[istsos] 02/03: Imported Upstream version 2.2.0

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Fri Jul 17 12:16:38 UTC 2015


This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository istsos.

commit 1c3569552099b43cff522ab28812a590e0cdc2ee
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Fri Jul 17 14:15:46 2015 +0200

    Imported Upstream version 2.2.0
---
 CLA.txt                                            |     24 +
 COMMITTERS.txt                                     |     10 +
 GPL.txt                                            |    341 +
 LICENSE.txt                                        |     18 +
 RFC.txt                                            |     45 +
 VERSION.txt                                        |      1 +
 application.py                                     |    172 +-
 cmdimportcsv.py                                    |    315 -
 code_provenance/lib_folder.txt                     |     22 +
 code_provenance/list_not_copyrighted.txt           |    189 +
 config.py                                          |     15 +-
 config.pyc                                         |    Bin 571 -> 0 bytes
 html/admin/app/Procedure.js                        |    881 +
 .../admin}/app/data/cmbcapabilities.json           |      0
 .../admin}/app/data/cmbcapabilitiesuom.json        |      0
 .../admin}/app/data/cmbdocumentformat.json         |      0
 {interface => html/admin}/app/data/cmbepsg.json    |      0
 .../admin}/app/data/cmbidentification.json         |      0
 .../admin}/app/data/cmbobservedproperties.json     |      0
 .../admin}/app/data/cmbphenomenon.json             |      0
 .../admin}/app/data/cmbsystemtype.json             |      0
 {interface => html/admin}/app/data/cmbuom.json     |      0
 .../admin}/app/data/fakeOfferings.json             |      0
 {interface => html/admin}/app/data/procedure.json  |      0
 {interface => html/admin}/app/engine/pageConfig.js |      0
 .../admin}/app/engine/pageManager.js               |      0
 {interface => html/admin}/app/engine/wa.js         |      0
 html/admin/app/store/AggregateFunctionStore.js     |     52 +
 html/admin/app/store/Constraint.js                 |     60 +
 html/admin/app/store/DataQualityStore.js           |     40 +
 html/admin/app/store/Fake.js                       |     41 +
 html/admin/app/store/MyArrayStore.js               |     29 +
 html/admin/app/store/MyJsonStore23.js              |     28 +
 html/admin/app/store/Observations.js               |     42 +
 html/admin/app/store/ObservedProperties.js         |     49 +
 html/admin/app/store/Offerings.js                  |     42 +
 html/admin/app/store/Procedures.js                 |     41 +
 html/admin/app/store/RatingCurve.js                |     62 +
 html/admin/app/store/Services.js                   |     41 +
 html/admin/app/store/cmbDocumentFormat.js          |     41 +
 html/admin/app/store/cmbIdentification.js          |     41 +
 html/admin/app/store/cmbName.js                    |     37 +
 html/admin/app/store/cmbNameDescription.js         |     41 +
 html/admin/app/store/cmbSml.js                     |     53 +
 html/admin/app/store/cmbSystemType.js              |     38 +
 html/admin/app/store/gridDocumentation.js          |     48 +
 html/admin/app/store/gridObservedProperties.js     |     53 +
 html/admin/app/store/gridOfferings.js              |     54 +
 html/admin/app/store/gridOutputs.js                |     70 +
 html/admin/app/store/gridProceduresList.js         |     57 +
 html/admin/app/store/gridUoms.js                   |     45 +
 html/admin/app/store/serverstatus.js               |     85 +
 html/admin/app/store/vplist.js                     |     43 +
 {interface => html/admin}/app/view/BasePage.js     |      0
 {interface => html/admin}/app/view/Calc.js         |      0
 {interface => html/admin}/app/view/Chart.js        |      0
 .../admin}/app/view/ChartContainer.js              |      0
 {interface => html/admin}/app/view/CheckColumn.js  |      0
 {interface => html/admin}/app/view/Editor1.js      |      0
 .../admin}/app/view/FormDataQuality.js             |      0
 {interface => html/admin}/app/view/FormPaths.js    |      0
 {interface => html/admin}/app/view/MainMenu.js     |      0
 html/admin/app/view/MainMenu2.js                   |    316 +
 {interface => html/admin}/app/view/MainPanel.js    |      0
 .../admin}/app/view/MyGridPanel15.js               |      0
 .../admin}/app/view/ObservationEditor.js           |      0
 .../view/ObservationEditorAdvancedOperations.js    |      0
 .../admin}/app/view/ObservationEditorColumn.js     |      0
 html/admin/app/view/ProcedureChart.js              |    677 +
 html/admin/app/view/ProcedureChooser.js            |    493 +
 html/admin/app/view/ProcedureGrid.js               |    575 +
 .../admin}/app/view/ProcedureGridEditor.js         |      0
 .../admin}/app/view/ProcedurePlotter.js            |      0
 {interface => html/admin}/app/view/TestCsv.js      |      0
 {interface => html/admin}/app/view/Viewer.js       |      0
 .../admin}/app/view/VirtualProcedureEditor.js      |      0
 {interface => html/admin}/app/view/Wizard.js       |      0
 {interface => html/admin}/app/view/about.js        |      0
 {interface => html/admin}/app/view/config.js       |      0
 {interface => html/admin}/app/view/contactinfo.js  |      0
 {interface => html/admin}/app/view/contacts.js     |      0
 {interface => html/admin}/app/view/database.js     |      0
 {interface => html/admin}/app/view/geo.js          |      0
 .../admin}/app/view/getobservation.js              |      0
 .../admin}/app/view/identification.js              |      0
 {interface => html/admin}/app/view/newservice.js   |      0
 .../admin}/app/view/obsPropEditor.js               |      0
 .../admin}/app/view/offeringsEditor.js             |      0
 {interface => html/admin}/app/view/paths.js        |      0
 {interface => html/admin}/app/view/procedure.js    |      0
 html/admin/app/view/proceduresList.js              |    188 +
 {interface => html/admin}/app/view/provider.js     |      0
 .../admin}/app/view/qualityindexEditor.js          |      0
 .../admin}/app/view/serviceEditor.js               |      0
 .../admin}/app/view/serviceconfig.js               |      0
 {interface => html/admin}/app/view/serviceurl.js   |      0
 {interface => html/admin}/app/view/status.js       |      0
 html/admin/app/view/ui/BasePage.js                 |     61 +
 html/admin/app/view/ui/Calc.js                     |    334 +
 .../admin}/app/view/ui/CenterPage.js               |      0
 html/admin/app/view/ui/Chart.js                    |    259 +
 html/admin/app/view/ui/ChartContainer.js           |     36 +
 html/admin/app/view/ui/CheckColumn.js              |     22 +
 html/admin/app/view/ui/Editor1.js                  |     74 +
 html/admin/app/view/ui/FormDataQuality.js          |     98 +
 {interface => html/admin}/app/view/ui/FormPaths.js |      0
 {interface => html/admin}/app/view/ui/MainMenu.js  |      0
 html/admin/app/view/ui/MainMenu2.js                |    117 +
 html/admin/app/view/ui/MainPanel.js                |    149 +
 .../admin}/app/view/ui/MyGridPanel15.js            |      0
 html/admin/app/view/ui/ObservationEditor.js        |    212 +
 .../view/ui/ObservationEditorAdvancedOperations.js |     39 +
 html/admin/app/view/ui/ObservationEditorColumn.js  |     55 +
 html/admin/app/view/ui/ProcedureChart.js           |    233 +
 html/admin/app/view/ui/ProcedureChooser.js         |     97 +
 html/admin/app/view/ui/ProcedureGrid.js            |     25 +
 html/admin/app/view/ui/ProcedureGridEditor.js      |     97 +
 html/admin/app/view/ui/ProcedurePlotter.js         |    114 +
 html/admin/app/view/ui/TestCsv.js                  |    122 +
 html/admin/app/view/ui/Viewer.js                   |     95 +
 html/admin/app/view/ui/VirtualProcedureEditor.js   |    341 +
 {interface => html/admin}/app/view/ui/Wizard.js    |      0
 .../admin}/app/view/ui/WizardPage.js               |      0
 html/admin/app/view/ui/about.js                    |     72 +
 html/admin/app/view/ui/config.js                   |    116 +
 html/admin/app/view/ui/contactinfo.js              |    113 +
 html/admin/app/view/ui/contacts.js                 |     93 +
 html/admin/app/view/ui/database.js                 |     96 +
 html/admin/app/view/ui/geo.js                      |     76 +
 html/admin/app/view/ui/getobservation.js           |     42 +
 html/admin/app/view/ui/identification.js           |     87 +
 html/admin/app/view/ui/newservice.js               |    133 +
 html/admin/app/view/ui/obsPropEditor.js            |    200 +
 html/admin/app/view/ui/offeringsEditor.js          |    304 +
 html/admin/app/view/ui/paths.js                    |     42 +
 html/admin/app/view/ui/procedure.js                |   1420 +
 html/admin/app/view/ui/proceduresList.js           |     81 +
 html/admin/app/view/ui/provider.js                 |    117 +
 html/admin/app/view/ui/qualityindexEditor.js       |    131 +
 html/admin/app/view/ui/serviceEditor.js            |    111 +
 html/admin/app/view/ui/serviceconfig.js            |    285 +
 html/admin/app/view/ui/serviceurl.js               |     44 +
 html/admin/app/view/ui/status.js                   |    109 +
 html/admin/app/view/ui/uomsEditor.js               |    124 +
 {interface => html/admin}/app/view/uomsEditor.js   |      0
 {interface => html/admin}/codemirror/LICENSE       |      0
 {interface => html/admin}/codemirror/README.md     |      0
 .../admin}/codemirror/demo/activeline.html         |      0
 .../admin}/codemirror/demo/changemode.html         |      0
 .../admin}/codemirror/demo/closetag.html           |      0
 .../admin}/codemirror/demo/complete.html           |      0
 .../admin}/codemirror/demo/emacs.html              |      0
 .../admin}/codemirror/demo/folding.html            |      0
 .../admin}/codemirror/demo/formatting.html         |      0
 .../admin}/codemirror/demo/fullscreen.html         |      0
 .../admin}/codemirror/demo/loadmode.html           |      0
 .../admin}/codemirror/demo/marker.html             |      0
 .../admin}/codemirror/demo/matchhighlighter.html   |      0
 .../admin}/codemirror/demo/mustache.html           |      0
 .../admin}/codemirror/demo/preview.html            |      0
 .../admin}/codemirror/demo/resize.html             |      0
 .../admin}/codemirror/demo/runmode.html            |      0
 .../admin}/codemirror/demo/search.html             |      0
 .../admin}/codemirror/demo/theme.html              |      0
 {interface => html/admin}/codemirror/demo/vim.html |      0
 .../admin}/codemirror/demo/visibletabs.html        |      0
 .../admin}/codemirror/doc/baboon.png               |    Bin
 .../admin}/codemirror/doc/baboon_vector.svg        |      0
 .../admin}/codemirror/doc/compress.html            |      0
 {interface => html/admin}/codemirror/doc/docs.css  |      0
 .../admin}/codemirror/doc/internals.html           |      0
 .../admin}/codemirror/doc/manual.html              |      0
 .../admin}/codemirror/doc/oldrelease.html          |      0
 .../admin}/codemirror/doc/reporting.html           |      0
 .../admin}/codemirror/doc/upgrade_v2.2.html        |      0
 {interface => html/admin}/codemirror/index.html    |      0
 .../admin}/codemirror/keymap/emacs.js              |      0
 {interface => html/admin}/codemirror/keymap/vim.js |      0
 .../admin}/codemirror/lib/codemirror.css           |      0
 .../admin}/codemirror/lib/codemirror.js            |      0
 .../admin}/codemirror/lib/util/closetag.js         |      0
 .../admin}/codemirror/lib/util/dialog.css          |      0
 .../admin}/codemirror/lib/util/dialog.js           |      0
 .../admin}/codemirror/lib/util/foldcode.js         |      0
 .../admin}/codemirror/lib/util/formatting.js       |      0
 .../admin}/codemirror/lib/util/javascript-hint.js  |      0
 .../admin}/codemirror/lib/util/loadmode.js         |      0
 .../codemirror/lib/util/match-highlighter.js       |      0
 .../admin}/codemirror/lib/util/overlay.js          |      0
 .../admin}/codemirror/lib/util/runmode.js          |      0
 .../admin}/codemirror/lib/util/search.js           |      0
 .../admin}/codemirror/lib/util/searchcursor.js     |      0
 .../admin}/codemirror/lib/util/simple-hint.css     |      0
 .../admin}/codemirror/lib/util/simple-hint.js      |      0
 .../admin}/codemirror/mode/javascript/index.html   |      0
 .../codemirror/mode/javascript/javascript.js       |      0
 .../admin}/codemirror/mode/python/LICENSE.txt      |      0
 .../admin}/codemirror/mode/python/index.html       |      0
 .../admin}/codemirror/mode/python/python.js        |      0
 .../admin}/codemirror/test/index.html              |      0
 .../admin}/codemirror/test/mode_test.css           |      0
 .../admin}/codemirror/test/mode_test.js            |      0
 {interface => html/admin}/codemirror/test/test.js  |      0
 .../admin}/codemirror/theme/ambiance.css           |      0
 .../admin}/codemirror/theme/blackboard.css         |      0
 .../admin}/codemirror/theme/cobalt.css             |      0
 .../admin}/codemirror/theme/eclipse.css            |      0
 .../admin}/codemirror/theme/elegant.css            |      0
 .../admin}/codemirror/theme/erlang-dark.css        |      0
 .../admin}/codemirror/theme/lesser-dark.css        |      0
 .../admin}/codemirror/theme/monokai.css            |      0
 .../admin}/codemirror/theme/neat.css               |      0
 .../admin}/codemirror/theme/night.css              |      0
 .../admin}/codemirror/theme/rubyblue.css           |      0
 .../admin}/codemirror/theme/xq-dark.css            |      0
 {interface => html/admin}/css/images/checked.gif   |    Bin
 .../admin}/css/images/grid3-hd-btn.gif             |    Bin
 {interface => html/admin}/css/images/unchecked.gif |    Bin
 html/admin/css/main.css                            |    649 +
 {interface => html/admin}/data/observations.json   |      0
 .../admin}/data/observedproperties.json            |      0
 {interface => html/admin}/data/offerings.json      |      0
 {interface => html/admin}/data/procedures.json     |      0
 .../admin}/dygraphs/dygraph-combined.js            |      0
 {interface => html/admin}/ext/codemirror.js        |      0
 {interface => html/admin}/ext/ext-all-debug.js     |      0
 .../admin}/ext/resources/css/ext-all-access.css    |      0
 .../admin}/ext/resources/css/ext-all-gray.css      |      0
 .../admin}/ext/resources/css/ext-all-scoped.css    |      0
 .../admin}/ext/resources/css/ext-all.css           |      0
 .../admin}/ext/resources/css/ext-ie-scoped.css     |      0
 .../admin}/ext/resources/css/ext-ie.css            |      0
 .../admin}/ext/resources/css/ext-sandbox.css       |      0
 .../ext/resources/css/ext-standard-scoped.css      |      0
 .../admin}/ext/resources/css/ext-standard.css      |      0
 .../admin}/ext/resources/sass/config.rb            |      0
 .../admin}/ext/resources/sass/ext-all-access.scss  |      0
 .../admin}/ext/resources/sass/ext-all-gray.scss    |      0
 .../admin}/ext/resources/sass/ext-all-scoped.scss  |      0
 .../admin}/ext/resources/sass/ext-all.scss         |      0
 .../admin}/ext/resources/sass/ext-ie-scoped.scss   |      0
 .../admin}/ext/resources/sass/ext-ie.scss          |      0
 .../admin}/ext/resources/sass/ext-sandbox.scss     |      0
 .../ext/resources/sass/ext-standard-scoped.scss    |      0
 .../admin}/ext/resources/sass/ext-standard.scss    |      0
 .../admin}/ext/resources/themes/compass_init.rb    |      0
 .../images/default}/boundlist/trigger-arrow.png    |    Bin
 .../themes/images/default}/box/corners-blue.gif    |    Bin
 .../themes/images/default}/box/corners.gif         |    Bin
 .../themes/images/default}/box/l-blue.gif          |    Bin
 .../ext/resources/themes/images/default}/box/l.gif |    Bin
 .../themes/images/default}/box/r-blue.gif          |    Bin
 .../ext/resources/themes/images/default}/box/r.gif |    Bin
 .../themes/images/default/box/tb-blue.gif          |    Bin
 .../resources/themes/images/default}/box/tb.gif    |    Bin
 .../btn-group/btn-group-default-framed-corners.gif |    Bin
 .../btn-group-default-framed-notitle-corners.gif   |    Bin
 .../btn-group-default-framed-notitle-sides.gif     |    Bin
 .../btn-group/btn-group-default-framed-sides.gif   |    Bin
 .../images/default/btn/btn-default-large-bg.gif    |    Bin
 .../default/btn/btn-default-large-corners.gif      |    Bin
 .../default/btn/btn-default-large-disabled-bg.gif  |    Bin
 .../btn/btn-default-large-disabled-corners.gif     |    Bin
 .../btn/btn-default-large-disabled-sides.gif       |    Bin
 .../default/btn/btn-default-large-focus-bg.gif     |    Bin
 .../btn/btn-default-large-focus-corners.gif        |    Bin
 .../default/btn/btn-default-large-focus-sides.gif  |    Bin
 .../default/btn/btn-default-large-over-bg.gif      |    Bin
 .../default/btn/btn-default-large-over-corners.gif |    Bin
 .../default/btn/btn-default-large-over-sides.gif   |    Bin
 .../default/btn/btn-default-large-pressed-bg.gif   |    Bin
 .../btn/btn-default-large-pressed-corners.gif      |    Bin
 .../btn/btn-default-large-pressed-sides.gif        |    Bin
 .../images/default/btn/btn-default-large-sides.gif |    Bin
 .../images/default/btn/btn-default-medium-bg.gif   |    Bin
 .../default/btn/btn-default-medium-corners.gif     |    Bin
 .../default/btn/btn-default-medium-disabled-bg.gif |    Bin
 .../btn/btn-default-medium-disabled-corners.gif    |    Bin
 .../btn/btn-default-medium-disabled-sides.gif      |    Bin
 .../default/btn/btn-default-medium-focus-bg.gif    |    Bin
 .../btn/btn-default-medium-focus-corners.gif       |    Bin
 .../default/btn/btn-default-medium-focus-sides.gif |    Bin
 .../default/btn/btn-default-medium-over-bg.gif     |    Bin
 .../btn/btn-default-medium-over-corners.gif        |    Bin
 .../default/btn/btn-default-medium-over-sides.gif  |    Bin
 .../default/btn/btn-default-medium-pressed-bg.gif  |    Bin
 .../btn/btn-default-medium-pressed-corners.gif     |    Bin
 .../btn/btn-default-medium-pressed-sides.gif       |    Bin
 .../default/btn/btn-default-medium-sides.gif       |    Bin
 .../images/default/btn/btn-default-small-bg.gif    |    Bin
 .../default/btn/btn-default-small-corners.gif      |    Bin
 .../default/btn/btn-default-small-disabled-bg.gif  |    Bin
 .../btn/btn-default-small-disabled-corners.gif     |    Bin
 .../btn/btn-default-small-disabled-sides.gif       |    Bin
 .../default/btn/btn-default-small-focus-bg.gif     |    Bin
 .../btn/btn-default-small-focus-corners.gif        |    Bin
 .../default/btn/btn-default-small-focus-sides.gif  |    Bin
 .../default/btn/btn-default-small-over-bg.gif      |    Bin
 .../default/btn/btn-default-small-over-corners.gif |    Bin
 .../default/btn/btn-default-small-over-sides.gif   |    Bin
 .../default/btn/btn-default-small-pressed-bg.gif   |    Bin
 .../btn/btn-default-small-pressed-corners.gif      |    Bin
 .../btn/btn-default-small-pressed-sides.gif        |    Bin
 .../images/default/btn/btn-default-small-sides.gif |    Bin
 .../btn/btn-default-toolbar-large-corners.gif      |    Bin
 .../btn-default-toolbar-large-disabled-corners.gif |    Bin
 .../btn-default-toolbar-large-disabled-sides.gif   |    Bin
 .../btn/btn-default-toolbar-large-focus-bg.gif     |    Bin
 .../btn-default-toolbar-large-focus-corners.gif    |    Bin
 .../btn/btn-default-toolbar-large-focus-sides.gif  |    Bin
 .../btn/btn-default-toolbar-large-over-bg.gif      |    Bin
 .../btn/btn-default-toolbar-large-over-corners.gif |    Bin
 .../btn/btn-default-toolbar-large-over-sides.gif   |    Bin
 .../btn/btn-default-toolbar-large-pressed-bg.gif   |    Bin
 .../btn-default-toolbar-large-pressed-corners.gif  |    Bin
 .../btn-default-toolbar-large-pressed-sides.gif    |    Bin
 .../btn/btn-default-toolbar-large-sides.gif        |    Bin
 .../btn/btn-default-toolbar-medium-corners.gif     |    Bin
 ...btn-default-toolbar-medium-disabled-corners.gif |    Bin
 .../btn-default-toolbar-medium-disabled-sides.gif  |    Bin
 .../btn/btn-default-toolbar-medium-focus-bg.gif    |    Bin
 .../btn-default-toolbar-medium-focus-corners.gif   |    Bin
 .../btn/btn-default-toolbar-medium-focus-sides.gif |    Bin
 .../btn/btn-default-toolbar-medium-over-bg.gif     |    Bin
 .../btn-default-toolbar-medium-over-corners.gif    |    Bin
 .../btn/btn-default-toolbar-medium-over-sides.gif  |    Bin
 .../btn/btn-default-toolbar-medium-pressed-bg.gif  |    Bin
 .../btn-default-toolbar-medium-pressed-corners.gif |    Bin
 .../btn-default-toolbar-medium-pressed-sides.gif   |    Bin
 .../btn/btn-default-toolbar-medium-sides.gif       |    Bin
 .../btn/btn-default-toolbar-small-corners.gif      |    Bin
 .../btn-default-toolbar-small-disabled-corners.gif |    Bin
 .../btn-default-toolbar-small-disabled-sides.gif   |    Bin
 .../btn/btn-default-toolbar-small-focus-bg.gif     |    Bin
 .../btn-default-toolbar-small-focus-corners.gif    |    Bin
 .../btn/btn-default-toolbar-small-focus-sides.gif  |    Bin
 .../btn/btn-default-toolbar-small-over-bg.gif      |    Bin
 .../btn/btn-default-toolbar-small-over-corners.gif |    Bin
 .../btn/btn-default-toolbar-small-over-sides.gif   |    Bin
 .../btn/btn-default-toolbar-small-pressed-bg.gif   |    Bin
 .../btn-default-toolbar-small-pressed-corners.gif  |    Bin
 .../btn-default-toolbar-small-pressed-sides.gif    |    Bin
 .../btn/btn-default-toolbar-small-sides.gif        |    Bin
 .../themes/images/default/button/arrow.gif         |    Bin
 .../resources/themes/images/default/button/btn.gif |    Bin
 .../themes/images/default/button/group-cs.gif      |    Bin
 .../themes/images/default/button/group-lr.gif      |    Bin
 .../themes/images/default/button/group-tb.gif      |    Bin
 .../images/default/button/s-arrow-b-noline.gif     |    Bin
 .../themes/images/default/button/s-arrow-b.gif     |    Bin
 .../themes/images/default/button/s-arrow-bo.gif    |    Bin
 .../images/default}/button/s-arrow-light.gif       |    Bin
 .../images/default/button/s-arrow-noline.gif       |    Bin
 .../themes/images/default/button/s-arrow-o.gif     |    Bin
 .../themes/images/default/button/s-arrow.gif       |    Bin
 .../default/datepicker/datepicker-footer-bg.gif    |    Bin
 .../default/datepicker/datepicker-footer-bg.png    |    Bin
 .../default/datepicker/datepicker-header-bg.gif    |    Bin
 .../default/datepicker/datepicker-header-bg.png    |    Bin
 .../themes/images/default}/dd/drop-add.gif         |    Bin
 .../resources/themes/images/default/dd/drop-no.gif |    Bin
 .../themes/images/default}/dd/drop-yes.gif         |    Bin
 .../themes/images/default/editor/tb-sprite.gif     |    Bin
 .../form-invalid-tip/form-invalid-tip-corners.gif  |    Bin
 .../form-invalid-tip-default-corners.gif           |    Bin
 .../form-invalid-tip-default-sides.gif             |    Bin
 .../form-invalid-tip/form-invalid-tip-sides.gif    |    Bin
 .../themes/images/default/form/checkbox.gif        |    Bin
 .../themes/images/default/form/clear-trigger.gif   |    Bin
 .../themes/images/default/form/date-trigger.gif    |    Bin
 .../images/default}/form/error-tip-corners.gif     |    Bin
 .../themes/images/default/form/exclamation.gif     |    Bin
 .../resources/themes/images/default/form/radio.gif |    Bin
 .../themes/images/default/form/search-trigger.gif  |    Bin
 .../themes/images/default/form/spinner-small.gif   |    Bin
 .../themes/images/default/form/spinner.gif         |    Bin
 .../themes/images/default/form/text-bg.gif         |    Bin
 .../themes/images/default/form/trigger-square.gif  |    Bin
 .../themes/images/default/form/trigger-tpl.gif     |    Bin
 .../themes/images/default/form/trigger.gif         |    Bin
 .../images/default}/grid/arrow-left-white.gif      |    Bin
 .../images/default}/grid/arrow-right-white.gif     |    Bin
 .../images/default}/grid/cell-special-bg.gif       |    Bin
 .../themes/images/default/grid/cell-special-bg.png |    Bin
 .../default/grid/cell-special-selected-bg.gif      |    Bin
 .../default/grid/cell-special-selected-bg.png      |    Bin
 .../themes/images/default}/grid/checked.gif        |    Bin
 .../images/default}/grid/col-move-bottom.gif       |    Bin
 .../themes/images/default}/grid/col-move-top.gif   |    Bin
 .../images/default/grid/column-header-bg.gif       |    Bin
 .../images/default/grid/column-header-bg.png       |    Bin
 .../images/default/grid/column-header-over-bg.gif  |    Bin
 .../images/default/grid/column-header-over-bg.png  |    Bin
 .../themes/images/default}/grid/columns.gif        |    Bin
 .../images/default}/grid/dd-insert-arrow-left.gif  |    Bin
 .../images/default}/grid/dd-insert-arrow-left.png  |    Bin
 .../images/default}/grid/dd-insert-arrow-right.gif |    Bin
 .../images/default}/grid/dd-insert-arrow-right.png |    Bin
 .../resources/themes/images/default/grid/dirty.gif |    Bin
 .../resources/themes/images/default}/grid/done.gif |    Bin
 .../themes/images/default}/grid/drop-no.gif        |    Bin
 .../themes/images/default}/grid/drop-yes.gif       |    Bin
 .../themes/images/default}/grid/footer-bg.gif      |    Bin
 .../themes/images/default}/grid/grid-blue-hd.gif   |    Bin
 .../themes/images/default/grid/grid-blue-split.gif |    Bin
 .../themes/images/default}/grid/grid-hrow.gif      |    Bin
 .../themes/images/default}/grid/grid-loading.gif   |    Bin
 .../themes/images/default}/grid/grid-split.gif     |    Bin
 .../themes/images/default}/grid/grid-vista-hd.gif  |    Bin
 .../themes/images/default/grid/grid3-hd-btn.gif    |    Bin
 .../themes/images/default/grid/grid3-hrow-over.gif |    Bin
 .../themes/images/default/grid/grid3-hrow.gif      |    Bin
 .../themes/images/default/grid/grid3-rowheader.gif |    Bin
 .../themes/images/default}/grid/group-by.gif       |    Bin
 .../themes/images/default/grid/group-collapse.gif  |    Bin
 .../images/default/grid/group-expand-sprite.gif    |    Bin
 .../themes/images/default/grid/group-expand.gif    |    Bin
 .../themes/images/default}/grid/hd-pop.gif         |    Bin
 .../themes/images/default}/grid/hmenu-asc.gif      |    Bin
 .../themes/images/default}/grid/hmenu-desc.gif     |    Bin
 .../themes/images/default}/grid/hmenu-lock.gif     |    Bin
 .../themes/images/default}/grid/hmenu-lock.png     |    Bin
 .../themes/images/default}/grid/hmenu-unlock.gif   |    Bin
 .../themes/images/default}/grid/hmenu-unlock.png   |    Bin
 .../themes/images/default/grid/invalid_line.gif    |    Bin
 .../themes/images/default}/grid/loading.gif        |    Bin
 .../themes/images/default}/grid/mso-hd.gif         |    Bin
 .../themes/images/default}/grid/nowait.gif         |    Bin
 .../images/default/grid/page-first-disabled.gif    |    Bin
 .../themes/images/default/grid/page-first.gif      |    Bin
 .../images/default/grid/page-last-disabled.gif     |    Bin
 .../themes/images/default/grid/page-last.gif       |    Bin
 .../images/default/grid/page-next-disabled.gif     |    Bin
 .../themes/images/default/grid/page-next.gif       |    Bin
 .../images/default/grid/page-prev-disabled.gif     |    Bin
 .../themes/images/default/grid/page-prev.gif       |    Bin
 .../themes/images/default}/grid/pick-button.gif    |    Bin
 .../images/default}/grid/property-cell-bg.gif      |    Bin
 .../default/grid/property-cell-selected-bg.gif     |    Bin
 .../images/default}/grid/refresh-disabled.gif      |    Bin
 .../themes/images/default/grid/refresh.gif         |    Bin
 .../images/default}/grid/row-check-sprite.gif      |    Bin
 .../images/default}/grid/row-expand-sprite.gif     |    Bin
 .../themes/images/default}/grid/row-over.gif       |    Bin
 .../themes/images/default}/grid/row-sel.gif        |    Bin
 .../themes/images/default/grid/sort-hd.gif         |    Bin
 .../themes/images/default/grid/sort_asc.gif        |    Bin
 .../themes/images/default/grid/sort_desc.gif       |    Bin
 .../themes/images/default}/grid/unchecked.gif      |    Bin
 .../resources/themes/images/default}/grid/wait.gif |    Bin
 .../themes/images/default}/layout/mini-bottom.gif  |    Bin
 .../themes/images/default}/layout/mini-left.gif    |    Bin
 .../themes/images/default}/layout/mini-right.gif   |    Bin
 .../themes/images/default}/layout/mini-top.gif     |    Bin
 .../themes/images/default}/menu/checked.gif        |    Bin
 .../themes/images/default/menu/group-checked.gif   |    Bin
 .../themes/images/default/menu/item-over.gif       |    Bin
 .../images/default/menu/menu-item-active-bg.gif    |    Bin
 .../default/menu/menu-item-active-corners.gif      |    Bin
 .../images/default/menu/menu-item-active-sides.gif |    Bin
 .../themes/images/default/menu/menu-parent.gif     |    Bin
 .../resources/themes/images/default/menu/menu.gif  |    Bin
 .../themes/images/default}/menu/unchecked.gif      |    Bin
 .../panel-header-default-bottom-bg.gif             |    Bin
 .../panel-header-default-framed-bottom-bg.gif      |    Bin
 .../panel-header-default-framed-bottom-corners.gif |    Bin
 .../panel-header-default-framed-bottom-sides.gif   |    Bin
 ...l-header-default-framed-collapsed-bottom-bg.gif |    Bin
 ...der-default-framed-collapsed-bottom-corners.gif |    Bin
 ...eader-default-framed-collapsed-bottom-sides.gif |    Bin
 ...nel-header-default-framed-collapsed-left-bg.gif |    Bin
 ...eader-default-framed-collapsed-left-corners.gif |    Bin
 ...-header-default-framed-collapsed-left-sides.gif |    Bin
 ...el-header-default-framed-collapsed-right-bg.gif |    Bin
 ...ader-default-framed-collapsed-right-corners.gif |    Bin
 ...header-default-framed-collapsed-right-sides.gif |    Bin
 ...anel-header-default-framed-collapsed-top-bg.gif |    Bin
 ...header-default-framed-collapsed-top-corners.gif |    Bin
 ...l-header-default-framed-collapsed-top-sides.gif |    Bin
 .../panel-header-default-framed-left-bg.gif        |    Bin
 .../panel-header-default-framed-left-corners.gif   |    Bin
 .../panel-header-default-framed-left-sides.gif     |    Bin
 .../panel-header-default-framed-right-bg.gif       |    Bin
 .../panel-header-default-framed-right-corners.gif  |    Bin
 .../panel-header-default-framed-right-sides.gif    |    Bin
 .../panel-header-default-framed-top-bg.gif         |    Bin
 .../panel-header-default-framed-top-corners.gif    |    Bin
 .../panel-header-default-framed-top-sides.gif      |    Bin
 .../panel-header/panel-header-default-left-bg.gif  |    Bin
 .../panel-header/panel-header-default-right-bg.gif |    Bin
 .../panel-header/panel-header-default-top-bg.gif   |    Bin
 .../default/panel/panel-default-framed-corners.gif |    Bin
 .../default/panel/panel-default-framed-sides.gif   |    Bin
 .../default/progress/progress-default-bg.gif       |    Bin
 .../themes/images/default}/shared/blue-loading.gif |    Bin
 .../themes/images/default/shared/calendar.gif      |    Bin
 .../themes/images/default/shared/glass-bg.gif      |    Bin
 .../themes/images/default/shared/hd-sprite.gif     |    Bin
 .../themes/images/default}/shared/icon-error.gif   |    Bin
 .../themes/images/default}/shared/icon-info.gif    |    Bin
 .../images/default}/shared/icon-question.gif       |    Bin
 .../themes/images/default}/shared/icon-warning.gif |    Bin
 .../images/default}/shared/large-loading.gif       |    Bin
 .../themes/images/default/shared/left-btn.gif      |    Bin
 .../themes/images/default/shared/loading-balls.gif |    Bin
 .../themes/images/default/shared/right-btn.gif     |    Bin
 .../themes/images/default/shared/shadow-c.png      |    Bin
 .../themes/images/default/shared/shadow-lr.png     |    Bin
 .../themes/images/default/shared/shadow.png        |    Bin
 .../themes/images/default/shared/warning.gif       |    Bin
 .../themes/images/default/sizer/e-handle-dark.gif  |    Bin
 .../themes/images/default/sizer/e-handle.gif       |    Bin
 .../themes/images/default/sizer/ne-handle-dark.gif |    Bin
 .../themes/images/default/sizer/ne-handle.gif      |    Bin
 .../themes/images/default/sizer/nw-handle-dark.gif |    Bin
 .../themes/images/default/sizer/nw-handle.gif      |    Bin
 .../themes/images/default/sizer/s-handle-dark.gif  |    Bin
 .../themes/images/default/sizer/s-handle.gif       |    Bin
 .../themes/images/default/sizer/se-handle-dark.gif |    Bin
 .../themes/images/default/sizer/se-handle.gif      |    Bin
 .../themes/images/default/sizer/square.gif         |    Bin
 .../themes/images/default/sizer/sw-handle-dark.gif |    Bin
 .../themes/images/default/sizer/sw-handle.gif      |    Bin
 .../themes/images/default/slider/slider-bg.gif     |    Bin
 .../themes/images/default/slider/slider-bg.png     |    Bin
 .../themes/images/default/slider/slider-thumb.gif  |    Bin
 .../themes/images/default/slider/slider-thumb.png  |    Bin
 .../themes/images/default/slider/slider-v-bg.gif   |    Bin
 .../themes/images/default/slider/slider-v-bg.png   |    Bin
 .../images/default/slider/slider-v-thumb.gif       |    Bin
 .../images/default/slider/slider-v-thumb.png       |    Bin
 .../themes/images/default/tab-bar/scroll-left.gif  |    Bin
 .../themes/images/default/tab-bar/scroll-right.gif |    Bin
 .../images/default/tab-bar/tab-bar-default-bg.gif  |    Bin
 .../default/tab/tab-default-bottom-active-bg.gif   |    Bin
 .../tab/tab-default-bottom-active-corners.gif      |    Bin
 .../tab/tab-default-bottom-active-sides.gif        |    Bin
 .../images/default/tab/tab-default-bottom-bg.gif   |    Bin
 .../default/tab/tab-default-bottom-corners.gif     |    Bin
 .../default/tab/tab-default-bottom-disabled-bg.gif |    Bin
 .../tab/tab-default-bottom-disabled-corners.gif    |    Bin
 .../tab/tab-default-bottom-disabled-sides.gif      |    Bin
 .../default/tab/tab-default-bottom-over-bg.gif     |    Bin
 .../tab/tab-default-bottom-over-corners.gif        |    Bin
 .../default/tab/tab-default-bottom-over-sides.gif  |    Bin
 .../default/tab/tab-default-bottom-sides.gif       |    Bin
 .../images/default/tab/tab-default-close.gif       |    Bin
 .../default/tab/tab-default-top-active-bg.gif      |    Bin
 .../default/tab/tab-default-top-active-corners.gif |    Bin
 .../default/tab/tab-default-top-active-sides.gif   |    Bin
 .../images/default/tab/tab-default-top-bg.gif      |    Bin
 .../images/default/tab/tab-default-top-corners.gif |    Bin
 .../default/tab/tab-default-top-disabled-bg.gif    |    Bin
 .../tab/tab-default-top-disabled-corners.gif       |    Bin
 .../default/tab/tab-default-top-disabled-sides.gif |    Bin
 .../images/default/tab/tab-default-top-over-bg.gif |    Bin
 .../default/tab/tab-default-top-over-corners.gif   |    Bin
 .../default/tab/tab-default-top-over-sides.gif     |    Bin
 .../images/default/tab/tab-default-top-sides.gif   |    Bin
 .../themes/images/default/tip/tip-corners.gif      |    Bin
 .../themes/images/default/tip/tip-sides.gif        |    Bin
 .../themes/images/default/toolbar/more.gif         |    Bin
 .../themes/images/default/toolbar/scroll-left.gif  |    Bin
 .../themes/images/default/toolbar/scroll-right.gif |    Bin
 .../images/default/toolbar/toolbar-default-bg.gif  |    Bin
 .../images/default/tools}/tool-sprite-tpl.gif      |    Bin
 .../themes/images/default/tools/tool-sprites.gif   |    Bin
 .../images/default/tools}/tools-sprites-trans.gif  |    Bin
 .../themes/images/default/tree/arrows.gif          |    Bin
 .../themes/images/default}/tree/drop-above.gif     |    Bin
 .../themes/images/default}/tree/drop-add.gif       |    Bin
 .../themes/images/default}/tree/drop-append.gif    |    Bin
 .../themes/images/default}/tree/drop-below.gif     |    Bin
 .../themes/images/default/tree}/drop-between.gif   |    Bin
 .../themes/images/default/tree}/drop-no.gif        |    Bin
 .../themes/images/default/tree}/drop-over.gif      |    Bin
 .../themes/images/default/tree}/drop-under.gif     |    Bin
 .../themes/images/default}/tree/drop-yes.gif       |    Bin
 .../images/default/tree/elbow-end-minus-nl.gif     |    Bin
 .../themes/images/default/tree/elbow-end-minus.gif |    Bin
 .../images/default/tree/elbow-end-plus-nl.gif      |    Bin
 .../themes/images/default/tree/elbow-end-plus.gif  |    Bin
 .../themes/images/default}/tree/elbow-end.gif      |    Bin
 .../themes/images/default}/tree/elbow-line.gif     |    Bin
 .../themes/images/default/tree/elbow-minus-nl.gif  |    Bin
 .../themes/images/default/tree/elbow-minus.gif     |    Bin
 .../themes/images/default/tree/elbow-plus-nl.gif   |    Bin
 .../themes/images/default/tree/elbow-plus.gif      |    Bin
 .../themes/images/default}/tree/elbow.gif          |    Bin
 .../themes/images/default/tree/folder-open.gif     |    Bin
 .../themes/images/default/tree/folder.gif          |    Bin
 .../resources/themes/images/default}/tree/leaf.gif |    Bin
 .../themes/images/default}/tree/loading.gif        |    Bin
 .../resources/themes/images/default}/tree/s.gif    |    Bin
 .../images/default}/util/splitter/mini-bottom.gif  |    Bin
 .../images/default}/util/splitter/mini-left.gif    |    Bin
 .../images/default}/util/splitter/mini-right.gif   |    Bin
 .../images/default}/util/splitter/mini-top.gif     |    Bin
 .../window-header-default-bottom-corners.gif       |    Bin
 .../window-header-default-bottom-sides.gif         |    Bin
 .../window-header-default-left-corners.gif         |    Bin
 .../window-header-default-left-sides.gif           |    Bin
 .../window-header-default-right-corners.gif        |    Bin
 .../window-header-default-right-sides.gif          |    Bin
 .../window-header-default-top-corners.gif          |    Bin
 .../window-header-default-top-sides.gif            |    Bin
 .../default/window/window-default-corners.gif      |    Bin
 .../images/default/window/window-default-sides.gif |    Bin
 .../admin}/ext/resources/themes/lib/utils.rb       |      0
 .../themes/stylesheets/ext4/default/_all.scss      |      0
 .../themes/stylesheets/ext4/default/_core.scss     |      0
 .../stylesheets/ext4/default/_functions.scss       |      0
 .../themes/stylesheets/ext4/default/_mixins.scss   |      0
 .../stylesheets/ext4/default/_variables.scss       |      0
 .../themes/stylesheets/ext4/default/_widgets.scss  |      0
 .../stylesheets/ext4/default/core/_core.scss       |      0
 .../stylesheets/ext4/default/core/_reset.scss      |      0
 .../stylesheets/ext4/default/layout/_layout.scss   |      0
 .../ext4/default/mixins/_background-gradient.scss  |      0
 .../ext4/default/mixins/_color-by-background.scss  |      0
 .../stylesheets/ext4/default/mixins/_frame.scss    |      0
 .../ext4/default/mixins/_inner-border.scss         |      0
 .../ext4/default/mixins/_reset-extras.scss         |      0
 .../default/mixins/_theme-background-image.scss    |      0
 .../stylesheets/ext4/default/util/_dragdrop.scss   |      0
 .../stylesheets/ext4/default/util/_focus.scss      |      0
 .../stylesheets/ext4/default/util/_messagebox.scss |      0
 .../stylesheets/ext4/default/util/_resizable.scss  |      0
 .../stylesheets/ext4/default/util/_scroller.scss   |      0
 .../stylesheets/ext4/default/util/_splitter.scss   |      0
 .../stylesheets/ext4/default/util/_tool.scss       |      0
 .../ext4/default/variables/_boundlist.scss         |      0
 .../ext4/default/variables/_btn-group.scss         |      0
 .../ext4/default/variables/_button.scss            |      0
 .../stylesheets/ext4/default/variables/_core.scss  |      0
 .../stylesheets/ext4/default/variables/_focus.scss |      0
 .../stylesheets/ext4/default/variables/_form.scss  |      0
 .../stylesheets/ext4/default/variables/_grid.scss  |      0
 .../ext4/default/variables/_htmleditor.scss        |      0
 .../ext4/default/variables/_layout.scss            |      0
 .../ext4/default/variables/_loadmask.scss          |      0
 .../stylesheets/ext4/default/variables/_menu.scss  |      0
 .../stylesheets/ext4/default/variables/_panel.scss |      0
 .../ext4/default/variables/_pickers.scss           |      0
 .../ext4/default/variables/_progress-bar.scss      |      0
 .../stylesheets/ext4/default/variables/_qtip.scss  |      0
 .../stylesheets/ext4/default/variables/_tabs.scss  |      0
 .../ext4/default/variables/_toolbar.scss           |      0
 .../stylesheets/ext4/default/variables/_tree.scss  |      0
 .../ext4/default/variables/_window.scss            |      0
 .../ext4/default/widgets/_boundlist.scss           |      0
 .../ext4/default/widgets/_btn-group.scss           |      0
 .../stylesheets/ext4/default/widgets/_button.scss  |      0
 .../ext4/default/widgets/_colorpicker.scss         |      0
 .../ext4/default/widgets/_datepicker.scss          |      0
 .../ext4/default/widgets/_drawcomponent.scss       |      0
 .../stylesheets/ext4/default/widgets/_form.scss    |      0
 .../stylesheets/ext4/default/widgets/_grid.scss    |      0
 .../stylesheets/ext4/default/widgets/_html.scss    |      0
 .../ext4/default/widgets/_loadmask.scss            |      0
 .../stylesheets/ext4/default/widgets/_menu.scss    |      0
 .../stylesheets/ext4/default/widgets/_panel.scss   |      0
 .../ext4/default/widgets/_progress-bar.scss        |      0
 .../stylesheets/ext4/default/widgets/_qtip.scss    |      0
 .../stylesheets/ext4/default/widgets/_slider.scss  |      0
 .../stylesheets/ext4/default/widgets/_tab.scss     |      0
 .../stylesheets/ext4/default/widgets/_tabbar.scss  |      0
 .../stylesheets/ext4/default/widgets/_toolbar.scss |      0
 .../stylesheets/ext4/default/widgets/_tree.scss    |      0
 .../ext4/default/widgets/_viewport.scss            |      0
 .../stylesheets/ext4/default/widgets/_window.scss  |      0
 .../ext4/default/widgets/form/_all.scss            |      0
 .../ext4/default/widgets/form/_checkbox.scss       |      0
 .../ext4/default/widgets/form/_checkboxgroup.scss  |      0
 .../ext4/default/widgets/form/_field.scss          |      0
 .../ext4/default/widgets/form/_fieldset.scss       |      0
 .../ext4/default/widgets/form/_file.scss           |      0
 .../ext4/default/widgets/form/_htmleditor.scss     |      0
 .../ext4/default/widgets/form/_triggerfield.scss   |      0
 .../themes/templates/resources/sass/config.rb      |      0
 .../templates/resources/sass/my-ext-theme.scss     |      0
 {interface => html/admin}/favicon.ico              |    Bin
 {interface => html/admin}/images/eye-grey.png      |    Bin
 {interface => html/admin}/images/eye.png           |    Bin
 {interface => html/admin}/images/eye.xcf           |    Bin
 {interface => html/admin}/images/forbidden.png     |    Bin
 {interface => html/admin}/images/header.png        |    Bin
 .../admin}/images/icon/btn_border.png              |    Bin
 .../admin}/images/icon/btn_border_hover.png        |    Bin
 .../admin}/images/icon/chart_bar.png               |    Bin
 .../admin}/images/icon/chart_curve.png             |    Bin
 .../admin}/images/icon/chart_pie.png               |    Bin
 {interface => html/admin}/images/icon/clock.png    |    Bin
 {interface => html/admin}/images/icon/database.png |    Bin
 {interface => html/admin}/images/icon/ko.svg       |      0
 .../admin}/images/icon/libreoffice-extension.png   |    Bin
 .../admin}/images/icon/loading_white.gif           |    Bin
 {interface => html/admin}/images/icon/ok.svg       |      0
 {interface => html/admin}/images/icon/server.png   |    Bin
 .../admin}/images/icon/server_chart.png            |    Bin
 .../admin}/images/icon/status_online.png           |    Bin
 {interface => html/admin}/images/icon/user.png     |    Bin
 .../admin}/images/icon/user_edit.png               |    Bin
 {interface => html/admin}/images/istsos-logo.gif   |    Bin
 {interface => html/admin}/images/istsos-logo.png   |    Bin
 {interface => html/admin}/images/istsos-logo.xcf   |    Bin
 {interface => html/admin}/images/istsos.png        |    Bin
 .../menu/11971055981382663610sagar_ns_database.svg |      0
 {interface => html/admin}/images/menu/Icon-add.svg |      0
 .../admin}/images/menu/No_trash_icon.svg           |      0
 {interface => html/admin}/images/menu/World.svg    |      0
 {interface => html/admin}/images/menu/about.svg    |      0
 {interface => html/admin}/images/menu/about2.svg   |      0
 .../admin}/images/menu/about_grey.svg              |      0
 .../menu/about_grey.svg-path3848-4294966697.png    |    Bin
 .../admin}/images/menu/applications-internet.svg   |      0
 .../admin}/images/menu/applications-system.svg     |      0
 {interface => html/admin}/images/menu/boh.svg      |      0
 .../admin}/images/menu/call-start.svg              |      0
 html/admin/images/menu/close.svg                   |    233 +
 {interface => html/admin}/images/menu/contacts.svg |      0
 .../admin}/images/menu/coordinate.svg              |      0
 {interface => html/admin}/images/menu/database.svg |      0
 {interface => html/admin}/images/menu/delete.svg   |      0
 {interface => html/admin}/images/menu/delete2.svg  |      0
 .../admin}/images/menu/desktop-effects.svg         |      0
 .../admin}/images/menu/document-save.svg           |      0
 html/admin/images/menu/download.svg                |    260 +
 {interface => html/admin}/images/menu/editor.svg   |      0
 .../admin}/images/menu/emblem-shared.svg           |      0
 .../admin}/images/menu/emblem-system.svg           |      0
 .../menu/emblem-ubuntuone-unsynchronized.svg       |      0
 {interface => html/admin}/images/menu/getobs.svg   |      0
 .../admin}/images/menu/internet-radio-new.svg      |      0
 {interface => html/admin}/images/menu/list-add.svg |      0
 .../admin}/images/menu/media-eject.svg             |      0
 .../admin}/images/menu/media-playback-start.svg    |      0
 .../images/menu/network-transmit-receive.svg       |      0
 .../admin}/images/menu/new_service.svg             |      0
 .../admin}/images/menu/observedProperties.svg      |      0
 .../admin}/images/menu/offerings.svg               |      0
 {interface => html/admin}/images/menu/provider.svg |      0
 {interface => html/admin}/images/menu/proxy.svg    |      0
 {interface => html/admin}/images/menu/quality.svg  |      0
 .../admin}/images/menu/quality_index.svg           |      0
 .../admin}/images/menu/service_provider.svg        |      0
 .../admin}/images/menu/service_provider_light.svg  |      0
 .../admin}/images/menu/service_provider_light2.svg |      0
 {interface => html/admin}/images/menu/srvc_id.svg  |      0
 {interface => html/admin}/images/menu/status.svg   |      0
 {interface => html/admin}/images/menu/status_1.svg |      0
 .../admin}/images/menu/system-run.svg              |      0
 .../admin}/images/menu/system-run_old.svg          |      0
 {interface => html/admin}/images/menu/unit.svg     |      0
 .../admin}/images/menu/user-trash.svg              |      0
 .../images/menu/view-list-details-symbolic.svg     |      0
 .../images/menu/view-list-icons-symbolic.svg       |      0
 {interface => html/admin}/images/menu/virtual.svg  |      0
 html/admin/index.html                              |    469 +
 {interface => html/admin}/poster.html              |      0
 html/admin/viewer.html                             |    114 +
 .../admin/viewer}/describeSensor.xml               |      0
 .../admin/viewer}/getCapabilities.xml              |      0
 .../admin/viewer}/getFeatureOfInterest.xml         |      0
 .../admin/viewer}/getObservation.xml               |      0
 .../admin/viewer}/getObservation2.xml              |      0
 .../admin/viewer}/getObservation3.xml              |      0
 .../admin/viewer}/getfeatureOfinterestBBOX.xml     |      0
 .../admin/viewer}/getfeatureOfinterestId.xml       |      0
 .../insertObservation_dynamic_insitu_composite.xml |      0
 .../insertObservation_dynamic_insitu_simple.xml    |      0
 ...sertObservation_stationary_insitu_composite.xml |      0
 .../insertObservation_stationary_insitu_simple.xml |      0
 .../admin/viewer}/istSOS_post_xml_index.xml        |      0
 .../registerSensor_stationary_insitu_composite.xml |      0
 .../registerSensor_stationary_insitu_simple.xml    |      0
 html/modules/status/app.js                         | 128209 ++++++++++++++++++
 html/modules/status/app/style.css                  |    400 +
 html/modules/status/index.html                     |     13 +
 html/modules/status/resources/Readme.md            |      3 +
 .../btn-group/btn-group-default-framed-corners.gif |    Bin 0 -> 97 bytes
 .../btn-group-default-framed-notitle-corners.gif   |    Bin 0 -> 97 bytes
 .../btn-group-default-framed-notitle-sides.gif     |    Bin 0 -> 81 bytes
 .../btn-group/btn-group-default-framed-sides.gif   |    Bin 0 -> 85 bytes
 .../resources/images/btn/btn-default-large-bg.gif  |    Bin 0 -> 316 bytes
 .../images/btn/btn-default-large-corners.gif       |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-large-disabled-bg.gif   |    Bin 0 -> 316 bytes
 .../btn/btn-default-large-disabled-corners.gif     |    Bin 0 -> 187 bytes
 .../images/btn/btn-default-large-disabled-fbg.gif  |    Bin 0 -> 217 bytes
 .../btn/btn-default-large-disabled-sides.gif       |    Bin 0 -> 543 bytes
 .../resources/images/btn/btn-default-large-fbg.gif |    Bin 0 -> 217 bytes
 .../images/btn/btn-default-large-focus-bg.gif      |    Bin 0 -> 316 bytes
 .../images/btn/btn-default-large-focus-corners.gif |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-large-focus-fbg.gif     |    Bin 0 -> 217 bytes
 .../images/btn/btn-default-large-focus-sides.gif   |    Bin 0 -> 641 bytes
 .../images/btn/btn-default-large-over-bg.gif       |    Bin 0 -> 316 bytes
 .../images/btn/btn-default-large-over-corners.gif  |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-large-over-fbg.gif      |    Bin 0 -> 217 bytes
 .../images/btn/btn-default-large-over-sides.gif    |    Bin 0 -> 641 bytes
 .../images/btn/btn-default-large-pressed-bg.gif    |    Bin 0 -> 220 bytes
 .../btn/btn-default-large-pressed-corners.gif      |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-large-pressed-fbg.gif   |    Bin 0 -> 217 bytes
 .../images/btn/btn-default-large-pressed-sides.gif |    Bin 0 -> 540 bytes
 .../images/btn/btn-default-large-sides.gif         |    Bin 0 -> 543 bytes
 .../resources/images/btn/btn-default-medium-bg.gif |    Bin 0 -> 212 bytes
 .../images/btn/btn-default-medium-corners.gif      |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-medium-disabled-bg.gif  |    Bin 0 -> 212 bytes
 .../btn/btn-default-medium-disabled-corners.gif    |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-medium-disabled-fbg.gif |    Bin 0 -> 208 bytes
 .../btn/btn-default-medium-disabled-sides.gif      |    Bin 0 -> 513 bytes
 .../images/btn/btn-default-medium-fbg.gif          |    Bin 0 -> 208 bytes
 .../images/btn/btn-default-medium-focus-bg.gif     |    Bin 0 -> 212 bytes
 .../btn/btn-default-medium-focus-corners.gif       |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-medium-focus-fbg.gif    |    Bin 0 -> 208 bytes
 .../images/btn/btn-default-medium-focus-sides.gif  |    Bin 0 -> 510 bytes
 .../images/btn/btn-default-medium-over-bg.gif      |    Bin 0 -> 212 bytes
 .../images/btn/btn-default-medium-over-corners.gif |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-medium-over-fbg.gif     |    Bin 0 -> 208 bytes
 .../images/btn/btn-default-medium-over-sides.gif   |    Bin 0 -> 510 bytes
 .../images/btn/btn-default-medium-pressed-bg.gif   |    Bin 0 -> 212 bytes
 .../btn/btn-default-medium-pressed-corners.gif     |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-medium-pressed-fbg.gif  |    Bin 0 -> 208 bytes
 .../btn/btn-default-medium-pressed-sides.gif       |    Bin 0 -> 508 bytes
 .../images/btn/btn-default-medium-sides.gif        |    Bin 0 -> 513 bytes
 .../resources/images/btn/btn-default-small-bg.gif  |    Bin 0 -> 203 bytes
 .../images/btn/btn-default-small-corners.gif       |    Bin 0 -> 187 bytes
 .../images/btn/btn-default-small-disabled-bg.gif   |    Bin 0 -> 203 bytes
 .../btn/btn-default-small-disabled-corners.gif     |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-small-disabled-fbg.gif  |    Bin 0 -> 200 bytes
 .../btn/btn-default-small-disabled-sides.gif       |    Bin 0 -> 477 bytes
 .../resources/images/btn/btn-default-small-fbg.gif |    Bin 0 -> 200 bytes
 .../images/btn/btn-default-small-focus-bg.gif      |    Bin 0 -> 203 bytes
 .../images/btn/btn-default-small-focus-corners.gif |    Bin 0 -> 187 bytes
 .../images/btn/btn-default-small-focus-fbg.gif     |    Bin 0 -> 200 bytes
 .../images/btn/btn-default-small-focus-sides.gif   |    Bin 0 -> 477 bytes
 .../images/btn/btn-default-small-over-bg.gif       |    Bin 0 -> 203 bytes
 .../images/btn/btn-default-small-over-corners.gif  |    Bin 0 -> 187 bytes
 .../images/btn/btn-default-small-over-fbg.gif      |    Bin 0 -> 200 bytes
 .../images/btn/btn-default-small-over-sides.gif    |    Bin 0 -> 477 bytes
 .../images/btn/btn-default-small-pressed-bg.gif    |    Bin 0 -> 203 bytes
 .../btn/btn-default-small-pressed-corners.gif      |    Bin 0 -> 188 bytes
 .../images/btn/btn-default-small-pressed-fbg.gif   |    Bin 0 -> 200 bytes
 .../images/btn/btn-default-small-pressed-sides.gif |    Bin 0 -> 475 bytes
 .../images/btn/btn-default-small-sides.gif         |    Bin 0 -> 477 bytes
 .../images/btn/btn-default-toolbar-large-bg.gif    |    Bin 0 -> 159 bytes
 .../btn/btn-default-toolbar-large-corners.gif      |    Bin 0 -> 135 bytes
 .../btn/btn-default-toolbar-large-disabled-bg.gif  |    Bin 0 -> 159 bytes
 .../btn-default-toolbar-large-disabled-corners.gif |    Bin 0 -> 135 bytes
 .../btn/btn-default-toolbar-large-disabled-fbg.gif |    Bin 0 -> 159 bytes
 .../btn-default-toolbar-large-disabled-sides.gif   |    Bin 0 -> 445 bytes
 .../images/btn/btn-default-toolbar-large-fbg.gif   |    Bin 0 -> 159 bytes
 .../btn/btn-default-toolbar-large-focus-bg.gif     |    Bin 0 -> 162 bytes
 .../btn-default-toolbar-large-focus-corners.gif    |    Bin 0 -> 135 bytes
 .../btn/btn-default-toolbar-large-focus-fbg.gif    |    Bin 0 -> 161 bytes
 .../btn/btn-default-toolbar-large-focus-sides.gif  |    Bin 0 -> 456 bytes
 .../btn/btn-default-toolbar-large-over-bg.gif      |    Bin 0 -> 162 bytes
 .../btn/btn-default-toolbar-large-over-corners.gif |    Bin 0 -> 135 bytes
 .../btn/btn-default-toolbar-large-over-fbg.gif     |    Bin 0 -> 161 bytes
 .../btn/btn-default-toolbar-large-over-sides.gif   |    Bin 0 -> 456 bytes
 .../btn/btn-default-toolbar-large-pressed-bg.gif   |    Bin 0 -> 162 bytes
 .../btn-default-toolbar-large-pressed-corners.gif  |    Bin 0 -> 104 bytes
 .../btn/btn-default-toolbar-large-pressed-fbg.gif  |    Bin 0 -> 160 bytes
 .../btn-default-toolbar-large-pressed-sides.gif    |    Bin 0 -> 445 bytes
 .../images/btn/btn-default-toolbar-large-sides.gif |    Bin 0 -> 445 bytes
 .../images/btn/btn-default-toolbar-medium-bg.gif   |    Bin 0 -> 155 bytes
 .../btn/btn-default-toolbar-medium-corners.gif     |    Bin 0 -> 134 bytes
 .../btn/btn-default-toolbar-medium-disabled-bg.gif |    Bin 0 -> 155 bytes
 ...btn-default-toolbar-medium-disabled-corners.gif |    Bin 0 -> 134 bytes
 .../btn-default-toolbar-medium-disabled-fbg.gif    |    Bin 0 -> 153 bytes
 .../btn-default-toolbar-medium-disabled-sides.gif  |    Bin 0 -> 427 bytes
 .../images/btn/btn-default-toolbar-medium-fbg.gif  |    Bin 0 -> 153 bytes
 .../btn/btn-default-toolbar-medium-focus-bg.gif    |    Bin 0 -> 159 bytes
 .../btn-default-toolbar-medium-focus-corners.gif   |    Bin 0 -> 133 bytes
 .../btn/btn-default-toolbar-medium-focus-fbg.gif   |    Bin 0 -> 154 bytes
 .../btn/btn-default-toolbar-medium-focus-sides.gif |    Bin 0 -> 429 bytes
 .../btn/btn-default-toolbar-medium-over-bg.gif     |    Bin 0 -> 159 bytes
 .../btn-default-toolbar-medium-over-corners.gif    |    Bin 0 -> 133 bytes
 .../btn/btn-default-toolbar-medium-over-fbg.gif    |    Bin 0 -> 154 bytes
 .../btn/btn-default-toolbar-medium-over-sides.gif  |    Bin 0 -> 429 bytes
 .../btn/btn-default-toolbar-medium-pressed-bg.gif  |    Bin 0 -> 158 bytes
 .../btn-default-toolbar-medium-pressed-corners.gif |    Bin 0 -> 130 bytes
 .../btn/btn-default-toolbar-medium-pressed-fbg.gif |    Bin 0 -> 155 bytes
 .../btn-default-toolbar-medium-pressed-sides.gif   |    Bin 0 -> 426 bytes
 .../btn/btn-default-toolbar-medium-sides.gif       |    Bin 0 -> 427 bytes
 .../images/btn/btn-default-toolbar-small-bg.gif    |    Bin 0 -> 151 bytes
 .../btn/btn-default-toolbar-small-corners.gif      |    Bin 0 -> 134 bytes
 .../btn/btn-default-toolbar-small-disabled-bg.gif  |    Bin 0 -> 151 bytes
 .../btn-default-toolbar-small-disabled-corners.gif |    Bin 0 -> 134 bytes
 .../btn/btn-default-toolbar-small-disabled-fbg.gif |    Bin 0 -> 149 bytes
 .../btn-default-toolbar-small-disabled-sides.gif   |    Bin 0 -> 407 bytes
 .../images/btn/btn-default-toolbar-small-fbg.gif   |    Bin 0 -> 149 bytes
 .../btn/btn-default-toolbar-small-focus-bg.gif     |    Bin 0 -> 153 bytes
 .../btn-default-toolbar-small-focus-corners.gif    |    Bin 0 -> 133 bytes
 .../btn/btn-default-toolbar-small-focus-fbg.gif    |    Bin 0 -> 150 bytes
 .../btn/btn-default-toolbar-small-focus-sides.gif  |    Bin 0 -> 411 bytes
 .../btn/btn-default-toolbar-small-over-bg.gif      |    Bin 0 -> 153 bytes
 .../btn/btn-default-toolbar-small-over-corners.gif |    Bin 0 -> 133 bytes
 .../btn/btn-default-toolbar-small-over-fbg.gif     |    Bin 0 -> 150 bytes
 .../btn/btn-default-toolbar-small-over-sides.gif   |    Bin 0 -> 411 bytes
 .../btn/btn-default-toolbar-small-pressed-bg.gif   |    Bin 0 -> 152 bytes
 .../btn-default-toolbar-small-pressed-corners.gif  |    Bin 0 -> 130 bytes
 .../btn/btn-default-toolbar-small-pressed-fbg.gif  |    Bin 0 -> 150 bytes
 .../btn-default-toolbar-small-pressed-sides.gif    |    Bin 0 -> 407 bytes
 .../images/btn/btn-default-toolbar-small-sides.gif |    Bin 0 -> 407 bytes
 .../images/button/default-large-arrow-rtl.png      |    Bin 0 -> 184 bytes
 .../images/button/default-large-arrow.png          |    Bin 0 -> 247 bytes
 .../images/button/default-large-s-arrow-b-rtl.png  |    Bin 0 -> 241 bytes
 .../images/button/default-large-s-arrow-b.png      |    Bin 0 -> 285 bytes
 .../images/button/default-large-s-arrow-rtl.png    |    Bin 0 -> 254 bytes
 .../images/button/default-large-s-arrow.png        |    Bin 0 -> 348 bytes
 .../images/button/default-medium-arrow-rtl.png     |    Bin 0 -> 153 bytes
 .../images/button/default-medium-arrow.png         |    Bin 0 -> 220 bytes
 .../images/button/default-medium-s-arrow-b-rtl.png |    Bin 0 -> 211 bytes
 .../images/button/default-medium-s-arrow-b.png     |    Bin 0 -> 261 bytes
 .../images/button/default-medium-s-arrow-rtl.png   |    Bin 0 -> 220 bytes
 .../images/button/default-medium-s-arrow.png       |    Bin 0 -> 308 bytes
 .../images/button/default-small-arrow-rtl.png      |    Bin 0 -> 120 bytes
 .../images/button/default-small-arrow.png          |    Bin 0 -> 173 bytes
 .../images/button/default-small-s-arrow-b-rtl.png  |    Bin 0 -> 173 bytes
 .../images/button/default-small-s-arrow-b.png      |    Bin 0 -> 1121 bytes
 .../images/button/default-small-s-arrow-rtl.png    |    Bin 0 -> 166 bytes
 .../images/button/default-small-s-arrow.png        |    Bin 0 -> 1106 bytes
 .../button/default-toolbar-large-arrow-rtl.png     |    Bin 0 -> 186 bytes
 .../images/button/default-toolbar-large-arrow.png  |    Bin 0 -> 290 bytes
 .../button/default-toolbar-large-s-arrow-b-rtl.png |    Bin 0 -> 240 bytes
 .../button/default-toolbar-large-s-arrow-b.png     |    Bin 0 -> 336 bytes
 .../button/default-toolbar-large-s-arrow-rtl.png   |    Bin 0 -> 253 bytes
 .../button/default-toolbar-large-s-arrow.png       |    Bin 0 -> 340 bytes
 .../button/default-toolbar-medium-arrow-rtl.png    |    Bin 0 -> 154 bytes
 .../images/button/default-toolbar-medium-arrow.png |    Bin 0 -> 252 bytes
 .../default-toolbar-medium-s-arrow-b-rtl.png       |    Bin 0 -> 209 bytes
 .../button/default-toolbar-medium-s-arrow-b.png    |    Bin 0 -> 291 bytes
 .../button/default-toolbar-medium-s-arrow-rtl.png  |    Bin 0 -> 259 bytes
 .../button/default-toolbar-medium-s-arrow.png      |    Bin 0 -> 361 bytes
 .../button/default-toolbar-small-arrow-rtl.png     |    Bin 0 -> 122 bytes
 .../images/button/default-toolbar-small-arrow.png  |    Bin 0 -> 199 bytes
 .../button/default-toolbar-small-s-arrow-b-rtl.png |    Bin 0 -> 193 bytes
 .../button/default-toolbar-small-s-arrow-b.png     |    Bin 0 -> 252 bytes
 .../button/default-toolbar-small-s-arrow-rtl.png   |    Bin 0 -> 176 bytes
 .../button/default-toolbar-small-s-arrow.png       |    Bin 0 -> 234 bytes
 .../button/plain-toolbar-large-arrow-rtl.png       |    Bin 0 -> 186 bytes
 .../images/button/plain-toolbar-large-arrow.png    |    Bin 0 -> 290 bytes
 .../button/plain-toolbar-large-s-arrow-b-rtl.png   |    Bin 0 -> 240 bytes
 .../button/plain-toolbar-large-s-arrow-b.png       |    Bin 0 -> 336 bytes
 .../button/plain-toolbar-large-s-arrow-rtl.png     |    Bin 0 -> 253 bytes
 .../images/button/plain-toolbar-large-s-arrow.png  |    Bin 0 -> 340 bytes
 .../button/plain-toolbar-medium-arrow-rtl.png      |    Bin 0 -> 154 bytes
 .../images/button/plain-toolbar-medium-arrow.png   |    Bin 0 -> 252 bytes
 .../button/plain-toolbar-medium-s-arrow-b-rtl.png  |    Bin 0 -> 209 bytes
 .../button/plain-toolbar-medium-s-arrow-b.png      |    Bin 0 -> 291 bytes
 .../button/plain-toolbar-medium-s-arrow-rtl.png    |    Bin 0 -> 259 bytes
 .../images/button/plain-toolbar-medium-s-arrow.png |    Bin 0 -> 361 bytes
 .../button/plain-toolbar-small-arrow-rtl.png       |    Bin 0 -> 122 bytes
 .../images/button/plain-toolbar-small-arrow.png    |    Bin 0 -> 199 bytes
 .../button/plain-toolbar-small-s-arrow-b-rtl.png   |    Bin 0 -> 193 bytes
 .../button/plain-toolbar-small-s-arrow-b.png       |    Bin 0 -> 252 bytes
 .../button/plain-toolbar-small-s-arrow-rtl.png     |    Bin 0 -> 176 bytes
 .../images/button/plain-toolbar-small-s-arrow.png  |    Bin 0 -> 234 bytes
 .../resources/images/datepicker/arrow-left.png     |    Bin 0 -> 1065 bytes
 .../resources/images/datepicker/arrow-right.png    |    Bin 0 -> 1065 bytes
 .../resources/images/datepicker/month-arrow.png    |    Bin 0 -> 975 bytes
 .../status/resources/images/dd/drop-add.png        |    Bin 0 -> 1325 bytes
 .../modules/status/resources/images/dd/drop-no.png |    Bin 0 -> 1277 bytes
 .../status/resources/images/dd/drop-yes.png        |    Bin 0 -> 1325 bytes
 .../status/resources/images/editor/tb-sprite.png   |    Bin 0 -> 2487 bytes
 .../resources/images/fieldset/collapse-tool.png    |    Bin 0 -> 332 bytes
 .../status/resources/images/form/checkbox.png      |    Bin 0 -> 1826 bytes
 .../resources/images/form/clear-trigger-rtl.png    |    Bin 0 -> 1718 bytes
 .../status/resources/images/form/clear-trigger.png |    Bin 0 -> 1718 bytes
 .../resources/images/form/date-trigger-rtl.png     |    Bin 0 -> 1257 bytes
 .../status/resources/images/form/date-trigger.png  |    Bin 0 -> 1257 bytes
 .../status/resources/images/form/exclamation.png   |    Bin 0 -> 1190 bytes
 .../modules/status/resources/images/form/radio.png |    Bin 0 -> 2434 bytes
 .../resources/images/form/search-trigger-rtl.png   |    Bin 0 -> 1624 bytes
 .../resources/images/form/search-trigger.png       |    Bin 0 -> 1624 bytes
 .../status/resources/images/form/spinner-rtl.png   |    Bin 0 -> 1304 bytes
 .../status/resources/images/form/spinner.png       |    Bin 0 -> 1304 bytes
 .../status/resources/images/form/trigger-rtl.png   |    Bin 0 -> 1137 bytes
 .../status/resources/images/form/trigger.png       |    Bin 0 -> 1137 bytes
 ...d-row-editor-buttons-default-bottom-corners.gif |    Bin 0 -> 158 bytes
 ...rid-row-editor-buttons-default-bottom-sides.gif |    Bin 0 -> 105 bytes
 ...grid-row-editor-buttons-default-top-corners.gif |    Bin 0 -> 154 bytes
 .../grid-row-editor-buttons-default-top-sides.gif  |    Bin 0 -> 105 bytes
 .../resources/images/grid/col-move-bottom.png      |    Bin 0 -> 1222 bytes
 .../status/resources/images/grid/col-move-top.png  |    Bin 0 -> 1222 bytes
 .../status/resources/images/grid/columns.png       |    Bin 0 -> 1110 bytes
 .../resources/images/grid/dd-insert-arrow-left.png |    Bin 0 -> 1044 bytes
 .../images/grid/dd-insert-arrow-right.png          |    Bin 0 -> 1049 bytes
 .../status/resources/images/grid/dirty-rtl.png     |    Bin 0 -> 972 bytes
 .../modules/status/resources/images/grid/dirty.png |    Bin 0 -> 972 bytes
 .../status/resources/images/grid/drop-no.png       |    Bin 0 -> 1277 bytes
 .../status/resources/images/grid/drop-yes.png      |    Bin 0 -> 1325 bytes
 .../status/resources/images/grid/group-by.png      |    Bin 0 -> 1069 bytes
 .../resources/images/grid/group-collapse.png       |    Bin 0 -> 216 bytes
 .../resources/images/grid/group-expand-sprite.png  |    Bin 0 -> 1094 bytes
 .../status/resources/images/grid/group-expand.png  |    Bin 0 -> 228 bytes
 .../status/resources/images/grid/hd-pop.png        |    Bin 0 -> 196 bytes
 .../status/resources/images/grid/hmenu-asc.png     |    Bin 0 -> 1007 bytes
 .../status/resources/images/grid/hmenu-desc.png    |    Bin 0 -> 1007 bytes
 .../status/resources/images/grid/hmenu-lock.png    |    Bin 0 -> 1091 bytes
 .../status/resources/images/grid/hmenu-unlock.png  |    Bin 0 -> 1078 bytes
 .../status/resources/images/grid/loading.gif       |    Bin 0 -> 1849 bytes
 .../status/resources/images/grid/page-first.png    |    Bin 0 -> 1134 bytes
 .../status/resources/images/grid/page-last.png     |    Bin 0 -> 1140 bytes
 .../status/resources/images/grid/page-next.png     |    Bin 0 -> 1122 bytes
 .../status/resources/images/grid/page-prev.png     |    Bin 0 -> 1118 bytes
 .../status/resources/images/grid/pick-button.png   |    Bin 0 -> 1126 bytes
 .../status/resources/images/grid/refresh.png       |    Bin 0 -> 1238 bytes
 .../status/resources/images/grid/sort_asc.png      |    Bin 0 -> 1007 bytes
 .../status/resources/images/grid/sort_desc.png     |    Bin 0 -> 1007 bytes
 .../status/resources}/images/istsos-logo.png       |    Bin
 .../status/resources/images/loadingwheel.gif       |    Bin 0 -> 196882 bytes
 .../status/resources/images/loadmask/loading.gif   |    Bin 0 -> 1849 bytes
 .../status/resources/images/menu/checked.png       |    Bin 0 -> 1280 bytes
 .../status/resources/images/menu/group-checked.png |    Bin 0 -> 1073 bytes
 .../resources/images/menu/menu-item-active-bg.gif  |    Bin 0 -> 52 bytes
 .../resources/images/menu/menu-parent-left.png     |    Bin 0 -> 1007 bytes
 .../status/resources/images/menu/menu-parent.png   |    Bin 0 -> 1012 bytes
 .../status/resources/images/menu/scroll-bottom.png |    Bin 0 -> 1119 bytes
 .../status/resources/images/menu/scroll-top.png    |    Bin 0 -> 1109 bytes
 .../status/resources/images/menu/unchecked.png     |    Bin 0 -> 1090 bytes
 .../panel-header-default-framed-bottom-corners.gif |    Bin 0 -> 127 bytes
 .../panel-header-default-framed-bottom-sides.gif   |    Bin 0 -> 70 bytes
 ...der-default-framed-collapsed-bottom-corners.gif |    Bin 0 -> 198 bytes
 ...eader-default-framed-collapsed-bottom-sides.gif |    Bin 0 -> 70 bytes
 ...r-default-framed-collapsed-left-corners-rtl.gif |    Bin 0 -> 197 bytes
 ...eader-default-framed-collapsed-left-corners.gif |    Bin 0 -> 198 bytes
 ...-header-default-framed-collapsed-left-sides.gif |    Bin 0 -> 113 bytes
 ...-default-framed-collapsed-right-corners-rtl.gif |    Bin 0 -> 197 bytes
 ...ader-default-framed-collapsed-right-corners.gif |    Bin 0 -> 198 bytes
 ...header-default-framed-collapsed-right-sides.gif |    Bin 0 -> 113 bytes
 ...header-default-framed-collapsed-top-corners.gif |    Bin 0 -> 198 bytes
 ...l-header-default-framed-collapsed-top-sides.gif |    Bin 0 -> 70 bytes
 ...anel-header-default-framed-left-corners-rtl.gif |    Bin 0 -> 127 bytes
 .../panel-header-default-framed-left-corners.gif   |    Bin 0 -> 130 bytes
 .../panel-header-default-framed-left-sides.gif     |    Bin 0 -> 113 bytes
 ...nel-header-default-framed-right-corners-rtl.gif |    Bin 0 -> 130 bytes
 .../panel-header-default-framed-right-corners.gif  |    Bin 0 -> 127 bytes
 .../panel-header-default-framed-right-sides.gif    |    Bin 0 -> 113 bytes
 .../panel-header-default-framed-top-corners.gif    |    Bin 0 -> 130 bytes
 .../panel-header-default-framed-top-sides.gif      |    Bin 0 -> 70 bytes
 .../images/panel/panel-default-framed-corners.gif  |    Bin 0 -> 198 bytes
 .../images/panel/panel-default-framed-sides.gif    |    Bin 0 -> 64 bytes
 .../status/resources/images/shared/icon-error.png  |    Bin 0 -> 2272 bytes
 .../status/resources/images/shared/icon-info.png   |    Bin 0 -> 1541 bytes
 .../resources/images/shared/icon-question.png      |    Bin 0 -> 1668 bytes
 .../resources/images/shared/icon-warning.png       |    Bin 0 -> 1967 bytes
 .../status/resources/images/sizer/e-handle.png     |    Bin 0 -> 946 bytes
 .../status/resources/images/sizer/ne-handle.png    |    Bin 0 -> 951 bytes
 .../status/resources/images/sizer/nw-handle.png    |    Bin 0 -> 950 bytes
 .../status/resources/images/sizer/s-handle.png     |    Bin 0 -> 939 bytes
 .../status/resources/images/sizer/se-handle.png    |    Bin 0 -> 953 bytes
 .../status/resources/images/sizer/sw-handle.png    |    Bin 0 -> 950 bytes
 .../status/resources/images/slider/slider-bg.png   |    Bin 0 -> 465 bytes
 .../resources/images/slider/slider-thumb.png       |    Bin 0 -> 2159 bytes
 .../status/resources/images/slider/slider-v-bg.png |    Bin 0 -> 464 bytes
 .../resources/images/slider/slider-v-thumb.png     |    Bin 0 -> 2159 bytes
 .../modules/status/resources/images}/status_1.svg  |      0
 .../images/tab-bar/default-plain-scroll-bottom.png |    Bin 0 -> 348 bytes
 .../images/tab-bar/default-plain-scroll-left.png   |    Bin 0 -> 360 bytes
 .../images/tab-bar/default-plain-scroll-right.png  |    Bin 0 -> 351 bytes
 .../images/tab-bar/default-plain-scroll-top.png    |    Bin 0 -> 344 bytes
 .../images/tab-bar/default-scroll-bottom.png       |    Bin 0 -> 262 bytes
 .../images/tab-bar/default-scroll-left.png         |    Bin 0 -> 253 bytes
 .../images/tab-bar/default-scroll-right.png        |    Bin 0 -> 246 bytes
 .../images/tab-bar/default-scroll-top.png          |    Bin 0 -> 249 bytes
 .../tab/tab-default-bottom-active-corners.gif      |    Bin 0 -> 110 bytes
 .../images/tab/tab-default-bottom-active-sides.gif |    Bin 0 -> 63 bytes
 .../images/tab/tab-default-bottom-corners.gif      |    Bin 0 -> 110 bytes
 .../tab/tab-default-bottom-disabled-corners.gif    |    Bin 0 -> 110 bytes
 .../tab/tab-default-bottom-disabled-sides.gif      |    Bin 0 -> 63 bytes
 .../images/tab/tab-default-bottom-over-corners.gif |    Bin 0 -> 110 bytes
 .../images/tab/tab-default-bottom-over-sides.gif   |    Bin 0 -> 63 bytes
 .../images/tab/tab-default-bottom-sides.gif        |    Bin 0 -> 63 bytes
 .../resources/images/tab/tab-default-close.png     |    Bin 0 -> 1388 bytes
 .../images/tab/tab-default-top-active-corners.gif  |    Bin 0 -> 88 bytes
 .../images/tab/tab-default-top-active-sides.gif    |    Bin 0 -> 63 bytes
 .../images/tab/tab-default-top-corners.gif         |    Bin 0 -> 88 bytes
 .../tab/tab-default-top-disabled-corners.gif       |    Bin 0 -> 113 bytes
 .../images/tab/tab-default-top-disabled-sides.gif  |    Bin 0 -> 63 bytes
 .../images/tab/tab-default-top-over-corners.gif    |    Bin 0 -> 113 bytes
 .../images/tab/tab-default-top-over-sides.gif      |    Bin 0 -> 63 bytes
 .../resources/images/tab/tab-default-top-sides.gif |    Bin 0 -> 63 bytes
 .../resources/images/tip/tip-default-corners.gif   |    Bin 0 -> 131 bytes
 .../resources/images/tip/tip-default-sides.gif     |    Bin 0 -> 99 bytes
 .../images/tip/tip-form-invalid-corners.gif        |    Bin 0 -> 131 bytes
 .../images/tip/tip-form-invalid-sides.gif          |    Bin 0 -> 99 bytes
 .../status/resources/images/toolbar/more.png       |    Bin 0 -> 972 bytes
 .../resources/images/toolbar/scroll-left.png       |    Bin 0 -> 2990 bytes
 .../resources/images/toolbar/scroll-right.png      |    Bin 0 -> 2983 bytes
 .../resources/images/tools/tool-sprites-dark.png   |    Bin 0 -> 4266 bytes
 .../status/resources/images/tools/tool-sprites.png |    Bin 0 -> 3642 bytes
 .../status/resources/images/tree/arrows-rtl.png    |    Bin 0 -> 1142 bytes
 .../status/resources/images/tree/arrows.png        |    Bin 0 -> 491 bytes
 .../status/resources/images/tree/drop-above.png    |    Bin 0 -> 1203 bytes
 .../status/resources/images/tree}/drop-add.gif     |    Bin
 .../status/resources/images/tree/drop-append.png   |    Bin 0 -> 1203 bytes
 .../status/resources/images/tree/drop-below.png    |    Bin 0 -> 1203 bytes
 .../status/resources/images/tree/drop-between.png  |    Bin 0 -> 1203 bytes
 .../status/resources/images}/tree/drop-no.gif      |    Bin
 .../status/resources/images}/tree/drop-over.gif    |    Bin
 .../status/resources/images}/tree/drop-under.gif   |    Bin
 .../status/resources/images/tree}/drop-yes.gif     |    Bin
 .../resources/images/tree/elbow-end-minus-rtl.png  |    Bin 0 -> 1058 bytes
 .../resources/images/tree/elbow-end-minus.png      |    Bin 0 -> 1059 bytes
 .../resources/images/tree/elbow-end-plus-rtl.png   |    Bin 0 -> 1090 bytes
 .../resources/images/tree/elbow-end-plus.png       |    Bin 0 -> 129 bytes
 .../status/resources/images/tree/elbow-end-rtl.png |    Bin 0 -> 971 bytes
 .../status/resources/images/tree/elbow-end.png     |    Bin 0 -> 1025 bytes
 .../resources/images/tree/elbow-line-rtl.png       |    Bin 0 -> 963 bytes
 .../status/resources/images/tree/elbow-line.png    |    Bin 0 -> 72 bytes
 .../resources/images/tree/elbow-minus-nl-rtl.png   |    Bin 0 -> 1031 bytes
 .../resources/images/tree/elbow-minus-nl.png       |    Bin 0 -> 1040 bytes
 .../resources/images/tree/elbow-minus-rtl.png      |    Bin 0 -> 131 bytes
 .../status/resources/images/tree/elbow-minus.png   |    Bin 0 -> 1056 bytes
 .../resources/images/tree/elbow-plus-nl-rtl.png    |    Bin 0 -> 1060 bytes
 .../status/resources/images/tree/elbow-plus-nl.png |    Bin 0 -> 119 bytes
 .../resources/images/tree/elbow-plus-rtl.png       |    Bin 0 -> 1069 bytes
 .../status/resources/images/tree/elbow-plus.png    |    Bin 0 -> 1071 bytes
 .../status/resources/images/tree/elbow-rtl.png     |    Bin 0 -> 74 bytes
 .../modules/status/resources/images/tree/elbow.png |    Bin 0 -> 966 bytes
 .../resources/images/tree/folder-open-rtl.png      |    Bin 0 -> 995 bytes
 .../status/resources/images/tree/folder-open.png   |    Bin 0 -> 1011 bytes
 .../status/resources/images/tree/folder-rtl.png    |    Bin 0 -> 981 bytes
 .../status/resources/images/tree/folder.png        |    Bin 0 -> 978 bytes
 .../status/resources/images/tree/leaf-rtl.png      |    Bin 0 -> 1014 bytes
 html/modules/status/resources/images/tree/leaf.png |    Bin 0 -> 1014 bytes
 .../status/resources/images/tree/loading.png       |    Bin 0 -> 1849 bytes
 .../resources/images/util/splitter/mini-bottom.png |    Bin 0 -> 456 bytes
 .../resources/images/util/splitter/mini-left.png   |    Bin 0 -> 434 bytes
 .../resources/images/util/splitter/mini-right.png  |    Bin 0 -> 442 bytes
 .../resources/images/util/splitter/mini-top.png    |    Bin 0 -> 430 bytes
 .../window-header-default-bottom-corners.gif       |    Bin 0 -> 124 bytes
 .../window-header-default-bottom-sides.gif         |    Bin 0 -> 70 bytes
 ...dow-header-default-collapsed-bottom-corners.gif |    Bin 0 -> 198 bytes
 ...indow-header-default-collapsed-bottom-sides.gif |    Bin 0 -> 70 bytes
 ...w-header-default-collapsed-left-corners-rtl.gif |    Bin 0 -> 197 bytes
 ...indow-header-default-collapsed-left-corners.gif |    Bin 0 -> 198 bytes
 .../window-header-default-collapsed-left-sides.gif |    Bin 0 -> 113 bytes
 ...-header-default-collapsed-right-corners-rtl.gif |    Bin 0 -> 146 bytes
 ...ndow-header-default-collapsed-right-corners.gif |    Bin 0 -> 146 bytes
 ...window-header-default-collapsed-right-sides.gif |    Bin 0 -> 113 bytes
 ...window-header-default-collapsed-top-corners.gif |    Bin 0 -> 198 bytes
 .../window-header-default-collapsed-top-sides.gif  |    Bin 0 -> 70 bytes
 .../window-header-default-left-corners-rtl.gif     |    Bin 0 -> 127 bytes
 .../window-header-default-left-corners.gif         |    Bin 0 -> 130 bytes
 .../window-header-default-left-sides.gif           |    Bin 0 -> 113 bytes
 .../window-header-default-right-corners-rtl.gif    |    Bin 0 -> 125 bytes
 .../window-header-default-right-corners.gif        |    Bin 0 -> 124 bytes
 .../window-header-default-right-sides.gif          |    Bin 0 -> 113 bytes
 .../window-header-default-top-corners.gif          |    Bin 0 -> 130 bytes
 .../window-header-default-top-sides.gif            |    Bin 0 -> 70 bytes
 .../images/window/window-default-corners.gif       |    Bin 0 -> 198 bytes
 .../images/window/window-default-sides.gif         |    Bin 0 -> 113 bytes
 html/modules/status/resources/istsosStatus-all.css |  17543 +++
 interface/app/Procedure.js                         |   1371 -
 interface/app/store/Constraint.js                  |     61 -
 interface/app/store/DataQualityStore.js            |     41 -
 interface/app/store/Fake.js                        |     42 -
 interface/app/store/MyArrayStore.js                |     30 -
 interface/app/store/Observations.js                |     43 -
 interface/app/store/ObservedProperties.js          |     50 -
 interface/app/store/Offerings.js                   |     43 -
 interface/app/store/Procedures.js                  |     42 -
 interface/app/store/RatingCurve.js                 |     63 -
 interface/app/store/Services.js                    |     42 -
 interface/app/store/cmbDocumentFormat.js           |     42 -
 interface/app/store/cmbIdentification.js           |     42 -
 interface/app/store/cmbName.js                     |     38 -
 interface/app/store/cmbNameDescription.js          |     42 -
 interface/app/store/cmbSml.js                      |     54 -
 interface/app/store/cmbSystemType.js               |     39 -
 interface/app/store/gridDocumentation.js           |     49 -
 interface/app/store/gridObservedProperties.js      |     54 -
 interface/app/store/gridOfferings.js               |     55 -
 interface/app/store/gridOutputs.js                 |     71 -
 interface/app/store/gridProceduresList.js          |     57 -
 interface/app/store/gridUoms.js                    |     46 -
 interface/app/store/serverstatus.js                |     86 -
 interface/app/store/vplist.js                      |     44 -
 interface/app/view/MainMenu2.js                    |    306 -
 interface/app/view/ProcedureChart.js               |    650 -
 interface/app/view/ProcedureChooser.js             |    287 -
 interface/app/view/ProcedureGrid.js                |    510 -
 interface/app/view/proceduresList.js               |    146 -
 interface/app/view/ui/BasePage.js                  |     62 -
 interface/app/view/ui/Calc.js                      |    335 -
 interface/app/view/ui/Chart.js                     |    260 -
 interface/app/view/ui/ChartContainer.js            |     37 -
 interface/app/view/ui/CheckColumn.js               |     23 -
 interface/app/view/ui/Editor1.js                   |     75 -
 interface/app/view/ui/FormDataQuality.js           |     99 -
 interface/app/view/ui/MainMenu2.js                 |    112 -
 interface/app/view/ui/MainPanel.js                 |    149 -
 interface/app/view/ui/ObservationEditor.js         |    213 -
 .../view/ui/ObservationEditorAdvancedOperations.js |     40 -
 interface/app/view/ui/ObservationEditorColumn.js   |     56 -
 interface/app/view/ui/ProcedureChart.js            |    197 -
 interface/app/view/ui/ProcedureChooser.js          |     98 -
 interface/app/view/ui/ProcedureGrid.js             |     26 -
 interface/app/view/ui/ProcedureGridEditor.js       |     98 -
 interface/app/view/ui/ProcedurePlotter.js          |    115 -
 interface/app/view/ui/TestCsv.js                   |    123 -
 interface/app/view/ui/Viewer.js                    |     96 -
 interface/app/view/ui/VirtualProcedureEditor.js    |    342 -
 interface/app/view/ui/about.js                     |     73 -
 interface/app/view/ui/config.js                    |    117 -
 interface/app/view/ui/contactinfo.js               |    114 -
 interface/app/view/ui/contacts.js                  |     94 -
 interface/app/view/ui/database.js                  |     97 -
 interface/app/view/ui/geo.js                       |     77 -
 interface/app/view/ui/getobservation.js            |     43 -
 interface/app/view/ui/identification.js            |     88 -
 interface/app/view/ui/newservice.js                |    134 -
 interface/app/view/ui/obsPropEditor.js             |    201 -
 interface/app/view/ui/offeringsEditor.js           |    305 -
 interface/app/view/ui/paths.js                     |     43 -
 interface/app/view/ui/procedure.js                 |   1421 -
 interface/app/view/ui/proceduresList.js            |     82 -
 interface/app/view/ui/provider.js                  |    118 -
 interface/app/view/ui/qualityindexEditor.js        |    132 -
 interface/app/view/ui/serviceEditor.js             |    112 -
 interface/app/view/ui/serviceconfig.js             |    286 -
 interface/app/view/ui/serviceurl.js                |     45 -
 interface/app/view/ui/status.js                    |    110 -
 interface/app/view/ui/uomsEditor.js                |    125 -
 interface/css/main.css                             |    636 -
 interface/designer.html                            |     14 -
 interface/designer.js                              |    191 -
 interface/designer_includeOrder.txt                |    106 -
 interface/dev.html                                 |    223 -
 .../resources/themes/images/access/box/tb-blue.gif |    Bin 843 -> 0 bytes
 .../btn-group/btn-group-default-framed-corners.gif |    Bin 1594 -> 0 bytes
 .../btn-group-default-framed-notitle-corners.gif   |    Bin 1594 -> 0 bytes
 .../btn-group-default-framed-notitle-sides.gif     |    Bin 1625 -> 0 bytes
 .../btn-group/btn-group-default-framed-sides.gif   |    Bin 1633 -> 0 bytes
 .../access/btn-group/btn-group-framed-corners.gif  |    Bin 1627 -> 0 bytes
 .../btn-group/btn-group-framed-notitle-corners.gif |    Bin 1624 -> 0 bytes
 .../btn-group/btn-group-framed-notitle-sides.gif   |    Bin 1651 -> 0 bytes
 .../access/btn-group/btn-group-framed-sides.gif    |    Bin 1687 -> 0 bytes
 .../images/access/btn/btn-default-large-bg.gif     |    Bin 1854 -> 0 bytes
 .../access/btn/btn-default-large-corners.gif       |    Bin 1615 -> 0 bytes
 .../access/btn/btn-default-large-disabled-bg.gif   |    Bin 1825 -> 0 bytes
 .../btn/btn-default-large-disabled-corners.gif     |    Bin 1616 -> 0 bytes
 .../btn/btn-default-large-disabled-sides.gif       |    Bin 1923 -> 0 bytes
 .../access/btn/btn-default-large-focus-bg.gif      |    Bin 1868 -> 0 bytes
 .../access/btn/btn-default-large-focus-corners.gif |    Bin 1623 -> 0 bytes
 .../access/btn/btn-default-large-focus-sides.gif   |    Bin 1952 -> 0 bytes
 .../access/btn/btn-default-large-over-bg.gif       |    Bin 1868 -> 0 bytes
 .../access/btn/btn-default-large-over-corners.gif  |    Bin 1623 -> 0 bytes
 .../access/btn/btn-default-large-over-sides.gif    |    Bin 1952 -> 0 bytes
 .../access/btn/btn-default-large-pressed-bg.gif    |    Bin 1855 -> 0 bytes
 .../btn/btn-default-large-pressed-corners.gif      |    Bin 1620 -> 0 bytes
 .../access/btn/btn-default-large-pressed-sides.gif |    Bin 1947 -> 0 bytes
 .../images/access/btn/btn-default-large-sides.gif  |    Bin 1938 -> 0 bytes
 .../images/access/btn/btn-default-medium-bg.gif    |    Bin 1831 -> 0 bytes
 .../access/btn/btn-default-medium-corners.gif      |    Bin 1615 -> 0 bytes
 .../access/btn/btn-default-medium-disabled-bg.gif  |    Bin 1809 -> 0 bytes
 .../btn/btn-default-medium-disabled-corners.gif    |    Bin 1618 -> 0 bytes
 .../btn/btn-default-medium-disabled-sides.gif      |    Bin 1907 -> 0 bytes
 .../access/btn/btn-default-medium-focus-bg.gif     |    Bin 1847 -> 0 bytes
 .../btn/btn-default-medium-focus-corners.gif       |    Bin 1624 -> 0 bytes
 .../access/btn/btn-default-medium-focus-sides.gif  |    Bin 1929 -> 0 bytes
 .../access/btn/btn-default-medium-over-bg.gif      |    Bin 1847 -> 0 bytes
 .../access/btn/btn-default-medium-over-corners.gif |    Bin 1624 -> 0 bytes
 .../access/btn/btn-default-medium-over-sides.gif   |    Bin 1929 -> 0 bytes
 .../access/btn/btn-default-medium-pressed-bg.gif   |    Bin 1835 -> 0 bytes
 .../btn/btn-default-medium-pressed-corners.gif     |    Bin 1620 -> 0 bytes
 .../btn/btn-default-medium-pressed-sides.gif       |    Bin 1927 -> 0 bytes
 .../images/access/btn/btn-default-medium-sides.gif |    Bin 1913 -> 0 bytes
 .../images/access/btn/btn-default-small-bg.gif     |    Bin 1814 -> 0 bytes
 .../access/btn/btn-default-small-corners.gif       |    Bin 1615 -> 0 bytes
 .../access/btn/btn-default-small-disabled-bg.gif   |    Bin 1793 -> 0 bytes
 .../btn/btn-default-small-disabled-corners.gif     |    Bin 1618 -> 0 bytes
 .../btn/btn-default-small-disabled-sides.gif       |    Bin 1887 -> 0 bytes
 .../access/btn/btn-default-small-focus-bg.gif      |    Bin 1817 -> 0 bytes
 .../access/btn/btn-default-small-focus-corners.gif |    Bin 1624 -> 0 bytes
 .../access/btn/btn-default-small-focus-sides.gif   |    Bin 1897 -> 0 bytes
 .../access/btn/btn-default-small-over-bg.gif       |    Bin 1817 -> 0 bytes
 .../access/btn/btn-default-small-over-corners.gif  |    Bin 1624 -> 0 bytes
 .../access/btn/btn-default-small-over-sides.gif    |    Bin 1897 -> 0 bytes
 .../access/btn/btn-default-small-pressed-bg.gif    |    Bin 1813 -> 0 bytes
 .../btn/btn-default-small-pressed-corners.gif      |    Bin 1620 -> 0 bytes
 .../access/btn/btn-default-small-pressed-sides.gif |    Bin 1897 -> 0 bytes
 .../images/access/btn/btn-default-small-sides.gif  |    Bin 1895 -> 0 bytes
 .../btn/btn-default-toolbar-large-corners.gif      |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-large-disabled-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-large-disabled-sides.gif   |    Bin 1596 -> 0 bytes
 .../btn-default-toolbar-large-focus-corners.gif    |    Bin 1620 -> 0 bytes
 .../btn/btn-default-toolbar-large-focus-sides.gif  |    Bin 1623 -> 0 bytes
 .../btn/btn-default-toolbar-large-over-corners.gif |    Bin 1620 -> 0 bytes
 .../btn/btn-default-toolbar-large-over-sides.gif   |    Bin 1623 -> 0 bytes
 .../btn-default-toolbar-large-pressed-corners.gif  |    Bin 1616 -> 0 bytes
 .../btn-default-toolbar-large-pressed-sides.gif    |    Bin 1623 -> 0 bytes
 .../access/btn/btn-default-toolbar-large-sides.gif |    Bin 1596 -> 0 bytes
 .../btn/btn-default-toolbar-medium-corners.gif     |    Bin 1585 -> 0 bytes
 ...btn-default-toolbar-medium-disabled-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-medium-disabled-sides.gif  |    Bin 1594 -> 0 bytes
 .../btn-default-toolbar-medium-focus-corners.gif   |    Bin 1621 -> 0 bytes
 .../btn/btn-default-toolbar-medium-focus-sides.gif |    Bin 1616 -> 0 bytes
 .../btn-default-toolbar-medium-over-corners.gif    |    Bin 1621 -> 0 bytes
 .../btn/btn-default-toolbar-medium-over-sides.gif  |    Bin 1616 -> 0 bytes
 .../btn-default-toolbar-medium-pressed-corners.gif |    Bin 1616 -> 0 bytes
 .../btn-default-toolbar-medium-pressed-sides.gif   |    Bin 1616 -> 0 bytes
 .../btn/btn-default-toolbar-medium-sides.gif       |    Bin 1594 -> 0 bytes
 .../btn/btn-default-toolbar-small-corners.gif      |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-small-disabled-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-small-disabled-sides.gif   |    Bin 1591 -> 0 bytes
 .../btn-default-toolbar-small-focus-corners.gif    |    Bin 1621 -> 0 bytes
 .../btn/btn-default-toolbar-small-focus-sides.gif  |    Bin 1607 -> 0 bytes
 .../btn/btn-default-toolbar-small-over-corners.gif |    Bin 1621 -> 0 bytes
 .../btn/btn-default-toolbar-small-over-sides.gif   |    Bin 1607 -> 0 bytes
 .../btn-default-toolbar-small-pressed-corners.gif  |    Bin 1616 -> 0 bytes
 .../btn-default-toolbar-small-pressed-sides.gif    |    Bin 1607 -> 0 bytes
 .../access/btn/btn-default-toolbar-small-sides.gif |    Bin 1591 -> 0 bytes
 .../access/btn/btn-toolbar-large-corners.gif       |    Bin 1585 -> 0 bytes
 .../btn/btn-toolbar-large-disabled-corners.gif     |    Bin 1585 -> 0 bytes
 .../btn/btn-toolbar-large-disabled-sides.gif       |    Bin 1596 -> 0 bytes
 .../access/btn/btn-toolbar-large-focus-corners.gif |    Bin 1620 -> 0 bytes
 .../access/btn/btn-toolbar-large-focus-sides.gif   |    Bin 1623 -> 0 bytes
 .../access/btn/btn-toolbar-large-over-corners.gif  |    Bin 1620 -> 0 bytes
 .../access/btn/btn-toolbar-large-over-sides.gif    |    Bin 1623 -> 0 bytes
 .../btn/btn-toolbar-large-pressed-corners.gif      |    Bin 1616 -> 0 bytes
 .../access/btn/btn-toolbar-large-pressed-sides.gif |    Bin 1623 -> 0 bytes
 .../images/access/btn/btn-toolbar-large-sides.gif  |    Bin 1596 -> 0 bytes
 .../access/btn/btn-toolbar-medium-corners.gif      |    Bin 1585 -> 0 bytes
 .../btn/btn-toolbar-medium-disabled-corners.gif    |    Bin 1585 -> 0 bytes
 .../btn/btn-toolbar-medium-disabled-sides.gif      |    Bin 1594 -> 0 bytes
 .../btn/btn-toolbar-medium-focus-corners.gif       |    Bin 1621 -> 0 bytes
 .../access/btn/btn-toolbar-medium-focus-sides.gif  |    Bin 1616 -> 0 bytes
 .../access/btn/btn-toolbar-medium-over-corners.gif |    Bin 1621 -> 0 bytes
 .../access/btn/btn-toolbar-medium-over-sides.gif   |    Bin 1616 -> 0 bytes
 .../btn/btn-toolbar-medium-pressed-corners.gif     |    Bin 1616 -> 0 bytes
 .../btn/btn-toolbar-medium-pressed-sides.gif       |    Bin 1616 -> 0 bytes
 .../images/access/btn/btn-toolbar-medium-sides.gif |    Bin 1594 -> 0 bytes
 .../access/btn/btn-toolbar-small-corners.gif       |    Bin 1585 -> 0 bytes
 .../btn/btn-toolbar-small-disabled-corners.gif     |    Bin 1585 -> 0 bytes
 .../btn/btn-toolbar-small-disabled-sides.gif       |    Bin 1591 -> 0 bytes
 .../access/btn/btn-toolbar-small-focus-corners.gif |    Bin 1621 -> 0 bytes
 .../access/btn/btn-toolbar-small-focus-sides.gif   |    Bin 1607 -> 0 bytes
 .../access/btn/btn-toolbar-small-over-corners.gif  |    Bin 1621 -> 0 bytes
 .../access/btn/btn-toolbar-small-over-sides.gif    |    Bin 1607 -> 0 bytes
 .../btn/btn-toolbar-small-pressed-corners.gif      |    Bin 1616 -> 0 bytes
 .../access/btn/btn-toolbar-small-pressed-sides.gif |    Bin 1607 -> 0 bytes
 .../images/access/btn/btn-toolbar-small-sides.gif  |    Bin 1591 -> 0 bytes
 .../themes/images/access/button/arrow.gif          |    Bin 833 -> 0 bytes
 .../resources/themes/images/access/button/btn.gif  |    Bin 2871 -> 0 bytes
 .../themes/images/access/button/group-cs.gif       |    Bin 2459 -> 0 bytes
 .../themes/images/access/button/group-lr.gif       |    Bin 861 -> 0 bytes
 .../themes/images/access/button/group-tb.gif       |    Bin 70 -> 0 bytes
 .../images/access/button/s-arrow-b-noline.gif      |    Bin 904 -> 0 bytes
 .../themes/images/access/button/s-arrow-b.gif      |    Bin 943 -> 0 bytes
 .../themes/images/access/button/s-arrow-bo.gif     |    Bin 961 -> 0 bytes
 .../themes/images/access/button/s-arrow-noline.gif |    Bin 875 -> 0 bytes
 .../themes/images/access/button/s-arrow-o.gif      |    Bin 155 -> 0 bytes
 .../themes/images/access/button/s-arrow.gif        |    Bin 956 -> 0 bytes
 .../access/datepicker/datepicker-footer-bg.gif     |    Bin 1835 -> 0 bytes
 .../access/datepicker/datepicker-header-bg.gif     |    Bin 1858 -> 0 bytes
 .../themes/images/access/editor/tb-sprite.gif      |    Bin 1994 -> 0 bytes
 .../form-invalid-tip-default-corners.gif           |    Bin 1690 -> 0 bytes
 .../themes/images/access/form/checkbox.gif         |    Bin 3210 -> 0 bytes
 .../themes/images/access/form/checkbox_.gif        |    Bin 2061 -> 0 bytes
 .../themes/images/access/form/clear-trigger.gif    |    Bin 2027 -> 0 bytes
 .../themes/images/access/form/date-trigger.gif     |    Bin 1620 -> 0 bytes
 .../themes/images/access/form/exclamation.gif      |    Bin 614 -> 0 bytes
 .../resources/themes/images/access/form/radio.gif  |    Bin 3444 -> 0 bytes
 .../resources/themes/images/access/form/radio_.gif |    Bin 1746 -> 0 bytes
 .../themes/images/access/form/search-trigger.gif   |    Bin 1534 -> 0 bytes
 .../themes/images/access/form/spinner-small.gif    |    Bin 1145 -> 0 bytes
 .../themes/images/access/form/spinner.gif          |    Bin 1145 -> 0 bytes
 .../themes/images/access/form/spinner_.gif         |    Bin 1943 -> 0 bytes
 .../themes/images/access/form/text-bg.gif          |    Bin 66 -> 0 bytes
 .../themes/images/access/form/trigger-tpl.gif      |    Bin 908 -> 0 bytes
 .../themes/images/access/form/trigger.gif          |    Bin 1451 -> 0 bytes
 .../access/grid/cell-special-selected-bg.gif       |    Bin 1637 -> 0 bytes
 .../themes/images/access/grid/column-header-bg.gif |    Bin 1863 -> 0 bytes
 .../images/access/grid/column-header-over-bg.gif   |    Bin 1860 -> 0 bytes
 .../resources/themes/images/access/grid/dirty.gif  |    Bin 68 -> 0 bytes
 .../themes/images/access/grid/grid-blue-split.gif  |    Bin 47 -> 0 bytes
 .../themes/images/access/grid/grid3-hd-btn.gif     |    Bin 419 -> 0 bytes
 .../themes/images/access/grid/grid3-hrow-over.gif  |    Bin 268 -> 0 bytes
 .../themes/images/access/grid/grid3-hrow.gif       |    Bin 164 -> 0 bytes
 .../images/access/grid/grid3-special-col-bg.gif    |    Bin 162 -> 0 bytes
 .../access/grid/grid3-special-col-sel-bg.gif       |    Bin 162 -> 0 bytes
 .../themes/images/access/grid/group-collapse.gif   |    Bin 77 -> 0 bytes
 .../images/access/grid/group-expand-sprite.gif     |    Bin 131 -> 0 bytes
 .../themes/images/access/grid/group-expand.gif     |    Bin 82 -> 0 bytes
 .../themes/images/access/grid/invalid_line.gif     |    Bin 46 -> 0 bytes
 .../images/access/grid/page-first-disabled.gif     |    Bin 340 -> 0 bytes
 .../themes/images/access/grid/page-first.gif       |    Bin 96 -> 0 bytes
 .../images/access/grid/page-last-disabled.gif      |    Bin 340 -> 0 bytes
 .../themes/images/access/grid/page-last.gif        |    Bin 96 -> 0 bytes
 .../images/access/grid/page-next-disabled.gif      |    Bin 195 -> 0 bytes
 .../themes/images/access/grid/page-next.gif        |    Bin 82 -> 0 bytes
 .../images/access/grid/page-prev-disabled.gif      |    Bin 197 -> 0 bytes
 .../themes/images/access/grid/page-prev.gif        |    Bin 82 -> 0 bytes
 .../themes/images/access/grid/refresh.gif          |    Bin 91 -> 0 bytes
 .../themes/images/access/grid/sort-hd.gif          |    Bin 2075 -> 0 bytes
 .../themes/images/access/grid/sort_asc.gif         |    Bin 74 -> 0 bytes
 .../themes/images/access/grid/sort_desc.gif        |    Bin 73 -> 0 bytes
 .../themes/images/access/menu/group-checked.gif    |    Bin 856 -> 0 bytes
 .../themes/images/access/menu/item-over.gif        |    Bin 820 -> 0 bytes
 .../images/access/menu/menu-item-active-bg.gif     |    Bin 1839 -> 0 bytes
 .../access/menu/menu-item-active-corners.gif       |    Bin 1620 -> 0 bytes
 .../images/access/menu/menu-item-active-sides.gif  |    Bin 1918 -> 0 bytes
 .../themes/images/access/menu/menu-parent.gif      |    Bin 73 -> 0 bytes
 .../resources/themes/images/access/menu/menu.gif   |    Bin 826 -> 0 bytes
 .../images/access/panel-header/panel-header-bg.gif |    Bin 1860 -> 0 bytes
 .../panel-header-default-bottom-bg.gif             |    Bin 1854 -> 0 bytes
 .../panel-header-default-framed-bottom-bg.gif      |    Bin 1837 -> 0 bytes
 .../panel-header-default-framed-bottom-corners.gif |    Bin 1621 -> 0 bytes
 ...el-header-default-framed-bottom-noborder-bg.gif |    Bin 1831 -> 0 bytes
 ...ader-default-framed-bottom-noborder-corners.gif |    Bin 1607 -> 0 bytes
 ...header-default-framed-bottom-noborder-sides.gif |    Bin 1735 -> 0 bytes
 .../panel-header-default-framed-bottom-sides.gif   |    Bin 1900 -> 0 bytes
 ...l-header-default-framed-collapsed-bottom-bg.gif |    Bin 1833 -> 0 bytes
 ...der-default-framed-collapsed-bottom-corners.gif |    Bin 1629 -> 0 bytes
 ...eader-default-framed-collapsed-bottom-sides.gif |    Bin 1898 -> 0 bytes
 ...nel-header-default-framed-collapsed-left-bg.gif |    Bin 1640 -> 0 bytes
 ...eader-default-framed-collapsed-left-corners.gif |    Bin 1639 -> 0 bytes
 ...-header-default-framed-collapsed-left-sides.gif |    Bin 1801 -> 0 bytes
 ...el-header-default-framed-collapsed-right-bg.gif |    Bin 1641 -> 0 bytes
 ...ader-default-framed-collapsed-right-corners.gif |    Bin 1643 -> 0 bytes
 ...header-default-framed-collapsed-right-sides.gif |    Bin 1803 -> 0 bytes
 ...anel-header-default-framed-collapsed-top-bg.gif |    Bin 1831 -> 0 bytes
 ...header-default-framed-collapsed-top-corners.gif |    Bin 1629 -> 0 bytes
 ...l-header-default-framed-collapsed-top-sides.gif |    Bin 1898 -> 0 bytes
 .../panel-header-default-framed-left-bg.gif        |    Bin 1641 -> 0 bytes
 .../panel-header-default-framed-left-corners.gif   |    Bin 1631 -> 0 bytes
 ...anel-header-default-framed-left-noborder-bg.gif |    Bin 1639 -> 0 bytes
 ...header-default-framed-left-noborder-corners.gif |    Bin 1623 -> 0 bytes
 ...l-header-default-framed-left-noborder-sides.gif |    Bin 1746 -> 0 bytes
 .../panel-header-default-framed-left-sides.gif     |    Bin 1802 -> 0 bytes
 .../panel-header-default-framed-right-bg.gif       |    Bin 1642 -> 0 bytes
 .../panel-header-default-framed-right-corners.gif  |    Bin 1632 -> 0 bytes
 ...nel-header-default-framed-right-noborder-bg.gif |    Bin 1639 -> 0 bytes
 ...eader-default-framed-right-noborder-corners.gif |    Bin 1623 -> 0 bytes
 ...-header-default-framed-right-noborder-sides.gif |    Bin 1749 -> 0 bytes
 .../panel-header-default-framed-right-sides.gif    |    Bin 1804 -> 0 bytes
 .../panel-header-default-framed-top-bg.gif         |    Bin 1848 -> 0 bytes
 .../panel-header-default-framed-top-corners.gif    |    Bin 1620 -> 0 bytes
 ...panel-header-default-framed-top-noborder-bg.gif |    Bin 1838 -> 0 bytes
 ...-header-default-framed-top-noborder-corners.gif |    Bin 1606 -> 0 bytes
 ...el-header-default-framed-top-noborder-sides.gif |    Bin 1739 -> 0 bytes
 .../panel-header-default-framed-top-sides.gif      |    Bin 1905 -> 0 bytes
 .../panel-header/panel-header-default-left-bg.gif  |    Bin 1643 -> 0 bytes
 .../panel-header/panel-header-default-right-bg.gif |    Bin 1645 -> 0 bytes
 .../panel-header/panel-header-default-top-bg.gif   |    Bin 1859 -> 0 bytes
 .../access/panel-header/panel-header-framed-bg.gif |    Bin 1845 -> 0 bytes
 .../panel-header/panel-header-framed-corners.gif   |    Bin 1613 -> 0 bytes
 .../panel-header/panel-header-framed-sides.gif     |    Bin 1919 -> 0 bytes
 .../panel-header/panel-header-vertical-bg.gif      |    Bin 1601 -> 0 bytes
 .../themes/images/access/panel/corners-sprite.gif  |    Bin 577 -> 0 bytes
 .../themes/images/access/panel/left-right.gif      |    Bin 52 -> 0 bytes
 .../themes/images/access/panel/light-hd.gif        |    Bin 161 -> 0 bytes
 .../access/panel/panel-default-framed-corners.gif  |    Bin 1616 -> 0 bytes
 .../panel-default-framed-noborder-corners.gif      |    Bin 1607 -> 0 bytes
 .../panel/panel-default-framed-noborder-sides.gif  |    Bin 1625 -> 0 bytes
 .../access/panel/panel-default-framed-sides.gif    |    Bin 1693 -> 0 bytes
 .../images/access/panel/panel-framed-corners.gif   |    Bin 1614 -> 0 bytes
 .../images/access/panel/panel-framed-sides.gif     |    Bin 1693 -> 0 bytes
 .../themes/images/access/panel/tool-sprites.gif    |    Bin 1981 -> 0 bytes
 .../themes/images/access/panel/top-bottom.gif      |    Bin 116 -> 0 bytes
 .../images/access/panel/white-corners-sprite.gif   |    Bin 1366 -> 0 bytes
 .../images/access/panel/white-left-right.gif       |    Bin 52 -> 0 bytes
 .../images/access/panel/white-top-bottom.gif       |    Bin 115 -> 0 bytes
 .../images/access/progress/progress-default-bg.gif |    Bin 1839 -> 0 bytes
 .../resources/themes/images/access/qtip/close.gif  |    Bin 972 -> 0 bytes
 .../images/access/qtip/tip-anchor-sprite.gif       |    Bin 951 -> 0 bytes
 .../themes/images/access/qtip/tip-sprite.gif       |    Bin 3376 -> 0 bytes
 .../themes/images/access/shared/glass-bg.gif       |    Bin 103 -> 0 bytes
 .../themes/images/access/shared/hd-sprite.gif      |    Bin 673 -> 0 bytes
 .../themes/images/access/shared/left-btn.gif       |    Bin 77 -> 0 bytes
 .../themes/images/access/shared/right-btn.gif      |    Bin 79 -> 0 bytes
 .../themes/images/access/sizer/e-handle-dark.gif   |    Bin 248 -> 0 bytes
 .../themes/images/access/sizer/e-handle.gif        |    Bin 753 -> 0 bytes
 .../themes/images/access/sizer/ne-handle-dark.gif  |    Bin 66 -> 0 bytes
 .../themes/images/access/sizer/ne-handle.gif       |    Bin 115 -> 0 bytes
 .../themes/images/access/sizer/nw-handle-dark.gif  |    Bin 66 -> 0 bytes
 .../themes/images/access/sizer/nw-handle.gif       |    Bin 114 -> 0 bytes
 .../themes/images/access/sizer/s-handle-dark.gif   |    Bin 246 -> 0 bytes
 .../themes/images/access/sizer/s-handle.gif        |    Bin 494 -> 0 bytes
 .../themes/images/access/sizer/se-handle-dark.gif  |    Bin 65 -> 0 bytes
 .../themes/images/access/sizer/se-handle.gif       |    Bin 114 -> 0 bytes
 .../themes/images/access/sizer/square.gif          |    Bin 123 -> 0 bytes
 .../themes/images/access/sizer/sw-handle-dark.gif  |    Bin 66 -> 0 bytes
 .../themes/images/access/sizer/sw-handle.gif       |    Bin 116 -> 0 bytes
 .../themes/images/access/slider/slider-bg.gif      |    Bin 144 -> 0 bytes
 .../themes/images/access/slider/slider-bg.png      |    Bin 3636 -> 0 bytes
 .../themes/images/access/slider/slider-thumb.gif   |    Bin 437 -> 0 bytes
 .../themes/images/access/slider/slider-thumb.png   |    Bin 3436 -> 0 bytes
 .../themes/images/access/slider/slider-v-bg.gif    |    Bin 149 -> 0 bytes
 .../themes/images/access/slider/slider-v-bg.png    |    Bin 3630 -> 0 bytes
 .../themes/images/access/slider/slider-v-thumb.gif |    Bin 436 -> 0 bytes
 .../themes/images/access/slider/slider-v-thumb.png |    Bin 3432 -> 0 bytes
 .../ext/resources/themes/images/access/spinner.gif |    Bin 2048 -> 0 bytes
 .../themes/images/access/tab-bar/scroll-left.gif   |    Bin 996 -> 0 bytes
 .../themes/images/access/tab-bar/scroll-right.gif  |    Bin 999 -> 0 bytes
 .../images/access/tab-bar/tab-bar-default-bg.gif   |    Bin 1841 -> 0 bytes
 .../access/tab/tab-bottom-active-corners.gif       |    Bin 1640 -> 0 bytes
 .../images/access/tab/tab-bottom-active-sides.gif  |    Bin 1621 -> 0 bytes
 .../images/access/tab/tab-bottom-corners.gif       |    Bin 1640 -> 0 bytes
 .../access/tab/tab-bottom-disabled-corners.gif     |    Bin 1640 -> 0 bytes
 .../access/tab/tab-bottom-disabled-sides.gif       |    Bin 1621 -> 0 bytes
 .../images/access/tab/tab-bottom-over-corners.gif  |    Bin 1640 -> 0 bytes
 .../images/access/tab/tab-bottom-over-sides.gif    |    Bin 1621 -> 0 bytes
 .../themes/images/access/tab/tab-bottom-sides.gif  |    Bin 1621 -> 0 bytes
 .../tab/tab-default-bottom-active-corners.gif      |    Bin 1639 -> 0 bytes
 .../access/tab/tab-default-bottom-active-sides.gif |    Bin 1628 -> 0 bytes
 .../access/tab/tab-default-bottom-corners.gif      |    Bin 1643 -> 0 bytes
 .../tab/tab-default-bottom-disabled-corners.gif    |    Bin 1630 -> 0 bytes
 .../tab/tab-default-bottom-disabled-sides.gif      |    Bin 1628 -> 0 bytes
 .../access/tab/tab-default-bottom-over-corners.gif |    Bin 1643 -> 0 bytes
 .../access/tab/tab-default-bottom-over-sides.gif   |    Bin 1628 -> 0 bytes
 .../images/access/tab/tab-default-bottom-sides.gif |    Bin 1628 -> 0 bytes
 .../access/tab/tab-default-top-active-corners.gif  |    Bin 1625 -> 0 bytes
 .../access/tab/tab-default-top-active-sides.gif    |    Bin 1620 -> 0 bytes
 .../images/access/tab/tab-default-top-corners.gif  |    Bin 1631 -> 0 bytes
 .../tab/tab-default-top-disabled-corners.gif       |    Bin 1621 -> 0 bytes
 .../access/tab/tab-default-top-disabled-sides.gif  |    Bin 1620 -> 0 bytes
 .../access/tab/tab-default-top-over-corners.gif    |    Bin 1631 -> 0 bytes
 .../access/tab/tab-default-top-over-sides.gif      |    Bin 1620 -> 0 bytes
 .../images/access/tab/tab-default-top-sides.gif    |    Bin 1620 -> 0 bytes
 .../images/access/tab/tab-top-active-corners.gif   |    Bin 1625 -> 0 bytes
 .../images/access/tab/tab-top-active-sides.gif     |    Bin 1614 -> 0 bytes
 .../themes/images/access/tab/tab-top-corners.gif   |    Bin 1625 -> 0 bytes
 .../images/access/tab/tab-top-disabled-corners.gif |    Bin 1625 -> 0 bytes
 .../images/access/tab/tab-top-disabled-sides.gif   |    Bin 1614 -> 0 bytes
 .../images/access/tab/tab-top-over-corners.gif     |    Bin 1625 -> 0 bytes
 .../images/access/tab/tab-top-over-sides.gif       |    Bin 1614 -> 0 bytes
 .../themes/images/access/tab/tab-top-sides.gif     |    Bin 1614 -> 0 bytes
 .../access/tabs/tab-btm-inactive-left-bg.gif       |    Bin 130 -> 0 bytes
 .../access/tabs/tab-btm-inactive-right-bg.gif      |    Bin 513 -> 0 bytes
 .../themes/images/access/tabs/tab-btm-left-bg.gif  |    Bin 512 -> 0 bytes
 .../themes/images/access/tabs/tab-btm-right-bg.gif |    Bin 117 -> 0 bytes
 .../themes/images/access/tabs/tab-close.gif        |    Bin 76 -> 0 bytes
 .../themes/images/access/tabs/tab-strip-bg.gif     |    Bin 827 -> 0 bytes
 .../themes/images/access/tabs/tab-strip-btm-bg.gif |    Bin 70 -> 0 bytes
 .../themes/images/access/tabs/tabs-sprite.gif      |    Bin 1221 -> 0 bytes
 .../themes/images/access/tip/tip-corners.gif       |    Bin 1619 -> 0 bytes
 .../themes/images/access/tip/tip-corners.png       |    Bin 258 -> 0 bytes
 .../themes/images/access/tip/tip-sides.gif         |    Bin 1623 -> 0 bytes
 .../themes/images/access/tip/tip-sides.png         |    Bin 129 -> 0 bytes
 .../resources/themes/images/access/toolbar/bg.gif  |    Bin 82 -> 0 bytes
 .../images/access/toolbar/btn-arrow-light.gif      |    Bin 916 -> 0 bytes
 .../themes/images/access/toolbar/btn-arrow.gif     |    Bin 919 -> 0 bytes
 .../themes/images/access/toolbar/btn-over-bg.gif   |    Bin 837 -> 0 bytes
 .../themes/images/access/toolbar/gray-bg.gif       |    Bin 832 -> 0 bytes
 .../themes/images/access/toolbar/more.gif          |    Bin 67 -> 0 bytes
 .../themes/images/access/toolbar/s-arrow-bo.gif    |    Bin 186 -> 0 bytes
 .../themes/images/access/toolbar/scroll-left.gif   |    Bin 996 -> 0 bytes
 .../themes/images/access/toolbar/scroll-right.gif  |    Bin 999 -> 0 bytes
 .../themes/images/access/toolbar/tb-btn-sprite.gif |    Bin 1127 -> 0 bytes
 .../images/access/toolbar/tb-xl-btn-sprite.gif     |    Bin 1663 -> 0 bytes
 .../themes/images/access/toolbar/tb-xl-sep.gif     |    Bin 810 -> 0 bytes
 .../images/access/toolbar/toolbar-default-bg.gif   |    Bin 1807 -> 0 bytes
 .../themes/images/access/tools/tool-sprite-tpl.gif |    Bin 971 -> 0 bytes
 .../themes/images/access/tools/tool-sprites.gif    |    Bin 1981 -> 0 bytes
 .../images/access/tools/tools-sprites-trans.gif    |    Bin 2843 -> 0 bytes
 .../resources/themes/images/access/tree/arrows.gif |    Bin 183 -> 0 bytes
 .../themes/images/access/tree/drop-between.gif     |    Bin 907 -> 0 bytes
 .../images/access/tree/elbow-end-minus-nl.gif      |    Bin 86 -> 0 bytes
 .../themes/images/access/tree/elbow-end-minus.gif  |    Bin 104 -> 0 bytes
 .../images/access/tree/elbow-end-plus-nl.gif       |    Bin 89 -> 0 bytes
 .../themes/images/access/tree/elbow-end-plus.gif   |    Bin 108 -> 0 bytes
 .../themes/images/access/tree/elbow-minus-nl.gif   |    Bin 86 -> 0 bytes
 .../themes/images/access/tree/elbow-minus.gif      |    Bin 106 -> 0 bytes
 .../themes/images/access/tree/elbow-plus-nl.gif    |    Bin 89 -> 0 bytes
 .../themes/images/access/tree/elbow-plus.gif       |    Bin 111 -> 0 bytes
 .../themes/images/access/tree/folder-open.gif      |    Bin 342 -> 0 bytes
 .../resources/themes/images/access/tree/folder.gif |    Bin 340 -> 0 bytes
 .../window-header-default-bottom-corners.gif       |    Bin 1660 -> 0 bytes
 .../window-header-default-bottom-sides.gif         |    Bin 1628 -> 0 bytes
 .../window-header-default-left-corners.gif         |    Bin 1651 -> 0 bytes
 .../window-header-default-left-sides.gif           |    Bin 1612 -> 0 bytes
 .../window-header-default-right-corners.gif        |    Bin 1657 -> 0 bytes
 .../window-header-default-right-sides.gif          |    Bin 1612 -> 0 bytes
 .../window-header-default-top-corners.gif          |    Bin 1663 -> 0 bytes
 .../window-header-default-top-sides.gif            |    Bin 1628 -> 0 bytes
 .../themes/images/access/window/icon-error.gif     |    Bin 256 -> 0 bytes
 .../themes/images/access/window/icon-info.gif      |    Bin 172 -> 0 bytes
 .../themes/images/access/window/icon-question.gif  |    Bin 217 -> 0 bytes
 .../themes/images/access/window/icon-warning.gif   |    Bin 173 -> 0 bytes
 .../themes/images/access/window/window-corners.gif |    Bin 1683 -> 0 bytes
 .../access/window/window-default-corners.gif       |    Bin 1677 -> 0 bytes
 .../images/access/window/window-default-sides.gif  |    Bin 1776 -> 0 bytes
 .../themes/images/access/window/window-sides.gif   |    Bin 1776 -> 0 bytes
 .../images/default/boundlist/trigger-arrow.png     |    Bin 2869 -> 0 bytes
 .../themes/images/default/box/corners-blue.gif     |    Bin 1010 -> 0 bytes
 .../themes/images/default/box/corners.gif          |    Bin 1005 -> 0 bytes
 .../resources/themes/images/default/box/l-blue.gif |    Bin 810 -> 0 bytes
 .../ext/resources/themes/images/default/box/l.gif  |    Bin 810 -> 0 bytes
 .../resources/themes/images/default/box/r-blue.gif |    Bin 810 -> 0 bytes
 .../ext/resources/themes/images/default/box/r.gif  |    Bin 810 -> 0 bytes
 .../ext/resources/themes/images/default/box/tb.gif |    Bin 839 -> 0 bytes
 .../themes/images/default/button/s-arrow-light.gif |    Bin 116 -> 0 bytes
 .../form-invalid-tip-default-sides.gif             |    Bin 1647 -> 0 bytes
 .../images/default/form/error-tip-corners.gif      |    Bin 4183 -> 0 bytes
 .../images/default/grid/arrow-left-white.gif       |    Bin 825 -> 0 bytes
 .../images/default/grid/arrow-right-white.gif      |    Bin 825 -> 0 bytes
 .../themes/images/default/grid/cell-special-bg.gif |    Bin 1636 -> 0 bytes
 .../themes/images/default/grid/checked.gif         |    Bin 959 -> 0 bytes
 .../themes/images/default/grid/col-move-bottom.gif |    Bin 868 -> 0 bytes
 .../themes/images/default/grid/col-move-top.gif    |    Bin 869 -> 0 bytes
 .../themes/images/default/grid/columns.gif         |    Bin 962 -> 0 bytes
 .../images/default/grid/dd-insert-arrow-left.gif   |    Bin 299 -> 0 bytes
 .../images/default/grid/dd-insert-arrow-left.png   |    Bin 345 -> 0 bytes
 .../images/default/grid/dd-insert-arrow-right.gif  |    Bin 301 -> 0 bytes
 .../images/default/grid/dd-insert-arrow-right.png  |    Bin 349 -> 0 bytes
 .../resources/themes/images/default/grid/done.gif  |    Bin 133 -> 0 bytes
 .../themes/images/default/grid/drop-no.gif         |    Bin 947 -> 0 bytes
 .../themes/images/default/grid/drop-yes.gif        |    Bin 860 -> 0 bytes
 .../themes/images/default/grid/footer-bg.gif       |    Bin 834 -> 0 bytes
 .../themes/images/default/grid/grid-blue-hd.gif    |    Bin 829 -> 0 bytes
 .../themes/images/default/grid/grid-hrow.gif       |    Bin 855 -> 0 bytes
 .../themes/images/default/grid/grid-loading.gif    |    Bin 701 -> 0 bytes
 .../themes/images/default/grid/grid-split.gif      |    Bin 817 -> 0 bytes
 .../themes/images/default/grid/grid-vista-hd.gif   |    Bin 829 -> 0 bytes
 .../themes/images/default/grid/group-by.gif        |    Bin 917 -> 0 bytes
 .../themes/images/default/grid/hd-pop.gif          |    Bin 839 -> 0 bytes
 .../themes/images/default/grid/hmenu-asc.gif       |    Bin 931 -> 0 bytes
 .../themes/images/default/grid/hmenu-desc.gif      |    Bin 930 -> 0 bytes
 .../themes/images/default/grid/hmenu-lock.gif      |    Bin 955 -> 0 bytes
 .../themes/images/default/grid/hmenu-lock.png      |    Bin 648 -> 0 bytes
 .../themes/images/default/grid/hmenu-unlock.gif    |    Bin 971 -> 0 bytes
 .../themes/images/default/grid/hmenu-unlock.png    |    Bin 697 -> 0 bytes
 .../themes/images/default/grid/loading.gif         |    Bin 771 -> 0 bytes
 .../themes/images/default/grid/mso-hd.gif          |    Bin 875 -> 0 bytes
 .../themes/images/default/grid/nowait.gif          |    Bin 884 -> 0 bytes
 .../themes/images/default/grid/pick-button.gif     |    Bin 1036 -> 0 bytes
 .../images/default/grid/property-cell-bg.gif       |    Bin 915 -> 0 bytes
 .../images/default/grid/refresh-disabled.gif       |    Bin 577 -> 0 bytes
 .../images/default/grid/row-check-sprite.gif       |    Bin 1083 -> 0 bytes
 .../images/default/grid/row-expand-sprite.gif      |    Bin 955 -> 0 bytes
 .../themes/images/default/grid/row-over.gif        |    Bin 823 -> 0 bytes
 .../themes/images/default/grid/row-sel.gif         |    Bin 823 -> 0 bytes
 .../themes/images/default/grid/unchecked.gif       |    Bin 941 -> 0 bytes
 .../resources/themes/images/default/grid/wait.gif  |    Bin 1100 -> 0 bytes
 .../themes/images/default/layout/mini-bottom.gif   |    Bin 856 -> 0 bytes
 .../themes/images/default/layout/mini-left.gif     |    Bin 871 -> 0 bytes
 .../themes/images/default/layout/mini-right.gif    |    Bin 872 -> 0 bytes
 .../themes/images/default/layout/mini-top.gif      |    Bin 856 -> 0 bytes
 .../themes/images/default/menu/checked.gif         |    Bin 959 -> 0 bytes
 .../themes/images/default/menu/unchecked.gif       |    Bin 941 -> 0 bytes
 .../themes/images/default/shared/blue-loading.gif  |    Bin 3236 -> 0 bytes
 .../themes/images/default/shared/icon-error.gif    |    Bin 1669 -> 0 bytes
 .../themes/images/default/shared/icon-info.gif     |    Bin 1586 -> 0 bytes
 .../themes/images/default/shared/icon-question.gif |    Bin 1607 -> 0 bytes
 .../themes/images/default/shared/icon-warning.gif  |    Bin 1483 -> 0 bytes
 .../themes/images/default/shared/large-loading.gif |    Bin 3236 -> 0 bytes
 .../images/default/tools/tool-sprite-tpl.gif       |    Bin 971 -> 0 bytes
 .../images/default/tools/tools-sprites-trans.gif   |    Bin 2843 -> 0 bytes
 .../themes/images/default/tree/drop-above.gif      |    Bin 911 -> 0 bytes
 .../themes/images/default/tree/drop-add.gif        |    Bin 1001 -> 0 bytes
 .../themes/images/default/tree/drop-append.gif     |    Bin 1001 -> 0 bytes
 .../themes/images/default/tree/drop-below.gif      |    Bin 911 -> 0 bytes
 .../themes/images/default/tree/drop-between.gif    |    Bin 907 -> 0 bytes
 .../themes/images/default/tree/drop-no.gif         |    Bin 949 -> 0 bytes
 .../themes/images/default/tree/drop-over.gif       |    Bin 911 -> 0 bytes
 .../themes/images/default/tree/drop-under.gif      |    Bin 911 -> 0 bytes
 .../themes/images/default/tree/drop-yes.gif        |    Bin 1016 -> 0 bytes
 .../themes/images/default/tree/elbow-end.gif       |    Bin 844 -> 0 bytes
 .../themes/images/default/tree/elbow-line.gif      |    Bin 846 -> 0 bytes
 .../resources/themes/images/default/tree/elbow.gif |    Bin 850 -> 0 bytes
 .../resources/themes/images/default/tree/leaf.gif  |    Bin 945 -> 0 bytes
 .../themes/images/default/tree/loading.gif         |    Bin 771 -> 0 bytes
 .../ext/resources/themes/images/default/tree/s.gif |    Bin 43 -> 0 bytes
 .../images/default/util/splitter/mini-bottom.gif   |    Bin 856 -> 0 bytes
 .../images/default/util/splitter/mini-left.gif     |    Bin 871 -> 0 bytes
 .../images/default/util/splitter/mini-right.gif    |    Bin 872 -> 0 bytes
 .../images/default/util/splitter/mini-top.gif      |    Bin 856 -> 0 bytes
 .../themes/images/gray/boundlist/trigger-arrow.png |    Bin 2869 -> 0 bytes
 .../themes/images/gray/box/corners-blue.gif        |    Bin 1010 -> 0 bytes
 .../resources/themes/images/gray/box/corners.gif   |    Bin 1005 -> 0 bytes
 .../resources/themes/images/gray/box/l-blue.gif    |    Bin 810 -> 0 bytes
 .../ext/resources/themes/images/gray/box/l.gif     |    Bin 810 -> 0 bytes
 .../resources/themes/images/gray/box/r-blue.gif    |    Bin 810 -> 0 bytes
 .../ext/resources/themes/images/gray/box/r.gif     |    Bin 810 -> 0 bytes
 .../resources/themes/images/gray/box/tb-blue.gif   |    Bin 851 -> 0 bytes
 .../ext/resources/themes/images/gray/box/tb.gif    |    Bin 839 -> 0 bytes
 .../btn-group/btn-group-default-framed-corners.gif |    Bin 1598 -> 0 bytes
 .../btn-group-default-framed-notitle-corners.gif   |    Bin 1598 -> 0 bytes
 .../btn-group-default-framed-notitle-sides.gif     |    Bin 1623 -> 0 bytes
 .../btn-group/btn-group-default-framed-sides.gif   |    Bin 1630 -> 0 bytes
 .../images/gray/btn/btn-default-large-bg.gif       |    Bin 1839 -> 0 bytes
 .../images/gray/btn/btn-default-large-corners.gif  |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-large-disabled-bg.gif     |    Bin 1847 -> 0 bytes
 .../btn/btn-default-large-disabled-corners.gif     |    Bin 1615 -> 0 bytes
 .../gray/btn/btn-default-large-disabled-sides.gif  |    Bin 1943 -> 0 bytes
 .../images/gray/btn/btn-default-large-focus-bg.gif |    Bin 1837 -> 0 bytes
 .../gray/btn/btn-default-large-focus-corners.gif   |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-large-focus-sides.gif     |    Bin 1935 -> 0 bytes
 .../images/gray/btn/btn-default-large-over-bg.gif  |    Bin 1837 -> 0 bytes
 .../gray/btn/btn-default-large-over-corners.gif    |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-large-over-sides.gif      |    Bin 1935 -> 0 bytes
 .../gray/btn/btn-default-large-pressed-bg.gif      |    Bin 1858 -> 0 bytes
 .../gray/btn/btn-default-large-pressed-corners.gif |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-large-pressed-sides.gif   |    Bin 1945 -> 0 bytes
 .../images/gray/btn/btn-default-large-sides.gif    |    Bin 1938 -> 0 bytes
 .../images/gray/btn/btn-default-medium-bg.gif      |    Bin 1826 -> 0 bytes
 .../images/gray/btn/btn-default-medium-corners.gif |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-medium-disabled-bg.gif    |    Bin 1832 -> 0 bytes
 .../btn/btn-default-medium-disabled-corners.gif    |    Bin 1618 -> 0 bytes
 .../gray/btn/btn-default-medium-disabled-sides.gif |    Bin 1923 -> 0 bytes
 .../gray/btn/btn-default-medium-focus-bg.gif       |    Bin 1823 -> 0 bytes
 .../gray/btn/btn-default-medium-focus-corners.gif  |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-medium-focus-sides.gif    |    Bin 1915 -> 0 bytes
 .../images/gray/btn/btn-default-medium-over-bg.gif |    Bin 1823 -> 0 bytes
 .../gray/btn/btn-default-medium-over-corners.gif   |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-medium-over-sides.gif     |    Bin 1915 -> 0 bytes
 .../gray/btn/btn-default-medium-pressed-bg.gif     |    Bin 1839 -> 0 bytes
 .../btn/btn-default-medium-pressed-corners.gif     |    Bin 1621 -> 0 bytes
 .../gray/btn/btn-default-medium-pressed-sides.gif  |    Bin 1917 -> 0 bytes
 .../images/gray/btn/btn-default-medium-sides.gif   |    Bin 1919 -> 0 bytes
 .../images/gray/btn/btn-default-small-bg.gif       |    Bin 1801 -> 0 bytes
 .../images/gray/btn/btn-default-small-corners.gif  |    Bin 1619 -> 0 bytes
 .../gray/btn/btn-default-small-disabled-bg.gif     |    Bin 1803 -> 0 bytes
 .../btn/btn-default-small-disabled-corners.gif     |    Bin 1618 -> 0 bytes
 .../gray/btn/btn-default-small-disabled-sides.gif  |    Bin 1888 -> 0 bytes
 .../images/gray/btn/btn-default-small-focus-bg.gif |    Bin 1810 -> 0 bytes
 .../gray/btn/btn-default-small-focus-corners.gif   |    Bin 1622 -> 0 bytes
 .../gray/btn/btn-default-small-focus-sides.gif     |    Bin 1892 -> 0 bytes
 .../images/gray/btn/btn-default-small-over-bg.gif  |    Bin 1810 -> 0 bytes
 .../gray/btn/btn-default-small-over-corners.gif    |    Bin 1622 -> 0 bytes
 .../gray/btn/btn-default-small-over-sides.gif      |    Bin 1892 -> 0 bytes
 .../gray/btn/btn-default-small-pressed-bg.gif      |    Bin 1816 -> 0 bytes
 .../gray/btn/btn-default-small-pressed-corners.gif |    Bin 1621 -> 0 bytes
 .../gray/btn/btn-default-small-pressed-sides.gif   |    Bin 1894 -> 0 bytes
 .../images/gray/btn/btn-default-small-sides.gif    |    Bin 1889 -> 0 bytes
 .../gray/btn/btn-default-toolbar-large-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-large-disabled-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-large-disabled-sides.gif   |    Bin 1596 -> 0 bytes
 .../btn/btn-default-toolbar-large-focus-bg.gif     |    Bin 1837 -> 0 bytes
 .../btn-default-toolbar-large-focus-corners.gif    |    Bin 1618 -> 0 bytes
 .../btn/btn-default-toolbar-large-focus-sides.gif  |    Bin 1934 -> 0 bytes
 .../gray/btn/btn-default-toolbar-large-over-bg.gif |    Bin 1837 -> 0 bytes
 .../btn/btn-default-toolbar-large-over-corners.gif |    Bin 1618 -> 0 bytes
 .../btn/btn-default-toolbar-large-over-sides.gif   |    Bin 1934 -> 0 bytes
 .../btn/btn-default-toolbar-large-pressed-bg.gif   |    Bin 1858 -> 0 bytes
 .../btn-default-toolbar-large-pressed-corners.gif  |    Bin 1619 -> 0 bytes
 .../btn-default-toolbar-large-pressed-sides.gif    |    Bin 1947 -> 0 bytes
 .../gray/btn/btn-default-toolbar-large-sides.gif   |    Bin 1596 -> 0 bytes
 .../btn/btn-default-toolbar-medium-corners.gif     |    Bin 1585 -> 0 bytes
 ...btn-default-toolbar-medium-disabled-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-medium-disabled-sides.gif  |    Bin 1594 -> 0 bytes
 .../btn/btn-default-toolbar-medium-focus-bg.gif    |    Bin 1823 -> 0 bytes
 .../btn-default-toolbar-medium-focus-corners.gif   |    Bin 1619 -> 0 bytes
 .../btn/btn-default-toolbar-medium-focus-sides.gif |    Bin 1915 -> 0 bytes
 .../btn/btn-default-toolbar-medium-over-bg.gif     |    Bin 1823 -> 0 bytes
 .../btn-default-toolbar-medium-over-corners.gif    |    Bin 1619 -> 0 bytes
 .../btn/btn-default-toolbar-medium-over-sides.gif  |    Bin 1915 -> 0 bytes
 .../btn/btn-default-toolbar-medium-pressed-bg.gif  |    Bin 1839 -> 0 bytes
 .../btn-default-toolbar-medium-pressed-corners.gif |    Bin 1621 -> 0 bytes
 .../btn-default-toolbar-medium-pressed-sides.gif   |    Bin 1917 -> 0 bytes
 .../gray/btn/btn-default-toolbar-medium-sides.gif  |    Bin 1594 -> 0 bytes
 .../gray/btn/btn-default-toolbar-small-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-small-disabled-corners.gif |    Bin 1585 -> 0 bytes
 .../btn-default-toolbar-small-disabled-sides.gif   |    Bin 1589 -> 0 bytes
 .../btn/btn-default-toolbar-small-focus-bg.gif     |    Bin 1810 -> 0 bytes
 .../btn-default-toolbar-small-focus-corners.gif    |    Bin 1621 -> 0 bytes
 .../btn/btn-default-toolbar-small-focus-sides.gif  |    Bin 1892 -> 0 bytes
 .../gray/btn/btn-default-toolbar-small-over-bg.gif |    Bin 1810 -> 0 bytes
 .../btn/btn-default-toolbar-small-over-corners.gif |    Bin 1621 -> 0 bytes
 .../btn/btn-default-toolbar-small-over-sides.gif   |    Bin 1892 -> 0 bytes
 .../btn/btn-default-toolbar-small-pressed-bg.gif   |    Bin 1816 -> 0 bytes
 .../btn-default-toolbar-small-pressed-corners.gif  |    Bin 1621 -> 0 bytes
 .../btn-default-toolbar-small-pressed-sides.gif    |    Bin 1894 -> 0 bytes
 .../gray/btn/btn-default-toolbar-small-sides.gif   |    Bin 1589 -> 0 bytes
 .../resources/themes/images/gray/button/arrow.gif  |    Bin 828 -> 0 bytes
 .../themes/images/gray/button/btn-arrow.gif        |    Bin 870 -> 0 bytes
 .../themes/images/gray/button/btn-sprite.gif       |    Bin 1222 -> 0 bytes
 .../resources/themes/images/gray/button/btn.gif    |    Bin 3319 -> 0 bytes
 .../themes/images/gray/button/group-cs.gif         |    Bin 2459 -> 0 bytes
 .../themes/images/gray/button/group-lr.gif         |    Bin 861 -> 0 bytes
 .../themes/images/gray/button/group-tb.gif         |    Bin 846 -> 0 bytes
 .../themes/images/gray/button/s-arrow-b-noline.gif |    Bin 898 -> 0 bytes
 .../themes/images/gray/button/s-arrow-b.gif        |    Bin 937 -> 0 bytes
 .../themes/images/gray/button/s-arrow-bo.gif       |    Bin 123 -> 0 bytes
 .../themes/images/gray/button/s-arrow-light.gif    |    Bin 116 -> 0 bytes
 .../themes/images/gray/button/s-arrow-noline.gif   |    Bin 863 -> 0 bytes
 .../themes/images/gray/button/s-arrow-o.gif        |    Bin 139 -> 0 bytes
 .../themes/images/gray/button/s-arrow.gif          |    Bin 937 -> 0 bytes
 .../gray/datepicker/datepicker-footer-bg.gif       |    Bin 1800 -> 0 bytes
 .../gray/datepicker/datepicker-footer-bg.png       |    Bin 328 -> 0 bytes
 .../gray/datepicker/datepicker-header-bg.gif       |    Bin 1836 -> 0 bytes
 .../gray/datepicker/datepicker-header-bg.png       |    Bin 309 -> 0 bytes
 .../resources/themes/images/gray/dd/drop-add.gif   |    Bin 1001 -> 0 bytes
 .../resources/themes/images/gray/dd/drop-no.gif    |    Bin 949 -> 0 bytes
 .../resources/themes/images/gray/dd/drop-yes.gif   |    Bin 1016 -> 0 bytes
 .../themes/images/gray/editor/tb-sprite.gif        |    Bin 2072 -> 0 bytes
 .../form-invalid-tip/form-invalid-tip-corners.gif  |    Bin 1690 -> 0 bytes
 .../form-invalid-tip-default-corners.gif           |    Bin 1690 -> 0 bytes
 .../form-invalid-tip-default-sides.gif             |    Bin 1647 -> 0 bytes
 .../form-invalid-tip/form-invalid-tip-sides.gif    |    Bin 1647 -> 0 bytes
 .../resources/themes/images/gray/form/checkbox.gif |    Bin 2061 -> 0 bytes
 .../themes/images/gray/form/clear-trigger.gif      |    Bin 1425 -> 0 bytes
 .../themes/images/gray/form/date-trigger.gif       |    Bin 929 -> 0 bytes
 .../themes/images/gray/form/error-tip-corners.gif  |    Bin 4183 -> 0 bytes
 .../themes/images/gray/form/exclamation.gif        |    Bin 996 -> 0 bytes
 .../resources/themes/images/gray/form/radio.gif    |    Bin 1746 -> 0 bytes
 .../themes/images/gray/form/search-trigger.gif     |    Bin 2220 -> 0 bytes
 .../themes/images/gray/form/spinner-small.gif      |    Bin 743 -> 0 bytes
 .../resources/themes/images/gray/form/spinner.gif  |    Bin 1975 -> 0 bytes
 .../resources/themes/images/gray/form/text-bg.gif  |    Bin 819 -> 0 bytes
 .../themes/images/gray/form/trigger-square.gif     |    Bin 1071 -> 0 bytes
 .../themes/images/gray/form/trigger-tpl.gif        |    Bin 1487 -> 0 bytes
 .../resources/themes/images/gray/form/trigger.gif  |    Bin 1080 -> 0 bytes
 .../themes/images/gray/grid/arrow-left-white.gif   |    Bin 825 -> 0 bytes
 .../themes/images/gray/grid/arrow-right-white.gif  |    Bin 825 -> 0 bytes
 .../themes/images/gray/grid/cell-special-bg.gif    |    Bin 1636 -> 0 bytes
 .../themes/images/gray/grid/cell-special-bg.png    |    Bin 121 -> 0 bytes
 .../images/gray/grid/cell-special-selected-bg.gif  |    Bin 1640 -> 0 bytes
 .../images/gray/grid/cell-special-selected-bg.png  |    Bin 136 -> 0 bytes
 .../resources/themes/images/gray/grid/checked.gif  |    Bin 959 -> 0 bytes
 .../themes/images/gray/grid/col-move-bottom.gif    |    Bin 177 -> 0 bytes
 .../themes/images/gray/grid/col-move-top.gif       |    Bin 178 -> 0 bytes
 .../themes/images/gray/grid/column-header-bg.gif   |    Bin 1858 -> 0 bytes
 .../themes/images/gray/grid/column-header-bg.png   |    Bin 293 -> 0 bytes
 .../images/gray/grid/column-header-over-bg.gif     |    Bin 1767 -> 0 bytes
 .../images/gray/grid/column-header-over-bg.png     |    Bin 283 -> 0 bytes
 .../resources/themes/images/gray/grid/columns.gif  |    Bin 962 -> 0 bytes
 .../images/gray/grid/dd-insert-arrow-left.gif      |    Bin 299 -> 0 bytes
 .../images/gray/grid/dd-insert-arrow-left.png      |    Bin 345 -> 0 bytes
 .../images/gray/grid/dd-insert-arrow-right.gif     |    Bin 301 -> 0 bytes
 .../images/gray/grid/dd-insert-arrow-right.png     |    Bin 349 -> 0 bytes
 .../resources/themes/images/gray/grid/dirty.gif    |    Bin 832 -> 0 bytes
 .../ext/resources/themes/images/gray/grid/done.gif |    Bin 133 -> 0 bytes
 .../resources/themes/images/gray/grid/drop-no.gif  |    Bin 947 -> 0 bytes
 .../resources/themes/images/gray/grid/drop-yes.gif |    Bin 860 -> 0 bytes
 .../themes/images/gray/grid/footer-bg.gif          |    Bin 834 -> 0 bytes
 .../themes/images/gray/grid/grid-blue-hd.gif       |    Bin 829 -> 0 bytes
 .../themes/images/gray/grid/grid-blue-split.gif    |    Bin 817 -> 0 bytes
 .../themes/images/gray/grid/grid-hrow.gif          |    Bin 855 -> 0 bytes
 .../themes/images/gray/grid/grid-loading.gif       |    Bin 701 -> 0 bytes
 .../themes/images/gray/grid/grid-split.gif         |    Bin 817 -> 0 bytes
 .../themes/images/gray/grid/grid-vista-hd.gif      |    Bin 829 -> 0 bytes
 .../themes/images/gray/grid/grid3-hd-btn.gif       |    Bin 482 -> 0 bytes
 .../themes/images/gray/grid/grid3-hrow-over.gif    |    Bin 823 -> 0 bytes
 .../themes/images/gray/grid/grid3-hrow.gif         |    Bin 836 -> 0 bytes
 .../themes/images/gray/grid/grid3-rowheader.gif    |    Bin 43 -> 0 bytes
 .../resources/themes/images/gray/grid/group-by.gif |    Bin 917 -> 0 bytes
 .../themes/images/gray/grid/group-collapse.gif     |    Bin 136 -> 0 bytes
 .../images/gray/grid/group-expand-sprite.gif       |    Bin 196 -> 0 bytes
 .../themes/images/gray/grid/group-expand.gif       |    Bin 138 -> 0 bytes
 .../resources/themes/images/gray/grid/hd-pop.gif   |    Bin 839 -> 0 bytes
 .../themes/images/gray/grid/hmenu-asc.gif          |    Bin 931 -> 0 bytes
 .../themes/images/gray/grid/hmenu-desc.gif         |    Bin 930 -> 0 bytes
 .../themes/images/gray/grid/hmenu-lock.gif         |    Bin 955 -> 0 bytes
 .../themes/images/gray/grid/hmenu-lock.png         |    Bin 648 -> 0 bytes
 .../themes/images/gray/grid/hmenu-unlock.gif       |    Bin 971 -> 0 bytes
 .../themes/images/gray/grid/hmenu-unlock.png       |    Bin 697 -> 0 bytes
 .../themes/images/gray/grid/invalid_line.gif       |    Bin 815 -> 0 bytes
 .../resources/themes/images/gray/grid/loading.gif  |    Bin 771 -> 0 bytes
 .../resources/themes/images/gray/grid/mso-hd.gif   |    Bin 875 -> 0 bytes
 .../resources/themes/images/gray/grid/nowait.gif   |    Bin 884 -> 0 bytes
 .../images/gray/grid/page-first-disabled.gif       |    Bin 925 -> 0 bytes
 .../themes/images/gray/grid/page-first.gif         |    Bin 327 -> 0 bytes
 .../themes/images/gray/grid/page-last-disabled.gif |    Bin 923 -> 0 bytes
 .../themes/images/gray/grid/page-last.gif          |    Bin 325 -> 0 bytes
 .../themes/images/gray/grid/page-next-disabled.gif |    Bin 875 -> 0 bytes
 .../themes/images/gray/grid/page-next.gif          |    Bin 183 -> 0 bytes
 .../themes/images/gray/grid/page-prev-disabled.gif |    Bin 879 -> 0 bytes
 .../themes/images/gray/grid/page-prev.gif          |    Bin 186 -> 0 bytes
 .../themes/images/gray/grid/pick-button.gif        |    Bin 1036 -> 0 bytes
 .../themes/images/gray/grid/property-cell-bg.gif   |    Bin 915 -> 0 bytes
 .../images/gray/grid/property-cell-selected-bg.gif |    Bin 843 -> 0 bytes
 .../themes/images/gray/grid/refresh-disabled.gif   |    Bin 577 -> 0 bytes
 .../resources/themes/images/gray/grid/refresh.gif  |    Bin 570 -> 0 bytes
 .../themes/images/gray/grid/row-check-sprite.gif   |    Bin 1083 -> 0 bytes
 .../themes/images/gray/grid/row-expand-sprite.gif  |    Bin 196 -> 0 bytes
 .../resources/themes/images/gray/grid/row-over.gif |    Bin 823 -> 0 bytes
 .../resources/themes/images/gray/grid/row-sel.gif  |    Bin 823 -> 0 bytes
 .../resources/themes/images/gray/grid/sort-hd.gif  |    Bin 2731 -> 0 bytes
 .../resources/themes/images/gray/grid/sort_asc.gif |    Bin 59 -> 0 bytes
 .../themes/images/gray/grid/sort_desc.gif          |    Bin 59 -> 0 bytes
 .../themes/images/gray/grid/unchecked.gif          |    Bin 941 -> 0 bytes
 .../ext/resources/themes/images/gray/grid/wait.gif |    Bin 1100 -> 0 bytes
 .../themes/images/gray/layout/mini-bottom.gif      |    Bin 856 -> 0 bytes
 .../themes/images/gray/layout/mini-left.gif        |    Bin 871 -> 0 bytes
 .../themes/images/gray/layout/mini-right.gif       |    Bin 872 -> 0 bytes
 .../themes/images/gray/layout/mini-top.gif         |    Bin 856 -> 0 bytes
 .../resources/themes/images/gray/menu/checked.gif  |    Bin 959 -> 0 bytes
 .../themes/images/gray/menu/group-checked.gif      |    Bin 295 -> 0 bytes
 .../themes/images/gray/menu/item-over-disabled.gif |    Bin 49 -> 0 bytes
 .../themes/images/gray/menu/item-over.gif          |    Bin 850 -> 0 bytes
 .../images/gray/menu/menu-item-active-bg.gif       |    Bin 1820 -> 0 bytes
 .../images/gray/menu/menu-item-active-corners.gif  |    Bin 1620 -> 0 bytes
 .../images/gray/menu/menu-item-active-sides.gif    |    Bin 1902 -> 0 bytes
 .../themes/images/gray/menu/menu-parent.gif        |    Bin 165 -> 0 bytes
 .../ext/resources/themes/images/gray/menu/menu.gif |    Bin 834 -> 0 bytes
 .../themes/images/gray/menu/unchecked.gif          |    Bin 941 -> 0 bytes
 .../panel-header-default-bottom-bg.gif             |    Bin 1842 -> 0 bytes
 .../panel-header-default-framed-bottom-bg.gif      |    Bin 1829 -> 0 bytes
 .../panel-header-default-framed-bottom-corners.gif |    Bin 1641 -> 0 bytes
 .../panel-header-default-framed-bottom-sides.gif   |    Bin 2009 -> 0 bytes
 ...l-header-default-framed-collapsed-bottom-bg.gif |    Bin 1819 -> 0 bytes
 ...der-default-framed-collapsed-bottom-corners.gif |    Bin 1652 -> 0 bytes
 ...eader-default-framed-collapsed-bottom-sides.gif |    Bin 1995 -> 0 bytes
 ...nel-header-default-framed-collapsed-left-bg.gif |    Bin 1633 -> 0 bytes
 ...eader-default-framed-collapsed-left-corners.gif |    Bin 1676 -> 0 bytes
 ...-header-default-framed-collapsed-left-sides.gif |    Bin 1828 -> 0 bytes
 ...el-header-default-framed-collapsed-right-bg.gif |    Bin 1634 -> 0 bytes
 ...ader-default-framed-collapsed-right-corners.gif |    Bin 1677 -> 0 bytes
 ...header-default-framed-collapsed-right-sides.gif |    Bin 1832 -> 0 bytes
 ...anel-header-default-framed-collapsed-top-bg.gif |    Bin 1819 -> 0 bytes
 ...header-default-framed-collapsed-top-corners.gif |    Bin 1656 -> 0 bytes
 ...l-header-default-framed-collapsed-top-sides.gif |    Bin 2003 -> 0 bytes
 .../panel-header-default-framed-left-bg.gif        |    Bin 1637 -> 0 bytes
 .../panel-header-default-framed-left-corners.gif   |    Bin 1660 -> 0 bytes
 .../panel-header-default-framed-left-sides.gif     |    Bin 1841 -> 0 bytes
 .../panel-header-default-framed-right-bg.gif       |    Bin 1638 -> 0 bytes
 .../panel-header-default-framed-right-corners.gif  |    Bin 1659 -> 0 bytes
 .../panel-header-default-framed-right-sides.gif    |    Bin 1842 -> 0 bytes
 .../panel-header-default-framed-top-bg.gif         |    Bin 1838 -> 0 bytes
 .../panel-header-default-framed-top-corners.gif    |    Bin 1641 -> 0 bytes
 .../panel-header-default-framed-top-sides.gif      |    Bin 2018 -> 0 bytes
 .../panel-header/panel-header-default-left-bg.gif  |    Bin 1640 -> 0 bytes
 .../panel-header/panel-header-default-right-bg.gif |    Bin 1641 -> 0 bytes
 .../panel-header/panel-header-default-top-bg.gif   |    Bin 1851 -> 0 bytes
 .../gray/panel/panel-default-framed-corners.gif    |    Bin 1631 -> 0 bytes
 .../gray/panel/panel-default-framed-sides.gif      |    Bin 1727 -> 0 bytes
 .../images/gray/progress/progress-default-bg.gif   |    Bin 1832 -> 0 bytes
 .../themes/images/gray/shared/blue-loading.gif     |    Bin 3236 -> 0 bytes
 .../themes/images/gray/shared/calendar.gif         |    Bin 979 -> 0 bytes
 .../themes/images/gray/shared/glass-bg.gif         |    Bin 873 -> 0 bytes
 .../themes/images/gray/shared/hd-sprite.gif        |    Bin 1099 -> 0 bytes
 .../themes/images/gray/shared/icon-error.gif       |    Bin 1669 -> 0 bytes
 .../themes/images/gray/shared/icon-info.gif        |    Bin 1586 -> 0 bytes
 .../themes/images/gray/shared/icon-question.gif    |    Bin 1607 -> 0 bytes
 .../themes/images/gray/shared/icon-warning.gif     |    Bin 1483 -> 0 bytes
 .../themes/images/gray/shared/large-loading.gif    |    Bin 3236 -> 0 bytes
 .../themes/images/gray/shared/left-btn.gif         |    Bin 106 -> 0 bytes
 .../themes/images/gray/shared/loading-balls.gif    |    Bin 2118 -> 0 bytes
 .../themes/images/gray/shared/right-btn.gif        |    Bin 107 -> 0 bytes
 .../themes/images/gray/shared/shadow-c.png         |    Bin 118 -> 0 bytes
 .../themes/images/gray/shared/shadow-lr.png        |    Bin 135 -> 0 bytes
 .../resources/themes/images/gray/shared/shadow.png |    Bin 311 -> 0 bytes
 .../themes/images/gray/shared/warning.gif          |    Bin 960 -> 0 bytes
 .../themes/images/gray/sizer/e-handle-dark.gif     |    Bin 1062 -> 0 bytes
 .../themes/images/gray/sizer/e-handle.gif          |    Bin 753 -> 0 bytes
 .../themes/images/gray/sizer/ne-handle-dark.gif    |    Bin 839 -> 0 bytes
 .../themes/images/gray/sizer/ne-handle.gif         |    Bin 128 -> 0 bytes
 .../themes/images/gray/sizer/nw-handle-dark.gif    |    Bin 839 -> 0 bytes
 .../themes/images/gray/sizer/nw-handle.gif         |    Bin 114 -> 0 bytes
 .../themes/images/gray/sizer/s-handle-dark.gif     |    Bin 1060 -> 0 bytes
 .../themes/images/gray/sizer/s-handle.gif          |    Bin 494 -> 0 bytes
 .../themes/images/gray/sizer/se-handle-dark.gif    |    Bin 838 -> 0 bytes
 .../themes/images/gray/sizer/se-handle.gif         |    Bin 114 -> 0 bytes
 .../resources/themes/images/gray/sizer/square.gif  |    Bin 123 -> 0 bytes
 .../themes/images/gray/sizer/sw-handle-dark.gif    |    Bin 839 -> 0 bytes
 .../themes/images/gray/sizer/sw-handle.gif         |    Bin 116 -> 0 bytes
 .../themes/images/gray/slider/slider-bg.gif        |    Bin 145 -> 0 bytes
 .../themes/images/gray/slider/slider-bg.png        |    Bin 1494 -> 0 bytes
 .../themes/images/gray/slider/slider-thumb.gif     |    Bin 542 -> 0 bytes
 .../themes/images/gray/slider/slider-thumb.png     |    Bin 675 -> 0 bytes
 .../themes/images/gray/slider/slider-v-bg.gif      |    Bin 150 -> 0 bytes
 .../themes/images/gray/slider/slider-v-bg.png      |    Bin 288 -> 0 bytes
 .../themes/images/gray/slider/slider-v-thumb.gif   |    Bin 533 -> 0 bytes
 .../themes/images/gray/slider/slider-v-thumb.png   |    Bin 632 -> 0 bytes
 .../themes/images/gray/tab-bar/scroll-left.gif     |    Bin 1260 -> 0 bytes
 .../themes/images/gray/tab-bar/scroll-right.gif    |    Bin 1269 -> 0 bytes
 .../images/gray/tab-bar/tab-bar-default-bg.gif     |    Bin 1750 -> 0 bytes
 .../gray/tab/tab-default-bottom-active-bg.gif      |    Bin 1813 -> 0 bytes
 .../gray/tab/tab-default-bottom-active-corners.gif |    Bin 1642 -> 0 bytes
 .../gray/tab/tab-default-bottom-active-sides.gif   |    Bin 1998 -> 0 bytes
 .../images/gray/tab/tab-default-bottom-bg.gif      |    Bin 1796 -> 0 bytes
 .../images/gray/tab/tab-default-bottom-corners.gif |    Bin 1646 -> 0 bytes
 .../gray/tab/tab-default-bottom-disabled-bg.gif    |    Bin 1796 -> 0 bytes
 .../tab/tab-default-bottom-disabled-corners.gif    |    Bin 1632 -> 0 bytes
 .../gray/tab/tab-default-bottom-disabled-sides.gif |    Bin 1989 -> 0 bytes
 .../images/gray/tab/tab-default-bottom-over-bg.gif |    Bin 1783 -> 0 bytes
 .../gray/tab/tab-default-bottom-over-corners.gif   |    Bin 1642 -> 0 bytes
 .../gray/tab/tab-default-bottom-over-sides.gif     |    Bin 1979 -> 0 bytes
 .../images/gray/tab/tab-default-bottom-sides.gif   |    Bin 1985 -> 0 bytes
 .../themes/images/gray/tab/tab-default-close.gif   |    Bin 896 -> 0 bytes
 .../images/gray/tab/tab-default-top-active-bg.gif  |    Bin 1811 -> 0 bytes
 .../gray/tab/tab-default-top-active-corners.gif    |    Bin 1645 -> 0 bytes
 .../gray/tab/tab-default-top-active-sides.gif      |    Bin 1997 -> 0 bytes
 .../themes/images/gray/tab/tab-default-top-bg.gif  |    Bin 1795 -> 0 bytes
 .../images/gray/tab/tab-default-top-corners.gif    |    Bin 1647 -> 0 bytes
 .../gray/tab/tab-default-top-disabled-bg.gif       |    Bin 1789 -> 0 bytes
 .../gray/tab/tab-default-top-disabled-corners.gif  |    Bin 1637 -> 0 bytes
 .../gray/tab/tab-default-top-disabled-sides.gif    |    Bin 1977 -> 0 bytes
 .../images/gray/tab/tab-default-top-over-bg.gif    |    Bin 1773 -> 0 bytes
 .../gray/tab/tab-default-top-over-corners.gif      |    Bin 1648 -> 0 bytes
 .../images/gray/tab/tab-default-top-over-sides.gif |    Bin 1960 -> 0 bytes
 .../images/gray/tab/tab-default-top-sides.gif      |    Bin 1983 -> 0 bytes
 .../themes/images/gray/tip/tip-corners.gif         |    Bin 1620 -> 0 bytes
 .../resources/themes/images/gray/tip/tip-sides.gif |    Bin 1623 -> 0 bytes
 .../resources/themes/images/gray/toolbar/more.gif  |    Bin 845 -> 0 bytes
 .../themes/images/gray/toolbar/scroll-left.gif     |    Bin 1861 -> 0 bytes
 .../themes/images/gray/toolbar/scroll-right.gif    |    Bin 1865 -> 0 bytes
 .../images/gray/toolbar/toolbar-default-bg.gif     |    Bin 1801 -> 0 bytes
 .../themes/images/gray/tools/tool-sprite-tpl.gif   |    Bin 971 -> 0 bytes
 .../themes/images/gray/tools/tool-sprites.gif      |    Bin 5835 -> 0 bytes
 .../images/gray/tools/tools-sprites-trans.gif      |    Bin 1981 -> 0 bytes
 .../resources/themes/images/gray/tree/arrows.gif   |    Bin 617 -> 0 bytes
 .../themes/images/gray/tree/drop-above.gif         |    Bin 911 -> 0 bytes
 .../resources/themes/images/gray/tree/drop-add.gif |    Bin 1001 -> 0 bytes
 .../themes/images/gray/tree/drop-append.gif        |    Bin 1001 -> 0 bytes
 .../themes/images/gray/tree/drop-below.gif         |    Bin 911 -> 0 bytes
 .../themes/images/gray/tree/drop-between.gif       |    Bin 907 -> 0 bytes
 .../resources/themes/images/gray/tree/drop-no.gif  |    Bin 949 -> 0 bytes
 .../themes/images/gray/tree/drop-over.gif          |    Bin 911 -> 0 bytes
 .../themes/images/gray/tree/drop-under.gif         |    Bin 911 -> 0 bytes
 .../resources/themes/images/gray/tree/drop-yes.gif |    Bin 1016 -> 0 bytes
 .../themes/images/gray/tree/elbow-end-minus-nl.gif |    Bin 898 -> 0 bytes
 .../themes/images/gray/tree/elbow-end-minus.gif    |    Bin 905 -> 0 bytes
 .../themes/images/gray/tree/elbow-end-plus-nl.gif  |    Bin 900 -> 0 bytes
 .../themes/images/gray/tree/elbow-end-plus.gif     |    Bin 907 -> 0 bytes
 .../themes/images/gray/tree/elbow-end.gif          |    Bin 844 -> 0 bytes
 .../themes/images/gray/tree/elbow-line.gif         |    Bin 846 -> 0 bytes
 .../themes/images/gray/tree/elbow-minus-nl.gif     |    Bin 898 -> 0 bytes
 .../themes/images/gray/tree/elbow-minus.gif        |    Bin 908 -> 0 bytes
 .../themes/images/gray/tree/elbow-plus-nl.gif      |    Bin 900 -> 0 bytes
 .../themes/images/gray/tree/elbow-plus.gif         |    Bin 910 -> 0 bytes
 .../resources/themes/images/gray/tree/elbow.gif    |    Bin 850 -> 0 bytes
 .../themes/images/gray/tree/folder-open.gif        |    Bin 956 -> 0 bytes
 .../resources/themes/images/gray/tree/folder.gif   |    Bin 952 -> 0 bytes
 .../ext/resources/themes/images/gray/tree/leaf.gif |    Bin 945 -> 0 bytes
 .../resources/themes/images/gray/tree/loading.gif  |    Bin 771 -> 0 bytes
 .../ext/resources/themes/images/gray/tree/s.gif    |    Bin 43 -> 0 bytes
 .../images/gray/util/splitter/mini-bottom.gif      |    Bin 856 -> 0 bytes
 .../themes/images/gray/util/splitter/mini-left.gif |    Bin 871 -> 0 bytes
 .../images/gray/util/splitter/mini-right.gif       |    Bin 872 -> 0 bytes
 .../themes/images/gray/util/splitter/mini-top.gif  |    Bin 856 -> 0 bytes
 .../window-header-default-bottom-corners.gif       |    Bin 1652 -> 0 bytes
 .../window-header-default-bottom-sides.gif         |    Bin 1620 -> 0 bytes
 .../window-header-default-left-corners.gif         |    Bin 1647 -> 0 bytes
 .../window-header-default-left-sides.gif           |    Bin 1607 -> 0 bytes
 .../window-header-default-right-corners.gif        |    Bin 1649 -> 0 bytes
 .../window-header-default-right-sides.gif          |    Bin 1607 -> 0 bytes
 .../window-header-default-top-corners.gif          |    Bin 1661 -> 0 bytes
 .../window-header-default-top-sides.gif            |    Bin 1620 -> 0 bytes
 .../themes/images/gray/window/icon-error.gif       |    Bin 1669 -> 0 bytes
 .../themes/images/gray/window/icon-info.gif        |    Bin 1586 -> 0 bytes
 .../themes/images/gray/window/icon-question.gif    |    Bin 1607 -> 0 bytes
 .../themes/images/gray/window/icon-warning.gif     |    Bin 1483 -> 0 bytes
 .../images/gray/window/window-default-corners.gif  |    Bin 1672 -> 0 bytes
 .../images/gray/window/window-default-sides.gif    |    Bin 1776 -> 0 bytes
 interface/index.html                               |    468 -
 interface/istsos-old.xds                           |  10998 --
 interface/istsos.xds                               |  14185 --
 interface/nbproject/private/private.properties     |      5 -
 interface/nbproject/private/private.xml            |     23 -
 interface/nbproject/private/retriever/catalog.xml  |    153 -
 .../schemas.opengis.net/filter/1.1.0/expr.xsd      |     67 -
 .../schemas.opengis.net/filter/1.1.0/filter.xsd    |    265 -
 .../schemas.opengis.net/filter/1.1.0/filterAll.xsd |     26 -
 .../filter/1.1.0/filterCapabilities.xsd            |    171 -
 .../schemas.opengis.net/filter/1.1.0/sort.xsd      |     47 -
 .../gml/3.1.1/base/basicTypes.xsd                  |    279 -
 .../gml/3.1.1/base/coordinateOperations.xsd        |    790 -
 .../gml/3.1.1/base/coordinateReferenceSystems.xsd  |    430 -
 .../gml/3.1.1/base/coordinateSystems.xsd           |    409 -
 .../gml/3.1.1/base/coverage.xsd                    |    452 -
 .../gml/3.1.1/base/dataQuality.xsd                 |    130 -
 .../schemas.opengis.net/gml/3.1.1/base/datums.xsd  |    485 -
 .../gml/3.1.1/base/defaultStyle.xsd                |    455 -
 .../gml/3.1.1/base/dictionary.xsd                  |    138 -
 .../gml/3.1.1/base/direction.xsd                   |     73 -
 .../gml/3.1.1/base/dynamicFeature.xsd              |    116 -
 .../schemas.opengis.net/gml/3.1.1/base/feature.xsd |    200 -
 .../gml/3.1.1/base/geometryAggregates.xsd          |    431 -
 .../gml/3.1.1/base/geometryBasic0d1d.xsd           |    603 -
 .../gml/3.1.1/base/geometryBasic2d.xsd             |    214 -
 .../gml/3.1.1/base/geometryComplexes.xsd           |    142 -
 .../gml/3.1.1/base/geometryPrimitives.xsd          |   1610 -
 .../schemas.opengis.net/gml/3.1.1/base/gml.xsd     |     22 -
 .../schemas.opengis.net/gml/3.1.1/base/gmlBase.xsd |    295 -
 .../schemas.opengis.net/gml/3.1.1/base/grids.xsd   |     77 -
 .../gml/3.1.1/base/measures.xsd                    |    201 -
 .../gml/3.1.1/base/observation.xsd                 |     97 -
 .../gml/3.1.1/base/referenceSystems.xsd            |    212 -
 .../gml/3.1.1/base/temporal.xsd                    |    333 -
 .../gml/3.1.1/base/temporalReferenceSystems.xsd    |    252 -
 .../gml/3.1.1/base/temporalTopology.xsd            |    187 -
 .../gml/3.1.1/base/topology.xsd                    |    460 -
 .../schemas.opengis.net/gml/3.1.1/base/units.xsd   |    171 -
 .../gml/3.1.1/base/valueObjects.xsd                |    362 -
 .../gml/3.1.1/smil/smil20-language.xsd             |    117 -
 .../schemas.opengis.net/gml/3.1.1/smil/smil20.xsd  |    234 -
 .../schemas.opengis.net/gml/3.2.1/basicTypes.xsd   |    268 -
 .../gml/3.2.1/coordinateOperations.xsd             |    525 -
 .../gml/3.2.1/coordinateReferenceSystems.xsd       |    373 -
 .../gml/3.2.1/coordinateSystems.xsd                |    297 -
 .../schemas.opengis.net/gml/3.2.1/coverage.xsd     |    292 -
 .../schemas.opengis.net/gml/3.2.1/datums.xsd       |    287 -
 .../gml/3.2.1/deprecatedTypes.xsd                  |   1133 -
 .../schemas.opengis.net/gml/3.2.1/dictionary.xsd   |     90 -
 .../schemas.opengis.net/gml/3.2.1/direction.xsd    |     84 -
 .../gml/3.2.1/dynamicFeature.xsd                   |    109 -
 .../schemas.opengis.net/gml/3.2.1/feature.xsd      |     94 -
 .../gml/3.2.1/geometryAggregates.xsd               |    197 -
 .../gml/3.2.1/geometryBasic0d1d.xsd                |    277 -
 .../gml/3.2.1/geometryBasic2d.xsd                  |    124 -
 .../gml/3.2.1/geometryComplexes.xsd                |     95 -
 .../gml/3.2.1/geometryPrimitives.xsd               |    846 -
 .../schemas.opengis.net/gml/3.2.1/gml.xsd          |     20 -
 .../schemas.opengis.net/gml/3.2.1/gmlBase.xsd      |    185 -
 .../schemas.opengis.net/gml/3.2.1/grids.xsd        |     64 -
 .../schemas.opengis.net/gml/3.2.1/measures.xsd     |     68 -
 .../schemas.opengis.net/gml/3.2.1/observation.xsd  |     95 -
 .../gml/3.2.1/referenceSystems.xsd                 |     70 -
 .../schemas.opengis.net/gml/3.2.1/temporal.xsd     |    269 -
 .../gml/3.2.1/temporalReferenceSystems.xsd         |    189 -
 .../gml/3.2.1/temporalTopology.xsd                 |    119 -
 .../schemas.opengis.net/gml/3.2.1/topology.xsd     |    386 -
 .../schemas.opengis.net/gml/3.2.1/units.xsd        |    162 -
 .../schemas.opengis.net/gml/3.2.1/valueObjects.xsd |    205 -
 .../schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd       |    553 -
 .../iso/19139/20070417/gco/basicTypes.xsd          |    431 -
 .../iso/19139/20070417/gco/gco.xsd                 |     12 -
 .../iso/19139/20070417/gco/gcoBase.xsd             |     63 -
 .../iso/19139/20070417/gmd/applicationSchema.xsd   |     43 -
 .../iso/19139/20070417/gmd/citation.xsd            |    276 -
 .../iso/19139/20070417/gmd/constraints.xsd         |    107 -
 .../iso/19139/20070417/gmd/content.xsd             |    190 -
 .../iso/19139/20070417/gmd/dataQuality.xsd         |    556 -
 .../iso/19139/20070417/gmd/distribution.xsd        |    203 -
 .../iso/19139/20070417/gmd/extent.xsd              |    206 -
 .../iso/19139/20070417/gmd/freeText.xsd            |    123 -
 .../iso/19139/20070417/gmd/gmd.xsd                 |     12 -
 .../iso/19139/20070417/gmd/identification.xsd      |    349 -
 .../iso/19139/20070417/gmd/maintenance.xsd         |     87 -
 .../iso/19139/20070417/gmd/metadataApplication.xsd |    176 -
 .../iso/19139/20070417/gmd/metadataEntity.xsd      |     71 -
 .../iso/19139/20070417/gmd/metadataExtension.xsd   |    100 -
 .../iso/19139/20070417/gmd/portrayalCatalogue.xsd  |     37 -
 .../iso/19139/20070417/gmd/referenceSystem.xsd     |    101 -
 .../19139/20070417/gmd/spatialRepresentation.xsd   |    238 -
 .../iso/19139/20070417/gsr/gsr.xsd                 |     12 -
 .../iso/19139/20070417/gsr/spatialReferencing.xsd  |     25 -
 .../iso/19139/20070417/gss/geometry.xsd            |     36 -
 .../iso/19139/20070417/gss/gss.xsd                 |     12 -
 .../iso/19139/20070417/gts/gts.xsd                 |     12 -
 .../iso/19139/20070417/gts/temporalObjects.xsd     |     35 -
 .../schemas.opengis.net/om/1.0.0/observation.xsd   |    200 -
 .../retriever/schemas.opengis.net/om/1.0.0/om.xsd  |     17 -
 .../ows/1.1.0/ows19115subset.xsd                   |    236 -
 .../schemas.opengis.net/ows/1.1.0/owsAll.xsd       |     23 -
 .../schemas.opengis.net/ows/1.1.0/owsCommon.xsd    |    158 -
 .../schemas.opengis.net/ows/1.1.0/owsContents.xsd  |     87 -
 .../ows/1.1.0/owsDataIdentification.xsd            |    128 -
 .../ows/1.1.0/owsDomainType.xsd                    |    280 -
 .../ows/1.1.0/owsExceptionReport.xsd               |     77 -
 .../ows/1.1.0/owsGetCapabilities.xsd               |    113 -
 .../ows/1.1.0/owsGetResourceByID.xsd               |     52 -
 .../ows/1.1.0/owsInputOutputData.xsd               |     60 -
 .../schemas.opengis.net/ows/1.1.0/owsManifest.xsd  |    125 -
 .../ows/1.1.0/owsOperationsMetadata.xsd            |    141 -
 .../ows/1.1.0/owsServiceIdentification.xsd         |     61 -
 .../ows/1.1.0/owsServiceProvider.xsd               |     48 -
 .../sampling/1.0.0/LUTgeodesy.xsd                  |    439 -
 .../sampling/1.0.0/sampling.xsd                    |     23 -
 .../sampling/1.0.0/samplingBase.xsd                |    129 -
 .../sampling/1.0.0/samplingManifold.xsd            |    174 -
 .../sampling/1.0.0/specimen.xsd                    |    142 -
 .../sampling/1.0.0/surveyProcedure.xsd             |     88 -
 .../schemas.opengis.net/sensorML/1.0.1/base.xsd    |    483 -
 .../schemas.opengis.net/sensorML/1.0.1/method.xsd  |    172 -
 .../schemas.opengis.net/sensorML/1.0.1/process.xsd |    410 -
 .../sensorML/1.0.1/sensorML.xsd                    |     37 -
 .../schemas.opengis.net/sensorML/1.0.1/system.xsd  |    318 -
 .../schemas.opengis.net/sos/1.0.0/ogc4sos.xsd      |    103 -
 .../schemas.opengis.net/sos/1.0.0/sosAll.xsd       |     32 -
 .../schemas.opengis.net/sos/1.0.0/sosCommon.xsd    |     45 -
 .../schemas.opengis.net/sos/1.0.0/sosContents.xsd  |     98 -
 .../sos/1.0.0/sosDescribeFeatureType.xsd           |     45 -
 .../sos/1.0.0/sosDescribeObservationType.xsd       |     45 -
 .../sos/1.0.0/sosDescribeResultModel.xsd           |     46 -
 .../sos/1.0.0/sosDescribeSensor.xsd                |     51 -
 .../sos/1.0.0/sosGetCapabilities.xsd               |     66 -
 .../sos/1.0.0/sosGetFeatureOfInterest.xsd          |     73 -
 .../sos/1.0.0/sosGetFeatureOfInterestTime.xsd      |     48 -
 .../sos/1.0.0/sosGetObservation.xsd                |    116 -
 .../sos/1.0.0/sosGetObservationById.xsd            |     59 -
 .../schemas.opengis.net/sos/1.0.0/sosGetResult.xsd |     78 -
 .../schemas.opengis.net/sos/1.0.0/sosInsert.xsd    |     62 -
 .../sos/1.0.0/sosRegisterSensor.xsd                |     69 -
 .../sweCommon/1.0.1/aggregateTypes.xsd             |    257 -
 .../sweCommon/1.0.1/basicTypes.xsd                 |    207 -
 .../sweCommon/1.0.1/curveTypes.xsd                 |     68 -
 .../schemas.opengis.net/sweCommon/1.0.1/data.xsd   |     49 -
 .../sweCommon/1.0.1/encoding.xsd                   |    174 -
 .../sweCommon/1.0.1/phenomenon.xsd                 |    172 -
 .../sweCommon/1.0.1/positionTypes.xsd              |    184 -
 .../sweCommon/1.0.1/simpleTypes.xsd                |    659 -
 .../schemas.opengis.net/sweCommon/1.0.1/swe.xsd    |     21 -
 .../sweCommon/1.0.1/temporalAggregates.xsd         |    265 -
 .../sweCommon/1.0.1/xmlData.xsd                    |    117 -
 .../private/retriever/www.w3.org/1999/xlink        |     32 -
 .../private/retriever/www.w3.org/1999/xlink.xsd    |    270 -
 .../private/retriever/www.w3.org/2001/xml.xsd      |    287 -
 interface/nbproject/project.properties             |      7 -
 interface/nbproject/project.xml                    |      9 -
 interface/servicestatus.html                       |     10 -
 interface/test/chart/app/config/data.json          |     18 -
 interface/test/chart/app/store/testColumnStore.js  |     40 -
 interface/test/chart/app/view/testColumn.js        |     24 -
 interface/test/chart/app/view/ui/testColumn.js     |     74 -
 interface/test/chart/charts.xds                    |    175 -
 interface/test/chart/column-cathegory.html         |    326 -
 interface/test/chart/column-time.html              |    326 -
 interface/test/chart/designer.html                 |     14 -
 interface/test/chart/designer.js                   |     32 -
 interface/test/chart/designer_includeOrder.txt     |      3 -
 interface/test_ObservationEditor.html              |     64 -
 interface/test_csv.html                            |     35 -
 interface/test_observedPropertiesEditor.html       |    251 -
 interface/test_procedure.html                      |    127 -
 interface/test_requests.html                       |     25 -
 interface/test_virtualprocedureeditor.html         |     53 -
 interface/viewer.html                              |    113 -
 istsoslib/__init__.py                              |     22 +
 istsoslib/__init__.pyc                             |    Bin 278 -> 269 bytes
 istsoslib/filters/DS_filter.py                     |    201 +-
 istsoslib/filters/DS_filter.pyc                    |    Bin 2710 -> 2683 bytes
 istsoslib/filters/GC_filter.py                     |    118 +-
 istsoslib/filters/GC_filter.pyc                    |    Bin 1737 -> 1710 bytes
 istsoslib/filters/GF_filter.py                     |    206 +-
 istsoslib/filters/GF_filter.pyc                    |    Bin 0 -> 3613 bytes
 istsoslib/filters/GO_filter.py                     |   1132 +-
 istsoslib/filters/GO_filter.pyc                    |    Bin 12306 -> 12298 bytes
 istsoslib/filters/IO_filter.py                     |    567 +-
 istsoslib/filters/IO_filter.pyc                    |    Bin 7502 -> 7854 bytes
 istsoslib/filters/RS_filter.py                     |    121 +-
 istsoslib/filters/RS_filter.pyc                    |    Bin 9703 -> 11056 bytes
 istsoslib/filters/USD_filter.py                    |    178 +-
 istsoslib/filters/__init__.py                      |     22 +
 istsoslib/filters/__init__.pyc                     |    Bin 335 -> 326 bytes
 istsoslib/filters/factory_filters.py               |    201 +-
 istsoslib/filters/factory_filters.pyc              |    Bin 2832 -> 2814 bytes
 istsoslib/filters/filter.py                        |    200 +-
 istsoslib/filters/filter.pyc                       |    Bin 2553 -> 2526 bytes
 istsoslib/renderers/DSresponseRender.py            |    515 +-
 istsoslib/renderers/DSresponseRender.pyc           |    Bin 6845 -> 6818 bytes
 istsoslib/renderers/GCresponseRender.py            |    369 +-
 istsoslib/renderers/GCresponseRender.pyc           |    Bin 7655 -> 0 bytes
 istsoslib/renderers/GFresponseRender.py            |    211 +-
 istsoslib/renderers/GFresponseRender.pyc           |    Bin 0 -> 3616 bytes
 istsoslib/renderers/GOresponseRender.py            |    705 +-
 istsoslib/renderers/GOresponseRender.pyc           |    Bin 10326 -> 10285 bytes
 istsoslib/renderers/IOresponseRender.py            |     61 +-
 istsoslib/renderers/IOresponseRender.pyc           |    Bin 763 -> 745 bytes
 istsoslib/renderers/RSresponseRender.py            |     65 +-
 istsoslib/renderers/RSresponseRender.pyc           |    Bin 929 -> 911 bytes
 istsoslib/renderers/USDresponseRender.py           |     55 +-
 istsoslib/renderers/USDresponseRender.pyc          |    Bin 0 -> 667 bytes
 istsoslib/renderers/__init__.py                    |     22 +
 istsoslib/renderers/__init__.pyc                   |    Bin 395 -> 386 bytes
 istsoslib/renderers/factory_render.py              |    122 +-
 istsoslib/renderers/factory_render.pyc             |    Bin 1449 -> 1431 bytes
 istsoslib/responders/DSresponse.py                 |    242 +-
 istsoslib/responders/DSresponse.pyc                |    Bin 3102 -> 3075 bytes
 istsoslib/responders/GCresponse.py                 |     16 +-
 istsoslib/responders/GCresponse.pyc                |    Bin 15785 -> 15568 bytes
 istsoslib/responders/GFresponse.py                 |    218 +-
 istsoslib/responders/GFresponse.pyc                |    Bin 0 -> 3024 bytes
 istsoslib/responders/GOresponse.py                 |   2142 +-
 istsoslib/responders/GOresponse.pyc                |    Bin 30526 -> 30250 bytes
 istsoslib/responders/IOresponse.py                 |    853 +-
 istsoslib/responders/IOresponse.pyc                |    Bin 10154 -> 10345 bytes
 istsoslib/responders/RSresponse.py                 |    779 +-
 istsoslib/responders/RSresponse.pyc                |    Bin 9248 -> 8689 bytes
 istsoslib/responders/USDresponse.py                |    166 +-
 istsoslib/responders/USDresponse.pyc               |    Bin 0 -> 2578 bytes
 istsoslib/responders/__init__.py                   |     22 +
 istsoslib/responders/__init__.pyc                  |    Bin 332 -> 323 bytes
 istsoslib/responders/factory_response.py           |    117 +-
 istsoslib/responders/factory_response.pyc          |    Bin 1503 -> 1485 bytes
 istsoslib/sosDatabase.py                           |     17 +-
 istsoslib/sosDatabase.pyc                          |    Bin 7529 -> 7385 bytes
 istsoslib/sosException.py                          |     23 +-
 istsoslib/sosException.pyc                         |    Bin 2429 -> 2366 bytes
 istsoslib/sosUtils.py                              |     30 +-
 istsoslib/sosUtils.pyc                             |    Bin 7379 -> 7338 bytes
 istsoslib/sos_version.py                           |     23 +-
 istsoslib/sos_version.pyc                          |    Bin 0 -> 174 bytes
 lib/__init__.py                                    |     19 +-
 lib/__init__.pyc                                   |    Bin 255 -> 261 bytes
 lib/apscheduler.tar.gz                             |    Bin 0 -> 37205 bytes
 lib/apscheduler/__init__.py                        |      2 +-
 lib/apscheduler/__init__.pyc                       |    Bin 0 -> 674 bytes
 lib/apscheduler/events.pyc                         |    Bin 0 -> 2996 bytes
 lib/apscheduler/job.pyc                            |    Bin 0 -> 5974 bytes
 lib/apscheduler/jobstores/__init__.pyc             |    Bin 0 -> 159 bytes
 lib/apscheduler/jobstores/base.pyc                 |    Bin 0 -> 1686 bytes
 lib/apscheduler/jobstores/ram_store.pyc            |    Bin 0 -> 1746 bytes
 lib/apscheduler/jobstores/shelve_store.py          |     14 +-
 lib/apscheduler/scheduler.py                       |     10 +-
 lib/apscheduler/scheduler.pyc                      |    Bin 0 -> 21891 bytes
 lib/apscheduler/threadpool.pyc                     |    Bin 0 -> 4974 bytes
 lib/apscheduler/triggers/__init__.pyc              |    Bin 0 -> 407 bytes
 lib/apscheduler/triggers/cron/__init__.pyc         |    Bin 0 -> 4739 bytes
 lib/apscheduler/triggers/cron/expressions.pyc      |    Bin 0 -> 8527 bytes
 lib/apscheduler/triggers/cron/fields.pyc           |    Bin 0 -> 5447 bytes
 lib/apscheduler/triggers/interval.pyc              |    Bin 0 -> 2035 bytes
 lib/apscheduler/triggers/simple.pyc                |    Bin 0 -> 1366 bytes
 lib/apscheduler/util.pyc                           |    Bin 0 -> 8485 bytes
 lib/argparse.pyc                                   |    Bin 68846 -> 61894 bytes
 lib/etree.py                                       |     19 +-
 lib/etree.pyc                                      |    Bin 745 -> 736 bytes
 lib/isodate/__init__.py                            |     23 +-
 lib/isodate/__init__.pyc                           |    Bin 2342 -> 2473 bytes
 lib/isodate/duration.py                            |     65 +-
 lib/isodate/duration.pyc                           |    Bin 9069 -> 9349 bytes
 lib/isodate/isodates.py                            |     51 +-
 lib/isodate/isodates.pyc                           |    Bin 5948 -> 5719 bytes
 lib/isodate/isodatetime.py                         |     25 +-
 lib/isodate/isodatetime.pyc                        |    Bin 1705 -> 1775 bytes
 lib/isodate/isoduration.py                         |     38 +-
 lib/isodate/isoduration.pyc                        |    Bin 4293 -> 4297 bytes
 lib/isodate/isoerror.py                            |      7 +-
 lib/isodate/isoerror.pyc                           |    Bin 540 -> 453 bytes
 lib/isodate/isostrf.py                             |     50 +-
 lib/isodate/isostrf.pyc                            |    Bin 10639 -> 9307 bytes
 lib/isodate/isotime.py                             |     12 +-
 lib/isodate/isotime.pyc                            |    Bin 3923 -> 3803 bytes
 lib/isodate/isotzinfo.py                           |     25 +-
 lib/isodate/isotzinfo.pyc                          |    Bin 3209 -> 3014 bytes
 lib/isodate/tests/__init__.py                      |     50 +
 lib/isodate/tests/test_date.py                     |    129 +
 lib/isodate/tests/test_datetime.py                 |    146 +
 lib/isodate/tests/test_duration.py                 |    525 +
 lib/isodate/tests/test_pickle.py                   |     54 +
 lib/isodate/tests/test_strf.py                     |    135 +
 lib/isodate/tests/test_time.py                     |    143 +
 lib/isodate/tzinfo.py                              |     37 +-
 lib/isodate/tzinfo.pyc                             |    Bin 5271 -> 4611 bytes
 lib/preparelibs.sh                                 |     19 +
 lib/pytz-old/__init__.py                           |   1513 +
 lib/pytz-old/__init__.pyc                          |    Bin 0 -> 25855 bytes
 lib/pytz-old/exceptions.py                         |     48 +
 lib/pytz-old/lazy.py                               |    168 +
 lib/{pytz => pytz-old}/locales/pytz.pot            |      0
 lib/{pytz => pytz-old}/reference.py                |      0
 lib/{pytz => pytz-old}/tests/__init__.py           |      0
 lib/pytz-old/tests/test_docs.py                    |     34 +
 lib/pytz-old/tests/test_lazy.py                    |    313 +
 lib/pytz-old/tests/test_tzinfo.py                  |    837 +
 lib/pytz-old/tzfile.py                             |    137 +
 lib/pytz-old/tzinfo.py                             |    564 +
 lib/pytz-old/tzinfo.pyc                            |    Bin 0 -> 11247 bytes
 lib/{pytz => pytz-old}/zone.tab                    |      0
 lib/pytz-old/zoneinfo/Africa/Abidjan               |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Abidjan.py  |      0
 lib/pytz-old/zoneinfo/Africa/Accra                 |    Bin 0 -> 840 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Accra.py    |      0
 lib/pytz-old/zoneinfo/Africa/Addis_Ababa           |    Bin 0 -> 283 bytes
 .../zoneinfo/Africa/Addis_Ababa.py                 |      0
 lib/pytz-old/zoneinfo/Africa/Algiers               |    Bin 0 -> 760 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Algiers.py  |      0
 lib/pytz-old/zoneinfo/Africa/Asmara                |    Bin 0 -> 283 bytes
 lib/pytz-old/zoneinfo/Africa/Asmera                |    Bin 0 -> 283 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Asmera.py   |      0
 lib/pytz-old/zoneinfo/Africa/Bamako                |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Bamako.py   |      0
 lib/pytz-old/zoneinfo/Africa/Bangui                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Bangui.py   |      0
 lib/pytz-old/zoneinfo/Africa/Banjul                |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Banjul.py   |      0
 lib/pytz-old/zoneinfo/Africa/Bissau                |    Bin 0 -> 208 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Bissau.py   |      0
 lib/pytz-old/zoneinfo/Africa/Blantyre              |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Blantyre.py |      0
 lib/pytz-old/zoneinfo/Africa/Brazzaville           |    Bin 0 -> 171 bytes
 .../zoneinfo/Africa/Brazzaville.py                 |      0
 lib/pytz-old/zoneinfo/Africa/Bujumbura             |    Bin 0 -> 171 bytes
 .../zoneinfo/Africa/Bujumbura.py                   |      0
 lib/pytz-old/zoneinfo/Africa/Cairo                 |    Bin 0 -> 2779 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Cairo.py    |      0
 lib/pytz-old/zoneinfo/Africa/Casablanca            |    Bin 0 -> 1657 bytes
 .../zoneinfo/Africa/Casablanca.py                  |      0
 lib/pytz-old/zoneinfo/Africa/Ceuta                 |    Bin 0 -> 2075 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Ceuta.py    |      0
 lib/pytz-old/zoneinfo/Africa/Conakry               |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Conakry.py  |      0
 lib/pytz-old/zoneinfo/Africa/Dakar                 |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Dakar.py    |      0
 lib/pytz-old/zoneinfo/Africa/Dar_es_Salaam         |    Bin 0 -> 283 bytes
 .../zoneinfo/Africa/Dar_es_Salaam.py               |      0
 lib/pytz-old/zoneinfo/Africa/Djibouti              |    Bin 0 -> 283 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Djibouti.py |      0
 lib/pytz-old/zoneinfo/Africa/Douala                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Douala.py   |      0
 lib/pytz-old/zoneinfo/Africa/El_Aaiun              |    Bin 0 -> 1487 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/El_Aaiun.py |      0
 lib/pytz-old/zoneinfo/Africa/Freetown              |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Freetown.py |      0
 lib/pytz-old/zoneinfo/Africa/Gaborone              |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Gaborone.py |      0
 lib/pytz-old/zoneinfo/Africa/Harare                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Harare.py   |      0
 lib/pytz-old/zoneinfo/Africa/Johannesburg          |    Bin 0 -> 271 bytes
 .../zoneinfo/Africa/Johannesburg.py                |      0
 lib/pytz-old/zoneinfo/Africa/Juba                  |    Bin 0 -> 683 bytes
 lib/pytz-old/zoneinfo/Africa/Kampala               |    Bin 0 -> 283 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Kampala.py  |      0
 lib/pytz-old/zoneinfo/Africa/Khartoum              |    Bin 0 -> 683 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Khartoum.py |      0
 lib/pytz-old/zoneinfo/Africa/Kigali                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Kigali.py   |      0
 lib/pytz-old/zoneinfo/Africa/Kinshasa              |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Kinshasa.py |      0
 lib/pytz-old/zoneinfo/Africa/Lagos                 |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Lagos.py    |      0
 lib/pytz-old/zoneinfo/Africa/Libreville            |    Bin 0 -> 171 bytes
 .../zoneinfo/Africa/Libreville.py                  |      0
 lib/pytz-old/zoneinfo/Africa/Lome                  |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Lome.py     |      0
 lib/pytz-old/zoneinfo/Africa/Luanda                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Luanda.py   |      0
 lib/pytz-old/zoneinfo/Africa/Lubumbashi            |    Bin 0 -> 171 bytes
 .../zoneinfo/Africa/Lubumbashi.py                  |      0
 lib/pytz-old/zoneinfo/Africa/Lusaka                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Lusaka.py   |      0
 lib/pytz-old/zoneinfo/Africa/Malabo                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Malabo.py   |      0
 lib/pytz-old/zoneinfo/Africa/Maputo                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Maputo.py   |      0
 lib/pytz-old/zoneinfo/Africa/Maseru                |    Bin 0 -> 271 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Maseru.py   |      0
 lib/pytz-old/zoneinfo/Africa/Mbabane               |    Bin 0 -> 271 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Mbabane.py  |      0
 lib/pytz-old/zoneinfo/Africa/Mogadishu             |    Bin 0 -> 283 bytes
 .../zoneinfo/Africa/Mogadishu.py                   |      0
 lib/pytz-old/zoneinfo/Africa/Monrovia              |    Bin 0 -> 241 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Monrovia.py |      0
 lib/pytz-old/zoneinfo/Africa/Nairobi               |    Bin 0 -> 283 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Nairobi.py  |      0
 lib/pytz-old/zoneinfo/Africa/Ndjamena              |    Bin 0 -> 225 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Ndjamena.py |      0
 lib/pytz-old/zoneinfo/Africa/Niamey                |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Niamey.py   |      0
 lib/pytz-old/zoneinfo/Africa/Nouakchott            |    Bin 0 -> 170 bytes
 .../zoneinfo/Africa/Nouakchott.py                  |      0
 lib/pytz-old/zoneinfo/Africa/Ouagadougou           |    Bin 0 -> 170 bytes
 .../zoneinfo/Africa/Ouagadougou.py                 |      0
 lib/pytz-old/zoneinfo/Africa/Porto-Novo            |    Bin 0 -> 171 bytes
 .../zoneinfo/Africa/Porto_minus_Novo.py            |      0
 lib/pytz-old/zoneinfo/Africa/Sao_Tome              |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Sao_Tome.py |      0
 lib/pytz-old/zoneinfo/Africa/Timbuktu              |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Timbuktu.py |      0
 lib/pytz-old/zoneinfo/Africa/Tripoli               |    Bin 0 -> 655 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Tripoli.py  |      0
 lib/pytz-old/zoneinfo/Africa/Tunis                 |    Bin 0 -> 710 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Tunis.py    |      0
 lib/pytz-old/zoneinfo/Africa/Windhoek              |    Bin 0 -> 1582 bytes
 lib/{pytz => pytz-old}/zoneinfo/Africa/Windhoek.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Africa/__init__.py |      0
 lib/pytz-old/zoneinfo/America/Adak                 |    Bin 0 -> 2379 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Adak.py    |      0
 lib/pytz-old/zoneinfo/America/Anchorage            |    Bin 0 -> 2384 bytes
 .../zoneinfo/America/Anchorage.py                  |      0
 lib/pytz-old/zoneinfo/America/Anguilla             |    Bin 0 -> 170 bytes
 .../zoneinfo/America/Anguilla.py                   |      0
 lib/pytz-old/zoneinfo/America/Antigua              |    Bin 0 -> 208 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Antigua.py |      0
 lib/pytz-old/zoneinfo/America/Araguaina            |    Bin 0 -> 896 bytes
 .../zoneinfo/America/Araguaina.py                  |      0
 .../zoneinfo/America/Argentina/Buenos_Aires        |    Bin 0 -> 1087 bytes
 .../zoneinfo/America/Argentina/Buenos_Aires.py     |      0
 lib/pytz-old/zoneinfo/America/Argentina/Catamarca  |    Bin 0 -> 1129 bytes
 .../zoneinfo/America/Argentina/Catamarca.py        |      0
 .../zoneinfo/America/Argentina/ComodRivadavia      |    Bin 0 -> 1129 bytes
 .../zoneinfo/America/Argentina/ComodRivadavia.py   |      0
 lib/pytz-old/zoneinfo/America/Argentina/Cordoba    |    Bin 0 -> 1129 bytes
 .../zoneinfo/America/Argentina/Cordoba.py          |      0
 lib/pytz-old/zoneinfo/America/Argentina/Jujuy      |    Bin 0 -> 1145 bytes
 .../zoneinfo/America/Argentina/Jujuy.py            |      0
 lib/pytz-old/zoneinfo/America/Argentina/La_Rioja   |    Bin 0 -> 1143 bytes
 .../zoneinfo/America/Argentina/La_Rioja.py         |      0
 lib/pytz-old/zoneinfo/America/Argentina/Mendoza    |    Bin 0 -> 1173 bytes
 .../zoneinfo/America/Argentina/Mendoza.py          |      0
 .../zoneinfo/America/Argentina/Rio_Gallegos        |    Bin 0 -> 1129 bytes
 .../zoneinfo/America/Argentina/Rio_Gallegos.py     |      0
 lib/pytz-old/zoneinfo/America/Argentina/Salta      |    Bin 0 -> 1101 bytes
 lib/pytz-old/zoneinfo/America/Argentina/San_Juan   |    Bin 0 -> 1143 bytes
 .../zoneinfo/America/Argentina/San_Juan.py         |      0
 lib/pytz-old/zoneinfo/America/Argentina/San_Luis   |    Bin 0 -> 1171 bytes
 lib/pytz-old/zoneinfo/America/Argentina/Tucuman    |    Bin 0 -> 1157 bytes
 .../zoneinfo/America/Argentina/Tucuman.py          |      0
 lib/pytz-old/zoneinfo/America/Argentina/Ushuaia    |    Bin 0 -> 1129 bytes
 .../zoneinfo/America/Argentina/Ushuaia.py          |      0
 .../zoneinfo/America/Argentina/__init__.py         |      0
 lib/pytz-old/zoneinfo/America/Aruba                |    Bin 0 -> 208 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Aruba.py   |      0
 lib/pytz-old/zoneinfo/America/Asuncion             |    Bin 0 -> 2062 bytes
 .../zoneinfo/America/Asuncion.py                   |      0
 lib/pytz-old/zoneinfo/America/Atikokan             |    Bin 0 -> 345 bytes
 .../zoneinfo/America/Atikokan.py                   |      0
 lib/pytz-old/zoneinfo/America/Atka                 |    Bin 0 -> 2379 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Atka.py    |      0
 lib/pytz-old/zoneinfo/America/Bahia                |    Bin 0 -> 1036 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Bahia.py   |      0
 lib/pytz-old/zoneinfo/America/Bahia_Banderas       |    Bin 0 -> 1588 bytes
 lib/pytz-old/zoneinfo/America/Barbados             |    Bin 0 -> 344 bytes
 .../zoneinfo/America/Barbados.py                   |      0
 lib/pytz-old/zoneinfo/America/Belem                |    Bin 0 -> 588 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Belem.py   |      0
 lib/pytz-old/zoneinfo/America/Belize               |    Bin 0 -> 976 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Belize.py  |      0
 lib/pytz-old/zoneinfo/America/Blanc-Sablon         |    Bin 0 -> 307 bytes
 .../zoneinfo/America/Blanc_minus_Sablon.py         |      0
 lib/pytz-old/zoneinfo/America/Boa_Vista            |    Bin 0 -> 644 bytes
 .../zoneinfo/America/Boa_Vista.py                  |      0
 lib/pytz-old/zoneinfo/America/Bogota               |    Bin 0 -> 257 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Bogota.py  |      0
 lib/pytz-old/zoneinfo/America/Boise                |    Bin 0 -> 2403 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Boise.py   |      0
 lib/pytz-old/zoneinfo/America/Buenos_Aires         |    Bin 0 -> 1087 bytes
 .../zoneinfo/America/Buenos_Aires.py               |      0
 lib/pytz-old/zoneinfo/America/Cambridge_Bay        |    Bin 0 -> 2098 bytes
 .../zoneinfo/America/Cambridge_Bay.py              |      0
 lib/pytz-old/zoneinfo/America/Campo_Grande         |    Bin 0 -> 2015 bytes
 .../zoneinfo/America/Campo_Grande.py               |      0
 lib/pytz-old/zoneinfo/America/Cancun               |    Bin 0 -> 1480 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Cancun.py  |      0
 lib/pytz-old/zoneinfo/America/Caracas              |    Bin 0 -> 266 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Caracas.py |      0
 lib/pytz-old/zoneinfo/America/Catamarca            |    Bin 0 -> 1129 bytes
 .../zoneinfo/America/Catamarca.py                  |      0
 lib/pytz-old/zoneinfo/America/Cayenne              |    Bin 0 -> 200 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Cayenne.py |      0
 lib/pytz-old/zoneinfo/America/Cayman               |    Bin 0 -> 203 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Cayman.py  |      0
 lib/pytz-old/zoneinfo/America/Chicago              |    Bin 0 -> 3585 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Chicago.py |      0
 lib/pytz-old/zoneinfo/America/Chihuahua            |    Bin 0 -> 1522 bytes
 .../zoneinfo/America/Chihuahua.py                  |      0
 lib/pytz-old/zoneinfo/America/Coral_Harbour        |    Bin 0 -> 345 bytes
 .../zoneinfo/America/Coral_Harbour.py              |      0
 lib/pytz-old/zoneinfo/America/Cordoba              |    Bin 0 -> 1129 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Cordoba.py |      0
 lib/pytz-old/zoneinfo/America/Costa_Rica           |    Bin 0 -> 341 bytes
 .../zoneinfo/America/Costa_Rica.py                 |      0
 lib/pytz-old/zoneinfo/America/Creston              |    Bin 0 -> 233 bytes
 lib/pytz-old/zoneinfo/America/Cuiaba               |    Bin 0 -> 1987 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Cuiaba.py  |      0
 lib/pytz-old/zoneinfo/America/Curacao              |    Bin 0 -> 208 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Curacao.py |      0
 lib/pytz-old/zoneinfo/America/Danmarkshavn         |    Bin 0 -> 714 bytes
 .../zoneinfo/America/Danmarkshavn.py               |      0
 lib/pytz-old/zoneinfo/America/Dawson               |    Bin 0 -> 2093 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Dawson.py  |      0
 lib/pytz-old/zoneinfo/America/Dawson_Creek         |    Bin 0 -> 1059 bytes
 .../zoneinfo/America/Dawson_Creek.py               |      0
 lib/pytz-old/zoneinfo/America/Denver               |    Bin 0 -> 2453 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Denver.py  |      0
 lib/pytz-old/zoneinfo/America/Detroit              |    Bin 0 -> 2216 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Detroit.py |      0
 lib/pytz-old/zoneinfo/America/Dominica             |    Bin 0 -> 170 bytes
 .../zoneinfo/America/Dominica.py                   |      0
 lib/pytz-old/zoneinfo/America/Edmonton             |    Bin 0 -> 2402 bytes
 .../zoneinfo/America/Edmonton.py                   |      0
 lib/pytz-old/zoneinfo/America/Eirunepe             |    Bin 0 -> 684 bytes
 .../zoneinfo/America/Eirunepe.py                   |      0
 lib/pytz-old/zoneinfo/America/El_Salvador          |    Bin 0 -> 250 bytes
 .../zoneinfo/America/El_Salvador.py                |      0
 lib/pytz-old/zoneinfo/America/Ensenada             |    Bin 0 -> 2356 bytes
 .../zoneinfo/America/Ensenada.py                   |      0
 lib/pytz-old/zoneinfo/America/Fort_Wayne           |    Bin 0 -> 1675 bytes
 .../zoneinfo/America/Fort_Wayne.py                 |      0
 lib/pytz-old/zoneinfo/America/Fortaleza            |    Bin 0 -> 728 bytes
 .../zoneinfo/America/Fortaleza.py                  |      0
 lib/pytz-old/zoneinfo/America/Glace_Bay            |    Bin 0 -> 2206 bytes
 .../zoneinfo/America/Glace_Bay.py                  |      0
 lib/pytz-old/zoneinfo/America/Godthab              |    Bin 0 -> 1877 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Godthab.py |      0
 lib/pytz-old/zoneinfo/America/Goose_Bay            |    Bin 0 -> 3219 bytes
 .../zoneinfo/America/Goose_Bay.py                  |      0
 lib/pytz-old/zoneinfo/America/Grand_Turk           |    Bin 0 -> 1287 bytes
 .../zoneinfo/America/Grand_Turk.py                 |      0
 lib/pytz-old/zoneinfo/America/Grenada              |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Grenada.py |      0
 lib/pytz-old/zoneinfo/America/Guadeloupe           |    Bin 0 -> 170 bytes
 .../zoneinfo/America/Guadeloupe.py                 |      0
 lib/pytz-old/zoneinfo/America/Guatemala            |    Bin 0 -> 306 bytes
 .../zoneinfo/America/Guatemala.py                  |      0
 lib/pytz-old/zoneinfo/America/Guayaquil            |    Bin 0 -> 203 bytes
 .../zoneinfo/America/Guayaquil.py                  |      0
 lib/pytz-old/zoneinfo/America/Guyana               |    Bin 0 -> 270 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Guyana.py  |      0
 lib/pytz-old/zoneinfo/America/Halifax              |    Bin 0 -> 3438 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Halifax.py |      0
 lib/pytz-old/zoneinfo/America/Havana               |    Bin 0 -> 2437 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Havana.py  |      0
 lib/pytz-old/zoneinfo/America/Hermosillo           |    Bin 0 -> 454 bytes
 .../zoneinfo/America/Hermosillo.py                 |      0
 lib/pytz-old/zoneinfo/America/Indiana/Indianapolis |    Bin 0 -> 1675 bytes
 .../zoneinfo/America/Indiana/Indianapolis.py       |      0
 lib/pytz-old/zoneinfo/America/Indiana/Knox         |    Bin 0 -> 2437 bytes
 .../zoneinfo/America/Indiana/Knox.py               |      0
 lib/pytz-old/zoneinfo/America/Indiana/Marengo      |    Bin 0 -> 1731 bytes
 .../zoneinfo/America/Indiana/Marengo.py            |      0
 lib/pytz-old/zoneinfo/America/Indiana/Petersburg   |    Bin 0 -> 1913 bytes
 .../zoneinfo/America/Indiana/Petersburg.py         |      0
 lib/pytz-old/zoneinfo/America/Indiana/Tell_City    |    Bin 0 -> 1735 bytes
 lib/pytz-old/zoneinfo/America/Indiana/Vevay        |    Bin 0 -> 1423 bytes
 .../zoneinfo/America/Indiana/Vevay.py              |      0
 lib/pytz-old/zoneinfo/America/Indiana/Vincennes    |    Bin 0 -> 1703 bytes
 .../zoneinfo/America/Indiana/Vincennes.py          |      0
 lib/pytz-old/zoneinfo/America/Indiana/Winamac      |    Bin 0 -> 1787 bytes
 .../zoneinfo/America/Indiana/__init__.py           |      0
 lib/pytz-old/zoneinfo/America/Indianapolis         |    Bin 0 -> 1675 bytes
 .../zoneinfo/America/Indianapolis.py               |      0
 lib/pytz-old/zoneinfo/America/Inuvik               |    Bin 0 -> 1928 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Inuvik.py  |      0
 lib/pytz-old/zoneinfo/America/Iqaluit              |    Bin 0 -> 2046 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Iqaluit.py |      0
 lib/pytz-old/zoneinfo/America/Jamaica              |    Bin 0 -> 507 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Jamaica.py |      0
 lib/pytz-old/zoneinfo/America/Jujuy                |    Bin 0 -> 1145 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Jujuy.py   |      0
 lib/pytz-old/zoneinfo/America/Juneau               |    Bin 0 -> 2362 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Juneau.py  |      0
 lib/pytz-old/zoneinfo/America/Kentucky/Louisville  |    Bin 0 -> 2781 bytes
 .../zoneinfo/America/Kentucky/Louisville.py        |      0
 lib/pytz-old/zoneinfo/America/Kentucky/Monticello  |    Bin 0 -> 2361 bytes
 .../zoneinfo/America/Kentucky/Monticello.py        |      0
 .../zoneinfo/America/Kentucky/__init__.py          |      0
 lib/pytz-old/zoneinfo/America/Knox_IN              |    Bin 0 -> 2437 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Knox_IN.py |      0
 lib/pytz-old/zoneinfo/America/Kralendijk           |    Bin 0 -> 208 bytes
 lib/pytz-old/zoneinfo/America/La_Paz               |    Bin 0 -> 243 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/La_Paz.py  |      0
 lib/pytz-old/zoneinfo/America/Lima                 |    Bin 0 -> 417 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Lima.py    |      0
 lib/pytz-old/zoneinfo/America/Los_Angeles          |    Bin 0 -> 2845 bytes
 .../zoneinfo/America/Los_Angeles.py                |      0
 lib/pytz-old/zoneinfo/America/Louisville           |    Bin 0 -> 2781 bytes
 .../zoneinfo/America/Louisville.py                 |      0
 lib/pytz-old/zoneinfo/America/Lower_Princes        |    Bin 0 -> 208 bytes
 lib/pytz-old/zoneinfo/America/Maceio               |    Bin 0 -> 756 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Maceio.py  |      0
 lib/pytz-old/zoneinfo/America/Managua              |    Bin 0 -> 463 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Managua.py |      0
 lib/pytz-old/zoneinfo/America/Manaus               |    Bin 0 -> 616 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Manaus.py  |      0
 lib/pytz-old/zoneinfo/America/Marigot              |    Bin 0 -> 170 bytes
 lib/pytz-old/zoneinfo/America/Martinique           |    Bin 0 -> 257 bytes
 .../zoneinfo/America/Martinique.py                 |      0
 lib/pytz-old/zoneinfo/America/Matamoros            |    Bin 0 -> 1416 bytes
 lib/pytz-old/zoneinfo/America/Mazatlan             |    Bin 0 -> 1564 bytes
 .../zoneinfo/America/Mazatlan.py                   |      0
 lib/pytz-old/zoneinfo/America/Mendoza              |    Bin 0 -> 1173 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Mendoza.py |      0
 lib/pytz-old/zoneinfo/America/Menominee            |    Bin 0 -> 2283 bytes
 .../zoneinfo/America/Menominee.py                  |      0
 lib/pytz-old/zoneinfo/America/Merida               |    Bin 0 -> 1456 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Merida.py  |      0
 lib/pytz-old/zoneinfo/America/Metlakatla           |    Bin 0 -> 716 bytes
 lib/pytz-old/zoneinfo/America/Mexico_City          |    Bin 0 -> 1618 bytes
 .../zoneinfo/America/Mexico_City.py                |      0
 lib/pytz-old/zoneinfo/America/Miquelon             |    Bin 0 -> 1684 bytes
 .../zoneinfo/America/Miquelon.py                   |      0
 lib/pytz-old/zoneinfo/America/Moncton              |    Bin 0 -> 3163 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Moncton.py |      0
 lib/pytz-old/zoneinfo/America/Monterrey            |    Bin 0 -> 1416 bytes
 .../zoneinfo/America/Monterrey.py                  |      0
 lib/pytz-old/zoneinfo/America/Montevideo           |    Bin 0 -> 2160 bytes
 .../zoneinfo/America/Montevideo.py                 |      0
 lib/pytz-old/zoneinfo/America/Montreal             |    Bin 0 -> 3503 bytes
 .../zoneinfo/America/Montreal.py                   |      0
 lib/pytz-old/zoneinfo/America/Montserrat           |    Bin 0 -> 170 bytes
 .../zoneinfo/America/Montserrat.py                 |      0
 lib/pytz-old/zoneinfo/America/Nassau               |    Bin 0 -> 2284 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Nassau.py  |      0
 lib/pytz-old/zoneinfo/America/New_York             |    Bin 0 -> 3545 bytes
 .../zoneinfo/America/New_York.py                   |      0
 lib/pytz-old/zoneinfo/America/Nipigon              |    Bin 0 -> 2131 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Nipigon.py |      0
 lib/pytz-old/zoneinfo/America/Nome                 |    Bin 0 -> 2376 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Nome.py    |      0
 lib/pytz-old/zoneinfo/America/Noronha              |    Bin 0 -> 728 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Noronha.py |      0
 lib/pytz-old/zoneinfo/America/North_Dakota/Beulah  |    Bin 0 -> 2389 bytes
 lib/pytz-old/zoneinfo/America/North_Dakota/Center  |    Bin 0 -> 2389 bytes
 .../zoneinfo/America/North_Dakota/Center.py        |      0
 .../zoneinfo/America/North_Dakota/New_Salem        |    Bin 0 -> 2389 bytes
 .../zoneinfo/America/North_Dakota/New_Salem.py     |      0
 .../zoneinfo/America/North_Dakota/__init__.py      |      0
 lib/pytz-old/zoneinfo/America/Ojinaga              |    Bin 0 -> 1522 bytes
 lib/pytz-old/zoneinfo/America/Panama               |    Bin 0 -> 203 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Panama.py  |      0
 lib/pytz-old/zoneinfo/America/Pangnirtung          |    Bin 0 -> 2108 bytes
 .../zoneinfo/America/Pangnirtung.py                |      0
 lib/pytz-old/zoneinfo/America/Paramaribo           |    Bin 0 -> 308 bytes
 .../zoneinfo/America/Paramaribo.py                 |      0
 lib/pytz-old/zoneinfo/America/Phoenix              |    Bin 0 -> 353 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Phoenix.py |      0
 lib/pytz-old/zoneinfo/America/Port-au-Prince       |    Bin 0 -> 1483 bytes
 .../zoneinfo/America/Port_minus_au_minus_Prince.py |      0
 lib/pytz-old/zoneinfo/America/Port_of_Spain        |    Bin 0 -> 170 bytes
 .../zoneinfo/America/Port_of_Spain.py              |      0
 lib/pytz-old/zoneinfo/America/Porto_Acre           |    Bin 0 -> 656 bytes
 .../zoneinfo/America/Porto_Acre.py                 |      0
 lib/pytz-old/zoneinfo/America/Porto_Velho          |    Bin 0 -> 588 bytes
 .../zoneinfo/America/Porto_Velho.py                |      0
 lib/pytz-old/zoneinfo/America/Puerto_Rico          |    Bin 0 -> 255 bytes
 .../zoneinfo/America/Puerto_Rico.py                |      0
 lib/pytz-old/zoneinfo/America/Rainy_River          |    Bin 0 -> 2131 bytes
 .../zoneinfo/America/Rainy_River.py                |      0
 lib/pytz-old/zoneinfo/America/Rankin_Inlet         |    Bin 0 -> 1930 bytes
 .../zoneinfo/America/Rankin_Inlet.py               |      0
 lib/pytz-old/zoneinfo/America/Recife               |    Bin 0 -> 728 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Recife.py  |      0
 lib/pytz-old/zoneinfo/America/Regina               |    Bin 0 -> 994 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Regina.py  |      0
 lib/pytz-old/zoneinfo/America/Resolute             |    Bin 0 -> 1930 bytes
 lib/pytz-old/zoneinfo/America/Rio_Branco           |    Bin 0 -> 656 bytes
 .../zoneinfo/America/Rio_Branco.py                 |      0
 lib/pytz-old/zoneinfo/America/Rosario              |    Bin 0 -> 1129 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Rosario.py |      0
 lib/pytz-old/zoneinfo/America/Santa_Isabel         |    Bin 0 -> 2356 bytes
 lib/pytz-old/zoneinfo/America/Santarem             |    Bin 0 -> 626 bytes
 lib/pytz-old/zoneinfo/America/Santiago             |    Bin 0 -> 2531 bytes
 .../zoneinfo/America/Santiago.py                   |      0
 lib/pytz-old/zoneinfo/America/Santo_Domingo        |    Bin 0 -> 489 bytes
 .../zoneinfo/America/Santo_Domingo.py              |      0
 lib/pytz-old/zoneinfo/America/Sao_Paulo            |    Bin 0 -> 2015 bytes
 .../zoneinfo/America/Sao_Paulo.py                  |      0
 lib/pytz-old/zoneinfo/America/Scoresbysund         |    Bin 0 -> 1925 bytes
 .../zoneinfo/America/Scoresbysund.py               |      0
 lib/pytz-old/zoneinfo/America/Shiprock             |    Bin 0 -> 2453 bytes
 .../zoneinfo/America/Shiprock.py                   |      0
 lib/pytz-old/zoneinfo/America/Sitka                |    Bin 0 -> 2350 bytes
 lib/pytz-old/zoneinfo/America/St_Barthelemy        |    Bin 0 -> 170 bytes
 lib/pytz-old/zoneinfo/America/St_Johns             |    Bin 0 -> 3664 bytes
 .../zoneinfo/America/St_Johns.py                   |      0
 lib/pytz-old/zoneinfo/America/St_Kitts             |    Bin 0 -> 170 bytes
 .../zoneinfo/America/St_Kitts.py                   |      0
 lib/pytz-old/zoneinfo/America/St_Lucia             |    Bin 0 -> 170 bytes
 .../zoneinfo/America/St_Lucia.py                   |      0
 lib/pytz-old/zoneinfo/America/St_Thomas            |    Bin 0 -> 170 bytes
 .../zoneinfo/America/St_Thomas.py                  |      0
 lib/pytz-old/zoneinfo/America/St_Vincent           |    Bin 0 -> 170 bytes
 .../zoneinfo/America/St_Vincent.py                 |      0
 lib/pytz-old/zoneinfo/America/Swift_Current        |    Bin 0 -> 574 bytes
 .../zoneinfo/America/Swift_Current.py              |      0
 lib/pytz-old/zoneinfo/America/Tegucigalpa          |    Bin 0 -> 278 bytes
 .../zoneinfo/America/Tegucigalpa.py                |      0
 lib/pytz-old/zoneinfo/America/Thule                |    Bin 0 -> 1528 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Thule.py   |      0
 lib/pytz-old/zoneinfo/America/Thunder_Bay          |    Bin 0 -> 2211 bytes
 .../zoneinfo/America/Thunder_Bay.py                |      0
 lib/pytz-old/zoneinfo/America/Tijuana              |    Bin 0 -> 2356 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Tijuana.py |      0
 lib/pytz-old/zoneinfo/America/Toronto              |    Bin 0 -> 3503 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Toronto.py |      0
 lib/pytz-old/zoneinfo/America/Tortola              |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Tortola.py |      0
 lib/pytz-old/zoneinfo/America/Vancouver            |    Bin 0 -> 2901 bytes
 .../zoneinfo/America/Vancouver.py                  |      0
 lib/pytz-old/zoneinfo/America/Virgin               |    Bin 0 -> 170 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Virgin.py  |      0
 lib/pytz-old/zoneinfo/America/Whitehorse           |    Bin 0 -> 2093 bytes
 .../zoneinfo/America/Whitehorse.py                 |      0
 lib/pytz-old/zoneinfo/America/Winnipeg             |    Bin 0 -> 2891 bytes
 .../zoneinfo/America/Winnipeg.py                   |      0
 lib/pytz-old/zoneinfo/America/Yakutat              |    Bin 0 -> 2314 bytes
 lib/{pytz => pytz-old}/zoneinfo/America/Yakutat.py |      0
 lib/pytz-old/zoneinfo/America/Yellowknife          |    Bin 0 -> 1980 bytes
 .../zoneinfo/America/Yellowknife.py                |      0
 .../zoneinfo/America/__init__.py                   |      0
 lib/pytz-old/zoneinfo/Antarctica/Casey             |    Bin 0 -> 272 bytes
 .../zoneinfo/Antarctica/Casey.py                   |      0
 lib/pytz-old/zoneinfo/Antarctica/Davis             |    Bin 0 -> 290 bytes
 .../zoneinfo/Antarctica/Davis.py                   |      0
 lib/pytz-old/zoneinfo/Antarctica/DumontDUrville    |    Bin 0 -> 227 bytes
 .../zoneinfo/Antarctica/DumontDUrville.py          |      0
 lib/pytz-old/zoneinfo/Antarctica/Macquarie         |    Bin 0 -> 1530 bytes
 lib/pytz-old/zoneinfo/Antarctica/Mawson            |    Bin 0 -> 204 bytes
 .../zoneinfo/Antarctica/Mawson.py                  |      0
 lib/pytz-old/zoneinfo/Antarctica/McMurdo           |    Bin 0 -> 2460 bytes
 .../zoneinfo/Antarctica/McMurdo.py                 |      0
 lib/pytz-old/zoneinfo/Antarctica/Palmer            |    Bin 0 -> 2054 bytes
 .../zoneinfo/Antarctica/Palmer.py                  |      0
 lib/pytz-old/zoneinfo/Antarctica/Rothera           |    Bin 0 -> 173 bytes
 .../zoneinfo/Antarctica/Rothera.py                 |      0
 lib/pytz-old/zoneinfo/Antarctica/South_Pole        |    Bin 0 -> 2460 bytes
 .../zoneinfo/Antarctica/South_Pole.py              |      0
 lib/pytz-old/zoneinfo/Antarctica/Syowa             |    Bin 0 -> 174 bytes
 .../zoneinfo/Antarctica/Syowa.py                   |      0
 lib/pytz-old/zoneinfo/Antarctica/Troll             |    Bin 0 -> 1161 bytes
 lib/pytz-old/zoneinfo/Antarctica/Vostok            |    Bin 0 -> 174 bytes
 .../zoneinfo/Antarctica/Vostok.py                  |      0
 .../zoneinfo/Antarctica/__init__.py                |      0
 lib/pytz-old/zoneinfo/Arctic/Longyearbyen          |    Bin 0 -> 2251 bytes
 .../zoneinfo/Arctic/Longyearbyen.py                |      0
 lib/{pytz => pytz-old}/zoneinfo/Arctic/__init__.py |      0
 lib/pytz-old/zoneinfo/Asia/Aden                    |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Aden.py       |      0
 lib/pytz-old/zoneinfo/Asia/Almaty                  |    Bin 0 -> 936 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Almaty.py     |      0
 lib/pytz-old/zoneinfo/Asia/Amman                   |    Bin 0 -> 1877 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Amman.py      |      0
 lib/pytz-old/zoneinfo/Asia/Anadyr                  |    Bin 0 -> 1197 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Anadyr.py     |      0
 lib/pytz-old/zoneinfo/Asia/Aqtau                   |    Bin 0 -> 1142 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Aqtau.py      |      0
 lib/pytz-old/zoneinfo/Asia/Aqtobe                  |    Bin 0 -> 1052 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Aqtobe.py     |      0
 lib/pytz-old/zoneinfo/Asia/Ashgabat                |    Bin 0 -> 671 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Ashgabat.py   |      0
 lib/pytz-old/zoneinfo/Asia/Ashkhabad               |    Bin 0 -> 671 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Ashkhabad.py  |      0
 lib/pytz-old/zoneinfo/Asia/Baghdad                 |    Bin 0 -> 988 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Baghdad.py    |      0
 lib/pytz-old/zoneinfo/Asia/Bahrain                 |    Bin 0 -> 209 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Bahrain.py    |      0
 lib/pytz-old/zoneinfo/Asia/Baku                    |    Bin 0 -> 1956 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Baku.py       |      0
 lib/pytz-old/zoneinfo/Asia/Bangkok                 |    Bin 0 -> 204 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Bangkok.py    |      0
 lib/pytz-old/zoneinfo/Asia/Beirut                  |    Bin 0 -> 2175 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Beirut.py     |      0
 lib/pytz-old/zoneinfo/Asia/Bishkek                 |    Bin 0 -> 1061 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Bishkek.py    |      0
 lib/pytz-old/zoneinfo/Asia/Brunei                  |    Bin 0 -> 201 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Brunei.py     |      0
 lib/pytz-old/zoneinfo/Asia/Calcutta                |    Bin 0 -> 291 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Calcutta.py   |      0
 lib/pytz-old/zoneinfo/Asia/Chita                   |    Bin 0 -> 1236 bytes
 lib/pytz-old/zoneinfo/Asia/Choibalsan              |    Bin 0 -> 904 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Choibalsan.py |      0
 lib/pytz-old/zoneinfo/Asia/Chongqing               |    Bin 0 -> 414 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Chongqing.py  |      0
 lib/pytz-old/zoneinfo/Asia/Chungking               |    Bin 0 -> 414 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Chungking.py  |      0
 lib/pytz-old/zoneinfo/Asia/Colombo                 |    Bin 0 -> 389 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Colombo.py    |      0
 lib/pytz-old/zoneinfo/Asia/Dacca                   |    Bin 0 -> 390 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Dacca.py      |      0
 lib/pytz-old/zoneinfo/Asia/Damascus                |    Bin 0 -> 2320 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Damascus.py   |      0
 lib/pytz-old/zoneinfo/Asia/Dhaka                   |    Bin 0 -> 390 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Dhaka.py      |      0
 lib/pytz-old/zoneinfo/Asia/Dili                    |    Bin 0 -> 309 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Dili.py       |      0
 lib/pytz-old/zoneinfo/Asia/Dubai                   |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Dubai.py      |      0
 lib/pytz-old/zoneinfo/Asia/Dushanbe                |    Bin 0 -> 611 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Dushanbe.py   |      0
 lib/pytz-old/zoneinfo/Asia/Gaza                    |    Bin 0 -> 2313 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Gaza.py       |      0
 lib/pytz-old/zoneinfo/Asia/Harbin                  |    Bin 0 -> 414 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Harbin.py     |      0
 lib/pytz-old/zoneinfo/Asia/Hebron                  |    Bin 0 -> 2341 bytes
 lib/pytz-old/zoneinfo/Asia/Ho_Chi_Minh             |    Bin 0 -> 373 bytes
 lib/pytz-old/zoneinfo/Asia/Hong_Kong               |    Bin 0 -> 1189 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Hong_Kong.py  |      0
 lib/pytz-old/zoneinfo/Asia/Hovd                    |    Bin 0 -> 848 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Hovd.py       |      0
 lib/pytz-old/zoneinfo/Asia/Irkutsk                 |    Bin 0 -> 1259 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Irkutsk.py    |      0
 lib/pytz-old/zoneinfo/Asia/Istanbul                |    Bin 0 -> 2747 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Istanbul.py   |      0
 lib/pytz-old/zoneinfo/Asia/Jakarta                 |    Bin 0 -> 370 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Jakarta.py    |      0
 lib/pytz-old/zoneinfo/Asia/Jayapura                |    Bin 0 -> 241 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Jayapura.py   |      0
 lib/pytz-old/zoneinfo/Asia/Jerusalem               |    Bin 0 -> 2265 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Jerusalem.py  |      0
 lib/pytz-old/zoneinfo/Asia/Kabul                   |    Bin 0 -> 199 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Kabul.py      |      0
 lib/pytz-old/zoneinfo/Asia/Kamchatka               |    Bin 0 -> 1181 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Kamchatka.py  |      0
 lib/pytz-old/zoneinfo/Asia/Karachi                 |    Bin 0 -> 403 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Karachi.py    |      0
 lib/pytz-old/zoneinfo/Asia/Kashgar                 |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Kashgar.py    |      0
 lib/pytz-old/zoneinfo/Asia/Kathmandu               |    Bin 0 -> 212 bytes
 lib/pytz-old/zoneinfo/Asia/Katmandu                |    Bin 0 -> 212 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Katmandu.py   |      0
 lib/pytz-old/zoneinfo/Asia/Khandyga                |    Bin 0 -> 1324 bytes
 lib/pytz-old/zoneinfo/Asia/Kolkata                 |    Bin 0 -> 291 bytes
 lib/pytz-old/zoneinfo/Asia/Krasnoyarsk             |    Bin 0 -> 1226 bytes
 .../zoneinfo/Asia/Krasnoyarsk.py                   |      0
 lib/pytz-old/zoneinfo/Asia/Kuala_Lumpur            |    Bin 0 -> 398 bytes
 .../zoneinfo/Asia/Kuala_Lumpur.py                  |      0
 lib/pytz-old/zoneinfo/Asia/Kuching                 |    Bin 0 -> 519 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Kuching.py    |      0
 lib/pytz-old/zoneinfo/Asia/Kuwait                  |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Kuwait.py     |      0
 lib/pytz-old/zoneinfo/Asia/Macao                   |    Bin 0 -> 795 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Macao.py      |      0
 lib/pytz-old/zoneinfo/Asia/Macau                   |    Bin 0 -> 795 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Macau.py      |      0
 lib/pytz-old/zoneinfo/Asia/Magadan                 |    Bin 0 -> 1227 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Magadan.py    |      0
 lib/pytz-old/zoneinfo/Asia/Makassar                |    Bin 0 -> 280 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Makassar.py   |      0
 lib/pytz-old/zoneinfo/Asia/Manila                  |    Bin 0 -> 361 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Manila.py     |      0
 lib/pytz-old/zoneinfo/Asia/Muscat                  |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Muscat.py     |      0
 lib/pytz-old/zoneinfo/Asia/Nicosia                 |    Bin 0 -> 2016 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Nicosia.py    |      0
 lib/pytz-old/zoneinfo/Asia/Novokuznetsk            |    Bin 0 -> 1248 bytes
 lib/pytz-old/zoneinfo/Asia/Novosibirsk             |    Bin 0 -> 1208 bytes
 .../zoneinfo/Asia/Novosibirsk.py                   |      0
 lib/pytz-old/zoneinfo/Asia/Omsk                    |    Bin 0 -> 1226 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Omsk.py       |      0
 lib/pytz-old/zoneinfo/Asia/Oral                    |    Bin 0 -> 1100 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Oral.py       |      0
 lib/pytz-old/zoneinfo/Asia/Phnom_Penh              |    Bin 0 -> 204 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Phnom_Penh.py |      0
 lib/pytz-old/zoneinfo/Asia/Pontianak               |    Bin 0 -> 375 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Pontianak.py  |      0
 lib/pytz-old/zoneinfo/Asia/Pyongyang               |    Bin 0 -> 279 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Pyongyang.py  |      0
 lib/pytz-old/zoneinfo/Asia/Qatar                   |    Bin 0 -> 209 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Qatar.py      |      0
 lib/pytz-old/zoneinfo/Asia/Qyzylorda               |    Bin 0 -> 1082 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Qyzylorda.py  |      0
 lib/pytz-old/zoneinfo/Asia/Rangoon                 |    Bin 0 -> 285 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Rangoon.py    |      0
 lib/pytz-old/zoneinfo/Asia/Riyadh                  |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Riyadh.py     |      0
 lib/pytz-old/zoneinfo/Asia/Saigon                  |    Bin 0 -> 373 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Saigon.py     |      0
 lib/pytz-old/zoneinfo/Asia/Sakhalin                |    Bin 0 -> 1227 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Sakhalin.py   |      0
 lib/pytz-old/zoneinfo/Asia/Samarkand               |    Bin 0 -> 691 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Samarkand.py  |      0
 lib/pytz-old/zoneinfo/Asia/Seoul                   |    Bin 0 -> 571 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Seoul.py      |      0
 lib/pytz-old/zoneinfo/Asia/Shanghai                |    Bin 0 -> 414 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Shanghai.py   |      0
 lib/pytz-old/zoneinfo/Asia/Singapore               |    Bin 0 -> 428 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Singapore.py  |      0
 lib/pytz-old/zoneinfo/Asia/Srednekolymsk           |    Bin 0 -> 1237 bytes
 lib/pytz-old/zoneinfo/Asia/Taipei                  |    Bin 0 -> 800 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Taipei.py     |      0
 lib/pytz-old/zoneinfo/Asia/Tashkent                |    Bin 0 -> 681 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Tashkent.py   |      0
 lib/pytz-old/zoneinfo/Asia/Tbilisi                 |    Bin 0 -> 1142 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Tbilisi.py    |      0
 lib/pytz-old/zoneinfo/Asia/Tehran                  |    Bin 0 -> 1661 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Tehran.py     |      0
 lib/pytz-old/zoneinfo/Asia/Tel_Aviv                |    Bin 0 -> 2265 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Tel_Aviv.py   |      0
 lib/pytz-old/zoneinfo/Asia/Thimbu                  |    Bin 0 -> 209 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Thimbu.py     |      0
 lib/pytz-old/zoneinfo/Asia/Thimphu                 |    Bin 0 -> 209 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Thimphu.py    |      0
 lib/pytz-old/zoneinfo/Asia/Tokyo                   |    Bin 0 -> 355 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Tokyo.py      |      0
 lib/pytz-old/zoneinfo/Asia/Ujung_Pandang           |    Bin 0 -> 280 bytes
 .../zoneinfo/Asia/Ujung_Pandang.py                 |      0
 lib/pytz-old/zoneinfo/Asia/Ulaanbaatar             |    Bin 0 -> 848 bytes
 .../zoneinfo/Asia/Ulaanbaatar.py                   |      0
 lib/pytz-old/zoneinfo/Asia/Ulan_Bator              |    Bin 0 -> 848 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Ulan_Bator.py |      0
 lib/pytz-old/zoneinfo/Asia/Urumqi                  |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Urumqi.py     |      0
 lib/pytz-old/zoneinfo/Asia/Ust-Nera                |    Bin 0 -> 1293 bytes
 lib/pytz-old/zoneinfo/Asia/Vientiane               |    Bin 0 -> 204 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Vientiane.py  |      0
 lib/pytz-old/zoneinfo/Asia/Vladivostok             |    Bin 0 -> 1227 bytes
 .../zoneinfo/Asia/Vladivostok.py                   |      0
 lib/pytz-old/zoneinfo/Asia/Yakutsk                 |    Bin 0 -> 1226 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Yakutsk.py    |      0
 lib/pytz-old/zoneinfo/Asia/Yekaterinburg           |    Bin 0 -> 1334 bytes
 .../zoneinfo/Asia/Yekaterinburg.py                 |      0
 lib/pytz-old/zoneinfo/Asia/Yerevan                 |    Bin 0 -> 1277 bytes
 lib/{pytz => pytz-old}/zoneinfo/Asia/Yerevan.py    |      0
 lib/{pytz => pytz-old}/zoneinfo/Asia/__init__.py   |      0
 lib/pytz-old/zoneinfo/Atlantic/Azores              |    Bin 0 -> 3488 bytes
 lib/{pytz => pytz-old}/zoneinfo/Atlantic/Azores.py |      0
 lib/pytz-old/zoneinfo/Atlantic/Bermuda             |    Bin 0 -> 2004 bytes
 .../zoneinfo/Atlantic/Bermuda.py                   |      0
 lib/pytz-old/zoneinfo/Atlantic/Canary              |    Bin 0 -> 1913 bytes
 lib/{pytz => pytz-old}/zoneinfo/Atlantic/Canary.py |      0
 lib/pytz-old/zoneinfo/Atlantic/Cape_Verde          |    Bin 0 -> 254 bytes
 .../zoneinfo/Atlantic/Cape_Verde.py                |      0
 lib/pytz-old/zoneinfo/Atlantic/Faeroe              |    Bin 0 -> 1829 bytes
 lib/{pytz => pytz-old}/zoneinfo/Atlantic/Faeroe.py |      0
 lib/pytz-old/zoneinfo/Atlantic/Faroe               |    Bin 0 -> 1829 bytes
 lib/pytz-old/zoneinfo/Atlantic/Jan_Mayen           |    Bin 0 -> 2251 bytes
 .../zoneinfo/Atlantic/Jan_Mayen.py                 |      0
 lib/pytz-old/zoneinfo/Atlantic/Madeira             |    Bin 0 -> 3478 bytes
 .../zoneinfo/Atlantic/Madeira.py                   |      0
 lib/pytz-old/zoneinfo/Atlantic/Reykjavik           |    Bin 0 -> 1167 bytes
 .../zoneinfo/Atlantic/Reykjavik.py                 |      0
 lib/pytz-old/zoneinfo/Atlantic/South_Georgia       |    Bin 0 -> 148 bytes
 .../zoneinfo/Atlantic/South_Georgia.py             |      0
 lib/pytz-old/zoneinfo/Atlantic/St_Helena           |    Bin 0 -> 170 bytes
 .../zoneinfo/Atlantic/St_Helena.py                 |      0
 lib/pytz-old/zoneinfo/Atlantic/Stanley             |    Bin 0 -> 1246 bytes
 .../zoneinfo/Atlantic/Stanley.py                   |      0
 .../zoneinfo/Atlantic/__init__.py                  |      0
 lib/pytz-old/zoneinfo/Australia/ACT                |    Bin 0 -> 2223 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/ACT.py   |      0
 lib/pytz-old/zoneinfo/Australia/Adelaide           |    Bin 0 -> 2238 bytes
 .../zoneinfo/Australia/Adelaide.py                 |      0
 lib/pytz-old/zoneinfo/Australia/Brisbane           |    Bin 0 -> 452 bytes
 .../zoneinfo/Australia/Brisbane.py                 |      0
 lib/pytz-old/zoneinfo/Australia/Broken_Hill        |    Bin 0 -> 2274 bytes
 .../zoneinfo/Australia/Broken_Hill.py              |      0
 lib/pytz-old/zoneinfo/Australia/Canberra           |    Bin 0 -> 2223 bytes
 .../zoneinfo/Australia/Canberra.py                 |      0
 lib/pytz-old/zoneinfo/Australia/Currie             |    Bin 0 -> 2223 bytes
 .../zoneinfo/Australia/Currie.py                   |      0
 lib/pytz-old/zoneinfo/Australia/Darwin             |    Bin 0 -> 323 bytes
 .../zoneinfo/Australia/Darwin.py                   |      0
 lib/pytz-old/zoneinfo/Australia/Eucla              |    Bin 0 -> 487 bytes
 lib/pytz-old/zoneinfo/Australia/Hobart             |    Bin 0 -> 2335 bytes
 .../zoneinfo/Australia/Hobart.py                   |      0
 lib/pytz-old/zoneinfo/Australia/LHI                |    Bin 0 -> 1859 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/LHI.py   |      0
 lib/pytz-old/zoneinfo/Australia/Lindeman           |    Bin 0 -> 522 bytes
 .../zoneinfo/Australia/Lindeman.py                 |      0
 lib/pytz-old/zoneinfo/Australia/Lord_Howe          |    Bin 0 -> 1859 bytes
 .../zoneinfo/Australia/Lord_Howe.py                |      0
 lib/pytz-old/zoneinfo/Australia/Melbourne          |    Bin 0 -> 2223 bytes
 .../zoneinfo/Australia/Melbourne.py                |      0
 lib/pytz-old/zoneinfo/Australia/NSW                |    Bin 0 -> 2223 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/NSW.py   |      0
 lib/pytz-old/zoneinfo/Australia/North              |    Bin 0 -> 323 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/North.py |      0
 lib/pytz-old/zoneinfo/Australia/Perth              |    Bin 0 -> 479 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/Perth.py |      0
 lib/pytz-old/zoneinfo/Australia/Queensland         |    Bin 0 -> 452 bytes
 .../zoneinfo/Australia/Queensland.py               |      0
 lib/pytz-old/zoneinfo/Australia/South              |    Bin 0 -> 2238 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/South.py |      0
 lib/pytz-old/zoneinfo/Australia/Sydney             |    Bin 0 -> 2223 bytes
 .../zoneinfo/Australia/Sydney.py                   |      0
 lib/pytz-old/zoneinfo/Australia/Tasmania           |    Bin 0 -> 2335 bytes
 .../zoneinfo/Australia/Tasmania.py                 |      0
 lib/pytz-old/zoneinfo/Australia/Victoria           |    Bin 0 -> 2223 bytes
 .../zoneinfo/Australia/Victoria.py                 |      0
 lib/pytz-old/zoneinfo/Australia/West               |    Bin 0 -> 479 bytes
 lib/{pytz => pytz-old}/zoneinfo/Australia/West.py  |      0
 lib/pytz-old/zoneinfo/Australia/Yancowinna         |    Bin 0 -> 2274 bytes
 .../zoneinfo/Australia/Yancowinna.py               |      0
 .../zoneinfo/Australia/__init__.py                 |      0
 lib/pytz-old/zoneinfo/Brazil/Acre                  |    Bin 0 -> 656 bytes
 lib/{pytz => pytz-old}/zoneinfo/Brazil/Acre.py     |      0
 lib/pytz-old/zoneinfo/Brazil/DeNoronha             |    Bin 0 -> 728 bytes
 .../zoneinfo/Brazil/DeNoronha.py                   |      0
 lib/pytz-old/zoneinfo/Brazil/East                  |    Bin 0 -> 2015 bytes
 lib/{pytz => pytz-old}/zoneinfo/Brazil/East.py     |      0
 lib/pytz-old/zoneinfo/Brazil/West                  |    Bin 0 -> 616 bytes
 lib/{pytz => pytz-old}/zoneinfo/Brazil/West.py     |      0
 lib/{pytz => pytz-old}/zoneinfo/Brazil/__init__.py |      0
 lib/pytz-old/zoneinfo/CET                          |    Bin 0 -> 2102 bytes
 lib/{pytz => pytz-old}/zoneinfo/CET.py             |      0
 lib/pytz-old/zoneinfo/CST6CDT                      |    Bin 0 -> 2294 bytes
 lib/{pytz => pytz-old}/zoneinfo/CST6CDT.py         |      0
 lib/pytz-old/zoneinfo/Canada/Atlantic              |    Bin 0 -> 3438 bytes
 lib/{pytz => pytz-old}/zoneinfo/Canada/Atlantic.py |      0
 lib/pytz-old/zoneinfo/Canada/Central               |    Bin 0 -> 2891 bytes
 lib/{pytz => pytz-old}/zoneinfo/Canada/Central.py  |      0
 lib/pytz-old/zoneinfo/Canada/East-Saskatchewan     |    Bin 0 -> 994 bytes
 .../zoneinfo/Canada/East_minus_Saskatchewan.py     |      0
 lib/pytz-old/zoneinfo/Canada/Eastern               |    Bin 0 -> 3503 bytes
 lib/{pytz => pytz-old}/zoneinfo/Canada/Eastern.py  |      0
 lib/pytz-old/zoneinfo/Canada/Mountain              |    Bin 0 -> 2402 bytes
 lib/{pytz => pytz-old}/zoneinfo/Canada/Mountain.py |      0
 lib/pytz-old/zoneinfo/Canada/Newfoundland          |    Bin 0 -> 3664 bytes
 .../zoneinfo/Canada/Newfoundland.py                |      0
 lib/pytz-old/zoneinfo/Canada/Pacific               |    Bin 0 -> 2901 bytes
 lib/{pytz => pytz-old}/zoneinfo/Canada/Pacific.py  |      0
 lib/pytz-old/zoneinfo/Canada/Saskatchewan          |    Bin 0 -> 994 bytes
 .../zoneinfo/Canada/Saskatchewan.py                |      0
 lib/pytz-old/zoneinfo/Canada/Yukon                 |    Bin 0 -> 2093 bytes
 lib/{pytz => pytz-old}/zoneinfo/Canada/Yukon.py    |      0
 lib/{pytz => pytz-old}/zoneinfo/Canada/__init__.py |      0
 lib/pytz-old/zoneinfo/Chile/Continental            |    Bin 0 -> 2531 bytes
 .../zoneinfo/Chile/Continental.py                  |      0
 lib/pytz-old/zoneinfo/Chile/EasterIsland           |    Bin 0 -> 2295 bytes
 .../zoneinfo/Chile/EasterIsland.py                 |      0
 lib/{pytz => pytz-old}/zoneinfo/Chile/__init__.py  |      0
 lib/pytz-old/zoneinfo/Cuba                         |    Bin 0 -> 2437 bytes
 lib/{pytz => pytz-old}/zoneinfo/Cuba.py            |      0
 lib/pytz-old/zoneinfo/EET                          |    Bin 0 -> 1876 bytes
 lib/{pytz => pytz-old}/zoneinfo/EET.py             |      0
 lib/pytz-old/zoneinfo/EST                          |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/EST.py             |      0
 lib/pytz-old/zoneinfo/EST5EDT                      |    Bin 0 -> 2294 bytes
 lib/{pytz => pytz-old}/zoneinfo/EST5EDT.py         |      0
 lib/pytz-old/zoneinfo/Egypt                        |    Bin 0 -> 2779 bytes
 lib/{pytz => pytz-old}/zoneinfo/Egypt.py           |      0
 lib/pytz-old/zoneinfo/Eire                         |    Bin 0 -> 3559 bytes
 lib/{pytz => pytz-old}/zoneinfo/Eire.py            |      0
 lib/pytz-old/zoneinfo/Etc/GMT                      |    Bin 0 -> 127 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+0                    |    Bin 0 -> 127 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+1                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+10                   |    Bin 0 -> 139 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+11                   |    Bin 0 -> 139 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+12                   |    Bin 0 -> 139 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+2                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+3                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+4                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+5                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+6                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+7                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+8                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT+9                    |    Bin 0 -> 135 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-0                    |    Bin 0 -> 127 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-1                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-10                   |    Bin 0 -> 140 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-11                   |    Bin 0 -> 140 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-12                   |    Bin 0 -> 140 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-13                   |    Bin 0 -> 140 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-14                   |    Bin 0 -> 140 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-2                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-3                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-4                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-5                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-6                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-7                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-8                    |    Bin 0 -> 136 bytes
 lib/pytz-old/zoneinfo/Etc/GMT-9                    |    Bin 0 -> 136 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT.py         |      0
 lib/pytz-old/zoneinfo/Etc/GMT0                     |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT0.py        |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_0.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_1.py |      0
 .../zoneinfo/Etc/GMT_minus_10.py                   |      0
 .../zoneinfo/Etc/GMT_minus_11.py                   |      0
 .../zoneinfo/Etc/GMT_minus_12.py                   |      0
 .../zoneinfo/Etc/GMT_minus_13.py                   |      0
 .../zoneinfo/Etc/GMT_minus_14.py                   |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_2.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_3.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_4.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_5.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_6.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_7.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_8.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_minus_9.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_0.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_1.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_10.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_11.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_12.py |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_2.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_3.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_4.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_5.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_6.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_7.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_8.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/GMT_plus_9.py  |      0
 lib/pytz-old/zoneinfo/Etc/Greenwich                |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/Greenwich.py   |      0
 lib/pytz-old/zoneinfo/Etc/UCT                      |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/UCT.py         |      0
 lib/pytz-old/zoneinfo/Etc/UTC                      |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/UTC.py         |      0
 lib/pytz-old/zoneinfo/Etc/Universal                |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/Universal.py   |      0
 lib/pytz-old/zoneinfo/Etc/Zulu                     |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Etc/Zulu.py        |      0
 lib/{pytz => pytz-old}/zoneinfo/Etc/__init__.py    |      0
 lib/pytz-old/zoneinfo/Europe/Amsterdam             |    Bin 0 -> 2943 bytes
 .../zoneinfo/Europe/Amsterdam.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Andorra               |    Bin 0 -> 1751 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Andorra.py  |      0
 lib/pytz-old/zoneinfo/Europe/Athens                |    Bin 0 -> 2271 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Athens.py   |      0
 lib/pytz-old/zoneinfo/Europe/Belfast               |    Bin 0 -> 3687 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Belfast.py  |      0
 lib/pytz-old/zoneinfo/Europe/Belgrade              |    Bin 0 -> 1957 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Belgrade.py |      0
 lib/pytz-old/zoneinfo/Europe/Berlin                |    Bin 0 -> 2335 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Berlin.py   |      0
 lib/pytz-old/zoneinfo/Europe/Bratislava            |    Bin 0 -> 2272 bytes
 .../zoneinfo/Europe/Bratislava.py                  |      0
 lib/pytz-old/zoneinfo/Europe/Brussels              |    Bin 0 -> 2970 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Brussels.py |      0
 lib/pytz-old/zoneinfo/Europe/Bucharest             |    Bin 0 -> 2221 bytes
 .../zoneinfo/Europe/Bucharest.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Budapest              |    Bin 0 -> 2405 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Budapest.py |      0
 lib/pytz-old/zoneinfo/Europe/Busingen              |    Bin 0 -> 1918 bytes
 lib/pytz-old/zoneinfo/Europe/Chisinau              |    Bin 0 -> 2433 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Chisinau.py |      0
 lib/pytz-old/zoneinfo/Europe/Copenhagen            |    Bin 0 -> 2160 bytes
 .../zoneinfo/Europe/Copenhagen.py                  |      0
 lib/pytz-old/zoneinfo/Europe/Dublin                |    Bin 0 -> 3559 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Dublin.py   |      0
 lib/pytz-old/zoneinfo/Europe/Gibraltar             |    Bin 0 -> 3061 bytes
 .../zoneinfo/Europe/Gibraltar.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Guernsey              |    Bin 0 -> 3687 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Guernsey.py |      0
 lib/pytz-old/zoneinfo/Europe/Helsinki              |    Bin 0 -> 1909 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Helsinki.py |      0
 lib/pytz-old/zoneinfo/Europe/Isle_of_Man           |    Bin 0 -> 3687 bytes
 .../zoneinfo/Europe/Isle_of_Man.py                 |      0
 lib/pytz-old/zoneinfo/Europe/Istanbul              |    Bin 0 -> 2747 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Istanbul.py |      0
 lib/pytz-old/zoneinfo/Europe/Jersey                |    Bin 0 -> 3687 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Jersey.py   |      0
 lib/pytz-old/zoneinfo/Europe/Kaliningrad           |    Bin 0 -> 1550 bytes
 .../zoneinfo/Europe/Kaliningrad.py                 |      0
 lib/pytz-old/zoneinfo/Europe/Kiev                  |    Bin 0 -> 2097 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Kiev.py     |      0
 lib/pytz-old/zoneinfo/Europe/Lisbon                |    Bin 0 -> 3453 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Lisbon.py   |      0
 lib/pytz-old/zoneinfo/Europe/Ljubljana             |    Bin 0 -> 1957 bytes
 .../zoneinfo/Europe/Ljubljana.py                   |      0
 lib/pytz-old/zoneinfo/Europe/London                |    Bin 0 -> 3687 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/London.py   |      0
 lib/pytz-old/zoneinfo/Europe/Luxembourg            |    Bin 0 -> 2974 bytes
 .../zoneinfo/Europe/Luxembourg.py                  |      0
 lib/pytz-old/zoneinfo/Europe/Madrid                |    Bin 0 -> 2619 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Madrid.py   |      0
 lib/pytz-old/zoneinfo/Europe/Malta                 |    Bin 0 -> 2629 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Malta.py    |      0
 lib/pytz-old/zoneinfo/Europe/Mariehamn             |    Bin 0 -> 1909 bytes
 .../zoneinfo/Europe/Mariehamn.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Minsk                 |    Bin 0 -> 1368 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Minsk.py    |      0
 lib/pytz-old/zoneinfo/Europe/Monaco                |    Bin 0 -> 2953 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Monaco.py   |      0
 lib/pytz-old/zoneinfo/Europe/Moscow                |    Bin 0 -> 1528 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Moscow.py   |      0
 lib/pytz-old/zoneinfo/Europe/Nicosia               |    Bin 0 -> 2016 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Nicosia.py  |      0
 lib/pytz-old/zoneinfo/Europe/Oslo                  |    Bin 0 -> 2251 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Oslo.py     |      0
 lib/pytz-old/zoneinfo/Europe/Paris                 |    Bin 0 -> 2971 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Paris.py    |      0
 lib/pytz-old/zoneinfo/Europe/Podgorica             |    Bin 0 -> 1957 bytes
 .../zoneinfo/Europe/Podgorica.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Prague                |    Bin 0 -> 2272 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Prague.py   |      0
 lib/pytz-old/zoneinfo/Europe/Riga                  |    Bin 0 -> 2235 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Riga.py     |      0
 lib/pytz-old/zoneinfo/Europe/Rome                  |    Bin 0 -> 2678 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Rome.py     |      0
 lib/pytz-old/zoneinfo/Europe/Samara                |    Bin 0 -> 1394 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Samara.py   |      0
 lib/pytz-old/zoneinfo/Europe/San_Marino            |    Bin 0 -> 2678 bytes
 .../zoneinfo/Europe/San_Marino.py                  |      0
 lib/pytz-old/zoneinfo/Europe/Sarajevo              |    Bin 0 -> 1957 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Sarajevo.py |      0
 lib/pytz-old/zoneinfo/Europe/Simferopol            |    Bin 0 -> 1504 bytes
 .../zoneinfo/Europe/Simferopol.py                  |      0
 lib/pytz-old/zoneinfo/Europe/Skopje                |    Bin 0 -> 1957 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Skopje.py   |      0
 lib/pytz-old/zoneinfo/Europe/Sofia                 |    Bin 0 -> 2130 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Sofia.py    |      0
 lib/pytz-old/zoneinfo/Europe/Stockholm             |    Bin 0 -> 1918 bytes
 .../zoneinfo/Europe/Stockholm.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Tallinn               |    Bin 0 -> 2201 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Tallinn.py  |      0
 lib/pytz-old/zoneinfo/Europe/Tirane                |    Bin 0 -> 2098 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Tirane.py   |      0
 lib/pytz-old/zoneinfo/Europe/Tiraspol              |    Bin 0 -> 2433 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Tiraspol.py |      0
 lib/pytz-old/zoneinfo/Europe/Uzhgorod              |    Bin 0 -> 2103 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Uzhgorod.py |      0
 lib/pytz-old/zoneinfo/Europe/Vaduz                 |    Bin 0 -> 1918 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Vaduz.py    |      0
 lib/pytz-old/zoneinfo/Europe/Vatican               |    Bin 0 -> 2678 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Vatican.py  |      0
 lib/pytz-old/zoneinfo/Europe/Vienna                |    Bin 0 -> 2237 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Vienna.py   |      0
 lib/pytz-old/zoneinfo/Europe/Vilnius               |    Bin 0 -> 2199 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Vilnius.py  |      0
 lib/pytz-old/zoneinfo/Europe/Volgograd             |    Bin 0 -> 1317 bytes
 .../zoneinfo/Europe/Volgograd.py                   |      0
 lib/pytz-old/zoneinfo/Europe/Warsaw                |    Bin 0 -> 2705 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Warsaw.py   |      0
 lib/pytz-old/zoneinfo/Europe/Zagreb                |    Bin 0 -> 1957 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Zagreb.py   |      0
 lib/pytz-old/zoneinfo/Europe/Zaporozhye            |    Bin 0 -> 2111 bytes
 .../zoneinfo/Europe/Zaporozhye.py                  |      0
 lib/pytz-old/zoneinfo/Europe/Zurich                |    Bin 0 -> 1918 bytes
 lib/{pytz => pytz-old}/zoneinfo/Europe/Zurich.py   |      0
 lib/{pytz => pytz-old}/zoneinfo/Europe/__init__.py |      0
 lib/pytz-old/zoneinfo/Factory                      |    Bin 0 -> 264 bytes
 lib/pytz-old/zoneinfo/GB                           |    Bin 0 -> 3687 bytes
 lib/pytz-old/zoneinfo/GB-Eire                      |    Bin 0 -> 3687 bytes
 lib/{pytz => pytz-old}/zoneinfo/GB.py              |      0
 lib/{pytz => pytz-old}/zoneinfo/GB_minus_Eire.py   |      0
 lib/pytz-old/zoneinfo/GMT                          |    Bin 0 -> 127 bytes
 lib/pytz-old/zoneinfo/GMT+0                        |    Bin 0 -> 127 bytes
 lib/pytz-old/zoneinfo/GMT-0                        |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/GMT.py             |      0
 lib/pytz-old/zoneinfo/GMT0                         |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/GMT0.py            |      0
 lib/{pytz => pytz-old}/zoneinfo/GMT_minus_0.py     |      0
 lib/{pytz => pytz-old}/zoneinfo/GMT_plus_0.py      |      0
 lib/pytz-old/zoneinfo/Greenwich                    |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Greenwich.py       |      0
 lib/pytz-old/zoneinfo/HST                          |    Bin 0 -> 128 bytes
 lib/{pytz => pytz-old}/zoneinfo/HST.py             |      0
 lib/pytz-old/zoneinfo/Hongkong                     |    Bin 0 -> 1189 bytes
 lib/{pytz => pytz-old}/zoneinfo/Hongkong.py        |      0
 lib/pytz-old/zoneinfo/Iceland                      |    Bin 0 -> 1167 bytes
 lib/{pytz => pytz-old}/zoneinfo/Iceland.py         |      0
 lib/pytz-old/zoneinfo/Indian/Antananarivo          |    Bin 0 -> 283 bytes
 .../zoneinfo/Indian/Antananarivo.py                |      0
 lib/pytz-old/zoneinfo/Indian/Chagos                |    Bin 0 -> 201 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Chagos.py   |      0
 lib/pytz-old/zoneinfo/Indian/Christmas             |    Bin 0 -> 149 bytes
 .../zoneinfo/Indian/Christmas.py                   |      0
 lib/pytz-old/zoneinfo/Indian/Cocos                 |    Bin 0 -> 152 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Cocos.py    |      0
 lib/pytz-old/zoneinfo/Indian/Comoro                |    Bin 0 -> 283 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Comoro.py   |      0
 lib/pytz-old/zoneinfo/Indian/Kerguelen             |    Bin 0 -> 171 bytes
 .../zoneinfo/Indian/Kerguelen.py                   |      0
 lib/pytz-old/zoneinfo/Indian/Mahe                  |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Mahe.py     |      0
 lib/pytz-old/zoneinfo/Indian/Maldives              |    Bin 0 -> 204 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Maldives.py |      0
 lib/pytz-old/zoneinfo/Indian/Mauritius             |    Bin 0 -> 253 bytes
 .../zoneinfo/Indian/Mauritius.py                   |      0
 lib/pytz-old/zoneinfo/Indian/Mayotte               |    Bin 0 -> 283 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Mayotte.py  |      0
 lib/pytz-old/zoneinfo/Indian/Reunion               |    Bin 0 -> 171 bytes
 lib/{pytz => pytz-old}/zoneinfo/Indian/Reunion.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Indian/__init__.py |      0
 lib/pytz-old/zoneinfo/Iran                         |    Bin 0 -> 1661 bytes
 lib/{pytz => pytz-old}/zoneinfo/Iran.py            |      0
 lib/pytz-old/zoneinfo/Israel                       |    Bin 0 -> 2265 bytes
 lib/{pytz => pytz-old}/zoneinfo/Israel.py          |      0
 lib/pytz-old/zoneinfo/Jamaica                      |    Bin 0 -> 507 bytes
 lib/{pytz => pytz-old}/zoneinfo/Jamaica.py         |      0
 lib/pytz-old/zoneinfo/Japan                        |    Bin 0 -> 355 bytes
 lib/{pytz => pytz-old}/zoneinfo/Japan.py           |      0
 lib/pytz-old/zoneinfo/Kwajalein                    |    Bin 0 -> 237 bytes
 lib/{pytz => pytz-old}/zoneinfo/Kwajalein.py       |      0
 lib/pytz-old/zoneinfo/Libya                        |    Bin 0 -> 655 bytes
 lib/{pytz => pytz-old}/zoneinfo/Libya.py           |      0
 lib/pytz-old/zoneinfo/MET                          |    Bin 0 -> 2102 bytes
 lib/{pytz => pytz-old}/zoneinfo/MET.py             |      0
 lib/pytz-old/zoneinfo/MST                          |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/MST.py             |      0
 lib/pytz-old/zoneinfo/MST7MDT                      |    Bin 0 -> 2294 bytes
 lib/{pytz => pytz-old}/zoneinfo/MST7MDT.py         |      0
 lib/pytz-old/zoneinfo/Mexico/BajaNorte             |    Bin 0 -> 2356 bytes
 .../zoneinfo/Mexico/BajaNorte.py                   |      0
 lib/pytz-old/zoneinfo/Mexico/BajaSur               |    Bin 0 -> 1564 bytes
 lib/{pytz => pytz-old}/zoneinfo/Mexico/BajaSur.py  |      0
 lib/pytz-old/zoneinfo/Mexico/General               |    Bin 0 -> 1618 bytes
 lib/{pytz => pytz-old}/zoneinfo/Mexico/General.py  |      0
 lib/{pytz => pytz-old}/zoneinfo/Mexico/__init__.py |      0
 lib/pytz-old/zoneinfo/NZ                           |    Bin 0 -> 2460 bytes
 lib/pytz-old/zoneinfo/NZ-CHAT                      |    Bin 0 -> 2057 bytes
 lib/{pytz => pytz-old}/zoneinfo/NZ.py              |      0
 lib/{pytz => pytz-old}/zoneinfo/NZ_minus_CHAT.py   |      0
 lib/pytz-old/zoneinfo/Navajo                       |    Bin 0 -> 2453 bytes
 lib/{pytz => pytz-old}/zoneinfo/Navajo.py          |      0
 lib/pytz-old/zoneinfo/PRC                          |    Bin 0 -> 414 bytes
 lib/{pytz => pytz-old}/zoneinfo/PRC.py             |      0
 lib/pytz-old/zoneinfo/PST8PDT                      |    Bin 0 -> 2294 bytes
 lib/{pytz => pytz-old}/zoneinfo/PST8PDT.py         |      0
 lib/pytz-old/zoneinfo/Pacific/Apia                 |    Bin 0 -> 1102 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Apia.py    |      0
 lib/pytz-old/zoneinfo/Pacific/Auckland             |    Bin 0 -> 2460 bytes
 .../zoneinfo/Pacific/Auckland.py                   |      0
 lib/pytz-old/zoneinfo/Pacific/Bougainville         |    Bin 0 -> 280 bytes
 lib/pytz-old/zoneinfo/Pacific/Chatham              |    Bin 0 -> 2057 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Chatham.py |      0
 lib/pytz-old/zoneinfo/Pacific/Chuuk                |    Bin 0 -> 153 bytes
 lib/pytz-old/zoneinfo/Pacific/Easter               |    Bin 0 -> 2295 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Easter.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Efate                |    Bin 0 -> 478 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Efate.py   |      0
 lib/pytz-old/zoneinfo/Pacific/Enderbury            |    Bin 0 -> 230 bytes
 .../zoneinfo/Pacific/Enderbury.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Fakaofo              |    Bin 0 -> 197 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Fakaofo.py |      0
 lib/pytz-old/zoneinfo/Pacific/Fiji                 |    Bin 0 -> 1074 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Fiji.py    |      0
 lib/pytz-old/zoneinfo/Pacific/Funafuti             |    Bin 0 -> 150 bytes
 .../zoneinfo/Pacific/Funafuti.py                   |      0
 lib/pytz-old/zoneinfo/Pacific/Galapagos            |    Bin 0 -> 211 bytes
 .../zoneinfo/Pacific/Galapagos.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Gambier              |    Bin 0 -> 173 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Gambier.py |      0
 lib/pytz-old/zoneinfo/Pacific/Guadalcanal          |    Bin 0 -> 172 bytes
 .../zoneinfo/Pacific/Guadalcanal.py                |      0
 lib/pytz-old/zoneinfo/Pacific/Guam                 |    Bin 0 -> 225 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Guam.py    |      0
 lib/pytz-old/zoneinfo/Pacific/Honolulu             |    Bin 0 -> 276 bytes
 .../zoneinfo/Pacific/Honolulu.py                   |      0
 lib/pytz-old/zoneinfo/Pacific/Johnston             |    Bin 0 -> 276 bytes
 .../zoneinfo/Pacific/Johnston.py                   |      0
 lib/pytz-old/zoneinfo/Pacific/Kiritimati           |    Bin 0 -> 230 bytes
 .../zoneinfo/Pacific/Kiritimati.py                 |      0
 lib/pytz-old/zoneinfo/Pacific/Kosrae               |    Bin 0 -> 230 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Kosrae.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Kwajalein            |    Bin 0 -> 237 bytes
 .../zoneinfo/Pacific/Kwajalein.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Majuro               |    Bin 0 -> 197 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Majuro.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Marquesas            |    Bin 0 -> 176 bytes
 .../zoneinfo/Pacific/Marquesas.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Midway               |    Bin 0 -> 294 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Midway.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Nauru                |    Bin 0 -> 254 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Nauru.py   |      0
 lib/pytz-old/zoneinfo/Pacific/Niue                 |    Bin 0 -> 226 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Niue.py    |      0
 lib/pytz-old/zoneinfo/Pacific/Norfolk              |    Bin 0 -> 208 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Norfolk.py |      0
 lib/pytz-old/zoneinfo/Pacific/Noumea               |    Bin 0 -> 314 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Noumea.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Pago_Pago            |    Bin 0 -> 272 bytes
 .../zoneinfo/Pacific/Pago_Pago.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Palau                |    Bin 0 -> 149 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Palau.py   |      0
 lib/pytz-old/zoneinfo/Pacific/Pitcairn             |    Bin 0 -> 203 bytes
 .../zoneinfo/Pacific/Pitcairn.py                   |      0
 lib/pytz-old/zoneinfo/Pacific/Pohnpei              |    Bin 0 -> 153 bytes
 lib/pytz-old/zoneinfo/Pacific/Ponape               |    Bin 0 -> 153 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Ponape.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Port_Moresby         |    Bin 0 -> 172 bytes
 .../zoneinfo/Pacific/Port_Moresby.py               |      0
 lib/pytz-old/zoneinfo/Pacific/Rarotonga            |    Bin 0 -> 574 bytes
 .../zoneinfo/Pacific/Rarotonga.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Saipan               |    Bin 0 -> 255 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Saipan.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Samoa                |    Bin 0 -> 272 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Samoa.py   |      0
 lib/pytz-old/zoneinfo/Pacific/Tahiti               |    Bin 0 -> 174 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Tahiti.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Tarawa               |    Bin 0 -> 153 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Tarawa.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Tongatapu            |    Bin 0 -> 339 bytes
 .../zoneinfo/Pacific/Tongatapu.py                  |      0
 lib/pytz-old/zoneinfo/Pacific/Truk                 |    Bin 0 -> 153 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Truk.py    |      0
 lib/pytz-old/zoneinfo/Pacific/Wake                 |    Bin 0 -> 153 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Wake.py    |      0
 lib/pytz-old/zoneinfo/Pacific/Wallis               |    Bin 0 -> 150 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Wallis.py  |      0
 lib/pytz-old/zoneinfo/Pacific/Yap                  |    Bin 0 -> 153 bytes
 lib/{pytz => pytz-old}/zoneinfo/Pacific/Yap.py     |      0
 .../zoneinfo/Pacific/__init__.py                   |      0
 lib/pytz-old/zoneinfo/Poland                       |    Bin 0 -> 2705 bytes
 lib/{pytz => pytz-old}/zoneinfo/Poland.py          |      0
 lib/pytz-old/zoneinfo/Portugal                     |    Bin 0 -> 3453 bytes
 lib/{pytz => pytz-old}/zoneinfo/Portugal.py        |      0
 lib/pytz-old/zoneinfo/ROC                          |    Bin 0 -> 800 bytes
 lib/{pytz => pytz-old}/zoneinfo/ROC.py             |      0
 lib/pytz-old/zoneinfo/ROK                          |    Bin 0 -> 571 bytes
 lib/{pytz => pytz-old}/zoneinfo/ROK.py             |      0
 lib/pytz-old/zoneinfo/Singapore                    |    Bin 0 -> 428 bytes
 lib/{pytz => pytz-old}/zoneinfo/Singapore.py       |      0
 lib/pytz-old/zoneinfo/Turkey                       |    Bin 0 -> 2747 bytes
 lib/{pytz => pytz-old}/zoneinfo/Turkey.py          |      0
 lib/pytz-old/zoneinfo/UCT                          |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/UCT.py             |      0
 lib/pytz-old/zoneinfo/US/Alaska                    |    Bin 0 -> 2384 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Alaska.py       |      0
 lib/pytz-old/zoneinfo/US/Aleutian                  |    Bin 0 -> 2379 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Aleutian.py     |      0
 lib/pytz-old/zoneinfo/US/Arizona                   |    Bin 0 -> 353 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Arizona.py      |      0
 lib/pytz-old/zoneinfo/US/Central                   |    Bin 0 -> 3585 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Central.py      |      0
 lib/pytz-old/zoneinfo/US/East-Indiana              |    Bin 0 -> 1675 bytes
 .../zoneinfo/US/East_minus_Indiana.py              |      0
 lib/pytz-old/zoneinfo/US/Eastern                   |    Bin 0 -> 3545 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Eastern.py      |      0
 lib/pytz-old/zoneinfo/US/Hawaii                    |    Bin 0 -> 276 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Hawaii.py       |      0
 lib/pytz-old/zoneinfo/US/Indiana-Starke            |    Bin 0 -> 2437 bytes
 .../zoneinfo/US/Indiana_minus_Starke.py            |      0
 lib/pytz-old/zoneinfo/US/Michigan                  |    Bin 0 -> 2216 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Michigan.py     |      0
 lib/pytz-old/zoneinfo/US/Mountain                  |    Bin 0 -> 2453 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Mountain.py     |      0
 lib/pytz-old/zoneinfo/US/Pacific                   |    Bin 0 -> 2845 bytes
 lib/pytz-old/zoneinfo/US/Pacific-New               |    Bin 0 -> 2845 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Pacific.py      |      0
 .../zoneinfo/US/Pacific_minus_New.py               |      0
 lib/pytz-old/zoneinfo/US/Samoa                     |    Bin 0 -> 272 bytes
 lib/{pytz => pytz-old}/zoneinfo/US/Samoa.py        |      0
 lib/{pytz => pytz-old}/zoneinfo/US/__init__.py     |      0
 lib/pytz-old/zoneinfo/UTC                          |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/UTC.py             |      0
 lib/pytz-old/zoneinfo/Universal                    |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Universal.py       |      0
 lib/pytz-old/zoneinfo/W-SU                         |    Bin 0 -> 1528 bytes
 lib/pytz-old/zoneinfo/WET                          |    Bin 0 -> 1873 bytes
 lib/{pytz => pytz-old}/zoneinfo/WET.py             |      0
 lib/{pytz => pytz-old}/zoneinfo/W_minus_SU.py      |      0
 lib/pytz-old/zoneinfo/Zulu                         |    Bin 0 -> 127 bytes
 lib/{pytz => pytz-old}/zoneinfo/Zulu.py            |      0
 lib/{pytz => pytz-old}/zoneinfo/__init__.py        |      0
 lib/pytz-old/zoneinfo/iso3166.tab                  |    275 +
 lib/pytz-old/zoneinfo/localtime                    |    Bin 0 -> 127 bytes
 lib/pytz-old/zoneinfo/posixrules                   |    Bin 0 -> 3545 bytes
 lib/{pytz => pytz-old}/zoneinfo/posixrules.py      |      0
 lib/pytz-old/zoneinfo/zone.tab                     |    440 +
 lib/pytz-old/zoneinfo/zone1970.tab                 |    371 +
 lib/pytz/__init__.py                               |    653 +-
 lib/pytz/__init__.pyc                              |    Bin 26999 -> 32916 bytes
 lib/pytz/exceptions.py                             |     48 +
 lib/pytz/exceptions.pyc                            |    Bin 0 -> 2079 bytes
 lib/pytz/lazy.py                                   |    168 +
 lib/pytz/lazy.pyc                                  |    Bin 0 -> 6658 bytes
 lib/pytz/reference.py                              |      0
 lib/pytz/tests/test_docs.py                        |     47 +-
 lib/pytz/tests/test_lazy.py                        |    313 +
 lib/pytz/tests/test_tzinfo.py                      |    496 +-
 lib/pytz/tzfile.py                                 |    137 +
 lib/pytz/tzfile.pyc                                |    Bin 0 -> 3931 bytes
 lib/pytz/tzinfo.py                                 |    337 +-
 lib/pytz/tzinfo.pyc                                |    Bin 12523 -> 16989 bytes
 lib/pytz/zoneinfo/Africa/Abidjan                   |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Accra                     |    Bin 0 -> 840 bytes
 lib/pytz/zoneinfo/Africa/Addis_Ababa               |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Algiers                   |    Bin 0 -> 760 bytes
 lib/pytz/zoneinfo/Africa/Asmara                    |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Asmera                    |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Bamako                    |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Bangui                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Banjul                    |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Bissau                    |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/Africa/Blantyre                  |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Brazzaville               |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Bujumbura                 |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Cairo                     |    Bin 0 -> 2779 bytes
 lib/pytz/zoneinfo/Africa/Casablanca                |    Bin 0 -> 1657 bytes
 lib/pytz/zoneinfo/Africa/Ceuta                     |    Bin 0 -> 2075 bytes
 lib/pytz/zoneinfo/Africa/Conakry                   |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Dakar                     |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Dar_es_Salaam             |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Djibouti                  |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Douala                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/El_Aaiun                  |    Bin 0 -> 1487 bytes
 lib/pytz/zoneinfo/Africa/Freetown                  |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Gaborone                  |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Harare                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Johannesburg              |    Bin 0 -> 271 bytes
 lib/pytz/zoneinfo/Africa/Juba                      |    Bin 0 -> 683 bytes
 lib/pytz/zoneinfo/Africa/Kampala                   |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Khartoum                  |    Bin 0 -> 683 bytes
 lib/pytz/zoneinfo/Africa/Kigali                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Kinshasa                  |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Lagos                     |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Libreville                |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Lome                      |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Luanda                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Lubumbashi                |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Lusaka                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Malabo                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Maputo                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Maseru                    |    Bin 0 -> 271 bytes
 lib/pytz/zoneinfo/Africa/Mbabane                   |    Bin 0 -> 271 bytes
 lib/pytz/zoneinfo/Africa/Mogadishu                 |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Monrovia                  |    Bin 0 -> 241 bytes
 lib/pytz/zoneinfo/Africa/Nairobi                   |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Africa/Ndjamena                  |    Bin 0 -> 225 bytes
 lib/pytz/zoneinfo/Africa/Niamey                    |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Nouakchott                |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Ouagadougou               |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Porto-Novo                |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Africa/Sao_Tome                  |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Timbuktu                  |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Africa/Tripoli                   |    Bin 0 -> 655 bytes
 lib/pytz/zoneinfo/Africa/Tunis                     |    Bin 0 -> 710 bytes
 lib/pytz/zoneinfo/Africa/Windhoek                  |    Bin 0 -> 1582 bytes
 lib/pytz/zoneinfo/America/Adak                     |    Bin 0 -> 2379 bytes
 lib/pytz/zoneinfo/America/Anchorage                |    Bin 0 -> 2384 bytes
 lib/pytz/zoneinfo/America/Anguilla                 |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Antigua                  |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/America/Araguaina                |    Bin 0 -> 896 bytes
 lib/pytz/zoneinfo/America/Argentina/Buenos_Aires   |    Bin 0 -> 1087 bytes
 lib/pytz/zoneinfo/America/Argentina/Catamarca      |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Argentina/ComodRivadavia |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Argentina/Cordoba        |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Argentina/Jujuy          |    Bin 0 -> 1145 bytes
 lib/pytz/zoneinfo/America/Argentina/La_Rioja       |    Bin 0 -> 1143 bytes
 lib/pytz/zoneinfo/America/Argentina/Mendoza        |    Bin 0 -> 1173 bytes
 lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos   |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Argentina/Salta          |    Bin 0 -> 1101 bytes
 lib/pytz/zoneinfo/America/Argentina/San_Juan       |    Bin 0 -> 1143 bytes
 lib/pytz/zoneinfo/America/Argentina/San_Luis       |    Bin 0 -> 1171 bytes
 lib/pytz/zoneinfo/America/Argentina/Tucuman        |    Bin 0 -> 1157 bytes
 lib/pytz/zoneinfo/America/Argentina/Ushuaia        |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Aruba                    |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/America/Asuncion                 |    Bin 0 -> 2062 bytes
 lib/pytz/zoneinfo/America/Atikokan                 |    Bin 0 -> 345 bytes
 lib/pytz/zoneinfo/America/Atka                     |    Bin 0 -> 2379 bytes
 lib/pytz/zoneinfo/America/Bahia                    |    Bin 0 -> 1036 bytes
 lib/pytz/zoneinfo/America/Bahia_Banderas           |    Bin 0 -> 1588 bytes
 lib/pytz/zoneinfo/America/Barbados                 |    Bin 0 -> 344 bytes
 lib/pytz/zoneinfo/America/Belem                    |    Bin 0 -> 588 bytes
 lib/pytz/zoneinfo/America/Belize                   |    Bin 0 -> 976 bytes
 lib/pytz/zoneinfo/America/Blanc-Sablon             |    Bin 0 -> 307 bytes
 lib/pytz/zoneinfo/America/Boa_Vista                |    Bin 0 -> 644 bytes
 lib/pytz/zoneinfo/America/Bogota                   |    Bin 0 -> 257 bytes
 lib/pytz/zoneinfo/America/Boise                    |    Bin 0 -> 2403 bytes
 lib/pytz/zoneinfo/America/Buenos_Aires             |    Bin 0 -> 1087 bytes
 lib/pytz/zoneinfo/America/Cambridge_Bay            |    Bin 0 -> 2098 bytes
 lib/pytz/zoneinfo/America/Campo_Grande             |    Bin 0 -> 2015 bytes
 lib/pytz/zoneinfo/America/Cancun                   |    Bin 0 -> 1480 bytes
 lib/pytz/zoneinfo/America/Caracas                  |    Bin 0 -> 266 bytes
 lib/pytz/zoneinfo/America/Catamarca                |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Cayenne                  |    Bin 0 -> 200 bytes
 lib/pytz/zoneinfo/America/Cayman                   |    Bin 0 -> 203 bytes
 lib/pytz/zoneinfo/America/Chicago                  |    Bin 0 -> 3585 bytes
 lib/pytz/zoneinfo/America/Chihuahua                |    Bin 0 -> 1522 bytes
 lib/pytz/zoneinfo/America/Coral_Harbour            |    Bin 0 -> 345 bytes
 lib/pytz/zoneinfo/America/Cordoba                  |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Costa_Rica               |    Bin 0 -> 341 bytes
 lib/pytz/zoneinfo/America/Creston                  |    Bin 0 -> 233 bytes
 lib/pytz/zoneinfo/America/Cuiaba                   |    Bin 0 -> 1987 bytes
 lib/pytz/zoneinfo/America/Curacao                  |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/America/Danmarkshavn             |    Bin 0 -> 714 bytes
 lib/pytz/zoneinfo/America/Dawson                   |    Bin 0 -> 2093 bytes
 lib/pytz/zoneinfo/America/Dawson_Creek             |    Bin 0 -> 1059 bytes
 lib/pytz/zoneinfo/America/Denver                   |    Bin 0 -> 2453 bytes
 lib/pytz/zoneinfo/America/Detroit                  |    Bin 0 -> 2216 bytes
 lib/pytz/zoneinfo/America/Dominica                 |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Edmonton                 |    Bin 0 -> 2402 bytes
 lib/pytz/zoneinfo/America/Eirunepe                 |    Bin 0 -> 684 bytes
 lib/pytz/zoneinfo/America/El_Salvador              |    Bin 0 -> 250 bytes
 lib/pytz/zoneinfo/America/Ensenada                 |    Bin 0 -> 2356 bytes
 lib/pytz/zoneinfo/America/Fort_Wayne               |    Bin 0 -> 1675 bytes
 lib/pytz/zoneinfo/America/Fortaleza                |    Bin 0 -> 728 bytes
 lib/pytz/zoneinfo/America/Glace_Bay                |    Bin 0 -> 2206 bytes
 lib/pytz/zoneinfo/America/Godthab                  |    Bin 0 -> 1877 bytes
 lib/pytz/zoneinfo/America/Goose_Bay                |    Bin 0 -> 3219 bytes
 lib/pytz/zoneinfo/America/Grand_Turk               |    Bin 0 -> 1287 bytes
 lib/pytz/zoneinfo/America/Grenada                  |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Guadeloupe               |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Guatemala                |    Bin 0 -> 306 bytes
 lib/pytz/zoneinfo/America/Guayaquil                |    Bin 0 -> 203 bytes
 lib/pytz/zoneinfo/America/Guyana                   |    Bin 0 -> 270 bytes
 lib/pytz/zoneinfo/America/Halifax                  |    Bin 0 -> 3438 bytes
 lib/pytz/zoneinfo/America/Havana                   |    Bin 0 -> 2437 bytes
 lib/pytz/zoneinfo/America/Hermosillo               |    Bin 0 -> 454 bytes
 lib/pytz/zoneinfo/America/Indiana/Indianapolis     |    Bin 0 -> 1675 bytes
 lib/pytz/zoneinfo/America/Indiana/Knox             |    Bin 0 -> 2437 bytes
 lib/pytz/zoneinfo/America/Indiana/Marengo          |    Bin 0 -> 1731 bytes
 lib/pytz/zoneinfo/America/Indiana/Petersburg       |    Bin 0 -> 1913 bytes
 lib/pytz/zoneinfo/America/Indiana/Tell_City        |    Bin 0 -> 1735 bytes
 lib/pytz/zoneinfo/America/Indiana/Vevay            |    Bin 0 -> 1423 bytes
 lib/pytz/zoneinfo/America/Indiana/Vincennes        |    Bin 0 -> 1703 bytes
 lib/pytz/zoneinfo/America/Indiana/Winamac          |    Bin 0 -> 1787 bytes
 lib/pytz/zoneinfo/America/Indianapolis             |    Bin 0 -> 1675 bytes
 lib/pytz/zoneinfo/America/Inuvik                   |    Bin 0 -> 1928 bytes
 lib/pytz/zoneinfo/America/Iqaluit                  |    Bin 0 -> 2046 bytes
 lib/pytz/zoneinfo/America/Jamaica                  |    Bin 0 -> 507 bytes
 lib/pytz/zoneinfo/America/Jujuy                    |    Bin 0 -> 1145 bytes
 lib/pytz/zoneinfo/America/Juneau                   |    Bin 0 -> 2362 bytes
 lib/pytz/zoneinfo/America/Kentucky/Louisville      |    Bin 0 -> 2781 bytes
 lib/pytz/zoneinfo/America/Kentucky/Monticello      |    Bin 0 -> 2361 bytes
 lib/pytz/zoneinfo/America/Knox_IN                  |    Bin 0 -> 2437 bytes
 lib/pytz/zoneinfo/America/Kralendijk               |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/America/La_Paz                   |    Bin 0 -> 243 bytes
 lib/pytz/zoneinfo/America/Lima                     |    Bin 0 -> 417 bytes
 lib/pytz/zoneinfo/America/Los_Angeles              |    Bin 0 -> 2845 bytes
 lib/pytz/zoneinfo/America/Louisville               |    Bin 0 -> 2781 bytes
 lib/pytz/zoneinfo/America/Lower_Princes            |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/America/Maceio                   |    Bin 0 -> 756 bytes
 lib/pytz/zoneinfo/America/Managua                  |    Bin 0 -> 463 bytes
 lib/pytz/zoneinfo/America/Manaus                   |    Bin 0 -> 616 bytes
 lib/pytz/zoneinfo/America/Marigot                  |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Martinique               |    Bin 0 -> 257 bytes
 lib/pytz/zoneinfo/America/Matamoros                |    Bin 0 -> 1416 bytes
 lib/pytz/zoneinfo/America/Mazatlan                 |    Bin 0 -> 1564 bytes
 lib/pytz/zoneinfo/America/Mendoza                  |    Bin 0 -> 1173 bytes
 lib/pytz/zoneinfo/America/Menominee                |    Bin 0 -> 2283 bytes
 lib/pytz/zoneinfo/America/Merida                   |    Bin 0 -> 1456 bytes
 lib/pytz/zoneinfo/America/Metlakatla               |    Bin 0 -> 716 bytes
 lib/pytz/zoneinfo/America/Mexico_City              |    Bin 0 -> 1618 bytes
 lib/pytz/zoneinfo/America/Miquelon                 |    Bin 0 -> 1684 bytes
 lib/pytz/zoneinfo/America/Moncton                  |    Bin 0 -> 3163 bytes
 lib/pytz/zoneinfo/America/Monterrey                |    Bin 0 -> 1416 bytes
 lib/pytz/zoneinfo/America/Montevideo               |    Bin 0 -> 2160 bytes
 lib/pytz/zoneinfo/America/Montreal                 |    Bin 0 -> 3503 bytes
 lib/pytz/zoneinfo/America/Montserrat               |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Nassau                   |    Bin 0 -> 2284 bytes
 lib/pytz/zoneinfo/America/New_York                 |    Bin 0 -> 3545 bytes
 lib/pytz/zoneinfo/America/Nipigon                  |    Bin 0 -> 2131 bytes
 lib/pytz/zoneinfo/America/Nome                     |    Bin 0 -> 2376 bytes
 lib/pytz/zoneinfo/America/Noronha                  |    Bin 0 -> 728 bytes
 lib/pytz/zoneinfo/America/North_Dakota/Beulah      |    Bin 0 -> 2389 bytes
 lib/pytz/zoneinfo/America/North_Dakota/Center      |    Bin 0 -> 2389 bytes
 lib/pytz/zoneinfo/America/North_Dakota/New_Salem   |    Bin 0 -> 2389 bytes
 lib/pytz/zoneinfo/America/Ojinaga                  |    Bin 0 -> 1522 bytes
 lib/pytz/zoneinfo/America/Panama                   |    Bin 0 -> 203 bytes
 lib/pytz/zoneinfo/America/Pangnirtung              |    Bin 0 -> 2108 bytes
 lib/pytz/zoneinfo/America/Paramaribo               |    Bin 0 -> 308 bytes
 lib/pytz/zoneinfo/America/Phoenix                  |    Bin 0 -> 353 bytes
 lib/pytz/zoneinfo/America/Port-au-Prince           |    Bin 0 -> 1483 bytes
 lib/pytz/zoneinfo/America/Port_of_Spain            |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Porto_Acre               |    Bin 0 -> 656 bytes
 lib/pytz/zoneinfo/America/Porto_Velho              |    Bin 0 -> 588 bytes
 lib/pytz/zoneinfo/America/Puerto_Rico              |    Bin 0 -> 255 bytes
 lib/pytz/zoneinfo/America/Rainy_River              |    Bin 0 -> 2131 bytes
 lib/pytz/zoneinfo/America/Rankin_Inlet             |    Bin 0 -> 1930 bytes
 lib/pytz/zoneinfo/America/Recife                   |    Bin 0 -> 728 bytes
 lib/pytz/zoneinfo/America/Regina                   |    Bin 0 -> 994 bytes
 lib/pytz/zoneinfo/America/Resolute                 |    Bin 0 -> 1930 bytes
 lib/pytz/zoneinfo/America/Rio_Branco               |    Bin 0 -> 656 bytes
 lib/pytz/zoneinfo/America/Rosario                  |    Bin 0 -> 1129 bytes
 lib/pytz/zoneinfo/America/Santa_Isabel             |    Bin 0 -> 2356 bytes
 lib/pytz/zoneinfo/America/Santarem                 |    Bin 0 -> 626 bytes
 lib/pytz/zoneinfo/America/Santiago                 |    Bin 0 -> 2531 bytes
 lib/pytz/zoneinfo/America/Santo_Domingo            |    Bin 0 -> 489 bytes
 lib/pytz/zoneinfo/America/Sao_Paulo                |    Bin 0 -> 2015 bytes
 lib/pytz/zoneinfo/America/Scoresbysund             |    Bin 0 -> 1925 bytes
 lib/pytz/zoneinfo/America/Shiprock                 |    Bin 0 -> 2453 bytes
 lib/pytz/zoneinfo/America/Sitka                    |    Bin 0 -> 2350 bytes
 lib/pytz/zoneinfo/America/St_Barthelemy            |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/St_Johns                 |    Bin 0 -> 3664 bytes
 lib/pytz/zoneinfo/America/St_Kitts                 |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/St_Lucia                 |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/St_Thomas                |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/St_Vincent               |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Swift_Current            |    Bin 0 -> 574 bytes
 lib/pytz/zoneinfo/America/Tegucigalpa              |    Bin 0 -> 278 bytes
 lib/pytz/zoneinfo/America/Thule                    |    Bin 0 -> 1528 bytes
 lib/pytz/zoneinfo/America/Thunder_Bay              |    Bin 0 -> 2211 bytes
 lib/pytz/zoneinfo/America/Tijuana                  |    Bin 0 -> 2356 bytes
 lib/pytz/zoneinfo/America/Toronto                  |    Bin 0 -> 3503 bytes
 lib/pytz/zoneinfo/America/Tortola                  |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Vancouver                |    Bin 0 -> 2901 bytes
 lib/pytz/zoneinfo/America/Virgin                   |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/America/Whitehorse               |    Bin 0 -> 2093 bytes
 lib/pytz/zoneinfo/America/Winnipeg                 |    Bin 0 -> 2891 bytes
 lib/pytz/zoneinfo/America/Yakutat                  |    Bin 0 -> 2314 bytes
 lib/pytz/zoneinfo/America/Yellowknife              |    Bin 0 -> 1980 bytes
 lib/pytz/zoneinfo/Antarctica/Casey                 |    Bin 0 -> 272 bytes
 lib/pytz/zoneinfo/Antarctica/Davis                 |    Bin 0 -> 290 bytes
 lib/pytz/zoneinfo/Antarctica/DumontDUrville        |    Bin 0 -> 227 bytes
 lib/pytz/zoneinfo/Antarctica/Macquarie             |    Bin 0 -> 1530 bytes
 lib/pytz/zoneinfo/Antarctica/Mawson                |    Bin 0 -> 204 bytes
 lib/pytz/zoneinfo/Antarctica/McMurdo               |    Bin 0 -> 2460 bytes
 lib/pytz/zoneinfo/Antarctica/Palmer                |    Bin 0 -> 2054 bytes
 lib/pytz/zoneinfo/Antarctica/Rothera               |    Bin 0 -> 173 bytes
 lib/pytz/zoneinfo/Antarctica/South_Pole            |    Bin 0 -> 2460 bytes
 lib/pytz/zoneinfo/Antarctica/Syowa                 |    Bin 0 -> 174 bytes
 lib/pytz/zoneinfo/Antarctica/Troll                 |    Bin 0 -> 1161 bytes
 lib/pytz/zoneinfo/Antarctica/Vostok                |    Bin 0 -> 174 bytes
 lib/pytz/zoneinfo/Arctic/Longyearbyen              |    Bin 0 -> 2251 bytes
 lib/pytz/zoneinfo/Asia/Aden                        |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Almaty                      |    Bin 0 -> 936 bytes
 lib/pytz/zoneinfo/Asia/Amman                       |    Bin 0 -> 1877 bytes
 lib/pytz/zoneinfo/Asia/Anadyr                      |    Bin 0 -> 1197 bytes
 lib/pytz/zoneinfo/Asia/Aqtau                       |    Bin 0 -> 1142 bytes
 lib/pytz/zoneinfo/Asia/Aqtobe                      |    Bin 0 -> 1052 bytes
 lib/pytz/zoneinfo/Asia/Ashgabat                    |    Bin 0 -> 671 bytes
 lib/pytz/zoneinfo/Asia/Ashkhabad                   |    Bin 0 -> 671 bytes
 lib/pytz/zoneinfo/Asia/Baghdad                     |    Bin 0 -> 988 bytes
 lib/pytz/zoneinfo/Asia/Bahrain                     |    Bin 0 -> 209 bytes
 lib/pytz/zoneinfo/Asia/Baku                        |    Bin 0 -> 1956 bytes
 lib/pytz/zoneinfo/Asia/Bangkok                     |    Bin 0 -> 204 bytes
 lib/pytz/zoneinfo/Asia/Beirut                      |    Bin 0 -> 2175 bytes
 lib/pytz/zoneinfo/Asia/Bishkek                     |    Bin 0 -> 1061 bytes
 lib/pytz/zoneinfo/Asia/Brunei                      |    Bin 0 -> 201 bytes
 lib/pytz/zoneinfo/Asia/Calcutta                    |    Bin 0 -> 291 bytes
 lib/pytz/zoneinfo/Asia/Chita                       |    Bin 0 -> 1236 bytes
 lib/pytz/zoneinfo/Asia/Choibalsan                  |    Bin 0 -> 904 bytes
 lib/pytz/zoneinfo/Asia/Chongqing                   |    Bin 0 -> 414 bytes
 lib/pytz/zoneinfo/Asia/Chungking                   |    Bin 0 -> 414 bytes
 lib/pytz/zoneinfo/Asia/Colombo                     |    Bin 0 -> 389 bytes
 lib/pytz/zoneinfo/Asia/Dacca                       |    Bin 0 -> 390 bytes
 lib/pytz/zoneinfo/Asia/Damascus                    |    Bin 0 -> 2320 bytes
 lib/pytz/zoneinfo/Asia/Dhaka                       |    Bin 0 -> 390 bytes
 lib/pytz/zoneinfo/Asia/Dili                        |    Bin 0 -> 309 bytes
 lib/pytz/zoneinfo/Asia/Dubai                       |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Dushanbe                    |    Bin 0 -> 611 bytes
 lib/pytz/zoneinfo/Asia/Gaza                        |    Bin 0 -> 2313 bytes
 lib/pytz/zoneinfo/Asia/Harbin                      |    Bin 0 -> 414 bytes
 lib/pytz/zoneinfo/Asia/Hebron                      |    Bin 0 -> 2341 bytes
 lib/pytz/zoneinfo/Asia/Ho_Chi_Minh                 |    Bin 0 -> 373 bytes
 lib/pytz/zoneinfo/Asia/Hong_Kong                   |    Bin 0 -> 1189 bytes
 lib/pytz/zoneinfo/Asia/Hovd                        |    Bin 0 -> 848 bytes
 lib/pytz/zoneinfo/Asia/Irkutsk                     |    Bin 0 -> 1259 bytes
 lib/pytz/zoneinfo/Asia/Istanbul                    |    Bin 0 -> 2747 bytes
 lib/pytz/zoneinfo/Asia/Jakarta                     |    Bin 0 -> 370 bytes
 lib/pytz/zoneinfo/Asia/Jayapura                    |    Bin 0 -> 241 bytes
 lib/pytz/zoneinfo/Asia/Jerusalem                   |    Bin 0 -> 2265 bytes
 lib/pytz/zoneinfo/Asia/Kabul                       |    Bin 0 -> 199 bytes
 lib/pytz/zoneinfo/Asia/Kamchatka                   |    Bin 0 -> 1181 bytes
 lib/pytz/zoneinfo/Asia/Karachi                     |    Bin 0 -> 403 bytes
 lib/pytz/zoneinfo/Asia/Kashgar                     |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Kathmandu                   |    Bin 0 -> 212 bytes
 lib/pytz/zoneinfo/Asia/Katmandu                    |    Bin 0 -> 212 bytes
 lib/pytz/zoneinfo/Asia/Khandyga                    |    Bin 0 -> 1324 bytes
 lib/pytz/zoneinfo/Asia/Kolkata                     |    Bin 0 -> 291 bytes
 lib/pytz/zoneinfo/Asia/Krasnoyarsk                 |    Bin 0 -> 1226 bytes
 lib/pytz/zoneinfo/Asia/Kuala_Lumpur                |    Bin 0 -> 398 bytes
 lib/pytz/zoneinfo/Asia/Kuching                     |    Bin 0 -> 519 bytes
 lib/pytz/zoneinfo/Asia/Kuwait                      |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Macao                       |    Bin 0 -> 795 bytes
 lib/pytz/zoneinfo/Asia/Macau                       |    Bin 0 -> 795 bytes
 lib/pytz/zoneinfo/Asia/Magadan                     |    Bin 0 -> 1227 bytes
 lib/pytz/zoneinfo/Asia/Makassar                    |    Bin 0 -> 280 bytes
 lib/pytz/zoneinfo/Asia/Manila                      |    Bin 0 -> 361 bytes
 lib/pytz/zoneinfo/Asia/Muscat                      |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Nicosia                     |    Bin 0 -> 2016 bytes
 lib/pytz/zoneinfo/Asia/Novokuznetsk                |    Bin 0 -> 1248 bytes
 lib/pytz/zoneinfo/Asia/Novosibirsk                 |    Bin 0 -> 1208 bytes
 lib/pytz/zoneinfo/Asia/Omsk                        |    Bin 0 -> 1226 bytes
 lib/pytz/zoneinfo/Asia/Oral                        |    Bin 0 -> 1100 bytes
 lib/pytz/zoneinfo/Asia/Phnom_Penh                  |    Bin 0 -> 204 bytes
 lib/pytz/zoneinfo/Asia/Pontianak                   |    Bin 0 -> 375 bytes
 lib/pytz/zoneinfo/Asia/Pyongyang                   |    Bin 0 -> 279 bytes
 lib/pytz/zoneinfo/Asia/Qatar                       |    Bin 0 -> 209 bytes
 lib/pytz/zoneinfo/Asia/Qyzylorda                   |    Bin 0 -> 1082 bytes
 lib/pytz/zoneinfo/Asia/Rangoon                     |    Bin 0 -> 285 bytes
 lib/pytz/zoneinfo/Asia/Riyadh                      |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Saigon                      |    Bin 0 -> 373 bytes
 lib/pytz/zoneinfo/Asia/Sakhalin                    |    Bin 0 -> 1227 bytes
 lib/pytz/zoneinfo/Asia/Samarkand                   |    Bin 0 -> 691 bytes
 lib/pytz/zoneinfo/Asia/Seoul                       |    Bin 0 -> 571 bytes
 lib/pytz/zoneinfo/Asia/Shanghai                    |    Bin 0 -> 414 bytes
 lib/pytz/zoneinfo/Asia/Singapore                   |    Bin 0 -> 428 bytes
 lib/pytz/zoneinfo/Asia/Srednekolymsk               |    Bin 0 -> 1237 bytes
 lib/pytz/zoneinfo/Asia/Taipei                      |    Bin 0 -> 800 bytes
 lib/pytz/zoneinfo/Asia/Tashkent                    |    Bin 0 -> 681 bytes
 lib/pytz/zoneinfo/Asia/Tbilisi                     |    Bin 0 -> 1142 bytes
 lib/pytz/zoneinfo/Asia/Tehran                      |    Bin 0 -> 1661 bytes
 lib/pytz/zoneinfo/Asia/Tel_Aviv                    |    Bin 0 -> 2265 bytes
 lib/pytz/zoneinfo/Asia/Thimbu                      |    Bin 0 -> 209 bytes
 lib/pytz/zoneinfo/Asia/Thimphu                     |    Bin 0 -> 209 bytes
 lib/pytz/zoneinfo/Asia/Tokyo                       |    Bin 0 -> 355 bytes
 lib/pytz/zoneinfo/Asia/Ujung_Pandang               |    Bin 0 -> 280 bytes
 lib/pytz/zoneinfo/Asia/Ulaanbaatar                 |    Bin 0 -> 848 bytes
 lib/pytz/zoneinfo/Asia/Ulan_Bator                  |    Bin 0 -> 848 bytes
 lib/pytz/zoneinfo/Asia/Urumqi                      |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Asia/Ust-Nera                    |    Bin 0 -> 1293 bytes
 lib/pytz/zoneinfo/Asia/Vientiane                   |    Bin 0 -> 204 bytes
 lib/pytz/zoneinfo/Asia/Vladivostok                 |    Bin 0 -> 1227 bytes
 lib/pytz/zoneinfo/Asia/Yakutsk                     |    Bin 0 -> 1226 bytes
 lib/pytz/zoneinfo/Asia/Yekaterinburg               |    Bin 0 -> 1334 bytes
 lib/pytz/zoneinfo/Asia/Yerevan                     |    Bin 0 -> 1277 bytes
 lib/pytz/zoneinfo/Atlantic/Azores                  |    Bin 0 -> 3488 bytes
 lib/pytz/zoneinfo/Atlantic/Bermuda                 |    Bin 0 -> 2004 bytes
 lib/pytz/zoneinfo/Atlantic/Canary                  |    Bin 0 -> 1913 bytes
 lib/pytz/zoneinfo/Atlantic/Cape_Verde              |    Bin 0 -> 254 bytes
 lib/pytz/zoneinfo/Atlantic/Faeroe                  |    Bin 0 -> 1829 bytes
 lib/pytz/zoneinfo/Atlantic/Faroe                   |    Bin 0 -> 1829 bytes
 lib/pytz/zoneinfo/Atlantic/Jan_Mayen               |    Bin 0 -> 2251 bytes
 lib/pytz/zoneinfo/Atlantic/Madeira                 |    Bin 0 -> 3478 bytes
 lib/pytz/zoneinfo/Atlantic/Reykjavik               |    Bin 0 -> 1167 bytes
 lib/pytz/zoneinfo/Atlantic/South_Georgia           |    Bin 0 -> 148 bytes
 lib/pytz/zoneinfo/Atlantic/St_Helena               |    Bin 0 -> 170 bytes
 lib/pytz/zoneinfo/Atlantic/Stanley                 |    Bin 0 -> 1246 bytes
 lib/pytz/zoneinfo/Australia/ACT                    |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/Adelaide               |    Bin 0 -> 2238 bytes
 lib/pytz/zoneinfo/Australia/Brisbane               |    Bin 0 -> 452 bytes
 lib/pytz/zoneinfo/Australia/Broken_Hill            |    Bin 0 -> 2274 bytes
 lib/pytz/zoneinfo/Australia/Canberra               |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/Currie                 |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/Darwin                 |    Bin 0 -> 323 bytes
 lib/pytz/zoneinfo/Australia/Eucla                  |    Bin 0 -> 487 bytes
 lib/pytz/zoneinfo/Australia/Hobart                 |    Bin 0 -> 2335 bytes
 lib/pytz/zoneinfo/Australia/LHI                    |    Bin 0 -> 1859 bytes
 lib/pytz/zoneinfo/Australia/Lindeman               |    Bin 0 -> 522 bytes
 lib/pytz/zoneinfo/Australia/Lord_Howe              |    Bin 0 -> 1859 bytes
 lib/pytz/zoneinfo/Australia/Melbourne              |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/NSW                    |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/North                  |    Bin 0 -> 323 bytes
 lib/pytz/zoneinfo/Australia/Perth                  |    Bin 0 -> 479 bytes
 lib/pytz/zoneinfo/Australia/Queensland             |    Bin 0 -> 452 bytes
 lib/pytz/zoneinfo/Australia/South                  |    Bin 0 -> 2238 bytes
 lib/pytz/zoneinfo/Australia/Sydney                 |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/Tasmania               |    Bin 0 -> 2335 bytes
 lib/pytz/zoneinfo/Australia/Victoria               |    Bin 0 -> 2223 bytes
 lib/pytz/zoneinfo/Australia/West                   |    Bin 0 -> 479 bytes
 lib/pytz/zoneinfo/Australia/Yancowinna             |    Bin 0 -> 2274 bytes
 lib/pytz/zoneinfo/Brazil/Acre                      |    Bin 0 -> 656 bytes
 lib/pytz/zoneinfo/Brazil/DeNoronha                 |    Bin 0 -> 728 bytes
 lib/pytz/zoneinfo/Brazil/East                      |    Bin 0 -> 2015 bytes
 lib/pytz/zoneinfo/Brazil/West                      |    Bin 0 -> 616 bytes
 lib/pytz/zoneinfo/CET                              |    Bin 0 -> 2102 bytes
 lib/pytz/zoneinfo/CST6CDT                          |    Bin 0 -> 2294 bytes
 lib/pytz/zoneinfo/Canada/Atlantic                  |    Bin 0 -> 3438 bytes
 lib/pytz/zoneinfo/Canada/Central                   |    Bin 0 -> 2891 bytes
 lib/pytz/zoneinfo/Canada/East-Saskatchewan         |    Bin 0 -> 994 bytes
 lib/pytz/zoneinfo/Canada/Eastern                   |    Bin 0 -> 3503 bytes
 lib/pytz/zoneinfo/Canada/Mountain                  |    Bin 0 -> 2402 bytes
 lib/pytz/zoneinfo/Canada/Newfoundland              |    Bin 0 -> 3664 bytes
 lib/pytz/zoneinfo/Canada/Pacific                   |    Bin 0 -> 2901 bytes
 lib/pytz/zoneinfo/Canada/Saskatchewan              |    Bin 0 -> 994 bytes
 lib/pytz/zoneinfo/Canada/Yukon                     |    Bin 0 -> 2093 bytes
 lib/pytz/zoneinfo/Chile/Continental                |    Bin 0 -> 2531 bytes
 lib/pytz/zoneinfo/Chile/EasterIsland               |    Bin 0 -> 2295 bytes
 lib/pytz/zoneinfo/Cuba                             |    Bin 0 -> 2437 bytes
 lib/pytz/zoneinfo/EET                              |    Bin 0 -> 1876 bytes
 lib/pytz/zoneinfo/EST                              |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/EST5EDT                          |    Bin 0 -> 2294 bytes
 lib/pytz/zoneinfo/Egypt                            |    Bin 0 -> 2779 bytes
 lib/pytz/zoneinfo/Eire                             |    Bin 0 -> 3559 bytes
 lib/pytz/zoneinfo/Etc/GMT                          |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/GMT+0                        |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/GMT+1                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+10                       |    Bin 0 -> 139 bytes
 lib/pytz/zoneinfo/Etc/GMT+11                       |    Bin 0 -> 139 bytes
 lib/pytz/zoneinfo/Etc/GMT+12                       |    Bin 0 -> 139 bytes
 lib/pytz/zoneinfo/Etc/GMT+2                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+3                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+4                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+5                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+6                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+7                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+8                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT+9                        |    Bin 0 -> 135 bytes
 lib/pytz/zoneinfo/Etc/GMT-0                        |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/GMT-1                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-10                       |    Bin 0 -> 140 bytes
 lib/pytz/zoneinfo/Etc/GMT-11                       |    Bin 0 -> 140 bytes
 lib/pytz/zoneinfo/Etc/GMT-12                       |    Bin 0 -> 140 bytes
 lib/pytz/zoneinfo/Etc/GMT-13                       |    Bin 0 -> 140 bytes
 lib/pytz/zoneinfo/Etc/GMT-14                       |    Bin 0 -> 140 bytes
 lib/pytz/zoneinfo/Etc/GMT-2                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-3                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-4                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-5                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-6                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-7                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-8                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT-9                        |    Bin 0 -> 136 bytes
 lib/pytz/zoneinfo/Etc/GMT0                         |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/Greenwich                    |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/UCT                          |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/UTC                          |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/Universal                    |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Etc/Zulu                         |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Europe/Amsterdam                 |    Bin 0 -> 2943 bytes
 lib/pytz/zoneinfo/Europe/Andorra                   |    Bin 0 -> 1751 bytes
 lib/pytz/zoneinfo/Europe/Athens                    |    Bin 0 -> 2271 bytes
 lib/pytz/zoneinfo/Europe/Belfast                   |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/Europe/Belgrade                  |    Bin 0 -> 1957 bytes
 lib/pytz/zoneinfo/Europe/Berlin                    |    Bin 0 -> 2335 bytes
 lib/pytz/zoneinfo/Europe/Bratislava                |    Bin 0 -> 2272 bytes
 lib/pytz/zoneinfo/Europe/Brussels                  |    Bin 0 -> 2970 bytes
 lib/pytz/zoneinfo/Europe/Bucharest                 |    Bin 0 -> 2221 bytes
 lib/pytz/zoneinfo/Europe/Budapest                  |    Bin 0 -> 2405 bytes
 lib/pytz/zoneinfo/Europe/Busingen                  |    Bin 0 -> 1918 bytes
 lib/pytz/zoneinfo/Europe/Chisinau                  |    Bin 0 -> 2433 bytes
 lib/pytz/zoneinfo/Europe/Copenhagen                |    Bin 0 -> 2160 bytes
 lib/pytz/zoneinfo/Europe/Dublin                    |    Bin 0 -> 3559 bytes
 lib/pytz/zoneinfo/Europe/Gibraltar                 |    Bin 0 -> 3061 bytes
 lib/pytz/zoneinfo/Europe/Guernsey                  |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/Europe/Helsinki                  |    Bin 0 -> 1909 bytes
 lib/pytz/zoneinfo/Europe/Isle_of_Man               |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/Europe/Istanbul                  |    Bin 0 -> 2747 bytes
 lib/pytz/zoneinfo/Europe/Jersey                    |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/Europe/Kaliningrad               |    Bin 0 -> 1550 bytes
 lib/pytz/zoneinfo/Europe/Kiev                      |    Bin 0 -> 2097 bytes
 lib/pytz/zoneinfo/Europe/Lisbon                    |    Bin 0 -> 3453 bytes
 lib/pytz/zoneinfo/Europe/Ljubljana                 |    Bin 0 -> 1957 bytes
 lib/pytz/zoneinfo/Europe/London                    |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/Europe/Luxembourg                |    Bin 0 -> 2974 bytes
 lib/pytz/zoneinfo/Europe/Madrid                    |    Bin 0 -> 2619 bytes
 lib/pytz/zoneinfo/Europe/Malta                     |    Bin 0 -> 2629 bytes
 lib/pytz/zoneinfo/Europe/Mariehamn                 |    Bin 0 -> 1909 bytes
 lib/pytz/zoneinfo/Europe/Minsk                     |    Bin 0 -> 1368 bytes
 lib/pytz/zoneinfo/Europe/Monaco                    |    Bin 0 -> 2953 bytes
 lib/pytz/zoneinfo/Europe/Moscow                    |    Bin 0 -> 1528 bytes
 lib/pytz/zoneinfo/Europe/Nicosia                   |    Bin 0 -> 2016 bytes
 lib/pytz/zoneinfo/Europe/Oslo                      |    Bin 0 -> 2251 bytes
 lib/pytz/zoneinfo/Europe/Paris                     |    Bin 0 -> 2971 bytes
 lib/pytz/zoneinfo/Europe/Podgorica                 |    Bin 0 -> 1957 bytes
 lib/pytz/zoneinfo/Europe/Prague                    |    Bin 0 -> 2272 bytes
 lib/pytz/zoneinfo/Europe/Riga                      |    Bin 0 -> 2235 bytes
 lib/pytz/zoneinfo/Europe/Rome                      |    Bin 0 -> 2678 bytes
 lib/pytz/zoneinfo/Europe/Samara                    |    Bin 0 -> 1394 bytes
 lib/pytz/zoneinfo/Europe/San_Marino                |    Bin 0 -> 2678 bytes
 lib/pytz/zoneinfo/Europe/Sarajevo                  |    Bin 0 -> 1957 bytes
 lib/pytz/zoneinfo/Europe/Simferopol                |    Bin 0 -> 1504 bytes
 lib/pytz/zoneinfo/Europe/Skopje                    |    Bin 0 -> 1957 bytes
 lib/pytz/zoneinfo/Europe/Sofia                     |    Bin 0 -> 2130 bytes
 lib/pytz/zoneinfo/Europe/Stockholm                 |    Bin 0 -> 1918 bytes
 lib/pytz/zoneinfo/Europe/Tallinn                   |    Bin 0 -> 2201 bytes
 lib/pytz/zoneinfo/Europe/Tirane                    |    Bin 0 -> 2098 bytes
 lib/pytz/zoneinfo/Europe/Tiraspol                  |    Bin 0 -> 2433 bytes
 lib/pytz/zoneinfo/Europe/Uzhgorod                  |    Bin 0 -> 2103 bytes
 lib/pytz/zoneinfo/Europe/Vaduz                     |    Bin 0 -> 1918 bytes
 lib/pytz/zoneinfo/Europe/Vatican                   |    Bin 0 -> 2678 bytes
 lib/pytz/zoneinfo/Europe/Vienna                    |    Bin 0 -> 2237 bytes
 lib/pytz/zoneinfo/Europe/Vilnius                   |    Bin 0 -> 2199 bytes
 lib/pytz/zoneinfo/Europe/Volgograd                 |    Bin 0 -> 1317 bytes
 lib/pytz/zoneinfo/Europe/Warsaw                    |    Bin 0 -> 2705 bytes
 lib/pytz/zoneinfo/Europe/Zagreb                    |    Bin 0 -> 1957 bytes
 lib/pytz/zoneinfo/Europe/Zaporozhye                |    Bin 0 -> 2111 bytes
 lib/pytz/zoneinfo/Europe/Zurich                    |    Bin 0 -> 1918 bytes
 lib/pytz/zoneinfo/Factory                          |    Bin 0 -> 264 bytes
 lib/pytz/zoneinfo/GB                               |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/GB-Eire                          |    Bin 0 -> 3687 bytes
 lib/pytz/zoneinfo/GMT                              |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/GMT+0                            |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/GMT-0                            |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/GMT0                             |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Greenwich                        |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/HST                              |    Bin 0 -> 128 bytes
 lib/pytz/zoneinfo/Hongkong                         |    Bin 0 -> 1189 bytes
 lib/pytz/zoneinfo/Iceland                          |    Bin 0 -> 1167 bytes
 lib/pytz/zoneinfo/Indian/Antananarivo              |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Indian/Chagos                    |    Bin 0 -> 201 bytes
 lib/pytz/zoneinfo/Indian/Christmas                 |    Bin 0 -> 149 bytes
 lib/pytz/zoneinfo/Indian/Cocos                     |    Bin 0 -> 152 bytes
 lib/pytz/zoneinfo/Indian/Comoro                    |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Indian/Kerguelen                 |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Indian/Mahe                      |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Indian/Maldives                  |    Bin 0 -> 204 bytes
 lib/pytz/zoneinfo/Indian/Mauritius                 |    Bin 0 -> 253 bytes
 lib/pytz/zoneinfo/Indian/Mayotte                   |    Bin 0 -> 283 bytes
 lib/pytz/zoneinfo/Indian/Reunion                   |    Bin 0 -> 171 bytes
 lib/pytz/zoneinfo/Iran                             |    Bin 0 -> 1661 bytes
 lib/pytz/zoneinfo/Israel                           |    Bin 0 -> 2265 bytes
 lib/pytz/zoneinfo/Jamaica                          |    Bin 0 -> 507 bytes
 lib/pytz/zoneinfo/Japan                            |    Bin 0 -> 355 bytes
 lib/pytz/zoneinfo/Kwajalein                        |    Bin 0 -> 237 bytes
 lib/pytz/zoneinfo/Libya                            |    Bin 0 -> 655 bytes
 lib/pytz/zoneinfo/MET                              |    Bin 0 -> 2102 bytes
 lib/pytz/zoneinfo/MST                              |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/MST7MDT                          |    Bin 0 -> 2294 bytes
 lib/pytz/zoneinfo/Mexico/BajaNorte                 |    Bin 0 -> 2356 bytes
 lib/pytz/zoneinfo/Mexico/BajaSur                   |    Bin 0 -> 1564 bytes
 lib/pytz/zoneinfo/Mexico/General                   |    Bin 0 -> 1618 bytes
 lib/pytz/zoneinfo/NZ                               |    Bin 0 -> 2460 bytes
 lib/pytz/zoneinfo/NZ-CHAT                          |    Bin 0 -> 2057 bytes
 lib/pytz/zoneinfo/Navajo                           |    Bin 0 -> 2453 bytes
 lib/pytz/zoneinfo/PRC                              |    Bin 0 -> 414 bytes
 lib/pytz/zoneinfo/PST8PDT                          |    Bin 0 -> 2294 bytes
 lib/pytz/zoneinfo/Pacific/Apia                     |    Bin 0 -> 1102 bytes
 lib/pytz/zoneinfo/Pacific/Auckland                 |    Bin 0 -> 2460 bytes
 lib/pytz/zoneinfo/Pacific/Bougainville             |    Bin 0 -> 280 bytes
 lib/pytz/zoneinfo/Pacific/Chatham                  |    Bin 0 -> 2057 bytes
 lib/pytz/zoneinfo/Pacific/Chuuk                    |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Pacific/Easter                   |    Bin 0 -> 2295 bytes
 lib/pytz/zoneinfo/Pacific/Efate                    |    Bin 0 -> 478 bytes
 lib/pytz/zoneinfo/Pacific/Enderbury                |    Bin 0 -> 230 bytes
 lib/pytz/zoneinfo/Pacific/Fakaofo                  |    Bin 0 -> 197 bytes
 lib/pytz/zoneinfo/Pacific/Fiji                     |    Bin 0 -> 1074 bytes
 lib/pytz/zoneinfo/Pacific/Funafuti                 |    Bin 0 -> 150 bytes
 lib/pytz/zoneinfo/Pacific/Galapagos                |    Bin 0 -> 211 bytes
 lib/pytz/zoneinfo/Pacific/Gambier                  |    Bin 0 -> 173 bytes
 lib/pytz/zoneinfo/Pacific/Guadalcanal              |    Bin 0 -> 172 bytes
 lib/pytz/zoneinfo/Pacific/Guam                     |    Bin 0 -> 225 bytes
 lib/pytz/zoneinfo/Pacific/Honolulu                 |    Bin 0 -> 276 bytes
 lib/pytz/zoneinfo/Pacific/Johnston                 |    Bin 0 -> 276 bytes
 lib/pytz/zoneinfo/Pacific/Kiritimati               |    Bin 0 -> 230 bytes
 lib/pytz/zoneinfo/Pacific/Kosrae                   |    Bin 0 -> 230 bytes
 lib/pytz/zoneinfo/Pacific/Kwajalein                |    Bin 0 -> 237 bytes
 lib/pytz/zoneinfo/Pacific/Majuro                   |    Bin 0 -> 197 bytes
 lib/pytz/zoneinfo/Pacific/Marquesas                |    Bin 0 -> 176 bytes
 lib/pytz/zoneinfo/Pacific/Midway                   |    Bin 0 -> 294 bytes
 lib/pytz/zoneinfo/Pacific/Nauru                    |    Bin 0 -> 254 bytes
 lib/pytz/zoneinfo/Pacific/Niue                     |    Bin 0 -> 226 bytes
 lib/pytz/zoneinfo/Pacific/Norfolk                  |    Bin 0 -> 208 bytes
 lib/pytz/zoneinfo/Pacific/Noumea                   |    Bin 0 -> 314 bytes
 lib/pytz/zoneinfo/Pacific/Pago_Pago                |    Bin 0 -> 272 bytes
 lib/pytz/zoneinfo/Pacific/Palau                    |    Bin 0 -> 149 bytes
 lib/pytz/zoneinfo/Pacific/Pitcairn                 |    Bin 0 -> 203 bytes
 lib/pytz/zoneinfo/Pacific/Pohnpei                  |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Pacific/Ponape                   |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Pacific/Port_Moresby             |    Bin 0 -> 172 bytes
 lib/pytz/zoneinfo/Pacific/Rarotonga                |    Bin 0 -> 574 bytes
 lib/pytz/zoneinfo/Pacific/Saipan                   |    Bin 0 -> 255 bytes
 lib/pytz/zoneinfo/Pacific/Samoa                    |    Bin 0 -> 272 bytes
 lib/pytz/zoneinfo/Pacific/Tahiti                   |    Bin 0 -> 174 bytes
 lib/pytz/zoneinfo/Pacific/Tarawa                   |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Pacific/Tongatapu                |    Bin 0 -> 339 bytes
 lib/pytz/zoneinfo/Pacific/Truk                     |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Pacific/Wake                     |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Pacific/Wallis                   |    Bin 0 -> 150 bytes
 lib/pytz/zoneinfo/Pacific/Yap                      |    Bin 0 -> 153 bytes
 lib/pytz/zoneinfo/Poland                           |    Bin 0 -> 2705 bytes
 lib/pytz/zoneinfo/Portugal                         |    Bin 0 -> 3453 bytes
 lib/pytz/zoneinfo/ROC                              |    Bin 0 -> 800 bytes
 lib/pytz/zoneinfo/ROK                              |    Bin 0 -> 571 bytes
 lib/pytz/zoneinfo/Singapore                        |    Bin 0 -> 428 bytes
 lib/pytz/zoneinfo/Turkey                           |    Bin 0 -> 2747 bytes
 lib/pytz/zoneinfo/UCT                              |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/US/Alaska                        |    Bin 0 -> 2384 bytes
 lib/pytz/zoneinfo/US/Aleutian                      |    Bin 0 -> 2379 bytes
 lib/pytz/zoneinfo/US/Arizona                       |    Bin 0 -> 353 bytes
 lib/pytz/zoneinfo/US/Central                       |    Bin 0 -> 3585 bytes
 lib/pytz/zoneinfo/US/East-Indiana                  |    Bin 0 -> 1675 bytes
 lib/pytz/zoneinfo/US/Eastern                       |    Bin 0 -> 3545 bytes
 lib/pytz/zoneinfo/US/Hawaii                        |    Bin 0 -> 276 bytes
 lib/pytz/zoneinfo/US/Indiana-Starke                |    Bin 0 -> 2437 bytes
 lib/pytz/zoneinfo/US/Michigan                      |    Bin 0 -> 2216 bytes
 lib/pytz/zoneinfo/US/Mountain                      |    Bin 0 -> 2453 bytes
 lib/pytz/zoneinfo/US/Pacific                       |    Bin 0 -> 2845 bytes
 lib/pytz/zoneinfo/US/Pacific-New                   |    Bin 0 -> 2845 bytes
 lib/pytz/zoneinfo/US/Samoa                         |    Bin 0 -> 272 bytes
 lib/pytz/zoneinfo/UTC                              |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/Universal                        |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/W-SU                             |    Bin 0 -> 1528 bytes
 lib/pytz/zoneinfo/WET                              |    Bin 0 -> 1873 bytes
 lib/pytz/zoneinfo/Zulu                             |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/iso3166.tab                      |    275 +
 lib/pytz/zoneinfo/localtime                        |    Bin 0 -> 127 bytes
 lib/pytz/zoneinfo/posixrules                       |    Bin 0 -> 3545 bytes
 lib/pytz/zoneinfo/zone.tab                         |    440 +
 lib/pytz/zoneinfo/zone1970.tab                     |    371 +
 lib/requests/__init__.py                           |     37 +-
 lib/requests/__init__.pyc                          |    Bin 1798 -> 2428 bytes
 lib/requests/_oauth.py                             |     23 -
 lib/requests/_oauth.pyc                            |    Bin 845 -> 0 bytes
 lib/requests/adapters.py                           |    437 +
 lib/requests/adapters.pyc                          |    Bin 0 -> 15150 bytes
 lib/requests/api.py                                |     57 +-
 lib/requests/api.pyc                               |    Bin 5714 -> 5429 bytes
 lib/requests/auth.py                               |    327 +-
 lib/requests/auth.pyc                              |    Bin 13930 -> 7019 bytes
 lib/requests/cacert.pem                            |   8260 +-
 lib/requests/certs.py                              |     28 +-
 lib/requests/certs.pyc                             |    Bin 730 -> 813 bytes
 lib/requests/compat.py                             |     16 +-
 lib/requests/compat.pyc                            |    Bin 2509 -> 2477 bytes
 lib/requests/cookies.py                            |    234 +-
 lib/requests/cookies.pyc                           |    Bin 17695 -> 18798 bytes
 lib/requests/defaults.py                           |     50 -
 lib/requests/defaults.pyc                          |    Bin 1894 -> 0 bytes
 lib/requests/exceptions.py                         |     54 +-
 lib/requests/exceptions.pyc                        |    Bin 2900 -> 4733 bytes
 lib/requests/hooks.py                              |     27 +-
 lib/requests/hooks.pyc                             |    Bin 1264 -> 968 bytes
 lib/requests/models.py                             |   1136 +-
 lib/requests/models.pyc                            |    Bin 21744 -> 23438 bytes
 lib/requests/packages/README.rst                   |      8 +
 lib/requests/packages/__init__.py                  |     94 +-
 lib/requests/packages/__init__.pyc                 |    Bin 280 -> 2747 bytes
 lib/requests/packages/chardet/__init__.py          |     14 +-
 lib/requests/packages/chardet/__init__.pyc         |    Bin 563 -> 775 bytes
 lib/requests/packages/chardet/big5freq.py          |     20 +-
 lib/requests/packages/chardet/big5prober.py        |     17 +-
 lib/requests/packages/chardet/chardetect.py        |     80 +
 lib/requests/packages/chardet/chardistribution.py  |    159 +-
 .../packages/chardet/charsetgroupprober.py         |     36 +-
 lib/requests/packages/chardet/charsetprober.py     |     24 +-
 .../packages/chardet/codingstatemachine.py         |     15 +-
 lib/requests/packages/chardet/compat.py            |     34 +
 lib/requests/packages/chardet/constants.py         |      8 -
 lib/requests/packages/chardet/cp949prober.py       |     44 +
 lib/requests/packages/chardet/escprober.py         |     39 +-
 lib/requests/packages/chardet/escsm.py             |    338 +-
 lib/requests/packages/chardet/eucjpprober.py       |     45 +-
 lib/requests/packages/chardet/euckrfreq.py         |      2 +
 lib/requests/packages/chardet/euckrprober.py       |     13 +-
 lib/requests/packages/chardet/euctwfreq.py         |     16 +-
 lib/requests/packages/chardet/euctwprober.py       |      8 +-
 lib/requests/packages/chardet/gb2312freq.py        |      9 +-
 lib/requests/packages/chardet/gb2312prober.py      |      8 +-
 lib/requests/packages/chardet/hebrewprober.py      |    184 +-
 lib/requests/packages/chardet/jisfreq.py           |     16 +-
 lib/requests/packages/chardet/jpcntx.py            |     97 +-
 .../packages/chardet/langbulgarianmodel.py         |     29 +-
 lib/requests/packages/chardet/langcyrillicmodel.py |     50 +-
 lib/requests/packages/chardet/langgreekmodel.py    |     26 +-
 lib/requests/packages/chardet/langhebrewmodel.py   |     20 +-
 .../packages/chardet/langhungarianmodel.py         |     26 +-
 lib/requests/packages/chardet/langthaimodel.py     |     22 +-
 lib/requests/packages/chardet/latin1prober.py      |    143 +-
 lib/requests/packages/chardet/mbcharsetprober.py   |     36 +-
 lib/requests/packages/chardet/mbcsgroupprober.py   |     28 +-
 lib/requests/packages/chardet/mbcssm.py            |    832 +-
 lib/requests/packages/chardet/sbcharsetprober.py   |     52 +-
 lib/requests/packages/chardet/sbcsgroupprober.py   |     39 +-
 lib/requests/packages/chardet/sjisprober.py        |     50 +-
 lib/requests/packages/chardet/universaldetector.py |     96 +-
 lib/requests/packages/chardet/utf8prober.py        |     20 +-
 lib/requests/packages/chardet2/__init__.py         |     26 -
 lib/requests/packages/chardet2/big5freq.py         |    923 -
 lib/requests/packages/chardet2/big5prober.py       |     41 -
 lib/requests/packages/chardet2/chardistribution.py |    200 -
 .../packages/chardet2/charsetgroupprober.py        |     97 -
 lib/requests/packages/chardet2/charsetprober.py    |     61 -
 .../packages/chardet2/codingstatemachine.py        |     57 -
 lib/requests/packages/chardet2/constants.py        |     39 -
 lib/requests/packages/chardet2/escprober.py        |     81 -
 lib/requests/packages/chardet2/escsm.py            |    240 -
 lib/requests/packages/chardet2/eucjpprober.py      |     87 -
 lib/requests/packages/chardet2/euckrfreq.py        |    594 -
 lib/requests/packages/chardet2/euckrprober.py      |     41 -
 lib/requests/packages/chardet2/euctwfreq.py        |    426 -
 lib/requests/packages/chardet2/euctwprober.py      |     41 -
 lib/requests/packages/chardet2/gb2312freq.py       |    471 -
 lib/requests/packages/chardet2/gb2312prober.py     |     41 -
 lib/requests/packages/chardet2/hebrewprober.py     |    269 -
 lib/requests/packages/chardet2/jisfreq.py          |    567 -
 lib/requests/packages/chardet2/jpcntx.py           |    210 -
 .../packages/chardet2/langbulgarianmodel.py        |    228 -
 .../packages/chardet2/langcyrillicmodel.py         |    329 -
 lib/requests/packages/chardet2/langgreekmodel.py   |    225 -
 lib/requests/packages/chardet2/langhebrewmodel.py  |    201 -
 .../packages/chardet2/langhungarianmodel.py        |    225 -
 lib/requests/packages/chardet2/langthaimodel.py    |    200 -
 lib/requests/packages/chardet2/latin1prober.py     |    135 -
 lib/requests/packages/chardet2/mbcharsetprober.py  |     83 -
 lib/requests/packages/chardet2/mbcsgroupprober.py  |     50 -
 lib/requests/packages/chardet2/mbcssm.py           |    514 -
 lib/requests/packages/chardet2/sbcharsetprober.py  |    107 -
 lib/requests/packages/chardet2/sbcsgroupprober.py  |     65 -
 lib/requests/packages/chardet2/sjisprober.py       |     86 -
 lib/requests/packages/chardet2/test.py             |     21 -
 .../packages/chardet2/universaldetector.py         |    155 -
 lib/requests/packages/chardet2/utf8prober.py       |     77 -
 lib/requests/packages/oauthlib/__init__.py         |      0
 lib/requests/packages/oauthlib/common.py           |    229 -
 lib/requests/packages/oauthlib/oauth1/__init__.py  |     13 -
 .../packages/oauthlib/oauth1/rfc5849/__init__.py   |    889 -
 .../packages/oauthlib/oauth1/rfc5849/parameters.py |    134 -
 .../packages/oauthlib/oauth1/rfc5849/signature.py  |    551 -
 .../packages/oauthlib/oauth1/rfc5849/utils.py      |     99 -
 lib/requests/packages/oauthlib/oauth2/__init__.py  |     13 -
 .../packages/oauthlib/oauth2/draft25/__init__.py   |    497 -
 .../packages/oauthlib/oauth2/draft25/parameters.py |    256 -
 .../packages/oauthlib/oauth2/draft25/tokens.py     |    132 -
 .../packages/oauthlib/oauth2/draft25/utils.py      |     39 -
 lib/requests/packages/urllib3/__init__.py          |     24 +-
 lib/requests/packages/urllib3/__init__.pyc         |    Bin 2181 -> 2531 bytes
 lib/requests/packages/urllib3/_collections.py      |    140 +-
 lib/requests/packages/urllib3/_collections.pyc     |    Bin 3676 -> 8954 bytes
 lib/requests/packages/urllib3/connection.py        |    262 +
 lib/requests/packages/urllib3/connection.pyc       |    Bin 0 -> 7823 bytes
 lib/requests/packages/urllib3/connectionpool.py    |    556 +-
 lib/requests/packages/urllib3/connectionpool.pyc   |    Bin 17704 -> 24017 bytes
 lib/requests/packages/urllib3/contrib/__init__.py  |      0
 lib/requests/packages/urllib3/contrib/__init__.pyc |    Bin 0 -> 136 bytes
 lib/requests/packages/urllib3/contrib/ntlmpool.py  |      8 +-
 lib/requests/packages/urllib3/contrib/pyopenssl.py |    308 +
 .../packages/urllib3/contrib/pyopenssl.pyc         |    Bin 0 -> 10199 bytes
 lib/requests/packages/urllib3/exceptions.py        |    122 +-
 lib/requests/packages/urllib3/exceptions.pyc       |    Bin 4344 -> 7793 bytes
 lib/requests/packages/urllib3/fields.py            |    177 +
 lib/requests/packages/urllib3/fields.pyc           |    Bin 0 -> 6434 bytes
 lib/requests/packages/urllib3/filepost.py          |     60 +-
 lib/requests/packages/urllib3/filepost.pyc         |    Bin 3492 -> 3102 bytes
 lib/requests/packages/urllib3/packages/__init__.py |      0
 .../packages/urllib3/packages/__init__.pyc         |    Bin 308 -> 264 bytes
 .../packages/urllib3/packages/ordered_dict.py      |      1 -
 .../packages/urllib3/packages/ordered_dict.pyc     |    Bin 10840 -> 9652 bytes
 lib/requests/packages/urllib3/packages/six.py      |     53 +-
 lib/requests/packages/urllib3/packages/six.pyc     |    Bin 14117 -> 13156 bytes
 .../packages/ssl_match_hostname/__init__.py        |     74 +-
 .../packages/ssl_match_hostname/__init__.pyc       |    Bin 2467 -> 499 bytes
 .../packages/ssl_match_hostname/_implementation.py |    105 +
 lib/requests/packages/urllib3/poolmanager.py       |    199 +-
 lib/requests/packages/urllib3/poolmanager.pyc      |    Bin 6382 -> 9205 bytes
 lib/requests/packages/urllib3/request.py           |     83 +-
 lib/requests/packages/urllib3/request.pyc          |    Bin 5510 -> 5834 bytes
 lib/requests/packages/urllib3/response.py          |    245 +-
 lib/requests/packages/urllib3/response.pyc         |    Bin 7113 -> 10989 bytes
 lib/requests/packages/urllib3/util.py              |    252 -
 lib/requests/packages/urllib3/util.pyc             |    Bin 7091 -> 0 bytes
 lib/requests/packages/urllib3/util/__init__.py     |     24 +
 lib/requests/packages/urllib3/util/__init__.pyc    |    Bin 0 -> 776 bytes
 lib/requests/packages/urllib3/util/connection.py   |     97 +
 lib/requests/packages/urllib3/util/connection.pyc  |    Bin 0 -> 2889 bytes
 lib/requests/packages/urllib3/util/request.py      |     71 +
 lib/requests/packages/urllib3/util/request.pyc     |    Bin 0 -> 2118 bytes
 lib/requests/packages/urllib3/util/response.py     |     22 +
 lib/requests/packages/urllib3/util/response.pyc    |    Bin 0 -> 610 bytes
 lib/requests/packages/urllib3/util/retry.py        |    285 +
 lib/requests/packages/urllib3/util/retry.pyc       |    Bin 0 -> 9596 bytes
 lib/requests/packages/urllib3/util/ssl_.py         |    254 +
 lib/requests/packages/urllib3/util/ssl_.pyc        |    Bin 0 -> 8039 bytes
 lib/requests/packages/urllib3/util/timeout.py      |    240 +
 lib/requests/packages/urllib3/util/timeout.pyc     |    Bin 0 -> 9413 bytes
 lib/requests/packages/urllib3/util/url.py          |    212 +
 lib/requests/packages/urllib3/util/url.pyc         |    Bin 0 -> 5702 bytes
 lib/requests/safe_mode.py                          |     40 -
 lib/requests/safe_mode.pyc                         |    Bin 1633 -> 0 bytes
 lib/requests/sessions.py                           |    752 +-
 lib/requests/sessions.pyc                          |    Bin 11387 -> 19020 bytes
 lib/requests/status_codes.py                       |     11 +-
 lib/requests/status_codes.pyc                      |    Bin 4387 -> 4573 bytes
 lib/requests/structures.py                         |     87 +-
 lib/requests/structures.pyc                        |    Bin 3706 -> 4587 bytes
 lib/requests/utils.py                              |    443 +-
 lib/requests/utils.pyc                             |    Bin 17773 -> 19351 bytes
 lib/requests_oauthlib/__init__.py                  |     41 +
 lib/requests_oauthlib/compliance_fixes/__init__.py |      5 +
 lib/requests_oauthlib/compliance_fixes/douban.py   |     18 +
 lib/requests_oauthlib/compliance_fixes/facebook.py |     33 +
 lib/requests_oauthlib/compliance_fixes/linkedin.py |     24 +
 lib/requests_oauthlib/compliance_fixes/weibo.py    |     17 +
 lib/requests_oauthlib/oauth1_auth.py               |     94 +
 lib/requests_oauthlib/oauth1_session.py            |    371 +
 lib/requests_oauthlib/oauth2_auth.py               |     35 +
 lib/requests_oauthlib/oauth2_session.py            |    315 +
 lib/twitter/__init__.py                            |     41 +
 lib/twitter/_file_cache.py                         |    150 +
 lib/twitter/api.py                                 |   3638 +
 lib/twitter/direct_message.py                      |    290 +
 lib/twitter/error.py                               |      9 +
 lib/twitter/hashtag.py                             |     23 +
 lib/twitter/list.py                                |    355 +
 lib/twitter/parse_tweet.py                         |     60 +
 lib/twitter/status.py                              |    735 +
 lib/twitter/trend.py                               |     49 +
 lib/twitter/url.py                                 |     25 +
 lib/twitter/user.py                                |    862 +
 logs/wa.log                                        |     83 -
 makecheck.py                                       |     23 +-
 procedures.csv                                     |    151 +
 public.py                                          |     56 +-
 runAllTests.py                                     |     23 +-
 sampling.csv                                       |    113 +
 scheduler.py                                       |     37 +-
 scripts/__init__.py                                |     21 +
 scripts/__init__.pyc                               |    Bin 0 -> 205 bytes
 lib/requests/async.py => scripts/build.sh          |      0
 scripts/compair2sos.py                             |    323 +
 scripts/constrain2db.py                            |     18 +-
 scripts/converter/__init__.py                      |     23 +-
 scripts/converter/__init__.pyc                     |    Bin 0 -> 116 bytes
 scripts/converter/campbell.py                      |     24 +-
 scripts/converter/campbell.pyc                     |    Bin 0 -> 6118 bytes
 scripts/converter/csv.py                           |     18 +-
 scripts/converter/kern.py                          |     23 +-
 scripts/converter/sts.py                           |     31 +-
 scripts/csv2istsos.py                              |    323 +-
 scripts/csv2istsos.pyc                             |    Bin 0 -> 8704 bytes
 scripts/istsos-ckeck.py                            |     90 +
 scripts/istsos2csv.py                              |    210 +
 scripts/istsos2csv.pyc                             |    Bin 0 -> 4971 bytes
 scripts/istsos2istsos.py                           |    131 +-
 scripts/istsos2istsos.pyc                          |    Bin 0 -> 12001 bytes
 scripts/istsosutils.py                             |    459 +
 scripts/istsosutils.pyc                            |    Bin 0 -> 12450 bytes
 scripts/migrate.py                                 |    142 +
 scripts/migrate_errors.py                          |    134 +
 scripts/net2csv.py                                 |     83 +
 scripts/raw2csv.py                                 |     66 +-
 scripts/raw2csv.pyc                                |    Bin 0 -> 18160 bytes
 scripts/registercsv.py                             |    127 +
 scripts/sos2istsos.py                              |    123 +-
 scripts/sos_virtualHQ_importer.py                  |     13 +-
 services/default.cfg                               |     42 +-
 test/__init__.py                                   |      2 -
 test/_test.py                                      |      6 -
 test/admin/__init__.py                             |      1 -
 test/delete.py                                     |    131 -
 test/get.py                                        |    275 -
 test/istsoslib/__init__.py                         |      2 -
 test/istsoslib/sosRequests.py                      |   1037 -
 test/post.py                                       |    102 -
 test/prove.py                                      |   1669 -
 test/put.py                                        |    133 -
 test/scripts/__init__.py                           |      2 -
 test/scripts/data/soglie_QC0_2013.txt              |     96 -
 test/walib/__init__.py                             |      2 -
 test/walib/istsos/__init__.py                      |      1 -
 test/walib/istsos/services/__init__.py             |      1 -
 test/walib/istsos/services/configsections.py       |   1052 -
 test/walib/istsos/services/dataqualities.py        |    257 -
 test/walib/istsos/services/epsgs.py                |     48 -
 test/walib/istsos/services/observedproperties.py   |    281 -
 test/walib/istsos/services/offerings.py            |    440 -
 test/walib/istsos/services/operations.py           |    286 -
 test/walib/istsos/services/procedures.py           |    486 -
 test/walib/istsos/services/services.py             |    335 -
 test/walib/istsos/services/systemtypes.py          |     55 -
 test/walib/istsos/services/uoms.py                 |    261 -
 updates/database_upgrade_2.1.1_to_2.2.sql          |     28 +
 waconf2sos.py                                      |     13 +-
 waconf2sos.pyc                                     |    Bin 4902 -> 0 bytes
 walib/__init__.py                                  |     25 +-
 walib/__init__.pyc                                 |    Bin 308 -> 301 bytes
 walib/admin/__init__.py                            |     22 +
 walib/admin/__init__.pyc                           |    Bin 0 -> 185 bytes
 walib/admin/configsections/__init__.py             |     22 +
 walib/admin/configsections/__init__.pyc            |    Bin 0 -> 213 bytes
 walib/admin/configsections/configsections.py       |     22 +
 walib/admin/configsections/configsections.pyc      |    Bin 0 -> 166 bytes
 walib/admin/configsections/paths.py                |     13 +-
 walib/admin/configsections/paths.pyc               |    Bin 0 -> 1268 bytes
 walib/configManager.py                             |     13 +-
 walib/configManager.pyc                            |    Bin 5016 -> 4953 bytes
 walib/databaseManager.py                           |     40 +-
 walib/databaseManager.pyc                          |    Bin 6157 -> 6031 bytes
 walib/istsos/__init__.py                           |     22 +
 walib/istsos/__init__.pyc                          |    Bin 203 -> 194 bytes
 walib/istsos/istsos.py                             |     15 +-
 walib/istsos/istsos.pyc                            |    Bin 9174 -> 0 bytes
 walib/istsos/services/__init__.py                  |     22 +
 walib/istsos/services/__init__.pyc                 |    Bin 316 -> 307 bytes
 walib/istsos/services/configsections/__init__.py   |     22 +
 walib/istsos/services/configsections/__init__.pyc  |    Bin 337 -> 328 bytes
 .../services/configsections/configsections.py      |     13 +-
 .../services/configsections/configsections.pyc     |    Bin 3117 -> 3081 bytes
 walib/istsos/services/configsections/connection.py |     13 +-
 .../istsos/services/configsections/connection.pyc  |    Bin 2210 -> 2156 bytes
 walib/istsos/services/configsections/geo.py        |     13 +-
 walib/istsos/services/configsections/geo.pyc       |    Bin 1611 -> 1584 bytes
 .../services/configsections/getobservation.py      |     13 +-
 .../services/configsections/getobservation.pyc     |    Bin 887 -> 869 bytes
 .../services/configsections/identification.py      |     13 +-
 .../services/configsections/identification.pyc     |    Bin 1071 -> 1053 bytes
 walib/istsos/services/configsections/provider.py   |     13 +-
 walib/istsos/services/configsections/provider.pyc  |    Bin 1679 -> 1661 bytes
 walib/istsos/services/configsections/serviceurl.py |     13 +-
 .../istsos/services/configsections/serviceurl.pyc  |    Bin 559 -> 541 bytes
 walib/istsos/services/configsections/urn.py        |     13 +-
 walib/istsos/services/configsections/urn.pyc       |    Bin 2753 -> 2699 bytes
 walib/istsos/services/dataqualities/__init__.py    |     22 +
 walib/istsos/services/dataqualities/__init__.pyc   |    Bin 0 -> 208 bytes
 .../istsos/services/dataqualities/dataqualities.py |     13 +-
 .../services/dataqualities/dataqualities.pyc       |    Bin 0 -> 7516 bytes
 walib/istsos/services/epsgs/__init__.py            |     22 +
 walib/istsos/services/epsgs/__init__.pyc           |    Bin 201 -> 192 bytes
 walib/istsos/services/epsgs/epsgs.py               |     13 +-
 walib/istsos/services/epsgs/epsgs.pyc              |    Bin 1648 -> 1612 bytes
 walib/istsos/services/logs/__init__.py             |     23 +
 walib/istsos/services/logs/logs.py                 |    246 +
 .../istsos/services/observedproperties/__init__.py |     22 +
 .../services/observedproperties/__init__.pyc       |    Bin 0 -> 218 bytes
 .../observedproperties/observedproperties.py       |     13 +-
 .../observedproperties/observedproperties.pyc      |    Bin 0 -> 8713 bytes
 walib/istsos/services/offerings/__init__.py        |     22 +
 walib/istsos/services/offerings/__init__.pyc       |    Bin 209 -> 200 bytes
 walib/istsos/services/offerings/offerings.py       |     13 +-
 walib/istsos/services/offerings/offerings.pyc      |    Bin 8217 -> 8136 bytes
 .../services/offerings/procedures/__init__.py      |     22 +
 .../services/offerings/procedures/__init__.pyc     |    Bin 221 -> 212 bytes
 .../services/offerings/procedures/procedures.py    |     13 +-
 .../services/offerings/procedures/procedures.pyc   |    Bin 6608 -> 6527 bytes
 walib/istsos/services/procedures/__init__.py       |     22 +
 walib/istsos/services/procedures/__init__.pyc      |    Bin 211 -> 202 bytes
 walib/istsos/services/procedures/procedures.py     |    115 +-
 walib/istsos/services/procedures/procedures.pyc    |    Bin 19520 -> 21590 bytes
 walib/istsos/services/services.py                  |     42 +-
 walib/istsos/services/services.pyc                 |    Bin 21765 -> 0 bytes
 walib/istsos/services/status/__init__.py           |     24 +
 walib/istsos/services/status/status.py             |    389 +
 walib/istsos/services/systemtypes/__init__.py      |     22 +
 walib/istsos/services/systemtypes/__init__.pyc     |    Bin 213 -> 0 bytes
 walib/istsos/services/systemtypes/systemtypes.py   |     13 +-
 walib/istsos/services/systemtypes/systemtypes.pyc  |    Bin 1916 -> 0 bytes
 walib/istsos/services/uoms/__init__.py             |     22 +
 walib/istsos/services/uoms/__init__.pyc            |    Bin 0 -> 190 bytes
 walib/istsos/services/uoms/uoms.py                 |     13 +-
 walib/istsos/services/uoms/uoms.pyc                |    Bin 0 -> 7158 bytes
 .../istsos/services/virtualprocedures/__init__.py  |     22 +-
 walib/istsos/services/virtualprocedures/code.py    |     18 +-
 .../services/virtualprocedures/ratingcurve.py      |     13 +-
 .../virtualprocedures/virtualprocedures.py         |     22 +-
 walib/procedure.py                                 |     28 +-
 walib/procedure.pyc                                |    Bin 28406 -> 28625 bytes
 walib/resource.py                                  |     83 +-
 walib/resource.pyc                                 |    Bin 10308 -> 10048 bytes
 walib/resourceFactory.py                           |     28 +-
 walib/resourceFactory.pyc                          |    Bin 4778 -> 4978 bytes
 walib/sqlschema.py                                 |    104 +-
 walib/sqlschema.pyc                                |    Bin 14661 -> 17997 bytes
 walib/utils.py                                     |     23 +-
 walib/utils.pyc                                    |    Bin 20301 -> 20051 bytes
 walib/wa_version.py                                |     22 +
 walib/wa_version.pyc                               |    Bin 0 -> 169 bytes
 wnslib/__init__.py                                 |     24 +
 wnslib/dbSetup.sql                                 |    107 +
 wnslib/notificationManager.py                      |    213 +
 wnslib/notificationScheduler.py                    |     78 +
 wnslib/notify.py                                   |    116 +
 wnslib/operation.py                                |    112 +
 wnslib/resourceFactory.py                          |     63 +
 wnslib/services/__init__.py                        |     23 +
 wnslib/services/notifications/__init__.py          |     23 +
 wnslib/services/notifications/notifications.py     |    201 +
 wnslib/services/registrations/__init__.py          |     23 +
 wnslib/services/registrations/registrations.py     |    144 +
 wnslib/services/users/__init__.py                  |     23 +
 wnslib/services/users/users.py                     |    133 +
 wnslib/setup.py                                    |     66 +
 4473 files changed, 198197 insertions(+), 99036 deletions(-)

diff --git a/CLA.txt b/CLA.txt
new file mode 100644
index 0000000..9400bb3
--- /dev/null
+++ b/CLA.txt
@@ -0,0 +1,24 @@
+istSOS
+
+Contributor License Agreement ("Agreement")
+===========================================
+
+Thank you for your interest in the istSOS open source project being administered by SUPSI. The form of license below is a document that clarifies the terms under which You, the person listed below, may contribute software, bug fixes, configuration changes, documentation, or any other materials that you send to us related to the Project (each a "Contribution") to the project. We appreciate your participation in our project, and your help in improving the project, so we want you to underst [...]
+
+If you have questions about these terms, please contact us at geomatica at supsi.ch.
+
+Corporate Contributions:
+------------------------
+
+If you are employed as a software engineer, or if your employer is in the business of developing software, or otherwise may claim rights in the Contributions, please provide information about your employer's policy on contributing to open source projects, including the name of the supervisor to contact in connection with such contributions.
+
+You and SUPSI agree:
+--------------------
+
+You grant us the ability to use the Contributions in any way. You hereby grant to SUPSI, a non-exclusive, irrevocable, worldwide, royalty-free, sublicenseable, transferable license under all of Your relevant intellectual property rights (including copyright, patent, and any other rights), to use, copy, prepare derivative works of, distribute and publicly perform and display the Contributions on any licensing terms, including without limitation: (a) open source licenses like the GNU Gener [...]
+You are able to grant us these rights. You represent that You are legally entitled to grant the above license. If Your employer has rights to intellectual property that You create, You represent that You have received permission to make the Contributions on behalf of that employer, or that Your employer has waived such rights for the Contributions.
+The Contributions are your original work. You represent that the Contributions are Your original works of authorship, and to Your knowledge, no other person claims, or has the right to claim, any right in any invention or patent related to the Contributions. You also represent that You are not legally obligated, whether by entering into an agreement or otherwise, in any way that conflicts with the terms of this license. For example, if you have signed an agreement requiring you to assign [...]
+We determine the code that is in our project. You understand that the decision to include the Contribution in any project or source repository is entirely that of SUPSI, and this agreement does not guarantee that the Contributions will be included in any product.
+No Implied Warranties. SUPSI acknowledges that, except as explicitly described in this Agreement, the Contribution is provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Sign Electronically
diff --git a/COMMITTERS.txt b/COMMITTERS.txt
new file mode 100644
index 0000000..a4786ad
--- /dev/null
+++ b/COMMITTERS.txt
@@ -0,0 +1,10 @@
+=============== ===================== ==================================== ==================================
+Login(s)        Name                  Email / Contact             Area(s)
+=============== ===================== ==================================== ==================================
+maxicannata     Massimiliano Cannata  massimiliano.cannata at gmail.com    Overall 
+mantonovic      Milan Antonovic       milan.antonovic at gmail.com         Overall 
+pietrap         Priska Pietra         
+fmassa          Francesco Massa
+doscio          Mirko Cardoso
+ambrosiniluca   Ambrosini Luca
+=============== ===================== ==================================== ==================================
diff --git a/GPL.txt b/GPL.txt
new file mode 100644
index 0000000..9067340
--- /dev/null
+++ b/GPL.txt
@@ -0,0 +1,341 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..934f616
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,18 @@
+#---------------------------------------------------------------------------
+# istSOS - Istituto Scienze della Terra
+# Copyright (C) IST-SUPSI
+#---------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#---------------------------------------------------------------------------
+
diff --git a/RFC.txt b/RFC.txt
new file mode 100644
index 0000000..9d9a56e
--- /dev/null
+++ b/RFC.txt
@@ -0,0 +1,45 @@
+RFC 1: Legal aspects of code contributions
+==========================================
+
+Author: Massimiliano Cannata (based on GRASS GIS/RFC2)
+
+Contact: ​???????
+
+Status: DRAFT
+
+Legal aspects
+-------------
+
+istSOS developers have to keep the code base clear of improperly contributed code. It is important to the istSOS users, developers and the OSGeo foundation to avoid contributing any code to the project without it being clearly licensed under the project license or a compliant license. In this document, a "committer" is understood to be a developer with write access to the istSOS source code repository.
+
+Generally speaking, the key issues are that those individuals providing code to be included in the istSOS repository understand that the code will be released under the GPL >=2 license, and that the person providing the code has the right to contribute the code. In order to verify this, the committer must have a clear understanding of the license themselves. When committing 3rd party contributions, the committer should verify the understanding unless the committer is very comfortable tha [...]
+
+If the contribution was developed on behalf of an employer (on work time, as part of a work project, etc) then it is important that an appropriate representative of the employer understand that the code will be contributed under the GPL license. The arrangement should be cleared with an authorized supervisor/manager, etc.
+
+The code should be developed by the contributor, or the code should be from a source which can be rightfully contributed such as from the public domain, or from an open source project under a compatible license.
+
+All unusual situations need to be discussed and/or documented.
+
+Committers should adhere to the following guidelines, and may be personally legally liable for improperly contributing code to the source repository:
+
+Make sure the contributor (and possibly employer) is aware of the contribution terms.
+Code coming from a source other than the contributor (such as adapted from another project) should be clearly marked as to the original source, copyright holders, license terms and so forth. This information can be in the file headers, but should also be added to the project licensing file if not exactly matching normal project licensing (istSOS/COPYRIGHT.txt).
+Existing copyright headers and license text should never be stripped from a file. If a copyright holder wishes to give up copyright they must do so in writing to the GRASS PSC before copyright messages are removed. If license terms are changed, it has to be by agreement (written in email is ok) of the copyright holders.
+When substantial contributions are added to a file (such as substantial patches) the author/contributor should be added to the list of copyright holders for the file in the file header.
+If there is uncertainty about whether a change is proper to contribute to the code base, please seek more information from the Project Steering Committee, other istSOS developers or the OSGeo foundation legal counsel.
+Questions regarding istSOS should be directed to the istSOS Development Team at the following address:
+
+Internet:
+
+http://istsos.org/home/contact-us/
+
+Postal address:
+
+ istSOS Development Team
+ c/o Prof. Massimiliano Cannata
+ 
+ Istituto scienze della Terra
+ Dipartimento ambiente costruzione e design
+ Scuola universitaria professionale della Svizzera italiana
+ Campus Trevano, CH - 6952 Canobbio
+
diff --git a/VERSION.txt b/VERSION.txt
new file mode 100644
index 0000000..ccbccc3
--- /dev/null
+++ b/VERSION.txt
@@ -0,0 +1 @@
+2.2.0
diff --git a/application.py b/application.py
old mode 100755
new mode 100644
index 6d9e19b..d04b8c1
--- a/application.py
+++ b/application.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istsos WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import sys
 from os import path
 sys.path.insert(0, path.abspath(path.dirname(__file__)))
@@ -22,27 +27,28 @@ sys.path.insert(0, path.abspath(path.dirname(__file__)))
 import pprint
 pp = pprint.PrettyPrinter(indent=4)
 
+
 def application(environ, start_response):
-    
-    
     path = environ['PATH_INFO'].strip()[1:].split("/")
-    #print >> sys.stderr, "pathInfo: %s" % path
-    #print >> sys.stderr, "\n\nENVIRON: %s" % pp.pprint(environ)
-    
-    if path[0]=='wa':
+    if path[0] == 'wa':
         return executeWa(environ, start_response)
+    elif path[0] == 'wns':
+        return executeWns(environ, start_response)
     else:
         return executeSos(environ, start_response)
 
+
 def executeSos(environ, start_response):
     import sys
     import traceback
     import waconf2sos as cfg
-    sosConfig = cfg.istsosConfig(environ)
+    from urlparse import parse_qs
     
+    sosConfig = cfg.istsosConfig(environ)
+
     if not sosConfig.istsos_librarypath=="" or sosConfig.istsos_librarypath==None:
         sys.path.insert(0, sosConfig.istsos_librarypath)
-        
+
     from istsoslib import sosDatabase
     from istsoslib import sosException
 
@@ -56,14 +62,15 @@ def executeSos(environ, start_response):
                            sosConfig.connection["dbname"],
                            sosConfig.connection["host"],
                            sosConfig.connection["port"])
-        
+
+
         from istsoslib.filters import factory_filters as FF
         from istsoslib.responders import factory_response as FR
         from istsoslib.renderers import factory_render as FRe
-        
-        req_filter = FF.sosFactoryFilter(environ,sosConfig)
-        response = FR.sosFactoryResponse(req_filter,pgdb)
-        render = FRe.sosFactoryRender(response,sosConfig)
+
+        req_filter = FF.sosFactoryFilter(environ, sosConfig)
+        response = FR.sosFactoryResponse(req_filter, pgdb)
+        render = FRe.sosFactoryRender(response, sosConfig)
         try:
             content_type = req_filter.responseFormat
         except:
@@ -77,11 +84,21 @@ def executeSos(environ, start_response):
         # prepare response header
         response_headers = [('Content-Type', content_type),
                             ('Content-Length', str(len(render.encode('utf-8'))))]
+                            
+        #Content-Disposition: attachment; filename="'.basename($file).'"'                    
+        if str(environ['REQUEST_METHOD']).upper()=='GET':
+            rect = parse_qs(environ['QUERY_STRING'])
+            requestObject = {}
+            for key in rect.keys():
+                requestObject[key.lower()] = rect[key][0]
+            if requestObject.has_key("attachment"):
+                response_headers.append(("Content-Disposition", "attachment; filename=%s" % requestObject["attachment"]))
+                            
         # send response header
         start_response(status, response_headers)
         #send response body
         return [render.encode('utf-8')]
-        
+
     except sosException.SOSException, e:
         print >> sys.stderr, traceback.print_exc()
         response_body = e.ToXML()
@@ -94,7 +111,7 @@ def executeSos(environ, start_response):
         start_response(status, response_headers)
         # send response
         return [response_body.encode('utf-8')]
-    
+
     except Exception, e:
         print >> sys.stderr, traceback.print_exc()
         othertext = traceback.format_exception(*sys.exc_info())
@@ -111,13 +128,12 @@ def executeSos(environ, start_response):
         start_response(status, response_headers)
         # send response
         return [response_body.encode('utf-8')]
-        
+
     return
-    
-    
-    
+
+
 def executeWa(environ, start_response):
-    
+
     from urlparse import parse_qs
     import config
     import traceback
@@ -138,7 +154,7 @@ def executeWa(environ, start_response):
         for h in logger.handlers:
             logger.removeHandler(h)
         logger.addHandler(handler)
-    
+
     if config.errorlog_level == "INFO":
         logger.setLevel(logging.INFO)
     elif config.errorlog_level == "ERROR":
@@ -151,7 +167,7 @@ def executeWa(environ, start_response):
     wsgi_response = "Hello istSOS"
     wsgi_mime = 'text/plain'
     wsgi_status = '200 OK'
-    
+
     waEnviron = {
         "path" : environ['PATH_INFO'][3:],
         "method" : str(environ['REQUEST_METHOD']).upper(),
@@ -169,53 +185,53 @@ def executeWa(environ, start_response):
         "errorlog_path" : config.errorlog_path
     }
     #print >> sys.stderr, "\n\nENVIRON: %s" % pp.pprint(waEnviron)
-    
-    try:   
-        
+
+    try:
+
         try:
             op = None
             op = factory.initResource(waEnviron)
-            
+
             try:
                 if op.response['success']:
-                
+
                     method = str(environ['REQUEST_METHOD']).upper()
                     # Data RETRIEVAL
-                    if method=="GET":
+                    if method == "GET":
                         op.executeGet()
-                        
+
                     # Data UPDATE
-                    elif method=="POST":
+                    elif method == "POST":
                         op.executePost()
-                        
+
                     # Data INSERT
-                    elif method=="PUT":
+                    elif method == "PUT":
                         op.executePut()
-                        
+
                     # Data DELETE
-                    elif method=="DELETE":
+                    elif method == "DELETE":
                         op.executeDelete()
-                    
+
                     else:
                         raise Exception("HTTP method %s not supported" % waEnviron["method"])
-                    
+
                     if 'log' in op.response:
-                        logger.info("Executing %s on %s: %s" % (waEnviron["method"], 
+                        logger.info("Executing %s on %s: %s" % (waEnviron["method"],
                                             environ['PATH_INFO'],str(op.response['log']) ))
-                    
+
                     if 'message' in op.response:
-                        logger.info("Executing %s on %s: %s" % (waEnviron["method"], 
+                        logger.info("Executing %s on %s: %s" % (waEnviron["method"],
                                             environ['PATH_INFO'],str(op.response['message']) ))
-                    
-                    
-                    
+
+
+
             except Exception as exe:
                 print >> sys.stderr, traceback.print_exc()
                 logger.error("Executing %s on %s: %s" % (waEnviron["method"],
                                  environ['PATH_INFO'],str(exe)))
                 #op.setException("Executing %s on %s: %s" % (method, environ['PATH_INFO'], exe))
                 op.setException(str(exe))
-                
+
         except Exception as exe:
             print >> sys.stderr, traceback.print_exc()
             logger.error("On initialization %s on %s: %s" % (waEnviron["method"],
@@ -224,7 +240,7 @@ def executeWa(environ, start_response):
             op = resource.waResource(waEnviron)
             #op.setException("On initialization: %s" % exe)
             op.setException(str(exe))
-            
+
         try:
             wsgi_response = op.getResponse()
         except Exception as exe:
@@ -232,9 +248,9 @@ def executeWa(environ, start_response):
             logger.error("Executing %s on %s: %s" % (waEnviron["method"],
                                  environ['PATH_INFO'],str(exe)))
             op.setException("Error converting response to json")
-            
+
         wsgi_mime = "application/json"
-    
+
     except Exception as e:
         print >> sys.stderr, traceback.print_exc()
         logger.error("Executing %s on %s: %s" % (waEnviron["method"],
@@ -242,12 +258,64 @@ def executeWa(environ, start_response):
         wsgi_response = str(e)
         wsgi_mime = 'text/plain'
         wsgi_status = '400 Bad Request'
-    
+
     wsgi_headers = [
         ('Content-Type', "%s; charset=utf-8" % wsgi_mime),
         ('Content-Length', str(len(wsgi_response)))
     ]
     start_response(wsgi_status, wsgi_headers)
     return [wsgi_response]
-    
 
+
+def executeWns(environ, start_response):
+
+    from urlparse import parse_qs
+    from wnslib import resourceFactory
+    import config
+
+    wsgi_response = "Hello istSOS WNS"
+    wsgi_mime = 'text/plain'
+    wsgi_status = '200 OK'
+
+    wnsEnviron = {
+        "path": environ['PATH_INFO'][3:],
+        "method": str(environ['REQUEST_METHOD']).upper(),
+        "pathinfo": environ['PATH_INFO'].strip()[4:].split("/"),
+        "wsgi_input": environ['wsgi.input'].read(int(environ["CONTENT_LENGTH"])) if environ.get("CONTENT_LENGTH") else None,
+        "url_scheme": environ['wsgi.url_scheme'],
+        "http_host": environ['HTTP_HOST'] if environ.get('HTTP_HOST') else None,
+        "server_name": environ['SERVER_NAME'],
+        "server_port": environ['SERVER_PORT'],
+        "script_name": environ['SCRIPT_NAME'] if environ.get('SCRIPT_NAME', '') else None,
+        "parameters": parse_qs(environ['QUERY_STRING']) if environ.get('QUERY_STRING') else None,
+        "services_path": config.services_path,
+    }
+
+    method = str(environ['REQUEST_METHOD']).upper()
+    op = resourceFactory.initResource(wnsEnviron)
+
+    try:
+        if method == "GET":
+            op.executeGet()
+        elif method == "PUT":
+            op.executePut()
+        elif method == "POST":
+            op.executePost()
+        elif method == "DELETE":
+            op.executeDelete()
+        else:
+            raise Exception("HTTP method %s not supported" % method)
+        wsgi_response = op.getResponse()
+        wsgi_mime = "application/json"
+
+    except Exception as e:
+        wsgi_response = str(e)
+        wsgi_mime = 'text/plain'
+        wsgi_status = '400 Bad Request'
+
+    wsgi_headers = [
+        ('Content-Type', "%s; charset=utf-8" % wsgi_mime),
+        ('Content-Length', str(len(wsgi_response)))
+    ]
+    start_response(wsgi_status, wsgi_headers)
+    return [wsgi_response]
diff --git a/cmdimportcsv.py b/cmdimportcsv.py
deleted file mode 100755
index 004e037..0000000
--- a/cmdimportcsv.py
+++ /dev/null
@@ -1,315 +0,0 @@
-# -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-'''
-This script can be used to import measurement from a CSV file.
-'''
-
-try:
-    import os
-    import traceback
-    import json
-    import pprint
-    import glob
-    import lib.requests as requests
-    import lib.argparse as argparse
-    
-except ImportError as e:
-    raise e
-    
-def execute (args):  
-    pp = pprint.PrettyPrinter(indent=2)
-    try:
-    
-        # Initializing URLs
-        url = args['u']
-        
-        # Procedures
-        service = args['s']
-        
-        # Quality index
-        quality = args['q']
-        
-        # Service instance name
-        procs = args['p']
-        
-        # Working directory, where the CSV files are located
-        wd = args['wd']
-        # File extension
-        ext = args['e']
-        
-        debug = args['v']
-        test = args['t']
-        
-        user = args['usr']
-        passw = args['pwd']
-        
-        req = requests.session()
-        
-        for proc in procs:
-            
-            print "Procedure: %s" % proc
-            
-            # Load procedure description
-            print "GET: %s/wa/istsos/services/%s/procedures/%s" % (url,service,proc)
-                
-            res = req.get("%s/wa/istsos/services/%s/procedures/%s" % (
-                url,
-                service,
-                proc
-                ), prefetch=True, auth=(user, passw), verify=False)
-                
-            data = res.json
-            if debug:
-                pp.pprint(data)
-                
-            if data['success']==False:
-                raise Exception ("Description of procedure %s can not be loaded: %s" % (proc, data['message']))
-            else:
-                if debug:
-                    pp.pprint(data)
-                else:
-                    print " > %s" % data['message']
-            
-            data = data['data']
-            
-            aid = data['assignedSensorId']
-            
-            # Getting observed properties from describeSensor response
-            op = []
-            for out in data['outputs']:
-                op.append(out['definition'])
-            
-            # Load of a getobservation request
-            
-            print "GET: %s/wa/istsos/services/%s/operations/getobservation/offerings/%s/procedures/%s/observedproperties/%s/eventtime/last" % (url,service,'temporary',proc,','.join(op))
-            res = req.get("%s/wa/istsos/services/%s/operations/getobservation/offerings/%s/procedures/%s/observedproperties/%s/eventtime/last" % (
-                url,
-                service,
-                'temporary',
-                proc,
-                ','.join(op)
-                ), prefetch=True, auth=(user, passw), verify=False)
-            
-            data = res.json
-            
-            if data['success']==False:
-                raise Exception ("Last observation of procedure %s can not be loaded: %s" % (proc, data['message']))
-            else:
-                if debug:
-                    pp.pprint(data)
-                else:
-                    print " > %s" % data['message']
-                    
-            data = data['data'][0]
-            data['AssignedSensorId'] = aid
-            
-            # Set values array empty (can contain 1 value if procedure not empty)
-            data['result']['DataArray']['values'] = []
-            
-            # discover json observed property disposition
-            jsonindex = {}
-            for pos in range(0, len(data['result']['DataArray']['field'])):
-                field = data['result']['DataArray']['field'][pos]
-                jsonindex[field['definition']] = pos
-            
-            if debug:
-                print "\njsonindex:"
-                pp.pprint(jsonindex)
-            
-            # find files
-            print "Searching: %s" % os.path.join(wd, "%s%s" % (proc,ext))
-            files = glob.glob(os.path.join(wd, "%s%s" % (proc,ext)))
-            
-            print " > %s %s found" % (len(files), "Files" if len(files)>1 else "File")
-            for f in files:
-            
-                # open file
-                file = open(f, 'rU')
-                
-                # loop lines
-                lines = file.readlines()
-                
-                obsindex = lines[0].strip(' \t\n\r').split(",")
-                
-                # Check if all the observedProperties of the procedure are included in the CSV file (quality index is optional)
-                for k, v in jsonindex.iteritems():
-                    if k in obsindex:
-                        continue
-                    elif ':qualityIndex' in k:
-                        continue
-                    else:
-                        raise Exception ("Mandatory observed property %s is not present in the CSV." % k)
-                
-                begin = None
-                end = None
-                
-                # loop lines skipping the header
-                for i in range(1, len(lines)):
-                    try:
-                        line = lines[i]
-                        lineArray = line.strip(' \t\n\r').split(",")
-                        
-                        # Creating an empty array where the values will be inserted
-                        observation =  ['']*len(jsonindex)
-                        
-                        for k, v in jsonindex.iteritems():
-                            val = None
-                            if k in obsindex:
-                                val = lineArray[obsindex.index(k)]
-                            elif ':qualityIndex' in k: # Quality index is not present in the CSV so the default value will be set
-                                val = quality
-                                
-                            observation[v] = val
-                            
-                        # get first date
-                        if i == 1:
-                            begin = observation[jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']]
-                            
-                        # get last date
-                        if i == (len(lines)-1):
-                            end   = observation[jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']]
-                        
-                        # attach to object
-                        data['result']['DataArray']['values'].append(observation)
-                    except Exception as e:
-                        print "Errore alla riga: %s" % i
-                        raise e
-                        
-                
-                data["samplingTime"] = {
-				    "beginPosition": begin, 
-				    "endPosition": end
-			    };
-                
-                print "Begin: %s" % begin
-                print "End: %s" % end
-                print "Values: %s" % len( data['result']['DataArray']['values'])
-                
-            if debug:
-                pp.pprint({
-                    "ForceInsert": "true",
-                    "AssignedSensorId": aid,
-                    "Observation": data
-                    })
-            
-            # send to wa
-            
-            if not test:
-                res = req.post("%s/wa/istsos/services/%s/operations/insertobservation" % (
-                    url,
-                    service), 
-                    prefetch=True,
-                    auth=(user, passw),
-                    verify=False,
-                    data=json.dumps({
-                    "ForceInsert": "true",
-                    "AssignedSensorId": aid,
-                    "Observation": data
-                    })
-                )
-                # read response
-                if debug:
-                    pp.pprint(res.json)
-                else:
-                    print " > Insert observation success: %s" % res.json['success']
-                
-        pass
-        
-    except Exception as e:    
-        print "ERROR: %s\n\n" % e
-        traceback.print_exc()
-        pass
-        
-    pass
-    
-
-    
-if __name__ == "__main__":
-
-    parser = argparse.ArgumentParser(
-        description='Import data from a csv file.')
-    
-    parser.add_argument('-v','--verbose',
-        action = 'store_true',
-        dest   = 'v',
-        help   = 'Activate verbose debug')
-        
-    parser.add_argument('-t','--test',
-        action = 'store_true',
-        dest   = 't',
-        help   = 'Use to test the command, deactivating the insert observation operations.')
-        
-    parser.add_argument('-p', 
-        action='store',
-        required=True,
-        nargs='+',
-        dest='p',
-        metavar='procedures',
-        help='List of procedures to be aggregated.')
-    
-    parser.add_argument('-q',
-        action = 'store',
-        dest   = 'q',
-        metavar= 'quality index',
-        default= '100',
-        help   = 'The quality index to set for all the measures of the CSV file, if not set into the CSV. (default: %(default)s).')
-        
-    parser.add_argument('-u',
-        action = 'store',
-        dest   = 'u',
-        metavar= 'url',
-        default= 'http://localhost:80/istsos',
-        help   = 'IstSOS Server address IP (or domain name) used for all request. (default: %(default)s).')
-    
-    parser.add_argument('-s',
-        action = 'store',
-        required=True,
-        dest   = 's',
-        metavar= 'service',
-        
-        help   = 'The name of the service instance.')
-    
-    parser.add_argument('-w',
-        action = 'store',
-        required=True,
-        dest   = 'wd',
-        metavar= 'working directory',
-        help   = 'Working directory where the csv files are located.')
-        
-    parser.add_argument('-e',
-        action = 'store',
-        dest   = 'e',
-        metavar= 'file extension',
-        default= '.DAT',
-        help   = 'Extension of the CSV file. (default: %(default)s)')
-        
-    parser.add_argument('-usr',
-        action = 'store',
-        dest   = 'usr',
-        metavar= 'user name')
-        
-    parser.add_argument('-pwd',
-        action = 'store',
-        dest   = 'pwd',
-        metavar= 'password')
-
-    args = parser.parse_args()
-    #print args.__dict__
-    execute(args.__dict__)
-
-
diff --git a/code_provenance/lib_folder.txt b/code_provenance/lib_folder.txt
new file mode 100644
index 0000000..3a8cc98
--- /dev/null
+++ b/code_provenance/lib_folder.txt
@@ -0,0 +1,22 @@
+ISODATE 
+License: BSD
+
+PYTZ
+License :: OSI Approved :: MIT License
+
+REQUESTS
+License :: OSI Approved :: Apache Software License
+
+requests-oauthlib
+License: ISC (~ BSD)
+
+twitter
+License :: OSI Approved :: MIT License
+
+APScheduler
+License :: OSI Approved :: MIT License
+
+argparse
+License :: OSI Approved :: Python Software Foundation License
+
+etree and preparelibs are istsos file with copyright indicated
diff --git a/code_provenance/list_not_copyrighted.txt b/code_provenance/list_not_copyrighted.txt
new file mode 100644
index 0000000..7c95b10
--- /dev/null
+++ b/code_provenance/list_not_copyrighted.txt
@@ -0,0 +1,189 @@
+[ ] ./site/conf.py
+
+[x] ./scripts/converter/__init__.py
+[x] ./scripts/istsos2csv.py
+[x] ./scripts/__init__.py
+
+[x] ./makecheck.py
+[x] ./documentation/conf.py
+
+[x] ./istsoslib/renderers/__init__.py
+[x] ./istsoslib/responders/__init__.py
+[x] ./istsoslib/sos_version.py
+[x] ./istsoslib/filters/__init__.py
+[x] ./istsoslib/sosException.py
+[x] ./istsoslib/sosUtils.py
+[x] ./istsoslib/__init__.py
+
+[x] ./site_/conf.py
+
+[ ] ./lib/requests_oauthlib/oauth1_session.py
+[ ] ./lib/requests_oauthlib/oauth2_session.py
+[ ] ./lib/requests_oauthlib/oauth2_auth.py
+[ ] ./lib/requests_oauthlib/oauth1_auth.py
+[ ] ./lib/requests_oauthlib/compliance_fixes/facebook.py
+[ ] ./lib/requests_oauthlib/compliance_fixes/douban.py
+[ ] ./lib/requests_oauthlib/compliance_fixes/linkedin.py
+[ ] ./lib/requests_oauthlib/compliance_fixes/weibo.py
+[ ] ./lib/requests_oauthlib/compliance_fixes/__init__.py
+[ ] ./lib/requests_oauthlib/__init__.py
+
+[ ] ./lib/twitter/list.py
+[ ] ./lib/twitter/_file_cache.py
+[ ] ./lib/twitter/hashtag.py
+[ ] ./lib/twitter/direct_message.py
+[ ] ./lib/twitter/status.py
+[ ] ./lib/twitter/url.py
+[ ] ./lib/twitter/parse_tweet.py
+[ ] ./lib/twitter/error.py
+[ ] ./lib/twitter/trend.py
+[ ] ./lib/twitter/user.py
+[ ] ./lib/twitter/api.py
+[ ] ./lib/twitter/__init__.py
+
+[ ] ./lib/pytz/exceptions.py
+[ ] ./lib/pytz/reference.py
+[ ] ./lib/pytz/tzfile.py
+[ ] ./lib/pytz/lazy.py
+[ ] ./lib/pytz/tests/test_lazy.py
+[ ] ./lib/pytz/tests/test_tzinfo.py
+[ ] ./lib/pytz/tests/test_docs.py
+[ ] ./lib/pytz/__init__.py
+[ ] ./lib/pytz/tzinfo.py
+
+[ ] ./lib/requests/models.py
+[ ] ./lib/requests/compat.py
+[ ] ./lib/requests/adapters.py
+[ ] ./lib/requests/auth.py
+[ ] ./lib/requests/exceptions.py
+[ ] ./lib/requests/sessions.py
+[ ] ./lib/requests/certs.py
+[ ] ./lib/requests/status_codes.py
+[ ] ./lib/requests/packages/urllib3/util/ssl_.py
+[ ] ./lib/requests/packages/urllib3/util/request.py
+[ ] ./lib/requests/packages/urllib3/util/connection.py
+[ ] ./lib/requests/packages/urllib3/util/url.py
+[ ] ./lib/requests/packages/urllib3/util/timeout.py
+[ ] ./lib/requests/packages/urllib3/util/response.py
+[ ] ./lib/requests/packages/urllib3/util/retry.py
+[ ] ./lib/requests/packages/urllib3/util/__init__.py
+[ ] ./lib/requests/packages/urllib3/connectionpool.py
+[ ] ./lib/requests/packages/urllib3/exceptions.py
+[ ] ./lib/requests/packages/urllib3/fields.py
+[ ] ./lib/requests/packages/urllib3/request.py
+[ ] ./lib/requests/packages/urllib3/connection.py
+[ ] ./lib/requests/packages/urllib3/response.py
+[ ] ./lib/requests/packages/urllib3/packages/ordered_dict.py
+[ ] ./lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
+[ ] ./lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+[ ] ./lib/requests/packages/urllib3/packages/__init__.py
+[ ] ./lib/requests/packages/urllib3/filepost.py
+[ ] ./lib/requests/packages/urllib3/contrib/__init__.py
+[ ] ./lib/requests/packages/urllib3/contrib/ntlmpool.py
+[ ] ./lib/requests/packages/urllib3/contrib/pyopenssl.py
+[ ] ./lib/requests/packages/urllib3/_collections.py
+[ ] ./lib/requests/packages/urllib3/poolmanager.py
+[ ] ./lib/requests/packages/urllib3/__init__.py
+[ ] ./lib/requests/packages/chardet/compat.py
+[ ] ./lib/requests/packages/chardet/__init__.py
+[ ] ./lib/requests/packages/chardet/chardetect.py
+[ ] ./lib/requests/packages/__init__.py
+[ ] ./lib/requests/cookies.py
+[ ] ./lib/requests/api.py
+[ ] ./lib/requests/hooks.py
+[ ] ./lib/requests/__init__.py
+[ ] ./lib/requests/utils.py
+[ ] ./lib/requests/structures.py
+
+[ ] ./lib/apscheduler/scheduler.py
+[ ] ./lib/apscheduler/util.py
+[ ] ./lib/apscheduler/events.py
+[ ] ./lib/apscheduler/jobstores/ram_store.py
+[ ] ./lib/apscheduler/jobstores/mongodb_store.py
+[ ] ./lib/apscheduler/jobstores/base.py
+[ ] ./lib/apscheduler/jobstores/shelve_store.py
+[ ] ./lib/apscheduler/jobstores/__init__.py
+[ ] ./lib/apscheduler/jobstores/sqlalchemy_store.py
+[ ] ./lib/apscheduler/jobstores/redis_store.py
+[ ] ./lib/apscheduler/job.py
+[ ] ./lib/apscheduler/triggers/cron/fields.py
+[ ] ./lib/apscheduler/triggers/cron/__init__.py
+[ ] ./lib/apscheduler/triggers/cron/expressions.py
+[ ] ./lib/apscheduler/triggers/interval.py
+[ ] ./lib/apscheduler/triggers/simple.py
+[ ] ./lib/apscheduler/triggers/__init__.py
+[ ] ./lib/apscheduler/__init__.py
+[ ] ./lib/apscheduler/threadpool.py
+
+[ ] ./lib/argparse.py
+
+[ ] ./lib/isodate/isostrf.py
+[ ] ./lib/isodate/isodates.py
+[ ] ./lib/isodate/isoduration.py
+[ ] ./lib/isodate/isotzinfo.py
+[ ] ./lib/isodate/isodatetime.py
+[ ] ./lib/isodate/isoerror.py
+[ ] ./lib/isodate/duration.py
+[ ] ./lib/isodate/isotime.py
+[ ] ./lib/isodate/__init__.py
+[ ] ./lib/isodate/tzinfo.py
+
+[x] ./lib/etree.py
+[x] ./lib/__init__.py
+
+[x] ./runAllTests.py
+
+[x] ./walib/sqlschema.py
+[?] ./walib/wa_version.py
+[x] ./walib/__init__.py
+
+[x] ./walib/istsos/services/virtualprocedures/__init__.py
+[x] ./walib/istsos/services/virtualprocedures/virtualprocedures.py
+[x] ./walib/istsos/services/systemtypes/__init__.py
+[x] ./walib/istsos/services/uoms/__init__.py
+[x] ./walib/istsos/services/observedproperties/__init__.py
+[x] ./walib/istsos/services/configsections/__init__.py
+[x] ./walib/istsos/services/procedures/__init__.py
+[x] ./walib/istsos/services/dataqualities/__init__.py
+[x] ./walib/istsos/services/logs/__init__.py
+[x] ./walib/istsos/services/status/__init__.py
+[x] ./walib/istsos/services/offerings/procedures/__init__.py
+[x] ./walib/istsos/services/offerings/__init__.py
+[x] ./walib/istsos/services/epsgs/__init__.py
+[x] ./walib/istsos/services/__init__.py
+[x] ./walib/istsos/__init__.py
+
+[?] ./walib/admin/configsections/configsections.py
+[x] ./walib/admin/configsections/__init__.py
+[x] ./walib/admin/__init__.py
+
+[x] ./wnslib/services/users/__init__.py
+[x] ./wnslib/services/notifications/__init__.py
+[x] ./wnslib/services/__init__.py
+[x] ./wnslib/services/registrations/__init__.py
+[x] ./wnslib/__init__.py
+
+[x] ./test/delete.py
+[x] ./test/scripts/__init__.py
+[x] ./test/_test.py
+[x] ./test/istsoslib/__init__.py
+[x] ./test/istsoslib/sosRequests.py
+[x] ./test/post.py
+[x] ./test/put.py
+[x] ./test/walib/__init__.py
+[x] ./test/walib/istsos/services/procedures.py
+[x] ./test/walib/istsos/services/uoms.py
+[x] ./test/walib/istsos/services/systemtypes.py
+[x] ./test/walib/istsos/services/operations.py
+[x] ./test/walib/istsos/services/observedproperties.py
+[x] ./test/walib/istsos/services/offerings.py
+[x] ./test/walib/istsos/services/services.py
+[x] ./test/walib/istsos/services/configsections.py
+[x] ./test/walib/istsos/services/__init__.py
+[x] ./test/walib/istsos/services/dataqualities.py
+[x] ./test/walib/istsos/services/epsgs.py
+[x] ./test/walib/istsos/__init__.py
+[ ] ./test/get.py
+[x] ./test/__init__.py
+[x] ./test/admin/__init__.py
+[x] ./test/prove.py
diff --git a/config.py b/config.py
index 859a79f..4316541 100755
--- a/config.py
+++ b/config.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,14 +18,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from os import path
 services_path = path.join(path.dirname(path.abspath(__file__)), "services")
 istsoslib_path = path.join(path.dirname(path.abspath(__file__)), "istsoslib")
 istsoswalib_path = path.join(path.dirname(path.abspath(__file__)), "walib")
 errorlog_path = path.join(path.dirname(path.abspath(__file__)), "logs")
 errorlog_level = "INFO"
-debug=False
+debug=True
 #==================================================================================
 # if you have to move some of "istsoslib" "walib" or "service" folder
 # in a different location you have to override the above paths
diff --git a/config.pyc b/config.pyc
deleted file mode 100644
index 68c5eb2..0000000
Binary files a/config.pyc and /dev/null differ
diff --git a/html/admin/app/Procedure.js b/html/admin/app/Procedure.js
new file mode 100755
index 0000000..d40c012
--- /dev/null
+++ b/html/admin/app/Procedure.js
@@ -0,0 +1,881 @@
+/**
+ * istSOS WebAdmin - Istituto Scienze della Terra
+ * Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+Ext.define('istsos.store.ObservationEditor', {
+    extend: 'Ext.data.Store',
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            proxy: {
+                type: 'memory',
+                reader: {
+                    type: 'array',
+                    idProperty: 'micro'
+                }
+            }
+        }, cfg)]);
+        this.addEvents('seriesupdated');
+    }
+});
+
+Ext.define('istsos.store.EditorQiStore', {
+    extend: 'Ext.data.Store',
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'editorQiStore',
+            fields: [
+            {
+                name: 'name'
+            },
+            {
+                name: 'description'
+            }
+            ]
+        }, cfg)]);
+    }
+});
+
+Ext.define('istsos.Sensor', {
+    extend: 'Ext.util.Observable',
+    service: null,
+    offering: null,
+    sensor: null,
+    beginPosition: null,
+    endPosition: null,
+    meta: null,
+    data: null,
+    store: null,
+    iso8601Field: 'iso8601',
+    visible: true,
+    color: "#000000",
+    configsections: {},
+    /**
+     * {Array} storeFields
+     * Array used to initialize an Ext.data.Model object.
+     * 
+     * storeFields = [
+     *   {
+     *       name: "micro",
+     *       type: "int"
+     *   },
+     *   {
+     *       name: "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601",
+     *       type: "string"
+     *   },
+     *   {
+     *       name: "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature",
+     *       type: "string"
+     *   }
+     * ]
+     * 
+     */
+    storeFields: [],
+    constructor: function(service, offering, sensor, config){
+        
+        if (Ext.isEmpty(service) || Ext.isEmpty(offering) || Ext.isEmpty(sensor) ) {
+            throw "Service, offering and sensor parameters are mandatory!"
+        }
+        
+        this.addEvents({
+            "metadataLoaded" : true,
+            "observationLoaded" : true,
+            "observationSaved" : true,
+            "colorchanged" : true,
+            "visibilitychanged" : true,
+            "aggregationchanged" : true
+        });
+        
+        this.service = service;
+        this.offering = offering;
+        this.sensor = sensor;
+        
+        Ext.applyIf(this, config);
+        this.callParent(arguments);
+        this._loadMetadata();
+        
+        
+    },
+    // can be an iso8601 date string, a Date object or microseconds in unix time
+    getObservation: function(from, to, tz, aggregateObj){
+        /*
+            [optional] 
+            aggregateObj = {
+                f: 'SUM', //aggregatefunction
+                i: 'SUM', //aggregateinterval
+                nd: '-999.9', //aggregatenodata
+                ndqi: '210' //aggregatenodataqi
+            }
+        */
+        
+        var params = {};
+        
+        var format = Ext.isEmpty(tz) ? "c": "Y-m-d\\TH:i:s";
+        
+        if (Ext.isDate(from)) {
+            from = Ext.Date.format(from,format);
+            if(!Ext.isEmpty(tz)){
+                from = from + (Ext.isString(tz) ? tz: istsos.utils.minutesToTz(tz));
+            }
+        }else if (Ext.isNumber(from)) {
+            if (Ext.isEmpty(tz)){
+                from = istsos.utils.micro2iso(from);
+            }else{
+                from = istsos.utils.micro2iso(from, (Ext.isString(tz) ? istsos.utils.minutesToTz(tz) : tz));
+            }
+            //from = istsos.utils.micro2iso(from);
+        }else{
+            // Check that is a valid string in iso format
+            var d = Ext.Date.parse(from,'c');
+            throw "Error in istsos.utils.getObservation";
+        }
+        
+        if (Ext.isDate(to)) {
+            to = Ext.Date.format(to,format);
+            if(!Ext.isEmpty(tz)){
+                to = to + (Ext.isString(tz) ? tz: istsos.utils.minutesToTz(tz));
+            }
+        }else if (Ext.isNumber(to)) {
+            if (Ext.isEmpty(tz)){
+                to = istsos.utils.micro2iso(to);
+            }else{
+                to = istsos.utils.micro2iso(to, (Ext.isString(tz) ? istsos.utils.minutesToTz(tz) : tz));
+            }
+        }else{
+            // Check that is a valid string in iso format
+            var d = Ext.Date.parse(to,'c');
+            throw "Error in istsos.utils.getObservation";
+        }
+        
+        
+        if (Ext.isObject(aggregateObj)){
+            params = Ext.apply(params,{
+                aggregatefunction: aggregateObj.f,
+                aggregateinterval: aggregateObj.i,
+                aggregatenodata: aggregateObj.nd,
+                aggregatenodataqi: aggregateObj.ndqi
+            });
+        }
+        
+        Ext.Ajax.request({
+            url: Ext.String.format(
+                '{0}/istsos/services/{1}/operations/getobservation/' +
+                'offerings/{2}/procedures/{3}/observedproperties/{4}/' +
+                'eventtime/{5}/{6}', wa.url, this.service,  this.offering,
+                this.sensor, this.getObservedProperties().join(','), from, to),
+            scope: this,
+            method: "GET",
+            params: params,
+            success: function(response){
+                var json = Ext.decode(response.responseText);
+                if (json.success) {
+                    for (var i = 0; i < json.data.length; i++) {
+                        if (json.data[i]['name']==this.sensor) {
+                            this.loadObservation(json.data[i]);
+                            break;
+                        }
+                    }
+                }
+            }
+        });
+        
+    },
+    loadObservation: function(data){
+        if (data['name']!=this.sensor) {
+            throw "wrong data object. The data belong to " + data['name'];
+        }
+        this.data = data;
+        var records = [], 
+        values = this.data['result']['DataArray']['values'],
+        field = this.data['result']['DataArray']['field'],
+        fieldIdx = {};
+        for (var f = 0; f < field.length; f++) {
+            fieldIdx[field[f]['definition']]=f;
+        }
+        for (var i = 0; i < values.length; i++) {
+            var row = [];
+            // Estrazione dei microsecondi dalla data
+            var micro = istsos.utils.iso2micro(values[i][0]);
+            row.push(micro, values[i][0]);
+            for (var f = 2; f < this.storeFields.length; f++) {
+                
+                var fieldName = this.storeConvertIdToField[this.storeFields[f]['name']];
+                row.push(parseFloat(values[i][fieldIdx[fieldName]]));
+                
+            //row.push(parseFloat(values[i][fieldIdx[this.storeFields[f]['name']]]));
+            }
+            records.push(row);
+        }
+        this.store.loadData(records);
+        this.fireEvent("observationLoaded", this);
+    },
+    insertObservation: function(){
+        var recs = this.store.getRange();
+        //var fields = this.storeFields;
+        var fields = this.data.result.DataArray.field;
+        var values = [];
+        for (var r = 0; r < recs.length; r++) {
+            var row = [];
+            for (var i = 0; i < fields.length; i++) {
+                
+                var def = fields[i].definition;
+                if (def == this.isodef) {
+                    row.push(istsos.utils.micro2iso(recs[r].get('micro')));
+                }else{
+                    row.push(""+(recs[r].get(this.storeConvertFieldToId[def])));
+                }
+                
+                /*
+                if (fields[i].name==this.iso8601Field) {
+                    continue;
+                }else if (fields[i].name=='micro') {
+                    row.push(istsos.utils.micro2iso(recs[r].get(fields[i].name)));
+                }else{
+                    row.push(""+(recs[r].get(fields[i].name)));
+                }*/
+            }
+            values.push(row);
+        }
+        this.data.result.DataArray.values = values;
+        this.data.result.DataArray.elementCount = ""+values.length;
+        this.data.samplingTime.beginPosition = istsos.utils.micro2iso(recs[0].get('micro'));
+        this.data.samplingTime.endPosition = istsos.utils.micro2iso(recs[recs.length-1].get('micro'));
+                
+        Ext.Ajax.request({
+            url: Ext.String.format('{0}/istsos/services/{1}/operations/insertobservation',wa.url,this.service),
+            scope: this,
+            method: "POST",
+            jsonData: {
+                "AssignedSensorId" : this.getId(),
+                "ForceInsert" : "true",
+                "Observation" : this.data
+            },
+            success: function(response){
+                var json = Ext.decode(response.responseText);
+                
+                this.commitModifications();
+                
+                this.fireEvent("observationSaved", this, json);
+            }
+        });
+        
+    },
+    rejectModifications: function(){
+        var recs = this.store.getUpdatedRecords();
+        for (var i = 0; i < recs.length; i++) {
+            recs[i].reject();
+        }
+    },
+    commitModifications: function(){
+        var recs = this.store.getUpdatedRecords();
+        for (var i = 0; i < recs.length; i++) {
+            recs[i].commit();
+        }
+    },
+    // This is a call to wa service for the describeSensor method
+    _loadMetadata: function(){
+        // First getting some sensors's service config
+        Ext.Ajax.request({          
+            url: Ext.String.format('{0}/istsos/services/{1}/configsections',wa.url,this.service),
+            scope: this,
+            method: "GET",
+            success: function(response){
+                var json = Ext.decode(response.responseText);
+                if (!json.success) {
+                    throw "Error retreiving general service config";
+                }
+                this.configsections = json.data;
+                this.isodef = this.configsections.urn.time;
+                Ext.Ajax.request({
+                    url: Ext.String.format('{0}/istsos/services/{1}/procedures/{2}',wa.url,this.service,this.sensor),
+                    scope: this,
+                    method: "GET",
+                    success: function(response){
+                        var json = Ext.decode(response.responseText);
+                        this.storeConvertFieldToId = ["'"+this.isodef+"': '"+this.iso8601Field+"'"];
+                        this.storeConvertIdToField = ["'"+this.iso8601Field+"': '"+this.isodef+"'"];
+                        if (json.success) {
+                            this.meta = json.data;
+                            // Configuring store fields
+                            this.storeFields = [{
+                                name: "micro", // Unixtime in µs
+                                type: 'int'
+                            },{
+                                name: this.iso8601Field,
+                                //name: this.isodef,
+                                type: 'string'
+                            }];
+                            for (var i = 1; i < this.meta.outputs.length; i++) {
+                                
+                                var one = Ext.id(), two = Ext.id();
+                                this.storeConvertFieldToId.push(
+                                    "'"+this.meta.outputs[i].definition+"': '"+one+"'",
+                                    "'"+this.meta.outputs[i].definition+":qualityIndex': '"+two+"'"
+                                    );
+                                this.storeConvertIdToField.push(
+                                    "'"+one+"': '"+this.meta.outputs[i].definition+"'",
+                                    "'"+two+"': '"+this.meta.outputs[i].definition+":qualityIndex"+"'"
+                                    );
+                                this.storeFields.push({
+                                    name: one,
+                                    type: 'float'
+                                },{
+                                    name: two,
+                                    type: 'float'
+                                });
+                            }
+                            this.storeConvertFieldToId = Ext.decode("{"+this.storeConvertFieldToId.join(',')+"}");
+                            this.storeConvertIdToField = Ext.decode("{"+this.storeConvertIdToField.join(',')+"}");
+                            
+                            Ext.define(this.service+'-'+this.sensor+'-model', {
+                                extend: 'Ext.data.Model',
+                                idProperty: "micro",
+                                fields: this.storeFields
+                            });
+                            this.storeId = Ext.id();
+                            this.store = Ext.create('istsos.store.ObservationEditor',{
+                                model: this.service+'-'+this.sensor+'-model',
+                                name: this.sensor
+                            });
+                            this.fireEvent("metadataLoaded", this);
+                        }
+                    }
+                });
+            }
+        });
+    },
+    getDuration: function(){
+        if (!Ext.isObject(this.data)) {
+            throw "Duration unknown. Observation object not loaded.";
+        }
+        return this.data["samplingTime"]["duration"]
+    },
+    getId: function(){
+        if (Ext.isEmpty(this.meta)) {
+            throw "Sensor metadata are not initialized at all!";
+        }
+        return this.meta['assignedSensorId'];
+    },
+    getName: function(){
+        return this.sensor;    
+    },
+    // return insitu-fixed-point, insitu-mobile-point or virtual
+    getSystemType: function(){
+        if (Ext.isEmpty(this.meta)) {
+            throw "Sensor metadata are not initialized at all!";
+        }
+        for (var i = 0; i < this.meta.classification.length; i++) {
+            if (this.meta.classification[i]['definition']=='urn:ogc:def:classifier:x-istsos:1.0:systemType') {
+                return this.meta.classification[i]['value'];
+            }
+        }
+    },
+    // The name of the sensor type
+    getSensorType: function(){
+        if (Ext.isEmpty(this.meta)) {
+            throw "Sensor metadata are not initialized at all!";
+        }
+        for (var i = 0; i < this.meta.classification.length; i++) {
+            if (this.meta.classification[i]['definition'].indexOf('urn:ogc:def:classifier:x-istsos:1.0:sensorType')) {
+                return this.meta.classification[i]['value'];
+            }
+        }
+    },
+    getGeoJSON: function(){
+        if (Ext.isEmpty(this.meta)) {
+            throw "Sensor metadata are not initialized at all!";
+        }
+        return this.meta['location']
+    },
+    getObservedProperties: function(){
+        var ret = [];
+        for (var i = 0; i < this.meta.outputs.length; i++) {
+            if (this.meta.outputs[i]['definition']!=this.isodef) {
+                ret.push(this.meta.outputs[i]['definition']);
+            }
+        }
+        return ret;
+    },
+    getObservedPropertiesName: function(){
+        var ret = [];
+        for (var i = 0; i < this.meta.outputs.length; i++) {
+            if (this.meta.outputs[i]['definition']!=this.isodef) {
+                ret.push(this.meta.outputs[i]['name']);
+            }
+        }
+        return ret;
+    },
+    getUomCode: function(definition){
+        for (var i = 0; i < this.meta.outputs.length; i++) {
+            if (this.meta.outputs[i]['definition']==definition) {
+                return this.meta.outputs[i]['uom'];
+            }
+        }
+    },
+    getBeginPosition: function(){
+        var ret = [];
+        for (var i = 0; i < this.meta.outputs.length; i++) {
+            if (this.meta.outputs[i]['definition']==this.isodef) {
+                if (Ext.isArray(this.meta.outputs[i]['constraint']['interval']) 
+                    && this.meta.outputs[i]['constraint']['interval'].length==2) {
+                    return this.meta.outputs[i]['constraint']['interval'][0];
+                }
+            }
+        }
+        return ret;
+    },
+    getEndPosition: function(){
+        var ret = [];
+        for (var i = 0; i < this.meta.outputs.length; i++) {
+            if (this.meta.outputs[i]['definition']==this.isodef) {
+                if (Ext.isArray(this.meta.outputs[i]['constraint']['interval']) 
+                    && this.meta.outputs[i]['constraint']['interval'].length==2) {
+                    return this.meta.outputs[i]['constraint']['interval'][1];
+                }
+            }
+        }
+        return ret;
+    },
+    getDefaultQI: function(){
+        return this.configsections.getobservation.defaultqi;
+    },
+    getDefaultNoData: function(){
+        return parseFloat(this.configsections.getobservation.aggregatenodata);
+    },
+    /*
+     * Change the color representing this procedure.
+     * If silent = true then the event will NOT be thrown
+     */
+    setColor: function(color, silent){
+        if (silent != true) {
+            silent = false;
+        }
+        var old = this.color;
+        this.color = color;
+        if (!silent && this.color != old) {
+            this.fireEvent("colorchanged", this, this.color, old);
+        }
+    },
+    getColor: function(){
+        return this.color;
+    },
+    /*
+     * Change the visibility of this procedure.
+     * If silent = true then the event will NOT be thrown
+     */
+    setVisibility: function(visible, silent){
+        if (silent != true) {
+            silent = false;
+        }
+        var old = this.visible;
+        this.visible = visible;
+        if (!silent && this.visible != old) {
+            this.fireEvent("visibilitychanged", this, this.visible);
+        }
+    },
+    getVisibility: function(){
+        return this.visible;
+    },
+    setAggregation: function(aggregation){
+        this.aggregation = aggregation;
+        this.fireEvent("aggregationchanged", this, this.aggregation);
+    }
+});
+
+Ext.define('istsos.utils', {
+    extend: 'Ext.util.Observable',
+    statics: {
+        // Convert microseconds number to isodate string
+        // If offset in minutes is not given UTC will be returned
+        micro2iso: function(m, offset){
+            
+            var offsetObj = new Date();
+            offsetObj.setHours(0);
+            offsetObj.setMinutes(0);
+            var sign = "+";
+            
+            var date = new Date(parseInt(m/1000));
+            var micro = parseFloat("0."+m);
+            
+            if (offset!=null) {
+                date.setUTCMinutes(date.getUTCMinutes()+offset);
+                if (offset<0) {
+                    sign = "-";
+                    offset = -1 * offset;
+                    offsetObj.setMinutes(offset);
+                }else{
+                    offsetObj.setMinutes(offset);
+                }
+            }
+            
+            var year = date.getUTCFullYear();
+            var month = (date.getUTCMonth()+1)<10?"0"+(date.getUTCMonth()+1):(date.getUTCMonth()+1);
+            var day = date.getUTCDate()<10?"0"+date.getUTCDate():date.getUTCDate();
+            var hour = date.getUTCHours()<10?"0"+date.getUTCHours():date.getUTCHours();
+            //hour = hour + offsetObj.getHours();
+            var minute = date.getUTCMinutes()<10?"0"+date.getUTCMinutes():date.getUTCMinutes();
+            //minute = minute + offsetObj.getMinutes();
+            
+            var second = date.getUTCSeconds()<10?"0"+date.getUTCSeconds():date.getUTCSeconds();
+            var micro = (""+parseFloat((""+(m/1000000)).replace(parseInt(m/1000000),"0"))).replace("0","");
+            
+            var tz = offset==null?"Z":sign+(offsetObj.getHours()<10?"0"+offsetObj.getHours():offsetObj.getHours())+(offsetObj.getMinutes()<10?"0"+offsetObj.getMinutes():offsetObj.getMinutes());
+            
+            return year + "-" + month + "-"  + day + "T" + hour+ ":" + minute + ":" + second + "" + micro + "" + tz;
+            
+        },
+        minutesToTz: function(offset){
+            if (Ext.isEmpty(offset)){
+                offset = (new Date()).getTimezoneOffset()/-60;
+            }
+            return (parseInt(offset)>=0?'+':'-') + this.pad(parseInt(offset)) + ':' + this.pad(Math.abs(((offset - parseInt(offset)) * 60 )));
+        },
+        tzToMinutes: function(tz){
+            var hm = tz.split(':');
+            return (parseInt(hm[0])*60) + parseInt(hm[1]);
+        },
+        validateTz: function (value){
+            /*
+                Validating TZ string:
+                Example: +02:00
+            */
+            var tz = "TZ format shall be +HH:MM";
+            if (value.length!=6) {
+                return tz;
+            }
+            if (value[0]!='-' && value[0]!='+') {
+                return tz;
+            }
+            if (value.indexOf(':')!=3){
+                return tz;
+            }
+            var h = parseInt( (value[1]+value[2]));
+            var m = parseInt( (value[4]+value[5]));
+            
+            if (h>23){
+                return tz;
+            }
+            if (m>59){
+                return tz;
+            }
+            return true;
+        },
+        pad: function(n){
+            if (n>=0 && n<10) {
+                return '0'+n;
+            }else if(n<0 && n>-10){
+                return '-0'+(-1*n);
+            }
+            return n;
+            // return n<10 ? '0'+n : n
+        },
+        // Extract microseconds from an isodate string 
+        //  > iso date with micro seconds: "2012-10-28T01:00:00.123456+0100"
+        //  > iso date with micro seconds: "2012-10-28T01:00:00+0100"
+        iso2micro: function(iso){
+            
+            // iso = "2012-10-28T00:50:00.123456+0100" | "2012-10-28T00:50:00+0100"
+            // iso = "2012-10-28T00:50:00.123456+0100" | "2012-10-28T00:50:00+01:00" << After OGC compl. tests
+            //                0      1     2        3          4        5
+            // splitted = ["2012", "10", "28", "00:50:00", "123456", "0100"]
+            // splitted = ["2012", "10", "28", "00:50:00", "0100"]
+            var splitted = iso.split(/[T]|[.]|[,]|[+]|[-]|[z]|[Z]/g);
+            
+            // Splitting hours
+            var hours = splitted[3].split(":");
+            
+            // Calculating offset
+            var hoffset = 0;
+            var moffset = 0;
+            if (iso.match(/[Z]/g)==null) { // Already UTC
+                
+                if (splitted[splitted.length-1].indexOf(":")>-1){
+                    splitted[splitted.length-1] = splitted[splitted.length-1].replace(":","");
+                }
+            
+                hoffset = parseInt(parseInt(splitted[splitted.length-1])/100);
+                moffset = parseInt(splitted[splitted.length-1]) - (hoffset*100);
+                if (iso.match(/[+]/g)==null) {
+                    hoffset = -1 * hoffset;
+                    moffset = -1 * moffset;
+                }
+            }
+            
+            var milli = Date.UTC(
+                parseInt(splitted[0]), // years
+                parseInt(splitted[1])-1, // months
+                parseInt(splitted[2]), // days
+                parseInt(hours[0])-hoffset, // hours
+                parseInt(hours[1])-moffset, // minutes
+                parseInt(hours[2]) // seconds
+                );
+                    
+            var match = iso.match(/[.]|[,]/g);
+            if (match != null && ( Ext.Array.contains(match, '.') || Ext.Array.contains(match, ','))) {
+                var micro = parseFloat("0."+splitted[4]);
+                
+                //console.log(istsos.utils.micro2iso((milli * 1000) + (micro * 1000000)));
+                return (milli * 1000) + (micro * 1000000);
+            } else {
+                //console.log(istsos.utils.micro2iso( milli*1000));
+                return milli*1000;
+            }
+            
+        },
+        getStore: function(procedure){
+            
+            var meta = procedure.meta;
+            var service = procedure.service;
+            var sensor = procedure.sensor;
+            
+            var storeFields = [{
+                name: "micro", // Tagliamo la testa al toro -> i mems misurano ogni mezzo millisecondo (500µs)!!
+                type: 'int'
+            },{
+                name: this.isodef,
+                type: 'string'
+            }];
+        
+            for (var i = 1; i < meta.outputs.length; i++) {
+                storeFields.push({
+                    name: meta.outputs[i].definition,
+                    type: 'float'
+                },{
+                    name: meta.outputs[i].definition+":qualityIndex",
+                    type: 'float'
+                });
+            }
+            
+            Ext.define(service+'-'+sensor+'-model', {
+                extend: 'Ext.data.Model',
+                idProperty: this.isodef,
+                fields: storeFields
+            });
+            
+            /*return Ext.create('istsos.store.ObservationEditor',{
+                model: service+'-'+sensor+'-model',
+                name: sensor
+            });*/
+            
+            return Ext.create('Ext.data.Store', {
+                model: service+'-'+sensor+'-model',
+                name: sensor,
+                proxy: {
+                    type: 'memory',
+                    reader: {
+                        type: 'array',
+                        idProperty: this.isodef
+                    }
+                }
+            });
+            
+        },
+        validatefilename: function(procedure, filename){
+            var tmp = filename.split(/[\\/]/);
+            if (tmp.length<2 || !Ext.isArray(tmp)) {
+                throw "File path error";
+            }
+            var ext  = tmp[tmp.length-1].split(".")[1];
+            if (ext != 'dat') {
+                throw "File extension wrong (must be *.dat)";
+            }
+            tmp = tmp[tmp.length-1].split(".")[0];
+            var ep = tmp.split("_");
+            if (ep.length<2 || !Ext.isArray(ep)) {
+                throw "File name format error";
+            }
+            ep = ep[ep.length-1];
+            // tmp = tmp.replace("_"+ep,"");
+            // Extracting the end position date
+            //  > date in file names are always in Greenwich time (GMT)
+            ep = Ext.Date.parse(ep+"0", "YmdHisZ");
+            // Checking File nema prefix must be equal the procedure name
+            if (tmp!=procedure.getName()) {
+                throw "File name format error, '" + tmp + "'"
+                + " is is not valid for '" + procedure.getName() + "' procedure";
+            }
+            return true;
+        },
+        parsecsvfile: function(procedure, fileList, filename, callback){
+            this.getParser().parsecsvfile(procedure, fileList, filename, function(progressEvent){
+                callback(istsos.utils.parsecsvstring(procedure, progressEvent.target.result));
+            });
+        },
+        // Return an object that can read the csv file and throw an event when finisched
+        getParser: function(){
+            return Ext.create('Ext.util.Observable', {
+                events: ['csvfileparsed'],
+                parsecsvfile: function(procedure, fileList, filename, callback){
+                    if (Ext.isFunction(callback)) {
+                        this.callback = callback;
+                    }else{
+                        delete this.callback;
+                    }
+                    var reader = new FileReader();
+                    try {
+                        for (var i = 0; i < fileList.length; i++) {
+                            reader.parser = this;
+                            reader.addEventListener('load', function (e) {
+                                if (Ext.isFunction(this.parser.callback)) {
+                                    this.parser.callback(e);
+                                }
+                                this.parser.fireEvent('csvfileparsed', e.target.result);
+                            }, false);     
+                            reader.readAsText(fileList[i]);
+                        }
+                    } catch (exception) { 
+                        Ext.Msg.alert('Warning', exception);           
+                    } 
+                }
+            });
+        },
+        // Convert microseconds number to isodate string
+        /*
+         * Parse a csv and return an object like this:
+         * {
+         *      "data": [
+         *          [
+         *              {
+         *                  "micro": 123234253456, // microseconds
+         *                  "urn:ogc:def:parameter:x-istsos::time:iso8601": "2012-12-09T14:12Z",
+         *                  "urn:ogc:def:parameter:x-istsos::foobar": "12.5",
+         *                  "urn:ogc:def:parameter:x-istsos::foobar:qualityIndex": "100"
+         *              },
+         *              ...
+         *          ]
+         *      ],
+         *      "total": 23,
+         *      "begin": "2012-12-09T14:12Z",
+         *      "end": "2012-12-10T14:00Z"
+         * }
+         */
+        parsecsvstring: function(procedure, csvstring){            
+            var lines = csvstring.split(/[\r\n|\n]+/);             
+            var ret = {
+                data: [],
+                header: ["micro"],
+                total: 0,
+                begin: null, 
+                end: null,
+                isregular: true,
+                timeresolutions: [],
+                timeresolutionscheck: []
+            }, header = lines[0].split(",");                
+            try {                
+                if (lines.length<2) {
+                    throw "CSV file contain less then the minimal 2 line (header + value)";
+                }
+                // Detecting procedure's observation properties order
+                var opcomposition = [];
+                var properties = procedure.meta.outputs;
+                for (c = 0; c < properties.length ; c++) {                    
+                    // Check if the output observed properties exist in the CSV
+                    if(!Ext.Array.contains(
+                        header, properties[c].definition) ){
+                        throw "CSV observed properties in header are not correct"
+                    }                    
+                    if (properties[c].definition == this.isodef) {
+                        opcomposition.push(properties[c].definition);
+                    }else{
+                        opcomposition.push(
+                            properties[c].definition,
+                            properties[c].definition+":qualityIndex"
+                            );
+                    }
+                }             
+                ret.header = ret.header.concat(opcomposition);
+                // Getting the time column position in the csv file
+                var idx = Ext.Array.indexOf(header, this.isodef);                
+                // csv begin position
+                var bp = Ext.Date.parse(lines[1].split(",")[idx],"c");                
+                // Get microseconds of first date
+                ret.begin = istsos.utils.iso2micro(lines[1].split(",")[idx]);                
+                // csv end position
+                var ep;
+                // reverse loop because sometimes last rows are empty
+                for(var c=(lines.length-1);c>0;c--) {
+                    if (lines[c].split(",").length==header.length) {
+                        ep = Ext.Date.parse(lines[c].split(",")[idx],"c");
+                        // Get microseconds of last date
+                        ret.end = istsos.utils.iso2micro(lines[1].split(",")[idx]);
+                        break;
+                    }
+                }
+                // statistics counters
+                var updated = 0, inserted = 0;
+                try {
+                    var idxStart=0;      
+                    var lastDate;
+                    for(c=1;c<lines.length;c++) { // start looping csv lines >>
+                        var row = [];
+                        var line = lines[c].split(",");
+                        // csv observed properties must be lenght exacly as 
+                        //   the procedure observed property 
+                        if (line.length!=header.length) {
+                            // Skip empty rows
+                            if (line.length==1 && line[0]=="") {
+                                continue;
+                            }
+                            throw ("Length mismatch from header definition");
+                        }
+                        for (var i = 0; i < opcomposition.length; i++) {
+                            // finding the observed property position in the csv
+                            idx = Ext.Array.indexOf(header, opcomposition[i]);      
+                            if (idx < 0) { // CSV does not have observed property
+                                if (opcomposition[i].indexOf(":qualityIndex")<0) {
+                                    // Quality index are not mandatory, other output obs.prop are mandatory
+                                    throw ("Mandatory procedures output observed property \"" + opcomposition[i] + "\" is not present in the CSV text");
+                                }
+                                row.push(parseInt(procedure.getDefaultQI()));
+                            }else{
+                                if (opcomposition[i]==this.isodef) { // If isodate field
+                                    var micro = istsos.utils.iso2micro(line[idx]);
+                                    //var date = Ext.Date.parse(line[idx],"c");
+                                    row.push(micro, line[idx]);
+                                    // Prepare info about time resolutions of this timeseries
+                                    if (lastDate) {
+                                        var delta = micro - lastDate;
+                                        if (!Ext.Array.contains(ret.timeresolutions, delta)) {
+                                            ret.isregular = false;
+                                            ret.timeresolutions.push(delta);
+                                            ret.timeresolutionscheck.push(line[idx]);
+                                        }
+                                    }
+                                    lastDate = micro;
+                                }else{
+                                    if(line[idx]!=''){ // All other observed properties
+                                        row.push(parseFloat(line[idx]));
+                                    }
+                                }
+                            }
+                        }
+                        ret.total += 1;
+                        ret.data.push(row);
+                    }
+                } catch (exception) { 
+                    throw "Riga [" + (c+1) + "]:" + exception;
+                }
+            } catch (exception) { 
+                Ext.Msg.alert('Warning', exception);   
+            }
+            return ret;
+        }
+    }
+});
diff --git a/interface/app/data/cmbcapabilities.json b/html/admin/app/data/cmbcapabilities.json
similarity index 100%
rename from interface/app/data/cmbcapabilities.json
rename to html/admin/app/data/cmbcapabilities.json
diff --git a/interface/app/data/cmbcapabilitiesuom.json b/html/admin/app/data/cmbcapabilitiesuom.json
similarity index 100%
rename from interface/app/data/cmbcapabilitiesuom.json
rename to html/admin/app/data/cmbcapabilitiesuom.json
diff --git a/interface/app/data/cmbdocumentformat.json b/html/admin/app/data/cmbdocumentformat.json
similarity index 100%
rename from interface/app/data/cmbdocumentformat.json
rename to html/admin/app/data/cmbdocumentformat.json
diff --git a/interface/app/data/cmbepsg.json b/html/admin/app/data/cmbepsg.json
similarity index 100%
rename from interface/app/data/cmbepsg.json
rename to html/admin/app/data/cmbepsg.json
diff --git a/interface/app/data/cmbidentification.json b/html/admin/app/data/cmbidentification.json
similarity index 100%
rename from interface/app/data/cmbidentification.json
rename to html/admin/app/data/cmbidentification.json
diff --git a/interface/app/data/cmbobservedproperties.json b/html/admin/app/data/cmbobservedproperties.json
similarity index 100%
rename from interface/app/data/cmbobservedproperties.json
rename to html/admin/app/data/cmbobservedproperties.json
diff --git a/interface/app/data/cmbphenomenon.json b/html/admin/app/data/cmbphenomenon.json
similarity index 100%
rename from interface/app/data/cmbphenomenon.json
rename to html/admin/app/data/cmbphenomenon.json
diff --git a/interface/app/data/cmbsystemtype.json b/html/admin/app/data/cmbsystemtype.json
similarity index 100%
rename from interface/app/data/cmbsystemtype.json
rename to html/admin/app/data/cmbsystemtype.json
diff --git a/interface/app/data/cmbuom.json b/html/admin/app/data/cmbuom.json
similarity index 100%
rename from interface/app/data/cmbuom.json
rename to html/admin/app/data/cmbuom.json
diff --git a/interface/app/data/fakeOfferings.json b/html/admin/app/data/fakeOfferings.json
similarity index 100%
rename from interface/app/data/fakeOfferings.json
rename to html/admin/app/data/fakeOfferings.json
diff --git a/interface/app/data/procedure.json b/html/admin/app/data/procedure.json
similarity index 100%
rename from interface/app/data/procedure.json
rename to html/admin/app/data/procedure.json
diff --git a/interface/app/engine/pageConfig.js b/html/admin/app/engine/pageConfig.js
similarity index 100%
rename from interface/app/engine/pageConfig.js
rename to html/admin/app/engine/pageConfig.js
diff --git a/interface/app/engine/pageManager.js b/html/admin/app/engine/pageManager.js
similarity index 100%
rename from interface/app/engine/pageManager.js
rename to html/admin/app/engine/pageManager.js
diff --git a/interface/app/engine/wa.js b/html/admin/app/engine/wa.js
similarity index 100%
rename from interface/app/engine/wa.js
rename to html/admin/app/engine/wa.js
diff --git a/html/admin/app/store/AggregateFunctionStore.js b/html/admin/app/store/AggregateFunctionStore.js
new file mode 100755
index 0000000..5bdd7ba
--- /dev/null
+++ b/html/admin/app/store/AggregateFunctionStore.js
@@ -0,0 +1,52 @@
+/*
+ * File: app/store/AggregateFunctionStore.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.AggregateFunctionStore', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'aggregatefunctionstore',
+            data: [
+                [
+                    'AVG'
+                ],
+                [
+                    'SUM'
+                ],
+                [
+                    'COUNT'
+                ],
+                [
+                    'MAX'
+                ],
+                [
+                    'MIN'
+                ]
+            ],
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'array',
+                    idProperty: 'name'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/Constraint.js b/html/admin/app/store/Constraint.js
new file mode 100755
index 0000000..305e600
--- /dev/null
+++ b/html/admin/app/store/Constraint.js
@@ -0,0 +1,60 @@
+/*
+ * File: app/store/Constraint.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.Constraint', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'constraint',
+            data: [
+                {
+                    name: ' -- ',
+                    'value': 0
+                },
+                {
+                    'name': 'Greater then',
+                    'value': 1
+                },
+                {
+                    'name': 'Less then',
+                    'value': 2
+                },
+                {
+                    'name': 'Between',
+                    'value': 3
+                },
+                {
+                    'name': 'Value list',
+                    'value': 4
+                },
+                
+            ],
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name'
+                },
+                {
+                    name: 'value'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/DataQualityStore.js b/html/admin/app/store/DataQualityStore.js
new file mode 100755
index 0000000..b88b2aa
--- /dev/null
+++ b/html/admin/app/store/DataQualityStore.js
@@ -0,0 +1,40 @@
+/*
+ * File: app/store/DataQualityStore.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.DataQualityStore', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'dataQualityStore',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name'
+                },
+                {
+                    name: 'code'
+                },
+                {
+                    name: 'description'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/Fake.js b/html/admin/app/store/Fake.js
new file mode 100755
index 0000000..0f096de
--- /dev/null
+++ b/html/admin/app/store/Fake.js
@@ -0,0 +1,41 @@
+/*
+ * File: app/store/Fake.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.Fake', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'fake',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name'
+                },
+                {
+                    name: 'value'
+                },
+                {
+                    name: 'definition',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/MyArrayStore.js b/html/admin/app/store/MyArrayStore.js
new file mode 100755
index 0000000..9fde83b
--- /dev/null
+++ b/html/admin/app/store/MyArrayStore.js
@@ -0,0 +1,29 @@
+/*
+ * File: app/store/MyArrayStore.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.MyArrayStore', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'MyArrayStore',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'array',
+                    idProperty: 'xx'
+                }
+            }
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/MyJsonStore23.js b/html/admin/app/store/MyJsonStore23.js
new file mode 100755
index 0000000..29c09c0
--- /dev/null
+++ b/html/admin/app/store/MyJsonStore23.js
@@ -0,0 +1,28 @@
+/*
+ * File: app/store/MyJsonStore23.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.MyJsonStore23', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'MyJsonStore23',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json'
+                }
+            }
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/Observations.js b/html/admin/app/store/Observations.js
new file mode 100755
index 0000000..baf24fd
--- /dev/null
+++ b/html/admin/app/store/Observations.js
@@ -0,0 +1,42 @@
+/*
+ * File: app/store/Observations.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.Observations', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'observations',
+            proxy: {
+                type: 'ajax',
+                url: 'data/observations.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'isodate',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    dateFormat: 'c',
+                    name: 'isodate',
+                    type: 'date'
+                },
+                {
+                    name: 'value',
+                    type: 'float'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/ObservedProperties.js b/html/admin/app/store/ObservedProperties.js
new file mode 100755
index 0000000..23ce2fd
--- /dev/null
+++ b/html/admin/app/store/ObservedProperties.js
@@ -0,0 +1,49 @@
+/*
+ * File: app/store/ObservedProperties.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.ObservedProperties', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'observedproperties',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    name: 'uom',
+                    type: 'string'
+                },
+                {
+                    name: 'definition',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/Offerings.js b/html/admin/app/store/Offerings.js
new file mode 100755
index 0000000..ae75e9a
--- /dev/null
+++ b/html/admin/app/store/Offerings.js
@@ -0,0 +1,42 @@
+/*
+ * File: app/store/Offerings.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.Offerings', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'offerings',
+            proxy: {
+                type: 'ajax',
+                url: 'data/offerings.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'name',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/Procedures.js b/html/admin/app/store/Procedures.js
new file mode 100755
index 0000000..68c3adc
--- /dev/null
+++ b/html/admin/app/store/Procedures.js
@@ -0,0 +1,41 @@
+/*
+ * File: app/store/Procedures.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.Procedures', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'procedures',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    idProperty: 'name',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/RatingCurve.js b/html/admin/app/store/RatingCurve.js
new file mode 100755
index 0000000..3f0b1bf
--- /dev/null
+++ b/html/admin/app/store/RatingCurve.js
@@ -0,0 +1,62 @@
+/*
+ * File: app/store/RatingCurve.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.RatingCurve', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'ratingcurve',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json'
+                }
+            },
+            fields: [
+                {
+                    name: 'from',
+                    type: 'date'
+                },
+                {
+                    name: 'to',
+                    type: 'date'
+                },
+                {
+                    name: 'low_val',
+                    type: 'float'
+                },
+                {
+                    name: 'up_val',
+                    type: 'float'
+                },
+                {
+                    name: 'A',
+                    type: 'float'
+                },
+                {
+                    name: 'B',
+                    type: 'float'
+                },
+                {
+                    name: 'C',
+                    type: 'float'
+                },
+                {
+                    name: 'K',
+                    type: 'float'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/Services.js b/html/admin/app/store/Services.js
new file mode 100755
index 0000000..49e28ba
--- /dev/null
+++ b/html/admin/app/store/Services.js
@@ -0,0 +1,41 @@
+/*
+ * File: app/store/Services.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.Services', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'storeServices',
+            proxy: {
+                type: 'ajax',
+                url: '/istsos/wa/istsos/services',
+                reader: {
+                    type: 'json',
+                    idProperty: 'service',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'service',
+                    type: 'string'
+                },
+                {
+                    name: 'path',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/cmbDocumentFormat.js b/html/admin/app/store/cmbDocumentFormat.js
new file mode 100755
index 0000000..c29d586
--- /dev/null
+++ b/html/admin/app/store/cmbDocumentFormat.js
@@ -0,0 +1,41 @@
+/*
+ * File: app/store/cmbDocumentFormat.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.cmbDocumentFormat', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'cmbdocumentformat',
+            proxy: {
+                type: 'ajax',
+                url: 'app/data/cmbdocumentformat.json',
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'extension',
+                    type: 'string'
+                },
+                {
+                    name: 'format',
+                    sortType: 'asText',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/cmbIdentification.js b/html/admin/app/store/cmbIdentification.js
new file mode 100755
index 0000000..d5d784e
--- /dev/null
+++ b/html/admin/app/store/cmbIdentification.js
@@ -0,0 +1,41 @@
+/*
+ * File: app/store/cmbIdentification.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.cmbIdentification', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'identification',
+            proxy: {
+                type: 'ajax',
+                url: 'app/data/cmbIdentification.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'definition',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/cmbName.js b/html/admin/app/store/cmbName.js
new file mode 100755
index 0000000..a26f461
--- /dev/null
+++ b/html/admin/app/store/cmbName.js
@@ -0,0 +1,37 @@
+/*
+ * File: app/store/cmbName.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.cmbName', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'cmbname',
+            proxy: {
+                type: 'ajax',
+                url: 'app/data/cmbsystemtype.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/cmbNameDescription.js b/html/admin/app/store/cmbNameDescription.js
new file mode 100755
index 0000000..53dfe7a
--- /dev/null
+++ b/html/admin/app/store/cmbNameDescription.js
@@ -0,0 +1,41 @@
+/*
+ * File: app/store/cmbNameDescription.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.cmbNameDescription', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'namedescription',
+            proxy: {
+                type: 'ajax',
+                url: 'app/data/cmbsystemtype.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/cmbSml.js b/html/admin/app/store/cmbSml.js
new file mode 100755
index 0000000..ece62db
--- /dev/null
+++ b/html/admin/app/store/cmbSml.js
@@ -0,0 +1,53 @@
+/*
+ * File: app/store/cmbSml.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.cmbSml', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'cmbsml',
+            proxy: {
+                type: 'ajax',
+                url: 'app/data/cmbIdentification.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    name: 'definition',
+                    type: 'string'
+                },
+                {
+                    name: 'uom',
+                    type: 'string'
+                },
+                {
+                    name: 'value',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/cmbSystemType.js b/html/admin/app/store/cmbSystemType.js
new file mode 100755
index 0000000..711d4ae
--- /dev/null
+++ b/html/admin/app/store/cmbSystemType.js
@@ -0,0 +1,38 @@
+/*
+ * File: app/store/cmbSystemType.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.cmbSystemType', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            autoLoad: true,
+            storeId: 'systemtype',
+            proxy: {
+                type: 'ajax',
+                url: 'app/data/cmbsystemtype.json',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/gridDocumentation.js b/html/admin/app/store/gridDocumentation.js
new file mode 100755
index 0000000..c0ca47f
--- /dev/null
+++ b/html/admin/app/store/gridDocumentation.js
@@ -0,0 +1,48 @@
+/*
+ * File: app/store/gridDocumentation.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.gridDocumentation', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'griddocumentation',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    dateFormat: 'Y-m-d',
+                    name: 'date',
+                    type: 'date'
+                },
+                {
+                    name: 'format',
+                    type: 'string'
+                },
+                {
+                    name: 'link',
+                    type: 'string'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/gridObservedProperties.js b/html/admin/app/store/gridObservedProperties.js
new file mode 100755
index 0000000..a3a4d2f
--- /dev/null
+++ b/html/admin/app/store/gridObservedProperties.js
@@ -0,0 +1,53 @@
+/*
+ * File: app/store/gridObservedProperties.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.gridObservedProperties', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'gridobservedproperties',
+            proxy: {
+                type: 'ajax',
+                url: '',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'definition',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    name: 'procedures',
+                    type: 'string'
+                },
+                {
+                    name: 'constraint'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/gridOfferings.js b/html/admin/app/store/gridOfferings.js
new file mode 100755
index 0000000..3e66f69
--- /dev/null
+++ b/html/admin/app/store/gridOfferings.js
@@ -0,0 +1,54 @@
+/*
+ * File: app/store/gridOfferings.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.gridOfferings', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'gridofferings',
+            proxy: {
+                type: 'ajax',
+                url: '',
+                reader: {
+                    type: 'json',
+                    idProperty: 'name',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    name: 'procedures'
+                },
+                {
+                    dateFormat: 'c',
+                    name: 'expiration',
+                    type: 'date'
+                },
+                {
+                    name: 'active',
+                    type: 'boolean'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/gridOutputs.js b/html/admin/app/store/gridOutputs.js
new file mode 100755
index 0000000..8c62e4d
--- /dev/null
+++ b/html/admin/app/store/gridOutputs.js
@@ -0,0 +1,70 @@
+/*
+ * File: app/store/gridOutputs.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.gridOutputs', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'gridoutputs',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    name: 'definition',
+                    type: 'string'
+                },
+                {
+                    name: 'uom',
+                    type: 'string'
+                },
+                {
+                    name: 'value',
+                    type: 'string'
+                },
+                {
+                    name: 'role'
+                },
+                {
+                    name: 'from',
+                    type: 'string'
+                },
+                {
+                    name: 'to',
+                    type: 'string'
+                },
+                {
+                    name: 'list',
+                    type: 'string'
+                },
+                {
+                    name: 'ctype'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/gridProceduresList.js b/html/admin/app/store/gridProceduresList.js
new file mode 100755
index 0000000..0cf081a
--- /dev/null
+++ b/html/admin/app/store/gridProceduresList.js
@@ -0,0 +1,57 @@
+/*
+ * File: app/store/gridProceduresList.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.gridProceduresList', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'procedurelist',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    idProperty: 'name',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'sensortype',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'offerings'
+                },
+                {
+                    name: 'observedproperties'
+                },
+                {
+                    name: 'samplingTime',
+                    type: 'auto'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/gridUoms.js b/html/admin/app/store/gridUoms.js
new file mode 100755
index 0000000..b5b3542
--- /dev/null
+++ b/html/admin/app/store/gridUoms.js
@@ -0,0 +1,45 @@
+/*
+ * File: app/store/gridUoms.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.gridUoms', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'griduoms',
+            proxy: {
+                type: 'ajax',
+                url: '',
+                reader: {
+                    type: 'json',
+                    idProperty: 'definition',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    type: 'string'
+                },
+                {
+                    name: 'procedures'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/serverstatus.js b/html/admin/app/store/serverstatus.js
new file mode 100755
index 0000000..82fc0fd
--- /dev/null
+++ b/html/admin/app/store/serverstatus.js
@@ -0,0 +1,85 @@
+/*
+ * File: app/store/serverstatus.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.serverstatus', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'serverstatus',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    idProperty: 'service',
+                    messageProperty: 'message',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'getcapabilities',
+                    type: 'boolean'
+                },
+                {
+                    name: 'featuresOfInterest',
+                    type: 'int'
+                },
+                {
+                    name: 'describesensor',
+                    type: 'boolean'
+                },
+                {
+                    name: 'getobservation',
+                    type: 'boolean'
+                },
+                {
+                    name: 'service',
+                    type: 'string'
+                },
+                {
+                    name: 'database',
+                    type: 'string'
+                },
+                {
+                    name: 'availability',
+                    type: 'string'
+                },
+                {
+                    name: 'offerings',
+                    type: 'int'
+                },
+                {
+                    name: 'getfeatureofinterest',
+                    type: 'boolean'
+                },
+                {
+                    name: 'registersensor',
+                    type: 'boolean'
+                },
+                {
+                    name: 'procedures',
+                    type: 'int'
+                },
+                {
+                    name: 'observedProperties',
+                    type: 'int'
+                },
+                {
+                    name: 'insertobservation',
+                    type: 'boolean'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/store/vplist.js b/html/admin/app/store/vplist.js
new file mode 100755
index 0000000..20426bf
--- /dev/null
+++ b/html/admin/app/store/vplist.js
@@ -0,0 +1,43 @@
+/*
+ * File: app/store/vplist.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.store.vplist', {
+    extend: 'Ext.data.Store',
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'vplist',
+            proxy: {
+                type: 'ajax',
+                reader: {
+                    type: 'json',
+                    idProperty: 'name',
+                    root: 'data'
+                }
+            },
+            fields: [
+                {
+                    name: 'name',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'offerings'
+                },
+                {
+                    name: 'observedproperties'
+                }
+            ]
+        }, cfg)]);
+    }
+});
\ No newline at end of file
diff --git a/interface/app/view/BasePage.js b/html/admin/app/view/BasePage.js
similarity index 100%
rename from interface/app/view/BasePage.js
rename to html/admin/app/view/BasePage.js
diff --git a/interface/app/view/Calc.js b/html/admin/app/view/Calc.js
similarity index 100%
rename from interface/app/view/Calc.js
rename to html/admin/app/view/Calc.js
diff --git a/interface/app/view/Chart.js b/html/admin/app/view/Chart.js
similarity index 100%
rename from interface/app/view/Chart.js
rename to html/admin/app/view/Chart.js
diff --git a/interface/app/view/ChartContainer.js b/html/admin/app/view/ChartContainer.js
similarity index 100%
rename from interface/app/view/ChartContainer.js
rename to html/admin/app/view/ChartContainer.js
diff --git a/interface/app/view/CheckColumn.js b/html/admin/app/view/CheckColumn.js
similarity index 100%
rename from interface/app/view/CheckColumn.js
rename to html/admin/app/view/CheckColumn.js
diff --git a/interface/app/view/Editor1.js b/html/admin/app/view/Editor1.js
similarity index 100%
rename from interface/app/view/Editor1.js
rename to html/admin/app/view/Editor1.js
diff --git a/interface/app/view/FormDataQuality.js b/html/admin/app/view/FormDataQuality.js
similarity index 100%
rename from interface/app/view/FormDataQuality.js
rename to html/admin/app/view/FormDataQuality.js
diff --git a/interface/app/view/FormPaths.js b/html/admin/app/view/FormPaths.js
similarity index 100%
rename from interface/app/view/FormPaths.js
rename to html/admin/app/view/FormPaths.js
diff --git a/interface/app/view/MainMenu.js b/html/admin/app/view/MainMenu.js
similarity index 100%
rename from interface/app/view/MainMenu.js
rename to html/admin/app/view/MainMenu.js
diff --git a/html/admin/app/view/MainMenu2.js b/html/admin/app/view/MainMenu2.js
new file mode 100755
index 0000000..d09a8ee
--- /dev/null
+++ b/html/admin/app/view/MainMenu2.js
@@ -0,0 +1,316 @@
+Ext.define('istsos.view.MainMenu2', {
+    extend: 'istsos.view.ui.MainMenu2',
+
+    initComponent: function() {
+        var me = this;
+        this.btnTemplate = new Ext.Template([
+            '<div class="submenuIcon">',
+            '<img src="images/menu/{icon}" width="46"/>',
+            '<div style="padding-top: 4px;">',
+            '{name}',
+            '</div>',
+            '</div>',
+            ]);
+        this.btnTemplate.compile();
+        
+        me.callParent(arguments);
+        
+        
+        Ext.Ajax.request({
+            url: Ext.String.format('{0}/istsos/operations/initialization',wa.url),
+            scope: this,
+            method: 'GET',
+            success: function(response){
+                var json = Ext.decode(response.responseText);
+                if (parseInt(json.data.level)>0) {
+                    //if (false) {
+                    Ext.getCmp('submenu').expand();
+                    this.loadServiceMenu();
+                    
+                }else{
+                    istsos.engine.pageManager.openWaPage({
+                        istService: "default",
+                        wizardName: "newservice",
+                        wapage: 'WizardPage'
+                    });
+                    Ext.getCmp('submenu').collapse();
+                }
+            }
+        });
+        
+        
+        // Registering click event on Server/Default button
+        
+        Ext.getCmp('menuServer').on("click",function(){
+            
+            var mainCenter = Ext.getCmp("mainCenter"), items = [];
+            mainCenter.removeAll(true);
+            
+            for (var h in istsos.engine.defaultConfig){
+                for (var l in istsos.engine.defaultConfig[h]){
+                    items.push(this.createSubButton({
+                        "name": l,
+                        "icon": istsos.engine.defaultConfig[h][l]['icon'],
+                        "istConfig": istsos.engine.defaultConfig[h][l]
+                    }));
+                }
+            }
+            
+            var sub = Ext.getCmp("submenu");
+            sub.removeAll();
+            var cmps = sub.add(items);
+            
+            var time = 250;
+            
+            for (var i = 0; i < cmps.length; i++) {
+                
+                //console.dir(cmps[i]);
+                
+                var el = cmps[i].getEl();
+                /*el.fadeIn({
+                    duration: time,
+                    easing: null
+                });*/
+                
+                el.on("click",function(e, t, eOpts){
+                    for (var c = 0; c < cmps.length; c++) {
+                        cmps[c].removeCls('submenuSelect');
+                    }
+                    this.addClass('submenuSelect');
+                    
+                    
+                    var conf = Ext.apply({
+                        istService: "default"
+                    },this.istConfig);
+                
+                    /*var conf = {
+                        istService: "default"
+                    };*/
+                    
+                    var url;
+                    if (Ext.isObject(conf.istOperation)) {
+                        url = conf.istOperation.restUrl;
+                        if (url.indexOf("@")>0) {
+                            conf.istOperation.restUrl = url.replace("@", istService);
+                        }
+                    }else if (Ext.isString(conf.istOperation)) {
+                        url = conf.istOperation;
+                        if (url.indexOf("@")>0) {
+                            conf.istOperation = url.replace("@", istService);
+                        }
+                    }
+                    
+                    istsos.engine.pageManager.openWaPage(conf);
+                    
+                },cmps[i]);
+                
+                time += 250;
+            }
+        },this);
+        
+        
+        Ext.getCmp('btnObservations').on("click",function(){
+            
+            var mainCenter = Ext.getCmp("mainCenter");
+            mainCenter.removeAll(true);
+            
+            var items = []
+            for (var h in istsos.engine.observationConfig){
+                for (var l in istsos.engine.observationConfig[h]){
+                    items.push(this.createSubButton({
+                        "name": l,
+                        "icon": istsos.engine.observationConfig[h][l]['icon'],
+                        "istConfig": istsos.engine.observationConfig[h][l]
+                    }));
+                }
+            }
+            
+            var sub = Ext.getCmp("submenu");
+            sub.removeAll();
+            if (items.length==1) {
+                items[0]['flex']=null;
+                items.push({
+                    xtype: 'container',
+                    id: 'imnotabutton',
+                    margin: '4 4 0 4',
+                    html: "",
+                    flex: 1,
+                    style: 'opacity: 0;'
+                });
+            }
+            var cmps = sub.add(items);
+            
+            var time = 250;
+            
+            for (var i = 0; i < cmps.length; i++) {
+                //console.dir(cmps[i]);
+                if (cmps[i].getId()!='imnotabutton') {
+                    var el = cmps[i].getEl();
+                    el.fadeIn({
+                        duration: time,
+                        easing: null
+                    
+                    });
+                    el.on("click",function(e, t, eOpts){
+                        for (var c = 0; c < cmps.length; c++) {
+                            cmps[c].removeCls('submenuSelect');
+                        }
+                        this.addClass('submenuSelect');
+                        var conf = Ext.apply({
+                            istService: "default"
+                        },this.istConfig);
+                        var url;
+                        if (Ext.isObject(conf.istOperation)) {
+                            url = conf.istOperation.restUrl;
+                            if (url.indexOf("@")>0) {
+                                conf.istOperation.restUrl = url.replace("@", istService);
+                            }
+                        }else if (Ext.isString(conf.istOperation)) {
+                            url = conf.istOperation;
+                            if (url.indexOf("@")>0) {
+                                conf.istOperation = url.replace("@", istService);
+                            }
+                        }
+                        istsos.engine.pageManager.openWaPage(conf);
+                    },cmps[i]);
+                    time += 250;
+                }
+            }
+        },this);
+        
+        
+        Ext.getCmp('btnStatus').on("click",function(){
+            if (this.status){
+                this.status.focus();
+            }else{
+                this.status = window.open("../modules/status", 'status', "location=no, menubar=no, status=no");
+            }
+        },this);
+        
+    },
+    showMask: function(msg){
+        if (!Ext.isEmpty(this.mask)) {
+            this.mask.hide();
+        }
+        this.mask = new Ext.LoadMask(Ext.getCmp('mainCenter').body, {
+            msg: msg
+        });
+        this.mask.show();
+    },
+    hideMask: function(){
+        if (!Ext.isEmpty(this.mask)) {
+            this.mask.hide();
+        }
+    }, 
+    createSubButton: function(conf){
+        return {
+            xtype: 'container',
+            margin: '4 4 0 4',
+            html: this.btnTemplate.apply(conf),
+            istConfig: conf['istConfig'],
+            width: 60,
+            flex: 1,
+            //style: 'opacity: 0;',
+            overCls: 'submenuOver',
+            componentCls: 'submenu'
+        //styleHtmlCls: 'submenuContent'
+        }
+    },
+    loadServiceMenu: function(){
+        Ext.Ajax.request({
+            url: Ext.String.format('{0}/istsos/services', wa.url),
+            scope: this,
+            method: 'GET',
+            success: function(response){
+                var json = Ext.decode(response.responseText);
+                if (json.success) {
+                    var menu = Ext.getCmp("menuServices");
+                    menu.removeAll();
+                    var items = [];
+                    for (var i = 0; i < json.total; i++) {
+                        items.push({
+                            text: json.data[i].service,
+                            istConfig: json.data[i],
+                            iconCls: 'service_menu'
+                        });
+                    }
+                    var cmp = menu.add(items);
+                    for (i = 0; i < cmp.length; i++) {
+                        cmp[i].on("click",function(btn, e, eOpts){
+                            
+                            var mainCenter = Ext.getCmp("mainCenter");
+                            mainCenter.removeAll(true);
+                            this.loadServiceButtons(btn.istConfig);
+                            Ext.getCmp('btnService').toggle(true,true);
+                        },this)
+                    }
+                }else{
+                                    
+                }
+            }
+        });
+        Ext.getCmp('menuServer').fireEvent("click");
+        istsos.engine.pageManager.openWaPage(istsos.engine.defaultConfig.Server.Status);
+    },
+    loadServiceButtons: function(istConfig){
+        
+        var mainCenter = Ext.getCmp("mainCenter");
+        mainCenter.removeAll(true);
+        
+        var items = [];
+        
+        for (var h in istsos.engine.serviceConfig){
+            for (var l in istsos.engine.serviceConfig[h]){
+                items.push(this.createSubButton({
+                    "name": l,
+                    "icon": istsos.engine.serviceConfig[h][l]['icon'],
+                    "istConfig": istsos.engine.serviceConfig[h][l]
+                }));
+            }
+        }
+            
+        var sub = Ext.getCmp("submenu");
+        sub.removeAll();
+        var cmps = sub.add(items);
+            
+        var time = 250;
+            
+        for (var i = 0; i < cmps.length; i++) {
+                
+            var el = cmps[i].getEl();
+            el.fadeIn({
+                duration: time,
+                //easing: 'elasticIn'
+                //easing: 'ease'
+                //easing: 'easeInOut'
+                //easing: 'backIn'
+                easing: null
+            });
+                
+            el.on("click",function(e, t, eOpts){
+                for (var c = 0; c < cmps.length; c++) {
+                    cmps[c].removeCls('submenuSelect');
+                }
+                this.addClass('submenuSelect');
+                var conf = Ext.apply({
+                    istService: istConfig.service
+                },this.istConfig);
+                var url;
+                if (Ext.isObject(conf.istOperation)) {
+                    url = conf.istOperation.restUrl;
+                    if (url.indexOf("@")>0) {
+                        conf.istOperation.restUrl = url.replace("@", istConfig.service);
+                    }
+                }else if (Ext.isString(conf.istOperation)) {
+                    url = conf.istOperation;
+                    if (url.indexOf("@")>0) {
+                        conf.istOperation = url.replace("@", istConfig.service);
+                    }
+                }
+                istsos.engine.pageManager.openPage(conf);
+            },cmps[i]);
+            time += 250;
+            
+        }
+    }
+});
diff --git a/interface/app/view/MainPanel.js b/html/admin/app/view/MainPanel.js
similarity index 100%
rename from interface/app/view/MainPanel.js
rename to html/admin/app/view/MainPanel.js
diff --git a/interface/app/view/MyGridPanel15.js b/html/admin/app/view/MyGridPanel15.js
similarity index 100%
rename from interface/app/view/MyGridPanel15.js
rename to html/admin/app/view/MyGridPanel15.js
diff --git a/interface/app/view/ObservationEditor.js b/html/admin/app/view/ObservationEditor.js
similarity index 100%
rename from interface/app/view/ObservationEditor.js
rename to html/admin/app/view/ObservationEditor.js
diff --git a/interface/app/view/ObservationEditorAdvancedOperations.js b/html/admin/app/view/ObservationEditorAdvancedOperations.js
similarity index 100%
rename from interface/app/view/ObservationEditorAdvancedOperations.js
rename to html/admin/app/view/ObservationEditorAdvancedOperations.js
diff --git a/interface/app/view/ObservationEditorColumn.js b/html/admin/app/view/ObservationEditorColumn.js
similarity index 100%
rename from interface/app/view/ObservationEditorColumn.js
rename to html/admin/app/view/ObservationEditorColumn.js
diff --git a/html/admin/app/view/ProcedureChart.js b/html/admin/app/view/ProcedureChart.js
new file mode 100755
index 0000000..26caa07
--- /dev/null
+++ b/html/admin/app/view/ProcedureChart.js
@@ -0,0 +1,677 @@
+/**
+ * istSOS WebAdmin - Istituto Scienze della Terra
+ * Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+Ext.define('istsos.view.ProcedureChart', {
+    extend: 'istsos.view.ui.ProcedureChart',
+    alias: 'widget.procedurechart',
+    
+    initComponent: function() {
+        var me = this;
+        
+        Ext.create('istsos.store.ObservedProperties');
+        Ext.create('istsos.store.AggregateFunctionStore').loadData([
+            ['AVG'],['SUM'],['COUNT'],['MAX'],['MIN']
+        ]);
+        this.procedures = {};
+        
+        me.callParent(arguments);
+        
+        this.addEvents('queueLoaded','observedPropertyIsSet','clickCallback','pointClickCallback', 'seriesSelected', 'underlayCallback');
+        
+        //var offset = (new Date()).getTimezoneOffset()/-60;
+        
+        //var tz = (parseInt(offset)>=0?'+':'-') + this.pad(parseInt(offset)) + ':' + this.pad(Math.abs(((offset - parseInt(offset)) * 60 )));
+        
+        //var tz = ((offset > 0) ? "+"+this.pad(offset) : this.pad(offset));
+        //Ext.getCmp('oeBeginTime').format = 'H:i ['+tz+']';
+        
+        Ext.getCmp('oeTZ').setValue(istsos.utils.minutesToTz());
+        
+        Ext.getCmp('oeBeginTime').setValue(Ext.Date.parse("00:00", 'H:i'));
+        //Ext.getCmp('oeEndTime').format = 'H:i ['+tz+']';
+        Ext.getCmp('oeEndTime').setValue(Ext.Date.parse("00:00", 'H:i'));
+        
+        Ext.getCmp("btnPlot").on("click",this.loadObservation, this);
+        this.on("queueLoaded",this.rederChart, this);
+                
+        Ext.getCmp("btnRangeDay").on("click",function(btn, e, eOpts){
+            // 86400000 ms = 1 day
+            var range = this.chart.xAxisRange();
+            var extreme = this.chart.xAxisExtremes();
+            range[1] = range[0]+86400000000;
+            if (extreme[1]<range[1]) {
+                range[0] = extreme[1]-86400000000;
+                range[1] = extreme[1];
+            }
+            btn.toggle(true,true);
+            this.chart.updateOptions({
+                'dateWindow': [range[0], range[1]]
+            });
+        },this);
+        
+        Ext.getCmp("btnRangeWeek").on("click",function(btn, e, eOpts){
+            var range = this.chart.xAxisRange();
+            var extreme = this.chart.xAxisExtremes();
+            range[1] = range[0]+604800000000;
+            if (extreme[1]<range[1]) {
+                range[0] = extreme[1]-604800000000;
+                range[1] = extreme[1];
+            }
+            btn.toggle(true,true);
+            this.chart.updateOptions( {
+                'dateWindow': [range[0], range[1]]
+            } );
+        },this);
+        
+        Ext.getCmp("btnRangeAll").on("click",function(btn, e, eOpts){
+            btn.toggle(true,true);
+            this.chart.updateOptions( {
+                'dateWindow': this.chart.xAxisExtremes()
+            } );
+        },this);
+        
+        
+        this.on("resize",function(panel, adjWidth, adjHeight, eOpts){
+            if(this.chart){
+                this.chart.resize();
+            }
+        });
+        
+        Ext.getCmp('oeCbObservedProperty').on("select",function(combo, records, eOpts){
+            var op = null;
+            if (records.length==1) {
+                op = records[0].data;
+            }
+            this.fireEvent("observedPropertyIsSet", this, op);
+        },this);
+    
+    },
+    pad: function(n){
+        if (n>=0 && n<10) {
+            return '0'+n;
+        }else if(n<0 && n>-10){
+            return '-0'+(-1*n);
+        }
+        return n;
+        // return n<10 ? '0'+n : n
+    },
+    rederChart: function(){
+        
+        this.obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
+        var procs = [];
+        // get the json rapresentation of the tree menu of procedures
+        //var checked = Ext.getCmp('proceduresTree').getValues();
+        var visibility = []; // Initialize the chart series visibility
+        
+        this.labels = ["isodate"];
+        this.colors = [];
+        var template = [];
+        
+        this.chartStore = {};
+        
+        var valueFormatter = {
+        
+        }
+        var cc = 1;
+        
+        var keys = Object.keys(this.procedures);
+        keys = keys.sort();
+        
+        //for (var key in this.procedures) {
+        for (var c = 0; c < keys.length; c++) {
+            var key = keys[c];
+            // check if procedures loaded have the requested observed property
+            if (Ext.Array.contains(this.procedures[key].getObservedProperties(),this.obsprop)) {
+                procs.push(this.procedures[key]);
+                // Preparing labels and single native row template
+                template.push(null);
+                this.labels.push(key);
+                this.colors.push(this.procedures[key].color);
+                valueFormatter[cc == 1 ? 'y': 'y'+cc] = {
+                    valueFormatter: function(ms, fn, p) {
+                        return ' '+ ms + ' '+ Ext.getCmp('chartpanel').procedures[p].getUomCode(
+                            Ext.getCmp("oeCbObservedProperty").getValue()    
+                            );
+                    }
+                } 
+            }
+        }
+        // merging data
+        var idx = 0;
+        //for (var key in procs) {
+        for (var c = 0; c < procs.length; c++) {
+            var p = procs[c];
+            
+            p.store.on("update",this._storeUpdated,this);
+            p.store.on("seriesupdated",this._storeSeriesUpdated,this);
+            
+            var recs = p.store.getRange();
+            for (var j = 0, l = recs.length; j < l; j++) {
+                if (Ext.isEmpty(this.chartStore[recs[j].get("micro") ])) {
+                    this.chartStore[recs[j].get("micro")] = Ext.Array.clone(template);
+                }
+                // Set the property choosen in the chart store in the right column
+                var v = parseFloat(recs[j].get(p.storeConvertFieldToId[this.obsprop]));
+                if (v<-900) {
+                    this.chartStore[recs[j].get("micro")][idx] = NaN;  
+                }else{
+                    this.chartStore[recs[j].get("micro")][idx] = v;          
+                }
+            }
+            idx++;
+        }
+        
+        // Sorting array by dates
+        var sorted = Ext.Array.sort(Ext.Object.getKeys(this.chartStore), 
+            function (d1, d2) {
+                d1 = parseInt(d1);
+                d2 = parseInt(d2);
+                if (d1 > d2) return 1;
+                if (d1 < d2) return -1;
+                return 0;
+            });
+        this.chartdata = [];
+        for (var i = 0; i < sorted.length; i++) {
+            var rec = [];
+            rec.push(parseInt(sorted[i]));
+            var vals = this.chartStore[sorted[i]];
+            rec = rec.concat(vals);
+            this.chartdata.push(rec);
+        }
+        var initChart = true;
+        if (initChart) {
+            Ext.getCmp("btnRangeDay").toggle(false,true);
+            Ext.getCmp("btnRangeWeek").toggle(false,true);
+            Ext.getCmp("btnRangeAll").toggle(true,true);
+            this.chart = new Dygraph(
+                document.getElementById("chartCnt-body"),
+                this.chartdata,
+                {
+                    labels: this.labels,
+                    colors: this.colors,
+                    strokeWidth: 2,
+                    digitsAfterDecimal: 6,
+                    connectSeparatedPoints: true,
+                    //visibility: visibility,
+                    legend: 'always',
+                    title: this.obsprop,
+                    showRangeSelector: true,
+                    showRoller: true,
+                    rangeSelectorHeight: 30,
+                    rangeSelectorPlotStrokeColor: 'black',
+                    rangeSelectorPlotFillColor: 'green',
+                    labelsDivStyles: {
+                        'padding': '4px',
+                        'border': '1px solid black',
+                        'borderRadius': '3px',
+                        'boxShadow': '4px 4px 4px #888',
+                        'right': '10px'
+                    },
+                    labelsDivWidth: "100%",
+                    axisLineColor: 'green',
+                    axisLabelFontSize: 12,
+                    axisLabelWidth: 150,
+                    xAxisLabelWidth: 150,
+                    highlightCircleSize: 4,
+                    axes: Ext.apply({
+                        x: {
+                            valueFormatter: function(ms) {
+                                return istsos.utils.micro2iso(ms,istsos.utils.tzToMinutes(Ext.getCmp('oeTZ').getValue()));
+                            },
+                            axisLabelFormatter: function(ms, gran, b, chart){
+                                
+                                // Get unix time in seconds
+                                var unix = parseInt(ms/1000000);
+                                // Extract microseconds only
+                                var micro = ms-(unix*1000000);
+                                // Date object without considering microseconds
+                                var date = Ext.Date.parse(unix,'U');
+                                
+                                var range = chart.xAxisRange();
+                                var delta = range[1]-range[0];
+                                
+                                var clip = function(m){
+                                    return (parseFloat('0.'+m)+"").substring(1);
+                                }
+                                if (delta<500000) { // less then a seconds range
+                                    if (micro == 0) {
+                                        if (date.getHours()==0 
+                                            && date.getMinutes()==0  
+                                            && date.getSeconds()==0) {
+                                            return Ext.Date.format(date,'Y-m-d');
+                                        }else{
+                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
+                                        }
+                                    }else{
+                                        if (micro==200000 || micro==400000 || micro==600000 || micro==800000) {
+                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
+                                        }else{
+                                            return micro/1000;
+                                        }
+                                    }
+                                }else if (delta<1000000) { // less then a seconds range
+                                    if (micro == 0) {
+                                        if (date.getHours()==0 
+                                            && date.getMinutes()==0  
+                                            && date.getSeconds()==0) {
+                                            return Ext.Date.format(date,'Y-m-d');
+                                        }else{
+                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
+                                        }
+                                    }else{
+                                        if (micro==500000) {
+                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
+                                        }else{
+                                            return micro/1000;
+                                        }
+                                    }
+                                }else if(delta<1000000*60) { // less the a minute
+                                    if (date.getHours()==0 
+                                        && date.getMinutes()==0  
+                                        && date.getSeconds()==0) {
+                                        return Ext.Date.format(date,'Y-m-d');
+                                    }else{
+                                        return Ext.Date.format(date,'H:i:s')+clip(micro);
+                                    }
+                                }else if(delta<1000000*60*60) { // less the an hour
+                                    if (date.getHours()==0 
+                                        && date.getMinutes()==0  
+                                        && date.getSeconds()==0) {
+                                        return Ext.Date.format(date,'Y-m-d');
+                                    }else{
+                                        return Ext.Date.format(date,'H:i');
+                                    }
+                                }else if(delta<1000000*60*60*24) { // less the a day
+                                    if (date.getHours()==0 
+                                        && date.getMinutes()==0  
+                                        && date.getSeconds()==0) {
+                                        return Ext.Date.format(date,'Y-m-d');
+                                    }else if (date.getHours()==12 
+                                        && date.getMinutes()==0  
+                                        && date.getSeconds()==0) {
+                                        return Ext.Date.format(date,'Y-m-d') + "T" +
+                                        Ext.Date.format(date,'H:i');
+                                    }else{
+                                        return Ext.Date.format(date,'H:i');
+                                    }
+                                }else if(delta<1000000*60*60*24*4) { // less the a day
+                                    if (date.getHours()==0 
+                                        && date.getMinutes()==0  
+                                        && date.getSeconds()==0) {
+                                        return Ext.Date.format(date,'Y-m-d');
+                                    }else if (date.getHours()==12) {
+                                        return Ext.Date.format(date,'Y-m-d') + "<br>" +
+                                        Ext.Date.format(date,'H:i');
+                                    }else{
+                                        return Ext.Date.format(date,'H:i');
+                                    }
+                                }else  { // less the a day
+                                    return Ext.Date.format(date,'Y-m-d');
+                                }
+                            
+                            }
+                        }
+                    },valueFormatter),
+                    clickCallback: function(e, x, pts) {
+                        var chartpanel = Ext.getCmp('chartpanel');                        
+                        // Series selectd
+                        if (e.shiftKey && chartpanel.lastClick) {
+                            Ext.callback(function(e, x, pts){
+                                this.fireEvent("seriesSelected", this, e, x, this.lastClick, pts);
+                            }, chartpanel, [e, x, pts]);
+                            
+                        }else{ // Single point selected
+                            chartpanel.lastClick = x;
+                            Ext.callback(function(e, x, pts){
+                                this.fireEvent("clickCallback", this, e, x, pts);
+                            }, chartpanel, [e, x, pts]);
+                        }
+                        
+                    },
+                    pointClickCallback: function(e, p) {
+                        
+                        
+                        
+                        var chartpanel = Ext.getCmp('chartpanel');
+                        Ext.callback(function(e, p){
+                            this.fireEvent("clickCallback", this, e, p['xval']);
+                        }, chartpanel, [e, p]);
+                    },
+                    underlayCallback: function(canvas, area, g) {
+                        var chartpanel = Ext.getCmp('chartpanel');
+                        Ext.callback(function(canvas, area, g){
+                            this.fireEvent("underlayCallback", this, canvas, area, g);
+                        }, chartpanel, [canvas, area, g]);
+                    }
+                }
+                );
+        }else if (!Ext.isEmpty(this.chart)) {
+            this.chart.updateOptions({
+                file: this.chartdata,
+                visibility: visibility,
+                labels: this.labels
+            });
+        }
+        Ext.get('chartCnt-body').removeCls("viewerChart");
+        Ext.get('chartCnt').unmask();
+    },
+    highlightRegion: function(startMicro, endMicro){
+        if (this.chart) {
+            if (startMicro==null && endMicro==null) {
+                this.chart.updateOptions({
+                    "underlayCallback": function(canvas, area, chart) {
+                    
+                    }
+                });
+            }else if (endMicro==null) {
+                this.chart.updateOptions({
+                    "underlayCallback": function(canvas, area, chart) {
+                        //canvas.fillStyle = "rgba(194, 232, 184, 1)";
+                        canvas.fillStyle = "rgba(0, 255, 0, 0.8)";
+                        var canvas_left_x = chart.toDomXCoord(startMicro)-1;
+                        var canvas_width = 3;
+                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
+                        
+                        // Border left
+                        canvas.fillStyle = "rgba(0, 0, 0, 1)";
+                        canvas_left_x = chart.toDomXCoord(startMicro)-2;
+                        canvas_width = 1;
+                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
+                        
+                        // Border right
+                        canvas_left_x = chart.toDomXCoord(startMicro)+2;
+                        canvas_width = 1;
+                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
+                    }
+                });
+            }else{ 
+                this.chart.updateOptions({
+                    "underlayCallback": function(canvas, area, chart) {
+                        //canvas.fillStyle = "rgba(194, 232, 184, 1)";
+                        canvas.fillStyle = "rgba(0, 255, 0, 1)";
+                        var canvas_left_x = chart.toDomXCoord(startMicro);
+                        var canvas_right_x = chart.toDomXCoord(endMicro);
+                        var canvas_width = canvas_right_x - canvas_left_x;
+                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
+                        
+                        
+                        // Border left
+                        canvas.fillStyle = "rgba(0, 0, 0, 1)";
+                        canvas_left_x = chart.toDomXCoord(startMicro);
+                        canvas_width = 1;
+                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
+                        
+                        // Border right
+                        canvas_left_x = chart.toDomXCoord(endMicro)-1;
+                        canvas_width = 1;
+                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
+                    }
+                });
+            }
+        }
+    },
+    addAnnotation: function(micro, annotation){
+        var series = Ext.getCmp('oeCbEditableProcedures').getValue();
+        var annotations = this.chart.annotations();
+        var a = {
+            series: series,
+            x: micro,
+            shortText: '\\/',
+            text: 'long test',
+            tickHeight: 10
+        };
+        if (!Ext.isEmpty(annotation)) {
+            Ext.apply(a,{
+                shortText: annotation
+            });
+        }
+        annotations.push(a);
+        this.chart.setAnnotations(annotations);
+    },
+    /*
+     * Remove all annotatione from the chart
+     */
+    removeAnnotations: function(){
+        this.chart.setAnnotations([]);
+    },
+    /*
+     * Load the observation for added procedures according to user configuration:
+     *  - begin / end
+     *  - observed property
+     */
+    loadObservation: function(){
+    
+        // validation
+        
+        if(!Ext.getCmp('plotdatafrm').form.isValid()){
+            Ext.Msg.show({
+                 title:'Warning',
+                 msg: 'Request parameters are not valid please check date ranges and observed properties',
+                 buttons: Ext.Msg.OK,
+                 icon: Ext.Msg.WARNING
+            });
+            return;
+        }
+    
+        // Mask the container with loading message
+        Ext.get('chartCnt').mask("Initializing chart..");
+        
+        var begin = Ext.getCmp('oeBegin').getValue();
+        var bt = Ext.getCmp('oeBeginTime').getValue();
+        begin.setHours(bt.getHours());
+        begin.setMinutes(bt.getMinutes());
+        
+        var end = Ext.getCmp('oeEnd').getValue();
+        var et = Ext.getCmp('oeEndTime').getValue();
+        end.setHours(et.getHours());
+        end.setMinutes(et.getMinutes());
+        
+        this.tz = Ext.getCmp('oeTZ').getValue();
+        
+        // Load data based on the date-time fields
+        this.loading = [];
+        for (var key in this.procedures) {
+            this.loading.push(key);
+            this.procedures[key].on("observationLoaded",function(p){
+                Ext.Array.remove(this.loading,p.getName());
+                if (this.loading.length==0) {
+                    this.fireEvent("queueLoaded",this);
+                }
+            },this,{
+                single: true
+            });
+            this.procedures[key].getObservation(begin,end,
+                this.tz, // Setted timezoe
+                (Ext.isObject(this.procedures[key].aggregation)?this.procedures[key].aggregation:null) // Aggregation configuration
+            );
+        }
+    },
+    _colorChanged: function(p, newColor, oldColor){
+        if (this.chart) {
+            var colors = this.chart.getColors();
+            var labels = this.chart.getLabels();
+            var index = Ext.Array.indexOf(labels, p.getName());
+            colors[index-1] = newColor;
+            this.chart.updateOptions( {
+                'colors': colors
+            });
+        }
+    },
+    _visibilityChanged: function(p, visibile){
+        if (this.chart) {
+            var labels = this.chart.getLabels();
+            var index = Ext.Array.indexOf(labels, p.getName())-1;
+            this.chart.setVisibility(index,visibile);
+        }
+    },
+    _storeUpdated: function( store, record){
+        var procedure = this.procedures[store.name];
+        var rec = [];
+        var obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
+        var colIdx = this.chart.indexFromSetName(store.name);
+        rec.push(record.get('micro'));
+        // @todo sync NaN with istSOS configuration
+        if (record.get(procedure.storeConvertFieldToId[obsprop])<-900) {
+            rec.push(NaN);
+        }else{
+            rec.push(record.get(procedure.storeConvertFieldToId[obsprop]));
+        }
+        for (var i = 0; i < this.chartdata.length; i++) {
+            if (this.chartdata[i][0]==rec[0]) {
+                this.chartdata[i][colIdx]=rec[1];
+                break;
+            }
+        }
+        this.chart.updateOptions({
+            file: this.chartdata
+        });
+        
+    },
+    _storeSeriesUpdated: function( store, records){
+        var obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
+        var procedure = this.procedures[store.name];
+        var field = procedure.storeConvertFieldToId[obsprop];
+        var colIdx = this.chart.indexFromSetName(store.name);
+        for (var c = 0, i = 0; i < this.chartdata.length && c < records.length ; i++) {
+            if (this.chartdata[i][0]==records[c].get('micro')) {
+                this.chartdata[i][colIdx]=records[c].get(field);
+                c++;
+            }
+        }
+        this.chart.updateOptions({
+            file: this.chartdata
+        });
+    },
+    /*
+    * Configure the plot panel loading the observed properties into the combo
+    * and setting begin e end limits according to the procedures metadata.
+    */
+    addProcedure: function(procedure){
+        this.procedures[procedure.getName()] = procedure;
+        procedure.on("colorchanged",this._colorChanged,this);
+        procedure.on("visibilitychanged",this._visibilityChanged,this);
+        this.reconfigure();
+    },
+    removeProcedure: function(procedure){
+        procedure.un("colorchanged",this._colorChanged,this);
+        delete this.procedures[procedure.getName()];
+        this.reconfigure();
+        if (this.chart) {
+            if (Ext.Object.getSize(this.procedures)==0) {
+                Ext.destroy(Ext.get('chartCnt-body').child('*'));
+                Ext.get('chartCnt-body').addCls("viewerChart");
+                delete this.chart;
+            }else{
+                this.rederChart();
+            }
+        }
+    },
+    reconfigure: function(){
+        var oeBegin = Ext.getCmp('oeBegin'), 
+        oeEnd = Ext.getCmp('oeEnd'), 
+        os = Ext.getStore('observedproperties');
+        os.removeAll();
+        oeBegin.setMaxValue(null); 
+        oeBegin.setMinValue(null); 
+        oeEnd.setMaxValue(null); 
+        oeEnd.setMinValue(null); 
+        if (Ext.Object.getSize(this.procedures)==0) {
+            Ext.getCmp('oeCbObservedProperty').reset();
+            Ext.getCmp("btnPlot").disable();
+            oeBegin.reset();
+            oeEnd.reset();
+            return;
+        }
+        
+        for (var key in this.procedures) {
+            var procedure = this.procedures[key], begin, end;
+            
+            var meta = procedure.meta;
+            for (var i = 0; i < meta.outputs.length; i++) {
+                if (meta.outputs[i]["definition"]==procedure.isodef) {
+                    if (!Ext.isEmpty(meta.outputs[i]['constraint']['interval'])) {
+                        var interval = Ext.Array.clone(meta.outputs[i]['constraint']['interval']);
+                        try{
+                            interval[0] = Ext.Date.parse(interval[0],"c");
+                            if (Ext.isEmpty(begin) || (Ext.isDate(begin) && begin>interval[0])) {
+                                begin = Ext.Date.clone(interval[0]);
+                            }
+                        }catch (e){
+                            console.error("Unable to parse allowed begin date interval");
+                        }
+                        try{
+                            interval[1] = Ext.Date.parse(interval[1],"c");
+                            if (Ext.isEmpty(end) || (Ext.isDate(end) && end<interval[1])) {
+                                end = Ext.Date.clone(interval[1]);
+                            }
+                        }catch (e){
+                            console.error("Unable to parse allowed end date interval");
+                        }
+                    }
+                }else if (os.find('definition',meta.outputs[i]["definition"])==-1) {
+                    var data = [[
+                    meta.outputs[i]["name"],
+                    meta.outputs[i]["description"],
+                    meta.outputs[i]["uom"],
+                    meta.outputs[i]["definition"]
+                    ]];
+                    os.loadData(data,true);
+                }
+            }
+            if (!Ext.isEmpty(begin)) {
+                if (!Ext.isEmpty(oeBegin.minValue)) {
+                    if (oeBegin.minValue.getTime()>begin.getTime()) {
+                        oeBegin.setMinValue(begin); 
+                        oeEnd.setMinValue(begin); 
+                    }
+                }else{
+                    oeBegin.setMinValue(begin); 
+                    oeEnd.setMinValue(begin); 
+                }
+            }
+            
+            
+            if (!Ext.isEmpty(end)) {
+                
+                var endCopy = Ext.Date.clone(end);
+                var beginCopy = Ext.Date.add(Ext.Date.clone(end), Ext.Date.DAY,-7);
+                
+                if (!Ext.isEmpty(oeBegin.maxValue)) {
+                    if (oeBegin.maxValue.getTime()<end.getTime()) {
+                        oeBegin.setMaxValue(endCopy); 
+                        oeEnd.setMaxValue(endCopy); 
+                        oeBegin.setValue(beginCopy); 
+                        oeEnd.setValue(end);
+                    }
+                }else{
+                    oeBegin.setMaxValue(endCopy); 
+                    oeEnd.setMaxValue(endCopy); 
+                    oeBegin.setValue(beginCopy); 
+                    oeEnd.setValue(end);
+                }
+            
+            }
+        }
+        if (os.data.length==1) {
+            Ext.getCmp('oeCbObservedProperty').setValue(os.getAt(0));
+            this.fireEvent("observedPropertyIsSet", this, os.getAt(0).data);
+        }
+        //Ext.getCmp('oeCbObservedProperty').enable();
+        Ext.getCmp("btnPlot").enable();
+    }
+});
diff --git a/html/admin/app/view/ProcedureChooser.js b/html/admin/app/view/ProcedureChooser.js
new file mode 100755
index 0000000..a3782a3
--- /dev/null
+++ b/html/admin/app/view/ProcedureChooser.js
@@ -0,0 +1,493 @@
+/**
+ * istSOS WebAdmin - Istituto Scienze della Terra
+ * Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+/*
+ * https://github.com/sterlingwes/RandomColor
+ */
+(function(root,factory){
+    if(typeof exports==='object'){
+        module.exports=factory;
+    }else if(typeof define==='function'&&define.amd){
+        define(factory);
+    }else{
+        root.RColor=factory();
+    }
+}(this,function(){
+    var RColor=function(){
+        this.hue=Math.random(),this.goldenRatio=0.618033988749895;
+    };
+    RColor.prototype.hsvToRgb=function(h,s,v){
+        var h_i=Math.floor(h*6),f=h*6- h_i,p=v*(1-s),q=v*(1-f*s),t=v*(1-(1-f)*s),r=255,g=255,b=255;
+        switch(h_i){
+            case 0:
+                r=v,g=t,b=p;
+                break;
+            case 1:
+                r=q,g=v,b=p;
+                break;
+            case 2:
+                r=p,g=v,b=t;
+                break;
+            case 3:
+                r=p,g=q,b=v;
+                break;
+            case 4:
+                r=t,g=p,b=v;
+                break;
+            case 5:
+                r=v,g=p,b=q;
+                break;
+        }
+        return[Math.floor(r*256),Math.floor(g*256),Math.floor(b*256)];
+    };
+    RColor.prototype.get=function(hex,saturation,value){
+        this.hue+=this.goldenRatio;
+        this.hue%=1;
+        if(typeof saturation!=="number")saturation=0.5;
+        if(typeof value!=="number")value=0.95;
+        var rgb=this.hsvToRgb(this.hue,saturation,value);
+        if(hex)
+            return"#"+rgb[0].toString(16)+rgb[1].toString(16)+rgb[2].toString(16);else
+            return rgb;
+    };
+    return RColor;
+}));
+
+Ext.define('istsos.view.ProcedureChooser', {
+    extend: 'istsos.view.ui.ProcedureChooser',
+    alias: 'widget.procedurechooser',
+
+    initComponent: function() {
+        
+        var me = this;
+        this.color = new RColor;
+        
+        this.addEvents({
+            "procedureAdded" : true,
+            "procedureRemoved" : true
+        });
+        
+        Ext.create('istsos.store.Offerings');
+        Ext.create('istsos.store.gridProceduresList');
+        var ssrv = Ext.create('istsos.store.Services');
+        ssrv.getProxy().url = Ext.String.format('{0}/istsos/services',wa.url);
+        
+        this.procedures = {};
+        this.configsections = {};
+        
+        me.callParent(arguments);
+        
+        Ext.getCmp("cmbServices").on("select",function(combo, records, eOpts){
+            var pr = Ext.getCmp('oeCbProcedure');
+            pr.reset();
+            pr.disable();
+            
+            var o = Ext.getCmp('oeCbOffering');
+            o.reset();
+            o.getStore().removeAll();
+            o.disable();
+            Ext.Ajax.request({
+                url: Ext.String.format('{0}/istsos/services/{1}/offerings/operations/getlist',
+                    wa.url,combo.getValue()),
+                scope: o,
+                method: "GET",
+                success: function(response){
+                    var json = Ext.decode(response.responseText);
+                    if (json.data.length>0) {
+                        this.getStore().loadData(json.data);
+                        this.enable();
+                    }else{
+                        this.disable();
+                        Ext.Msg.alert("Server message", "\"" + json['message'] + "\"<br/><br/>" + 
+                                "<small>Status response: " + response.statusText + "</small>");
+                    }
+                }
+            });
+            
+            Ext.Ajax.request({
+                url: Ext.String.format('{0}/istsos/services/{1}/configsections',wa.url, combo.getValue()),
+                scope: this,
+                method: "GET",
+                success: function(response){
+                    var json = Ext.decode(response.responseText);
+                    if (json.success) {
+                        this.configsections = json.data;
+                    }
+                }
+            });
+            
+        },this);
+        
+        Ext.getCmp("oeCbOffering").on("select",function(combo, records, eOpts){
+            var pr = Ext.getCmp('oeCbProcedure');
+            pr.reset();
+            pr.getStore().removeAll();
+            pr.disable();
+            Ext.Ajax.request({
+                url: Ext.String.format('{0}/istsos/services/{1}/offerings/{2}/procedures/operations/memberslist',
+                    wa.url,Ext.getCmp('cmbServices').getValue(),combo.getValue()),
+                scope: pr,
+                method: "GET",
+                success: function(response){
+                    var json = Ext.decode(response.responseText);
+                    if (json.data.length>0) {
+                        this.getStore().loadData(json.data);
+                        this.enable();
+                    }else{
+                        this.disable();
+                        Ext.Msg.alert("Server message", "\"" + json['message'] + "\"<br/><br/>" + 
+                                "<small>Status response: " + response.statusText + "</small>");
+                    }
+                }
+            });
+            /*
+            pr.getStore().load({
+                url: Ext.String.format('{0}/istsos/services/{1}/offerings/{2}/procedures/operations/memberslist',
+                    wa.url,Ext.getCmp('cmbServices').getValue(),combo.getValue()),
+                callback: function(records, operation, success){
+                    this.enable();
+                },
+                scope: pr
+            });*/
+        });
+        
+        Ext.getCmp("btnAdd").on("click",function(btn, e, eOpts){
+            
+            // Add an istsos.Procedure in the this.procedures array
+            // every row contains some describeSensor data
+            var service = Ext.getCmp("cmbServices").getValue();
+            var offering = Ext.getCmp("oeCbOffering").getValue();
+            var procedure = Ext.getCmp("oeCbProcedure").getValue();
+            
+            this.procedures[procedure] = Ext.create('istsos.Sensor', 
+                service, offering, procedure, {
+                    listeners: {
+                        metadataLoaded: this._getProcedureDetails,
+                        scope: this
+                    }
+                });
+            
+        },this);
+    },
+    _getProcedureDetails: function(proc){
+        var obsprop = [];
+        for (var i = 0; i < proc.meta.outputs.length; i++) {
+            if (proc.meta.outputs[i]['definition']!=proc.isodef) {
+                obsprop.push(proc.meta.outputs[i]['name'] + " (" + proc.meta.outputs[i]['uom']+ ")");
+            }
+        }
+        proc.color = this.color.get(true);
+        var idVisible = Ext.id(), idColor = Ext.id(), idRemove = Ext.id(), 
+                        idBtnAggregation = Ext.id(), idAggregation = Ext.id(), idToggleAggregation = Ext.id(),
+                        idDetailsAggregation = Ext.id(), idBtnAggregationReset = Ext.id(), idDownload = Ext.id(),
+                        idBtnAggregationAll = Ext.id();
+                        
+        var cmp = Ext.getCmp('proceduresTree').add({
+            xtype: 'panel',
+            //id: 'fs-'+proc.getName(),
+            border: false,
+            istsos: {
+                procedure: proc,
+                idVisible: idVisible,
+                idColor: idColor,
+                idRemove: idRemove,
+                chooser: this,
+                idToggleAggregation: idToggleAggregation,
+                toggleAggregation: false,
+                idAggregation: idAggregation,
+                idBtnAggregation: idBtnAggregation,
+                idBtnAggregationAll: idBtnAggregationAll,
+                idBtnAggregationReset: idBtnAggregationReset,
+                idDetailsAggregation: idDetailsAggregation,
+                idDownload: idDownload
+            },
+            listeners: {
+                "added": {
+                    fn: function(panel, container, pos, eOpts){
+                        this.fireEvent("procedureAdded", proc);
+                    },
+                    scope: this,
+                    options: {
+                        single: true
+                    }
+                },
+                "afterrender": {
+                    fn: function(procedureDetailsPanel, layout, eOpts ){
+                        
+                        //console.log("Afterrender: " + procedureDetailsPanel.istsos.procedure.getName());
+                        
+                        var v = Ext.get(procedureDetailsPanel.istsos.idVisible);
+                        v.on("click",function(){
+                            if (this.istsos.procedure.getVisibility()) {
+                                Ext.get(this.istsos.idVisible).addCls("pchooserBtnNotVisible");
+                            }else{
+                                Ext.get(this.istsos.idVisible).removeCls("pchooserBtnNotVisible");
+                            }
+                            this.istsos.procedure.setVisibility(!this.istsos.procedure.getVisibility());
+                        },procedureDetailsPanel);
+                        
+                        var c = Ext.get(procedureDetailsPanel.istsos.idDownload);
+                        c.on("click",function(){
+                            var from = Ext.getCmp('oeBegin').getValue();
+                            var bt = Ext.getCmp('oeBeginTime').getValue();
+                            from.setHours(bt.getHours());
+                            from.setMinutes(bt.getMinutes());
+                            
+                            var to = Ext.getCmp('oeEnd').getValue();
+                            var et = Ext.getCmp('oeEndTime').getValue();
+                            to.setHours(et.getHours());
+                            to.setMinutes(et.getMinutes());
+                            
+                            var attachment = this.istsos.procedure.getName()+ "_" + Ext.Date.format(to, 'YmdHi') + ".csv";
+                            
+                            var ob = this.istsos.procedure.getObservedProperties();
+                            
+                            var tz = Ext.getCmp('oeTZ').getValue();
+                            var format = Ext.isEmpty(tz) ? "c": "Y-m-d\\TH:i:s";
+                            
+                            from = Ext.Date.format(from,format);
+                            if(!Ext.isEmpty(tz)){
+                                from = from + (Ext.isString(tz) ? tz: istsos.utils.minutesToTz(tz));
+                            }
+                            
+                            to = Ext.Date.format(to,format);
+                            if(!Ext.isEmpty(tz)){
+                                to = to + (Ext.isString(tz) ? tz: istsos.utils.minutesToTz(tz));
+                            }
+                        
+                            var params = {
+                                "request": "GetObservation",
+                                "attachment": attachment,
+                                "offering": this.istsos.procedure.offering,
+                                "procedure": this.istsos.procedure.getName(),
+                                "eventTime": from+"/"+to,
+                                "observedProperty": ob.join(','),
+                                "qualityIndex": "True",
+                                "responseFormat": "text/plain",
+                                "service": "SOS",
+                                "version": "1.0.0"
+                            };
+                            
+                            if (Ext.isObject(this.istsos.procedure.aggregation)){
+                                params = Ext.apply(params, {
+                                    aggregatefunction: this.istsos.procedure.aggregation.f,
+                                    aggregateinterval: this.istsos.procedure.aggregation.i,
+                                    aggregatenodata: this.istsos.procedure.aggregation.nd,
+                                    aggregatenodataqi: this.istsos.procedure.aggregation.ndqi
+                                });
+                            }
+                            params = Ext.Object.toQueryString(params);
+                            
+                            window.open("../"+this.istsos.procedure.service+"?" + params);
+                            
+                            //console.log(params);
+                            
+                            
+                        },procedureDetailsPanel);
+                        
+                        c = Ext.get(procedureDetailsPanel.istsos.idColor);
+                        c.on("click",function(){
+                            Ext.create('Ext.window.Window', {
+                                title: this.istsos.procedure.getName() + ': color',
+                                height: 110,
+                                width: 200,
+                                closeAction: 'destroy',
+                                modal: true,
+                                layout: 'fit',
+                                items: Ext.create('Ext.picker.Color', {
+                                    listeners: {
+                                        select: function(picker, selColor) {
+                                            this.istsos.procedure.setColor("#"+selColor);
+                                            Ext.get(this.istsos.idColor).setStyle("background-color", "#"+selColor);
+                                            picker.ownerCt.close();
+                                        },
+                                        scope: this
+                                    }
+                                })
+                            }).show();
+                        },procedureDetailsPanel);
+                        
+                    
+                        c = Ext.get(procedureDetailsPanel.istsos.idRemove);
+                        c.on("click",function(){
+                            var pchoose = this.ownerCt.ownerCt;
+                            this.ownerCt.remove(this);
+                            pchoose.fireEvent("procedureRemoved", proc);
+                        },procedureDetailsPanel,{
+                            single: true
+                        });
+                        
+                        
+                        // AGGREGATION FUNCTIONALITIES <<<<<<<<<<<<<<<<<<<<<<<<<
+                        
+                        procedureDetailsPanel.istsos.procedure.on('aggregationchanged',function(procedure, aggregation){
+                            var det = Ext.get(this.istsos.idDetailsAggregation);
+                            if (Ext.isObject(aggregation)){
+                                det.update(aggregation.f + ", " + aggregation.i + ", " + aggregation.nd + ", " + aggregation.ndqi );
+                            }else{
+                                det.update("no");
+                            }
+                            this.istsos.toggleAggregation = false;
+                            Ext.getCmp(this.istsos.idAggregation).setVisible( this.istsos.toggleAggregation);
+                            var form = Ext.getCmp(this.istsos.idAggregation);
+                            form.form.setValues(aggregation);
+                        },procedureDetailsPanel);
+                        
+                        c = Ext.get(procedureDetailsPanel.istsos.idToggleAggregation);
+                        c.on("click",function(){
+                            this.istsos.toggleAggregation = !this.istsos.toggleAggregation;
+                            Ext.getCmp(this.istsos.idAggregation).setVisible( this.istsos.toggleAggregation );
+                        },procedureDetailsPanel);
+                        
+                        c = Ext.getCmp(procedureDetailsPanel.istsos.idBtnAggregation);
+                        c.on('click',function(btn){
+                            var form = Ext.getCmp(this.istsos.idAggregation);
+                            var values = form.getValues();
+                            this.istsos.procedure.setAggregation(values);
+                        },procedureDetailsPanel);
+                        
+                        c = Ext.getCmp(procedureDetailsPanel.istsos.idBtnAggregationAll); // APPLY TO ALL
+                        c.on('click',function(btn){
+                            var form = Ext.getCmp(this.istsos.idAggregation);
+                            var values = form.getValues();
+                            for ( var k in this.istsos.chooser.procedures) {
+                              this.istsos.chooser.procedures[k].setAggregation(values);
+                            }
+                        },procedureDetailsPanel);
+                        
+                        c = Ext.getCmp(procedureDetailsPanel.istsos.idBtnAggregationReset);
+                        c.on('click',function(btn){
+                            var form = Ext.getCmp(this.istsos.idAggregation);
+                            form.getForm().reset();
+                            this.istsos.procedure.setAggregation(null);
+                        },procedureDetailsPanel);
+                    },
+                    scope: this,
+                    options: {
+                        single: true
+                    }
+                }
+            },
+            cls: 'pchooser',
+            items: [
+                {
+                    xtype: 'panel',
+                    border: false,
+                    html: 
+                        "<div>" +
+                        "   <div style='border-bottom: thin solid white; padding: 2px; background-color: green; color: white; text-align: center;'>" +
+                        "       <span style='font-weight: bold; font-size: 14px;'>" + proc.getName() + "</span>" +
+                        "       <div id='"+idVisible+"' class='pchooserBtnVisible' title='Hide this procedure'></div>" +
+                        "       <div id='"+idDownload+"' class='pchooserBtnDownload' title='Download CSV data of selected interval'> </div>" +
+                        "       <div id='"+idColor+"' class='pchooserBtnColor' style='background-color: "+proc.color+";' title='Choose color'></div>" +
+                        "       <div id='"+idRemove+"' class='pchooserBtnRemove' title='Remove this procedure'> </div>" +
+                        "   </div>" +
+                        "   <div style='font-size: 12px; border-bottom: thin solid green; padding: 2px; background-color: white; color: black; text-align: center;'>" +
+                        "       <span style='font-style: italic;'>" + proc.service + ":" + proc.offering + "</span><br/>" +
+                        "       <span>Fr:" + proc.getBeginPosition() + "</span><br/>" +
+                        "       <span>To:" + proc.getEndPosition() + "</span><br/>" +
+                        "       <span style='font-weight: bold;'>" + obsprop.join("<br>") + "</span>" +
+                        "   </div>" +
+                        "   <div style='font-size: 12px; border-bottom: thin solid green; padding: 2px; background-color: white; color: black; text-align: center;'>" +
+                        "       <span id='"+idToggleAggregation+"' style='color: green; cursor: pointer;'>Aggregation: </span>" +
+                        "       <span id='"+idDetailsAggregation+"'>no</span>" +
+                        "   </div>" +
+                        "</div>"
+                },
+                {
+                    xtype: 'form',
+                    border: false,
+                    hidden: true,
+                    id: idAggregation,
+                    /*collapsible: true,
+                    collapsed: true,
+                    hideCollapseTool: true,
+                    titleCollapse: true,*/
+                    padding: 8,
+                    items: [
+                        {
+                            xtype: 'combobox',
+                            //id: 'oeFunction',
+                            name: 'f',
+                            fieldLabel: 'Function',
+                            displayField: 'name',
+                            forceSelection: true,
+                            queryMode: 'local',
+                            store: 'aggregatefunctionstore',
+                            valueField: 'name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            fieldLabel: 'Interval',
+                            name: 'i',
+                            emptyText: 'PT10M, P1DT',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            value: this.configsections.getobservation.aggregatenodata,
+                            name: 'nd',
+                            fieldLabel: 'No Data Value',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            value: this.configsections.getobservation.aggregatenodataqi,
+                            name: 'ndqi',
+                            fieldLabel: 'No Data QI',
+                            anchor: '100%'
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            dock: 'bottom',
+                            layout: {
+                                align: 'middle',
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    id: idBtnAggregationAll,
+                                    xtype: 'button',
+                                    text: 'Apply to all'
+                                },
+                                {
+                                    id: idBtnAggregation,
+                                    xtype: 'button',
+                                    text: 'Apply'
+                                },
+                                {
+                                    id: idBtnAggregationReset,
+                                    xtype: 'button',
+                                    text: 'Reset'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+            
+        });
+        
+        
+    }
+});
diff --git a/html/admin/app/view/ProcedureGrid.js b/html/admin/app/view/ProcedureGrid.js
new file mode 100755
index 0000000..f6da89f
--- /dev/null
+++ b/html/admin/app/view/ProcedureGrid.js
@@ -0,0 +1,575 @@
+/*
+ * File: app/view/ProcedureGrid.js
+ * Date: Mon Jan 21 2013 10:59:02 GMT+0100 (CET)
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be generated the first time you export.
+ *
+ * You should implement event handling and custom methods in this
+ * class.
+ */
+
+Ext.define('istsos.view.ProcedureGrid', {
+    extend: 'istsos.view.ui.ProcedureGrid',
+    alias: 'widget.proceduregrid',
+
+    initComponent: function() {
+        var me = this;
+        me.callParent(arguments);
+        this.addEvents('select','selectionchange','gridremoved');
+    },
+    resetConfig: function(conf){
+        this.readOnlyGrid = false;
+        this.observedProperty = null;
+        if (Ext.isObject(conf)) {
+            Ext.apply(this,conf);
+        }
+    },
+    initEditorGrid: function(procedures, procedureName, observedProperty){
+        
+        this.resetConfig({
+            readOnlyGrid: false,
+            observedProperty: observedProperty
+        });
+        
+        // @todo think something better and "shirker"
+        this.procedures=procedures;
+        var procedure = procedures[procedureName];
+        this.procedure=procedure;
+        
+        if (!Ext.getStore('editorQiStore')) {
+            Ext.create('Ext.data.Store', {
+                storeId: 'editorQiStore',
+                autoLoad: true,
+                proxy: {
+                    type: 'ajax',
+                    url: Ext.String.format('{0}/istsos/services/{1}/dataqualities',wa.url, this.procedure.service),
+                    reader: {
+                        type: 'json',
+                        idProperty: 'code',
+                        root: 'data'
+                    }
+                },
+                fields: [
+                {
+                    name: 'code'
+                },
+                {
+                    name: 'combo',
+                    convert: function(v, record){
+                        return record.get('code')  + " - " + record.get('name');
+                    }
+                },
+                {
+                    name: 'name'
+                },
+                {
+                    name: 'description'
+                }
+                ]
+            });
+        }else{
+            Ext.getStore('editorQiStore').getProxy().url = Ext.String.format('{0}/istsos/services/{1}/dataqualities',wa.url, this.procedure.service);
+            Ext.getStore('editorQiStore').load();
+        }
+        
+        
+        
+        
+        Ext.get(this.id).mask("Initializing editor grid..");
+        
+        var properties = procedure.data.result.DataArray.field;
+        
+        var columns = [{
+            xtype: 'numbercolumn',
+            dataIndex: 'micro',
+            hidden: true,
+            hideable: false,
+            header: 'id'
+        },{
+            xtype: 'gridcolumn',
+            dataIndex: procedure.iso8601Field, // isodate is always present at position one
+            flex: 0.7,
+            header: 'Date'
+        }];
+        
+        for (var i = 1; i < properties.length; i++) {
+            
+            columns.push({
+                //xtype: 'numbercolumn',
+                header: properties[i].name,
+                dataIndex: procedure.storeConvertFieldToId[properties[i].definition],
+                definition: properties[i].definition,
+                flex: 0.4,
+                editor: {
+                    xtype: 'numberfield',
+                    decimalPrecision: 6,
+                    hideLabel: true,
+                    listeners: {
+                        change: function(form, newValue, oldValue, eOpts){
+                        //console.log("change: ");
+                        //console.dir(arguments);
+                        }
+                    }
+                }
+            },{
+                //xtype: 'gridcolumn',
+                header: 'qualityIndex',
+                dataIndex: procedure.storeConvertFieldToId[properties[i].definition+':qualityIndex'],
+                definition: Ext.String.format('{0}:qualityIndex',properties[i].definition),
+                flex: 0.3,
+                editor: {
+                    xtype: 'combobox',
+                    queryMode: 'local',
+                    allowBlank: false,
+                    hideLabel: true,
+                    displayField: 'combo',
+                    matchFieldWidth: false,
+                    listConfig: {
+                        minWidth: 200
+                    },
+                    store: 'editorQiStore',
+                    valueField: 'code',
+                    anchor: '100%'
+                }
+            });
+            i++;
+        }
+        
+        var observedProperty = this.observedProperty.definition;
+        for (var i = 2; i < columns.length; i++) {
+            if (//columns[i]['definition']==procedure.isodef && 
+                columns[i]['definition']!=observedProperty && 
+                columns[i]['definition']!=observedProperty+':qualityIndex') {
+                columns[i]['hidden']=true;
+            }
+        }
+        
+        this.grid = Ext.create('Ext.grid.Panel', {
+            xtype: 'grid',
+            //id: 'oegrid',
+            title: '',
+            store: procedure.store,
+            autoRender: true,
+            autoScroll: true,
+            viewConfig: {
+            
+            },
+            columns: columns,
+            plugins: [Ext.create('Ext.grid.plugin.CellEditing')],
+            selModel: Ext.create('Ext.selection.RowModel', {
+                allowDeselect: true,
+                mode: 'MULTI'
+            }),
+            listeners: {
+                select: function(grid, record, index, eOpts){
+                    this.fireEvent("select", this, grid, record, index, eOpts);
+                },
+                selectionchange: function(grid, selected, eOpts){
+                    this.fireEvent("selectionchange", this, grid, selected, eOpts);
+                },
+                scope: this
+            },
+            dockedItems: [
+            {
+                xtype: 'toolbar',
+                dock: 'top',
+                items: [
+                /*{
+                    xtype: 'filefield',
+                    emptyText: 'Load CSV..',
+                    labelWidth: 40
+                },*/
+                {
+                    xtype: 'button',
+                    flex: 1,
+                    id: 'btnSave',
+                    text: 'Save',
+                    disabled: true,
+                    handler: function(){
+                        if (this.procedure.store.getUpdatedRecords().length>0) {
+                            this.procedure.on("observationSaved",function(){
+                                this.destroyGrid();
+                            },this,{
+                                single: true
+                            });
+                            this.procedure.insertObservation();
+                        }else{
+                            Ext.Msg.alert('Info', 'Nothing to save.');
+                        }
+                    },
+                    scope: this
+                },
+                {
+                    xtype: 'button',
+                    flex: 1,
+                    id: 'btnCancel',
+                    text: 'Cancel',
+                    handler: function(){
+                        if (this.procedure.store.getUpdatedRecords().length>0) {
+                            Ext.Msg.show({
+                                title:'Confirm action',
+                                msg: 'There are unsaved changes, are you sure you want to continue this action?',
+                                buttons: Ext.Msg.YESNO,
+                                icon: Ext.Msg.QUESTION,
+                                fn: function(btn, text){
+                                    if (btn == 'yes'){
+                                        this.destroyGrid();
+                                        this.procedure.rejectModifications();
+                                    }
+                                },
+                                scope: this
+                            });
+                            
+                        }else{
+                            this.destroyGrid();
+                        }
+                    },
+                    scope: this
+                },
+                {
+                    xtype: 'button',
+                    flex: 1,
+                    id: 'btnCalc',
+                    text: 'Calculator',
+                    handler: function(){
+                        this.calcWin = Ext.create('Ext.window.Window', {
+                            title: 'Calculator',
+                            height: 190,
+                            width: 700,
+                            layout: 'fit',
+                            items: Ext.create('istsos.view.Calc',{
+                                id: 'calcpanel',
+                                grid: Ext.getCmp('proceduregrid').grid,
+                                procedure: this.procedure,
+                                procedures: this.procedures,
+                                observedproperty: this.observedProperty.definition
+                            })
+                        });
+                        this.calcWin.show();
+                    },
+                    scope: this
+                },
+                {
+                    xtype: 'button',
+                    flex: 1,
+                    id: 'btnSelectAll',
+                    text: 'Select all',
+                    handler: function(){
+                        var selectionModel = this.grid.getSelectionModel();
+                        selectionModel.selectAll(true);
+                    },
+                    scope: this
+                }
+                ]
+            }
+            ]
+        });
+        this.removeAll();
+        this.add(this.grid);
+        
+        this.procedure.store.on('update',function(){
+            this.enable();
+        },Ext.getCmp('btnSave'));
+        this.procedure.store.on('seriesupdated',function(){
+            this.enable();
+        },Ext.getCmp('btnSave'));
+        
+        Ext.get(this.id).unmask();
+        
+        
+    },
+    destroyGrid: function(){
+        Ext.getCmp('btnSave').disable();
+        this.removeAll();
+        delete this.grid;
+        this.fireEvent("gridremoved", this);
+    },
+    /*
+ * procedures is a dictionary of istsos.Sensor objects
+ * 
+ * {
+ *    "T_BIASCA": {istsos.Sensor}
+ * }
+ */
+    initReadOnlyGrid: function(procedures, observedProperty){
+        // @todo: Check if procedures has loaded some data
+        
+        this.resetConfig({
+            readOnlyGrid: true,
+            observedProperty: observedProperty
+        });
+        this.procedures = procedures;
+        
+        Ext.get('gridpanel').mask("Initializing read only grid..");
+        
+        var keys = Object.keys(procedures);
+        keys = keys.sort();
+        
+        // Initialization of the grid store and the data model *****************
+        var modelFields = [
+        {
+            name: 'micro', 
+            type: 'int'
+        },
+
+        {
+            name: 'iso8601', 
+            type: 'string'
+        }            
+        ];
+        var template = {
+            micro: null,
+            iso8601: null
+        }
+        for (var c = 0; c < keys.length; c++) {
+            var key = keys[c];
+            if (Ext.Array.contains(procedures[key].getObservedProperties(),observedProperty)) {
+                modelFields.push({
+                    name: key, 
+                    type: 'string'
+                },{
+                    name: key+'_qi', 
+                    type: 'string'
+                });
+                template[key] = "-";
+                template[key+'_qi'] = "-";
+            }
+        }
+        // Creating data model
+        Ext.define('procedureGridDatamodel', {
+            extend: 'Ext.data.Model',
+            idProperty: "micro",
+            fields: modelFields
+        });
+        // Creating the store
+        this.store = Ext.create('Ext.data.Store', {
+            model: 'procedureGridDatamodel',
+            proxy: {
+                type: 'memory',
+                reader: {
+                    type: 'array',
+                    idProperty: 'micro'
+                }
+            }
+        });
+        // Suspends the firing of all events:
+        // Pass as true to queue up suspended events to be fired after 
+        // the resumeEvents call instead of discarding all suspended events.
+        this.store.suspendEvents(false);
+        // Merging loaded data to this grid store
+        
+        for (var c = 0; c < keys.length; c++) {
+            var key = keys[c];
+            if (Ext.Array.contains(procedures[key].getObservedProperties(),observedProperty)) {
+                
+                var recs = procedures[key].store.getRange();
+                
+                for (var j = 0, l = recs.length; j < l; j++) {
+                    
+                    var rec = null;
+                    var idx = this.store.indexOfId(recs[j].get("micro"));
+                    
+                    if (idx==-1) { // If record does not exist create a new one
+                        rec = Ext.create('procedureGridDatamodel', template);
+                        rec.set("micro",recs[j].get("micro"));
+                        rec.set("iso8601",recs[j].get("iso8601"));
+                        this.store.add(rec);
+                    }else{// if record exists then use it
+                        rec = this.store.getAt(idx);
+                    }
+                    
+                    // Set the property choosen in the chart store in the right column
+                    var v = parseFloat(recs[j].get(procedures[key].storeConvertFieldToId[observedProperty]));
+                    rec.set(key,v);
+                    rec.set(key+"_qi", recs[j].get(procedures[key].storeConvertFieldToId[observedProperty+":qualityIndex"]));   
+                    rec.commit(true);
+                }
+            }
+        }
+        this.store.sort('micro');
+        this.store.resumeEvents();
+        
+        
+        // Initialization of the two always present columns ********************
+        var columns = [{
+            xtype: 'numbercolumn',
+            dataIndex: 'micro',
+            hidden: true,
+            hideable: false,
+            sortable: false,
+            header: 'id'
+        },{
+            xtype: 'gridcolumn',
+            dataIndex: 'iso8601', // isodate is always present at position one
+            sortable: false,
+            hideable: false,
+            width: 200,
+            //flex: 0.7,
+            header: 'Date'
+        }];
+        for (var c = 0; c < keys.length; c++) {
+            var key = keys[c];
+            // check if procedures loaded have the requested observed property
+            if (Ext.Array.contains(procedures[key].getObservedProperties(),observedProperty)) {
+                columns.push({
+                    xtype: 'gridcolumn',
+                    //xtype: 'numbercolumn',
+                    //format: "0'000.000000",
+                    dataIndex: key,
+                    hideable: false,
+                    sortable: false,
+                    //flex: 0.4,
+                    text: key
+                },{
+                    xtype: 'gridcolumn',
+                    dataIndex: key + "_qi",
+                    sortable: false,
+                    hideable: false,
+                    width: 40,
+                    flex: (c+1) == keys.length ? 1: null,
+                    text: 'QI'
+                });
+            }else{
+                console.log("Procedure \""+key+"\" has not the desired observed property: " + observedProperty);
+            }
+        }
+        this.grid = Ext.create('Ext.grid.Panel', {
+            xtype: 'grid',
+            store: this.store,
+            autoRender: true,
+            autoScroll: true,
+            viewConfig: {
+            
+            },
+            columns: columns,
+            selModel: Ext.create('Ext.selection.RowModel', {
+                allowDeselect: true,
+                mode: 'MULTI'
+            }),
+            listeners: {
+                select: function(grid, record, index, eOpts){
+                    this.fireEvent("select", this, grid, record, index, eOpts);
+                },
+                selectionchange: function(grid, selected, eOpts){
+                    this.fireEvent("selectionchange", this, grid, selected, eOpts);
+                },
+                scope: this
+            },
+            dockedItems: [
+                {
+                    xtype: 'toolbar',
+                    //dock: 'bottom',
+                    layout: {
+                        align: 'middle',
+                        //pack: 'center',
+                        type: 'hbox'
+                    },
+                    items: [
+                        {
+                            xtype: 'button',
+                            text: 'Show CSV',
+                            handler: this.showCsv,
+                            scope: this
+                        }
+                    ]
+                }
+            ]
+        });
+        
+        this.removeAll();
+        this.add(this.grid);
+        
+        Ext.get('gridpanel').unmask();
+        
+    },
+    showCsv: function(){
+        //chartdata
+        var ret = [this.observedProperty];
+        
+        var keys = Object.keys(this.procedures);
+        keys = keys.sort();
+        
+        var lineStr = ['DATETIME'];
+        for (var c = 0; c < keys.length; c++) {
+            var key = keys[c];
+            // check if procedures loaded have the requested observed property
+            if (Ext.Array.contains(this.procedures[key].getObservedProperties(),this.observedProperty)) {
+                lineStr.push(key);
+                lineStr.push(key+"_QI");
+            }
+        }
+        ret.push(lineStr.join(","));
+        
+        var records = this.store.getRange();
+        for (var cnta = 0; cnta < records.length; cnta++){
+            var rec = records[cnta];
+            lineStr = [rec.get('iso8601')];
+            for (var c = 0; c < keys.length; c++) {
+                var key = keys[c];
+                lineStr.push(rec.get(key));
+                lineStr.push(rec.get(key+"_qi"));
+            }
+            ret.push(lineStr.join(","));
+        }
+        Ext.create('Ext.window.Window', {
+            title: 'CSV data',
+            height: 400,
+            width: 300,
+            layout: 'fit',
+            modal: true,
+            items: {  // Let's put an empty grid in just to illustrate fit layout
+                xtype: 'form',
+                border: false,
+                layout: 'fit',
+                items: {
+                    xtype     : 'textareafield',
+                    //grow      : true,
+                    anchor    : '100%',
+                    value: ret.join("\n")
+                }
+            }
+        }).show();
+        console.log(ret.join("\n"));
+    },
+    /*
+ * MicroArray can be of two type:
+ * 1. one array with an integer representing a micro id to be highlighted
+ *    example: [1351326600000000] 
+ * 2. one array with two integers representing an interval of micro ids to be highlighted
+ *    example: [1351326000000000,1351327000000000] 
+ */
+    updateGridSelection: function(microArray){
+        if (!Ext.isEmpty(this.grid)) {
+            var selectionModel, store;
+            this.suspendEvents(false);
+            if (microArray.length==2) {
+                selectionModel = this.grid.getSelectionModel();
+                store = this.grid.getStore();
+                var idx1 = store.find('micro',microArray[0]);
+                var idx2 = store.find('micro',microArray[1]);
+                selectionModel.selectRange(idx1,idx2);
+            }else if (microArray.length==1) {
+                selectionModel = this.grid.getSelectionModel();
+                store = this.grid.getStore();
+                var idx1 = store.find('micro',microArray[0]);
+                selectionModel.select(idx1);
+            }
+            this.resumeEvents();
+        }
+    },
+    removeProcedure: function(procedure){
+        delete this.procedures[procedure.getName()];
+        if (Ext.Object.getSize(this.procedures)==0) {
+            this.removeAll();
+        }else{
+            if (this.readOnlyGrid) {
+                this.initReadOnlyGrid(
+                    this.procedures,
+                    this.observedProperty);
+            }
+        }
+    }
+});
diff --git a/interface/app/view/ProcedureGridEditor.js b/html/admin/app/view/ProcedureGridEditor.js
similarity index 100%
rename from interface/app/view/ProcedureGridEditor.js
rename to html/admin/app/view/ProcedureGridEditor.js
diff --git a/interface/app/view/ProcedurePlotter.js b/html/admin/app/view/ProcedurePlotter.js
similarity index 100%
rename from interface/app/view/ProcedurePlotter.js
rename to html/admin/app/view/ProcedurePlotter.js
diff --git a/interface/app/view/TestCsv.js b/html/admin/app/view/TestCsv.js
similarity index 100%
rename from interface/app/view/TestCsv.js
rename to html/admin/app/view/TestCsv.js
diff --git a/interface/app/view/Viewer.js b/html/admin/app/view/Viewer.js
similarity index 100%
rename from interface/app/view/Viewer.js
rename to html/admin/app/view/Viewer.js
diff --git a/interface/app/view/VirtualProcedureEditor.js b/html/admin/app/view/VirtualProcedureEditor.js
similarity index 100%
rename from interface/app/view/VirtualProcedureEditor.js
rename to html/admin/app/view/VirtualProcedureEditor.js
diff --git a/interface/app/view/Wizard.js b/html/admin/app/view/Wizard.js
similarity index 100%
rename from interface/app/view/Wizard.js
rename to html/admin/app/view/Wizard.js
diff --git a/interface/app/view/about.js b/html/admin/app/view/about.js
similarity index 100%
rename from interface/app/view/about.js
rename to html/admin/app/view/about.js
diff --git a/interface/app/view/config.js b/html/admin/app/view/config.js
similarity index 100%
rename from interface/app/view/config.js
rename to html/admin/app/view/config.js
diff --git a/interface/app/view/contactinfo.js b/html/admin/app/view/contactinfo.js
similarity index 100%
rename from interface/app/view/contactinfo.js
rename to html/admin/app/view/contactinfo.js
diff --git a/interface/app/view/contacts.js b/html/admin/app/view/contacts.js
similarity index 100%
rename from interface/app/view/contacts.js
rename to html/admin/app/view/contacts.js
diff --git a/interface/app/view/database.js b/html/admin/app/view/database.js
similarity index 100%
rename from interface/app/view/database.js
rename to html/admin/app/view/database.js
diff --git a/interface/app/view/geo.js b/html/admin/app/view/geo.js
similarity index 100%
rename from interface/app/view/geo.js
rename to html/admin/app/view/geo.js
diff --git a/interface/app/view/getobservation.js b/html/admin/app/view/getobservation.js
similarity index 100%
rename from interface/app/view/getobservation.js
rename to html/admin/app/view/getobservation.js
diff --git a/interface/app/view/identification.js b/html/admin/app/view/identification.js
similarity index 100%
rename from interface/app/view/identification.js
rename to html/admin/app/view/identification.js
diff --git a/interface/app/view/newservice.js b/html/admin/app/view/newservice.js
similarity index 100%
rename from interface/app/view/newservice.js
rename to html/admin/app/view/newservice.js
diff --git a/interface/app/view/obsPropEditor.js b/html/admin/app/view/obsPropEditor.js
similarity index 100%
rename from interface/app/view/obsPropEditor.js
rename to html/admin/app/view/obsPropEditor.js
diff --git a/interface/app/view/offeringsEditor.js b/html/admin/app/view/offeringsEditor.js
similarity index 100%
rename from interface/app/view/offeringsEditor.js
rename to html/admin/app/view/offeringsEditor.js
diff --git a/interface/app/view/paths.js b/html/admin/app/view/paths.js
similarity index 100%
rename from interface/app/view/paths.js
rename to html/admin/app/view/paths.js
diff --git a/interface/app/view/procedure.js b/html/admin/app/view/procedure.js
similarity index 100%
rename from interface/app/view/procedure.js
rename to html/admin/app/view/procedure.js
diff --git a/html/admin/app/view/proceduresList.js b/html/admin/app/view/proceduresList.js
new file mode 100755
index 0000000..38f0968
--- /dev/null
+++ b/html/admin/app/view/proceduresList.js
@@ -0,0 +1,188 @@
+/*
+ * File: app/view/proceduresList.js
+ * Date: Thu Apr 26 2012 16:35:17 GMT+0200 (CEST)
+ *
+ * This file was generated by Ext Designer version 1.2.2.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be generated the first time you export.
+ *
+ * You should implement event handling and custom methods in this
+ * class.
+ */
+
+Ext.define('istsos.view.proceduresList', {
+    extend: 'istsos.view.ui.proceduresList',
+
+    initComponent: function() {
+        var me = this;
+        Ext.create('istsos.store.gridProceduresList',{
+            fields: [
+                {
+                    name: 'name',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'description',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'sensortype',
+                    sortType: 'asText',
+                    type: 'string'
+                },
+                {
+                    name: 'offerings'
+                },
+                {
+                    name: 'observedproperties'
+                },
+                {
+                    name: 'samplingTime',
+                    type: 'auto'
+                },
+                {
+                    name: 'begin',
+                    convert: function fullName(v, record){
+                        return record.data.samplingTime.beginposition;
+                    },
+                    type: 'string'
+                },
+                {
+                    name: 'end',
+                    convert: function fullName(v, record){
+                        return record.data.samplingTime.endposition;
+                    },
+                    type: 'string'
+                }
+            ]
+        });
+        me.callParent(arguments);
+        
+        
+        Ext.getCmp("btnRemove").on("click",function(){
+            var sm = this.getSelectionModel();
+            var rec = sm.getSelection();
+            if (rec.length==1) {
+                
+                var msg = '', deleteurl='';
+                if (rec[0].get('sensortype')=='virtual'){
+                    deleteurl=Ext.String.format('{0}/istsos/services/{1}/virtualprocedures/{2}', 
+                        wa.url, this.istService, rec[0].get('name')
+                    );
+                    msg = "Are you sure you want to erase the virtual " +
+                        "procedure and all of its python code?";
+                }else{
+                    deleteurl=Ext.String.format('{0}/istsos/services/{1}/procedures/{2}', 
+                        wa.url, this.istService, rec[0].get('name')
+                    );
+                    msg = "Are you sure you want to erase the procedure and all of its observations?";
+                }
+                
+                Ext.Msg.show({
+                    title:'Erasing procedure',
+                    msg: msg,
+                    buttons: Ext.Msg.YESNO,
+                    icon: Ext.Msg.QUESTION,
+                    fn: function(btn){
+                        if (btn == 'yes'){
+                            var sm = this.getSelectionModel();
+                            var rec = sm.getSelection();
+                            if (Ext.isEmpty(this.mask)) {
+                                this.mask = new Ext.LoadMask(this.body, {
+                                    msg:"Please wait..."
+                                });
+                            }
+                            this.mask.show();
+                            Ext.Ajax.request({
+                                url: deleteurl,
+                                scope: this,
+                                method: "DELETE",
+                                success: function(response){
+                                    Ext.Ajax.request({
+                                        url: Ext.String.format('{0}/istsos/services/{1}/procedures/operations/getlist', wa.url,this.istService),
+                                        scope: this,
+                                        method: "GET",
+                                        success: function(response){
+                                            var json = Ext.decode(response.responseText);
+                                            if (json.success) {
+                                                this.getStore().loadData(json.data);
+                                            }
+                                            this.mask.hide();
+                                        }
+                                    });
+                                },
+                                failure: function(){
+                                    
+                                }
+                            });      
+                        }
+                    },
+                    scope: this
+                });       
+            }
+        },this);
+        
+        this.columns[0].renderer = function(value, p, record){
+            var func=Ext.String.format("istsos.engine.pageManager.openPage({" + 
+                "istTitle: 'Edit procedure', " +
+                "istBody: ['istsos.view.procedure'], " +
+                "istFooter: istsos.SUBMIT, " +
+                "istService: '{0}'," + 
+                "istProcedure: '{1}'," + 
+                "istFunction: { " +
+                "   onLoad: 'executeGet'," +
+                "   onSubmit: 'executePut'" +
+                "}" +
+                "})",
+                this.istService,value);
+            return Ext.String.format('<span class="softLink" onclick="{0}">{1}</span>',func,value);
+        }
+        this.columns[3].renderer = function(value, p, record){
+            var ret = [];
+            for (var i = 0; i < value.length; i++) {
+                //var s = Ext.String.format('<span class="softLink" onclick="alert(\'load editor for: '+value[i]+'\')">{0}</span>',value[i]);
+                var s = Ext.String.format('{0}',value[i]);
+                ret.push(s);
+            }  
+            return ret.join(", ")
+        };
+        this.columns[4].renderer = function(value, p, record){
+            var ret = [];
+            for (var i = 0; i < value.length; i++) {
+                var v = value[i]['name'].split(':');
+                var s = Ext.String.format('{0} [{1}]',v[v.length-1],value[i]['uom']);
+                ret.push(s);
+            }  
+            return ret.join(", ")
+        };
+        /*this.columns[5].renderer = function(value, p, record){
+            return value['beginposition'];
+        };
+        this.columns[6].renderer = function(value, p, record){
+            return value['endposition'];
+        };*/
+    },
+    operationLoad: function(){
+        if (Ext.isEmpty(this.mask)) {
+            this.mask = new Ext.LoadMask(this.body, {
+                msg:"Please wait..."
+            });
+        }
+        this.mask.show();
+        Ext.Ajax.request({
+            url: Ext.String.format('{0}/istsos/services/{1}/procedures/operations/getlist', wa.url,this.istService),
+            scope: this,
+            method: "GET",
+            success: function(response){
+                var json = Ext.decode(response.responseText);
+                if (json.success) {
+                    this.istForm.getStore().loadData(json.data);
+                }
+                this.mask.hide();
+            }
+        });
+    }
+});
diff --git a/interface/app/view/provider.js b/html/admin/app/view/provider.js
similarity index 100%
rename from interface/app/view/provider.js
rename to html/admin/app/view/provider.js
diff --git a/interface/app/view/qualityindexEditor.js b/html/admin/app/view/qualityindexEditor.js
similarity index 100%
rename from interface/app/view/qualityindexEditor.js
rename to html/admin/app/view/qualityindexEditor.js
diff --git a/interface/app/view/serviceEditor.js b/html/admin/app/view/serviceEditor.js
similarity index 100%
rename from interface/app/view/serviceEditor.js
rename to html/admin/app/view/serviceEditor.js
diff --git a/interface/app/view/serviceconfig.js b/html/admin/app/view/serviceconfig.js
similarity index 100%
rename from interface/app/view/serviceconfig.js
rename to html/admin/app/view/serviceconfig.js
diff --git a/interface/app/view/serviceurl.js b/html/admin/app/view/serviceurl.js
similarity index 100%
rename from interface/app/view/serviceurl.js
rename to html/admin/app/view/serviceurl.js
diff --git a/interface/app/view/status.js b/html/admin/app/view/status.js
similarity index 100%
rename from interface/app/view/status.js
rename to html/admin/app/view/status.js
diff --git a/html/admin/app/view/ui/BasePage.js b/html/admin/app/view/ui/BasePage.js
new file mode 100755
index 0000000..7452618
--- /dev/null
+++ b/html/admin/app/view/ui/BasePage.js
@@ -0,0 +1,61 @@
+/*
+ * File: app/view/ui/BasePage.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.BasePage', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    layout: {
+        type: 'border'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    hidden: true,
+                    layout: {
+                        type: 'fit'
+                    },
+                    bodyBorder: true,
+                    bodyCls: 'centerTitle',
+                    bodyPadding: '8px',
+                    region: 'north'
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    styleHtmlContent: true,
+                    autoScroll: true,
+                    layout: {
+                        type: 'anchor'
+                    },
+                    bodyBorder: true,
+                    bodyCls: 'centerBody',
+                    region: 'center'
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    height: 20,
+                    hidden: true,
+                    bodyPadding: '8px',
+                    region: 'south'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/Calc.js b/html/admin/app/view/ui/Calc.js
new file mode 100755
index 0000000..49ed360
--- /dev/null
+++ b/html/admin/app/view/ui/Calc.js
@@ -0,0 +1,334 @@
+/*
+ * File: app/view/ui/Calc.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.Calc', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    height: 150,
+    minWidth: 450,
+    width: 450,
+    layout: {
+        type: 'border'
+    },
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    height: 100,
+                    layout: {
+                        align: 'stretch',
+                        type: 'hbox'
+                    },
+                    title: '',
+                    region: 'north',
+                    items: [
+                        {
+                            xtype: 'gridpanel',
+                            border: 0,
+                            id: 'editableProcedureGrid',
+                            width: 180,
+                            title: '',
+                            store: 'editableProcedure',
+                            flex: 0.3,
+                            columns: [
+                                {
+                                    xtype: 'gridcolumn',
+                                    border: 0,
+                                    dataIndex: 'name',
+                                    flex: 1,
+                                    text: 'Procedures'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            layout: {
+                                align: 'stretch',
+                                type: 'vbox'
+                            },
+                            title: '',
+                            flex: 0.7,
+                            items: [
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 30,
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    flex: 1,
+                                    items: [
+                                        {
+                                            xtype: 'button',
+                                            id: 'plus',
+                                            text: '+',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'moltiply',
+                                            text: '*',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'sqrt',
+                                            text: 'sqrt',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'sin',
+                                            text: 'sin',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'exp',
+                                            text: '^',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'acos',
+                                            text: 'acos',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'openparentesis',
+                                            text: '(',
+                                            flex: 1
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 30,
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    flex: 1,
+                                    items: [
+                                        {
+                                            xtype: 'button',
+                                            id: 'minus',
+                                            text: '-',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'divide',
+                                            text: '/',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'cos',
+                                            text: 'cos',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'asin',
+                                            text: 'asin',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'tan',
+                                            text: 'tan',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'atan',
+                                            text: 'atan',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'closedparentesis',
+                                            text: ')',
+                                            flex: 1
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 30,
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    flex: 1,
+                                    items: [
+                                        {
+                                            xtype: 'button',
+                                            id: 'less',
+                                            text: '<',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'grater',
+                                            text: '>',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'equal',
+                                            text: '=',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'lesseq',
+                                            text: '≤',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'gretereq',
+                                            text: '≥',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'andop',
+                                            text: 'AND',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'orop',
+                                            text: 'OR',
+                                            flex: 1
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    layout: {
+                        type: 'border'
+                    },
+                    title: '',
+                    region: 'center',
+                    items: [
+                        {
+                            xtype: 'form',
+                            border: 0,
+                            width: 120,
+                            bodyPadding: 10,
+                            title: '',
+                            region: 'west',
+                            items: [
+                                {
+                                    xtype: 'displayfield',
+                                    id: 'pEditing',
+                                    hideLabel: true,
+                                    anchor: '100%'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            layout: {
+                                align: 'stretch',
+                                type: 'hbox'
+                            },
+                            title: '',
+                            region: 'center',
+                            items: [
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    id: 'codePanel',
+                                    layout: {
+                                        align: 'stretch',
+                                        padding: '6 0 0 0',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    flex: 0.5
+                                },
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    bodyPadding: 10,
+                                    title: '',
+                                    flex: 0.5,
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'calcQiCombo',
+                                            fieldLabel: 'QI',
+                                            labelSeparator: '=',
+                                            labelWidth: 40,
+                                            emptyText: 'choosing a qi will update the selectded values..',
+                                            displayField: 'combo',
+                                            queryMode: 'local',
+                                            store: 'calcQiStore',
+                                            valueField: 'code',
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            width: 40,
+                            layout: {
+                                align: 'stretch',
+                                padding: '5px',
+                                type: 'vbox'
+                            },
+                            title: '',
+                            region: 'east',
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnExecute',
+                                    text: '↵',
+                                    flex: 1
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/interface/app/view/ui/CenterPage.js b/html/admin/app/view/ui/CenterPage.js
similarity index 100%
rename from interface/app/view/ui/CenterPage.js
rename to html/admin/app/view/ui/CenterPage.js
diff --git a/html/admin/app/view/ui/Chart.js b/html/admin/app/view/ui/Chart.js
new file mode 100755
index 0000000..24abdcc
--- /dev/null
+++ b/html/admin/app/view/ui/Chart.js
@@ -0,0 +1,259 @@
+/*
+ * File: app/view/ui/Chart.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.Chart', {
+    extend: 'Ext.panel.Panel',
+    requires: [
+        'istsos.view.ProcedurePlotter',
+        'istsos.view.ProcedureChooser'
+    ],
+
+    border: 0,
+    height: 600,
+    id: 'chartpanel',
+    minHeight: 400,
+    minWidth: 1130,
+    autoScroll: true,
+    layout: {
+        type: 'border'
+    },
+    bodyStyle: 'background-color: white;',
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'charttwo',
+                    minWidth: 500,
+                    layout: {
+                        align: 'stretch',
+                        type: 'vbox'
+                    },
+                    title: '',
+                    region: 'center',
+                    items: [
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            height: 150,
+                            id: 'plotcalc',
+                            activeItem: 0,
+                            layout: {
+                                type: 'card'
+                            },
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    padding: '0px 5px 5px 5px ',
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'fieldset',
+                                            title: '2. Plot data',
+                                            items: [
+                                                {
+                                                    xtype: 'procedureplotter',
+                                                    id: 'plotdatafrm'
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    id: 'calccnt',
+                                    padding: '9 10 0 10',
+                                    layout: {
+                                        type: 'fit'
+                                    },
+                                    title: ''
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            html: '<div style=\'border-radius: 3px 3px 3px 3px !important; background-color: white; border: thin solid green; width: 100%; height: 100%;\' id=\'chartCnt\'></div>',
+                            title: '',
+                            flex: 0.7,
+                            margins: '0 10 5 10'
+                        },
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            height: 30,
+                            padding: '0 10 5 10',
+                            layout: {
+                                align: 'middle',
+                                padding: '0 10 5 10',
+                                type: 'hbox'
+                            },
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnRangeDay',
+                                    enableToggle: true,
+                                    text: 'Day',
+                                    toggleGroup: 'timeline',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnRangeWeek',
+                                    enableToggle: true,
+                                    text: 'Week',
+                                    toggleGroup: 'timeline',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnRangeAll',
+                                    enableToggle: true,
+                                    pressed: true,
+                                    text: 'All',
+                                    toggleGroup: 'timeline',
+                                    flex: 1
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'chartthree',
+                    minWidth: 350,
+                    width: 350,
+                    layout: {
+                        align: 'stretch',
+                        type: 'vbox'
+                    },
+                    collapsed: false,
+                    region: 'east',
+                    items: [
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            height: 105,
+                            layout: {
+                                type: 'fit'
+                            },
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    id: 'chartfilterFrm',
+                                    bodyPadding: '0 10 5 0',
+                                    collapseFirst: false,
+                                    collapsed: false,
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'fieldset',
+                                            padding: 5,
+                                            title: '3. Start editing',
+                                            items: [
+                                                {
+                                                    xtype: 'combobox',
+                                                    id: 'oeCbEditableProcedures',
+                                                    name: 'procedure',
+                                                    fieldLabel: 'Procedure',
+                                                    labelWidth: 70,
+                                                    displayField: 'name',
+                                                    queryMode: 'local',
+                                                    store: 'editableProcedure',
+                                                    valueField: 'name',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'container',
+                                                    height: 25,
+                                                    layout: {
+                                                        align: 'stretch',
+                                                        type: 'hbox'
+                                                    },
+                                                    items: [
+                                                        {
+                                                            xtype: 'button',
+                                                            hidden: true,
+                                                            id: 'btnCancelEditor',
+                                                            text: 'Cancel',
+                                                            flex: 1
+                                                        },
+                                                        {
+                                                            xtype: 'button',
+                                                            id: 'btnStartEditor',
+                                                            text: 'Start editing',
+                                                            flex: 1
+                                                        }
+                                                    ]
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            id: 'chartgridcnt',
+                            layout: {
+                                type: 'fit'
+                            },
+                            title: '',
+                            flex: 1,
+                            margins: '0 10 5 0'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    width: 300,
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'west',
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            padding: 5,
+                            layout: {
+                                type: 'fit'
+                            },
+                            title: '1. Choose procedure',
+                            items: [
+                                {
+                                    xtype: 'procedurechooser',
+                                    id: 'pchoose'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ChartContainer.js b/html/admin/app/view/ui/ChartContainer.js
new file mode 100755
index 0000000..0c078ab
--- /dev/null
+++ b/html/admin/app/view/ui/ChartContainer.js
@@ -0,0 +1,36 @@
+/*
+ * File: app/view/ui/ChartContainer.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ChartContainer', {
+    extend: 'Ext.panel.Panel',
+    requires: [
+        'istsos.view.Chart'
+    ],
+
+    border: 0,
+    layout: {
+        type: 'fit'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'chart'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/CheckColumn.js b/html/admin/app/view/ui/CheckColumn.js
new file mode 100755
index 0000000..ff8c04e
--- /dev/null
+++ b/html/admin/app/view/ui/CheckColumn.js
@@ -0,0 +1,22 @@
+/*
+ * File: app/view/ui/CheckColumn.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.CheckColumn', {
+    extend: 'Ext.grid.column.Column',
+
+    text: 'Interpolation',
+
+    initComponent: function() {
+        var me = this;
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/Editor1.js b/html/admin/app/view/ui/Editor1.js
new file mode 100755
index 0000000..871a109
--- /dev/null
+++ b/html/admin/app/view/ui/Editor1.js
@@ -0,0 +1,74 @@
+/*
+ * File: app/view/ui/Editor1.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.Editor1', {
+    extend: 'Ext.panel.Panel',
+    requires: [
+        'istsos.view.ProcedureChart',
+        'istsos.view.ProcedureChooser',
+        'istsos.view.ProcedureGridEditor'
+    ],
+
+    border: 0,
+    padding: 0,
+    layout: {
+        type: 'border'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    layout: {
+                        type: 'border'
+                    },
+                    title: '',
+                    region: 'center',
+                    items: [
+                        {
+                            xtype: 'procedurechart',
+                            region: 'center'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'tabpanel',
+                    width: 450,
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    activeTab: 0,
+                    region: 'west',
+                    items: [
+                        {
+                            xtype: 'procedurechooser',
+                            border: 0,
+                            id: 'pchoose',
+                            title: 'Choose procedure'
+                        },
+                        {
+                            xtype: 'proceduregrideditor',
+                            id: 'proceduregrideditor',
+                            title: 'Editor'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/FormDataQuality.js b/html/admin/app/view/ui/FormDataQuality.js
new file mode 100755
index 0000000..c394155
--- /dev/null
+++ b/html/admin/app/view/ui/FormDataQuality.js
@@ -0,0 +1,98 @@
+/*
+ * File: app/view/ui/FormDataQuality.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.FormDataQuality', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    layout: {
+        type: 'anchor'
+    },
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'form',
+                    border: 0,
+                    bodyPadding: 10,
+                    title: '',
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            title: 'Add new index',
+                            items: [
+                                {
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Code',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    fieldLabel: 'Description',
+                                    anchor: '100%'
+                                }
+                            ]
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            anchor: '100%',
+                            dock: 'bottom',
+                            layout: {
+                                pack: 'end',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    text: 'Cancel'
+                                },
+                                {
+                                    xtype: 'button',
+                                    text: 'Add'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'gridpanel',
+                    padding: '16 8 0 8',
+                    title: 'Quality indexes',
+                    store: 'dataQualityStore',
+                    viewConfig: {
+                        height: 120
+                    },
+                    columns: [
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'code',
+                            text: 'Code'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'description',
+                            text: 'Description'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/interface/app/view/ui/FormPaths.js b/html/admin/app/view/ui/FormPaths.js
similarity index 100%
rename from interface/app/view/ui/FormPaths.js
rename to html/admin/app/view/ui/FormPaths.js
diff --git a/interface/app/view/ui/MainMenu.js b/html/admin/app/view/ui/MainMenu.js
similarity index 100%
rename from interface/app/view/ui/MainMenu.js
rename to html/admin/app/view/ui/MainMenu.js
diff --git a/html/admin/app/view/ui/MainMenu2.js b/html/admin/app/view/ui/MainMenu2.js
new file mode 100755
index 0000000..2331b94
--- /dev/null
+++ b/html/admin/app/view/ui/MainMenu2.js
@@ -0,0 +1,117 @@
+/*
+ * File: app/view/ui/MainMenu2.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.MainMenu2', {
+    extend: 'Ext.panel.Panel',
+
+    id: 'webadmincmp',
+    layout: {
+        type: 'border'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'mainCenter',
+                    autoScroll: true,
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'center'
+                },
+                {
+                    xtype: 'panel',
+                    height: 150,
+                    id: 'submenu',
+                    margin: '0px 0px 1px 0px ',
+                    layout: {
+                        align: 'stretch',
+                        type: 'hbox'
+                    },
+                    collapsed: true,
+                    hideCollapseTool: true,
+                    title: '',
+                    region: 'north',
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            flex: 1,
+                            dock: 'top',
+                            layout: {
+                                padding: '4 0 4 0',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    componentCls: 'test',
+                                    id: 'menuServer',
+                                    enableToggle: true,
+                                    pressed: true,
+                                    text: 'Server',
+                                    toggleGroup: 'mainmenu'
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnService',
+                                    enableToggle: true,
+                                    text: 'Services',
+                                    toggleGroup: 'mainmenu',
+                                    menu: {
+                                        xtype: 'menu',
+                                        id: 'menuServices'
+                                    }
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnObservations',
+                                    enableToggle: true,
+                                    text: 'Data viewer',
+                                    toggleGroup: 'mainmenu'
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnStatus',
+                                    allowDepress: false,
+                                    text: 'Status'
+                                },
+                                {
+                                    xtype: 'container',
+                                    html: ' <div class=\'mainHeaderTitle\'><a href=\'http://istgeo.ist.supsi.ch/software/istsos/\' target=\'_BLANK\'><img height=28 src=\'images/istsos-logo.png\'/></a></div>',
+                                    flex: 1
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    height: 25,
+                    html: '<a style=\'color: white; text-decoration: none;\' href=\'http://www.supsi.ch/ist\' target=\'_BLANK\'>Open Source Software by Institute of Earth Science - SUPSI</a>',
+                    id: 'mainFoot',
+                    bodyCls: 'mainFooter',
+                    bodyPadding: 8,
+                    title: '',
+                    region: 'south'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/MainPanel.js b/html/admin/app/view/ui/MainPanel.js
new file mode 100755
index 0000000..e4fffea
--- /dev/null
+++ b/html/admin/app/view/ui/MainPanel.js
@@ -0,0 +1,149 @@
+/*
+ * File: app/view/ui/MainPanel.js
+ * Date: Thu May 22 2014 15:17:28 GMT+0200 (CEST)
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.MainPanel', {
+    extend: 'Ext.container.Viewport',
+
+    id: 'mainPanel',
+    itemId: '',
+    layout: {
+        type: 'border'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'mainCenter',
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'center'
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    height: 70,
+                    html: '<div class=\'mainHeaderTitle\'>istSOS manager</div>\n<div class=\'mainHeaderSubtitle\'> > Control Panel for Sensor Observation Service</div>',
+                    id: 'mainHead',
+                    bodyCls: 'mainHeader',
+                    bodyPadding: '15 0 0 8',
+                    title: '',
+                    region: 'north'
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    height: 25,
+                    html: 'Open Source Software by Institute of Earth Science - SUPSI',
+                    id: 'mainFoot',
+                    bodyCls: 'mainFooter',
+                    bodyPadding: 8,
+                    title: '',
+                    region: 'south'
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'panelMenu',
+                    width: 210,
+                    layout: {
+                        type: 'border'
+                    },
+                    title: '',
+                    region: 'west',
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            height: 30,
+                            style: 'background-color: white !important;',
+                            region: 'north',
+                            dock: 'top',
+                            layout: {
+                                align: 'stretch',
+                                padding: 2,
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnMainMenu',
+                                    enableToggle: true,
+                                    pressed: true,
+                                    text: 'Server',
+                                    toggleGroup: 'menugroup',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnServicesMenu',
+                                    enableToggle: true,
+                                    text: 'Services',
+                                    toggleGroup: 'menugroup',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnDataMenu',
+                                    enableToggle: true,
+                                    text: 'Data',
+                                    toggleGroup: 'menugroup',
+                                    flex: 1
+                                }
+                            ]
+                        }
+                    ],
+                    items: [
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            id: 'menuCard',
+                            activeItem: 0,
+                            layout: {
+                                type: 'card'
+                            },
+                            title: '',
+                            region: 'center',
+                            items: [
+                                {
+                                    xtype: 'component',
+                                    id: 'mainMenu',
+                                    padding: '10px',
+                                    style: 'background: #fff;',
+                                    styleHtmlContent: true,
+                                    width: 150
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    id: 'servicesMenu',
+                                    layout: {
+                                        type: 'accordion'
+                                    },
+                                    bodyPadding: '10px',
+                                    title: ''
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/interface/app/view/ui/MyGridPanel15.js b/html/admin/app/view/ui/MyGridPanel15.js
similarity index 100%
rename from interface/app/view/ui/MyGridPanel15.js
rename to html/admin/app/view/ui/MyGridPanel15.js
diff --git a/html/admin/app/view/ui/ObservationEditor.js b/html/admin/app/view/ui/ObservationEditor.js
new file mode 100755
index 0000000..984a2f1
--- /dev/null
+++ b/html/admin/app/view/ui/ObservationEditor.js
@@ -0,0 +1,212 @@
+/*
+ * File: app/view/ui/ObservationEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ObservationEditor', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    height: 600,
+    width: 900,
+    layout: {
+        type: 'border'
+    },
+    bodyStyle: 'background-color: transparent;',
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'form',
+                    border: 0,
+                    height: 140,
+                    id: 'oeSettings',
+                    bodyPadding: 10,
+                    title: '',
+                    region: 'north',
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            title: 'Choose the procedure',
+                            items: [
+                                {
+                                    xtype: 'fieldcontainer',
+                                    height: 30,
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    fieldLabel: 'Label',
+                                    hideLabel: true,
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'cmbServices',
+                                            fieldLabel: 'Service',
+                                            displayField: 'service',
+                                            store: 'storeServices',
+                                            valueField: 'service',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            disabled: true,
+                                            id: 'oeCbOffering',
+                                            name: 'offering',
+                                            fieldLabel: 'Offering',
+                                            labelAlign: 'right',
+                                            labelWidth: 60,
+                                            displayField: 'name',
+                                            queryMode: 'local',
+                                            store: 'offerings',
+                                            valueField: 'name',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            disabled: true,
+                                            id: 'oeCbProcedure',
+                                            name: 'procedure',
+                                            fieldLabel: 'Procedure',
+                                            labelAlign: 'right',
+                                            labelWidth: 80,
+                                            displayField: 'name',
+                                            queryMode: 'local',
+                                            store: 'procedurelist',
+                                            valueField: 'name',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            disabled: true,
+                                            id: 'oeCbObservedProperty',
+                                            name: 'observedproperty',
+                                            fieldLabel: 'Property',
+                                            labelAlign: 'right',
+                                            labelWidth: 80,
+                                            displayField: 'name',
+                                            queryMode: 'local',
+                                            store: 'observedproperties',
+                                            valueField: 'name',
+                                            flex: 1
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'fieldcontainer',
+                                    height: 25,
+                                    defaults: {
+                                        flex: 1,
+                                        hideLabel: true
+                                    },
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    fieldLabel: 'Time period',
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'datefield',
+                                            disabled: true,
+                                            id: 'oeBegin',
+                                            name: 'begin',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'timefield',
+                                            disabled: true,
+                                            id: 'oeBeginTime',
+                                            name: 'begintime',
+                                            value: '00:00',
+                                            fieldLabel: 'Label',
+                                            format: 'G:i',
+                                            increment: 10,
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            html: '<div style=\'text-align: center; width: 100%;\'>-</div>',
+                                            padding: '5 0 0 0 ',
+                                            width: 20,
+                                            layout: {
+                                                type: 'fit'
+                                            },
+                                            flex: 0
+                                        },
+                                        {
+                                            xtype: 'datefield',
+                                            disabled: true,
+                                            id: 'oeEnd',
+                                            name: 'end',
+                                            fieldLabel: 'Label',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'timefield',
+                                            disabled: true,
+                                            id: 'oeEndTime',
+                                            name: 'endtime',
+                                            value: '00:00',
+                                            fieldLabel: 'Label',
+                                            format: 'G:i',
+                                            increment: 10,
+                                            flex: 1
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            dock: 'bottom',
+                            layout: {
+                                align: 'middle',
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'oeBtnReset',
+                                    text: 'Reset'
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'oeBtnLoad',
+                                    text: 'Load'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'oeEditor',
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'center'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ObservationEditorAdvancedOperations.js b/html/admin/app/view/ui/ObservationEditorAdvancedOperations.js
new file mode 100755
index 0000000..d5e5e83
--- /dev/null
+++ b/html/admin/app/view/ui/ObservationEditorAdvancedOperations.js
@@ -0,0 +1,39 @@
+/*
+ * File: app/view/ui/ObservationEditorAdvancedOperations.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ObservationEditorAdvancedOperations', {
+    extend: 'Ext.form.Panel',
+
+    border: 1,
+    height: 45,
+    width: 300,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'textfield',
+                    id: 'oeaTf',
+                    name: 'val',
+                    fieldLabel: 'New value',
+                    enableKeyEvents: true,
+                    anchor: '100%'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ObservationEditorColumn.js b/html/admin/app/view/ui/ObservationEditorColumn.js
new file mode 100755
index 0000000..e9d9e49
--- /dev/null
+++ b/html/admin/app/view/ui/ObservationEditorColumn.js
@@ -0,0 +1,55 @@
+/*
+ * File: app/view/ui/ObservationEditorColumn.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ObservationEditorColumn', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    layout: {
+        align: 'stretch',
+        type: 'hbox'
+    },
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    id: 'chartContainer',
+                    padding: '16px',
+                    maintainFlex: true,
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    flex: 0.9
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    id: 'gridContainer',
+                    width: 300,
+                    maintainFlex: true,
+                    layout: {
+                        type: 'fit'
+                    },
+                    bodyPadding: '16px',
+                    title: ''
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ProcedureChart.js b/html/admin/app/view/ui/ProcedureChart.js
new file mode 100755
index 0000000..fc2c63f
--- /dev/null
+++ b/html/admin/app/view/ui/ProcedureChart.js
@@ -0,0 +1,233 @@
+/*
+ * File: app/view/ui/ProcedureChart.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ProcedureChart', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    id: 'chartpanel',
+    layout: {
+        type: 'border'
+    },
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    title: '',
+                    region: 'north',
+                    items: [
+                        {
+                            xtype: 'form',
+                            border: 0,
+                            id: 'plotdatafrm',
+                            padding: '5 10 0 10',
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'fieldcontainer',
+                                    border: 0,
+                                    defaults: {
+                                        flex: 1,
+                                        hideLabel: true
+                                    },
+                                    layout: {
+                                        type: 'hbox'
+                                    },
+                                    fieldLabel: 'From',
+                                    labelWidth: 35,
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'datefield',
+                                            id: 'oeBegin',
+                                            name: 'begin',
+                                            allowBlank: false,
+                                            format: 'Y-m-d',
+                                            flex: 0.3
+                                        },
+                                        {
+                                            xtype: 'timefield',
+                                            id: 'oeBeginTime',
+                                            name: 'begintime',
+                                            fieldLabel: 'Label',
+                                            allowBlank: false,
+                                            format: 'H:i ',
+                                            increment: 10,
+                                            flex: 0.2
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            id: 'oeTZ',
+                                            name: 'timezone',
+                                            fieldLabel: 'Label',
+                                            allowBlank: false,
+                                            validator: function (value){
+
+    var tz = "TZ format shall be +HH:MM";
+    if (value.length!=6) {
+        return tz;
+    }
+    if (value[0]!='-' && value[0]!='+') {
+        return tz;
+    }
+    if (value.indexOf(':')!=3){
+        return tz;
+    }
+    var h = parseInt( (value[1]+value[2]));
+    var m = parseInt( (value[4]+value[5]));
+    
+    if (h>23){
+        return tz;
+    }
+    if (m>59){
+        return tz;
+    }
+    return true;
+},
+                                            flex: 0.08
+                                        },
+                                        {
+                                            xtype: 'label',
+                                            height: 22,
+                                            padding: '2px 0px 0px 10px',
+                                            width: 30,
+                                            text: 'To:',
+                                            flex: 0
+                                        },
+                                        {
+                                            xtype: 'datefield',
+                                            id: 'oeEnd',
+                                            name: 'end',
+                                            fieldLabel: 'Label',
+                                            allowBlank: false,
+                                            format: 'Y-m-d',
+                                            flex: 0.3
+                                        },
+                                        {
+                                            xtype: 'timefield',
+                                            id: 'oeEndTime',
+                                            name: 'endtime',
+                                            fieldLabel: 'Label',
+                                            allowBlank: false,
+                                            format: 'H:i ',
+                                            increment: 10,
+                                            flex: 0.2
+                                        },
+                                        {
+                                            xtype: 'label',
+                                            height: 22,
+                                            padding: '2px 0px 0px 10px',
+                                            width: 70,
+                                            text: 'Property:',
+                                            flex: 0
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'oeCbObservedProperty',
+                                            name: 'observedproperty',
+                                            fieldLabel: 'Property',
+                                            labelWidth: 70,
+                                            allowBlank: false,
+                                            displayField: 'name',
+                                            forceSelection: true,
+                                            queryMode: 'local',
+                                            store: 'observedproperties',
+                                            valueField: 'definition',
+                                            flex: 0.6
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            disabled: true,
+                                            id: 'btnPlot',
+                                            text: 'Plot',
+                                            flex: 0.4
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    style: 'background-color: white;',
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'center',
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            dock: 'bottom',
+                            layout: {
+                                align: 'middle',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'tbspacer',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnRangeDay',
+                                    width: 60,
+                                    enableToggle: true,
+                                    text: 'Day',
+                                    toggleGroup: 'timeline'
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnRangeWeek',
+                                    width: 60,
+                                    enableToggle: true,
+                                    text: 'Week',
+                                    toggleGroup: 'timeline'
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnRangeAll',
+                                    width: 60,
+                                    enableToggle: true,
+                                    pressed: true,
+                                    text: 'All',
+                                    toggleGroup: 'timeline'
+                                }
+                            ]
+                        }
+                    ],
+                    items: [
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            id: 'chartCnt',
+                            layout: {
+                                type: 'fit'
+                            },
+                            bodyCls: 'viewerChart',
+                            title: ''
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ProcedureChooser.js b/html/admin/app/view/ui/ProcedureChooser.js
new file mode 100755
index 0000000..59d03dd
--- /dev/null
+++ b/html/admin/app/view/ui/ProcedureChooser.js
@@ -0,0 +1,97 @@
+/*
+ * File: app/view/ui/ProcedureChooser.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ProcedureChooser', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    itemId: 'chartone',
+    minWidth: 280,
+    padding: '10px 0px 0px 0px',
+    layout: {
+        type: 'border'
+    },
+    bodyPadding: '',
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'form',
+                    border: 0,
+                    height: 120,
+                    id: 'oeSettings',
+                    bodyPadding: '0 10 0 10',
+                    title: '',
+                    region: 'north',
+                    items: [
+                        {
+                            xtype: 'combobox',
+                            id: 'cmbServices',
+                            fieldLabel: 'Service',
+                            labelWidth: 70,
+                            displayField: 'service',
+                            store: 'storeServices',
+                            valueField: 'service',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'combobox',
+                            disabled: true,
+                            id: 'oeCbOffering',
+                            name: 'offering',
+                            fieldLabel: 'Offering',
+                            labelWidth: 70,
+                            displayField: 'name',
+                            queryMode: 'local',
+                            store: 'offerings',
+                            valueField: 'name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'combobox',
+                            disabled: true,
+                            id: 'oeCbProcedure',
+                            name: 'procedure',
+                            fieldLabel: 'Procedure',
+                            labelWidth: 70,
+                            displayField: 'name',
+                            queryMode: 'local',
+                            store: 'procedurelist',
+                            valueField: 'name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'button',
+                            id: 'btnAdd',
+                            text: 'Add',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'form',
+                    border: 0,
+                    id: 'proceduresTree',
+                    autoScroll: true,
+                    bodyPadding: '0 10 0 10',
+                    title: '',
+                    region: 'center'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ProcedureGrid.js b/html/admin/app/view/ui/ProcedureGrid.js
new file mode 100755
index 0000000..3c41e9b
--- /dev/null
+++ b/html/admin/app/view/ui/ProcedureGrid.js
@@ -0,0 +1,25 @@
+/*
+ * File: app/view/ui/ProcedureGrid.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ProcedureGrid', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    layout: {
+        type: 'fit'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ProcedureGridEditor.js b/html/admin/app/view/ui/ProcedureGridEditor.js
new file mode 100755
index 0000000..9f15d06
--- /dev/null
+++ b/html/admin/app/view/ui/ProcedureGridEditor.js
@@ -0,0 +1,97 @@
+/*
+ * File: app/view/ui/ProcedureGridEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ProcedureGridEditor', {
+    extend: 'Ext.panel.Panel',
+    requires: [
+        'istsos.view.ProcedureGrid'
+    ],
+
+    id: 'proceduregrideditor',
+    minWidth: 350,
+    width: 350,
+    layout: {
+        type: 'border'
+    },
+    collapsed: false,
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    height: 30,
+                    itemId: 'buttonspanel',
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'north',
+                    items: [
+                        {
+                            xtype: 'form',
+                            border: 0,
+                            id: 'chartfilterFrm',
+                            layout: {
+                                align: 'middle',
+                                type: 'hbox'
+                            },
+                            bodyPadding: '0 10 0 10',
+                            collapseFirst: false,
+                            collapsed: false,
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'combobox',
+                                    id: 'oeCbEditableProcedures',
+                                    name: 'procedure',
+                                    fieldLabel: 'Procedure',
+                                    labelWidth: 70,
+                                    allowBlank: false,
+                                    displayField: 'name',
+                                    queryMode: 'local',
+                                    store: 'editableProcedure',
+                                    valueField: 'name',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'button',
+                                    hidden: true,
+                                    id: 'btnCancelEditor',
+                                    minWidth: 60,
+                                    text: 'Cancel',
+                                    flex: 0.5
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'btnStartEditor',
+                                    minWidth: 60,
+                                    text: 'Start editing',
+                                    flex: 0.5
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'proceduregrid',
+                    region: 'center',
+                    id: 'proceduregrid'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/ProcedurePlotter.js b/html/admin/app/view/ui/ProcedurePlotter.js
new file mode 100755
index 0000000..bbf5cba
--- /dev/null
+++ b/html/admin/app/view/ui/ProcedurePlotter.js
@@ -0,0 +1,114 @@
+/*
+ * File: app/view/ui/ProcedurePlotter.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.ProcedurePlotter', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    id: 'plotdatafrm',
+    padding: '5 10 0 10',
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'fieldcontainer',
+                    border: 0,
+                    defaults: {
+                        flex: 1,
+                        hideLabel: true
+                    },
+                    layout: {
+                        type: 'hbox'
+                    },
+                    fieldLabel: 'From',
+                    labelWidth: 35,
+                    anchor: '100%',
+                    items: [
+                        {
+                            xtype: 'datefield',
+                            id: 'oeBegin',
+                            name: 'begin',
+                            format: 'Y-m-d',
+                            flex: 0.3
+                        },
+                        {
+                            xtype: 'timefield',
+                            id: 'oeBeginTime',
+                            name: 'begintime',
+                            fieldLabel: 'Label',
+                            format: 'H:i ',
+                            increment: 10,
+                            flex: 0.2
+                        },
+                        {
+                            xtype: 'label',
+                            height: 22,
+                            padding: '2px 0px 0px 10px',
+                            width: 30,
+                            text: 'To:',
+                            flex: 0
+                        },
+                        {
+                            xtype: 'datefield',
+                            id: 'oeEnd',
+                            name: 'end',
+                            fieldLabel: 'Label',
+                            format: 'Y-m-d',
+                            flex: 0.3
+                        },
+                        {
+                            xtype: 'timefield',
+                            id: 'oeEndTime',
+                            name: 'endtime',
+                            fieldLabel: 'Label',
+                            format: 'H:i ',
+                            increment: 10,
+                            flex: 0.2
+                        },
+                        {
+                            xtype: 'label',
+                            height: 22,
+                            padding: '2px 0px 0px 10px',
+                            width: 70,
+                            text: 'Property:',
+                            flex: 0
+                        },
+                        {
+                            xtype: 'combobox',
+                            id: 'oeCbObservedProperty',
+                            name: 'observedproperty',
+                            fieldLabel: 'Property',
+                            labelWidth: 70,
+                            displayField: 'name',
+                            queryMode: 'local',
+                            store: 'observedproperties',
+                            valueField: 'definition',
+                            flex: 0.6
+                        },
+                        {
+                            xtype: 'button',
+                            disabled: true,
+                            id: 'btnPlot',
+                            text: 'Plot',
+                            flex: 0.4
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/TestCsv.js b/html/admin/app/view/ui/TestCsv.js
new file mode 100755
index 0000000..e6366b6
--- /dev/null
+++ b/html/admin/app/view/ui/TestCsv.js
@@ -0,0 +1,122 @@
+/*
+ * File: app/view/ui/TestCsv.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.TestCsv', {
+    extend: 'Ext.container.Viewport',
+
+    layout: {
+        type: 'fit'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    layout: {
+                        type: 'border'
+                    },
+                    title: '',
+                    items: [
+                        {
+                            xtype: 'form',
+                            width: 300,
+                            bodyPadding: 16,
+                            title: 'FILE',
+                            region: 'west',
+                            items: [
+                                {
+                                    xtype: 'combobox',
+                                    id: 'cmbServices',
+                                    fieldLabel: 'Service',
+                                    labelWidth: 70,
+                                    displayField: 'service',
+                                    store: 'storeServices',
+                                    valueField: 'service',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'combobox',
+                                    id: 'oeCbOffering',
+                                    name: 'offering',
+                                    fieldLabel: 'Offering',
+                                    labelWidth: 70,
+                                    displayField: 'name',
+                                    queryMode: 'local',
+                                    store: 'offerings',
+                                    valueField: 'name',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'combobox',
+                                    id: 'oeCbProcedure',
+                                    name: 'procedure',
+                                    fieldLabel: 'Procedure',
+                                    labelWidth: 70,
+                                    displayField: 'name',
+                                    queryMode: 'local',
+                                    store: 'procedurelist',
+                                    valueField: 'name',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'filefield',
+                                    id: 'btncsv',
+                                    fieldLabel: 'CSV',
+                                    labelWidth: 70,
+                                    anchor: '100%'
+                                }
+                            ],
+                            dockedItems: [
+                                {
+                                    xtype: 'toolbar',
+                                    dock: 'top',
+                                    layout: {
+                                        align: 'middle',
+                                        type: 'hbox'
+                                    },
+                                    items: [
+                                        {
+                                            xtype: 'button',
+                                            text: 'Action!',
+                                            flex: 1
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'form',
+                            bodyPadding: 16,
+                            title: '',
+                            region: 'center',
+                            items: [
+                                {
+                                    xtype: 'textareafield',
+                                    height: 155,
+                                    id: 'logger',
+                                    readOnly: true,
+                                    fieldLabel: 'Log',
+                                    hideLabel: true,
+                                    anchor: '100%'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/Viewer.js b/html/admin/app/view/ui/Viewer.js
new file mode 100755
index 0000000..ea3547b
--- /dev/null
+++ b/html/admin/app/view/ui/Viewer.js
@@ -0,0 +1,95 @@
+/*
+ * File: app/view/ui/Viewer.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.Viewer', {
+    extend: 'Ext.container.Viewport',
+    requires: [
+        'istsos.view.ProcedureChart',
+        'istsos.view.ProcedureGrid',
+        'istsos.view.ProcedureChooser'
+    ],
+
+    border: 0,
+    layout: {
+        type: 'border'
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    layout: {
+                        type: 'border'
+                    },
+                    title: '',
+                    region: 'center',
+                    items: [
+                        {
+                            xtype: 'procedurechart',
+                            region: 'center',
+                            id: 'chartpanel'
+                        },
+                        {
+                            xtype: 'panel',
+                            height: 250,
+                            layout: {
+                                type: 'fit'
+                            },
+                            collapsible: true,
+                            title: 'Grid',
+                            region: 'south',
+                            split: true,
+                            items: [
+                                {
+                                    xtype: 'proceduregrid',
+                                    id: 'gridpanel'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    border: 0,
+                    height: 25,
+                    html: '<a style=\'color: white; text-decoration: none;\' href=\'http://www.supsi.ch/ist\' target=\'_BLANK\'>Open Source Software by Institute of Earth Science - SUPSI</a>',
+                    id: 'mainFoot',
+                    bodyCls: 'mainFooter',
+                    bodyPadding: 8,
+                    title: '',
+                    region: 'south'
+                },
+                {
+                    xtype: 'panel',
+                    width: 300,
+                    layout: {
+                        type: 'fit'
+                    },
+                    title: '',
+                    region: 'west',
+                    items: [
+                        {
+                            xtype: 'procedurechooser',
+                            border: 0,
+                            id: 'pchoose'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/VirtualProcedureEditor.js b/html/admin/app/view/ui/VirtualProcedureEditor.js
new file mode 100755
index 0000000..c97f003
--- /dev/null
+++ b/html/admin/app/view/ui/VirtualProcedureEditor.js
@@ -0,0 +1,341 @@
+/*
+ * File: app/view/ui/VirtualProcedureEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.VirtualProcedureEditor', {
+    extend: 'Ext.panel.Panel',
+
+    layout: {
+        type: 'border'
+    },
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'form',
+                    height: 50,
+                    bodyPadding: 10,
+                    title: '',
+                    region: 'north',
+                    items: [
+                        {
+                            xtype: 'combobox',
+                            id: 'vpcmbplist',
+                            fieldLabel: 'Virtual procedure',
+                            labelWidth: 150,
+                            allowBlank: false,
+                            displayField: 'name',
+                            forceSelection: true,
+                            store: 'vplist',
+                            valueField: 'name',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'tabpanel',
+                    id: 'vppanel',
+                    activeItem: 0,
+                    title: '',
+                    activeTab: 1,
+                    flex: 1,
+                    region: 'center',
+                    items: [
+                        {
+                            xtype: 'panel',
+                            layout: {
+                                align: 'stretch',
+                                type: 'vbox'
+                            },
+                            title: 'Rating curve',
+                            dockedItems: [
+                                {
+                                    xtype: 'toolbar',
+                                    flex: 1,
+                                    dock: 'top',
+                                    items: [
+                                        {
+                                            xtype: 'tbtext',
+                                            text: 'ADD'
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'vpbtnaddrc',
+                                            text: '> at end'
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            disabled: true,
+                                            id: 'vpbtnaddaboverc',
+                                            text: '> above selected'
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            disabled: true,
+                                            id: 'vpbtnaddbelowrc',
+                                            text: '> below selected'
+                                        },
+                                        {
+                                            xtype: 'tbseparator',
+                                            margin: '0px 8px 0px 8px'
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            disabled: true,
+                                            id: 'vpbtnremoverc',
+                                            text: 'Remove selected'
+                                        }
+                                    ]
+                                }
+                            ],
+                            items: [
+                                {
+                                    xtype: 'gridpanel',
+                                    border: 0,
+                                    id: 'vpgridratingcurve',
+                                    title: '',
+                                    store: 'ratingcurve',
+                                    flex: 1,
+                                    columns: [
+                                        {
+                                            xtype: 'datecolumn',
+                                            sortable: false,
+                                            dataIndex: 'from',
+                                            flex: 0.13,
+                                            text: 'From',
+                                            format: 'Y-m-d',
+                                            field: {
+                                                xtype: 'datefield',
+                                                name: 'from',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                format: 'Y-m-d'
+                                            }
+                                        },
+                                        {
+                                            xtype: 'datecolumn',
+                                            sortable: false,
+                                            dataIndex: 'to',
+                                            flex: 0.13,
+                                            text: 'To',
+                                            format: 'Y-m-d',
+                                            field: {
+                                                xtype: 'datefield',
+                                                name: 'to',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                format: 'Y-m-d'
+                                            }
+                                        },
+                                        {
+                                            xtype: 'numbercolumn',
+                                            sortable: false,
+                                            dataIndex: 'low_val',
+                                            flex: 0.13,
+                                            text: 'Low',
+                                            format: '0,000.0000',
+                                            field: {
+                                                xtype: 'numberfield',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                decimalPrecision: 4
+                                            }
+                                        },
+                                        {
+                                            xtype: 'numbercolumn',
+                                            sortable: false,
+                                            dataIndex: 'up_val',
+                                            flex: 0.13,
+                                            text: 'Up',
+                                            format: '0,000.0000',
+                                            field: {
+                                                xtype: 'numberfield',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                decimalPrecision: 4
+                                            }
+                                        },
+                                        {
+                                            xtype: 'numbercolumn',
+                                            sortable: false,
+                                            dataIndex: 'A',
+                                            flex: 0.13,
+                                            text: 'A',
+                                            format: '0,000.0000',
+                                            field: {
+                                                xtype: 'numberfield',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                decimalPrecision: 4
+                                            }
+                                        },
+                                        {
+                                            xtype: 'numbercolumn',
+                                            sortable: false,
+                                            dataIndex: 'B',
+                                            flex: 0.13,
+                                            text: 'B',
+                                            format: '0,000.0000',
+                                            field: {
+                                                xtype: 'numberfield',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                decimalPrecision: 4
+                                            }
+                                        },
+                                        {
+                                            xtype: 'numbercolumn',
+                                            sortable: false,
+                                            dataIndex: 'C',
+                                            flex: 0.13,
+                                            text: 'C',
+                                            format: '0,000.0000',
+                                            field: {
+                                                xtype: 'numberfield',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                decimalPrecision: 4
+                                            }
+                                        },
+                                        {
+                                            xtype: 'numbercolumn',
+                                            sortable: false,
+                                            dataIndex: 'K',
+                                            flex: 0.13,
+                                            text: 'K',
+                                            format: '0,000.0000',
+                                            field: {
+                                                xtype: 'numberfield',
+                                                fieldLabel: 'Label',
+                                                hideLabel: true,
+                                                decimalPrecision: 4
+                                            }
+                                        }
+                                    ],
+                                    viewConfig: {
+
+                                    },
+                                    plugins: [
+                                        Ext.create('Ext.grid.plugin.CellEditing', {
+
+                                        })
+                                    ],
+                                    selModel: Ext.create('Ext.selection.RowModel', {
+                                        allowDeselect: true
+                                    })
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 60,
+                                    layout: {
+                                        align: 'stretch',
+                                        padding: '8px 0px 8px 0px',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'container',
+                                            width: 40
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'vpbtndeleterc',
+                                            text: 'Delete Rating Curve File',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 40
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'vpbtnsaverc',
+                                            text: 'Store the File',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 40
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'panel',
+                            layout: {
+                                align: 'stretch',
+                                type: 'vbox'
+                            },
+                            title: 'Code',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    id: 'vpcodingform',
+                                    layout: {
+                                        type: 'fit'
+                                    },
+                                    bodyPadding: 10,
+                                    title: '',
+                                    flex: 1
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 60,
+                                    layout: {
+                                        align: 'stretch',
+                                        padding: '8px 0px 8px 0px',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'container',
+                                            width: 40
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'vpbtndeletecode',
+                                            text: 'Delete Code File',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 40
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'vpbtnsavecode',
+                                            text: 'Save the Python Code',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 40
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/interface/app/view/ui/Wizard.js b/html/admin/app/view/ui/Wizard.js
similarity index 100%
rename from interface/app/view/ui/Wizard.js
rename to html/admin/app/view/ui/Wizard.js
diff --git a/interface/app/view/ui/WizardPage.js b/html/admin/app/view/ui/WizardPage.js
similarity index 100%
rename from interface/app/view/ui/WizardPage.js
rename to html/admin/app/view/ui/WizardPage.js
diff --git a/html/admin/app/view/ui/about.js b/html/admin/app/view/ui/about.js
new file mode 100755
index 0000000..e42906b
--- /dev/null
+++ b/html/admin/app/view/ui/about.js
@@ -0,0 +1,72 @@
+/*
+ * File: app/view/ui/about.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.about', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'fieldset',
+                    title: 'istSOS',
+                    items: [
+                        {
+                            xtype: 'displayfield',
+                            name: 'istsos_version',
+                            fieldLabel: 'Version',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'displayfield',
+                            id: 'updates',
+                            name: 'istsos_message',
+                            fieldLabel: 'Updates',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'displayfield',
+                            hidden: true,
+                            id: 'download',
+                            name: 'download_url',
+                            fieldLabel: 'Download',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textareafield',
+                            hidden: true,
+                            id: 'changelog',
+                            name: 'latest_istsos_changelog',
+                            readOnly: true,
+                            fieldLabel: 'Change log',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    html: '<p>istSOS (Istituto Scienze della Terra Sensor Observation Service) is an implementation of the Sensor Observation Service standard from Open Geospatial Consortium.\n</p>\n<p>\nThe developement of istSOS has started in 2009 in order to provide a simple implementation of the SOS standard for the management, provision and integration of hydro-meteorological data collected in Canton Ticino (Switzerland).\n</p>\n<p>\nistSOS is entirely written in <a href="http://py [...]
+                    padding: '10 0 0 0',
+                    styleHtmlContent: true,
+                    anchor: '100%'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/config.js b/html/admin/app/view/ui/config.js
new file mode 100755
index 0000000..e727bef
--- /dev/null
+++ b/html/admin/app/view/ui/config.js
@@ -0,0 +1,116 @@
+/*
+ * File: app/view/ui/config.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.config', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Proxy URL (optional)',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            fieldLabel: 'Url',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            hidden: true,
+                            fieldLabel: 'POST',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'SensorML folder',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'smlpath',
+                            fieldLabel: 'Path',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Virtual procedures',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'vppath',
+                            fieldLabel: 'Path',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Coordinate system',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'defaultepsg',
+                            fieldLabel: 'Default EPSG',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'permittedepsg',
+                            fieldLabel: 'Permitted EPSG',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'xaxisname',
+                            fieldLabel: 'X axis name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'yaxisname',
+                            fieldLabel: 'Y axis name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'zaxisname',
+                            fieldLabel: 'Z axis name',
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/contactinfo.js b/html/admin/app/view/ui/contactinfo.js
new file mode 100755
index 0000000..88fd791
--- /dev/null
+++ b/html/admin/app/view/ui/contactinfo.js
@@ -0,0 +1,113 @@
+/*
+ * File: app/view/ui/contactinfo.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.contactinfo', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    id: 'contactinfo',
+    bodyPadding: 10,
+    bodyStyle: 'centerBody',
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'contact',
+                    fieldLabel: 'Contact',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'organization',
+                    fieldLabel: 'Organization',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'position',
+                    fieldLabel: 'Position',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'addressType',
+                    fieldLabel: 'Address type',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'address',
+                    fieldLabel: 'Address',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'city',
+                    fieldLabel: 'City',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'state',
+                    fieldLabel: 'State',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'zipCode',
+                    fieldLabel: 'ZIP code',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'country',
+                    fieldLabel: 'Coutry',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'telephone',
+                    fieldLabel: 'Telephone',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'fax',
+                    fieldLabel: 'Fax',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'email',
+                    fieldLabel: 'Email',
+                    anchor: '100%'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/contacts.js b/html/admin/app/view/ui/contacts.js
new file mode 100755
index 0000000..67ce58d
--- /dev/null
+++ b/html/admin/app/view/ui/contacts.js
@@ -0,0 +1,93 @@
+/*
+ * File: app/view/ui/contacts.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.contacts', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Authority',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'name',
+                            fieldLabel: 'Name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'version',
+                            fieldLabel: 'Version',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Service Identification:',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'title',
+                            fieldLabel: 'Title',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'abstract',
+                            fieldLabel: 'Abstract',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'keywords',
+                            fieldLabel: 'Keywords',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'fees',
+                            fieldLabel: 'Fees',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'accessconstrains',
+                            fieldLabel: 'Access constrains',
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/database.js b/html/admin/app/view/ui/database.js
new file mode 100755
index 0000000..7f61c39
--- /dev/null
+++ b/html/admin/app/view/ui/database.js
@@ -0,0 +1,96 @@
+/*
+ * File: app/view/ui/database.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.database', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'PostGIS database',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'user',
+                            fieldLabel: 'User',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            inputType: 'password',
+                            name: 'password',
+                            fieldLabel: 'Password',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'host',
+                            fieldLabel: 'Host',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'port',
+                            fieldLabel: 'Port',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'dbname',
+                            fieldLabel: 'DB name',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    items: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            layout: {
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnTestConnection',
+                                    text: 'Test connection'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/geo.js b/html/admin/app/view/ui/geo.js
new file mode 100755
index 0000000..7293eb3
--- /dev/null
+++ b/html/admin/app/view/ui/geo.js
@@ -0,0 +1,76 @@
+/*
+ * File: app/view/ui/geo.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.geo', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Coordinate system',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            id: 'defaultepsg',
+                            name: 'istsosepsg',
+                            fieldLabel: 'Default EPSG',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'allowedepsg',
+                            fieldLabel: 'Permitted EPSG',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'xaxisname',
+                            fieldLabel: 'X axis name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'yaxisname',
+                            fieldLabel: 'Y axis name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'zaxisname',
+                            fieldLabel: 'Z axis name',
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/getobservation.js b/html/admin/app/view/ui/getobservation.js
new file mode 100755
index 0000000..900ba91
--- /dev/null
+++ b/html/admin/app/view/ui/getobservation.js
@@ -0,0 +1,42 @@
+/*
+ * File: app/view/ui/getobservation.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.getobservation', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'fieldset',
+                    id: 'getobsconfig',
+                    title: 'GetObservation configuration:',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'maxgoperiod',
+                            fieldLabel: 'Max request interval (hours)',
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/identification.js b/html/admin/app/view/ui/identification.js
new file mode 100755
index 0000000..c0196af
--- /dev/null
+++ b/html/admin/app/view/ui/identification.js
@@ -0,0 +1,87 @@
+/*
+ * File: app/view/ui/identification.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.identification', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Service Identification:',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'title',
+                            fieldLabel: 'Title',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'abstract',
+                            fieldLabel: 'Abstract',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'keywords',
+                            fieldLabel: 'Keywords',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'fees',
+                            fieldLabel: 'Fees',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'accessconstrains',
+                            fieldLabel: 'Access constrains',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'authority',
+                            fieldLabel: 'URN authority',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'urnversion',
+                            fieldLabel: 'URN version',
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/newservice.js b/html/admin/app/view/ui/newservice.js
new file mode 100755
index 0000000..6a5f96d
--- /dev/null
+++ b/html/admin/app/view/ui/newservice.js
@@ -0,0 +1,133 @@
+/*
+ * File: app/view/ui/newservice.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.newservice', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'fieldset',
+                    title: 'Sensor Observation Service',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            id: 'nsservice',
+                            invalidText: 'The serivice name must be a single lower case word',
+                            name: 'service',
+                            fieldLabel: 'Service name',
+                            allowBlank: false,
+                            regex: /^[a-z]+$/,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'epsg',
+                            fieldLabel: 'EPSG',
+                            emptyText: 'if empty, the default EPSG will be used',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    padding: 10
+                },
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    id: 'fscustomdb',
+                    checkboxName: 'customdb',
+                    checkboxToggle: true,
+                    collapsed: true,
+                    collapsible: true,
+                    title: 'Customize database',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'user',
+                            fieldLabel: 'User',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'password',
+                            fieldLabel: 'Password',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'host',
+                            fieldLabel: 'Host',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'port',
+                            fieldLabel: 'Port',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'dbname',
+                            fieldLabel: 'DB name',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'container',
+                            items: [
+                                {
+                                    xtype: 'toolbar',
+                                    margin: '0 0 5 0',
+                                    ui: 'footer',
+                                    layout: {
+                                        pack: 'end',
+                                        type: 'hbox'
+                                    },
+                                    items: [
+                                        {
+                                            xtype: 'button',
+                                            id: 'btnTestConnection',
+                                            text: 'Test connection'
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/obsPropEditor.js b/html/admin/app/view/ui/obsPropEditor.js
new file mode 100755
index 0000000..d35d57d
--- /dev/null
+++ b/html/admin/app/view/ui/obsPropEditor.js
@@ -0,0 +1,200 @@
+/*
+ * File: app/view/ui/obsPropEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.obsPropEditor', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'gridpanel',
+                    id: 'gridop',
+                    margin: 8,
+                    maxHeight: 250,
+                    title: '',
+                    forceFit: true,
+                    store: 'gridobservedproperties',
+                    viewConfig: {
+
+                    },
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            dock: 'top',
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnNew',
+                                    text: 'New'
+                                },
+                                {
+                                    xtype: 'button',
+                                    disabled: true,
+                                    id: 'btnRemove',
+                                    text: 'Remove selected'
+                                }
+                            ]
+                        }
+                    ],
+                    columns: [
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'name',
+                            flex: 1,
+                            text: 'Name'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'definition',
+                            flex: 1,
+                            text: 'Definition'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'description',
+                            flex: 1,
+                            text: 'Description'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'procedures',
+                            flex: 1,
+                            text: 'Procedures'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'constraint2str',
+                            flex: 1,
+                            text: 'Constraint'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'form',
+                    border: 0,
+                    hidden: true,
+                    id: 'frmObservedProperties',
+                    bodyPadding: 10,
+                    title: '',
+                    trackResetOnLoad: true,
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            title: 'Observed property',
+                            items: [
+                                {
+                                    xtype: 'textfield',
+                                    id: 'opName',
+                                    name: 'name',
+                                    fieldLabel: 'Name',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    id: 'opDefinition',
+                                    name: 'definition',
+                                    fieldLabel: 'Definition URN',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    name: 'description',
+                                    fieldLabel: 'Description',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'fieldcontainer',
+                                    height: 28,
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    fieldLabel: 'Correct Quality Index Constraints',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'sqiChoose',
+                                            width: 110,
+                                            name: 'ctype',
+                                            fieldLabel: '',
+                                            labelWidth: 50,
+                                            emptyText: 'Choose...',
+                                            displayField: 'name',
+                                            queryMode: 'local',
+                                            store: 'constraint',
+                                            valueField: 'value'
+                                        },
+                                        {
+                                            xtype: 'numberfield',
+                                            hidden: true,
+                                            id: 'sqiFrom',
+                                            name: 'from',
+                                            fieldLabel: 'From',
+                                            labelAlign: 'right',
+                                            labelWidth: 50,
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'numberfield',
+                                            hidden: true,
+                                            id: 'sqiTo',
+                                            name: 'to',
+                                            fieldLabel: 'To',
+                                            labelAlign: 'right',
+                                            labelWidth: 40,
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            hidden: true,
+                                            id: 'sqiList',
+                                            name: 'list',
+                                            fieldLabel: 'List',
+                                            labelAlign: 'right',
+                                            labelWidth: 40,
+                                            flex: 1
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            dock: 'bottom',
+                            layout: {
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnForm',
+                                    text: 'Insert'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/offeringsEditor.js b/html/admin/app/view/ui/offeringsEditor.js
new file mode 100755
index 0000000..00a21fb
--- /dev/null
+++ b/html/admin/app/view/ui/offeringsEditor.js
@@ -0,0 +1,304 @@
+/*
+ * File: app/view/ui/offeringsEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.offeringsEditor', {
+    extend: 'Ext.tab.Panel',
+
+    minHeight: 400,
+    title: '',
+    activeTab: 0,
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    height: 450,
+                    minHeight: 400,
+                    title: 'Offerings',
+                    items: [
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'gridpanel',
+                                    id: 'gridoff',
+                                    margin: 8,
+                                    maxHeight: 250,
+                                    minHeight: 150,
+                                    title: '',
+                                    forceFit: true,
+                                    store: 'gridofferings',
+                                    viewConfig: {
+
+                                    },
+                                    dockedItems: [
+                                        {
+                                            xtype: 'toolbar',
+                                            dock: 'top',
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    id: 'btnNew',
+                                                    text: 'New'
+                                                },
+                                                {
+                                                    xtype: 'button',
+                                                    disabled: true,
+                                                    id: 'btnRemove',
+                                                    text: 'Remove selected'
+                                                }
+                                            ]
+                                        }
+                                    ],
+                                    columns: [
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'name',
+                                            text: 'Name'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'description',
+                                            text: 'Description'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'procedures',
+                                            text: 'Procedures'
+                                        },
+                                        {
+                                            xtype: 'datecolumn',
+                                            dataIndex: 'expiration',
+                                            text: 'Expiration',
+                                            format: 'c'
+                                        },
+                                        {
+                                            xtype: 'booleancolumn',
+                                            dataIndex: 'active',
+                                            text: 'Active'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    hidden: true,
+                                    id: 'frmOfferings',
+                                    bodyPadding: 10,
+                                    title: '',
+                                    trackResetOnLoad: true,
+                                    items: [
+                                        {
+                                            xtype: 'fieldset',
+                                            title: 'Offerings',
+                                            items: [
+                                                {
+                                                    xtype: 'textfield',
+                                                    id: 'offName',
+                                                    name: 'name',
+                                                    fieldLabel: 'Name',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'description',
+                                                    fieldLabel: 'Description',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'datefield',
+                                                    name: 'expiration',
+                                                    fieldLabel: 'Expiration',
+                                                    format: 'c',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'checkboxfield',
+                                                    name: 'active',
+                                                    fieldLabel: 'Visibility',
+                                                    boxLabel: 'enabled',
+                                                    anchor: '100%'
+                                                }
+                                            ]
+                                        }
+                                    ],
+                                    dockedItems: [
+                                        {
+                                            xtype: 'toolbar',
+                                            ui: 'footer',
+                                            dock: 'bottom',
+                                            layout: {
+                                                pack: 'center',
+                                                type: 'hbox'
+                                            },
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    id: 'btnForm',
+                                                    text: 'Insert'
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    height: 450,
+                    layout: {
+                        align: 'stretch',
+                        type: 'vbox'
+                    },
+                    title: 'Offering-Procedure memberships',
+                    items: [
+                        {
+                            xtype: 'panel',
+                            border: 0,
+                            height: 40,
+                            html: 'Click & Drag procedures to add or remove membership',
+                            padding: '16 16 8 16',
+                            title: ''
+                        },
+                        {
+                            xtype: 'panel',
+                            autoRender: true,
+                            border: 0,
+                            minHeight: 400,
+                            layout: {
+                                align: 'stretch',
+                                type: 'hbox'
+                            },
+                            flex: 1,
+                            items: [
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 300,
+                                    minHeight: 350,
+                                    layout: {
+                                        type: 'fit'
+                                    },
+                                    bodyPadding: 8,
+                                    title: '',
+                                    flex: 0.5,
+                                    items: [
+                                        {
+                                            xtype: 'gridpanel',
+                                            id: 'gridMembers',
+                                            autoScroll: true,
+                                            title: '',
+                                            forceFit: true,
+                                            store: 'proceduresMembers',
+                                            viewConfig: {
+                                                multiSelect: true,
+                                                plugins: [
+                                                    Ext.create('Ext.grid.plugin.DragDrop', {
+                                                        ddGroup: 'offeringsprocedures',
+                                                        dragGroup: 'gridMembers',
+                                                        dropGroup: 'gridNonMembers'
+                                                    })
+                                                ]
+                                            },
+                                            dockedItems: [
+                                                {
+                                                    xtype: 'toolbar',
+                                                    dock: 'top',
+                                                    items: [
+                                                        {
+                                                            xtype: 'combobox',
+                                                            id: 'cbOfferings',
+                                                            fieldLabel: 'Choose an offering',
+                                                            labelStyle: 'color: white;',
+                                                            labelWidth: 140,
+                                                            displayField: 'name',
+                                                            store: 'cmbname',
+                                                            valueField: 'name',
+                                                            flex: 1
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            columns: [
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'name',
+                                                    text: 'Name'
+                                                },
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'description',
+                                                    text: 'Description'
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'panel',
+                                    border: 0,
+                                    height: 300,
+                                    minHeight: 350,
+                                    layout: {
+                                        type: 'fit'
+                                    },
+                                    bodyPadding: 8,
+                                    title: '',
+                                    flex: 0.5,
+                                    items: [
+                                        {
+                                            xtype: 'gridpanel',
+                                            id: 'gridNonMembers',
+                                            title: 'Not members',
+                                            forceFit: true,
+                                            store: 'proceduresNonmembers',
+                                            viewConfig: {
+                                                multiSelect: true,
+                                                plugins: [
+                                                    Ext.create('Ext.grid.plugin.DragDrop', {
+                                                        ddGroup: 'offeringsprocedures',
+                                                        dragGroup: 'gridNonMembers',
+                                                        dropGroup: 'gridMembers'
+                                                    })
+                                                ]
+                                            },
+                                            columns: [
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'name',
+                                                    text: 'Name'
+                                                },
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'description',
+                                                    text: 'Description'
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/paths.js b/html/admin/app/view/ui/paths.js
new file mode 100755
index 0000000..9f25807
--- /dev/null
+++ b/html/admin/app/view/ui/paths.js
@@ -0,0 +1,42 @@
+/*
+ * File: app/view/ui/paths.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.paths', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    bodyStyle: 'centerBody',
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'textfield',
+                    name: 'istsos',
+                    fieldLabel: 'istSOS lib',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'textfield',
+                    name: 'services',
+                    fieldLabel: 'istSOS config',
+                    anchor: '100%'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/procedure.js b/html/admin/app/view/ui/procedure.js
new file mode 100755
index 0000000..ea88f2a
--- /dev/null
+++ b/html/admin/app/view/ui/procedure.js
@@ -0,0 +1,1420 @@
+/*
+ * File: app/view/ui/procedure.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.procedure', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    id: 'newprocpanel',
+    autoScroll: true,
+    defaults: 'defaults: {\nanchor: \'100%\',\npadding: \'10px\',\n }',
+    layout: {
+        type: 'anchor'
+    },
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'container',
+                    border: 0,
+                    padding: 8,
+                    layout: {
+                        type: 'anchor'
+                    },
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            id: 'toolspanel',
+                            title: 'Tools',
+                            items: [
+                                {
+                                    xtype: 'container',
+                                    html: '<H4>Copy configuration from an existing procedure:</H4>'
+                                },
+                                {
+                                    xtype: 'fieldcontainer',
+                                    id: 'oeSettings',
+                                    layout: {
+                                        type: 'hbox'
+                                    },
+                                    fieldLabel: '',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'cmbServices',
+                                            fieldLabel: 'Service',
+                                            labelWidth: 60,
+                                            displayField: 'service',
+                                            store: 'storeServices',
+                                            valueField: 'service',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 15
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'oeCbOffering',
+                                            name: 'offering',
+                                            fieldLabel: 'Offering',
+                                            labelWidth: 60,
+                                            displayField: 'name',
+                                            queryMode: 'local',
+                                            store: 'offerings',
+                                            valueField: 'name',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 15
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'oeCbProcedure',
+                                            name: 'procedure',
+                                            fieldLabel: 'Procedure',
+                                            labelWidth: 70,
+                                            displayField: 'name',
+                                            queryMode: 'local',
+                                            store: 'procedurelist',
+                                            valueField: 'name',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'container',
+                                            width: 15
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'btnTemplateFill',
+                                            text: 'Fill form',
+                                            flex: 1
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            height: 30,
+                            html: '<h2>Procedure:</h2>',
+                            padding: '0 0 16 0'
+                        },
+                        {
+                            xtype: 'form',
+                            border: 10,
+                            id: 'generalInfo',
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'fieldset',
+                                    border: 0,
+                                    margin: 0,
+                                    padding: 10,
+                                    checkboxName: 'cbproxy',
+                                    title: 'General info',
+                                    items: [
+                                        {
+                                            xtype: 'displayfield',
+                                            hidden: true,
+                                            id: 'asid',
+                                            name: 'assignedSensorId',
+                                            fieldLabel: 'Sensor ID',
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            id: 'procedurename',
+                                            name: 'system',
+                                            fieldLabel: 'Name',
+                                            allowBlank: false,
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'description',
+                                            fieldLabel: 'Description',
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'keywords',
+                                            fieldLabel: 'Keywords',
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'form',
+                            border: 0,
+                            id: 'classification',
+                            title: '',
+                            items: [
+                                {
+                                    xtype: 'fieldset',
+                                    border: 0,
+                                    margin: 0,
+                                    title: 'Classification',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'cmbsystemtype',
+                                            name: 'systemtype',
+                                            fieldLabel: 'System type',
+                                            allowBlank: false,
+                                            displayField: 'name',
+                                            forceSelection: true,
+                                            store: 'systemtype',
+                                            valueField: 'name',
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'sensortype',
+                                            fieldLabel: 'Sensor Type',
+                                            allowBlank: false,
+                                            emptyText: 'tipping-bucket gauge, ...',
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            margin: 0,
+                            title: 'Location',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    id: 'frmLocation',
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'name',
+                                            fieldLabel: 'FOI name',
+                                            allowBlank: false,
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'cbepsg',
+                                            name: 'epsg',
+                                            fieldLabel: 'EPSG',
+                                            allowBlank: false,
+                                            displayField: 'name',
+                                            forceSelection: true,
+                                            store: 'locationEPSG',
+                                            valueField: 'name',
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'fieldcontainer',
+                                            height: 30,
+                                            layout: {
+                                                type: 'column'
+                                            },
+                                            fieldLabel: 'Coordinates',
+                                            items: [
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'x',
+                                                    fieldLabel: 'X',
+                                                    labelWidth: 20,
+                                                    allowBlank: false,
+                                                    columnWidth: 0.33
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'y',
+                                                    fieldLabel: 'Y',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 20,
+                                                    allowBlank: false,
+                                                    columnWidth: 0.33
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'z',
+                                                    fieldLabel: 'Z',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 20,
+                                                    allowBlank: false,
+                                                    columnWidth: 0.34
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            id: 'smlOutputs',
+                            margin: 0,
+                            padding: 8,
+                            title: 'Outputs',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    id: 'frmSmlOutputs',
+                                    itemId: 'frmSml',
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'cmbObservedProperty',
+                                            itemId: 'cmbSml',
+                                            name: 'name',
+                                            fieldLabel: '<span class=\'softLink\' onclick=\'Ext.getCmp("newprocpanel").openObsPropEditorWin();\'>Observed property</span>',
+                                            labelWidth: 120,
+                                            allowBlank: false,
+                                            displayField: 'definition',
+                                            forceSelection: true,
+                                            store: 'cmbobservedproperties',
+                                            valueField: 'definition',
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'cmbUom',
+                                            name: 'uom',
+                                            fieldLabel: '<span class=\'softLink\' onclick=\'Ext.getCmp("newprocpanel").openUomsEditorWin();\'>Unit of measure</span>',
+                                            labelWidth: 120,
+                                            allowBlank: false,
+                                            displayField: 'name',
+                                            forceSelection: true,
+                                            store: 'cmbuom',
+                                            valueField: 'name',
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'description',
+                                            fieldLabel: 'Description',
+                                            labelWidth: 120,
+                                            anchor: '100%'
+                                        },
+                                        {
+                                            xtype: 'fieldcontainer',
+                                            height: 28,
+                                            layout: {
+                                                align: 'stretch',
+                                                type: 'hbox'
+                                            },
+                                            fieldLabel: 'Statistical Quality Index Constraints',
+                                            labelWidth: 230,
+                                            items: [
+                                                {
+                                                    xtype: 'combobox',
+                                                    id: 'constrChoose',
+                                                    width: 150,
+                                                    name: 'ctype',
+                                                    fieldLabel: '',
+                                                    labelWidth: 50,
+                                                    emptyText: 'Choose...',
+                                                    displayField: 'name',
+                                                    queryMode: 'local',
+                                                    store: 'constraint',
+                                                    valueField: 'value'
+                                                },
+                                                {
+                                                    xtype: 'numberfield',
+                                                    hidden: true,
+                                                    id: 'constrFrom',
+                                                    name: 'from',
+                                                    fieldLabel: 'From',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 50,
+                                                    flex: 1
+                                                },
+                                                {
+                                                    xtype: 'numberfield',
+                                                    hidden: true,
+                                                    id: 'constrTo',
+                                                    name: 'to',
+                                                    fieldLabel: 'To',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 40,
+                                                    flex: 1
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    hidden: true,
+                                                    id: 'constrList',
+                                                    name: 'list',
+                                                    fieldLabel: 'List',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 40,
+                                                    flex: 1
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            itemId: 'btnAddSml',
+                                            margin: '0 0 10 0',
+                                            text: 'Add',
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'gridpanel',
+                                    height: 120,
+                                    itemId: 'gridSml',
+                                    minHeight: 120,
+                                    title: '',
+                                    forceFit: true,
+                                    store: 'gridoutputs',
+                                    viewConfig: {
+
+                                    },
+                                    dockedItems: [
+                                        {
+                                            xtype: 'toolbar',
+                                            itemId: 'gridToolbar',
+                                            dock: 'top',
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    itemId: 'btnRemoveSml',
+                                                    text: 'Remove selected'
+                                                }
+                                            ]
+                                        }
+                                    ],
+                                    columns: [
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'name',
+                                            text: 'Name'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'description',
+                                            text: 'Description'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'definition',
+                                            text: 'Definition'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'uom',
+                                            text: 'Uom'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            hidden: true,
+                                            dataIndex: 'role',
+                                            text: 'Role'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'from',
+                                            text: 'From'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'to',
+                                            text: 'To'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'list',
+                                            text: 'List'
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    border: 0,
+                    padding: 8,
+                    layout: {
+                        type: 'anchor'
+                    },
+                    items: [
+                        {
+                            xtype: 'container',
+                            height: 30,
+                            html: '<h4>Optional parameters:</h4>',
+                            layout: {
+                                type: 'fit'
+                            }
+                        },
+                        {
+                            xtype: 'fieldset',
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Contacts (optional)',
+                            items: [
+                                {
+                                    xtype: 'container',
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'form',
+                                            border: 0,
+                                            id: 'frmOwner',
+                                            title: '',
+                                            items: [
+                                                {
+                                                    xtype: 'hiddenfield',
+                                                    name: 'role',
+                                                    value: 'urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:owner',
+                                                    fieldLabel: 'Label',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'organizationName',
+                                                    fieldLabel: 'Owner',
+                                                    labelWidth: 130,
+                                                    allowBlank: false,
+                                                    emptyText: 'Organization name...',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'fieldset',
+                                                    collapsed: true,
+                                                    collapsible: true,
+                                                    title: 'Details (optional)',
+                                                    anchor: '100%',
+                                                    items: [
+                                                        {
+                                                            xtype: 'container',
+                                                            layout: {
+                                                                type: 'column'
+                                                            },
+                                                            anchor: '100%',
+                                                            items: [
+                                                                {
+                                                                    xtype: 'container',
+                                                                    padding: 6,
+                                                                    layout: {
+                                                                        type: 'anchor'
+                                                                    },
+                                                                    columnWidth: 0.5,
+                                                                    items: [
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'individualName',
+                                                                            fieldLabel: 'Person',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'voice',
+                                                                            fieldLabel: 'Telephone',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'fax',
+                                                                            fieldLabel: 'Fax',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'email',
+                                                                            fieldLabel: 'email',
+                                                                            anchor: '100%'
+                                                                        }
+                                                                    ]
+                                                                },
+                                                                {
+                                                                    xtype: 'container',
+                                                                    padding: 6,
+                                                                    layout: {
+                                                                        type: 'anchor'
+                                                                    },
+                                                                    columnWidth: 0.5,
+                                                                    items: [
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'web',
+                                                                            fieldLabel: 'Web',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'deliveryPoint',
+                                                                            fieldLabel: 'Address',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'city',
+                                                                            fieldLabel: 'City',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'administrativeArea',
+                                                                            fieldLabel: 'Admin area',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'postalcode',
+                                                                            fieldLabel: 'Postal code',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'country',
+                                                                            fieldLabel: 'Country',
+                                                                            anchor: '100%'
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'container',
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'form',
+                                            border: 0,
+                                            id: 'frmManufacturer',
+                                            title: '',
+                                            items: [
+                                                {
+                                                    xtype: 'hiddenfield',
+                                                    name: 'role',
+                                                    value: 'urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:manufacturer',
+                                                    fieldLabel: 'Label',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'organizationName',
+                                                    fieldLabel: 'Manufacturer',
+                                                    labelWidth: 130,
+                                                    allowBlank: false,
+                                                    emptyText: 'Organization name...',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'fieldset',
+                                                    collapsed: true,
+                                                    collapsible: true,
+                                                    title: 'Details (optional)',
+                                                    items: [
+                                                        {
+                                                            xtype: 'container',
+                                                            layout: {
+                                                                type: 'column'
+                                                            },
+                                                            anchor: '100%',
+                                                            items: [
+                                                                {
+                                                                    xtype: 'container',
+                                                                    padding: 6,
+                                                                    layout: {
+                                                                        type: 'anchor'
+                                                                    },
+                                                                    columnWidth: 0.5,
+                                                                    items: [
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'individualName',
+                                                                            fieldLabel: 'Person',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'voice',
+                                                                            fieldLabel: 'Telephone',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'fax',
+                                                                            fieldLabel: 'Fax',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'email',
+                                                                            fieldLabel: 'email',
+                                                                            anchor: '100%'
+                                                                        }
+                                                                    ]
+                                                                },
+                                                                {
+                                                                    xtype: 'container',
+                                                                    padding: 6,
+                                                                    layout: {
+                                                                        type: 'anchor'
+                                                                    },
+                                                                    columnWidth: 0.5,
+                                                                    items: [
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'web',
+                                                                            fieldLabel: 'Web',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'deliveryPoint',
+                                                                            fieldLabel: 'Address',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'city',
+                                                                            fieldLabel: 'City',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'administrativeArea',
+                                                                            fieldLabel: 'Admin area',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'postalcode',
+                                                                            fieldLabel: 'Postal code',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'country',
+                                                                            fieldLabel: 'Country',
+                                                                            anchor: '100%'
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'container',
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'form',
+                                            border: 0,
+                                            id: 'frmOperator',
+                                            title: '',
+                                            items: [
+                                                {
+                                                    xtype: 'hiddenfield',
+                                                    name: 'role',
+                                                    value: 'urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:operator',
+                                                    fieldLabel: 'Label',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'organizationName',
+                                                    fieldLabel: 'Operator',
+                                                    labelWidth: 130,
+                                                    allowBlank: false,
+                                                    emptyText: 'Organization name...',
+                                                    anchor: '100%'
+                                                },
+                                                {
+                                                    xtype: 'fieldset',
+                                                    collapsed: true,
+                                                    collapsible: true,
+                                                    title: 'Details (optional)',
+                                                    items: [
+                                                        {
+                                                            xtype: 'container',
+                                                            layout: {
+                                                                type: 'column'
+                                                            },
+                                                            anchor: '100%',
+                                                            items: [
+                                                                {
+                                                                    xtype: 'container',
+                                                                    padding: 6,
+                                                                    layout: {
+                                                                        type: 'anchor'
+                                                                    },
+                                                                    columnWidth: 0.5,
+                                                                    items: [
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'individualName',
+                                                                            fieldLabel: 'Person',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'voice',
+                                                                            fieldLabel: 'Telephone',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'fax',
+                                                                            fieldLabel: 'Fax',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'email',
+                                                                            fieldLabel: 'email',
+                                                                            anchor: '100%'
+                                                                        }
+                                                                    ]
+                                                                },
+                                                                {
+                                                                    xtype: 'container',
+                                                                    padding: 6,
+                                                                    layout: {
+                                                                        type: 'anchor'
+                                                                    },
+                                                                    columnWidth: 0.5,
+                                                                    items: [
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'web',
+                                                                            fieldLabel: 'Web',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'deliveryPoint',
+                                                                            fieldLabel: 'Address',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'city',
+                                                                            fieldLabel: 'City',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'administrativeArea',
+                                                                            fieldLabel: 'Admin area',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'postalcode',
+                                                                            fieldLabel: 'Postal code',
+                                                                            anchor: '100%'
+                                                                        },
+                                                                        {
+                                                                            xtype: 'textfield',
+                                                                            name: 'country',
+                                                                            fieldLabel: 'Country',
+                                                                            anchor: '100%'
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        }
+                                                    ]
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            id: 'smlDocumentation',
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Documents (optional)',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    height: 150,
+                                    itemId: 'frmSml',
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'vbox'
+                                    },
+                                    bodyPadding: '10 0 5 0',
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'description',
+                                            fieldLabel: 'Description',
+                                            allowBlank: false
+                                        },
+                                        {
+                                            xtype: 'combobox',
+                                            id: 'applicationType',
+                                            itemId: 'cmbSml',
+                                            name: 'format',
+                                            fieldLabel: 'Format',
+                                            displayField: 'format',
+                                            forceSelection: true,
+                                            queryMode: 'local',
+                                            store: 'cmbdocumentformat',
+                                            typeAhead: true,
+                                            valueField: 'format',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'datefield',
+                                            name: 'date',
+                                            fieldLabel: 'Date',
+                                            format: 'Y-m-d',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'link',
+                                            fieldLabel: 'Link',
+                                            allowBlank: false,
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            itemId: 'btnAddSml',
+                                            width: 30,
+                                            text: 'Add'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'gridpanel',
+                                    height: 120,
+                                    itemId: 'gridSml',
+                                    minHeight: 120,
+                                    title: '',
+                                    forceFit: true,
+                                    store: 'griddocumentation',
+                                    viewConfig: {
+
+                                    },
+                                    dockedItems: [
+                                        {
+                                            xtype: 'toolbar',
+                                            itemId: 'gridToolbar',
+                                            dock: 'top',
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    itemId: 'btnRemoveSml',
+                                                    text: 'Remove selected'
+                                                }
+                                            ]
+                                        }
+                                    ],
+                                    columns: [
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'description',
+                                            text: 'Description'
+                                        },
+                                        {
+                                            xtype: 'datecolumn',
+                                            dataIndex: 'date',
+                                            text: 'Date',
+                                            format: 'Y-m-d'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'format',
+                                            text: 'Format'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'link',
+                                            text: 'Link'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Interfaces (optional)',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    id: 'frmInterfaces',
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'interfaces',
+                                            fieldLabel: 'Name list (csv)',
+                                            emptyText: 'RS-232,RS-485,BLUETOOTH,WIFI,IR ...',
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            hidden: true,
+                            id: 'smlInputs',
+                            padding: 8,
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Inputs (optional)',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    height: 30,
+                                    itemId: 'frmSml',
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            itemId: 'cmbSml',
+                                            margin: '0 6 0 0',
+                                            name: 'name',
+                                            fieldLabel: '<span class=\'softLink\' onclick=\'alert(\"to do\");\'>Name</span>',
+                                            labelWidth: 40,
+                                            allowBlank: false,
+                                            displayField: 'name',
+                                            store: 'cmbphenomenon',
+                                            valueField: 'name',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'description',
+                                            fieldLabel: 'Description',
+                                            labelAlign: 'right',
+                                            labelWidth: 80,
+                                            allowBlank: false,
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            itemId: 'btnAddSml',
+                                            margin: '0 0 0 6',
+                                            width: 50,
+                                            text: 'Add'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'gridpanel',
+                                    height: 120,
+                                    itemId: 'gridSml',
+                                    margin: 8,
+                                    minHeight: 120,
+                                    title: '',
+                                    store: 'gridinput',
+                                    viewConfig: {
+
+                                    },
+                                    dockedItems: [
+                                        {
+                                            xtype: 'toolbar',
+                                            itemId: 'gridToolbar',
+                                            dock: 'top',
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    itemId: 'btnRemoveSml',
+                                                    text: 'Remove selected'
+                                                }
+                                            ]
+                                        }
+                                    ],
+                                    columns: [
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'name',
+                                            text: 'Name'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'description',
+                                            flex: 0.5,
+                                            text: 'Description'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'definition',
+                                            flex: 1,
+                                            text: 'Definition'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            id: 'smlIdentification',
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Identification (optional)',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    height: 30,
+                                    id: 'frmIdentification',
+                                    itemId: 'frmSml',
+                                    layout: {
+                                        align: 'stretch',
+                                        type: 'hbox'
+                                    },
+                                    title: '',
+                                    anchor: '100%',
+                                    items: [
+                                        {
+                                            xtype: 'combobox',
+                                            itemId: 'cmbSml',
+                                            margin: '0 6 0 0',
+                                            name: 'name',
+                                            fieldLabel: 'Name',
+                                            labelWidth: 40,
+                                            allowBlank: false,
+                                            displayField: 'name',
+                                            store: 'cmbidentification',
+                                            valueField: 'name',
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'value',
+                                            fieldLabel: 'Value',
+                                            labelAlign: 'right',
+                                            labelWidth: 40,
+                                            allowBlank: false,
+                                            flex: 1
+                                        },
+                                        {
+                                            xtype: 'button',
+                                            id: 'btnAddIdentification',
+                                            itemId: 'btnAddSml',
+                                            margin: '0 0 0 6',
+                                            width: 50,
+                                            text: 'Add'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'gridpanel',
+                                    height: 120,
+                                    id: 'gridIdentification',
+                                    itemId: 'gridSml',
+                                    margin: 8,
+                                    minHeight: 120,
+                                    title: '',
+                                    store: 'grididentification',
+                                    viewConfig: {
+
+                                    },
+                                    dockedItems: [
+                                        {
+                                            xtype: 'toolbar',
+                                            itemId: 'gridToolbar',
+                                            dock: 'top',
+                                            items: [
+                                                {
+                                                    xtype: 'button',
+                                                    id: 'btnRemoveIdentification',
+                                                    itemId: 'btnRemoveSml',
+                                                    text: 'Remove selected'
+                                                }
+                                            ]
+                                        }
+                                    ],
+                                    columns: [
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'name',
+                                            text: 'Name'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'value',
+                                            flex: 0.5,
+                                            text: 'Value'
+                                        },
+                                        {
+                                            xtype: 'gridcolumn',
+                                            dataIndex: 'definition',
+                                            flex: 1,
+                                            text: 'Definition'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Characteristics (optional)',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    id: 'characteristics',
+                                    margin: 0,
+                                    padding: 0,
+                                    collapsed: false,
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'textfield',
+                                            name: 'characteristics',
+                                            fieldLabel: 'Technical specification sheet URL',
+                                            labelWidth: 210,
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'fieldset',
+                            checkboxToggle: true,
+                            collapsed: true,
+                            collapsible: true,
+                            title: 'Capabilities',
+                            items: [
+                                {
+                                    xtype: 'form',
+                                    border: 0,
+                                    id: 'frmCapabilities',
+                                    collapsed: false,
+                                    title: '',
+                                    items: [
+                                        {
+                                            xtype: 'fieldcontainer',
+                                            height: 30,
+                                            layout: {
+                                                type: 'column'
+                                            },
+                                            fieldLabel: 'Sampling time resolution',
+                                            labelWidth: 180,
+                                            items: [
+                                                {
+                                                    xtype: 'combobox',
+                                                    id: 'strCombo',
+                                                    fieldLabel: 'Label',
+                                                    hideLabel: true,
+                                                    displayField: 'combo',
+                                                    store: 'cmbcapabilitiesuom',
+                                                    valueField: 'uom',
+                                                    columnWidth: 0.5
+                                                },
+                                                {
+                                                    xtype: 'numberfield',
+                                                    id: 'strValue',
+                                                    fieldLabel: 'Value',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 60,
+                                                    columnWidth: 0.5
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            xtype: 'fieldcontainer',
+                                            height: 30,
+                                            id: 'MyFieldContainer8',
+                                            layout: {
+                                                type: 'column'
+                                            },
+                                            fieldLabel: 'Acquisition time resolution',
+                                            labelWidth: 180,
+                                            items: [
+                                                {
+                                                    xtype: 'combobox',
+                                                    id: 'atrCombo',
+                                                    fieldLabel: 'Label',
+                                                    hideLabel: true,
+                                                    displayField: 'combo',
+                                                    store: 'cmbcapabilitiesuom2',
+                                                    valueField: 'uom',
+                                                    columnWidth: 0.5
+                                                },
+                                                {
+                                                    xtype: 'numberfield',
+                                                    id: 'atrValue',
+                                                    fieldLabel: 'Value',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 60,
+                                                    columnWidth: 0.5
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            xtype: 'textfield',
+                                            id: 'storeTypeValue',
+                                            fieldLabel: 'Storage type',
+                                            labelWidth: 180,
+                                            anchor: '100%'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'fieldset',
+                                    id: 'smlCapabilities',
+                                    padding: 8,
+                                    collapsed: true,
+                                    collapsible: true,
+                                    title: 'Additional Capabilities (optional)',
+                                    items: [
+                                        {
+                                            xtype: 'form',
+                                            border: 0,
+                                            height: 30,
+                                            itemId: 'frmSml',
+                                            layout: {
+                                                align: 'stretch',
+                                                type: 'hbox'
+                                            },
+                                            title: '',
+                                            anchor: '100%',
+                                            items: [
+                                                {
+                                                    xtype: 'combobox',
+                                                    itemId: 'cmbSml',
+                                                    margin: '0 6 0 0',
+                                                    name: 'name',
+                                                    fieldLabel: 'Name',
+                                                    labelWidth: 60,
+                                                    allowBlank: false,
+                                                    displayField: 'combo',
+                                                    store: 'cmbCapabilities',
+                                                    valueField: 'name',
+                                                    flex: 1
+                                                },
+                                                {
+                                                    xtype: 'textfield',
+                                                    name: 'value',
+                                                    fieldLabel: 'Value',
+                                                    labelAlign: 'right',
+                                                    labelWidth: 60,
+                                                    allowBlank: false,
+                                                    flex: 1
+                                                },
+                                                {
+                                                    xtype: 'button',
+                                                    itemId: 'btnAddSml',
+                                                    margin: '0 0 0 6',
+                                                    width: 50,
+                                                    text: 'Add'
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            xtype: 'gridpanel',
+                                            height: 120,
+                                            itemId: 'gridSml',
+                                            margin: 8,
+                                            minHeight: 120,
+                                            title: '',
+                                            store: 'gridCapabilities',
+                                            viewConfig: {
+
+                                            },
+                                            dockedItems: [
+                                                {
+                                                    xtype: 'toolbar',
+                                                    itemId: 'gridToolbar',
+                                                    dock: 'top',
+                                                    items: [
+                                                        {
+                                                            xtype: 'button',
+                                                            itemId: 'btnRemoveSml',
+                                                            text: 'Remove selected'
+                                                        }
+                                                    ]
+                                                }
+                                            ],
+                                            columns: [
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'name',
+                                                    text: 'Name'
+                                                },
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'value',
+                                                    flex: 0.5,
+                                                    text: 'Value'
+                                                },
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'uom',
+                                                    text: 'Unit of measure'
+                                                },
+                                                {
+                                                    xtype: 'gridcolumn',
+                                                    dataIndex: 'definition',
+                                                    flex: 1,
+                                                    text: 'Definition'
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/proceduresList.js b/html/admin/app/view/ui/proceduresList.js
new file mode 100755
index 0000000..42c0718
--- /dev/null
+++ b/html/admin/app/view/ui/proceduresList.js
@@ -0,0 +1,81 @@
+/*
+ * File: app/view/ui/proceduresList.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.proceduresList', {
+    extend: 'Ext.grid.Panel',
+
+    height: 400,
+    autoScroll: true,
+    forceFit: true,
+    store: 'procedurelist',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            dockedItems: [
+                {
+                    xtype: 'toolbar',
+                    dock: 'top',
+                    items: [
+                        {
+                            xtype: 'button',
+                            id: 'btnRemove',
+                            text: 'Delete selected'
+                        }
+                    ]
+                }
+            ],
+            viewConfig: {
+
+            },
+            columns: [
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'name',
+                    text: 'Name'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'description',
+                    text: 'Description'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'sensortype',
+                    text: 'Sensor Type'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'offerings',
+                    text: 'Offerings'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'observedproperties',
+                    text: 'Observedproperties'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'begin',
+                    text: 'BeginPosition'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'end',
+                    text: 'EndPosition'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/provider.js b/html/admin/app/view/ui/provider.js
new file mode 100755
index 0000000..7bef4c1
--- /dev/null
+++ b/html/admin/app/view/ui/provider.js
@@ -0,0 +1,117 @@
+/*
+ * File: app/view/ui/provider.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.provider', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'displayfield',
+                    hidden: true,
+                    id: 'messageField',
+                    fieldStyle: 'color: red;',
+                    name: 'message',
+                    fieldLabel: 'Message',
+                    labelStyle: 'color: red;',
+                    anchor: '100%'
+                },
+                {
+                    xtype: 'fieldset',
+                    title: 'Service Provider:',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'providername',
+                            fieldLabel: 'Name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'providersite',
+                            fieldLabel: 'Web site',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactname',
+                            fieldLabel: 'Contact name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactposition',
+                            fieldLabel: 'Contact position',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactvoice',
+                            fieldLabel: 'Voice',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactfax',
+                            fieldLabel: 'Fax',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactemail',
+                            fieldLabel: 'Email',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactdeliverypoint',
+                            fieldLabel: 'Address',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactpostalcode',
+                            fieldLabel: 'Postal code',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactcity',
+                            fieldLabel: 'City',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactadminarea',
+                            fieldLabel: 'State',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactcountry',
+                            fieldLabel: 'Country',
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/qualityindexEditor.js b/html/admin/app/view/ui/qualityindexEditor.js
new file mode 100755
index 0000000..b45efe8
--- /dev/null
+++ b/html/admin/app/view/ui/qualityindexEditor.js
@@ -0,0 +1,131 @@
+/*
+ * File: app/view/ui/qualityindexEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.qualityindexEditor', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'gridpanel',
+                    id: 'gridop',
+                    margin: 8,
+                    maxHeight: 250,
+                    title: '',
+                    forceFit: true,
+                    store: 'qistore',
+                    viewConfig: {
+
+                    },
+                    columns: [
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'code',
+                            text: 'Code'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'name',
+                            text: 'Name'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'description',
+                            text: 'Description'
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            dock: 'top',
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnNew',
+                                    text: 'New'
+                                },
+                                {
+                                    xtype: 'button',
+                                    disabled: true,
+                                    id: 'btnRemove',
+                                    text: 'Remove selected'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'form',
+                    border: 0,
+                    hidden: true,
+                    id: 'frmQuality',
+                    bodyPadding: 10,
+                    title: '',
+                    trackResetOnLoad: true,
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            title: 'Quality index',
+                            items: [
+                                {
+                                    xtype: 'textfield',
+                                    id: 'opCode',
+                                    name: 'code',
+                                    fieldLabel: 'Code',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    id: 'opName',
+                                    name: 'name',
+                                    fieldLabel: 'Name',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    name: 'description',
+                                    fieldLabel: 'Description',
+                                    anchor: '100%'
+                                }
+                            ]
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            dock: 'bottom',
+                            layout: {
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnForm',
+                                    text: 'Insert'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/serviceEditor.js b/html/admin/app/view/ui/serviceEditor.js
new file mode 100755
index 0000000..fcc4b77
--- /dev/null
+++ b/html/admin/app/view/ui/serviceEditor.js
@@ -0,0 +1,111 @@
+/*
+ * File: app/view/ui/serviceEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.serviceEditor', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'form',
+                    border: 0,
+                    id: 'frmServices',
+                    bodyPadding: 10,
+                    title: '',
+                    trackResetOnLoad: true,
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            title: 'Quality index',
+                            items: [
+                                {
+                                    xtype: 'textfield',
+                                    id: 'opService',
+                                    name: 'service',
+                                    fieldLabel: 'Name',
+                                    anchor: '100%'
+                                }
+                            ]
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            dock: 'bottom',
+                            layout: {
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnForm',
+                                    text: 'New'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'gridpanel',
+                    id: 'gridop',
+                    margin: 8,
+                    title: '',
+                    forceFit: true,
+                    store: 'storeServices',
+                    viewConfig: {
+
+                    },
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            dock: 'top',
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnNew',
+                                    text: 'New'
+                                },
+                                {
+                                    xtype: 'button',
+                                    disabled: true,
+                                    id: 'btnRemove',
+                                    text: 'Remove'
+                                }
+                            ]
+                        }
+                    ],
+                    columns: [
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'service',
+                            text: 'Service'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'path',
+                            text: 'Path'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/serviceconfig.js b/html/admin/app/view/ui/serviceconfig.js
new file mode 100755
index 0000000..434668e
--- /dev/null
+++ b/html/admin/app/view/ui/serviceconfig.js
@@ -0,0 +1,285 @@
+/*
+ * File: app/view/ui/serviceconfig.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.serviceconfig', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'container',
+                    html: '<h3>Service Provider:</h3>Here you can personalize the service provider information. It will be displayed in the getCapabilities document.',
+                    padding: '10 0 10 0'
+                },
+                {
+                    xtype: 'fieldset',
+                    id: 'provider',
+                    padding: 10,
+                    checkboxName: 'cbprovider',
+                    checkboxToggle: true,
+                    collapsed: true,
+                    collapsible: true,
+                    title: 'check to apply customizations',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'providername',
+                            fieldLabel: 'Name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'providersite',
+                            fieldLabel: 'Web site',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactname',
+                            fieldLabel: 'Contact name',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactposition',
+                            fieldLabel: 'Contact position',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactvoice',
+                            fieldLabel: 'Voice',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactfax',
+                            fieldLabel: 'Fax',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactemail',
+                            fieldLabel: 'Email',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactdeliverypoint',
+                            fieldLabel: 'Address',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactpostalcode',
+                            fieldLabel: 'Postal code',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactcity',
+                            fieldLabel: 'City',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactadminarea',
+                            fieldLabel: 'State',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'contactcountry',
+                            fieldLabel: 'Country',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    html: '<h3>Service Identification:</h3>Here you can personalize..',
+                    padding: '10 0 10 0'
+                },
+                {
+                    xtype: 'fieldset',
+                    id: 'identification',
+                    padding: 10,
+                    checkboxName: 'cbidentification',
+                    checkboxToggle: true,
+                    collapsed: true,
+                    collapsible: true,
+                    title: 'check to apply customizations',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'title',
+                            fieldLabel: 'Title',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'abstract',
+                            fieldLabel: 'Abstract',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'keywords',
+                            fieldLabel: 'Keywords',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'fees',
+                            fieldLabel: 'Fees',
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'accessconstrains',
+                            fieldLabel: 'Access constrains',
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    html: '<h3>Coordinate system:</h3>Here you can personalize..',
+                    padding: '10 0 10 0'
+                },
+                {
+                    xtype: 'fieldset',
+                    id: 'geo',
+                    padding: 10,
+                    checkboxName: 'cbcoordinates',
+                    checkboxToggle: true,
+                    collapsed: true,
+                    collapsible: true,
+                    title: 'check to apply customizations',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'istsosepsg',
+                            fieldLabel: 'Default EPSG',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'allowedepsg',
+                            fieldLabel: 'Permitted EPSG',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'xaxisname',
+                            fieldLabel: 'X axis name',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'yaxisname',
+                            fieldLabel: 'Y axis name',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'textfield',
+                            name: 'zaxisname',
+                            fieldLabel: 'Z axis name',
+                            allowBlank: false,
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    html: '<h3>GetObservation configuration:</h3>Here you can personalize..',
+                    padding: '10 0 10 0'
+                },
+                {
+                    xtype: 'fieldset',
+                    id: 'getobservation',
+                    padding: 10,
+                    checkboxName: 'cbgetobservation',
+                    checkboxToggle: true,
+                    collapsed: true,
+                    collapsible: true,
+                    title: 'check to apply customizations',
+                    items: [
+                        {
+                            xtype: 'numberfield',
+                            name: 'maxgoperiod',
+                            fieldLabel: 'Max request interval (hours)',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'numberfield',
+                            name: 'defaultqi',
+                            fieldLabel: 'Default quality index',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'numberfield',
+                            name: 'aggregatenodataqi',
+                            fieldLabel: 'Aggregation no-data quality index',
+                            allowBlank: false,
+                            anchor: '100%'
+                        },
+                        {
+                            xtype: 'numberfield',
+                            name: 'aggregatenodata',
+                            fieldLabel: 'Aggregation no-data value',
+                            allowBlank: false,
+                            anchor: '100%'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'container',
+                    html: '<h3>Proxy URL:</h3>Here you can personalize..',
+                    padding: '10 0 10 0'
+                },
+                {
+                    xtype: 'fieldset',
+                    id: 'proxyurl',
+                    padding: 10,
+                    checkboxName: 'cbgetobservation',
+                    checkboxToggle: true,
+                    collapsed: true,
+                    collapsible: true,
+                    title: 'check to apply customizations',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'url',
+                            fieldLabel: 'Url',
+                            allowBlank: false,
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/serviceurl.js b/html/admin/app/view/ui/serviceurl.js
new file mode 100755
index 0000000..dd3dc07
--- /dev/null
+++ b/html/admin/app/view/ui/serviceurl.js
@@ -0,0 +1,44 @@
+/*
+ * File: app/view/ui/serviceurl.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.serviceurl', {
+    extend: 'Ext.form.Panel',
+
+    border: 0,
+    bodyPadding: 10,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'fieldset',
+                    padding: 10,
+                    checkboxName: 'cbproxy',
+                    title: 'Proxy url',
+                    items: [
+                        {
+                            xtype: 'textfield',
+                            name: 'url',
+                            fieldLabel: 'Url',
+                            allowBlank: false,
+                            anchor: '100%'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/status.js b/html/admin/app/view/ui/status.js
new file mode 100755
index 0000000..d11e632
--- /dev/null
+++ b/html/admin/app/view/ui/status.js
@@ -0,0 +1,109 @@
+/*
+ * File: app/view/ui/status.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.status', {
+    extend: 'Ext.grid.Panel',
+
+    title: '',
+    forceFit: true,
+    store: 'serverstatus',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            viewConfig: {
+
+            },
+            columns: [
+                {
+                    xtype: 'gridcolumn',
+                    dataIndex: 'service',
+                    text: 'Service'
+                },
+                {
+                    xtype: 'numbercolumn',
+                    dataIndex: 'featuresOfInterest',
+                    text: 'Features Of Interest',
+                    format: 0
+                },
+                {
+                    xtype: 'numbercolumn',
+                    dataIndex: 'offerings',
+                    text: 'Offerings',
+                    format: 0
+                },
+                {
+                    xtype: 'numbercolumn',
+                    dataIndex: 'procedures',
+                    text: 'Procedures',
+                    format: 0
+                },
+                {
+                    xtype: 'numbercolumn',
+                    dataIndex: 'observedProperties',
+                    text: 'Observed Properties',
+                    format: 0
+                },
+                {
+                    xtype: 'gridcolumn',
+                    id: 'colAvailability',
+                    dataIndex: 'availability',
+                    text: 'Availability'
+                },
+                {
+                    xtype: 'gridcolumn',
+                    id: 'colDatabase',
+                    dataIndex: 'database',
+                    text: 'Database'
+                },
+                {
+                    xtype: 'booleancolumn',
+                    id: 'colGetcapabilities',
+                    dataIndex: 'getcapabilities',
+                    text: 'GetCapabilities'
+                },
+                {
+                    xtype: 'booleancolumn',
+                    id: 'colDescribesensor',
+                    dataIndex: 'describesensor',
+                    text: 'DescribeSensor'
+                },
+                {
+                    xtype: 'booleancolumn',
+                    id: 'colGetobservation',
+                    dataIndex: 'getobservation',
+                    text: 'GetObservation'
+                },
+                {
+                    xtype: 'booleancolumn',
+                    id: 'colGetfeatureofinterest',
+                    dataIndex: 'getfeatureofinterest',
+                    text: 'GetFeatureOfInterest'
+                },
+                {
+                    xtype: 'booleancolumn',
+                    id: 'colInsertobservation',
+                    dataIndex: 'insertobservation',
+                    text: 'InsertObservation'
+                },
+                {
+                    xtype: 'booleancolumn',
+                    id: 'colRegistersensor',
+                    dataIndex: 'registersensor',
+                    text: 'RegisterSensor'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/html/admin/app/view/ui/uomsEditor.js b/html/admin/app/view/ui/uomsEditor.js
new file mode 100755
index 0000000..fd19b8b
--- /dev/null
+++ b/html/admin/app/view/ui/uomsEditor.js
@@ -0,0 +1,124 @@
+/*
+ * File: app/view/ui/uomsEditor.js
+ *
+ * This file was generated by Ext Designer version 1.2.3.
+ * http://www.sencha.com/products/designer/
+ *
+ * This file will be auto-generated each and everytime you export.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsos.view.ui.uomsEditor', {
+    extend: 'Ext.panel.Panel',
+
+    border: 0,
+    title: '',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'gridpanel',
+                    id: 'gridop',
+                    margin: 8,
+                    maxHeight: 250,
+                    title: '',
+                    forceFit: true,
+                    store: 'griduoms',
+                    viewConfig: {
+
+                    },
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            dock: 'top',
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnNew',
+                                    text: 'New'
+                                },
+                                {
+                                    xtype: 'button',
+                                    disabled: true,
+                                    id: 'btnRemove',
+                                    text: 'Remove selected'
+                                }
+                            ]
+                        }
+                    ],
+                    columns: [
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'name',
+                            text: 'Code'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'description',
+                            text: 'Description'
+                        },
+                        {
+                            xtype: 'gridcolumn',
+                            dataIndex: 'procedures',
+                            text: 'Procedures'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'form',
+                    border: 0,
+                    hidden: true,
+                    id: 'frmUoms',
+                    bodyPadding: 10,
+                    title: '',
+                    trackResetOnLoad: true,
+                    items: [
+                        {
+                            xtype: 'fieldset',
+                            title: 'Observed property',
+                            items: [
+                                {
+                                    xtype: 'textfield',
+                                    id: 'opName',
+                                    name: 'name',
+                                    fieldLabel: 'Code',
+                                    anchor: '100%'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    name: 'description',
+                                    fieldLabel: 'Description',
+                                    anchor: '100%'
+                                }
+                            ]
+                        }
+                    ],
+                    dockedItems: [
+                        {
+                            xtype: 'toolbar',
+                            ui: 'footer',
+                            dock: 'bottom',
+                            layout: {
+                                pack: 'center',
+                                type: 'hbox'
+                            },
+                            items: [
+                                {
+                                    xtype: 'button',
+                                    id: 'btnForm',
+                                    text: 'Insert'
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+});
\ No newline at end of file
diff --git a/interface/app/view/uomsEditor.js b/html/admin/app/view/uomsEditor.js
similarity index 100%
rename from interface/app/view/uomsEditor.js
rename to html/admin/app/view/uomsEditor.js
diff --git a/interface/codemirror/LICENSE b/html/admin/codemirror/LICENSE
similarity index 100%
rename from interface/codemirror/LICENSE
rename to html/admin/codemirror/LICENSE
diff --git a/interface/codemirror/README.md b/html/admin/codemirror/README.md
similarity index 100%
rename from interface/codemirror/README.md
rename to html/admin/codemirror/README.md
diff --git a/interface/codemirror/demo/activeline.html b/html/admin/codemirror/demo/activeline.html
similarity index 100%
rename from interface/codemirror/demo/activeline.html
rename to html/admin/codemirror/demo/activeline.html
diff --git a/interface/codemirror/demo/changemode.html b/html/admin/codemirror/demo/changemode.html
similarity index 100%
rename from interface/codemirror/demo/changemode.html
rename to html/admin/codemirror/demo/changemode.html
diff --git a/interface/codemirror/demo/closetag.html b/html/admin/codemirror/demo/closetag.html
similarity index 100%
rename from interface/codemirror/demo/closetag.html
rename to html/admin/codemirror/demo/closetag.html
diff --git a/interface/codemirror/demo/complete.html b/html/admin/codemirror/demo/complete.html
similarity index 100%
rename from interface/codemirror/demo/complete.html
rename to html/admin/codemirror/demo/complete.html
diff --git a/interface/codemirror/demo/emacs.html b/html/admin/codemirror/demo/emacs.html
similarity index 100%
rename from interface/codemirror/demo/emacs.html
rename to html/admin/codemirror/demo/emacs.html
diff --git a/interface/codemirror/demo/folding.html b/html/admin/codemirror/demo/folding.html
similarity index 100%
rename from interface/codemirror/demo/folding.html
rename to html/admin/codemirror/demo/folding.html
diff --git a/interface/codemirror/demo/formatting.html b/html/admin/codemirror/demo/formatting.html
similarity index 100%
rename from interface/codemirror/demo/formatting.html
rename to html/admin/codemirror/demo/formatting.html
diff --git a/interface/codemirror/demo/fullscreen.html b/html/admin/codemirror/demo/fullscreen.html
similarity index 100%
rename from interface/codemirror/demo/fullscreen.html
rename to html/admin/codemirror/demo/fullscreen.html
diff --git a/interface/codemirror/demo/loadmode.html b/html/admin/codemirror/demo/loadmode.html
similarity index 100%
rename from interface/codemirror/demo/loadmode.html
rename to html/admin/codemirror/demo/loadmode.html
diff --git a/interface/codemirror/demo/marker.html b/html/admin/codemirror/demo/marker.html
similarity index 100%
rename from interface/codemirror/demo/marker.html
rename to html/admin/codemirror/demo/marker.html
diff --git a/interface/codemirror/demo/matchhighlighter.html b/html/admin/codemirror/demo/matchhighlighter.html
similarity index 100%
rename from interface/codemirror/demo/matchhighlighter.html
rename to html/admin/codemirror/demo/matchhighlighter.html
diff --git a/interface/codemirror/demo/mustache.html b/html/admin/codemirror/demo/mustache.html
similarity index 100%
rename from interface/codemirror/demo/mustache.html
rename to html/admin/codemirror/demo/mustache.html
diff --git a/interface/codemirror/demo/preview.html b/html/admin/codemirror/demo/preview.html
similarity index 100%
rename from interface/codemirror/demo/preview.html
rename to html/admin/codemirror/demo/preview.html
diff --git a/interface/codemirror/demo/resize.html b/html/admin/codemirror/demo/resize.html
similarity index 100%
rename from interface/codemirror/demo/resize.html
rename to html/admin/codemirror/demo/resize.html
diff --git a/interface/codemirror/demo/runmode.html b/html/admin/codemirror/demo/runmode.html
similarity index 100%
rename from interface/codemirror/demo/runmode.html
rename to html/admin/codemirror/demo/runmode.html
diff --git a/interface/codemirror/demo/search.html b/html/admin/codemirror/demo/search.html
similarity index 100%
rename from interface/codemirror/demo/search.html
rename to html/admin/codemirror/demo/search.html
diff --git a/interface/codemirror/demo/theme.html b/html/admin/codemirror/demo/theme.html
similarity index 100%
rename from interface/codemirror/demo/theme.html
rename to html/admin/codemirror/demo/theme.html
diff --git a/interface/codemirror/demo/vim.html b/html/admin/codemirror/demo/vim.html
similarity index 100%
rename from interface/codemirror/demo/vim.html
rename to html/admin/codemirror/demo/vim.html
diff --git a/interface/codemirror/demo/visibletabs.html b/html/admin/codemirror/demo/visibletabs.html
similarity index 100%
rename from interface/codemirror/demo/visibletabs.html
rename to html/admin/codemirror/demo/visibletabs.html
diff --git a/interface/codemirror/doc/baboon.png b/html/admin/codemirror/doc/baboon.png
similarity index 100%
rename from interface/codemirror/doc/baboon.png
rename to html/admin/codemirror/doc/baboon.png
diff --git a/interface/codemirror/doc/baboon_vector.svg b/html/admin/codemirror/doc/baboon_vector.svg
similarity index 100%
rename from interface/codemirror/doc/baboon_vector.svg
rename to html/admin/codemirror/doc/baboon_vector.svg
diff --git a/interface/codemirror/doc/compress.html b/html/admin/codemirror/doc/compress.html
similarity index 100%
rename from interface/codemirror/doc/compress.html
rename to html/admin/codemirror/doc/compress.html
diff --git a/interface/codemirror/doc/docs.css b/html/admin/codemirror/doc/docs.css
similarity index 100%
rename from interface/codemirror/doc/docs.css
rename to html/admin/codemirror/doc/docs.css
diff --git a/interface/codemirror/doc/internals.html b/html/admin/codemirror/doc/internals.html
similarity index 100%
rename from interface/codemirror/doc/internals.html
rename to html/admin/codemirror/doc/internals.html
diff --git a/interface/codemirror/doc/manual.html b/html/admin/codemirror/doc/manual.html
similarity index 100%
rename from interface/codemirror/doc/manual.html
rename to html/admin/codemirror/doc/manual.html
diff --git a/interface/codemirror/doc/oldrelease.html b/html/admin/codemirror/doc/oldrelease.html
similarity index 100%
rename from interface/codemirror/doc/oldrelease.html
rename to html/admin/codemirror/doc/oldrelease.html
diff --git a/interface/codemirror/doc/reporting.html b/html/admin/codemirror/doc/reporting.html
similarity index 100%
rename from interface/codemirror/doc/reporting.html
rename to html/admin/codemirror/doc/reporting.html
diff --git a/interface/codemirror/doc/upgrade_v2.2.html b/html/admin/codemirror/doc/upgrade_v2.2.html
similarity index 100%
rename from interface/codemirror/doc/upgrade_v2.2.html
rename to html/admin/codemirror/doc/upgrade_v2.2.html
diff --git a/interface/codemirror/index.html b/html/admin/codemirror/index.html
similarity index 100%
rename from interface/codemirror/index.html
rename to html/admin/codemirror/index.html
diff --git a/interface/codemirror/keymap/emacs.js b/html/admin/codemirror/keymap/emacs.js
similarity index 100%
rename from interface/codemirror/keymap/emacs.js
rename to html/admin/codemirror/keymap/emacs.js
diff --git a/interface/codemirror/keymap/vim.js b/html/admin/codemirror/keymap/vim.js
similarity index 100%
rename from interface/codemirror/keymap/vim.js
rename to html/admin/codemirror/keymap/vim.js
diff --git a/interface/codemirror/lib/codemirror.css b/html/admin/codemirror/lib/codemirror.css
similarity index 100%
rename from interface/codemirror/lib/codemirror.css
rename to html/admin/codemirror/lib/codemirror.css
diff --git a/interface/codemirror/lib/codemirror.js b/html/admin/codemirror/lib/codemirror.js
similarity index 100%
rename from interface/codemirror/lib/codemirror.js
rename to html/admin/codemirror/lib/codemirror.js
diff --git a/interface/codemirror/lib/util/closetag.js b/html/admin/codemirror/lib/util/closetag.js
similarity index 100%
rename from interface/codemirror/lib/util/closetag.js
rename to html/admin/codemirror/lib/util/closetag.js
diff --git a/interface/codemirror/lib/util/dialog.css b/html/admin/codemirror/lib/util/dialog.css
similarity index 100%
rename from interface/codemirror/lib/util/dialog.css
rename to html/admin/codemirror/lib/util/dialog.css
diff --git a/interface/codemirror/lib/util/dialog.js b/html/admin/codemirror/lib/util/dialog.js
similarity index 100%
rename from interface/codemirror/lib/util/dialog.js
rename to html/admin/codemirror/lib/util/dialog.js
diff --git a/interface/codemirror/lib/util/foldcode.js b/html/admin/codemirror/lib/util/foldcode.js
similarity index 100%
rename from interface/codemirror/lib/util/foldcode.js
rename to html/admin/codemirror/lib/util/foldcode.js
diff --git a/interface/codemirror/lib/util/formatting.js b/html/admin/codemirror/lib/util/formatting.js
similarity index 100%
rename from interface/codemirror/lib/util/formatting.js
rename to html/admin/codemirror/lib/util/formatting.js
diff --git a/interface/codemirror/lib/util/javascript-hint.js b/html/admin/codemirror/lib/util/javascript-hint.js
similarity index 100%
rename from interface/codemirror/lib/util/javascript-hint.js
rename to html/admin/codemirror/lib/util/javascript-hint.js
diff --git a/interface/codemirror/lib/util/loadmode.js b/html/admin/codemirror/lib/util/loadmode.js
similarity index 100%
rename from interface/codemirror/lib/util/loadmode.js
rename to html/admin/codemirror/lib/util/loadmode.js
diff --git a/interface/codemirror/lib/util/match-highlighter.js b/html/admin/codemirror/lib/util/match-highlighter.js
similarity index 100%
rename from interface/codemirror/lib/util/match-highlighter.js
rename to html/admin/codemirror/lib/util/match-highlighter.js
diff --git a/interface/codemirror/lib/util/overlay.js b/html/admin/codemirror/lib/util/overlay.js
similarity index 100%
rename from interface/codemirror/lib/util/overlay.js
rename to html/admin/codemirror/lib/util/overlay.js
diff --git a/interface/codemirror/lib/util/runmode.js b/html/admin/codemirror/lib/util/runmode.js
similarity index 100%
rename from interface/codemirror/lib/util/runmode.js
rename to html/admin/codemirror/lib/util/runmode.js
diff --git a/interface/codemirror/lib/util/search.js b/html/admin/codemirror/lib/util/search.js
similarity index 100%
rename from interface/codemirror/lib/util/search.js
rename to html/admin/codemirror/lib/util/search.js
diff --git a/interface/codemirror/lib/util/searchcursor.js b/html/admin/codemirror/lib/util/searchcursor.js
similarity index 100%
rename from interface/codemirror/lib/util/searchcursor.js
rename to html/admin/codemirror/lib/util/searchcursor.js
diff --git a/interface/codemirror/lib/util/simple-hint.css b/html/admin/codemirror/lib/util/simple-hint.css
similarity index 100%
rename from interface/codemirror/lib/util/simple-hint.css
rename to html/admin/codemirror/lib/util/simple-hint.css
diff --git a/interface/codemirror/lib/util/simple-hint.js b/html/admin/codemirror/lib/util/simple-hint.js
similarity index 100%
rename from interface/codemirror/lib/util/simple-hint.js
rename to html/admin/codemirror/lib/util/simple-hint.js
diff --git a/interface/codemirror/mode/javascript/index.html b/html/admin/codemirror/mode/javascript/index.html
similarity index 100%
rename from interface/codemirror/mode/javascript/index.html
rename to html/admin/codemirror/mode/javascript/index.html
diff --git a/interface/codemirror/mode/javascript/javascript.js b/html/admin/codemirror/mode/javascript/javascript.js
similarity index 100%
rename from interface/codemirror/mode/javascript/javascript.js
rename to html/admin/codemirror/mode/javascript/javascript.js
diff --git a/interface/codemirror/mode/python/LICENSE.txt b/html/admin/codemirror/mode/python/LICENSE.txt
similarity index 100%
rename from interface/codemirror/mode/python/LICENSE.txt
rename to html/admin/codemirror/mode/python/LICENSE.txt
diff --git a/interface/codemirror/mode/python/index.html b/html/admin/codemirror/mode/python/index.html
similarity index 100%
rename from interface/codemirror/mode/python/index.html
rename to html/admin/codemirror/mode/python/index.html
diff --git a/interface/codemirror/mode/python/python.js b/html/admin/codemirror/mode/python/python.js
similarity index 100%
rename from interface/codemirror/mode/python/python.js
rename to html/admin/codemirror/mode/python/python.js
diff --git a/interface/codemirror/test/index.html b/html/admin/codemirror/test/index.html
similarity index 100%
rename from interface/codemirror/test/index.html
rename to html/admin/codemirror/test/index.html
diff --git a/interface/codemirror/test/mode_test.css b/html/admin/codemirror/test/mode_test.css
similarity index 100%
rename from interface/codemirror/test/mode_test.css
rename to html/admin/codemirror/test/mode_test.css
diff --git a/interface/codemirror/test/mode_test.js b/html/admin/codemirror/test/mode_test.js
similarity index 100%
rename from interface/codemirror/test/mode_test.js
rename to html/admin/codemirror/test/mode_test.js
diff --git a/interface/codemirror/test/test.js b/html/admin/codemirror/test/test.js
similarity index 100%
rename from interface/codemirror/test/test.js
rename to html/admin/codemirror/test/test.js
diff --git a/interface/codemirror/theme/ambiance.css b/html/admin/codemirror/theme/ambiance.css
similarity index 100%
rename from interface/codemirror/theme/ambiance.css
rename to html/admin/codemirror/theme/ambiance.css
diff --git a/interface/codemirror/theme/blackboard.css b/html/admin/codemirror/theme/blackboard.css
similarity index 100%
rename from interface/codemirror/theme/blackboard.css
rename to html/admin/codemirror/theme/blackboard.css
diff --git a/interface/codemirror/theme/cobalt.css b/html/admin/codemirror/theme/cobalt.css
similarity index 100%
rename from interface/codemirror/theme/cobalt.css
rename to html/admin/codemirror/theme/cobalt.css
diff --git a/interface/codemirror/theme/eclipse.css b/html/admin/codemirror/theme/eclipse.css
similarity index 100%
rename from interface/codemirror/theme/eclipse.css
rename to html/admin/codemirror/theme/eclipse.css
diff --git a/interface/codemirror/theme/elegant.css b/html/admin/codemirror/theme/elegant.css
similarity index 100%
rename from interface/codemirror/theme/elegant.css
rename to html/admin/codemirror/theme/elegant.css
diff --git a/interface/codemirror/theme/erlang-dark.css b/html/admin/codemirror/theme/erlang-dark.css
similarity index 100%
rename from interface/codemirror/theme/erlang-dark.css
rename to html/admin/codemirror/theme/erlang-dark.css
diff --git a/interface/codemirror/theme/lesser-dark.css b/html/admin/codemirror/theme/lesser-dark.css
similarity index 100%
rename from interface/codemirror/theme/lesser-dark.css
rename to html/admin/codemirror/theme/lesser-dark.css
diff --git a/interface/codemirror/theme/monokai.css b/html/admin/codemirror/theme/monokai.css
similarity index 100%
rename from interface/codemirror/theme/monokai.css
rename to html/admin/codemirror/theme/monokai.css
diff --git a/interface/codemirror/theme/neat.css b/html/admin/codemirror/theme/neat.css
similarity index 100%
rename from interface/codemirror/theme/neat.css
rename to html/admin/codemirror/theme/neat.css
diff --git a/interface/codemirror/theme/night.css b/html/admin/codemirror/theme/night.css
similarity index 100%
rename from interface/codemirror/theme/night.css
rename to html/admin/codemirror/theme/night.css
diff --git a/interface/codemirror/theme/rubyblue.css b/html/admin/codemirror/theme/rubyblue.css
similarity index 100%
rename from interface/codemirror/theme/rubyblue.css
rename to html/admin/codemirror/theme/rubyblue.css
diff --git a/interface/codemirror/theme/xq-dark.css b/html/admin/codemirror/theme/xq-dark.css
similarity index 100%
rename from interface/codemirror/theme/xq-dark.css
rename to html/admin/codemirror/theme/xq-dark.css
diff --git a/interface/css/images/checked.gif b/html/admin/css/images/checked.gif
similarity index 100%
rename from interface/css/images/checked.gif
rename to html/admin/css/images/checked.gif
diff --git a/interface/css/images/grid3-hd-btn.gif b/html/admin/css/images/grid3-hd-btn.gif
similarity index 100%
rename from interface/css/images/grid3-hd-btn.gif
rename to html/admin/css/images/grid3-hd-btn.gif
diff --git a/interface/css/images/unchecked.gif b/html/admin/css/images/unchecked.gif
similarity index 100%
rename from interface/css/images/unchecked.gif
rename to html/admin/css/images/unchecked.gif
diff --git a/html/admin/css/main.css b/html/admin/css/main.css
new file mode 100755
index 0000000..a0627fb
--- /dev/null
+++ b/html/admin/css/main.css
@@ -0,0 +1,649 @@
+body {
+    background: #fff;
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+    /*font-family: tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif;*/
+    text-align:left !important;
+}
+
+.x-grid-checkheader {
+    height: 14px;
+    background-image: url('images/unchecked.gif');
+    background-position: 50% -2px;
+    background-repeat: no-repeat;
+    background-color: transparent;
+}
+
+.x-grid-checkheader-checked {
+    background-image: url('images/checked.gif');
+}
+
+.x-grid-checkheader-editor .x-form-cb-wrap {
+    text-align: center;
+}
+
+.mainHeader {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif, cursive;
+    color: white;
+    background-color: green;
+    background-image :url(../images/header.png); 
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+.mainHeaderTitle {
+    font-weight: bold;
+    font-size: 24px;
+    color: white;
+    text-align: right;
+    padding-right: 10px;
+}
+.mainHeaderSubtitle {
+    font-size: 10px;
+}
+.mainHeaderTitleSmall {
+    font-weight: bold;
+    font-size: 10px;
+    color: white;
+    text-align: right;
+}
+.mainHeaderSubtitleSmall {
+    font-size: 8px;
+    color: white;
+}
+
+
+.submenu{
+    text-align: center;
+    color: darkolivegreen;
+    position: relative;
+    border-bottom: 4px transparent solid;
+
+}
+.submenuOver{
+    color: green;
+    text-align: center;
+    position: relative;
+    border-bottom: 5px grey solid;
+}
+.submenuSelect{
+    color: green;
+    text-align: center;
+    position: relative;
+    border-bottom: 5px green solid;
+}
+
+.submenuContent{
+    position: absolute;
+    bottom: 6;
+    text-align: center;
+    width: 100%;
+}
+.submenuIcon{
+    position: absolute;
+    top: 0;
+    text-align: center;
+    width: 100%;
+}
+
+.softLink {
+    color: blue;
+    text-decoration: underline;
+    cursor: pointer;
+    font-size: inherit;
+}
+
+.softLink:hover {
+    color: red; 
+    text-decoration: underline;
+    cursor: pointer;
+    font-size: inherit; 
+}
+
+.mainFooter {
+    font-weight: bold !important;
+    font-size: 10px !important;
+    color: white !important;
+    /*background-color: green !important;*/
+    text-align: center;
+
+
+    background: #008000 !important;
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
+    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
+    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
+    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
+
+}
+
+.menuHead {
+    /*font-family: 'Patrick Hand', cursive;*/
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif, cursive;
+    font-weight: bold;
+    font-size: 18px;
+    color: green;
+}
+
+.menuLink {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif, cursive;
+    font-size: 16px;
+    color: green;
+    text-decoration: underline;
+    cursor: pointer;
+}
+
+.service_menu {
+    background-image: url(../images/icon/libreoffice-extension.png) !important;
+    background-repeat: no-repeat !important;
+}
+
+.tab_db {
+    background-image:url(../images/icon/server.png) !important;
+}
+.btn_border {
+    background-image:url(../images/icon/btn_border.png) !important;
+}
+.btn_border_hover {
+    background-image:url(../images/icon/btn_border_hover.png) !important;
+}
+
+.centerTitle {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif;
+    font-weight: bold;
+    font-size: 18px;
+    color: white !important;
+    text-align: center;
+    border: 5px black solid !important;
+    /*border-right: 0;
+    border-bottom: 0;
+    border-top: 5px black solid !important;
+    border-left: 0;*/
+    background-color: green !important;
+}
+
+.centerBody {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif;
+    font-size: 16px;
+    color: green;
+    border-right: 0;
+    border-bottom: 0;
+    border-color: green;
+}
+
+.x-form-item {
+    font-family: inherit;
+    font-size: inherit;
+    color: inherit;
+    /*border-right: inherit;
+    border-bottom: inherit;*/
+    border-color: inherit;
+}
+
+.x-fieldset-header {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+    font-size: 11px !important;
+    color: green;
+}
+.x-fieldset {
+    border: 1px solid green !important;
+}
+
+/*ACCORDATION CSS*/
+.x-accordion-hd {
+    background: none repeat scroll 0 0 GREEN !important;
+    box-shadow: 0 0 0 0 #D9E7F8 inset;
+}
+.x-panel-header-text-default {
+    color: WHITE !important;
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+    font-size: 14px !important;
+    font-weight: bold;
+}
+.x-panel-collapsed .x-window-header-default, .x-panel-collapsed .x-panel-header-default {
+    border-color: BLACK !important;
+}
+
+/*.x-panel-header-default {
+    background-color: GREEN !important;
+    background-image: -moz-linear-gradient(center top , #DAE7F6, #CDDEF3 45%, #ABC7EC 46%, #ABC7EC 50%, #B8CFEE 51%, #CBDDF3) !important;
+    border-color: black !important;
+    border-style: solid !important;
+    border-width: 1px !important;
+    box-shadow: 0 1px 0 0 black inset !important;
+    font-size: 11px !important;
+    line-height: 15px !important;
+}*/
+
+.x-panel-header-default {
+    font-size: 11px !important;
+    line-height: 15px !important;
+    
+    border-color: GREEN !important;
+    border-width: 0px !important;
+    border-style: solid !important;
+    /*background-image: none !important;
+    background-color: GREEN !important;*/
+
+    background: #008000 !important;
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
+    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
+    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
+    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
+
+}
+
+/*LOADING MASK CSS*/
+.x-mask-msg {
+    background-color: GREEN !important;
+    border: 1px solid GREEN !important;
+}
+.x-mask-msg div {
+    background-color: white;
+    background-image: url("../images/icon/loading_white.gif");
+    background-position: 5px center;
+    background-repeat: no-repeat;
+    border: 1px solid white;
+    color: black;
+    cursor: wait;
+    font: 14px 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+}
+
+/*COLORE GENERALE DELLO SFONDO*/
+.x-border-layout-ct {
+    background-color: green !important;
+}
+
+
+.x-toolbar-default {
+    border: 0px !important;
+    border-color: black !important;
+    background-image: none !important;
+    /*background-color: green !important;*/
+
+    background: #008000 !important;
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
+    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
+    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
+    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
+
+}
+
+.x-btn-default-toolbar-small-menu-active, .x-btn-default-toolbar-small-pressed {
+    border-color: green !important;
+    background-image: none !important;
+    background-color: green !important;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #19ab19), color-stop(48%, #20b320), color-stop(52%, #119511), color-stop(100%, #008000));
+    background-image: -webkit-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: -moz-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: -o-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: -ms-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+}
+/*
+.x-btn-inner {
+    color: white !important;
+}*/
+
+.x-grid-header-ct {
+    border: 1px solid green !important;
+}
+.x-panel .x-grid-body {
+    border-color: green !important;
+}
+.x-column-header {
+    font: 11px 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+}
+
+
+.x-grid-row-selected .x-grid-cell, .x-grid-row-selected .x-grid-rowwrap-div {
+    border-color: green !important;
+    background-color: #c2e8b8 !important;
+}
+
+.x-panel-default {
+    border-color: green !important;
+}
+
+
+.x-window-default {
+    background-color: green !important;
+}
+.x-window-header-text-default {
+    color: white !important;
+    font-family: 'Electrolize', sans-serif, tahoma, arial, verdana, sans-serif !important;
+}
+.x-message-box .x-window-body {
+    background-color: white !important;
+}
+.x-window-header-default-top {
+    background-color: green !important;
+}
+
+.x-btn-default-small-focus {
+    background-color: green !important;
+    background-image: none !important;
+    background-color: white !important;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, white), color-stop(48%, #F9F9F9), color-stop(52%, #E2E2E2), color-stop(100%, #E7E7E7)) !important;
+    background-image: -moz-linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
+    background-image: linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
+}
+.x-btn-default-small-over {
+    background-color: green !important;
+    background-image: none !important;
+    background-color: white !important;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, white), color-stop(48%, #F9F9F9), color-stop(52%, #E2E2E2), color-stop(100%, #E7E7E7)) !important;
+    background-image: -moz-linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
+    background-image: linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
+}
+
+.x-panel-body-default {
+    background: whitesmoke;
+    border-color: green !important;
+    color: black;
+    border-width: 1px;
+    border-style: solid;
+}
+
+
+
+.x-tab-bar {
+    background-color: transparent !important;
+    background-image: none;
+    /*background-color: green;
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #19ab19), color-stop(48%, #20b320), color-stop(52%, #119511), color-stop(100%, #008000));
+    background-image: -webkit-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: -moz-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: -o-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: -ms-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    background-image: linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
+    font-size: 11px;*/
+}
+
+.x-tab-inner {
+    font-family: 'Electrolize', sans-serif, Tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+    color: white !important;
+}
+.x-tab-bar-body-default-plain {
+    background-color: white !important;
+}
+.x-tab-default-top {
+    background-color: grey !important;
+    background-image: none !important;
+}
+.x-tab-bar-body {
+    border-color: transparent !important;
+}
+.x-tab-top-active {
+    background-color: green !important;
+}
+.x-tab {
+    border-color: black !important;
+}
+.x-tab-default-top {
+    -moz-box-shadow: green 0 0 0 0 inset, green 0 0 0 0 inset, green 0 0 0 0 inset !important;
+    -webkit-box-shadow: green 0 0 0 0 inset, green 0 0 0 0 inset, green 0 0 0 0 inset !important;
+    -o-box-shadow: green 0 0 0 0 inset, green 0 0 0 0 inset, green 0 0 0 0 inset !important;
+    box-shadow: green 0px 0px 0px 0px inset, green 0px 0px 0px 0px inset, green 0px 0px 0px 0px inset !important;
+    border-bottom: 0px solid green !important;
+}
+.x-tab-bar-strip-default, .x-tab-bar-strip-default-plain {
+    border-color: green !important;
+    background-color: green !important;
+}
+
+.x-btn-default-small .x-btn-inner {
+    color: white !important;
+}
+
+.x-btn-default-small {
+    background-color: green !important;
+    background-image: none !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.x-btn-inner {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+    font-size: 16px !important;
+}
+
+.x-btn-group-default-framed {
+    background-color: white !important;
+}
+
+.x-btn-default-toolbar-small {
+    border-color: #cbcbcb !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.x-btn-default-toolbar-small .x-btn-inner {
+    color: white !important;
+}
+
+.x-btn-default-toolbar-small-over {
+    background-color: green !important;
+    background-image:  none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-toolbar-small-focus {
+    background-color: green !important;
+    background-image:  none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-toolbar-small-menu-active, .x-btn-default-toolbar-small-pressed {
+    background-color: grey !important;
+    background-image:  none  !important;
+    border-color: black !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.x-btn-default-small-over {
+    background-color: grey !important;
+    background-image:  none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-small-focus {
+    background-color: green !important;
+    background-image: none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-small-menu-active, .x-btn-default-small-pressed {
+    background-color: black !important;
+    background-image: none  !important;
+    border-color: green !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.x-menu-body {
+    background: white !important;
+}
+
+.x-menu-item-active .x-menu-item-link {
+    background-color: lightgrey !important;
+    background-image: none !important;     
+    border: 1px solid green !important;
+    /*background-image: -moz-linear-gradient(center top , #E7F0FC, #C7DDF9);
+    border: 1px solid #A9CBF5;
+    border-radius: 3px 3px 3px 3px;
+    cursor: pointer;
+    margin: 0;*/
+}
+
+
+#chartCnt {
+    position: absolute;
+    left: 0px;
+    right: 0px;
+    top: 0px;
+    bottom: 0px;
+}
+
+.x-fieldset {
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.CodeMirror {
+    font-size: 14px !important;
+}
+
+.codemirror-scroll {
+    overflow: auto !important;
+}
+
+.x-tip {
+    background-color: white !important;
+}
+
+.x-tip {
+    border-color: green !important;
+}
+
+
+.x-datepicker-header {
+    position: relative;
+    height: 26px;
+    background-image: none;
+    background-color: green !important;
+}
+
+.x-datepicker-footer, .x-monthpicker-buttons {
+    position: relative;
+    border-top: 1px solid green;
+    background-image: none;
+    background-color: #00A800;
+}
+
+.x-datepicker {
+    border: 1px solid black !important;
+}
+
+table.x-datepicker-inner th {
+    color: white !important;
+    border-bottom: 1px solid black !important;
+    background-image: none !important;
+    background-color: #00A800 !important;
+}
+table.x-datepicker-inner .x-datepicker-selected a {
+    background-color: #00A800 !important;
+    border: 1px solid black !important;
+    color: white !important;
+}
+
+.x-form-text, textarea.x-form-field {
+    border-color: #00A800 !important;
+}
+
+.x-boundlist-item-over{
+    background: green !important;
+    border-color: lightgrey !important;
+    color: white !important;
+}
+
+.x-boundlist {
+    border-color: green !important;
+}
+
+.x-boundlist-selected {
+    background: #00A800 !important;
+    border-color: green !important;
+}
+
+/*.dygraph-ylabel { 
+    font-size: 18px; 
+    text-shadow: gray -2px 2px 2px; 
+    height: 40px;
+}*/
+
+.dygraph-axis-label-x{
+    height: 30px;
+}
+
+.pchooserBtnVisible {
+    position: absolute;
+    left: 5px;
+    top: 2px;
+    width: 16px;
+    height: 16px;
+    background-image :url(../images/eye.png);
+    background-repeat: no-repeat;
+    background-position: center center;
+    cursor: pointer;
+} 
+.pchooserBtnNotVisible {
+    background-image :url(../images/forbidden.png) !important;
+    background-repeat: no-repeat;
+    background-position: center center;
+} 
+.pchooserBtnDownload {
+    position: absolute;
+    right: 46px;
+    top: 2px;
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    /*border: thin solid whitesmoke;*/
+    background: transparent url(../images/menu/download.svg) no-repeat scroll center center;
+    background-size: contain; 
+}
+.pchooserBtnColor {
+    position: absolute;
+    right: 26px;
+    top: 2px;
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    border: thin solid whitesmoke;
+} 
+.pchooserBtnRemove {
+    position: absolute;
+    right: 6px;
+    top: 2px;
+    width: 16px;
+    height: 16px;
+    font-size: 14;
+    font-weight: bolder;
+    cursor: pointer;
+    background: transparent url(../images/menu/close.svg) no-repeat scroll center center;
+    background-size: contain; 
+} 
+
+.pchooser {
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    margin-bottom: 10px; 
+    border: thin solid green; 
+    width: 100%;
+    font-family: monospace;
+}
+
+/*.pchooser td {
+    padding: 2px 4px 2px 4px;    
+}*/
+
+.viewerChart {
+    background-image :url(../images/istsos-logo.png);
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-size: 280px;
+}
+
+
+.x-toolbar .x-toolbar-text {
+    color: white !important;
+}
+
+
diff --git a/interface/data/observations.json b/html/admin/data/observations.json
similarity index 100%
rename from interface/data/observations.json
rename to html/admin/data/observations.json
diff --git a/interface/data/observedproperties.json b/html/admin/data/observedproperties.json
similarity index 100%
rename from interface/data/observedproperties.json
rename to html/admin/data/observedproperties.json
diff --git a/interface/data/offerings.json b/html/admin/data/offerings.json
similarity index 100%
rename from interface/data/offerings.json
rename to html/admin/data/offerings.json
diff --git a/interface/data/procedures.json b/html/admin/data/procedures.json
similarity index 100%
rename from interface/data/procedures.json
rename to html/admin/data/procedures.json
diff --git a/interface/dygraphs/dygraph-combined.js b/html/admin/dygraphs/dygraph-combined.js
similarity index 100%
rename from interface/dygraphs/dygraph-combined.js
rename to html/admin/dygraphs/dygraph-combined.js
diff --git a/interface/ext/codemirror.js b/html/admin/ext/codemirror.js
similarity index 100%
rename from interface/ext/codemirror.js
rename to html/admin/ext/codemirror.js
diff --git a/interface/ext/ext-all-debug.js b/html/admin/ext/ext-all-debug.js
similarity index 100%
rename from interface/ext/ext-all-debug.js
rename to html/admin/ext/ext-all-debug.js
diff --git a/interface/ext/resources/css/ext-all-access.css b/html/admin/ext/resources/css/ext-all-access.css
similarity index 100%
rename from interface/ext/resources/css/ext-all-access.css
rename to html/admin/ext/resources/css/ext-all-access.css
diff --git a/interface/ext/resources/css/ext-all-gray.css b/html/admin/ext/resources/css/ext-all-gray.css
similarity index 100%
rename from interface/ext/resources/css/ext-all-gray.css
rename to html/admin/ext/resources/css/ext-all-gray.css
diff --git a/interface/ext/resources/css/ext-all-scoped.css b/html/admin/ext/resources/css/ext-all-scoped.css
similarity index 100%
rename from interface/ext/resources/css/ext-all-scoped.css
rename to html/admin/ext/resources/css/ext-all-scoped.css
diff --git a/interface/ext/resources/css/ext-all.css b/html/admin/ext/resources/css/ext-all.css
similarity index 100%
rename from interface/ext/resources/css/ext-all.css
rename to html/admin/ext/resources/css/ext-all.css
diff --git a/interface/ext/resources/css/ext-ie-scoped.css b/html/admin/ext/resources/css/ext-ie-scoped.css
similarity index 100%
rename from interface/ext/resources/css/ext-ie-scoped.css
rename to html/admin/ext/resources/css/ext-ie-scoped.css
diff --git a/interface/ext/resources/css/ext-ie.css b/html/admin/ext/resources/css/ext-ie.css
similarity index 100%
rename from interface/ext/resources/css/ext-ie.css
rename to html/admin/ext/resources/css/ext-ie.css
diff --git a/interface/ext/resources/css/ext-sandbox.css b/html/admin/ext/resources/css/ext-sandbox.css
similarity index 100%
rename from interface/ext/resources/css/ext-sandbox.css
rename to html/admin/ext/resources/css/ext-sandbox.css
diff --git a/interface/ext/resources/css/ext-standard-scoped.css b/html/admin/ext/resources/css/ext-standard-scoped.css
similarity index 100%
rename from interface/ext/resources/css/ext-standard-scoped.css
rename to html/admin/ext/resources/css/ext-standard-scoped.css
diff --git a/interface/ext/resources/css/ext-standard.css b/html/admin/ext/resources/css/ext-standard.css
similarity index 100%
rename from interface/ext/resources/css/ext-standard.css
rename to html/admin/ext/resources/css/ext-standard.css
diff --git a/interface/ext/resources/sass/config.rb b/html/admin/ext/resources/sass/config.rb
similarity index 100%
rename from interface/ext/resources/sass/config.rb
rename to html/admin/ext/resources/sass/config.rb
diff --git a/interface/ext/resources/sass/ext-all-access.scss b/html/admin/ext/resources/sass/ext-all-access.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-all-access.scss
rename to html/admin/ext/resources/sass/ext-all-access.scss
diff --git a/interface/ext/resources/sass/ext-all-gray.scss b/html/admin/ext/resources/sass/ext-all-gray.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-all-gray.scss
rename to html/admin/ext/resources/sass/ext-all-gray.scss
diff --git a/interface/ext/resources/sass/ext-all-scoped.scss b/html/admin/ext/resources/sass/ext-all-scoped.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-all-scoped.scss
rename to html/admin/ext/resources/sass/ext-all-scoped.scss
diff --git a/interface/ext/resources/sass/ext-all.scss b/html/admin/ext/resources/sass/ext-all.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-all.scss
rename to html/admin/ext/resources/sass/ext-all.scss
diff --git a/interface/ext/resources/sass/ext-ie-scoped.scss b/html/admin/ext/resources/sass/ext-ie-scoped.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-ie-scoped.scss
rename to html/admin/ext/resources/sass/ext-ie-scoped.scss
diff --git a/interface/ext/resources/sass/ext-ie.scss b/html/admin/ext/resources/sass/ext-ie.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-ie.scss
rename to html/admin/ext/resources/sass/ext-ie.scss
diff --git a/interface/ext/resources/sass/ext-sandbox.scss b/html/admin/ext/resources/sass/ext-sandbox.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-sandbox.scss
rename to html/admin/ext/resources/sass/ext-sandbox.scss
diff --git a/interface/ext/resources/sass/ext-standard-scoped.scss b/html/admin/ext/resources/sass/ext-standard-scoped.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-standard-scoped.scss
rename to html/admin/ext/resources/sass/ext-standard-scoped.scss
diff --git a/interface/ext/resources/sass/ext-standard.scss b/html/admin/ext/resources/sass/ext-standard.scss
similarity index 100%
rename from interface/ext/resources/sass/ext-standard.scss
rename to html/admin/ext/resources/sass/ext-standard.scss
diff --git a/interface/ext/resources/themes/compass_init.rb b/html/admin/ext/resources/themes/compass_init.rb
similarity index 100%
rename from interface/ext/resources/themes/compass_init.rb
rename to html/admin/ext/resources/themes/compass_init.rb
diff --git a/interface/ext/resources/themes/images/access/boundlist/trigger-arrow.png b/html/admin/ext/resources/themes/images/default/boundlist/trigger-arrow.png
similarity index 100%
rename from interface/ext/resources/themes/images/access/boundlist/trigger-arrow.png
rename to html/admin/ext/resources/themes/images/default/boundlist/trigger-arrow.png
diff --git a/interface/ext/resources/themes/images/access/box/corners-blue.gif b/html/admin/ext/resources/themes/images/default/box/corners-blue.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/corners-blue.gif
rename to html/admin/ext/resources/themes/images/default/box/corners-blue.gif
diff --git a/interface/ext/resources/themes/images/access/box/corners.gif b/html/admin/ext/resources/themes/images/default/box/corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/corners.gif
rename to html/admin/ext/resources/themes/images/default/box/corners.gif
diff --git a/interface/ext/resources/themes/images/access/box/l-blue.gif b/html/admin/ext/resources/themes/images/default/box/l-blue.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/l-blue.gif
rename to html/admin/ext/resources/themes/images/default/box/l-blue.gif
diff --git a/interface/ext/resources/themes/images/access/box/l.gif b/html/admin/ext/resources/themes/images/default/box/l.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/l.gif
rename to html/admin/ext/resources/themes/images/default/box/l.gif
diff --git a/interface/ext/resources/themes/images/access/box/r-blue.gif b/html/admin/ext/resources/themes/images/default/box/r-blue.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/r-blue.gif
rename to html/admin/ext/resources/themes/images/default/box/r-blue.gif
diff --git a/interface/ext/resources/themes/images/access/box/r.gif b/html/admin/ext/resources/themes/images/default/box/r.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/r.gif
rename to html/admin/ext/resources/themes/images/default/box/r.gif
diff --git a/interface/ext/resources/themes/images/default/box/tb-blue.gif b/html/admin/ext/resources/themes/images/default/box/tb-blue.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/box/tb-blue.gif
rename to html/admin/ext/resources/themes/images/default/box/tb-blue.gif
diff --git a/interface/ext/resources/themes/images/access/box/tb.gif b/html/admin/ext/resources/themes/images/default/box/tb.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/box/tb.gif
rename to html/admin/ext/resources/themes/images/default/box/tb.gif
diff --git a/interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-corners.gif b/html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-corners.gif b/html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-sides.gif b/html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-notitle-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-sides.gif b/html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn-group/btn-group-default-framed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn-group/btn-group-default-framed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-disabled-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-disabled-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-disabled-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-disabled-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-focus-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-focus-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-focus-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-focus-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-focus-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-focus-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-focus-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-focus-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-focus-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-focus-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-focus-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-focus-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-over-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-over-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-over-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-pressed-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-pressed-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-pressed-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-pressed-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-pressed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-pressed-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-pressed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-pressed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-pressed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-large-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-large-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-large-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-large-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-disabled-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-disabled-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-disabled-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-disabled-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-focus-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-focus-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-focus-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-focus-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-focus-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-focus-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-focus-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-focus-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-focus-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-over-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-over-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-over-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-pressed-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-pressed-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-pressed-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-pressed-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-pressed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-pressed-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-pressed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-pressed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-pressed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-medium-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-medium-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-medium-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-medium-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-disabled-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-disabled-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-disabled-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-disabled-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-focus-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-focus-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-focus-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-focus-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-focus-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-focus-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-focus-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-focus-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-focus-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-focus-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-focus-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-focus-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-over-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-over-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-over-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-pressed-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-pressed-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-pressed-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-pressed-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-pressed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-pressed-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-pressed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-pressed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-pressed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-small-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-small-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-small-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-small-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-focus-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-pressed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-large-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-large-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-focus-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-pressed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-medium-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-focus-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-bg.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-bg.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-bg.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-pressed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-sides.gif b/html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/btn/btn-default-toolbar-small-sides.gif
rename to html/admin/ext/resources/themes/images/default/btn/btn-default-toolbar-small-sides.gif
diff --git a/interface/ext/resources/themes/images/default/button/arrow.gif b/html/admin/ext/resources/themes/images/default/button/arrow.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/arrow.gif
rename to html/admin/ext/resources/themes/images/default/button/arrow.gif
diff --git a/interface/ext/resources/themes/images/default/button/btn.gif b/html/admin/ext/resources/themes/images/default/button/btn.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/btn.gif
rename to html/admin/ext/resources/themes/images/default/button/btn.gif
diff --git a/interface/ext/resources/themes/images/default/button/group-cs.gif b/html/admin/ext/resources/themes/images/default/button/group-cs.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/group-cs.gif
rename to html/admin/ext/resources/themes/images/default/button/group-cs.gif
diff --git a/interface/ext/resources/themes/images/default/button/group-lr.gif b/html/admin/ext/resources/themes/images/default/button/group-lr.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/group-lr.gif
rename to html/admin/ext/resources/themes/images/default/button/group-lr.gif
diff --git a/interface/ext/resources/themes/images/default/button/group-tb.gif b/html/admin/ext/resources/themes/images/default/button/group-tb.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/group-tb.gif
rename to html/admin/ext/resources/themes/images/default/button/group-tb.gif
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow-b-noline.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow-b-noline.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/s-arrow-b-noline.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow-b-noline.gif
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow-b.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow-b.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/s-arrow-b.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow-b.gif
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow-bo.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow-bo.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/s-arrow-bo.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow-bo.gif
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow-light.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow-light.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/button/s-arrow-light.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow-light.gif
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow-noline.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow-noline.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/s-arrow-noline.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow-noline.gif
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow-o.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow-o.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/s-arrow-o.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow-o.gif
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow.gif b/html/admin/ext/resources/themes/images/default/button/s-arrow.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/button/s-arrow.gif
rename to html/admin/ext/resources/themes/images/default/button/s-arrow.gif
diff --git a/interface/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.gif b/html/admin/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.gif
rename to html/admin/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.gif
diff --git a/interface/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.png b/html/admin/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.png
rename to html/admin/ext/resources/themes/images/default/datepicker/datepicker-footer-bg.png
diff --git a/interface/ext/resources/themes/images/default/datepicker/datepicker-header-bg.gif b/html/admin/ext/resources/themes/images/default/datepicker/datepicker-header-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/datepicker/datepicker-header-bg.gif
rename to html/admin/ext/resources/themes/images/default/datepicker/datepicker-header-bg.gif
diff --git a/interface/ext/resources/themes/images/default/datepicker/datepicker-header-bg.png b/html/admin/ext/resources/themes/images/default/datepicker/datepicker-header-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/datepicker/datepicker-header-bg.png
rename to html/admin/ext/resources/themes/images/default/datepicker/datepicker-header-bg.png
diff --git a/interface/ext/resources/themes/images/access/dd/drop-add.gif b/html/admin/ext/resources/themes/images/default/dd/drop-add.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/dd/drop-add.gif
rename to html/admin/ext/resources/themes/images/default/dd/drop-add.gif
diff --git a/interface/ext/resources/themes/images/default/dd/drop-no.gif b/html/admin/ext/resources/themes/images/default/dd/drop-no.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/dd/drop-no.gif
rename to html/admin/ext/resources/themes/images/default/dd/drop-no.gif
diff --git a/interface/ext/resources/themes/images/access/dd/drop-yes.gif b/html/admin/ext/resources/themes/images/default/dd/drop-yes.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/dd/drop-yes.gif
rename to html/admin/ext/resources/themes/images/default/dd/drop-yes.gif
diff --git a/interface/ext/resources/themes/images/default/editor/tb-sprite.gif b/html/admin/ext/resources/themes/images/default/editor/tb-sprite.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/editor/tb-sprite.gif
rename to html/admin/ext/resources/themes/images/default/editor/tb-sprite.gif
diff --git a/interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif b/html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif
rename to html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-corners.gif
diff --git a/interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-corners.gif b/html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-corners.gif
rename to html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-corners.gif
diff --git a/interface/ext/resources/themes/images/access/form-invalid-tip/form-invalid-tip-default-sides.gif b/html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/form-invalid-tip/form-invalid-tip-default-sides.gif
rename to html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-sides.gif
diff --git a/interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif b/html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif
rename to html/admin/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-sides.gif
diff --git a/interface/ext/resources/themes/images/default/form/checkbox.gif b/html/admin/ext/resources/themes/images/default/form/checkbox.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/checkbox.gif
rename to html/admin/ext/resources/themes/images/default/form/checkbox.gif
diff --git a/interface/ext/resources/themes/images/default/form/clear-trigger.gif b/html/admin/ext/resources/themes/images/default/form/clear-trigger.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/clear-trigger.gif
rename to html/admin/ext/resources/themes/images/default/form/clear-trigger.gif
diff --git a/interface/ext/resources/themes/images/default/form/date-trigger.gif b/html/admin/ext/resources/themes/images/default/form/date-trigger.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/date-trigger.gif
rename to html/admin/ext/resources/themes/images/default/form/date-trigger.gif
diff --git a/interface/ext/resources/themes/images/access/form/error-tip-corners.gif b/html/admin/ext/resources/themes/images/default/form/error-tip-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/form/error-tip-corners.gif
rename to html/admin/ext/resources/themes/images/default/form/error-tip-corners.gif
diff --git a/interface/ext/resources/themes/images/default/form/exclamation.gif b/html/admin/ext/resources/themes/images/default/form/exclamation.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/exclamation.gif
rename to html/admin/ext/resources/themes/images/default/form/exclamation.gif
diff --git a/interface/ext/resources/themes/images/default/form/radio.gif b/html/admin/ext/resources/themes/images/default/form/radio.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/radio.gif
rename to html/admin/ext/resources/themes/images/default/form/radio.gif
diff --git a/interface/ext/resources/themes/images/default/form/search-trigger.gif b/html/admin/ext/resources/themes/images/default/form/search-trigger.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/search-trigger.gif
rename to html/admin/ext/resources/themes/images/default/form/search-trigger.gif
diff --git a/interface/ext/resources/themes/images/default/form/spinner-small.gif b/html/admin/ext/resources/themes/images/default/form/spinner-small.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/spinner-small.gif
rename to html/admin/ext/resources/themes/images/default/form/spinner-small.gif
diff --git a/interface/ext/resources/themes/images/default/form/spinner.gif b/html/admin/ext/resources/themes/images/default/form/spinner.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/spinner.gif
rename to html/admin/ext/resources/themes/images/default/form/spinner.gif
diff --git a/interface/ext/resources/themes/images/default/form/text-bg.gif b/html/admin/ext/resources/themes/images/default/form/text-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/text-bg.gif
rename to html/admin/ext/resources/themes/images/default/form/text-bg.gif
diff --git a/interface/ext/resources/themes/images/default/form/trigger-square.gif b/html/admin/ext/resources/themes/images/default/form/trigger-square.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/trigger-square.gif
rename to html/admin/ext/resources/themes/images/default/form/trigger-square.gif
diff --git a/interface/ext/resources/themes/images/default/form/trigger-tpl.gif b/html/admin/ext/resources/themes/images/default/form/trigger-tpl.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/trigger-tpl.gif
rename to html/admin/ext/resources/themes/images/default/form/trigger-tpl.gif
diff --git a/interface/ext/resources/themes/images/default/form/trigger.gif b/html/admin/ext/resources/themes/images/default/form/trigger.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/form/trigger.gif
rename to html/admin/ext/resources/themes/images/default/form/trigger.gif
diff --git a/interface/ext/resources/themes/images/access/grid/arrow-left-white.gif b/html/admin/ext/resources/themes/images/default/grid/arrow-left-white.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/arrow-left-white.gif
rename to html/admin/ext/resources/themes/images/default/grid/arrow-left-white.gif
diff --git a/interface/ext/resources/themes/images/access/grid/arrow-right-white.gif b/html/admin/ext/resources/themes/images/default/grid/arrow-right-white.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/arrow-right-white.gif
rename to html/admin/ext/resources/themes/images/default/grid/arrow-right-white.gif
diff --git a/interface/ext/resources/themes/images/access/grid/cell-special-bg.gif b/html/admin/ext/resources/themes/images/default/grid/cell-special-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/cell-special-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/cell-special-bg.gif
diff --git a/interface/ext/resources/themes/images/default/grid/cell-special-bg.png b/html/admin/ext/resources/themes/images/default/grid/cell-special-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/cell-special-bg.png
rename to html/admin/ext/resources/themes/images/default/grid/cell-special-bg.png
diff --git a/interface/ext/resources/themes/images/default/grid/cell-special-selected-bg.gif b/html/admin/ext/resources/themes/images/default/grid/cell-special-selected-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/cell-special-selected-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/cell-special-selected-bg.gif
diff --git a/interface/ext/resources/themes/images/default/grid/cell-special-selected-bg.png b/html/admin/ext/resources/themes/images/default/grid/cell-special-selected-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/cell-special-selected-bg.png
rename to html/admin/ext/resources/themes/images/default/grid/cell-special-selected-bg.png
diff --git a/interface/ext/resources/themes/images/access/grid/checked.gif b/html/admin/ext/resources/themes/images/default/grid/checked.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/checked.gif
rename to html/admin/ext/resources/themes/images/default/grid/checked.gif
diff --git a/interface/ext/resources/themes/images/access/grid/col-move-bottom.gif b/html/admin/ext/resources/themes/images/default/grid/col-move-bottom.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/col-move-bottom.gif
rename to html/admin/ext/resources/themes/images/default/grid/col-move-bottom.gif
diff --git a/interface/ext/resources/themes/images/access/grid/col-move-top.gif b/html/admin/ext/resources/themes/images/default/grid/col-move-top.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/col-move-top.gif
rename to html/admin/ext/resources/themes/images/default/grid/col-move-top.gif
diff --git a/interface/ext/resources/themes/images/default/grid/column-header-bg.gif b/html/admin/ext/resources/themes/images/default/grid/column-header-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/column-header-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/column-header-bg.gif
diff --git a/interface/ext/resources/themes/images/default/grid/column-header-bg.png b/html/admin/ext/resources/themes/images/default/grid/column-header-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/column-header-bg.png
rename to html/admin/ext/resources/themes/images/default/grid/column-header-bg.png
diff --git a/interface/ext/resources/themes/images/default/grid/column-header-over-bg.gif b/html/admin/ext/resources/themes/images/default/grid/column-header-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/column-header-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/column-header-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/grid/column-header-over-bg.png b/html/admin/ext/resources/themes/images/default/grid/column-header-over-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/column-header-over-bg.png
rename to html/admin/ext/resources/themes/images/default/grid/column-header-over-bg.png
diff --git a/interface/ext/resources/themes/images/access/grid/columns.gif b/html/admin/ext/resources/themes/images/default/grid/columns.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/columns.gif
rename to html/admin/ext/resources/themes/images/default/grid/columns.gif
diff --git a/interface/ext/resources/themes/images/access/grid/dd-insert-arrow-left.gif b/html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-left.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/dd-insert-arrow-left.gif
rename to html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-left.gif
diff --git a/interface/ext/resources/themes/images/access/grid/dd-insert-arrow-left.png b/html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-left.png
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/dd-insert-arrow-left.png
rename to html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-left.png
diff --git a/interface/ext/resources/themes/images/access/grid/dd-insert-arrow-right.gif b/html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-right.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/dd-insert-arrow-right.gif
rename to html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-right.gif
diff --git a/interface/ext/resources/themes/images/access/grid/dd-insert-arrow-right.png b/html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-right.png
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/dd-insert-arrow-right.png
rename to html/admin/ext/resources/themes/images/default/grid/dd-insert-arrow-right.png
diff --git a/interface/ext/resources/themes/images/default/grid/dirty.gif b/html/admin/ext/resources/themes/images/default/grid/dirty.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/dirty.gif
rename to html/admin/ext/resources/themes/images/default/grid/dirty.gif
diff --git a/interface/ext/resources/themes/images/access/grid/done.gif b/html/admin/ext/resources/themes/images/default/grid/done.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/done.gif
rename to html/admin/ext/resources/themes/images/default/grid/done.gif
diff --git a/interface/ext/resources/themes/images/access/grid/drop-no.gif b/html/admin/ext/resources/themes/images/default/grid/drop-no.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/drop-no.gif
rename to html/admin/ext/resources/themes/images/default/grid/drop-no.gif
diff --git a/interface/ext/resources/themes/images/access/grid/drop-yes.gif b/html/admin/ext/resources/themes/images/default/grid/drop-yes.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/drop-yes.gif
rename to html/admin/ext/resources/themes/images/default/grid/drop-yes.gif
diff --git a/interface/ext/resources/themes/images/access/grid/footer-bg.gif b/html/admin/ext/resources/themes/images/default/grid/footer-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/footer-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/footer-bg.gif
diff --git a/interface/ext/resources/themes/images/access/grid/grid-blue-hd.gif b/html/admin/ext/resources/themes/images/default/grid/grid-blue-hd.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/grid-blue-hd.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid-blue-hd.gif
diff --git a/interface/ext/resources/themes/images/default/grid/grid-blue-split.gif b/html/admin/ext/resources/themes/images/default/grid/grid-blue-split.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/grid-blue-split.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid-blue-split.gif
diff --git a/interface/ext/resources/themes/images/access/grid/grid-hrow.gif b/html/admin/ext/resources/themes/images/default/grid/grid-hrow.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/grid-hrow.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid-hrow.gif
diff --git a/interface/ext/resources/themes/images/access/grid/grid-loading.gif b/html/admin/ext/resources/themes/images/default/grid/grid-loading.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/grid-loading.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid-loading.gif
diff --git a/interface/ext/resources/themes/images/access/grid/grid-split.gif b/html/admin/ext/resources/themes/images/default/grid/grid-split.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/grid-split.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid-split.gif
diff --git a/interface/ext/resources/themes/images/access/grid/grid-vista-hd.gif b/html/admin/ext/resources/themes/images/default/grid/grid-vista-hd.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/grid-vista-hd.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid-vista-hd.gif
diff --git a/interface/ext/resources/themes/images/default/grid/grid3-hd-btn.gif b/html/admin/ext/resources/themes/images/default/grid/grid3-hd-btn.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/grid3-hd-btn.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid3-hd-btn.gif
diff --git a/interface/ext/resources/themes/images/default/grid/grid3-hrow-over.gif b/html/admin/ext/resources/themes/images/default/grid/grid3-hrow-over.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/grid3-hrow-over.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid3-hrow-over.gif
diff --git a/interface/ext/resources/themes/images/default/grid/grid3-hrow.gif b/html/admin/ext/resources/themes/images/default/grid/grid3-hrow.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/grid3-hrow.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid3-hrow.gif
diff --git a/interface/ext/resources/themes/images/default/grid/grid3-rowheader.gif b/html/admin/ext/resources/themes/images/default/grid/grid3-rowheader.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/grid3-rowheader.gif
rename to html/admin/ext/resources/themes/images/default/grid/grid3-rowheader.gif
diff --git a/interface/ext/resources/themes/images/access/grid/group-by.gif b/html/admin/ext/resources/themes/images/default/grid/group-by.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/group-by.gif
rename to html/admin/ext/resources/themes/images/default/grid/group-by.gif
diff --git a/interface/ext/resources/themes/images/default/grid/group-collapse.gif b/html/admin/ext/resources/themes/images/default/grid/group-collapse.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/group-collapse.gif
rename to html/admin/ext/resources/themes/images/default/grid/group-collapse.gif
diff --git a/interface/ext/resources/themes/images/default/grid/group-expand-sprite.gif b/html/admin/ext/resources/themes/images/default/grid/group-expand-sprite.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/group-expand-sprite.gif
rename to html/admin/ext/resources/themes/images/default/grid/group-expand-sprite.gif
diff --git a/interface/ext/resources/themes/images/default/grid/group-expand.gif b/html/admin/ext/resources/themes/images/default/grid/group-expand.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/group-expand.gif
rename to html/admin/ext/resources/themes/images/default/grid/group-expand.gif
diff --git a/interface/ext/resources/themes/images/access/grid/hd-pop.gif b/html/admin/ext/resources/themes/images/default/grid/hd-pop.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hd-pop.gif
rename to html/admin/ext/resources/themes/images/default/grid/hd-pop.gif
diff --git a/interface/ext/resources/themes/images/access/grid/hmenu-asc.gif b/html/admin/ext/resources/themes/images/default/grid/hmenu-asc.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hmenu-asc.gif
rename to html/admin/ext/resources/themes/images/default/grid/hmenu-asc.gif
diff --git a/interface/ext/resources/themes/images/access/grid/hmenu-desc.gif b/html/admin/ext/resources/themes/images/default/grid/hmenu-desc.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hmenu-desc.gif
rename to html/admin/ext/resources/themes/images/default/grid/hmenu-desc.gif
diff --git a/interface/ext/resources/themes/images/access/grid/hmenu-lock.gif b/html/admin/ext/resources/themes/images/default/grid/hmenu-lock.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hmenu-lock.gif
rename to html/admin/ext/resources/themes/images/default/grid/hmenu-lock.gif
diff --git a/interface/ext/resources/themes/images/access/grid/hmenu-lock.png b/html/admin/ext/resources/themes/images/default/grid/hmenu-lock.png
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hmenu-lock.png
rename to html/admin/ext/resources/themes/images/default/grid/hmenu-lock.png
diff --git a/interface/ext/resources/themes/images/access/grid/hmenu-unlock.gif b/html/admin/ext/resources/themes/images/default/grid/hmenu-unlock.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hmenu-unlock.gif
rename to html/admin/ext/resources/themes/images/default/grid/hmenu-unlock.gif
diff --git a/interface/ext/resources/themes/images/access/grid/hmenu-unlock.png b/html/admin/ext/resources/themes/images/default/grid/hmenu-unlock.png
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/hmenu-unlock.png
rename to html/admin/ext/resources/themes/images/default/grid/hmenu-unlock.png
diff --git a/interface/ext/resources/themes/images/default/grid/invalid_line.gif b/html/admin/ext/resources/themes/images/default/grid/invalid_line.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/invalid_line.gif
rename to html/admin/ext/resources/themes/images/default/grid/invalid_line.gif
diff --git a/interface/ext/resources/themes/images/access/grid/loading.gif b/html/admin/ext/resources/themes/images/default/grid/loading.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/loading.gif
rename to html/admin/ext/resources/themes/images/default/grid/loading.gif
diff --git a/interface/ext/resources/themes/images/access/grid/mso-hd.gif b/html/admin/ext/resources/themes/images/default/grid/mso-hd.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/mso-hd.gif
rename to html/admin/ext/resources/themes/images/default/grid/mso-hd.gif
diff --git a/interface/ext/resources/themes/images/access/grid/nowait.gif b/html/admin/ext/resources/themes/images/default/grid/nowait.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/nowait.gif
rename to html/admin/ext/resources/themes/images/default/grid/nowait.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-first-disabled.gif b/html/admin/ext/resources/themes/images/default/grid/page-first-disabled.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-first-disabled.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-first-disabled.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-first.gif b/html/admin/ext/resources/themes/images/default/grid/page-first.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-first.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-first.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-last-disabled.gif b/html/admin/ext/resources/themes/images/default/grid/page-last-disabled.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-last-disabled.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-last-disabled.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-last.gif b/html/admin/ext/resources/themes/images/default/grid/page-last.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-last.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-last.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-next-disabled.gif b/html/admin/ext/resources/themes/images/default/grid/page-next-disabled.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-next-disabled.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-next-disabled.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-next.gif b/html/admin/ext/resources/themes/images/default/grid/page-next.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-next.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-next.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-prev-disabled.gif b/html/admin/ext/resources/themes/images/default/grid/page-prev-disabled.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-prev-disabled.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-prev-disabled.gif
diff --git a/interface/ext/resources/themes/images/default/grid/page-prev.gif b/html/admin/ext/resources/themes/images/default/grid/page-prev.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/page-prev.gif
rename to html/admin/ext/resources/themes/images/default/grid/page-prev.gif
diff --git a/interface/ext/resources/themes/images/access/grid/pick-button.gif b/html/admin/ext/resources/themes/images/default/grid/pick-button.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/pick-button.gif
rename to html/admin/ext/resources/themes/images/default/grid/pick-button.gif
diff --git a/interface/ext/resources/themes/images/access/grid/property-cell-bg.gif b/html/admin/ext/resources/themes/images/default/grid/property-cell-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/property-cell-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/property-cell-bg.gif
diff --git a/interface/ext/resources/themes/images/default/grid/property-cell-selected-bg.gif b/html/admin/ext/resources/themes/images/default/grid/property-cell-selected-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/property-cell-selected-bg.gif
rename to html/admin/ext/resources/themes/images/default/grid/property-cell-selected-bg.gif
diff --git a/interface/ext/resources/themes/images/access/grid/refresh-disabled.gif b/html/admin/ext/resources/themes/images/default/grid/refresh-disabled.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/refresh-disabled.gif
rename to html/admin/ext/resources/themes/images/default/grid/refresh-disabled.gif
diff --git a/interface/ext/resources/themes/images/default/grid/refresh.gif b/html/admin/ext/resources/themes/images/default/grid/refresh.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/refresh.gif
rename to html/admin/ext/resources/themes/images/default/grid/refresh.gif
diff --git a/interface/ext/resources/themes/images/access/grid/row-check-sprite.gif b/html/admin/ext/resources/themes/images/default/grid/row-check-sprite.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/row-check-sprite.gif
rename to html/admin/ext/resources/themes/images/default/grid/row-check-sprite.gif
diff --git a/interface/ext/resources/themes/images/access/grid/row-expand-sprite.gif b/html/admin/ext/resources/themes/images/default/grid/row-expand-sprite.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/row-expand-sprite.gif
rename to html/admin/ext/resources/themes/images/default/grid/row-expand-sprite.gif
diff --git a/interface/ext/resources/themes/images/access/grid/row-over.gif b/html/admin/ext/resources/themes/images/default/grid/row-over.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/row-over.gif
rename to html/admin/ext/resources/themes/images/default/grid/row-over.gif
diff --git a/interface/ext/resources/themes/images/access/grid/row-sel.gif b/html/admin/ext/resources/themes/images/default/grid/row-sel.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/row-sel.gif
rename to html/admin/ext/resources/themes/images/default/grid/row-sel.gif
diff --git a/interface/ext/resources/themes/images/default/grid/sort-hd.gif b/html/admin/ext/resources/themes/images/default/grid/sort-hd.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/sort-hd.gif
rename to html/admin/ext/resources/themes/images/default/grid/sort-hd.gif
diff --git a/interface/ext/resources/themes/images/default/grid/sort_asc.gif b/html/admin/ext/resources/themes/images/default/grid/sort_asc.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/sort_asc.gif
rename to html/admin/ext/resources/themes/images/default/grid/sort_asc.gif
diff --git a/interface/ext/resources/themes/images/default/grid/sort_desc.gif b/html/admin/ext/resources/themes/images/default/grid/sort_desc.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/grid/sort_desc.gif
rename to html/admin/ext/resources/themes/images/default/grid/sort_desc.gif
diff --git a/interface/ext/resources/themes/images/access/grid/unchecked.gif b/html/admin/ext/resources/themes/images/default/grid/unchecked.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/unchecked.gif
rename to html/admin/ext/resources/themes/images/default/grid/unchecked.gif
diff --git a/interface/ext/resources/themes/images/access/grid/wait.gif b/html/admin/ext/resources/themes/images/default/grid/wait.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/grid/wait.gif
rename to html/admin/ext/resources/themes/images/default/grid/wait.gif
diff --git a/interface/ext/resources/themes/images/access/layout/mini-bottom.gif b/html/admin/ext/resources/themes/images/default/layout/mini-bottom.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/layout/mini-bottom.gif
rename to html/admin/ext/resources/themes/images/default/layout/mini-bottom.gif
diff --git a/interface/ext/resources/themes/images/access/layout/mini-left.gif b/html/admin/ext/resources/themes/images/default/layout/mini-left.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/layout/mini-left.gif
rename to html/admin/ext/resources/themes/images/default/layout/mini-left.gif
diff --git a/interface/ext/resources/themes/images/access/layout/mini-right.gif b/html/admin/ext/resources/themes/images/default/layout/mini-right.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/layout/mini-right.gif
rename to html/admin/ext/resources/themes/images/default/layout/mini-right.gif
diff --git a/interface/ext/resources/themes/images/access/layout/mini-top.gif b/html/admin/ext/resources/themes/images/default/layout/mini-top.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/layout/mini-top.gif
rename to html/admin/ext/resources/themes/images/default/layout/mini-top.gif
diff --git a/interface/ext/resources/themes/images/access/menu/checked.gif b/html/admin/ext/resources/themes/images/default/menu/checked.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/menu/checked.gif
rename to html/admin/ext/resources/themes/images/default/menu/checked.gif
diff --git a/interface/ext/resources/themes/images/default/menu/group-checked.gif b/html/admin/ext/resources/themes/images/default/menu/group-checked.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/group-checked.gif
rename to html/admin/ext/resources/themes/images/default/menu/group-checked.gif
diff --git a/interface/ext/resources/themes/images/default/menu/item-over.gif b/html/admin/ext/resources/themes/images/default/menu/item-over.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/item-over.gif
rename to html/admin/ext/resources/themes/images/default/menu/item-over.gif
diff --git a/interface/ext/resources/themes/images/default/menu/menu-item-active-bg.gif b/html/admin/ext/resources/themes/images/default/menu/menu-item-active-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/menu-item-active-bg.gif
rename to html/admin/ext/resources/themes/images/default/menu/menu-item-active-bg.gif
diff --git a/interface/ext/resources/themes/images/default/menu/menu-item-active-corners.gif b/html/admin/ext/resources/themes/images/default/menu/menu-item-active-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/menu-item-active-corners.gif
rename to html/admin/ext/resources/themes/images/default/menu/menu-item-active-corners.gif
diff --git a/interface/ext/resources/themes/images/default/menu/menu-item-active-sides.gif b/html/admin/ext/resources/themes/images/default/menu/menu-item-active-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/menu-item-active-sides.gif
rename to html/admin/ext/resources/themes/images/default/menu/menu-item-active-sides.gif
diff --git a/interface/ext/resources/themes/images/default/menu/menu-parent.gif b/html/admin/ext/resources/themes/images/default/menu/menu-parent.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/menu-parent.gif
rename to html/admin/ext/resources/themes/images/default/menu/menu-parent.gif
diff --git a/interface/ext/resources/themes/images/default/menu/menu.gif b/html/admin/ext/resources/themes/images/default/menu/menu.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/menu/menu.gif
rename to html/admin/ext/resources/themes/images/default/menu/menu.gif
diff --git a/interface/ext/resources/themes/images/access/menu/unchecked.gif b/html/admin/ext/resources/themes/images/default/menu/unchecked.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/menu/unchecked.gif
rename to html/admin/ext/resources/themes/images/default/menu/unchecked.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-bottom-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-bottom-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-bottom-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-bottom-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-bottom-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-left-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-right-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-collapsed-top-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-left-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-right-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-corners.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-sides.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-framed-top-sides.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-left-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-left-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-left-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-left-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-right-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-right-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-right-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-right-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel-header/panel-header-default-top-bg.gif b/html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-top-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel-header/panel-header-default-top-bg.gif
rename to html/admin/ext/resources/themes/images/default/panel-header/panel-header-default-top-bg.gif
diff --git a/interface/ext/resources/themes/images/default/panel/panel-default-framed-corners.gif b/html/admin/ext/resources/themes/images/default/panel/panel-default-framed-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel/panel-default-framed-corners.gif
rename to html/admin/ext/resources/themes/images/default/panel/panel-default-framed-corners.gif
diff --git a/interface/ext/resources/themes/images/default/panel/panel-default-framed-sides.gif b/html/admin/ext/resources/themes/images/default/panel/panel-default-framed-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/panel/panel-default-framed-sides.gif
rename to html/admin/ext/resources/themes/images/default/panel/panel-default-framed-sides.gif
diff --git a/interface/ext/resources/themes/images/default/progress/progress-default-bg.gif b/html/admin/ext/resources/themes/images/default/progress/progress-default-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/progress/progress-default-bg.gif
rename to html/admin/ext/resources/themes/images/default/progress/progress-default-bg.gif
diff --git a/interface/ext/resources/themes/images/access/shared/blue-loading.gif b/html/admin/ext/resources/themes/images/default/shared/blue-loading.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/shared/blue-loading.gif
rename to html/admin/ext/resources/themes/images/default/shared/blue-loading.gif
diff --git a/interface/ext/resources/themes/images/default/shared/calendar.gif b/html/admin/ext/resources/themes/images/default/shared/calendar.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/calendar.gif
rename to html/admin/ext/resources/themes/images/default/shared/calendar.gif
diff --git a/interface/ext/resources/themes/images/default/shared/glass-bg.gif b/html/admin/ext/resources/themes/images/default/shared/glass-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/glass-bg.gif
rename to html/admin/ext/resources/themes/images/default/shared/glass-bg.gif
diff --git a/interface/ext/resources/themes/images/default/shared/hd-sprite.gif b/html/admin/ext/resources/themes/images/default/shared/hd-sprite.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/hd-sprite.gif
rename to html/admin/ext/resources/themes/images/default/shared/hd-sprite.gif
diff --git a/interface/ext/resources/themes/images/access/shared/icon-error.gif b/html/admin/ext/resources/themes/images/default/shared/icon-error.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/shared/icon-error.gif
rename to html/admin/ext/resources/themes/images/default/shared/icon-error.gif
diff --git a/interface/ext/resources/themes/images/access/shared/icon-info.gif b/html/admin/ext/resources/themes/images/default/shared/icon-info.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/shared/icon-info.gif
rename to html/admin/ext/resources/themes/images/default/shared/icon-info.gif
diff --git a/interface/ext/resources/themes/images/access/shared/icon-question.gif b/html/admin/ext/resources/themes/images/default/shared/icon-question.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/shared/icon-question.gif
rename to html/admin/ext/resources/themes/images/default/shared/icon-question.gif
diff --git a/interface/ext/resources/themes/images/access/shared/icon-warning.gif b/html/admin/ext/resources/themes/images/default/shared/icon-warning.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/shared/icon-warning.gif
rename to html/admin/ext/resources/themes/images/default/shared/icon-warning.gif
diff --git a/interface/ext/resources/themes/images/access/shared/large-loading.gif b/html/admin/ext/resources/themes/images/default/shared/large-loading.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/shared/large-loading.gif
rename to html/admin/ext/resources/themes/images/default/shared/large-loading.gif
diff --git a/interface/ext/resources/themes/images/default/shared/left-btn.gif b/html/admin/ext/resources/themes/images/default/shared/left-btn.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/left-btn.gif
rename to html/admin/ext/resources/themes/images/default/shared/left-btn.gif
diff --git a/interface/ext/resources/themes/images/default/shared/loading-balls.gif b/html/admin/ext/resources/themes/images/default/shared/loading-balls.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/loading-balls.gif
rename to html/admin/ext/resources/themes/images/default/shared/loading-balls.gif
diff --git a/interface/ext/resources/themes/images/default/shared/right-btn.gif b/html/admin/ext/resources/themes/images/default/shared/right-btn.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/right-btn.gif
rename to html/admin/ext/resources/themes/images/default/shared/right-btn.gif
diff --git a/interface/ext/resources/themes/images/default/shared/shadow-c.png b/html/admin/ext/resources/themes/images/default/shared/shadow-c.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/shadow-c.png
rename to html/admin/ext/resources/themes/images/default/shared/shadow-c.png
diff --git a/interface/ext/resources/themes/images/default/shared/shadow-lr.png b/html/admin/ext/resources/themes/images/default/shared/shadow-lr.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/shadow-lr.png
rename to html/admin/ext/resources/themes/images/default/shared/shadow-lr.png
diff --git a/interface/ext/resources/themes/images/default/shared/shadow.png b/html/admin/ext/resources/themes/images/default/shared/shadow.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/shadow.png
rename to html/admin/ext/resources/themes/images/default/shared/shadow.png
diff --git a/interface/ext/resources/themes/images/default/shared/warning.gif b/html/admin/ext/resources/themes/images/default/shared/warning.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/shared/warning.gif
rename to html/admin/ext/resources/themes/images/default/shared/warning.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/e-handle-dark.gif b/html/admin/ext/resources/themes/images/default/sizer/e-handle-dark.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/e-handle-dark.gif
rename to html/admin/ext/resources/themes/images/default/sizer/e-handle-dark.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/e-handle.gif b/html/admin/ext/resources/themes/images/default/sizer/e-handle.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/e-handle.gif
rename to html/admin/ext/resources/themes/images/default/sizer/e-handle.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/ne-handle-dark.gif b/html/admin/ext/resources/themes/images/default/sizer/ne-handle-dark.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/ne-handle-dark.gif
rename to html/admin/ext/resources/themes/images/default/sizer/ne-handle-dark.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/ne-handle.gif b/html/admin/ext/resources/themes/images/default/sizer/ne-handle.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/ne-handle.gif
rename to html/admin/ext/resources/themes/images/default/sizer/ne-handle.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/nw-handle-dark.gif b/html/admin/ext/resources/themes/images/default/sizer/nw-handle-dark.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/nw-handle-dark.gif
rename to html/admin/ext/resources/themes/images/default/sizer/nw-handle-dark.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/nw-handle.gif b/html/admin/ext/resources/themes/images/default/sizer/nw-handle.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/nw-handle.gif
rename to html/admin/ext/resources/themes/images/default/sizer/nw-handle.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/s-handle-dark.gif b/html/admin/ext/resources/themes/images/default/sizer/s-handle-dark.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/s-handle-dark.gif
rename to html/admin/ext/resources/themes/images/default/sizer/s-handle-dark.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/s-handle.gif b/html/admin/ext/resources/themes/images/default/sizer/s-handle.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/s-handle.gif
rename to html/admin/ext/resources/themes/images/default/sizer/s-handle.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/se-handle-dark.gif b/html/admin/ext/resources/themes/images/default/sizer/se-handle-dark.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/se-handle-dark.gif
rename to html/admin/ext/resources/themes/images/default/sizer/se-handle-dark.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/se-handle.gif b/html/admin/ext/resources/themes/images/default/sizer/se-handle.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/se-handle.gif
rename to html/admin/ext/resources/themes/images/default/sizer/se-handle.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/square.gif b/html/admin/ext/resources/themes/images/default/sizer/square.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/square.gif
rename to html/admin/ext/resources/themes/images/default/sizer/square.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/sw-handle-dark.gif b/html/admin/ext/resources/themes/images/default/sizer/sw-handle-dark.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/sw-handle-dark.gif
rename to html/admin/ext/resources/themes/images/default/sizer/sw-handle-dark.gif
diff --git a/interface/ext/resources/themes/images/default/sizer/sw-handle.gif b/html/admin/ext/resources/themes/images/default/sizer/sw-handle.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/sizer/sw-handle.gif
rename to html/admin/ext/resources/themes/images/default/sizer/sw-handle.gif
diff --git a/interface/ext/resources/themes/images/default/slider/slider-bg.gif b/html/admin/ext/resources/themes/images/default/slider/slider-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-bg.gif
rename to html/admin/ext/resources/themes/images/default/slider/slider-bg.gif
diff --git a/interface/ext/resources/themes/images/default/slider/slider-bg.png b/html/admin/ext/resources/themes/images/default/slider/slider-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-bg.png
rename to html/admin/ext/resources/themes/images/default/slider/slider-bg.png
diff --git a/interface/ext/resources/themes/images/default/slider/slider-thumb.gif b/html/admin/ext/resources/themes/images/default/slider/slider-thumb.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-thumb.gif
rename to html/admin/ext/resources/themes/images/default/slider/slider-thumb.gif
diff --git a/interface/ext/resources/themes/images/default/slider/slider-thumb.png b/html/admin/ext/resources/themes/images/default/slider/slider-thumb.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-thumb.png
rename to html/admin/ext/resources/themes/images/default/slider/slider-thumb.png
diff --git a/interface/ext/resources/themes/images/default/slider/slider-v-bg.gif b/html/admin/ext/resources/themes/images/default/slider/slider-v-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-v-bg.gif
rename to html/admin/ext/resources/themes/images/default/slider/slider-v-bg.gif
diff --git a/interface/ext/resources/themes/images/default/slider/slider-v-bg.png b/html/admin/ext/resources/themes/images/default/slider/slider-v-bg.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-v-bg.png
rename to html/admin/ext/resources/themes/images/default/slider/slider-v-bg.png
diff --git a/interface/ext/resources/themes/images/default/slider/slider-v-thumb.gif b/html/admin/ext/resources/themes/images/default/slider/slider-v-thumb.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-v-thumb.gif
rename to html/admin/ext/resources/themes/images/default/slider/slider-v-thumb.gif
diff --git a/interface/ext/resources/themes/images/default/slider/slider-v-thumb.png b/html/admin/ext/resources/themes/images/default/slider/slider-v-thumb.png
similarity index 100%
rename from interface/ext/resources/themes/images/default/slider/slider-v-thumb.png
rename to html/admin/ext/resources/themes/images/default/slider/slider-v-thumb.png
diff --git a/interface/ext/resources/themes/images/default/tab-bar/scroll-left.gif b/html/admin/ext/resources/themes/images/default/tab-bar/scroll-left.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab-bar/scroll-left.gif
rename to html/admin/ext/resources/themes/images/default/tab-bar/scroll-left.gif
diff --git a/interface/ext/resources/themes/images/default/tab-bar/scroll-right.gif b/html/admin/ext/resources/themes/images/default/tab-bar/scroll-right.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab-bar/scroll-right.gif
rename to html/admin/ext/resources/themes/images/default/tab-bar/scroll-right.gif
diff --git a/interface/ext/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif b/html/admin/ext/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab-bar/tab-bar-default-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-active-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-active-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-active-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-active-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-active-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-active-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-active-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-active-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-active-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-active-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-active-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-active-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-over-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-over-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-over-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-bottom-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-bottom-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-bottom-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-close.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-close.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-close.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-close.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-active-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-active-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-active-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-active-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-active-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-active-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-active-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-active-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-active-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-active-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-active-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-active-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-disabled-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-disabled-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-disabled-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-over-bg.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-over-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-over-bg.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-over-bg.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-over-corners.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-over-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-over-corners.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-over-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-over-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-over-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-over-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-over-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tab/tab-default-top-sides.gif b/html/admin/ext/resources/themes/images/default/tab/tab-default-top-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tab/tab-default-top-sides.gif
rename to html/admin/ext/resources/themes/images/default/tab/tab-default-top-sides.gif
diff --git a/interface/ext/resources/themes/images/default/tip/tip-corners.gif b/html/admin/ext/resources/themes/images/default/tip/tip-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tip/tip-corners.gif
rename to html/admin/ext/resources/themes/images/default/tip/tip-corners.gif
diff --git a/interface/ext/resources/themes/images/default/tip/tip-sides.gif b/html/admin/ext/resources/themes/images/default/tip/tip-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tip/tip-sides.gif
rename to html/admin/ext/resources/themes/images/default/tip/tip-sides.gif
diff --git a/interface/ext/resources/themes/images/default/toolbar/more.gif b/html/admin/ext/resources/themes/images/default/toolbar/more.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/toolbar/more.gif
rename to html/admin/ext/resources/themes/images/default/toolbar/more.gif
diff --git a/interface/ext/resources/themes/images/default/toolbar/scroll-left.gif b/html/admin/ext/resources/themes/images/default/toolbar/scroll-left.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/toolbar/scroll-left.gif
rename to html/admin/ext/resources/themes/images/default/toolbar/scroll-left.gif
diff --git a/interface/ext/resources/themes/images/default/toolbar/scroll-right.gif b/html/admin/ext/resources/themes/images/default/toolbar/scroll-right.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/toolbar/scroll-right.gif
rename to html/admin/ext/resources/themes/images/default/toolbar/scroll-right.gif
diff --git a/interface/ext/resources/themes/images/default/toolbar/toolbar-default-bg.gif b/html/admin/ext/resources/themes/images/default/toolbar/toolbar-default-bg.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/toolbar/toolbar-default-bg.gif
rename to html/admin/ext/resources/themes/images/default/toolbar/toolbar-default-bg.gif
diff --git a/interface/ext/resources/themes/images/access/panel/tool-sprite-tpl.gif b/html/admin/ext/resources/themes/images/default/tools/tool-sprite-tpl.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/panel/tool-sprite-tpl.gif
rename to html/admin/ext/resources/themes/images/default/tools/tool-sprite-tpl.gif
diff --git a/interface/ext/resources/themes/images/default/tools/tool-sprites.gif b/html/admin/ext/resources/themes/images/default/tools/tool-sprites.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tools/tool-sprites.gif
rename to html/admin/ext/resources/themes/images/default/tools/tool-sprites.gif
diff --git a/interface/ext/resources/themes/images/access/panel/tools-sprites-trans.gif b/html/admin/ext/resources/themes/images/default/tools/tools-sprites-trans.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/panel/tools-sprites-trans.gif
rename to html/admin/ext/resources/themes/images/default/tools/tools-sprites-trans.gif
diff --git a/interface/ext/resources/themes/images/default/tree/arrows.gif b/html/admin/ext/resources/themes/images/default/tree/arrows.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/arrows.gif
rename to html/admin/ext/resources/themes/images/default/tree/arrows.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-above.gif b/html/admin/ext/resources/themes/images/default/tree/drop-above.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-above.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-above.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-add.gif b/html/admin/ext/resources/themes/images/default/tree/drop-add.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-add.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-add.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-append.gif b/html/admin/ext/resources/themes/images/default/tree/drop-append.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-append.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-append.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-below.gif b/html/admin/ext/resources/themes/images/default/tree/drop-below.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-below.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-below.gif
diff --git a/interface/ext/resources/themes/images/access/dd/drop-between.gif b/html/admin/ext/resources/themes/images/default/tree/drop-between.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/dd/drop-between.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-between.gif
diff --git a/interface/ext/resources/themes/images/access/dd/drop-no.gif b/html/admin/ext/resources/themes/images/default/tree/drop-no.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/dd/drop-no.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-no.gif
diff --git a/interface/ext/resources/themes/images/access/dd/drop-over.gif b/html/admin/ext/resources/themes/images/default/tree/drop-over.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/dd/drop-over.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-over.gif
diff --git a/interface/ext/resources/themes/images/access/dd/drop-under.gif b/html/admin/ext/resources/themes/images/default/tree/drop-under.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/dd/drop-under.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-under.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-yes.gif b/html/admin/ext/resources/themes/images/default/tree/drop-yes.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-yes.gif
rename to html/admin/ext/resources/themes/images/default/tree/drop-yes.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-end-minus-nl.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-end-minus-nl.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-end-minus-nl.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-end-minus-nl.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-end-minus.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-end-minus.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-end-minus.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-end-minus.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-end-plus-nl.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-end-plus-nl.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-end-plus-nl.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-end-plus-nl.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-end-plus.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-end-plus.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-end-plus.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-end-plus.gif
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-end.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-end.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/elbow-end.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-end.gif
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-line.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-line.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/elbow-line.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-line.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-minus-nl.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-minus-nl.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-minus-nl.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-minus-nl.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-minus.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-minus.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-minus.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-minus.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-plus-nl.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-plus-nl.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-plus-nl.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-plus-nl.gif
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-plus.gif b/html/admin/ext/resources/themes/images/default/tree/elbow-plus.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/elbow-plus.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow-plus.gif
diff --git a/interface/ext/resources/themes/images/access/tree/elbow.gif b/html/admin/ext/resources/themes/images/default/tree/elbow.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/elbow.gif
rename to html/admin/ext/resources/themes/images/default/tree/elbow.gif
diff --git a/interface/ext/resources/themes/images/default/tree/folder-open.gif b/html/admin/ext/resources/themes/images/default/tree/folder-open.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/folder-open.gif
rename to html/admin/ext/resources/themes/images/default/tree/folder-open.gif
diff --git a/interface/ext/resources/themes/images/default/tree/folder.gif b/html/admin/ext/resources/themes/images/default/tree/folder.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/tree/folder.gif
rename to html/admin/ext/resources/themes/images/default/tree/folder.gif
diff --git a/interface/ext/resources/themes/images/access/tree/leaf.gif b/html/admin/ext/resources/themes/images/default/tree/leaf.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/leaf.gif
rename to html/admin/ext/resources/themes/images/default/tree/leaf.gif
diff --git a/interface/ext/resources/themes/images/access/tree/loading.gif b/html/admin/ext/resources/themes/images/default/tree/loading.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/loading.gif
rename to html/admin/ext/resources/themes/images/default/tree/loading.gif
diff --git a/interface/ext/resources/themes/images/access/tree/s.gif b/html/admin/ext/resources/themes/images/default/tree/s.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/s.gif
rename to html/admin/ext/resources/themes/images/default/tree/s.gif
diff --git a/interface/ext/resources/themes/images/access/util/splitter/mini-bottom.gif b/html/admin/ext/resources/themes/images/default/util/splitter/mini-bottom.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/util/splitter/mini-bottom.gif
rename to html/admin/ext/resources/themes/images/default/util/splitter/mini-bottom.gif
diff --git a/interface/ext/resources/themes/images/access/util/splitter/mini-left.gif b/html/admin/ext/resources/themes/images/default/util/splitter/mini-left.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/util/splitter/mini-left.gif
rename to html/admin/ext/resources/themes/images/default/util/splitter/mini-left.gif
diff --git a/interface/ext/resources/themes/images/access/util/splitter/mini-right.gif b/html/admin/ext/resources/themes/images/default/util/splitter/mini-right.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/util/splitter/mini-right.gif
rename to html/admin/ext/resources/themes/images/default/util/splitter/mini-right.gif
diff --git a/interface/ext/resources/themes/images/access/util/splitter/mini-top.gif b/html/admin/ext/resources/themes/images/default/util/splitter/mini-top.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/util/splitter/mini-top.gif
rename to html/admin/ext/resources/themes/images/default/util/splitter/mini-top.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-bottom-corners.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-bottom-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-bottom-corners.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-bottom-corners.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-bottom-sides.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-left-corners.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-left-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-left-corners.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-left-corners.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-left-sides.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-left-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-left-sides.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-left-sides.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-right-corners.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-right-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-right-corners.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-right-corners.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-right-sides.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-right-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-right-sides.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-right-sides.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-top-corners.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-top-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-top-corners.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-top-corners.gif
diff --git a/interface/ext/resources/themes/images/default/window-header/window-header-default-top-sides.gif b/html/admin/ext/resources/themes/images/default/window-header/window-header-default-top-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window-header/window-header-default-top-sides.gif
rename to html/admin/ext/resources/themes/images/default/window-header/window-header-default-top-sides.gif
diff --git a/interface/ext/resources/themes/images/default/window/window-default-corners.gif b/html/admin/ext/resources/themes/images/default/window/window-default-corners.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window/window-default-corners.gif
rename to html/admin/ext/resources/themes/images/default/window/window-default-corners.gif
diff --git a/interface/ext/resources/themes/images/default/window/window-default-sides.gif b/html/admin/ext/resources/themes/images/default/window/window-default-sides.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/window/window-default-sides.gif
rename to html/admin/ext/resources/themes/images/default/window/window-default-sides.gif
diff --git a/interface/ext/resources/themes/lib/utils.rb b/html/admin/ext/resources/themes/lib/utils.rb
similarity index 100%
rename from interface/ext/resources/themes/lib/utils.rb
rename to html/admin/ext/resources/themes/lib/utils.rb
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/_all.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/_all.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/_all.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/_all.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/_core.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/_core.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/_core.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/_core.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/_functions.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/_functions.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/_functions.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/_functions.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/_mixins.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/_mixins.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/_mixins.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/_mixins.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/_variables.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/_variables.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/_variables.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/_variables.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/_widgets.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/_widgets.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/_widgets.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/_widgets.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/core/_core.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/core/_core.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/core/_core.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/core/_core.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/core/_reset.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/core/_reset.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/core/_reset.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/core/_reset.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/layout/_layout.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/layout/_layout.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/layout/_layout.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/layout/_layout.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/mixins/_background-gradient.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_background-gradient.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/mixins/_background-gradient.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_background-gradient.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/mixins/_color-by-background.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_color-by-background.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/mixins/_color-by-background.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_color-by-background.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/mixins/_frame.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_frame.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/mixins/_frame.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_frame.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/mixins/_inner-border.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_inner-border.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/mixins/_inner-border.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_inner-border.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_reset-extras.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/mixins/_theme-background-image.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_dragdrop.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_focus.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_focus.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_focus.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_focus.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_messagebox.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_messagebox.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_messagebox.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_messagebox.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_resizable.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_resizable.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_resizable.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_resizable.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_scroller.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_scroller.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_scroller.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_scroller.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_splitter.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_splitter.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_splitter.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_splitter.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/util/_tool.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/util/_tool.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/util/_tool.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/util/_tool.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_boundlist.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_boundlist.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_boundlist.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_boundlist.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_btn-group.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_btn-group.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_btn-group.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_btn-group.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_button.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_button.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_button.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_button.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_core.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_core.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_core.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_core.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_focus.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_focus.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_focus.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_focus.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_form.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_form.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_form.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_form.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_grid.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_grid.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_grid.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_grid.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_htmleditor.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_htmleditor.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_htmleditor.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_htmleditor.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_layout.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_layout.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_layout.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_layout.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_loadmask.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_loadmask.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_loadmask.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_loadmask.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_menu.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_menu.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_menu.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_menu.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_panel.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_panel.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_panel.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_panel.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_pickers.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_pickers.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_pickers.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_pickers.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_progress-bar.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_progress-bar.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_progress-bar.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_progress-bar.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_qtip.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_qtip.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_qtip.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_qtip.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_tabs.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_tabs.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_tabs.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_tabs.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_toolbar.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_toolbar.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_toolbar.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_toolbar.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_tree.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_tree.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_tree.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_tree.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/variables/_window.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_window.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/variables/_window.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/variables/_window.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_boundlist.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_boundlist.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_boundlist.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_boundlist.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_btn-group.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_btn-group.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_btn-group.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_btn-group.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_button.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_button.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_button.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_button.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_colorpicker.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_colorpicker.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_colorpicker.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_colorpicker.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_datepicker.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_drawcomponent.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_form.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_form.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_form.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_form.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_grid.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_grid.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_html.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_html.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_html.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_html.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_loadmask.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_menu.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_menu.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_menu.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_menu.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_panel.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_panel.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_panel.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_panel.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_progress-bar.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_qtip.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_slider.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_slider.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_slider.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_slider.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_tab.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_tab.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_tabbar.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_toolbar.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_tree.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_tree.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_tree.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_tree.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_viewport.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_viewport.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_viewport.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_viewport.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/_window.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_window.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/_window.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/_window.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_all.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkbox.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_checkboxgroup.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_field.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_fieldset.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_file.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_file.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_file.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_file.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_htmleditor.scss
diff --git a/interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss b/html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss
similarity index 100%
rename from interface/ext/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss
rename to html/admin/ext/resources/themes/stylesheets/ext4/default/widgets/form/_triggerfield.scss
diff --git a/interface/ext/resources/themes/templates/resources/sass/config.rb b/html/admin/ext/resources/themes/templates/resources/sass/config.rb
similarity index 100%
rename from interface/ext/resources/themes/templates/resources/sass/config.rb
rename to html/admin/ext/resources/themes/templates/resources/sass/config.rb
diff --git a/interface/ext/resources/themes/templates/resources/sass/my-ext-theme.scss b/html/admin/ext/resources/themes/templates/resources/sass/my-ext-theme.scss
similarity index 100%
rename from interface/ext/resources/themes/templates/resources/sass/my-ext-theme.scss
rename to html/admin/ext/resources/themes/templates/resources/sass/my-ext-theme.scss
diff --git a/interface/favicon.ico b/html/admin/favicon.ico
similarity index 100%
rename from interface/favicon.ico
rename to html/admin/favicon.ico
diff --git a/interface/images/eye-grey.png b/html/admin/images/eye-grey.png
similarity index 100%
rename from interface/images/eye-grey.png
rename to html/admin/images/eye-grey.png
diff --git a/interface/images/eye.png b/html/admin/images/eye.png
similarity index 100%
rename from interface/images/eye.png
rename to html/admin/images/eye.png
diff --git a/interface/images/eye.xcf b/html/admin/images/eye.xcf
similarity index 100%
rename from interface/images/eye.xcf
rename to html/admin/images/eye.xcf
diff --git a/interface/images/forbidden.png b/html/admin/images/forbidden.png
similarity index 100%
rename from interface/images/forbidden.png
rename to html/admin/images/forbidden.png
diff --git a/interface/images/header.png b/html/admin/images/header.png
similarity index 100%
rename from interface/images/header.png
rename to html/admin/images/header.png
diff --git a/interface/images/icon/btn_border.png b/html/admin/images/icon/btn_border.png
similarity index 100%
rename from interface/images/icon/btn_border.png
rename to html/admin/images/icon/btn_border.png
diff --git a/interface/images/icon/btn_border_hover.png b/html/admin/images/icon/btn_border_hover.png
similarity index 100%
rename from interface/images/icon/btn_border_hover.png
rename to html/admin/images/icon/btn_border_hover.png
diff --git a/interface/images/icon/chart_bar.png b/html/admin/images/icon/chart_bar.png
similarity index 100%
rename from interface/images/icon/chart_bar.png
rename to html/admin/images/icon/chart_bar.png
diff --git a/interface/images/icon/chart_curve.png b/html/admin/images/icon/chart_curve.png
similarity index 100%
rename from interface/images/icon/chart_curve.png
rename to html/admin/images/icon/chart_curve.png
diff --git a/interface/images/icon/chart_pie.png b/html/admin/images/icon/chart_pie.png
similarity index 100%
rename from interface/images/icon/chart_pie.png
rename to html/admin/images/icon/chart_pie.png
diff --git a/interface/images/icon/clock.png b/html/admin/images/icon/clock.png
similarity index 100%
rename from interface/images/icon/clock.png
rename to html/admin/images/icon/clock.png
diff --git a/interface/images/icon/database.png b/html/admin/images/icon/database.png
similarity index 100%
rename from interface/images/icon/database.png
rename to html/admin/images/icon/database.png
diff --git a/interface/images/icon/ko.svg b/html/admin/images/icon/ko.svg
similarity index 100%
rename from interface/images/icon/ko.svg
rename to html/admin/images/icon/ko.svg
diff --git a/interface/images/icon/libreoffice-extension.png b/html/admin/images/icon/libreoffice-extension.png
similarity index 100%
rename from interface/images/icon/libreoffice-extension.png
rename to html/admin/images/icon/libreoffice-extension.png
diff --git a/interface/images/icon/loading_white.gif b/html/admin/images/icon/loading_white.gif
similarity index 100%
rename from interface/images/icon/loading_white.gif
rename to html/admin/images/icon/loading_white.gif
diff --git a/interface/images/icon/ok.svg b/html/admin/images/icon/ok.svg
similarity index 100%
rename from interface/images/icon/ok.svg
rename to html/admin/images/icon/ok.svg
diff --git a/interface/images/icon/server.png b/html/admin/images/icon/server.png
similarity index 100%
rename from interface/images/icon/server.png
rename to html/admin/images/icon/server.png
diff --git a/interface/images/icon/server_chart.png b/html/admin/images/icon/server_chart.png
similarity index 100%
rename from interface/images/icon/server_chart.png
rename to html/admin/images/icon/server_chart.png
diff --git a/interface/images/icon/status_online.png b/html/admin/images/icon/status_online.png
similarity index 100%
rename from interface/images/icon/status_online.png
rename to html/admin/images/icon/status_online.png
diff --git a/interface/images/icon/user.png b/html/admin/images/icon/user.png
similarity index 100%
rename from interface/images/icon/user.png
rename to html/admin/images/icon/user.png
diff --git a/interface/images/icon/user_edit.png b/html/admin/images/icon/user_edit.png
similarity index 100%
rename from interface/images/icon/user_edit.png
rename to html/admin/images/icon/user_edit.png
diff --git a/interface/images/istsos-logo.gif b/html/admin/images/istsos-logo.gif
similarity index 100%
rename from interface/images/istsos-logo.gif
rename to html/admin/images/istsos-logo.gif
diff --git a/interface/images/istsos-logo.png b/html/admin/images/istsos-logo.png
similarity index 100%
copy from interface/images/istsos-logo.png
copy to html/admin/images/istsos-logo.png
diff --git a/interface/images/istsos-logo.xcf b/html/admin/images/istsos-logo.xcf
similarity index 100%
rename from interface/images/istsos-logo.xcf
rename to html/admin/images/istsos-logo.xcf
diff --git a/interface/images/istsos.png b/html/admin/images/istsos.png
similarity index 100%
rename from interface/images/istsos.png
rename to html/admin/images/istsos.png
diff --git a/interface/images/menu/11971055981382663610sagar_ns_database.svg b/html/admin/images/menu/11971055981382663610sagar_ns_database.svg
similarity index 100%
rename from interface/images/menu/11971055981382663610sagar_ns_database.svg
rename to html/admin/images/menu/11971055981382663610sagar_ns_database.svg
diff --git a/interface/images/menu/Icon-add.svg b/html/admin/images/menu/Icon-add.svg
similarity index 100%
rename from interface/images/menu/Icon-add.svg
rename to html/admin/images/menu/Icon-add.svg
diff --git a/interface/images/menu/No_trash_icon.svg b/html/admin/images/menu/No_trash_icon.svg
similarity index 100%
rename from interface/images/menu/No_trash_icon.svg
rename to html/admin/images/menu/No_trash_icon.svg
diff --git a/interface/images/menu/World.svg b/html/admin/images/menu/World.svg
similarity index 100%
rename from interface/images/menu/World.svg
rename to html/admin/images/menu/World.svg
diff --git a/interface/images/menu/about.svg b/html/admin/images/menu/about.svg
similarity index 100%
rename from interface/images/menu/about.svg
rename to html/admin/images/menu/about.svg
diff --git a/interface/images/menu/about2.svg b/html/admin/images/menu/about2.svg
similarity index 100%
rename from interface/images/menu/about2.svg
rename to html/admin/images/menu/about2.svg
diff --git a/interface/images/menu/about_grey.svg b/html/admin/images/menu/about_grey.svg
similarity index 100%
rename from interface/images/menu/about_grey.svg
rename to html/admin/images/menu/about_grey.svg
diff --git a/interface/images/menu/about_grey.svg-path3848-4294966697.png b/html/admin/images/menu/about_grey.svg-path3848-4294966697.png
similarity index 100%
rename from interface/images/menu/about_grey.svg-path3848-4294966697.png
rename to html/admin/images/menu/about_grey.svg-path3848-4294966697.png
diff --git a/interface/images/menu/applications-internet.svg b/html/admin/images/menu/applications-internet.svg
similarity index 100%
rename from interface/images/menu/applications-internet.svg
rename to html/admin/images/menu/applications-internet.svg
diff --git a/interface/images/menu/applications-system.svg b/html/admin/images/menu/applications-system.svg
similarity index 100%
rename from interface/images/menu/applications-system.svg
rename to html/admin/images/menu/applications-system.svg
diff --git a/interface/images/menu/boh.svg b/html/admin/images/menu/boh.svg
similarity index 100%
rename from interface/images/menu/boh.svg
rename to html/admin/images/menu/boh.svg
diff --git a/interface/images/menu/call-start.svg b/html/admin/images/menu/call-start.svg
similarity index 100%
rename from interface/images/menu/call-start.svg
rename to html/admin/images/menu/call-start.svg
diff --git a/html/admin/images/menu/close.svg b/html/admin/images/menu/close.svg
new file mode 100755
index 0000000..f15fc83
--- /dev/null
+++ b/html/admin/images/menu/close.svg
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg2408"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.4 r9939"
+   version="1.0"
+   sodipodi:docname="close.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2410">
+    <linearGradient
+       id="linearGradient3637">
+      <stop
+         style="stop-color:#f0f0f0;stop-opacity:1;"
+         offset="0"
+         id="stop3639" />
+      <stop
+         style="stop-color:#aaaaaa;stop-opacity:1;"
+         offset="1"
+         id="stop3641" />
+    </linearGradient>
+    <linearGradient
+       id="ButtonShadow"
+       gradientTransform="scale(1.0058652,0.994169)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3750" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.58823532;"
+         offset="1"
+         id="stop3752" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3737">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3739" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3741" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3700">
+      <stop
+         style="stop-color:#2276c5;stop-opacity:1;"
+         offset="0"
+         id="stop3702" />
+      <stop
+         style="stop-color:#68baf4;stop-opacity:1;"
+         offset="1"
+         id="stop3704" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter3174">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.71"
+         id="feGaussianBlur3176" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3794"
+       x="-0.192"
+       width="1.384"
+       y="-0.192"
+       height="1.384">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.28"
+         id="feGaussianBlur3796" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3737"
+       id="linearGradient3613"
+       x1="48"
+       y1="20.220806"
+       x2="48"
+       y2="138.66119"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3613">
+      <rect
+         ry="6"
+         rx="6"
+         y="6"
+         x="6"
+         height="84"
+         width="84"
+         id="rect3615"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3625">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="M 0,0 0,96 96,96 96,0 0,0 z m 12,6 72,0 c 3.324,0 6,2.676 6,6 l 0,72 c 0,3.324 -2.676,6 -6,6 L 12,90 C 8.676,90 6,87.324 6,84 L 6,12 C 6,8.676 8.676,6 12,6 z"
+         id="path3627" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3649">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="rect3651"
+         width="76"
+         height="76"
+         x="10"
+         y="10"
+         rx="4"
+         ry="4" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter3657">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.14"
+         id="feGaussianBlur3659" />
+    </filter>
+    <linearGradient
+       id="ButtonShadow-0"
+       gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3750-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.58823532;"
+         offset="1"
+         id="stop3752-5" />
+    </linearGradient>
+    <linearGradient
+       y2="11.015625"
+       x2="19"
+       y1="11.015625"
+       x1="11"
+       gradientTransform="matrix(0,-3.0000004,2.9652505,0,33.335916,111.00001)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2927-4"
+       xlink:href="#linearGradient3183-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3183-0">
+      <stop
+         style="stop-color:#c80000;stop-opacity:1;"
+         offset="0"
+         id="stop3185-9" />
+      <stop
+         style="stop-color:#f3604d;stop-opacity:1;"
+         offset="1"
+         id="stop3187-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.9492233"
+     inkscape:cx="25.255544"
+     inkscape:cy="51.597005"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg2408"
+     showgrid="true"
+     showborder="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1871"
+     inkscape:window-height="1056"
+     inkscape:window-x="49"
+     inkscape:window-y="1104"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3732"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2413">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:9.19999999999999929;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-start:none"
+     d="M 90,6 90.095795,90.789236 5,91 5,6 z"
+     id="path4556"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:12.04600905999999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 23.879502,23.855162 48.119467,48.601515 m -48.119467,0 48.385391,-48.721568"
+     id="path4558"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/interface/images/menu/contacts.svg b/html/admin/images/menu/contacts.svg
similarity index 100%
rename from interface/images/menu/contacts.svg
rename to html/admin/images/menu/contacts.svg
diff --git a/interface/images/menu/coordinate.svg b/html/admin/images/menu/coordinate.svg
similarity index 100%
rename from interface/images/menu/coordinate.svg
rename to html/admin/images/menu/coordinate.svg
diff --git a/interface/images/menu/database.svg b/html/admin/images/menu/database.svg
similarity index 100%
rename from interface/images/menu/database.svg
rename to html/admin/images/menu/database.svg
diff --git a/interface/images/menu/delete.svg b/html/admin/images/menu/delete.svg
similarity index 100%
rename from interface/images/menu/delete.svg
rename to html/admin/images/menu/delete.svg
diff --git a/interface/images/menu/delete2.svg b/html/admin/images/menu/delete2.svg
similarity index 100%
rename from interface/images/menu/delete2.svg
rename to html/admin/images/menu/delete2.svg
diff --git a/interface/images/menu/desktop-effects.svg b/html/admin/images/menu/desktop-effects.svg
similarity index 100%
rename from interface/images/menu/desktop-effects.svg
rename to html/admin/images/menu/desktop-effects.svg
diff --git a/interface/images/menu/document-save.svg b/html/admin/images/menu/document-save.svg
similarity index 100%
rename from interface/images/menu/document-save.svg
rename to html/admin/images/menu/document-save.svg
diff --git a/html/admin/images/menu/download.svg b/html/admin/images/menu/download.svg
new file mode 100755
index 0000000..46ea4ae
--- /dev/null
+++ b/html/admin/images/menu/download.svg
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg2408"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.4 r9939"
+   version="1.0"
+   sodipodi:docname="download.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2410">
+    <linearGradient
+       id="linearGradient3637">
+      <stop
+         style="stop-color:#f0f0f0;stop-opacity:1;"
+         offset="0"
+         id="stop3639" />
+      <stop
+         style="stop-color:#aaaaaa;stop-opacity:1;"
+         offset="1"
+         id="stop3641" />
+    </linearGradient>
+    <linearGradient
+       id="ButtonShadow"
+       gradientTransform="scale(1.0058652,0.994169)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3750" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.58823532;"
+         offset="1"
+         id="stop3752" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3737">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3739" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3741" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3700">
+      <stop
+         style="stop-color:#2276c5;stop-opacity:1;"
+         offset="0"
+         id="stop3702" />
+      <stop
+         style="stop-color:#68baf4;stop-opacity:1;"
+         offset="1"
+         id="stop3704" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter3174">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.71"
+         id="feGaussianBlur3176" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3794"
+       x="-0.192"
+       width="1.384"
+       y="-0.192"
+       height="1.384">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.28"
+         id="feGaussianBlur3796" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3737"
+       id="linearGradient3613"
+       x1="48"
+       y1="20.220806"
+       x2="48"
+       y2="138.66119"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3613">
+      <rect
+         ry="6"
+         rx="6"
+         y="6"
+         x="6"
+         height="84"
+         width="84"
+         id="rect3615"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3625">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         d="M 0,0 0,96 96,96 96,0 0,0 z m 12,6 72,0 c 3.324,0 6,2.676 6,6 l 0,72 c 0,3.324 -2.676,6 -6,6 L 12,90 C 8.676,90 6,87.324 6,84 L 6,12 C 6,8.676 8.676,6 12,6 z"
+         id="path3627" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3649">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="rect3651"
+         width="76"
+         height="76"
+         x="10"
+         y="10"
+         rx="4"
+         ry="4" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter3657">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.14"
+         id="feGaussianBlur3659" />
+    </filter>
+    <linearGradient
+       id="ButtonShadow-0"
+       gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)"
+       x1="45.447727"
+       y1="92.539597"
+       x2="45.447727"
+       y2="7.0165396"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3750-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.58823532;"
+         offset="1"
+         id="stop3752-5" />
+    </linearGradient>
+    <linearGradient
+       y2="11.015625"
+       x2="19"
+       y1="11.015625"
+       x1="11"
+       gradientTransform="matrix(0,-3.0000004,2.9652505,0,33.335916,111.00001)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2927-4"
+       xlink:href="#linearGradient3183-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3183-0">
+      <stop
+         style="stop-color:#c80000;stop-opacity:1;"
+         offset="0"
+         id="stop3185-9" />
+      <stop
+         style="stop-color:#f3604d;stop-opacity:1;"
+         offset="1"
+         id="stop3187-6" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.9492233"
+     inkscape:cx="22.734207"
+     inkscape:cy="51.597005"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg2408"
+     showgrid="true"
+     showborder="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1871"
+     inkscape:window-height="1056"
+     inkscape:window-x="49"
+     inkscape:window-y="1104"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3732"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2413">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:13.38152790000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 7.6122993,12.074541 0,75.949946"
+     id="path3745"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:13.38152790000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 7.6122993,88.024487 80.2796687,0 0,-75.949946"
+     id="path3747"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:12.80330563000000055;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 47.537929,7.5157486 0,63.2073444"
+     id="path3749"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:13.38152790000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="M 29.506754,53.327444 47.537929,70.154029"
+     id="path3751"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:13.38152790000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="M 47.537929,70.154029 65.997513,53.327444"
+     id="path3753"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:13.38152790000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 7.6122993,12.074541 21.8944547,0"
+     id="path4523"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:13.38152790000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 87.891968,12.074541 -21.894455,0"
+     id="path4525"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/interface/images/menu/editor.svg b/html/admin/images/menu/editor.svg
similarity index 100%
rename from interface/images/menu/editor.svg
rename to html/admin/images/menu/editor.svg
diff --git a/interface/images/menu/emblem-shared.svg b/html/admin/images/menu/emblem-shared.svg
similarity index 100%
rename from interface/images/menu/emblem-shared.svg
rename to html/admin/images/menu/emblem-shared.svg
diff --git a/interface/images/menu/emblem-system.svg b/html/admin/images/menu/emblem-system.svg
similarity index 100%
rename from interface/images/menu/emblem-system.svg
rename to html/admin/images/menu/emblem-system.svg
diff --git a/interface/images/menu/emblem-ubuntuone-unsynchronized.svg b/html/admin/images/menu/emblem-ubuntuone-unsynchronized.svg
similarity index 100%
rename from interface/images/menu/emblem-ubuntuone-unsynchronized.svg
rename to html/admin/images/menu/emblem-ubuntuone-unsynchronized.svg
diff --git a/interface/images/menu/getobs.svg b/html/admin/images/menu/getobs.svg
similarity index 100%
rename from interface/images/menu/getobs.svg
rename to html/admin/images/menu/getobs.svg
diff --git a/interface/images/menu/internet-radio-new.svg b/html/admin/images/menu/internet-radio-new.svg
similarity index 100%
rename from interface/images/menu/internet-radio-new.svg
rename to html/admin/images/menu/internet-radio-new.svg
diff --git a/interface/images/menu/list-add.svg b/html/admin/images/menu/list-add.svg
similarity index 100%
rename from interface/images/menu/list-add.svg
rename to html/admin/images/menu/list-add.svg
diff --git a/interface/images/menu/media-eject.svg b/html/admin/images/menu/media-eject.svg
similarity index 100%
rename from interface/images/menu/media-eject.svg
rename to html/admin/images/menu/media-eject.svg
diff --git a/interface/images/menu/media-playback-start.svg b/html/admin/images/menu/media-playback-start.svg
similarity index 100%
rename from interface/images/menu/media-playback-start.svg
rename to html/admin/images/menu/media-playback-start.svg
diff --git a/interface/images/menu/network-transmit-receive.svg b/html/admin/images/menu/network-transmit-receive.svg
similarity index 100%
rename from interface/images/menu/network-transmit-receive.svg
rename to html/admin/images/menu/network-transmit-receive.svg
diff --git a/interface/images/menu/new_service.svg b/html/admin/images/menu/new_service.svg
similarity index 100%
rename from interface/images/menu/new_service.svg
rename to html/admin/images/menu/new_service.svg
diff --git a/interface/images/menu/observedProperties.svg b/html/admin/images/menu/observedProperties.svg
similarity index 100%
rename from interface/images/menu/observedProperties.svg
rename to html/admin/images/menu/observedProperties.svg
diff --git a/interface/images/menu/offerings.svg b/html/admin/images/menu/offerings.svg
similarity index 100%
rename from interface/images/menu/offerings.svg
rename to html/admin/images/menu/offerings.svg
diff --git a/interface/images/menu/provider.svg b/html/admin/images/menu/provider.svg
similarity index 100%
rename from interface/images/menu/provider.svg
rename to html/admin/images/menu/provider.svg
diff --git a/interface/images/menu/proxy.svg b/html/admin/images/menu/proxy.svg
similarity index 100%
rename from interface/images/menu/proxy.svg
rename to html/admin/images/menu/proxy.svg
diff --git a/interface/images/menu/quality.svg b/html/admin/images/menu/quality.svg
similarity index 100%
rename from interface/images/menu/quality.svg
rename to html/admin/images/menu/quality.svg
diff --git a/interface/images/menu/quality_index.svg b/html/admin/images/menu/quality_index.svg
similarity index 100%
rename from interface/images/menu/quality_index.svg
rename to html/admin/images/menu/quality_index.svg
diff --git a/interface/images/menu/service_provider.svg b/html/admin/images/menu/service_provider.svg
similarity index 100%
rename from interface/images/menu/service_provider.svg
rename to html/admin/images/menu/service_provider.svg
diff --git a/interface/images/menu/service_provider_light.svg b/html/admin/images/menu/service_provider_light.svg
similarity index 100%
rename from interface/images/menu/service_provider_light.svg
rename to html/admin/images/menu/service_provider_light.svg
diff --git a/interface/images/menu/service_provider_light2.svg b/html/admin/images/menu/service_provider_light2.svg
similarity index 100%
rename from interface/images/menu/service_provider_light2.svg
rename to html/admin/images/menu/service_provider_light2.svg
diff --git a/interface/images/menu/srvc_id.svg b/html/admin/images/menu/srvc_id.svg
similarity index 100%
rename from interface/images/menu/srvc_id.svg
rename to html/admin/images/menu/srvc_id.svg
diff --git a/interface/images/menu/status.svg b/html/admin/images/menu/status.svg
similarity index 100%
rename from interface/images/menu/status.svg
rename to html/admin/images/menu/status.svg
diff --git a/interface/images/menu/status_1.svg b/html/admin/images/menu/status_1.svg
similarity index 100%
copy from interface/images/menu/status_1.svg
copy to html/admin/images/menu/status_1.svg
diff --git a/interface/images/menu/system-run.svg b/html/admin/images/menu/system-run.svg
similarity index 100%
rename from interface/images/menu/system-run.svg
rename to html/admin/images/menu/system-run.svg
diff --git a/interface/images/menu/system-run_old.svg b/html/admin/images/menu/system-run_old.svg
similarity index 100%
rename from interface/images/menu/system-run_old.svg
rename to html/admin/images/menu/system-run_old.svg
diff --git a/interface/images/menu/unit.svg b/html/admin/images/menu/unit.svg
similarity index 100%
rename from interface/images/menu/unit.svg
rename to html/admin/images/menu/unit.svg
diff --git a/interface/images/menu/user-trash.svg b/html/admin/images/menu/user-trash.svg
similarity index 100%
rename from interface/images/menu/user-trash.svg
rename to html/admin/images/menu/user-trash.svg
diff --git a/interface/images/menu/view-list-details-symbolic.svg b/html/admin/images/menu/view-list-details-symbolic.svg
similarity index 100%
rename from interface/images/menu/view-list-details-symbolic.svg
rename to html/admin/images/menu/view-list-details-symbolic.svg
diff --git a/interface/images/menu/view-list-icons-symbolic.svg b/html/admin/images/menu/view-list-icons-symbolic.svg
similarity index 100%
rename from interface/images/menu/view-list-icons-symbolic.svg
rename to html/admin/images/menu/view-list-icons-symbolic.svg
diff --git a/interface/images/menu/virtual.svg b/html/admin/images/menu/virtual.svg
similarity index 100%
rename from interface/images/menu/virtual.svg
rename to html/admin/images/menu/virtual.svg
diff --git a/html/admin/index.html b/html/admin/index.html
new file mode 100755
index 0000000..0839e01
--- /dev/null
+++ b/html/admin/index.html
@@ -0,0 +1,469 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>istSOS webadmin developer page</title>
+	<link rel="icon" href="favicon.ico" />
+	<link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
+        <!--[if gte IE 9]>
+            <style type="text/css">
+                .gradient {
+                filter: none;
+                }
+            </style>
+        <![endif]-->
+        <link rel="stylesheet" type="text/css" href="css/main.css"/>
+
+        <link href='https://fonts.googleapis.com/css?family=Electrolize' rel='stylesheet' type='text/css'>
+        <!--
+        <link href='http://fonts.googleapis.com/css?family=Karla:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+        <link href='http://fonts.googleapis.com/css?family=Exo' rel='stylesheet' type='text/css'>
+        <link href='http://fonts.googleapis.com/css?family=Patrick+Hand' rel='stylesheet' type='text/css'>
+        <link href='http://fonts.googleapis.com/css?family=Nova+Square' rel='stylesheet' type='text/css'>
+        <link href='http://fonts.googleapis.com/css?family=Mate+SC' rel='stylesheet' type='text/css'>
+        <link href='http://fonts.googleapis.com/css?family=Imprima' rel='stylesheet' type='text/css'>
+        -->
+
+        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
+
+        <script type="text/javascript" src="dygraphs/dygraph-combined.js"></script>
+        <!--<script type="text/javascript" src="http://dygraphs.com/dygraph-dev.js"></script>-->
+
+        <script type="text/javascript" src="codemirror/lib/codemirror.js"></script>
+        <link   rel="stylesheet" href="codemirror/lib/codemirror.css">
+        <script type="text/javascript" src="codemirror/mode/javascript/javascript.js"></script>
+        <script type="text/javascript" src="codemirror/mode/python/python.js"></script>
+        <script type="text/javascript" src="ext/codemirror.js"></script>
+
+
+        <script type="text/javascript" src="app/engine/wa.js"></script>
+        <script type="text/javascript" src="app/engine/pageConfig.js"></script>
+        <script type="text/javascript" src="app/engine/pageManager.js"></script>
+
+        <script type="text/javascript">
+            
+            function pad(n){return n<10 ? '0'+n : n}
+            
+            function ISO8601FromDate(isodate) {
+                alert("ISO8601FromDate is deprecated!!");
+                function pad(n){return n<10 ? '0'+n : n}
+                var offset = isodate.getTimezoneOffset()/-60;
+                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
+                return isodate.getFullYear()+'-'
+                    + pad(isodate.getMonth()+1)+'-'
+                    + pad(isodate.getDate())+'T'
+                    + pad(isodate.getHours())+':'
+                    + pad(isodate.getMinutes())+':'
+                    + pad(isodate.getSeconds())+'.'
+                    + isodate.getMilliseconds() + tz;
+            }
+            String.prototype.capitalize = function(){
+                return this.toLowerCase().replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
+            };
+            Ext.override(Ext.layout.Layout, {
+                renderItem: function(item, target, position) {
+                    if (item && !item.rendered && item.isFieldLabelable && item.fieldLabel && item.allowBlank == false) {
+                        item.fieldLabel = '<span title="This is a mandatory parameter">' + item.fieldLabel + '<span style="color:red">*</span></span>';
+                    }
+                    this.callOverridden(arguments);
+                }
+            });
+            Function.prototype.defer =
+                function(n,o) {
+                // Get arguments as array
+                var a = [];
+                for(var i=2; i<arguments.length; i++)
+                    a.push(arguments[i]);
+                var that = this;
+                window.setTimeout(function(){return that.apply(o,a);},n);
+            };
+            Ext.override(Ext.chart.Chart, {  
+                onMouseUp: function(e) {
+                    var me = this,
+                    position = me.getEventXY(e),
+                    item;
+                    if (me.mask) {
+                        me.mixins.mask.onMouseUp.call(me, e);
+                    }
+                    me.series.each(function(series) {
+                        if (Ext.draw.Draw.withinBox(position[0], position[1], series.bbox)) {
+                            if (series.getItemForPoint) {
+                                item = series.getItemForPoint(position[0], position[1]);
+                                if (item) {
+                                    series.fireEvent('itemmouseup', item, e);
+                                }
+                            }
+                        }
+                    }, me);
+                }
+            });
+            Ext.override(Ext.view.DropZone, {  
+                onNodeDrop: function (node, dragZone, e, data) {
+                    var me = this,
+                    dropHandled = false,
+                    dropHandlers = {
+                        wait : false,
+                        processDrop : function () {
+                            me.invalidateDrop();
+                            me.handleNodeDrop(data, me.overRecord, me.currentPosition);
+                            dropHandled = true;
+                            me.fireViewEvent('drop', node, data, me.overRecord, me.currentPosition);
+                        },
+                        cancelDrop : function () {
+                            me.invalidateDrop();
+                            dropHandled = true;
+                        }
+                    },
+                    performOperation = false;
+                    if (me.valid) {
+                        performOperation = me.fireViewEvent('beforedrop', node, data, me.overRecord, me.currentPosition, dropHandlers);
+                        if (dropHandlers.wait) {
+                            return;
+                        }
+                        if (performOperation !== false) {
+                            if (!dropHandled) {
+                                dropHandlers.processDrop();
+                            }
+                        }
+                    }
+                    return performOperation;
+                }
+            });
+            
+            
+            Ext.override(Ext.form.FieldSet, {
+                setExpanded: function(expanded) {
+                    var me = this,
+                    checkboxCmp = me.checkboxCmp,
+                    toggleCmp = me.toggleCmp,
+                    event;
+
+                    expanded = !!expanded;
+        
+                    if (checkboxCmp) {
+                        checkboxCmp.setValue(expanded);
+                    }
+        
+                    if (toggleCmp) {
+                        toggleCmp.setType(expanded ? 'up' : 'down');
+                    }
+        
+                    if (expanded) {
+                        event = "expand";
+                        me.removeCls(me.baseCls + '-collapsed');
+                    } else {
+                        event = "collapse";
+                        me.addCls(me.baseCls + '-collapsed');
+                    }
+                    me.collapsed = !expanded;
+                    if (expanded) {
+                        // ensure subitems will get rendered and layed out when expanding
+                        me.getComponentLayout().childrenChanged = true;
+                    }
+                    me.doComponentLayout();
+                    me.fireEvent(event, me);
+                    return me;
+                }
+            });
+
+            /* 
+            This reusable script is copyrighted.
+            Copyright (c) 2004,2005,2006 Claude Ostyn
+            This script is free for use with attribution
+            under the Creative Commons Attribution-ShareAlike 2.5 License.
+            To view a copy of this license, visit
+            http://creativecommons.org/licenses/by-sa/2.5/
+            or send a letter to
+            Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
+
+            For any other use, contact Claude Ostyn via tools at Ostyn.com.
+
+            USE AT YOUR OWN RISK!
+            THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+            EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+            OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+            NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER
+            BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+            ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+            CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+            SOFTWARE.
+             */
+
+            function centisecsToISODuration(n, bPrecise)
+            {
+                // Note: SCORM and IEEE 1484.11.1 require centisec precision
+                // Parameters:
+                // n = number of centiseconds
+                // bPrecise = optional parameter; if true, duration will
+                // be expressed without using year and/or month fields.
+                // If bPrecise is not true, and the duration is long,
+                // months are calculated by approximation based on average number
+                // of days over 4 years (365*4+1), not counting the extra days
+                // for leap years. If a reference date was available,
+                // the calculation could be more precise, but becomes complex,
+                // since the exact result depends on where the reference date
+                // falls within the period (e.g. beginning, end or ???)
+                // 1 year ~ (365*4+1)/4*60*60*24*100 = 3155760000 centiseconds
+                // 1 month ~ (365*4+1)/48*60*60*24*100 = 262980000 centiseconds
+                // 1 day = 8640000 centiseconds
+                // 1 hour = 360000 centiseconds
+                // 1 minute = 6000 centiseconds
+                var str = "P";
+                var nCs=n;
+                var nY=0, nM=0, nD=0, nH=0, nMin=0, nS=0;
+                n = Math.max(n,0); // there is no such thing as a negative duration
+                var nCs = n;
+                // Next set of operations uses whole seconds
+                with (Math)
+                {
+                    nCs = round(nCs);
+                    if (bPrecise == true)
+                    {
+                        nD = floor(nCs / 8640000);
+                    }
+                    else
+                    {
+                        nY = floor(nCs / 3155760000);
+                        nCs -= nY * 3155760000;
+                        nM = floor(nCs / 262980000);
+                        nCs -= nM * 262980000;
+                        nD = floor(nCs / 8640000);
+                    }
+                    nCs -= nD * 8640000;
+                    nH = floor(nCs / 360000);
+                    nCs -= nH * 360000;
+                    var nMin = floor(nCs /6000);
+                    nCs -= nMin * 6000
+                }
+                // Now we can construct string
+                if (nY > 0) str += nY + "Y";
+                if (nM > 0) str += nM + "M";
+                if (nD > 0) str += nD + "D";
+                if ((nH > 0) || (nMin > 0) || (nCs > 0))
+                {
+                    str += "T";
+                    if (nH > 0) str += nH + "H";
+                    if (nMin > 0) str += nMin + "M";
+                    if (nCs > 0) str += (nCs / 100) + "S";
+                }
+                if (str == "P") str = "PT0H0M0S";
+                // technically PT0S should do but SCORM test suite assumes longer form.
+                return str;
+            }
+        </script>
+        <script type="text/javascript" src="app/view/ui/BasePage.js"></script>
+        <script type="text/javascript" src="app/view/BasePage.js"></script>
+        <script type="text/javascript" src="app/view/ui/CenterPage.js"></script>
+        <script type="text/javascript" src="app/view/ui/WizardPage.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/contactinfo.js"></script>
+        <script type="text/javascript" src="app/view/contactinfo.js"></script>
+        <script type="text/javascript" src="app/view/ui/paths.js"></script>
+        <script type="text/javascript" src="app/view/paths.js"></script>
+        <script type="text/javascript" src="app/view/ui/about.js"></script>
+        <script type="text/javascript" src="app/view/about.js"></script>
+        <script type="text/javascript" src="app/view/ui/contacts.js"></script>
+        <script type="text/javascript" src="app/view/contacts.js"></script>
+        <script type="text/javascript" src="app/view/ui/config.js"></script>
+        <script type="text/javascript" src="app/view/config.js"></script>
+        <script type="text/javascript" src="app/view/ui/database.js"></script>
+        <script type="text/javascript" src="app/view/database.js"></script>
+        <script type="text/javascript" src="app/view/ui/newservice.js"></script>
+        <script type="text/javascript" src="app/view/newservice.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/identification.js"></script>
+        <script type="text/javascript" src="app/view/identification.js"></script>
+        <script type="text/javascript" src="app/view/ui/provider.js"></script>
+        <script type="text/javascript" src="app/view/provider.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/FormDataQuality.js"></script>
+        <script type="text/javascript" src="app/view/FormDataQuality.js"></script>
+        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
+
+
+        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
+        <script type="text/javascript" src="app/store/Offerings.js"></script>
+        <script type="text/javascript" src="app/store/Procedures.js"></script>
+        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
+        <!--<script type="text/javascript" src="app/store/Observations.js"></script>-->
+
+        <script type="text/javascript" src="app/store/Services.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/ObservationEditorColumn.js"></script>
+        <script type="text/javascript" src="app/view/ObservationEditorColumn.js"></script>
+        <script type="text/javascript" src="app/view/ui/ObservationEditor.js"></script>
+        <script type="text/javascript" src="app/view/ObservationEditor.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/serviceconfig.js"></script>
+        <script type="text/javascript" src="app/view/serviceconfig.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/geo.js"></script>
+        <script type="text/javascript" src="app/view/geo.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/getobservation.js"></script>
+        <script type="text/javascript" src="app/view/getobservation.js"></script>
+
+        <script type="text/javascript" src="app/store/serverstatus.js"></script>
+
+
+        <script type="text/javascript" src="app/view/ui/status.js"></script>
+        <script type="text/javascript" src="app/view/status.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/serviceurl.js"></script>
+        <script type="text/javascript" src="app/view/serviceurl.js"></script>
+
+        <script type="text/javascript" src="app/store/cmbIdentification.js"></script>
+        <script type="text/javascript" src="app/store/cmbSystemType.js"></script>
+        <script type="text/javascript" src="app/store/cmbSml.js"></script>
+        <script type="text/javascript" src="app/store/cmbName.js"></script>
+        <script type="text/javascript" src="app/store/cmbDocumentFormat.js"></script>
+        <script type="text/javascript" src="app/store/gridDocumentation.js"></script>
+        <script type="text/javascript" src="app/store/gridOutputs.js"></script>
+        <script type="text/javascript" src="app/store/Constraint.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/procedure.js"></script>
+        <script type="text/javascript" src="app/view/procedure.js"></script>
+
+        <script type="text/javascript" src="app/store/gridProceduresList.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/proceduresList.js"></script>
+        <script type="text/javascript" src="app/view/proceduresList.js"></script>
+
+        <script type="text/javascript" src="app/store/gridObservedProperties.js"></script>
+        <script type="text/javascript" src="app/store/gridUoms.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/obsPropEditor.js"></script>
+        <script type="text/javascript" src="app/view/obsPropEditor.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/uomsEditor.js"></script>
+        <script type="text/javascript" src="app/view/uomsEditor.js"></script>
+
+        <script type="text/javascript" src="app/store/gridOfferings.js"></script>
+        <script type="text/javascript" src="app/view/ui/offeringsEditor.js"></script>
+        <script type="text/javascript" src="app/view/offeringsEditor.js"></script>
+
+        <script type="text/javascript" src="app/store/cmbNameDescription.js"></script>
+        <script type="text/javascript" src="app/view/ui/qualityindexEditor.js"></script>
+        <script type="text/javascript" src="app/view/qualityindexEditor.js"></script>
+
+        <!-- DEVELOPERS INCLUDE -->
+        <script type="text/javascript" src="app/view/ui/MainMenu.js"></script>
+        <script type="text/javascript" src="app/view/MainMenu.js"></script>
+        <script type="text/javascript" src="app/view/ui/MainMenu2.js"></script>
+        <script type="text/javascript" src="app/view/MainMenu2.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/ObservationEditorAdvancedOperations.js"></script>
+        <script type="text/javascript" src="app/view/ObservationEditorAdvancedOperations.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/serviceEditor.js"></script>
+        <script type="text/javascript" src="app/view/serviceEditor.js"></script>
+
+
+        <script type="text/javascript" src="app/Procedure.js"></script>
+        <script type="text/javascript" src="app/store/AggregateFunctionStore.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/ProcedureChooser.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureChooser.js"></script>
+        
+        <script type="text/javascript" src="app/view/ui/ProcedurePlotter.js"></script>
+        <script type="text/javascript" src="app/view/ProcedurePlotter.js"></script>
+        
+        <script type="text/javascript" src="app/view/ui/CheckColumn.js"></script>
+        <script type="text/javascript" src="app/view/CheckColumn.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/Calc.js"></script>
+        <script type="text/javascript" src="app/view/Calc.js"></script>
+
+        <script type="text/javascript" src="app/view/ui/Chart.js"></script>
+        <script type="text/javascript" src="app/view/Chart.js"></script>
+        
+        
+        <script type="text/javascript" src="app/view/ui/ProcedureChart.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureChart.js"></script>
+        <script type="text/javascript" src="app/view/ui/ProcedureGrid.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureGrid.js"></script>
+        <script type="text/javascript" src="app/view/ui/ProcedureGridEditor.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureGridEditor.js"></script>
+        
+        
+        <script type="text/javascript" src="app/view/ui/Editor1.js"></script>
+        <script type="text/javascript" src="app/view/Editor1.js"></script>
+        
+        
+        <script type="text/javascript" src="app/store/RatingCurve.js"></script>
+        <script type="text/javascript" src="app/store/vplist.js"></script>
+        <script type="text/javascript" src="app/view/ui/VirtualProcedureEditor.js"></script>
+        <script type="text/javascript" src="app/view/VirtualProcedureEditor.js"></script>
+
+
+
+        <style type="text/css">
+            .x-btn-default-toolbar-small .x-btn-inner {
+                color: white !important;
+            }
+            .x-btn-arrow {
+                background-image: url('ext/resources/themes/images/default/button/arrow.gif');
+                display: block;
+            }
+        </style>
+
+        <script type="text/javascript">
+            
+            Ext.ns("wa");
+            wa.isodef = "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601";
+            wa.url = "../wa";
+
+            Ext.Loader.setConfig({
+                enabled: false
+            });
+            
+            Ext.application({
+                
+                name: 'istsos',
+
+                launch: function() {
+                    
+                    Ext.QuickTips.init();
+                    
+                    Ext.Ajax.on("requestexception",function(conn, response, options, eOpts ){
+                        try{
+                            var json = Ext.decode(response.responseText);
+                            if(!json.success && !Ext.isEmpty(json.message)){
+                                Ext.Msg.alert(response.statusText, json.message);
+                            }
+                        }catch(e){
+                            console.error(response);
+                        }
+                    });
+                    
+                    Ext.Ajax.on("requestcomplete",function(conn, response, options, eOpts ){
+                        try{
+                            var json = Ext.decode(response.responseText);
+                            if(!json.success && !Ext.isEmpty(json.message)){
+                                Ext.Msg.alert("Server message",json.message + "<br/><br/>" + 
+                                    "<small>Status response: " + response.statusText + "</small><br/>" + 
+                                    "<small>Resource: " + json.resource + "</small><br/>" + 
+                                    "<small>Method: " + json.method + "</small><br/>" + 
+                                    "<small>Path " + json.path + "</small>");
+                                console.error(json.message);
+                            }else if (json.success && !Ext.isEmpty(json.message)){
+                                console.log(json.message);
+                            }
+                        }catch(e){
+                            console.error(response);
+                        }
+                    });
+                    
+                    
+                    
+                    Ext.create('Ext.Viewport', {
+                        layout: "fit",
+                        items: Ext.create('istsos.view.MainMenu2')
+                    }).show();
+                    
+                }
+            });
+        </script>
+    </head>
+    <body></body>
+</html>
diff --git a/interface/poster.html b/html/admin/poster.html
similarity index 100%
rename from interface/poster.html
rename to html/admin/poster.html
diff --git a/html/admin/viewer.html b/html/admin/viewer.html
new file mode 100755
index 0000000..7dfffa3
--- /dev/null
+++ b/html/admin/viewer.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>istSOS - Data viewer</title>
+        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
+        <!--[if gte IE 9]>
+            <style type="text/css">
+                .gradient {
+                filter: none;
+                }
+            </style>
+        <![endif]-->
+        <link rel="stylesheet" type="text/css" href="css/main.css"/>
+
+        <link href='http://fonts.googleapis.com/css?family=Electrolize' rel='stylesheet' type='text/css'>
+
+        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
+
+        <script type="text/javascript" src="dygraphs/dygraph-combined.js"></script>
+
+        <script type="text/javascript" src="app/store/Offerings.js"></script>
+        <script type="text/javascript" src="app/store/gridProceduresList.js"></script>
+        <script type="text/javascript" src="app/store/Services.js"></script>
+        <script type="text/javascript" src="app/store/AggregateFunctionStore.js"></script>
+        
+        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
+        
+        <script type="text/javascript" src="app/view/ui/ProcedureChooser.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureChooser.js"></script>
+        
+        <script type="text/javascript" src="app/view/ui/ProcedureChart.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureChart.js"></script>
+        
+        <script type="text/javascript" src="app/view/ui/ProcedureGrid.js"></script>
+        <script type="text/javascript" src="app/view/ProcedureGrid.js"></script>
+        
+        
+        <script type="text/javascript" src="app/view/ui/Viewer.js"></script>
+        <script type="text/javascript" src="app/view/Viewer.js"></script>
+
+        <script type="text/javascript" src="app/Procedure.js"></script>
+
+
+
+        <style type="text/css">
+
+            .x-btn-default-toolbar-small .x-btn-inner {
+                color: white !important;
+            }
+            .x-btn-arrow {
+                background-image: url('ext/resources/themes/images/default/button/arrow.gif');
+                display: block;
+            }
+        </style> 
+
+        <script type="text/javascript">
+            
+            function pad(n){return n<10 ? '0'+n : n}
+            
+            Ext.ns("wa");
+            wa.url = "../wa";
+
+            Ext.Loader.setConfig({
+                enabled: false
+            });
+            
+            Ext.application({
+                
+                name: 'istsos',
+
+                launch: function() {
+                    
+                    Ext.QuickTips.init();
+                    
+                    Ext.Ajax.on("requestexception",function(conn, response, options, eOpts ){
+                        try{
+                            var json = Ext.decode(response.responseText);
+                            if(!json.success && !Ext.isEmpty(json.message)){
+                                Ext.Msg.alert(response.statusText, json.message);
+                            }
+                        }catch(e){
+                            console.error(response);
+                        }
+                    });
+                    
+                    Ext.Ajax.on("requestcomplete",function(conn, response, options, eOpts ){
+                        try{
+                            var json = Ext.decode(response.responseText);
+                            if(!json.success && !Ext.isEmpty(json.message)){
+                                Ext.Msg.alert("Server message",json.message + "<br/><br/>" + 
+                                    "<small>Status response: " + response.statusText + "</small><br/>" + 
+                                    "<small>Resource: " + json.resource + "</small><br/>" + 
+                                    "<small>Method: " + json.method + "</small><br/>" + 
+                                    "<small>Path " + json.path + "</small>");
+                                console.error(json.message);
+                            }else if (json.success && !Ext.isEmpty(json.message)){
+                                console.log(json.message);
+                            }
+                        }catch(e){
+                            console.error(response);
+                        }
+                    });
+                    
+                    Ext.create('istsos.view.Viewer', {
+                        renderTo: Ext.getBody()
+                    }).show();
+                    
+                }
+            });
+        </script>
+    </head>
+    <body></body>
+</html>
diff --git a/interface/requests/describeSensor.xml b/html/admin/viewer/describeSensor.xml
similarity index 100%
rename from interface/requests/describeSensor.xml
rename to html/admin/viewer/describeSensor.xml
diff --git a/interface/requests/getCapabilities.xml b/html/admin/viewer/getCapabilities.xml
similarity index 100%
rename from interface/requests/getCapabilities.xml
rename to html/admin/viewer/getCapabilities.xml
diff --git a/interface/requests/getFeatureOfInterest.xml b/html/admin/viewer/getFeatureOfInterest.xml
similarity index 100%
rename from interface/requests/getFeatureOfInterest.xml
rename to html/admin/viewer/getFeatureOfInterest.xml
diff --git a/interface/requests/getObservation.xml b/html/admin/viewer/getObservation.xml
similarity index 100%
rename from interface/requests/getObservation.xml
rename to html/admin/viewer/getObservation.xml
diff --git a/interface/requests/getObservation2.xml b/html/admin/viewer/getObservation2.xml
similarity index 100%
rename from interface/requests/getObservation2.xml
rename to html/admin/viewer/getObservation2.xml
diff --git a/interface/requests/getObservation3.xml b/html/admin/viewer/getObservation3.xml
similarity index 100%
rename from interface/requests/getObservation3.xml
rename to html/admin/viewer/getObservation3.xml
diff --git a/interface/requests/getfeatureOfinterestBBOX.xml b/html/admin/viewer/getfeatureOfinterestBBOX.xml
similarity index 100%
rename from interface/requests/getfeatureOfinterestBBOX.xml
rename to html/admin/viewer/getfeatureOfinterestBBOX.xml
diff --git a/interface/requests/getfeatureOfinterestId.xml b/html/admin/viewer/getfeatureOfinterestId.xml
similarity index 100%
rename from interface/requests/getfeatureOfinterestId.xml
rename to html/admin/viewer/getfeatureOfinterestId.xml
diff --git a/interface/requests/insertObservation_dynamic_insitu_composite.xml b/html/admin/viewer/insertObservation_dynamic_insitu_composite.xml
similarity index 100%
rename from interface/requests/insertObservation_dynamic_insitu_composite.xml
rename to html/admin/viewer/insertObservation_dynamic_insitu_composite.xml
diff --git a/interface/requests/insertObservation_dynamic_insitu_simple.xml b/html/admin/viewer/insertObservation_dynamic_insitu_simple.xml
similarity index 100%
rename from interface/requests/insertObservation_dynamic_insitu_simple.xml
rename to html/admin/viewer/insertObservation_dynamic_insitu_simple.xml
diff --git a/interface/requests/insertObservation_stationary_insitu_composite.xml b/html/admin/viewer/insertObservation_stationary_insitu_composite.xml
similarity index 100%
rename from interface/requests/insertObservation_stationary_insitu_composite.xml
rename to html/admin/viewer/insertObservation_stationary_insitu_composite.xml
diff --git a/interface/requests/insertObservation_stationary_insitu_simple.xml b/html/admin/viewer/insertObservation_stationary_insitu_simple.xml
similarity index 100%
rename from interface/requests/insertObservation_stationary_insitu_simple.xml
rename to html/admin/viewer/insertObservation_stationary_insitu_simple.xml
diff --git a/interface/requests/istSOS_post_xml_index.xml b/html/admin/viewer/istSOS_post_xml_index.xml
similarity index 100%
rename from interface/requests/istSOS_post_xml_index.xml
rename to html/admin/viewer/istSOS_post_xml_index.xml
diff --git a/interface/requests/registerSensor_stationary_insitu_composite.xml b/html/admin/viewer/registerSensor_stationary_insitu_composite.xml
similarity index 100%
rename from interface/requests/registerSensor_stationary_insitu_composite.xml
rename to html/admin/viewer/registerSensor_stationary_insitu_composite.xml
diff --git a/interface/requests/registerSensor_stationary_insitu_simple.xml b/html/admin/viewer/registerSensor_stationary_insitu_simple.xml
similarity index 100%
rename from interface/requests/registerSensor_stationary_insitu_simple.xml
rename to html/admin/viewer/registerSensor_stationary_insitu_simple.xml
diff --git a/html/modules/status/app.js b/html/modules/status/app.js
new file mode 100755
index 0000000..0d29d81
--- /dev/null
+++ b/html/modules/status/app.js
@@ -0,0 +1,128209 @@
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @define Ext
+
+/**
+ * @class Ext
+ * @singleton
+ */
+var Ext = Ext || {};
+Ext._startTime = new Date().getTime();
+(function() {
+    var global = this,
+        objectPrototype = Object.prototype,
+        toString = objectPrototype.toString,
+        enumerables = true,
+        enumerablesTest = {toString: 1},
+        emptyFn = function () {},
+        // This is the "$previous" method of a hook function on an instance. When called, it
+        // calls through the class prototype by the name of the called method.
+        callOverrideParent = function () {
+            var method = callOverrideParent.caller.caller; // skip callParent (our caller)
+            return method.$owner.prototype[method.$name].apply(this, arguments);
+        },
+        i,
+        nonWhitespaceRe = /\S/,
+        ExtApp,
+        iterableRe = /\[object\s*(?:Array|Arguments|\w*Collection|\w*List|HTML\s+document\.all\s+class)\]/;
+
+    Function.prototype.$extIsFunction = true;
+
+    Ext.global = global;
+
+    for (i in enumerablesTest) {
+        enumerables = null;
+    }
+
+    if (enumerables) {
+        enumerables = ['hasOwnProperty', 'valueOf', 'isPrototypeOf', 'propertyIsEnumerable',
+                       'toLocaleString', 'toString', 'constructor'];
+    }
+
+    /**
+     * An array containing extra enumerables for old browsers
+     * @property {String[]}
+     */
+    Ext.enumerables = enumerables;
+
+    /**
+     * Copies all the properties of config to the specified object.
+     * Note that if recursive merging and cloning without referencing the original objects / arrays is needed, use
+     * {@link Ext.Object#merge} instead.
+     * @param {Object} object The receiver of the properties
+     * @param {Object} config The source of the properties
+     * @param {Object} [defaults] A different object that will also be applied for default values
+     * @return {Object} returns obj
+     */
+    Ext.apply = function(object, config, defaults) {
+        if (defaults) {
+            Ext.apply(object, defaults);
+        }
+
+        if (object && config && typeof config === 'object') {
+            var i, j, k;
+
+            for (i in config) {
+                object[i] = config[i];
+            }
+
+            if (enumerables) {
+                for (j = enumerables.length; j--;) {
+                    k = enumerables[j];
+                    if (config.hasOwnProperty(k)) {
+                        object[k] = config[k];
+                    }
+                }
+            }
+        }
+
+        return object;
+    };
+
+    Ext.buildSettings = Ext.apply({
+        baseCSSPrefix: 'x-'
+    }, Ext.buildSettings || {});
+
+    Ext.apply(Ext, {
+
+        /**
+         * @property {String} [name='Ext']
+         * <p>The name of the property in the global namespace (The <code>window</code> in browser environments) which refers to the current instance of Ext.</p>
+         * <p>This is usually <code>"Ext"</code>, but if a sandboxed build of ExtJS is being used, this will be an alternative name.</p>
+         * <p>If code is being generated for use by <code>eval</code> or to create a <code>new Function</code>, and the global instance
+         * of Ext must be referenced, this is the name that should be built into the code.</p>
+         */
+        name: Ext.sandboxName || 'Ext',
+
+        /**
+         * @property {Function}
+         * A reusable empty function
+         */
+        emptyFn: emptyFn,
+        
+        /**
+         * A reusable identity function. The function will always return the first argument, unchanged.
+         */
+        identityFn: function(o) {
+            return o;
+        },
+
+        /**
+         * A zero length string which will pass a truth test. Useful for passing to methods
+         * which use a truth test to reject <i>falsy</i> values where a string value must be cleared.
+         */
+        emptyString: new String(),
+
+        baseCSSPrefix: Ext.buildSettings.baseCSSPrefix,
+
+        /**
+         * Copies all the properties of config to object if they don't already exist.
+         * @param {Object} object The receiver of the properties
+         * @param {Object} config The source of the properties
+         * @return {Object} returns obj
+         */
+        applyIf: function(object, config) {
+            var property;
+
+            if (object) {
+                for (property in config) {
+                    if (object[property] === undefined) {
+                        object[property] = config[property];
+                    }
+                }
+            }
+
+            return object;
+        },
+
+        /**
+         * Iterates either an array or an object. This method delegates to
+         * {@link Ext.Array#each Ext.Array.each} if the given value is iterable, and {@link Ext.Object#each Ext.Object.each} otherwise.
+         *
+         * @param {Object/Array} object The object or array to be iterated.
+         * @param {Function} fn The function to be called for each iteration. See and {@link Ext.Array#each Ext.Array.each} and
+         * {@link Ext.Object#each Ext.Object.each} for detailed lists of arguments passed to this function depending on the given object
+         * type that is being iterated.
+         * @param {Object} scope (Optional) The scope (`this` reference) in which the specified function is executed.
+         * Defaults to the object being iterated itself.
+         * @markdown
+         */
+        iterate: function(object, fn, scope) {
+            if (Ext.isEmpty(object)) {
+                return;
+            }
+
+            if (scope === undefined) {
+                scope = object;
+            }
+
+            if (Ext.isIterable(object)) {
+                Ext.Array.each.call(Ext.Array, object, fn, scope);
+            }
+            else {
+                Ext.Object.each.call(Ext.Object, object, fn, scope);
+            }
+        }
+    });
+
+    Ext.apply(Ext, {
+
+        /**
+         * This method deprecated. Use {@link Ext#define Ext.define} instead.
+         * @method
+         * @param {Function} superclass
+         * @param {Object} overrides
+         * @return {Function} The subclass constructor from the <tt>overrides</tt> parameter, or a generated one if not provided.
+         * @deprecated 4.0.0 Use {@link Ext#define Ext.define} instead
+         */
+        extend: (function() {
+            // inline overrides
+            var objectConstructor = objectPrototype.constructor,
+                inlineOverrides = function(o) {
+                for (var m in o) {
+                    if (!o.hasOwnProperty(m)) {
+                        continue;
+                    }
+                    this[m] = o[m];
+                }
+            };
+
+            return function(subclass, superclass, overrides) {
+                // First we check if the user passed in just the superClass with overrides
+                if (Ext.isObject(superclass)) {
+                    overrides = superclass;
+                    superclass = subclass;
+                    subclass = overrides.constructor !== objectConstructor ? overrides.constructor : function() {
+                        superclass.apply(this, arguments);
+                    };
+                }
+
+                if (!superclass) {
+                    Ext.Error.raise({
+                        sourceClass: 'Ext',
+                        sourceMethod: 'extend',
+                        msg: 'Attempting to extend from a class which has not been loaded on the page.'
+                    });
+                }
+
+                // We create a new temporary class
+                var F = function() {},
+                    subclassProto, superclassProto = superclass.prototype;
+
+                F.prototype = superclassProto;
+                subclassProto = subclass.prototype = new F();
+                subclassProto.constructor = subclass;
+                subclass.superclass = superclassProto;
+
+                if (superclassProto.constructor === objectConstructor) {
+                    superclassProto.constructor = superclass;
+                }
+
+                subclass.override = function(overrides) {
+                    Ext.override(subclass, overrides);
+                };
+
+                subclassProto.override = inlineOverrides;
+                subclassProto.proto = subclassProto;
+
+                subclass.override(overrides);
+                subclass.extend = function(o) {
+                    return Ext.extend(subclass, o);
+                };
+
+                return subclass;
+            };
+        }()),
+
+        /**
+         * Overrides members of the specified `target` with the given values.
+         * 
+         * If the `target` is a class declared using {@link Ext#define Ext.define}, the
+         * `override` method of that class is called (see {@link Ext.Base#override}) given
+         * the `overrides`.
+         *
+         * If the `target` is a function, it is assumed to be a constructor and the contents
+         * of `overrides` are applied to its `prototype` using {@link Ext#apply Ext.apply}.
+         * 
+         * If the `target` is an instance of a class declared using {@link Ext#define Ext.define},
+         * the `overrides` are applied to only that instance. In this case, methods are
+         * specially processed to allow them to use {@link Ext.Base#callParent}.
+         * 
+         *      var panel = new Ext.Panel({ ... });
+         *      
+         *      Ext.override(panel, {
+         *          initComponent: function () {
+         *              // extra processing...
+         *              
+         *              this.callParent();
+         *          }
+         *      });
+         *
+         * If the `target` is none of these, the `overrides` are applied to the `target`
+         * using {@link Ext#apply Ext.apply}.
+         *
+         * Please refer to {@link Ext#define Ext.define} and {@link Ext.Base#override} for
+         * further details.
+         *
+         * @param {Object} target The target to override.
+         * @param {Object} overrides The properties to add or replace on `target`. 
+         * @method override
+         */
+        override: function (target, overrides) {
+            if (target.$isClass) {
+                target.override(overrides);
+            } else if (typeof target == 'function') {
+                Ext.apply(target.prototype, overrides);
+            } else {
+                var owner = target.self,
+                    name, value;
+
+                if (owner && owner.$isClass) { // if (instance of Ext.define'd class)
+                    for (name in overrides) {
+                        if (overrides.hasOwnProperty(name)) {
+                            value = overrides[name];
+
+                            if (typeof value == 'function') {
+                                if (owner.$className) {
+                                    value.displayName = owner.$className + '#' + name;
+                                }
+
+                                value.$name = name;
+                                value.$owner = owner;
+                                value.$previous = target.hasOwnProperty(name)
+                                    ? target[name] // already hooked, so call previous hook
+                                    : callOverrideParent; // calls by name on prototype
+                            }
+
+                            target[name] = value;
+                        }
+                    }
+                } else {
+                    Ext.apply(target, overrides);
+                }
+            }
+
+            return target;
+        }
+    });
+
+    // A full set of static methods to do type checking
+    Ext.apply(Ext, {
+
+        /**
+         * Returns the given value itself if it's not empty, as described in {@link Ext#isEmpty}; returns the default
+         * value (second argument) otherwise.
+         *
+         * @param {Object} value The value to test
+         * @param {Object} defaultValue The value to return if the original value is empty
+         * @param {Boolean} allowBlank (optional) true to allow zero length strings to qualify as non-empty (defaults to false)
+         * @return {Object} value, if non-empty, else defaultValue
+         */
+        valueFrom: function(value, defaultValue, allowBlank){
+            return Ext.isEmpty(value, allowBlank) ? defaultValue : value;
+        },
+
+        /**
+         * Returns the type of the given variable in string format. List of possible values are:
+         *
+         * - `undefined`: If the given value is `undefined`
+         * - `null`: If the given value is `null`
+         * - `string`: If the given value is a string
+         * - `number`: If the given value is a number
+         * - `boolean`: If the given value is a boolean value
+         * - `date`: If the given value is a `Date` object
+         * - `function`: If the given value is a function reference
+         * - `object`: If the given value is an object
+         * - `array`: If the given value is an array
+         * - `regexp`: If the given value is a regular expression
+         * - `element`: If the given value is a DOM Element
+         * - `textnode`: If the given value is a DOM text node and contains something other than whitespace
+         * - `whitespace`: If the given value is a DOM text node and contains only whitespace
+         *
+         * @param {Object} value
+         * @return {String}
+         * @markdown
+         */
+        typeOf: function(value) {
+            var type,
+                typeToString;
+            
+            if (value === null) {
+                return 'null';
+            }
+
+            type = typeof value;
+
+            if (type === 'undefined' || type === 'string' || type === 'number' || type === 'boolean') {
+                return type;
+            }
+
+            typeToString = toString.call(value);
+
+            switch(typeToString) {
+                case '[object Array]':
+                    return 'array';
+                case '[object Date]':
+                    return 'date';
+                case '[object Boolean]':
+                    return 'boolean';
+                case '[object Number]':
+                    return 'number';
+                case '[object RegExp]':
+                    return 'regexp';
+            }
+
+            if (type === 'function') {
+                return 'function';
+            }
+
+            if (type === 'object') {
+                if (value.nodeType !== undefined) {
+                    if (value.nodeType === 3) {
+                        return (nonWhitespaceRe).test(value.nodeValue) ? 'textnode' : 'whitespace';
+                    }
+                    else {
+                        return 'element';
+                    }
+                }
+
+                return 'object';
+            }
+
+            Ext.Error.raise({
+                sourceClass: 'Ext',
+                sourceMethod: 'typeOf',
+                msg: 'Failed to determine the type of the specified value "' + value + '". This is most likely a bug.'
+            });
+        },
+
+        /**
+         * Coerces the first value if possible so that it is comparable to the second value.
+         *
+         * Coercion only works between the basic atomic data types String, Boolean, Number, Date, null and undefined.
+         *
+         * Numbers and numeric strings are coerced to Dates using the value as the millisecond era value.
+         *
+         * Strings are coerced to Dates by parsing using the {@link Ext.Date#defaultFormat defaultFormat}.
+         * 
+         * For example
+         *
+         *     Ext.coerce('false', true);
+         *     
+         * returns the boolean value `false` because the second parameter is of type `Boolean`.
+         * 
+         * @param {Mixed} from The value to coerce
+         * @param {Mixed} to The value it must be compared against
+         * @return The coerced value.
+         */
+        coerce: function(from, to) {
+            var fromType = Ext.typeOf(from),
+                toType = Ext.typeOf(to),
+                isString = typeof from === 'string';
+
+            if (fromType !== toType) {
+                switch (toType) {
+                    case 'string':
+                        return String(from);
+                    case 'number':
+                        return Number(from);
+                    case 'boolean':
+                        return isString && (!from || from === 'false') ? false : Boolean(from);
+                    case 'null':
+                        return isString && (!from || from === 'null') ? null : from;
+                    case 'undefined':
+                        return isString && (!from || from === 'undefined') ? undefined : from;
+                    case 'date':
+                        return isString && isNaN(from) ? Ext.Date.parse(from, Ext.Date.defaultFormat) : Date(Number(from));
+                }
+            }
+            return from;
+        },
+
+        /**
+         * Returns true if the passed value is empty, false otherwise. The value is deemed to be empty if it is either:
+         *
+         * - `null`
+         * - `undefined`
+         * - a zero-length array
+         * - a zero-length string (Unless the `allowEmptyString` parameter is set to `true`)
+         *
+         * @param {Object} value The value to test
+         * @param {Boolean} allowEmptyString (optional) true to allow empty strings (defaults to false)
+         * @return {Boolean}
+         * @markdown
+         */
+        isEmpty: function(value, allowEmptyString) {
+            return (value === null) || (value === undefined) || (!allowEmptyString ? value === '' : false) || (Ext.isArray(value) && value.length === 0);
+        },
+
+        /**
+         * Returns true if the passed value is a JavaScript Array, false otherwise.
+         *
+         * @param {Object} target The target to test
+         * @return {Boolean}
+         * @method
+         */
+        isArray: ('isArray' in Array) ? Array.isArray : function(value) {
+            return toString.call(value) === '[object Array]';
+        },
+
+        /**
+         * Returns true if the passed value is a JavaScript Date object, false otherwise.
+         * @param {Object} object The object to test
+         * @return {Boolean}
+         */
+        isDate: function(value) {
+            return toString.call(value) === '[object Date]';
+        },
+
+        /**
+         * Returns true if the passed value is a JavaScript Object, false otherwise.
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         * @method
+         */
+        isObject: (toString.call(null) === '[object Object]') ?
+        function(value) {
+            // check ownerDocument here as well to exclude DOM nodes
+            return value !== null && value !== undefined && toString.call(value) === '[object Object]' && value.ownerDocument === undefined;
+        } :
+        function(value) {
+            return toString.call(value) === '[object Object]';
+        },
+
+        /**
+         * @private
+         */
+        isSimpleObject: function(value) {
+            return value instanceof Object && value.constructor === Object;
+        },
+        /**
+         * Returns true if the passed value is a JavaScript 'primitive', a string, number or boolean.
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isPrimitive: function(value) {
+            var type = typeof value;
+
+            return type === 'string' || type === 'number' || type === 'boolean';
+        },
+
+        /**
+         * Returns true if the passed value is a JavaScript Function, false otherwise.
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         * @method
+         */
+        isFunction: function(value) {
+            return !!(value && value.$extIsFunction);
+        },
+
+        /**
+         * Returns true if the passed value is a number. Returns false for non-finite numbers.
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isNumber: function(value) {
+            return typeof value === 'number' && isFinite(value);
+        },
+
+        /**
+         * Validates that a value is numeric.
+         * @param {Object} value Examples: 1, '1', '2.34'
+         * @return {Boolean} True if numeric, false otherwise
+         */
+        isNumeric: function(value) {
+            return !isNaN(parseFloat(value)) && isFinite(value);
+        },
+
+        /**
+         * Returns true if the passed value is a string.
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isString: function(value) {
+            return typeof value === 'string';
+        },
+
+        /**
+         * Returns true if the passed value is a boolean.
+         *
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isBoolean: function(value) {
+            return typeof value === 'boolean';
+        },
+
+        /**
+         * Returns true if the passed value is an HTMLElement
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isElement: function(value) {
+            return value ? value.nodeType === 1 : false;
+        },
+
+        /**
+         * Returns true if the passed value is a TextNode
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isTextNode: function(value) {
+            return value ? value.nodeName === "#text" : false;
+        },
+
+        /**
+         * Returns true if the passed value is defined.
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isDefined: function(value) {
+            return typeof value !== 'undefined';
+        },
+
+        /**
+         * Returns `true` if the passed value is iterable, that is, if elements of it are addressable using array
+         * notation with numeric indices, `false` otherwise.
+         *
+         * Arrays and function `arguments` objects are iterable. Also HTML collections such as `NodeList` and `HTMLCollection'
+         * are iterable.
+         *
+         * @param {Object} value The value to test
+         * @return {Boolean}
+         */
+        isIterable: function(value) {
+            // To be iterable, the object must have a numeric length property and must not be a string or function.
+            if (!value || typeof value.length !== 'number' || typeof value === 'string' || value.$extIsFunction) {
+                return false;
+            }
+
+            // Certain "standard" collections in IE (such as document.images) do not offer the correct
+            // Javascript Object interface; specifically, they lack the propertyIsEnumerable method.
+            // And the item property while it does exist is not typeof "function"
+            if (!value.propertyIsEnumerable) {
+                return !!value.item;
+            }
+
+            // If it is a regular, interrogatable JS object (not an IE ActiveX object), then...
+            // If it has its own property called "length", but not enumerable, it's iterable
+            if (value.hasOwnProperty('length') && !value.propertyIsEnumerable('length')) {
+                return true;
+            }
+
+            // Test against whitelist which includes known iterable collection types
+            return iterableRe.test(toString.call(value));
+        }
+    });
+
+    Ext.apply(Ext, {
+
+        /**
+         * Clone simple variables including array, {}-like objects, DOM nodes and Date without keeping the old reference.
+         * A reference for the object itself is returned if it's not a direct decendant of Object. For model cloning,
+         * see {@link Ext.data.Model#copy Model.copy}.
+         * 
+         * @param {Object} item The variable to clone
+         * @return {Object} clone
+         */
+        clone: function(item) {
+            var type,
+                i,
+                j,
+                k,
+                clone,
+                key;
+            
+            if (item === null || item === undefined) {
+                return item;
+            }
+
+            // DOM nodes
+            // TODO proxy this to Ext.Element.clone to handle automatic id attribute changing
+            // recursively
+            if (item.nodeType && item.cloneNode) {
+                return item.cloneNode(true);
+            }
+
+            type = toString.call(item);
+
+            // Date
+            if (type === '[object Date]') {
+                return new Date(item.getTime());
+            }
+
+
+            // Array
+            if (type === '[object Array]') {
+                i = item.length;
+
+                clone = [];
+
+                while (i--) {
+                    clone[i] = Ext.clone(item[i]);
+                }
+            }
+            // Object
+            else if (type === '[object Object]' && item.constructor === Object) {
+                clone = {};
+
+                for (key in item) {
+                    clone[key] = Ext.clone(item[key]);
+                }
+
+                if (enumerables) {
+                    for (j = enumerables.length; j--;) {
+                        k = enumerables[j];
+                        if (item.hasOwnProperty(k)) {
+                            clone[k] = item[k];
+                        }
+                    }
+                }
+            }
+
+            return clone || item;
+        },
+
+        /**
+         * @private
+         * Generate a unique reference of Ext in the global scope, useful for sandboxing
+         */
+        getUniqueGlobalNamespace: function() {
+            var uniqueGlobalNamespace = this.uniqueGlobalNamespace,
+                i;
+
+            if (uniqueGlobalNamespace === undefined) {
+                i = 0;
+
+                do {
+                    uniqueGlobalNamespace = 'ExtBox' + (++i);
+                } while (Ext.global[uniqueGlobalNamespace] !== undefined);
+
+                Ext.global[uniqueGlobalNamespace] = Ext;
+                this.uniqueGlobalNamespace = uniqueGlobalNamespace;
+            }
+
+            return uniqueGlobalNamespace;
+        },
+        
+        /**
+         * @private
+         */
+        functionFactoryCache: {},
+        
+        cacheableFunctionFactory: function() {
+            var me = this,
+                args = Array.prototype.slice.call(arguments),
+                cache = me.functionFactoryCache,
+                idx, fn, ln;
+                
+             if (Ext.isSandboxed) {
+                ln = args.length;
+                if (ln > 0) {
+                    ln--;
+                    args[ln] = 'var Ext=window.' + Ext.name + ';' + args[ln];
+                }
+            }
+            idx = args.join('');
+            fn = cache[idx];
+            if (!fn) {
+                fn = Function.prototype.constructor.apply(Function.prototype, args);
+                
+                cache[idx] = fn;
+            }
+            return fn;
+        },
+        
+        functionFactory: function() {
+            var me = this,
+                args = Array.prototype.slice.call(arguments),
+                ln;
+                
+            if (Ext.isSandboxed) {
+                ln = args.length;
+                if (ln > 0) {
+                    ln--;
+                    args[ln] = 'var Ext=window.' + Ext.name + ';' + args[ln];
+                }
+            }
+     
+            return Function.prototype.constructor.apply(Function.prototype, args);
+        },
+
+        /**
+         * @private
+         * @property
+         */
+        Logger: {
+            verbose: emptyFn,
+            log: emptyFn,
+            info: emptyFn,
+            warn: emptyFn,
+            error: function(message) {
+                throw new Error(message);
+            },
+            deprecate: emptyFn
+        }
+    });
+
+    /**
+     * Old alias to {@link Ext#typeOf}
+     * @deprecated 4.0.0 Use {@link Ext#typeOf} instead
+     * @method
+     * @inheritdoc Ext#typeOf
+     */
+    Ext.type = Ext.typeOf;
+    
+    // When using Cmd optimizations, the namespace Ext.app may already be defined
+    // by this point since it's done up front by the tool. Check if app already
+    // exists before overwriting it.
+    ExtApp = Ext.app;
+    if (!ExtApp) {
+        ExtApp = Ext.app = {};
+    }
+    Ext.apply(ExtApp, {
+        namespaces: {},
+        
+        /**
+        * @private
+        */
+        collectNamespaces: function(paths) {
+            var namespaces = Ext.app.namespaces,
+                path;
+            
+            for (path in paths) {
+                if (paths.hasOwnProperty(path)) {
+                    namespaces[path] = true;
+                }
+            }
+        },
+
+        /**
+        * Adds namespace(s) to known list.
+        *
+        * @param {String/String[]} namespace
+        */
+        addNamespaces: function(ns) {
+            var namespaces = Ext.app.namespaces,
+                i, l;
+
+            if (!Ext.isArray(ns)) {
+                ns = [ns];
+            }
+
+            for (i = 0, l = ns.length; i < l; i++) {
+                namespaces[ns[i]] = true;
+            }
+        },
+
+        /**
+        * @private Clear all namespaces from known list.
+        */
+        clearNamespaces: function() {
+            Ext.app.namespaces = {};
+        },
+
+        /**
+        * Get namespace prefix for a class name.
+        *
+        * @param {String} className
+        *
+        * @return {String} Namespace prefix if it's known, otherwise undefined
+        */
+        getNamespace: function(className) {
+            var namespaces    = Ext.app.namespaces,
+                deepestPrefix = '',
+                prefix;
+
+            for (prefix in namespaces) {
+                if (namespaces.hasOwnProperty(prefix)    &&
+                    prefix.length > deepestPrefix.length &&
+                    (prefix + '.' === className.substring(0, prefix.length + 1))) {
+                    deepestPrefix = prefix;
+                }
+            }
+
+            return deepestPrefix === '' ? undefined : deepestPrefix;
+        }
+    });
+}());
+
+/*
+ * This method evaluates the given code free of any local variable. In some browsers this
+ * will be at global scope, in others it will be in a function.
+ * @parma {String} code The code to evaluate.
+ * @private
+ * @method
+ */
+Ext.globalEval = Ext.global.execScript
+    ? function(code) {
+        execScript(code);
+    }
+    : function($$code) {
+        // IMPORTANT: because we use eval we cannot place this in the above function or it
+        // will break the compressor's ability to rename local variables...
+        (function(){
+            // This var should not be replaced by the compressor. We need to do this so
+            // that Ext refers to the global Ext, if we're sandboxing it may
+            // refer to the local instance inside the closure
+            var Ext = this.Ext;
+            eval($$code);
+        }());
+    };
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require ../Ext.js
+// @define Ext.Version
+
+/**
+ * @author Jacky Nguyen <jacky at sencha.com>
+ * @docauthor Jacky Nguyen <jacky at sencha.com>
+ * @class Ext.Version
+ *
+ * A utility class that wrap around a string version number and provide convenient
+ * method to perform comparison. See also: {@link Ext.Version#compare compare}. Example:
+ *
+ *     var version = new Ext.Version('1.0.2beta');
+ *     console.log("Version is " + version); // Version is 1.0.2beta
+ *
+ *     console.log(version.getMajor()); // 1
+ *     console.log(version.getMinor()); // 0
+ *     console.log(version.getPatch()); // 2
+ *     console.log(version.getBuild()); // 0
+ *     console.log(version.getRelease()); // beta
+ *
+ *     console.log(version.isGreaterThan('1.0.1')); // True
+ *     console.log(version.isGreaterThan('1.0.2alpha')); // True
+ *     console.log(version.isGreaterThan('1.0.2RC')); // False
+ *     console.log(version.isGreaterThan('1.0.2')); // False
+ *     console.log(version.isLessThan('1.0.2')); // True
+ *
+ *     console.log(version.match(1.0)); // True
+ *     console.log(version.match('1.0.2')); // True
+ *
+ */
+(function() {
+
+// Current core version
+// also fix Ext-more.js
+var version = '4.2.1.883', Version;
+    Ext.Version = Version = Ext.extend(Object, {
+
+        /**
+         * @param {String/Number} version The version number in the following standard format:
+         *
+         *     major[.minor[.patch[.build[release]]]]
+         *
+         * Examples:
+         *
+         *     1.0
+         *     1.2.3beta
+         *     1.2.3.4RC
+         *
+         * @return {Ext.Version} this
+         */
+        constructor: function(version) {
+            var parts, releaseStartIndex;
+
+            if (version instanceof Version) {
+                return version;
+            }
+
+            this.version = this.shortVersion = String(version).toLowerCase().replace(/_/g, '.').replace(/[\-+]/g, '');
+
+            releaseStartIndex = this.version.search(/([^\d\.])/);
+
+            if (releaseStartIndex !== -1) {
+                this.release = this.version.substr(releaseStartIndex, version.length);
+                this.shortVersion = this.version.substr(0, releaseStartIndex);
+            }
+
+            this.shortVersion = this.shortVersion.replace(/[^\d]/g, '');
+
+            parts = this.version.split('.');
+
+            this.major = parseInt(parts.shift() || 0, 10);
+            this.minor = parseInt(parts.shift() || 0, 10);
+            this.patch = parseInt(parts.shift() || 0, 10);
+            this.build = parseInt(parts.shift() || 0, 10);
+
+            return this;
+        },
+
+        /**
+         * Override the native toString method
+         * @private
+         * @return {String} version
+         */
+        toString: function() {
+            return this.version;
+        },
+
+        /**
+         * Override the native valueOf method
+         * @private
+         * @return {String} version
+         */
+        valueOf: function() {
+            return this.version;
+        },
+
+        /**
+         * Returns the major component value
+         * @return {Number} major
+         */
+        getMajor: function() {
+            return this.major || 0;
+        },
+
+        /**
+         * Returns the minor component value
+         * @return {Number} minor
+         */
+        getMinor: function() {
+            return this.minor || 0;
+        },
+
+        /**
+         * Returns the patch component value
+         * @return {Number} patch
+         */
+        getPatch: function() {
+            return this.patch || 0;
+        },
+
+        /**
+         * Returns the build component value
+         * @return {Number} build
+         */
+        getBuild: function() {
+            return this.build || 0;
+        },
+
+        /**
+         * Returns the release component value
+         * @return {Number} release
+         */
+        getRelease: function() {
+            return this.release || '';
+        },
+
+        /**
+         * Returns whether this version if greater than the supplied argument
+         * @param {String/Number} target The version to compare with
+         * @return {Boolean} True if this version if greater than the target, false otherwise
+         */
+        isGreaterThan: function(target) {
+            return Version.compare(this.version, target) === 1;
+        },
+
+        /**
+         * Returns whether this version if greater than or equal to the supplied argument
+         * @param {String/Number} target The version to compare with
+         * @return {Boolean} True if this version if greater than or equal to the target, false otherwise
+         */
+        isGreaterThanOrEqual: function(target) {
+            return Version.compare(this.version, target) >= 0;
+        },
+
+        /**
+         * Returns whether this version if smaller than the supplied argument
+         * @param {String/Number} target The version to compare with
+         * @return {Boolean} True if this version if smaller than the target, false otherwise
+         */
+        isLessThan: function(target) {
+            return Version.compare(this.version, target) === -1;
+        },
+
+        /**
+         * Returns whether this version if less than or equal to the supplied argument
+         * @param {String/Number} target The version to compare with
+         * @return {Boolean} True if this version if less than or equal to the target, false otherwise
+         */
+        isLessThanOrEqual: function(target) {
+            return Version.compare(this.version, target) <= 0;
+        },
+
+        /**
+         * Returns whether this version equals to the supplied argument
+         * @param {String/Number} target The version to compare with
+         * @return {Boolean} True if this version equals to the target, false otherwise
+         */
+        equals: function(target) {
+            return Version.compare(this.version, target) === 0;
+        },
+
+        /**
+         * Returns whether this version matches the supplied argument. Example:
+         *
+         *     var version = new Ext.Version('1.0.2beta');
+         *     console.log(version.match(1)); // True
+         *     console.log(version.match(1.0)); // True
+         *     console.log(version.match('1.0.2')); // True
+         *     console.log(version.match('1.0.2RC')); // False
+         *
+         * @param {String/Number} target The version to compare with
+         * @return {Boolean} True if this version matches the target, false otherwise
+         */
+        match: function(target) {
+            target = String(target);
+            return this.version.substr(0, target.length) === target;
+        },
+
+        /**
+         * Returns this format: [major, minor, patch, build, release]. Useful for comparison
+         * @return {Number[]}
+         */
+        toArray: function() {
+            return [this.getMajor(), this.getMinor(), this.getPatch(), this.getBuild(), this.getRelease()];
+        },
+
+        /**
+         * Returns shortVersion version without dots and release
+         * @return {String}
+         */
+        getShortVersion: function() {
+            return this.shortVersion;
+        },
+
+        /**
+         * Convenient alias to {@link Ext.Version#isGreaterThan isGreaterThan}
+         * @param {String/Number} target
+         * @return {Boolean}
+         */
+        gt: function() {
+            return this.isGreaterThan.apply(this, arguments);
+        },
+
+        /**
+         * Convenient alias to {@link Ext.Version#isLessThan isLessThan}
+         * @param {String/Number} target
+         * @return {Boolean}
+         */
+        lt: function() {
+            return this.isLessThan.apply(this, arguments);
+        },
+
+        /**
+         * Convenient alias to {@link Ext.Version#isGreaterThanOrEqual isGreaterThanOrEqual}
+         * @param {String/Number} target
+         * @return {Boolean}
+         */
+        gtEq: function() {
+            return this.isGreaterThanOrEqual.apply(this, arguments);
+        },
+
+        /**
+         * Convenient alias to {@link Ext.Version#isLessThanOrEqual isLessThanOrEqual}
+         * @param {String/Number} target
+         * @return {Boolean}
+         */
+        ltEq: function() {
+            return this.isLessThanOrEqual.apply(this, arguments);
+        }
+    });
+
+    Ext.apply(Version, {
+        // @private
+        releaseValueMap: {
+            'dev': -6,
+            'alpha': -5,
+            'a': -5,
+            'beta': -4,
+            'b': -4,
+            'rc': -3,
+            '#': -2,
+            'p': -1,
+            'pl': -1
+        },
+
+        /**
+         * Converts a version component to a comparable value
+         *
+         * @static
+         * @param {Object} value The value to convert
+         * @return {Object}
+         */
+        getComponentValue: function(value) {
+            return !value ? 0 : (isNaN(value) ? this.releaseValueMap[value] || value : parseInt(value, 10));
+        },
+
+        /**
+         * Compare 2 specified versions, starting from left to right. If a part contains special version strings,
+         * they are handled in the following order:
+         * 'dev' < 'alpha' = 'a' < 'beta' = 'b' < 'RC' = 'rc' < '#' < 'pl' = 'p' < 'anything else'
+         *
+         * @static
+         * @param {String} current The current version to compare to
+         * @param {String} target The target version to compare to
+         * @return {Number} Returns -1 if the current version is smaller than the target version, 1 if greater, and 0 if they're equivalent
+         */
+        compare: function(current, target) {
+            var currentValue, targetValue, i;
+
+            current = new Version(current).toArray();
+            target = new Version(target).toArray();
+
+            for (i = 0; i < Math.max(current.length, target.length); i++) {
+                currentValue = this.getComponentValue(current[i]);
+                targetValue = this.getComponentValue(target[i]);
+
+                if (currentValue < targetValue) {
+                    return -1;
+                } else if (currentValue > targetValue) {
+                    return 1;
+                }
+            }
+
+            return 0;
+        }
+    });
+
+    /**
+     * @class Ext
+     */
+    Ext.apply(Ext, {
+        /**
+         * @private
+         */
+        versions: {},
+
+        /**
+         * @private
+         */
+        lastRegisteredVersion: null,
+
+        /**
+         * Set version number for the given package name.
+         *
+         * @param {String} packageName The package name, for example: 'core', 'touch', 'extjs'
+         * @param {String/Ext.Version} version The version, for example: '1.2.3alpha', '2.4.0-dev'
+         * @return {Ext}
+         */
+        setVersion: function(packageName, version) {
+            Ext.versions[packageName] = new Version(version);
+            Ext.lastRegisteredVersion = Ext.versions[packageName];
+
+            return this;
+        },
+
+        /**
+         * Get the version number of the supplied package name; will return the last registered version
+         * (last Ext.setVersion call) if there's no package name given.
+         *
+         * @param {String} packageName (Optional) The package name, for example: 'core', 'touch', 'extjs'
+         * @return {Ext.Version} The version
+         */
+        getVersion: function(packageName) {
+            if (packageName === undefined) {
+                return Ext.lastRegisteredVersion;
+            }
+
+            return Ext.versions[packageName];
+        },
+
+        /**
+         * Create a closure for deprecated code.
+         *
+         *     // This means Ext.oldMethod is only supported in 4.0.0beta and older.
+         *     // If Ext.getVersion('extjs') returns a version that is later than '4.0.0beta', for example '4.0.0RC',
+         *     // the closure will not be invoked
+         *     Ext.deprecate('extjs', '4.0.0beta', function() {
+         *         Ext.oldMethod = Ext.newMethod;
+         *
+         *         ...
+         *     });
+         *
+         * @param {String} packageName The package name
+         * @param {String} since The last version before it's deprecated
+         * @param {Function} closure The callback function to be executed with the specified version is less than the current version
+         * @param {Object} scope The execution scope (`this`) if the closure
+         */
+        deprecate: function(packageName, since, closure, scope) {
+            if (Version.compare(Ext.getVersion(packageName), since) < 1) {
+                closure.call(scope);
+            }
+        }
+    }); // End Versioning
+
+    Ext.setVersion('core', version);
+
+}());
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require ../version/Version.js
+// @define Ext.String
+
+/**
+ * @class Ext.String
+ *
+ * A collection of useful static methods to deal with strings.
+ * @singleton
+ */
+
+Ext.String = (function() {
+    var trimRegex     = /^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,
+        escapeRe      = /('|\\)/g,
+        formatRe      = /\{(\d+)\}/g,
+        escapeRegexRe = /([-.*+?\^${}()|\[\]\/\\])/g,
+        basicTrimRe   = /^\s+|\s+$/g,
+        whitespaceRe  = /\s+/,
+        varReplace    = /(^[^a-z]*|[^\w])/gi,
+        charToEntity,
+        entityToChar,
+        charToEntityRegex,
+        entityToCharRegex,
+        htmlEncodeReplaceFn = function(match, capture) {
+            return charToEntity[capture];
+        },
+        htmlDecodeReplaceFn = function(match, capture) {
+            return (capture in entityToChar) ? entityToChar[capture] : String.fromCharCode(parseInt(capture.substr(2), 10));
+        },
+        boundsCheck = function(s, other){
+            if (s === null || s === undefined || other === null || other === undefined) {
+                return false;
+            }
+            
+            return other.length <= s.length; 
+        };
+
+    return {
+        
+        /**
+         * Inserts a substring into a string.
+         * @param {String} s The original string.
+         * @param {String} value The substring to insert.
+         * @param {Number} index The index to insert the substring. Negative indexes will insert from the end of
+         * the string. Example: 
+         *
+         *     Ext.String.insert("abcdefg", "h", -1); // abcdefhg
+         *
+         * @return {String} The value with the inserted substring
+         */
+        insert: function(s, value, index) {
+            if (!s) {
+                return value;
+            }
+            
+            if (!value) {
+                return s;
+            }
+            
+            var len = s.length;
+            
+            if (!index && index !== 0) {
+                index = len;
+            }
+            
+            if (index < 0) {
+                index *= -1;
+                if (index >= len) {
+                    // negative overflow, insert at start
+                    index = 0;
+                } else {
+                    index = len - index;
+                }
+            }
+            
+            if (index === 0) {
+                s = value + s;
+            } else if (index >= s.length) {
+                s += value;
+            } else {
+                s = s.substr(0, index) + value + s.substr(index);
+            }
+            return s;
+        },
+        
+        /**
+         * Checks if a string starts with a substring
+         * @param {String} s The original string
+         * @param {String} start The substring to check
+         * @param {Boolean} [ignoreCase=false] True to ignore the case in the comparison
+         */
+        startsWith: function(s, start, ignoreCase){
+            var result = boundsCheck(s, start);
+            
+            if (result) {
+                if (ignoreCase) {
+                    s = s.toLowerCase();
+                    start = start.toLowerCase();
+                }
+                result = s.lastIndexOf(start, 0) === 0;
+            }
+            return result;
+        },
+        
+        /**
+         * Checks if a string ends with a substring
+         * @param {String} s The original string
+         * @param {String} start The substring to check
+         * @param {Boolean} [ignoreCase=false] True to ignore the case in the comparison
+         */
+        endsWith: function(s, end, ignoreCase){
+            var result = boundsCheck(s, end);
+            
+            if (result) {
+                if (ignoreCase) {
+                    s = s.toLowerCase();
+                    end = end.toLowerCase();
+                }
+                result = s.indexOf(end, s.length - end.length) !== -1;
+            }
+            return result;
+        },
+
+        /**
+         * Converts a string of characters into a legal, parse-able JavaScript `var` name as long as the passed
+         * string contains at least one alphabetic character. Non alphanumeric characters, and *leading* non alphabetic
+         * characters will be removed.
+         * @param {String} s A string to be converted into a `var` name.
+         * @return {String} A legal JavaScript `var` name.
+         */
+        createVarName: function(s) {
+            return s.replace(varReplace, '');
+        },
+
+        /**
+         * Convert certain characters (&, <, >, ', and ") to their HTML character equivalents for literal display in web pages.
+         * @param {String} value The string to encode.
+         * @return {String} The encoded text.
+         * @method
+         */
+        htmlEncode: function(value) {
+            return (!value) ? value : String(value).replace(charToEntityRegex, htmlEncodeReplaceFn);
+        },
+
+        /**
+         * Convert certain characters (&, <, >, ', and ") from their HTML character equivalents.
+         * @param {String} value The string to decode.
+         * @return {String} The decoded text.
+         * @method
+         */
+        htmlDecode: function(value) {
+            return (!value) ? value : String(value).replace(entityToCharRegex, htmlDecodeReplaceFn);
+        },
+
+        /**
+         * Adds a set of character entity definitions to the set used by
+         * {@link Ext.String#htmlEncode} and {@link Ext.String#htmlDecode}.
+         *
+         * This object should be keyed by the entity name sequence,
+         * with the value being the textual representation of the entity.
+         *
+         *      Ext.String.addCharacterEntities({
+         *          '&Uuml;':'Ü',
+         *          '&ccedil;':'ç',
+         *          '&ntilde;':'ñ',
+         *          '&egrave;':'è'
+         *      });
+         *      var s = Ext.String.htmlEncode("A string with entities: èÜçñ");
+         *
+         * __Note:__ the values of the character entities defined on this object are expected
+         * to be single character values.  As such, the actual values represented by the
+         * characters are sensitive to the character encoding of the JavaScript source
+         * file when defined in string literal form. Script tags referencing server
+         * resources with character entities must ensure that the 'charset' attribute
+         * of the script node is consistent with the actual character encoding of the
+         * server resource.
+         *
+         * The set of character entities may be reset back to the default state by using
+         * the {@link Ext.String#resetCharacterEntities} method
+         *
+         * @param {Object} entities The set of character entities to add to the current
+         * definitions.
+         */
+        addCharacterEntities: function(newEntities) {
+            var charKeys = [],
+                entityKeys = [],
+                key, echar;
+            for (key in newEntities) {
+                echar = newEntities[key];
+                entityToChar[key] = echar;
+                charToEntity[echar] = key;
+                charKeys.push(echar);
+                entityKeys.push(key);
+            }
+            charToEntityRegex = new RegExp('(' + charKeys.join('|') + ')', 'g');
+            entityToCharRegex = new RegExp('(' + entityKeys.join('|') + '|&#[0-9]{1,5};' + ')', 'g');
+        },
+
+        /**
+         * Resets the set of character entity definitions used by
+         * {@link Ext.String#htmlEncode} and {@link Ext.String#htmlDecode} back to the
+         * default state.
+         */
+        resetCharacterEntities: function() {
+            charToEntity = {};
+            entityToChar = {};
+            // add the default set
+            this.addCharacterEntities({
+                '&'     :   '&',
+                '>'      :   '>',
+                '<'      :   '<',
+                '"'    :   '"',
+                '''     :   "'"
+            });
+        },
+
+        /**
+         * Appends content to the query string of a URL, handling logic for whether to place
+         * a question mark or ampersand.
+         * @param {String} url The URL to append to.
+         * @param {String} string The content to append to the URL.
+         * @return {String} The resulting URL
+         */
+        urlAppend : function(url, string) {
+            if (!Ext.isEmpty(string)) {
+                return url + (url.indexOf('?') === -1 ? '?' : '&') + string;
+            }
+
+            return url;
+        },
+
+        /**
+         * Trims whitespace from either end of a string, leaving spaces within the string intact.  Example:
+         *
+         *     var s = '  foo bar  ';
+         *     alert('-' + s + '-');                   //alerts "- foo bar -"
+         *     alert('-' + Ext.String.trim(s) + '-');  //alerts "-foo bar-"
+         *
+         * @param {String} string The string to trim.
+         * @return {String} The trimmed string.
+         */
+        trim: function(string) {
+            return string.replace(trimRegex, "");
+        },
+
+        /**
+         * Capitalize the given string
+         * @param {String} string
+         * @return {String}
+         */
+        capitalize: function(string) {
+            return string.charAt(0).toUpperCase() + string.substr(1);
+        },
+
+        /**
+         * Uncapitalize the given string.
+         * @param {String} string
+         * @return {String}
+         */
+        uncapitalize: function(string) {
+            return string.charAt(0).toLowerCase() + string.substr(1);
+        },
+
+        /**
+         * Truncate a string and add an ellipsis ('...') to the end if it exceeds the specified length.
+         * @param {String} value The string to truncate.
+         * @param {Number} length The maximum length to allow before truncating.
+         * @param {Boolean} [word=false] `true` to try to find a common word break.
+         * @return {String} The converted text.
+         */
+        ellipsis: function(value, len, word) {
+            if (value && value.length > len) {
+                if (word) {
+                    var vs = value.substr(0, len - 2),
+                    index = Math.max(vs.lastIndexOf(' '), vs.lastIndexOf('.'), vs.lastIndexOf('!'), vs.lastIndexOf('?'));
+                    if (index !== -1 && index >= (len - 15)) {
+                        return vs.substr(0, index) + "...";
+                    }
+                }
+                return value.substr(0, len - 3) + "...";
+            }
+            return value;
+        },
+
+        /**
+         * Escapes the passed string for use in a regular expression.
+         * @param {String} string
+         * @return {String}
+         */
+        escapeRegex: function(string) {
+            return string.replace(escapeRegexRe, "\\$1");
+        },
+
+        /**
+         * Escapes the passed string for ' and \
+         * @param {String} string The string to escape
+         * @return {String} The escaped string
+         */
+        escape: function(string) {
+            return string.replace(escapeRe, "\\$1");
+        },
+
+        /**
+         * Utility function that allows you to easily switch a string between two alternating values.  The passed value
+         * is compared to the current string, and if they are equal, the other value that was passed in is returned.  If
+         * they are already different, the first value passed in is returned.  Note that this method returns the new value
+         * but does not change the current string.
+         *
+         *     // alternate sort directions
+         *     sort = Ext.String.toggle(sort, 'ASC', 'DESC');
+         *
+         *     // instead of conditional logic:
+         *     sort = (sort === 'ASC' ? 'DESC' : 'ASC');
+         *
+         * @param {String} string The current string.
+         * @param {String} value The value to compare to the current string.
+         * @param {String} other The new value to use if the string already equals the first value passed in.
+         * @return {String} The new value.
+         */
+        toggle: function(string, value, other) {
+            return string === value ? other : value;
+        },
+
+        /**
+         * Pads the left side of a string with a specified character.  This is especially useful
+         * for normalizing number and date strings.  Example usage:
+         *
+         *     var s = Ext.String.leftPad('123', 5, '0');
+         *     // s now contains the string: '00123'
+         *
+         * @param {String} string The original string.
+         * @param {Number} size The total length of the output string.
+         * @param {String} [character=' '] (optional) The character with which to pad the original string.
+         * @return {String} The padded string.
+         */
+        leftPad: function(string, size, character) {
+            var result = String(string);
+            character = character || " ";
+            while (result.length < size) {
+                result = character + result;
+            }
+            return result;
+        },
+
+        /**
+         * Allows you to define a tokenized string and pass an arbitrary number of arguments to replace the tokens.  Each
+         * token must be unique, and must increment in the format {0}, {1}, etc.  Example usage:
+         *
+         *     var cls = 'my-class',
+         *         text = 'Some text';
+         *     var s = Ext.String.format('<div class="{0}">{1}</div>', cls, text);
+         *     // s now contains the string: '<div class="my-class">Some text</div>'
+         *
+         * @param {String} string The tokenized string to be formatted.
+         * @param {Mixed...} values The values to replace tokens `{0}`, `{1}`, etc in order.
+         * @return {String} The formatted string.
+         */
+        format: function(format) {
+            var args = Ext.Array.toArray(arguments, 1);
+            return format.replace(formatRe, function(m, i) {
+                return args[i];
+            });
+        },
+
+        /**
+         * Returns a string with a specified number of repetitions a given string pattern.
+         * The pattern be separated by a different string.
+         *
+         *      var s = Ext.String.repeat('---', 4); // = '------------'
+         *      var t = Ext.String.repeat('--', 3, '/'); // = '--/--/--'
+         *
+         * @param {String} pattern The pattern to repeat.
+         * @param {Number} count The number of times to repeat the pattern (may be 0).
+         * @param {String} sep An option string to separate each pattern.
+         */
+        repeat: function(pattern, count, sep) {
+            if (count < 1) {
+                count = 0;
+            }
+            for (var buf = [], i = count; i--; ) {
+                buf.push(pattern);
+            }
+            return buf.join(sep || '');
+        },
+
+        /**
+         * Splits a string of space separated words into an array, trimming as needed. If the
+         * words are already an array, it is returned.
+         *
+         * @param {String/Array} words
+         */
+        splitWords: function (words) {
+            if (words && typeof words == 'string') {
+                return words.replace(basicTrimRe, '').split(whitespaceRe);
+            }
+            return words || [];
+        }
+    };
+}());
+
+// initialize the default encode / decode entities
+Ext.String.resetCharacterEntities();
+
+/**
+ * Old alias to {@link Ext.String#htmlEncode}
+ * @deprecated Use {@link Ext.String#htmlEncode} instead
+ * @method
+ * @member Ext
+ * @inheritdoc Ext.String#htmlEncode
+ */
+Ext.htmlEncode = Ext.String.htmlEncode;
+
+
+/**
+ * Old alias to {@link Ext.String#htmlDecode}
+ * @deprecated Use {@link Ext.String#htmlDecode} instead
+ * @method
+ * @member Ext
+ * @inheritdoc Ext.String#htmlDecode
+ */
+Ext.htmlDecode = Ext.String.htmlDecode;
+
+/**
+ * Old alias to {@link Ext.String#urlAppend}
+ * @deprecated Use {@link Ext.String#urlAppend} instead
+ * @method
+ * @member Ext
+ * @inheritdoc Ext.String#urlAppend
+ */
+Ext.urlAppend = Ext.String.urlAppend;
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require String.js
+// @define Ext.Number
+
+/**
+ * @class Ext.Number
+ *
+ * A collection of useful static methods to deal with numbers
+ * @singleton
+ */
+
+Ext.Number = new function() {
+
+    var me = this,
+        isToFixedBroken = (0.9).toFixed() !== '1',
+        math = Math;
+
+    Ext.apply(this, {
+        /**
+         * Checks whether or not the passed number is within a desired range.  If the number is already within the
+         * range it is returned, otherwise the min or max value is returned depending on which side of the range is
+         * exceeded. Note that this method returns the constrained value but does not change the current number.
+         * @param {Number} number The number to check
+         * @param {Number} min The minimum number in the range
+         * @param {Number} max The maximum number in the range
+         * @return {Number} The constrained value if outside the range, otherwise the current value
+         */
+        constrain: function(number, min, max) {
+            var x = parseFloat(number);
+
+            // Watch out for NaN in Chrome 18
+            // V8bug: http://code.google.com/p/v8/issues/detail?id=2056
+
+            // Operators are faster than Math.min/max. See http://jsperf.com/number-constrain
+            // ... and (x < Nan) || (x < undefined) == false
+            // ... same for (x > NaN) || (x > undefined)
+            // so if min or max are undefined or NaN, we never return them... sadly, this
+            // is not true of null (but even Math.max(-1,null)==0 and isNaN(null)==false)
+            return (x < min) ? min : ((x > max) ? max : x);
+        },
+
+        /**
+         * Snaps the passed number between stopping points based upon a passed increment value.
+         *
+         * The difference between this and {@link #snapInRange} is that {@link #snapInRange} uses the minValue
+         * when calculating snap points:
+         *
+         *     r = Ext.Number.snap(56, 2, 55, 65);        // Returns 56 - snap points are zero based
+         *
+         *     r = Ext.Number.snapInRange(56, 2, 55, 65); // Returns 57 - snap points are based from minValue
+         *
+         * @param {Number} value The unsnapped value.
+         * @param {Number} increment The increment by which the value must move.
+         * @param {Number} minValue The minimum value to which the returned value must be constrained. Overrides the increment.
+         * @param {Number} maxValue The maximum value to which the returned value must be constrained. Overrides the increment.
+         * @return {Number} The value of the nearest snap target.
+         */
+        snap : function(value, increment, minValue, maxValue) {
+            var m;
+
+            // If no value passed, or minValue was passed and value is less than minValue (anything < undefined is false)
+            // Then use the minValue (or zero if the value was undefined)
+            if (value === undefined || value < minValue) {
+                return minValue || 0;
+            }
+
+            if (increment) {
+                m = value % increment;
+                if (m !== 0) {
+                    value -= m;
+                    if (m * 2 >= increment) {
+                        value += increment;
+                    } else if (m * 2 < -increment) {
+                        value -= increment;
+                    }
+                }
+            }
+            return me.constrain(value, minValue,  maxValue);
+        },
+
+        /**
+         * Snaps the passed number between stopping points based upon a passed increment value.
+         *
+         * The difference between this and {@link #snap} is that {@link #snap} does not use the minValue
+         * when calculating snap points:
+         *
+         *     r = Ext.Number.snap(56, 2, 55, 65);        // Returns 56 - snap points are zero based
+         *
+         *     r = Ext.Number.snapInRange(56, 2, 55, 65); // Returns 57 - snap points are based from minValue
+         *
+         * @param {Number} value The unsnapped value.
+         * @param {Number} increment The increment by which the value must move.
+         * @param {Number} [minValue=0] The minimum value to which the returned value must be constrained.
+         * @param {Number} [maxValue=Infinity] The maximum value to which the returned value must be constrained.
+         * @return {Number} The value of the nearest snap target.
+         */
+        snapInRange : function(value, increment, minValue, maxValue) {
+            var tween;
+
+            // default minValue to zero
+            minValue = (minValue || 0);
+
+            // If value is undefined, or less than minValue, use minValue
+            if (value === undefined || value < minValue) {
+                return minValue;
+            }
+
+            // Calculate how many snap points from the minValue the passed value is.
+            if (increment && (tween = ((value - minValue) % increment))) {
+                value -= tween;
+                tween *= 2;
+                if (tween >= increment) {
+                    value += increment;
+                }
+            }
+
+            // If constraining within a maximum, ensure the maximum is on a snap point
+            if (maxValue !== undefined) {
+                if (value > (maxValue = me.snapInRange(maxValue, increment, minValue))) {
+                    value = maxValue;
+                }
+            }
+
+            return value;
+        },
+
+        /**
+         * Formats a number using fixed-point notation
+         * @param {Number} value The number to format
+         * @param {Number} precision The number of digits to show after the decimal point
+         */
+        toFixed: isToFixedBroken ? function(value, precision) {
+            precision = precision || 0;
+            var pow = math.pow(10, precision);
+            return (math.round(value * pow) / pow).toFixed(precision);
+        } : function(value, precision) {
+            return value.toFixed(precision);
+        },
+
+        /**
+         * Validate that a value is numeric and convert it to a number if necessary. Returns the specified default value if
+         * it is not.
+
+    Ext.Number.from('1.23', 1); // returns 1.23
+    Ext.Number.from('abc', 1); // returns 1
+
+         * @param {Object} value
+         * @param {Number} defaultValue The value to return if the original value is non-numeric
+         * @return {Number} value, if numeric, defaultValue otherwise
+         */
+        from: function(value, defaultValue) {
+            if (isFinite(value)) {
+                value = parseFloat(value);
+            }
+
+            return !isNaN(value) ? value : defaultValue;
+        },
+
+        /**
+         * Returns a random integer between the specified range (inclusive)
+         * @param {Number} from Lowest value to return.
+         * @param {Number} to Highst value to return.
+         * @return {Number} A random integer within the specified range.
+         */
+        randomInt: function (from, to) {
+           return math.floor(math.random() * (to - from + 1) + from);
+        },
+        
+        /**
+         * Corrects floating point numbers that overflow to a non-precise
+         * value because of their floating nature, for example `0.1 + 0.2`
+         * @param {Number} The number
+         * @return {Number} The correctly rounded number
+         */
+        correctFloat: function(n) {
+            // This is to correct the type of errors where 2 floats end with
+            // a long string of decimals, eg 0.1 + 0.2. When they overflow in this
+            // manner, they usually go to 15-16 decimals, so we cut it off at 14.
+            return parseFloat(n.toPrecision(14));
+        }
+    });
+
+    /**
+     * @deprecated 4.0.0 Please use {@link Ext.Number#from} instead.
+     * @member Ext
+     * @method num
+     * @inheritdoc Ext.Number#from
+     */
+    Ext.num = function() {
+        return me.from.apply(this, arguments);
+    };
+};
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require Number.js
+// @define Ext.Array
+
+/**
+ * @class Ext.Array
+ * @singleton
+ * @author Jacky Nguyen <jacky at sencha.com>
+ * @docauthor Jacky Nguyen <jacky at sencha.com>
+ *
+ * A set of useful static methods to deal with arrays; provide missing methods for older browsers.
+ */
+(function() {
+
+    var arrayPrototype = Array.prototype,
+        slice = arrayPrototype.slice,
+        supportsSplice = (function () {
+            var array = [],
+                lengthBefore,
+                j = 20;
+
+            if (!array.splice) {
+                return false;
+            }
+
+            // This detects a bug in IE8 splice method:
+            // see http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/6e946d03-e09f-4b22-a4dd-cd5e276bf05a/
+
+            while (j--) {
+                array.push("A");
+            }
+
+            array.splice(15, 0, "F", "F", "F", "F", "F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F");
+
+            lengthBefore = array.length; //41
+            array.splice(13, 0, "XXX"); // add one element
+
+            if (lengthBefore+1 != array.length) {
+                return false;
+            }
+            // end IE8 bug
+
+            return true;
+        }()),
+        supportsForEach = 'forEach' in arrayPrototype,
+        supportsMap = 'map' in arrayPrototype,
+        supportsIndexOf = 'indexOf' in arrayPrototype,
+        supportsEvery = 'every' in arrayPrototype,
+        supportsSome = 'some' in arrayPrototype,
+        supportsFilter = 'filter' in arrayPrototype,
+        supportsSort = (function() {
+            var a = [1,2,3,4,5].sort(function(){ return 0; });
+            return a[0] === 1 && a[1] === 2 && a[2] === 3 && a[3] === 4 && a[4] === 5;
+        }()),
+        supportsSliceOnNodeList = true,
+        ExtArray,
+        erase,
+        replace,
+        splice;
+
+    try {
+        // IE 6 - 8 will throw an error when using Array.prototype.slice on NodeList
+        if (typeof document !== 'undefined') {
+            slice.call(document.getElementsByTagName('body'));
+        }
+    } catch (e) {
+        supportsSliceOnNodeList = false;
+    }
+
+    function fixArrayIndex (array, index) {
+        return (index < 0) ? Math.max(0, array.length + index)
+                           : Math.min(array.length, index);
+    }
+
+    /*
+    Does the same work as splice, but with a slightly more convenient signature. The splice
+    method has bugs in IE8, so this is the implementation we use on that platform.
+
+    The rippling of items in the array can be tricky. Consider two use cases:
+
+                  index=2
+                  removeCount=2
+                 /=====\
+        +---+---+---+---+---+---+---+---+
+        | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 |
+        +---+---+---+---+---+---+---+---+
+                         /  \/  \/  \/  \
+                        /   /\  /\  /\   \
+                       /   /  \/  \/  \   +--------------------------+
+                      /   /   /\  /\   +--------------------------+   \
+                     /   /   /  \/  +--------------------------+   \   \
+                    /   /   /   /+--------------------------+   \   \   \
+                   /   /   /   /                             \   \   \   \
+                  v   v   v   v                               v   v   v   v
+        +---+---+---+---+---+---+       +---+---+---+---+---+---+---+---+---+
+        | 0 | 1 | 4 | 5 | 6 | 7 |       | 0 | 1 | a | b | c | 4 | 5 | 6 | 7 |
+        +---+---+---+---+---+---+       +---+---+---+---+---+---+---+---+---+
+        A                               B        \=========/
+                                                 insert=[a,b,c]
+
+    In case A, it is obvious that copying of [4,5,6,7] must be left-to-right so
+    that we don't end up with [0,1,6,7,6,7]. In case B, we have the opposite; we
+    must go right-to-left or else we would end up with [0,1,a,b,c,4,4,4,4].
+    */
+    function replaceSim (array, index, removeCount, insert) {
+        var add = insert ? insert.length : 0,
+            length = array.length,
+            pos = fixArrayIndex(array, index),
+            remove,
+            tailOldPos,
+            tailNewPos,
+            tailCount,
+            lengthAfterRemove,
+            i;
+
+        // we try to use Array.push when we can for efficiency...
+        if (pos === length) {
+            if (add) {
+                array.push.apply(array, insert);
+            }
+        } else {
+            remove = Math.min(removeCount, length - pos);
+            tailOldPos = pos + remove;
+            tailNewPos = tailOldPos + add - remove;
+            tailCount = length - tailOldPos;
+            lengthAfterRemove = length - remove;
+
+            if (tailNewPos < tailOldPos) { // case A
+                for (i = 0; i < tailCount; ++i) {
+                    array[tailNewPos+i] = array[tailOldPos+i];
+                }
+            } else if (tailNewPos > tailOldPos) { // case B
+                for (i = tailCount; i--; ) {
+                    array[tailNewPos+i] = array[tailOldPos+i];
+                }
+            } // else, add == remove (nothing to do)
+
+            if (add && pos === lengthAfterRemove) {
+                array.length = lengthAfterRemove; // truncate array
+                array.push.apply(array, insert);
+            } else {
+                array.length = lengthAfterRemove + add; // reserves space
+                for (i = 0; i < add; ++i) {
+                    array[pos+i] = insert[i];
+                }
+            }
+        }
+
+        return array;
+    }
+
+    function replaceNative (array, index, removeCount, insert) {
+        if (insert && insert.length) {
+            // Inserting at index zero with no removing: use unshift
+            if (index === 0 && !removeCount) {
+                array.unshift.apply(array, insert);
+            }
+            // Inserting/replacing in middle of array
+            else if (index < array.length) {
+                array.splice.apply(array, [index, removeCount].concat(insert));
+            }
+            // Appending to array
+            else {
+                array.push.apply(array, insert);
+            }
+        } else {
+            array.splice(index, removeCount);
+        }
+        return array;
+    }
+
+    function eraseSim (array, index, removeCount) {
+        return replaceSim(array, index, removeCount);
+    }
+
+    function eraseNative (array, index, removeCount) {
+        array.splice(index, removeCount);
+        return array;
+    }
+
+    function spliceSim (array, index, removeCount) {
+        var pos = fixArrayIndex(array, index),
+            removed = array.slice(index, fixArrayIndex(array, pos+removeCount));
+
+        if (arguments.length < 4) {
+            replaceSim(array, pos, removeCount);
+        } else {
+            replaceSim(array, pos, removeCount, slice.call(arguments, 3));
+        }
+
+        return removed;
+    }
+
+    function spliceNative (array) {
+        return array.splice.apply(array, slice.call(arguments, 1));
+    }
+
+    erase = supportsSplice ? eraseNative : eraseSim;
+    replace = supportsSplice ? replaceNative : replaceSim;
+    splice = supportsSplice ? spliceNative : spliceSim;
+
+    // NOTE: from here on, use erase, replace or splice (not native methods)...
+
+    ExtArray = Ext.Array = {
+        /**
+         * Iterates an array or an iterable value and invoke the given callback function for each item.
+         *
+         *     var countries = ['Vietnam', 'Singapore', 'United States', 'Russia'];
+         *
+         *     Ext.Array.each(countries, function(name, index, countriesItSelf) {
+         *         console.log(name);
+         *     });
+         *
+         *     var sum = function() {
+         *         var sum = 0;
+         *
+         *         Ext.Array.each(arguments, function(value) {
+         *             sum += value;
+         *         });
+         *
+         *         return sum;
+         *     };
+         *
+         *     sum(1, 2, 3); // returns 6
+         *
+         * The iteration can be stopped by returning false in the function callback.
+         *
+         *     Ext.Array.each(countries, function(name, index, countriesItSelf) {
+         *         if (name === 'Singapore') {
+         *             return false; // break here
+         *         }
+         *     });
+         *
+         * {@link Ext#each Ext.each} is alias for {@link Ext.Array#each Ext.Array.each}
+         *
+         * @param {Array/NodeList/Object} iterable The value to be iterated. If this
+         * argument is not iterable, the callback function is called once.
+         * @param {Function} fn The callback function. If it returns false, the iteration stops and this method returns
+         * the current `index`.
+         * @param {Object} fn.item The item at the current `index` in the passed `array`
+         * @param {Number} fn.index The current `index` within the `array`
+         * @param {Array} fn.allItems The `array` itself which was passed as the first argument
+         * @param {Boolean} fn.return Return false to stop iteration.
+         * @param {Object} scope (Optional) The scope (`this` reference) in which the specified function is executed.
+         * @param {Boolean} reverse (Optional) Reverse the iteration order (loop from the end to the beginning)
+         * Defaults false
+         * @return {Boolean} See description for the `fn` parameter.
+         */
+        each: function(array, fn, scope, reverse) {
+            array = ExtArray.from(array);
+
+            var i,
+                ln = array.length;
+
+            if (reverse !== true) {
+                for (i = 0; i < ln; i++) {
+                    if (fn.call(scope || array[i], array[i], i, array) === false) {
+                        return i;
+                    }
+                }
+            }
+            else {
+                for (i = ln - 1; i > -1; i--) {
+                    if (fn.call(scope || array[i], array[i], i, array) === false) {
+                        return i;
+                    }
+                }
+            }
+
+            return true;
+        },
+
+        /**
+         * Iterates an array and invoke the given callback function for each item. Note that this will simply
+         * delegate to the native Array.prototype.forEach method if supported. It doesn't support stopping the
+         * iteration by returning false in the callback function like {@link Ext.Array#each}. However, performance
+         * could be much better in modern browsers comparing with {@link Ext.Array#each}
+         *
+         * @param {Array} array The array to iterate
+         * @param {Function} fn The callback function.
+         * @param {Object} fn.item The item at the current `index` in the passed `array`
+         * @param {Number} fn.index The current `index` within the `array`
+         * @param {Array}  fn.allItems The `array` itself which was passed as the first argument
+         * @param {Object} scope (Optional) The execution scope (`this`) in which the specified function is executed.
+         */
+        forEach: supportsForEach ? function(array, fn, scope) {
+            array.forEach(fn, scope);
+        } : function(array, fn, scope) {
+            var i = 0,
+                ln = array.length;
+
+            for (; i < ln; i++) {
+                fn.call(scope, array[i], i, array);
+            }
+        },
+
+        /**
+         * Get the index of the provided `item` in the given `array`, a supplement for the
+         * missing arrayPrototype.indexOf in Internet Explorer.
+         *
+         * @param {Array} array The array to check
+         * @param {Object} item The item to look for
+         * @param {Number} from (Optional) The index at which to begin the search
+         * @return {Number} The index of item in the array (or -1 if it is not found)
+         */
+        indexOf: supportsIndexOf ? function(array, item, from) {
+            return arrayPrototype.indexOf.call(array, item, from);
+         } : function(array, item, from) {
+            var i, length = array.length;
+
+            for (i = (from < 0) ? Math.max(0, length + from) : from || 0; i < length; i++) {
+                if (array[i] === item) {
+                    return i;
+                }
+            }
+
+            return -1;
+        },
+
+        /**
+         * Checks whether or not the given `array` contains the specified `item`
+         *
+         * @param {Array} array The array to check
+         * @param {Object} item The item to look for
+         * @return {Boolean} True if the array contains the item, false otherwise
+         */
+        contains: supportsIndexOf ? function(array, item) {
+            return arrayPrototype.indexOf.call(array, item) !== -1;
+        } : function(array, item) {
+            var i, ln;
+
+            for (i = 0, ln = array.length; i < ln; i++) {
+                if (array[i] === item) {
+                    return true;
+                }
+            }
+
+            return false;
+        },
+
+        /**
+         * Converts any iterable (numeric indices and a length property) into a true array.
+         *
+         *     function test() {
+         *         var args = Ext.Array.toArray(arguments),
+         *             fromSecondToLastArgs = Ext.Array.toArray(arguments, 1);
+         *
+         *         alert(args.join(' '));
+         *         alert(fromSecondToLastArgs.join(' '));
+         *     }
+         *
+         *     test('just', 'testing', 'here'); // alerts 'just testing here';
+         *                                      // alerts 'testing here';
+         *
+         *     Ext.Array.toArray(document.getElementsByTagName('div')); // will convert the NodeList into an array
+         *     Ext.Array.toArray('splitted'); // returns ['s', 'p', 'l', 'i', 't', 't', 'e', 'd']
+         *     Ext.Array.toArray('splitted', 0, 3); // returns ['s', 'p', 'l']
+         *
+         * {@link Ext#toArray Ext.toArray} is alias for {@link Ext.Array#toArray Ext.Array.toArray}
+         *
+         * @param {Object} iterable the iterable object to be turned into a true Array.
+         * @param {Number} start (Optional) a zero-based index that specifies the start of extraction. Defaults to 0
+         * @param {Number} end (Optional) a 1-based index that specifies the end of extraction. Defaults to the last
+         * index of the iterable value
+         * @return {Array} array
+         */
+        toArray: function(iterable, start, end){
+            if (!iterable || !iterable.length) {
+                return [];
+            }
+
+            if (typeof iterable === 'string') {
+                iterable = iterable.split('');
+            }
+
+            if (supportsSliceOnNodeList) {
+                return slice.call(iterable, start || 0, end || iterable.length);
+            }
+
+            var array = [],
+                i;
+
+            start = start || 0;
+            end = end ? ((end < 0) ? iterable.length + end : end) : iterable.length;
+
+            for (i = start; i < end; i++) {
+                array.push(iterable[i]);
+            }
+
+            return array;
+        },
+
+        /**
+         * Plucks the value of a property from each item in the Array. Example:
+         *
+         *     Ext.Array.pluck(Ext.query("p"), "className"); // [el1.className, el2.className, ..., elN.className]
+         *
+         * @param {Array/NodeList} array The Array of items to pluck the value from.
+         * @param {String} propertyName The property name to pluck from each element.
+         * @return {Array} The value from each item in the Array.
+         */
+        pluck: function(array, propertyName) {
+            var ret = [],
+                i, ln, item;
+
+            for (i = 0, ln = array.length; i < ln; i++) {
+                item = array[i];
+
+                ret.push(item[propertyName]);
+            }
+
+            return ret;
+        },
+
+        /**
+         * Creates a new array with the results of calling a provided function on every element in this array.
+         *
+         * @param {Array} array
+         * @param {Function} fn Callback function for each item
+         * @param {Mixed} fn.item Current item.
+         * @param {Number} fn.index Index of the item.
+         * @param {Array} fn.array The whole array that's being iterated.
+         * @param {Object} [scope] Callback function scope
+         * @return {Array} results
+         */
+        map: supportsMap ? function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.map must have a callback function passed as second argument.');
+            }
+            return array.map(fn, scope);
+        } : function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.map must have a callback function passed as second argument.');
+            }
+            var results = [],
+                i = 0,
+                len = array.length;
+
+            for (; i < len; i++) {
+                results[i] = fn.call(scope, array[i], i, array);
+            }
+
+            return results;
+        },
+
+        /**
+         * Executes the specified function for each array element until the function returns a falsy value.
+         * If such an item is found, the function will return false immediately.
+         * Otherwise, it will return true.
+         *
+         * @param {Array} array
+         * @param {Function} fn Callback function for each item
+         * @param {Mixed} fn.item Current item.
+         * @param {Number} fn.index Index of the item.
+         * @param {Array} fn.array The whole array that's being iterated.
+         * @param {Object} scope Callback function scope
+         * @return {Boolean} True if no false value is returned by the callback function.
+         */
+        every: supportsEvery ? function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.every must have a callback function passed as second argument.');
+            }
+            return array.every(fn, scope);
+        } : function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.every must have a callback function passed as second argument.');
+            }
+            var i = 0,
+                ln = array.length;
+
+            for (; i < ln; ++i) {
+                if (!fn.call(scope, array[i], i, array)) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        /**
+         * Executes the specified function for each array element until the function returns a truthy value.
+         * If such an item is found, the function will return true immediately. Otherwise, it will return false.
+         *
+         * @param {Array} array
+         * @param {Function} fn Callback function for each item
+         * @param {Mixed} fn.item Current item.
+         * @param {Number} fn.index Index of the item.
+         * @param {Array} fn.array The whole array that's being iterated.
+         * @param {Object} scope Callback function scope
+         * @return {Boolean} True if the callback function returns a truthy value.
+         */
+        some: supportsSome ? function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.some must have a callback function passed as second argument.');
+            }
+            return array.some(fn, scope);
+        } : function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.some must have a callback function passed as second argument.');
+            }
+            var i = 0,
+                ln = array.length;
+
+            for (; i < ln; ++i) {
+                if (fn.call(scope, array[i], i, array)) {
+                    return true;
+                }
+            }
+
+            return false;
+        },
+        
+        /**
+         * Shallow compares the contents of 2 arrays using strict equality.
+         * @param {Array} array1
+         * @param {Array} array2
+         * @return {Boolean} `true` if the arrays are equal.
+         */
+        equals: function(array1, array2) {
+            var len1 = array1.length,
+                len2 = array2.length,
+                i;
+                
+            // Short circuit if the same array is passed twice
+            if (array1 === array2) {
+                return true;
+            }
+                
+            if (len1 !== len2) {
+                return false;
+            }
+            
+            for (i = 0; i < len1; ++i) {
+                if (array1[i] !== array2[i]) {
+                    return false;
+                }
+            }
+            
+            return true;
+        },
+
+        /**
+         * Filter through an array and remove empty item as defined in {@link Ext#isEmpty Ext.isEmpty}
+         *
+         * See {@link Ext.Array#filter}
+         *
+         * @param {Array} array
+         * @return {Array} results
+         */
+        clean: function(array) {
+            var results = [],
+                i = 0,
+                ln = array.length,
+                item;
+
+            for (; i < ln; i++) {
+                item = array[i];
+
+                if (!Ext.isEmpty(item)) {
+                    results.push(item);
+                }
+            }
+
+            return results;
+        },
+
+        /**
+         * Returns a new array with unique items
+         *
+         * @param {Array} array
+         * @return {Array} results
+         */
+        unique: function(array) {
+            var clone = [],
+                i = 0,
+                ln = array.length,
+                item;
+
+            for (; i < ln; i++) {
+                item = array[i];
+
+                if (ExtArray.indexOf(clone, item) === -1) {
+                    clone.push(item);
+                }
+            }
+
+            return clone;
+        },
+
+        /**
+         * Creates a new array with all of the elements of this array for which
+         * the provided filtering function returns true.
+         *
+         * @param {Array} array
+         * @param {Function} fn Callback function for each item
+         * @param {Mixed} fn.item Current item.
+         * @param {Number} fn.index Index of the item.
+         * @param {Array} fn.array The whole array that's being iterated.
+         * @param {Object} scope Callback function scope
+         * @return {Array} results
+         */
+        filter: supportsFilter ? function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.filter must have a filter function passed as second argument.');
+            }
+            return array.filter(fn, scope);
+        } : function(array, fn, scope) {
+            if (!fn) {
+                Ext.Error.raise('Ext.Array.filter must have a filter function passed as second argument.');
+            }
+            var results = [],
+                i = 0,
+                ln = array.length;
+
+            for (; i < ln; i++) {
+                if (fn.call(scope, array[i], i, array)) {
+                    results.push(array[i]);
+                }
+            }
+
+            return results;
+        },
+
+        /**
+         * Returns the first item in the array which elicits a true return value from the
+         * passed selection function.
+         * @param {Array} array The array to search
+         * @param {Function} fn The selection function to execute for each item.
+         * @param {Mixed} fn.item The array item.
+         * @param {String} fn.index The index of the array item.
+         * @param {Object} scope (optional) The scope (<code>this</code> reference) in which the
+         * function is executed. Defaults to the array
+         * @return {Object} The first item in the array which returned true from the selection
+         * function, or null if none was found.
+         */
+        findBy : function(array, fn, scope) {
+            var i = 0,
+                len = array.length;
+
+            for (; i < len; i++) {
+                if (fn.call(scope || array, array[i], i)) {
+                    return array[i];
+                }
+            }
+            return null;
+        },
+
+        /**
+         * Converts a value to an array if it's not already an array; returns:
+         *
+         * - An empty array if given value is `undefined` or `null`
+         * - Itself if given value is already an array
+         * - An array copy if given value is {@link Ext#isIterable iterable} (arguments, NodeList and alike)
+         * - An array with one item which is the given value, otherwise
+         *
+         * @param {Object} value The value to convert to an array if it's not already is an array
+         * @param {Boolean} newReference (Optional) True to clone the given array and return a new reference if necessary,
+         * defaults to false
+         * @return {Array} array
+         */
+        from: function(value, newReference) {
+            if (value === undefined || value === null) {
+                return [];
+            }
+
+            if (Ext.isArray(value)) {
+                return (newReference) ? slice.call(value) : value;
+            }
+
+            var type = typeof value;
+            // Both strings and functions will have a length property. In phantomJS, NodeList
+            // instances report typeof=='function' but don't have an apply method...
+            if (value && value.length !== undefined && type !== 'string' && (type !== 'function' || !value.apply)) {
+                return ExtArray.toArray(value);
+            }
+
+            return [value];
+        },
+
+        /**
+         * Removes the specified item from the array if it exists
+         *
+         * @param {Array} array The array
+         * @param {Object} item The item to remove
+         * @return {Array} The passed array itself
+         */
+        remove: function(array, item) {
+            var index = ExtArray.indexOf(array, item);
+
+            if (index !== -1) {
+                erase(array, index, 1);
+            }
+
+            return array;
+        },
+
+        /**
+         * Push an item into the array only if the array doesn't contain it yet
+         *
+         * @param {Array} array The array
+         * @param {Object} item The item to include
+         */
+        include: function(array, item) {
+            if (!ExtArray.contains(array, item)) {
+                array.push(item);
+            }
+        },
+
+        /**
+         * Clone a flat array without referencing the previous one. Note that this is different
+         * from Ext.clone since it doesn't handle recursive cloning. It's simply a convenient, easy-to-remember method
+         * for Array.prototype.slice.call(array)
+         *
+         * @param {Array} array The array
+         * @return {Array} The clone array
+         */
+        clone: function(array) {
+            return slice.call(array);
+        },
+
+        /**
+         * Merge multiple arrays into one with unique items.
+         *
+         * {@link Ext.Array#union} is alias for {@link Ext.Array#merge}
+         *
+         * @param {Array} array1
+         * @param {Array} array2
+         * @param {Array} etc
+         * @return {Array} merged
+         */
+        merge: function() {
+            var args = slice.call(arguments),
+                array = [],
+                i, ln;
+
+            for (i = 0, ln = args.length; i < ln; i++) {
+                array = array.concat(args[i]);
+            }
+
+            return ExtArray.unique(array);
+        },
+
+        /**
+         * Merge multiple arrays into one with unique items that exist in all of the arrays.
+         *
+         * @param {Array} array1
+         * @param {Array} array2
+         * @param {Array} etc
+         * @return {Array} intersect
+         */
+        intersect: function() {
+            var intersection = [],
+                arrays = slice.call(arguments),
+                arraysLength,
+                array,
+                arrayLength,
+                minArray,
+                minArrayIndex,
+                minArrayCandidate,
+                minArrayLength,
+                element,
+                elementCandidate,
+                elementCount,
+                i, j, k;
+
+            if (!arrays.length) {
+                return intersection;
+            }
+
+            // Find the smallest array
+            arraysLength = arrays.length;
+            for (i = minArrayIndex = 0; i < arraysLength; i++) {
+                minArrayCandidate = arrays[i];
+                if (!minArray || minArrayCandidate.length < minArray.length) {
+                    minArray = minArrayCandidate;
+                    minArrayIndex = i;
+                }
+            }
+
+            minArray = ExtArray.unique(minArray);
+            erase(arrays, minArrayIndex, 1);
+
+            // Use the smallest unique'd array as the anchor loop. If the other array(s) do contain
+            // an item in the small array, we're likely to find it before reaching the end
+            // of the inner loop and can terminate the search early.
+            minArrayLength = minArray.length;
+            arraysLength = arrays.length;
+            for (i = 0; i < minArrayLength; i++) {
+                element = minArray[i];
+                elementCount = 0;
+
+                for (j = 0; j < arraysLength; j++) {
+                    array = arrays[j];
+                    arrayLength = array.length;
+                    for (k = 0; k < arrayLength; k++) {
+                        elementCandidate = array[k];
+                        if (element === elementCandidate) {
+                            elementCount++;
+                            break;
+                        }
+                    }
+                }
+
+                if (elementCount === arraysLength) {
+                    intersection.push(element);
+                }
+            }
+
+            return intersection;
+        },
+
+        /**
+         * Perform a set difference A-B by subtracting all items in array B from array A.
+         *
+         * @param {Array} arrayA
+         * @param {Array} arrayB
+         * @return {Array} difference
+         */
+        difference: function(arrayA, arrayB) {
+            var clone = slice.call(arrayA),
+                ln = clone.length,
+                i, j, lnB;
+
+            for (i = 0,lnB = arrayB.length; i < lnB; i++) {
+                for (j = 0; j < ln; j++) {
+                    if (clone[j] === arrayB[i]) {
+                        erase(clone, j, 1);
+                        j--;
+                        ln--;
+                    }
+                }
+            }
+
+            return clone;
+        },
+
+        /**
+         * Returns a shallow copy of a part of an array. This is equivalent to the native
+         * call "Array.prototype.slice.call(array, begin, end)". This is often used when "array"
+         * is "arguments" since the arguments object does not supply a slice method but can
+         * be the context object to Array.prototype.slice.
+         *
+         * @param {Array} array The array (or arguments object).
+         * @param {Number} begin The index at which to begin. Negative values are offsets from
+         * the end of the array.
+         * @param {Number} end The index at which to end. The copied items do not include
+         * end. Negative values are offsets from the end of the array. If end is omitted,
+         * all items up to the end of the array are copied.
+         * @return {Array} The copied piece of the array.
+         * @method slice
+         */
+        // Note: IE6 will return [] on slice.call(x, undefined).
+        slice: ([1,2].slice(1, undefined).length ?
+            function (array, begin, end) {
+                return slice.call(array, begin, end);
+            } :
+            // at least IE6 uses arguments.length for variadic signature
+            function (array, begin, end) {
+                // After tested for IE 6, the one below is of the best performance
+                // see http://jsperf.com/slice-fix
+                if (typeof begin === 'undefined') {
+                    return slice.call(array);
+                }
+                if (typeof end === 'undefined') {
+                    return slice.call(array, begin);
+                }
+                return slice.call(array, begin, end);
+            }
+        ),
+
+        /**
+         * Sorts the elements of an Array.
+         * By default, this method sorts the elements alphabetically and ascending.
+         *
+         * @param {Array} array The array to sort.
+         * @param {Function} sortFn (optional) The comparison function.
+         * @param {Mixed} sortFn.a An item to compare.
+         * @param {Mixed} sortFn.b Another item to compare.
+         * @return {Array} The sorted array.
+         */
+        sort: supportsSort ? function(array, sortFn) {
+            if (sortFn) {
+                return array.sort(sortFn);
+            } else {
+                return array.sort();
+            }
+         } : function(array, sortFn) {
+            var length = array.length,
+                i = 0,
+                comparison,
+                j, min, tmp;
+
+            for (; i < length; i++) {
+                min = i;
+                for (j = i + 1; j < length; j++) {
+                    if (sortFn) {
+                        comparison = sortFn(array[j], array[min]);
+                        if (comparison < 0) {
+                            min = j;
+                        }
+                    } else if (array[j] < array[min]) {
+                        min = j;
+                    }
+                }
+                if (min !== i) {
+                    tmp = array[i];
+                    array[i] = array[min];
+                    array[min] = tmp;
+                }
+            }
+
+            return array;
+        },
+
+        /**
+         * Recursively flattens into 1-d Array. Injects Arrays inline.
+         *
+         * @param {Array} array The array to flatten
+         * @return {Array} The 1-d array.
+         */
+        flatten: function(array) {
+            var worker = [];
+
+            function rFlatten(a) {
+                var i, ln, v;
+
+                for (i = 0, ln = a.length; i < ln; i++) {
+                    v = a[i];
+
+                    if (Ext.isArray(v)) {
+                        rFlatten(v);
+                    } else {
+                        worker.push(v);
+                    }
+                }
+
+                return worker;
+            }
+
+            return rFlatten(array);
+        },
+
+        /**
+         * Returns the minimum value in the Array.
+         *
+         * @param {Array/NodeList} array The Array from which to select the minimum value.
+         * @param {Function} comparisonFn (optional) a function to perform the comparision which determines minimization.
+         * If omitted the "<" operator will be used. Note: gt = 1; eq = 0; lt = -1
+         * @param {Mixed} comparisonFn.min Current minimum value.
+         * @param {Mixed} comparisonFn.item The value to compare with the current minimum.
+         * @return {Object} minValue The minimum value
+         */
+        min: function(array, comparisonFn) {
+            var min = array[0],
+                i, ln, item;
+
+            for (i = 0, ln = array.length; i < ln; i++) {
+                item = array[i];
+
+                if (comparisonFn) {
+                    if (comparisonFn(min, item) === 1) {
+                        min = item;
+                    }
+                }
+                else {
+                    if (item < min) {
+                        min = item;
+                    }
+                }
+            }
+
+            return min;
+        },
+
+        /**
+         * Returns the maximum value in the Array.
+         *
+         * @param {Array/NodeList} array The Array from which to select the maximum value.
+         * @param {Function} comparisonFn (optional) a function to perform the comparision which determines maximization.
+         * If omitted the ">" operator will be used. Note: gt = 1; eq = 0; lt = -1
+         * @param {Mixed} comparisonFn.max Current maximum value.
+         * @param {Mixed} comparisonFn.item The value to compare with the current maximum.
+         * @return {Object} maxValue The maximum value
+         */
+        max: function(array, comparisonFn) {
+            var max = array[0],
+                i, ln, item;
+
+            for (i = 0, ln = array.length; i < ln; i++) {
+                item = array[i];
+
+                if (comparisonFn) {
+                    if (comparisonFn(max, item) === -1) {
+                        max = item;
+                    }
+                }
+                else {
+                    if (item > max) {
+                        max = item;
+                    }
+                }
+            }
+
+            return max;
+        },
+
+        /**
+         * Calculates the mean of all items in the array.
+         *
+         * @param {Array} array The Array to calculate the mean value of.
+         * @return {Number} The mean.
+         */
+        mean: function(array) {
+            return array.length > 0 ? ExtArray.sum(array) / array.length : undefined;
+        },
+
+        /**
+         * Calculates the sum of all items in the given array.
+         *
+         * @param {Array} array The Array to calculate the sum value of.
+         * @return {Number} The sum.
+         */
+        sum: function(array) {
+            var sum = 0,
+                i, ln, item;
+
+            for (i = 0,ln = array.length; i < ln; i++) {
+                item = array[i];
+
+                sum += item;
+            }
+
+            return sum;
+        },
+
+        /**
+         * Creates a map (object) keyed by the elements of the given array. The values in
+         * the map are the index+1 of the array element. For example:
+         * 
+         *      var map = Ext.Array.toMap(['a','b','c']);
+         *
+         *      // map = { a: 1, b: 2, c: 3 };
+         * 
+         * Or a key property can be specified:
+         * 
+         *      var map = Ext.Array.toMap([
+         *              { name: 'a' },
+         *              { name: 'b' },
+         *              { name: 'c' }
+         *          ], 'name');
+         *
+         *      // map = { a: 1, b: 2, c: 3 };
+         * 
+         * Lastly, a key extractor can be provided:
+         * 
+         *      var map = Ext.Array.toMap([
+         *              { name: 'a' },
+         *              { name: 'b' },
+         *              { name: 'c' }
+         *          ], function (obj) { return obj.name.toUpperCase(); });
+         *
+         *      // map = { A: 1, B: 2, C: 3 };
+         * 
+         * @param {Array} array The Array to create the map from.
+         * @param {String/Function} [getKey] Name of the object property to use
+         * as a key or a function to extract the key.
+         * @param {Object} [scope] Value of this inside callback.
+         * @return {Object} The resulting map.
+         */
+        toMap: function(array, getKey, scope) {
+            var map = {},
+                i = array.length;
+
+            if (!getKey) {
+                while (i--) {
+                    map[array[i]] = i+1;
+                }
+            } else if (typeof getKey == 'string') {
+                while (i--) {
+                    map[array[i][getKey]] = i+1;
+                }
+            } else {
+                while (i--) {
+                    map[getKey.call(scope, array[i])] = i+1;
+                }
+            }
+
+            return map;
+        },
+
+        /**
+         * Creates a map (object) keyed by a property of elements of the given array. The values in
+         * the map are the array element. For example:
+         * 
+         *      var map = Ext.Array.toMap(['a','b','c']);
+         *
+         *      // map = { a: 'a', b: 'b', c: 'c' };
+         * 
+         * Or a key property can be specified:
+         * 
+         *      var map = Ext.Array.toMap([
+         *              { name: 'a' },
+         *              { name: 'b' },
+         *              { name: 'c' }
+         *          ], 'name');
+         *
+         *      // map = { a: {name: 'a'}, b: {name: 'b'}, c: {name: 'c'} };
+         * 
+         * Lastly, a key extractor can be provided:
+         * 
+         *      var map = Ext.Array.toMap([
+         *              { name: 'a' },
+         *              { name: 'b' },
+         *              { name: 'c' }
+         *          ], function (obj) { return obj.name.toUpperCase(); });
+         *
+         *      // map = { A: {name: 'a'}, B: {name: 'b'}, C: {name: 'c'} };
+         *
+         * @param {Array} array The Array to create the map from.
+         * @param {String/Function} [getKey] Name of the object property to use
+         * as a key or a function to extract the key.
+         * @param {Object} [scope] Value of this inside callback.
+         * @return {Object} The resulting map.
+         */
+        toValueMap: function(array, getKey, scope) {
+            var map = {},
+                i = array.length;
+
+            if (!getKey) {
+                while (i--) {
+                    map[array[i]] = array[i];
+                }
+            } else if (typeof getKey == 'string') {
+                while (i--) {
+                    map[array[i][getKey]] = array[i];
+                }
+            } else {
+                while (i--) {
+                    map[getKey.call(scope, array[i])] = array[i];
+                }
+            }
+
+            return map;
+        },
+
+        _replaceSim: replaceSim, // for unit testing
+        _spliceSim: spliceSim,
+
+        /**
+         * Removes items from an array. This is functionally equivalent to the splice method
+         * of Array, but works around bugs in IE8's splice method and does not copy the
+         * removed elements in order to return them (because very often they are ignored).
+         *
+         * @param {Array} array The Array on which to replace.
+         * @param {Number} index The index in the array at which to operate.
+         * @param {Number} removeCount The number of items to remove at index.
+         * @return {Array} The array passed.
+         * @method
+         */
+        erase: erase,
+
+        /**
+         * Inserts items in to an array.
+         *
+         * @param {Array} array The Array in which to insert.
+         * @param {Number} index The index in the array at which to operate.
+         * @param {Array} items The array of items to insert at index.
+         * @return {Array} The array passed.
+         */
+        insert: function (array, index, items) {
+            return replace(array, index, 0, items);
+        },
+
+        /**
+         * Replaces items in an array. This is functionally equivalent to the splice method
+         * of Array, but works around bugs in IE8's splice method and is often more convenient
+         * to call because it accepts an array of items to insert rather than use a variadic
+         * argument list.
+         *
+         * @param {Array} array The Array on which to replace.
+         * @param {Number} index The index in the array at which to operate.
+         * @param {Number} removeCount The number of items to remove at index (can be 0).
+         * @param {Array} insert (optional) An array of items to insert at index.
+         * @return {Array} The array passed.
+         * @method
+         */
+        replace: replace,
+
+        /**
+         * Replaces items in an array. This is equivalent to the splice method of Array, but
+         * works around bugs in IE8's splice method. The signature is exactly the same as the
+         * splice method except that the array is the first argument. All arguments following
+         * removeCount are inserted in the array at index.
+         *
+         * @param {Array} array The Array on which to replace.
+         * @param {Number} index The index in the array at which to operate.
+         * @param {Number} removeCount The number of items to remove at index (can be 0).
+         * @param {Object...} elements The elements to add to the array. If you don't specify
+         * any elements, splice simply removes elements from the array.
+         * @return {Array} An array containing the removed items.
+         * @method
+         */
+        splice: splice,
+
+        /**
+         * Pushes new items onto the end of an Array.
+         *
+         * Passed parameters may be single items, or arrays of items. If an Array is found in the argument list, all its
+         * elements are pushed into the end of the target Array.
+         *
+         * @param {Array} target The Array onto which to push new items
+         * @param {Object...} elements The elements to add to the array. Each parameter may
+         * be an Array, in which case all the elements of that Array will be pushed into the end of the
+         * destination Array.
+         * @return {Array} An array containing all the new items push onto the end.
+         *
+         */
+        push: function(array) {
+            var len = arguments.length,
+                i = 1,
+                newItem;
+
+            if (array === undefined) {
+                array = [];
+            } else if (!Ext.isArray(array)) {
+                array = [array];
+            }
+            for (; i < len; i++) {
+                newItem = arguments[i];
+                Array.prototype.push[Ext.isIterable(newItem) ? 'apply' : 'call'](array, newItem);
+            }
+            return array;
+        }
+    };
+
+    /**
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#each
+     */
+    Ext.each = ExtArray.each;
+
+    /**
+     * @method
+     * @member Ext.Array
+     * @inheritdoc Ext.Array#merge
+     */
+    ExtArray.union = ExtArray.merge;
+
+    /**
+     * Old alias to {@link Ext.Array#min}
+     * @deprecated 4.0.0 Use {@link Ext.Array#min} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#min
+     */
+    Ext.min = ExtArray.min;
+
+    /**
+     * Old alias to {@link Ext.Array#max}
+     * @deprecated 4.0.0 Use {@link Ext.Array#max} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#max
+     */
+    Ext.max = ExtArray.max;
+
+    /**
+     * Old alias to {@link Ext.Array#sum}
+     * @deprecated 4.0.0 Use {@link Ext.Array#sum} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#sum
+     */
+    Ext.sum = ExtArray.sum;
+
+    /**
+     * Old alias to {@link Ext.Array#mean}
+     * @deprecated 4.0.0 Use {@link Ext.Array#mean} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#mean
+     */
+    Ext.mean = ExtArray.mean;
+
+    /**
+     * Old alias to {@link Ext.Array#flatten}
+     * @deprecated 4.0.0 Use {@link Ext.Array#flatten} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#flatten
+     */
+    Ext.flatten = ExtArray.flatten;
+
+    /**
+     * Old alias to {@link Ext.Array#clean}
+     * @deprecated 4.0.0 Use {@link Ext.Array#clean} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#clean
+     */
+    Ext.clean = ExtArray.clean;
+
+    /**
+     * Old alias to {@link Ext.Array#unique}
+     * @deprecated 4.0.0 Use {@link Ext.Array#unique} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#unique
+     */
+    Ext.unique = ExtArray.unique;
+
+    /**
+     * Old alias to {@link Ext.Array#pluck Ext.Array.pluck}
+     * @deprecated 4.0.0 Use {@link Ext.Array#pluck Ext.Array.pluck} instead
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#pluck
+     */
+    Ext.pluck = ExtArray.pluck;
+
+    /**
+     * @method
+     * @member Ext
+     * @inheritdoc Ext.Array#toArray
+     */
+    Ext.toArray = function() {
+        return ExtArray.toArray.apply(ExtArray, arguments);
+    };
+}());
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require Array.js
+// @define Ext.Function
+
+/**
+ * @class Ext.Function
+ *
+ * A collection of useful static methods to deal with function callbacks
+ * @singleton
+ * @alternateClassName Ext.util.Functions
+ */
+Ext.Function = {
+
+    /**
+     * A very commonly used method throughout the framework. It acts as a wrapper around another method
+     * which originally accepts 2 arguments for `name` and `value`.
+     * The wrapped function then allows "flexible" value setting of either:
+     *
+     * - `name` and `value` as 2 arguments
+     * - one single object argument with multiple key - value pairs
+     *
+     * For example:
+     *
+     *     var setValue = Ext.Function.flexSetter(function(name, value) {
+     *         this[name] = value;
+     *     });
+     *
+     *     // Afterwards
+     *     // Setting a single name - value
+     *     setValue('name1', 'value1');
+     *
+     *     // Settings multiple name - value pairs
+     *     setValue({
+     *         name1: 'value1',
+     *         name2: 'value2',
+     *         name3: 'value3'
+     *     });
+     *
+     * @param {Function} setter
+     * @returns {Function} flexSetter
+     */
+    flexSetter: function(fn) {
+        return function(a, b) {
+            var k, i;
+
+            if (a === null) {
+                return this;
+            }
+
+            if (typeof a !== 'string') {
+                for (k in a) {
+                    if (a.hasOwnProperty(k)) {
+                        fn.call(this, k, a[k]);
+                    }
+                }
+
+                if (Ext.enumerables) {
+                    for (i = Ext.enumerables.length; i--;) {
+                        k = Ext.enumerables[i];
+                        if (a.hasOwnProperty(k)) {
+                            fn.call(this, k, a[k]);
+                        }
+                    }
+                }
+            } else {
+                fn.call(this, a, b);
+            }
+
+            return this;
+        };
+    },
+
+    /**
+     * Create a new function from the provided `fn`, change `this` to the provided scope, optionally
+     * overrides arguments for the call. (Defaults to the arguments passed by the caller)
+     *
+     * {@link Ext#bind Ext.bind} is alias for {@link Ext.Function#bind Ext.Function.bind}
+     *
+     * @param {Function} fn The function to delegate.
+     * @param {Object} scope (optional) The scope (`this` reference) in which the function is executed.
+     * **If omitted, defaults to the default global environment object (usually the browser window).**
+     * @param {Array} args (optional) Overrides arguments for the call. (Defaults to the arguments passed by the caller)
+     * @param {Boolean/Number} appendArgs (optional) if True args are appended to call args instead of overriding,
+     * if a number the args are inserted at the specified position
+     * @return {Function} The new function
+     */
+    bind: function(fn, scope, args, appendArgs) {
+        if (arguments.length === 2) {
+            return function() {
+                return fn.apply(scope, arguments);
+            };
+        }
+
+        var method = fn,
+            slice = Array.prototype.slice;
+
+        return function() {
+            var callArgs = args || arguments;
+
+            if (appendArgs === true) {
+                callArgs = slice.call(arguments, 0);
+                callArgs = callArgs.concat(args);
+            }
+            else if (typeof appendArgs == 'number') {
+                callArgs = slice.call(arguments, 0); // copy arguments first
+                Ext.Array.insert(callArgs, appendArgs, args);
+            }
+
+            return method.apply(scope || Ext.global, callArgs);
+        };
+    },
+
+    /**
+     * Create a new function from the provided `fn`, the arguments of which are pre-set to `args`.
+     * New arguments passed to the newly created callback when it's invoked are appended after the pre-set ones.
+     * This is especially useful when creating callbacks.
+     *
+     * For example:
+     *
+     *     var originalFunction = function(){
+     *         alert(Ext.Array.from(arguments).join(' '));
+     *     };
+     *
+     *     var callback = Ext.Function.pass(originalFunction, ['Hello', 'World']);
+     *
+     *     callback(); // alerts 'Hello World'
+     *     callback('by Me'); // alerts 'Hello World by Me'
+     *
+     * {@link Ext#pass Ext.pass} is alias for {@link Ext.Function#pass Ext.Function.pass}
+     *
+     * @param {Function} fn The original function
+     * @param {Array} args The arguments to pass to new callback
+     * @param {Object} scope (optional) The scope (`this` reference) in which the function is executed.
+     * @return {Function} The new callback function
+     */
+    pass: function(fn, args, scope) {
+        if (!Ext.isArray(args)) {
+            if (Ext.isIterable(args)) {
+                args = Ext.Array.clone(args);
+            } else {
+                args = args !== undefined ? [args] : [];
+            }
+        }
+
+        return function() {
+            var fnArgs = [].concat(args);
+            fnArgs.push.apply(fnArgs, arguments);
+            return fn.apply(scope || this, fnArgs);
+        };
+    },
+
+    /**
+     * Create an alias to the provided method property with name `methodName` of `object`.
+     * Note that the execution scope will still be bound to the provided `object` itself.
+     *
+     * @param {Object/Function} object
+     * @param {String} methodName
+     * @return {Function} aliasFn
+     */
+    alias: function(object, methodName) {
+        return function() {
+            return object[methodName].apply(object, arguments);
+        };
+    },
+
+    /**
+     * Create a "clone" of the provided method. The returned method will call the given
+     * method passing along all arguments and the "this" pointer and return its result.
+     *
+     * @param {Function} method
+     * @return {Function} cloneFn
+     */
+    clone: function(method) {
+        return function() {
+            return method.apply(this, arguments);
+        };
+    },
+
+    /**
+     * Creates an interceptor function. The passed function is called before the original one. If it returns false,
+     * the original one is not called. The resulting function returns the results of the original function.
+     * The passed function is called with the parameters of the original function. Example usage:
+     *
+     *     var sayHi = function(name){
+     *         alert('Hi, ' + name);
+     *     }
+     *
+     *     sayHi('Fred'); // alerts "Hi, Fred"
+     *
+     *     // create a new function that validates input without
+     *     // directly modifying the original function:
+     *     var sayHiToFriend = Ext.Function.createInterceptor(sayHi, function(name){
+     *         return name == 'Brian';
+     *     });
+     *
+     *     sayHiToFriend('Fred');  // no alert
+     *     sayHiToFriend('Brian'); // alerts "Hi, Brian"
+     *
+     * @param {Function} origFn The original function.
+     * @param {Function} newFn The function to call before the original
+     * @param {Object} [scope] The scope (`this` reference) in which the passed function is executed.
+     * **If omitted, defaults to the scope in which the original function is called or the browser window.**
+     * @param {Object} [returnValue=null] The value to return if the passed function return false.
+     * @return {Function} The new function
+     */
+    createInterceptor: function(origFn, newFn, scope, returnValue) {
+        var method = origFn;
+        if (!Ext.isFunction(newFn)) {
+            return origFn;
+        } else {
+            returnValue = Ext.isDefined(returnValue) ? returnValue : null;
+            return function() {
+                var me = this,
+                    args = arguments;
+                    
+                newFn.target = me;
+                newFn.method = origFn;
+                return (newFn.apply(scope || me || Ext.global, args) !== false) ? origFn.apply(me || Ext.global, args) : returnValue;
+            };
+        }
+    },
+
+    /**
+     * Creates a delegate (callback) which, when called, executes after a specific delay.
+     *
+     * @param {Function} fn The function which will be called on a delay when the returned function is called.
+     * Optionally, a replacement (or additional) argument list may be specified.
+     * @param {Number} delay The number of milliseconds to defer execution by whenever called.
+     * @param {Object} scope (optional) The scope (`this` reference) used by the function at execution time.
+     * @param {Array} args (optional) Override arguments for the call. (Defaults to the arguments passed by the caller)
+     * @param {Boolean/Number} appendArgs (optional) if True args are appended to call args instead of overriding,
+     * if a number the args are inserted at the specified position.
+     * @return {Function} A function which, when called, executes the original function after the specified delay.
+     */
+    createDelayed: function(fn, delay, scope, args, appendArgs) {
+        if (scope || args) {
+            fn = Ext.Function.bind(fn, scope, args, appendArgs);
+        }
+
+        return function() {
+            var me = this,
+                args = Array.prototype.slice.call(arguments);
+
+            setTimeout(function() {
+                fn.apply(me, args);
+            }, delay);
+        };
+    },
+
+    /**
+     * Calls this function after the number of millseconds specified, optionally in a specific scope. Example usage:
+     *
+     *     var sayHi = function(name){
+     *         alert('Hi, ' + name);
+     *     }
+     *
+     *     // executes immediately:
+     *     sayHi('Fred');
+     *
+     *     // executes after 2 seconds:
+     *     Ext.Function.defer(sayHi, 2000, this, ['Fred']);
+     *
+     *     // this syntax is sometimes useful for deferring
+     *     // execution of an anonymous function:
+     *     Ext.Function.defer(function(){
+     *         alert('Anonymous');
+     *     }, 100);
+     *
+     * {@link Ext#defer Ext.defer} is alias for {@link Ext.Function#defer Ext.Function.defer}
+     *
+     * @param {Function} fn The function to defer.
+     * @param {Number} millis The number of milliseconds for the setTimeout call
+     * (if less than or equal to 0 the function is executed immediately)
+     * @param {Object} scope (optional) The scope (`this` reference) in which the function is executed.
+     * **If omitted, defaults to the browser window.**
+     * @param {Array} args (optional) Overrides arguments for the call. (Defaults to the arguments passed by the caller)
+     * @param {Boolean/Number} appendArgs (optional) if True args are appended to call args instead of overriding,
+     * if a number the args are inserted at the specified position
+     * @return {Number} The timeout id that can be used with clearTimeout
+     */
+    defer: function(fn, millis, scope, args, appendArgs) {
+        fn = Ext.Function.bind(fn, scope, args, appendArgs);
+        if (millis > 0) {
+            return setTimeout(Ext.supports.TimeoutActualLateness ? function () {
+                fn();
+            } : fn, millis);
+        }
+        fn();
+        return 0;
+    },
+
+    /**
+     * Create a combined function call sequence of the original function + the passed function.
+     * The resulting function returns the results of the original function.
+     * The passed function is called with the parameters of the original function. Example usage:
+     *
+     *     var sayHi = function(name){
+     *         alert('Hi, ' + name);
+     *     }
+     *
+     *     sayHi('Fred'); // alerts "Hi, Fred"
+     *
+     *     var sayGoodbye = Ext.Function.createSequence(sayHi, function(name){
+     *         alert('Bye, ' + name);
+     *     });
+     *
+     *     sayGoodbye('Fred'); // both alerts show
+     *
+     * @param {Function} originalFn The original function.
+     * @param {Function} newFn The function to sequence
+     * @param {Object} scope (optional) The scope (`this` reference) in which the passed function is executed.
+     * If omitted, defaults to the scope in which the original function is called or the default global environment object (usually the browser window).
+     * @return {Function} The new function
+     */
+    createSequence: function(originalFn, newFn, scope) {
+        if (!newFn) {
+            return originalFn;
+        }
+        else {
+            return function() {
+                var result = originalFn.apply(this, arguments);
+                newFn.apply(scope || this, arguments);
+                return result;
+            };
+        }
+    },
+
+    /**
+     * Creates a delegate function, optionally with a bound scope which, when called, buffers
+     * the execution of the passed function for the configured number of milliseconds.
+     * If called again within that period, the impending invocation will be canceled, and the
+     * timeout period will begin again.
+     *
+     * @param {Function} fn The function to invoke on a buffered timer.
+     * @param {Number} buffer The number of milliseconds by which to buffer the invocation of the
+     * function.
+     * @param {Object} scope (optional) The scope (`this` reference) in which
+     * the passed function is executed. If omitted, defaults to the scope specified by the caller.
+     * @param {Array} args (optional) Override arguments for the call. Defaults to the arguments
+     * passed by the caller.
+     * @return {Function} A function which invokes the passed function after buffering for the specified time.
+     */
+    createBuffered: function(fn, buffer, scope, args) {
+        var timerId;
+
+        return function() {
+            var callArgs = args || Array.prototype.slice.call(arguments, 0),
+                me = scope || this;
+
+            if (timerId) {
+                clearTimeout(timerId);
+            }
+
+            timerId = setTimeout(function(){
+                fn.apply(me, callArgs);
+            }, buffer);
+        };
+    },
+
+    /**
+     * Creates a throttled version of the passed function which, when called repeatedly and
+     * rapidly, invokes the passed function only after a certain interval has elapsed since the
+     * previous invocation.
+     *
+     * This is useful for wrapping functions which may be called repeatedly, such as
+     * a handler of a mouse move event when the processing is expensive.
+     *
+     * @param {Function} fn The function to execute at a regular time interval.
+     * @param {Number} interval The interval **in milliseconds** on which the passed function is executed.
+     * @param {Object} scope (optional) The scope (`this` reference) in which
+     * the passed function is executed. If omitted, defaults to the scope specified by the caller.
+     * @returns {Function} A function which invokes the passed function at the specified interval.
+     */
+    createThrottled: function(fn, interval, scope) {
+        var lastCallTime, elapsed, lastArgs, timer, execute = function() {
+            fn.apply(scope || this, lastArgs);
+            lastCallTime = Ext.Date.now();
+        };
+
+        return function() {
+            elapsed = Ext.Date.now() - lastCallTime;
+            lastArgs = arguments;
+
+            clearTimeout(timer);
+            if (!lastCallTime || (elapsed >= interval)) {
+                execute();
+            } else {
+                timer = setTimeout(execute, interval - elapsed);
+            }
+        };
+    },
+
+
+    /**
+     * Adds behavior to an existing method that is executed before the
+     * original behavior of the function.  For example:
+     * 
+     *     var soup = {
+     *         contents: [],
+     *         add: function(ingredient) {
+     *             this.contents.push(ingredient);
+     *         }
+     *     };
+     *     Ext.Function.interceptBefore(soup, "add", function(ingredient){
+     *         if (!this.contents.length && ingredient !== "water") {
+     *             // Always add water to start with
+     *             this.contents.push("water");
+     *         }
+     *     });
+     *     soup.add("onions");
+     *     soup.add("salt");
+     *     soup.contents; // will contain: water, onions, salt
+     * 
+     * @param {Object} object The target object
+     * @param {String} methodName Name of the method to override
+     * @param {Function} fn Function with the new behavior.  It will
+     * be called with the same arguments as the original method.  The
+     * return value of this function will be the return value of the
+     * new method.
+     * @param {Object} [scope] The scope to execute the interceptor function. Defaults to the object.
+     * @return {Function} The new function just created.
+     */
+    interceptBefore: function(object, methodName, fn, scope) {
+        var method = object[methodName] || Ext.emptyFn;
+
+        return (object[methodName] = function() {
+            var ret = fn.apply(scope || this, arguments);
+            method.apply(this, arguments);
+
+            return ret;
+        });
+    },
+
+    /**
+     * Adds behavior to an existing method that is executed after the
+     * original behavior of the function.  For example:
+     * 
+     *     var soup = {
+     *         contents: [],
+     *         add: function(ingredient) {
+     *             this.contents.push(ingredient);
+     *         }
+     *     };
+     *     Ext.Function.interceptAfter(soup, "add", function(ingredient){
+     *         // Always add a bit of extra salt
+     *         this.contents.push("salt");
+     *     });
+     *     soup.add("water");
+     *     soup.add("onions");
+     *     soup.contents; // will contain: water, salt, onions, salt
+     * 
+     * @param {Object} object The target object
+     * @param {String} methodName Name of the method to override
+     * @param {Function} fn Function with the new behavior.  It will
+     * be called with the same arguments as the original method.  The
+     * return value of this function will be the return value of the
+     * new method.
+     * @param {Object} [scope] The scope to execute the interceptor function. Defaults to the object.
+     * @return {Function} The new function just created.
+     */
+    interceptAfter: function(object, methodName, fn, scope) {
+        var method = object[methodName] || Ext.emptyFn;
+
+        return (object[methodName] = function() {
+            method.apply(this, arguments);
+            return fn.apply(scope || this, arguments);
+        });
+    }
+};
+
+/**
+ * @method
+ * @member Ext
+ * @inheritdoc Ext.Function#defer
+ */
+Ext.defer = Ext.Function.alias(Ext.Function, 'defer');
+
+/**
+ * @method
+ * @member Ext
+ * @inheritdoc Ext.Function#pass
+ */
+Ext.pass = Ext.Function.alias(Ext.Function, 'pass');
+
+/**
+ * @method
+ * @member Ext
+ * @inheritdoc Ext.Function#bind
+ */
+Ext.bind = Ext.Function.alias(Ext.Function, 'bind');
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require Function.js
+// @define Ext.Object
+
+/**
+ * @class Ext.Object
+ *
+ * A collection of useful static methods to deal with objects.
+ *
+ * @singleton
+ */
+
+(function() {
+
+// The "constructor" for chain:
+var TemplateClass = function(){},
+    ExtObject = Ext.Object = {
+
+    /**
+     * Returns a new object with the given object as the prototype chain. This method is
+     * designed to mimic the ECMA standard `Object.create` method and is assigned to that
+     * function when it is available.
+     * 
+     * **NOTE** This method does not support the property definitions capability of the
+     * `Object.create` method. Only the first argument is supported.
+     * 
+     * @param {Object} object The prototype chain for the new object.
+     */
+    chain: Object.create || function (object) {
+        TemplateClass.prototype = object;
+        var result = new TemplateClass();
+        TemplateClass.prototype = null;
+        return result;
+    },
+
+    /**
+     * Converts a `name` - `value` pair to an array of objects with support for nested structures. Useful to construct
+     * query strings. For example:
+     *
+     *     var objects = Ext.Object.toQueryObjects('hobbies', ['reading', 'cooking', 'swimming']);
+     *
+     *     // objects then equals:
+     *     [
+     *         { name: 'hobbies', value: 'reading' },
+     *         { name: 'hobbies', value: 'cooking' },
+     *         { name: 'hobbies', value: 'swimming' },
+     *     ];
+     *
+     *     var objects = Ext.Object.toQueryObjects('dateOfBirth', {
+     *         day: 3,
+     *         month: 8,
+     *         year: 1987,
+     *         extra: {
+     *             hour: 4
+     *             minute: 30
+     *         }
+     *     }, true); // Recursive
+     *
+     *     // objects then equals:
+     *     [
+     *         { name: 'dateOfBirth[day]', value: 3 },
+     *         { name: 'dateOfBirth[month]', value: 8 },
+     *         { name: 'dateOfBirth[year]', value: 1987 },
+     *         { name: 'dateOfBirth[extra][hour]', value: 4 },
+     *         { name: 'dateOfBirth[extra][minute]', value: 30 },
+     *     ];
+     *
+     * @param {String} name
+     * @param {Object/Array} value
+     * @param {Boolean} [recursive=false] True to traverse object recursively
+     * @return {Array}
+     */
+    toQueryObjects: function(name, value, recursive) {
+        var self = ExtObject.toQueryObjects,
+            objects = [],
+            i, ln;
+
+        if (Ext.isArray(value)) {
+            for (i = 0, ln = value.length; i < ln; i++) {
+                if (recursive) {
+                    objects = objects.concat(self(name + '[' + i + ']', value[i], true));
+                }
+                else {
+                    objects.push({
+                        name: name,
+                        value: value[i]
+                    });
+                }
+            }
+        }
+        else if (Ext.isObject(value)) {
+            for (i in value) {
+                if (value.hasOwnProperty(i)) {
+                    if (recursive) {
+                        objects = objects.concat(self(name + '[' + i + ']', value[i], true));
+                    }
+                    else {
+                        objects.push({
+                            name: name,
+                            value: value[i]
+                        });
+                    }
+                }
+            }
+        }
+        else {
+            objects.push({
+                name: name,
+                value: value
+            });
+        }
+
+        return objects;
+    },
+
+    /**
+     * Takes an object and converts it to an encoded query string.
+     *
+     * Non-recursive:
+     *
+     *     Ext.Object.toQueryString({foo: 1, bar: 2}); // returns "foo=1&bar=2"
+     *     Ext.Object.toQueryString({foo: null, bar: 2}); // returns "foo=&bar=2"
+     *     Ext.Object.toQueryString({'some price': '$300'}); // returns "some%20price=%24300"
+     *     Ext.Object.toQueryString({date: new Date(2011, 0, 1)}); // returns "date=%222011-01-01T00%3A00%3A00%22"
+     *     Ext.Object.toQueryString({colors: ['red', 'green', 'blue']}); // returns "colors=red&colors=green&colors=blue"
+     *
+     * Recursive:
+     *
+     *     Ext.Object.toQueryString({
+     *         username: 'Jacky',
+     *         dateOfBirth: {
+     *             day: 1,
+     *             month: 2,
+     *             year: 1911
+     *         },
+     *         hobbies: ['coding', 'eating', 'sleeping', ['nested', 'stuff']]
+     *     }, true); // returns the following string (broken down and url-decoded for ease of reading purpose):
+     *     // username=Jacky
+     *     //    &dateOfBirth[day]=1&dateOfBirth[month]=2&dateOfBirth[year]=1911
+     *     //    &hobbies[0]=coding&hobbies[1]=eating&hobbies[2]=sleeping&hobbies[3][0]=nested&hobbies[3][1]=stuff
+     *
+     * @param {Object} object The object to encode
+     * @param {Boolean} [recursive=false] Whether or not to interpret the object in recursive format.
+     * (PHP / Ruby on Rails servers and similar).
+     * @return {String} queryString
+     */
+    toQueryString: function(object, recursive) {
+        var paramObjects = [],
+            params = [],
+            i, j, ln, paramObject, value;
+
+        for (i in object) {
+            if (object.hasOwnProperty(i)) {
+                paramObjects = paramObjects.concat(ExtObject.toQueryObjects(i, object[i], recursive));
+            }
+        }
+
+        for (j = 0, ln = paramObjects.length; j < ln; j++) {
+            paramObject = paramObjects[j];
+            value = paramObject.value;
+
+            if (Ext.isEmpty(value)) {
+                value = '';
+            } else if (Ext.isDate(value)) {
+                value = Ext.Date.toString(value);
+            }
+
+            params.push(encodeURIComponent(paramObject.name) + '=' + encodeURIComponent(String(value)));
+        }
+
+        return params.join('&');
+    },
+
+    /**
+     * Converts a query string back into an object.
+     *
+     * Non-recursive:
+     *
+     *     Ext.Object.fromQueryString("foo=1&bar=2"); // returns {foo: '1', bar: '2'}
+     *     Ext.Object.fromQueryString("foo=&bar=2"); // returns {foo: null, bar: '2'}
+     *     Ext.Object.fromQueryString("some%20price=%24300"); // returns {'some price': '$300'}
+     *     Ext.Object.fromQueryString("colors=red&colors=green&colors=blue"); // returns {colors: ['red', 'green', 'blue']}
+     *
+     * Recursive:
+     *
+     *     Ext.Object.fromQueryString(
+     *         "username=Jacky&"+
+     *         "dateOfBirth[day]=1&dateOfBirth[month]=2&dateOfBirth[year]=1911&"+
+     *         "hobbies[0]=coding&hobbies[1]=eating&hobbies[2]=sleeping&"+
+     *         "hobbies[3][0]=nested&hobbies[3][1]=stuff", true);
+     *
+     *     // returns
+     *     {
+     *         username: 'Jacky',
+     *         dateOfBirth: {
+     *             day: '1',
+     *             month: '2',
+     *             year: '1911'
+     *         },
+     *         hobbies: ['coding', 'eating', 'sleeping', ['nested', 'stuff']]
+     *     }
+     *
+     * @param {String} queryString The query string to decode
+     * @param {Boolean} [recursive=false] Whether or not to recursively decode the string. This format is supported by
+     * PHP / Ruby on Rails servers and similar.
+     * @return {Object}
+     */
+    fromQueryString: function(queryString, recursive) {
+        var parts = queryString.replace(/^\?/, '').split('&'),
+            object = {},
+            temp, components, name, value, i, ln,
+            part, j, subLn, matchedKeys, matchedName,
+            keys, key, nextKey;
+
+        for (i = 0, ln = parts.length; i < ln; i++) {
+            part = parts[i];
+
+            if (part.length > 0) {
+                components = part.split('=');
+                name = decodeURIComponent(components[0]);
+                value = (components[1] !== undefined) ? decodeURIComponent(components[1]) : '';
+
+                if (!recursive) {
+                    if (object.hasOwnProperty(name)) {
+                        if (!Ext.isArray(object[name])) {
+                            object[name] = [object[name]];
+                        }
+
+                        object[name].push(value);
+                    }
+                    else {
+                        object[name] = value;
+                    }
+                }
+                else {
+                    matchedKeys = name.match(/(\[):?([^\]]*)\]/g);
+                    matchedName = name.match(/^([^\[]+)/);
+
+                    if (!matchedName) {
+                        throw new Error('[Ext.Object.fromQueryString] Malformed query string given, failed parsing name from "' + part + '"');
+                    }
+
+                    name = matchedName[0];
+                    keys = [];
+
+                    if (matchedKeys === null) {
+                        object[name] = value;
+                        continue;
+                    }
+
+                    for (j = 0, subLn = matchedKeys.length; j < subLn; j++) {
+                        key = matchedKeys[j];
+                        key = (key.length === 2) ? '' : key.substring(1, key.length - 1);
+                        keys.push(key);
+                    }
+
+                    keys.unshift(name);
+
+                    temp = object;
+
+                    for (j = 0, subLn = keys.length; j < subLn; j++) {
+                        key = keys[j];
+
+                        if (j === subLn - 1) {
+                            if (Ext.isArray(temp) && key === '') {
+                                temp.push(value);
+                            }
+                            else {
+                                temp[key] = value;
+                            }
+                        }
+                        else {
+                            if (temp[key] === undefined || typeof temp[key] === 'string') {
+                                nextKey = keys[j+1];
+
+                                temp[key] = (Ext.isNumeric(nextKey) || nextKey === '') ? [] : {};
+                            }
+
+                            temp = temp[key];
+                        }
+                    }
+                }
+            }
+        }
+
+        return object;
+    },
+
+    /**
+     * Iterates through an object and invokes the given callback function for each iteration.
+     * The iteration can be stopped by returning `false` in the callback function. For example:
+     *
+     *     var person = {
+     *         name: 'Jacky'
+     *         hairColor: 'black'
+     *         loves: ['food', 'sleeping', 'wife']
+     *     };
+     *
+     *     Ext.Object.each(person, function(key, value, myself) {
+     *         console.log(key + ":" + value);
+     *
+     *         if (key === 'hairColor') {
+     *             return false; // stop the iteration
+     *         }
+     *     });
+     *
+     * @param {Object} object The object to iterate
+     * @param {Function} fn The callback function.
+     * @param {String} fn.key
+     * @param {Object} fn.value
+     * @param {Object} fn.object The object itself
+     * @param {Object} [scope] The execution scope (`this`) of the callback function
+     */
+    each: function(object, fn, scope) {
+        for (var property in object) {
+            if (object.hasOwnProperty(property)) {
+                if (fn.call(scope || object, property, object[property], object) === false) {
+                    return;
+                }
+            }
+        }
+    },
+
+    /**
+     * Merges any number of objects recursively without referencing them or their children.
+     *
+     *     var extjs = {
+     *         companyName: 'Ext JS',
+     *         products: ['Ext JS', 'Ext GWT', 'Ext Designer'],
+     *         isSuperCool: true,
+     *         office: {
+     *             size: 2000,
+     *             location: 'Palo Alto',
+     *             isFun: true
+     *         }
+     *     };
+     *
+     *     var newStuff = {
+     *         companyName: 'Sencha Inc.',
+     *         products: ['Ext JS', 'Ext GWT', 'Ext Designer', 'Sencha Touch', 'Sencha Animator'],
+     *         office: {
+     *             size: 40000,
+     *             location: 'Redwood City'
+     *         }
+     *     };
+     *
+     *     var sencha = Ext.Object.merge(extjs, newStuff);
+     *
+     *     // extjs and sencha then equals to
+     *     {
+     *         companyName: 'Sencha Inc.',
+     *         products: ['Ext JS', 'Ext GWT', 'Ext Designer', 'Sencha Touch', 'Sencha Animator'],
+     *         isSuperCool: true,
+     *         office: {
+     *             size: 40000,
+     *             location: 'Redwood City',
+     *             isFun: true
+     *         }
+     *     }
+     *
+     * @param {Object} destination The object into which all subsequent objects are merged.
+     * @param {Object...} object Any number of objects to merge into the destination.
+     * @return {Object} merged The destination object with all passed objects merged in.
+     */
+    merge: function(destination) {
+        var i = 1,
+            ln = arguments.length,
+            mergeFn = ExtObject.merge,
+            cloneFn = Ext.clone,
+            object, key, value, sourceKey;
+
+        for (; i < ln; i++) {
+            object = arguments[i];
+
+            for (key in object) {
+                value = object[key];
+                if (value && value.constructor === Object) {
+                    sourceKey = destination[key];
+                    if (sourceKey && sourceKey.constructor === Object) {
+                        mergeFn(sourceKey, value);
+                    }
+                    else {
+                        destination[key] = cloneFn(value);
+                    }
+                }
+                else {
+                    destination[key] = value;
+                }
+            }
+        }
+
+        return destination;
+    },
+
+    /**
+     * @private
+     * @param destination
+     */
+    mergeIf: function(destination) {
+        var i = 1,
+            ln = arguments.length,
+            cloneFn = Ext.clone,
+            object, key, value;
+
+        for (; i < ln; i++) {
+            object = arguments[i];
+
+            for (key in object) {
+                if (!(key in destination)) {
+                    value = object[key];
+
+                    if (value && value.constructor === Object) {
+                        destination[key] = cloneFn(value);
+                    }
+                    else {
+                        destination[key] = value;
+                    }
+                }
+            }
+        }
+
+        return destination;
+    },
+
+    /**
+     * Returns the first matching key corresponding to the given value.
+     * If no matching value is found, null is returned.
+     *
+     *     var person = {
+     *         name: 'Jacky',
+     *         loves: 'food'
+     *     };
+     *
+     *     alert(Ext.Object.getKey(person, 'food')); // alerts 'loves'
+     *
+     * @param {Object} object
+     * @param {Object} value The value to find
+     */
+    getKey: function(object, value) {
+        for (var property in object) {
+            if (object.hasOwnProperty(property) && object[property] === value) {
+                return property;
+            }
+        }
+
+        return null;
+    },
+
+    /**
+     * Gets all values of the given object as an array.
+     *
+     *     var values = Ext.Object.getValues({
+     *         name: 'Jacky',
+     *         loves: 'food'
+     *     }); // ['Jacky', 'food']
+     *
+     * @param {Object} object
+     * @return {Array} An array of values from the object
+     */
+    getValues: function(object) {
+        var values = [],
+            property;
+
+        for (property in object) {
+            if (object.hasOwnProperty(property)) {
+                values.push(object[property]);
+            }
+        }
+
+        return values;
+    },
+
+    /**
+     * Gets all keys of the given object as an array.
+     *
+     *     var values = Ext.Object.getKeys({
+     *         name: 'Jacky',
+     *         loves: 'food'
+     *     }); // ['name', 'loves']
+     *
+     * @param {Object} object
+     * @return {String[]} An array of keys from the object
+     * @method
+     */
+    getKeys: (typeof Object.keys == 'function')
+        ? function(object){
+            if (!object) {
+                return [];
+            }
+            return Object.keys(object);
+        }
+        : function(object) {
+            var keys = [],
+                property;
+
+            for (property in object) {
+                if (object.hasOwnProperty(property)) {
+                    keys.push(property);
+                }
+            }
+
+            return keys;
+        },
+
+    /**
+     * Gets the total number of this object's own properties
+     *
+     *     var size = Ext.Object.getSize({
+     *         name: 'Jacky',
+     *         loves: 'food'
+     *     }); // size equals 2
+     *
+     * @param {Object} object
+     * @return {Number} size
+     */
+    getSize: function(object) {
+        var size = 0,
+            property;
+
+        for (property in object) {
+            if (object.hasOwnProperty(property)) {
+                size++;
+            }
+        }
+
+        return size;
+    },
+    
+    /**
+     * Checks if there are any properties on this object.
+     * @param {Object} object
+     * @return {Boolean} `true` if there no properties on the object.
+     */
+    isEmpty: function(object){
+        for (var key in object) {
+            if (object.hasOwnProperty(key)) {
+                return false;
+            }
+        }
+        return true;    
+    },
+    
+    /**
+     * Shallow compares the contents of 2 objects using strict equality. Objects are
+     * considered equal if they both have the same set of properties and the
+     * value for those properties equals the other in the corresponding object.
+     * 
+     *     // Returns true
+     *     Ext.Object.equals({
+     *         foo: 1,
+     *         bar: 2
+     *     }, {
+     *         foo: 1,
+     *         bar: 2
+     *     });
+     * 
+     * @param {Object} object1
+     * @param {Object} object2
+     * @return {Boolean} `true` if the objects are equal.
+     */
+    equals: (function() {
+        var check = function(o1, o2) {
+            var key;
+        
+            for (key in o1) {
+                if (o1.hasOwnProperty(key)) {
+                    if (o1[key] !== o2[key]) {
+                        return false;
+                    }    
+                }
+            }    
+            return true;
+        };
+        
+        return function(object1, object2) {
+            
+            // Short circuit if the same object is passed twice
+            if (object1 === object2) {
+                return true;
+            } if (object1 && object2) {
+                // Do the second check because we could have extra keys in
+                // object2 that don't exist in object1.
+                return check(object1, object2) && check(object2, object1);  
+            } else if (!object1 && !object2) {
+                return object1 === object2;
+            } else {
+                return false;
+            }
+        };
+    })(),
+
+    /**
+     * @private
+     */
+    classify: function(object) {
+        var prototype = object,
+            objectProperties = [],
+            propertyClassesMap = {},
+            objectClass = function() {
+                var i = 0,
+                    ln = objectProperties.length,
+                    property;
+
+                for (; i < ln; i++) {
+                    property = objectProperties[i];
+                    this[property] = new propertyClassesMap[property]();
+                }
+            },
+            key, value;
+
+        for (key in object) {
+            if (object.hasOwnProperty(key)) {
+                value = object[key];
+
+                if (value && value.constructor === Object) {
+                    objectProperties.push(key);
+                    propertyClassesMap[key] = ExtObject.classify(value);
+                }
+            }
+        }
+
+        objectClass.prototype = prototype;
+
+        return objectClass;
+    }
+};
+
+/**
+ * A convenient alias method for {@link Ext.Object#merge}.
+ *
+ * @member Ext
+ * @method merge
+ * @inheritdoc Ext.Object#merge
+ */
+Ext.merge = Ext.Object.merge;
+
+/**
+ * @private
+ * @member Ext
+ */
+Ext.mergeIf = Ext.Object.mergeIf;
+
+/**
+ *
+ * @member Ext
+ * @method urlEncode
+ * @inheritdoc Ext.Object#toQueryString
+ * @deprecated 4.0.0 Use {@link Ext.Object#toQueryString} instead
+ */
+Ext.urlEncode = function() {
+    var args = Ext.Array.from(arguments),
+        prefix = '';
+
+    // Support for the old `pre` argument
+    if ((typeof args[1] === 'string')) {
+        prefix = args[1] + '&';
+        args[1] = false;
+    }
+
+    return prefix + ExtObject.toQueryString.apply(ExtObject, args);
+};
+
+/**
+ * Alias for {@link Ext.Object#fromQueryString}.
+ *
+ * @member Ext
+ * @method urlDecode
+ * @inheritdoc Ext.Object#fromQueryString
+ * @deprecated 4.0.0 Use {@link Ext.Object#fromQueryString} instead
+ */
+Ext.urlDecode = function() {
+    return ExtObject.fromQueryString.apply(ExtObject, arguments);
+};
+
+}());
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require Object.js
+// @define Ext.Date
+
+/**
+ * @class Ext.Date
+ * A set of useful static methods to deal with date
+ * Note that if Ext.Date is required and loaded, it will copy all methods / properties to
+ * this object for convenience
+ *
+ * The date parsing and formatting syntax contains a subset of
+ * [PHP's `date()` function](http://www.php.net/date), and the formats that are
+ * supported will provide results equivalent to their PHP versions.
+ *
+ * The following is a list of all currently supported formats:
+ * <pre class="">
+Format      Description                                                               Example returned values
+------      -----------------------------------------------------------------------   -----------------------
+  d         Day of the month, 2 digits with leading zeros                             01 to 31
+  D         A short textual representation of the day of the week                     Mon to Sun
+  j         Day of the month without leading zeros                                    1 to 31
+  l         A full textual representation of the day of the week                      Sunday to Saturday
+  N         ISO-8601 numeric representation of the day of the week                    1 (for Monday) through 7 (for Sunday)
+  S         English ordinal suffix for the day of the month, 2 characters             st, nd, rd or th. Works well with j
+  w         Numeric representation of the day of the week                             0 (for Sunday) to 6 (for Saturday)
+  z         The day of the year (starting from 0)                                     0 to 364 (365 in leap years)
+  W         ISO-8601 week number of year, weeks starting on Monday                    01 to 53
+  F         A full textual representation of a month, such as January or March        January to December
+  m         Numeric representation of a month, with leading zeros                     01 to 12
+  M         A short textual representation of a month                                 Jan to Dec
+  n         Numeric representation of a month, without leading zeros                  1 to 12
+  t         Number of days in the given month                                         28 to 31
+  L         Whether it's a leap year                                                  1 if it is a leap year, 0 otherwise.
+  o         ISO-8601 year number (identical to (Y), but if the ISO week number (W)    Examples: 1998 or 2004
+            belongs to the previous or next year, that year is used instead)
+  Y         A full numeric representation of a year, 4 digits                         Examples: 1999 or 2003
+  y         A two digit representation of a year                                      Examples: 99 or 03
+  a         Lowercase Ante meridiem and Post meridiem                                 am or pm
+  A         Uppercase Ante meridiem and Post meridiem                                 AM or PM
+  g         12-hour format of an hour without leading zeros                           1 to 12
+  G         24-hour format of an hour without leading zeros                           0 to 23
+  h         12-hour format of an hour with leading zeros                              01 to 12
+  H         24-hour format of an hour with leading zeros                              00 to 23
+  i         Minutes, with leading zeros                                               00 to 59
+  s         Seconds, with leading zeros                                               00 to 59
+  u         Decimal fraction of a second                                              Examples:
+            (minimum 1 digit, arbitrary number of digits allowed)                     001 (i.e. 0.001s) or
+                                                                                      100 (i.e. 0.100s) or
+                                                                                      999 (i.e. 0.999s) or
+                                                                                      999876543210 (i.e. 0.999876543210s)
+  O         Difference to Greenwich time (GMT) in hours and minutes                   Example: +1030
+  P         Difference to Greenwich time (GMT) with colon between hours and minutes   Example: -08:00
+  T         Timezone abbreviation of the machine running the code                     Examples: EST, MDT, PDT ...
+  Z         Timezone offset in seconds (negative if west of UTC, positive if east)    -43200 to 50400
+  c         ISO 8601 date
+            Notes:                                                                    Examples:
+            1) If unspecified, the month / day defaults to the current month / day,   1991 or
+               the time defaults to midnight, while the timezone defaults to the      1992-10 or
+               browser's timezone. If a time is specified, it must include both hours 1993-09-20 or
+               and minutes. The "T" delimiter, seconds, milliseconds and timezone     1994-08-19T16:20+01:00 or
+               are optional.                                                          1995-07-18T17:21:28-02:00 or
+            2) The decimal fraction of a second, if specified, must contain at        1996-06-17T18:22:29.98765+03:00 or
+               least 1 digit (there is no limit to the maximum number                 1997-05-16T19:23:30,12345-0400 or
+               of digits allowed), and may be delimited by either a '.' or a ','      1998-04-15T20:24:31.2468Z or
+            Refer to the examples on the right for the various levels of              1999-03-14T20:24:32Z or
+            date-time granularity which are supported, or see                         2000-02-13T21:25:33
+            http://www.w3.org/TR/NOTE-datetime for more info.                         2001-01-12 22:26:34
+  U         Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)                1193432466 or -2138434463
+  MS        Microsoft AJAX serialized dates                                           \/Date(1238606590509)\/ (i.e. UTC milliseconds since epoch) or
+                                                                                      \/Date(1238606590509+0800)\/
+  time      A javascript millisecond timestamp                                        1350024476440
+  timestamp A UNIX timestamp (same as U)                                              1350024866            
+</pre>
+ *
+ * Example usage (note that you must escape format specifiers with '\\' to render them as character literals):
+ *
+ *     // Sample date:
+ *     // 'Wed Jan 10 2007 15:05:01 GMT-0600 (Central Standard Time)'
+ *     
+ *     var dt = new Date('1/10/2007 03:05:01 PM GMT-0600');
+ *     console.log(Ext.Date.format(dt, 'Y-m-d'));                          // 2007-01-10
+ *     console.log(Ext.Date.format(dt, 'F j, Y, g:i a'));                  // January 10, 2007, 3:05 pm
+ *     console.log(Ext.Date.format(dt, 'l, \\t\\he jS \\of F Y h:i:s A')); // Wednesday, the 10th of January 2007 03:05:01 PM
+ *
+ * Here are some standard date/time patterns that you might find helpful.  They
+ * are not part of the source of Ext.Date, but to use them you can simply copy this
+ * block of code into any script that is included after Ext.Date and they will also become
+ * globally available on the Date object.  Feel free to add or remove patterns as needed in your code.
+ *
+ *     Ext.Date.patterns = {
+ *         ISO8601Long:"Y-m-d H:i:s",
+ *         ISO8601Short:"Y-m-d",
+ *         ShortDate: "n/j/Y",
+ *         LongDate: "l, F d, Y",
+ *         FullDateTime: "l, F d, Y g:i:s A",
+ *         MonthDay: "F d",
+ *         ShortTime: "g:i A",
+ *         LongTime: "g:i:s A",
+ *         SortableDateTime: "Y-m-d\\TH:i:s",
+ *         UniversalSortableDateTime: "Y-m-d H:i:sO",
+ *         YearMonth: "F, Y"
+ *     };
+ *
+ * Example usage:
+ *
+ *     var dt = new Date();
+ *     console.log(Ext.Date.format(dt, Ext.Date.patterns.ShortDate));
+ *
+ * Developer-written, custom formats may be used by supplying both a formatting and a parsing function
+ * which perform to specialized requirements. The functions are stored in {@link #parseFunctions} and {@link #formatFunctions}.
+ * @singleton
+ */
+
+/*
+ * Most of the date-formatting functions below are the excellent work of Baron Schwartz.
+ * (see http://www.xaprb.com/blog/2005/12/12/javascript-closures-for-runtime-efficiency/)
+ * They generate precompiled functions from format patterns instead of parsing and
+ * processing each pattern every time a date is formatted. These functions are available
+ * on every Date object.
+ */
+
+Ext.Date = new function() {
+  var utilDate = this,
+      stripEscapeRe = /(\\.)/g,
+      hourInfoRe = /([gGhHisucUOPZ]|MS)/,
+      dateInfoRe = /([djzmnYycU]|MS)/,
+      slashRe = /\\/gi,
+      numberTokenRe = /\{(\d+)\}/g,
+      MSFormatRe = new RegExp('\\/Date\\(([-+])?(\\d+)(?:[+-]\\d{4})?\\)\\/'),
+      code = [
+        // date calculations (note: the code below creates a dependency on Ext.Number.from())
+        "var me = this, dt, y, m, d, h, i, s, ms, o, O, z, zz, u, v, W, year, jan4, week1monday, daysInMonth, dayMatched,",
+            "def = me.defaults,",
+            "from = Ext.Number.from,",
+            "results = String(input).match(me.parseRegexes[{0}]);", // either null, or an array of matched strings
+
+        "if(results){",
+            "{1}",
+
+            "if(u != null){", // i.e. unix time is defined
+                "v = new Date(u * 1000);", // give top priority to UNIX time
+            "}else{",
+                // create Date object representing midnight of the current day;
+                // this will provide us with our date defaults
+                // (note: clearTime() handles Daylight Saving Time automatically)
+                "dt = me.clearTime(new Date);",
+
+                "y = from(y, from(def.y, dt.getFullYear()));",
+                "m = from(m, from(def.m - 1, dt.getMonth()));",
+                "dayMatched = d !== undefined;",
+                "d = from(d, from(def.d, dt.getDate()));",
+                
+                // Attempt to validate the day. Since it defaults to today, it may go out
+                // of range, for example parsing m/Y where the value is 02/2000 on the 31st of May.
+                // It will attempt to parse 2000/02/31, which will overflow to March and end up
+                // returning 03/2000. We only do this when we default the day. If an invalid day value
+                // was set to be parsed by the user, continue on and either let it overflow or return null
+                // depending on the strict value. This will be in line with the normal Date behaviour.
+                
+                "if (!dayMatched) {", 
+                    "dt.setDate(1);",
+                    "dt.setMonth(m);",
+                    "dt.setFullYear(y);",
+                
+                    "daysInMonth = me.getDaysInMonth(dt);",
+                    "if (d > daysInMonth) {",
+                        "d = daysInMonth;",
+                    "}",
+                "}",
+
+                "h  = from(h, from(def.h, dt.getHours()));",
+                "i  = from(i, from(def.i, dt.getMinutes()));",
+                "s  = from(s, from(def.s, dt.getSeconds()));",
+                "ms = from(ms, from(def.ms, dt.getMilliseconds()));",
+
+                "if(z >= 0 && y >= 0){",
+                    // both the year and zero-based day of year are defined and >= 0.
+                    // these 2 values alone provide sufficient info to create a full date object
+
+                    // create Date object representing January 1st for the given year
+                    // handle years < 100 appropriately
+                    "v = me.add(new Date(y < 100 ? 100 : y, 0, 1, h, i, s, ms), me.YEAR, y < 100 ? y - 100 : 0);",
+
+                    // then add day of year, checking for Date "rollover" if necessary
+                    "v = !strict? v : (strict === true && (z <= 364 || (me.isLeapYear(v) && z <= 365))? me.add(v, me.DAY, z) : null);",
+                "}else if(strict === true && !me.isValid(y, m + 1, d, h, i, s, ms)){", // check for Date "rollover"
+                    "v = null;", // invalid date, so return null
+                "}else{",
+                    "if (W) {", // support ISO-8601
+                        // http://en.wikipedia.org/wiki/ISO_week_date
+                        //
+                        // Mutually equivalent definitions for week 01 are:
+                        // a. the week starting with the Monday which is nearest in time to 1 January
+                        // b. the week with 4 January in it
+                        // ... there are many others ...
+                        //
+                        // We'll use letter b above to determine the first week of the year.
+                        //
+                        // So, first get a Date object for January 4th of whatever calendar year is desired.
+                        //
+                        // Then, the first Monday of the year can easily be determined by (operating on this Date):
+                        // 1. Getting the day of the week.
+                        // 2. Subtracting that by one.
+                        // 3. Multiplying that by 86400000 (one day in ms).
+                        // 4. Subtracting this number of days (in ms) from the January 4 date (represented in ms).
+                        // 
+                        // Example #1 ...
+                        //
+                        //       January 2012
+                        //   Su Mo Tu We Th Fr Sa
+                        //    1  2  3  4  5  6  7
+                        //    8  9 10 11 12 13 14
+                        //   15 16 17 18 19 20 21
+                        //   22 23 24 25 26 27 28
+                        //   29 30 31
+                        //
+                        // 1. January 4th is a Wednesday.
+                        // 2. Its day number is 3.
+                        // 3. Simply substract 2 days from Wednesday.
+                        // 4. The first week of the year begins on Monday, January 2. Simple!
+                        //
+                        // Example #2 ...
+                        //       January 1992
+                        //   Su Mo Tu We Th Fr Sa
+                        //             1  2  3  4
+                        //    5  6  7  8  9 10 11
+                        //   12 13 14 15 16 17 18
+                        //   19 20 21 22 23 24 25
+                        //   26 27 28 29 30 31
+                        // 
+                        // 1. January 4th is a Saturday.
+                        // 2. Its day number is 6.
+                        // 3. Simply subtract 5 days from Saturday.
+                        // 4. The first week of the year begins on Monday, December 30. Simple!
+                        //
+                        // v = Ext.Date.clearTime(new Date(week1monday.getTime() + ((W - 1) * 604800000)));
+                        // (This is essentially doing the same thing as above but for the week rather than the day)
+                        "year = y || (new Date()).getFullYear(),",
+                        "jan4 = new Date(year, 0, 4, 0, 0, 0),",
+                        "week1monday = new Date(jan4.getTime() - ((jan4.getDay() - 1) * 86400000));",
+                        "v = Ext.Date.clearTime(new Date(week1monday.getTime() + ((W - 1) * 604800000)));",
+                    "} else {",
+                        // plain old Date object
+                        // handle years < 100 properly
+                        "v = me.add(new Date(y < 100 ? 100 : y, m, d, h, i, s, ms), me.YEAR, y < 100 ? y - 100 : 0);",
+                    "}",
+                "}",
+            "}",
+        "}",
+
+        "if(v){",
+            // favor UTC offset over GMT offset
+            "if(zz != null){",
+                // reset to UTC, then add offset
+                "v = me.add(v, me.SECOND, -v.getTimezoneOffset() * 60 - zz);",
+            "}else if(o){",
+                // reset to GMT, then add offset
+                "v = me.add(v, me.MINUTE, -v.getTimezoneOffset() + (sn == '+'? -1 : 1) * (hr * 60 + mn));",
+            "}",
+        "}",
+
+        "return v;"
+      ].join('\n');
+
+  // create private copy of Ext JS's `Ext.util.Format.format()` method
+  // - to remove unnecessary dependency
+  // - to resolve namespace conflict with MS-Ajax's implementation
+  function xf(format) {
+      var args = Array.prototype.slice.call(arguments, 1);
+      return format.replace(numberTokenRe, function(m, i) {
+          return args[i];
+      });
+  }
+
+  Ext.apply(utilDate, {
+    /**
+     * Returns the current timestamp.
+     * @return {Number} Milliseconds since UNIX epoch.
+     * @method
+     */
+    now: Date.now || function() {
+        return +new Date();
+    },
+
+    /**
+     * @private
+     * Private for now
+     */
+    toString: function(date) {
+        var pad = Ext.String.leftPad;
+
+        return date.getFullYear() + "-"
+            + pad(date.getMonth() + 1, 2, '0') + "-"
+            + pad(date.getDate(), 2, '0') + "T"
+            + pad(date.getHours(), 2, '0') + ":"
+            + pad(date.getMinutes(), 2, '0') + ":"
+            + pad(date.getSeconds(), 2, '0');
+    },
+
+    /**
+     * Returns the number of milliseconds between two dates.
+     * @param {Date} dateA The first date.
+     * @param {Date} [dateB=new Date()] (optional) The second date.
+     * @return {Number} The difference in milliseconds
+     */
+    getElapsed: function(dateA, dateB) {
+        return Math.abs(dateA - (dateB || utilDate.now()));
+    },
+
+    /**
+     * Global flag which determines if strict date parsing should be used.
+     * Strict date parsing will not roll-over invalid dates, which is the
+     * default behavior of JavaScript Date objects.
+     * (see {@link #parse} for more information)
+     * @type Boolean
+    */
+    useStrict: false,
+
+    // private
+    formatCodeToRegex: function(character, currentGroup) {
+        // Note: currentGroup - position in regex result array (see notes for Ext.Date.parseCodes below)
+        var p = utilDate.parseCodes[character];
+
+        if (p) {
+          p = typeof p == 'function'? p() : p;
+          utilDate.parseCodes[character] = p; // reassign function result to prevent repeated execution
+        }
+
+        return p ? Ext.applyIf({
+          c: p.c ? xf(p.c, currentGroup || "{0}") : p.c
+        }, p) : {
+            g: 0,
+            c: null,
+            s: Ext.String.escapeRegex(character) // treat unrecognized characters as literals
+        };
+    },
+
+    /**
+     * An object hash in which each property is a date parsing function. The property name is the
+     * format string which that function parses.
+     *
+     * This object is automatically populated with date parsing functions as
+     * date formats are requested for Ext standard formatting strings.
+     *
+     * Custom parsing functions may be inserted into this object, keyed by a name which from then on
+     * may be used as a format string to {@link #parse}.
+     *
+     * Example:
+     *
+     *     Ext.Date.parseFunctions['x-date-format'] = myDateParser;
+     *
+     * A parsing function should return a Date object, and is passed the following parameters:<div class="mdetail-params"><ul>
+     * <li><code>date</code> : String<div class="sub-desc">The date string to parse.</div></li>
+     * <li><code>strict</code> : Boolean<div class="sub-desc">True to validate date strings while parsing
+     * (i.e. prevent JavaScript Date "rollover") (The default must be `false`).
+     * Invalid date strings should return `null` when parsed.</div></li>
+     * </ul></div>
+     *
+     * To enable Dates to also be _formatted_ according to that format, a corresponding
+     * formatting function must be placed into the {@link #formatFunctions} property.
+     * @property parseFunctions
+     * @type Object
+     */
+    parseFunctions: {
+        "MS": function(input, strict) {
+            // note: the timezone offset is ignored since the MS Ajax server sends
+            // a UTC milliseconds-since-Unix-epoch value (negative values are allowed)
+            var r = (input || '').match(MSFormatRe);
+            return r ? new Date(((r[1] || '') + r[2]) * 1) : null;
+        },
+        "time": function(input, strict) {
+            var num = parseInt(input, 10);
+            if (num || num === 0) {
+                return new Date(num);
+            }
+            return null;
+        },
+        "timestamp": function(input, strict) {
+            var num = parseInt(input, 10);
+            if (num || num === 0) {
+                return new Date(num * 1000);
+            }
+            return null;
+        }
+    },
+    parseRegexes: [],
+
+    /**
+     * An object hash in which each property is a date formatting function. The property name is the
+     * format string which corresponds to the produced formatted date string.
+     *
+     * This object is automatically populated with date formatting functions as
+     * date formats are requested for Ext standard formatting strings.
+     *
+     * Custom formatting functions may be inserted into this object, keyed by a name which from then on
+     * may be used as a format string to {@link #format}.
+     *
+     * Example:
+     *
+     *     Ext.Date.formatFunctions['x-date-format'] = myDateFormatter;
+     *
+     * A formatting function should return a string representation of the passed Date object, and is passed the following parameters:<div class="mdetail-params"><ul>
+     * <li><code>date</code> : Date<div class="sub-desc">The Date to format.</div></li>
+     * </ul></div>
+     *
+     * To enable date strings to also be _parsed_ according to that format, a corresponding
+     * parsing function must be placed into the {@link #parseFunctions} property.
+     * @property formatFunctions
+     * @type Object
+     */
+    formatFunctions: {
+        "MS": function() {
+            // UTC milliseconds since Unix epoch (MS-AJAX serialized date format (MRSF))
+            return '\\/Date(' + this.getTime() + ')\\/';
+        },
+        "time": function(){
+            return this.getTime().toString();
+        },
+        "timestamp": function(){
+            return utilDate.format(this, 'U');
+        }
+    },
+
+    y2kYear : 50,
+
+    /**
+     * Date interval constant
+     * @type String
+     */
+    MILLI : "ms",
+
+    /**
+     * Date interval constant
+     * @type String
+     */
+    SECOND : "s",
+
+    /**
+     * Date interval constant
+     * @type String
+     */
+    MINUTE : "mi",
+
+    /** Date interval constant
+     * @type String
+     */
+    HOUR : "h",
+
+    /**
+     * Date interval constant
+     * @type String
+     */
+    DAY : "d",
+
+    /**
+     * Date interval constant
+     * @type String
+     */
+    MONTH : "mo",
+
+    /**
+     * Date interval constant
+     * @type String
+     */
+    YEAR : "y",
+
+    /**
+     * An object hash containing default date values used during date parsing.
+     * 
+     * The following properties are available:<div class="mdetail-params"><ul>
+     * <li><code>y</code> : Number<div class="sub-desc">The default year value. (defaults to undefined)</div></li>
+     * <li><code>m</code> : Number<div class="sub-desc">The default 1-based month value. (defaults to undefined)</div></li>
+     * <li><code>d</code> : Number<div class="sub-desc">The default day value. (defaults to undefined)</div></li>
+     * <li><code>h</code> : Number<div class="sub-desc">The default hour value. (defaults to undefined)</div></li>
+     * <li><code>i</code> : Number<div class="sub-desc">The default minute value. (defaults to undefined)</div></li>
+     * <li><code>s</code> : Number<div class="sub-desc">The default second value. (defaults to undefined)</div></li>
+     * <li><code>ms</code> : Number<div class="sub-desc">The default millisecond value. (defaults to undefined)</div></li>
+     * </ul></div>
+     * 
+     * Override these properties to customize the default date values used by the {@link #parse} method.
+     * 
+     * __Note:__ In countries which experience Daylight Saving Time (i.e. DST), the `h`, `i`, `s`
+     * and `ms` properties may coincide with the exact time in which DST takes effect.
+     * It is the responsibility of the developer to account for this.
+     *
+     * Example Usage:
+     * 
+     *     // set default day value to the first day of the month
+     *     Ext.Date.defaults.d = 1;
+     *
+     *     // parse a February date string containing only year and month values.
+     *     // setting the default day value to 1 prevents weird date rollover issues
+     *     // when attempting to parse the following date string on, for example, March 31st 2009.
+     *     Ext.Date.parse('2009-02', 'Y-m'); // returns a Date object representing February 1st 2009
+     *
+     * @property defaults
+     * @type Object
+     */
+    defaults: {},
+
+    //<locale type="array">
+    /**
+     * @property {String[]} dayNames
+     * An array of textual day names.
+     * Override these values for international dates.
+     *
+     * Example:
+     *
+     *     Ext.Date.dayNames = [
+     *         'SundayInYourLang',
+     *         'MondayInYourLang'
+     *         // ...
+     *     ];
+     */
+    dayNames : [
+        "Sunday",
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday"
+    ],
+    //</locale>
+
+    //<locale type="array">
+    /**
+     * @property {String[]} monthNames
+     * An array of textual month names.
+     * Override these values for international dates.
+     *
+     * Example:
+     *
+     *     Ext.Date.monthNames = [
+     *         'JanInYourLang',
+     *         'FebInYourLang'
+     *         // ...
+     *     ];
+     */
+    monthNames : [
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December"
+    ],
+    //</locale>
+
+    //<locale type="object">
+    /**
+     * @property {Object} monthNumbers
+     * An object hash of zero-based JavaScript month numbers (with short month names as keys. **Note:** keys are case-sensitive).
+     * Override these values for international dates.
+     *
+     * Example:
+     *
+     *     Ext.Date.monthNumbers = {
+     *         'LongJanNameInYourLang': 0,
+     *         'ShortJanNameInYourLang':0,
+     *         'LongFebNameInYourLang':1,
+     *         'ShortFebNameInYourLang':1
+     *         // ...
+     *     };
+     */
+    monthNumbers : {
+        January: 0,
+        Jan: 0,
+        February: 1,
+        Feb: 1,
+        March: 2,
+        Mar: 2,
+        April: 3,
+        Apr: 3,
+        May: 4,
+        June: 5,
+        Jun: 5,
+        July: 6,
+        Jul: 6,
+        August: 7,
+        Aug: 7,
+        September: 8,
+        Sep: 8,
+        October: 9,
+        Oct: 9,
+        November: 10,
+        Nov: 10,
+        December: 11,
+        Dec: 11
+    },
+    //</locale>
+    
+    //<locale>
+    /**
+     * @property {String} defaultFormat
+     * The date format string that the {@link Ext.util.Format#dateRenderer}
+     * and {@link Ext.util.Format#date} functions use.  See {@link Ext.Date} for details.
+     *
+     * This may be overridden in a locale file.
+     */
+    defaultFormat : "m/d/Y",
+    //</locale>
+    //<locale type="function">
+    /**
+     * Get the short month name for the given month number.
+     * Override this function for international dates.
+     * @param {Number} month A zero-based JavaScript month number.
+     * @return {String} The short month name.
+     */
+    getShortMonthName : function(month) {
+        return Ext.Date.monthNames[month].substring(0, 3);
+    },
+    //</locale>
+
+    //<locale type="function">
+    /**
+     * Get the short day name for the given day number.
+     * Override this function for international dates.
+     * @param {Number} day A zero-based JavaScript day number.
+     * @return {String} The short day name.
+     */
+    getShortDayName : function(day) {
+        return Ext.Date.dayNames[day].substring(0, 3);
+    },
+    //</locale>
+
+    //<locale type="function">
+    /**
+     * Get the zero-based JavaScript month number for the given short/full month name.
+     * Override this function for international dates.
+     * @param {String} name The short/full month name.
+     * @return {Number} The zero-based JavaScript month number.
+     */
+    getMonthNumber : function(name) {
+        // handle camel casing for English month names (since the keys for the Ext.Date.monthNumbers hash are case sensitive)
+        return Ext.Date.monthNumbers[name.substring(0, 1).toUpperCase() + name.substring(1, 3).toLowerCase()];
+    },
+    //</locale>
+
+    /**
+     * Checks if the specified format contains hour information
+     * @param {String} format The format to check
+     * @return {Boolean} True if the format contains hour information
+     * @method
+     */
+    formatContainsHourInfo : function(format){
+        return hourInfoRe.test(format.replace(stripEscapeRe, ''));
+    },
+
+    /**
+     * Checks if the specified format contains information about
+     * anything other than the time.
+     * @param {String} format The format to check
+     * @return {Boolean} True if the format contains information about
+     * date/day information.
+     * @method
+     */
+    formatContainsDateInfo : function(format){
+        return dateInfoRe.test(format.replace(stripEscapeRe, ''));
+    },
+    
+    /**
+     * Removes all escaping for a date format string. In date formats,
+     * using a '\' can be used to escape special characters.
+     * @param {String} format The format to unescape
+     * @return {String} The unescaped format
+     * @method
+     */
+    unescapeFormat: function(format) {
+        // Escape the format, since \ can be used to escape special
+        // characters in a date format. For example, in a Spanish
+        // locale the format may be: 'd \\de F \\de Y'
+        return format.replace(slashRe, '');
+    },
+
+    /**
+     * The base format-code to formatting-function hashmap used by the {@link #format} method.
+     * Formatting functions are strings (or functions which return strings) which
+     * will return the appropriate value when evaluated in the context of the Date object
+     * from which the {@link #format} method is called.
+     * Add to / override these mappings for custom date formatting.
+     *
+     * __Note:__ Ext.Date.format() treats characters as literals if an appropriate mapping cannot be found.
+     *
+     * Example:
+     *
+     *     Ext.Date.formatCodes.x = "Ext.util.Format.leftPad(this.getDate(), 2, '0')";
+     *     console.log(Ext.Date.format(new Date(), 'X'); // returns the current day of the month
+     * @type Object
+     */
+    formatCodes : {
+        d: "Ext.String.leftPad(this.getDate(), 2, '0')",
+        D: "Ext.Date.getShortDayName(this.getDay())", // get localized short day name
+        j: "this.getDate()",
+        l: "Ext.Date.dayNames[this.getDay()]",
+        N: "(this.getDay() ? this.getDay() : 7)",
+        S: "Ext.Date.getSuffix(this)",
+        w: "this.getDay()",
+        z: "Ext.Date.getDayOfYear(this)",
+        W: "Ext.String.leftPad(Ext.Date.getWeekOfYear(this), 2, '0')",
+        F: "Ext.Date.monthNames[this.getMonth()]",
+        m: "Ext.String.leftPad(this.getMonth() + 1, 2, '0')",
+        M: "Ext.Date.getShortMonthName(this.getMonth())", // get localized short month name
+        n: "(this.getMonth() + 1)",
+        t: "Ext.Date.getDaysInMonth(this)",
+        L: "(Ext.Date.isLeapYear(this) ? 1 : 0)",
+        o: "(this.getFullYear() + (Ext.Date.getWeekOfYear(this) == 1 && this.getMonth() > 0 ? +1 : (Ext.Date.getWeekOfYear(this) >= 52 && this.getMonth() < 11 ? -1 : 0)))",
+        Y: "Ext.String.leftPad(this.getFullYear(), 4, '0')",
+        y: "('' + this.getFullYear()).substring(2, 4)",
+        a: "(this.getHours() < 12 ? 'am' : 'pm')",
+        A: "(this.getHours() < 12 ? 'AM' : 'PM')",
+        g: "((this.getHours() % 12) ? this.getHours() % 12 : 12)",
+        G: "this.getHours()",
+        h: "Ext.String.leftPad((this.getHours() % 12) ? this.getHours() % 12 : 12, 2, '0')",
+        H: "Ext.String.leftPad(this.getHours(), 2, '0')",
+        i: "Ext.String.leftPad(this.getMinutes(), 2, '0')",
+        s: "Ext.String.leftPad(this.getSeconds(), 2, '0')",
+        u: "Ext.String.leftPad(this.getMilliseconds(), 3, '0')",
+        O: "Ext.Date.getGMTOffset(this)",
+        P: "Ext.Date.getGMTOffset(this, true)",
+        T: "Ext.Date.getTimezone(this)",
+        Z: "(this.getTimezoneOffset() * -60)",
+
+        c: function() { // ISO-8601 -- GMT format
+            var c, code, i, l, e;
+            for (c = "Y-m-dTH:i:sP", code = [], i = 0, l = c.length; i < l; ++i) {
+                e = c.charAt(i);
+                code.push(e == "T" ? "'T'" : utilDate.getFormatCode(e)); // treat T as a character literal
+            }
+            return code.join(" + ");
+        },
+        /*
+        c: function() { // ISO-8601 -- UTC format
+            return [
+              "this.getUTCFullYear()", "'-'",
+              "Ext.util.Format.leftPad(this.getUTCMonth() + 1, 2, '0')", "'-'",
+              "Ext.util.Format.leftPad(this.getUTCDate(), 2, '0')",
+              "'T'",
+              "Ext.util.Format.leftPad(this.getUTCHours(), 2, '0')", "':'",
+              "Ext.util.Format.leftPad(this.getUTCMinutes(), 2, '0')", "':'",
+              "Ext.util.Format.leftPad(this.getUTCSeconds(), 2, '0')",
+              "'Z'"
+            ].join(" + ");
+        },
+        */
+
+        U: "Math.round(this.getTime() / 1000)"
+    },
+
+    /**
+     * Checks if the passed Date parameters will cause a JavaScript Date "rollover".
+     * @param {Number} year 4-digit year
+     * @param {Number} month 1-based month-of-year
+     * @param {Number} day Day of month
+     * @param {Number} hour (optional) Hour
+     * @param {Number} minute (optional) Minute
+     * @param {Number} second (optional) Second
+     * @param {Number} millisecond (optional) Millisecond
+     * @return {Boolean} `true` if the passed parameters do not cause a Date "rollover", `false` otherwise.
+     */
+    isValid : function(y, m, d, h, i, s, ms) {
+        // setup defaults
+        h = h || 0;
+        i = i || 0;
+        s = s || 0;
+        ms = ms || 0;
+
+        // Special handling for year < 100
+        var dt = utilDate.add(new Date(y < 100 ? 100 : y, m - 1, d, h, i, s, ms), utilDate.YEAR, y < 100 ? y - 100 : 0);
+
+        return y == dt.getFullYear() &&
+            m == dt.getMonth() + 1 &&
+            d == dt.getDate() &&
+            h == dt.getHours() &&
+            i == dt.getMinutes() &&
+            s == dt.getSeconds() &&
+            ms == dt.getMilliseconds();
+    },
+
+    /**
+     * Parses the passed string using the specified date format.
+     * Note that this function expects normal calendar dates, meaning that months are 1-based (i.e. 1 = January).
+     * The {@link #defaults} hash will be used for any date value (i.e. year, month, day, hour, minute, second or millisecond)
+     * which cannot be found in the passed string. If a corresponding default date value has not been specified in the {@link #defaults} hash,
+     * the current date's year, month, day or DST-adjusted zero-hour time value will be used instead.
+     * Keep in mind that the input date string must precisely match the specified format string
+     * in order for the parse operation to be successful (failed parse operations return a null value).
+     * 
+     * Example:
+     *
+     *     //dt = Fri May 25 2007 (current date)
+     *     var dt = new Date();
+     *     
+     *     //dt = Thu May 25 2006 (today's month/day in 2006)
+     *     dt = Ext.Date.parse("2006", "Y");
+     *     
+     *     //dt = Sun Jan 15 2006 (all date parts specified)
+     *     dt = Ext.Date.parse("2006-01-15", "Y-m-d");
+     *     
+     *     //dt = Sun Jan 15 2006 15:20:01
+     *     dt = Ext.Date.parse("2006-01-15 3:20:01 PM", "Y-m-d g:i:s A");
+     *     
+     *     // attempt to parse Sun Feb 29 2006 03:20:01 in strict mode
+     *     dt = Ext.Date.parse("2006-02-29 03:20:01", "Y-m-d H:i:s", true); // returns null
+     *
+     * @param {String} input The raw date string.
+     * @param {String} format The expected date string format.
+     * @param {Boolean} [strict=false] (optional) `true` to validate date strings while parsing (i.e. prevents JavaScript Date "rollover").
+     * Invalid date strings will return `null` when parsed.
+     * @return {Date} The parsed Date.
+     */
+    parse : function(input, format, strict) {
+        var p = utilDate.parseFunctions;
+        if (p[format] == null) {
+            utilDate.createParser(format);
+        }
+        return p[format].call(utilDate, input, Ext.isDefined(strict) ? strict : utilDate.useStrict);
+    },
+
+    // Backwards compat
+    parseDate: function(input, format, strict){
+        return utilDate.parse(input, format, strict);
+    },
+
+
+    // private
+    getFormatCode : function(character) {
+        var f = utilDate.formatCodes[character];
+
+        if (f) {
+          f = typeof f == 'function'? f() : f;
+          utilDate.formatCodes[character] = f; // reassign function result to prevent repeated execution
+        }
+
+        // note: unknown characters are treated as literals
+        return f || ("'" + Ext.String.escape(character) + "'");
+    },
+
+    // private
+    createFormat : function(format) {
+        var code = [],
+            special = false,
+            ch = '',
+            i;
+
+        for (i = 0; i < format.length; ++i) {
+            ch = format.charAt(i);
+            if (!special && ch == "\\") {
+                special = true;
+            } else if (special) {
+                special = false;
+                code.push("'" + Ext.String.escape(ch) + "'");
+            } else {
+                code.push(utilDate.getFormatCode(ch));
+            }
+        }
+        utilDate.formatFunctions[format] = Ext.functionFactory("return " + code.join('+'));
+    },
+
+    // private
+    createParser : function(format) {
+        var regexNum = utilDate.parseRegexes.length,
+            currentGroup = 1,
+            calc = [],
+            regex = [],
+            special = false,
+            ch = "",
+            i = 0,
+            len = format.length,
+            atEnd = [],
+            obj;
+
+        for (; i < len; ++i) {
+            ch = format.charAt(i);
+            if (!special && ch == "\\") {
+                special = true;
+            } else if (special) {
+                special = false;
+                regex.push(Ext.String.escape(ch));
+            } else {
+                obj = utilDate.formatCodeToRegex(ch, currentGroup);
+                currentGroup += obj.g;
+                regex.push(obj.s);
+                if (obj.g && obj.c) {
+                    if (obj.calcAtEnd) {
+                        atEnd.push(obj.c);
+                    } else {
+                        calc.push(obj.c);
+                    }
+                }
+            }
+        }
+
+        calc = calc.concat(atEnd);
+
+        utilDate.parseRegexes[regexNum] = new RegExp("^" + regex.join('') + "$", 'i');
+        utilDate.parseFunctions[format] = Ext.functionFactory("input", "strict", xf(code, regexNum, calc.join('')));
+    },
+
+    // private
+    parseCodes : {
+        /*
+         * Notes:
+         * g = {Number} calculation group (0 or 1. only group 1 contributes to date calculations.)
+         * c = {String} calculation method (required for group 1. null for group 0. {0} = currentGroup - position in regex result array)
+         * s = {String} regex pattern. all matches are stored in results[], and are accessible by the calculation mapped to 'c'
+         */
+        d: {
+            g:1,
+            c:"d = parseInt(results[{0}], 10);\n",
+            s:"(3[0-1]|[1-2][0-9]|0[1-9])" // day of month with leading zeroes (01 - 31)
+        },
+        j: {
+            g:1,
+            c:"d = parseInt(results[{0}], 10);\n",
+            s:"(3[0-1]|[1-2][0-9]|[1-9])" // day of month without leading zeroes (1 - 31)
+        },
+        D: function() {
+            for (var a = [], i = 0; i < 7; a.push(utilDate.getShortDayName(i)), ++i); // get localised short day names
+            return {
+                g:0,
+                c:null,
+                s:"(?:" + a.join("|") +")"
+            };
+        },
+        l: function() {
+            return {
+                g:0,
+                c:null,
+                s:"(?:" + utilDate.dayNames.join("|") + ")"
+            };
+        },
+        N: {
+            g:0,
+            c:null,
+            s:"[1-7]" // ISO-8601 day number (1 (monday) - 7 (sunday))
+        },
+        //<locale type="object" property="parseCodes">
+        S: {
+            g:0,
+            c:null,
+            s:"(?:st|nd|rd|th)"
+        },
+        //</locale>
+        w: {
+            g:0,
+            c:null,
+            s:"[0-6]" // JavaScript day number (0 (sunday) - 6 (saturday))
+        },
+        z: {
+            g:1,
+            c:"z = parseInt(results[{0}], 10);\n",
+            s:"(\\d{1,3})" // day of the year (0 - 364 (365 in leap years))
+        },
+        W: {
+            g:1,
+            c:"W = parseInt(results[{0}], 10);\n",
+            s:"(\\d{2})" // ISO-8601 week number (with leading zero)
+        },
+        F: function() {
+            return {
+                g:1,
+                c:"m = parseInt(me.getMonthNumber(results[{0}]), 10);\n", // get localised month number
+                s:"(" + utilDate.monthNames.join("|") + ")"
+            };
+        },
+        M: function() {
+            for (var a = [], i = 0; i < 12; a.push(utilDate.getShortMonthName(i)), ++i); // get localised short month names
+            return Ext.applyIf({
+                s:"(" + a.join("|") + ")"
+            }, utilDate.formatCodeToRegex("F"));
+        },
+        m: {
+            g:1,
+            c:"m = parseInt(results[{0}], 10) - 1;\n",
+            s:"(1[0-2]|0[1-9])" // month number with leading zeros (01 - 12)
+        },
+        n: {
+            g:1,
+            c:"m = parseInt(results[{0}], 10) - 1;\n",
+            s:"(1[0-2]|[1-9])" // month number without leading zeros (1 - 12)
+        },
+        t: {
+            g:0,
+            c:null,
+            s:"(?:\\d{2})" // no. of days in the month (28 - 31)
+        },
+        L: {
+            g:0,
+            c:null,
+            s:"(?:1|0)"
+        },
+        o: { 
+            g: 1,
+            c: "y = parseInt(results[{0}], 10);\n",
+            s: "(\\d{4})" // ISO-8601 year number (with leading zero)
+
+        },
+        Y: {
+            g:1,
+            c:"y = parseInt(results[{0}], 10);\n",
+            s:"(\\d{4})" // 4-digit year
+        },
+        y: {
+            g:1,
+            c:"var ty = parseInt(results[{0}], 10);\n"
+                + "y = ty > me.y2kYear ? 1900 + ty : 2000 + ty;\n", // 2-digit year
+            s:"(\\d{1,2})"
+        },
+        /*
+         * In the am/pm parsing routines, we allow both upper and lower case
+         * even though it doesn't exactly match the spec. It gives much more flexibility
+         * in being able to specify case insensitive regexes.
+         */
+        //<locale type="object" property="parseCodes">
+        a: {
+            g:1,
+            c:"if (/(am)/i.test(results[{0}])) {\n"
+                + "if (!h || h == 12) { h = 0; }\n"
+                + "} else { if (!h || h < 12) { h = (h || 0) + 12; }}",
+            s:"(am|pm|AM|PM)",
+            calcAtEnd: true
+        },
+        //</locale>
+        //<locale type="object" property="parseCodes">
+        A: {
+            g:1,
+            c:"if (/(am)/i.test(results[{0}])) {\n"
+                + "if (!h || h == 12) { h = 0; }\n"
+                + "} else { if (!h || h < 12) { h = (h || 0) + 12; }}",
+            s:"(AM|PM|am|pm)",
+            calcAtEnd: true
+        },
+        //</locale>
+        g: {
+            g:1,
+            c:"h = parseInt(results[{0}], 10);\n",
+            s:"(1[0-2]|[0-9])" //  12-hr format of an hour without leading zeroes (1 - 12)
+        },
+        G: {
+            g:1,
+            c:"h = parseInt(results[{0}], 10);\n",
+            s:"(2[0-3]|1[0-9]|[0-9])" // 24-hr format of an hour without leading zeroes (0 - 23)
+        },
+        h: {
+            g:1,
+            c:"h = parseInt(results[{0}], 10);\n",
+            s:"(1[0-2]|0[1-9])" //  12-hr format of an hour with leading zeroes (01 - 12)
+        },
+        H: {
+            g:1,
+            c:"h = parseInt(results[{0}], 10);\n",
+            s:"(2[0-3]|[0-1][0-9])" //  24-hr format of an hour with leading zeroes (00 - 23)
+        },
+        i: {
+            g:1,
+            c:"i = parseInt(results[{0}], 10);\n",
+            s:"([0-5][0-9])" // minutes with leading zeros (00 - 59)
+        },
+        s: {
+            g:1,
+            c:"s = parseInt(results[{0}], 10);\n",
+            s:"([0-5][0-9])" // seconds with leading zeros (00 - 59)
+        },
+        u: {
+            g:1,
+            c:"ms = results[{0}]; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n",
+            s:"(\\d+)" // decimal fraction of a second (minimum = 1 digit, maximum = unlimited)
+        },
+        O: {
+            g:1,
+            c:[
+                "o = results[{0}];",
+                "var sn = o.substring(0,1),", // get + / - sign
+                    "hr = o.substring(1,3)*1 + Math.floor(o.substring(3,5) / 60),", // get hours (performs minutes-to-hour conversion also, just in case)
+                    "mn = o.substring(3,5) % 60;", // get minutes
+                "o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n" // -12hrs <= GMT offset <= 14hrs
+            ].join("\n"),
+            s: "([+-]\\d{4})" // GMT offset in hrs and mins
+        },
+        P: {
+            g:1,
+            c:[
+                "o = results[{0}];",
+                "var sn = o.substring(0,1),", // get + / - sign
+                    "hr = o.substring(1,3)*1 + Math.floor(o.substring(4,6) / 60),", // get hours (performs minutes-to-hour conversion also, just in case)
+                    "mn = o.substring(4,6) % 60;", // get minutes
+                "o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n" // -12hrs <= GMT offset <= 14hrs
+            ].join("\n"),
+            s: "([+-]\\d{2}:\\d{2})" // GMT offset in hrs and mins (with colon separator)
+        },
+        T: {
+            g:0,
+            c:null,
+            s:"[A-Z]{1,5}" // timezone abbrev. may be between 1 - 5 chars
+        },
+        Z: {
+            g:1,
+            c:"zz = results[{0}] * 1;\n" // -43200 <= UTC offset <= 50400
+                  + "zz = (-43200 <= zz && zz <= 50400)? zz : null;\n",
+            s:"([+-]?\\d{1,5})" // leading '+' sign is optional for UTC offset
+        },
+        c: function() {
+            var calc = [],
+                arr = [
+                    utilDate.formatCodeToRegex("Y", 1), // year
+                    utilDate.formatCodeToRegex("m", 2), // month
+                    utilDate.formatCodeToRegex("d", 3), // day
+                    utilDate.formatCodeToRegex("H", 4), // hour
+                    utilDate.formatCodeToRegex("i", 5), // minute
+                    utilDate.formatCodeToRegex("s", 6), // second
+                    {c:"ms = results[7] || '0'; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n"}, // decimal fraction of a second (minimum = 1 digit, maximum = unlimited)
+                    {c:[ // allow either "Z" (i.e. UTC) or "-0530" or "+08:00" (i.e. UTC offset) timezone delimiters. assumes local timezone if no timezone is specified
+                        "if(results[8]) {", // timezone specified
+                            "if(results[8] == 'Z'){",
+                                "zz = 0;", // UTC
+                            "}else if (results[8].indexOf(':') > -1){",
+                                utilDate.formatCodeToRegex("P", 8).c, // timezone offset with colon separator
+                            "}else{",
+                                utilDate.formatCodeToRegex("O", 8).c, // timezone offset without colon separator
+                            "}",
+                        "}"
+                    ].join('\n')}
+                ],
+                i,
+                l;
+
+            for (i = 0, l = arr.length; i < l; ++i) {
+                calc.push(arr[i].c);
+            }
+
+            return {
+                g:1,
+                c:calc.join(""),
+                s:[
+                    arr[0].s, // year (required)
+                    "(?:", "-", arr[1].s, // month (optional)
+                        "(?:", "-", arr[2].s, // day (optional)
+                            "(?:",
+                                "(?:T| )?", // time delimiter -- either a "T" or a single blank space
+                                arr[3].s, ":", arr[4].s,  // hour AND minute, delimited by a single colon (optional). MUST be preceded by either a "T" or a single blank space
+                                "(?::", arr[5].s, ")?", // seconds (optional)
+                                "(?:(?:\\.|,)(\\d+))?", // decimal fraction of a second (e.g. ",12345" or ".98765") (optional)
+                                "(Z|(?:[-+]\\d{2}(?::)?\\d{2}))?", // "Z" (UTC) or "-0530" (UTC offset without colon delimiter) or "+08:00" (UTC offset with colon delimiter) (optional)
+                            ")?",
+                        ")?",
+                    ")?"
+                ].join("")
+            };
+        },
+        U: {
+            g:1,
+            c:"u = parseInt(results[{0}], 10);\n",
+            s:"(-?\\d+)" // leading minus sign indicates seconds before UNIX epoch
+        }
+    },
+
+    //Old Ext.Date prototype methods.
+    // private
+    dateFormat: function(date, format) {
+        return utilDate.format(date, format);
+    },
+
+    /**
+     * Compares if two dates are equal by comparing their values.
+     * @param {Date} date1
+     * @param {Date} date2
+     * @return {Boolean} `true` if the date values are equal
+     */
+    isEqual: function(date1, date2) {
+        // check we have 2 date objects
+        if (date1 && date2) {
+            return (date1.getTime() === date2.getTime());
+        }
+        // one or both isn't a date, only equal if both are falsey
+        return !(date1 || date2);
+    },
+
+    /**
+     * Formats a date given the supplied format string.
+     * @param {Date} date The date to format
+     * @param {String} format The format string
+     * @return {String} The formatted date or an empty string if date parameter is not a JavaScript Date object
+     */
+    format: function(date, format) {
+        var formatFunctions = utilDate.formatFunctions;
+
+        if (!Ext.isDate(date)) {
+            return '';
+        }
+
+        if (formatFunctions[format] == null) {
+            utilDate.createFormat(format);
+        }
+
+        return formatFunctions[format].call(date) + '';
+    },
+
+    /**
+     * Get the timezone abbreviation of the current date (equivalent to the format specifier 'T').
+     *
+     * __Note:__ The date string returned by the JavaScript Date object's `toString()` method varies
+     * between browsers (e.g. FF vs IE) and system region settings (e.g. IE in Asia vs IE in America).
+     * For a given date string e.g. "Thu Oct 25 2007 22:55:35 GMT+0800 (Malay Peninsula Standard Time)",
+     * getTimezone() first tries to get the timezone abbreviation from between a pair of parentheses
+     * (which may or may not be present), failing which it proceeds to get the timezone abbreviation
+     * from the GMT offset portion of the date string.
+     * @param {Date} date The date
+     * @return {String} The abbreviated timezone name (e.g. 'CST', 'PDT', 'EDT', 'MPST' ...).
+     */
+    getTimezone : function(date) {
+        // the following list shows the differences between date strings from different browsers on a WinXP SP2 machine from an Asian locale:
+        //
+        // Opera  : "Thu, 25 Oct 2007 22:53:45 GMT+0800" -- shortest (weirdest) date string of the lot
+        // Safari : "Thu Oct 25 2007 22:55:35 GMT+0800 (Malay Peninsula Standard Time)" -- value in parentheses always gives the correct timezone (same as FF)
+        // FF     : "Thu Oct 25 2007 22:55:35 GMT+0800 (Malay Peninsula Standard Time)" -- value in parentheses always gives the correct timezone
+        // IE     : "Thu Oct 25 22:54:35 UTC+0800 2007" -- (Asian system setting) look for 3-4 letter timezone abbrev
+        // IE     : "Thu Oct 25 17:06:37 PDT 2007" -- (American system setting) look for 3-4 letter timezone abbrev
+        //
+        // this crazy regex attempts to guess the correct timezone abbreviation despite these differences.
+        // step 1: (?:\((.*)\) -- find timezone in parentheses
+        // step 2: ([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?) -- if nothing was found in step 1, find timezone from timezone offset portion of date string
+        // step 3: remove all non uppercase characters found in step 1 and 2
+        return date.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,5})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/, "$1$2").replace(/[^A-Z]/g, "");
+    },
+
+    /**
+     * Get the offset from GMT of the current date (equivalent to the format specifier 'O').
+     * @param {Date} date The date
+     * @param {Boolean} [colon=false] (optional) true to separate the hours and minutes with a colon.
+     * @return {String} The 4-character offset string prefixed with + or - (e.g. '-0600').
+     */
+    getGMTOffset : function(date, colon) {
+        var offset = date.getTimezoneOffset();
+        return (offset > 0 ? "-" : "+")
+            + Ext.String.leftPad(Math.floor(Math.abs(offset) / 60), 2, "0")
+            + (colon ? ":" : "")
+            + Ext.String.leftPad(Math.abs(offset % 60), 2, "0");
+    },
+
+    /**
+     * Get the numeric day number of the year, adjusted for leap year.
+     * @param {Date} date The date
+     * @return {Number} 0 to 364 (365 in leap years).
+     */
+    getDayOfYear: function(date) {
+        var num = 0,
+            d = Ext.Date.clone(date),
+            m = date.getMonth(),
+            i;
+
+        for (i = 0, d.setDate(1), d.setMonth(0); i < m; d.setMonth(++i)) {
+            num += utilDate.getDaysInMonth(d);
+        }
+        return num + date.getDate() - 1;
+    },
+
+    /**
+     * Get the numeric ISO-8601 week number of the year.
+     * (equivalent to the format specifier 'W', but without a leading zero).
+     * @param {Date} date The date
+     * @return {Number} 1 to 53
+     * @method
+     */
+    getWeekOfYear : (function() {
+        // adapted from http://www.merlyn.demon.co.uk/weekcalc.htm
+        var ms1d = 864e5, // milliseconds in a day
+            ms7d = 7 * ms1d; // milliseconds in a week
+
+        return function(date) { // return a closure so constants get calculated only once
+            var DC3 = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate() + 3) / ms1d, // an Absolute Day Number
+                AWN = Math.floor(DC3 / 7), // an Absolute Week Number
+                Wyr = new Date(AWN * ms7d).getUTCFullYear();
+
+            return AWN - Math.floor(Date.UTC(Wyr, 0, 7) / ms7d) + 1;
+        };
+    }()),
+
+    /**
+     * Checks if the current date falls within a leap year.
+     * @param {Date} date The date
+     * @return {Boolean} True if the current date falls within a leap year, false otherwise.
+     */
+    isLeapYear : function(date) {
+        var year = date.getFullYear();
+        return !!((year & 3) == 0 && (year % 100 || (year % 400 == 0 && year)));
+    },
+
+    /**
+     * Get the first day of the current month, adjusted for leap year.  The returned value
+     * is the numeric day index within the week (0-6) which can be used in conjunction with
+     * the {@link #monthNames} array to retrieve the textual day name.
+     *
+     * Example:
+     *
+     *     var dt = new Date('1/10/2007'),
+     *         firstDay = Ext.Date.getFirstDayOfMonth(dt);
+     *     console.log(Ext.Date.dayNames[firstDay]); // output: 'Monday'
+     *
+     * @param {Date} date The date
+     * @return {Number} The day number (0-6).
+     */
+    getFirstDayOfMonth : function(date) {
+        var day = (date.getDay() - (date.getDate() - 1)) % 7;
+        return (day < 0) ? (day + 7) : day;
+    },
+
+    /**
+     * Get the last day of the current month, adjusted for leap year.  The returned value
+     * is the numeric day index within the week (0-6) which can be used in conjunction with
+     * the {@link #monthNames} array to retrieve the textual day name.
+     *
+     * Example:
+     *
+     *     var dt = new Date('1/10/2007'),
+     *         lastDay = Ext.Date.getLastDayOfMonth(dt);
+     *     console.log(Ext.Date.dayNames[lastDay]); // output: 'Wednesday'
+     *
+     * @param {Date} date The date
+     * @return {Number} The day number (0-6).
+     */
+    getLastDayOfMonth : function(date) {
+        return utilDate.getLastDateOfMonth(date).getDay();
+    },
+
+
+    /**
+     * Get the date of the first day of the month in which this date resides.
+     * @param {Date} date The date
+     * @return {Date}
+     */
+    getFirstDateOfMonth : function(date) {
+        return new Date(date.getFullYear(), date.getMonth(), 1);
+    },
+
+    /**
+     * Get the date of the last day of the month in which this date resides.
+     * @param {Date} date The date
+     * @return {Date}
+     */
+    getLastDateOfMonth : function(date) {
+        return new Date(date.getFullYear(), date.getMonth(), utilDate.getDaysInMonth(date));
+    },
+
+    /**
+     * Get the number of days in the current month, adjusted for leap year.
+     * @param {Date} date The date
+     * @return {Number} The number of days in the month.
+     * @method
+     */
+    getDaysInMonth: (function() {
+        var daysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+        return function(date) { // return a closure for efficiency
+            var m = date.getMonth();
+
+            return m == 1 && utilDate.isLeapYear(date) ? 29 : daysInMonth[m];
+        };
+    }()),
+
+    //<locale type="function">
+    /**
+     * Get the English ordinal suffix of the current day (equivalent to the format specifier 'S').
+     * @param {Date} date The date
+     * @return {String} 'st, 'nd', 'rd' or 'th'.
+     */
+    getSuffix : function(date) {
+        switch (date.getDate()) {
+            case 1:
+            case 21:
+            case 31:
+                return "st";
+            case 2:
+            case 22:
+                return "nd";
+            case 3:
+            case 23:
+                return "rd";
+            default:
+                return "th";
+        }
+    },
+    //</locale>
+
+    /**
+     * Creates and returns a new Date instance with the exact same date value as the called instance.
+     * Dates are copied and passed by reference, so if a copied date variable is modified later, the original
+     * variable will also be changed.  When the intention is to create a new variable that will not
+     * modify the original instance, you should create a clone.
+     *
+     * Example of correctly cloning a date:
+     *
+     *     //wrong way:
+     *     var orig = new Date('10/1/2006');
+     *     var copy = orig;
+     *     copy.setDate(5);
+     *     console.log(orig);  // returns 'Thu Oct 05 2006'!
+     *
+     *     //correct way:
+     *     var orig = new Date('10/1/2006'),
+     *         copy = Ext.Date.clone(orig);
+     *     copy.setDate(5);
+     *     console.log(orig);  // returns 'Thu Oct 01 2006'
+     *
+     * @param {Date} date The date.
+     * @return {Date} The new Date instance.
+     */
+    clone : function(date) {
+        return new Date(date.getTime());
+    },
+
+    /**
+     * Checks if the current date is affected by Daylight Saving Time (DST).
+     * @param {Date} date The date
+     * @return {Boolean} `true` if the current date is affected by DST.
+     */
+    isDST : function(date) {
+        // adapted from http://sencha.com/forum/showthread.php?p=247172#post247172
+        // courtesy of @geoffrey.mcgill
+        return new Date(date.getFullYear(), 0, 1).getTimezoneOffset() != date.getTimezoneOffset();
+    },
+
+    /**
+     * Attempts to clear all time information from this Date by setting the time to midnight of the same day,
+     * automatically adjusting for Daylight Saving Time (DST) where applicable.
+     *
+     * __Note:__ DST timezone information for the browser's host operating system is assumed to be up-to-date.
+     * @param {Date} date The date
+     * @param {Boolean} [clone=false] `true` to create a clone of this date, clear the time and return it.
+     * @return {Date} this or the clone.
+     */
+    clearTime : function(date, clone) {
+        if (clone) {
+            return Ext.Date.clearTime(Ext.Date.clone(date));
+        }
+
+        // get current date before clearing time
+        var d = date.getDate(),
+            hr,
+            c;
+
+        // clear time
+        date.setHours(0);
+        date.setMinutes(0);
+        date.setSeconds(0);
+        date.setMilliseconds(0);
+
+        if (date.getDate() != d) { // account for DST (i.e. day of month changed when setting hour = 0)
+            // note: DST adjustments are assumed to occur in multiples of 1 hour (this is almost always the case)
+            // refer to http://www.timeanddate.com/time/aboutdst.html for the (rare) exceptions to this rule
+
+            // increment hour until cloned date == current date
+            for (hr = 1, c = utilDate.add(date, Ext.Date.HOUR, hr); c.getDate() != d; hr++, c = utilDate.add(date, Ext.Date.HOUR, hr));
+
+            date.setDate(d);
+            date.setHours(c.getHours());
+        }
+
+        return date;
+    },
+
+    /**
+     * Provides a convenient method for performing basic date arithmetic. This method
+     * does not modify the Date instance being called - it creates and returns
+     * a new Date instance containing the resulting date value.
+     *
+     * Examples:
+     *
+     *     // Basic usage:
+     *     var dt = Ext.Date.add(new Date('10/29/2006'), Ext.Date.DAY, 5);
+     *     console.log(dt); // returns 'Fri Nov 03 2006 00:00:00'
+     *
+     *     // Negative values will be subtracted:
+     *     var dt2 = Ext.Date.add(new Date('10/1/2006'), Ext.Date.DAY, -5);
+     *     console.log(dt2); // returns 'Tue Sep 26 2006 00:00:00'
+     *
+     *      // Decimal values can be used:
+     *     var dt3 = Ext.Date.add(new Date('10/1/2006'), Ext.Date.DAY, 1.25);
+     *     console.log(dt3); // returns 'Mon Oct 02 2006 06:00:00'
+     *
+     * @param {Date} date The date to modify
+     * @param {String} interval A valid date interval enum value.
+     * @param {Number} value The amount to add to the current date.
+     * @return {Date} The new Date instance.
+     */
+    add : function(date, interval, value) {
+        var d = Ext.Date.clone(date),
+            Date = Ext.Date,
+            day, decimalValue, base = 0;
+        if (!interval || value === 0) {
+            return d;
+        }
+
+        decimalValue = value - parseInt(value, 10);
+        value = parseInt(value, 10);
+
+        if (value) {
+            switch(interval.toLowerCase()) {
+                // See EXTJSIV-7418. We use setTime() here to deal with issues related to
+                // the switchover that occurs when changing to daylight savings and vice
+                // versa. setTime() handles this correctly where setHour/Minute/Second/Millisecond
+                // do not. Let's assume the DST change occurs at 2am and we're incrementing using add
+                // for 15 minutes at time. When entering DST, we should see:
+                // 01:30am
+                // 01:45am
+                // 03:00am // skip 2am because the hour does not exist
+                // ...
+                // Similarly, leaving DST, we should see:
+                // 01:30am
+                // 01:45am
+                // 01:00am // repeat 1am because that's the change over
+                // 01:30am
+                // 01:45am
+                // 02:00am
+                // ....
+                // 
+                case Ext.Date.MILLI:
+                    d.setTime(d.getTime() + value);
+                    break;
+                case Ext.Date.SECOND:
+                    d.setTime(d.getTime() + value * 1000);
+                    break;
+                case Ext.Date.MINUTE:
+                    d.setTime(d.getTime() + value * 60 * 1000);
+                    break;
+                case Ext.Date.HOUR:
+                    d.setTime(d.getTime() + value * 60 * 60 * 1000);
+                    break;
+                case Ext.Date.DAY:
+                    d.setDate(d.getDate() + value);
+                    break;
+                case Ext.Date.MONTH:
+                    day = date.getDate();
+                    if (day > 28) {
+                        day = Math.min(day, Ext.Date.getLastDateOfMonth(Ext.Date.add(Ext.Date.getFirstDateOfMonth(date), Ext.Date.MONTH, value)).getDate());
+                    }
+                    d.setDate(day);
+                    d.setMonth(date.getMonth() + value);
+                    break;
+                case Ext.Date.YEAR:
+                    day = date.getDate();
+                    if (day > 28) {
+                        day = Math.min(day, Ext.Date.getLastDateOfMonth(Ext.Date.add(Ext.Date.getFirstDateOfMonth(date), Ext.Date.YEAR, value)).getDate());
+                    }
+                    d.setDate(day);
+                    d.setFullYear(date.getFullYear() + value);
+                    break;
+            }
+        }
+
+        if (decimalValue) {
+            switch (interval.toLowerCase()) {
+                case Ext.Date.MILLI:    base = 1;               break;
+                case Ext.Date.SECOND:   base = 1000;            break;
+                case Ext.Date.MINUTE:   base = 1000*60;         break;
+                case Ext.Date.HOUR:     base = 1000*60*60;      break;
+                case Ext.Date.DAY:      base = 1000*60*60*24;   break;
+
+                case Ext.Date.MONTH:
+                    day = utilDate.getDaysInMonth(d);
+                    base = 1000*60*60*24*day;
+                    break;
+
+                case Ext.Date.YEAR:
+                    day = (utilDate.isLeapYear(d) ? 366 : 365);
+                    base = 1000*60*60*24*day;
+                    break;
+            }
+            if (base) {
+                d.setTime(d.getTime() + base * decimalValue); 
+            }
+        }
+
+        return d;
+    },
+    
+    /**
+     * Provides a convenient method for performing basic date arithmetic. This method
+     * does not modify the Date instance being called - it creates and returns
+     * a new Date instance containing the resulting date value.
+     * 
+     * Examples:
+     *
+     *     // Basic usage:
+     *     var dt = Ext.Date.subtract(new Date('10/29/2006'), Ext.Date.DAY, 5);
+     *     console.log(dt); // returns 'Tue Oct 24 2006 00:00:00'
+     *
+     *     // Negative values will be added:
+     *     var dt2 = Ext.Date.subtract(new Date('10/1/2006'), Ext.Date.DAY, -5);
+     *     console.log(dt2); // returns 'Fri Oct 6 2006 00:00:00'
+     *
+     *      // Decimal values can be used:
+     *     var dt3 = Ext.Date.subtract(new Date('10/1/2006'), Ext.Date.DAY, 1.25);
+     *     console.log(dt3); // returns 'Fri Sep 29 2006 06:00:00'
+     * 
+     * @param {Date} date The date to modify
+     * @param {String} interval A valid date interval enum value.
+     * @param {Number} value The amount to subtract from the current date.
+     * @return {Date} The new Date instance.
+     */
+    subtract: function(date, interval, value){
+        return utilDate.add(date, interval, -value);
+    },
+
+    /**
+     * Checks if a date falls on or between the given start and end dates.
+     * @param {Date} date The date to check
+     * @param {Date} start Start date
+     * @param {Date} end End date
+     * @return {Boolean} `true` if this date falls on or between the given start and end dates.
+     */
+    between : function(date, start, end) {
+        var t = date.getTime();
+        return start.getTime() <= t && t <= end.getTime();
+    },
+
+    //Maintains compatibility with old static and prototype window.Date methods.
+    compat: function() {
+        var nativeDate = window.Date,
+            p,
+            statics = ['useStrict', 'formatCodeToRegex', 'parseFunctions', 'parseRegexes', 'formatFunctions', 'y2kYear', 'MILLI', 'SECOND', 'MINUTE', 'HOUR', 'DAY', 'MONTH', 'YEAR', 'defaults', 'dayNames', 'monthNames', 'monthNumbers', 'getShortMonthName', 'getShortDayName', 'getMonthNumber', 'formatCodes', 'isValid', 'parseDate', 'getFormatCode', 'createFormat', 'createParser', 'parseCodes'],
+            proto = ['dateFormat', 'format', 'getTimezone', 'getGMTOffset', 'getDayOfYear', 'getWeekOfYear', 'isLeapYear', 'getFirstDayOfMonth', 'getLastDayOfMonth', 'getDaysInMonth', 'getSuffix', 'clone', 'isDST', 'clearTime', 'add', 'between'],
+            sLen    = statics.length,
+            pLen    = proto.length,
+            stat, prot, s;
+
+        //Append statics
+        for (s = 0; s < sLen; s++) {
+            stat = statics[s];
+            nativeDate[stat] = utilDate[stat];
+        }
+
+        //Append to prototype
+        for (p = 0; p < pLen; p++) {
+            prot = proto[p];
+            nativeDate.prototype[prot] = function() {
+                var args = Array.prototype.slice.call(arguments);
+                args.unshift(this);
+                return utilDate[prot].apply(utilDate, args);
+            };
+        }
+    }
+  });
+};
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require ../lang/Date.js
+// @define Ext.Base
+
+/**
+ * @author Jacky Nguyen <jacky at sencha.com>
+ * @docauthor Jacky Nguyen <jacky at sencha.com>
+ * @class Ext.Base
+ *
+ * The root of all classes created with {@link Ext#define}.
+ *
+ * Ext.Base is the building block of all Ext classes. All classes in Ext inherit from Ext.Base.
+ * All prototype and static members of this class are inherited by all other classes.
+ */
+(function(flexSetter) {
+
+var noArgs = [],
+    Base = function(){},
+    hookFunctionFactory = function(hookFunction, underriddenFunction, methodName, owningClass) {
+        var result = function() {
+            var result = this.callParent(arguments);
+            hookFunction.apply(this, arguments);
+            return result;
+        };
+        result.$name = methodName;
+        result.$owner = owningClass;
+        if (underriddenFunction) {
+            result.$previous = underriddenFunction.$previous;
+            underriddenFunction.$previous = result;
+        }
+        return result;
+    };
+
+    // These static properties will be copied to every newly created class with {@link Ext#define}
+    Ext.apply(Base, {
+        $className: 'Ext.Base',
+
+        $isClass: true,
+
+        /**
+         * Create a new instance of this Class.
+         *
+         *     Ext.define('My.cool.Class', {
+         *         ...
+         *     });
+         *
+         *     My.cool.Class.create({
+         *         someConfig: true
+         *     });
+         *
+         * All parameters are passed to the constructor of the class.
+         *
+         * @return {Object} the created instance.
+         * @static
+         * @inheritable
+         */
+        create: function() {
+            return Ext.create.apply(Ext, [this].concat(Array.prototype.slice.call(arguments, 0)));
+        },
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         * @param config
+         */
+        extend: function(parent) {
+            var parentPrototype = parent.prototype,
+                basePrototype, prototype, i, ln, name, statics;
+
+            prototype = this.prototype = Ext.Object.chain(parentPrototype);
+            prototype.self = this;
+
+            this.superclass = prototype.superclass = parentPrototype;
+
+            if (!parent.$isClass) {
+                basePrototype = Ext.Base.prototype;
+
+                for (i in basePrototype) {
+                    if (i in prototype) {
+                        prototype[i] = basePrototype[i];
+                    }
+                }
+            }
+
+            // Statics inheritance
+            statics = parentPrototype.$inheritableStatics;
+
+            if (statics) {
+                for (i = 0,ln = statics.length; i < ln; i++) {
+                    name = statics[i];
+
+                    if (!this.hasOwnProperty(name)) {
+                        this[name] = parent[name];
+                    }
+                }
+            }
+
+            if (parent.$onExtended) {
+                this.$onExtended = parent.$onExtended.slice();
+            }
+
+            prototype.config = new prototype.configClass();
+            prototype.initConfigList = prototype.initConfigList.slice();
+            prototype.initConfigMap = Ext.clone(prototype.initConfigMap);
+            prototype.configMap = Ext.Object.chain(prototype.configMap);
+        },
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         */
+        $onExtended: [],
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         */
+        triggerExtended: function() {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(this, 'Ext.Base#triggerExtended', arguments);
+        
+            var callbacks = this.$onExtended,
+                ln = callbacks.length,
+                i, callback;
+
+            if (ln > 0) {
+                for (i = 0; i < ln; i++) {
+                    callback = callbacks[i];
+                    callback.fn.apply(callback.scope || this, arguments);
+                }
+            }
+        },
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         */
+        onExtended: function(fn, scope) {
+            this.$onExtended.push({
+                fn: fn,
+                scope: scope
+            });
+
+            return this;
+        },
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         * @param config
+         */
+        addConfig: function(config, fullMerge) {
+            var prototype = this.prototype,
+                configNameCache = Ext.Class.configNameCache,
+                hasConfig = prototype.configMap,
+                initConfigList = prototype.initConfigList,
+                initConfigMap = prototype.initConfigMap,
+                defaultConfig = prototype.config,
+                initializedName, name, value;
+
+            for (name in config) {
+                if (config.hasOwnProperty(name)) {
+                    if (!hasConfig[name]) {
+                        hasConfig[name] = true;
+                    }
+
+                    value = config[name];
+
+                    initializedName = configNameCache[name].initialized;
+
+                    if (!initConfigMap[name] && value !== null && !prototype[initializedName]) {
+                        initConfigMap[name] = true;
+                        initConfigList.push(name);
+                    }
+                }
+            }
+
+            if (fullMerge) {
+                Ext.merge(defaultConfig, config);
+            }
+            else {
+                Ext.mergeIf(defaultConfig, config);
+            }
+
+            prototype.configClass = Ext.Object.classify(defaultConfig);
+        },
+
+        /**
+         * Add / override static properties of this class.
+         *
+         *     Ext.define('My.cool.Class', {
+         *         ...
+         *     });
+         *
+         *     My.cool.Class.addStatics({
+         *         someProperty: 'someValue',      // My.cool.Class.someProperty = 'someValue'
+         *         method1: function() { ... },    // My.cool.Class.method1 = function() { ... };
+         *         method2: function() { ... }     // My.cool.Class.method2 = function() { ... };
+         *     });
+         *
+         * @param {Object} members
+         * @return {Ext.Base} this
+         * @static
+         * @inheritable
+         */
+        addStatics: function(members) {
+            var member, name;
+
+            for (name in members) {
+                if (members.hasOwnProperty(name)) {
+                    member = members[name];
+                    if (typeof member == 'function' && !member.$isClass && member !== Ext.emptyFn && member !== Ext.identityFn) {
+                        member.$owner = this;
+                        member.$name = name;
+                        member.displayName = Ext.getClassName(this) + '.' + name;
+                    }
+                    this[name] = member;
+                }
+            }
+
+            return this;
+        },
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         * @param {Object} members
+         */
+        addInheritableStatics: function(members) {
+            var inheritableStatics,
+                hasInheritableStatics,
+                prototype = this.prototype,
+                name, member;
+
+            inheritableStatics = prototype.$inheritableStatics;
+            hasInheritableStatics = prototype.$hasInheritableStatics;
+
+            if (!inheritableStatics) {
+                inheritableStatics = prototype.$inheritableStatics = [];
+                hasInheritableStatics = prototype.$hasInheritableStatics = {};
+            }
+
+            for (name in members) {
+                if (members.hasOwnProperty(name)) {
+                    member = members[name];
+                    if (typeof member == 'function') {
+                        member.displayName = Ext.getClassName(this) + '.' + name;
+                    }
+                    this[name] = member;
+
+                    if (!hasInheritableStatics[name]) {
+                        hasInheritableStatics[name] = true;
+                        inheritableStatics.push(name);
+                    }
+                }
+            }
+
+            return this;
+        },
+
+        /**
+         * Add methods / properties to the prototype of this class.
+         *
+         *     Ext.define('My.awesome.Cat', {
+         *         constructor: function() {
+         *             ...
+         *         }
+         *     });
+         *
+         *      My.awesome.Cat.addMembers({
+         *          meow: function() {
+         *             alert('Meowww...');
+         *          }
+         *      });
+         *
+         *      var kitty = new My.awesome.Cat;
+         *      kitty.meow();
+         *
+         * @param {Object} members
+         * @static
+         * @inheritable
+         */
+        addMembers: function(members) {
+            var prototype = this.prototype,
+                enumerables = Ext.enumerables,
+                names = [],
+                i, ln, name, member;
+
+            for (name in members) {
+                names.push(name);
+            }
+
+            if (enumerables) {
+                names.push.apply(names, enumerables);
+            }
+
+            for (i = 0,ln = names.length; i < ln; i++) {
+                name = names[i];
+
+                if (members.hasOwnProperty(name)) {
+                    member = members[name];
+
+                    if (typeof member == 'function' && !member.$isClass && member !== Ext.emptyFn && member !== Ext.identityFn) {
+                        member.$owner = this;
+                        member.$name = name;
+                        member.displayName = (this.$className || '') + '#' + name;
+                    }
+
+                    prototype[name] = member;
+                }
+            }
+
+            return this;
+        },
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         * @param name
+         * @param member
+         */
+        addMember: function(name, member) {            
+            if (typeof member == 'function' && !member.$isClass && member !== Ext.emptyFn && member !== Ext.identityFn) {
+                member.$owner = this;
+                member.$name = name;
+                member.displayName = (this.$className || '') + '#' + name;
+            }
+
+            this.prototype[name] = member;
+            return this;
+        },
+
+        /**
+         * Adds members to class.
+         * @static
+         * @inheritable
+         * @deprecated 4.1 Use {@link #addMembers} instead.
+         */
+        implement: function() {
+            this.addMembers.apply(this, arguments);
+        },
+
+        /**
+         * Borrow another class' members to the prototype of this class.
+         *
+         *     Ext.define('Bank', {
+         *         money: '$$$',
+         *         printMoney: function() {
+         *             alert('$$$$$$$');
+         *         }
+         *     });
+         *
+         *     Ext.define('Thief', {
+         *         ...
+         *     });
+         *
+         *     Thief.borrow(Bank, ['money', 'printMoney']);
+         *
+         *     var steve = new Thief();
+         *
+         *     alert(steve.money); // alerts '$$$'
+         *     steve.printMoney(); // alerts '$$$$$$$'
+         *
+         * @param {Ext.Base} fromClass The class to borrow members from
+         * @param {Array/String} members The names of the members to borrow
+         * @return {Ext.Base} this
+         * @static
+         * @inheritable
+         * @private
+         */
+        borrow: function(fromClass, members) {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(this, 'Ext.Base#borrow', arguments);
+            
+            var prototype = this.prototype,
+                fromPrototype = fromClass.prototype,
+                className = Ext.getClassName(this),
+                i, ln, name, fn, toBorrow;
+
+            members = Ext.Array.from(members);
+
+            for (i = 0,ln = members.length; i < ln; i++) {
+                name = members[i];
+
+                toBorrow = fromPrototype[name];
+
+                if (typeof toBorrow == 'function') {
+                    fn = Ext.Function.clone(toBorrow);
+
+                    if (className) {
+                        fn.displayName = className + '#' + name;
+                    }
+
+                    fn.$owner = this;
+                    fn.$name = name;
+
+                    prototype[name] = fn;
+                }
+                else {
+                    prototype[name] = toBorrow;
+                }
+            }
+
+            return this;
+        },
+
+        /**
+         * Override members of this class. Overridden methods can be invoked via
+         * {@link Ext.Base#callParent}.
+         *
+         *     Ext.define('My.Cat', {
+         *         constructor: function() {
+         *             alert("I'm a cat!");
+         *         }
+         *     });
+         *
+         *     My.Cat.override({
+         *         constructor: function() {
+         *             alert("I'm going to be a cat!");
+         *
+         *             this.callParent(arguments);
+         *
+         *             alert("Meeeeoooowwww");
+         *         }
+         *     });
+         *
+         *     var kitty = new My.Cat(); // alerts "I'm going to be a cat!"
+         *                               // alerts "I'm a cat!"
+         *                               // alerts "Meeeeoooowwww"
+         *
+         * As of 4.1, direct use of this method is deprecated. Use {@link Ext#define Ext.define}
+         * instead:
+         *
+         *     Ext.define('My.CatOverride', {
+         *         override: 'My.Cat',
+         *         constructor: function() {
+         *             alert("I'm going to be a cat!");
+         *
+         *             this.callParent(arguments);
+         *
+         *             alert("Meeeeoooowwww");
+         *         }
+         *     });
+         *
+         * The above accomplishes the same result but can be managed by the {@link Ext.Loader}
+         * which can properly order the override and its target class and the build process
+         * can determine whether the override is needed based on the required state of the
+         * target class (My.Cat).
+         *
+         * @param {Object} members The properties to add to this class. This should be
+         * specified as an object literal containing one or more properties.
+         * @return {Ext.Base} this class
+         * @static
+         * @inheritable
+         * @markdown
+         * @deprecated 4.1.0 Use {@link Ext#define Ext.define} instead
+         */
+        override: function(members) {
+            var me = this,
+                enumerables = Ext.enumerables,
+                target = me.prototype,
+                cloneFunction = Ext.Function.clone,
+                name, index, member, statics, names, previous;
+
+            if (arguments.length === 2) {
+                name = members;
+                members = {};
+                members[name] = arguments[1];
+                enumerables = null;
+            }
+
+            do {
+                names = []; // clean slate for prototype (1st pass) and static (2nd pass)
+                statics = null; // not needed 1st pass, but needs to be cleared for 2nd pass
+
+                for (name in members) { // hasOwnProperty is checked in the next loop...
+                    if (name == 'statics') {
+                        statics = members[name];
+                    } else if (name == 'inheritableStatics'){
+                        me.addInheritableStatics(members[name]);
+                    } else if (name == 'config') {
+                        me.addConfig(members[name], true);
+                    } else {
+                        names.push(name);
+                    }
+                }
+
+                if (enumerables) {
+                    names.push.apply(names, enumerables);
+                }
+
+                for (index = names.length; index--; ) {
+                    name = names[index];
+
+                    if (members.hasOwnProperty(name)) {
+                        member = members[name];
+
+                        if (typeof member == 'function' && !member.$className && member !== Ext.emptyFn && member !== Ext.identityFn) {
+                            if (typeof member.$owner != 'undefined') {
+                                member = cloneFunction(member);
+                            }
+
+                            if (me.$className) {
+                                member.displayName = me.$className + '#' + name;
+                            }
+
+                            member.$owner = me;
+                            member.$name = name;
+
+                            previous = target[name];
+                            if (previous) {
+                                member.$previous = previous;
+                            }
+                        }
+
+                        target[name] = member;
+                    }
+                }
+
+                target = me; // 2nd pass is for statics
+                members = statics; // statics will be null on 2nd pass
+            } while (members);
+
+            return this;
+        },
+
+        // Documented downwards
+        callParent: function(args) {
+            var method;
+
+            // This code is intentionally inlined for the least number of debugger stepping
+            return (method = this.callParent.caller) && (method.$previous ||
+                  ((method = method.$owner ? method : method.caller) &&
+                        method.$owner.superclass.self[method.$name])).apply(this, args || noArgs);
+        },
+
+        // Documented downwards
+        callSuper: function(args) {
+            var method;
+
+            // This code is intentionally inlined for the least number of debugger stepping
+            return (method = this.callSuper.caller) &&
+                    ((method = method.$owner ? method : method.caller) &&
+                      method.$owner.superclass.self[method.$name]).apply(this, args || noArgs);
+        },
+
+        /**
+         * Used internally by the mixins pre-processor
+         * @private
+         * @static
+         * @inheritable
+         */
+        mixin: function(name, mixinClass) {
+            var me = this,
+                mixin = mixinClass.prototype,
+                prototype = me.prototype,
+                key, statics, i, ln, staticName,
+                mixinValue, hookKey, hookFunction;
+
+            if (typeof mixin.onClassMixedIn != 'undefined') {
+                mixin.onClassMixedIn.call(mixinClass, me);
+            }
+
+            if (!prototype.hasOwnProperty('mixins')) {
+                if ('mixins' in prototype) {
+                    prototype.mixins = Ext.Object.chain(prototype.mixins);
+                }
+                else {
+                    prototype.mixins = {};
+                }
+            }
+
+            for (key in mixin) {
+                mixinValue = mixin[key];
+                if (key === 'mixins') {
+                    Ext.merge(prototype.mixins, mixinValue);
+                }
+                else if (key === 'xhooks') {
+                    for (hookKey in mixinValue) {
+                        hookFunction = mixinValue[hookKey];
+
+                        // Mixed in xhook methods cannot call a parent.
+                        hookFunction.$previous = Ext.emptyFn;
+
+                        if (prototype.hasOwnProperty(hookKey)) {
+
+                            // Pass the hook function, and the existing function which it is to underride.
+                            // The existing function has its $previous pointer replaced by a closure
+                            // which calls the hookFunction and then the existing function's original $previous
+                            hookFunctionFactory(hookFunction, prototype[hookKey], hookKey, me);
+                        } else {
+                            // There's no original function, so generate an implementation which calls
+                            // the hook function. It will not get any $previous pointer.
+                            prototype[hookKey] = hookFunctionFactory(hookFunction, null, hookKey, me);
+                        }
+                    }
+                }
+                else if (!(key === 'mixinId' || key === 'config') && (prototype[key] === undefined)) {
+                    prototype[key] = mixinValue;
+                }
+            }
+
+            // Mixin statics inheritance
+            statics = mixin.$inheritableStatics;
+
+            if (statics) {
+                for (i = 0, ln = statics.length; i < ln; i++) {
+                    staticName = statics[i];
+
+                    if (!me.hasOwnProperty(staticName)) {
+                        me[staticName] = mixinClass[staticName];
+                    }
+                }
+            }
+
+            if ('config' in mixin) {
+                me.addConfig(mixin.config, false);
+            }
+
+            prototype.mixins[name] = mixin;
+            return me;
+        },
+
+        /**
+         * Get the current class' name in string format.
+         *
+         *     Ext.define('My.cool.Class', {
+         *         constructor: function() {
+         *             alert(this.self.getName()); // alerts 'My.cool.Class'
+         *         }
+         *     });
+         *
+         *     My.cool.Class.getName(); // 'My.cool.Class'
+         *
+         * @return {String} className
+         * @static
+         * @inheritable
+         */
+        getName: function() {
+            return Ext.getClassName(this);
+        },
+
+        /**
+         * Create aliases for existing prototype methods. Example:
+         *
+         *     Ext.define('My.cool.Class', {
+         *         method1: function() { ... },
+         *         method2: function() { ... }
+         *     });
+         *
+         *     var test = new My.cool.Class();
+         *
+         *     My.cool.Class.createAlias({
+         *         method3: 'method1',
+         *         method4: 'method2'
+         *     });
+         *
+         *     test.method3(); // test.method1()
+         *
+         *     My.cool.Class.createAlias('method5', 'method3');
+         *
+         *     test.method5(); // test.method3() -> test.method1()
+         *
+         * @param {String/Object} alias The new method name, or an object to set multiple aliases. See
+         * {@link Ext.Function#flexSetter flexSetter}
+         * @param {String/Object} origin The original method name
+         * @static
+         * @inheritable
+         * @method
+         */
+        createAlias: flexSetter(function(alias, origin) {
+            this.override(alias, function() {
+                return this[origin].apply(this, arguments);
+            });
+        }),
+
+        /**
+         * @private
+         * @static
+         * @inheritable
+         */
+        addXtype: function(xtype) {
+            var prototype = this.prototype,
+                xtypesMap = prototype.xtypesMap,
+                xtypes = prototype.xtypes,
+                xtypesChain = prototype.xtypesChain;
+
+            if (!prototype.hasOwnProperty('xtypesMap')) {
+                xtypesMap = prototype.xtypesMap = Ext.merge({}, prototype.xtypesMap || {});
+                xtypes = prototype.xtypes = prototype.xtypes ? [].concat(prototype.xtypes) : [];
+                xtypesChain = prototype.xtypesChain = prototype.xtypesChain ? [].concat(prototype.xtypesChain) : [];
+                prototype.xtype = xtype;
+            }
+
+            if (!xtypesMap[xtype]) {
+                xtypesMap[xtype] = true;
+                xtypes.push(xtype);
+                xtypesChain.push(xtype);
+                Ext.ClassManager.setAlias(this, 'widget.' + xtype);
+            }
+
+            return this;
+        }
+    });
+
+    Base.implement({
+        /** @private */
+        isInstance: true,
+
+        /** @private */
+        $className: 'Ext.Base',
+
+        /** @private */
+        configClass: Ext.emptyFn,
+
+        /** @private */
+        initConfigList: [],
+
+        /** @private */
+        configMap: {},
+
+        /** @private */
+        initConfigMap: {},
+
+        /**
+         * Get the reference to the class from which this object was instantiated. Note that unlike {@link Ext.Base#self},
+         * `this.statics()` is scope-independent and it always returns the class from which it was called, regardless of what
+         * `this` points to during run-time
+         *
+         *     Ext.define('My.Cat', {
+         *         statics: {
+         *             totalCreated: 0,
+         *             speciesName: 'Cat' // My.Cat.speciesName = 'Cat'
+         *         },
+         *
+         *         constructor: function() {
+         *             var statics = this.statics();
+         *
+         *             alert(statics.speciesName);     // always equals to 'Cat' no matter what 'this' refers to
+         *                                             // equivalent to: My.Cat.speciesName
+         *
+         *             alert(this.self.speciesName);   // dependent on 'this'
+         *
+         *             statics.totalCreated++;
+         *         },
+         *
+         *         clone: function() {
+         *             var cloned = new this.self;                      // dependent on 'this'
+         *
+         *             cloned.groupName = this.statics().speciesName;   // equivalent to: My.Cat.speciesName
+         *
+         *             return cloned;
+         *         }
+         *     });
+         *
+         *
+         *     Ext.define('My.SnowLeopard', {
+         *         extend: 'My.Cat',
+         *
+         *         statics: {
+         *             speciesName: 'Snow Leopard'     // My.SnowLeopard.speciesName = 'Snow Leopard'
+         *         },
+         *
+         *         constructor: function() {
+         *             this.callParent();
+         *         }
+         *     });
+         *
+         *     var cat = new My.Cat();                 // alerts 'Cat', then alerts 'Cat'
+         *
+         *     var snowLeopard = new My.SnowLeopard(); // alerts 'Cat', then alerts 'Snow Leopard'
+         *
+         *     var clone = snowLeopard.clone();
+         *     alert(Ext.getClassName(clone));         // alerts 'My.SnowLeopard'
+         *     alert(clone.groupName);                 // alerts 'Cat'
+         *
+         *     alert(My.Cat.totalCreated);             // alerts 3
+         *
+         * @protected
+         * @return {Ext.Class}
+         */
+        statics: function() {
+            var method = this.statics.caller,
+                self = this.self;
+
+            if (!method) {
+                return self;
+            }
+
+            return method.$owner;
+        },
+
+        /**
+         * Call the "parent" method of the current method. That is the method previously
+         * overridden by derivation or by an override (see {@link Ext#define}).
+         *
+         *      Ext.define('My.Base', {
+         *          constructor: function (x) {
+         *              this.x = x;
+         *          },
+         *
+         *          statics: {
+         *              method: function (x) {
+         *                  return x;
+         *              }
+         *          }
+         *      });
+         *
+         *      Ext.define('My.Derived', {
+         *          extend: 'My.Base',
+         *
+         *          constructor: function () {
+         *              this.callParent([21]);
+         *          }
+         *      });
+         *
+         *      var obj = new My.Derived();
+         *
+         *      alert(obj.x);  // alerts 21
+         *
+         * This can be used with an override as follows:
+         *
+         *      Ext.define('My.DerivedOverride', {
+         *          override: 'My.Derived',
+         *
+         *          constructor: function (x) {
+         *              this.callParent([x*2]); // calls original My.Derived constructor
+         *          }
+         *      });
+         *
+         *      var obj = new My.Derived();
+         *
+         *      alert(obj.x);  // now alerts 42
+         *
+         * This also works with static methods.
+         *
+         *      Ext.define('My.Derived2', {
+         *          extend: 'My.Base',
+         *
+         *          statics: {
+         *              method: function (x) {
+         *                  return this.callParent([x*2]); // calls My.Base.method
+         *              }
+         *          }
+         *      });
+         *
+         *      alert(My.Base.method(10);     // alerts 10
+         *      alert(My.Derived2.method(10); // alerts 20
+         *
+         * Lastly, it also works with overridden static methods.
+         *
+         *      Ext.define('My.Derived2Override', {
+         *          override: 'My.Derived2',
+         *
+         *          statics: {
+         *              method: function (x) {
+         *                  return this.callParent([x*2]); // calls My.Derived2.method
+         *              }
+         *          }
+         *      });
+         *
+         *      alert(My.Derived2.method(10); // now alerts 40
+         *
+         * To override a method and replace it and also call the superclass method, use
+         * {@link #callSuper}. This is often done to patch a method to fix a bug.
+         *
+         * @protected
+         * @param {Array/Arguments} args The arguments, either an array or the `arguments` object
+         * from the current method, for example: `this.callParent(arguments)`
+         * @return {Object} Returns the result of calling the parent method
+         */
+        callParent: function(args) {
+            // NOTE: this code is deliberately as few expressions (and no function calls)
+            // as possible so that a debugger can skip over this noise with the minimum number
+            // of steps. Basically, just hit Step Into until you are where you really wanted
+            // to be.
+            var method,
+                superMethod = (method = this.callParent.caller) && (method.$previous ||
+                        ((method = method.$owner ? method : method.caller) &&
+                                method.$owner.superclass[method.$name]));
+
+            if (!superMethod) {
+                method = this.callParent.caller;
+                var parentClass, methodName;
+
+                if (!method.$owner) {
+                    if (!method.caller) {
+                        throw new Error("Attempting to call a protected method from the public scope, which is not allowed");
+                    }
+
+                    method = method.caller;
+                }
+
+                parentClass = method.$owner.superclass;
+                methodName = method.$name;
+
+                if (!(methodName in parentClass)) {
+                    throw new Error("this.callParent() was called but there's no such method (" + methodName +
+                                ") found in the parent class (" + (Ext.getClassName(parentClass) || 'Object') + ")");
+                }
+            }
+
+            return superMethod.apply(this, args || noArgs);
+        },
+
+        /**
+         * This method is used by an override to call the superclass method but bypass any
+         * overridden method. This is often done to "patch" a method that contains a bug
+         * but for whatever reason cannot be fixed directly.
+         * 
+         * Consider:
+         * 
+         *      Ext.define('Ext.some.Class', {
+         *          method: function () {
+         *              console.log('Good');
+         *          }
+         *      });
+         * 
+         *      Ext.define('Ext.some.DerivedClass', {
+         *          method: function () {
+         *              console.log('Bad');
+         * 
+         *              // ... logic but with a bug ...
+         *              
+         *              this.callParent();
+         *          }
+         *      });
+         * 
+         * To patch the bug in `DerivedClass.method`, the typical solution is to create an
+         * override:
+         * 
+         *      Ext.define('App.paches.DerivedClass', {
+         *          override: 'Ext.some.DerivedClass',
+         *          
+         *          method: function () {
+         *              console.log('Fixed');
+         * 
+         *              // ... logic but with bug fixed ...
+         *
+         *              this.callSuper();
+         *          }
+         *      });
+         * 
+         * The patch method cannot use `callParent` to call the superclass `method` since
+         * that would call the overridden method containing the bug. In other words, the
+         * above patch would only produce "Fixed" then "Good" in the console log, whereas,
+         * using `callParent` would produce "Fixed" then "Bad" then "Good".
+         *
+         * @protected
+         * @param {Array/Arguments} args The arguments, either an array or the `arguments` object
+         * from the current method, for example: `this.callSuper(arguments)`
+         * @return {Object} Returns the result of calling the superclass method
+         */
+        callSuper: function(args) {
+            // NOTE: this code is deliberately as few expressions (and no function calls)
+            // as possible so that a debugger can skip over this noise with the minimum number
+            // of steps. Basically, just hit Step Into until you are where you really wanted
+            // to be.
+            var method,
+                superMethod = (method = this.callSuper.caller) &&
+                        ((method = method.$owner ? method : method.caller) &&
+                          method.$owner.superclass[method.$name]);
+
+            if (!superMethod) {
+                method = this.callSuper.caller;
+                var parentClass, methodName;
+
+                if (!method.$owner) {
+                    if (!method.caller) {
+                        throw new Error("Attempting to call a protected method from the public scope, which is not allowed");
+                    }
+
+                    method = method.caller;
+                }
+
+                parentClass = method.$owner.superclass;
+                methodName = method.$name;
+
+                if (!(methodName in parentClass)) {
+                    throw new Error("this.callSuper() was called but there's no such method (" + methodName +
+                                ") found in the parent class (" + (Ext.getClassName(parentClass) || 'Object') + ")");
+                }
+            }
+
+            return superMethod.apply(this, args || noArgs);
+        },
+
+        /**
+         * @property {Ext.Class} self
+         *
+         * Get the reference to the current class from which this object was instantiated. Unlike {@link Ext.Base#statics},
+         * `this.self` is scope-dependent and it's meant to be used for dynamic inheritance. See {@link Ext.Base#statics}
+         * for a detailed comparison
+         *
+         *     Ext.define('My.Cat', {
+         *         statics: {
+         *             speciesName: 'Cat' // My.Cat.speciesName = 'Cat'
+         *         },
+         *
+         *         constructor: function() {
+         *             alert(this.self.speciesName); // dependent on 'this'
+         *         },
+         *
+         *         clone: function() {
+         *             return new this.self();
+         *         }
+         *     });
+         *
+         *
+         *     Ext.define('My.SnowLeopard', {
+         *         extend: 'My.Cat',
+         *         statics: {
+         *             speciesName: 'Snow Leopard'         // My.SnowLeopard.speciesName = 'Snow Leopard'
+         *         }
+         *     });
+         *
+         *     var cat = new My.Cat();                     // alerts 'Cat'
+         *     var snowLeopard = new My.SnowLeopard();     // alerts 'Snow Leopard'
+         *
+         *     var clone = snowLeopard.clone();
+         *     alert(Ext.getClassName(clone));             // alerts 'My.SnowLeopard'
+         *
+         * @protected
+         */
+        self: Base,
+
+        // Default constructor, simply returns `this`
+        constructor: function() {
+            return this;
+        },
+
+        /**
+         * Initialize configuration for this class. a typical example:
+         *
+         *     Ext.define('My.awesome.Class', {
+         *         // The default config
+         *         config: {
+         *             name: 'Awesome',
+         *             isAwesome: true
+         *         },
+         *
+         *         constructor: function(config) {
+         *             this.initConfig(config);
+         *         }
+         *     });
+         *
+         *     var awesome = new My.awesome.Class({
+         *         name: 'Super Awesome'
+         *     });
+         *
+         *     alert(awesome.getName()); // 'Super Awesome'
+         *
+         * @protected
+         * @param {Object} config
+         * @return {Ext.Base} this
+         */
+        initConfig: function(config) {
+            var instanceConfig = config,
+                configNameCache = Ext.Class.configNameCache,
+                defaultConfig = new this.configClass(),
+                defaultConfigList = this.initConfigList,
+                hasConfig = this.configMap,
+                nameMap, i, ln, name, initializedName;
+
+            this.initConfig = Ext.emptyFn;
+
+            this.initialConfig = instanceConfig || {};
+
+            this.config = config = (instanceConfig) ? Ext.merge(defaultConfig, config) : defaultConfig;
+
+            if (instanceConfig) {
+                defaultConfigList = defaultConfigList.slice();
+
+                for (name in instanceConfig) {
+                    if (hasConfig[name]) {
+                        if (instanceConfig[name] !== null) {
+                            defaultConfigList.push(name);
+                            this[configNameCache[name].initialized] = false;
+                        }
+                    }
+                }
+            }
+
+            for (i = 0,ln = defaultConfigList.length; i < ln; i++) {
+                name = defaultConfigList[i];
+                nameMap = configNameCache[name];
+                initializedName = nameMap.initialized;
+
+                if (!this[initializedName]) {
+                    this[initializedName] = true;
+                    this[nameMap.set].call(this, config[name]);
+                }
+            }
+
+            return this;
+        },
+
+        /**
+         * @private
+         * @param config
+         */
+        hasConfig: function(name) {
+            return Boolean(this.configMap[name]);
+        },
+
+        /**
+         * @private
+         */
+        setConfig: function(config, applyIfNotSet) {
+            if (!config) {
+                return this;
+            }
+
+            var configNameCache = Ext.Class.configNameCache,
+                currentConfig = this.config,
+                hasConfig = this.configMap,
+                initialConfig = this.initialConfig,
+                name, value;
+
+            applyIfNotSet = Boolean(applyIfNotSet);
+
+            for (name in config) {
+                if (applyIfNotSet && initialConfig.hasOwnProperty(name)) {
+                    continue;
+                }
+
+                value = config[name];
+                currentConfig[name] = value;
+
+                if (hasConfig[name]) {
+                    this[configNameCache[name].set](value);
+                }
+            }
+
+            return this;
+        },
+
+        /**
+         * @private
+         * @param name
+         */
+        getConfig: function(name) {
+            var configNameCache = Ext.Class.configNameCache;
+
+            return this[configNameCache[name].get]();
+        },
+
+        /**
+         * Returns the initial configuration passed to constructor when instantiating
+         * this class.
+         * @param {String} [name] Name of the config option to return.
+         * @return {Object/Mixed} The full config object or a single config value
+         * when `name` parameter specified.
+         */
+        getInitialConfig: function(name) {
+            var config = this.config;
+
+            if (!name) {
+                return config;
+            }
+            else {
+                return config[name];
+            }
+        },
+
+        /**
+         * @private
+         * @param names
+         * @param callback
+         * @param scope
+         */
+        onConfigUpdate: function(names, callback, scope) {
+            var self = this.self,
+                className = self.$className,
+                i, ln, name,
+                updaterName, updater, newUpdater;
+
+            names = Ext.Array.from(names);
+
+            scope = scope || this;
+
+            for (i = 0,ln = names.length; i < ln; i++) {
+                name = names[i];
+                updaterName = 'update' + Ext.String.capitalize(name);
+                updater = this[updaterName] || Ext.emptyFn;
+                newUpdater = function() {
+                    updater.apply(this, arguments);
+                    scope[callback].apply(scope, arguments);
+                };
+                newUpdater.$name = updaterName;
+                newUpdater.$owner = self;
+                newUpdater.displayName = className + '#' + updaterName;
+
+                this[updaterName] = newUpdater;
+            }
+        },
+
+        /**
+         * @private
+         */
+        destroy: function() {
+            this.destroy = Ext.emptyFn;
+        }
+    });
+
+    /**
+     * Call the original method that was previously overridden with {@link Ext.Base#override}
+     *
+     *     Ext.define('My.Cat', {
+     *         constructor: function() {
+     *             alert("I'm a cat!");
+     *         }
+     *     });
+     *
+     *     My.Cat.override({
+     *         constructor: function() {
+     *             alert("I'm going to be a cat!");
+     *
+     *             this.callOverridden();
+     *
+     *             alert("Meeeeoooowwww");
+     *         }
+     *     });
+     *
+     *     var kitty = new My.Cat(); // alerts "I'm going to be a cat!"
+     *                               // alerts "I'm a cat!"
+     *                               // alerts "Meeeeoooowwww"
+     *
+     * @param {Array/Arguments} args The arguments, either an array or the `arguments` object
+     * from the current method, for example: `this.callOverridden(arguments)`
+     * @return {Object} Returns the result of calling the overridden method
+     * @protected
+     * @deprecated as of 4.1. Use {@link #callParent} instead.
+     */
+    Base.prototype.callOverridden = Base.prototype.callParent;
+
+    Ext.Base = Base;
+
+}(Ext.Function.flexSetter));
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require Base.js
+// @define Ext.Class
+
+/**
+ * @author Jacky Nguyen <jacky at sencha.com>
+ * @docauthor Jacky Nguyen <jacky at sencha.com>
+ * @class Ext.Class
+ *
+ * Handles class creation throughout the framework. This is a low level factory that is used by Ext.ClassManager and generally
+ * should not be used directly. If you choose to use Ext.Class you will lose out on the namespace, aliasing and depency loading
+ * features made available by Ext.ClassManager. The only time you would use Ext.Class directly is to create an anonymous class.
+ *
+ * If you wish to create a class you should use {@link Ext#define Ext.define} which aliases
+ * {@link Ext.ClassManager#create Ext.ClassManager.create} to enable namespacing and dynamic dependency resolution.
+ *
+ * Ext.Class is the factory and **not** the superclass of everything. For the base class that **all** Ext classes inherit
+ * from, see {@link Ext.Base}.
+ */
+(function() {
+    var ExtClass,
+        Base = Ext.Base,
+        baseStaticMembers = [],
+        baseStaticMember, baseStaticMemberLength;
+
+    for (baseStaticMember in Base) {
+        if (Base.hasOwnProperty(baseStaticMember)) {
+            baseStaticMembers.push(baseStaticMember);
+        }
+    }
+
+    baseStaticMemberLength = baseStaticMembers.length;
+
+    // Creates a constructor that has nothing extra in its scope chain.
+    function makeCtor (className) {
+        function constructor () {
+            // Opera has some problems returning from a constructor when Dragonfly isn't running. The || null seems to
+            // be sufficient to stop it misbehaving. Known to be required against 10.53, 11.51 and 11.61.
+            return this.constructor.apply(this, arguments) || null;
+        }
+        if (className) {
+            constructor.displayName = className;
+        }
+        return constructor;
+    }
+
+    /**
+     * @method constructor
+     * Create a new anonymous class.
+     *
+     * @param {Object} data An object represent the properties of this class
+     * @param {Function} onCreated Optional, the callback function to be executed when this class is fully created.
+     * Note that the creation process can be asynchronous depending on the pre-processors used.
+     *
+     * @return {Ext.Base} The newly created class
+     */
+    Ext.Class = ExtClass = function(Class, data, onCreated) {
+        if (typeof Class != 'function') {
+            onCreated = data;
+            data = Class;
+            Class = null;
+        }
+
+        if (!data) {
+            data = {};
+        }
+
+        Class = ExtClass.create(Class, data);
+
+        ExtClass.process(Class, data, onCreated);
+
+        return Class;
+    };
+
+    Ext.apply(ExtClass, {
+        /**
+         * @private
+         */
+        onBeforeCreated: function(Class, data, hooks) {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(Class, '>> Ext.Class#onBeforeCreated', arguments);
+        
+            Class.addMembers(data);
+
+            hooks.onCreated.call(Class, Class);
+            
+            Ext.classSystemMonitor && Ext.classSystemMonitor(Class, '<< Ext.Class#onBeforeCreated', arguments);
+        },
+
+        /**
+         * @private
+         */
+        create: function(Class, data) {
+            var name, i;
+
+            if (!Class) {
+                Class = makeCtor(
+                    data.$className
+                );
+            }
+
+            for (i = 0; i < baseStaticMemberLength; i++) {
+                name = baseStaticMembers[i];
+                Class[name] = Base[name];
+            }
+
+            return Class;
+        },
+
+        /**
+         * @private
+         */
+        process: function(Class, data, onCreated) {
+            var preprocessorStack = data.preprocessors || ExtClass.defaultPreprocessors,
+                registeredPreprocessors = this.preprocessors,
+                hooks = {
+                    onBeforeCreated: this.onBeforeCreated
+                },
+                preprocessors = [],
+                preprocessor, preprocessorsProperties,
+                i, ln, j, subLn, preprocessorProperty;
+
+            delete data.preprocessors;
+
+            for (i = 0,ln = preprocessorStack.length; i < ln; i++) {
+                preprocessor = preprocessorStack[i];
+
+                if (typeof preprocessor == 'string') {
+                    preprocessor = registeredPreprocessors[preprocessor];
+                    preprocessorsProperties = preprocessor.properties;
+
+                    if (preprocessorsProperties === true) {
+                        preprocessors.push(preprocessor.fn);
+                    }
+                    else if (preprocessorsProperties) {
+                        for (j = 0,subLn = preprocessorsProperties.length; j < subLn; j++) {
+                            preprocessorProperty = preprocessorsProperties[j];
+
+                            if (data.hasOwnProperty(preprocessorProperty)) {
+                                preprocessors.push(preprocessor.fn);
+                                break;
+                            }
+                        }
+                    }
+                }
+                else {
+                    preprocessors.push(preprocessor);
+                }
+            }
+
+            hooks.onCreated = onCreated ? onCreated : Ext.emptyFn;
+            hooks.preprocessors = preprocessors;
+
+            this.doProcess(Class, data, hooks);
+        },
+        
+        doProcess: function(Class, data, hooks) {
+            var me = this,
+                preprocessors = hooks.preprocessors,
+                preprocessor = preprocessors.shift(),
+                doProcess = me.doProcess;
+
+            for ( ; preprocessor ; preprocessor = preprocessors.shift()) {
+                // Returning false signifies an asynchronous preprocessor - it will call doProcess when we can continue
+                if (preprocessor.call(me, Class, data, hooks, doProcess) === false) {
+                    return;
+                }
+            }
+            hooks.onBeforeCreated.apply(me, arguments);
+        },
+
+        /** @private */
+        preprocessors: {},
+
+        /**
+         * Register a new pre-processor to be used during the class creation process
+         *
+         * @param {String} name The pre-processor's name
+         * @param {Function} fn The callback function to be executed. Typical format:
+         *
+         *     function(cls, data, fn) {
+         *         // Your code here
+         *
+         *         // Execute this when the processing is finished.
+         *         // Asynchronous processing is perfectly ok
+         *         if (fn) {
+         *             fn.call(this, cls, data);
+         *         }
+         *     });
+         *
+         * @param {Function} fn.cls The created class
+         * @param {Object} fn.data The set of properties passed in {@link Ext.Class} constructor
+         * @param {Function} fn.fn The callback function that **must** to be executed when this
+         * pre-processor finishes, regardless of whether the processing is synchronous or aynchronous.
+         * @return {Ext.Class} this
+         * @private
+         * @static
+         */
+        registerPreprocessor: function(name, fn, properties, position, relativeTo) {
+            if (!position) {
+                position = 'last';
+            }
+
+            if (!properties) {
+                properties = [name];
+            }
+
+            this.preprocessors[name] = {
+                name: name,
+                properties: properties || false,
+                fn: fn
+            };
+
+            this.setDefaultPreprocessorPosition(name, position, relativeTo);
+
+            return this;
+        },
+
+        /**
+         * Retrieve a pre-processor callback function by its name, which has been registered before
+         *
+         * @param {String} name
+         * @return {Function} preprocessor
+         * @private
+         * @static
+         */
+        getPreprocessor: function(name) {
+            return this.preprocessors[name];
+        },
+
+        /**
+         * @private
+         */
+        getPreprocessors: function() {
+            return this.preprocessors;
+        },
+
+        /**
+         * @private
+         */
+        defaultPreprocessors: [],
+
+        /**
+         * Retrieve the array stack of default pre-processors
+         * @return {Function[]} defaultPreprocessors
+         * @private
+         * @static
+         */
+        getDefaultPreprocessors: function() {
+            return this.defaultPreprocessors;
+        },
+
+        /**
+         * Set the default array stack of default pre-processors
+         *
+         * @private
+         * @param {Array} preprocessors
+         * @return {Ext.Class} this
+         * @static
+         */
+        setDefaultPreprocessors: function(preprocessors) {
+            this.defaultPreprocessors = Ext.Array.from(preprocessors);
+
+            return this;
+        },
+
+        /**
+         * Insert this pre-processor at a specific position in the stack, optionally relative to
+         * any existing pre-processor. For example:
+         *
+         *     Ext.Class.registerPreprocessor('debug', function(cls, data, fn) {
+         *         // Your code here
+         *
+         *         if (fn) {
+         *             fn.call(this, cls, data);
+         *         }
+         *     }).setDefaultPreprocessorPosition('debug', 'last');
+         *
+         * @private
+         * @param {String} name The pre-processor name. Note that it needs to be registered with
+         * {@link Ext.Class#registerPreprocessor registerPreprocessor} before this
+         * @param {String} offset The insertion position. Four possible values are:
+         * 'first', 'last', or: 'before', 'after' (relative to the name provided in the third argument)
+         * @param {String} relativeName
+         * @return {Ext.Class} this
+         * @static
+         */
+        setDefaultPreprocessorPosition: function(name, offset, relativeName) {
+            var defaultPreprocessors = this.defaultPreprocessors,
+                index;
+
+            if (typeof offset == 'string') {
+                if (offset === 'first') {
+                    defaultPreprocessors.unshift(name);
+
+                    return this;
+                }
+                else if (offset === 'last') {
+                    defaultPreprocessors.push(name);
+
+                    return this;
+                }
+
+                offset = (offset === 'after') ? 1 : -1;
+            }
+
+            index = Ext.Array.indexOf(defaultPreprocessors, relativeName);
+
+            if (index !== -1) {
+                Ext.Array.splice(defaultPreprocessors, Math.max(0, index + offset), 0, name);
+            }
+
+            return this;
+        },
+
+        configNameCache: {},
+
+        getConfigNameMap: function(name) {
+            var cache = this.configNameCache,
+                map = cache[name],
+                capitalizedName;
+
+            if (!map) {
+                capitalizedName = name.charAt(0).toUpperCase() + name.substr(1);
+
+                map = cache[name] = {
+                    internal: name,
+                    initialized: '_is' + capitalizedName + 'Initialized',
+                    apply: 'apply' + capitalizedName,
+                    update: 'update' + capitalizedName,
+                    'set': 'set' + capitalizedName,
+                    'get': 'get' + capitalizedName,
+                    doSet : 'doSet' + capitalizedName,
+                    changeEvent: name.toLowerCase() + 'change'
+                };
+            }
+
+            return map;
+        }
+    });
+
+    /**
+     * @cfg {String} extend
+     * The parent class that this class extends. For example:
+     *
+     *     Ext.define('Person', {
+     *         say: function(text) { alert(text); }
+     *     });
+     *
+     *     Ext.define('Developer', {
+     *         extend: 'Person',
+     *         say: function(text) { this.callParent(["print "+text]); }
+     *     });
+     */
+    ExtClass.registerPreprocessor('extend', function(Class, data, hooks) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#extendPreProcessor', arguments);
+        
+        var Base = Ext.Base,
+            basePrototype = Base.prototype,
+            extend = data.extend,
+            Parent, parentPrototype, i;
+
+        delete data.extend;
+
+        if (extend && extend !== Object) {
+            Parent = extend;
+        }
+        else {
+            Parent = Base;
+        }
+
+        parentPrototype = Parent.prototype;
+
+        if (!Parent.$isClass) {
+            for (i in basePrototype) {
+                if (!parentPrototype[i]) {
+                    parentPrototype[i] = basePrototype[i];
+                }
+            }
+        }
+
+        Class.extend(Parent);
+
+        Class.triggerExtended.apply(Class, arguments);
+
+        if (data.onClassExtended) {
+            Class.onExtended(data.onClassExtended, Class);
+            delete data.onClassExtended;
+        }
+
+    }, true);
+
+    /**
+     * @cfg {Object} statics
+     * List of static methods for this class. For example:
+     *
+     *     Ext.define('Computer', {
+     *          statics: {
+     *              factory: function(brand) {
+     *                  // 'this' in static methods refer to the class itself
+     *                  return new this(brand);
+     *              }
+     *          },
+     *
+     *          constructor: function() { ... }
+     *     });
+     *
+     *     var dellComputer = Computer.factory('Dell');
+     */
+    ExtClass.registerPreprocessor('statics', function(Class, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#staticsPreprocessor', arguments);
+        
+        Class.addStatics(data.statics);
+
+        delete data.statics;
+    });
+
+    /**
+     * @cfg {Object} inheritableStatics
+     * List of inheritable static methods for this class.
+     * Otherwise just like {@link #statics} but subclasses inherit these methods.
+     */
+    ExtClass.registerPreprocessor('inheritableStatics', function(Class, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#inheritableStaticsPreprocessor', arguments);
+        
+        Class.addInheritableStatics(data.inheritableStatics);
+
+        delete data.inheritableStatics;
+    });
+
+    /**
+     * @cfg {Object} config
+     * List of configuration options with their default values, for which automatically
+     * accessor methods are generated.  For example:
+     *
+     *     Ext.define('SmartPhone', {
+     *          config: {
+     *              hasTouchScreen: false,
+     *              operatingSystem: 'Other',
+     *              price: 500
+     *          },
+     *          constructor: function(cfg) {
+     *              this.initConfig(cfg);
+     *          }
+     *     });
+     *
+     *     var iPhone = new SmartPhone({
+     *          hasTouchScreen: true,
+     *          operatingSystem: 'iOS'
+     *     });
+     *
+     *     iPhone.getPrice(); // 500;
+     *     iPhone.getOperatingSystem(); // 'iOS'
+     *     iPhone.getHasTouchScreen(); // true;
+     *
+     * NOTE for when configs are reference types, the getter and setter methods do not make copies.
+     *
+     * For example, when a config value is set, the reference is stored on the instance. All instances that set
+     * the same reference type will share it.
+     *
+     * In the case of the getter, the value with either come from the prototype if the setter was never called or from
+     * the instance as the last value passed to the setter.
+     *
+     * For some config properties, the value passed to the setter is transformed prior to being stored on the instance.
+     */
+    ExtClass.registerPreprocessor('config', function(Class, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#configPreProcessor', arguments);
+        
+        var config = data.config,
+            prototype = Class.prototype;
+
+        delete data.config;
+
+        Ext.Object.each(config, function(name, value) {
+            var nameMap = ExtClass.getConfigNameMap(name),
+                internalName = nameMap.internal,
+                initializedName = nameMap.initialized,
+                applyName = nameMap.apply,
+                updateName = nameMap.update,
+                setName = nameMap.set,
+                getName = nameMap.get,
+                hasOwnSetter = (setName in prototype) || data.hasOwnProperty(setName),
+                hasOwnApplier = (applyName in prototype) || data.hasOwnProperty(applyName),
+                hasOwnUpdater = (updateName in prototype) || data.hasOwnProperty(updateName),
+                optimizedGetter, customGetter;
+
+            if (value === null || (!hasOwnSetter && !hasOwnApplier && !hasOwnUpdater)) {
+                prototype[internalName] = value;
+                prototype[initializedName] = true;
+            }
+            else {
+                prototype[initializedName] = false;
+            }
+
+            if (!hasOwnSetter) {
+                data[setName] = function(value) {
+                    var oldValue = this[internalName],
+                        applier = this[applyName],
+                        updater = this[updateName];
+
+                    if (!this[initializedName]) {
+                        this[initializedName] = true;
+                    }
+
+                    if (applier) {
+                        value = applier.call(this, value, oldValue);
+                    }
+
+                    if (typeof value != 'undefined') {
+                        this[internalName] = value;
+
+                        if (updater && value !== oldValue) {
+                            updater.call(this, value, oldValue);
+                        }
+                    }
+
+                    return this;
+                };
+            }
+
+            if (!(getName in prototype) || data.hasOwnProperty(getName)) {
+                customGetter = data[getName] || false;
+
+                if (customGetter) {
+                    optimizedGetter = function() {
+                        return customGetter.apply(this, arguments);
+                    };
+                }
+                else {
+                    optimizedGetter = function() {
+                        return this[internalName];
+                    };
+                }
+
+                data[getName] = function() {
+                    var currentGetter;
+
+                    if (!this[initializedName]) {
+                        this[initializedName] = true;
+                        this[setName](this.config[name]);
+                    }
+
+                    currentGetter = this[getName];
+
+                    if ('$previous' in currentGetter) {
+                        currentGetter.$previous = optimizedGetter;
+                    }
+                    else {
+                        this[getName] = optimizedGetter;
+                    }
+
+                    return optimizedGetter.apply(this, arguments);
+                };
+            }
+        });
+
+        Class.addConfig(config, true);
+    });
+
+    /**
+     * @cfg {String[]/Object} mixins
+     * List of classes to mix into this class. For example:
+     *
+     *     Ext.define('CanSing', {
+     *          sing: function() {
+     *              alert("I'm on the highway to hell...")
+     *          }
+     *     });
+     *
+     *     Ext.define('Musician', {
+     *          mixins: ['CanSing']
+     *     })
+     *
+     * In this case the Musician class will get a `sing` method from CanSing mixin.
+     *
+     * But what if the Musician already has a `sing` method? Or you want to mix
+     * in two classes, both of which define `sing`?  In such a cases it's good
+     * to define mixins as an object, where you assign a name to each mixin:
+     *
+     *     Ext.define('Musician', {
+     *          mixins: {
+     *              canSing: 'CanSing'
+     *          },
+     * 
+     *          sing: function() {
+     *              // delegate singing operation to mixin
+     *              this.mixins.canSing.sing.call(this);
+     *          }
+     *     })
+     *
+     * In this case the `sing` method of Musician will overwrite the
+     * mixed in `sing` method. But you can access the original mixed in method
+     * through special `mixins` property.
+     */
+    ExtClass.registerPreprocessor('mixins', function(Class, data, hooks) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#mixinsPreprocessor', arguments);
+        
+        var mixins = data.mixins,
+            name, mixin, i, ln;
+
+        delete data.mixins;
+
+        Ext.Function.interceptBefore(hooks, 'onCreated', function() {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#mixinsPreprocessor#beforeCreated', arguments);
+        
+            if (mixins instanceof Array) {
+                for (i = 0,ln = mixins.length; i < ln; i++) {
+                    mixin = mixins[i];
+                    name = mixin.prototype.mixinId || mixin.$className;
+
+                    Class.mixin(name, mixin);
+                }
+            }
+            else {
+                for (var mixinName in mixins) {
+                    if (mixins.hasOwnProperty(mixinName)) {
+                        Class.mixin(mixinName, mixins[mixinName]);
+                    }
+                }
+            }
+        });
+    });
+
+    // Backwards compatible
+    Ext.extend = function(Class, Parent, members) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(Class, 'Ext.Class#extend-backwards-compatible', arguments);
+            
+        if (arguments.length === 2 && Ext.isObject(Parent)) {
+            members = Parent;
+            Parent = Class;
+            Class = null;
+        }
+
+        var cls;
+
+        if (!Parent) {
+            throw new Error("[Ext.extend] Attempting to extend from a class which has not been loaded on the page.");
+        }
+
+        members.extend = Parent;
+        members.preprocessors = [
+            'extend'
+            ,'statics'
+            ,'inheritableStatics'
+            ,'mixins'
+            ,'config'
+        ];
+
+        if (Class) {
+            cls = new ExtClass(Class, members);
+            // The 'constructor' is given as 'Class' but also needs to be on prototype
+            cls.prototype.constructor = Class;
+        } else {
+            cls = new ExtClass(members);
+        }
+
+        cls.prototype.override = function(o) {
+            for (var m in o) {
+                if (o.hasOwnProperty(m)) {
+                    this[m] = o[m];
+                }
+            }
+        };
+
+        return cls;
+    };
+}());
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require Class.js
+// @define Ext.ClassManager
+
+/**
+ * @author Jacky Nguyen <jacky at sencha.com>
+ * @docauthor Jacky Nguyen <jacky at sencha.com>
+ * @class Ext.ClassManager
+ *
+ * Ext.ClassManager manages all classes and handles mapping from string class name to
+ * actual class objects throughout the whole framework. It is not generally accessed directly, rather through
+ * these convenient shorthands:
+ *
+ * - {@link Ext#define Ext.define}
+ * - {@link Ext#create Ext.create}
+ * - {@link Ext#widget Ext.widget}
+ * - {@link Ext#getClass Ext.getClass}
+ * - {@link Ext#getClassName Ext.getClassName}
+ *
+ * # Basic syntax:
+ *
+ *     Ext.define(className, properties);
+ *
+ * in which `properties` is an object represent a collection of properties that apply to the class. See
+ * {@link Ext.ClassManager#create} for more detailed instructions.
+ *
+ *     Ext.define('Person', {
+ *          name: 'Unknown',
+ *
+ *          constructor: function(name) {
+ *              if (name) {
+ *                  this.name = name;
+ *              }
+ *          },
+ *
+ *          eat: function(foodType) {
+ *              alert("I'm eating: " + foodType);
+ *
+ *              return this;
+ *          }
+ *     });
+ *
+ *     var aaron = new Person("Aaron");
+ *     aaron.eat("Sandwich"); // alert("I'm eating: Sandwich");
+ *
+ * Ext.Class has a powerful set of extensible {@link Ext.Class#registerPreprocessor pre-processors} which takes care of
+ * everything related to class creation, including but not limited to inheritance, mixins, configuration, statics, etc.
+ *
+ * # Inheritance:
+ *
+ *     Ext.define('Developer', {
+ *          extend: 'Person',
+ *
+ *          constructor: function(name, isGeek) {
+ *              this.isGeek = isGeek;
+ *
+ *              // Apply a method from the parent class' prototype
+ *              this.callParent([name]);
+ *          },
+ *
+ *          code: function(language) {
+ *              alert("I'm coding in: " + language);
+ *
+ *              this.eat("Bugs");
+ *
+ *              return this;
+ *          }
+ *     });
+ *
+ *     var jacky = new Developer("Jacky", true);
+ *     jacky.code("JavaScript"); // alert("I'm coding in: JavaScript");
+ *                               // alert("I'm eating: Bugs");
+ *
+ * See {@link Ext.Base#callParent} for more details on calling superclass' methods
+ *
+ * # Mixins:
+ *
+ *     Ext.define('CanPlayGuitar', {
+ *          playGuitar: function() {
+ *             alert("F#...G...D...A");
+ *          }
+ *     });
+ *
+ *     Ext.define('CanComposeSongs', {
+ *          composeSongs: function() { ... }
+ *     });
+ *
+ *     Ext.define('CanSing', {
+ *          sing: function() {
+ *              alert("I'm on the highway to hell...")
+ *          }
+ *     });
+ *
+ *     Ext.define('Musician', {
+ *          extend: 'Person',
+ *
+ *          mixins: {
+ *              canPlayGuitar: 'CanPlayGuitar',
+ *              canComposeSongs: 'CanComposeSongs',
+ *              canSing: 'CanSing'
+ *          }
+ *     })
+ *
+ *     Ext.define('CoolPerson', {
+ *          extend: 'Person',
+ *
+ *          mixins: {
+ *              canPlayGuitar: 'CanPlayGuitar',
+ *              canSing: 'CanSing'
+ *          },
+ *
+ *          sing: function() {
+ *              alert("Ahem....");
+ *
+ *              this.mixins.canSing.sing.call(this);
+ *
+ *              alert("[Playing guitar at the same time...]");
+ *
+ *              this.playGuitar();
+ *          }
+ *     });
+ *
+ *     var me = new CoolPerson("Jacky");
+ *
+ *     me.sing(); // alert("Ahem...");
+ *                // alert("I'm on the highway to hell...");
+ *                // alert("[Playing guitar at the same time...]");
+ *                // alert("F#...G...D...A");
+ *
+ * # Config:
+ *
+ *     Ext.define('SmartPhone', {
+ *          config: {
+ *              hasTouchScreen: false,
+ *              operatingSystem: 'Other',
+ *              price: 500
+ *          },
+ *
+ *          isExpensive: false,
+ *
+ *          constructor: function(config) {
+ *              this.initConfig(config);
+ *          },
+ *
+ *          applyPrice: function(price) {
+ *              this.isExpensive = (price > 500);
+ *
+ *              return price;
+ *          },
+ *
+ *          applyOperatingSystem: function(operatingSystem) {
+ *              if (!(/^(iOS|Android|BlackBerry)$/i).test(operatingSystem)) {
+ *                  return 'Other';
+ *              }
+ *
+ *              return operatingSystem;
+ *          }
+ *     });
+ *
+ *     var iPhone = new SmartPhone({
+ *          hasTouchScreen: true,
+ *          operatingSystem: 'iOS'
+ *     });
+ *
+ *     iPhone.getPrice(); // 500;
+ *     iPhone.getOperatingSystem(); // 'iOS'
+ *     iPhone.getHasTouchScreen(); // true;
+ *     iPhone.hasTouchScreen(); // true
+ *
+ *     iPhone.isExpensive; // false;
+ *     iPhone.setPrice(600);
+ *     iPhone.getPrice(); // 600
+ *     iPhone.isExpensive; // true;
+ *
+ *     iPhone.setOperatingSystem('AlienOS');
+ *     iPhone.getOperatingSystem(); // 'Other'
+ *
+ * # Statics:
+ *
+ *     Ext.define('Computer', {
+ *          statics: {
+ *              factory: function(brand) {
+ *                 // 'this' in static methods refer to the class itself
+ *                  return new this(brand);
+ *              }
+ *          },
+ *
+ *          constructor: function() { ... }
+ *     });
+ *
+ *     var dellComputer = Computer.factory('Dell');
+ *
+ * Also see {@link Ext.Base#statics} and {@link Ext.Base#self} for more details on accessing
+ * static properties within class methods
+ *
+ * @singleton
+ */
+(function(Class, alias, arraySlice, arrayFrom, global) {
+
+    // Creates a constructor that has nothing extra in its scope chain.
+    function makeCtor () {
+        function constructor () {
+            // Opera has some problems returning from a constructor when Dragonfly isn't running. The || null seems to
+            // be sufficient to stop it misbehaving. Known to be required against 10.53, 11.51 and 11.61.
+            return this.constructor.apply(this, arguments) || null;
+        }
+        return constructor;
+    }
+
+    var Manager = Ext.ClassManager = {
+
+        /**
+         * @property {Object} classes
+         * All classes which were defined through the ClassManager. Keys are the
+         * name of the classes and the values are references to the classes.
+         * @private
+         */
+        classes: {},
+
+        /**
+         * @private
+         */
+        existCache: {},
+
+        /**
+         * @private
+         */
+        namespaceRewrites: [{
+            from: 'Ext.',
+            to: Ext
+        }],
+
+        /**
+         * @private
+         */
+        maps: {
+            alternateToName: {},
+            aliasToName: {},
+            nameToAliases: {},
+            nameToAlternates: {}
+        },
+
+        /** @private */
+        enableNamespaceParseCache: true,
+
+        /** @private */
+        namespaceParseCache: {},
+
+        /** @private */
+        instantiators: [],
+
+        /**
+         * Checks if a class has already been created.
+         *
+         * @param {String} className
+         * @return {Boolean} exist
+         */
+        isCreated: function(className) {
+            var existCache = this.existCache,
+                i, ln, part, root, parts;
+
+            if (typeof className != 'string' || className.length < 1) {
+                throw new Error("[Ext.ClassManager] Invalid classname, must be a string and must not be empty");
+            }
+
+            if (this.classes[className] || existCache[className]) {
+                return true;
+            }
+
+            root = global;
+            parts = this.parseNamespace(className);
+
+            for (i = 0, ln = parts.length; i < ln; i++) {
+                part = parts[i];
+
+                if (typeof part != 'string') {
+                    root = part;
+                } else {
+                    if (!root || !root[part]) {
+                        return false;
+                    }
+
+                    root = root[part];
+                }
+            }
+
+            existCache[className] = true;
+
+            this.triggerCreated(className);
+
+            return true;
+        },
+
+        /**
+         * @private
+         */
+        createdListeners: [],
+
+        /**
+         * @private
+         */
+        nameCreatedListeners: {},
+
+        /**
+         * @private
+         */
+        triggerCreated: function(className) {
+            var listeners = this.createdListeners,
+                nameListeners = this.nameCreatedListeners,
+                alternateNames = this.maps.nameToAlternates[className],
+                names = [className],
+                i, ln, j, subLn, listener, name;
+
+            for (i = 0,ln = listeners.length; i < ln; i++) {
+                listener = listeners[i];
+                listener.fn.call(listener.scope, className);
+            }
+
+            if (alternateNames) {
+                names.push.apply(names, alternateNames);
+            }
+
+            for (i = 0,ln = names.length; i < ln; i++) {
+                name = names[i];
+                listeners = nameListeners[name];
+
+                if (listeners) {
+                    for (j = 0,subLn = listeners.length; j < subLn; j++) {
+                        listener = listeners[j];
+                        listener.fn.call(listener.scope, name);
+                    }
+                    delete nameListeners[name];
+                }
+            }
+        },
+
+        /**
+         * @private
+         */
+        onCreated: function(fn, scope, className) {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(className, 'Ext.ClassManager#onCreated', arguments);
+            
+            var listeners = this.createdListeners,
+                nameListeners = this.nameCreatedListeners,
+                listener = {
+                    fn: fn,
+                    scope: scope
+                };
+
+            if (className) {
+                if (this.isCreated(className)) {
+                    fn.call(scope, className);
+                    return;
+                }
+
+                if (!nameListeners[className]) {
+                    nameListeners[className] = [];
+                }
+
+                nameListeners[className].push(listener);
+            }
+            else {
+                listeners.push(listener);
+            }
+        },
+
+        /**
+         * Supports namespace rewriting
+         * @private
+         */
+        parseNamespace: function(namespace) {
+            if (typeof namespace != 'string') {
+                throw new Error("[Ext.ClassManager] Invalid namespace, must be a string");
+            }
+
+            var cache = this.namespaceParseCache,
+                parts,
+                rewrites,
+                root,
+                name,
+                rewrite, from, to, i, ln;
+
+            if (this.enableNamespaceParseCache) {
+                if (cache.hasOwnProperty(namespace)) {
+                    return cache[namespace];
+                }
+            }
+
+            parts = [];
+            rewrites = this.namespaceRewrites;
+            root = global;
+            name = namespace;
+
+            for (i = 0, ln = rewrites.length; i < ln; i++) {
+                rewrite = rewrites[i];
+                from = rewrite.from;
+                to = rewrite.to;
+
+                if (name === from || name.substring(0, from.length) === from) {
+                    name = name.substring(from.length);
+
+                    if (typeof to != 'string') {
+                        root = to;
+                    } else {
+                        parts = parts.concat(to.split('.'));
+                    }
+
+                    break;
+                }
+            }
+
+            parts.push(root);
+
+            parts = parts.concat(name.split('.'));
+
+            if (this.enableNamespaceParseCache) {
+                cache[namespace] = parts;
+            }
+
+            return parts;
+        },
+
+        /**
+         * Creates a namespace and assign the `value` to the created object
+         *
+         *     Ext.ClassManager.setNamespace('MyCompany.pkg.Example', someObject);
+         *
+         *     alert(MyCompany.pkg.Example === someObject); // alerts true
+         *
+         * @param {String} name
+         * @param {Object} value
+         */
+        setNamespace: function(name, value) {
+            var root = global,
+                parts = this.parseNamespace(name),
+                ln = parts.length - 1,
+                leaf = parts[ln],
+                i, part;
+
+            for (i = 0; i < ln; i++) {
+                part = parts[i];
+
+                if (typeof part != 'string') {
+                    root = part;
+                } else {
+                    if (!root[part]) {
+                        root[part] = {};
+                    }
+
+                    root = root[part];
+                }
+            }
+
+            root[leaf] = value;
+
+            return root[leaf];
+        },
+
+        /**
+         * The new Ext.ns, supports namespace rewriting
+         * @private
+         */
+        createNamespaces: function() {
+            var root = global,
+                parts, part, i, j, ln, subLn;
+
+            for (i = 0, ln = arguments.length; i < ln; i++) {
+                parts = this.parseNamespace(arguments[i]);
+
+                for (j = 0, subLn = parts.length; j < subLn; j++) {
+                    part = parts[j];
+
+                    if (typeof part != 'string') {
+                        root = part;
+                    } else {
+                        if (!root[part]) {
+                            root[part] = {};
+                        }
+
+                        root = root[part];
+                    }
+                }
+            }
+
+            return root;
+        },
+
+        /**
+         * Sets a name reference to a class.
+         *
+         * @param {String} name
+         * @param {Object} value
+         * @return {Ext.ClassManager} this
+         */
+        set: function(name, value) {
+            var me = this,
+                maps = me.maps,
+                nameToAlternates = maps.nameToAlternates,
+                targetName = me.getName(value),
+                alternates;
+
+            me.classes[name] = me.setNamespace(name, value);
+
+            if (targetName && targetName !== name) {
+                maps.alternateToName[name] = targetName;
+                alternates = nameToAlternates[targetName] || (nameToAlternates[targetName] = []);
+                alternates.push(name);
+            }
+
+            return this;
+        },
+
+        /**
+         * Retrieve a class by its name.
+         *
+         * @param {String} name
+         * @return {Ext.Class} class
+         */
+        get: function(name) {
+            var classes = this.classes,
+                root,
+                parts,
+                part, i, ln;
+
+            if (classes[name]) {
+                return classes[name];
+            }
+
+            root = global;
+            parts = this.parseNamespace(name);
+
+            for (i = 0, ln = parts.length; i < ln; i++) {
+                part = parts[i];
+
+                if (typeof part != 'string') {
+                    root = part;
+                } else {
+                    if (!root || !root[part]) {
+                        return null;
+                    }
+
+                    root = root[part];
+                }
+            }
+
+            return root;
+        },
+
+        /**
+         * Register the alias for a class.
+         *
+         * @param {Ext.Class/String} cls a reference to a class or a className
+         * @param {String} alias Alias to use when referring to this class
+         */
+        setAlias: function(cls, alias) {
+            var aliasToNameMap = this.maps.aliasToName,
+                nameToAliasesMap = this.maps.nameToAliases,
+                className;
+
+            if (typeof cls == 'string') {
+                className = cls;
+            } else {
+                className = this.getName(cls);
+            }
+
+            if (alias && aliasToNameMap[alias] !== className) {
+                if (aliasToNameMap[alias] && Ext.isDefined(global.console)) {
+                    global.console.log("[Ext.ClassManager] Overriding existing alias: '" + alias + "' " +
+                        "of: '" + aliasToNameMap[alias] + "' with: '" + className + "'. Be sure it's intentional.");
+                }
+
+                aliasToNameMap[alias] = className;
+            }
+
+            if (!nameToAliasesMap[className]) {
+                nameToAliasesMap[className] = [];
+            }
+
+            if (alias) {
+                Ext.Array.include(nameToAliasesMap[className], alias);
+            }
+
+            return this;
+        },
+
+        /**
+         * Adds a batch of class name to alias mappings
+         * @param {Object} aliases The set of mappings of the form
+         * className : [values...]
+         */
+        addNameAliasMappings: function(aliases){
+            var aliasToNameMap = this.maps.aliasToName,
+                nameToAliasesMap = this.maps.nameToAliases,
+                className, aliasList, alias, i;
+
+            for (className in aliases) {
+                aliasList = nameToAliasesMap[className] ||
+                    (nameToAliasesMap[className] = []);
+
+                for (i = 0; i < aliases[className].length; i++) {
+                    alias = aliases[className][i];
+                    if (!aliasToNameMap[alias]) {
+                        aliasToNameMap[alias] = className;
+                        aliasList.push(alias);
+                    }
+                }
+
+            }
+            return this;
+        },
+
+        /**
+         *
+         * @param {Object} alternates The set of mappings of the form
+         * className : [values...]
+         */
+        addNameAlternateMappings: function(alternates) {
+            var alternateToName = this.maps.alternateToName,
+                nameToAlternates = this.maps.nameToAlternates,
+                className, aliasList, alternate, i;
+
+            for (className in alternates) {
+                aliasList = nameToAlternates[className] ||
+                    (nameToAlternates[className] = []);
+
+                for (i  = 0; i < alternates[className].length; i++) {
+                    alternate = alternates[className][i];
+                    if (!alternateToName[alternate]) {
+                        alternateToName[alternate] = className;
+                        aliasList.push(alternate);
+                    }
+                }
+
+            }
+            return this;
+        },
+
+        /**
+         * Get a reference to the class by its alias.
+         *
+         * @param {String} alias
+         * @return {Ext.Class} class
+         */
+        getByAlias: function(alias) {
+            return this.get(this.getNameByAlias(alias));
+        },
+
+        /**
+         * Get the name of a class by its alias.
+         *
+         * @param {String} alias
+         * @return {String} className
+         */
+        getNameByAlias: function(alias) {
+            return this.maps.aliasToName[alias] || '';
+        },
+
+        /**
+         * Get the name of a class by its alternate name.
+         *
+         * @param {String} alternate
+         * @return {String} className
+         */
+        getNameByAlternate: function(alternate) {
+            return this.maps.alternateToName[alternate] || '';
+        },
+
+        /**
+         * Get the aliases of a class by the class name
+         *
+         * @param {String} name
+         * @return {Array} aliases
+         */
+        getAliasesByName: function(name) {
+            return this.maps.nameToAliases[name] || [];
+        },
+
+        /**
+         * Get the name of the class by its reference or its instance;
+         * 
+         * {@link Ext.ClassManager#getName} is usually invoked by the shorthand {@link Ext#getClassName}.
+         *
+         *     Ext.getName(Ext.Action); // returns "Ext.Action"
+         *
+         * @param {Ext.Class/Object} object
+         * @return {String} className
+         */
+        getName: function(object) {
+            return object && object.$className || '';
+        },
+
+        /**
+         * Get the class of the provided object; returns null if it's not an instance
+         * of any class created with Ext.define.
+         *
+         * {@link Ext.ClassManager#getClass} is usually invoked by the shorthand {@link Ext#getClass}.
+         *
+         *     var component = new Ext.Component();
+         *
+         *     Ext.getClass(component); // returns Ext.Component
+         *
+         * @param {Object} object
+         * @return {Ext.Class} class
+         */
+        getClass: function(object) {
+            return object && object.self || null;
+        },
+
+        /**
+         * Defines a class.
+         * @deprecated 4.1.0 Use {@link Ext#define} instead, as that also supports creating overrides.
+         */
+        create: function(className, data, createdFn) {
+            if (className != null && typeof className != 'string') {
+                throw new Error("[Ext.define] Invalid class name '" + className + "' specified, must be a non-empty string");
+            }
+
+            var ctor = makeCtor();
+            if (typeof data == 'function') {
+                data = data(ctor);
+            }
+
+            if (className) {
+                ctor.displayName = className;
+            }
+
+            data.$className = className;
+
+            return new Class(ctor, data, function() {
+                var postprocessorStack = data.postprocessors || Manager.defaultPostprocessors,
+                    registeredPostprocessors = Manager.postprocessors,
+                    postprocessors = [],
+                    postprocessor, i, ln, j, subLn, postprocessorProperties, postprocessorProperty;
+
+                delete data.postprocessors;
+
+                for (i = 0,ln = postprocessorStack.length; i < ln; i++) {
+                    postprocessor = postprocessorStack[i];
+
+                    if (typeof postprocessor == 'string') {
+                        postprocessor = registeredPostprocessors[postprocessor];
+                        postprocessorProperties = postprocessor.properties;
+
+                        if (postprocessorProperties === true) {
+                            postprocessors.push(postprocessor.fn);
+                        }
+                        else if (postprocessorProperties) {
+                            for (j = 0,subLn = postprocessorProperties.length; j < subLn; j++) {
+                                postprocessorProperty = postprocessorProperties[j];
+
+                                if (data.hasOwnProperty(postprocessorProperty)) {
+                                    postprocessors.push(postprocessor.fn);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        postprocessors.push(postprocessor);
+                    }
+                }
+
+                data.postprocessors = postprocessors;
+                data.createdFn = createdFn;
+                Manager.processCreate(className, this, data);
+            });
+        },
+
+        processCreate: function(className, cls, clsData){
+            var me = this,
+                postprocessor = clsData.postprocessors.shift(),
+                createdFn = clsData.createdFn;
+
+            if (!postprocessor) {
+                Ext.classSystemMonitor && Ext.classSystemMonitor(className, 'Ext.ClassManager#classCreated', arguments);
+                
+                if (className) {
+                    me.set(className, cls);
+                }
+
+                if (createdFn) {
+                    createdFn.call(cls, cls);
+                }
+
+                if (className) {
+                    me.triggerCreated(className);
+                }
+                return;
+            }
+
+            if (postprocessor.call(me, className, cls, clsData, me.processCreate) !== false) {
+                me.processCreate(className, cls, clsData);
+            }
+        },
+
+        createOverride: function (className, data, createdFn) {
+            var me = this,
+                overriddenClassName = data.override,
+                requires = data.requires,
+                uses = data.uses,
+                classReady = function () {
+                    var cls, temp;
+
+                    if (requires) {
+                        temp = requires;
+                        requires = null; // do the real thing next time (which may be now)
+
+                        // Since the override is going to be used (its target class is now
+                        // created), we need to fetch the required classes for the override
+                        // and call us back once they are loaded:
+                        Ext.Loader.require(temp, classReady);
+                    } else {
+                        // The target class and the required classes for this override are
+                        // ready, so we can apply the override now:
+                        cls = me.get(overriddenClassName);
+
+                        // We don't want to apply these:
+                        delete data.override;
+                        delete data.requires;
+                        delete data.uses;
+
+                        Ext.override(cls, data);
+
+                        // This pushes the overridding file itself into Ext.Loader.history
+                        // Hence if the target class never exists, the overriding file will
+                        // never be included in the build.
+                        me.triggerCreated(className);
+
+                        if (uses) {
+                            Ext.Loader.addUsedClasses(uses); // get these classes too!
+                        }
+
+                        if (createdFn) {
+                            createdFn.call(cls); // last but not least!
+                        }
+                    }
+                };
+
+            me.existCache[className] = true;
+
+            // Override the target class right after it's created
+            me.onCreated(classReady, me, overriddenClassName);
+
+            return me;
+        },
+
+        /**
+         * Instantiate a class by its alias.
+         * 
+         * {@link Ext.ClassManager#instantiateByAlias} is usually invoked by the shorthand {@link Ext#createByAlias}.
+         *
+         * If {@link Ext.Loader} is {@link Ext.Loader#setConfig enabled} and the class has not been defined yet, it will
+         * attempt to load the class via synchronous loading.
+         *
+         *     var window = Ext.createByAlias('widget.window', { width: 600, height: 800, ... });
+         *
+         * @param {String} alias
+         * @param {Object...} args Additional arguments after the alias will be passed to the
+         * class constructor.
+         * @return {Object} instance
+         */
+        instantiateByAlias: function() {
+            var alias = arguments[0],
+                args = arraySlice.call(arguments),
+                className = this.getNameByAlias(alias);
+
+            if (!className) {
+                className = this.maps.aliasToName[alias];
+
+                if (!className) {
+                    throw new Error("[Ext.createByAlias] Cannot create an instance of unrecognized alias: " + alias);
+                }
+
+                if (global.console) {
+                    global.console.warn("[Ext.Loader] Synchronously loading '" + className + "'; consider adding " +
+                         "Ext.require('" + alias + "') above Ext.onReady");
+                }
+
+                Ext.syncRequire(className);
+            }
+
+            args[0] = className;
+
+            return this.instantiate.apply(this, args);
+        },
+
+        /**
+         * @private
+         */
+        instantiate: function() {
+            var name = arguments[0],
+                nameType = typeof name,
+                args = arraySlice.call(arguments, 1),
+                alias = name,
+                possibleName, cls;
+
+            if (nameType != 'function') {
+                if (nameType != 'string' && args.length === 0) {
+                    args = [name];
+                    name = name.xclass;
+                }
+
+                if (typeof name != 'string' || name.length < 1) {
+                    throw new Error("[Ext.create] Invalid class name or alias '" + name + "' specified, must be a non-empty string");
+                }
+
+                cls = this.get(name);
+            }
+            else {
+                cls = name;
+            }
+
+            // No record of this class name, it's possibly an alias, so look it up
+            if (!cls) {
+                possibleName = this.getNameByAlias(name);
+
+                if (possibleName) {
+                    name = possibleName;
+
+                    cls = this.get(name);
+                }
+            }
+
+            // Still no record of this class name, it's possibly an alternate name, so look it up
+            if (!cls) {
+                possibleName = this.getNameByAlternate(name);
+
+                if (possibleName) {
+                    name = possibleName;
+
+                    cls = this.get(name);
+                }
+            }
+
+            // Still not existing at this point, try to load it via synchronous mode as the last resort
+            if (!cls) {
+                if (global.console) {
+                    global.console.warn("[Ext.Loader] Synchronously loading '" + name + "'; consider adding " +
+                         "Ext.require('" + ((possibleName) ? alias : name) + "') above Ext.onReady");
+                }
+
+                Ext.syncRequire(name);
+
+                cls = this.get(name);
+            }
+
+            if (!cls) {
+                throw new Error("[Ext.create] Cannot create an instance of unrecognized class name / alias: " + alias);
+            }
+
+            if (typeof cls != 'function') {
+                throw new Error("[Ext.create] '" + name + "' is a singleton and cannot be instantiated");
+            }
+
+            return this.getInstantiator(args.length)(cls, args);
+        },
+
+        /**
+         * @private
+         * @param name
+         * @param args
+         */
+        dynInstantiate: function(name, args) {
+            args = arrayFrom(args, true);
+            args.unshift(name);
+
+            return this.instantiate.apply(this, args);
+        },
+
+        /**
+         * @private
+         * @param length
+         */
+        getInstantiator: function(length) {
+            var instantiators = this.instantiators,
+                instantiator,
+                i,
+                args;
+
+            instantiator = instantiators[length];
+
+            if (!instantiator) {
+                i = length;
+                args = [];
+
+                for (i = 0; i < length; i++) {
+                    args.push('a[' + i + ']');
+                }
+
+                instantiator = instantiators[length] = new Function('c', 'a', 'return new c(' + args.join(',') + ')');
+                instantiator.displayName = "Ext.ClassManager.instantiate" + length;
+            }
+
+            return instantiator;
+        },
+
+        /**
+         * @private
+         */
+        postprocessors: {},
+
+        /**
+         * @private
+         */
+        defaultPostprocessors: [],
+
+        /**
+         * Register a post-processor function.
+         *
+         * @private
+         * @param {String} name
+         * @param {Function} postprocessor
+         */
+        registerPostprocessor: function(name, fn, properties, position, relativeTo) {
+            if (!position) {
+                position = 'last';
+            }
+
+            if (!properties) {
+                properties = [name];
+            }
+
+            this.postprocessors[name] = {
+                name: name,
+                properties: properties || false,
+                fn: fn
+            };
+
+            this.setDefaultPostprocessorPosition(name, position, relativeTo);
+
+            return this;
+        },
+
+        /**
+         * Set the default post processors array stack which are applied to every class.
+         *
+         * @private
+         * @param {String/Array} postprocessors The name of a registered post processor or an array of registered names.
+         * @return {Ext.ClassManager} this
+         */
+        setDefaultPostprocessors: function(postprocessors) {
+            this.defaultPostprocessors = arrayFrom(postprocessors);
+
+            return this;
+        },
+
+        /**
+         * Insert this post-processor at a specific position in the stack, optionally relative to
+         * any existing post-processor
+         *
+         * @private
+         * @param {String} name The post-processor name. Note that it needs to be registered with
+         * {@link Ext.ClassManager#registerPostprocessor} before this
+         * @param {String} offset The insertion position. Four possible values are:
+         * 'first', 'last', or: 'before', 'after' (relative to the name provided in the third argument)
+         * @param {String} relativeName
+         * @return {Ext.ClassManager} this
+         */
+        setDefaultPostprocessorPosition: function(name, offset, relativeName) {
+            var defaultPostprocessors = this.defaultPostprocessors,
+                index;
+
+            if (typeof offset == 'string') {
+                if (offset === 'first') {
+                    defaultPostprocessors.unshift(name);
+
+                    return this;
+                }
+                else if (offset === 'last') {
+                    defaultPostprocessors.push(name);
+
+                    return this;
+                }
+
+                offset = (offset === 'after') ? 1 : -1;
+            }
+
+            index = Ext.Array.indexOf(defaultPostprocessors, relativeName);
+
+            if (index !== -1) {
+                Ext.Array.splice(defaultPostprocessors, Math.max(0, index + offset), 0, name);
+            }
+
+            return this;
+        },
+
+        /**
+         * Converts a string expression to an array of matching class names. An expression can either refers to class aliases
+         * or class names. Expressions support wildcards:
+         *
+         *      // returns ['Ext.window.Window']
+         *     var window = Ext.ClassManager.getNamesByExpression('widget.window');
+         *
+         *     // returns ['widget.panel', 'widget.window', ...]
+         *     var allWidgets = Ext.ClassManager.getNamesByExpression('widget.*');
+         *
+         *     // returns ['Ext.data.Store', 'Ext.data.ArrayProxy', ...]
+         *     var allData = Ext.ClassManager.getNamesByExpression('Ext.data.*');
+         *
+         * @param {String} expression
+         * @return {String[]} classNames
+         */
+        getNamesByExpression: function(expression) {
+            var nameToAliasesMap = this.maps.nameToAliases,
+                names = [],
+                name, alias, aliases, possibleName, regex, i, ln;
+
+            if (typeof expression != 'string' || expression.length < 1) {
+                throw new Error("[Ext.ClassManager.getNamesByExpression] Expression " + expression + " is invalid, must be a non-empty string");
+            }
+
+            if (expression.indexOf('*') !== -1) {
+                expression = expression.replace(/\*/g, '(.*?)');
+                regex = new RegExp('^' + expression + '$');
+
+                for (name in nameToAliasesMap) {
+                    if (nameToAliasesMap.hasOwnProperty(name)) {
+                        aliases = nameToAliasesMap[name];
+
+                        if (name.search(regex) !== -1) {
+                            names.push(name);
+                        }
+                        else {
+                            for (i = 0, ln = aliases.length; i < ln; i++) {
+                                alias = aliases[i];
+
+                                if (alias.search(regex) !== -1) {
+                                    names.push(name);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+            } else {
+                possibleName = this.getNameByAlias(expression);
+
+                if (possibleName) {
+                    names.push(possibleName);
+                } else {
+                    possibleName = this.getNameByAlternate(expression);
+
+                    if (possibleName) {
+                        names.push(possibleName);
+                    } else {
+                        names.push(expression);
+                    }
+                }
+            }
+
+            return names;
+        }
+    };
+
+    /**
+     * @cfg {String[]} alias
+     * @member Ext.Class
+     * List of short aliases for class names.  Most useful for defining xtypes for widgets:
+     *
+     *     Ext.define('MyApp.CoolPanel', {
+     *         extend: 'Ext.panel.Panel',
+     *         alias: ['widget.coolpanel'],
+     *         title: 'Yeah!'
+     *     });
+     *
+     *     // Using Ext.create
+     *     Ext.create('widget.coolpanel');
+     *
+     *     // Using the shorthand for defining widgets by xtype
+     *     Ext.widget('panel', {
+     *         items: [
+     *             {xtype: 'coolpanel', html: 'Foo'},
+     *             {xtype: 'coolpanel', html: 'Bar'}
+     *         ]
+     *     });
+     *
+     * Besides "widget" for xtype there are alias namespaces like "feature" for ftype and "plugin" for ptype.
+     */
+    Manager.registerPostprocessor('alias', function(name, cls, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(name, 'Ext.ClassManager#aliasPostProcessor', arguments);
+        
+        var aliases = data.alias,
+            i, ln;
+
+        for (i = 0,ln = aliases.length; i < ln; i++) {
+            alias = aliases[i];
+
+            this.setAlias(cls, alias);
+        }
+
+    }, ['xtype', 'alias']);
+
+    /**
+     * @cfg {Boolean} singleton
+     * @member Ext.Class
+     * When set to true, the class will be instantiated as singleton.  For example:
+     *
+     *     Ext.define('Logger', {
+     *         singleton: true,
+     *         log: function(msg) {
+     *             console.log(msg);
+     *         }
+     *     });
+     *
+     *     Logger.log('Hello');
+     */
+    Manager.registerPostprocessor('singleton', function(name, cls, data, fn) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(name, 'Ext.ClassManager#singletonPostProcessor', arguments);
+        
+        if (data.singleton) {
+            fn.call(this, name, new cls(), data);
+        }
+        else {
+            return true;
+        }
+        return false;
+    });
+
+    /**
+     * @cfg {String/String[]} alternateClassName
+     * @member Ext.Class
+     * Defines alternate names for this class.  For example:
+     *
+     *     Ext.define('Developer', {
+     *         alternateClassName: ['Coder', 'Hacker'],
+     *         code: function(msg) {
+     *             alert('Typing... ' + msg);
+     *         }
+     *     });
+     *
+     *     var joe = Ext.create('Developer');
+     *     joe.code('stackoverflow');
+     *
+     *     var rms = Ext.create('Hacker');
+     *     rms.code('hack hack');
+     */
+    Manager.registerPostprocessor('alternateClassName', function(name, cls, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(name, 'Ext.ClassManager#alternateClassNamePostprocessor', arguments);
+        
+        var alternates = data.alternateClassName,
+            i, ln, alternate;
+
+        if (!(alternates instanceof Array)) {
+            alternates = [alternates];
+        }
+
+        for (i = 0, ln = alternates.length; i < ln; i++) {
+            alternate = alternates[i];
+
+            if (typeof alternate != 'string') {
+                throw new Error("[Ext.define] Invalid alternate of: '" + alternate + "' for class: '" + name + "'; must be a valid string");
+            }
+
+            this.set(alternate, cls);
+        }
+    });
+
+    Ext.apply(Ext, {
+        /**
+         * Instantiate a class by either full name, alias or alternate name.
+         *
+         * If {@link Ext.Loader} is {@link Ext.Loader#setConfig enabled} and the class has
+         * not been defined yet, it will attempt to load the class via synchronous loading.
+         *
+         * For example, all these three lines return the same result:
+         *
+         *      // alias
+         *      var window = Ext.create('widget.window', {
+         *          width: 600,
+         *          height: 800,
+         *          ...
+         *      });
+         *
+         *      // alternate name
+         *      var window = Ext.create('Ext.Window', {
+         *          width: 600,
+         *          height: 800,
+         *          ...
+         *      });
+         *
+         *      // full class name
+         *      var window = Ext.create('Ext.window.Window', {
+         *          width: 600,
+         *          height: 800,
+         *          ...
+         *      });
+         *
+         *      // single object with xclass property:
+         *      var window = Ext.create({
+         *          xclass: 'Ext.window.Window', // any valid value for 'name' (above)
+         *          width: 600,
+         *          height: 800,
+         *          ...
+         *      });
+         *
+         * @param {String} [name] The class name or alias. Can be specified as `xclass`
+         * property if only one object parameter is specified.
+         * @param {Object...} [args] Additional arguments after the name will be passed to
+         * the class' constructor.
+         * @return {Object} instance
+         * @member Ext
+         * @method create
+         */
+        create: alias(Manager, 'instantiate'),
+
+        /**
+         * Convenient shorthand to create a widget by its xtype or a config object.
+         * See also {@link Ext.ClassManager#instantiateByAlias}.
+         *
+         *      var button = Ext.widget('button'); // Equivalent to Ext.create('widget.button');
+         *
+         *      var panel = Ext.widget('panel', { // Equivalent to Ext.create('widget.panel')
+         *          title: 'Panel'
+         *      });
+         *
+         *      var grid = Ext.widget({
+         *          xtype: 'grid',
+         *          ...
+         *      });
+         *
+         * If a {@link Ext.Component component} instance is passed, it is simply returned.
+         *
+         * @member Ext
+         * @param {String} [name] The xtype of the widget to create.
+         * @param {Object} [config] The configuration object for the widget constructor.
+         * @return {Object} The widget instance
+         */
+        widget: function(name, config) {
+            // forms:
+            //      1: (xtype)
+            //      2: (xtype, config)
+            //      3: (config)
+            //      4: (xtype, component)
+            //      5: (component)
+            //      
+            var xtype = name,
+                alias, className, T, load;
+
+            if (typeof xtype != 'string') { // if (form 3 or 5)
+                // first arg is config or component
+                config = name; // arguments[0]
+                xtype = config.xtype;
+            } else {
+                config = config || {};
+            }
+
+            if (config.isComponent) {
+                return config;
+            }
+
+            alias = 'widget.' + xtype;
+            className = Manager.getNameByAlias(alias);
+
+            // this is needed to support demand loading of the class
+            if (!className) {
+                load = true;
+            }
+
+            T = Manager.get(className);
+            if (load || !T) {
+                return Manager.instantiateByAlias(alias, config);
+            }
+            return new T(config);
+        },
+
+        /**
+         * @inheritdoc Ext.ClassManager#instantiateByAlias
+         * @member Ext
+         * @method createByAlias
+         */
+        createByAlias: alias(Manager, 'instantiateByAlias'),
+
+        /**
+         * Defines a class or override. A basic class is defined like this:
+         *
+         *      Ext.define('My.awesome.Class', {
+         *          someProperty: 'something',
+         *
+         *          someMethod: function(s) {
+         *              alert(s + this.someProperty);
+         *          }
+         *
+         *          ...
+         *      });
+         *
+         *      var obj = new My.awesome.Class();
+         *
+         *      obj.someMethod('Say '); // alerts 'Say something'
+         *
+         * To create an anonymous class, pass `null` for the `className`:
+         *
+         *      Ext.define(null, {
+         *          constructor: function () {
+         *              // ...
+         *          }
+         *      });
+         *
+         * In some cases, it is helpful to create a nested scope to contain some private
+         * properties. The best way to do this is to pass a function instead of an object
+         * as the second parameter. This function will be called to produce the class
+         * body:
+         *
+         *      Ext.define('MyApp.foo.Bar', function () {
+         *          var id = 0;
+         *
+         *          return {
+         *              nextId: function () {
+         *                  return ++id;
+         *              }
+         *          };
+         *      });
+         * 
+         * _Note_ that when using override, the above syntax will not override successfully, because
+         * the passed function would need to be executed first to determine whether or not the result 
+         * is an override or defining a new object. As such, an alternative syntax that immediately 
+         * invokes the function can be used:
+         * 
+         *      Ext.define('MyApp.override.BaseOverride', function () {
+         *          var counter = 0;
+         *
+         *          return {
+         *              override: 'Ext.Component',
+         *              logId: function () {
+         *                  console.log(++counter, this.id);
+         *              }
+         *          };
+         *      }());
+         * 
+         *
+         * When using this form of `Ext.define`, the function is passed a reference to its
+         * class. This can be used as an efficient way to access any static properties you
+         * may have:
+         *
+         *      Ext.define('MyApp.foo.Bar', function (Bar) {
+         *          return {
+         *              statics: {
+         *                  staticMethod: function () {
+         *                      // ...
+         *                  }
+         *              },
+         *
+         *              method: function () {
+         *                  return Bar.staticMethod();
+         *              }
+         *          };
+         *      });
+         *
+         * To define an override, include the `override` property. The content of an
+         * override is aggregated with the specified class in order to extend or modify
+         * that class. This can be as simple as setting default property values or it can
+         * extend and/or replace methods. This can also extend the statics of the class.
+         *
+         * One use for an override is to break a large class into manageable pieces.
+         *
+         *      // File: /src/app/Panel.js
+         *
+         *      Ext.define('My.app.Panel', {
+         *          extend: 'Ext.panel.Panel',
+         *          requires: [
+         *              'My.app.PanelPart2',
+         *              'My.app.PanelPart3'
+         *          ]
+         *
+         *          constructor: function (config) {
+         *              this.callParent(arguments); // calls Ext.panel.Panel's constructor
+         *              //...
+         *          },
+         *
+         *          statics: {
+         *              method: function () {
+         *                  return 'abc';
+         *              }
+         *          }
+         *      });
+         *
+         *      // File: /src/app/PanelPart2.js
+         *      Ext.define('My.app.PanelPart2', {
+         *          override: 'My.app.Panel',
+         *
+         *          constructor: function (config) {
+         *              this.callParent(arguments); // calls My.app.Panel's constructor
+         *              //...
+         *          }
+         *      });
+         *
+         * Another use of overrides is to provide optional parts of classes that can be
+         * independently required. In this case, the class may even be unaware of the
+         * override altogether.
+         *
+         *      Ext.define('My.ux.CoolTip', {
+         *          override: 'Ext.tip.ToolTip',
+         *
+         *          constructor: function (config) {
+         *              this.callParent(arguments); // calls Ext.tip.ToolTip's constructor
+         *              //...
+         *          }
+         *      });
+         *
+         * The above override can now be required as normal.
+         *
+         *      Ext.define('My.app.App', {
+         *          requires: [
+         *              'My.ux.CoolTip'
+         *          ]
+         *      });
+         *
+         * Overrides can also contain statics:
+         *
+         *      Ext.define('My.app.BarMod', {
+         *          override: 'Ext.foo.Bar',
+         *
+         *          statics: {
+         *              method: function (x) {
+         *                  return this.callParent([x * 2]); // call Ext.foo.Bar.method
+         *              }
+         *          }
+         *      });
+         *
+         * IMPORTANT: An override is only included in a build if the class it overrides is
+         * required. Otherwise, the override, like the target class, is not included.
+         *
+         * @param {String} className The class name to create in string dot-namespaced format, for example:
+         * 'My.very.awesome.Class', 'FeedViewer.plugin.CoolPager'
+         * It is highly recommended to follow this simple convention:
+         *  - The root and the class name are 'CamelCased'
+         *  - Everything else is lower-cased
+         * Pass `null` to create an anonymous class.
+         * @param {Object} data The key - value pairs of properties to apply to this class. Property names can be of any valid
+         * strings, except those in the reserved listed below:
+         *  - `mixins`
+         *  - `statics`
+         *  - `config`
+         *  - `alias`
+         *  - `self`
+         *  - `singleton`
+         *  - `alternateClassName`
+         *  - `override`
+         *
+         * @param {Function} createdFn Optional callback to execute after the class is created, the execution scope of which
+         * (`this`) will be the newly created class itself.
+         * @return {Ext.Base}
+         * @member Ext
+         */
+        define: function (className, data, createdFn) {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(className, 'ClassManager#define', arguments);
+            
+            if (data.override) {
+                return Manager.createOverride.apply(Manager, arguments);
+            }
+
+            return Manager.create.apply(Manager, arguments);
+        },
+
+        /**
+         * Undefines a class defined using the #define method. Typically used
+         * for unit testing where setting up and tearing down a class multiple
+         * times is required.  For example:
+         * 
+         *     // define a class
+         *     Ext.define('Foo', {
+         *        ...
+         *     });
+         *     
+         *     // run test
+         *     
+         *     // undefine the class
+         *     Ext.undefine('Foo');
+         * @param {String} className The class name to undefine in string dot-namespaced format.
+         * @private
+         */
+        undefine: function(className) {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(className, 'Ext.ClassManager#undefine', arguments);
+        
+            var classes = Manager.classes,
+                maps = Manager.maps,
+                aliasToName = maps.aliasToName,
+                nameToAliases = maps.nameToAliases,
+                alternateToName = maps.alternateToName,
+                nameToAlternates = maps.nameToAlternates,
+                aliases = nameToAliases[className],
+                alternates = nameToAlternates[className],
+                parts, partCount, namespace, i;
+
+            delete Manager.namespaceParseCache[className];
+            delete nameToAliases[className];
+            delete nameToAlternates[className];
+            delete classes[className];
+
+            if (aliases) {
+                for (i = aliases.length; i--;) {
+                    delete aliasToName[aliases[i]];
+                }
+            }
+
+            if (alternates) {
+                for (i = alternates.length; i--; ) {
+                    delete alternateToName[alternates[i]];
+                }
+            }
+
+            parts  = Manager.parseNamespace(className);
+            partCount = parts.length - 1;
+            namespace = parts[0];
+
+            for (i = 1; i < partCount; i++) {
+                namespace = namespace[parts[i]];
+                if (!namespace) {
+                    return;
+                }
+            }
+
+            // Old IE blows up on attempt to delete window property
+            try {
+                delete namespace[parts[partCount]];
+            }
+            catch (e) {
+                namespace[parts[partCount]] = undefined;
+            }
+        },
+
+        /**
+         * @inheritdoc Ext.ClassManager#getName
+         * @member Ext
+         * @method getClassName
+         */
+        getClassName: alias(Manager, 'getName'),
+
+        /**
+         * Returns the displayName property or className or object. When all else fails, returns "Anonymous".
+         * @param {Object} object
+         * @return {String}
+         */
+        getDisplayName: function(object) {
+            if (object) {
+                if (object.displayName) {
+                    return object.displayName;
+                }
+
+                if (object.$name && object.$class) {
+                    return Ext.getClassName(object.$class) + '#' + object.$name;
+                }
+
+                if (object.$className) {
+                    return object.$className;
+                }
+            }
+
+            return 'Anonymous';
+        },
+
+        /**
+         * @inheritdoc Ext.ClassManager#getClass
+         * @member Ext
+         * @method getClass
+         */
+        getClass: alias(Manager, 'getClass'),
+
+        /**
+         * Creates namespaces to be used for scoping variables and classes so that they are not global.
+         * Specifying the last node of a namespace implicitly creates all other nodes. Usage:
+         *
+         *     Ext.namespace('Company', 'Company.data');
+         *
+         *     // equivalent and preferable to the above syntax
+         *     Ext.ns('Company.data');
+         *
+         *     Company.Widget = function() { ... };
+         *
+         *     Company.data.CustomStore = function(config) { ... };
+         *
+         * @param {String...} namespaces
+         * @return {Object} The namespace object.
+         * (If multiple arguments are passed, this will be the last namespace created)
+         * @member Ext
+         * @method namespace
+         */
+        namespace: alias(Manager, 'createNamespaces')
+    });
+
+    /**
+     * Old name for {@link Ext#widget}.
+     * @deprecated 4.0.0 Use {@link Ext#widget} instead.
+     * @method createWidget
+     * @member Ext
+     */
+    Ext.createWidget = Ext.widget;
+
+    /**
+     * Convenient alias for {@link Ext#namespace Ext.namespace}.
+     * @inheritdoc Ext#namespace
+     * @member Ext
+     * @method ns
+     */
+    Ext.ns = Ext.namespace;
+
+    Class.registerPreprocessor('className', function(cls, data) {
+        if (data.$className) {
+            cls.$className = data.$className;
+            cls.displayName = cls.$className;
+        }
+        
+        Ext.classSystemMonitor && Ext.classSystemMonitor(cls, 'Ext.ClassManager#classNamePreprocessor', arguments);
+    }, true, 'first');
+
+    Class.registerPreprocessor('alias', function(cls, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(cls, 'Ext.ClassManager#aliasPreprocessor', arguments);
+        
+        var prototype = cls.prototype,
+            xtypes = arrayFrom(data.xtype),
+            aliases = arrayFrom(data.alias),
+            widgetPrefix = 'widget.',
+            widgetPrefixLength = widgetPrefix.length,
+            xtypesChain = Array.prototype.slice.call(prototype.xtypesChain || []),
+            xtypesMap = Ext.merge({}, prototype.xtypesMap || {}),
+            i, ln, alias, xtype;
+
+        for (i = 0,ln = aliases.length; i < ln; i++) {
+            alias = aliases[i];
+
+            if (typeof alias != 'string' || alias.length < 1) {
+                throw new Error("[Ext.define] Invalid alias of: '" + alias + "' for class: '" + name + "'; must be a valid string");
+            }
+
+            if (alias.substring(0, widgetPrefixLength) === widgetPrefix) {
+                xtype = alias.substring(widgetPrefixLength);
+                Ext.Array.include(xtypes, xtype);
+            }
+        }
+
+        cls.xtype = data.xtype = xtypes[0];
+        data.xtypes = xtypes;
+
+        for (i = 0,ln = xtypes.length; i < ln; i++) {
+            xtype = xtypes[i];
+
+            if (!xtypesMap[xtype]) {
+                xtypesMap[xtype] = true;
+                xtypesChain.push(xtype);
+            }
+        }
+
+        data.xtypesChain = xtypesChain;
+        data.xtypesMap = xtypesMap;
+
+        Ext.Function.interceptAfter(data, 'onClassCreated', function() {
+            Ext.classSystemMonitor && Ext.classSystemMonitor(cls, 'Ext.ClassManager#aliasPreprocessor#afterClassCreated', arguments);
+        
+            var mixins = prototype.mixins,
+                key, mixin;
+
+            for (key in mixins) {
+                if (mixins.hasOwnProperty(key)) {
+                    mixin = mixins[key];
+
+                    xtypes = mixin.xtypes;
+
+                    if (xtypes) {
+                        for (i = 0,ln = xtypes.length; i < ln; i++) {
+                            xtype = xtypes[i];
+
+                            if (!xtypesMap[xtype]) {
+                                xtypesMap[xtype] = true;
+                                xtypesChain.push(xtype);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        for (i = 0,ln = xtypes.length; i < ln; i++) {
+            xtype = xtypes[i];
+
+            if (typeof xtype != 'string' || xtype.length < 1) {
+                throw new Error("[Ext.define] Invalid xtype of: '" + xtype + "' for class: '" + name + "'; must be a valid non-empty string");
+            }
+
+            Ext.Array.include(aliases, widgetPrefix + xtype);
+        }
+
+        data.alias = aliases;
+
+    }, ['xtype', 'alias']);
+
+}(Ext.Class, Ext.Function.alias, Array.prototype.slice, Ext.Array.from, Ext.global));
+
+// simple mechanism for automated means of injecting large amounts of dependency info
+// at the appropriate time in the load cycle
+if (Ext._alternatesMetadata) {
+   Ext.ClassManager.addNameAlternateMappings(Ext._alternatesMetadata);
+   Ext._alternatesMetadata = null;
+}
+
+if (Ext._aliasMetadata) {
+    Ext.ClassManager.addNameAliasMappings(Ext._aliasMetadata);
+    Ext._aliasMetadata = null;
+}
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require ClassManager.js
+// @define Ext.Loader
+
+/**
+ * @author Jacky Nguyen <jacky at sencha.com>
+ * @docauthor Jacky Nguyen <jacky at sencha.com>
+ * @class Ext.Loader
+ *
+ * Ext.Loader is the heart of the new dynamic dependency loading capability in Ext JS 4+. It is most commonly used
+ * via the {@link Ext#require} shorthand. Ext.Loader supports both asynchronous and synchronous loading
+ * approaches, and leverage their advantages for the best development flow. We'll discuss about the pros and cons of each approach:
+ *
+ * # Asynchronous Loading #
+ *
+ * - Advantages:
+ *     + Cross-domain
+ *     + No web server needed: you can run the application via the file system protocol (i.e: `file://path/to/your/index
+ *  .html`)
+ *     + Best possible debugging experience: error messages come with the exact file name and line number
+ *
+ * - Disadvantages:
+ *     + Dependencies need to be specified before-hand
+ *
+ * ### Method 1: Explicitly include what you need: ###
+ *
+ *     // Syntax
+ *     Ext.require({String/Array} expressions);
+ *
+ *     // Example: Single alias
+ *     Ext.require('widget.window');
+ *
+ *     // Example: Single class name
+ *     Ext.require('Ext.window.Window');
+ *
+ *     // Example: Multiple aliases / class names mix
+ *     Ext.require(['widget.window', 'layout.border', 'Ext.data.Connection']);
+ *
+ *     // Wildcards
+ *     Ext.require(['widget.*', 'layout.*', 'Ext.data.*']);
+ *
+ * ### Method 2: Explicitly exclude what you don't need: ###
+ *
+ *     // Syntax: Note that it must be in this chaining format.
+ *     Ext.exclude({String/Array} expressions)
+ *        .require({String/Array} expressions);
+ *
+ *     // Include everything except Ext.data.*
+ *     Ext.exclude('Ext.data.*').require('*');
+ *
+ *     // Include all widgets except widget.checkbox*,
+ *     // which will match widget.checkbox, widget.checkboxfield, widget.checkboxgroup, etc.
+ *     Ext.exclude('widget.checkbox*').require('widget.*');
+ *
+ * # Synchronous Loading on Demand #
+ *
+ * - Advantages:
+ *     + There's no need to specify dependencies before-hand, which is always the convenience of including ext-all.js
+ *  before
+ *
+ * - Disadvantages:
+ *     + Not as good debugging experience since file name won't be shown (except in Firebug at the moment)
+ *     + Must be from the same domain due to XHR restriction
+ *     + Need a web server, same reason as above
+ *
+ * There's one simple rule to follow: Instantiate everything with Ext.create instead of the `new` keyword
+ *
+ *     Ext.create('widget.window', { ... }); // Instead of new Ext.window.Window({...});
+ *
+ *     Ext.create('Ext.window.Window', {}); // Same as above, using full class name instead of alias
+ *
+ *     Ext.widget('window', {}); // Same as above, all you need is the traditional `xtype`
+ *
+ * Behind the scene, {@link Ext.ClassManager} will automatically check whether the given class name / alias has already
+ *  existed on the page. If it's not, Ext.Loader will immediately switch itself to synchronous mode and automatic load the given
+ *  class and all its dependencies.
+ *
+ * # Hybrid Loading - The Best of Both Worlds #
+ *
+ * It has all the advantages combined from asynchronous and synchronous loading. The development flow is simple:
+ *
+ * ### Step 1: Start writing your application using synchronous approach.
+ *
+ * Ext.Loader will automatically fetch all dependencies on demand as they're needed during run-time. For example:
+ *
+ *     Ext.onReady(function(){
+ *         var window = Ext.widget('window', {
+ *             width: 500,
+ *             height: 300,
+ *             layout: {
+ *                 type: 'border',
+ *                 padding: 5
+ *             },
+ *             title: 'Hello Dialog',
+ *             items: [{
+ *                 title: 'Navigation',
+ *                 collapsible: true,
+ *                 region: 'west',
+ *                 width: 200,
+ *                 html: 'Hello',
+ *                 split: true
+ *             }, {
+ *                 title: 'TabPanel',
+ *                 region: 'center'
+ *             }]
+ *         });
+ *
+ *         window.show();
+ *     })
+ *
+ * ### Step 2: Along the way, when you need better debugging ability, watch the console for warnings like these: ###
+ *
+ *     [Ext.Loader] Synchronously loading 'Ext.window.Window'; consider adding Ext.require('Ext.window.Window') before your application's code
+ *     ClassManager.js:432
+ *     [Ext.Loader] Synchronously loading 'Ext.layout.container.Border'; consider adding Ext.require('Ext.layout.container.Border') before your application's code
+ *
+ * Simply copy and paste the suggested code above `Ext.onReady`, i.e:
+ *
+ *     Ext.require('Ext.window.Window');
+ *     Ext.require('Ext.layout.container.Border');
+ *
+ *     Ext.onReady(...);
+ *
+ * Everything should now load via asynchronous mode.
+ *
+ * # Deployment #
+ *
+ * It's important to note that dynamic loading should only be used during development on your local machines.
+ * During production, all dependencies should be combined into one single JavaScript file. Ext.Loader makes
+ * the whole process of transitioning from / to between development / maintenance and production as easy as
+ * possible. Internally {@link Ext.Loader#history Ext.Loader.history} maintains the list of all dependencies your application
+ * needs in the exact loading sequence. It's as simple as concatenating all files in this array into one,
+ * then include it on top of your application.
+ *
+ * This process will be automated with Sencha Command, to be released and documented towards Ext JS 4 Final.
+ *
+ * @singleton
+ */
+
+Ext.Loader = new function() {
+    var Loader = this,
+        Manager = Ext.ClassManager,
+        Class = Ext.Class,
+        flexSetter = Ext.Function.flexSetter,
+        alias = Ext.Function.alias,
+        pass = Ext.Function.pass,
+        defer = Ext.Function.defer,
+        arrayErase = Ext.Array.erase,
+        dependencyProperties = ['extend', 'mixins', 'requires'],
+        isInHistory = {},
+        history = [],
+        slashDotSlashRe = /\/\.\//g,
+        dotRe = /\./g,
+        setPathCount = 0;
+
+    Ext.apply(Loader, {
+
+        /**
+         * @private
+         */
+        isInHistory: isInHistory,
+
+        /**
+         * An array of class names to keep track of the dependency loading order.
+         * This is not guaranteed to be the same everytime due to the asynchronous
+         * nature of the Loader.
+         *
+         * @property {Array} history
+         */
+        history: history,
+
+        /**
+         * Configuration
+         * @private
+         */
+        config: {
+            /**
+             * @cfg {Boolean} enabled
+             * Whether or not to enable the dynamic dependency loading feature.
+             */
+            enabled: false,
+
+            /**
+             * @cfg {Boolean} scriptChainDelay
+             * millisecond delay between asynchronous script injection (prevents stack overflow on some user agents)
+             * 'false' disables delay but potentially increases stack load.
+             */
+            scriptChainDelay : false,
+
+            /**
+             * @cfg {Boolean} disableCaching
+             * Appends current timestamp to script files to prevent caching.
+             */
+            disableCaching: true,
+
+            /**
+             * @cfg {String} disableCachingParam
+             * The get parameter name for the cache buster's timestamp.
+             */
+            disableCachingParam: '_dc',
+
+            /**
+             * @cfg {Boolean} garbageCollect
+             * True to prepare an asynchronous script tag for garbage collection (effective only
+             * if {@link #preserveScripts preserveScripts} is false)
+             */
+            garbageCollect : false,
+
+            /**
+             * @cfg {Object} paths
+             * The mapping from namespaces to file paths
+             *
+             *     {
+             *         'Ext': '.', // This is set by default, Ext.layout.container.Container will be
+             *                     // loaded from ./layout/Container.js
+             *
+             *         'My': './src/my_own_folder' // My.layout.Container will be loaded from
+             *                                     // ./src/my_own_folder/layout/Container.js
+             *     }
+             *
+             * Note that all relative paths are relative to the current HTML document.
+             * If not being specified, for example, <code>Other.awesome.Class</code>
+             * will simply be loaded from <code>./Other/awesome/Class.js</code>
+             */
+            paths: {
+                'Ext': '.'
+            },
+
+            /**
+             * @cfg {Boolean} preserveScripts
+             * False to remove and optionally {@link #garbageCollect garbage-collect} asynchronously loaded scripts,
+             * True to retain script element for browser debugger compatibility and improved load performance.
+             */
+            preserveScripts : true,
+
+            /**
+             * @cfg {String} scriptCharset
+             * Optional charset to specify encoding of dynamic script content.
+             */
+            scriptCharset : undefined
+        },
+
+        /**
+         * Set the configuration for the loader. This should be called right after ext-(debug).js
+         * is included in the page, and before Ext.onReady. i.e:
+         *
+         *     <script type="text/javascript" src="ext-core-debug.js"></script>
+         *     <script type="text/javascript">
+         *         Ext.Loader.setConfig({
+         *           enabled: true,
+         *           paths: {
+         *               'My': 'my_own_path'
+         *           }
+         *         });
+         *     </script>
+         *     <script type="text/javascript">
+         *         Ext.require(...);
+         *
+         *         Ext.onReady(function() {
+         *           // application code here
+         *         });
+         *     </script>
+         *
+         * Refer to config options of {@link Ext.Loader} for the list of possible properties
+         *
+         * @param {Object} config The config object to override the default values
+         * @return {Ext.Loader} this
+         */
+        setConfig: function(name, value) {
+            if (Ext.isObject(name) && arguments.length === 1) {
+                Ext.merge(Loader.config, name);
+
+                if ('paths' in name) {
+                    Ext.app.collectNamespaces(name.paths);
+                }
+            }
+            else {
+                Loader.config[name] = (Ext.isObject(value)) ? Ext.merge(Loader.config[name], value) : value;
+
+                if (name === 'paths') {
+                    Ext.app.collectNamespaces(value);
+                }
+            }
+
+            return Loader;
+        },
+
+        /**
+         * Get the config value corresponding to the specified name. If no name is given, will return the config object
+         * @param {String} name The config property name
+         * @return {Object}
+         */
+        getConfig: function(name) {
+            if (name) {
+                return Loader.config[name];
+            }
+
+            return Loader.config;
+        },
+
+        /**
+         * Sets the path of a namespace.
+         * For Example:
+         *
+         *     Ext.Loader.setPath('Ext', '.');
+         *
+         * @param {String/Object} name See {@link Ext.Function#flexSetter flexSetter}
+         * @param {String} [path] See {@link Ext.Function#flexSetter flexSetter}
+         * @return {Ext.Loader} this
+         * @method
+         */
+        setPath: flexSetter(function(name, path) {
+            Loader.config.paths[name] = path;
+            Ext.app.namespaces[name] = true;
+            setPathCount++;
+
+            return Loader;
+        }),
+
+        /**
+         * Sets a batch of path entries
+         *
+         * @param {Object } paths a set of className: path mappings
+         * @return {Ext.Loader} this
+         */
+        addClassPathMappings: function(paths) {
+            var name;
+
+            if(setPathCount == 0){
+                Loader.config.paths = paths;
+            } else {
+                for(name in paths){
+                    Loader.config.paths[name] = paths[name];
+                }
+            }
+            setPathCount++;
+            return Loader;
+        },
+
+        /**
+         * Translates a className to a file path by adding the
+         * the proper prefix and converting the .'s to /'s. For example:
+         *
+         *     Ext.Loader.setPath('My', '/path/to/My');
+         *
+         *     alert(Ext.Loader.getPath('My.awesome.Class')); // alerts '/path/to/My/awesome/Class.js'
+         *
+         * Note that the deeper namespace levels, if explicitly set, are always resolved first. For example:
+         *
+         *     Ext.Loader.setPath({
+         *         'My': '/path/to/lib',
+         *         'My.awesome': '/other/path/for/awesome/stuff',
+         *         'My.awesome.more': '/more/awesome/path'
+         *     });
+         *
+         *     alert(Ext.Loader.getPath('My.awesome.Class')); // alerts '/other/path/for/awesome/stuff/Class.js'
+         *
+         *     alert(Ext.Loader.getPath('My.awesome.more.Class')); // alerts '/more/awesome/path/Class.js'
+         *
+         *     alert(Ext.Loader.getPath('My.cool.Class')); // alerts '/path/to/lib/cool/Class.js'
+         *
+         *     alert(Ext.Loader.getPath('Unknown.strange.Stuff')); // alerts 'Unknown/strange/Stuff.js'
+         *
+         * @param {String} className
+         * @return {String} path
+         */
+        getPath: function(className) {
+            var path = '',
+                paths = Loader.config.paths,
+                prefix = Loader.getPrefix(className);
+
+            if (prefix.length > 0) {
+                if (prefix === className) {
+                    return paths[prefix];
+                }
+
+                path = paths[prefix];
+                className = className.substring(prefix.length + 1);
+            }
+
+            if (path.length > 0) {
+                path += '/';
+            }
+
+            return path.replace(slashDotSlashRe, '/') + className.replace(dotRe, "/") + '.js';
+        },
+
+        /**
+         * @private
+         * @param {String} className
+         */
+        getPrefix: function(className) {
+            var paths = Loader.config.paths,
+                prefix, deepestPrefix = '';
+
+            if (paths.hasOwnProperty(className)) {
+                return className;
+            }
+
+            for (prefix in paths) {
+                if (paths.hasOwnProperty(prefix) && prefix + '.' === className.substring(0, prefix.length + 1)) {
+                    if (prefix.length > deepestPrefix.length) {
+                        deepestPrefix = prefix;
+                    }
+                }
+            }
+
+            return deepestPrefix;
+        },
+
+        /**
+         * @private
+         * @param {String} className
+         */
+        isAClassNameWithAKnownPrefix: function(className) {
+            var prefix = Loader.getPrefix(className);
+
+            // we can only say it's really a class if className is not equal to any known namespace
+            return prefix !== '' && prefix !== className;
+        },
+
+        /**
+         * Loads all classes by the given names and all their direct dependencies; optionally executes
+         * the given callback function when finishes, within the optional scope.
+         *
+         * {@link Ext#require} is alias for {@link Ext.Loader#require}.
+         *
+         * @param {String/Array} expressions Can either be a string or an array of string
+         * @param {Function} fn (Optional) The callback function
+         * @param {Object} scope (Optional) The execution scope (`this`) of the callback function
+         * @param {String/Array} excludes (Optional) Classes to be excluded, useful when being used with expressions
+         */
+        require: function(expressions, fn, scope, excludes) {
+            if (fn) {
+                fn.call(scope);
+            }
+        },
+
+        /**
+         * Synchronously loads all classes by the given names and all their direct dependencies; optionally
+         * executes the given callback function when finishes, within the optional scope.
+         *
+         * {@link Ext#syncRequire} is alias for {@link Ext.Loader#syncRequire}.
+         *
+         * @param {String/Array} expressions Can either be a string or an array of string
+         * @param {Function} fn (Optional) The callback function
+         * @param {Object} scope (Optional) The execution scope (`this`) of the callback function
+         * @param {String/Array} excludes (Optional) Classes to be excluded, useful when being used with expressions
+         */
+        syncRequire: function() {},
+
+        /**
+         * Explicitly exclude files from being loaded. Useful when used in conjunction with a broad include expression.
+         * Can be chained with more `require` and `exclude` methods, eg:
+         *
+         *     Ext.exclude('Ext.data.*').require('*');
+         *
+         *     Ext.exclude('widget.button*').require('widget.*');
+         *
+         * {@link Ext#exclude} is alias for {@link Ext.Loader#exclude}.
+         *
+         * @param {Array} excludes
+         * @return {Object} object contains `require` method for chaining
+         */
+        exclude: function(excludes) {
+            return {
+                require: function(expressions, fn, scope) {
+                    return Loader.require(expressions, fn, scope, excludes);
+                },
+
+                syncRequire: function(expressions, fn, scope) {
+                    return Loader.syncRequire(expressions, fn, scope, excludes);
+                }
+            };
+        },
+
+        /**
+         * Add a new listener to be executed when all required scripts are fully loaded
+         *
+         * @param {Function} fn The function callback to be executed
+         * @param {Object} scope The execution scope (<code>this</code>) of the callback function
+         * @param {Boolean} withDomReady Whether or not to wait for document dom ready as well
+         */
+        onReady: function(fn, scope, withDomReady, options) {
+            var oldFn;
+
+            if (withDomReady !== false && Ext.onDocumentReady) {
+                oldFn = fn;
+
+                fn = function() {
+                    Ext.onDocumentReady(oldFn, scope, options);
+                };
+            }
+
+            fn.call(scope);
+        }
+    });
+
+    var queue = [],
+        isClassFileLoaded = {},
+        isFileLoaded = {},
+        classNameToFilePathMap = {},
+        scriptElements = {},
+        readyListeners = [],
+        usedClasses = [],
+        requiresMap = {},
+        comparePriority = function(listenerA, listenerB) {
+            return listenerB.priority - listenerA.priority;
+        };
+
+    Ext.apply(Loader, {
+        /**
+         * @private
+         */
+        documentHead: typeof document != 'undefined' && (document.head || document.getElementsByTagName('head')[0]),
+
+        /**
+         * Flag indicating whether there are still files being loaded
+         * @private
+         */
+        isLoading: false,
+
+        /**
+         * Maintain the queue for all dependencies. Each item in the array is an object of the format:
+         *
+         *     {
+         *          requires: [...], // The required classes for this queue item
+         *          callback: function() { ... } // The function to execute when all classes specified in requires exist
+         *     }
+         *
+         * @private
+         */
+        queue: queue,
+
+        /**
+         * Maintain the list of files that have already been handled so that they never get double-loaded
+         * @private
+         */
+        isClassFileLoaded: isClassFileLoaded,
+
+        /**
+         * @private
+         */
+        isFileLoaded: isFileLoaded,
+
+        /**
+         * Maintain the list of listeners to execute when all required scripts are fully loaded
+         * @private
+         */
+        readyListeners: readyListeners,
+
+        /**
+         * Contains classes referenced in `uses` properties.
+         * @private
+         */
+        optionalRequires: usedClasses,
+
+        /**
+         * Map of fully qualified class names to an array of dependent classes.
+         * @private
+         */
+        requiresMap: requiresMap,
+
+        /**
+         * @private
+         */
+        numPendingFiles: 0,
+
+        /**
+         * @private
+         */
+        numLoadedFiles: 0,
+
+        /** @private */
+        hasFileLoadError: false,
+
+        /**
+         * @private
+         */
+        classNameToFilePathMap: classNameToFilePathMap,
+
+        /**
+         * The number of scripts loading via loadScript.
+         * @private
+         */
+        scriptsLoading: 0,
+
+        /**
+         * @private
+         */
+        syncModeEnabled: false,
+
+        scriptElements: scriptElements,
+
+        /**
+         * Refresh all items in the queue. If all dependencies for an item exist during looping,
+         * it will execute the callback and call refreshQueue again. Triggers onReady when the queue is
+         * empty
+         * @private
+         */
+        refreshQueue: function() {
+            var ln = queue.length,
+                i, item, j, requires;
+
+            // When the queue of loading classes reaches zero, trigger readiness
+
+            if (!ln && !Loader.scriptsLoading) {
+                return Loader.triggerReady();
+            }
+
+            for (i = 0; i < ln; i++) {
+                item = queue[i];
+
+                if (item) {
+                    requires = item.requires;
+
+                    // Don't bother checking when the number of files loaded
+                    // is still less than the array length
+                    if (requires.length > Loader.numLoadedFiles) {
+                        continue;
+                    }
+
+                    // Remove any required classes that are loaded
+                    for (j = 0; j < requires.length; ) {
+                        if (Manager.isCreated(requires[j])) {
+                            // Take out from the queue
+                            arrayErase(requires, j, 1);
+                        }
+                        else {
+                            j++;
+                        }
+                    }
+
+                    // If we've ended up with no required classes, call the callback
+                    if (item.requires.length === 0) {
+                        arrayErase(queue, i, 1);
+                        item.callback.call(item.scope);
+                        Loader.refreshQueue();
+                        break;
+                    }
+                }
+            }
+
+            return Loader;
+        },
+
+        /**
+         * Inject a script element to document's head, call onLoad and onError accordingly
+         * @private
+         */
+        injectScriptElement: function(url, onLoad, onError, scope, charset) {
+            var script = document.createElement('script'),
+                dispatched = false,
+                config = Loader.config,
+                onLoadFn = function() {
+
+                    if(!dispatched) {
+                        dispatched = true;
+                        script.onload = script.onreadystatechange = script.onerror = null;
+                        if (typeof config.scriptChainDelay == 'number') {
+                            //free the stack (and defer the next script)
+                            defer(onLoad, config.scriptChainDelay, scope);
+                        } else {
+                            onLoad.call(scope);
+                        }
+                        Loader.cleanupScriptElement(script, config.preserveScripts === false, config.garbageCollect);
+                    }
+
+                },
+                onErrorFn = function(arg) {
+                    defer(onError, 1, scope);   //free the stack
+                    Loader.cleanupScriptElement(script, config.preserveScripts === false, config.garbageCollect);
+                };
+
+            script.type = 'text/javascript';
+            script.onerror = onErrorFn;
+            charset = charset || config.scriptCharset;
+            if (charset) {
+                script.charset = charset;
+            }
+
+            /*
+             * IE9 Standards mode (and others) SHOULD follow the load event only
+             * (Note: IE9 supports both onload AND readystatechange events)
+             */
+            if ('addEventListener' in script ) {
+                script.onload = onLoadFn;
+            } else if ('readyState' in script) {   // for <IE9 Compatability
+                script.onreadystatechange = function() {
+                    if ( this.readyState == 'loaded' || this.readyState == 'complete' ) {
+                        onLoadFn();
+                    }
+                };
+            } else {
+                 script.onload = onLoadFn;
+            }
+
+            script.src = url;
+            (Loader.documentHead || document.getElementsByTagName('head')[0]).appendChild(script);
+
+            return script;
+        },
+
+        /**
+         * @private
+         */
+        removeScriptElement: function(url) {
+            if (scriptElements[url]) {
+                Loader.cleanupScriptElement(scriptElements[url], true, !!Loader.getConfig('garbageCollect'));
+                delete scriptElements[url];
+            }
+
+            return Loader;
+        },
+
+        /**
+         * @private
+         */
+        cleanupScriptElement: function(script, remove, collect) {
+            var prop;
+            script.onload = script.onreadystatechange = script.onerror = null;
+            if (remove) {
+                Ext.removeNode(script);       // Remove, since its useless now
+                if (collect) {
+                    for (prop in script) {
+                        try {
+                            if (prop != 'src') {
+                                // If we set the src property to null IE
+                                // will try and request a script at './null'
+                                script[prop] = null;
+                            }
+                            delete script[prop];      // and prepare for GC
+                        } catch (cleanEx) {
+                            //ignore
+                        }
+                    }
+                }
+            }
+
+            return Loader;
+        },
+
+        /**
+         * Loads the specified script URL and calls the supplied callbacks. If this method
+         * is called before {@link Ext#isReady}, the script's load will delay the transition
+         * to ready. This can be used to load arbitrary scripts that may contain further
+         * {@link Ext#require Ext.require} calls.
+         *
+         * @param {Object/String} options The options object or simply the URL to load.
+         * @param {String} options.url The URL from which to load the script.
+         * @param {Function} [options.onLoad] The callback to call on successful load.
+         * @param {Function} [options.onError] The callback to call on failure to load.
+         * @param {Object} [options.scope] The scope (`this`) for the supplied callbacks.
+         */
+        loadScript: function (options) {
+            var config = Loader.getConfig(),
+                isString = typeof options == 'string',
+                url = isString ? options : options.url,
+                onError = !isString && options.onError,
+                onLoad = !isString && options.onLoad,
+                scope = !isString && options.scope,
+                onScriptError = function() {
+                    Loader.numPendingFiles--;
+                    Loader.scriptsLoading--;
+
+                    if (onError) {
+                        onError.call(scope, "Failed loading '" + url + "', please verify that the file exists");
+                    }
+
+                    if (Loader.numPendingFiles + Loader.scriptsLoading === 0) {
+                        Loader.refreshQueue();
+                    }
+                },
+                onScriptLoad = function () {
+                    Loader.numPendingFiles--;
+                    Loader.scriptsLoading--;
+
+                    if (onLoad) {
+                        onLoad.call(scope);
+                    }
+
+                    if (Loader.numPendingFiles + Loader.scriptsLoading === 0) {
+                        Loader.refreshQueue();
+                    }
+                },
+                src;
+
+            Loader.isLoading = true;
+            Loader.numPendingFiles++;
+            Loader.scriptsLoading++;
+
+            src = config.disableCaching ?
+                (url + '?' + config.disableCachingParam + '=' + Ext.Date.now()) : url;
+
+            scriptElements[url] = Loader.injectScriptElement(src, onScriptLoad, onScriptError);
+        },
+
+        /**
+         * Load a script file, supports both asynchronous and synchronous approaches
+         * @private
+         */
+        loadScriptFile: function(url, onLoad, onError, scope, synchronous) {
+            if (isFileLoaded[url]) {
+                return Loader;
+            }
+
+            var config = Loader.getConfig(),
+                noCacheUrl = url + (config.disableCaching ? ('?' + config.disableCachingParam + '=' + Ext.Date.now()) : ''),
+                isCrossOriginRestricted = false,
+                xhr, status, onScriptError,
+                debugSourceURL = "";
+
+            scope = scope || Loader;
+
+            Loader.isLoading = true;
+
+            if (!synchronous) {
+                onScriptError = function() {
+                    onError.call(scope, "Failed loading '" + url + "', please verify that the file exists", synchronous);
+                };
+
+                scriptElements[url] = Loader.injectScriptElement(noCacheUrl, onLoad, onScriptError, scope);
+            } else {
+                if (typeof XMLHttpRequest != 'undefined') {
+                    xhr = new XMLHttpRequest();
+                } else {
+                    xhr = new ActiveXObject('Microsoft.XMLHTTP');
+                }
+
+                try {
+                    xhr.open('GET', noCacheUrl, false);
+                    xhr.send(null);
+                } catch (e) {
+                    isCrossOriginRestricted = true;
+                }
+
+                status = (xhr.status === 1223) ? 204 :
+                    (xhr.status === 0 && ((self.location || {}).protocol == 'file:' || (self.location || {}).protocol == 'ionp:')) ? 200 : xhr.status;
+
+                isCrossOriginRestricted = isCrossOriginRestricted || (status === 0);
+
+                if (isCrossOriginRestricted
+                ) {
+                    onError.call(Loader, "Failed loading synchronously via XHR: '" + url + "'; It's likely that the file is either " +
+                                       "being loaded from a different domain or from the local file system whereby cross origin " +
+                                       "requests are not allowed due to security reasons. Use asynchronous loading with " +
+                                       "Ext.require instead.", synchronous);
+                }
+                else if ((status >= 200 && status < 300) || (status === 304)
+                ) {
+                    // Debugger friendly, file names are still shown even though they're eval'ed code
+                    // Breakpoints work on both Firebug and Chrome's Web Inspector
+                    if (!Ext.isIE) {
+                        debugSourceURL = "\n//@ sourceURL=" + url;
+                    }
+
+                    Ext.globalEval(xhr.responseText + debugSourceURL);
+
+                    onLoad.call(scope);
+                }
+                else {
+                    onError.call(Loader, "Failed loading synchronously via XHR: '" + url + "'; please " +
+                                       "verify that the file exists. " +
+                                       "XHR status code: " + status, synchronous);
+                }
+
+                // Prevent potential IE memory leak
+                xhr = null;
+            }
+        },
+
+        // documented above
+        syncRequire: function() {
+            var syncModeEnabled = Loader.syncModeEnabled;
+
+            if (!syncModeEnabled) {
+                Loader.syncModeEnabled = true;
+            }
+
+            Loader.require.apply(Loader, arguments);
+
+            if (!syncModeEnabled) {
+                Loader.syncModeEnabled = false;
+            }
+
+            Loader.refreshQueue();
+        },
+
+        // documented above
+        require: function(expressions, fn, scope, excludes) {
+            var excluded = {},
+                included = {},
+                excludedClassNames = [],
+                possibleClassNames = [],
+                classNames = [],
+                references = [],
+                callback,
+                syncModeEnabled,
+                filePath, expression, exclude, className,
+                possibleClassName, i, j, ln, subLn;
+
+            if (excludes) {
+                // Convert possible single string to an array.
+                excludes = (typeof excludes === 'string') ? [ excludes ] : excludes;
+
+                for (i = 0,ln = excludes.length; i < ln; i++) {
+                    exclude = excludes[i];
+
+                    if (typeof exclude == 'string' && exclude.length > 0) {
+                        excludedClassNames = Manager.getNamesByExpression(exclude);
+
+                        for (j = 0,subLn = excludedClassNames.length; j < subLn; j++) {
+                            excluded[excludedClassNames[j]] = true;
+                        }
+                    }
+                }
+            }
+
+            // Convert possible single string to an array.
+            expressions = (typeof expressions === 'string') ? [ expressions ] : (expressions ? expressions : []);
+
+            if (fn) {
+                if (fn.length > 0) {
+                    callback = function() {
+                        var classes = [],
+                            i, ln;
+
+                        for (i = 0,ln = references.length; i < ln; i++) {
+                            classes.push(Manager.get(references[i]));
+                        }
+
+                        return fn.apply(this, classes);
+                    };
+                }
+                else {
+                    callback = fn;
+                }
+            }
+            else {
+                callback = Ext.emptyFn;
+            }
+
+            scope = scope || Ext.global;
+
+            for (i = 0,ln = expressions.length; i < ln; i++) {
+                expression = expressions[i];
+
+                if (typeof expression == 'string' && expression.length > 0) {
+                    possibleClassNames = Manager.getNamesByExpression(expression);
+                    subLn = possibleClassNames.length;
+
+                    for (j = 0; j < subLn; j++) {
+                        possibleClassName = possibleClassNames[j];
+
+                        if (excluded[possibleClassName] !== true) {
+                            references.push(possibleClassName);
+
+                            if (!Manager.isCreated(possibleClassName) && !included[possibleClassName]) {
+                                included[possibleClassName] = true;
+                                classNames.push(possibleClassName);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // If the dynamic dependency feature is not being used, throw an error
+            // if the dependencies are not defined
+            if (classNames.length > 0) {
+                if (!Loader.config.enabled) {
+                    throw new Error("Ext.Loader is not enabled, so dependencies cannot be resolved dynamically. " +
+                             "Missing required class" + ((classNames.length > 1) ? "es" : "") + ": " + classNames.join(', '));
+                }
+            }
+            else {
+                callback.call(scope);
+                return Loader;
+            }
+
+            syncModeEnabled = Loader.syncModeEnabled;
+
+            if (!syncModeEnabled) {
+                queue.push({
+                    requires: classNames.slice(), // this array will be modified as the queue is processed,
+                                                  // so we need a copy of it
+                    callback: callback,
+                    scope: scope
+                });
+            }
+
+            ln = classNames.length;
+
+            for (i = 0; i < ln; i++) {
+                className = classNames[i];
+
+                filePath = Loader.getPath(className);
+
+                // If we are synchronously loading a file that has already been asychronously loaded before
+                // we need to destroy the script tag and revert the count
+                // This file will then be forced loaded in synchronous
+                if (syncModeEnabled && isClassFileLoaded.hasOwnProperty(className)) {
+                    if (!isClassFileLoaded[className]) {
+                        Loader.numPendingFiles--;
+                        Loader.removeScriptElement(filePath);
+                        delete isClassFileLoaded[className];
+                    }
+                }
+
+                if (!isClassFileLoaded.hasOwnProperty(className)) {
+                    isClassFileLoaded[className] = false;
+                    classNameToFilePathMap[className] = filePath;
+
+                    Loader.numPendingFiles++;
+                    Loader.loadScriptFile(
+                        filePath,
+                        pass(Loader.onFileLoaded, [className, filePath], Loader),
+                        pass(Loader.onFileLoadError, [className, filePath], Loader),
+                        Loader,
+                        syncModeEnabled
+                    );
+                }
+            }
+
+            if (syncModeEnabled) {
+                callback.call(scope);
+
+                if (ln === 1) {
+                    return Manager.get(className);
+                }
+            }
+
+            return Loader;
+        },
+
+        /**
+         * @private
+         * @param {String} className
+         * @param {String} filePath
+         */
+        onFileLoaded: function(className, filePath) {
+            var loaded = isClassFileLoaded[className];
+            Loader.numLoadedFiles++;
+
+            isClassFileLoaded[className] = true;
+            isFileLoaded[filePath] = true;
+
+            // In FF, when we sync load something that has had a script tag inserted, the load event may
+            // sometimes fire even if we clean it up and set it to null, so check if we're already loaded here.
+            if (!loaded) {
+                Loader.numPendingFiles--;
+            }
+
+            if (Loader.numPendingFiles === 0) {
+                Loader.refreshQueue();
+            }
+
+            if (!Loader.syncModeEnabled && Loader.numPendingFiles === 0 && Loader.isLoading && !Loader.hasFileLoadError) {
+                var missingClasses = [],
+                    missingPaths = [],
+                    requires,
+                    i, ln, j, subLn;
+
+                for (i = 0,ln = queue.length; i < ln; i++) {
+                    requires = queue[i].requires;
+
+                    for (j = 0,subLn = requires.length; j < subLn; j++) {
+                        if (isClassFileLoaded[requires[j]]) {
+                            missingClasses.push(requires[j]);
+                        }
+                    }
+                }
+
+                if (missingClasses.length < 1) {
+                    return;
+                }
+
+                missingClasses = Ext.Array.filter(Ext.Array.unique(missingClasses), function(item) {
+                    return !requiresMap.hasOwnProperty(item);
+                }, Loader);
+                
+                if (missingClasses.length < 1) {
+                    return;
+                }
+
+                for (i = 0,ln = missingClasses.length; i < ln; i++) {
+                    missingPaths.push(classNameToFilePathMap[missingClasses[i]]);
+                }
+
+                throw new Error("The following classes are not declared even if their files have been " +
+                    "loaded: '" + missingClasses.join("', '") + "'. Please check the source code of their " +
+                    "corresponding files for possible typos: '" + missingPaths.join("', '"));
+            }
+        },
+
+        /**
+         * @private
+         */
+        onFileLoadError: function(className, filePath, errorMessage, isSynchronous) {
+            Loader.numPendingFiles--;
+            Loader.hasFileLoadError = true;
+
+            throw new Error("[Ext.Loader] " + errorMessage);
+        },
+
+        /**
+         * @private
+         * Ensure that any classes referenced in the `uses` property are loaded.
+         */
+        addUsedClasses: function (classes) {
+            var cls, i, ln;
+
+            if (classes) {
+                classes = (typeof classes == 'string') ? [classes] : classes;
+                for (i = 0, ln = classes.length; i < ln; i++) {
+                    cls = classes[i];
+                    if (typeof cls == 'string' && !Ext.Array.contains(usedClasses, cls)) {
+                        usedClasses.push(cls);
+                    }
+                }
+            }
+
+            return Loader;
+        },
+
+        /**
+         * @private
+         */
+        triggerReady: function() {
+            var listener,
+                refClasses = usedClasses;
+
+            if (Loader.isLoading) {
+                Loader.isLoading = false;
+
+                if (refClasses.length !== 0) {
+                    // Clone then empty the array to eliminate potential recursive loop issue
+                    refClasses = refClasses.slice();
+                    usedClasses.length = 0;
+                    // this may immediately call us back if all 'uses' classes
+                    // have been loaded
+                    Loader.require(refClasses, Loader.triggerReady, Loader);
+                    return Loader;
+                }
+            }
+
+            Ext.Array.sort(readyListeners, comparePriority);
+
+            // this method can be called with Loader.isLoading either true or false
+            // (can be called with false when all 'uses' classes are already loaded)
+            // this may bypass the above if condition
+            while (readyListeners.length && !Loader.isLoading) {
+                // calls to refreshQueue may re-enter triggerReady
+                // so we cannot necessarily iterate the readyListeners array
+                listener = readyListeners.shift();
+                listener.fn.call(listener.scope);
+            }
+
+            return Loader;
+        },
+
+        // Documented above already
+        onReady: function(fn, scope, withDomReady, options) {
+            var oldFn;
+
+            if (withDomReady !== false && Ext.onDocumentReady) {
+                oldFn = fn;
+
+                fn = function() {
+                    Ext.onDocumentReady(oldFn, scope, options);
+                };
+            }
+
+            if (!Loader.isLoading) {
+                fn.call(scope);
+            }
+            else {
+                readyListeners.push({
+                    fn: fn,
+                    scope: scope,
+                    priority: (options && options.priority) || 0
+                });
+            }
+        },
+
+        /**
+         * @private
+         * @param {String} className
+         */
+        historyPush: function(className) {
+            if (className && isClassFileLoaded.hasOwnProperty(className) && !isInHistory[className]) {
+                isInHistory[className] = true;
+                history.push(className);
+            }
+            return Loader;
+        }
+    });
+
+    /**
+     * Turns on or off the "cache buster" applied to dynamically loaded scripts. Normally
+     * dynamically loaded scripts have an extra query parameter appended to avoid stale
+     * cached scripts. This method can be used to disable this mechanism, and is primarily
+     * useful for testing. This is done using a cookie.
+     * @param {Boolean} disable True to disable the cache buster.
+     * @param {String} [path="/"] An optional path to scope the cookie.
+     * @private
+     */
+    Ext.disableCacheBuster = function (disable, path) {
+        var date = new Date();
+        date.setTime(date.getTime() + (disable ? 10*365 : -1) * 24*60*60*1000);
+        date = date.toGMTString();
+        document.cookie = 'ext-cache=1; expires=' + date + '; path='+(path || '/');
+    };
+
+
+    /**
+     * @member Ext
+     * @method require
+     * @inheritdoc Ext.Loader#require
+     */
+    Ext.require = alias(Loader, 'require');
+
+    /**
+     * @member Ext
+     * @method syncRequire
+     * @inheritdoc Ext.Loader#syncRequire
+     */
+    Ext.syncRequire = alias(Loader, 'syncRequire');
+
+    /**
+     * Convenient shortcut to {@link Ext.Loader#exclude}
+     * @member Ext
+     * @method exclude
+     * @inheritdoc Ext.Loader#exclude
+     */
+    Ext.exclude = alias(Loader, 'exclude');
+
+    /**
+     * @member Ext
+     * @method onReady
+     * @ignore
+     */
+    Ext.onReady = function(fn, scope, options) {
+        Loader.onReady(fn, scope, true, options);
+    };
+
+    /**
+     * @cfg {String[]} requires
+     * @member Ext.Class
+     * List of classes that have to be loaded before instantiating this class.
+     * For example:
+     *
+     *     Ext.define('Mother', {
+     *         requires: ['Child'],
+     *         giveBirth: function() {
+     *             // we can be sure that child class is available.
+     *             return new Child();
+     *         }
+     *     });
+     */
+    Class.registerPreprocessor('loader', function(cls, data, hooks, continueFn) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(cls, 'Ext.Loader#loaderPreprocessor', arguments);
+        
+        var me = this,
+            dependencies = [],
+            dependency,
+            className = Manager.getName(cls),
+            i, j, ln, subLn, value, propertyName, propertyValue,
+            requiredMap, requiredDep;
+
+        /*
+        Loop through the dependencyProperties, look for string class names and push
+        them into a stack, regardless of whether the property's value is a string, array or object. For example:
+        {
+              extend: 'Ext.MyClass',
+              requires: ['Ext.some.OtherClass'],
+              mixins: {
+                  observable: 'Ext.util.Observable';
+              }
+        }
+        which will later be transformed into:
+        {
+              extend: Ext.MyClass,
+              requires: [Ext.some.OtherClass],
+              mixins: {
+                  observable: Ext.util.Observable;
+              }
+        }
+        */
+
+        for (i = 0,ln = dependencyProperties.length; i < ln; i++) {
+            propertyName = dependencyProperties[i];
+
+            if (data.hasOwnProperty(propertyName)) {
+                propertyValue = data[propertyName];
+
+                if (typeof propertyValue == 'string') {
+                    dependencies.push(propertyValue);
+                }
+                else if (propertyValue instanceof Array) {
+                    for (j = 0, subLn = propertyValue.length; j < subLn; j++) {
+                        value = propertyValue[j];
+
+                        if (typeof value == 'string') {
+                            dependencies.push(value);
+                        }
+                    }
+                }
+                else if (typeof propertyValue != 'function') {
+                    for (j in propertyValue) {
+                        if (propertyValue.hasOwnProperty(j)) {
+                            value = propertyValue[j];
+
+                            if (typeof value == 'string') {
+                                dependencies.push(value);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (dependencies.length === 0) {
+            return;
+        }
+
+        var deadlockPath = [],
+            detectDeadlock;
+
+        /*
+        Automatically detect deadlocks before-hand,
+        will throw an error with detailed path for ease of debugging. Examples of deadlock cases:
+
+        - A extends B, then B extends A
+        - A requires B, B requires C, then C requires A
+
+        The detectDeadlock function will recursively transverse till the leaf, hence it can detect deadlocks
+        no matter how deep the path is.
+        */
+
+        if (className) {
+            requiresMap[className] = dependencies;
+            requiredMap = Loader.requiredByMap || (Loader.requiredByMap = {});
+
+            for (i = 0,ln = dependencies.length; i < ln; i++) {
+                dependency = dependencies[i];
+                (requiredMap[dependency] || (requiredMap[dependency] = [])).push(className);
+            }
+            detectDeadlock = function(cls) {
+                deadlockPath.push(cls);
+
+                if (requiresMap[cls]) {
+                    if (Ext.Array.contains(requiresMap[cls], className)) {
+                        throw new Error("Deadlock detected while loading dependencies! '" + className + "' and '" +
+                                deadlockPath[1] + "' " + "mutually require each other. Path: " +
+                                deadlockPath.join(' -> ') + " -> " + deadlockPath[0]);
+                    }
+
+                    for (i = 0,ln = requiresMap[cls].length; i < ln; i++) {
+                        detectDeadlock(requiresMap[cls][i]);
+                    }
+                }
+            };
+
+            detectDeadlock(className);
+        }
+
+
+        Loader.require(dependencies, function() {
+            for (i = 0,ln = dependencyProperties.length; i < ln; i++) {
+                propertyName = dependencyProperties[i];
+
+                if (data.hasOwnProperty(propertyName)) {
+                    propertyValue = data[propertyName];
+
+                    if (typeof propertyValue == 'string') {
+                        data[propertyName] = Manager.get(propertyValue);
+                    }
+                    else if (propertyValue instanceof Array) {
+                        for (j = 0, subLn = propertyValue.length; j < subLn; j++) {
+                            value = propertyValue[j];
+
+                            if (typeof value == 'string') {
+                                data[propertyName][j] = Manager.get(value);
+                            }
+                        }
+                    }
+                    else if (typeof propertyValue != 'function') {
+                        for (var k in propertyValue) {
+                            if (propertyValue.hasOwnProperty(k)) {
+                                value = propertyValue[k];
+
+                                if (typeof value == 'string') {
+                                    data[propertyName][k] = Manager.get(value);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            continueFn.call(me, cls, data, hooks);
+        });
+
+        return false;
+    }, true, 'after', 'className');
+
+    /**
+     * @cfg {String[]} uses
+     * @member Ext.Class
+     * List of optional classes to load together with this class. These aren't neccessarily loaded before
+     * this class is created, but are guaranteed to be available before Ext.onReady listeners are
+     * invoked. For example:
+     *
+     *     Ext.define('Mother', {
+     *         uses: ['Child'],
+     *         giveBirth: function() {
+     *             // This code might, or might not work:
+     *             // return new Child();
+     *
+     *             // Instead use Ext.create() to load the class at the spot if not loaded already:
+     *             return Ext.create('Child');
+     *         }
+     *     });
+     */
+    Manager.registerPostprocessor('uses', function(name, cls, data) {
+        Ext.classSystemMonitor && Ext.classSystemMonitor(cls, 'Ext.Loader#usesPostprocessor', arguments);
+        
+        var uses = data.uses;
+        if (uses) {
+            Loader.addUsedClasses(uses);
+        }
+    });
+
+    Manager.onCreated(Loader.historyPush);
+};
+
+// simple mechanism for automated means of injecting large amounts of dependency info
+// at the appropriate time in the load cycle
+if (Ext._classPathMetadata) {
+    Ext.Loader.addClassPathMappings(Ext._classPathMetadata);
+    Ext._classPathMetadata = null;
+}
+
+// initalize the default path of the framework
+(function() {
+    var scripts = document.getElementsByTagName('script'),
+        currentScript = scripts[scripts.length - 1],
+        src = currentScript.src,
+        path = src.substring(0, src.lastIndexOf('/') + 1),
+        Loader = Ext.Loader;
+
+    if(src.indexOf("/platform/core/src/class/") != -1) {
+        path = path + "../../../../extjs/";
+    } else if(src.indexOf("/core/src/class/") != -1) {
+        path = path + "../../../";
+    }
+
+    Loader.setConfig({
+        enabled: true,
+        disableCaching:
+            (/[?&](?:cache|disableCacheBuster)\b/i.test(location.search) ||
+             /(^|[ ;])ext-cache=1/.test(document.cookie)) ? false : 
+            true,
+        paths: {
+            'Ext': path + 'src'
+        }
+    });
+})();
+
+// allows a tools like dynatrace to deterministically detect onReady state by invoking
+// a callback (intended for external consumption)
+Ext._endTime = new Date().getTime();
+if (Ext._beforereadyhandler){
+    Ext._beforereadyhandler();
+}
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag foundation,core
+// @require ../class/Loader.js
+// @define Ext.Error
+
+/**
+ * @author Brian Moeskau <brian at sencha.com>
+ * @docauthor Brian Moeskau <brian at sencha.com>
+ *
+ * A wrapper class for the native JavaScript Error object that adds a few useful capabilities for handling
+ * errors in an Ext application. When you use Ext.Error to {@link #raise} an error from within any class that
+ * uses the Ext 4 class system, the Error class can automatically add the source class and method from which
+ * the error was raised. It also includes logic to automatically log the error to the console, if available,
+ * with additional metadata about the error. In all cases, the error will always be thrown at the end so that
+ * execution will halt.
+ *
+ * Ext.Error also offers a global error {@link #handle handling} method that can be overridden in order to
+ * handle application-wide errors in a single spot. You can optionally {@link #ignore} errors altogether,
+ * although in a real application it's usually a better idea to override the handling function and perform
+ * logging or some other method of reporting the errors in a way that is meaningful to the application.
+ *
+ * At its simplest you can simply raise an error as a simple string from within any code:
+ *
+ * Example usage:
+ *
+ *     Ext.Error.raise('Something bad happened!');
+ *
+ * If raised from plain JavaScript code, the error will be logged to the console (if available) and the message
+ * displayed. In most cases however you'll be raising errors from within a class, and it may often be useful to add
+ * additional metadata about the error being raised.  The {@link #raise} method can also take a config object.
+ * In this form the `msg` attribute becomes the error description, and any other data added to the config gets
+ * added to the error object and, if the console is available, logged to the console for inspection.
+ *
+ * Example usage:
+ *
+ *     Ext.define('Ext.Foo', {
+ *         doSomething: function(option){
+ *             if (someCondition === false) {
+ *                 Ext.Error.raise({
+ *                     msg: 'You cannot do that!',
+ *                     option: option,   // whatever was passed into the method
+ *                     'error code': 100 // other arbitrary info
+ *                 });
+ *             }
+ *         }
+ *     });
+ *
+ * If a console is available (that supports the `console.dir` function) you'll see console output like:
+ *
+ *     An error was raised with the following data:
+ *     option:         Object { foo: "bar"}
+ *         foo:        "bar"
+ *     error code:     100
+ *     msg:            "You cannot do that!"
+ *     sourceClass:   "Ext.Foo"
+ *     sourceMethod:  "doSomething"
+ *
+ *     uncaught exception: You cannot do that!
+ *
+ * As you can see, the error will report exactly where it was raised and will include as much information as the
+ * raising code can usefully provide.
+ *
+ * If you want to handle all application errors globally you can simply override the static {@link #handle} method
+ * and provide whatever handling logic you need. If the method returns true then the error is considered handled
+ * and will not be thrown to the browser. If anything but true is returned then the error will be thrown normally.
+ *
+ * Example usage:
+ *
+ *     Ext.Error.handle = function(err) {
+ *         if (err.someProperty == 'NotReallyAnError') {
+ *             // maybe log something to the application here if applicable
+ *             return true;
+ *         }
+ *         // any non-true return value (including none) will cause the error to be thrown
+ *     }
+ *
+ */
+Ext.Error = Ext.extend(Error, {
+    statics: {
+        /**
+         * @property {Boolean} ignore
+         * Static flag that can be used to globally disable error reporting to the browser if set to true
+         * (defaults to false). Note that if you ignore Ext errors it's likely that some other code may fail
+         * and throw a native JavaScript error thereafter, so use with caution. In most cases it will probably
+         * be preferable to supply a custom error {@link #handle handling} function instead.
+         *
+         * Example usage:
+         *
+         *     Ext.Error.ignore = true;
+         *
+         * @static
+         */
+        ignore: false,
+
+        /**
+         * @property {Boolean} notify
+         * Static flag that can be used to globally control error notification to the user. Unlike
+         * Ex.Error.ignore, this does not effect exceptions. They are still thrown. This value can be
+         * set to false to disable the alert notification (default is true for IE6 and IE7).
+         *
+         * Only the first error will generate an alert. Internally this flag is set to false when the
+         * first error occurs prior to displaying the alert.
+         *
+         * This flag is not used in a release build.
+         *
+         * Example usage:
+         *
+         *     Ext.Error.notify = false;
+         *
+         * @static
+         */
+        //notify: Ext.isIE6 || Ext.isIE7,
+
+        /**
+         * Raise an error that can include additional data and supports automatic console logging if available.
+         * You can pass a string error message or an object with the `msg` attribute which will be used as the
+         * error message. The object can contain any other name-value attributes (or objects) to be logged
+         * along with the error.
+         *
+         * Note that after displaying the error message a JavaScript error will ultimately be thrown so that
+         * execution will halt.
+         *
+         * Example usage:
+         *
+         *     Ext.Error.raise('A simple string error message');
+         *
+         *     // or...
+         *
+         *     Ext.define('Ext.Foo', {
+         *         doSomething: function(option){
+         *             if (someCondition === false) {
+         *                 Ext.Error.raise({
+         *                     msg: 'You cannot do that!',
+         *                     option: option,   // whatever was passed into the method
+         *                     'error code': 100 // other arbitrary info
+         *                 });
+         *             }
+         *         }
+         *     });
+         *
+         * @param {String/Object} err The error message string, or an object containing the attribute "msg" that will be
+         * used as the error message. Any other data included in the object will also be logged to the browser console,
+         * if available.
+         * @static
+         */
+        raise: function(err){
+            err = err || {};
+            if (Ext.isString(err)) {
+                err = { msg: err };
+            }
+
+            var method = this.raise.caller,
+                msg;
+
+            if (method) {
+                if (method.$name) {
+                    err.sourceMethod = method.$name;
+                }
+                if (method.$owner) {
+                    err.sourceClass = method.$owner.$className;
+                }
+            }
+
+            if (Ext.Error.handle(err) !== true) {
+                msg = Ext.Error.prototype.toString.call(err);
+
+                Ext.log({
+                    msg: msg,
+                    level: 'error',
+                    dump: err,
+                    stack: true
+                });
+
+                throw new Ext.Error(err);
+            }
+        },
+
+        /**
+         * Globally handle any Ext errors that may be raised, optionally providing custom logic to
+         * handle different errors individually. Return true from the function to bypass throwing the
+         * error to the browser, otherwise the error will be thrown and execution will halt.
+         *
+         * Example usage:
+         *
+         *     Ext.Error.handle = function(err) {
+         *         if (err.someProperty == 'NotReallyAnError') {
+         *             // maybe log something to the application here if applicable
+         *             return true;
+         *         }
+         *         // any non-true return value (including none) will cause the error to be thrown
+         *     }
+         *
+         * @param {Ext.Error} err The Ext.Error object being raised. It will contain any attributes that were originally
+         * raised with it, plus properties about the method and class from which the error originated (if raised from a
+         * class that uses the Ext 4 class system).
+         * @static
+         */
+        handle: function(){
+            return Ext.Error.ignore;
+        }
+    },
+
+    // This is the standard property that is the name of the constructor.
+    name: 'Ext.Error',
+
+    /**
+     * Creates new Error object.
+     * @param {String/Object} config The error message string, or an object containing the
+     * attribute "msg" that will be used as the error message. Any other data included in
+     * the object will be applied to the error instance and logged to the browser console, if available.
+     */
+    constructor: function(config){
+        if (Ext.isString(config)) {
+            config = { msg: config };
+        }
+
+        var me = this;
+
+        Ext.apply(me, config);
+
+        me.message = me.message || me.msg; // 'message' is standard ('msg' is non-standard)
+        // note: the above does not work in old WebKit (me.message is readonly) (Safari 4)
+    },
+
+    /**
+     * Provides a custom string representation of the error object. This is an override of the base JavaScript
+     * `Object.toString` method, which is useful so that when logged to the browser console, an error object will
+     * be displayed with a useful message instead of `[object Object]`, the default `toString` result.
+     *
+     * The default implementation will include the error message along with the raising class and method, if available,
+     * but this can be overridden with a custom implementation either at the prototype level (for all errors) or on
+     * a particular error instance, if you want to provide a custom description that will show up in the console.
+     * @return {String} The error message. If raised from within the Ext 4 class system, the error message will also
+     * include the raising class and method names, if available.
+     */
+    toString: function(){
+        var me = this,
+            className = me.sourceClass ? me.sourceClass : '',
+            methodName = me.sourceMethod ? '.' + me.sourceMethod + '(): ' : '',
+            msg = me.msg || '(No description provided)';
+
+        return className + methodName + msg;
+    }
+});
+
+/*
+ * Create a function that will throw an error if called (in debug mode) with a message that
+ * indicates the method has been removed.
+ * @param {String} suggestion Optional text to include in the message (a workaround perhaps).
+ * @return {Function} The generated function.
+ * @private
+ */
+Ext.deprecated = function (suggestion) {
+    if (!suggestion) {
+        suggestion = '';
+    }
+
+    function fail () {
+        Ext.Error.raise('The method "' + fail.$owner.$className + '.' + fail.$name + 
+                '" has been removed. ' + suggestion);
+    }
+
+    return fail;
+    return Ext.emptyFn;
+};
+
+/*
+ * This mechanism is used to notify the user of the first error encountered on the page. This
+ * was previously internal to Ext.Error.raise and is a desirable feature since errors often
+ * slip silently under the radar. It cannot live in Ext.Error.raise since there are times
+ * where exceptions are handled in a try/catch.
+ */
+(function () {
+    var timer, errors = 0,
+        win = Ext.global,
+        msg;
+
+    if (typeof window === 'undefined') {
+        return; // build system or some such environment...
+    }
+
+    // This method is called to notify the user of the current error status.
+    function notify () {
+        var counters = Ext.log.counters,
+            supports = Ext.supports,
+            hasOnError = supports && supports.WindowOnError; // TODO - timing
+
+        // Put log counters to the status bar (for most browsers):
+        if (counters && (counters.error + counters.warn + counters.info + counters.log)) {
+            msg = [ 'Logged Errors:',counters.error, 'Warnings:',counters.warn,
+                        'Info:',counters.info, 'Log:',counters.log].join(' ');
+            if (errors) {
+                msg = '*** Errors: ' + errors + ' - ' + msg;
+            } else if (counters.error) {
+                msg = '*** ' + msg;
+            }
+            win.status = msg;
+        }
+
+        // Display an alert on the first error:
+        if (!Ext.isDefined(Ext.Error.notify)) {
+            Ext.Error.notify = Ext.isIE6 || Ext.isIE7; // TODO - timing
+        }
+        if (Ext.Error.notify && (hasOnError ? errors : (counters && counters.error))) {
+            Ext.Error.notify = false;
+
+            if (timer) {
+                win.clearInterval(timer); // ticks can queue up so stop...
+                timer = null;
+            }
+
+            alert('Unhandled error on page: See console or log');
+            poll();
+        }
+    }
+
+    // Sets up polling loop. This is the only way to know about errors in some browsers
+    // (Opera/Safari) and is the only way to update the status bar for warnings and other
+    // non-errors.
+    function poll () {
+        timer = win.setInterval(notify, 1000);
+    }
+
+    // window.onerror sounds ideal but it prevents the built-in error dialog from doing
+    // its (better) thing.
+    poll();
+}());
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require ../lang/Error.js
+// @define Ext.JSON
+
+/**
+ * Modified version of [Douglas Crockford's JSON.js][dc] that doesn't
+ * mess with the Object prototype.
+ *
+ * [dc]: http://www.json.org/js.html
+ *
+ * @singleton
+ */
+Ext.JSON = (new(function() {
+    var me = this,
+    encodingFunction,
+    decodingFunction,
+    useNative = null,
+    useHasOwn = !! {}.hasOwnProperty,
+    isNative = function() {
+        if (useNative === null) {
+            useNative = Ext.USE_NATIVE_JSON && window.JSON && JSON.toString() == '[object JSON]';
+        }
+        return useNative;
+    },
+    pad = function(n) {
+        return n < 10 ? "0" + n : n;
+    },
+    doDecode = function(json) {
+        return eval("(" + json + ')');
+    },
+    doEncode = function(o, newline) {
+        // http://jsperf.com/is-undefined
+        if (o === null || o === undefined) {
+            return "null";
+        } else if (Ext.isDate(o)) {
+            return Ext.JSON.encodeDate(o);
+        } else if (Ext.isString(o)) {
+            return Ext.JSON.encodeString(o);
+        } else if (typeof o == "number") {
+            //don't use isNumber here, since finite checks happen inside isNumber
+            return isFinite(o) ? String(o) : "null";
+        } else if (Ext.isBoolean(o)) {
+            return String(o);
+        }
+        // Allow custom zerialization by adding a toJSON method to any object type.
+        // Date/String have a toJSON in some environments, so check these first.
+        else if (o.toJSON) {
+            return o.toJSON();
+        } else if (Ext.isArray(o)) {
+            return encodeArray(o, newline);
+        } else if (Ext.isObject(o)) {
+            return encodeObject(o, newline);
+        } else if (typeof o === "function") {
+            return "null";
+        }
+        return 'undefined';
+    },
+    m = {
+        "\b": '\\b',
+        "\t": '\\t',
+        "\n": '\\n',
+        "\f": '\\f',
+        "\r": '\\r',
+        '"': '\\"',
+        "\\": '\\\\',
+        '\x0b': '\\u000b' //ie doesn't handle \v
+    },
+    charToReplace = /[\\\"\x00-\x1f\x7f-\uffff]/g,
+    encodeString = function(s) {
+        return '"' + s.replace(charToReplace, function(a) {
+            var c = m[a];
+            return typeof c === 'string' ? c : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"';
+    },
+
+    encodeArrayPretty = function(o, newline) {
+        var len = o.length,
+            cnewline = newline + '   ',
+            sep = ',' + cnewline,
+            a = ["[", cnewline], // Note newline in case there are no members
+            i;
+
+        for (i = 0; i < len; i += 1) {
+            a.push(Ext.JSON.encodeValue(o[i], cnewline), sep);
+        }
+
+        // Overwrite trailing comma (or empty string)
+        a[a.length - 1] = newline + ']';
+
+        return a.join('');
+    },
+
+    encodeObjectPretty = function(o, newline) {
+        var cnewline = newline + '   ',
+            sep = ',' + cnewline,
+            a = ["{", cnewline], // Note newline in case there are no members
+            i, val;
+
+        for (i in o) {
+            val = o[i];
+            if (!useHasOwn || o.hasOwnProperty(i)) {
+                // To match JSON.stringify, we shouldn't encode functions or undefined
+                if (typeof val === 'function' || val === undefined) {
+                    continue;
+                }
+                a.push(Ext.JSON.encodeValue(i) + ': ' + Ext.JSON.encodeValue(val, cnewline), sep);
+            }
+        }
+
+        // Overwrite trailing comma (or empty string)
+        a[a.length - 1] = newline + '}';
+
+        return a.join('');
+    },
+
+    encodeArray = function(o, newline) {
+        if (newline) {
+            return encodeArrayPretty(o, newline);
+        }
+
+        var a = ["[", ""], // Note empty string in case there are no serializable members.
+            len = o.length,
+            i;
+        for (i = 0; i < len; i += 1) {
+            a.push(Ext.JSON.encodeValue(o[i]), ',');
+        }
+        // Overwrite trailing comma (or empty string)
+        a[a.length - 1] = ']';
+        return a.join("");
+    },
+
+    encodeObject = function(o, newline) {
+        if (newline) {
+            return encodeObjectPretty(o, newline);
+        }
+
+        var a = ["{", ""], // Note empty string in case there are no serializable members.
+            i, val;
+        for (i in o) {
+            val = o[i];
+            if (!useHasOwn || o.hasOwnProperty(i)) {
+                // To match JSON.stringify, we shouldn't encode functions or undefined
+                if (typeof val === 'function' || val === undefined) {
+                    continue;
+                }
+                a.push(Ext.JSON.encodeValue(i), ":", Ext.JSON.encodeValue(val), ',');
+                
+            }
+        }
+        // Overwrite trailing comma (or empty string)
+        a[a.length - 1] = '}';
+        return a.join("");
+    };
+    
+    /**
+     * Encodes a String. This returns the actual string which is inserted into the JSON string as the literal
+     * expression. **The returned value includes enclosing double quotation marks.**
+     *
+     * To override this:
+     *
+     *     Ext.JSON.encodeString = function(s) {
+     *         return 'Foo' + s;
+     *     };
+     *
+     * @param {String} s The String to encode
+     * @return {String} The string literal to use in a JSON string.
+     * @method
+     */
+    me.encodeString = encodeString;
+
+    /**
+     * The function which {@link #encode} uses to encode all javascript values to their JSON representations
+     * when {@link Ext#USE_NATIVE_JSON} is `false`.
+     * 
+     * This is made public so that it can be replaced with a custom implementation.
+     *
+     * @param {Object} o Any javascript value to be converted to its JSON representation
+     * @return {String} The JSON representation of the passed value.
+     * @method
+     */
+    me.encodeValue = doEncode;
+
+    /**
+     * Encodes a Date. This returns the actual string which is inserted into the JSON string as the literal
+     * expression. **The returned value includes enclosing double quotation marks.**
+     *
+     * The default return format is `"yyyy-mm-ddThh:mm:ss"`.
+     *
+     * To override this:
+     *
+     *     Ext.JSON.encodeDate = function(d) {
+     *         return Ext.Date.format(d, '"Y-m-d"');
+     *     };
+     *
+     * @param {Date} d The Date to encode
+     * @return {String} The string literal to use in a JSON string.
+     */
+    me.encodeDate = function(o) {
+        return '"' + o.getFullYear() + "-"
+        + pad(o.getMonth() + 1) + "-"
+        + pad(o.getDate()) + "T"
+        + pad(o.getHours()) + ":"
+        + pad(o.getMinutes()) + ":"
+        + pad(o.getSeconds()) + '"';
+    };
+
+    /**
+     * Encodes an Object, Array or other value.
+     * 
+     * If the environment's native JSON encoding is not being used ({@link Ext#USE_NATIVE_JSON} is not set,
+     * or the environment does not support it), then ExtJS's encoding will be used. This allows the developer
+     * to add a `toJSON` method to their classes which need serializing to return a valid JSON representation
+     * of the object.
+     * 
+     * @param {Object} o The variable to encode
+     * @return {String} The JSON string
+     */
+    me.encode = function(o) {
+        if (!encodingFunction) {
+            // setup encoding function on first access
+            encodingFunction = isNative() ? JSON.stringify : me.encodeValue;
+        }
+        return encodingFunction(o);
+    };
+
+    /**
+     * Decodes (parses) a JSON string to an object. If the JSON is invalid, this function throws
+     * a SyntaxError unless the safe option is set.
+     *
+     * @param {String} json The JSON string
+     * @param {Boolean} [safe=false] True to return null, false to throw an exception if the JSON is invalid.
+     * @return {Object} The resulting object
+     */
+    me.decode = function(json, safe) {
+        if (!decodingFunction) {
+            // setup decoding function on first access
+            decodingFunction = isNative() ? JSON.parse : doDecode;
+        }
+        try {
+            return decodingFunction(json);
+        } catch (e) {
+            if (safe === true) {
+                return null;
+            }
+            Ext.Error.raise({
+                sourceClass: "Ext.JSON",
+                sourceMethod: "decode",
+                msg: "You're trying to decode an invalid JSON String: " + json
+            });
+        }
+    };
+})());
+/**
+ * Shorthand for {@link Ext.JSON#encode}
+ * @member Ext
+ * @method encode
+ * @inheritdoc Ext.JSON#encode
+ */
+Ext.encode = Ext.JSON.encode;
+/**
+ * Shorthand for {@link Ext.JSON#decode}
+ * @member Ext
+ * @method decode
+ * @inheritdoc Ext.JSON#decode
+ */
+Ext.decode = Ext.JSON.decode;
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require misc/JSON.js
+// @define Ext
+
+/**
+ * @class Ext
+ *
+ * The Ext namespace (global object) encapsulates all classes, singletons, and
+ * utility methods provided by Sencha's libraries.
+ *
+ * Most user interface Components are at a lower level of nesting in the namespace,
+ * but many common utility functions are provided as direct properties of the Ext namespace.
+ *
+ * Also many frequently used methods from other classes are provided as shortcuts
+ * within the Ext namespace. For example {@link Ext#getCmp Ext.getCmp} aliases
+ * {@link Ext.ComponentManager#get Ext.ComponentManager.get}.
+ *
+ * Many applications are initiated with {@link Ext#onReady Ext.onReady} which is
+ * called once the DOM is ready. This ensures all scripts have been loaded,
+ * preventing dependency issues. For example:
+ *
+ *     Ext.onReady(function(){
+ *         new Ext.Component({
+ *             renderTo: document.body,
+ *             html: 'DOM ready!'
+ *         });
+ *     });
+ *
+ * For more information about how to use the Ext classes, see:
+ *
+ * - <a href="http://www.sencha.com/learn/">The Learning Center</a>
+ * - <a href="http://www.sencha.com/learn/Ext_FAQ">The FAQ</a>
+ * - <a href="http://www.sencha.com/forum/">The forums</a>
+ *
+ * @singleton
+ */
+Ext.apply(Ext, {
+    userAgent: navigator.userAgent.toLowerCase(),
+    cache: {},
+    idSeed: 1000,
+    windowId: 'ext-window',
+    documentId: 'ext-document',
+
+    /**
+     * True when the document is fully initialized and ready for action
+     */
+    isReady: false,
+
+    /**
+     * True to automatically uncache orphaned Ext.Elements periodically
+     */
+    enableGarbageCollector: true,
+
+    /**
+     * True to automatically purge event listeners during garbageCollection.
+     */
+    enableListenerCollection: true,
+
+    /**
+     * @property {Object} rootHierarchyState the top level hierarchy state to which
+     * all other hierarchy states are chained.  If there is a viewport instance,
+     * this object becomes the viewport's heirarchyState. See also
+     * {@link Ext.AbstractComponent#getHierarchyState}
+     * @private
+     */
+    rootHierarchyState: {},
+
+    addCacheEntry: function(id, el, dom) {
+        dom = dom || el.dom;
+
+        if (!dom) {
+            // Without the DOM node we can't GC the entry
+            Ext.Error.raise('Cannot add an entry to the element cache without the DOM node');
+        }
+
+        var cache = Ext.cache,
+            key = id || (el && el.id) || dom.id,
+            entry = cache[key] || (cache[key] = {
+                data: {},
+                events: {},
+
+                dom: dom,
+
+                // Skip garbage collection for special elements (window, document, iframes)
+                skipGarbageCollection: !!(dom.getElementById || dom.navigator)
+            });
+
+        if (el) {
+            el.$cache = entry;
+            // Inject the back link from the cache in case the cache entry
+            // had already been created by Ext.fly. Ext.fly creates a cache entry with no el link.
+            entry.el = el;
+        }
+
+        return entry;
+    },
+
+    updateCacheEntry: function(cacheItem, dom){
+        cacheItem.dom = dom;
+        if (cacheItem.el) {
+            cacheItem.el.dom = dom;
+        }
+        return cacheItem;
+    },
+
+    /**
+     * Generates unique ids. If the element already has an id, it is unchanged
+     * @param {HTMLElement/Ext.Element} [el] The element to generate an id for
+     * @param {String} prefix (optional) Id prefix (defaults "ext-gen")
+     * @return {String} The generated Id.
+     */
+    id: function(el, prefix) {
+        var me = this,
+            sandboxPrefix = '';
+        el = Ext.getDom(el, true) || {};
+        if (el === document) {
+            el.id = me.documentId;
+        }
+        else if (el === window) {
+            el.id = me.windowId;
+        }
+        if (!el.id) {
+            if (me.isSandboxed) {
+                sandboxPrefix = Ext.sandboxName.toLowerCase() + '-';
+            }
+            el.id = sandboxPrefix + (prefix || "ext-gen") + (++Ext.idSeed);
+        }
+        return el.id;
+    },
+
+    escapeId: (function(){
+        var validIdRe = /^[a-zA-Z_][a-zA-Z0-9_\-]*$/i,
+            escapeRx = /([\W]{1})/g,
+            leadingNumRx = /^(\d)/g,
+            escapeFn = function(match, capture){
+                return "\\" + capture;
+            },
+            numEscapeFn = function(match, capture){
+                return '\\00' + capture.charCodeAt(0).toString(16) + ' ';
+            };
+
+        return function(id) {
+            return validIdRe.test(id)
+                ? id
+                // replace the number portion last to keep the trailing ' '
+                // from being escaped
+                : id.replace(escapeRx, escapeFn)
+                    .replace(leadingNumRx, numEscapeFn);
+        };
+    }()),
+
+    /**
+     * Returns the current document body as an {@link Ext.Element}.
+     * @return {Ext.Element} The document body
+     */
+    getBody: (function() {
+        var body;
+        return function() {
+            return body || (body = Ext.get(document.body));
+        };
+    }()),
+
+    /**
+     * Returns the current document head as an {@link Ext.Element}.
+     * @return {Ext.Element} The document head
+     * @method
+     */
+    getHead: (function() {
+        var head;
+        return function() {
+            return head || (head = Ext.get(document.getElementsByTagName("head")[0]));
+        };
+    }()),
+
+    /**
+     * Returns the current HTML document object as an {@link Ext.Element}.
+     * @return {Ext.Element} The document
+     */
+    getDoc: (function() {
+        var doc;
+        return function() {
+            return doc || (doc = Ext.get(document));
+        };
+    }()),
+
+    /**
+     * Returns the current orientation of the mobile device
+     * @return {String} Either 'portrait' or 'landscape'
+     */
+    getOrientation: function() {
+        return window.innerHeight > window.innerWidth ? 'portrait' : 'landscape';
+    },
+
+    /**
+     * Attempts to destroy any objects passed to it by removing all event listeners, removing them from the
+     * DOM (if applicable) and calling their destroy functions (if available).  This method is primarily
+     * intended for arguments of type {@link Ext.Element} and {@link Ext.Component}, but any subclass of
+     * {@link Ext.util.Observable} can be passed in.  Any number of elements and/or components can be
+     * passed into this function in a single call as separate arguments.
+     *
+     * @param {Ext.dom.Element/Ext.util.Observable/Ext.dom.Element[]/Ext.util.Observable[]...} args
+     * Any number of elements or components, or an Array of either of these to destroy.
+     */
+    destroy: function() {
+        var ln = arguments.length,
+        i, arg;
+
+        for (i = 0; i < ln; i++) {
+            arg = arguments[i];
+            if (arg) {
+                if (Ext.isArray(arg)) {
+                    this.destroy.apply(this, arg);
+                } else if (arg.isStore) {
+                    arg.destroyStore();
+                } else if (Ext.isFunction(arg.destroy)) {
+                    arg.destroy();
+                } else if (arg.dom) {
+                    arg.remove();
+                }
+            }
+        }
+    },
+
+    /**
+     * Execute a callback function in a particular scope. If `callback` argument is a
+     * function reference, that is called. If it is a string, the string is assumed to
+     * be the name of a method on the given `scope`. If no function is passed the call
+     * is ignored.
+     *
+     * For example, these calls are equivalent:
+     *
+     *      var myFunc = this.myFunc;
+     *
+     *      Ext.callback('myFunc', this, [arg1, arg2]);
+     *      Ext.callback(myFunc, this, [arg1, arg2]);
+     *
+     *      Ext.isFunction(myFunc) && this.myFunc(arg1, arg2);
+     *
+     * @param {Function} callback The callback to execute
+     * @param {Object} [scope] The scope to execute in
+     * @param {Array} [args] The arguments to pass to the function
+     * @param {Number} [delay] Pass a number to delay the call by a number of milliseconds.
+     * @return The value returned by the callback or `undefined` (if there is a `delay`
+     * or if the `callback` is not a function).
+     */
+    callback: function (callback, scope, args, delay) {
+        var fn, ret;
+
+        if (Ext.isFunction(callback)){
+            fn = callback;
+        } else if (scope && Ext.isString(callback)) {
+            fn = scope[callback];
+            if (!fn) {
+                Ext.Error.raise('No method named "' + callback + '"');
+            }
+        }
+
+        if (fn) {
+            args = args || [];
+            scope = scope || window;
+            if (delay) {
+                Ext.defer(fn, delay, scope, args);
+            } else {
+                ret = fn.apply(scope, args);
+            }
+        }
+
+        return ret;
+    },
+    
+    /**
+     * @private
+     */
+    resolveMethod: function(fn, scope) {
+        if (Ext.isFunction(fn)) {
+            return fn;
+        }
+        
+        if (!Ext.isObject(scope) || !Ext.isFunction(scope[fn])) {
+            Ext.Error.raise('No method named "' + fn + '"');
+        }
+        
+        return scope[fn];
+    },
+
+    /**
+     * Alias for {@link Ext.String#htmlEncode}.
+     * @inheritdoc Ext.String#htmlEncode
+     * @ignore
+     */
+    htmlEncode : function(value) {
+        return Ext.String.htmlEncode(value);
+    },
+
+    /**
+     * Alias for {@link Ext.String#htmlDecode}.
+     * @inheritdoc Ext.String#htmlDecode
+     * @ignore
+     */
+    htmlDecode : function(value) {
+         return Ext.String.htmlDecode(value);
+    },
+
+    /**
+     * Alias for {@link Ext.String#urlAppend}.
+     * @inheritdoc Ext.String#urlAppend
+     * @ignore
+     */
+    urlAppend : function(url, s) {
+        return Ext.String.urlAppend(url, s);
+    }
+});
+
+
+Ext.ns = Ext.namespace;
+
+// for old browsers
+window.undefined = window.undefined;
+
+/**
+ * @class Ext
+ */
+(function(){
+/*
+FF 3.6      - Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.17) Gecko/20110420 Firefox/3.6.17
+FF 4.0.1    - Mozilla/5.0 (Windows NT 5.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1
+FF 5.0      - Mozilla/5.0 (Windows NT 6.1; WOW64; rv:5.0) Gecko/20100101 Firefox/5.0
+
+IE6         - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1;)
+IE7         - Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; SV1;)
+IE8         - Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)
+IE9         - Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E)]
+IE10        - Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E; MS-RTC LM 8)
+
+Chrome 11   - Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.60 Safari/534.24
+
+Safari 5    - Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1
+
+Opera 11.11 - Opera/9.80 (Windows NT 6.1; U; en) Presto/2.8.131 Version/11.11
+*/
+    var check = function(regex){
+            return regex.test(Ext.userAgent);
+        },
+        isStrict = document.compatMode == "CSS1Compat",
+        version = function (is, regex) {
+            var m;
+            return (is && (m = regex.exec(Ext.userAgent))) ? parseFloat(m[1]) : 0;
+        },
+        docMode = document.documentMode,
+        isOpera = check(/opera/),
+        isOpera10_5 = isOpera && check(/version\/10\.5/),
+        isChrome = check(/\bchrome\b/),
+        isWebKit = check(/webkit/),
+        isSafari = !isChrome && check(/safari/),
+        isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2
+        isSafari3 = isSafari && check(/version\/3/),
+        isSafari4 = isSafari && check(/version\/4/),
+        isSafari5_0 = isSafari && check(/version\/5\.0/),
+        isSafari5 = isSafari && check(/version\/5/),
+        isIE = !isOpera && check(/msie/),
+        isIE7 = isIE && ((check(/msie 7/) && docMode != 8 && docMode != 9 && docMode != 10) || docMode == 7),
+        isIE8 = isIE && ((check(/msie 8/) && docMode != 7 && docMode != 9 && docMode != 10) || docMode == 8),
+        isIE9 = isIE && ((check(/msie 9/) && docMode != 7 && docMode != 8 && docMode != 10) || docMode == 9),
+        isIE10 = isIE && ((check(/msie 10/) && docMode != 7 && docMode != 8 && docMode != 9) || docMode == 10),
+        isIE6 = isIE && check(/msie 6/),
+        isGecko = !isWebKit && check(/gecko/),
+        isGecko3 = isGecko && check(/rv:1\.9/),
+        isGecko4 = isGecko && check(/rv:2\.0/),
+        isGecko5 = isGecko && check(/rv:5\./),
+        isGecko10 = isGecko && check(/rv:10\./),
+        isFF3_0 = isGecko3 && check(/rv:1\.9\.0/),
+        isFF3_5 = isGecko3 && check(/rv:1\.9\.1/),
+        isFF3_6 = isGecko3 && check(/rv:1\.9\.2/),
+        isWindows = check(/windows|win32/),
+        isMac = check(/macintosh|mac os x/),
+        isLinux = check(/linux/),
+        scrollbarSize = null,
+        chromeVersion = version(true, /\bchrome\/(\d+\.\d+)/),
+        firefoxVersion = version(true, /\bfirefox\/(\d+\.\d+)/),
+        ieVersion = version(isIE, /msie (\d+\.\d+)/),
+        operaVersion = version(isOpera, /version\/(\d+\.\d+)/),
+        safariVersion = version(isSafari, /version\/(\d+\.\d+)/),
+        webKitVersion = version(isWebKit, /webkit\/(\d+\.\d+)/),
+        isSecure = /^https/i.test(window.location.protocol),
+        nullLog;
+
+    // remove css image flicker
+    try {
+        document.execCommand("BackgroundImageCache", false, true);
+    } catch(e) {}
+
+
+    var primitiveRe = /string|number|boolean/;
+    function dumpObject (object) {
+        var member, type, value, name,
+            members = [];
+
+        // Cannot use Ext.encode since it can recurse endlessly (if we're lucky)
+        // ...and the data could be prettier!
+        for (name in object) {
+            if (object.hasOwnProperty(name)) {
+                value = object[name];
+
+                type = typeof value;
+                if (type == "function") {
+                    continue;
+                }
+
+                if (type == 'undefined') {
+                    member = type;
+                } else if (value === null || primitiveRe.test(type) || Ext.isDate(value)) {
+                    member = Ext.encode(value);
+                } else if (Ext.isArray(value)) {
+                    member = '[ ]';
+                } else if (Ext.isObject(value)) {
+                    member = '{ }';
+                } else {
+                    member = type;
+                }
+                members.push(Ext.encode(name) + ': ' + member);
+            }
+        }
+
+        if (members.length) {
+            return ' \nData: {\n  ' + members.join(',\n  ') + '\n}';
+        }
+        return '';
+    }
+
+    function log (message) {
+        var options, dump,
+            con = Ext.global.console,
+            level = 'log',
+            indent = log.indent || 0,
+            stack,
+            out,
+            max;
+
+        log.indent = indent;
+
+        if (typeof message != 'string') {
+            options = message;
+            message = options.msg || '';
+            level = options.level || level;
+            dump = options.dump;
+            stack = options.stack;
+
+            if (options.indent) {
+                ++log.indent;
+            } else if (options.outdent) {
+                log.indent = indent = Math.max(indent - 1, 0);
+            }
+
+            if (dump && !(con && con.dir)) {
+                message += dumpObject(dump);
+                dump = null;
+            }
+        }
+
+        if (arguments.length > 1) {
+            message += Array.prototype.slice.call(arguments, 1).join('');
+        }
+
+        message = indent ? Ext.String.repeat(' ', log.indentSize * indent) + message : message;
+        // w/o console, all messages are equal, so munge the level into the message:
+        if (level != 'log') {
+            message = '[' + level.charAt(0).toUpperCase() + '] ' + message;
+        }
+
+        // Not obvious, but 'console' comes and goes when Firebug is turned on/off, so
+        // an early test may fail either direction if Firebug is toggled.
+        //
+        if (con) { // if (Firebug-like console)
+            if (con[level]) {
+                con[level](message);
+            } else {
+                con.log(message);
+            }
+
+            if (dump) {
+                con.dir(dump);
+            }
+
+            if (stack && con.trace) {
+                // Firebug's console.error() includes a trace already...
+                if (!con.firebug || level != 'error') {
+                    con.trace();
+                }
+            }
+        } else {
+            if (Ext.isOpera) {
+                opera.postError(message);
+            } else {
+                out = log.out;
+                max = log.max;
+
+                if (out.length >= max) {
+                    // this formula allows out.max to change (via debugger), where the
+                    // more obvious "max/4" would not quite be the same
+                    Ext.Array.erase(out, 0, out.length - 3 * Math.floor(max / 4)); // keep newest 75%
+                }
+
+                out.push(message);
+            }
+        }
+
+        // Mostly informational, but the Ext.Error notifier uses them:
+        ++log.count;
+        ++log.counters[level];
+    }
+
+    function logx (level, args) {
+        if (typeof args[0] == 'string') {
+            args.unshift({});
+        }
+        args[0].level = level;
+        log.apply(this, args);
+    }
+
+    log.error = function () {
+        logx('error', Array.prototype.slice.call(arguments));
+    };
+    log.info = function () {
+        logx('info', Array.prototype.slice.call(arguments));
+    };
+    log.warn = function () {
+        logx('warn', Array.prototype.slice.call(arguments));
+    };
+
+    log.count = 0;
+    log.counters = { error: 0, warn: 0, info: 0, log: 0 };
+    log.indentSize = 2;
+    log.out = [];
+    log.max = 750;
+    log.show = function () {
+        window.open('','extlog').document.write([
+            '<html><head><script type="text/javascript">',
+                'var lastCount = 0;',
+                'function update () {',
+                    'var ext = window.opener.Ext,',
+                        'extlog = ext && ext.log;',
+                    'if (extlog && extlog.out && lastCount != extlog.count) {',
+                        'lastCount = extlog.count;',
+                        'var s = "<tt>" + extlog.out.join("~~~").replace(/[&]/g, "&").replace(/[<]/g, "<").replace(/[ ]/g, " ").replace(/\\~\\~\\~/g, "<br/>") + "</tt>";',
+                        'document.body.innerHTML = s;',
+                    '}',
+                    'setTimeout(update, 1000);',
+                '}',
+                'setTimeout(update, 1000);',
+            '</script></head><body></body></html>'].join(''));
+    };
+
+    nullLog = function () {};
+    nullLog.info = nullLog.warn = nullLog.error = Ext.emptyFn;
+
+    // also update Version.js
+    Ext.setVersion('extjs', '4.2.1.883');
+    Ext.apply(Ext, {
+        /**
+         * @property {String} SSL_SECURE_URL
+         * URL to a blank file used by Ext when in secure mode for iframe src and onReady src
+         * to prevent the IE insecure content warning (`'about:blank'`, except for IE
+         * in secure mode, which is `'javascript:""'`).
+         */
+        SSL_SECURE_URL : isSecure && isIE ? 'javascript:\'\'' : 'about:blank',
+
+        /**
+         * @property {Boolean} enableFx
+         * True if the {@link Ext.fx.Anim} Class is available.
+         */
+
+        plainTableCls: Ext.buildSettings.baseCSSPrefix + 'table-plain', 
+
+        plainListCls: Ext.buildSettings.baseCSSPrefix + 'list-plain', 
+
+        /**
+         * @property {Boolean} enableNestedListenerRemoval
+         * **Experimental.** True to cascade listener removal to child elements when an element
+         * is removed. Currently not optimized for performance.
+         */
+        enableNestedListenerRemoval : false,
+
+        /**
+         * @property {Boolean} USE_NATIVE_JSON
+         * Indicates whether to use native browser parsing for JSON methods.
+         * This option is ignored if the browser does not support native JSON methods.
+         *
+         * **Note:** Native JSON methods will not work with objects that have functions.
+         * Also, property names must be quoted, otherwise the data will not parse.
+         */
+        USE_NATIVE_JSON : false,
+
+        /**
+         * Returns the dom node for the passed String (id), dom node, or Ext.Element.
+         * Optional 'strict' flag is needed for IE since it can return 'name' and
+         * 'id' elements by using getElementById.
+         *
+         * Here are some examples:
+         *
+         *     // gets dom node based on id
+         *     var elDom = Ext.getDom('elId');
+         *     // gets dom node based on the dom node
+         *     var elDom1 = Ext.getDom(elDom);
+         *
+         *     // If we don't know if we are working with an
+         *     // Ext.Element or a dom node use Ext.getDom
+         *     function(el){
+         *         var dom = Ext.getDom(el);
+         *         // do something with the dom node
+         *     }
+         *
+         * **Note:** the dom node to be found actually needs to exist (be rendered, etc)
+         * when this method is called to be successful.
+         *
+         * @param {String/HTMLElement/Ext.Element} el
+         * @return HTMLElement
+         */
+        getDom : function(el, strict) {
+            if (!el || !document) {
+                return null;
+            }
+            if (el.dom) {
+                return el.dom;
+            } else {
+                if (typeof el == 'string') {
+                    var e = Ext.getElementById(el);
+                    // IE returns elements with the 'name' and 'id' attribute.
+                    // we do a strict check to return the element with only the id attribute
+                    if (e && isIE && strict) {
+                        if (el == e.getAttribute('id')) {
+                            return e;
+                        } else {
+                            return null;
+                        }
+                    }
+                    return e;
+                } else {
+                    return el;
+                }
+            }
+        },
+
+        /**
+         * Removes a DOM node from the document.
+         *
+         * Removes this element from the document, removes all DOM event listeners, and
+         * deletes the cache reference. All DOM event listeners are removed from this element.
+         * If {@link Ext#enableNestedListenerRemoval Ext.enableNestedListenerRemoval} is
+         * `true`, then DOM event listeners are also removed from all child nodes.
+         * The body node will be ignored if passed in.
+         *
+         * @param {HTMLElement} node The node to remove
+         * @method
+         */
+        removeNode : isIE6 || isIE7 || isIE8
+            ? (function() {
+                var d;
+                return function(n){
+                    if(n && n.tagName.toUpperCase() != 'BODY'){
+                        (Ext.enableNestedListenerRemoval) ? Ext.EventManager.purgeElement(n) : Ext.EventManager.removeAll(n);
+
+                        var cache = Ext.cache,
+                            id = n.id;
+
+                        if (cache[id]) {
+                            delete cache[id].dom;
+                            delete cache[id];
+                        }
+
+                        if (isIE8 && n.parentNode) {
+                            n.parentNode.removeChild(n);
+                        }
+                        d = d || document.createElement('div');
+                        d.appendChild(n);
+                        d.innerHTML = '';
+                    }
+                };
+            }())
+            : function(n) {
+                if (n && n.parentNode && n.tagName.toUpperCase() != 'BODY') {
+                    (Ext.enableNestedListenerRemoval) ? Ext.EventManager.purgeElement(n) : Ext.EventManager.removeAll(n);
+
+                    var cache = Ext.cache,
+                        id = n.id;
+
+                    if (cache[id]) {
+                        delete cache[id].dom;
+                        delete cache[id];
+                    }
+
+                    n.parentNode.removeChild(n);
+                }
+            },
+
+        isStrict: isStrict,
+
+        // IE10 quirks behaves like Gecko/WebKit quirks, so don't include it here
+        isIEQuirks: isIE && (!isStrict && (isIE6 || isIE7 || isIE8 || isIE9)),
+
+        /**
+         * True if the detected browser is Opera.
+         * @type Boolean
+         */
+        isOpera : isOpera,
+
+        /**
+         * True if the detected browser is Opera 10.5x.
+         * @type Boolean
+         */
+        isOpera10_5 : isOpera10_5,
+
+        /**
+         * True if the detected browser uses WebKit.
+         * @type Boolean
+         */
+        isWebKit : isWebKit,
+
+        /**
+         * True if the detected browser is Chrome.
+         * @type Boolean
+         */
+        isChrome : isChrome,
+
+        /**
+         * True if the detected browser is Safari.
+         * @type Boolean
+         */
+        isSafari : isSafari,
+
+        /**
+         * True if the detected browser is Safari 3.x.
+         * @type Boolean
+         */
+        isSafari3 : isSafari3,
+
+        /**
+         * True if the detected browser is Safari 4.x.
+         * @type Boolean
+         */
+        isSafari4 : isSafari4,
+
+        /**
+         * True if the detected browser is Safari 5.x.
+         * @type Boolean
+         */
+        isSafari5 : isSafari5,
+
+        /**
+         * True if the detected browser is Safari 5.0.x.
+         * @type Boolean
+         */
+        isSafari5_0 : isSafari5_0,
+
+
+        /**
+         * True if the detected browser is Safari 2.x.
+         * @type Boolean
+         */
+        isSafari2 : isSafari2,
+
+        /**
+         * True if the detected browser is Internet Explorer.
+         * @type Boolean
+         */
+        isIE : isIE,
+
+        /**
+         * True if the detected browser is Internet Explorer 6.x.
+         * @type Boolean
+         */
+        isIE6 : isIE6,
+
+        /**
+         * True if the detected browser is Internet Explorer 7.x.
+         * @type Boolean
+         */
+        isIE7 : isIE7,
+
+        /**
+         * True if the detected browser is Internet Explorer 7.x or lower.
+         * @type Boolean
+         */
+        isIE7m : isIE6 || isIE7,
+
+        /**
+         * True if the detected browser is Internet Explorer 7.x or higher.
+         * @type Boolean
+         */
+        isIE7p : isIE && !isIE6,
+
+        /**
+         * True if the detected browser is Internet Explorer 8.x.
+         * @type Boolean
+         */
+        isIE8 : isIE8,
+
+        /**
+         * True if the detected browser is Internet Explorer 8.x or lower.
+         * @type Boolean
+         */
+        isIE8m : isIE6 || isIE7 || isIE8,
+
+        /**
+         * True if the detected browser is Internet Explorer 8.x or higher.
+         * @type Boolean
+         */
+        isIE8p : isIE && !(isIE6 || isIE7),
+
+        /**
+         * True if the detected browser is Internet Explorer 9.x.
+         * @type Boolean
+         */
+        isIE9 : isIE9,
+
+        /**
+         * True if the detected browser is Internet Explorer 9.x or lower.
+         * @type Boolean
+         */
+        isIE9m : isIE6 || isIE7 || isIE8 || isIE9,
+
+        /**
+         * True if the detected browser is Internet Explorer 9.x or higher.
+         * @type Boolean
+         */
+        isIE9p : isIE && !(isIE6 || isIE7 || isIE8),
+        
+        /**  
+         * True if the detected browser is Internet Explorer 10.x.
+         * @type Boolean
+         */
+        isIE10 : isIE10, 
+ 
+        /**
+         * True if the detected browser is Internet Explorer 10.x or lower.
+         * @type Boolean
+         */
+        isIE10m : isIE6 || isIE7 || isIE8 || isIE9 || isIE10,
+ 
+        /**
+         * True if the detected browser is Internet Explorer 10.x or higher.
+         * @type Boolean
+         */
+        isIE10p : isIE && !(isIE6 || isIE7 || isIE8 || isIE9),
+
+        /**
+         * True if the detected browser uses the Gecko layout engine (e.g. Mozilla, Firefox).
+         * @type Boolean
+         */
+        isGecko : isGecko,
+
+        /**
+         * True if the detected browser uses a Gecko 1.9+ layout engine (e.g. Firefox 3.x).
+         * @type Boolean
+         */
+        isGecko3 : isGecko3,
+
+        /**
+         * True if the detected browser uses a Gecko 2.0+ layout engine (e.g. Firefox 4.x).
+         * @type Boolean
+         */
+        isGecko4 : isGecko4,
+
+        /**
+         * True if the detected browser uses a Gecko 5.0+ layout engine (e.g. Firefox 5.x).
+         * @type Boolean
+         */
+        isGecko5 : isGecko5,
+
+        /**
+         * True if the detected browser uses a Gecko 5.0+ layout engine (e.g. Firefox 5.x).
+         * @type Boolean
+         */
+        isGecko10 : isGecko10,
+
+        /**
+         * True if the detected browser uses FireFox 3.0
+         * @type Boolean
+         */
+        isFF3_0 : isFF3_0,
+
+        /**
+         * True if the detected browser uses FireFox 3.5
+         * @type Boolean
+         */
+        isFF3_5 : isFF3_5,
+
+        /**
+         * True if the detected browser uses FireFox 3.6
+         * @type Boolean
+         */
+        isFF3_6 : isFF3_6,
+
+        /**
+         * True if the detected browser uses FireFox 4
+         * @type Boolean
+         */
+        isFF4 : 4 <= firefoxVersion && firefoxVersion < 5,
+
+        /**
+         * True if the detected browser uses FireFox 5
+         * @type Boolean
+         */
+        isFF5 : 5 <= firefoxVersion && firefoxVersion < 6,
+
+        /**
+         * True if the detected browser uses FireFox 10
+         * @type Boolean
+         */
+        isFF10 : 10 <= firefoxVersion && firefoxVersion < 11,
+
+        /**
+         * True if the detected platform is Linux.
+         * @type Boolean
+         */
+        isLinux : isLinux,
+
+        /**
+         * True if the detected platform is Windows.
+         * @type Boolean
+         */
+        isWindows : isWindows,
+
+        /**
+         * True if the detected platform is Mac OS.
+         * @type Boolean
+         */
+        isMac : isMac,
+
+        /**
+         * The current version of Chrome (0 if the browser is not Chrome).
+         * @type Number
+         */
+        chromeVersion: chromeVersion,
+
+        /**
+         * The current version of Firefox (0 if the browser is not Firefox).
+         * @type Number
+         */
+        firefoxVersion: firefoxVersion,
+
+        /**
+         * The current version of IE (0 if the browser is not IE). This does not account
+         * for the documentMode of the current page, which is factored into {@link #isIE7},
+         * {@link #isIE8} and {@link #isIE9}. Thus this is not always true:
+         *
+         *     Ext.isIE8 == (Ext.ieVersion == 8)
+         *
+         * @type Number
+         */
+        ieVersion: ieVersion,
+
+        /**
+         * The current version of Opera (0 if the browser is not Opera).
+         * @type Number
+         */
+        operaVersion: operaVersion,
+
+        /**
+         * The current version of Safari (0 if the browser is not Safari).
+         * @type Number
+         */
+        safariVersion: safariVersion,
+
+        /**
+         * The current version of WebKit (0 if the browser does not use WebKit).
+         * @type Number
+         */
+        webKitVersion: webKitVersion,
+
+        /**
+         * True if the page is running over SSL
+         * @type Boolean
+         */
+        isSecure: isSecure,
+
+        /**
+         * URL to a 1x1 transparent gif image used by Ext to create inline icons with
+         * CSS background images. In older versions of IE, this defaults to
+         * "http://sencha.com/s.gif" and you should change this to a URL on your server.
+         * For other browsers it uses an inline data URL.
+         * @type String
+         */
+        BLANK_IMAGE_URL : (isIE6 || isIE7) ? '/' + '/www.sencha.com/s.gif' : 'data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==',
+
+        /**
+         * Utility method for returning a default value if the passed value is empty.
+         *
+         * The value is deemed to be empty if it is:
+         *
+         * - null
+         * - undefined
+         * - an empty array
+         * - a zero length string (Unless the `allowBlank` parameter is `true`)
+         *
+         * @param {Object} value The value to test
+         * @param {Object} defaultValue The value to return if the original value is empty
+         * @param {Boolean} [allowBlank=false] true to allow zero length strings to qualify as non-empty.
+         * @return {Object} value, if non-empty, else defaultValue
+         * @deprecated 4.0.0 Use {@link Ext#valueFrom} instead
+         */
+        value : function(v, defaultValue, allowBlank){
+            return Ext.isEmpty(v, allowBlank) ? defaultValue : v;
+        },
+
+        /**
+         * Escapes the passed string for use in a regular expression.
+         * @param {String} str
+         * @return {String}
+         * @deprecated 4.0.0 Use {@link Ext.String#escapeRegex} instead
+         */
+        escapeRe : function(s) {
+            return s.replace(/([-.*+?\^${}()|\[\]\/\\])/g, "\\$1");
+        },
+
+        /**
+         * Applies event listeners to elements by selectors when the document is ready.
+         * The event name is specified with an `@` suffix.
+         *
+         *     Ext.addBehaviors({
+         *         // add a listener for click on all anchors in element with id foo
+         *         '#foo a at click' : function(e, t){
+         *             // do something
+         *         },
+         *
+         *         // add the same listener to multiple selectors (separated by comma BEFORE the @)
+         *         '#foo a, #bar span.some-class at mouseover' : function(){
+         *             // do something
+         *         }
+         *     });
+         *
+         * @param {Object} obj The list of behaviors to apply
+         */
+        addBehaviors : function(o){
+            if(!Ext.isReady){
+                Ext.onReady(function(){
+                    Ext.addBehaviors(o);
+                });
+            } else {
+                var cache = {}, // simple cache for applying multiple behaviors to same selector does query multiple times
+                    parts,
+                    b,
+                    s;
+                for (b in o) {
+                    if ((parts = b.split('@'))[1]) { // for Object prototype breakers
+                        s = parts[0];
+                        if(!cache[s]){
+                            cache[s] = Ext.select(s);
+                        }
+                        cache[s].on(parts[1], o[b]);
+                    }
+                }
+                cache = null;
+            }
+        },
+
+        /**
+         * Returns the size of the browser scrollbars. This can differ depending on
+         * operating system settings, such as the theme or font size.
+         * @param {Boolean} [force] true to force a recalculation of the value.
+         * @return {Object} An object containing scrollbar sizes.
+         * @return {Number} return.width The width of the vertical scrollbar.
+         * @return {Number} return.height The height of the horizontal scrollbar.
+         */
+        getScrollbarSize: function (force) {
+            if (!Ext.isReady) {
+                return {};
+            }
+
+            if (force || !scrollbarSize) {
+                var db = document.body,
+                    div = document.createElement('div');
+
+                div.style.width = div.style.height = '100px';
+                div.style.overflow = 'scroll';
+                div.style.position = 'absolute';
+
+                db.appendChild(div); // now we can measure the div...
+
+                // at least in iE9 the div is not 100px - the scrollbar size is removed!
+                scrollbarSize = {
+                    width: div.offsetWidth - div.clientWidth,
+                    height: div.offsetHeight - div.clientHeight
+                };
+
+                db.removeChild(div);
+            }
+
+            return scrollbarSize;
+        },
+
+        /**
+         * Utility method for getting the width of the browser's vertical scrollbar. This
+         * can differ depending on operating system settings, such as the theme or font size.
+         *
+         * This method is deprected in favor of {@link #getScrollbarSize}.
+         *
+         * @param {Boolean} [force] true to force a recalculation of the value.
+         * @return {Number} The width of a vertical scrollbar.
+         * @deprecated
+         */
+        getScrollBarWidth: function(force){
+            var size = Ext.getScrollbarSize(force);
+            return size.width + 2; // legacy fudge factor
+        },
+
+        /**
+         * Copies a set of named properties fom the source object to the destination object.
+         *
+         * Example:
+         *
+         *     ImageComponent = Ext.extend(Ext.Component, {
+         *         initComponent: function() {
+         *             this.autoEl = { tag: 'img' };
+         *             MyComponent.superclass.initComponent.apply(this, arguments);
+         *             this.initialBox = Ext.copyTo({}, this.initialConfig, 'x,y,width,height');
+         *         }
+         *     });
+         *
+         * Important note: To borrow class prototype methods, use {@link Ext.Base#borrow} instead.
+         *
+         * @param {Object} dest The destination object.
+         * @param {Object} source The source object.
+         * @param {String/String[]} names Either an Array of property names, or a comma-delimited list
+         * of property names to copy.
+         * @param {Boolean} [usePrototypeKeys] Defaults to false. Pass true to copy keys off of the
+         * prototype as well as the instance.
+         * @return {Object} The modified object.
+         */
+        copyTo : function(dest, source, names, usePrototypeKeys){
+            if(typeof names == 'string'){
+                names = names.split(/[,;\s]/);
+            }
+
+            var n,
+                nLen = names? names.length : 0,
+                name;
+
+            for(n = 0; n < nLen; n++) {
+                name = names[n];
+
+                if(usePrototypeKeys || source.hasOwnProperty(name)){
+                    dest[name] = source[name];
+                }
+            }
+
+            return dest;
+        },
+
+        /**
+         * Attempts to destroy and then remove a set of named properties of the passed object.
+         * @param {Object} o The object (most likely a Component) who's properties you wish to destroy.
+         * @param {String...} args One or more names of the properties to destroy and remove from the object.
+         */
+        destroyMembers : function(o){
+            for (var i = 1, a = arguments, len = a.length; i < len; i++) {
+                Ext.destroy(o[a[i]]);
+                delete o[a[i]];
+            }
+        },
+
+        /**
+         * Logs a message. If a console is present it will be used. On Opera, the method
+         * "opera.postError" is called. In other cases, the message is logged to an array
+         * "Ext.log.out". An attached debugger can watch this array and view the log. The
+         * log buffer is limited to a maximum of "Ext.log.max" entries (defaults to 250).
+         * The `Ext.log.out` array can also be written to a popup window by entering the
+         * following in the URL bar (a "bookmarklet"):
+         *
+         *     javascript:void(Ext.log.show());
+         *
+         * If additional parameters are passed, they are joined and appended to the message.
+         * A technique for tracing entry and exit of a function is this:
+         *
+         *     function foo () {
+         *         Ext.log({ indent: 1 }, '>> foo');
+         *
+         *         // log statements in here or methods called from here will be indented
+         *         // by one step
+         *
+         *         Ext.log({ outdent: 1 }, '<< foo');
+         *     }
+         *
+         * This method does nothing in a release build.
+         *
+         * @param {String/Object} [options] The message to log or an options object with any
+         * of the following properties:
+         *
+         *  - `msg`: The message to log (required).
+         *  - `level`: One of: "error", "warn", "info" or "log" (the default is "log").
+         *  - `dump`: An object to dump to the log as part of the message.
+         *  - `stack`: True to include a stack trace in the log.
+         *  - `indent`: Cause subsequent log statements to be indented one step.
+         *  - `outdent`: Cause this and following statements to be one step less indented.
+         *
+         * @param {String...} [message] The message to log (required unless specified in
+         * options object).
+         *
+         * @method
+         */
+        log :
+            log ||
+            nullLog,
+
+        /**
+         * Partitions the set into two sets: a true set and a false set.
+         *
+         * Example 1:
+         *
+         *     Ext.partition([true, false, true, true, false]);
+         *     // returns [[true, true, true], [false, false]]
+         *
+         * Example 2:
+         *
+         *     Ext.partition(
+         *         Ext.query("p"),
+         *         function(val){
+         *             return val.className == "class1"
+         *         }
+         *     );
+         *     // true are those paragraph elements with a className of "class1",
+         *     // false set are those that do not have that className.
+         *
+         * @param {Array/NodeList} arr The array to partition
+         * @param {Function} truth (optional) a function to determine truth.
+         * If this is omitted the element itself must be able to be evaluated for its truthfulness.
+         * @return {Array} [array of truish values, array of falsy values]
+         * @deprecated 4.0.0 Will be removed in the next major version
+         */
+        partition : function(arr, truth){
+            var ret = [[],[]],
+                a, v,
+                aLen = arr.length;
+
+            for (a = 0; a < aLen; a++) {
+                v = arr[a];
+                ret[ (truth && truth(v, a, arr)) || (!truth && v) ? 0 : 1].push(v);
+            }
+
+            return ret;
+        },
+
+        /**
+         * Invokes a method on each item in an Array.
+         *
+         * Example:
+         *
+         *     Ext.invoke(Ext.query("p"), "getAttribute", "id");
+         *     // [el1.getAttribute("id"), el2.getAttribute("id"), ..., elN.getAttribute("id")]
+         *
+         * @param {Array/NodeList} arr The Array of items to invoke the method on.
+         * @param {String} methodName The method name to invoke.
+         * @param {Object...} args Arguments to send into the method invocation.
+         * @return {Array} The results of invoking the method on each item in the array.
+         * @deprecated 4.0.0 Will be removed in the next major version
+         */
+        invoke : function(arr, methodName){
+            var ret  = [],
+                args = Array.prototype.slice.call(arguments, 2),
+                a, v,
+                aLen = arr.length;
+
+            for (a = 0; a < aLen; a++) {
+                v = arr[a];
+
+                if (v && typeof v[methodName] == 'function') {
+                    ret.push(v[methodName].apply(v, args));
+                } else {
+                    ret.push(undefined);
+                }
+            }
+
+            return ret;
+        },
+
+        /**
+         * Zips N sets together.
+         *
+         * Example 1:
+         *
+         *     Ext.zip([1,2,3],[4,5,6]); // [[1,4],[2,5],[3,6]]
+         *
+         * Example 2:
+         *
+         *     Ext.zip(
+         *         [ "+", "-", "+"],
+         *         [  12,  10,  22],
+         *         [  43,  15,  96],
+         *         function(a, b, c){
+         *             return "$" + a + "" + b + "." + c
+         *         }
+         *     ); // ["$+12.43", "$-10.15", "$+22.96"]
+         *
+         * @param {Array/NodeList...} arr This argument may be repeated. Array(s)
+         * to contribute values.
+         * @param {Function} zipper (optional) The last item in the argument list.
+         * This will drive how the items are zipped together.
+         * @return {Array} The zipped set.
+         * @deprecated 4.0.0 Will be removed in the next major version
+         */
+        zip : function(){
+            var parts = Ext.partition(arguments, function( val ){ return typeof val != 'function'; }),
+                arrs = parts[0],
+                fn = parts[1][0],
+                len = Ext.max(Ext.pluck(arrs, "length")),
+                ret = [],
+                i,
+                j,
+                aLen;
+
+            for (i = 0; i < len; i++) {
+                ret[i] = [];
+                if(fn){
+                    ret[i] = fn.apply(fn, Ext.pluck(arrs, i));
+                }else{
+                    for (j = 0, aLen = arrs.length; j < aLen; j++){
+                        ret[i].push( arrs[j][i] );
+                    }
+                }
+            }
+            return ret;
+        },
+
+        /**
+         * Turns an array into a sentence, joined by a specified connector - e.g.:
+         *
+         *     Ext.toSentence(['Adama', 'Tigh', 'Roslin']); //'Adama, Tigh and Roslin'
+         *     Ext.toSentence(['Adama', 'Tigh', 'Roslin'], 'or'); //'Adama, Tigh or Roslin'
+         *
+         * @param {String[]} items The array to create a sentence from
+         * @param {String} connector The string to use to connect the last two words.
+         * Usually 'and' or 'or' - defaults to 'and'.
+         * @return {String} The sentence string
+         * @deprecated 4.0.0 Will be removed in the next major version
+         */
+        toSentence: function(items, connector) {
+            var length = items.length,
+                head,
+                tail;
+
+            if (length <= 1) {
+                return items[0];
+            } else {
+                head = items.slice(0, length - 1);
+                tail = items[length - 1];
+
+                return Ext.util.Format.format("{0} {1} {2}", head.join(", "), connector || 'and', tail);
+            }
+        },
+
+        /**
+         * Sets the default font-family to use for components that support a `glyph` config.
+         * @param {String} fontFamily The name of the font-family
+         */
+        setGlyphFontFamily: function(fontFamily) {
+            Ext._glyphFontFamily = fontFamily;
+        },
+
+        /**
+         * @property {Boolean} useShims
+         * By default, Ext intelligently decides whether floating elements should be shimmed.
+         * If you are using flash, you may want to set this to true.
+         */
+        useShims: isIE6
+    });
+}());
+
+/**
+ * Loads Ext.app.Application class and starts it up with given configuration after the
+ * page is ready.
+ *
+ * See `Ext.app.Application` for details.
+ *
+ * @param {Object/String} config Application config object or name of a class derived from Ext.app.Application.
+ */
+Ext.application = function(config) {
+    var App, paths, ns;
+    
+    if (typeof config === "string") {
+        Ext.require(config, function(){
+            App = Ext.ClassManager.get(config);
+        });
+    }
+    else {
+        // We have to process `paths` before creating Application class,
+        // or `requires` won't work.
+        Ext.Loader.setPath(config.name, config.appFolder || 'app');
+        
+        if (paths = config.paths) {
+            for (ns in paths) {
+                if (paths.hasOwnProperty(ns)) {
+                    Ext.Loader.setPath(ns, paths[ns]);
+                }
+            }
+        }
+        
+        config['paths processed'] = true;
+        
+        // Let Ext.define do the hard work but don't assign a class name.
+        //
+        Ext.define(config.name + ".$application", Ext.apply({
+                extend: 'Ext.app.Application' // can be replaced by config!
+            }, config),
+            // call here when the App class gets full defined
+            function () {
+                App = this;
+            });
+    }
+
+    Ext.onReady(function() {
+        // this won't be called until App has been created and its requires have been
+        // met...
+        Ext.app.Application.instance = new App();
+    });
+};
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require ../Ext-more.js
+// @define Ext.util.Format
+
+/**
+ * @class Ext.util.Format
+ *  
+ * This class is a centralized place for formatting functions. It includes
+ * functions to format various different types of data, such as text, dates and numeric values.
+ *  
+ * ## Localization
+ *
+ * This class contains several options for localization. These can be set once the library has loaded,
+ * all calls to the functions from that point will use the locale settings that were specified.
+ *
+ * Options include:
+ *
+ * - thousandSeparator
+ * - decimalSeparator
+ * - currenyPrecision
+ * - currencySign
+ * - currencyAtEnd
+ *
+ * This class also uses the default date format defined here: {@link Ext.Date#defaultFormat}.
+ *
+ * ## Using with renderers
+ *
+ * There are two helper functions that return a new function that can be used in conjunction with
+ * grid renderers:
+ *  
+ *     columns: [{
+ *         dataIndex: 'date',
+ *         renderer: Ext.util.Format.dateRenderer('Y-m-d')
+ *     }, {
+ *         dataIndex: 'time',
+ *         renderer: Ext.util.Format.numberRenderer('0.000')
+ *     }]
+ *  
+ * Functions that only take a single argument can also be passed directly:
+ *
+ *     columns: [{
+ *         dataIndex: 'cost',
+ *         renderer: Ext.util.Format.usMoney
+ *     }, {
+ *         dataIndex: 'productCode',
+ *         renderer: Ext.util.Format.uppercase
+ *     }]
+ *  
+ * ## Using with XTemplates
+ *
+ * XTemplates can also directly use Ext.util.Format functions:
+ *  
+ *     new Ext.XTemplate([
+ *         'Date: {startDate:date("Y-m-d")}',
+ *         'Cost: {cost:usMoney}'
+ *     ]);
+ *
+ * @singleton
+ */
+(function() {
+    Ext.ns('Ext.util');
+
+    var UtilFormat     = Ext.util.Format = {},
+        stripTagsRE    = /<\/?[^>]+>/gi,
+        stripScriptsRe = /(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)/ig,
+        nl2brRe        = /\r?\n/g,
+        allHashes      = /^#+$/,
+
+        // Match a format string characters to be able to detect remaining "literal" characters
+        formatPattern = /[\d,\.#]+/,
+
+        // A RegExp to remove from a number format string, all characters except digits and '.'
+        formatCleanRe  = /[^\d\.#]/g,
+
+        // A RegExp to remove from a number format string, all characters except digits and the local decimal separator.
+        // Created on first use. The local decimal separator character must be initialized for this to be created.
+        I18NFormatCleanRe,
+
+        // Cache ofg number formatting functions keyed by format string
+        formatFns = {};
+
+    Ext.apply(UtilFormat, {
+        //<locale>
+        /**
+         * @property {String} thousandSeparator
+         * The character that the {@link #number} function uses as a thousand separator.
+         *
+         * This may be overridden in a locale file.
+         */
+        thousandSeparator: ',',
+        //</locale>
+
+        //<locale>
+        /**
+         * @property {String} decimalSeparator
+         * The character that the {@link #number} function uses as a decimal point.
+         *
+         * This may be overridden in a locale file.
+         */
+        decimalSeparator: '.',
+        //</locale>
+
+        //<locale>
+        /**
+         * @property {Number} currencyPrecision
+         * The number of decimal places that the {@link #currency} function displays.
+         *
+         * This may be overridden in a locale file.
+         */
+        currencyPrecision: 2,
+        //</locale>
+
+         //<locale>
+        /**
+         * @property {String} currencySign
+         * The currency sign that the {@link #currency} function displays.
+         *
+         * This may be overridden in a locale file.
+         */
+        currencySign: '$',
+        //</locale>
+
+        //<locale>
+        /**
+         * @property {Boolean} currencyAtEnd
+         * This may be set to <code>true</code> to make the {@link #currency} function
+         * append the currency sign to the formatted value.
+         *
+         * This may be overridden in a locale file.
+         */
+        currencyAtEnd: false,
+        //</locale>
+
+        /**
+         * Checks a reference and converts it to empty string if it is undefined.
+         * @param {Object} value Reference to check
+         * @return {Object} Empty string if converted, otherwise the original value
+         */
+        undef : function(value) {
+            return value !== undefined ? value : "";
+        },
+
+        /**
+         * Checks a reference and converts it to the default value if it's empty.
+         * @param {Object} value Reference to check
+         * @param {String} [defaultValue=""] The value to insert of it's undefined.
+         * @return {String}
+         */
+        defaultValue : function(value, defaultValue) {
+            return value !== undefined && value !== '' ? value : defaultValue;
+        },
+
+        /**
+         * Returns a substring from within an original string.
+         * @param {String} value The original text
+         * @param {Number} start The start index of the substring
+         * @param {Number} length The length of the substring
+         * @return {String} The substring
+         * @method
+         */
+        substr : 'ab'.substr(-1) != 'b'
+        ? function (value, start, length) {
+            var str = String(value);
+            return (start < 0)
+                ? str.substr(Math.max(str.length + start, 0), length)
+                : str.substr(start, length);
+        }
+        : function(value, start, length) {
+            return String(value).substr(start, length);
+        },
+
+        /**
+         * Converts a string to all lower case letters.
+         * @param {String} value The text to convert
+         * @return {String} The converted text
+         */
+        lowercase : function(value) {
+            return String(value).toLowerCase();
+        },
+
+        /**
+         * Converts a string to all upper case letters.
+         * @param {String} value The text to convert
+         * @return {String} The converted text
+         */
+        uppercase : function(value) {
+            return String(value).toUpperCase();
+        },
+
+        /**
+         * Format a number as US currency.
+         * @param {Number/String} value The numeric value to format
+         * @return {String} The formatted currency string
+         */
+        usMoney : function(v) {
+            return UtilFormat.currency(v, '$', 2);
+        },
+
+        /**
+         * Format a number as a currency.
+         * @param {Number/String} value The numeric value to format
+         * @param {String} [sign] The currency sign to use (defaults to {@link #currencySign})
+         * @param {Number} [decimals] The number of decimals to use for the currency
+         * (defaults to {@link #currencyPrecision})
+         * @param {Boolean} [end] True if the currency sign should be at the end of the string
+         * (defaults to {@link #currencyAtEnd})
+         * @return {String} The formatted currency string
+         */
+        currency: function(v, currencySign, decimals, end) {
+            var negativeSign = '',
+                format = ",0",
+                i = 0;
+            v = v - 0;
+            if (v < 0) {
+                v = -v;
+                negativeSign = '-';
+            }
+            decimals = Ext.isDefined(decimals) ? decimals : UtilFormat.currencyPrecision;
+            format += (decimals > 0 ? '.' : '');
+            for (; i < decimals; i++) {
+                format += '0';
+            }
+            v = UtilFormat.number(v, format);
+            if ((end || UtilFormat.currencyAtEnd) === true) {
+                return Ext.String.format("{0}{1}{2}", negativeSign, v, currencySign || UtilFormat.currencySign);
+            } else {
+                return Ext.String.format("{0}{1}{2}", negativeSign, currencySign || UtilFormat.currencySign, v);
+            }
+        },
+
+        /**
+         * Formats the passed date using the specified format pattern.
+         * @param {String/Date} value The value to format. If a string is passed, it is converted to a Date
+         * by the Javascript's built-in Date#parse method.
+         * @param {String} [format] Any valid date format string. Defaults to {@link Ext.Date#defaultFormat}.
+         * @return {String} The formatted date string.
+         */
+        date: function(v, format) {
+            if (!v) {
+                return "";
+            }
+            if (!Ext.isDate(v)) {
+                v = new Date(Date.parse(v));
+            }
+            return Ext.Date.dateFormat(v, format || Ext.Date.defaultFormat);
+        },
+
+        /**
+         * Returns a date rendering function that can be reused to apply a date format multiple times efficiently.
+         * @param {String} format Any valid date format string. Defaults to {@link Ext.Date#defaultFormat}.
+         * @return {Function} The date formatting function
+         */
+        dateRenderer : function(format) {
+            return function(v) {
+                return UtilFormat.date(v, format);
+            };
+        },
+
+        /**
+         * Strips all HTML tags.
+         * @param {Object} value The text from which to strip tags
+         * @return {String} The stripped text
+         */
+        stripTags : function(v) {
+            return !v ? v : String(v).replace(stripTagsRE, "");
+        },
+
+        /**
+         * Strips all script tags.
+         * @param {Object} value The text from which to strip script tags
+         * @return {String} The stripped text
+         */
+        stripScripts : function(v) {
+            return !v ? v : String(v).replace(stripScriptsRe, "");
+        },
+
+        /**
+         * Simple format for a file size (xxx bytes, xxx KB, xxx MB).
+         * @param {Number/String} size The numeric value to format
+         * @return {String} The formatted file size
+         */
+        fileSize : (function(){
+            var byteLimit = 1024,
+                kbLimit = 1048576,
+                mbLimit = 1073741824;
+                
+            return function(size) {
+                var out;
+                if (size < byteLimit) {
+                    if (size === 1) {
+                        out = '1 byte';    
+                    } else {
+                        out = size + ' bytes';
+                    }
+                } else if (size < kbLimit) {
+                    out = (Math.round(((size*10) / byteLimit))/10) + ' KB';
+                } else if (size < mbLimit) {
+                    out = (Math.round(((size*10) / kbLimit))/10) + ' MB';
+                } else {
+                    out = (Math.round(((size*10) / mbLimit))/10) + ' GB';
+                }
+                return out;
+            };
+        })(),
+
+        /**
+         * It does simple math for use in a template, for example:
+         *
+         *     var tpl = new Ext.Template('{value} * 10 = {value:math("* 10")}');
+         *
+         * @return {Function} A function that operates on the passed value.
+         * @method
+         */
+        math : (function(){
+            var fns = {};
+
+            return function(v, a){
+                if (!fns[a]) {
+                    fns[a] = Ext.functionFactory('v', 'return v ' + a + ';');
+                }
+                return fns[a](v);
+            };
+        }()),
+
+        /**
+         * Rounds the passed number to the required decimal precision.
+         * @param {Number/String} value The numeric value to round.
+         * @param {Number} precision The number of decimal places to which to round the first parameter's value.
+         * @return {Number} The rounded value.
+         */
+        round : function(value, precision) {
+            var result = Number(value);
+            if (typeof precision == 'number') {
+                precision = Math.pow(10, precision);
+                result = Math.round(value * precision) / precision;
+            }
+            return result;
+        },
+
+        /**
+         * Formats the passed number according to the passed format string.
+         *
+         * The number of digits after the decimal separator character specifies the number of
+         * decimal places in the resulting string. The *local-specific* decimal character is
+         * used in the result.
+         *
+         * The *presence* of a thousand separator character in the format string specifies that
+         * the *locale-specific* thousand separator (if any) is inserted separating thousand groups.
+         *
+         * By default, "," is expected as the thousand separator, and "." is expected as the decimal separator.
+         *
+         * ## New to Ext JS 4
+         *
+         * Locale-specific characters are always used in the formatted output when inserting
+         * thousand and decimal separators.
+         *
+         * The format string must specify separator characters according to US/UK conventions ("," as the
+         * thousand separator, and "." as the decimal separator)
+         *
+         * To allow specification of format strings according to local conventions for separator characters, add
+         * the string `/i` to the end of the format string.
+         *
+         * examples (123456.789):
+         * 
+         * - `0` - (123456) show only digits, no precision
+         * - `0.00` - (123456.78) show only digits, 2 precision
+         * - `0.0000` - (123456.7890) show only digits, 4 precision
+         * - `0,000` - (123,456) show comma and digits, no precision
+         * - `0,000.00` - (123,456.78) show comma and digits, 2 precision
+         * - `0,0.00` - (123,456.78) shortcut method, show comma and digits, 2 precision
+         * - `0.####` - (123,456,789) Allow maximum 4 decimal places, but do not right pad with zeroes
+         *
+         * @param {Number} v The number to format.
+         * @param {String} format The way you would like to format this text.
+         * @return {String} The formatted number.
+         */
+        number : function(v, formatString) {
+            if (!formatString) {
+                return v;
+            }
+            var formatFn = formatFns[formatString];
+
+            // Generate formatting function to be cached and reused keyed by the format string.
+            // This results in a 100% performance increase over analyzing the format string each invocation.
+            if (!formatFn) {
+
+                var originalFormatString = formatString,
+                    comma = UtilFormat.thousandSeparator,
+                    decimalSeparator = UtilFormat.decimalSeparator,
+                    hasComma,
+                    splitFormat,
+                    extraChars,
+                    precision = 0,
+                    multiplier,
+                    trimTrailingZeroes,
+                    code;
+
+                // The "/i" suffix allows caller to use a locale-specific formatting string.
+                // Clean the format string by removing all but numerals and the decimal separator.
+                // Then split the format string into pre and post decimal segments according to *what* the
+                // decimal separator is. If they are specifying "/i", they are using the local convention in the format string.
+                if (formatString.substr(formatString.length - 2) == '/i') {
+                    if (!I18NFormatCleanRe) {
+                        I18NFormatCleanRe = new RegExp('[^\\d\\' + UtilFormat.decimalSeparator + ']','g');
+                    }
+                    formatString = formatString.substr(0, formatString.length - 2);
+                    hasComma = formatString.indexOf(comma) != -1;
+                    splitFormat = formatString.replace(I18NFormatCleanRe, '').split(decimalSeparator);
+                } else {
+                    hasComma = formatString.indexOf(',') != -1;
+                    splitFormat = formatString.replace(formatCleanRe, '').split('.');
+                }
+                extraChars = formatString.replace(formatPattern, '');
+
+                if (splitFormat.length > 2) {
+                    Ext.Error.raise({
+                        sourceClass: "Ext.util.Format",
+                        sourceMethod: "number",
+                        value: v,
+                        formatString: formatString,
+                        msg: "Invalid number format, should have no more than 1 decimal"
+                    });
+                } else if (splitFormat.length === 2) {
+                    precision = splitFormat[1].length;
+
+                    // Formatting ending in .##### means maximum 5 trailing significant digits
+                    trimTrailingZeroes = allHashes.test(splitFormat[1]);
+                }
+                
+                // The function we create is called immediately and returns a closure which has access to vars and some fixed values; RegExes and the format string.
+                code = [
+                    'var utilFormat=Ext.util.Format,extNumber=Ext.Number,neg,fnum,parts' +
+                        (hasComma ? ',thousandSeparator,thousands=[],j,n,i' : '') +
+                        (extraChars  ? ',formatString="' + formatString + '",formatPattern=/[\\d,\\.#]+/' : '') +
+                        (trimTrailingZeroes ? ',trailingZeroes=/\\.?0+$/;' : ';') +
+                    'return function(v){' +
+                    'if(typeof v!=="number"&&isNaN(v=extNumber.from(v,NaN)))return"";' +
+                    'neg=v<0;',
+                    'fnum=Ext.Number.toFixed(Math.abs(v), ' + precision + ');'
+                ];
+
+                if (hasComma) {
+                    // If we have to insert commas...
+                    
+                    // split the string up into whole and decimal parts if there are decimals
+                    if (precision) {
+                        code[code.length] = 'parts=fnum.split(".");';
+                        code[code.length] = 'fnum=parts[0];';
+                    }
+                    code[code.length] =
+                        'if(v>=1000) {';
+                            code[code.length] = 'thousandSeparator=utilFormat.thousandSeparator;' +
+                            'thousands.length=0;' +
+                            'j=fnum.length;' +
+                            'n=fnum.length%3||3;' +
+                            'for(i=0;i<j;i+=n){' +
+                                'if(i!==0){' +
+                                    'n=3;' +
+                                '}' +
+                                'thousands[thousands.length]=fnum.substr(i,n);' +
+                            '}' +
+                            'fnum=thousands.join(thousandSeparator);' + 
+                        '}';
+                    if (precision) {
+                        code[code.length] = 'fnum += utilFormat.decimalSeparator+parts[1];';
+                    }
+                    
+                } else if (precision) {
+                    // If they are using a weird decimal separator, split and concat using it
+                    code[code.length] = 'if(utilFormat.decimalSeparator!=="."){' +
+                        'parts=fnum.split(".");' +
+                        'fnum=parts[0]+utilFormat.decimalSeparator+parts[1];' +
+                    '}';
+                }
+
+                if (trimTrailingZeroes) {
+                    code[code.length] = 'fnum=fnum.replace(trailingZeroes,"");';
+                }
+
+                /*
+                 * Edge case. If we have a very small negative number it will get rounded to 0,
+                 * however the initial check at the top will still report as negative. Replace
+                 * everything but 1-9 and check if the string is empty to determine a 0 value.
+                 */
+                code[code.length] = 'if(neg&&fnum!=="' + (precision ? '0.' + Ext.String.repeat('0', precision) : '0') + '")fnum="-"+fnum;';
+
+                code[code.length] = 'return ';
+
+                // If there were extra characters around the formatting string, replace the format string part with the formatted number.
+                if (extraChars) {
+                    code[code.length] = 'formatString.replace(formatPattern, fnum);';
+                } else {
+                    code[code.length] = 'fnum;';
+                }
+                code[code.length] = '};'
+
+                formatFn = formatFns[originalFormatString] = Ext.functionFactory('Ext', code.join(''))(Ext);
+            }
+            return formatFn(v);
+        },
+
+        /**
+         * Returns a number rendering function that can be reused to apply a number format multiple
+         * times efficiently.
+         *
+         * @param {String} format Any valid number format string for {@link #number}
+         * @return {Function} The number formatting function
+         */
+        numberRenderer : function(format) {
+            return function(v) {
+                return UtilFormat.number(v, format);
+            };
+        },
+
+        /**
+         * Formats an object of name value properties as HTML element attribute values suitable for using when creating textual markup.
+         * @param {Object} attributes An object containing the HTML attributes as properties eg: `{height:40, vAlign:'top'}`
+         */
+        attributes: function(attributes) {
+            if (typeof attributes === 'object') {
+                var result = [],
+                    name;
+
+                for (name in attributes) {
+                    result.push(name, '="', name === 'style' ? Ext.DomHelper.generateStyles(attributes[name]) : Ext.htmlEncode(attributes[name]), '"');
+                }
+                attributes = result.join('');
+            }
+            return attributes||'';
+        },
+
+        /**
+         * Selectively do a plural form of a word based on a numeric value. For example, in a template,
+         * `{commentCount:plural("Comment")}`  would result in `"1 Comment"` if commentCount was 1 or
+         * would be `"x Comments"` if the value is 0 or greater than 1.
+         *
+         * @param {Number} value The value to compare against
+         * @param {String} singular The singular form of the word
+         * @param {String} [plural] The plural form of the word (defaults to the singular with an "s")
+         */
+        plural : function(v, s, p) {
+            return v +' ' + (v == 1 ? s : (p ? p : s+'s'));
+        },
+
+        /**
+         * Converts newline characters to the HTML tag `<br/>`
+         *
+         * @param {String} v The string value to format.
+         * @return {String} The string with embedded `<br/>` tags in place of newlines.
+         */
+        nl2br : function(v) {
+            return Ext.isEmpty(v) ? '' : v.replace(nl2brRe, '<br/>');
+        },
+
+        /**
+         * Alias for {@link Ext.String#capitalize}.
+         * @method
+         * @inheritdoc Ext.String#capitalize
+         */
+        capitalize: Ext.String.capitalize,
+
+        /**
+         * Alias for {@link Ext.String#ellipsis}.
+         * @method
+         * @inheritdoc Ext.String#ellipsis
+         */
+        ellipsis: Ext.String.ellipsis,
+
+        /**
+         * Alias for {@link Ext.String#format}.
+         * @method
+         * @inheritdoc Ext.String#format
+         */
+        format: Ext.String.format,
+
+        /**
+         * Alias for {@link Ext.String#htmlDecode}.
+         * @method
+         * @inheritdoc Ext.String#htmlDecode
+         */
+        htmlDecode: Ext.String.htmlDecode,
+
+        /**
+         * Alias for {@link Ext.String#htmlEncode}.
+         * @method
+         * @inheritdoc Ext.String#htmlEncode
+         */
+        htmlEncode: Ext.String.htmlEncode,
+
+        /**
+         * Alias for {@link Ext.String#leftPad}.
+         * @method
+         * @inheritdoc Ext.String#leftPad
+         */
+        leftPad: Ext.String.leftPad,
+
+        /**
+         * Alias for {@link Ext.String#trim}.
+         * @method
+         * @inheritdoc Ext.String#trim
+         */
+        trim : Ext.String.trim,
+
+        /**
+         * Parses a number or string representing margin sizes into an object.
+         * Supports CSS-style margin declarations (e.g. 10, "10", "10 10", "10 10 10" and
+         * "10 10 10 10" are all valid options and would return the same result).
+         *
+         * @param {Number/String} v The encoded margins
+         * @return {Object} An object with margin sizes for top, right, bottom and left
+         */
+        parseBox : function(box) {
+            box = box || 0;
+
+            if (typeof box === 'number') {
+                return {
+                    top   : box,
+                    right : box,
+                    bottom: box,
+                    left  : box
+                };
+             }
+
+            var parts  = box.split(' '),
+                ln = parts.length;
+
+            if (ln == 1) {
+                parts[1] = parts[2] = parts[3] = parts[0];
+            }
+            else if (ln == 2) {
+                parts[2] = parts[0];
+                parts[3] = parts[1];
+            }
+            else if (ln == 3) {
+                parts[3] = parts[1];
+            }
+
+            return {
+                top   :parseInt(parts[0], 10) || 0,
+                right :parseInt(parts[1], 10) || 0,
+                bottom:parseInt(parts[2], 10) || 0,
+                left  :parseInt(parts[3], 10) || 0
+            };
+        },
+
+        /**
+         * Escapes the passed string for use in a regular expression.
+         * @param {String} str
+         * @return {String}
+         */
+        escapeRegex : function(s) {
+            return s.replace(/([\-.*+?\^${}()|\[\]\/\\])/g, "\\$1");
+        }
+    });
+}());
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require Format.js
+
+/**
+ * Provides the ability to execute one or more arbitrary tasks in a asynchronous manner.
+ * Generally, you can use the singleton {@link Ext.TaskManager} instead, but if needed,
+ * you can create separate instances of TaskRunner. Any number of separate tasks can be
+ * started at any time and will run independently of each other.
+ * 
+ * Example usage:
+ *
+ *      // Start a simple clock task that updates a div once per second
+ *      var updateClock = function () {
+ *          Ext.fly('clock').update(new Date().format('g:i:s A'));
+ *      }
+ *
+ *      var runner = new Ext.util.TaskRunner();
+ *      var task = runner.start({
+ *          run: updateClock,
+ *          interval: 1000
+ *      }
+ *
+ * The equivalent using TaskManager:
+ *
+ *      var task = Ext.TaskManager.start({
+ *          run: updateClock,
+ *          interval: 1000
+ *      });
+ *
+ * To end a running task:
+ * 
+ *      task.destroy();
+ *
+ * If a task needs to be started and stopped repeated over time, you can create a
+ * {@link Ext.util.TaskRunner.Task Task} instance.
+ *
+ *      var task = runner.newTask({
+ *          run: function () {
+ *              // useful code
+ *          },
+ *          interval: 1000
+ *      });
+ *      
+ *      task.start();
+ *      
+ *      // ...
+ *      
+ *      task.stop();
+ *      
+ *      // ...
+ *      
+ *      task.start();
+ *
+ * A re-usable, one-shot task can be managed similar to the above:
+ *
+ *      var task = runner.newTask({
+ *          run: function () {
+ *              // useful code to run once
+ *          },
+ *          repeat: 1
+ *      });
+ *      
+ *      task.start();
+ *      
+ *      // ...
+ *      
+ *      task.start();
+ *
+ * See the {@link #start} method for details about how to configure a task object.
+ *
+ * Also see {@link Ext.util.DelayedTask}. 
+ * 
+ * @constructor
+ * @param {Number/Object} [interval=10] The minimum precision in milliseconds supported by this
+ * TaskRunner instance. Alternatively, a config object to apply to the new instance.
+ */
+Ext.define('Ext.util.TaskRunner', {
+    /**
+     * @cfg {Boolean} [fireIdleEvent=true]
+     * This may be configured `false` to inhibit firing of the {@link Ext.EventManager#idleEvent idle event} after task invocation.
+     */
+
+    /**
+     * @cfg interval
+     * The timer resolution.
+     */
+    interval: 10,
+
+    /**
+     * @property timerId
+     * The id of the current timer.
+     * @private
+     */
+    timerId: null,
+
+    constructor: function (interval) {
+        var me = this;
+
+        if (typeof interval == 'number') {
+            me.interval = interval;
+        } else if (interval) {
+            Ext.apply(me, interval);
+        }
+
+        me.tasks = [];
+        me.timerFn = Ext.Function.bind(me.onTick, me);
+    },
+
+    /**
+     * Creates a new {@link Ext.util.TaskRunner.Task Task} instance. These instances can
+     * be easily started and stopped.
+     * @param {Object} config The config object. For details on the supported properties,
+     * see {@link #start}.
+     */
+    newTask: function (config) {
+        var task = new Ext.util.TaskRunner.Task(config);
+        task.manager = this;
+        return task;
+    },
+
+    /**
+     * Starts a new task.
+     *
+     * Before each invocation, Ext injects the property `taskRunCount` into the task object
+     * so that calculations based on the repeat count can be performed.
+     * 
+     * The returned task will contain a `destroy` method that can be used to destroy the
+     * task and cancel further calls. This is equivalent to the {@link #stop} method.
+     *
+     * @param {Object} task A config object that supports the following properties:
+     * @param {Function} task.run The function to execute each time the task is invoked. The
+     * function will be called at each interval and passed the `args` argument if specified,
+     * and the current invocation count if not.
+     * 
+     * If a particular scope (`this` reference) is required, be sure to specify it using
+     * the `scope` argument.
+     * 
+     * @param {Function} task.onError The function to execute in case of unhandled
+     * error on task.run.
+     *
+     * @param {Boolean} task.run.return `false` from this function to terminate the task.
+     *
+     * @param {Number} task.interval The frequency in milliseconds with which the task
+     * should be invoked.
+     *
+     * @param {Object[]} task.args An array of arguments to be passed to the function
+     * specified by `run`. If not specified, the current invocation count is passed.
+     *
+     * @param {Object} task.scope The scope (`this` reference) in which to execute the
+     * `run` function. Defaults to the task config object.
+     *
+     * @param {Number} task.duration The length of time in milliseconds to invoke the task
+     * before stopping automatically (defaults to indefinite).
+     *
+     * @param {Number} task.repeat The number of times to invoke the task before stopping
+     * automatically (defaults to indefinite).
+     * @return {Object} The task
+     */
+    start: function(task) {
+        var me = this,
+            now = Ext.Date.now();
+
+        if (!task.pending) {
+            me.tasks.push(task);
+            task.pending = true; // don't allow the task to be added to me.tasks again
+        }
+
+        task.stopped = false; // might have been previously stopped...
+        task.taskStartTime = now;
+        task.taskRunTime = task.fireOnStart !== false ? 0 : task.taskStartTime;
+        task.taskRunCount = 0;
+
+        if (!me.firing) {
+            if (task.fireOnStart !== false) {
+                me.startTimer(0, now);
+            } else {
+                me.startTimer(task.interval, now);
+            }
+        }
+
+        return task;
+    },
+
+    /**
+     * Stops an existing running task.
+     * @param {Object} task The task to stop
+     * @return {Object} The task
+     */
+    stop: function(task) {
+        // NOTE: we don't attempt to remove the task from me.tasks at this point because
+        // this could be called from inside a task which would then corrupt the state of
+        // the loop in onTick
+        if (!task.stopped) {
+            task.stopped = true;
+
+            if (task.onStop) {
+                task.onStop.call(task.scope || task, task);
+            }
+        }
+
+        return task;
+    },
+
+    /**
+     * Stops all tasks that are currently running.
+     */
+    stopAll: function() {
+        // onTick will take care of cleaning up the mess after this point...
+        Ext.each(this.tasks, this.stop, this);
+    },
+
+    //-------------------------------------------------------------------------
+
+    firing: false,
+
+    nextExpires: 1e99,
+
+    // private
+    onTick: function () {
+        var me = this,
+            tasks = me.tasks,
+            now = Ext.Date.now(),
+            nextExpires = 1e99,
+            len = tasks.length,
+            expires, newTasks, i, task, rt, remove;
+
+        me.timerId = null;
+        me.firing = true; // ensure we don't startTimer during this loop...
+
+        // tasks.length can be > len if start is called during a task.run call... so we
+        // first check len to avoid tasks.length reference but eventually we need to also
+        // check tasks.length. we avoid repeating use of tasks.length by setting len at
+        // that time (to help the next loop)
+        for (i = 0; i < len || i < (len = tasks.length); ++i) {
+            task = tasks[i];
+
+            if (!(remove = task.stopped)) {
+                expires = task.taskRunTime + task.interval;
+
+                if (expires <= now) {
+                    rt = 1; // otherwise we have a stale "rt"
+                    try {
+                        rt = task.run.apply(task.scope || task, task.args || [++task.taskRunCount]);
+                    } catch (taskError) {
+                        try {
+                            Ext.log({
+                                msg: taskError,
+                                level: 'error'
+                            });
+                            if (task.onError) {
+                                rt = task.onError.call(task.scope || task, task, taskError);
+                            }
+                        } catch (ignore) { }
+                        }
+                    task.taskRunTime = now;
+                    if (rt === false || task.taskRunCount === task.repeat) {
+                        me.stop(task);
+                        remove = true;
+                    } else {
+                        remove = task.stopped; // in case stop was called by run
+                        expires = now + task.interval;
+                    }
+                }
+
+                if (!remove && task.duration && task.duration <= (now - task.taskStartTime)) {
+                    me.stop(task);
+                    remove = true;
+                }
+            }
+
+            if (remove) {
+                task.pending = false; // allow the task to be added to me.tasks again
+
+                // once we detect that a task needs to be removed, we copy the tasks that
+                // will carry forward into newTasks... this way we avoid O(N*N) to remove
+                // each task from the tasks array (and ripple the array down) and also the
+                // potentially wasted effort of making a new tasks[] even if all tasks are
+                // going into the next wave.
+                if (!newTasks) {
+                    newTasks = tasks.slice(0, i);
+                    // we don't set me.tasks here because callbacks can also start tasks,
+                    // which get added to me.tasks... so we will visit them in this loop
+                    // and account for their expirations in nextExpires...
+                }
+            } else {
+                if (newTasks) {
+                    newTasks.push(task); // we've cloned the tasks[], so keep this one...
+                }
+
+                if (nextExpires > expires) {
+                    nextExpires = expires; // track the nearest expiration time
+                }
+            }
+        }
+
+        if (newTasks) {
+            // only now can we copy the newTasks to me.tasks since no user callbacks can
+            // take place
+            me.tasks = newTasks;
+        }
+
+        me.firing = false; // we're done, so allow startTimer afterwards
+
+        if (me.tasks.length) {
+            // we create a new Date here because all the callbacks could have taken a long
+            // time... we want to base the next timeout on the current time (after the
+            // callback storm):
+            me.startTimer(nextExpires - now, Ext.Date.now());
+        }
+        
+        // After a tick
+        if (me.fireIdleEvent !== false) {
+            Ext.EventManager.idleEvent.fire();
+        }
+   },
+
+    // private
+    startTimer: function (timeout, now) {
+        var me = this,
+            expires = now + timeout,
+            timerId = me.timerId;
+
+        // Check to see if this request is enough in advance of the current timer. If so,
+        // we reschedule the timer based on this new expiration.
+        if (timerId && me.nextExpires - expires > me.interval) {
+            clearTimeout(timerId);
+            timerId = null;
+        }
+
+        if (!timerId) {
+            if (timeout < me.interval) {
+                timeout = me.interval;
+            }
+
+            me.timerId = setTimeout(me.timerFn, timeout);
+            me.nextExpires = expires;
+        }
+    }
+},
+function () {
+    var me = this,
+        proto = me.prototype;
+
+    /**
+     * Destroys this instance, stopping all tasks that are currently running.
+     * @method destroy
+     */
+    proto.destroy = proto.stopAll;
+
+    // Documented in TaskManager.js
+    Ext.util.TaskManager = Ext.TaskManager = new me();
+
+    /**
+     * Instances of this class are created by {@link Ext.util.TaskRunner#newTask} method.
+     * 
+     * For details on config properties, see {@link Ext.util.TaskRunner#start}.
+     * @class Ext.util.TaskRunner.Task
+     */
+    me.Task = new Ext.Class({
+        isTask: true,
+
+        /**
+         * This flag is set to `true` by {@link #stop}.
+         * @private
+         */
+        stopped: true, // this avoids the odd combination of !stopped && !pending
+
+        /**
+         * Override default behavior
+         */
+        fireOnStart: false,
+
+        constructor: function (config) {
+            Ext.apply(this, config);
+        },
+
+        /**
+         * Restarts this task, clearing it duration, expiration and run count.
+         * @param {Number} [interval] Optionally reset this task's interval.
+         */
+        restart: function (interval) {
+            if (interval !== undefined) {
+                this.interval = interval;
+            }
+
+            this.manager.start(this);
+        },
+
+        /**
+         * Starts this task if it is not already started.
+         * @param {Number} [interval] Optionally reset this task's interval.
+         */
+        start: function (interval) {
+            if (this.stopped) {
+                this.restart(interval);
+            }
+        },
+
+        /**
+         * Stops this task.
+         */
+        stop: function () {
+            this.manager.stop(this);
+        }
+    });
+
+    proto = me.Task.prototype;
+
+    /**
+     * Destroys this instance, stopping this task's execution.
+     * @method destroy
+     */
+    proto.destroy = proto.stop;
+});
+
+
+
+
+
+
+
+
+
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+/**
+ * A static {@link Ext.util.TaskRunner} instance that can be used to start and stop
+ * arbitrary tasks. See {@link Ext.util.TaskRunner} for supported methods and task
+ * config properties.
+ *
+ *    // Start a simple clock task that updates a div once per second
+ *    var task = {
+ *       run: function(){
+ *           Ext.fly('clock').update(new Date().format('g:i:s A'));
+ *       },
+ *       interval: 1000 //1 second
+ *    }
+ *
+ *    Ext.TaskManager.start(task);
+ *
+ * See the {@link #start} method for details about how to configure a task object.
+ */
+Ext.define('Ext.util.TaskManager', {
+    extend:  Ext.util.TaskRunner ,
+
+    alternateClassName: [
+        'Ext.TaskManager'
+    ],
+
+    singleton: true
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require ../util/TaskManager.js
+
+/**
+ * @class Ext.perf.Accumulator
+ * @private
+ */
+Ext.define('Ext.perf.Accumulator', (function () {
+    var currentFrame = null,
+        khrome = Ext.global['chrome'],
+        formatTpl,
+        // lazy init on first request for timestamp (avoids infobar in IE until needed)
+        // Also avoids kicking off Chrome's microsecond timer until first needed
+        getTimestamp = function () {
+
+            getTimestamp = function () {
+                return new Date().getTime();
+            };
+            
+            var interval, toolbox;
+
+            // If Chrome is started with the --enable-benchmarking switch
+            if (Ext.isChrome && khrome && khrome.Interval) {
+                interval = new khrome.Interval();
+                interval.start();
+                getTimestamp = function () {
+                    return interval.microseconds() / 1000;
+                };
+            } else if (window.ActiveXObject) {
+                try {
+                    // the above technique is not very accurate for small intervals...
+                    toolbox = new ActiveXObject('SenchaToolbox.Toolbox');
+                    Ext.senchaToolbox = toolbox; // export for other uses
+                    getTimestamp = function () {
+                        return toolbox.milliseconds;
+                    };
+                } catch (e) {
+                    // ignore
+                }
+            } else if (Date.now) {
+                getTimestamp = Date.now;
+            }
+
+            Ext.perf.getTimestamp = Ext.perf.Accumulator.getTimestamp = getTimestamp;
+            return getTimestamp();
+        };
+
+    function adjustSet (set, time) {
+        set.sum += time;
+        set.min = Math.min(set.min, time);
+        set.max = Math.max(set.max, time);
+    }
+
+    function leaveFrame (time) {
+        var totalTime = time ? time : (getTimestamp() - this.time), // do this first
+            me = this, // me = frame
+            accum = me.accum;
+
+        ++accum.count;
+        if (! --accum.depth) {
+            adjustSet(accum.total, totalTime);
+        }
+        adjustSet(accum.pure, totalTime - me.childTime);
+
+        currentFrame = me.parent;
+        if (currentFrame) {
+            ++currentFrame.accum.childCount;
+            currentFrame.childTime += totalTime;
+        }
+    }
+
+    function makeSet () {
+        return {
+            min: Number.MAX_VALUE,
+            max: 0,
+            sum: 0
+        };
+    }
+
+    function makeTap (me, fn) {
+        return function () {
+            var frame = me.enter(),
+                ret = fn.apply(this, arguments);
+
+            frame.leave();
+            return ret;
+        };
+    }
+
+    function round (x) {
+        return Math.round(x * 100) / 100;
+    }
+
+    function setToJSON (count, childCount, calibration, set) {
+        var data = {
+            avg: 0,
+            min: set.min,
+            max: set.max,
+            sum: 0
+        };
+
+        if (count) {
+            calibration = calibration || 0;
+            data.sum = set.sum - childCount * calibration;
+            data.avg = data.sum / count;
+            // min and max cannot be easily corrected since we don't know the number of
+            // child calls for them.
+        }
+
+        return data;
+    }
+
+    return {
+        constructor: function (name) {
+            var me = this;
+
+            me.count = me.childCount = me.depth = me.maxDepth = 0;
+            me.pure = makeSet();
+            me.total = makeSet();
+            me.name = name;
+        },
+
+        statics: {
+            getTimestamp: getTimestamp
+        },
+
+        format: function (calibration) {
+            if (!formatTpl) {
+                formatTpl = new Ext.XTemplate([
+                        '{name} - {count} call(s)',
+                        '<tpl if="count">',
+                            '<tpl if="childCount">',
+                                ' ({childCount} children)',
+                            '</tpl>',
+                            '<tpl if="depth - 1">',
+                                ' ({depth} deep)',
+                            '</tpl>',
+                            '<tpl for="times">',
+                                ', {type}: {[this.time(values.sum)]} msec (',
+                                     //'min={[this.time(values.min)]}, ',
+                                     'avg={[this.time(values.sum / parent.count)]}',
+                                     //', max={[this.time(values.max)]}',
+                                     ')',
+                            '</tpl>',
+                        '</tpl>'
+                    ].join(''), {
+                        time: function (t) {
+                            return Math.round(t * 100) / 100;
+                        }
+                    });
+            }
+
+            var data = this.getData(calibration);
+            data.name = this.name;
+            data.pure.type = 'Pure';
+            data.total.type = 'Total';
+            data.times = [data.pure, data.total];
+            return formatTpl.apply(data);
+        },
+
+        getData: function (calibration) {
+            var me = this;
+
+            return {
+                count: me.count,
+                childCount: me.childCount,
+                depth: me.maxDepth,
+                pure: setToJSON(me.count, me.childCount, calibration, me.pure),
+                total: setToJSON(me.count, me.childCount, calibration, me.total)
+            };
+        },
+
+        enter: function () {
+            var me = this,
+                frame = {
+                    accum: me,
+                    leave: leaveFrame,
+                    childTime: 0,
+                    parent: currentFrame
+                };
+
+            ++me.depth;
+            if (me.maxDepth < me.depth) {
+                me.maxDepth = me.depth;
+            }
+
+            currentFrame = frame;
+            frame.time = getTimestamp(); // do this last
+            return frame;
+        },
+
+        monitor: function (fn, scope, args) {
+            var frame = this.enter();
+            if (args) {
+                fn.apply(scope, args);
+            } else {
+                fn.call(scope);
+            }
+            frame.leave();
+        },
+
+        report: function () {
+            Ext.log(this.format());
+        },
+
+        tap: function (className, methodName) {
+            var me = this,
+                methods = typeof methodName == 'string' ? [methodName] : methodName,
+                klass, statik, i, parts, length, name, src,
+                tapFunc;
+
+            tapFunc = function(){
+                if (typeof className == 'string') {
+                    klass = Ext.global;
+                    parts = className.split('.');
+                    for (i = 0, length = parts.length; i < length; ++i) {
+                        klass = klass[parts[i]];
+                    }
+                } else {
+                    klass = className;
+                }
+
+                for (i = 0, length = methods.length; i < length; ++i) {
+                    name = methods[i];
+                    statik = name.charAt(0) == '!';
+
+                    if (statik) {
+                        name = name.substring(1);
+                    } else {
+                        statik = !(name in klass.prototype);
+                    }
+
+                    src = statik ? klass : klass.prototype;
+                    src[name] = makeTap(me, src[name]);
+                }
+            };
+
+            Ext.ClassManager.onCreated(tapFunc, me, className);
+
+            return me;
+        }
+    };
+}()),
+
+function () {
+    Ext.perf.getTimestamp = this.getTimestamp;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require Accumulator.js
+
+/**
+ * @class Ext.perf.Monitor
+ * @singleton
+ * @private
+ */
+Ext.define('Ext.perf.Monitor', {
+    singleton: true,
+    alternateClassName: 'Ext.Perf',
+
+               
+                              
+      
+
+    constructor: function () {
+        this.accumulators = [];
+        this.accumulatorsByName = {};
+    },
+
+    calibrate: function () {
+        var accum = new Ext.perf.Accumulator('$'),
+            total = accum.total,
+            getTimestamp = Ext.perf.Accumulator.getTimestamp,
+            count = 0,
+            frame,
+            endTime,
+            startTime;
+
+        startTime = getTimestamp();
+
+        do {
+            frame = accum.enter();
+            frame.leave();
+            ++count;
+        } while (total.sum < 100);
+
+        endTime = getTimestamp();
+
+        return (endTime - startTime) / count;
+    },
+
+    get: function (name) {
+        var me = this,
+            accum = me.accumulatorsByName[name];
+
+        if (!accum) {
+            me.accumulatorsByName[name] = accum = new Ext.perf.Accumulator(name);
+            me.accumulators.push(accum);
+        }
+
+        return accum;
+    },
+
+    enter: function (name) {
+        return this.get(name).enter();
+    },
+
+    monitor: function (name, fn, scope) {
+        this.get(name).monitor(fn, scope);
+    },
+
+    report: function () {
+        var me = this,
+            accumulators = me.accumulators,
+            calibration = me.calibrate();
+
+        accumulators.sort(function (a, b) {
+            return (a.name < b.name) ? -1 : ((b.name < a.name) ? 1 : 0);
+        });
+
+        me.updateGC();
+
+        Ext.log('Calibration: ' + Math.round(calibration * 100) / 100 + ' msec/sample');
+        Ext.each(accumulators, function (accum) {
+            Ext.log(accum.format(calibration));
+        });
+    },
+
+    getData: function (all) {
+        var ret = {},
+            accumulators = this.accumulators;
+
+        Ext.each(accumulators, function (accum) {
+            if (all || accum.count) {
+                ret[accum.name] = accum.getData();
+            }
+        });
+
+        return ret;
+    },
+
+    reset: function(){
+        Ext.each(this.accumulators, function(accum){
+            var me = accum;
+            me.count = me.childCount = me.depth = me.maxDepth = 0;
+            me.pure = {
+                min: Number.MAX_VALUE,
+                max: 0,
+                sum: 0
+            };
+            me.total = {
+                min: Number.MAX_VALUE,
+                max: 0,
+                sum: 0
+            };
+        });
+    },
+
+    updateGC: function () {
+        var accumGC = this.accumulatorsByName.GC,
+            toolbox = Ext.senchaToolbox,
+            bucket;
+
+        if (accumGC) {
+            accumGC.count = toolbox.garbageCollectionCounter || 0;
+
+            if (accumGC.count) {
+                bucket = accumGC.pure;
+                accumGC.total.sum = bucket.sum = toolbox.garbageCollectionMilliseconds;
+                bucket.min = bucket.max = bucket.sum / accumGC.count;
+                bucket = accumGC.total;
+                bucket.min = bucket.max = bucket.sum / accumGC.count;
+            }
+        }
+    },
+
+    watchGC: function () {
+        Ext.perf.getTimestamp(); // initializes SenchaToolbox (if available)
+
+        var toolbox = Ext.senchaToolbox;
+
+        if (toolbox) {
+            this.get("GC");
+            toolbox.watchGarbageCollector(false); // no logging, just totals
+        }
+    },
+
+    setup: function (config) {
+        if (!config) {
+            config = {
+                /*insertHtml: {
+                    'Ext.dom.Helper': 'insertHtml'
+                },*/
+                /*xtplCompile: {
+                    'Ext.XTemplateCompiler': 'compile'
+                },*/
+//                doInsert: {
+//                    'Ext.Template': 'doInsert'
+//                },
+//                applyOut: {
+//                    'Ext.XTemplate': 'applyOut'
+//                },
+                render: {
+                    'Ext.AbstractComponent': 'render'
+                },
+//                fnishRender: {
+//                    'Ext.AbstractComponent': 'finishRender'
+//                },
+//                renderSelectors: {
+//                    'Ext.AbstractComponent': 'applyRenderSelectors'
+//                },
+//                compAddCls: {
+//                    'Ext.AbstractComponent': 'addCls'
+//                },
+//                compRemoveCls: {
+//                    'Ext.AbstractComponent': 'removeCls'
+//                },
+//                getStyle: {
+//                    'Ext.core.Element': 'getStyle'
+//                },
+//                setStyle: {
+//                    'Ext.core.Element': 'setStyle'
+//                },
+//                addCls: {
+//                    'Ext.core.Element': 'addCls'
+//                },
+//                removeCls: {
+//                    'Ext.core.Element': 'removeCls'
+//                },
+//                measure: {
+//                    'Ext.layout.component.Component': 'measureAutoDimensions'
+//                },
+//                moveItem: {
+//                    'Ext.layout.Layout': 'moveItem'
+//                },
+//                layoutFlush: {
+//                    'Ext.layout.Context': 'flush'
+//                },
+                layout: {
+                    'Ext.layout.Context': 'run'
+                }
+            };
+        }
+
+        this.currentConfig = config;
+
+        var key, prop,
+            accum, className, methods;
+        for (key in config) {
+            if (config.hasOwnProperty(key)) {
+                prop = config[key];
+                accum = Ext.Perf.get(key);
+
+                for (className in prop) {
+                    if (prop.hasOwnProperty(className)) {
+                        methods = prop[className];
+                        accum.tap(className, methods);
+                    }
+                }
+            }
+        }
+
+        this.watchGC();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag extras,core
+// @require perf/Monitor.js
+// @define Ext.Supports
+
+/**
+ * @class Ext.is
+ * 
+ * Determines information about the current platform the application is running on.
+ * 
+ * @singleton
+ */
+Ext.is = {
+    init : function(navigator) {
+        var platforms = this.platforms,
+            ln = platforms.length,
+            i, platform;
+
+        navigator = navigator || window.navigator;
+
+        for (i = 0; i < ln; i++) {
+            platform = platforms[i];
+            this[platform.identity] = platform.regex.test(navigator[platform.property]);
+        }
+
+        /**
+         * @property Desktop True if the browser is running on a desktop machine
+         * @type {Boolean}
+         */
+        this.Desktop = this.Mac || this.Windows || (this.Linux && !this.Android);
+        /**
+         * @property Tablet True if the browser is running on a tablet (iPad)
+         */
+        this.Tablet = this.iPad;
+        /**
+         * @property Phone True if the browser is running on a phone.
+         * @type {Boolean}
+         */
+        this.Phone = !this.Desktop && !this.Tablet;
+        /**
+         * @property iOS True if the browser is running on iOS
+         * @type {Boolean}
+         */
+        this.iOS = this.iPhone || this.iPad || this.iPod;
+        
+        /**
+         * @property Standalone Detects when application has been saved to homescreen.
+         * @type {Boolean}
+         */
+        this.Standalone = !!window.navigator.standalone;
+    },
+    
+    /**
+     * @property iPhone True when the browser is running on a iPhone
+     * @type {Boolean}
+     */
+    platforms: [{
+        property: 'platform',
+        regex: /iPhone/i,
+        identity: 'iPhone'
+    },
+    
+    /**
+     * @property iPod True when the browser is running on a iPod
+     * @type {Boolean}
+     */
+    {
+        property: 'platform',
+        regex: /iPod/i,
+        identity: 'iPod'
+    },
+    
+    /**
+     * @property iPad True when the browser is running on a iPad
+     * @type {Boolean}
+     */
+    {
+        property: 'userAgent',
+        regex: /iPad/i,
+        identity: 'iPad'
+    },
+    
+    /**
+     * @property Blackberry True when the browser is running on a Blackberry
+     * @type {Boolean}
+     */
+    {
+        property: 'userAgent',
+        regex: /Blackberry/i,
+        identity: 'Blackberry'
+    },
+    
+    /**
+     * @property Android True when the browser is running on an Android device
+     * @type {Boolean}
+     */
+    {
+        property: 'userAgent',
+        regex: /Android/i,
+        identity: 'Android'
+    },
+    
+    /**
+     * @property Mac True when the browser is running on a Mac
+     * @type {Boolean}
+     */
+    {
+        property: 'platform',
+        regex: /Mac/i,
+        identity: 'Mac'
+    },
+    
+    /**
+     * @property Windows True when the browser is running on Windows
+     * @type {Boolean}
+     */
+    {
+        property: 'platform',
+        regex: /Win/i,
+        identity: 'Windows'
+    },
+    
+    /**
+     * @property Linux True when the browser is running on Linux
+     * @type {Boolean}
+     */
+    {
+        property: 'platform',
+        regex: /Linux/i,
+        identity: 'Linux'
+    }]
+};
+
+Ext.is.init();
+
+/**
+ * @class Ext.supports
+ *
+ * Determines information about features are supported in the current environment
+ * 
+ * @singleton
+ */
+(function(){
+
+    // this is a local copy of certain logic from (Abstract)Element.getStyle
+    // to break a dependancy between the supports mechanism and Element
+    // use this instead of element references to check for styling info
+    var getStyle = function(element, styleName){
+        var view = element.ownerDocument.defaultView,
+            style = (view ? view.getComputedStyle(element, null) : element.currentStyle) || element.style;
+        return style[styleName];
+    },
+    supportsVectors = {
+        'IE6-quirks':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,0,0,1,0,0,1,0,0,1,0,1,0,0,0],
+        'IE6-strict':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,0,0,1,0,1,1,0,0,1,0,1,0,0,0],
+        'IE7-quirks':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,0,0,1,0,0,1,0,0,1,0,1,0,0,0],
+        'IE7-strict':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,0,0,1,1,0,1,0,0,1,0,1,0,0,0],
+        'IE8-quirks':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,0,0,1,0,0,1,0,0,1,0,1,0,0,0],
+        'IE8-strict':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,0,0,1,1,1,1,0,0,1,0,1,0,0,1],
+        'IE9-quirks':  [0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,1,0,0,0,1,0,0,1,0,0,1,0,1,0,0,0],
+        'IE9-strict':  [0,1,0,0,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,0,0,0,0,1],
+        'IE10-quirks': [1,1,0,0,1,1,1,1,0,1,1,1,0,0,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,0,0,1],
+        'IE10-strict': [1,1,0,0,1,1,1,1,0,1,1,1,0,0,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,0,0,1]
+    };
+
+function getBrowserKey() {
+    var browser = Ext.isIE6 ? 'IE6' : Ext.isIE7 ? 'IE7' : Ext.isIE8 ? 'IE8' :
+        Ext.isIE9 ? 'IE9': Ext.isIE10 ? 'IE10' : '';
+
+    return browser ? browser + (Ext.isStrict ? '-strict' : '-quirks') : '';
+}
+
+Ext.supports = {
+    /**
+     * Runs feature detection routines and sets the various flags. This is called when
+     * the scripts loads (very early) and again at {@link Ext#onReady}. Some detections
+     * are flagged as `early` and run immediately. Others that require the document body
+     * will not run until ready.
+     *
+     * Each test is run only once, so calling this method from an onReady function is safe
+     * and ensures that all flags have been set.
+     * @markdown
+     * @private
+     */
+    init : function() {
+        var me = this,
+            doc = document,
+            toRun = me.toRun || me.tests,
+            n = toRun.length,
+            div = n && Ext.isReady && doc.createElement('div'),
+            notRun = [],
+            browserKey = getBrowserKey(),
+            test, vector, value;
+
+        if (div) {
+            div.innerHTML = [
+                '<div style="height:30px;width:50px;">',
+                    '<div style="height:20px;width:20px;"></div>',
+                '</div>',
+                '<div style="width: 200px; height: 200px; position: relative; padding: 5px;">',
+                    '<div style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></div>',
+                '</div>',
+                '<div style="position: absolute; left: 10%; top: 10%;"></div>',
+                '<div style="float:left; background-color:transparent;"></div>'
+            ].join('');
+
+            doc.body.appendChild(div);
+        }
+
+        vector = supportsVectors[browserKey];
+        while (n--) {
+            test = toRun[n];
+            value = vector && vector[n];
+            if (value !== undefined) {
+                me[test.identity] = value;
+            } else if (div || test.early) {
+                me[test.identity] = test.fn.call(me, doc, div);
+            } else {
+                notRun.push(test);
+            }
+        }
+
+        if (div) {
+            doc.body.removeChild(div);
+        }
+
+        me.toRun = notRun;
+    },
+
+    /**
+     * Generates a support vector for the current browser/mode.  The result can be
+     * added to supportsVectors to eliminate feature detection at startup time.
+     * @private
+     */
+    generateVector: function() {
+        var tests = this.tests,
+            vector = [],
+            i = 0,
+            ln = tests.length,
+            test;
+
+        for (; i < ln; i++) {
+            test = tests[i];
+            vector.push(this[test.identity] ? 1 : 0);
+        }
+        return vector;
+    },
+
+    /**
+     * @property PointerEvents True if document environment supports the CSS3 pointer-events style.
+     * @type {Boolean}
+     */
+    PointerEvents: 'pointerEvents' in document.documentElement.style,
+
+    // IE10/Win8 throws "Access Denied" accessing window.localStorage, so this test
+    // needs to have a try/catch
+    /**
+     * @property LocalStorage True if localStorage is supported
+     */
+    LocalStorage: (function() {
+        try {
+            return 'localStorage' in window && window['localStorage'] !== null;
+        } catch (e) {
+            return false;
+        }
+    })(),
+
+    /**
+     * @property CSS3BoxShadow True if document environment supports the CSS3 box-shadow style.
+     * @type {Boolean}
+     */
+    CSS3BoxShadow: 'boxShadow' in document.documentElement.style || 'WebkitBoxShadow' in document.documentElement.style || 'MozBoxShadow' in document.documentElement.style,
+
+    /**
+     * @property ClassList True if document environment supports the HTML5 classList API.
+     * @type {Boolean}
+     */
+    ClassList: !!document.documentElement.classList,
+
+    /**
+     * @property OrientationChange True if the device supports orientation change
+     * @type {Boolean}
+     */
+    OrientationChange: ((typeof window.orientation != 'undefined') && ('onorientationchange' in window)),
+
+    /**
+     * @property DeviceMotion True if the device supports device motion (acceleration and rotation rate)
+     * @type {Boolean}
+     */
+    DeviceMotion: ('ondevicemotion' in window),
+
+    /**
+     * @property Touch True if the device supports touch
+     * @type {Boolean}
+     */
+    // is.Desktop is needed due to the bug in Chrome 5.0.375, Safari 3.1.2
+    // and Safari 4.0 (they all have 'ontouchstart' in the window object).
+    Touch: ('ontouchstart' in window) && (!Ext.is.Desktop),
+
+    /**
+     * @property TimeoutActualLateness True if the browser passes the "actualLateness" parameter to
+     * setTimeout. See: https://developer.mozilla.org/en/DOM/window.setTimeout
+     * @type {Boolean}
+     */
+    TimeoutActualLateness: (function(){
+        setTimeout(function(){
+            Ext.supports.TimeoutActualLateness = arguments.length !== 0;
+        }, 0);
+    }()),
+
+    tests: [
+        /**
+         * @property Transitions True if the device supports CSS3 Transitions
+         * @type {Boolean}
+         */
+        {
+            identity: 'Transitions',
+            fn: function(doc, div) {
+                var prefix = [
+                        'webkit',
+                        'Moz',
+                        'o',
+                        'ms',
+                        'khtml'
+                    ],
+                    TE = 'TransitionEnd',
+                    transitionEndName = [
+                        prefix[0] + TE,
+                        'transitionend', //Moz bucks the prefixing convention
+                        prefix[2] + TE,
+                        prefix[3] + TE,
+                        prefix[4] + TE
+                    ],
+                    ln = prefix.length,
+                    i = 0,
+                    out = false;
+
+                for (; i < ln; i++) {
+                    if (getStyle(div, prefix[i] + "TransitionProperty")) {
+                        Ext.supports.CSS3Prefix = prefix[i];
+                        Ext.supports.CSS3TransitionEnd = transitionEndName[i];
+                        out = true;
+                        break;
+                    }
+                }
+                return out;
+            }
+        },
+
+        /**
+         * @property RightMargin True if the device supports right margin.
+         * See https://bugs.webkit.org/show_bug.cgi?id=13343 for why this is needed.
+         * @type {Boolean}
+         */
+        {
+            identity: 'RightMargin',
+            fn: function(doc, div) {
+                var view = doc.defaultView;
+                return !(view && view.getComputedStyle(div.firstChild.firstChild, null).marginRight != '0px');
+            }
+        },
+
+        /**
+         * @property DisplayChangeInputSelectionBug True if INPUT elements lose their
+         * selection when their display style is changed. Essentially, if a text input
+         * has focus and its display style is changed, the I-beam disappears.
+         *
+         * This bug is encountered due to the work around in place for the {@link #RightMargin}
+         * bug. This has been observed in Safari 4.0.4 and older, and appears to be fixed
+         * in Safari 5. It's not clear if Safari 4.1 has the bug, but it has the same WebKit
+         * version number as Safari 5 (according to http://unixpapa.com/js/gecko.html).
+         */
+        {
+            identity: 'DisplayChangeInputSelectionBug',
+            early: true,
+            fn: function() {
+                var webKitVersion = Ext.webKitVersion;
+                // WebKit but older than Safari 5 or Chrome 6:
+                return 0 < webKitVersion && webKitVersion < 533;
+            }
+        },
+
+        /**
+         * @property DisplayChangeTextAreaSelectionBug True if TEXTAREA elements lose their
+         * selection when their display style is changed. Essentially, if a text area has
+         * focus and its display style is changed, the I-beam disappears.
+         *
+         * This bug is encountered due to the work around in place for the {@link #RightMargin}
+         * bug. This has been observed in Chrome 10 and Safari 5 and older, and appears to
+         * be fixed in Chrome 11.
+         */
+        {
+            identity: 'DisplayChangeTextAreaSelectionBug',
+            early: true,
+            fn: function() {
+                var webKitVersion = Ext.webKitVersion;
+
+                /*
+                Has bug w/textarea:
+
+                (Chrome) Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US)
+                            AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.127
+                            Safari/534.16
+                (Safari) Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us)
+                            AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5
+                            Safari/533.21.1
+
+                No bug:
+
+                (Chrome) Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7)
+                            AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.57
+                            Safari/534.24
+                */
+                return 0 < webKitVersion && webKitVersion < 534.24;
+            }
+        },
+
+        /**
+         * @property TransparentColor True if the device supports transparent color
+         * @type {Boolean}
+         */
+        {
+            identity: 'TransparentColor',
+            fn: function(doc, div, view) {
+                view = doc.defaultView;
+                return !(view && view.getComputedStyle(div.lastChild, null).backgroundColor != 'transparent');
+            }
+        },
+
+        /**
+         * @property ComputedStyle True if the browser supports document.defaultView.getComputedStyle()
+         * @type {Boolean}
+         */
+        {
+            identity: 'ComputedStyle',
+            fn: function(doc, div, view) {
+                view = doc.defaultView;
+                return view && view.getComputedStyle;
+            }
+        },
+
+        /**
+         * @property Svg True if the device supports SVG
+         * @type {Boolean}
+         */
+        {
+            identity: 'Svg',
+            fn: function(doc) {
+                return !!doc.createElementNS && !!doc.createElementNS( "http:/" + "/www.w3.org/2000/svg", "svg").createSVGRect;
+            }
+        },
+
+        /**
+         * @property Canvas True if the device supports Canvas
+         * @type {Boolean}
+         */
+        {
+            identity: 'Canvas',
+            fn: function(doc) {
+                return !!doc.createElement('canvas').getContext;
+            }
+        },
+
+        /**
+         * @property Vml True if the device supports VML
+         * @type {Boolean}
+         */
+        {
+            identity: 'Vml',
+            fn: function(doc) {
+                var d = doc.createElement("div");
+                d.innerHTML = "<!--[if vml]><br/><br/><![endif]-->";
+                return (d.childNodes.length == 2);
+            }
+        },
+
+        /**
+         * @property Float True if the device supports CSS float
+         * @type {Boolean}
+         */
+        {
+            identity: 'Float',
+            fn: function(doc, div) {
+                return !!div.lastChild.style.cssFloat;
+            }
+        },
+
+        /**
+         * @property AudioTag True if the device supports the HTML5 audio tag
+         * @type {Boolean}
+         */
+        {
+            identity: 'AudioTag',
+            fn: function(doc) {
+                return !!doc.createElement('audio').canPlayType;
+            }
+        },
+
+        /**
+         * @property History True if the device supports HTML5 history
+         * @type {Boolean}
+         */
+        {
+            identity: 'History',
+            fn: function() {
+                var history = window.history;
+                return !!(history && history.pushState);
+            }
+        },
+
+        /**
+         * @property CSS3DTransform True if the device supports CSS3DTransform
+         * @type {Boolean}
+         */
+        {
+            identity: 'CSS3DTransform',
+            fn: function() {
+                return (typeof WebKitCSSMatrix != 'undefined' && new WebKitCSSMatrix().hasOwnProperty('m41'));
+            }
+        },
+
+		/**
+         * @property CSS3LinearGradient True if the device supports CSS3 linear gradients
+         * @type {Boolean}
+         */
+        {
+            identity: 'CSS3LinearGradient',
+            fn: function(doc, div) {
+                var property = 'background-image:',
+                    webkit   = '-webkit-gradient(linear, left top, right bottom, from(black), to(white))',
+                    w3c      = 'linear-gradient(left top, black, white)',
+                    moz      = '-moz-' + w3c,
+                    ms       = '-ms-' + w3c,
+                    opera    = '-o-' + w3c,
+                    options  = [property + webkit, property + w3c, property + moz, property + ms, property + opera];
+
+                div.style.cssText = options.join(';');
+
+                return (("" + div.style.backgroundImage).indexOf('gradient') !== -1) && !Ext.isIE9;
+            }
+        },
+
+        /**
+         * @property CSS3BorderRadius True if the device supports CSS3 border radius
+         * @type {Boolean}
+         */
+        {
+            identity: 'CSS3BorderRadius',
+            fn: function(doc, div) {
+                var domPrefixes = ['borderRadius', 'BorderRadius', 'MozBorderRadius', 'WebkitBorderRadius', 'OBorderRadius', 'KhtmlBorderRadius'],
+                    pass = false,
+                    i;
+                for (i = 0; i < domPrefixes.length; i++) {
+                    if (document.body.style[domPrefixes[i]] !== undefined) {
+                        return true;
+                    }
+                }
+                return pass;
+            }
+        },
+
+        /**
+         * @property GeoLocation True if the device supports GeoLocation
+         * @type {Boolean}
+         */
+        {
+            identity: 'GeoLocation',
+            fn: function() {
+                // Use the in check for geolocation, see https://github.com/Modernizr/Modernizr/issues/513
+                return (typeof navigator != 'undefined' && 'geolocation' in navigator) || (typeof google != 'undefined' && typeof google.gears != 'undefined');
+            }
+        },
+        /**
+         * @property MouseEnterLeave True if the browser supports mouseenter and mouseleave events
+         * @type {Boolean}
+         */
+        {
+            identity: 'MouseEnterLeave',
+            fn: function(doc, div){
+                return ('onmouseenter' in div && 'onmouseleave' in div);
+            }
+        },
+        /**
+         * @property MouseWheel True if the browser supports the mousewheel event
+         * @type {Boolean}
+         */
+        {
+            identity: 'MouseWheel',
+            fn: function(doc, div) {
+                return ('onmousewheel' in div);
+            }
+        },
+        /**
+         * @property Opacity True if the browser supports normal css opacity
+         * @type {Boolean}
+         */
+        {
+            identity: 'Opacity',
+            fn: function(doc, div){
+                // Not a strict equal comparison in case opacity can be converted to a number.
+                if (Ext.isIE6 || Ext.isIE7 || Ext.isIE8) {
+                    return false;
+                }
+                div.firstChild.style.cssText = 'opacity:0.73';
+                return div.firstChild.style.opacity == '0.73';
+            }
+        },
+        /**
+         * @property Placeholder True if the browser supports the HTML5 placeholder attribute on inputs
+         * @type {Boolean}
+         */
+        {
+            identity: 'Placeholder',
+            fn: function(doc) {
+                return 'placeholder' in doc.createElement('input');
+            }
+        },
+
+        /**
+         * @property Direct2DBug True if when asking for an element's dimension via offsetWidth or offsetHeight,
+         * getBoundingClientRect, etc. the browser returns the subpixel width rounded to the nearest pixel.
+         * @type {Boolean}
+         */
+        {
+            identity: 'Direct2DBug',
+            fn: function() {
+                return Ext.isString(document.body.style.msTransformOrigin) && Ext.isIE10m;
+            }
+        },
+        /**
+         * @property BoundingClientRect True if the browser supports the getBoundingClientRect method on elements
+         * @type {Boolean}
+         */
+        {
+            identity: 'BoundingClientRect',
+            fn: function(doc, div) {
+                return Ext.isFunction(div.getBoundingClientRect);
+            }
+        },
+        /**
+         * @property RotatedBoundingClientRect True if the BoundingClientRect is
+         * rotated when the element is rotated using a CSS transform.
+         * @type {Boolean}
+         */
+        {
+            identity: 'RotatedBoundingClientRect',
+            fn: function() {
+                var body = document.body,
+                    supports = false,
+                    el = document.createElement('div'),
+                    style = el.style;
+
+                if (el.getBoundingClientRect) {
+                    style.WebkitTransform = style.MozTransform =
+                        style.OTransform = style.transform = 'rotate(90deg)';
+                    style.width = '100px';
+                    style.height = '30px';
+                    body.appendChild(el)
+
+                    supports = el.getBoundingClientRect().height !== 100;
+                    body.removeChild(el);
+                }
+               
+                return supports;
+            }
+        },
+        {
+            identity: 'IncludePaddingInWidthCalculation',
+            fn: function(doc, div){
+                return div.childNodes[1].firstChild.offsetWidth == 210;
+            }
+        },
+        {
+            identity: 'IncludePaddingInHeightCalculation',
+            fn: function(doc, div){
+                return div.childNodes[1].firstChild.offsetHeight == 210;
+            }
+        },
+
+        /**
+         * @property ArraySort True if the Array sort native method isn't bugged.
+         * @type {Boolean}
+         */
+        {
+            identity: 'ArraySort',
+            fn: function() {
+                var a = [1,2,3,4,5].sort(function(){ return 0; });
+                return a[0] === 1 && a[1] === 2 && a[2] === 3 && a[3] === 4 && a[4] === 5;
+            }
+        },
+        /**
+         * @property Range True if browser support document.createRange native method.
+         * @type {Boolean}
+         */
+        {
+            identity: 'Range',
+            fn: function() {
+                return !!document.createRange;
+            }
+        },
+        /**
+         * @property CreateContextualFragment True if browser support CreateContextualFragment range native methods.
+         * @type {Boolean}
+         */
+        {
+            identity: 'CreateContextualFragment',
+            fn: function() {
+                var range = Ext.supports.Range ? document.createRange() : false;
+
+                return range && !!range.createContextualFragment;
+            }
+        },
+
+        /**
+         * @property WindowOnError True if browser supports window.onerror.
+         * @type {Boolean}
+         */
+        {
+            identity: 'WindowOnError',
+            fn: function () {
+                // sadly, we cannot feature detect this...
+                return Ext.isIE || Ext.isGecko || Ext.webKitVersion >= 534.16; // Chrome 10+
+            }
+        },
+
+        /**
+         * @property TextAreaMaxLength True if the browser supports maxlength on textareas.
+         * @type {Boolean}
+         */
+        {
+            identity: 'TextAreaMaxLength',
+            fn: function(){
+                var el = document.createElement('textarea');
+                return ('maxlength' in el);
+            }
+        },
+        /**
+         * @property GetPositionPercentage True if the browser will return the left/top/right/bottom
+         * position as a percentage when explicitly set as a percentage value.
+         * @type {Boolean}
+         */
+        // Related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=707691#c7
+        {
+            identity: 'GetPositionPercentage',
+            fn: function(doc, div){
+               return getStyle(div.childNodes[2], 'left') == '10%';
+            }
+        },
+        /**
+         * @property {Boolean} PercentageHeightOverflowBug
+         * In some browsers (IE quirks, IE6, IE7, IE9, chrome, safari and opera at the time
+         * of this writing) a percentage-height element ignores the horizontal scrollbar
+         * of its parent element.  This method returns true if the browser is affected
+         * by this bug.
+         *
+         * @private
+         */
+        {
+            identity: 'PercentageHeightOverflowBug',
+            fn: function(doc) {
+                var hasBug = false,
+                    style, el;
+
+                if (Ext.getScrollbarSize().height) {
+                    // must have space-consuming scrollbars for bug to be possible
+                    el = doc.createElement('div');
+                    style = el.style;
+                    style.height = '50px';
+                    style.width = '50px';
+                    style.overflow = 'auto';
+                    style.position = 'absolute';
+                    
+                    el.innerHTML = [
+                        '<div style="display:table;height:100%;">',
+                            // The element that causes the horizontal overflow must be 
+                            // a child of the element with the 100% height, otherwise
+                            // horizontal overflow is not triggered in webkit quirks mode
+                            '<div style="width:51px;"></div>',
+                        '</div>'
+                    ].join('');
+                    doc.body.appendChild(el);
+                    if (el.firstChild.offsetHeight === 50) {
+                        hasBug = true;
+                    }
+                    doc.body.removeChild(el);
+                }
+                
+                return hasBug;
+            }
+        },
+        /**
+         * @property {Boolean} xOriginBug
+         * In Chrome 24.0, an RTL element which has vertical overflow positions its right X origin incorrectly.
+         * It skips a non-existent scrollbar which has been moved to the left edge due to the RTL setting.
+         *
+         * http://code.google.com/p/chromium/issues/detail?id=174656
+         *
+         * This method returns true if the browser is affected by this bug.
+         *
+         * @private
+         */
+        {
+            identity: 'xOriginBug',
+            fn: function(doc, div) {
+               div.innerHTML = '<div id="b1" style="height:100px;width:100px;direction:rtl;position:relative;overflow:scroll">' +
+                    '<div id="b2" style="position:relative;width:100%;height:20px;"></div>' +
+                    '<div id="b3" style="position:absolute;width:20px;height:20px;top:0px;right:0px"></div>' +
+                '</div>';
+
+                var outerBox = document.getElementById('b1').getBoundingClientRect(),
+                    b2 = document.getElementById('b2').getBoundingClientRect(),
+                    b3 = document.getElementById('b3').getBoundingClientRect();
+
+                return (b2.left !== outerBox.left && b3.right !== outerBox.right);
+            }
+        },
+
+        /**
+         * @property {Boolean} ScrollWidthInlinePaddingBug
+         * In some browsers the right padding of an overflowing element is not accounted
+         * for in its scrollWidth.  The result can vary depending on whether or not
+         * The element contains block-level children.  This method tests the effect
+         * of padding on scrollWidth when there are no block-level children inside the
+         * overflowing element.
+         * 
+         * This method returns true if the browser is affected by this bug.
+         */
+        {
+            identity: 'ScrollWidthInlinePaddingBug',
+            fn: function(doc) {
+                var hasBug = false,
+                    style, el;
+
+                el = doc.createElement('div');
+                style = el.style;
+                style.height = '50px';
+                style.width = '50px';
+                style.padding = '10px';
+                style.overflow = 'hidden';
+                style.position = 'absolute';
+                
+                el.innerHTML =
+                    '<span style="display:inline-block;zoom:1;height:60px;width:60px;"></span>';
+                doc.body.appendChild(el);
+                if (el.scrollWidth === 70) {
+                    hasBug = true;
+                }
+                doc.body.removeChild(el);
+                
+                return hasBug;
+            }
+        }
+    ]
+};
+}());
+
+Ext.supports.init(); // run the "early" detections now
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require ../Support.js
+// @define Ext.util.DelayedTask
+
+/**
+ * @class Ext.util.DelayedTask
+ * 
+ * The DelayedTask class provides a convenient way to "buffer" the execution of a method,
+ * performing setTimeout where a new timeout cancels the old timeout. When called, the
+ * task will wait the specified time period before executing. If durng that time period,
+ * the task is called again, the original call will be cancelled. This continues so that
+ * the function is only called a single time for each iteration.
+ * 
+ * This method is especially useful for things like detecting whether a user has finished
+ * typing in a text field. An example would be performing validation on a keypress. You can
+ * use this class to buffer the keypress events for a certain number of milliseconds, and
+ * perform only if they stop for that amount of time.  
+ * 
+ * ## Usage
+ * 
+ *     var task = new Ext.util.DelayedTask(function(){
+ *         alert(Ext.getDom('myInputField').value.length);
+ *     });
+ *     
+ *     // Wait 500ms before calling our function. If the user presses another key
+ *     // during that 500ms, it will be cancelled and we'll wait another 500ms.
+ *     Ext.get('myInputField').on('keypress', function() {
+ *         task.{@link #delay}(500);
+ *     });
+ * 
+ * Note that we are using a DelayedTask here to illustrate a point. The configuration
+ * option `buffer` for {@link Ext.util.Observable#addListener addListener/on} will
+ * also setup a delayed task for you to buffer events.
+ * 
+ * @constructor The parameters to this constructor serve as defaults and are not required.
+ * @param {Function} fn (optional) The default function to call. If not specified here, it must be specified during the {@link #delay} call.
+ * @param {Object} scope (optional) The default scope (The **`this`** reference) in which the
+ * function is called. If not specified, `this` will refer to the browser window.
+ * @param {Array} args (optional) The default Array of arguments.
+ * @param {Boolean} [cancelOnDelay=true] By default, each call to {@link #delay} cancels any pending invocation and reschedules a new
+ * invocation. Specifying this as `false` means that calls to {@link #delay} when an invocation is pending just update the call settings,
+ * `newDelay`, `newFn`, `newScope` or `newArgs`, whichever are passed.
+ */
+Ext.util.DelayedTask = function(fn, scope, args, cancelOnDelay) {
+    var me = this,
+        delay,
+        call = function() {
+            clearInterval(me.id);
+            me.id = null;
+            fn.apply(scope, args || []);
+            Ext.EventManager.idleEvent.fire();
+        };
+
+    cancelOnDelay = typeof cancelOnDelay === 'boolean' ? cancelOnDelay : true;
+
+    /**
+     * @property {Number} id
+     * The id of the currently pending invocation.  Will be set to `null` if there is no
+     * invocation pending.
+     */
+    me.id = null;
+
+    /**
+     * By default, cancels any pending timeout and queues a new one.
+     *
+     * If the `cancelOnDelay` parameter was specified as `false` in the constructor, this does not cancel and
+     * reschedule, but just updates the call settings, `newDelay`, `newFn`, `newScope` or `newArgs`, whichever are passed.
+     *
+     * @param {Number} newDelay The milliseconds to delay
+     * @param {Function} newFn (optional) Overrides function passed to constructor
+     * @param {Object} newScope (optional) Overrides scope passed to constructor. Remember that if no scope
+     * is specified, <code>this</code> will refer to the browser window.
+     * @param {Array} newArgs (optional) Overrides args passed to constructor
+     */
+    me.delay = function(newDelay, newFn, newScope, newArgs) {
+        if (cancelOnDelay) {
+            me.cancel();
+        }
+        delay = newDelay || delay,
+        fn    = newFn    || fn;
+        scope = newScope || scope;
+        args  = newArgs  || args;
+        if (!me.id) {
+            me.id = setInterval(call, delay);
+        }
+    };
+
+    /**
+     * Cancel the last queued timeout
+     */
+    me.cancel = function() {
+        if (me.id) {
+            clearInterval(me.id);
+            me.id = null;
+        }
+    };
+};
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ * Represents single event type that an Observable object listens to.
+ * All actual listeners are tracked inside here.  When the event fires,
+ * it calls all the registered listener functions.
+ *
+ * @private
+ */
+Ext.define('Ext.util.Event', function() {
+  var arraySlice = Array.prototype.slice,
+      arrayInsert = Ext.Array.insert,
+      toArray = Ext.Array.toArray,
+      DelayedTask = Ext.util.DelayedTask;
+
+  return {
+                                     
+
+    /**
+     * @property {Boolean} isEvent
+     * `true` in this class to identify an object as an instantiated Event, or subclass thereof.
+     */
+    isEvent: true,
+    
+    // Private. Event suspend count
+    suspended: 0,
+
+    noOptions: {},
+
+    constructor: function(observable, name) {
+        this.name = name;
+        this.observable = observable;
+        this.listeners = [];
+    },
+
+    addListener: function(fn, scope, options) {
+        var me = this,
+            listeners, listener, priority, isNegativePriority, highestNegativePriorityIndex,
+            hasNegativePriorityIndex, length, index, i, listenerPriority;
+
+        scope = scope || me.observable;
+
+        if (!fn) {
+            Ext.Error.raise({
+                sourceClass: Ext.getClassName(this.observable),
+                sourceMethod: "addListener",
+                msg: "The specified callback function is undefined"
+            });
+        }
+
+        if (!me.isListening(fn, scope)) {
+            listener = me.createListener(fn, scope, options);
+            if (me.firing) {
+                // if we are currently firing this event, don't disturb the listener loop
+                me.listeners = me.listeners.slice(0);
+            }
+            listeners = me.listeners;
+            index = length = listeners.length;
+            priority = options && options.priority;
+            highestNegativePriorityIndex = me._highestNegativePriorityIndex;
+            hasNegativePriorityIndex = (highestNegativePriorityIndex !== undefined);
+            if (priority) {
+                // Find the index at which to insert the listener into the listeners array,
+                // sorted by priority highest to lowest.
+                isNegativePriority = (priority < 0);
+                if (!isNegativePriority || hasNegativePriorityIndex) {
+                    // If the priority is a positive number, or if it is a negative number
+                    // and there are other existing negative priority listenrs, then we
+                    // need to calcuate the listeners priority-order index.
+                    // If the priority is a negative number, begin the search for priority
+                    // order index at the index of the highest existing negative priority
+                    // listener, otherwise begin at 0
+                    for(i = (isNegativePriority ? highestNegativePriorityIndex : 0); i < length; i++) {
+                        // Listeners created without options will have no "o" property
+                        listenerPriority = listeners[i].o ? listeners[i].o.priority||0 : 0;
+                        if (listenerPriority < priority) {
+                            index = i;
+                            break;
+                        }
+                    }
+                } else {
+                    // if the priority is a negative number, and there are no other negative
+                    // priority listeners, then no calculation is needed - the negative
+                    // priority listener gets appended to the end of the listeners array.
+                    me._highestNegativePriorityIndex = index;
+                }
+            } else if (hasNegativePriorityIndex) {
+                // listeners with a priority of 0 or undefined are appended to the end of
+                // the listeners array unless there are negative priority listeners in the
+                // listeners array, then they are inserted before the highest negative
+                // priority listener.
+                index = highestNegativePriorityIndex;
+            }
+
+            if (!isNegativePriority && index <= highestNegativePriorityIndex) {
+                me._highestNegativePriorityIndex ++;
+            }
+            if (index === length) {
+                me.listeners[length] = listener;
+            } else {
+                arrayInsert(me.listeners, index, [listener]);
+            }
+        }
+    },
+
+    createListener: function(fn, scope, o) {
+        scope = scope || this.observable;
+
+        var me = this,
+            listener = {
+                fn: fn,
+                scope: scope,
+                ev: me
+            },
+            handler = fn;
+
+        // The order is important. The 'single' wrapper must be wrapped by the 'buffer' and 'delayed' wrapper
+        // because the event removal that the single listener does destroys the listener's DelayedTask(s)
+        if (o) {
+            listener.o = o;
+            if (o.single) {
+                handler = me.createSingle(handler, listener, o, scope);
+            }
+            if (o.target) {
+                handler = me.createTargeted(handler, listener, o, scope);
+            }
+            if (o.delay) {
+                handler = me.createDelayed(handler, listener, o, scope);
+            }
+            if (o.buffer) {
+                handler = me.createBuffered(handler, listener, o, scope);
+            }
+        }
+
+        listener.fireFn = handler;
+        return listener;
+    },
+
+    findListener: function(fn, scope) {
+        var listeners = this.listeners,
+        i = listeners.length,
+        listener,
+        s;
+
+        while (i--) {
+            listener = listeners[i];
+            if (listener) {
+                s = listener.scope;
+
+                // Compare the listener's scope with *JUST THE PASSED SCOPE* if one is passed, and only fall back to the owning Observable if none is passed.
+                // We cannot use the test (s == scope || s == this.observable)
+                // Otherwise, if the Observable itself adds Ext.emptyFn as a listener, and then Ext.emptyFn is added under another scope, there will be a false match.
+                if (listener.fn == fn && (s == (scope || this.observable))) {
+                    return i;
+                }
+            }
+        }
+
+        return - 1;
+    },
+
+    isListening: function(fn, scope) {
+        return this.findListener(fn, scope) !== -1;
+    },
+
+    removeListener: function(fn, scope) {
+        var me = this,
+            index,
+            listener,
+            highestNegativePriorityIndex,
+            k;
+        index = me.findListener(fn, scope);
+        if (index != -1) {
+            listener = me.listeners[index];
+            highestNegativePriorityIndex = me._highestNegativePriorityIndex;
+
+            if (me.firing) {
+                me.listeners = me.listeners.slice(0);
+            }
+
+            // cancel and remove a buffered handler that hasn't fired yet
+            if (listener.task) {
+                listener.task.cancel();
+                delete listener.task;
+            }
+
+            // cancel and remove all delayed handlers that haven't fired yet
+            k = listener.tasks && listener.tasks.length;
+            if (k) {
+                while (k--) {
+                    listener.tasks[k].cancel();
+                }
+                delete listener.tasks;
+            }
+
+            // Remove this listener from the listeners array
+            // We can use splice directly. The IE8 bug which Ext.Array works around only affects *insertion*
+            // http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/6e946d03-e09f-4b22-a4dd-cd5e276bf05a/
+            me.listeners.splice(index, 1);
+
+            // if the listeners array contains negative priority listeners, adjust the
+            // internal index if needed.
+            if (highestNegativePriorityIndex) {
+                if (index < highestNegativePriorityIndex) {
+                    me._highestNegativePriorityIndex --;
+                } else if (index === highestNegativePriorityIndex && index === me.listeners.length) {
+                    delete me._highestNegativePriorityIndex;
+                }
+            }
+            return true;
+        }
+
+        return false;
+    },
+
+    // Iterate to stop any buffered/delayed events
+    clearListeners: function() {
+        var listeners = this.listeners,
+            i = listeners.length;
+
+        while (i--) {
+            this.removeListener(listeners[i].fn, listeners[i].scope);
+        }
+    },
+
+    suspend: function() {
+        this.suspended += 1;
+    },
+
+    resume: function() {
+        if (this.suspended) {
+            this.suspended--;
+        }
+    },
+
+    fire: function() {
+        var me = this,
+            listeners = me.listeners,
+            count = listeners.length,
+            i,
+            args,
+            listener,
+            len;
+
+        if (!me.suspended && count > 0) {
+            me.firing = true;
+            args = arguments.length ? arraySlice.call(arguments, 0) : []
+            len = args.length;
+            for (i = 0; i < count; i++) {
+                listener = listeners[i];
+                if (listener.o) {
+                    args[len] = listener.o;
+                }
+                if (listener && listener.fireFn.apply(listener.scope || me.observable, args) === false) {
+                    return (me.firing = false);
+                }
+            }
+        }
+        me.firing = false;
+        return true;
+    },
+
+    createTargeted: function (handler, listener, o, scope) {
+        return function(){
+            if (o.target === arguments[0]){
+                handler.apply(scope, arguments);
+            }
+        };
+    },
+
+    createBuffered: function (handler, listener, o, scope) {
+        listener.task = new DelayedTask();
+        return function() {
+            listener.task.delay(o.buffer, handler, scope, toArray(arguments));
+        };
+    },
+
+    createDelayed: function (handler, listener, o, scope) {
+        return function() {
+            var task = new DelayedTask();
+            if (!listener.tasks) {
+                listener.tasks = [];
+            }
+            listener.tasks.push(task);
+            task.delay(o.delay || 10, handler, scope, toArray(arguments));
+        };
+    },
+
+    createSingle: function (handler, listener, o, scope) {
+        return function() {
+            var event = listener.ev;
+
+            if (event.removeListener(listener.fn, scope) && event.observable) {
+                // Removing from a regular Observable-owned, named event (not an anonymous
+                // event such as Ext's readyEvent): Decrement the listeners count
+                event.observable.hasListeners[event.name]--;
+            }
+
+            return handler.apply(scope, arguments);
+        };
+    }
+  };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require util/Event.js
+// @define Ext.EventManager
+
+/**
+ * @class Ext.EventManager
+ * Registers event handlers that want to receive a normalized EventObject instead of the standard browser event and provides
+ * several useful events directly.
+ *
+ * See {@link Ext.EventObject} for more details on normalized event objects.
+ * @singleton
+ */
+Ext.EventManager = new function() {
+    var EventManager = this,
+        doc = document,
+        win = window,
+        escapeRx = /\\/g,
+        prefix = Ext.baseCSSPrefix,
+        // IE9strict addEventListener has some issues with using synthetic events
+        supportsAddEventListener = !Ext.isIE9 && 'addEventListener' in doc,
+        readyEvent,
+        initExtCss = function() {
+            // find the body element
+            var bd = doc.body || doc.getElementsByTagName('body')[0],
+                cls = [prefix + 'body'],
+                htmlCls = [],
+                supportsLG = Ext.supports.CSS3LinearGradient,
+                supportsBR = Ext.supports.CSS3BorderRadius,
+                html;
+
+            if (!bd) {
+                return false;
+            }
+
+            html = bd.parentNode;
+
+            function add (c) {
+                cls.push(prefix + c);
+            }
+
+            //Let's keep this human readable!
+            if (Ext.isIE && Ext.isIE9m) {
+                add('ie');
+
+                // very often CSS needs to do checks like "IE7+" or "IE6 or 7". To help
+                // reduce the clutter (since CSS/SCSS cannot do these tests), we add some
+                // additional classes:
+                //
+                //      x-ie7p      : IE7+      :  7 <= ieVer
+                //      x-ie7m      : IE7-      :  ieVer <= 7
+                //      x-ie8p      : IE8+      :  8 <= ieVer
+                //      x-ie8m      : IE8-      :  ieVer <= 8
+                //      x-ie9p      : IE9+      :  9 <= ieVer
+                //      x-ie78      : IE7 or 8  :  7 <= ieVer <= 8
+                //
+                if (Ext.isIE6) {
+                    add('ie6');
+                } else { // ignore pre-IE6 :)
+                    add('ie7p');
+
+                    if (Ext.isIE7) {
+                        add('ie7');
+                    } else {
+                        add('ie8p');
+
+                        if (Ext.isIE8) {
+                            add('ie8');
+                        } else {
+                            add('ie9p');
+
+                            if (Ext.isIE9) {
+                                add('ie9');
+                            }
+                        }
+                    }
+                }
+
+                if (Ext.isIE7m) {
+                    add('ie7m');
+                }
+                if (Ext.isIE8m) {
+                    add('ie8m');
+                }
+                if (Ext.isIE9m) {
+                    add('ie9m');
+                }
+                if (Ext.isIE7 || Ext.isIE8) {
+                    add('ie78');
+                }
+            }
+            
+            if (Ext.isIE10) {
+                add('ie10');
+            }
+            
+            if (Ext.isGecko) {
+                add('gecko');
+                if (Ext.isGecko3) {
+                    add('gecko3');
+                }
+                if (Ext.isGecko4) {
+                    add('gecko4');
+                }
+                if (Ext.isGecko5) {
+                    add('gecko5');
+                }
+            }
+            if (Ext.isOpera) {
+                add('opera');
+            }
+            if (Ext.isWebKit) {
+                add('webkit');
+            }
+            if (Ext.isSafari) {
+                add('safari');
+                if (Ext.isSafari2) {
+                    add('safari2');
+                }
+                if (Ext.isSafari3) {
+                    add('safari3');
+                }
+                if (Ext.isSafari4) {
+                    add('safari4');
+                }
+                if (Ext.isSafari5) {
+                    add('safari5');
+                }
+                if (Ext.isSafari5_0) {
+                    add('safari5_0')
+                }
+            }
+            if (Ext.isChrome) {
+                add('chrome');
+            }
+            if (Ext.isMac) {
+                add('mac');
+            }
+            if (Ext.isLinux) {
+                add('linux');
+            }
+            if (!supportsBR) {
+                add('nbr');
+            }
+            if (!supportsLG) {
+                add('nlg');
+            }
+
+            // add to the parent to allow for selectors x-strict x-border-box, also set the isBorderBox property correctly
+            if (html) {
+                if (Ext.isStrict && (Ext.isIE6 || Ext.isIE7)) {
+                    Ext.isBorderBox = false;
+                }
+                else {
+                    Ext.isBorderBox = true;
+                }
+
+                if(!Ext.isBorderBox) {
+                    htmlCls.push(prefix + 'content-box');
+                }
+                if (Ext.isStrict) {
+                    htmlCls.push(prefix + 'strict');
+                } else {
+                    htmlCls.push(prefix + 'quirks');
+                }
+                Ext.fly(html, '_internal').addCls(htmlCls);
+            }
+
+            Ext.fly(bd, '_internal').addCls(cls);
+            return true;
+        };
+
+    Ext.apply(EventManager, {
+        /**
+         * Check if we have bound our global onReady listener
+         * @private
+         */
+        hasBoundOnReady: false,
+
+        /**
+         * Check if fireDocReady has been called
+         * @private
+         */
+        hasFiredReady: false,
+
+        /**
+         * Additionally, allow the 'DOM' listener thread to complete (usually desirable with mobWebkit, Gecko)
+         * before firing the entire onReady chain (high stack load on Loader) by specifying a delay value.
+         * Defaults to 1ms.
+         * @private
+         */
+        deferReadyEvent : 1,
+
+        /*
+         * diags: a list of event names passed to onReadyEvent (in chron order)
+         * @private
+         */
+        onReadyChain : [],
+
+        /**
+         * Holds references to any onReady functions
+         * @private
+         */
+        readyEvent:
+            (function () {
+                readyEvent = new Ext.util.Event();
+                readyEvent.fire = function () {
+                    Ext._beforeReadyTime = Ext._beforeReadyTime || new Date().getTime();
+                    readyEvent.self.prototype.fire.apply(readyEvent, arguments);
+                    Ext._afterReadytime = new Date().getTime();
+                };
+                return readyEvent;
+            }()),
+
+        /**
+         * Fires when an event handler finishes its run, just before returning to browser control.
+         * 
+         * This includes DOM event handlers, Ajax (including JSONP) event handlers, and {@link Ext.util.TaskRunner TaskRunners}
+         * 
+         * This can be useful for performing cleanup, or update tasks which need to happen only
+         * after all code in an event handler has been run, but which should not be executed in a timer
+         * due to the intervening browser reflow/repaint which would take place.
+         *
+         */
+        idleEvent: new Ext.util.Event(),
+
+        /**
+         * detects whether the EventManager has been placed in a paused state for synchronization
+         * with external debugging / perf tools (PageAnalyzer)
+         * @private
+         */
+        isReadyPaused: function(){
+            return (/[?&]ext-pauseReadyFire\b/i.test(location.search) && !Ext._continueFireReady);
+        },
+
+        /**
+         * Binds the appropriate browser event for checking if the DOM has loaded.
+         * @private
+         */
+        bindReadyEvent: function() {
+            if (EventManager.hasBoundOnReady) {
+                return;
+            }
+
+            // Test scenario where Core is dynamically loaded AFTER window.load
+            if ( doc.readyState == 'complete'  ) {  // Firefox4+ got support for this state, others already do.
+                EventManager.onReadyEvent({
+                    type: doc.readyState || 'body'
+                });
+            } else {
+                doc.addEventListener('DOMContentLoaded', EventManager.onReadyEvent, false);
+                win.addEventListener('load', EventManager.onReadyEvent, false);
+                EventManager.hasBoundOnReady = true;
+            }
+        },
+
+        onReadyEvent : function(e) {
+            if (e && e.type) {
+                EventManager.onReadyChain.push(e.type);
+            }
+
+            if (EventManager.hasBoundOnReady) {
+                doc.removeEventListener('DOMContentLoaded', EventManager.onReadyEvent, false);
+                win.removeEventListener('load', EventManager.onReadyEvent, false);
+            }
+
+            if (!Ext.isReady) {
+                EventManager.fireDocReady();
+            }
+        },
+
+        /**
+         * We know the document is loaded, so trigger any onReady events.
+         * @private
+         */
+        fireDocReady: function() {
+            if (!Ext.isReady) {
+                Ext._readyTime = new Date().getTime();
+                Ext.isReady = true;
+
+                Ext.supports.init();
+                EventManager.onWindowUnload();
+                readyEvent.onReadyChain = EventManager.onReadyChain;    //diags report
+
+                if (Ext.isNumber(EventManager.deferReadyEvent)) {
+                    Ext.Function.defer(EventManager.fireReadyEvent, EventManager.deferReadyEvent);
+                    EventManager.hasDocReadyTimer = true;
+                } else {
+                    EventManager.fireReadyEvent();
+                }
+            }
+        },
+
+        /**
+         * Fires the ready event
+         * @private
+         */
+        fireReadyEvent: function() {
+
+            // Unset the timer flag here since other onReady events may be
+            // added during the fire() call and we don't want to block them
+            EventManager.hasDocReadyTimer = false;
+            EventManager.isFiring = true;
+
+            // Ready events are all single: true, if we get to the end
+            // & there are more listeners, it means they were added
+            // inside some other ready event
+            while (readyEvent.listeners.length && !EventManager.isReadyPaused()) {
+                readyEvent.fire();
+            }
+            EventManager.isFiring = false;
+            EventManager.hasFiredReady = true;
+            Ext.EventManager.idleEvent.fire();
+        },
+
+        /**
+         * Adds a listener to be notified when the document is ready (before onload and before images are loaded).
+         *
+         * {@link Ext#onDocumentReady} is an alias for {@link Ext.EventManager#onDocumentReady}.
+         *
+         * @param {Function} fn The method the event invokes.
+         * @param {Object} [scope] The scope (`this` reference) in which the handler function executes.
+         * Defaults to the browser window.
+         * @param {Object} [options] Options object as passed to {@link Ext.Element#addListener}.
+         */
+        onDocumentReady: function(fn, scope, options) {
+            options = options || {};
+            // force single, only ever fire it once
+            options.single = true;
+            readyEvent.addListener(fn, scope, options);
+
+            // If we're in the middle of firing, or we have a deferred timer
+            // pending, drop out since the event will be fired  later
+            if (!(EventManager.isFiring || EventManager.hasDocReadyTimer)) {
+                if (Ext.isReady) {
+                    EventManager.fireReadyEvent();
+                } else {
+                    EventManager.bindReadyEvent();
+                }
+            }
+        },
+
+        // --------------------- event binding ---------------------
+
+        /**
+         * Contains a list of all document mouse downs, so we can ensure they fire even when stopEvent is called.
+         * @private
+         */
+        stoppedMouseDownEvent: new Ext.util.Event(),
+
+        /**
+         * Options to parse for the 4th argument to addListener.
+         * @private
+         */
+        propRe: /^(?:scope|delay|buffer|single|stopEvent|preventDefault|stopPropagation|normalized|args|delegate|freezeEvent)$/,
+
+        /**
+         * Get the id of the element. If one has not been assigned, automatically assign it.
+         * @param {HTMLElement/Ext.Element} element The element to get the id for.
+         * @return {String} id
+         */
+        getId : function(element) {
+            var id;
+
+            element = Ext.getDom(element);
+
+            if (element === doc || element === win) {
+                id = element === doc ? Ext.documentId : Ext.windowId;
+            }
+            else {
+                id = Ext.id(element);
+            }
+
+            if (!Ext.cache[id]) {
+                Ext.addCacheEntry(id, null, element);
+            }
+
+            return id;
+        },
+
+        /**
+         * Convert a "config style" listener into a set of flat arguments so they can be passed to addListener
+         * @private
+         * @param {Object} element The element the event is for
+         * @param {Object} event The event configuration
+         * @param {Object} isRemove True if a removal should be performed, otherwise an add will be done.
+         */
+        prepareListenerConfig: function(element, config, isRemove) {
+            var propRe = EventManager.propRe,
+                key, value, args;
+
+            // loop over all the keys in the object
+            for (key in config) {
+                if (config.hasOwnProperty(key)) {
+                    // if the key is something else then an event option
+                    if (!propRe.test(key)) {
+                        value = config[key];
+                        // if the value is a function it must be something like click: function() {}, scope: this
+                        // which means that there might be multiple event listeners with shared options
+                        if (typeof value == 'function') {
+                            // shared options
+                            args = [element, key, value, config.scope, config];
+                        } else {
+                            // if its not a function, it must be an object like click: {fn: function() {}, scope: this}
+                            args = [element, key, value.fn, value.scope, value];
+                        }
+
+                        if (isRemove) {
+                            EventManager.removeListener.apply(EventManager, args);
+                        } else {
+                            EventManager.addListener.apply(EventManager, args);
+                        }
+                    }
+                }
+            }
+        },
+
+        mouseEnterLeaveRe: /mouseenter|mouseleave/,
+
+        /**
+         * Normalize cross browser event differences
+         * @private
+         * @param {Object} eventName The event name
+         * @param {Object} fn The function to execute
+         * @return {Object} The new event name/function
+         */
+        normalizeEvent: function(eventName, fn) {
+            if (EventManager.mouseEnterLeaveRe.test(eventName) && !Ext.supports.MouseEnterLeave) {
+                if (fn) {
+                    fn = Ext.Function.createInterceptor(fn, EventManager.contains);
+                }
+                eventName = eventName == 'mouseenter' ? 'mouseover' : 'mouseout';
+            } else if (eventName == 'mousewheel' && !Ext.supports.MouseWheel && !Ext.isOpera) {
+                eventName = 'DOMMouseScroll';
+            }
+            return {
+                eventName: eventName,
+                fn: fn
+            };
+        },
+
+        /**
+         * Checks whether the event's relatedTarget is contained inside (or <b>is</b>) the element.
+         * @private
+         * @param {Object} event
+         */
+        contains: function(event) {
+            event = event.browserEvent || event;
+            var parent = event.currentTarget,
+                child = EventManager.getRelatedTarget(event);
+
+            if (parent && parent.firstChild) {
+                while (child) {
+                    if (child === parent) {
+                        return false;
+                    }
+                    child = child.parentNode;
+                    if (child && (child.nodeType != 1)) {
+                        child = null;
+                    }
+                }
+            }
+            return true;
+        },
+
+        /**
+         * Appends an event handler to an element.  The shorthand version {@link #on} is equivalent.
+         * Typically you will use {@link Ext.Element#addListener} directly on an Element in favor of
+         * calling this version.
+         * 
+         * {@link Ext.EventManager#on} is an alias for {@link Ext.EventManager#addListener}.
+         *
+         * @param {String/Ext.Element/HTMLElement/Window} el The html element or id to assign the event handler to.
+         *
+         * @param {String} eventName The name of the event to listen for.
+         *
+         * @param {Function/String} handler The handler function the event invokes. A String parameter
+         * is assumed to be method name in `scope` object, or Element object if no scope is provided.
+         * @param {Ext.EventObject} handler.event The {@link Ext.EventObject EventObject} describing the event.
+         * @param {Ext.dom.Element} handler.target The Element which was the target of the event.
+         * Note that this may be filtered by using the `delegate` option.
+         * @param {Object} handler.options The options object from the addListener call.
+         *
+         * @param {Object} [scope] The scope (`this` reference) in which the handler function is executed.
+         * Defaults to the Element.
+         *
+         * @param {Object} [options] An object containing handler configuration properties.
+         * This may contain any of the following properties (See {@link Ext.Element#addListener}
+         * for examples of how to use these options.):
+         * @param {Object} options.scope The scope (`this` reference) in which the handler function is executed. Defaults to the Element.
+         * @param {String} options.delegate A simple selector to filter the target or look for a descendant of the target
+         * @param {Boolean} options.stopEvent True to stop the event. That is stop propagation, and prevent the default action.
+         * @param {Boolean} options.preventDefault True to prevent the default action
+         * @param {Boolean} options.stopPropagation True to prevent event propagation
+         * @param {Boolean} options.normalized False to pass a browser event to the handler function instead of an Ext.EventObject
+         * @param {Number} options.delay The number of milliseconds to delay the invocation of the handler after te event fires.
+         * @param {Boolean} options.single True to add a handler to handle just the next firing of the event, and then remove itself.
+         * @param {Number} options.buffer Causes the handler to be scheduled to run in an {@link Ext.util.DelayedTask} delayed
+         * by the specified number of milliseconds. If the event fires again within that time, the original
+         * handler is *not* invoked, but the new handler is scheduled in its place.
+         * @param {Ext.dom.Element} options.target Only call the handler if the event was fired on the target Element,
+         * *not* if the event was bubbled up from a child node.
+         */
+        addListener: function(element, eventName, fn, scope, options) {
+            // Check if we've been passed a "config style" event.
+            if (typeof eventName !== 'string') {
+                EventManager.prepareListenerConfig(element, eventName);
+                return;
+            }
+
+            var dom = element.dom || Ext.getDom(element),
+                hasAddEventListener, bind, wrap, cache, id, cacheItem, capture;
+            
+            if (typeof fn === 'string') {
+                fn = Ext.resolveMethod(fn, scope || element);
+            }
+
+            if (!fn) {
+                Ext.Error.raise({
+                    sourceClass: 'Ext.EventManager',
+                    sourceMethod: 'addListener',
+                    targetElement: element,
+                    eventName: eventName,
+                    msg: 'Error adding "' + eventName + '\" listener. The handler function is undefined.'
+                });
+            }
+
+            // create the wrapper function
+            options = options || {};
+
+            bind = EventManager.normalizeEvent(eventName, fn);
+            wrap = EventManager.createListenerWrap(dom, eventName, bind.fn, scope, options);
+            
+            // add all required data into the event cache
+            cache = EventManager.getEventListenerCache(element.dom ? element : dom, eventName);
+            eventName = bind.eventName;
+
+            // In IE9 we prefer to use attachEvent but it's not available for some Elements (SVG)
+            hasAddEventListener = supportsAddEventListener || (Ext.isIE9 && !dom.attachEvent);
+            
+            if (!hasAddEventListener) {
+                id = EventManager.normalizeId(dom);
+                // If there's no id we don't have any events bound, so we never
+                // need to clone at this point.
+                if (id) {
+                    cacheItem = Ext.cache[id][eventName];
+                    if (cacheItem && cacheItem.firing) {
+                        // If we're in the middle of firing we want to update the class
+                        // cache reference so it is different to the array we referenced
+                        // when we started firing the event. Though this is a more difficult
+                        // way of not mutating the collection while firing, a vast majority of
+                        // the time we won't be adding listeners for the same element/event type
+                        // while firing the same event.
+                        cache = EventManager.cloneEventListenerCache(dom, eventName);
+                    }
+                }
+            }
+
+            capture = !!options.capture;
+            cache.push({
+                fn: fn,
+                wrap: wrap,
+                scope: scope,
+                capture: capture 
+            });
+
+            if (!hasAddEventListener) {
+                // If cache length is 1, it means we're binding the first event
+                // for this element for this type
+                if (cache.length === 1) {
+                    id = EventManager.normalizeId(dom, true);
+                    fn = Ext.Function.bind(EventManager.handleSingleEvent, EventManager, [id, eventName], true);
+                    Ext.cache[id][eventName] = {
+                        firing: false,
+                        fn: fn
+                    };
+                    dom.attachEvent('on' + eventName, fn);
+                }
+            } else {
+                dom.addEventListener(eventName, wrap, capture);
+            }
+
+            if (dom == doc && eventName == 'mousedown') {
+                EventManager.stoppedMouseDownEvent.addListener(wrap);
+            }
+        },
+        
+        // Handle the case where the window/document already has an id attached.
+        // In this case we still want to return our custom window/doc id.
+        normalizeId: function(dom, force) {
+            var id;
+            if (dom === document) {
+                id = Ext.documentId;
+            } else if (dom === window) {
+                id = Ext.windowId;
+            } else {
+                id = dom.id;
+            }
+            if (!id && force) {
+                id = EventManager.getId(dom);
+            }
+            return id;
+        },
+        
+        handleSingleEvent: function(e, id, eventName) {
+            // Don't create a copy here, since we fire lots of events and it's likely
+            // that we won't add an event during a fire. Instead, we'll handle this during
+            // the process of adding events 
+            var listenerCache = EventManager.getEventListenerCache(id, eventName),
+                attachItem = Ext.cache[id][eventName],
+                len, i;
+                
+            // Typically this will never occur, however, the framework allows the creation
+            // of synthetic events in Ext.EventObject. As such, it makes it possible to fire
+            // off the same event on the same element during this method.
+            if (attachItem.firing) {
+                return;
+            }
+                
+            attachItem.firing = true;
+            for (i = 0, len = listenerCache.length; i < len; ++i) {
+                listenerCache[i].wrap(e);
+            }
+            attachItem.firing = false;
+            
+        },
+
+        /**
+         * Removes an event handler from an element.  The shorthand version {@link #un} is equivalent.  Typically
+         * you will use {@link Ext.Element#removeListener} directly on an Element in favor of calling this version.
+         *
+         * {@link Ext.EventManager#on} is an alias for {@link Ext.EventManager#addListener}.
+         *
+         * @param {String/Ext.Element/HTMLElement/Window} el The id or html element from which to remove the listener.
+         * @param {String} eventName The name of the event.
+         * @param {Function} fn The handler function to remove. **This must be a reference to the function passed
+         * into the {@link #addListener} call.**
+         * @param {Object} scope If a scope (`this` reference) was specified when the listener was added,
+         * then this must refer to the same object.
+         */
+        removeListener : function(element, eventName, fn, scope) {
+            // handle our listener config object syntax
+            if (typeof eventName !== 'string') {
+                EventManager.prepareListenerConfig(element, eventName, true);
+                return;
+            }
+
+            var dom = Ext.getDom(element),
+                id, el = element.dom ? element : Ext.get(dom),
+                cache = EventManager.getEventListenerCache(el, eventName),
+                bindName = EventManager.normalizeEvent(eventName).eventName,
+                i = cache.length, j, cacheItem, hasRemoveEventListener,
+                listener, wrap;
+                
+            if (!dom) {
+                return;
+            }
+
+            // In IE9 we prefer to use detachEvent but it's not available for some Elements (SVG)
+            hasRemoveEventListener = supportsAddEventListener || (Ext.isIE9 && !dom.detachEvent);
+            
+            if (typeof fn === 'string') {
+                fn = Ext.resolveMethod(fn, scope || element);
+            }
+
+            while (i--) {
+                listener = cache[i];
+
+                if (listener && (!fn || listener.fn == fn) && (!scope || listener.scope === scope)) {
+                    wrap = listener.wrap;
+
+                    // clear buffered calls
+                    if (wrap.task) {
+                        clearTimeout(wrap.task);
+                        delete wrap.task;
+                    }
+
+                    // clear delayed calls
+                    j = wrap.tasks && wrap.tasks.length;
+                    if (j) {
+                        while (j--) {
+                            clearTimeout(wrap.tasks[j]);
+                        }
+                        delete wrap.tasks;
+                    }
+
+                    if (!hasRemoveEventListener) {
+                        // if length is 1, we're removing the final event, actually
+                        // unbind it from the element
+                        id = EventManager.normalizeId(dom, true);
+                        cacheItem = Ext.cache[id][bindName];
+                        if (cacheItem && cacheItem.firing) {
+                            // See code in addListener for why we create a copy
+                            cache = EventManager.cloneEventListenerCache(dom, bindName);
+                        }
+                        
+                        if (cache.length === 1) {
+                            fn = cacheItem.fn;
+                            delete Ext.cache[id][bindName];
+                            dom.detachEvent('on' + bindName, fn);
+                        }
+                    } else {
+                        dom.removeEventListener(bindName, wrap, listener.capture);
+                    }
+
+                    if (wrap && dom == doc && eventName == 'mousedown') {
+                        EventManager.stoppedMouseDownEvent.removeListener(wrap);
+                    }
+
+                    // remove listener from cache
+                    Ext.Array.erase(cache, i, 1);
+                }
+            }
+        },
+
+        /**
+         * Removes all event handers from an element.  Typically you will use {@link Ext.Element#removeAllListeners}
+         * directly on an Element in favor of calling this version.
+         * @param {String/Ext.Element/HTMLElement/Window} el The id or html element from which to remove all event handlers.
+         */
+        removeAll : function(element) {
+            var id = (typeof element === 'string') ? element : element.id,
+                cache, events, eventName;
+
+            // If the element does not have an ID or a cache entry for its ID, then this is a no-op
+            if (id && (cache = Ext.cache[id])) {
+                events = cache.events;
+    
+                for (eventName in events) {
+                    if (events.hasOwnProperty(eventName)) {
+                        EventManager.removeListener(element, eventName);
+                    }
+                }
+                cache.events = {};
+             }
+        },
+
+        /**
+         * Recursively removes all previous added listeners from an element and its children. Typically you will use {@link Ext.Element#purgeAllListeners}
+         * directly on an Element in favor of calling this version.
+         * @param {String/Ext.Element/HTMLElement/Window} el The id or html element from which to remove all event handlers.
+         * @param {String} eventName (optional) The name of the event.
+         */
+        purgeElement : function(element, eventName) {
+            var dom = Ext.getDom(element),
+                i = 0, len, childNodes;
+
+            if (eventName) {
+                EventManager.removeListener(element, eventName);
+            } else {
+                EventManager.removeAll(element);
+            }
+
+            if (dom && dom.childNodes) {
+                childNodes = dom.childNodes;
+                for (len = childNodes.length; i < len; i++) {
+                    EventManager.purgeElement(childNodes[i], eventName);
+                }
+            }
+        },
+
+        /**
+         * Create the wrapper function for the event
+         * @private
+         * @param {HTMLElement} dom The dom element
+         * @param {String} ename The event name
+         * @param {Function} fn The function to execute
+         * @param {Object} scope The scope to execute callback in
+         * @param {Object} options The options
+         * @return {Function} the wrapper function
+         */
+        createListenerWrap : function(dom, ename, fn, scope, options) {
+            options = options || {};
+
+            var f, gen, wrap = function(e, args) {
+                // Compile the implementation upon first firing
+                if (!gen) {
+                    f = ['if(!' + Ext.name + ') {return;}'];
+
+                    if (options.buffer || options.delay || options.freezeEvent) {
+                        if (options.freezeEvent) {
+                            // If we're freezing, we still want to update the singleton event object
+                            // as well as returning a frozen copy
+                            f.push('e = X.EventObject.setEvent(e);');
+                        }
+                        f.push('e = new X.EventObjectImpl(e, ' + (options.freezeEvent ? 'true' : 'false' ) + ');');
+                    } else {
+                        f.push('e = X.EventObject.setEvent(e);');
+                    }
+
+                    if (options.delegate) {
+                        // double up '\' characters so escape sequences survive the
+                        // string-literal translation
+                        f.push('var result, t = e.getTarget("' + (options.delegate + '').replace(escapeRx, '\\\\') + '", this);');
+                        f.push('if(!t) {return;}');
+                    } else {
+                        f.push('var t = e.target, result;');
+                    }
+
+                    if (options.target) {
+                        f.push('if(e.target !== options.target) {return;}');
+                    }
+
+                    if (options.stopEvent) {
+                        f.push('e.stopEvent();');
+                    } else {
+                        if(options.preventDefault) {
+                            f.push('e.preventDefault();');
+                        }
+                        if(options.stopPropagation) {
+                            f.push('e.stopPropagation();');
+                        }
+                    }
+
+                    if (options.normalized === false) {
+                        f.push('e = e.browserEvent;');
+                    }
+
+                    if (options.buffer) {
+                        f.push('(wrap.task && clearTimeout(wrap.task));');
+                        f.push('wrap.task = setTimeout(function() {');
+                    }
+
+                    if (options.delay) {
+                        f.push('wrap.tasks = wrap.tasks || [];');
+                        f.push('wrap.tasks.push(setTimeout(function() {');
+                    }
+
+                    // finally call the actual handler fn
+                    f.push('result = fn.call(scope || dom, e, t, options);');
+
+                    if (options.single) {
+                        f.push('evtMgr.removeListener(dom, ename, fn, scope);');
+                    }
+
+                    // Fire the global idle event for all events except mousemove which is too common, and
+                    // fires too frequently and fast to be use in tiggering onIdle processing. Do not fire on page unload.
+                    if (ename !== 'mousemove' && ename !== 'unload') {
+                        f.push('if (evtMgr.idleEvent.listeners.length) {');
+                        f.push('evtMgr.idleEvent.fire();');
+                        f.push('}');
+                    }
+
+                    if (options.delay) {
+                        f.push('}, ' + options.delay + '));');
+                    }
+
+                    if (options.buffer) {
+                        f.push('}, ' + options.buffer + ');');
+                    }
+                    f.push('return result;');
+
+                    gen = Ext.cacheableFunctionFactory('e', 'options', 'fn', 'scope', 'ename', 'dom', 'wrap', 'args', 'X', 'evtMgr', f.join('\n'));
+                }
+
+                return gen.call(dom, e, options, fn, scope, ename, dom, wrap, args, Ext, EventManager);
+            };
+            return wrap;
+        },
+        
+        /**
+         * Gets the event cache object for a particular element
+         * @private
+         * @param {HTMLElement} element The element
+         * @return {Object} The event cache object
+         */
+        getEventCache: function(element) {
+            var elementCache, eventCache, id;
+            
+            if (!element) {
+                return [];
+            }
+
+            if (element.$cache) {
+                elementCache = element.$cache;
+            } else {
+                // getId will populate the cache for this element if it isn't already present
+                if (typeof element === 'string') {
+                    id = element;
+                } else {
+                    id = EventManager.getId(element);
+                }
+                elementCache = Ext.cache[id];
+            }
+            eventCache = elementCache.events || (elementCache.events = {});
+            return eventCache;
+        },
+
+        /**
+         * Get the event cache for a particular element for a particular event
+         * @private
+         * @param {HTMLElement} element The element
+         * @param {Object} eventName The event name
+         * @return {Array} The events for the element
+         */
+        getEventListenerCache : function(element, eventName) {
+            var eventCache = EventManager.getEventCache(element);
+            return eventCache[eventName] || (eventCache[eventName] = []);
+        },
+        
+        /**
+         * Clones the event cache for a particular element for a particular event
+         * @private
+         * @param {HTMLElement} element The element
+         * @param {Object} eventName The event name
+         * @return {Array} The cloned events for the element
+         */
+        cloneEventListenerCache: function(element, eventName){
+            var eventCache = EventManager.getEventCache(element),
+                out;
+                
+            if (eventCache[eventName]) {
+                out = eventCache[eventName].slice(0);
+            } else {
+                out = [];
+            }
+            eventCache[eventName] = out;
+            return out;
+        },
+
+        // --------------------- utility methods ---------------------
+        mouseLeaveRe: /(mouseout|mouseleave)/,
+        mouseEnterRe: /(mouseover|mouseenter)/,
+
+        /**
+         * Stop the event (preventDefault and stopPropagation)
+         * @param {Event} event The event to stop
+         */
+        stopEvent: function(event) {
+            EventManager.stopPropagation(event);
+            EventManager.preventDefault(event);
+        },
+
+        /**
+         * Cancels bubbling of the event.
+         * @param {Event} event The event to stop bubbling.
+         */
+        stopPropagation: function(event) {
+            event = event.browserEvent || event;
+            if (event.stopPropagation) {
+                event.stopPropagation();
+            } else {
+                event.cancelBubble = true;
+            }
+        },
+
+        /**
+         * Prevents the browsers default handling of the event.
+         * @param {Event} event The event to prevent the default
+         */
+        preventDefault: function(event) {
+            event = event.browserEvent || event;
+            if (event.preventDefault) {
+                event.preventDefault();
+            } else {
+                event.returnValue = false;
+                // Some keys events require setting the keyCode to -1 to be prevented
+                try {
+                  // all ctrl + X and F1 -> F12
+                  if (event.ctrlKey || event.keyCode > 111 && event.keyCode < 124) {
+                      event.keyCode = -1;
+                  }
+                } catch (e) {
+                    // see this outdated document http://support.microsoft.com/kb/934364/en-us for more info
+                }
+            }
+        },
+
+        /**
+         * Gets the related target from the event.
+         * @param {Object} event The event
+         * @return {HTMLElement} The related target.
+         */
+        getRelatedTarget: function(event) {
+            event = event.browserEvent || event;
+            var target = event.relatedTarget;
+            if (!target) {
+                if (EventManager.mouseLeaveRe.test(event.type)) {
+                    target = event.toElement;
+                } else if (EventManager.mouseEnterRe.test(event.type)) {
+                    target = event.fromElement;
+                }
+            }
+            return EventManager.resolveTextNode(target);
+        },
+
+        /**
+         * Gets the x coordinate from the event
+         * @param {Object} event The event
+         * @return {Number} The x coordinate
+         */
+        getPageX: function(event) {
+            return EventManager.getPageXY(event)[0];
+        },
+
+        /**
+         * Gets the y coordinate from the event
+         * @param {Object} event The event
+         * @return {Number} The y coordinate
+         */
+        getPageY: function(event) {
+            return EventManager.getPageXY(event)[1];
+        },
+
+        /**
+         * Gets the x & y coordinate from the event
+         * @param {Object} event The event
+         * @return {Number[]} The x/y coordinate
+         */
+        getPageXY: function(event) {
+            event = event.browserEvent || event;
+            var x = event.pageX,
+                y = event.pageY,
+                docEl = doc.documentElement,
+                body = doc.body;
+
+            // pageX/pageY not available (undefined, not null), use clientX/clientY instead
+            if (!x && x !== 0) {
+                x = event.clientX + (docEl && docEl.scrollLeft || body && body.scrollLeft || 0) - (docEl && docEl.clientLeft || body && body.clientLeft || 0);
+                y = event.clientY + (docEl && docEl.scrollTop  || body && body.scrollTop  || 0) - (docEl && docEl.clientTop  || body && body.clientTop  || 0);
+            }
+            return [x, y];
+        },
+
+        /**
+         * Gets the target of the event.
+         * @param {Object} event The event
+         * @return {HTMLElement} target
+         */
+        getTarget: function(event) {
+            event = event.browserEvent || event;
+            return EventManager.resolveTextNode(event.target || event.srcElement);
+        },
+
+        // technically no need to browser sniff this, however it makes
+        // no sense to check this every time, for every event, whether
+        // the string is equal.
+        /**
+         * Resolve any text nodes accounting for browser differences.
+         * @private
+         * @param {HTMLElement} node The node
+         * @return {HTMLElement} The resolved node
+         */
+        resolveTextNode: Ext.isGecko ?
+            function(node) {
+                if (node) {
+                    // work around firefox bug, https://bugzilla.mozilla.org/show_bug.cgi?id=101197
+                    var s = HTMLElement.prototype.toString.call(node);
+                    if (s !== '[xpconnect wrapped native prototype]' && s !== '[object XULElement]') {
+                        return node.nodeType == 3 ? node.parentNode: node;
+                    }
+                }
+            }
+            :
+            function(node) {
+                return node && node.nodeType == 3 ? node.parentNode: node;
+            },
+
+        // --------------------- custom event binding ---------------------
+
+        // Keep track of the current width/height
+        curWidth: 0,
+        curHeight: 0,
+
+        /**
+         * Adds a listener to be notified when the browser window is resized and provides resize event buffering (100 milliseconds),
+         * passes new viewport width and height to handlers.
+         * @param {Function} fn      The handler function the window resize event invokes.
+         * @param {Object}   scope   The scope (<code>this</code> reference) in which the handler function executes. Defaults to the browser window.
+         * @param {Boolean}  [options] Options object as passed to {@link Ext.Element#addListener}
+         */
+        onWindowResize: function(fn, scope, options) {
+            var resize = EventManager.resizeEvent;
+
+            if (!resize) {
+                EventManager.resizeEvent = resize = new Ext.util.Event();
+                EventManager.on(win, 'resize', EventManager.fireResize, null, {buffer: 100});
+            }
+            resize.addListener(fn, scope, options);
+        },
+
+        /**
+         * Fire the resize event.
+         * @private
+         */
+        fireResize: function() {
+            var w = Ext.Element.getViewWidth(),
+                h = Ext.Element.getViewHeight();
+
+             //whacky problem in IE where the resize event will sometimes fire even though the w/h are the same.
+             if (EventManager.curHeight != h || EventManager.curWidth != w) {
+                 EventManager.curHeight = h;
+                 EventManager.curWidth = w;
+                 EventManager.resizeEvent.fire(w, h);
+             }
+        },
+
+        /**
+         * Removes the passed window resize listener.
+         * @param {Function} fn        The method the event invokes
+         * @param {Object}   scope    The scope of handler
+         */
+        removeResizeListener: function(fn, scope) {
+            var resize = EventManager.resizeEvent;
+            if (resize) {
+                resize.removeListener(fn, scope);
+            }
+        },
+
+        /**
+         * Adds a listener to be notified when the browser window is unloaded.
+         * @param {Function} fn      The handler function the window unload event invokes.
+         * @param {Object}   scope   The scope (<code>this</code> reference) in which the handler function executes. Defaults to the browser window.
+         * @param {Boolean}  options Options object as passed to {@link Ext.Element#addListener}
+         */
+        onWindowUnload: function(fn, scope, options) {
+            var unload = EventManager.unloadEvent;
+
+            if (!unload) {
+                EventManager.unloadEvent = unload = new Ext.util.Event();
+                EventManager.addListener(win, 'unload', EventManager.fireUnload);
+            }
+            if (fn) {
+                unload.addListener(fn, scope, options);
+            }
+        },
+
+        /**
+         * Fires the unload event for items bound with onWindowUnload
+         * @private
+         */
+        fireUnload: function() {
+            // wrap in a try catch, could have some problems during unload
+            try {
+                // relinquish references.
+                doc = win = undefined;
+
+                var gridviews, i, ln,
+                    el, cache;
+
+                EventManager.unloadEvent.fire();
+                // Work around FF3 remembering the last scroll position when refreshing the grid and then losing grid view
+                if (Ext.isGecko3) {
+                    gridviews = Ext.ComponentQuery.query('gridview');
+                    i = 0;
+                    ln = gridviews.length;
+                    for (; i < ln; i++) {
+                        gridviews[i].scrollToTop();
+                    }
+                }
+                // Purge all elements in the cache
+                cache = Ext.cache;
+
+                for (el in cache) {
+                    if (cache.hasOwnProperty(el)) {
+                        EventManager.removeAll(el);
+                    }
+                }
+            } catch(e) {
+            }
+        },
+
+        /**
+         * Removes the passed window unload listener.
+         * @param {Function} fn        The method the event invokes
+         * @param {Object}   scope    The scope of handler
+         */
+        removeUnloadListener: function(fn, scope) {
+            var unload = EventManager.unloadEvent;
+            if (unload) {
+                unload.removeListener(fn, scope);
+            }
+        },
+
+        /**
+         * note 1: IE fires ONLY the keydown event on specialkey autorepeat
+         * note 2: Safari < 3.1, Gecko (Mac/Linux) & Opera fire only the keypress event on specialkey autorepeat
+         * (research done by Jan Wolter at http://unixpapa.com/js/key.html)
+         * @private
+         */
+        useKeyDown: Ext.isWebKit ?
+                       parseInt(navigator.userAgent.match(/AppleWebKit\/(\d+)/)[1], 10) >= 525 :
+                       !((Ext.isGecko && !Ext.isWindows) || Ext.isOpera),
+
+        /**
+         * Indicates which event to use for getting key presses.
+         * @return {String} The appropriate event name.
+         */
+        getKeyEvent: function() {
+            return EventManager.useKeyDown ? 'keydown' : 'keypress';
+        }
+    });
+
+    // route "< ie9-Standards" to a legacy IE onReady implementation
+    if(!supportsAddEventListener && document.attachEvent) {
+        Ext.apply( EventManager, {
+            /* Customized implementation for Legacy IE.  The default implementation is configured for use
+             *  with all other 'standards compliant' agents.
+             *  References: http://javascript.nwbox.com/IEContentLoaded/
+             *  licensed courtesy of http://developer.yahoo.com/yui/license.html
+             */
+
+            /**
+             * This strategy has minimal benefits for Sencha solutions that build themselves (ie. minimal initial page markup).
+             * However, progressively-enhanced pages (with image content and/or embedded frames) will benefit the most from it.
+             * Browser timer resolution is too poor to ensure a doScroll check more than once on a page loaded with minimal
+             * assets (the readystatechange event 'complete' usually beats the doScroll timer on a 'lightly-loaded' initial document).
+             */
+            pollScroll : function() {
+                var scrollable = true;
+
+                try {
+                    document.documentElement.doScroll('left');
+                } catch(e) {
+                    scrollable = false;
+                }
+
+                // on IE8, when running within an iFrame, document.body is not immediately available
+                if (scrollable && document.body) {
+                    EventManager.onReadyEvent({
+                        type:'doScroll'
+                    });
+                } else {
+                    /*
+                     * minimize thrashing --
+                     * adjusted for setTimeout's close-to-minimums (not too low),
+                     * as this method SHOULD always be called once initially
+                     */
+                    EventManager.scrollTimeout = setTimeout(EventManager.pollScroll, 20);
+                }
+
+                return scrollable;
+            },
+
+            /**
+             * Timer for doScroll polling
+             * @private
+             */
+            scrollTimeout: null,
+
+            /* @private
+             */
+            readyStatesRe  : /complete/i,
+
+            /* @private
+             */
+            checkReadyState: function() {
+                var state = document.readyState;
+
+                if (EventManager.readyStatesRe.test(state)) {
+                    EventManager.onReadyEvent({
+                        type: state
+                    });
+                }
+            },
+
+            bindReadyEvent: function() {
+                var topContext = true;
+
+                if (EventManager.hasBoundOnReady) {
+                    return;
+                }
+
+                //are we in an IFRAME? (doScroll ineffective here)
+                try {
+                    topContext = window.frameElement === undefined;
+                } catch(e) {
+                    // If we throw an exception, it means we're probably getting access denied,
+                    // which means we're in an iframe cross domain.
+                    topContext = false;
+                }
+
+                if (!topContext || !doc.documentElement.doScroll) {
+                    EventManager.pollScroll = Ext.emptyFn;   //then noop this test altogether
+                }
+
+                // starts doScroll polling if necessary
+                if (EventManager.pollScroll() === true) {
+                    return;
+                }
+
+                // Core is loaded AFTER initial document write/load ?
+                if (doc.readyState == 'complete' )  {
+                    EventManager.onReadyEvent({type: 'already ' + (doc.readyState || 'body') });
+                } else {
+                    doc.attachEvent('onreadystatechange', EventManager.checkReadyState);
+                    window.attachEvent('onload', EventManager.onReadyEvent);
+                    EventManager.hasBoundOnReady = true;
+                }
+            },
+
+            onReadyEvent : function(e) {
+                if (e && e.type) {
+                    EventManager.onReadyChain.push(e.type);
+                }
+
+                if (EventManager.hasBoundOnReady) {
+                    document.detachEvent('onreadystatechange', EventManager.checkReadyState);
+                    window.detachEvent('onload', EventManager.onReadyEvent);
+                }
+
+                if (Ext.isNumber(EventManager.scrollTimeout)) {
+                    clearTimeout(EventManager.scrollTimeout);
+                    delete EventManager.scrollTimeout;
+                }
+
+                if (!Ext.isReady) {
+                    EventManager.fireDocReady();
+                }
+            },
+
+            //diags: a list of event types passed to onReadyEvent (in chron order)
+            onReadyChain : []
+        });
+    }
+
+
+    /**
+     * Adds a function to be called when the DOM is ready, and all required classes have been loaded.
+     * 
+     * If the DOM is ready and all classes are loaded, the passed function is executed immediately.
+     * @member Ext
+     * @method onReady
+     * @param {Function} fn The function callback to be executed
+     * @param {Object} scope The execution scope (`this` reference) of the callback function
+     * @param {Object} options The options to modify the listener as passed to {@link Ext.util.Observable#addListener addListener}.
+     */
+    Ext.onReady = function(fn, scope, options) {
+        Ext.Loader.onReady(fn, scope, true, options);
+    };
+
+    /**
+     * @member Ext
+     * @method onDocumentReady
+     * @inheritdoc Ext.EventManager#onDocumentReady
+     */
+    Ext.onDocumentReady = EventManager.onDocumentReady;
+
+    /**
+     * @member Ext.EventManager
+     * @method on
+     * @inheritdoc Ext.EventManager#addListener
+     */
+    EventManager.on = EventManager.addListener;
+
+    /**
+     * @member Ext.EventManager
+     * @method un
+     * @inheritdoc Ext.EventManager#removeListener
+     */
+    EventManager.un = EventManager.removeListener;
+
+    Ext.onReady(initExtCss);
+};
+
+Ext.setVersion("ext-theme-base", "4.2.1");
+Ext.setVersion("ext-theme-neptune", "4.2.1");
+Ext.setVersion("ext-theme-neutral", "4.2.1");
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag core
+/**
+ * Base class that provides a common interface for publishing events. Subclasses are expected to to have a property
+ * "events" with all the events defined, and, optionally, a property "listeners" with configured listeners defined.
+ *
+ * For example:
+ *
+ *     Ext.define('Employee', {
+ *         mixins: {
+ *             observable: 'Ext.util.Observable'
+ *         },
+ *
+ *         constructor: function (config) {
+ *             // The Observable constructor copies all of the properties of `config` on
+ *             // to `this` using {@link Ext#apply}. Further, the `listeners` property is
+ *             // processed to add listeners.
+ *             //
+ *             this.mixins.observable.constructor.call(this, config);
+ *
+ *             this.addEvents(
+ *                 'fired',
+ *                 'quit'
+ *             );
+ *         }
+ *     });
+ *
+ * This could then be used like this:
+ *
+ *     var newEmployee = new Employee({
+ *         name: employeeName,
+ *         listeners: {
+ *             quit: function() {
+ *                 // By default, "this" will be the object that fired the event.
+ *                 alert(this.name + " has quit!");
+ *             }
+ *         }
+ *     });
+ */
+Ext.define('Ext.util.Observable', function(Observable) {
+
+    // Private Destroyable class which removes listeners
+    var emptyArray = [],
+        arrayProto = Array.prototype,
+        arraySlice = arrayProto.slice,
+        ExtEvent = Ext.util.Event,
+        ListenerRemover = function(observable) {
+
+            // Passed a ListenerRemover: return it
+            if (observable instanceof ListenerRemover) {
+                return observable;
+            }
+
+            this.observable = observable;
+
+            // Called when addManagedListener is used with the event source as the second arg:
+            // (owner, eventSource, args...)
+            if (arguments[1].isObservable) {
+                this.managedListeners = true;
+            }
+            this.args = arraySlice.call(arguments, 1);
+        };
+
+    ListenerRemover.prototype.destroy = function() {
+        this.observable[this.managedListeners ? 'mun' : 'un'].apply(this.observable, this.args);
+    };
+
+    return {
+
+        /* Begin Definitions */
+
+                                                         
+
+        statics: {
+            /**
+            * Removes **all** added captures from the Observable.
+            *
+            * @param {Ext.util.Observable} o The Observable to release
+            * @static
+            */
+            releaseCapture: function(o) {
+                o.fireEventArgs = this.prototype.fireEventArgs;
+            },
+
+            /**
+            * Starts capture on the specified Observable. All events will be passed to the supplied function with the event
+            * name + standard signature of the event **before** the event is fired. If the supplied function returns false,
+            * the event will not fire.
+            *
+            * @param {Ext.util.Observable} o The Observable to capture events from.
+            * @param {Function} fn The function to call when an event is fired.
+            * @param {Object} scope (optional) The scope (`this` reference) in which the function is executed. Defaults to
+            * the Observable firing the event.
+            * @static
+            */
+            capture: function(o, fn, scope) {
+                // We're capturing calls to fireEventArgs to avoid duplication of events;
+                // however fn expects fireEvent's signature so we have to convert it here.
+                // To avoid unnecessary conversions, observe() below is aware of the changes
+                // and will capture fireEventArgs instead.
+                var newFn = function(eventName, args) {
+                    return fn.apply(scope, [eventName].concat(args));
+                }
+                
+                this.captureArgs(o, newFn, scope);
+            },
+            
+            /**
+             * @private
+             */
+            captureArgs: function(o, fn, scope) {
+                o.fireEventArgs = Ext.Function.createInterceptor(o.fireEventArgs, fn, scope);
+            },
+
+            /**
+            * Sets observability on the passed class constructor.
+            *
+            * This makes any event fired on any instance of the passed class also fire a single event through
+            * the **class** allowing for central handling of events on many instances at once.
+            *
+            * Usage:
+            *
+            *     Ext.util.Observable.observe(Ext.data.Connection);
+            *     Ext.data.Connection.on('beforerequest', function(con, options) {
+            *         console.log('Ajax request made to ' + options.url);
+            *     });
+            *
+            * @param {Function} c The class constructor to make observable.
+            * @param {Object} listeners An object containing a series of listeners to add. See {@link #addListener}.
+            * @static
+            */
+            observe: function(cls, listeners) {
+                if (cls) {
+                    if (!cls.isObservable) {
+                        Ext.applyIf(cls, new this());
+                        this.captureArgs(cls.prototype, cls.fireEventArgs, cls);
+                    }
+                    if (Ext.isObject(listeners)) {
+                        cls.on(listeners);
+                    }
+                }
+                return cls;
+            },
+
+            /**
+            * Prepares a given class for observable instances. This method is called when a
+            * class derives from this class or uses this class as a mixin.
+            * @param {Function} T The class constructor to prepare.
+            * @private
+            */
+            prepareClass: function (T, mixin) {
+                // T.hasListeners is the object to track listeners on class T. This object's
+                // prototype (__proto__) is the "hasListeners" of T.superclass.
+
+                // Instances of T will create "hasListeners" that have T.hasListeners as their
+                // immediate prototype (__proto__).
+
+                if (!T.HasListeners) {
+                    // We create a HasListeners "class" for this class. The "prototype" of the
+                    // HasListeners class is an instance of the HasListeners class associated
+                    // with this class's super class (or with Observable).
+                    var HasListeners = function () {},
+                        SuperHL = T.superclass.HasListeners || (mixin && mixin.HasListeners) ||
+                                Observable.HasListeners;
+
+                    // Make the HasListener class available on the class and its prototype:
+                    T.prototype.HasListeners = T.HasListeners = HasListeners;
+
+                    // And connect its "prototype" to the new HasListeners of our super class
+                    // (which is also the class-level "hasListeners" instance).
+                    HasListeners.prototype = T.hasListeners = new SuperHL();
+                }
+            }
+        },
+
+        /* End Definitions */
+
+        /**
+        * @cfg {Object} listeners
+        *
+        * A config object containing one or more event handlers to be added to this object during initialization. This
+        * should be a valid listeners config object as specified in the {@link #addListener} example for attaching multiple
+        * handlers at once.
+        *
+        * **DOM events from Ext JS {@link Ext.Component Components}**
+        *
+        * While _some_ Ext JS Component classes export selected DOM events (e.g. "click", "mouseover" etc), this is usually
+        * only done when extra value can be added. For example the {@link Ext.view.View DataView}'s **`{@link
+        * Ext.view.View#itemclick itemclick}`** event passing the node clicked on. To access DOM events directly from a
+        * child element of a Component, we need to specify the `element` option to identify the Component property to add a
+        * DOM listener to:
+        *
+        *     new Ext.panel.Panel({
+        *         width: 400,
+        *         height: 200,
+        *         dockedItems: [{
+        *             xtype: 'toolbar'
+        *         }],
+        *         listeners: {
+        *             click: {
+        *                 element: 'el', //bind to the underlying el property on the panel
+        *                 fn: function(){ console.log('click el'); }
+        *             },
+        *             dblclick: {
+        *                 element: 'body', //bind to the underlying body property on the panel
+        *                 fn: function(){ console.log('dblclick body'); }
+        *             }
+        *         }
+        *     });
+        */
+
+        /**
+        * @property {Boolean} isObservable
+        * `true` in this class to identify an object as an instantiated Observable, or subclass thereof.
+        */
+        isObservable: true,
+
+        /**
+        * @private
+        * Initial suspended call count. Incremented when {@link #suspendEvents} is called, decremented when {@link #resumeEvents} is called.
+        */
+        eventsSuspended: 0,
+
+        /**
+        * @property {Object} hasListeners
+        * @readonly
+        * This object holds a key for any event that has a listener. The listener may be set
+        * directly on the instance, or on its class or a super class (via {@link #observe}) or
+        * on the {@link Ext.app.EventBus MVC EventBus}. The values of this object are truthy
+        * (a non-zero number) and falsy (0 or undefined). They do not represent an exact count
+        * of listeners. The value for an event is truthy if the event must be fired and is
+        * falsy if there is no need to fire the event.
+        * 
+        * The intended use of this property is to avoid the expense of fireEvent calls when
+        * there are no listeners. This can be particularly helpful when one would otherwise
+        * have to call fireEvent hundreds or thousands of times. It is used like this:
+        * 
+        *      if (this.hasListeners.foo) {
+        *          this.fireEvent('foo', this, arg1);
+        *      }
+        */
+
+        constructor: function(config) {
+            var me = this;
+
+            Ext.apply(me, config);
+
+            // The subclass may have already initialized it.
+            if (!me.hasListeners) {
+                me.hasListeners = new me.HasListeners();
+            }
+
+            me.events = me.events || {};
+            if (me.listeners) {
+                me.on(me.listeners);
+                me.listeners = null; //Set as an instance property to pre-empt the prototype in case any are set there.
+            }
+
+            if (me.bubbleEvents) {
+                me.enableBubble(me.bubbleEvents);
+            }
+        },
+
+        onClassExtended: function (T) {
+            if (!T.HasListeners) {
+                // Some classes derive from us and some others derive from those classes. All
+                // of these are passed to this method.
+                Observable.prepareClass(T);
+            }
+        },
+
+        // @private
+        // Matches options property names within a listeners specification object  - property names which are never used as event names.
+        eventOptionsRe : /^(?:scope|delay|buffer|single|stopEvent|preventDefault|stopPropagation|normalized|args|delegate|element|destroyable|vertical|horizontal|freezeEvent|priority)$/,
+
+        /**
+        * Adds listeners to any Observable object (or Ext.Element) which are automatically removed when this Component is
+        * destroyed.
+        *
+        * @param {Ext.util.Observable/Ext.Element} item The item to which to add a listener/listeners.
+        * @param {Object/String} ename The event name, or an object containing event name properties.
+        * @param {Function} fn (optional) If the `ename` parameter was an event name, this is the handler function.
+        * @param {Object} scope (optional) If the `ename` parameter was an event name, this is the scope (`this` reference)
+        * in which the handler function is executed.
+        * @param {Object} options (optional) If the `ename` parameter was an event name, this is the
+        * {@link Ext.util.Observable#addListener addListener} options.
+        * @return {Object} **Only when the `destroyable` option is specified. **
+        *
+        *  A `Destroyable` object. An object which implements the `destroy` method which removes all listeners added in this call. For example:
+        *
+        *     this.btnListeners =  = myButton.mon({
+        *         destroyable: true
+        *         mouseover:   function() { console.log('mouseover'); },
+        *         mouseout:    function() { console.log('mouseout'); },
+        *         click:       function() { console.log('click'); }
+        *     });
+        *
+        * And when those listeners need to be removed:
+        *
+        *     Ext.destroy(this.btnListeners);
+        *
+        * or
+        *
+        *     this.btnListeners.destroy();
+        */
+        addManagedListener: function(item, ename, fn, scope, options, /* private */ noDestroy) {
+            var me = this,
+                managedListeners = me.managedListeners = me.managedListeners || [],
+                config, passedOptions;
+
+            if (typeof ename !== 'string') {
+                // When creating listeners using the object form, allow caller to override the default of
+                // using the listeners object as options.
+                // This is used by relayEvents, when adding its relayer so that it does not contibute
+                // a spurious options param to the end of the arg list.
+                passedOptions = arguments.length > 4 ? options : ename;
+
+                options = ename;
+                for (ename in options) {
+                    if (options.hasOwnProperty(ename)) {
+                        config = options[ename];
+                        if (!me.eventOptionsRe.test(ename)) {
+                            // recurse, but pass the noDestroy parameter as true so that lots of individual Destroyables are not created.
+                            // We create a single one at the end if necessary.
+                            me.addManagedListener(item, ename, config.fn || config, config.scope || options.scope || scope, config.fn ? config : passedOptions, true);
+                        }
+                    }
+                }
+                if (options && options.destroyable) {
+                    return new ListenerRemover(me, item, options);
+                }
+            }
+            else {
+                if (typeof fn === 'string') {
+                    scope = scope || me;
+                    fn = Ext.resolveMethod(fn, scope);
+                }
+                
+                managedListeners.push({
+                    item: item,
+                    ename: ename,
+                    fn: fn,
+                    scope: scope,
+                    options: options
+                });
+
+                item.on(ename, fn, scope, options);
+
+                // The 'noDestroy' flag is sent if we're looping through a hash of listeners passing each one to addManagedListener separately
+                if (!noDestroy && options && options.destroyable) {
+                    return new ListenerRemover(me, item, ename, fn, scope);
+                }
+            }
+        },
+
+        /**
+        * Removes listeners that were added by the {@link #mon} method.
+        *
+        * @param {Ext.util.Observable/Ext.Element} item The item from which to remove a listener/listeners.
+        * @param {Object/String} ename The event name, or an object containing event name properties.
+        * @param {Function} fn (optional) If the `ename` parameter was an event name, this is the handler function.
+        * @param {Object} scope (optional) If the `ename` parameter was an event name, this is the scope (`this` reference)
+        * in which the handler function is executed.
+        */
+        removeManagedListener: function(item, ename, fn, scope) {
+            var me = this,
+                options,
+                config,
+                managedListeners,
+                length,
+                i, func;
+
+            if (typeof ename !== 'string') {
+                options = ename;
+                for (ename in options) {
+                    if (options.hasOwnProperty(ename)) {
+                        config = options[ename];
+                        if (!me.eventOptionsRe.test(ename)) {
+                            me.removeManagedListener(item, ename, config.fn || config, config.scope || options.scope || scope);
+                        }
+                    }
+                }
+            } else {
+                managedListeners = me.managedListeners ? me.managedListeners.slice() : [];
+                
+                if (typeof fn === 'string') {
+                    scope = scope || me;
+                    fn = Ext.resolveMethod(fn, scope);
+                }
+
+                for (i = 0, length = managedListeners.length; i < length; i++) {
+                    me.removeManagedListenerItem(false, managedListeners[i], item, ename, fn, scope);
+                }
+            }
+        },
+
+        /**
+        * Fires the specified event with the passed parameters (minus the event name, plus the `options` object passed
+        * to {@link #addListener}).
+        *
+        * An event may be set to bubble up an Observable parent hierarchy (See {@link Ext.Component#getBubbleTarget}) by
+        * calling {@link #enableBubble}.
+        *
+        * @param {String} eventName The name of the event to fire.
+        * @param {Object...} args Variable number of parameters are passed to handlers.
+        * @return {Boolean} returns false if any of the handlers return false otherwise it returns true.
+        */
+        fireEvent: function(eventName) {
+            return this.fireEventArgs(eventName, arraySlice.call(arguments, 1));
+        },
+
+        /**
+        * Fires the specified event with the passed parameter list.
+        *
+        * An event may be set to bubble up an Observable parent hierarchy (See {@link Ext.Component#getBubbleTarget}) by
+        * calling {@link #enableBubble}.
+        *
+        * @param {String} eventName The name of the event to fire.
+        * @param {Object[]} args An array of parameters which are passed to handlers.
+        * @return {Boolean} returns false if any of the handlers return false otherwise it returns true.
+        */
+        fireEventArgs: function(eventName, args) {
+            eventName = eventName.toLowerCase();
+            var me = this,
+                events = me.events,
+                event = events && events[eventName],
+                ret = true;
+
+            // Only continue firing the event if there are listeners to be informed.
+            // Bubbled events will always have a listener count, so will be fired.
+            if (event && me.hasListeners[eventName]) {
+                ret = me.continueFireEvent(eventName, args || emptyArray, event.bubble);
+            }
+            return ret;
+        },
+
+        /**
+        * Continue to fire event.
+        * @private
+        *
+        * @param {String} eventName
+        * @param {Array} args
+        * @param {Boolean} bubbles
+        */
+        continueFireEvent: function(eventName, args, bubbles) {
+            var target = this,
+                queue, event,
+                ret = true;
+
+            do {
+                if (target.eventsSuspended) {
+                    if ((queue = target.eventQueue)) {
+                        queue.push([eventName, args, bubbles]);
+                    }
+                    return ret;
+                } else {
+                    event = target.events[eventName];
+                    // Continue bubbling if event exists and it is `true` or the handler didn't returns false and it
+                    // configure to bubble.
+                    if (event && event !== true) {
+                        if ((ret = event.fire.apply(event, args)) === false) {
+                            break;
+                        }
+                    }
+                }
+            } while (bubbles && (target = target.getBubbleParent()));
+            return ret;
+        },
+
+        /**
+        * Gets the bubbling parent for an Observable
+        * @private
+        * @return {Ext.util.Observable} The bubble parent. null is returned if no bubble target exists
+        */
+        getBubbleParent: function() {
+            var me = this, parent = me.getBubbleTarget && me.getBubbleTarget();
+            if (parent && parent.isObservable) {
+                return parent;
+            }
+            return null;
+        },
+
+        /**
+        * Appends an event handler to this object.  For example:
+        *
+        *     myGridPanel.on("mouseover", this.onMouseOver, this);
+        *
+        * The method also allows for a single argument to be passed which is a config object
+        * containing properties which specify multiple events. For example:
+        *
+        *     myGridPanel.on({
+        *         cellClick: this.onCellClick,
+        *         mouseover: this.onMouseOver,
+        *         mouseout: this.onMouseOut,
+        *         scope: this // Important. Ensure "this" is correct during handler execution
+        *     });
+        *
+        * One can also specify options for each event handler separately:
+        *
+        *     myGridPanel.on({
+        *         cellClick: {fn: this.onCellClick, scope: this, single: true},
+        *         mouseover: {fn: panel.onMouseOver, scope: panel}
+        *     });
+        *
+        * *Names* of methods in a specified scope may also be used. Note that
+        * `scope` MUST be specified to use this option:
+        *
+        *     myGridPanel.on({
+        *         cellClick: {fn: 'onCellClick', scope: this, single: true},
+        *         mouseover: {fn: 'onMouseOver', scope: panel}
+        *     });
+        *
+        * @param {String/Object} eventName The name of the event to listen for.
+        * May also be an object who's property names are event names.
+        *
+        * @param {Function} [fn] The method the event invokes, or *if `scope` is specified, the *name* of the method within
+        * the specified `scope`.  Will be called with arguments
+        * given to {@link Ext.util.Observable#fireEvent} plus the `options` parameter described below.
+        *
+        * @param {Object} [scope] The scope (`this` reference) in which the handler function is
+        * executed. **If omitted, defaults to the object which fired the event.**
+        *
+        * @param {Object} [options] An object containing handler configuration.
+        *
+        * **Note:** Unlike in ExtJS 3.x, the options object will also be passed as the last
+        * argument to every event handler.
+        *
+        * This object may contain any of the following properties:
+        *
+        * @param {Object} options.scope
+        *   The scope (`this` reference) in which the handler function is executed. **If omitted,
+        *   defaults to the object which fired the event.**
+        *
+        * @param {Number} options.delay
+        *   The number of milliseconds to delay the invocation of the handler after the event fires.
+        *
+        * @param {Boolean} options.single
+        *   True to add a handler to handle just the next firing of the event, and then remove itself.
+        *
+        * @param {Number} options.buffer
+        *   Causes the handler to be scheduled to run in an {@link Ext.util.DelayedTask} delayed
+        *   by the specified number of milliseconds. If the event fires again within that time,
+        *   the original handler is _not_ invoked, but the new handler is scheduled in its place.
+        *
+        * @param {Ext.util.Observable} options.target
+        *   Only call the handler if the event was fired on the target Observable, _not_ if the event
+        *   was bubbled up from a child Observable.
+        *
+        * @param {String} options.element
+        *   **This option is only valid for listeners bound to {@link Ext.Component Components}.**
+        *   The name of a Component property which references an element to add a listener to.
+        *
+        *   This option is useful during Component construction to add DOM event listeners to elements of
+        *   {@link Ext.Component Components} which will exist only after the Component is rendered.
+        *   For example, to add a click listener to a Panel's body:
+        *
+        *       new Ext.panel.Panel({
+        *           title: 'The title',
+        *           listeners: {
+        *               click: this.handlePanelClick,
+        *               element: 'body'
+        *           }
+        *       });
+        *
+        * @param {Boolean} [options.destroyable=false]
+        *   When specified as `true`, the function returns A `Destroyable` object. An object which implements the `destroy` method which removes all listeners added in this call.
+        *   
+        * @param {Number} [options.priority]
+        *   An optional numeric priority that determines the order in which event handlers
+        *   are run. Event handlers with no priority will be run as if they had a priority
+        *   of 0. Handlers with a higher priority will be prioritized to run sooner than
+        *   those with a lower priority.  Negative numbers can be used to set a priority
+        *   lower than the default. Internally, the framework uses a range of 1000 or
+        *   greater, and -1000 or lesser for handers that are intended to run before or
+        *   after all others, so it is recommended to stay within the range of -999 to 999
+        *   when setting the priority of event handlers in application-level code.
+        *
+        * **Combining Options**
+        *
+        * Using the options argument, it is possible to combine different types of listeners:
+        *
+        * A delayed, one-time listener.
+        *
+        *     myPanel.on('hide', this.handleClick, this, {
+        *         single: true,
+        *         delay: 100
+        *     });
+        *
+        * @return {Object} **Only when the `destroyable` option is specified. **
+        *
+        *  A `Destroyable` object. An object which implements the `destroy` method which removes all listeners added in this call. For example:
+        *
+        *     this.btnListeners =  = myButton.on({
+        *         destroyable: true
+        *         mouseover:   function() { console.log('mouseover'); },
+        *         mouseout:    function() { console.log('mouseout'); },
+        *         click:       function() { console.log('click'); }
+        *     });
+        *
+        * And when those listeners need to be removed:
+        *
+        *     Ext.destroy(this.btnListeners);
+        *
+        * or
+        *
+        *     this.btnListeners.destroy();
+        */
+        addListener: function(ename, fn, scope, options) {
+            var me = this,
+                config, event,
+                prevListenerCount = 0;
+
+            // Object listener hash passed
+            if (typeof ename !== 'string') {
+                options = ename;
+                for (ename in options) {
+                    if (options.hasOwnProperty(ename)) {
+                        config = options[ename];
+                        if (!me.eventOptionsRe.test(ename)) {
+                            /* This would be an API change so check removed until https://sencha.jira.com/browse/EXTJSIV-7183 is fully implemented in 4.2
+                            // Test must go here as well as in the simple form because of the attempted property access here on the config object.
+                            if (!config || (typeof config !== 'function' && !config.fn)) {
+                                Ext.Error.raise('No function passed for event ' + me.$className + '.' + ename);
+                            }
+                            */
+                            me.addListener(ename, config.fn || config, config.scope || options.scope, config.fn ? config : options);
+                        }
+                    }
+                }
+                if (options && options.destroyable) {
+                    return new ListenerRemover(me, options);
+                }
+            }
+            // String, function passed
+            else {
+                ename = ename.toLowerCase();
+                event = me.events[ename];
+                if (event && event.isEvent) {
+                    prevListenerCount = event.listeners.length;
+                } else {
+                    me.events[ename] = event = new ExtEvent(me, ename);
+                }
+                if (!fn) {
+                    Ext.Error.raise('No function passed for event ' + me.$className + '.' + ename);
+                }
+
+                // Allow listeners: { click: 'onClick', scope: myObject }
+                if (typeof fn === 'string') {
+                    scope = scope || me;
+                    fn = Ext.resolveMethod(fn, scope);
+                }
+                event.addListener(fn, scope, options);
+
+                // If a new listener has been added (Event.addListener rejects duplicates of the same fn+scope)
+                // then increment the hasListeners counter
+                if (event.listeners.length !== prevListenerCount) {
+                    me.hasListeners._incr_(ename);
+                }
+                if (options && options.destroyable) {
+                    return new ListenerRemover(me, ename, fn, scope, options);
+                }
+            }
+        },
+
+        /**
+        * Removes an event handler.
+        *
+        * @param {String} eventName The type of event the handler was associated with.
+        * @param {Function} fn The handler to remove. **This must be a reference to the function passed into the
+        * {@link Ext.util.Observable#addListener} call.**
+        * @param {Object} scope (optional) The scope originally specified for the handler. It must be the same as the
+        * scope argument specified in the original call to {@link Ext.util.Observable#addListener} or the listener will not be removed.
+        */
+        removeListener: function(ename, fn, scope) {
+            var me = this,
+                config,
+                event,
+                options;
+
+            if (typeof ename !== 'string') {
+                options = ename;
+                for (ename in options) {
+                    if (options.hasOwnProperty(ename)) {
+                        config = options[ename];
+                        if (!me.eventOptionsRe.test(ename)) {
+                            me.removeListener(ename, config.fn || config, config.scope || options.scope);
+                        }
+                    }
+                }
+            } else {
+                ename = ename.toLowerCase();
+                event = me.events[ename];
+                if (event && event.isEvent) {
+                    if (typeof fn === 'string') {
+                        scope = scope || me;
+                        fn = Ext.resolveMethod(fn, scope);
+                    }
+                    
+                    if (event.removeListener(fn, scope)) {
+                        me.hasListeners._decr_(ename);
+                    }
+                }
+            }
+        },
+
+        /**
+        * Removes all listeners for this object including the managed listeners
+        */
+        clearListeners: function() {
+            var events = this.events,
+                hasListeners = this.hasListeners,
+                event,
+                key;
+
+            for (key in events) {
+                if (events.hasOwnProperty(key)) {
+                    event = events[key];
+                    if (event.isEvent) {
+                        delete hasListeners[key];
+                        event.clearListeners();
+                    }
+                }
+            }
+
+            this.clearManagedListeners();
+        },
+
+        purgeListeners : function() {
+            if (Ext.global.console) {
+                Ext.global.console.warn('Observable: purgeListeners has been deprecated. Please use clearListeners.');
+            }
+            return this.clearListeners.apply(this, arguments);
+        },
+
+        /**
+        * Removes all managed listeners for this object.
+        */
+        clearManagedListeners : function() {
+            var managedListeners = this.managedListeners || [],
+                i = 0,
+                len = managedListeners.length;
+
+            for (; i < len; i++) {
+                this.removeManagedListenerItem(true, managedListeners[i]);
+            }
+
+            this.managedListeners = [];
+        },
+
+        /**
+        * Remove a single managed listener item
+        * @private
+        * @param {Boolean} isClear True if this is being called during a clear
+        * @param {Object} managedListener The managed listener item
+        * See removeManagedListener for other args
+        */
+        removeManagedListenerItem: function(isClear, managedListener, item, ename, fn, scope){
+            if (isClear || (managedListener.item === item && managedListener.ename === ename && (!fn || managedListener.fn === fn) && (!scope || managedListener.scope === scope))) {
+                managedListener.item.un(managedListener.ename, managedListener.fn, managedListener.scope);
+                if (!isClear) {
+                    Ext.Array.remove(this.managedListeners, managedListener);
+                }
+            }
+        },
+
+        purgeManagedListeners : function() {
+            if (Ext.global.console) {
+                Ext.global.console.warn('Observable: purgeManagedListeners has been deprecated. Please use clearManagedListeners.');
+            }
+            return this.clearManagedListeners.apply(this, arguments);
+        },
+
+        /**
+        * Adds the specified events to the list of events which this Observable may fire.
+        *
+        * @param {Object/String...} eventNames Either an object with event names as properties with
+        * a value of `true`. For example:
+        *
+        *     this.addEvents({
+        *         storeloaded: true,
+        *         storecleared: true
+        *     });
+        *
+        * Or any number of event names as separate parameters. For example:
+        *
+        *     this.addEvents('storeloaded', 'storecleared');
+        *
+        */
+        addEvents: function(o) {
+            var me = this,
+                events = me.events || (me.events = {}),
+                arg, args, i;
+
+            if (typeof o == 'string') {
+                for (args = arguments, i = args.length; i--; ) {
+                    arg = args[i];
+                    if (!events[arg]) {
+                        events[arg] = true;
+                    }
+                }
+            } else {
+                Ext.applyIf(me.events, o);
+            }
+        },
+
+        /**
+        * Checks to see if this object has any listeners for a specified event, or whether the event bubbles. The answer
+        * indicates whether the event needs firing or not.
+        *
+        * @param {String} eventName The name of the event to check for
+        * @return {Boolean} `true` if the event is being listened for or bubbles, else `false`
+        */
+        hasListener: function(ename) {
+            return !!this.hasListeners[ename.toLowerCase()];
+        },
+
+        /**
+        * Suspends the firing of all events. (see {@link #resumeEvents})
+        *
+        * @param {Boolean} queueSuspended Pass as true to queue up suspended events to be fired
+        * after the {@link #resumeEvents} call instead of discarding all suspended events.
+        */
+        suspendEvents: function(queueSuspended) {
+            this.eventsSuspended += 1;
+            if (queueSuspended && !this.eventQueue) {
+                this.eventQueue = [];
+            }
+        },
+
+        /**
+         * Suspends firing of the named event(s).
+         *
+         * After calling this method to suspend events, the events will no longer fire when requested to fire.
+         *
+         * **Note that if this is called multiple times for a certain event, the converse method
+         * {@link #resumeEvent} will have to be called the same number of times for it to resume firing.**
+         *
+         * @param  {String...} eventName Multiple event names to suspend.
+         */
+        suspendEvent: function(eventName) {
+            var len = arguments.length,
+                i, event;
+
+            for (i = 0; i < len; i++) {
+                event = this.events[arguments[i]];
+
+                // If it exists, and is an Event object (not still a boolean placeholder), suspend it
+                if (event && event.suspend) {
+                    event.suspend();
+                }
+            }
+        },
+
+        /**
+         * Resumes firing of the named event(s).
+         *
+         * After calling this method to resume events, the events will fire when requested to fire.
+         *
+         * **Note that if the {@link #suspendEvent} method is called multiple times for a certain event,
+         * this converse method will have to be called the same number of times for it to resume firing.**
+         *
+         * @param  {String...} eventName Multiple event names to resume.
+         */
+        resumeEvent: function() {
+            var len = arguments.length,
+                i, event;
+
+            for (i = 0; i < len; i++) {
+
+                // If it exists, and is an Event object (not still a boolean placeholder), resume it
+                event = this.events[arguments[i]];
+                if (event && event.resume) {
+                    event.resume();
+                }
+            }
+        },
+
+        /**
+        * Resumes firing events (see {@link #suspendEvents}).
+        *
+        * If events were suspended using the `queueSuspended` parameter, then all events fired
+        * during event suspension will be sent to any listeners now.
+        */
+        resumeEvents: function() {
+            var me = this,
+                queued = me.eventQueue,
+                qLen, q;
+
+            if (me.eventsSuspended && ! --me.eventsSuspended) {
+                delete me.eventQueue;
+
+                if (queued) {
+                    qLen = queued.length;
+                    for (q = 0; q < qLen; q++) {
+                        me.continueFireEvent.apply(me, queued[q]);
+                    }
+                }
+            }
+        },
+
+        /**
+        * Relays selected events from the specified Observable as if the events were fired by `this`.
+        *
+        * For example if you are extending Grid, you might decide to forward some events from store.
+        * So you can do this inside your initComponent:
+        *
+        *     this.relayEvents(this.getStore(), ['load']);
+        *
+        * The grid instance will then have an observable 'load' event which will be passed the
+        * parameters of the store's load event and any function fired with the grid's load event
+        * would have access to the grid using the `this` keyword.
+        *
+        * @param {Object} origin The Observable whose events this object is to relay.
+        * @param {String[]} events Array of event names to relay.
+        * @param {String} [prefix] A common prefix to prepend to the event names. For example:
+        *
+        *     this.relayEvents(this.getStore(), ['load', 'clear'], 'store');
+        *
+        * Now the grid will forward 'load' and 'clear' events of store as 'storeload' and 'storeclear'.
+        *
+        * @return {Object} A `Destroyable` object. An object which implements the `destroy` method which, when destroyed, removes all relayers. For example:
+        *
+        *     this.storeRelayers = this.relayEvents(this.getStore(), ['load', 'clear'], 'store');
+        *
+        * Can be undone by calling
+        *
+        *     Ext.destroy(this.storeRelayers);
+        *
+        * or
+        *     this.store.relayers.destroy();
+        */
+        relayEvents : function(origin, events, prefix) {
+            var me = this,
+                len = events.length,
+                i = 0,
+                oldName,
+                relayers = {};
+
+            for (; i < len; i++) {
+                oldName = events[i];
+
+                // Build up the listener hash.
+                relayers[oldName] = me.createRelayer(prefix ? prefix + oldName : oldName);
+            }
+            // Add the relaying listeners as ManagedListeners so that they are removed when this.clearListeners is called (usually when _this_ is destroyed)
+            // Explicitly pass options as undefined so that the listener does not get an extra options param
+            // which then has to be sliced off in the relayer.
+            me.mon(origin, relayers, null, null, undefined);
+
+            // relayed events are always destroyable.
+            return new ListenerRemover(me, origin, relayers);
+        },
+
+        /**
+        * @private
+        * Creates an event handling function which refires the event from this object as the passed event name.
+        * @param {String} newName The name under which to refire the passed parameters.
+        * @param {Array} beginEnd (optional) The caller can specify on which indices to slice.
+        * @returns {Function}
+        */
+        createRelayer: function(newName, beginEnd) {
+            var me = this;
+            return function() {
+                return me.fireEventArgs.call(me, newName, beginEnd ? arraySlice.apply(arguments, beginEnd) : arguments);
+            };
+        },
+
+        /**
+        * Enables events fired by this Observable to bubble up an owner hierarchy by calling `this.getBubbleTarget()` if
+        * present. There is no implementation in the Observable base class.
+        *
+        * This is commonly used by Ext.Components to bubble events to owner Containers.
+        * See {@link Ext.Component#getBubbleTarget}. The default implementation in Ext.Component returns the
+        * Component's immediate owner. But if a known target is required, this can be overridden to access the
+        * required target more quickly.
+        *
+        * Example:
+        *
+        *     Ext.define('Ext.overrides.form.field.Base', {
+        *         override: 'Ext.form.field.Base',
+        *
+        *         //  Add functionality to Field's initComponent to enable the change event to bubble
+        *         initComponent: function () {
+        *             this.callParent();
+        *             this.enableBubble('change');
+        *         }
+        *     });
+        *
+        *     var myForm = Ext.create('Ext.form.Panel', {
+        *         title: 'User Details',
+        *         items: [{
+        *             ...
+        *         }],
+        *         listeners: {
+        *             change: function() {
+        *                 // Title goes red if form has been modified.
+        *                 myForm.header.setStyle('color', 'red');
+        *             }
+        *         }
+        *     });
+        *
+        * @param {String/String[]} eventNames The event name to bubble, or an Array of event names.
+        */
+        enableBubble: function(eventNames) {
+            if (eventNames) {
+                var me = this,
+                    names = (typeof eventNames == 'string') ? arguments : eventNames,
+                    length = names.length,
+                    events = me.events,
+                    ename, event, i;
+
+                for (i = 0; i < length; ++i) {
+                    ename = names[i].toLowerCase();
+                    event = events[ename];
+
+                    if (!event || typeof event == 'boolean') {
+                        events[ename] = event = new ExtEvent(me, ename);
+                    }
+
+                    // Event must fire if it bubbles (We don't know if anyone up the
+                    // bubble hierarchy has listeners added)
+                    me.hasListeners._incr_(ename);
+
+                    event.bubble = true;
+                }
+            }
+        }
+    };
+}, function() {
+    var Observable = this,
+        proto = Observable.prototype,
+        HasListeners = function () {},
+        prepareMixin = function (T) {
+            if (!T.HasListeners) {
+                var proto = T.prototype;
+
+                // Classes that use us as a mixin (best practice) need to be prepared.
+                Observable.prepareClass(T, this);
+
+                // Now that we are mixed in to class T, we need to watch T for derivations
+                // and prepare them also.
+                T.onExtended(function (U) {
+                    Ext.classSystemMonitor && Ext.classSystemMonitor('extend mixin', arguments);
+                    
+                    Observable.prepareClass(U);
+                });
+
+                // Also, if a class uses us as a mixin and that class is then used as
+                // a mixin, we need to be notified of that as well.
+                if (proto.onClassMixedIn) {
+                    // play nice with other potential overrides...
+                    Ext.override(T, {
+                        onClassMixedIn: function (U) {
+                            prepareMixin.call(this, U);
+                            this.callParent(arguments);
+                        }
+                    });
+                } else {
+                    // just us chickens, so add the method...
+                    proto.onClassMixedIn = function (U) {
+                        prepareMixin.call(this, U);
+                    };
+                }
+            }
+        },
+        globalEvents;
+
+    HasListeners.prototype = {
+        //$$: 42  // to make sure we have a proper prototype
+        _decr_: function (ev) {
+            if (! --this[ev]) {
+                // Delete this entry, since 0 does not mean no one is listening, just
+                // that no one is *directly* listening. This allows the eventBus or
+                // class observers to "poke" through and expose their presence.
+                delete this[ev];
+            }
+        },
+        _incr_: function (ev) {
+            if (this.hasOwnProperty(ev)) {
+                // if we already have listeners at this level, just increment the count...
+                ++this[ev];
+            } else {
+                // otherwise, start the count at 1 (which hides whatever is in our prototype
+                // chain)...
+                this[ev] = 1;
+            }
+        }
+    };
+
+    proto.HasListeners = Observable.HasListeners = HasListeners;
+
+    Observable.createAlias({
+        /**
+         * @method
+         * Shorthand for {@link #addListener}.
+         * @inheritdoc Ext.util.Observable#addListener
+         */
+        on: 'addListener',
+        /**
+         * @method
+         * Shorthand for {@link #removeListener}.
+         * @inheritdoc Ext.util.Observable#removeListener
+         */
+        un: 'removeListener',
+        /**
+         * @method
+         * Shorthand for {@link #addManagedListener}.
+         * @inheritdoc Ext.util.Observable#addManagedListener
+         */
+        mon: 'addManagedListener',
+        /**
+         * @method
+         * Shorthand for {@link #removeManagedListener}.
+         * @inheritdoc Ext.util.Observable#removeManagedListener
+         */
+        mun: 'removeManagedListener'
+    });
+
+    //deprecated, will be removed in 5.0
+    Observable.observeClass = Observable.observe;
+
+    /**
+     * @member Ext
+     * @property {Ext.util.Observable} globalEvents
+     * An instance of `{@link Ext.util.Observable}` through which Ext fires global events.
+     *
+     * This Observable instance fires the following events:
+     *
+     * *  **`idle`**
+     *
+     *    Fires when an event handler finishes its run, just before returning to browser control.
+     *
+     *    This includes DOM event handlers, Ajax (including JSONP) event handlers, and {@link Ext.util.TaskRunner TaskRunners}
+     *
+     *    This can be useful for performing cleanup, or update tasks which need to happen only
+     *    after all code in an event handler has been run, but which should not be executed in a timer
+     *    due to the intervening browser reflow/repaint which would take place.
+     *
+     * * **`ready`**
+     *
+     *    Fires when the DOM is ready, and all required classes have been loaded. Functionally
+     *    the same as {@link Ext#onReady}, but must be called with the `single` option:
+     *
+     *         Ext.on({
+     *             ready: function() {
+     *                 console.log('document is ready!');
+     *             },
+     *             single: true
+     *         }); 
+     *
+     * * **`resumelayouts`**
+     *
+     *    Fires after global layout processing has been resumed in {@link Ext.AbstractComponent#resumeLayouts}.
+     */
+    Ext.globalEvents = globalEvents = new Observable({
+        events: {
+            idle: Ext.EventManager.idleEvent,
+            ready: Ext.EventManager.readyEvent
+        }
+    });
+
+    /**
+     * @member Ext
+     * @method on
+     * Shorthand for the {@link Ext.util.Observable#addListener} method of the
+     * {@link Ext#globalEvents} Observable instance.
+     * @inheritdoc Ext.util.Observable#addListener
+     */
+    Ext.on = function() {
+        return globalEvents.addListener.apply(globalEvents, arguments);
+    };
+
+    /**
+     * @member Ext
+     * @method
+     * Shorthand for the {@link Ext.util.Observable#removeListener} method of the
+     * {@link Ext#globalEvents} Observable instance.
+     * @inheritdoc Ext.util.Observable#removeListener
+     */
+    Ext.un = function() {
+        return globalEvents.removeListener.apply(globalEvents, arguments);
+    };
+
+    // this is considered experimental (along with beforeMethod, afterMethod, removeMethodListener?)
+    // allows for easier interceptor and sequences, including cancelling and overwriting the return value of the call
+    // private
+    function getMethodEvent(method){
+        var e = (this.methodEvents = this.methodEvents || {})[method],
+            returnValue,
+            v,
+            cancel,
+            obj = this,
+            makeCall;
+
+        if (!e) {
+            this.methodEvents[method] = e = {};
+            e.originalFn = this[method];
+            e.methodName = method;
+            e.before = [];
+            e.after = [];
+
+            makeCall = function(fn, scope, args){
+                if((v = fn.apply(scope || obj, args)) !== undefined){
+                    if (typeof v == 'object') {
+                        if(v.returnValue !== undefined){
+                            returnValue = v.returnValue;
+                        }else{
+                            returnValue = v;
+                        }
+                        cancel = !!v.cancel;
+                    }
+                    else
+                        if (v === false) {
+                            cancel = true;
+                        }
+                        else {
+                            returnValue = v;
+                        }
+                }
+            };
+
+            this[method] = function(){
+                var args = Array.prototype.slice.call(arguments, 0),
+                    b, i, len;
+                returnValue = v = undefined;
+                cancel = false;
+
+                for(i = 0, len = e.before.length; i < len; i++){
+                    b = e.before[i];
+                    makeCall(b.fn, b.scope, args);
+                    if (cancel) {
+                        return returnValue;
+                    }
+                }
+
+                if((v = e.originalFn.apply(obj, args)) !== undefined){
+                    returnValue = v;
+                }
+
+                for(i = 0, len = e.after.length; i < len; i++){
+                    b = e.after[i];
+                    makeCall(b.fn, b.scope, args);
+                    if (cancel) {
+                        return returnValue;
+                    }
+                }
+                return returnValue;
+            };
+        }
+        return e;
+    }
+
+    Ext.apply(proto, {
+        onClassMixedIn: prepareMixin,
+
+        // these are considered experimental
+        // allows for easier interceptor and sequences, including cancelling and overwriting the return value of the call
+        // adds an 'interceptor' called before the original method
+        beforeMethod : function(method, fn, scope){
+            getMethodEvent.call(this, method).before.push({
+                fn: fn,
+                scope: scope
+            });
+        },
+
+        // adds a 'sequence' called after the original method
+        afterMethod : function(method, fn, scope){
+            getMethodEvent.call(this, method).after.push({
+                fn: fn,
+                scope: scope
+            });
+        },
+
+        removeMethodListener: function(method, fn, scope){
+            var e = this.getMethodEvent(method),
+                i, len;
+            for(i = 0, len = e.before.length; i < len; i++){
+                if(e.before[i].fn == fn && e.before[i].scope == scope){
+                    Ext.Array.erase(e.before, i, 1);
+                    return;
+                }
+            }
+            for(i = 0, len = e.after.length; i < len; i++){
+                if(e.after[i].fn == fn && e.after[i].scope == scope){
+                    Ext.Array.erase(e.after, i, 1);
+                    return;
+                }
+            }
+        },
+
+        toggleEventLogging: function(toggle) {
+            Ext.util.Observable[toggle ? 'capture' : 'releaseCapture'](this, function(en) {
+                if (Ext.isDefined(Ext.global.console)) {
+                    Ext.global.console.log(en, arguments);
+                }
+            });
+        }
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require EventManager.js
+// @define Ext.EventObject
+
+/**
+ * @class Ext.EventObject
+
+Just as {@link Ext.Element} wraps around a native DOM node, Ext.EventObject
+wraps the browser's native event-object normalizing cross-browser differences,
+such as which mouse button is clicked, keys pressed, mechanisms to stop
+event-propagation along with a method to prevent default actions from taking place.
+
+For example:
+
+    function handleClick(e, t){ // e is not a standard event object, it is a Ext.EventObject
+        e.preventDefault();
+        var target = e.getTarget(); // same as t (the target HTMLElement)
+        ...
+    }
+
+    var myDiv = {@link Ext#get Ext.get}("myDiv");  // get reference to an {@link Ext.Element}
+    myDiv.on(         // 'on' is shorthand for addListener
+        "click",      // perform an action on click of myDiv
+        handleClick   // reference to the action handler
+    );
+
+    // other methods to do the same:
+    Ext.EventManager.on("myDiv", 'click', handleClick);
+    Ext.EventManager.addListener("myDiv", 'click', handleClick);
+
+ * @singleton
+ * @markdown
+ */
+Ext.define('Ext.EventObjectImpl', {
+                             
+
+    /** Key constant @type Number */
+    BACKSPACE: 8,
+    /** Key constant @type Number */
+    TAB: 9,
+    /** Key constant @type Number */
+    NUM_CENTER: 12,
+    /** Key constant @type Number */
+    ENTER: 13,
+    /** Key constant @type Number */
+    RETURN: 13,
+    /** Key constant @type Number */
+    SHIFT: 16,
+    /** Key constant @type Number */
+    CTRL: 17,
+    /** Key constant @type Number */
+    ALT: 18,
+    /** Key constant @type Number */
+    PAUSE: 19,
+    /** Key constant @type Number */
+    CAPS_LOCK: 20,
+    /** Key constant @type Number */
+    ESC: 27,
+    /** Key constant @type Number */
+    SPACE: 32,
+    /** Key constant @type Number */
+    PAGE_UP: 33,
+    /** Key constant @type Number */
+    PAGE_DOWN: 34,
+    /** Key constant @type Number */
+    END: 35,
+    /** Key constant @type Number */
+    HOME: 36,
+    /** Key constant @type Number */
+    LEFT: 37,
+    /** Key constant @type Number */
+    UP: 38,
+    /** Key constant @type Number */
+    RIGHT: 39,
+    /** Key constant @type Number */
+    DOWN: 40,
+    /** Key constant @type Number */
+    PRINT_SCREEN: 44,
+    /** Key constant @type Number */
+    INSERT: 45,
+    /** Key constant @type Number */
+    DELETE: 46,
+    /** Key constant @type Number */
+    ZERO: 48,
+    /** Key constant @type Number */
+    ONE: 49,
+    /** Key constant @type Number */
+    TWO: 50,
+    /** Key constant @type Number */
+    THREE: 51,
+    /** Key constant @type Number */
+    FOUR: 52,
+    /** Key constant @type Number */
+    FIVE: 53,
+    /** Key constant @type Number */
+    SIX: 54,
+    /** Key constant @type Number */
+    SEVEN: 55,
+    /** Key constant @type Number */
+    EIGHT: 56,
+    /** Key constant @type Number */
+    NINE: 57,
+    /** Key constant @type Number */
+    A: 65,
+    /** Key constant @type Number */
+    B: 66,
+    /** Key constant @type Number */
+    C: 67,
+    /** Key constant @type Number */
+    D: 68,
+    /** Key constant @type Number */
+    E: 69,
+    /** Key constant @type Number */
+    F: 70,
+    /** Key constant @type Number */
+    G: 71,
+    /** Key constant @type Number */
+    H: 72,
+    /** Key constant @type Number */
+    I: 73,
+    /** Key constant @type Number */
+    J: 74,
+    /** Key constant @type Number */
+    K: 75,
+    /** Key constant @type Number */
+    L: 76,
+    /** Key constant @type Number */
+    M: 77,
+    /** Key constant @type Number */
+    N: 78,
+    /** Key constant @type Number */
+    O: 79,
+    /** Key constant @type Number */
+    P: 80,
+    /** Key constant @type Number */
+    Q: 81,
+    /** Key constant @type Number */
+    R: 82,
+    /** Key constant @type Number */
+    S: 83,
+    /** Key constant @type Number */
+    T: 84,
+    /** Key constant @type Number */
+    U: 85,
+    /** Key constant @type Number */
+    V: 86,
+    /** Key constant @type Number */
+    W: 87,
+    /** Key constant @type Number */
+    X: 88,
+    /** Key constant @type Number */
+    Y: 89,
+    /** Key constant @type Number */
+    Z: 90,
+    /** Key constant @type Number */
+    CONTEXT_MENU: 93,
+    /** Key constant @type Number */
+    NUM_ZERO: 96,
+    /** Key constant @type Number */
+    NUM_ONE: 97,
+    /** Key constant @type Number */
+    NUM_TWO: 98,
+    /** Key constant @type Number */
+    NUM_THREE: 99,
+    /** Key constant @type Number */
+    NUM_FOUR: 100,
+    /** Key constant @type Number */
+    NUM_FIVE: 101,
+    /** Key constant @type Number */
+    NUM_SIX: 102,
+    /** Key constant @type Number */
+    NUM_SEVEN: 103,
+    /** Key constant @type Number */
+    NUM_EIGHT: 104,
+    /** Key constant @type Number */
+    NUM_NINE: 105,
+    /** Key constant @type Number */
+    NUM_MULTIPLY: 106,
+    /** Key constant @type Number */
+    NUM_PLUS: 107,
+    /** Key constant @type Number */
+    NUM_MINUS: 109,
+    /** Key constant @type Number */
+    NUM_PERIOD: 110,
+    /** Key constant @type Number */
+    NUM_DIVISION: 111,
+    /** Key constant @type Number */
+    F1: 112,
+    /** Key constant @type Number */
+    F2: 113,
+    /** Key constant @type Number */
+    F3: 114,
+    /** Key constant @type Number */
+    F4: 115,
+    /** Key constant @type Number */
+    F5: 116,
+    /** Key constant @type Number */
+    F6: 117,
+    /** Key constant @type Number */
+    F7: 118,
+    /** Key constant @type Number */
+    F8: 119,
+    /** Key constant @type Number */
+    F9: 120,
+    /** Key constant @type Number */
+    F10: 121,
+    /** Key constant @type Number */
+    F11: 122,
+    /** Key constant @type Number */
+    F12: 123,
+    /**
+     * The mouse wheel delta scaling factor. This value depends on browser version and OS and
+     * attempts to produce a similar scrolling experience across all platforms and browsers.
+     *
+     * To change this value:
+     *
+     *      Ext.EventObjectImpl.prototype.WHEEL_SCALE = 72;
+     *
+     * @type Number
+     * @markdown
+     */
+    WHEEL_SCALE: (function () {
+        var scale;
+
+        if (Ext.isGecko) {
+            // Firefox uses 3 on all platforms
+            scale = 3;
+        } else if (Ext.isMac) {
+            // Continuous scrolling devices have momentum and produce much more scroll than
+            // discrete devices on the same OS and browser. To make things exciting, Safari
+            // (and not Chrome) changed from small values to 120 (like IE).
+
+            if (Ext.isSafari && Ext.webKitVersion >= 532.0) {
+                // Safari changed the scrolling factor to match IE (for details see
+                // https://bugs.webkit.org/show_bug.cgi?id=24368). The WebKit version where this
+                // change was introduced was 532.0
+                //      Detailed discussion:
+                //      https://bugs.webkit.org/show_bug.cgi?id=29601
+                //      http://trac.webkit.org/browser/trunk/WebKit/chromium/src/mac/WebInputEventFactory.mm#L1063
+                scale = 120;
+            } else {
+                // MS optical wheel mouse produces multiples of 12 which is close enough
+                // to help tame the speed of the continuous mice...
+                scale = 12;
+            }
+
+            // Momentum scrolling produces very fast scrolling, so increase the scale factor
+            // to help produce similar results cross platform. This could be even larger and
+            // it would help those mice, but other mice would become almost unusable as a
+            // result (since we cannot tell which device type is in use).
+            scale *= 3;
+        } else {
+            // IE, Opera and other Windows browsers use 120.
+            scale = 120;
+        }
+
+        return scale;
+    }()),
+
+    /**
+     * Simple click regex
+     * @private
+     */
+    clickRe: /(dbl)?click/,
+    // safari keypress events for special keys return bad keycodes
+    safariKeys: {
+        3: 13, // enter
+        63234: 37, // left
+        63235: 39, // right
+        63232: 38, // up
+        63233: 40, // down
+        63276: 33, // page up
+        63277: 34, // page down
+        63272: 46, // delete
+        63273: 36, // home
+        63275: 35 // end
+    },
+    // normalize button clicks, don't see any way to feature detect this.
+    btnMap: Ext.isIE ? {
+        1: 0,
+        4: 1,
+        2: 2
+    } : {
+        0: 0,
+        1: 1,
+        2: 2
+    },
+    
+    /**
+     * @property {Boolean} ctrlKey
+     * True if the control key was down during the event.
+     * In Mac this will also be true when meta key was down.
+     */
+    /**
+     * @property {Boolean} altKey
+     * True if the alt key was down during the event.
+     */
+    /**
+     * @property {Boolean} shiftKey
+     * True if the shift key was down during the event.
+     */
+
+    constructor: function(event, freezeEvent){
+        if (event) {
+            this.setEvent(event.browserEvent || event, freezeEvent);
+        }
+    },
+
+    setEvent: function(event, freezeEvent){
+        var me = this, button, options;
+
+        if (event === me || (event && event.browserEvent)) { // already wrapped
+            return event;
+        }
+        me.browserEvent = event;
+        if (event) {
+            // normalize buttons
+            button = event.button ? me.btnMap[event.button] : (event.which ? event.which - 1 : -1);
+            if (me.clickRe.test(event.type) && button == -1) {
+                button = 0;
+            }
+            options = {
+                type: event.type,
+                button: button,
+                shiftKey: event.shiftKey,
+                // mac metaKey behaves like ctrlKey
+                ctrlKey: event.ctrlKey || event.metaKey || false,
+                altKey: event.altKey,
+                // in getKey these will be normalized for the mac
+                keyCode: event.keyCode,
+                charCode: event.charCode,
+                // cache the targets for the delayed and or buffered events
+                target: Ext.EventManager.getTarget(event),
+                relatedTarget: Ext.EventManager.getRelatedTarget(event),
+                currentTarget: event.currentTarget,
+                xy: (freezeEvent ? me.getXY() : null)
+            };
+        } else {
+            options = {
+                button: -1,
+                shiftKey: false,
+                ctrlKey: false,
+                altKey: false,
+                keyCode: 0,
+                charCode: 0,
+                target: null,
+                xy: [0, 0]
+            };
+        }
+        Ext.apply(me, options);
+        return me;
+    },
+
+    /**
+     * Stop the event (preventDefault and stopPropagation)
+     */
+    stopEvent: function(){
+        this.stopPropagation();
+        this.preventDefault();
+    },
+
+    /**
+     * Prevents the browsers default handling of the event.
+     */
+    preventDefault: function(){
+        if (this.browserEvent) {
+            Ext.EventManager.preventDefault(this.browserEvent);
+        }
+    },
+
+    /**
+     * Cancels bubbling of the event.
+     */
+    stopPropagation: function(){
+        var browserEvent = this.browserEvent;
+
+        if (browserEvent) {
+            if (browserEvent.type == 'mousedown') {
+                Ext.EventManager.stoppedMouseDownEvent.fire(this);
+            }
+            Ext.EventManager.stopPropagation(browserEvent);
+        }
+    },
+
+    /**
+     * Gets the character code for the event.
+     * @return {Number}
+     */
+    getCharCode: function(){
+        return this.charCode || this.keyCode;
+    },
+
+    /**
+     * Returns a normalized keyCode for the event.
+     * @return {Number} The key code
+     */
+    getKey: function(){
+        return this.normalizeKey(this.keyCode || this.charCode);
+    },
+
+    /**
+     * Normalize key codes across browsers
+     * @private
+     * @param {Number} key The key code
+     * @return {Number} The normalized code
+     */
+    normalizeKey: function(key){
+        // can't feature detect this
+        return Ext.isWebKit ? (this.safariKeys[key] || key) : key;
+    },
+
+    /**
+     * Gets the x coordinate of the event.
+     * @return {Number}
+     * @deprecated 4.0 Replaced by {@link #getX}
+     */
+    getPageX: function(){
+        return this.getX();
+    },
+
+    /**
+     * Gets the y coordinate of the event.
+     * @return {Number}
+     * @deprecated 4.0 Replaced by {@link #getY}
+     */
+    getPageY: function(){
+        return this.getY();
+    },
+
+    /**
+     * Gets the x coordinate of the event.
+     * @return {Number}
+     */
+    getX: function() {
+        return this.getXY()[0];
+    },
+
+    /**
+     * Gets the y coordinate of the event.
+     * @return {Number}
+     */
+    getY: function() {
+        return this.getXY()[1];
+    },
+
+    /**
+     * Gets the page coordinates of the event.
+     * @return {Number[]} The xy values like [x, y]
+     */
+    getXY: function() {
+        if (!this.xy) {
+            // same for XY
+            this.xy = Ext.EventManager.getPageXY(this.browserEvent);
+        }
+        return this.xy;
+    },
+
+    /**
+     * Gets the target for the event.
+     * @param {String} selector (optional) A simple selector to filter the target or look for an ancestor of the target
+     * @param {Number/HTMLElement} maxDepth (optional) The max depth to search as a number or element (defaults to 10 || document.body)
+     * @param {Boolean} returnEl (optional) True to return a Ext.Element object instead of DOM node
+     * @return {HTMLElement}
+     */
+    getTarget : function(selector, maxDepth, returnEl){
+        if (selector) {
+            return Ext.fly(this.target).findParent(selector, maxDepth, returnEl);
+        }
+        return returnEl ? Ext.get(this.target) : this.target;
+    },
+
+    /**
+     * Gets the related target.
+     * @param {String} selector (optional) A simple selector to filter the target or look for an ancestor of the target
+     * @param {Number/HTMLElement} maxDepth (optional) The max depth to search as a number or element (defaults to 10 || document.body)
+     * @param {Boolean} returnEl (optional) True to return a Ext.Element object instead of DOM node
+     * @return {HTMLElement}
+     */
+    getRelatedTarget : function(selector, maxDepth, returnEl){
+        if (selector && this.relatedTarget) {
+            return Ext.fly(this.relatedTarget).findParent(selector, maxDepth, returnEl);
+        }
+        return returnEl ? Ext.get(this.relatedTarget) : this.relatedTarget;
+    },
+
+    /**
+     * Correctly scales a given wheel delta.
+     * @param {Number} delta The delta value.
+     */
+    correctWheelDelta : function (delta) {
+        var scale = this.WHEEL_SCALE,
+            ret = Math.round(delta / scale);
+
+        if (!ret && delta) {
+            ret = (delta < 0) ? -1 : 1; // don't allow non-zero deltas to go to zero!
+        }
+
+        return ret;
+    },
+
+    /**
+     * Returns the mouse wheel deltas for this event.
+     * @return {Object} An object with "x" and "y" properties holding the mouse wheel deltas.
+     */
+    getWheelDeltas : function () {
+        var me = this,
+            event = me.browserEvent,
+            dx = 0, dy = 0; // the deltas
+
+        if (Ext.isDefined(event.wheelDeltaX)) { // WebKit has both dimensions
+            dx = event.wheelDeltaX;
+            dy = event.wheelDeltaY;
+        } else if (event.wheelDelta) { // old WebKit and IE
+            dy = event.wheelDelta;
+        } else if (event.detail) { // Gecko
+            dy = -event.detail; // gecko is backwards
+
+            // Gecko sometimes returns really big values if the user changes settings to
+            // scroll a whole page per scroll
+            if (dy > 100) {
+                dy = 3;
+            } else if (dy < -100) {
+                dy = -3;
+            }
+
+            // Firefox 3.1 adds an axis field to the event to indicate direction of
+            // scroll.  See https://developer.mozilla.org/en/Gecko-Specific_DOM_Events
+            if (Ext.isDefined(event.axis) && event.axis === event.HORIZONTAL_AXIS) {
+                dx = dy;
+                dy = 0;
+            }
+        }
+
+        return {
+            x: me.correctWheelDelta(dx),
+            y: me.correctWheelDelta(dy)
+        };
+    },
+
+    /**
+     * Normalizes mouse wheel y-delta across browsers. To get x-delta information, use
+     * {@link #getWheelDeltas} instead.
+     * @return {Number} The mouse wheel y-delta
+     */
+    getWheelDelta : function(){
+        var deltas = this.getWheelDeltas();
+
+        return deltas.y;
+    },
+
+    /**
+     * Returns true if the target of this event is a child of el.  Unless the allowEl parameter is set, it will return false if if the target is el.
+     * Example usage:<pre><code>
+// Handle click on any child of an element
+Ext.getBody().on('click', function(e){
+    if(e.within('some-el')){
+        alert('Clicked on a child of some-el!');
+    }
+});
+
+// Handle click directly on an element, ignoring clicks on child nodes
+Ext.getBody().on('click', function(e,t){
+    if((t.id == 'some-el') && !e.within(t, true)){
+        alert('Clicked directly on some-el!');
+    }
+});
+</code></pre>
+     * @param {String/HTMLElement/Ext.Element} el The id, DOM element or Ext.Element to check
+     * @param {Boolean} [related] `true` to test if the related target is within el instead of the target
+     * @param {Boolean} [allowEl] `true` to also check if the passed element is the target or related target
+     * @return {Boolean}
+     */
+    within : function(el, related, allowEl){
+        if(el){
+            var t = related ? this.getRelatedTarget() : this.getTarget(),
+                result;
+
+            if (t) {
+                result = Ext.fly(el, '_internal').contains(t);
+                if (!result && allowEl) {
+                    result = t == Ext.getDom(el);
+                }
+                return result;
+            }
+        }
+        return false;
+    },
+
+    /**
+     * Checks if the key pressed was a "navigation" key
+     * @return {Boolean} True if the press is a navigation keypress
+     */
+    isNavKeyPress : function(){
+        var me = this,
+            k = this.normalizeKey(me.keyCode);
+
+       return (k >= 33 && k <= 40) ||  // Page Up/Down, End, Home, Left, Up, Right, Down
+       k == me.RETURN ||
+       k == me.TAB ||
+       k == me.ESC;
+    },
+
+    /**
+     * Checks if the key pressed was a "special" key
+     * @return {Boolean} True if the press is a special keypress
+     */
+    isSpecialKey : function(){
+        var k = this.normalizeKey(this.keyCode);
+        return (this.type == 'keypress' && this.ctrlKey) ||
+        this.isNavKeyPress() ||
+        (k == this.BACKSPACE) || // Backspace
+        (k >= 16 && k <= 20) || // Shift, Ctrl, Alt, Pause, Caps Lock
+        (k >= 44 && k <= 46);   // Print Screen, Insert, Delete
+    },
+
+    /**
+     * Returns a point object that consists of the object coordinates.
+     * @return {Ext.util.Point} point
+     */
+    getPoint : function(){
+        var xy = this.getXY();
+        return new Ext.util.Point(xy[0], xy[1]);
+    },
+
+   /**
+    * Returns true if the control, meta, shift or alt key was pressed during this event.
+    * @return {Boolean}
+    */
+    hasModifier : function(){
+        return this.ctrlKey || this.altKey || this.shiftKey || this.metaKey;
+    },
+
+    /**
+     * Injects a DOM event using the data in this object and (optionally) a new target.
+     * This is a low-level technique and not likely to be used by application code. The
+     * currently supported event types are:
+     * <p><b>HTMLEvents</b></p>
+     * <ul>
+     * <li>load</li>
+     * <li>unload</li>
+     * <li>select</li>
+     * <li>change</li>
+     * <li>submit</li>
+     * <li>reset</li>
+     * <li>resize</li>
+     * <li>scroll</li>
+     * </ul>
+     * <p><b>MouseEvents</b></p>
+     * <ul>
+     * <li>click</li>
+     * <li>dblclick</li>
+     * <li>mousedown</li>
+     * <li>mouseup</li>
+     * <li>mouseover</li>
+     * <li>mousemove</li>
+     * <li>mouseout</li>
+     * </ul>
+     * <p><b>UIEvents</b></p>
+     * <ul>
+     * <li>focusin</li>
+     * <li>focusout</li>
+     * <li>activate</li>
+     * <li>focus</li>
+     * <li>blur</li>
+     * </ul>
+     * @param {Ext.Element/HTMLElement} target (optional) If specified, the target for the event. This
+     * is likely to be used when relaying a DOM event. If not specified, {@link #getTarget}
+     * is used to determine the target.
+     */
+    injectEvent: (function () {
+        var API,
+            dispatchers = {}, // keyed by event type (e.g., 'mousedown')
+            crazyIEButtons;
+
+        // Good reference: http://developer.yahoo.com/yui/docs/UserAction.js.html
+
+        // IE9 has createEvent, but this code causes major problems with htmleditor (it
+        // blocks all mouse events and maybe more). TODO
+
+        if (!Ext.isIE9m && document.createEvent) { // if (DOM compliant)
+            API = {
+                createHtmlEvent: function (doc, type, bubbles, cancelable) {
+                    var event = doc.createEvent('HTMLEvents');
+
+                    event.initEvent(type, bubbles, cancelable);
+                    return event;
+                },
+
+                createMouseEvent: function (doc, type, bubbles, cancelable, detail,
+                                            clientX, clientY, ctrlKey, altKey, shiftKey, metaKey,
+                                            button, relatedTarget) {
+                    var event = doc.createEvent('MouseEvents'),
+                        view = doc.defaultView || window;
+
+                    if (event.initMouseEvent) {
+                        event.initMouseEvent(type, bubbles, cancelable, view, detail,
+                                    clientX, clientY, clientX, clientY, ctrlKey, altKey,
+                                    shiftKey, metaKey, button, relatedTarget);
+                    } else { // old Safari
+                        event = doc.createEvent('UIEvents');
+                        event.initEvent(type, bubbles, cancelable);
+                        event.view = view;
+                        event.detail = detail;
+                        event.screenX = clientX;
+                        event.screenY = clientY;
+                        event.clientX = clientX;
+                        event.clientY = clientY;
+                        event.ctrlKey = ctrlKey;
+                        event.altKey = altKey;
+                        event.metaKey = metaKey;
+                        event.shiftKey = shiftKey;
+                        event.button = button;
+                        event.relatedTarget = relatedTarget;
+                    }
+
+                    return event;
+                },
+
+                createUIEvent: function (doc, type, bubbles, cancelable, detail) {
+                    var event = doc.createEvent('UIEvents'),
+                        view = doc.defaultView || window;
+
+                    event.initUIEvent(type, bubbles, cancelable, view, detail);
+                    return event;
+                },
+
+                fireEvent: function (target, type, event) {
+                    target.dispatchEvent(event);
+                },
+
+                fixTarget: function (target) {
+                    // Safari3 doesn't have window.dispatchEvent()
+                    if (target == window && !target.dispatchEvent) {
+                        return document;
+                    }
+
+                    return target;
+                }
+            };
+        } else if (document.createEventObject) { // else if (IE)
+            crazyIEButtons = { 0: 1, 1: 4, 2: 2 };
+
+            API = {
+                createHtmlEvent: function (doc, type, bubbles, cancelable) {
+                    var event = doc.createEventObject();
+                    event.bubbles = bubbles;
+                    event.cancelable = cancelable;
+                    return event;
+                },
+
+                createMouseEvent: function (doc, type, bubbles, cancelable, detail,
+                                            clientX, clientY, ctrlKey, altKey, shiftKey, metaKey,
+                                            button, relatedTarget) {
+                    var event = doc.createEventObject();
+                    event.bubbles = bubbles;
+                    event.cancelable = cancelable;
+                    event.detail = detail;
+                    event.screenX = clientX;
+                    event.screenY = clientY;
+                    event.clientX = clientX;
+                    event.clientY = clientY;
+                    event.ctrlKey = ctrlKey;
+                    event.altKey = altKey;
+                    event.shiftKey = shiftKey;
+                    event.metaKey = metaKey;
+                    event.button = crazyIEButtons[button] || button;
+                    event.relatedTarget = relatedTarget; // cannot assign to/fromElement
+                    return event;
+                },
+
+                createUIEvent: function (doc, type, bubbles, cancelable, detail) {
+                    var event = doc.createEventObject();
+                    event.bubbles = bubbles;
+                    event.cancelable = cancelable;
+                    return event;
+                },
+
+                fireEvent: function (target, type, event) {
+                    target.fireEvent('on' + type, event);
+                },
+
+                fixTarget: function (target) {
+                    if (target == document) {
+                        // IE6,IE7 thinks window==document and doesn't have window.fireEvent()
+                        // IE6,IE7 cannot properly call document.fireEvent()
+                        return document.documentElement;
+                    }
+
+                    return target;
+                }
+            };
+        }
+
+        //----------------
+        // HTMLEvents
+
+        Ext.Object.each({
+                load:   [false, false],
+                unload: [false, false],
+                select: [true, false],
+                change: [true, false],
+                submit: [true, true],
+                reset:  [true, false],
+                resize: [true, false],
+                scroll: [true, false]
+            },
+            function (name, value) {
+                var bubbles = value[0], cancelable = value[1];
+                dispatchers[name] = function (targetEl, srcEvent) {
+                    var e = API.createHtmlEvent(name, bubbles, cancelable);
+                    API.fireEvent(targetEl, name, e);
+                };
+            });
+
+        //----------------
+        // MouseEvents
+
+        function createMouseEventDispatcher (type, detail) {
+            var cancelable = (type != 'mousemove');
+            return function (targetEl, srcEvent) {
+                var xy = srcEvent.getXY(),
+                    e = API.createMouseEvent(targetEl.ownerDocument, type, true, cancelable,
+                                detail, xy[0], xy[1], srcEvent.ctrlKey, srcEvent.altKey,
+                                srcEvent.shiftKey, srcEvent.metaKey, srcEvent.button,
+                                srcEvent.relatedTarget);
+                API.fireEvent(targetEl, type, e);
+            };
+        }
+
+        Ext.each(['click', 'dblclick', 'mousedown', 'mouseup', 'mouseover', 'mousemove', 'mouseout'],
+            function (eventName) {
+                dispatchers[eventName] = createMouseEventDispatcher(eventName, 1);
+            });
+
+        //----------------
+        // UIEvents
+
+        Ext.Object.each({
+                focusin:  [true, false],
+                focusout: [true, false],
+                activate: [true, true],
+                focus:    [false, false],
+                blur:     [false, false]
+            },
+            function (name, value) {
+                var bubbles = value[0], cancelable = value[1];
+                dispatchers[name] = function (targetEl, srcEvent) {
+                    var e = API.createUIEvent(targetEl.ownerDocument, name, bubbles, cancelable, 1);
+                    API.fireEvent(targetEl, name, e);
+                };
+            });
+
+        //---------
+        if (!API) {
+            // not even sure what ancient browsers fall into this category...
+
+            dispatchers = {}; // never mind all those we just built :P
+
+            API = {
+                fixTarget: Ext.identityFn
+            };
+        }
+
+        function cannotInject (target, srcEvent) {
+            // TODO log something
+        }
+
+        return function (target) {
+            var me = this,
+                dispatcher = dispatchers[me.type] || cannotInject,
+                t = target ? (target.dom || target) : me.getTarget();
+
+            t = API.fixTarget(t);
+            dispatcher(t, me);
+        };
+    }()) // call to produce method
+
+}, function() {
+
+Ext.EventObject = new Ext.EventObjectImpl();
+
+});
+
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require ../EventObject.js
+
+/**
+ * @class Ext.dom.AbstractQuery
+ * @private
+ */
+Ext.define('Ext.dom.AbstractQuery', {
+    /**
+     * Selects a group of elements.
+     * @param {String} selector The selector/xpath query (can be a comma separated list of selectors)
+     * @param {HTMLElement/String} [root] The start of the query (defaults to document).
+     * @return {HTMLElement[]} An Array of DOM elements which match the selector. If there are
+     * no matches, and empty Array is returned.
+     */
+    select: function(q, root) {
+        var results = [],
+            nodes,
+            i,
+            j,
+            qlen,
+            nlen;
+
+        root = root || document;
+
+        if (typeof root == 'string') {
+            root = document.getElementById(root);
+        }
+
+        q = q.split(",");
+
+        for (i = 0,qlen = q.length; i < qlen; i++) {
+            if (typeof q[i] == 'string') {
+                
+                //support for node attribute selection
+                if (typeof q[i][0] == '@') {
+                    nodes = root.getAttributeNode(q[i].substring(1));
+                    results.push(nodes);
+                } else {
+                    nodes = root.querySelectorAll(q[i]);
+
+                    for (j = 0,nlen = nodes.length; j < nlen; j++) {
+                        results.push(nodes[j]);
+                    }
+                }
+            }
+        }
+
+        return results;
+    },
+
+    /**
+     * Selects a single element.
+     * @param {String} selector The selector/xpath query
+     * @param {HTMLElement/String} [root] The start of the query (defaults to document).
+     * @return {HTMLElement} The DOM element which matched the selector.
+     */
+    selectNode: function(q, root) {
+        return this.select(q, root)[0];
+    },
+
+    /**
+     * Returns true if the passed element(s) match the passed simple selector (e.g. div.some-class or span:first-child)
+     * @param {String/HTMLElement/Array} el An element id, element or array of elements
+     * @param {String} selector The simple selector to test
+     * @return {Boolean}
+     */
+    is: function(el, q) {
+        if (typeof el == "string") {
+            el = document.getElementById(el);
+        }
+        return this.select(q).indexOf(el) !== -1;
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require AbstractQuery.js
+
+/**
+ * Abstract base class for {@link Ext.dom.Helper}.
+ * @private
+ */
+Ext.define('Ext.dom.AbstractHelper', {
+    emptyTags : /^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i,
+    confRe : /^(?:tag|children|cn|html|tpl|tplData)$/i,
+    endRe : /end/i,
+    styleSepRe: /\s*(?::|;)\s*/,
+
+    // Since cls & for are reserved words, we need to transform them
+    attributeTransform: { cls : 'class', htmlFor : 'for' },
+
+    closeTags: {},
+
+    decamelizeName : (function () {
+        var camelCaseRe = /([a-z])([A-Z])/g,
+            cache = {};
+
+        function decamel (match, p1, p2) {
+            return p1 + '-' + p2.toLowerCase();
+        }
+
+        return function (s) {
+            return cache[s] || (cache[s] = s.replace(camelCaseRe, decamel));
+        };
+    }()),
+
+    generateMarkup: function(spec, buffer) {
+        var me = this,
+            specType = typeof spec,
+            attr, val, tag, i, closeTags;
+
+        if (specType == "string" || specType == "number") {
+            buffer.push(spec);
+        } else if (Ext.isArray(spec)) {
+            for (i = 0; i < spec.length; i++) {
+                if (spec[i]) {
+                    me.generateMarkup(spec[i], buffer);
+                }
+            }
+        } else {
+            tag = spec.tag || 'div';
+            buffer.push('<', tag);
+
+            for (attr in spec) {
+                if (spec.hasOwnProperty(attr)) {
+                    val = spec[attr];
+                    if (!me.confRe.test(attr)) {
+                        if (typeof val == "object") {
+                            buffer.push(' ', attr, '="');
+                            me.generateStyles(val, buffer).push('"');
+                        } else {
+                            buffer.push(' ', me.attributeTransform[attr] || attr, '="', val, '"');
+                        }
+                    }
+                }
+            }
+
+            // Now either just close the tag or try to add children and close the tag.
+            if (me.emptyTags.test(tag)) {
+                buffer.push('/>');
+            } else {
+                buffer.push('>');
+
+                // Apply the tpl html, and cn specifications
+                if ((val = spec.tpl)) {
+                    val.applyOut(spec.tplData, buffer);
+                }
+                if ((val = spec.html)) {
+                    buffer.push(val);
+                }
+                if ((val = spec.cn || spec.children)) {
+                    me.generateMarkup(val, buffer);
+                }
+
+                // we generate a lot of close tags, so cache them rather than push 3 parts
+                closeTags = me.closeTags;
+                buffer.push(closeTags[tag] || (closeTags[tag] = '</' + tag + '>'));
+            }
+        }
+
+        return buffer;
+    },
+
+    /**
+     * Converts the styles from the given object to text. The styles are CSS style names
+     * with their associated value.
+     * 
+     * The basic form of this method returns a string:
+     * 
+     *      var s = Ext.DomHelper.generateStyles({
+     *          backgroundColor: 'red'
+     *      });
+     *      
+     *      // s = 'background-color:red;'
+     *
+     * Alternatively, this method can append to an output array.
+     * 
+     *      var buf = [];
+     *
+     *      ...
+     *
+     *      Ext.DomHelper.generateStyles({
+     *          backgroundColor: 'red'
+     *      }, buf);
+     *
+     * In this case, the style text is pushed on to the array and the array is returned.
+     * 
+     * @param {Object} styles The object describing the styles.
+     * @param {String[]} [buffer] The output buffer.
+     * @return {String/String[]} If buffer is passed, it is returned. Otherwise the style
+     * string is returned.
+     */
+    generateStyles: function (styles, buffer) {
+        var a = buffer || [],
+            name;
+
+        for (name in styles) {
+            if (styles.hasOwnProperty(name)) {
+                a.push(this.decamelizeName(name), ':', styles[name], ';');
+            }
+        }
+
+        return buffer || a.join('');
+    },
+
+    /**
+     * Returns the markup for the passed Element(s) config.
+     * @param {Object} spec The DOM object spec (and children)
+     * @return {String}
+     */
+    markup: function(spec) {
+        if (typeof spec == "string") {
+            return spec;
+        }
+
+        var buf = this.generateMarkup(spec, []);
+        return buf.join('');
+    },
+
+    /**
+     * Applies a style specification to an element.
+     * @param {String/HTMLElement} el The element to apply styles to
+     * @param {String/Object/Function} styles A style specification string e.g. 'width:100px', or object in the form {width:'100px'}, or
+     * a function which returns such a specification.
+     */
+    applyStyles: function(el, styles) {
+        if (styles) {
+            var i = 0,
+                len;
+
+            el = Ext.fly(el, '_applyStyles');
+            if (typeof styles == 'function') {
+                styles = styles.call();
+            }
+            if (typeof styles == 'string') {
+                styles = Ext.util.Format.trim(styles).split(this.styleSepRe);
+                for (len = styles.length; i < len;) {
+                    el.setStyle(styles[i++], styles[i++]);
+                }
+            } else if (Ext.isObject(styles)) {
+                el.setStyle(styles);
+            }
+        }
+    },
+
+    /**
+     * Inserts an HTML fragment into the DOM.
+     * @param {String} where Where to insert the html in relation to el - beforeBegin, afterBegin, beforeEnd, afterEnd.
+     *
+     * For example take the following HTML: `<div>Contents</div>`
+     *
+     * Using different `where` values inserts element to the following places:
+     *
+     * - beforeBegin: `<HERE><div>Contents</div>`
+     * - afterBegin: `<div><HERE>Contents</div>`
+     * - beforeEnd: `<div>Contents<HERE></div>`
+     * - afterEnd: `<div>Contents</div><HERE>`
+     *
+     * @param {HTMLElement/TextNode} el The context element
+     * @param {String} html The HTML fragment
+     * @return {HTMLElement} The new node
+     */
+    insertHtml: function(where, el, html) {
+        var hash = {},
+            setStart,
+            range,
+            frag,
+            rangeEl;
+
+        where = where.toLowerCase();
+
+        // add these here because they are used in both branches of the condition.
+        hash['beforebegin'] = ['BeforeBegin', 'previousSibling'];
+        hash['afterend'] = ['AfterEnd', 'nextSibling'];
+
+        range = el.ownerDocument.createRange();
+        setStart = 'setStart' + (this.endRe.test(where) ? 'After' : 'Before');
+        if (hash[where]) {
+            range[setStart](el);
+            frag = range.createContextualFragment(html);
+            el.parentNode.insertBefore(frag, where == 'beforebegin' ? el : el.nextSibling);
+            return el[(where == 'beforebegin' ? 'previous' : 'next') + 'Sibling'];
+        }
+        else {
+            rangeEl = (where == 'afterbegin' ? 'first' : 'last') + 'Child';
+            if (el.firstChild) {
+                range[setStart](el[rangeEl]);
+                frag = range.createContextualFragment(html);
+                if (where == 'afterbegin') {
+                    el.insertBefore(frag, el.firstChild);
+                }
+                else {
+                    el.appendChild(frag);
+                }
+            }
+            else {
+                el.innerHTML = html;
+            }
+            return el[rangeEl];
+        }
+
+        throw 'Illegal insertion point -> "' + where + '"';
+    },
+
+    /**
+     * Creates new DOM element(s) and inserts them before el.
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/String} o The DOM object spec (and children) or raw HTML blob
+     * @param {Boolean} [returnElement] true to return a Ext.Element
+     * @return {HTMLElement/Ext.Element} The new node
+     */
+    insertBefore: function(el, o, returnElement) {
+        return this.doInsert(el, o, returnElement, 'beforebegin');
+    },
+
+    /**
+     * Creates new DOM element(s) and inserts them after el.
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object} o The DOM object spec (and children)
+     * @param {Boolean} [returnElement] true to return a Ext.Element
+     * @return {HTMLElement/Ext.Element} The new node
+     */
+    insertAfter: function(el, o, returnElement) {
+        return this.doInsert(el, o, returnElement, 'afterend', 'nextSibling');
+    },
+
+    /**
+     * Creates new DOM element(s) and inserts them as the first child of el.
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/String} o The DOM object spec (and children) or raw HTML blob
+     * @param {Boolean} [returnElement] true to return a Ext.Element
+     * @return {HTMLElement/Ext.Element} The new node
+     */
+    insertFirst: function(el, o, returnElement) {
+        return this.doInsert(el, o, returnElement, 'afterbegin', 'firstChild');
+    },
+
+    /**
+     * Creates new DOM element(s) and appends them to el.
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/String} o The DOM object spec (and children) or raw HTML blob
+     * @param {Boolean} [returnElement] true to return a Ext.Element
+     * @return {HTMLElement/Ext.Element} The new node
+     */
+    append: function(el, o, returnElement) {
+        return this.doInsert(el, o, returnElement, 'beforeend', '', true);
+    },
+
+    /**
+     * Creates new DOM element(s) and overwrites the contents of el with them.
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/String} o The DOM object spec (and children) or raw HTML blob
+     * @param {Boolean} [returnElement] true to return a Ext.Element
+     * @return {HTMLElement/Ext.Element} The new node
+     */
+    overwrite: function(el, o, returnElement) {
+        el = Ext.getDom(el);
+        el.innerHTML = this.markup(o);
+        return returnElement ? Ext.get(el.firstChild) : el.firstChild;
+    },
+
+    doInsert: function(el, o, returnElement, pos, sibling, append) {
+        var newNode = this.insertHtml(pos, Ext.getDom(el), this.markup(o));
+        return returnElement ? Ext.get(newNode, true) : newNode;
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.AbstractElement_static', {
+    override: 'Ext.dom.AbstractElement',
+
+    inheritableStatics: {
+        unitRe: /\d+(px|em|%|en|ex|pt|in|cm|mm|pc)$/i,
+        camelRe: /(-[a-z])/gi,
+        msRe: /^-ms-/,
+        cssRe: /([a-z0-9\-]+)\s*:\s*([^;\s]+(?:\s*[^;\s]+)*)?;?/gi,
+        opacityRe: /alpha\(opacity=(.*)\)/i,
+        propertyCache: {},
+        defaultUnit : "px",
+        borders: {l: 'border-left-width', r: 'border-right-width', t: 'border-top-width', b: 'border-bottom-width'},
+        paddings: {l: 'padding-left', r: 'padding-right', t: 'padding-top', b: 'padding-bottom'},
+        margins: {l: 'margin-left', r: 'margin-right', t: 'margin-top', b: 'margin-bottom'},
+        /**
+        * Test if size has a unit, otherwise appends the passed unit string, or the default for this Element.
+        * @param size {Object} The size to set
+        * @param units {String} The units to append to a numeric size value
+        * @private
+        * @static
+        */
+        addUnits: function(size, units) {
+            // Most common case first: Size is set to a number
+            if (typeof size == 'number') {
+                return size + (units || this.defaultUnit || 'px');
+            }
+
+            // Size set to a value which means "auto"
+            if (size === "" || size == "auto" || size === undefined || size === null) {
+                return size || '';
+            }
+
+            // Otherwise, warn if it's not a valid CSS measurement
+            if (!this.unitRe.test(size)) {
+                if (Ext.isDefined(Ext.global.console)) {
+                    Ext.global.console.warn("Warning, size detected as NaN on Element.addUnits.");
+                }
+                return size || '';
+            }
+
+            return size;
+        },
+
+        /**
+        * @static
+        * @private
+        */
+        isAncestor: function(p, c) {
+            var ret = false;
+
+            p = Ext.getDom(p);
+            c = Ext.getDom(c);
+            if (p && c) {
+                if (p.contains) {
+                    return p.contains(c);
+                } else if (p.compareDocumentPosition) {
+                    return !!(p.compareDocumentPosition(c) & 16);
+                } else {
+                    while ((c = c.parentNode)) {
+                        ret = c == p || ret;
+                    }
+                }
+            }
+            return ret;
+        },
+
+        /**
+        * Parses a number or string representing margin sizes into an object. Supports CSS-style margin declarations
+        * (e.g. 10, "10", "10 10", "10 10 10" and "10 10 10 10" are all valid options and would return the same result)
+        * @static
+        * @param {Number/String} box The encoded margins
+        * @return {Object} An object with margin sizes for top, right, bottom and left
+        */
+        parseBox: function(box) {
+            box = box || 0;
+            
+            var type = typeof box,
+                parts,
+                ln;
+
+            if (type === 'number') {
+                return {
+                    top   : box,
+                    right : box,
+                    bottom: box,
+                    left  : box
+                };
+             } else if (type !== 'string') {
+                 // If not a number or a string, assume we've been given a box config.
+                 return box;
+             }
+
+            parts  = box.split(' ');
+            ln = parts.length;
+
+            if (ln == 1) {
+                parts[1] = parts[2] = parts[3] = parts[0];
+            } else if (ln == 2) {
+                parts[2] = parts[0];
+                parts[3] = parts[1];
+            } else if (ln == 3) {
+                parts[3] = parts[1];
+            }
+
+            return {
+                top   :parseFloat(parts[0]) || 0,
+                right :parseFloat(parts[1]) || 0,
+                bottom:parseFloat(parts[2]) || 0,
+                left  :parseFloat(parts[3]) || 0
+            };
+        },
+
+        /**
+         * Parses a number or string representing margin sizes into an object. Supports CSS-style margin declarations
+         * (e.g. 10, "10", "10 10", "10 10 10" and "10 10 10 10" are all valid options and would return the same result)
+         * @static
+         * @param {Number/String/Object} box The encoded margins, or an object with top, right,
+         * bottom, and left properties
+         * @param {String} units The type of units to add
+         * @return {String} An string with unitized (px if units is not specified) metrics for top, right, bottom and left
+         */
+        unitizeBox: function(box, units) {
+            var a = this.addUnits,
+                b = this.parseBox(box);
+
+            return a(b.top, units) + ' ' +
+                   a(b.right, units) + ' ' +
+                   a(b.bottom, units) + ' ' +
+                   a(b.left, units);
+
+        },
+
+        // private
+        camelReplaceFn: function(m, a) {
+            return a.charAt(1).toUpperCase();
+        },
+
+        /**
+        * Normalizes CSS property keys from dash delimited to camel case JavaScript Syntax.
+        * For example:
+        *
+        * - border-width -> borderWidth
+        * - padding-top -> paddingTop
+        *
+        * @static
+        * @param {String} prop The property to normalize
+        * @return {String} The normalized string
+        */
+        normalize: function(prop) {
+            // TODO: Mobile optimization?
+            if (prop == 'float') {
+                prop = Ext.supports.Float ? 'cssFloat' : 'styleFloat';
+            }
+            // For '-ms-foo' we need msFoo
+            return this.propertyCache[prop] || (this.propertyCache[prop] = prop.replace(this.msRe, 'ms-').replace(this.camelRe, this.camelReplaceFn));
+        },
+
+        /**
+        * Retrieves the document height
+        * @static
+        * @return {Number} documentHeight
+        */
+        getDocumentHeight: function() {
+            return Math.max(!Ext.isStrict ? document.body.scrollHeight : document.documentElement.scrollHeight, this.getViewportHeight());
+        },
+
+        /**
+        * Retrieves the document width
+        * @static
+        * @return {Number} documentWidth
+        */
+        getDocumentWidth: function() {
+            return Math.max(!Ext.isStrict ? document.body.scrollWidth : document.documentElement.scrollWidth, this.getViewportWidth());
+        },
+
+        /**
+        * Retrieves the viewport height of the window.
+        * @static
+        * @return {Number} viewportHeight
+        */
+        getViewportHeight: function(){
+            return window.innerHeight;
+        },
+
+        /**
+        * Retrieves the viewport width of the window.
+        * @static
+        * @return {Number} viewportWidth
+        */
+        getViewportWidth: function() {
+            return window.innerWidth;
+        },
+
+        /**
+        * Retrieves the viewport size of the window.
+        * @static
+        * @return {Object} object containing width and height properties
+        */
+        getViewSize: function() {
+            return {
+                width: window.innerWidth,
+                height: window.innerHeight
+            };
+        },
+
+        /**
+        * Retrieves the current orientation of the window. This is calculated by
+        * determing if the height is greater than the width.
+        * @static
+        * @return {String} Orientation of window: 'portrait' or 'landscape'
+        */
+        getOrientation: function() {
+            if (Ext.supports.OrientationChange) {
+                return (window.orientation == 0) ? 'portrait' : 'landscape';
+            }
+
+            return (window.innerHeight > window.innerWidth) ? 'portrait' : 'landscape';
+        },
+
+        /**
+        * Returns the top Element that is located at the passed coordinates
+        * @static
+        * @param {Number} x The x coordinate
+        * @param {Number} y The y coordinate
+        * @return {String} The found Element
+        */
+        fromPoint: function(x, y) {
+            return Ext.get(document.elementFromPoint(x, y));
+        },
+
+        /**
+        * Converts a CSS string into an object with a property for each style.
+        *
+        * The sample code below would return an object with 2 properties, one
+        * for background-color and one for color.
+        *
+        *     var css = 'background-color: red;color: blue; ';
+        *     console.log(Ext.dom.Element.parseStyles(css));
+        *
+        * @static
+        * @param {String} styles A CSS string
+        * @return {Object} styles
+        */
+        parseStyles: function(styles){
+            var out = {},
+                cssRe = this.cssRe,
+                matches;
+
+            if (styles) {
+                // Since we're using the g flag on the regex, we need to set the lastIndex.
+                // This automatically happens on some implementations, but not others, see:
+                // http://stackoverflow.com/questions/2645273/javascript-regular-expression-literal-persists-between-function-calls
+                // http://blog.stevenlevithan.com/archives/fixing-javascript-regexp
+                cssRe.lastIndex = 0;
+                while ((matches = cssRe.exec(styles))) {
+                    out[matches[1]] = matches[2]||'';
+                }
+            }
+            return out;
+        }
+    }
+},
+function () {
+    var doc = document,
+        activeElement = null,
+        isCSS1 = doc.compatMode == "CSS1Compat";
+
+    // If the browser does not support document.activeElement we need some assistance.
+    // This covers old Safari 3.2 (4.0 added activeElement along with just about all
+    // other browsers). We need this support to handle issues with old Safari.
+    if (!('activeElement' in doc) && doc.addEventListener) {
+        doc.addEventListener('focus',
+            function (ev) {
+                if (ev && ev.target) {
+                    activeElement = (ev.target == doc) ? null : ev.target;
+                }
+            }, true);
+    }
+
+    /*
+     * Helper function to create the function that will restore the selection.
+     */
+    function makeSelectionRestoreFn (activeEl, start, end) {
+        return function () {
+            activeEl.selectionStart = start;
+            activeEl.selectionEnd = end;
+        };
+    }
+
+    this.addInheritableStatics({
+        /**
+         * Returns the active element in the DOM. If the browser supports activeElement
+         * on the document, this is returned. If not, the focus is tracked and the active
+         * element is maintained internally.
+         * @return {HTMLElement} The active (focused) element in the document.
+         */
+        getActiveElement: function () {
+            var active;
+            // In IE 6/7, calling activeElement can sometimes throw an Unspecified Error,
+            // so we need to wrap it in a try catch
+            
+            try {
+                active = doc.activeElement;
+            } catch(e) {}
+            
+            // Default to the body if we can't find anything
+            // https://developer.mozilla.org/en-US/docs/DOM/document.activeElement
+            active = active || activeElement;
+            if (!active) {
+                active = activeElement = document.body;
+            }
+            return active;
+        },
+
+        /**
+         * Creates a function to call to clean up problems with the work-around for the
+         * WebKit RightMargin bug. The work-around is to add "display: 'inline-block'" to
+         * the element before calling getComputedStyle and then to restore its original
+         * display value. The problem with this is that it corrupts the selection of an
+         * INPUT or TEXTAREA element (as in the "I-beam" goes away but ths focus remains).
+         * To cleanup after this, we need to capture the selection of any such element and
+         * then restore it after we have restored the display style.
+         *
+         * @param {Ext.dom.Element} target The top-most element being adjusted.
+         * @private
+         */
+        getRightMarginFixCleaner: function (target) {
+            var supports = Ext.supports,
+                hasInputBug = supports.DisplayChangeInputSelectionBug,
+                hasTextAreaBug = supports.DisplayChangeTextAreaSelectionBug,
+                activeEl,
+                tag,
+                start,
+                end;
+
+            if (hasInputBug || hasTextAreaBug) {
+                activeEl = doc.activeElement || activeElement; // save a call
+                tag = activeEl && activeEl.tagName;
+
+                if ((hasTextAreaBug && tag == 'TEXTAREA') ||
+                    (hasInputBug && tag == 'INPUT' && activeEl.type == 'text')) {
+                    if (Ext.dom.Element.isAncestor(target, activeEl)) {
+                        start = activeEl.selectionStart;
+                        end = activeEl.selectionEnd;
+
+                        if (Ext.isNumber(start) && Ext.isNumber(end)) { // to be safe...
+                            // We don't create the raw closure here inline because that
+                            // will be costly even if we don't want to return it (nested
+                            // function decls and exprs are often instantiated on entry
+                            // regardless of whether execution ever reaches them):
+                            return makeSelectionRestoreFn(activeEl, start, end);
+                        }
+                    }
+                }
+            }
+
+            return Ext.emptyFn; // avoid special cases, just return a nop
+        },
+
+        getViewWidth: function(full) {
+            return full ? Ext.dom.Element.getDocumentWidth() : Ext.dom.Element.getViewportWidth();
+        },
+
+        getViewHeight: function(full) {
+            return full ? Ext.dom.Element.getDocumentHeight() : Ext.dom.Element.getViewportHeight();
+        },
+
+        getDocumentHeight: function() {
+            return Math.max(!isCSS1 ? doc.body.scrollHeight : doc.documentElement.scrollHeight, Ext.dom.Element.getViewportHeight());
+        },
+
+        getDocumentWidth: function() {
+            return Math.max(!isCSS1 ? doc.body.scrollWidth : doc.documentElement.scrollWidth, Ext.dom.Element.getViewportWidth());
+        },
+
+        getViewportHeight: function(){
+            return Ext.isIE9m ?
+                   (Ext.isStrict ? doc.documentElement.clientHeight : doc.body.clientHeight) :
+                   self.innerHeight;
+        },
+
+        getViewportWidth: function() {
+            return (!Ext.isStrict && !Ext.isOpera) ? doc.body.clientWidth :
+                   Ext.isIE9m ? doc.documentElement.clientWidth : self.innerWidth;
+        },
+
+        /**
+         * Serializes a DOM form into a url encoded string
+         * @param {Object} form The form
+         * @return {String} The url encoded form
+         */
+        serializeForm: function(form) {
+            var fElements = form.elements || (document.forms[form] || Ext.getDom(form)).elements,
+                hasSubmit = false,
+                encoder   = encodeURIComponent,
+                data      = '',
+                eLen      = fElements.length,
+                element, name, type, options, hasValue, e,
+                o, oLen, opt;
+
+            for (e = 0; e < eLen; e++) {
+                element = fElements[e];
+                name    = element.name;
+                type    = element.type;
+                options = element.options;
+
+                if (!element.disabled && name) {
+                    if (/select-(one|multiple)/i.test(type)) {
+                        oLen = options.length;
+                        for (o = 0; o < oLen; o++) {
+                            opt = options[o];
+                            if (opt.selected) {
+                                hasValue = opt.hasAttribute ? opt.hasAttribute('value') : opt.getAttributeNode('value').specified;
+                                data += Ext.String.format("{0}={1}&", encoder(name), encoder(hasValue ? opt.value : opt.text));
+                            }
+                        }
+                    } else if (!(/file|undefined|reset|button/i.test(type))) {
+                        if (!(/radio|checkbox/i.test(type) && !element.checked) && !(type == 'submit' && hasSubmit)) {
+                            data += encoder(name) + '=' + encoder(element.value) + '&';
+                            hasSubmit = /submit/i.test(type);
+                        }
+                    }
+                }
+            }
+            return data.substr(0, data.length - 1);
+        }
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.AbstractElement_insertion', {
+    override: 'Ext.dom.AbstractElement',
+
+    /**
+     * Appends the passed element(s) to this element
+     * @param {String/HTMLElement/Ext.dom.AbstractElement/Object} el The id or element to insert or a DomHelper config
+     * The id of the node, a DOM Node or an existing Element.
+     * @param {Boolean} [returnDom=false] True to return the raw DOM element instead of Ext.dom.AbstractElement
+     * @return {Ext.dom.AbstractElement} The inserted Element.
+     */
+    appendChild: function(el, returnDom) {
+        var me = this,
+            insertEl,
+            eLen, e, oldUseDom;
+
+        if (el.nodeType || el.dom || typeof el == 'string') { // element
+            el = Ext.getDom(el);
+            me.dom.appendChild(el);
+            return !returnDom ? Ext.get(el) : el;
+        } else if (el.length) {
+            // append all elements to a documentFragment
+            insertEl = Ext.fly(document.createDocumentFragment(), '_internal');
+            eLen = el.length;
+
+            // DocumentFragments cannot accept innerHTML
+            Ext.DomHelper.useDom = true;
+            for (e = 0; e < eLen; e++) {
+                insertEl.appendChild(el[e], returnDom);
+            }
+            Ext.DomHelper.useDom = oldUseDom;
+            me.dom.appendChild(insertEl.dom);
+            return returnDom ? insertEl.dom : insertEl;
+        }
+        else { // dh config
+            return me.createChild(el, null, returnDom);
+        }
+    },
+
+    /**
+     * Appends this element to the passed element
+     * @param {String/HTMLElement/Ext.dom.AbstractElement} el The new parent element.
+     * The id of the node, a DOM Node or an existing Element.
+     * @return {Ext.dom.AbstractElement} This element
+     */
+    appendTo: function(el) {
+        Ext.getDom(el).appendChild(this.dom);
+        return this;
+    },
+
+    /**
+     * Inserts this element before the passed element in the DOM
+     * @param {String/HTMLElement/Ext.dom.AbstractElement} el The element before which this element will be inserted.
+     * The id of the node, a DOM Node or an existing Element.
+     * @return {Ext.dom.AbstractElement} This element
+     */
+    insertBefore: function(el) {
+        el = Ext.getDom(el);
+        el.parentNode.insertBefore(this.dom, el);
+        return this;
+    },
+
+    /**
+     * Inserts this element after the passed element in the DOM
+     * @param {String/HTMLElement/Ext.dom.AbstractElement} el The element to insert after.
+     * The id of the node, a DOM Node or an existing Element.
+     * @return {Ext.dom.AbstractElement} This element
+     */
+    insertAfter: function(el) {
+        el = Ext.getDom(el);
+        el.parentNode.insertBefore(this.dom, el.nextSibling);
+        return this;
+    },
+
+    /**
+     * Inserts (or creates) an element (or DomHelper config) as the first child of this element
+     * @param {String/HTMLElement/Ext.dom.AbstractElement/Object} el The id or element to insert or a DomHelper config
+     * to create and insert
+     * @return {Ext.dom.AbstractElement} The new child
+     */
+    insertFirst: function(el, returnDom) {
+        el = el || {};
+        if (el.nodeType || el.dom || typeof el == 'string') { // element
+            el = Ext.getDom(el);
+            this.dom.insertBefore(el, this.dom.firstChild);
+            return !returnDom ? Ext.get(el) : el;
+        }
+        else { // dh config
+            return this.createChild(el, this.dom.firstChild, returnDom);
+        }
+    },
+
+    /**
+     * Inserts (or creates) the passed element (or DomHelper config) as a sibling of this element
+     * @param {String/HTMLElement/Ext.dom.AbstractElement/Object/Array} el The id, element to insert or a DomHelper config
+     * to create and insert *or* an array of any of those.
+     * @param {String} [where='before'] 'before' or 'after'
+     * @param {Boolean} [returnDom=false] True to return the raw DOM element instead of Ext.dom.AbstractElement
+     * @return {Ext.dom.AbstractElement} The inserted Element. If an array is passed, the last inserted element is returned.
+     */
+    insertSibling: function(el, where, returnDom) {
+        var me        = this,
+            DomHelper = Ext.core.DomHelper,
+            oldUseDom = DomHelper.useDom,
+            isAfter   = (where || 'before').toLowerCase() == 'after',
+            rt, insertEl, eLen, e;
+
+        if (Ext.isArray(el)) {
+            // append all elements to a documentFragment
+            insertEl = Ext.fly(document.createDocumentFragment(), '_internal');
+            eLen = el.length;
+
+            // DocumentFragments cannot accept innerHTML
+            DomHelper.useDom = true;
+            for (e = 0; e < eLen; e++) {
+                rt = insertEl.appendChild(el[e], returnDom);
+            }
+            DomHelper.useDom = oldUseDom;
+
+            // Insert fragment into document
+            me.dom.parentNode.insertBefore(insertEl.dom, isAfter ? me.dom.nextSibling : me.dom);
+            return rt;
+        }
+
+        el = el || {};
+
+        if (el.nodeType || el.dom) {
+            rt = me.dom.parentNode.insertBefore(Ext.getDom(el), isAfter ? me.dom.nextSibling : me.dom);
+            if (!returnDom) {
+                rt = Ext.get(rt);
+            }
+        } else {
+            if (isAfter && !me.dom.nextSibling) {
+                rt = DomHelper.append(me.dom.parentNode, el, !returnDom);
+            } else {
+                rt = DomHelper[isAfter ? 'insertAfter' : 'insertBefore'](me.dom, el, !returnDom);
+            }
+        }
+        return rt;
+    },
+
+    /**
+     * Replaces the passed element with this element
+     * @param {String/HTMLElement/Ext.dom.AbstractElement} el The element to replace.
+     * The id of the node, a DOM Node or an existing Element.
+     * @return {Ext.dom.AbstractElement} This element
+     */
+    replace: function(el) {
+        el = Ext.get(el);
+        this.insertBefore(el);
+        el.remove();
+        return this;
+    },
+
+    /**
+     * Replaces this element with the passed element
+     * @param {String/HTMLElement/Ext.dom.AbstractElement/Object} el The new element (id of the node, a DOM Node
+     * or an existing Element) or a DomHelper config of an element to create
+     * @return {Ext.dom.AbstractElement} This element
+     */
+    replaceWith: function(el){
+        var me = this;
+
+        if (el.nodeType || el.dom || typeof el == 'string') {
+            el = Ext.get(el);
+            me.dom.parentNode.insertBefore(el.dom, me.dom);
+        } else {
+            el = Ext.core.DomHelper.insertBefore(me.dom, el);
+        }
+
+        delete Ext.cache[me.id];
+        Ext.removeNode(me.dom);
+        me.id = Ext.id(me.dom = el);
+        Ext.dom.AbstractElement.addToCache(me.isFlyweight ? new Ext.dom.AbstractElement(me.dom) : me);
+        return me;
+    },
+
+    /**
+     * Creates the passed DomHelper config and appends it to this element or optionally inserts it before the passed child element.
+     * @param {Object} config DomHelper element config object.  If no tag is specified (e.g., {tag:'input'}) then a div will be
+     * automatically generated with the specified attributes.
+     * @param {HTMLElement} [insertBefore] a child element of this element
+     * @param {Boolean} [returnDom=false] true to return the dom node instead of creating an Element
+     * @return {Ext.dom.AbstractElement} The new child element
+     */
+    createChild: function(config, insertBefore, returnDom) {
+        config = config || {tag:'div'};
+        if (insertBefore) {
+            return Ext.core.DomHelper.insertBefore(insertBefore, config, returnDom !== true);
+        }
+        else {
+            return Ext.core.DomHelper.append(this.dom, config,  returnDom !== true);
+        }
+    },
+
+    /**
+     * Creates and wraps this element with another element
+     * @param {Object} [config] DomHelper element config object for the wrapper element or null for an empty div
+     * @param {Boolean} [returnDom=false] True to return the raw DOM element instead of Ext.dom.AbstractElement
+     * @param {String} [selector] A {@link Ext.dom.Query DomQuery} selector to select a descendant node within the created element to use as the wrapping element.
+     * @return {HTMLElement/Ext.dom.AbstractElement} The newly created wrapper element
+     */
+    wrap: function(config, returnDom, selector) {
+        var newEl = Ext.core.DomHelper.insertBefore(this.dom, config || {tag: "div"}, true),
+            target = newEl;
+        
+        if (selector) {
+            target = Ext.DomQuery.selectNode(selector, newEl.dom);
+        }
+
+        target.appendChild(this.dom);
+        return returnDom ? newEl.dom : newEl;
+    },
+
+    /**
+     * Inserts an html fragment into this element
+     * @param {String} where Where to insert the html in relation to this element - beforeBegin, afterBegin, beforeEnd, afterEnd.
+     * See {@link Ext.dom.Helper#insertHtml} for details.
+     * @param {String} html The HTML fragment
+     * @param {Boolean} [returnEl=false] True to return an Ext.dom.AbstractElement
+     * @return {HTMLElement/Ext.dom.AbstractElement} The inserted node (or nearest related if more than 1 inserted)
+     */
+    insertHtml: function(where, html, returnEl) {
+        var el = Ext.core.DomHelper.insertHtml(where, this.dom, html);
+        return returnEl ? Ext.get(el) : el;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.AbstractElement_style', {
+
+    override: 'Ext.dom.AbstractElement'
+
+}, function() {
+    // local style camelizing for speed
+    var Element = this,
+        wordsRe = /\w/g,
+        spacesRe = /\s+/,
+        transparentRe = /^(?:transparent|(?:rgba[(](?:\s*\d+\s*[,]){3}\s*0\s*[)]))$/i,
+        // In some browsers, currently IE10 and older chrome versions, when ClassList is 
+        // supported most elements will have the classList attribute, but some svg elements
+        // will still not have it present, so in a small amount of cases we'll still need
+        // to check at run time whether we can use it.
+        hasClassList = Ext.supports.ClassList,
+        PADDING = 'padding',
+        MARGIN = 'margin',
+        BORDER = 'border',
+        LEFT_SUFFIX = '-left',
+        RIGHT_SUFFIX = '-right',
+        TOP_SUFFIX = '-top',
+        BOTTOM_SUFFIX = '-bottom',
+        WIDTH = '-width',
+        // special markup used throughout Ext when box wrapping elements
+        borders = {l: BORDER + LEFT_SUFFIX + WIDTH, r: BORDER + RIGHT_SUFFIX + WIDTH, t: BORDER + TOP_SUFFIX + WIDTH, b: BORDER + BOTTOM_SUFFIX + WIDTH},
+        paddings = {l: PADDING + LEFT_SUFFIX, r: PADDING + RIGHT_SUFFIX, t: PADDING + TOP_SUFFIX, b: PADDING + BOTTOM_SUFFIX},
+        margins = {l: MARGIN + LEFT_SUFFIX, r: MARGIN + RIGHT_SUFFIX, t: MARGIN + TOP_SUFFIX, b: MARGIN + BOTTOM_SUFFIX},
+        internalFly = new Element.Fly();
+
+
+    Ext.override(Element, {
+
+        /**
+         * This shared object is keyed by style name (e.g., 'margin-left' or 'marginLeft'). The
+         * values are objects with the following properties:
+         *
+         *  * `name` (String) : The actual name to be presented to the DOM. This is typically the value
+         *      returned by {@link #normalize}.
+         *  * `get` (Function) : A hook function that will perform the get on this style. These
+         *      functions receive "(dom, el)" arguments. The `dom` parameter is the DOM Element
+         *      from which to get ths tyle. The `el` argument (may be null) is the Ext.Element.
+         *  * `set` (Function) : A hook function that will perform the set on this style. These
+         *      functions receive "(dom, value, el)" arguments. The `dom` parameter is the DOM Element
+         *      from which to get ths tyle. The `value` parameter is the new value for the style. The
+         *      `el` argument (may be null) is the Ext.Element.
+         *
+         * The `this` pointer is the object that contains `get` or `set`, which means that
+         * `this.name` can be accessed if needed. The hook functions are both optional.
+         * @private
+         */
+        styleHooks: {},
+
+        // private
+        addStyles : function(sides, styles){
+            var totalSize = 0,
+                sidesArr = (sides || '').match(wordsRe),
+                i,
+                len = sidesArr.length,
+                side,
+                styleSides = [];
+
+            if (len == 1) {
+                totalSize = Math.abs(parseFloat(this.getStyle(styles[sidesArr[0]])) || 0);
+            } else if (len) {
+                for (i = 0; i < len; i++) {
+                    side = sidesArr[i];
+                    styleSides.push(styles[side]);
+                }
+                //Gather all at once, returning a hash
+                styleSides = this.getStyle(styleSides);
+
+                for (i=0; i < len; i++) {
+                    side = sidesArr[i];
+                    totalSize += Math.abs(parseFloat(styleSides[styles[side]]) || 0);
+                }
+            }
+
+            return totalSize;
+        },
+
+        /**
+         * Adds one or more CSS classes to the element. Duplicate classes are automatically filtered out.
+         * @param {String/String[]} className The CSS classes to add separated by space, or an array of classes
+         * @return {Ext.dom.Element} this
+         * @method
+         */
+        addCls: (function(){
+            var addWithClassList = function(className) {
+                if (String(className).indexOf('undefined') > -1) {
+                    Ext.Logger.warn("called with an undefined className: " + className);
+                }
+                var me = this,
+                    dom = me.dom,
+                    trimRe = me.trimRe,
+                    origClassName = className,
+                    classList,
+                    newCls,
+                    i,
+                    len,
+                    cls;
+
+                if (typeof(className) == 'string') {
+                    // split string on spaces to make an array of className
+                    className = className.replace(trimRe, '').split(spacesRe);
+                }
+
+                // the gain we have here is that we can skip parsing className and use the
+                // classList.contains method, so now O(M) not O(M+N)
+                if (dom && className && !!(len = className.length)) {
+                    if (!dom.className) {
+                        dom.className = className.join(' ');
+                    } else {
+                        classList = dom.classList;
+                        if (classList) {
+                            for (i = 0; i < len; ++i) {
+                                cls = className[i];
+                                if (cls) {
+                                    if (!classList.contains(cls)) {
+                                        if (newCls) {
+                                            newCls.push(cls);
+                                        } else {
+                                            newCls = dom.className.replace(trimRe, '');
+                                            newCls = newCls ? [newCls, cls] : [cls];
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (newCls) {
+                                dom.className = newCls.join(' '); // write to DOM once
+                            }
+                        } else {
+                            addWithoutClassList(origClassName);
+                        }
+                    }
+                }
+                return me;
+            }, addWithoutClassList = function(className) {
+                if (String(className).indexOf('undefined') > -1) {
+                    Ext.Logger.warn("called with an undefined className: '" + className + "'");
+                }
+                var me = this,
+                    dom = me.dom,
+                    elClasses;
+
+                if (dom && className && className.length) {
+                    elClasses = Ext.Element.mergeClsList(dom.className, className);
+                    if (elClasses.changed) {
+                        dom.className = elClasses.join(' '); // write to DOM once
+                    }
+                }
+                return me;
+            };
+            
+            return hasClassList ? addWithClassList : addWithoutClassList;
+        })(),
+
+
+        /**
+         * Removes one or more CSS classes from the element.
+         * @param {String/String[]} className The CSS classes to remove separated by space, or an array of classes
+         * @return {Ext.dom.Element} this
+         */
+        removeCls: function(className) {
+            var me = this,
+                dom = me.dom,
+                classList,
+                len,
+                elClasses;
+
+            if (typeof(className) == 'string') {
+                // split string on spaces to make an array of className
+                className = className.replace(me.trimRe, '').split(spacesRe);
+            }
+
+            if (dom && dom.className && className && !!(len = className.length)) {
+                classList = dom.classList;
+                if (len === 1 && classList) {
+                    if (className[0]) {
+                        classList.remove(className[0]); // one DOM write
+                    }
+                } else {
+                    elClasses = Ext.Element.removeCls(dom.className, className);
+                    if (elClasses.changed) {
+                        dom.className = elClasses.join(' ');
+                    }
+                }
+            }
+            return me;
+        },
+
+        /**
+         * Adds one or more CSS classes to this element and removes the same class(es) from all siblings.
+         * @param {String/String[]} className The CSS class to add, or an array of classes
+         * @return {Ext.dom.Element} this
+         */
+        radioCls: function(className) {
+            var cn = this.dom.parentNode.childNodes,
+                v,
+                i, len;
+            className = Ext.isArray(className) ? className: [className];
+            for (i = 0, len = cn.length; i < len; i++) {
+                v = cn[i];
+                if (v && v.nodeType == 1) {
+                    internalFly.attach(v).removeCls(className);
+                }
+            }
+            return this.addCls(className);
+        },
+
+        /**
+         * Toggles the specified CSS class on this element (removes it if it already exists, otherwise adds it).
+         * @param {String} className The CSS class to toggle
+         * @return {Ext.dom.Element} this
+         * @method
+         */
+        toggleCls: (function(){
+            var toggleWithClassList = function(className){
+                var me = this,
+                    dom = me.dom,
+                    classList;
+
+                if (dom) {
+                    className = className.replace(me.trimRe, '');
+                    if (className) {
+                        classList = dom.classList;
+                        if (classList) {
+                            classList.toggle(className);
+                        } else {
+                            toggleWithoutClassList(className);
+                        }
+                    }
+                }
+
+                return me;
+            }, toggleWithoutClassList = function(className){
+                return this.hasCls(className) ? this.removeCls(className) : this.addCls(className);
+            };
+            
+            return hasClassList ? toggleWithClassList :  toggleWithoutClassList;
+        })(),
+
+        /**
+         * Checks if the specified CSS class exists on this element's DOM node.
+         * @param {String} className The CSS class to check for
+         * @return {Boolean} True if the class exists, else false
+         * @method
+         */
+        hasCls: (function(){
+            var hasClsWithClassList = function(className) {
+                var dom = this.dom,
+                    out = false,
+                    classList;
+                    
+                if (dom && className) {
+                    classList = dom.classList;
+                    if (classList) {
+                        out = classList.contains(className);
+                    } else {
+                        out = hasClsWithoutClassList(className);
+                    }
+                }
+                return out;
+            }, hasClsWithoutClassList = function(className){
+                var dom = this.dom;
+                return dom ? className && (' '+dom.className+' ').indexOf(' '+className+' ') !== -1 : false;
+            };
+            
+            return hasClassList ? hasClsWithClassList : hasClsWithoutClassList;
+        })(),
+
+        /**
+         * Replaces a CSS class on the element with another.  If the old name does not exist, the new name will simply be added.
+         * @param {String} oldClassName The CSS class to replace
+         * @param {String} newClassName The replacement CSS class
+         * @return {Ext.dom.Element} this
+         */
+        replaceCls: function(oldClassName, newClassName){
+            return this.removeCls(oldClassName).addCls(newClassName);
+        },
+
+        /**
+         * Checks if the current value of a style is equal to a given value.
+         * @param {String} style property whose value is returned.
+         * @param {String} value to check against.
+         * @return {Boolean} true for when the current value equals the given value.
+         */
+        isStyle: function(style, val) {
+            return this.getStyle(style) == val;
+        },
+
+        /**
+         * Returns a named style property based on computed/currentStyle (primary) and
+         * inline-style if primary is not available.
+         *
+         * @param {String/String[]} property The style property (or multiple property names
+         * in an array) whose value is returned.
+         * @param {Boolean} [inline=false] if `true` only inline styles will be returned.
+         * @return {String/Object} The current value of the style property for this element
+         * (or a hash of named style values if multiple property arguments are requested).
+         * @method
+         */
+        getStyle: function (property, inline) {
+            var me = this,
+                dom = me.dom,
+                multiple = typeof property != 'string',
+                hooks = me.styleHooks,
+                prop = property,
+                props = prop,
+                len = 1,
+                domStyle, camel, values, hook, out, style, i;
+
+            if (multiple) {
+                values = {};
+                prop = props[0];
+                i = 0;
+                if (!(len = props.length)) {
+                    return values;
+                }
+            }
+
+            if (!dom || dom.documentElement) {
+                return values || '';
+            }
+
+            domStyle = dom.style;
+
+            if (inline) {
+                style = domStyle;
+            } else {
+                // Caution: Firefox will not render "presentation" (ie. computed styles) in
+                // iframes that are display:none or those inheriting display:none. Similar
+                // issues with legacy Safari.
+                //
+                style = dom.ownerDocument.defaultView.getComputedStyle(dom, null);
+
+                // fallback to inline style if rendering context not available
+                if (!style) {
+                    inline = true;
+                    style = domStyle;
+                }
+            }
+
+            do {
+                hook = hooks[prop];
+
+                if (!hook) {
+                    hooks[prop] = hook = { name: Element.normalize(prop) };
+                }
+
+                if (hook.get) {
+                    out = hook.get(dom, me, inline, style);
+                } else {
+                    camel = hook.name;
+                    out = style[camel];
+                }
+
+                if (!multiple) {
+                   return out;
+                }
+
+                values[prop] = out;
+                prop = props[++i];
+            } while (i < len);
+
+            return values;
+        },
+
+        getStyles: function () {
+            var props = Ext.Array.slice(arguments),
+                len = props.length,
+                inline;
+
+            if (len && typeof props[len-1] == 'boolean') {
+                inline = props.pop();
+            }
+
+            return this.getStyle(props, inline);
+        },
+
+        /**
+         * Returns true if the value of the given property is visually transparent. This
+         * may be due to a 'transparent' style value or an rgba value with 0 in the alpha
+         * component.
+         * @param {String} prop The style property whose value is to be tested.
+         * @return {Boolean} True if the style property is visually transparent.
+         */
+        isTransparent: function (prop) {
+            var value = this.getStyle(prop);
+            return value ? transparentRe.test(value) : false;
+        },
+
+        /**
+         * Wrapper for setting style properties, also takes single object parameter of multiple styles.
+         * @param {String/Object} property The style property to be set, or an object of multiple styles.
+         * @param {String} [value] The value to apply to the given property, or null if an object was passed.
+         * @return {Ext.dom.Element} this
+         */
+        setStyle: function(prop, value) {
+            var me = this,
+                dom = me.dom,
+                hooks = me.styleHooks,
+                style = dom.style,
+                name = prop,
+                hook;
+
+            // we don't promote the 2-arg form to object-form to avoid the overhead...
+            if (typeof name == 'string') {
+                hook = hooks[name];
+                if (!hook) {
+                    hooks[name] = hook = { name: Element.normalize(name) };
+                }
+                value = (value == null) ? '' : value;
+                if (hook.set) {
+                    hook.set(dom, value, me);
+                } else {
+                    style[hook.name] = value;
+                }
+                if (hook.afterSet) {
+                    hook.afterSet(dom, value, me);
+                }
+            } else {
+                for (name in prop) {
+                    if (prop.hasOwnProperty(name)) {
+                        hook = hooks[name];
+                        if (!hook) {
+                            hooks[name] = hook = { name: Element.normalize(name) };
+                        }
+                        value = prop[name];
+                        value = (value == null) ? '' : value;
+                        if (hook.set) {
+                            hook.set(dom, value, me);
+                        } else {
+                            style[hook.name] = value;
+                        }
+                        if (hook.afterSet) {
+                            hook.afterSet(dom, value, me);
+                        }
+                    }
+                }
+            }
+
+            return me;
+        },
+
+        /**
+         * Returns the offset height of the element
+         * @param {Boolean} [contentHeight] true to get the height minus borders and padding
+         * @return {Number} The element's height
+         */
+        getHeight: function(contentHeight) {
+            var dom = this.dom,
+                height = contentHeight ? (dom.clientHeight - this.getPadding("tb")) : dom.offsetHeight;
+            return height > 0 ? height: 0;
+        },
+
+        /**
+         * Returns the offset width of the element
+         * @param {Boolean} [contentWidth] true to get the width minus borders and padding
+         * @return {Number} The element's width
+         */
+        getWidth: function(contentWidth) {
+            var dom = this.dom,
+                width = contentWidth ? (dom.clientWidth - this.getPadding("lr")) : dom.offsetWidth;
+            return width > 0 ? width: 0;
+        },
+
+        /**
+         * Set the width of this Element.
+         * @param {Number/String} width The new width. This may be one of:
+         *
+         * - A Number specifying the new width in this Element's {@link #defaultUnit}s (by default, pixels).
+         * - A String used to set the CSS width style. Animation may **not** be used.
+         *
+         * @return {Ext.dom.Element} this
+         */
+        setWidth: function(width) {
+            var me = this;
+                me.dom.style.width = Element.addUnits(width);
+            return me;
+        },
+
+        /**
+         * Set the height of this Element.
+         *
+         *     // change the height to 200px and animate with default configuration
+         *     Ext.fly('elementId').setHeight(200, true);
+         *
+         *     // change the height to 150px and animate with a custom configuration
+         *     Ext.fly('elId').setHeight(150, {
+         *         duration : 500, // animation will have a duration of .5 seconds
+         *         // will change the content to "finished"
+         *         callback: function(){ this.{@link #update}("finished"); }
+         *     });
+         *
+         * @param {Number/String} height The new height. This may be one of:
+         *
+         * - A Number specifying the new height in this Element's {@link #defaultUnit}s (by default, pixels.)
+         * - A String used to set the CSS height style. Animation may **not** be used.
+         *
+         * @return {Ext.dom.Element} this
+         */
+        setHeight: function(height) {
+            var me = this;
+                me.dom.style.height = Element.addUnits(height);
+            return me;
+        },
+
+        /**
+         * Gets the width of the border(s) for the specified side(s)
+         * @param {String} side Can be t, l, r, b or any combination of those to add multiple values. For example,
+         * passing `'lr'` would get the border **l**eft width + the border **r**ight width.
+         * @return {Number} The width of the sides passed added together
+         */
+        getBorderWidth: function(side){
+            return this.addStyles(side, borders);
+        },
+
+        /**
+         * Gets the width of the padding(s) for the specified side(s)
+         * @param {String} side Can be t, l, r, b or any combination of those to add multiple values. For example,
+         * passing `'lr'` would get the padding **l**eft + the padding **r**ight.
+         * @return {Number} The padding of the sides passed added together
+         */
+        getPadding: function(side){
+            return this.addStyles(side, paddings);
+        },
+
+        margins : margins,
+
+        /**
+         * More flexible version of {@link #setStyle} for setting style properties.
+         * @param {String/Object/Function} styles A style specification string, e.g. "width:100px", or object in the form {width:"100px"}, or
+         * a function which returns such a specification.
+         * @return {Ext.dom.Element} this
+         */
+        applyStyles: function(styles) {
+            if (styles) {
+                var i,
+                    len,
+                    dom = this.dom;
+
+                if (typeof styles == 'function') {
+                    styles = styles.call();
+                }
+                if (typeof styles == 'string') {
+                    styles = Ext.util.Format.trim(styles).split(/\s*(?::|;)\s*/);
+                    for (i = 0, len = styles.length; i < len;) {
+                        dom.style[Element.normalize(styles[i++])] = styles[i++];
+                    }
+                }
+                else if (typeof styles == 'object') {
+                    this.setStyle(styles);
+                }
+            }
+        },
+
+        /**
+         * Set the size of this Element. If animation is true, both width and height will be animated concurrently.
+         * @param {Number/String} width The new width. This may be one of:
+         *
+         * - A Number specifying the new width in this Element's {@link #defaultUnit}s (by default, pixels).
+         * - A String used to set the CSS width style. Animation may **not** be used.
+         * - A size object in the format `{width: widthValue, height: heightValue}`.
+         *
+         * @param {Number/String} height The new height. This may be one of:
+         *
+         * - A Number specifying the new height in this Element's {@link #defaultUnit}s (by default, pixels).
+         * - A String used to set the CSS height style. Animation may **not** be used.
+         *
+         * @return {Ext.dom.Element} this
+         */
+        setSize: function(width, height) {
+            var me = this,
+                style = me.dom.style;
+
+            if (Ext.isObject(width)) {
+                // in case of object from getSize()
+                height = width.height;
+                width = width.width;
+            }
+
+            style.width = Element.addUnits(width);
+            style.height = Element.addUnits(height);
+            return me;
+        },
+
+        /**
+         * Returns the dimensions of the element available to lay content out in.
+         *
+         * If the element (or any ancestor element) has CSS style `display: none`, the dimensions will be zero.
+         *
+         * Example:
+         *
+         *     var vpSize = Ext.getBody().getViewSize();
+         *
+         *     // all Windows created afterwards will have a default value of 90% height and 95% width
+         *     Ext.Window.override({
+         *         width: vpSize.width * 0.9,
+         *         height: vpSize.height * 0.95
+         *     });
+         *     // To handle window resizing you would have to hook onto onWindowResize.
+         *
+         * getViewSize utilizes clientHeight/clientWidth which excludes sizing of scrollbars.
+         * To obtain the size including scrollbars, use getStyleSize
+         *
+         * Sizing of the document body is handled at the adapter level which handles special cases for IE and strict modes, etc.
+         *
+         * @return {Object} Object describing width and height.
+         * @return {Number} return.width
+         * @return {Number} return.height
+         */
+        getViewSize: function() {
+            var doc = document,
+                dom = this.dom;
+
+            if (dom == doc || dom == doc.body) {
+                return {
+                    width: Element.getViewportWidth(),
+                    height: Element.getViewportHeight()
+                };
+            }
+            else {
+                return {
+                    width: dom.clientWidth,
+                    height: dom.clientHeight
+                };
+            }
+        },
+
+        /**
+         * Returns the size of the element.
+         * @param {Boolean} [contentSize] true to get the width/size minus borders and padding
+         * @return {Object} An object containing the element's size:
+         * @return {Number} return.width
+         * @return {Number} return.height
+         */
+        getSize: function(contentSize) {
+            var dom = this.dom;
+            return {
+                width: Math.max(0, contentSize ? (dom.clientWidth - this.getPadding("lr")) : dom.offsetWidth),
+                height: Math.max(0, contentSize ? (dom.clientHeight - this.getPadding("tb")) : dom.offsetHeight)
+            };
+        },
+
+        /**
+         * Forces the browser to repaint this element
+         * @return {Ext.dom.Element} this
+         */
+        repaint: function() {
+            var dom = this.dom;
+            this.addCls(Ext.baseCSSPrefix + 'repaint');
+            setTimeout(function(){
+                internalFly.attach(dom).removeCls(Ext.baseCSSPrefix + 'repaint');
+            }, 1);
+            return this;
+        },
+
+        /**
+         * Returns an object with properties top, left, right and bottom representing the margins of this element unless sides is passed,
+         * then it returns the calculated width of the sides (see getPadding)
+         * @param {String} [sides] Any combination of l, r, t, b to get the sum of those sides
+         * @return {Object/Number}
+         */
+        getMargin: function(side){
+            var me = this,
+                hash = {t:"top", l:"left", r:"right", b: "bottom"},
+                key,
+                o,
+                margins;
+
+            if (!side) {
+                margins = [];
+                for (key in me.margins) {
+                    if(me.margins.hasOwnProperty(key)) {
+                        margins.push(me.margins[key]);
+                    }
+                }
+                o = me.getStyle(margins);
+                if(o && typeof o == 'object') {
+                    //now mixin nomalized values (from hash table)
+                    for (key in me.margins) {
+                        if(me.margins.hasOwnProperty(key)) {
+                            o[hash[key]] = parseFloat(o[me.margins[key]]) || 0;
+                        }
+                    }
+                }
+
+                return o;
+            } else {
+                return me.addStyles(side, me.margins);
+            }
+        },
+
+        /**
+         * Puts a mask over this element to disable user interaction. Requires core.css.
+         * This method can only be applied to elements which accept child nodes.
+         * @param {String} [msg] A message to display in the mask
+         * @param {String} [msgCls] A css class to apply to the msg element
+         */
+        mask: function(msg, msgCls, transparent) {
+            var me = this,
+                dom = me.dom,
+                data = (me.$cache || me.getCache()).data,
+                el = data.mask,
+                mask,
+                size,
+                cls = '',
+                prefix = Ext.baseCSSPrefix;
+
+            me.addCls(prefix + 'masked');
+            if (me.getStyle("position") == "static") {
+                me.addCls(prefix + 'masked-relative');
+            }
+            if (el) {
+                el.remove();
+            }
+            if (msgCls && typeof msgCls == 'string' ) {
+                cls = ' ' + msgCls;
+            }
+            else {
+                cls = ' ' + prefix + 'mask-gray';
+            }
+
+            mask = me.createChild({
+                cls: prefix + 'mask' + ((transparent !== false) ? '' : (' ' + prefix + 'mask-gray')),
+                html: msg ? ('<div class="' + (msgCls || (prefix + 'mask-message')) + '">' + msg + '</div>') : ''
+            });
+
+            size = me.getSize();
+
+            data.mask = mask;
+
+            if (dom === document.body) {
+                size.height = window.innerHeight;
+                if (me.orientationHandler) {
+                    Ext.EventManager.unOrientationChange(me.orientationHandler, me);
+                }
+
+                me.orientationHandler = function() {
+                    size = me.getSize();
+                    size.height = window.innerHeight;
+                    mask.setSize(size);
+                };
+
+                Ext.EventManager.onOrientationChange(me.orientationHandler, me);
+            }
+            mask.setSize(size);
+            if (Ext.is.iPad) {
+                Ext.repaint();
+            }
+        },
+
+        /**
+         * Removes a previously applied mask.
+         */
+        unmask: function() {
+            var me = this,
+                data = (me.$cache || me.getCache()).data,
+                mask = data.mask,
+                prefix = Ext.baseCSSPrefix;
+
+            if (mask) {
+                mask.remove();
+                delete data.mask;
+            }
+            me.removeCls([prefix + 'masked', prefix + 'masked-relative']);
+
+            if (me.dom === document.body) {
+                Ext.EventManager.unOrientationChange(me.orientationHandler, me);
+                delete me.orientationHandler;
+            }
+        }
+    });
+
+
+    Ext.onReady(function () {
+        var supports = Ext.supports,
+            styleHooks,
+            colorStyles, i, name, camel;
+
+        function fixTransparent (dom, el, inline, style) {
+            var value = style[this.name] || '';
+            return transparentRe.test(value) ? 'transparent' : value;
+        }
+
+        function fixRightMargin (dom, el, inline, style) {
+            var result = style.marginRight,
+                domStyle, display;
+
+            // Ignore cases when the margin is correctly reported as 0, the bug only shows
+            // numbers larger.
+            if (result != '0px') {
+                domStyle = dom.style;
+                display = domStyle.display;
+                domStyle.display = 'inline-block';
+                result = (inline ? style : dom.ownerDocument.defaultView.getComputedStyle(dom, null)).marginRight;
+                domStyle.display = display;
+            }
+
+            return result;
+        }
+
+        function fixRightMarginAndInputFocus (dom, el, inline, style) {
+            var result = style.marginRight,
+                domStyle, cleaner, display;
+
+            if (result != '0px') {
+                domStyle = dom.style;
+                cleaner = Element.getRightMarginFixCleaner(dom);
+                display = domStyle.display;
+                domStyle.display = 'inline-block';
+                result = (inline ? style : dom.ownerDocument.defaultView.getComputedStyle(dom, '')).marginRight;
+                domStyle.display = display;
+                cleaner();
+            }
+
+            return result;
+        }
+
+        styleHooks = Element.prototype.styleHooks;
+
+        // Ext.supports needs to be initialized (we run very early in the onready sequence),
+        // but it is OK to call Ext.supports.init() more times than necessary...
+        if (supports.init) {
+            supports.init();
+        }
+
+        // Fix bug caused by this: https://bugs.webkit.org/show_bug.cgi?id=13343
+        if (!supports.RightMargin) {
+            styleHooks.marginRight = styleHooks['margin-right'] = {
+                name: 'marginRight',
+                // TODO - Touch should use conditional compilation here or ensure that the
+                //      underlying Ext.supports flags are set correctly...
+                get: (supports.DisplayChangeInputSelectionBug || supports.DisplayChangeTextAreaSelectionBug) ?
+                    fixRightMarginAndInputFocus : fixRightMargin
+            };
+        }
+
+        if (!supports.TransparentColor) {
+            colorStyles = ['background-color', 'border-color', 'color', 'outline-color'];
+            for (i = colorStyles.length; i--; ) {
+                name = colorStyles[i];
+                camel = Element.normalize(name);
+
+                styleHooks[name] = styleHooks[camel] = {
+                    name: camel,
+                    get: fixTransparent
+                };
+            }
+        }
+    });
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.AbstractElement_traversal', {
+    override: 'Ext.dom.AbstractElement',
+
+    /**
+     * Looks at this node and then at parent nodes for a match of the passed simple selector (e.g. div.some-class or span:first-child)
+     * @param {String} selector The simple selector to test
+     * @param {Number/String/HTMLElement/Ext.Element} [limit]
+     * The max depth to search as a number or an element which causes the upward traversal to stop
+     * and is <b>not</b> considered for inclusion as the result. (defaults to 50 || document.documentElement)
+     * @param {Boolean} [returnEl=false] True to return a Ext.Element object instead of DOM node
+     * @return {HTMLElement} The matching DOM node (or null if no match was found)
+     */
+    findParent: function(simpleSelector, limit, returnEl) {
+        var target = this.dom,
+            topmost = document.documentElement,
+            depth = 0,
+            stopEl;
+
+        limit = limit || 50;
+        if (isNaN(limit)) {
+            stopEl = Ext.getDom(limit);
+            limit = Number.MAX_VALUE;
+        }
+        while (target && target.nodeType == 1 && depth < limit && target != topmost && target != stopEl) {
+            if (Ext.DomQuery.is(target, simpleSelector)) {
+                return returnEl ? Ext.get(target) : target;
+            }
+            depth++;
+            target = target.parentNode;
+        }
+        return null;
+    },
+
+    /**
+     * Looks at parent nodes for a match of the passed simple selector (e.g. div.some-class or span:first-child)
+     * @param {String} selector The simple selector to test
+     * @param {Number/String/HTMLElement/Ext.Element} [limit]
+     * The max depth to search as a number or an element which causes the upward traversal to stop
+     * and is <b>not</b> considered for inclusion as the result. (defaults to 50 || document.documentElement)
+     * @param {Boolean} [returnEl=false] True to return a Ext.Element object instead of DOM node
+     * @return {HTMLElement} The matching DOM node (or null if no match was found)
+     */
+    findParentNode: function(simpleSelector, limit, returnEl) {
+        var p = Ext.fly(this.dom.parentNode, '_internal');
+        return p ? p.findParent(simpleSelector, limit, returnEl) : null;
+    },
+
+    /**
+     * Walks up the DOM looking for a parent node that matches the passed simple selector (e.g. div.some-class or span:first-child).
+     * This is a shortcut for findParentNode() that always returns an Ext.dom.Element.
+     * @param {String} selector The simple selector to test
+     * @param {Number/String/HTMLElement/Ext.Element} [limit]
+     * The max depth to search as a number or an element which causes the upward traversal to stop
+     * and is <b>not</b> considered for inclusion as the result. (defaults to 50 || document.documentElement)
+     * @param {Boolean} [returnDom=false] True to return the DOM node instead of Ext.dom.Element
+     * @return {Ext.Element} The matching DOM node (or null if no match was found)
+     */
+    up: function(simpleSelector, limit, returnDom) {
+        return this.findParentNode(simpleSelector, limit, !returnDom);
+    },
+
+    /**
+     * Creates a {@link Ext.CompositeElement} for child nodes based on the passed CSS selector (the selector should not contain an id).
+     * @param {String} selector The CSS selector
+     * @param {Boolean} [unique] True to create a unique Ext.Element for each element. Defaults to a shared flyweight object.
+     * @return {Ext.CompositeElement} The composite element
+     */
+    select: function(selector, composite) {
+        return Ext.dom.Element.select(selector, this.dom, composite);
+    },
+
+    /**
+     * Selects child nodes based on the passed CSS selector (the selector should not contain an id).
+     * @param {String} selector The CSS selector
+     * @return {HTMLElement[]} An array of the matched nodes
+     */
+    query: function(selector) {
+        return Ext.DomQuery.select(selector, this.dom);
+    },
+
+    /**
+     * Selects a single child at any depth below this element based on the passed CSS selector (the selector should not contain an id).
+     * @param {String} selector The CSS selector
+     * @param {Boolean} [returnDom=false] True to return the DOM node instead of Ext.dom.Element
+     * @return {HTMLElement/Ext.dom.Element} The child Ext.dom.Element (or DOM node if returnDom = true)
+     */
+    down: function(selector, returnDom) {
+        var n = Ext.DomQuery.selectNode(selector, this.dom);
+        return returnDom ? n : Ext.get(n);
+    },
+
+    /**
+     * Selects a single *direct* child based on the passed CSS selector (the selector should not contain an id).
+     * @param {String} selector The CSS selector
+     * @param {Boolean} [returnDom=false] True to return the DOM node instead of Ext.dom.Element.
+     * @return {HTMLElement/Ext.dom.Element} The child Ext.dom.Element (or DOM node if returnDom = true)
+     */
+    child: function(selector, returnDom) {
+        var node,
+            me = this,
+            id;
+
+        // Pull the ID from the DOM (Ext.id also ensures that there *is* an ID).
+        // If this object is a Flyweight, it will not have an ID
+        id = Ext.id(me.dom);
+        // Escape "invalid" chars
+        id = Ext.escapeId(id);
+        node = Ext.DomQuery.selectNode('#' + id + " > " + selector, me.dom);
+        return returnDom ? node : Ext.get(node);
+    },
+
+     /**
+     * Gets the parent node for this element, optionally chaining up trying to match a selector
+     * @param {String} [selector] Find a parent node that matches the passed simple selector
+     * @param {Boolean} [returnDom=false] True to return a raw dom node instead of an Ext.dom.Element
+     * @return {Ext.dom.Element/HTMLElement} The parent node or null
+     */
+    parent: function(selector, returnDom) {
+        return this.matchNode('parentNode', 'parentNode', selector, returnDom);
+    },
+
+     /**
+     * Gets the next sibling, skipping text nodes
+     * @param {String} [selector] Find the next sibling that matches the passed simple selector
+     * @param {Boolean} [returnDom=false] True to return a raw dom node instead of an Ext.dom.Element
+     * @return {Ext.dom.Element/HTMLElement} The next sibling or null
+     */
+    next: function(selector, returnDom) {
+        return this.matchNode('nextSibling', 'nextSibling', selector, returnDom);
+    },
+
+    /**
+     * Gets the previous sibling, skipping text nodes
+     * @param {String} [selector] Find the previous sibling that matches the passed simple selector
+     * @param {Boolean} [returnDom=false] True to return a raw dom node instead of an Ext.dom.Element
+     * @return {Ext.dom.Element/HTMLElement} The previous sibling or null
+     */
+    prev: function(selector, returnDom) {
+        return this.matchNode('previousSibling', 'previousSibling', selector, returnDom);
+    },
+
+
+    /**
+     * Gets the first child, skipping text nodes
+     * @param {String} [selector] Find the next sibling that matches the passed simple selector
+     * @param {Boolean} [returnDom=false] True to return a raw dom node instead of an Ext.dom.Element
+     * @return {Ext.dom.Element/HTMLElement} The first child or null
+     */
+    first: function(selector, returnDom) {
+        return this.matchNode('nextSibling', 'firstChild', selector, returnDom);
+    },
+
+    /**
+     * Gets the last child, skipping text nodes
+     * @param {String} [selector] Find the previous sibling that matches the passed simple selector
+     * @param {Boolean} [returnDom=false] True to return a raw dom node instead of an Ext.dom.Element
+     * @return {Ext.dom.Element/HTMLElement} The last child or null
+     */
+    last: function(selector, returnDom) {
+        return this.matchNode('previousSibling', 'lastChild', selector, returnDom);
+    },
+
+    matchNode: function(dir, start, selector, returnDom) {
+        if (!this.dom) {
+            return null;
+        }
+
+        var n = this.dom[start];
+        while (n) {
+            if (n.nodeType == 1 && (!selector || Ext.DomQuery.is(n, selector))) {
+                return !returnDom ? Ext.get(n) : n;
+            }
+            n = n[dir];
+        }
+        return null;
+    },
+
+    isAncestor: function(element) {
+        return this.self.isAncestor.call(this.self, this.dom, element);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require Ext.Supports
+
+/**
+ * @private
+ */
+Ext.define('Ext.dom.AbstractElement', {
+               
+                           
+                                         
+                                            
+                                        
+                                           
+      
+
+    trimRe: /^\s+|\s+$/g,
+    whitespaceRe: /\s/,
+    
+    inheritableStatics: {
+        trimRe: /^\s+|\s+$/g,
+        whitespaceRe: /\s/,
+
+        /**
+         * Retrieves Ext.dom.Element objects. {@link Ext#get} is alias for {@link Ext.dom.Element#get}.
+         *
+         * **This method does not retrieve {@link Ext.Component Component}s.** This method retrieves Ext.dom.Element
+         * objects which encapsulate DOM elements. To retrieve a Component by its ID, use {@link Ext.ComponentManager#get}.
+         * 
+         * When passing an id, it should not include the `#` character that is used for a css selector.
+         * 
+         *     // For an element with id 'foo'
+         *     Ext.get('foo'); // Correct
+         *     Ext.get('#foo'); // Incorrect
+         *
+         * Uses simple caching to consistently return the same object. Automatically fixes if an object was recreated with
+         * the same id via AJAX or DOM.
+         *
+         * @param {String/HTMLElement/Ext.Element} el The id of the node, a DOM Node or an existing Element.
+         * @return {Ext.dom.Element} The Element object (or null if no matching element was found)
+         * @static
+         * @inheritable
+         */
+        get: function(el) {
+            var me = this,
+                document = window.document,
+                El = Ext.dom.Element,
+                cacheItem,
+                docEl,
+                extEl,
+                dom,
+                id;
+
+            if (!el) {
+                return null;
+            }
+
+            // Ext.get(flyweight) must return an Element instance, not the flyweight
+            if (el.isFly) {
+                el = el.dom;
+            }
+
+            if (typeof el == "string") { // element id
+                if (el == Ext.windowId) {
+                    return El.get(window);
+                } else if (el == Ext.documentId) {
+                    return El.get(document);
+                }
+                
+                cacheItem = Ext.cache[el];
+                // This code is here to catch the case where we've got a reference to a document of an iframe
+                // It getElementById will fail because it's not part of the document, so if we're skipping
+                // GC it means it's a window/document object that isn't the default window/document, which we have
+                // already handled above
+                if (cacheItem && cacheItem.skipGarbageCollection) {
+                    extEl = cacheItem.el;
+                    return extEl;
+                }
+                
+                if (!(dom = document.getElementById(el))) {
+                    return null;
+                }
+
+                if (cacheItem && cacheItem.el) {
+                    extEl = Ext.updateCacheEntry(cacheItem, dom).el;
+                } else {
+                    // Force new element if there's a cache but no el attached
+                    extEl = new El(dom, !!cacheItem);
+                }
+                return extEl;
+            } else if (el.tagName) { // dom element
+                if (!(id = el.id)) {
+                    id = Ext.id(el);
+                }
+                cacheItem = Ext.cache[id];
+                if (cacheItem && cacheItem.el) {
+                    extEl = Ext.updateCacheEntry(cacheItem, el).el;
+                } else {
+                    // Force new element if there's a cache but no el attached
+                    extEl = new El(el, !!cacheItem);
+                }
+                return extEl;
+            } else if (el instanceof me) {
+                if (el != me.docEl && el != me.winEl) {
+                    id = el.id;
+                    // refresh dom element in case no longer valid,
+                    // catch case where it hasn't been appended
+                    cacheItem = Ext.cache[id];
+                    if (cacheItem) {
+                        Ext.updateCacheEntry(cacheItem, document.getElementById(id) || el.dom);
+                    }
+                }
+                return el;
+            } else if (el.isComposite) {
+                return el;
+            } else if (Ext.isArray(el)) {
+                return me.select(el);
+            } else if (el === document) {
+                // create a bogus element object representing the document object
+                if (!me.docEl) {
+                    docEl = me.docEl = Ext.Object.chain(El.prototype);
+                    docEl.dom = document;
+                    // set an "el" property on the element that references itself.
+                    // This allows Ext.util.Positionable methods to operate on
+                    // this.el.dom since it gets mixed into both Element and Component
+                    docEl.el = docEl;
+                    docEl.id = Ext.id(document);
+                    me.addToCache(docEl);
+                }
+                return me.docEl;
+            } else if (el === window) {
+                if (!me.winEl) {
+                    me.winEl = Ext.Object.chain(El.prototype);
+                    me.winEl.dom = window;
+                    me.winEl.id = Ext.id(window);
+                    me.addToCache(me.winEl);
+                }
+                return me.winEl;
+            }
+            return null;
+        },
+
+        addToCache: function(el, id) {
+            if (el) {
+                Ext.addCacheEntry(id, el);
+            }
+            return el;
+        },
+
+        addMethods: function() {
+            this.override.apply(this, arguments);
+        },
+
+        /**
+         * <p>Returns an array of unique class names based upon the input strings, or string arrays.</p>
+         * <p>The number of parameters is unlimited.</p>
+         * <p>Example</p><pre><code>
+// Add x-invalid and x-mandatory classes, do not duplicate
+myElement.dom.className = Ext.core.Element.mergeClsList(this.initialClasses, 'x-invalid x-mandatory');
+</code></pre>
+         * @param {Mixed} clsList1 A string of class names, or an array of class names.
+         * @param {Mixed} clsList2 A string of class names, or an array of class names.
+         * @return {Array} An array of strings representing remaining unique, merged class names. If class names were added to the first list, the <code>changed</code> property will be <code>true</code>.
+         * @static
+         * @inheritable
+         */
+        mergeClsList: function() {
+            var clsList, clsHash = {},
+                i, length, j, listLength, clsName, result = [],
+                changed = false,
+                trimRe = this.trimRe,
+                whitespaceRe = this.whitespaceRe;
+
+            for (i = 0, length = arguments.length; i < length; i++) {
+                clsList = arguments[i];
+                if (Ext.isString(clsList)) {
+                    clsList = clsList.replace(trimRe, '').split(whitespaceRe);
+                }
+                if (clsList) {
+                    for (j = 0, listLength = clsList.length; j < listLength; j++) {
+                        clsName = clsList[j];
+                        if (!clsHash[clsName]) {
+                            if (i) {
+                                changed = true;
+                            }
+                            clsHash[clsName] = true;
+                        }
+                    }
+                }
+            }
+
+            for (clsName in clsHash) {
+                result.push(clsName);
+            }
+            result.changed = changed;
+            return result;
+        },
+
+        /**
+         * <p>Returns an array of unique class names deom the first parameter with all class names
+         * from the second parameter removed.</p>
+         * <p>Example</p><pre><code>
+// Remove x-invalid and x-mandatory classes if present.
+myElement.dom.className = Ext.core.Element.removeCls(this.initialClasses, 'x-invalid x-mandatory');
+</code></pre>
+         * @param {Mixed} existingClsList A string of class names, or an array of class names.
+         * @param {Mixed} removeClsList A string of class names, or an array of class names to remove from <code>existingClsList</code>.
+         * @return {Array} An array of strings representing remaining class names. If class names were removed, the <code>changed</code> property will be <code>true</code>.
+         * @static
+         * @inheritable
+         */
+        removeCls: function(existingClsList, removeClsList) {
+            var clsHash = {},
+                i, length, clsName, result = [],
+                changed = false,
+                whitespaceRe = this.whitespaceRe;
+
+            if (existingClsList) {
+                if (Ext.isString(existingClsList)) {
+                    existingClsList = existingClsList.replace(this.trimRe, '').split(whitespaceRe);
+                }
+                for (i = 0, length = existingClsList.length; i < length; i++) {
+                    clsHash[existingClsList[i]] = true;
+                }
+            }
+            if (removeClsList) {
+                if (Ext.isString(removeClsList)) {
+                    removeClsList = removeClsList.split(whitespaceRe);
+                }
+                for (i = 0, length = removeClsList.length; i < length; i++) {
+                    clsName = removeClsList[i];
+                    if (clsHash[clsName]) {
+                        changed = true;
+                        delete clsHash[clsName];
+                    }
+                }
+            }
+            for (clsName in clsHash) {
+                result.push(clsName);
+            }
+            result.changed = changed;
+            return result;
+        },
+
+        /**
+         * @property {Number}
+         * Visibility mode constant for use with {@link Ext.dom.Element#setVisibilityMode}. 
+         * Use the CSS 'visibility' property to hide the element.
+         *
+         * Note that in this mode, {@link Ext.dom.Element#isVisible isVisible} may return true
+         * for an element even though it actually has a parent element that is hidden. For this
+         * reason, and in most cases, using the {@link #OFFSETS} mode is a better choice.
+         * @static
+         * @inheritable
+         */
+        VISIBILITY: 1,
+
+        /**
+         * @property {Number}
+         * Visibility mode constant for use with {@link Ext.dom.Element#setVisibilityMode}. 
+         * Use the CSS 'display' property to hide the element.
+         * @static
+         * @inheritable
+         */
+        DISPLAY: 2,
+
+        /**
+         * @property {Number}
+         * Visibility mode constant for use with {@link Ext.dom.Element#setVisibilityMode}. 
+         * Use CSS absolute positioning and top/left offsets to hide the element.
+         * @static
+         * @inheritable
+         */
+        OFFSETS: 3,
+
+        /**
+         * @property {Number}
+         * Visibility mode constant for use with {@link Ext.dom.Element#setVisibilityMode}. 
+         * Add or remove the {@link Ext.Layer#visibilityCls} class to hide the element.
+         * @static
+         * @inheritable
+         */
+        ASCLASS: 4
+    },
+
+    constructor: function(element, forceNew) {
+        var me = this,
+            dom = typeof element == 'string'
+                ? document.getElementById(element)
+                : element,
+            id;
+
+        // set an "el" property that references "this".  This allows
+        // Ext.util.Positionable methods to operate on this.el.dom since it
+        // gets mixed into both Element and Component
+        me.el = me;
+
+        if (!dom) {
+            return null;
+        }
+
+        id = dom.id;
+        if (!forceNew && id && Ext.cache[id]) {
+            // element object already exists
+            return Ext.cache[id].el;
+        }
+
+        /**
+         * @property {HTMLElement} dom
+         * The DOM element
+         */
+        me.dom = dom;
+
+        /**
+         * @property {String} id
+         * The DOM element ID
+         */
+        me.id = id || Ext.id(dom);
+
+        me.self.addToCache(me);
+    },
+
+    /**
+     * Sets the passed attributes as attributes of this element (a style attribute can be a string, object or function)
+     * @param {Object} o The object with the attributes
+     * @param {Boolean} [useSet=true] false to override the default setAttribute to use expandos.
+     * @return {Ext.dom.Element} this
+     */
+    set: function(o, useSet) {
+         var el = this.dom,
+             attr,
+             value;
+
+         for (attr in o) {
+             if (o.hasOwnProperty(attr)) {
+                 value = o[attr];
+                 if (attr == 'style') {
+                     this.applyStyles(value);
+                 }
+                 else if (attr == 'cls') {
+                     el.className = value;
+                 }
+                 else if (useSet !== false) {
+                     if (value === undefined) {
+                         el.removeAttribute(attr);
+                     } else {
+                        el.setAttribute(attr, value);
+                     }
+                 }
+                 else {
+                     el[attr] = value;
+                 }
+             }
+         }
+         return this;
+     },
+
+    /**
+     * @property {String} defaultUnit
+     * The default unit to append to CSS values where a unit isn't provided.
+     */
+    defaultUnit: "px",
+
+    /**
+     * Returns true if this element matches the passed simple selector (e.g. div.some-class or span:first-child)
+     * @param {String} selector The simple selector to test
+     * @return {Boolean} True if this element matches the selector, else false
+     */
+    is: function(simpleSelector) {
+        return Ext.DomQuery.is(this.dom, simpleSelector);
+    },
+
+    /**
+     * Returns the value of the "value" attribute
+     * @param {Boolean} asNumber true to parse the value as a number
+     * @return {String/Number}
+     */
+    getValue: function(asNumber) {
+        var val = this.dom.value;
+        return asNumber ? parseInt(val, 10) : val;
+    },
+
+    /**
+     * Removes this element's dom reference. Note that event and cache removal is handled at {@link Ext#removeNode
+     * Ext.removeNode}
+     */
+    remove: function() {
+        var me = this,
+            dom = me.dom;
+            
+        if (me.isAnimate) {
+            me.stopAnimation();
+        }
+
+        if (dom) {
+            Ext.removeNode(dom);
+            delete me.dom;
+        }
+    },
+
+    /**
+     * Returns true if this element is an ancestor of the passed element
+     * @param {HTMLElement/String} el The element to check
+     * @return {Boolean} True if this element is an ancestor of el, else false
+     */
+    contains: function(el) {
+        if (!el) {
+            return false;
+        }
+
+        var me = this,
+            dom = el.dom || el;
+
+        // we need el-contains-itself logic here because isAncestor does not do that:
+        return (dom === me.dom) || Ext.dom.AbstractElement.isAncestor(me.dom, dom);
+    },
+
+    /**
+     * Returns the value of an attribute from the element's underlying DOM node.
+     * @param {String} name The attribute name
+     * @param {String} [namespace] The namespace in which to look for the attribute
+     * @return {String} The attribute value
+     */
+    getAttribute: function(name, ns) {
+        var dom = this.dom;
+        return dom.getAttributeNS(ns, name) || dom.getAttribute(ns + ":" + name) || dom.getAttribute(name) || dom[name];
+    },
+
+    /**
+     * Update the innerHTML of this element
+     * @param {String} html The new HTML
+     * @return {Ext.dom.Element} this
+     */
+    update: function(html) {
+        if (this.dom) {
+            this.dom.innerHTML = html;
+        }
+        return this;
+    },
+
+
+    /**
+    * Set the innerHTML of this element
+    * @param {String} html The new HTML
+    * @return {Ext.Element} this
+     */
+    setHTML: function(html) {
+        if(this.dom) {
+            this.dom.innerHTML = html;
+        }
+        return this;
+    },
+
+    /**
+     * Returns the innerHTML of an Element or an empty string if the element's
+     * dom no longer exists.
+     */
+    getHTML: function() {
+        return this.dom ? this.dom.innerHTML : '';
+    },
+
+    /**
+     * Hide this element - Uses display mode to determine whether to use "display" or "visibility". See {@link #setVisible}.
+     * @param {Boolean/Object} animate (optional) true for the default animation or a standard Element animation config object
+     * @return {Ext.Element} this
+     */
+    hide: function() {
+        this.setVisible(false);
+        return this;
+    },
+
+    /**
+     * Show this element - Uses display mode to determine whether to use "display" or "visibility". See {@link #setVisible}.
+     * @param {Boolean/Object} animate (optional) true for the default animation or a standard Element animation config object
+     * @return {Ext.Element} this
+     */
+    show: function() {
+        this.setVisible(true);
+        return this;
+    },
+
+    /**
+     * Sets the visibility of the element (see details). If the visibilityMode is set to Element.DISPLAY, it will use
+     * the display property to hide the element, otherwise it uses visibility. The default is to hide and show using the visibility property.
+     * @param {Boolean} visible Whether the element is visible
+     * @param {Boolean/Object} animate (optional) True for the default animation, or a standard Element animation config object
+     * @return {Ext.Element} this
+     */
+    setVisible: function(visible, animate) {
+        var me = this,
+            statics = me.self,
+            mode = me.getVisibilityMode(),
+            prefix = Ext.baseCSSPrefix;
+
+        switch (mode) {
+            case statics.VISIBILITY:
+                me.removeCls([prefix + 'hidden-display', prefix + 'hidden-offsets']);
+                me[visible ? 'removeCls' : 'addCls'](prefix + 'hidden-visibility');
+            break;
+
+            case statics.DISPLAY:
+                me.removeCls([prefix + 'hidden-visibility', prefix + 'hidden-offsets']);
+                me[visible ? 'removeCls' : 'addCls'](prefix + 'hidden-display');
+            break;
+
+            case statics.OFFSETS:
+                me.removeCls([prefix + 'hidden-visibility', prefix + 'hidden-display']);
+                me[visible ? 'removeCls' : 'addCls'](prefix + 'hidden-offsets');
+            break;
+        }
+
+        return me;
+    },
+
+    getVisibilityMode: function() {
+        // Only flyweights won't have a $cache object, by calling getCache the cache
+        // will be created for future accesses. As such, we're eliminating the method
+        // call since it's mostly redundant
+        var data = (this.$cache || this.getCache()).data,
+            visMode = data.visibilityMode;
+
+        if (visMode === undefined) {
+            data.visibilityMode = visMode = this.self.DISPLAY;
+        }
+        
+        return visMode;
+    },
+
+    /**
+     * Use this to change the visibility mode between {@link #VISIBILITY}, {@link #DISPLAY}, {@link #OFFSETS} or {@link #ASCLASS}.
+     */
+    setVisibilityMode: function(mode) {
+        (this.$cache || this.getCache()).data.visibilityMode = mode;
+        return this;
+    },
+    
+    getCache: function() {
+        var me = this,
+            id = me.dom.id || Ext.id(me.dom);
+
+        // Note that we do not assign an ID to the calling object here.
+        // An Ext.dom.Element will have one assigned at construction, and an Ext.dom.Element.Fly must not have one.
+        // We assign an ID to the DOM element if it does not have one.
+        me.$cache = Ext.cache[id] || Ext.addCacheEntry(id, null, me.dom);
+            
+        return me.$cache;
+    }
+},
+function() {
+    var AbstractElement = this;
+
+    /**
+     * @private
+     * @member Ext
+     */
+    Ext.getDetachedBody = function () {
+        var detachedEl = AbstractElement.detachedBodyEl;
+
+        if (!detachedEl) {
+            detachedEl = document.createElement('div');
+            AbstractElement.detachedBodyEl = detachedEl = new AbstractElement.Fly(detachedEl);
+            detachedEl.isDetachedBody = true;
+        }
+
+        return detachedEl;
+    };
+
+    /**
+     * @private
+     * @member Ext
+     */
+    Ext.getElementById = function (id) {
+        var el = document.getElementById(id),
+            detachedBodyEl;
+
+        if (!el && (detachedBodyEl = AbstractElement.detachedBodyEl)) {
+            el = detachedBodyEl.dom.querySelector('#' + Ext.escapeId(id));
+        }
+
+        return el;
+    };
+
+    /**
+     * @member Ext
+     * @method get
+     * @inheritdoc Ext.dom.Element#get
+     */
+    Ext.get = function(el) {
+        return Ext.dom.Element.get(el);
+    };
+
+    this.addStatics({
+        /**
+         * @class Ext.dom.Element.Fly
+         * @alternateClassName Ext.dom.AbstractElement.Fly
+         * @extends Ext.dom.Element
+         *
+         * A non-persistent wrapper for a DOM element which may be used to execute methods of {@link Ext.dom.Element}
+         * upon a DOM element without creating an instance of {@link Ext.dom.Element}.
+         *
+         * A **singleton** instance of this class is returned when you use {@link Ext#fly}
+         *
+         * Because it is a singleton, this Flyweight does not have an ID, and must be used and discarded in a single line.
+         * You should not keep and use the reference to this singleton over multiple lines because methods that you call
+         * may themselves make use of {@link Ext#fly} and may change the DOM element to which the instance refers.
+         */
+        Fly: new Ext.Class({
+            // Although here the class is extending from AbstractElement,
+            // the class will be overwritten by Element definition with
+            // a class extending from Element instead.
+            // Therefore above we document it as extending Ext.Element.
+            extend: AbstractElement,
+
+            /**
+             * @property {Boolean} isFly
+             * This is `true` to identify Element flyweights
+             */
+            isFly: true,
+
+            constructor: function(dom) {
+                this.dom = dom;
+                // set an "el" property that references "this".  This allows
+                // Ext.util.Positionable methods to operate on this.el.dom since it
+                // gets mixed into both Element and Component
+                this.el = this;
+            },
+
+            /**
+             * @private
+             * Attach this fliyweight instance to the passed DOM element.
+             *
+             * Note that a flightweight does **not** have an ID, and does not acquire the ID of the DOM element.
+             */
+            attach: function (dom) {
+
+                // Attach to the passed DOM element. The same code as in Ext.Fly
+                this.dom = dom;
+                // Use cached data if there is existing cached data for the referenced DOM element,
+                // otherwise it will be created when needed by getCache.
+                this.$cache = dom.id ? Ext.cache[dom.id] : null;
+                return this;
+            }
+        }),
+
+        _flyweights: {},
+
+        /**
+         * Gets the singleton {@link Ext.dom.Element.Fly flyweight} element, with the passed node as the active element.
+         * 
+         * Because it is a singleton, this Flyweight does not have an ID, and must be used and discarded in a single line.
+         * You may not keep and use the reference to this singleton over multiple lines because methods that you call
+         * may themselves make use of {@link Ext#fly} and may change the DOM element to which the instance refers.
+         *  
+         * {@link Ext#fly} is alias for {@link Ext.dom.AbstractElement#fly}.
+         *
+         * Use this to make one-time references to DOM elements which are not going to be accessed again either by
+         * application code, or by Ext's classes. If accessing an element which will be processed regularly, then {@link
+         * Ext#get Ext.get} will be more appropriate to take advantage of the caching provided by the Ext.dom.Element
+         * class.
+         *
+         * @param {String/HTMLElement} dom The dom node or id
+         * @param {String} [named] Allows for creation of named reusable flyweights to prevent conflicts (e.g.
+         * internally Ext uses "_global")
+         * @return {Ext.dom.Element.Fly} The singleton flyweight object (or null if no matching element was found)
+         * @static
+         * @member Ext.dom.AbstractElement
+         */
+        fly: function(dom, named) {
+            var fly = null,
+                _flyweights = AbstractElement._flyweights;
+
+            named = named || '_global';
+
+            dom = Ext.getDom(dom);
+
+            if (dom) {
+                fly = _flyweights[named] || (_flyweights[named] = new AbstractElement.Fly());
+
+                // Attach to the passed DOM element.
+                // This code performs the same function as Fly.attach, but inline it for efficiency
+                fly.dom = dom;
+                // Use cached data if there is existing cached data for the referenced DOM element,
+                // otherwise it will be created when needed by getCache.
+                fly.$cache = dom.id ? Ext.cache[dom.id] : null;
+            }
+            return fly;
+        }
+    });
+
+    /**
+     * @member Ext
+     * @method fly
+     * @inheritdoc Ext.dom.AbstractElement#fly
+     */
+    Ext.fly = function() {
+        return AbstractElement.fly.apply(AbstractElement, arguments);
+    };
+
+    (function (proto) {
+        /**
+         * @method destroy
+         * @member Ext.dom.AbstractElement
+         * @inheritdoc Ext.dom.AbstractElement#remove
+         * Alias to {@link #remove}.
+         */
+        proto.destroy = proto.remove;
+
+        /**
+         * Returns a child element of this element given its `id`.
+         * @method getById
+         * @member Ext.dom.AbstractElement
+         * @param {String} id The id of the desired child element.
+         * @param {Boolean} [asDom=false] True to return the DOM element, false to return a
+         * wrapped Element object.
+         */
+        if (document.querySelector) {
+            proto.getById = function (id, asDom) {
+                // for normal elements getElementById is the best solution, but if the el is
+                // not part of the document.body, we have to resort to querySelector
+                var dom = document.getElementById(id) ||
+                    this.dom.querySelector('#'+Ext.escapeId(id));
+                return asDom ? dom : (dom ? Ext.get(dom) : null);
+            };
+        } else {
+            proto.getById = function (id, asDom) {
+                var dom = document.getElementById(id);
+                return asDom ? dom : (dom ? Ext.get(dom) : null);
+            };
+        }
+    }(this.prototype));
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @define Ext.DomHelper
+
+// @define Ext.core.DomHelper
+
+/**
+ * @class Ext.DomHelper
+ * @extends Ext.dom.Helper
+ * @alternateClassName Ext.core.DomHelper
+ * @singleton
+ *
+ * The DomHelper class provides a layer of abstraction from DOM and transparently supports creating elements via DOM or
+ * using HTML fragments. It also has the ability to create HTML fragment templates from your DOM building code.
+ *
+ * # DomHelper element specification object
+ *
+ * A specification object is used when creating elements. Attributes of this object are assumed to be element
+ * attributes, except for 4 special attributes:
+ *
+ * - **tag** - The tag name of the element.
+ * - **children** or **cn** - An array of the same kind of element definition objects to be created and appended.
+ *   These can be nested as deep as you want.
+ * - **cls** - The class attribute of the element. This will end up being either the "class" attribute on a HTML
+ *   fragment or className for a DOM node, depending on whether DomHelper is using fragments or DOM.
+ * - **html** - The innerHTML for the element.
+ *
+ * **NOTE:** For other arbitrary attributes, the value will currently **not** be automatically HTML-escaped prior to
+ * building the element's HTML string. This means that if your attribute value contains special characters that would
+ * not normally be allowed in a double-quoted attribute value, you **must** manually HTML-encode it beforehand (see
+ * {@link Ext.String#htmlEncode}) or risk malformed HTML being created. This behavior may change in a future release.
+ *
+ * # Insertion methods
+ *
+ * Commonly used insertion methods:
+ *
+ * - **{@link #append}**
+ * - **{@link #insertBefore}**
+ * - **{@link #insertAfter}**
+ * - **{@link #overwrite}**
+ * - **{@link #createTemplate}**
+ * - **{@link #insertHtml}**
+ *
+ * # Example
+ *
+ * This is an example, where an unordered list with 3 children items is appended to an existing element with
+ * id 'my-div':
+ *
+ *     var dh = Ext.DomHelper; // create shorthand alias
+ *     // specification object
+ *     var spec = {
+ *         id: 'my-ul',
+ *         tag: 'ul',
+ *         cls: 'my-list',
+ *         // append children after creating
+ *         children: [     // may also specify 'cn' instead of 'children'
+ *             {tag: 'li', id: 'item0', html: 'List Item 0'},
+ *             {tag: 'li', id: 'item1', html: 'List Item 1'},
+ *             {tag: 'li', id: 'item2', html: 'List Item 2'}
+ *         ]
+ *     };
+ *     var list = dh.append(
+ *         'my-div', // the context element 'my-div' can either be the id or the actual node
+ *         spec      // the specification object
+ *     );
+ *
+ * Element creation specification parameters in this class may also be passed as an Array of specification objects. This
+ * can be used to insert multiple sibling nodes into an existing container very efficiently. For example, to add more
+ * list items to the example above:
+ *
+ *     dh.append('my-ul', [
+ *         {tag: 'li', id: 'item3', html: 'List Item 3'},
+ *         {tag: 'li', id: 'item4', html: 'List Item 4'}
+ *     ]);
+ *
+ * # Templating
+ *
+ * The real power is in the built-in templating. Instead of creating or appending any elements, {@link #createTemplate}
+ * returns a Template object which can be used over and over to insert new elements. Revisiting the example above, we
+ * could utilize templating this time:
+ *
+ *     // create the node
+ *     var list = dh.append('my-div', {tag: 'ul', cls: 'my-list'});
+ *     // get template
+ *     var tpl = dh.createTemplate({tag: 'li', id: 'item{0}', html: 'List Item {0}'});
+ *
+ *     for(var i = 0; i < 5, i++){
+ *         tpl.append(list, [i]); // use template to append to the actual node
+ *     }
+ *
+ * An example using a template:
+ *
+ *     var html = '<a id="{0}" href="{1}" class="nav">{2}</a>';
+ *
+ *     var tpl = new Ext.DomHelper.createTemplate(html);
+ *     tpl.append('blog-roll', ['link1', 'http://www.edspencer.net/', "Ed's Site"]);
+ *     tpl.append('blog-roll', ['link2', 'http://www.dustindiaz.com/', "Dustin's Site"]);
+ *
+ * The same example using named parameters:
+ *
+ *     var html = '<a id="{id}" href="{url}" class="nav">{text}</a>';
+ *
+ *     var tpl = new Ext.DomHelper.createTemplate(html);
+ *     tpl.append('blog-roll', {
+ *         id: 'link1',
+ *         url: 'http://www.edspencer.net/',
+ *         text: "Ed's Site"
+ *     });
+ *     tpl.append('blog-roll', {
+ *         id: 'link2',
+ *         url: 'http://www.dustindiaz.com/',
+ *         text: "Dustin's Site"
+ *     });
+ *
+ * # Compiling Templates
+ *
+ * Templates are applied using regular expressions. The performance is great, but if you are adding a bunch of DOM
+ * elements using the same template, you can increase performance even further by {@link Ext.Template#compile
+ * "compiling"} the template. The way "{@link Ext.Template#compile compile()}" works is the template is parsed and
+ * broken up at the different variable points and a dynamic function is created and eval'ed. The generated function
+ * performs string concatenation of these parts and the passed variables instead of using regular expressions.
+ *
+ *     var html = '<a id="{id}" href="{url}" class="nav">{text}</a>';
+ *
+ *     var tpl = new Ext.DomHelper.createTemplate(html);
+ *     tpl.compile();
+ *
+ *     //... use template like normal
+ *
+ * # Performance Boost
+ *
+ * DomHelper will transparently create HTML fragments when it can. Using HTML fragments instead of DOM can significantly
+ * boost performance.
+ *
+ * Element creation specification parameters may also be strings. If {@link #useDom} is false, then the string is used
+ * as innerHTML. If {@link #useDom} is true, a string specification results in the creation of a text node. Usage:
+ *
+ *     Ext.DomHelper.useDom = true; // force it to use DOM; reduces performance
+ *
+ */
+Ext.define('Ext.dom.Helper', (function() {
+
+// kill repeat to save bytes
+var afterbegin = 'afterbegin',
+    afterend = 'afterend',
+    beforebegin = 'beforebegin',
+    beforeend = 'beforeend',
+    ts = '<table>',
+    te = '</table>',
+    tbs = ts+'<tbody>',
+    tbe = '</tbody>'+te,
+    trs = tbs + '<tr>',
+    tre = '</tr>'+tbe,
+    detachedDiv = document.createElement('div'),
+    bbValues = ['BeforeBegin', 'previousSibling'],
+    aeValues = ['AfterEnd', 'nextSibling'],
+    bb_ae_PositionHash = {
+        beforebegin: bbValues,
+        afterend: aeValues
+    },
+    fullPositionHash = {
+        beforebegin: bbValues,
+        afterend: aeValues,
+        afterbegin: ['AfterBegin', 'firstChild'],
+        beforeend: ['BeforeEnd', 'lastChild']
+    };
+
+/**
+ * @class Ext.dom.Helper
+ * @extends Ext.dom.AbstractHelper
+ * @requires Ext.dom.AbstractElement
+ * 
+ * The actual class of which {@link Ext.DomHelper} is instance of.
+ * 
+ * Use singleton {@link Ext.DomHelper} instead.
+ * 
+ * @private
+ */
+return {
+    extend:  Ext.dom.AbstractHelper ,
+                                         
+
+    tableRe: /^(?:table|thead|tbody|tr|td)$/i,
+
+    tableElRe: /td|tr|tbody|thead/i,
+
+    /**
+     * @property {Boolean} useDom
+     * True to force the use of DOM instead of html fragments.
+     */
+    useDom : false,
+
+    /**
+     * Creates new DOM element(s) without inserting them to the document.
+     * @param {Object/String} o The DOM object spec (and children) or raw HTML blob
+     * @return {HTMLElement} The new uninserted node
+     */
+    createDom: function(o, parentNode){
+        var el,
+            doc = document,
+            useSet,
+            attr,
+            val,
+            cn,
+            i, l;
+
+        if (Ext.isArray(o)) {                       // Allow Arrays of siblings to be inserted
+            el = doc.createDocumentFragment(); // in one shot using a DocumentFragment
+            for (i = 0, l = o.length; i < l; i++) {
+                this.createDom(o[i], el);
+            }
+        } else if (typeof o == 'string') {         // Allow a string as a child spec.
+            el = doc.createTextNode(o);
+        } else {
+            el = doc.createElement(o.tag || 'div');
+            useSet = !!el.setAttribute; // In IE some elements don't have setAttribute
+            for (attr in o) {
+                if (!this.confRe.test(attr)) {
+                    val = o[attr];
+                    if (attr == 'cls') {
+                        el.className = val;
+                    } else {
+                        if (useSet) {
+                            el.setAttribute(attr, val);
+                        } else {
+                            el[attr] = val;
+                        }
+                    }
+                }
+            }
+            Ext.DomHelper.applyStyles(el, o.style);
+
+            if ((cn = o.children || o.cn)) {
+                this.createDom(cn, el);
+            } else if (o.html) {
+                el.innerHTML = o.html;
+            }
+        }
+        if (parentNode) {
+            parentNode.appendChild(el);
+        }
+        return el;
+    },
+
+    ieTable: function(depth, openingTags, htmlContent, closingTags){
+        detachedDiv.innerHTML = [openingTags, htmlContent, closingTags].join('');
+
+        var i = -1,
+            el = detachedDiv,
+            ns;
+
+        while (++i < depth) {
+            el = el.firstChild;
+        }
+        // If the result is multiple siblings, then encapsulate them into one fragment.
+        ns = el.nextSibling;
+
+        if (ns) {
+            ns = el;
+            el = document.createDocumentFragment();
+            
+            while (ns) {
+                 nx = ns.nextSibling;
+                 el.appendChild(ns);
+                 ns = nx;
+            }
+        }
+        return el;
+    },
+
+    /**
+     * @private
+     * Nasty code for IE's broken table implementation
+     */
+    insertIntoTable: function(tag, where, destinationEl, html) {
+        var node,
+            before,
+            bb = where == beforebegin,
+            ab = where == afterbegin,
+            be = where == beforeend,
+            ae = where == afterend;
+
+        if (tag == 'td' && (ab || be) || !this.tableElRe.test(tag) && (bb || ae)) {
+            return null;
+        }
+        before = bb ? destinationEl :
+                 ae ? destinationEl.nextSibling :
+                 ab ? destinationEl.firstChild : null;
+
+        if (bb || ae) {
+            destinationEl = destinationEl.parentNode;
+        }
+
+        if (tag == 'td' || (tag == 'tr' && (be || ab))) {
+            node = this.ieTable(4, trs, html, tre);
+        } else if (((tag == 'tbody' || tag == 'thead') && (be || ab)) ||
+                (tag == 'tr' && (bb || ae))) {
+            node = this.ieTable(3, tbs, html, tbe);
+        } else {
+            node = this.ieTable(2, ts, html, te);
+        }
+        destinationEl.insertBefore(node, before);
+        return node;
+    },
+
+    /**
+     * @private
+     * Fix for IE9 createContextualFragment missing method
+     */
+    createContextualFragment: function(html) {
+        var fragment = document.createDocumentFragment(),
+            length, childNodes;
+
+        detachedDiv.innerHTML = html;
+        childNodes = detachedDiv.childNodes;
+        length = childNodes.length;
+
+        // Move nodes into fragment, don't clone: http://jsperf.com/create-fragment
+        while (length--) {
+            fragment.appendChild(childNodes[0]);
+        }
+        return fragment;
+    },
+
+    applyStyles: function(el, styles) {
+        if (styles) {
+            if (typeof styles == "function") {
+                styles = styles.call();
+            }
+            if (typeof styles == "string") {
+                styles = Ext.dom.Element.parseStyles(styles);
+            }
+            if (typeof styles == "object") {
+                Ext.fly(el, '_applyStyles').setStyle(styles);
+            }
+        }
+    },
+
+    /**
+     * Alias for {@link #markup}.
+     * @inheritdoc Ext.dom.AbstractHelper#markup
+     */
+    createHtml: function(spec) {
+        return this.markup(spec);
+    },
+
+    doInsert: function(el, o, returnElement, pos, sibling, append) {
+        
+        el = el.dom || Ext.getDom(el);
+
+        var newNode;
+
+        if (this.useDom) {
+            newNode = this.createDom(o, null);
+
+            if (append) {
+                el.appendChild(newNode);
+            }
+            else {
+                (sibling == 'firstChild' ? el : el.parentNode).insertBefore(newNode, el[sibling] || el);
+            }
+
+        } else {
+            newNode = this.insertHtml(pos, el, this.markup(o));
+        }
+        return returnElement ? Ext.get(newNode, true) : newNode;
+    },
+
+    /**
+     * Creates new DOM element(s) and overwrites the contents of el with them.
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/String} o The DOM object spec (and children) or raw HTML blob
+     * @param {Boolean} [returnElement] true to return an Ext.Element
+     * @return {HTMLElement/Ext.Element} The new node
+     */
+    overwrite: function(el, html, returnElement) {
+        var newNode;
+
+        el = Ext.getDom(el);
+        html = this.markup(html);
+
+        // IE Inserting HTML into a table/tbody/tr requires extra processing: http://www.ericvasilik.com/2006/07/code-karma.html
+        if (Ext.isIE && this.tableRe.test(el.tagName)) {
+            // Clearing table elements requires removal of all elements.
+            while (el.firstChild) {
+                el.removeChild(el.firstChild);
+            }
+            if (html) {
+                newNode = this.insertHtml('afterbegin', el, html);
+                return returnElement ? Ext.get(newNode) : newNode;
+            }
+            return null;
+        }
+        el.innerHTML = html;
+        return returnElement ? Ext.get(el.firstChild) : el.firstChild;
+    },
+
+    insertHtml: function(where, el, html) {
+        var hashVal,
+            range,
+            rangeEl,
+            setStart,
+            frag;
+
+        where = where.toLowerCase();
+
+        // Has fast HTML insertion into existing DOM: http://www.w3.org/TR/html5/apis-in-html-documents.html#insertadjacenthtml
+        if (el.insertAdjacentHTML) {
+
+            // IE's incomplete table implementation: http://www.ericvasilik.com/2006/07/code-karma.html
+            if (Ext.isIE && this.tableRe.test(el.tagName) && (frag = this.insertIntoTable(el.tagName.toLowerCase(), where, el, html))) {
+                return frag;
+            }
+
+            if ((hashVal = fullPositionHash[where])) {
+
+                if (Ext.global.MSApp && Ext.global.MSApp.execUnsafeLocalFunction) {
+                    //ALLOW MS TO EXECUTE THIS CODE FOR NATIVE WINDOWS 8 DESKTOP APPS
+                    MSApp.execUnsafeLocalFunction(function () {
+                        el.insertAdjacentHTML(hashVal[0], html);
+                    });
+                } else {
+                    el.insertAdjacentHTML(hashVal[0], html);
+                }
+
+                return el[hashVal[1]];
+            }
+            // if (not IE and context element is an HTMLElement) or TextNode
+        } else {
+            // we cannot insert anything inside a textnode so...
+            if (el.nodeType === 3) {
+                where = where === 'afterbegin' ? 'beforebegin' : where;
+                where = where === 'beforeend' ? 'afterend' : where;
+            }
+            range = Ext.supports.CreateContextualFragment ? el.ownerDocument.createRange() : undefined;
+            setStart = 'setStart' + (this.endRe.test(where) ? 'After' : 'Before');
+            if (bb_ae_PositionHash[where]) {
+                if (range) {
+                    range[setStart](el);
+                    frag = range.createContextualFragment(html);
+                } else {
+                    frag = this.createContextualFragment(html);
+                }
+                el.parentNode.insertBefore(frag, where == beforebegin ? el : el.nextSibling);
+                return el[(where == beforebegin ? 'previous' : 'next') + 'Sibling'];
+            } else {
+                rangeEl = (where == afterbegin ? 'first' : 'last') + 'Child';
+                if (el.firstChild) {
+                    if (range) {
+                        range[setStart](el[rangeEl]);
+                        frag = range.createContextualFragment(html);
+                    } else {
+                        frag = this.createContextualFragment(html);
+                    }
+
+                    if (where == afterbegin) {
+                        el.insertBefore(frag, el.firstChild);
+                    } else {
+                        el.appendChild(frag);
+                    }
+                } else {
+                    el.innerHTML = html;
+                }
+                return el[rangeEl];
+            }
+        }
+        Ext.Error.raise({
+            sourceClass: 'Ext.DomHelper',
+            sourceMethod: 'insertHtml',
+            htmlToInsert: html,
+            targetElement: el,
+            msg: 'Illegal insertion point reached: "' + where + '"'
+        });
+    },
+
+    /**
+     * Creates a new Ext.Template from the DOM object spec.
+     * @param {Object} o The DOM object spec (and children)
+     * @return {Ext.Template} The new template
+     */
+    createTemplate: function(o) {
+        var html = this.markup(o);
+        return new Ext.Template(html);
+    }
+
+};
+})(), function() {
+    Ext.ns('Ext.core');
+    Ext.DomHelper = Ext.core.DomHelper = new this;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag core
+/**
+ * Represents an HTML fragment template. Templates may be {@link #compile precompiled} for greater performance.
+ *
+ * An instance of this class may be created by passing to the constructor either a single argument, or multiple
+ * arguments:
+ *
+ * # Single argument: String/Array
+ *
+ * The single argument may be either a String or an Array:
+ *
+ * - String:
+ *
+ *       var t = new Ext.Template("<div>Hello {0}.</div>");
+ *       t.{@link #append}('some-element', ['foo']);
+ *
+ * - Array:
+ *
+ *   An Array will be combined with `join('')`.
+ *
+ *       var t = new Ext.Template([
+ *           '<div name="{id}">',
+ *               '<span class="{cls}">{name:trim} {value:ellipsis(10)}</span>',
+ *           '</div>',
+ *       ]);
+ *       t.{@link #compile}();
+ *       t.{@link #append}('some-element', {id: 'myid', cls: 'myclass', name: 'foo', value: 'bar'});
+ *
+ * # Multiple arguments: String, Object, Array, ...
+ *
+ * Multiple arguments will be combined with `join('')`.
+ *
+ *     var t = new Ext.Template(
+ *         '<div name="{id}">',
+ *             '<span class="{cls}">{name} {value}</span>',
+ *         '</div>',
+ *         // a configuration object:
+ *         {
+ *             compiled: true,      // {@link #compile} immediately
+ *         }
+ *     );
+ *
+ * # Notes
+ *
+ * - For a list of available format functions, see {@link Ext.util.Format}.
+ * - `disableFormats` reduces `{@link #apply}` time when no formatting is required.
+ */
+Ext.define('Ext.Template', {
+
+    /* Begin Definitions */
+
+                                                    
+
+    inheritableStatics: {
+        /**
+         * Creates a template from the passed element's value (_display:none_ textarea, preferred) or innerHTML.
+         * @param {String/HTMLElement} el A DOM element or its id
+         * @param {Object} config (optional) Config object
+         * @return {Ext.Template} The created template
+         * @static
+         * @inheritable
+         */
+        from: function(el, config) {
+            el = Ext.getDom(el);
+            return new this(el.value || el.innerHTML, config || '');
+        }
+    },
+
+    /* End Definitions */
+
+    /**
+     * Creates new template.
+     * 
+     * @param {String...} html List of strings to be concatenated into template.
+     * Alternatively an array of strings can be given, but then no config object may be passed.
+     * @param {Object} config (optional) Config object
+     */
+    constructor: function(html) {
+        var me = this,
+            args = arguments,
+            buffer = [],
+            i = 0,
+            length = args.length,
+            value;
+
+        me.initialConfig = {};
+        
+        // Allow an array to be passed here so we can
+        // pass an array of strings and an object
+        // at the end
+        if (length === 1 && Ext.isArray(html)) {
+            args = html;
+            length = args.length;
+        }
+
+        if (length > 1) {
+            for (; i < length; i++) {
+                value = args[i];
+                if (typeof value == 'object') {
+                    Ext.apply(me.initialConfig, value);
+                    Ext.apply(me, value);
+                } else {
+                    buffer.push(value);
+                }
+            }
+        } else {
+            buffer.push(html);
+        }
+
+        // @private
+        me.html = buffer.join('');
+
+        if (me.compiled) {
+            me.compile();
+        }
+    },
+
+    /**
+     * @property {Boolean} isTemplate
+     * `true` in this class to identify an object as an instantiated Template, or subclass thereof.
+     */
+    isTemplate: true,
+
+    /**
+     * @cfg {Boolean} compiled
+     * True to immediately compile the template. Defaults to false.
+     */
+
+    /**
+     * @cfg {Boolean} disableFormats
+     * True to disable format functions in the template. If the template doesn't contain
+     * format functions, setting disableFormats to true will reduce apply time. Defaults to false.
+     */
+    disableFormats: false,
+
+    re: /\{([\w\-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,
+
+    /**
+     * Returns an HTML fragment of this template with the specified values applied.
+     *
+     * @param {Object/Array} values The template values. Can be an array if your params are numeric:
+     *
+     *     var tpl = new Ext.Template('Name: {0}, Age: {1}');
+     *     tpl.apply(['John', 25]);
+     *
+     * or an object:
+     *
+     *     var tpl = new Ext.Template('Name: {name}, Age: {age}');
+     *     tpl.apply({name: 'John', age: 25});
+     *
+     * @return {String} The HTML fragment
+     */
+    apply: function(values) {
+        var me = this,
+            useFormat = me.disableFormats !== true,
+            fm = Ext.util.Format,
+            tpl = me,
+            ret;
+
+        if (me.compiled) {
+            return me.compiled(values).join('');
+        }
+
+        function fn(m, name, format, args) {
+            if (format && useFormat) {
+                if (args) {
+                    args = [values[name]].concat(Ext.functionFactory('return ['+ args +'];')());
+                } else {
+                    args = [values[name]];
+                }
+                if (format.substr(0, 5) == "this.") {
+                    return tpl[format.substr(5)].apply(tpl, args);
+                }
+                else {
+                    return fm[format].apply(fm, args);
+                }
+            }
+            else {
+                return values[name] !== undefined ? values[name] : "";
+            }
+        }
+
+        ret = me.html.replace(me.re, fn);
+        return ret;
+    },
+
+    /**
+     * Appends the result of this template to the provided output array.
+     * @param {Object/Array} values The template values. See {@link #apply}.
+     * @param {Array} out The array to which output is pushed.
+     * @return {Array} The given out array.
+     */
+    applyOut: function(values, out) {
+        var me = this;
+
+        if (me.compiled) {
+            out.push.apply(out, me.compiled(values));
+        } else {
+            out.push(me.apply(values));
+        }
+
+        return out;
+    },
+
+    /**
+     * @method applyTemplate
+     * @member Ext.Template
+     * Alias for {@link #apply}.
+     * @inheritdoc Ext.Template#apply
+     */
+    applyTemplate: function () {
+        return this.apply.apply(this, arguments);
+    },
+
+    /**
+     * Sets the HTML used as the template and optionally compiles it.
+     * @param {String} html
+     * @param {Boolean} compile (optional) True to compile the template.
+     * @return {Ext.Template} this
+     */
+    set: function(html, compile) {
+        var me = this;
+        me.html = html;
+        me.compiled = null;
+        return compile ? me.compile() : me;
+    },
+
+    compileARe: /\\/g,
+    compileBRe: /(\r\n|\n)/g,
+    compileCRe: /'/g,
+
+    /**
+     * Compiles the template into an internal function, eliminating the RegEx overhead.
+     * @return {Ext.Template} this
+     */
+    compile: function() {
+        var me = this,
+            fm = Ext.util.Format,
+            useFormat = me.disableFormats !== true,
+            body, bodyReturn;
+
+        function fn(m, name, format, args) {
+            if (format && useFormat) {
+                args = args ? ',' + args: "";
+                if (format.substr(0, 5) != "this.") {
+                    format = "fm." + format + '(';
+                }
+                else {
+                    format = 'this.' + format.substr(5) + '(';
+                }
+            }
+            else {
+                args = '';
+                format = "(values['" + name + "'] == undefined ? '' : ";
+            }
+            return "'," + format + "values['" + name + "']" + args + ") ,'";
+        }
+
+        bodyReturn = me.html.replace(me.compileARe, '\\\\').replace(me.compileBRe, '\\n').replace(me.compileCRe, "\\'").replace(me.re, fn);
+        body = "this.compiled = function(values){ return ['" + bodyReturn + "'];};";
+        eval(body);
+        return me;
+    },
+
+    /**
+     * Applies the supplied values to the template and inserts the new node(s) as the first child of el.
+     *
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/Array} values The template values. See {@link #applyTemplate} for details.
+     * @param {Boolean} returnElement (optional) true to return a Ext.Element.
+     * @return {HTMLElement/Ext.Element} The new node or Element
+     */
+    insertFirst: function(el, values, returnElement) {
+        return this.doInsert('afterBegin', el, values, returnElement);
+    },
+
+    /**
+     * Applies the supplied values to the template and inserts the new node(s) before el.
+     *
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/Array} values The template values. See {@link #applyTemplate} for details.
+     * @param {Boolean} returnElement (optional) true to return a Ext.Element.
+     * @return {HTMLElement/Ext.Element} The new node or Element
+     */
+    insertBefore: function(el, values, returnElement) {
+        return this.doInsert('beforeBegin', el, values, returnElement);
+    },
+
+    /**
+     * Applies the supplied values to the template and inserts the new node(s) after el.
+     *
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/Array} values The template values. See {@link #applyTemplate} for details.
+     * @param {Boolean} returnElement (optional) true to return a Ext.Element.
+     * @return {HTMLElement/Ext.Element} The new node or Element
+     */
+    insertAfter: function(el, values, returnElement) {
+        return this.doInsert('afterEnd', el, values, returnElement);
+    },
+
+    /**
+     * Applies the supplied `values` to the template and appends the new node(s) to the specified `el`.
+     *
+     * For example usage see {@link Ext.Template Ext.Template class docs}.
+     *
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/Array} values The template values. See {@link #applyTemplate} for details.
+     * @param {Boolean} returnElement (optional) true to return an Ext.Element.
+     * @return {HTMLElement/Ext.Element} The new node or Element
+     */
+    append: function(el, values, returnElement) {
+        return this.doInsert('beforeEnd', el, values, returnElement);
+    },
+
+    doInsert: function(where, el, values, returnElement) {
+        var newNode = Ext.DomHelper.insertHtml(where, Ext.getDom(el), this.apply(values));
+        return returnElement ? Ext.get(newNode) : newNode;
+    },
+
+    /**
+     * Applies the supplied values to the template and overwrites the content of el with the new node(s).
+     *
+     * @param {String/HTMLElement/Ext.Element} el The context element
+     * @param {Object/Array} values The template values. See {@link #applyTemplate} for details.
+     * @param {Boolean} returnElement (optional) true to return a Ext.Element.
+     * @return {HTMLElement/Ext.Element} The new node or Element
+     */
+    overwrite: function(el, values, returnElement) {
+        var newNode = Ext.DomHelper.overwrite(Ext.getDom(el), this.apply(values));
+        return returnElement ? Ext.get(newNode) : newNode;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag core
+/**
+ * This class parses the XTemplate syntax and calls abstract methods to process the parts.
+ * @private
+ */
+Ext.define('Ext.XTemplateParser', {
+    constructor: function (config) {
+        Ext.apply(this, config);
+    },
+
+    /**
+     * @property {Number} level The 'for' or 'foreach' loop context level. This is adjusted
+     * up by one prior to calling {@link #doFor} or {@link #doForEach} and down by one after
+     * calling the corresponding {@link #doEnd} that closes the loop. This will be 1 on the
+     * first {@link #doFor} or {@link #doForEach} call.
+     */
+
+    /**
+     * This method is called to process a piece of raw text from the tpl.
+     * @param {String} text
+     * @method doText
+     */
+    // doText: function (text)
+
+    /**
+     * This method is called to process expressions (like `{[expr]}`).
+     * @param {String} expr The body of the expression (inside "{[" and "]}").
+     * @method doExpr
+     */
+    // doExpr: function (expr)
+
+    /**
+     * This method is called to process simple tags (like `{tag}`).
+     * @method doTag
+     */
+    // doTag: function (tag)
+
+    /**
+     * This method is called to process `<tpl else>`.
+     * @method doElse
+     */
+    // doElse: function ()
+
+    /**
+     * This method is called to process `{% text %}`.
+     * @param {String} text
+     * @method doEval
+     */
+    // doEval: function (text)
+
+    /**
+     * This method is called to process `<tpl if="action">`. If there are other attributes,
+     * these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name (such as 'exec').
+     * @method doIf
+     */
+    // doIf: function (action, actions)
+
+    /**
+     * This method is called to process `<tpl elseif="action">`. If there are other attributes,
+     * these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name (such as 'exec').
+     * @method doElseIf
+     */
+    // doElseIf: function (action, actions)
+
+    /**
+     * This method is called to process `<tpl switch="action">`. If there are other attributes,
+     * these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name (such as 'exec').
+     * @method doSwitch
+     */
+    // doSwitch: function (action, actions)
+
+    /**
+     * This method is called to process `<tpl case="action">`. If there are other attributes,
+     * these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name (such as 'exec').
+     * @method doCase
+     */
+    // doCase: function (action, actions)
+
+    /**
+     * This method is called to process `<tpl default>`.
+     * @method doDefault
+     */
+    // doDefault: function ()
+
+    /**
+     * This method is called to process `</tpl>`. It is given the action type that started
+     * the tpl and the set of additional actions.
+     * @param {String} type The type of action that is being ended.
+     * @param {Object} actions The other actions keyed by the attribute name (such as 'exec').
+     * @method doEnd
+     */
+    // doEnd: function (type, actions) 
+
+    /**
+     * This method is called to process `<tpl for="action">`. If there are other attributes,
+     * these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name (such as 'exec').
+     * @method doFor
+     */
+    // doFor: function (action, actions)
+
+    /**
+     * This method is called to process `<tpl foreach="action">`. If there are other
+     * attributes, these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name (such as 'exec').
+     * @method doForEach
+     */
+    // doForEach: function (action, actions)
+
+    /**
+     * This method is called to process `<tpl exec="action">`. If there are other attributes,
+     * these are passed in the actions object.
+     * @param {String} action
+     * @param {Object} actions Other actions keyed by the attribute name.
+     * @method doExec
+     */
+    // doExec: function (action, actions)
+
+    /**
+     * This method is called to process an empty `<tpl>`. This is unlikely to need to be
+     * implemented, so a default (do nothing) version is provided.
+     * @method
+     */
+    doTpl: Ext.emptyFn,
+
+    parse: function (str) {
+        var me = this,
+            len = str.length,
+            aliases = { elseif: 'elif' },
+            topRe = me.topRe,
+            actionsRe = me.actionsRe,
+            index, stack, s, m, t, prev, frame, subMatch, begin, end, actions,
+            prop;
+
+        me.level = 0;
+        me.stack = stack = [];
+
+        for (index = 0; index < len; index = end) {
+            topRe.lastIndex = index;
+            m = topRe.exec(str);
+
+            if (!m) {
+                me.doText(str.substring(index, len));
+                break;
+            }
+
+            begin = m.index;
+            end = topRe.lastIndex;
+
+            if (index < begin) {
+                me.doText(str.substring(index, begin));
+            }
+
+            if (m[1]) {
+                end = str.indexOf('%}', begin+2);
+                me.doEval(str.substring(begin+2, end));
+                end += 2;
+            } else if (m[2]) {
+                end = str.indexOf(']}', begin+2);
+                me.doExpr(str.substring(begin+2, end));
+                end += 2;
+            } else if (m[3]) { // if ('{' token)
+                me.doTag(m[3]);
+            } else if (m[4]) { // content of a <tpl xxxxxx xxx> tag
+                actions = null;
+                while ((subMatch = actionsRe.exec(m[4])) !== null) {
+                    s = subMatch[2] || subMatch[3];
+                    if (s) {
+                        s = Ext.String.htmlDecode(s); // decode attr value
+                        t = subMatch[1];
+                        t = aliases[t] || t;
+                        actions = actions || {};
+                        prev = actions[t];
+
+                        if (typeof prev == 'string') {
+                            actions[t] = [prev, s];
+                        } else if (prev) {
+                            actions[t].push(s);
+                        } else {
+                            actions[t] = s;
+                        }
+                    }
+                }
+
+                if (!actions) {
+                    if (me.elseRe.test(m[4])) {
+                        me.doElse();
+                    } else if (me.defaultRe.test(m[4])) {
+                        me.doDefault();
+                    } else {
+                        me.doTpl();
+                        stack.push({ type: 'tpl' });
+                    }
+                }
+                else if (actions['if']) {
+                    me.doIf(actions['if'], actions);
+                    stack.push({ type: 'if' });
+                }
+                else if (actions['switch']) {
+                    me.doSwitch(actions['switch'], actions);
+                    stack.push({ type: 'switch' });
+                }
+                else if (actions['case']) {
+                    me.doCase(actions['case'], actions);
+                }
+                else if (actions['elif']) {
+                    me.doElseIf(actions['elif'], actions);
+                }
+                else if (actions['for']) {
+                    ++me.level;
+
+                    // Extract property name to use from indexed item
+                    if (prop = me.propRe.exec(m[4])) {
+                        actions.propName = prop[1] || prop[2];
+                    }
+                    me.doFor(actions['for'], actions);
+                    stack.push({ type: 'for', actions: actions });
+                }
+                else if (actions['foreach']) {
+                    ++me.level;
+
+                    // Extract property name to use from indexed item
+                    if (prop = me.propRe.exec(m[4])) {
+                        actions.propName = prop[1] || prop[2];
+                    }
+                    me.doForEach(actions['foreach'], actions);
+                    stack.push({ type: 'foreach', actions: actions });
+                }
+                else if (actions.exec) {
+                    me.doExec(actions.exec, actions);
+                    stack.push({ type: 'exec', actions: actions });
+                }
+                /*
+                else {
+                    // todo - error
+                }
+                */
+            } else if (m[0].length === 5) {
+                // if the length of m[0] is 5, assume that we're dealing with an opening tpl tag with no attributes (e.g. <tpl>...</tpl>)
+                // in this case no action is needed other than pushing it on to the stack
+                stack.push({ type: 'tpl' });
+            } else {
+                frame = stack.pop();
+                me.doEnd(frame.type, frame.actions);
+                if (frame.type == 'for' || frame.type == 'foreach') {
+                    --me.level;
+                }
+            }
+        }
+    },
+
+    // Internal regexes
+    
+    topRe:     /(?:(\{\%)|(\{\[)|\{([^{}]+)\})|(?:<tpl([^>]*)\>)|(?:<\/tpl>)/g,
+    actionsRe: /\s*(elif|elseif|if|for|foreach|exec|switch|case|eval|between)\s*\=\s*(?:(?:"([^"]*)")|(?:'([^']*)'))\s*/g,
+    propRe:    /prop=(?:(?:"([^"]*)")|(?:'([^']*)'))/,
+    defaultRe: /^\s*default\s*$/,
+    elseRe:    /^\s*else\s*$/
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag core
+/**
+ * This class compiles the XTemplate syntax into a function object. The function is used
+ * like so:
+ * 
+ *      function (out, values, parent, xindex, xcount) {
+ *          // out is the output array to store results
+ *          // values, parent, xindex and xcount have their historical meaning
+ *      }
+ *
+ * @markdown
+ * @private
+ */
+Ext.define('Ext.XTemplateCompiler', {
+    extend:  Ext.XTemplateParser ,
+
+    // Chrome really likes "new Function" to realize the code block (as in it is
+    // 2x-3x faster to call it than using eval), but Firefox chokes on it badly.
+    // IE and Opera are also fine with the "new Function" technique.
+    useEval: Ext.isGecko,
+
+    // See http://jsperf.com/nige-array-append for quickest way to append to an array of unknown length
+    // (Due to arbitrary code execution inside a template, we cannot easily track the length in  var)
+    // On IE6 to 8, myArray[myArray.length]='foo' is better. On other browsers myArray.push('foo') is better.
+    useIndex: Ext.isIE8m,
+
+    useFormat: true,
+    
+    propNameRe: /^[\w\d\$]*$/,
+
+    compile: function (tpl) {
+        var me = this,
+            code = me.generate(tpl);
+
+        // When using "new Function", we have to pass our "Ext" variable to it in order to
+        // support sandboxing. If we did not, the generated function would use the global
+        // "Ext", not the "Ext" from our sandbox (scope chain).
+        //
+        return me.useEval ? me.evalTpl(code) : (new Function('Ext', code))(Ext);
+    },
+
+    generate: function (tpl) {
+        var me = this,
+            // note: Ext here is properly sandboxed
+            definitions = 'var fm=Ext.util.Format,ts=Object.prototype.toString;',
+            code;
+
+        // Track how many levels we use, so that we only "var" each level's variables once
+        me.maxLevel = 0;
+
+        me.body = [
+            'var c0=values, a0=' + me.createArrayTest(0) + ', p0=parent, n0=xcount, i0=xindex, k0, v;\n'
+        ];
+        if (me.definitions) {
+            if (typeof me.definitions === 'string') {
+                me.definitions = [me.definitions, definitions ];
+            } else {
+                me.definitions.push(definitions);
+            }
+        } else {
+            me.definitions = [ definitions ];
+        }
+        me.switches = [];
+
+        me.parse(tpl);
+
+        me.definitions.push(
+            (me.useEval ? '$=' : 'return') + ' function (' + me.fnArgs + ') {',
+                me.body.join(''),
+            '}'
+        );
+
+        code = me.definitions.join('\n');
+
+        // Free up the arrays.
+        me.definitions.length = me.body.length = me.switches.length = 0;
+        delete me.definitions;
+        delete me.body;
+        delete me.switches;
+
+        return code;
+    },
+
+    //-----------------------------------
+    // XTemplateParser callouts
+
+    doText: function (text) {
+        var me = this,
+            out = me.body;
+
+        text = text.replace(me.aposRe, "\\'").replace(me.newLineRe, '\\n');
+        if (me.useIndex) {
+            out.push('out[out.length]=\'', text, '\'\n');
+        } else {
+            out.push('out.push(\'', text, '\')\n');
+        }
+    },
+
+    doExpr: function (expr) {
+        var out = this.body;
+        out.push('if ((v=' + expr + ') != null) out');
+
+        // Coerce value to string using concatenation of an empty string literal.
+        // See http://jsperf.com/tostringvscoercion/5
+        if (this.useIndex) {
+             out.push('[out.length]=v+\'\'\n');
+        } else {
+             out.push('.push(v+\'\')\n');
+        }
+    },
+
+    doTag: function (tag) {
+        var expr = this.parseTag(tag);
+        if (expr) {
+            this.doExpr(expr);
+        } else {
+            // if we cannot match on tagRe handle as plain text
+            this.doText('{' + tag + '}');
+        }
+    },
+
+    doElse: function () {
+        this.body.push('} else {\n');
+    },
+
+    doEval: function (text) {
+        this.body.push(text, '\n');
+    },
+
+    doIf: function (action, actions) {
+        var me = this;
+
+        // If it's just a propName, use it directly in the if
+        if (action === '.') {
+            me.body.push('if (values) {\n');
+        } else if (me.propNameRe.test(action)) {
+            me.body.push('if (', me.parseTag(action), ') {\n');
+        }
+        // Otherwise, it must be an expression, and needs to be returned from an fn which uses with(values)
+        else {
+            me.body.push('if (', me.addFn(action), me.callFn, ') {\n');
+        }
+        if (actions.exec) {
+            me.doExec(actions.exec);
+        }
+    },
+
+    doElseIf: function (action, actions) {
+        var me = this;
+
+        // If it's just a propName, use it directly in the else if
+        if (action === '.') {
+            me.body.push('else if (values) {\n');
+        } else if (me.propNameRe.test(action)) {
+            me.body.push('} else if (', me.parseTag(action), ') {\n');
+        }
+        // Otherwise, it must be an expression, and needs to be returned from an fn which uses with(values)
+        else {
+            me.body.push('} else if (', me.addFn(action), me.callFn, ') {\n');
+        }
+        if (actions.exec) {
+            me.doExec(actions.exec);
+        }
+    },
+
+    doSwitch: function (action) {
+        var me = this;
+
+        // If it's just a propName, use it directly in the switch
+        if (action === '.') {
+            me.body.push('switch (values) {\n');
+        } else if (me.propNameRe.test(action)) {
+            me.body.push('switch (', me.parseTag(action), ') {\n');
+        }
+        // Otherwise, it must be an expression, and needs to be returned from an fn which uses with(values)
+        else {
+            me.body.push('switch (', me.addFn(action), me.callFn, ') {\n');
+        }
+        me.switches.push(0);
+    },
+
+    doCase: function (action) {
+        var me = this,
+            cases = Ext.isArray(action) ? action : [action],
+            n = me.switches.length - 1,
+            match, i;
+
+        if (me.switches[n]) {
+            me.body.push('break;\n');
+        } else {
+            me.switches[n]++;
+        }
+
+        for (i = 0, n = cases.length; i < n; ++i) {
+            match = me.intRe.exec(cases[i]);
+            cases[i] = match ? match[1] : ("'" + cases[i].replace(me.aposRe,"\\'") + "'");
+        }
+
+        me.body.push('case ', cases.join(': case '), ':\n');
+    },
+
+    doDefault: function () {
+        var me = this,
+            n = me.switches.length - 1;
+
+        if (me.switches[n]) {
+            me.body.push('break;\n');
+        } else {
+            me.switches[n]++;
+        }
+
+        me.body.push('default:\n');
+    },
+
+    doEnd: function (type, actions) {
+        var me = this,
+            L = me.level-1;
+
+        if (type == 'for' || type == 'foreach') {
+            /*
+            To exit a for or foreach loop we must restore the outer loop's context. The
+            code looks like this (which goes with that produced by doFor or doForEach):
+
+                    for (...) { // the part generated by doFor or doForEach
+                        ...  // the body of the for loop
+
+                        // ... any tpl for exec statement goes here...
+                    }
+                    parent = p1;
+                    values = r2;
+                    xcount = n1;
+                    xindex = i1
+            */
+            if (actions.exec) {
+                me.doExec(actions.exec);
+            }
+
+            me.body.push('}\n');
+            me.body.push('parent=p',L,';values=r',L+1,';xcount=n'+L+';xindex=i',L,'+1;xkey=k',L,';\n');
+        } else if (type == 'if' || type == 'switch') {
+            me.body.push('}\n');
+        }
+    },
+
+    doFor: function (action, actions) {
+        var me = this,
+            s,
+            L = me.level,
+            up = L-1,
+            parentAssignment;
+
+        // If it's just a propName, use it directly in the switch
+        if (action === '.') {
+            s = 'values';
+        } else if (me.propNameRe.test(action)) {
+            s = me.parseTag(action);
+        }
+        // Otherwise, it must be an expression, and needs to be returned from an fn which uses with(values)
+        else {
+            s = me.addFn(action) + me.callFn;
+        }
+
+        /*
+        We are trying to produce a block of code that looks like below. We use the nesting
+        level to uniquely name the control variables.
+
+            // Omit "var " if we have already been through level 2
+            var i2 = 0,
+                n2 = 0,
+                c2 = values['propName'],
+                    // c2 is the context object for the for loop
+                a2 = Array.isArray(c2);
+                r2 = values,
+                    // r2 is the values object 
+                p2, // p2 is the parent context (of the outer for loop)
+                k2; // object key - not used by for loop but doEnd needs this to be declared 
+
+            // If iterating over the current data, the parent is always set to c2
+            p2 = parent = c2;
+            // If iterating over a property in an object, set the parent to the object
+            p2 = parent = a1 ? c1[i1] : c1 // set parent
+            if (c2) {
+                if (a2) {
+                    n2 = c2.length;
+                } else if (c2.isMixedCollection) {
+                    c2 = c2.items;
+                    n2 = c2.length;
+                } else if (c2.isStore) {
+                    c2 = c2.data.items;
+                    n2 = c2.length;
+                } else {
+                    c2 = [ c2 ];
+                    n2 = 1;
+                }
+            }
+            // i2 is the loop index and n2 is the number (xcount) of this for loop
+            for (xcount = n2; i2 < n2; ++i2) {
+                values = c2[i2]           // adjust special vars to inner scope
+                xindex = i2 + 1           // xindex is 1-based
+
+        The body of the loop is whatever comes between the tpl and /tpl statements (which
+        is handled by doEnd).
+        */
+
+        // Declare the vars for a particular level only if we have not already declared them.
+        if (me.maxLevel < L) {
+            me.maxLevel = L;
+            me.body.push('var ');
+        }
+        
+        if (action == '.') {
+            parentAssignment = 'c' + L;
+        } else {
+            parentAssignment = 'a' + up + '?c' + up + '[i' + up + ']:c' + up;
+        }
+        
+        me.body.push('i',L,'=0,n', L, '=0,c',L,'=',s,',a',L,'=', me.createArrayTest(L),',r',L,'=values,p',L,',k',L,';\n',
+            'p',L,'=parent=',parentAssignment,'\n',
+            'if (c',L,'){if(a',L,'){n', L,'=c', L, '.length;}else if (c', L, '.isMixedCollection){c',L,'=c',L,'.items;n',L,'=c',L,'.length;}else if(c',L,'.isStore){c',L,'=c',L,'.data.items;n',L,'=c',L,'.length;}else{c',L,'=[c',L,'];n',L,'=1;}}\n',
+            'for (xcount=n',L,';i',L,'<n'+L+';++i',L,'){\n',
+            'values=c',L,'[i',L,']');
+        if (actions.propName) {
+            me.body.push('.', actions.propName);
+        }
+        me.body.push('\n',
+            'xindex=i',L,'+1\n');
+        
+        if (actions.between) {
+            me.body.push('if(xindex>1){ out.push("',actions.between,'"); } \n');
+        }
+    },
+
+    doForEach: function (action, actions) {
+        var me = this,
+            s,
+            L = me.level,
+            up = L-1,
+            parentAssignment;
+
+        // If it's just a propName, use it directly in the switch
+        if (action === '.') {
+            s = 'values';
+        } else if (me.propNameRe.test(action)) {
+            s = me.parseTag(action);
+        }
+        // Otherwise, it must be an expression, and needs to be returned from an fn which uses with(values)
+        else {
+            s = me.addFn(action) + me.callFn;
+        }
+
+        /*
+        We are trying to produce a block of code that looks like below. We use the nesting
+        level to uniquely name the control variables.
+
+            // Omit "var " if we have already been through level 2
+            var i2 = -1,
+                n2 = 0,
+                c2 = values['propName'], // c2 is the context object for the for loop
+                a2 = Array.isArray(c2);
+                r2 = values, // r2 is the values object
+                p2, // p2 is the parent context (of the outer for loop)
+                k2; // k2 is the object key while looping
+
+            // If iterating over the current data, the parent is always set to c2
+            p2 = parent = c2;
+            // If iterating over a property in an object, set the parent to the object
+            p2 = parent = a1 ? c1[i1] : c1 // set parent
+
+            for(k2 in c2){
+                xindex = ++i + 1; // xindex is 1-based
+                xkey = k2;
+                values = c2[k2]; // values is the property value
+
+
+        The body of the loop is whatever comes between the tpl and /tpl statements (which
+        is handled by doEnd).
+        */
+
+        // Declare the vars for a particular level only if we have not already declared them.
+        if (me.maxLevel < L) {
+            me.maxLevel = L;
+            me.body.push('var ');
+        }
+        
+        if (action == '.') {
+            parentAssignment = 'c' + L;
+        } else {
+            parentAssignment = 'a' + up + '?c' + up + '[i' + up + ']:c' + up;
+        }
+        
+        me.body.push('i',L,'=-1,n',L,'=0,c',L,'=',s,',a',L,'=',me.createArrayTest(L),',r',L,'=values,p',L,',k',L,';\n',
+            'p',L,'=parent=',parentAssignment,'\n',
+            'for(k',L,' in c',L,'){\n',
+                'xindex=++i',L,'+1;\n',
+                'xkey=k',L,';\n',
+                'values=c',L,'[k',L,'];');
+        if (actions.propName) {
+            me.body.push('.', actions.propName);
+        }
+        
+        if (actions.between) {
+            me.body.push('if(xindex>1){ out.push("',actions.between,'"); } \n');
+        }
+    },
+
+    createArrayTest: ('isArray' in Array) ? function(L) {
+        return 'Array.isArray(c' + L + ')';
+    } : function(L) {
+        return 'ts.call(c' + L + ')==="[object Array]"';
+    },
+
+    doExec: function (action, actions) {
+        var me = this,
+            name = 'f' + me.definitions.length;
+
+        me.definitions.push('function ' + name + '(' + me.fnArgs + ') {',
+                            ' try { with(values) {',
+                            '  ' + action,
+                            ' }} catch(e) {',
+                            'Ext.log("XTemplate Error: " + e.message);',
+                            '}',
+                      '}');
+
+        me.body.push(name + me.callFn + '\n');
+    },
+
+    //-----------------------------------
+    // Internal
+
+    addFn: function (body) {
+        var me = this,
+            name = 'f' + me.definitions.length;
+
+        if (body === '.') {
+            me.definitions.push('function ' + name + '(' + me.fnArgs + ') {',
+                            ' return values',
+                       '}');
+        } else if (body === '..') {
+            me.definitions.push('function ' + name + '(' + me.fnArgs + ') {',
+                            ' return parent',
+                       '}');
+        } else {
+            me.definitions.push('function ' + name + '(' + me.fnArgs + ') {',
+                            ' try { with(values) {',
+                            '  return(' + body + ')',
+                            ' }} catch(e) {',
+                            'Ext.log("XTemplate Error: " + e.message);',
+                            '}',
+                       '}');
+        }
+
+        return name;
+    },
+
+    parseTag: function (tag) {
+        var me = this,
+            m = me.tagRe.exec(tag),
+            name, format, args, math, v;
+
+        if (!m) {
+            return null;
+        }
+
+        name = m[1];
+        format = m[2];
+        args = m[3];
+        math = m[4];
+
+        // name = "." - Just use the values object.
+        if (name == '.') {
+            // filter to not include arrays/objects/nulls
+            if (!me.validTypes) {
+                me.definitions.push('var validTypes={string:1,number:1,boolean:1};');
+                me.validTypes = true;
+            }
+            v = 'validTypes[typeof values] || ts.call(values) === "[object Date]" ? values : ""';
+        }
+        // name = "#" - Use the xindex
+        else if (name == '#') {
+            v = 'xindex';
+        }
+        // name = "$" - Use the xkey
+        else if (name == '$') {
+            v = 'xkey';
+        }
+        else if (name.substr(0, 7) == "parent.") {
+            v = name;
+        }
+        // compound Javascript property name (e.g., "foo.bar")
+        else if (isNaN(name) && name.indexOf('-') == -1 && name.indexOf('.') != -1) {
+            v = "values." + name;
+        }
+        // number or a '-' in it or a single word (maybe a keyword): use array notation
+        // (http://jsperf.com/string-property-access/4)
+        else {    
+            v = "values['" + name + "']";
+        }
+
+        if (math) {
+            v = '(' + v + math + ')';
+        }
+
+        if (format && me.useFormat) {
+            args = args ? ',' + args : "";
+            if (format.substr(0, 5) != "this.") {
+                format = "fm." + format + '(';
+            } else {
+                format += '(';
+            }
+        } else {
+            return v;
+        }
+
+        return format + v + args + ')';
+    },
+
+    // @private
+    evalTpl: function ($) {
+
+        // We have to use eval to realize the code block and capture the inner func we also
+        // don't want a deep scope chain. We only do this in Firefox and it is also unhappy
+        // with eval containing a return statement, so instead we assign to "$" and return
+        // that. Because we use "eval", we are automatically sandboxed properly.
+        eval($);
+        return $;
+    },
+
+    newLineRe: /\r\n|\r|\n/g,
+    aposRe: /[']/g,
+    intRe:  /^\s*(\d+)\s*$/,
+    tagRe:  /^([\w-\.\#\$]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?(\s?[\+\-\*\/]\s?[\d\.\+\-\*\/\(\)]+)?$/
+
+}, function () {
+    var proto = this.prototype;
+
+    proto.fnArgs = 'out,values,parent,xindex,xcount,xkey';
+    proto.callFn = '.call(this,' + proto.fnArgs + ')';
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag core
+/**
+ * A template class that supports advanced functionality like:
+ *
+ * - Autofilling arrays using templates and sub-templates
+ * - Conditional processing with basic comparison operators
+ * - Basic math function support
+ * - Execute arbitrary inline code with special built-in template variables
+ * - Custom member functions
+ * - Many special tags and built-in operators that aren't defined as part of the API, but are supported in the templates that can be created
+ *
+ * XTemplate provides the templating mechanism built into {@link Ext.view.View}.
+ *
+ * The {@link Ext.Template} describes the acceptable parameters to pass to the constructor. The following examples
+ * demonstrate all of the supported features.
+ *
+ * # Sample Data
+ *
+ * This is the data object used for reference in each code example:
+ *
+ *     var data = {
+ *         name: 'Don Griffin',
+ *         title: 'Senior Technomage',
+ *         company: 'Sencha Inc.',
+ *         drinks: ['Coffee', 'Water', 'More Coffee'],
+ *         kids: [
+ *             { name: 'Aubrey',  age: 17 },
+ *             { name: 'Joshua',  age: 13 },
+ *             { name: 'Cale',    age: 10 },
+ *             { name: 'Nikol',   age: 5 },
+ *             { name: 'Solomon', age: 0 }
+ *         ]
+ *     };
+ *
+ * # Auto filling of arrays
+ *
+ * The **tpl** tag and the **for** operator are used to process the provided data object:
+ *
+ * - If the value specified in for is an array, it will auto-fill, repeating the template block inside the tpl
+ *   tag for each item in the array.
+ * - If for="." is specified, the data object provided is examined.
+ * - If between="..." is specified, the provided value will be inserted between the items.
+ *   This is also supported in the "foreach" looping template.
+ * - While processing an array, the special variable {#} will provide the current array index + 1 (starts at 1, not 0).
+ *
+ * Examples:
+ *
+ *     <tpl for=".">...</tpl>       // loop through array at root node
+ *     <tpl for="foo">...</tpl>     // loop through array at foo node
+ *     <tpl for="foo.bar">...</tpl> // loop through array at foo.bar node
+ *     <tpl for="." between=",">...</tpl> // loop through array at root node and insert ',' between each item
+ *
+ * Using the sample data above:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Kids: ',
+ *         '<tpl for=".">',       // process the data.kids node
+ *             '<p>{#}. {name}</p>',  // use current array index to autonumber
+ *         '</tpl></p>'
+ *     );
+ *     tpl.overwrite(panel.body, data.kids); // pass the kids property of the data object
+ *
+ * An example illustrating how the **for** property can be leveraged to access specified members of the provided data
+ * object to populate the template:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Title: {title}</p>',
+ *         '<p>Company: {company}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',     // interrogate the kids property within the data
+ *             '<p>{name}</p>',
+ *         '</tpl></p>'
+ *     );
+ *     tpl.overwrite(panel.body, data);  // pass the root node of the data object
+ *
+ * Flat arrays that contain values (and not objects) can be auto-rendered using the special **`{.}`** variable inside a
+ * loop. This variable will represent the value of the array at the current index:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>{name}\'s favorite beverages:</p>',
+ *         '<tpl for="drinks">',
+ *             '<div> - {.}</div>',
+ *         '</tpl>'
+ *     );
+ *     tpl.overwrite(panel.body, data);
+ *
+ * When processing a sub-template, for example while looping through a child array, you can access the parent object's
+ * members via the **parent** object:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<tpl if="age > 1">',
+ *                 '<p>{name}</p>',
+ *                 '<p>Dad: {parent.name}</p>',
+ *             '</tpl>',
+ *         '</tpl></p>'
+ *     );
+ *     tpl.overwrite(panel.body, data);
+ *     
+ * The **foreach** operator is used to loop over an object's properties.  The following
+ * example demonstrates looping over the main data object's properties:
+ * 
+ *     var tpl = new Ext.XTemplate(
+ *         '<dl>',
+ *             '<tpl foreach=".">',
+ *                 '<dt>{$}</dt>', // the special **`{$}`** variable contains the property name
+ *                 '<dd>{.}</dd>', // within the loop, the **`{.}`** variable is set to the property value
+ *             '</tpl>',
+ *         '</dl>'
+ *     );
+ *     tpl.overwrite(panel.body, data);
+ *
+ * # Conditional processing with basic comparison operators
+ *
+ * The **tpl** tag and the **if** operator are used to provide conditional checks for deciding whether or not to render
+ * specific parts of the template.
+ *
+ * Using the sample data above:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<tpl if="age > 1">',
+ *                 '<p>{name}</p>',
+ *             '</tpl>',
+ *         '</tpl></p>'
+ *     );
+ *     tpl.overwrite(panel.body, data);
+ *
+ * More advanced conditionals are also supported:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<p>{name} is a ',
+ *             '<tpl if="age >= 13">',
+ *                 '<p>teenager</p>',
+ *             '<tpl elseif="age >= 2">',
+ *                 '<p>kid</p>',
+ *             '<tpl else>',
+ *                 '<p>baby</p>',
+ *             '</tpl>',
+ *         '</tpl></p>'
+ *     );
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<p>{name} is a ',
+ *             '<tpl switch="name">',
+ *                 '<tpl case="Aubrey" case="Nikol">',
+ *                     '<p>girl</p>',
+ *                 '<tpl default>',
+ *                     '<p>boy</p>',
+ *             '</tpl>',
+ *         '</tpl></p>'
+ *     );
+ *
+ * A `break` is implied between each case and default, however, multiple cases can be listed
+ * in a single <tpl> tag.
+ *
+ * # Using double quotes
+ *
+ * Examples:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         "<tpl if='age > 1 && age < 10'>Child</tpl>",
+ *         "<tpl if='age >= 10 && age < 18'>Teenager</tpl>",
+ *         "<tpl if='this.isGirl(name)'>...</tpl>",
+ *         '<tpl if="id == \'download\'">...</tpl>',
+ *         "<tpl if='needsIcon'><img src='{icon}' class='{iconCls}'/></tpl>",
+ *         "<tpl if='name == \"Don\"'>Hello</tpl>"
+ *     );
+ *
+ * # Basic math support
+ *
+ * The following basic math operators may be applied directly on numeric data values:
+ *
+ *     + - * /
+ *
+ * For example:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<tpl if="age > 1">',  // <-- Note that the > is encoded
+ *                 '<p>{#}: {name}</p>',  // <-- Auto-number each item
+ *                 '<p>In 5 Years: {age+5}</p>',  // <-- Basic math
+ *                 '<p>Dad: {parent.name}</p>',
+ *             '</tpl>',
+ *         '</tpl></p>'
+ *     );
+ *     tpl.overwrite(panel.body, data);
+ *
+ * # Execute arbitrary inline code with special built-in template variables
+ *
+ * Anything between `{[ ... ]}` is considered code to be executed in the scope of the template.
+ * The expression is evaluated and the result is included in the generated result. There are
+ * some special variables available in that code:
+ *
+ * - **out**: The output array into which the template is being appended (using `push` to later
+ *   `join`).
+ * - **values**: The values in the current scope. If you are using scope changing sub-templates,
+ *   you can change what values is.
+ * - **parent**: The scope (values) of the ancestor template.
+ * - **xindex**: If you are in a "for" or "foreach" looping template, the index of the loop you are in (1-based).
+ * - **xcount**: If you are in a "for" looping template, the total length of the array you are looping.
+ * - **xkey**: If you are in a "foreach" looping template, the key of the current property
+ * being examined.
+ *
+ * This example demonstrates basic row striping using an inline code block and the xindex variable:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Company: {[values.company.toUpperCase() + ", " + values.title]}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<div class="{[xindex % 2 === 0 ? "even" : "odd"]}">',
+ *             '{name}',
+ *             '</div>',
+ *         '</tpl></p>'
+ *      );
+ *
+ * Any code contained in "verbatim" blocks (using "{% ... %}") will be inserted directly in
+ * the generated code for the template. These blocks are not included in the output. This
+ * can be used for simple things like break/continue in a loop, or control structures or
+ * method calls (when they don't produce output). The `this` references the template instance.
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Company: {[values.company.toUpperCase() + ", " + values.title]}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '{% if (xindex % 2 === 0) continue; %}',
+ *             '{name}',
+ *             '{% if (xindex > 100) break; %}',
+ *             '</div>',
+ *         '</tpl></p>'
+ *      );
+ *
+ * # Template member functions
+ *
+ * One or more member functions can be specified in a configuration object passed into the XTemplate constructor for
+ * more complex processing:
+ *
+ *     var tpl = new Ext.XTemplate(
+ *         '<p>Name: {name}</p>',
+ *         '<p>Kids: ',
+ *         '<tpl for="kids">',
+ *             '<tpl if="this.isGirl(name)">',
+ *                 '<p>Girl: {name} - {age}</p>',
+ *             '<tpl else>',
+ *                 '<p>Boy: {name} - {age}</p>',
+ *             '</tpl>',
+ *             '<tpl if="this.isBaby(age)">',
+ *                 '<p>{name} is a baby!</p>',
+ *             '</tpl>',
+ *         '</tpl></p>',
+ *         {
+ *             // XTemplate configuration:
+ *             disableFormats: true,
+ *             // member functions:
+ *             isGirl: function(name){
+ *                return name == 'Aubrey' || name == 'Nikol';
+ *             },
+ *             isBaby: function(age){
+ *                return age < 1;
+ *             }
+ *         }
+ *     );
+ *     tpl.overwrite(panel.body, data);
+ */
+Ext.define('Ext.XTemplate', {
+    extend:  Ext.Template ,
+
+                                      
+
+    /**
+     * @private
+     */
+    emptyObj: {},
+
+    /**
+     * @cfg {Boolean} compiled
+     * Only applies to {@link Ext.Template}, XTemplates are compiled automatically on the
+     * first call to {@link #apply} or {@link #applyOut}.
+     * @hide
+     */
+
+    /**
+     * @cfg {String/Array} definitions
+     * Optional. A statement, or array of statements which set up `var`s which may then
+     * be accessed within the scope of the generated function.
+     */
+
+    apply: function(values, parent) {
+        return this.applyOut(values, [], parent).join('');
+    },
+
+    applyOut: function(values, out, parent) {
+        var me = this,
+            compiler;
+
+        if (!me.fn) {
+            compiler = new Ext.XTemplateCompiler({
+                useFormat: me.disableFormats !== true,
+                definitions: me.definitions
+            });
+
+            me.fn = compiler.compile(me.html);
+        }
+
+        try {
+            me.fn(out, values, parent || me.emptyObj, 1, 1);
+        } catch (e) {
+            Ext.log('Error: ' + e.message);
+        }
+
+        return out;
+    },
+
+    /**
+     * Does nothing. XTemplates are compiled automatically, so this function simply returns this.
+     * @return {Ext.XTemplate} this
+     */
+    compile: function() {
+        return this;
+    },
+
+    statics: {
+        /**
+         * Gets an `XTemplate` from an object (an instance of an {@link Ext#define}'d class).
+         * Many times, templates are configured high in the class hierarchy and are to be
+         * shared by all classes that derive from that base. To further complicate matters,
+         * these templates are seldom actual instances but are rather configurations. For
+         * example:
+         *
+         *      Ext.define('MyApp.Class', {
+         *          extraCls: 'extra-class',
+         *
+         *          someTpl: [
+         *              '<div class="{%this.emitClass(out)%}"></div>',
+         *          {
+         *              // Member fn - outputs the owing class's extra CSS class
+         *              emitClass: function(out) {
+         *                  out.push(this.owner.extraCls);
+         *              }
+         *          }]
+         *      });
+         *
+         * The goal being to share that template definition with all instances and even
+         * instances of derived classes, until `someTpl` is overridden. This method will
+         * "upgrade" these configurations to be real `XTemplate` instances *in place* (to
+         * avoid creating one instance per object).
+         *
+         * The resulting XTemplate will have an `owner` reference injected which refers back
+         * to the owning object whether that is an object which has an *own instance*, or a
+         * class prototype. Through this link, XTemplate member functions will be able to access
+         * prototype properties of its owning class.
+         *
+         * @param {Object} instance The object from which to get the `XTemplate` (must be
+         * an instance of an {@link Ext#define}'d class).
+         * @param {String} name The name of the property by which to get the `XTemplate`.
+         * @return {Ext.XTemplate} The `XTemplate` instance or null if not found.
+         * @protected
+         * @static
+         */
+        getTpl: function (instance, name) {
+            var tpl = instance[name], // go for it! 99% of the time we will get it!
+                owner;
+
+            if (tpl && !tpl.isTemplate) { // tpl is just a configuration (not an instance)
+                // create the template instance from the configuration:
+                tpl = Ext.ClassManager.dynInstantiate('Ext.XTemplate', tpl);
+
+                // and replace the reference with the new instance:
+                if (instance.hasOwnProperty(name)) { // the tpl is on the instance
+                    owner = instance;
+                } else { // must be somewhere in the prototype chain
+                    for (owner = instance.self.prototype; owner && !owner.hasOwnProperty(name); owner = owner.superclass) {
+                    }
+                }
+                owner[name] = tpl;
+                tpl.owner = owner;
+            }
+            // else !tpl (no such tpl) or the tpl is an instance already... either way, tpl
+            // is ready to return
+
+            return tpl || null;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+// @require Helper.js
+// @define Ext.dom.Query
+// @define Ext.core.DomQuery
+// @define Ext.DomQuery
+
+/*
+ * This is code is also distributed under MIT license for use
+ * with jQuery and prototype JavaScript libraries.
+ */
+/**
+ * @class Ext.dom.Query
+ * @alternateClassName Ext.DomQuery
+ * @alternateClassName Ext.core.DomQuery
+ * @singleton
+ *
+ * Provides high performance selector/xpath processing by compiling queries into reusable functions. New pseudo classes
+ * and matchers can be plugged. It works on HTML and XML documents (if a content node is passed in).
+ *
+ * DomQuery supports most of the [CSS3 selectors spec][1], along with some custom selectors and basic XPath.
+ *
+ * All selectors, attribute filters and pseudos below can be combined infinitely in any order. For example
+ * `div.foo:nth-child(odd)[@foo=bar].bar:first` would be a perfectly valid selector. Node filters are processed
+ * in the order in which they appear, which allows you to optimize your queries for your document structure.
+ *
+ * ## Element Selectors:
+ *
+ *   - **`*`** any element
+ *   - **`E`** an element with the tag E
+ *   - **`E F`** All descendent elements of E that have the tag F
+ *   - **`E > F`** or **E/F** all direct children elements of E that have the tag F
+ *   - **`E + F`** all elements with the tag F that are immediately preceded by an element with the tag E
+ *   - **`E ~ F`** all elements with the tag F that are preceded by a sibling element with the tag E
+ *
+ * ## Attribute Selectors:
+ *
+ * The use of `@` and quotes are optional. For example, `div[@foo='bar']` is also a valid attribute selector.
+ *
+ *   - **`E[foo]`** has an attribute "foo"
+ *   - **`E[foo=bar]`** has an attribute "foo" that equals "bar"
+ *   - **`E[foo^=bar]`** has an attribute "foo" that starts with "bar"
+ *   - **`E[foo$=bar]`** has an attribute "foo" that ends with "bar"
+ *   - **`E[foo*=bar]`** has an attribute "foo" that contains the substring "bar"
+ *   - **`E[foo%=2]`** has an attribute "foo" that is evenly divisible by 2
+ *   - **`E[foo!=bar]`** attribute "foo" does not equal "bar"
+ *
+ * ## Pseudo Classes:
+ *
+ *   - **`E:first-child`** E is the first child of its parent
+ *   - **`E:last-child`** E is the last child of its parent
+ *   - **`E:nth-child(_n_)`** E is the _n_th child of its parent (1 based as per the spec)
+ *   - **`E:nth-child(odd)`** E is an odd child of its parent
+ *   - **`E:nth-child(even)`** E is an even child of its parent
+ *   - **`E:only-child`** E is the only child of its parent
+ *   - **`E:checked`** E is an element that is has a checked attribute that is true (e.g. a radio or checkbox)
+ *   - **`E:first`** the first E in the resultset
+ *   - **`E:last`** the last E in the resultset
+ *   - **`E:nth(_n_)`** the _n_th E in the resultset (1 based)
+ *   - **`E:odd`** shortcut for :nth-child(odd)
+ *   - **`E:even`** shortcut for :nth-child(even)
+ *   - **`E:contains(foo)`** E's innerHTML contains the substring "foo"
+ *   - **`E:nodeValue(foo)`** E contains a textNode with a nodeValue that equals "foo"
+ *   - **`E:not(S)`** an E element that does not match simple selector S
+ *   - **`E:has(S)`** an E element that has a descendent that matches simple selector S
+ *   - **`E:next(S)`** an E element whose next sibling matches simple selector S
+ *   - **`E:prev(S)`** an E element whose previous sibling matches simple selector S
+ *   - **`E:any(S1|S2|S2)`** an E element which matches any of the simple selectors S1, S2 or S3
+ *   - **`E:visible(true)`** an E element which is deeply visible according to {@link Ext.dom.Element#isVisible}
+ *
+ * ## CSS Value Selectors:
+ *
+ *   - **`E{display=none}`** css value "display" that equals "none"
+ *   - **`E{display^=none}`** css value "display" that starts with "none"
+ *   - **`E{display$=none}`** css value "display" that ends with "none"
+ *   - **`E{display*=none}`** css value "display" that contains the substring "none"
+ *   - **`E{display%=2}`** css value "display" that is evenly divisible by 2
+ *   - **`E{display!=none}`** css value "display" that does not equal "none"
+ * 
+ * ## XML Namespaces:
+ *   - **`ns|E`** an element with tag E and namespace prefix ns
+ *
+ * [1]: http://www.w3.org/TR/2005/WD-css3-selectors-20051215/#selectors
+ */
+Ext.ns('Ext.core');
+
+Ext.dom.Query = Ext.core.DomQuery = Ext.DomQuery = (function() {
+    var DQ,
+        doc = document,
+        cache = {},
+        simpleCache = {},
+        valueCache = {},
+        useClassList = !!doc.documentElement.classList,
+        useElementPointer = !!doc.documentElement.firstElementChild,
+        useChildrenCollection = (function() {
+            var d = doc.createElement('div');
+            d.innerHTML = '<!-- -->text<!-- -->';
+            return d.children && (d.children.length === 0);
+        })(),
+        nonSpace = /\S/,
+        trimRe = /^\s+|\s+$/g,
+        tplRe = /\{(\d+)\}/g,
+        modeRe = /^(\s?[\/>+~]\s?|\s|$)/,
+        tagTokenRe = /^(#)?([\w\-\*\|\\]+)/,
+        nthRe = /(\d*)n\+?(\d*)/,
+        nthRe2 = /\D/,
+        startIdRe = /^\s*#/,
+        // This is for IE MSXML which does not support expandos.
+        // IE runs the same speed using setAttribute, however FF slows way down
+        // and Safari completely fails so they need to continue to use expandos.
+        isIE = window.ActiveXObject ? true : false,
+        key = 30803,
+        longHex = /\\([0-9a-fA-F]{6})/g,
+        shortHex = /\\([0-9a-fA-F]{1,6})\s{0,1}/g,
+        nonHex = /\\([^0-9a-fA-F]{1})/g,
+        escapes = /\\/g,
+        num, hasEscapes,
+        // True if the browser supports the following syntax:
+        // document.getElementsByTagName('namespacePrefix:tagName')
+        supportsColonNsSeparator = (function () {
+            var xmlDoc,
+                xmlString = '<r><a:b xmlns:a="n"></a:b></r>';
+
+            if (window.DOMParser) {
+                xmlDoc = (new DOMParser()).parseFromString(xmlString, "application/xml");
+            } else {
+                xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+                xmlDoc.loadXML(xmlString);
+            }
+
+            return !!xmlDoc.getElementsByTagName('a:b').length;
+        })(),
+
+        // replaces a long hex regex match group with the appropriate ascii value
+        // $args indicate regex match pos
+        longHexToChar = function($0, $1) {
+            return String.fromCharCode(parseInt($1, 16));
+        },
+
+        // converts a shortHex regex match to the long form
+        shortToLongHex = function($0, $1) {
+            while ($1.length < 6) {
+                $1 = '0' + $1;
+            }
+            return '\\' + $1;
+        },
+
+        // converts a single char escape to long escape form
+        charToLongHex = function($0, $1) {
+            num = $1.charCodeAt(0).toString(16);
+            if (num.length === 1) {
+                num = '0' + num;
+            }
+            return '\\0000' + num;
+        },
+
+        // Un-escapes an input selector string.  Assumes all escape sequences have been
+        // normalized to the css '\\0000##' 6-hex-digit style escape sequence :
+        // will not handle any other escape formats
+        unescapeCssSelector = function(selector) {
+            return (hasEscapes) ? selector.replace(longHex, longHexToChar) : selector;
+        },
+
+        // checks if the path has escaping & does any appropriate replacements
+        setupEscapes = function(path) {
+            hasEscapes = (path.indexOf('\\') > -1);
+            if (hasEscapes) {
+                path = path
+                    .replace(shortHex, shortToLongHex)
+                    .replace(nonHex, charToLongHex)
+                    .replace(escapes, '\\\\');  // double the '\' for js compilation
+            }
+            return path;
+        };
+
+    // this eval is stop the compressor from
+    // renaming the variable to something shorter
+    eval("var batch = 30803, child, next, prev, byClassName;");
+
+    // Retrieve the child node from a particular
+    // parent at the specified index.
+    child = useChildrenCollection ?
+        function child(parent, index) {
+            return parent.children[index];
+        } :
+        function child(parent, index) {
+            var i = 0,
+                n = parent.firstChild;
+            while (n) {
+                if (n.nodeType == 1) {
+                    if (++i == index) {
+                        return n;
+                    }
+                }
+                n = n.nextSibling;
+            }
+            return null;
+        };
+
+    // retrieve the next element node
+    next = useElementPointer ?
+        function(n) {
+            return n.nextElementSibling;
+        } :
+        function(n) {
+            while ((n = n.nextSibling) && n.nodeType != 1);
+            return n;
+        };
+
+    // retrieve the previous element node
+    prev = useElementPointer ?
+        function(n) {
+            return n.previousElementSibling;
+        } :
+        function(n) {
+            while ((n = n.previousSibling) && n.nodeType != 1);
+            return n;
+        };
+
+    // Mark each child node with a nodeIndex skipping and
+    // removing empty text nodes.
+    function children(parent) {
+        var n = parent.firstChild,
+            nodeIndex = -1,
+            nextNode;
+
+        while (n) {
+            nextNode = n.nextSibling;
+            // clean worthless empty nodes.
+            if (n.nodeType == 3 && !nonSpace.test(n.nodeValue)) {
+                parent.removeChild(n);
+            } else {
+                // add an expando nodeIndex
+                n.nodeIndex = ++nodeIndex;
+            }
+            n = nextNode;
+        }
+        return this;
+    }
+
+    // nodeSet - array of nodes
+    // cls - CSS Class
+    byClassName = useClassList ? // Use classList API where available: http://jsperf.com/classlist-vs-old-school-check/
+        function (nodeSet, cls) {
+            cls = unescapeCssSelector(cls);
+            if (!cls) {
+                return nodeSet;
+            }
+            var result = [], ri = -1,
+                i, ci, classList;
+
+            for (i = 0; ci = nodeSet[i]; i++) {
+                classList = ci.classList;
+                if (classList) {
+                    if (classList.contains(cls)) {
+                        result[++ri] = ci;
+                    }
+                } else if ((' ' + ci.className + ' ').indexOf(cls) !== -1) {
+                    // Some elements types (SVG) may not always have a classList
+                    // in some browsers, so fallback to the old style here
+                    result[++ri] = ci;
+                }
+            }
+            return result;
+        } :
+        function (nodeSet, cls) {
+            cls = unescapeCssSelector(cls);
+            if (!cls) {
+                return nodeSet;
+            }
+            var result = [], ri = -1,
+                i, ci;
+
+            for (i = 0; ci = nodeSet[i]; i++) {
+                if ((' ' + ci.className + ' ').indexOf(cls) !== -1) {
+                    result[++ri] = ci;
+                }
+            }
+            return result;
+        };
+
+    function attrValue(n, attr) {
+        // if its an array, use the first node.
+        if (!n.tagName && typeof n.length != "undefined") {
+            n = n[0];
+        }
+        if (!n) {
+            return null;
+        }
+
+        if (attr == "for") {
+            return n.htmlFor;
+        }
+        if (attr == "class" || attr == "className") {
+            return n.className;
+        }
+        return n.getAttribute(attr) || n[attr];
+
+    }
+
+    // ns - nodes
+    // mode - false, /, >, +, ~
+    // tagName - defaults to "*"
+    function getNodes(ns, mode, tagName) {
+        var result = [], ri = -1, cs,
+            i, ni, j, ci, cn, utag, n, cj;
+        if (!ns) {
+            return result;
+        }
+        tagName = tagName.replace('|', ':') || "*";
+        // convert to array
+        if (typeof ns.getElementsByTagName != "undefined") {
+            ns = [ns];
+        }
+
+        // no mode specified, grab all elements by tagName
+        // at any depth
+        if (!mode) {
+            tagName = unescapeCssSelector(tagName);
+            if (!supportsColonNsSeparator && DQ.isXml(ns[0]) &&
+                tagName.indexOf(':') !== -1) {
+                // Some browsers (e.g. WebKit and Opera do not support the following syntax
+                // in xml documents: getElementsByTagName('ns:tagName'). To work around
+                // this, we remove the namespace prefix from the tagName, get the elements
+                // by tag name only, and then compare each element's tagName property to
+                // the tagName with namespace prefix attached to ensure that the tag is in
+                // the proper namespace.
+                for (i = 0; ni = ns[i]; i++) {
+                    cs = ni.getElementsByTagName(tagName.split(':').pop());
+                    for (j = 0; ci = cs[j]; j++) {
+                        if (ci.tagName === tagName) {
+                            result[++ri] = ci;
+                        }
+                    }
+                }
+            } else {
+                for (i = 0; ni = ns[i]; i++) {
+                    cs = ni.getElementsByTagName(tagName);
+                    for (j = 0; ci = cs[j]; j++) {
+                        result[++ri] = ci;
+                    }
+                }
+            }
+            // Direct Child mode (/ or >)
+            // E > F or E/F all direct children elements of E that have the tag
+        } else if (mode == "/" || mode == ">") {
+            utag = tagName.toUpperCase();
+            for (i = 0; ni = ns[i]; i++) {
+                cn = ni.childNodes;
+                for (j = 0; cj = cn[j]; j++) {
+                    if (cj.nodeName == utag || cj.nodeName == tagName || tagName == '*') {
+                        result[++ri] = cj;
+                    }
+                }
+            }
+            // Immediately Preceding mode (+)
+            // E + F all elements with the tag F that are immediately preceded by an element with the tag E
+        } else if (mode == "+") {
+            utag = tagName.toUpperCase();
+            for (i = 0; n = ns[i]; i++) {
+                while ((n = n.nextSibling) && n.nodeType != 1);
+                if (n && (n.nodeName == utag || n.nodeName == tagName || tagName == '*')) {
+                    result[++ri] = n;
+                }
+            }
+            // Sibling mode (~)
+            // E ~ F all elements with the tag F that are preceded by a sibling element with the tag E
+        } else if (mode == "~") {
+            utag = tagName.toUpperCase();
+            for (i = 0; n = ns[i]; i++) {
+                while ((n = n.nextSibling)) {
+                    if (n.nodeName == utag || n.nodeName == tagName || tagName == '*') {
+                        result[++ri] = n;
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    function concat(a, b) {
+        a.push.apply(a, b);
+        return a;
+    }
+
+    function byTag(cs, tagName) {
+        if (cs.tagName || cs === doc) {
+            cs = [cs];
+        }
+        if (!tagName) {
+            return cs;
+        }
+        var result = [], ri = -1,
+            i, ci;
+        tagName = tagName.toLowerCase();
+        for (i = 0; ci = cs[i]; i++) {
+            if (ci.nodeType == 1 && ci.tagName.toLowerCase() == tagName) {
+                result[++ri] = ci;
+            }
+        }
+        return result;
+    }
+
+    function byId(cs, id) {
+        id = unescapeCssSelector(id);
+        if (cs.tagName || cs === doc) {
+            cs = [cs];
+        }
+        if (!id) {
+            return cs;
+        }
+        var result = [], ri = -1,
+            i, ci;
+        for (i = 0; ci = cs[i]; i++) {
+            if (ci && ci.id == id) {
+                result[++ri] = ci;
+                return result;
+            }
+        }
+        return result;
+    }
+
+    // operators are =, !=, ^=, $=, *=, %=, |= and ~=
+    // custom can be "{"
+    function byAttribute(cs, attr, value, op, custom) {
+        var result = [],
+            ri = -1,
+            useGetStyle = custom == "{",
+            fn = DQ.operators[op],
+            a,
+            xml,
+            hasXml,
+            i, ci;
+
+        value = unescapeCssSelector(value);
+
+        for (i = 0; ci = cs[i]; i++) {
+            // skip non-element nodes.
+            if (ci.nodeType === 1) {
+                // only need to do this for the first node
+                if (!hasXml) {
+                    xml = DQ.isXml(ci);
+                    hasXml = true;
+                }
+
+                // we only need to change the property names if we're dealing with html nodes, not XML
+                if (!xml) {
+                    if (useGetStyle) {
+                        a = DQ.getStyle(ci, attr);
+                    } else if (attr == "class" || attr == "className") {
+                        a = ci.className;
+                    } else if (attr == "for") {
+                        a = ci.htmlFor;
+                    } else if (attr == "href") {
+                        // getAttribute href bug
+                        // http://www.glennjones.net/Post/809/getAttributehrefbug.htm
+                        a = ci.getAttribute("href", 2);
+                    } else {
+                        a = ci.getAttribute(attr);
+                    }
+                } else {
+                    a = ci.getAttribute(attr);
+                }
+                if ((fn && fn(a, value)) || (!fn && a)) {
+                    result[++ri] = ci;
+                }
+            }
+        }
+        return result;
+    }
+
+    function byPseudo(cs, name, value) {
+        value = unescapeCssSelector(value);
+        return DQ.pseudos[name](cs, value);
+    }
+
+    function nodupIEXml(cs) {
+        var d = ++key,
+            r,
+            i, len, c;
+        cs[0].setAttribute("_nodup", d);
+        r = [cs[0]];
+        for (i = 1, len = cs.length; i < len; i++) {
+            c = cs[i];
+            if (!c.getAttribute("_nodup") != d) {
+                c.setAttribute("_nodup", d);
+                r[r.length] = c;
+            }
+        }
+        for (i = 0, len = cs.length; i < len; i++) {
+            cs[i].removeAttribute("_nodup");
+        }
+        return r;
+    }
+
+    function nodup(cs) {
+        if (!cs) {
+            return [];
+        }
+        var len = cs.length, c, i, r = cs, cj, ri = -1, d, j;
+        if (!len || typeof cs.nodeType != "undefined" || len == 1) {
+            return cs;
+        }
+        if (isIE && typeof cs[0].selectSingleNode != "undefined") {
+            return nodupIEXml(cs);
+        }
+        d = ++key;
+        cs[0]._nodup = d;
+        for (i = 1; c = cs[i]; i++) {
+            if (c._nodup != d) {
+                c._nodup = d;
+            } else {
+                r = [];
+                for (j = 0; j < i; j++) {
+                    r[++ri] = cs[j];
+                }
+                for (j = i + 1; cj = cs[j]; j++) {
+                    if (cj._nodup != d) {
+                        cj._nodup = d;
+                        r[++ri] = cj;
+                    }
+                }
+                return r;
+            }
+        }
+        return r;
+    }
+
+    function quickDiffIEXml(c1, c2) {
+        var d = ++key,
+            r = [],
+            i, len;
+        for (i = 0, len = c1.length; i < len; i++) {
+            c1[i].setAttribute("_qdiff", d);
+        }
+        for (i = 0, len = c2.length; i < len; i++) {
+            if (c2[i].getAttribute("_qdiff") != d) {
+                r[r.length] = c2[i];
+            }
+        }
+        for (i = 0, len = c1.length; i < len; i++) {
+            c1[i].removeAttribute("_qdiff");
+        }
+        return r;
+    }
+
+    function quickDiff(c1, c2) {
+        var len1 = c1.length,
+            d = ++key,
+            r = [],
+            i, len;
+        if (!len1) {
+            return c2;
+        }
+        if (isIE && typeof c1[0].selectSingleNode != "undefined") {
+            return quickDiffIEXml(c1, c2);
+        }
+        for (i = 0; i < len1; i++) {
+            c1[i]._qdiff = d;
+        }
+        for (i = 0, len = c2.length; i < len; i++) {
+            if (c2[i]._qdiff != d) {
+                r[r.length] = c2[i];
+            }
+        }
+        return r;
+    }
+
+    function quickId(ns, mode, root, id) {
+        if (ns == root) {
+            id = unescapeCssSelector(id);
+            var d = root.ownerDocument || root;
+            return d.getElementById(id);
+        }
+        ns = getNodes(ns, mode, "*");
+        return byId(ns, id);
+    }
+
+    return DQ = {
+        getStyle: function(el, name) {
+            return Ext.fly(el, '_DomQuery').getStyle(name);
+        },
+        /**
+         * Compiles a selector/xpath query into a reusable function. The returned function
+         * takes one parameter "root" (optional), which is the context node from where the query should start.
+         * @param {String} selector The selector/xpath query
+         * @param {String} [type="select"] Either "select" or "simple" for a simple selector match
+         * @return {Function}
+         */
+        compile: function(path, type) {
+            type = type || "select";
+
+            // setup fn preamble
+            var fn = ["var f = function(root) {\n var mode; ++batch; var n = root || document;\n"],
+                lastPath,
+                matchers = DQ.matchers,
+                matchersLn = matchers.length,
+                modeMatch,
+                // accept leading mode switch
+                lmode = path.match(modeRe),
+                tokenMatch, matched, j, t, m;
+
+            path = setupEscapes(path);
+
+            if (lmode && lmode[1]) {
+                fn[fn.length] = 'mode="' + lmode[1].replace(trimRe, "") + '";';
+                path = path.replace(lmode[1], "");
+            }
+
+            // strip leading slashes
+            while (path.substr(0, 1) == "/") {
+                path = path.substr(1);
+            }
+
+            while (path && lastPath != path) {
+                lastPath = path;
+                tokenMatch = path.match(tagTokenRe);
+                if (type == "select") {
+                    if (tokenMatch) {
+                        // ID Selector
+                        if (tokenMatch[1] == "#") {
+                            fn[fn.length] = 'n = quickId(n, mode, root, "' + tokenMatch[2] + '");';
+                        } else {
+                            fn[fn.length] = 'n = getNodes(n, mode, "' + tokenMatch[2] + '");';
+                        }
+                        path = path.replace(tokenMatch[0], "");
+                    } else if (path.substr(0, 1) != '@') {
+                        fn[fn.length] = 'n = getNodes(n, mode, "*");';
+                    }
+                    // type of "simple"
+                } else {
+                    if (tokenMatch) {
+                        if (tokenMatch[1] == "#") {
+                            fn[fn.length] = 'n = byId(n, "' + tokenMatch[2] + '");';
+                        } else {
+                            fn[fn.length] = 'n = byTag(n, "' + tokenMatch[2] + '");';
+                        }
+                        path = path.replace(tokenMatch[0], "");
+                    }
+                }
+                while (!(modeMatch = path.match(modeRe))) {
+                    matched = false;
+                    for (j = 0; j < matchersLn; j++) {
+                        t = matchers[j];
+                        m = path.match(t.re);
+                        if (m) {
+                            fn[fn.length] = t.select.replace(tplRe, function(x, i) {
+                                return m[i];
+                            });
+                            path = path.replace(m[0], "");
+                            matched = true;
+                            break;
+                        }
+                    }
+                    // prevent infinite loop on bad selector
+                    if (!matched) {
+                        Ext.Error.raise({
+                            sourceClass:'Ext.DomQuery',
+                            sourceMethod:'compile',
+                            msg:'Error parsing selector. Parsing failed at "' + path + '"'
+                        });
+                    }
+                }
+                if (modeMatch[1]) {
+                    fn[fn.length] = 'mode="' + modeMatch[1].replace(trimRe, "") + '";';
+                    path = path.replace(modeMatch[1], "");
+                }
+            }
+            // close fn out
+            fn[fn.length] = "return nodup(n);\n}";
+
+            // eval fn and return it
+            eval(fn.join(""));
+            return f;
+        },
+
+        /**
+         * Selects an array of DOM nodes using JavaScript-only implementation.
+         *
+         * Use {@link #select} to take advantage of browsers built-in support for CSS selectors.
+         * @param {String} selector The selector/xpath query (can be a comma separated list of selectors)
+         * @param {HTMLElement/String} [root=document] The start of the query.
+         * @return {HTMLElement[]} An Array of DOM elements which match the selector. If there are
+         * no matches, and empty Array is returned.
+         */
+        jsSelect: function(path, root, type) {
+            // set root to doc if not specified.
+            root = root || doc;
+
+            if (typeof root == "string") {
+                root = doc.getElementById(root);
+            }
+            var paths = path.split(","),
+                results = [],
+                i, len, subPath, result;
+
+            // loop over each selector
+            for (i = 0, len = paths.length; i < len; i++) {
+                subPath = paths[i].replace(trimRe, "");
+                // compile and place in cache
+                if (!cache[subPath]) {
+                    // When we compile, escaping is handled inside the compile method
+                    cache[subPath] = DQ.compile(subPath, type);
+                    if (!cache[subPath]) {
+                        Ext.Error.raise({
+                            sourceClass:'Ext.DomQuery',
+                            sourceMethod:'jsSelect',
+                            msg:subPath + ' is not a valid selector'
+                        });
+                    }
+                } else {
+                    // If we've already compiled, we still need to check if the
+                    // selector has escaping and setup the appropriate flags
+                    setupEscapes(subPath);
+                }
+                result = cache[subPath](root);
+                if (result && result !== doc) {
+                    results = results.concat(result);
+                }
+            }
+
+            // if there were multiple selectors, make sure dups
+            // are eliminated
+            if (paths.length > 1) {
+                return nodup(results);
+            }
+            return results;
+        },
+
+        isXml: function(el) {
+            var docEl = (el ? el.ownerDocument || el : 0).documentElement;
+            return docEl ? docEl.nodeName !== "HTML" : false;
+        },
+
+        /**
+         * Selects an array of DOM nodes by CSS/XPath selector.
+         *
+         * Uses [document.querySelectorAll][0] if browser supports that, otherwise falls back to
+         * {@link Ext.dom.Query#jsSelect} to do the work.
+         *
+         * Aliased as {@link Ext#query}.
+         *
+         * [0]: https://developer.mozilla.org/en/DOM/document.querySelectorAll
+         *
+         * @param {String} path The selector/xpath query
+         * @param {HTMLElement} [root=document] The start of the query.
+         * @return {HTMLElement[]} An array of DOM elements (not a NodeList as returned by `querySelectorAll`).
+         * @param {String} [type="select"] Either "select" or "simple" for a simple selector match (only valid when
+         * used when the call is deferred to the jsSelect method)
+         * @param {Boolean} [single] Pass `true` to select only the first matching node using `document.querySelector` (where available)
+         * @method
+         */
+        select : doc.querySelectorAll ? function(path, root, type, single) {
+            root = root || doc;
+            if (!DQ.isXml(root)) {
+                try {
+                    /*
+                     * This checking here is to "fix" the behaviour of querySelectorAll
+                     * for non root document queries. The way qsa works is intentional,
+                     * however it's definitely not the expected way it should work.
+                     * When descendant selectors are used, only the lowest selector must be inside the root!
+                     * More info: http://ejohn.org/blog/thoughts-on-queryselectorall/
+                     * So we create a descendant selector by prepending the root's ID, and query the parent node.
+                     * UNLESS the root has no parent in which qsa will work perfectly.
+                     *
+                     * We only modify the path for single selectors (ie, no multiples),
+                     * without a full parser it makes it difficult to do this correctly.
+                     */
+                    if (root.parentNode && (root.nodeType !== 9) && path.indexOf(',') === -1 && !startIdRe.test(path)) {
+                        path = '#' + Ext.escapeId(Ext.id(root)) + ' ' + path;
+                        root = root.parentNode;
+                    }
+                    return single ? [ root.querySelector(path) ]
+                        : Ext.Array.toArray(root.querySelectorAll(path));
+                }
+                catch (e) {
+                }
+            }
+            return DQ.jsSelect.call(this, path, root, type);
+        } : function(path, root, type) {
+            return DQ.jsSelect.call(this, path, root, type);
+        },
+
+        /**
+         * Selects a single element.
+         * @param {String} selector The selector/xpath query
+         * @param {HTMLElement} [root=document] The start of the query.
+         * @return {HTMLElement} The DOM element which matched the selector.
+         */
+        selectNode : function(path, root){
+            return Ext.DomQuery.select(path, root, null, true)[0];
+        },
+
+        /**
+         * Selects the value of a node, optionally replacing null with the defaultValue.
+         * @param {String} selector The selector/xpath query
+         * @param {HTMLElement} [root=document] The start of the query.
+         * @param {String} [defaultValue] When specified, this is return as empty value.
+         * @return {String}
+         */
+        selectValue: function(path, root, defaultValue) {
+            path = path.replace(trimRe, "");
+            if (!valueCache[path]) {
+                valueCache[path] = DQ.compile(path, "select");
+            } else {
+                setupEscapes(path);
+            }
+
+            var n = valueCache[path](root),
+                v;
+
+            n = n[0] ? n[0] : n;
+
+            // overcome a limitation of maximum textnode size
+            // Rumored to potentially crash IE6 but has not been confirmed.
+            // http://reference.sitepoint.com/javascript/Node/normalize
+            // https://developer.mozilla.org/En/DOM/Node.normalize
+            if (typeof n.normalize == 'function') {
+                n.normalize();
+            }
+
+            v = (n && n.firstChild ? n.firstChild.nodeValue : null);
+            return ((v === null || v === undefined || v === '') ? defaultValue : v);
+        },
+
+        /**
+         * Selects the value of a node, parsing integers and floats.
+         * Returns the defaultValue, or 0 if none is specified.
+         * @param {String} selector The selector/xpath query
+         * @param {HTMLElement} [root=document] The start of the query.
+         * @param {Number} [defaultValue] When specified, this is return as empty value.
+         * @return {Number}
+         */
+        selectNumber: function(path, root, defaultValue) {
+            var v = DQ.selectValue(path, root, defaultValue || 0);
+            return parseFloat(v);
+        },
+
+        /**
+         * Returns true if the passed element(s) match the passed simple selector
+         * (e.g. `div.some-class` or `span:first-child`)
+         * @param {String/HTMLElement/HTMLElement[]} el An element id, element or array of elements
+         * @param {String} selector The simple selector to test
+         * @return {Boolean}
+         */
+        is: function(el, ss) {
+            if (typeof el == "string") {
+                el = doc.getElementById(el);
+            }
+            var isArray = Ext.isArray(el),
+                result = DQ.filter(isArray ? el : [el], ss);
+            return isArray ? (result.length == el.length) : (result.length > 0);
+        },
+
+        /**
+         * Filters an array of elements to only include matches of a simple selector
+         * (e.g. `div.some-class` or `span:first-child`)
+         * @param {HTMLElement[]} el An array of elements to filter
+         * @param {String} selector The simple selector to test
+         * @param {Boolean} nonMatches If true, it returns the elements that DON'T match the selector instead of the
+         * ones that match
+         * @return {HTMLElement[]} An Array of DOM elements which match the selector. If there are no matches, and empty
+         * Array is returned.
+         */
+        filter: function(els, ss, nonMatches) {
+            ss = ss.replace(trimRe, "");
+            if (!simpleCache[ss]) {
+                simpleCache[ss] = DQ.compile(ss, "simple");
+            } else {
+                setupEscapes(ss);
+            }
+
+            var result = simpleCache[ss](els);
+            return nonMatches ? quickDiff(result, els) : result;
+        },
+
+        /**
+         * Collection of matching regular expressions and code snippets.
+         * Each capture group within `()` will be replace the `{}` in the select
+         * statement as specified by their index.
+         */
+        matchers: [{
+            re: /^\.([\w\-\\]+)/,
+            select: useClassList ? 'n = byClassName(n, "{1}");' : 'n = byClassName(n, " {1} ");'
+        }, {
+            re: /^\:([\w\-]+)(?:\(((?:[^\s>\/]*|.*?))\))?/,
+            select: 'n = byPseudo(n, "{1}", "{2}");'
+        },  {
+            re: /^(?:([\[\{])(?:@)?([\w\-]+)\s?(?:(=|.=)\s?['"]?(.*?)["']?)?[\]\}])/,
+            select: 'n = byAttribute(n, "{2}", "{4}", "{3}", "{1}");'
+        }, {
+            re: /^#([\w\-\\]+)/,
+            select: 'n = byId(n, "{1}");'
+        }, {
+            re: /^@([\w\-\.]+)/,
+            select: 'return {firstChild:{nodeValue:attrValue(n, "{1}")}};'
+        }],
+
+        /**
+         * Collection of operator comparison functions.
+         * The default operators are `=`, `!=`, `^=`, `$=`, `*=`, `%=`, `|=` and `~=`.
+         *
+         * New operators can be added as long as the match the format *c*`=` where *c*
+         * is any character other than space, `>`, or `<`.
+         *
+         * Operator functions are passed the following parameters:
+         *
+         * * `propValue` : The property value to test.
+         * * `compareTo` : The value to compare to.
+         */
+        operators: {
+            "=": function(a, v) {
+                return a == v;
+            },
+            "!=": function(a, v) {
+                return a != v;
+            },
+            "^=": function(a, v) {
+                return a && a.substr(0, v.length) == v;
+            },
+            "$=": function(a, v) {
+                return a && a.substr(a.length - v.length) == v;
+            },
+            "*=": function(a, v) {
+                return a && a.indexOf(v) !== -1;
+            },
+            "%=": function(a, v) {
+                return (a % v) === 0;
+            },
+            "|=": function(a, v) {
+                return a && (a == v || a.substr(0, v.length + 1) == v + '-');
+            },
+            "~=": function(a, v) {
+                return a && (' ' + a + ' ').indexOf(' ' + v + ' ') != -1;
+            }
+        },
+
+        /**
+         * Object hash of "pseudo class" filter functions which are used when filtering selections.
+         * Each function is passed two parameters:
+         *
+         * - **c** : Array
+         *     An Array of DOM elements to filter.
+         *
+         * - **v** : String
+         *     The argument (if any) supplied in the selector.
+         *
+         * A filter function returns an Array of DOM elements which conform to the pseudo class.
+         * In addition to the provided pseudo classes listed above such as `first-child` and `nth-child`,
+         * developers may add additional, custom psuedo class filters to select elements according to application-specific requirements.
+         *
+         * For example, to filter `a` elements to only return links to __external__ resources:
+         *
+         *     Ext.DomQuery.pseudos.external = function(c, v) {
+         *         var r = [], ri = -1;
+         *         for(var i = 0, ci; ci = c[i]; i++) {
+         *             // Include in result set only if it's a link to an external resource
+         *             if (ci.hostname != location.hostname) {
+         *                 r[++ri] = ci;
+         *             }
+         *         }
+         *         return r;
+         *     };
+         *
+         * Then external links could be gathered with the following statement:
+         *
+         *     var externalLinks = Ext.select("a:external");
+         */
+        pseudos: {
+            "first-child": function(c) {
+                var r = [], ri = -1, n,
+                    i, ci;
+                for (i = 0; (ci = n = c[i]); i++) {
+                    while ((n = n.previousSibling) && n.nodeType != 1);
+                    if (!n) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "last-child": function(c) {
+                var r = [], ri = -1, n,
+                    i, ci;
+                for (i = 0; (ci = n = c[i]); i++) {
+                    while ((n = n.nextSibling) && n.nodeType != 1);
+                    if (!n) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "nth-child": function(c, a) {
+                var r = [], ri = -1,
+                    m = nthRe.exec(a == "even" && "2n" || a == "odd" && "2n+1" || !nthRe2.test(a) && "n+" + a || a),
+                    f = (m[1] || 1) - 0, l = m[2] - 0,
+                    i, n, j, cn, pn;
+                for (i = 0; n = c[i]; i++) {
+                    pn = n.parentNode;
+                    if (batch != pn._batch) {
+                        j = 0;
+                        for (cn = pn.firstChild; cn; cn = cn.nextSibling) {
+                            if (cn.nodeType == 1) {
+                                cn.nodeIndex = ++j;
+                            }
+                        }
+                        pn._batch = batch;
+                    }
+                    if (f == 1) {
+                        if (l === 0 || n.nodeIndex == l) {
+                            r[++ri] = n;
+                        }
+                    } else if ((n.nodeIndex + l) % f === 0) {
+                        r[++ri] = n;
+                    }
+                }
+
+                return r;
+            },
+
+            "only-child": function(c) {
+                var r = [], ri = -1,
+                    i, ci;
+                for (i = 0; ci = c[i]; i++) {
+                    if (!prev(ci) && !next(ci)) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "empty": function(c) {
+                var r = [], ri = -1,
+                    i, ci, cns, j, cn, empty;
+                for (i = 0; ci = c[i]; i++) {
+                    cns = ci.childNodes;
+                    j = 0;
+                    empty = true;
+                    while (cn = cns[j]) {
+                        ++j;
+                        if (cn.nodeType == 1 || cn.nodeType == 3) {
+                            empty = false;
+                            break;
+                        }
+                    }
+                    if (empty) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "contains": function(c, v) {
+                var r = [], ri = -1,
+                    i, ci;
+                for (i = 0; ci = c[i]; i++) {
+                    if ((ci.textContent || ci.innerText || ci.text || '').indexOf(v) != -1) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "nodeValue": function(c, v) {
+                var r = [], ri = -1,
+                    i, ci;
+                for (i = 0; ci = c[i]; i++) {
+                    if (ci.firstChild && ci.firstChild.nodeValue == v) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "checked": function(c) {
+                var r = [], ri = -1,
+                    i, ci;
+                for (i = 0; ci = c[i]; i++) {
+                    if (ci.checked === true) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "not": function(c, ss) {
+                return DQ.filter(c, ss, true);
+            },
+
+            "any": function(c, selectors) {
+                var ss = selectors.split('|'),
+                    r = [], ri = -1, s,
+                    i, ci, j;
+                for (i = 0; ci = c[i]; i++) {
+                    for (j = 0; s = ss[j]; j++) {
+                        if (DQ.is(ci, s)) {
+                            r[++ri] = ci;
+                            break;
+                        }
+                    }
+                }
+                return r;
+            },
+
+            "odd": function(c) {
+                return this["nth-child"](c, "odd");
+            },
+
+            "even": function(c) {
+                return this["nth-child"](c, "even");
+            },
+
+            "nth": function(c, a) {
+                return c[a - 1] || [];
+            },
+
+            "first": function(c) {
+                return c[0] || [];
+            },
+
+            "last": function(c) {
+                return c[c.length - 1] || [];
+            },
+
+            "has": function(c, ss) {
+                var s = DQ.select,
+                    r = [], ri = -1,
+                    i, ci;
+                for (i = 0; ci = c[i]; i++) {
+                    if (s(ss, ci).length > 0) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "next": function(c, ss) {
+                var is = DQ.is,
+                    r = [], ri = -1,
+                    i, ci, n;
+                for (i = 0; ci = c[i]; i++) {
+                    n = next(ci);
+                    if (n && is(n, ss)) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            "prev": function(c, ss) {
+                var is = DQ.is,
+                    r = [], ri = -1,
+                    i, ci, n;
+                for (i = 0; ci = c[i]; i++) {
+                    n = prev(ci);
+                    if (n && is(n, ss)) {
+                        r[++ri] = ci;
+                    }
+                }
+                return r;
+            },
+
+            focusable: function(candidates) {
+                var len = candidates.length,
+                    results = [],
+                    i = 0,
+                    c;
+
+                for (; i < len; i++) {
+                    c = candidates[i];
+                    if (Ext.fly(c, '_DomQuery').isFocusable()) {
+                        results.push(c);
+                    }
+                }
+
+                return results;
+            },
+            
+            visible: function(candidates, deep) {
+                var len = candidates.length,
+                    results = [],
+                    i = 0,
+                    c;
+
+                for (; i < len; i++) {
+                    c = candidates[i];
+                    if (Ext.fly(c, '_DomQuery').isVisible(deep)) {
+                        results.push(c);
+                    }
+                }
+
+                return results;
+            }
+        }
+    };
+}());
+
+/**
+* Shorthand of {@link Ext.dom.Query#select}
+* @member Ext
+* @method query
+* @inheritdoc Ext.dom.Query#select
+*/
+Ext.query = Ext.DomQuery.select;
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/* ================================
+ * A Note About Wrapped Animations
+ * ================================
+ * A few of the effects below implement two different animations per effect, one wrapping
+ * animation that performs the visual effect and a "no-op" animation on this Element where
+ * no attributes of the element itself actually change. The purpose for this is that the
+ * wrapper is required for the effect to work and so it does the actual animation work, but
+ * we always animate `this` so that the element's events and callbacks work as expected to
+ * the callers of this API.
+ * 
+ * Because of this, we always want each wrap animation to complete first (we don't want to
+ * cut off the visual effect early). To ensure that, we arbitrarily increase the duration of
+ * the element's no-op animation, also ensuring that it has a decent minimum value -- on slow
+ * systems, too-low durations can cause race conditions between the wrap animation and the
+ * element animation being removed out of order. Note that in each wrap's `afteranimate`
+ * callback it will explicitly terminate the element animation as soon as the wrap is complete,
+ * so there's no real danger in making the duration too long.
+ * 
+ * This applies to all effects that get wrapped, including slideIn, slideOut, switchOff and frame.
+ */
+
+/**
+ */
+Ext.define('Ext.dom.Element_anim', {
+    override: 'Ext.dom.Element',
+
+    /**
+     * Performs custom animation on this Element.
+     *
+     * The following properties may be specified in `from`, `to`, and `keyframe` objects:
+     *
+     *   - `x` - The page X position in pixels.
+     *
+     *   - `y` - The page Y position in pixels
+     *
+     *   - `left` - The element's CSS `left` value. Units must be supplied.
+     *
+     *   - `top` - The element's CSS `top` value. Units must be supplied.
+     *
+     *   - `width` - The element's CSS `width` value. Units must be supplied.
+     *
+     *   - `height` - The element's CSS `height` value. Units must be supplied.
+     *
+     *   - `scrollLeft` - The element's `scrollLeft` value.
+     *
+     *   - `scrollTop` - The element's `scrollTop` value.
+     *
+     *   - `opacity` - The element's `opacity` value. This must be a value between `0` and `1`.
+     *
+     * **Be aware** that animating an Element which is being used by an Ext Component without in some way informing the
+     * Component about the changed element state will result in incorrect Component behaviour. This is because the
+     * Component will be using the old state of the element. To avoid this problem, it is now possible to directly
+     * animate certain properties of Components.
+     *
+     * @param {Object} config  Configuration for {@link Ext.fx.Anim}.
+     * Note that the {@link Ext.fx.Anim#to to} config is required.
+     * @return {Ext.dom.Element} this
+     */
+    animate: function(config) {
+        var me = this,
+            listeners,
+            anim,
+            animId = me.dom.id || Ext.id(me.dom);
+
+        if (!Ext.fx.Manager.hasFxBlock(animId)) {
+            // Bit of gymnastics here to ensure our internal listeners get bound first
+            if (config.listeners) {
+                listeners = config.listeners;
+                delete config.listeners;
+            }
+            if (config.internalListeners) {
+                config.listeners = config.internalListeners;
+                delete config.internalListeners;
+            }
+            anim = new Ext.fx.Anim(me.anim(config));
+            if (listeners) {
+                anim.on(listeners);
+            }
+            Ext.fx.Manager.queueFx(anim);
+        }
+        return me;
+    },
+
+    // @private - process the passed fx configuration.
+    anim: function(config) {
+        if (!Ext.isObject(config)) {
+            return (config) ? {} : false;
+        }
+
+        var me = this,
+            duration = config.duration || Ext.fx.Anim.prototype.duration,
+            easing = config.easing || 'ease',
+            animConfig;
+
+        if (config.stopAnimation) {
+            me.stopAnimation();
+        }
+
+        Ext.applyIf(config, Ext.fx.Manager.getFxDefaults(me.id));
+
+        // Clear any 'paused' defaults.
+        Ext.fx.Manager.setFxDefaults(me.id, {
+            delay: 0
+        });
+
+        animConfig = {
+            // Pass the DOM reference. That's tested first so will be converted to an Ext.fx.Target fastest.
+            target: me.dom,
+            remove: config.remove,
+            alternate: config.alternate || false,
+            duration: duration,
+            easing: easing,
+            callback: config.callback,
+            listeners: config.listeners,
+            iterations: config.iterations || 1,
+            scope: config.scope,
+            block: config.block,
+            concurrent: config.concurrent,
+            delay: config.delay || 0,
+            paused: true,
+            keyframes: config.keyframes,
+            from: config.from || {},
+            to: Ext.apply({}, config)
+        };
+        Ext.apply(animConfig.to, config.to);
+
+        // Anim API properties - backward compat
+        delete animConfig.to.to;
+        delete animConfig.to.from;
+        delete animConfig.to.remove;
+        delete animConfig.to.alternate;
+        delete animConfig.to.keyframes;
+        delete animConfig.to.iterations;
+        delete animConfig.to.listeners;
+        delete animConfig.to.target;
+        delete animConfig.to.paused;
+        delete animConfig.to.callback;
+        delete animConfig.to.scope;
+        delete animConfig.to.duration;
+        delete animConfig.to.easing;
+        delete animConfig.to.concurrent;
+        delete animConfig.to.block;
+        delete animConfig.to.stopAnimation;
+        delete animConfig.to.delay;
+        return animConfig;
+    },
+
+    /**
+     * Slides the element into view. An anchor point can be optionally passed to set the point of origin for the slide
+     * effect. This function automatically handles wrapping the element with a fixed-size container if needed. See the
+     * {@link Ext.fx.Anim} class overview for valid anchor point options. Usage:
+     *
+     *     // default: slide the element in from the top
+     *     el.slideIn();
+     *
+     *     // custom: slide the element in from the right with a 2-second duration
+     *     el.slideIn('r', { duration: 2000 });
+     *
+     *     // common config options shown with default values
+     *     el.slideIn('t', {
+     *         easing: 'easeOut',
+     *         duration: 500
+     *     });
+     *
+     * @param {String} anchor (optional) One of the valid {@link Ext.fx.Anim} anchor positions (defaults to top: 't')
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @param {Boolean} options.preserveScroll Set to true if preservation of any descendant elements'
+     * `scrollTop` values is required. By default the DOM wrapping operation performed by `slideIn` and
+     * `slideOut` causes the browser to lose all scroll positions.
+     * @return {Ext.dom.Element} The Element
+     */
+    slideIn: function(anchor, obj, slideOut) {
+        var me = this,
+            dom = me.dom,
+            elStyle = dom.style,
+            beforeAnim,
+            wrapAnim,
+            restoreScroll,
+            wrapDomParentNode;
+
+        anchor = anchor || "t";
+        obj = obj || {};
+
+        beforeAnim = function() {
+            var animScope = this,
+                listeners = obj.listeners,
+                el = Ext.fly(dom, '_anim'),
+                box, originalStyles, anim, wrap;
+
+            if (!slideOut) {
+                el.fixDisplay();
+            }
+
+            box = el.getBox();
+            if ((anchor == 't' || anchor == 'b') && box.height === 0) {
+                box.height = dom.scrollHeight;
+            }
+            else if ((anchor == 'l' || anchor == 'r') && box.width === 0) {
+                box.width = dom.scrollWidth;
+            }
+
+            originalStyles = el.getStyles('width', 'height', 'left', 'right', 'top', 'bottom', 'position', 'z-index', true);
+            el.setSize(box.width, box.height);
+
+            // Cache all descendants' scrollTop & scrollLeft values if configured to preserve scroll.
+            if (obj.preserveScroll) {
+                restoreScroll = el.cacheScrollValues();
+            }
+
+            wrap = el.wrap({
+                id: Ext.id() + '-anim-wrap-for-' + el.dom.id,
+                style: {
+                    visibility: slideOut ? 'visible' : 'hidden'
+                }
+            });
+            wrapDomParentNode = wrap.dom.parentNode;
+            wrap.setPositioning(el.getPositioning(true));
+            if (wrap.isStyle('position', 'static')) {
+                wrap.position('relative');
+            }
+            el.clearPositioning('auto');
+            wrap.clip();
+
+            // The wrap will have reset all descendant scrollTops. Restore them if we cached them.
+            if (restoreScroll) {
+                restoreScroll();
+            }
+
+            // This element is temporarily positioned absolute within its wrapper.
+            // Restore to its default, CSS-inherited visibility setting.
+            // We cannot explicitly poke visibility:visible into its style because that overrides the visibility of the wrap.
+            el.setStyle({
+                visibility: '',
+                position: 'absolute'
+            });
+            if (slideOut) {
+                wrap.setSize(box.width, box.height);
+            }
+
+            switch (anchor) {
+                case 't':
+                    anim = {
+                        from: {
+                            width: box.width + 'px',
+                            height: '0px'
+                        },
+                        to: {
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    elStyle.bottom = '0px';
+                    break;
+                case 'l':
+                    anim = {
+                        from: {
+                            width: '0px',
+                            height: box.height + 'px'
+                        },
+                        to: {
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    me.anchorAnimX(anchor);
+                    break;
+                case 'r':
+                    anim = {
+                        from: {
+                            x: box.x + box.width,
+                            width: '0px',
+                            height: box.height + 'px'
+                        },
+                        to: {
+                            x: box.x,
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    me.anchorAnimX(anchor);
+                    break;
+                case 'b':
+                    anim = {
+                        from: {
+                            y: box.y + box.height,
+                            width: box.width + 'px',
+                            height: '0px'
+                        },
+                        to: {
+                            y: box.y,
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    break;
+                case 'tl':
+                    anim = {
+                        from: {
+                            x: box.x,
+                            y: box.y,
+                            width: '0px',
+                            height: '0px'
+                        },
+                        to: {
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    elStyle.bottom = '0px';
+                    me.anchorAnimX('l');
+                    break;
+                case 'bl':
+                    anim = {
+                        from: {
+                            y: box.y + box.height,
+                            width: '0px',
+                            height: '0px'
+                        },
+                        to: {
+                            y: box.y,
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    me.anchorAnimX('l');
+                    break;
+                case 'br':
+                    anim = {
+                        from: {
+                            x: box.x + box.width,
+                            y: box.y + box.height,
+                            width: '0px',
+                            height: '0px'
+                        },
+                        to: {
+                            x: box.x,
+                            y: box.y,
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    me.anchorAnimX('r');
+                    break;
+                case 'tr':
+                    anim = {
+                        from: {
+                            x: box.x + box.width,
+                            width: '0px',
+                            height: '0px'
+                        },
+                        to: {
+                            x: box.x,
+                            width: box.width + 'px',
+                            height: box.height + 'px'
+                        }
+                    };
+                    elStyle.bottom = '0px';
+                    me.anchorAnimX('r');
+                    break;
+            }
+
+            wrap.show();
+            wrapAnim = Ext.apply({}, obj);
+            delete wrapAnim.listeners;
+            wrapAnim = new Ext.fx.Anim(Ext.applyIf(wrapAnim, {
+                target: wrap,
+                duration: 500,
+                easing: 'ease-out',
+                from: slideOut ? anim.to : anim.from,
+                to: slideOut ? anim.from : anim.to
+            }));
+
+            // In the absence of a callback, this listener MUST be added first
+            wrapAnim.on('afteranimate', function() {
+                var el = Ext.fly(dom, '_anim');
+                
+                el.setStyle(originalStyles);
+                if (slideOut) {
+                    if (obj.useDisplay) {
+                        el.setDisplayed(false);
+                    } else {
+                        el.hide();
+                    }
+                }
+                if (wrap.dom) {
+                    if (wrap.dom.parentNode) {
+                        wrap.dom.parentNode.insertBefore(el.dom, wrap.dom);
+                    } else {
+                        wrapDomParentNode.appendChild(el.dom);
+                    }
+                    wrap.remove();
+                }
+                // The unwrap will have reset all descendant scrollTops. Restore them if we cached them.
+                if (restoreScroll) {
+                    restoreScroll();
+                }
+                // kill the no-op element animation created below
+                animScope.end();
+            });
+            // Add configured listeners after
+            if (listeners) {
+                wrapAnim.on(listeners);
+            }
+        };
+
+        me.animate({
+            // See "A Note About Wrapped Animations" at the top of this class:
+            duration: obj.duration ? Math.max(obj.duration, 500) * 2 : 1000,
+            listeners: {
+                beforeanimate: beforeAnim // kick off the wrap animation
+            }
+        });
+        return me;
+    },
+
+
+    /**
+     * Slides the element out of view. An anchor point can be optionally passed to set the end point for the slide
+     * effect. When the effect is completed, the element will be hidden (visibility = 'hidden') but block elements will
+     * still take up space in the document. The element must be removed from the DOM using the 'remove' config option if
+     * desired. This function automatically handles wrapping the element with a fixed-size container if needed. See the
+     * {@link Ext.fx.Anim} class overview for valid anchor point options. Usage:
+     *
+     *     // default: slide the element out to the top
+     *     el.slideOut();
+     *
+     *     // custom: slide the element out to the right with a 2-second duration
+     *     el.slideOut('r', { duration: 2000 });
+     *
+     *     // common config options shown with default values
+     *     el.slideOut('t', {
+     *         easing: 'easeOut',
+     *         duration: 500,
+     *         remove: false,
+     *         useDisplay: false
+     *     });
+     *
+     * @param {String} anchor (optional) One of the valid {@link Ext.fx.Anim} anchor positions (defaults to top: 't')
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.dom.Element} The Element
+     */
+    slideOut: function(anchor, o) {
+        return this.slideIn(anchor, o, true);
+    },
+
+    /**
+     * Fades the element out while slowly expanding it in all directions. When the effect is completed, the element will
+     * be hidden (visibility = 'hidden') but block elements will still take up space in the document. Usage:
+     *
+     *     // default
+     *     el.puff();
+     *
+     *     // common config options shown with default values
+     *     el.puff({
+     *         easing: 'easeOut',
+     *         duration: 500,
+     *         useDisplay: false
+     *     });
+     *
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.dom.Element} The Element
+     */
+    puff: function(obj) {
+        var me = this,
+            dom = me.dom,
+            beforeAnim,
+            box = me.getBox(),
+            originalStyles = me.getStyles('width', 'height', 'left', 'right', 'top', 'bottom', 'position', 'z-index', 'font-size', 'opacity', true);
+
+       obj = Ext.applyIf(obj || {}, {
+            easing: 'ease-out',
+            duration: 500,
+            useDisplay: false
+        });
+
+        beforeAnim = function() {
+            var el = Ext.fly(dom, '_anim');
+            
+            el.clearOpacity();
+            el.show();
+            this.to = {
+                width: box.width * 2,
+                height: box.height * 2,
+                x: box.x - (box.width / 2),
+                y: box.y - (box.height /2),
+                opacity: 0,
+                fontSize: '200%'
+            };
+            this.on('afteranimate',function() {
+                var el = Ext.fly(dom, '_anim');
+                if (el) {
+                    if (obj.useDisplay) {
+                        el.setDisplayed(false);
+                    } else {
+                        el.hide();
+                    }
+                    el.setStyle(originalStyles);
+                    Ext.callback(obj.callback, obj.scope);
+                }
+            });
+        };
+
+        me.animate({
+            duration: obj.duration,
+            easing: obj.easing,
+            listeners: {
+                beforeanimate: {
+                    fn: beforeAnim
+                }
+            }
+        });
+        return me;
+    },
+
+    /**
+     * Blinks the element as if it was clicked and then collapses on its center (similar to switching off a television).
+     * When the effect is completed, the element will be hidden (visibility = 'hidden') but block elements will still
+     * take up space in the document. The element must be removed from the DOM using the 'remove' config option if
+     * desired. Usage:
+     *
+     *     // default
+     *     el.switchOff();
+     *
+     *     // all config options shown with default values
+     *     el.switchOff({
+     *         easing: 'easeIn',
+     *         duration: .3,
+     *         remove: false,
+     *         useDisplay: false
+     *     });
+     *
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.dom.Element} The Element
+     */
+    switchOff: function(obj) {
+        var me = this,
+            dom = me.dom,
+            beforeAnim;
+
+        obj = Ext.applyIf(obj || {}, {
+            easing: 'ease-in',
+            duration: 500,
+            remove: false,
+            useDisplay: false
+        });
+
+        beforeAnim = function() {
+            var el = Ext.fly(dom, '_anim'),
+                animScope = this,
+                size = el.getSize(),
+                xy = el.getXY(),
+                keyframe, position;
+                
+            el.clearOpacity();
+            el.clip();
+            position = el.getPositioning();
+
+            keyframe = new Ext.fx.Animator({
+                target: dom,
+                duration: obj.duration,
+                easing: obj.easing,
+                keyframes: {
+                    33: {
+                        opacity: 0.3
+                    },
+                    66: {
+                        height: 1,
+                        y: xy[1] + size.height / 2
+                    },
+                    100: {
+                        width: 1,
+                        x: xy[0] + size.width / 2
+                    }
+                }
+            });
+            keyframe.on('afteranimate', function() {
+                var el = Ext.fly(dom, '_anim');
+                if (obj.useDisplay) {
+                    el.setDisplayed(false);
+                } else {
+                    el.hide();
+                }
+                el.clearOpacity();
+                el.setPositioning(position);
+                el.setSize(size);
+                // kill the no-op element animation created below
+                animScope.end();
+            });
+        };
+        
+        me.animate({
+            // See "A Note About Wrapped Animations" at the top of this class:
+            duration: (Math.max(obj.duration, 500) * 2),
+            listeners: {
+                beforeanimate: {
+                    fn: beforeAnim
+                }
+            },
+            callback: obj.callback,
+            scope: obj.scope
+        });
+        return me;
+    },
+
+    /**
+     * Shows a ripple of exploding, attenuating borders to draw attention to an Element. Usage:
+     *
+     *     // default: a single light blue ripple
+     *     el.frame();
+     *
+     *     // custom: 3 red ripples lasting 3 seconds total
+     *     el.frame("#ff0000", 3, { duration: 3000 });
+     *
+     *     // common config options shown with default values
+     *     el.frame("#C3DAF9", 1, {
+     *         duration: 1000 // duration of each individual ripple.
+     *         // Note: Easing is not configurable and will be ignored if included
+     *     });
+     *
+     * @param {String} [color='#C3DAF9'] The hex color value for the border.
+     * @param {Number} [count=1] The number of ripples to display.
+     * @param {Object} [options] Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.dom.Element} The Element
+     */
+    frame : function(color, count, obj){
+        var me = this,
+            dom = me.dom,
+            beforeAnim;
+
+        color = color || '#C3DAF9';
+        count = count || 1;
+        obj = obj || {};
+
+        beforeAnim = function() {
+            var el = Ext.fly(dom, '_anim'),
+                animScope = this,
+                box,
+                proxy, proxyAnim;
+                
+            el.show();
+            box = el.getBox();
+            proxy = Ext.getBody().createChild({
+                id: el.dom.id + '-anim-proxy',
+                style: {
+                    position : 'absolute',
+                    'pointer-events': 'none',
+                    'z-index': 35000,
+                    border : '0px solid ' + color
+                }
+            });
+            
+            proxyAnim = new Ext.fx.Anim({
+                target: proxy,
+                duration: obj.duration || 1000,
+                iterations: count,
+                from: {
+                    top: box.y,
+                    left: box.x,
+                    borderWidth: 0,
+                    opacity: 1,
+                    height: box.height,
+                    width: box.width
+                },
+                to: {
+                    top: box.y - 20,
+                    left: box.x - 20,
+                    borderWidth: 10,
+                    opacity: 0,
+                    height: box.height + 40,
+                    width: box.width + 40
+                }
+            });
+            proxyAnim.on('afteranimate', function() {
+                proxy.remove();
+                // kill the no-op element animation created below
+                animScope.end();
+            });
+        };
+
+        me.animate({
+            // See "A Note About Wrapped Animations" at the top of this class:
+            duration: (Math.max(obj.duration, 500) * 2) || 2000,
+            listeners: {
+                beforeanimate: {
+                    fn: beforeAnim
+                }
+            },
+            callback: obj.callback,
+            scope: obj.scope
+        });
+        return me;
+    },
+
+    /**
+     * Slides the element while fading it out of view. An anchor point can be optionally passed to set the ending point
+     * of the effect. Usage:
+     *
+     *     // default: slide the element downward while fading out
+     *     el.ghost();
+     *
+     *     // custom: slide the element out to the right with a 2-second duration
+     *     el.ghost('r', { duration: 2000 });
+     *
+     *     // common config options shown with default values
+     *     el.ghost('b', {
+     *         easing: 'easeOut',
+     *         duration: 500
+     *     });
+     *
+     * @param {String} anchor (optional) One of the valid {@link Ext.fx.Anim} anchor positions (defaults to bottom: 'b')
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.dom.Element} The Element
+     */
+    ghost: function(anchor, obj) {
+        var me = this,
+            dom = me.dom,
+            beforeAnim;
+
+        anchor = anchor || "b";
+        beforeAnim = function() {
+            var el = Ext.fly(dom, '_anim'),
+                width = el.getWidth(),
+                height = el.getHeight(),
+                xy = el.getXY(),
+                position = el.getPositioning(),
+                to = {
+                    opacity: 0
+                };
+            switch (anchor) {
+                case 't':
+                    to.y = xy[1] - height;
+                    break;
+                case 'l':
+                    to.x = xy[0] - width;
+                    break;
+                case 'r':
+                    to.x = xy[0] + width;
+                    break;
+                case 'b':
+                    to.y = xy[1] + height;
+                    break;
+                case 'tl':
+                    to.x = xy[0] - width;
+                    to.y = xy[1] - height;
+                    break;
+                case 'bl':
+                    to.x = xy[0] - width;
+                    to.y = xy[1] + height;
+                    break;
+                case 'br':
+                    to.x = xy[0] + width;
+                    to.y = xy[1] + height;
+                    break;
+                case 'tr':
+                    to.x = xy[0] + width;
+                    to.y = xy[1] - height;
+                    break;
+            }
+            this.to = to;
+            this.on('afteranimate', function () {
+                var el = Ext.fly(dom, '_anim');
+                if (el) {
+                    el.hide();
+                    el.clearOpacity();
+                    el.setPositioning(position);
+                }
+            });
+        };
+
+        me.animate(Ext.applyIf(obj || {}, {
+            duration: 500,
+            easing: 'ease-out',
+            listeners: {
+                beforeanimate: beforeAnim
+            }
+        }));
+        return me;
+    },
+
+    /**
+     * Highlights the Element by setting a color (applies to the background-color by default, but can be changed using
+     * the "attr" config option) and then fading back to the original color. If no original color is available, you
+     * should provide the "endColor" config option which will be cleared after the animation. Usage:
+     *
+     *     // default: highlight background to yellow
+     *     el.highlight();
+     *
+     *     // custom: highlight foreground text to blue for 2 seconds
+     *     el.highlight("0000ff", { attr: 'color', duration: 2000 });
+     *
+     *     // common config options shown with default values
+     *     el.highlight("ffff9c", {
+     *         attr: "backgroundColor", //can be any valid CSS property (attribute) that supports a color value
+     *         endColor: (current color) or "ffffff",
+     *         easing: 'easeIn',
+     *         duration: 1000
+     *     });
+     *
+     * @param {String} color (optional) The highlight color. Should be a 6 char hex color without the leading #
+     * (defaults to yellow: 'ffff9c')
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.dom.Element} The Element
+     */
+    highlight: function(color, o) {
+        var me = this,
+            dom = me.dom,
+            from = {},
+            restore, to, attr, lns, event, fn;
+
+        // Cannot set bckground-color on table elements. Find div elements to highlight.
+        if (dom.tagName.match(me.tableTagRe)) {
+            return me.select('div').highlight(color, o);
+        }
+
+        o = o || {};
+        lns = o.listeners || {};
+        attr = o.attr || 'backgroundColor';
+        from[attr] = color || 'ffff9c';
+
+        if (!o.to) {
+            to = {};
+            to[attr] = o.endColor || me.getColor(attr, 'ffffff', '');
+        }
+        else {
+            to = o.to;
+        }
+
+        // Don't apply directly on lns, since we reference it in our own callbacks below
+        o.listeners = Ext.apply(Ext.apply({}, lns), {
+            beforeanimate: function() {
+                restore = dom.style[attr];
+                var el = Ext.fly(dom, '_anim');
+                el.clearOpacity();
+                el.show();
+
+                event = lns.beforeanimate;
+                if (event) {
+                    fn = event.fn || event;
+                    return fn.apply(event.scope || lns.scope || window, arguments);
+                }
+            },
+            afteranimate: function() {
+                if (dom) {
+                    dom.style[attr] = restore;
+                }
+
+                event = lns.afteranimate;
+                if (event) {
+                    fn = event.fn || event;
+                    fn.apply(event.scope || lns.scope || window, arguments);
+                }
+            }
+        });
+
+        me.animate(Ext.apply({}, o, {
+            duration: 1000,
+            easing: 'ease-in',
+            from: from,
+            to: to
+        }));
+        return me;
+    },
+
+   /**
+    * Creates a pause before any subsequent queued effects begin. If there are no effects queued after the pause it will
+    * have no effect. Usage:
+    *
+    *     el.pause(1);
+    *
+    * @deprecated 4.0 Use the `delay` config to {@link #animate} instead.
+    * @param {Number} seconds The length of time to pause (in seconds)
+    * @return {Ext.Element} The Element
+    */
+    pause: function(ms) {
+        var me = this;
+        Ext.fx.Manager.setFxDefaults(me.id, {
+            delay: ms
+        });
+        return me;
+    },
+
+    /**
+     * Fade an element in (from transparent to opaque). The ending opacity can be specified using the `opacity`
+     * config option. Usage:
+     *
+     *     // default: fade in from opacity 0 to 100%
+     *     el.fadeIn();
+     *
+     *     // custom: fade in from opacity 0 to 75% over 2 seconds
+     *     el.fadeIn({ opacity: .75, duration: 2000});
+     *
+     *     // common config options shown with default values
+     *     el.fadeIn({
+     *         opacity: 1, //can be any value between 0 and 1 (e.g. .5)
+     *         easing: 'easeOut',
+     *         duration: 500
+     *     });
+     *
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.Element} The Element
+     */
+    fadeIn: function(o) {
+        var me = this,
+            dom = me.dom;
+            
+        me.animate(Ext.apply({}, o, {
+            opacity: 1,
+            internalListeners: {
+                beforeanimate: function(anim){
+                    // restore any visibility/display that may have 
+                    // been applied by a fadeout animation
+                    var el = Ext.fly(dom, '_anim');
+                    if (el.isStyle('display', 'none')) {
+                        el.setDisplayed('');
+                    } else {
+                        el.show();
+                    } 
+                }
+            }
+        }));
+        return this;
+    },
+
+    /**
+     * Fade an element out (from opaque to transparent). The ending opacity can be specified using the `opacity`
+     * config option. Note that IE may require `useDisplay:true` in order to redisplay correctly.
+     * Usage:
+     *
+     *     // default: fade out from the element's current opacity to 0
+     *     el.fadeOut();
+     *
+     *     // custom: fade out from the element's current opacity to 25% over 2 seconds
+     *     el.fadeOut({ opacity: .25, duration: 2000});
+     *
+     *     // common config options shown with default values
+     *     el.fadeOut({
+     *         opacity: 0, //can be any value between 0 and 1 (e.g. .5)
+     *         easing: 'easeOut',
+     *         duration: 500,
+     *         remove: false,
+     *         useDisplay: false
+     *     });
+     *
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.Element} The Element
+     */
+    fadeOut: function(o) {
+        var me = this,
+            dom = me.dom;
+            
+        o = Ext.apply({
+            opacity: 0,
+            internalListeners: {
+                afteranimate: function(anim){
+                    if (dom && anim.to.opacity === 0) {
+                        var el = Ext.fly(dom, '_anim');
+                        if (o.useDisplay) {
+                            el.setDisplayed(false);
+                        } else {
+                            el.hide();
+                        }
+                    }         
+                }
+            }
+        }, o);
+        me.animate(o);
+        return me;
+    },
+
+    /**
+     * Animates the transition of an element's dimensions from a starting height/width to an ending height/width. This
+     * method is a convenience implementation of {@link #shift}. Usage:
+     *
+     *     // change height and width to 100x100 pixels
+     *     el.scale(100, 100);
+     *
+     *     // common config options shown with default values.  The height and width will default to
+     *     // the element's existing values if passed as null.
+     *     el.scale(
+     *         [element's width],
+     *         [element's height], {
+     *             easing: 'easeOut',
+     *             duration: 350
+     *         }
+     *     );
+     *
+     * @deprecated 4.0 Just use {@link #animate} instead.
+     * @param {Number} width The new width (pass undefined to keep the original width)
+     * @param {Number} height The new height (pass undefined to keep the original height)
+     * @param {Object} options (optional) Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.Element} The Element
+     */
+    scale: function(w, h, o) {
+        this.animate(Ext.apply({}, o, {
+            width: w,
+            height: h
+        }));
+        return this;
+    },
+
+    /**
+     * Animates the transition of any combination of an element's dimensions, xy position and/or opacity. Any of these
+     * properties not specified in the config object will not be changed. This effect requires that at least one new
+     * dimension, position or opacity setting must be passed in on the config object in order for the function to have
+     * any effect. Usage:
+     *
+     *     // slide the element horizontally to x position 200 while changing the height and opacity
+     *     el.shift({ x: 200, height: 50, opacity: .8 });
+     *
+     *     // common config options shown with default values.
+     *     el.shift({
+     *         width: [element's width],
+     *         height: [element's height],
+     *         x: [element's x position],
+     *         y: [element's y position],
+     *         opacity: [element's opacity],
+     *         easing: 'easeOut',
+     *         duration: 350
+     *     });
+     *
+     * @deprecated 4.0 Just use {@link #animate} instead.
+     * @param {Object} options Object literal with any of the {@link Ext.fx.Anim} config options
+     * @return {Ext.Element} The Element
+     */
+    shift: function(config) {
+        this.animate(config);
+        return this;
+    },
+
+    /**
+     * @private
+     */
+    anchorAnimX: function(anchor) {
+        var xName = (anchor === 'l') ? 'right' : 'left';
+        this.dom.style[xName] = '0px';
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.Element_dd', {
+    override: 'Ext.dom.Element',
+
+    /**
+     * Initializes a {@link Ext.dd.DD} drag drop object for this element.
+     * @param {String} group The group the DD object is member of
+     * @param {Object} config The DD config object
+     * @param {Object} overrides An object containing methods to override/implement on the DD object
+     * @return {Ext.dd.DD} The DD object
+     */
+    initDD : function(group, config, overrides){
+        var dd = new Ext.dd.DD(Ext.id(this.dom), group, config);
+        return Ext.apply(dd, overrides);
+    },
+
+    /**
+     * Initializes a {@link Ext.dd.DDProxy} object for this element.
+     * @param {String} group The group the DDProxy object is member of
+     * @param {Object} config The DDProxy config object
+     * @param {Object} overrides An object containing methods to override/implement on the DDProxy object
+     * @return {Ext.dd.DDProxy} The DDProxy object
+     */
+    initDDProxy : function(group, config, overrides){
+        var dd = new Ext.dd.DDProxy(Ext.id(this.dom), group, config);
+        return Ext.apply(dd, overrides);
+    },
+
+    /**
+     * Initializes a {@link Ext.dd.DDTarget} object for this element.
+     * @param {String} group The group the DDTarget object is member of
+     * @param {Object} config The DDTarget config object
+     * @param {Object} overrides An object containing methods to override/implement on the DDTarget object
+     * @return {Ext.dd.DDTarget} The DDTarget object
+     */
+    initDDTarget : function(group, config, overrides){
+        var dd = new Ext.dd.DDTarget(Ext.id(this.dom), group, config);
+        return Ext.apply(dd, overrides);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.Element_fx', {
+    override: 'Ext.dom.Element'
+},
+function() {
+
+var Element         = Ext.dom.Element,
+    VISIBILITY      = "visibility",
+    DISPLAY         = "display",
+    NONE            = "none",
+    HIDDEN          = 'hidden',
+    VISIBLE         = 'visible',
+    OFFSETS         = "offsets",
+    ASCLASS         = "asclass",
+    NOSIZE          = 'nosize',
+    ORIGINALDISPLAY = 'originalDisplay',
+    VISMODE         = 'visibilityMode',
+    ISVISIBLE       = 'isVisible',
+    OFFSETCLASS     = Ext.baseCSSPrefix + 'hide-offsets',
+    getDisplay = function(el) {
+        var data = (el.$cache || el.getCache()).data,
+            display = data[ORIGINALDISPLAY];
+            
+        if (display === undefined) {
+            data[ORIGINALDISPLAY] = display = '';
+        }
+        return display;
+    },
+    getVisMode = function(el){
+        var data = (el.$cache || el.getCache()).data,
+            visMode = data[VISMODE];
+            
+        if (visMode === undefined) {
+            data[VISMODE] = visMode = Element.VISIBILITY;
+        }
+        return visMode;
+    };
+
+Element.override({
+    /**
+     * The element's default display mode.
+     */
+    originalDisplay : "",
+    visibilityMode : 1,
+
+    /**
+     * Sets the visibility of the element (see details). If the visibilityMode is set to Element.DISPLAY, it will use
+     * the display property to hide the element, otherwise it uses visibility. The default is to hide and show using the visibility property.
+     * @param {Boolean} visible Whether the element is visible
+     * @param {Boolean/Object} [animate] True for the default animation, or a standard Element animation config object
+     * @return {Ext.dom.Element} this
+     */
+    setVisible : function(visible, animate) {
+        var me = this,
+            dom = me.dom,
+            visMode = getVisMode(me);
+
+        // hideMode string override
+        if (typeof animate == 'string') {
+            switch (animate) {
+                case DISPLAY:
+                    visMode = Element.DISPLAY;
+                    break;
+                case VISIBILITY:
+                    visMode = Element.VISIBILITY;
+                    break;
+                case OFFSETS:
+                    visMode = Element.OFFSETS;
+                    break;
+                case NOSIZE:
+                case ASCLASS:
+                    visMode = Element.ASCLASS;
+                    break;
+            }
+            me.setVisibilityMode(visMode);
+            animate = false;
+        }
+
+        if (!animate || !me.anim) {
+            if (visMode == Element.DISPLAY) {
+                return me.setDisplayed(visible);
+            } else if (visMode == Element.OFFSETS) {
+                me[visible?'removeCls':'addCls'](OFFSETCLASS);
+            } else if (visMode == Element.VISIBILITY) {
+                me.fixDisplay();
+                // Show by clearing visibility style. Explicitly setting to "visible" overrides parent visibility setting
+                dom.style.visibility = visible ? '' : HIDDEN;
+            } else if (visMode == Element.ASCLASS) {
+                me[visible?'removeCls':'addCls'](me.visibilityCls || Element.visibilityCls);
+            }
+        } else {
+            // closure for composites
+            if (visible) {
+                me.setOpacity(0.01);
+                me.setVisible(true);
+            }
+            if (!Ext.isObject(animate)) {
+                animate = {
+                    duration: 350,
+                    easing: 'ease-in'
+                };
+            }
+            me.animate(Ext.applyIf({
+                callback: function() {
+                    if (!visible) {
+                        
+                        // Grab the dom again, since the reference may have changed if we use fly
+                        Ext.fly(dom, '_internal').setVisible(false).setOpacity(1);
+                    }
+                },
+                to: {
+                    opacity: (visible) ? 1 : 0
+                }
+            }, animate));
+        }
+        (me.$cache || me.getCache()).data[ISVISIBLE] = visible;
+        return me;
+    },
+
+    /**
+     * @private
+     * Determine if the Element has a relevant height and width available based
+     * upon current logical visibility state
+     */
+    hasMetrics  : function(){
+        var visMode = getVisMode(this);
+        return this.isVisible() || (visMode == Element.OFFSETS) || (visMode == Element.VISIBILITY);
+    },
+
+    /**
+     * Toggles the element's visibility or display, depending on visibility mode.
+     * @param {Boolean/Object} [animate] True for the default animation, or a standard Element animation config object
+     * @return {Ext.dom.Element} this
+     */
+    toggle : function(animate){
+        var me = this;
+        me.setVisible(!me.isVisible(), me.anim(animate));
+        return me;
+    },
+
+    /**
+     * Sets the CSS display property. Uses originalDisplay if the specified value is a boolean true.
+     * @param {Boolean/String} value Boolean value to display the element using its default display, or a string to set the display directly.
+     * @return {Ext.dom.Element} this
+     */
+    setDisplayed : function(value) {
+        if(typeof value == "boolean"){
+           value = value ? getDisplay(this) : NONE;
+        }
+        this.setStyle(DISPLAY, value);
+        return this;
+    },
+
+    // private
+    fixDisplay : function(){
+        var me = this;
+        if (me.isStyle(DISPLAY, NONE)) {
+            me.setStyle(VISIBILITY, HIDDEN);
+            me.setStyle(DISPLAY, getDisplay(me)); // first try reverting to default
+            if (me.isStyle(DISPLAY, NONE)) { // if that fails, default to block
+                me.setStyle(DISPLAY, "block");
+            }
+        }
+    },
+
+    /**
+     * Hide this element - Uses display mode to determine whether to use "display" or "visibility". See {@link #setVisible}.
+     * @param {Boolean/Object} [animate] true for the default animation or a standard Element animation config object
+     * @return {Ext.dom.Element} this
+     */
+    hide : function(animate){
+        // hideMode override
+        if (typeof animate == 'string'){
+            this.setVisible(false, animate);
+            return this;
+        }
+        this.setVisible(false, this.anim(animate));
+        return this;
+    },
+
+    /**
+     * Show this element - Uses display mode to determine whether to use "display" or "visibility". See {@link #setVisible}.
+     * @param {Boolean/Object} [animate] true for the default animation or a standard Element animation config object
+     * @return {Ext.dom.Element} this
+     */
+    show : function(animate){
+        // hideMode override
+        if (typeof animate == 'string'){
+            this.setVisible(true, animate);
+            return this;
+        }
+        this.setVisible(true, this.anim(animate));
+        return this;
+    }
+});
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.Element_position', {
+    override: 'Ext.dom.Element'
+},
+function() {
+
+var flyInstance,
+    Element = this,
+    LEFT = "left",
+    RIGHT = "right",
+    TOP = "top",
+    BOTTOM = "bottom",
+    POSITION = "position",
+    STATIC = "static",
+    RELATIVE = "relative",
+    ZINDEX = "z-index",
+    BODY = 'BODY',
+
+    PADDING = 'padding',
+    BORDER = 'border',
+    SLEFT = '-left',
+    SRIGHT = '-right',
+    STOP = '-top',
+    SBOTTOM = '-bottom',
+    SWIDTH = '-width',
+    // special markup used throughout Ext when box wrapping elements
+    borders = {l: BORDER + SLEFT + SWIDTH, r: BORDER + SRIGHT + SWIDTH, t: BORDER + STOP + SWIDTH, b: BORDER + SBOTTOM + SWIDTH},
+    paddings = {l: PADDING + SLEFT, r: PADDING + SRIGHT, t: PADDING + STOP, b: PADDING + SBOTTOM},
+    paddingsTLRB = [paddings.l, paddings.r, paddings.t, paddings.b],
+    bordersTLRB = [borders.l,  borders.r,  borders.t,  borders.b],
+    round = Math.round,
+    doc = document,
+    fly = function (el) {
+        if (!flyInstance) {
+            flyInstance = new Ext.Element.Fly();
+        }
+        flyInstance.attach(el);
+        return flyInstance;
+    };
+
+    Element.override({
+
+        pxRe: /^\d+(?:\.\d*)?px$/i,
+
+        inheritableStatics: {
+            getX: function(el) {
+                return Element.getXY(el)[0];
+            },
+
+            getXY: function(el) {
+                var bd = doc.body,
+                    docEl = doc.documentElement,
+                    leftBorder = 0,
+                    topBorder = 0,
+                    ret = [0,0],
+                    box,
+                    scroll;
+
+                el = Ext.getDom(el);
+
+                if(el != doc && el != bd){
+                    // IE has the potential to throw when getBoundingClientRect
+                    // is called on an element not attached to dom
+                    if (Ext.isIE) {
+                        try {
+                            box = el.getBoundingClientRect();
+                            // In some versions of IE, the documentElement (HTML element)
+                            // will have a 2px border that gets included, so subtract it off
+                            topBorder = docEl.clientTop || bd.clientTop;
+                            leftBorder = docEl.clientLeft || bd.clientLeft;
+                        } catch (ex) {
+                            box = { left: 0, top: 0 };
+                        }
+                    } else {
+                        box = el.getBoundingClientRect();
+                    }
+
+                    scroll = fly(doc).getScroll();
+                    ret = [
+                        round(box.left + scroll.left - leftBorder),
+                        round(box.top + scroll.top - topBorder)
+                    ];
+                }
+                return ret;
+            },
+
+            getY: function(el) {
+                return Element.getXY(el)[1];
+            },
+
+            setX: function(el, x) {
+                Element.setXY(el, [x, false]);
+            },
+
+            setXY: function(el, xy) {
+                (el = Ext.fly(el, '_setXY')).position();
+
+                var pts = el.translatePoints(xy),
+                    style = el.dom.style,
+                    pos;
+
+                // right position may have been previously set by rtlSetXY or
+                // rtlSetLocalXY so clear it here just in case.
+                style.right = 'auto';
+                for (pos in pts) {
+                    if (!isNaN(pts[pos])) {
+                        style[pos] = pts[pos] + "px";
+                    }
+                }
+            },
+
+            setY: function(el, y) {
+                Element.setXY(el, [false, y]);
+            }
+        },
+
+        /**
+         * Centers the Element in either the viewport, or another Element.
+         * @param {String/HTMLElement/Ext.dom.Element} centerIn element in
+         * which to center the element.
+         */
+        center: function(centerIn){
+            return this.alignTo(centerIn || doc, 'c-c');
+        },
+
+        /**
+         * Clears positioning back to the default when the document was loaded.
+         * @param {String} [value=''] The value to use for the left, right, top, bottom.
+         * You could use 'auto'.
+         * @return {Ext.dom.Element} this
+         */
+        clearPositioning: function(value) {
+            value = value || '';
+            return this.setStyle({
+                left : value,
+                right : value,
+                top : value,
+                bottom : value,
+                'z-index' : '',
+                position : STATIC
+            });
+        },
+
+        getAnchorToXY: function(el, anchor, local, mySize) {
+            return el.getAnchorXY(anchor, local, mySize);
+        },
+
+        /**
+         * Gets the bottom Y coordinate of the element (element Y position + element height)
+         * @param {Boolean} local True to get the local css position instead of page
+         * coordinate
+         * @return {Number}
+         * @deprecated
+         */
+        getBottom: function(local) {
+            return (local ? this.getLocalY() : this.getY()) + this.getHeight();
+        },
+
+        getBorderPadding: function() {
+            var paddingWidth = this.getStyle(paddingsTLRB),
+                bordersWidth = this.getStyle(bordersTLRB);
+
+            return {
+                beforeX: (parseFloat(bordersWidth[borders.l]) || 0) + (parseFloat(paddingWidth[paddings.l]) || 0),
+                afterX: (parseFloat(bordersWidth[borders.r]) || 0) + (parseFloat(paddingWidth[paddings.r]) || 0),
+                beforeY: (parseFloat(bordersWidth[borders.t]) || 0) + (parseFloat(paddingWidth[paddings.t]) || 0),
+                afterY: (parseFloat(bordersWidth[borders.b]) || 0) + (parseFloat(paddingWidth[paddings.b]) || 0)
+            };
+        },
+
+        /**
+         * Calculates the x, y to center this element on the screen
+         * @return {Number[]} The x, y values [x, y]
+         * @deprecated
+         */
+        getCenterXY: function(){
+            return this.getAlignToXY(doc, 'c-c');
+        },
+
+        /**
+         * Gets the left X coordinate
+         * @param {Boolean} local True to get the local css position instead of
+         * page coordinate
+         * @return {Number}
+         * @deprecated Use {@link #getX} or {@link #getLocalX}
+         */
+        getLeft: function(local) {
+            return local ? this.getLocalX() : this.getX();
+        },
+
+        /**
+         * Gets the local CSS X position for the element
+         *
+         * @return {Number}
+         */
+        getLocalX: function() {
+            var me = this,
+                offsetParent = me.dom.offsetParent,
+                x = me.getStyle('left');
+
+            if (!x || x === 'auto') {
+                x = 0;
+            } else if (me.pxRe.test(x)) {
+                x = parseFloat(x);
+            } else {
+                x = me.getX();
+                if (offsetParent) {
+                    x -= Element.getX(offsetParent);
+                }
+            }
+
+            return x;
+        },
+
+        /**
+         * Gets the local CSS X and Y position for the element
+         *
+         * @return {Array} [x, y]
+         */
+        getLocalXY: function() {
+            var me = this,
+                offsetParent = me.dom.offsetParent,
+                style = me.getStyle(['left', 'top']),
+                x = style.left,
+                y = style.top;
+
+            if (!x || x === 'auto') {
+                x = 0;
+            } else if (me.pxRe.test(x)) {
+                x = parseFloat(x);
+            } else {
+                x = me.getX();
+                if (offsetParent) {
+                    x -= Element.getX(offsetParent);
+                }
+            }
+
+            if (!y || y === 'auto') {
+                y = 0;
+            } else if (me.pxRe.test(y)) {
+                y = parseFloat(y);
+            } else {
+                y = me.getY();
+                if (offsetParent) {
+                    y -= Element.getY(offsetParent);
+                }
+            }
+
+            return [x, y];
+        },
+
+        /**
+         * Gets the local CSS Y position for the element
+         *
+         * @return {Number}
+         */
+        getLocalY: function() {
+            var me = this,
+                offsetParent = me.dom.offsetParent,
+                y = me.getStyle('top');
+
+            if (!y || y === 'auto') {
+                y = 0;
+            } else if (me.pxRe.test(y)) {
+                y = parseFloat(y);
+            } else {
+                y = me.getY();
+                if (offsetParent) {
+                    y -= Element.getY(offsetParent);
+                }
+            }
+
+            return y;
+        },
+
+        /**
+         * Returns an object defining the area of this Element which can be passed to
+         * {@link Ext.util.Positionable#setBox} to set another Element's size/location to match this element.
+         *
+         * @param {Boolean} [asRegion] If true an Ext.util.Region will be returned
+         * @return {Object/Ext.util.Region} box An object in the following format:
+         *
+         *     {
+         *         left: <Element's X position>,
+         *         top: <Element's Y position>,
+         *         width: <Element's width>,
+         *         height: <Element's height>,
+         *         bottom: <Element's lower bound>,
+         *         right: <Element's rightmost bound>
+         *     }
+         *
+         * The returned object may also be addressed as an Array where index 0 contains
+         * the X position and index 1 contains the Y position. So the result may also be
+         * used for {@link #setXY}
+         * @deprecated use {@link Ext.util.Positionable#getBox} to get a box object, and
+         * {@link Ext.util.Positionable#getRegion} to get a {@link Ext.util.Region Region}.
+         */
+        getPageBox: function(getRegion) {
+            var me = this,
+                dom = me.dom,
+                isDoc = dom.nodeName == BODY,
+                w = isDoc ? Ext.Element.getViewWidth() : dom.offsetWidth,
+                h = isDoc ? Ext.Element.getViewHeight() : dom.offsetHeight,
+                xy = me.getXY(),
+                t = xy[1],
+                r = xy[0] + w,
+                b = xy[1] + h,
+                l = xy[0];
+
+            if (getRegion) {
+                return new Ext.util.Region(t, r, b, l);
+            }
+            else {
+                return {
+                    left: l,
+                    top: t,
+                    width: w,
+                    height: h,
+                    right: r,
+                    bottom: b
+                };
+            }
+        },
+
+        /**
+         * Gets an object with all CSS positioning properties. Useful along with
+         * #setPostioning to get snapshot before performing an update and then restoring
+         * the element.
+         * @param {Boolean} [autoPx=false] true to return pixel values for "auto" styles.
+         * @return {Object}
+         */
+        getPositioning: function(autoPx){
+            var styles = this.getStyle(['left', 'top', 'position', 'z-index']),
+                dom = this.dom;
+
+            if(autoPx) {
+                if(styles.left === 'auto') {
+                    styles.left = dom.offsetLeft + 'px';
+                }
+                if(styles.top === 'auto') {
+                    styles.top = dom.offsetTop + 'px';
+                }
+            }
+
+            return styles;
+        },
+
+        /**
+         * Gets the right X coordinate of the element (element X position + element width)
+         * @param {Boolean} local True to get the local css position instead of page
+         * coordinates
+         * @return {Number}
+         * @deprecated
+         */
+        getRight: function(local) {
+            return (local ? this.getLocalX() : this.getX()) + this.getWidth();
+        },
+
+        /**
+         * Gets the top Y coordinate
+         * @param {Boolean} local True to get the local css position instead of page
+         * coordinates
+         * @return {Number}
+         * @deprecated Use {@link #getY} or {@link #getLocalY}
+         */
+        getTop: function(local) {
+            return local ? this.getLocalY() : this.getY();
+        },
+
+        /**
+         * Gets element X position in page coordinates
+         *
+         * @return {Number}
+         */
+        getX: function() {
+            return Element.getX(this.dom);
+        },
+
+        /**
+         * Gets element X and Y positions in page coordinates
+         *
+         * @return {Array} [x, y]
+         */
+        getXY: function() {
+            return Element.getXY(this.dom);
+        },
+
+        /**
+         * Gets element Y position in page coordinates
+         *
+         * @return {Number}
+         */
+        getY: function() {
+            return Element.getY(this.dom);
+        },
+
+        /**
+         * Sets the position of the element in page coordinates.
+         * @param {Number} x X value for new position (coordinates are page-based)
+         * @param {Number} y Y value for new position (coordinates are page-based)
+         * @param {Boolean/Object} [animate] True for the default animation, or a standard
+         * Element animation config object
+         * @return {Ext.dom.Element} this
+         * @deprecated Use {@link #setXY} instead.
+         */
+        moveTo: function(x, y, animate) {
+            return this.setXY([x, y], animate);
+        },
+
+        /**
+         * Initializes positioning on this element. If a desired position is not passed,
+         * it will make the the element positioned relative IF it is not already positioned.
+         * @param {String} [pos] Positioning to use "relative", "absolute" or "fixed"
+         * @param {Number} [zIndex] The zIndex to apply
+         * @param {Number} [x] Set the page X position
+         * @param {Number} [y] Set the page Y position
+         */
+        position: function(pos, zIndex, x, y) {
+            var me = this;
+
+            if (!pos && me.isStyle(POSITION, STATIC)) {
+                me.setStyle(POSITION, RELATIVE);
+            } else if (pos) {
+                me.setStyle(POSITION, pos);
+            }
+            if (zIndex) {
+                me.setStyle(ZINDEX, zIndex);
+            }
+            if (x || y) {
+                me.setXY([x || false, y || false]);
+            }
+        },
+
+        /**
+         * Sets the element's CSS bottom style.
+         * @param {Number/String} bottom Number of pixels or CSS string value to set as
+         * the bottom CSS property value
+         * @return {Ext.dom.Element} this
+         * @deprecated
+         */
+        setBottom: function(bottom) {
+            this.dom.style[BOTTOM] = this.addUnits(bottom);
+            return this;
+        },
+
+        /**
+         * Sets the element's position and size in one shot. If animation is true then
+         * width, height, x and y will be animated concurrently.
+         *
+         * @param {Number} x X value for new position (coordinates are page-based)
+         * @param {Number} y Y value for new position (coordinates are page-based)
+         * @param {Number/String} width The new width. This may be one of:
+         *
+         * - A Number specifying the new width in this Element's
+         * {@link #defaultUnit}s (by default, pixels)
+         * - A String used to set the CSS width style. Animation may **not** be used.
+         *
+         * @param {Number/String} height The new height. This may be one of:
+         *
+         * - A Number specifying the new height in this Element's
+         * {@link #defaultUnit}s (by default, pixels)
+         * - A String used to set the CSS height style. Animation may **not** be used.
+         *
+         * @param {Boolean/Object} [animate] true for the default animation or
+         * a standard Element animation config object
+         *
+         * @return {Ext.dom.Element} this
+         * @deprecated Use {@link Ext.util.Positionable#setBox} instead.
+         */
+        setBounds: function(x, y, width, height, animate) {
+            return this.setBox({
+                x: x,
+                y: y,
+                width: width,
+                height: height
+            }, animate);
+        },
+
+        /**
+         * Sets the element's left position directly using CSS style
+         * (instead of {@link #setX}).
+         * @param {Number/String} left Number of pixels or CSS string value to
+         * set as the left CSS property value
+         * @return {Ext.dom.Element} this
+         * @deprecated
+         */
+        setLeft: function(left) {
+            this.dom.style[LEFT] = this.addUnits(left); 
+            return this;
+        },
+
+        /**
+         * Sets the element's left and top positions directly using CSS style
+         * @param {Number/String} left Number of pixels or CSS string value to
+         * set as the left CSS property value
+         * @param {Number/String} top Number of pixels or CSS string value to
+         * set as the top CSS property value
+         * @return {Ext.dom.Element} this
+         * @deprecated
+         */
+        setLeftTop: function(left, top) {
+            var me = this,
+                style = me.dom.style;
+
+            style.left = me.addUnits(left);
+            style.top = me.addUnits(top);
+
+            return me;
+        },
+
+        setLocalX: function(x) {
+            var style = this.dom.style;
+
+            // clear right style just in case it was previously set by rtlSetXY/rtlSetLocalXY
+            style.right = 'auto';
+            style.left = (x === null) ? 'auto' : x + 'px';
+        },
+
+        setLocalXY: function(x, y) {
+            var style = this.dom.style;
+
+            // clear right style just in case it was previously set by rtlSetXY/rtlSetLocalXY
+            style.right = 'auto';
+
+            if (x && x.length) {
+                y = x[1];
+                x = x[0];
+            }
+
+            if (x === null) {
+                style.left = 'auto';
+            } else if (x !== undefined) {
+                style.left = x + 'px';
+            }
+
+            if (y === null) {
+                style.top = 'auto';
+            } else if (y !== undefined) {
+                style.top = y + 'px';
+            }
+        },
+
+        setLocalY: function(y) {
+            this.dom.style.top = (y === null) ? 'auto' : y + 'px';
+        },
+
+        /**
+         * Sets the position of the element in page coordinates.
+         * @param {Number} x X value for new position
+         * @param {Number} y Y value for new position
+         * @param {Boolean/Object} [animate] True for the default animation, or a standard
+         * Element animation config object
+         * @return {Ext.dom.Element} this
+         * @deprecated Use {@link #setXY} instead.
+         */
+        setLocation: function(x, y, animate) {
+            return this.setXY([x, y], animate);
+        },
+
+        /**
+         * Set positioning with an object returned by #getPositioning.
+         * @param {Object} posCfg
+         * @return {Ext.dom.Element} this
+         */
+        setPositioning: function(pc) {
+            return this.setStyle(pc);
+        },
+
+        /**
+         * Sets the element's CSS right style.
+         * @param {Number/String} right Number of pixels or CSS string value to
+         * set as the right CSS property value
+         * @return {Ext.dom.Element} this
+         * @deprecated
+         */
+        setRight: function(right) {
+            this.dom.style[RIGHT] = this.addUnits(right);
+            return this;
+        },
+
+        /**
+         * Sets the element's top position directly using CSS style
+         * (instead of {@link #setY}).
+         * @param {Number/String} top Number of pixels or CSS string value to
+         * set as the top CSS property value
+         * @return {Ext.dom.Element} this
+         * @deprecated
+         */
+        setTop: function(top) {
+            this.dom.style[TOP] = this.addUnits(top);
+            return this;
+        },
+
+        setX: function(x, animate) {
+            return this.setXY([x, this.getY()], animate);
+        },
+
+        setXY: function(xy, animate) {
+            var me = this;
+
+            if (!animate || !me.anim) {
+                Element.setXY(me.dom, xy);
+            } else {
+                if (!Ext.isObject(animate)) {
+                    animate = {};
+                }
+                me.animate(Ext.applyIf({ to: { x: xy[0], y: xy[1] } }, animate));
+            }
+            return this;
+        },
+
+        setY: function(y, animate) {
+            return this.setXY([this.getX(), y], animate);
+        }
+    });
+
+    /**
+     * @private
+     * Returns the `X,Y` position of the passed element in browser document space without regard
+     * to any RTL direction settings.
+     */
+    Element.getTrueXY = Element.getXY;
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.Element_scroll', {
+    override: 'Ext.dom.Element',
+
+    /**
+     * Returns true if this element is scrollable.
+     * @return {Boolean}
+     */
+    isScrollable: function() {
+        var dom = this.dom;
+        return dom.scrollHeight > dom.clientHeight || dom.scrollWidth > dom.clientWidth;
+    },
+
+    /**
+     * Returns the current scroll position of the element.
+     * @return {Object} An object containing the scroll position in the format
+     * `{left: (scrollLeft), top: (scrollTop)}`
+     */
+    getScroll: function() {
+        var me = this,
+            dom = me.dom,
+            doc = document,
+            body = doc.body,
+            docElement = doc.documentElement,
+            left, top;
+
+        if (dom === doc || dom === body) {
+            // the scrollLeft/scrollTop may be either on the body or documentElement,
+            // depending on browser. It is possible to use window.pageXOffset/pageYOffset
+            // in most modern browsers but this complicates things when in rtl mode because
+            // pageXOffset does not always behave the same as scrollLeft when direction is
+            // rtl. (e.g. pageXOffset can be an offset from the right, while scrollLeft
+            // is offset from the left, one can be positive and the other negative, etc.)
+            // To avoid adding an extra layer of feature detection in rtl mode to deal with
+            // these differences, it's best just to always use scrollLeft/scrollTop
+            left = docElement.scrollLeft || (body ? body.scrollLeft : 0);
+            top = docElement.scrollTop || (body ? body.scrollTop : 0);
+        } else {
+            left = dom.scrollLeft;
+            top = dom.scrollTop;
+        }
+
+        return {
+            left: left,
+            top: top
+        };
+    },
+    
+    /**
+     * Gets the left scroll position
+     * @return {Number} The left scroll position
+     */
+    getScrollLeft: function() {
+        var dom = this.dom,
+            doc = document;
+            
+        if (dom === doc || dom === doc.body) {
+            return this.getScroll().left;
+        } else {
+            return dom.scrollLeft;
+        }
+    },
+    
+    /**
+     * Gets the top scroll position
+     * @return {Number} The top scroll position
+     */
+    getScrollTop: function(){
+        var dom = this.dom,
+            doc = document;
+            
+        if (dom === doc || dom === doc.body) {
+            return this.getScroll().top;
+        } else {
+            return dom.scrollTop;
+        }
+    },
+    
+    /**
+     * Sets the left scroll position
+     * @param {Number} left The left scroll position
+     * @return {Ext.dom.Element} this
+     */
+    setScrollLeft: function(left){
+        this.dom.scrollLeft = left;
+        return this;
+    },
+    
+    /**
+     * Sets the top scroll position
+     * @param {Number} top The top scroll position
+     * @return {Ext.dom.Element} this
+     */
+    setScrollTop: function(top) {
+        this.dom.scrollTop = top;
+        return this;
+    },
+
+    /**
+     * Scrolls this element by the passed delta values, optionally animating.
+     * 
+     * All of the following are equivalent:
+     *
+     *      el.scrollBy(10, 10, true);
+     *      el.scrollBy([10, 10], true);
+     *      el.scrollBy({ x: 10, y: 10 }, true);
+     * 
+     * @param {Number/Number[]/Object} deltaX Either the x delta, an Array specifying x and y deltas or
+     * an object with "x" and "y" properties.
+     * @param {Number/Boolean/Object} deltaY Either the y delta, or an animate flag or config object.
+     * @param {Boolean/Object} animate Animate flag/config object if the delta values were passed separately.
+     * @return {Ext.Element} this
+     */
+    scrollBy: function(deltaX, deltaY, animate) {
+        var me = this,
+            dom = me.dom;
+
+        // Extract args if deltas were passed as an Array.
+        if (deltaX.length) {
+            animate = deltaY;
+            deltaY = deltaX[1];
+            deltaX = deltaX[0];
+        } else if (typeof deltaX != 'number') { // or an object
+            animate = deltaY;
+            deltaY = deltaX.y;
+            deltaX = deltaX.x;
+        }
+
+        if (deltaX) {
+            me.scrollTo('left', me.constrainScrollLeft(dom.scrollLeft + deltaX), animate);
+        }
+        if (deltaY) {
+            me.scrollTo('top', me.constrainScrollTop(dom.scrollTop + deltaY), animate);
+        }
+
+        return me;
+    },
+
+    /**
+     * Scrolls this element the specified scroll point. It does NOT do bounds checking so
+     * if you scroll to a weird value it will try to do it. For auto bounds checking, use #scroll.
+     * @param {String} side Either "left" for scrollLeft values or "top" for scrollTop values.
+     * @param {Number} value The new scroll value
+     * @param {Boolean/Object} [animate] true for the default animation or a standard Element
+     * animation config object
+     * @return {Ext.Element} this
+     */
+    scrollTo: function(side, value, animate) {
+        //check if we're scrolling top or left
+        var top = /top/i.test(side),
+            me = this,
+            prop = top ? 'scrollTop' : 'scrollLeft',
+            dom = me.dom,
+            animCfg;
+
+        if (!animate || !me.anim) {
+            // just setting the value, so grab the direction
+            dom[prop] = value;
+            // corrects IE, other browsers will ignore
+            dom[prop] = value;
+        }
+        else {
+            animCfg = {
+                to: {}
+            };
+            animCfg.to[prop] = value;
+            if (Ext.isObject(animate)) {
+                Ext.applyIf(animCfg, animate);
+            }
+            me.animate(animCfg);
+        }
+        return me;
+    },
+
+    /**
+     * Scrolls this element into view within the passed container.
+     * @param {String/HTMLElement/Ext.Element} [container=document.body] The container element
+     * to scroll.  Should be a string (id), dom node, or Ext.Element.
+     * @param {Boolean} [hscroll=true] False to disable horizontal scroll.
+     * @param {Boolean/Object} [animate] true for the default animation or a standard Element
+     * @param {Boolean} [highlight=false] true to {@link #highlight} the element when it is in view.
+     * animation config object
+     * @return {Ext.dom.Element} this
+     */
+    scrollIntoView: function(container, hscroll, animate, highlight) {
+        var me = this,
+            dom = me.dom,
+            offsets = me.getOffsetsTo(container = Ext.getDom(container) || Ext.getBody().dom),
+        // el's box
+            left = offsets[0] + container.scrollLeft,
+            top = offsets[1] + container.scrollTop,
+            bottom = top + dom.offsetHeight,
+            right = left + dom.offsetWidth,
+        // ct's box
+            ctClientHeight = container.clientHeight,
+            ctScrollTop = parseInt(container.scrollTop, 10),
+            ctScrollLeft = parseInt(container.scrollLeft, 10),
+            ctBottom = ctScrollTop + ctClientHeight,
+            ctRight = ctScrollLeft + container.clientWidth,
+            newPos;
+
+        // Highlight upon end of scroll
+        if (highlight) {
+            if (animate) {
+                animate = Ext.apply({
+                    listeners: {
+                        afteranimate: function() {
+                            me.scrollChildFly.attach(dom).highlight();
+                        }
+                    }
+                }, animate);
+            } else {
+                me.scrollChildFly.attach(dom).highlight();
+            }
+        }
+
+        if (dom.offsetHeight > ctClientHeight || top < ctScrollTop) {
+            newPos = top;
+        } else if (bottom > ctBottom) {
+            newPos = bottom - ctClientHeight;
+        }
+        if (newPos != null) {
+            me.scrollChildFly.attach(container).scrollTo('top', newPos, animate);
+        }
+
+        if (hscroll !== false) {
+            newPos = null;
+            if (dom.offsetWidth > container.clientWidth || left < ctScrollLeft) {
+                newPos = left;
+            } else if (right > ctRight) {
+                newPos = right - container.clientWidth;
+            }
+            if (newPos != null) {
+                me.scrollChildFly.attach(container).scrollTo('left', newPos, animate);
+            }
+        }
+        return me;
+    },
+
+    // @private
+    scrollChildIntoView: function(child, hscroll) {
+        this.scrollChildFly.attach(Ext.getDom(child)).scrollIntoView(this, hscroll);
+    },
+
+    /**
+     * Scrolls this element the specified direction. Does bounds checking to make sure the scroll is
+     * within this element's scrollable range.
+     * @param {String} direction Possible values are:
+     *
+     * - `"l"` (or `"left"`)
+     * - `"r"` (or `"right"`)
+     * - `"t"` (or `"top"`, or `"up"`)
+     * - `"b"` (or `"bottom"`, or `"down"`)
+     *
+     * @param {Number} distance How far to scroll the element in pixels
+     * @param {Boolean/Object} [animate] true for the default animation or a standard Element
+     * animation config object
+     * @return {Boolean} Returns true if a scroll was triggered or false if the element
+     * was scrolled as far as it could go.
+     */
+    scroll: function(direction, distance, animate) {
+        if (!this.isScrollable()) {
+            return false;
+        }
+        var me = this,
+            dom = me.dom,
+            side = direction === 'r' || direction === 'l' ? 'left' : 'top',
+            scrolled = false,
+            currentScroll, constrainedScroll;
+
+        if (direction === 'r') {
+            distance = -distance;
+        }
+
+        if (side === 'left') {
+            currentScroll = dom.scrollLeft;
+            constrainedScroll = me.constrainScrollLeft(currentScroll + distance);
+        } else {
+            currentScroll = dom.scrollTop;
+            constrainedScroll = me.constrainScrollTop(currentScroll + distance);
+        }
+
+        if (constrainedScroll !== currentScroll) {
+            this.scrollTo(side, constrainedScroll, animate);
+            scrolled = true;
+        }
+
+        return scrolled;
+    },
+
+    constrainScrollLeft: function(left) {
+        var dom = this.dom;
+        return Math.max(Math.min(left, dom.scrollWidth - dom.clientWidth), 0);
+    },
+
+    constrainScrollTop: function(top) {
+        var dom = this.dom;
+        return Math.max(Math.min(top, dom.scrollHeight - dom.clientHeight), 0);
+    }
+}, function() {
+    this.prototype.scrollChildFly = new this.Fly();
+    this.prototype.scrolltoFly = new this.Fly();
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ */
+Ext.define('Ext.dom.Element_style', {
+    override: 'Ext.dom.Element'
+},
+function() {
+
+var Element = this,
+    view = document.defaultView,
+    adjustDirect2DTableRe = /table-row|table-.*-group/,
+    INTERNAL = '_internal',
+    HIDDEN = 'hidden',
+    HEIGHT = 'height',
+    WIDTH = 'width',
+    ISCLIPPED = 'isClipped',
+    OVERFLOW = 'overflow',
+    OVERFLOWX = 'overflow-x',
+    OVERFLOWY = 'overflow-y',
+    ORIGINALCLIP = 'originalClip',
+    DOCORBODYRE = /#document|body/i,
+    // This reduces the lookup of 'me.styleHooks' by one hop in the prototype chain. It is
+    // the same object.
+    styleHooks, verticalStyleHooks90, verticalStyleHooks270,
+    edges, k, edge, borderWidth;
+
+if (!view || !view.getComputedStyle) {
+    Element.prototype.getStyle = function (property, inline) {
+        var me = this,
+            dom = me.dom,
+            multiple = typeof property != 'string',
+            hooks = me.styleHooks,
+            prop = property,
+            props = prop,
+            len = 1,
+            isInline = inline,
+            camel, domStyle, values, hook, out, style, i;
+
+        if (multiple) {
+            values = {};
+            prop = props[0];
+            i = 0;
+            if (!(len = props.length)) {
+                return values;
+            }
+        }
+
+        if (!dom || dom.documentElement) {
+            return values || '';
+        }
+
+        domStyle = dom.style;
+
+        if (inline) {
+            style = domStyle;
+        } else {
+            style = dom.currentStyle;
+
+            // fallback to inline style if rendering context not available
+            if (!style) {
+                isInline = true;
+                style = domStyle;
+            }
+        }
+
+        do {
+            hook = hooks[prop];
+
+            if (!hook) {
+                hooks[prop] = hook = { name: Element.normalize(prop) };
+            }
+
+            if (hook.get) {
+                out = hook.get(dom, me, isInline, style);
+            } else {
+                camel = hook.name;
+
+                // In some cases, IE6 will throw Invalid Argument exceptions for properties
+                // like fontSize (/examples/tabs/tabs.html in 4.0 used to exhibit this but
+                // no longer does due to font style changes). There is a real cost to a try
+                // block, so we avoid it where possible...
+                if (hook.canThrow) {
+                    try {
+                        out = style[camel];
+                    } catch (e) {
+                        out = '';
+                    }
+                } else {
+                    // EXTJSIV-5657 - In IE9 quirks mode there is a chance that VML root element 
+                    // has neither `currentStyle` nor `style`. Return '' this case.
+                    out = style ? style[camel] : '';
+                }
+            }
+
+            if (!multiple) {
+                return out;
+            }
+
+            values[prop] = out;
+            prop = props[++i];
+        } while (i < len);
+
+        return values;
+    };
+}
+
+Element.override({
+    getHeight: function(contentHeight, preciseHeight) {
+        var me = this,
+            hidden = me.isStyle('display', 'none'),
+            height,
+            floating;
+
+        if (hidden) {
+            return 0;
+        }
+
+        height = me.dom.offsetHeight;
+
+        // IE9/10 Direct2D dimension rounding bug
+        if (Ext.supports.Direct2DBug) {
+            floating = me.adjustDirect2DDimension(HEIGHT);
+            if (preciseHeight) {
+                height += floating;
+            }
+            else if (floating > 0 && floating < 0.5) {
+                height++;
+            }
+        }
+
+        if (contentHeight) {
+            height -= me.getBorderWidth("tb") + me.getPadding("tb");
+        }
+
+        return (height < 0) ? 0 : height;
+    },
+
+    getWidth: function(contentWidth, preciseWidth) {
+        var me = this,
+            dom = me.dom,
+            hidden = me.isStyle('display', 'none'),
+            rect, width, floating;
+
+        if (hidden) {
+            return 0;
+        }
+
+        // Gecko will in some cases report an offsetWidth that is actually less than the width of the
+        // text contents, because it measures fonts with sub-pixel precision but rounds the calculated
+        // value down. Using getBoundingClientRect instead of offsetWidth allows us to get the precise
+        // subpixel measurements so we can force them to always be rounded up. See
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=458617
+        // Rounding up ensures that the width includes the full width of the text contents.
+        if (preciseWidth && Ext.supports.BoundingClientRect) {
+            rect = dom.getBoundingClientRect();
+            // IE9 is the only browser that supports getBoundingClientRect() and
+            // uses a filter to rotate the element vertically.  When a filter
+            // is used to rotate the element, the getHeight/getWidth functions
+            // are not inverted (see setVertical).
+            width = (me.vertical && !Ext.isIE9 && !Ext.supports.RotatedBoundingClientRect) ?
+                    (rect.bottom - rect.top) : (rect.right - rect.left);
+        } else {
+            width = dom.offsetWidth;
+        }
+
+        // IE9/10 Direct2D dimension rounding bug: https://sencha.jira.com/browse/EXTJSIV-603
+        // there is no need make adjustments for this bug when the element is vertically
+        // rotated because the width of a vertical element is its rotated height
+        if (Ext.supports.Direct2DBug && !me.vertical) {
+            // get the fractional portion of the sub-pixel precision width of the element's text contents
+            floating = me.adjustDirect2DDimension(WIDTH);
+            if (preciseWidth) {
+                width += floating;
+            }
+            // IE9 also measures fonts with sub-pixel precision, but unlike Gecko, instead of rounding the offsetWidth down,
+            // it rounds to the nearest integer. This means that in order to ensure that the width includes the full
+            // width of the text contents we need to increment the width by 1 only if the fractional portion is less than 0.5
+            else if (floating > 0 && floating < 0.5) {
+                width++;
+            }
+        }
+
+        if (contentWidth) {
+            width -= me.getBorderWidth("lr") + me.getPadding("lr");
+        }
+
+        return (width < 0) ? 0 : width;
+    },
+
+    setWidth: function(width, animate) {
+        var me = this;
+        width = me.adjustWidth(width);
+        if (!animate || !me.anim) {
+            me.dom.style.width = me.addUnits(width);
+        }
+        else {
+            if (!Ext.isObject(animate)) {
+                animate = {};
+            }
+            me.animate(Ext.applyIf({
+                to: {
+                    width: width
+                }
+            }, animate));
+        }
+        return me;
+    },
+
+    setHeight : function(height, animate) {
+        var me = this;
+
+        height = me.adjustHeight(height);
+        if (!animate || !me.anim) {
+            me.dom.style.height = me.addUnits(height);
+        }
+        else {
+            if (!Ext.isObject(animate)) {
+                animate = {};
+            }
+            me.animate(Ext.applyIf({
+                to: {
+                    height: height
+                }
+            }, animate));
+        }
+
+        return me;
+    },
+
+    applyStyles: function(style) {
+        Ext.DomHelper.applyStyles(this.dom, style);
+        return this;
+    },
+
+    setSize: function(width, height, animate) {
+        var me = this;
+
+        if (Ext.isObject(width)) { // in case of object from getSize()
+            animate = height;
+            height = width.height;
+            width = width.width;
+        }
+
+        width = me.adjustWidth(width);
+        height = me.adjustHeight(height);
+
+        if (!animate || !me.anim) {
+            me.dom.style.width = me.addUnits(width);
+            me.dom.style.height = me.addUnits(height);
+        }
+        else {
+            if (animate === true) {
+                animate = {};
+            }
+            me.animate(Ext.applyIf({
+                to: {
+                    width: width,
+                    height: height
+                }
+            }, animate));
+        }
+
+        return me;
+    },
+
+    getViewSize : function() {
+        var me = this,
+            dom = me.dom,
+            isDoc = DOCORBODYRE.test(dom.nodeName),
+            ret;
+
+        // If the body, use static methods
+        if (isDoc) {
+            ret = {
+                width : Element.getViewWidth(),
+                height : Element.getViewHeight()
+            };
+        } else {
+            ret = {
+                width : dom.clientWidth,
+                height : dom.clientHeight
+            };
+        }
+
+        return ret;
+    },
+
+    getSize: function(contentSize) {
+        return {width: this.getWidth(contentSize), height: this.getHeight(contentSize)};
+    },
+
+    // TODO: Look at this
+
+    // private  ==> used by Fx
+    adjustWidth : function(width) {
+        var me = this,
+            isNum = (typeof width == 'number');
+
+        if (isNum && me.autoBoxAdjust && !me.isBorderBox()) {
+            width -= (me.getBorderWidth("lr") + me.getPadding("lr"));
+        }
+        return (isNum && width < 0) ? 0 : width;
+    },
+
+    // private   ==> used by Fx
+    adjustHeight : function(height) {
+        var me = this,
+            isNum = (typeof height == "number");
+
+        if (isNum && me.autoBoxAdjust && !me.isBorderBox()) {
+            height -= (me.getBorderWidth("tb") + me.getPadding("tb"));
+        }
+        return (isNum && height < 0) ? 0 : height;
+    },
+
+    /**
+     * Return the CSS color for the specified CSS attribute. rgb, 3 digit (like `#fff`) and valid values
+     * are convert to standard 6 digit hex color.
+     * @param {String} attr The css attribute
+     * @param {String} defaultValue The default value to use when a valid color isn't found
+     * @param {String} [prefix] defaults to #. Use an empty string when working with
+     * color anims.
+     */
+    getColor : function(attr, defaultValue, prefix) {
+        var v = this.getStyle(attr),
+            color = prefix || prefix === '' ? prefix : '#',
+            h, len, i=0;
+
+        if (!v || (/transparent|inherit/.test(v))) {
+            return defaultValue;
+        }
+        if (/^r/.test(v)) {
+             v = v.slice(4, v.length - 1).split(',');
+             len = v.length;
+             for (; i<len; i++) {
+                h = parseInt(v[i], 10);
+                color += (h < 16 ? '0' : '') + h.toString(16);
+            }
+        } else {
+            v = v.replace('#', '');
+            color += v.length == 3 ? v.replace(/^(\w)(\w)(\w)$/, '$1$1$2$2$3$3') : v;
+        }
+        return(color.length > 5 ? color.toLowerCase() : defaultValue);
+    },
+
+    /**
+     * Set the opacity of the element
+     * @param {Number} opacity The new opacity. 0 = transparent, .5 = 50% visibile, 1 = fully visible, etc
+     * @param {Boolean/Object} [animate] a standard Element animation config object or `true` for
+     * the default animation (`{duration: 350, easing: 'easeIn'}`)
+     * @return {Ext.dom.Element} this
+     */
+    setOpacity: function(opacity, animate) {
+        var me = this;
+
+        if (!me.dom) {
+            return me;
+        }
+
+        if (!animate || !me.anim) {
+            me.setStyle('opacity', opacity);
+        }
+        else {
+            if (typeof animate != 'object') {
+                animate = {
+                    duration: 350,
+                    easing: 'ease-in'
+                };
+            }
+
+            me.animate(Ext.applyIf({
+                to: {
+                    opacity: opacity
+                }
+            }, animate));
+        }
+        return me;
+    },
+
+    /**
+     * Clears any opacity settings from this element. Required in some cases for IE.
+     * @return {Ext.dom.Element} this
+     */
+    clearOpacity : function() {
+        return this.setOpacity('');
+    },
+
+    /**
+     * @private
+     * Returns 1 if the browser returns the subpixel dimension rounded to the lowest pixel.
+     * @return {Number} 0 or 1
+     */
+    adjustDirect2DDimension: function(dimension) {
+        var me = this,
+            dom = me.dom,
+            display = me.getStyle('display'),
+            inlineDisplay = dom.style.display,
+            inlinePosition = dom.style.position,
+            originIndex = dimension === WIDTH ? 0 : 1,
+            currentStyle = dom.currentStyle,
+            floating;
+
+        if (display === 'inline') {
+            dom.style.display = 'inline-block';
+        }
+
+        dom.style.position = display.match(adjustDirect2DTableRe) ? 'absolute' : 'static';
+
+        // floating will contain digits that appears after the decimal point
+        // if height or width are set to auto we fallback to msTransformOrigin calculation
+        
+        // Use currentStyle here instead of getStyle. In some difficult to reproduce 
+        // instances it resets the scrollWidth of the element
+        floating = (parseFloat(currentStyle[dimension]) || parseFloat(currentStyle.msTransformOrigin.split(' ')[originIndex]) * 2) % 1;
+
+        dom.style.position = inlinePosition;
+
+        if (display === 'inline') {
+            dom.style.display = inlineDisplay;
+        }
+
+        return floating;
+    },
+
+    /**
+     * Store the current overflow setting and clip overflow on the element - use {@link #unclip} to remove
+     * @return {Ext.dom.Element} this
+     */
+    clip : function() {
+        var me = this,
+            data = (me.$cache || me.getCache()).data,
+            style;
+
+        if (!data[ISCLIPPED]) {
+            data[ISCLIPPED] = true;
+            style = me.getStyle([OVERFLOW, OVERFLOWX, OVERFLOWY]);
+            data[ORIGINALCLIP] = {
+                o: style[OVERFLOW],
+                x: style[OVERFLOWX],
+                y: style[OVERFLOWY]
+            };
+            me.setStyle(OVERFLOW, HIDDEN);
+            me.setStyle(OVERFLOWX, HIDDEN);
+            me.setStyle(OVERFLOWY, HIDDEN);
+        }
+        return me;
+    },
+
+    /**
+     * Return clipping (overflow) to original clipping before {@link #clip} was called
+     * @return {Ext.dom.Element} this
+     */
+    unclip : function() {
+        var me = this,
+            data = (me.$cache || me.getCache()).data,
+            clip;
+
+        if (data[ISCLIPPED]) {
+            data[ISCLIPPED] = false;
+            clip = data[ORIGINALCLIP];
+            if (clip.o) {
+                me.setStyle(OVERFLOW, clip.o);
+            }
+            if (clip.x) {
+                me.setStyle(OVERFLOWX, clip.x);
+            }
+            if (clip.y) {
+                me.setStyle(OVERFLOWY, clip.y);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Wraps the specified element with a special 9 element markup/CSS block that renders by default as
+     * a gray container with a gradient background, rounded corners and a 4-way shadow.
+     *
+     * This special markup is used throughout Ext when box wrapping elements ({@link Ext.button.Button},
+     * {@link Ext.panel.Panel} when {@link Ext.panel.Panel#frame frame=true}, {@link Ext.window.Window}).
+     * The markup is of this form:
+     *
+     *     Ext.dom.Element.boxMarkup =
+     *     '<div class="{0}-tl"><div class="{0}-tr"><div class="{0}-tc"></div></div></div>
+     *     <div class="{0}-ml"><div class="{0}-mr"><div class="{0}-mc"></div></div></div>
+     *     <div class="{0}-bl"><div class="{0}-br"><div class="{0}-bc"></div></div></div>';
+     *
+     * Example usage:
+     *
+     *     // Basic box wrap
+     *     Ext.get("foo").boxWrap();
+     *
+     *     // You can also add a custom class and use CSS inheritance rules to customize the box look.
+     *     // 'x-box-blue' is a built-in alternative -- look at the related CSS definitions as an example
+     *     // for how to create a custom box wrap style.
+     *     Ext.get("foo").boxWrap().addCls("x-box-blue");
+     *
+     * @param {String} [class='x-box'] A base CSS class to apply to the containing wrapper element.
+     * Note that there are a number of CSS rules that are dependent on this name to make the overall effect work,
+     * so if you supply an alternate base class, make sure you also supply all of the necessary rules.
+     * @return {Ext.dom.Element} The outermost wrapping element of the created box structure.
+     */
+    boxWrap : function(cls) {
+        cls = cls || Ext.baseCSSPrefix + 'box';
+        var el = Ext.get(this.insertHtml("beforeBegin", "<div class='" + cls + "'>" + Ext.String.format(Element.boxMarkup, cls) + "</div>"));
+        Ext.DomQuery.selectNode('.' + cls + '-mc', el.dom).appendChild(this.dom);
+        return el;
+    },
+
+    /**
+     * Returns either the offsetHeight or the height of this element based on CSS height adjusted by padding or borders
+     * when needed to simulate offsetHeight when offsets aren't available. This may not work on display:none elements
+     * if a height has not been set using CSS.
+     * @return {Number}
+     */
+    getComputedHeight : function() {
+        var me = this,
+            h = Math.max(me.dom.offsetHeight, me.dom.clientHeight);
+        if (!h) {
+            h = parseFloat(me.getStyle(HEIGHT)) || 0;
+            if (!me.isBorderBox()) {
+                h += me.getFrameWidth('tb');
+            }
+        }
+        return h;
+    },
+
+    /**
+     * Returns either the offsetWidth or the width of this element based on CSS width adjusted by padding or borders
+     * when needed to simulate offsetWidth when offsets aren't available. This may not work on display:none elements
+     * if a width has not been set using CSS.
+     * @return {Number}
+     */
+    getComputedWidth : function() {
+        var me = this,
+            w = Math.max(me.dom.offsetWidth, me.dom.clientWidth);
+
+        if (!w) {
+            w = parseFloat(me.getStyle(WIDTH)) || 0;
+            if (!me.isBorderBox()) {
+                w += me.getFrameWidth('lr');
+            }
+        }
+        return w;
+    },
+
+    /**
+     * Returns the sum width of the padding and borders for the passed "sides". See getBorderWidth()
+     * for more information about the sides.
+     * @param {String} sides
+     * @return {Number}
+     */
+    getFrameWidth : function(sides, onlyContentBox) {
+        return (onlyContentBox && this.isBorderBox()) ? 0 : (this.getPadding(sides) + this.getBorderWidth(sides));
+    },
+
+    /**
+     * Sets up event handlers to add and remove a css class when the mouse is over this element
+     * @param {String} className The class to add
+     * @param {Function} [testFn] A test function to execute before adding the class. The passed parameter
+     * will be the Element instance. If this functions returns false, the class will not be added.
+     * @param {Object} [scope] The scope to execute the testFn in.
+     * @return {Ext.dom.Element} this
+     */
+    addClsOnOver : function(className, testFn, scope) {
+        var me = this,
+            dom = me.dom,
+            hasTest = Ext.isFunction(testFn);
+            
+        me.hover(
+            function() {
+                if (hasTest && testFn.call(scope || me, me) === false) {
+                    return;
+                }
+                Ext.fly(dom, INTERNAL).addCls(className);
+            },
+            function() {
+                Ext.fly(dom, INTERNAL).removeCls(className);
+            }
+        );
+        return me;
+    },
+
+    /**
+     * Sets up event handlers to add and remove a css class when this element has the focus
+     * @param {String} className The class to add
+     * @param {Function} [testFn] A test function to execute before adding the class. The passed parameter
+     * will be the Element instance. If this functions returns false, the class will not be added.
+     * @param {Object} [scope] The scope to execute the testFn in.
+     * @return {Ext.dom.Element} this
+     */
+    addClsOnFocus : function(className, testFn, scope) {
+        var me = this,
+            dom = me.dom,
+            hasTest = Ext.isFunction(testFn);
+            
+        me.on("focus", function() {
+            if (hasTest && testFn.call(scope || me, me) === false) {
+                return false;
+            }
+            Ext.fly(dom, INTERNAL).addCls(className);
+        });
+        me.on("blur", function() {
+            Ext.fly(dom, INTERNAL).removeCls(className);
+        });
+        return me;
+    },
+
+    /**
+     * Sets up event handlers to add and remove a css class when the mouse is down and then up on this element (a click effect)
+     * @param {String} className The class to add
+     * @param {Function} [testFn] A test function to execute before adding the class. The passed parameter
+     * will be the Element instance. If this functions returns false, the class will not be added.
+     * @param {Object} [scope] The scope to execute the testFn in.
+     * @return {Ext.dom.Element} this
+     */
+    addClsOnClick : function(className, testFn, scope) {
+        var me = this,
+            dom = me.dom,
+            hasTest = Ext.isFunction(testFn);
+            
+        me.on("mousedown", function() {
+            if (hasTest && testFn.call(scope || me, me) === false) {
+                return false;
+            }
+            Ext.fly(dom, INTERNAL).addCls(className);
+            var d = Ext.getDoc(),
+                fn = function() {
+                    Ext.fly(dom, INTERNAL).removeCls(className);
+                    d.removeListener("mouseup", fn);
+                };
+            d.on("mouseup", fn);
+        });
+        return me;
+    },
+
+    /**
+     * Returns the dimensions of the element available to lay content out in.
+     *
+     * getStyleSize utilizes prefers style sizing if present, otherwise it chooses the larger of offsetHeight/clientHeight and
+     * offsetWidth/clientWidth. To obtain the size excluding scrollbars, use getViewSize.
+     *
+     * Sizing of the document body is handled at the adapter level which handles special cases for IE and strict modes, etc.
+     *
+     * @return {Object} Object describing width and height.
+     * @return {Number} return.width
+     * @return {Number} return.height
+     */
+    getStyleSize : function() {
+        var me = this,
+            d = this.dom,
+            isDoc = DOCORBODYRE.test(d.nodeName),
+            s ,
+            w, h;
+
+        // If the body, use static methods
+        if (isDoc) {
+            return {
+                width : Element.getViewWidth(),
+                height : Element.getViewHeight()
+            };
+        }
+
+        s = me.getStyle([HEIGHT, WIDTH], true);  //seek inline
+        // Use Styles if they are set
+        if (s.width && s.width != 'auto') {
+            w = parseFloat(s.width);
+            if (me.isBorderBox()) {
+                w -= me.getFrameWidth('lr');
+            }
+        }
+        // Use Styles if they are set
+        if (s.height && s.height != 'auto') {
+            h = parseFloat(s.height);
+            if (me.isBorderBox()) {
+                h -= me.getFrameWidth('tb');
+            }
+        }
+        // Use getWidth/getHeight if style not set.
+        return {width: w || me.getWidth(true), height: h || me.getHeight(true)};
+    },
+
+    statics: {
+        selectableCls: Ext.baseCSSPrefix + 'selectable',
+        unselectableCls: Ext.baseCSSPrefix + 'unselectable'
+    },
+
+    /**
+     * Enable text selection for this element (normalized across browsers)
+     * @return {Ext.Element} this
+     */
+    selectable : function() {
+        var me = this;
+
+        // We clear this property for all browsers, not just Opera. This is so that rendering templates don't need to
+        // condition on Opera when making elements unselectable.
+        me.dom.unselectable = '';
+
+        me.removeCls(Element.unselectableCls);
+        me.addCls(Element.selectableCls);
+
+        return me;
+    },
+
+    /**
+     * Disables text selection for this element (normalized across browsers)
+     * @return {Ext.dom.Element} this
+     */
+    unselectable : function() {
+        // The approach used to disable text selection combines CSS, HTML attributes and DOM events. Importantly the
+        // strategy is designed to be expressible in markup, so that elements can be rendered unselectable without
+        // needing modifications post-render. e.g.:
+        //
+        // <div class="x-unselectable" unselectable="on"></div>
+        //
+        // Changes to this method may need to be reflected elsewhere, e.g. ProtoElement.
+        var me = this;
+
+        // The unselectable property (or similar) is supported by various browsers but Opera is the only browser that
+        // doesn't support any of the other techniques. The problem with it is that it isn't inherited by child
+        // elements. Theoretically we could add it to all children but the performance would be terrible. In certain
+        // key locations (e.g. panel headers) we add unselectable="on" to extra elements during rendering just for
+        // Opera's benefit.
+        if (Ext.isOpera) {
+            me.dom.unselectable = 'on';
+        }
+
+        // In Mozilla and WebKit the CSS properties -moz-user-select and -webkit-user-select prevent a selection
+        // originating in an element. These are inherited, which is what we want.
+        //
+        // In IE we rely on a listener for the selectstart event instead. We don't need to register a listener on the
+        // individual element, instead we use a single listener and rely on event propagation to listen for the event at
+        // the document level. That listener will walk up the DOM looking for nodes that have either of the classes
+        // x-selectable or x-unselectable. This simulates the CSS inheritance approach.
+        //
+        // IE 10 is expected to support -ms-user-select so the listener may not be required.
+        me.removeCls(Element.selectableCls);
+        me.addCls(Element.unselectableCls);
+
+        return me;
+    },
+
+    /**
+     * Changes this Element's state to "vertical" (rotated 90 or 270 degrees).
+     * This involves inverting the getters and setters for height and width,
+     * and applying hooks for rotating getters and setters for border/margin/padding.
+     * (getWidth becomes getHeight and vice versa), setStyle and getStyle will
+     * also return the inverse when height or width are being operated on.
+     * 
+     * @param {Number} angle the angle of rotation - either 90 or 270
+     * @param {String} cls an optional css class that contains the required
+     * styles for switching the element to vertical orientation. Omit this if
+     * the element already contains vertical styling.  If cls is provided,
+     * it will be removed from the element when {@link #setHorizontal} is called.
+     * @private
+     */
+    setVertical: function(angle, cls) {
+        var me = this,
+            proto = Element.prototype,
+            hooks;
+
+        me.vertical = true;
+        if (cls) {
+            me.addCls(me.verticalCls = cls);
+        }
+
+        me.setWidth = proto.setHeight;
+        me.setHeight = proto.setWidth;
+        if (!Ext.isIE9m) {
+            // In browsers that use CSS3 transforms we must invert getHeight and
+            // get Width. In IE9 and below no adjustment is needed because we use
+            // a BasicImage filter to rotate the element and the element's
+            // offsetWidth and offsetHeight are automatically inverted.
+            me.getWidth = proto.getHeight;
+            me.getHeight = proto.getWidth;
+        }
+
+        // Switch to using the appropriate vertical style hooks
+        me.styleHooks = (angle === 270) ?
+            Element.prototype.verticalStyleHooks270 : Element.prototype.verticalStyleHooks90;
+    },
+
+    /**
+     * Removes "vertical" state from this element (reverses everything done
+     * by {@link #setVertical}).
+     * @private
+     */
+    setHorizontal: function() {
+        var me = this,
+            cls = me.verticalCls;
+
+        delete me.vertical;
+        if (cls) {
+            delete me.verticalCls;
+            me.removeCls(cls);
+        }
+
+        // delete the inverted methods and revert to inheriting from the prototype 
+        delete me.setWidth;
+        delete me.setHeight;
+        if (!Ext.isIE9m) {
+            delete me.getWidth;
+            delete me.getHeight;
+        }
+
+        // revert to inheriting styleHooks from the prototype
+        delete me.styleHooks;
+    }
+});
+
+Element.prototype.styleHooks = styleHooks = Ext.dom.AbstractElement.prototype.styleHooks;
+
+// When elements are rotated 80 or 270 degrees, their border, margin and padding hooks
+// need to be rotated as well.
+Element.prototype.verticalStyleHooks90 = verticalStyleHooks90 = Ext.Object.chain(Element.prototype.styleHooks);
+Element.prototype.verticalStyleHooks270 = verticalStyleHooks270 = Ext.Object.chain(Element.prototype.styleHooks);
+
+verticalStyleHooks90.width = { name: 'height' };
+verticalStyleHooks90.height = { name: 'width' };
+verticalStyleHooks90['margin-top'] = { name: 'marginLeft' };
+verticalStyleHooks90['margin-right'] = { name: 'marginTop' };
+verticalStyleHooks90['margin-bottom'] = { name: 'marginRight' };
+verticalStyleHooks90['margin-left'] = { name: 'marginBottom' };
+verticalStyleHooks90['padding-top'] = { name: 'paddingLeft' };
+verticalStyleHooks90['padding-right'] = { name: 'paddingTop' };
+verticalStyleHooks90['padding-bottom'] = { name: 'paddingRight' };
+verticalStyleHooks90['padding-left'] = { name: 'paddingBottom' };
+verticalStyleHooks90['border-top'] = { name: 'borderLeft' };
+verticalStyleHooks90['border-right'] = { name: 'borderTop' };
+verticalStyleHooks90['border-bottom'] = { name: 'borderRight' };
+verticalStyleHooks90['border-left'] = { name: 'borderBottom' };
+
+verticalStyleHooks270.width = { name: 'height' };
+verticalStyleHooks270.height = { name: 'width' };
+verticalStyleHooks270['margin-top'] = { name: 'marginRight' };
+verticalStyleHooks270['margin-right'] = { name: 'marginBottom' };
+verticalStyleHooks270['margin-bottom'] = { name: 'marginLeft' };
+verticalStyleHooks270['margin-left'] = { name: 'marginTop' };
+verticalStyleHooks270['padding-top'] = { name: 'paddingRight' };
+verticalStyleHooks270['padding-right'] = { name: 'paddingBottom' };
+verticalStyleHooks270['padding-bottom'] = { name: 'paddingLeft' };
+verticalStyleHooks270['padding-left'] = { name: 'paddingTop' };
+verticalStyleHooks270['border-top'] = { name: 'borderRight' };
+verticalStyleHooks270['border-right'] = { name: 'borderBottom' };
+verticalStyleHooks270['border-bottom'] = { name: 'borderLeft' };
+verticalStyleHooks270['border-left'] = { name: 'borderTop' };
+
+if (Ext.isIE7m) {
+    styleHooks.fontSize = styleHooks['font-size'] = {
+        name: 'fontSize',
+        canThrow: true
+    };
+    
+    styleHooks.fontStyle = styleHooks['font-style'] = {
+        name: 'fontStyle',
+        canThrow: true
+    };
+    
+    styleHooks.fontFamily = styleHooks['font-family'] = {
+        name: 'fontFamily',
+        canThrow: true
+    };
+}
+
+// override getStyle for border-*-width
+if (Ext.isIEQuirks || Ext.isIE && Ext.ieVersion <= 8) {
+    function getBorderWidth (dom, el, inline, style) {
+        if (style[this.styleName] == 'none') {
+            return '0px';
+        }
+        return style[this.name];
+    }
+
+    edges = ['Top','Right','Bottom','Left'];
+    k = edges.length;
+
+    while (k--) {
+        edge = edges[k];
+        borderWidth = 'border' + edge + 'Width';
+
+        styleHooks['border-'+edge.toLowerCase()+'-width'] = styleHooks[borderWidth] = {
+            name: borderWidth,
+            styleName: 'border' + edge + 'Style',
+            get: getBorderWidth
+        };
+    }
+}
+
+// The following hack is needed to support padding on dom elements with display:table.
+// It was added because at one point auto layout's "outerCt" element had padding applied
+// to it. The padding is now appplied to the innerCt which is display:table-cell, so this
+// hack is not currently needed.
+//if (Ext.isIE9 && Ext.isStrict) {
+//    // In IE9, getComputedStyle always returns 0px for padding if the element has
+//    // "display:table", so we use currentStyle instead.
+//    var names = {
+//            padding: 'padding',
+//            paddingTop: 'padding-top',
+//            paddingRight: 'padding-right',
+//            paddingBottom: 'padding-bottom',
+//            paddingLeft: 'padding-left'
+//        },
+//        createHook = function(name, camelCaseName) {
+//            styleHooks[name] = styleHooks[camelCaseName] = {
+//                name: name,
+//                get: function(dom) {
+//                    return dom.currentStyle[name];
+//                }
+//            }
+//        },
+//        camelCaseName;
+//
+//    for (camelCaseName in names) {
+//        createHook(names[camelCaseName], camelCaseName);
+//    }
+//}
+
+// Element.unselectable relies on this listener to prevent selection in IE. Some other browsers support the event too
+// but it is only strictly required for IE. In WebKit this listener causes subtle differences to how the browser handles
+// the non-selection, e.g. whether or not the mouse cursor changes when attempting to select text.
+Ext.getDoc().on('selectstart', function(ev, dom) {
+    var doc = document.documentElement,
+        selectableCls = Element.selectableCls,
+        unselectableCls = Element.unselectableCls,
+        tagName = dom && dom.tagName;
+
+    tagName = tagName && tagName.toLowerCase();
+
+    // Element.unselectable is not really intended to handle selection within text fields and it is important that
+    // fields inside menus or panel headers don't inherit the unselectability. In most browsers this is automatic but in
+    // IE 9 the selectstart event can bubble up from text fields so we have to explicitly handle that case.
+    if (tagName === 'input' || tagName === 'textarea') {
+        return;
+    }
+
+    // Walk up the DOM checking the nodes. This may be 'slow' but selectstart events don't fire very often
+    while (dom && dom.nodeType === 1 && dom !== doc) {
+        var el = Ext.fly(dom);
+
+        // If the node has the class x-selectable then stop looking, the text selection is allowed
+        if (el.hasCls(selectableCls)) {
+            return;
+        }
+
+        // If the node has class x-unselectable then the text selection needs to be stopped
+        if (el.hasCls(unselectableCls)) {
+            ev.stopEvent();
+            return;
+        }
+
+        dom = dom.parentNode;
+    }
+});
+
+});
+
+Ext.onReady(function () {
+    var opacityRe = /alpha\(opacity=(.*)\)/i,
+        trimRe = /^\s+|\s+$/g,
+        hooks = Ext.dom.Element.prototype.styleHooks;
+
+    // Ext.supports flags are not populated until onReady...
+    hooks.opacity = {
+        name: 'opacity',
+        afterSet: function(dom, value, el) {
+            if (el.isLayer) {
+                el.onOpacitySet(value);
+            }
+        }
+    };
+    if (!Ext.supports.Opacity && Ext.isIE) {
+        Ext.apply(hooks.opacity, {
+            get: function (dom) {
+                var filter = dom.style.filter,
+                    match, opacity;
+                if (filter.match) {
+                    match = filter.match(opacityRe);
+                    if (match) {
+                        opacity = parseFloat(match[1]);
+                        if (!isNaN(opacity)) {
+                            return opacity ? opacity / 100 : 0;
+                        }
+                    }
+                }
+                return 1;
+            },
+            set: function (dom, value) {
+                var style = dom.style,
+                    val = style.filter.replace(opacityRe, '').replace(trimRe, '');
+
+                style.zoom = 1; // ensure dom.hasLayout
+
+                // value can be a number or '' or null... so treat falsey as no opacity
+                if (typeof(value) == 'number' && value >= 0 && value < 1) {
+                    value *= 100;
+                    style.filter = val + (val.length ? ' ' : '') + 'alpha(opacity='+value+')';
+                } else {
+                    style.filter = val;
+                }
+            }  
+        });
+    }
+    // else there is no work around for the lack of opacity support. Should not be a
+    // problem given that this has been supported for a long time now...
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag core
+/**
+ * This mixin provides a common interface for objects that can be positioned, e.g.
+ * {@link Ext.Component Components} and {@link Ext.dom.Element Elements}
+ */
+Ext.define('Ext.util.Positionable', {
+
+    _positionTopLeft: ['position', 'top', 'left'],
+
+    _alignRe: /^([a-z]+)-([a-z]+)(\?)?$/,
+
+    // Stub implementation called after positioning.
+    // May be implemented in subclasses. AbstractComponent has an implementation.
+    afterSetPosition: Ext.emptyFn,
+
+    // ***********************
+    // Begin Abstract Methods
+    // ***********************
+
+    /**
+     * Gets the x,y coordinates of an element specified by the anchor position on the
+     * element.
+     * @param {Ext.dom.Element} el The element
+     * @param {String} [anchor='tl'] The specified anchor position.
+     * See {@link #alignTo} for details on supported anchor positions.
+     * @param {Boolean} [local] True to get the local (element top/left-relative) anchor
+     * position instead of page coordinates
+     * @param {Object} [size] An object containing the size to use for calculating anchor
+     * position {width: (target width), height: (target height)} (defaults to the
+     * element's current size)
+     * @return {Number[]} [x, y] An array containing the element's x and y coordinates
+     * @private
+     */
+    getAnchorToXY: function() {
+        Ext.Error.raise("getAnchorToXY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Returns the size of the element's borders and padding.
+     * @return {Object} an object with the following numeric properties
+     * - beforeX
+     * - afterX
+     * - beforeY
+     * - afterY
+     * @private
+     */
+    getBorderPadding: function() {
+        Ext.Error.raise("getBorderPadding is not implemented in " + this.$className);
+    },
+
+    /**
+     * Returns the x coordinate of this element reletive to its `offsetParent`.
+     * @return {Number} The local x coordinate
+     */
+    getLocalX: function() {
+        Ext.Error.raise("getLocalX is not implemented in " + this.$className);
+    },
+
+    /**
+     * Returns the x and y coordinates of this element relative to its `offsetParent`.
+     * @return {Number[]} The local XY position of the element
+     */
+    getLocalXY: function() {
+        Ext.Error.raise("getLocalXY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Returns the y coordinate of this element reletive to its `offsetParent`.
+     * @return {Number} The local y coordinate
+     */
+    getLocalY: function() {
+        Ext.Error.raise("getLocalY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Gets the current X position of the DOM element based on page coordinates.
+     * @return {Number} The X position of the element
+     */
+    getX: function() {
+        Ext.Error.raise("getX is not implemented in " + this.$className);
+    },
+
+    /**
+     * Gets the current position of the DOM element based on page coordinates.
+     * @return {Number[]} The XY position of the element
+     */
+    getXY: function() {
+        Ext.Error.raise("getXY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Gets the current Y position of the DOM element based on page coordinates.
+     * @return {Number} The Y position of the element
+     */
+    getY: function() {
+        Ext.Error.raise("getY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Sets the local x coordinate of this element using CSS style. When used on an
+     * absolute positioned element this method is symmetrical with {@link #getLocalX}, but
+     * may not be symmetrical when used on a relatively positioned element.
+     * @param {Number} x The x coordinate. A value of `null` sets the left style to 'auto'.
+     * @return {Ext.util.Positionable} this
+     */
+    setLocalX: function() {
+        Ext.Error.raise("setLocalX is not implemented in " + this.$className);
+    },
+
+    /**
+     * Sets the local x and y coordinates of this element using CSS style. When used on an
+     * absolute positioned element this method is symmetrical with {@link #getLocalXY}, but
+     * may not be symmetrical when used on a relatively positioned element.
+     * @param {Number/Array} x The x coordinate or an array containing [x, y]. A value of
+     * `null` sets the left style to 'auto'
+     * @param {Number} [y] The y coordinate, required if x is not an array. A value of
+     * `null` sets the top style to 'auto'
+     * @return {Ext.util.Positionable} this
+     */
+    setLocalXY: function() {
+        Ext.Error.raise("setLocalXY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Sets the local y coordinate of this element using CSS style. When used on an
+     * absolute positioned element this method is symmetrical with {@link #getLocalY}, but
+     * may not be symmetrical when used on a relatively positioned element.
+     * @param {Number} y The y coordinate. A value of `null` sets the top style to 'auto'.
+     * @return {Ext.util.Positionable} this
+     */
+    setLocalY: function() {
+        Ext.Error.raise("setLocalY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Sets the X position of the DOM element based on page coordinates.
+     * @param {Number} The X position
+     * @param {Boolean/Object} [animate] True for the default animation, or a standard
+     * Element animation config object
+     * @return {Ext.util.Positionable} this
+     */
+    setX: function() {
+        Ext.Error.raise("setX is not implemented in " + this.$className);
+    },
+
+    /**
+     * Sets the position of the DOM element in page coordinates.
+     * @param {Number[]} pos Contains X & Y [x, y] values for new position (coordinates
+     * are page-based)
+     * @param {Boolean/Object} [animate] True for the default animation, or a standard
+     * Element animation config object
+     * @return {Ext.util.Positionable} this
+     */
+    setXY: function() {
+        Ext.Error.raise("setXY is not implemented in " + this.$className);
+    },
+
+    /**
+     * Sets the Y position of the DOM element based on page coordinates.
+     * @param {Number} The Y position
+     * @param {Boolean/Object} [animate] True for the default animation, or a standard
+     * Element animation config object
+     * @return {Ext.util.Positionable} this
+     */
+    setY: function() {
+        Ext.Error.raise("setY is not implemented in " + this.$className);
+    },
+
+    // ***********************
+    // End Abstract Methods
+    // ***********************
+
+    // private ==>  used outside of core
+    // TODO: currently only used by ToolTip. does this method belong here?
+    adjustForConstraints: function(xy, parent) {
+        var vector = this.getConstrainVector(parent, xy);
+        if (vector) {
+            xy[0] += vector[0];
+            xy[1] += vector[1];
+        }
+        return xy;
+    },
+
+    /**
+     * Aligns the element with another element relative to the specified anchor points. If
+     * the other element is the document it aligns it to the viewport. The position
+     * parameter is optional, and can be specified in any one of the following formats:
+     *
+     * - **Blank**: Defaults to aligning the element's top-left corner to the target's
+     *   bottom-left corner ("tl-bl").
+     * - **One anchor (deprecated)**: The passed anchor position is used as the target
+     *   element's anchor point.  The element being aligned will position its top-left
+     *   corner (tl) to that point. *This method has been deprecated in favor of the newer
+     *   two anchor syntax below*.
+     * - **Two anchors**: If two values from the table below are passed separated by a dash,
+     *   the first value is used as the element's anchor point, and the second value is
+     *   used as the target's anchor point.
+     *
+     * In addition to the anchor points, the position parameter also supports the "?"
+     * character. If "?" is passed at the end of the position string, the element will
+     * attempt to align as specified, but the position will be adjusted to constrain to
+     * the viewport if necessary. Note that the element being aligned might be swapped to
+     * align to a different position than that specified in order to enforce the viewport
+     * constraints. Following are all of the supported anchor positions:
+     *
+     * <pre>
+     * Value  Description
+     * -----  -----------------------------
+     * tl     The top left corner (default)
+     * t      The center of the top edge
+     * tr     The top right corner
+     * l      The center of the left edge
+     * c      In the center of the element
+     * r      The center of the right edge
+     * bl     The bottom left corner
+     * b      The center of the bottom edge
+     * br     The bottom right corner
+     * </pre>
+     *
+     * Example Usage:
+     *
+     *     // align el to other-el using the default positioning
+     *     // ("tl-bl", non-constrained)
+     *     el.alignTo("other-el");
+     *
+     *     // align the top left corner of el with the top right corner of other-el
+     *     // (constrained to viewport)
+     *     el.alignTo("other-el", "tr?");
+     *
+     *     // align the bottom right corner of el with the center left edge of other-el
+     *     el.alignTo("other-el", "br-l?");
+     *
+     *     // align the center of el with the bottom left corner of other-el and
+     *     // adjust the x position by -6 pixels (and the y position by 0)
+     *     el.alignTo("other-el", "c-bl", [-6, 0]);
+     *
+     * @param {Ext.util.Positionable/HTMLElement/String} element The Positionable,
+     * HTMLElement, or id of the element to align to.
+     * @param {String} [position="tl-bl?"] The position to align to
+     * @param {Number[]} [offsets] Offset the positioning by [x, y]
+     * @param {Boolean/Object} [animate] true for the default animation or a standard
+     * Element animation config object
+     * @return {Ext.util.Positionable} this
+     */
+    alignTo: function(element, position, offsets, animate) {
+        var me = this,
+            el = me.el;
+
+        return me.setXY(me.getAlignToXY(element, position, offsets),
+                el.anim && !!animate ? el.anim(animate) : false);
+    },
+
+    /**
+     * Anchors an element to another element and realigns it when the window is resized.
+     * @param {Ext.util.Positionable/HTMLElement/String} element The Positionable,
+     * HTMLElement, or id of the element to align to.
+     * @param {String} [position="tl-bl?"] The position to align to
+     * @param {Number[]} [offsets] Offset the positioning by [x, y]
+     * @param {Boolean/Object} [animate] true for the default animation or a standard
+     * Element animation config object
+     * @param {Boolean/Number} [monitorScroll=50] True to monitor body scroll and
+     * reposition. If this parameter is a number, it is used as the buffer delay in
+     * milliseconds.
+     * @param {Function} [callback] The function to call after the animation finishes
+     * @return {Ext.util.Positionable} this
+     */
+    anchorTo: function(anchorToEl, alignment, offsets, animate, monitorScroll, callback) {
+        var me = this,
+            scroll = !Ext.isEmpty(monitorScroll),
+            action = function() {
+                me.alignTo(anchorToEl, alignment, offsets, animate);
+                Ext.callback(callback, me);
+            },
+            anchor = me.getAnchor();
+
+        // previous listener anchor, remove it
+        me.removeAnchor();
+        Ext.apply(anchor, {
+            fn: action,
+            scroll: scroll
+        });
+
+        Ext.EventManager.onWindowResize(action, null);
+
+        if (scroll) {
+            Ext.EventManager.on(window, 'scroll', action, null,
+                    {buffer: !isNaN(monitorScroll) ? monitorScroll : 50});
+        }
+        action(); // align immediately
+        return me;
+    },
+
+    /**
+     * Calculates x,y coordinates specified by the anchor position on the element, adding
+     * extraX and extraY values.
+     * @param {String} [anchor='tl'] The specified anchor position.
+     * See {@link #alignTo} for details on supported anchor positions.
+     * @param {Number} [extraX] value to be added to the x coordinate
+     * @param {Number} [extraY] value to be added to the y coordinate
+     * @param {Object} [size] An object containing the size to use for calculating anchor
+     * position {width: (target width), height: (target height)} (defaults to the
+     * element's current size) 
+     * @return {Number[]} [x, y] An array containing the element's x and y coordinates
+     * @private
+     */
+    calculateAnchorXY: function(anchor, extraX, extraY, mySize) {
+        //Passing a different size is useful for pre-calculating anchors,
+        //especially for anchored animations that change the el size.
+        var me = this,
+            el = me.el,
+            doc = document,
+            isViewport = el.dom == doc.body || el.dom == doc,
+            round = Math.round,
+            xy, myWidth, myHeight;
+
+        anchor = (anchor || "tl").toLowerCase();
+        mySize = mySize || {};
+
+        myWidth = mySize.width || isViewport ? Ext.Element.getViewWidth() : me.getWidth();
+        myHeight = mySize.height || isViewport ? Ext.Element.getViewHeight() : me.getHeight();
+
+        // Calculate anchor position.
+        // Test most common cases for picker alignment first.
+        switch (anchor) {
+            case 'tl' : xy = [0, 0];
+                        break;
+            case 'bl' : xy = [0, myHeight];
+                        break;
+            case 'tr' : xy = [myWidth, 0];
+                        break;
+            case 'c'  : xy = [round(myWidth * 0.5), round(myHeight * 0.5)];
+                        break;
+            case 't'  : xy = [round(myWidth * 0.5), 0];
+                        break;
+            case 'l'  : xy = [0, round(myHeight * 0.5)];
+                        break;
+            case 'r'  : xy = [myWidth, round(myHeight * 0.5)];
+                        break;
+            case 'b'  : xy = [round(myWidth * 0.5), myHeight];
+                        break;
+            case 'tc' : xy = [round(myWidth * 0.5), 0];
+                        break;
+            case 'bc' : xy = [round(myWidth * 0.5), myHeight];
+                        break;
+            case 'br' : xy = [myWidth, myHeight];
+        }
+        return [xy[0] + extraX, xy[1] + extraY];
+    },
+
+    /**
+     * By default this method does nothing but return the position spec passed to it. In
+     * rtl mode it is overridden to convert "l" to "r" and vice versa when required.
+     * @private
+     */
+    convertPositionSpec: Ext.identityFn,
+
+    /**
+     * Gets the x,y coordinates to align this element with another element. See
+     * {@link #alignTo} for more info on the supported position values.
+     * @param {Ext.util.Positionable/HTMLElement/String} element The Positionable,
+     * HTMLElement, or id of the element to align to.
+     * @param {String} [position="tl-bl?"] The position to align to
+     * @param {Number[]} [offsets] Offset the positioning by [x, y]
+     * @return {Number[]} [x, y]
+     */
+    getAlignToXY: function(alignToEl, posSpec, offset) {
+        var me = this,
+            viewportWidth = Ext.Element.getViewWidth() - 10, // 10px of margin for ie
+            viewportHeight = Ext.Element.getViewHeight() - 10, // 10px of margin for ie
+            doc = document,
+            docElement = doc.documentElement,
+            docBody = doc.body,
+            scrollX = (docElement.scrollLeft || docBody.scrollLeft || 0),
+            scrollY = (docElement.scrollTop  || docBody.scrollTop  || 0),
+            alignMatch, myPosition, alignToElPosition, myWidth, myHeight,
+            alignToElRegion, swapY, swapX, constrain, align1, align2,
+            p1y, p1x, p2y, p2x, x, y;
+
+        alignToEl = Ext.get(alignToEl.el || alignToEl);
+
+        if (!alignToEl || !alignToEl.dom) {
+            Ext.Error.raise({
+                sourceClass: 'Ext.util.Positionable',
+                sourceMethod: 'getAlignToXY',
+                msg: 'Attempted to align an element that doesn\'t exist'
+            });
+        }
+
+        offset = offset || [0,0];
+        posSpec = (!posSpec || posSpec == "?" ? "tl-bl?" :
+            (!(/-/).test(posSpec) && posSpec !== "" ? "tl-" + posSpec : posSpec || "tl-bl")).toLowerCase();
+
+        posSpec = me.convertPositionSpec(posSpec);
+
+        alignMatch = posSpec.match(me._alignRe);
+
+        if (!alignMatch) {
+            Ext.Error.raise({
+                sourceClass: 'Ext.util.Positionable',
+                sourceMethod: 'getAlignToXY',
+                el: alignToEl,
+                position: posSpec,
+                offset: offset,
+                msg: 'Attemmpted to align an element with an invalid position: "' + posSpec + '"'
+            });
+        }
+
+        align1 = alignMatch[1];
+        align2 = alignMatch[2];
+        constrain = !!alignMatch[3];
+
+        //Subtract the aligned el's internal xy from the target's offset xy
+        //plus custom offset to get this Element's new offset xy
+        myPosition = me.getAnchorXY(align1, true);
+        alignToElPosition = me.getAnchorToXY(alignToEl, align2, false);
+
+        x = alignToElPosition[0] - myPosition[0] + offset[0];
+        y = alignToElPosition[1] - myPosition[1] + offset[1];
+
+        // If position spec ended with a "?", then constrain to viewport is necessary
+        if (constrain) {
+            myWidth = me.getWidth();
+            myHeight = me.getHeight();
+            alignToElRegion = alignToEl.getRegion();
+            // If we are at a viewport boundary and the aligned el is anchored
+            // on a target border that is perpendicular to the vp border,
+            // allow the aligned el to slide on that border, otherwise swap
+            // the aligned el to the opposite border of the target.
+            p1y = align1.charAt(0);
+            p1x = align1.charAt(align1.length - 1);
+            p2y = align2.charAt(0);
+            p2x = align2.charAt(align2.length - 1);
+            swapY = ((p1y == "t" && p2y == "b") || (p1y == "b" && p2y == "t"));
+            swapX = ((p1x == "r" && p2x == "l") || (p1x == "l" && p2x == "r"));
+
+            if (x + myWidth > viewportWidth + scrollX) {
+                x = swapX ? alignToElRegion.left - myWidth : viewportWidth + scrollX - myWidth;
+            }
+            if (x < scrollX) {
+                x = swapX ? alignToElRegion.right : scrollX;
+            }
+            if (y + myHeight > viewportHeight + scrollY) {
+                y = swapY ? alignToElRegion.top - myHeight : viewportHeight + scrollY - myHeight;
+            }
+            if (y < scrollY) {
+                y = swapY ? alignToElRegion.bottom : scrollY;
+            }
+        }
+        return [x,y];
+    },
+
+    // private
+    getAnchor: function(){
+        var el = this.el,
+            data = (el.$cache || el.getCache()).data,
+            anchor;
+            
+        if (!el.dom) {
+            return;
+        }
+        anchor = data._anchor;
+
+        if(!anchor){
+            anchor = data._anchor = {};
+        }
+        return anchor;
+    },
+
+    /**
+     * Gets the x,y coordinates specified by the anchor position on the element.
+     * @param {String} [anchor='tl'] The specified anchor position.
+     * See {@link #alignTo} for details on supported anchor positions.
+     * @param {Boolean} [local] True to get the local (element top/left-relative) anchor
+     * position instead of page coordinates
+     * @param {Object} [size] An object containing the size to use for calculating anchor
+     * position {width: (target width), height: (target height)} (defaults to the
+     * element's current size)
+     * @return {Number[]} [x, y] An array containing the element's x and y coordinates
+     */
+    getAnchorXY: function(anchor, local, mySize) {
+        var me = this,
+            myPos = me.getXY(),
+            el = me.el,
+            doc = document,
+            isViewport = el.dom == doc.body || el.dom == doc,
+            scroll = el.getScroll(),
+            extraX = isViewport ? scroll.left : local ? 0 : myPos[0],
+            extraY = isViewport ? scroll.top : local ? 0 : myPos[1];
+
+        return me.calculateAnchorXY(anchor, extraX, extraY, mySize);
+    },
+
+    /**
+     * Return an object defining the area of this Element which can be passed to
+     * {@link #setBox} to set another Element's size/location to match this element.
+     *
+     * @param {Boolean} [contentBox] If true a box for the content of the element is
+     * returned.
+     * @param {Boolean} [local] If true the element's left and top relative to its
+     * `offsetParent` are returned instead of page x/y.
+     * @return {Object} box An object in the format:
+     *
+     *     {
+     *         x: <Element's X position>,
+     *         y: <Element's Y position>,
+     *         left: <Element's X position (an alias for x)>,
+     *         top: <Element's Y position (an alias for y)>,
+     *         width: <Element's width>,
+     *         height: <Element's height>,
+     *         bottom: <Element's lower bound>,
+     *         right: <Element's rightmost bound>
+     *     }
+     *
+     * The returned object may also be addressed as an Array where index 0 contains the X
+     * position and index 1 contains the Y position. The result may also be used for
+     * {@link #setXY}
+     */
+    getBox: function(contentBox, local) {
+        var me = this,
+            xy = local ? me.getLocalXY() : me.getXY(),
+            x = xy[0],
+            y = xy[1],
+            w = me.getWidth(),
+            h = me.getHeight(),
+            borderPadding, beforeX, beforeY;
+
+        if (contentBox) {
+            borderPadding = me.getBorderPadding();
+            beforeX = borderPadding.beforeX;
+            beforeY = borderPadding.beforeY;
+
+            x += beforeX;
+            y += beforeY;
+            w -= (beforeX + borderPadding.afterX);
+            h -= (beforeY + borderPadding.afterY);
+        }
+
+        return {
+            x: x,
+            left: x,
+            0: x,
+            y: y,
+            top: y,
+            1: y,
+            width: w,
+            height: h,
+            right: x + w,
+            bottom: y + h
+        };
+    },
+
+    /**
+     * Calculates the new [x,y] position to move this Positionable into a constrain region.
+     *
+     * By default, this Positionable is constrained to be within the container it was added to, or the element it was
+     * rendered to.
+     *
+     * Priority is given to constraining the top and left within the constraint.
+     *
+     * An alternative constraint may be passed.
+     * @param {String/HTMLElement/Ext.Element/Ext.util.Region} [constrainTo] The Element or {@link Ext.util.Region Region}
+     * into which this Component is to be constrained. Defaults to the element into which this Positionable
+     * was rendered, or this Component's {@link Ext.Component#constrainTo.
+     * @param {Number[]} [proposedPosition] A proposed `[X, Y]` position to test for validity
+     * and to coerce into constraints instead of using this Positionable's current position.
+     * @param {Boolean} [local] The proposedPosition is local *(relative to floatParent if a floating Component)*
+     * @param {Number[]} [proposedSize] A proposed `[width, height]` size to use when calculating
+     * constraints instead of using this Positionable's current size.
+     * @return {Number[]} **If** the element *needs* to be translated, the new `[X, Y]` position within
+     * constraints if possible, giving priority to keeping the top and left edge in the constrain region.
+     * Otherwise, `false`.
+     */
+    calculateConstrainedPosition: function(constrainTo, proposedPosition, local, proposedSize) {
+        var me = this,
+            vector,
+            fp = me.floatParent,
+            parentNode = fp ? fp.getTargetEl() : null,
+            parentOffset,
+            borderPadding,
+            proposedConstrainPosition,
+            xy = false;
+
+        if (local && fp) {
+            parentOffset = parentNode.getXY();
+            borderPadding = parentNode.getBorderPadding();
+            parentOffset[0] += borderPadding.beforeX;
+            parentOffset[1] += borderPadding.beforeY;
+            if (proposedPosition) {
+                proposedConstrainPosition = [proposedPosition[0] + parentOffset[0], proposedPosition[1] + parentOffset[1]];
+            }
+        } else {
+            proposedConstrainPosition = proposedPosition;
+        }
+        // Calculate the constrain vector to coerce our position to within our
+        // constrainTo setting. getConstrainVector will provide a default constraint
+        // region if there is no explicit constrainTo, *and* there is no floatParent owner Component.
+        constrainTo = constrainTo || me.constrainTo || parentNode || me.container || me.el.parent();
+        vector = (me.constrainHeader ? me.header : me).getConstrainVector(constrainTo, proposedConstrainPosition, proposedSize);
+
+        // false is returned if no movement is needed
+        if (vector) {
+            xy = proposedPosition || me.getPosition(local);
+            xy[0] += vector[0];
+            xy[1] += vector[1];
+        }
+        return xy;
+    },
+
+    /**
+     * Returns the `[X, Y]` vector by which this Positionable's element must be translated to make a best
+     * attempt to constrain within the passed constraint. Returns `false` if the element
+     * does not need to be moved.
+     *
+     * Priority is given to constraining the top and left within the constraint.
+     *
+     * The constraint may either be an existing element into which the element is to be
+     * constrained, or a {@link Ext.util.Region Region} into which this element is to be
+     * constrained.
+     *
+     * By default, any extra shadow around the element is **not** included in the constrain calculations - the edges
+     * of the element are used as the element bounds. To constrain the shadow within the constrain region, set the
+     * `constrainShadow` property on this element to `true`.
+     *
+     * @param {Ext.util.Positionable/HTMLElement/String/Ext.util.Region} [constrainTo] The
+     * Positionable, HTMLElement, element id, or Region into which the element is to be
+     * constrained.
+     * @param {Number[]} [proposedPosition] A proposed `[X, Y]` position to test for validity
+     * and to produce a vector for instead of using the element's current position
+     * @param {Number[]} [proposedSize] A proposed `[width, height]` size to constrain
+     * instead of using the element's current size
+     * @return {Number[]/Boolean} **If** the element *needs* to be translated, an `[X, Y]`
+     * vector by which this element must be translated. Otherwise, `false`.
+     */
+    getConstrainVector: function(constrainTo, proposedPosition, proposedSize) {
+        var thisRegion = this.getRegion(),
+            vector = [0, 0],
+            shadowSize = (this.shadow && this.constrainShadow && !this.shadowDisabled) ? this.shadow.getShadowSize() : undefined,
+            overflowed = false,
+            constraintInsets = this.constraintInsets;
+
+        if (!(constrainTo instanceof Ext.util.Region)) {
+            constrainTo = Ext.get(constrainTo.el || constrainTo).getViewRegion();
+        }
+
+        // Apply constraintInsets
+        if (constraintInsets) {
+            constraintInsets = Ext.isObject(constraintInsets) ? constraintInsets : Ext.Element.parseBox(constraintInsets);
+            constrainTo.adjust(constraintInsets.top, constraintInsets.right, constraintInsets.bottom, constraintInsets.length);
+        }
+
+        // Shift this region to occupy the proposed position
+        if (proposedPosition) {
+            thisRegion.translateBy(proposedPosition[0] - thisRegion.x, proposedPosition[1] - thisRegion.y);
+        }
+        // Set the size of this region to the proposed size
+        if (proposedSize) {
+            thisRegion.right = thisRegion.left + proposedSize[0];
+            thisRegion.bottom = thisRegion.top + proposedSize[1];
+        }
+
+        // Reduce the constrain region to allow for shadow
+        if (shadowSize) {
+            constrainTo.adjust(shadowSize[0], -shadowSize[1], -shadowSize[2], shadowSize[3]);
+        }
+
+        // Constrain the X coordinate by however much this Element overflows
+        if (thisRegion.right > constrainTo.right) {
+            overflowed = true;
+            vector[0] = (constrainTo.right - thisRegion.right);    // overflowed the right
+        }
+        if (thisRegion.left + vector[0] < constrainTo.left) {
+            overflowed = true;
+            vector[0] = (constrainTo.left - thisRegion.left);      // overflowed the left
+        }
+
+        // Constrain the Y coordinate by however much this Element overflows
+        if (thisRegion.bottom > constrainTo.bottom) {
+            overflowed = true;
+            vector[1] = (constrainTo.bottom - thisRegion.bottom);  // overflowed the bottom
+        }
+        if (thisRegion.top + vector[1] < constrainTo.top) {
+            overflowed = true;
+            vector[1] = (constrainTo.top - thisRegion.top);        // overflowed the top
+        }
+        return overflowed ? vector : false;
+    },
+
+    /**
+      * Returns the offsets of this element from the passed element. The element must both
+      * be part of the DOM tree and not have display:none to have page coordinates.
+      * @param {Ext.util.Positionable/HTMLElement/String} offsetsTo The Positionable,
+      * HTMLElement, or element id to get get the offsets from.
+      * @return {Number[]} The XY page offsets (e.g. `[100, -200]`)
+      */
+    getOffsetsTo: function(offsetsTo) {
+        var o = this.getXY(),
+                e = Ext.fly(offsetsTo.el || offsetsTo, '_internal').getXY();
+        return [o[0] - e[0],o[1] - e[1]];
+    },
+
+    /**
+     * Returns a region object that defines the area of this element.
+     * @return {Ext.util.Region} A Region containing "top, left, bottom, right" properties.
+     */
+    getRegion: function() {
+        var box = this.getBox();
+        return new Ext.util.Region(box.top, box.right, box.bottom, box.left);
+    },
+
+    /**
+     * Returns the **content** region of this element. That is the region within the borders
+     * and padding.
+     * @return {Ext.util.Region} A Region containing "top, left, bottom, right" member data.
+     */
+    getViewRegion: function() {
+        var me = this,
+            el = me.el,
+            isBody = el.dom.nodeName === 'BODY',
+            borderPadding, scroll, pos, top, left, width, height;
+
+        // For the body we want to do some special logic
+        if (isBody) {
+            scroll = el.getScroll();
+            left = scroll.left;
+            top = scroll.top;
+            width = Ext.dom.AbstractElement.getViewportWidth();
+            height = Ext.dom.AbstractElement.getViewportHeight();
+        }
+        else {
+            borderPadding = me.getBorderPadding();
+            pos = me.getXY();
+            left = pos[0] + borderPadding.beforeX;
+            top = pos[1] + borderPadding.beforeY;
+            width = me.getWidth(true);
+            height = me.getHeight(true);
+        }
+
+        return new Ext.util.Region(top, left + width, top + height, left);
+    },
+
+    /**
+     * Move the element relative to its current position.
+     * @param {String} direction Possible values are:
+     *
+     * - `"l"` (or `"left"`)
+     * - `"r"` (or `"right"`)
+     * - `"t"` (or `"top"`, or `"up"`)
+     * - `"b"` (or `"bottom"`, or `"down"`)
+     *
+     * @param {Number} distance How far to move the element in pixels
+     * @param {Boolean/Object} [animate] true for the default animation or a standard
+     * Element animation config object
+     */
+    move: function(direction, distance, animate) {
+        var me = this,
+            xy = me.getXY(),
+            x = xy[0],
+            y = xy[1],
+            left = [x - distance, y],
+            right = [x + distance, y],
+            top = [x, y - distance],
+            bottom = [x, y + distance],
+            hash = {
+                l: left,
+                left: left,
+                r: right,
+                right: right,
+                t: top,
+                top: top,
+                up: top,
+                b: bottom,
+                bottom: bottom,
+                down: bottom
+            };
+
+        direction = direction.toLowerCase();
+        me.setXY([hash[direction][0], hash[direction][1]], animate);
+    },
+
+    /**
+     * Remove any anchor to this element. See {@link #anchorTo}.
+     * @return {Ext.util.Positionable} this
+     */
+    removeAnchor: function() {
+        var anchor = this.getAnchor();
+
+        if (anchor && anchor.fn) {
+            Ext.EventManager.removeResizeListener(anchor.fn);
+            if (anchor.scroll) {
+                Ext.EventManager.un(window, 'scroll', anchor.fn);
+            }
+            delete anchor.fn;
+        }
+        return this;
+    },
+
+    /**
+     * Sets the element's box. If animate is true then x, y, width, and height will be
+     * animated concurrently.
+     * @param {Object} box The box to fill {x, y, width, height}
+     * @param {Boolean/Object} [animate] true for the default animation or a standard
+     * Element animation config object
+     * @return {Ext.util.Positionable} this
+     */
+    setBox: function(box, animate) {
+        var me = this,
+            el = me.el,
+            x = box.x,
+            y = box.y,
+            xy = [x, y],
+            w = box.width,
+            h = box.height,
+            doConstrain = (me.constrain || me.constrainHeader),
+            constrainedPos = doConstrain && me.calculateConstrainedPosition(null, [x, y], false, [w, h]);
+
+        // Position to the contrained
+        if (constrainedPos) {
+            x = constrainedPos[0];
+            y = constrainedPos[1];
+        }
+        if (!animate || !el.anim) {
+            me.setSize(w, h);
+            me.setXY([x, y]);
+            me.afterSetPosition(x, y);
+        } else {
+            me.animate(Ext.applyIf({
+                to: {
+                    x: x,
+                    y: y,
+                    width: el.adjustWidth(w),
+                    height: el.adjustHeight(h)
+                },
+                listeners: {
+                    afteranimate: Ext.Function.bind(me.afterSetPosition, me, [x, y])
+                }
+            }, animate));
+        }
+        return me;
+    },
+
+    /**
+     * Sets the element's position and size to the specified region. If animation is true
+     * then width, height, x and y will be animated concurrently.
+     *
+     * @param {Ext.util.Region} region The region to fill
+     * @param {Boolean/Object} [animate] true for the default animation or a standard
+     * Element animation config object
+     * @return {Ext.util.Positionable} this
+     */
+    setRegion: function(region, animate) {
+        return this.setBox({
+            x: region.left,
+            y: region.top,
+            width: region.right - region.left,
+            height: region.bottom - region.top
+        }, animate);
+    },
+
+    /**
+     * Translates the passed page coordinates into left/top css values for the element
+     * @param {Number/Array} x The page x or an array containing [x, y]
+     * @param {Number} [y] The page y, required if x is not an array
+     * @return {Object} An object with left and top properties. e.g.
+     * {left: (value), top: (value)}
+     */
+    translatePoints: function(x, y) {
+        var pos = this.translateXY(x, y);
+
+        return {
+            left: pos.x,
+            top: pos.y
+        };
+    },
+
+    /**
+     * Translates the passed page coordinates into x and y css values for the element
+     * @param {Number/Array} x The page x or an array containing [x, y]
+     * @param {Number} [y] The page y, required if x is not an array
+     * @return {Object} An object with x and y properties. e.g.
+     * {x: (value), y: (value)}
+     * @private
+     */
+    translateXY: function(x, y) {
+        var me = this,
+            el = me.el,
+            styles = el.getStyle(me._positionTopLeft),
+            relative = styles.position == 'relative',
+            left = parseFloat(styles.left),
+            top = parseFloat(styles.top),
+            xy = me.getXY();
+
+        if (Ext.isArray(x)) {
+             y = x[1];
+             x = x[0];
+        }
+        if (isNaN(left)) {
+            left = relative ? 0 : el.dom.offsetLeft;
+        }
+        if (isNaN(top)) {
+            top = relative ? 0 : el.dom.offsetTop;
+        }
+        left = (typeof x == 'number') ? x - xy[0] + left : undefined;
+        top = (typeof y == 'number') ? y - xy[1] + top : undefined;
+        return {
+            x: left,
+            y: top
+        };
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ * @class Ext.dom.Element
+ * @alternateClassName Ext.Element
+ * @alternateClassName Ext.core.Element
+ * @extends Ext.dom.AbstractElement
+ *
+ * Encapsulates a DOM element, adding simple DOM manipulation facilities, normalizing for browser differences.
+ *
+ * All instances of this class inherit the methods of {@link Ext.fx.Anim} making visual effects easily available to all
+ * DOM elements.
+ *
+ * Note that the events documented in this class are not Ext events, they encapsulate browser events. Some older browsers
+ * may not support the full range of events. Which events are supported is beyond the control of Ext JS.
+ *
+ * Usage:
+ *
+ *     // by id
+ *     var el = Ext.get("my-div");
+ *
+ *     // by DOM element reference
+ *     var el = Ext.get(myDivElement);
+ *
+ * # Animations
+ *
+ * When an element is manipulated, by default there is no animation.
+ *
+ *     var el = Ext.get("my-div");
+ *
+ *     // no animation
+ *     el.setWidth(100);
+ *
+ * Many of the functions for manipulating an element have an optional "animate" parameter. This parameter can be
+ * specified as boolean (true) for default animation effects.
+ *
+ *     // default animation
+ *     el.setWidth(100, true);
+ *
+ * To configure the effects, an object literal with animation options to use as the Element animation configuration
+ * object can also be specified. Note that the supported Element animation configuration options are a subset of the
+ * {@link Ext.fx.Anim} animation options specific to Fx effects. The supported Element animation configuration options
+ * are:
+ *
+ *     Option    Default   Description
+ *     --------- --------  ---------------------------------------------
+ *     {@link Ext.fx.Anim#duration duration}  350       The duration of the animation in milliseconds
+ *     {@link Ext.fx.Anim#easing easing}    easeOut   The easing method
+ *     {@link Ext.fx.Anim#callback callback}  none      A function to execute when the anim completes
+ *     {@link Ext.fx.Anim#scope scope}     this      The scope (this) of the callback function
+ *
+ * Usage:
+ *
+ *     // Element animation options object
+ *     var opt = {
+ *         {@link Ext.fx.Anim#duration duration}: 1000,
+ *         {@link Ext.fx.Anim#easing easing}: 'elasticIn',
+ *         {@link Ext.fx.Anim#callback callback}: this.foo,
+ *         {@link Ext.fx.Anim#scope scope}: this
+ *     };
+ *     // animation with some options set
+ *     el.setWidth(100, opt);
+ *
+ * The Element animation object being used for the animation will be set on the options object as "anim", which allows
+ * you to stop or manipulate the animation. Here is an example:
+ *
+ *     // using the "anim" property to get the Anim object
+ *     if(opt.anim.isAnimated()){
+ *         opt.anim.stop();
+ *     }
+ *
+ * # Composite (Collections of) Elements
+ *
+ * For working with collections of Elements, see {@link Ext.CompositeElement}
+ *
+ * @constructor
+ * Creates new Element directly.
+ * @param {String/HTMLElement} element
+ * @param {Boolean} [forceNew] By default the constructor checks to see if there is already an instance of this
+ * element in the cache and if there is it returns the same instance. This will skip that check (useful for extending
+ * this class).
+ * @return {Object}
+ */
+Ext.define('Ext.dom.Element', function(Element) {
+    var HIDDEN          = 'hidden',
+        DOC             = document,
+        VISIBILITY      = "visibility",
+        DISPLAY         = "display",
+        NONE            = "none",
+        XMASKED         = Ext.baseCSSPrefix + "masked",
+        XMASKEDRELATIVE = Ext.baseCSSPrefix + "masked-relative",
+        EXTELMASKMSG    = Ext.baseCSSPrefix + "mask-msg",
+        bodyRe          = /^body/i,
+        visFly,
+
+        // speedy lookup for elements never to box adjust
+        noBoxAdjust = Ext.isStrict ? {
+            select: 1
+        }: {
+            input: 1,
+            select: 1,
+            textarea: 1
+        },
+
+        // Pseudo for use by cacheScrollValues
+        isScrolled = function(c) {
+            var r = [], ri = -1,
+                i, ci;
+            for (i = 0; ci = c[i]; i++) {
+                if (ci.scrollTop > 0 || ci.scrollLeft > 0) {
+                    r[++ri] = ci;
+                }
+            }
+            return r;
+        };
+
+    return {
+
+        extend:  Ext.dom.AbstractElement ,
+
+        alternateClassName: ['Ext.Element', 'Ext.core.Element'],
+
+                   
+                            
+                                   
+                                 
+                                 
+                                       
+                                     
+                                   
+          
+        
+        tableTagRe: /^(?:tr|td|table|tbody)$/i,
+
+        mixins: [
+             Ext.util.Positionable 
+        ],
+
+        addUnits: function() {
+            return Element.addUnits.apply(Element, arguments);
+        },
+
+        /**
+         * Tries to focus the element. Any exceptions are caught and ignored.
+         * @param {Number} [defer] Milliseconds to defer the focus
+         * @return {Ext.dom.Element} this
+         */
+        focus: function(defer, /* private */ dom) {
+            var me = this;
+
+            dom = dom || me.dom;
+            try {
+                if (Number(defer)) {
+                    Ext.defer(me.focus, defer, me, [null, dom]);
+                } else {
+                    dom.focus();
+                }
+            } catch(e) {
+            }
+            return me;
+        },
+
+        /**
+        * Tries to blur the element. Any exceptions are caught and ignored.
+        * @return {Ext.dom.Element} this
+        */
+        blur: function() {
+            var me = this,
+                dom = me.dom;
+            // In IE, blurring the body can cause the browser window to hide.
+            // Blurring the body is redundant, so instead we just focus it
+            if (dom !== document.body) {
+                try {
+                    dom.blur();
+                } catch(e) {
+                }
+                return me;
+            } else {
+                return me.focus(undefined, dom);
+            }
+        },
+
+        /**
+        * Tests various css rules/browsers to determine if this element uses a border box
+        * @return {Boolean}
+        */
+        isBorderBox: function() {
+            var box = Ext.isBorderBox;
+            
+            // IE6/7 force input elements to content-box even if border-box is set explicitly
+            if (box && Ext.isIE7m) {
+                box = !((this.dom.tagName || "").toLowerCase() in noBoxAdjust);
+            }
+            return box;
+        },
+
+        /**
+        * Sets up event handlers to call the passed functions when the mouse is moved into and out of the Element.
+        * @param {Function} overFn The function to call when the mouse enters the Element.
+        * @param {Function} outFn The function to call when the mouse leaves the Element.
+        * @param {Object} [scope] The scope (`this` reference) in which the functions are executed. Defaults
+        * to the Element's DOM element.
+        * @param {Object} [options] Options for the listener. See {@link Ext.util.Observable#addListener the
+        * options parameter}.
+        * @return {Ext.dom.Element} this
+        */
+        hover: function(overFn, outFn, scope, options) {
+            var me = this;
+            me.on('mouseenter', overFn, scope || me.dom, options);
+            me.on('mouseleave', outFn, scope || me.dom, options);
+            return me;
+        },
+
+        /**
+        * Returns the value of a namespaced attribute from the element's underlying DOM node.
+        * @param {String} namespace The namespace in which to look for the attribute
+        * @param {String} name The attribute name
+        * @return {String} The attribute value
+        */
+        getAttributeNS: function(ns, name) {
+            return this.getAttribute(name, ns);
+        },
+
+        getAttribute: (Ext.isIE && !(Ext.isIE9p && DOC.documentMode >= 9)) ?
+
+            // Essentially all web browsers (Firefox, Internet Explorer, recent versions of Opera, Safari, Konqueror, and iCab,
+            // as a non-exhaustive list) return null when the specified attribute does not exist on the specified element.
+            // The DOM specification says that the correct return value in this case is actually the empty string, and some
+            // DOM implementations implement this behavior. The implementation of getAttribute in XUL (Gecko) actually follows
+            // the specification and returns an empty string. Consequently, you should use hasAttribute to check for an attribute's
+            // existence prior to calling getAttribute() if it is possible that the requested attribute does not exist on the specified element.
+            //
+            // https://developer.mozilla.org/en-US/docs/DOM/element.getAttribute
+            // http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-745549614
+
+            function(name, ns) {
+                var d = this.dom,
+                        type;
+                if (ns) {
+                    type = typeof d[ns + ":" + name];
+                    if (type != 'undefined' && type != 'unknown') {
+                        return d[ns + ":" + name] || null;
+                    }
+                    return null;
+                }
+                if (name === "for") {
+                    name = "htmlFor";
+                }
+                return d[name] || null;
+            } : function(name, ns) {
+                var d = this.dom;
+                if (ns) {
+                    return d.getAttributeNS(ns, name) || d.getAttribute(ns + ":" + name);
+                }
+                return  d.getAttribute(name) || d[name] || null;
+            },
+
+        /**
+        * When an element is moved around in the DOM, or is hidden using `display:none`, it loses layout, and therefore
+        * all scroll positions of all descendant elements are lost.
+        * 
+        * This function caches them, and returns a function, which when run will restore the cached positions.
+        * In the following example, the Panel is moved from one Container to another which will cause it to lose all scroll positions:
+        * 
+        *     var restoreScroll = myPanel.el.cacheScrollValues();
+        *     myOtherContainer.add(myPanel);
+        *     restoreScroll();
+        * 
+        * @return {Function} A function which will restore all descentant elements of this Element to their scroll
+        * positions recorded when this function was executed. Be aware that the returned function is a closure which has
+        * captured the scope of `cacheScrollValues`, so take care to derefence it as soon as not needed - if is it is a `var`
+        * it will drop out of scope, and the reference will be freed.
+        */
+        cacheScrollValues: function() {
+            var me = this,
+                scrolledDescendants,
+                el, i,
+                scrollValues = [],
+                result = function() {
+                    for (i = 0; i < scrolledDescendants.length; i++) {
+                        el = scrolledDescendants[i];
+                        el.scrollLeft = scrollValues[i][0];
+                        el.scrollTop  = scrollValues[i][1];
+                    }
+                };
+
+            if (!Ext.DomQuery.pseudos.isScrolled) {
+                Ext.DomQuery.pseudos.isScrolled = isScrolled;
+            }
+            scrolledDescendants = me.query(':isScrolled');
+            for (i = 0; i < scrolledDescendants.length; i++) {
+                el = scrolledDescendants[i];
+                scrollValues[i] = [el.scrollLeft, el.scrollTop];
+            }
+            return result;
+        },
+
+        /**
+        * @property {Boolean} autoBoxAdjust
+        * True to automatically adjust width and height settings for box-model issues.
+        */
+        autoBoxAdjust: true,
+
+        /**
+        * Checks whether the element is currently visible using both visibility and display properties.
+        * @param {Boolean} [deep=false] True to walk the dom and see if parent elements are hidden.
+        * If false, the function only checks the visibility of the element itself and it may return
+        * `true` even though a parent is not visible.
+        * @return {Boolean} `true` if the element is currently visible, else `false`
+        */
+        isVisible : function(deep) {
+            var me = this,
+                dom = me.dom,
+                stopNode = dom.ownerDocument.documentElement;
+
+            if (!visFly) {
+                visFly = new Element.Fly();
+            }
+
+            while (dom !== stopNode) {
+                // We're invisible if we hit a nonexistent parentNode or a document
+                // fragment or computed style visibility:hidden or display:none
+                if (!dom || dom.nodeType === 11 || (visFly.attach(dom)).isStyle(VISIBILITY, HIDDEN) || visFly.isStyle(DISPLAY, NONE)) {
+                    return false;
+                }
+                // Quit now unless we are being asked to check parent nodes.
+                if (!deep) {
+                    break;
+                }
+                dom = dom.parentNode;
+            }
+            return true;
+        },
+
+        /**
+        * Returns true if display is not "none"
+        * @return {Boolean}
+        */
+        isDisplayed : function() {
+            return !this.isStyle(DISPLAY, NONE);
+        },
+
+        /**
+        * Convenience method for setVisibilityMode(Element.DISPLAY)
+        * @param {String} [display] What to set display to when visible
+        * @return {Ext.dom.Element} this
+        */
+        enableDisplayMode : function(display) {
+            var me = this;
+
+            me.setVisibilityMode(Element.DISPLAY);
+
+            if (!Ext.isEmpty(display)) {
+                (me.$cache || me.getCache()).data.originalDisplay = display;
+            }
+
+            return me;
+        },
+
+        /**
+        * Puts a mask over this element to disable user interaction. Requires core.css.
+        * This method can only be applied to elements which accept child nodes.
+        * @param {String} [msg] A message to display in the mask
+        * @param {String} [msgCls] A css class to apply to the msg element
+        * @return {Ext.dom.Element} The mask element
+        */
+        mask : function(msg, msgCls /* private - passed by AbstractComponent.mask to avoid the need to interrogate the DOM to get the height*/, elHeight) {
+            var me            = this,
+                dom           = me.dom,
+                // In some cases, setExpression will exist but not be of a function type,
+                // so we check it explicitly here to stop IE throwing errors
+                setExpression = dom.style.setExpression,
+                data          = (me.$cache || me.getCache()).data,
+                maskShimEl    = data.maskShimEl,
+                maskEl        = data.maskEl,
+                maskMsg       = data.maskMsg,
+                widthExpression, heightExpression;
+
+            if (!(bodyRe.test(dom.tagName) && me.getStyle('position') == 'static')) {
+                me.addCls(XMASKEDRELATIVE);
+            }
+
+            // We always needs to recreate the mask since the DOM element may have been re-created
+            if (maskEl) {
+                maskEl.remove();
+            }
+
+            if (maskMsg) {
+                maskMsg.remove();
+            }
+
+            if (maskShimEl) {
+                maskShimEl.remove();
+            }
+
+            if (Ext.isIE6) {
+                maskShimEl = Ext.DomHelper.append(dom, {
+                    tag: 'iframe',
+                    cls : Ext.baseCSSPrefix + 'shim ' + Ext.baseCSSPrefix + 'mask-shim'
+                }, true);
+                data.maskShimEl = maskShimEl;
+                maskShimEl.setDisplayed(true);
+            }
+
+            Ext.DomHelper.append(dom, [{
+                cls : Ext.baseCSSPrefix + "mask",
+                style: 'top:0;left:0;'
+            }, {
+                cls : msgCls ? EXTELMASKMSG + " " + msgCls : EXTELMASKMSG,
+                cn  : {
+                    tag: 'div',
+                    cls: Ext.baseCSSPrefix + 'mask-msg-inner',
+                    cn: {
+                        tag: 'div',
+                        cls: Ext.baseCSSPrefix + 'mask-msg-text',
+                        html: msg || ''
+                    }
+                }
+            }]);
+
+            maskMsg = Ext.get(dom.lastChild);
+            maskEl = Ext.get(maskMsg.dom.previousSibling);
+            data.maskMsg = maskMsg;
+            data.maskEl = maskEl;
+
+            me.addCls(XMASKED);
+            maskEl.setDisplayed(true);
+
+            if (typeof msg == 'string') {
+                maskMsg.setDisplayed(true);
+                maskMsg.center(me);
+            } else {
+                maskMsg.setDisplayed(false);
+            }
+            // NOTE: CSS expressions are resource intensive and to be used only as a last resort
+            // These expressions are removed as soon as they are no longer necessary - in the unmask method.
+            // In normal use cases an element will be masked for a limited period of time.
+            // Fix for https://sencha.jira.com/browse/EXTJSIV-19.
+            // IE6 strict mode and IE6-9 quirks mode takes off left+right padding when calculating width!
+            if (!Ext.supports.IncludePaddingInWidthCalculation && setExpression) {
+                // In an occasional case setExpression will throw an exception
+                try {
+                    maskEl.dom.style.setExpression('width', 'this.parentNode.clientWidth + "px"');
+                    widthExpression = 'this.parentNode.clientWidth + "px"';
+                    if (maskShimEl) {
+                        maskShimEl.dom.style.setExpression('width', widthExpression);
+                    }
+                    maskEl.dom.style.setExpression('width', widthExpression);
+                } catch (e) {}
+            }
+
+            // Some versions and modes of IE subtract top+bottom padding when calculating height.
+            // Different versions from those which make the same error for width!
+            if (!Ext.supports.IncludePaddingInHeightCalculation && setExpression) {
+                // In an occasional case setExpression will throw an exception
+                try {
+                    heightExpression = 'this.parentNode.' + (dom == DOC.body ? 'scrollHeight' : 'offsetHeight') + ' + "px"';
+                    if (maskShimEl) {
+                        maskShimEl.dom.style.setExpression('height', heightExpression);
+                    }
+                    maskEl.dom.style.setExpression('height', heightExpression);
+                } catch (e) {}
+            }
+            // ie will not expand full height automatically
+            else if (Ext.isIE9m && !(Ext.isIE7 && Ext.isStrict) && me.getStyle('height') == 'auto') {
+                if (maskShimEl) {
+                    maskShimEl.setSize(undefined, elHeight || me.getHeight());
+                }
+                maskEl.setSize(undefined, elHeight || me.getHeight());
+            }
+            return maskEl;
+        },
+
+        /**
+        * Hides a previously applied mask.
+        */
+        unmask : function() {
+            var me      = this,
+                data    = (me.$cache || me.getCache()).data,
+                maskEl  = data.maskEl,
+                maskShimEl = data.maskShimEl,
+                maskMsg = data.maskMsg,
+                style;
+
+            if (maskEl) {
+                style = maskEl.dom.style;
+                // Remove resource-intensive CSS expressions as soon as they are not required.
+                if (style.clearExpression) {
+                    style.clearExpression('width');
+                    style.clearExpression('height');
+                }
+
+                if (maskEl) {
+                    maskEl.remove();
+                    delete data.maskEl;
+                }
+
+                if (maskMsg) {
+                    maskMsg.remove();
+                    delete data.maskMsg;
+                }
+
+                me.removeCls([XMASKED, XMASKEDRELATIVE]);
+
+                if (maskShimEl) {
+                    style = maskShimEl.dom.style;
+                    // Remove resource-intensive CSS expressions as soon as they are not required.
+                    if (style.clearExpression) {
+                        style.clearExpression('width');
+                        style.clearExpression('height');
+                    }
+
+                    maskShimEl.remove();
+                    delete data.maskShimEl;
+                }
+            }
+        },
+
+        /**
+        * Returns true if this element is masked. Also re-centers any displayed message within the mask.
+        * @return {Boolean}
+        */
+        isMasked : function() {
+            var me      = this,
+                data    = (me.$cache || me.getCache()).data,
+                maskEl  = data.maskEl,
+                maskMsg = data.maskMsg,
+                hasMask = false; 
+
+            if (maskEl && maskEl.isVisible()) {
+                if (maskMsg) {
+                    maskMsg.center(me);
+                }
+                hasMask = true;
+            }
+            return hasMask;
+        },
+
+        /**
+        * Creates an iframe shim for this element to keep selects and other windowed objects from
+        * showing through.
+        * @return {Ext.dom.Element} The new shim element
+        */
+        createShim : function() {
+            var el = DOC.createElement('iframe'),
+                shim;
+
+            el.frameBorder = '0';
+            el.className = Ext.baseCSSPrefix + 'shim';
+            el.src = Ext.SSL_SECURE_URL;
+            shim = Ext.get(this.dom.parentNode.insertBefore(el, this.dom));
+            shim.autoBoxAdjust = false;
+            return shim;
+        },
+
+        /**
+        * Convenience method for constructing a KeyMap
+        * @param {String/Number/Number[]/Object} key Either a string with the keys to listen for, the numeric key code,
+        * array of key codes or an object with the following options:
+        * @param {Number/Array} key.key
+        * @param {Boolean} key.shift
+        * @param {Boolean} key.ctrl
+        * @param {Boolean} key.alt
+        * @param {Function} fn The function to call
+        * @param {Object} [scope] The scope (`this` reference) in which the specified function is executed. Defaults to this Element.
+        * @return {Ext.util.KeyMap} The KeyMap created
+        */
+        addKeyListener : function(key, fn, scope){
+            var config;
+            if(typeof key != 'object' || Ext.isArray(key)){
+                config = {
+                    target: this,
+                    key: key,
+                    fn: fn,
+                    scope: scope
+                };
+            }else{
+                config = {
+                    target: this,
+                    key : key.key,
+                    shift : key.shift,
+                    ctrl : key.ctrl,
+                    alt : key.alt,
+                    fn: fn,
+                    scope: scope
+                };
+            }
+            return new Ext.util.KeyMap(config);
+        },
+
+        /**
+        * Creates a KeyMap for this element
+        * @param {Object} config The KeyMap config. See {@link Ext.util.KeyMap} for more details
+        * @return {Ext.util.KeyMap} The KeyMap created
+        */
+        addKeyMap : function(config) {
+            return new Ext.util.KeyMap(Ext.apply({
+                target: this
+            }, config));
+        },
+
+        //  Mouse events
+        /**
+        * @event click
+        * Fires when a mouse click is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event contextmenu
+        * Fires when a right click is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event dblclick
+        * Fires when a mouse double click is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mousedown
+        * Fires when a mousedown is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mouseup
+        * Fires when a mouseup is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mouseover
+        * Fires when a mouseover is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mousemove
+        * Fires when a mousemove is detected with the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mouseout
+        * Fires when a mouseout is detected with the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mouseenter
+        * Fires when the mouse enters the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event mouseleave
+        * Fires when the mouse leaves the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+
+        //  Keyboard events
+        /**
+        * @event keypress
+        * Fires when a keypress is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event keydown
+        * Fires when a keydown is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event keyup
+        * Fires when a keyup is detected within the element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+
+        //  HTML frame/object events
+        /**
+        * @event load
+        * Fires when the user agent finishes loading all content within the element. Only supported by window, frames,
+        * objects and images.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event unload
+        * Fires when the user agent removes all content from a window or frame. For elements, it fires when the target
+        * element or any of its content has been removed.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event abort
+        * Fires when an object/image is stopped from loading before completely loaded.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event error
+        * Fires when an object/image/frame cannot be loaded properly.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event resize
+        * Fires when a document view is resized.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event scroll
+        * Fires when a document view is scrolled.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+
+        //  Form events
+        /**
+        * @event select
+        * Fires when a user selects some text in a text field, including input and textarea.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event change
+        * Fires when a control loses the input focus and its value has been modified since gaining focus.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event submit
+        * Fires when a form is submitted.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event reset
+        * Fires when a form is reset.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event focus
+        * Fires when an element receives focus either via the pointing device or by tab navigation.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event blur
+        * Fires when an element loses focus either via the pointing device or by tabbing navigation.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+
+        //  User Interface events
+        /**
+        * @event DOMFocusIn
+        * Where supported. Similar to HTML focus event, but can be applied to any focusable element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMFocusOut
+        * Where supported. Similar to HTML blur event, but can be applied to any focusable element.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMActivate
+        * Where supported. Fires when an element is activated, for instance, through a mouse click or a keypress.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+
+        //  DOM Mutation events
+        /**
+        * @event DOMSubtreeModified
+        * Where supported. Fires when the subtree is modified.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMNodeInserted
+        * Where supported. Fires when a node has been added as a child of another node.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMNodeRemoved
+        * Where supported. Fires when a descendant node of the element is removed.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMNodeRemovedFromDocument
+        * Where supported. Fires when a node is being removed from a document.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMNodeInsertedIntoDocument
+        * Where supported. Fires when a node is being inserted into a document.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMAttrModified
+        * Where supported. Fires when an attribute has been modified.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+        /**
+        * @event DOMCharacterDataModified
+        * Where supported. Fires when the character data has been modified.
+        * @param {Ext.EventObject} e The {@link Ext.EventObject} encapsulating the DOM event.
+        * @param {HTMLElement} t The target of the event.
+        */
+
+        /**
+        * Appends an event handler to this element.
+        *
+        * @param {String} eventName The name of event to handle.
+        *
+        * @param {Function} fn The handler function the event invokes. This function is passed the following parameters:
+        *
+        * - **evt** : EventObject
+        *
+        *   The {@link Ext.EventObject EventObject} describing the event.
+        *
+        * - **el** : HtmlElement
+        *
+        *   The DOM element which was the target of the event. Note that this may be filtered by using the delegate option.
+        *
+        * - **o** : Object
+        *
+        *   The options object from the call that setup the listener.
+        *
+        * @param {Object} scope (optional) The scope (**this** reference) in which the handler function is executed. **If
+        * omitted, defaults to this Element.**
+        *
+        * @param {Object} options (optional) An object containing handler configuration properties. This may contain any of
+        * the following properties:
+        *
+        * - **scope** Object :
+        *
+        *   The scope (**this** reference) in which the handler function is executed. **If omitted, defaults to this
+        *   Element.**
+        *
+        * - **delegate** String:
+        *
+        *   A simple selector to filter the target or look for a descendant of the target. See below for additional details.
+        *
+        * - **stopEvent** Boolean:
+        *
+        *   True to stop the event. That is stop propagation, and prevent the default action.
+        *
+        * - **preventDefault** Boolean:
+        *
+        *   True to prevent the default action
+        *
+        * - **stopPropagation** Boolean:
+        *
+        *   True to prevent event propagation
+        *
+        * - **normalized** Boolean:
+        *
+        *   False to pass a browser event to the handler function instead of an Ext.EventObject
+        *
+        * - **target** Ext.dom.Element:
+        *
+        *   Only call the handler if the event was fired on the target Element, _not_ if the event was bubbled up from a
+        *   child node.
+        *
+        * - **delay** Number:
+        *
+        *   The number of milliseconds to delay the invocation of the handler after the event fires.
+        *
+        * - **single** Boolean:
+        *
+        *   True to add a handler to handle just the next firing of the event, and then remove itself.
+        *
+        * - **buffer** Number:
+        *
+        *   Causes the handler to be scheduled to run in an {@link Ext.util.DelayedTask} delayed by the specified number of
+        *   milliseconds. If the event fires again within that time, the original handler is _not_ invoked, but the new
+        *   handler is scheduled in its place.
+        *
+        * **Combining Options**
+        *
+        * Using the options argument, it is possible to combine different types of listeners:
+        *
+        * A delayed, one-time listener that auto stops the event and adds a custom argument (forumId) to the options
+        * object. The options object is available as the third parameter in the handler function.
+        *
+        * Code:
+        *
+        *     el.on('click', this.onClick, this, {
+        *         single: true,
+        *         delay: 100,
+        *         stopEvent : true,
+        *         forumId: 4
+        *     });
+        *
+        * **Attaching multiple handlers in 1 call**
+        *
+        * The method also allows for a single argument to be passed which is a config object containing properties which
+        * specify multiple handlers.
+        *
+        * Code:
+        *
+        *     el.on({
+        *         'click' : {
+        *             fn: this.onClick,
+        *             scope: this,
+        *             delay: 100
+        *         },
+        *         'mouseover' : {
+        *             fn: this.onMouseOver,
+        *             scope: this
+        *         },
+        *         'mouseout' : {
+        *             fn: this.onMouseOut,
+        *             scope: this
+        *         }
+        *     });
+        *
+        * Or a shorthand syntax:
+        *
+        * Code:
+        *
+        *     el.on({
+        *         'click' : this.onClick,
+        *         'mouseover' : this.onMouseOver,
+        *         'mouseout' : this.onMouseOut,
+        *         scope: this
+        *     });
+        *
+        * **delegate**
+        *
+        * This is a configuration option that you can pass along when registering a handler for an event to assist with
+        * event delegation. Event delegation is a technique that is used to reduce memory consumption and prevent exposure
+        * to memory-leaks. By registering an event for a container element as opposed to each element within a container.
+        * By setting this configuration option to a simple selector, the target element will be filtered to look for a
+        * descendant of the target. For example:
+        *
+        *     // using this markup:
+        *     <div id='elId'>
+        *         <p id='p1'>paragraph one</p>
+        *         <p id='p2' class='clickable'>paragraph two</p>
+        *         <p id='p3'>paragraph three</p>
+        *     </div>
+        *
+        *     // utilize event delegation to registering just one handler on the container element:
+        *     el = Ext.get('elId');
+        *     el.on(
+        *         'click',
+        *         function(e,t) {
+        *             // handle click
+        *             console.info(t.id); // 'p2'
+        *         },
+        *         this,
+        *         {
+        *             // filter the target element to be a descendant with the class 'clickable'
+        *             delegate: '.clickable'
+        *         }
+        *     );
+        *
+        * @return {Ext.dom.Element} this
+        */
+        on: function(eventName, fn, scope, options) {
+            Ext.EventManager.on(this, eventName, fn, scope || this, options);
+            return this;
+        },
+
+        /**
+        * Removes an event handler from this element.
+        *
+        * **Note**: if a *scope* was explicitly specified when {@link #on adding} the listener,
+        * the same scope must be specified here.
+        *
+        * Example:
+        *
+        *     el.un('click', this.handlerFn);
+        *     // or
+        *     el.removeListener('click', this.handlerFn);
+        *
+        * @param {String} eventName The name of the event from which to remove the handler.
+        * @param {Function} fn The handler function to remove. **This must be a reference to the function passed into the
+        * {@link #on} call.**
+        * @param {Object} scope If a scope (**this** reference) was specified when the listener was added, then this must
+        * refer to the same object.
+        * @return {Ext.dom.Element} this
+        */
+        un: function(eventName, fn, scope) {
+            Ext.EventManager.un(this, eventName, fn, scope || this);
+            return this;
+        },
+
+        /**
+        * Removes all previous added listeners from this element
+        * @return {Ext.dom.Element} this
+        */
+        removeAllListeners: function() {
+            Ext.EventManager.removeAll(this);
+            return this;
+        },
+
+        /**
+        * Recursively removes all previous added listeners from this element and its children
+        * @return {Ext.dom.Element} this
+        */
+        purgeAllListeners: function() {
+            Ext.EventManager.purgeElement(this);
+            return this;
+        },
+
+        select: function(selector) {
+            return Element.select(selector, false,  this.dom);
+        }
+    };
+}, function() {
+
+    var DOC             = document,
+        EC              = Ext.cache,
+        Element         = this,
+        AbstractElement = Ext.dom.AbstractElement,
+        focusRe         = /^a|button|embed|iframe|input|object|select|textarea$/i,
+        nonSpaceRe      = /\S/,
+        scriptTagRe     = /(?:<script([^>]*)?>)((\n|\r|.)*?)(?:<\/script>)/ig,
+        replaceScriptTagRe = /(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)/ig,
+        srcRe           = /\ssrc=([\'\"])(.*?)\1/i,
+        typeRe          = /\stype=([\'\"])(.*?)\1/i,
+        useDocForId     = !Ext.isIE8m,
+        internalFly;
+
+    Element.boxMarkup = '<div class="{0}-tl"><div class="{0}-tr"><div class="{0}-tc"></div></div></div><div class="{0}-ml"><div class="{0}-mr"><div class="{0}-mc"></div></div></div><div class="{0}-bl"><div class="{0}-br"><div class="{0}-bc"></div></div></div>';
+    //</!if>
+
+    // private
+    // Garbage collection - uncache elements/purge listeners on orphaned elements
+    // so we don't hold a reference and cause the browser to retain them
+    function garbageCollect() {
+        if (!Ext.enableGarbageCollector) {
+            clearInterval(Element.collectorThreadId);
+        } else {
+            var eid,
+                d,
+                o,
+                t;
+
+            for (eid in EC) {
+                if (!EC.hasOwnProperty(eid)) {
+                    continue;
+                }
+
+                o = EC[eid];
+
+                // Skip document and window elements
+                if (o.skipGarbageCollection) {
+                    continue;
+                }
+
+                d = o.dom;
+
+                // Should always have a DOM node
+                if (!d) {
+                    Ext.Error.raise('Missing DOM node in element garbage collection: ' + eid);
+                }
+
+                // Check that document and window elements haven't got through
+                if (d && (d.getElementById || d.navigator)) {
+                    Ext.Error.raise('Unexpected document or window element in element garbage collection');
+                }
+
+                // -------------------------------------------------------
+                // Determining what is garbage:
+                // -------------------------------------------------------
+                // !d.parentNode
+                // no parentNode == direct orphan, definitely garbage
+                // -------------------------------------------------------
+                // !d.offsetParent && !document.getElementById(eid)
+                // display none elements have no offsetParent so we will
+                // also try to look it up by it's id. However, check
+                // offsetParent first so we don't do unneeded lookups.
+                // This enables collection of elements that are not orphans
+                // directly, but somewhere up the line they have an orphan
+                // parent.
+                // -------------------------------------------------------
+                if (d && (!d.parentNode || (!d.offsetParent && !Ext.getElementById(eid)))) {
+                    if (Ext.enableListenerCollection) {
+                        Ext.EventManager.removeAll(d);
+                    }
+                    delete EC[eid];
+                }
+            }
+            // Cleanup IE Object leaks
+            if (Ext.isIE) {
+                t = {};
+                for (eid in EC) {
+                    if (!EC.hasOwnProperty(eid)) {
+                        continue;
+                    }
+                    t[eid] = EC[eid];
+                }
+                EC = Ext.cache = t;
+            }
+        }
+    }
+
+    Element.collectorThreadId = setInterval(garbageCollect, 30000);
+
+    //Stuff from Element-more.js
+    Element.addMethods({
+
+        /**
+         * Monitors this Element for the mouse leaving. Calls the function after the specified delay only if
+         * the mouse was not moved back into the Element within the delay. If the mouse *was* moved
+         * back in, the function is not called.
+         * @param {Number} delay The delay **in milliseconds** to wait for possible mouse re-entry before calling the handler function.
+         * @param {Function} handler The function to call if the mouse remains outside of this Element for the specified time.
+         * @param {Object} [scope] The scope (`this` reference) in which the handler function executes. Defaults to this Element.
+         * @return {Object} The listeners object which was added to this element so that monitoring can be stopped. Example usage:
+         *
+         *     // Hide the menu if the mouse moves out for 250ms or more
+         *     this.mouseLeaveMonitor = this.menuEl.monitorMouseLeave(250, this.hideMenu, this);
+         *
+         *     ...
+         *     // Remove mouseleave monitor on menu destroy
+         *     this.menuEl.un(this.mouseLeaveMonitor);
+         *
+         */
+        monitorMouseLeave: function(delay, handler, scope) {
+            var me = this,
+                timer,
+                listeners = {
+                    mouseleave: function(e) {
+                        timer = setTimeout(Ext.Function.bind(handler, scope||me, [e]), delay);
+                    },
+                    mouseenter: function() {
+                        clearTimeout(timer);
+                    },
+                    freezeEvent: true
+                };
+
+            me.on(listeners);
+            return listeners;
+        },
+
+        /**
+         * Stops the specified event(s) from bubbling and optionally prevents the default action
+         * @param {String/String[]} eventName an event / array of events to stop from bubbling
+         * @param {Boolean} [preventDefault] true to prevent the default action too
+         * @return {Ext.dom.Element} this
+         */
+        swallowEvent : function(eventName, preventDefault) {
+            var me = this,
+                e, eLen,
+                fn = function(e) {
+                    e.stopPropagation();
+                    if (preventDefault) {
+                        e.preventDefault();
+                    }
+                };
+
+            if (Ext.isArray(eventName)) {
+                eLen = eventName.length;
+
+                for (e = 0; e < eLen; e++) {
+                    me.on(eventName[e], fn);
+                }
+
+                return me;
+            }
+            me.on(eventName, fn);
+            return me;
+        },
+
+        /**
+         * Create an event handler on this element such that when the event fires and is handled by this element,
+         * it will be relayed to another object (i.e., fired again as if it originated from that object instead).
+         * @param {String} eventName The type of event to relay
+         * @param {Object} observable Any object that extends {@link Ext.util.Observable} that will provide the context
+         * for firing the relayed event
+         */
+        relayEvent : function(eventName, observable) {
+            this.on(eventName, function(e) {
+                observable.fireEvent(eventName, e);
+            });
+        },
+
+        /**
+         * Removes Empty, or whitespace filled text nodes. Combines adjacent text nodes.
+         * @param {Boolean} [forceReclean=false] By default the element keeps track if it has been cleaned already
+         * so you can call this over and over. However, if you update the element and need to force a reclean, you
+         * can pass true.
+         */
+        clean : function(forceReclean) {
+            var me   = this,
+                dom  = me.dom,
+                data = (me.$cache || me.getCache()).data,
+                n    = dom.firstChild,
+                ni   = -1,
+                nx;
+
+            if (data.isCleaned && forceReclean !== true) {
+                return me;
+            }
+
+            while (n) {
+                nx = n.nextSibling;
+                if (n.nodeType == 3) {
+                    // Remove empty/whitespace text nodes
+                    if (!(nonSpaceRe.test(n.nodeValue))) {
+                        dom.removeChild(n);
+                    // Combine adjacent text nodes
+                    } else if (nx && nx.nodeType == 3) {
+                        n.appendData(Ext.String.trim(nx.data));
+                        dom.removeChild(nx);
+                        nx = n.nextSibling;
+                        n.nodeIndex = ++ni;
+                    }
+                } else {
+                    // Recursively clean
+                    internalFly.attach(n).clean();
+                    n.nodeIndex = ++ni;
+                }
+                n = nx;
+            }
+
+            data.isCleaned = true;
+            return me;
+        },
+
+        /**
+         * Direct access to the Ext.ElementLoader {@link Ext.ElementLoader#method-load} method. The method takes the same object
+         * parameter as {@link Ext.ElementLoader#method-load}
+         * @return {Ext.dom.Element} this
+         */
+        load : function(options) {
+            this.getLoader().load(options);
+            return this;
+        },
+
+        /**
+         * Gets this element's {@link Ext.ElementLoader ElementLoader}
+         * @return {Ext.ElementLoader} The loader
+         */
+        getLoader : function() {
+            var me = this,
+                data = (me.$cache || me.getCache()).data,
+                loader = data.loader;
+
+            if (!loader) {
+                data.loader = loader = new Ext.ElementLoader({
+                    target: me
+                });
+            }
+            return loader;
+        },
+
+        /**
+         * @private.
+         * Currently used for updating grid cells without modifying DOM structure
+         *
+         * Synchronizes content of this Element with the content of the passed element.
+         * 
+         * Style and CSS class are copied from source into this Element, and contents are synched
+         * recursively. If a child node is a text node, the textual data is copied.
+         */
+        syncContent: function(source) {
+            source = Ext.getDom(source);
+            var sourceNodes = source.childNodes,
+                sourceLen = sourceNodes.length,
+                dest = this.dom,
+                destNodes = dest.childNodes,
+                destLen = destNodes.length,
+                i,  destNode, sourceNode,
+                nodeType, newAttrs, attLen, attName;
+
+            // Copy top node's attributes across. Use IE-specific method if possible.
+            // In IE10, there is a problem where the className will not get updated
+            // in the view, even though the className on the dom element is correct.
+            // See EXTJSIV-9462
+            if (Ext.isIE9m && dest.mergeAttributes) {
+                dest.mergeAttributes(source, true);
+
+                // EXTJSIV-6803. IE's mergeAttributes appears not to make the source's "src" value available until after the image is ready.
+                // So programatically copy any src attribute.
+                dest.src = source.src;
+            } else {
+                newAttrs = source.attributes;
+                attLen = newAttrs.length;
+                for (i = 0; i < attLen; i++) {
+                    attName = newAttrs[i].name;
+                    if (attName !== 'id') {
+                        dest.setAttribute(attName, newAttrs[i].value);
+                    }
+                }
+            }
+
+            // If the number of child nodes does not match, fall back to replacing innerHTML
+            if (sourceLen !== destLen) {
+                dest.innerHTML = source.innerHTML;
+                return;
+            }
+
+            // Loop through source nodes.
+            // If there are fewer, we must remove excess
+            for (i = 0; i < sourceLen; i++) {
+                sourceNode = sourceNodes[i];
+                destNode = destNodes[i];
+                nodeType = sourceNode.nodeType;
+
+                // If node structure is out of sync, just drop innerHTML in and return
+                if (nodeType !== destNode.nodeType || (nodeType === 1 && sourceNode.tagName !== destNode.tagName)) {
+                    dest.innerHTML = source.innerHTML;
+                    return;
+                }
+
+                // Update text node
+                if (nodeType === 3) {
+                    destNode.data = sourceNode.data;
+                }
+                // Sync element content
+                else {
+                    if (sourceNode.id && destNode.id !== sourceNode.id) {
+                        destNode.id = sourceNode.id;
+                    }
+                    destNode.style.cssText = sourceNode.style.cssText;
+                    destNode.className = sourceNode.className;
+                    internalFly.attach(destNode).syncContent(sourceNode);
+                }
+            }
+        },
+
+        /**
+         * Updates the innerHTML of this element, optionally searching for and processing scripts.
+         * @param {String} html The new HTML
+         * @param {Boolean} [loadScripts] True to look for and process scripts (defaults to false)
+         * @param {Function} [callback] For async script loading you can be notified when the update completes
+         * @return {Ext.dom.Element} this
+         */
+        update : function(html, loadScripts, callback) {
+            var me = this,
+                id,
+                dom,
+                interval;
+
+            if (!me.dom) {
+                return me;
+            }
+            html = html || '';
+            dom = me.dom;
+
+            if (loadScripts !== true) {
+                dom.innerHTML = html;
+                Ext.callback(callback, me);
+                return me;
+            }
+
+            id  = Ext.id();
+            html += '<span id="' + id + '"></span>';
+
+            interval = setInterval(function() {
+                var hd,
+                    match,
+                    attrs,
+                    srcMatch,
+                    typeMatch,
+                    el,
+                    s;
+                if (!(el = DOC.getElementById(id))) {
+                    return false;
+                }
+                clearInterval(interval);
+                Ext.removeNode(el);
+                hd = Ext.getHead().dom;
+
+                while ((match = scriptTagRe.exec(html))) {
+                    attrs = match[1];
+                    srcMatch = attrs ? attrs.match(srcRe) : false;
+                    if (srcMatch && srcMatch[2]) {
+                       s = DOC.createElement("script");
+                       s.src = srcMatch[2];
+                       typeMatch = attrs.match(typeRe);
+                       if (typeMatch && typeMatch[2]) {
+                           s.type = typeMatch[2];
+                       }
+                       hd.appendChild(s);
+                    } else if (match[2] && match[2].length > 0) {
+                        if (window.execScript) {
+                           window.execScript(match[2]);
+                        } else {
+                           window.eval(match[2]);
+                        }
+                    }
+                }
+                Ext.callback(callback, me);
+            }, 20);
+            dom.innerHTML = html.replace(replaceScriptTagRe, '');
+            return me;
+        },
+
+        // inherit docs, overridden so we can add removeAnchor
+        removeAllListeners : function() {
+            this.removeAnchor();
+            Ext.EventManager.removeAll(this.dom);
+            return this;
+        },
+
+        /**
+         * Creates a proxy element of this element
+         * @param {String/Object} config The class name of the proxy element or a DomHelper config object
+         * @param {String/HTMLElement} [renderTo] The element or element id to render the proxy to. Defaults to: document.body.
+         * @param {Boolean} [matchBox=false] True to align and size the proxy to this element now.
+         * @return {Ext.dom.Element} The new proxy element
+         */
+        createProxy : function(config, renderTo, matchBox) {
+            config = (typeof config == 'object') ? config : {tag : "div", cls: config};
+
+            var me = this,
+                proxy = renderTo ? Ext.DomHelper.append(renderTo, config, true) :
+                                   Ext.DomHelper.insertBefore(me.dom, config, true);
+
+            proxy.setVisibilityMode(Element.DISPLAY);
+            proxy.hide();
+            if (matchBox && me.setBox && me.getBox) { // check to make sure Element.position.js is loaded
+               proxy.setBox(me.getBox());
+            }
+            return proxy;
+        },
+        
+        /**
+         * Returns true if this element needs an explicit tabIndex to make it focusable. Input fields, text areas, buttons
+         * anchors elements **with an href** etc do not need a tabIndex, but structural elements do.
+         */
+        needsTabIndex: function() {
+            if (this.dom) {
+                if ((this.dom.nodeName === 'a') && (!this.dom.href)) {
+                    return true;
+                }
+                return !focusRe.test(this.dom.nodeName);
+            }
+        },
+
+        /**
+         * Checks whether this element can be focused.
+         * @return {Boolean} True if the element is focusable
+         */
+        isFocusable: function (/* private - assume it's the focusEl of a Component */ asFocusEl) {
+            var dom = this.dom,
+                tabIndexAttr = dom.getAttributeNode('tabIndex'),
+                tabIndex,
+                nodeName = dom.nodeName,
+                canFocus = false;
+
+            // Certain browsers always report zero in the absence of the tabIndex attribute.
+            // Testing the specified property (Standards: http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-862529273)
+            // Should filter out these cases.
+            // The exceptions are IE6 to IE8. In these browsers all elements will yield a tabIndex
+            // and therefore all elements will appear to be focusable.
+            // This adversely affects modal Floating components.
+            // These listen for the TAB key, and then test whether the event target === last focusable
+            // or first focusable element, and forcibly to a circular navigation.
+            // We cannot know the true first or last focusable element, so this problem still exists for IE6,7,8
+            // See Ext.util.Floating
+            if (tabIndexAttr && tabIndexAttr.specified) {
+                tabIndex = tabIndexAttr.value;
+            }
+            if (dom && !dom.disabled) {
+                // A tabIndex of -1 means it has to be programatically focused, so that needs FocusManager,
+                // and it has to be the focus holding el of a Component within the Component tree.
+                if (tabIndex == -1) { // note that the value is a string
+                    canFocus = Ext.FocusManager && Ext.FocusManager.enabled && asFocusEl;
+                }
+                else {
+                    // See if it's a naturally focusable element
+                    if (focusRe.test(nodeName)) {
+                        if ((nodeName !== 'a') || dom.href) {
+                            canFocus = true;
+                        }
+                    }
+                    // A non naturally focusable element is in the navigation flow if it has a positive numeric tab index.
+                    else {
+                        canFocus = tabIndex != null && tabIndex >= 0;
+                    }
+                }
+                canFocus = canFocus && this.isVisible(true);
+            }
+            return canFocus;
+        }
+    });
+
+    if (Ext.isIE) {
+        Element.prototype.getById = function (id, asDom) {
+            var dom = this.dom,
+                cacheItem, el, ret;
+
+            if (dom) {
+                // for normal elements getElementById is the best solution, but if the el is
+                // not part of the document.body, we need to use all[]
+                el = (useDocForId && DOC.getElementById(id)) || dom.all[id];
+                if (el) {
+                    if (asDom) {
+                        ret = el;
+                    } else {
+                        // calling Element.get here is a real hit (2x slower) because it has to
+                        // redetermine that we are giving it a dom el.
+                        cacheItem = EC[id];
+                        if (cacheItem && cacheItem.el) {
+                            ret = Ext.updateCacheEntry(cacheItem, el).el;
+                        } else {
+                            ret = new Element(el);
+                        }
+                    }
+                    return ret;
+                }
+            }
+
+            return asDom ? Ext.getDom(id) : Element.get(id);
+        };
+    }
+
+    Element.createAlias({
+        /**
+         * @method
+         * @inheritdoc Ext.dom.Element#on
+         * Shorthand for {@link #on}.
+         */
+        addListener: 'on',
+        /**
+         * @method
+         * @inheritdoc Ext.dom.Element#un
+         * Shorthand for {@link #un}.
+         */
+        removeListener: 'un',
+        /**
+         * @method
+         * @inheritdoc Ext.dom.Element#removeAllListeners
+         * Alias for {@link #removeAllListeners}.
+         */
+        clearListeners: 'removeAllListeners',
+        /**
+         * @method
+         * @inheritdoc Ext.dom.Element#isFocusable
+         * Alias for {@link #isFocusable}.
+         */
+        focusable: 'isFocusable'
+    });
+
+    Element.Fly = AbstractElement.Fly = new Ext.Class({
+        extend: Element,
+
+        isFly: true,
+
+        constructor: function(dom) {
+            this.dom = dom;
+            // set an "el" property that references "this".  This allows
+            // Ext.util.Positionable methods to operate on this.el.dom since it
+            // gets mixed into both Element and Component
+            this.el = this;
+        },
+        
+        attach: AbstractElement.Fly.prototype.attach
+    });
+    
+    internalFly = new Element.Fly();
+
+    if (Ext.isIE) {
+        Ext.getElementById = function (id) {
+            var el = DOC.getElementById(id),
+                detachedBodyEl;
+
+            if (!el && (detachedBodyEl = AbstractElement.detachedBodyEl)) {
+                el = detachedBodyEl.dom.all[id];
+            }
+
+            return el;
+        };
+    } else if (!DOC.querySelector) {
+        Ext.getDetachedBody = Ext.getBody;
+
+        Ext.getElementById = function (id) {
+            return DOC.getElementById(id);
+        };
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ * This class encapsulates a *collection* of DOM elements, providing methods to filter members, or to perform collective
+ * actions upon the whole set.
+ *
+ * Although they are not listed, this class supports all of the methods of {@link Ext.dom.Element} and
+ * {@link Ext.fx.Anim}. The methods from these classes will be performed on all the elements in this collection.
+ *
+ * Example:
+ *
+ *     var els = Ext.select("#some-el div.some-class");
+ *     // or select directly from an existing element
+ *     var el = Ext.get('some-el');
+ *     el.select('div.some-class');
+ *
+ *     els.setWidth(100); // all elements become 100 width
+ *     els.hide(true); // all elements fade out and hide
+ *     // or
+ *     els.setWidth(100).hide(true);
+ */
+Ext.define('Ext.dom.CompositeElementLite', {
+    alternateClassName: 'Ext.CompositeElementLite',
+
+                                                   
+
+    statics: {
+        /**
+         * @private
+         * Copies all of the functions from Ext.dom.Element's prototype onto CompositeElementLite's prototype.
+         * This is called twice - once immediately below, and once again after additional Ext.dom.Element
+         * are added in Ext JS
+         */
+        importElementMethods: function() {
+            var name,
+                elementPrototype = Ext.dom.Element.prototype,
+                prototype = this.prototype;
+
+            for (name in elementPrototype) {
+                if (typeof elementPrototype[name] == 'function'){
+                    (function(key) {
+                        prototype[key] = prototype[key] || function() {
+                            return this.invoke(key, arguments);
+                        };
+                    }).call(prototype, name);
+
+                }
+            }
+        }
+    },
+
+    constructor: function(elements, root) {
+        /**
+         * @property {HTMLElement[]} elements
+         * The Array of DOM elements which this CompositeElement encapsulates.
+         *
+         * This will not *usually* be accessed in developers' code, but developers wishing to augment the capabilities
+         * of the CompositeElementLite class may use it when adding methods to the class.
+         *
+         * For example to add the `nextAll` method to the class to **add** all following siblings of selected elements,
+         * the code would be
+         *
+         *     Ext.override(Ext.dom.CompositeElementLite, {
+         *         nextAll: function() {
+         *             var elements = this.elements, i, l = elements.length, n, r = [], ri = -1;
+         *              
+         *             // Loop through all elements in this Composite, accumulating
+         *             // an Array of all siblings.
+         *             for (i = 0; i < l; i++) {
+         *                 for (n = elements[i].nextSibling; n; n = n.nextSibling) {
+         *                     r[++ri] = n;
+         *                 }
+         *             }
+         *              
+         *             // Add all found siblings to this Composite
+         *             return this.add(r);
+         *         }
+         *     });
+         *
+         * @readonly
+         */
+        this.elements = [];
+        this.add(elements, root);
+        this.el = new Ext.dom.AbstractElement.Fly();
+    },
+
+    /**
+     * @property {Boolean} isComposite
+     * `true` in this class to identify an object as an instantiated CompositeElement, or subclass thereof.
+     */
+    isComposite: true,
+
+    // private
+    getElement: function(el) {
+        // Set the shared flyweight dom property to the current element
+        return this.el.attach(el);
+    },
+
+    // private
+    transformElement: function(el) {
+        return Ext.getDom(el);
+    },
+
+    /**
+     * Returns the number of elements in this Composite.
+     * @return {Number}
+     */
+    getCount: function() {
+        return this.elements.length;
+    },
+
+    /**
+     * Adds elements to this Composite object.
+     * @param {HTMLElement[]/Ext.dom.CompositeElement} els Either an Array of DOM elements to add, or another Composite
+     * object who's elements should be added.
+     * @return {Ext.dom.CompositeElement} This Composite object.
+     */
+    add: function(els, root) {
+        var elements = this.elements,
+            i, ln;
+
+        if (!els) {
+            return this;
+        }
+
+        if (typeof els == "string") {
+            els = Ext.dom.Element.selectorFunction(els, root);
+        }
+        else if (els.isComposite) {
+            els = els.elements;
+        }
+        else if (!Ext.isIterable(els)) {
+            els = [els];
+        }
+
+        for (i = 0, ln = els.length; i < ln; ++i) {
+            elements.push(this.transformElement(els[i]));
+        }
+
+        return this;
+    },
+
+    invoke: function(fn, args) {
+        var elements = this.elements,
+            ln = elements.length,
+            element,
+            i;
+
+        fn = Ext.dom.Element.prototype[fn];
+        for (i = 0; i < ln; i++) {
+            element = elements[i];
+
+            if (element) {
+                fn.apply(this.getElement(element), args);
+            }
+        }
+        return this;
+    },
+
+    /**
+     * Returns a flyweight Element of the dom element object at the specified index
+     * @param {Number} index
+     * @return {Ext.dom.Element}
+     */
+    item: function(index) {
+        var el = this.elements[index],
+            out = null;
+
+        if (el) {
+            out = this.getElement(el);
+        }
+
+        return out;
+    },
+
+    /**
+     * Gets a range nodes.
+     * @param {Number} start (optional) The index of the first node in the range
+     * @param {Number} end (optional) The index of the last node in the range
+     * @return {HTMLElement[]} An array of nodes
+     */
+    slice: function() {
+        return this.elements.slice.apply(this.elements, arguments);
+    },
+
+    // fixes scope with flyweight
+    addListener: function(eventName, handler, scope, opt) {
+        var els = this.elements,
+                len = els.length,
+                i, e;
+
+        for (i = 0; i < len; i++) {
+            e = els[i];
+            if (e) {
+                Ext.EventManager.on(e, eventName, handler, scope || e, opt);
+            }
+        }
+        return this;
+    },
+    /**
+     * Calls the passed function for each element in this composite.
+     * @param {Function} fn The function to call.
+     * @param {Ext.dom.Element} fn.el The current Element in the iteration. **This is the flyweight
+     * (shared) Ext.dom.Element instance, so if you require a a reference to the dom node, use el.dom.**
+     * @param {Ext.dom.CompositeElement} fn.c This Composite object.
+     * @param {Number} fn.index The zero-based index in the iteration.
+     * @param {Object} [scope] The scope (this reference) in which the function is executed.
+     * Defaults to the Element.
+     * @return {Ext.dom.CompositeElement} this
+     */
+    each: function(fn, scope) {
+        var me  = this,
+            els = me.elements,
+            len = els.length,
+            i, e;
+
+        for (i = 0; i < len; i++) {
+            e = els[i];
+            if (e) {
+                e = this.getElement(e);
+                if (fn.call(scope || e, e, me, i) === false) {
+                    break;
+                }
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Clears this Composite and adds the elements passed.
+     * @param {HTMLElement[]/Ext.dom.CompositeElement} els Either an array of DOM elements, or another Composite from which
+     * to fill this Composite.
+     * @return {Ext.dom.CompositeElement} this
+     */
+    fill: function(els) {
+        var me = this;
+        me.elements = [];
+        me.add(els);
+        return me;
+    },
+
+    insert: function(index, nodes) {
+        Ext.Array.insert(this.elements, index, nodes);
+    },
+
+    /**
+     * Filters this composite to only elements that match the passed selector.
+     * @param {String/Function} selector A string CSS selector or a comparison function. The comparison function will be
+     * called with the following arguments:
+     * @param {Ext.dom.Element} selector.el The current DOM element.
+     * @param {Number} selector.index The current index within the collection.
+     * @return {Ext.dom.CompositeElement} this
+     */
+    filter: function(selector) {
+        var me  = this,
+            els = me.elements,
+            len = els.length,
+            out = [],
+            i = 0,
+            isFunc = typeof selector == 'function',
+            add,
+            el;
+
+        for (; i < len; i++) {
+            el = els[i];
+            add = false;
+            if (el) {
+                el = me.getElement(el);
+
+                if (isFunc) {
+                    add = selector.call(el, el, me, i) !== false;
+                } else {
+                    add = el.is(selector);
+                }
+                
+                if (add) {
+                    out.push(me.transformElement(el));
+                }
+            }
+        }
+
+        me.elements = out;
+        return me;
+    },
+
+    /**
+     * Find the index of the passed element within the composite collection.
+     * @param {String/HTMLElement/Ext.Element/Number} el The id of an element, or an Ext.dom.Element, or an HtmlElement
+     * to find within the composite collection.
+     * @return {Number} The index of the passed Ext.dom.Element in the composite collection, or -1 if not found.
+     */
+    indexOf: function(el) {
+        return Ext.Array.indexOf(this.elements, this.transformElement(el));
+    },
+
+    /**
+     * Replaces the specified element with the passed element.
+     * @param {String/HTMLElement/Ext.Element/Number} el The id of an element, the Element itself, the index of the
+     * element in this composite to replace.
+     * @param {String/Ext.Element} replacement The id of an element or the Element itself.
+     * @param {Boolean} [domReplace] True to remove and replace the element in the document too.
+     * @return {Ext.dom.CompositeElement} this
+     */
+    replaceElement: function(el, replacement, domReplace) {
+        var index = !isNaN(el) ? el : this.indexOf(el),
+                d;
+        if (index > -1) {
+            replacement = Ext.getDom(replacement);
+            if (domReplace) {
+                d = this.elements[index];
+                d.parentNode.insertBefore(replacement, d);
+                Ext.removeNode(d);
+            }
+            Ext.Array.splice(this.elements, index, 1, replacement);
+        }
+        return this;
+    },
+
+    /**
+     * Removes all elements from this Composite.
+     * @param {Boolean} [removeDom] True to also remove the elements from the document.
+     */
+    clear: function(removeDom) {
+        var me  = this,
+            els = me.elements,
+            i = els.length - 1;
+        
+        if (removeDom) {
+            for (; i >= 0; i--) {
+                Ext.removeNode(els[i]);
+            }
+        }
+        this.elements = [];
+    },
+
+    addElements: function(els, root) {
+        if (!els) {
+            return this;
+        }
+
+        if (typeof els == "string") {
+            els = Ext.dom.Element.selectorFunction(els, root);
+        }
+
+        var yels = this.elements,
+            eLen = els.length,
+            e;
+
+        for (e = 0; e < eLen; e++) {
+            yels.push(Ext.get(els[e]));
+        }
+
+        return this;
+    },
+
+    /**
+     * Returns the first Element
+     * @return {Ext.dom.Element}
+     */
+    first: function() {
+        return this.item(0);
+    },
+
+    /**
+     * Returns the last Element
+     * @return {Ext.dom.Element}
+     */
+    last: function() {
+        return this.item(this.getCount() - 1);
+    },
+
+    /**
+     * Returns true if this composite contains the passed element.
+     * @param {String/HTMLElement/Ext.Element/Number} el The id of an element, or an Ext.Element, or an HtmlElement to
+     * find within the composite collection.
+     * @return {Boolean}
+     */
+    contains: function(el) {
+        return this.indexOf(el) != -1;
+    },
+
+    /**
+     * Removes the specified element(s).
+     * @param {String/HTMLElement/Ext.Element/Number} el The id of an element, the Element itself, the index of the
+     * element in this composite or an array of any of those.
+     * @param {Boolean} [removeDom] True to also remove the element from the document.
+     * @return {Ext.dom.CompositeElement} this
+     */
+    removeElement: function(keys, removeDom) {
+        keys = [].concat(keys);
+
+        var me       = this,
+            elements = me.elements,
+            kLen     = keys.length,
+            val, el, k;
+
+        for (k = 0; k < kLen; k++) {
+            val = keys[k];
+
+            if ((el = (elements[val] || elements[val = me.indexOf(val)]))) {
+                if (removeDom) {
+                    if (el.dom) {
+                        el.remove();
+                    } else {
+                        Ext.removeNode(el);
+                    }
+                }
+                Ext.Array.erase(elements, val, 1);
+            }
+        }
+
+        return me;
+    }
+
+}, function() {
+    this.importElementMethods();
+
+    this.prototype.on = this.prototype.addListener;
+
+    if (Ext.DomQuery){
+        Ext.dom.Element.selectorFunction = Ext.DomQuery.select;
+    }
+
+    /**
+     * Selects elements based on the passed CSS selector to enable {@link Ext.Element Element} methods
+     * to be applied to many related elements in one statement through the returned
+     * {@link Ext.dom.CompositeElement CompositeElement} or
+     * {@link Ext.dom.CompositeElementLite CompositeElementLite} object.
+     * @param {String/HTMLElement[]} selector The CSS selector or an array of elements
+     * @param {HTMLElement/String} [root] The root element of the query or id of the root
+     * @return {Ext.dom.CompositeElementLite/Ext.dom.CompositeElement}
+     * @member Ext.dom.Element
+     * @method select
+     * @static
+     * @ignore
+     */
+   Ext.dom.Element.select = function(selector, root) {
+        var elements;
+
+        if (typeof selector == "string") {
+            elements = Ext.dom.Element.selectorFunction(selector, root);
+        }
+        else if (selector.length !== undefined) {
+            elements = selector;
+        }
+        else {
+            throw new Error("[Ext.select] Invalid selector specified: " + selector);
+        }
+
+        return new Ext.CompositeElementLite(elements);
+    };
+
+    /**
+     * @member Ext
+     * @method select
+     * @inheritdoc Ext.dom.Element#select
+     * @ignore
+     */
+    Ext.select = function() {
+        return Ext.dom.Element.select.apply(Ext.dom.Element, arguments);
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @tag dom,core
+/**
+ * @class Ext.dom.CompositeElement
+ * <p>This class encapsulates a <i>collection</i> of DOM elements, providing methods to filter
+ * members, or to perform collective actions upon the whole set.</p>
+ * <p>Although they are not listed, this class supports all of the methods of {@link Ext.dom.Element} and
+ * {@link Ext.fx.Anim}. The methods from these classes will be performed on all the elements in this collection.</p>
+ * <p>All methods return <i>this</i> and can be chained.</p>
+ * Usage:
+ <pre><code>
+ var els = Ext.select("#some-el div.some-class", true);
+ // or select directly from an existing element
+ var el = Ext.get('some-el');
+ el.select('div.some-class', true);
+
+ els.setWidth(100); // all elements become 100 width
+ els.hide(true); // all elements fade out and hide
+ // or
+ els.setWidth(100).hide(true);
+ </code></pre>
+ */
+Ext.define('Ext.dom.CompositeElement', {
+    alternateClassName: 'Ext.CompositeElement',
+
+    extend:  Ext.dom.CompositeElementLite ,
+
+    // private
+    getElement: function(el) {
+        // In this case just return it, since we already have a reference to it
+        return el;
+    },
+
+    // private
+    transformElement: function(el) {
+        return Ext.get(el);
+    }
+
+}, function() {
+    /**
+     * Selects elements based on the passed CSS selector to enable {@link Ext.Element Element} methods
+     * to be applied to many related elements in one statement through the returned {@link Ext.CompositeElement CompositeElement} or
+     * {@link Ext.CompositeElementLite CompositeElementLite} object.
+     * @param {String/HTMLElement[]} selector The CSS selector or an array of elements
+     * @param {Boolean} [unique] true to create a unique Ext.Element for each element (defaults to a shared flyweight object)
+     * @param {HTMLElement/String} [root] The root element of the query or id of the root
+     * @return {Ext.CompositeElementLite/Ext.CompositeElement}
+     * @member Ext.dom.Element
+     * @method select
+     * @static
+     */
+
+    Ext.dom.Element.select = function(selector, unique, root) {
+        var elements;
+
+        if (typeof selector == "string") {
+            elements = Ext.dom.Element.selectorFunction(selector, root);
+        }
+        else if (selector.length !== undefined) {
+            elements = selector;
+        }
+        else {
+            throw new Error("[Ext.select] Invalid selector specified: " + selector);
+        }
+        return (unique === true) ? new Ext.CompositeElement(elements) : new Ext.CompositeElementLite(elements);
+    };
+});
+
+/**
+ * Shorthand of {@link Ext.Element#method-select}.
+ * @member Ext
+ * @method select
+ * @inheritdoc Ext.Element#select
+ */
+Ext.select = Ext.Element.select;
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents a collection of a set of key and value pairs. Each key in the HashMap
+ * must be unique, the same key cannot exist twice. Access to items is provided via
+ * the key only. Sample usage:
+ *
+ *     var map = new Ext.util.HashMap();
+ *     map.add('key1', 1);
+ *     map.add('key2', 2);
+ *     map.add('key3', 3);
+ *
+ *     map.each(function(key, value, length){
+ *         console.log(key, value, length);
+ *     });
+ *
+ * The HashMap is an unordered class,
+ * there is no guarantee when iterating over the items that they will be in any particular
+ * order. If this is required, then use a {@link Ext.util.MixedCollection}.
+ */
+Ext.define('Ext.util.HashMap', {
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @private Mutation counter which is incremented upon add and remove.
+     */
+    generation: 0,
+    
+    /**
+     * @cfg {Function} keyFn A function that is used to retrieve a default key for a passed object.
+     * A default is provided that returns the `id` property on the object. This function is only used
+     * if the `add` method is called with a single argument.
+     */
+
+    /**
+     * Creates new HashMap.
+     * @param {Object} config (optional) Config object.
+     */
+    constructor: function(config) {
+        config = config || {};
+
+        var me = this,
+            keyFn = config.keyFn;
+
+        me.initialConfig = config;
+        me.addEvents(
+            /**
+             * @event add
+             * Fires when a new item is added to the hash.
+             * @param {Ext.util.HashMap} this
+             * @param {String} key The key of the added item.
+             * @param {Object} value The value of the added item.
+             */
+            'add',
+            /**
+             * @event clear
+             * Fires when the hash is cleared.
+             * @param {Ext.util.HashMap} this
+             */
+            'clear',
+            /**
+             * @event remove
+             * Fires when an item is removed from the hash.
+             * @param {Ext.util.HashMap} this
+             * @param {String} key The key of the removed item.
+             * @param {Object} value The value of the removed item.
+             */
+            'remove',
+            /**
+             * @event replace
+             * Fires when an item is replaced in the hash.
+             * @param {Ext.util.HashMap} this
+             * @param {String} key The key of the replaced item.
+             * @param {Object} value The new value for the item.
+             * @param {Object} old The old value for the item.
+             */
+            'replace'
+        );
+
+        me.mixins.observable.constructor.call(me, config);
+        me.clear(true);
+
+        if (keyFn) {
+            me.getKey = keyFn;
+        }
+    },
+
+    /**
+     * Gets the number of items in the hash.
+     * @return {Number} The number of items in the hash.
+     */
+    getCount: function() {
+        return this.length;
+    },
+
+    /**
+     * Implementation for being able to extract the key from an object if only
+     * a single argument is passed.
+     * @private
+     * @param {String} key The key
+     * @param {Object} value The value
+     * @return {Array} [key, value]
+     */
+    getData: function(key, value) {
+        // if we have no value, it means we need to get the key from the object
+        if (value === undefined) {
+            value = key;
+            key = this.getKey(value);
+        }
+
+        return [key, value];
+    },
+
+    /**
+     * Extracts the key from an object. This is a default implementation, it may be overridden
+     * @param {Object} o The object to get the key from
+     * @return {String} The key to use.
+     */
+    getKey: function(o) {
+        return o.id;
+    },
+
+    /**
+     * Adds an item to the collection. Fires the {@link #event-add} event when complete.
+     *
+     * @param {String/Object} key The key to associate with the item, or the new item.
+     *
+     * If a {@link #getKey} implementation was specified for this HashMap,
+     * or if the key of the stored items is in a property called `id`,
+     * the HashMap will be able to *derive* the key for the new item.
+     * In this case just pass the new item in this parameter.
+     *
+     * @param {Object} [o] The item to add.
+     *
+     * @return {Object} The item added.
+     */
+    add: function(key, value) {
+        var me = this;
+
+        // Need to check arguments length here, since we could have called:
+        // map.add('foo', undefined);
+        if (arguments.length === 1) {
+            value = key;
+            key = me.getKey(value);
+        }
+
+        if (me.containsKey(key)) {
+            return me.replace(key, value);
+        }
+
+        me.map[key] = value;
+        ++me.length;
+        me.generation++;
+        if (me.hasListeners.add) {
+            me.fireEvent('add', me, key, value);
+        }
+        return value;
+    },
+
+    /**
+     * Replaces an item in the hash. If the key doesn't exist, the
+     * {@link #method-add} method will be used.
+     * @param {String} key The key of the item.
+     * @param {Object} value The new value for the item.
+     * @return {Object} The new value of the item.
+     */
+    replace: function(key, value) {
+        var me = this,
+            map = me.map,
+            old;
+
+        // Need to check arguments length here, since we could have called:
+        // map.replace('foo', undefined);
+        if (arguments.length === 1) {
+            value = key;
+            key = me.getKey(value);
+        }
+
+        if (!me.containsKey(key)) {
+            me.add(key, value);
+        }
+        old = map[key];
+        map[key] = value;
+        me.generation++;
+        if (me.hasListeners.replace) {
+            me.fireEvent('replace', me, key, value, old);
+        }
+        return value;
+    },
+
+    /**
+     * Remove an item from the hash.
+     * @param {Object} o The value of the item to remove.
+     * @return {Boolean} True if the item was successfully removed.
+     */
+    remove: function(o) {
+        var key = this.findKey(o);
+        if (key !== undefined) {
+            return this.removeAtKey(key);
+        }
+        return false;
+    },
+
+    /**
+     * Remove an item from the hash.
+     * @param {String} key The key to remove.
+     * @return {Boolean} True if the item was successfully removed.
+     */
+    removeAtKey: function(key) {
+        var me = this,
+            value;
+
+        if (me.containsKey(key)) {
+            value = me.map[key];
+            delete me.map[key];
+            --me.length;
+            me.generation++;
+            if (me.hasListeners.remove) {
+                me.fireEvent('remove', me, key, value);
+            }
+            return true;
+        }
+        return false;
+    },
+
+    /**
+     * Retrieves an item with a particular key.
+     * @param {String} key The key to lookup.
+     * @return {Object} The value at that key. If it doesn't exist, `undefined` is returned.
+     */
+    get: function(key) {
+        var map = this.map;
+        return map.hasOwnProperty(key) ? map[key] : undefined;
+    },
+
+    /**
+     * Removes all items from the hash.
+     * @return {Ext.util.HashMap} this
+     */
+    clear: function(/* private */ initial) {
+        var me = this;
+
+        // Only clear if it has ever had any content
+        if (initial || me.generation) {
+            me.map = {};
+            me.length = 0;
+            me.generation = initial ? 0 : me.generation + 1;
+        }
+        if (initial !== true && me.hasListeners.clear) {
+            me.fireEvent('clear', me);
+        }
+        return me;
+    },
+
+    /**
+     * Checks whether a key exists in the hash.
+     * @param {String} key The key to check for.
+     * @return {Boolean} True if they key exists in the hash.
+     */
+    containsKey: function(key) {
+        var map = this.map;
+        return map.hasOwnProperty(key) && map[key] !== undefined;
+    },
+
+    /**
+     * Checks whether a value exists in the hash.
+     * @param {Object} value The value to check for.
+     * @return {Boolean} True if the value exists in the dictionary.
+     */
+    contains: function(value) {
+        return this.containsKey(this.findKey(value));
+    },
+
+    /**
+     * Return all of the keys in the hash.
+     * @return {Array} An array of keys.
+     */
+    getKeys: function() {
+        return this.getArray(true);
+    },
+
+    /**
+     * Return all of the values in the hash.
+     * @return {Array} An array of values.
+     */
+    getValues: function() {
+        return this.getArray(false);
+    },
+
+    /**
+     * Gets either the keys/values in an array from the hash.
+     * @private
+     * @param {Boolean} isKey True to extract the keys, otherwise, the value
+     * @return {Array} An array of either keys/values from the hash.
+     */
+    getArray: function(isKey) {
+        var arr = [],
+            key,
+            map = this.map;
+        for (key in map) {
+            if (map.hasOwnProperty(key)) {
+                arr.push(isKey ? key: map[key]);
+            }
+        }
+        return arr;
+    },
+
+    /**
+     * Executes the specified function once for each item in the hash.
+     * Returning false from the function will cease iteration.
+     *
+     * @param {Function} fn The function to execute.
+     * @param {String} fn.key The key of the item.
+     * @param {Number} fn.value The value of the item.
+     * @param {Number} fn.length The total number of items in the hash.
+     * @param {Object} [scope] The scope to execute in. Defaults to <tt>this</tt>.
+     * @return {Ext.util.HashMap} this
+     */
+    each: function(fn, scope) {
+        // copy items so they may be removed during iteration.
+        var items = Ext.apply({}, this.map),
+            key,
+            length = this.length;
+
+        scope = scope || this;
+        for (key in items) {
+            if (items.hasOwnProperty(key)) {
+                if (fn.call(scope, key, items[key], length) === false) {
+                    break;
+                }
+            }
+        }
+        return this;
+    },
+
+    /**
+     * Performs a shallow copy on this hash.
+     * @return {Ext.util.HashMap} The new hash object.
+     */
+    clone: function() {
+        var hash = new this.self(this.initialConfig),
+            map = this.map,
+            key;
+
+        hash.suspendEvents();
+        for (key in map) {
+            if (map.hasOwnProperty(key)) {
+                hash.add(key, map[key]);
+            }
+        }
+        hash.resumeEvents();
+        return hash;
+    },
+
+    /**
+     * @private
+     * Find the key for a value.
+     * @param {Object} value The value to find.
+     * @return {Object} The value of the item. Returns <tt>undefined</tt> if not found.
+     */
+    findKey: function(value) {
+        var key,
+            map = this.map;
+
+        for (key in map) {
+            if (map.hasOwnProperty(key) && map[key] === value) {
+                return key;
+            }
+        }
+        return undefined;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Base Manager class
+ */
+Ext.define('Ext.AbstractManager', {
+
+    /* Begin Definitions */
+
+                                   
+
+    /* End Definitions */
+
+    typeName: 'type',
+
+    constructor: function(config) {
+        Ext.apply(this, config || {});
+
+        /**
+         * @property {Ext.util.HashMap} all
+         * Contains all of the items currently managed
+         */
+        this.all = new Ext.util.HashMap();
+
+        this.types = {};
+    },
+
+    /**
+     * Returns an item by id.
+     * For additional details see {@link Ext.util.HashMap#get}.
+     * @param {String} id The id of the item
+     * @return {Object} The item, undefined if not found.
+     */
+    get : function(id) {
+        return this.all.get(id);
+    },
+
+    /**
+     * Registers an item to be managed
+     * @param {Object} item The item to register
+     */
+    register: function(item) {
+        var all = this.all,
+            key = all.getKey(item);
+            
+        if (all.containsKey(key)) {
+            Ext.Error.raise('Registering duplicate id "' + key + '" with this manager');
+        }
+        this.all.add(item);
+    },
+
+    /**
+     * Unregisters an item by removing it from this manager
+     * @param {Object} item The item to unregister
+     */
+    unregister: function(item) {
+        this.all.remove(item);
+    },
+
+    /**
+     * Registers a new item constructor, keyed by a type key.
+     * @param {String} type The mnemonic string by which the class may be looked up.
+     * @param {Function} cls The new instance class.
+     */
+    registerType : function(type, cls) {
+        this.types[type] = cls;
+        cls[this.typeName] = type;
+    },
+
+    /**
+     * Checks if an item type is registered.
+     * @param {String} type The mnemonic string by which the class may be looked up
+     * @return {Boolean} Whether the type is registered.
+     */
+    isRegistered : function(type){
+        return this.types[type] !== undefined;
+    },
+
+    /**
+     * Creates and returns an instance of whatever this manager manages, based on the supplied type and
+     * config object.
+     * @param {Object} config The config object
+     * @param {String} defaultType If no type is discovered in the config object, we fall back to this type
+     * @return {Object} The instance of whatever this manager is managing
+     */
+    create: function(config, defaultType) {
+        var type        = config[this.typeName] || config.type || defaultType,
+            Constructor = this.types[type];
+
+        if (Constructor === undefined) {
+            Ext.Error.raise("The '" + type + "' type has not been registered with this manager");
+        }
+
+        return new Constructor(config);
+    },
+
+    /**
+     * Registers a function that will be called when an item with the specified id is added to the manager.
+     * This will happen on instantiation.
+     * @param {String} id The item id
+     * @param {Function} fn The callback function. Called with a single parameter, the item.
+     * @param {Object} scope The scope (this reference) in which the callback is executed.
+     * Defaults to the item.
+     */
+    onAvailable : function(id, fn, scope){
+        var all = this.all,
+            item,
+            callback;
+        
+        if (all.containsKey(id)) {
+            item = all.get(id);
+            fn.call(scope || item, item);
+        } else {
+            callback = function(map, key, item){
+                if (key == id) {
+                    fn.call(scope || item, item);
+                    all.un('add', callback);
+                }
+            }; 
+            all.on('add', callback);
+        }
+    },
+    
+    /**
+     * Executes the specified function once for each item in the collection.
+     * @param {Function} fn The function to execute.
+     * @param {String} fn.key The key of the item
+     * @param {Number} fn.value The value of the item
+     * @param {Number} fn.length The total number of items in the collection
+     * @param {Boolean} fn.return False to cease iteration.
+     * @param {Object} scope The scope to execute in. Defaults to `this`.
+     */
+    each: function(fn, scope){
+        this.all.each(fn, scope || this);    
+    },
+    
+    /**
+     * Gets the number of items in the collection.
+     * @return {Number} The number of items in the collection.
+     */
+    getCount: function(){
+        return this.all.getCount();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.ComponentManager
+ * <p>Provides a registry of all Components (instances of {@link Ext.Component} or any subclass
+ * thereof) on a page so that they can be easily accessed by {@link Ext.Component component}
+ * {@link Ext.Component#id id} (see {@link #get}, or the convenience method {@link Ext#getCmp Ext.getCmp}).</p>
+ * <p>This object also provides a registry of available Component <i>classes</i>
+ * indexed by a mnemonic code known as the Component's {@link Ext.Component#xtype xtype}.
+ * The <code>xtype</code> provides a way to avoid instantiating child Components
+ * when creating a full, nested config object for a complete Ext page.</p>
+ * <p>A child Component may be specified simply as a <i>config object</i>
+ * as long as the correct <code>{@link Ext.Component#xtype xtype}</code> is specified so that if and when the Component
+ * needs rendering, the correct type can be looked up for lazy instantiation.</p>
+ * <p>For a list of all available <code>{@link Ext.Component#xtype xtypes}</code>, see {@link Ext.Component}.</p>
+ * @singleton
+ */
+Ext.define('Ext.ComponentManager', {
+    extend:  Ext.AbstractManager ,
+    alternateClassName: 'Ext.ComponentMgr',
+    
+    singleton: true,
+    
+    typeName: 'xtype',
+    
+    /**
+     * Creates a new Component from the specified config object using the
+     * config object's xtype to determine the class to instantiate.
+     * @param {Object} config A configuration object for the Component you wish to create.
+     * @param {String} defaultType (optional) The xtype to use if the config object does not
+     * contain a <code>xtype</code>. (Optional if the config contains a <code>xtype</code>).
+     * @return {Ext.Component} The newly instantiated Component.
+     */
+    create: function(component, defaultType){
+        if (typeof component == 'string') {
+            return Ext.widget(component);
+        }
+        if (component.isComponent) {
+            return component;
+        }
+        return Ext.widget(component.xtype || defaultType, component);
+    },
+
+    registerType: function(type, cls) {
+        this.types[type] = cls;
+        cls[this.typeName] = type;
+        cls.prototype[this.typeName] = type;
+    }
+},
+function () {
+    /**
+     * This is shorthand reference to {@link Ext.ComponentManager#get}.
+     * Looks up an existing {@link Ext.Component Component} by {@link Ext.Component#id id}
+     *
+     * @param {String} id The component {@link Ext.Component#id id}
+     * @return Ext.Component The Component, `undefined` if not found, or `null` if a
+     * Class was found.
+     * @member Ext
+    */
+    Ext.getCmp = function(id) {
+        return Ext.ComponentManager.get(id);
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides searching of Components within Ext.ComponentManager (globally) or a specific
+ * Ext.container.Container on the document with a similar syntax to a CSS selector.
+ * Returns Array of matching Components, or empty Array.
+ *
+ * ## Basic Component lookup
+ *
+ * Components can be retrieved by using their {@link Ext.Component xtype}:
+ *
+ * - `component`
+ * - `gridpanel`
+ *
+ * Matching by `xtype` matches inherited types, so in the following code, the previous field
+ * *of any type which inherits from `TextField`* will be found:
+ *
+ *     prevField = myField.previousNode('textfield');
+ *
+ * To match only the exact type, pass the "shallow" flag by adding `(true)` to xtype
+ * (See AbstractComponent's {@link Ext.AbstractComponent#isXType isXType} method):
+ *
+ *     prevTextField = myField.previousNode('textfield(true)');
+ *
+ * You can search Components by their `id` or `itemId` property, prefixed with a #:
+ *
+ *     #myContainer
+ *
+ * Component `xtype` and `id` or `itemId` can be used together to avoid possible
+ * id collisions between Components of different types:
+ *
+ *     panel#myPanel
+ *
+ * ## Traversing Component tree
+ *
+ * Components can be found by their relation to other Components. There are several
+ * relationship operators, mostly taken from CSS selectors:
+ *
+ * - **`E F`** All descendant Components of E that match F
+ * - **`E > F`** All direct children Components of E that match F
+ * - **`E ^ F`** All parent Components of E that match F
+ *
+ * Expressions between relationship operators are matched left to right, i.e. leftmost
+ * selector is applied first, then if one or more matches are found, relationship operator
+ * itself is applied, then next selector expression, etc. It is possible to combine
+ * relationship operators in complex selectors:
+ *
+ *     window[title="Input form"] textfield[name=login] ^ form > button[action=submit]
+ *
+ * That selector can be read this way: Find a window with title "Input form", in that
+ * window find a TextField with name "login" at any depth (including subpanels and/or
+ * FieldSets), then find an `Ext.form.Panel` that is a parent of the TextField, and in
+ * that form find a direct child that is a button with custom property `action` set to
+ * value "submit".
+ *
+ * Whitespace on both sides of `^` and `>` operators is non-significant, i.e. can be
+ * omitted, but usually is used for clarity.
+ *
+ * ## Searching by Component attributes
+ *
+ * Components can be searched by their object property values (attributes). To do that,
+ * use attribute matching expression in square brackets:
+ *
+ * - `component[autoScroll]` - matches any Component that has `autoScroll` property with
+ * any truthy (non-empty, not `false`) value.
+ * - `panel[title="Test"]` - matches any Component that has `title` property set to
+ * "Test". Note that if the value does not contain spaces, the quotes are optional.
+ *
+ * Attributes can use any of the operators in {@link Ext.dom.Query DomQuery}'s
+ * {@link Ext.dom.Query#operators operators} to compare values.
+ *
+ * Prefixing the attribute name with an at sign `@` means that the property must be
+ * the object's `ownProperty`, not a property from the prototype chain.
+ *
+ * Specifications like `[propName]` check that the property is a truthy value. To check
+ * that the object has an `ownProperty` of a certain name, regardless of the value use
+ * the form `[?propName]`.
+ *
+ * The specified value is coerced to match the type of the property found in the
+ * candidate Component using {@link Ext#coerce}.
+ *
+ * If you need to find Components by their `itemId` property, use `#id` form; it will
+ * do the same but is easier to read.
+ *
+ * ## Attribute matching operators
+ *
+ * The '=' operator will return the results that **exactly** match the
+ * specified object property (attribute):
+ *
+ *     Ext.ComponentQuery.query('panel[cls=my-cls]');
+ *
+ * Will match the following Component:
+ *
+ *     Ext.create('Ext.window.Window', {
+ *         cls: 'my-cls'
+ *     });
+ *
+ * But will not match the following Component, because 'my-cls' is one value
+ * among others:
+ *
+ *      Ext.create('Ext.panel.Panel', {
+ *          cls: 'foo-cls my-cls bar-cls'
+ *      });
+ *
+ * You can use the '~=' operator instead, it will return Components with
+ * the property that **exactly** matches one of the whitespace-separated
+ * values. This is also true for properties that only have *one* value:
+ *
+ *     Ext.ComponentQuery.query('panel[cls~=my-cls]');
+ *
+ * Will match both Components:
+ *
+ *     Ext.create('Ext.panel.Panel', {
+ *         cls: 'foo-cls my-cls bar-cls'
+ *     });
+ *     
+ *     Ext.create('Ext.window.Window', {
+ *         cls: 'my-cls'
+ *     });
+ *
+ * Generally, '=' operator is more suited for object properties other than
+ * CSS classes, while '~=' operator will work best with properties that
+ * hold lists of whitespace-separated CSS classes.
+ *
+ * The '^=' operator will return Components with specified attribute that
+ * start with the passed value:
+ *
+ *     Ext.ComponentQuery.query('panel[title^=Sales]');
+ *
+ * Will match the following Component:
+ *
+ *     Ext.create('Ext.panel.Panel', {
+ *         title: 'Sales estimate for Q4'
+ *     });
+ *
+ * The '$=' operator will return Components with specified properties that
+ * end with the passed value:
+ *
+ *     Ext.ComponentQuery.query('field[fieldLabel$=name]');
+ *
+ * Will match the following Component:
+ *
+ *     Ext.create('Ext.form.field.Text', {
+ *         fieldLabel: 'Enter your name'
+ *     });
+ *
+ * The following test will find panels with their `ownProperty` collapsed being equal to
+ * `false`. It will **not** match a collapsed property from the prototype chain.
+ *
+ *     Ext.ComponentQuery.query('panel[@collapsed=false]');
+ *
+ * Member expressions from candidate Components may be tested. If the expression returns
+ * a *truthy* value, the candidate Component will be included in the query:
+ *
+ *     var disabledFields = myFormPanel.query("{isDisabled()}");
+ *
+ * Such expressions are executed in Component's context, and the above expression is
+ * similar to running this snippet for every Component in your application:
+ *
+ *      if (component.isDisabled()) {
+ *          matches.push(component);
+ *      }
+ *
+ * It is important to use only methods that are available in **every** Component instance
+ * to avoid run time exceptions. If you need to match your Components with a custom
+ * condition formula, you can augment `Ext.Component` to provide custom matcher that
+ * will return `false` by default, and override it in your custom classes:
+ * 
+ *      Ext.define('My.Component', {
+ *          override: 'Ext.Component',
+ *          myMatcher: function() { return false; }
+ *      });
+ *
+ *      Ext.define('My.Panel', {
+ *          extend: 'Ext.panel.Panel',
+ *          requires: ['My.Component'],     // Ensure that Component override is applied
+ *          myMatcher: function(selector) {
+ *              return selector === 'myPanel';
+ *          }
+ *      });
+ *
+ * After that you can use a selector with your custom matcher to find all instances
+ * of `My.Panel`:
+ *
+ *      Ext.ComponentQuery.query("{myMatcher('myPanel')}");
+ *
+ * However if you really need to use a custom matcher, you may find it easier to implement
+ * a custom Pseudo class instead (see below).
+ *
+ * ## Conditional matching
+ *
+ * Attribute matchers can be combined to select only Components that match **all**
+ * conditions (logical AND operator):
+ *
+ *     Ext.ComponentQuery.query('panel[cls~=my-cls][floating=true][title$="sales data"]');
+ *
+ * E.g., the query above will match only a Panel-descended Component that has 'my-cls'
+ * CSS class *and* is floating *and* with a title that ends with "sales data".
+ *
+ * Expressions separated with commas will match any Component that satisfies
+ * *either* expression (logical OR operator):
+ *
+ *     Ext.ComponentQuery.query('field[fieldLabel^=User], field[fieldLabel*=password]');
+ *
+ * E.g., the query above will match any field with field label starting with "User",
+ * *or* any field that has "password" in its label.
+ *
+ * ## Pseudo classes
+ *
+ * Pseudo classes may be used to filter results in the same way as in
+ * {@link Ext.dom.Query}. There are five default pseudo classes:
+ *
+ * * `not` Negates a selector.
+ * * `first` Filters out all except the first matching item for a selector.
+ * * `last` Filters out all except the last matching item for a selector.
+ * * `focusable` Filters out all except Components which are currently able to recieve
+ * focus.
+ * * `nth-child` Filters Components by ordinal position in the selection.
+ *
+ * These pseudo classes can be used with other matchers or without them:
+ *
+ *      // Select first direct child button in any panel
+ *      Ext.ComponentQuery.query('panel > button:first');
+ *
+ *      // Select last field in Profile form
+ *      Ext.ComponentQuery.query('form[title=Profile] field:last');
+ * 
+ *      // Find first focusable Component in a panel and focus it
+ *      panel.down(':focusable').focus();
+ * 
+ *      // Select any field that is not hidden in a form
+ *      form.query('field:not(hiddenfield)');
+ *
+ * Pseudo class `nth-child` can be used to find any child Component by its
+ * position relative to its siblings. This class' handler takes one argument
+ * that specifies the selection formula as `Xn` or `Xn+Y`:
+ *
+ *      // Find every odd field in a form
+ *      form.query('field:nth-child(2n+1)'); // or use shortcut: :nth-child(odd)
+ *
+ *      // Find every even field in a form
+ *      form.query('field:nth-child(2n)');   // or use shortcut: :nth-child(even)
+ *
+ *      // Find every 3rd field in a form
+ *      form.query('field:nth-child(3n)');
+ *
+ * Pseudo classes can be combined to further filter the results, e.g., in the
+ * form example above we can modify the query to exclude hidden fields:
+ *
+ *      // Find every 3rd non-hidden field in a form
+ *      form.query('field:not(hiddenfield):nth-child(3n)');
+ *
+ * Note that when combining pseudo classes, whitespace is significant, i.e.
+ * there should be no spaces between pseudo classes. This is a common mistake;
+ * if you accidentally type a space between `field` and `:not`, the query
+ * will not return any result because it will mean "find *field's children
+ * Components* that are not hidden fields...".
+ *
+ * ## Custom pseudo classes
+ *
+ * It is possible to define your own custom pseudo classes. In fact, a
+ * pseudo class is just a property in `Ext.ComponentQuery.pseudos` object
+ * that defines pseudo class name (property name) and pseudo class handler
+ * (property value):
+ *
+ *     // Function receives array and returns a filtered array.
+ *     Ext.ComponentQuery.pseudos.invalid = function(items) {
+ *         var i = 0, l = items.length, c, result = [];
+ *         for (; i < l; i++) {
+ *             if (!(c = items[i]).isValid()) {
+ *                 result.push(c);
+ *             }
+ *         }
+ *         return result;
+ *     };
+ * 
+ *     var invalidFields = myFormPanel.query('field:invalid');
+ *     if (invalidFields.length) {
+ *         invalidFields[0].getEl().scrollIntoView(myFormPanel.body);
+ *         for (var i = 0, l = invalidFields.length; i < l; i++) {
+ *             invalidFields[i].getEl().frame("red");
+ *         }
+ *     }
+ *
+ * Pseudo class handlers can be even more flexible, with a selector
+ * argument used to define the logic:
+ *
+ *      // Handler receives array of itmes and selector in parentheses
+ *      Ext.ComponentQuery.pseudos.titleRegex = function(components, selector) {
+ *          var i = 0, l = components.length, c, result = [], regex = new RegExp(selector);
+ *          for (; i < l; i++) {
+ *              c = components[i];
+ *              if (c.title && regex.test(c.title)) {
+ *                  result.push(c);
+ *              }
+ *          }
+ *          return result;
+ *      }
+ *
+ *      var salesTabs = tabPanel.query('panel:titleRegex("sales\\s+for\\s+201[123]")');
+ *
+ * Be careful when using custom pseudo classes with MVC Controllers: when
+ * you use a pseudo class in Controller's `control` or `listen` component
+ * selectors, the pseudo class' handler function will be called very often
+ * and may slow down your application significantly. A good rule of thumb
+ * is to always specify Component xtype with the pseudo class so that the
+ * handlers are only called on Components that you need, and try to make
+ * the condition checks as cheap in terms of execution time as possible.
+ * Note how in the example above, handler function checks that Component
+ * *has* a title first, before running regex test on it.
+ *
+ * ## Query examples
+ *
+ * Queries return an array of Components. Here are some example queries:
+ *
+ *     // retrieve all Ext.Panels in the document by xtype
+ *     var panelsArray = Ext.ComponentQuery.query('panel');
+ *
+ *     // retrieve all Ext.Panels within the container with an id myCt
+ *     var panelsWithinmyCt = Ext.ComponentQuery.query('#myCt panel');
+ *
+ *     // retrieve all direct children which are Ext.Panels within myCt
+ *     var directChildPanel = Ext.ComponentQuery.query('#myCt > panel');
+ *
+ *     // retrieve all grids or trees
+ *     var gridsAndTrees = Ext.ComponentQuery.query('gridpanel, treepanel');
+ *     
+ *     // Focus first Component
+ *     myFormPanel.child(':focusable').focus();
+ *
+ *     // Retrieve every odd text field in a form
+ *     myFormPanel.query('textfield:nth-child(odd)');
+ *
+ *     // Retrieve every even field in a form, excluding hidden fields
+ *     myFormPanel.query('field:not(hiddenfield):nth-child(even)');
+ *
+ * For easy access to queries based from a particular Container see the
+ * {@link Ext.container.Container#query}, {@link Ext.container.Container#down} and
+ * {@link Ext.container.Container#child} methods. Also see
+ * {@link Ext.Component#up}.
+ */
+Ext.define('Ext.ComponentQuery', {
+    singleton: true 
+               
+                               
+                       
+     
+}, function() {
+
+    var cq = this,
+        domQueryOperators = Ext.dom.Query.operators,
+        nthRe = /(\d*)n\+?(\d*)/,
+        nthRe2 = /\D/,
+
+        // A function source code pattern with a placeholder which accepts an expression which yields a truth value when applied
+        // as a member on each item in the passed array.
+        filterFnPattern = [
+            'var r = [],',
+                'i = 0,',
+                'it = items,',
+                'l = it.length,',
+                'c;',
+            'for (; i < l; i++) {',
+                'c = it[i];',
+                'if (c.{0}) {',
+                   'r.push(c);',
+                '}',
+            '}',
+            'return r;'
+        ].join(''),
+
+        filterItems = function(items, operation) {
+            // Argument list for the operation is [ itemsArray, operationArg1, operationArg2...]
+            // The operation's method loops over each item in the candidate array and
+            // returns an array of items which match its criteria
+            return operation.method.apply(this, [ items ].concat(operation.args));
+        },
+
+        getItems = function(items, mode) {
+            var result = [],
+                i = 0,
+                length = items.length,
+                candidate,
+                deep = mode !== '>';
+                
+            for (; i < length; i++) {
+                candidate = items[i];
+                if (candidate.getRefItems) {
+                    result = result.concat(candidate.getRefItems(deep));
+                }
+            }
+            return result;
+        },
+
+        getAncestors = function(items) {
+            var result = [],
+                i = 0,
+                length = items.length,
+                candidate;
+            for (; i < length; i++) {
+                candidate = items[i];
+                while (!!(candidate = candidate.getRefOwner())) {
+                    result.push(candidate);
+                }
+            }
+            return result;
+        },
+
+        // Filters the passed candidate array and returns only items which match the passed xtype
+        filterByXType = function(items, xtype, shallow) {
+            if (xtype === '*') {
+                return items.slice();
+            }
+            else {
+                var result = [],
+                    i = 0,
+                    length = items.length,
+                    candidate;
+                for (; i < length; i++) {
+                    candidate = items[i];
+                    if (candidate.isXType(xtype, shallow)) {
+                        result.push(candidate);
+                    }
+                }
+                return result;
+            }
+        },
+
+        // Filters the passed candidate array and returns only items which have the passed className
+        filterByClassName = function(items, className) {
+            var result = [],
+                i = 0,
+                length = items.length,
+                candidate;
+            for (; i < length; i++) {
+                candidate = items[i];
+                if (candidate.hasCls(className)) {
+                    result.push(candidate);
+                }
+            }
+            return result;
+        },
+
+        // Filters the passed candidate array and returns only items which have the specified property match
+        filterByAttribute = function(items, property, operator, compareTo) {
+            var result = [],
+                i = 0,
+                length = items.length,
+                mustBeOwnProperty,
+                presenceOnly,
+                candidate, propValue,
+                j, propLen;
+
+            // Prefixing property name with an @ means that the property must be in the candidate, not in its prototype
+            if (property.charAt(0) === '@') {
+                mustBeOwnProperty = true;
+                property = property.substr(1);
+            }
+            if (property.charAt(0) === '?') {
+                mustBeOwnProperty = true;
+                presenceOnly = true;
+                property = property.substr(1);
+            }
+
+            for (; i < length; i++) {
+                candidate = items[i];
+
+                // Check candidate hasOwnProperty is propName prefixed with a bang.
+                if (!mustBeOwnProperty || candidate.hasOwnProperty(property)) {
+
+                    // pull out property value to test
+                    propValue = candidate[property];
+
+                    if (presenceOnly) {
+                        result.push(candidate);
+                    }
+                    // implies property is an array, and we must compare value against each element.
+                    else if (operator === '~=') {
+                        if (propValue) {
+                            //We need an array
+                            if (!Ext.isArray(propValue)) {
+                                propValue = propValue.split(' ');
+                            }
+
+                            for (j = 0, propLen = propValue.length; j < propLen; j++) {
+                                if (domQueryOperators[operator](Ext.coerce(propValue[j], compareTo), compareTo)) {
+                                    result.push(candidate);
+                                    break;
+                                }
+                            }
+                        }
+                    } else if (!compareTo ? !!candidate[property] : domQueryOperators[operator](Ext.coerce(propValue, compareTo), compareTo)) {
+                        result.push(candidate);
+                    }
+                }
+            }
+            return result;
+        },
+
+        // Filters the passed candidate array and returns only items which have the specified itemId or id
+        filterById = function(items, id) {
+            var result = [],
+                i = 0,
+                length = items.length,
+                candidate;
+            for (; i < length; i++) {
+                candidate = items[i];
+                if (candidate.getItemId() === id) {
+                    result.push(candidate);
+                }
+            }
+            return result;
+        },
+
+        // Filters the passed candidate array and returns only items which the named pseudo class matcher filters in
+        filterByPseudo = function(items, name, value) {
+            return cq.pseudos[name](items, value);
+        },
+
+        // Determines leading mode
+        // > for direct child, and ^ to switch to ownerCt axis
+        modeRe = /^(\s?([>\^])\s?|\s|$)/,
+
+        // Matches a token with possibly (true|false) appended for the "shallow" parameter
+        tokenRe = /^(#)?([\w\-]+|\*)(?:\((true|false)\))?/,
+
+        matchers = [{
+            // Checks for .xtype with possibly (true|false) appended for the "shallow" parameter
+            re: /^\.([\w\-]+)(?:\((true|false)\))?/,
+            method: filterByXType
+        }, {
+            // checks for [attribute=value], [attribute^=value], [attribute$=value], [attribute*=value], [attribute~=value], [attribute%=value], [attribute!=value]
+            // Allow [@attribute] to check truthy ownProperty
+            // Allow [?attribute] to check for presence of ownProperty
+            re: /^(?:\[((?:@|\?)?[\w\-\$]*[^\^\$\*~%!])\s?(?:(=|.=)\s?['"]?(.*?)["']?)?\])/,
+            method: filterByAttribute
+        }, {
+            // checks for #cmpItemId
+            re: /^#([\w\-]+)/,
+            method: filterById
+        }, {
+            // checks for :<pseudo_class>(<selector>)
+            re: /^\:([\w\-]+)(?:\(((?:\{[^\}]+\})|(?:(?!\{)[^\s>\/]*?(?!\})))\))?/,
+            method: filterByPseudo
+        }, {
+            // checks for {<member_expression>}
+            re: /^(?:\{([^\}]+)\})/,
+            method: filterFnPattern
+        }];
+
+    // Internal class Ext.ComponentQuery.Query
+    cq.Query = Ext.extend(Object, {
+        constructor: function(cfg) {
+            cfg = cfg || {};
+            Ext.apply(this, cfg);
+        },
+
+        // Executes this Query upon the selected root.
+        // The root provides the initial source of candidate Component matches which are progressively
+        // filtered by iterating through this Query's operations cache.
+        // If no root is provided, all registered Components are searched via the ComponentManager.
+        // root may be a Container who's descendant Components are filtered
+        // root may be a Component with an implementation of getRefItems which provides some nested Components such as the
+        // docked items within a Panel.
+        // root may be an array of candidate Components to filter using this Query.
+        execute : function(root) {
+            var operations = this.operations,
+                i = 0,
+                length = operations.length,
+                operation,
+                workingItems;
+
+            // no root, use all Components in the document
+            if (!root) {
+                workingItems = Ext.ComponentManager.all.getArray();
+            }
+            // Root is an iterable object like an Array, or system Collection, eg HtmlCollection
+            else if (Ext.isIterable(root)) {
+                workingItems = root;
+            }
+            // Root is a MixedCollection
+            else if (root.isMixedCollection) {
+                workingItems = root.items;
+            }
+
+            // We are going to loop over our operations and take care of them
+            // one by one.
+            for (; i < length; i++) {
+                operation = operations[i];
+
+                // The mode operation requires some custom handling.
+                // All other operations essentially filter down our current
+                // working items, while mode replaces our current working
+                // items by getting children from each one of our current
+                // working items. The type of mode determines the type of
+                // children we get. (e.g. > only gets direct children)
+                if (operation.mode === '^') {
+                    workingItems = getAncestors(workingItems || [root]);
+                }
+                else if (operation.mode) {
+                    workingItems = getItems(workingItems || [root], operation.mode);
+                }
+                else {
+                    workingItems = filterItems(workingItems || getItems([root]), operation);
+                }
+
+                // If this is the last operation, it means our current working
+                // items are the final matched items. Thus return them!
+                if (i === length -1) {
+                    return workingItems;
+                }
+            }
+            return [];
+        },
+
+        is: function(component) {
+            var operations = this.operations,
+                components = Ext.isArray(component) ? component : [component],
+                originalLength = components.length,
+                lastOperation = operations[operations.length-1],
+                ln, i;
+
+            components = filterItems(components, lastOperation);
+            if (components.length === originalLength) {
+                if (operations.length > 1) {
+                    for (i = 0, ln = components.length; i < ln; i++) {
+                        if (Ext.Array.indexOf(this.execute(), components[i]) === -1) {
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+    });
+
+    Ext.apply(this, {
+
+        // private cache of selectors and matching ComponentQuery.Query objects
+        cache: {},
+
+        // private cache of pseudo class filter functions
+        pseudos: {
+            not: function(components, selector){
+                var CQ = Ext.ComponentQuery,
+                    i = 0,
+                    length = components.length,
+                    results = [],
+                    index = -1,
+                    component;
+                
+                for(; i < length; ++i) {
+                    component = components[i];
+                    if (!CQ.is(component, selector)) {
+                        results[++index] = component;
+                    }
+                }
+                return results;
+            },
+            first: function(components) {
+                var ret = [];
+                    
+                if (components.length > 0) {
+                    ret.push(components[0]);
+                }
+                return ret;       
+            },
+            last: function(components) {
+                var len = components.length,
+                    ret = [];
+                    
+                if (len > 0) {
+                    ret.push(components[len - 1]);
+                }
+                return ret;
+            },
+            focusable: function(cmps) {
+                var len = cmps.length,
+                    results = [],
+                    i = 0,
+                    c;
+
+                for (; i < len; i++) {
+                    c = cmps[i];
+                    // If this is a generally focusable Component (has a focusEl, is rendered, enabled and visible)
+                    // then it is currently focusable if focus management is enabled or if it is an input field, a button or a menu item
+                    if (c.isFocusable()) {
+                        results.push(c);
+                    }
+                }
+
+                return results;
+            },
+            "nth-child" : function(c, a) {
+                var result = [],
+                    m = nthRe.exec(a == "even" && "2n" || a == "odd" && "2n+1" || !nthRe2.test(a) && "n+" + a || a),
+                    f = (m[1] || 1) - 0, l = m[2] - 0,
+                    i, n, nodeIndex;
+                for (i = 0; n = c[i]; i++) {
+                    nodeIndex = i + 1;
+                    if (f == 1) {
+                        if (l == 0 || nodeIndex == l) {
+                            result.push(n);
+                        }
+                    } else if ((nodeIndex + l) % f == 0){
+                        result.push(n);
+                    }
+                }
+
+                return result;
+            }
+        },
+
+        /**
+         * Returns an array of matched Components from within the passed root object.
+         *
+         * This method filters returned Components in a similar way to how CSS selector based DOM
+         * queries work using a textual selector string.
+         *
+         * See class summary for details.
+         *
+         * @param {String} selector The selector string to filter returned Components
+         * @param {Ext.container.Container} [root] The Container within which to perform the query.
+         * If omitted, all Components within the document are included in the search.
+         * 
+         * This parameter may also be an array of Components to filter according to the selector.
+         * @returns {Ext.Component[]} The matched Components.
+         * 
+         * @member Ext.ComponentQuery
+         */
+        query: function(selector, root) {
+            var selectors = selector.split(','),
+                length = selectors.length,
+                i = 0,
+                results = [],
+                noDupResults = [], 
+                dupMatcher = {}, 
+                query, resultsLn, cmp;
+
+            for (; i < length; i++) {
+                selector = Ext.String.trim(selectors[i]);
+                query = this.cache[selector] || (this.cache[selector] = this.parse(selector));
+                results = results.concat(query.execute(root));
+            }
+
+            // multiple selectors, potential to find duplicates
+            // lets filter them out.
+            if (length > 1) {
+                resultsLn = results.length;
+                for (i = 0; i < resultsLn; i++) {
+                    cmp = results[i];
+                    if (!dupMatcher[cmp.id]) {
+                        noDupResults.push(cmp);
+                        dupMatcher[cmp.id] = true;
+                    }
+                }
+                results = noDupResults;
+            }
+            return results;
+        },
+
+        /**
+         * Tests whether the passed Component matches the selector string.
+         * @param {Ext.Component} component The Component to test
+         * @param {String} selector The selector string to test against.
+         * @return {Boolean} True if the Component matches the selector.
+         * @member Ext.ComponentQuery
+         */
+        is: function(component, selector) {
+            if (!selector) {
+                return true;
+            }
+            var selectors = selector.split(','),
+                length = selectors.length,
+                i = 0,
+                query;
+
+            for (; i < length; i++) {
+                selector = Ext.String.trim(selectors[i]);
+                query = this.cache[selector] || (this.cache[selector] = this.parse(selector));
+                if (query.is(component)) {
+                    return true;
+                }
+            }
+            return false;
+        },
+
+        parse: function(selector) {
+            var operations = [],
+                length = matchers.length,
+                lastSelector,
+                tokenMatch,
+                matchedChar,
+                modeMatch,
+                selectorMatch,
+                i, matcher, method;
+
+            // We are going to parse the beginning of the selector over and
+            // over again, slicing off the selector any portions we converted into an
+            // operation, until it is an empty string.
+            while (selector && lastSelector !== selector) {
+                lastSelector = selector;
+
+                // First we check if we are dealing with a token like #, * or an xtype
+                tokenMatch = selector.match(tokenRe);
+
+                if (tokenMatch) {
+                    matchedChar = tokenMatch[1];
+
+                    // If the token is prefixed with a # we push a filterById operation to our stack
+                    if (matchedChar === '#') {
+                        operations.push({
+                            method: filterById,
+                            args: [Ext.String.trim(tokenMatch[2])]
+                        });
+                    }
+                    // If the token is prefixed with a . we push a filterByClassName operation to our stack
+                    // FIXME: Not enabled yet. just needs \. adding to the tokenRe prefix
+                    else if (matchedChar === '.') {
+                        operations.push({
+                            method: filterByClassName,
+                            args: [Ext.String.trim(tokenMatch[2])]
+                        });
+                    }
+                    // If the token is a * or an xtype string, we push a filterByXType
+                    // operation to the stack.
+                    else {
+                        operations.push({
+                            method: filterByXType,
+                            args: [Ext.String.trim(tokenMatch[2]), Boolean(tokenMatch[3])]
+                        });
+                    }
+
+                    // Now we slice of the part we just converted into an operation
+                    selector = selector.replace(tokenMatch[0], '');
+                }
+
+                // If the next part of the query is not a space or > or ^, it means we
+                // are going to check for more things that our current selection
+                // has to comply to.
+                while (!(modeMatch = selector.match(modeRe))) {
+                    // Lets loop over each type of matcher and execute it
+                    // on our current selector.
+                    for (i = 0; selector && i < length; i++) {
+                        matcher = matchers[i];
+                        selectorMatch = selector.match(matcher.re);
+                        method = matcher.method;
+
+                        // If we have a match, add an operation with the method
+                        // associated with this matcher, and pass the regular
+                        // expression matches are arguments to the operation.
+                        if (selectorMatch) {
+                            operations.push({
+                                method: Ext.isString(matcher.method)
+                                    // Turn a string method into a function by formatting the string with our selector matche expression
+                                    // A new method is created for different match expressions, eg {id=='textfield-1024'}
+                                    // Every expression may be different in different selectors.
+                                    ? Ext.functionFactory('items', Ext.String.format.apply(Ext.String, [method].concat(selectorMatch.slice(1))))
+                                    : matcher.method,
+                                args: selectorMatch.slice(1)
+                            });
+                            selector = selector.replace(selectorMatch[0], '');
+                            break; // Break on match
+                        }
+                        // Exhausted all matches: It's an error
+                        if (i === (length - 1)) {
+                            Ext.Error.raise('Invalid ComponentQuery selector: "' + arguments[0] + '"');
+                        }
+                    }
+                }
+
+                // Now we are going to check for a mode change. This means a space
+                // or a > to determine if we are going to select all the children
+                // of the currently matched items, or a ^ if we are going to use the
+                // ownerCt axis as the candidate source.
+                if (modeMatch[1]) { // Assignment, and test for truthiness!
+                    operations.push({
+                        mode: modeMatch[2]||modeMatch[1]
+                    });
+                    selector = selector.replace(modeMatch[0], '');
+                }
+            }
+
+            //  Now that we have all our operations in an array, we are going
+            // to create a new Query using these operations.
+            return new cq.Query({
+                operations: operations
+            });
+        }
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/*
+ * The dirty implementation in this class is quite naive. The reasoning for this is that the dirty state
+ * will only be used in very specific circumstances, specifically, after the render process has begun but
+ * the component is not yet rendered to the DOM. As such, we want it to perform as quickly as possible
+ * so it's not as fully featured as you may expect.
+ */
+
+/**
+ * Manages certain element-like data prior to rendering. These values are passed
+ * on to the render process. This is currently used to manage the "class" and "style" attributes
+ * of a component's primary el as well as the bodyEl of panels. This allows things like
+ * addBodyCls in Panel to share logic with addCls in AbstractComponent.
+ * @private
+ */
+Ext.define('Ext.util.ProtoElement', (function () {
+    var splitWords = Ext.String.splitWords,
+        toMap = Ext.Array.toMap;
+
+    return {
+        
+        isProtoEl: true,
+        
+        /**
+         * The property name for the className on the data object passed to {@link #writeTo}.
+         */
+        clsProp: 'cls',
+
+        /**
+         * The property name for the style on the data object passed to {@link #writeTo}.
+         */
+        styleProp: 'style',
+        
+        /**
+         * The property name for the removed classes on the data object passed to {@link #writeTo}.
+         */
+        removedProp: 'removed',
+
+        /**
+         * True if the style must be converted to text during {@link #writeTo}. When used to
+         * populate tpl data, this will be true. When used to populate {@link Ext.DomHelper}
+         * specs, this will be false (the default).
+         */
+        styleIsText: false,
+
+        constructor: function (config) {
+            var me = this;
+
+            Ext.apply(me, config);
+
+            me.classList = splitWords(me.cls);
+            me.classMap = toMap(me.classList);
+            delete me.cls;
+
+            if (Ext.isFunction(me.style)) {
+                me.styleFn = me.style;
+                delete me.style;
+            } else if (typeof me.style == 'string') {
+                me.style = Ext.Element.parseStyles(me.style);
+            } else if (me.style) {
+                me.style = Ext.apply({}, me.style); // don't edit the given object
+            }
+        },
+        
+        /**
+         * Indicates that the current state of the object has been flushed to the DOM, so we need
+         * to track any subsequent changes
+         */
+        flush: function(){
+            this.flushClassList = [];
+            this.removedClasses = {};
+            // clear the style, it will be recreated if we add anything new
+            delete this.style;
+            delete this.unselectableAttr;
+        },
+
+        /**
+         * Adds class to the element.
+         * @param {String} cls One or more classnames separated with spaces.
+         * @return {Ext.util.ProtoElement} this
+         */
+        addCls: function (cls) {
+            var me = this,
+                add = (typeof cls === 'string') ? splitWords(cls) : cls,
+                length = add.length,
+                list = me.classList,
+                map = me.classMap,
+                flushList = me.flushClassList,
+                i = 0,
+                c;
+
+            for (; i < length; ++i) {
+                c = add[i];
+                if (!map[c]) {
+                    map[c] = true;
+                    list.push(c);
+                    if (flushList) {
+                        flushList.push(c);
+                        delete me.removedClasses[c];
+                    }
+                }
+            }
+
+            return me;
+        },
+
+        /**
+         * True if the element has given class.
+         * @param {String} cls
+         * @return {Boolean}
+         */
+        hasCls: function (cls) {
+            return cls in this.classMap;
+        },
+
+        /**
+         * Removes class from the element.
+         * @param {String} cls One or more classnames separated with spaces.
+         * @return {Ext.util.ProtoElement} this
+         */
+        removeCls: function (cls) {
+            var me = this,
+                list = me.classList,
+                newList = (me.classList = []),
+                remove = toMap(splitWords(cls)),
+                length = list.length,
+                map = me.classMap,
+                removedClasses = me.removedClasses,
+                i, c;
+
+            for (i = 0; i < length; ++i) {
+                c = list[i];
+                if (remove[c]) {
+                    if (removedClasses) {
+                        if (map[c]) {
+                            removedClasses[c] = true;
+                            Ext.Array.remove(me.flushClassList, c);
+                        }
+                    }
+                    delete map[c];
+                } else {
+                    newList.push(c);
+                }
+            }
+
+            return me;
+        },
+
+        /**
+         * Adds styles to the element.
+         * @param {String/Object} prop The style property to be set, or an object of multiple styles.
+         * @param {String} [value] The value to apply to the given property.
+         * @return {Ext.util.ProtoElement} this
+         */
+        setStyle: function (prop, value) {
+            var me = this,
+                style = me.style || (me.style = {});
+
+            if (typeof prop == 'string') {
+                if (arguments.length === 1) {
+                    me.setStyle(Ext.Element.parseStyles(prop));
+                } else {
+                    style[prop] = value;
+                }
+            } else {
+                Ext.apply(style, prop);
+            }
+
+            return me;
+        },
+
+        unselectable: function() {
+            // See Ext.dom.Element.unselectable for an explanation of what is required to make an element unselectable
+            this.addCls(Ext.dom.Element.unselectableCls);
+
+            if (Ext.isOpera) {
+                this.unselectableAttr = true;
+            }
+        },
+
+        /**
+         * Writes style and class properties to given object.
+         * Styles will be written to {@link #styleProp} and class names to {@link #clsProp}.
+         * @param {Object} to
+         * @return {Object} to
+         */
+        writeTo: function (to) {
+            var me = this,
+                classList = me.flushClassList || me.classList,
+                removedClasses = me.removedClasses,
+                style;
+
+            if (me.styleFn) {
+                style = Ext.apply({}, me.styleFn());
+                Ext.apply(style, me.style);
+            } else {
+                style = me.style;
+            }
+
+            to[me.clsProp] = classList.join(' ');
+
+            if (style) {
+                to[me.styleProp] = me.styleIsText ? Ext.DomHelper.generateStyles(style) : style;
+            }
+            
+            if (removedClasses) {
+                removedClasses = Ext.Object.getKeys(removedClasses);
+                if (removedClasses.length) {
+                    to[me.removedProp] = removedClasses.join(' ');
+                }
+            }
+
+            if (me.unselectableAttr) {
+                to.unselectable = 'on';
+            }
+
+            return to;
+        }
+    };
+}()));
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides a registry of available Plugin classes indexed by a mnemonic code known as the Plugin's ptype.
+ *
+ * A plugin may be specified simply as a *config object* as long as the correct `ptype` is specified:
+ *
+ *     {
+ *         ptype: 'gridviewdragdrop',
+ *         dragText: 'Drag and drop to reorganize'
+ *     }
+ *
+ * Or just use the ptype on its own:
+ *
+ *     'gridviewdragdrop'
+ *
+ * Alternatively you can instantiate the plugin with Ext.create:
+ *
+ *     Ext.create('Ext.grid.plugin.DragDrop', {
+ *         dragText: 'Drag and drop to reorganize'
+ *     })
+ */
+Ext.define('Ext.PluginManager', {
+    extend:  Ext.AbstractManager ,
+    alternateClassName: 'Ext.PluginMgr',
+    singleton: true,
+    typeName: 'ptype',
+
+    /**
+     * Creates a new Plugin from the specified config object using the config object's ptype to determine the class to
+     * instantiate.
+     * @param {Object} config A configuration object for the Plugin you wish to create.
+     * @param {Function} defaultType (optional) The constructor to provide the default Plugin type if the config object does not
+     * contain a `ptype`. (Optional if the config contains a `ptype`).
+     * @return {Ext.Component} The newly instantiated Plugin.
+     */
+    create : function(config, defaultType, host) {
+        var result;
+
+        if (config.init) {
+            result = config;
+        } else {
+            // Inject the host into the config is we know the host
+            if (host) {
+                config = Ext.apply({}, config); // copy since we are going to modify
+                config.cmp = host;
+            }
+            // Grab the host ref if it was configured in
+            else {
+                host = config.cmp;
+            }
+
+            if (config.xclass) {
+                result = Ext.create(config);
+            } else {
+                // Lookup the class from the ptype and instantiate unless its a singleton
+                result = Ext.ClassManager.getByAlias(('plugin.' + (config.ptype || defaultType)));
+
+                if (typeof result === 'function') {
+                    result = new result(config);
+                }
+            }
+        }
+
+        // If we come out with a non-null plugin, ensure that any setCmp is called once.
+        if (result && host && result.setCmp && !result.setCmpCalled) {
+            result.setCmp(host);
+            result.setCmpCalled = true;
+        }
+        return result;
+    },
+
+    /**
+     * Returns all plugins registered with the given type. Here, 'type' refers to the type of plugin, not its ptype.
+     * @param {String} type The type to search for
+     * @param {Boolean} defaultsOnly True to only return plugins of this type where the plugin's isDefault property is
+     * truthy
+     * @return {Ext.AbstractPlugin[]} All matching plugins
+     */
+    findByType: function(type, defaultsOnly) {
+        var matches = [],
+            types   = this.types,
+            name,
+            item;
+
+        for (name in types) {
+            if (!types.hasOwnProperty(name)) {
+                continue;
+            }
+            item = types[name];
+
+            if (item.type == type && (!defaultsOnly || (defaultsOnly === true && item.isDefault))) {
+                matches.push(item);
+            }
+        }
+
+        return matches;
+    }
+}, function() {
+    /**
+     * Shorthand for {@link Ext.PluginManager#registerType}
+     * @param {String} ptype The ptype mnemonic string by which the Plugin class
+     * may be looked up.
+     * @param {Function} cls The new Plugin class.
+     * @member Ext
+     * @method preg
+     */
+    Ext.preg = function() {
+        return Ext.PluginManager.registerType.apply(Ext.PluginManager, arguments);
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents a filter that can be applied to a {@link Ext.util.MixedCollection MixedCollection}. Can either simply
+ * filter on a property/value pair or pass in a filter function with custom logic. Filters are always used in the
+ * context of MixedCollections, though {@link Ext.data.Store Store}s frequently create them when filtering and searching
+ * on their records. Example usage:
+ *
+ *     //set up a fictional MixedCollection containing a few people to filter on
+ *     var allNames = new Ext.util.MixedCollection();
+ *     allNames.addAll([
+ *         {id: 1, name: 'Ed',    age: 25},
+ *         {id: 2, name: 'Jamie', age: 37},
+ *         {id: 3, name: 'Abe',   age: 32},
+ *         {id: 4, name: 'Aaron', age: 26},
+ *         {id: 5, name: 'David', age: 32}
+ *     ]);
+ *
+ *     var ageFilter = new Ext.util.Filter({
+ *         property: 'age',
+ *         value   : 32
+ *     });
+ *
+ *     var longNameFilter = new Ext.util.Filter({
+ *         filterFn: function(item) {
+ *             return item.name.length > 4;
+ *         }
+ *     });
+ *
+ *     //a new MixedCollection with the 3 names longer than 4 characters
+ *     var longNames = allNames.filter(longNameFilter);
+ *
+ *     //a new MixedCollection with the 2 people of age 32:
+ *     var youngFolk = allNames.filter(ageFilter);
+ *
+ */
+Ext.define('Ext.util.Filter', {
+
+    /**
+     * @cfg {String} property
+     * The property to filter on. Required unless a {@link #filterFn} is passed
+     */
+    /**
+     * @cfg {Mixed} value
+     * The value to filter on. Required unless a {@link #filterFn} is passed.
+     */
+
+    /**
+     * @cfg {Function} filterFn
+     * A custom filter function which is passed each item in the {@link Ext.util.MixedCollection} in turn. Should return
+     * `true` to accept each item or `false` to reject it.
+     */
+
+    /**
+     * @cfg {String} [id]
+     * An identifier by which this Filter is indexed in a {@link Ext.data.Store#property-filters Store's filters collection}
+     *
+     * Identified Filters may be individually removed from a Store's filter set by using {@link Ext.data.Store#removeFilter}.
+     *
+     * Anonymous Filters may be removed en masse by passing `null` to {@link Ext.data.Store#removeFilter}.
+     */
+    id: null,
+
+    /**
+     * @cfg {Boolean} anyMatch
+     * True to allow any match - no regex start/end line anchors will be added.
+     */
+    anyMatch: false,
+
+    /**
+     * @cfg {Boolean} exactMatch
+     * True to force exact match (^ and $ characters added to the regex). Ignored if anyMatch is true.
+     */
+    exactMatch: false,
+
+    /**
+     * @cfg {Boolean} caseSensitive
+     * True to make the regex case sensitive (adds 'i' switch to regex).
+     */
+    caseSensitive: false,
+
+    /**
+     * @property {Boolean} disabled
+     * Setting this property to `true` disables this individual Filter so that it no longer contributes to a {@link Ext.data.Store#property-filters Store's filter set}
+     *
+     * When disabled, the next time the store is filtered, the Filter plays no part in filtering and records eliminated by it may rejoin the dataset.
+     *
+     */
+    disabled: false,
+
+    /**
+     * @cfg {String} [operator]
+     * The operator to use to compare the {@link #cfg-property} to this Filter's {@link #cfg-value}
+     *
+     * Possible values are:
+     *    * <
+     *    * <=
+     *    * =
+     *    * >=
+     *    * >
+     *    * !=
+     */
+    operator: null,
+
+    /**
+     * @cfg {String} root
+     * Optional root property. This is mostly useful when filtering a Store, in which case we set the root to 'data' to
+     * make the filter pull the {@link #property} out of the data object of each item
+     */
+
+    statics: {
+        /**
+         * Creates a single filter function which encapsulates the passed Filter array.
+         * @param {Ext.util.Filter[]} filters The filter set for which to create a filter function
+         * @return {Function} a function, which when passed a candidate object returns `true` if
+         * the candidate passes all the specified Filters.
+         */
+        createFilterFn: function(filters) {
+            return filters && filters.length ? function(candidate) {
+                var isMatch = true,
+                    length = filters.length,
+                    i, filter;
+
+                for (i = 0; isMatch && i < length; i++) {
+                    filter = filters[i];
+
+                    // Disabling a filter stops it from contributing to the overall filter function.
+                    if (!filter.disabled) {
+                        isMatch = isMatch && filter.filterFn.call(filter.scope || filter, candidate);
+                    }
+                }
+                return isMatch;
+            } : function() {
+                return true;
+            };
+        }
+    },
+
+    operatorFns: {
+        "<": function(candidate) {
+            return Ext.coerce(this.getRoot(candidate)[this.property], this.value) < this.value;
+        },
+        "<=": function(candidate) {
+            return Ext.coerce(this.getRoot(candidate)[this.property], this.value) <= this.value;
+        },
+        "=": function(candidate) {
+            return Ext.coerce(this.getRoot(candidate)[this.property], this.value) == this.value;
+        },
+        ">=": function(candidate) {
+            return Ext.coerce(this.getRoot(candidate)[this.property], this.value) >= this.value;
+        },
+        ">": function(candidate) {
+            return Ext.coerce(this.getRoot(candidate)[this.property], this.value) > this.value;
+        },
+        "!=": function(candidate) {
+            return Ext.coerce(this.getRoot(candidate)[this.property], this.value) != this.value;
+        }
+    },
+
+    /**
+     * Creates new Filter.
+     * @param {Object} [config] Config object
+     */
+    constructor: function(config) {
+        var me = this;
+        me.initialConfig = config;
+        Ext.apply(me, config);
+
+        //we're aliasing filter to filterFn mostly for API cleanliness reasons, despite the fact it dirties the code here.
+        //Ext.util.Sorter takes a sorterFn property but allows .sort to be called - we do the same here
+        me.filter = me.filter || me.filterFn;
+
+        if (me.filter === undefined) {
+            me.setValue(config.value);
+        }
+    },
+
+    /**
+     * Changes the value that this filter tests its configured (@link #cfg-property} with.
+     * @param {Mixed} value The new value to compare the property with.
+     */
+    setValue: function(value) {
+        var me = this;
+        me.value = value;
+        if (me.property === undefined || me.value === undefined) {
+            // Commented this out temporarily because it stops us using string ids in models. TODO: Remove this once
+            // Model has been updated to allow string ids
+
+            // Ext.Error.raise("A Filter requires either a property or a filterFn to be set");
+        } else {
+            me.filter = me.createFilterFn();
+        }
+
+        me.filterFn = me.filter;
+    },
+
+    /**
+     * Changes the filtering function which this Filter uses to choose items to include.
+     *
+     * This replaces any configured {@link #cfg-filterFn} and overrides any {@link #cfg-property} and {@link #cfg-value) settings.
+     * @param {Function} filterFn A function which returns `true` or `false` to either include or exclude the passed object.
+     * @param {Object} filterFn.value The value for consideration to be included or excluded.
+     *
+     */
+    setFilterFn: function(filterFn) {
+        this.filterFn = this.filter = filterFn;
+    },
+
+    /**
+     * @private
+     * Creates a filter function for the configured property/value/anyMatch/caseSensitive options for this Filter
+     */
+    createFilterFn: function() {
+        var me       = this,
+            matcher  = me.createValueMatcher(),
+            property = me.property;
+
+        if (me.operator) {
+            return me.operatorFns[me.operator];
+        } else {
+            return function(item) {
+                var value = me.getRoot(item)[property];
+                return matcher === null ? value === null : matcher.test(value);
+            };
+        }
+    },
+
+    /**
+     * @private
+     * Returns the root property of the given item, based on the configured {@link #root} property
+     * @param {Object} item The item
+     * @return {Object} The root property of the object
+     */
+    getRoot: function(item) {
+        var root = this.root;
+        return root === undefined ? item : item[root];
+    },
+
+    /**
+     * @private
+     * Returns a regular expression based on the given value and matching options
+     */
+    createValueMatcher : function() {
+        var me            = this,
+            value         = me.value,
+            anyMatch      = me.anyMatch,
+            exactMatch    = me.exactMatch,
+            caseSensitive = me.caseSensitive,
+            escapeRe      = Ext.String.escapeRegex;
+
+        if (value === null) {
+            return value;
+        }
+
+        if (!value.exec) { // not a regex
+            value = String(value);
+
+            if (anyMatch === true) {
+                value = escapeRe(value);
+            } else {
+                value = '^' + escapeRe(value);
+                if (exactMatch === true) {
+                    value += '$';
+                }
+            }
+            value = new RegExp(value, caseSensitive ? '' : 'i');
+         }
+
+         return value;
+    },
+
+    serialize: function() {
+        var me = this,
+            result = Ext.apply({}, me.initialConfig);
+
+        result.value = me.value;
+        return result;
+    }
+}, function() {
+    // Operator type '==' is the same as operator type '='
+    this.prototype.operatorFns['=='] = this.prototype.operatorFns['='];
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.util.AbstractMixedCollection
+ * @private
+ */
+Ext.define('Ext.util.AbstractMixedCollection', {
+                                  
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @property {Boolean} isMixedCollection
+     * `true` in this class to identify an object as an instantiated MixedCollection, or subclass thereof.
+     */
+    isMixedCollection: true,
+
+    /**
+     * @private Mutation counter which is incremented upon add and remove.
+     */
+    generation: 0,
+    
+    /**
+     * @private Mutation counter for the index map which is synchronized with the collection's mutation counter
+     * when the index map is interrogated and found to be out of sync and needed a rebuild.
+     */
+    indexGeneration: 0,
+    
+    constructor: function(allowFunctions, keyFn) {
+        var me = this;
+
+        // Modern constructor signature using a config object
+        if (arguments.length === 1 && Ext.isObject(allowFunctions)) {
+            me.initialConfig = allowFunctions;
+            Ext.apply(me, allowFunctions);
+        }
+        // Old constructor signature
+        else {
+            me.allowFunctions = allowFunctions === true;
+            if (keyFn) {
+                me.getKey = keyFn;
+            }
+            me.initialConfig = {
+                allowFunctions: me.allowFunctions,
+                getKey: me.getKey
+            };
+        }
+
+        me.items = [];
+        me.map = {};
+        me.keys = [];
+        me.indexMap = {};
+        me.length = 0;
+
+        /**
+         * @event clear
+         * Fires when the collection is cleared.
+         * @since 1.1.0
+         */
+
+        /**
+         * @event add
+         * Fires when an item is added to the collection.
+         * @param {Number} index The index at which the item was added.
+         * @param {Object} o The item added.
+         * @param {String} key The key associated with the added item.
+         * @since 1.1.0
+         */
+
+        /**
+         * @event replace
+         * Fires when an item is replaced in the collection.
+         * @param {String} key he key associated with the new added.
+         * @param {Object} old The item being replaced.
+         * @param {Object} new The new item.
+         * @since 1.1.0
+         */
+       
+        /**
+         * @event remove
+         * Fires when an item is removed from the collection.
+         * @param {Object} o The item being removed.
+         * @param {String} key (optional) The key associated with the removed item.
+         * @since 1.1.0
+         */
+
+        me.mixins.observable.constructor.call(me);
+    },
+
+    /**
+     * @cfg {Boolean} allowFunctions Specify <code>true</code> if the {@link #addAll}
+     * function should add function references to the collection. Defaults to
+     * <code>false</code>.
+     * @since 3.4.0
+     */
+    allowFunctions : false,
+
+    /**
+     * Adds an item to the collection. Fires the {@link #event-add} event when complete.
+     *
+     * @param {String/Object} key The key to associate with the item, or the new item.
+     *
+     * If a {@link #getKey} implementation was specified for this MixedCollection,
+     * or if the key of the stored items is in a property called `id`,
+     * the MixedCollection will be able to *derive* the key for the new item.
+     * In this case just pass the new item in this parameter.
+     *
+     * @param {Object} [obj] The item to add.
+     *
+     * @return {Object} The item added.
+     * @since 1.1.0
+     */
+    add : function(key, obj) {
+        var len = this.length,
+            out;
+        
+        if (arguments.length === 1) {
+            out = this.insert(len, key);
+        } else {
+            out = this.insert(len, key, obj);
+        }
+        return out;
+    },
+
+    /**
+     * A function which will be called, passing a newly added object
+     * when the object is added without a separate id.  The function
+     * should yield the key by which that object will be indexed.
+     * 
+     * If no key is yielded, then the object will be added, but it
+     * cannot be accessed or removed quickly. Finding it in this
+     * collection for interrogation or removal will require a linear
+     * scan of this collection's items.
+     * 
+     * The default implementation simply returns `item.id` but you can
+     * provide your own implementation to return a different value as
+     * in the following examples:
+     *
+     *     // normal way
+     *     var mc = new Ext.util.MixedCollection();
+     *     mc.add(someEl.dom.id, someEl);
+     *     mc.add(otherEl.dom.id, otherEl);
+     *     //and so on
+     *
+     *     // using getKey
+     *     var mc = new Ext.util.MixedCollection({
+     *         getKey: function(el){
+     *             return el.dom.id;
+     *         }
+     *     });
+     *     mc.add(someEl);
+     *     mc.add(otherEl);
+     *
+     * @param {Object} item The item for which to find the key.
+     * @return {Object} The key for the passed item.
+     * @since 1.1.0
+     * @template
+     */
+    getKey : function(o) {
+         return o.id;
+    },
+
+    /**
+     * Replaces an item in the collection. Fires the {@link #event-replace} event when complete.
+     * @param {String} key The key associated with the item to replace, or the replacement item.
+     * 
+     * If you supplied a {@link #getKey} implementation for this MixedCollection, or if the key
+     * of your stored items is in a property called *`id`*, then the MixedCollection
+     * will be able to <i>derive</i> the key of the replacement item. If you want to replace an item
+     * with one having the same key value, then just pass the replacement item in this parameter.
+     * 
+     * @param o {Object} o (optional) If the first parameter passed was a key, the item to associate
+     * with that key.
+     * @return {Object}  The new item.
+     * @since 1.1.0
+     */
+    replace : function(key, o) {
+        var me = this,
+            old,
+            index;
+
+        if (arguments.length == 1) {
+            o = arguments[0];
+            key = me.getKey(o);
+        }
+        old = me.map[key];
+        if (typeof key == 'undefined' || key === null || typeof old == 'undefined') {
+             return me.add(key, o);
+        }
+        me.generation++;
+        index = me.indexOfKey(key);
+        me.items[index] = o;
+        me.map[key] = o;
+        if (me.hasListeners.replace) {
+            me.fireEvent('replace', key, old, o);
+        }
+        return o;
+    },
+    
+    /**
+     * Change the key for an existing item in the collection. If the old key
+     * does not exist this is a no-op.
+     * @param {Object} oldKey The old key
+     * @param {Object} newKey The new key
+     */
+    updateKey: function(oldKey, newKey) {
+        var me = this,
+            map = me.map,
+            indexMap = me.indexMap,
+            index = me.indexOfKey(oldKey),
+            item;
+            
+        if (index > -1) {
+            item = map[oldKey];
+            delete map[oldKey];
+            delete indexMap[oldKey];
+            map[newKey] = item;
+            indexMap[newKey] = index;
+            me.keys[index] = newKey;
+            me.generation++;
+            
+        }
+    },
+
+    /**
+     * Adds all elements of an Array or an Object to the collection.
+     * @param {Object/Array} objs An Object containing properties which will be added
+     * to the collection, or an Array of values, each of which are added to the collection.
+     * Functions references will be added to the collection if `{@link #allowFunctions}`
+     * has been set to `true`.
+     * @since 1.1.0
+     */
+    addAll : function(objs) {
+        var me = this,
+            key;
+
+        if (arguments.length > 1 || Ext.isArray(objs)) {
+            me.insert(me.length, arguments.length > 1 ? arguments : objs);
+        } else {
+            for (key in objs) {
+                if (objs.hasOwnProperty(key)) {
+                    if (me.allowFunctions || typeof objs[key] != 'function') {
+                        me.add(key, objs[key]);
+                    }
+                }
+            }
+        }
+    },
+
+    /**
+     * Executes the specified function once for every item in the collection.
+     * The function should return a boolean value.
+     * Returning false from the function will stop the iteration.
+     *
+     * @param {Function} fn The function to execute for each item.
+     * @param {Mixed} fn.item The collection item.
+     * @param {Number} fn.index The index of item.
+     * @param {Number} fn.len Total length of collection.
+     * @param {Object} scope (optional) The scope (<code>this</code> reference)
+     * in which the function is executed. Defaults to the current item in the iteration.
+     *
+     * @since 1.1.0
+     */
+    each : function(fn, scope){
+        var items = Ext.Array.push([], this.items), // each safe for removal
+            i = 0,
+            len = items.length,
+            item;
+
+        for (; i < len; i++) {
+            item = items[i];
+            if (fn.call(scope || item, item, i, len) === false) {
+                break;
+            }
+        }
+    },
+
+    /**
+     * Executes the specified function once for every key in the collection, passing each
+     * key, and its associated item as the first two parameters.
+     * @param {Function} fn The function to execute for each item.
+     * @param {String} fn.key The key of collection item.
+     * @param {Mixed} fn.item The collection item.
+     * @param {Number} fn.index The index of item.
+     * @param {Number} fn.len Total length of collection.
+     * @param {Object} scope (optional) The scope (<code>this</code> reference) in which the
+     * function is executed. Defaults to the browser window.
+     *
+     * @since 1.1.0
+     */
+    eachKey : function(fn, scope){
+        var keys = this.keys,
+            items = this.items,
+            i = 0,
+            len = keys.length;
+
+        for (; i < len; i++) {
+            fn.call(scope || window, keys[i], items[i], i, len);
+        }
+    },
+
+    /**
+     * Returns the first item in the collection which elicits a true return value from the
+     * passed selection function.
+     * @param {Function} fn The selection function to execute for each item.
+     * @param {Mixed} fn.item The collection item.
+     * @param {String} fn.key The key of collection item.
+     * @param {Object} scope (optional) The scope (<code>this</code> reference) in which the
+     * function is executed. Defaults to the browser window.
+     * @return {Object} The first item in the collection which returned true from the selection
+     * function, or null if none was found.
+     */
+    findBy : function(fn, scope) {
+        var keys = this.keys,
+            items = this.items,
+            i = 0,
+            len = items.length;
+
+        for (; i < len; i++) {
+            if (fn.call(scope || window, items[i], keys[i])) {
+                return items[i];
+            }
+        }
+        return null;
+    },
+
+
+    /**
+     * Inserts an item at the specified index in the collection. Fires the {@link #event-add} event when complete.
+     * @param {Number} index The index to insert the item at.
+     * @param {String/Object/String[]/Object[]} key The key to associate with the new item, or the item itself.
+     * May also be an array of either to insert multiple items at once.
+     * @param {Object/Object[]} o (optional) If the second parameter was a key, the new item.
+     * May also be an array to insert multiple items at once.
+     * @return {Object} The item inserted or an array of items inserted.
+     * @since 1.1.0
+     */
+    insert : function(index, key, obj) {
+        var out;
+        if (Ext.isIterable(key)) {
+            out = this.doInsert(index, key, obj);
+        } else {
+            if (arguments.length > 2) {
+                out = this.doInsert(index, [key], [obj]);
+            } else {
+                out = this.doInsert(index, [key]);
+            }
+            out = out[0];
+        }
+        return out;
+    },
+ 
+    // Private multi insert implementation.
+    doInsert : function(index, keys, objects) {
+        var me = this,
+            itemKey,
+            removeIndex,
+            i, len = keys.length,
+            deDupedLen = len,
+            fireAdd = me.hasListeners.add,
+            syncIndices,
+            newKeys = {},
+            passedDuplicates,
+            oldKeys, oldObjects;
+
+        // External key(s) passed. We cannot reliably find an object's index using the key extraction fn.
+        // Set a flag for use by contains, indexOf and remove
+        if (objects != null) {
+            me.useLinearSearch = true;
+        }
+        // No external keys: calculate keys array if not passed
+        else {
+            objects = keys;
+            keys = new Array(len);
+            for (i = 0; i < len; i++) {
+                keys[i] = this.getKey(objects[i]);
+            }
+        }
+
+        // First, remove duplicates of the keys. If a removal point is less than insertion index, decr insertion index
+        me.suspendEvents();
+        for (i = 0; i < len; i++) {
+            itemKey = keys[i];
+
+            // Must use indexOf - map might be out of sync
+            removeIndex = me.indexOfKey(itemKey);
+            if (removeIndex !== -1) {
+                if (removeIndex < index) {
+                    index--;
+                }
+                me.removeAt(removeIndex);
+            }
+
+            if (itemKey != null) {
+                // If a previous new item used this key, we will have to rebuild the input arrays from the newKeys map.
+                if (newKeys[itemKey] != null) {
+                    passedDuplicates = true;
+                    deDupedLen--;
+                }
+                newKeys[itemKey] = i;
+            }
+        }
+        me.resumeEvents();
+
+        // Duplicate keys were detected - rebuild the objects and keys arrays from the last values associated with each unique key
+        if (passedDuplicates) {
+            oldKeys = keys;
+            oldObjects = objects;
+            keys = new Array(deDupedLen);
+            objects = new Array(deDupedLen);
+            i = 0;
+
+            // Loop through unique key hash, properties of which point to last encountered index for that key.
+            // Rebuild deduped objects and keys arrays.
+            for (itemKey in newKeys) {
+                keys[i] = oldKeys[newKeys[itemKey]];
+                objects[i] = oldObjects[newKeys[itemKey]];
+                i++;
+            }
+            len = deDupedLen;
+        }
+
+        // If we are appending and the indices are in sync, its cheap to kep them that way
+        syncIndices = index === me.length && me.indexGeneration === me.generation;
+
+        // Insert the new items and new keys in at the insertion point
+        Ext.Array.insert(me.items, index, objects);
+        Ext.Array.insert(me.keys,  index, keys);
+        me.length += len;
+        me.generation++;
+        if (syncIndices) {
+            me.indexGeneration = me.generation;
+        }
+        for (i = 0; i < len; i++, index++) {
+            itemKey = keys[i];
+            if (itemKey != null) {
+                me.map[itemKey] = objects[i];
+
+                // If the index is still in sync, keep it that way
+                if (syncIndices) {
+                    me.indexMap[itemKey] = index;
+                }
+            }
+            if (fireAdd) {
+                me.fireEvent('add', index, objects[i], itemKey);
+            }
+        }
+        return objects;
+    },
+
+    /**
+     * Remove an item from the collection.
+     * @param {Object} o The item to remove.
+     * @return {Object} The item removed or false if no item was removed.
+     * @since 1.1.0
+     */
+    remove : function(o) {
+        var me = this,
+            removeKey,
+            index;
+
+        // If
+        //     We have not been forced into using linear lookup by a usage of the 2 arg form of add
+        // and
+        //     The key extraction function yields a key
+        // Then use indexOfKey. This will use the indexMap - rebuilding it if necessary.
+        if (!me.useLinearSearch && (removeKey = me.getKey(o))) {
+            index = me.indexOfKey(removeKey);
+        }
+
+        // Otherwise we have to do it the slow way with a linear search.
+        else {
+            index = Ext.Array.indexOf(me.items, o);
+        }
+
+        return (index === -1) ? false : me.removeAt(index);
+    },
+
+    /**
+     * Remove all items in the collection. Can also be used
+     * to remove only the items in the passed array.
+     * @param {Array} [items] An array of items to be removed.
+     * @return {Ext.util.MixedCollection} this object
+     */
+    removeAll : function(items) {
+        var me = this, 
+            i;
+
+        if (items || me.hasListeners.remove) {
+            // Only perform expensive item-by-item removal if there's a listener or specific items
+            if (items) {
+                for (i = items.length - 1; i >= 0; --i) {
+                    me.remove(items[i]);
+                }
+            } else {
+                while (me.length) {
+                    me.removeAt(0);
+                }
+            }
+        } else {
+            me.length = me.items.length = me.keys.length = 0;
+            me.map = {};
+            me.indexMap = {};
+            me.generation++;
+            me.indexGeneration = me.generation;
+        }
+    },
+    
+    /**
+     * Remove an item from a specified index in the collection. Fires the {@link #event-remove} event when complete.
+     * @param {Number} index The index within the collection of the item to remove.
+     * @return {Object} The item removed or false if no item was removed.
+     * @since 1.1.0
+     */
+    removeAt : function(index) {
+        var me = this,
+            o,
+            key;
+
+        if (index < me.length && index >= 0) {
+            me.length--;
+            o = me.items[index];
+            Ext.Array.erase(me.items, index, 1);
+            key = me.keys[index];
+            if (typeof key != 'undefined') {
+                delete me.map[key];
+            }
+            Ext.Array.erase(me.keys, index, 1);
+            if (me.hasListeners.remove) {
+                me.fireEvent('remove', o, key);
+            }
+            me.generation++;
+            return o;
+        }
+        return false;
+    },
+
+    /**
+     * Remove a range of items starting at a specified index in the collection.
+     * Does not fire the remove event.
+     * @param {Number} index The index within the collection of the item to remove.
+     * @param {Number} [removeCount=1] The nuber of items to remove beginning at the specified index.
+     * @return {Object} The last item removed or false if no item was removed.
+     */
+    removeRange : function(index, removeCount) {
+        var me = this,
+            o,
+            key,
+            i,
+            limit,
+            syncIndices,
+            trimming;
+
+        if (index < me.length && index >= 0) {
+            if (!removeCount) {
+                removeCount = 1;
+            }
+            limit = Math.min(index + removeCount, me.length);
+            removeCount = limit - index;
+
+            // If we are removing from end and the indices are in sync, its cheap to kep them that way
+            trimming = limit === me.length;
+            syncIndices = trimming && me.indexGeneration === me.generation;
+
+            // Loop through the to remove indices deleting from the key hashes
+            for (i = index; i < limit; i++) {
+                key = me.keys[i];
+                if (key != null) {
+                    delete me.map[key];
+                    if (syncIndices) {
+                        delete me.indexMap[key];
+                    }
+                }
+            }
+            // Last item encountered
+            o = me.items[i - 1];
+            
+            me.length -= removeCount;
+            me.generation++;
+            if (syncIndices) {
+                me.indexGeneration = me.generation;
+            }
+
+            // Chop items and keys arrays.
+            // If trimming the trailing end, we can just truncate the array.
+            // We can use splice directly. The IE8 bug which Ext.Array works around only affects *insertion*
+            // http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/6e946d03-e09f-4b22-a4dd-cd5e276bf05a/
+            if (trimming) {
+                me.items.length = me.keys.length = me.length;
+            } else {
+                me.items.splice(index, removeCount);
+                me.keys.splice(index, removeCount);
+            }
+
+            // Return last object removed
+            return o;
+        }
+        return false;
+    },
+
+    /**
+     * Removes an item associated with the passed key fom the collection.
+     * @param {String} key The key of the item to remove. If `null` is passed,
+     * all objects which yielded no key from the configured {@link #getKey} function are removed.
+     * @return {Object} Only returned if removing at a specified key. The item removed or false if no item was removed.
+     */
+    removeAtKey : function(key) {
+        var me = this,
+            keys = me.keys,
+            i;
+
+        // Remove objects which yielded no key from our configured getKey function
+        if (key == null) {
+            for (i = keys.length - 1; i >=0; i--) {
+                if (keys[i] == null) {
+                    me.removeAt(i);
+                }
+            }
+        }
+        // Remove object at the passed key
+        else {
+            return me.removeAt(me.indexOfKey(key));
+        }
+    },
+
+    /**
+     * Returns the number of items in the collection.
+     * @return {Number} the number of items in the collection.
+     * @since 1.1.0
+     */
+    getCount : function() {
+        return this.length;
+    },
+
+    /**
+     * Returns index within the collection of the passed Object.
+     * @param {Object} o The item to find the index of.
+     * @return {Number} index of the item. Returns -1 if not found.
+     * @since 1.1.0
+     */
+    indexOf : function(o) {
+        var me = this,
+            key;
+
+        if (o != null) {
+            // If
+            //     We have not been forced into using linear lookup by a usage of the 2 arg form of add
+            // and
+            //     The key extraction function yields a key
+            // Then use indexOfKey. This will use the indexMap - rebuilding it if necessary.
+            if (!me.useLinearSearch && (key = me.getKey(o))) {
+                return this.indexOfKey(key);
+            }
+
+            // Fallback: Use linear search
+            return Ext.Array.indexOf(me.items, o);
+        }
+
+        // No object passed
+        return -1;
+    },
+
+    /**
+     * Returns index within the collection of the passed key.
+     * @param {String} key The key to find the index of.
+     * @return {Number} index of the key.
+     * @since 1.1.0
+     */
+    indexOfKey : function(key) {
+        if (!this.map.hasOwnProperty(key)) {
+            return -1;
+        }
+        if (this.indexGeneration !== this.generation) {
+            this.rebuildIndexMap();
+        }
+        return this.indexMap[key];
+    },
+    
+    rebuildIndexMap: function() {
+        var me = this,
+            indexMap = me.indexMap = {},
+            keys = me.keys,
+            len = keys.length,
+            i;
+
+        for (i = 0; i < len; i++) {
+            indexMap[keys[i]] = i;
+        }
+        me.indexGeneration = me.generation;
+    },
+
+    /**
+     * Returns the item associated with the passed key OR index.
+     * Key has priority over index.  This is the equivalent
+     * of calling {@link #getByKey} first, then if nothing matched calling {@link #getAt}.
+     * @param {String/Number} key The key or index of the item.
+     * @return {Object} If the item is found, returns the item.  If the item was not found, returns <code>undefined</code>.
+     * If an item was found, but is a Class, returns <code>null</code>.
+     * @since 1.1.0
+     */
+    get : function(key) {
+        var me = this,
+            mk = me.map[key],
+            item = mk !== undefined ? mk : (typeof key == 'number') ? me.items[key] : undefined;
+        return typeof item != 'function' || me.allowFunctions ? item : null; // for prototype!
+    },
+
+    /**
+     * Returns the item at the specified index.
+     * @param {Number} index The index of the item.
+     * @return {Object} The item at the specified index.
+     */
+    getAt : function(index) {
+        return this.items[index];
+    },
+
+    /**
+     * Returns the item associated with the passed key.
+     * @param {String/Number} key The key of the item.
+     * @return {Object} The item associated with the passed key.
+     */
+    getByKey : function(key) {
+        return this.map[key];
+    },
+
+    /**
+     * Returns true if the collection contains the passed Object as an item.
+     * @param {Object} o  The Object to look for in the collection.
+     * @return {Boolean} True if the collection contains the Object as an item.
+     * @since 1.1.0
+     */
+    contains : function(o) {
+        var me = this,
+            key;
+
+        if (o != null) {
+            // If
+            //     We have not been forced into using linear lookup by a usage of the 2 arg form of add
+            // and
+            //     The key extraction function yields a key
+            // Then use the map to determine object presence.
+            if (!me.useLinearSearch && (key = me.getKey(o))) {
+                return this.map[key] != null;
+            }
+
+            // Fallback: Use linear search
+            return Ext.Array.indexOf(this.items, o) !== -1;
+        }
+        
+        return false;
+    },
+
+    /**
+     * Returns true if the collection contains the passed Object as a key.
+     * @param {String} key The key to look for in the collection.
+     * @return {Boolean} True if the collection contains the Object as a key.
+     * @since 1.1.0
+     */
+    containsKey : function(key) {
+        return this.map.hasOwnProperty(key);
+    },
+
+    /**
+     * Removes all items from the collection.  Fires the {@link #event-clear} event when complete.
+     * @since 1.1.0
+     */
+    clear : function() {
+        var me = this;
+
+        // Only clear if it has ever had any content
+        if (me.generation) {
+            me.length = 0;
+            me.items = [];
+            me.keys = [];
+            me.map = {};
+            me.indexMap = {};
+
+            me.generation++;
+            me.indexGeneration = me.generation;
+        }
+        if (me.hasListeners.clear) {
+            me.fireEvent('clear');
+        }
+    },
+
+    /**
+     * Returns the first item in the collection.
+     * @return {Object} the first item in the collection..
+     * @since 1.1.0
+     */
+    first : function() {
+        return this.items[0];
+    },
+
+    /**
+     * Returns the last item in the collection.
+     * @return {Object} the last item in the collection..
+     * @since 1.1.0
+     */
+    last : function() {
+        return this.items[this.length - 1];
+    },
+
+    /**
+     * Collects all of the values of the given property and returns their sum
+     * @param {String} property The property to sum by
+     * @param {String} [root] 'root' property to extract the first argument from. This is used mainly when
+     * summing fields in records, where the fields are all stored inside the 'data' object
+     * @param {Number} [start=0] The record index to start at
+     * @param {Number} [end=-1] The record index to end at
+     * @return {Number} The total
+     */
+    sum: function(property, root, start, end) {
+        var values = this.extractValues(property, root),
+            length = values.length,
+            sum    = 0,
+            i;
+
+        start = start || 0;
+        end   = (end || end === 0) ? end : length - 1;
+
+        for (i = start; i <= end; i++) {
+            sum += values[i];
+        }
+
+        return sum;
+    },
+
+    /**
+     * Collects unique values of a particular property in this MixedCollection
+     * @param {String} property The property to collect on
+     * @param {String} root (optional) 'root' property to extract the first argument from. This is used mainly when
+     * summing fields in records, where the fields are all stored inside the 'data' object
+     * @param {Boolean} allowBlank (optional) Pass true to allow null, undefined or empty string values
+     * @return {Array} The unique values
+     */
+    collect: function(property, root, allowNull) {
+        var values = this.extractValues(property, root),
+            length = values.length,
+            hits   = {},
+            unique = [],
+            value, strValue, i;
+
+        for (i = 0; i < length; i++) {
+            value = values[i];
+            strValue = String(value);
+
+            if ((allowNull || !Ext.isEmpty(value)) && !hits[strValue]) {
+                hits[strValue] = true;
+                unique.push(value);
+            }
+        }
+
+        return unique;
+    },
+
+    /**
+     * @private
+     * Extracts all of the given property values from the items in the MC. Mainly used as a supporting method for
+     * functions like sum and collect.
+     * @param {String} property The property to extract
+     * @param {String} root (optional) 'root' property to extract the first argument from. This is used mainly when
+     * extracting field data from Model instances, where the fields are stored inside the 'data' object
+     * @return {Array} The extracted values
+     */
+    extractValues: function(property, root) {
+        var values = this.items;
+
+        if (root) {
+            values = Ext.Array.pluck(values, root);
+        }
+
+        return Ext.Array.pluck(values, property);
+    },
+
+    /**
+     * @private
+     * For API parity with Store's PageMap class. Buffered rendering checks if the Store has the range
+     * required to render. The Store delegates this question to its backing data object which may be an instance
+     * of its private PageMap class, or a MixedCollection.
+     */
+    hasRange: function(start, end) {
+        return (end < this.length);
+    },
+
+    /**
+     * Returns a range of items in this collection
+     * @param {Number} startIndex (optional) The starting index. Defaults to 0.
+     * @param {Number} endIndex (optional) The ending index. Defaults to the last item.
+     * @return {Array} An array of items
+     * @since 1.1.0
+     */
+    getRange : function(start, end){
+        var me = this,
+            items = me.items,
+            range = [],
+            len = items.length,
+            tmp, reverse;
+
+        if (len < 1) {
+            return range;
+        }
+        
+        if (start > end) {
+            reverse = true;
+            tmp = start;
+            start = end;
+            end = tmp;
+        }
+
+        if (start < 0) {
+            start = 0;
+        }
+        
+        if (end == null || end >= len) {
+            end = len - 1;    
+        }
+        
+        range = items.slice(start, end + 1);
+        if (reverse && range.length) {
+            range.reverse();
+        }
+        return range;
+    },
+
+    /**
+     * <p>Filters the objects in this collection by a set of {@link Ext.util.Filter Filter}s, or by a single
+     * property/value pair with optional parameters for substring matching and case sensitivity. See
+     * {@link Ext.util.Filter Filter} for an example of using Filter objects (preferred). Alternatively,
+     * MixedCollection can be easily filtered by property like this:</p>
+     *
+     *    //create a simple store with a few people defined
+     *    var people = new Ext.util.MixedCollection();
+     *    people.addAll([
+     *        {id: 1, age: 25, name: 'Ed'},
+     *        {id: 2, age: 24, name: 'Tommy'},
+     *        {id: 3, age: 24, name: 'Arne'},
+     *        {id: 4, age: 26, name: 'Aaron'}
+     *    ]);
+     *    
+     *    //a new MixedCollection containing only the items where age == 24
+     *    var middleAged = people.filter('age', 24);
+     *
+     * @param {Ext.util.Filter[]/String} property A property on your objects, or an array of {@link Ext.util.Filter Filter} objects
+     * @param {String/RegExp} value Either string that the property values
+     * should start with or a RegExp to test against the property
+     * @param {Boolean} [anyMatch=false] True to match any part of the string, not just the beginning
+     * @param {Boolean} [caseSensitive=false] True for case sensitive comparison.
+     * @return {Ext.util.MixedCollection} The new filtered collection
+     * @since 1.1.0
+     */
+    filter : function(property, value, anyMatch, caseSensitive) {
+        var filters = [];
+
+        //support for the simple case of filtering by property/value
+        if (Ext.isString(property)) {
+            filters.push(new Ext.util.Filter({
+                property     : property,
+                value        : value,
+                anyMatch     : anyMatch,
+                caseSensitive: caseSensitive
+            }));
+        } else if (Ext.isArray(property) || property instanceof Ext.util.Filter) {
+            filters = filters.concat(property);
+        }
+
+        // At this point we have an array of zero or more Ext.util.Filter objects to filter with,
+        // so here we construct a function that combines these filters by ANDing them together
+        // and filter by that.
+        return this.filterBy(Ext.util.Filter.createFilterFn(filters));
+    },
+
+    /**
+     * Filter by a function. Returns a <i>new</i> collection that has been filtered.
+     * The passed function will be called with each object in the collection.
+     * If the function returns true, the value is included otherwise it is filtered.
+     * @param {Function} fn The function to be called.
+     * @param {Mixed} fn.item The collection item.
+     * @param {String} fn.key The key of collection item.
+     * @param {Object} scope (optional) The scope (<code>this</code> reference) in
+     * which the function is executed. Defaults to this MixedCollection.
+     * @return {Ext.util.MixedCollection} The new filtered collection
+     * @since 1.1.0
+     */
+    filterBy : function(fn, scope) {
+        var me = this,
+            newMC  = new me.self(me.initialConfig),
+            keys   = me.keys,
+            items  = me.items,
+            length = items.length,
+            i;
+
+        newMC.getKey = me.getKey;
+
+        for (i = 0; i < length; i++) {
+            if (fn.call(scope || me, items[i], keys[i])) {
+                newMC.add(keys[i], items[i]);
+            }
+        }
+
+        return newMC;
+    },
+
+    /**
+     * Finds the index of the first matching object in this collection by a specific property/value.
+     * @param {String} property The name of a property on your objects.
+     * @param {String/RegExp} value A string that the property values
+     * should start with or a RegExp to test against the property.
+     * @param {Number} [start=0] The index to start searching at.
+     * @param {Boolean} [anyMatch=false] True to match any part of the string, not just the beginning.
+     * @param {Boolean} [caseSensitive=false] True for case sensitive comparison.
+     * @return {Number} The matched index or -1
+     * @since 2.3.0
+     */
+    findIndex : function(property, value, start, anyMatch, caseSensitive){
+        if(Ext.isEmpty(value, false)){
+            return -1;
+        }
+        value = this.createValueMatcher(value, anyMatch, caseSensitive);
+        return this.findIndexBy(function(o){
+            return o && value.test(o[property]);
+        }, null, start);
+    },
+
+    /**
+     * Find the index of the first matching object in this collection by a function.
+     * If the function returns <i>true</i> it is considered a match.
+     * @param {Function} fn The function to be called.
+     * @param {Mixed} fn.item The collection item.
+     * @param {String} fn.key The key of collection item.
+     * @param {Object} [scope] The scope (<code>this</code> reference) in which the function is executed. Defaults to this MixedCollection.
+     * @param {Number} [start=0] The index to start searching at.
+     * @return {Number} The matched index or -1
+     * @since 2.3.0
+     */
+    findIndexBy : function(fn, scope, start){
+        var me = this,
+            keys = me.keys,
+            items = me.items,
+            i = start || 0,
+            len = items.length;
+
+        for (; i < len; i++) {
+            if (fn.call(scope || me, items[i], keys[i])) {
+                return i;
+            }
+        }
+        return -1;
+    },
+
+    /**
+     * Returns a regular expression based on the given value and matching options. This is used internally for finding and filtering,
+     * and by Ext.data.Store#filter
+     * @private
+     * @param {String} value The value to create the regex for. This is escaped using Ext.escapeRe
+     * @param {Boolean} anyMatch True to allow any match - no regex start/end line anchors will be added. Defaults to false
+     * @param {Boolean} caseSensitive True to make the regex case sensitive (adds 'i' switch to regex). Defaults to false.
+     * @param {Boolean} exactMatch True to force exact match (^ and $ characters added to the regex). Defaults to false. Ignored if anyMatch is true.
+     * @since 3.4.0
+     */
+    createValueMatcher : function(value, anyMatch, caseSensitive, exactMatch) {
+        if (!value.exec) { // not a regex
+            var er = Ext.String.escapeRegex;
+            value = String(value);
+
+            if (anyMatch === true) {
+                value = er(value);
+            } else {
+                value = '^' + er(value);
+                if (exactMatch === true) {
+                    value += '$';
+                }
+            }
+            value = new RegExp(value, caseSensitive ? '' : 'i');
+        }
+        return value;
+    },
+
+    /**
+     * Creates a shallow copy of this collection
+     * @return {Ext.util.MixedCollection}
+     * @since 1.1.0
+     */
+    clone : function() {
+        var me = this,
+            copy = new this.self(me.initialConfig);
+
+        copy.add(me.keys, me.items);
+        return copy;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents a single sorter that can be applied to a Store. The sorter is used
+ * to compare two values against each other for the purpose of ordering them. Ordering
+ * is achieved by specifying either:
+ *
+ * - {@link #property A sorting property}
+ * - {@link #sorterFn A sorting function}
+ *
+ * As a contrived example, we can specify a custom sorter that sorts by rank:
+ *
+ *     Ext.define('Person', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['name', 'rank']
+ *     });
+ *
+ *     Ext.create('Ext.data.Store', {
+ *         model: 'Person',
+ *         proxy: 'memory',
+ *         sorters: [{
+ *             sorterFn: function(o1, o2){
+ *                 var getRank = function(o){
+ *                     var name = o.get('rank');
+ *                     if (name === 'first') {
+ *                         return 1;
+ *                     } else if (name === 'second') {
+ *                         return 2;
+ *                     } else {
+ *                         return 3;
+ *                     }
+ *                 },
+ *                 rank1 = getRank(o1),
+ *                 rank2 = getRank(o2);
+ *
+ *                 if (rank1 === rank2) {
+ *                     return 0;
+ *                 }
+ *
+ *                 return rank1 < rank2 ? -1 : 1;
+ *             }
+ *         }],
+ *         data: [{
+ *             name: 'Person1',
+ *             rank: 'second'
+ *         }, {
+ *             name: 'Person2',
+ *             rank: 'third'
+ *         }, {
+ *             name: 'Person3',
+ *             rank: 'first'
+ *         }]
+ *     });
+ */
+Ext.define('Ext.util.Sorter', {
+
+    /**
+     * @cfg {String} property
+     * The property to sort by. Required unless {@link #sorterFn} is provided. The property is extracted from the object
+     * directly and compared for sorting using the built in comparison operators.
+     */
+
+    /**
+     * @cfg {Function} sorterFn
+     * A specific sorter function to execute. Can be passed instead of {@link #property}. This sorter function allows
+     * for any kind of custom/complex comparisons. The sorterFn receives two arguments, the objects being compared. The
+     * function should return:
+     *
+     *   - -1 if o1 is "less than" o2
+     *   - 0 if o1 is "equal" to o2
+     *   - 1 if o1 is "greater than" o2
+     */
+
+    /**
+     * @cfg {String} root
+     * Optional root property. This is mostly useful when sorting a Store, in which case we set the root to 'data' to
+     * make the filter pull the {@link #property} out of the data object of each item
+     */
+
+    /**
+     * @cfg {Function} transform
+     * A function that will be run on each value before it is compared in the sorter. The function will receive a single
+     * argument, the value.
+     */
+
+    /**
+     * @cfg {String} direction
+     * The direction to sort by.
+     */
+    direction: "ASC",
+
+    constructor: function(config) {
+        var me = this;
+
+        Ext.apply(me, config);
+
+        if (me.property === undefined && me.sorterFn === undefined) {
+            Ext.Error.raise("A Sorter requires either a property or a sorter function");
+        }
+
+        me.updateSortFunction();
+    },
+
+    /**
+     * @private
+     * Creates and returns a function which sorts an array by the given property and direction
+     * @return {Function} A function which sorts by the property/direction combination provided
+     */
+    createSortFunction: function(sorterFn) {
+        var me        = this,
+            direction = me.direction || "ASC",
+            modifier  = direction.toUpperCase() == "DESC" ? -1 : 1;
+
+        //create a comparison function. Takes 2 objects, returns 1 if object 1 is greater,
+        //-1 if object 2 is greater or 0 if they are equal
+        return function(o1, o2) {
+            return modifier * sorterFn.call(me, o1, o2);
+        };
+    },
+
+    /**
+     * @private
+     * Basic default sorter function that just compares the defined property of each object
+     */
+    defaultSorterFn: function(o1, o2) {
+        var me = this,
+            transform = me.transform,
+            v1 = me.getRoot(o1)[me.property],
+            v2 = me.getRoot(o2)[me.property];
+
+        if (transform) {
+            v1 = transform(v1);
+            v2 = transform(v2);
+        }
+
+        return v1 > v2 ? 1 : (v1 < v2 ? -1 : 0);
+    },
+
+    /**
+     * @private
+     * Returns the root property of the given item, based on the configured {@link #root} property
+     * @param {Object} item The item
+     * @return {Object} The root property of the object
+     */
+    getRoot: function(item) {
+        return this.root === undefined ? item : item[this.root];
+    },
+
+    /**
+     * Set the sorting direction for this sorter.
+     * @param {String} direction The direction to sort in. Should be either 'ASC' or 'DESC'.
+     */
+    setDirection: function(direction) {
+        var me = this;
+        me.direction = direction ? direction.toUpperCase() : direction;
+        me.updateSortFunction();
+    },
+
+    /**
+     * Toggles the sorting direction for this sorter.
+     */
+    toggle: function() {
+        var me = this;
+        me.direction = Ext.String.toggle(me.direction, "ASC", "DESC");
+        me.updateSortFunction();
+    },
+
+    /**
+     * Update the sort function for this sorter.
+     * @param {Function} [fn] A new sorter function for this sorter. If not specified it will use the default
+     * sorting function.
+     */
+    updateSortFunction: function(fn) {
+        var me = this;
+        fn = fn || me.sorterFn || me.defaultSorterFn;
+        me.sort = me.createSortFunction(fn);
+    },
+
+    serialize: function() {
+        return {
+            root: this.root,
+            property: this.property,
+            direction: this.direction
+        };
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Tommy Maintz <tommy at sencha.com>
+ *
+ * A mixin which allows a data component to be sorted. This is used by e.g. {@link Ext.data.Store} and {@link Ext.data.TreeStore}.
+ *
+ * **NOTE**: This mixin is mainly for internal use and most users should not need to use it directly. It
+ * is more likely you will want to use one of the component classes that import this mixin, such as
+ * {@link Ext.data.Store} or {@link Ext.data.TreeStore}.
+ */
+Ext.define("Ext.util.Sortable", {
+    /**
+     * @property {Boolean} isSortable
+     * `true` in this class to identify an object as an instantiated Sortable, or subclass thereof.
+     */
+    isSortable: true,
+
+    /**
+     * @cfg {String} defaultSortDirection
+     * The default sort direction to use if one is not specified.
+     */
+    defaultSortDirection: "ASC",
+
+               
+                         
+      
+
+    statics: {
+        /**
+         * Creates a single comparator function which encapsulates the passed Sorter array.
+         * @param {Ext.util.Sorter[]} sorters The sorter set for which to create a comparator function
+         * @return {Function} a function, which when passed two comparable objects returns the result
+         * of the whole sorter comparator functions.
+         */
+        createComparator: function(sorters) {
+            return sorters && sorters.length ? function(r1, r2) {
+                var result = sorters[0].sort(r1, r2),
+                    length = sorters.length,
+                    i = 1;
+
+                // if we have more than one sorter, OR any additional sorter functions together
+                for (; i < length; i++) {
+                    result = result || sorters[i].sort.call(this, r1, r2);
+                }
+                return result;
+            }: function() {
+                return 0;
+            };
+        }
+    },
+
+    /**
+     * @cfg {String} sortRoot
+     * The property in each item that contains the data to sort.
+     */
+
+    /**
+     * @cfg {Ext.util.Sorter[]/Object[]} sorters
+     * The initial set of {@link Ext.util.Sorter Sorters}
+     */
+
+    /**
+     * Performs initialization of this mixin. Component classes using this mixin should call this method during their
+     * own initialization.
+     */
+    initSortable: function() {
+        var me = this,
+            sorters = me.sorters;
+
+        /**
+         * @property {Ext.util.MixedCollection} sorters
+         * The collection of {@link Ext.util.Sorter Sorters} currently applied to this Store
+         */
+        me.sorters = new Ext.util.AbstractMixedCollection(false, function(item) {
+            return item.id || item.property;
+        });
+
+        if (sorters) {
+            me.sorters.addAll(me.decodeSorters(sorters));
+        }
+    },
+
+    /**
+     * Sorts the data in the Store by one or more of its properties. Example usage:
+     *
+     *     //sort by a single field
+     *     myStore.sort('myField', 'DESC');
+     *
+     *     //sorting by multiple fields
+     *     myStore.sort([
+     *         {
+     *             property : 'age',
+     *             direction: 'ASC'
+     *         },
+     *         {
+     *             property : 'name',
+     *             direction: 'DESC'
+     *         }
+     *     ]);
+     *
+     * Internally, Store converts the passed arguments into an array of {@link Ext.util.Sorter} instances, and delegates
+     * the actual sorting to its internal {@link Ext.util.MixedCollection}.
+     *
+     * When passing a single string argument to sort, Store maintains a ASC/DESC toggler per field, so this code:
+     *
+     *     store.sort('myField');
+     *     store.sort('myField');
+     *
+     * Is equivalent to this code, because Store handles the toggling automatically:
+     *
+     *     store.sort('myField', 'ASC');
+     *     store.sort('myField', 'DESC');
+     *
+     * @param {String/Ext.util.Sorter[]} [sorters] Either a string name of one of the fields in this Store's configured
+     * {@link Ext.data.Model Model}, or an array of sorter configurations.
+     * @param {String} [direction="ASC"] The overall direction to sort the data by.
+     * @return {Ext.util.Sorter[]}
+     */
+    sort: function(sorters, direction, where, doSort) {
+        var me = this,
+            sorter,
+            newSorters;
+
+        if (Ext.isArray(sorters)) {
+            doSort = where;
+            where = direction;
+            newSorters = sorters;
+        }
+        else if (Ext.isObject(sorters)) {
+            doSort = where;
+            where = direction;
+            newSorters = [sorters];
+        }
+        else if (Ext.isString(sorters)) {
+            sorter = me.sorters.get(sorters);
+
+            if (!sorter) {
+                sorter = {
+                    property : sorters,
+                    direction: direction
+                };
+                newSorters = [sorter];
+            }
+            else if (direction === undefined) {
+                sorter.toggle();
+            }
+            else {
+                sorter.setDirection(direction);
+            }
+        }
+
+        if (newSorters && newSorters.length) {
+            newSorters = me.decodeSorters(newSorters);
+            if (Ext.isString(where)) {
+                if (where === 'prepend') {
+                    me.sorters.insert(0, newSorters);
+                }
+                else {
+                    me.sorters.addAll(newSorters);
+                }
+            }
+            else {
+                me.sorters.clear();
+                me.sorters.addAll(newSorters);
+            }
+        }
+
+        if (doSort !== false) {
+            me.fireEvent('beforesort', me, newSorters);
+            me.onBeforeSort(newSorters);
+            
+            sorters = me.sorters.items;
+            if (sorters.length) {
+                // Sort using a generated sorter function which combines all of the Sorters passed
+                me.doSort(me.generateComparator());
+            }
+        }
+
+        return sorters;
+    },
+
+    /**
+     * Returns a comparator function which compares two items and returns -1, 0, or 1 depending
+     * on the currently defined set of {@link #cfg-sorters}.
+     *
+     * If there are no {@link #cfg-sorters} defined, it returns a function which returns `0` meaning
+     * that no sorting will occur.
+     */
+    generateComparator: function() {
+        var sorters = this.sorters.getRange();
+        return sorters.length ? this.createComparator(sorters) : this.emptyComparator;
+    },
+
+    emptyComparator: function(){
+        return 0;
+    },
+
+    onBeforeSort: Ext.emptyFn,
+
+    /**
+     * @private
+     * Normalizes an array of sorter objects, ensuring that they are all Ext.util.Sorter instances
+     * @param {Object[]} sorters The sorters array
+     * @return {Ext.util.Sorter[]} Array of Ext.util.Sorter objects
+     */
+    decodeSorters: function(sorters) {
+        if (!Ext.isArray(sorters)) {
+            if (sorters === undefined) {
+                sorters = [];
+            } else {
+                sorters = [sorters];
+            }
+        }
+
+        var length = sorters.length,
+            Sorter = Ext.util.Sorter,
+            fields = this.model ? this.model.prototype.fields : null,
+            field,
+            config, i;
+
+        for (i = 0; i < length; i++) {
+            config = sorters[i];
+
+            if (!(config instanceof Sorter)) {
+                if (Ext.isString(config)) {
+                    config = {
+                        property: config
+                    };
+                }
+
+                Ext.applyIf(config, {
+                    root     : this.sortRoot,
+                    direction: "ASC"
+                });
+
+                //support for 3.x style sorters where a function can be defined as 'fn'
+                if (config.fn) {
+                    config.sorterFn = config.fn;
+                }
+
+                //support a function to be passed as a sorter definition
+                if (typeof config == 'function') {
+                    config = {
+                        sorterFn: config
+                    };
+                }
+
+                // ensure sortType gets pushed on if necessary
+                if (fields && !config.transform) {
+                    field = fields.get(config.property);
+                    config.transform = field && field.sortType !== Ext.identityFn ? field.sortType : undefined;
+                }
+                sorters[i] = new Ext.util.Sorter(config);
+            }
+        }
+
+        return sorters;
+    },
+
+    getSorters: function() {
+        return this.sorters.items;
+    },
+    
+    /**
+     * Gets the first sorter from the sorters collection, excluding
+     * any groupers that may be in place
+     * @protected
+     * @return {Ext.util.Sorter} The sorter, null if none exist
+     */
+    getFirstSorter: function(){
+        var sorters = this.sorters.items,
+            len = sorters.length,
+            i = 0,
+            sorter;
+            
+        for (; i < len; ++i) {
+            sorter = sorters[i];
+            if (!sorter.isGrouper) {
+                return sorter;    
+            }
+        }
+        return null;
+    }
+}, function() {
+    // Reference the static implementation in prototype
+    this.prototype.createComparator = this.createComparator;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents a collection of a set of key and value pairs. Each key in the MixedCollection
+ * must be unique, the same key cannot exist twice. This collection is ordered, items in the
+ * collection can be accessed by index  or via the key. Newly added items are added to
+ * the end of the collection. This class is similar to {@link Ext.util.HashMap} however it
+ * is heavier and provides more functionality. Sample usage:
+ *
+ *     var coll = new Ext.util.MixedCollection();
+ *     coll.add('key1', 'val1');
+ *     coll.add('key2', 'val2');
+ *     coll.add('key3', 'val3');
+ *
+ *     console.log(coll.get('key1')); // prints 'val1'
+ *     console.log(coll.indexOfKey('key3')); // prints 2
+ *
+ * The MixedCollection also has support for sorting and filtering of the values in the collection.
+ *
+ *     var coll = new Ext.util.MixedCollection();
+ *     coll.add('key1', 100);
+ *     coll.add('key2', -100);
+ *     coll.add('key3', 17);
+ *     coll.add('key4', 0);
+ *     var biggerThanZero = coll.filterBy(function(value){
+ *         return value > 0;
+ *     });
+ *     console.log(biggerThanZero.getCount()); // prints 2
+ *
+ */
+Ext.define('Ext.util.MixedCollection', {
+    extend:  Ext.util.AbstractMixedCollection ,
+    mixins: {
+        sortable:  Ext.util.Sortable 
+    },
+
+    /**
+     * @cfg {Boolean} allowFunctions
+     * Configure as `true` if the {@link #addAll} function should add function references to the collection.
+     */
+
+    /**
+     * Creates new MixedCollection.
+     * @param {Object} config A configuration object.
+     *  @param {Boolean} [config.allowFunctions=false] Specify `true` if the {@link #addAll}
+     * function should add function references to the collection.
+     *  @param {Function} [config.getKey] A function that can accept an item of the type(s) stored in this MixedCollection
+     * and return the key value for that item.  This is used when available to look up the key on items that
+     * were passed without an explicit key parameter to a MixedCollection method.  Passing this parameter is
+     * equivalent to overriding the {@link #method-getKey} method.
+     */
+    constructor: function() {
+        var me = this;
+        me.callParent(arguments);
+        me.addEvents('sort');
+        me.mixins.sortable.initSortable.call(me);
+    },
+
+    doSort: function(sorterFn) {
+        this.sortBy(sorterFn);
+    },
+
+    /**
+     * @private
+     * Performs the actual sorting based on a direction and a sorting function. Internally,
+     * this creates a temporary array of all items in the MixedCollection, sorts it and then writes
+     * the sorted array data back into this.items and this.keys
+     * @param {String} property Property to sort by ('key', 'value', or 'index')
+     * @param {String} dir (optional) Direction to sort 'ASC' or 'DESC'. Defaults to 'ASC'.
+     * @param {Function} fn (optional) Comparison function that defines the sort order.
+     * Defaults to sorting by numeric value.
+     */
+    _sort : function(property, dir, fn) {
+        var me = this,
+            i, len,
+            dsc   = String(dir).toUpperCase() == 'DESC' ? -1 : 1,
+
+            //this is a temporary array used to apply the sorting function
+            c     = [],
+            keys  = me.keys,
+            items = me.items,
+            o;
+
+        //default to a simple sorter function if one is not provided
+        fn = fn || function(a, b) {
+            return a - b;
+        };
+
+        //copy all the items into a temporary array, which we will sort
+        for (i = 0, len = items.length; i < len; i++) {
+            c[c.length] = {
+                key  : keys[i],
+                value: items[i],
+                index: i
+            };
+        }
+
+        //sort the temporary array
+        Ext.Array.sort(c, function(a, b) {
+            return fn(a[property], b[property]) * dsc ||
+                // In case of equality, ensure stable sort by comparing collection index
+                (a.index < b.index ? -1 : 1);
+        });
+
+        // Copy the temporary array back into the main this.items and this.keys objects
+        // Repopulate the indexMap hash if configured to do so.
+        for (i = 0, len = c.length; i < len; i++) {
+            o = c[i];
+            items[i] = o.value;
+            keys[i]  = o.key;
+            me.indexMap[o.key] = i;
+        }
+        me.generation++;
+        me.indexGeneration = me.generation;
+        me.fireEvent('sort', me);
+    },
+
+    /**
+     * Sorts the collection by a single sorter function
+     * @param {Function} sorterFn The function to sort by
+     */
+    sortBy: function(sorterFn) {
+        var me     = this,
+            items  = me.items,
+            item,
+            keys   = me.keys,
+            key,
+            length = items.length,
+            i;
+
+        // Stamp the collection index into each item so that we can implement stable sort
+        for (i = 0; i < length; i++) {
+            items[i].$extCollectionIndex = i;
+        }
+
+        Ext.Array.sort(items, function(a, b) {
+            return sorterFn(a, b) ||
+                // In case of equality, ensure stable sort by comparing collection index
+                (a.$extCollectionIndex < b.$extCollectionIndex ? -1 : 1);
+        });
+
+        // Update the keys array, and remove the index
+        for (i = 0; i < length; i++) {
+            item = items[i];
+            key = me.getKey(item);
+            keys[i] = key;
+            me.indexMap[key] = i;
+            delete items.$extCollectionIndex;
+        }
+        me.generation++;
+        me.indexGeneration = me.generation;
+        me.fireEvent('sort', me, items, keys);
+    },
+
+    /**
+     * Calculates the insertion index of the new item based upon the comparison function passed, or the current sort order.
+     * @param {Object} newItem The new object to find the insertion position of.
+     * @param {Function} [sorterFn] The function to sort by. This is the same as the sorting function
+     * passed to {@link #sortBy}. It accepts 2 items from this MixedCollection, and returns -1 0, or 1
+     * depending on the relative sort positions of the 2 compared items.
+     *
+     * If omitted, a function {@link #generateComparator generated} from the currently defined set of
+     * {@link #cfg-sorters} will be used.
+     *
+     * @return {Number} The insertion point to add the new item into this MixedCollection at using {@link #insert}
+     */
+    findInsertionIndex: function(newItem, sorterFn) {
+        var me    = this,
+            items = me.items,
+            start = 0,
+            end   = items.length - 1,
+            middle,
+            comparison;
+
+        if (!sorterFn) {
+            sorterFn = me.generateComparator();
+        }
+        while (start <= end) {
+            middle = (start + end) >> 1;
+            comparison = sorterFn(newItem, items[middle]);
+            if (comparison >= 0) {
+                start = middle + 1;
+            } else if (comparison < 0) {
+                end = middle - 1;
+            }
+        }
+        return start;
+    },
+
+    /**
+     * Reorders each of the items based on a mapping from old index to new index. Internally this
+     * just translates into a sort. The 'sort' event is fired whenever reordering has occured.
+     * @param {Object} mapping Mapping from old item index to new item index
+     */
+    reorder: function(mapping) {
+        var me = this,
+            items = me.items,
+            index = 0,
+            length = items.length,
+            order = [],
+            remaining = [],
+            oldIndex;
+
+        me.suspendEvents();
+
+        //object of {oldPosition: newPosition} reversed to {newPosition: oldPosition}
+        for (oldIndex in mapping) {
+            order[mapping[oldIndex]] = items[oldIndex];
+        }
+
+        for (index = 0; index < length; index++) {
+            if (mapping[index] == undefined) {
+                remaining.push(items[index]);
+            }
+        }
+
+        for (index = 0; index < length; index++) {
+            if (order[index] == undefined) {
+                order[index] = remaining.shift();
+            }
+        }
+
+        me.clear();
+        me.addAll(order);
+
+        me.resumeEvents();
+        me.fireEvent('sort', me);
+    },
+
+    /**
+     * Sorts this collection by <b>key</b>s.
+     * @param {String} direction (optional) 'ASC' or 'DESC'. Defaults to 'ASC'.
+     * @param {Function} fn (optional) Comparison function that defines the sort order.
+     * Defaults to sorting by case insensitive string.
+     */
+    sortByKey : function(dir, fn){
+        this._sort('key', dir, fn || function(a, b){
+            var v1 = String(a).toUpperCase(), v2 = String(b).toUpperCase();
+            return v1 > v2 ? 1 : (v1 < v2 ? -1 : 0);
+        });
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.Target
+
+This class specifies a generic target for an animation. It provides a wrapper around a
+series of different types of objects to allow for a generic animation API.
+A target can be a single object or a Composite object containing other objects that are 
+to be animated. This class and it's subclasses are generally not created directly, the 
+underlying animation will create the appropriate Ext.fx.target.Target object by passing 
+the instance to be animated.
+
+The following types of objects can be animated:
+
+- {@link Ext.fx.target.Component Components}
+- {@link Ext.fx.target.Element Elements}
+- {@link Ext.fx.target.Sprite Sprites}
+
+ * @markdown
+ * @abstract
+ */
+Ext.define('Ext.fx.target.Target', {
+
+    isAnimTarget: true,
+
+    /**
+     * Creates new Target.
+     * @param {Ext.Component/Ext.Element/Ext.draw.Sprite} target The object to be animated
+     */
+    constructor: function(target) {
+        this.target = target;
+        this.id = this.getId();
+    },
+    
+    getId: function() {
+        return this.target.id;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.Element
+ * 
+ * This class represents a animation target for an {@link Ext.Element}. In general this class will not be
+ * created directly, the {@link Ext.Element} will be passed to the animation and
+ * and the appropriate target will be created.
+ */
+Ext.define('Ext.fx.target.Element', {
+
+    /* Begin Definitions */
+    
+    extend:  Ext.fx.target.Target ,
+    
+    /* End Definitions */
+
+    type: 'element',
+
+    getElVal: function(el, attr, val) {
+        if (val == undefined) {
+            if (attr === 'x') {
+                val = el.getX();
+            } else if (attr === 'y') {
+                val = el.getY();
+            } else if (attr === 'scrollTop') {
+                val = el.getScroll().top;
+            } else if (attr === 'scrollLeft') {
+                val = el.getScroll().left;
+            } else if (attr === 'height') {
+                val = el.getHeight();
+            } else if (attr === 'width') {
+                val = el.getWidth();
+            } else {
+                val = el.getStyle(attr);
+            }
+        }
+        return val;
+    },
+
+    getAttr: function(attr, val) {
+        var el = this.target;
+        return [[ el, this.getElVal(el, attr, val)]];
+    },
+
+    setAttr: function(targetData) {
+        var target = this.target,
+            ln = targetData.length,
+            attrs, attr, o, i, j, ln2;
+            
+        for (i = 0; i < ln; i++) {
+            attrs = targetData[i].attrs;
+            for (attr in attrs) {
+                if (attrs.hasOwnProperty(attr)) {
+                    ln2 = attrs[attr].length;
+                    for (j = 0; j < ln2; j++) {
+                        o = attrs[attr][j];
+                        this.setElVal(o[0], attr, o[1]);
+                    }
+                }
+            }
+        }
+    },
+    
+    setElVal: function(element, attr, value){
+        if (attr === 'x') {
+            element.setX(value);
+        } else if (attr === 'y') {
+            element.setY(value);
+        } else if (attr === 'scrollTop') {
+            element.scrollTo('top', value);
+        } else if (attr === 'scrollLeft') {
+            element.scrollTo('left',value);
+        } else if (attr === 'width') {
+            element.setWidth(value);
+        } else if (attr === 'height') {
+            element.setHeight(value);
+        } else {
+            element.setStyle(attr, value);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.ElementCSS
+ * 
+ * This class represents a animation target for an {@link Ext.Element} that supports CSS
+ * based animation. In general this class will not be created directly, the {@link Ext.Element} 
+ * will be passed to the animation and the appropriate target will be created.
+ */
+Ext.define('Ext.fx.target.ElementCSS', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.fx.target.Element ,
+
+    /* End Definitions */
+
+    setAttr: function(targetData, isFirstFrame) {
+        var cssArr = {
+                attrs: [],
+                duration: [],
+                easing: []
+            },
+            ln = targetData.length,
+            attributes,
+            attrs,
+            attr,
+            easing,
+            duration,
+            o,
+            i,
+            j,
+            ln2;
+        for (i = 0; i < ln; i++) {
+            attrs = targetData[i];
+            duration = attrs.duration;
+            easing = attrs.easing;
+            attrs = attrs.attrs;
+            for (attr in attrs) {
+                if (Ext.Array.indexOf(cssArr.attrs, attr) == -1) {
+                    cssArr.attrs.push(attr.replace(/[A-Z]/g, function(v) {
+                        return '-' + v.toLowerCase();
+                    }));
+                    cssArr.duration.push(duration + 'ms');
+                    cssArr.easing.push(easing);
+                }
+            }
+        }
+        attributes = cssArr.attrs.join(',');
+        duration = cssArr.duration.join(',');
+        easing = cssArr.easing.join(', ');
+        for (i = 0; i < ln; i++) {
+            attrs = targetData[i].attrs;
+            for (attr in attrs) {
+                ln2 = attrs[attr].length;
+                for (j = 0; j < ln2; j++) {
+                    o = attrs[attr][j];
+                    o[0].setStyle(Ext.supports.CSS3Prefix + 'TransitionProperty', isFirstFrame ? '' : attributes);
+                    o[0].setStyle(Ext.supports.CSS3Prefix + 'TransitionDuration', isFirstFrame ? '' : duration);
+                    o[0].setStyle(Ext.supports.CSS3Prefix + 'TransitionTimingFunction', isFirstFrame ? '' : easing);
+                    o[0].setStyle(attr, o[1]);
+
+                    // Must trigger reflow to make this get used as the start point for the transition that follows
+                    if (isFirstFrame) {
+                        o = o[0].dom.offsetWidth;
+                    }
+                    else {
+                        // Remove transition properties when completed.
+                        o[0].on(Ext.supports.CSS3TransitionEnd, function() {
+                            this.setStyle(Ext.supports.CSS3Prefix + 'TransitionProperty', null);
+                            this.setStyle(Ext.supports.CSS3Prefix + 'TransitionDuration', null);
+                            this.setStyle(Ext.supports.CSS3Prefix + 'TransitionTimingFunction', null);
+                        }, o[0], { single: true });
+                    }
+                }
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.CompositeElement
+ * 
+ * This class represents a animation target for a {@link Ext.CompositeElement}. It allows
+ * each {@link Ext.Element} in the group to be animated as a whole. In general this class will not be
+ * created directly, the {@link Ext.CompositeElement} will be passed to the animation and
+ * and the appropriate target will be created.
+ */
+Ext.define('Ext.fx.target.CompositeElement', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.fx.target.Element ,
+
+    /* End Definitions */
+
+    /**
+     * @property {Boolean} isComposite
+     * `true` in this class to identify an object as an instantiated CompositeElement, or subclass thereof.
+     */
+    isComposite: true,
+    
+    constructor: function(target) {
+        target.id = target.id || Ext.id(null, 'ext-composite-');
+        this.callParent([target]);
+    },
+
+    getAttr: function(attr, val) {
+        var out      = [],
+            target = this.target,
+            elements = target.elements,
+            length   = elements.length,
+            i,
+            el;
+
+        for (i = 0; i < length; i++) {
+            el = elements[i];
+
+            if (el) {
+                el = target.getElement(el);
+                out.push([el, this.getElVal(el, attr, val)]);
+            }
+        }
+
+        return out;
+    },
+    
+    setAttr: function(targetData){
+        var target = this.target,
+            ln = targetData.length,
+            elements = target.elements,
+            ln3 = elements.length,
+            value, k,
+            attrs, attr, o, i, j, ln2;
+            
+        for (i = 0; i < ln; i++) {
+            attrs = targetData[i].attrs;
+            for (attr in attrs) {
+                if (attrs.hasOwnProperty(attr)) {
+                    ln2 = attrs[attr].length;
+                    for (j = 0; j < ln2; j++) {
+                        value = attrs[attr][j][1];
+                        for (k = 0; k < ln3; ++k) {
+                            el = elements[k];
+                            if (el) {
+                                el = target.getElement(el);
+                                this.setElVal(el, attr, value);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.CompositeElementCSS
+ * 
+ * This class represents a animation target for a {@link Ext.CompositeElement}, where the
+ * constituent elements support CSS based animation. It allows each {@link Ext.Element} in 
+ * the group to be animated as a whole. In general this class will not be created directly, 
+ * the {@link Ext.CompositeElement} will be passed to the animation and the appropriate target 
+ * will be created.
+ */
+Ext.define('Ext.fx.target.CompositeElementCSS', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.fx.target.CompositeElement ,
+
+                                           
+
+    /* End Definitions */
+    setAttr: function() {
+        return Ext.fx.target.ElementCSS.prototype.setAttr.apply(this, arguments);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.Sprite
+
+ This class represents an animation target for a {@link Ext.draw.Sprite}. In general this class will not be
+ created directly, the {@link Ext.draw.Sprite} will be passed to the animation and
+ and the appropriate target will be created.
+
+ * @markdown
+ */
+
+Ext.define('Ext.fx.target.Sprite', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.fx.target.Target ,
+
+    /* End Definitions */
+
+    type: 'draw',
+
+    getFromPrim: function (sprite, attr) {
+        var obj;
+        switch (attr) {
+            case 'rotate':
+            case 'rotation':
+                obj = sprite.attr.rotation;
+                return {
+                    x: obj.x || 0,
+                    y: obj.y || 0,
+                    degrees: obj.degrees || 0
+                };
+            case 'scale':
+            case 'scaling':
+                obj = sprite.attr.scaling;
+                return {
+                    x: obj.x || 1,
+                    y: obj.y || 1,
+                    cx: obj.cx || 0,
+                    cy: obj.cy || 0
+                };
+            case 'translate':
+            case 'translation':
+                obj = sprite.attr.translation;
+                return {
+                    x: obj.x || 0,
+                    y: obj.y || 0
+                };
+            default:
+                return sprite.attr[attr];
+        }
+    },
+
+    getAttr: function (attr, val) {
+        return [
+            [this.target, val != undefined ? val : this.getFromPrim(this.target, attr)]
+        ];
+    },
+
+    setAttr: function (targetData) {
+        var ln = targetData.length,
+            spriteArr = [],
+            attrsConf, attr, attrArr, attrs, sprite, idx, value, i, j, x, y, ln2;
+        for (i = 0; i < ln; i++) {
+            attrsConf = targetData[i].attrs;
+            for (attr in attrsConf) {
+                attrArr = attrsConf[attr];
+                ln2 = attrArr.length;
+                for (j = 0; j < ln2; j++) {
+                    sprite = attrArr[j][0];
+                    attrs = attrArr[j][1];
+                    if (attr === 'translate' || attr === 'translation') {
+                        value = {
+                            x: attrs.x,
+                            y: attrs.y
+                        };
+                    }
+                    else if (attr === 'rotate' || attr === 'rotation') {
+                        x = attrs.x;
+                        if (isNaN(x)) {
+                            x = null;
+                        }
+                        y = attrs.y;
+                        if (isNaN(y)) {
+                            y = null;
+                        }
+                        value = {
+                            degrees: attrs.degrees,
+                            x: x,
+                            y: y
+                        };
+                    } else if (attr === 'scale' || attr === 'scaling') {
+                        x = attrs.x;
+                        if (isNaN(x)) {
+                            x = null;
+                        }
+                        y = attrs.y;
+                        if (isNaN(y)) {
+                            y = null;
+                        }
+                        value = {
+                            x: x,
+                            y: y,
+                            cx: attrs.cx,
+                            cy: attrs.cy
+                        };
+                    }
+                    else if (attr === 'width' || attr === 'height' || attr === 'x' || attr === 'y') {
+                        value = parseFloat(attrs);
+                    }
+                    else {
+                        value = attrs;
+                    }
+                    idx = Ext.Array.indexOf(spriteArr, sprite);
+                    if (idx == -1) {
+                        spriteArr.push([sprite, {}]);
+                        idx = spriteArr.length - 1;
+                    }
+                    spriteArr[idx][1][attr] = value;
+                }
+            }
+        }
+        ln = spriteArr.length;
+        for (i = 0; i < ln; i++) {
+            spriteArr[i][0].setAttributes(spriteArr[i][1]);
+        }
+        this.target.redraw();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.CompositeSprite
+
+This class represents a animation target for a {@link Ext.draw.CompositeSprite}. It allows
+each {@link Ext.draw.Sprite} in the group to be animated as a whole. In general this class will not be
+created directly, the {@link Ext.draw.CompositeSprite} will be passed to the animation and
+and the appropriate target will be created.
+
+ * @markdown
+ */
+
+Ext.define('Ext.fx.target.CompositeSprite', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.fx.target.Sprite ,
+
+    /* End Definitions */
+
+    getAttr: function(attr, val) {
+        var out     = [],
+            sprites = [].concat(this.target.items),
+            length  = sprites.length,
+            i,
+            sprite;
+
+        for (i = 0; i < length; i++) {
+            sprite = sprites[i];
+            out.push([sprite, val != undefined ? val : this.getFromPrim(sprite, attr)]);
+        }
+
+        return out;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.target.Component
+ * 
+ * This class represents a animation target for a {@link Ext.Component}. In general this class will not be
+ * created directly, the {@link Ext.Component} will be passed to the animation and
+ * and the appropriate target will be created.
+ */
+Ext.define('Ext.fx.target.Component', {
+
+    /* Begin Definitions */
+   
+    extend:  Ext.fx.target.Target ,
+    
+    /* End Definitions */
+
+    type: 'component',
+
+    // Methods to call to retrieve unspecified "from" values from a target Component
+    getPropMethod: {
+        top: function() {
+            return this.getPosition(true)[1];
+        },
+        left: function() {
+            return this.getPosition(true)[0];
+        },
+        x: function() {
+            return this.getPosition()[0];
+        },
+        y: function() {
+            return this.getPosition()[1];
+        },
+        height: function() {
+            return this.getHeight();
+        },
+        width: function() {
+            return this.getWidth();
+        },
+        opacity: function() {
+            return this.el.getStyle('opacity');
+        }
+    },
+
+    setMethods: {
+        top:     'setPosition',
+        left:    'setPosition',
+        x:       'setPagePosition',
+        y:       'setPagePosition',
+        height:  'setSize',
+        width:   'setSize',
+        opacity: 'setOpacity'
+    },
+
+    // Read the named attribute from the target Component. Use the defined getter for the attribute
+    getAttr: function(attr, val) {
+        return [[this.target, val !== undefined ? val : this.getPropMethod[attr].call(this.target)]];
+    },
+
+    setAttr: function(targetData, isFirstFrame, isLastFrame) {
+        var me = this,
+            ln = targetData.length,
+            attrs, attr, o, i, j, targets, left, top, w, h,
+            methodsToCall = {},
+            methodProps;
+
+        for (i = 0; i < ln; i++) {
+            attrs = targetData[i].attrs;
+            for (attr in attrs) {
+                targets = attrs[attr].length;
+                for (j = 0; j < targets; j++) {
+                    o = attrs[attr][j];
+                    methodProps = methodsToCall[me.setMethods[attr]] || (methodsToCall[me.setMethods[attr]] = {});
+                    methodProps.target = o[0];
+                    methodProps[attr] = o[1];
+                    // debugging code: Ext.log('Setting ' + o[0].id + "'s " + attr + ' to ' + o[1]);
+                }
+            }
+            if (methodsToCall.setPosition) {
+                o = methodsToCall.setPosition;
+                left = (o.left === undefined) ? undefined : parseFloat(o.left);
+                top = (o.top === undefined) ? undefined : parseFloat(o.top);
+                o.target.setPosition(left, top);
+            }
+            if (methodsToCall.setPagePosition) {
+                o = methodsToCall.setPagePosition;
+                o.target.setPagePosition(o.x, o.y);
+            }
+            if (methodsToCall.setSize) {
+                o = methodsToCall.setSize;
+                // Dimensions not being animated MUST NOT be autosized. They must remain at current value.
+                w = (o.width === undefined) ? o.target.getWidth() : parseFloat(o.width);
+                h = (o.height === undefined) ? o.target.getHeight() : parseFloat(o.height);
+
+                // Only set the size of the Component on the last frame, or if the animation was
+                // configured with dynamic: true.
+                // In other cases, we just set the target element size.
+                // This will result in either clipping if animating a reduction in size, or the revealing of
+                // the inner elements of the Component if animating an increase in size.
+                // Component's animate function initially resizes to the larger size before resizing the
+                // outer element to clip the contents.
+                o.target.el.setSize(w, h);
+                if (isLastFrame || me.dynamic) {
+                    // Defer the final sizing & layout until we are outside of this frame.
+                    // In case anything in the resulting layout calls animation.
+                    // If it does, *this* frame will fire again... recursively
+                    Ext.globalEvents.on({
+                        idle: Ext.Function.bind(o.target.setSize, o.target, [w, h]),
+                        single: true
+                    });
+                }
+            }
+            if (methodsToCall.setOpacity) {
+                o = methodsToCall.setOpacity;
+                o.target.el.setStyle('opacity', o.opacity);
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.Queue
+ * Animation Queue mixin to handle chaining and queueing by target.
+ * @private
+ */
+
+Ext.define('Ext.fx.Queue', {
+
+                                   
+
+    constructor: function() {
+        this.targets = new Ext.util.HashMap();
+        this.fxQueue = {};
+    },
+
+    // @private
+    getFxDefaults: function(targetId) {
+        var target = this.targets.get(targetId);
+        if (target) {
+            return target.fxDefaults;
+        }
+        return {};
+    },
+
+    // @private
+    setFxDefaults: function(targetId, obj) {
+        var target = this.targets.get(targetId);
+        if (target) {
+            target.fxDefaults = Ext.apply(target.fxDefaults || {}, obj);
+        }
+    },
+
+    // @private
+    stopAnimation: function(targetId) {
+        var me = this,
+            queue = me.getFxQueue(targetId),
+            ln = queue.length;
+        while (ln) {
+            queue[ln - 1].end();
+            ln--;
+        }
+    },
+
+    /**
+     * @private
+     * Returns current animation object if the element has any effects actively running or queued, else returns false.
+     */
+    getActiveAnimation: function(targetId) {
+        var queue = this.getFxQueue(targetId);
+        return (queue && !!queue.length) ? queue[0] : false;
+    },
+
+    // @private
+    hasFxBlock: function(targetId) {
+        var queue = this.getFxQueue(targetId);
+        return queue && queue[0] && queue[0].block;
+    },
+
+    // @private get fx queue for passed target, create if needed.
+    getFxQueue: function(targetId) {
+        if (!targetId) {
+            return false;
+        }
+        var me = this,
+            queue = me.fxQueue[targetId],
+            target = me.targets.get(targetId);
+
+        if (!target) {
+            return false;
+        }
+
+        if (!queue) {
+            me.fxQueue[targetId] = [];
+            // GarbageCollector will need to clean up Elements since they aren't currently observable
+            if (target.type != 'element') {
+                target.target.on('destroy', function() {
+                    me.fxQueue[targetId] = [];
+                });
+            }
+        }
+        return me.fxQueue[targetId];
+    },
+
+    // @private
+    queueFx: function(anim) {
+        var me = this,
+            target = anim.target,
+            queue, ln;
+
+        if (!target) {
+            return;
+        }
+
+        queue = me.getFxQueue(target.getId());
+        ln = queue.length;
+
+        if (ln) {
+            if (anim.concurrent) {
+                anim.paused = false;
+            }
+            else {
+                queue[ln - 1].on('afteranimate', function() {
+                    anim.paused = false;
+                });
+            }
+        }
+        else {
+            anim.paused = false;
+        }
+        anim.on('afteranimate', function() {
+            Ext.Array.remove(queue, anim);
+            if (queue.length === 0) {
+                me.targets.remove(anim.target);
+            }
+            if (anim.remove) {
+                if (target.type == 'element') {
+                    var el = Ext.get(target.id);
+                    if (el) {
+                        el.remove();
+                    }
+                }
+            }
+        }, me, {
+            single: true
+        });
+        queue.push(anim);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.Manager
+ * Animation Manager which keeps track of all current animations and manages them on a frame by frame basis.
+ * @private
+ * @singleton
+ */
+
+Ext.define('Ext.fx.Manager', {
+
+    /* Begin Definitions */
+
+    singleton: true,
+
+                                          
+                                       
+                                          
+                                                
+                                                   
+                                      
+                                               
+                                          
+
+    mixins: {
+        queue:  Ext.fx.Queue 
+    },
+
+    /* End Definitions */
+
+    constructor: function() {
+        var me = this;
+        me.items = new Ext.util.MixedCollection();
+        me.mixins.queue.constructor.call(me);
+        
+        // Do not use fireIdleEvent: false. Each tick of the TaskRunner needs to fire the idleEvent
+        // in case an animation callback/listener adds a listener.
+        me.taskRunner = new Ext.util.TaskRunner();
+
+        // this.requestAnimFrame = (function() {
+        //     var raf = window.requestAnimationFrame ||
+        //               window.webkitRequestAnimationFrame ||
+        //               window.mozRequestAnimationFrame ||
+        //               window.oRequestAnimationFrame ||
+        //               window.msRequestAnimationFrame;
+        //     if (raf) {
+        //         return function(callback, element) {
+        //             raf(callback);
+        //         };
+        //     }
+        //     else {
+        //         return function(callback, element) {
+        //             window.setTimeout(callback, Ext.fx.Manager.interval);
+        //         };
+        //     }
+        // })();
+    },
+
+    /**
+     * @cfg {Number} interval Default interval in miliseconds to calculate each frame.  Defaults to 16ms (~60fps)
+     */
+    interval: 16,
+
+    /**
+     * @cfg {Boolean} forceJS Force the use of JavaScript-based animation instead of CSS3 animation, even when CSS3
+     * animation is supported by the browser. This defaults to true currently, as CSS3 animation support is still
+     * considered experimental at this time, and if used should be thouroughly tested across all targeted browsers.
+     * @protected
+     */
+    forceJS: true,
+
+    // @private Target factory
+    createTarget: function(target) {
+        var me = this,
+            useCSS3 = !me.forceJS && Ext.supports.Transitions,
+            targetObj;
+
+        me.useCSS3 = useCSS3;
+
+        if (target) {
+            // dom element, string or fly
+            if (target.tagName || Ext.isString(target) || target.isFly) {
+                target = Ext.get(target);
+                targetObj = new Ext.fx.target['Element' + (useCSS3 ? 'CSS' : '')](target);
+            }
+            // Element
+            else if (target.dom) {
+                targetObj = new Ext.fx.target['Element' + (useCSS3 ? 'CSS' : '')](target);
+            }
+            // Element Composite
+            else if (target.isComposite) {
+                targetObj = new Ext.fx.target['CompositeElement' + (useCSS3 ? 'CSS' : '')](target);
+            }
+            // Draw Sprite
+            else if (target.isSprite) {
+                targetObj = new Ext.fx.target.Sprite(target);
+            }
+            // Draw Sprite Composite
+            else if (target.isCompositeSprite) {
+                targetObj = new Ext.fx.target.CompositeSprite(target);
+            }
+            // Component
+            else if (target.isComponent) {
+                targetObj = new Ext.fx.target.Component(target);
+            }
+            else if (target.isAnimTarget) {
+                return target;
+            }
+            else {
+                return null;
+            }
+            me.targets.add(targetObj);
+            return targetObj;
+        }
+        else {
+            return null;
+        }
+    },
+
+    /**
+     * Add an Anim to the manager. This is done automatically when an Anim instance is created.
+     * @param {Ext.fx.Anim} anim
+     */
+    addAnim: function(anim) {
+        var me = this,
+            items = me.items,
+            task = me.task;
+
+        // Make sure we use the anim's id, not the anim target's id here. The anim id will be unique on
+        // each call to addAnim. `anim.target` is the DOM element being targeted, and since multiple animations
+        // can target a single DOM node concurrently, the target id cannot be assumned to be unique.
+        items.add(anim.id, anim);
+        //Ext.log('+     added anim ', anim.id, ', target: ', anim.target.getId(), ', duration: ', anim.duration);
+
+        // Start the timer if not already running
+        if (!task && items.length) {
+            task = me.task = {
+                run: me.runner,
+                interval: me.interval,
+                scope: me
+            };
+            //Ext.log('--->> Starting task');
+            me.taskRunner.start(task);
+        }
+    },
+
+    /**
+     * Remove an Anim from the manager. This is done automatically when an Anim ends.
+     * @param {Ext.fx.Anim} anim
+     */
+    removeAnim: function(anim) {
+        var me = this,
+            items = me.items,
+            task = me.task;
+                
+        items.removeAtKey(anim.id);
+        //Ext.log('    X removed anim ', anim.id, ', target: ', anim.target.getId(), ', frames: ', anim.frameCount, ', item count: ', items.length);
+        
+        // Stop the timer if there are no more managed Anims
+        if (task && !items.length) {
+            //Ext.log('[]--- Stopping task');
+            me.taskRunner.stop(task);
+            delete me.task;
+        }
+    },
+
+    /**
+     * @private
+     * Runner function being called each frame
+     */
+    runner: function() {
+        var me = this,
+            items = me.items.getRange(),
+            i = 0,
+            len = items.length,
+            anim;
+
+        //Ext.log('      executing anim runner task with ', len, ' items');
+        me.targetArr = {};
+
+        // Single timestamp for all animations this interval
+        me.timestamp = new Date();
+        
+        // Loop to start any new animations first before looping to
+        // execute running animations (which will also include all animations
+        // started in this loop). This is a subtle difference from simply
+        // iterating in one loop and starting then running each animation,
+        // but separating the loops is necessary to ensure that all new animations
+        // actually kick off prior to existing ones regardless of array order.
+        // Otherwise in edge cases when there is excess latency in overall
+        // performance, allowing existing animations to run before new ones can
+        // lead to dropped frames and subtle race conditions when they are
+        // interdependent, which is often the case with certain Element fx.
+        for (; i < len; i++) {
+            anim = items[i];
+            
+            if (anim.isReady()) {
+                //Ext.log('      starting anim ', anim.id, ', target: ', anim.target.id);
+                me.startAnim(anim);
+            }
+        }
+        
+        for (i = 0; i < len; i++) {
+            anim = items[i];
+            
+            if (anim.isRunning()) {
+                //Ext.log('      running anim ', anim.target.id);
+                me.runAnim(anim);
+            } else if (!me.useCSS3) {
+                // When using CSS3 transitions the animations get paused since they are not
+                // needed once the transition is handed over to the browser, so we can
+                // ignore this case. However if we are doing JS animations and something is
+                // paused here it's possibly unintentional.
+                //Ext.log(' (i)  anim ', anim.id, ' is active but not running...');
+            }
+        }
+
+        // Apply all the pending changes to their targets
+        me.applyPendingAttrs();
+    },
+
+    /**
+     * @private
+     * Start the individual animation (initialization)
+     */
+    startAnim: function(anim) {
+        anim.start(this.timestamp);
+    },
+
+    /**
+     * @private
+     * Run the individual animation for this frame
+     */
+    runAnim: function(anim) {
+        if (!anim) {
+            return;
+        }
+        var me = this,
+            useCSS3 = me.useCSS3 && anim.target.type == 'element',
+            elapsedTime = me.timestamp - anim.startTime,
+            lastFrame = (elapsedTime >= anim.duration),
+            target, o;
+
+        target = this.collectTargetData(anim, elapsedTime, useCSS3, lastFrame);
+        
+        // For CSS3 animation, we need to immediately set the first frame's attributes without any transition
+        // to get a good initial state, then add the transition properties and set the final attributes.
+        if (useCSS3) {
+            //Ext.log(' (i)  using CSS3 transitions');
+            
+            // Flush the collected attributes, without transition
+            anim.target.setAttr(target.anims[anim.id].attributes, true);
+
+            // Add the end frame data
+            me.collectTargetData(anim, anim.duration, useCSS3, lastFrame);
+
+            // Pause the animation so runAnim doesn't keep getting called
+            anim.paused = true;
+
+            target = anim.target.target;
+            // We only want to attach an event on the last element in a composite
+            if (anim.target.isComposite) {
+                target = anim.target.target.last();
+            }
+
+            // Listen for the transitionend event
+            o = {};
+            o[Ext.supports.CSS3TransitionEnd] = anim.lastFrame;
+            o.scope = anim;
+            o.single = true;
+            target.on(o);
+        }
+    },
+
+    /**
+     * @private
+     * Collect target attributes for the given Anim object at the given timestamp
+     * @param {Ext.fx.Anim} anim The Anim instance
+     * @param {Number} timestamp Time after the anim's start time
+     * @param {Boolean} [useCSS3=false] True if using CSS3-based animation, else false
+     * @param {Boolean} [isLastFrame=false] True if this is the last frame of animation to be run, else false
+     * @return {Object} The animation target wrapper object containing the passed animation along with the
+     * new attributes to set on the target's element in the next animation frame.
+     */
+    collectTargetData: function(anim, elapsedTime, useCSS3, isLastFrame) {
+        var targetId = anim.target.getId(),
+            target = this.targetArr[targetId];
+        
+        if (!target) {
+            // Create a thin wrapper around the target so that we can create a link between the
+            // target element and its associated animations. This is important later when applying
+            // attributes to the target so that each animation can be independently run with its own
+            // duration and stopped at any point without affecting other animations for the same target.
+            target = this.targetArr[targetId] = {
+                id: targetId,
+                el: anim.target,
+                anims: {}
+            };
+        }
+
+        // This is a wrapper for the animation so that we can also save state along with it,
+        // including the current elapsed time and lastFrame status. Even though this method only
+        // adds a single anim object per call, each target element could have multiple animations
+        // associated with it, which is why the anim is added to the target's `anims` hash by id.
+        target.anims[anim.id] = {
+            id: anim.id,
+            anim: anim,
+            elapsed: elapsedTime,
+            isLastFrame: isLastFrame,
+            // This is the object that gets applied to the target element below in applyPendingAttrs():
+            attributes: [{
+                duration: anim.duration,
+                easing: (useCSS3 && anim.reverse) ? anim.easingFn.reverse().toCSS3() : anim.easing,
+                // This is where the magic happens. The anim calculates what its new attributes should
+                // be based on the current frame and returns those as a hash of values.
+                attrs: anim.runAnim(elapsedTime)
+            }]
+        };
+        
+        return target;
+    },
+    
+    /**
+     * @private
+     * Apply all pending attribute changes to their targets
+     */
+    applyPendingAttrs: function() {
+        var targetArr = this.targetArr,
+            target, targetId, animWrap, anim, animId;
+        
+        // Loop through each target
+        for (targetId in targetArr) {
+            if (targetArr.hasOwnProperty(targetId)) {
+                target = targetArr[targetId];
+                
+                // Each target could have multiple associated animations, so iterate those
+                for (animId in target.anims) {
+                    if (target.anims.hasOwnProperty(animId)) {
+                        animWrap = target.anims[animId];
+                        anim = animWrap.anim;
+                        
+                        // If the animation has valid attributes, set them on the target
+                        if (animWrap.attributes && anim.isRunning()) {
+                            //Ext.log('  >   applying attributes for anim ', animWrap.id, ', target: ', target.id, ', elapsed: ', animWrap.elapsed);
+                            target.el.setAttr(animWrap.attributes, false, animWrap.isLastFrame);
+                            
+                            // If this particular anim is at the last frame end it
+                            if (animWrap.isLastFrame) {
+                                //Ext.log('      running last frame for ', animWrap.id, ', target: ', targetId);
+                                anim.lastFrame();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.fx.Animator
+ *
+ * This class is used to run keyframe based animations, which follows the CSS3 based animation structure.
+ * Keyframe animations differ from typical from/to animations in that they offer the ability to specify values
+ * at various points throughout the animation.
+ *
+ * ## Using Keyframes
+ *
+ * The {@link #keyframes} option is the most important part of specifying an animation when using this
+ * class. A key frame is a point in a particular animation. We represent this as a percentage of the
+ * total animation duration. At each key frame, we can specify the target values at that time. Note that
+ * you *must* specify the values at 0% and 100%, the start and ending values. There is also a {@link #keyframe}
+ * event that fires after each key frame is reached.
+ *
+ * ## Example
+ *
+ * In the example below, we modify the values of the element at each fifth throughout the animation.
+ *
+ *     @example
+ *     Ext.create('Ext.fx.Animator', {
+ *         target: Ext.getBody().createChild({
+ *             style: {
+ *                 width: '100px',
+ *                 height: '100px',
+ *                 'background-color': 'red'
+ *             }
+ *         }),
+ *         duration: 10000, // 10 seconds
+ *         keyframes: {
+ *             0: {
+ *                 opacity: 1,
+ *                 backgroundColor: 'FF0000'
+ *             },
+ *             20: {
+ *                 x: 30,
+ *                 opacity: 0.5
+ *             },
+ *             40: {
+ *                 x: 130,
+ *                 backgroundColor: '0000FF'
+ *             },
+ *             60: {
+ *                 y: 80,
+ *                 opacity: 0.3
+ *             },
+ *             80: {
+ *                 width: 200,
+ *                 y: 200
+ *             },
+ *             100: {
+ *                 opacity: 1,
+ *                 backgroundColor: '00FF00'
+ *             }
+ *         }
+ *     });
+ */
+Ext.define('Ext.fx.Animator', {
+
+    /* Begin Definitions */
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+                                 
+
+    /* End Definitions */
+
+    /**
+     * @property {Boolean} isAnimator
+     * `true` in this class to identify an object as an instantiated Animator, or subclass thereof.
+     */
+    isAnimator: true,
+
+    /**
+     * @cfg {Number} duration
+     * Time in milliseconds for the animation to last. Defaults to 250.
+     */
+    duration: 250,
+
+    /**
+     * @cfg {Number} delay
+     * Time to delay before starting the animation. Defaults to 0.
+     */
+    delay: 0,
+
+    /* private used to track a delayed starting time */
+    delayStart: 0,
+
+    /**
+     * @cfg {Boolean} dynamic
+     * Currently only for Component Animation: Only set a component's outer element size bypassing layouts.  Set to true to do full layouts for every frame of the animation.  Defaults to false.
+     */
+    dynamic: false,
+
+    /**
+     * @cfg {String} easing
+     *
+     * This describes how the intermediate values used during a transition will be calculated. It allows for a transition to change
+     * speed over its duration.
+     *
+     *  - backIn
+     *  - backOut
+     *  - bounceIn
+     *  - bounceOut
+     *  - ease
+     *  - easeIn
+     *  - easeOut
+     *  - easeInOut
+     *  - elasticIn
+     *  - elasticOut
+     *  - cubic-bezier(x1, y1, x2, y2)
+     *
+     * Note that cubic-bezier will create a custom easing curve following the CSS3 [transition-timing-function][0]
+     * specification.  The four values specify points P1 and P2 of the curve as (x1, y1, x2, y2). All values must
+     * be in the range [0, 1] or the definition is invalid.
+     *
+     * [0]: http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag
+     */
+    easing: 'ease',
+
+    /**
+     * Flag to determine if the animation has started
+     * @property running
+     * @type Boolean
+     */
+    running: false,
+
+    /**
+     * Flag to determine if the animation is paused. Only set this to true if you need to
+     * keep the Anim instance around to be unpaused later; otherwise call {@link #end}.
+     * @property paused
+     * @type Boolean
+     */
+    paused: false,
+
+    /**
+     * @private
+     */
+    damper: 1,
+
+    /**
+     * @cfg {Number} iterations
+     * Number of times to execute the animation. Defaults to 1.
+     */
+    iterations: 1,
+
+    /**
+     * Current iteration the animation is running.
+     * @property currentIteration
+     * @type Number
+     */
+    currentIteration: 0,
+
+    /**
+     * Current keyframe step of the animation.
+     * @property keyframeStep
+     * @type Number
+     */
+    keyframeStep: 0,
+
+    /**
+     * @private
+     */
+    animKeyFramesRE: /^(from|to|\d+%?)$/,
+
+    /**
+     * @cfg {Ext.fx.target.Target} target
+     * The Ext.fx.target to apply the animation to.  If not specified during initialization, this can be passed to the applyAnimator
+     * method to apply the same animation to many targets.
+     */
+
+     /**
+      * @cfg {Object} keyframes
+      * Animation keyframes follow the CSS3 Animation configuration pattern. 'from' is always considered '0%' and 'to'
+      * is considered '100%'.<b>Every keyframe declaration must have a keyframe rule for 0% and 100%, possibly defined using
+      * "from" or "to"</b>.  A keyframe declaration without these keyframe selectors is invalid and will not be available for
+      * animation.  The keyframe declaration for a keyframe rule consists of properties and values. Properties that are unable to
+      * be animated are ignored in these rules, with the exception of 'easing' which can be changed at each keyframe. For example:
+ <pre><code>
+keyframes : {
+    '0%': {
+        left: 100
+    },
+    '40%': {
+        left: 150
+    },
+    '60%': {
+        left: 75
+    },
+    '100%': {
+        left: 100
+    }
+}
+ </code></pre>
+      */
+    constructor: function(config) {
+        var me = this;
+        config = Ext.apply(me, config || {});
+        me.config = config;
+        me.id = Ext.id(null, 'ext-animator-');
+        me.addEvents(
+            /**
+             * @event beforeanimate
+             * Fires before the animation starts. A handler can return false to cancel the animation.
+             * @param {Ext.fx.Animator} this
+             */
+            'beforeanimate',
+            /**
+              * @event keyframe
+              * Fires at each keyframe.
+              * @param {Ext.fx.Animator} this
+              * @param {Number} keyframe step number
+              */
+            'keyframe',
+            /**
+             * @event afteranimate
+             * Fires when the animation is complete.
+             * @param {Ext.fx.Animator} this
+             * @param {Date} startTime
+             */
+            'afteranimate'
+        );
+        me.mixins.observable.constructor.call(me, config);
+        me.timeline = [];
+        me.createTimeline(me.keyframes);
+        if (me.target) {
+            me.applyAnimator(me.target);
+            Ext.fx.Manager.addAnim(me);
+        }
+    },
+
+    /**
+     * @private
+     */
+    sorter: function (a, b) {
+        return a.pct - b.pct;
+    },
+
+    /**
+     * @private
+     * Takes the given keyframe configuration object and converts it into an ordered array with the passed attributes per keyframe
+     * or applying the 'to' configuration to all keyframes.  Also calculates the proper animation duration per keyframe.
+     */
+    createTimeline: function(keyframes) {
+        var me = this,
+            attrs = [],
+            to = me.to || {},
+            duration = me.duration,
+            prevMs, ms, i, ln, pct, attr;
+
+        for (pct in keyframes) {
+            if (keyframes.hasOwnProperty(pct) && me.animKeyFramesRE.test(pct)) {
+                attr = {attrs: Ext.apply(keyframes[pct], to)};
+                // CSS3 spec allow for from/to to be specified.
+                if (pct == "from") {
+                    pct = 0;
+                }
+                else if (pct == "to") {
+                    pct = 100;
+                }
+                // convert % values into integers
+                attr.pct = parseInt(pct, 10);
+                attrs.push(attr);
+            }
+        }
+        // Sort by pct property
+        Ext.Array.sort(attrs, me.sorter);
+        // Only an end
+        //if (attrs[0].pct) {
+        //    attrs.unshift({pct: 0, attrs: element.attrs});
+        //}
+
+        ln = attrs.length;
+        for (i = 0; i < ln; i++) {
+            prevMs = (attrs[i - 1]) ? duration * (attrs[i - 1].pct / 100) : 0;
+            ms = duration * (attrs[i].pct / 100);
+            me.timeline.push({
+                duration: ms - prevMs,
+                attrs: attrs[i].attrs
+            });
+        }
+    },
+
+    /**
+     * Applies animation to the Ext.fx.target
+     * @private
+     * @param target
+     * @type String/Object
+     */
+    applyAnimator: function(target) {
+        var me = this,
+            anims = [],
+            timeline = me.timeline,
+            ln = timeline.length,
+            anim, easing, damper, attrs, i;
+
+        if (me.fireEvent('beforeanimate', me) !== false) {
+            for (i = 0; i < ln; i++) {
+                anim = timeline[i];
+                attrs = anim.attrs;
+                easing = attrs.easing || me.easing;
+                damper = attrs.damper || me.damper;
+                delete attrs.easing;
+                delete attrs.damper;
+                anim = new Ext.fx.Anim({
+                    target: target,
+                    easing: easing,
+                    damper: damper,
+                    duration: anim.duration,
+                    paused: true,
+                    to: attrs
+                });
+                anims.push(anim);
+            }
+            me.animations = anims;
+            me.target = anim.target;
+            for (i = 0; i < ln - 1; i++) {
+                anim = anims[i];
+                anim.nextAnim = anims[i + 1];
+                anim.on('afteranimate', function() {
+                    this.nextAnim.paused = false;
+                });
+                anim.on('afteranimate', function() {
+                    this.fireEvent('keyframe', this, ++this.keyframeStep);
+                }, me);
+            }
+            anims[ln - 1].on('afteranimate', function() {
+                this.lastFrame();
+            }, me);
+        }
+    },
+
+    /**
+     * @private
+     * Fires beforeanimate and sets the running flag.
+     */
+    start: function(startTime) {
+        var me = this,
+            delay = me.delay,
+            delayStart = me.delayStart,
+            delayDelta;
+        if (delay) {
+            if (!delayStart) {
+                me.delayStart = startTime;
+                return;
+            }
+            else {
+                delayDelta = startTime - delayStart;
+                if (delayDelta < delay) {
+                    return;
+                }
+                else {
+                    // Compensate for frame delay;
+                    startTime = new Date(delayStart.getTime() + delay);
+                }
+            }
+        }
+        if (me.fireEvent('beforeanimate', me) !== false) {
+            me.startTime = startTime;
+            me.running = true;
+            me.animations[me.keyframeStep].paused = false;
+        }
+    },
+
+    /**
+     * @private
+     * Perform lastFrame cleanup and handle iterations
+     * @returns a hash of the new attributes.
+     */
+    lastFrame: function() {
+        var me = this,
+            iter = me.iterations,
+            iterCount = me.currentIteration;
+
+        iterCount++;
+        if (iterCount < iter) {
+            me.startTime = new Date();
+            me.currentIteration = iterCount;
+            me.keyframeStep = 0;
+            me.applyAnimator(me.target);
+            me.animations[me.keyframeStep].paused = false;
+        }
+        else {
+            me.currentIteration = 0;
+            me.end();
+        }
+    },
+
+    /**
+     * Fire afteranimate event and end the animation. Usually called automatically when the
+     * animation reaches its final frame, but can also be called manually to pre-emptively
+     * stop and destroy the running animation.
+     */
+    end: function() {
+        var me = this;
+        me.fireEvent('afteranimate', me, me.startTime, new Date() - me.startTime);
+    },
+    
+    isReady: function() {
+        return this.paused === false && this.running === false && this.iterations > 0;
+    },
+    
+    isRunning: function() {
+        // Explicitly return false, we don't want to be run continuously by the manager
+        return false;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.fx.CubicBezier', {
+
+    /* Begin Definitions */
+
+    singleton: true,
+
+    /* End Definitions */
+
+    cubicBezierAtTime: function(t, p1x, p1y, p2x, p2y, duration) {
+        var cx = 3 * p1x,
+            bx = 3 * (p2x - p1x) - cx,
+            ax = 1 - cx - bx,
+            cy = 3 * p1y,
+            by = 3 * (p2y - p1y) - cy,
+            ay = 1 - cy - by;
+        function sampleCurveX(t) {
+            return ((ax * t + bx) * t + cx) * t;
+        }
+        function solve(x, epsilon) {
+            var t = solveCurveX(x, epsilon);
+            return ((ay * t + by) * t + cy) * t;
+        }
+        function solveCurveX(x, epsilon) {
+            var t0, t1, t2, x2, d2, i;
+            for (t2 = x, i = 0; i < 8; i++) {
+                x2 = sampleCurveX(t2) - x;
+                if (Math.abs(x2) < epsilon) {
+                    return t2;
+                }
+                d2 = (3 * ax * t2 + 2 * bx) * t2 + cx;
+                if (Math.abs(d2) < 1e-6) {
+                    break;
+                }
+                t2 = t2 - x2 / d2;
+            }
+            t0 = 0;
+            t1 = 1;
+            t2 = x;
+            if (t2 < t0) {
+                return t0;
+            }
+            if (t2 > t1) {
+                return t1;
+            }
+            while (t0 < t1) {
+                x2 = sampleCurveX(t2);
+                if (Math.abs(x2 - x) < epsilon) {
+                    return t2;
+                }
+                if (x > x2) {
+                    t0 = t2;
+                } else {
+                    t1 = t2;
+                }
+                t2 = (t1 - t0) / 2 + t0;
+            }
+            return t2;
+        }
+        return solve(t, 1 / (200 * duration));
+    },
+
+    cubicBezier: function(x1, y1, x2, y2) {
+        var fn = function(pos) {
+            return Ext.fx.CubicBezier.cubicBezierAtTime(pos, x1, y1, x2, y2, 1);
+        };
+        fn.toCSS3 = function() {
+            return 'cubic-bezier(' + [x1, y1, x2, y2].join(',') + ')';
+        };
+        fn.reverse = function() {
+            return Ext.fx.CubicBezier.cubicBezier(1 - x2, 1 - y2, 1 - x1, 1 - y1);
+        };
+        return fn;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @define Ext.fx.Easing
+
+/**
+ * @class Ext.fx.Easing
+ *
+ * This class contains a series of function definitions used to modify values during an animation.
+ * They describe how the intermediate values used during a transition will be calculated. It allows for a transition to change
+ * speed over its duration. The following options are available: 
+ *
+ * - linear The default easing type
+ * - backIn
+ * - backOut
+ * - bounceIn
+ * - bounceOut
+ * - ease
+ * - easeIn
+ * - easeOut
+ * - easeInOut
+ * - elasticIn
+ * - elasticOut
+ * - cubic-bezier(x1, y1, x2, y2)
+ *
+ * Note that cubic-bezier will create a custom easing curve following the CSS3 [transition-timing-function][0]
+ * specification.  The four values specify points P1 and P2 of the curve as (x1, y1, x2, y2). All values must
+ * be in the range [0, 1] or the definition is invalid.
+ *
+ * [0]: http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag
+ *
+ * @singleton
+ */
+Ext.require('Ext.fx.CubicBezier', function() {
+    var math = Math,
+        pi = math.PI,
+        pow = math.pow,
+        sin = math.sin,
+        sqrt = math.sqrt,
+        abs = math.abs,
+        backInSeed = 1.70158;
+        
+    Ext.define('Ext.fx.Easing', {
+        singleton: true,
+        
+        linear: Ext.identityFn,
+        ease: function(n) {
+            var q = 0.07813 - n / 2,
+                alpha = -0.25,
+                Q = sqrt(0.0066 + q * q),
+                x = Q - q,
+                X = pow(abs(x), 1/3) * (x < 0 ? -1 : 1),
+                y = -Q - q,
+                Y = pow(abs(y), 1/3) * (y < 0 ? -1 : 1),
+                t = X + Y + 0.25;
+            return pow(1 - t, 2) * 3 * t * 0.1 + (1 - t) * 3 * t * t + t * t * t;
+        },
+        easeIn: function (n) {
+            return pow(n, 1.7);
+        },
+        easeOut: function (n) {
+            return pow(n, 0.48);
+        },
+        easeInOut: function(n) {
+            var q = 0.48 - n / 1.04,
+                Q = sqrt(0.1734 + q * q),
+                x = Q - q,
+                X = pow(abs(x), 1/3) * (x < 0 ? -1 : 1),
+                y = -Q - q,
+                Y = pow(abs(y), 1/3) * (y < 0 ? -1 : 1),
+                t = X + Y + 0.5;
+            return (1 - t) * 3 * t * t + t * t * t;
+        },
+        backIn: function (n) {
+            return n * n * ((backInSeed + 1) * n - backInSeed);
+        },
+        backOut: function (n) {
+            n = n - 1;
+            return n * n * ((backInSeed + 1) * n + backInSeed) + 1;
+        },
+        elasticIn: function (n) {
+            if (n === 0 || n === 1) {
+                return n;
+            }
+            var p = 0.3,
+                s = p / 4;
+            return pow(2, -10 * n) * sin((n - s) * (2 * pi) / p) + 1;
+        },
+        elasticOut: function (n) {
+            return 1 - Ext.fx.Easing.elasticIn(1 - n);
+        },
+        bounceIn: function (n) {
+            return 1 - Ext.fx.Easing.bounceOut(1 - n);
+        },
+        bounceOut: function (n) {
+            var s = 7.5625,
+                p = 2.75,
+                l;
+            if (n < (1 / p)) {
+                l = s * n * n;
+            } else {
+                if (n < (2 / p)) {
+                    n -= (1.5 / p);
+                    l = s * n * n + 0.75;
+                } else {
+                    if (n < (2.5 / p)) {
+                        n -= (2.25 / p);
+                        l = s * n * n + 0.9375;
+                    } else {
+                        n -= (2.625 / p);
+                        l = s * n * n + 0.984375;
+                    }
+                }
+            }
+            return l;
+        }
+    }, function(){
+        var easing = Ext.fx.Easing.self,
+            proto = easing.prototype;
+            
+        easing.implement({
+            'back-in': proto.backIn,
+            'back-out': proto.backOut,
+            'ease-in': proto.easeIn,
+            'ease-out': proto.easeOut,
+            'elastic-in': proto.elasticIn,
+            'elastic-out': proto.elasticOut,
+            'bounce-in': proto.bounceIn,
+            'bounce-out': proto.bounceOut,
+            'ease-in-out': proto.easeInOut
+        });        
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents an RGB color and provides helper functions get
+ * color components in HSL color space.
+ */
+Ext.define('Ext.draw.Color', {
+
+    /* Begin Definitions */
+
+    /* End Definitions */
+
+    colorToHexRe: /(.*?)rgb\((\d+),\s*(\d+),\s*(\d+)\)/,
+    rgbRe: /\s*rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)\s*/,
+    hexRe: /\s*#([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)\s*/,
+
+    /**
+     * @cfg {Number} lightnessFactor
+     *
+     * The default factor to compute the lighter or darker color. Defaults to 0.2.
+     */
+    lightnessFactor: 0.2,
+
+    /**
+     * Creates new Color.
+     * @param {Number} red Red component (0..255)
+     * @param {Number} green Green component (0..255)
+     * @param {Number} blue Blue component (0..255)
+     */
+    constructor : function(red, green, blue) {
+        var me = this,
+            clamp = Ext.Number.constrain;
+        me.r = clamp(red, 0, 255);
+        me.g = clamp(green, 0, 255);
+        me.b = clamp(blue, 0, 255);
+    },
+
+    /**
+     * Get the red component of the color, in the range 0..255.
+     * @return {Number}
+     */
+    getRed: function() {
+        return this.r;
+    },
+
+    /**
+     * Get the green component of the color, in the range 0..255.
+     * @return {Number}
+     */
+    getGreen: function() {
+        return this.g;
+    },
+
+    /**
+     * Get the blue component of the color, in the range 0..255.
+     * @return {Number}
+     */
+    getBlue: function() {
+        return this.b;
+    },
+
+    /**
+     * Get the RGB values.
+     * @return {Number[]}
+     */
+    getRGB: function() {
+        var me = this;
+        return [me.r, me.g, me.b];
+    },
+
+    /**
+     * Get the equivalent HSL components of the color.
+     * @return {Number[]}
+     */
+    getHSL: function() {
+        var me = this,
+            r = me.r / 255,
+            g = me.g / 255,
+            b = me.b / 255,
+            max = Math.max(r, g, b),
+            min = Math.min(r, g, b),
+            delta = max - min,
+            h,
+            s = 0,
+            l = 0.5 * (max + min);
+
+        // min==max means achromatic (hue is undefined)
+        if (min != max) {
+            s = (l < 0.5) ? delta / (max + min) : delta / (2 - max - min);
+            if (r == max) {
+                h = 60 * (g - b) / delta;
+            } else if (g == max) {
+                h = 120 + 60 * (b - r) / delta;
+            } else {
+                h = 240 + 60 * (r - g) / delta;
+            }
+            if (h < 0) {
+                h += 360;
+            }
+            if (h >= 360) {
+                h -= 360;
+            }
+        }
+        return [h, s, l];
+    },
+
+    /**
+     * Return a new color that is lighter than this color.
+     * @param {Number} factor Lighter factor (0..1), default to 0.2
+     * @return Ext.draw.Color
+     */
+    getLighter: function(factor) {
+        var hsl = this.getHSL();
+        factor = factor || this.lightnessFactor;
+        hsl[2] = Ext.Number.constrain(hsl[2] + factor, 0, 1);
+        return this.fromHSL(hsl[0], hsl[1], hsl[2]);
+    },
+
+    /**
+     * Return a new color that is darker than this color.
+     * @param {Number} factor Darker factor (0..1), default to 0.2
+     * @return Ext.draw.Color
+     */
+    getDarker: function(factor) {
+        factor = factor || this.lightnessFactor;
+        return this.getLighter(-factor);
+    },
+
+    /**
+     * Return the color in the hex format, i.e. '#rrggbb'.
+     * @return {String}
+     */
+    toString: function() {
+        var me = this,
+            round = Math.round,
+            r = round(me.r).toString(16),
+            g = round(me.g).toString(16),
+            b = round(me.b).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].join('');
+    },
+
+    /**
+     * Convert a color to hexadecimal format.
+     *
+     * **Note:** This method is both static and instance.
+     *
+     * @param {String/String[]} color The color value (i.e 'rgb(255, 255, 255)', 'color: #ffffff').
+     * Can also be an Array, in this case the function handles the first member.
+     * @returns {String} The color in hexadecimal format.
+     * @static
+     */
+    toHex: function(color) {
+        if (Ext.isArray(color)) {
+            color = color[0];
+        }
+        if (!Ext.isString(color)) {
+            return '';
+        }
+        if (color.substr(0, 1) === '#') {
+            return color;
+        }
+        var digits = this.colorToHexRe.exec(color),
+            red,
+            green,
+            blue,
+            rgb;
+
+        if (Ext.isArray(digits)) {
+            red = parseInt(digits[2], 10);
+            green = parseInt(digits[3], 10);
+            blue = parseInt(digits[4], 10);
+            rgb = blue | (green << 8) | (red << 16);
+            return digits[1] + '#' + ("000000" + rgb.toString(16)).slice(-6);
+        }
+        else {
+            return color;
+        }
+    },
+
+    /**
+     * Parse the string and create a new color.
+     *
+     * Supported formats: '#rrggbb', '#rgb', and 'rgb(r,g,b)'.
+     *
+     * If the string is not recognized, an undefined will be returned instead.
+     *
+     * **Note:** This method is both static and instance.
+     *
+     * @param {String} str Color in string.
+     * @returns Ext.draw.Color
+     * @static
+     */
+    fromString: function(str) {
+        var values, r, g, b,
+            parse = parseInt;
+
+        if ((str.length == 4 || str.length == 7) && str.substr(0, 1) === '#') {
+            values = str.match(this.hexRe);
+            if (values) {
+                r = parse(values[1], 16) >> 0;
+                g = parse(values[2], 16) >> 0;
+                b = parse(values[3], 16) >> 0;
+                if (str.length == 4) {
+                    r += (r * 16);
+                    g += (g * 16);
+                    b += (b * 16);
+                }
+            }
+        }
+        else {
+            values = str.match(this.rgbRe);
+            if (values) {
+                r = values[1];
+                g = values[2];
+                b = values[3];
+            }
+        }
+
+        return (typeof r == 'undefined') ? undefined : new Ext.draw.Color(r, g, b);
+    },
+
+    /**
+     * Returns the gray value (0 to 255) of the color.
+     *
+     * The gray value is calculated using the formula r*0.3 + g*0.59 + b*0.11.
+     *
+     * @returns {Number}
+     */
+    getGrayscale: function() {
+        // http://en.wikipedia.org/wiki/Grayscale#Converting_color_to_grayscale
+        return this.r * 0.3 + this.g * 0.59 + this.b * 0.11;
+    },
+
+    /**
+     * Create a new color based on the specified HSL values.
+     *
+     * **Note:** This method is both static and instance.
+     *
+     * @param {Number} h Hue component (0..359)
+     * @param {Number} s Saturation component (0..1)
+     * @param {Number} l Lightness component (0..1)
+     * @returns Ext.draw.Color
+     * @static
+     */
+    fromHSL: function(h, s, l) {
+        var C, X, m, i, rgb = [],
+            abs = Math.abs,
+            floor = Math.floor;
+
+        if (s == 0 || h == null) {
+            // achromatic
+            rgb = [l, l, l];
+        }
+        else {
+            // http://en.wikipedia.org/wiki/HSL_and_HSV#From_HSL
+            // C is the chroma
+            // X is the second largest component
+            // m is the lightness adjustment
+            h /= 60;
+            C = s * (1 - abs(2 * l - 1));
+            X = C * (1 - abs(h - 2 * floor(h / 2) - 1));
+            m = l - C / 2;
+            switch (floor(h)) {
+                case 0:
+                    rgb = [C, X, 0];
+                    break;
+                case 1:
+                    rgb = [X, C, 0];
+                    break;
+                case 2:
+                    rgb = [0, C, X];
+                    break;
+                case 3:
+                    rgb = [0, X, C];
+                    break;
+                case 4:
+                    rgb = [X, 0, C];
+                    break;
+                case 5:
+                    rgb = [C, 0, X];
+                    break;
+            }
+            rgb = [rgb[0] + m, rgb[1] + m, rgb[2] + m];
+        }
+        return new Ext.draw.Color(rgb[0] * 255, rgb[1] * 255, rgb[2] * 255);
+    }
+}, function() {
+    var prototype = this.prototype;
+
+    //These functions are both static and instance. TODO: find a more elegant way of copying them
+    this.addStatics({
+        fromHSL: function() {
+            return prototype.fromHSL.apply(prototype, arguments);
+        },
+        fromString: function() {
+            return prototype.fromString.apply(prototype, arguments);
+        },
+        toHex: function() {
+            return prototype.toHex.apply(prototype, arguments);
+        }
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.draw.Draw
+ * Base Drawing class.  Provides base drawing functions.
+ * @private
+ */
+Ext.define('Ext.draw.Draw', {
+    /* Begin Definitions */
+
+    singleton: true,
+
+                                 
+
+    /* End Definitions */
+
+    pathToStringRE: /,?([achlmqrstvxz]),?/gi,
+    pathCommandRE: /([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,
+    pathValuesRE: /(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,
+    stopsRE: /^(\d+%?)$/,
+    radian: Math.PI / 180,
+
+    availableAnimAttrs: {
+        along: "along",
+        blur: null,
+        "clip-rect": "csv",
+        cx: null,
+        cy: null,
+        fill: "color",
+        "fill-opacity": null,
+        "font-size": null,
+        height: null,
+        opacity: null,
+        path: "path",
+        r: null,
+        rotation: "csv",
+        rx: null,
+        ry: null,
+        scale: "csv",
+        stroke: "color",
+        "stroke-opacity": null,
+        "stroke-width": null,
+        translation: "csv",
+        width: null,
+        x: null,
+        y: null
+    },
+
+    is: function(o, type) {
+        type = String(type).toLowerCase();
+        return (type == "object" && o === Object(o)) ||
+            (type == "undefined" && typeof o == type) ||
+            (type == "null" && o === null) ||
+            (type == "array" && Array.isArray && Array.isArray(o)) ||
+            (Object.prototype.toString.call(o).toLowerCase().slice(8, -1)) == type;
+    },
+
+    ellipsePath: function(sprite) {
+        var attr = sprite.attr;
+        return Ext.String.format("M{0},{1}A{2},{3},0,1,1,{0},{4}A{2},{3},0,1,1,{0},{1}z", attr.x, attr.y - attr.ry, attr.rx, attr.ry, attr.y + attr.ry);
+    },
+
+    rectPath: function(sprite) {
+        var attr = sprite.attr;
+        if (attr.radius) {
+            return Ext.String.format("M{0},{1}l{2},0a{3},{3},0,0,1,{3},{3}l0,{5}a{3},{3},0,0,1,{4},{3}l{6},0a{3},{3},0,0,1,{4},{4}l0,{7}a{3},{3},0,0,1,{3},{4}z", attr.x + attr.radius, attr.y, attr.width - attr.radius * 2, attr.radius, -attr.radius, attr.height - attr.radius * 2, attr.radius * 2 - attr.width, attr.radius * 2 - attr.height);
+        }
+        else {
+            return Ext.String.format("M{0},{1}L{2},{1},{2},{3},{0},{3}z", attr.x, attr.y, attr.width + attr.x, attr.height + attr.y);
+        }
+    },
+
+    // To be deprecated, converts itself (an arrayPath) to a proper SVG path string
+    path2string: function () {
+        return this.join(",").replace(Ext.draw.Draw.pathToStringRE, "$1");
+    },
+
+    // Convert the passed arrayPath to a proper SVG path string (d attribute)
+    pathToString: function(arrayPath) {
+        return arrayPath.join(",").replace(Ext.draw.Draw.pathToStringRE, "$1");
+    },
+
+    parsePathString: function (pathString) {
+        if (!pathString) {
+            return null;
+        }
+        var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, q: 4, s: 4, t: 2, v: 1, z: 0},
+            data = [],
+            me = this;
+        if (me.is(pathString, "array") && me.is(pathString[0], "array")) { // rough assumption
+            data = me.pathClone(pathString);
+        }
+        if (!data.length) {
+            String(pathString).replace(me.pathCommandRE, function (a, b, c) {
+                var params = [],
+                    name = b.toLowerCase();
+                c.replace(me.pathValuesRE, function (a, b) {
+                    b && params.push(+b);
+                });
+                if (name == "m" && params.length > 2) {
+                    data.push([b].concat(Ext.Array.splice(params, 0, 2)));
+                    name = "l";
+                    b = (b == "m") ? "l" : "L";
+                }
+                while (params.length >= paramCounts[name]) {
+                    data.push([b].concat(Ext.Array.splice(params, 0, paramCounts[name])));
+                    if (!paramCounts[name]) {
+                        break;
+                    }
+                }
+            });
+        }
+        data.toString = me.path2string;
+        return data;
+    },
+
+    mapPath: function (path, matrix) {
+        if (!matrix) {
+            return path;
+        }
+        var x, y, i, ii, j, jj, pathi;
+        path = this.path2curve(path);
+        for (i = 0, ii = path.length; i < ii; i++) {
+            pathi = path[i];
+            for (j = 1, jj = pathi.length; j < jj-1; j += 2) {
+                x = matrix.x(pathi[j], pathi[j + 1]);
+                y = matrix.y(pathi[j], pathi[j + 1]);
+                pathi[j] = x;
+                pathi[j + 1] = y;
+            }
+        }
+        return path;
+    },
+
+    pathClone: function(pathArray) {
+        var res = [],
+            j, jj, i, ii;
+        if (!this.is(pathArray, "array") || !this.is(pathArray && pathArray[0], "array")) { // rough assumption
+            pathArray = this.parsePathString(pathArray);
+        }
+        for (i = 0, ii = pathArray.length; i < ii; i++) {
+            res[i] = [];
+            for (j = 0, jj = pathArray[i].length; j < jj; j++) {
+                res[i][j] = pathArray[i][j];
+            }
+        }
+        res.toString = this.path2string;
+        return res;
+    },
+
+    pathToAbsolute: function (pathArray) {
+        if (!this.is(pathArray, "array") || !this.is(pathArray && pathArray[0], "array")) { // rough assumption
+            pathArray = this.parsePathString(pathArray);
+        }
+        var res = [],
+            x = 0,
+            y = 0,
+            mx = 0,
+            my = 0,
+            i = 0,
+            ln = pathArray.length,
+            r, pathSegment, j, ln2;
+        // MoveTo initial x/y position
+        if (ln && pathArray[0][0] == "M") {
+            x = +pathArray[0][1];
+            y = +pathArray[0][2];
+            mx = x;
+            my = y;
+            i++;
+            res[0] = ["M", x, y];
+        }
+        for (; i < ln; i++) {
+            r = res[i] = [];
+            pathSegment = pathArray[i];
+            if (pathSegment[0] != pathSegment[0].toUpperCase()) {
+                r[0] = pathSegment[0].toUpperCase();
+                switch (r[0]) {
+                    // Elliptical Arc
+                    case "A":
+                        r[1] = pathSegment[1];
+                        r[2] = pathSegment[2];
+                        r[3] = pathSegment[3];
+                        r[4] = pathSegment[4];
+                        r[5] = pathSegment[5];
+                        r[6] = +(pathSegment[6] + x);
+                        r[7] = +(pathSegment[7] + y);
+                        break;
+                    // Vertical LineTo
+                    case "V":
+                        r[1] = +pathSegment[1] + y;
+                        break;
+                    // Horizontal LineTo
+                    case "H":
+                        r[1] = +pathSegment[1] + x;
+                        break;
+                    case "M":
+                    // MoveTo
+                        mx = +pathSegment[1] + x;
+                        my = +pathSegment[2] + y;
+                    default:
+                        j = 1;
+                        ln2 = pathSegment.length;
+                        for (; j < ln2; j++) {
+                            r[j] = +pathSegment[j] + ((j % 2) ? x : y);
+                        }
+                }
+            }
+            else {
+                j = 0;
+                ln2 = pathSegment.length;
+                for (; j < ln2; j++) {
+                    res[i][j] = pathSegment[j];
+                }
+            }
+            switch (r[0]) {
+                // ClosePath
+                case "Z":
+                    x = mx;
+                    y = my;
+                    break;
+                // Horizontal LineTo
+                case "H":
+                    x = r[1];
+                    break;
+                // Vertical LineTo
+                case "V":
+                    y = r[1];
+                    break;
+                // MoveTo
+                case "M":
+                    pathSegment = res[i];
+                    ln2 = pathSegment.length;
+                    mx = pathSegment[ln2 - 2];
+                    my = pathSegment[ln2 - 1];
+                default:
+                    pathSegment = res[i];
+                    ln2 = pathSegment.length;
+                    x = pathSegment[ln2 - 2];
+                    y = pathSegment[ln2 - 1];
+            }
+        }
+        res.toString = this.path2string;
+        return res;
+    },
+
+    // TO BE DEPRECATED
+    pathToRelative: function (pathArray) {
+        if (!this.is(pathArray, "array") || !this.is(pathArray && pathArray[0], "array")) {
+            pathArray = this.parsePathString(pathArray);
+        }
+        var res = [],
+            x = 0,
+            y = 0,
+            mx = 0,
+            my = 0,
+            start = 0,
+            r,
+            pa,
+            i,
+            j,
+            k,
+            len,
+            ii,
+            jj,
+            kk;
+        
+        if (pathArray[0][0] == "M") {
+            x = pathArray[0][1];
+            y = pathArray[0][2];
+            mx = x;
+            my = y;
+            start++;
+            res.push(["M", x, y]);
+        }
+        for (i = start, ii = pathArray.length; i < ii; i++) {
+            r = res[i] = [];
+            pa = pathArray[i];
+            if (pa[0] != pa[0].toLowerCase()) {
+                r[0] = pa[0].toLowerCase();
+                switch (r[0]) {
+                    case "a":
+                        r[1] = pa[1];
+                        r[2] = pa[2];
+                        r[3] = pa[3];
+                        r[4] = pa[4];
+                        r[5] = pa[5];
+                        r[6] = +(pa[6] - x).toFixed(3);
+                        r[7] = +(pa[7] - y).toFixed(3);
+                        break;
+                    case "v":
+                        r[1] = +(pa[1] - y).toFixed(3);
+                        break;
+                    case "m":
+                        mx = pa[1];
+                        my = pa[2];
+                    default:
+                        for (j = 1, jj = pa.length; j < jj; j++) {
+                            r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
+                        }
+                }
+            } else {
+                r = res[i] = [];
+                if (pa[0] == "m") {
+                    mx = pa[1] + x;
+                    my = pa[2] + y;
+                }
+                for (k = 0, kk = pa.length; k < kk; k++) {
+                    res[i][k] = pa[k];
+                }
+            }
+            len = res[i].length;
+            switch (res[i][0]) {
+                case "z":
+                    x = mx;
+                    y = my;
+                    break;
+                case "h":
+                    x += +res[i][len - 1];
+                    break;
+                case "v":
+                    y += +res[i][len - 1];
+                    break;
+                default:
+                    x += +res[i][len - 2];
+                    y += +res[i][len - 1];
+            }
+        }
+        res.toString = this.path2string;
+        return res;
+    },
+
+    // Returns a path converted to a set of curveto commands
+    path2curve: function (path) {
+        var me = this,
+            points = me.pathToAbsolute(path),
+            ln = points.length,
+            attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
+            i, seg, segLn, point;
+            
+        for (i = 0; i < ln; i++) {
+            points[i] = me.command2curve(points[i], attrs);
+            if (points[i].length > 7) {
+                    points[i].shift();
+                    point = points[i];
+                    while (point.length) {
+                        Ext.Array.splice(points, i++, 0, ["C"].concat(Ext.Array.splice(point, 0, 6)));
+                    }
+                    Ext.Array.erase(points, i, 1);
+                    ln = points.length;
+                    i--;
+                }
+            seg = points[i];
+            segLn = seg.length;
+            attrs.x = seg[segLn - 2];
+            attrs.y = seg[segLn - 1];
+            attrs.bx = parseFloat(seg[segLn - 4]) || attrs.x;
+            attrs.by = parseFloat(seg[segLn - 3]) || attrs.y;
+        }
+        return points;
+    },
+    
+    interpolatePaths: function (path, path2) {
+        var me = this,
+            p = me.pathToAbsolute(path),
+            p2 = me.pathToAbsolute(path2),
+            attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
+            attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
+            fixArc = function (pp, i) {
+                if (pp[i].length > 7) {
+                    pp[i].shift();
+                    var pi = pp[i];
+                    while (pi.length) {
+                        Ext.Array.splice(pp, i++, 0, ["C"].concat(Ext.Array.splice(pi, 0, 6)));
+                    }
+                    Ext.Array.erase(pp, i, 1);
+                    ii = Math.max(p.length, p2.length || 0);
+                }
+            },
+            fixM = function (path1, path2, a1, a2, i) {
+                if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
+                    Ext.Array.splice(path2, i, 0, ["M", a2.x, a2.y]);
+                    a1.bx = 0;
+                    a1.by = 0;
+                    a1.x = path1[i][1];
+                    a1.y = path1[i][2];
+                    ii = Math.max(p.length, p2.length || 0);
+                }
+            },
+            i, ii,
+            seg, seg2, seglen, seg2len;
+        for (i = 0, ii = Math.max(p.length, p2.length || 0); i < ii; i++) {
+            p[i] = me.command2curve(p[i], attrs);
+            fixArc(p, i);
+            (p2[i] = me.command2curve(p2[i], attrs2));
+            fixArc(p2, i);
+            fixM(p, p2, attrs, attrs2, i);
+            fixM(p2, p, attrs2, attrs, i);
+            seg = p[i];
+            seg2 = p2[i];
+            seglen = seg.length;
+            seg2len = seg2.length;
+            attrs.x = seg[seglen - 2];
+            attrs.y = seg[seglen - 1];
+            attrs.bx = parseFloat(seg[seglen - 4]) || attrs.x;
+            attrs.by = parseFloat(seg[seglen - 3]) || attrs.y;
+            attrs2.bx = (parseFloat(seg2[seg2len - 4]) || attrs2.x);
+            attrs2.by = (parseFloat(seg2[seg2len - 3]) || attrs2.y);
+            attrs2.x = seg2[seg2len - 2];
+            attrs2.y = seg2[seg2len - 1];
+        }
+        return [p, p2];
+    },
+    
+    //Returns any path command as a curveto command based on the attrs passed
+    command2curve: function (pathCommand, d) {
+        var me = this;
+        if (!pathCommand) {
+            return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
+        }
+        if (pathCommand[0] != "T" && pathCommand[0] != "Q") {
+            d.qx = d.qy = null;
+        }
+        switch (pathCommand[0]) {
+            case "M":
+                d.X = pathCommand[1];
+                d.Y = pathCommand[2];
+                break;
+            case "A":
+                pathCommand = ["C"].concat(me.arc2curve.apply(me, [d.x, d.y].concat(pathCommand.slice(1))));
+                break;
+            case "S":
+                pathCommand = ["C", d.x + (d.x - (d.bx || d.x)), d.y + (d.y - (d.by || d.y))].concat(pathCommand.slice(1));
+                break;
+            case "T":
+                d.qx = d.x + (d.x - (d.qx || d.x));
+                d.qy = d.y + (d.y - (d.qy || d.y));
+                pathCommand = ["C"].concat(me.quadratic2curve(d.x, d.y, d.qx, d.qy, pathCommand[1], pathCommand[2]));
+                break;
+            case "Q":
+                d.qx = pathCommand[1];
+                d.qy = pathCommand[2];
+                pathCommand = ["C"].concat(me.quadratic2curve(d.x, d.y, pathCommand[1], pathCommand[2], pathCommand[3], pathCommand[4]));
+                break;
+            case "L":
+                pathCommand = ["C"].concat(d.x, d.y, pathCommand[1], pathCommand[2], pathCommand[1], pathCommand[2]);
+                break;
+            case "H":
+                pathCommand = ["C"].concat(d.x, d.y, pathCommand[1], d.y, pathCommand[1], d.y);
+                break;
+            case "V":
+                pathCommand = ["C"].concat(d.x, d.y, d.x, pathCommand[1], d.x, pathCommand[1]);
+                break;
+            case "Z":
+                pathCommand = ["C"].concat(d.x, d.y, d.X, d.Y, d.X, d.Y);
+                break;
+        }
+        return pathCommand;
+    },
+
+    quadratic2curve: function (x1, y1, ax, ay, x2, y2) {
+        var _13 = 1 / 3,
+            _23 = 2 / 3;
+        return [
+                _13 * x1 + _23 * ax,
+                _13 * y1 + _23 * ay,
+                _13 * x2 + _23 * ax,
+                _13 * y2 + _23 * ay,
+                x2,
+                y2
+            ];
+    },
+    
+    rotate: function (x, y, rad) {
+        var cos = Math.cos(rad),
+            sin = Math.sin(rad),
+            X = x * cos - y * sin,
+            Y = x * sin + y * cos;
+        return {x: X, y: Y};
+    },
+
+    arc2curve: function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
+        // for more information of where this Math came from visit:
+        // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+        var me = this,
+            PI = Math.PI,
+            radian = me.radian,
+            _120 = PI * 120 / 180,
+            rad = radian * (+angle || 0),
+            res = [],
+            math = Math,
+            mcos = math.cos,
+            msin = math.sin,
+            msqrt = math.sqrt,
+            mabs = math.abs,
+            masin = math.asin,
+            xy, x, y, h, rx2, ry2, k, cx, cy, f1, f2, df, c1, s1, c2, s2,
+            t, hx, hy, m1, m2, m3, m4, newres, i, ln, f2old, x2old, y2old;
+        if (!recursive) {
+            xy = me.rotate(x1, y1, -rad);
+            x1 = xy.x;
+            y1 = xy.y;
+            xy = me.rotate(x2, y2, -rad);
+            x2 = xy.x;
+            y2 = xy.y;
+            x = (x1 - x2) / 2;
+            y = (y1 - y2) / 2;
+            h = (x * x) / (rx * rx) + (y * y) / (ry * ry);
+            if (h > 1) {
+                h = msqrt(h);
+                rx = h * rx;
+                ry = h * ry;
+            }
+            rx2 = rx * rx;
+            ry2 = ry * ry;
+            k = (large_arc_flag == sweep_flag ? -1 : 1) *
+                    msqrt(mabs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x)));
+            cx = k * rx * y / ry + (x1 + x2) / 2;
+            cy = k * -ry * x / rx + (y1 + y2) / 2;
+            f1 = masin(((y1 - cy) / ry).toFixed(7));
+            f2 = masin(((y2 - cy) / ry).toFixed(7));
+
+            f1 = x1 < cx ? PI - f1 : f1;
+            f2 = x2 < cx ? PI - f2 : f2;
+            if (f1 < 0) {
+                f1 = PI * 2 + f1;
+            }
+            if (f2 < 0) {
+                f2 = PI * 2 + f2;
+            }
+            if (sweep_flag && f1 > f2) {
+                f1 = f1 - PI * 2;
+            }
+            if (!sweep_flag && f2 > f1) {
+                f2 = f2 - PI * 2;
+            }
+        }
+        else {
+            f1 = recursive[0];
+            f2 = recursive[1];
+            cx = recursive[2];
+            cy = recursive[3];
+        }
+        df = f2 - f1;
+        if (mabs(df) > _120) {
+            f2old = f2;
+            x2old = x2;
+            y2old = y2;
+            f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
+            x2 = cx + rx * mcos(f2);
+            y2 = cy + ry * msin(f2);
+            res = me.arc2curve(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
+        }
+        df = f2 - f1;
+        c1 = mcos(f1);
+        s1 = msin(f1);
+        c2 = mcos(f2);
+        s2 = msin(f2);
+        t = math.tan(df / 4);
+        hx = 4 / 3 * rx * t;
+        hy = 4 / 3 * ry * t;
+        m1 = [x1, y1];
+        m2 = [x1 + hx * s1, y1 - hy * c1];
+        m3 = [x2 + hx * s2, y2 - hy * c2];
+        m4 = [x2, y2];
+        m2[0] = 2 * m1[0] - m2[0];
+        m2[1] = 2 * m1[1] - m2[1];
+        if (recursive) {
+            return [m2, m3, m4].concat(res);
+        }
+        else {
+            res = [m2, m3, m4].concat(res).join().split(",");
+            newres = [];
+            ln = res.length;
+            for (i = 0;  i < ln; i++) {
+                newres[i] = i % 2 ? me.rotate(res[i - 1], res[i], rad).y : me.rotate(res[i], res[i + 1], rad).x;
+            }
+            return newres;
+        }
+    },
+
+    // TO BE DEPRECATED
+    rotateAndTranslatePath: function (sprite) {
+        var alpha = sprite.rotation.degrees,
+            cx = sprite.rotation.x,
+            cy = sprite.rotation.y,
+            dx = sprite.translation.x,
+            dy = sprite.translation.y,
+            path,
+            i,
+            p,
+            xy,
+            j,
+            res = [];
+        if (!alpha && !dx && !dy) {
+            return this.pathToAbsolute(sprite.attr.path);
+        }
+        dx = dx || 0;
+        dy = dy || 0;
+        path = this.pathToAbsolute(sprite.attr.path);
+        for (i = path.length; i--;) {
+            p = res[i] = path[i].slice();
+            if (p[0] == "A") {
+                xy = this.rotatePoint(p[6], p[7], alpha, cx, cy);
+                p[6] = xy.x + dx;
+                p[7] = xy.y + dy;
+            } else {
+                j = 1;
+                while (p[j + 1] != null) {
+                    xy = this.rotatePoint(p[j], p[j + 1], alpha, cx, cy);
+                    p[j] = xy.x + dx;
+                    p[j + 1] = xy.y + dy;
+                    j += 2;
+                }
+            }
+        }
+        return res;
+    },
+
+    // TO BE DEPRECATED
+    rotatePoint: function (x, y, alpha, cx, cy) {
+        if (!alpha) {
+            return {
+                x: x,
+                y: y
+            };
+        }
+        cx = cx || 0;
+        cy = cy || 0;
+        x = x - cx;
+        y = y - cy;
+        alpha = alpha * this.radian;
+        var cos = Math.cos(alpha),
+            sin = Math.sin(alpha);
+        return {
+            x: x * cos - y * sin + cx,
+            y: x * sin + y * cos + cy
+        };
+    },
+
+    pathDimensions: function (path) {
+        if (!path || !(path + "")) {
+            return {x: 0, y: 0, width: 0, height: 0};
+        }
+        path = this.path2curve(path);
+        var x = 0, 
+            y = 0,
+            X = [],
+            Y = [],
+            i = 0,
+            ln = path.length,
+            p, xmin, ymin, xmax, ymax, dim;
+        for (; i < ln; i++) {
+            p = path[i];
+            if (p[0] == "M") {
+                x = p[1];
+                y = p[2];
+                X.push(x);
+                Y.push(y);
+            }
+            else {
+                dim = this.curveDim(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
+                X = X.concat(dim.min.x, dim.max.x);
+                Y = Y.concat(dim.min.y, dim.max.y);
+                x = p[5];
+                y = p[6];
+            }
+        }
+        xmin = Math.min.apply(0, X);
+        ymin = Math.min.apply(0, Y);
+        xmax = Math.max.apply(0, X);
+        ymax = Math.max.apply(0, Y);
+        return {
+            x: Math.round(xmin),
+            y: Math.round(ymin),
+            path: path,
+            width: Math.round(xmax - xmin),
+            height: Math.round(ymax - ymin)
+        };
+    },
+
+    intersectInside: function(path, cp1, cp2) {
+        return (cp2[0] - cp1[0]) * (path[1] - cp1[1]) > (cp2[1] - cp1[1]) * (path[0] - cp1[0]);
+    },
+
+    intersectIntersection: function(s, e, cp1, cp2) {
+        var p = [],
+            dcx = cp1[0] - cp2[0],
+            dcy = cp1[1] - cp2[1],
+            dpx = s[0] - e[0],
+            dpy = s[1] - e[1],
+            n1 = cp1[0] * cp2[1] - cp1[1] * cp2[0],
+            n2 = s[0] * e[1] - s[1] * e[0],
+            n3 = 1 / (dcx * dpy - dcy * dpx);
+
+        p[0] = (n1 * dpx - n2 * dcx) * n3;
+        p[1] = (n1 * dpy - n2 * dcy) * n3;
+        return p;
+    },
+
+    intersect: function(subjectPolygon, clipPolygon) {
+        var me = this,
+            i = 0,
+            ln = clipPolygon.length,
+            cp1 = clipPolygon[ln - 1],
+            outputList = subjectPolygon,
+            cp2, s, e, ln2, inputList, j;
+        for (; i < ln; ++i) {
+            cp2 = clipPolygon[i];
+            inputList = outputList;
+            outputList = [];
+            s = inputList[inputList.length - 1];
+            j = 0;
+            ln2 = inputList.length;
+            for (; j < ln2; j++) {
+                e = inputList[j];
+                if (me.intersectInside(e, cp1, cp2)) {
+                    if (!me.intersectInside(s, cp1, cp2)) {
+                        outputList.push(me.intersectIntersection(s, e, cp1, cp2));
+                    }
+                    outputList.push(e);
+                }
+                else if (me.intersectInside(s, cp1, cp2)) {
+                    outputList.push(me.intersectIntersection(s, e, cp1, cp2));
+                }
+                s = e;
+            }
+            cp1 = cp2;
+        }
+        return outputList;
+    },
+    
+    bezier : function (a, b, c, d, x) {
+        if (x === 0) {
+            return a;
+        } 
+        else if (x === 1) {
+            return d;
+        }
+        var du = 1 - x,
+            d3 = du * du * du,
+            r = x / du;
+        return d3 * (a + r * (3 * b + r * (3 * c + d * r)));
+    },
+    
+    bezierDim : function (a, b, c, d) {
+        var points = [], r,
+            A, top, C, delta, bottom, s,
+            min, max, i;
+        // The min and max happens on boundary or b' == 0
+        if (a + 3 * c == d + 3 * b) {   
+            r = a - b;
+            r /= 2 * (a - b - b + c);
+            if ( r < 1 && r > 0) {
+                points.push(r);
+            }
+        } else {
+            // b'(x) / -3 = (a-3b+3c-d)x^2+ (-2a+4b-2c)x + (a-b)
+            // delta = -4 (-b^2+a c+b c-c^2-a d+b d)
+            A = a - 3 * b + 3 * c - d;
+            top = 2 * (a - b - b + c);
+            C = a - b;
+            delta = top * top - 4 * A * C;
+            bottom = A + A;
+            if (delta === 0) {
+                r = top / bottom;
+                if (r < 1 && r > 0) {
+                    points.push(r);
+                }
+            } else if (delta > 0) {
+                s = Math.sqrt(delta);
+                r = (s + top) / bottom;
+                
+                if (r < 1 && r > 0) {
+                    points.push(r);
+                }
+                
+                r = (top - s) / bottom;
+                
+                if (r < 1 && r > 0) {
+                    points.push(r);
+                }
+            }
+        }
+        min = Math.min(a, d);
+        max = Math.max(a, d);
+        for (i = 0; i < points.length; i++) {
+            min = Math.min(min, this.bezier(a, b, c, d, points[i]));
+            max = Math.max(max, this.bezier(a, b, c, d, points[i]));
+        }
+        return [min, max];
+    },
+    
+    curveDim: function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
+        var x = this.bezierDim(p1x, c1x, c2x, p2x),
+            y = this.bezierDim(p1y, c1y, c2y, p2y);
+        return {
+            min: {
+                x: x[0],
+                y: y[0]
+            },
+            max: {
+                x: x[1],
+                y: y[1]
+            }
+        };
+    },
+
+    /**
+     * @private
+     *
+     * Calculates bezier curve control anchor points for a particular point in a path, with a
+     * smoothing curve applied. The smoothness of the curve is controlled by the 'value' parameter.
+     * Note that this algorithm assumes that the line being smoothed is normalized going from left
+     * to right; it makes special adjustments assuming this orientation.
+     *
+     * @param {Number} prevX X coordinate of the previous point in the path
+     * @param {Number} prevY Y coordinate of the previous point in the path
+     * @param {Number} curX X coordinate of the current point in the path
+     * @param {Number} curY Y coordinate of the current point in the path
+     * @param {Number} nextX X coordinate of the next point in the path
+     * @param {Number} nextY Y coordinate of the next point in the path
+     * @param {Number} value A value to control the smoothness of the curve; this is used to
+     *                 divide the distance between points, so a value of 2 corresponds to
+     *                 half the distance between points (a very smooth line) while higher values
+     *                 result in less smooth curves. Defaults to 4.
+     * @return {Object} Object containing x1, y1, x2, y2 bezier control anchor points; x1 and y1
+     *                  are the control point for the curve toward the previous path point, and
+     *                  x2 and y2 are the control point for the curve toward the next path point.
+     */
+    getAnchors: function (prevX, prevY, curX, curY, nextX, nextY, value) {
+        value = value || 4;
+        var M = Math,
+            PI = M.PI,
+            halfPI = PI / 2,
+            abs = M.abs,
+            sin = M.sin,
+            cos = M.cos,
+            atan = M.atan,
+            control1Length, control2Length, control1Angle, control2Angle,
+            control1X, control1Y, control2X, control2Y, alpha;
+
+        // Find the length of each control anchor line, by dividing the horizontal distance
+        // between points by the value parameter.
+        control1Length = (curX - prevX) / value;
+        control2Length = (nextX - curX) / value;
+
+        // Determine the angle of each control anchor line. If the middle point is a vertical
+        // turnaround then we force it to a flat horizontal angle to prevent the curve from
+        // dipping above or below the middle point. Otherwise we use an angle that points
+        // toward the previous/next target point.
+        if ((curY >= prevY && curY >= nextY) || (curY <= prevY && curY <= nextY)) {
+            control1Angle = control2Angle = halfPI;
+        } else {
+            control1Angle = atan((curX - prevX) / abs(curY - prevY));
+            if (prevY < curY) {
+                control1Angle = PI - control1Angle;
+            }
+            control2Angle = atan((nextX - curX) / abs(curY - nextY));
+            if (nextY < curY) {
+                control2Angle = PI - control2Angle;
+            }
+        }
+
+        // Adjust the calculated angles so they point away from each other on the same line
+        alpha = halfPI - ((control1Angle + control2Angle) % (PI * 2)) / 2;
+        if (alpha > halfPI) {
+            alpha -= PI;
+        }
+        control1Angle += alpha;
+        control2Angle += alpha;
+
+        // Find the control anchor points from the angles and length
+        control1X = curX - control1Length * sin(control1Angle);
+        control1Y = curY + control1Length * cos(control1Angle);
+        control2X = curX + control2Length * sin(control2Angle);
+        control2Y = curY + control2Length * cos(control2Angle);
+
+        // One last adjustment, make sure that no control anchor point extends vertically past
+        // its target prev/next point, as that results in curves dipping above or below and
+        // bending back strangely. If we find this happening we keep the control angle but
+        // reduce the length of the control line so it stays within bounds.
+        if ((curY > prevY && control1Y < prevY) || (curY < prevY && control1Y > prevY)) {
+            control1X += abs(prevY - control1Y) * (control1X - curX) / (control1Y - curY);
+            control1Y = prevY;
+        }
+        if ((curY > nextY && control2Y < nextY) || (curY < nextY && control2Y > nextY)) {
+            control2X -= abs(nextY - control2Y) * (control2X - curX) / (control2Y - curY);
+            control2Y = nextY;
+        }
+        
+        return {
+            x1: control1X,
+            y1: control1Y,
+            x2: control2X,
+            y2: control2Y
+        };
+    },
+
+    /* Smoothing function for a path.  Converts a path into cubic beziers.  Value defines the divider of the distance between points.
+     * Defaults to a value of 4.
+     */
+    smooth: function (originalPath, value) {
+        var path = this.path2curve(originalPath),
+            newp = [path[0]],
+            x = path[0][1],
+            y = path[0][2],
+            j,
+            points,
+            i = 1,
+            ii = path.length,
+            beg = 1,
+            mx = x,
+            my = y,
+            pathi,
+            pathil,
+            pathim,
+            pathiml,
+            pathip,
+            pathipl,
+            begl;
+        
+        for (; i < ii; i++) {
+            pathi = path[i];
+            pathil = pathi.length;
+            pathim = path[i - 1];
+            pathiml = pathim.length;
+            pathip = path[i + 1];
+            pathipl = pathip && pathip.length;
+            if (pathi[0] == "M") {
+                mx = pathi[1];
+                my = pathi[2];
+                j = i + 1;
+                while (path[j][0] != "C") {
+                    j++;
+                }
+                newp.push(["M", mx, my]);
+                beg = newp.length;
+                x = mx;
+                y = my;
+                continue;
+            }
+            if (pathi[pathil - 2] == mx && pathi[pathil - 1] == my && (!pathip || pathip[0] == "M")) {
+                begl = newp[beg].length;
+                points = this.getAnchors(pathim[pathiml - 2], pathim[pathiml - 1], mx, my, newp[beg][begl - 2], newp[beg][begl - 1], value);
+                newp[beg][1] = points.x2;
+                newp[beg][2] = points.y2;
+            }
+            else if (!pathip || pathip[0] == "M") {
+                points = {
+                    x1: pathi[pathil - 2],
+                    y1: pathi[pathil - 1]
+                };
+            } else {
+                points = this.getAnchors(pathim[pathiml - 2], pathim[pathiml - 1], pathi[pathil - 2], pathi[pathil - 1], pathip[pathipl - 2], pathip[pathipl - 1], value);
+            }
+            newp.push(["C", x, y, points.x1, points.y1, pathi[pathil - 2], pathi[pathil - 1]]);
+            x = points.x2;
+            y = points.y2;
+        }
+        return newp;
+    },
+
+    findDotAtSegment: function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
+        var t1 = 1 - t;
+        return {
+            x: Math.pow(t1, 3) * p1x + Math.pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + Math.pow(t, 3) * p2x,
+            y: Math.pow(t1, 3) * p1y + Math.pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + Math.pow(t, 3) * p2y
+        };
+    },
+
+    /**
+     * @private
+     */
+    snapEnds: function (from, to, stepsMax, prettyNumbers) {
+        if (Ext.isDate(from)) {
+            return this.snapEndsByDate(from, to, stepsMax);
+        }
+        var step = (to - from) / stepsMax,
+            level = Math.floor(Math.log(step) / Math.LN10) + 1,
+            m = Math.pow(10, level),
+            cur,
+            floor,
+            modulo = Math.round((step % m) * Math.pow(10, 2 - level)),
+            interval = [[0, 15], [10, 1], [20, 4], [25, 2], [50, 9], [100, 15]],
+            stepCount = 0,
+            value,
+            weight,
+            i,
+            topValue,
+            topWeight = 1e9,
+            ln = interval.length;
+
+        floor = Math.floor(from / m) * m;
+        if (from == floor && floor > 0) {
+            floor = Math.floor((from - (m/10)) / m) * m;
+        }
+        
+        if (prettyNumbers) {
+            for (i = 0; i < ln; i++) {
+                value = interval[i][0];
+                weight = (value - modulo) < 0 ? 1e6 : (value - modulo) / interval[i][1];
+                if (weight < topWeight) {
+                    topValue = value;
+                    topWeight = weight;
+                }
+            }
+            step = Math.floor(step * Math.pow(10, -level)) * Math.pow(10, level) + topValue * Math.pow(10, level - 2);
+
+            if (from < 0 && to >= 0) {
+                cur = 0;
+                while (cur > from) {
+                    cur -= step;
+                    stepCount++;
+                }
+                from = +cur.toFixed(10);
+
+                cur = 0;
+                while (cur < to) {
+                    cur += step;
+                    stepCount++;
+                }
+                to = +cur.toFixed(10);
+            } else {
+                cur = from = floor;
+                while (cur < to) {
+                    cur += step;
+                    stepCount++;
+                }
+            }
+            to = +cur.toFixed(10);
+        } else {
+            from = floor;
+            stepCount = stepsMax;
+        }
+        
+        return {
+            from: from,
+            to: to,
+            power: level,
+            step: step,
+            steps: stepCount
+        };
+    },
+
+    /**
+     * snapEndsByDate is a utility method to deduce an appropriate tick configuration for the data set of given
+     * feature. Refer to {@link #snapEnds}.
+     *
+     * @param {Date} from The minimum value in the data
+     * @param {Date} to The maximum value in the data
+     * @param {Number} stepsMax The maximum number of ticks
+     * @param {Boolean} lockEnds If true, the 'from' and 'to' parameters will be used as fixed end values and will not be adjusted
+     *
+     * @return {Object} The calculated step and ends info; properties are:
+     * - from: The result start value, which may be lower than the original start value
+     * - to: The result end value, which may be higher than the original end value
+     * - step: The fixed value size of each step, or undefined if the steps are not fixed.
+     * - steps: The number of steps if the steps are fixed, or an array of step values.
+     
+     * NOTE: Even when the steps have a fixed value, they may not divide the from/to range perfectly evenly;
+     * there may be a smaller distance between the last step and the end value than between prior
+     * steps, particularly when the `endsLocked` param is true. Therefore it is best to not use
+     * the `steps` result when finding the axis tick points, instead use the `step`, `to`, and
+     * `from` to find the correct point for each tick.
+     */
+    snapEndsByDate: function (from, to, stepsMax, lockEnds) {
+        var selectedStep = false,
+            scales       = [
+                [Ext.Date.MILLI, [1, 2, 5, 10, 20, 50, 100, 200, 250, 500]],
+                [Ext.Date.SECOND, [1, 2, 5, 10, 15, 30]],
+                [Ext.Date.MINUTE, [1, 2, 5, 10, 15, 30]],
+                [Ext.Date.HOUR, [1, 2, 3, 4, 6, 12]],
+                [Ext.Date.DAY, [1, 2, 7, 14]],
+                [Ext.Date.MONTH, [1, 2, 3, 6]]
+            ],
+            sLen         = scales.length,
+            stop         = false,
+            scale, j, yearDiff, s;
+
+        // Find the most desirable scale
+        for (s = 0; s < sLen; s++) {
+            scale = scales[s];
+            if (!stop) {
+                for (j = 0; j < scale[1].length; j++) {
+                    if (to < Ext.Date.add(from, scale[0], scale[1][j] * stepsMax)) {
+                        selectedStep = [scale[0], scale[1][j]];
+                        stop         = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!selectedStep) {
+            yearDiff = this.snapEnds(from.getFullYear(), to.getFullYear() + 1, stepsMax, lockEnds);
+            selectedStep = [Date.YEAR, Math.round(yearDiff.step)];
+        }
+        return this.snapEndsByDateAndStep(from, to, selectedStep, lockEnds);
+    },
+
+
+    /**
+     * snapEndsByDateAndStep is a utility method to deduce an appropriate tick configuration for the data set of given
+     * feature and specific step size.
+     *
+     * @param {Date} from The minimum value in the data
+     * @param {Date} to The maximum value in the data
+     * @param {Array} step An array with two components: The first is the unit of the step (day, month, year, etc). 
+     * The second is the number of units for the step (1, 2, etc.).
+     * If the number is an integer, it represents the number of units for the step ([Ext.Date.DAY, 2] means "Every other day").
+     * If the number is a fraction, it represents the number of steps per unit ([Ext.Date.DAY, 1/2] means "Twice a day").
+     * If the unit is the month, the steps may be adjusted depending on the month. For instance [Ext.Date.MONTH, 1/3], which means "Three times a month",
+     * generates steps on the 1st, the 10th and the 20th of every month regardless of whether a month has 28 days or 31 days. The steps are generated
+     * as follows:
+     * - [Ext.Date.MONTH, n]: on the current date every 'n' months, maxed to the number of days in the month.
+     * - [Ext.Date.MONTH, 1/2]: on the 1st and 15th of every month.
+     * - [Ext.Date.MONTH, 1/3]: on the 1st, 10th and 20th of every month.
+     * - [Ext.Date.MONTH, 1/4]: on the 1st, 8th, 15th and 22nd of every month.
+     * @param {Boolean} lockEnds If true, the 'from' and 'to' parameters will be used as fixed end values
+     *        and will not be adjusted
+     *
+     * @return {Object} The calculated step and ends info; properties are:
+     * - from: The result start value, which may be lower than the original start value
+     * - to: The result end value, which may be higher than the original end value
+     * - step: The fixed value size of each step, or undefined if the steps are not fixed.
+     * - steps: The number of steps if the steps are fixed, or an array of step values.
+     
+     * NOTE: Even when the steps have a fixed value, they may not divide the from/to range perfectly evenly;
+     * there may be a smaller distance between the last step and the end value than between prior
+     * steps, particularly when the `endsLocked` param is true. Therefore it is best to not use
+     * the `steps` result when finding the axis tick points, instead use the `step`, `to`, and
+     * `from` to find the correct point for each tick.
+     */
+
+    snapEndsByDateAndStep: function(from, to, step, lockEnds) {
+        var fromStat = [from.getFullYear(), from.getMonth(), from.getDate(),
+                from.getHours(), from.getMinutes(), from.getSeconds(), from.getMilliseconds()],
+            steps, testFrom, testTo, date, year, month, day, fractionalMonth,
+            stepUnit = step[0], stepValue = step[1];
+        if (lockEnds) {
+            testFrom = from;
+        } else {
+            switch (stepUnit) {
+                case Ext.Date.MILLI:
+                    testFrom = new Date(fromStat[0], fromStat[1], fromStat[2], fromStat[3],
+                            fromStat[4], fromStat[5], Math.floor(fromStat[6] / stepValue) * stepValue);
+                    break;
+                case Ext.Date.SECOND:
+                    testFrom = new Date(fromStat[0], fromStat[1], fromStat[2], fromStat[3],
+                            fromStat[4], Math.floor(fromStat[5] / stepValue) * stepValue, 0);
+                    break;
+                case Ext.Date.MINUTE:
+                    testFrom = new Date(fromStat[0], fromStat[1], fromStat[2], fromStat[3],
+                            Math.floor(fromStat[4] / stepValue) * stepValue, 0, 0);
+                    break;
+                case Ext.Date.HOUR:
+                    testFrom = new Date(fromStat[0], fromStat[1], fromStat[2],
+                            Math.floor(fromStat[3] / stepValue) * stepValue, 0, 0, 0);
+                    break;
+                case Ext.Date.DAY:
+                    testFrom = new Date(fromStat[0], fromStat[1],
+                            Math.floor((fromStat[2] - 1) / stepValue) * stepValue + 1, 0, 0, 0, 0);
+                    break;
+                case Ext.Date.MONTH:
+                    testFrom = new Date(fromStat[0], Math.floor(fromStat[1] / stepValue) * stepValue, 1, 0, 0, 0, 0);
+                    break;
+                default: // Ext.Date.YEAR
+                    testFrom = new Date(Math.floor(fromStat[0] / stepValue) * stepValue, 0, 1, 0, 0, 0, 0);
+                    break;
+            }
+        }
+
+        fractionalMonth = ((stepUnit === Ext.Date.MONTH) && (stepValue == 1/2 || stepValue == 1/3 || stepValue == 1/4));
+        steps = (fractionalMonth ? [] : 0);
+
+        // TODO(zhangbei) : We can do it better somehow...
+        testTo = new Date(testFrom);
+        while (testTo < to) {
+            if (fractionalMonth) {
+                date = new Date(testTo);
+                year = date.getFullYear();
+                month = date.getMonth();
+                day = date.getDate();
+                switch(stepValue) {
+                    case 1/2:   // the 1st and 15th of every month
+                        if (day >= 15) {
+                            day = 1;
+                            if (++month > 11) {
+                                year++;
+                            }
+                        }
+                        else {
+                            day = 15;
+                        }
+                        break;
+
+                    case 1/3:   // the 1st, 10th and 20th of every month
+                        if (day >= 20) {
+                            day = 1;
+                            if (++month > 11) {
+                                year++;
+                            }
+                        }
+                        else {
+                            if (day >= 10) {
+                                day = 20
+                            }
+                            else {
+                                day = 10;
+                            }
+                        }
+                        break;
+
+                    case 1/4:   // the 1st, 8th, 15th and 22nd of every month
+                        if (day >= 22) {
+                            day = 1;
+                            if (++month > 11) {
+                                year++;
+                            }
+                        }
+                        else {
+                            if (day >= 15) {
+                                day = 22
+                            }
+                            else {
+                                if (day >= 8) {
+                                    day = 15
+                                }
+                                else {
+                                    day = 8;
+                                }
+                            }
+                        }
+                        break;
+                }
+                testTo.setYear(year);
+                testTo.setMonth(month);
+                testTo.setDate(day);
+                steps.push(new Date(testTo));
+            }
+            else {
+                testTo = Ext.Date.add(testTo, stepUnit, stepValue);                
+                steps++;
+            }
+        }
+
+        if (lockEnds) {
+            testTo = to;
+        }
+        
+        if (fractionalMonth) {
+            return {
+                from : +testFrom,
+                to : +testTo,
+                steps : steps   // array of steps
+            };            
+        }
+        else {
+            return {
+                from : +testFrom,
+                to : +testTo,
+                step : (testTo - testFrom) / steps,
+                steps : steps   // number of steps
+            };            
+        }
+    },
+
+    sorter: function (a, b) {
+        return a.offset - b.offset;
+    },
+
+    rad: function(degrees) {
+        return degrees % 360 * Math.PI / 180;
+    },
+
+    degrees: function(radian) {
+        return radian * 180 / Math.PI % 360;
+    },
+
+    withinBox: function(x, y, bbox) {
+        bbox = bbox || {};
+        return (x >= bbox.x && x <= (bbox.x + bbox.width) && y >= bbox.y && y <= (bbox.y + bbox.height));
+    },
+
+    parseGradient: function(gradient) {
+        var me = this,
+            type = gradient.type || 'linear',
+            angle = gradient.angle || 0,
+            radian = me.radian,
+            stops = gradient.stops,
+            stopsArr = [],
+            stop,
+            vector,
+            max,
+            stopObj;
+
+        if (type == 'linear') {
+            vector = [0, 0, Math.cos(angle * radian), Math.sin(angle * radian)];
+            max = 1 / (Math.max(Math.abs(vector[2]), Math.abs(vector[3])) || 1);
+            vector[2] *= max;
+            vector[3] *= max;
+            if (vector[2] < 0) {
+                vector[0] = -vector[2];
+                vector[2] = 0;
+            }
+            if (vector[3] < 0) {
+                vector[1] = -vector[3];
+                vector[3] = 0;
+            }
+        }
+
+        for (stop in stops) {
+            if (stops.hasOwnProperty(stop) && me.stopsRE.test(stop)) {
+                stopObj = {
+                    offset: parseInt(stop, 10),
+                    color: Ext.draw.Color.toHex(stops[stop].color) || '#ffffff',
+                    opacity: stops[stop].opacity || 1
+                };
+                stopsArr.push(stopObj);
+            }
+        }
+        // Sort by pct property
+        Ext.Array.sort(stopsArr, me.sorter);
+        if (type == 'linear') {
+            return {
+                id: gradient.id,
+                type: type,
+                vector: vector,
+                stops: stopsArr
+            };
+        }
+        else {
+            return {
+                id: gradient.id,
+                type: type,
+                centerX: gradient.centerX,
+                centerY: gradient.centerY,
+                focalX: gradient.focalX,
+                focalY: gradient.focalY,
+                radius: gradient.radius,
+                vector: vector,
+                stops: stopsArr
+            };
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.fx.PropertyHandler', {
+
+    /* Begin Definitions */
+
+                                
+
+    statics: {
+        defaultHandler: {
+            pixelDefaultsRE: /width|height|top$|bottom$|left$|right$/i,
+            unitRE: /^(-?\d*\.?\d*){1}(em|ex|px|in|cm|mm|pt|pc|%)*$/,
+            scrollRE: /^scroll/i,
+
+            computeDelta: function(from, end, damper, initial, attr) {
+                damper = (typeof damper == 'number') ? damper : 1;
+                var unitRE = this.unitRE,
+                    match = unitRE.exec(from),
+                    start, units;
+                if (match) {
+                    from = match[1];
+                    units = match[2];
+                    if (!this.scrollRE.test(attr) && !units && this.pixelDefaultsRE.test(attr)) {
+                        units = 'px';
+                    }
+                }
+                from = +from || 0;
+
+                match = unitRE.exec(end);
+                if (match) {
+                    end = match[1];
+                    units = match[2] || units;
+                }
+                end = +end || 0;
+                start = (initial != null) ? initial : from;
+                return {
+                    from: from,
+                    delta: (end - start) * damper,
+                    units: units
+                };
+            },
+
+            get: function(from, end, damper, initialFrom, attr) {
+                var ln = from.length,
+                    out = [],
+                    i, initial, res, j, len;
+                for (i = 0; i < ln; i++) {
+                    if (initialFrom) {
+                        initial = initialFrom[i][1].from;
+                    }
+                    if (Ext.isArray(from[i][1]) && Ext.isArray(end)) {
+                        res = [];
+                        j = 0;
+                        len = from[i][1].length;
+                        for (; j < len; j++) {
+                            res.push(this.computeDelta(from[i][1][j], end[j], damper, initial, attr));
+                        }
+                        out.push([from[i][0], res]);
+                    }
+                    else {
+                        out.push([from[i][0], this.computeDelta(from[i][1], end, damper, initial, attr)]);
+                    }
+                }
+                return out;
+            },
+
+            set: function(values, easing) {
+                var ln = values.length,
+                    out = [],
+                    i, val, res, len, j;
+                for (i = 0; i < ln; i++) {
+                    val  = values[i][1];
+                    if (Ext.isArray(val)) {
+                        res = [];
+                        j = 0;
+                        len = val.length;
+                        for (; j < len; j++) {
+                            res.push(val[j].from + val[j].delta * easing + (val[j].units || 0));
+                        }
+                        out.push([values[i][0], res]);
+                    } else {
+                        out.push([values[i][0], val.from + val.delta * easing + (val.units || 0)]);
+                    }
+                }
+                return out;
+            }
+        },
+        stringHandler: {
+            computeDelta: function(from, end, damper, initial, attr) {
+                return {
+                    from: from,
+                    delta: end
+                };
+            },
+
+            get: function(from, end, damper, initialFrom, attr) {
+                var ln = from.length,
+                    out = [],
+                    i, initial, res, j, len;
+                for (i = 0; i < ln; i++) {
+                    out.push([from[i][0], this.computeDelta(from[i][1], end, damper, initial, attr)]);
+                }
+                return out;
+            },
+
+            set: function(values, easing) {
+                var ln = values.length,
+                    out = [],
+                    i, val, res, len, j;
+                for (i = 0; i < ln; i++) {
+                    val  = values[i][1];
+                    out.push([values[i][0], val.delta]);
+                }
+                return out;
+            }
+        },
+        color: {
+            rgbRE: /^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i,
+            hexRE: /^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i,
+            hex3RE: /^#?([0-9A-F]{1})([0-9A-F]{1})([0-9A-F]{1})$/i,
+
+            parseColor : function(color, damper) {
+                damper = (typeof damper == 'number') ? damper : 1;
+                var out    = false,
+                    reList = [this.hexRE, this.rgbRE, this.hex3RE],
+                    length = reList.length,
+                    match, base, re, i;
+
+                for (i = 0; i < length; i++) {
+                    re = reList[i];
+
+                    base = (i % 2 === 0) ? 16 : 10;
+                    match = re.exec(color);
+                    if (match && match.length === 4) {
+                        if (i === 2) {
+                            match[1] += match[1];
+                            match[2] += match[2];
+                            match[3] += match[3];
+                        }
+                        out = {
+                            red: parseInt(match[1], base),
+                            green: parseInt(match[2], base),
+                            blue: parseInt(match[3], base)
+                        };
+                        break;
+                    }
+                }
+
+                return out || color;
+            },
+
+            computeDelta: function(from, end, damper, initial) {
+                from = this.parseColor(from);
+                end = this.parseColor(end, damper);
+                var start = initial ? initial : from,
+                    tfrom = typeof start,
+                    tend = typeof end;
+                //Extra check for when the color string is not recognized.
+                if (tfrom == 'string' ||  tfrom == 'undefined'
+                  || tend == 'string' || tend == 'undefined') {
+                    return end || start;
+                }
+                return {
+                    from:  from,
+                    delta: {
+                        red: Math.round((end.red - start.red) * damper),
+                        green: Math.round((end.green - start.green) * damper),
+                        blue: Math.round((end.blue - start.blue) * damper)
+                    }
+                };
+            },
+
+            get: function(start, end, damper, initialFrom) {
+                var ln = start.length,
+                    out = [],
+                    i, initial;
+                for (i = 0; i < ln; i++) {
+                    if (initialFrom) {
+                        initial = initialFrom[i][1].from;
+                    }
+                    out.push([start[i][0], this.computeDelta(start[i][1], end, damper, initial)]);
+                }
+                return out;
+            },
+
+            set: function(values, easing) {
+                var ln = values.length,
+                    out = [],
+                    i, val, parsedString, from, delta;
+                for (i = 0; i < ln; i++) {
+                    val = values[i][1];
+                    if (val) {
+                        from = val.from;
+                        delta = val.delta;
+                        //multiple checks to reformat the color if it can't recognized by computeDelta.
+                        val = (typeof val == 'object' && 'red' in val)? 
+                                'rgb(' + val.red + ', ' + val.green + ', ' + val.blue + ')' : val;
+                        val = (typeof val == 'object' && val.length)? val[0] : val;
+                        if (typeof val == 'undefined') {
+                            return [];
+                        }
+                        parsedString = typeof val == 'string'? val :
+                            'rgb(' + [
+                                  (from.red + Math.round(delta.red * easing)) % 256,
+                                  (from.green + Math.round(delta.green * easing)) % 256,
+                                  (from.blue + Math.round(delta.blue * easing)) % 256
+                              ].join(',') + ')';
+                        out.push([
+                            values[i][0],
+                            parsedString
+                        ]);
+                    }
+                }
+                return out;
+            }
+        },
+        object: {
+            interpolate: function(prop, damper) {
+                damper = (typeof damper == 'number') ? damper : 1;
+                var out = {},
+                    p;
+                for(p in prop) {
+                    out[p] = parseFloat(prop[p]) * damper;
+                }
+                return out;
+            },
+
+            computeDelta: function(from, end, damper, initial) {
+                from = this.interpolate(from);
+                end = this.interpolate(end, damper);
+                var start = initial ? initial : from,
+                    delta = {},
+                    p;
+
+                for(p in end) {
+                    delta[p] = end[p] - start[p];
+                }
+                return {
+                    from:  from,
+                    delta: delta
+                };
+            },
+
+            get: function(start, end, damper, initialFrom) {
+                var ln = start.length,
+                    out = [],
+                    i, initial;
+                for (i = 0; i < ln; i++) {
+                    if (initialFrom) {
+                        initial = initialFrom[i][1].from;
+                    }
+                    out.push([start[i][0], this.computeDelta(start[i][1], end, damper, initial)]);
+                }
+                return out;
+            },
+
+            set: function(values, easing) {
+                var ln = values.length,
+                    out = [],
+                    outObject = {},
+                    i, from, delta, val, p;
+                for (i = 0; i < ln; i++) {
+                    val  = values[i][1];
+                    from = val.from;
+                    delta = val.delta;
+                    for (p in from) {
+                        outObject[p] = from[p] + delta[p] * easing;
+                    }
+                    out.push([
+                        values[i][0],
+                        outObject
+                    ]);
+                }
+                return out;
+            }
+        },
+
+        path: {
+            computeDelta: function(from, end, damper, initial) {
+                damper = (typeof damper == 'number') ? damper : 1;
+                var start;
+                from = +from || 0;
+                end = +end || 0;
+                start = (initial != null) ? initial : from;
+                return {
+                    from: from,
+                    delta: (end - start) * damper
+                };
+            },
+
+            forcePath: function(path) {
+                if (!Ext.isArray(path) && !Ext.isArray(path[0])) {
+                    path = Ext.draw.Draw.parsePathString(path);
+                }
+                return path;
+            },
+
+            get: function(start, end, damper, initialFrom) {
+                var endPath = this.forcePath(end),
+                    out = [],
+                    startLn = start.length,
+                    startPathLn, pointsLn, i, deltaPath, initial, j, k, path, startPath;
+                for (i = 0; i < startLn; i++) {
+                    startPath = this.forcePath(start[i][1]);
+
+                    deltaPath = Ext.draw.Draw.interpolatePaths(startPath, endPath);
+                    startPath = deltaPath[0];
+                    endPath = deltaPath[1];
+
+                    startPathLn = startPath.length;
+                    path = [];
+                    for (j = 0; j < startPathLn; j++) {
+                        deltaPath = [startPath[j][0]];
+                        pointsLn = startPath[j].length;
+                        for (k = 1; k < pointsLn; k++) {
+                            initial = initialFrom && initialFrom[0][1][j][k].from;
+                            deltaPath.push(this.computeDelta(startPath[j][k], endPath[j][k], damper, initial));
+                        }
+                        path.push(deltaPath);
+                    }
+                    out.push([start[i][0], path]);
+                }
+                return out;
+            },
+
+            set: function(values, easing) {
+                var ln = values.length,
+                    out = [],
+                    i, j, k, newPath, calcPath, deltaPath, deltaPathLn, pointsLn;
+                for (i = 0; i < ln; i++) {
+                    deltaPath = values[i][1];
+                    newPath = [];
+                    deltaPathLn = deltaPath.length;
+                    for (j = 0; j < deltaPathLn; j++) {
+                        calcPath = [deltaPath[j][0]];
+                        pointsLn = deltaPath[j].length;
+                        for (k = 1; k < pointsLn; k++) {
+                            calcPath.push(deltaPath[j][k].from + deltaPath[j][k].delta * easing);
+                        }
+                        newPath.push(calcPath.join(','));
+                    }
+                    out.push([values[i][0], newPath.join(',')]);
+                }
+                return out;
+            }
+        }
+        /* End Definitions */
+    }
+}, function() {
+    //set color properties to color interpolator
+    var props  = [
+            'outlineColor',
+            'backgroundColor',
+            'borderColor',
+            'borderTopColor',
+            'borderRightColor',
+            'borderBottomColor',
+            'borderLeftColor',
+            'fill',
+            'stroke'
+        ],
+        length = props.length,
+        i      = 0,
+        prop;
+
+    for (; i<length; i++) {
+        prop = props[i];
+        this[prop] = this.color;
+    }
+    
+    //set string properties to string
+    props  = ['cursor'];
+    length = props.length;
+    i      = 0;
+
+    for (; i<length; i++) {
+        prop = props[i];
+        this[prop] = this.stringHandler;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class manages animation for a specific {@link #target}. The animation allows
+ * animation of various properties on the target, such as size, position, color and others.
+ *
+ * ## Starting Conditions
+ *
+ * The starting conditions for the animation are provided by the {@link #from} configuration.
+ * Any/all of the properties in the {@link #from} configuration can be specified. If a particular
+ * property is not defined, the starting value for that property will be read directly from the target.
+ *
+ * ## End Conditions
+ *
+ * The ending conditions for the animation are provided by the {@link #to} configuration. These mark
+ * the final values once the animations has finished. The values in the {@link #from} can mirror
+ * those in the {@link #to} configuration to provide a starting point.
+ *
+ * ## Other Options
+ *
+ *  - {@link #duration}: Specifies the time period of the animation.
+ *  - {@link #easing}: Specifies the easing of the animation.
+ *  - {@link #iterations}: Allows the animation to repeat a number of times.
+ *  - {@link #alternate}: Used in conjunction with {@link #iterations}, reverses the direction every second iteration.
+ *
+ * ## Example Code
+ *
+ *     @example
+ *     var myComponent = Ext.create('Ext.Component', {
+ *         renderTo: document.body,
+ *         width: 200,
+ *         height: 200,
+ *         style: 'border: 1px solid red;'
+ *     });
+ *
+ *     Ext.create('Ext.fx.Anim', {
+ *         target: myComponent,
+ *         duration: 1000,
+ *         from: {
+ *             width: 400 //starting width 400
+ *         },
+ *         to: {
+ *             width: 300, //end width 300
+ *             height: 300 // end height 300
+ *         }
+ *     });
+ */
+Ext.define('Ext.fx.Anim', {
+
+    /* Begin Definitions */
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+                                                                                                                     
+
+    /* End Definitions */
+
+    /**
+     * @property {Boolean} isAnimation
+     * `true` in this class to identify an object as an instantiated Anim, or subclass thereof.
+     */
+    isAnimation: true,
+
+    /**
+     * @cfg {Function} callback
+     * A function to be run after the animation has completed.
+     */
+
+    /**
+     * @cfg {Function} scope
+     * The scope that the {@link #callback} function will be called with
+     */
+
+    /**
+     * @cfg {Number} duration
+     * Time in milliseconds for a single animation to last. If the {@link #iterations} property is
+     * specified, then each animate will take the same duration for each iteration.
+     */
+    duration: 250,
+
+    /**
+     * @cfg {Number} delay
+     * Time to delay before starting the animation.
+     */
+    delay: 0,
+
+    /* @private used to track a delayed starting time */
+    delayStart: 0,
+
+    /**
+     * @cfg {Boolean} dynamic
+     * Currently only for Component Animation: Only set a component's outer element size bypassing layouts.
+     * Set to true to do full layouts for every frame of the animation.
+     */
+    dynamic: false,
+
+    /**
+     * @cfg {String} easing
+     * This describes how the intermediate values used during a transition will be calculated.
+     * It allows for a transition to change speed over its duration.
+     *
+     * - backIn
+     * - backOut
+     * - bounceIn
+     * - bounceOut
+     * - ease
+     * - easeIn
+     * - easeOut
+     * - easeInOut
+     * - elasticIn
+     * - elasticOut
+     * - cubic-bezier(x1, y1, x2, y2)
+     *
+     * Note that cubic-bezier will create a custom easing curve following the CSS3 [transition-timing-function][0]
+     * specification.  The four values specify points P1 and P2 of the curve as (x1, y1, x2, y2). All values must
+     * be in the range [0, 1] or the definition is invalid.
+     *
+     * [0]: http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag
+     */
+    easing: 'ease',
+
+    /**
+     * @cfg {Object} keyframes
+     * Animation keyframes follow the CSS3 Animation configuration pattern. 'from' is always considered '0%' and 'to'
+     * is considered '100%'. **Every keyframe declaration must have a keyframe rule for 0% and 100%, possibly defined using
+     * "from" or "to".**  A keyframe declaration without these keyframe selectors is invalid and will not be available for
+     * animation.  The keyframe declaration for a keyframe rule consists of properties and values. Properties that are unable to
+     * be animated are ignored in these rules, with the exception of 'easing' which can be changed at each keyframe. For example:
+     *
+     *     keyframes : {
+     *         '0%': {
+     *             left: 100
+     *         },
+     *         '40%': {
+     *             left: 150
+     *         },
+     *         '60%': {
+     *             left: 75
+     *         },
+     *         '100%': {
+     *             left: 100
+     *         }
+     *     }
+     */
+
+    /**
+     * @private
+     */
+    damper: 1,
+
+    /**
+     * @private
+     */
+    bezierRE: /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,
+
+    /**
+     * Run the animation from the end to the beginning
+     * Defaults to false.
+     * @cfg {Boolean} reverse
+     */
+    reverse: false,
+
+    /**
+     * Flag to determine if the animation has started
+     * @property running
+     * @type Boolean
+     */
+    running: false,
+
+    /**
+     * Flag to determine if the animation is paused. Only set this to true if you need to
+     * keep the Anim instance around to be unpaused later; otherwise call {@link #end}.
+     * @property paused
+     * @type Boolean
+     */
+    paused: false,
+
+    /**
+     * @cfg {Number} iterations
+     * Number of times to execute the animation.
+     */
+    iterations: 1,
+
+    /**
+     * @cfg {Boolean} alternate
+     * Used in conjunction with iterations to reverse the animation each time an iteration completes.
+     */
+    alternate: false,
+
+    /**
+     * Current iteration the animation is running.
+     * @property currentIteration
+     * @type Number
+     */
+    currentIteration: 0,
+
+    /**
+     * Starting time of the animation.
+     * @property startTime
+     * @type Date
+     */
+    startTime: 0,
+
+    /**
+     * Contains a cache of the interpolators to be used.
+     * @private
+     * @property propHandlers
+     * @type Object
+     */
+
+    /**
+     * @cfg {String/Object} target
+     * The {@link Ext.fx.target.Target} to apply the animation to.  This should only be specified when creating an Ext.fx.Anim directly.
+     * The target does not need to be a {@link Ext.fx.target.Target} instance, it can be the underlying object. For example, you can
+     * pass a Component, Element or Sprite as the target and the Anim will create the appropriate {@link Ext.fx.target.Target} object
+     * automatically.
+     */
+
+    /**
+     * @cfg {Object} from
+     * An object containing property/value pairs for the beginning of the animation.  If not specified, the current state of the
+     * Ext.fx.target will be used. For example:
+     *
+     *     from: {
+     *         opacity: 0,       // Transparent
+     *         color: '#ffffff', // White
+     *         left: 0
+     *     }
+     *
+     */
+
+    /**
+     * @cfg {Object} to (required)
+     * An object containing property/value pairs for the end of the animation. For example:
+     *
+     *     to: {
+     *         opacity: 1,       // Opaque
+     *         color: '#00ff00', // Green
+     *         left: 500
+     *     }
+     *
+     */
+    
+    // @private
+    frameCount: 0,
+
+    // @private
+    constructor: function(config) {
+        var me = this,
+            curve;
+            
+        config = config || {};
+        // If keyframes are passed, they really want an Animator instead.
+        if (config.keyframes) {
+            return new Ext.fx.Animator(config);
+        }
+        Ext.apply(me, config);
+        if (me.from === undefined) {
+            me.from = {};
+        }
+        me.propHandlers = {};
+        me.config = config;
+        me.target = Ext.fx.Manager.createTarget(me.target);
+        me.easingFn = Ext.fx.Easing[me.easing];
+        me.target.dynamic = me.dynamic;
+
+        // If not a pre-defined curve, try a cubic-bezier
+        if (!me.easingFn) {
+            me.easingFn = String(me.easing).match(me.bezierRE);
+            if (me.easingFn && me.easingFn.length == 5) {
+                curve = me.easingFn;
+                me.easingFn = Ext.fx.CubicBezier.cubicBezier(+curve[1], +curve[2], +curve[3], +curve[4]);
+            }
+        }
+        me.id = Ext.id(null, 'ext-anim-');
+        me.addEvents(
+            /**
+             * @event beforeanimate
+             * Fires before the animation starts. A handler can return false to cancel the animation.
+             * @param {Ext.fx.Anim} this
+             */
+            'beforeanimate',
+             /**
+              * @event afteranimate
+              * Fires when the animation is complete.
+              * @param {Ext.fx.Anim} this
+              * @param {Date} startTime
+              */
+            'afteranimate',
+             /**
+              * @event lastframe
+              * Fires when the animation's last frame has been set.
+              * @param {Ext.fx.Anim} this
+              * @param {Date} startTime
+              */
+            'lastframe'
+        );
+        me.mixins.observable.constructor.call(me);
+        Ext.fx.Manager.addAnim(me);
+    },
+
+    /**
+     * @private
+     * Helper to the target
+     */
+    setAttr: function(attr, value) {
+        return Ext.fx.Manager.items.get(this.id).setAttr(this.target, attr, value);
+    },
+
+    /**
+     * @private
+     * Set up the initial currentAttrs hash.
+     */
+    initAttrs: function() {
+        var me = this,
+            from = me.from,
+            to = me.to,
+            initialFrom = me.initialFrom || {},
+            out = {},
+            start, end, propHandler, attr;
+
+        for (attr in to) {
+            if (to.hasOwnProperty(attr)) {
+                start = me.target.getAttr(attr, from[attr]);
+                end = to[attr];
+                // Use default (numeric) property handler
+                if (!Ext.fx.PropertyHandler[attr]) {
+                    if (Ext.isObject(end)) {
+                        propHandler = me.propHandlers[attr] = Ext.fx.PropertyHandler.object;
+                    } else {
+                        propHandler = me.propHandlers[attr] = Ext.fx.PropertyHandler.defaultHandler;
+                    }
+                }
+                // Use custom handler
+                else {
+                    propHandler = me.propHandlers[attr] = Ext.fx.PropertyHandler[attr];
+                }
+                out[attr] = propHandler.get(start, end, me.damper, initialFrom[attr], attr);
+            }
+        }
+        me.currentAttrs = out;
+    },
+
+    /**
+     * @private
+     * Fires beforeanimate and sets the running flag.
+     */
+    start: function(startTime) {
+        var me = this,
+            delay = me.delay,
+            delayStart = me.delayStart,
+            delayDelta;
+        
+        if (delay) {
+            if (!delayStart) {
+                me.delayStart = startTime;
+                return;
+            }
+            else {
+                delayDelta = startTime - delayStart;
+                if (delayDelta < delay) {
+                    return;
+                }
+                else {
+                    // Compensate for frame delay;
+                    startTime = new Date(delayStart.getTime() + delay);
+                }
+            }
+        }
+        if (me.fireEvent('beforeanimate', me) !== false) {
+            me.startTime = startTime;
+            if (!me.paused && !me.currentAttrs) {
+                me.initAttrs();
+            }
+            me.running = true;
+            me.frameCount = 0;
+        }
+    },
+
+    /**
+     * @private
+     * Calculate attribute value at the passed timestamp.
+     * @returns a hash of the new attributes.
+     */
+    runAnim: function(elapsedTime) {
+        var me = this,
+            attrs = me.currentAttrs,
+            duration = me.duration,
+            easingFn = me.easingFn,
+            propHandlers = me.propHandlers,
+            ret = {},
+            easing, values, attr, lastFrame;
+
+        if (elapsedTime >= duration) {
+            elapsedTime = duration;
+            lastFrame = true;
+        }
+        if (me.reverse) {
+            elapsedTime = duration - elapsedTime;
+        }
+
+        for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+                values = attrs[attr];
+                easing = lastFrame ? 1 : easingFn(elapsedTime / duration);
+                ret[attr] = propHandlers[attr].set(values, easing);
+            }
+        }
+        me.frameCount++;
+            
+        return ret;
+    },
+
+    /**
+     * @private
+     * Perform lastFrame cleanup and handle iterations
+     * @returns a hash of the new attributes.
+     */
+    lastFrame: function() {
+        var me = this,
+            iter = me.iterations,
+            iterCount = me.currentIteration;
+
+        iterCount++;
+        if (iterCount < iter) {
+            if (me.alternate) {
+                me.reverse = !me.reverse;
+            }
+            me.startTime = new Date();
+            me.currentIteration = iterCount;
+            // Turn off paused for CSS3 Transitions
+            me.paused = false;
+        }
+        else {
+            me.currentIteration = 0;
+            me.end();
+            me.fireEvent('lastframe', me, me.startTime);
+        }
+    },
+
+    endWasCalled: 0,
+
+    /**
+     * Fire afteranimate event and end the animation. Usually called automatically when the
+     * animation reaches its final frame, but can also be called manually to pre-emptively
+     * stop and destroy the running animation.
+     */
+    end: function() {
+        if (this.endWasCalled++) {
+            return;
+        }
+        var me = this;
+        me.startTime = 0;
+        me.paused = false;
+        me.running = false;
+        Ext.fx.Manager.removeAnim(me);
+        me.fireEvent('afteranimate', me, me.startTime);
+        Ext.callback(me.callback, me.scope, [me, me.startTime]);
+    },
+    
+    isReady: function() {
+        return this.paused === false && this.running === false && this.iterations > 0;
+    },
+    
+    isRunning: function() {
+        return this.paused === false && this.running === true && this.isAnimator !== true;
+    }
+});
+// Set flag to indicate that Fx is available. Class might not be available immediately.
+Ext.enableFx = true;
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This animation class is a mixin.
+ *
+ * Ext.util.Animate provides an API for the creation of animated transitions of properties and styles.
+ * This class is used as a mixin and currently applied to {@link Ext.Element}, {@link Ext.CompositeElement},
+ * {@link Ext.draw.Sprite}, {@link Ext.draw.CompositeSprite}, and {@link Ext.Component}.  Note that Components
+ * have a limited subset of what attributes can be animated such as top, left, x, y, height, width, and
+ * opacity (color, paddings, and margins can not be animated).
+ *
+ * ## Animation Basics
+ *
+ * All animations require three things - `easing`, `duration`, and `to` (the final end value for each property)
+ * you wish to animate. Easing and duration are defaulted values specified below.
+ * Easing describes how the intermediate values used during a transition will be calculated.
+ * {@link Ext.fx.Anim#easing Easing} allows for a transition to change speed over its duration.
+ * You may use the defaults for easing and duration, but you must always set a
+ * {@link Ext.fx.Anim#to to} property which is the end value for all animations.
+ *
+ * Popular element 'to' configurations are:
+ *
+ *  - opacity
+ *  - x
+ *  - y
+ *  - color
+ *  - height
+ *  - width
+ *
+ * Popular sprite 'to' configurations are:
+ *
+ *  - translation
+ *  - path
+ *  - scale
+ *  - stroke
+ *  - rotation
+ *
+ * The default duration for animations is 250 (which is a 1/4 of a second).  Duration is denoted in
+ * milliseconds.  Therefore 1 second is 1000, 1 minute would be 60000, and so on. The default easing curve
+ * used for all animations is 'ease'.  Popular easing functions are included and can be found in {@link Ext.fx.Anim#easing Easing}.
+ *
+ * For example, a simple animation to fade out an element with a default easing and duration:
+ *
+ *     var p1 = Ext.get('myElementId');
+ *
+ *     p1.animate({
+ *         to: {
+ *             opacity: 0
+ *         }
+ *     });
+ *
+ * To make this animation fade out in a tenth of a second:
+ *
+ *     var p1 = Ext.get('myElementId');
+ *
+ *     p1.animate({
+ *        duration: 100,
+ *         to: {
+ *             opacity: 0
+ *         }
+ *     });
+ *
+ * ## Animation Queues
+ *
+ * By default all animations are added to a queue which allows for animation via a chain-style API.
+ * For example, the following code will queue 4 animations which occur sequentially (one right after the other):
+ *
+ *     p1.animate({
+ *         to: {
+ *             x: 500
+ *         }
+ *     }).animate({
+ *         to: {
+ *             y: 150
+ *         }
+ *     }).animate({
+ *         to: {
+ *             backgroundColor: '#f00'  //red
+ *         }
+ *     }).animate({
+ *         to: {
+ *             opacity: 0
+ *         }
+ *     });
+ *
+ * You can change this behavior by calling the {@link Ext.util.Animate#syncFx syncFx} method and all
+ * subsequent animations for the specified target will be run concurrently (at the same time).
+ *
+ *     p1.syncFx();  //this will make all animations run at the same time
+ *
+ *     p1.animate({
+ *         to: {
+ *             x: 500
+ *         }
+ *     }).animate({
+ *         to: {
+ *             y: 150
+ *         }
+ *     }).animate({
+ *         to: {
+ *             backgroundColor: '#f00'  //red
+ *         }
+ *     }).animate({
+ *         to: {
+ *             opacity: 0
+ *         }
+ *     });
+ *
+ * This works the same as:
+ *
+ *     p1.animate({
+ *         to: {
+ *             x: 500,
+ *             y: 150,
+ *             backgroundColor: '#f00'  //red
+ *             opacity: 0
+ *         }
+ *     });
+ *
+ * The {@link Ext.util.Animate#stopAnimation stopAnimation} method can be used to stop any
+ * currently running animations and clear any queued animations.
+ *
+ * ## Animation Keyframes
+ *
+ * You can also set up complex animations with {@link Ext.fx.Anim#keyframes keyframes} which follow the
+ * CSS3 Animation configuration pattern. Note rotation, translation, and scaling can only be done for sprites.
+ * The previous example can be written with the following syntax:
+ *
+ *     p1.animate({
+ *         duration: 1000,  //one second total
+ *         keyframes: {
+ *             25: {     //from 0 to 250ms (25%)
+ *                 x: 0
+ *             },
+ *             50: {   //from 250ms to 500ms (50%)
+ *                 y: 0
+ *             },
+ *             75: {  //from 500ms to 750ms (75%)
+ *                 backgroundColor: '#f00'  //red
+ *             },
+ *             100: {  //from 750ms to 1sec
+ *                 opacity: 0
+ *             }
+ *         }
+ *     });
+ *
+ * ## Animation Events
+ *
+ * Each animation you create has events for {@link Ext.fx.Anim#beforeanimate beforeanimate},
+ * {@link Ext.fx.Anim#afteranimate afteranimate}, and {@link Ext.fx.Anim#lastframe lastframe}.
+ * Keyframed animations adds an additional {@link Ext.fx.Animator#keyframe keyframe} event which
+ * fires for each keyframe in your animation.
+ *
+ * All animations support the {@link Ext.util.Observable#listeners listeners} configuration to attact functions to these events.
+ *
+ *     startAnimate: function() {
+ *         var p1 = Ext.get('myElementId');
+ *         p1.animate({
+ *            duration: 100,
+ *             to: {
+ *                 opacity: 0
+ *             },
+ *             listeners: {
+ *                 beforeanimate:  function() {
+ *                     // Execute my custom method before the animation
+ *                     this.myBeforeAnimateFn();
+ *                 },
+ *                 afteranimate: function() {
+ *                     // Execute my custom method after the animation
+ *                     this.myAfterAnimateFn();
+ *                 },
+ *                 scope: this
+ *         });
+ *     },
+ *     myBeforeAnimateFn: function() {
+ *       // My custom logic
+ *     },
+ *     myAfterAnimateFn: function() {
+ *       // My custom logic
+ *     }
+ *
+ * Due to the fact that animations run asynchronously, you can determine if an animation is currently
+ * running on any target by using the {@link Ext.util.Animate#getActiveAnimation getActiveAnimation}
+ * method.  This method will return false if there are no active animations or return the currently
+ * running {@link Ext.fx.Anim} instance.
+ *
+ * In this example, we're going to wait for the current animation to finish, then stop any other
+ * queued animations before we fade our element's opacity to 0:
+ *
+ *     var curAnim = p1.getActiveAnimation();
+ *     if (curAnim) {
+ *         curAnim.on('afteranimate', function() {
+ *             p1.stopAnimation();
+ *             p1.animate({
+ *                 to: {
+ *                     opacity: 0
+ *                 }
+ *             });
+ *         });
+ *     }
+ */
+Ext.define('Ext.util.Animate', {
+               
+                       
+                                   
+                          
+                     
+      
+    
+    isAnimate: true,
+
+    /**
+     * Performs custom animation on this object.
+     *
+     * This method is applicable to both the {@link Ext.Component Component} class and the {@link Ext.draw.Sprite Sprite}
+     * class. It performs animated transitions of certain properties of this object over a specified timeline.
+     *
+     * ### Animating a {@link Ext.Component Component}
+     *
+     * When animating a Component, the following properties may be specified in `from`, `to`, and `keyframe` objects:
+     *
+     *   - `x` - The Component's page X position in pixels.
+     *
+     *   - `y` - The Component's page Y position in pixels
+     *
+     *   - `left` - The Component's `left` value in pixels.
+     *
+     *   - `top` - The Component's `top` value in pixels.
+     *
+     *   - `width` - The Component's `width` value in pixels.
+     *
+     *   - `height` - The Component's `height` value in pixels.
+     *
+     *   - `dynamic` - Specify as true to update the Component's layout (if it is a Container) at every frame of the animation.
+     *     *Use sparingly as laying out on every intermediate size change is an expensive operation.*
+     *
+     * For example, to animate a Window to a new size, ensuring that its internal layout and any shadow is correct:
+     *
+     *     myWindow = Ext.create('Ext.window.Window', {
+     *         title: 'Test Component animation',
+     *         width: 500,
+     *         height: 300,
+     *         layout: {
+     *             type: 'hbox',
+     *             align: 'stretch'
+     *         },
+     *         items: [{
+     *             title: 'Left: 33%',
+     *             margins: '5 0 5 5',
+     *             flex: 1
+     *         }, {
+     *             title: 'Left: 66%',
+     *             margins: '5 5 5 5',
+     *             flex: 2
+     *         }]
+     *     });
+     *     myWindow.show();
+     *     myWindow.header.el.on('click', function() {
+     *         myWindow.animate({
+     *             to: {
+     *                 width: (myWindow.getWidth() == 500) ? 700 : 500,
+     *                 height: (myWindow.getHeight() == 300) ? 400 : 300
+     *             }
+     *         });
+     *     });
+     *
+     * For performance reasons, by default, the internal layout is only updated when the Window reaches its final `"to"`
+     * size. If dynamic updating of the Window's child Components is required, then configure the animation with
+     * `dynamic: true` and the two child items will maintain their proportions during the animation.
+     *
+     * @param {Object} config  Configuration for {@link Ext.fx.Anim}.
+     * Note that the {@link Ext.fx.Anim#to to} config is required.
+     * @return {Object} this
+     */
+    animate: function(animObj) {
+        var me = this;
+        if (Ext.fx.Manager.hasFxBlock(me.id)) {
+            return me;
+        }
+        Ext.fx.Manager.queueFx(new Ext.fx.Anim(me.anim(animObj)));
+        return this;
+    },
+
+    // @private - process the passed fx configuration.
+    anim: function(config) {
+        if (!Ext.isObject(config)) {
+            return (config) ? {} : false;
+        }
+
+        var me = this;
+
+        if (config.stopAnimation) {
+            me.stopAnimation();
+        }
+
+        Ext.applyIf(config, Ext.fx.Manager.getFxDefaults(me.id));
+
+        return Ext.apply({
+            target: me,
+            paused: true
+        }, config);
+    },
+
+    /**
+     * Stops any running effects and clears this object's internal effects queue if it contains any additional effects
+     * that haven't started yet.
+     * @deprecated 4.0 Replaced by {@link #stopAnimation}
+     * @return {Ext.Element} The Element
+     * @method
+     */
+    stopFx: Ext.Function.alias(Ext.util.Animate, 'stopAnimation'),
+
+    /**
+     * Stops any running effects and clears this object's internal effects queue if it contains any additional effects
+     * that haven't started yet.
+     * @return {Ext.Element} The Element
+     */
+    stopAnimation: function() {
+        Ext.fx.Manager.stopAnimation(this.id);
+        return this;
+    },
+
+    /**
+     * Ensures that all effects queued after syncFx is called on this object are run concurrently. This is the opposite
+     * of {@link #sequenceFx}.
+     * @return {Object} this
+     */
+    syncFx: function() {
+        Ext.fx.Manager.setFxDefaults(this.id, {
+            concurrent: true
+        });
+        return this;
+    },
+
+    /**
+     * Ensures that all effects queued after sequenceFx is called on this object are run in sequence. This is the
+     * opposite of {@link #syncFx}.
+     * @return {Object} this
+     */
+    sequenceFx: function() {
+        Ext.fx.Manager.setFxDefaults(this.id, {
+            concurrent: false
+        });
+        return this;
+    },
+
+    /**
+     * @deprecated 4.0 Replaced by {@link #getActiveAnimation}
+     * @inheritdoc Ext.util.Animate#getActiveAnimation
+     * @method
+     */
+    hasActiveFx: Ext.Function.alias(Ext.util.Animate, 'getActiveAnimation'),
+
+    /**
+     * Returns the current animation if this object has any effects actively running or queued, else returns false.
+     * @return {Ext.fx.Anim/Boolean} Anim if element has active effects, else false
+     */
+    getActiveAnimation: function() {
+        return Ext.fx.Manager.getActiveAnimation(this.id);
+    }
+}, function(){
+    // Apply Animate mixin manually until Element is defined in the proper 4.x way
+    Ext.applyIf(Ext.Element.prototype, this.prototype);
+    // We need to call this again so the animation methods get copied over to CE
+    Ext.CompositeElementLite.importElementMethods();
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This mixin enables classes to declare relationships to child elements and provides the
+ * mechanics for acquiring the {@link Ext.Element elements} and storing them on an object
+ * instance as properties.
+ *
+ * This class is used by {@link Ext.Component components} and {@link Ext.layout.container.Container container layouts} to
+ * manage their child elements.
+ * 
+ * A typical component that uses these features might look something like this:
+ * 
+ *      Ext.define('Ext.ux.SomeComponent', {
+ *          extend: 'Ext.Component',
+ *          
+ *          childEls: [
+ *              'bodyEl'
+ *          ],
+ *          
+ *          renderTpl: [
+ *              '<div id="{id}-bodyEl"></div>'
+ *          ],
+ *          
+ *          // ...
+ *      });
+ * 
+ * The `childEls` array lists one or more relationships to child elements managed by the
+ * component. The items in this array can be either of the following types:
+ * 
+ * - String: the id suffix and property name in one. For example, "bodyEl" in the above
+ * example means a "bodyEl" property will be added to the instance with the result of
+ * {@link Ext#get} given "componentId-bodyEl" where "componentId" is the component instance's
+ * id.
+ * - Object: with a `name` property that names the instance property for the element, and
+ * one of the following additional properties:
+ *      - `id`: The full id of the child element.
+ *      - `itemId`: The suffix part of the id to which "componentId-" is prepended.
+ *      - `select`: A selector that will be passed to {@link Ext#select}.
+ *      - `selectNode`: A selector that will be passed to {@link Ext.DomQuery#selectNode}.
+ * 
+ * The example above could have used this instead to achieve the same result:
+ *
+ *      childEls: [
+ *          { name: 'bodyEl', itemId: 'bodyEl' }
+ *      ]
+ *
+ * When using `select`, the property will be an instance of {@link Ext.CompositeElement}. In
+ * all other cases, the property will be an {@link Ext.Element} or `null` if not found.
+ *
+ * Care should be taken when using `select` or `selectNode` to find child elements. The
+ * following issues should be considered:
+ * 
+ * - Performance: using selectors can be slower than id lookup by a factor 10x or more.
+ * - Over-selecting: selectors are applied after the DOM elements for all children have
+ * been rendered, so selectors can match elements from child components (including nested
+ * versions of the same component) accidentally.
+ * 
+ * This above issues are most important when using `select` since it returns multiple
+ * elements.
+ *
+ * **IMPORTANT** 
+ * Unlike a `renderTpl` where there is a single value for an instance, `childEls` are aggregated
+ * up the class hierarchy so that they are effectively inherited. In other words, if a
+ * class where to derive from `Ext.ux.SomeComponent` in the example above, it could also
+ * have a `childEls` property in the same way as `Ext.ux.SomeComponent`.
+ * 
+ *      Ext.define('Ext.ux.AnotherComponent', {
+ *          extend: 'Ext.ux.SomeComponent',
+ *          
+ *          childEls: [
+ *              // 'bodyEl' is inherited
+ *              'innerEl'
+ *          ],
+ *          
+ *          renderTpl: [
+ *              '<div id="{id}-bodyEl">'
+ *                  '<div id="{id}-innerEl"></div>'
+ *              '</div>'
+ *          ],
+ *          
+ *          // ...
+ *      });
+ * 
+ * The `renderTpl` contains both child elements and unites them in the desired markup, but
+ * the `childEls` only contains the new child element. The {@link #applyChildEls} method
+ * takes care of looking up all `childEls` for an instance and considers `childEls`
+ * properties on all the super classes and mixins.
+ * 
+ * @private
+ */
+Ext.define('Ext.util.ElementContainer', {
+
+    childEls: [
+        // empty - this solves a couple problems:
+        //  1. It ensures that all classes have a childEls (avoid null ptr)
+        //  2. It prevents mixins from smashing on their own childEls (these are gathered
+        //      specifically)
+    ],
+
+    constructor: function () {
+        var me = this,
+            childEls;
+
+        // if we have configured childEls, we need to merge them with those from this
+        // class, its bases and the set of mixins...
+        if (me.hasOwnProperty('childEls')) {
+            childEls = me.childEls;
+            delete me.childEls;
+
+            me.addChildEls.apply(me, childEls);
+        }
+    },
+
+    destroy: function () {
+        var me = this,
+            childEls = me.getChildEls(),
+            child, childName, i, k;
+
+        for (i = childEls.length; i--; ) {
+            childName = childEls[i];
+            if (typeof childName != 'string') {
+                childName = childName.name;
+            }
+
+            child = me[childName];
+            if (child) {
+                me[childName] = null; // better than delete since that changes the "shape"
+                child.remove();
+            }
+        }
+    },
+
+    /**
+     * Adds each argument passed to this method to the {@link Ext.AbstractComponent#cfg-childEls childEls} array.
+     */
+    addChildEls: function () {
+        var me = this,
+            args = arguments;
+
+        if (me.hasOwnProperty('childEls')) {
+            me.childEls.push.apply(me.childEls, args);
+        } else {
+            me.childEls = me.getChildEls().concat(Array.prototype.slice.call(args));
+        }
+        
+        me.prune(me.childEls, false);
+    },
+
+    /**
+     * Sets references to elements inside the component. 
+     * @private
+     */
+    applyChildEls: function(el, id) {
+        var me = this,
+            childEls = me.getChildEls(),
+            baseId, childName, i, selector, value;
+
+        baseId = (id || me.id) + '-';
+        for (i = childEls.length; i--; ) {
+            childName = childEls[i];
+
+            if (typeof childName == 'string') {
+                // We don't use Ext.get because that is 3x (or more) slower on IE6-8. Since
+                // we know the el's are children of our el we use getById instead:
+                value = el.getById(baseId + childName);
+            } else {
+                if ((selector = childName.select)) {
+                    value = Ext.select(selector, true, el.dom); // a CompositeElement
+                } else if ((selector = childName.selectNode)) {
+                    value = Ext.get(Ext.DomQuery.selectNode(selector, el.dom));
+                } else {
+                    // see above re:getById...
+                    value = el.getById(childName.id || (baseId + childName.itemId));
+                }
+
+                childName = childName.name;
+            }
+
+            me[childName] = value;
+        }
+    },
+
+    getChildEls: function () {
+        var me = this,
+            self;
+
+        // If an instance has its own childEls, that is the complete set:
+        if (me.hasOwnProperty('childEls')) {
+            return me.childEls;
+        }
+
+        // Typically, however, the childEls is a class-level concept, so check to see if
+        // we have cached the complete set on the class:
+        self = me.self;
+        return self.$childEls || me.getClassChildEls(self);
+    },
+
+    getClassChildEls: function (cls) {
+        var me = this,
+            result = cls.$childEls,
+            childEls, i, length, forked, mixin, mixins, name, parts, proto, supr, superMixins;
+
+        if (!result) {
+            // We put the various childEls arrays into parts in the order of superclass,
+            // new mixins and finally from cls. These parts can be null or undefined and
+            // we will skip them later.
+
+            supr = cls.superclass;
+            if (supr) {
+                supr = supr.self;
+                parts = [supr.$childEls || me.getClassChildEls(supr)]; // super+mixins
+                superMixins = supr.prototype.mixins || {};
+            } else {
+                parts = [];
+                superMixins = {};
+            }
+
+            proto = cls.prototype;
+            mixins = proto.mixins; // since we are a mixin, there will be at least us
+            for (name in mixins) {
+                if (mixins.hasOwnProperty(name) && !superMixins.hasOwnProperty(name)) {
+                    mixin = mixins[name].self;
+                    parts.push(mixin.$childEls || me.getClassChildEls(mixin));
+                }
+            }
+
+            parts.push(proto.hasOwnProperty('childEls') && proto.childEls);
+
+            for (i = 0, length = parts.length; i < length; ++i) {
+                childEls = parts[i];
+                if (childEls && childEls.length) {
+                    if (!result) {
+                        result = childEls;
+                    } else {
+                        if (!forked) {
+                            forked = true;
+                            result = result.slice(0);
+                        }
+                        result.push.apply(result, childEls);
+                    }
+                }
+            }
+
+            cls.$childEls = result = (result ? me.prune(result, !forked) : []);
+        }
+
+        return result;
+    },
+
+    prune: function (childEls, shared) {
+        var index = childEls.length,
+            map = {},
+            name;
+
+        while (index--) {
+            name = childEls[index];
+            if (typeof name != 'string') {
+                name = name.name;
+            }
+
+            if (!map[name]) {
+                map[name] = 1;
+            } else {
+                if (shared) {
+                    shared = false;
+                    childEls = childEls.slice(0);
+                }
+                Ext.Array.erase(childEls, index, 1);
+            }
+        }
+
+        return childEls;
+    },
+
+    /**
+     * Removes items in the childEls array based on the return value of a supplied test
+     * function. The function is called with a entry in childEls and if the test function
+     * return true, that entry is removed. If false, that entry is kept.
+     *
+     * @param {Function} testFn The test function.
+     */
+    removeChildEls: function (testFn) {
+        var me = this,
+            old = me.getChildEls(),
+            keepers = (me.childEls = []),
+            n, i, cel;
+
+        for (i = 0, n = old.length; i < n; ++i) {
+            cel = old[i];
+            if (!testFn(cel)) {
+                keepers.push(cel);
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Given a component hierarchy of this:
+ *
+ *      {
+ *          xtype: 'panel',
+ *          id: 'ContainerA',
+ *          layout: 'hbox',
+ *          renderTo: Ext.getBody(),
+ *          items: [
+ *              {
+ *                  id: 'ContainerB',
+ *                  xtype: 'container',
+ *                  items: [
+ *                      { id: 'ComponentA' }
+ *                  ]
+ *              }
+ *          ]
+ *      }
+ *
+ * The rendering of the above proceeds roughly like this:
+ *
+ *  - ContainerA's initComponent calls #render passing the `renderTo` property as the
+ *    container argument.
+ *  - `render` calls the `getRenderTree` method to get a complete {@link Ext.DomHelper} spec.
+ *  - `getRenderTree` fires the "beforerender" event and calls the #beforeRender
+ *    method. Its result is obtained by calling #getElConfig.
+ *  - The #getElConfig method uses the `renderTpl` and its render data as the content
+ *    of the `autoEl` described element.
+ *  - The result of `getRenderTree` is passed to {@link Ext.DomHelper#append}.
+ *  - The `renderTpl` contains calls to render things like docked items, container items
+ *    and raw markup (such as the `html` or `tpl` config properties). These calls are to
+ *    methods added to the {@link Ext.XTemplate} instance by #setupRenderTpl.
+ *  - The #setupRenderTpl method adds methods such as `renderItems`, `renderContent`, etc.
+ *    to the template. These are directed to "doRenderItems", "doRenderContent" etc..
+ *  - The #setupRenderTpl calls traverse from components to their {@link Ext.layout.Layout}
+ *    object.
+ *  - When a container is rendered, it also has a `renderTpl`. This is processed when the
+ *    `renderContainer` method is called in the component's `renderTpl`. This call goes to
+ *    Ext.layout.container.Container#doRenderContainer. This method repeats this
+ *    process for all components in the container.
+ *  - After the top-most component's markup is generated and placed in to the DOM, the next
+ *    step is to link elements to their components and finish calling the component methods
+ *    `onRender` and `afterRender` as well as fire the corresponding events.
+ *  - The first step in this is to call #finishRender. This method descends the
+ *    component hierarchy and calls `onRender` and fires the `render` event. These calls
+ *    are delivered top-down to approximate the timing of these calls/events from previous
+ *    versions.
+ *  - During the pass, the component's `el` is set. Likewise, the `renderSelectors` and
+ *    `childEls` are applied to capture references to the component's elements.
+ *  - These calls are also made on the {@link Ext.layout.container.Container} layout to
+ *    capture its elements. Both of these classes use {@link Ext.util.ElementContainer} to
+ *    handle `childEls` processing.
+ *  - Once this is complete, a similar pass is made by calling #finishAfterRender.
+ *    This call also descends the component hierarchy, but this time the calls are made in
+ *    a bottom-up order to `afterRender`.
+ *
+ * @private
+ */
+Ext.define('Ext.util.Renderable', {
+               
+                         
+      
+
+    frameCls: Ext.baseCSSPrefix + 'frame',
+
+    frameIdRegex: /[\-]frame\d+[TMB][LCR]$/,
+    
+    frameElNames: ['TL','TC','TR','ML','MC','MR','BL','BC','BR'],
+
+    frameTpl: [
+        '{%this.renderDockedItems(out,values,0);%}',
+        '<tpl if="top">',
+            '<tpl if="left"><div id="{fgid}TL" class="{frameCls}-tl {baseCls}-tl {baseCls}-{ui}-tl<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-tl</tpl>{frameElCls}" role="presentation"></tpl>',
+                '<tpl if="right"><div id="{fgid}TR" class="{frameCls}-tr {baseCls}-tr {baseCls}-{ui}-tr<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-tr</tpl>{frameElCls}" role="presentation"></tpl>',
+                    '<div id="{fgid}TC" class="{frameCls}-tc {baseCls}-tc {baseCls}-{ui}-tc<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-tc</tpl>{frameElCls}" role="presentation"></div>',
+                '<tpl if="right"></div></tpl>',
+            '<tpl if="left"></div></tpl>',
+        '</tpl>',
+        '<tpl if="left"><div id="{fgid}ML" class="{frameCls}-ml {baseCls}-ml {baseCls}-{ui}-ml<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-ml</tpl>{frameElCls}" role="presentation"></tpl>',
+            '<tpl if="right"><div id="{fgid}MR" class="{frameCls}-mr {baseCls}-mr {baseCls}-{ui}-mr<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-mr</tpl>{frameElCls}" role="presentation"></tpl>',
+                '<div id="{fgid}MC" class="{frameCls}-mc {baseCls}-mc {baseCls}-{ui}-mc<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-mc</tpl>{frameElCls}" role="presentation">',
+                    '{%this.applyRenderTpl(out, values)%}',
+                '</div>',
+            '<tpl if="right"></div></tpl>',
+        '<tpl if="left"></div></tpl>',
+        '<tpl if="bottom">',
+            '<tpl if="left"><div id="{fgid}BL" class="{frameCls}-bl {baseCls}-bl {baseCls}-{ui}-bl<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-bl</tpl>{frameElCls}" role="presentation"></tpl>',
+                '<tpl if="right"><div id="{fgid}BR" class="{frameCls}-br {baseCls}-br {baseCls}-{ui}-br<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-br</tpl>{frameElCls}" role="presentation"></tpl>',
+                    '<div id="{fgid}BC" class="{frameCls}-bc {baseCls}-bc {baseCls}-{ui}-bc<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-bc</tpl>{frameElCls}" role="presentation"></div>',
+                '<tpl if="right"></div></tpl>',
+            '<tpl if="left"></div></tpl>',
+        '</tpl>',
+        '{%this.renderDockedItems(out,values,1);%}'
+    ],
+
+    frameTableTpl: [
+        '{%this.renderDockedItems(out,values,0);%}',
+        '<table class="', Ext.plainTableCls, '" cellpadding="0"><tbody>',
+            '<tpl if="top">',
+                '<tr>',
+                    '<tpl if="left"><td id="{fgid}TL" class="{frameCls}-tl {baseCls}-tl {baseCls}-{ui}-tl<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-tl</tpl>{frameElCls}" role="presentation"></td></tpl>',
+                    '<td id="{fgid}TC" class="{frameCls}-tc {baseCls}-tc {baseCls}-{ui}-tc<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-tc</tpl>{frameElCls}" role="presentation"></td>',
+                    '<tpl if="right"><td id="{fgid}TR" class="{frameCls}-tr {baseCls}-tr {baseCls}-{ui}-tr<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-tr</tpl>{frameElCls}" role="presentation"></td></tpl>',
+                '</tr>',
+            '</tpl>',
+            '<tr>',
+                '<tpl if="left"><td id="{fgid}ML" class="{frameCls}-ml {baseCls}-ml {baseCls}-{ui}-ml<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-ml</tpl>{frameElCls}" role="presentation"></td></tpl>',
+                '<td id="{fgid}MC" class="{frameCls}-mc {baseCls}-mc {baseCls}-{ui}-mc<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-mc</tpl>{frameElCls}" role="presentation">',
+                    '{%this.applyRenderTpl(out, values)%}',
+                '</td>',
+                '<tpl if="right"><td id="{fgid}MR" class="{frameCls}-mr {baseCls}-mr {baseCls}-{ui}-mr<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-mr</tpl>{frameElCls}" role="presentation"></td></tpl>',
+            '</tr>',
+            '<tpl if="bottom">',
+                '<tr>',
+                    '<tpl if="left"><td id="{fgid}BL" class="{frameCls}-bl {baseCls}-bl {baseCls}-{ui}-bl<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-bl</tpl>{frameElCls}" role="presentation"></td></tpl>',
+                    '<td id="{fgid}BC" class="{frameCls}-bc {baseCls}-bc {baseCls}-{ui}-bc<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-bc</tpl>{frameElCls}" role="presentation"></td>',
+                    '<tpl if="right"><td id="{fgid}BR" class="{frameCls}-br {baseCls}-br {baseCls}-{ui}-br<tpl for="uiCls"> {parent.baseCls}-{parent.ui}-{.}-br</tpl>{frameElCls}" role="presentation"></td></tpl>',
+                '</tr>',
+            '</tpl>',
+        '</tbody></table>',
+        '{%this.renderDockedItems(out,values,1);%}'
+    ],
+
+    /**
+     * Allows addition of behavior after rendering is complete. At this stage the Component’s Element
+     * will have been styled according to the configuration, will have had any configured CSS class
+     * names added, and will be in the configured visibility and the configured enable state.
+     *
+     * @template
+     * @protected
+     */
+    afterRender : function() {
+        var me = this,
+            data = {},
+            protoEl = me.protoEl,
+            target = me.el,
+            item, pre, hide, contentEl;
+
+        me.finishRenderChildren();
+        
+        // We need to do the contentEl here because it depends on the layout items (inner/outerCt)
+        // to be rendered before we can put it in
+        if (me.contentEl) {
+            pre = Ext.baseCSSPrefix;
+            hide = pre + 'hide-';
+            contentEl = Ext.get(me.contentEl);
+            contentEl.removeCls([pre+'hidden', hide+'display', hide+'offsets', hide+'nosize']);
+            me.getContentTarget().appendChild(contentEl.dom);
+        }
+
+        protoEl.writeTo(data);
+        
+        // Here we apply any styles that were set on the protoEl during the rendering phase
+        // A majority of times this will not happen, but we still need to handle it
+        
+        item = data.removed;
+        if (item) {
+            target.removeCls(item);
+        }
+        
+        item = data.cls;
+        if (item.length) {
+            target.addCls(item);
+        }
+        
+        item = data.style;
+        if (data.style) {
+            target.setStyle(item);
+        }
+        
+        me.protoEl = null;
+
+        // If this is the outermost Container, lay it out as soon as it is rendered.
+        if (!me.ownerCt) {
+            me.updateLayout();
+        }
+    },
+
+    afterFirstLayout : function(width, height) {
+        var me = this,
+            x = me.x,
+            y = me.y,
+            hasX,
+            hasY,
+            pos, xy;
+
+        // We only have to set absolute position here if there is no ownerlayout which should take responsibility.
+        // Consider the example of rendered components outside of a viewport - these might need their positions setting.
+        if (!me.ownerLayout) {
+            hasX = Ext.isDefined(x);
+            hasY = Ext.isDefined(y);
+        }
+
+        // For floaters, calculate x and y if they aren't defined by aligning
+        // the sized element to the center of either the container or the ownerCt
+        if (me.floating && (!hasX || !hasY)) {
+            if (me.floatParent) {
+                pos = me.floatParent.getTargetEl().getViewRegion();
+                xy = me.el.getAlignToXY(me.floatParent.getTargetEl(), 'c-c');
+                pos.x = xy[0] - pos.x;
+                pos.y = xy[1] - pos.y;
+            } else {
+                xy = me.el.getAlignToXY(me.container, 'c-c');
+                pos = me.container.translateXY(xy[0], xy[1]);
+            }
+            x = hasX ? x : pos.x;
+            y = hasY ? y : pos.y;
+            hasX = hasY = true;
+        }
+
+        if (hasX || hasY) {
+            me.setPosition(x, y);
+        }
+        me.onBoxReady(width, height);
+    },
+
+    /**
+     * Sets references to elements inside the component. This applies {@link Ext.AbstractComponent#cfg-renderSelectors renderSelectors}
+     * as well as {@link Ext.AbstractComponent#cfg-childEls childEls}.
+     * @private
+     */
+    applyRenderSelectors: function() {
+        var me = this,
+            selectors = me.renderSelectors,
+            el = me.el,
+            dom = el.dom,
+            selector;
+
+        me.applyChildEls(el);
+
+        // We still support renderSelectors. There are a few places in the framework that
+        // need them and they are a documented part of the API. In fact, we support mixing
+        // childEls and renderSelectors (no reason not to).
+        if (selectors) {
+            for (selector in selectors) {
+                if (selectors.hasOwnProperty(selector) && selectors[selector]) {
+                    me[selector] = Ext.get(Ext.DomQuery.selectNode(selectors[selector], dom));
+                }
+            }
+        }
+    },
+
+    beforeRender: function () {
+        var me = this,
+            target = me.getTargetEl(),
+            overflowEl = me.getOverflowEl(),
+            layout = me.getComponentLayout(),
+            // Call the style calculation early which sets the public scrollFlags property
+            overflowStyle = me.getOverflowStyle();
+
+        // Just before rendering, set the frame flag if we are an always-framed component like Window or Tip.
+        me.frame = me.frame || me.alwaysFramed;
+
+        if (!layout.initialized) {
+            layout.initLayout();
+        }
+
+        // Attempt to set overflow style prior to render if the targetEl can be accessed.
+        // If the targetEl does not exist yet, this will take place in finishRender
+        if (overflowEl) {
+            overflowEl.setStyle(overflowStyle);
+            me.overflowStyleSet = true;
+        }
+
+        me.setUI(me.ui);
+
+        if (me.disabled) {
+            // pass silent so the event doesn't fire the first time.
+            me.disable(true);
+        }
+    },
+
+    /**
+     * @private
+     * Called from the selected frame generation template to insert this Component's inner structure inside the framing structure.
+     *
+     * When framing is used, a selected frame generation template is used as the primary template of the #getElConfig instead
+     * of the configured {@link Ext.AbstractComponent#renderTpl renderTpl}. The renderTpl is invoked by this method which is injected into the framing template.
+     */
+    doApplyRenderTpl: function(out, values) {
+        // Careful! This method is bolted on to the frameTpl so all we get for context is
+        // the renderData! The "this" pointer is the frameTpl instance!
+
+        var me = values.$comp,
+            tpl;
+
+        // Don't do this if the component is already rendered:
+        if (!me.rendered) {
+            tpl = me.initRenderTpl();
+            tpl.applyOut(values.renderData, out);
+        }
+    },
+
+    /**
+     * Handles autoRender.
+     * Floating Components may have an ownerCt. If they are asking to be constrained, constrain them within that
+     * ownerCt, and have their z-index managed locally. Floating Components are always rendered to document.body
+     */
+    doAutoRender: function() {
+        var me = this;
+        if (!me.rendered) {
+            if (me.floating) {
+                me.render(document.body);
+            } else {
+                me.render(Ext.isBoolean(me.autoRender) ? Ext.getBody() : me.autoRender);
+            }
+        }
+    },
+
+    doRenderContent: function (out, renderData) {
+        // Careful! This method is bolted on to the renderTpl so all we get for context is
+        // the renderData! The "this" pointer is the renderTpl instance!
+
+        var me = renderData.$comp;
+
+        if (me.html) {
+            Ext.DomHelper.generateMarkup(me.html, out);
+            delete me.html;
+        }
+
+        if (me.tpl) {
+            // Make sure this.tpl is an instantiated XTemplate
+            if (!me.tpl.isTemplate) {
+                me.tpl = new Ext.XTemplate(me.tpl);
+            }
+
+            if (me.data) {
+                //me.tpl[me.tplWriteMode](target, me.data);
+                me.tpl.applyOut(me.data, out);
+                delete me.data;
+            }
+        }
+    },
+
+    doRenderFramingDockedItems: function (out, renderData, after) {
+        // Careful! This method is bolted on to the frameTpl so all we get for context is
+        // the renderData! The "this" pointer is the frameTpl instance!
+
+        var me = renderData.$comp;
+
+        // Most components don't have dockedItems, so check for doRenderDockedItems on the
+        // component (also, don't do this if the component is already rendered):
+        if (!me.rendered && me.doRenderDockedItems) {
+            // The "renderData" property is placed in scope for the renderTpl, but we don't
+            // want to render docked items at that level in addition to the framing level:
+            renderData.renderData.$skipDockedItems = true;
+
+            // doRenderDockedItems requires the $comp property on renderData, but this is
+            // set on the frameTpl's renderData as well:
+            me.doRenderDockedItems.call(this, out, renderData, after);
+        }
+    },
+
+    /**
+     * This method visits the rendered component tree in a "top-down" order. That is, this
+     * code runs on a parent component before running on a child. This method calls the
+     * {@link #onRender} method of each component.
+     * @param {Number} containerIdx The index into the Container items of this Component.
+     *
+     * @private
+     */
+    finishRender: function(containerIdx) {
+        var me = this,
+            tpl, data, el;
+
+        // We are typically called w/me.el==null as a child of some ownerCt that is being
+        // rendered. We are also called by render for a normal component (w/o a configured
+        // me.el). In this case, render sets me.el and me.rendering (indirectly). Lastly
+        // we are also called on a component (like a Viewport) that has a configured me.el
+        // (body for a Viewport) when render is called. In this case, it is not flagged as
+        // "me.rendering" yet becasue it does not produce a renderTree. We use this to know
+        // not to regen the renderTpl.
+
+        if (!me.el || me.$pid) {
+            if (me.container) {
+                el = me.container.getById(me.id, true);
+            } else {
+                el = Ext.getDom(me.id);
+            }
+
+            if (!me.el) {
+                // Typical case: we produced the el during render
+                me.wrapPrimaryEl(el);
+            } else {
+                // We were configured with an el and created a proxy, so now we can swap
+                // the proxy for me.el:
+                delete me.$pid;
+
+                if (!me.el.dom) {
+                    // make sure me.el is an Element
+                    me.wrapPrimaryEl(me.el);
+                }
+                el.parentNode.insertBefore(me.el.dom, el);
+                Ext.removeNode(el); // remove placeholder el
+                // TODO - what about class/style?
+            }
+        } else if (!me.rendering) {
+            // We were configured with an el and then told to render (e.g., Viewport). We
+            // need to generate the proper DOM. Insert first because the layout system
+            // insists that child Component elements indices match the Component indices.
+            tpl = me.initRenderTpl();
+            if (tpl) {
+                data = me.initRenderData();
+                tpl.insertFirst(me.getTargetEl(), data);
+            }
+        }
+        // else we are rendering
+
+        if (!me.container) {
+            // top-level rendered components will already have me.container set up
+            me.container = Ext.get(me.el.dom.parentNode);
+        }
+
+        if (me.ctCls) {
+            me.container.addCls(me.ctCls);
+        }
+
+        // Sets the rendered flag and clears the rendering flag
+        me.onRender(me.container, containerIdx);
+
+        // If we could not access a target protoEl in beforeRender, we have to set the overflow styles here.
+        if (!me.overflowStyleSet) {
+            me.getOverflowEl().setStyle(me.getOverflowStyle());
+        }
+
+        // Tell the encapsulating element to hide itself in the way the Component is configured to hide
+        // This means DISPLAY, VISIBILITY or OFFSETS.
+        me.el.setVisibilityMode(Ext.Element[me.hideMode.toUpperCase()]);
+
+        if (me.overCls) {
+            me.el.hover(me.addOverCls, me.removeOverCls, me);
+        }
+
+        if (me.hasListeners.render) {
+            me.fireEvent('render', me);
+        }
+
+        me.afterRender(); // this can cause a layout
+        if (me.hasListeners.afterrender) {
+            me.fireEvent('afterrender', me);
+        }
+        me.initEvents();
+
+        if (me.hidden) {
+            // Hiding during the render process should not perform any ancillary
+            // actions that the full hide process does; It is not hiding, it begins in a hidden state.'
+            // So just make the element hidden according to the configured hideMode
+            me.el.hide();
+        }
+    },
+
+    finishRenderChildren: function () {
+        var layout = this.getComponentLayout();
+
+        layout.finishRender();
+    },
+
+    getElConfig : function() {
+        var me = this,
+            autoEl = me.autoEl,
+            frameInfo = me.getFrameInfo(),
+            config = {
+                tag: 'div',
+                tpl: frameInfo ? me.initFramingTpl(frameInfo.table) : me.initRenderTpl()
+            },
+            protoEl = me.protoEl,
+            i, frameElNames, len, suffix, frameGenId, frameData;
+
+        me.initStyles(protoEl);
+        protoEl.writeTo(config);
+        protoEl.flush();
+
+        if (Ext.isString(autoEl)) {
+            config.tag = autoEl;
+        } else {
+            Ext.apply(config, autoEl); // harmless if !autoEl
+        }
+
+        // It's important to assign the id here as an autoEl.id could have been (wrongly) applied and this would get things out of sync
+        config.id = me.id;
+
+        if (config.tpl) {
+            // Use the framingTpl as the main content creating template. It will call out to this.applyRenderTpl(out, values)
+            if (frameInfo) {
+                frameElNames = me.frameElNames;
+                len = frameElNames.length;
+
+                config.tplData = frameData = me.getFrameRenderData();
+                frameData.renderData = me.initRenderData();
+                frameGenId = frameData.fgid;
+
+                // Add the childEls for each of the frame elements
+                for (i = 0; i < len; i++) {
+                    suffix = frameElNames[i];
+                    me.addChildEls({ name: 'frame' + suffix, id: frameGenId + suffix });
+                }
+
+                // Panel must have a frameBody
+                me.addChildEls({
+                    name: 'frameBody',
+                    id: frameGenId + 'MC'
+                });
+            } else {
+                config.tplData = me.initRenderData();
+            }
+        }
+
+        return config;
+    },
+
+    // Create the framingTpl from the string.
+    // Poke in a reference to applyRenderTpl(frameInfo, out)
+    initFramingTpl: function(table) {
+        var tpl = this.getFrameTpl(table);
+
+        if (tpl && !tpl.applyRenderTpl) {
+            this.setupFramingTpl(tpl);
+        }
+
+        return tpl;
+    },
+
+    /**
+     * @private
+     * Inject a reference to the function which applies the render template into the framing template. The framing template
+     * wraps the content.
+     */
+    setupFramingTpl: function(frameTpl) {
+        frameTpl.applyRenderTpl = this.doApplyRenderTpl;
+        frameTpl.renderDockedItems = this.doRenderFramingDockedItems;
+    },
+
+    /**
+     * This function takes the position argument passed to onRender and returns a
+     * DOM element that you can use in the insertBefore.
+     * @param {String/Number/Ext.dom.Element/HTMLElement} position Index, element id or element you want
+     * to put this component before.
+     * @return {HTMLElement} DOM element that you can use in the insertBefore
+     */
+    getInsertPosition: function(position) {
+        // Convert the position to an element to insert before
+        if (position !== undefined) {
+            if (Ext.isNumber(position)) {
+                position = this.container.dom.childNodes[position];
+            }
+            else {
+                position = Ext.getDom(position);
+            }
+        }
+
+        return position;
+    },
+
+    getRenderTree: function() {
+        var me = this;
+
+        if (!me.hasListeners.beforerender || me.fireEvent('beforerender', me) !== false) {
+            me.beforeRender();
+
+            // Flag to let the layout's finishRenderItems and afterFinishRenderItems
+            // know which items to process
+            me.rendering = true;
+
+            if (me.el) {
+                // Since we are producing a render tree, we produce a "proxy el" that will
+                // sit in the rendered DOM precisely where me.el belongs. We replace the
+                // proxy el in the finishRender phase.
+                return {
+                    tag: 'div',
+                    id: (me.$pid = Ext.id())
+                };
+            }
+
+            return me.getElConfig();
+        }
+
+        return null;
+    },
+
+    initContainer: function(container) {
+        var me = this;
+
+        // If you render a component specifying the el, we get the container
+        // of the el, and make sure we dont move the el around in the dom
+        // during the render
+        if (!container && me.el) {
+            container = me.el.dom.parentNode;
+            me.allowDomMove = false;
+        }
+        me.container = container.dom ? container : Ext.get(container);
+
+        return me.container;
+    },
+
+    /**
+     * Initialized the renderData to be used when rendering the renderTpl.
+     * @return {Object} Object with keys and values that are going to be applied to the renderTpl
+     * @protected
+     */
+    initRenderData: function() {
+        var me = this;
+
+        return Ext.apply({
+            $comp: me,
+            id: me.id,
+            ui: me.ui,
+            uiCls: me.uiCls,
+            baseCls: me.baseCls,
+            componentCls: me.componentCls,
+            frame: me.frame,
+            childElCls: '' // overridden in RTL
+        }, me.renderData);
+    },
+
+    /**
+     * Initializes the renderTpl.
+     * @return {Ext.XTemplate} The renderTpl XTemplate instance.
+     * @private
+     */
+    initRenderTpl: function() {
+        var tpl = this.getTpl('renderTpl');
+
+        if (tpl && !tpl.renderContent) {
+            this.setupRenderTpl(tpl);
+        }
+
+        return tpl;
+    },
+
+    /**
+     * Template method called when this Component's DOM structure is created.
+     *
+     * At this point, this Component's (and all descendants') DOM structure *exists* but it has not
+     * been layed out (positioned and sized).
+     *
+     * Subclasses which override this to gain access to the structure at render time should
+     * call the parent class's method before attempting to access any child elements of the Component.
+     *
+     * @param {Ext.core.Element} parentNode The parent Element in which this Component's encapsulating element is contained.
+     * @param {Number} containerIdx The index within the parent Container's child collection of this Component.
+     *
+     * @template
+     * @protected
+     */
+    onRender: function(parentNode, containerIdx) {
+        var me = this,
+            x = me.x,
+            y = me.y,
+            lastBox = null,
+            width, height,
+            el = me.el;
+
+        me.applyRenderSelectors();
+
+        // Flag set on getRenderTree to flag to the layout's postprocessing routine that
+        // the Component is in the process of being rendered and needs postprocessing.
+        me.rendering = null;
+
+        me.rendered = true;
+
+        // We need to remember these to avoid writing them during the initial layout:
+        if (x != null) {
+            lastBox = {x:x};
+        }
+        if (y != null) {
+            (lastBox = lastBox || {}).y = y;
+        }
+        // Framed components need their width/height to apply to the frame, which is
+        // best handled in layout at present.
+        // If we're using the content box model, we also cannot assign initial sizes since we do not know the border widths to subtract
+        if (!me.getFrameInfo() && Ext.isBorderBox) {
+            width = me.width;
+            height = me.height;
+
+            if (typeof width === 'number') {
+                lastBox = lastBox || {};
+                lastBox.width = width;
+            }
+            if (typeof height === 'number') {
+                lastBox = lastBox || {};
+                lastBox.height = height;
+            }
+        }
+
+        me.lastBox = el.lastBox = lastBox;
+    },
+
+    /**
+     * Renders the Component into the passed HTML element.
+     * 
+     * **If you are using a {@link Ext.container.Container Container} object to house this
+     * Component, then do not use the render method.**
+     *
+     * A Container's child Components are rendered by that Container's
+     * {@link Ext.container.Container#layout layout} manager when the Container is first rendered.
+     *
+     * If the Container is already rendered when a new child Component is added, you may need to call
+     * the Container's {@link Ext.container.Container#doLayout doLayout} to refresh the view which
+     * causes any unrendered child Components to be rendered. This is required so that you can add
+     * multiple child components if needed while only refreshing the layout once.
+     *
+     * When creating complex UIs, it is important to remember that sizing and positioning
+     * of child items is the responsibility of the Container's {@link Ext.container.Container#layout layout}
+     * manager.  If you expect child items to be sized in response to user interactions, you must
+     * configure the Container with a layout manager which creates and manages the type of layout you
+     * have in mind.
+     *
+     * **Omitting the Container's {@link Ext.Container#layout layout} config means that a basic
+     * layout manager is used which does nothing but render child components sequentially into the
+     * Container. No sizing or positioning will be performed in this situation.**
+     *
+     * @param {Ext.Element/HTMLElement/String} [container] The element this Component should be
+     * rendered into. If it is being created from existing markup, this should be omitted.
+     * @param {String/Number} [position] The element ID or DOM node index within the container **before**
+     * which this component will be inserted (defaults to appending to the end of the container)
+     */
+    render: function(container, position) {
+        var me = this,
+            el = me.el && (me.el = Ext.get(me.el)), // ensure me.el is wrapped
+            vetoed,
+            tree,
+            nextSibling;
+
+        Ext.suspendLayouts();
+
+        container = me.initContainer(container);
+
+        nextSibling = me.getInsertPosition(position);
+
+        if (!el) {
+            tree = me.getRenderTree();
+            if (me.ownerLayout && me.ownerLayout.transformItemRenderTree) {
+                tree = me.ownerLayout.transformItemRenderTree(tree);
+            }
+
+            // tree will be null if a beforerender listener returns false
+            if (tree) {
+                if (nextSibling) {
+                    el = Ext.DomHelper.insertBefore(nextSibling, tree);
+                } else {
+                    el = Ext.DomHelper.append(container, tree);
+                }
+
+                me.wrapPrimaryEl(el);
+            }
+        } else {
+            if (!me.hasListeners.beforerender || me.fireEvent('beforerender', me) !== false) {
+                me.beforeRender();
+                // Set configured styles on pre-rendered Component's element
+                me.initStyles(el);
+                if (me.allowDomMove !== false) {
+                    if (nextSibling) {
+                        container.dom.insertBefore(el.dom, nextSibling);
+                    } else {
+                        container.dom.appendChild(el.dom);
+                    }
+                }
+            } else {
+                vetoed = true;
+            }
+        }
+
+        if (el && !vetoed) {
+            me.finishRender(position);
+        }
+
+        Ext.resumeLayouts(!me.hidden && !container.isDetachedBody);
+    },
+
+    /**
+     * Ensures that this component is attached to `document.body`. If the component was
+     * rendered to {@link Ext#getDetachedBody}, then it will be appended to `document.body`.
+     * Any configured position is also restored.
+     * @param {Boolean} [runLayout=false] True to run the component's layout.
+     */
+    ensureAttachedToBody: function (runLayout) {
+        var comp = this,
+            body;
+
+        while (comp.ownerCt) {
+            comp = comp.ownerCt;
+        }
+
+        if (comp.container.isDetachedBody) {
+            comp.container = body = Ext.getBody();
+            body.appendChild(comp.el.dom);
+            if (runLayout) {
+                comp.updateLayout();
+            }
+            if (typeof comp.x == 'number' || typeof comp.y == 'number') {
+                comp.setPosition(comp.x, comp.y);
+            }
+        }
+    },
+
+    setupRenderTpl: function (renderTpl) {
+        renderTpl.renderBody = renderTpl.renderContent = this.doRenderContent;
+    },
+
+    wrapPrimaryEl: function (dom) {
+        this.el = Ext.get(dom, true);
+    },
+
+    /**
+     * @private
+     */
+    initFrame : function() {
+        if (Ext.supports.CSS3BorderRadius || !this.frame) {
+            return;
+        }
+
+        var me = this,
+            frameInfo = me.getFrameInfo(),
+            frameTpl, frameGenId,
+            frameElNames = me.frameElNames,
+            len = frameElNames.length,
+            i, frameData, suffix;
+
+        if (frameInfo) {
+            frameTpl = me.getFrameTpl(frameInfo.table);
+            frameData = me.getFrameRenderData();
+            frameGenId = frameData.fgid;
+
+            // Here we render the frameTpl to this component. This inserts the 9point div
+            // or the table framing.
+            frameTpl.insertFirst(me.el, frameData);
+
+            // The frameBody is returned in getTargetEl, so that layouts render items to
+            // the correct target.
+            me.frameBody = me.el.down('.' + me.frameCls + '-mc');
+
+            // Clean out the childEls for the old frame elements (the majority of the els)
+            me.removeChildEls(function (c) {
+                return c.id && me.frameIdRegex.test(c.id);
+            });
+
+            // Grab references to the childEls for each of the new frame elements
+            for (i = 0; i < len; i++) {
+                suffix = frameElNames[i];
+                me['frame' + suffix] = me.el.getById(frameGenId + suffix);
+            }
+        }
+    },
+
+    getFrameRenderData: function () {
+        var me = this,
+            // we are only called if framing so this has already been determined:
+            frameInfo = me.frameSize,
+            frameGenId = (me.frameGenId || 0) + 1;
+
+        // since we render id's into the markup and id's NEED to be unique, we have a
+        // simple strategy for numbering their generations.
+        me.frameGenId = frameGenId;
+
+        return {
+            $comp:      me,
+            fgid:       me.id + '-frame' + frameGenId,
+            ui:         me.ui,
+            uiCls:      me.uiCls,
+            frameCls:   me.frameCls,
+            baseCls:    me.baseCls,
+            top:        !!frameInfo.top,
+            left:       !!frameInfo.left,
+            right:      !!frameInfo.right,
+            bottom:     !!frameInfo.bottom,
+            // can be optionally set by a subclass or override to be an extra class to
+            // be applied to all framing elements (used by RTL)
+            frameElCls: ''
+        };
+    },
+
+    updateFrame: function() {
+        if (Ext.supports.CSS3BorderRadius || !this.frame) {
+            return;
+        }
+
+        var me = this,
+            wasTable = me.frameSize && me.frameSize.table,
+            oldFrameTL = me.frameTL,
+            oldFrameBL = me.frameBL,
+            oldFrameML = me.frameML,
+            oldFrameMC = me.frameMC,
+            newMCClassName;
+
+        me.initFrame();
+
+        if (oldFrameMC) {
+            if (me.frame) {
+
+                // Store the class names set on the new MC
+                newMCClassName = me.frameMC.dom.className;
+
+                // Framing elements have been selected in initFrame, no need to run applyRenderSelectors
+                // Replace the new mc with the old mc
+                oldFrameMC.insertAfter(me.frameMC);
+                me.frameMC.remove();
+
+                // Restore the reference to the old frame mc as the framebody
+                me.frameBody = me.frameMC = oldFrameMC;
+
+                // Apply the new mc classes to the old mc element
+                oldFrameMC.dom.className = newMCClassName;
+
+                // Remove the old framing
+                if (wasTable) {
+                    me.el.query('> table')[1].remove();
+                }
+                else {
+                    if (oldFrameTL) {
+                        oldFrameTL.remove();
+                    }
+                    if (oldFrameBL) {
+                        oldFrameBL.remove();
+                    }
+                    if (oldFrameML) {
+                        oldFrameML.remove();
+                    }
+                }
+            }
+        }
+        else if (me.frame) {
+            me.applyRenderSelectors();
+        }
+    },
+
+    /**
+     * @private
+     * On render, reads an encoded style attribute, "filter" from the style of this Component's element.
+     * This information is memoized based upon the CSS class name of this Component's element.
+     * Because child Components are rendered as textual HTML as part of the topmost Container, a dummy div is inserted
+     * into the document to receive the document element's CSS class name, and therefore style attributes.
+     */
+    getFrameInfo: function() {
+        // If native framing can be used, or this component is not going to be framed, then do not attempt to read CSS framing info.
+        if (Ext.supports.CSS3BorderRadius || !this.frame) {
+            return false;
+        }
+
+        var me = this,
+            frameInfoCache = me.frameInfoCache,
+            cls = me.getFramingInfoCls() + '-frameInfo',
+            frameInfo = frameInfoCache[cls],
+            max = Math.max,
+            styleEl, match, info, frameTop, frameRight, frameBottom, frameLeft,
+            borderWidthT, borderWidthR, borderWidthB, borderWidthL,
+            paddingT, paddingR, paddingB, paddingL,
+            borderRadiusTL, borderRadiusTR, borderRadiusBR, borderRadiusBL;
+
+        if (frameInfo == null) {
+            // Get the singleton frame style proxy with our el class name stamped into it.
+            styleEl = Ext.fly(me.getStyleProxy(cls), 'frame-style-el');
+            info = styleEl.getStyle('font-family');
+
+            if (info) {
+                // The framing data is encoded as
+                // 
+                //         D=div|T=table
+                //         |   H=horz|V=vert
+                //         |   |
+                //         |   |
+                //        [DT][HV]-[T-R-B-L]-[T-R-B-L]-[T-R-B-L]
+                //                /       /  |       |  \      \
+                //              /        /   |       |   \      \
+                //            /         /   /         \   \      \
+                //          /          /    border-width   \      \
+                //        border-radius                      padding
+                //
+                // The first 2 chars hold the div/table and horizontal/vertical flags.
+                // The 3 sets of TRBL 4-tuples are the CSS3 values for border-radius,
+                // border-width and padding, respectively.
+                //
+                info = info.split('-');
+                
+                borderRadiusTL = parseInt(info[1], 10);
+                borderRadiusTR = parseInt(info[2], 10);
+                borderRadiusBR = parseInt(info[3], 10);
+                borderRadiusBL = parseInt(info[4], 10);
+                borderWidthT   = parseInt(info[5], 10);
+                borderWidthR   = parseInt(info[6], 10);
+                borderWidthB   = parseInt(info[7], 10);
+                borderWidthL   = parseInt(info[8], 10);
+                paddingT       = parseInt(info[9], 10);
+                paddingR       = parseInt(info[10], 10);
+                paddingB       = parseInt(info[11], 10);
+                paddingL       = parseInt(info[12], 10);
+
+                // This calculation should follow ext-theme-base/etc/mixins/frame.css
+                // with respect to the CSS3 equivalent formulation:
+                frameTop    = max(borderWidthT, max(borderRadiusTL, borderRadiusTR));
+                frameRight  = max(borderWidthR, max(borderRadiusTR, borderRadiusBR));
+                frameBottom = max(borderWidthB, max(borderRadiusBL, borderRadiusBR));
+                frameLeft   = max(borderWidthL, max(borderRadiusTL, borderRadiusBL));
+
+                frameInfo = {
+                    table: info[0].charAt(0) === 't',
+                    vertical: info[0].charAt(1) === 'v',
+
+                    top: frameTop,
+                    right: frameRight,
+                    bottom: frameBottom,
+                    left: frameLeft,
+
+                    width: frameLeft + frameRight,
+                    height: frameTop + frameBottom,
+
+                    maxWidth: max(frameTop, frameRight, frameBottom, frameLeft),
+
+                    border: {
+                        top:    borderWidthT,
+                        right:  borderWidthR,
+                        bottom: borderWidthB,
+                        left:   borderWidthL,
+                        width:  borderWidthL + borderWidthR,
+                        height: borderWidthT + borderWidthB
+                    },
+                    padding: {
+                        top:    paddingT,
+                        right:  paddingR,
+                        bottom: paddingB,
+                        left:   paddingL,
+                        width:  paddingL + paddingR,
+                        height: paddingT + paddingB
+                    },
+                    radius: {
+                        tl: borderRadiusTL,
+                        tr: borderRadiusTR,
+                        br: borderRadiusBR,
+                        bl: borderRadiusBL
+                    }
+                };
+            } else {
+                frameInfo = false;
+            }
+
+            // This happens when you set frame: true explicitly without using the x-frame mixin in sass.
+            // This way IE can't figure out what sizes to use and thus framing can't work.
+            if (me.frame === true && !frameInfo) {
+                Ext.log.error('You have set frame: true explicity on this component (' + me.getXType() + ') and it ' +
+                        'does not have any framing defined in the CSS template. In this case IE cannot figure out ' +
+                        'what sizes to use and thus framing on this component will be disabled.');
+            }
+
+            frameInfoCache[cls] = frameInfo;
+        }
+
+        me.frame = !!frameInfo;
+        me.frameSize = frameInfo;
+
+        return frameInfo;
+    },
+    
+    getFramingInfoCls: function(){
+        return this.baseCls + '-' + this.ui;
+    },
+
+    /**
+     * @private
+     * Returns an offscreen div with the same class name as the element this is being rendered.
+     * This is because child item rendering takes place in a detached div which, being not
+     * part of the document, has no styling.
+     */
+    getStyleProxy: function(cls) {
+        var result = this.styleProxyEl || (Ext.AbstractComponent.prototype.styleProxyEl = Ext.getBody().createChild({
+                style: {
+                    position: 'absolute',
+                    top: '-10000px'
+                }
+            }, null, true));
+
+        result.className = cls;
+        return result;
+    },
+
+    /**
+     * @private
+     */
+    getFrameTpl : function(table) {
+        return this.getTpl(table ? 'frameTableTpl' : 'frameTpl');
+    },
+
+    // Cache the frame information object so as not to cause style recalculations
+    frameInfoCache: {}
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.state.Provider
+ * <p>Abstract base class for state provider implementations. The provider is responsible
+ * for setting values  and extracting values to/from the underlying storage source. The 
+ * storage source can vary and the details should be implemented in a subclass. For example
+ * a provider could use a server side database or the browser localstorage where supported.</p>
+ *
+ * <p>This class provides methods for encoding and decoding <b>typed</b> variables including 
+ * dates and defines the Provider interface. By default these methods put the value and the
+ * type information into a delimited string that can be stored. These should be overridden in 
+ * a subclass if you want to change the format of the encoded value and subsequent decoding.</p>
+ */
+Ext.define('Ext.state.Provider', {
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+    
+    /**
+     * @cfg {String} prefix A string to prefix to items stored in the underlying state store. 
+     * Defaults to <tt>'ext-'</tt>
+     */
+    prefix: 'ext-',
+    
+    constructor : function(config){
+        config = config || {};
+        var me = this;
+        Ext.apply(me, config);
+        /**
+         * @event statechange
+         * Fires when a state change occurs.
+         * @param {Ext.state.Provider} this This state provider
+         * @param {String} key The state key which was changed
+         * @param {String} value The encoded value for the state
+         */
+        me.addEvents("statechange");
+        me.state = {};
+        me.mixins.observable.constructor.call(me);
+    },
+    
+    /**
+     * Returns the current value for a key
+     * @param {String} name The key name
+     * @param {Object} defaultValue A default value to return if the key's value is not found
+     * @return {Object} The state data
+     */
+    get : function(name, defaultValue){
+        return typeof this.state[name] == "undefined" ?
+            defaultValue : this.state[name];
+    },
+
+    /**
+     * Clears a value from the state
+     * @param {String} name The key name
+     */
+    clear : function(name){
+        var me = this;
+        delete me.state[name];
+        me.fireEvent("statechange", me, name, null);
+    },
+
+    /**
+     * Sets the value for a key
+     * @param {String} name The key name
+     * @param {Object} value The value to set
+     */
+    set : function(name, value){
+        var me = this;
+        me.state[name] = value;
+        me.fireEvent("statechange", me, name, value);
+    },
+
+    /**
+     * Decodes a string previously encoded with {@link #encodeValue}.
+     * @param {String} value The value to decode
+     * @return {Object} The decoded value
+     */
+    decodeValue : function(value){
+
+        // a -> Array
+        // n -> Number
+        // d -> Date
+        // b -> Boolean
+        // s -> String
+        // o -> Object
+        // -> Empty (null)
+
+        var me = this,
+            re = /^(a|n|d|b|s|o|e)\:(.*)$/,
+            matches = re.exec(unescape(value)),
+            all,
+            type,
+            keyValue,
+            values,
+            vLen,
+            v;
+            
+        if(!matches || !matches[1]){
+            return; // non state
+        }
+        
+        type = matches[1];
+        value = matches[2];
+        switch (type) {
+            case 'e':
+                return null;
+            case 'n':
+                return parseFloat(value);
+            case 'd':
+                return new Date(Date.parse(value));
+            case 'b':
+                return (value == '1');
+            case 'a':
+                all = [];
+                if(value != ''){
+                    values = value.split('^');
+                    vLen   = values.length;
+
+                    for (v = 0; v < vLen; v++) {
+                        value = values[v];
+                        all.push(me.decodeValue(value));
+                    }
+                }
+                return all;
+           case 'o':
+                all = {};
+                if(value != ''){
+                    values = value.split('^');
+                    vLen   = values.length;
+
+                    for (v = 0; v < vLen; v++) {
+                        value = values[v];
+                        keyValue         = value.split('=');
+                        all[keyValue[0]] = me.decodeValue(keyValue[1]);
+                    }
+                }
+                return all;
+           default:
+                return value;
+        }
+    },
+
+    /**
+     * Encodes a value including type information.  Decode with {@link #decodeValue}.
+     * @param {Object} value The value to encode
+     * @return {String} The encoded value
+     */
+    encodeValue : function(value){
+        var flat = '',
+            i = 0,
+            enc,
+            len,
+            key;
+            
+        if (value == null) {
+            return 'e:1';    
+        } else if(typeof value == 'number') {
+            enc = 'n:' + value;
+        } else if(typeof value == 'boolean') {
+            enc = 'b:' + (value ? '1' : '0');
+        } else if(Ext.isDate(value)) {
+            enc = 'd:' + value.toGMTString();
+        } else if(Ext.isArray(value)) {
+            for (len = value.length; i < len; i++) {
+                flat += this.encodeValue(value[i]);
+                if (i != len - 1) {
+                    flat += '^';
+                }
+            }
+            enc = 'a:' + flat;
+        } else if (typeof value == 'object') {
+            for (key in value) {
+                if (typeof value[key] != 'function' && value[key] !== undefined) {
+                    flat += key + '=' + this.encodeValue(value[key]) + '^';
+                }
+            }
+            enc = 'o:' + flat.substring(0, flat.length-1);
+        } else {
+            enc = 's:' + value;
+        }
+        return escape(enc);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.state.Manager
+ * This is the global state manager. By default all components that are "state aware" check this class
+ * for state information if you don't pass them a custom state provider. In order for this class
+ * to be useful, it must be initialized with a provider when your application initializes. Example usage:
+ <pre><code>
+// in your initialization function
+init : function(){
+   Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
+}
+ </code></pre>
+ * This class passes on calls from components to the underlying {@link Ext.state.Provider} so that
+ * there is a common interface that can be used without needing to refer to a specific provider instance
+ * in every component.
+ * @singleton
+ * @docauthor Evan Trimboli <evan at sencha.com>
+ */
+Ext.define('Ext.state.Manager', {
+    singleton: true,
+                                     
+    constructor: function() {
+        this.provider = new Ext.state.Provider();
+    },
+    
+    
+    /**
+     * Configures the default state provider for your application
+     * @param {Ext.state.Provider} stateProvider The state provider to set
+     */
+    setProvider : function(stateProvider){
+        this.provider = stateProvider;
+    },
+
+    /**
+     * Returns the current value for a key
+     * @param {String} name The key name
+     * @param {Object} defaultValue The default value to return if the key lookup does not match
+     * @return {Object} The state data
+     */
+    get : function(key, defaultValue){
+        return this.provider.get(key, defaultValue);
+    },
+
+    /**
+     * Sets the value for a key
+     * @param {String} name The key name
+     * @param {Object} value The state data
+     */
+     set : function(key, value){
+        this.provider.set(key, value);
+    },
+
+    /**
+     * Clears a value from the state
+     * @param {String} name The key name
+     */
+    clear : function(key){
+        this.provider.clear(key);
+    },
+
+    /**
+     * Gets the currently configured state provider
+     * @return {Ext.state.Provider} The state provider
+     */
+    getProvider : function(){
+        return this.provider;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.state.Stateful
+ * A mixin for being able to save the state of an object to an underlying
+ * {@link Ext.state.Provider}.
+ */
+Ext.define('Ext.state.Stateful', {
+
+    /* Begin Definitions */
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+                                    
+
+    /* End Definitions */
+
+    /**
+     * @cfg {Boolean} stateful
+     * A flag which causes the object to attempt to restore the state of
+     * internal properties from a saved state on startup. The object must have
+     * a {@link #stateId} for state to be managed.
+     * 
+     * Auto-generated ids are not guaranteed to be stable across page loads and
+     * cannot be relied upon to save and restore the same state for a object.
+     *
+     * For state saving to work, the state manager's provider must have been
+     * set to an implementation of {@link Ext.state.Provider} which overrides the
+     * {@link Ext.state.Provider#set set} and {@link Ext.state.Provider#get get}
+     * methods to save and recall name/value pairs. A built-in implementation,
+     * {@link Ext.state.CookieProvider} is available.
+     * 
+     * To set the state provider for the current page:
+     * 
+     *    Ext.state.Manager.setProvider(new Ext.state.CookieProvider({
+     *        expires: new Date(new Date().getTime()+(1000*60*60*24*7)), //7 days from now
+     *    }));
+     *
+     * A stateful object attempts to save state when one of the events
+     * listed in the {@link #stateEvents} configuration fires.
+     * 
+     * To save state, a stateful object first serializes its state by
+     * calling *{@link #getState}*.
+     * 
+     * The Component base class implements {@link #getState} to save its width and height within the state
+     * only if they were initially configured, and have changed from the configured value.
+     * 
+     * The Panel class saves its collapsed state in addition to that.
+     * 
+     * The Grid class saves its column state in addition to its superclass state.
+     * 
+     * If there is more application state to be save, the developer must provide an implementation which
+     * first calls the superclass method to inherit the above behaviour, and then injects new properties
+     * into the returned object.
+     * 
+     * The value yielded by getState is passed to {@link Ext.state.Manager#set}
+     * which uses the configured {@link Ext.state.Provider} to save the object
+     * keyed by the {@link #stateId}.
+     * 
+     * During construction, a stateful object attempts to *restore* its state by calling
+     * {@link Ext.state.Manager#get} passing the {@link #stateId}
+     * 
+     * The resulting object is passed to {@link #applyState}*. The default implementation of
+     * {@link #applyState} simply copies properties into the object, but a developer may
+     * override this to support restoration of more complex application state.
+     * 
+     * You can perform extra processing on state save and restore by attaching
+     * handlers to the {@link #beforestaterestore}, {@link #staterestore},
+     * {@link #beforestatesave} and {@link #statesave} events.
+     */
+    stateful: false,
+
+    /**
+     * @cfg {String} stateId
+     * The unique id for this object to use for state management purposes.
+     * <p>See {@link #stateful} for an explanation of saving and restoring state.</p>
+     */
+
+    /**
+     * @cfg {String[]} stateEvents
+     * <p>An array of events that, when fired, should trigger this object to
+     * save its state. Defaults to none. <code>stateEvents</code> may be any type
+     * of event supported by this object, including browser or custom events
+     * (e.g., <tt>['click', 'customerchange']</tt>).</p>
+     * <p>See <code>{@link #stateful}</code> for an explanation of saving and
+     * restoring object state.</p>
+     */
+
+    /**
+     * @cfg {Number} saveDelay
+     * A buffer to be applied if many state events are fired within a short period.
+     */
+    saveDelay: 100,
+
+    constructor: function(config) {
+        var me = this;
+
+        config = config || {};
+        if (config.stateful !== undefined) {
+            me.stateful = config.stateful;
+        }
+        if (config.saveDelay !== undefined) {
+            me.saveDelay = config.saveDelay;
+        }
+        me.stateId = me.stateId || config.stateId;
+
+        if (!me.stateEvents) {
+            me.stateEvents = [];
+        }
+        if (config.stateEvents) {
+            me.stateEvents.concat(config.stateEvents);
+        }
+        this.addEvents(
+            /**
+             * @event beforestaterestore
+             * Fires before the state of the object is restored. Return false from an event handler to stop the restore.
+             * @param {Ext.state.Stateful} this
+             * @param {Object} state The hash of state values returned from the StateProvider. If this
+             * event is not vetoed, then the state object is passed to <b><tt>applyState</tt></b>. By default,
+             * that simply copies property values into this object. The method maybe overriden to
+             * provide custom state restoration.
+             */
+            'beforestaterestore',
+
+            /**
+             * @event staterestore
+             * Fires after the state of the object is restored.
+             * @param {Ext.state.Stateful} this
+             * @param {Object} state The hash of state values returned from the StateProvider. This is passed
+             * to <b><tt>applyState</tt></b>. By default, that simply copies property values into this
+             * object. The method maybe overriden to provide custom state restoration.
+             */
+            'staterestore',
+
+            /**
+             * @event beforestatesave
+             * Fires before the state of the object is saved to the configured state provider. Return false to stop the save.
+             * @param {Ext.state.Stateful} this
+             * @param {Object} state The hash of state values. This is determined by calling
+             * <b><tt>getState()</tt></b> on the object. This method must be provided by the
+             * developer to return whetever representation of state is required, by default, Ext.state.Stateful
+             * has a null implementation.
+             */
+            'beforestatesave',
+
+            /**
+             * @event statesave
+             * Fires after the state of the object is saved to the configured state provider.
+             * @param {Ext.state.Stateful} this
+             * @param {Object} state The hash of state values. This is determined by calling
+             * <b><tt>getState()</tt></b> on the object. This method must be provided by the
+             * developer to return whetever representation of state is required, by default, Ext.state.Stateful
+             * has a null implementation.
+             */
+            'statesave'
+        );
+        me.mixins.observable.constructor.call(me);
+
+        if (me.stateful !== false) {
+            me.addStateEvents(me.stateEvents);
+            me.initState();
+        }
+    },
+
+    /**
+     * Add events that will trigger the state to be saved. If the first argument is an
+     * array, each element of that array is the name of a state event. Otherwise, each
+     * argument passed to this method is the name of a state event.
+     *
+     * @param {String/String[]} events The event name or an array of event names.
+     */
+    addStateEvents: function (events) {
+        var me = this,
+            i, event, stateEventsByName;
+
+        if (me.stateful && me.getStateId()) {
+            if (typeof events == 'string') {
+                events = Array.prototype.slice.call(arguments, 0);
+            }
+
+            stateEventsByName = me.stateEventsByName || (me.stateEventsByName = {});
+
+            for (i = events.length; i--; ) {
+                event = events[i];
+
+                if (!stateEventsByName[event]) {
+                    stateEventsByName[event] = 1;
+                    me.on(event, me.onStateChange, me);
+                }
+            }
+        }
+    },
+
+    /**
+     * This method is called when any of the {@link #stateEvents} are fired.
+     * @private
+     */
+    onStateChange: function(){
+        var me = this,
+            delay = me.saveDelay,
+            statics, runner;
+
+        if (!me.stateful) {
+            return;
+        }
+
+        if (delay) {
+            if (!me.stateTask) {
+                statics = Ext.state.Stateful;
+                runner = statics.runner || (statics.runner = new Ext.util.TaskRunner());
+
+                me.stateTask = runner.newTask({
+                    run: me.saveState,
+                    scope: me,
+                    interval: delay,
+                    repeat: 1
+                });
+            }
+
+            me.stateTask.start();
+        } else {
+            me.saveState();
+        }
+    },
+
+    /**
+     * Saves the state of the object to the persistence store.
+     */
+    saveState: function() {
+        var me = this,
+            id = me.stateful && me.getStateId(),
+            hasListeners = me.hasListeners,
+            state;
+
+        if (id) {
+            state = me.getState() || {};    //pass along for custom interactions
+            if (!hasListeners.beforestatesave || me.fireEvent('beforestatesave', me, state) !== false) {
+                Ext.state.Manager.set(id, state);
+                if (hasListeners.statesave) {
+                    me.fireEvent('statesave', me, state);
+                }
+            }
+        }
+    },
+
+    /**
+     * Gets the current state of the object. By default this function returns null,
+     * it should be overridden in subclasses to implement methods for getting the state.
+     * @return {Object} The current state
+     */
+    getState: function(){
+        return null;
+    },
+
+    /**
+     * Applies the state to the object. This should be overridden in subclasses to do
+     * more complex state operations. By default it applies the state properties onto
+     * the current object.
+     * @param {Object} state The state
+     */
+    applyState: function(state) {
+        if (state) {
+            Ext.apply(this, state);
+        }
+    },
+
+    /**
+     * Gets the state id for this object.
+     * @return {String} The 'stateId' or the implicit 'id' specified by component configuration.
+     * @private
+     */
+    getStateId: function() {
+        var me = this;
+        return me.stateId || (me.autoGenId ? null : me.id);
+    },
+
+    /**
+     * Initializes the state of the object upon construction.
+     * @private
+     */
+    initState: function(){
+        var me = this,
+            id = me.stateful && me.getStateId(),
+            hasListeners = me.hasListeners,
+            state;
+
+        if (id) {
+            state = Ext.state.Manager.get(id);
+            if (state) {
+                state = Ext.apply({}, state);
+                if (!hasListeners.beforestaterestore || me.fireEvent('beforestaterestore', me, state) !== false) {
+                    me.applyState(state);
+                    if (hasListeners.staterestore) {
+                        me.fireEvent('staterestore', me, state);
+                    }
+                }
+            }
+        }
+    },
+
+    /**
+     * Conditionally saves a single property from this object to the given state object.
+     * The idea is to only save state which has changed from the initial state so that
+     * current software settings do not override future software settings. Only those
+     * values that are user-changed state should be saved.
+     *
+     * @param {String} propName The name of the property to save.
+     * @param {Object} state The state object in to which to save the property.
+     * @param {String} stateName (optional) The name to use for the property in state.
+     * @return {Boolean} True if the property was saved, false if not.
+     */
+    savePropToState: function (propName, state, stateName) {
+        var me = this,
+            value = me[propName],
+            config = me.initialConfig;
+
+        if (me.hasOwnProperty(propName)) {
+            if (!config || config[propName] !== value) {
+                if (state) {
+                    state[stateName || propName] = value;
+                }
+                return true;
+            }
+        }
+        return false;
+    },
+
+    /**
+     * Gathers additional named properties of the instance and adds their current values
+     * to the passed state object.
+     * @param {String/String[]} propNames The name (or array of names) of the property to save.
+     * @param {Object} state The state object in to which to save the property values.
+     * @return {Object} state
+     */
+    savePropsToState: function (propNames, state) {
+        var me = this,
+            i, n;
+
+        if (typeof propNames == 'string') {
+            me.savePropToState(propNames, state);
+        } else {
+            for (i = 0, n = propNames.length; i < n; ++i) {
+                me.savePropToState(propNames[i], state);
+            }
+        }
+
+        return state;
+    },
+
+    /**
+     * Destroys this stateful object.
+     */
+    destroy: function(){
+        var me = this,
+            task = me.stateTask;
+
+        if (task) {
+            task.destroy();
+            me.stateTask = null;
+        }
+
+        me.clearListeners();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+
+/**
+ * An abstract base class which provides shared methods for Components across the Sencha product line.
+ *
+ * Please refer to sub class's documentation.
+ * @private
+ */
+Ext.define('Ext.AbstractComponent', {
+
+    /* Begin Definitions */
+               
+                             
+                               
+                                
+                                   
+                           
+      
+
+    mixins: {
+        positionable:  Ext.util.Positionable ,
+        observable:  Ext.util.Observable ,
+        animate:  Ext.util.Animate ,
+        elementCt:  Ext.util.ElementContainer ,
+        renderable:  Ext.util.Renderable ,
+        state:  Ext.state.Stateful 
+    },
+
+    // The "uses" property specifies class which are used in an instantiated AbstractComponent.
+    // They do *not* have to be loaded before this class may be defined - that is what "requires" is for.
+           
+                            
+                      
+                        
+                        
+                              
+                           
+                             
+                            
+                                    
+                       
+                           
+      
+
+    statics: {
+        AUTO_ID: 1000,
+
+        pendingLayouts: null,
+
+        layoutSuspendCount: 0,
+
+        /**
+         * Cancels layout of a component.
+         * @param {Ext.Component} comp
+         */
+        cancelLayout: function(comp, isDestroying) {
+            var context = this.runningLayoutContext || this.pendingLayouts;
+
+            if (context) {
+                context.cancelComponent(comp, false, isDestroying);
+            }
+        },
+
+        /**
+         * Performs all pending layouts that were scheduled while
+         * {@link Ext.AbstractComponent#suspendLayouts suspendLayouts} was in effect.
+         * @static
+         */
+        flushLayouts: function () {
+            var me = this,
+                context = me.pendingLayouts;
+
+            if (context && context.invalidQueue.length) {
+                me.pendingLayouts = null;
+                me.runningLayoutContext = context;
+
+                Ext.override(context, {
+                    runComplete: function () {
+                        // we need to release the layout queue before running any of the
+                        // finishedLayout calls because they call afterComponentLayout
+                        // which can re-enter by calling doLayout/doComponentLayout.
+                        me.runningLayoutContext = null;
+                         
+                        var result = this.callParent(); // not "me" here!
+                        if (Ext.globalEvents.hasListeners.afterlayout) {                            
+                            Ext.globalEvents.fireEvent('afterlayout');
+                        }
+                        return result;
+                    }
+                });
+
+                context.run();
+            }
+        },
+
+        /**
+         * Resumes layout activity in the whole framework.
+         *
+         * {@link Ext#suspendLayouts} is alias of {@link Ext.AbstractComponent#suspendLayouts}.
+         *
+         * @param {Boolean} [flush=false] `true` to perform all the pending layouts. This can also be
+         * achieved by calling {@link Ext.AbstractComponent#flushLayouts flushLayouts} directly.
+         * @static
+         */
+        resumeLayouts: function (flush) {
+            if (this.layoutSuspendCount && ! --this.layoutSuspendCount) {
+                if (flush) {
+                    this.flushLayouts();
+                }
+                if (Ext.globalEvents.hasListeners.resumelayouts) {
+                    Ext.globalEvents.fireEvent('resumelayouts');
+                }
+            }
+        },
+
+        /**
+         * Stops layouts from happening in the whole framework.
+         *
+         * It's useful to suspend the layout activity while updating multiple components and
+         * containers:
+         *
+         *     Ext.suspendLayouts();
+         *     // batch of updates...
+         *     Ext.resumeLayouts(true);
+         *
+         * {@link Ext#suspendLayouts} is alias of {@link Ext.AbstractComponent#suspendLayouts}.
+         *
+         * See also {@link Ext#batchLayouts} for more abstract way of doing this.
+         *
+         * @static
+         */
+        suspendLayouts: function () {
+            ++this.layoutSuspendCount;
+        },
+
+        /**
+         * Updates layout of a component.
+         *
+         * @param {Ext.Component} comp The component to update.
+         * @param {Boolean} [defer=false] `true` to just queue the layout if this component.
+         * @static
+         */
+        updateLayout: function (comp, defer) {
+            var me = this,
+                running = me.runningLayoutContext,
+                pending;
+
+            if (running) {
+                running.queueInvalidate(comp);
+            } else {
+                pending = me.pendingLayouts || (me.pendingLayouts = new Ext.layout.Context());
+                pending.queueInvalidate(comp);
+
+                if (!defer && !me.layoutSuspendCount && !comp.isLayoutSuspended()) {
+                    me.flushLayouts();
+                }
+            }
+        }
+    },
+
+    /* End Definitions */
+
+    /**
+     * @property {Boolean} isComponent
+     * `true` in this class to identify an object as an instantiated Component, or subclass thereof.
+     */
+    isComponent: true,
+
+    /**
+     * @private
+     */
+    getAutoId: function() {
+        this.autoGenId = true;
+        return ++Ext.AbstractComponent.AUTO_ID;
+    },
+
+    deferLayouts: false,
+
+    /**
+     * @cfg {String} id
+     * The **unique id of this component instance.**
+     *
+     * It should not be necessary to use this configuration except for singleton objects in your application. Components
+     * created with an `id` may be accessed globally using {@link Ext#getCmp Ext.getCmp}.
+     *
+     * Instead of using assigned ids, use the {@link #itemId} config, and {@link Ext.ComponentQuery ComponentQuery}
+     * which provides selector-based searching for Sencha Components analogous to DOM querying. The {@link
+     * Ext.container.Container Container} class contains {@link Ext.container.Container#down shortcut methods} to query
+     * its descendant Components by selector.
+     *
+     * Note that this `id` will also be used as the element id for the containing HTML element that is rendered to the
+     * page for this component. This allows you to write id-based CSS rules to style the specific instance of this
+     * component uniquely, and also to select sub-elements using this component's `id` as the parent.
+     *
+     * **Note:** To avoid complications imposed by a unique `id` also see `{@link #itemId}`.
+     *
+     * **Note:** To access the container of a Component see `{@link #ownerCt}`.
+     *
+     * Defaults to an {@link #getId auto-assigned id}.
+     *
+     * @since 1.1.0
+     */
+
+     /**
+     * @property {Boolean} autoGenId
+     * `true` indicates an `id` was auto-generated rather than provided by configuration.
+     * @private
+     */
+    autoGenId: false,
+
+    /**
+     * @cfg {String} itemId
+     * An `itemId` can be used as an alternative way to get a reference to a component when no object reference is
+     * available. Instead of using an `{@link #id}` with {@link Ext}.{@link Ext#getCmp getCmp}, use `itemId` with
+     * {@link Ext.container.Container}.{@link Ext.container.Container#getComponent getComponent} which will retrieve
+     * `itemId`'s or {@link #id}'s. Since `itemId`'s are an index to the container's internal MixedCollection, the
+     * `itemId` is scoped locally to the container -- avoiding potential conflicts with {@link Ext.ComponentManager}
+     * which requires a **unique** `{@link #id}`.
+     *
+     *     var c = new Ext.panel.Panel({ //
+     *         {@link Ext.Component#height height}: 300,
+     *         {@link #renderTo}: document.body,
+     *         {@link Ext.container.Container#layout layout}: 'auto',
+     *         {@link Ext.container.Container#cfg-items items}: [
+     *             {
+     *                 itemId: 'p1',
+     *                 {@link Ext.panel.Panel#title title}: 'Panel 1',
+     *                 {@link Ext.Component#height height}: 150
+     *             },
+     *             {
+     *                 itemId: 'p2',
+     *                 {@link Ext.panel.Panel#title title}: 'Panel 2',
+     *                 {@link Ext.Component#height height}: 150
+     *             }
+     *         ]
+     *     })
+     *     p1 = c.{@link Ext.container.Container#getComponent getComponent}('p1'); // not the same as {@link Ext#getCmp Ext.getCmp()}
+     *     p2 = p1.{@link #ownerCt}.{@link Ext.container.Container#getComponent getComponent}('p2'); // reference via a sibling
+     *
+     * Also see {@link #id}, `{@link Ext.container.Container#query}`, `{@link Ext.container.Container#down}` and
+     * `{@link Ext.container.Container#child}`.
+     *
+     * **Note**: to access the container of an item see {@link #ownerCt}.
+     *
+     * @since 3.4.0
+     */
+
+    /**
+     * @property {Ext.Container} ownerCt
+     * This Component's owner {@link Ext.container.Container Container} (is set automatically
+     * when this Component is added to a Container).
+     *
+     * *Important.* This is not a universal upwards navigation pointer. It indicates the Container which owns and manages
+     * this Component if any. There are other similar relationships such as the {@link Ext.button.Button button} which activates a {@link Ext.button.Button#cfg-menu menu}, or the
+     * {@link Ext.menu.Item menu item} which activated a {@link Ext.menu.Item#cfg-menu submenu}, or the
+     * {@link Ext.grid.column.Column column header} which activated the column menu.
+     *
+     * These differences are abstracted away by the {@link #up} method.
+     *
+     * **Note**: to access items within the Container see {@link #itemId}.
+     * @readonly
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String/Object} autoEl
+     * A tag name or {@link Ext.DomHelper DomHelper} spec used to create the {@link #getEl Element} which will
+     * encapsulate this Component.
+     *
+     * You do not normally need to specify this. For the base classes {@link Ext.Component} and
+     * {@link Ext.container.Container}, this defaults to **'div'**. The more complex Sencha classes use a more
+     * complex DOM structure specified by their own {@link #renderTpl}s.
+     *
+     * This is intended to allow the developer to create application-specific utility Components encapsulated by
+     * different DOM elements. Example usage:
+     *
+     *     {
+     *         xtype: 'component',
+     *         autoEl: {
+     *             tag: 'img',
+     *             src: 'http://www.example.com/example.jpg'
+     *         }
+     *     }, {
+     *         xtype: 'component',
+     *         autoEl: {
+     *             tag: 'blockquote',
+     *             html: 'autoEl is cool!'
+     *         }
+     *     }, {
+     *         xtype: 'container',
+     *         autoEl: 'ul',
+     *         cls: 'ux-unordered-list',
+     *         items: {
+     *             xtype: 'component',
+     *             autoEl: 'li',
+     *             html: 'First list item'
+     *         }
+     *     }
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {Ext.XTemplate/String/String[]} renderTpl
+     * An {@link Ext.XTemplate XTemplate} used to create the internal structure inside this Component's encapsulating
+     * {@link #getEl Element}.
+     *
+     * You do not normally need to specify this. For the base classes {@link Ext.Component} and
+     * {@link Ext.container.Container}, this defaults to **`null`** which means that they will be initially rendered
+     * with no internal structure; they render their {@link #getEl Element} empty. The more specialized Ext JS and Sencha Touch
+     * classes which use a more complex DOM structure, provide their own template definitions.
+     *
+     * This is intended to allow the developer to create application-specific utility Components with customized
+     * internal structure.
+     *
+     * Upon rendering, any created child elements may be automatically imported into object properties using the
+     * {@link #renderSelectors} and {@link #cfg-childEls} options.
+     * @protected
+     */
+    renderTpl: '{%this.renderContent(out,values)%}',
+
+    /**
+     * @cfg {Object} renderData
+     *
+     * The data used by {@link #renderTpl} in addition to the following property values of the component:
+     *
+     * - id
+     * - ui
+     * - uiCls
+     * - baseCls
+     * - componentCls
+     * - frame
+     *
+     * See {@link #renderSelectors} and {@link #cfg-childEls} for usage examples.
+     */
+
+    /**
+     * @cfg {Object} renderSelectors
+     * An object containing properties specifying {@link Ext.DomQuery DomQuery} selectors which identify child elements
+     * created by the render process.
+     *
+     * After the Component's internal structure is rendered according to the {@link #renderTpl}, this object is iterated through,
+     * and the found Elements are added as properties to the Component using the `renderSelector` property name.
+     *
+     * For example, a Component which renders a title and description into its element:
+     *
+     *     Ext.create('Ext.Component', {
+     *         renderTo: Ext.getBody(),
+     *         renderTpl: [
+     *             '<h1 class="title">{title}</h1>',
+     *             '<p>{desc}</p>'
+     *         ],
+     *         renderData: {
+     *             title: "Error",
+     *             desc: "Something went wrong"
+     *         },
+     *         renderSelectors: {
+     *             titleEl: 'h1.title',
+     *             descEl: 'p'
+     *         },
+     *         listeners: {
+     *             afterrender: function(cmp){
+     *                 // After rendering the component will have a titleEl and descEl properties
+     *                 cmp.titleEl.setStyle({color: "red"});
+     *             }
+     *         }
+     *     });
+     *
+     * For a faster, but less flexible, alternative that achieves the same end result (properties for child elements on the
+     * Component after render), see {@link #cfg-childEls} and {@link #addChildEls}.
+     */
+
+    /**
+     * @cfg {Object[]} childEls
+     * An array describing the child elements of the Component. Each member of the array
+     * is an object with these properties:
+     *
+     * - `name` - The property name on the Component for the child element.
+     * - `itemId` - The id to combine with the Component's id that is the id of the child element.
+     * - `id` - The id of the child element.
+     *
+     * If the array member is a string, it is equivalent to `{ name: m, itemId: m }`.
+     *
+     * For example, a Component which renders a title and body text:
+     *
+     *     @example
+     *     Ext.create('Ext.Component', {
+     *         renderTo: Ext.getBody(),
+     *         renderTpl: [
+     *             '<h1 id="{id}-title">{title}</h1>',
+     *             '<p>{msg}</p>',
+     *         ],
+     *         renderData: {
+     *             title: "Error",
+     *             msg: "Something went wrong"
+     *         },
+     *         childEls: ["title"],
+     *         listeners: {
+     *             afterrender: function(cmp){
+     *                 // After rendering the component will have a title property
+     *                 cmp.title.setStyle({color: "red"});
+     *             }
+     *         }
+     *     });
+     *
+     * A more flexible, but somewhat slower, approach is {@link #renderSelectors}.
+     */
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} renderTo
+     * Specify the `id` of the element, a DOM element or an existing Element that this component will be rendered into.
+     *
+     * **Notes:**
+     *
+     * Do *not* use this option if the Component is to be a child item of a {@link Ext.container.Container Container}.
+     * It is the responsibility of the {@link Ext.container.Container Container}'s
+     * {@link Ext.container.Container#layout layout manager} to render and manage its child items.
+     *
+     * When using this config, a call to `render()` is not required.
+     *
+     * See also: {@link #method-render}.
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {Boolean} frame
+     * Specify as `true` to have the Component inject framing elements within the Component at render time to provide a
+     * graphical rounded frame around the Component content.
+     *
+     * This is only necessary when running on outdated, or non standard-compliant browsers such as Microsoft's Internet
+     * Explorer prior to version 9 which do not support rounded corners natively.
+     *
+     * The extra space taken up by this framing is available from the read only property {@link #frameSize}.
+     */
+
+    /**
+     * @property {Object} frameSize
+     * @readonly
+     * Indicates the width of any framing elements which were added within the encapsulating
+     * element to provide graphical, rounded borders. See the {@link #frame} config. This
+     * property is `null` if the component is not framed.
+     *
+     * This is an object containing the frame width in pixels for all four sides of the
+     * Component containing the following properties:
+     *
+     * @property {Number} [frameSize.top=0] The width of the top framing element in pixels.
+     * @property {Number} [frameSize.right=0] The width of the right framing element in pixels.
+     * @property {Number} [frameSize.bottom=0] The width of the bottom framing element in pixels.
+     * @property {Number} [frameSize.left=0] The width of the left framing element in pixels.
+     * @property {Number} [frameSize.width=0] The total width of the left and right framing elements in pixels.
+     * @property {Number} [frameSize.height=0] The total height of the top and right bottom elements in pixels.
+     */
+    frameSize: null,
+
+    /**
+     * @cfg {String/Object} componentLayout
+     * The sizing and positioning of a Component's internal Elements is the responsibility of the Component's layout
+     * manager which sizes a Component's internal structure in response to the Component being sized.
+     *
+     * Generally, developers will not use this configuration as all provided Components which need their internal
+     * elements sizing (Such as {@link Ext.form.field.Base input fields}) come with their own componentLayout managers.
+     *
+     * The {@link Ext.layout.container.Auto default layout manager} will be used on instances of the base Ext.Component
+     * class which simply sizes the Component's encapsulating element to the height and width specified in the
+     * {@link #setSize} method.
+     */
+
+    /**
+     * @cfg {Ext.XTemplate/Ext.Template/String/String[]} tpl
+     * An {@link Ext.Template}, {@link Ext.XTemplate} or an array of strings to form an Ext.XTemplate. Used in
+     * conjunction with the `{@link #data}` and `{@link #tplWriteMode}` configurations.
+     *
+     * @since 3.4.0
+     */
+
+    /**
+     * @cfg {Object} data
+     * The initial set of data to apply to the `{@link #tpl}` to update the content area of the Component.
+     *
+     * @since 3.4.0
+     */
+
+    /**
+     * @cfg {Ext.enums.Widget} xtype
+     * This property provides a shorter alternative to creating objects than using a full
+     * class name. Using `xtype` is the most common way to define component instances,
+     * especially in a container. For example, the items in a form containing text fields
+     * could be created explicitly like so:
+     *
+     *      items: [
+     *          Ext.create('Ext.form.field.Text', {
+     *              fieldLabel: 'Foo'
+     *          }),
+     *          Ext.create('Ext.form.field.Text', {
+     *              fieldLabel: 'Bar'
+     *          }),
+     *          Ext.create('Ext.form.field.Number', {
+     *              fieldLabel: 'Num'
+     *          })
+     *      ]
+     *
+     * But by using `xtype`, the above becomes:
+     *
+     *      items: [
+     *          {
+     *              xtype: 'textfield',
+     *              fieldLabel: 'Foo'
+     *          },
+     *          {
+     *              xtype: 'textfield',
+     *              fieldLabel: 'Bar'
+     *          },
+     *          {
+     *              xtype: 'numberfield',
+     *              fieldLabel: 'Num'
+     *          }
+     *      ]
+     *
+     * When the `xtype` is common to many items, {@link Ext.container.AbstractContainer#defaultType}
+     * is another way to specify the `xtype` for all items that don't have an explicit `xtype`:
+     *
+     *      defaultType: 'textfield',
+     *      items: [
+     *          { fieldLabel: 'Foo' },
+     *          { fieldLabel: 'Bar' },
+     *          { fieldLabel: 'Num', xtype: 'numberfield' }
+     *      ]
+     *
+     * Each member of the `items` array is now just a "configuration object". These objects
+     * are used to create and configure component instances. A configuration object can be
+     * manually used to instantiate a component using {@link Ext#widget}:
+     *
+     *      var text1 = Ext.create('Ext.form.field.Text', {
+     *          fieldLabel: 'Foo'
+     *      });
+     *
+     *      // or alternatively:
+     *
+     *      var text1 = Ext.widget({
+     *          xtype: 'textfield',
+     *          fieldLabel: 'Foo'
+     *      });
+     *
+     * This conversion of configuration objects into instantiated components is done when
+     * a container is created as part of its {Ext.container.AbstractContainer#initComponent}
+     * process. As part of the same process, the `items` array is converted from its raw
+     * array form into a {@link Ext.util.MixedCollection} instance.
+     *
+     * You can define your own `xtype` on a custom {@link Ext.Component component} by specifying
+     * the `xtype` property in {@link Ext#define}. For example:
+     *
+     *     Ext.define('MyApp.PressMeButton', {
+     *         extend: 'Ext.button.Button',
+     *         xtype: 'pressmebutton',
+     *         text: 'Press Me'
+     *     });
+     *
+     * Care should be taken when naming an `xtype` in a custom component because there is
+     * a single, shared scope for all xtypes. Third part components should consider using
+     * a prefix to avoid collisions.
+     *
+     *     Ext.define('Foo.form.CoolButton', {
+     *         extend: 'Ext.button.Button',
+     *         xtype: 'ux-coolbutton',
+     *         text: 'Cool!'
+     *     });
+     *
+     * See {@link Ext.enums.Widget} for list of all available xtypes.
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String} tplWriteMode
+     * The Ext.(X)Template method to use when updating the content area of the Component.
+     * See `{@link Ext.XTemplate#overwrite}` for information on default mode.
+     *
+     * @since 3.4.0
+     */
+    tplWriteMode: 'overwrite',
+
+    /**
+     * @cfg {String} [baseCls='x-component']
+     * The base CSS class to apply to this component's element. This will also be prepended to elements within this
+     * component like Panel's body will get a class `x-panel-body`. This means that if you create a subclass of Panel, and
+     * you want it to get all the Panels styling for the element and the body, you leave the `baseCls` `x-panel` and use
+     * `componentCls` to add specific styling for this component.
+     */
+    baseCls: Ext.baseCSSPrefix + 'component',
+
+    /**
+     * @cfg {String} componentCls
+     * CSS Class to be added to a components root level element to give distinction to it via styling.
+     */
+
+    /**
+     * @cfg {String} [cls='']
+     * An optional extra CSS class that will be added to this component's Element. This can be useful
+     * for adding customized styles to the component or any of its children using standard CSS rules.
+     *
+     * @since 1.1.0
+     */
+
+    /**
+     * @cfg {String} [overCls='']
+     * An optional extra CSS class that will be added to this component's Element when the mouse moves over the Element,
+     * and removed when the mouse moves out. This can be useful for adding customized 'active' or 'hover' styles to the
+     * component or any of its children using standard CSS rules.
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String} [disabledCls='x-item-disabled']
+     * CSS class to add when the Component is disabled.
+     */
+    disabledCls: Ext.baseCSSPrefix + 'item-disabled',
+
+    /**
+     * @cfg {String} ui
+     * A UI style for a component.
+     */
+    ui: 'default',
+
+    /**
+     * @cfg {String[]} uiCls
+     * An array of of `classNames` which are currently applied to this component.
+     * @private
+     */
+    uiCls: [],
+
+    /**
+     * @cfg {String/Object} style
+     * A custom style specification to be applied to this component's Element. Should be a valid argument to
+     * {@link Ext.Element#applyStyles}.
+     *
+     *     new Ext.panel.Panel({
+     *         title: 'Some Title',
+     *         renderTo: Ext.getBody(),
+     *         width: 400, height: 300,
+     *         layout: 'form',
+     *         items: [{
+     *             xtype: 'textarea',
+     *             style: {
+     *                 width: '95%',
+     *                 marginBottom: '10px'
+     *             }
+     *         },
+     *         new Ext.button.Button({
+     *             text: 'Send',
+     *             minWidth: '100',
+     *             style: {
+     *                 marginBottom: '10px'
+     *             }
+     *         })
+     *         ]
+     *     });
+     *
+     * @since 1.1.0
+     */
+
+    /**
+     * @cfg {Number} width
+     * The width of this component in pixels.
+     */
+
+    /**
+     * @cfg {Number} height
+     * The height of this component in pixels.
+     */
+
+    /**
+     * @cfg {Number/String/Boolean} border
+     * Specifies the border size for this component. The border can be a single numeric value to apply to all sides or it can
+     * be a CSS style specification for each style, for example: '10 5 3 10' (top, right, bottom, left).
+     *
+     * For components that have no border by default, setting this won't make the border appear by itself.
+     * You also need to specify border color and style:
+     *
+     *     border: 5,
+     *     style: {
+     *         borderColor: 'red',
+     *         borderStyle: 'solid'
+     *     }
+     * 
+     * To turn off the border, use `border: false`.
+     */
+
+    /**
+     * @cfg {Number/String} padding
+     * Specifies the padding for this component. The padding can be a single numeric value to apply to all sides or it
+     * can be a CSS style specification for each style, for example: '10 5 3 10' (top, right, bottom, left).
+     */
+
+    /**
+     * @cfg {Number/String} margin
+     * Specifies the margin for this component. The margin can be a single numeric value to apply to all sides or it can
+     * be a CSS style specification for each style, for example: '10 5 3 10' (top, right, bottom, left).
+     */
+
+    /**
+     * @cfg {Boolean} hidden
+     * `true` to hide the component.
+     * @since 2.3.0
+     */
+    hidden: false,
+
+    /**
+     * @cfg {Boolean} disabled
+     * `true` to disable the component.
+     * @since 2.3.0
+     */
+    disabled: false,
+
+    /**
+     * @cfg {Boolean} [draggable=false]
+     * Allows the component to be dragged.
+     */
+
+    /**
+     * @property {Boolean} draggable
+     * Indicates whether or not the component can be dragged.
+     * @readonly
+     */
+    draggable: false,
+
+    /**
+     * @cfg {Boolean} floating
+     * Create the Component as a floating and use absolute positioning.
+     *
+     * The z-index of floating Components is handled by a ZIndexManager. If you simply render a floating Component into the DOM, it will be managed
+     * by the global {@link Ext.WindowManager WindowManager}.
+     *
+     * If you include a floating Component as a child item of a Container, then upon render, Ext JS will seek an ancestor floating Component to house a new
+     * ZIndexManager instance to manage its descendant floaters. If no floating ancestor can be found, the global WindowManager will be used.
+     *
+     * When a floating Component which has a ZindexManager managing descendant floaters is destroyed, those descendant floaters will also be destroyed.
+     */
+    floating: false,
+
+    /**
+     * @cfg {String} hideMode
+     * A String which specifies how this Component's encapsulating DOM element will be hidden. Values may be:
+     *
+     *   - `'display'` : The Component will be hidden using the `display: none` style.
+     *   - `'visibility'` : The Component will be hidden using the `visibility: hidden` style.
+     *   - `'offsets'` : The Component will be hidden by absolutely positioning it out of the visible area of the document.
+     *     This is useful when a hidden Component must maintain measurable dimensions. Hiding using `display` results in a
+     *     Component having zero dimensions.
+     *
+     * @since 1.1.0
+     */
+    hideMode: 'display',
+
+    /**
+     * @cfg {String} contentEl
+     * Specify an existing HTML element, or the `id` of an existing HTML element to use as the content for this component.
+     *
+     * This config option is used to take an existing HTML element and place it in the layout element of a new component
+     * (it simply moves the specified DOM element _after the Component is rendered_ to use as the content.
+     *
+     * **Notes:**
+     *
+     * The specified HTML element is appended to the layout element of the component _after any configured
+     * {@link #html HTML} has been inserted_, and so the document will not contain this element at the time
+     * the {@link #event-render} event is fired.
+     *
+     * The specified HTML element used will not participate in any **`{@link Ext.container.Container#layout layout}`**
+     * scheme that the Component may use. It is just HTML. Layouts operate on child
+     * **`{@link Ext.container.Container#cfg-items items}`**.
+     *
+     * Add either the `x-hidden` or the `x-hide-display` CSS class to prevent a brief flicker of the content before it
+     * is rendered to the panel.
+     *
+     * @since 3.4.0
+     */
+
+    /**
+     * @cfg {String/Object} [html='']
+     * An HTML fragment, or a {@link Ext.DomHelper DomHelper} specification to use as the layout element content.
+     * The HTML content is added after the component is rendered, so the document will not contain this HTML at the time
+     * the {@link #event-render} event is fired. This content is inserted into the body _before_ any configured {@link #contentEl}
+     * is appended.
+     *
+     * @since 3.4.0
+     */
+
+    /**
+     * @cfg {Number} minHeight
+     * The minimum value in pixels which this Component will set its height to.
+     *
+     * **Warning:** This will override any size management applied by layout managers.
+     */
+    /**
+     * @cfg {Number} minWidth
+     * The minimum value in pixels which this Component will set its width to.
+     *
+     * **Warning:** This will override any size management applied by layout managers.
+     */
+    /**
+     * @cfg {Number} maxHeight
+     * The maximum value in pixels which this Component will set its height to.
+     *
+     * **Warning:** This will override any size management applied by layout managers.
+     */
+    /**
+     * @cfg {Number} maxWidth
+     * The maximum value in pixels which this Component will set its width to.
+     *
+     * **Warning:** This will override any size management applied by layout managers.
+     */
+
+    /**
+     * @cfg {Ext.ComponentLoader/Object} loader
+     * A configuration object or an instance of a {@link Ext.ComponentLoader} to load remote content
+     * for this Component.
+     *
+     *     Ext.create('Ext.Component', {
+     *         loader: {
+     *             url: 'content.html',
+     *             autoLoad: true
+     *         },
+     *         renderTo: Ext.getBody()
+     *     });
+     */
+
+    /**
+     * @cfg {Ext.ComponentLoader/Object/String/Boolean} autoLoad
+     * An alias for {@link #loader} config which also allows to specify just a string which will be
+     * used as the url that's automatically loaded:
+     *
+     *     Ext.create('Ext.Component', {
+     *         autoLoad: 'content.html',
+     *         renderTo: Ext.getBody()
+     *     });
+     *
+     * The above is the same as:
+     *
+     *     Ext.create('Ext.Component', {
+     *         loader: {
+     *             url: 'content.html',
+     *             autoLoad: true
+     *         },
+     *         renderTo: Ext.getBody()
+     *     });
+     *
+     * Don't use it together with {@link #loader} config.
+     *
+     * @deprecated 4.1.1 Use {@link #loader} config instead.
+     */
+
+    /**
+     * @cfg {Boolean} autoShow
+     * `true` to automatically show the component upon creation. This config option may only be used for
+     * {@link #floating} components or components that use {@link #autoRender}.
+     *
+     * @since 2.3.0
+     */
+    autoShow: false,
+
+    /**
+     * @cfg {Boolean/String/HTMLElement/Ext.Element} autoRender
+     * This config is intended mainly for non-{@link #cfg-floating} Components which may or may not be shown. Instead of using
+     * {@link #renderTo} in the configuration, and rendering upon construction, this allows a Component to render itself
+     * upon first _{@link Ext.Component#method-show show}_. If {@link #cfg-floating} is `true`, the value of this config is omitted as if it is `true`.
+     *
+     * Specify as `true` to have this Component render to the document body upon first show.
+     *
+     * Specify as an element, or the ID of an element to have this Component render to a specific element upon first
+     * show.
+     */
+    autoRender: false,
+
+    // @private
+    allowDomMove: true,
+
+    /**
+     * @cfg {Ext.AbstractPlugin[]/Ext.AbstractPlugin/Object[]/Object/Ext.enums.Plugin[]/Ext.enums.Plugin} plugins
+     * An array of plugins to be added to this component. Can also be just a single plugin instead of array.
+     *
+     * Plugins provide custom functionality for a component. The only requirement for
+     * a valid plugin is that it contain an `init` method that accepts a reference of type Ext.Component. When a component
+     * is created, if any plugins are available, the component will call the init method on each plugin, passing a
+     * reference to itself. Each plugin can then call methods or respond to events on the component as needed to provide
+     * its functionality.
+     *
+     * Plugins can be added to component by either directly referencing the plugin instance:
+     *
+     *     plugins: [Ext.create('Ext.grid.plugin.CellEditing', {clicksToEdit: 1})],
+     *
+     * By using config object with ptype:
+     *
+     *     plugins: [{ptype: 'cellediting', clicksToEdit: 1}],
+     *
+     * Or with just a ptype:
+     *
+     *     plugins: ['cellediting', 'gridviewdragdrop'],
+     *
+     * See {@link Ext.enums.Plugin} for list of all ptypes.
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @property {Boolean} rendered
+     * Indicates whether or not the component has been rendered.
+     * @readonly
+     * @since 1.1.0
+     */
+    rendered: false,
+
+    /**
+     * @property {Number} componentLayoutCounter
+     * @private
+     * The number of component layout calls made on this object.
+     */
+    componentLayoutCounter: 0,
+
+    /**
+     * @cfg {Boolean/Number} [shrinkWrap=2]
+     *
+     * If this property is a number, it is interpreted as follows:
+     *
+     *   - 0: Neither width nor height depend on content. This is equivalent to `false`.
+     *   - 1: Width depends on content (shrink wraps), but height does not.
+     *   - 2: Height depends on content (shrink wraps), but width does not. The default.
+     *   - 3: Both width and height depend on content (shrink wrap). This is equivalent to `true`.
+     *
+     * In CSS terms, shrink-wrap width is analogous to an inline-block element as opposed
+     * to a block-level element. Some container layouts always shrink-wrap their children,
+     * effectively ignoring this property (e.g., {@link Ext.layout.container.HBox},
+     * {@link Ext.layout.container.VBox}, {@link Ext.layout.component.Dock}).
+     */
+    shrinkWrap: 2,
+
+    weight: 0,
+
+    /**
+     * @property {Boolean} maskOnDisable
+     * This is an internal flag that you use when creating custom components. By default this is set to `true` which means
+     * that every component gets a mask when it's disabled. Components like FieldContainer, FieldSet, Field, Button, Tab
+     * override this property to `false` since they want to implement custom disable logic.
+     */
+    maskOnDisable: true,
+
+    /**
+     * @property {Boolean} [_isLayoutRoot=false]
+     * Setting this property to `true` causes the {@link #isLayoutRoot} method to return
+     * `true` and stop the search for the top-most component for a layout.
+     * @protected
+     */
+    _isLayoutRoot: false,
+
+    /**
+     * @property {String} [contentPaddingProperty='padding']
+     * The name of the padding property that is used by the layout to manage
+     * padding.  See {@link Ext.layout.container.Auto#managePadding managePadding}
+     */ 
+    contentPaddingProperty: 'padding',
+    
+    horizontalPosProp: 'left',
+
+    // private
+    borderBoxCls: Ext.baseCSSPrefix + 'border-box',
+
+    /**
+     * Creates new Component.
+     * @param {Object} config  (optional) Config object.
+     */
+    constructor : function(config) {
+        var me = this,
+            i, len, xhooks;
+
+        if (config) {
+            Ext.apply(me, config);
+
+            xhooks = me.xhooks;
+            if (xhooks) {
+                delete me.xhooks;
+                Ext.override(me, xhooks);
+            }
+        } else {
+            config = {};
+        }
+
+        me.initialConfig = config;
+
+        me.mixins.elementCt.constructor.call(me);
+
+        me.addEvents(
+            /**
+             * @event beforeactivate
+             * Fires before a Component has been visually activated. Returning `false` from an event listener can prevent
+             * the activate from occurring.
+             * @param {Ext.Component} this
+             */
+            'beforeactivate',
+            /**
+             * @event activate
+             * Fires after a Component has been visually activated.
+             * @param {Ext.Component} this
+             */
+            'activate',
+            /**
+             * @event beforedeactivate
+             * Fires before a Component has been visually deactivated. Returning `false` from an event listener can
+             * prevent the deactivate from occurring.
+             * @param {Ext.Component} this
+             */
+            'beforedeactivate',
+            /**
+             * @event deactivate
+             * Fires after a Component has been visually deactivated.
+             * @param {Ext.Component} this
+             */
+            'deactivate',
+            /**
+             * @event added
+             * Fires after a Component had been added to a Container.
+             * @param {Ext.Component} this
+             * @param {Ext.container.Container} container Parent Container
+             * @param {Number} pos position of Component
+             * @since 3.4.0
+             */
+            'added',
+            /**
+             * @event disable
+             * Fires after the component is disabled.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'disable',
+            /**
+             * @event enable
+             * Fires after the component is enabled.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'enable',
+            /**
+             * @event beforeshow
+             * Fires before the component is shown when calling the {@link Ext.Component#method-show show} method. Return `false` from an event
+             * handler to stop the show.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'beforeshow',
+            /**
+             * @event show
+             * Fires after the component is shown when calling the {@link Ext.Component#method-show show} method.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'show',
+            /**
+             * @event beforehide
+             * Fires before the component is hidden when calling the {@link Ext.Component#method-hide hide} method. Return `false` from an event
+             * handler to stop the hide.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'beforehide',
+            /**
+             * @event hide
+             * Fires after the component is hidden. Fires after the component is hidden when calling the {@link Ext.Component#method-hide hide}
+             * method.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'hide',
+            /**
+             * @event removed
+             * Fires when a component is removed from an Ext.container.Container
+             * @param {Ext.Component} this
+             * @param {Ext.container.Container} ownerCt Container which holds the component
+             * @since 3.4.0
+             */
+            'removed',
+            /**
+             * @event beforerender
+             * Fires before the component is {@link #rendered}. Return `false` from an event handler to stop the
+             * {@link #method-render}.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'beforerender',
+            /**
+             * @event render
+             * Fires after the component markup is {@link #rendered}.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'render',
+            /**
+             * @event afterrender
+             * Fires after the component rendering is finished.
+             *
+             * The `afterrender` event is fired after this Component has been {@link #rendered}, been postprocessed by any
+             * `afterRender` method defined for the Component.
+             * @param {Ext.Component} this
+             * @since 3.4.0
+             */
+            'afterrender',
+            /**
+             * @event boxready
+             * Fires *one time* - after the component has been laid out for the first time at its initial size.
+             * @param {Ext.Component} this
+             * @param {Number} width The initial width.
+             * @param {Number} height The initial height.
+             */
+            'boxready',
+            /**
+             * @event beforedestroy
+             * Fires before the component is {@link #method-destroy}ed. Return `false` from an event handler to stop the
+             * {@link #method-destroy}.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'beforedestroy',
+            /**
+             * @event destroy
+             * Fires after the component is {@link #method-destroy}ed.
+             * @param {Ext.Component} this
+             * @since 1.1.0
+             */
+            'destroy',
+            /**
+             * @event resize
+             * Fires after the component is resized. Note that this does *not* fire when the component is first laid out at its initial
+             * size. To hook that point in the life cycle, use the {@link #boxready} event.
+             * @param {Ext.Component} this
+             * @param {Number} width The new width that was set.
+             * @param {Number} height The new height that was set.
+             * @param {Number} oldWidth The previous width.
+             * @param {Number} oldHeight The previous height.
+             */
+            'resize',
+            /**
+             * @event move
+             * Fires after the component is moved.
+             * @param {Ext.Component} this
+             * @param {Number} x The new x position.
+             * @param {Number} y The new y position.
+             */
+             'move',
+            /**
+             * @event focus
+             * Fires when this Component receives focus.
+             * @param {Ext.Component} this
+             * @param {Ext.EventObject} The focus event.
+             */
+            'focus',
+            /**
+             * @event blur
+             * Fires when this Component loses focus.
+             * @param {Ext.Component} this
+             * @param {Ext.EventObject} The blur event.
+             */
+            'blur'
+        );
+
+        me.getId();
+
+        me.setupProtoEl();
+
+        // initComponent, beforeRender, or event handlers may have set the style or `cls` property since the `protoEl` was set up
+        // so we must apply styles and classes here too.
+        if (me.cls) {
+            me.initialCls = me.cls;
+            me.protoEl.addCls(me.cls);
+        }
+        if (me.style) {
+            me.initialStyle = me.style;
+            me.protoEl.setStyle(me.style);
+        }
+
+        me.renderData = me.renderData || {};
+        me.renderSelectors = me.renderSelectors || {};
+
+        if (me.plugins) {
+            me.plugins = me.constructPlugins();
+        }
+
+        // we need this before we call initComponent
+        if (!me.hasListeners) {
+            me.hasListeners = new me.HasListeners();
+        }
+
+        me.initComponent();
+
+        // ititComponent gets a chance to change the id property before registering
+        Ext.ComponentManager.register(me);
+
+        // Don't pass the config so that it is not applied to 'this' again
+        me.mixins.observable.constructor.call(me);
+        me.mixins.state.constructor.call(me, config);
+
+        // Save state on resize.
+        this.addStateEvents('resize');
+
+        // Move this into Observable?
+        if (me.plugins) {
+            for (i = 0, len = me.plugins.length; i < len; i++) {
+                me.plugins[i] = me.initPlugin(me.plugins[i]);
+            }
+        }
+
+        me.loader = me.getLoader();
+
+        if (me.renderTo) {
+            me.render(me.renderTo);
+            // EXTJSIV-1935 - should be a way to do afterShow or something, but that
+            // won't work. Likewise, rendering hidden and then showing (w/autoShow) has
+            // implications to afterRender so we cannot do that.
+        }
+
+        // Auto show only works unilaterally on *uncontained* Components.
+        // If contained, then it is the Container's responsibility to do the showing at next layout time.
+        if (me.autoShow && !me.isContained) {
+            me.show();
+        }
+
+        if (Ext.isDefined(me.disabledClass)) {
+            if (Ext.isDefined(Ext.global.console)) {
+                Ext.global.console.warn('Ext.Component: disabledClass has been deprecated. Please use disabledCls.');
+            }
+            me.disabledCls = me.disabledClass;
+            delete me.disabledClass;
+        }
+    },
+
+    initComponent: function () {
+        // This is called again here to allow derived classes to add plugin configs to the
+        // plugins array before calling down to this, the base initComponent.
+        this.plugins = this.constructPlugins();
+
+        // this will properly (ignore or) constrain the configured width/height to their
+        // min/max values for consistency.
+        this.setSize(this.width, this.height);
+    },
+
+    /**
+     * The supplied default state gathering method for the AbstractComponent class.
+     *
+     * This method returns dimension settings such as `flex`, `anchor`, `width` and `height` along with `collapsed`
+     * state.
+     *
+     * Subclasses which implement more complex state should call the superclass's implementation, and apply their state
+     * to the result if this basic state is to be saved.
+     *
+     * Note that Component state will only be saved if the Component has a {@link #stateId} and there as a StateProvider
+     * configured for the document.
+     *
+     * @return {Object}
+     */
+    getState: function() {
+        var me = this,
+            state = null,
+            sizeModel = me.getSizeModel();
+
+        if (sizeModel.width.configured) {
+            state = me.addPropertyToState(state, 'width');
+        }
+        if (sizeModel.height.configured) {
+            state = me.addPropertyToState(state, 'height');
+        }
+
+        return state;
+    },
+
+    /**
+     * Save a property to the given state object if it is not its default or configured
+     * value.
+     *
+     * @param {Object} state The state object.
+     * @param {String} propName The name of the property on this object to save.
+     * @param {String} [value] The value of the state property (defaults to `this[propName]`).
+     * @return {Boolean} The state object or a new object if state was `null` and the property
+     * was saved.
+     * @protected
+     */
+    addPropertyToState: function (state, propName, value) {
+        var me = this,
+            len = arguments.length;
+
+        // If the property is inherited, it is a default and we don't want to save it to
+        // the state, however if we explicitly specify a value, always save it
+        if (len == 3 || me.hasOwnProperty(propName)) {
+            if (len < 3) {
+                value = me[propName];
+            }
+
+            // If the property has the same value as was initially configured, again, we
+            // don't want to save it.
+            if (value !== me.initialConfig[propName]) {
+                (state || (state = {}))[propName] = value;
+            }
+        }
+
+        return state;
+    },
+
+    show: Ext.emptyFn,
+
+    animate: function(animObj) {
+        var me = this,
+            hasToWidth,
+            hasToHeight,
+            toHeight,
+            toWidth,
+            to,
+            clearWidth,
+            clearHeight,
+            curWidth, w, curHeight, h, isExpanding,
+            wasConstrained,
+            wasConstrainedHeader,
+            passedCallback,
+            oldOverflow;
+
+        animObj = animObj || {};
+        to = animObj.to || {};
+
+        if (Ext.fx.Manager.hasFxBlock(me.id)) {
+            return me;
+        }
+
+        hasToWidth = Ext.isDefined(to.width);
+        if (hasToWidth) {
+            toWidth = Ext.Number.constrain(to.width, me.minWidth, me.maxWidth);
+        }
+
+        hasToHeight = Ext.isDefined(to.height);
+        if (hasToHeight) {
+            toHeight = Ext.Number.constrain(to.height, me.minHeight, me.maxHeight);
+        }
+
+        // Special processing for animating Component dimensions.
+        if (!animObj.dynamic && (hasToWidth || hasToHeight)) {
+            curWidth = (animObj.from ? animObj.from.width : undefined) || me.getWidth();
+            w = curWidth;
+            curHeight = (animObj.from ? animObj.from.height : undefined) || me.getHeight();
+            h = curHeight;
+            isExpanding = false;
+
+            if (hasToHeight && toHeight > curHeight) {
+                h = toHeight;
+                isExpanding = true;
+            }
+            if (hasToWidth && toWidth > curWidth) {
+                w = toWidth;
+                isExpanding = true;
+            }
+
+            // During animated sizing, overflow has to be hidden to clip expanded content
+            if (hasToHeight || hasToWidth) {
+                oldOverflow = me.el.getStyle('overtflow');
+                if (oldOverflow !== 'hidden') {
+                    me.el.setStyle('overflow', 'hidden');
+                }
+            }
+
+            // If any dimensions are being increased, we must resize the internal structure
+            // of the Component, but then clip it by sizing its encapsulating element back to original dimensions.
+            // The animation will then progressively reveal the larger content.
+            if (isExpanding) {
+                clearWidth = !Ext.isNumber(me.width);
+                clearHeight = !Ext.isNumber(me.height);
+
+                // Lay out this component at the new, larger size to get the internals correctly laid out.
+                // Then size the encapsulating **Element** back down to size.
+                // We will then just animate the element to reveal the correctly laid out content.
+                me.setSize(w, h);
+                me.el.setSize(curWidth, curHeight);
+
+                if (clearWidth) {
+                    delete me.width;
+                }
+                if (clearHeight) {
+                    delete me.height;
+                }
+            }
+            if (hasToWidth) {
+                to.width = toWidth;
+            }
+
+            if (hasToHeight) {
+                to.height = toHeight;
+            }
+        }
+
+        // No constraining during the animate - the "to" size has already been calculated with respect to all settings.
+        // Arrange to reinstate any constraining after the animation has completed
+        wasConstrained = me.constrain;
+        wasConstrainedHeader = me.constrainHeader;
+        if (wasConstrained || wasConstrainedHeader) {
+            me.constrain = me.constrainHeader = false;
+            passedCallback = animObj.callback;
+            animObj.callback = function() {
+                me.constrain = wasConstrained;
+                me.constrainHeader = wasConstrainedHeader;
+                // Call the original callback if any
+                if (passedCallback) {
+                    passedCallback.call(animObj.scope||me, arguments);
+                }
+                if (oldOverflow !== 'hidden') {
+                    me.el.setStyle('overflow', oldOverflow);
+                }
+            };
+        }
+        return me.mixins.animate.animate.apply(me, arguments);
+    },
+    
+    setHiddenState: function(hidden){
+        var hierarchyState = this.getHierarchyState();
+        
+        this.hidden = hidden;
+        if (hidden) {
+            hierarchyState.hidden = true;
+        } else {
+            delete hierarchyState.hidden;
+        }
+    },
+
+    onHide: function() {
+        // Only lay out if there is an owning layout which might be affected by the hide
+        if (this.ownerLayout) {
+            this.updateLayout({ isRoot: false });
+        }
+    },
+
+    onShow : function() {
+        this.updateLayout({ isRoot: false });
+    },
+
+    /**
+     * @private
+     * @param {String/Object} ptype string or config object containing a ptype property.
+     *
+     * Constructs a plugin according to the passed config object/ptype string.
+     *
+     * Ensures that the constructed plugin always has a `cmp` reference back to this component.
+     * The setting up of this is done in PluginManager. The PluginManager ensures that a reference to this
+     * component is passed to the constructor. It also ensures that the plugin's `setCmp` method (if any) is called. 
+     */
+    constructPlugin: function(plugin) {
+        var me = this;
+        
+        // ptype only, pass as the defultType
+        if (typeof plugin == 'string') {
+            plugin = Ext.PluginManager.create({}, plugin, me);
+        }
+        // Object (either config with ptype or an instantiated plugin)
+        else {
+            plugin = Ext.PluginManager.create(plugin, null, me);
+        }
+        return plugin;
+    },
+
+    /**
+     * @private
+     * Returns an array of fully constructed plugin instances. This converts any configs into their
+     * appropriate instances.
+     *
+     * It does not mutate the plugins array. It creates a new array.
+     */
+    constructPlugins: function() {
+        var me = this,
+            plugins = me.plugins,
+            result, i, len;
+
+        if (plugins) {
+            result = [];
+            if (!Ext.isArray(plugins)) {
+                plugins = [ plugins ];
+            }
+            for (i = 0, len = plugins.length; i < len; i++) {
+                // this just returns already-constructed plugin instances...
+                result[i] = me.constructPlugin(plugins[i]);
+            }
+        }
+
+        me.pluginsInitialized = true;
+        return result;
+    },
+
+    // @private
+    initPlugin : function(plugin) {
+        plugin.init(this);
+
+        return plugin;
+    },
+
+    // @private
+    // Adds a plugin. May be called at any time in the component's lifecycle.
+    addPlugin: function(plugin) {
+        var me = this;
+
+        plugin = me.constructPlugin(plugin);
+        if (me.plugins) {
+            me.plugins.push(plugin);
+        } else {
+            me.plugins = [ plugin ];
+        }
+        if (me.pluginsInitialized) {
+            me.initPlugin(plugin);
+        }
+        return plugin;
+    },
+
+    removePlugin: function(plugin) {
+        Ext.Array.remove(this.plugins, plugin);
+        plugin.destroy();
+    },
+
+    /**
+     * Retrieves plugin from this component's collection by its `ptype`.
+     * @param {String} ptype The Plugin's ptype as specified by the class's `alias` configuration.
+     * @return {Ext.AbstractPlugin} plugin instance.
+     */
+    findPlugin: function(ptype) {
+        var i,
+            plugins = this.plugins,
+            ln = plugins && plugins.length;
+        for (i = 0; i < ln; i++) {
+            if (plugins[i].ptype === ptype) {
+                return plugins[i];
+            }
+        }
+    },
+
+    /**
+     * Retrieves a plugin from this component's collection by its `pluginId`.
+     * @param {String} pluginId
+     * @return {Ext.AbstractPlugin} plugin instance.
+     */
+    getPlugin: function(pluginId) {
+        var i,
+            plugins = this.plugins,
+            ln = plugins && plugins.length;
+        for (i = 0; i < ln; i++) {
+            if (plugins[i].pluginId === pluginId) {
+                return plugins[i];
+            }
+        }
+    },
+
+    /**
+     * Occurs before componentLayout is run. In previous releases, this method could
+     * return `false` to prevent its layout but that is not supported in Ext JS 4.1 or
+     * higher. This method is simply a notification of the impending layout to give the
+     * component a chance to adjust the DOM. Ideally, DOM reads should be avoided at this
+     * time to reduce expensive document reflows.
+     *
+     * @template
+     * @protected
+     */
+    beforeLayout: Ext.emptyFn,
+
+    /**
+     * @private
+     * Injected as an override by Ext.Aria.initialize
+     */
+    updateAria: Ext.emptyFn,
+
+    /**
+     * Called by Component#doAutoRender
+     *
+     * Register a Container configured `floating: true` with this Component's {@link Ext.ZIndexManager ZIndexManager}.
+     *
+     * Components added in this way will not participate in any layout, but will be rendered
+     * upon first show in the way that {@link Ext.window.Window Window}s are.
+     */
+    registerFloatingItem: function(cmp) {
+        var me = this;
+        if (!me.floatingDescendants) {
+            me.floatingDescendants = new Ext.ZIndexManager(me);
+        }
+        me.floatingDescendants.register(cmp);
+    },
+
+    unregisterFloatingItem: function(cmp) {
+        var me = this;
+        if (me.floatingDescendants) {
+            me.floatingDescendants.unregister(cmp);
+        }
+    },
+
+    layoutSuspendCount: 0,
+
+    suspendLayouts: function () {
+        var me = this;
+        if (!me.rendered) {
+            return;
+        }
+        if (++me.layoutSuspendCount == 1) {
+            me.suspendLayout = true;
+        }
+    },
+
+    resumeLayouts: function (flushOptions) {
+        var me = this;
+        if (!me.rendered) {
+            return;
+        }
+        if (! --me.layoutSuspendCount) {
+            me.suspendLayout = false;
+            if (flushOptions && !me.isLayoutSuspended()) {
+                me.updateLayout(flushOptions);
+            }
+        }
+    },
+
+    setupProtoEl: function() {
+        var cls = this.initCls();
+
+        this.protoEl = new Ext.util.ProtoElement({
+            cls: cls.join(' ') // in case any of the parts have multiple classes
+        });
+    },
+
+    initCls: function() {
+        var me = this,
+            cls = [ me.baseCls, me.getComponentLayout().targetCls ];
+
+
+        if (me.componentCls) {
+            cls.push(me.componentCls);
+        } else {
+            me.componentCls = me.baseCls;
+        }
+
+        return cls;
+    },
+
+    /**
+     * Sets the UI for the component. This will remove any existing UIs on the component. It will also loop through any
+     * `uiCls` set on the component and rename them so they include the new UI.
+     * @param {String} ui The new UI for the component.
+     */
+    setUI: function(ui) {
+        var me = this,
+            uiCls = me.uiCls,
+            activeUI = me.activeUI,
+            classes;
+
+        if (ui === activeUI) {
+            // The ui hasn't changed
+            return;
+        }
+
+        // activeUI will only be set if setUI has been called before. If it hasn't there's no need to remove anything
+        if (activeUI) {
+            classes = me.removeClsWithUI(uiCls, true);
+
+            if (classes.length) {
+                me.removeCls(classes);
+            }
+
+            // Remove the UI from the element
+            me.removeUIFromElement();
+        }
+        else {
+            // We need uiCls to be empty otherwise our call to addClsWithUI won't do anything
+            me.uiCls = [];
+        }
+
+        // Set the UI
+        me.ui = ui;
+
+        // After the first call to setUI the values ui and activeUI should track each other but initially we need some
+        // way to tell whether the ui has really been set.
+        me.activeUI = ui;
+
+        // Add the new UI to the element
+        me.addUIToElement();
+
+        classes = me.addClsWithUI(uiCls, true);
+
+        if (classes.length) {
+            me.addCls(classes);
+        }
+
+        // Changing the ui can lead to significant changes to a component's appearance, so the layout needs to be
+        // updated. Internally most calls to setUI are pre-render. Buttons are a notable exception as setScale changes
+        // the ui and often requires the layout to be updated.
+        if (me.rendered) {
+            me.updateLayout();
+        }
+    },
+
+    /**
+     * Adds a `cls` to the `uiCls` array, which will also call {@link #addUIClsToElement} and adds to all elements of this
+     * component.
+     * @param {String/String[]} classes A string or an array of strings to add to the `uiCls`.
+     * @param {Object} skip (Boolean) skip `true` to skip adding it to the class and do it later (via the return).
+     */
+    addClsWithUI: function(classes, skip) {
+        var me = this,
+            clsArray = [],
+            i = 0,
+            uiCls = me.uiCls = Ext.Array.clone(me.uiCls),
+            activeUI = me.activeUI,
+            length,
+            cls;
+
+        if (typeof classes === "string") {
+            classes = (classes.indexOf(' ') < 0) ? [classes] : Ext.String.splitWords(classes);
+        }
+
+        length = classes.length;
+
+        for (; i < length; i++) {
+            cls = classes[i];
+
+            if (cls && !me.hasUICls(cls)) {
+                uiCls.push(cls);
+
+                // We can skip this bit if there isn't an activeUI because we'll be called again from setUI
+                if (activeUI) {
+                    clsArray = clsArray.concat(me.addUIClsToElement(cls));
+                }
+            }
+        }
+
+        if (skip !== true && activeUI) {
+            me.addCls(clsArray);
+        }
+
+        return clsArray;
+    },
+
+    /**
+     * Removes a `cls` to the `uiCls` array, which will also call {@link #removeUIClsFromElement} and removes it from all
+     * elements of this component.
+     * @param {String/String[]} cls A string or an array of strings to remove to the `uiCls`.
+     */
+    removeClsWithUI: function(classes, skip) {
+        var me = this,
+            clsArray = [],
+            i = 0,
+            extArray = Ext.Array,
+            remove = extArray.remove,
+            uiCls = me.uiCls = extArray.clone(me.uiCls),
+            activeUI = me.activeUI,
+            length, cls;
+
+        if (typeof classes === "string") {
+            classes = (classes.indexOf(' ') < 0) ? [classes] : Ext.String.splitWords(classes);
+        }
+
+        length = classes.length;
+
+        for (i = 0; i < length; i++) {
+            cls = classes[i];
+
+            if (cls && me.hasUICls(cls)) {
+                remove(uiCls, cls);
+
+                //If there's no activeUI then there's nothing to remove
+                if (activeUI) {
+                    clsArray = clsArray.concat(me.removeUIClsFromElement(cls));
+                }
+            }
+        }
+
+        if (skip !== true && activeUI) {
+            me.removeCls(clsArray);
+        }
+
+        return clsArray;
+    },
+
+    /**
+     * Checks if there is currently a specified `uiCls`.
+     * @param {String} cls The `cls` to check.
+     */
+    hasUICls: function(cls) {
+        var me = this,
+            uiCls = me.uiCls || [];
+
+        return Ext.Array.contains(uiCls, cls);
+    },
+
+    frameElementsArray: ['tl', 'tc', 'tr', 'ml', 'mc', 'mr', 'bl', 'bc', 'br'],
+
+    /**
+     * Method which adds a specified UI + `uiCls` to the components element. Can be overridden to remove the UI from more
+     * than just the components element.
+     * @param {String} ui The UI to remove from the element.
+     */
+    addUIClsToElement: function(cls) {
+        var me = this,
+            baseClsUi = me.baseCls + '-' + me.ui + '-' + cls,
+            result = [Ext.baseCSSPrefix + cls, me.baseCls + '-' + cls, baseClsUi],
+            frameElementsArray, frameElementsLength, i, el, frameElement;
+
+        if (me.rendered && me.frame && !Ext.supports.CSS3BorderRadius) {
+            // define each element of the frame
+            frameElementsArray = me.frameElementsArray;
+            frameElementsLength = frameElementsArray.length;
+
+            // loop through each of them, and if they are defined add the ui
+            for (i = 0; i < frameElementsLength; i++) {
+                frameElement = frameElementsArray[i];
+                el = me['frame' + frameElement.toUpperCase()];
+
+                if (el) {
+                    el.addCls(baseClsUi + '-' + frameElement);
+                }
+            }
+        }
+
+        return result;
+    },
+
+    /**
+     * Method which removes a specified UI + `uiCls` from the components element. The `cls` which is added to the element
+     * will be: `this.baseCls + '-' + ui`.
+     * @param {String} ui The UI to add to the element.
+     */
+    removeUIClsFromElement: function(cls) {
+        var me = this,
+            baseClsUi = me.baseCls + '-' + me.ui + '-' + cls,
+            result = [Ext.baseCSSPrefix + cls, me.baseCls + '-' + cls, baseClsUi],
+            frameElementsArray, frameElementsLength, i, el, frameElement;
+
+        if (me.rendered && me.frame && !Ext.supports.CSS3BorderRadius) {
+            // define each element of the frame
+            frameElementsArray = me.frameElementsArray;
+            frameElementsLength = frameElementsArray.length;
+
+            // loop through each of them, and if they are defined add the ui
+            for (i = 0; i < frameElementsLength; i++) {
+                frameElement = frameElementsArray[i];
+                el = me['frame' + frameElement.toUpperCase()];
+
+                if (el) {
+                    el.removeCls(baseClsUi + '-' + frameElement);
+                }
+            }
+        }
+
+        return result;
+    },
+
+    /**
+     * Method which adds a specified UI to the components element.
+     * @private
+     */
+    addUIToElement: function() {
+        var me = this,
+            baseClsUI = me.baseCls + '-' + me.ui,
+            frameElementsArray, frameElementsLength, i, el, frameElement;
+
+        me.addCls(baseClsUI);
+
+        if (me.rendered && me.frame && !Ext.supports.CSS3BorderRadius) {
+            // define each element of the frame
+            frameElementsArray = me.frameElementsArray;
+            frameElementsLength = frameElementsArray.length;
+
+            // loop through each of them, and if they are defined add the ui
+            for (i = 0; i < frameElementsLength; i++) {
+                frameElement = frameElementsArray[i];
+                el = me['frame' + frameElement.toUpperCase()];
+
+                if (el) {
+                    el.addCls(baseClsUI + '-' + frameElement);
+                }
+            }
+        }
+    },
+
+    /**
+     * Method which removes a specified UI from the components element.
+     * @private
+     */
+    removeUIFromElement: function() {
+        var me = this,
+            baseClsUI = me.baseCls + '-' + me.ui,
+            frameElementsArray, frameElementsLength, i, el, frameElement;
+
+        me.removeCls(baseClsUI);
+
+        if (me.rendered && me.frame && !Ext.supports.CSS3BorderRadius) {
+            // define each element of the frame
+            frameElementsArray = me.frameElementsArray;
+            frameElementsLength = frameElementsArray.length;
+
+            for (i = 0; i < frameElementsLength; i++) {
+                frameElement = frameElementsArray[i];
+                el = me['frame' + frameElement.toUpperCase()];
+
+                if (el) {
+                    el.removeCls(baseClsUI + '-' + frameElement);
+                }
+            }
+        }
+    },
+
+    /**
+     * @private
+     */
+    getTpl: function(name) {
+        return Ext.XTemplate.getTpl(this, name);
+    },
+
+    /**
+     * Applies padding, margin, border, top, left, height, and width configs to the
+     * appropriate elements.
+     * @private
+     */
+    initStyles: function(targetEl) {
+        var me = this,
+            Element = Ext.Element,
+            margin = me.margin,
+            border = me.border,
+            cls = me.cls,
+            style = me.style,
+            x = me.x,
+            y = me.y,
+            width, height;
+
+        me.initPadding(targetEl);
+
+        if (margin != null) {
+            targetEl.setStyle('margin', this.unitizeBox((margin === true) ? 5 : margin));
+        }
+
+        if (border != null) {
+            me.setBorder(border, targetEl);
+        }
+
+        // initComponent, beforeRender, or event handlers may have set the style or cls property since the protoEl was set up
+        // so we must apply styles and classes here too.
+        if (cls && cls != me.initialCls) {
+            targetEl.addCls(cls);
+            me.cls = me.initialCls = null;
+        }
+        if (style && style != me.initialStyle) {
+            targetEl.setStyle(style);
+            me.style = me.initialStyle = null;
+        }
+
+        if (x != null) {
+            targetEl.setStyle(me.horizontalPosProp, (typeof x == 'number') ? (x + 'px') : x);
+        }
+        if (y != null) {
+            targetEl.setStyle('top', (typeof y == 'number') ? (y + 'px') : y);
+        }
+
+        if (Ext.isBorderBox && (!me.ownerCt || me.floating)) {
+            targetEl.addCls(me.borderBoxCls);
+        }
+
+        // Framed components need their width/height to apply to the frame, which is
+        // best handled in layout at present.
+        if (!me.getFrameInfo()) {
+            width = me.width;
+            height = me.height;
+
+            // If we're using the content box model, we also cannot assign numeric initial sizes since we do not know the border widths to subtract
+            if (width != null) {
+                if (typeof width === 'number') {
+                    if (Ext.isBorderBox) {
+                        targetEl.setStyle('width', width + 'px');
+                    }
+                } else {
+                    targetEl.setStyle('width', width);
+                }
+            }
+            if (height != null) {
+                if (typeof height === 'number') {
+                    if (Ext.isBorderBox) {
+                        targetEl.setStyle('height', height + 'px');
+                    }
+                } else {
+                    targetEl.setStyle('height', height);
+                }
+            }
+        }
+    },
+
+    /**
+     * Initializes padding by applying it to the target element, or if the layout manages
+     * padding ensures that the padding on the target element is "0".
+     * @private
+     */
+    initPadding: function(targetEl) {
+        var me = this,
+            padding = me.padding;
+
+        if (padding != null) {
+            if (me.layout && me.layout.managePadding && me.contentPaddingProperty === 'padding') {
+                // If the container layout manages padding, the layout will apply the 
+                // padding to an inner element rather than the target element.  The
+                // assumed intent is for the configured padding to override any padding
+                // that is applied to the target element via stylesheet rules.  It is
+                // therefore necessary to set the target element's padding to "0".
+                targetEl.setStyle('padding', 0);
+            } else {
+                // Convert the padding, margin and border properties from a space seperated string
+                // into a proper style string
+                targetEl.setStyle('padding', this.unitizeBox((padding === true) ? 5 : padding));
+            }
+        }
+    },
+    
+    parseBox: function(box) {
+        return Ext.dom.Element.parseBox(box);    
+    },
+    
+    unitizeBox: function(box) {
+        return Ext.dom.Element.unitizeBox(box);    
+    },
+    
+    /**
+     * Sets the margin on the target element.
+     * @param {Number/String} margin The margin to set. See the {@link #margin} config.
+     */
+    setMargin: function(margin, /* private */ preventLayout) {
+        var me = this;
+        
+        if (me.rendered) {
+            if (!margin && margin !== 0) {
+                margin = '';
+            } else {
+                if (margin === true) {
+                    margin = 5;
+                }
+                margin = this.unitizeBox(margin);
+            }
+            me.getTargetEl().setStyle('margin', margin);
+            if (!preventLayout) {
+                me.updateLayout();
+            }
+        } else {
+            me.margin = margin;
+        }
+    },
+
+    /**
+     * Initialize any events on this component
+     * @protected
+     */
+    initEvents : function() {
+        var me = this,
+            afterRenderEvents = me.afterRenderEvents,
+            afterRenderEvent, el, property, index, len;
+
+        if (afterRenderEvents) {
+            for (property in afterRenderEvents) {
+                el = me[property];
+
+                if (el && el.on) {
+                    afterRenderEvent = afterRenderEvents[property];
+
+                    for (index = 0, len = afterRenderEvent.length ; index < len ; ++index) {
+                        me.mon(el, afterRenderEvent[index]);
+                     }
+                 }
+            }
+        }
+
+        // This will add focus/blur listeners to the getFocusEl() element if that is naturally focusable.
+        // If *not* naturally focusable, then the FocusManager must be enabled to get it to listen for focus so that
+        // the FocusManager can track and highlight focus.
+        me.addFocusListener();
+    },
+
+    /**
+     * @private
+     * Sets up the focus listener on this Component's {@link #getFocusEl focusEl} if it has one.
+     * 
+     * Form Components which must implicitly participate in tabbing order usually have a naturally focusable
+     * element as their {@link #getFocusEl focusEl}, and it is the DOM event of that receiving focus which drives
+     * the Component's `onFocus` handling, and the DOM event of it being blurred which drives the `onBlur` handling.
+     *
+     * If the {@link #getFocusEl focusEl} is **not** naturally focusable, then the listeners are only added
+     * if the {@link Ext.FocusManager FocusManager} is enabled.
+     */
+    addFocusListener: function() {
+        var me = this,
+            focusEl = me.getFocusEl(),
+            needsTabIndex;
+
+        // All Containers may be focusable, not only "form" type elements, but also
+        // Panels, Toolbars, Windows etc.
+        // Usually, the <DIV> element they will return as their focusEl will not be able to receive focus
+        // However, if the FocusManager is invoked, its non-default navigation handlers (invoked when
+        // tabbing/arrowing off of certain Components) may explicitly focus a Panel or Container or FieldSet etc.
+        // Add listeners to the focus and blur events on the focus element
+
+        // If this Component returns a focusEl, we might need to add a focus listener to it.
+        if (focusEl) {
+            // getFocusEl might return a Component if a Container wishes to delegate focus to a descendant.
+            // Window can do this via its defaultFocus configuration which can reference a Button.
+            if (focusEl.isComponent) {
+                return focusEl.addFocusListener();
+            }
+
+            // If the focusEl is naturally focusable, then we always need a focus listener to drive the Component's
+            // onFocus handling.
+            // If *not* naturally focusable, then we only need the focus listener if the FocusManager is enabled.
+            needsTabIndex = focusEl.needsTabIndex();
+            if (!me.focusListenerAdded && (!needsTabIndex || Ext.FocusManager.enabled)) {
+                if (needsTabIndex) {
+                    focusEl.dom.tabIndex = -1;
+                }
+                focusEl.on({
+                    focus: me.onFocus,
+                    blur: me.onBlur,
+                    scope: me
+                });
+                me.focusListenerAdded = true;
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Returns the focus holder element associated with this Component. At the Component base class level, this function returns `undefined`.
+     *
+     * Subclasses which use embedded focusable elements (such as Window, Field and Button) should override this
+     * for use by the {@link Ext.Component#method-focus focus} method.
+     *
+     * Containers which need to participate in the {@link Ext.FocusManager FocusManager}'s navigation and Container focusing scheme also
+     * need to return a `focusEl`, although focus is only listened for in this case if the {@link Ext.FocusManager FocusManager} is {@link Ext.FocusManager#method-enable enable}d.
+     *
+     * @returns {undefined} `undefined` because raw Components cannot by default hold focus.
+     */
+    getFocusEl: Ext.emptyFn,
+
+    isFocusable: function() {
+        var me = this,
+            focusEl;
+        if ((me.focusable !== false) && (focusEl = me.getFocusEl()) && me.rendered && !me.destroying && !me.isDestroyed && !me.disabled && me.isVisible(true)) {
+
+            // getFocusEl might return a Component if a Container wishes to delegate focus to a descendant.
+            // Window can do this via its defaultFocus configuration which can reference a Button.
+            // Both Component and Element implement isFocusable, so always ask that.
+            return focusEl.isFocusable(true);
+        }
+    },
+
+    /**
+     * Template method to do any pre-focus processing.
+     * @protected
+     * @param {Ext.EventObject} e The event object
+     */
+    beforeFocus: Ext.emptyFn,
+
+    // private
+    onFocus: function(e) {
+        var me = this,
+            focusCls = me.focusCls,
+            focusEl = me.getFocusEl();
+
+        if (!me.disabled) {
+            me.beforeFocus(e);
+            if (focusCls && focusEl) {
+                focusEl.addCls(me.addClsWithUI(focusCls, true));
+            }
+            if (!me.hasFocus) {
+                me.hasFocus = true;
+                me.fireEvent('focus', me, e);
+            }
+        }
+    },
+
+    /**
+     * Template method to do any pre-blur processing.
+     * @protected
+     * @param {Ext.EventObject} e The event object
+     */
+    beforeBlur : Ext.emptyFn,
+
+    // private
+    onBlur : function(e) {
+        var me = this,
+            focusCls = me.focusCls,
+            focusEl = me.getFocusEl();
+
+        if (me.destroying) {
+            return;
+        }
+
+        me.beforeBlur(e);
+        if (focusCls && focusEl) {
+            focusEl.removeCls(me.removeClsWithUI(focusCls, true));
+        }
+        if (me.validateOnBlur) {
+            me.validate();
+        }
+        me.hasFocus = false;
+        me.fireEvent('blur', me, e);
+        me.postBlur(e);
+    },
+
+    /**
+     * Template method to do any post-blur processing.
+     * @protected
+     * @param {Ext.EventObject} e The event object
+     */
+    postBlur : Ext.emptyFn,
+
+    /**
+     * Tests whether this Component matches the selector string.
+     * @param {String} selector The selector string to test against.
+     * @return {Boolean} `true` if this Component matches the selector.
+     */
+    is: function(selector) {
+        return Ext.ComponentQuery.is(this, selector);
+    },
+
+    /**
+     * Navigates up the ownership hierarchy searching for an ancestor Container which matches any passed simple selector or component.
+     *
+     * *Important.* There is not a universal upwards navigation pointer. There are several upwards relationships
+     * such as the {@link Ext.button.Button button} which activates a {@link Ext.button.Button#cfg-menu menu}, or the
+     * {@link Ext.menu.Item menu item} which activated a {@link Ext.menu.Item#cfg-menu submenu}, or the
+     * {@link Ext.grid.column.Column column header} which activated the column menu.
+     *
+     * These differences are abstracted away by this method.
+     *
+     * Example:
+     *
+     *     var owningTabPanel = grid.up('tabpanel');
+     *
+     * @param {String/Ext.Component} [selector] The simple selector component or actual component to test. If not passed the immediate owner/activater is returned.
+     * @param {String/Number/Ext.Component} [limit] This may be a selector upon which to stop the upward scan, or a limit of teh number of steps, or Component reference to stop on.
+     * @return {Ext.container.Container} The matching ancestor Container (or `undefined` if no match was found).
+     */
+    up: function (selector, limit) {
+        var result = this.getRefOwner(),
+            limitSelector = typeof limit === 'string',
+            limitCount = typeof limit === 'number',
+            limitComponent = limit && limit.isComponent,
+            steps = 0;
+
+        if (selector) {
+            for (; result; result = result.getRefOwner()) {
+                steps++;
+                if (selector.isComponent) {
+                    if (result === selector) {
+                        return result;
+                    }
+                } else {
+                    if (Ext.ComponentQuery.is(result, selector)) {
+                        return result;
+                    }
+                }
+
+                // Stop when we hit the limit selector
+                if (limitSelector && result.is(limit)) {
+                    return;
+                }
+                if (limitCount && steps === limit) {
+                    return;
+                }
+                if (limitComponent && result === limit) {
+                    return;
+                }
+            }
+        }
+        return result;
+    },
+
+    /**
+     * Returns the next sibling of this Component.
+     *
+     * Optionally selects the next sibling which matches the passed {@link Ext.ComponentQuery ComponentQuery} selector.
+     *
+     * May also be referred to as **`next()`**
+     *
+     * Note that this is limited to siblings, and if no siblings of the item match, `null` is returned. Contrast with
+     * {@link #nextNode}
+     * @param {String} [selector] A {@link Ext.ComponentQuery ComponentQuery} selector to filter the following items.
+     * @return {Ext.Component} The next sibling (or the next sibling which matches the selector).
+     * Returns `null` if there is no matching sibling.
+     */
+    nextSibling: function(selector) {
+        var o = this.ownerCt, it, last, idx, c;
+        if (o) {
+            it = o.items;
+            idx = it.indexOf(this) + 1;
+            if (idx) {
+                if (selector) {
+                    for (last = it.getCount(); idx < last; idx++) {
+                        if ((c = it.getAt(idx)).is(selector)) {
+                            return c;
+                        }
+                    }
+                } else {
+                    if (idx < it.getCount()) {
+                        return it.getAt(idx);
+                    }
+                }
+            }
+        }
+        return null;
+    },
+
+    /**
+     * Returns the previous sibling of this Component.
+     *
+     * Optionally selects the previous sibling which matches the passed {@link Ext.ComponentQuery ComponentQuery}
+     * selector.
+     *
+     * May also be referred to as **`prev()`**
+     *
+     * Note that this is limited to siblings, and if no siblings of the item match, `null` is returned. Contrast with
+     * {@link #previousNode}
+     * @param {String} [selector] A {@link Ext.ComponentQuery ComponentQuery} selector to filter the preceding items.
+     * @return {Ext.Component} The previous sibling (or the previous sibling which matches the selector).
+     * Returns `null` if there is no matching sibling.
+     */
+    previousSibling: function(selector) {
+        var o = this.ownerCt, it, idx, c;
+        if (o) {
+            it = o.items;
+            idx = it.indexOf(this);
+            if (idx != -1) {
+                if (selector) {
+                    for (--idx; idx >= 0; idx--) {
+                        if ((c = it.getAt(idx)).is(selector)) {
+                            return c;
+                        }
+                    }
+                } else {
+                    if (idx) {
+                        return it.getAt(--idx);
+                    }
+                }
+            }
+        }
+        return null;
+    },
+
+    /**
+     * Returns the previous node in the Component tree in tree traversal order.
+     *
+     * Note that this is not limited to siblings, and if invoked upon a node with no matching siblings, will walk the
+     * tree in reverse order to attempt to find a match. Contrast with {@link #previousSibling}.
+     * @param {String} [selector] A {@link Ext.ComponentQuery ComponentQuery} selector to filter the preceding nodes.
+     * @return {Ext.Component} The previous node (or the previous node which matches the selector).
+     * Returns `null` if there is no matching node.
+     */
+    previousNode: function(selector, /* private */ includeSelf) {
+        var node = this,
+            ownerCt = node.ownerCt,
+            result,
+            it, i, sib;
+
+        // If asked to include self, test me
+        if (includeSelf && node.is(selector)) {
+            return node;
+        }
+
+        if (ownerCt) {
+            for (it = ownerCt.items.items, i = Ext.Array.indexOf(it, node) - 1; i > -1; i--) {
+                sib = it[i];
+                if (sib.query) {
+                    result = sib.query(selector);
+                    result = result[result.length - 1];
+                    if (result) {
+                        return result;
+                    }
+                }
+                if (sib.is(selector)) {
+                    return sib;
+                }
+            }
+            return ownerCt.previousNode(selector, true);
+        }
+        return null;
+    },
+
+    /**
+     * Returns the next node in the Component tree in tree traversal order.
+     *
+     * Note that this is not limited to siblings, and if invoked upon a node with no matching siblings, will walk the
+     * tree to attempt to find a match. Contrast with {@link #nextSibling}.
+     * @param {String} [selector] A {@link Ext.ComponentQuery ComponentQuery} selector to filter the following nodes.
+     * @return {Ext.Component} The next node (or the next node which matches the selector).
+     * Returns `null` if there is no matching node.
+     */
+    nextNode: function(selector, /* private */ includeSelf) {
+        var node = this,
+            ownerCt = node.ownerCt,
+            result,
+            it, len, i, sib;
+
+        // If asked to include self, test me
+        if (includeSelf && node.is(selector)) {
+            return node;
+        }
+
+        if (ownerCt) {
+            for (it = ownerCt.items.items, i = Ext.Array.indexOf(it, node) + 1, len = it.length; i < len; i++) {
+                sib = it[i];
+                if (sib.is(selector)) {
+                    return sib;
+                }
+                if (sib.down) {
+                    result = sib.down(selector);
+                    if (result) {
+                        return result;
+                    }
+                }
+            }
+            return ownerCt.nextNode(selector);
+        }
+        return null;
+    },
+
+    /**
+     * Retrieves the `id` of this component. Will auto-generate an `id` if one has not already been set.
+     * @return {String}
+     */
+    getId : function() {
+        return this.id || (this.id = 'ext-comp-' + (this.getAutoId()));
+    },
+
+    /**
+     * Returns the value of {@link #itemId} assigned to this component, or when that
+     * is not set, returns the value of {@link #id}.
+     * @return {String}
+     */
+    getItemId : function() {
+        return this.itemId || this.id;
+    },
+
+    /**
+     * Retrieves the top level element representing this component.
+     * @return {Ext.dom.Element}
+     * @since 1.1.0
+     */
+    getEl : function() {
+        return this.el;
+    },
+
+    /**
+     * This is used to determine where to insert the 'html', 'contentEl' and 'items' in this component.
+     * @private
+     */
+    getTargetEl: function() {
+        return this.frameBody || this.el;
+    },
+    
+    /**
+     * Get an el for overflowing, defaults to the target el
+     * @private
+     */
+    getOverflowEl: function(){
+        return this.getTargetEl();
+    },
+
+    /**
+     * @private
+     * Returns the CSS style object which will set the Component's scroll styles. This must be applied
+     * to the {@link #getTargetEl target element}.
+     */
+    getOverflowStyle: function() {
+        var me = this,
+            result = null,
+            ox, oy,
+            overflowStyle;
+
+        // Note to maintainer. To save on waves of testing, setting and defaulting, the code below
+        // rolls assignent statements into conditional test value expressiona and property object initializers.
+        // This avoids sprawling code. Maintain with care.
+        if (typeof me.autoScroll === 'boolean') {
+            result = {
+                overflow: overflowStyle = me.autoScroll ? 'auto' : ''
+            };
+            me.scrollFlags = {
+                overflowX: overflowStyle,
+                overflowY: overflowStyle,
+                x: true,
+                y: true,
+                both: true
+            };
+        } else {
+            ox = me.overflowX;
+            oy = me.overflowY;
+            if (ox !== undefined || oy !== undefined) {
+                result = {
+                    'overflowX':  ox = ox || '',
+                    'overflowY':  oy = oy || ''
+                };
+
+                /**
+                * @member Ext.Component
+                * @property {Object} scrollFlags
+                * An object property which provides unified information as to which dimensions are scrollable based upon
+                * the {@link #autoScroll}, {@link #overflowX} and {@link #overflowY} settings (And for *views* of trees and grids, the owning panel's {@link Ext.panel.Table#scroll scroll} setting).
+                * 
+                * Note that if you set overflow styles using the {@link #style} config or {@link Ext.panel.Panel#bodyStyle bodyStyle} config, this object does not include that information;
+                * it is best to use {@link #autoScroll}, {@link #overflowX} and {@link #overflowY} if you need to access these flags.
+                * 
+                * This object has the following properties:
+                * @property {Boolean} scrollFlags.x `true` if this Component is scrollable horizontally - style setting may be `'auto'` or `'scroll'`.
+                * @property {Boolean} scrollFlags.y `true` if this Component is scrollable vertically - style setting may be `'auto'` or `'scroll'`.
+                * @property {Boolean} scrollFlags.both `true` if this Component is scrollable both horizontally and vertically.
+                * @property {String} scrollFlags.overflowX The `overflow-x` style setting, `'auto'` or `'scroll'` or `''`.
+                * @property {String} scrollFlags.overflowY The `overflow-y` style setting, `'auto'` or `'scroll'` or `''`.
+                * @readonly
+                */
+                me.scrollFlags = {
+                    overflowX: ox,
+                    overflowY: oy,
+                    x: ox = (ox === 'auto' || ox === 'scroll'),
+                    y: oy = (oy === 'auto' || oy === 'scroll'),
+                    both: ox && oy
+                };
+            } else {
+                me.scrollFlags = {
+                    overflowX: '',
+                    overflowY: '',
+                    x: false,
+                    y: false,
+                    both: false
+                };
+            }
+        }
+
+        // The scrollable container element must be non-statically positioned or IE6/7 will make
+        // positioned children stay in place rather than scrolling with the rest of the content
+        if (result && Ext.isIE7m) {
+            result.position = 'relative';
+        }
+
+        return result;
+    },
+
+    /**
+     * Tests whether or not this Component is of a specific xtype. This can test whether this Component is descended
+     * from the xtype (default) or whether it is directly of the xtype specified (`shallow = true`).
+     *
+     * **If using your own subclasses, be aware that a Component must register its own xtype to participate in
+     * determination of inherited xtypes.**
+     *
+     * For a list of all available xtypes, see the {@link Ext.Component} header.
+     *
+     * Example usage:
+     *
+     *     @example
+     *     var t = new Ext.form.field.Text();
+     *     var isText = t.isXType('textfield');        // true
+     *     var isBoxSubclass = t.isXType('field');       // true, descended from Ext.form.field.Base
+     *     var isBoxInstance = t.isXType('field', true); // false, not a direct Ext.form.field.Base instance
+     *
+     * @param {String} xtype The xtype to check for this Component
+     * @param {Boolean} [shallow=false] `true` to check whether this Component is directly of the specified xtype, `false` to
+     * check whether this Component is descended from the xtype.
+     * @return {Boolean} `true` if this component descends from the specified xtype, `false` otherwise.
+     *
+     * @since 2.3.0
+     */
+    isXType: function(xtype, shallow) {
+        if (shallow) {
+            return this.xtype === xtype;
+        }
+        else {
+            return this.xtypesMap[xtype];
+        }
+    },
+
+    /**
+     * Returns this Component's xtype hierarchy as a slash-delimited string. For a list of all available xtypes, see the
+     * {@link Ext.Component} header.
+     *
+     * **If using your own subclasses, be aware that a Component must register its own xtype to participate in
+     * determination of inherited xtypes.**
+     *
+     * Example usage:
+     *
+     *     @example
+     *     var t = new Ext.form.field.Text();
+     *     alert(t.getXTypes());  // alerts 'component/field/textfield'
+     *
+     * @return {String} The xtype hierarchy string
+     *
+     * @since 2.3.0
+     */
+    getXTypes: function() {
+        var self = this.self,
+            xtypes, parentPrototype, parentXtypes;
+
+        if (!self.xtypes) {
+            xtypes = [];
+            parentPrototype = this;
+
+            while (parentPrototype) {
+                parentXtypes = parentPrototype.xtypes;
+
+                if (parentXtypes !== undefined) {
+                    xtypes.unshift.apply(xtypes, parentXtypes);
+                }
+
+                parentPrototype = parentPrototype.superclass;
+            }
+
+            self.xtypeChain = xtypes;
+            self.xtypes = xtypes.join('/');
+        }
+
+        return self.xtypes;
+    },
+
+    /**
+     * Update the content area of a component.
+     * @param {String/Object} htmlOrData If this component has been configured with a template via the tpl config then
+     * it will use this argument as data to populate the template. If this component was not configured with a template,
+     * the components content area will be updated via Ext.Element update.
+     * @param {Boolean} [loadScripts=false] Only legitimate when using the `html` configuration.
+     * @param {Function} [callback] Only legitimate when using the `html` configuration. Callback to execute when
+     * scripts have finished loading.
+     *
+     * @since 3.4.0
+     */
+    update : function(htmlOrData, loadScripts, cb) {
+        var me = this,
+            isData = (me.tpl && !Ext.isString(htmlOrData)),
+            el;
+
+        if (isData) {
+            me.data = htmlOrData;
+        } else {
+            me.html = Ext.isObject(htmlOrData) ? Ext.DomHelper.markup(htmlOrData) : htmlOrData;
+        }
+
+        if (me.rendered) {
+            el = me.isContainer ? me.layout.getRenderTarget() : me.getTargetEl();
+            if (isData) {
+                me.tpl[me.tplWriteMode](el, htmlOrData || {});
+            } else {
+                el.update(me.html, loadScripts, cb);
+            }
+            me.updateLayout();
+        }
+
+    },
+
+    /**
+     * Convenience function to hide or show this component by Boolean.
+     * @param {Boolean} visible `true` to show, `false` to hide.
+     * @return {Ext.Component} this
+     * @since 1.1.0
+     */
+    setVisible : function(visible) {
+        return this[visible ? 'show': 'hide']();
+    },
+
+    /**
+     * Returns `true` if this component is visible.
+     *
+     * @param {Boolean} [deep=false] Pass `true` to interrogate the visibility status of all parent Containers to
+     * determine whether this Component is truly visible to the user.
+     *
+     * Generally, to determine whether a Component is hidden, the no argument form is needed. For example when creating
+     * dynamically laid out UIs in a hidden Container before showing them.
+     *
+     * @return {Boolean} `true` if this component is visible, `false` otherwise.
+     *
+     * @since 1.1.0
+     */
+    isVisible: function(deep) {
+        var me = this,
+            hidden;
+
+        if (me.hidden || !me.rendered || me.isDestroyed) {
+            hidden = true;
+        } else if (deep) {
+            hidden = me.isHierarchicallyHidden();
+        }
+
+        return !hidden;
+    },
+
+    isHierarchicallyHidden: function() {
+        var child = this,
+            hidden = false,
+            parent, parentHierarchyState;
+
+        // It is possible for some components to be immune to collapse meaning the immune
+        // component remains visible when its direct parent is collapsed, e.g. panel header.
+        // Because of this, we must walk up the component hierarchy to determine the true
+        // visible state of the component.
+        for (; (parent = child.ownerCt || child.floatParent); child = parent) {
+            parentHierarchyState = parent.getHierarchyState();
+            if (parentHierarchyState.hidden) {
+                hidden = true;
+                break;
+            }
+            if (child.getHierarchyState().collapseImmune) {
+                // The child or one of its ancestors is immune to collapse.
+                if (parent.collapsed && !child.collapseImmune) {
+                    // If the child's direct parent is collapsed, and the child
+                    // itself does not have collapse immunity we know that
+                    // the child is not visible.
+                    hidden = true;
+                    break;
+                }
+            } else {
+                // We have ascended the tree to a point where collapse immunity
+                // is not in play.  This means if any anscestor above this point
+                // is collapsed, then the component is not visible.
+                hidden = !!parentHierarchyState.collapsed;
+                break;
+            }
+        }
+
+        return hidden;
+    },
+
+    onBoxReady: function(width, height) {
+        var me = this;
+
+        if (me.disableOnBoxReady) {
+            me.onDisable();
+        } else if (me.enableOnBoxReady) {
+            me.onEnable();
+        }
+        if (me.resizable) {
+            me.initResizable(me.resizable);
+        }
+
+        // Draggability must be initialized after resizability
+        // Because if we have to be wrapped, the resizer wrapper must be dragged as a pseudo-Component
+        if (me.draggable) {
+            me.initDraggable();
+        }
+        
+        if (me.hasListeners.boxready) {
+            me.fireEvent('boxready', me, width, height);
+        }
+    },
+
+    /**
+     * Enable the component
+     * @param {Boolean} [silent=false] Passing `true` will suppress the `enable` event from being fired.
+     * @since 1.1.0
+     */
+    enable: function(silent) {
+        var me = this;
+
+        delete me.disableOnBoxReady;
+        me.removeCls(me.disabledCls);
+        if (me.rendered) {
+            me.onEnable();
+        } else {
+            me.enableOnBoxReady = true;
+        }
+
+        me.disabled = false;
+        delete me.resetDisable;
+
+        if (silent !== true) {
+            me.fireEvent('enable', me);
+        }
+
+        return me;
+    },
+
+    /**
+     * Disable the component.
+     * @param {Boolean} [silent=false] Passing `true` will suppress the `disable` event from being fired.
+     * @since 1.1.0
+     */
+    disable: function(silent) {
+        var me = this;
+
+        delete me.enableOnBoxReady;
+        me.addCls(me.disabledCls);
+        if (me.rendered) {
+            me.onDisable();
+        } else {
+            me.disableOnBoxReady = true;
+        }
+
+        me.disabled = true;
+
+        if (silent !== true) {
+            delete me.resetDisable;
+            me.fireEvent('disable', me);
+        }
+
+        return me;
+    },
+
+    /**
+     * Allows addition of behavior to the enable operation.
+     * After calling the superclass's `onEnable`, the Component will be enabled.
+     *
+     * @template
+     * @protected
+     */
+    onEnable: function() {
+        if (this.maskOnDisable) {
+            this.el.dom.disabled = false;
+            this.unmask();
+        }
+    },
+
+    /**
+     * Allows addition of behavior to the disable operation.
+     * After calling the superclass's `onDisable`, the Component will be disabled.
+     *
+     * @template
+     * @protected
+     */
+    onDisable : function() {
+        var me = this,
+            focusCls = me.focusCls,
+            focusEl = me.getFocusEl();
+            
+        if (focusCls && focusEl) {
+            focusEl.removeCls(me.removeClsWithUI(focusCls, true));
+        }
+        
+        if (me.maskOnDisable) {
+            me.el.dom.disabled = true;
+            me.mask();
+        }
+    },
+
+    mask: function() {
+        var box = this.lastBox,
+            target = this.getMaskTarget(),
+            args = [];
+
+        // Pass it the height of our element if we know it.
+        if (box) {
+            args[2] = box.height;
+        }
+        target.mask.apply(target, args);
+    },
+
+    unmask: function() {
+        this.getMaskTarget().unmask();
+    },
+
+    getMaskTarget: function(){
+        return this.el;
+    },
+
+    /**
+     * Method to determine whether this Component is currently disabled.
+     * @return {Boolean} the disabled state of this Component.
+     */
+    isDisabled : function() {
+        return this.disabled;
+    },
+
+    /**
+     * Enable or disable the component.
+     * @param {Boolean} disabled `true` to disable.
+     */
+    setDisabled : function(disabled) {
+        return this[disabled ? 'disable': 'enable']();
+    },
+
+    /**
+     * Method to determine whether this Component is currently set to hidden.
+     * @return {Boolean} the hidden state of this Component.
+     */
+    isHidden : function() {
+        return this.hidden;
+    },
+
+    /**
+     * Adds a CSS class to the top level element representing this component.
+     * @param {String/String[]} cls The CSS class name to add.
+     * @return {Ext.Component} Returns the Component to allow method chaining.
+     */
+    addCls : function(cls) {
+        var me = this,
+            el = me.rendered ? me.el : me.protoEl;
+
+        el.addCls.apply(el, arguments);
+        return me;
+    },
+
+    /**
+     * @inheritdoc Ext.AbstractComponent#addCls
+     * @deprecated 4.1 Use {@link #addCls} instead.
+     * @since 2.3.0
+     */
+    addClass : function() {
+        return this.addCls.apply(this, arguments);
+    },
+
+    /**
+     * Checks if the specified CSS class exists on this element's DOM node.
+     * @param {String} className The CSS class to check for.
+     * @return {Boolean} `true` if the class exists, else `false`.
+     * @method
+     */
+    hasCls: function (cls) {
+        var me = this,
+            el = me.rendered ? me.el : me.protoEl;
+
+        return el.hasCls.apply(el, arguments);
+    },
+
+    /**
+     * Removes a CSS class from the top level element representing this component.
+     * @param {String/String[]} cls The CSS class name to remove.
+     * @returns {Ext.Component} Returns the Component to allow method chaining.
+     */
+    removeCls : function(cls) {
+        var me = this,
+            el = me.rendered ? me.el : me.protoEl;
+
+        el.removeCls.apply(el, arguments);
+        return me;
+    },
+
+    // @since 2.3.0
+    removeClass : function() {
+        if (Ext.isDefined(Ext.global.console)) {
+            Ext.global.console.warn('Ext.Component: removeClass has been deprecated. Please use removeCls.');
+        }
+        return this.removeCls.apply(this, arguments);
+    },
+
+    addOverCls: function() {
+        var me = this;
+        if (!me.disabled) {
+            me.el.addCls(me.overCls);
+        }
+    },
+
+    removeOverCls: function() {
+        this.el.removeCls(this.overCls);
+    },
+
+    addListener : function(element, listeners, scope, options) {
+        var me = this,
+            fn,
+            option;
+
+        if (Ext.isString(element) && (Ext.isObject(listeners) || options && options.element)) {
+            if (options.element) {
+                fn = listeners;
+
+                listeners = {};
+                listeners[element] = fn;
+                element = options.element;
+                if (scope) {
+                    listeners.scope = scope;
+                }
+
+                for (option in options) {
+                    if (options.hasOwnProperty(option)) {
+                        if (me.eventOptionsRe.test(option)) {
+                            listeners[option] = options[option];
+                        }
+                    }
+                }
+            }
+
+            // At this point we have a variable called element,
+            // and a listeners object that can be passed to on
+            if (me[element] && me[element].on) {
+                me.mon(me[element], listeners);
+            } else {
+                me.afterRenderEvents = me.afterRenderEvents || {};
+                if (!me.afterRenderEvents[element]) {
+                    me.afterRenderEvents[element] = [];
+                }
+                me.afterRenderEvents[element].push(listeners);
+            }
+            return;
+        }
+
+        return me.mixins.observable.addListener.apply(me, arguments);
+    },
+
+    // inherit docs
+    removeManagedListenerItem: function(isClear, managedListener, item, ename, fn, scope){
+        var me = this,
+            element = managedListener.options ? managedListener.options.element : null;
+
+        if (element) {
+            element = me[element];
+            if (element && element.un) {
+                if (isClear || (managedListener.item === item && managedListener.ename === ename && (!fn || managedListener.fn === fn) && (!scope || managedListener.scope === scope))) {
+                    element.un(managedListener.ename, managedListener.fn, managedListener.scope);
+                    if (!isClear) {
+                        Ext.Array.remove(me.managedListeners, managedListener);
+                    }
+                }
+            }
+        } else {
+            return me.mixins.observable.removeManagedListenerItem.apply(me, arguments);
+        }
+    },
+
+    /**
+     * Provides the link for Observable's `fireEvent` method to bubble up the ownership hierarchy.
+     * @return {Ext.container.Container} the Container which owns this Component.
+     * @since 3.4.0
+     */
+    getBubbleTarget : function() {
+        return this.ownerCt;
+    },
+
+    /**
+     * Method to determine whether this Component is floating.
+     * @return {Boolean} the floating state of this component.
+     */
+    isFloating : function() {
+        return this.floating;
+    },
+
+    /**
+     * Method to determine whether this Component is draggable.
+     * @return {Boolean} the draggable state of this component.
+     */
+    isDraggable : function() {
+        return !!this.draggable;
+    },
+
+    /**
+     * Method to determine whether this Component is droppable.
+     * @return {Boolean} the droppable state of this component.
+     */
+    isDroppable : function() {
+        return !!this.droppable;
+    },
+
+    /**
+     * Method to manage awareness of when components are added to their
+     * respective Container, firing an #added event. References are
+     * established at add time rather than at render time.
+     *
+     * Allows addition of behavior when a Component is added to a
+     * Container. At this stage, the Component is in the parent
+     * Container's collection of child items. After calling the
+     * superclass's `onAdded`, the `ownerCt` reference will be present,
+     * and if configured with a ref, the `refOwner` will be set.
+     *
+     * @param {Ext.container.Container} container Container which holds the component.
+     * @param {Number} pos Position at which the component was added.
+     *
+     * @template
+     * @protected
+     * @since 3.4.0
+     */
+    onAdded : function(container, pos) {
+        var me = this;
+
+        me.ownerCt = container;
+
+        if (me.hierarchyState) {
+            // if component has a hierarchyState at this point we set an invalid flag in the
+            // hierarchy state so that descendants of this component know to re-initialize
+            // their hierarchyState the next time it is requested (see getHierarchyState())
+            me.hierarchyState.invalid = true;
+            // We can now delete the old hierarchyState since it is invalid.  IMPORTANT:
+            // the descendants are still linked to the old hierarchy state via the
+            // prototype chain, and their heirarchyState property will be synced up 
+            // the next time their getHierarchyState() method is called.  For this reason
+            // hierarchyState should always be accessed using getHierarchyState()
+            delete me.hierarchyState;
+        }
+
+        if (me.hasListeners.added) {
+            me.fireEvent('added', me, container, pos);
+        }
+    },
+
+    /**
+     * Method to manage awareness of when components are removed from their
+     * respective Container, firing a #removed event. References are properly
+     * cleaned up after removing a component from its owning container.
+     *
+     * Allows addition of behavior when a Component is removed from
+     * its parent Container. At this stage, the Component has been
+     * removed from its parent Container's collection of child items,
+     * but has not been destroyed (It will be destroyed if the parent
+     * Container's `autoDestroy` is `true`, or if the remove call was
+     * passed a truthy second parameter). After calling the
+     * superclass's `onRemoved`, the `ownerCt` and the `refOwner` will not
+     * be present.
+     * @param {Boolean} destroying Will be passed as `true` if the Container performing the remove operation will delete this
+     * Component upon remove.
+     *
+     * @template
+     * @protected
+     * @since 3.4.0
+     */
+    onRemoved : function(destroying) {
+        var me = this;
+        if (me.hasListeners.removed) {
+            me.fireEvent('removed', me, me.ownerCt);
+        }
+        delete me.ownerCt;
+        delete me.ownerLayout;
+    },
+
+    /**
+     * Invoked before the Component is destroyed.
+     *
+     * @method
+     * @template
+     * @protected
+     */
+    beforeDestroy : Ext.emptyFn,
+
+    /**
+     * Allows addition of behavior to the resize operation.
+     *
+     * Called when Ext.resizer.Resizer#drag event is fired.
+     *
+     * @method
+     * @template
+     * @protected
+     */
+    onResize: function(width, height, oldWidth, oldHeight) {
+        var me = this;
+
+        // constrain is a config on Floating
+        if (me.floating && me.constrain) {
+            me.doConstrain();
+        }
+        if (me.hasListeners.resize) {
+            me.fireEvent('resize', me, width, height, oldWidth, oldHeight);
+        }
+    },
+
+    /**
+     * Sets the width and height of this Component. This method fires the {@link #resize} event. This method can accept
+     * either width and height as separate arguments, or you can pass a size object like `{width:10, height:20}`.
+     *
+     * @param {Number/String/Object} width The new width to set. This may be one of:
+     *
+     *   - A Number specifying the new width in the {@link #getEl Element}'s {@link Ext.Element#defaultUnit}s (by default, pixels).
+     *   - A String used to set the CSS width style.
+     *   - A size object in the format `{width: widthValue, height: heightValue}`.
+     *   - `undefined` to leave the width unchanged.
+     *
+     * @param {Number/String} height The new height to set (not required if a size object is passed as the first arg).
+     * This may be one of:
+     *
+     *   - A Number specifying the new height in the {@link #getEl Element}'s {@link Ext.Element#defaultUnit}s (by default, pixels).
+     *   - A String used to set the CSS height style. Animation may **not** be used.
+     *   - `undefined` to leave the height unchanged.
+     *
+     * @return {Ext.Component} this
+     */
+    setSize : function(width, height) {
+        var me = this;
+
+        // support for standard size objects
+        if (width && typeof width == 'object') {
+            height = width.height;
+            width  = width.width;
+        }
+
+        // Constrain within configured maxima
+        if (typeof width == 'number') {
+            me.width = Ext.Number.constrain(width, me.minWidth, me.maxWidth);
+        } else if (width === null) {
+            delete me.width;
+        }
+        
+        if (typeof height == 'number') {
+            me.height = Ext.Number.constrain(height, me.minHeight, me.maxHeight);
+        } else if (height === null) {
+            delete me.height;
+        }
+
+        // If not rendered, all we need to is set the properties.
+        // The initial layout will set the size
+        if (me.rendered && me.isVisible()) {
+
+            // If we are changing size, then we are not the root.
+            me.updateLayout({
+                isRoot: false
+            });
+        }
+
+        return me;
+    },
+
+    /**
+     * Determines whether this Component is the root of a layout. This returns `true` if
+     * this component can run its layout without assistance from or impact on its owner.
+     * If this component cannot run its layout given these restrictions, `false` is returned
+     * and its owner will be considered as the next candidate for the layout root.
+     *
+     * Setting the {@link #_isLayoutRoot} property to `true` causes this method to always
+     * return `true`. This may be useful when updating a layout of a Container which shrink
+     * wraps content, and you know that it will not change size, and so can safely be the
+     * topmost participant in the layout run.
+     * @protected
+     */
+    isLayoutRoot: function() {
+        var me = this,
+            ownerLayout = me.ownerLayout;
+
+        // Return true if we have been explicitly flagged as the layout root, or if we are floating.
+        // Sometimes floating Components get an ownerCt ref injected into them which is *not* a true ownerCt, merely
+        // an upward link for reference purposes. For example a grid column menu is linked to the
+        // owning header via an ownerCt reference.
+        if (!ownerLayout || me._isLayoutRoot || me.floating) {
+            return true;
+        }
+
+        return ownerLayout.isItemLayoutRoot(me);
+    },
+
+    /**
+     * Returns `true` if layout is suspended for this component. This can come from direct
+     * suspension of this component's layout activity ({@link Ext.Container#suspendLayout}) or if one
+     * of this component's containers is suspended.
+     *
+     * @return {Boolean} `true` layout of this component is suspended.
+     */
+    isLayoutSuspended: function () {
+        var comp = this,
+            ownerLayout;
+
+        while (comp) {
+            if (comp.layoutSuspendCount || comp.suspendLayout) {
+                return true;
+            }
+
+            ownerLayout = comp.ownerLayout;
+            if (!ownerLayout) {
+                break;
+            }
+
+            // TODO - what about suspending a Layout instance?
+
+            // this works better than ownerCt since ownerLayout means "is managed by" in
+            // the proper sense... some floating components have ownerCt but won't have an
+            // ownerLayout
+            comp = ownerLayout.owner;
+        }
+
+        return false;
+    },
+
+    /**
+     * Updates this component's layout. If this update affects this components {@link #ownerCt},
+     * that component's `updateLayout` method will be called to perform the layout instead.
+     * Otherwise, just this component (and its child items) will layout.
+     *
+     * @param {Object} [options] An object with layout options.
+     * @param {Boolean} options.defer `true` if this layout should be deferred.
+     * @param {Boolean} options.isRoot `true` if this layout should be the root of the layout.
+     */
+    updateLayout: function (options) {
+        var me = this,
+            defer,
+            lastBox = me.lastBox,
+            isRoot = options && options.isRoot;
+
+        if (lastBox) {
+            // remember that this component's last layout result is invalid and must be
+            // recalculated
+            lastBox.invalid = true;
+        }
+
+        if (!me.rendered || me.layoutSuspendCount || me.suspendLayout) {
+            return;
+        }
+
+        if (me.hidden) {
+            Ext.AbstractComponent.cancelLayout(me);
+        } else if (typeof isRoot != 'boolean') {
+            isRoot = me.isLayoutRoot();
+        }
+
+        // if we aren't the root, see if our ownerLayout will handle it...
+        if (isRoot || !me.ownerLayout || !me.ownerLayout.onContentChange(me)) {
+            // either we are the root or our ownerLayout doesn't care
+            if (!me.isLayoutSuspended()) {
+                // we aren't suspended (knew that), but neither is any of our ownerCt's...
+                defer = (options && options.hasOwnProperty('defer')) ? options.defer : me.deferLayouts;
+                Ext.AbstractComponent.updateLayout(me, defer);
+            }
+        }
+    },
+
+    /**
+     * Returns an object that describes how this component's width and height are managed.
+     * All of these objects are shared and should not be modified.
+     *
+     * @return {Object} The size model for this component.
+     * @return {Ext.layout.SizeModel} return.width The {@link Ext.layout.SizeModel size model}
+     * for the width.
+     * @return {Ext.layout.SizeModel} return.height The {@link Ext.layout.SizeModel size model}
+     * for the height.
+     */
+    getSizeModel: function (ownerCtSizeModel) {
+        var me = this,
+            models = Ext.layout.SizeModel,
+            ownerContext = me.componentLayout.ownerContext,
+            width = me.width,
+            height = me.height,
+            typeofWidth, typeofHeight,
+            hasPixelWidth, hasPixelHeight,
+            heightModel, ownerLayout, policy, shrinkWrap, topLevel, widthModel;
+
+        if (ownerContext) {
+            // If we are in the middle of a running layout, always report the current,
+            // dynamic size model rather than recompute it. This is not (only) a time
+            // saving thing, but a correctness thing since we cannot get the right answer
+            // otherwise.
+            widthModel = ownerContext.widthModel;
+            heightModel = ownerContext.heightModel;
+        }
+
+        if (!widthModel || !heightModel) {
+            hasPixelWidth = ((typeofWidth = typeof width) == 'number');
+            hasPixelHeight = ((typeofHeight = typeof height) == 'number');
+            topLevel = me.floating || !(ownerLayout = me.ownerLayout);
+
+            // Floating or no owner layout, e.g. rendered using renderTo
+            if (topLevel) {
+                policy = Ext.layout.Layout.prototype.autoSizePolicy;
+                shrinkWrap = me.floating ? 3 : me.shrinkWrap;
+
+                if (hasPixelWidth) {
+                    widthModel = models.configured;
+                }
+
+                if (hasPixelHeight) {
+                    heightModel = models.configured;
+                }
+            } else {
+                policy = ownerLayout.getItemSizePolicy(me, ownerCtSizeModel);
+                shrinkWrap = ownerLayout.isItemShrinkWrap(me);
+            }
+
+            if (ownerContext) {
+                ownerContext.ownerSizePolicy = policy;
+            }
+
+            shrinkWrap = (shrinkWrap === true) ? 3 : (shrinkWrap || 0); // false->0, true->3
+
+            // Now that we have shrinkWrap as a 0-3 value, we need to turn off shrinkWrap
+            // bits for any dimension that has a configured size not in pixels. These must
+            // be read from the DOM.
+            //
+            if (topLevel && shrinkWrap) {
+                if (width && typeofWidth == 'string') {
+                    shrinkWrap &= 2; // percentage, "30em" or whatever - not width shrinkWrap
+                }
+                if (height && typeofHeight == 'string') {
+                    shrinkWrap &= 1; // percentage, "30em" or whatever - not height shrinkWrap
+                }
+            }
+
+            if (shrinkWrap !== 3) {
+                if (!ownerCtSizeModel) {
+                    ownerCtSizeModel = me.ownerCt && me.ownerCt.getSizeModel();
+                }
+
+                if (ownerCtSizeModel) {
+                    shrinkWrap |= (ownerCtSizeModel.width.shrinkWrap ? 1 : 0) | (ownerCtSizeModel.height.shrinkWrap ? 2 : 0);
+                }
+            }
+
+            if (!widthModel) {
+                if (!policy.setsWidth) {
+                    if (hasPixelWidth) {
+                        widthModel = models.configured;
+                    } else {
+                        widthModel = (shrinkWrap & 1) ? models.shrinkWrap : models.natural;
+                    }
+                } else if (policy.readsWidth) {
+                    if (hasPixelWidth) {
+                        widthModel = models.calculatedFromConfigured;
+                    } else {
+                        widthModel = (shrinkWrap & 1) ? models.calculatedFromShrinkWrap :
+                                    models.calculatedFromNatural;
+                    }
+                } else {
+                    widthModel = models.calculated;
+                }
+            }
+
+            if (!heightModel) {
+                if (!policy.setsHeight) {
+                    if (hasPixelHeight) {
+                        heightModel = models.configured;
+                    } else {
+                        heightModel = (shrinkWrap & 2) ? models.shrinkWrap : models.natural;
+                    }
+                } else if (policy.readsHeight) {
+                    if (hasPixelHeight) {
+                        heightModel = models.calculatedFromConfigured;
+                    } else {
+                        heightModel = (shrinkWrap & 2) ? models.calculatedFromShrinkWrap :
+                                    models.calculatedFromNatural;
+                    }
+                } else {
+                    heightModel = models.calculated;
+                }
+            }
+        }
+
+        // We return one of the cached objects with the proper "width" and "height" as the
+        // sizeModels we have determined.
+        return widthModel.pairsByHeightOrdinal[heightModel.ordinal];
+    },
+
+    isDescendant: function(ancestor) {
+        if (ancestor.isContainer) {
+            for (var c = this.ownerCt; c; c = c.ownerCt) {
+                if (c === ancestor) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    },
+
+    /**
+     * This method needs to be called whenever you change something on this component that requires the Component's
+     * layout to be recalculated.
+     * @return {Ext.container.Container} this
+     */
+    doComponentLayout : function() {
+        this.updateLayout();
+        return this;
+    },
+
+    /**
+     * Forces this component to redo its componentLayout.
+     * @deprecated 4.1.0 Use {@link #updateLayout} instead.
+     */
+    forceComponentLayout: function () {
+        this.updateLayout();
+    },
+
+    // @private
+    setComponentLayout : function(layout) {
+        var currentLayout = this.componentLayout;
+        if (currentLayout && currentLayout.isLayout && currentLayout != layout) {
+            currentLayout.setOwner(null);
+        }
+        this.componentLayout = layout;
+        layout.setOwner(this);
+    },
+
+    getComponentLayout : function() {
+        var me = this;
+
+        if (!me.componentLayout || !me.componentLayout.isLayout) {
+            me.setComponentLayout(Ext.layout.Layout.create(me.componentLayout, 'autocomponent'));
+        }
+        return me.componentLayout;
+    },
+
+    /**
+     * Called by the layout system after the Component has been laid out.
+     *
+     * @param {Number} width The width that was set
+     * @param {Number} height The height that was set
+     * @param {Number/undefined} oldWidth The old width, or `undefined` if this was the initial layout.
+     * @param {Number/undefined} oldHeight The old height, or `undefined` if this was the initial layout.
+     *
+     * @template
+     * @protected
+     */
+    afterComponentLayout: function(width, height, oldWidth, oldHeight) {
+        var me = this;
+
+        if (++me.componentLayoutCounter === 1) {
+            me.afterFirstLayout(width, height);
+        }
+
+        if (width !== oldWidth || height !== oldHeight) {
+            me.onResize(width, height, oldWidth, oldHeight);
+        }
+    },
+
+    /**
+     * Occurs before `componentLayout` is run. Returning `false` from this method will prevent the `componentLayout` from
+     * being executed.
+     *
+     * @param {Number} adjWidth The box-adjusted width that was set.
+     * @param {Number} adjHeight The box-adjusted height that was set.
+     *
+     * @template
+     * @protected
+     */
+    beforeComponentLayout: function(width, height) {
+        return true;
+    },
+
+    /**
+     * @member Ext.Component
+     * Sets the left and top of the component. To set the page XY position instead, use {@link Ext.Component#setPagePosition setPagePosition}. This
+     * method fires the {@link #event-move} event.
+     * @param {Number/Number[]/Object} x The new left, an array of `[x,y]`, or animation config object containing `x` and `y` properties.
+     * @param {Number} [y] The new top.
+     * @param {Boolean/Object} [animate] If `true`, the Component is _animated_ into its new position. You may also pass an
+     * animation configuration.
+     * @return {Ext.Component} this
+     */
+    setPosition: function(x, y, animate) {
+        var me = this,
+            pos = me.beforeSetPosition.apply(me, arguments);
+
+        if (pos && me.rendered) {
+            x = pos.x;
+            y = pos.y;
+
+            if (animate) {
+                // Proceed only if the new position is different from the current
+                // one. We only do these DOM reads in the animate case as we don't
+                // want to incur the penalty of read/write on every call to setPosition
+                if (x !== me.getLocalX() || y !== me.getLocalY()) {
+                    me.stopAnimation();
+                    me.animate(Ext.apply({
+                        duration: 1000,
+                        listeners: {
+                            afteranimate: Ext.Function.bind(me.afterSetPosition, me, [x, y])
+                        },
+                        to: {
+                            x: x,
+                            y: y
+                        }
+                    }, animate));
+                }
+            } else {
+                me.setLocalXY(x, y);
+                me.afterSetPosition(x, y);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * @private Template method called before a Component is positioned.
+     *
+     * Ensures that the position is adjusted so that the Component is constrained if so configured.
+     */
+    beforeSetPosition: function (x, y, animate) {
+        var pos, x0;
+
+        // Decode members of x if x is an array or an object.
+        // If it is numeric (including zero), we need do nothing.
+        if (x) {
+            // Position in first argument as an array of [x, y]
+            if (Ext.isNumber(x0 = x[0])) {
+                animate = y;
+                y = x[1];
+                x = x0;
+            }
+            // Position in first argument as object w/ x & y properties
+            else if ((x0 = x.x) !== undefined) {
+                animate = y;
+                y = x.y;
+                x = x0;
+            }
+        }
+
+        if (this.constrain || this.constrainHeader) {
+            pos = this.calculateConstrainedPosition(null, [x, y], true);
+            if (pos) {
+                x = pos[0];
+                y = pos[1];
+            }
+        }
+
+        // Set up the return info and store the position in this object
+        pos = {
+            x : this.x = x,
+            y : this.y = y,
+            anim: animate,
+            hasX: x !== undefined,
+            hasY: y !== undefined
+        };
+
+        return (pos.hasX || pos.hasY) ? pos : null;
+    },
+
+    /**
+     * Template method called after a Component has been positioned.
+     *
+     * @param {Number} x
+     * @param {Number} y
+     *
+     * @template
+     * @protected
+     */
+    afterSetPosition: function(x, y) {
+        var me = this;
+        me.onPosition(x, y);
+        if (me.hasListeners.move) {
+            me.fireEvent('move', me, x, y);
+        }
+    },
+
+    /**
+     * Called after the component is moved, this method is empty by default but can be implemented by any
+     * subclass that needs to perform custom logic after a move occurs.
+     *
+     * @param {Number} x The new x position.
+     * @param {Number} y The new y position.
+     *
+     * @template
+     * @protected
+     */
+    onPosition: Ext.emptyFn,
+
+    /**
+     * Sets the width of the component. This method fires the {@link #resize} event.
+     *
+     * @param {Number} width The new width to setThis may be one of:
+     *
+     *   - A Number specifying the new width in the {@link #getEl Element}'s {@link Ext.Element#defaultUnit}s (by default, pixels).
+     *   - A String used to set the CSS width style.
+     *
+     * @return {Ext.Component} this
+     */
+    setWidth : function(width) {
+        return this.setSize(width);
+    },
+
+    /**
+     * Sets the height of the component. This method fires the {@link #resize} event.
+     *
+     * @param {Number} height The new height to set. This may be one of:
+     *
+     *   - A Number specifying the new height in the {@link #getEl Element}'s {@link Ext.Element#defaultUnit}s (by default, pixels).
+     *   - A String used to set the CSS height style.
+     *   - _undefined_ to leave the height unchanged.
+     *
+     * @return {Ext.Component} this
+     */
+    setHeight : function(height) {
+        return this.setSize(undefined, height);
+    },
+
+    /**
+     * Gets the current size of the component's underlying element.
+     * @return {Object} An object containing the element's size `{width: (element width), height: (element height)}`
+     */
+    getSize : function() {
+        return this.el.getSize();
+    },
+
+    /**
+     * Gets the current width of the component's underlying element.
+     * @return {Number}
+     */
+    getWidth : function() {
+        return this.el.getWidth();
+    },
+
+    /**
+     * Gets the current height of the component's underlying element.
+     * @return {Number}
+     */
+    getHeight : function() {
+        return this.el.getHeight();
+    },
+
+    /**
+     * Gets the {@link Ext.ComponentLoader} for this Component.
+     * @return {Ext.ComponentLoader} The loader instance, null if it doesn't exist.
+     */
+    getLoader: function(){
+        var me = this,
+            autoLoad = me.autoLoad ? (Ext.isObject(me.autoLoad) ? me.autoLoad : {url: me.autoLoad}) : null,
+            loader = me.loader || autoLoad;
+
+        if (loader) {
+            if (!loader.isLoader) {
+                me.loader = new Ext.ComponentLoader(Ext.apply({
+                    target: me,
+                    autoLoad: autoLoad
+                }, loader));
+            } else {
+                loader.setTarget(me);
+            }
+            return me.loader;
+
+        }
+        return null;
+    },
+
+    /**
+     * Sets the dock position of this component in its parent panel. Note that this only has effect if this item is part
+     * of the `dockedItems` collection of a parent that has a DockLayout (note that any Panel has a DockLayout by default)
+     * @param {Object} dock The dock position.
+     * @param {Boolean} [layoutParent=false] `true` to re-layout parent.
+     * @return {Ext.Component} this
+     */
+    setDocked : function(dock, layoutParent) {
+        var me = this;
+
+        me.dock = dock;
+        if (layoutParent && me.ownerCt && me.rendered) {
+            me.ownerCt.updateLayout();
+        }
+        return me;
+    },
+
+    /**
+     *
+     * @param {String/Number} border The border, see {@link #border}. If a falsey value is passed
+     * the border will be removed.
+     */
+    setBorder: function(border, /* private */ targetEl) {
+        var me = this,
+            initial = !!targetEl;
+
+        if (me.rendered || initial) {
+            if (!initial) {
+                targetEl = me.el;
+            }
+
+            if (!border) {
+                border = 0;
+            } else if (border === true) {
+                border = '1px';
+            } else {
+                border = this.unitizeBox(border);
+            }
+            targetEl.setStyle('border-width', border);
+            if (!initial) {
+                me.updateLayout();
+            }
+        }
+        me.border = border;
+    },
+
+    onDestroy : function() {
+        var me = this;
+
+        if (me.monitorResize && Ext.EventManager.resizeEvent) {
+            Ext.EventManager.resizeEvent.removeListener(me.setSize, me);
+        }
+
+        // Destroying the floatingItems ZIndexManager will also destroy descendant floating Components
+        Ext.destroy(
+            me.componentLayout,
+            me.loadMask,
+            me.floatingDescendants
+        );
+    },
+
+    /**
+     * Destroys the Component.
+     * @since 1.1.0
+     */
+    destroy : function() {
+        var me = this,
+            selectors = me.renderSelectors,
+            selector,
+            el;
+
+        if (!me.isDestroyed) {
+            if (!me.hasListeners.beforedestroy || me.fireEvent('beforedestroy', me) !== false) {
+                me.destroying = true;
+                me.beforeDestroy();
+
+                if (me.floating) {
+                    delete me.floatParent;
+                    // A zIndexManager is stamped into a *floating* Component when it is added to a Container.
+                    // If it has no zIndexManager at render time, it is assigned to the global Ext.WindowManager instance.
+                    if (me.zIndexManager) {
+                        me.zIndexManager.unregister(me);
+                    }
+                } else if (me.ownerCt && me.ownerCt.remove) {
+                    me.ownerCt.remove(me, false);
+                }
+
+                me.stopAnimation();
+                me.onDestroy();
+
+                // Attempt to destroy all plugins
+                Ext.destroy(me.plugins);
+
+                if (me.hasListeners.destroy) {
+                    me.fireEvent('destroy', me);
+                }
+                Ext.ComponentManager.unregister(me);
+
+                me.mixins.state.destroy.call(me);
+
+                me.clearListeners();
+                // make sure we clean up the element references after removing all events
+                if (me.rendered) {
+                    if (!me.preserveElOnDestroy) {
+                        me.el.remove();
+                    }
+                    me.mixins.elementCt.destroy.call(me); // removes childEls
+                    if (selectors) {
+                        for (selector in selectors) {
+                            if (selectors.hasOwnProperty(selector)) {
+                                el = me[selector];
+                                if (el) { // in case any other code may have already removed it
+                                    delete me[selector];
+                                    el.remove();
+                                }
+                            }
+                        }
+                    }
+
+                    delete me.el;
+                    delete me.frameBody;
+                    delete me.rendered;
+                }
+
+                me.destroying = false;
+                me.isDestroyed = true;
+            }
+        }
+    },
+
+    /**
+     * Determines whether this component is the descendant of a particular container.
+     * @param {Ext.Container} container
+     * @return {Boolean} `true` if the component is the descendant of a particular container, otherwise `false`.
+     */
+    isDescendantOf: function(container) {
+        return !!this.findParentBy(function(p){
+            return p === container;
+        });
+    },
+
+    /**
+     * A component's hierarchyState is used to keep track of aspects of a component's
+     * state that affect its descendants hierarchically like "collapsed" and "hidden".
+     * For example, if this.hierarchyState.hidden == true, it means that either this
+     * component, or one of its ancestors is hidden. 
+     * 
+     * Hierarchical state management is implemented by chaining each component's
+     * hierarchyState property to its parent container's hierarchyState property via the
+     * prototype. The result is such that if a component's hierarchyState does not have
+     * it's own property, it inherits the property from the nearest ancestor that does.
+     * 
+     * To set a hierarchical "hidden" value:
+     * 
+     *     this.getHierarchyState().hidden = true;
+     *     
+     * It is important to remember when unsetting hierarchyState properties to delete
+     * them instead of just setting them to a falsy value.  This ensures that the
+     * hierarchyState returns to a state of inheriting the value instead of overriding it
+     * To unset the hierarchical "hidden" value:
+     * 
+     *     delete this.getHierarchyState().hidden;
+     * 
+     * IMPORTANT! ALWAYS access hierarchyState using this method, not by accessing
+     * this.hierarchyState directly.  The hierarchyState property does not exist until
+     * the first time getHierarchyState() is called.  At that point getHierarchyState()
+     * walks up the component tree to establish the hierarchyState prototype chain.
+     * Additionally the hierarchyState property should NOT be relied upon even after
+     * the initial call to getHierarchyState() because  it is possible for the
+     * hierarchyState to be invalidated. Invalidation typically happens when a component
+     * is moved to a new container. In such a case the hierarchy state remains invalid
+     * until the next time getHierarchyState() is called on the component or one of its
+     * descendants.
+     * 
+     * @private
+     */
+    getHierarchyState: function (inner) {
+        var me = this,
+            hierarchyState = (inner && me.hierarchyStateInner) || me.hierarchyState,
+            ownerCt = me.ownerCt,
+            parent, layout, hierarchyStateInner, getInner;
+ 
+        if (!hierarchyState || hierarchyState.invalid) {
+            // Use upward navigational link, not ownerCt.
+            // 99% of the time, this will use ownerCt/floatParent.
+            // Certain floating components do not have an ownerCt, but they are still linked
+            // into a navigational hierarchy. The getRefOwner method normalizes these differences.
+            parent = me.getRefOwner();
+            
+            if (ownerCt) {
+                // This will only be true if the item is a "child" of its owning container
+                // For example, a docked item will not get the inner hierarchy state
+                getInner = me.ownerLayout === ownerCt.layout;
+            }
+
+            me.hierarchyState = hierarchyState =
+                // chain this component's hierarchyState to that of its parent.  If it
+                // doesn't have a parent, then chain to the rootHierarchyState.  This is
+                // done so that when there is a viewport, all component's will inherit
+                // from its hierarchyState, even components that are not descendants of
+                // the viewport.
+                Ext.Object.chain(parent ? parent.getHierarchyState(getInner)
+                                        : Ext.rootHierarchyState);
+
+            me.initHierarchyState(hierarchyState);
+            if ((layout = me.componentLayout).initHierarchyState) {
+                layout.initHierarchyState(hierarchyState);
+            }
+
+            if (me.isContainer) {
+                me.hierarchyStateInner = hierarchyStateInner = Ext.Object.chain(hierarchyState);
+
+                layout = me.layout;
+                if (layout && layout.initHierarchyState) {
+                    layout.initHierarchyState(hierarchyStateInner, hierarchyState);
+                }
+                if (inner) {
+                    hierarchyState = hierarchyStateInner;
+                }
+            }
+        }
+
+        return hierarchyState;
+    },
+
+    /**
+     * Called by {@link #getHierarchyState} to initialize the hierarchyState the first
+     * time it is requested.
+     * @private
+     */
+    initHierarchyState: function(hierarchyState) {
+        var me = this;
+
+        if (me.collapsed) {
+            hierarchyState.collapsed = true;
+        }
+        if (me.hidden) {
+            hierarchyState.hidden = true;
+        }
+        if (me.collapseImmune) {
+            hierarchyState.collapseImmune = true;
+        }
+    },
+
+    // **********************************************************************************
+    // Begin Positionable methods
+    // **********************************************************************************
+
+    getAnchorToXY: function(el, anchor, local, mySize) {
+        return el.getAnchorXY(anchor, local, mySize);
+    },
+
+    getBorderPadding: function() {
+        return this.el.getBorderPadding();
+    },
+
+    getLocalX: function() {
+        return this.el.getLocalX();
+    },
+
+    getLocalXY: function() {
+        return this.el.getLocalXY();
+    },
+
+    getLocalY: function() {
+        return this.el.getLocalY();
+    },
+
+    getX: function() {
+        return this.el.getX();
+    },
+
+    getXY: function() {
+        return this.el.getXY();
+    },
+
+    getY: function() {
+        return this.el.getY();
+    },
+
+    setLocalX: function(x) {
+        this.el.setLocalX(x);
+    },
+
+    setLocalXY: function(x, y) {
+        this.el.setLocalXY(x, y);
+    },
+
+    setLocalY: function(y) {
+        this.el.setLocalY(y);
+    },
+
+    setX: function(x, animate) {
+        this.el.setX(x, animate);
+    },
+
+    setXY: function(xy, animate) {
+        this.el.setXY(xy, animate);
+    },
+
+    setY: function(y, animate) {
+        this.el.setY(y, animate);
+    }
+
+    // **********************************************************************************
+    // End Positionable methods
+    // **********************************************************************************
+}, function() {
+    var AbstractComponent = this;
+
+    AbstractComponent.createAlias({
+        on: 'addListener',
+        prev: 'previousSibling',
+        next: 'nextSibling'
+    });
+
+    /**
+     * @inheritdoc Ext.AbstractComponent#resumeLayouts
+     * @member Ext
+     */
+    Ext.resumeLayouts = function (flush) {
+        AbstractComponent.resumeLayouts(flush);
+    };
+
+    /**
+     * @inheritdoc Ext.AbstractComponent#suspendLayouts
+     * @member Ext
+     */
+    Ext.suspendLayouts = function () {
+        AbstractComponent.suspendLayouts();
+    };
+
+    /**
+     * Utility wrapper that suspends layouts of all components for the duration of a given function.
+     * @param {Function} fn The function to execute.
+     * @param {Object} [scope] The scope (`this` reference) in which the specified function is executed.
+     * @member Ext
+     */
+    Ext.batchLayouts = function(fn, scope) {
+        AbstractComponent.suspendLayouts();
+        // Invoke the function
+        fn.call(scope);
+        AbstractComponent.resumeLayouts(true);
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ *
+ * Simulates an XMLHttpRequest object's methods and properties as returned
+ * form the flash polyfill plugin. Used in submitting binary data in browsers that do 
+ * not support doing so from JavaScript.
+ * NOTE: By default this will look for the flash object in the ext directory. When packaging and deploying the app, copy the <tt>ext/plugins</tt> directory and its contents to your root directory. For custom deployments where just the <tt>FlashPlugin.swf</tt> file gets copied (e.g. to <tt>/resources/FlashPlugin.swf</tt>), make sure to notify the framework of the location of the plugin before making the first attempt to post binary data, e.g. in the <tt>launch</tt> method of your app do:
+ * <pre><code>
+Ext.flashPluginPath="/resources/FlashPlugin.swf";
+ </code></pre>
+ *
+ * @private
+ */
+Ext.define('Ext.data.flash.BinaryXhr', {
+    
+    statics: {
+        /**
+         * Called by the flash plugin once it's installed and open for business.
+         * @private
+         */
+        flashPluginActivated: function() {
+            Ext.data.flash.BinaryXhr.flashPluginActive = true;
+            Ext.data.flash.BinaryXhr.flashPlugin = document.getElementById("ext-flash-polyfill");
+            Ext.globalEvents.fireEvent("flashready"); // let all pending connections know
+        },
+        
+        /**
+         * Set to <tt>trut</tt> once the plugin registers and is active.
+         * @private
+         */
+        flashPluginActive: false,
+        
+        /**
+         * Flag to avoid installing the plugin twice.
+         * @private
+         */
+        flashPluginInjected: false,
+        
+        /**
+         * Counts IDs for new connections.
+         * @private
+         */
+        
+        connectionIndex: 1,
+        
+        /**
+         * Plcaeholder for active connections.
+         * @private
+         */
+        liveConnections: {},
+        
+        /**
+         * Reference to the actual plugin, once activated.
+         * @private
+         */
+        flashPlugin: null,
+        
+        /**
+         * Called by the flash plugin once the state of one of the active connections changes.
+         * @param {Number/number} javascriptId the ID of the connection.
+         * @param {number} state the state of the connection. Equivalent to readyState numbers in XHR.
+         * @param {Object} data optional object containing the returned data, error and status codes.
+         * @private
+         */
+        onFlashStateChange: function(javascriptId, state, data) {
+            var connection;
+            // Identify the request this is for
+            connection = this.liveConnections[Number(javascriptId)]; // Make sure its a native number
+            if (connection) {
+                connection.onFlashStateChange(state, data);
+            } 
+            else {
+                Ext.warn.log("onFlashStateChange for unknown connection ID: " + javascriptId);
+            }
+        },
+        
+        /**
+         * Adds the BinaryXhr object to the tracked connection list and assigns it an ID
+         * @param {Ext.data.flash.BinaryXhr} conn the connection to register
+         * @return {Number} id
+         * @private
+         */
+        registerConnection: function(conn) {
+            var i = this.connectionIndex;
+            this.conectionIndex = this.connectionIndex + 1;
+            this.liveConnections[i] = conn;
+            return i;
+        },
+        
+        /**
+         * Injects the flash polyfill plugin to allow posting binary data.
+         * This is done in two steps: First we load the javascript loader for flash objects, then we call it to inject the flash object.
+         * @private
+         */
+        injectFlashPlugin: function() {
+            var divTag, pTag, aTag, iTag,
+                me=this,
+                flashLoaderPath, flashObjectPath;
+                // Generate the following HTML set of tags:
+               // + '<div id="ext-flash-polyfill">'
+               // + '<p>To view this page ensure that Adobe Flash Player version 11.1.0 or greater is installed, and that the FlashPlugin.swf file was correctly placed in the /resources directory.</p>'
+                //+ '<a href="http://www.adobe.com/go/getflashplayer"><img src="' + window.location.protocol + '//www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" /></a>'
+                //+ '</div>'
+            
+            iTag=document.createElement("img");
+            iTag.setAttribute("src",  window.location.protocol + '//www.adobe.com/images/shared/download_buttons/get_flash_player.gif');
+            iTag.setAttribute("alt", "Get Adobe Flash player");
+            
+            aTag=document.createElement("a");
+            aTag.setAttribute("href", "http://www.adobe.com/go/getflashplayer");
+            aTag.appendChild(iTag);
+            
+            pTag=document.createElement("p");
+            pTag.innerHTML="To view this page ensure that Adobe Flash Player version 11.1.0 or greater is installed.";
+            
+            divTag=document.createElement("div");
+            divTag.setAttribute("id", "ext-flash-polyfill");
+            divTag.appendChild(pTag);
+            divTag.appendChild(iTag);
+            
+            Ext.getBody().dom.appendChild(divTag);
+            
+            
+            
+            // Now load the flash-loading script
+            
+            flashLoaderPath = [Ext.Loader.getPath('Ext.data.Connection'), '../../../plugins/flash/swfobject.js'].join('/');
+            flashObjectPath = "/plugins/flash/FlashPlugin.swf";
+            flashObjectPath = [Ext.Loader.getPath('Ext.data.Connection'), '../../plugins/flash/FlashPlugin.swf'].join('/');
+            if (Ext.flashPluginPath) {
+                flashObjectPath = Ext.flashPluginPath;
+            }
+            //console.log('LOADING Flash plugin from: ' + flashObjectPath);
+            Ext.Loader.loadScript({
+                url:flashLoaderPath,
+                onLoad: function() {
+                    // For version detection, set to min. required Flash Player version, or 0 (or 0.0.0), for no version detection. 
+                    var swfVersionStr = "11.4.0";
+                    // To use express install, set to playerProductInstall.swf, otherwise the empty string. 
+                    var xiSwfUrlStr = "playerProductInstall.swf";
+                    var flashvars = {};
+                    var params = {};
+                    params.quality = "high";
+                    params.bgcolor = "#ffffff";
+                    params.allowscriptaccess = "sameDomain";
+                    params.allowfullscreen = "true";
+                    var attributes = {};
+                    attributes.id = "ext-flash-polyfill";
+                    attributes.name = "polyfill";
+                    attributes.align = "middle";
+                    swfobject.embedSWF(
+                        flashObjectPath, "ext-flash-polyfill", 
+                        "0", "0", // no size so it's not visible. 
+                        swfVersionStr, xiSwfUrlStr, 
+                        flashvars, params, attributes);
+                },
+                onError: function() {
+                    Ext.Error.raise("Could not load flash-loader file swfobject.js from " + flashLoader);
+                },
+                scope: me
+            });
+            Ext.globalEvents.addEvents("flashready"); // we'll fire this one once flash is loaded
+            Ext.data.flash.BinaryXhr.flashPluginInjected = true;
+        }
+
+    
+    },
+    
+    /**
+     * @property {number} readyState The connection's simulated readyState. Note that the only supported values are 0, 1 and 4. States 2 and 3 will never be reported.
+     */
+    readyState: 0,
+    
+    /**
+     * @property {number} status Connection status code returned by flash or the server.
+     */
+    status: 0,
+    
+    
+    /**
+     * Status text (if any) returned by flash or the server.
+     */
+    statusText: "",
+    
+    /**
+     * @property {Array} responseBytes The binary bytes returned.
+     */
+    responseBytes: null,
+    
+    /**
+     * An ID representing this connection with flash.
+     * @private
+     */
+    javascriptId: null,
+    
+    
+    /**
+     * Creates a new instance of BinaryXhr.
+     */
+    constructor: function (config) {
+        // first, make sure flash is loading if needed
+        if (!Ext.data.flash.BinaryXhr.flashPluginInjected) {
+            Ext.data.flash.BinaryXhr.injectFlashPlugin();
+        }
+        var me = this;
+
+        Ext.apply(me, config);
+        me.requestHeaders = {};
+    },
+
+    /**
+     * Abort this connection. Sets its readyState to 4.
+     */
+    abort: function () {
+        var me = this;
+        // if complete, nothing to abort 
+        if (me.readyState == 4) {
+            Ext.warn.log("Aborting a connection that's completed its transfer: " + this.url);
+            return;
+        }
+        // Mark as aborted
+        me.aborted = true;
+        // Remove ourselves from the listeners if flash isn't active yet
+        if (!Ext.data.flash.BinaryXhr.flashPluginActive) {
+            Ext.globalEvents.removeListener("flashready", me.onFlashReady, me);
+            return;
+        }
+        // Flash is already live, so we should have a javascriptID and should have called flash to get the request going. Cancel:
+        Ext.data.flash.BinaryXhr.flashPlugin.abortRequest(me.javascriptId);
+        // remove from list
+        delete Ext.data.flash.BinaryXhr.liveConnections[me.javascriptId];
+    },
+
+    /**
+     * As in XMLHttpRequest.
+     */
+    getAllResponseHeaders: function () {
+        var headers = [];
+        Ext.Object.each(this.responseHeaders, function (name, value) {
+            headers.push(name + ': ' + value);
+        });
+        return headers.join('\x0d\x0a');
+    },
+
+    /**
+     * As in XMLHttpRequest.
+     */
+    getResponseHeader: function (header) {
+        var headers = this.responseHeaders;
+        return (headers && headers[header]) || null;
+    },
+
+    /**
+     * As in XMLHttpRequest.
+     */
+    open: function (method, url, async, user, password) {
+        var me = this;
+        me.method = method;
+        me.url = url;
+        me.async = async !== false;
+        me.user = user;
+        me.password = password;
+        
+        if (!me.async) {
+            Ext.Error.raise("Binary posts are only supported in async mode: " + url);
+        }
+        if (me.method != "POST") {
+            Ext.log.warn("Binary data can only be sent as a POST request: " + url);
+        }
+    },
+
+    /**
+     * As in XMLHttpRequest.
+     */
+    overrideMimeType: function (mimeType) {
+        this.mimeType = mimeType;
+    },
+
+    /**
+     * Initiate the request.
+     * @param {Array} body an array of byte values to send.
+     */
+    send: function (body) {
+        var me = this;
+        me.body = body;
+        if (!Ext.data.flash.BinaryXhr.flashPluginActive) {
+            Ext.globalEvents.addListener("flashready", me.onFlashReady, me);
+        } else {
+            this.onFlashReady();
+        }
+    },
+    
+    /**
+     * Called by send, or once flash is loaded, to actually send the bytes.
+     * @private
+     */
+    onFlashReady: function() {
+        var me = this, req, status;
+        me.javascriptId = Ext.data.flash.BinaryXhr.registerConnection(me);
+        
+        // Create the request object we're sending to flash
+        req = {
+            method: me.method, // ignored since we always POST binary data
+            url: me.url,
+            user: me.user,
+            password: me.password,
+            mimeType: me.mimeType,
+            requestHeaders: me.requestHeaders,
+            body: me.body,
+            javascriptId: me.javascriptId
+        };
+        status = Ext.data.flash.BinaryXhr.flashPlugin.postBinary(req);
+    },
+
+    /**
+     * Updates readyState and notifies listeners.
+     * @private
+     */
+    setReadyState: function (state) {
+        var me = this;
+        if (me.readyState != state) {
+            me.readyState = state;
+            me.onreadystatechange();
+        }
+    },
+
+    /**
+     * As in XMLHttpRequest.
+     */
+    setRequestHeader: function (header, value) {
+        this.requestHeaders[header] = value;
+    },
+
+    /**
+     * As in XMLHttpRequest.
+     */
+    onreadystatechange: Ext.emptyFn,
+
+    /**
+     * Parses data returned from flash once a connection is done.
+     * @param {Object} data the data object send from Flash.
+     * @private
+     */
+    parseData: function (data) {
+        var me = this;
+        // parse data and set up variables so that listeners can use this XHR
+        this.status = data.status || 0; 
+        // we get back no response headers, so fake what we know:
+        me.responseHeaders = {};
+        if (me.mimeType) {
+            me.responseHeaders["content-type"] = me.mimeType;
+        }
+        if (data.reason == "complete") {
+            // Transfer complete and data received
+            this.responseBytes = data.data;
+            me.responseHeaders["content-length"] = data.data.length;
+        } else if (data.reason == "error" || data.reason == "securityError") {
+            this.statusText = data.text;
+            me.responseHeaders["content-length"] = 0; // we don't get the error response data
+        }
+        else {
+            Ext.Error.raise("Unkown reason code in data: " + data.reason);
+        }
+    },
+
+    /**
+     * Called once flash calls back with updates about the connection
+     * @param {Number} state the readyState of the connection.
+     * @param {Object} data optional data object.
+     * @private
+     */
+    onFlashStateChange: function(state, data) {
+        var me = this;
+        if (state == 4) {
+            // parse data and prepare for handing back to initiator
+            me.parseData(data);
+            // remove from list
+            delete Ext.data.flash.BinaryXhr.liveConnections[me.javascriptId];
+        }
+        me.setReadyState(state); // notify all listeners
+    }
+    
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * The Connection class encapsulates a connection to the page's originating domain, allowing requests to be made either
+ * to a configured URL, or to a URL specified at request time.
+ *
+ * Requests made by this class are asynchronous, and will return immediately. No data from the server will be available
+ * to the statement immediately following the {@link #request} call. To process returned data, use a success callback
+ * in the request options object, or an {@link #requestcomplete event listener}.
+ *
+ * # File Uploads
+ *
+ * File uploads are not performed using normal "Ajax" techniques, that is they are not performed using XMLHttpRequests.
+ * Instead the form is submitted in the standard manner with the DOM <form> element temporarily modified to have its
+ * target set to refer to a dynamically generated, hidden <iframe> which is inserted into the document but removed
+ * after the return data has been gathered.
+ *
+ * The server response is parsed by the browser to create the document for the IFRAME. If the server is using JSON to
+ * send the return object, then the Content-Type header must be set to "text/html" in order to tell the browser to
+ * insert the text unchanged into the document body.
+ *
+ * Characters which are significant to an HTML parser must be sent as HTML entities, so encode `<` as `<`, `&` as
+ * `&` etc.
+ *
+ * The response text is retrieved from the document, and a fake XMLHttpRequest object is created containing a
+ * responseText property in order to conform to the requirements of event handlers and callbacks.
+ *
+ * Be aware that file upload packets are sent with the content type multipart/form and some server technologies
+ * (notably JEE) may require some custom processing in order to retrieve parameter names and parameter values from the
+ * packet content.
+ *
+ * Also note that it's not possible to check the response code of the hidden iframe, so the success handler will ALWAYS fire.
+ * 
+ * # Binary Posts
+ * 
+ * The class supports posting binary data to the server by using native browser capabilities, or a flash polyfill plugin in browsers that do not support native binary posting (e.g. Internet Explorer version 9 or less). A number of limitations exist when the polyfill is used:
+ *
+ * - Only asynchronous connections are supported. 
+ * - Only the POST method can be used.
+ * - The return data can only be binary for now. Set the {@link Ext.data.Connection#binary binary} parameter to <tt>true</tt>.
+ * - Only the 0, 1 and 4 (complete) readyState values will be reported to listeners.
+ * - The flash object will be injected at the bottom of the document and should be invisible.
+ * - Important: See note about packaing the flash plugin with the app in the documenetation of {@link Ext.data.flash.BinaryXhr BinaryXhr}.
+ * 
+ */
+Ext.define('Ext.data.Connection', {
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+    
+               
+                                  
+      
+
+    statics: {
+        requestId: 0
+    },
+
+    url: null,
+    async: true,
+    method: null,
+    username: '',
+    password: '',
+
+    /**
+     * @cfg {Boolean} disableCaching
+     * True to add a unique cache-buster param to GET requests.
+     */
+    disableCaching: true,
+
+    /**
+     * @cfg {Boolean} withCredentials
+     * True to set `withCredentials = true` on the XHR object
+     */
+    withCredentials: false,
+
+    /**
+     * @cfg {Boolean} binary
+     * True if the response should be treated as binary data.  If true, the binary
+     * data will be accessible as a "responseBytes" property on the response object.
+     */
+    binary: false,
+
+    /**
+     * @cfg {Boolean} cors
+     * True to enable CORS support on the XHR object. Currently the only effect of this option
+     * is to use the XDomainRequest object instead of XMLHttpRequest if the browser is IE8 or above.
+     */
+    cors: false,
+
+    isXdr: false,
+
+    defaultXdrContentType: 'text/plain',
+
+    /**
+     * @cfg {String} disableCachingParam
+     * Change the parameter which is sent went disabling caching through a cache buster.
+     */
+    disableCachingParam: '_dc',
+
+    /**
+     * @cfg {Number} timeout
+     * The timeout in milliseconds to be used for requests.
+     */
+    timeout : 30000,
+
+    /**
+     * @cfg {Object} extraParams
+     * Any parameters to be appended to the request.
+     */
+
+    /**
+     * @cfg {Boolean} [autoAbort=false]
+     * Whether this request should abort any pending requests.
+     */
+
+    /**
+     * @cfg {String} method
+     * The default HTTP method to be used for requests.
+     *
+     * If not set, but {@link #request} params are present, POST will be used;
+     * otherwise, GET will be used.
+     */
+
+    /**
+     * @cfg {Object} defaultHeaders
+     * An object containing request headers which are added to each request made by this object.
+     */
+
+    useDefaultHeader : true,
+    defaultPostHeader : 'application/x-www-form-urlencoded; charset=UTF-8',
+    useDefaultXhrHeader : true,
+    defaultXhrHeader : 'XMLHttpRequest',
+
+    constructor : function(config) {
+        config = config || {};
+        Ext.apply(this, config);
+
+        /**
+         * @event beforerequest
+         * Fires before a network request is made to retrieve a data object.
+         * @param {Ext.data.Connection} conn This Connection object.
+         * @param {Object} options The options config object passed to the {@link #request} method.
+         */
+        /**
+         * @event requestcomplete
+         * Fires if the request was successfully completed.
+         * @param {Ext.data.Connection} conn This Connection object.
+         * @param {Object} response The XHR object containing the response data.
+         * See [The XMLHttpRequest Object](http://www.w3.org/TR/XMLHttpRequest/) for details.
+         * @param {Object} options The options config object passed to the {@link #request} method.
+         */
+        /**
+         * @event requestexception
+         * Fires if an error HTTP status was returned from the server. This event may also
+         * be listened to in the event that a request has timed out or has been aborted.
+         * See [HTTP Status Code Definitions](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html)
+         * for details of HTTP status codes.
+         * @param {Ext.data.Connection} conn This Connection object.
+         * @param {Object} response The XHR object containing the response data.
+         * See [The XMLHttpRequest Object](http://www.w3.org/TR/XMLHttpRequest/) for details.
+         * @param {Object} options The options config object passed to the {@link #request} method.
+         */
+        this.requests = {};
+        this.mixins.observable.constructor.call(this);
+    },
+
+    /**
+     * Sends an HTTP request to a remote server.
+     *
+     * **Important:** Ajax server requests are asynchronous, and this call will
+     * return before the response has been received. Process any returned data
+     * in a callback function.
+     *
+     *     Ext.Ajax.request({
+     *         url: 'ajax_demo/sample.json',
+     *         success: function(response, opts) {
+     *             var obj = Ext.decode(response.responseText);
+     *             console.dir(obj);
+     *         },
+     *         failure: function(response, opts) {
+     *             console.log('server-side failure with status code ' + response.status);
+     *         }
+     *     });
+     *
+     * To execute a callback function in the correct scope, use the `scope` option.
+     *
+     * @param {Object} options An object which may contain the following properties:
+     *
+     * (The options object may also contain any other property which might be needed to perform
+     * postprocessing in a callback because it is passed to callback functions.)
+     *
+     * @param {String/Function} options.url The URL to which to send the request, or a function
+     * to call which returns a URL string. The scope of the function is specified by the `scope` option.
+     * Defaults to the configured `url`.
+     *
+     * @param {Object/String/Function} options.params An object containing properties which are
+     * used as parameters to the request, a url encoded string or a function to call to get either. The scope
+     * of the function is specified by the `scope` option.
+     *
+     * @param {String} options.method The HTTP method to use
+     * for the request. Defaults to the configured method, or if no method was configured,
+     * "GET" if no parameters are being sent, and "POST" if parameters are being sent.  Note that
+     * the method name is case-sensitive and should be all caps.
+     *
+     * @param {Function} options.callback The function to be called upon receipt of the HTTP response.
+     * The callback is called regardless of success or failure and is passed the following parameters:
+     * @param {Object} options.callback.options The parameter to the request call.
+     * @param {Boolean} options.callback.success True if the request succeeded.
+     * @param {Object} options.callback.response The XMLHttpRequest object containing the response data.
+     * See [www.w3.org/TR/XMLHttpRequest/](http://www.w3.org/TR/XMLHttpRequest/) for details about
+     * accessing elements of the response.
+     *
+     * @param {Function} options.success The function to be called upon success of the request.
+     * The callback is passed the following parameters:
+     * @param {Object} options.success.response The XMLHttpRequest object containing the response data.
+     * @param {Object} options.success.options The parameter to the request call.
+     *
+     * @param {Function} options.failure The function to be called upon failure of the request.
+     * The callback is passed the following parameters:
+     * @param {Object} options.failure.response The XMLHttpRequest object containing the response data.
+     * @param {Object} options.failure.options The parameter to the request call.
+     *
+     * @param {Object} options.scope The scope in which to execute the callbacks: The "this" object for
+     * the callback function. If the `url`, or `params` options were specified as functions from which to
+     * draw values, then this also serves as the scope for those function calls. Defaults to the browser
+     * window.
+     *
+     * @param {Number} options.timeout The timeout in milliseconds to be used for this request.
+     * Defaults to 30 seconds.
+     *
+     * @param {Ext.Element/HTMLElement/String} options.form The `<form>` Element or the id of the `<form>`
+     * to pull parameters from.
+     *
+     * @param {Boolean} options.isUpload **Only meaningful when used with the `form` option.**
+     *
+     * True if the form object is a file upload (will be set automatically if the form was configured
+     * with **`enctype`** `"multipart/form-data"`).
+     *
+     * File uploads are not performed using normal "Ajax" techniques, that is they are **not**
+     * performed using XMLHttpRequests. Instead the form is submitted in the standard manner with the
+     * DOM `<form>` element temporarily modified to have its [target][] set to refer to a dynamically
+     * generated, hidden `<iframe>` which is inserted into the document but removed after the return data
+     * has been gathered.
+     *
+     * The server response is parsed by the browser to create the document for the IFRAME. If the
+     * server is using JSON to send the return object, then the [Content-Type][] header must be set to
+     * "text/html" in order to tell the browser to insert the text unchanged into the document body.
+     *
+     * The response text is retrieved from the document, and a fake XMLHttpRequest object is created
+     * containing a `responseText` property in order to conform to the requirements of event handlers
+     * and callbacks.
+     *
+     * Be aware that file upload packets are sent with the content type [multipart/form][] and some server
+     * technologies (notably JEE) may require some custom processing in order to retrieve parameter names
+     * and parameter values from the packet content.
+     *
+     * [target]: http://www.w3.org/TR/REC-html40/present/frames.html#adef-target
+     * [Content-Type]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17
+     * [multipart/form]: http://www.faqs.org/rfcs/rfc2388.html
+     *
+     * @param {Object} options.headers Request headers to set for the request.
+     *
+     * @param {Object} options.xmlData XML document to use for the post. Note: This will be used instead
+     * of params for the post data. Any params will be appended to the URL.
+     *
+     * @param {Object/String} options.jsonData JSON data to use as the post. Note: This will be used
+     * instead of params for the post data. Any params will be appended to the URL.
+     *
+     * @param {Array} options.binaryData An array of bytes to submit in binary form. Any params will be appended to the URL. If binaryData is present, you must set {@link Ext.data.Connection#binary binary} to <tt>true</tt> and options.method to <tt>POST</tt>.
+     * 
+     * @param {Boolean} options.disableCaching True to add a unique cache-buster param to GET requests.
+     *
+     * @param {Boolean} options.withCredentials True to add the withCredentials property to the XHR object
+     * 
+     * @param {Boolean} options.binary True if the response should be treated as binary data.  If true, the binary
+     * data will be accessible as a "responseBytes" property on the response object.
+     *
+     * @return {Object} The request object. This may be used to cancel the request.
+     */
+    request : function(options) {
+        options = options || {};
+        var me = this,
+            scope = options.scope || window,
+            username = options.username || me.username,
+            password = options.password || me.password || '',
+            async,
+            requestOptions,
+            request,
+            headers,
+            xhr;
+        if (me.fireEvent('beforerequest', me, options) !== false) {
+
+            requestOptions = me.setOptions(options, scope);
+
+            if (me.isFormUpload(options)) {
+                me.upload(options.form, requestOptions.url, requestOptions.data, options);
+                return null;
+            }
+
+            // if autoabort is set, cancel the current transactions
+            if (options.autoAbort || me.autoAbort) {
+                me.abort();
+            }
+
+            // create a connection object
+            async = options.async !== false ? (options.async || me.async) : false;
+            xhr = me.openRequest(options, requestOptions, async, username, password);
+
+            // XDR doesn't support setting any headers
+            if (!me.isXdr) {
+                headers = me.setupHeaders(xhr, options, requestOptions.data, requestOptions.params);
+            }
+
+            // create the transaction object
+            request = {
+                id: ++Ext.data.Connection.requestId,
+                xhr: xhr,
+                headers: headers,
+                options: options,
+                async: async,
+                binary: options.binary || me.binary,
+                timeout: setTimeout(function() {
+                    request.timedout = true;
+                    me.abort(request);
+                }, options.timeout || me.timeout)
+            };
+
+            me.requests[request.id] = request;
+            me.latestId = request.id;
+            // bind our statechange listener
+            if (async) {
+                if (!me.isXdr) {
+                    xhr.onreadystatechange = Ext.Function.bind(me.onStateChange, me, [request]);
+                }
+            }
+
+            if (me.isXdr) {
+                me.processXdrRequest(request, xhr);
+            }
+
+            // start the request!
+            xhr.send(requestOptions.data);
+            if (!async) {
+                return me.onComplete(request);
+            }
+            return request;
+        } else {
+            Ext.callback(options.callback, options.scope, [options, undefined, undefined]);
+            return null;
+        }
+    },
+
+    processXdrRequest: function(request, xhr) {
+        var me = this;
+
+        // Mutate the request object as per XDR spec.
+        delete request.headers;
+
+        request.contentType = request.options.contentType || me.defaultXdrContentType;
+
+        xhr.onload = Ext.Function.bind(me.onStateChange, me, [request, true]);
+        xhr.onerror = xhr.ontimeout = Ext.Function.bind(me.onStateChange, me, [request, false]);
+    },
+
+    processXdrResponse: function(response, xhr) {
+        // Mutate the response object as per XDR spec.
+        response.getAllResponseHeaders = function () {
+            return [];
+        };
+        response.getResponseHeader = function () {
+            return '';
+        };
+        response.contentType = xhr.contentType || this.defaultXdrContentType;
+    },
+
+    /**
+     * Uploads a form using a hidden iframe.
+     * @param {String/HTMLElement/Ext.Element} form The form to upload
+     * @param {String} url The url to post to
+     * @param {String} params Any extra parameters to pass
+     * @param {Object} options The initial options
+     */
+    upload: function(form, url, params, options) {
+        form = Ext.getDom(form);
+        options = options || {};
+
+        var id = Ext.id(),
+            frame = document.createElement('iframe'),
+            hiddens = [],
+            encoding = 'multipart/form-data',
+            buf = {
+                target: form.target,
+                method: form.method,
+                encoding: form.encoding,
+                enctype: form.enctype,
+                action: form.action
+            },
+            addField = function(name, value) {
+                hiddenItem = document.createElement('input');
+                Ext.fly(hiddenItem).set({
+                    type: 'hidden',
+                    value: value,
+                    name: name
+                });
+                form.appendChild(hiddenItem);
+                hiddens.push(hiddenItem);
+            },
+            hiddenItem, obj, value, name, vLen, v, hLen, h;
+
+        /*
+         * Originally this behaviour was modified for Opera 10 to apply the secure URL after
+         * the frame had been added to the document. It seems this has since been corrected in
+         * Opera so the behaviour has been reverted, the URL will be set before being added.
+         */
+        Ext.fly(frame).set({
+            id: id,
+            name: id,
+            cls: Ext.baseCSSPrefix + 'hide-display',
+            src: Ext.SSL_SECURE_URL
+        });
+
+        document.body.appendChild(frame);
+
+        // This is required so that IE doesn't pop the response up in a new window.
+        if (document.frames) {
+            document.frames[id].name = id;
+        }
+
+        Ext.fly(form).set({
+            target: id,
+            method: 'POST',
+            enctype: encoding,
+            encoding: encoding,
+            action: url || buf.action
+        });
+
+        // add dynamic params
+        if (params) {
+            obj = Ext.Object.fromQueryString(params) || {};
+
+            for (name in obj) {
+                if (obj.hasOwnProperty(name)) {
+                    value = obj[name];  
+                    if (Ext.isArray(value)) {
+                        vLen = value.length;
+                        for (v = 0; v < vLen; v++) {
+                            addField(name, value[v]);
+                        }
+                    } else {
+                        addField(name, value);
+                    }
+                }
+            }
+        }
+
+        Ext.fly(frame).on('load', Ext.Function.bind(this.onUploadComplete, this, [frame, options]), null, {single: !Ext.isOpera});
+        form.submit();
+
+        Ext.fly(form).set(buf);
+
+        hLen = hiddens.length;
+
+        for (h = 0; h < hLen; h++) {
+            Ext.removeNode(hiddens[h]);
+        }
+    },
+
+    /**
+     * @private
+     * Callback handler for the upload function. After we've submitted the form via the iframe this creates a bogus
+     * response object to simulate an XHR and populates its responseText from the now-loaded iframe's document body
+     * (or a textarea inside the body). We then clean up by removing the iframe
+     */
+    onUploadComplete: function(frame, options) {
+        var me = this,
+            // bogus response object
+            response = {
+                responseText: '',
+                responseXML: null
+            }, callback, success, doc, contentNode;
+
+        try {
+            doc = frame.contentWindow.document || frame.contentDocument || window.frames[frame.id].document;
+            // Opera will fire an extraneous load event on about:blank
+            // We want to ignore this since the load event will be fired twice
+            if (doc) {
+                 if (Ext.isOpera && doc.location == 'about:blank') {
+                     return;
+                 }
+                if (doc.body) {
+
+                    // Response sent as Content-Type: text/json or text/plain. Browser will embed in a <pre> element
+                    // Note: The statement below tests the result of an assignment.
+                    if ((contentNode = doc.body.firstChild) && /pre/i.test(contentNode.tagName)) {
+                        response.responseText = contentNode.textContent;
+                    }
+
+                    // Response sent as Content-Type: text/html. We must still support JSON response wrapped in textarea.
+                    // Note: The statement below tests the result of an assignment.
+                    else if ((contentNode = doc.getElementsByTagName('textarea')[0])) {
+                        response.responseText = contentNode.value;
+                    }
+                    // Response sent as Content-Type: text/html with no wrapping. Scrape JSON response out of text
+                    else {
+                        response.responseText = doc.body.textContent || doc.body.innerText;
+                    }
+                }
+                //in IE the document may still have a body even if returns XML.
+                response.responseXML = doc.XMLDocument || doc;
+                callback = options.success;
+                success = true;
+            }
+        } catch (e) {
+            // Report any error in the message property
+            response.responseText = '{success:false,message:"' + Ext.String.trim(e.message || e.description) + '"}';
+            callback = options.failure;
+            success = false;
+        }
+
+        me.fireEvent('requestcomplete', me, response, options);
+
+        Ext.callback(callback, options.scope, [response, options]);
+        Ext.callback(options.callback, options.scope, [options, success, response]);
+
+        setTimeout(function() {
+            Ext.removeNode(frame);
+        }, 100);
+    },
+
+    /**
+     * Detects whether the form is intended to be used for an upload.
+     * @private
+     */
+    isFormUpload: function(options) {
+        var form = this.getForm(options);
+        if (form) {
+            return (options.isUpload || (/multipart\/form-data/i).test(form.getAttribute('enctype')));
+        }
+        return false;
+    },
+
+    /**
+     * Gets the form object from options.
+     * @private
+     * @param {Object} options The request options
+     * @return {HTMLElement} The form, null if not passed
+     */
+    getForm: function(options) {
+        return Ext.getDom(options.form) || null;
+    },
+
+    /**
+     * Sets various options such as the url, params for the request
+     * @param {Object} options The initial options
+     * @param {Object} scope The scope to execute in
+     * @return {Object} The params for the request
+     */
+    setOptions: function(options, scope) {
+        var me = this,
+            params = options.params || {},
+            extraParams = me.extraParams,
+            urlParams = options.urlParams,
+            url = options.url || me.url,
+            jsonData = options.jsonData,
+            method,
+            disableCache,
+            data;
+
+
+        // allow params to be a method that returns the params object
+        if (Ext.isFunction(params)) {
+            params = params.call(scope, options);
+        }
+
+        // allow url to be a method that returns the actual url
+        if (Ext.isFunction(url)) {
+            url = url.call(scope, options);
+        }
+
+        url = this.setupUrl(options, url);
+
+        if (!url) {
+            Ext.Error.raise({
+                options: options,
+                msg: 'No URL specified'
+            });
+        }
+
+        // check for xml or json data, and make sure json data is encoded
+        data = options.rawData || options.binaryData || options.xmlData || jsonData || null;
+        if (jsonData && !Ext.isPrimitive(jsonData)) {
+            data = Ext.encode(data);
+        }
+        // Check for binary data. Transform if needed
+        if (options.binaryData) {
+            if (!Ext.isArray(options.binaryData)) {
+                Ext.log.warn("Binary submission data must be an array of byte values! Instead got " + typeof(options.binaryData));
+            }
+            if (me.nativeBinaryPostSupport()) {
+                data = (new Uint8Array(options.binaryData));
+                if ((Ext.isChrome && Ext.chromeVersion < 22) || Ext.isSafari || Ext.isGecko) {
+                    data = data.buffer; //  send the underlying buffer, not the view, since that's not supported on versions of chrome older than 22
+                }
+            }
+        }
+        
+        // make sure params are a url encoded string and include any extraParams if specified
+        if (Ext.isObject(params)) {
+            params = Ext.Object.toQueryString(params);
+        }
+
+        if (Ext.isObject(extraParams)) {
+            extraParams = Ext.Object.toQueryString(extraParams);
+        }
+
+        params = params + ((extraParams) ? ((params) ? '&' : '') + extraParams : '');
+
+        urlParams = Ext.isObject(urlParams) ? Ext.Object.toQueryString(urlParams) : urlParams;
+
+        params = this.setupParams(options, params);
+
+        // decide the proper method for this request
+        method = (options.method || me.method || ((params || data) ? 'POST' : 'GET')).toUpperCase();
+        this.setupMethod(options, method);
+
+
+        disableCache = options.disableCaching !== false ? (options.disableCaching || me.disableCaching) : false;
+        // if the method is get append date to prevent caching
+        if (method === 'GET' && disableCache) {
+            url = Ext.urlAppend(url, (options.disableCachingParam || me.disableCachingParam) + '=' + (new Date().getTime()));
+        }
+
+        // if the method is get or there is json/xml data append the params to the url
+        if ((method == 'GET' || data) && params) {
+            url = Ext.urlAppend(url, params);
+            params = null;
+        }
+
+        // allow params to be forced into the url
+        if (urlParams) {
+            url = Ext.urlAppend(url, urlParams);
+        }
+
+        return {
+            url: url,
+            method: method,
+            data: data || params || null
+        };
+    },
+
+    /**
+     * Template method for overriding url
+     * @template
+     * @private
+     * @param {Object} options
+     * @param {String} url
+     * @return {String} The modified url
+     */
+    setupUrl: function(options, url) {
+        var form = this.getForm(options);
+        if (form) {
+            url = url || form.action;
+        }
+        return url;
+    },
+
+
+    /**
+     * Template method for overriding params
+     * @template
+     * @private
+     * @param {Object} options
+     * @param {String} params
+     * @return {String} The modified params
+     */
+    setupParams: function(options, params) {
+        var form = this.getForm(options),
+            serializedForm;
+        if (form && !this.isFormUpload(options)) {
+            serializedForm = Ext.Element.serializeForm(form);
+            params = params ? (params + '&' + serializedForm) : serializedForm;
+        }
+        return params;
+    },
+
+    /**
+     * Template method for overriding method
+     * @template
+     * @private
+     * @param {Object} options
+     * @param {String} method
+     * @return {String} The modified method
+     */
+    setupMethod: function(options, method) {
+        if (this.isFormUpload(options)) {
+            return 'POST';
+        }
+        return method;
+    },
+
+    /**
+     * Setup all the headers for the request
+     * @private
+     * @param {Object} xhr The xhr object
+     * @param {Object} options The options for the request
+     * @param {Object} data The data for the request
+     * @param {Object} params The params for the request
+     */
+    setupHeaders: function(xhr, options, data, params) {
+        var me = this,
+            headers = Ext.apply({}, options.headers || {}, me.defaultHeaders || {}),
+            contentType = me.defaultPostHeader,
+            jsonData = options.jsonData,
+            xmlData = options.xmlData,
+            key,
+            header;
+
+        if (!headers['Content-Type'] && (data || params)) {
+            if (data) {
+                if (options.rawData) {
+                    contentType = 'text/plain';
+                } else {
+                    if (xmlData && Ext.isDefined(xmlData)) {
+                        contentType = 'text/xml';
+                    } else if (jsonData && Ext.isDefined(jsonData)) {
+                        contentType = 'application/json';
+                    }
+                }
+            }
+            headers['Content-Type'] = contentType;
+        }
+
+        if (me.useDefaultXhrHeader && !headers['X-Requested-With']) {
+            headers['X-Requested-With'] = me.defaultXhrHeader;
+        }
+        // set up all the request headers on the xhr object
+        try {
+            for (key in headers) {
+                if (headers.hasOwnProperty(key)) {
+                    header = headers[key];
+                    xhr.setRequestHeader(key, header);
+                }
+            }
+        } catch(e) {
+            me.fireEvent('exception', key, header);
+        }
+        return headers;
+    },
+
+    /**
+     * Creates the appropriate XHR transport for a given request on this browser. On IE
+     * this may be an `XDomainRequest` rather than an `XMLHttpRequest`.
+     * @private
+     */
+    newRequest: function (options) {
+        var me = this,
+            xhr;
+
+        if (options.binaryData) {
+            // This is a binary data request. Handle submission differently for differnet browsers
+            if (me.nativeBinaryPostSupport()) { 
+                xhr = this.getXhrInstance(); // On browsers that support this, use the native XHR object
+            } else {
+                // catch all for all other browser types
+                xhr = new Ext.data.flash.BinaryXhr();
+            }
+        } else  if ((options.cors || me.cors) && Ext.isIE && Ext.ieVersion <= 9) {
+            xhr = me.getXdrInstance();
+            me.isXdr = true;
+        } else {
+            xhr = me.getXhrInstance();
+        }
+
+        return xhr;
+    },
+
+    /**
+     * Creates and opens an appropriate XHR transport for a given request on this browser.
+     * This logic is contained in an individual method to allow for overrides to process all
+     * of the parameters and options and return a suitable, open connection.
+     * @private
+     */
+    openRequest: function (options, requestOptions, async, username, password) {
+        var me = this,
+            xhr = me.newRequest(options);
+
+        if (username) {
+            xhr.open(requestOptions.method, requestOptions.url, async, username, password);
+        } else {
+            if (me.isXdr) {
+                xhr.open(requestOptions.method, requestOptions.url);
+            } else {
+                xhr.open(requestOptions.method, requestOptions.url, async);
+            }
+        }
+
+        if (options.binary || me.binary) {
+            if (window.Uint8Array) {
+                xhr.responseType = 'arraybuffer';
+            } else if (xhr.overrideMimeType) {
+                // In some older non-IE browsers, e.g. ff 3.6, that do not
+                // support Uint8Array, a mime type override is required so that
+                // the unprocessed binary data can be read from the responseText
+                // (see createResponse())
+                xhr.overrideMimeType('text\/plain; charset=x-user-defined');  
+            } else if (!Ext.isIE) {
+                Ext.log.warn("Your does not support loading binary data using Ajax.");
+            }
+        }
+
+        if (options.withCredentials || me.withCredentials) {
+            xhr.withCredentials = true;
+        }
+
+        return xhr;
+    },
+
+    /**
+     * Creates the appropriate XDR transport for this browser.
+     * - IE 7 and below don't support CORS
+     * - IE 8 and 9 support CORS with native XDomainRequest object
+     * - IE 10 (and above?) supports CORS with native XMLHttpRequest object
+     * @private
+     */
+    getXdrInstance: function() {
+        var xdr;
+
+        if (Ext.ieVersion >= 8) {
+            xdr = new XDomainRequest();
+        } else {
+            Ext.Error.raise({
+                msg: 'Your browser does not support CORS'
+            });
+        }
+
+        return xdr;
+    },
+
+    /**
+     * Creates the appropriate XHR transport for this browser.
+     * @private
+     */
+    getXhrInstance: (function() {
+        var options = [function() {
+            return new XMLHttpRequest();
+        }, function() {
+            return new ActiveXObject('MSXML2.XMLHTTP.3.0');
+        }, function() {
+            return new ActiveXObject('MSXML2.XMLHTTP');
+        }, function() {
+            return new ActiveXObject('Microsoft.XMLHTTP');
+        }], i = 0,
+            len = options.length,
+            xhr;
+
+        for (; i < len; ++i) {
+            try {
+                xhr = options[i];
+                xhr();
+                break;
+            } catch(e) {
+            }
+        }
+        return xhr;
+    }()),
+
+    /**
+     * Determines whether this object has a request outstanding.
+     * @param {Object} [request] Defaults to the last transaction
+     * @return {Boolean} True if there is an outstanding request.
+     */
+    isLoading : function(request) {
+        if (!request) {
+            request = this.getLatest();
+        }
+        if (!(request && request.xhr)) {
+            return false;
+        }
+        // if there is a connection and readyState is not 0 or 4, or in case of BinaryXHR, not 4
+        var state = request.xhr.readyState;
+        return ((request.xhr instanceof Ext.data.flash.BinaryXhr) && state != 4) || !(state === 0 || state == 4);
+    },
+
+    /**
+     * Aborts an active request.
+     * @param {Object} [request] Defaults to the last request
+     */
+    abort : function(request) {
+        var me = this,
+            xhr;
+        
+        if (!request) {
+            request = me.getLatest();
+        }
+
+        if (request && me.isLoading(request)) {
+            /*
+             * Clear out the onreadystatechange here, this allows us
+             * greater control, the browser may/may not fire the function
+             * depending on a series of conditions.
+             */
+            xhr = request.xhr;
+            try {
+                xhr.onreadystatechange = null;
+            } catch (e) {
+                // Setting onreadystatechange to null can cause problems in IE, see
+                // http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_a_1.html
+                xhr.onreadystatechange = Ext.emptyFn;
+            }
+            xhr.abort();
+            me.clearTimeout(request);
+            if (!request.timedout) {
+                request.aborted = true;
+            }
+            me.onComplete(request);
+            me.cleanup(request);
+        }
+    },
+    
+    /**
+     * Aborts all active requests
+     */
+    abortAll: function(){
+        var requests = this.requests,
+            id;
+        
+        for (id in requests) {
+            if (requests.hasOwnProperty(id)) {
+                this.abort(requests[id]);
+            }
+        }
+    },
+    
+    /**
+     * Gets the most recent request
+     * @private
+     * @return {Object} The request. Null if there is no recent request
+     */
+    getLatest: function(){
+        var id = this.latestId,
+            request;
+            
+        if (id) {
+            request = this.requests[id];
+        }
+        return request || null;
+    },
+
+    /**
+     * Fires when the state of the xhr changes
+     * @private
+     * @param {Object} request The request
+     */
+    onStateChange : function(request, xdrResult) {
+        var me = this;
+
+        // Using CORS with IE doesn't support readyState so we fake it
+        if ((request.xhr && request.xhr.readyState == 4) || me.isXdr) {
+            me.clearTimeout(request);
+            me.onComplete(request, xdrResult);
+            me.cleanup(request);
+            Ext.EventManager.idleEvent.fire();
+        }
+    },
+
+    /**
+     * Clears the timeout on the request
+     * @private
+     * @param {Object} request The request
+     */
+    clearTimeout: function(request) {
+        clearTimeout(request.timeout);
+        delete request.timeout;
+    },
+
+    /**
+     * Cleans up any left over information from the request
+     * @private
+     * @param {Object} request The request
+     */
+    cleanup: function(request) {
+        request.xhr = null;
+        delete request.xhr;
+    },
+
+    /**
+     * To be called when the request has come back from the server
+     * @private
+     * @param {Object} request
+     * @return {Object} The response
+     */
+    onComplete : function(request, xdrResult) {
+        var me = this,
+            options = request.options,
+            result,
+            success,
+            response;
+
+        try {
+            result = me.parseStatus(request.xhr.status);
+        } catch (e) {
+            // in some browsers we can't access the status if the readyState is not 4, so the request has failed
+            result = {
+                success : false,
+                isException : false
+            };
+
+        }
+        success = me.isXdr ? xdrResult : result.success;
+
+        if (success) {
+            response = me.createResponse(request);
+            me.fireEvent('requestcomplete', me, response, options);
+            Ext.callback(options.success, options.scope, [response, options]);
+        } else {
+            if (result.isException || request.aborted || request.timedout) {
+                response = me.createException(request);
+            } else {
+                response = me.createResponse(request);
+            }
+            me.fireEvent('requestexception', me, response, options);
+            Ext.callback(options.failure, options.scope, [response, options]);
+        }
+        Ext.callback(options.callback, options.scope, [options, success, response]);
+        delete me.requests[request.id];
+        return response;
+    },
+
+    /**
+     * Checks if the response status was successful
+     * @param {Number} status The status code
+     * @return {Object} An object containing success/status state
+     */
+    parseStatus: function(status) {
+        // see: https://prototype.lighthouseapp.com/projects/8886/tickets/129-ie-mangles-http-response-status-code-204-to-1223
+        status = status == 1223 ? 204 : status;
+
+        var success = (status >= 200 && status < 300) || status == 304,
+            isException = false;
+
+        if (!success) {
+            switch (status) {
+                case 12002:
+                case 12029:
+                case 12030:
+                case 12031:
+                case 12152:
+                case 13030:
+                    isException = true;
+                    break;
+            }
+        }
+        return {
+            success: success,
+            isException: isException
+        };
+    },
+
+    /**
+     * Creates the response object
+     * @private
+     * @param {Object} request
+     */
+    createResponse : function(request) {
+        var me = this,
+            xhr = request.xhr,
+            isXdr = me.isXdr,
+            headers = {},
+            lines = isXdr ? [] : xhr.getAllResponseHeaders().replace(/\r\n/g, '\n').split('\n'),
+            count = lines.length,
+            line, index, key, response, byteArray;
+
+        while (count--) {
+            line = lines[count];
+            index = line.indexOf(':');
+            if (index >= 0) {
+                key = line.substr(0, index).toLowerCase();
+                if (line.charAt(index + 1) == ' ') {
+                    ++index;
+                }
+                headers[key] = line.substr(index + 1);
+            }
+        }
+
+        request.xhr = null;
+        delete request.xhr;
+
+        response = {
+            request: request,
+            requestId: request.id,
+            status: xhr.status,
+            statusText: xhr.statusText,
+            getResponseHeader: function(header) {
+                return headers[header.toLowerCase()];
+            },
+            getAllResponseHeaders: function() {
+                return headers;
+            }
+        };
+
+        if (isXdr) {
+            me.processXdrResponse(response, xhr);
+        }
+
+        if (request.binary) {
+            response.responseBytes = me.getByteArray(xhr);
+        } else {
+            // an error is thrown when trying to access responseText or responseXML
+            // on an xhr object with responseType of 'arraybuffer', so only attempt
+            // to set these properties in the response if we're not dealing with
+            // binary data
+            response.responseText = xhr.responseText;
+            response.responseXML = xhr.responseXML;
+        }
+
+        // If we don't explicitly tear down the xhr reference, IE6/IE7 will hold this in the closure of the
+        // functions created with getResponseHeader/getAllResponseHeaders
+        xhr = null;
+        return response;
+    },
+
+    /**
+     * Creates the exception object
+     * @private
+     * @param {Object} request
+     */
+    createException : function(request) {
+        return {
+            request : request,
+            requestId : request.id,
+            status : request.aborted ? -1 : 0,
+            statusText : request.aborted ? 'transaction aborted' : 'communication failure',
+            aborted: request.aborted,
+            timedout: request.timedout
+        };
+    },
+
+    /**
+     * Gets binary data from the xhr response object and returns it as a byte array
+     * @private
+     * @param {Object} xhr the xhr response object
+     * @return {Uint8Array/Array}
+     */
+    getByteArray: function(xhr) {
+        var response = xhr.response,
+            responseBody = xhr.responseBody,
+            byteArray, responseText, len, i;
+
+        if (xhr instanceof Ext.data.flash.BinaryXhr) {
+            // If this was a BinaryXHR request via flash, we already have the bytes ready
+            byteArray = xhr.responseBytes;
+        } else if (window.Uint8Array) {
+            // Modern browsers (including IE10) have a native byte array
+            // which can be created by passing the ArrayBuffer (returned as
+            // the xhr.response property) to the Uint8Array constructor.
+            byteArray = response ? new Uint8Array(response) : [];
+        } else if (Ext.isIE9p) {
+            // In IE9 and below the responseBody property contains a byte array
+            // but it is not directly accessible using javascript.
+            // In IE9p we can get the bytes by constructing a VBArray
+            // using the responseBody and then converting it to an Array.
+            try {
+                byteArray = new VBArray(responseBody).toArray();
+            } catch(e) {
+                // If the binary response is empty, the VBArray constructor will
+                // choke on the responseBody.  We can't simply do a null check
+                // on responseBody because responseBody is always falsy when it
+                // contains binary data.
+                byteArray = [];
+            }
+        } else if (Ext.isIE) {
+            // IE8 and below also have a VBArray constructor, but throw a
+            // "VBArray Expected" error if you try to pass the responseBody to
+            // the VBArray constructor.
+            // http://msdn.microsoft.com/en-us/library/ye3x9by3%28v=vs.71%29.aspx
+            // so we have to use vbscript injection to access the bytes
+            if (!this.self.vbScriptInjected) {
+                this.injectVBScript();
+            }
+            getIEByteArray(xhr.responseBody, byteArray = []);
+        } else {
+            // in other older browsers make a best-effort attempt to read the
+            // bytes from responseText
+            byteArray = [];
+            responseText = xhr.responseText;
+            len = responseText.length;
+            for (i = 0; i < len; i++) {
+                // Some characters have an extra byte 0xF7 in the high order
+                // position. Throw away the high order byte and then push the
+                // result onto the byteArray.
+                byteArray.push(responseText.charCodeAt(i) & 0xFF);
+            }
+        }
+
+        return byteArray;
+    },
+
+    /**
+     * Injects a vbscript tag containing a 'getIEByteArray' method for reading
+     * binary data from an xhr response in IE8 and below.
+     * @private
+     */
+    injectVBScript: function() {
+        var scriptTag = document.createElement('script');
+        scriptTag.type = 'text/vbscript';
+        scriptTag.text = [
+            'Function getIEByteArray(byteArray, out)',
+                'Dim len, i',
+                'len = LenB(byteArray)',
+                'For i = 1 to len',
+                    'out.push(AscB(MidB(byteArray, i, 1)))',
+                'Next',
+            'End Function'
+        ].join('\n');
+        Ext.getHead().dom.appendChild(scriptTag);
+        this.self.vbScriptInjected = true;
+    },
+    
+    /**
+     * @private
+     * @return {boolean} <tt>true</tt> if the browser can natively post binary data.
+     */
+    nativeBinaryPostSupport: function() {
+        return Ext.isChrome ||
+            (Ext.isSafari && Ext.isDefined(window.Uint8Array)) ||
+            (Ext.isGecko && Ext.isDefined(window.Uint8Array));
+    }
+    
+    
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.Ajax
+ * @singleton
+ * @markdown
+
+A singleton instance of an {@link Ext.data.Connection}. This class
+is used to communicate with your server side code. It can be used as follows:
+
+    Ext.Ajax.request({
+        url: 'page.php',
+        params: {
+            id: 1
+        },
+        success: function(response){
+            var text = response.responseText;
+            // process server response here
+        }
+    });
+
+Default options for all requests can be set by changing a property on the Ext.Ajax class:
+
+    Ext.Ajax.timeout = 60000; // 60 seconds
+
+Any options specified in the request method for the Ajax request will override any
+defaults set on the Ext.Ajax class. In the code sample below, the timeout for the
+request will be 60 seconds.
+
+    Ext.Ajax.timeout = 120000; // 120 seconds
+    Ext.Ajax.request({
+        url: 'page.aspx',
+        timeout: 60000
+    });
+
+In general, this class will be used for all Ajax requests in your application.
+The main reason for creating a separate {@link Ext.data.Connection} is for a
+series of requests that share common settings that are different to all other
+requests in the application.
+
+ */
+Ext.define('Ext.Ajax', {
+    extend:  Ext.data.Connection ,
+    singleton: true,
+
+    /**
+     * @cfg {Object} extraParams @hide
+     */
+    /**
+     * @cfg {Object} defaultHeaders @hide
+     */
+    /**
+     * @cfg {String} method @hide
+     */
+    /**
+     * @cfg {Number} timeout @hide
+     */
+    /**
+     * @cfg {Boolean} autoAbort @hide
+     */
+    /**
+     * @cfg {Boolean} disableCaching @hide
+     */
+
+    /**
+     * @property {Boolean} disableCaching
+     * True to add a unique cache-buster param to GET requests. Defaults to true.
+     */
+    /**
+     * @property {String} url
+     * The default URL to be used for requests to the server.
+     * If the server receives all requests through one URL, setting this once is easier than
+     * entering it on every request.
+     */
+    /**
+     * @property {Object} extraParams
+     * An object containing properties which are used as extra parameters to each request made
+     * by this object. Session information and other data that you need
+     * to pass with each request are commonly put here.
+     */
+    /**
+     * @property {Object} defaultHeaders
+     * An object containing request headers which are added to each request made by this object.
+     */
+    /**
+     * @property {String} method
+     * The default HTTP method to be used for requests. Note that this is case-sensitive and
+     * should be all caps (if not set but params are present will use
+     * <tt>"POST"</tt>, otherwise will use <tt>"GET"</tt>.)
+     */
+    /**
+     * @property {Number} timeout
+     * The timeout in milliseconds to be used for requests. Defaults to 30000.
+     */
+
+    /**
+     * @property {Boolean} autoAbort
+     * Whether a new request should abort any pending requests.
+     */
+    autoAbort : false
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A mixin to add floating capability to a Component.
+ */
+Ext.define('Ext.util.Floating', {
+
+                                             
+
+    /**
+     * @cfg {Boolean} focusOnToFront
+     * Specifies whether the floated component should be automatically {@link Ext.Component#method-focus focused} when
+     * it is {@link #toFront brought to the front}.
+     */
+    focusOnToFront: true,
+
+    /**
+     * @cfg {String/Boolean} shadow
+     * Specifies whether the floating component should be given a shadow. Set to true to automatically create an
+     * {@link Ext.Shadow}, or a string indicating the shadow's display {@link Ext.Shadow#mode}. Set to false to
+     * disable the shadow.
+     */
+    shadow: 'sides',
+
+    /**
+     * @cfg {Boolean} constrain
+     * True to constrain this Components within its containing element, false to allow it to fall outside of its containing
+     * element. By default this Component will be rendered to `document.body`. To render and constrain this Component within
+     * another element specify {@link Ext.AbstractComponent#renderTo renderTo}.
+     */
+    constrain: false,
+
+    /**
+     * @cfg {Boolean} [fixed=false]
+     * Configure as `true` to have this Component fixed at its `X, Y` coordinates in the browser viewport, immune
+     * to scrolling the document.
+     * 
+     * *Only in browsers that support `position:fixed`*
+     * 
+     * *IE6 and IE7, 8 and 9 quirks do not support `position: fixed`*
+     */
+
+    /**
+     * @cfg {Number} shadowOffset
+     * Number of pixels to offset the shadow.
+     */
+
+    constructor: function (dom) {
+        var me = this;
+
+        // We do not support fixed on legacy browsers.
+        me.fixed = me.fixed && !(Ext.isIE6 || Ext.isIEQuirks);
+
+        me.el = new Ext.dom.Layer(Ext.apply({
+            preventSync  : true,
+            hideMode     : me.hideMode,
+            hidden       : me.hidden,
+            shadow       : (typeof me.shadow != 'undefined') ? me.shadow : 'sides',
+            shadowOffset : me.shadowOffset,
+            constrain    : false,
+            fixed        : me.fixed,
+            shim         : (me.shim === false) ? false : undefined
+        }, me.floating), dom);
+
+        // If modal, and focus navigation not being handled by the FocusManager,
+        // catch tab navigation, and loop back in on tab off first or last item.
+        if (me.modal && !(Ext.FocusManager && Ext.FocusManager.enabled)) {
+            me.mon(me.el, {
+                keydown: me.onKeyDown,
+                scope: me
+            });
+        }
+
+        // clickToRaise
+        me.mon(me.el, {
+            mousedown: me.onMouseDown,
+            scope: me
+        });
+
+        // release config object (if it was one)
+        me.floating = true;
+
+        // Register with the configured ownerCt.
+        // With this we acquire a floatParent for relative positioning, and a zIndexParent which is an
+        // ancestor floater which provides zIndex management.
+        me.registerWithOwnerCt();
+
+        me.initHierarchyEvents();
+    },
+
+    initHierarchyEvents: function() {
+        var me = this,
+            syncHidden = this.syncHidden;
+
+        if (!me.hasHierarchyEventListeners) {
+            me.mon(me.hierarchyEventSource, {
+                hide: syncHidden,
+                collapse: syncHidden,
+                show: syncHidden,
+                expand: syncHidden,
+                added: syncHidden,
+                scope: me
+            });
+            me.hasHierarchyEventListeners = true;
+        }
+    },
+
+    registerWithOwnerCt: function() {
+        var me = this,
+            ownerCt = me.ownerCt,
+            zip = me.zIndexParent;
+
+        if (zip) {
+            zip.unregisterFloatingItem(me);
+        }
+
+        // Acquire a zIndexParent by traversing the ownerCt axis for the nearest floating ancestor.
+        // This is to find a base which can allocate relative z-index values
+        zip = me.zIndexParent = me.up('[floating]');
+
+        // Set the floatParent to the ownertCt if one has been provided.
+        // Otherwise use the zIndexParent.
+        // Developers must only use ownerCt if there is really a containing relationship.
+        me.setFloatParent(ownerCt || zip);
+        delete me.ownerCt;
+
+        if (zip) {
+            zip.registerFloatingItem(me);
+        } else {
+            Ext.WindowManager.register(me);
+        }
+    },
+
+    // Listen for TAB events and wrap round if tabbing of either end of the Floater
+    onKeyDown: function(e) {
+        var me = this,
+            shift,
+            focusables,
+            first,
+            last;
+
+        // If tabbing off either end, wrap round.
+        // See Ext.dom.Element.isFocusable
+        // Certain browsers always report tabIndex zero in the absence of the tabIndex attribute.
+        // Testing the specified property (Standards: http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-862529273)
+        // Should filter out these cases.
+        // The exceptions are IE6 to IE8. In these browsers all elements will yield a tabIndex
+        // and therefore all elements will appear to be focusable.
+        // This adversely affects modal Floating components.
+        // These listen for the TAB key, and then test whether the event target === last focusable
+        // or first focusable element, and forcibly to a circular navigation.
+        // We cannot know the true first or last focusable element, so this problem still exists for IE6,7,8
+        if (e.getKey() == Ext.EventObject.TAB) {
+            shift = e.shiftKey;
+            focusables = me.el.query(':focusable');
+            first = focusables[0];
+            last = focusables[focusables.length - 1];
+            if (first && last && e.target === (shift ? first : last)) {
+                e.stopEvent();
+                (shift ? last : first).focus(false, true);
+            }
+        }
+    },
+
+    // @private
+    // Mousedown brings to front, and programatically grabs focus *unless the mousedown was on a focusable element*
+    onMouseDown: function (e) {
+        var focusTask = this.focusTask;
+        
+        if (this.floating &&
+            // get out of here if there is already a pending focus.  This usually means
+            // that the handler for a mousedown on a child element set the focus on some
+            // other component, and we so not want to steal it back. See EXTJSIV-9458
+            (!focusTask || !focusTask.id)) {
+            // If what was mousedowned upon is going to claim focus anyway, pass preventFocus as true.
+            this.toFront(!!e.getTarget(':focusable'));
+        }
+    },
+
+    setFloatParent: function(floatParent) {
+        var me = this;
+
+        me.floatParent = floatParent;
+
+        // If a floating Component is configured to be constrained, but has no configured
+        // constrainTo setting, set its constrainTo to be it's ownerCt before rendering.
+        if ((me.constrain || me.constrainHeader) && !me.constrainTo) {
+            me.constrainTo = floatParent ? floatParent.getTargetEl() : me.container;
+        }
+    },
+    
+    // @private
+    syncShadow : function() {
+        if (this.floating) {
+            this.el.sync(true);
+        }
+    },
+    
+    onBeforeFloatLayout: function(){
+        this.el.preventSync = true;
+    },
+    
+    onAfterFloatLayout: function(){
+        delete this.el.preventSync;
+        this.syncShadow();   
+    },
+
+    /**
+     * synchronizes the hidden state of this component with the state of its hierarchy
+     * @private
+     */
+    syncHidden: function() {
+        var me = this,
+            hidden = me.hidden || !me.rendered,
+            hierarchicallyHidden = me.hierarchicallyHidden = me.isHierarchicallyHidden(),
+            pendingShow = me.pendingShow;
+
+        if (hidden !== hierarchicallyHidden) {
+            if (hierarchicallyHidden) {
+                me.hide();
+                me.pendingShow = true;
+            } else if (pendingShow) {
+                delete me.pendingShow;
+                if (pendingShow.length) {
+                    me.show.apply(me, pendingShow);
+                } else {
+                    me.show();
+                }
+            }
+        }
+    },
+
+    // @private
+    // z-index is managed by the zIndexManager and may be overwritten at any time.
+    // Returns the next z-index to be used.
+    // If this is a Container, then it will have rebased any managed floating Components,
+    // and so the next available z-index will be approximately 10000 above that.
+    setZIndex: function(index) {
+        var me = this;
+
+        me.el.setZIndex(index);
+
+        // Next item goes 10 above;
+        index += 10;
+
+        // When a Container with floating descendants has its z-index set, it rebases any floating descendants it is managing.
+        // The returned value is a round number approximately 10000 above the last z-index used.
+        if (me.floatingDescendants) {
+            index = Math.floor(me.floatingDescendants.setBase(index) / 100) * 100 + 10000;
+        }
+        return index;
+    },
+
+    /**
+     * Moves this floating Component into a constrain region.
+     *
+     * By default, this Component is constrained to be within the container it was added to, or the element it was
+     * rendered to.
+     *
+     * An alternative constraint may be passed.
+     * @param {String/HTMLElement/Ext.Element/Ext.util.Region} [constrainTo] The Element or {@link Ext.util.Region Region}
+     * into which this Component is to be constrained. Defaults to the element into which this floating Component
+     * was rendered.
+     */
+    doConstrain: function(constrainTo) {
+        var me = this,
+            // Calculate the constrained poition.
+            // calculateConstrainedPosition will provide a default constraint
+            // region if there is no explicit constrainTo, *and* there is no floatParent owner Component.
+            xy = me.calculateConstrainedPosition(constrainTo, null, true);
+
+        // false is returned if no movement is needed
+        if (xy) {
+            me.setPosition(xy);
+        }
+    },
+
+    /**
+     * Brings this floating Component to the front of any other visible, floating Components managed by the same
+     * {@link Ext.ZIndexManager ZIndexManager}
+     *
+     * If this Component is modal, inserts the modal mask just below this Component in the z-index stack.
+     *
+     * @param {Boolean} [preventFocus=false] Specify `true` to prevent the Component from being focused.
+     * @return {Ext.Component} this
+     */
+    toFront: function(preventFocus) {
+        var me = this,
+            zip = me.zIndexParent,
+            preventFocusSetting = me.preventFocusOnActivate;
+
+        // Find the floating Component which provides the base for this Component's zIndexing.
+        // That must move to front to then be able to rebase its zIndex stack and move this to the front
+        if (zip && me.bringParentToFront !== false) {
+            zip.toFront(true);
+        }
+
+        if (!Ext.isDefined(preventFocus)) {
+            preventFocus = !me.focusOnToFront;
+        }
+
+        if (preventFocus) {
+            me.preventFocusOnActivate = true;
+        }
+        if (me.zIndexManager.bringToFront(me, preventFocus)) {    
+            if (!preventFocus) {
+                // Kick off a delayed focus request.
+                // If another floating Component is toFronted before the delay expires
+                // this will not receive focus.
+                me.focus(false, true);
+            }
+        }
+        
+        // Restore to original setting
+        me.preventFocusOnActivate = preventFocusSetting;
+        return me;
+    },
+
+    /**
+     * This method is called internally by {@link Ext.ZIndexManager} to signal that a floating Component has either been
+     * moved to the top of its zIndex stack, or pushed from the top of its zIndex stack.
+     *
+     * If a _Window_ is superceded by another Window, deactivating it hides its shadow.
+     *
+     * This method also fires the {@link Ext.Component#activate activate} or
+     * {@link Ext.Component#deactivate deactivate} event depending on which action occurred.
+     *
+     * @param {Boolean} [active=false] True to activate the Component, false to deactivate it.
+     * @param {Ext.Component} [newActive] The newly active Component which is taking over topmost zIndex position.
+     */
+    setActive: function(active, newActive) {
+        var me = this;
+        
+        if (active) {
+            if (me.el.shadow && !me.maximized) {
+                me.el.enableShadow(true);
+            }
+            if (!me.preventFocusOnActivate) {
+                me.focus(false, true);
+            }
+            me.fireEvent('activate', me);
+        } else {
+            // Only the *Windows* in a zIndex stack share a shadow. All other types of floaters
+            // can keep their shadows all the time
+            if (me.isWindow && (newActive && newActive.isWindow) && me.hideShadowOnDeactivate) {
+                me.el.disableShadow();
+            }
+            me.fireEvent('deactivate', me);
+        }
+    },
+
+    /**
+     * Sends this Component to the back of (lower z-index than) any other visible windows
+     * @return {Ext.Component} this
+     */
+    toBack: function() {
+        this.zIndexManager.sendToBack(this);
+        return this;
+    },
+
+    /**
+     * Center this Component in its container.
+     * @return {Ext.Component} this
+     */
+    center: function() {
+        var me = this,
+            xy;
+            
+        if (me.isVisible()) {
+            xy = me.getAlignToXY(me.container, 'c-c');
+            me.setPagePosition(xy);
+        } else {
+            me.needsCenter = true;
+        }
+        return me;
+    },
+    
+    onFloatShow: function() {
+        if (this.needsCenter) {
+            this.center();    
+        }
+        delete this.needsCenter;
+    },
+
+    // @private
+    fitContainer: function(animate) {
+        var me = this,
+            parent = me.floatParent,
+            container = parent ? parent.getTargetEl() : me.container,
+            newBox = container.getViewSize(false),
+            newPosition = parent || (container.dom !== document.body) ?
+                // If we are a contained floater, or rendered to a div, maximized position is (0,0)
+                [0, 0] :
+                // If no parent and rendered to body, align with origin of container el.
+                container.getXY();
+
+        newBox.x = newPosition[0];
+        newBox.y = newPosition[1];
+        me.setBox(newBox, animate);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Base class for all Ext components.
+ *
+ * The Component base class has built-in support for basic hide/show and enable/disable and size control behavior.
+ *
+ * ## xtypes
+ *
+ * Every component has a specific xtype, which is its Ext-specific type name, along with methods for checking the xtype
+ * like {@link #getXType} and {@link #isXType}. See the [Component Guide][1] for more information on xtypes and the
+ * Component hierarchy.
+ *
+ * ## Finding components
+ *
+ * All Components are registered with the {@link Ext.ComponentManager} on construction so that they can be referenced at
+ * any time via {@link Ext#getCmp Ext.getCmp}, passing the {@link #id}.
+ *
+ * Additionally the {@link Ext.ComponentQuery} provides a CSS-selectors-like way to look up components by their xtype
+ * and many other attributes.  For example the following code will find all textfield components inside component with
+ * `id: 'myform'`:
+ *
+ *     Ext.ComponentQuery.query('#myform textfield');
+ *
+ * ## Extending Ext.Component
+ *
+ * All subclasses of Component may participate in the automated Ext component
+ * lifecycle of creation, rendering and destruction which is provided by the {@link Ext.container.Container Container}
+ * class. Components may be added to a Container through the {@link Ext.container.Container#cfg-items items} config option
+ * at the time the Container is created, or they may be added dynamically via the
+ * {@link Ext.container.Container#method-add add} method.
+ *
+ * All user-developed visual widgets that are required to participate in automated lifecycle and size management should
+ * subclass Component.
+ *
+ * See the Creating new UI controls chapter in [Component Guide][1] for details on how and to either extend
+ * or augment Ext JS base classes to create custom Components.
+ *
+ * ## The Ext.Component class by itself
+ *
+ * Usually one doesn't need to instantiate the Ext.Component class. There are subclasses which implement
+ * specialized use cases, covering most application needs. However it is possible to instantiate a base
+ * Component, and it can be rendered to document, or handled by layouts as the child item of a Container:
+ *
+ *     @example
+ *     Ext.create('Ext.Component', {
+ *         html: 'Hello world!',
+ *         width: 300,
+ *         height: 200,
+ *         padding: 20,
+ *         style: {
+ *             color: '#FFFFFF',
+ *             backgroundColor:'#000000'
+ *         },
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * The Component above creates its encapsulating `div` upon render, and use the configured HTML as content. More complex
+ * internal structure may be created using the {@link #renderTpl} configuration, although to display database-derived
+ * mass data, it is recommended that an ExtJS data-backed Component such as a {@link Ext.view.View View},
+ * {@link Ext.grid.Panel GridPanel}, or {@link Ext.tree.Panel TreePanel} be used.
+ *
+ * [1]: #!/guide/components
+ */
+Ext.define('Ext.Component', {
+
+    /* Begin Definitions */
+
+    alias: ['widget.component', 'widget.box'],
+
+    extend:  Ext.AbstractComponent ,
+
+           
+                               
+                    
+                              
+                                   
+      
+
+    mixins: {
+        floating:  Ext.util.Floating 
+    },
+
+    statics: {
+        // Collapse/expand directions
+        DIRECTION_TOP: 'top',
+        DIRECTION_RIGHT: 'right',
+        DIRECTION_BOTTOM: 'bottom',
+        DIRECTION_LEFT: 'left',
+
+        VERTICAL_DIRECTION_Re: /^(?:top|bottom)$/,
+
+        // RegExp whih specifies characters in an xtype which must be translated to '-' when generating auto IDs.
+        // This includes dot, comma and whitespace
+        INVALID_ID_CHARS_Re: /[\.,\s]/g
+    },
+
+    /* End Definitions */
+
+    /**
+     * @cfg {Boolean/Object} resizable
+     * Specify as `true` to apply a {@link Ext.resizer.Resizer Resizer} to this Component after rendering.
+     *
+     * May also be specified as a config object to be passed to the constructor of {@link Ext.resizer.Resizer Resizer}
+     * to override any defaults. By default the Component passes its minimum and maximum size, and uses
+     * `{@link Ext.resizer.Resizer#dynamic}: false`
+     */
+
+    /**
+     * @cfg {String} resizeHandles
+     * A valid {@link Ext.resizer.Resizer} handles config string. Only applies when resizable = true.
+     */
+    resizeHandles: 'all',
+
+    /**
+     * @cfg {Boolean} [autoScroll=false]
+     * `true` to use overflow:'auto' on the components layout element and show scroll bars automatically when necessary,
+     * `false` to clip any overflowing content.
+     * This should not be combined with {@link #overflowX} or  {@link #overflowY}.
+     */
+
+    /**
+     * @cfg {String} overflowX
+     * Possible values are:
+     *  * `'auto'` to enable automatic horizontal scrollbar (overflow-x: 'auto').
+     *  * `'scroll'` to always enable horizontal scrollbar (overflow-x: 'scroll').
+     * The default is overflow-x: 'hidden'. This should not be combined with {@link #autoScroll}.
+     */
+
+    /**
+     * @cfg {String} overflowY
+     * Possible values are:
+     *  * `'auto'` to enable automatic vertical scrollbar (overflow-y: 'auto').
+     *  * `'scroll'` to always enable vertical scrollbar (overflow-y: 'scroll').
+     * The default is overflow-y: 'hidden'. This should not be combined with {@link #autoScroll}.
+     */
+
+    /**
+     * @cfg {Boolean} floating
+     * Specify as true to float the Component outside of the document flow using CSS absolute positioning.
+     *
+     * Components such as {@link Ext.window.Window Window}s and {@link Ext.menu.Menu Menu}s are floating by default.
+     *
+     * Floating Components that are programatically {@link Ext.Component#method-render rendered} will register
+     * themselves with the global {@link Ext.WindowManager ZIndexManager}
+     *
+     * ### Floating Components as child items of a Container
+     *
+     * A floating Component may be used as a child item of a Container. This just allows the floating Component to seek
+     * a ZIndexManager by examining the ownerCt chain.
+     *
+     * When configured as floating, Components acquire, at render time, a {@link Ext.ZIndexManager ZIndexManager} which
+     * manages a stack of related floating Components. The ZIndexManager brings a single floating Component to the top
+     * of its stack when the Component's {@link #toFront} method is called.
+     *
+     * The ZIndexManager is found by traversing up the {@link #ownerCt} chain to find an ancestor which itself is
+     * floating. This is so that descendant floating Components of floating _Containers_ (Such as a ComboBox dropdown
+     * within a Window) can have its zIndex managed relative to any siblings, but always **above** that floating
+     * ancestor Container.
+     *
+     * If no floating ancestor is found, a floating Component registers itself with the default {@link Ext.WindowManager
+     * ZIndexManager}.
+     *
+     * Floating components _do not participate in the Container's layout_. Because of this, they are not rendered until
+     * you explicitly {@link #method-show} them.
+     *
+     * After rendering, the ownerCt reference is deleted, and the {@link #floatParent} property is set to the found
+     * floating ancestor Container. If no floating ancestor Container was found the {@link #floatParent} property will
+     * not be set.
+     */
+    floating: false,
+    
+    /**
+     * @cfg {String} [defaultAlign="tl-bl?"]
+     * The default {@link Ext.util.Positionable#getAlignToXY Ext.Element#getAlignToXY} anchor position value for this menu
+     * relative to its element of origin. Used in conjunction with {@link #showBy}.
+     */
+    defaultAlign: 'tl-bl?',
+
+    /**
+     * @cfg {Boolean} toFrontOnShow
+     * True to automatically call {@link #toFront} when the {@link #method-show} method is called on an already visible,
+     * floating component.
+     */
+    toFrontOnShow: true,
+    
+    /**
+     * @cfg {Ext.util.Region/Ext.Element} constrainTo
+     * A {@link Ext.util.Region Region} (or an element from which a Region measurement will be read) which is used
+     * to constrain the component. Only applies when the component is floating.
+     */
+
+    /**
+     * @cfg {Object/String} constraintInsets
+     * An object or a string (in TRBL order) specifying insets from the configured {@link #constrainTo constrain region}
+     * within which this component must be constrained when positioning or sizing.
+     * example:
+     *
+     *    constraintInsets: '10 10 10 10' // Constrain with 10px insets from parent
+     */
+
+    /**
+     * @property {Ext.ZIndexManager} zIndexManager
+     * Only present for {@link #floating} Components after they have been rendered.
+     *
+     * A reference to the ZIndexManager which is managing this Component's z-index.
+     *
+     * The {@link Ext.ZIndexManager ZIndexManager} maintains a stack of floating Component z-indices, and also provides
+     * a single modal mask which is insert just beneath the topmost visible modal floating Component.
+     *
+     * Floating Components may be {@link #toFront brought to the front} or {@link #toBack sent to the back} of the
+     * z-index stack.
+     *
+     * This defaults to the global {@link Ext.WindowManager ZIndexManager} for floating Components that are
+     * programatically {@link Ext.Component#method-render rendered}.
+     *
+     * For {@link #floating} Components which are added to a Container, the ZIndexManager is acquired from the first
+     * ancestor Container found which is floating. If no floating ancestor is found, the global {@link Ext.WindowManager ZIndexManager} is
+     * used.
+     *
+     * See {@link #floating} and {@link #zIndexParent}
+     * @readonly
+     */
+
+    /**
+     * @property {Ext.Container} floatParent
+     * **Only present for {@link #floating} Components which were inserted as child items of Containers.**
+     *
+     * There are other similar relationships such as the {@link Ext.button.Button button} which activates a {@link Ext.button.Button#cfg-menu menu}, or the
+     * {@link Ext.menu.Item menu item} which activated a {@link Ext.menu.Item#cfg-menu submenu}, or the
+     * {@link Ext.grid.column.Column column header} which activated the column menu.
+     *
+     * These differences are abstracted away by the {@link #up} method.
+     *
+     * Floating Components that are programatically {@link Ext.Component#method-render rendered} will not have a `floatParent`
+     * property.
+     *
+     * See {@link #floating} and {@link #zIndexManager}
+     * @readonly
+     */
+
+    /**
+     * @property {Ext.Container} zIndexParent
+     * Only present for {@link #floating} Components which were inserted as child items of Containers, and which have a floating
+     * Container in their containment ancestry.
+     *
+     * For {@link #floating} Components which are child items of a Container, the zIndexParent will be a floating
+     * ancestor Container which is responsible for the base z-index value of all its floating descendants. It provides
+     * a {@link Ext.ZIndexManager ZIndexManager} which provides z-indexing services for all its descendant floating
+     * Components.
+     *
+     * Floating Components that are programatically {@link Ext.Component#method-render rendered} will not have a `zIndexParent`
+     * property.
+     *
+     * For example, the dropdown {@link Ext.view.BoundList BoundList} of a ComboBox which is in a Window will have the
+     * Window as its `zIndexParent`, and will always show above that Window, wherever the Window is placed in the z-index stack.
+     *
+     * See {@link #floating} and {@link #zIndexManager}
+     * @readonly
+     */
+
+    /**
+     * @cfg {Boolean/Object} [draggable=false]
+     * Specify as true to make a {@link #floating} Component draggable using the Component's encapsulating element as
+     * the drag handle.
+     *
+     * This may also be specified as a config object for the {@link Ext.util.ComponentDragger ComponentDragger} which is
+     * instantiated to perform dragging.
+     *
+     * For example to create a Component which may only be dragged around using a certain internal element as the drag
+     * handle, use the delegate option:
+     *
+     *     new Ext.Component({
+     *         constrain: true,
+     *         floating: true,
+     *         style: {
+     *             backgroundColor: '#fff',
+     *             border: '1px solid black'
+     *         },
+     *         html: '<h1 style="cursor:move">The title</h1><p>The content</p>',
+     *         draggable: {
+     *             delegate: 'h1'
+     *         }
+     *     }).show();
+     */
+    
+    /**
+     * @cfg {Boolean} [formBind=false]
+     * When inside FormPanel, any component configured with `formBind: true` will
+     * be enabled/disabled depending on the validity state of the form.
+     * See {@link Ext.form.Panel} for more information and example.
+     */
+
+    /**
+     * @cfg {Number/String} [columnWidth=undefined]
+     * Defines the column width inside {@link Ext.layout.container.Column column layout}.
+     *
+     * Can be specified as a number or as a percentage.
+     */
+
+    /**
+     * @cfg {"north"/"south"/"east"/"west"/"center"} [region=undefined]
+     * Defines the region inside {@link Ext.layout.container.Border border layout}.
+     *
+     * Possible values:
+     *
+     * - north - Positions component at top.
+     * - south - Positions component at bottom.
+     * - east - Positions component at right.
+     * - west - Positions component at left.
+     * - center - Positions component at the remaining space.
+     *   There **must** be a component with `region: "center"` in every border layout.
+     */
+
+    hideMode: 'display',
+    
+    offsetsCls: Ext.baseCSSPrefix + 'hide-offsets',
+
+    bubbleEvents: [],
+
+    defaultComponentLayoutType: 'autocomponent',
+
+    //renderTpl: new Ext.XTemplate(
+    //    '<div id="{id}" class="{baseCls} {cls} {cmpCls}<tpl if="typeof ui !== \'undefined\'"> {uiBase}-{ui}</tpl>"<tpl if="typeof style !== \'undefined\'"> style="{style}"</tpl>></div>', {
+    //        compiled: true,
+    //        disableFormats: true
+    //    }
+    //),
+
+    /**
+     * Creates new Component.
+     * @param {Ext.Element/String/Object} config The configuration options may be specified as either:
+     *
+     * - **an element** : it is set as the internal element and its id used as the component id
+     * - **a string** : it is assumed to be the id of an existing element and is used as the component id
+     * - **anything else** : it is assumed to be a standard config object and is applied to the component
+     */
+    constructor: function(config) {
+        var me = this;
+
+        config = config || {};
+        if (config.initialConfig) {
+
+            // Being initialized from an Ext.Action instance...
+            if (config.isAction) {
+                me.baseAction = config;
+            }
+            config = config.initialConfig;
+            // component cloning / action set up
+        }
+        else if (config.tagName || config.dom || Ext.isString(config)) {
+            // element object
+            config = {
+                applyTo: config,
+                id: config.id || config
+            };
+        }
+
+        me.callParent([config]);
+
+        // If we were configured from an instance of Ext.Action, (or configured with a baseAction option),
+        // register this Component as one of its items
+        if (me.baseAction){
+            me.baseAction.addComponent(me);
+        }
+    },
+
+    /**
+     * The initComponent template method is an important initialization step for a Component. It is intended to be
+     * implemented by each subclass of Ext.Component to provide any needed constructor logic. The
+     * initComponent method of the class being created is called first, with each initComponent method
+     * up the hierarchy to Ext.Component being called thereafter. This makes it easy to implement and,
+     * if needed, override the constructor logic of the Component at any step in the hierarchy.
+     *
+     * The initComponent method **must** contain a call to {@link Ext.Base#callParent callParent} in order
+     * to ensure that the parent class' initComponent method is also called.
+     *
+     * All config options passed to the constructor are applied to `this` before initComponent is called,
+     * so you can simply access them with `this.someOption`.
+     *
+     * The following example demonstrates using a dynamic string for the text of a button at the time of
+     * instantiation of the class.
+     *
+     *     Ext.define('DynamicButtonText', {
+     *         extend: 'Ext.button.Button',
+     *
+     *         initComponent: function() {
+     *             this.text = new Date();
+     *             this.renderTo = Ext.getBody();
+     *             this.callParent();
+     *         }
+     *     });
+     *
+     *     Ext.onReady(function() {
+     *         Ext.create('DynamicButtonText');
+     *     });
+     *
+     * @template
+     * @protected
+     * @since 1.1.0
+     */
+    initComponent: function() {
+        var me = this;
+
+        me.callParent();
+
+        if (me.listeners) {
+            me.on(me.listeners);
+            me.listeners = null; //change the value to remove any on prototype
+        }
+        me.enableBubble(me.bubbleEvents);
+    },
+
+    afterRender: function() {
+        var me = this;
+
+        me.callParent();
+
+        if (!(me.x && me.y) && (me.pageX || me.pageY)) {
+            me.setPagePosition(me.pageX, me.pageY);
+        }
+    },
+
+    /**
+     * Sets the overflow on the content element of the component.
+     * @param {Boolean} scroll True to allow the Component to auto scroll.
+     * @return {Ext.Component} this
+     */
+    setAutoScroll : function(scroll) {
+        var me = this;
+
+        me.autoScroll = !!scroll;
+
+        // Scrolling styles must be applied to Component's main element.
+        // Layouts which use an innerCt (Box layout), shrinkwrap the innerCt round overflowing content,
+        // so the innerCt must be scrolled by the container, it does not scroll content.
+        if (me.rendered) {
+            me.getOverflowEl().setStyle(me.getOverflowStyle());
+        }
+        me.updateLayout();
+        return me;
+    },
+
+    /**
+     * Sets the overflow x/y on the content element of the component. The x/y overflow
+     * values can be any valid CSS overflow (e.g., 'auto' or 'scroll'). By default, the
+     * value is 'hidden'. Passing null for one of the values will erase the inline style.
+     * Passing `undefined` will preserve the current value.
+     *
+     * @param {String} overflowX The overflow-x value.
+     * @param {String} overflowY The overflow-y value.
+     * @return {Ext.Component} this
+     */
+    setOverflowXY: function(overflowX, overflowY) {
+        var me = this,
+            argCount = arguments.length;
+
+        if (argCount) {
+            me.overflowX = overflowX || '';
+            if (argCount > 1) {
+                me.overflowY = overflowY || '';
+            }
+        }
+
+        // Scrolling styles must be applied to Component's main element.
+        // Layouts which use an innerCt (Box layout), shrinkwrap the innerCt round overflowing content,
+        // so the innerCt must be scrolled by the container, it does not scroll content.
+        if (me.rendered) {
+            me.getOverflowEl().setStyle(me.getOverflowStyle());
+        }
+        me.updateLayout();
+        return me;
+    },
+
+    beforeRender: function () {
+        var me = this,
+            floating = me.floating,
+            cls;
+
+        if (floating) {
+            me.addCls(Ext.baseCSSPrefix + 'layer');
+
+            cls = floating.cls;
+            if (cls) {
+                me.addCls(cls);
+            }
+        }
+
+        return me.callParent();
+    },
+    
+    beforeLayout: function(){
+        this.callParent(arguments);
+        if (this.floating) {
+            this.onBeforeFloatLayout();
+        }    
+    },
+    
+    afterComponentLayout: function(){
+        this.callParent(arguments);
+        if (this.floating) {
+            this.onAfterFloatLayout();
+        }
+    },
+
+    // @private
+    makeFloating : function (dom) {
+        this.mixins.floating.constructor.call(this, dom);
+    },
+
+    wrapPrimaryEl: function (dom) {
+        if (this.floating) {
+            this.makeFloating(dom);
+        } else {
+            this.callParent(arguments);
+        }
+    },
+
+    initResizable: function(resizable) {
+        var me = this;
+
+        resizable = Ext.apply({
+            target: me,
+            dynamic: false,
+            constrainTo: me.constrainTo || (me.floatParent ? me.floatParent.getTargetEl() : null),
+            handles: me.resizeHandles
+        }, resizable);
+        resizable.target = me;
+        me.resizer = new Ext.resizer.Resizer(resizable);
+    },
+
+    getDragEl: function() {
+        return this.el;
+    },
+
+    initDraggable: function() {
+        var me = this,
+
+            // If we are resizable, and the resizer had to wrap this Component's el (eg an Img)
+            // Then we have to create a pseudo-Component out of the resizer to drag that,
+            // otherwise, we just drag this Component
+            dragTarget = (me.resizer && me.resizer.el !== me.el) ? me.resizerComponent = new Ext.Component({
+                el: me.resizer.el,
+                rendered: true,
+                container: me.container
+            }) : me,
+            ddConfig = Ext.applyIf({
+                el: dragTarget.getDragEl(),
+                constrainTo: (me.constrain||me.draggable.constrain) ? (me.constrainTo || (me.floatParent ? me.floatParent.getTargetEl() : me.container)) : undefined
+            }, me.draggable);
+
+        // Add extra configs if Component is specified to be constrained
+        if (me.constrain || me.constrainDelegate) {
+            ddConfig.constrain = me.constrain;
+            ddConfig.constrainDelegate = me.constrainDelegate;
+        }
+
+        me.dd = new Ext.util.ComponentDragger(dragTarget, ddConfig);
+    },
+
+    /**
+     * Scrolls this Component's {@link #getTargetEl target element} by the passed delta values, optionally animating.
+     *
+     * All of the following are equivalent:
+     *
+     *      comp.scrollBy(10, 10, true);
+     *      comp.scrollBy([10, 10], true);
+     *      comp.scrollBy({ x: 10, y: 10 }, true);
+     *
+     * @param {Number/Number[]/Object} deltaX Either the x delta, an Array specifying x and y deltas or
+     * an object with "x" and "y" properties.
+     * @param {Number/Boolean/Object} deltaY Either the y delta, or an animate flag or config object.
+     * @param {Boolean/Object} animate Animate flag/config object if the delta values were passed separately.
+     */
+    scrollBy: function(deltaX, deltaY, animate) {
+        var el;
+
+        if ((el = this.getTargetEl()) && el.dom) {
+            el.scrollBy.apply(el, arguments);
+        }
+    },
+
+    /**
+     * This method allows you to show or hide a LoadMask on top of this component.
+     *
+     * @param {Boolean/Object/String} load True to show the default LoadMask, a config object that will be passed to the
+     * LoadMask constructor, or a message String to show. False to hide the current LoadMask.
+     * @param {Boolean} [targetEl=false] True to mask the targetEl of this Component instead of the `this.el`. For example,
+     * setting this to true on a Panel will cause only the body to be masked.
+     * @return {Ext.LoadMask} The LoadMask instance that has just been shown.
+     */
+    setLoading : function(load, targetEl) {
+        var me = this,
+            config = {
+                target: me
+            };
+
+        if (me.rendered) {
+            Ext.destroy(me.loadMask);
+            me.loadMask = null;
+
+            if (load !== false && !me.collapsed) {
+                if (Ext.isObject(load)) {
+                    Ext.apply(config, load);
+                } else if (Ext.isString(load)) {
+                    config.msg = load;
+                }
+                
+                if (targetEl) {
+                    Ext.applyIf(config, {
+                        useTargetEl: true
+                    });
+                }
+                me.loadMask = new Ext.LoadMask(config);
+                me.loadMask.show();
+            }
+        }
+        return me.loadMask;
+    },
+
+    beforeSetPosition: function () {
+        var me = this,
+            pos = me.callParent(arguments), // pass all args on for signature decoding
+            adj;
+
+        if (pos) {
+            adj = me.adjustPosition(pos.x, pos.y);
+            pos.x = adj.x;
+            pos.y = adj.y;
+        }
+        return pos || null;
+    },
+
+    afterSetPosition: function(ax, ay) {
+        this.onPosition(ax, ay);
+        this.fireEvent('move', this, ax, ay);
+    },
+
+    /**
+     * Displays component at specific xy position.
+     * A floating component (like a menu) is positioned relative to its ownerCt if any.
+     * Useful for popping up a context menu:
+     *
+     *     listeners: {
+     *         itemcontextmenu: function(view, record, item, index, event, options) {
+     *             Ext.create('Ext.menu.Menu', {
+     *                 width: 100,
+     *                 height: 100,
+     *                 margin: '0 0 10 0',
+     *                 items: [{
+     *                     text: 'regular item 1'
+     *                 },{
+     *                     text: 'regular item 2'
+     *                 },{
+     *                     text: 'regular item 3'
+     *                 }]
+     *             }).showAt(event.getXY());
+     *         }
+     *     }
+     *
+     * @param {Number/Number[]} x The new x position or array of `[x,y]`.
+     * @param {Number} [y] The new y position
+     * @param {Boolean/Object} [animate] True to animate the Component into its new position. You may also pass an
+     * animation configuration.
+     * @return {Ext.Component} this
+     */
+    showAt: function(x, y, animate) {
+        var me = this;
+
+        // Not rendered, then animating to a position is meaningless,
+        // just set the x,y position and allow show's processing to work.
+        if (!me.rendered && (me.autoRender || me.floating)) {
+            me.x = x;
+            me.y = y;
+            return me.show();
+        }
+        if (me.floating) {
+            me.setPosition(x, y, animate);
+        } else {
+            me.setPagePosition(x, y, animate);
+        }
+        me.show();
+    },
+    
+    /**
+     * Shows this component by the specified {@link Ext.Component Component} or {@link Ext.Element Element}.
+     * Used when this component is {@link #floating}.
+     * @param {Ext.Component/Ext.dom.Element} component The {@link Ext.Component} or {@link Ext.Element} to show the component by.
+     * @param {String} [position] Alignment position as used by {@link Ext.util.Positionable#getAlignToXY}.
+     * Defaults to `{@link #defaultAlign}`.
+     * @param {Number[]} [offsets] Alignment offsets as used by {@link Ext.util.Positionable#getAlignToXY}.
+     * @return {Ext.Component} this
+     */
+    showBy: function(cmp, pos, off) {
+        var me = this;
+        
+        if (!me.floating) {
+            Ext.log.warn('Using showBy on a non-floating component');
+            return me;
+        }
+
+        if (me.floating && cmp) {
+            me.show();
+
+            // Show may have been vetoed
+            if (me.rendered && !me.hidden) {
+                // Align to Component or Element using alignTo because normal show methods
+                // are container-relative, and we must align to the requested element or
+                // Component:
+                me.alignTo(cmp, pos || me.defaultAlign, off);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Sets the page XY position of the component. To set the left and top instead, use {@link #setPosition}.
+     * This method fires the {@link #event-move} event.
+     * @param {Number/Number[]} x The new x position or an array of `[x,y]`.
+     * @param {Number} [y] The new y position.
+     * @param {Boolean/Object} [animate] True to animate the Component into its new position. You may also pass an
+     * animation configuration.
+     * @return {Ext.Component} this
+     */
+    setPagePosition: function(x, y, animate) {
+        var me = this,
+            p,
+            floatParentBox;
+
+        if (Ext.isArray(x)) {
+            y = x[1];
+            x = x[0];
+        }
+        me.pageX = x;
+        me.pageY = y;
+
+        if (me.floating) {
+
+            // Floating Components which are registered with a Container have to have their x and y properties made relative
+            if (me.isContainedFloater()) {
+                floatParentBox = me.floatParent.getTargetEl().getViewRegion();
+                if (Ext.isNumber(x) && Ext.isNumber(floatParentBox.left)) {
+                    x -= floatParentBox.left;
+                }
+                if (Ext.isNumber(y) && Ext.isNumber(floatParentBox.top)) {
+                    y -= floatParentBox.top;
+                }
+            } else {
+                p = me.el.translateXY(x, y);
+                x = p.x;
+                y = p.y;
+            }
+
+            me.setPosition(x, y, animate);
+        } else {
+            p = me.el.translateXY(x, y);
+            me.setPosition(p.x, p.y, animate);
+        }
+
+        return me;
+    },
+
+    // Utility method to determine if a Component is floating, and has an owning Container whose coordinate system
+    // it must be positioned in when using setPosition.
+    isContainedFloater: function() {
+        return (this.floating && this.floatParent);
+    },
+
+    /**
+     * Sets the current box measurements of the component's underlying element.
+     * @param {Object} box An object in the format {x, y, width, height}
+     * @return {Ext.Component} this
+     */
+    updateBox : function(box){
+        this.setSize(box.width, box.height);
+        this.setPagePosition(box.x, box.y);
+        return this;
+    },
+
+    // Include margins
+    getOuterSize: function() {
+        var el = this.el;
+        return {
+            width: el.getWidth() + el.getMargin('lr'),
+            height: el.getHeight() + el.getMargin('tb')
+        };
+    },
+
+    // @private
+    adjustPosition: function(x, y) {
+        var me = this,
+            floatParentBox;
+
+        // Floating Components being positioned in their ownerCt have to be made absolute.
+        if (me.isContainedFloater()) {
+            floatParentBox = me.floatParent.getTargetEl().getViewRegion();
+            x += floatParentBox.left;
+            y += floatParentBox.top;
+        }
+
+        return {
+            x: x,
+            y: y
+        };
+    },
+
+    /**
+     * Gets the current XY position of the component's underlying element.
+     * @param {Boolean} [local=false] If true the element's left and top are returned instead of page XY.
+     * @return {Number[]} The XY position of the element (e.g., [100, 200])
+     */
+    getPosition: function(local) {
+        var me = this,
+            xy,
+            isContainedFloater = me.isContainedFloater(),
+            floatParentBox;
+
+        // Local position for non-floaters means element's local position
+        if ((local === true) && !isContainedFloater) {
+            return [me.getLocalX(), me.getLocalY()];
+        }
+
+        xy = me.getXY();
+
+        // Local position for floaters means position relative to the container's target element
+        if ((local === true) && isContainedFloater) {
+            floatParentBox = me.floatParent.getTargetEl().getViewRegion();
+            xy[0] -= floatParentBox.left;
+            xy[1] -= floatParentBox.top;
+        }
+        return xy;
+    },
+
+    getId: function() {
+        var me = this,
+            xtype;
+
+        if (!me.id) {
+            xtype = me.getXType();
+            if (xtype) {
+                xtype = xtype.replace(Ext.Component.INVALID_ID_CHARS_Re, '-');
+            } else {
+                xtype = Ext.name.toLowerCase() + '-comp';
+            }
+            me.id = xtype + '-' + me.getAutoId();
+        }
+        return me.id;
+    },
+
+    /**
+     * Shows this Component, rendering it first if {@link #autoRender} or {@link #floating} are `true`.
+     *
+     * After being shown, a {@link #floating} Component (such as a {@link Ext.window.Window}), is activated it and
+     * brought to the front of its {@link #zIndexManager z-index stack}.
+     *
+     * @param {String/Ext.Element} [animateTarget=null] **only valid for {@link #floating} Components such as {@link
+     * Ext.window.Window Window}s or {@link Ext.tip.ToolTip ToolTip}s, or regular Components which have been configured
+     * with `floating: true`.** The target from which the Component should animate from while opening.
+     * @param {Function} [callback] A callback function to call after the Component is displayed.
+     * Only necessary if animation was specified.
+     * @param {Object} [scope] The scope (`this` reference) in which the callback is executed.
+     * Defaults to this Component.
+     * @return {Ext.Component} this
+     */
+    show: function(animateTarget, cb, scope) {
+        var me = this,
+            rendered = me.rendered;
+
+        if (me.hierarchicallyHidden || (me.floating && !rendered && me.isHierarchicallyHidden())) {
+            // If this is a hierarchically hidden floating component, we need to stash
+            // the arguments to this call so that the call can be deferred until the next
+            // time syncHidden() is called.
+            if (!rendered) {
+                // If the component has not yet been rendered it requires special treatment.
+                // Normally, for rendered components we can just set the pendingShow property
+                // and syncHidden() listens to events in the hierarchyEventSource and calls
+                // show() when this component becomes hierarchically visible.  However,
+                // if the component has not yet been rendered the hierarchy event listeners
+                // have not yet been attached (since Floating is initialized during the
+                // render phase.  This means we have to initialize the hierarchy event
+                // listeners right now to ensure that the component will show itself when
+                // it becomes hierarchically visible.  
+                me.initHierarchyEvents();
+            }
+            // defer the show call until next syncHidden(), but ignore animateTarget.
+            if (arguments.length > 1) {
+                arguments[0] = null;
+                me.pendingShow = arguments;
+            } else {
+                me.pendingShow = true;
+            }
+        } else if (rendered && me.isVisible()) {
+            if (me.toFrontOnShow && me.floating) {
+                me.toFront();
+            }
+        } else {
+            if (me.fireEvent('beforeshow', me) !== false) {
+                me.hidden = false;
+                delete this.getHierarchyState().hidden;
+                // Render on first show if there is an autoRender config, or if this
+                // is a floater (Window, Menu, BoundList etc).
+                
+                // We suspend layouts here because floaters/autoRenders
+                // will layout when onShow is called. If the render succeeded,
+                // the layout will be trigger inside onShow, so we don't flush
+                // in the first block. If, for some reason we couldn't render, then
+                // we resume layouts and force a flush because we don't know if something
+                // will force it.
+                Ext.suspendLayouts();
+                if (!rendered && (me.autoRender || me.floating)) {
+                    me.doAutoRender();
+                    rendered = me.rendered;
+                }
+            
+                if (rendered) {
+                    me.beforeShow();
+                    Ext.resumeLayouts();
+                    me.onShow.apply(me, arguments);
+                    me.afterShow.apply(me, arguments);
+                } else {
+                    Ext.resumeLayouts(true);
+                }
+            } else {
+                me.onShowVeto();
+            }
+        }
+        return me;
+    },
+    
+    onShowVeto: Ext.emptyFn,
+
+    /**
+     * Invoked before the Component is shown.
+     *
+     * @method
+     * @template
+     * @protected
+     */
+    beforeShow: Ext.emptyFn,
+
+    /**
+     * Allows addition of behavior to the show operation. After
+     * calling the superclass's onShow, the Component will be visible.
+     *
+     * Override in subclasses where more complex behaviour is needed.
+     *
+     * Gets passed the same parameters as #show.
+     *
+     * @param {String/Ext.Element} [animateTarget]
+     * @param {Function} [callback]
+     * @param {Object} [scope]
+     *
+     * @template
+     * @protected
+     */
+    onShow: function() {
+        var me = this;
+
+        me.el.show();
+        me.callParent(arguments);
+
+        // Constraining/containing element may have changed size while this Component was hidden
+        if (me.floating) {
+            if (me.maximized) {
+                me.fitContainer();
+            }
+            else if (me.constrain) {
+                me.doConstrain();
+            }
+        }
+    },
+    
+    getAnimateTarget: function(target){
+        target = target || this.animateTarget;
+        if (target) {
+            target = target.isComponent ? target.getEl() : Ext.get(target);
+        }
+        return target || null;
+    },
+
+    /**
+     * Invoked after the Component is shown (after #onShow is called).
+     *
+     * Gets passed the same parameters as #show.
+     *
+     * @param {String/Ext.Element} [animateTarget]
+     * @param {Function} [callback]
+     * @param {Object} [scope]
+     *
+     * @template
+     * @protected
+     */
+    afterShow: function(animateTarget, cb, scope) {
+        var me = this,
+            myEl = me.el,
+            fromBox,
+            toBox,
+            ghostPanel;
+
+        // Default to configured animate target if none passed
+        animateTarget = me.getAnimateTarget(animateTarget);
+
+        // Need to be able to ghost the Component
+        if (!me.ghost) {
+            animateTarget = null;
+        }
+        // If we're animating, kick of an animation of the ghost from the target to the *Element* current box
+        if (animateTarget) {
+            toBox = {
+                x: myEl.getX(),
+                y: myEl.getY(),
+                width: myEl.dom.offsetWidth,
+                height: myEl.dom.offsetHeight
+            };
+            fromBox = {
+                x: animateTarget.getX(),
+                y: animateTarget.getY(),
+                width: animateTarget.dom.offsetWidth,
+                height: animateTarget.dom.offsetHeight
+            };
+            myEl.addCls(me.offsetsCls);
+            ghostPanel = me.ghost();
+            ghostPanel.el.stopAnimation();
+
+            // Shunting it offscreen immediately, *before* the Animation class grabs it ensure no flicker.
+            ghostPanel.setX(-10000);
+
+            me.ghostBox = toBox;
+            ghostPanel.el.animate({
+                from: fromBox,
+                to: toBox,
+                listeners: {
+                    afteranimate: function() {
+                        delete ghostPanel.componentLayout.lastComponentSize;
+                        me.unghost();
+                        delete me.ghostBox;
+                        myEl.removeCls(me.offsetsCls);
+                        me.onShowComplete(cb, scope);
+                    }
+                }
+            });
+        }
+        else {
+            me.onShowComplete(cb, scope);
+        }
+        me.fireHierarchyEvent('show');
+    },
+
+    /**
+     * Invoked after the #afterShow method is complete.
+     *
+     * Gets passed the same `callback` and `scope` parameters that #afterShow received.
+     *
+     * @param {Function} [callback]
+     * @param {Object} [scope]
+     *
+     * @template
+     * @protected
+     */
+    onShowComplete: function(cb, scope) {
+        var me = this;
+        if (me.floating) {
+            me.toFront();
+            me.onFloatShow();
+        }
+        Ext.callback(cb, scope || me);
+        me.fireEvent('show', me);
+        delete me.hiddenByLayout;
+    },
+
+    /**
+     * Hides this Component, setting it to invisible using the configured {@link #hideMode}.
+     * @param {String/Ext.Element/Ext.Component} [animateTarget=null] **only valid for {@link #cfg-floating} Components
+     * such as {@link Ext.window.Window Window}s or {@link Ext.tip.ToolTip ToolTip}s, or regular Components which have
+     * been configured with `floating: true`.**. The target to which the Component should animate while hiding.
+     * @param {Function} [callback] A callback function to call after the Component is hidden.
+     * @param {Object} [scope] The scope (`this` reference) in which the callback is executed.
+     * Defaults to this Component.
+     * @return {Ext.Component} this
+     */
+    hide: function(animateTarget, cb, scope) {
+        var me = this,
+            continueHide;
+
+        if (me.pendingShow) {
+            // If this is a hierarchically hidden floating component with a pending show
+            // hide() simply cancels the pending show.
+            delete me.pendingShow;
+        } if (!(me.rendered && !me.isVisible())) {
+            continueHide = (me.fireEvent('beforehide', me) !== false);
+            if (me.hierarchicallyHidden || continueHide) {
+                me.hidden = true;
+                me.getHierarchyState().hidden = true;
+                if (me.rendered) {
+                    me.onHide.apply(me, arguments);
+                }
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Possibly animates down to a target element.
+     *
+     * Allows addition of behavior to the hide operation. After
+     * calling the superclass’s onHide, the Component will be hidden.
+     *
+     * Gets passed the same parameters as #hide.
+     *
+     * @param {String/Ext.Element/Ext.Component} [animateTarget]
+     * @param {Function} [callback]
+     * @param {Object} [scope]
+     *
+     * @template
+     * @protected
+     */
+    onHide: function(animateTarget, cb, scope) {
+        var me = this,
+            ghostPanel,
+            fromSize,
+            toBox;
+
+        // Default to configured animate target if none passed
+        animateTarget = me.getAnimateTarget(animateTarget);
+
+        // Need to be able to ghost the Component
+        if (!me.ghost) {
+            animateTarget = null;
+        }
+        // If we're animating, kick off an animation of the ghost down to the target
+        if (animateTarget) {
+            toBox = {
+                x: animateTarget.getX(),
+                y: animateTarget.getY(),
+                width: animateTarget.dom.offsetWidth,
+                height: animateTarget.dom.offsetHeight
+            };
+            ghostPanel = me.ghost();
+            ghostPanel.el.stopAnimation();
+            fromSize = me.getSize();
+            ghostPanel.el.animate({
+                to: toBox,
+                listeners: {
+                    afteranimate: function() {
+                        delete ghostPanel.componentLayout.lastComponentSize;
+                        ghostPanel.el.hide();
+                        ghostPanel.el.setSize(fromSize);
+                        me.afterHide(cb, scope);
+                    }
+                }
+            });
+        }
+        me.el.hide();
+        if (!animateTarget) {
+            me.afterHide(cb, scope);
+        }
+    },
+
+    /**
+     * Invoked after the Component has been hidden.
+     *
+     * Gets passed the same `callback` and `scope` parameters that #onHide received.
+     *
+     * @param {Function} [callback]
+     * @param {Object} [scope]
+     *
+     * @template
+     * @protected
+     */
+    afterHide: function(cb, scope) {
+        var me = this,
+            activeEl = Ext.Element.getActiveElement();
+
+        me.hiddenByLayout = null;
+
+        // we are the back-end method of onHide at this level, but our call to our parent
+        // may need to be async... so callParent won't quite work here...
+        Ext.AbstractComponent.prototype.onHide.call(me);
+
+        // If hiding a Component which is focused, or contains focus: blur the focused el. 
+        if (activeEl === me.el || me.el.contains(activeEl)) {
+            Ext.fly(activeEl).blur();
+        }
+
+        Ext.callback(cb, scope || me);
+        me.fireEvent('hide', me);
+        me.fireHierarchyEvent('hide');
+    },
+
+    /**
+     * Allows addition of behavior to the destroy operation.
+     * After calling the superclass's onDestroy, the Component will be destroyed.
+     *
+     * @template
+     * @protected
+     */
+    onDestroy: function() {
+        var me = this;
+
+        // Ensure that any ancillary components are destroyed.
+        if (me.rendered) {
+            Ext.destroy(
+                me.dd,
+                me.resizer,
+                me.proxy,
+                me.proxyWrap,
+                me.resizerComponent
+            );
+        }
+        delete me.focusTask;
+        me.callParent();
+    },
+
+    deleteMembers: function() {
+        var args = arguments,
+            len = args.length,
+            i = 0;
+        for (; i < len; ++i) {
+            delete this[args[i]];
+        }
+    },
+
+    /**
+     * Try to focus this component.
+     * @param {Boolean} [selectText] If applicable, true to also select the text in this component
+     * @param {Boolean/Number} [delay] Delay the focus this number of milliseconds (true for 10 milliseconds).
+     * @param {Function} [callback] Only needed if the `delay` parameter is used. A function to call upon focus.
+     * @param {Function} [scope] Only needed if the `delay` parameter is used. The scope (`this` reference) in which to execute the callback.
+     * @return {Ext.Component} The focused Component. Usually <code>this</code> Component. Some Containers may
+     * delegate focus to a descendant Component ({@link Ext.window.Window Window}s can do this through their
+     * {@link Ext.window.Window#defaultFocus defaultFocus} config option.
+     */
+    focus: function(selectText, delay, callback, scope) {
+        var me = this,
+            focusEl,
+            focusElDom,
+            containerScrollTop;
+
+        // If delay is wanted, queue a call to this function.
+        if (delay) {
+            if (!me.focusTask) {
+                // One global DelayedTask to assign focus
+                // So that the last focus call wins.
+                Ext.Component.prototype.focusTask = new Ext.util.DelayedTask(me.focus);
+            }
+            me.focusTask.delay(Ext.isNumber(delay) ? delay : 10, null, me, [selectText, false, callback, scope]);
+            return me;
+        }
+
+        // An immediate focus call must cancel any outstanding delayed focus calls.
+        if (me.focusTask) {
+            me.focusTask.cancel();
+        }
+
+        if (me.rendered && !me.isDestroyed && me.isVisible(true) && (focusEl = me.getFocusEl())) {
+
+            // getFocusEl might return a Component if a Container wishes to delegate focus to a descendant.
+            // Window can do this via its defaultFocus configuration which can reference a Button.
+            if (focusEl.isComponent) {
+                return focusEl.focus(selectText, delay);
+            }
+
+            // If it was an Element with a dom property
+            if ((focusElDom = focusEl.dom)) {
+
+                // Not a natural focus holding element, add a tab index to make it programatically focusable.
+                if (focusEl.needsTabIndex()) {
+                    focusElDom.tabIndex = -1;
+                }
+
+                if (me.floating) {
+                    containerScrollTop = me.container.dom.scrollTop;
+                }
+
+                // Focus the element.
+                // The focusEl has a DOM focus listener on it which invokes the Component's onFocus method
+                // to perform Component-specific focus processing
+                focusEl.focus();
+                if (selectText === true) {
+                    focusElDom.select();
+                }
+
+                // Call the callback when focus is done
+                Ext.callback(callback, scope);
+            }
+
+            // Focusing a floating Component brings it to the front of its stack.
+            // this is performed by its zIndexManager. Pass preventFocus true to avoid recursion.
+            if (me.floating) {
+                me.toFront(true);
+                if (containerScrollTop !== undefined) {
+                    me.container.dom.scrollTop = containerScrollTop;
+                }
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Cancel any deferred focus on this component
+     * @protected
+     */
+    cancelFocus: function() {
+        var task = this.focusTask;
+        if (task) {
+            task.cancel();
+        }
+    },
+
+    // @private
+    blur: function() {
+        var focusEl;
+        if (this.rendered && (focusEl = this.getFocusEl())) {
+            focusEl.blur();
+        }
+        return this;
+    },
+
+    getEl: function() {
+        return this.el;
+    },
+
+    // Deprecate 5.0
+    getResizeEl: function() {
+        return this.el;
+    },
+
+    // Deprecate 5.0
+    getPositionEl: function() {
+        return this.el;
+    },
+
+    // Deprecate 5.0
+    getActionEl: function() {
+        return this.el;
+    },
+
+    // Deprecate 5.0
+    getVisibilityEl: function() {
+        return this.el;
+    },
+
+    /*
+     * @protected
+     * Used by {@link Ext.ComponentQuery ComponentQuery}, and the {@link Ext.AbstractComponent#up up} method to find the
+     * owning Component in the linkage hierarchy.
+     *
+     * By default this returns the Container which contains this Component.
+     *
+     * This may be overriden by Component authors who implement ownership hierarchies which are not
+     * based upon ownerCt, such as BoundLists being owned by Fields or Menus being owned by Buttons.
+     */
+    getRefOwner: function() {
+        return this.ownerCt || this.floatParent;
+    },
+
+    /**
+     * @protected
+     * Implements an upward event bubbling policy. By default a Component bubbles events up to its {@link #getRefOwner reference owner}.
+     *
+     * Component subclasses may implement a different bubbling strategy by overriding this method.
+     */
+    getBubbleTarget: function() {
+        return this.getRefOwner();
+    },
+
+    // @private
+    getContentTarget: function() {
+        return this.el;
+    },
+
+    /**
+     * Clone the current component using the original config values passed into this instance by default.
+     * @param {Object} overrides A new config containing any properties to override in the cloned version.
+     * An id property can be passed on this object, otherwise one will be generated to avoid duplicates.
+     * @return {Ext.Component} clone The cloned copy of this component
+     */
+    cloneConfig: function(overrides) {
+        overrides = overrides || {};
+        var id = overrides.id || Ext.id(),
+            cfg = Ext.applyIf(overrides, this.initialConfig),
+            self;
+
+        cfg.id = id;
+
+        self = Ext.getClass(this);
+
+        // prevent dup id
+        return new self(cfg);
+    },
+
+    /**
+     * Gets the xtype for this component as registered with {@link Ext.ComponentManager}. For a list of all available
+     * xtypes, see the {@link Ext.Component} header. Example usage:
+     *
+     *     var t = new Ext.form.field.Text();
+     *     alert(t.getXType());  // alerts 'textfield'
+     *
+     * @return {String} The xtype
+     */
+    getXType: function() {
+        return this.self.xtype;
+    },
+
+    /**
+     * Find a container above this component at any level by a custom function. If the passed function returns true, the
+     * container will be returned.
+     *
+     * See also the {@link Ext.Component#up up} method.
+     *
+     * @param {Function} fn The custom function to call with the arguments (container, this component).
+     * @return {Ext.container.Container} The first Container for which the custom function returns true
+     */
+    findParentBy: function(fn) {
+        var p;
+
+        // Iterate up the ownerCt chain until there's no ownerCt, or we find an ancestor which matches using the selector function.
+        for (p = this.getBubbleTarget(); p && !fn(p, this); p = p.getBubbleTarget()) {
+            // do nothing
+        }
+        return p || null;
+    },
+
+    /**
+     * Find a container above this component at any level by xtype or class
+     *
+     * See also the {@link Ext.Component#up up} method.
+     *
+     * @param {String/Ext.Class} xtype The xtype string for a component, or the class of the component directly
+     * @return {Ext.container.Container} The first Container which matches the given xtype or class
+     */
+    findParentByType: function(xtype) {
+        return Ext.isFunction(xtype) ?
+            this.findParentBy(function(p) {
+                return p.constructor === xtype;
+            })
+        :
+            this.up(xtype);
+    },
+
+    /**
+     * Bubbles up the component/container heirarchy, calling the specified function with each component. The scope
+     * (*this*) of function call will be the scope provided or the current component. The arguments to the function will
+     * be the args provided or the current component. If the function returns false at any point, the bubble is stopped.
+     *
+     * @param {Function} fn The function to call
+     * @param {Object} [scope] The scope of the function. Defaults to current node.
+     * @param {Array} [args] The args to call the function with. Defaults to passing the current component.
+     * @return {Ext.Component} this
+     */
+    bubble: function(fn, scope, args) {
+        var p = this;
+        while (p) {
+            if (fn.apply(scope || p, args || [p]) === false) {
+                break;
+            }
+            p = p.getBubbleTarget();
+        }
+        return this;
+    },
+
+    getProxy: function() {
+        var me = this,
+            target;
+
+        if (!me.proxy) {
+            target = Ext.getBody();
+            me.proxy = me.el.createProxy(Ext.baseCSSPrefix + 'proxy-el', target, true);
+        }
+        return me.proxy;
+    },
+
+    /*
+     * For more information on the hierarchy events, see the note for the
+     * hierarchyEventSource observer defined in the onClassCreated callback.
+     * 
+     * This functionality is contained in Component (as opposed to Container)
+     * because a Component can be the ownerCt for a floating component (loadmask),
+     * and the loadmask needs to know when its owner is shown/hidden via the
+     * hierarchyEventSource so that its hidden state can be synchronized.
+     * 
+     * TODO: merge this functionality with Ext.globalEvents
+     */
+    fireHierarchyEvent: function (ename) {
+        this.hierarchyEventSource.fireEvent(ename, this);
+    },
+
+    onAdded: function() {
+        this.callParent(arguments);
+        if (this.hierarchyEventSource.hasListeners.added) {
+            this.fireHierarchyEvent('added');
+        }
+    }
+}, function () {
+    /*
+     * The observer below is used to be able to detect showing/hiding at various levels
+     * in the hierarchy. While it's not particularly expensive to bubble an event up,
+     * cascading an event down can be quite costly.
+     * 
+     * The main usage for this is to do with floating components. For example, the load mask
+     * is a floating component. The component it is masking may be inside several containers.
+     * As such, we need to know when component is hidden, either directly, or via a parent
+     * container being hidden. We can subscribe to these events and filter out the appropriate
+     * container.
+     */
+    this.hierarchyEventSource = this.prototype.hierarchyEventSource = new Ext.util.Observable({ events: {
+        hide: true,
+        show: true,
+        collapse: true,
+        expand: true,
+        added: true
+    }});
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This override provides extra, border layout specific methods for `Ext.Component`. The
+ * `Ext.layout.container.Border` class requires this override so that the added functions
+ * are only included in a build when `border` layout is used.
+ */
+Ext.define('Ext.layout.container.border.Region', {
+    override: 'Ext.Component',
+
+    /**
+     * This method is called by the `Ext.layout.container.Border` class when instances are
+     * added as regions to the layout. Since it is valid to add any component to a border
+     * layout as a region, this method must be added to `Ext.Component` but is only ever
+     * called when that component is owned by a `border` layout.
+     * @private
+     */
+    initBorderRegion: function () {
+        var me = this;
+
+        if (!me._borderRegionInited) {
+            me._borderRegionInited = true;
+
+            // Now that border regions can have dynamic region/weight, these need to be
+            // saved to state as they change:
+            me.addStateEvents(['changeregion', 'changeweight']);
+
+            // We override getState on the instance for a couple reasons. Firstly, since
+            // there are very few border regions in an application, the overhead here is
+            // not a concern. Secondly, if this method were on the prototype it would
+            // impact all components.
+            Ext.override(me, {
+                getState: function () {
+                    var state = me.callParent();
+
+                    // Now that border regions can have dynamic region/weight, these need to be saved
+                    // to state:
+                    state = me.addPropertyToState(state, 'region');
+                    state = me.addPropertyToState(state, 'weight');
+
+                    return state;
+                }
+            });
+        }
+    },
+
+    /**
+     * Returns the owning container if that container uses `border` layout. Otherwise
+     * this method returns `null`.
+     * @return {Ext.container.Container} The owning border container or `null`.
+     * @private
+     */
+    getOwningBorderContainer: function () {
+        var layout = this.getOwningBorderLayout();
+        return layout && layout.owner;
+    },
+
+    /**
+     * Returns the owning `border` (`Ext.layout.container.Border`) instance if there is
+     * one. Otherwise this method returns `null`.
+     * @return {Ext.layout.container.Border} The owning border layout or `null`.
+     * @private
+     */
+    getOwningBorderLayout: function () {
+        // the ownerLayot (if set) may or may not be a border layout
+        var layout = this.ownerLayout;
+        return (layout && layout.isBorderLayout) ? layout : null;
+    },
+
+    /**
+     * This method changes the `region` config property for this border region. This is
+     * only valid if this component is in a `border` layout (`Ext.layout.container.Border`).
+     * @param {String} region The new `region` value (`"north"`, `"south"`, `"east"` or
+     * `"west"`).
+     * @return {String} The previous value of the `region` property.
+     */
+    setBorderRegion: function (region) {
+        var me = this,
+            borderLayout,
+            old = me.region;
+
+        if (region !== old) {
+            borderLayout = me.getOwningBorderLayout();
+            if (borderLayout) {
+                var regionFlags = borderLayout.regionFlags[region],
+                    placeholder = me.placeholder,
+                    splitter = me.splitter,
+                    owner = borderLayout.owner,
+                    regionMeta = borderLayout.regionMeta,
+                    collapsed = me.collapsed || me.floated,
+                    delta, items, index;
+
+                if (me.fireEventArgs('beforechangeregion', [me, region]) === false) {
+                    return old;
+                }
+                Ext.suspendLayouts();
+
+                me.region = region;
+                Ext.apply(me, regionFlags);
+
+                if (me.updateCollapseTool) {
+                    me.updateCollapseTool();
+                }
+
+                if (splitter) {
+                    // splitter.region = region; -- we don't set "region" on splitters!
+                    Ext.apply(splitter, regionFlags);
+                    splitter.updateOrientation();
+
+                    items = owner.items;
+                    index = items.indexOf(me);
+                    if (index >= 0) {
+                        delta = regionMeta[region].splitterDelta;
+                        if (items.getAt(index + delta) !== splitter) {
+                            // splitter is not where we expect it, so move it there
+                            items.remove(splitter);
+                            index = items.indexOf(me);  // could have changed
+                            if (delta > 0) {
+                                ++index;
+                            }
+                            // else, insert at index and splitter will be before the item
+                            items.insert(index, splitter);
+
+                            // Now that the splitter is in the right place in me.items,
+                            // the layout will fix up the DOM childNode to be at the same
+                            // index as well.
+                        }
+                    }
+                }
+                if (placeholder) {
+                    // The collapsed item is potentially remembering wrong things (for
+                    // example, if it was collapsed as a West region and changed to be
+                    // North). The only simple answer here is to expand/collapse the
+                    // item (w/o animation).
+                    if (collapsed) {
+                        me.expand(false);
+                    }
+
+                    owner.remove(placeholder);
+                    me.placeholder = null; // force creation of a new placeholder
+
+                    if (collapsed) {
+                        me.collapse(null, false);
+                    }
+                }
+
+                owner.updateLayout();
+                Ext.resumeLayouts(true);
+
+                me.fireEventArgs('changeregion', [me, old]);
+            } else {
+                me.region = region; // maybe not added yet
+            }
+        }
+
+        return old;
+    },
+
+    /**
+     * Sets the `weight` config property for this component. This is only valid if this
+     * component is in a `border` layout (`Ext.layout.container.Border`).
+     * @param {Number} weight The new `weight` value.
+     * @return {Number} The previous value of the `weight` property.
+     */
+    setRegionWeight: function (weight) {
+        var me = this,
+            ownerCt = me.getOwningBorderContainer(),
+            placeholder = me.placeholder,
+            old = me.weight;
+
+        if (weight !== old) {
+            if (me.fireEventArgs('beforechangeweight', [me, weight]) !== false) {
+                me.weight = weight;
+                if (placeholder) {
+                    placeholder.weight = weight;
+                }
+                if (ownerCt) {
+                    ownerCt.updateLayout();
+                }
+                me.fireEventArgs('changeweight', [me, old]);
+            }
+        }
+
+        return old;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.Component', {
+    override: 'Ext.Component',
+
+    initComponent: function() {
+        this.callParent();
+
+        if (this.dock && this.border === undefined) {
+            this.border = false;
+        }
+    },
+
+    initStyles: function() {
+        var me = this,
+            border = me.border;
+
+        if (me.dock) {
+            // prevent the superclass method from setting the border style.  We want to
+            // allow dock layout to decide which borders to suppress.
+            me.border = null;
+        }
+        me.callParent(arguments);
+        me.border = border;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A class used to load remote content to an Element. Sample usage:
+ *
+ *     Ext.get('el').load({
+ *         url: 'myPage.php',
+ *         scripts: true,
+ *         params: {
+ *             id: 1
+ *         }
+ *     });
+ *
+ * In general this class will not be instanced directly, rather the {@link Ext.Element#method-load} method
+ * will be used.
+ */
+Ext.define('Ext.ElementLoader', {
+
+    /* Begin Definitions */
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+           
+                              
+                  
+      
+
+    statics: {
+        Renderer: {
+            Html: function(loader, response, active){
+                loader.getTarget().update(response.responseText, active.scripts === true);
+                return true;
+            }
+        }
+    },
+
+    /* End Definitions */
+
+    /**
+     * @cfg {String} url (required)
+     * The url to retrieve the content from.
+     */
+    url: null,
+
+    /**
+     * @cfg {Object} params
+     * Any params to be attached to the Ajax request. These parameters will
+     * be overridden by any params in the load options.
+     */
+    params: null,
+
+    /**
+     * @cfg {Object} baseParams Params that will be attached to every request. These parameters
+     * will not be overridden by any params in the load options.
+     */
+    baseParams: null,
+
+    /**
+     * @cfg {Boolean/Object} autoLoad
+     * True to have the loader make a request as soon as it is created.
+     * This argument can also be a set of options that will be passed to {@link #method-load} is called.
+     */
+    autoLoad: false,
+
+    /**
+     * @cfg {HTMLElement/Ext.Element/String} target
+     * The target element for the loader. It can be the DOM element, the id or an {@link Ext.Element}.
+     */
+    target: null,
+
+    /**
+     * @cfg {Boolean/String} loadMask
+     * True or a string to show when the element is loading.
+     */
+    loadMask: false,
+
+    /**
+     * @cfg {Object} ajaxOptions
+     * Any additional options to be passed to the request, for example timeout or headers.
+     */
+    ajaxOptions: null,
+
+    /**
+     * @cfg {Boolean} scripts
+     * True to parse any inline script tags in the response.
+     */
+    scripts: false,
+
+    /**
+     * @cfg {Function} success
+     * A function to be called when a load request is successful.
+     * Will be called with the following config parameters:
+     *
+     * - this - The ElementLoader instance.
+     * - response - The response object.
+     * - options - Ajax options.
+     */
+
+    /**
+     * @cfg {Function} failure A function to be called when a load request fails.
+     * Will be called with the following config parameters:
+     *
+     * - this - The ElementLoader instance.
+     * - response - The response object.
+     * - options - Ajax options.
+     */
+
+    /**
+     * @cfg {Function} callback A function to be called when a load request finishes.
+     * Will be called with the following config parameters:
+     *
+     * - this - The ElementLoader instance.
+     * - success - True if successful request.
+     * - response - The response object.
+     * - options - Ajax options.
+     */
+
+    /**
+     * @cfg {Object} scope
+     * The scope to execute the {@link #success} and {@link #failure} functions in.
+     */
+
+    /**
+     * @cfg {Function} renderer
+     * A custom function to render the content to the element. The function should
+     * return false if the renderer could not be applied. The passed parameters are:
+     *
+     * - The loader
+     * - The response
+     * - The active request
+     */
+
+    /**
+     * @property {Boolean} isLoader
+     * `true` in this class to identify an object as an instantiated ElementLoader, or subclass thereof.
+     */
+    isLoader: true,
+
+    constructor: function(config) {
+        var me = this,
+            autoLoad;
+
+        config = config || {};
+        Ext.apply(me, config);
+        me.setTarget(me.target);
+        me.addEvents(
+            /**
+             * @event beforeload
+             * Fires before a load request is made to the server.
+             * Returning false from an event listener can prevent the load
+             * from occurring.
+             * @param {Ext.ElementLoader} this
+             * @param {Object} options The options passed to the request
+             */
+            'beforeload',
+
+            /**
+             * @event exception
+             * Fires after an unsuccessful load.
+             * @param {Ext.ElementLoader} this
+             * @param {Object} response The response from the server
+             * @param {Object} options The options passed to the request
+             */
+            'exception',
+
+            /**
+             * @event load
+             * Fires after a successful load.
+             * @param {Ext.ElementLoader} this
+             * @param {Object} response The response from the server
+             * @param {Object} options The options passed to the request
+             */
+            'load'
+        );
+
+        // don't pass config because we have already applied it.
+        me.mixins.observable.constructor.call(me);
+
+        if (me.autoLoad) {
+            autoLoad = me.autoLoad;
+            if (autoLoad === true) {
+                autoLoad = {};
+            }
+            me.load(autoLoad);
+        }
+    },
+
+    /**
+     * Sets an {@link Ext.Element} as the target of this loader.
+     * Note that if the target is changed, any active requests will be aborted.
+     * @param {String/HTMLElement/Ext.Element} target The element or its ID.
+     */
+    setTarget: function(target){
+        var me = this;
+        target = Ext.get(target);
+        if (me.target && me.target != target) {
+            me.abort();
+        }
+        me.target = target;
+    },
+
+    /**
+     * Returns the target of this loader.
+     * @return {Ext.Component} The target or null if none exists.
+     */
+    getTarget: function(){
+        return this.target || null;
+    },
+
+    /**
+     * Aborts the active load request
+     */
+    abort: function(){
+        var active = this.active;
+        if (active !== undefined) {
+            Ext.Ajax.abort(active.request);
+            if (active.mask) {
+                this.removeMask();
+            }
+            delete this.active;
+        }
+    },
+
+    /**
+     * Removes the mask on the target
+     * @private
+     */
+    removeMask: function(){
+        this.target.unmask();
+    },
+
+    /**
+     * Adds the mask on the target
+     * @private
+     * @param {Boolean/Object} mask The mask configuration
+     */
+    addMask: function(mask){
+        this.target.mask(mask === true ? null : mask);
+    },
+
+    /**
+     * Loads new data from the server.
+     * @param {Object} options The options for the request. They can be any configuration option that can be specified for
+     * the class, with the exception of the target option. Note that any options passed to the method will override any
+     * class defaults.
+     */
+    load: function(options) {
+        if (!this.target) {
+            Ext.Error.raise('A valid target is required when loading content');
+        }
+
+        options = Ext.apply({}, options);
+
+        var me = this,
+            mask = Ext.isDefined(options.loadMask) ? options.loadMask : me.loadMask,
+            params = Ext.apply({}, options.params),
+            ajaxOptions = Ext.apply({}, options.ajaxOptions),
+            callback = options.callback || me.callback,
+            scope = options.scope || me.scope || me;
+
+        Ext.applyIf(ajaxOptions, me.ajaxOptions);
+        Ext.applyIf(options, ajaxOptions);
+
+        Ext.applyIf(params, me.params);
+        Ext.apply(params, me.baseParams);
+
+        Ext.applyIf(options, {
+            url: me.url
+        });
+
+        if (!options.url) {
+            Ext.Error.raise('You must specify the URL from which content should be loaded');
+        }
+
+        Ext.apply(options, {
+            scope: me,
+            params: params,
+            callback: me.onComplete
+        });
+
+        if (me.fireEvent('beforeload', me, options) === false) {
+            return;
+        }
+
+        if (mask) {
+            me.addMask(mask);
+        }
+
+        me.active = {
+            options: options,
+            mask: mask,
+            scope: scope,
+            callback: callback,
+            success: options.success || me.success,
+            failure: options.failure || me.failure,
+            renderer: options.renderer || me.renderer,
+            scripts: Ext.isDefined(options.scripts) ? options.scripts : me.scripts
+        };
+        me.active.request = Ext.Ajax.request(options);
+        me.setOptions(me.active, options);
+    },
+
+    /**
+     * Sets any additional options on the active request
+     * @private
+     * @param {Object} active The active request
+     * @param {Object} options The initial options
+     */
+    setOptions: Ext.emptyFn,
+
+    /**
+     * Parses the response after the request completes
+     * @private
+     * @param {Object} options Ajax options
+     * @param {Boolean} success Success status of the request
+     * @param {Object} response The response object
+     */
+    onComplete: function(options, success, response) {
+        var me = this,
+            active = me.active,
+            scope;
+
+        if (active) {
+            scope = active.scope;
+            if (success) {
+                success = me.getRenderer(active.renderer).call(me, me, response, active) !== false;
+            }
+
+            if (success) {
+                Ext.callback(active.success, scope, [me, response, options]);
+                me.fireEvent('load', me, response, options);
+            } else {
+                Ext.callback(active.failure, scope, [me, response, options]);
+                me.fireEvent('exception', me, response, options);
+            }
+            Ext.callback(active.callback, scope, [me, success, response, options]);
+            if (active.mask) {
+                me.removeMask();
+            }
+        }
+
+        delete me.active;
+    },
+
+    /**
+     * Gets the renderer to use
+     * @private
+     * @param {String/Function} renderer The renderer to use
+     * @return {Function} A rendering function to use.
+     */
+    getRenderer: function(renderer){
+        if (Ext.isFunction(renderer)) {
+            return renderer;
+        }
+        return this.statics().Renderer.Html;
+    },
+
+    /**
+     * Automatically refreshes the content over a specified period.
+     * @param {Number} interval The interval to refresh in ms.
+     * @param {Object} options (optional) The options to pass to the load method. See {@link #method-load}
+     */
+    startAutoRefresh: function(interval, options){
+        var me = this;
+        me.stopAutoRefresh();
+        me.autoRefresh = setInterval(function(){
+            me.load(options);
+        }, interval);
+    },
+
+    /**
+     * Clears any auto refresh. See {@link #startAutoRefresh}.
+     */
+    stopAutoRefresh: function(){
+        clearInterval(this.autoRefresh);
+        delete this.autoRefresh;
+    },
+
+    /**
+     * Checks whether the loader is automatically refreshing. See {@link #startAutoRefresh}.
+     * @return {Boolean} True if the loader is automatically refreshing
+     */
+    isAutoRefreshing: function(){
+        return Ext.isDefined(this.autoRefresh);
+    },
+
+    /**
+     * Destroys the loader. Any active requests will be aborted.
+     */
+    destroy: function(){
+        var me = this;
+        me.stopAutoRefresh();
+        delete me.target;
+        me.abort();
+        me.clearListeners();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is used to load content via Ajax into a {@link Ext.Component}. In general 
+ * this class will not be instanced directly, rather a loader configuration will be passed to the
+ * constructor of the {@link Ext.Component}.
+ *
+ * ## HTML Renderer
+ *
+ * By default, the content loaded will be processed as raw html. The response text
+ * from the request is taken and added to the component. This can be used in
+ * conjunction with the {@link #scripts} option to execute any inline scripts in
+ * the resulting content. Using this renderer has the same effect as passing the
+ * {@link Ext.Component#html} configuration option.
+ *
+ * ## Data Renderer
+ *
+ * This renderer allows content to be added by using JSON data and a {@link Ext.XTemplate}.
+ * The content received from the response is passed to the {@link Ext.Component#update} method.
+ * This content is run through the attached {@link Ext.Component#tpl} and the data is added to
+ * the Component. Using this renderer has the same effect as using the {@link Ext.Component#data}
+ * configuration in conjunction with a {@link Ext.Component#tpl}.
+ *
+ * ## Component Renderer
+ *
+ * This renderer can only be used with a {@link Ext.container.Container} and subclasses. It allows for
+ * Components to be loaded remotely into a Container. The response is expected to be a single/series of
+ * {@link Ext.Component} configuration objects. When the response is received, the data is decoded
+ * and then passed to {@link Ext.container.Container#method-add}. Using this renderer has the same effect as specifying
+ * the {@link Ext.container.Container#cfg-items} configuration on a Container.
+ *
+ * ## Custom Renderer
+ *
+ * A custom function can be passed to handle any other special case, see the {@link #renderer} option.
+ *
+ * ## Example Usage
+ *
+ *     var cmp = Ext.create('Ext.Component', {
+ *         renderTo: Ext.getBody(),
+ *         tpl: '{firstName} - {lastName}',
+ *         loader: {
+ *             url: 'myPage.php',
+ *             renderer: 'data',
+ *             params: {
+ *                 userId: 1
+ *             }
+ *         }
+ *     });
+ *
+ *     // call the loader manually (or use autoLoad:true instead)
+ *     cmp.getLoader().load();
+ */
+Ext.define('Ext.ComponentLoader', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.ElementLoader ,
+
+    statics: {
+        Renderer: {
+            Data: function(loader, response, active){
+                var success = true;
+                try {
+                    loader.getTarget().update(Ext.decode(response.responseText));
+                } catch (e) {
+                    success = false;
+                }
+                return success;
+            },
+
+            Component: function(loader, response, active){
+                var success = true,
+                    target = loader.getTarget(),
+                    items = [];
+
+                if (!target.isContainer) {
+                    Ext.Error.raise({
+                        target: target,
+                        msg: 'Components can only be loaded into a container'
+                    });
+                }
+
+                try {
+                    items = Ext.decode(response.responseText);
+                } catch (e) {
+                    success = false;
+                }
+
+                if (success) {
+                    target.suspendLayouts();
+                    if (active.removeAll) {
+                        target.removeAll();
+                    }
+                    target.add(items);
+                    target.resumeLayouts(true);
+                }
+                return success;
+            }
+        }
+    },
+
+    /* End Definitions */
+
+    /**
+     * @cfg {Ext.Component/String} target The target {@link Ext.Component} for the loader.
+     * If a string is passed it will be looked up via the id.
+     */
+    target: null,
+
+    /**
+     * @cfg {Boolean/Object} loadMask True or a {@link Ext.LoadMask} configuration to enable masking during loading.
+     */
+    loadMask: false,
+
+    /**
+     * @cfg {Boolean} scripts True to parse any inline script tags in the response. This only used when using the html
+     * {@link #renderer}.
+     */
+
+    /**
+     * @cfg {String/Function} renderer
+
+The type of content that is to be loaded into, which can be one of 3 types:
+
++ **html** : Loads raw html content, see {@link Ext.Component#html}
++ **data** : Loads raw html content, see {@link Ext.Component#data}
++ **component** : Loads child {Ext.Component} instances. This option is only valid when used with a Container.
+
+Alternatively, you can pass a function which is called with the following parameters.
+
++ loader - Loader instance
++ response - The server response
++ active - The active request
+
+The function must return false is loading is not successful. Below is a sample of using a custom renderer:
+
+    new Ext.Component({
+        loader: {
+            url: 'myPage.php',
+            renderer: function(loader, response, active) {
+                var text = response.responseText;
+                loader.getTarget().update('The response is ' + text);
+                return true;
+            }
+        }
+    });
+     */
+    renderer: 'html',
+
+    /**
+     * Set a {Ext.Component} as the target of this loader. Note that if the target is changed,
+     * any active requests will be aborted.
+     * @param {String/Ext.Component} target The component to be the target of this loader. If a string is passed
+     * it will be looked up via its id.
+     */
+    setTarget: function(target){
+        var me = this;
+
+        if (Ext.isString(target)) {
+            target = Ext.getCmp(target);
+        }
+
+        if (me.target && me.target != target) {
+            me.abort();
+        }
+        me.target = target;
+    },
+
+    // inherit docs
+    removeMask: function(){
+        this.target.setLoading(false);
+    },
+
+    /**
+     * Add the mask on the target
+     * @private
+     * @param {Boolean/Object} mask The mask configuration
+     */
+    addMask: function(mask){
+        this.target.setLoading(mask);
+    },
+
+
+    setOptions: function(active, options){
+        active.removeAll = Ext.isDefined(options.removeAll) ? options.removeAll : this.removeAll;
+    },
+
+    /**
+     * Gets the renderer to use
+     * @private
+     * @param {String/Function} renderer The renderer to use
+     * @return {Function} A rendering function to use.
+     */
+    getRenderer: function(renderer){
+        if (Ext.isFunction(renderer)) {
+            return renderer;
+        }
+
+        var renderers = this.statics().Renderer;
+        switch (renderer) {
+            case 'component':
+                return renderers.Component;
+            case 'data':
+                return renderers.Data;
+            default:
+                return Ext.ElementLoader.Renderer.Html;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class describes a size determination strategy or algorithm used by the layout
+ * system. There are special instances of this class stored as static properties to
+ * avoid needless object instantiation. These instances should be treated as readonly.
+ * 
+ *  * `calculated`
+ *  * `configured`
+ *  * `constrainedMax`
+ *  * `constrainedMin`
+ *  * `natural`
+ *  * `shrinkWrap`
+ *  * `calculatedFromConfigured`
+ *  * `calculatedFromNatural`
+ *  * `calculatedFromShrinkWrap`
+ *
+ * Using one of these instances is simply:
+ *
+ *       var calculated = Ext.layout.SizeModel.calculated;
+ *
+ * @private
+ */
+Ext.define('Ext.layout.SizeModel', {
+    constructor: function (config) {
+        var me = this,
+            SizeModel = me.self,
+            sizeModelsArray = SizeModel.sizeModelsArray,
+            name;
+
+        Ext.apply(me, config);
+
+        me[name = me.name] = true; // set the one special flag that matches our name
+
+        me.fixed = !(me.auto = me.natural || me.shrinkWrap);
+
+        /**
+         * @property {Number} ordinal
+         * The 0-based ordinal for this `SizeModel` instance.
+         * @readonly
+         */
+        sizeModelsArray[me.ordinal = sizeModelsArray.length] =
+            SizeModel[name] =
+            SizeModel.sizeModels[name] = me;
+    },
+
+    statics: {
+        /**
+         * An array of all SizeModel instances.
+         * @private
+         */
+        sizeModelsArray: [],
+
+        /**
+         * An object containing all SizeModel instances keyed by `name`.
+         * @private
+         */
+        sizeModels: {}
+    },
+
+    /**
+     * @property {String} name
+     * The name of this size model (e.g., "calculated").
+     * @readonly
+     */
+
+    /**
+     * @property {Boolean} auto
+     * True if the size is either `natural` or `shrinkWrap`, otherwise false.
+     * @readonly
+     */
+
+    /**
+     * @property {Boolean} calculated
+     * True if the size is calculated by the `ownerLayout`.
+     * @readonly
+     */
+    calculated: false,
+
+    /**
+     * @property {Boolean} configured
+     * True if the size is configured (e.g., by a `width` or `minWidth`). The names of
+     * configuration properties can be found in the {@link #names} property.
+     * @readonly
+     */
+    configured: false,
+
+    /**
+     * @property {Boolean} constrainedMax
+     * True if the size is constrained by a `maxWidth` or `maxHeight` configuration. This
+     * is a flavor of `configured` (since `maxWidth` and `maxHeight` are config options).
+     * If true, the {@link #names} property will be defined as well.
+     * @readonly
+     */
+    constrainedMax: false,
+
+    /**
+     * @property {Boolean} constrainedMin
+     * True if the size is constrained by a `minWidth` or `minHeight` configuration. This
+     * is a flavor of `configured` (since `minWidth` and `minHeight` are config options).
+     * If true, the {@link #names} property will be defined as well.
+     * @readonly
+     */
+    constrainedMin: false,
+
+    /**
+     * @property {Boolean} fixed
+     * True if the size is either `calculated` or `configured`, otherwise false.
+     * @readonly
+     */
+
+    /**
+     * @property {Boolean} natural
+     * True if the size is determined by CSS and not by content. Such sizes are assumed to
+     * be dependent on the container box and measurement occurs on the outer-most element.
+     * @readonly
+     */
+    natural: false,
+
+    /**
+     * @property {Boolean} shrinkWrap
+     * True if the size is determined by content irrespective of the container box.
+     * @readonly
+     */
+    shrinkWrap: false,
+
+    /**
+     * @property {Boolean} calculatedFromConfigured
+     * True if the size is calculated by the `ownerLayout` based on a configured size.
+     * @readonly
+     */
+    calculatedFromConfigured: false,
+
+    /**
+     * @property {Boolean} calculatedFromNatural
+     * True if the size is calculated by the `ownerLayout` based on `natural` size model
+     * results.
+     * @readonly
+     */
+    calculatedFromNatural: false,
+
+    /**
+     * @property {Boolean} calculatedFromShrinkWrap
+     * True if the size is calculated by the `ownerLayout` based on `shrinkWrap` size model
+     * results.
+     * @readonly
+     */
+    calculatedFromShrinkWrap: false,
+
+    /**
+     * @property {Object} names An object with the config property names that determine the
+     * size.
+     * @property {String} names.width The width property name (e.g., 'width').
+     * @property {String} names.height The height property name (e.g., 'minHeight').
+     * @readonly
+     */
+    names: null
+},
+function () {
+    var SizeModel = this,
+        sizeModelsArray = SizeModel.sizeModelsArray,
+        i, j, n, pairs, sizeModel;
+
+    //-------------------------------------------------------------------------------
+    // These are the 4 fundamental size models.
+
+    new SizeModel({
+        name: 'calculated'
+    });
+
+    new SizeModel({
+        name: 'configured',
+        names: { width: 'width', height: 'height' }
+    });
+
+    new SizeModel({
+        name: 'natural'
+    });
+
+    new SizeModel({
+        name: 'shrinkWrap'
+    });
+
+    //-------------------------------------------------------------------------------
+    // These are the size models are flavors of the above but with some extra detail
+    // about their dynamic use.
+
+    new SizeModel({
+        name: 'calculatedFromConfigured',
+        configured: true,
+        names: { width: 'width', height: 'height' }
+    });
+
+    new SizeModel({
+        name: 'calculatedFromNatural',
+        natural: true
+    });
+
+    new SizeModel({
+        name: 'calculatedFromShrinkWrap',
+        shrinkWrap: true
+    });
+
+    new SizeModel({
+        name: 'constrainedMax',
+        configured: true,
+        constrained: true,
+        names: { width: 'maxWidth', height: 'maxHeight' }
+    });
+
+    new SizeModel({
+        name: 'constrainedMin',
+        configured: true,
+        constrained: true,
+        names: { width: 'minWidth', height: 'minHeight' }
+    });
+
+    new SizeModel({
+        name: 'constrainedDock',
+        configured: true,
+        constrained: true,
+        constrainedByMin: true,
+        names: { width: 'dockConstrainedWidth', height: 'dockConstrainedHeight' }
+    });
+
+    for (i = 0, n = sizeModelsArray.length; i < n; ++i) {
+        sizeModel = sizeModelsArray[i];
+
+        /**
+         * An array of objects indexed by the {@link #ordinal} of a height `SizeModel` on
+         * a width `SizeModel` to yield an object describing both height and width size
+         * models.
+         * 
+         * Used like this:
+         *
+         *      widthModel.pairsByHeightOrdinal[heightModel.ordinal]
+         *
+         * This provides a reusable object equivalent to the following:
+         * 
+         *      {
+         *          width: widthModel,
+         *          height: heightModel
+         *      }
+         *
+         * @property {Object[]} pairsByHeightOrdinal
+         * @property {Ext.layout.SizeModel} pairsByHeightOrdinal.width The `SizeModel` for
+         * the width.
+         * @property {Ext.layout.SizeModel} pairsByHeightOrdinal.height The `SizeModel` for
+         * the height.
+         */
+        sizeModel.pairsByHeightOrdinal = pairs = [];
+
+        for (j = 0; j < n; ++j) {
+            pairs.push({
+                width: sizeModel,
+                height: sizeModelsArray[j]
+            });
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is the base for all layout types: component and container.
+ * @protected
+ */
+Ext.define('Ext.layout.Layout', {
+               
+                        
+                              
+      
+
+                                   
+
+    /**
+     * @property {Boolean} isLayout
+     * `true` in this class to identify an object as an instantiated Layout, or subclass thereof.
+     * @readonly
+     */
+    isLayout: true,
+    initialized: false,
+    running: false,
+
+    autoSizePolicy: {
+        readsWidth: 1,
+        readsHeight: 1,
+        setsWidth: 0,
+        setsHeight: 0
+    },
+
+    statics: {
+        layoutsByType: {},
+
+        create: function(layout, defaultType) {
+            var ClassManager = Ext.ClassManager,
+                layoutsByType = this.layoutsByType,
+                alias, className, config, layoutClass, type, load;
+
+            if (!layout || typeof layout === 'string') {
+                type = layout || defaultType;
+                config = {};                    
+            } else if (layout.isLayout) {
+                return layout;
+            } else {
+                config = layout;
+                type = layout.type || defaultType;
+            }
+
+            if (!(layoutClass = layoutsByType[type])) {
+                alias = 'layout.' + type;
+                className = ClassManager.getNameByAlias(alias);
+
+                // this is needed to support demand loading of the class
+                if (!className) {
+                    load = true;
+                }
+                
+                layoutClass = ClassManager.get(className);
+                if (load || !layoutClass) {
+                    return ClassManager.instantiateByAlias(alias, config || {});
+                }
+                layoutsByType[type] = layoutClass;
+            }
+
+            return new layoutClass(config);
+        }
+    },
+
+    constructor : function(config) {
+        var me = this;
+
+        me.id = Ext.id(null, me.type + '-');
+        Ext.apply(me, config);
+        me.layoutCount = 0;
+    },
+
+    /**
+     * @property {Boolean} done Used only during a layout run, this value indicates that a
+     * layout has finished its calculations. This flag is set to true prior to the call to
+     * {@link #calculate} and should be set to false if this layout has more work to do.
+     */
+
+    /**
+     * Called before any calculation cycles to prepare for layout.
+     * 
+     * This is a write phase and DOM reads should be strictly avoided when overridding
+     * this method.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     * @method beginLayout
+     */
+    beginLayout: Ext.emptyFn,
+
+    /**
+     * Called before any calculation cycles to reset DOM values and prepare for calculation.
+     * 
+     * This is a write phase and DOM reads should be strictly avoided when overridding
+     * this method.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     * @method beginLayoutCycle
+     */
+    beginLayoutCycle: function (ownerContext) {
+        var me = this,
+            context = me.context,
+            changed;
+
+        if (me.lastWidthModel != ownerContext.widthModel) {
+            if (me.lastWidthModel) {
+                changed = true;
+            }
+            me.lastWidthModel = ownerContext.widthModel;
+        }
+
+        if (me.lastHeightModel != ownerContext.heightModel) {
+            if (me.lastWidthModel) {
+                changed = true;
+            }
+            me.lastHeightModel = ownerContext.heightModel;
+        }
+
+        if (changed) {
+            (context = ownerContext.context).clearTriggers(me, false);
+            context.clearTriggers(me, true);
+            me.triggerCount = 0;
+        }
+    },
+
+    /**
+     * Called to perform the calculations for this layout. This method will be called at
+     * least once and may be called repeatedly if the {@link #done} property is cleared
+     * before return to indicate that this layout is not yet done. The {@link #done} property
+     * is always set to `true` before entering this method.
+     * 
+     * This is a read phase and DOM writes should be strictly avoided in derived classes.
+     * Instead, DOM writes need to be written to {@link Ext.layout.ContextItem} objects to
+     *  be flushed at the next opportunity.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     * @method calculate
+     * @abstract
+     */
+
+    /**
+     * This method (if implemented) is called at the end of the cycle in which this layout
+     * completes (by not setting {@link #done} to `false` in {@link #calculate}). It is
+     * possible for the layout to complete and yet become invalid before the end of the cycle,
+     * in which case, this method will not be called. It is also possible for this method to
+     * be called and then later the layout becomes invalidated. This will result in
+     * {@link #calculate} being called again, followed by another call to this method.
+     * 
+     * This is a read phase and DOM writes should be strictly avoided in derived classes.
+     * Instead, DOM writes need to be written to {@link Ext.layout.ContextItem} objects to
+     * be flushed at the next opportunity.
+     * 
+     * This method need not be implemented by derived classes and, in fact, should only be
+     * implemented when needed.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     * @method completeLayout
+     */
+
+    /**
+     * This method (if implemented) is called after all layouts have completed. In most
+     * ways this is similar to {@link #completeLayout}. This call can cause this (or any
+     * layout) to be become invalid (see {@link Ext.layout.Context#invalidate}), but this
+     * is best avoided. This method is intended to be where final reads are made and so it
+     * is best to avoid invalidating layouts at this point whenever possible. Even so, this
+     * method can be used to perform final checks that may require all other layouts to be
+     * complete and then invalidate some results.
+     * 
+     * This is a read phase and DOM writes should be strictly avoided in derived classes.
+     * Instead, DOM writes need to be written to {@link Ext.layout.ContextItem} objects to
+     * be flushed at the next opportunity.
+     * 
+     * This method need not be implemented by derived classes and, in fact, should only be
+     * implemented when needed.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     * @method finalizeLayout
+     */
+
+    /**
+     * This method is called after all layouts are complete and their calculations flushed
+     * to the DOM. No further layouts will be run and this method is only called once per
+     * layout run. The base component layout caches `lastComponentSize`.
+     * 
+     * This is a write phase and DOM reads should be avoided if possible when overridding
+     * this method.
+     * 
+     * This method need not be implemented by derived classes and, in fact, should only be
+     * implemented when needed.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     */
+    finishedLayout: function (ownerContext) {
+        this.lastWidthModel = ownerContext.widthModel;
+        this.lastHeightModel = ownerContext.heightModel;
+        this.ownerContext = null;
+    },
+    
+    /**
+     * This method (if implemented) is called after all layouts are finished, and all have
+     * a `lastComponentSize` cached. No further layouts will be run and this method is only
+     * called once per layout run. It is the bookend to {@link #beginLayout}.
+     * 
+     * This is a write phase and DOM reads should be avoided if possible when overridding
+     * this method. This is the catch-all tail method to a layout and so the rules are more
+     * relaxed. Even so, for performance reasons, it is best to avoid reading the DOM. If
+     * a read is necessary, consider implementing a {@link #finalizeLayout} method to do the
+     * required reads.
+     * 
+     * This method need not be implemented by derived classes and, in fact, should only be
+     * implemented when needed.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The context item for the layout's owner
+     * component.
+     * @method notifyOwner
+     */
+    
+    redoLayout: Ext.emptyFn,
+    undoLayout: Ext.emptyFn,
+
+    getAnimatePolicy: function() {
+        return this.animatePolicy;
+    },
+
+    /**
+     * Returns an object describing how this layout manages the size of the given component.
+     * This method must be implemented by any layout that manages components.
+     *
+     * @param {Ext.Component} item
+     * @return {Ext.layout.SizePolicy} An object describing the sizing done by the layout
+     * for this item.
+     * @protected
+     */
+    getItemSizePolicy: function (item) {
+        return this.autoSizePolicy;
+    },
+
+    isItemBoxParent: function (itemContext) {
+        return false;
+    },
+
+    isItemLayoutRoot: function (item) {
+        var sizeModel = item.getSizeModel(),
+            width = sizeModel.width,
+            height = sizeModel.height;
+
+        // If this component has never had a layout and some of its dimensions are set by
+        // its ownerLayout, we cannot be the layoutRoot...
+        if (!item.componentLayout.lastComponentSize && (width.calculated || height.calculated)) {
+            return false;
+        }
+
+        // otherwise an ownerCt whose size is not effected by its content is a root
+        return !width.shrinkWrap && !height.shrinkWrap;
+    },
+
+    isItemShrinkWrap: function (item) {
+        return item.shrinkWrap;
+    },
+
+    isRunning: function () {
+        return !!this.ownerContext;
+    },
+
+    //-----------------------------------------------------
+    /*
+     * Clears any styles which must be cleared before layout can take place.
+     * Only DOM WRITES must be performed at this stage.
+     *
+     * An entry for the owner's element ID must be created in the layoutContext containing
+     * a reference to the target which must be sized/positioned/styled by the layout at
+     * the flush stage:
+     *
+     *     {
+     *         target: me.owner
+     *     }
+     *
+     * Component layouts should iterate through managed Elements,
+     * pushing an entry for each element:
+     *
+     *     {
+     *         target: childElement
+     *     }
+     */
+    //-----------------------------------------------------
+
+    getItemsRenderTree: function (items, renderCfgs) {
+        var length = items.length,
+            i, item, itemConfig, result;
+
+        if (length) {
+            result = [];
+            for (i = 0; i < length; ++i) {
+                item = items[i];
+
+                // If we are being asked to move an already rendered Component, we must not recalculate its renderTree
+                // and rerun its render process. The Layout's isValidParent check will ensure that the DOM is moved into place.
+                if (!item.rendered) {
+
+                    // If we've already calculated the item's element config, don't calculate it again.
+                    // This may happen if the rendering process mutates the owning Container's items
+                    // collection, and Ext.layout.Container#getRenderTree runs through the collection again.
+                    // Note that the config may be null if a beforerender listener vetoed the operation, so
+                    // we must compare to undefined.
+                    if (renderCfgs && (renderCfgs[item.id] !== undefined)) {
+                        itemConfig = renderCfgs[item.id];
+                    } else {
+                        // Perform layout preprocessing in the bulk render path
+                        this.configureItem(item);
+                        itemConfig = item.getRenderTree();
+                        if (renderCfgs) {
+                            renderCfgs[item.id] = itemConfig;
+                        }
+                    }
+
+                    // itemConfig mey be null if a beforerender listener vetoed the operation.
+                    if (itemConfig) {
+                        result.push(itemConfig);
+                    }
+                }
+            }
+        }
+
+        return result;
+    },
+
+    finishRender: Ext.emptyFn,
+
+    finishRenderItems: function (target, items) {
+        var length = items.length,
+            i, item;
+
+        for (i = 0; i < length; i++) {
+            item = items[i];
+
+            // Only postprocess items which are being rendered. deferredRender may mean that only one has been rendered.
+            if (item.rendering) {
+
+                // Tell the item at which index in the Container it is
+                item.finishRender(i);
+
+                this.afterRenderItem(item);
+            }
+        }
+    },
+
+    renderChildren: function () {
+        var me = this,
+            items = me.getLayoutItems(),
+            target = me.getRenderTarget();
+
+        me.renderItems(items, target);
+    },
+
+    /**
+     * Iterates over all passed items, ensuring they are rendered.  If the items are already rendered,
+     * also determines if the items are in the proper place in the dom.
+     * @protected
+     */
+    renderItems : function(items, target) {
+        var me = this,
+            ln = items.length,
+            i = 0,
+            item;
+
+        if (ln) {
+            Ext.suspendLayouts();
+            for (; i < ln; i++) {
+                item = items[i];
+                if (item && !item.rendered) {
+                    me.renderItem(item, target, i);
+                } else if (!me.isValidParent(item, target, i)) {
+                    me.moveItem(item, target, i);
+                } else {
+                    // still need to configure the item, it may have moved in the container.
+                    me.configureItem(item);
+                }
+            }
+            Ext.resumeLayouts(true);
+        }
+    },
+
+    /**
+     * Validates item is in the proper place in the dom.
+     * @protected
+     */
+    isValidParent : function(item, target, position) {
+        var itemDom = item.el ? item.el.dom : Ext.getDom(item),
+            targetDom = (target && target.dom) || target,
+            parentNode = itemDom.parentNode,
+            className;
+
+        // If it's resizable+wrapped, the position element is the wrapper.
+        if (parentNode) {
+            className = parentNode.className;
+            if (className && className.indexOf(Ext.baseCSSPrefix + 'resizable-wrap') !== -1) {
+                itemDom = itemDom.parentNode;
+            }
+        }
+
+        // Test DOM nodes for equality using "===" : http://jsperf.com/dom-equality-test
+        if (itemDom && targetDom) {
+            if (typeof position == 'number') {
+                position = this.getPositionOffset(position);
+                return itemDom === targetDom.childNodes[position];
+            }
+            return itemDom.parentNode === targetDom;
+        }
+
+        return false;
+    },
+    
+    getPositionOffset: function(position){
+        return position;
+    },
+
+    /**
+     * Called before an item is rendered to allow the layout to configure the item.
+     * @param {Ext.Component} item The item to be configured
+     * @protected
+     */
+    configureItem: function(item) {
+        item.ownerLayout = this;
+    },
+
+    /**
+     * Renders the given Component into the target Element.
+     * @param {Ext.Component} item The Component to render
+     * @param {Ext.dom.Element} target The target Element
+     * @param {Number} position The position within the target to render the item to
+     * @private
+     */
+    renderItem : function(item, target, position) {
+        var me = this;
+        if (!item.rendered) {
+            me.configureItem(item);
+            item.render(target, position);
+            me.afterRenderItem(item);
+        }
+    },
+
+    /**
+     * Moves Component to the provided target instead.
+     * @private
+     */
+    moveItem : function(item, target, position) {
+        target = target.dom || target;
+        if (typeof position == 'number') {
+            position = target.childNodes[position];
+        }
+        target.insertBefore(item.el.dom, position || null);
+        item.container = Ext.get(target);
+        this.configureItem(item);
+    },
+
+    /**
+     * This method is called when a child item changes in some way. By default this calls
+     * {@link Ext.AbstractComponent#updateLayout} on this layout's owner.
+     * 
+     * @param {Ext.Component} child The child item that has changed.
+     * @return {Boolean} True if this layout has handled the content change.
+     */
+    onContentChange: function () {
+        this.owner.updateLayout();
+        return true;
+    },
+
+    /**
+     * A one-time initialization method called just before rendering.
+     * @protected
+     */
+    initLayout : function() {
+        this.initialized = true;
+    },
+
+    // @private Sets the layout owner
+    setOwner : function(owner) {
+        this.owner = owner;
+    },
+
+    /**
+     * Returns the set of items to layout (empty by default).
+     * @protected
+     */
+    getLayoutItems : function() {
+        return [];
+    },
+
+    onAdd: function (item) {
+        item.ownerLayout = this;
+    },
+    afterRenderItem: Ext.emptyFn,
+    onRemove : Ext.emptyFn,
+    onDestroy : Ext.emptyFn,
+
+    /**
+     * Removes layout's itemCls and owning Container's itemCls.
+     * Clears the managed dimensions flags
+     * @protected
+     */
+    afterRemove : function(item) {
+        var me = this,
+            el = item.el,
+            owner = me.owner,
+            removeClasses;
+
+        if (item.rendered) {
+            removeClasses = [].concat(me.itemCls || []);
+            if (owner.itemCls) {
+                removeClasses = Ext.Array.push(removeClasses, owner.itemCls);
+            }
+            if (removeClasses.length) {
+                el.removeCls(removeClasses);
+            }
+        }
+
+        delete item.ownerLayout;
+    },
+
+    /**
+     * Destroys this layout. This method removes a `targetCls` from the `target`
+     * element and calls `onDestroy`.
+     * 
+     * A derived class can override either this method or `onDestroy` but in all
+     * cases must call the base class versions of these methods to allow the base class to
+     * perform its cleanup.
+     * 
+     * This method (or `onDestroy`) are overridden by subclasses most often to purge
+     * event handlers or remove unmanged DOM nodes.
+     *
+     * @protected
+     */
+    destroy : function() {
+        var me = this,
+            target;
+
+        if (me.targetCls) {
+            target = me.getTarget();
+            if (target) {
+                target.removeCls(me.targetCls);
+            }
+        }
+
+        me.onDestroy();
+    },
+
+    sortWeightedItems: function (items, reverseProp) {
+        for (var i = 0, length = items.length; i < length; ++i) {
+            items[i].$i = i;
+        }
+
+        Ext.Array.sort(items, function (item1, item2) {
+            var ret = item2.weight - item1.weight;
+
+            if (!ret) {
+                ret = item1.$i - item2.$i;
+                if (item1[reverseProp]) {
+                    ret = -ret;
+                }
+            }
+
+            return ret;
+        });
+
+        for (i = 0; i < length; ++i) {
+            delete items[i].$i;
+        }
+    }
+}, function () {
+    var Layout = this;
+
+    Layout.prototype.sizeModels = Layout.sizeModels = Ext.layout.SizeModel.sizeModels;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is intended to be extended or created via the {@link Ext.container.Container#layout layout}
+ * configuration property.  See {@link Ext.container.Container#layout} for additional details.
+ */
+Ext.define('Ext.layout.container.Container', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.container'],
+
+    extend:  Ext.layout.Layout ,
+
+    alternateClassName: 'Ext.layout.ContainerLayout',
+
+    mixins: {
+        elementCt:  Ext.util.ElementContainer 
+    },
+
+               
+                       
+      
+
+    type: 'container',
+
+    /* End Definitions */
+
+    /**
+     * @cfg {String} itemCls
+     * An optional extra CSS class that will be added to the container. This can be useful for
+     * adding customized styles to the container or any of its children using standard CSS
+     * rules. See {@link Ext.Component}.{@link Ext.Component#componentCls componentCls} also.
+     */
+
+    /**
+     * @private
+     * Called by an owning Panel before the Panel begins its collapse process.
+     * Most layouts will not need to override the default Ext.emptyFn implementation.
+     */
+    beginCollapse: Ext.emptyFn,
+
+    /**
+     * @private
+     * Called by an owning Panel before the Panel begins its expand process.
+     * Most layouts will not need to override the default Ext.emptyFn implementation.
+     */
+    beginExpand: Ext.emptyFn,
+
+    /**
+     * An object which contains boolean properties specifying which properties are to be 
+     * animated upon flush of child Component ContextItems. For example, Accordion would
+     * have:
+     *
+     *      {
+     *          y: true,
+     *          height: true
+     *      }
+     *
+     * @private
+     */
+    animatePolicy: null,
+
+    childEls: [
+        /**
+         * @property {Ext.Element} overflowPadderEl
+         * The element used to correct body padding during overflow.
+         */
+        'overflowPadderEl'
+    ],
+
+    renderTpl: [
+        '{%this.renderBody(out,values)%}'
+    ],
+
+    usesContainerHeight: true,
+    usesContainerWidth: true,
+    usesHeight: true,
+    usesWidth: true,
+
+    constructor: function () {
+        this.callParent(arguments);
+        this.mixins.elementCt.constructor.call(this);
+    },
+
+    destroy : function() {
+        this.callParent();
+        this.mixins.elementCt.destroy.call(this);
+    },
+
+    /**
+     * In addition to work done by our base classes, containers benefit from some extra
+     * cached data. The following properties are added to the ownerContext:
+     * 
+     *  - visibleItems: the result of {@link #getVisibleItems}
+     *  - childItems: the ContextItem[] for each visible item
+     *  - targetContext: the ContextItem for the {@link #getTarget} element
+     */
+    beginLayout: function (ownerContext) {
+        this.callParent(arguments);
+
+        ownerContext.targetContext = ownerContext.paddingContext = ownerContext.getEl('getTarget', this);
+
+        this.cacheChildItems(ownerContext);
+    },
+
+    beginLayoutCycle: function (ownerContext, firstCycle) {
+        var me = this;
+
+        me.callParent(arguments);
+
+        if (firstCycle) {
+            if (me.usesContainerHeight) {
+                ++ownerContext.consumersContainerHeight;
+            }
+            if (me.usesContainerWidth) {
+                ++ownerContext.consumersContainerWidth;
+            }
+        }
+    },
+
+    cacheChildItems: function (ownerContext) {
+        var context = ownerContext.context,
+            childItems = [],
+            items = this.getVisibleItems(),
+            length = items.length,
+            i;
+
+        ownerContext.childItems = childItems;
+        ownerContext.visibleItems = items;
+
+        for (i = 0; i < length; ++i) {
+            childItems.push(context.getCmp(items[i]));
+        }
+    },
+
+    cacheElements: function () {
+        var owner = this.owner;
+
+        this.applyChildEls(owner.el, owner.id); // from ElementContainer mixin
+    },
+
+    /**
+     * Adds layout's itemCls and owning Container's itemCls
+     * @protected
+     */
+    configureItem: function(item) {
+        var me = this,
+            itemCls = me.itemCls,
+            ownerItemCls = me.owner.itemCls,
+            addClasses;
+
+        // Effectively callParent but without the function overhead
+        item.ownerLayout = me;
+
+        if (itemCls) {
+            // itemCls can be a single clas or an array
+            addClasses = typeof itemCls === 'string' ? [itemCls] : itemCls;
+        }
+        if (ownerItemCls) {
+            addClasses = Ext.Array.push(addClasses||[], ownerItemCls);
+        }
+        if (addClasses) {
+            item.addCls(addClasses);
+        }
+    },
+
+    doRenderBody: function (out, renderData) {
+        // Careful! This method is bolted on to the renderTpl so all we get for context is
+        // the renderData! The "this" pointer is the renderTpl instance!
+
+        this.renderItems(out, renderData);
+        this.renderContent(out, renderData);
+    },
+
+    doRenderContainer: function (out, renderData) {
+        // Careful! This method is bolted on to the renderTpl so all we get for context is
+        // the renderData! The "this" pointer is the renderTpl instance!
+
+        var me = renderData.$comp.layout,
+            tpl = me.getRenderTpl(),
+            data = me.getRenderData();
+
+        tpl.applyOut(data, out);
+    },
+
+    doRenderItems: function (out, renderData) {
+        // Careful! This method is bolted on to the renderTpl so all we get for context is
+        // the renderData! The "this" pointer is the renderTpl instance!
+
+        var me = renderData.$layout,
+            tree = me.getRenderTree();
+
+        if (tree) {
+            Ext.DomHelper.generateMarkup(tree, out);
+        }
+    },
+
+    finishRender: function () {
+        var me = this,
+            target, items;
+
+        me.callParent();
+
+        me.cacheElements();
+
+        target = me.getRenderTarget();
+        items = me.getLayoutItems();
+
+        if (me.targetCls && !me.getTarget().hasCls(me.targetCls)) {
+            Ext.log.warn('targetCls is missing. This may mean that getTargetEl() is being overridden but not applyTargetCls(). ' + me.owner.id);
+        }
+
+        me.finishRenderItems(target, items);
+    },
+
+    /**
+     * @private
+     * Called for every layout in the layout context after all the layouts have been finally flushed
+     */
+    notifyOwner: function() {
+        this.owner.afterLayout(this);
+    },
+
+    /**
+     * Returns the container size (that of the target). Only the fixed-sized dimensions can
+     * be returned because the shrinkWrap dimensions are based on the contentWidth/Height
+     * as determined by the container layout.
+     *
+     * @param {Ext.layout.ContextItem} ownerContext The owner's context item.
+     * @param {Boolean} [inDom=false] True if the container size must be in the DOM.
+     * @return {Object} The size
+     * @return {Number} return.width The width
+     * @return {Number} return.height The height
+     * @protected
+     */
+    getContainerSize : function(ownerContext, inDom) {
+        // Subtle But Important:
+        // 
+        // We don't want to call getProp/hasProp et.al. unless we in fact need that value
+        // for our results! If we call it and don't need it, the layout manager will think
+        // we depend on it and will schedule us again should it change.
+
+        var targetContext = ownerContext.targetContext,
+            frameInfo = targetContext.getFrameInfo(),
+            padding = ownerContext.paddingContext.getPaddingInfo(),
+            got = 0,
+            needed = 0,
+            gotWidth, gotHeight, width, height;
+
+        // In an shrinkWrap width/height case, we must not ask for any of these dimensions
+        // because they will be determined by contentWidth/Height which is calculated by
+        // this layout...
+
+        // Fit/Card layouts are able to set just the width of children, allowing child's
+        // resulting height to autosize the Container.
+        // See examples/tabs/tabs.html for an example of this.
+
+        if (!ownerContext.widthModel.shrinkWrap) {
+            ++needed;
+            width = inDom ? targetContext.getDomProp('width') : targetContext.getProp('width');
+            gotWidth = (typeof width == 'number');
+            if (gotWidth) {
+                ++got;
+                width -= frameInfo.width + padding.width;
+                if (width < 0) {
+                    width = 0;
+                }
+            }
+        }
+
+        if (!ownerContext.heightModel.shrinkWrap) {
+            ++needed;
+            height = inDom ? targetContext.getDomProp('height') : targetContext.getProp('height');
+            gotHeight = (typeof height == 'number');
+            if (gotHeight) {
+                ++got;
+                height -= frameInfo.height + padding.height;
+                if (height < 0) {
+                    height = 0;
+                }
+            }
+        }
+
+        return {
+            width: width,
+            height: height,
+            needed: needed,
+            got: got,
+            gotAll: got == needed,
+            gotWidth: gotWidth,
+            gotHeight: gotHeight
+        };
+    },
+    
+    // This method is used to offset the DOM position when checking
+    // whether the element is a certain child of the target. This is
+    // required in cases where the extra elements prepended to the target
+    // before any of the items. An example of this is when using labelAlign: 'top'
+    // on a field. The label appears first in the DOM before any child items are
+    // created, so when we check the position we need to add an extra offset.
+    // Containers that create an innerCt are exempt because this new element
+    // preserves the order
+    getPositionOffset: function(position) {
+        if (!this.createsInnerCt) {
+            var offset = this.owner.itemNodeOffset;
+            if (offset) {
+                position += offset;
+            }
+        }
+        return position;
+    },
+
+    /**
+     * Returns an array of child components either for a render phase (Performed in the beforeLayout
+     * method of the layout's base class), or the layout phase (onLayout).
+     * @return {Ext.Component[]} of child components
+     */
+    getLayoutItems: function() {
+        var owner = this.owner,
+            items = owner && owner.items;
+
+        return (items && items.items) || [];
+    },
+
+    getRenderData: function () {
+        var comp = this.owner;
+
+        return {
+            $comp: comp,
+            $layout: this,
+            ownerId: comp.id
+        };
+    },
+
+    /**
+     * @protected
+     * Returns all items that are rendered
+     * @return {Array} All matching items
+     */
+    getRenderedItems: function() {
+        var me = this,
+            target = me.getRenderTarget(),
+            items = me.getLayoutItems(),
+            ln = items.length,
+            renderedItems = [],
+            i, item;
+
+        for (i = 0; i < ln; i++) {
+            item = items[i];
+            if (item.rendered && me.isValidParent(item, target, i)) {
+                renderedItems.push(item);
+            }
+        }
+
+        return renderedItems;
+    },
+
+    /**
+     * Returns the element into which rendering must take place. Defaults to the owner Container's
+     * target element.
+     *
+     * May be overridden in layout managers which implement an inner element.
+     *
+     * @return {Ext.Element}
+     */
+    getRenderTarget: function() {
+        return this.owner.getTargetEl();
+    },
+
+    /**
+     * Returns the element into which extra functional DOM elements can be inserted. Defaults to the owner Component's encapsulating element.
+     *
+     * May be overridden in Component layout managers which implement a {@link #getRenderTarget component render target} which must only
+     * contain child components.
+     * @return {Ext.Element}
+     */
+    getElementTarget: function() {
+        return this.getRenderTarget();
+    },
+
+    getRenderTpl: function () {
+        var me = this,
+            renderTpl = Ext.XTemplate.getTpl(this, 'renderTpl');
+
+        // Make sure all standard callout methods for the owner component are placed on the
+        // XTemplate instance (but only once please):
+        if (!renderTpl.renderContent) {
+            me.owner.setupRenderTpl(renderTpl);
+        }
+
+        return renderTpl;
+    },
+
+    getRenderTree: function () {
+        var result,
+            items = this.owner.items,
+            itemsGen,
+            renderCfgs = {};
+        
+        do {
+            itemsGen = items.generation;
+            result = this.getItemsRenderTree(this.getLayoutItems(), renderCfgs);
+        } while (items.generation !== itemsGen);
+        return result;
+    },
+    
+    renderChildren: function () {
+        var me = this,
+            ownerItems = me.owner.items,
+            target = me.getRenderTarget(),
+            itemsGen, items;
+            
+        // During the render phase, new items may be added. Specifically, a panel will
+        // create a placeholder component during render if required, so we need to catch
+        // it here so we can render it.
+        do {
+            itemsGen = ownerItems.generation;
+            items = me.getLayoutItems();
+            me.renderItems(items, target);
+        } while (ownerItems.generation !== itemsGen);
+    },
+
+    getScrollbarsNeeded: function (width, height, contentWidth, contentHeight) {
+        var scrollbarSize = Ext.getScrollbarSize(),
+            hasWidth = typeof width == 'number',
+            hasHeight = typeof height == 'number',
+            needHorz = 0,
+            needVert = 0;
+
+        // No space-consuming scrollbars.
+        if (!scrollbarSize.width) {
+            return 0;
+        }
+        if (hasHeight && height < contentHeight) {
+            needVert = 2;
+            width -= scrollbarSize.width;
+        }
+
+        if (hasWidth && width < contentWidth) {
+            needHorz = 1;
+            if (!needVert && hasHeight) {
+                height -= scrollbarSize.height;
+                if (height < contentHeight) {
+                    needVert = 2;
+                }
+            }
+        }
+
+        return needVert + needHorz;
+    },
+
+    /**
+     * Returns the owner component's resize element.
+     * @return {Ext.Element}
+     */
+    getTarget: function() {
+        return this.owner.getTargetEl();
+    },
+
+    /**
+     * @protected
+     * Returns all items that are both rendered and visible
+     * @return {Array} All matching items
+     */
+    getVisibleItems: function() {
+        var target   = this.getRenderTarget(),
+            items = this.getLayoutItems(),
+            ln = items.length,
+            visibleItems = [],
+            i, item;
+
+        for (i = 0; i < ln; i++) {
+            item = items[i];
+            if (item.rendered && this.isValidParent(item, target, i) && item.hidden !== true) {
+                visibleItems.push(item);
+            }
+        }
+
+        return visibleItems;
+    },
+
+    setupRenderTpl: function (renderTpl) {
+        var me = this;
+
+        renderTpl.renderBody = me.doRenderBody;
+        renderTpl.renderContainer = me.doRenderContainer;
+        renderTpl.renderItems = me.doRenderItems;
+    },
+    
+    getContentTarget: function(){
+        return this.owner.getDefaultContentTarget();
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.layout.container.Auto
+ *
+ * The AutoLayout is the default layout manager delegated by {@link Ext.container.Container} to
+ * render any child Components when no `{@link Ext.container.Container#layout layout}` is configured into
+ * a `{@link Ext.container.Container Container}.` AutoLayout provides only a passthrough of any layout calls
+ * to any child containers.
+ *
+ *     @example
+ *     Ext.create('Ext.Panel', {
+ *         width: 500,
+ *         height: 280,
+ *         title: "AutoLayout Panel",
+ *         layout: 'auto',
+ *         renderTo: document.body,
+ *         items: [{
+ *             xtype: 'panel',
+ *             title: 'Top Inner Panel',
+ *             width: '75%',
+ *             height: 90
+ *         },
+ *         {
+ *             xtype: 'panel',
+ *             title: 'Bottom Inner Panel',
+ *             width: '75%',
+ *             height: 90
+ *         }]
+ *     });
+ */
+Ext.define('Ext.layout.container.Auto', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.auto', 'layout.autocontainer'],
+
+    extend:  Ext.layout.container.Container ,
+
+    /* End Definitions */
+
+    type: 'autocontainer',
+
+    childEls: [
+        'outerCt',
+        'innerCt',
+        'clearEl'
+    ],
+
+    /**
+     * @cfg {Boolean} [reserveScrollbar=false]
+     * Set to `true` to leave space for a vertical scrollbar (if the OS shows space-consuming scrollbars) regardless
+     * of whether a scrollbar is needed.
+     *
+     * This is useful if content height changes during application usage, but you do not want the calculated width
+     * of child items to change when a scrollbar appears or disappears. The scrollbar will appear in the reserved space,
+     * and the calculated width of child Components will not change.
+     *
+     *     @example
+     *     Ext.define('Employee', {
+     *         extend: 'Ext.data.Model',
+     *         fields: [
+     *            {name: 'rating', type: 'int'},
+     *            {name: 'salary', type: 'float'},
+     *            {name: 'name'}
+     *         ]
+     *     });
+     *
+     *     function createFakeData(count) {
+     *         var firstNames   = ['Ed', 'Tommy', 'Aaron', 'Abe', 'Jamie', 'Adam', 'Dave', 'David', 'Jay', 'Nicolas', 'Nige'],
+     *             lastNames    = ['Spencer', 'Maintz', 'Conran', 'Elias', 'Avins', 'Mishcon', 'Kaneda', 'Davis', 'Robinson', 'Ferrero', 'White'],
+     *             ratings      = [1, 2, 3, 4, 5],
+     *             salaries     = [100, 400, 900, 1500, 1000000];
+     *
+     *         var data = [];
+     *         for (var i = 0; i < (count || 25); i++) {
+     *             var ratingId    = Math.floor(Math.random() * ratings.length),
+     *                 salaryId    = Math.floor(Math.random() * salaries.length),
+     *                 firstNameId = Math.floor(Math.random() * firstNames.length),
+     *                 lastNameId  = Math.floor(Math.random() * lastNames.length),
+     *
+     *                 rating      = ratings[ratingId],
+     *                 salary      = salaries[salaryId],
+     *                 name        = Ext.String.format("{0} {1}", firstNames[firstNameId], lastNames[lastNameId]);
+     *
+     *             data.push({
+     *                 rating: rating,
+     *                 salary: salary,
+     *                 name: name
+     *             });
+     *         }
+     *         store.loadData(data);
+     *     }
+     *
+     *     // create the Data Store
+     *     var store = Ext.create('Ext.data.Store', {
+     *         id: 'store',
+     *         model: 'Employee',
+     *         proxy: {
+     *             type: 'memory'
+     *         }
+     *     });
+     *     createFakeData(10);
+     *
+     *     var grid = Ext.create('Ext.grid.Panel', {
+     *         title: 'Grid loaded with varying number of records',
+     *         anchor: '100%',
+     *         store: store,
+     *         columns: [{
+     *             xtype: 'rownumberer',
+     *             width: 40,
+     *             sortable: false
+     *         },{
+     *             text: 'Name',
+     *             flex: 1,
+     *             sortable: true,
+     *             dataIndex: 'name'
+     *         },{
+     *             text: 'Rating',
+     *             width: 125,
+     *             sortable: true,
+     *             dataIndex: 'rating'
+     *         },{
+     *             text: 'Salary',
+     *             width: 125,
+     *             sortable: true,
+     *             dataIndex: 'salary',
+     *             align: 'right',
+     *             renderer: Ext.util.Format.usMoney
+     *         }]
+     *     });
+     *
+     *     Ext.create('Ext.panel.Panel', {
+     *         renderTo: document.body,
+     *         width: 800,
+     *         height: 600,
+     *         layout: {
+     *             type: 'anchor',
+     *             reserveScrollbar: true // There will be a gap even when there's no scrollbar
+     *         },
+     *         autoScroll: true,
+     *         items: grid,
+     *         tbar: {
+     *             defaults: {
+     *                 handler: function(b) {
+     *                     createFakeData(b.count);
+     *                 }
+     *             },
+     *             items: [{
+     *                  text: '10 Items',
+     *                  count: 10
+     *             },{
+     *                  text: '100 Items',
+     *                  count: 100
+     *             },{
+     *                  text: '300 Items',
+     *                  count: 300
+     *             },{
+     *                  text: '1000 Items',
+     *                  count: 1000
+     *             },{
+     *                  text: '5000 Items',
+     *                  count: 5000
+     *             }]
+     *         }
+     *     });
+     *
+     */
+    reserveScrollbar: false,
+
+    /**
+     * @property {Boolean} [managePadding=true]
+     * indicates that this layout will correct cross browser padding differences when the
+     * container has overflow.
+     * 
+     * In some browsers the right and/or bottom padding of a container is lost when
+     * the container has overflow.  If managePadding is true the layout will apply the
+     * padding to an inner wrapping element instead of the container element that has the
+     * overflow so that paddding will be included in the scrollable area.
+     * Note: padding will not be managed if it is configured on the container using
+     * a style config or css class.  In order to be managed, padding must be added to the
+     * container using the appropriate {@link Ext.AbstractComponent#contentPaddingProperty
+     * contentPaddingProperty}.  For {@link Ext.panel.Panel Panels} use 
+     * {@link Ext.panel.AbstractPanel#bodyPadding}, and for
+     * {@link Ext.container.Container Containers}, use
+     * {@link Ext.AbstractComponent#padding padding}
+     */
+    managePadding: true,
+
+    /**
+     * @property {Boolean} [manageOverflow=false]
+     * true to rerun the layout if scrollbars are needed.
+     */
+    manageOverflow: false,
+
+    // Begin with no previous adjustments
+    lastOverflowAdjust: {
+        width: 0,
+        height: 0
+    },
+
+    // Auto layout's renderTpl wraps the content in an outerCt which is used to accomplish
+    // the following 3 goals:
+    // 
+    // 1. When the container has a shrink wrapped width and/or height, the outerCt is used
+    // to measure the size of the content.
+    // 2. When the container has overflow some browsers lose the container's right and/or
+    // bottom padding.  To fix this, the padding is rendered to the outerCt instead of
+    // the container target element.  This ensures that the padding is included in the 
+    // container's scrollWidth/scrollHeight. In Old IE when a table is used, the padding
+    // is rendered to the innerCt td element.
+    // 3. The outerCt contains the margins of its children, that is to say, it prevents
+    // them from collapsing.
+    renderTpl: [
+        '{% if (!(Ext.isIEQuirks || Ext.isIE7m)) { %}',
+            // All browsers that support display:table use this template.
+            // An outerCt with display:table shrink-wraps contents, and contains child
+            // margins. The table-cell innerCt is required in order to support percentage
+            // heights on child elements. Originally the outerCt started out as a div, but
+            // was changed to a span to work around an obscure firefox 3.6 bug where
+            // placing a Container inside of a fieldset's legend element causes the legend
+            // to blow up if the outerCt is a div.
+            '<span id="{ownerId}-outerCt" style="display:table;">',
+                // height:100% is required on the innerCt in order for percentage-height
+                // children to work in IE, firefox, and opera
+                '<div id="{ownerId}-innerCt" style="display:table-cell;height:100%;',
+                'vertical-align:top;{%this.renderPadding(out, values)%}" class="{innerCtCls}">',
+                    '{%this.renderBody(out,values)%}',
+                '</div>',
+            '</span>',
+        '{% } else if (values.shrinkWrapWidth) { %}',
+            // If the containers width is shrink wrapped a table-based outerCt/innerCt
+            // is required in old IE.  See getRenderData() for more details on the criteria
+            // used to determine if the container has shrink wrapped width.
+            '<table id="{ownerId}-outerCt" class="' + Ext.plainTableCls + '">',
+                '<tr>',
+                    '<td id="{ownerId}-innerCt" style="vertical-align:top;padding:0;',
+                        '{%this.renderPadding(out, values)%}" class="{innerCtCls}">',
+                        '{%this.renderBody(out,values)%}',
+                         // clear element to contain the bottom margin of floated last child item
+                        '<div id="{ownerId}-clearEl" class="', Ext.baseCSSPrefix,  'clear"',
+                            'role="presentation"></div>',
+                    '</td>',
+                '</tr>',
+            '</table>',
+        '{% } else { %}',
+            // If the container's width is not shrink wrapped, old IE can get by with
+            // divs as the outerCt/innerCt.  zoom:1 is required to contain the margins
+            // of children. The padding is placed on the outerCt instead of the innerCt.
+            // This is to because if the padding was placed on the innerCt, the top
+            // margin of the first child item would collapse into the top padding of
+            // the innerCt.
+            '<div id="{ownerId}-outerCt" style="zoom:1;{%this.renderPadding(out, values)%}">',
+                '<div id="{ownerId}-innerCt" style="zoom:1;height:100%;" class="{innerCtCls}">',
+                    '{%this.renderBody(out,values)%}',
+                     // clear element to contain the bottom margin of floated last child item
+                    '<div id="{ownerId}-clearEl" class="', Ext.baseCSSPrefix,  'clear"',
+                        'role="presentation"></div>',
+                '</div>',
+            '</div>',
+            // set a flag that indicates we are not using a "shrink wrap" template
+            '{% values.$layout.isShrinkWrapTpl = false %}',
+        '{% } %}'
+    ],
+
+    // This template is used for dynamically inserting a table outerCt/innerCt when needed.
+    // It should be identical to the table template defined in renderTpl except that it
+    // does not have renderBody or clearEl.  It is an empty shell so that the contents
+    // of an already existing innerCt can be moved into it.
+    tableTpl: [
+        '<table id="{ownerId}-outerCt" class="' + Ext.plainTableCls + '">',
+            '<tr>',
+                '<td id="{ownerId}-innerCt" style="vertical-align:top;padding:0;',
+                    '{%this.renderPadding(out, values)%}" class="{innerCtCls}">',
+                '</td>',
+            '</tr>',
+        '</table>'
+    ],
+
+    isShrinkWrapTpl: true,
+
+
+    beginLayout: function(ownerContext) {
+        var me = this,
+            bottomPadding, overflowYStyle, overflowXStyle, needsTable;
+        
+        me.callParent(arguments);
+
+        me.initContextItems(ownerContext);
+
+        if (!me.isShrinkWrapTpl) {
+            // In most cases the determination to use a table based template is made at
+            // render time; however, if the initial determination was incorrect, we may
+            // need to dynamically replace the existing outerCt/innerCt with a table
+            // (see insertTableCt)
+            if (ownerContext.widthModel.shrinkWrap) {
+                needsTable = true;
+            }
+
+            // in IE7 strict right padding is lost when there is horizontal overflow
+            // unless the outerCt is a table.
+            if (Ext.isStrict && Ext.isIE7) {
+                overflowXStyle = me.getOverflowXStyle(ownerContext);
+                if ((overflowXStyle === 'auto' || overflowXStyle === 'scroll') &&
+                    ownerContext.paddingContext.getPaddingInfo().right) {
+                    needsTable = true;
+                }
+            }
+
+            if (needsTable) {
+                me.insertTableCt(ownerContext);
+            }
+        }
+
+        // When using the non-table renderTpl IE7 strict loses bottom padding if there
+        // is vertical overflow. To adjust for the loss of padding, we add the bottom
+        // padding to the height of the clearEl
+        if (!me.isShrinkWrapTpl && Ext.isIE7 && Ext.isStrict && !me.clearElHasPadding) {
+             bottomPadding = ownerContext.paddingContext.getPaddingInfo().bottom;
+             overflowYStyle = me.getOverflowYStyle(ownerContext);
+             if (bottomPadding && (overflowYStyle === 'auto' || overflowYStyle === 'scroll')) {
+                 me.clearEl.setStyle('height', bottomPadding);
+                 me.clearElHasPadding = true;
+             }
+        }
+    },
+    
+    beforeLayoutCycle: function(ownerContext){
+        var comp = this.owner,
+            hierarchyState = comp.hierarchyState,
+            hierarchyStateInner = comp.hierarchyStateInner;
+
+        if (!hierarchyState || hierarchyState.invalid) {
+            hierarchyState = comp.getHierarchyState(); // fixes both
+            hierarchyStateInner = comp.hierarchyStateInner;
+        }
+        if (ownerContext.widthModel.shrinkWrap && this.isShrinkWrapTpl) {
+            hierarchyStateInner.inShrinkWrapTable = true;
+        } else {
+            delete hierarchyStateInner.inShrinkWrapTable;
+        }
+    },
+
+    beginLayoutCycle: function(ownerContext) {
+        var me = this,
+            outerCt = me.outerCt,
+            lastOuterCtWidth = me.lastOuterCtWidth || '',
+            lastOuterCtHeight = me.lastOuterCtHeight || '',
+            lastOuterCtTableLayout = me.lastOuterCtTableLayout || '',
+            state = ownerContext.state,
+            overflowXStyle, overflowYStyle, outerCtWidth, outerCtHeight, outerCtTableLayout,
+            deferWidth, hierarchyStateInner;
+
+        me.callParent(arguments);
+
+        // Default to "shrink wrap styles".
+        outerCtWidth = outerCtHeight = outerCtTableLayout = '';
+
+        if (!ownerContext.widthModel.shrinkWrap && me.isShrinkWrapTpl) {
+            // if we're not shrink wrapping width, but we're using a shrink wrap template
+            // we need to get the innerCt out of the way to avoid any shrink wrapping
+            // effect on child items
+            if (Ext.isIE7m && Ext.isStrict) {
+                overflowYStyle = me.getOverflowYStyle(ownerContext);
+                if (overflowYStyle === 'auto' || overflowYStyle === 'scroll') {
+                    // IE6/7 strict will have the outerCt's width set by setCtSizeIfNeeded()
+                    // when the container has potential vertical overflow, so there is
+                    // no need to set the outerCt's width to 100% here
+                    deferWidth = true;
+                }
+            }
+
+            if (!deferWidth) {
+                // fill the available width within the container
+                outerCtWidth = '100%';
+            }
+            hierarchyStateInner = me.owner.hierarchyStateInner;
+            // expand no further than the available width, even if contents are wider
+            // unless there is a potential for horizontal overflow, then allow
+            // the outerCt to expand to the width of the contents
+            overflowXStyle = me.getOverflowXStyle(ownerContext);
+            outerCtTableLayout = (hierarchyStateInner.inShrinkWrapTable ||
+                                  overflowXStyle === 'auto' || 
+                                  overflowXStyle === 'scroll') ? '' : 'fixed';
+        }
+
+        if (!ownerContext.heightModel.shrinkWrap && 
+            !Ext.supports.PercentageHeightOverflowBug) {
+            // if we're not shrink wrapping height, we need to get the outerCt out of the
+            // way so that percentage height children will be sized correctly.  We do this
+            // by giving the outerCt a height of '100%' unless the browser is affected by
+            // the "percentage height overflow bug", in which case the outerCt will get a
+            // pixel height set during the calculate phase after we know the targetEl size.
+            outerCtHeight = '100%';
+        }
+
+        // if the outerCt width changed since last time (becuase of a widthModel change)
+        // or if we set a pixel width on the outerCt last time to work around a browser-
+        // specific bug, we need to set the width of the outerCt
+        if ((outerCtWidth !== lastOuterCtWidth) || me.hasOuterCtPxWidth) {
+            outerCt.setStyle('width', outerCtWidth);
+            me.lastOuterCtWidth = outerCtWidth;
+            me.hasOuterCtPxWidth = false;
+        }
+
+        // Set the outerCt table-layout property if different from last time.
+        if (outerCtTableLayout !== lastOuterCtTableLayout) {
+            outerCt.setStyle('table-layout', outerCtTableLayout);
+            me.lastOuterCtTableLayout = outerCtTableLayout;
+        }
+
+        // if the outerCt height changed since last time (becuase of a heightModel change)
+        // or if we set a pixel height on the outerCt last time to work around a browser-
+        // specific bug, we need to set the height of the outerCt
+        if ((outerCtHeight !== lastOuterCtHeight) || me.hasOuterCtPxHeight) {
+            outerCt.setStyle('height', outerCtHeight);
+            me.lastOuterCtHeight = outerCtHeight;
+            me.hasOuterCtPxHeight = false;
+        }
+
+        if (me.hasInnerCtPxHeight) {
+            me.innerCt.setStyle('height', '');
+            me.hasInnerCtPxHeight = false;
+        }
+
+        // Begin with the scrollbar adjustment that we used last time - this is more likely
+        // to be correct than beginning with no adjustment at all, but only if it is not
+        // already defined - it may have already been set by invalidate()
+        state.overflowAdjust = state.overflowAdjust || me.lastOverflowAdjust;
+    },
+
+    calculate: function(ownerContext) {
+        var me = this,
+            state = ownerContext.state,
+            containerSize = me.getContainerSize(ownerContext, true),
+            // If subclass has a calculateItems method, call it and cache the result
+            calculatedItems = state.calculatedItems ||
+                (state.calculatedItems = me.calculateItems ?
+                me.calculateItems(ownerContext, containerSize) : true);
+
+        me.setCtSizeIfNeeded(ownerContext, containerSize);
+
+        if (calculatedItems && ownerContext.hasDomProp('containerChildrenSizeDone')) {
+
+            me.calculateContentSize(ownerContext);
+
+            if (containerSize.gotAll) {
+                if (me.manageOverflow && !ownerContext.state.secondPass && !me.reserveScrollbar) {
+                    me.calculateOverflow(ownerContext, containerSize);
+                }
+                return;
+            }
+        }
+        
+        me.done = false;
+    },
+
+    calculateContentSize: function (ownerContext) {
+        var me = this,
+            containerDimensions = ((ownerContext.widthModel.shrinkWrap ? 1 : 0) |
+                                   (ownerContext.heightModel.shrinkWrap ? 2 : 0)),
+            calcWidth = (containerDimensions & 1) || undefined,
+            calcHeight = (containerDimensions & 2) || undefined,
+            needed = 0,
+            props = ownerContext.props;
+
+        if (calcWidth) {
+            if (isNaN(props.contentWidth)) {
+                ++needed;
+            } else {
+                calcWidth = undefined;
+            }
+        }
+        if (calcHeight) {
+            if (isNaN(props.contentHeight)) {
+                ++needed;
+            } else {
+                calcHeight = undefined;
+            }
+        }
+
+        if (needed) {
+            if (calcWidth && !ownerContext.setContentWidth(me.measureContentWidth(ownerContext))) {
+                me.done = false;
+            }
+            if (calcHeight && !ownerContext.setContentHeight(me.measureContentHeight(ownerContext))) {
+                me.done = false;
+            }
+
+            //if (me.done) {
+            //    var el = ownerContext.targetContext.el.dom;
+            //    Ext.log(this.owner.id, '.contentSize: ', contentWidth, 'x', contentHeight,
+            //        ' => scrollSize: ', el.scrollWidth, 'x', el.scrollHeight);
+            //}
+        }
+    },
+
+    /**
+     * Handles overflow processing for a container.  In addition to the ownerContext
+     * passed to the {@link #calculate} method, this method also needs the containerSize
+     * (the object returned by {@link #getContainerSize}).
+     * @protected
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext
+     */
+    calculateOverflow: function (ownerContext) {
+        var me = this,
+            width, height, scrollbarSize, scrollbars, xauto, yauto, targetEl;
+
+        // Determine the dimensions that have overflow:auto applied. If these come by
+        // way of component config, this does not require a DOM read:
+        xauto = (me.getOverflowXStyle(ownerContext) === 'auto');
+        yauto = (me.getOverflowYStyle(ownerContext) === 'auto');
+
+        if (xauto || yauto) {
+            scrollbarSize = Ext.getScrollbarSize();
+            targetEl = ownerContext.overflowContext.el.dom;
+            scrollbars = 0;
+
+            if (targetEl.scrollWidth > targetEl.clientWidth) {
+                // has horizontal scrollbar
+                scrollbars |= 1;
+            }
+
+            if (targetEl.scrollHeight > targetEl.clientHeight) {
+                // has vertical scrollbar
+                scrollbars |= 2;
+            }
+
+            width = (yauto && (scrollbars & 2)) ? scrollbarSize.width : 0;
+            height = (xauto && (scrollbars & 1)) ? scrollbarSize.height : 0;
+
+            if (width !== me.lastOverflowAdjust.width || height !== me.lastOverflowAdjust.height) {
+                me.done = false;
+
+                // we pass overflowAdjust and overflowState in as state for the next
+                // cycle (these are discarded if one of our ownerCt's invalidates):
+                ownerContext.invalidate({
+                    state: {
+                        overflowAdjust: {
+                            width: width,
+                            height: height
+                        },
+                        overflowState: scrollbars,
+                        secondPass: true
+                    }
+                });
+            }
+        }
+    },
+
+    completeLayout: function(ownerContext) {
+       this.lastOverflowAdjust = ownerContext.state.overflowAdjust;
+    },
+
+    doRenderPadding: function(out, renderData) {
+        // Careful! This method is bolted on to the renderTpl so all we get for context is
+        // the renderData! The "this" pointer is the renderTpl instance!
+
+        var me = renderData.$layout,
+            owner = renderData.$layout.owner,
+            padding = owner[owner.contentPaddingProperty];
+
+        if (me.managePadding && padding) {
+            out.push('padding:', owner.unitizeBox(padding));
+        }
+    },
+
+    finishedLayout: function (ownerContext) {
+        var innerCt = this.innerCt;
+
+        this.callParent(arguments);
+
+        if (Ext.isIEQuirks || Ext.isIE8m)  {
+            // IE6/7/quirks need a repaint to fix various rendering issues. TODO: narrow
+            // down the specific issues that require a repaint.
+            // IE8 strict needs a repaint to render percentage sized child items.
+            innerCt.repaint();
+        }
+
+        if (Ext.isOpera) {
+            // Opera also needs a repaint to render percentage sized child items. but 
+            // the normal repaint() method doesn't seem to do the trick, but tweaking
+            // the position property in combination with reading scrollWidth does.
+            innerCt.setStyle('position', 'relative');
+            innerCt.dom.scrollWidth;
+            innerCt.setStyle('position', '');
+        }
+    },
+
+    /**
+     * Returns the container size (that of the target). Only the fixed-sized dimensions can
+     * be returned because the shrinkWrap dimensions are based on the contentWidth/Height
+     * as determined by the container layout.
+     *
+     * If the {@link #calculateOverflow} method is used and if {@link #manageOverflow} is
+     * true, this will adjust the width/height by the size of scrollbars.
+     * 
+     * @param {Ext.layout.ContextItem} ownerContext The owner's context item.
+     * @param {Boolean} [inDom=false] True if the container size must be in the DOM.
+     * @return {Object} The size
+     * @return {Number} return.width The width
+     * @return {Number} return.height The height
+     * @protected
+     */
+    getContainerSize : function(ownerContext, inDom) {
+        // Subtle But Important:
+        // 
+        // We don't want to call getProp/hasProp et.al. unless we in fact need that value
+        // for our results! If we call it and don't need it, the layout manager will think
+        // we depend on it and will schedule us again should it change.
+        
+        var size = this.callParent(arguments),
+            overflowAdjust = ownerContext.state.overflowAdjust;
+
+        if (overflowAdjust) {
+            size.width -= overflowAdjust.width;
+            size.height -= overflowAdjust.height;
+        }
+
+        return size;
+    },
+
+    getRenderData: function() {
+        var owner = this.owner,
+            data = this.callParent();
+        
+        // The shrinkWrapWidth data property is used by the renderTpl to determine if
+        // a table-based outerCt/innerCt is required in old IE.  There are currently 2
+        // container configs that turn on the table at render time:
+        // 
+        // 1. shrinkWrap:[1/3/true] on the container's initial config.  There
+        // are two reasons one would want to use this config:
+        //     a) If the container's width is initially shrink wrapped.
+        //     b) If the container is not initially shrink wrapped and it is known
+        //        at creation time that it will be shrink wrapped at some point
+        //        after the initial layout cycle, then it is recommended to
+        //        use the shrinkWrap config to initially configure the container
+        //        with shrink wrapped width so that the layout does not have to
+        //        dynamically insert a table after initial render.
+        //        
+        // 2. If the container's "floating" config is set to true, and the container
+        // does not have a configured width, we can be relatively certain at render
+        // time that the container will be shrink wrapped at layout time, so 
+        // we go ahead and initially render using a table.
+        if ((Ext.isIEQuirks || Ext.isIE7m) && // old IE
+            ((owner.shrinkWrap & 1) || // shrink wrap width (handles value of 1, 3, or true)
+            (owner.floating && !owner.width))) { // floating container with no configured width
+            data.shrinkWrapWidth = true;
+        }
+
+        return data;
+    },
+
+    // Overridden method from Ext.layout.container.Container.
+    // Used in the beforeLayout method to render all items into.
+    getRenderTarget: function() {
+        return this.innerCt;
+    },
+
+    // Overridden method from Ext.layout.container.Container.
+    // Used by Container classes to insert special DOM elements which must exist in addition to the child components
+    getElementTarget: function() {
+        return this.innerCt;
+    },
+
+    /**
+     * Returns the overflow-x style of the render target.
+     * Note: If overflow is configured on a container using style or css class this method
+     * will read the dom the first time it is called. It is therefore preferable for
+     * performance reasons to use the autoScroll or overflowX config when horizontal
+     * overflow is desired.
+     * @protected
+     * @param {Ext.layout.ContextItem} ownerContext
+     * @return {String}
+     */
+    getOverflowXStyle: function(ownerContext) {
+        return ownerContext.overflowXStyle ||
+            (ownerContext.overflowXStyle = this.owner.scrollFlags.overflowX || ownerContext.overflowContext.getStyle('overflow-x'));
+    },
+
+    /**
+     * Returns the overflow-y style of the render target.
+     * Note: If overflow is configured on a container using style or css class this method
+     * will read the dom the first time it is called. It is therefore preferable for
+     * performance reasons to use the autoScroll or overflowY config when vertical
+     * overflow is desired.
+     * @protected
+     * @param {Ext.layout.ContextItem} ownerContext
+     * @return {String}
+     */
+    getOverflowYStyle: function(ownerContext) {
+        return ownerContext.overflowYStyle || 
+            (ownerContext.overflowYStyle = this.owner.scrollFlags.overflowY || ownerContext.overflowContext.getStyle('overflow-y'));
+    },
+
+    initContextItems: function(ownerContext) {
+        var me = this,
+            target = ownerContext.target,
+            customOverflowEl = me.owner.customOverflowEl;
+
+        ownerContext.outerCtContext = ownerContext.getEl('outerCt', me);
+        ownerContext.innerCtContext = ownerContext.getEl('innerCt', me);
+        
+        if (customOverflowEl) {
+            ownerContext.overflowContext = ownerContext.getEl(customOverflowEl);    
+        } else {
+            ownerContext.overflowContext = ownerContext.targetContext;
+        }
+        
+        if (target[target.contentPaddingProperty] !== undefined) {
+            // If padding was defined using the contentPaddingProperty, we render the
+            // the padding to the innerCt or outerCt (depending on the template that is
+            // being used), so we need to set the paddingContext accordingly.
+            // Otherwise we leave paddingContext as set by Container layout (defaults to
+            // the targetContext)
+            ownerContext.paddingContext = me.isShrinkWrapTpl ?
+                ownerContext.innerCtContext : ownerContext.outerCtContext;
+        }
+    },
+
+    initLayout: function() {
+        var me = this,
+            scrollbarWidth = Ext.getScrollbarSize().width,
+            owner = me.owner;
+
+        me.callParent();
+
+        // Create a default lastOverflowAdjust based upon scrolling configuration.
+        // If the Container is to overflow, or we *always* reserve space for a scrollbar
+        // then reserve space for a vertical scrollbar
+        if (scrollbarWidth && me.manageOverflow && !me.hasOwnProperty('lastOverflowAdjust')) {
+            if (owner.autoScroll || me.reserveScrollbar) {
+                me.lastOverflowAdjust = {
+                    width: scrollbarWidth,
+                    height: 0
+                };
+            }
+        }
+    },
+
+    /**
+     * In some cases a table-based outerCt/innerCt is required in old IE (see renderTpl).
+     * Most of the time this is determined at render time, however its possible that
+     * we made the wrong determination at render time and now that the layout is in
+     * progress we need a table.  If so, this method should be called to replace the
+     * existing outerCt with a new table outerCt, and move the child elements to the new
+     * innerCt.
+     * @private
+     */
+    insertTableCt: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            i = 0,
+            renderTpl, fragment, childNodes, childLength, targetEl;
+
+        // get the table-based renderTpl
+        renderTpl = Ext.XTemplate.getTpl(this, 'tableTpl');
+        renderTpl.renderPadding = me.doRenderPadding
+
+        // To avoid unnecessary reflows, remove the innerCt from the dom
+        // before operating on its children.
+        me.outerCt.dom.removeChild(me.innerCt.dom);
+        // create a document fragment to move all the childNodes to, so that
+        // they can be batch appended to the new innerCt
+        fragment = document.createDocumentFragment();
+        childNodes = me.innerCt.dom.childNodes;
+        childLength = childNodes.length;
+        // append all the children to the document fragment
+        for (; i < childLength; i++) {
+            fragment.appendChild(childNodes[0]);
+        }
+        // process the table template and insert it into the target el
+        targetEl = me.getTarget();
+        targetEl.dom.innerHTML = renderTpl.apply({
+            $layout: me,
+            ownerId: me.owner.id
+        });
+
+        // append the document fragment containing the childNodes to the new innerCt
+        targetEl.down('td').dom.appendChild(fragment);
+        // reconfigure childEls to point to the new template's elements
+        // we need to do this after the childNodes are appended to the new innerCt
+        // because the clearEl is one of the childNodes
+        me.applyChildEls(owner.el, owner.id)
+        // set the flag that indicates we are using a "shrink wrap" template.
+        // this needs to be done before reinitializeing the context items so that
+        // the paddingContext will be configured correctly.
+        me.isShrinkWrapTpl = true;
+        // since we have new childEls we need to reinitialize the context items
+        ownerContext.removeEl(me.outerCt);
+        ownerContext.removeEl(me.innerCt);
+        me.initContextItems(ownerContext);
+    },
+
+    measureContentHeight: function (ownerContext) {
+        // contentHeight includes padding, but not border, framing or margins
+        var contentHeight = this.outerCt.getHeight(),
+            target = ownerContext.target;
+
+        if (this.managePadding && (target[target.contentPaddingProperty] === undefined)) {
+            // if padding was not configured using the appropriate contentPaddingProperty
+            // then the padding will not be on the paddingContext, and therfore not included
+            // in the outerCt measurement, so we need to read the padding from the
+            // targetContext
+            contentHeight += ownerContext.targetContext.getPaddingInfo().height;
+        }
+        return contentHeight;
+    },
+
+    measureContentWidth: function (ownerContext) {
+        var dom, style, old, contentWidth, target;
+            
+        // In the newer Chrome versions, it won't measure the
+        // width correctly without repainting the inner
+        // cell in some circumstances.
+        if (this.chromeCellMeasureBug) {
+            dom = this.innerCt.dom;
+            style = dom.style;
+            old = style.display;
+            
+            if (old == 'table-cell') {
+                style.display = '';
+                dom.offsetWidth;
+                style.display = old;
+            }    
+        }
+        
+        // contentWidth includes padding, but not border, framing or margins
+        contentWidth = this.outerCt.getWidth();
+        target = ownerContext.target;
+
+        if (this.managePadding && (target[target.contentPaddingProperty] === undefined)) {
+            // if padding was not configured using the appropriate contentPaddingProperty
+            // then the padding will not be on the paddingContext, and therfore not included
+            // in the outerCt measurement, so we need to read the padding from the
+            // targetContext
+            contentWidth += ownerContext.targetContext.getPaddingInfo().width;
+        }
+        return contentWidth;
+    },
+
+    /**
+     * This method sets the height and/or width of the outerCt/innerCt to adjust for the
+     * following browser-specific issues:
+     * 
+     * 1. In IE6 and 7 strict if we are using the shrink wrap template, and the outerCt
+     * has a 100% width (because the container is not shrink wrapping width currently),
+     * and the target element has a vertical scrollbar, the browser disregards the 
+     * scrollbar when sizing the width of the outerCt.  This can result in the target
+     * element gaining a horizontal scrollbar.  We fix this issue by setting a pixel
+     * width on the outerCt
+     * 
+     * 2. In IE quirks when using the "non shrink wrap" template, a long non-breaking word
+     * can cause the outerCt's width to expand beyond the width of its container. This 
+     * behavior is desired if the container has the potential for horizontal overflow,
+     * but can cause text to be hidden if the container's overflow is hidden. To prevent
+     * this from happening we give the outerCt a fixed width in IE quirks when the
+     * container does not have horizontal overflow.
+     * 
+     * 3. In some browsers a percentage-height element ignores the horizontal scrollbar
+     * of its parent (see Ext.supports.PercentageHeightOverflowBug).  If the browser is
+     * affected by this bug the outerCt needs a pixel height in order to support
+     * percentage-height children when not shrink-wrapping height. If the browser is not
+     * affected by this bug, a height of 100% is assigned to the outerCt (see
+     * beginLayoutCycle).
+     * 
+     * 4. In IE6/7 strict when using the "shrink wrap" template, percentage heights on 
+     * children do not work unless the innerCt td has a height set.  We can't use height
+     * 100% on the innerCt because conent-box sizing will cause any top/bottom padding to
+     * be added to the height.  The solution is to set a pixel height on the innerCt.
+ 
+     * 5. IE8 strict mode has a bug with percentage height children.  if the innerCt has
+     * a height of 100%, has padding, and has a child item with a percentage height, that
+     * child item will be sized as a percentage of the parent's height plus padding height.
+     * In other words, a child with height:50% would have its height caclulated thusly:
+     * (parentHeight + parentPaddingHeight) * 0.5
+     * To fix this, we have to give the innerCt a pixel height.
+     * 
+     * 6. In IE7 strict if we're using the "non shrink wrap" template, and the target
+     * element has overflow-y:auto, the outerCt reserves space for the target element's
+     * vertical scrollbar even when there is no vertical scrollbar.  This is fixed by
+     * setting the targetEl's overflow property to "hidden" and then back to "auto".
+     * 
+     * @protected
+     * @param {Ext.layout.ContextItem} ownerContext
+     * @param {Object} containerSize
+     */
+    setCtSizeIfNeeded: function(ownerContext, containerSize) {
+        var me = this,
+            width = containerSize.width,
+            height = containerSize.height,
+            padding = ownerContext.paddingContext.getPaddingInfo(),
+            targetEl = me.getTarget(),
+            overflowXStyle = me.getOverflowXStyle(ownerContext),
+            overflowYStyle = me.getOverflowYStyle(ownerContext),
+            canOverflowX = (overflowXStyle === 'auto' || overflowXStyle === 'scroll'),
+            canOverflowY = (overflowYStyle === 'auto' || overflowYStyle === 'scroll'),
+            scrollbarSize = Ext.getScrollbarSize(),
+            isShrinkWrapTpl = me.isShrinkWrapTpl,
+            manageOverflow = me.manageOverflow,
+            overflowStyleName, needsOuterHeight, needsInnerHeight, needsInnerCtPaddingHeight;
+
+        if (width && !ownerContext.widthModel.shrinkWrap &&
+            // shrink wrap outerCt needs pixel width in IE6/7 strict because 100% width
+            // on the outerCt causes it to overlap the vertical scrollbar
+            ((Ext.isIE7m && Ext.isStrict && isShrinkWrapTpl && canOverflowY) ||
+            // non shrink wrap tpl outerCt in IE quirks needs pixel width to prevent
+            // non-breaking text from causing the outerCt to expand beyond the width
+            // of its container.
+            (Ext.isIEQuirks && !isShrinkWrapTpl && !canOverflowX))) {
+
+            if (!manageOverflow) {
+                // If we're not managing overflow, the containerSize will not account for
+                // vertical scrollbar width, so we need to see if there is a vertical
+                // scrollbar and subtract its width
+                if (canOverflowY && (targetEl.dom.scrollHeight > targetEl.dom.clientHeight)) {
+                    // has vertical scrollbar
+                    width -= scrollbarSize.width;
+                }
+            }
+
+            ownerContext.outerCtContext.setProp('width', width + padding.width);
+            me.hasOuterCtPxWidth = true;
+        }
+
+        if (height && !ownerContext.heightModel.shrinkWrap) {
+            if (Ext.supports.PercentageHeightOverflowBug) {
+                // set a pixel height on the outerCt if the browser ignores horizontal
+                // scrollbar when rendering percentage-height elements
+                needsOuterHeight = true;
+            }
+            if (((Ext.isIE8 && Ext.isStrict) ||
+                Ext.isIE7m && Ext.isStrict && isShrinkWrapTpl)) {
+                // When using a shrink wrap template and not shrink wrapping, we set a
+                // pixel height on the innerCt to support percentage height children in
+                // IE6/7/8 strict.
+                needsInnerHeight = true;
+                // Do not add padding to the innerCt height in IE8 to prevent percentage-
+                // height children from adding padding height in their height calculation.
+                needsInnerCtPaddingHeight = !Ext.isIE8;
+            }
+
+            if ((needsOuterHeight || needsInnerHeight) && canOverflowX && 
+                (targetEl.dom.scrollWidth > targetEl.dom.clientWidth)) {
+                // adjust the height for scrollbar size since it's not accounted for
+                // in the containerSize.
+                // IE8 in what passes for "standards" mode does not tolerate -ve sizes
+                height = Math.max(height - scrollbarSize.height, 0);
+            }
+
+            if (needsOuterHeight) {
+                ownerContext.outerCtContext.setProp('height', height + padding.height);
+                me.hasOuterCtPxHeight = true;
+            }
+            
+            if (needsInnerHeight) {
+                if (needsInnerCtPaddingHeight) {
+                    height += padding.height;
+                }
+                ownerContext.innerCtContext.setProp('height', height);
+                me.hasInnerCtPxHeight = true;
+            }
+        }
+
+        if (Ext.isIE7 && Ext.isStrict && !isShrinkWrapTpl && (overflowYStyle === 'auto')) {
+            // IE7 strict has an insane bug where an auto-width element reserves
+            // space for its parent's vertical scrollbar if the parent has
+            // overflow-y:auto; even when no scrollbar is present.  To workaround
+            // this issue we can set overflow-y to 'hidden' and then back to 'auto'.
+            // If we have vertical overflow, however, tweaking overflow-y can cause an
+            // illegitimate horizontal scrollbar to appear. So we have to tweak overflow-x
+            // instead if the overflow-x style is "auto"
+            overflowStyleName = (overflowXStyle === 'auto') ? 'overflow-x' : 'overflow-y';
+            targetEl.setStyle(overflowStyleName, 'hidden');
+            targetEl.setStyle(overflowStyleName, 'auto');
+        }
+    },
+
+    setupRenderTpl: function (renderTpl) {
+        this.callParent(arguments);
+
+        renderTpl.renderPadding = this.doRenderPadding;
+    },
+
+    getContentTarget: function(){
+        return this.innerCt;
+    }
+
+}, function(){
+    this.prototype.chromeCellMeasureBug = Ext.isChrome && Ext.chromeVersion >= 26;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A class that manages a group of {@link Ext.Component#floating} Components and provides z-order management,
+ * and Component activation behavior, including masking below the active (topmost) Component.
+ *
+ * {@link Ext.Component#floating Floating} Components which are rendered directly into the document (such as
+ * {@link Ext.window.Window Window}s) which are {@link Ext.Component#method-show show}n are managed by a
+ * {@link Ext.WindowManager global instance}.
+ *
+ * {@link Ext.Component#floating Floating} Components which are descendants of {@link Ext.Component#floating floating}
+ * *Containers* (for example a {@link Ext.view.BoundList BoundList} within an {@link Ext.window.Window Window},
+ * or a {@link Ext.menu.Menu Menu}), are managed by a ZIndexManager owned by that floating Container. Therefore
+ * ComboBox dropdowns within Windows will have managed z-indices guaranteed to be correct, relative to the Window.
+ */
+Ext.define('Ext.ZIndexManager', {
+    alternateClassName: 'Ext.WindowGroup',
+
+    statics: {
+        zBase : 9000
+    },
+
+    constructor: function(container) {
+        var me = this;
+
+        me.list = {};
+        me.zIndexStack = [];
+        me.front = null;
+
+        if (container) {
+
+            // This is the ZIndexManager for an Ext.container.Container, base its zseed on the zIndex of the Container's element
+            if (container.isContainer) {
+                container.on('resize', me._onContainerResize, me);
+                me.zseed = Ext.Number.from(me.rendered ? container.getEl().getStyle('zIndex') : undefined, me.getNextZSeed());
+                // The containing element we will be dealing with (eg masking) is the content target
+                me.targetEl = container.getTargetEl();
+                me.container = container;
+            }
+            // This is the ZIndexManager for a DOM element
+            else {
+                Ext.EventManager.onWindowResize(me._onContainerResize, me);
+                me.zseed = me.getNextZSeed();
+                me.targetEl = Ext.get(container);
+            }
+        }
+        // No container passed means we are the global WindowManager. Our target is the doc body.
+        // DOM must be ready to collect that ref.
+        else {
+            Ext.EventManager.onWindowResize(me._onContainerResize, me);
+            me.zseed = me.getNextZSeed();
+            Ext.onDocumentReady(function() {
+                me.targetEl = Ext.getBody();
+            });
+        }
+    },
+
+    getNextZSeed: function() {
+        return (Ext.ZIndexManager.zBase += 10000);
+    },
+
+    setBase: function(baseZIndex) {
+        this.zseed = baseZIndex;
+        var result = this.assignZIndices();
+        this._activateLast();
+        return result;
+    },
+
+    // @private
+    assignZIndices: function() {
+        var a = this.zIndexStack,
+            len = a.length,
+            i = 0,
+            zIndex = this.zseed,
+            comp,
+            topModal;
+
+        for (; i < len; i++) {
+            comp = a[i];
+            if (comp && !comp.hidden) {
+
+                // Setting the zIndex of a Component returns the topmost zIndex consumed by
+                // that Component.
+                // If it's just a plain floating Component such as a BoundList, then the
+                // return value is the passed value plus 10, ready for the next item.
+                // If a floating *Container* has its zIndex set, it re-orders its managed
+                // floating children, starting from that new base, and returns a value 10000 above
+                // the highest zIndex which it allocates.
+                zIndex = comp.setZIndex(zIndex);
+                if (comp.modal) {
+                    topModal = comp;
+                }
+            }
+        }
+        
+        // If we encountered a modal in our reassigment, ensure our modal mask is just below it.
+        if (topModal) {
+            this._showModalMask(topModal)
+        }
+        return zIndex;
+    },
+
+    // @private
+    _setActiveChild: function(comp, oldFront) {
+        var front = this.front,
+            oldPreventFocus = comp.preventFocusOnActivate;
+
+        if (comp !== front) {
+
+            if (front && !front.destroying) {
+                front.setActive(false, comp);
+            }
+            this.front = comp;
+            if (comp && comp != oldFront) {
+
+                // If the previously active comp did not take focus, then do not disturb focus state by focusing the new front
+                comp.preventFocusOnActivate = comp.preventFocusOnActivate || oldFront && (oldFront.preventFocusOnActivate || !oldFront.focusOnToFront);
+
+                comp.setActive(true);
+                
+                // If the modal mask was utilized by the outgoing front component, reposition it.
+                if (comp.modal) {
+                    this._showModalMask(comp);
+                }
+
+                // Restore the new front's focusing flag
+                comp.preventFocusOnActivate = oldPreventFocus;
+            }
+        }
+    },
+
+    onComponentHide: function(comp){
+        this._activateLast();
+    },
+
+    // @private
+    _activateLast: function() {
+        var me = this,
+            stack = me.zIndexStack,
+            i = stack.length - 1,
+            comp;
+
+        // Go down through the z-index stack.
+        // Activate the next visible one down.
+        // If that was modal, then we're done
+        for (; i >= 0 && stack[i].hidden; --i);
+
+        // The loop found a visible floater to activate
+        if ((comp = stack[i])) {
+            me._setActiveChild(comp, me.front);
+            if (comp.modal) {
+                return;
+            }
+        }
+        // No other floater to activate, just deactivate the current one
+        else {
+            if (me.front && !me.front.destroying) {
+                me.front.setActive(false);
+            }
+            me.front = null;
+        }
+
+        // If the new top one was not modal, keep going down to find the next visible
+        // modal one to shift the modal mask down under
+        for (; i >= 0; --i) {
+            comp = stack[i];
+            // If we find a visible modal further down the zIndex stack, move the mask to just under it.
+            if (comp.isVisible() && comp.modal) {
+                me._showModalMask(comp);
+                return;
+            }
+        }
+
+        // No visible modal Component was found in the run down the stack.
+        // So hide the modal mask
+        me._hideModalMask();
+    },
+
+    _showModalMask: function(comp) {
+        var me = this,
+            zIndex = comp.el.getStyle('zIndex') - 4,
+            maskTarget = comp.floatParent ? comp.floatParent.getTargetEl() : comp.container,
+            mask = me.mask,
+            shim = me.maskShim,
+            viewSize;
+
+        if (!mask) {
+            if (Ext.isIE6) {
+                shim = me.maskShim = Ext.getBody().createChild({
+                    tag: 'iframe',
+                    cls : Ext.baseCSSPrefix + 'shim ' + Ext.baseCSSPrefix + 'mask-shim'
+                });
+                shim.setVisibilityMode(Ext.Element.DISPLAY);
+            }
+
+            // Create the mask at zero size so that it does not affect upcoming target measurements.
+            mask = me.mask = Ext.getBody().createChild({
+                cls: Ext.baseCSSPrefix + 'mask',
+                style: 'height:0;width:0'
+            });
+            mask.setVisibilityMode(Ext.Element.DISPLAY);
+            mask.on('click', me._onMaskClick, me);
+        }
+        
+        mask.maskTarget = maskTarget;
+        viewSize = me.getMaskBox();
+
+        if (shim) {
+            shim.setStyle('zIndex', zIndex);
+            shim.show();
+            shim.setBox(viewSize);
+        }
+        mask.setStyle('zIndex', zIndex);
+
+        // setting mask box before showing it in an IE7 strict iframe within a quirks page
+        // can cause body scrolling [EXTJSIV-6219]
+        mask.show();
+        mask.setBox(viewSize);
+    },
+
+    _hideModalMask: function() {
+        var mask = this.mask,
+            maskShim = this.maskShim;
+
+        if (mask && mask.isVisible()) {
+            mask.maskTarget = undefined;
+            mask.hide();
+            if (maskShim) {
+                maskShim.hide();
+            }
+        }
+    },
+
+    _onMaskClick: function() {
+        if (this.front) {
+            this.front.focus();
+        }
+    },
+    
+    getMaskBox: function(){
+        var maskTarget = this.mask.maskTarget;
+        if (maskTarget.dom === document.body) {
+            return {
+                height: Math.max(document.body.scrollHeight, Ext.dom.Element.getDocumentHeight()),
+                width: Math.max(document.body.scrollWidth, document.documentElement.clientWidth),
+                x: 0,
+                y: 0
+            };
+        } else {
+            return maskTarget.getBox();
+        } 
+    },
+
+    _onContainerResize: function() {
+        var me = this,
+            mask = me.mask,
+            maskShim = me.maskShim,
+            viewSize;
+
+        if (mask && mask.isVisible()) {
+
+            // At the new container size, the mask might be *causing* the scrollbar, so to find the valid
+            // client size to mask, we must temporarily unmask the parent node.
+            mask.hide();
+            if (maskShim) {
+                maskShim.hide();
+            }
+
+            viewSize = me.getMaskBox();
+            if (maskShim) {
+                maskShim.setSize(viewSize);
+                maskShim.show();
+            }
+            mask.setSize(viewSize);
+            mask.show();
+        }
+    },
+
+    /**
+     * Registers a floating {@link Ext.Component} with this ZIndexManager. This should not
+     * need to be called under normal circumstances. Floating Components (such as Windows,
+     * BoundLists and Menus) are automatically registered with a
+     * {@link Ext.Component#zIndexManager zIndexManager} at render time.
+     *
+     * Where this may be useful is moving Windows between two ZIndexManagers. For example,
+     * to bring the Ext.MessageBox dialog under the same manager as the Desktop's
+     * ZIndexManager in the desktop sample app:
+     *
+     *     MyDesktop.getDesktop().getManager().register(Ext.MessageBox);
+     *
+     * @param {Ext.Component} comp The Component to register.
+     */
+    register : function(comp) {
+        var me = this,
+            compAfterHide = comp.afterHide;
+        
+        if (comp.zIndexManager) {
+            comp.zIndexManager.unregister(comp);
+        }
+        comp.zIndexManager = me;
+
+        me.list[comp.id] = comp;
+        me.zIndexStack.push(comp);
+        
+        // Hook into Component's afterHide processing
+        comp.afterHide = function() {
+            compAfterHide.apply(comp, arguments);
+            me.onComponentHide(comp);
+        };
+    },
+
+    /**
+     * Unregisters a {@link Ext.Component} from this ZIndexManager. This should not
+     * need to be called. Components are automatically unregistered upon destruction.
+     * See {@link #register}.
+     * @param {Ext.Component} comp The Component to unregister.
+     */
+    unregister : function(comp) {
+        var me = this,
+            list = me.list;
+        
+        delete comp.zIndexManager;
+        if (list && list[comp.id]) {
+            delete list[comp.id];
+            
+            // Relinquish control of Component's afterHide processing
+            delete comp.afterHide;
+            Ext.Array.remove(me.zIndexStack, comp);
+
+            // Destruction requires that the topmost visible floater be activated. Same as hiding.
+            me._activateLast();
+        }
+    },
+
+    /**
+     * Gets a registered Component by id.
+     * @param {String/Object} id The id of the Component or a {@link Ext.Component} instance
+     * @return {Ext.Component}
+     */
+    get : function(id) {
+        return id.isComponent ? id : this.list[id];
+    },
+
+   /**
+     * Brings the specified Component to the front of any other active Components in this ZIndexManager.
+     * @param {String/Object} comp The id of the Component or a {@link Ext.Component} instance
+     * @return {Boolean} True if the dialog was brought to the front, else false
+     * if it was already in front
+     */
+    bringToFront : function(comp, preventFocus) {
+        var me = this,
+            result = false,
+            zIndexStack = me.zIndexStack;
+        
+        comp = me.get(comp);
+        if (comp !== me.front) {
+            Ext.Array.remove(zIndexStack, comp);
+            if (comp.preventBringToFront) {
+                // this takes care of cases where a load mask should be displayed under a floated component
+                zIndexStack.unshift(comp);
+            } else {
+                // the default behavior is to push onto the stack
+                zIndexStack.push(comp);
+            }
+
+            me.assignZIndices();
+
+            // Activate new topmost
+            if (!preventFocus) {
+                me._activateLast();
+            }
+            result = true;
+            me.front = comp;
+            
+            // If new topmost is modal, ensure the mask is there
+            if (comp.modal) {
+                me._showModalMask(comp);
+            }
+        }
+        return result;
+    },
+
+    /**
+     * Sends the specified Component to the back of other active Components in this ZIndexManager.
+     * @param {String/Object} comp The id of the Component or a {@link Ext.Component} instance
+     * @return {Ext.Component} The Component
+     */
+    sendToBack : function(comp) {
+        var me = this;
+        
+        comp = me.get(comp);
+        Ext.Array.remove(me.zIndexStack, comp);
+        me.zIndexStack.unshift(comp);
+        me.assignZIndices();
+        this._activateLast();
+        return comp;
+    },
+
+    /**
+     * Hides all Components managed by this ZIndexManager.
+     */
+    hideAll : function() {
+        var list = this.list,
+            item,
+            id;
+            
+        for (id in list) {
+            if (list.hasOwnProperty(id)) {
+                item = list[id];
+                if (item.isComponent && item.isVisible()) {
+                    item.hide();
+                }
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Temporarily hides all currently visible managed Components. This is for when
+     * dragging a Window which may manage a set of floating descendants in its ZIndexManager;
+     * they should all be hidden just for the duration of the drag.
+     */
+    hide: function() {
+        var i = 0,
+            stack = this.zIndexStack,
+            len = stack.length,
+            comp;
+
+        this.tempHidden = [];
+        for (; i < len; i++) {
+            comp = stack[i];
+            if (comp.isVisible()) {
+                this.tempHidden.push(comp);
+                comp.el.hide();
+                comp.hidden = true;
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Restores temporarily hidden managed Components to visibility.
+     */
+    show: function() {
+        var i = 0,
+            tempHidden = this.tempHidden,
+            len = tempHidden ? tempHidden.length : 0,
+            comp;
+
+        for (; i < len; i++) {
+            comp = tempHidden[i];
+            comp.el.show();
+            comp.hidden = false;
+            comp.setPosition(comp.x, comp.y);
+        }
+        delete this.tempHidden;
+    },
+
+    /**
+     * Gets the currently-active Component in this ZIndexManager.
+     * @return {Ext.Component} The active Component
+     */
+    getActive : function() {
+        return this.front;
+    },
+
+    /**
+     * Returns zero or more Components in this ZIndexManager using the custom search function passed to this method.
+     * The function should accept a single {@link Ext.Component} reference as its only argument and should
+     * return true if the Component matches the search criteria, otherwise it should return false.
+     * @param {Function} fn The search function
+     * @param {Object} [scope] The scope (this reference) in which the function is executed.
+     * Defaults to the Component being tested. That gets passed to the function if not specified.
+     * @return {Array} An array of zero or more matching windows
+     */
+    getBy : function(fn, scope) {
+        var r = [],
+            i = 0,
+            stack = this.zIndexStack,
+            len = stack.length,
+            comp;
+
+        for (; i < len; i++) {
+            comp = stack[i];
+            if (fn.call(scope||comp, comp) !== false) {
+                r.push(comp);
+            }
+        }
+        return r;
+    },
+
+    /**
+     * Executes the specified function once for every Component in this ZIndexManager, passing each
+     * Component as the only parameter. Returning false from the function will stop the iteration.
+     * @param {Function} fn The function to execute for each item
+     * @param {Object} [scope] The scope (this reference) in which the function
+     * is executed. Defaults to the current Component in the iteration.
+     */
+    each : function(fn, scope) {
+        var list = this.list,
+            id,
+            comp;
+            
+        for (id in list) {
+            if (list.hasOwnProperty(id)) {
+                comp = list[id];
+                if (comp.isComponent && fn.call(scope || comp, comp) === false) {
+                    return;
+                }
+            }
+        }
+    },
+
+    /**
+     * Executes the specified function once for every Component in this ZIndexManager, passing each
+     * Component as the only parameter. Returning false from the function will stop the iteration.
+     * The components are passed to the function starting at the bottom and proceeding to the top.
+     * @param {Function} fn The function to execute for each item
+     * @param {Object} scope (optional) The scope (this reference) in which the function
+     * is executed. Defaults to the current Component in the iteration.
+     */
+    eachBottomUp: function (fn, scope) {
+        var stack = this.zIndexStack,
+            i = 0,
+            len = stack.length,
+            comp;
+
+        for (; i < len; i++) {
+            comp = stack[i];
+            if (comp.isComponent && fn.call(scope || comp, comp) === false) {
+                return;
+            }
+        }
+    },
+
+    /**
+     * Executes the specified function once for every Component in this ZIndexManager, passing each
+     * Component as the only parameter. Returning false from the function will stop the iteration.
+     * The components are passed to the function starting at the top and proceeding to the bottom.
+     * @param {Function} fn The function to execute for each item
+     * @param {Object} [scope] The scope (this reference) in which the function
+     * is executed. Defaults to the current Component in the iteration.
+     */
+    eachTopDown: function (fn, scope) {
+        var stack = this.zIndexStack,
+            i = stack.length,
+            comp;
+
+        for (; i-- > 0; ) {
+            comp = stack[i];
+            if (comp.isComponent && fn.call(scope || comp, comp) === false) {
+                return;
+            }
+        }
+    },
+
+    destroy: function() {
+        var me   = this,
+            list = me.list,
+            comp,
+            id;
+
+        for (id in list) {
+            if (list.hasOwnProperty(id)) {
+                comp = list[id];
+
+                if (comp.isComponent) {
+                    comp.destroy();
+                }
+            }
+        }
+
+        delete me.zIndexStack;
+        delete me.list;
+        delete me.container;
+        delete me.targetEl;
+    }
+}, function() {
+    /**
+     * @class Ext.WindowManager
+     * @extends Ext.ZIndexManager
+     *
+     * The default global floating Component group that is available automatically.
+     *
+     * This manages instances of floating Components which were rendered programatically without
+     * being added to a {@link Ext.container.Container Container}, and for floating Components
+     * which were added into non-floating Containers.
+     * 
+     * *Floating* Containers create their own instance of ZIndexManager, and floating Components
+     * added at any depth below there are managed by that ZIndexManager.
+     *
+     * @singleton
+     */
+    Ext.WindowManager = Ext.WindowMgr = new this();
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ * A mixin for providing query related methods for {@link Ext.ComponentQuery} for components that
+ * implement getRefItems.
+ */
+Ext.define('Ext.Queryable', {
+    
+    isQueryable: true,
+    
+    /**
+     * Retrieves all descendant components which match the passed selector.
+     * Executes an Ext.ComponentQuery.query using this container as its root.
+     * @param {String} [selector] Selector complying to an Ext.ComponentQuery selector.
+     * If no selector is specified all items will be returned.
+     * @return {Ext.Component[]} Components which matched the selector
+     */
+    query : function(selector) {
+        selector = selector || '*';
+        return Ext.ComponentQuery.query(selector, this);
+    },
+    
+    /**
+     * Retrieves all descendant components which match the passed function.
+     * The function should return false for components that are to be
+     * excluded from the selection.
+     * @param {Function} fn The matcher function. It will be called with a single argument,
+     * the component being tested.
+     * @param {Object} [scope] The scope in which to run the function. If not specified,
+     * it will default to the active component.
+     * @return {Ext.Component[]} Components matched by the passed function
+     */
+    queryBy: function(fn, scope) {
+        var out = [],
+            items = this.getRefItems(true),
+            i = 0,
+            len = items.length,
+            item;
+            
+        for (; i < len; ++i) {
+            item = items[i];
+            if (fn.call(scope || item, item) !== false) {
+                out.push(item);
+            }
+        }
+        return out;
+    },
+    
+    /**
+     * Finds a component at any level under this container matching the id/itemId.
+     * This is a shorthand for calling ct.down('#' + id);
+     * @param {String} id The id to find
+     * @return {Ext.Component} The matching id, null if not found
+     */
+    queryById: function(id){
+        return this.down('#' + id);
+    },
+
+    /**
+     * Retrieves the first direct child of this container which matches the passed selector or component.
+     * The passed in selector must comply with an Ext.ComponentQuery selector, or it can be an actual Ext.Component.
+     * @param {String/Ext.Component} [selector] An Ext.ComponentQuery selector. If no selector is
+     * specified, the first child will be returned.
+     * @return Ext.Component The matching child Ext.Component (or `null` if no match was found).
+     */
+    child: function (selector) {
+        if (selector && selector.isComponent) {
+            selector = '#' + Ext.escapeId(selector.getItemId());
+        }
+
+        selector = selector || '';
+        return this.query('> ' + selector)[0] || null;
+    },
+    
+    /**
+     * Retrieves the first descendant of this container which matches the passed selector.
+     * The passed in selector must comply with an Ext.ComponentQuery selector, or it can be an actual Ext.Component.
+     * @param {String/Ext.Component} [selector] An Ext.ComponentQuery selector or Ext.Component. If no selector is
+     * specified, the first child will be returned.
+     * @return Ext.Component The matching descendant Ext.Component (or `null` if no match was found).
+     */
+    down: function (selector) {
+        if (selector && selector.isComponent) {
+            selector = '#' + Ext.escapeId(selector.getItemId());
+        }
+
+        selector = selector || '';
+        return this.query(selector)[0] || null;
+    },
+    
+    getRefItems: function(){
+        return [];
+    }
+        
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * An abstract base class which provides shared methods for Containers across the Sencha product line.
+ *
+ * Please refer to sub class's documentation
+ *
+ * @private
+ */
+Ext.define('Ext.container.AbstractContainer', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.Component ,
+
+               
+                                   
+                                    
+                           
+      
+    
+    mixins: {
+        queryable:  Ext.Queryable 
+    },
+
+    /* End Definitions */
+
+    renderTpl: '{%this.renderContainer(out,values)%}',
+
+    /**
+     * @cfg {Ext.enums.Layout/Object} layout
+     * **Important**: In order for child items to be correctly sized and
+     * positioned, typically a layout manager **must** be specified through
+     * the `layout` configuration option.
+     *
+     * The sizing and positioning of child {@link #cfg-items} is the responsibility of
+     * the Container's layout manager which creates and manages the type of layout
+     * you have in mind.  For example:
+     *
+     * If the layout configuration is not explicitly specified for
+     * a general purpose container (e.g. Container or Panel) the
+     * {@link Ext.layout.container.Auto default layout manager} will be used
+     * which does nothing but render child components sequentially into the
+     * Container (no sizing or positioning will be performed in this situation).
+     *
+     * **layout** may be specified as either as an Object or as a String:
+     *
+     * ## Specify as an Object
+     *
+     * Example usage:
+     *
+     *     layout: {
+     *         type: 'vbox',
+     *         align: 'left'
+     *     }
+     *
+     *   - **type**
+     *
+     *     The layout type to be used for this container.  If not specified,
+     *     a default {@link Ext.layout.container.Auto} will be created and used.
+     *
+     *     Valid layout <code>type</code> values are listed in {@link Ext.enums.Layout}.
+     *
+     *   - Layout specific configuration properties
+     *
+     *     Additional layout specific configuration properties may also be
+     *     specified. For complete details regarding the valid config options for
+     *     each layout type, see the layout class corresponding to the `type`
+     *     specified.
+     *
+     * ## Specify as a String
+     *
+     * Example usage:
+     *
+     *     layout: 'vbox'
+     *
+     *   - **layout**
+     *
+     *     The layout `type` to be used for this container (see {@link Ext.enums.Layout}
+     *     for list of valid values).
+     *
+     *     Additional layout specific configuration properties. For complete
+     *     details regarding the valid config options for each layout type, see the
+     *     layout class corresponding to the `layout` specified.
+     *
+     * ## Configuring the default layout type
+     *
+     * If a certain Container class has a default layout (For example a {@link Ext.toolbar.Toolbar Toolbar}
+     * with a default `Box` layout), then to simply configure the default layout,
+     * use an object, but without the `type` property:
+     *
+     *
+     *     xtype: 'toolbar',
+     *     layout: {
+     *         pack: 'center'
+     *     }
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String/Number} activeItem
+     * A string component id or the numeric index of the component that should be
+     * initially activated within the container's layout on render.  For example,
+     * activeItem: 'item-1' or activeItem: 0 (index 0 = the first item in the
+     * container's collection).  activeItem only applies to layout styles that can
+     * display items one at a time (like {@link Ext.layout.container.Card} and
+     * {@link Ext.layout.container.Fit}).
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {Object/Object[]} items
+     * A single item, or an array of child Components to be added to this container
+     *
+     * **Unless configured with a {@link #layout}, a Container simply renders child
+     * Components serially into its encapsulating element and performs no sizing or
+     * positioning upon them.**
+     *
+     * Example:
+     *
+     *     // specifying a single item
+     *     items: {...},
+     *     layout: 'fit',    // The single items is sized to fit
+     *      
+     *     // specifying multiple items
+     *     items: [{...}, {...}],
+     *     layout: 'hbox', // The items are arranged horizontally
+     *
+     * Each item may be:
+     *
+     * - A {@link Ext.Component Component}
+     * - A Component configuration object
+     *
+     * If a configuration object is specified, the actual type of Component to be
+     * instantiated my be indicated by using the {@link Ext.Component#xtype xtype} option.
+     *
+     * Every Component class has its own {@link Ext.Component#xtype xtype}.
+     *
+     * If an {@link Ext.Component#xtype xtype} is not explicitly specified, the
+     * {@link #defaultType} for the Container is used, which by default is usually `panel`.
+     *
+     * # Notes:
+     *
+     * Ext uses lazy rendering. Child Components will only be rendered
+     * should it become necessary. Items are automatically laid out when they are first
+     * shown (no sizing is done while hidden), or in response to a {@link #doLayout} call.
+     *
+     * Do not specify {@link Ext.panel.Panel#contentEl contentEl} or
+     * {@link Ext.panel.Panel#html html} with `items`.
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {Object/Function} defaults
+     * This option is a means of applying default settings to all added items whether added
+     * through the {@link #cfg-items} config or via the {@link #method-add} or {@link #insert} methods.
+     *
+     * Defaults are applied to both config objects and instantiated components conditionally
+     * so as not to override existing properties in the item (see {@link Ext#applyIf}).
+     *
+     * If the defaults option is specified as a function, then the function will be called
+     * using this Container as the scope (`this` reference) and passing the added item as
+     * the first parameter. Any resulting object from that call is then applied to the item
+     * as default properties.
+     *
+     * For example, to automatically apply padding to the body of each of a set of
+     * contained {@link Ext.panel.Panel} items, you could pass:
+     * `defaults: {bodyStyle:'padding:15px'}`.
+     *
+     * Usage:
+     *
+     *     defaults: { // defaults are applied to items, not the container
+     *         autoScroll: true
+     *     },
+     *     items: [
+     *         // default will not be applied here, panel1 will be autoScroll: false
+     *         {
+     *             xtype: 'panel',
+     *             id: 'panel1',
+     *             autoScroll: false
+     *         },
+     *         // this component will have autoScroll: true
+     *         new Ext.panel.Panel({
+     *             id: 'panel2'
+     *         })
+     *     ]
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {Boolean} suspendLayout
+     * If true, suspend calls to doLayout. Useful when batching multiple adds to a container
+     * and not passing them as multiple arguments or an array.
+     */
+    suspendLayout : false,
+
+    /**
+     * @cfg {Boolean} [autoDestroy=true]
+     * If true the container will automatically destroy any contained component that is removed
+     * from it, else destruction must be handled manually.
+     * @since 2.3.0
+     */
+    autoDestroy : true,
+
+     /**
+      * @cfg {String} [defaultType="panel"]
+      * The default {@link Ext.Component xtype} of child Components to create in this Container when
+      * a child item is specified as a raw configuration object, rather than as an instantiated Component.
+      * @since 2.3.0
+      */
+    defaultType: 'panel',
+    
+    /**
+     * @cfg {Boolean} [detachOnRemove=true]
+     * True to move any component to the {@link Ext#getDetachedBody detachedBody} when the component is
+     * removed from this container. This option is only applicable when the component is not destroyed while
+     * being removed, see {@link #autoDestroy} and {@link #method-remove}. If this option is set to false, the DOM
+     * of the component will remain in the current place until it is explicitly moved.
+     */
+    detachOnRemove: true,
+
+    /*
+     * @property {Boolean} isContainer
+     * `true` in this class to identify an object as an instantiated Container, or subclass thereof.
+     */
+    isContainer : true,
+
+    /**
+     * @property {Number} layoutCounter
+     * The number of container layout calls made on this object.
+     * @private
+     */
+    layoutCounter : 0,
+
+    baseCls: Ext.baseCSSPrefix + 'container',
+
+    /**
+     * @cfg {String[]} bubbleEvents
+     * An array of events that, when fired, should be bubbled to any parent container.
+     * See {@link Ext.util.Observable#enableBubble}.
+     * @since 3.4.0
+     */
+
+    defaultLayoutType: 'auto',
+
+    // @private
+    initComponent : function(){
+        var me = this;
+        me.addEvents(
+            /**
+             * @event afterlayout
+             * Fires when the components in this container are arranged by the associated layout manager.
+             * @param {Ext.container.Container} this
+             * @param {Ext.layout.container.Container} layout The ContainerLayout implementation for this container
+             * @since 2.3.0
+             */
+            'afterlayout',
+            /**
+             * @event beforeadd
+             * Fires before any {@link Ext.Component} is added or inserted into the container.
+             * A handler can return false to cancel the add.
+             * @param {Ext.container.Container} this
+             * @param {Ext.Component} component The component being added
+             * @param {Number} index The index at which the component will be added to the container's items collection
+             * @since 2.3.0
+             */
+            'beforeadd',
+            /**
+             * @event beforeremove
+             * Fires before any {@link Ext.Component} is removed from the container.  A handler can return
+             * false to cancel the remove.
+             * @param {Ext.container.Container} this
+             * @param {Ext.Component} component The component being removed
+             * @since 2.3.0
+             */
+            'beforeremove',
+            /**
+             * @event add
+             * Fires after any {@link Ext.Component} is added or inserted into the container.
+             * 
+             * **This event bubbles:** 'add' will also be fired when Component is added to any of
+             * the child containers or their childern or ...
+             * @param {Ext.container.Container} this
+             * @param {Ext.Component} component The component that was added
+             * @param {Number} index The index at which the component was added to the container's items collection
+             * @since 2.3.0
+             */
+            'add',
+            /**
+             * @event remove
+             * Fires after any {@link Ext.Component} is removed from the container.
+             *
+             * **This event bubbles:** 'remove' will also be fired when Component is removed from any of
+             * the child containers or their children or ...
+             * @param {Ext.container.Container} this
+             * @param {Ext.Component} component The component that was removed
+             * @since 2.3.0
+             */
+            'remove'
+        );
+
+        me.callParent();
+
+        me.getLayout();
+        me.initItems();
+    },
+
+    // @private
+    initItems : function() {
+        var me = this,
+            items = me.items;
+
+        /**
+         * The MixedCollection containing all the child items of this container.
+         * @property items
+         * @type Ext.util.AbstractMixedCollection
+         * @since 2.3.0
+         */
+        me.items = new Ext.util.AbstractMixedCollection(false, me.getComponentId);
+        me.floatingItems = new Ext.util.MixedCollection(false, me.getComponentId);
+
+        if (items) {
+            if (!Ext.isArray(items)) {
+                items = [items];
+            }
+
+            me.add(items);
+        }
+    },
+
+    /**
+     * @private
+     * Returns the focus holder element associated with this Container. By default, this is the Container's target
+     * element. Subclasses which use embedded focusable elements (such as Window and Button) should override this for use
+     * by the {@link #method-focus} method.
+     * @returns {Ext.Element} the focus holding element.
+     */
+    getFocusEl: function() {
+        return this.getTargetEl();
+    },
+
+    finishRenderChildren: function () {
+        this.callParent();
+
+        var layout = this.getLayout();
+
+        if (layout) {
+            layout.finishRender();
+        }
+    },
+
+    beforeRender: function () {
+        var me = this,
+            layout = me.getLayout(),
+            targetCls;
+
+        me.callParent();
+
+        if (!layout.initialized) {
+            layout.initLayout();
+        }
+
+        targetCls = layout.targetCls;
+
+        if (targetCls) {
+            me.applyTargetCls(targetCls);
+        }
+    },
+
+    // The targetCls is a CSS class that the layout needs added to the targetEl. The targetEl is where the container's
+    // children are rendered and is usually just the main el. Some containers (e.g. panels) use a body instead.
+    //
+    // In general, if a class overrides getTargetEl it will also need to override this method. This is necessary to
+    // avoid a post-render step to add the targetCls.
+    applyTargetCls: function(targetCls) {
+        this.addCls(targetCls);
+    },
+
+    afterComponentLayout: function() {
+        var floaters = this.floatingItems.items,
+            floaterCount = floaters.length,
+            i, floater
+            
+        this.callParent(arguments);
+
+        // Contained, unrendered, autoShow items must be shown upon next layout of the Container
+        for (i = 0; i < floaterCount; i++) {
+            floater = floaters[i];
+            if (!floater.rendered && floater.autoShow) {
+                floater.show();
+            }
+        }
+    },
+
+    onPosition: function() {
+        this.callParent(arguments);
+        this.repositionFloatingItems();
+    },
+
+    onResize: function() {
+        this.callParent(arguments);
+        this.repositionFloatingItems();
+    },
+
+    repositionFloatingItems: function() {
+        var floaters = this.floatingItems.items,
+            floaterCount = floaters.length,
+            i, floater;
+
+        // Ensure correct positioning of floated children before calling superclass
+        for (i = 0; i < floaterCount; i++) {
+            floater = floaters[i];
+            if (floater.el && !floater.hidden) {
+                floater.setPosition(floater.x, floater.y);
+            }
+        }
+    },
+
+    setupRenderTpl: function (renderTpl) {
+        this.callParent(arguments);
+        this.getLayout().setupRenderTpl(renderTpl);
+    },
+    
+    // @private
+    getDefaultContentTarget: function() {
+        return this.el;
+    },
+    
+    // @private
+    getContentTarget: function(){
+        return this.getLayout().getContentTarget();
+    },
+
+    // @private
+    setLayout : function(layout) {
+        var currentLayout = this.layout;
+
+        if (currentLayout && currentLayout.isLayout && currentLayout != layout) {
+            currentLayout.setOwner(null);
+        }
+
+        this.layout = layout;
+        layout.setOwner(this);
+    },
+
+    /**
+     * Returns the {@link Ext.layout.container.Container layout} instance currently associated with this Container.
+     * If a layout has not been instantiated yet, that is done first
+     * @return {Ext.layout.container.Container} The layout
+     */
+    getLayout : function() {
+        var me = this;
+        if (!me.layout || !me.layout.isLayout) {
+            // Pass any configured in layout property, defaulting to the prototype's layout property, falling back to Auto.
+            me.setLayout(Ext.layout.Layout.create(me.layout, me.self.prototype.layout || me.defaultLayoutType));
+        }
+
+        return me.layout;
+    },
+
+    /**
+     * Manually force this container's layout to be recalculated. The framework uses this internally to refresh layouts
+     * form most cases.
+     * @return {Ext.container.Container} this
+     * @since 2.3.0
+     */
+    doLayout : function() {
+        this.updateLayout();
+        return this;
+    },
+
+    /**
+     * Invoked after the Container has laid out (and rendered if necessary)
+     * its child Components.
+     *
+     * @param {Ext.layout.container.Container} layout
+     *
+     * @template
+     * @protected
+     */
+    afterLayout : function(layout) {
+        var me = this;
+        ++me.layoutCounter;
+        if (me.hasListeners.afterlayout) {
+            me.fireEvent('afterlayout', me, layout);
+        }
+    },
+
+    // @private
+    prepareItems : function(items, applyDefaults) {
+        // Create an Array which does not refer to the passed array.
+        // The passed array is a reference to a user's config object and MUST NOT be mutated.
+        if (Ext.isArray(items)) {
+            items = items.slice();
+        } else {
+            items = [items];
+        }
+
+        // Make sure defaults are applied and item is initialized
+        var me = this,
+            i = 0,
+            len = items.length,
+            item;
+
+        for (; i < len; i++) {
+            item = items[i];
+            if (item == null) {
+                Ext.Array.erase(items, i, 1);
+                --i;
+                --len;
+            } else {
+                if (applyDefaults) {
+                    item = this.applyDefaults(item);
+                }
+
+                // Tell the item we're in a container during construction
+                item.isContained = me;
+                items[i] = me.lookupComponent(item);
+                // need to delete both in case item was a config
+                delete item.isContained;
+                delete items[i].isContained;
+            }
+        }
+
+        return items;
+    },
+
+    // @private
+    applyDefaults : function(config) {
+        var defaults = this.defaults;
+
+        if (defaults) {
+            if (Ext.isFunction(defaults)) {
+                defaults = defaults.call(this, config);
+            }
+
+            if (Ext.isString(config)) {
+                config = Ext.ComponentManager.get(config);
+            }
+            Ext.applyIf(config, defaults);
+        }
+        return config;
+    },
+
+    // @private
+    lookupComponent : function(comp) {
+        return (typeof comp == 'string') ? Ext.ComponentManager.get(comp)
+                                         : Ext.ComponentManager.create(comp, this.defaultType);
+    },
+
+    // @private - used as the key lookup function for the items collection
+    getComponentId : function(comp) {
+        return comp.getItemId && comp.getItemId();
+    },
+
+    /**
+     * Adds {@link Ext.Component Component}(s) to this Container.
+     *
+     * ## Description:
+     *
+     * - Fires the {@link #beforeadd} event before adding.
+     * - The Container's {@link #defaults default config values} will be applied
+     *   accordingly (see `{@link #defaults}` for details).
+     * - Fires the `{@link #event-add}` event after the component has been added.
+     *
+     * ## Notes:
+     *
+     * If the Container is __already rendered__ when `add`
+     * is called, it will render the newly added Component into its content area.
+     *
+     * **If** the Container was configured with a size-managing {@link #layout} manager,
+     * the Container will recalculate its internal layout at this time too.
+     *  
+     * Note that the default layout manager simply renders child Components sequentially
+     * into the content area and thereafter performs no sizing.
+     *  
+     * If adding multiple new child Components, pass them as an array to the `add` method,
+     * so that only one layout recalculation is performed.
+     *  
+     *     tb = new {@link Ext.toolbar.Toolbar}({
+     *         renderTo: document.body
+     *     });  // toolbar is rendered
+     *     // add multiple items.
+     *     // ({@link #defaultType} for {@link Ext.toolbar.Toolbar Toolbar} is 'button')
+     *     tb.add([{text:'Button 1'}, {text:'Button 2'}]);
+     *
+     * To inject components between existing ones, use the {@link #insert} method.
+     *
+     * ## Warning:
+     *
+     * Components directly managed by the BorderLayout layout manager may not be removed
+     * or added.  See the Notes for {@link Ext.layout.container.Border BorderLayout} for
+     * more details.
+     *
+     * @param {Ext.Component[]|Object[]/Ext.Component.../Object...} component
+     * Either one or more Components to add or an Array of Components to add.
+     * See `{@link #cfg-items}` for additional information.
+     *
+     * @return {Ext.Component[]/Ext.Component} The Components that were added.
+     *
+     * @since 2.3.0
+     */
+    add : function() {
+        var me = this,
+            args = Ext.Array.slice(arguments),
+            index = (typeof args[0] == 'number') ? args.shift() : -1,
+            layout = me.getLayout(),
+            addingArray, items, i, length, item, pos, ret;
+
+        if (args.length == 1 && Ext.isArray(args[0])) {
+            items = args[0];
+            addingArray = true;
+        } else {
+            items = args;
+        }
+
+        if (me.rendered) {
+            Ext.suspendLayouts(); // suspend layouts while adding items...
+        }
+
+        ret = items = me.prepareItems(items, true);
+        length = items.length;
+
+        if (!addingArray && length == 1) { // an array of 1 should still return an array...
+            ret = items[0];
+        }
+
+        // loop
+        for (i = 0; i < length; i++) {
+            item = items[i];
+            if (!item) {
+                Ext.Error.raise("Cannot add null item to Container with itemId/id: " + me.getItemId());
+            }
+
+            pos = (index < 0) ? me.items.length : (index + i);
+
+            // Floating Components are not added into the items collection, but to a separate floatingItems collection
+            if (item.floating) {
+                me.floatingItems.add(item);
+                item.onAdded(me, pos);
+
+                if (me.hasListeners.add) {
+                    me.fireEvent('add', me, item, pos);
+                }
+            } else if ((!me.hasListeners.beforeadd || me.fireEvent('beforeadd', me, item, pos) !== false) && me.onBeforeAdd(item) !== false) {
+                me.items.insert(pos, item);
+                item.onAdded(me, pos);
+                me.onAdd(item, pos);
+                layout.onAdd(item, pos);
+
+                if (me.hasListeners.add) {
+                    me.fireEvent('add', me, item, pos);
+                }
+            }
+        }
+
+        // We need to update our layout after adding all passed items
+        me.updateLayout();
+        if (me.rendered) {
+            Ext.resumeLayouts(true);
+        }
+
+        return ret;
+    },
+
+    /**
+     * This method is invoked after a new Component has been added. It
+     * is passed the Component which has been added. This method may
+     * be used to update any internal structure which may depend upon
+     * the state of the child items.
+     *
+     * @param {Ext.Component} component
+     * @param {Number} position
+     *
+     * @template
+     * @protected
+     */
+    onAdd : Ext.emptyFn,
+
+    /**
+     * This method is invoked after a new Component has been
+     * removed. It is passed the Component which has been
+     * removed. This method may be used to update any internal
+     * structure which may depend upon the state of the child items.
+     *
+     * @param {Ext.Component} component
+     * @param {Boolean} autoDestroy
+     *
+     * @template
+     * @protected
+     */
+    onRemove : Ext.emptyFn,
+
+    /**
+     * Inserts a Component into this Container at a specified index. Fires the
+     * {@link #beforeadd} event before inserting, then fires the {@link #event-add}
+     * event after the Component has been inserted.
+     *
+     * @param {Number} index The index at which the Component will be inserted
+     * into the Container's items collection
+     *
+     * @param {Ext.Component/Object} component The child Component to insert.
+     *
+     * Ext uses lazy rendering, and will only render the inserted Component should
+     * it become necessary.
+     *
+     * A Component config object may be passed in order to avoid the overhead of
+     * constructing a real Component object if lazy rendering might mean that the
+     * inserted Component will not be rendered immediately. To take advantage of
+     * this 'lazy instantiation', set the {@link Ext.Component#xtype} config
+     * property to the registered type of the Component wanted.
+     *
+     * For a list of all available xtypes, see {@link Ext.enums.Widget}.
+     *
+     * @return {Ext.Component} component The Component (or config object) that was
+     * inserted with the Container's default config values applied.
+     *
+     * @since 2.3.0
+     */
+    insert : function(index, comp) {
+        var compIdx;
+        if (comp && comp.isComponent) {
+            compIdx = this.items.indexOf(comp);
+            if (compIdx !== -1) {
+                return this.move(compIdx, index);
+            }
+        }
+        return this.add(index, comp);
+    },
+
+    /**
+     * Moves a Component within the Container
+     * @param {Number/Ext.Component} fromIdx The index/component to move.
+     * @param {Number} toIdx The new index for the Component.
+     * @return {Ext.Component} component The Component that was moved.
+     */
+    move : function(fromIdx, toIdx) {
+        var items = this.items,
+            item;
+            
+        if (fromIdx.isComponent) {
+            fromIdx = items.indexOf(fromIdx);
+        }
+        item = items.removeAt(fromIdx);
+        if (item === false) {
+            return false;
+        }
+        items.insert(toIdx, item);
+        this.onMove(item, fromIdx, toIdx);
+        this.updateLayout();
+        return item;
+    },
+    
+    onMove: Ext.emptyFn,
+
+    /**
+     * This method is invoked before adding a new child Component. It
+     * is passed the new Component, and may be used to modify the
+     * Component, or prepare the Container in some way. Returning
+     * false aborts the add operation.
+     *
+     * @param {Ext.Component} item
+     *
+     * @template
+     * @protected
+     */
+    onBeforeAdd : function(item) {
+        // Remove from current container if it's not us.
+        if (item.ownerCt && item.ownerCt !== this) {
+            item.ownerCt.remove(item, false);
+        }
+    },
+
+    /**
+     * Removes a component from this container.  Fires the {@link #beforeremove} event
+     * before removing, then fires the {@link #event-remove} event after the component has
+     * been removed.
+     *
+     * @param {Ext.Component/String} component The component reference or id to remove.
+     *
+     * @param {Boolean} [autoDestroy] True to automatically invoke the removed Component's
+     * {@link Ext.Component#method-destroy} function.
+     *
+     * Defaults to the value of this Container's {@link #autoDestroy} config.
+     *
+     * @return {Ext.Component} component The Component that was removed.
+     * @since 2.3.0
+     */
+    remove : function(comp, autoDestroy) {
+        var me = this,
+            c = me.getComponent(comp);
+            if (Ext.isDefined(Ext.global.console) && !c) {
+                Ext.global.console.warn("Attempted to remove a component that does not exist. Ext.container.Container: remove takes an argument of the component to remove. cmp.remove() is incorrect usage.");
+            }
+
+        if (c && (!me.hasListeners.beforeremove || me.fireEvent('beforeremove', me, c) !== false)) {
+            me.doRemove(c, autoDestroy);
+            if (me.hasListeners.remove) {
+                me.fireEvent('remove', me, c);
+            }
+
+            if (!me.destroying && !c.floating) {
+                me.updateLayout();
+            }
+        }
+
+        return c;
+    },
+
+    // @private
+    doRemove : function(component, doDestroy) {
+        // Ensure the flag is set correctly
+        doDestroy = doDestroy === true || (doDestroy !== false && this.autoDestroy);
+
+        var me = this,
+            layout = me.layout,
+            hasLayout = layout && me.rendered,
+
+            // isDestroying flag is true if the removal is taking place as part of destruction, OR if removal is intended to *cause* destruction
+            isDestroying = component.destroying || doDestroy,
+            floating = component.floating;
+
+        if (floating) {
+            me.floatingItems.remove(component);
+        } else {
+            me.items.remove(component);
+        }
+
+        // Inform ownerLayout of removal before deleting the ownerLayout & ownerCt references in the onRemoved call
+        if (hasLayout && !floating) {
+            // Removing a component from a running layout has to cancel the layout
+            if (layout.running) {
+                Ext.AbstractComponent.cancelLayout(component, isDestroying);
+            }
+            layout.onRemove(component, isDestroying);
+        }
+
+        component.onRemoved(isDestroying);
+
+        me.onRemove(component, isDestroying);
+
+        // Destroy if we were explicitly told to, or we're defaulting to our autoDestroy configuration
+        if (doDestroy) {
+            component.destroy();
+        }
+        // Only have the layout perform remove postprocessing if the Component is not being destroyed
+        else {
+            if (hasLayout && !floating) {
+                layout.afterRemove(component);       
+            }
+            if (me.detachOnRemove && component.rendered) {
+                me.detachComponent(component);
+            }
+        }
+    },
+    
+    // Detach a component from the DOM
+    detachComponent: function(component){
+        Ext.getDetachedBody().appendChild(component.getEl());
+    },
+
+    /**
+     * Removes all components from this container.
+     * @param {Boolean} [autoDestroy] True to automatically invoke the removed
+     * Component's {@link Ext.Component#method-destroy} function.
+     * Defaults to the value of this Container's {@link #autoDestroy} config.
+     * @return {Ext.Component[]} Array of the removed components
+     * @since 2.3.0
+     */
+    removeAll : function(autoDestroy) {
+        var me = this,
+            removeItems = me.items.items.slice().concat(me.floatingItems.items),
+            items = [],
+            i = 0,
+            len = removeItems.length,
+            item;
+
+        // Suspend Layouts while we remove multiple items from the container
+        me.suspendLayouts();
+        for (; i < len; i++) {
+            item = removeItems[i];
+            me.remove(item, autoDestroy);
+
+            if (item.ownerCt !== me) {
+                items.push(item);
+            }
+        }
+
+        // Resume Layouts now that all items have been removed and do a single layout (if we removed anything!)
+        me.resumeLayouts(!!len);
+        return items;
+    },
+
+    /**
+     * @protected
+     * Used by {@link Ext.ComponentQuery ComponentQuery}, {@link #child} and {@link #down} to retrieve all of the items
+     * which can potentially be considered a child of this Container.
+     * 
+     * This may be overriden by Components which have ownership of Components
+     * that are not contained in the {@link #property-items} collection.
+     *
+     * NOTE: IMPORTANT note for maintainers:
+     * Items are returned in tree traversal order. Each item is appended to the result array
+     * followed by the results of that child's getRefItems call.
+     * Floating child items are appended after internal child items.
+     */
+    getRefItems : function(deep) {
+        var me = this,
+            items = me.items.items,
+            len = items.length,
+            i = 0,
+            item,
+            result = [];
+
+        for (; i < len; i++) {
+            item = items[i];
+            result[result.length] = item;
+            if (deep && item.getRefItems) {
+                result.push.apply(result, item.getRefItems(true));
+            }
+        }
+
+        // Append floating items to the list.
+        items = me.floatingItems.items;
+        len = items.length;
+        for (i = 0; i < len; i++) {
+            item = items[i];
+            result[result.length] = item;
+            if (deep && item.getRefItems) {
+                result.push.apply(result, item.getRefItems(true));
+            }
+        }
+
+        return result;
+    },
+
+    /**
+     * Cascades down the component/container heirarchy from this component (passed in
+     * the first call), calling the specified function with each component. The scope
+     * (this reference) of the function call will be the scope provided or the current
+     * component. The arguments to the function will be the args provided or the current
+     * component. If the function returns false at any point, the cascade is stopped on
+     * that branch.
+     * @param {Function} fn The function to call
+     * @param {Object} [scope] The scope of the function (defaults to current component)
+     * @param {Array} [args] The args to call the function with. The current component
+     * always passed as the last argument.
+     * @return {Ext.Container} this
+     * @since 2.3.0
+     */
+    cascade : function(fn, scope, origArgs){
+        var me = this,
+            cs = me.items ? me.items.items : [],
+            len = cs.length,
+            i = 0,
+            c,
+            args = origArgs ? origArgs.concat(me) : [me],
+            componentIndex = args.length - 1;
+
+        if (fn.apply(scope || me, args) !== false) {
+            for (; i < len; i++){
+                c = cs[i];
+                if (c.cascade) {
+                    c.cascade(fn, scope, origArgs);
+                } else {
+                    args[componentIndex] = c;
+                    fn.apply(scope || cs, args);
+                }
+            }
+        }
+        return this;
+    },
+
+    /**
+     * Determines whether **this Container** is an ancestor of the passed Component.
+     * This will return `true` if the passed Component is anywhere within the subtree
+     * beneath this Container.
+     * @param {Ext.Component} possibleDescendant The Component to test for presence
+     * within this Container's subtree.
+     */
+    isAncestor: function(possibleDescendant) {
+        while (possibleDescendant) {
+            if (possibleDescendant.ownerCt === this) {
+                return true;
+            }
+            possibleDescendant = possibleDescendant.ownerCt;
+        }
+    },
+
+    /**
+     * Examines this container's {@link #property-items} **property** and gets a direct child
+     * component of this container.
+     *
+     * @param {String/Number} comp This parameter may be any of the following:
+     *
+     * - a **String** : representing the {@link Ext.Component#itemId itemId}
+     *   or {@link Ext.Component#id id} of the child component.
+     * - a **Number** : representing the position of the child component
+     *   within the {@link #property-items} **property**
+     *
+     * For additional information see {@link Ext.util.MixedCollection#get}.
+     *
+     * @return {Ext.Component} The component (if found).
+     *
+     * @since 2.3.0
+     */
+    getComponent : function(comp) {
+        if (Ext.isObject(comp)) {
+            comp = comp.getItemId();
+        }
+        
+        var c = this.items.get(comp);
+             
+        // Only allow finding by index on the main items container
+        if (!c && typeof comp != 'number') {
+            c = this.floatingItems.get(comp);
+        }
+
+        return c;
+    },
+
+    /**
+     * Determines whether the passed Component is either an immediate child of this Container,
+     * or whether it is a descendant.
+     *
+     * @param {Ext.Component} comp The Component to test.
+     * @param {Boolean} [deep=false] Pass `true` to test for the Component being a descendant at any level.
+     * @return {Boolean} `true` if the passed Component is contained at the specified level.
+     */
+    contains: function(comp, deep) {
+        var result = false;
+        if (deep) {
+            this.cascade(function(c) {
+                // Only test if the item is a container
+                if (c.contains && c.contains(comp)) {
+                    result = true;
+                    return false;
+                }
+            });
+            return result;
+        } else {
+            return this.items.contains(comp) || this.floatingItems.contains(comp);
+        }
+    },
+
+    nextChild: function(child, selector) {
+        var me = this,
+            result,
+            childIndex = me.items.indexOf(child);
+
+        if (childIndex !== -1) {
+            result = selector ? Ext.ComponentQuery(selector, me.items.items.slice(childIndex + 1)) : me.items.getAt(childIndex + 1);
+            if (!result && me.ownerCt) {
+                result = me.ownerCt.nextChild(me, selector);
+            }
+        }
+        return result;
+    },
+
+    prevChild: function(child, selector) {
+        var me = this,
+            result,
+            childIndex = me.items.indexOf(child);
+
+        if (childIndex !== -1) {
+            result = selector ? Ext.ComponentQuery(selector, me.items.items.slice(childIndex + 1)) : me.items.getAt(childIndex + 1);
+            if (!result && me.ownerCt) {
+                result = me.ownerCt.nextChild(me, selector);
+            }
+        }
+        return result;
+    },
+
+    // @private
+    // Enable all immediate children that was previously disabled
+    // Override enable because onEnable only gets called when rendered
+    enable: function() {
+        this.callParent(arguments);
+
+        var itemsToDisable = this.getChildItemsToDisable(),
+            length         = itemsToDisable.length,
+            item, i;
+
+        for (i = 0; i < length; i++) {
+            item = itemsToDisable[i];
+
+            if (item.resetDisable) {
+                item.enable();
+            }
+        }
+
+        return this;
+    },
+
+    // Inherit docs
+    // Disable all immediate children that was previously disabled
+    // Override disable because onDisable only gets called when rendered
+    disable: function() {
+        this.callParent(arguments);
+
+        var itemsToDisable = this.getChildItemsToDisable(),
+            length         = itemsToDisable.length,
+            item, i;
+
+        for (i = 0; i < length; i++) {
+            item = itemsToDisable[i];
+
+            if (item.resetDisable !== false && !item.disabled) {
+                item.disable();
+                item.resetDisable = true;
+            }
+        }
+
+        return this;
+    },
+    
+    /**
+     * Gets a list of child components to enable/disable when the container is
+     * enabled/disabled
+     * @private
+     * @return {Ext.Component[]} Items to be enabled/disabled
+     */
+    getChildItemsToDisable: function(){
+        return this.query('[isFormField],button');
+    },
+
+    // @private
+    // @since 2.3.0
+    beforeDestroy : function() {
+        var me = this,
+            items = me.items,
+            floatingItems = me.floatingItems,
+            c;
+
+        if (items) {
+            while ((c = items.first())) {
+                me.doRemove(c, true);
+            }
+        }
+        
+        if (floatingItems) {
+            while ((c = floatingItems.first())) {
+                me.doRemove(c, true);
+            }
+        }
+
+        Ext.destroy(
+            me.layout
+        );
+        me.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Base class for any Ext.Component that may contain other Components. Containers handle the basic behavior of
+ * containing items, namely adding, inserting and removing items.
+ *
+ * The most commonly used Container classes are Ext.panel.Panel, Ext.window.Window and
+ * Ext.tab.Panel. If you do not need the capabilities offered by the aforementioned classes you can create a
+ * lightweight Container to be encapsulated by an HTML element to your specifications by using the
+ * {@link Ext.Component#autoEl autoEl} config option.
+ *
+ * The code below illustrates how to explicitly create a Container:
+ *
+ *     @example
+ *     // Explicitly create a Container
+ *     Ext.create('Ext.container.Container', {
+ *         layout: {
+ *             type: 'hbox'
+ *         },
+ *         width: 400,
+ *         renderTo: Ext.getBody(),
+ *         border: 1,
+ *         style: {borderColor:'#000000', borderStyle:'solid', borderWidth:'1px'},
+ *         defaults: {
+ *             labelWidth: 80,
+ *             // implicitly create Container by specifying xtype
+ *             xtype: 'datefield',
+ *             flex: 1,
+ *             style: {
+ *                 padding: '10px'
+ *             }
+ *         },
+ *         items: [{
+ *             xtype: 'datefield',
+ *             name: 'startDate',
+ *             fieldLabel: 'Start date'
+ *         },{
+ *             xtype: 'datefield',
+ *             name: 'endDate',
+ *             fieldLabel: 'End date'
+ *         }]
+ *     });
+ *
+ * ## Layout
+ *
+ * Container classes delegate the rendering of child Components to a layout manager class which must be configured into
+ * the Container using the `{@link #layout}` configuration property.
+ *
+ * When either specifying child `{@link #cfg-items}` of a Container, or dynamically {@link #method-add adding} Components to a
+ * Container, remember to consider how you wish the Container to arrange those child elements, and whether those child
+ * elements need to be sized using one of Ext's built-in `{@link #layout}` schemes. By default, Containers use the
+ * {@link Ext.layout.container.Auto Auto} scheme which only renders child components, appending them one after the other
+ * inside the Container, and **does not apply any sizing** at all.
+ *
+ * A common mistake is when a developer neglects to specify a `{@link #layout}` (e.g. widgets like GridPanels or
+ * TreePanels are added to Containers for which no `{@link #layout}` has been specified). If a Container is left to
+ * use the default {@link Ext.layout.container.Auto Auto} scheme, none of its child components will be resized, or changed in
+ * any way when the Container is resized.
+ *
+ * Certain layout managers allow dynamic addition of child components. Those that do include
+ * Ext.layout.container.Card, Ext.layout.container.Anchor, Ext.layout.container.VBox,
+ * Ext.layout.container.HBox, and Ext.layout.container.Table. For example:
+ *
+ *     //  Create the GridPanel.
+ *     var myNewGrid = Ext.create('Ext.grid.Panel', {
+ *         store: myStore,
+ *         headers: myHeaders,
+ *         title: 'Results', // the title becomes the title of the tab
+ *     });
+ *
+ *     myTabPanel.add(myNewGrid); // {@link Ext.tab.Panel} implicitly uses {@link Ext.layout.container.Card Card}
+ *     myTabPanel.{@link Ext.tab.Panel#setActiveTab setActiveTab}(myNewGrid);
+ *
+ * The example above adds a newly created GridPanel to a TabPanel. Note that a TabPanel uses {@link
+ * Ext.layout.container.Card} as its layout manager which means all its child items are sized to {@link
+ * Ext.layout.container.Fit fit} exactly into its client area.
+ *
+ * **_Overnesting is a common problem_**. An example of overnesting occurs when a GridPanel is added to a TabPanel by
+ * wrapping the GridPanel _inside_ a wrapping Panel (that has no `{@link #layout}` specified) and then add that
+ * wrapping Panel to the TabPanel. The point to realize is that a GridPanel **is** a Component which can be added
+ * directly to a Container. If the wrapping Panel has no `{@link #layout}` configuration, then the overnested
+ * GridPanel will not be sized as expected.
+ *
+ * ## Adding via remote configuration
+ *
+ * A server side script can be used to add Components which are generated dynamically on the server. An example of
+ * adding a GridPanel to a TabPanel where the GridPanel is generated by the server based on certain parameters:
+ *
+ *     // execute an Ajax request to invoke server side script:
+ *     Ext.Ajax.request({
+ *         url: 'gen-invoice-grid.php',
+ *         // send additional parameters to instruct server script
+ *         params: {
+ *             startDate: Ext.getCmp('start-date').getValue(),
+ *             endDate: Ext.getCmp('end-date').getValue()
+ *         },
+ *         // process the response object to add it to the TabPanel:
+ *         success: function(xhr) {
+ *             var newComponent = eval(xhr.responseText); // see discussion below
+ *             myTabPanel.add(newComponent); // add the component to the TabPanel
+ *             myTabPanel.setActiveTab(newComponent);
+ *         },
+ *         failure: function() {
+ *             Ext.Msg.alert("Grid create failed", "Server communication failure");
+ *         }
+ *     });
+ *
+ * The server script needs to return a JSON representation of a configuration object, which, when decoded will return a
+ * config object with an {@link Ext.Component#xtype xtype}. The server might return the following JSON:
+ *
+ *     {
+ *         "xtype": 'grid',
+ *         "title": 'Invoice Report',
+ *         "store": {
+ *             "model": 'Invoice',
+ *             "proxy": {
+ *                 "type": 'ajax',
+ *                 "url": 'get-invoice-data.php',
+ *                 "reader": {
+ *                     "type": 'json'
+ *                     "record": 'transaction',
+ *                     "idProperty": 'id',
+ *                     "totalRecords": 'total'
+ *                 })
+ *             },
+ *             "autoLoad": {
+ *                 "params": {
+ *                     "startDate": '01/01/2008',
+ *                     "endDate": '01/31/2008'
+ *                 }
+ *             }
+ *         },
+ *         "headers": [
+ *             {"header": "Customer", "width": 250, "dataIndex": 'customer', "sortable": true},
+ *             {"header": "Invoice Number", "width": 120, "dataIndex": 'invNo', "sortable": true},
+ *             {"header": "Invoice Date", "width": 100, "dataIndex": 'date', "renderer": Ext.util.Format.dateRenderer('M d, y'), "sortable": true},
+ *             {"header": "Value", "width": 120, "dataIndex": 'value', "renderer": 'usMoney', "sortable": true}
+ *         ]
+ *     }
+ *
+ * When the above code fragment is passed through the `eval` function in the success handler of the Ajax request, the
+ * result will be a config object which, when added to a Container, will cause instantiation of a GridPanel. **Be sure
+ * that the Container is configured with a layout which sizes and positions the child items to your requirements.**
+ *
+ * **Note:** since the code above is _generated_ by a server script, the `autoLoad` params for the Store, the user's
+ * preferred date format, the metadata to allow generation of the Model layout, and the ColumnModel can all be generated
+ * into the code since these are all known on the server.
+ */
+Ext.define('Ext.container.Container', {
+    extend:  Ext.container.AbstractContainer ,
+    alias: 'widget.container',
+    alternateClassName: 'Ext.Container',
+
+    /**
+     * Return the immediate child Component in which the passed element is located.
+     * @param {Ext.Element/HTMLElement/String} el The element to test (or ID of element).
+     * @param {Boolean} deep If `true`, returns the deepest descendant Component which contains the passed element.
+     * @return {Ext.Component} The child item which contains the passed element.
+     */
+    getChildByElement: function(el, deep) {
+        var item,
+            itemEl,
+            i = 0,
+            it = this.getRefItems(),
+            ln = it.length;
+
+        el = Ext.getDom(el);
+        for (; i < ln; i++) {
+            item = it[i];
+            itemEl = item.getEl();
+            if (itemEl && ((itemEl.dom === el) || itemEl.contains(el))) {
+                return (deep && item.getChildByElement) ? item.getChildByElement(el, deep) : item;
+            }
+        }
+        return null;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Handles mapping key events to handling functions for an element or a Component. One KeyMap can be used for multiple
+ * actions.
+ *
+ * A KeyMap must be configured with a {@link #target} as an event source which may be an Element or a Component.
+ *
+ * If the target is an element, then the `keydown` event will trigger the invocation of {@link #binding}s.
+ *
+ * It is possible to configure the KeyMap with a custom {@link #eventName} to listen for. This may be useful when the
+ * {@link #target} is a Component.
+ *
+ * The KeyMap's event handling requires that the first parameter passed is a key event. So if the Component's event
+ * signature is different, specify a {@link #processEvent} configuration which accepts the event's parameters and
+ * returns a key event.
+ *
+ * Functions specified in {@link #binding}s are called with this signature : `(String key, Ext.EventObject e)` (if the
+ * match is a multi-key combination the callback will still be called only once). A KeyMap can also handle a string
+ * representation of keys. By default KeyMap starts enabled.
+ *
+ * Usage:
+ *
+ *     // map one key by key code
+ *     var map = new Ext.util.KeyMap({
+ *         target: "my-element",
+ *         key: 13, // or Ext.EventObject.ENTER
+ *         fn: myHandler,
+ *         scope: myObject
+ *     });
+ *
+ *     // map multiple keys to one action by string
+ *     var map = new Ext.util.KeyMap({
+ *         target: "my-element",
+ *         key: "a\r\n\t",
+ *         fn: myHandler,
+ *         scope: myObject
+ *     });
+ *
+ *     // map multiple keys to multiple actions by strings and array of codes
+ *     var map = new Ext.util.KeyMap({
+ *         target: "my-element",
+ *         binding: [{
+ *             key: [10,13],
+ *             fn: function(){ alert("Return was pressed"); }
+ *         }, {
+ *             key: "abc",
+ *             fn: function(){ alert('a, b or c was pressed'); }
+ *         }, {
+ *             key: "\t",
+ *             ctrl:true,
+ *             shift:true,
+ *             fn: function(){ alert('Control + shift + tab was pressed.'); }
+ *         }]
+ *     });
+ *
+ * Since 4.1.0, KeyMaps can bind to Components and process key-based events fired by Components.
+ *
+ * To bind to a Component, use the single parameter form of constructor and include the Component event name
+ * to listen for, and a `processEvent` implementation which returns the key event for further processing by
+ * the KeyMap:
+ *
+ *     var map = new Ext.util.KeyMap({
+ *         target: myGridView,
+ *         eventName: 'itemkeydown',
+ *         processEvent: function(view, record, node, index, event) {
+ *
+ *             // Load the event with the extra information needed by the mappings
+ *             event.view = view;
+ *             event.store = view.getStore();
+ *             event.record = record;
+ *             event.index = index;
+ *             return event;
+ *         },
+ *         binding: {
+ *             key: Ext.EventObject.DELETE,
+ *             fn: function(keyCode, e) {
+ *                 e.store.remove(e.record);
+ *
+ *                 // Attempt to select the record that's now in its place
+ *                 e.view.getSelectionModel().select(e.index);
+ *                 e.view.el.focus();
+ *             }
+ *         }
+ *     });
+ */
+Ext.define('Ext.util.KeyMap', {
+    alternateClassName: 'Ext.KeyMap',
+
+    /**
+     * @cfg {Ext.Component/Ext.Element/HTMLElement/String} target
+     * The object on which to listen for the event specified by the {@link #eventName} config option.
+     */
+
+    /**
+     * @cfg {Object/Object[][]} binding
+     * Either a single object describing a handling function for s specified key (or set of keys), or
+     * an array of such objects.
+     * @cfg {String/String[]} binding.key A single keycode or an array of keycodes to handle
+     * @cfg {Boolean}  binding.shift True to handle key only when shift is pressed, False to handle the
+     *  key only when shift is not pressed (defaults to undefined)
+     * @cfg {Boolean}  binding.ctrl True to handle key only when ctrl is pressed, False to handle the
+     *  key only when ctrl is not pressed (defaults to undefined)
+     * @cfg {Boolean}  binding.alt True to handle key only when alt is pressed, False to handle the key
+     *  only when alt is not pressed (defaults to undefined)
+     * @cfg {Function} binding.handler The function to call when KeyMap finds the expected key combination
+     * @cfg {Function} binding.fn Alias of handler (for backwards-compatibility)
+     * @cfg {Object}   binding.scope The scope of the callback function
+     * @cfg {String}   binding.defaultEventAction A default action to apply to the event. Possible values
+     *  are: stopEvent, stopPropagation, preventDefault. If no value is set no action is performed.
+     */
+
+    /**
+     * @cfg {Object} [processEventScope=this]
+     * The scope (`this` context) in which the {@link #processEvent} method is executed.
+     */
+
+    /**
+     * @cfg {Boolean} [ignoreInputFields=false]
+     * Configure this as `true` if there are any input fields within the {@link #target}, and this KeyNav
+     * should not process events from input fields, (`<input>, <textarea> and elements with `contentEditable="true"`)
+     */
+
+    /**
+     * @cfg {String} eventName
+     * The event to listen for to pick up key events.
+     */
+    eventName: 'keydown',
+
+    constructor: function(config) {
+        var me = this;
+
+        // Handle legacy arg list in which the first argument is the target.
+        // TODO: Deprecate in V5
+        if ((arguments.length !== 1) || (typeof config === 'string') || config.dom || config.tagName || config === document || config.isComponent) {
+            me.legacyConstructor.apply(me, arguments);
+            return;
+        }
+
+        Ext.apply(me, config);
+        me.bindings = [];
+
+        if (!me.target.isComponent) {
+            me.target = Ext.get(me.target);
+        }
+
+        if (me.binding) {
+            me.addBinding(me.binding);
+        } else if (config.key) {
+            me.addBinding(config);
+        }
+        me.enable();
+    },
+
+    /**
+     * @private
+     * Old constructor signature
+     * @param {String/HTMLElement/Ext.Element/Ext.Component} el The element or its ID, or Component to bind to
+     * @param {Object} binding The binding (see {@link #addBinding})
+     * @param {String} [eventName="keydown"] The event to bind to
+     */
+    legacyConstructor: function(el, binding, eventName){
+        var me = this;
+
+        Ext.apply(me, {
+            target: Ext.get(el),
+            eventName: eventName || me.eventName,
+            bindings: []
+        });
+        if (binding) {
+            me.addBinding(binding);
+        }
+        me.enable();
+    },
+
+    /**
+     * Add a new binding to this KeyMap.
+     *
+     * Usage:
+     *
+     *     // Create a KeyMap
+     *     var map = new Ext.util.KeyMap(document, {
+     *         key: Ext.EventObject.ENTER,
+     *         fn: handleKey,
+     *         scope: this
+     *     });
+     *
+     *     //Add a new binding to the existing KeyMap later
+     *     map.addBinding({
+     *         key: 'abc',
+     *         shift: true,
+     *         fn: handleKey,
+     *         scope: this
+     *     });
+     *
+     * @param {Object/Object[]} binding A single KeyMap config or an array of configs.
+     * The following config object properties are supported:
+     * @param {String/Array} binding.key A single keycode or an array of keycodes to handle.
+     * @param {Boolean} binding.shift True to handle key only when shift is pressed,
+     * False to handle the keyonly when shift is not pressed (defaults to undefined).
+     * @param {Boolean} binding.ctrl True to handle key only when ctrl is pressed,
+     * False to handle the key only when ctrl is not pressed (defaults to undefined).
+     * @param {Boolean} binding.alt True to handle key only when alt is pressed,
+     * False to handle the key only when alt is not pressed (defaults to undefined).
+     * @param {Function} binding.handler The function to call when KeyMap finds the
+     * expected key combination.
+     * @param {Function} binding.fn Alias of handler (for backwards-compatibility).
+     * @param {Object} binding.scope The scope of the callback function.
+     * @param {String} binding.defaultEventAction A default action to apply to the event.
+     * Possible values are: stopEvent, stopPropagation, preventDefault. If no value is
+     * set no action is performed..
+     */
+    addBinding : function(binding){
+        var me = this,
+            keyCode = binding.key,
+            i,
+            len;
+
+        if (me.processing) {
+            me.bindings = bindings.slice(0);
+        }
+        
+        if (Ext.isArray(binding)) {
+            for (i = 0, len = binding.length; i < len; i++) {
+                me.addBinding(binding[i]);
+            }
+            return;
+        }
+
+        me.bindings.push(Ext.apply({
+            keyCode: me.processKeys(keyCode)
+        }, binding));
+    },
+    
+    /**
+     * Remove a binding from this KeyMap.
+     * @param {Object} binding See {@link #addBinding for options}
+     */
+    removeBinding: function(binding){
+        var me = this,
+            bindings = me.bindings,
+            len = bindings.length,
+            i, item, keys;
+            
+        if (me.processing) {
+            me.bindings = bindings.slice(0);
+        }
+        
+        keys = me.processKeys(binding.key);
+        for (i = 0; i < len; ++i) {
+            item = bindings[i];
+            if (item.fn === binding.fn && item.scope === binding.scope) {
+                if (binding.alt == item.alt && binding.crtl == item.crtl && binding.shift == item.shift) {
+                    if (Ext.Array.equals(item.keyCode, keys)) {
+                        Ext.Array.erase(me.bindings, i, 1);
+                        return;
+                    }
+                }
+            }
+        }
+    },
+    
+    processKeys: function(keyCode){
+        var processed = false,
+            key, keys, keyString, len, i;
+            
+        if (Ext.isString(keyCode)) {
+            keys = [];
+            keyString = keyCode.toUpperCase();
+
+            for (i = 0, len = keyString.length; i < len; ++i){
+                keys.push(keyString.charCodeAt(i));
+            }
+            keyCode = keys;
+            processed = true;
+        }
+
+        if (!Ext.isArray(keyCode)) {
+            keyCode = [keyCode];
+        }
+
+        if (!processed) {
+            for (i = 0, len = keyCode.length; i < len; ++i) {
+                key = keyCode[i];
+                if (Ext.isString(key)) {
+                    keyCode[i] = key.toUpperCase().charCodeAt(0);
+                }
+            }
+        }
+        return keyCode;
+    },
+
+    /**
+     * Process the {@link #eventName event} from the {@link #target}.
+     * @private
+     * @param {Ext.EventObject} event
+     */
+    handleTargetEvent: (function() {
+        var tagRe = /input|textarea/i;
+
+        return function(event) {
+            var me = this,
+                bindings, i, len,
+                target, contentEditable;
+
+            if (me.enabled) { //just in case
+                bindings = me.bindings;
+                i = 0;
+                len = bindings.length;
+
+                // Process the event
+                event = me.processEvent.apply(me||me.processEventScope, arguments);
+
+                // Ignore events from input fields if configured to do so
+                if (me.ignoreInputFields) {
+                    target = event.target;
+                    contentEditable = target.contentEditable;
+                    // contentEditable will default to inherit if not specified, only check if the
+                    // attribute has been set or explicitly set to true
+                    // http://html5doctor.com/the-contenteditable-attribute/
+                    if (tagRe.test(target.tagName) || (contentEditable === '' || contentEditable === 'true')) {
+                        return;
+                    }
+                }
+
+                // If the processor does not return a keyEvent, we can't process it.
+                // Allow them to return false to cancel processing of the event
+                if (!event.getKey) {
+                    return event;
+                }
+                me.processing = true;
+                for(; i < len; ++i){
+                    me.processBinding(bindings[i], event);
+                }
+                me.processing = false;
+            }
+        }
+    }()),
+
+    /**
+     * @cfg {Function} processEvent
+     * An optional event processor function which accepts the argument list provided by the
+     * {@link #eventName configured event} of the {@link #target}, and returns a keyEvent for processing by the KeyMap.
+     *
+     * This may be useful when the {@link #target} is a Component with s complex event signature, where the event is not
+     * the first parameter. Extra information from the event arguments may be injected into the event for use by the handler
+     * functions before returning it.
+     */
+    processEvent: Ext.identityFn,
+
+    /**
+     * Process a particular binding and fire the handler if necessary.
+     * @private
+     * @param {Object} binding The binding information
+     * @param {Ext.EventObject} event
+     */
+    processBinding: function(binding, event){
+        if (this.checkModifiers(binding, event)) {
+            var key = event.getKey(),
+                handler = binding.fn || binding.handler,
+                scope = binding.scope || this,
+                keyCode = binding.keyCode,
+                defaultEventAction = binding.defaultEventAction,
+                i,
+                len,
+                keydownEvent = new Ext.EventObjectImpl(event);
+
+
+            for (i = 0, len = keyCode.length; i < len; ++i) {
+                if (key === keyCode[i]) {
+                    if (handler.call(scope, key, event) !== true && defaultEventAction) {
+                        keydownEvent[defaultEventAction]();
+                    }
+                    break;
+                }
+            }
+        }
+    },
+
+    /**
+     * Check if the modifiers on the event match those on the binding
+     * @private
+     * @param {Object} binding
+     * @param {Ext.EventObject} event
+     * @return {Boolean} True if the event matches the binding
+     */
+    checkModifiers: function(binding, e) {
+        var keys = ['shift', 'ctrl', 'alt'],
+            i = 0,
+            len = keys.length,
+            val, key;
+
+        for (; i < len; ++i){
+            key = keys[i];
+            val = binding[key];
+            if (!(val === undefined || (val === e[key + 'Key']))) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /**
+     * Shorthand for adding a single key listener.
+     *
+     * @param {Number/Number[]/Object} key Either the numeric key code, array of key codes or an object with the
+     * following options: `{key: (number or array), shift: (true/false), ctrl: (true/false), alt: (true/false)}`
+     * @param {Function} fn The function to call
+     * @param {Object} [scope] The scope (`this` reference) in which the function is executed.
+     * Defaults to the browser window.
+     */
+    on: function(key, fn, scope) {
+        var keyCode, shift, ctrl, alt;
+        if (Ext.isObject(key) && !Ext.isArray(key)) {
+            keyCode = key.key;
+            shift = key.shift;
+            ctrl = key.ctrl;
+            alt = key.alt;
+        } else {
+            keyCode = key;
+        }
+        this.addBinding({
+            key: keyCode,
+            shift: shift,
+            ctrl: ctrl,
+            alt: alt,
+            fn: fn,
+            scope: scope
+        });
+    },
+    
+    /**
+     * Shorthand for removing a single key listener.
+     *
+     * @param {Number/Number[]/Object} key Either the numeric key code, array of key codes or an object with the
+     * following options: `{key: (number or array), shift: (true/false), ctrl: (true/false), alt: (true/false)}`
+     * @param {Function} fn The function to call
+     * @param {Object} [scope] The scope (`this` reference) in which the function is executed.
+     * Defaults to the browser window.
+     */
+    un: function(key, fn, scope) {
+        var keyCode, shift, ctrl, alt;
+        if (Ext.isObject(key) && !Ext.isArray(key)) {
+            keyCode = key.key;
+            shift = key.shift;
+            ctrl = key.ctrl;
+            alt = key.alt;
+        } else {
+            keyCode = key;
+        }
+        this.removeBinding({
+            key: keyCode,
+            shift: shift,
+            ctrl: ctrl,
+            alt: alt,
+            fn: fn,
+            scope: scope
+        });
+    },
+
+    /**
+     * Returns true if this KeyMap is enabled
+     * @return {Boolean}
+     */
+    isEnabled : function() {
+        return this.enabled;
+    },
+
+    /**
+     * Enables this KeyMap
+     */
+    enable: function() {
+        var me = this;
+        
+        if (!me.enabled) {
+            me.target.on(me.eventName, me.handleTargetEvent, me);
+            me.enabled = true;
+        }
+    },
+
+    /**
+     * Disable this KeyMap
+     */
+    disable: function() {
+        var me = this;
+        
+        if (me.enabled) {
+            me.target.removeListener(me.eventName, me.handleTargetEvent, me);
+            me.enabled = false;
+        }
+    },
+
+    /**
+     * Convenience function for setting disabled/enabled by boolean.
+     * @param {Boolean} disabled
+     */
+    setDisabled : function(disabled) {
+        if (disabled) {
+            this.disable();
+        } else {
+            this.enable();
+        }
+    },
+
+    /**
+     * Destroys the KeyMap instance and removes all handlers.
+     * @param {Boolean} removeTarget True to also remove the {@link #target}
+     */
+    destroy: function(removeTarget) {
+        var me = this,
+            target = me.target;
+
+        me.bindings = [];
+        me.disable();
+        if (removeTarget === true) {
+            if (target.isComponent) {
+                target.destroy();
+            } else {
+                target.remove();
+            }
+        }
+        delete me.target;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides a convenient wrapper for normalized keyboard navigation. KeyNav allows you to bind navigation keys to
+ * function calls that will get called when the keys are pressed, providing an easy way to implement custom navigation
+ * schemes for any UI component.
+ *
+ * The following are all of the possible keys that can be implemented: enter, space, left, right, up, down, tab, esc,
+ * pageUp, pageDown, del, backspace, home, end.
+ *
+ * Usage:
+ *
+ *     var nav = new Ext.util.KeyNav({
+ *         target : "my-element",
+ *         left   : function(e){
+ *             this.moveLeft(e.ctrlKey);
+ *         },
+ *         right  : function(e){
+ *             this.moveRight(e.ctrlKey);
+ *         },
+ *         enter  : function(e){
+ *             this.save();
+ *         },
+ *         
+ *         // Binding may be a function specifiying fn, scope and defaultAction
+ *         esc: {
+ *             fn: this.onEsc,
+ *             defaultEventAction: false
+ *         },
+ *         scope : this
+ *     });
+ */
+Ext.define('Ext.util.KeyNav', {
+    alternateClassName: 'Ext.KeyNav',
+
+                                  
+
+    statics: {
+        keyOptions: {
+            left: 37,
+            right: 39,
+            up: 38,
+            down: 40,
+            space: 32,
+            pageUp: 33,
+            pageDown: 34,
+            del: 46,
+            backspace: 8,
+            home: 36,
+            end: 35,
+            enter: 13,
+            esc: 27,
+            tab: 9
+        }
+    },
+
+    constructor: function(config) {
+        var me = this;
+        if (arguments.length === 2) {
+            me.legacyConstructor.apply(me, arguments);
+            return;
+        }
+        me.setConfig(config);
+    },
+
+    /**
+     * @private
+     * Old constructor signature.
+     * @param {String/HTMLElement/Ext.Element} el The element or its ID to bind to
+     * @param {Object} config The config
+     */
+    legacyConstructor: function(el, config) {
+        this.setConfig(Ext.apply({
+            target: el
+        }, config));
+    },
+
+    /**
+     * Sets up a configuration for the KeyNav.
+     * @private
+     * @param {Object} config A configuration object as specified in the constructor.
+     */
+    setConfig: function(config) {
+        var me = this,
+            keymapCfg = {
+                target: config.target,
+                ignoreInputFields: config.ignoreInputFields,
+                eventName: me.getKeyEvent('forceKeyDown' in config ? config.forceKeyDown : me.forceKeyDown, config.eventName)
+            },
+            map, keyCodes, defaultScope, keyName, binding;
+
+        if (me.map) {
+            me.map.destroy();
+        }
+
+        if (config.processEvent) {
+            keymapCfg.processEvent = config.processEvent;
+            keymapCfg.processEventScope = config.processEventScope||me;
+        }
+
+        // If they specified a KeyMap to use, use it
+        if (config.keyMap) {
+            map = me.map = config.keyMap;
+        }
+        // Otherwise, create one, and remember to destroy it on destroy
+        else {
+            map = me.map = new Ext.util.KeyMap(keymapCfg);
+            me.destroyKeyMap = true;
+        }
+        keyCodes = Ext.util.KeyNav.keyOptions;
+        defaultScope = config.scope || me;
+
+        for (keyName in keyCodes) {
+            if (keyCodes.hasOwnProperty(keyName)) {
+
+                // There is a property named after a key name.
+                // It may be a function or an binding spec containing handler, scope and defaultAction configs
+                if (binding = config[keyName]) {
+                    if (typeof binding === 'function') {
+                        binding = {
+                            handler: binding,
+                            defaultEventAction: (config.defaultEventAction !== undefined) ? config.defaultEventAction : me.defaultEventAction
+                        };
+                    }
+                    map.addBinding({
+                        key: keyCodes[keyName],
+                        handler: Ext.Function.bind(me.handleEvent, binding.scope||defaultScope, binding.handler||binding.fn, true),
+                        defaultEventAction: (binding.defaultEventAction !== undefined) ? binding.defaultEventAction : me.defaultEventAction
+                    });
+                }
+            }
+        }
+
+        map.disable();
+        if (!config.disabled) {
+            map.enable();
+        }
+    },
+
+    /**
+     * Method for filtering out the map argument
+     * @private
+     * @param {Number} keyCode
+     * @param {Ext.EventObject} event
+     * @param {Object} options Contains the handler to call
+     */
+    handleEvent: function(keyCode, event, handler){
+        return handler.call(this, event);
+    },
+
+    /**
+     * @cfg {Boolean} disabled
+     * True to disable this KeyNav instance.
+     */
+    disabled: false,
+
+    /**
+     * @cfg {String} defaultEventAction
+     * The method to call on the {@link Ext.EventObject} after this KeyNav intercepts a key. Valid values are {@link
+     * Ext.EventObject#stopEvent}, {@link Ext.EventObject#preventDefault} and {@link Ext.EventObject#stopPropagation}.
+     *
+     * If a falsy value is specified, no method is called on the key event.
+     */
+    defaultEventAction: "stopEvent",
+
+    /**
+     * @cfg {Boolean} forceKeyDown
+     * Handle the keydown event instead of keypress. KeyNav automatically does this for IE since IE does not propagate
+     * special keys on keypress, but setting this to true will force other browsers to also handle keydown instead of
+     * keypress.
+     */
+    forceKeyDown: false,
+
+    /**
+     * @cfg {Ext.Component/Ext.Element/HTMLElement/String} target
+     * The object on which to listen for the event specified by the {@link #eventName} config option.
+     */
+
+    /**
+     * @cfg {String} eventName
+     * The event to listen for to pick up key events.
+     */
+    eventName: 'keypress',
+
+    /**
+     * @cfg {Function} processEvent
+     * An optional event processor function which accepts the argument list provided by the {@link #eventName configured
+     * event} of the {@link #target}, and returns a keyEvent for processing by the KeyMap.
+     *
+     * This may be useful when the {@link #target} is a Component with s complex event signature. Extra information from
+     * the event arguments may be injected into the event for use by the handler functions before returning it.
+     */
+
+    /**
+     * @cfg {Object} [processEventScope=this]
+     * The scope (`this` context) in which the {@link #processEvent} method is executed.
+     */
+
+    /**
+     * @cfg {Boolean} [ignoreInputFields=false]
+     * Configure this as `true` if there are any input fields within the {@link #target}, and this KeyNav
+     * should not process events from input fields, (`<input>, <textarea> and elements with `contentEditable="true"`)
+     */
+
+    /**
+     * @cfg {Ext.util.KeyMap} [keyMap]
+     * An optional pre-existing {@link Ext.util.KeyMap KeyMap} to use to listen for key events. If not specified,
+     * one is created.
+     */
+
+    /**
+     * Destroy this KeyNav.
+     * @param {Boolean} removeEl Pass `true` to remove the element associated with this KeyNav.
+     */
+    destroy: function(removeEl) {
+        if (this.destroyKeyMap) {
+            this.map.destroy(removeEl);
+        }
+        delete this.map;
+    },
+
+    /**
+     * Enables this KeyNav.
+     */
+    enable: function() {
+        // this.map will be removed if destroyed
+        if (this.map) {
+            this.map.enable();
+            this.disabled = false;
+        }
+    },
+
+    /**
+     * Disables this KeyNav.
+     */
+    disable: function() {
+        // this.map will be removed if destroyed
+        if (this.map) {
+            this.map.disable();
+        }
+        this.disabled = true;
+    },
+
+    /**
+     * Convenience function for setting disabled/enabled by boolean.
+     * @param {Boolean} disabled
+     */
+    setDisabled : function(disabled) {
+        this.map.setDisabled(disabled);
+        this.disabled = disabled;
+    },
+
+    /**
+     * @private
+     * Determines the event to bind to listen for keys. Defaults to the {@link #eventName} value, but
+     * may be overridden the {@link #forceKeyDown} setting.
+     *
+     * The useKeyDown option on the EventManager modifies the default {@link #eventName} to be `keydown`,
+     * but a configured {@link #eventName} takes priority over this.
+     *
+     * @return {String} The type of event to listen for.
+     */
+    getKeyEvent: function(forceKeyDown, configuredEventName) {
+        if (forceKeyDown || (Ext.EventManager.useKeyDown && !configuredEventName)) {
+            return 'keydown';
+        } else {
+            return configuredEventName||this.eventName;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * The FocusManager is responsible for globally:
+ *
+ * 1. Managing component focus
+ * 2. Providing basic keyboard navigation
+ * 3. (optional) Provide a visual cue for focused components, in the form of a focus ring/frame.
+ *
+ * To activate the FocusManager, simply call `Ext.FocusManager.enable();`. In turn, you may
+ * deactivate the FocusManager by subsequently calling `Ext.FocusManager.disable();`.  The
+ * FocusManager is disabled by default.
+ *
+ * To enable the optional focus frame, pass `true` or `{focusFrame: true}` to {@link #method-enable}.
+ *
+ * Another feature of the FocusManager is to provide basic keyboard focus navigation scoped to any {@link Ext.container.Container}
+ * that would like to have navigation between its child {@link Ext.Component}'s.
+ *
+ * @author Jarred Nicholls <jarred at sencha.com>
+ * @docauthor Jarred Nicholls <jarred at sencha.com>
+ */
+Ext.define('Ext.FocusManager', {
+    singleton: true,
+    alternateClassName: ['Ext.FocusMgr' ],
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+               
+                                
+                        
+                               
+                             
+                           
+                         
+      
+
+    /**
+     * @property {Boolean} enabled
+     * Whether or not the FocusManager is currently enabled
+     */
+    enabled: false,
+
+    /**
+     * @property {Ext.Component} focusedCmp
+     * The currently focused component.
+     */
+
+    focusElementCls: Ext.baseCSSPrefix + 'focus-element',
+
+    focusFrameCls: Ext.baseCSSPrefix + 'focus-frame',
+
+    /**
+     * @property {String[]} whitelist
+     * A list of xtypes that should ignore certain navigation input keys and
+     * allow for the default browser event/behavior. These input keys include:
+     *
+     * 1. Backspace
+     * 2. Delete
+     * 3. Left
+     * 4. Right
+     * 5. Up
+     * 6. Down
+     *
+     * The FocusManager will not attempt to navigate when a component is an xtype (or descendents thereof)
+     * that belongs to this whitelist. E.g., an {@link Ext.form.field.Text} should allow
+     * the user to move the input cursor left and right, and to delete characters, etc.
+     */
+    whitelist: [
+        'textfield'
+    ],
+
+    constructor: function(config) {
+        var me = this,
+            CQ = Ext.ComponentQuery;
+
+        me.mixins.observable.constructor.call(me, config);
+
+        me.addEvents(
+            /**
+             * @event beforecomponentfocus
+             * Fires before a component becomes focused. Return `false` to prevent
+             * the component from gaining focus.
+             * @param {Ext.FocusManager} fm A reference to the FocusManager singleton
+             * @param {Ext.Component} cmp The component that is being focused
+             * @param {Ext.Component} previousCmp The component that was previously focused,
+             * or `undefined` if there was no previously focused component.
+             */
+            'beforecomponentfocus',
+
+            /**
+             * @event componentfocus
+             * Fires after a component becomes focused.
+             * @param {Ext.FocusManager} fm A reference to the FocusManager singleton
+             * @param {Ext.Component} cmp The component that has been focused
+             * @param {Ext.Component} previousCmp The component that was previously focused,
+             * or `undefined` if there was no previously focused component.
+             */
+            'componentfocus',
+
+            /**
+             * @event disable
+             * Fires when the FocusManager is disabled
+             * @param {Ext.FocusManager} fm A reference to the FocusManager singleton
+             */
+            'disable',
+
+            /**
+             * @event enable
+             * Fires when the FocusManager is enabled
+             * @param {Ext.FocusManager} fm A reference to the FocusManager singleton
+             */
+            'enable'
+        );
+
+        me.focusTask = new Ext.util.DelayedTask(me.handleComponentFocus, me);
+
+        // Gain control on Component focus, blur, hide and destroy
+        Ext.override(Ext.AbstractComponent, {
+            onFocus: function() {
+                this.callParent(arguments);
+                if (me.enabled && this.hasFocus) {
+                    Array.prototype.unshift.call(arguments, this);
+                    me.onComponentFocus.apply(me, arguments);
+                }
+            },
+            onBlur: function() {
+                this.callParent(arguments);
+                if (me.enabled && !this.hasFocus) {
+                    Array.prototype.unshift.call(arguments, this);
+                    me.onComponentBlur.apply(me, arguments);
+                }
+            },
+            onDestroy: function() {
+                this.callParent(arguments);
+                if (me.enabled) {
+                    Array.prototype.unshift.call(arguments, this);
+                    me.onComponentDestroy.apply(me, arguments);
+                }
+            }
+        });
+        Ext.override(Ext.Component, {
+            afterHide: function() {
+                this.callParent(arguments);
+                if (me.enabled) {
+                    Array.prototype.unshift.call(arguments, this);
+                    me.onComponentHide.apply(me, arguments);
+                }
+            }
+        });
+        // Setup KeyNav that's bound to document to catch all
+        // unhandled/bubbled key events for navigation
+        me.keyNav = new Ext.util.KeyNav(Ext.getDoc(), {
+            disabled: true,
+            scope: me,
+
+            backspace: me.focusLast,
+            enter: me.navigateIn,
+            esc: me.navigateOut,
+            tab: me.navigateSiblings,
+            space: me.navigateIn,
+            del: me.focusLast,
+            left: me.navigateSiblings,
+            right: me.navigateSiblings,
+            down: me.navigateSiblings,
+            up: me.navigateSiblings
+        });
+
+        me.focusData = {};
+        me.subscribers = new Ext.util.HashMap();
+        me.focusChain = {};
+
+        // Setup some ComponentQuery pseudos
+        Ext.apply(CQ.pseudos, {
+            // Return the single next focusable sibling from the current idx in either direction (step -1 or 1)
+            nextFocus: function(cmps, idx, step) {
+                step = step || 1;
+                idx = parseInt(idx, 10);
+
+                var len = cmps.length,
+                    i = idx, c;
+
+                for (;;) {
+                    // Increment index, and loop round if off either end
+                    if ((i += step) >= len) {
+                        i = 0;
+                    } else if (i < 0) {
+                        i = len - 1;
+                    }
+
+                    // As soon as we loop back to the starting index, give up, there are no focusable siblings.
+                    if (i === idx) {
+                        return [];
+                    }
+
+                    // If we have found a focusable sibling, return it
+                    if ((c = cmps[i]).isFocusable()) {
+                        return [c];
+                    }
+                }
+
+                return [];
+            },
+
+            prevFocus: function(cmps, idx) {
+                return this.nextFocus(cmps, idx, -1);
+            },
+
+            root: function(cmps) {
+                var len = cmps.length,
+                    results = [],
+                    i = 0,
+                    c;
+
+                for (; i < len; i++) {
+                    c = cmps[i];
+                    if (!c.ownerCt) {
+                        results.push(c);
+                    }
+                }
+
+                return results;
+            }
+        });
+    },
+
+    /**
+     * Adds the specified xtype to the {@link #whitelist}.
+     * @param {String/String[]} xtype Adds the xtype(s) to the {@link #whitelist}.
+     */
+    addXTypeToWhitelist: function(xtype) {
+        var me = this;
+
+        if (Ext.isArray(xtype)) {
+            Ext.Array.forEach(xtype, me.addXTypeToWhitelist, me);
+            return;
+        }
+
+        if (!Ext.Array.contains(me.whitelist, xtype)) {
+            me.whitelist.push(xtype);
+        }
+    },
+
+    clearComponent: function(cmp) {
+        clearTimeout(this.cmpFocusDelay);
+        if (!cmp.isDestroyed) {
+            cmp.blur();
+        }
+    },
+
+    /**
+     * Disables the FocusManager by turning of all automatic focus management and keyboard navigation
+     */
+    disable: function() {
+        var me = this;
+
+        if (!me.enabled) {
+            return;
+        }
+
+        delete me.options;
+        me.enabled = false;
+
+        me.removeDOM();
+
+        // Stop handling key navigation
+        me.keyNav.disable();
+
+        me.fireEvent('disable', me);
+    },
+
+    /**
+     * Enables the FocusManager by turning on all automatic focus management and keyboard navigation
+     * @param {Boolean/Object} options Either `true`/`false` to turn on the focus frame, or an object
+     * with the following options:
+     * @param {Boolean} [options.focusFrame=false] `true` to show the focus frame around a component when it is focused.
+     */
+    enable: function(options) {
+        var me = this;
+
+        if (options === true) {
+            options = { focusFrame: true };
+        }
+        me.options = options = options || {};
+
+        if (me.enabled) {
+            return;
+        }
+
+        // When calling addFocusListener on Containers, the FocusManager must be enabled, otherwise it won't do it.
+        me.enabled = true;
+        me.initDOM(options);
+
+        // Start handling key navigation
+        me.keyNav.enable();
+
+        // Finally, let's focus our global focus el so we start fresh
+        me.focusEl.focus();
+        delete me.focusedCmp;
+
+        me.fireEvent('enable', me);
+    },
+
+    focusLast: function(e) {
+        var me = this;
+
+        if (me.isWhitelisted(me.focusedCmp)) {
+            return true;
+        }
+
+        // Go back to last focused item
+        if (me.previousFocusedCmp) {
+            me.previousFocusedCmp.focus();
+        }
+    },
+
+    getRootComponents: function() {
+        var CQ = Ext.ComponentQuery,
+            inline = CQ.query(':focusable:root:not([floating])'),
+            floating = CQ.query(':focusable:root[floating]');
+
+        // Floating items should go to the top of our root stack, and be ordered
+        // by their z-index (highest first)
+        floating.sort(function(a, b) {
+            return a.el.getZIndex() > b.el.getZIndex();
+        });
+
+        return floating.concat(inline);
+    },
+
+    initDOM: function(options) {
+        var me = this,
+            cls = me.focusFrameCls,
+            needListeners = Ext.ComponentQuery.query('{getFocusEl()}:not([focusListenerAdded])'),
+            i = 0, len = needListeners.length;
+
+        if (!Ext.isReady) {
+            return Ext.onReady(me.initDOM, me);
+        }
+
+        // When we are enabled, we must ensure that all Components which return a focusEl that is *not naturally focusable*
+        // have focus/blur listeners enabled to then trigger onFocus/onBlur handling so that we get to know about their focus action.
+        // These listeners are not added at initialization unless the FocusManager is enabled at that time.
+        for (; i < len; i++) {
+            needListeners[i].addFocusListener();
+        }
+
+        // Make the document body the global focus element
+        if (!me.focusEl) {
+            me.focusEl = Ext.getBody();
+            me.focusEl.dom.tabIndex = -1;
+        }
+
+        // Create global focus frame
+        if (!me.focusFrame && options.focusFrame) {
+            me.focusFrame = Ext.getBody().createChild({
+                cls: cls,
+                children: [
+                    { cls: cls + '-top' },
+                    { cls: cls + '-bottom' },
+                    { cls: cls + '-left' },
+                    { cls: cls + '-right' }
+                ],
+                style: 'top: -100px; left: -100px;'
+            });
+            me.focusFrame.setVisibilityMode(Ext.Element.DISPLAY);
+            me.focusFrame.hide().setLocalXY(0, 0);
+        }
+    },
+
+    isWhitelisted: function(cmp) {
+        return cmp && Ext.Array.some(this.whitelist, function(x) {
+            return cmp.isXType(x);
+        });
+    },
+
+    navigateIn: function(e) {
+        var me = this,
+            focusedCmp = me.focusedCmp,
+            defaultRoot,
+            firstChild;
+
+        if (me.isWhitelisted(focusedCmp)) {
+            return true;
+        }
+
+        if (!focusedCmp) {
+            // No focus yet, so focus the first root cmp on the page
+            defaultRoot = me.getRootComponents()[0];
+            if (defaultRoot) {
+                // If the default root is based upon the body, then it will already be focused, and will not fire a focus event to
+                // trigger its own onFocus processing, so we have to programatically blur it first.
+                if (defaultRoot.getFocusEl() === me.focusEl) {
+                    me.focusEl.blur();
+                }
+                defaultRoot.focus();
+            }
+        } else {
+            // Drill into child ref items of the focused cmp, if applicable.
+            // This works for any Component with a getRefItems implementation.
+            firstChild = focusedCmp.hasFocus ? Ext.ComponentQuery.query('>:focusable', focusedCmp)[0] : focusedCmp;
+            if (firstChild) {
+                firstChild.focus();
+            } else {
+                // Let's try to fire a click event, as if it came from the mouse
+                if (Ext.isFunction(focusedCmp.onClick)) {
+                    e.button = 0;
+                    focusedCmp.onClick(e);
+                    if (focusedCmp.isVisible(true)) {
+                        focusedCmp.focus();
+                    } else {
+                        me.navigateOut();
+                    }
+                }
+            }
+        }
+    },
+
+    navigateOut: function(e) {
+        var me = this,
+            parent;
+
+        if (!me.focusedCmp || !(parent = me.focusedCmp.up(':focusable'))) {
+            me.focusEl.focus();
+        } else {
+            parent.focus();
+        }
+
+        // In some browsers (Chrome) FocusManager can handle this before other
+        // handlers. Ext Windows have their own Esc key handling, so we need to
+        // return true here to allow the event to bubble.
+        return true;
+    },
+
+    navigateSiblings: function(e, source, parent) {
+        var me = this,
+            src = source || me,
+            key = e.getKey(),
+            EO = Ext.EventObject,
+            goBack = e.shiftKey || key == EO.LEFT || key == EO.UP,
+            checkWhitelist = key == EO.LEFT || key == EO.RIGHT || key == EO.UP || key == EO.DOWN,
+            nextSelector = goBack ? 'prev' : 'next',
+            idx, next, focusedCmp, siblings;
+
+        focusedCmp = (src.focusedCmp && src.focusedCmp.comp) || src.focusedCmp;
+        if (!focusedCmp && !parent) {
+            return true;
+        }
+
+        if (checkWhitelist && me.isWhitelisted(focusedCmp)) {
+            return true;
+        }
+
+        // If no focused Component, or a root level one was focused, then siblings are root components.
+        if (!focusedCmp || focusedCmp.is(':root')) {
+            siblings = me.getRootComponents();
+        } else {
+            // Else if the focused component has a parent, get siblings from there
+            parent = parent || focusedCmp.up();
+            if (parent) {
+                siblings = parent.getRefItems();
+            }
+        }
+
+
+        // Navigate if we have found siblings.
+        if (siblings) {
+            idx = focusedCmp ? Ext.Array.indexOf(siblings, focusedCmp) : -1;
+            next = Ext.ComponentQuery.query(':' + nextSelector + 'Focus(' + idx + ')', siblings)[0];
+            if (next && focusedCmp !== next) {
+                next.focus();
+                return next;
+            }
+        }
+    },
+
+    onComponentBlur: function(cmp, e) {
+        var me = this;
+
+        if (me.focusedCmp === cmp) {
+            me.previousFocusedCmp = cmp;
+            delete me.focusedCmp;
+        }
+
+        if (me.focusFrame) {
+            me.focusFrame.hide();
+        }
+    },
+
+    onComponentFocus: function(cmp, e) {
+        var me = this,
+            chain = me.focusChain,
+            parent;
+
+        if (!cmp.isFocusable()) {
+            me.clearComponent(cmp);
+
+            // Check our focus chain, so we don't run into a never ending recursion
+            // If we've attempted (unsuccessfully) to focus this component before,
+            // then we're caught in a loop of child->parent->...->child and we
+            // need to cut the loop off rather than feed into it.
+            if (chain[cmp.id]) {
+                return;
+            }
+
+            // Try to focus the parent instead
+            parent = cmp.up();
+            if (parent) {
+                // Add component to our focus chain to detect infinite focus loop
+                // before we fire off an attempt to focus our parent.
+                // See the comments above.
+                chain[cmp.id] = true;
+                parent.focus();
+            }
+
+            return;
+        }
+        // Clear our focus chain when we have a focusable component
+        me.focusChain = {};
+
+        // Capture the focusEl to frame now.
+        // Button returns its encapsulating element during the focus phase
+        // So that element gets styled and framed.
+        me.focusTask.delay(10, null, null, [cmp, cmp.getFocusEl()]);
+    },
+
+    handleComponentFocus: function(cmp, focusEl) {
+        var me = this,
+            cls,
+            ff,
+            box,
+            bt,
+            bl,
+            bw,
+            bh,
+            ft,
+            fb,
+            fl,
+            fr;
+
+        if (me.fireEvent('beforecomponentfocus', me, cmp, me.previousFocusedCmp) === false) {
+            me.clearComponent(cmp);
+            return;
+        }
+
+        me.focusedCmp = cmp;
+
+        // If we have a focus frame, show it around the focused component
+        if (me.shouldShowFocusFrame(cmp)) {
+            cls = '.' + me.focusFrameCls + '-';
+            ff = me.focusFrame;
+            
+            // focusEl may in fact be a descendant component to which to delegate focus
+            box = (focusEl.dom ? focusEl : focusEl.el).getBox();
+
+            // Size the focus frame's t/b/l/r according to the box
+            // This leaves a hole in the middle of the frame so user
+            // interaction w/ the mouse can continue
+            bt = box.top;
+            bl = box.left;
+            bw = box.width;
+            bh = box.height;
+            ft = ff.child(cls + 'top');
+            fb = ff.child(cls + 'bottom');
+            fl = ff.child(cls + 'left');
+            fr = ff.child(cls + 'right');
+
+            ft.setWidth(bw).setLocalXY(bl, bt);
+            fb.setWidth(bw).setLocalXY(bl, bt + bh - 2);
+            fl.setHeight(bh - 2).setLocalXY(bl, bt + 2);
+            fr.setHeight(bh - 2).setLocalXY(bl + bw - 2, bt + 2);
+
+            ff.show();
+        }
+
+        me.fireEvent('componentfocus', me, cmp, me.previousFocusedCmp);
+    },
+
+    onComponentHide: function(cmp) {
+        var me = this,
+            cmpHadFocus = false,
+            focusedCmp = me.focusedCmp,
+            parent;
+
+        if (focusedCmp) {
+            // See if the Component being hidden was the focused Component, or owns the focused Component
+            // In these cases, focus needs to be removed from the focused Component to the nearest focusable ancestor
+            cmpHadFocus = cmp.hasFocus || (cmp.isContainer && cmp.isAncestor(me.focusedCmp));
+        }
+
+        me.clearComponent(cmp);
+
+        // Move focus onto the nearest focusable ancestor, or this is there is none
+        if (cmpHadFocus && (parent = cmp.up(':focusable'))) {
+            parent.focus();
+        } else {
+            me.focusEl.focus();
+        }
+    },
+
+    onComponentDestroy: function() {
+
+    },
+
+    removeDOM: function() {
+        var me = this;
+
+        // If we are still enabled globally, or there are still subscribers
+        // then we will halt here, since our DOM stuff is still being used
+        if (me.enabled || me.subscribers.length) {
+            return;
+        }
+
+        Ext.destroy(
+            me.focusFrame
+        );
+        delete me.focusEl;
+        delete me.focusFrame;
+    },
+
+    /**
+     * Removes the specified xtype from the {@link #whitelist}.
+     * @param {String/String[]} xtype Removes the xtype(s) from the {@link #whitelist}.
+     */
+    removeXTypeFromWhitelist: function(xtype) {
+        var me = this;
+
+        if (Ext.isArray(xtype)) {
+            Ext.Array.forEach(xtype, me.removeXTypeFromWhitelist, me);
+            return;
+        }
+
+        Ext.Array.remove(me.whitelist, xtype);
+    },
+
+    setupSubscriberKeys: function(container, keys) {
+        var me = this,
+            el = container.getFocusEl(),
+            scope = keys.scope,
+            handlers = {
+                backspace: me.focusLast,
+                enter: me.navigateIn,
+                esc: me.navigateOut,
+                scope: me
+            },
+
+            navSiblings = function(e) {
+                if (me.focusedCmp === container) {
+                    // Root the sibling navigation to this container, so that we
+                    // can automatically dive into the container, rather than forcing
+                    // the user to hit the enter key to dive in.
+                    return me.navigateSiblings(e, me, container);
+                } else {
+                    return me.navigateSiblings(e);
+                }
+            };
+
+        Ext.iterate(keys, function(key, cb) {
+            handlers[key] = function(e) {
+                var ret = navSiblings(e);
+
+                if (Ext.isFunction(cb) && cb.call(scope || container, e, ret) === true) {
+                    return true;
+                }
+
+                return ret;
+            };
+        }, me);
+
+        return new Ext.util.KeyNav(el, handlers);
+    },
+
+    shouldShowFocusFrame: function(cmp) {
+        var me = this,
+            opts = me.options || {};
+
+        // Do not show a focus frame if
+        // 1. We are configured not to.
+        // 2. No Component was passed
+        if (!me.focusFrame || !cmp) {
+            return false;
+        }
+
+        // Global trumps
+        if (opts.focusFrame) {
+            return true;
+        }
+
+        if (me.focusData[cmp.id].focusFrame) {
+            return true;
+        }
+
+        return false;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Simple helper class for easily creating image components. This renders an image tag to
+ * the DOM with the configured src.
+ *
+ * {@img Ext.Img/Ext.Img.png Ext.Img component}
+ *
+ * ## Example usage:
+ *
+ *     var changingImage = Ext.create('Ext.Img', {
+ *         src: 'http://www.sencha.com/img/20110215-feat-html5.png',
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ *     // change the src of the image programmatically
+ *     changingImage.setSrc('http://www.sencha.com/img/20110215-feat-perf.png');
+ *
+ * By default, only an img element is rendered and that is this component's primary
+ * {@link Ext.AbstractComponent#getEl element}. If the {@link Ext.AbstractComponent#autoEl} property
+ * is other than 'img' (the default), the a child img element will be added to the primary
+ * element. This can be used to create a wrapper element around the img.
+ *
+ * ## Wrapping the img in a div:
+ *
+ *     var wrappedImage = Ext.create('Ext.Img', {
+ *         src: 'http://www.sencha.com/img/20110215-feat-html5.png',
+ *         autoEl: 'div', // wrap in a div
+ *         renderTo: Ext.getBody()
+ *     });
+ */
+Ext.define('Ext.Img', {
+    extend:  Ext.Component ,
+    alias: ['widget.image', 'widget.imagecomponent'],
+
+    autoEl: 'img',
+
+    baseCls: Ext.baseCSSPrefix + 'img',
+
+    /**
+     * @cfg {String} src
+     * The image src.
+     */
+    src: '',
+
+    /**
+     * @cfg {String} alt
+     * The descriptive text for non-visual UI description.
+     */
+    alt: '',
+
+    /**
+     * @cfg {String} title
+     * Specifies addtional information about the image.
+     */
+    title: '',
+
+    /**
+     * @cfg {String} imgCls
+     * Optional CSS classes to add to the img element.
+     */
+    imgCls: '',
+
+    /**
+     * @cfg {Number/String} glyph
+     * A numeric unicode character code to serve as the image.  If this option is used
+     * The image will be rendered using a div with innerHTML set to the html entity
+     * for the given character code.  The default font-family for glyphs can be set
+     * globally using {@link Ext#setGlyphFontFamily Ext.setGlyphFontFamily()}. Alternatively,
+     * this config option accepts a string with the charCode and font-family separated by
+     * the `@` symbol. For example '65 at My Font Family'.
+     */
+
+    initComponent: function() {
+        if (this.glyph) {
+            this.autoEl = 'div';
+        }
+        this.callParent();
+    },
+
+    getElConfig: function() {
+        var me = this,
+            config = me.callParent(),
+            glyphFontFamily = Ext._glyphFontFamily,
+            glyph = me.glyph,
+            img, glyphParts;
+
+        // It is sometimes helpful (like in a panel header icon) to have the img wrapped
+        // by a div. If our autoEl is not 'img' then we just add an img child to the el.
+        if (me.autoEl == 'img') {
+            img = config;
+        } else if (me.glyph) {
+            if (typeof glyph === 'string') {
+                glyphParts = glyph.split('@');
+                glyph = glyphParts[0];
+                glyphFontFamily = glyphParts[1];
+            }
+            config.html = '&#' + glyph + ';';
+            if (glyphFontFamily) {
+                config.style = 'font-family:' + glyphFontFamily;
+            }
+        } else {
+            config.cn = [img = {
+                tag: 'img',
+                id: me.id + '-img'
+            }];
+        }
+
+        if (img) {
+            if (me.imgCls) {
+                img.cls = (img.cls ? img.cls + ' ' : '') + me.imgCls;
+            }
+
+            img.src = me.src || Ext.BLANK_IMAGE_URL;
+        }
+
+        if (me.alt) {
+            (img || config).alt = me.alt;
+        }
+        if (me.title) {
+            (img || config).title = me.title;
+        }
+
+        return config;
+    },
+
+    onRender: function () {
+        var me = this,
+            el;
+
+        me.callParent(arguments);
+
+        el = me.el;
+        me.imgEl = (me.autoEl == 'img') ? el : el.getById(me.id + '-img');
+    },
+
+    onDestroy: function () {
+        Ext.destroy(this.imgEl);
+        this.imgEl = null;
+        this.callParent();
+    },
+
+    /**
+     * Updates the {@link #src} of the image.
+     * @param {String} src
+     */
+    setSrc: function(src) {
+        var me = this,
+            imgEl = me.imgEl;
+
+        me.src = src;
+
+        if (imgEl) {
+            imgEl.dom.src = src || Ext.BLANK_IMAGE_URL;
+        }
+    },
+
+    setGlyph: function(glyph) {
+        var me = this,
+            glyphFontFamily = Ext._glyphFontFamily,
+            glyphParts, dom;
+
+        if (glyph != me.glyph) {
+            if (typeof glyph === 'string') {
+                glyphParts = glyph.split('@');
+                glyph = glyphParts[0];
+                glyphFontFamily = glyphParts[1];
+            }
+
+            dom = me.el.dom;
+
+            dom.innerHTML = '&#' + glyph + ';';
+            if (glyphFontFamily) {
+                dom.style = 'font-family:' + glyphFontFamily;
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is used as a mixin.
+ *
+ * This class is to be used to provide basic methods for binding/unbinding stores to other
+ * classes. In general it will not be used directly.
+ */
+Ext.define('Ext.util.Bindable', {
+
+    /**
+     * Binds a store to this instance.
+     * @param {Ext.data.AbstractStore/String} [store] The store to bind or ID of the store.
+     * When no store given (or when `null` or `undefined` passed), unbinds the existing store.
+     */
+    bindStore: function(store, initial, propertyName) {
+        // Private params
+        // @param {Boolean} [initial=false] True to not remove listeners from existing store.
+        // @param {String} [propertyName="store"] The property in this object under which to cache the passed Store.
+        propertyName = propertyName || 'store';
+
+        var me = this,
+            oldStore = me[propertyName];
+
+        if (!initial && oldStore) {
+            // Perform implementation-specific unbinding operations *before* possible Store destruction.
+            me.onUnbindStore(oldStore, initial, propertyName);
+
+            if (store !== oldStore && oldStore.autoDestroy) {
+                oldStore.destroyStore();
+            } else {
+                me.unbindStoreListeners(oldStore);
+            }
+        }
+        if (store) {
+            store = Ext.data.StoreManager.lookup(store);
+            me.bindStoreListeners(store);
+            me.onBindStore(store, initial, propertyName);
+        }
+        me[propertyName] = store || null;
+        return me;
+    },
+
+    /**
+     * Gets the current store instance.
+     * @return {Ext.data.AbstractStore} The store, null if one does not exist.
+     */
+    getStore: function(){
+        return this.store;
+    },
+
+    /**
+     * Unbinds listeners from this component to the store. By default it will remove
+     * anything bound by the bindStoreListeners method, however it can be overridden
+     * in a subclass to provide any more complicated handling.
+     * @protected 
+     * @param {Ext.data.AbstractStore} store The store to unbind from
+     */
+    unbindStoreListeners: function(store) {
+        // Can be overridden in the subclass for more complex removal
+        var listeners = this.storeListeners;
+        if (listeners) {
+            store.un(listeners);
+        }
+    },
+
+    /**
+     * Binds listeners for this component to the store. By default it will add
+     * anything bound by the getStoreListeners method, however it can be overridden
+     * in a subclass to provide any more complicated handling.
+     * @protected 
+     * @param {Ext.data.AbstractStore} store The store to bind to
+     */
+    bindStoreListeners: function(store) {
+        // Can be overridden in the subclass for more complex binding
+        var me = this,
+            listeners = Ext.apply({}, me.getStoreListeners(store));
+
+        if (!listeners.scope) {
+            listeners.scope = me;
+        }
+        me.storeListeners = listeners;
+        store.on(listeners);
+    },
+
+    /**
+     * Gets the listeners to bind to a new store.
+     * @protected
+     * @param {Ext.data.Store} store The Store which is being bound to for which a listeners object should be returned.
+     * @return {Object} The listeners to be bound to the store in object literal form. The scope
+     * may be omitted, it is assumed to be the current instance.
+     */
+    getStoreListeners: Ext.emptyFn,
+
+    /**
+     * Template method, it is called when an existing store is unbound
+     * from the current instance.
+     * @protected
+     * @param {Ext.data.AbstractStore} store The store being unbound
+     * @param {Boolean} initial True if this store is being bound as initialization of the instance.
+     */
+    onUnbindStore: Ext.emptyFn,
+
+    /**
+     * Template method, it is called when a new store is bound
+     * to the current instance.
+     * @protected
+     * @param {Ext.data.AbstractStore} store The store being bound
+     * @param {Boolean} initial True if this store is being bound as initialization of the instance.
+     */
+    onBindStore: Ext.emptyFn    
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A modal, floating Component which may be shown above a specified {@link Ext.Component Component} while loading data.
+ * When shown, the configured owning Component will be covered with a modality mask, and the LoadMask's {@link #msg} will be
+ * displayed centered, accompanied by a spinner image.
+ *
+ * If the {@link #store} config option is specified, the masking will be automatically shown and then hidden synchronized with
+ * the Store's loading process.
+ *
+ * Because this is a floating Component, its z-index will be managed by the global {@link Ext.WindowManager ZIndexManager}
+ * object, and upon show, it will place itsef at the top of the hierarchy.
+ *
+ * Example usage:
+ *
+ *     // Basic mask:
+ *     var myMask = new Ext.LoadMask(myPanel, {msg:"Please wait..."});
+ *     myMask.show();
+ */
+Ext.define('Ext.LoadMask', {
+
+    extend:  Ext.Component ,
+
+    alias: 'widget.loadmask',
+
+    /* Begin Definitions */
+
+    mixins: {
+        floating:  Ext.util.Floating ,
+        bindable:  Ext.util.Bindable 
+    },
+
+                                    
+
+    /* End Definitions */
+    
+    /**
+     * @cfg {Ext.Component} target The Component you wish to mask. The the mask will be automatically sized
+     * upon Component resize, and the message box will be kept centered.
+     */
+
+    /**
+     * @cfg {Ext.data.Store} store
+     * Optional Store to which the mask is bound. The mask is displayed when a load request is issued, and
+     * hidden on either load success, or load fail.
+     */
+
+    //<locale>
+    /**
+     * @cfg {String} [msg="Loading..."]
+     * The text to display in a centered loading message box.
+     */
+    msg : 'Loading...',
+    //</locale>
+
+    /**
+     * @cfg {String} [msgCls="x-mask-loading"]
+     * The CSS class to apply to the loading message element.
+     */
+    msgCls : Ext.baseCSSPrefix + 'mask-loading',
+
+    /**
+     * @cfg {String} [maskCls="x-mask"]
+     * The CSS class to apply to the mask element
+     */
+    maskCls: Ext.baseCSSPrefix + 'mask',
+
+    /**
+     * @cfg {Boolean} [useMsg=true]
+     * Whether or not to use a loading message class or simply mask the bound element.
+     */
+    useMsg: true,
+
+    /**
+     * @cfg {Boolean} [useTargetEl=false]
+     * True to mask the {@link Ext.Component#getTargetEl targetEl} of the bound Component. By default,
+     * the {@link Ext.Component#getEl el} will be masked.
+     */
+    useTargetEl: false,
+
+    baseCls: Ext.baseCSSPrefix + 'mask-msg',
+
+    childEls: [
+        'msgEl',
+        'msgTextEl'
+    ],
+
+    renderTpl: [
+        '<div id="{id}-msgEl" class="{[values.$comp.msgCls]} ',
+            Ext.baseCSSPrefix, 'mask-msg-inner{childElCls}">',
+            '<div id="{id}-msgTextEl" class="', Ext.baseCSSPrefix ,'mask-msg-text',
+                '{childElCls}"></div>',
+        '</div>'
+    ],
+
+    // @private Obviously, it's floating.
+    floating: {
+        shadow: 'frame'
+    },
+
+    // @private Masks are not focusable
+    focusOnToFront: false,
+
+    // When we put the load mask to the front of it's owner, we generally don't want to also bring the owning
+    // component to the front.
+    bringParentToFront: false,
+
+    /**
+     * Creates new LoadMask.
+     * @param {Object} [config] The config object.
+     */
+    constructor : function(config) {
+        var me = this,
+            comp;
+
+        if (arguments.length === 2) {
+            if (Ext.isDefined(Ext.global.console)) {
+                Ext.global.console.warn('Ext.LoadMask: LoadMask now uses a standard 1 arg constructor: use the target config');
+            }
+            comp = config;
+            config = arguments[1];
+        } else {
+            comp = config.target;
+        }
+
+        // Element support to be deprecated
+        if (!comp.isComponent) {
+            if (Ext.isDefined(Ext.global.console)) {
+                Ext.global.console.warn('Ext.LoadMask: LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask');
+            }
+            comp = Ext.get(comp);
+            this.isElement = true;
+        }
+
+        me.ownerCt = comp;
+        if (!this.isElement) {
+            me.bindComponent(comp);
+        }
+        me.callParent([config]);
+
+        if (me.store) {
+            me.bindStore(me.store, true);
+        }
+    },
+
+    bindComponent: function(comp) {
+        var me = this,
+            listeners = {
+                scope: this,
+                resize: me.sizeMask,
+                added: me.onComponentAdded,
+                removed: me.onComponentRemoved
+            };
+            
+        if (comp.floating) {
+            listeners.move = me.sizeMask;
+            me.activeOwner = comp;
+        } else if (comp.ownerCt) {
+            me.onComponentAdded(comp.ownerCt);
+        } else {
+            // if the target comp is non-floating and under a floating comp don't bring the load mask to the front of the stack
+            me.preventBringToFront = true;
+        }
+
+        me.mon(comp, listeners);
+        
+        // subscribe to the observer that manages the hierarchy
+        me.mon(me.hierarchyEventSource, {
+            show: me.onContainerShow,
+            hide: me.onContainerHide,
+            expand: me.onContainerExpand,
+            collapse: me.onContainerCollapse,
+            scope: me
+        });
+    },
+
+    onComponentAdded: function(owner) {
+        var me = this;
+        delete me.activeOwner;
+        me.floatParent = owner;
+        if (!owner.floating) {
+            owner = owner.up('[floating]');
+        }
+        if (owner) {
+            me.activeOwner = owner;
+            me.mon(owner, 'move', me.sizeMask, me);
+        } else {
+            me.preventBringToFront = true;
+        }
+        owner = me.floatParent.ownerCt;
+        if (me.rendered && me.isVisible() && owner) {
+            me.floatOwner = owner;
+            me.mon(owner, 'afterlayout', me.sizeMask, me, {single: true});
+        }
+    },
+
+    onComponentRemoved: function(owner) {
+        var me = this,
+            activeOwner = me.activeOwner,
+            floatOwner = me.floatOwner;
+
+        if (activeOwner) {
+            me.mun(activeOwner, 'move', me.sizeMask, me);
+        }
+        if (floatOwner) {
+            me.mun(floatOwner, 'afterlayout', me.sizeMask, me);
+        }
+        delete me.activeOwner;
+        delete me.floatOwner;
+    },
+
+    afterRender: function() {
+        this.callParent(arguments);
+            this.container = this.floatParent.getContentTarget();
+    },
+
+    onContainerShow: function(container) {
+        if (this.isActiveContainer(container)) {
+            this.onComponentShow();
+        }
+    },
+
+    onContainerHide: function(container) {
+        if (this.isActiveContainer(container)) {
+            this.onComponentHide();
+        }
+    },
+
+    onContainerExpand: function(container) {
+        if (this.isActiveContainer(container)) {
+            this.onComponentShow();
+        }
+    },
+
+    onContainerCollapse: function(container) {
+        if (this.isActiveContainer(container)) {
+            this.onComponentHide();
+        }
+    },
+
+    isActiveContainer: function(container) {
+        return this.isDescendantOf(container);
+    },
+
+    onComponentHide: function() {
+        var me = this;
+
+        if (me.rendered && me.isVisible()) {
+            me.hide();
+            me.showNext = true;
+        }
+    },
+
+    onComponentShow: function() {
+        if (this.showNext) {
+            this.show();
+        }
+        delete this.showNext;
+    },
+
+    /**
+     * @private
+     * Called when this LoadMask's Component is resized. The toFront method rebases and resizes the modal mask.
+     */
+    sizeMask: function() {
+        var me = this,
+            target;
+
+        if (me.rendered && me.isVisible()) {
+            me.center();
+
+            target = me.getMaskTarget();
+            me.getMaskEl().show().setSize(target.getSize()).alignTo(target, 'tl-tl');
+
+        }
+    },
+
+    /**
+     * Changes the data store bound to this LoadMask.
+     * @param {Ext.data.Store} store The store to bind to this LoadMask
+     */
+    bindStore : function(store, initial) {
+        var me = this;
+        me.mixins.bindable.bindStore.apply(me, arguments);
+        store = me.store;
+        if (store && store.isLoading()) {
+            me.onBeforeLoad();
+        }
+    },
+
+    getStoreListeners: function(store) {
+        var load = this.onLoad,
+            beforeLoad = this.onBeforeLoad,
+            result = {
+                // Fired when a range is requested for rendering that is not in the cache
+                cachemiss: beforeLoad,
+
+                // Fired when a range for rendering which was previously missing from the cache is loaded
+                cachefilled: load
+            };
+
+        // Only need to mask on load if the proxy is asynchronous - ie: Ajax/JsonP
+        if (!store.proxy.isSynchronous) {
+            result.beforeLoad = beforeLoad;
+            result.load = load;
+        }
+        return result;
+    },
+
+    onDisable : function() {
+        this.callParent(arguments);
+        if (this.loading) {
+            this.onLoad();
+        }
+    },
+
+    getOwner: function() {
+        return this.ownerCt || this.floatParent;
+    },
+
+    getMaskTarget: function() {
+        var owner = this.getOwner();
+        return this.useTargetEl ? owner.getTargetEl() : owner.getEl();
+    },
+
+    // @private
+    onBeforeLoad : function() {
+        var me = this,
+            owner = me.getOwner(),
+            origin;
+
+        if (!me.disabled) {
+            me.loading = true;
+            // If the owning Component has not been layed out, defer so that the ZIndexManager
+            // gets to read its layed out size when sizing the modal mask
+            if (owner.componentLayoutCounter) {
+                me.maybeShow();
+            } else {
+                // The code below is a 'run-once' interceptor.
+                origin = owner.afterComponentLayout;
+                owner.afterComponentLayout = function() {
+                    owner.afterComponentLayout = origin;
+                    origin.apply(owner, arguments);
+                    me.maybeShow();
+                };
+            }
+        }
+    },
+
+    maybeShow: function() {
+        var me = this,
+            owner = me.getOwner();
+
+        if (!owner.isVisible(true)) {
+            me.showNext = true;
+        }
+        else if (me.loading && owner.rendered) {
+            me.show();
+        }
+    },
+
+    getMaskEl: function(){
+        var me = this;
+        return me.maskEl || (me.maskEl = me.el.insertSibling({
+            cls: me.maskCls,
+            style: {
+                zIndex: me.el.getStyle('zIndex') - 2
+            }
+        }, 'before'));
+    },
+
+    onShow: function() {
+        var me = this,
+            msgEl = me.msgEl;
+
+        me.callParent(arguments);
+        me.loading = true;
+
+        if (me.useMsg) {
+            msgEl.show();
+            me.msgTextEl.update(me.msg);
+        } else {
+            msgEl.parent().hide();
+        }
+    },
+
+    hide: function() {
+        // Element support to be deprecated
+        if (this.isElement) {
+            this.ownerCt.unmask();
+            this.fireEvent('hide', this);
+            return;
+        }
+        delete this.showNext;
+        return this.callParent(arguments);
+    },
+
+    onHide: function() {
+        this.callParent();
+        this.getMaskEl().hide();
+    },
+
+    show: function() {
+        // Element support to be deprecated
+        if (this.isElement) {
+            this.ownerCt.mask(this.useMsg ? this.msg : '', this.msgCls);
+            this.fireEvent('show', this);
+            return;
+        }
+        return this.callParent(arguments);
+    },
+
+    afterShow: function() {
+        this.callParent(arguments);
+        this.sizeMask();
+    },
+
+    setZIndex: function(index) {
+        var me = this,
+            owner = me.activeOwner;
+            
+        if (owner) {
+            // it seems silly to add 1 to have it subtracted in the call below,
+            // but this allows the x-mask el to have the correct z-index (same as the component)
+            // so instead of directly changing the zIndexStack just get the z-index of the owner comp
+            index = parseInt(owner.el.getStyle('zIndex'), 10) + 1;
+        }
+
+        me.getMaskEl().setStyle('zIndex', index - 1);
+        return me.mixins.floating.setZIndex.apply(me, arguments);
+    },
+
+    // @private
+    onLoad : function() {
+        this.loading = false;
+        this.hide();
+    },
+
+    onDestroy: function() {
+        var me = this;
+
+        if (me.isElement) {
+            me.ownerCt.unmask();
+        }
+
+        Ext.destroy(me.maskEl);
+        me.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Associations enable you to express relationships between different {@link Ext.data.Model Models}. Let's say we're
+ * writing an ecommerce system where Users can make Orders - there's a relationship between these Models that we can
+ * express like this:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'name', 'email'],
+ *
+ *         hasMany: {model: 'Order', name: 'orders'}
+ *     });
+ *
+ *     Ext.define('Order', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'user_id', 'status', 'price'],
+ *
+ *         belongsTo: 'User'
+ *     });
+ *
+ * We've set up two models - User and Order - and told them about each other. You can set up as many associations on
+ * each Model as you need using the two default types - {@link Ext.data.HasManyAssociation hasMany} and {@link
+ * Ext.data.BelongsToAssociation belongsTo}. There's much more detail on the usage of each of those inside their
+ * documentation pages. If you're not familiar with Models already, {@link Ext.data.Model there is plenty on those too}.
+ *
+ * **Further Reading**
+ *
+ *   - {@link Ext.data.association.HasMany hasMany associations}
+ *   - {@link Ext.data.association.BelongsTo belongsTo associations}
+ *   - {@link Ext.data.association.HasOne hasOne associations}
+ *   - {@link Ext.data.Model using Models}
+ *
+ * # Self association models
+ *
+ * We can also have models that create parent/child associations between the same type. Below is an example, where
+ * groups can be nested inside other groups:
+ *
+ *     // Server Data
+ *     {
+ *         "groups": {
+ *             "id": 10,
+ *             "parent_id": 100,
+ *             "name": "Main Group",
+ *             "parent_group": {
+ *                 "id": 100,
+ *                 "parent_id": null,
+ *                 "name": "Parent Group"
+ *             },
+ *             "nested" : {
+ *                 "child_groups": [{
+ *                     "id": 2,
+ *                     "parent_id": 10,
+ *                     "name": "Child Group 1"
+ *                 },{
+ *                     "id": 3,
+ *                     "parent_id": 10,
+ *                     "name": "Child Group 2"
+ *                 },{
+ *                     "id": 4,
+ *                     "parent_id": 10,
+ *                     "name": "Child Group 3"
+ *                 }]
+ *             }
+ *         }
+ *     }
+ *
+ *     // Client code
+ *     Ext.define('Group', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'parent_id', 'name'],
+ *         proxy: {
+ *             type: 'ajax',
+ *             url: 'data.json',
+ *             reader: {
+ *                 type: 'json',
+ *                 root: 'groups'
+ *             }
+ *         },
+ *         associations: [{
+ *             type: 'hasMany',
+ *             model: 'Group',
+ *             primaryKey: 'id',
+ *             foreignKey: 'parent_id',
+ *             autoLoad: true,
+ *             associationKey: 'nested.child_groups' // read child data from nested.child_groups
+ *         }, {
+ *             type: 'belongsTo',
+ *             model: 'Group',
+ *             primaryKey: 'id',
+ *             foreignKey: 'parent_id',
+ *             associationKey: 'parent_group' // read parent data from parent_group
+ *         }]
+ *     });
+ *
+ *     Ext.onReady(function(){
+ *
+ *         Group.load(10, {
+ *             success: function(group){
+ *                 console.log(group.getGroup().get('name'));
+ *
+ *                 group.groups().each(function(rec){
+ *                     console.log(rec.get('name'));
+ *                 });
+ *             }
+ *         });
+ *
+ *     });
+ *
+ */
+Ext.define('Ext.data.association.Association', {
+    alternateClassName: 'Ext.data.Association',
+    /**
+     * @cfg {String} ownerModel
+     * The string name of the model that owns the association.
+     *
+     * **NB!** This config is required when instantiating the Association directly.
+     * However, it cannot be used at all when defining the association as a config
+     * object inside Model, because the name of the model itself will be supplied
+     * automatically as the value of this config.
+     */
+
+    /**
+     * @cfg {String} associatedModel
+     * The string name of the model that is being associated with.
+     *
+     * **NB!** This config is required when instantiating the Association directly.
+     * When defining the association as a config object inside Model, the #model
+     * configuration will shadow this config.
+     */
+
+    /**
+     * @cfg {String} model
+     * The string name of the model that is being associated with.
+     *
+     * This config option is to be used when defining the association as a config
+     * object within Model.  The value is then mapped to #associatedModel when
+     * Association is instantiated inside Model.
+     */
+
+    /**
+     * @cfg {String} primaryKey
+     * The name of the primary key on the associated model. In general this will be the
+     * {@link Ext.data.Model#idProperty} of the Model.
+     */
+    primaryKey: 'id',
+
+    /**
+     * @cfg {Ext.data.reader.Reader} reader
+     * A special reader to read associated data
+     */
+    
+    /**
+     * @cfg {String} associationKey
+     * The name of the property in the data to read the association from. Defaults to the name of the associated model.
+     */
+
+    associationKeyFunction : null,
+
+    defaultReaderType: 'json',
+
+    isAssociation: true,
+
+    initialConfig: null,
+
+    statics: {
+        AUTO_ID: 1000,
+        
+        create: function(association){
+            if (Ext.isString(association)) {
+                association = {
+                    type: association
+                };
+            }
+
+            switch (association.type) {
+                case 'belongsTo':
+                    return new Ext.data.association.BelongsTo(association);
+                case 'hasMany':
+                    return new Ext.data.association.HasMany(association);
+                case 'hasOne':
+                    return new Ext.data.association.HasOne(association);
+                //TODO Add this back when it's fixed
+//                    case 'polymorphic':
+//                        return Ext.create('Ext.data.PolymorphicAssociation', association);
+                default:
+                    Ext.Error.raise('Unknown Association type: "' + association.type + '"');
+            }
+            return association;
+        }
+    },
+
+    /**
+     * Creates the Association object.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        Ext.apply(this, config);
+
+        var me              = this,
+            types           = Ext.ModelManager.types,
+            ownerName       = config.ownerModel,
+            associatedName  = config.associatedModel,
+            ownerModel      = types[ownerName],
+            associatedModel = types[associatedName],
+            associationKey  = config.associationKey,
+            keyReIdx;
+
+        if (associationKey) {
+            keyReIdx = String(associationKey).search(/[\[\.]/);
+
+            if (keyReIdx >= 0) {
+                me.associationKeyFunction = Ext.functionFactory('obj', 'return obj' + (keyReIdx > 0 ? '.' : '') + associationKey);
+            }
+        }
+
+        me.initialConfig = config;
+
+        if (ownerModel === undefined) {
+            Ext.Error.raise("The configured ownerModel was not valid (you tried " + ownerName + ")");
+        }
+        if (associatedModel === undefined) {
+            Ext.Error.raise("The configured associatedModel was not valid (you tried " + associatedName + ")");
+        }
+
+        me.ownerModel = ownerModel;
+        me.associatedModel = associatedModel;
+
+        /**
+         * @property {String} ownerName
+         * The name of the model that 'owns' the association
+         */
+
+        /**
+         * @property {String} associatedName
+         * The name of the model is on the other end of the association (e.g. if a User model hasMany Orders, this is
+         * 'Order')
+         */
+
+        Ext.applyIf(me, {
+            ownerName : ownerName,
+            associatedName: associatedName
+        });
+        
+        me.associationId = 'association' + (++me.statics().AUTO_ID);
+    },
+
+    /**
+     * Get a specialized reader for reading associated data
+     * @return {Ext.data.reader.Reader} The reader, null if not supplied
+     */
+    getReader: function(){
+        var me = this,
+            reader = me.reader,
+            model = me.associatedModel;
+
+        if (reader) {
+            if (Ext.isString(reader)) {
+                reader = {
+                    type: reader
+                };
+            }
+            if (reader.isReader) {
+                reader.setModel(model);
+            } else {
+                Ext.applyIf(reader, {
+                    model: model,
+                    type : me.defaultReaderType
+                });
+            }
+            me.reader = Ext.createByAlias('reader.' + reader.type, reader);
+        }
+        return me.reader || null;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * @class Ext.ModelManager
+
+The ModelManager keeps track of all {@link Ext.data.Model} types defined in your application.
+
+__Creating Model Instances__
+
+Model instances can be created by using the {@link Ext#create Ext.create} method. Ext.create replaces
+the deprecated {@link #create Ext.ModelManager.create} method. It is also possible to create a model instance
+this by using the Model type directly. The following 3 snippets are equivalent:
+
+    Ext.define('User', {
+        extend: 'Ext.data.Model',
+        fields: ['first', 'last']
+    });
+
+    // method 1, create using Ext.create (recommended)
+    Ext.create('User', {
+        first: 'Ed',
+        last: 'Spencer'
+    });
+
+    // method 2, create through the manager (deprecated)
+    Ext.ModelManager.create({
+        first: 'Ed',
+        last: 'Spencer'
+    }, 'User');
+
+    // method 3, create on the type directly
+    new User({
+        first: 'Ed',
+        last: 'Spencer'
+    });
+
+__Accessing Model Types__
+
+A reference to a Model type can be obtained by using the {@link #getModel} function. Since models types
+are normal classes, you can access the type directly. The following snippets are equivalent:
+
+    Ext.define('User', {
+        extend: 'Ext.data.Model',
+        fields: ['first', 'last']
+    });
+
+    // method 1, access model type through the manager
+    var UserType = Ext.ModelManager.getModel('User');
+
+    // method 2, reference the type directly
+    var UserType = User;
+
+ * @markdown
+ * @singleton
+ */
+Ext.define('Ext.ModelManager', {
+    extend:  Ext.AbstractManager ,
+    alternateClassName: 'Ext.ModelMgr',
+                                                   
+    
+    singleton: true,
+
+    typeName: 'mtype',
+
+    /**
+     * Private stack of associations that must be created once their associated model has been defined
+     * @property {Ext.data.association.Association[]} associationStack
+     */
+    associationStack: [],
+
+    /**
+     * Registers a model definition. All model plugins marked with isDefault: true are bootstrapped
+     * immediately, as are any addition plugins defined in the model config.
+     * @private
+     */
+    registerType: function(name, config) {
+        var proto = config.prototype,
+            model;
+        if (proto && proto.isModel) {
+            // registering an already defined model
+            model = config;
+        } else {
+            // passing in a configuration
+            if (!config.extend) {
+                config.extend = 'Ext.data.Model';
+            }
+            model = Ext.define(name, config);
+        }
+        this.types[name] = model;
+        return model;
+    },
+    
+    /**
+     * Unregisters a model definition. Generally used by stores with implicit model classes.
+     * @private
+     */
+    unregisterType: function(name) {
+        delete this.types[name];
+    },
+
+    /**
+     * @private
+     * Private callback called whenever a model has just been defined. This sets up any associations
+     * that were waiting for the given model to be defined
+     * @param {Function} model The model that was just created
+     */
+    onModelDefined: function(model) {
+        var stack  = this.associationStack,
+            length = stack.length,
+            create = [],
+            association, i, created;
+
+        for (i = 0; i < length; i++) {
+            association = stack[i];
+
+            if (association.associatedModel == model.modelName) {
+                create.push(association);
+            }
+        }
+
+        for (i = 0, length = create.length; i < length; i++) {
+            created = create[i];
+            this.types[created.ownerModel].prototype.associations.add(Ext.data.association.Association.create(created));
+            Ext.Array.remove(stack, created);
+        }
+    },
+
+    /**
+     * Registers an association where one of the models defined doesn't exist yet.
+     * The ModelManager will check when new models are registered if it can link them
+     * together
+     * @private
+     * @param {Ext.data.association.Association} association The association
+     */
+    registerDeferredAssociation: function(association){
+        this.associationStack.push(association);
+    },
+
+    /**
+     * Returns the {@link Ext.data.Model} class for a given model name
+     * @param {String/Object} id The classname of the model or the model class itself.
+     * @return {Ext.data.Model} a model class.
+     */
+    getModel: function(id) {
+        var model = id;
+        if (typeof model == 'string') {
+            model = this.types[model];
+        }
+        return model;
+    },
+
+    /**
+     * Creates a new instance of a Model using the given data. Deprecated, instead use Ext.create:
+     *
+     *     Ext.create('User', {
+     *         first: 'Ed',
+     *         last: 'Spencer'
+     *     });
+     *
+     * @deprecated 4.1 Use {@link Ext#create Ext.create} instead.
+     *
+     * @param {Object} data Data to initialize the Model's fields with
+     * @param {String} name The name of the model to create
+     * @param {Number} id (Optional) unique id of the Model instance (see {@link Ext.data.Model})
+     */
+    create: function(config, name, id) {
+        var Con = typeof name == 'function' ? name : this.types[name || config.name];
+
+        return new Con(config, id);
+    }
+}, function() {
+
+    /**
+     * Old way for creating Model classes.  Instead use:
+     *
+     *     Ext.define("MyModel", {
+     *         extend: "Ext.data.Model",
+     *         fields: []
+     *     });
+     *
+     * @param {String} name Name of the Model class.
+     * @param {Object} config A configuration object for the Model you wish to create.
+     * @return {Ext.data.Model} The newly registered Model
+     * @member Ext
+     * @deprecated 4.0.0 Use {@link Ext#define} instead.
+     */
+    Ext.regModel = function() {
+        if (Ext.isDefined(Ext.global.console)) {
+            Ext.global.console.warn('Ext.regModel has been deprecated. Models can now be created by extending Ext.data.Model: Ext.define("MyModel", {extend: "Ext.data.Model", fields: []});.');
+        }
+        return this.ModelManager.registerType.apply(this.ModelManager, arguments);
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is intended to be extended or created via the {@link Ext.Component#componentLayout layout}
+ * configuration property.  See {@link Ext.Component#componentLayout} for additional details.
+ * @private
+ */
+Ext.define('Ext.layout.component.Component', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.layout.Layout ,
+
+    /* End Definitions */
+
+    type: 'component',
+
+    isComponentLayout: true,
+
+    nullBox: {},
+
+    usesContentHeight: true,
+    usesContentWidth: true,
+    usesHeight: true,
+    usesWidth: true,
+
+    beginLayoutCycle: function (ownerContext, firstCycle) {
+        var me = this,
+            owner = me.owner,
+            ownerCtContext = ownerContext.ownerCtContext,
+            heightModel = ownerContext.heightModel,
+            widthModel = ownerContext.widthModel,
+            body = owner.el.dom === document.body,
+            lastBox = owner.lastBox || me.nullBox,
+            lastSize = owner.el.lastBox || me.nullBox,
+            dirty = !body,
+            ownerLayout, v, widthName, heightName;
+
+        me.callParent(arguments);
+
+        if (firstCycle) {
+            if (me.usesContentWidth) {
+                ++ownerContext.consumersContentWidth;
+            }
+            if (me.usesContentHeight) {
+                ++ownerContext.consumersContentHeight;
+            }
+            if (me.usesWidth) {
+                ++ownerContext.consumersWidth;
+            }
+            if (me.usesHeight) {
+                ++ownerContext.consumersHeight;
+            }
+
+            if (ownerCtContext && !ownerCtContext.hasRawContent) {
+                ownerLayout = owner.ownerLayout;
+
+                if (ownerLayout.usesWidth) {
+                    ++ownerContext.consumersWidth;
+                }
+                if (ownerLayout.usesHeight) {
+                    ++ownerContext.consumersHeight;
+                }
+            }
+        }
+
+        // we want to publish configured dimensions as early as possible and since this is
+        // a write phase...
+
+        if (widthModel.configured) {
+            // If the owner.el is the body, owner.width is not dirty (we don't want to write
+            // it to the body el). For other el's, the width may already be correct in the
+            // DOM (e.g., it is rendered in the markup initially). If the width is not
+            // correct in the DOM, this is only going to be the case on the first cycle.
+            widthName = widthModel.names.width;
+
+            if (!body) {
+                dirty = firstCycle ? owner[widthName] !== lastSize.width
+                                   : widthModel.constrained;
+            }
+            
+            ownerContext.setWidth(owner[widthName], dirty);
+        } else if (ownerContext.isTopLevel) {
+            if (widthModel.calculated) {
+                v = lastBox.width;
+                ownerContext.setWidth(v, /*dirty=*/v != lastSize.width);
+            }
+
+            v = lastBox.x;
+            ownerContext.setProp('x', v, /*dirty=*/v != lastSize.x);
+        }
+
+        if (heightModel.configured) {
+            heightName = heightModel.names.height;
+
+            if (!body) {
+                dirty = firstCycle ? owner[heightName] !== lastSize.height
+                                   : heightModel.constrained;
+            }
+
+            ownerContext.setHeight(owner[heightName], dirty);
+        } else if (ownerContext.isTopLevel) {
+            if (heightModel.calculated) {
+                v = lastBox.height;
+                ownerContext.setHeight(v, v != lastSize.height);
+            }
+
+            v = lastBox.y;
+            ownerContext.setProp('y', v, /*dirty=*/v != lastSize.y);
+        }
+    },
+
+    finishedLayout: function(ownerContext) {
+        var me = this,
+            elementChildren = ownerContext.children,
+            owner = me.owner,
+            len, i, elContext, lastBox, props;
+
+        // NOTE: In the code below we cannot use getProp because that will generate a layout dependency
+
+        // Set lastBox on managed child Elements.
+        // So that ContextItem.constructor can snag the lastBox for use by its undo method.
+        if (elementChildren) {
+            len = elementChildren.length;
+            for (i = 0; i < len; i++) {
+                elContext = elementChildren[i];
+                elContext.el.lastBox = elContext.props;
+            }
+        }
+
+        // Cache the size from which we are changing so that notifyOwner can notify the owningComponent with all essential information
+        ownerContext.previousSize = me.lastComponentSize;
+
+        // Cache the currently layed out size
+        me.lastComponentSize = owner.el.lastBox = props = ownerContext.props;
+        
+        // lastBox is a copy of the defined props to allow save/restore of these (panel
+        // collapse needs this)
+        lastBox = owner.lastBox || (owner.lastBox = {});
+        lastBox.x = props.x;
+        lastBox.y = props.y;
+        lastBox.width = props.width;
+        lastBox.height = props.height;
+        lastBox.invalid = false;
+        
+        me.callParent(arguments);
+    },
+    
+    notifyOwner: function(ownerContext) {
+        var me = this,
+            currentSize = me.lastComponentSize,
+            prevSize = ownerContext.previousSize,
+            args = [currentSize.width, currentSize.height];
+
+        if (prevSize) {
+            args.push(prevSize.width, prevSize.height);
+        }
+
+        // Call afterComponentLayout passing new size, and only passing old size if there *was* an old size.
+        me.owner.afterComponentLayout.apply(me.owner, args);
+    },
+
+    /**
+     * Returns the owner component's resize element.
+     * @return {Ext.Element}
+     */
+    getTarget : function() {
+        return this.owner.el;
+    },
+
+    /**
+     * Returns the element into which rendering must take place. Defaults to the owner Component's encapsulating element.
+     *
+     * May be overridden in Component layout managers which implement an inner element.
+     * @return {Ext.Element}
+     */
+    getRenderTarget : function() {
+        return this.owner.el;
+    },
+
+    cacheTargetInfo: function(ownerContext) {
+        var me = this,
+            targetInfo = me.targetInfo,
+            target;
+
+        if (!targetInfo) {
+            target = ownerContext.getEl('getTarget', me);
+
+            me.targetInfo = targetInfo = {
+                padding: target.getPaddingInfo(),
+                border: target.getBorderInfo()
+            };
+        }
+
+        return targetInfo;
+    },
+
+    measureAutoDimensions: function (ownerContext, dimensions) {
+        // Subtle But Important:
+        // 
+        // We don't want to call getProp/hasProp et.al. unless we in fact need that value
+        // for our results! If we call it and don't need it, the layout manager will think
+        // we depend on it and will schedule us again should it change.
+
+        var me = this,
+            owner = me.owner,
+            containerLayout = owner.layout,
+            heightModel = ownerContext.heightModel,
+            widthModel = ownerContext.widthModel,
+            boxParent = ownerContext.boxParent,
+            isBoxParent = ownerContext.isBoxParent,
+            props = ownerContext.props,
+            isContainer,
+            ret = {
+                gotWidth: false,
+                gotHeight: false,
+                isContainer: (isContainer = !ownerContext.hasRawContent)
+            },
+            hv = dimensions || 3,
+            zeroWidth, zeroHeight,
+            needed = 0,
+            got = 0,
+            ready, size, temp;
+
+        // Note: this method is called *a lot*, so we have to be careful not to waste any
+        // time or make useless calls or, especially, read the DOM when we can avoid it.
+
+        //---------------------------------------------------------------------
+        // Width
+
+        if (widthModel.shrinkWrap && ownerContext.consumersContentWidth) {
+            ++needed;
+            zeroWidth = !(hv & 1);
+
+            if (isContainer) {
+                // as a componentLayout for a container, we rely on the container layout to
+                // produce contentWidth...
+                if (zeroWidth) {
+                    ret.contentWidth = 0;
+                    ret.gotWidth = true;
+                    ++got;
+                } else if ((ret.contentWidth = ownerContext.getProp('contentWidth')) !== undefined) {
+                    ret.gotWidth = true;
+                    ++got;
+                }
+            } else {
+                size = props.contentWidth;
+
+                if (typeof size == 'number') { // if (already determined)
+                    ret.contentWidth = size;
+                    ret.gotWidth = true;
+                    ++got;
+                } else {
+                    if (zeroWidth) {
+                        ready = true;
+                    } else if (!ownerContext.hasDomProp('containerChildrenSizeDone')) {
+                        ready = false;
+                    } else if (isBoxParent || !boxParent || boxParent.widthModel.shrinkWrap) {
+                        // if we have no boxParent, we are ready, but a shrinkWrap boxParent
+                        // artificially provides width early in the measurement process so
+                        // we are ready to go in that case as well...
+                        ready = true;
+                    } else {
+                        // lastly, we have a boxParent that will be given a width, so we
+                        // can wait for that width to be set in order to properly measure
+                        // whatever is inside...
+                        ready = boxParent.hasDomProp('width');
+                    }
+
+                    if (ready) {
+                        if (zeroWidth) {
+                            temp = 0;
+                        } else if (containerLayout && containerLayout.measureContentWidth) {
+                            // Allow the container layout to do the measurement since it
+                            // may have a better idea of how to do it even with no items:
+                            temp = containerLayout.measureContentWidth(ownerContext);
+                        } else {
+                            temp = me.measureContentWidth(ownerContext);
+                        }
+
+                        if (!isNaN(ret.contentWidth = temp)) {
+                            ownerContext.setContentWidth(temp, true);
+                            ret.gotWidth = true;
+                            ++got;
+                        }
+                    }
+                }
+            }
+        } else if (widthModel.natural && ownerContext.consumersWidth) {
+            ++needed;
+            size = props.width;
+            // zeroWidth does not apply
+
+            if (typeof size == 'number') { // if (already determined)
+                ret.width = size;
+                ret.gotWidth = true;
+                ++got;
+            } else {
+                if (isBoxParent || !boxParent) {
+                    ready = true;
+                } else {
+                    // lastly, we have a boxParent that will be given a width, so we
+                    // can wait for that width to be set in order to properly measure
+                    // whatever is inside...
+                    ready = boxParent.hasDomProp('width');
+                }
+
+                if (ready) {
+                    if (!isNaN(ret.width = me.measureOwnerWidth(ownerContext))) {
+                        ownerContext.setWidth(ret.width, false);
+                        ret.gotWidth = true;
+                        ++got;
+                    }
+                }
+            }
+        }
+
+        //---------------------------------------------------------------------
+        // Height
+
+        if (heightModel.shrinkWrap && ownerContext.consumersContentHeight) {
+            ++needed;
+            zeroHeight = !(hv & 2);
+
+            if (isContainer) {
+                // don't ask unless we need to know...
+                if (zeroHeight) {
+                    ret.contentHeight = 0;
+                    ret.gotHeight = true;
+                    ++got;
+                } else if ((ret.contentHeight = ownerContext.getProp('contentHeight')) !== undefined) {
+                    ret.gotHeight = true;
+                    ++got;
+                }
+            } else {
+                size = props.contentHeight;
+
+                if (typeof size == 'number') { // if (already determined)
+                    ret.contentHeight = size;
+                    ret.gotHeight = true;
+                    ++got;
+                } else {
+                    if (zeroHeight) {
+                        ready = true;
+                    } else if (!ownerContext.hasDomProp('containerChildrenSizeDone')) {
+                        ready = false;
+                    } else if (owner.noWrap) {
+                        ready = true;
+                    } else if (!widthModel.shrinkWrap) {
+                        // fixed width, so we need the width to determine the height...
+                        ready = (ownerContext.bodyContext || ownerContext).hasDomProp('width');// && (!ownerContext.bodyContext || ownerContext.bodyContext.hasDomProp('width'));
+                    } else if (isBoxParent || !boxParent || boxParent.widthModel.shrinkWrap) {
+                        // if we have no boxParent, we are ready, but an autoWidth boxParent
+                        // artificially provides width early in the measurement process so
+                        // we are ready to go in that case as well...
+                        ready = true;
+                    } else {
+                        // lastly, we have a boxParent that will be given a width, so we
+                        // can wait for that width to be set in order to properly measure
+                        // whatever is inside...
+                        ready = boxParent.hasDomProp('width');
+                    }
+
+                    if (ready) {
+                        if (zeroHeight) {
+                            temp = 0;
+                        } else if (containerLayout && containerLayout.measureContentHeight) {
+                            // Allow the container layout to do the measurement since it
+                            // may have a better idea of how to do it even with no items:
+                            temp = containerLayout.measureContentHeight(ownerContext);
+                        } else {
+                            temp = me.measureContentHeight(ownerContext);
+                        }
+
+                        if (!isNaN(ret.contentHeight = temp)) {
+                            ownerContext.setContentHeight(temp, true);
+                            ret.gotHeight = true;
+                            ++got;
+                        }
+                    }
+                }
+            }
+        } else if (heightModel.natural && ownerContext.consumersHeight) {
+            ++needed;
+            size = props.height;
+            // zeroHeight does not apply
+
+            if (typeof size == 'number') { // if (already determined)
+                ret.height = size;
+                ret.gotHeight = true;
+                ++got;
+            } else {
+                if (isBoxParent || !boxParent) {
+                    ready = true;
+                } else {
+                    // lastly, we have a boxParent that will be given a width, so we
+                    // can wait for that width to be set in order to properly measure
+                    // whatever is inside...
+                    ready = boxParent.hasDomProp('width');
+                }
+
+                if (ready) {
+                    if (!isNaN(ret.height = me.measureOwnerHeight(ownerContext))) {
+                        ownerContext.setHeight(ret.height, false);
+                        ret.gotHeight = true;
+                        ++got;
+                    }
+                }
+            }
+        }
+
+        if (boxParent) {
+            ownerContext.onBoxMeasured();
+        }
+
+        ret.gotAll = got == needed;
+        // see if we can avoid calling this method by storing something on ownerContext.
+        return ret;
+    },
+
+    measureContentWidth: function (ownerContext) {
+        // contentWidth includes padding, but not border, framing or margins
+        return ownerContext.el.getWidth() - ownerContext.getFrameInfo().width;
+    },
+
+    measureContentHeight: function (ownerContext) {
+        // contentHeight includes padding, but not border, framing or margins
+        return ownerContext.el.getHeight() - ownerContext.getFrameInfo().height;
+    },
+
+    measureOwnerHeight: function (ownerContext) {
+        return ownerContext.el.getHeight();
+    },
+
+    measureOwnerWidth: function (ownerContext) {
+        return ownerContext.el.getWidth();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * The class is the default component layout for {@link Ext.Component} when no explicit
+ * `{@link Ext.Component#componentLayout componentLayout}` is configured.
+ *
+ * This class uses template methods to perform the individual aspects of measurement,
+ * calculation and publication of results. The methods called depend on the component's
+ * {@link Ext.AbstractComponent#getSizeModel size model}.
+ * 
+ * ## configured / calculated
+ *
+ * In either of these size models, the dimension of the outer element is of a known size.
+ * The size is found in the `ownerContext` (the {@link Ext.layout.ContextItem} for the owner
+ * component) as either "width" or "height". This value, if available, is passed to the
+ * `publishInnerWidth` or `publishInnerHeight` method, respectively.
+ * 
+ * ## shrinkWrap
+ *
+ * When a dimension uses the `shrinkWrap` size model, that means the content is measured,
+ * then the outer (owner) size is calculated and published.
+ * 
+ * For example, for a shrinkWrap width, the following sequence of calls are made:
+ * 
+ * - `Ext.layout.component.Component#measureContentWidth`
+ * - `publishOwnerWidth`
+ *    - `calculateOwnerWidthFromContentWidth`
+ *    - `publishInnerWidth` (in the event of hitting a min/maxWidth constraint)
+ *
+ * ## natural
+ *
+ * When a dimension uses the `natural` size model, the measurement is made on the outer
+ * (owner) element. This size is then used to determine the content area in much the same
+ * way as if the outer element had a `configured` or `calculated` size model.
+ * 
+ * - `Ext.layout.component.Component#measureOwnerWidth`
+ * - `publishInnerWidth`
+ *
+ * @protected
+ */
+Ext.define('Ext.layout.component.Auto', {
+
+    /* Begin Definitions */
+
+    alias: 'layout.autocomponent',
+
+    extend:  Ext.layout.component.Component ,
+
+    /* End Definitions */
+
+    type: 'autocomponent',
+
+    /**
+     * @cfg {Boolean} [setHeightInDom=false]
+     * @protected
+     * When publishing height of an auto Component, it is usually not written to the DOM.
+     * Setting this to `true` overrides this behaviour.
+     */
+    setHeightInDom: false,
+
+    /**
+     * @cfg {Boolean} [setWidthInDom=false]
+     * @protected
+     * When publishing width of an auto Component, it is usually not written to the DOM.
+     * Setting this to `true` overrides this behaviour.
+     */
+    setWidthInDom: false,
+
+    waitForOuterHeightInDom: false,
+    waitForOuterWidthInDom: false,
+    
+    beginLayoutCycle: function(ownerContext, firstCycle){
+        var me = this,
+            lastWidthModel = me.lastWidthModel,
+            lastHeightModel = me.lastHeightModel,
+            el = me.owner.el;
+            
+        me.callParent(arguments);
+            
+        if (lastWidthModel && lastWidthModel.fixed && ownerContext.widthModel.shrinkWrap) {
+            el.setWidth(null);
+        }
+            
+        if (lastHeightModel && lastHeightModel.fixed && ownerContext.heightModel.shrinkWrap) {
+            el.setHeight(null);
+        }    
+    },
+
+    calculate: function(ownerContext) {
+        var me = this,
+            measurement = me.measureAutoDimensions(ownerContext),
+            heightModel = ownerContext.heightModel,
+            widthModel = ownerContext.widthModel,
+            width, height;
+
+        // It is generally important to process widths before heights, since widths can
+        // often effect heights...
+        if (measurement.gotWidth) {
+            if (widthModel.shrinkWrap) {
+                me.publishOwnerWidth(ownerContext, measurement.contentWidth);
+            } else if (me.publishInnerWidth) {
+                me.publishInnerWidth(ownerContext, measurement.width);
+            }
+        } else if (!widthModel.auto && me.publishInnerWidth) {
+            width = me.waitForOuterWidthInDom ? ownerContext.getDomProp('width')
+                        : ownerContext.getProp('width');
+            if (width === undefined) {
+                me.done = false;
+            } else {
+                me.publishInnerWidth(ownerContext, width);
+            }
+        }
+
+        if (measurement.gotHeight) {
+            if (heightModel.shrinkWrap) {
+                me.publishOwnerHeight(ownerContext, measurement.contentHeight);
+            } else if (me.publishInnerHeight) {
+                me.publishInnerHeight(ownerContext, measurement.height);
+            }
+        } else if (!heightModel.auto && me.publishInnerHeight) {
+            height = me.waitForOuterHeightInDom ? ownerContext.getDomProp('height')
+                        : ownerContext.getProp('height');
+            if (height === undefined) {
+                me.done = false;
+            } else {
+               me.publishInnerHeight(ownerContext, height);
+            }
+        }
+
+        if (!measurement.gotAll) {
+            me.done = false;
+        }
+    },
+
+    calculateOwnerHeightFromContentHeight: function (ownerContext, contentHeight) {
+        return contentHeight + ownerContext.getFrameInfo().height;
+    },
+
+    calculateOwnerWidthFromContentWidth: function (ownerContext, contentWidth) {
+        return contentWidth + ownerContext.getFrameInfo().width;
+    },
+
+    publishOwnerHeight: function (ownerContext, contentHeight) {
+        var me = this,
+            owner = me.owner,
+            height = me.calculateOwnerHeightFromContentHeight(ownerContext, contentHeight),
+            constrainedHeight, dirty, heightModel;
+
+        if (isNaN(height)) {
+            me.done = false;
+        } else {
+            constrainedHeight = Ext.Number.constrain(height, owner.minHeight, owner.maxHeight);
+
+            if (constrainedHeight == height) {
+                dirty = me.setHeightInDom;
+            } else {
+                heightModel = me.sizeModels[
+                    (constrainedHeight < height) ? 'constrainedMax' : 'constrainedMin'];
+                height = constrainedHeight;
+
+                if (ownerContext.heightModel.calculatedFromShrinkWrap) {
+                    // Don't bother to invalidate since that will come soon... but we need
+                    // to signal our ownerLayout that we need an invalidate to actually
+                    // make good on the determined (constrained) size!
+                    ownerContext.heightModel = heightModel;
+                } else {
+                    ownerContext.invalidate({ heightModel: heightModel });
+                }
+            }
+            
+            ownerContext.setHeight(height, dirty);
+        }
+    },
+
+    publishOwnerWidth: function (ownerContext, contentWidth) {
+        var me = this,
+            owner = me.owner,
+            width = me.calculateOwnerWidthFromContentWidth(ownerContext, contentWidth),
+            constrainedWidth, dirty, widthModel;
+
+        if (isNaN(width)) {
+            me.done = false;
+        } else {
+            constrainedWidth = Ext.Number.constrain(width, owner.minWidth, owner.maxWidth);
+
+            if (constrainedWidth == width) {
+                dirty = me.setWidthInDom;
+            } else {
+                widthModel = me.sizeModels[
+                    (constrainedWidth < width) ? 'constrainedMax' : 'constrainedMin'];
+                width = constrainedWidth;
+
+                if (ownerContext.widthModel.calculatedFromShrinkWrap) {
+                    // Don't bother to invalidate since that will come soon... but we need
+                    // to signal our ownerLayout that we need an invalidate to actually
+                    // make good on the determined (constrained) size!
+                    ownerContext.widthModel = widthModel;
+                } else {
+                    ownerContext.invalidate({ widthModel: widthModel });
+                }
+            }
+
+            ownerContext.setWidth(width, dirty);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.layout.component.ProgressBar', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.progressbar'],
+
+    extend:  Ext.layout.component.Auto ,
+
+    /* End Definitions */
+
+    type: 'progressbar',
+
+    beginLayout: function (ownerContext) {
+        var me = this,
+            i, textEls;
+
+        me.callParent(arguments);
+
+        if (!ownerContext.textEls) {
+            textEls = me.owner.textEl; // an Ext.Element or CompositeList (raw DOM el's)
+
+            if (textEls.isComposite) {
+                ownerContext.textEls = [];
+                textEls = textEls.elements;
+                for (i = textEls.length; i--; ) {
+                    ownerContext.textEls[i] = ownerContext.getEl(Ext.get(textEls[i]));
+                }
+            } else {
+                ownerContext.textEls = [ ownerContext.getEl('textEl') ];
+            }
+        }
+    },
+
+    calculate: function(ownerContext) {
+        var me = this,
+            i, textEls, width;
+
+        me.callParent(arguments);
+
+        if (Ext.isNumber(width = ownerContext.getProp('width'))) {
+            width -= ownerContext.getBorderInfo().width;
+            textEls = ownerContext.textEls;
+
+            for (i = textEls.length; i--; ) {
+                textEls[i].setWidth(width);
+            }
+        } else {
+            me.done = false;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * An updateable progress bar component. The progress bar supports two different modes: manual and automatic.
+ *
+ * In manual mode, you are responsible for showing, updating (via {@link #updateProgress}) and clearing the progress bar
+ * as needed from your own code. This method is most appropriate when you want to show progress throughout an operation
+ * that has predictable points of interest at which you can update the control.
+ *
+ * In automatic mode, you simply call {@link #wait} and let the progress bar run indefinitely, only clearing it once the
+ * operation is complete. You can optionally have the progress bar wait for a specific amount of time and then clear
+ * itself. Automatic mode is most appropriate for timed operations or asynchronous operations in which you have no need
+ * for indicating intermediate progress.
+ *
+ *     @example
+ *     var p = Ext.create('Ext.ProgressBar', {
+ *        renderTo: Ext.getBody(),
+ *        width: 300
+ *     });
+ *
+ *     // Wait for 5 seconds, then update the status el (progress bar will auto-reset)
+ *     p.wait({
+ *         interval: 500, //bar will move fast!
+ *         duration: 50000,
+ *         increment: 15,
+ *         text: 'Updating...',
+ *         scope: this,
+ *         fn: function(){
+ *             p.updateText('Done!');
+ *         }
+ *     });
+ */
+Ext.define('Ext.ProgressBar', {
+    extend:  Ext.Component ,
+    alias: 'widget.progressbar',
+
+               
+                       
+                               
+                          
+                                          
+      
+
+                          
+
+   /**
+    * @cfg {Number} [value=0]
+    * A floating point value between 0 and 1 (e.g., .5)
+    */
+
+   /**
+    * @cfg {String/HTMLElement/Ext.Element} textEl
+    * The element to render the progress text to (defaults to the progress bar's internal text element)
+    */
+
+   /**
+    * @cfg {String} id
+    * The progress bar element's id (defaults to an auto-generated id)
+    */
+
+   /**
+    * @cfg {String} [baseCls='x-progress']
+    * The base CSS class to apply to the progress bar's wrapper element.
+    */
+    baseCls: Ext.baseCSSPrefix + 'progress',
+
+    /**
+     * @cfg {Boolean/Object} animate
+     * True to animate the progress bar during transitions, or an animation configuration
+     * (see the {@link #method-animate} method for details).
+     */
+    animate: false,
+
+    /**
+     * @cfg {String} text
+     * The text shown in the progress bar.
+     */
+    text: '',
+
+    // private
+    waitTimer: null,
+
+    childEls: [
+        'bar'
+    ],
+
+    renderTpl: [
+        '<tpl if="internalText">',
+            '<div class="{baseCls}-text {baseCls}-text-back">{text}</div>',
+        '</tpl>',
+        '<div id="{id}-bar" class="{baseCls}-bar {baseCls}-bar-{ui}" style="width:{percentage}%">',
+            '<tpl if="internalText">',
+                '<div class="{baseCls}-text">',
+                    '<div>{text}</div>',
+                '</div>',
+            '</tpl>',
+        '</div>'
+    ],
+
+    componentLayout: 'progressbar',
+
+    // private
+    initComponent: function() {
+        this.callParent();
+
+        this.addEvents(
+            /**
+             * @event update
+             * Fires after each update interval
+             * @param {Ext.ProgressBar} this
+             * @param {Number} value The current progress value
+             * @param {String} text The current progress text
+             */
+            "update"
+        );
+    },
+
+    initRenderData: function() {
+        var me = this;
+        return Ext.apply(me.callParent(), {
+            internalText : !me.hasOwnProperty('textEl'),
+            text         : me.text || ' ',
+            percentage   : me.value ? me.value * 100 : 0
+        });
+    },
+
+    onRender : function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // External text display
+        if (me.textEl) {
+            me.textEl = Ext.get(me.textEl);
+            me.updateText(me.text);
+        }
+        // Inline text display
+        else {
+            // This produces a composite w/2 el's (which is why we cannot use childEls or
+            // renderSelectors):
+            me.textEl = me.el.select('.' + me.baseCls + '-text');
+        }
+    },
+
+    /**
+     * Updates the progress bar value, and optionally its text. If the text argument is not specified, any existing text
+     * value will be unchanged. To blank out existing text, pass ''. Note that even if the progress bar value exceeds 1,
+     * it will never automatically reset -- you are responsible for determining when the progress is complete and
+     * calling {@link #reset} to clear and/or hide the control.
+     * @param {Number} [value=0] A floating point value between 0 and 1 (e.g., .5)
+     * @param {String} [text=''] The string to display in the progress text element
+     * @param {Boolean} [animate=false] Whether to animate the transition of the progress bar. If this value is not
+     * specified, the default for the class is used
+     * @return {Ext.ProgressBar} this
+     */
+    updateProgress: function(value, text, animate) {
+        var me = this,
+            oldValue = me.value;
+
+        me.value = value || 0;
+        if (text) {
+            me.updateText(text);
+        }
+        if (me.rendered && !me.isDestroyed) {
+            if (animate === true || (animate !== false && me.animate)) {
+                me.bar.stopAnimation();
+                me.bar.animate(Ext.apply({
+                    from: {
+                        width: (oldValue * 100) + '%'
+                    },
+                    to: {
+                        width: (me.value * 100) + '%'
+                    }
+                }, me.animate));
+            } else {
+                me.bar.setStyle('width', (me.value * 100) + '%');
+            }
+        }
+        me.fireEvent('update', me, me.value, text);
+        return me;
+    },
+
+    /**
+     * Updates the progress bar text. If specified, textEl will be updated, otherwise the progress bar itself will
+     * display the updated text.
+     * @param {String} [text=''] The string to display in the progress text element
+     * @return {Ext.ProgressBar} this
+     */
+    updateText: function(text) {
+        var me = this;
+        
+        me.text = text;
+        if (me.rendered) {
+            me.textEl.update(me.text);
+        }
+        return me;
+    },
+
+    applyText : function(text) {
+        this.updateText(text);
+    },
+    
+    getText: function(){
+        return this.text;    
+    },
+
+    /**
+     * Initiates an auto-updating progress bar. A duration can be specified, in which case the progress bar will
+     * automatically reset after a fixed amount of time and optionally call a callback function if specified. If no
+     * duration is passed in, then the progress bar will run indefinitely and must be manually cleared by calling
+     * {@link #reset}.
+     *
+     * Example usage:
+     *
+     *     var p = new Ext.ProgressBar({
+     *        renderTo: 'my-el'
+     *     });
+     *
+     *     //Wait for 5 seconds, then update the status el (progress bar will auto-reset)
+     *     var p = Ext.create('Ext.ProgressBar', {
+     *        renderTo: Ext.getBody(),
+     *        width: 300
+     *     });
+     *
+     *     //Wait for 5 seconds, then update the status el (progress bar will auto-reset)
+     *     p.wait({
+     *        interval: 500, //bar will move fast!
+     *        duration: 50000,
+     *        increment: 15,
+     *        text: 'Updating...',
+     *        scope: this,
+     *        fn: function(){
+     *           p.updateText('Done!');
+     *        }
+     *     });
+     *
+     *     //Or update indefinitely until some async action completes, then reset manually
+     *     p.wait();
+     *     myAction.on('complete', function(){
+     *         p.reset();
+     *         p.updateText('Done!');
+     *     });
+     *
+     * @param {Object} config (optional) Configuration options
+     * @param {Number} config.duration The length of time in milliseconds that the progress bar should
+     * run before resetting itself (defaults to undefined, in which case it will run indefinitely
+     * until reset is called)
+     * @param {Number} config.interval The length of time in milliseconds between each progress update
+     * (defaults to 1000 ms)
+     * @param {Boolean} config.animate Whether to animate the transition of the progress bar. If this
+     * value is not specified, the default for the class is used.
+     * @param {Number} config.increment The number of progress update segments to display within the
+     * progress bar (defaults to 10).  If the bar reaches the end and is still updating, it will
+     * automatically wrap back to the beginning.
+     * @param {String} config.text Optional text to display in the progress bar element (defaults to '').
+     * @param {Function} config.fn A callback function to execute after the progress bar finishes auto-
+     * updating.  The function will be called with no arguments.  This function will be ignored if
+     * duration is not specified since in that case the progress bar can only be stopped programmatically,
+     * so any required function should be called by the same code after it resets the progress bar.
+     * @param {Object} config.scope The scope that is passed to the callback function (only applies when
+     * duration and fn are both passed).
+     * @return {Ext.ProgressBar} this
+     */
+    wait: function(o) {
+        var me = this, scope;
+            
+        if (!me.waitTimer) {
+            scope = me;
+            o = o || {};
+            me.updateText(o.text);
+            me.waitTimer = Ext.TaskManager.start({
+                run: function(i){
+                    var inc = o.increment || 10;
+                    i -= 1;
+                    me.updateProgress(((((i+inc)%inc)+1)*(100/inc))*0.01, null, o.animate);
+                },
+                interval: o.interval || 1000,
+                duration: o.duration,
+                onStop: function(){
+                    if (o.fn) {
+                        o.fn.apply(o.scope || me);
+                    }
+                    me.reset();
+                },
+                scope: scope
+            });
+        }
+        return me;
+    },
+
+    /**
+     * Returns true if the progress bar is currently in a {@link #wait} operation
+     * @return {Boolean} True if waiting, else false
+     */
+    isWaiting: function(){
+        return this.waitTimer !== null;
+    },
+
+    /**
+     * Resets the progress bar value to 0 and text to empty string. If hide = true, the progress bar will also be hidden
+     * (using the {@link #hideMode} property internally).
+     * @param {Boolean} [hide=false] True to hide the progress bar.
+     * @return {Ext.ProgressBar} this
+     */
+    reset: function(hide){
+        var me = this;
+        
+        me.updateProgress(0);
+        me.clearTimer();
+        if (hide === true) {
+            me.hide();
+        }
+        return me;
+    },
+
+    // private
+    clearTimer: function(){
+        var me = this;
+        
+        if (me.waitTimer) {
+            me.waitTimer.onStop = null; //prevent recursion
+            Ext.TaskManager.stop(me.waitTimer);
+            me.waitTimer = null;
+        }
+    },
+
+    onDestroy: function(){
+        var me = this,
+            bar = me.bar;
+        
+        me.clearTimer();
+        if (me.rendered) {
+            if (me.textEl.isComposite) {
+                me.textEl.clear();
+            }
+            Ext.destroyMembers(me, 'textEl', 'progressBar');
+            if (bar && me.animate) {
+                bar.stopAnimation();
+            }
+        }
+        me.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Private utility class that manages the internal Shadow cache.
+ * @private
+ */
+Ext.define('Ext.ShadowPool', {
+    singleton: true,
+                                
+
+    markup: (function() {
+        return Ext.String.format(
+            '<div class="{0}{1}-shadow" role="presentation"></div>',
+            Ext.baseCSSPrefix,
+            Ext.isIE && !Ext.supports.CSS3BoxShadow ? 'ie' : 'css'
+        );
+    }()),
+
+    shadows: [],
+
+    pull: function() {
+        var sh = this.shadows.shift();
+        if (!sh) {
+            sh = Ext.get(Ext.DomHelper.insertHtml("beforeBegin", document.body.firstChild, this.markup));
+            sh.autoBoxAdjust = false;
+        }
+        return sh;
+    },
+
+    push: function(sh) {
+        this.shadows.push(sh);
+    },
+    
+    reset: function() {
+        var shadows = [].concat(this.shadows),
+            s,
+            sLen    = shadows.length;
+
+        for (s = 0; s < sLen; s++) {
+            shadows[s].remove();
+        }
+
+        this.shadows = [];
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Simple class that can provide a shadow effect for any element.  Note that the element
+ * MUST be absolutely positioned, and the shadow does not provide any shimming.  This
+ * should be used only in simple cases - for more advanced functionality that can also
+ * provide the same shadow effect, see the {@link Ext.Layer} class.
+ */
+Ext.define('Ext.Shadow', {
+                                 
+
+    localXYNames: {
+        get: 'getLocalXY',
+        set: 'setLocalXY'
+    },
+
+    /**
+     * Creates new Shadow.
+     * @param {Object} config (optional) Config object.
+     */
+    constructor: function(config) {
+        var me = this,
+            adjusts,
+            offset,
+            rad;
+        
+        Ext.apply(me, config);
+        if (!Ext.isString(me.mode)) {
+            me.mode = me.defaultMode;
+        }
+        offset = me.offset;
+        rad = Math.floor(offset / 2);
+        me.opacity = 50;
+        switch (me.mode.toLowerCase()) {
+            // all this hideous nonsense calculates the various offsets for shadows
+            case "drop":
+                if (Ext.supports.CSS3BoxShadow) {
+                    adjusts = {
+                        t: offset,
+                        l: offset,
+                        h: -offset,
+                        w: -offset
+                    };
+                }
+                else {
+                    adjusts = {
+                        t: -rad,
+                        l: -rad,
+                        h: -rad,
+                        w: -rad
+                    };
+                }
+                break;
+            case "sides":
+                if (Ext.supports.CSS3BoxShadow) {
+                    adjusts = {
+                        t: offset,
+                        l: 0,
+                        h: -offset,
+                        w: 0
+                    };
+                }
+                else {
+                    adjusts = {
+                        t: - (1 + rad),
+                        l: 1 + rad - 2 * offset,
+                        h: -1,
+                        w: rad - 1
+                    };
+                }
+                break;
+            case "frame":
+                if (Ext.supports.CSS3BoxShadow) {
+                    adjusts = {
+                        t: 0,
+                        l: 0,
+                        h: 0,
+                        w: 0
+                    };
+                }
+                else {
+                    adjusts = {
+                        t: 1 + rad - 2 * offset,
+                        l: 1 + rad - 2 * offset,
+                        h: offset - rad - 1,
+                        w: offset - rad - 1
+                    };
+                }
+                break;
+            case "bottom":
+                if (Ext.supports.CSS3BoxShadow) {
+                    adjusts = {
+                        t: offset,
+                        l: 0,
+                        h: -offset,
+                        w: 0
+                    };
+                }
+                else {
+                    adjusts = {
+                        t: offset,
+                        l: 0,
+                        h: 0,
+                        w: 0
+                    };
+                }
+                break;
+        }
+        me.adjusts = adjusts;
+    },
+
+    /**
+     * @private
+     * Returns the shadow size on each side of the element in standard CSS order: top, right, bottom, left;
+     * @return {Number[]} Top, right, bottom and left shadow size.
+     */
+    getShadowSize: function() {
+        var me = this,
+            offset = me.el ? me.offset : 0,
+            result = [offset, offset, offset, offset],
+            mode = me.mode.toLowerCase();
+
+        // There are only offsets if the shadow element is present.
+        if (me.el && mode !== 'frame') {
+            result[0] = 0;
+            if (mode == 'drop') {
+                result[3] = 0;
+            }
+        }
+        return result;
+    },
+
+    /**
+     * @cfg {String} mode
+     * The shadow display mode.  Supports the following options:
+     *
+     * - sides : Shadow displays on both sides and bottom only
+     * - frame : Shadow displays equally on all four sides
+     * - drop : Traditional bottom-right drop shadow
+     */
+
+    /**
+     * @cfg {Number} offset
+     * The number of pixels to offset the shadow from the element
+     */
+    offset: 4,
+
+    // private
+    defaultMode: "drop",
+
+    // private - CSS property to use to set the box shadow
+    boxShadowProperty: (function() {
+        var property = 'boxShadow',
+            style = document.documentElement.style;
+
+        if (!('boxShadow' in style)) {
+            if ('WebkitBoxShadow' in style) {
+                // Safari prior to version 5.1 and Chrome prior to version 10
+                property = 'WebkitBoxShadow';
+            }
+            else if ('MozBoxShadow' in style) {
+                // FF 3.5 & 3.6
+                property = 'MozBoxShadow';
+            }
+        }
+
+        return property;
+    }()),
+
+    /**
+     * Displays the shadow under the target element
+     * @param {String/HTMLElement/Ext.Element} targetEl The id or element under which the shadow should display
+     */
+    show: function(target) {
+        var me = this,
+            index, xy;
+
+        target = Ext.get(target);
+        
+        // DOM reads first...
+        index = (parseInt(target.getStyle("z-index"), 10) - 1) || 0;
+        xy = target[me.localXYNames.get]();
+
+        // DOM writes...
+        if (!me.el) {
+            me.el = Ext.ShadowPool.pull();
+            // Shadow elements are shared, so fix position to match current owner
+            if (me.fixed) {
+                me.el.dom.style.position = 'fixed';
+            } else {
+                me.el.dom.style.position = '';
+            }
+            if (me.el.dom.nextSibling != target.dom) {
+                me.el.insertBefore(target);
+            }
+        }
+        me.el.setStyle("z-index", me.zIndex || index);
+        if (Ext.isIE && !Ext.supports.CSS3BoxShadow) {
+            me.el.dom.style.filter = "progid:DXImageTransform.Microsoft.alpha(opacity=" + me.opacity + ") progid:DXImageTransform.Microsoft.Blur(pixelradius=" + (me.offset) + ")";
+        }
+        me.realign(
+            xy[0],
+            xy[1],
+            target.dom.offsetWidth,
+            target.dom.offsetHeight
+        );
+        me.el.dom.style.display = "block";
+    },
+
+    /**
+     * Returns true if the shadow is visible, else false
+     */
+    isVisible: function() {
+        return this.el ? true: false;
+    },
+
+    /**
+     * Direct alignment when values are already available. Show must be called at least once before
+     * calling this method to ensure it is initialized.
+     * @param {Number} left The target element left position
+     * @param {Number} top The target element top position
+     * @param {Number} width The target element width
+     * @param {Number} height The target element height
+     */
+    realign: function(l, t, targetWidth, targetHeight) {
+        if (!this.el) {
+            return;
+        }
+        var adjusts = this.adjusts,
+            el = this.el,
+            targetStyle = el.dom.style,
+            shadowWidth,
+            shadowHeight,
+            sws,
+            shs;
+
+        el[this.localXYNames.set](l + adjusts.l, t + adjusts.t);
+        shadowWidth = Math.max(targetWidth + adjusts.w, 0);
+        shadowHeight = Math.max(targetHeight + adjusts.h, 0);
+        sws = shadowWidth + "px";
+        shs = shadowHeight + "px";
+        if (targetStyle.width != sws || targetStyle.height != shs) {
+            targetStyle.width = sws;
+            targetStyle.height = shs;
+
+            if (Ext.supports.CSS3BoxShadow) {
+                targetStyle[this.boxShadowProperty] = '0 0 ' + (this.offset + 2) + 'px #888';
+            }
+        }
+    },
+
+    /**
+     * Hides this shadow
+     */
+    hide: function() {
+        var me = this;
+        
+        if (me.el) {
+            me.el.dom.style.display = "none";
+            Ext.ShadowPool.push(me.el);
+            delete me.el;
+        }
+    },
+
+    /**
+     * Adjust the z-index of this shadow
+     * @param {Number} zindex The new z-index
+     */
+    setZIndex: function(z) {
+        this.zIndex = z;
+        if (this.el) {
+            this.el.setStyle("z-index", z);
+        }
+    },
+    
+    /**
+     * Sets the opacity of the shadow
+     * @param {Number} opacity The opacity
+     */
+    setOpacity: function(opacity){
+        if (this.el) {
+            if (Ext.isIE && !Ext.supports.CSS3BoxShadow) {
+                opacity = Math.floor(opacity * 100 / 2) / 100;
+            }
+            this.opacity = opacity;
+            this.el.setOpacity(opacity);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is a base class for an event domain. In the context of MVC, an "event domain"
+ * is one or more base classes that fire events to which a Controller wants to listen. A
+ * controller listens to events by describing the selectors for events of interest to it.
+ *
+ * Matching selectors to the firer of an event is one key aspect that defines an event
+ * domain. All event domain instances must provide a `match` method that tests selectors
+ * against the event firer.
+ *
+ * When an event domain instance is created (typically as a `singleton`), its `type`
+ * property is used to catalog the domain in the
+ * {@link Ext.app.EventDomain#instances Ext.app.EventDomain.instances} map.
+ *
+ * There are five event domains provided by default:
+ *
+ * -   {@link Ext.app.domain.Component Component domain}. This is the primary event domain that
+ * has been available since Ext JS MVC was introduced. This domain is defined as any class that
+ * extends {@link Ext.Component}, where the selectors use
+ * {@link Ext.ComponentQuery#query Ext.ComponentQuery}.
+ * -   {@link Ext.app.domain.Global Global domain}. This domain provides Controllers with access
+ * to events fired from {@link Ext#globalEvents} Observable instance. These events represent
+ * the state of the application as a whole, and are always anonymous. Because of this, Global
+ * domain does not provide selectors at all.
+ * -   {@link Ext.app.domain.Controller Controller domain}. This domain includes all classes
+ * that extend {@link Ext.app.Controller}. Events fired by Controllers will be available
+ * within this domain; selectors are either Controller's {@link Ext.app.Controller#id id} or
+ * '*' wildcard for any Controller.
+ * -   {@link Ext.app.domain.Store Store domain}. This domain is for classes extending
+ * {@link Ext.data.AbstractStore}. Selectors are either Store's
+ * {@link Ext.data.AbstractStore#storeId storeId} or '*' wildcard for any Store.
+ * -   {@link Ext.app.domain.Direct Direct domain}. This domain includes all classes that extend
+ * {@link Ext.direct.Provider}. Selectors are either Provider's {@link Ext.direct.Provider#id id}
+ * or '*' wildcard for any Provider. This domain is optional and will be loaded only if
+ * {@link Ext.direct.Manager} singleton is required in your application.
+ *
+ * @protected
+ */
+
+Ext.define('Ext.app.EventDomain', {
+               
+                        
+      
+
+    statics: {
+        /**
+         * An object map containing `Ext.app.EventDomain` instances keyed by the value
+         * of their `type` property.
+         */
+        instances: {}
+    },
+    
+    /**
+     * @cfg {String} idProperty Name of the identifier property for this event domain.
+     */
+     
+    isEventDomain: true,
+
+    constructor: function() {
+        var me = this;
+
+        Ext.app.EventDomain.instances[me.type] = me;
+
+        me.bus = {};
+        me.monitoredClasses = [];
+    },
+
+    /**
+     * This method dispatches an event fired by an object monitored by this domain. This
+     * is not called directly but is called by interceptors injected by the `monitor` method.
+     * 
+     * @param {Object} target The firer of the event.
+     * @param {String} ev The event being fired.
+     * @param {Array} args The arguments for the event. This array **does not** include the event name.
+     * That has already been sliced off because this class intercepts the {@link Ext.util.Observable#fireEventArgs fireEventArgs}
+     * method which takes an array as the event's argument list.
+     *
+     * @return {Boolean} `false` if any listener returned `false`, otherwise `true`.
+     *
+     * @private
+     */
+    dispatch: function(target, ev, args) {
+        var me = this,
+            bus = me.bus,
+            selectors = bus[ev],
+            selector, controllers, id, events, event, i, ln;
+
+        if (!selectors) {
+            return true;
+        }
+
+        // Loop over all the selectors that are bound to this event
+        for (selector in selectors) {
+            // Check if the target matches the selector
+            if (selectors.hasOwnProperty(selector) && me.match(target, selector)) {
+                // Loop over all the controllers that are bound to this selector
+                controllers = selectors[selector];
+
+                for (id in controllers) {
+                    if (controllers.hasOwnProperty(id)) {
+                        // Loop over all the events that are bound to this selector
+                        events = controllers[id];
+
+                        for (i = 0, ln = events.length; i < ln; i++) {
+                            event = events[i];
+
+                            // Fire the event!
+                            if (event.fire.apply(event, args) === false) {
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    },
+
+    /**
+     * This method adds listeners on behalf of a controller. This method is passed an
+     * object that is keyed by selectors. The value of these is also an object but now
+     * keyed by event name. For example:
+     * 
+     *      domain.listen({
+     *          'some[selector]': {
+     *              click: function() { ... }
+     *          },
+     *          
+     *          'other selector': {
+     *              change: {
+     *                  fn: function() { ... },
+     *                  delay: 10
+     *              }
+     *          }
+     *      
+     *      }, controller);
+     * 
+     * @param {Object} selectors Config object containing selectors and listeners.
+     *
+     * @private
+     */
+    listen: function(selectors, controller) {
+        var me = this,
+            bus = me.bus,
+            idProperty = me.idProperty,
+            monitoredClasses = me.monitoredClasses,
+            monitoredClassesCount = monitoredClasses.length,
+            i, tree, list, selector, options, listener, scope, event, listeners, ev;
+
+        for (selector in selectors) {
+            if (selectors.hasOwnProperty(selector) && (listeners = selectors[selector])) {
+                if (idProperty) {
+                    if (!/^[*#]/.test(selector)) {
+                        Ext.Error.raise('Selectors containing id should begin with #');
+                    }
+                
+                    selector = selector === '*' ? selector : selector.substring(1);
+                }
+                
+                for (ev in listeners) {
+                    if (listeners.hasOwnProperty(ev)) {
+                        options  = null;
+                        listener = listeners[ev];
+                        scope    = controller;
+                        event    = new Ext.util.Event(controller, ev);
+
+                        // Normalize the listener
+                        if (Ext.isObject(listener)) {
+                            options  = listener;
+                            listener = options.fn;
+                            scope    = options.scope || controller;
+
+                            delete options.fn;
+                            delete options.scope;
+                        }
+
+                        if (typeof listener === 'string') {
+                            listener = scope[listener];
+                        }
+                        event.addListener(listener, scope, options);
+
+                        for (i = monitoredClassesCount; i-- > 0;) {
+                            monitoredClasses[i].hasListeners._incr_(ev);
+                        }
+
+                        // Create the bus tree if it is not there yet
+                        tree = bus[ev]             || (bus[ev] = {});
+                        tree = tree[selector]      || (tree[selector] = {});
+                        list = tree[controller.id] || (tree[controller.id] = []);
+
+                        // Push our listener in our bus
+                        list.push(event);
+                    }
+                } //end inner loop
+            }
+        } //end outer loop
+    },
+
+    /**
+     * This method matches the firer of the event (the `target`) to the given `selector`.
+     * Default matching is very simple: a match is true when selector equals target's
+     * {@link #cfg-idProperty idProperty}, or when selector is '*' wildcard to match any
+     * target.
+     * 
+     * @param {Object} target The firer of the event.
+     * @param {String} selector The selector to which to match the `target`.
+     *
+     * @return {Boolean} `true` if the `target` matches the `selector`.
+     *
+     * @protected
+     */
+    match: function(target, selector) {
+        var idProperty = this.idProperty;
+        
+        if (idProperty) {
+            return selector === '*' || target[idProperty] === selector;
+        }
+        
+        return false;
+    },
+
+    /**
+     * This method is called by the derived class to monitor `fireEvent` calls. Any call
+     * to `fireEvent` on the target Observable will be intercepted and dispatched to any
+     * listening Controllers. Assuming the original `fireEvent` method does not return
+     * `false`, the event is passed to the `dispatch` method of this object.
+     * 
+     * This is typically called in the `constructor` of derived classes.
+     * 
+     * @param {Ext.Class} observable The Observable to monitor for events.
+     *
+     * @protected
+     */
+    monitor: function(observable) {
+        var domain = this,
+            prototype = observable.isInstance ? observable : observable.prototype,
+            fireEventArgs = prototype.fireEventArgs;
+
+        domain.monitoredClasses.push(observable);
+
+        prototype.fireEventArgs = function(ev, args) {
+            var ret = fireEventArgs.apply(this, arguments);
+
+            if (ret !== false) {
+                ret = domain.dispatch(this, ev, args);
+            }
+
+            return ret;
+        };
+    },
+
+    /**
+     * Removes all of a controller's attached listeners.
+     *
+     * @param {String} controllerId The id of the controller.
+     *
+     * @private
+     */
+    unlisten: function(controllerId) {
+        var bus = this.bus,
+            controllers, ev, selector, selectors;
+
+        for (ev in bus) {
+            if (bus.hasOwnProperty(ev) && (selectors = bus[ev])) {
+                for (selector in selectors) {
+                    controllers = selectors[selector];
+                    delete controllers[controllerId];  // harmless if !hasOwnProperty
+                }
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class implements the component event domain. All classes extending from
+ * {@link Ext.Component} are included in this domain. The matching criteria uses
+ * {@link Ext.ComponentQuery}.
+ * 
+ * @protected
+ */
+Ext.define('Ext.app.domain.Component', {
+    extend:  Ext.app.EventDomain ,
+    singleton: true,
+
+               
+                       
+      
+
+    type: 'component',
+
+    constructor: function() {
+        var me = this;
+        
+        me.callParent();
+        me.monitor(Ext.Component);
+    },
+
+    match: function(target, selector) {
+        return target.is(selector);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class manages event dispatching for Controllers. The details of connecting classes
+ * to this dispatching mechanism is delegated to {@link Ext.app.EventDomain} instances.
+ *
+ * @private
+ */
+Ext.define('Ext.app.EventBus', {
+    singleton: true,
+
+               
+                                  
+      
+    
+    constructor: function() {
+        var me = this,
+            domains = Ext.app.EventDomain.instances;
+
+        me.callParent();
+
+        me.domains = domains;
+        me.bus = domains.component.bus; // compat
+    },
+
+    /**
+     * Adds a set of component event listeners for a controller. To work with event domains
+     * other than component, see {@link #listen}.
+     *
+     * @param {Object} selectors Config object containing selectors and listeners.
+     * @param {Ext.app.Controller} controller The listening controller instance.
+     */
+    control: function(selectors, controller) {
+        return this.domains.component.listen(selectors, controller);
+    },
+
+    /**
+     * Adds a set of event domain listeners for a controller. For more information on event
+     * domains, see {@link Ext.app.EventDomain} and {@link Ext.app.Controller}.
+     *
+     * @param {Object} to Config object containing domains, selectors and listeners.
+     * @param {Ext.app.Controller} controller The listening controller instance.
+     */
+    listen: function(to, controller) {
+        var domains = this.domains,
+            domain;
+
+        for (domain in to) {
+            if (to.hasOwnProperty(domain)) {
+                domains[domain].listen(to[domain], controller);
+            }
+        }
+    },
+
+    /**
+     * Removes all of a controller's attached listeners.
+     *
+     * @param {String} controllerId The id of the controller.
+     */
+    unlisten: function(controllerId) {
+        var domains = Ext.app.EventDomain.instances,
+            domain;
+        
+        for (domain in domains) {
+            domains[domain].unlisten(controllerId);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Evan Trimboli <evan at sencha.com>
+ *
+ * Contains a collection of all stores that are created that have an identifier. An identifier can be assigned by
+ * setting the {@link Ext.data.AbstractStore#storeId storeId} property. When a store is in the StoreManager, it can be
+ * referred to via it's identifier:
+ *
+ *     Ext.create('Ext.data.Store', {
+ *         model: 'SomeModel',
+ *         storeId: 'myStore'
+ *     });
+ *
+ *     var store = Ext.data.StoreManager.lookup('myStore');
+ *
+ * Also note that the {@link #lookup} method is aliased to {@link Ext#getStore} for convenience.
+ *
+ * If a store is registered with the StoreManager, you can also refer to the store by it's identifier when registering
+ * it with any Component that consumes data from a store:
+ *
+ *     Ext.create('Ext.data.Store', {
+ *         model: 'SomeModel',
+ *         storeId: 'myStore'
+ *     });
+ *
+ *     Ext.create('Ext.view.View', {
+ *         store: 'myStore',
+ *         // other configuration here
+ *     });
+ *
+ */
+Ext.define('Ext.data.StoreManager', {
+    extend:  Ext.util.MixedCollection ,
+    alternateClassName: ['Ext.StoreMgr', 'Ext.data.StoreMgr', 'Ext.StoreManager'],
+    singleton: true,
+                                  
+    
+    /**
+     * @cfg {Object} listeners
+     * @private
+     */
+
+    /**
+     * Registers one or more Stores with the StoreManager. You do not normally need to register stores manually. Any
+     * store initialized with a {@link Ext.data.Store#storeId} will be auto-registered.
+     * @param {Ext.data.Store...} stores Any number of Store instances
+     */
+    register : function() {
+        for (var i = 0, s; (s = arguments[i]); i++) {
+            this.add(s);
+        }
+    },
+
+    /**
+     * Unregisters one or more Stores with the StoreManager
+     * @param {String/Object...} stores Any number of Store instances or ID-s
+     */
+    unregister : function() {
+        for (var i = 0, s; (s = arguments[i]); i++) {
+            this.remove(this.lookup(s));
+        }
+    },
+
+    /**
+     * Gets a registered Store by id
+     * @param {String/Object} store The id of the Store, or a Store instance, or a store configuration
+     * @return {Ext.data.Store}
+     */
+    lookup : function(store) {
+        // handle the case when we are given an array or an array of arrays.
+        if (Ext.isArray(store)) {
+            var fields = ['field1'], 
+                expand = !Ext.isArray(store[0]),
+                data = store,
+                i,
+                len;
+                
+            if(expand){
+                data = [];
+                for (i = 0, len = store.length; i < len; ++i) {
+                    data.push([store[i]]);
+                }
+            } else {
+                for(i = 2, len = store[0].length; i <= len; ++i){
+                    fields.push('field' + i);
+                }
+            }
+            return new Ext.data.ArrayStore({
+                data  : data,
+                fields: fields,
+                autoDestroy: true,
+                autoCreated: true,
+                expanded: expand
+            });
+        }
+        
+        if (Ext.isString(store)) {
+            // store id
+            return this.get(store);
+        } else {
+            // store instance or store config
+            return Ext.data.AbstractStore.create(store);
+        }
+    },
+
+    // getKey implementation for MixedCollection
+    getKey : function(o) {
+         return o.storeId;
+    }
+}, function() {    
+    /**
+     * Creates a new store for the given id and config, then registers it with the {@link Ext.data.StoreManager Store Manager}. 
+     * Sample usage:
+     *
+     *     Ext.regStore('AllUsers', {
+     *         model: 'User'
+     *     });
+     *
+     *     // the store can now easily be used throughout the application
+     *     new Ext.List({
+     *         store: 'AllUsers',
+     *         ... other config
+     *     });
+     *
+     * @param {String} id The id to set on the new store
+     * @param {Object} config The store config
+     * @member Ext
+     * @method regStore
+     */
+    Ext.regStore = function(name, config) {
+        var store;
+
+        if (Ext.isObject(name)) {
+            config = name;
+        } else {
+            config.storeId = name;
+        }
+
+        if (config instanceof Ext.data.Store) {
+            store = config;
+        } else {
+            store = new Ext.data.Store(config);
+        }
+
+        return Ext.data.StoreManager.register(store);
+    };
+
+    /**
+     * Shortcut to {@link Ext.data.StoreManager#lookup}.
+     * @member Ext
+     * @method getStore
+     * @inheritdoc Ext.data.StoreManager#lookup
+     */
+    Ext.getStore = function(name) {
+        return Ext.data.StoreManager.lookup(name);
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class implements the global event domain. This domain represents event fired from
+ * {@link Ext#globalEvents} Observable instance. No selectors are supported for this domain.
+ * 
+ * @protected
+ */
+Ext.define('Ext.app.domain.Global', {
+    extend:  Ext.app.EventDomain ,
+    singleton: true,
+
+    type: 'global',
+
+    constructor: function() {
+        var me = this;
+        
+        me.callParent();
+        me.monitor(Ext.globalEvents);
+    },
+    
+    /**
+     * This method adds listeners on behalf of a controller. Since Global domain does not
+     * support selectors, we skip this layer and just accept an object keyed by events.
+     * For example:
+     *
+     *      domain.listen({
+     *          idle: function() { ... },
+     *          afterlayout: {
+     *              fn: function() { ... },
+     *              delay: 10
+     *          }
+     *      });
+     *
+     * @param {Object} listeners Config object containing listeners.
+     *
+     * @private
+     */              
+    listen: function(listeners, controller) {
+        // Parent method requires selectors so we just wrap passed listeners
+        // in a dummy selector
+        this.callParent([{ global: listeners }, controller]);
+    },
+
+    match: function() {
+        return true;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Simple wrapper class that represents a set of records returned by a Proxy.
+ */
+Ext.define('Ext.data.ResultSet', {
+    /**
+     * @cfg {Boolean} loaded
+     * True if the records have already been loaded. This is only meaningful when dealing with
+     * SQL-backed proxies.
+     */
+    loaded: true,
+
+    /**
+     * @cfg {Number} count
+     * The number of records in this ResultSet. Note that total may differ from this number.
+     */
+    count: 0,
+
+    /**
+     * @cfg {Number} total
+     * The total number of records reported by the data source. This ResultSet may form a subset of
+     * those records (see {@link #count}).
+     */
+    total: 0,
+
+    /**
+     * @cfg {Boolean} success
+     * True if the ResultSet loaded successfully, false if any errors were encountered.
+     */
+    success: false,
+
+    /**
+     * @cfg {Ext.data.Model[]} records (required)
+     * The array of record instances.
+     */
+
+    /**
+     * Creates the resultSet
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        Ext.apply(this, config);
+
+        /**
+         * @property {Number} totalRecords
+         * Copy of this.total.
+         * @deprecated Will be removed in Ext JS 5.0. Use {@link #total} instead.
+         */
+        this.totalRecords = this.total;
+
+        if (config.count === undefined) {
+            this.count = this.records.length;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Readers are used to interpret data to be loaded into a {@link Ext.data.Model Model} instance or a {@link
+ * Ext.data.Store Store} - often in response to an AJAX request. In general there is usually no need to create
+ * a Reader instance directly, since a Reader is almost always used together with a {@link Ext.data.proxy.Proxy Proxy},
+ * and is configured using the Proxy's {@link Ext.data.proxy.Proxy#cfg-reader reader} configuration property:
+ * 
+ *     Ext.create('Ext.data.Store', {
+ *         model: 'User',
+ *         proxy: {
+ *             type: 'ajax',
+ *             url : 'users.json',
+ *             reader: {
+ *                 type: 'json',
+ *                 root: 'users'
+ *             }
+ *         },
+ *     });
+ *     
+ * The above reader is configured to consume a JSON string that looks something like this:
+ *  
+ *     {
+ *         "success": true,
+ *         "users": [
+ *             { "name": "User 1" },
+ *             { "name": "User 2" }
+ *         ]
+ *     }
+ * 
+ *
+ * # Loading Nested Data
+ *
+ * Readers have the ability to automatically load deeply-nested data objects based on the {@link Ext.data.association.Association
+ * associations} configured on each Model. Below is an example demonstrating the flexibility of these associations in a
+ * fictional CRM system which manages a User, their Orders, OrderItems and Products. First we'll define the models:
+ *
+ *     Ext.define("User", {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             'id', 'name'
+ *         ],
+ *
+ *         hasMany: {model: 'Order', name: 'orders'},
+ *
+ *         proxy: {
+ *             type: 'rest',
+ *             url : 'users.json',
+ *             reader: {
+ *                 type: 'json',
+ *                 root: 'users'
+ *             }
+ *         }
+ *     });
+ *
+ *     Ext.define("Order", {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             'id', 'total'
+ *         ],
+ *
+ *         hasMany  : {model: 'OrderItem', name: 'orderItems', associationKey: 'order_items'},
+ *         belongsTo: 'User'
+ *     });
+ *
+ *     Ext.define("OrderItem", {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             'id', 'price', 'quantity', 'order_id', 'product_id'
+ *         ],
+ *
+ *         belongsTo: ['Order', {model: 'Product', associationKey: 'product'}]
+ *     });
+ *
+ *     Ext.define("Product", {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             'id', 'name'
+ *         ],
+ *
+ *         hasMany: 'OrderItem'
+ *     });
+ *
+ * This may be a lot to take in - basically a User has many Orders, each of which is composed of several OrderItems.
+ * Finally, each OrderItem has a single Product. This allows us to consume data like this:
+ *
+ *     {
+ *         "users": [
+ *             {
+ *                 "id": 123,
+ *                 "name": "Ed",
+ *                 "orders": [
+ *                     {
+ *                         "id": 50,
+ *                         "total": 100,
+ *                         "order_items": [
+ *                             {
+ *                                 "id"      : 20,
+ *                                 "price"   : 40,
+ *                                 "quantity": 2,
+ *                                 "product" : {
+ *                                     "id": 1000,
+ *                                     "name": "MacBook Pro"
+ *                                 }
+ *                             },
+ *                             {
+ *                                 "id"      : 21,
+ *                                 "price"   : 20,
+ *                                 "quantity": 3,
+ *                                 "product" : {
+ *                                     "id": 1001,
+ *                                     "name": "iPhone"
+ *                                 }
+ *                             }
+ *                         ]
+ *                     }
+ *                 ]
+ *             }
+ *         ]
+ *     }
+ *
+ * The JSON response is deeply nested - it returns all Users (in this case just 1 for simplicity's sake), all of the
+ * Orders for each User (again just 1 in this case), all of the OrderItems for each Order (2 order items in this case),
+ * and finally the Product associated with each OrderItem. Now we can read the data and use it as follows:
+ *
+ *     var store = Ext.create('Ext.data.Store', {
+ *         model: "User"
+ *     });
+ *
+ *     store.load({
+ *         callback: function() {
+ *             //the user that was loaded
+ *             var user = store.first();
+ *
+ *             console.log("Orders for " + user.get('name') + ":")
+ *
+ *             //iterate over the Orders for each User
+ *             user.orders().each(function(order) {
+ *                 console.log("Order ID: " + order.getId() + ", which contains items:");
+ *
+ *                 //iterate over the OrderItems for each Order
+ *                 order.orderItems().each(function(orderItem) {
+ *                     //we know that the Product data is already loaded, so we can use the synchronous getProduct
+ *                     //usually, we would use the asynchronous version (see {@link Ext.data.association.BelongsTo})
+ *                     var product = orderItem.getProduct();
+ *
+ *                     console.log(orderItem.get('quantity') + ' orders of ' + product.get('name'));
+ *                 });
+ *             });
+ *         }
+ *     });
+ *
+ * Running the code above results in the following:
+ *
+ *     Orders for Ed:
+ *     Order ID: 50, which contains items:
+ *     2 orders of MacBook Pro
+ *     3 orders of iPhone
+ */
+Ext.define('Ext.data.reader.Reader', {
+                                                      
+    alternateClassName: ['Ext.data.Reader', 'Ext.data.DataReader'],
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @cfg {String} idProperty
+     * Name of the property within a row object that contains a record identifier value. Defaults to the id of the
+     * model. If an idProperty is explicitly specified it will take precedence over idProperty defined on the model.
+     */
+
+    /**
+     * @cfg {String} [totalProperty="total"]
+     * Name of the property from which to retrieve the total number of records in the dataset. This is only needed if
+     * the whole dataset is not passed in one go, but is being paged from the remote server.
+     */
+    totalProperty: 'total',
+
+    /**
+     * @cfg {String} [successProperty="success"]
+     * Name of the property from which to retrieve the `success` attribute, the value of which indicates
+     * whether a given request succeeded or failed (typically a boolean or 'true'|'false'). See
+     * {@link Ext.data.proxy.Server}.{@link Ext.data.proxy.Server#exception exception} for additional information.
+     */
+    successProperty: 'success',
+
+    /**
+     * @cfg {String} [root]
+     * The name of the property which contains the data items corresponding to the Model(s) for which this
+     * Reader is configured.  For JSON reader it's a property name (or a dot-separated list of property names
+     * if the root is nested).  For XML reader it's a CSS selector.  For Array reader the root is not applicable
+     * since the data is assumed to be a single-level array of arrays.
+     * 
+     * By default the natural root of the data will be used: the root JSON array, the root XML element, or the array.
+     *
+     * The data packet value for this property should be an empty array to clear the data or show no data.
+     */
+    root: '',
+    
+    /**
+     * @cfg {String} messageProperty
+     * The name of the property which contains a response message. This property is optional.
+     */
+    
+    /**
+     * @cfg {Boolean} [implicitIncludes=true]
+     * True to automatically parse models nested within other models in a response object. See the
+     * Ext.data.reader.Reader intro docs for full explanation.
+     */
+    implicitIncludes: true,
+    
+    /**
+     * @cfg {Boolean} [readRecordsOnFailure=true]
+     * True to extract the records from a data packet even if the {@link #successProperty} returns false.
+     */
+    readRecordsOnFailure: true,
+    
+    /**
+     * @property {Object} metaData
+     * The raw meta data that was most recently read, if any. Meta data can include existing
+     * Reader config options like {@link #idProperty}, {@link #totalProperty}, etc. that get
+     * automatically applied to the Reader, and those can still be accessed directly from the Reader
+     * if needed. However, meta data is also often used to pass other custom data to be processed
+     * by application code. For example, it is common when reconfiguring the data model of a grid to
+     * also pass a corresponding column model config to be applied to the grid. Any such data will
+     * not get applied to the Reader directly (it just gets passed through and is ignored by Ext).
+     * This metaData property gives you access to all meta data that was passed, including any such
+     * custom data ignored by the reader.
+     * 
+     * This is a read-only property, and it will get replaced each time a new meta data object is
+     * passed to the reader. Note that typically you would handle proxy's
+     * {@link Ext.data.proxy.Proxy#metachange metachange} event which passes this exact same meta
+     * object to listeners. However this property is available if it's more convenient to access it
+     * via the reader directly in certain cases.
+     * @readonly
+     */
+    
+    /*
+     * @property {Boolean} isReader
+     * `true` in this class to identify an object as an instantiated Reader, or subclass thereof.
+     */
+    isReader: true,
+
+    // Private flag to the generated convertRecordData function to indicate whether to apply Field default
+    // values to fields for which no value is present in the raw data.
+    // This is set to false by a Server Proxy which is reading the response from a "create" or "update" operation.
+    applyDefaults: true,
+
+    lastFieldGeneration: null,
+    
+    /**
+     * Creates new Reader.
+     * @param {Object} config (optional) Config object.
+     */
+    constructor: function(config) {
+        var me = this;
+        
+        me.mixins.observable.constructor.call(me, config);
+        me.fieldCount = 0;
+        me.model = Ext.ModelManager.getModel(me.model);
+
+        // Extractors can only be calculated if the fields MixedCollection has been set.
+        // A Model may only complete its setup (set the prototype properties) after asynchronous loading
+        // which would mean that there may be no "fields"
+        // If this happens, the load callback will call proxy.setModel which calls reader.setModel which
+        // triggers buildExtractors.
+        if (me.model && me.model.prototype.fields) {
+            me.buildExtractors();
+        }
+
+        this.addEvents(
+            /**
+             * @event
+             * Fires when the reader receives improperly encoded data from the server
+             * @param {Ext.data.reader.Reader} reader A reference to this reader
+             * @param {XMLHttpRequest} response The XMLHttpRequest response object
+             * @param {Ext.data.ResultSet} error The error object
+             */
+            'exception'
+        );
+    },
+
+    /**
+     * Sets a new model for the reader.
+     * @private
+     * @param {Object} model The model to set.
+     * @param {Boolean} setOnProxy True to also set on the Proxy, if one is configured
+     */
+    setModel: function(model, setOnProxy) {
+        var me = this;
+        
+        me.model = Ext.ModelManager.getModel(model);
+        if (model) {
+            me.buildExtractors(true);
+        }
+        
+        if (setOnProxy && me.proxy) {
+            me.proxy.setModel(me.model, true);
+        }
+    },
+
+    /**
+     * Reads the given response object. This method normalizes the different types of response object that may be passed to it.
+     * If it's an XMLHttpRequest object, hand off to the subclass' {@link #getResponseData} method.
+     * Else, hand off the reading of records to the {@link #readRecords} method.
+     * @param {Object} response The response object. This may be either an XMLHttpRequest object or a plain JS object
+     * @return {Ext.data.ResultSet} The parsed or default ResultSet object
+     */
+    read: function(response) {
+        var data;
+
+        if (response) {
+            data = response.responseText ? this.getResponseData(response) : this.readRecords(response);
+        }
+
+        return data || this.nullResultSet;
+    },
+
+    /**
+     * Abstracts common functionality used by all Reader subclasses. Each subclass is expected to call this function
+     * before running its own logic and returning the Ext.data.ResultSet instance. For most Readers additional
+     * processing should not be needed.
+     * @param {Object} data The raw data object
+     * @return {Ext.data.ResultSet} A ResultSet object
+     */
+    readRecords: function(data) {
+        var me = this,
+            success,
+            recordCount,
+            records,
+            root,
+            total,
+            value,
+            message;
+        
+        /*
+         * We check here whether fields collection has changed since the last read.
+         * This works around an issue when a Model is used for both a Tree and another
+         * source, because the tree decorates the model with extra fields and it causes
+         * issues because the readers aren't notified.
+         */
+        if (me.lastFieldGeneration !== me.model.prototype.fields.generation) {
+            me.buildExtractors(true);
+        }
+        
+        /**
+         * @property {Object} rawData
+         * The raw data object that was last passed to {@link #readRecords}. Stored for further processing if needed.
+         */
+        me.rawData = data;
+
+        data = me.getData(data);
+        
+        success = true;
+        recordCount = 0;
+        records = [];
+            
+        if (me.successProperty) {
+            value = me.getSuccess(data);
+            if (value === false || value === 'false') {
+                success = false;
+            }
+        }
+        
+        if (me.messageProperty) {
+            message = me.getMessage(data);
+        }
+
+        
+        // Only try and extract other data if call was successful
+        if (me.readRecordsOnFailure || success) {
+            // If we pass an array as the data, we dont use getRoot on the data.
+            // Instead the root equals to the data.
+            root = Ext.isArray(data) ? data : me.getRoot(data);
+            
+            if (root) {
+                total = root.length;
+            }
+
+          if (me.totalProperty) {
+                value = parseInt(me.getTotal(data), 10);
+                if (!isNaN(value)) {
+                    total = value;
+                }
+            }
+
+           if (root) {
+                records = me.extractData(root);
+                recordCount = records.length;
+            }
+        }
+
+        return new Ext.data.ResultSet({
+            total  : total || recordCount,
+            count  : recordCount,
+            records: records,
+            success: success,
+            message: message
+        });
+    },
+
+    /**
+     * Returns extracted, type-cast rows of data.
+     * @param {Object[]/Object} root from server response
+     * @return {Array} An array of records containing the extracted data
+     * @private
+     */
+    extractData : function(root) {
+        var me = this,
+            Model   = me.model,
+            length  = root.length,
+            records = new Array(length),
+            convertedValues, node, record, i;
+
+        if (!root.length && Ext.isObject(root)) {
+            root = [root];
+            length = 1;
+        }
+
+        for (i = 0; i < length; i++) {
+            node = root[i];
+            if (node.isModel) {
+                // If we're given a model instance in the data, just push it on
+                // without doing any conversion
+                records[i] = node;
+            } else {
+                // Create a record with an empty data object.
+                // Populate that data object by extracting and converting field values from raw data.
+                // Must pass the ID to use because we pass no data for the constructor to pluck an ID from
+                records[i] = record = new Model(undefined, me.getId(node), node, convertedValues = {});
+
+                // If the server did not include an id in the response data, the Model constructor will mark the record as phantom.
+                // We  need to set phantom to false here because records created from a server response using a reader by definition are not phantom records.
+                record.phantom = false;
+
+                // Use generated function to extract all fields at once
+                me.convertRecordData(convertedValues, node, record);
+
+                if (me.implicitIncludes && record.associations.length) {
+                    me.readAssociated(record, node);
+                }
+            }
+        }
+
+        return records;
+    },
+
+    /**
+     * @private
+     * Loads a record's associations from the data object. This prepopulates hasMany and belongsTo associations
+     * on the record provided.
+     * @param {Ext.data.Model} record The record to load associations for
+     * @param {Object} data The data object
+     * @return {String} Return value description
+     */
+    readAssociated: function(record, data) {
+        var associations = record.associations.items,
+            i            = 0,
+            length       = associations.length,
+            association, associationData, proxy, reader;
+        
+        for (; i < length; i++) {
+            association     = associations[i];
+            associationData = this.getAssociatedDataRoot(data, association.associationKeyFunction || association.associationKey || association.name);
+            
+            if (associationData) {
+                reader = association.getReader();
+                if (!reader) {
+                    proxy = association.associatedModel.getProxy();
+                    // if the associated model has a Reader already, use that, otherwise attempt to create a sensible one
+                    if (proxy) {
+                        reader = proxy.getReader();
+                    } else {
+                        reader = new this.constructor({
+                            model: association.associatedName
+                        });
+                    }
+                }
+                association.read(record, reader, associationData);
+            }  
+        }
+    },
+    
+    /**
+     * @private
+     * Used internally by {@link #readAssociated}. Given a data object (which could be json, xml etc) for a specific
+     * record, this should return the relevant part of that data for the given association name. If a complex
+     * mapping, this will traverse arrays and objects to resolve the data.
+     * @param {Object} data The raw data object
+     * @param {String} associationName The name of the association to get data for (uses associationKey if present)
+     * @return {Object} The root
+     */
+    getAssociatedDataRoot: function(data, associationName) {
+        if (Ext.isFunction(associationName)) {
+            return associationName(data);
+        }
+
+        return data[associationName];
+    },
+    
+    getFields: function() {
+        return this.model.prototype.fields.items;
+    },
+
+    /**
+     * @private
+     * By default this function just returns what is passed to it. It can be overridden in a subclass
+     * to return something else. See XmlReader for an example.
+     * @param {Object} data The data object
+     * @return {Object} The normalized data object
+     */
+    getData: Ext.identityFn,
+
+    /**
+     * @private
+     * This will usually need to be implemented in a subclass. Given a generic data object (the type depends on the type
+     * of data we are reading), this function should return the object as configured by the Reader's 'root' meta data config.
+     * See XmlReader's getRoot implementation for an example. By default the same data object will simply be returned.
+     * @param {Object} data The data object
+     * @return {Object} The same data object
+     */
+    getRoot: Ext.identityFn,
+
+    /**
+     * Takes a raw response object (as passed to the {@link #read} method) and returns the useful data
+     * segment from it. This must be implemented by each subclass.
+     * @param {Object} response The response object
+     * @return {Ext.data.ResultSet} A ResultSet object
+     */
+    getResponseData: function(response) {
+        Ext.Error.raise("getResponseData must be implemented in the Ext.data.reader.Reader subclass");
+    },
+
+    /**
+     * @private
+     * Reconfigures the meta data tied to this Reader
+     */
+    onMetaChange : function(meta) {
+        var me = this,
+            fields = meta.fields || me.getFields(),
+            newModel,
+            clientIdProperty;
+        
+        // save off the raw meta data
+        me.metaData = meta;
+        
+        // set any reader-specific configs from meta if available
+        me.root = meta.root || me.root;
+        me.idProperty = meta.idProperty || me.idProperty;
+        me.totalProperty = meta.totalProperty || me.totalProperty;
+        me.successProperty = meta.successProperty || me.successProperty;
+        me.messageProperty = meta.messageProperty || me.messageProperty;
+        clientIdProperty = meta.clientIdProperty;
+
+        if (me.model) {
+            me.model.setFields(fields, me.idProperty, clientIdProperty);
+            me.setModel(me.model, true);
+        }
+        else {
+            newModel = Ext.define("Ext.data.reader.Json-Model" + Ext.id(), {
+                extend: 'Ext.data.Model',
+                fields: fields,
+                clientIdProperty: clientIdProperty
+            });
+            if (me.idProperty) {
+                // We only do this if the reader actually has a custom idProperty set,
+                // otherwise let the model use its own default value. It is valid for
+                // the reader idProperty to be undefined, in which case it will use the
+                // model's idProperty (in getIdProperty()).
+                newModel.idProperty = me.idProperty;
+            }
+            me.setModel(newModel, true);
+        }
+    },
+    
+    /**
+     * Get the idProperty to use for extracting data
+     * @private
+     * @return {String} The id property **if any**
+     */
+    getIdProperty: function() {
+        var idField = this.model.prototype.idField,
+            idProperty = this.idProperty;
+
+        if (!idProperty && idField  && (idProperty = idField.mapping) == null) {
+            idProperty = idField.name;
+        }
+        return idProperty;
+    },
+
+    /**
+     * @private
+     * This builds optimized functions for retrieving record data and meta data from an object.
+     * Subclasses may need to implement their own getRoot function.
+     * @param {Boolean} [force=false] True to automatically remove existing extractor functions first
+     */
+    buildExtractors: function(force) {
+        var me          = this,
+            idProp      = me.getIdProperty(),
+            totalProp   = me.totalProperty,
+            successProp = me.successProperty,
+            messageProp = me.messageProperty,
+            accessor;
+            
+        if (force === true) {
+            delete me.convertRecordData;
+        }
+        
+        if (me.convertRecordData) {
+            return;
+        }   
+
+        //build the extractors for all the meta data
+        if (totalProp) {
+            me.getTotal = me.createAccessor(totalProp);
+        }
+
+        if (successProp) {
+            me.getSuccess = me.createAccessor(successProp);
+        }
+
+        if (messageProp) {
+            me.getMessage = me.createAccessor(messageProp);
+        }
+
+        // Generate a getter for the raw identifying property if any
+        if (idProp) {
+            accessor = me.createAccessor(idProp);
+            me.getId = function(record) {
+                var id = accessor.call(me, record);
+                return (id === undefined || id === '') ? null : id;
+            };
+        } else {
+            me.getId = function() {
+                return null;
+            };
+        }
+        me.convertRecordData = me.buildRecordDataExtractor();
+        me.lastFieldGeneration = me.model.prototype.fields.generation;
+    },
+
+    recordDataExtractorTemplate : [
+        'var me = this\n',
+        '    ,fields = me.model.prototype.fields\n',
+        '    ,value\n',
+        '    ,internalId\n',
+        '<tpl for="fields">',
+        '    ,__field{#} = fields.map["{name}"]\n',
+        '</tpl>', ';\n',
+
+        'return function(dest, source, record) {\n',
+        '<tpl for="fields">',
+        '{% var fieldAccessExpression =  this.createFieldAccessExpression(values, "__field" + xindex, "source");',
+        '   if (fieldAccessExpression) { %}',
+        // createFieldAccessExpression must be implemented in subclasses to extract data from the source object in the correct way
+        '    value = {[ this.createFieldAccessExpression(values, "__field" + xindex, "source") ]};\n',
+
+        // Code for processing a source property when a custom convert is defined
+            '<tpl if="hasCustomConvert">',
+        '    dest["{name}"] = value === undefined ? __field{#}.convert(__field{#}.defaultValue, record) : __field{#}.convert(value, record);\n',
+
+        // Code for processing a source property when there is a default value
+            '<tpl elseif="defaultValue !== undefined">',
+        '    if (value === undefined) {\n',
+        '        if (me.applyDefaults) {\n',
+                '<tpl if="convert">',
+        '            dest["{name}"] = __field{#}.convert(__field{#}.defaultValue, record);\n',
+                '<tpl else>',
+        '            dest["{name}"] = __field{#}.defaultValue\n',
+                '</tpl>',
+        '        };\n',
+        '    } else {\n',
+                '<tpl if="convert">',
+        '        dest["{name}"] = __field{#}.convert(value, record);\n',
+                '<tpl else>',
+        '        dest["{name}"] = value;\n',
+                '</tpl>',
+        '    };\n',
+
+        // Code for processing a source property value when there is no default value
+            '<tpl else>',
+        '    if (value !== undefined) {\n',
+                '<tpl if="convert">',
+        '        dest["{name}"] = __field{#}.convert(value, record);\n',
+                '<tpl else>',
+        '        dest["{name}"] = value;\n',
+                '</tpl>',
+        '    }\n',
+            '</tpl>',
+            
+        // For when createFieldExpression yielded nothing.
+        // There's no mapping - the field is not intended to be read from server data.
+        // This is the case with NodeInterface fields.
+        '{% } else { %}',
+            '<tpl if="defaultValue !== undefined">',
+                '<tpl if="convert">',
+        '    dest["{name}"] = __field{#}.convert(__field{#}.defaultValue, record);\n',
+                '<tpl else>',
+        '    dest["{name}"] = __field{#}.defaultValue\n',
+                '</tpl>',
+            '</tpl>',
+        '{% } %}',
+        '</tpl>',
+
+        // set the client id as the internalId of the record.
+        // clientId handles the case where a client side record did not previously exist on the server,
+        // so the server is passing back a client id that can be used to pair the server side record up with the client record
+        '<tpl if="clientIdProp">',
+        '    if (record && (internalId = {[ this.createFieldAccessExpression(\{mapping: values.clientIdProp\}, null, "source") ]})) {\n',
+        '        record.{["internalId"]} = internalId;\n',
+        '    }\n',
+        '</tpl>',
+
+        '};'
+    ],
+
+    /**
+     * @private
+     * Return a function which will read a raw row object in the format this Reader accepts, and populates
+     * a record's data object with converted data values.
+     *
+     * The returned function must be passed the following parameters:
+     *
+     * - dest A record's empty data object into which the new field value properties are injected.
+     * - source A raw row data object of whatever type this Reader consumes
+     * - record The record which is being populated.
+     *
+     */
+    buildRecordDataExtractor: function() {
+        var me = this,
+            modelProto = me.model.prototype,
+            templateData = {
+                clientIdProp: modelProto.clientIdProperty,
+                fields: modelProto.fields.items
+            };
+
+        me.recordDataExtractorTemplate.createFieldAccessExpression = function() { 
+            return me.createFieldAccessExpression.apply(me,arguments);
+        };
+        
+        // Here we are creating a new Function and invoking it immediately in the scope of this Reader
+        // It declares several vars capturing the configured context of this Reader, and returns a function
+        // which, when passed a record data object, a raw data row in the format this Reader is configured to read,
+        // and the record which is being created, will populate the record's data object from the raw row data.
+        return Ext.functionFactory(me.recordDataExtractorTemplate.apply(templateData)).call(me);
+    },
+
+    destroyReader: function() {
+        var me = this;
+        delete me.proxy;
+        delete me.model;
+        delete me.convertRecordData;
+        delete me.getId;
+        delete me.getTotal;
+        delete me.getSuccess;
+        delete me.getMessage;
+    }
+}, function() {
+    var proto = this.prototype;
+    Ext.apply(proto, {
+        // Private. Empty ResultSet to return when response is falsy (null|undefined|empty string)
+        nullResultSet: new Ext.data.ResultSet({
+            total  : 0,
+            count  : 0,
+            records: [],
+            success: true,
+            message: ''
+        }),
+        recordDataExtractorTemplate: new Ext.XTemplate(proto.recordDataExtractorTemplate)
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * The JSON Reader is used by a Proxy to read a server response that is sent back in JSON format. This usually
+ * happens as a result of loading a Store - for example we might create something like this:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'name', 'email']
+ *     });
+ *
+ *     var store = Ext.create('Ext.data.Store', {
+ *         model: 'User',
+ *         proxy: {
+ *             type: 'ajax',
+ *             url : 'users.json',
+ *             reader: {
+ *                 type: 'json'
+ *             }
+ *         }
+ *     });
+ *
+ * The example above creates a 'User' model. Models are explained in the {@link Ext.data.Model Model} docs if you're
+ * not already familiar with them.
+ *
+ * We created the simplest type of JSON Reader possible by simply telling our {@link Ext.data.Store Store}'s
+ * {@link Ext.data.proxy.Proxy Proxy} that we want a JSON Reader. The Store automatically passes the configured model to the
+ * Store, so it is as if we passed this instead:
+ *
+ *     reader: {
+ *         type : 'json',
+ *         model: 'User'
+ *     }
+ *
+ * The reader we set up is ready to read data from our server - at the moment it will accept a response like this:
+ *
+ *     [
+ *         {
+ *             "id": 1,
+ *             "name": "Ed Spencer",
+ *             "email": "ed at sencha.com"
+ *         },
+ *         {
+ *             "id": 2,
+ *             "name": "Abe Elias",
+ *             "email": "abe at sencha.com"
+ *         }
+ *     ]
+ *
+ * ## Reading other JSON formats
+ *
+ * If you already have your JSON format defined and it doesn't look quite like what we have above, you can usually
+ * pass JsonReader a couple of configuration options to make it parse your format. For example, we can use the
+ * {@link #cfg-root} configuration to parse data that comes back like this:
+ *
+ *     {
+ *         "users": [
+ *            {
+ *                "id": 1,
+ *                "name": "Ed Spencer",
+ *                "email": "ed at sencha.com"
+ *            },
+ *            {
+ *                "id": 2,
+ *                "name": "Abe Elias",
+ *                "email": "abe at sencha.com"
+ *            }
+ *         ]
+ *     }
+ *
+ * To parse this we just pass in a {@link #root} configuration that matches the 'users' above:
+ *
+ *     reader: {
+ *         type: 'json',
+ *         root: 'users'
+ *     }
+ *
+ * Sometimes the JSON structure is even more complicated. Document databases like CouchDB often provide metadata
+ * around each record inside a nested structure like this:
+ *
+ *     {
+ *         "total": 122,
+ *         "offset": 0,
+ *         "users": [
+ *             {
+ *                 "id": "ed-spencer-1",
+ *                 "value": 1,
+ *                 "user": {
+ *                     "id": 1,
+ *                     "name": "Ed Spencer",
+ *                     "email": "ed at sencha.com"
+ *                 }
+ *             }
+ *         ]
+ *     }
+ *
+ * In the case above the record data is nested an additional level inside the "users" array as each "user" item has
+ * additional metadata surrounding it ('id' and 'value' in this case). To parse data out of each "user" item in the
+ * JSON above we need to specify the {@link #record} configuration like this:
+ *
+ *     reader: {
+ *         type  : 'json',
+ *         root  : 'users',
+ *         record: 'user'
+ *     }
+ *
+ * ## Response MetaData
+ *
+ * The server can return metadata in its response, in addition to the record data, that describe attributes
+ * of the data set itself or are used to reconfigure the Reader. To pass metadata in the response you simply
+ * add a `metaData` attribute to the root of the response data. The metaData attribute can contain anything,
+ * but supports a specific set of properties that are handled by the Reader if they are present:
+ * 
+ * - {@link #root}: the property name of the root response node containing the record data
+ * - {@link #idProperty}: property name for the primary key field of the data
+ * - {@link #totalProperty}: property name for the total number of records in the data
+ * - {@link #successProperty}: property name for the success status of the response
+ * - {@link #messageProperty}: property name for an optional response message
+ * - {@link Ext.data.Model#cfg-fields fields}: Config used to reconfigure the Model's fields before converting the
+ * response data into records
+ * 
+ * An initial Reader configuration containing all of these properties might look like this ("fields" would be
+ * included in the Model definition, not shown):
+ *
+ *     reader: {
+ *         type : 'json',
+ *         root : 'root',
+ *         idProperty     : 'id',
+ *         totalProperty  : 'total',
+ *         successProperty: 'success',
+ *         messageProperty: 'message'
+ *     }
+ *
+ * If you were to pass a response object containing attributes different from those initially defined above, you could
+ * use the `metaData` attribute to reconifgure the Reader on the fly. For example:
+ *
+ *     {
+ *         "count": 1,
+ *         "ok": true,
+ *         "msg": "Users found",
+ *         "users": [{
+ *             "userId": 123,
+ *             "name": "Ed Spencer",
+ *             "email": "ed at sencha.com"
+ *         }],
+ *         "metaData": {
+ *             "root": "users",
+ *             "idProperty": 'userId',
+ *             "totalProperty": 'count',
+ *             "successProperty": 'ok',
+ *             "messageProperty": 'msg'
+ *         }
+ *     }
+ *
+ * You can also place any other arbitrary data you need into the `metaData` attribute which will be ignored by the Reader,
+ * but will be accessible via the Reader's {@link #metaData} property (which is also passed to listeners via the Proxy's
+ * {@link Ext.data.proxy.Proxy#metachange metachange} event (also relayed by the {@link Ext.data.AbstractStore#metachange
+ * store}). Application code can then process the passed metadata in any way it chooses.
+ * 
+ * A simple example for how this can be used would be customizing the fields for a Model that is bound to a grid. By passing
+ * the `fields` property the Model will be automatically updated by the Reader internally, but that change will not be
+ * reflected automatically in the grid unless you also update the column configuration. You could do this manually, or you
+ * could simply pass a standard grid {@link Ext.panel.Table#columns column} config object as part of the `metaData` attribute
+ * and then pass that along to the grid. Here's a very simple example for how that could be accomplished:
+ *
+ *     // response format:
+ *     {
+ *         ...
+ *         "metaData": {
+ *             "fields": [
+ *                 { "name": "userId", "type": "int" },
+ *                 { "name": "name", "type": "string" },
+ *                 { "name": "birthday", "type": "date", "dateFormat": "Y-j-m" },
+ *             ],
+ *             "columns": [
+ *                 { "text": "User ID", "dataIndex": "userId", "width": 40 },
+ *                 { "text": "User Name", "dataIndex": "name", "flex": 1 },
+ *                 { "text": "Birthday", "dataIndex": "birthday", "flex": 1, "format": 'Y-j-m', "xtype": "datecolumn" }
+ *             ]
+ *         }
+ *     }
+ *
+ * The Reader will automatically read the meta fields config and rebuild the Model based on the new fields, but to handle
+ * the new column configuration you would need to handle the metadata within the application code. This is done simply enough
+ * by handling the metachange event on either the store or the proxy, e.g.:
+ *
+ *     var store = Ext.create('Ext.data.Store', {
+ *         ...
+ *         listeners: {
+ *             'metachange': function(store, meta) {
+ *                 myGrid.reconfigure(store, meta.columns);
+ *             }
+ *         }
+ *     });
+ *
+ */
+Ext.define('Ext.data.reader.Json', {
+    extend:  Ext.data.reader.Reader ,
+    alternateClassName: 'Ext.data.JsonReader',
+    alias : 'reader.json',
+
+    root: '',
+
+    /**
+     * @cfg {String} record The optional location within the JSON response that the record data itself can be found at.
+     * See the JsonReader intro docs for more details. This is not often needed.
+     */
+    
+    /**
+     * @cfg {String} [metaProperty="metaData"]
+     * Name of the property from which to retrieve the `metaData` attribute. See {@link #metaData}.
+     */
+    metaProperty: 'metaData',
+
+    /**
+     * @cfg {Boolean} useSimpleAccessors True to ensure that field names/mappings are treated as literals when
+     * reading values.
+     *
+     * For example, by default, using the mapping "foo.bar.baz" will try and read a property foo from the root, then a property bar
+     * from foo, then a property baz from bar. Setting the simple accessors to true will read the property with the name
+     * "foo.bar.baz" direct from the root object.
+     */
+    useSimpleAccessors: false,
+
+    /**
+     * Reads a JSON object and returns a ResultSet. Uses the internal getTotal and getSuccess extractors to
+     * retrieve meta data from the response, and extractData to turn the JSON data into model instances.
+     * @param {Object} data The raw JSON data
+     * @return {Ext.data.ResultSet} A ResultSet containing model instances and meta data about the results
+     */
+    readRecords: function(data) {
+        var me = this,
+            meta;
+            
+        //this has to be before the call to super because we use the meta data in the superclass readRecords
+        if (me.getMeta) {
+            meta = me.getMeta(data);
+            if (meta) {
+                me.onMetaChange(meta);
+            }
+        } else if (data.metaData) {
+            me.onMetaChange(data.metaData);
+        }
+
+        /**
+         * @property {Object} jsonData
+         * A copy of this.rawData.
+         * @deprecated Will be removed in Ext JS 5.0. This is just a copy of this.rawData - use that instead.
+         */
+        me.jsonData = data;
+        return me.callParent([data]);
+    },
+
+    //inherit docs
+    getResponseData: function(response) {
+        var data, error;
+ 
+        try {
+            data = Ext.decode(response.responseText);
+            return this.readRecords(data);
+        } catch (ex) {
+            error = new Ext.data.ResultSet({
+                total  : 0,
+                count  : 0,
+                records: [],
+                success: false,
+                message: ex.message
+            });
+
+            this.fireEvent('exception', this, response, error);
+
+            Ext.Logger.warn('Unable to parse the JSON returned by the server');
+
+            return error;
+        }
+    },
+
+    //inherit docs
+    buildExtractors : function() {
+        var me = this,
+            metaProp = me.metaProperty;
+
+        me.callParent(arguments);
+
+        if (me.root) {
+            me.getRoot = me.createAccessor(me.root);
+        } else {
+            me.getRoot = Ext.identityFn;
+        }
+        
+        if (metaProp) {
+            me.getMeta = me.createAccessor(metaProp);
+        }
+    },
+
+    /**
+     * @private
+     * We're just preparing the data for the superclass by pulling out the record objects we want. If a {@link #record}
+     * was specified we have to pull those out of the larger JSON object, which is most of what this function is doing
+     * @param {Object} root The JSON root node
+     * @return {Ext.data.Model[]} The records
+     */
+    extractData: function(root) {
+        var recordName = this.record,
+            data = [],
+            length, i;
+
+        if (recordName) {
+            length = root.length;
+            
+            if (!length && Ext.isObject(root)) {
+                length = 1;
+                root = [root];
+            }
+
+            for (i = 0; i < length; i++) {
+                data[i] = root[i][recordName];
+            }
+        } else {
+            data = root;
+        }
+        return this.callParent([data]);
+    },
+
+    /**
+     * @private
+     * @method
+     * Returns an accessor function for the given property string. Gives support for properties such as the following:
+     *
+     * - 'someProperty'
+     * - 'some.property'
+     * - '["someProperty"]'
+     * - 'values[0]'
+     * 
+     * This is used by {@link #buildExtractors} to create optimized extractor functions for properties that are looked
+     * up directly on the source object (e.g. {@link #successProperty}, {@link #messageProperty}, etc.).
+     */
+    createAccessor: (function() {
+        var re = /[\[\.]/;
+
+        return function(expr) {
+            if (Ext.isEmpty(expr)) {
+                return Ext.emptyFn;
+            }
+            if (Ext.isFunction(expr)) {
+                return expr;
+            }
+            if (this.useSimpleAccessors !== true) {
+                var i = String(expr).search(re);
+                if (i >= 0) {
+                    return Ext.functionFactory('obj', 'return obj' + (i > 0 ? '.' : '') + expr);
+                }
+            }
+            return function(obj) {
+                return obj[expr];
+            };
+        };
+    }()),
+
+    /**
+     * @private
+     * @method
+     * Returns an accessor expression for the passed Field. Gives support for properties such as the following:
+     * 
+     * - 'someProperty'
+     * - 'some.property'
+     * - '["someProperty"]'
+     * - 'values[0]'
+     * 
+     * This is used by {@link #buildRecordDataExtractor} to create optimized extractor expressions when converting raw
+     * data into model instances. This method is used at the field level to dynamically map values to model fields.
+     */
+    createFieldAccessExpression: (function() {
+        var re = /[\[\.]/;
+
+        return function(field, fieldVarName, dataName) {
+            var mapping = field.mapping,
+                hasMap = mapping || mapping === 0,
+                map    = hasMap ? mapping : field.name,
+                result,
+                operatorIndex;
+
+            // mapping: false means that the Field will never be read from server data.
+            if (mapping === false) {
+                return;
+            }
+
+            if (typeof map === 'function') {
+                result = fieldVarName + '.mapping(' + dataName + ', this)';
+            } else if (this.useSimpleAccessors === true || ((operatorIndex = String(map).search(re)) < 0)) {
+                if (!hasMap || isNaN(map)) {
+                    // If we don't provide a mapping, we may have a field name that is numeric
+                    map = '"' + map + '"';
+                }
+                result = dataName + "[" + map + "]";
+            } else if (operatorIndex === 0) {
+                // If it matched at index 0 then it must be bracket syntax (e.g. ["foo"]). In this case simply
+                // join the two, e.g. 'field["foo"]':
+                result = dataName + map;
+            } else {
+                // If it matched at index > 0 it must be either dot syntax (e.g. field.foo) or a values array
+                // item (e.g. values[0]). For the latter, we can simply concatenate the values reference to
+                // the source directly like 'field.values[0]'. For dot notation we have to support arbitrary
+                // levels (field.foo.bar), any of which could be null or undefined, so we have to create the
+                // returned value such that the references will be assigned defensively in the calling code.
+                // The output should look like 'field.foo && field.foo.bar' in that case.
+                var parts = map.split('.'),
+                    len = parts.length,
+                    i = 1,
+                    tempResult = dataName + '.' + parts[0],
+                    buffer = [tempResult]; // for 'field.values[0]' this will be the returned result
+                
+                for (; i < len; i++) {
+                    tempResult += '.' + parts[i];
+                    buffer.push(tempResult);
+                }
+                result = buffer.join(' && ');
+            }
+            return result;
+        };
+    }())
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Base Writer class used by most subclasses of {@link Ext.data.proxy.Server}. This class is responsible for taking a
+ * set of {@link Ext.data.Operation} objects and a {@link Ext.data.Request} object and modifying that request based on
+ * the Operations.
+ *
+ * For example a Ext.data.writer.Json would format the Operations and their {@link Ext.data.Model} instances based on
+ * the config options passed to the JsonWriter's constructor.
+ *
+ * Writers are not needed for any kind of local storage - whether via a {@link Ext.data.proxy.WebStorage Web Storage
+ * proxy} (see {@link Ext.data.proxy.LocalStorage localStorage} and {@link Ext.data.proxy.SessionStorage
+ * sessionStorage}) or just in memory via a {@link Ext.data.proxy.Memory MemoryProxy}.
+ * 
+ * # Dates
+ * Before sending dates to the server, they can be formatted using one of the {@link Ext.Date} formats.
+ * These formats can be specified both on the field and the writer itself. In terms of precedence, from highest to lowest:
+ * 
+ * -  {@link #dateFormat Writer.dateFormat} The writer dateFormat will always have the highest precedence
+ * -  {@link Ext.data.Field#dateWriteFormat} The dateWriteFormat will be used if no format is specified on the writer
+ * -  {@link Ext.data.Field#dateFormat Field.dateFormat}/{@link Ext.data.Field#dateReadFormat Field.dateReadFormat} 
+ * Finally, if none of the above options are specified the field will be formatted using the format that was used to read the date from the server.
+ */
+Ext.define('Ext.data.writer.Writer', {
+    alias: 'writer.base',
+    alternateClassName: ['Ext.data.DataWriter', 'Ext.data.Writer'],
+
+    /**
+     * @cfg {Boolean} writeAllFields
+     * True to write all fields from the record to the server. If set to false it will only send the fields that were
+     * modified. Note that any fields that have {@link Ext.data.Field#persist} set to false will still be ignored.
+     */
+    writeAllFields: true,
+
+    /**
+     * @cfg {String} dateFormat
+     * This is used for each field of type date in the model to format the value before
+     * it is sent to the server.
+     */
+
+    /**
+     * @cfg {String} nameProperty
+     * This property is used to read the key for each value that will be sent to the server. For example:
+     *
+     *     Ext.define('Person', {
+     *         extend: 'Ext.data.Model',
+     *         fields: [{
+     *             name: 'first',
+     *             mapping: 'firstName'
+     *         }, {
+     *             name: 'last',
+     *             mapping: 'lastName'
+     *         }, {
+     *             name: 'age'
+     *         }]
+     *     });
+     *     new Ext.data.writer.Writer({
+     *         writeAllFields: true,
+     *         nameProperty: 'mapping'
+     *     });
+     *
+     *     // This will be sent to the server
+     *     {
+     *         firstName: 'first name value',
+     *         lastName: 'last name value',
+     *         age: 1
+     *     }
+     *
+     * If the value is not present, the field name will always be used.
+     */
+    nameProperty: 'name',
+
+    /**
+     * @cfg {Boolean} [writeRecordId]
+     * By default, each record's id is always included in the output for non-phantom records since in most
+     * cases the id will be required on the server to process the record action. This is helpful since the id
+     * will normally not be modified, and so would not be sent to the server unless {@link #writeAllFields}
+     * was explicitly enabled.
+     * 
+     * However, there are cases where it is not desirable for the record id to be passed in the data directly.
+     * For example, when using a RESTful API the record id would typically be appended to the url instead.
+     */
+    writeRecordId: true,
+
+    /*
+     * @property {Boolean} isWriter
+     * `true` in this class to identify an object as an instantiated Writer, or subclass thereof.
+     */
+    isWriter: true,
+
+    /**
+     * Creates new Writer.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        Ext.apply(this, config);
+    },
+
+    /**
+     * Prepares a Proxy's Ext.data.Request object
+     * @param {Ext.data.Request} request The request object
+     * @return {Ext.data.Request} The modified request object
+     */
+    write: function(request) {
+        var operation = request.operation,
+            records   = operation.records || [],
+            len       = records.length,
+            i         = 0,
+            data      = [];
+
+        for (; i < len; i++) {
+            data.push(this.getRecordData(records[i], operation));
+        }
+        return this.writeRecords(request, data);
+    },
+
+    /**
+     * Formats the data for each record before sending it to the server. This
+     * method should be overridden to format the data in a way that differs from the default.
+     * @param {Ext.data.Model} record The record that we are writing to the server.
+     * @param {Ext.data.Operation} [operation] An operation object.
+     * @return {Object} An object literal of name/value keys to be written to the server.
+     * By default this method returns the data property on the record.
+     */
+    getRecordData: function(record, operation) {
+        var isPhantom = record.phantom === true,
+            writeAll = this.writeAllFields || isPhantom,
+            fields = record.fields,
+            fieldItems = fields.items,
+            data = {},
+            clientIdProperty = record.clientIdProperty,
+            changes,
+            field,
+            key,
+            mappedIdProperty,
+            f, fLen;
+
+        if (writeAll) {
+            fLen = fieldItems.length;
+
+            for (f = 0; f < fLen; f++) {
+                field = fieldItems[f];
+                if (field.persist) {
+                    this.writeValue(data, field, record);
+                }
+            }
+        } else {
+            // Only write the changes
+            changes = record.getChanges();
+            for (key in changes) {
+                if (changes.hasOwnProperty(key)) {
+                    field = fields.get(key);
+                    if (field.persist) {
+                        this.writeValue(data, field, record);
+                    }
+                }
+            }
+        }
+        if (isPhantom) {
+            if (clientIdProperty && operation && operation.records.length > 1) {
+                // include clientId for phantom records, if multiple records are being written to the server in one operation.
+                // The server can then return the clientId with each record so the operation can match the server records with the client records
+                data[clientIdProperty] = record.internalId;
+            }
+        } else if (this.writeRecordId) {
+            // Make sure that if a mapping is in place the mapped id name is used instead of the default field name. 
+            mappedIdProperty = fields.get(record.idProperty)[this.nameProperty] || record.idProperty;
+            data[mappedIdProperty] = record.getId();
+        }
+
+        return data;
+    },
+
+    writeValue: function(data, field, record){
+        var name = field[this.nameProperty],
+            dateFormat = this.dateFormat || field.dateWriteFormat || field.dateFormat,
+            value = record.get(field.name);
+
+        // Allow the nameProperty to yield a numeric value which may be zero.
+        // For example, using a field's numeric mapping to write an array for output.
+        if (name == null) {
+            name = field.name;
+        }
+
+        if (field.serialize) {
+            data[name] = field.serialize(value, record);
+        } else if (field.type === Ext.data.Types.DATE && dateFormat && Ext.isDate(value)) {
+            data[name] = Ext.Date.format(value, dateFormat);
+        } else {
+            data[name] = value;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.data.writer.Json
+
+This class is used to write {@link Ext.data.Model} data to the server in a JSON format.
+The {@link #allowSingle} configuration can be set to false to force the records to always be
+encoded in an array, even if there is only a single record being sent.
+
+ * @markdown
+ */
+Ext.define('Ext.data.writer.Json', {
+    extend:  Ext.data.writer.Writer ,
+    alternateClassName: 'Ext.data.JsonWriter',
+    alias: 'writer.json',
+    
+    /**
+     * @cfg {String} root The HTTP parameter name by which JSON encoded records will be passed to the server if the
+     * {@link #encode} option is `true`.
+     */
+    root: undefined,
+    
+    /**
+     * @cfg {Boolean} [encode=false] Configure `true` to send record data (all record fields if {@link #writeAllFields} is `true`)
+     * as a JSON encoded HTTP parameter named by the {@link #root} configuration.
+     * 
+     * The encode option should only be set to true when a {@link #root} is defined, because the values will be
+     * sent as part of the request parameters as opposed to a raw post. The root will be the name of the parameter
+     * sent to the server.
+     */
+    encode: false,
+    
+    /**
+     * @cfg {Boolean} [allowSingle=true] Configure with `false` to ensure that records are always wrapped in an array, even if there is only
+     * one record being sent. When there is more than one record, they will always be encoded into an array.
+     */
+    allowSingle: true,
+    
+    /**
+     * @cfg {Boolean} [expandData=false] By default, when dot-delimited field {@link #nameProperty mappings} are
+     * used (e.g. `name: 'myProperty', mapping: 'my.nested.property'`) the writer will simply output a flat data
+     * object containing the mapping string literal as the property name (e.g. `{ 'my.nested.property': 'foo' }`).
+     * 
+     * Mappings are used to map incoming nested JSON to flat Ext models. In many case, the data output by the
+     * writer should preferrably match the original nested data format. Setting this config to `true` will ensure
+     * that the output will instead look like `{ my: { nested: { property: 'foo' }}}`. The output is generated
+     * by {@link #getExpandedData}, which can optionally be overridden to apply more customized logic.
+     */
+    expandData: false,
+    
+    /**
+     * @protected
+     * The Reader classes support dot-delimited data mappings for extracting nested raw data into fields, so the
+     * writer must support converting the flat {@link Ext.data.Model} structure back into the original nested data
+     * format. Using the same mappings when available, the Writer will simply split each delimiter into a nested
+     * object in the output, which should exactly match the input format. For example, record data like this:
+     * 
+     *     my.nested.property: 'foo',
+     *     my.nested.another: 'bar',
+     *     my.somethingElse: 123
+     * 
+     * should write out as...
+     * 
+     *     my: {
+     *         nested: {
+     *             property: 'foo',
+     *             another: 'bar
+     *         },
+     *         somethingElse: 123
+     *     }
+     *
+     * This behavior is governed by the {@link #expandData} config. By default, this option is `false` for
+     * compatibility reasons, and will output a flat structure matching the flat record format. Setting this config
+     * to `true` will enable the expanded mapping behavior as shown here. This method could also be overridden
+     * to provide an even more customized output data structure.
+     */
+    getExpandedData: function(data) {
+        var dataLength = data.length,
+            i = 0,
+            item,
+            prop,
+            nameParts,
+            j,
+            tempObj,
+            
+            toObject = function(name, value) {
+                var o = {};
+                o[name] = value;
+                return o;
+            };
+        
+        for (; i < dataLength; i++) {
+            item = data[i];
+            
+            for (prop in item) {
+                if (item.hasOwnProperty(prop)) {
+                    // e.g. my.nested.property: 'foo'
+                    nameParts = prop.split('.');
+                    j = nameParts.length - 1;
+                    
+                    if (j > 0) {
+                        // Initially this will be the value 'foo'.
+                        // Equivalent to rec['my.nested.property']
+                        tempObj = item[prop];
+                        
+                        for (; j > 0; j--) {
+                            // Starting with the value above, we loop inside out, assigning the
+                            // current object as the value for the parent name. Work all
+                            // the way up until only the root name is left to assign.
+                            tempObj = toObject(nameParts[j], tempObj);
+                        }
+                        
+                        // At this point we'll have all child properties rolled up into a single
+                        // object like `{ nested: { property: 'foo' }}`. Now add the root name
+                        // (e.g. 'my') to the record data if needed (do not overwrite existing):
+                        item[nameParts[0]] = item[nameParts[0]] || {};
+                        // Since there could be duplicate names at any level of the nesting be sure
+                        // to merge rather than assign when setting the object as the value:
+                        Ext.Object.merge(item[nameParts[0]], tempObj);
+                        // Finally delete the original mapped property from the record
+                        delete item[prop];
+                    }
+                }
+            }
+        }
+        return data;
+    },
+    
+    //inherit docs
+    writeRecords: function(request, data) {
+        var root = this.root;
+        
+        if (this.expandData) {
+            data = this.getExpandedData(data);
+        }
+        
+        if (this.allowSingle && data.length === 1) {
+            // convert to single object format
+            data = data[0];
+        }
+        
+        if (this.encode) {
+            if (root) {
+                // sending as a param, need to encode
+                request.params[root] = Ext.encode(data);
+            } else {
+                Ext.Error.raise('Must specify a root when using encode');
+            }
+        } else {
+            // send as jsonData
+            request.jsonData = request.jsonData || {};
+            if (root) {
+                request.jsonData[root] = data;
+            } else {
+                request.jsonData = data;
+            }
+        }
+        return request;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Proxies are used by {@link Ext.data.Store Stores} to handle the loading and saving of {@link Ext.data.Model Model}
+ * data. Usually developers will not need to create or interact with proxies directly.
+ *
+ * # Types of Proxy
+ *
+ * There are two main types of Proxy - {@link Ext.data.proxy.Client Client} and {@link Ext.data.proxy.Server Server}.
+ * The Client proxies save their data locally and include the following subclasses:
+ *
+ * - {@link Ext.data.proxy.LocalStorage LocalStorageProxy} - saves its data to localStorage if the browser supports it
+ * - {@link Ext.data.proxy.SessionStorage SessionStorageProxy} - saves its data to sessionStorage if the browsers supports it
+ * - {@link Ext.data.proxy.Memory MemoryProxy} - holds data in memory only, any data is lost when the page is refreshed
+ *
+ * The Server proxies save their data by sending requests to some remote server. These proxies include:
+ *
+ * - {@link Ext.data.proxy.Ajax Ajax} - sends requests to a server on the same domain
+ * - {@link Ext.data.proxy.JsonP JsonP} - uses JSON-P to send requests to a server on a different domain
+ * - {@link Ext.data.proxy.Rest Rest} - uses RESTful HTTP methods (GET/PUT/POST/DELETE) to communicate with server
+ * - {@link Ext.data.proxy.Direct Direct} - uses {@link Ext.direct.Manager} to send requests
+ *
+ * Proxies operate on the principle that all operations performed are either Create, Read, Update or Delete. These four
+ * operations are mapped to the methods {@link #create}, {@link #read}, {@link #update} and {@link #destroy}
+ * respectively. Each Proxy subclass implements these functions.
+ *
+ * The CRUD methods each expect an {@link Ext.data.Operation Operation} object as the sole argument. The Operation
+ * encapsulates information about the action the Store wishes to perform, the {@link Ext.data.Model model} instances
+ * that are to be modified, etc. See the {@link Ext.data.Operation Operation} documentation for more details. Each CRUD
+ * method also accepts a callback function to be called asynchronously on completion.
+ *
+ * Proxies also support batching of Operations via a {@link Ext.data.Batch batch} object, invoked by the {@link #batch}
+ * method.
+ */
+Ext.define('Ext.data.proxy.Proxy', {
+    alias: 'proxy.proxy',
+    alternateClassName: ['Ext.data.DataProxy', 'Ext.data.Proxy'],
+
+               
+                               
+                              
+      
+
+           
+                         
+                             
+                        
+      
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @cfg {String} batchOrder
+     * Comma-separated ordering 'create', 'update' and 'destroy' actions when batching. Override this to set a different
+     * order for the batched CRUD actions to be executed in. Defaults to 'create,update,destroy'.
+     */
+    batchOrder: 'create,update,destroy',
+
+    /**
+     * @cfg {Boolean} batchActions
+     * True to batch actions of a particular type when synchronizing the store. Defaults to true.
+     */
+    batchActions: true,
+
+    /**
+     * @cfg {String} defaultReaderType
+     * The default registered reader type. Defaults to 'json'.
+     * @private
+     */
+    defaultReaderType: 'json',
+
+    /**
+     * @cfg {String} defaultWriterType
+     * The default registered writer type. Defaults to 'json'.
+     * @private
+     */
+    defaultWriterType: 'json',
+
+    /**
+     * @cfg {String/Ext.data.Model} model
+     * The name of the Model to tie to this Proxy. Can be either the string name of the Model, or a reference to the
+     * Model constructor. Required.
+     */
+
+    /**
+     * @cfg {Object/String/Ext.data.reader.Reader} reader
+     * The Ext.data.reader.Reader to use to decode the server's response or data read from client. This can either be a
+     * Reader instance, a config object or just a valid Reader type name (e.g. 'json', 'xml').
+     */
+
+    /**
+     * @cfg {Object/String/Ext.data.writer.Writer} writer
+     * The Ext.data.writer.Writer to use to encode any request sent to the server or saved to client. This can either be
+     * a Writer instance, a config object or just a valid Writer type name (e.g. 'json', 'xml').
+     */
+
+    /**
+     * @property {Boolean} isProxy
+     * `true` in this class to identify an object as an instantiated Proxy, or subclass thereof.
+     */
+    isProxy: true,
+
+    /**
+     * @property {Boolean} [isSynchronous=false]
+     * Identifies the proxy as (a)synchronous.
+     */
+     isSynchronous: false,
+
+    /**
+     * Creates the Proxy
+     * @param {Object} config (optional) Config object.
+     */
+    constructor: function(config) {
+        var me = this;
+
+        config = config || {};
+        me.proxyConfig = config;
+
+        me.mixins.observable.constructor.call(me, config);
+
+        if (me.model !== undefined && !(me.model instanceof Ext.data.Model)) {
+            me.setModel(me.model);
+        } else {
+            if (me.reader) {
+                me.setReader(me.reader);
+            }
+            
+            if (me.writer) {
+                me.setWriter(me.writer);
+            }
+        }
+
+        /**
+         * @event metachange
+         * Fires when this proxy's reader provides new metadata. Metadata usually consists
+         * of new field definitions, but can include any configuration data required by an
+         * application, and can be processed as needed in the event handler.
+         * This event is currently only fired for JsonReaders. Note that this event is also
+         * propagated by {@link Ext.data.Store}, which is typically where it would be handled.
+         * @param {Ext.data.proxy.Proxy} this
+         * @param {Object} meta The JSON metadata
+         */
+    },
+
+    /**
+     * Sets the model associated with this proxy. This will only usually be called by a Store
+     *
+     * @param {String/Ext.data.Model} model The new model. Can be either the model name string,
+     * or a reference to the model's constructor
+     * @param {Boolean} setOnStore Sets the new model on the associated Store, if one is present
+     */
+    setModel: function(model, setOnStore) {
+        var me = this;
+        
+        me.model = Ext.ModelManager.getModel(model);
+
+        me.setReader(this.reader);
+        me.setWriter(this.writer);
+
+        if (setOnStore && me.store) {
+            me.store.setModel(me.model);
+        }
+    },
+
+    /**
+     * Returns the model attached to this Proxy
+     * @return {Ext.data.Model} The model
+     */
+    getModel: function() {
+        return this.model;
+    },
+
+    /**
+     * Sets the Proxy's Reader by string, config object or Reader instance
+     *
+     * @param {String/Object/Ext.data.reader.Reader} reader The new Reader, which can be either a type string,
+     * a configuration object or an Ext.data.reader.Reader instance
+     * @return {Ext.data.reader.Reader} The attached Reader object
+     */
+    setReader: function(reader) {
+        var me = this,
+            needsCopy = true,
+            current = me.reader;
+
+        if (reader === undefined || typeof reader == 'string') {
+            reader = {
+                type: reader
+            };
+            needsCopy = false;
+        }
+
+        if (reader.isReader) {
+            reader.setModel(me.model);
+        } else {
+            if (needsCopy) {
+                reader = Ext.apply({}, reader);
+            }
+            Ext.applyIf(reader, {
+                proxy: me,
+                model: me.model,
+                type : me.defaultReaderType
+            });
+
+            reader = Ext.createByAlias('reader.' + reader.type, reader);
+        }
+
+        if (reader !== current && reader.onMetaChange) {
+            reader.onMetaChange = Ext.Function.createSequence(reader.onMetaChange, this.onMetaChange, this);
+        }
+
+        me.reader = reader;
+        return me.reader;
+    },
+
+    /**
+     * Returns the reader currently attached to this proxy instance
+     * @return {Ext.data.reader.Reader} The Reader instance
+     */
+    getReader: function() {
+        return this.reader;
+    },
+
+    /**
+     * @private
+     * Called each time the reader's onMetaChange is called so that the proxy can fire the metachange event
+     */
+    onMetaChange: function(meta) {
+        this.fireEvent('metachange', this, meta);
+    },
+
+    /**
+     * Sets the Proxy's Writer by string, config object or Writer instance
+     *
+     * @param {String/Object/Ext.data.writer.Writer} writer The new Writer, which can be either a type string,
+     * a configuration object or an Ext.data.writer.Writer instance
+     * @return {Ext.data.writer.Writer} The attached Writer object
+     */
+    setWriter: function(writer) {
+        var me = this,
+            needsCopy = true;
+            
+        if (writer === undefined || typeof writer == 'string') {
+            writer = {
+                type: writer
+            };
+            needsCopy = false;
+        }
+
+        if (!writer.isWriter) {
+            if (needsCopy) {
+                writer = Ext.apply({}, writer);
+            }
+            Ext.applyIf(writer, {
+                model: me.model,
+                type : me.defaultWriterType
+            });
+
+            writer = Ext.createByAlias('writer.' + writer.type, writer);
+        }
+
+        me.writer = writer;
+
+        return me.writer;
+    },
+
+    /**
+     * Returns the writer currently attached to this proxy instance
+     * @return {Ext.data.writer.Writer} The Writer instance
+     */
+    getWriter: function() {
+        return this.writer;
+    },
+
+    /**
+     * Performs the given create operation.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    create: Ext.emptyFn,
+
+    /**
+     * Performs the given read operation.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    read: Ext.emptyFn,
+
+    /**
+     * Performs the given update operation.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    update: Ext.emptyFn,
+
+    /**
+     * Performs the given destroy operation.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    destroy: Ext.emptyFn,
+
+    /**
+     * Performs a batch of {@link Ext.data.Operation Operations}, in the order specified by {@link #batchOrder}. Used
+     * internally by {@link Ext.data.Store}'s {@link Ext.data.Store#sync sync} method. Example usage:
+     *
+     *     myProxy.batch({
+     *         create : [myModel1, myModel2],
+     *         update : [myModel3],
+     *         destroy: [myModel4, myModel5]
+     *     });
+     *
+     * Where the myModel* above are {@link Ext.data.Model Model} instances - in this case 1 and 2 are new instances and
+     * have not been saved before, 3 has been saved previously but needs to be updated, and 4 and 5 have already been
+     * saved but should now be destroyed.
+     * 
+     * Note that the previous version of this method took 2 arguments (operations and listeners). While this is still
+     * supported for now, the current signature is now a single `options` argument that can contain both operations and
+     * listeners, in addition to other options. The multi-argument signature will likely be deprecated in a future release.
+     *
+     * @param {Object} options Object containing one or more properties supported by the batch method:
+     * 
+     * @param {Object} options.operations Object containing the Model instances to act upon, keyed by action name
+     * 
+     * @param {Object} [options.listeners] Event listeners object passed straight through to the Batch -
+     * see {@link Ext.data.Batch} for details
+     * 
+     * @param {Ext.data.Batch/Object} [options.batch] A {@link Ext.data.Batch} object (or batch config to apply 
+     * to the created batch). If unspecified a default batch will be auto-created.
+     * 
+     * @param {Function} [options.callback] The function to be called upon completion of processing the batch.
+     * The callback is called regardless of success or failure and is passed the following parameters:
+     * @param {Ext.data.Batch} options.callback.batch The {@link Ext.data.Batch batch} that was processed,
+     * containing all operations in their current state after processing
+     * @param {Object} options.callback.options The options argument that was originally passed into batch
+     * 
+     * @param {Function} [options.success] The function to be called upon successful completion of the batch. The 
+     * success function is called only if no exceptions were reported in any operations. If one or more exceptions
+     * occurred then the `failure` function will be called instead. The success function is called 
+     * with the following parameters:
+     * @param {Ext.data.Batch} options.success.batch The {@link Ext.data.Batch batch} that was processed,
+     * containing all operations in their current state after processing
+     * @param {Object} options.success.options The options argument that was originally passed into batch
+     * 
+     * @param {Function} [options.failure] The function to be called upon unsuccessful completion of the batch. The 
+     * failure function is called when one or more operations returns an exception during processing (even if some
+     * operations were also successful). In this case you can check the batch's {@link Ext.data.Batch#exceptions
+     * exceptions} array to see exactly which operations had exceptions. The failure function is called with the 
+     * following parameters:
+     * @param {Ext.data.Batch} options.failure.batch The {@link Ext.data.Batch batch} that was processed,
+     * containing all operations in their current state after processing
+     * @param {Object} options.failure.options The options argument that was originally passed into batch
+     * 
+     * @param {Object} [options.scope] The scope in which to execute any callbacks (i.e. the `this` object inside
+     * the callback, success and/or failure functions). Defaults to the proxy.
+     *
+     * @return {Ext.data.Batch} The newly created Batch
+     */
+    batch: function(options, /* deprecated */listeners) {
+        var me = this,
+            useBatch = me.batchActions,
+            batch,
+            records,
+            actions, aLen, action, a, r, rLen, record;
+
+        if (options.operations === undefined) {
+            // the old-style (operations, listeners) signature was called
+            // so convert to the single options argument syntax
+            options = {
+                operations: options,
+                listeners: listeners
+            };
+        }
+
+        if (options.batch) {
+            if (Ext.isDefined(options.batch.runOperation)) {
+                batch = Ext.applyIf(options.batch, {
+                    proxy: me,
+                    listeners: {}
+                });
+            }
+        } else {
+            options.batch = {
+                proxy: me,
+                listeners: options.listeners || {}
+            };
+        }
+
+        if (!batch) {
+            batch = new Ext.data.Batch(options.batch);
+        }
+
+        batch.on('complete', Ext.bind(me.onBatchComplete, me, [options], 0));
+
+        actions = me.batchOrder.split(',');
+        aLen    = actions.length;
+
+        for (a = 0; a < aLen; a++) {
+            action  = actions[a];
+            records = options.operations[action];
+
+            if (records) {
+                if (useBatch) {
+                    batch.add(new Ext.data.Operation({
+                        action  : action,
+                        records : records
+                    }));
+                } else {
+                    rLen = records.length;
+
+                    for (r = 0; r < rLen; r++) {
+                        record = records[r];
+
+                        batch.add(new Ext.data.Operation({
+                            action  : action,
+                            records : [record]
+                        }));
+                    }
+                }
+            }
+        }
+
+        batch.start();
+        return batch;
+    },
+
+    /**
+     * @private
+     * The internal callback that the proxy uses to call any specified user callbacks after completion of a batch
+     */
+    onBatchComplete: function(batchOptions, batch) {
+        var scope = batchOptions.scope || this;
+
+        if (batch.hasException) {
+            if (Ext.isFunction(batchOptions.failure)) {
+                Ext.callback(batchOptions.failure, scope, [batch, batchOptions]);
+            }
+        } else if (Ext.isFunction(batchOptions.success)) {
+            Ext.callback(batchOptions.success, scope, [batch, batchOptions]);
+        }
+
+        if (Ext.isFunction(batchOptions.callback)) {
+            Ext.callback(batchOptions.callback, scope, [batch, batchOptions]);
+        }
+    },
+
+    clone: function() {
+        return new this.self(this.proxyConfig);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Represents a single read or write operation performed by a {@link Ext.data.proxy.Proxy Proxy}. Operation objects are
+ * used to enable communication between Stores and Proxies. Application developers should rarely need to interact with
+ * Operation objects directly.
+ *
+ * Several Operations can be batched together in a {@link Ext.data.Batch batch}.
+ */
+Ext.define('Ext.data.Operation', {
+    /**
+     * @cfg {Boolean} synchronous
+     * True if this Operation is to be executed synchronously. This property is inspected by a
+     * {@link Ext.data.Batch Batch} to see if a series of Operations can be executed in parallel or not.
+     */
+    synchronous: true,
+
+    /**
+     * @cfg {String} action
+     * The action being performed by this Operation. Should be one of 'create', 'read', 'update' or 'destroy'.
+     */
+    action: undefined,
+
+    /**
+     * @cfg {Ext.util.Filter[]} filters
+     * Optional array of filter objects. Only applies to 'read' actions.
+     */
+    filters: undefined,
+
+    /**
+     * @cfg {Ext.util.Sorter[]} sorters
+     * Optional array of sorter objects. Only applies to 'read' actions.
+     */
+    sorters: undefined,
+
+    /**
+     * @cfg {Ext.util.Grouper[]} groupers
+     * Optional grouping configuration. Only applies to 'read' actions where grouping is desired.
+     */
+    groupers: undefined,
+
+    /**
+     * @cfg {Number} start
+     * The start index (offset), used in paging when running a 'read' action.
+     */
+    start: undefined,
+
+    /**
+     * @cfg {Number} limit
+     * The number of records to load. Used on 'read' actions when paging is being used.
+     */
+    limit: undefined,
+
+    /**
+     * @cfg {Ext.data.Batch} batch
+     * The batch that this Operation is a part of.
+     */
+    batch: undefined,
+    
+    /**
+     * @cfg {Object} params
+     * Parameters to pass along with the request when performing the operation.
+     */
+
+    /**
+     * @cfg {Function} callback
+     * Function to execute when operation completed.
+     * @cfg {Ext.data.Model[]} callback.records Array of records.
+     * @cfg {Ext.data.Operation} callback.operation The Operation itself.
+     * @cfg {Boolean} callback.success True when operation completed successfully.
+     */
+    callback: undefined,
+
+    /**
+     * @cfg {Object} scope
+     * Scope for the {@link #callback} function.
+     */
+    scope: undefined,
+
+    /**
+     * @property {Boolean} started
+     * The start status of this Operation. Use {@link #isStarted}.
+     * @readonly
+     * @private
+     */
+    started: false,
+
+    /**
+     * @property {Boolean} running
+     * The run status of this Operation. Use {@link #isRunning}.
+     * @readonly
+     * @private
+     */
+    running: false,
+
+    /**
+     * @property {Boolean} complete
+     * The completion status of this Operation. Use {@link #isComplete}.
+     * @readonly
+     * @private
+     */
+    complete: false,
+
+    /**
+     * @property {Boolean} success
+     * Whether the Operation was successful or not. This starts as undefined and is set to true
+     * or false by the Proxy that is executing the Operation. It is also set to false by {@link #setException}. Use
+     * {@link #wasSuccessful} to query success status.
+     * @readonly
+     * @private
+     */
+    success: undefined,
+
+    /**
+     * @property {Boolean} exception
+     * The exception status of this Operation. Use {@link #hasException} and see {@link #getError}.
+     * @readonly
+     * @private
+     */
+    exception: false,
+
+    /**
+     * @property {String/Object} error
+     * The error object passed when {@link #setException} was called. This could be any object or primitive.
+     * @private
+     */
+    error: undefined,
+
+    /**
+     * @property {RegExp} actionCommitRecordsRe
+     * The RegExp used to categorize actions that require record commits.
+     */
+    actionCommitRecordsRe: /^(?:create|update)$/i,
+
+    /**
+     * @property {RegExp} actionSkipSyncRe
+     * The RegExp used to categorize actions that skip local record synchronization. This defaults
+     * to match 'destroy'.
+     */
+    actionSkipSyncRe: /^destroy$/i,
+
+    /**
+     * Creates new Operation object.
+     * @param {Object} config (optional) Config object.
+     */
+    constructor: function(config) {
+        Ext.apply(this, config || {});
+    },
+
+    /**
+     * This method is called to commit data to this instance's records given the records in
+     * the server response. This is followed by calling {@link Ext.data.Model#commit} on all
+     * those records (for 'create' and 'update' actions).
+     *
+     * If this {@link #action} is 'destroy', any server records are ignored and the
+     * {@link Ext.data.Model#commit} method is not called.
+     *
+     * @param {Ext.data.Model[]} serverRecords An array of {@link Ext.data.Model} objects returned by
+     * the server.
+     * @markdown
+     */
+    commitRecords: function(serverRecords) {
+        var me = this,
+            commitRecords = me.actionCommitRecordsRe.test(me.action),
+            mc, index, clientRecords, serverRec, clientRec, i, len,
+            modifiedFields, recordModifiedFields;
+
+        if (!me.actionSkipSyncRe.test(me.action)) {
+            clientRecords = me.records;
+
+            if (clientRecords && clientRecords.length) {
+
+                // If we plan to commit the records modified by the server's return records
+                // we collect all the fields which were modified as a result.
+                // This is so that a modifiedFields array can be passed into the commit codepath
+                // so that minimal UI updating can be applied.
+                if (commitRecords) {
+                    recordModifiedFields = [];
+                }
+                if (clientRecords.length > 1) {
+                    // If this operation has multiple records, client records need to be matched up with server records
+                    // so that any data returned from the server can be updated in the client records. If we don't have
+                    // a clientIdProperty specified on the model and we've done a create, just assume the data is returned in order.
+                    // If it's an update, the records should already have an id which should match what the server returns.
+                    if (me.action == 'update' || clientRecords[0].clientIdProperty) {
+                        mc = new Ext.util.MixedCollection();
+                        mc.addAll(serverRecords);
+
+                        for (index = clientRecords.length; index--; ) {
+                            clientRec = clientRecords[index];
+                            serverRec = mc.findBy(me.matchClientRec, clientRec);
+
+                            // Replace client record data with server record data
+                            modifiedFields = clientRec.copyFrom(serverRec);
+
+                            // If we plan to commit the records, collect modified field list for each record
+                            if (commitRecords) {
+                                recordModifiedFields.push(modifiedFields);
+                            }
+                        }
+                    } else {
+                        for (i = 0, len = clientRecords.length; i < len; ++i) {
+                            clientRec = clientRecords[i];
+                            serverRec = serverRecords[i];
+                            if (clientRec && serverRec) {
+                                modifiedFields = me.updateRecord(clientRec, serverRec);
+
+                                // If we plan to commit the records, collect modified field list for each record
+                                if (commitRecords) {
+                                    recordModifiedFields.push(modifiedFields);
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // operation only has one record, so just match the first client record up with the first server record
+                    modifiedFields = me.updateRecord(clientRecords[0], serverRecords[0]);   
+
+                    // If we plan to commit the records, collect modified field list for each record
+                    if (commitRecords) {
+                        recordModifiedFields[0] = modifiedFields;
+                    }
+                }
+
+                if (commitRecords) {
+                    for (index = clientRecords.length; index--; ) {
+
+                        // Pass array of field names which were modified as a result of the server's reply
+                        // In a grid, this avoids full row refreshes when the record returns unmodified.
+                        // See Ext.view.Table#shouldUpdateCell
+                        clientRecords[index].commit(false, recordModifiedFields[index]);
+                    }
+                }
+            }
+        }
+    },
+    
+    updateRecord: function(clientRec, serverRec) {
+        // if the client record is not a phantom, make sure the ids match before replacing the client data with server data.
+        if (serverRec && (clientRec.phantom || clientRec.getId() === serverRec.getId())) {
+            return clientRec.copyFrom(serverRec);
+        }
+
+        // ID could not be matched up, no fields were modified.
+        return [];
+    },
+
+    // Private.
+    // Record matching function used by commitRecords
+    // IMPORTANT: This is called in the scope of the clientRec being matched
+    matchClientRec: function(record) {
+        var clientRec = this,
+            clientRecordId = clientRec.getId();
+
+        if(clientRecordId && record.getId() === clientRecordId) {
+            return true;
+        }
+        // if the server record cannot be found by id, find by internalId.
+        // this allows client records that did not previously exist on the server
+        // to be updated with the correct server id and data.
+        return record.internalId === clientRec.internalId;
+    },
+
+    /**
+     * Marks the Operation as started.
+     */
+    setStarted: function() {
+        this.started = true;
+        this.running = true;
+    },
+
+    /**
+     * Marks the Operation as completed.
+     */
+    setCompleted: function() {
+        this.complete = true;
+        this.running  = false;
+    },
+
+    /**
+     * Marks the Operation as successful.
+     */
+    setSuccessful: function() {
+        this.success = true;
+    },
+
+    /**
+     * Marks the Operation as having experienced an exception. Can be supplied with an option error message/object.
+     * @param {String/Object} error (optional) error string/object
+     */
+    setException: function(error) {
+        this.exception = true;
+        this.success = false;
+        this.running = false;
+        this.error = error;
+    },
+
+    /**
+     * Returns true if this Operation encountered an exception (see also {@link #getError})
+     * @return {Boolean} True if there was an exception
+     */
+    hasException: function() {
+        return this.exception === true;
+    },
+
+    /**
+     * Returns the error string or object that was set using {@link #setException}
+     * @return {String/Object} The error object
+     */
+    getError: function() {
+        return this.error;
+    },
+
+    /**
+     * Returns the {@link Ext.data.Model record}s associated with this operation.  For read operations the records as set by the {@link Ext.data.proxy.Proxy Proxy} will be returned (returns `null` if the proxy has not yet set the records).
+     * For create, update, and destroy operations the operation's initially configured records will be returned, although the proxy may modify these records' data at some point after the operation is initialized.
+     * @return {Ext.data.Model[]}
+     */
+    getRecords: function() {
+        var resultSet = this.getResultSet();
+        return this.records || (resultSet ? resultSet.records : null);
+    },
+
+    /**
+     * Returns the ResultSet object (if set by the Proxy). This object will contain the {@link Ext.data.Model model}
+     * instances as well as meta data such as number of instances fetched, number available etc
+     * @return {Ext.data.ResultSet} The ResultSet object
+     */
+    getResultSet: function() {
+        return this.resultSet;
+    },
+
+    /**
+     * Returns true if the Operation has been started. Note that the Operation may have started AND completed, see
+     * {@link #isRunning} to test if the Operation is currently running.
+     * @return {Boolean} True if the Operation has started
+     */
+    isStarted: function() {
+        return this.started === true;
+    },
+
+    /**
+     * Returns true if the Operation has been started but has not yet completed.
+     * @return {Boolean} True if the Operation is currently running
+     */
+    isRunning: function() {
+        return this.running === true;
+    },
+
+    /**
+     * Returns true if the Operation has been completed
+     * @return {Boolean} True if the Operation is complete
+     */
+    isComplete: function() {
+        return this.complete === true;
+    },
+
+    /**
+     * Returns true if the Operation has completed and was successful
+     * @return {Boolean} True if successful
+     */
+    wasSuccessful: function() {
+        return this.isComplete() && this.success === true;
+    },
+
+    /**
+     * @private
+     * Associates this Operation with a Batch
+     * @param {Ext.data.Batch} batch The batch
+     */
+    setBatch: function(batch) {
+        this.batch = batch;
+    },
+
+    /**
+     * Checks whether this operation should cause writing to occur.
+     * @return {Boolean} Whether the operation should cause a write to occur.
+     */
+    allowWrite: function() {
+        return this.action != 'read';
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * AbstractStore is a superclass of {@link Ext.data.Store} and {@link Ext.data.TreeStore}. It's never used directly,
+ * but offers a set of methods used by both of those subclasses.
+ *
+ * We've left it here in the docs for reference purposes, but unless you need to make a whole new type of Store, what
+ * you're probably looking for is {@link Ext.data.Store}. If you're still interested, here's a brief description of what
+ * AbstractStore is and is not.
+ *
+ * AbstractStore provides the basic configuration for anything that can be considered a Store. It expects to be
+ * given a {@link Ext.data.Model Model} that represents the type of data in the Store. It also expects to be given a
+ * {@link Ext.data.proxy.Proxy Proxy} that handles the loading of data into the Store.
+ *
+ * AbstractStore provides a few helpful methods such as {@link #method-load} and {@link #sync}, which load and save data
+ * respectively, passing the requests through the configured {@link #proxy}. Both built-in Store subclasses add extra
+ * behavior to each of these functions. Note also that each AbstractStore subclass has its own way of storing data -
+ * in {@link Ext.data.Store} the data is saved as a flat {@link Ext.util.MixedCollection MixedCollection}, whereas in
+ * {@link Ext.data.TreeStore TreeStore} we use a {@link Ext.data.Tree} to maintain the data's hierarchy.
+ *
+ * The store provides filtering and sorting support. This sorting/filtering can happen on the client side
+ * or can be completed on the server. This is controlled by the {@link Ext.data.Store#remoteSort remoteSort} and
+ * {@link Ext.data.Store#remoteFilter remoteFilter} config options. For more information see the {@link #sort} and
+ * {@link Ext.data.Store#filter filter} methods.
+ */
+Ext.define('Ext.data.AbstractStore', {
+               
+                                   
+                               
+                             
+                         
+      
+
+    mixins: {
+        observable:  Ext.util.Observable ,
+        sortable:  Ext.util.Sortable 
+    },
+
+    statics: {
+        /**
+         * Creates a store from config object.
+         * 
+         * @param {Object/Ext.data.AbstractStore} store A config for
+         * the store to be created.  It may contain a `type` field
+         * which defines the particular type of store to create.
+         * 
+         * Alteratively passing an actual store to this method will
+         * just return it, no changes made.
+         * 
+         * @return {Ext.data.AbstractStore} The created store.
+         * @static
+         */
+        create: function(store) {
+            if (!store.isStore) {
+                if (!store.type) {
+                    store.type = 'store';
+                }
+                store = Ext.createByAlias('store.' + store.type, store);
+            }
+            return store;
+        }
+    },
+
+    onClassExtended: function(cls, data, hooks) {
+        var model = data.model,
+            onBeforeClassCreated;
+
+        if (typeof model == 'string') {
+            onBeforeClassCreated = hooks.onBeforeCreated;
+
+            hooks.onBeforeCreated = function() {
+                var me = this,
+                    args = arguments;
+
+                Ext.require(model, function() {
+                    onBeforeClassCreated.apply(me, args);
+                });
+            };
+        }
+    },
+
+    /**
+     * @cfg {Boolean} remoteSort
+     * True to defer any sorting operation to the server. If false, sorting is done locally on the client.
+     */
+    remoteSort  : false,
+
+    /**
+     * @cfg {Boolean} remoteFilter
+     * True to defer any filtering operation to the server. If false, filtering is done locally on the client.
+     */
+    remoteFilter: false,
+
+    /**
+     * @cfg {String/Ext.data.proxy.Proxy/Object} proxy
+     * The Proxy to use for this Store. This can be either a string, a config object or a Proxy instance -
+     * see {@link #setProxy} for details.
+     * @since 1.1.0
+     */
+
+    /**
+     * @cfg {Boolean/Object} autoLoad
+     * If data is not specified, and if autoLoad is true or an Object, this store's load method is automatically called
+     * after creation. If the value of autoLoad is an Object, this Object will be passed to the store's load method.
+     * @since 2.3.0
+     */
+    autoLoad: undefined,
+
+    /**
+     * @cfg {Boolean} autoSync
+     * True to automatically sync the Store with its Proxy after every edit to one of its Records. Defaults to false.
+     */
+    autoSync: false,
+
+    /**
+     * @cfg {String} batchUpdateMode
+     * Sets the updating behavior based on batch synchronization. 'operation' (the default) will update the Store's
+     * internal representation of the data after each operation of the batch has completed, 'complete' will wait until
+     * the entire batch has been completed before updating the Store's data. 'complete' is a good choice for local
+     * storage proxies, 'operation' is better for remote proxies, where there is a comparatively high latency.
+     */
+    batchUpdateMode: 'operation',
+
+    /**
+     * @cfg {Boolean} filterOnLoad
+     * If true, any filters attached to this Store will be run after loading data, before the datachanged event is fired.
+     * Defaults to true, ignored if {@link Ext.data.Store#remoteFilter remoteFilter} is true
+     */
+    filterOnLoad: true,
+
+    /**
+     * @cfg {Boolean} sortOnLoad
+     * If true, any sorters attached to this Store will be run after loading data, before the datachanged event is fired.
+     * Defaults to true, igored if {@link Ext.data.Store#remoteSort remoteSort} is true
+     */
+    sortOnLoad: true,
+
+    /**
+     * @property {Boolean} implicitModel
+     * True if a model was created implicitly for this Store. This happens if a fields array is passed to the Store's
+     * constructor instead of a model constructor or name.
+     * @private
+     */
+    implicitModel: false,
+
+    /**
+     * @property {String} defaultProxyType
+     * The string type of the Proxy to create if none is specified. This defaults to creating a
+     * {@link Ext.data.proxy.Memory memory proxy}.
+     */
+    defaultProxyType: 'memory',
+
+    /**
+     * @property {Boolean} isDestroyed
+     * True if the Store has already been destroyed. If this is true, the reference to Store should be deleted
+     * as it will not function correctly any more.
+     * @since 3.4.0
+     */
+    isDestroyed: false,
+
+    /**
+     * @property {Boolean} isStore
+     * `true` in this class to identify an object as an instantiated Store, or subclass thereof.
+     */
+    isStore: true,
+
+    /**
+     * @cfg {String} storeId
+     * Unique identifier for this store. If present, this Store will be registered with the {@link Ext.data.StoreManager},
+     * making it easy to reuse elsewhere.
+     *
+     * Note that when store is instatiated by Controller, the storeId will be overridden by the name of the store.
+     */
+
+    /**
+     * @cfg {Object[]} fields
+     * This may be used in place of specifying a {@link #model} configuration. The fields should be a
+     * set of {@link Ext.data.Field} configuration objects. The store will automatically create a {@link Ext.data.Model}
+     * with these fields. In general this configuration option should only be used for simple stores like
+     * a two-field store of ComboBox. For anything more complicated, such as specifying a particular id property or
+     * associations, a {@link Ext.data.Model} should be defined and specified for the {@link #model}
+     * config.
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String} model
+     * Name of the {@link Ext.data.Model Model} associated with this store.
+     * The string is used as an argument for {@link Ext.ModelManager#getModel}.
+     */
+
+    /**
+     * @cfg {Object[]/Function[]} filters
+     * Array of {@link Ext.util.Filter Filters} for this store. Can also be passed array of
+     * functions which will be used as the {@link Ext.util.Filter#filterFn filterFn} config
+     * for filters:
+     * 
+     *     filters: [
+     *         function(item) {
+     *             return item.weight > 0;
+     *         }
+     *     ]
+     *
+     * To filter after the grid is loaded use the {@link Ext.data.Store#filterBy filterBy} function.
+     */
+
+    /**
+     * @cfg {Boolean} [statefulFilters=false]
+     * Configure as `true` to have the filters saved when a client {@link Ext.grid.Panel grid} saves its state.
+     */
+
+    sortRoot: 'data',
+
+    //documented above
+    constructor: function(config) {
+        var me = this,
+            filters;
+
+        /**
+         * @event add
+         * Fired when a Model instance has been added to this Store.
+         * @param {Ext.data.Store} store The store
+         * @param {Ext.data.Model[]} records The Model instances that were added
+         * @param {Number} index The index at which the instances were inserted
+         * @since 1.1.0
+         */
+
+        /**
+         * @event remove
+         * Fired when a Model instance has been removed from this Store.
+         *
+         * **If many records may be removed in one go, then it is more efficient to listen for the {@link #event-bulkremove} event
+         * and perform any processing for a bulk remove than to listen for this {@link #event-remove} event.**
+         * @param {Ext.data.Store} store The Store object
+         * @param {Ext.data.Model} record The record that was removed
+         * @param {Number} index The index of the record that was removed
+         * @param {Boolean} isMove `true` if the child node is being removed so it can be moved to another position in this Store.
+         * @since 1.1.0
+         */
+
+        /**
+         * @event bulkremove
+         * Fired at the *end* of the {@link Ext.data.Store#method-remove remove} method when all records in the passed array have been removed.
+         *
+         * If many records may be removed in one go, then it is more efficient to listen for this event
+         * and perform any processing for a bulk remove than to listen for many {@link #event-remove} events.
+         * @param {Ext.data.Store} store The Store object
+         * @param {Ext.data.Model[]} records The array of records that were removed (In the order they appear in the Store)
+         * @param {Number[]} indexes The indexes of the records that were removed
+         * @param {Boolean} isMove `true` if the child nodes are being removed so they can be moved to another position in this Store.
+         */
+
+        /**
+         * @event update
+         * Fires when a Model instance has been updated.
+         * @param {Ext.data.Store} this
+         * @param {Ext.data.Model} record The Model instance that was updated
+         * @param {String} operation The update operation being performed. Value may be one of:
+         *
+         *     Ext.data.Model.EDIT
+         *     Ext.data.Model.REJECT
+         *     Ext.data.Model.COMMIT
+         * @param {String[]} modifiedFieldNames Array of field names changed during edit.
+         * @since 1.1.0
+         */
+
+        /**
+         * @event datachanged
+         * Fires whenever the records in the Store have changed in some way - this could include adding or removing
+         * records, or updating the data in existing records
+         * @param {Ext.data.Store} this The data store
+         * @since 1.1.0
+         */
+        
+        /**
+         * @event refresh
+         * Fires when the data cache has changed in a bulk manner (e.g., it has been sorted, filtered, etc.) and a
+         * widget that is using this Store as a Record cache should refresh its view.
+         * @param {Ext.data.Store} this The data store
+         */
+
+        /**
+         * @event beforeload
+         * Fires before a request is made for a new data object. If the beforeload handler returns false the load
+         * action will be canceled.
+         * @param {Ext.data.Store} store This Store
+         * @param {Ext.data.Operation} operation The Ext.data.Operation object that will be passed to the Proxy to
+         * load the Store
+         * @since 1.1.0
+         */
+
+        /**
+         * @event load
+         * Fires whenever the store reads data from a remote data source.
+         * @param {Ext.data.Store} this
+         * @param {Ext.data.Model[]} records An array of records
+         * @param {Boolean} successful True if the operation was successful.
+         * @since 1.1.0
+         */
+
+        /**
+         * @event write
+         * Fires whenever a successful write has been made via the configured {@link #proxy Proxy}
+         * @param {Ext.data.Store} store This Store
+         * @param {Ext.data.Operation} operation The {@link Ext.data.Operation Operation} object that was used in
+         * the write
+         * @since 3.4.0
+         */
+
+        /**
+         * @event beforesync
+         * Fired before a call to {@link #sync} is executed. Return false from any listener to cancel the sync
+         * @param {Object} options Hash of all records to be synchronized, broken down into create, update and destroy
+         */
+        /**
+         * @event clear
+         * Fired after the {@link #removeAll} method is called.
+         * @param {Ext.data.Store} this
+         * @since 1.1.0
+         */
+        /**
+         * @event metachange
+         * Fires when this store's underlying reader (available via the proxy) provides new metadata.
+         * Metadata usually consists of new field definitions, but can include any configuration data
+         * required by an application, and can be processed as needed in the event handler.
+         * This event is currently only fired for JsonReaders.
+         * @param {Ext.data.Store} this
+         * @param {Object} meta The JSON metadata
+         * @since 1.1.0
+         */
+
+        Ext.apply(me, config);
+        // don't use *config* anymore from here on... use *me* instead...
+
+        /**
+         * Temporary cache in which removed model instances are kept until successfully synchronised with a Proxy,
+         * at which point this is cleared.
+         * @protected
+         * @property {Ext.data.Model[]} removed
+         */
+        me.removed = [];
+
+        me.mixins.observable.constructor.apply(me, arguments);
+
+        var configModel = me.model;
+
+        me.model = Ext.ModelManager.getModel(me.model);
+
+        /**
+         * @property {Object} modelDefaults
+         * @private
+         * A set of default values to be applied to every model instance added via {@link Ext.data.Store#insert insert} or created
+         * via {@link Ext.data.Store#createModel createModel}. This is used internally by associations to set foreign keys and
+         * other fields. See the Association classes source code for examples. This should not need to be used by application developers.
+         */
+        Ext.applyIf(me, {
+            modelDefaults: null
+        });
+
+        //Supports the 3.x style of simply passing an array of fields to the store, implicitly creating a model
+        if (!me.model && me.fields) {
+            me.model = Ext.define('Ext.data.Store.ImplicitModel-' + (me.storeId || Ext.id()), {
+                extend: 'Ext.data.Model',
+                fields: me.fields,
+                proxy: me.proxy || me.defaultProxyType
+            });
+
+            delete me.fields;
+
+            me.implicitModel = true;
+        }
+
+        if (!me.model && me.useModelWarning !== false) {
+            // There are a number of ways things could have gone wrong, try to give as much information as possible
+            var logMsg = [
+                Ext.getClassName(me) || 'Store',
+                ' created with no model.'
+            ];
+
+            if (typeof configModel === 'string') {
+                logMsg.push(" The name '", configModel, "'", ' does not correspond to a valid model.');
+            }
+
+            Ext.log.warn(logMsg.join(''));
+        }
+
+        //ensures that the Proxy is instantiated correctly
+        me.setProxy(me.proxy || me.model.getProxy());
+
+        if (!me.disableMetaChangeEvent) {
+            me.proxy.on('metachange', me.onMetaChange, me);
+        }
+
+        if (me.id && !me.storeId) {
+            me.storeId = me.id;
+            delete me.id;
+        }
+
+        if (me.storeId) {
+            Ext.data.StoreManager.register(me);
+        }
+
+        me.mixins.sortable.initSortable.call(me);
+
+        /**
+         * @property {Ext.util.MixedCollection} filters
+         * The collection of {@link Ext.util.Filter Filters} currently applied to this Store
+         */
+        filters = me.decodeFilters(me.filters);
+        me.filters = new Ext.util.MixedCollection();
+        me.filters.addAll(filters);
+    },
+
+    /**
+     * Sets the Store's Proxy by string, config object or Proxy instance
+     * @param {String/Object/Ext.data.proxy.Proxy} proxy The new Proxy, which can be either a type string, a configuration object
+     * or an Ext.data.proxy.Proxy instance
+     * @return {Ext.data.proxy.Proxy} The attached Proxy object
+     */
+    setProxy: function(proxy) {
+        var me = this;
+
+        if (proxy instanceof Ext.data.proxy.Proxy) {
+            proxy.setModel(me.model);
+        } else {
+            if (Ext.isString(proxy)) {
+                proxy = {
+                    type: proxy
+                };
+            }
+            Ext.applyIf(proxy, {
+                model: me.model
+            });
+
+            proxy = Ext.createByAlias('proxy.' + proxy.type, proxy);
+        }
+
+        me.proxy = proxy;
+
+        return me.proxy;
+    },
+
+    /**
+     * Returns the proxy currently attached to this proxy instance
+     * @return {Ext.data.proxy.Proxy} The Proxy instance
+     */
+    getProxy: function() {
+        return this.proxy;
+    },
+
+    // private
+    onMetaChange: function(proxy, meta) {
+        this.fireEvent('metachange', this, meta);
+    },
+
+    //saves any phantom records
+    create: function(data, options) {
+        var me = this,
+            instance = Ext.ModelManager.create(Ext.applyIf(data, me.modelDefaults), me.model.modelName),
+            operation;
+
+        options = options || {};
+
+        Ext.applyIf(options, {
+            action : 'create',
+            records: [instance]
+        });
+
+        operation = new Ext.data.Operation(options);
+
+        me.proxy.create(operation, me.onProxyWrite, me);
+
+        return instance;
+    },
+
+    read: function() {
+        return this.load.apply(this, arguments);
+    },
+
+    update: function(options) {
+        var me = this,
+            operation;
+        options = options || {};
+
+        Ext.applyIf(options, {
+            action : 'update',
+            records: me.getUpdatedRecords()
+        });
+
+        operation = new Ext.data.Operation(options);
+
+        return me.proxy.update(operation, me.onProxyWrite, me);
+    },
+
+    /**
+     * @private
+     * Callback for any write Operation over the Proxy. Updates the Store's MixedCollection to reflect
+     * the updates provided by the Proxy
+     */
+    onProxyWrite: function(operation) {
+        var me = this,
+            success = operation.wasSuccessful(),
+            records = operation.getRecords();
+
+        switch (operation.action) {
+            case 'create':
+                me.onCreateRecords(records, operation, success);
+                break;
+            case 'update':
+                me.onUpdateRecords(records, operation, success);
+                break;
+            case 'destroy':
+                me.onDestroyRecords(records, operation, success);
+                break;
+        }
+
+        if (success) {
+            me.fireEvent('write', me, operation);
+            me.fireEvent('datachanged', me);
+            me.fireEvent('refresh', me);
+        }
+        //this is a callback that would have been passed to the 'create', 'update' or 'destroy' function and is optional
+        Ext.callback(operation.callback, operation.scope || me, [records, operation, success]);
+    },
+    
+    // may be implemented by store subclasses
+    onCreateRecords: Ext.emptyFn,
+    
+    // may be implemented by store subclasses
+    onUpdateRecords: Ext.emptyFn,
+    
+    /**
+     * Removes any records when a write is returned from the server.
+     * @private
+     * @param {Ext.data.Model[]} records The array of removed records
+     * @param {Ext.data.Operation} operation The operation that just completed
+     * @param {Boolean} success True if the operation was successful
+     */
+    onDestroyRecords: function(records, operation, success) {
+        if (success) {
+            this.removed = [];
+        }
+    },
+
+    // tells the attached proxy to destroy the given records
+    // @since 3.4.0
+    destroy: function(options) {
+        var me = this,
+            operation;
+
+        options = options || {};
+
+        Ext.applyIf(options, {
+            action : 'destroy',
+            records: me.getRemovedRecords()
+        });
+
+        operation = new Ext.data.Operation(options);
+
+        return me.proxy.destroy(operation, me.onProxyWrite, me);
+    },
+
+    /**
+     * @private
+     * Attached as the 'operationcomplete' event listener to a proxy's Batch object. By default just calls through
+     * to onProxyWrite.
+     */
+    onBatchOperationComplete: function(batch, operation) {
+        return this.onProxyWrite(operation);
+    },
+
+    /**
+     * @private
+     * Attached as the 'complete' event listener to a proxy's Batch object. Iterates over the batch operations
+     * and updates the Store's internal data MixedCollection.
+     */
+    onBatchComplete: function(batch, operation) {
+        var me = this,
+            operations = batch.operations,
+            length = operations.length,
+            i;
+
+        me.suspendEvents();
+
+        for (i = 0; i < length; i++) {
+            me.onProxyWrite(operations[i]);
+        }
+
+        me.resumeEvents();
+
+        me.fireEvent('datachanged', me);
+        me.fireEvent('refresh', me);
+    },
+
+    /**
+     * @private
+     */
+    onBatchException: function(batch, operation) {
+        // //decide what to do... could continue with the next operation
+        // batch.start();
+        //
+        // //or retry the last operation
+        // batch.retry();
+    },
+
+    /**
+     * @private
+     * Filter function for new records.
+     */
+    filterNew: function(item) {
+        // only want phantom records that are valid
+        return item.phantom === true && item.isValid();
+    },
+
+    /**
+     * Returns all Model instances that are either currently a phantom (e.g. have no id), or have an ID but have not
+     * yet been saved on this Store (this happens when adding a non-phantom record from another Store into this one)
+     * @return {Ext.data.Model[]} The Model instances
+     */
+    getNewRecords: function() {
+        return [];
+    },
+
+    /**
+     * Returns all Model instances that have been updated in the Store but not yet synchronized with the Proxy
+     * @return {Ext.data.Model[]} The updated Model instances
+     */
+    getUpdatedRecords: function() {
+        return [];
+    },
+
+    /**
+     * Gets all {@link Ext.data.Model records} added or updated since the last commit. Note that the order of records
+     * returned is not deterministic and does not indicate the order in which records were modified. Note also that
+     * removed records are not included (use {@link #getRemovedRecords} for that).
+     * @return {Ext.data.Model[]} The added and updated Model instances
+     */
+    getModifiedRecords : function(){
+        return [].concat(this.getNewRecords(), this.getUpdatedRecords());
+    },
+    
+    /**
+     * @private
+     * Filter function for updated records.
+     */
+    filterUpdated: function(item) {
+        // only want dirty records, not phantoms that are valid
+        return item.dirty === true && item.phantom !== true && item.isValid();
+    },
+
+    /**
+     * Returns any records that have been removed from the store but not yet destroyed on the proxy.
+     * @return {Ext.data.Model[]} The removed Model instances
+     */
+    getRemovedRecords: function() {
+        return this.removed;
+    },
+
+    filter: function(filters, value) {
+
+    },
+
+    /**
+     * @private
+     * Normalizes an array of filter objects, ensuring that they are all Ext.util.Filter instances
+     * @param {Object[]} filters The filters array
+     * @return {Ext.util.Filter[]} Array of Ext.util.Filter objects
+     */
+    decodeFilters: function(filters) {
+        if (!Ext.isArray(filters)) {
+            if (filters === undefined) {
+                filters = [];
+            } else {
+                filters = [filters];
+            }
+        }
+
+        var length = filters.length,
+            Filter = Ext.util.Filter,
+            config, i;
+
+        for (i = 0; i < length; i++) {
+            config = filters[i];
+
+            if (!(config instanceof Filter)) {
+                Ext.apply(config, {
+                    root: 'data'
+                });
+
+                //support for 3.x style filters where a function can be defined as 'fn'
+                if (config.fn) {
+                    config.filterFn = config.fn;
+                }
+
+                //support a function to be passed as a filter definition
+                if (typeof config == 'function') {
+                    config = {
+                        filterFn: config
+                    };
+                }
+
+                filters[i] = new Filter(config);
+            }
+        }
+
+        return filters;
+    },
+
+    clearFilter: function(supressEvent) {
+
+    },
+
+    isFiltered: function() {
+
+    },
+
+    filterBy: function(fn, scope) {
+
+    },
+
+    /**
+     * Synchronizes the store with its {@link #proxy}. This asks the proxy to batch together any new, updated
+     * and deleted records in the store, updating the store's internal representation of the records
+     * as each operation completes.
+     * 
+     * @param {Object} [options] Object containing one or more properties supported by the sync method (these get 
+     * passed along to the underlying proxy's {@link Ext.data.Proxy#batch batch} method):
+     * 
+     * @param {Ext.data.Batch/Object} [options.batch] A {@link Ext.data.Batch} object (or batch config to apply 
+     * to the created batch). If unspecified a default batch will be auto-created as needed.
+     * 
+     * @param {Function} [options.callback] The function to be called upon completion of the sync.
+     * The callback is called regardless of success or failure and is passed the following parameters:
+     * @param {Ext.data.Batch} options.callback.batch The {@link Ext.data.Batch batch} that was processed,
+     * containing all operations in their current state after processing
+     * @param {Object} options.callback.options The options argument that was originally passed into sync
+     * 
+     * @param {Function} [options.success] The function to be called upon successful completion of the sync. The 
+     * success function is called only if no exceptions were reported in any operations. If one or more exceptions
+     * occurred then the failure function will be called instead. The success function is called 
+     * with the following parameters:
+     * @param {Ext.data.Batch} options.success.batch The {@link Ext.data.Batch batch} that was processed,
+     * containing all operations in their current state after processing
+     * @param {Object} options.success.options The options argument that was originally passed into sync
+     * 
+     * @param {Function} [options.failure] The function to be called upon unsuccessful completion of the sync. The 
+     * failure function is called when one or more operations returns an exception during processing (even if some
+     * operations were also successful). In this case you can check the batch's {@link Ext.data.Batch#exceptions 
+     * exceptions} array to see exactly which operations had exceptions. The failure function is called with the 
+     * following parameters:
+     * @param {Ext.data.Batch} options.failure.batch The {@link Ext.data.Batch} that was processed, containing all
+     * operations in their current state after processing
+     * @param {Object} options.failure.options The options argument that was originally passed into sync
+     * 
+     * @param {Object} [options.scope] The scope in which to execute any callbacks (i.e. the `this` object inside
+     * the callback, success and/or failure functions). Defaults to the store's proxy.
+     * 
+     * @return {Ext.data.Store} this
+     */
+    sync: function(options) {
+        var me = this,
+            operations = {},
+            toCreate = me.getNewRecords(),
+            toUpdate = me.getUpdatedRecords(),
+            toDestroy = me.getRemovedRecords(),
+            needsSync = false;
+
+        if (toCreate.length > 0) {
+            operations.create = toCreate;
+            needsSync = true;
+        }
+
+        if (toUpdate.length > 0) {
+            operations.update = toUpdate;
+            needsSync = true;
+        }
+
+        if (toDestroy.length > 0) {
+            operations.destroy = toDestroy;
+            needsSync = true;
+        }
+
+        if (needsSync && me.fireEvent('beforesync', operations) !== false) {
+            options = options || {};
+
+            me.proxy.batch(Ext.apply(options, {
+                operations: operations,
+                listeners: me.getBatchListeners()
+            }));
+        }
+        
+        return me;
+    },
+    
+    /**
+     * @private
+     * Returns an object which is passed in as the listeners argument to proxy.batch inside this.sync.
+     * This is broken out into a separate function to allow for customisation of the listeners
+     * @return {Object} The listeners object
+     */
+    getBatchListeners: function() {
+        var me = this,
+            listeners = {
+                scope: me,
+                exception: me.onBatchException
+            };
+
+        if (me.batchUpdateMode == 'operation') {
+            listeners.operationcomplete = me.onBatchOperationComplete;
+        } else {
+            listeners.complete = me.onBatchComplete;
+        }
+
+        return listeners;
+    },
+
+    /**
+     * Saves all pending changes via the configured {@link #proxy}. Use {@link #sync} instead.
+     * @deprecated 4.0.0 Will be removed in the next major version
+     */
+    save: function() {
+        return this.sync.apply(this, arguments);
+    },
+
+    /**
+     * Loads the Store using its configured {@link #proxy}.
+     * @param {Object} options (optional) config object. This is passed into the {@link Ext.data.Operation Operation}
+     * object that is created and then sent to the proxy's {@link Ext.data.proxy.Proxy#read} function
+     * 
+     * @return {Ext.data.Store} this
+     * @since 1.1.0
+     */
+    load: function(options) {
+        var me = this,
+            operation;
+
+        options = Ext.apply({
+            action: 'read',
+            filters: me.filters.items,
+            sorters: me.getSorters()
+        }, options);
+        me.lastOptions = options;
+
+        operation = new Ext.data.Operation(options);
+
+        if (me.fireEvent('beforeload', me, operation) !== false) {
+            me.loading = true;
+            me.proxy.read(operation, me.onProxyLoad, me);
+        }
+
+        return me;
+    },
+
+    /**
+     * Reloads the store using the last options passed to the {@link #method-load} method.
+     * @param {Object} options A config object which contains options which may override the options passed to the previous load call.
+     */
+    reload: function(options) {
+        return this.load(Ext.apply(this.lastOptions, options));
+    },
+
+    /**
+     * @private
+     * A model instance should call this method on the Store it has been {@link Ext.data.Model#join joined} to.
+     * @param {Ext.data.Model} record The model instance that was edited
+     * @param {String[]} modifiedFieldNames Array of field names changed during edit.
+     * @since 3.4.0
+     */
+    afterEdit : function(record, modifiedFieldNames) {
+        var me = this,
+            i, shouldSync;
+
+        if (me.autoSync && !me.autoSyncSuspended) {
+            for (i = modifiedFieldNames.length; i--;) {
+                // only sync if persistent fields were modified
+                if (record.fields.get(modifiedFieldNames[i]).persist) {
+                    shouldSync = true;
+                    break;
+                }
+            }
+            if (shouldSync) {
+                me.sync();
+            }
+        }
+        me.onUpdate(record, Ext.data.Model.EDIT, modifiedFieldNames);
+        me.fireEvent('update', me, record, Ext.data.Model.EDIT, modifiedFieldNames);
+    },
+
+    /**
+     * @private
+     * A model instance should call this method on the Store it has been {@link Ext.data.Model#join joined} to..
+     * @param {Ext.data.Model} record The model instance that was edited
+     * @since 3.4.0
+     */
+    afterReject : function(record) {
+        // Must pass the 5th param (modifiedFieldNames) as null, otherwise the
+        // event firing machinery appends the listeners "options" object to the arg list
+        // which may get used as the modified fields array by a handler.
+        // This array is used for selective grid cell updating by Grid View.
+        // Null will be treated as though all cells need updating.
+        this.onUpdate(record, Ext.data.Model.REJECT, null);
+        this.fireEvent('update', this, record, Ext.data.Model.REJECT, null);
+    },
+
+    /**
+     * @private
+     * A model instance should call this method on the Store it has been {@link Ext.data.Model#join joined} to.
+     * @param {Ext.data.Model} record The model instance that was edited
+     * @since 3.4.0
+     */
+    afterCommit : function(record, modifiedFieldNames) {
+        if (!modifiedFieldNames) {
+            modifiedFieldNames = null;
+        }
+        this.onUpdate(record, Ext.data.Model.COMMIT, modifiedFieldNames);
+        this.fireEvent('update', this, record, Ext.data.Model.COMMIT, modifiedFieldNames);
+    },
+
+    onUpdate: Ext.emptyFn,
+
+    onIdChanged: function(model, oldId, newId, oldInternalId){
+        this.fireEvent('idchanged', this, model, oldId, newId, oldInternalId);
+    },
+
+    // private
+    destroyStore: function() {
+        var implicitModelName,
+            me = this;
+
+        if (!me.isDestroyed) {
+            me.clearListeners();
+            if (me.storeId) {
+                Ext.data.StoreManager.unregister(me);
+            }
+            me.clearData();
+            me.data = me.tree = me.sorters = me.filters = me.groupers = null;
+            if (me.reader) {
+                me.reader.destroyReader();
+            }
+            me.proxy = me.reader = me.writer = null;
+            me.isDestroyed = true;
+
+            if (me.implicitModel) {
+                implicitModelName = Ext.getClassName(me.model);
+                Ext.undefine(implicitModelName);
+                Ext.ModelManager.unregisterType(implicitModelName);
+            } else {
+                me.model = null;
+            }
+        }
+    },
+    
+    /**
+     * @private
+     * Returns the grouping, sorting and filtered state of this Store.
+     */
+    getState: function() {
+        var me = this,
+            hasState,
+            result,
+            hasGroupers = !!me.groupers,
+            groupers = [],
+            sorters = [],
+            filters = [];
+
+        if (hasGroupers) {
+            me.groupers.each(function(g) {
+                groupers[groupers.length] = g.serialize();
+                hasState = true;
+            });
+        }
+
+        if (me.sorters) {
+            // Create sorters config array.
+            me.sorters.each(function(s) {
+                // Sorters collection gets groupers prepended to it, so do not duplicate
+                if (hasGroupers && !me.groupers.contains(s)) {
+                    sorters[sorters.length] = s.serialize();
+                    hasState = true;
+                }
+            });
+        }
+
+        // Because we do not provide a filter changing mechanism, only statify the filters if they opt in.
+        // Otherwise filters would get "stuck".
+        if (me.filters && me.statefulFilters) {
+            me.filters.each(function(f) {
+                filters[filters.length] = f.serialize();
+                hasState = true;
+            });
+        }
+
+        // If there is any state to save, return it as an object
+        if (hasState) {
+            result = {};
+            if (groupers.length) {
+                result.groupers = groupers;
+            }
+            if (sorters.length) {
+                result.sorters = sorters;
+            }
+            if (filters.length) {
+                result.filters = filters;
+            }
+            return result;
+        }
+    },
+
+    /**
+     * @private
+     * Restores state to the passed state
+     */
+    applyState: function(state) {
+        var me = this,
+            hasSorters = !!me.sorters,
+            hasGroupers = !!me.groupers,
+            hasFilters = !!me.filters,
+            locallySorted;
+
+        if (hasGroupers && state.groupers) {
+            me.groupers.clear();
+            me.groupers.addAll(me.decodeGroupers(state.groupers));
+        }
+
+        if (hasSorters && state.sorters) {
+            me.sorters.clear();
+            me.sorters.addAll(me.decodeSorters(state.sorters));
+        }
+
+        if (hasFilters && state.filters) {
+            me.filters.clear();
+            me.filters.addAll(me.decodeFilters(state.filters));
+        }
+
+        if (hasSorters && hasGroupers) {
+            // Sorters collection gets groupers prepended to it
+            me.sorters.insert(0, me.groupers.getRange());
+        }
+
+        // Data manipulated by the server - reload 
+        if (me.autoLoad && (me.remoteSort || me.remoteGroup || me.remoteFilter)) {
+            if (me.autoLoad === true) {
+                me.reload();
+            } else {
+                me.reload(me.autoLoad);
+            }
+        }
+
+        // If we have local filters, filter the data
+        if (hasFilters && me.filters.length && !me.remoteFilter) {
+            me.filter();
+            locallySorted = me.sortOnFilter;
+        }
+
+        // If we have local sorters, and the data is not already sorted by a sortOnFilter operation, then sort.
+        if (hasSorters && me.sorters.length && !me.remoteSort && !locallySorted) {
+            me.sort();
+        }
+    },
+
+    // private
+    doSort: function(sorterFn) {
+        var me = this;
+        if (me.remoteSort) {
+            //the load function will pick up the new sorters and request the sorted data from the proxy
+            me.load();
+        } else {
+            me.data.sortBy(sorterFn);
+            me.fireEvent('datachanged', me);
+            me.fireEvent('refresh', me);
+        }
+        me.fireEvent('sort', me, me.sorters.getRange());
+    },
+
+    // to be implemented by subclasses
+    clearData: Ext.emptyFn,
+    
+    // to be implemented by subclasses
+    getCount: Ext.emptyFn,
+
+    // to be implemented by subclasses
+    getById: Ext.emptyFn,
+
+    /**
+     * Removes all records from the store. This method does a "fast remove",
+     * individual remove events are not called. The {@link #clear} event is
+     * fired upon completion.
+     * @method
+     * @since 1.1.0
+     */
+    removeAll: Ext.emptyFn,
+    // individual store subclasses should implement a "fast" remove
+    // and fire a clear event afterwards
+
+    /**
+     * Returns true if the Store is currently performing a load operation
+     * @return {Boolean} True if the Store is currently loading
+     */
+    isLoading: function() {
+        return !!this.loading;
+    },
+
+    /**
+     * Suspends automatically syncing the Store with its Proxy.  Only applicable if {@link #autoSync} is `true`
+     */
+    suspendAutoSync: function() {
+        this.autoSyncSuspended = true;
+    },
+
+    /**
+     * Resumes automatically syncing the Store with its Proxy.  Only applicable if {@link #autoSync} is `true`
+     */
+    resumeAutoSync: function() {
+        this.autoSyncSuspended = false;
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class implements the data store event domain. All classes extending from 
+ * {@link Ext.data.AbstractStore} are included in this domain. The selectors are simply
+ * store id's or the wildcard "*" to match any store.
+ *
+ * @protected
+ */
+
+Ext.define('Ext.app.domain.Store', {
+    extend:  Ext.app.EventDomain ,
+    singleton: true,
+    
+               
+                                
+      
+    
+    type: 'store',
+    idProperty: 'storeId',
+    
+    constructor: function() {
+        var me = this;
+        
+        me.callParent();
+        me.monitor(Ext.data.AbstractStore);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Controllers are the glue that binds an application together. All they really do is listen for events (usually from
+ * views) and take some action. Here's how we might create a Controller to manage Users:
+ *
+ *      Ext.define('MyApp.controller.Users', {
+ *          extend: 'Ext.app.Controller',
+ *
+ *          init: function() {
+ *              console.log('Initialized Users! This happens before ' +
+ *                          'the Application launch() function is called');
+ *          }
+ *      });
+ *
+ * The init function is a special method that is called when your application boots. It is called before the
+ * {@link Ext.app.Application Application}'s launch function is executed so gives a hook point to run any code before
+ * your Viewport is created.
+ *
+ * The init function is a great place to set up how your controller interacts with the view, and is usually used in
+ * conjunction with another Controller function - {@link Ext.app.Controller#control control}. The control function
+ * makes it easy to listen to events on your view classes and take some action with a handler function. Let's update
+ * our Users controller to tell us when the panel is rendered:
+ *
+ *      Ext.define('MyApp.controller.Users', {
+ *          extend: 'Ext.app.Controller',
+ *
+ *          init: function() {
+ *              this.control({
+ *                  'viewport > panel': {
+ *                      render: this.onPanelRendered
+ *                  }
+ *              });
+ *          },
+ *
+ *          onPanelRendered: function() {
+ *              console.log('The panel was rendered');
+ *          }
+ *      });
+ *
+ * We've updated the init function to use {@link Ext.app.Controller#control control method} to set up listeners on views
+ * in our application. The control method uses the ComponentQuery engine to quickly and easily get references to components
+ * on the page. If you are not familiar with ComponentQuery yet, be sure to check out the
+ * {@link Ext.ComponentQuery documentation}. In brief though, it allows us to pass a CSS-like selector that will find
+ * every matching component on the page.
+ *
+ * In our init function above we supplied 'viewport > panel', which translates to "find me every Panel that is a direct
+ * child of a Viewport". We then supplied an object that maps event names (just 'render' in this case) to handler
+ * functions. The overall effect is that whenever any component that matches our selector fires a 'render' event, our
+ * onPanelRendered function is called.
+ *
+ * ## Event domains
+ *
+ * In Ext JS 4.2, we introduced the concept of event domains. In terms of MVC, an event domain
+ * is one or more base classes that fire events to which a Controller wants to listen. Besides
+ * Component event domain that encompass {@link Ext.Component}-descended Views, Controllers now
+ * can listen to events from data Stores, Ext.Direct Providers, other Controllers, and Ext.globalEvents.
+ * This feature provides a way to communicate between parts of the whole application without the need
+ * to bind controllers together tightly, and allows to develop and test application parts in isolation.
+ *
+ * See usage examples in {@link #listen} method documentation.
+ *
+ * ## Using refs
+ *
+ * One of the most useful parts of Controllers is the ref system. These use the {@link Ext.ComponentQuery} to
+ * make it really easy to get references to Views on your page. Let's look at an example of this now:
+ *
+ *      Ext.define('MyApp.controller.Users', {
+ *          extend: 'Ext.app.Controller',
+ *          
+ *          refs: [{
+ *              ref: 'list',
+ *              selector: 'grid'
+ *          }],
+ *          
+ *          init: function() {
+ *              this.control({
+ *                  'button': {
+ *                      click: this.refreshGrid
+ *                  }
+ *              });
+ *          },
+ *          
+ *          refreshGrid: function() {
+ *              this.getList().store.load();
+ *          }
+ *      });
+ *
+ * This example assumes the existence of a {@link Ext.grid.Panel Grid} on the page, which contains a single button to
+ * refresh the Grid when clicked. In our refs array, we set up a reference to the grid. There are two parts to this -
+ * the 'selector', which is a {@link Ext.ComponentQuery ComponentQuery} selector which finds any grid on the page and
+ * assigns it to the reference 'list'.
+ *
+ * By giving the reference a name, we get a number of things for free. The first is the getList function that we use in
+ * the refreshGrid method above. This is generated automatically by the Controller based on the name of our ref, which
+ * was capitalized and prepended with get to go from 'list' to 'getList'.
+ *
+ * The way this works is that the first time getList is called by your code, the ComponentQuery selector is run and the
+ * first component that matches the selector ('grid' in this case) will be returned. All future calls to getList will
+ * use a cached reference to that grid. Usually it is advised to use a specific ComponentQuery selector that will only
+ * match a single View in your application (in the case above our selector will match any grid on the page).
+ *
+ * Bringing it all together, our init function is called when the application boots, at which time we call this.control
+ * to listen to any click on a {@link Ext.button.Button button} and call our refreshGrid function (again, this will
+ * match any button on the page so we advise a more specific selector than just 'button', but have left it this way for
+ * simplicity). When the button is clicked we use out getList function to refresh the grid.
+ *
+ * You can create any number of refs and control any number of components this way, simply adding more functions to
+ * your Controller as you go. For an example of real-world usage of Controllers see the Feed Viewer example in the
+ * examples/app/feed-viewer folder in the SDK download.
+ *
+ * ## Generated getter methods
+ *
+ * Refs aren't the only thing that generate convenient getter methods. Controllers often have to deal with Models and
+ * Stores so the framework offers a couple of easy ways to get access to those too. Let's look at another example:
+ *
+ *      Ext.define('MyApp.controller.Users', {
+ *          extend: 'Ext.app.Controller',
+ *
+ *          models: ['User'],
+ *          stores: ['AllUsers', 'AdminUsers'],
+ *
+ *          init: function() {
+ *              var User, allUsers, ed;
+ *              
+ *              User = this.getUserModel();
+ *              allUsers = this.getAllUsersStore();
+ *
+ *              ed = new User({ name: 'Ed' });
+ *              allUsers.add(ed);
+ *          }
+ *      });
+ *
+ * By specifying Models and Stores that the Controller cares about, it again dynamically loads them from the appropriate
+ * locations (app/model/User.js, app/store/AllUsers.js and app/store/AdminUsers.js in this case) and creates getter
+ * functions for them all. The example above will create a new User model instance and add it to the AllUsers Store.
+ * Of course, you could do anything in this function but in this case we just did something simple to demonstrate the
+ * functionality.
+ *
+ * ## Further Reading
+ *
+ * For more information about writing Ext JS 4 applications, please see the
+ * [application architecture guide](#/guide/application_architecture). Also see the {@link Ext.app.Application}
+ * documentation.
+ *
+ * @docauthor Ed Spencer
+ */
+Ext.define('Ext.app.Controller', {
+               
+                           
+                           
+                                
+                               
+                                
+                                   
+                              
+      
+    
+           
+                                   
+      
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @cfg {String} id The id of this controller. You can use this id when dispatching.
+     */
+
+    statics: {
+        strings: {
+            model: {
+                getter: 'getModel',
+                upper: 'Model'
+            },
+
+            view: {
+                getter: 'getView',
+                upper: 'View'
+            },
+
+            controller: {
+                getter: 'getController',
+                upper: 'Controller'
+            },
+
+            store: {
+                getter: 'getStore',
+                upper: 'Store'
+            }
+        },
+
+        controllerRegex: /^(.*)\.controller\./,
+
+        createGetter: function(baseGetter, name) {
+            return function () {
+                return this[baseGetter](name);
+            };
+        },
+
+        getGetterName: function(name, kindUpper) {
+            var fn       = 'get',
+                parts    = name.split('.'),
+                numParts = parts.length,
+                index;
+
+            // Handle namespaced class names. E.g. feed.Add becomes getFeedAddView etc.
+            for (index = 0; index < numParts; index++) {
+                fn += Ext.String.capitalize(parts[index]);
+            }
+
+            fn += kindUpper;
+            
+            return fn;
+        },
+
+        /**
+         * This method is called like so:
+         *
+         *      Ext.app.Controller.processDependencies(proto, requiresArray, 'MyApp', 'model', [
+         *          'User',
+         *          'Item',
+         *          'Foo at Common.model',
+         *          'Bar.Baz at Common.model'
+         *      ]);
+         *
+         * Required dependencies are added to requiresArray.
+         *
+         * @private
+         */
+        processDependencies: function(cls, requires, namespace, kind, names) {
+            if (!names || !names.length) {
+                return;
+            }
+
+            var me = this,
+                strings = me.strings[kind],
+                o, absoluteName, shortName, name, j, subLn, getterName, getter;
+                
+             if (!Ext.isArray(names)) {
+                 names = [names];
+             }
+
+            for (j = 0, subLn = names.length; j < subLn; j++) {
+                name = names[j];
+                o = me.getFullName(name, kind, namespace);
+                absoluteName = o.absoluteName;
+                shortName = o.shortName;
+
+                requires.push(absoluteName);
+                getterName = me.getGetterName(shortName, strings.upper);
+                cls[getterName] = getter = me.createGetter(strings.getter, name);
+
+                // Application class will init the controller getters
+                if (kind !== 'controller') {
+                    // This marker allows the constructor to easily/cheaply identify the
+                    // generated getter methods since they all need to be called to get
+                    // things initialized. We use a property name that deliberately does
+                    // not work with dot-access to reduce any chance of collision.
+                    getter['Ext.app.getter'] = true;
+                }
+            }
+        },
+
+        getFullName: function(name, kind, namespace) {
+            var shortName = name,
+                sep, absoluteName;
+
+            if ((sep = name.indexOf('@')) > 0) {
+                // The unambiguous syntax is Model at Name.space (or "space.Model at Name")
+                // which contains both the short name ("Model" or "space.Model") and
+                // the full name (Name.space.Model).
+                //
+                shortName    = name.substring(0, sep); // "Model"
+                absoluteName = name.substring(sep + 1) + '.' + shortName; //  ex: "Name.space.Model"
+            }
+            // Deciding if a class name must be qualified:
+            //
+            // 1 - if the name doesn't contain a dot, we must qualify it
+            //
+            // 2 - the name may be a qualified name of a known class, but:
+            //
+            // 2.1 - in runtime, the loader may not know the class - specially in
+            //       production - so we must check the class manager
+            //
+            // 2.2 - in build time, the class manager may not know the class, but
+            //       the loader does, so we check the second one (the loader check
+            //       assures it's really a class, and not a namespace, so we can
+            //       have 'Books.controller.Books', and requesting a controller
+            //       called Books will not be underqualified)
+            //
+            else if (name.indexOf('.') > 0 && (Ext.ClassManager.isCreated(name) ||
+                     Ext.Loader.isAClassNameWithAKnownPrefix(name))) {
+                absoluteName = name;
+            }
+            else {
+                if (!namespace) {
+                    Ext.log.warn("Cannot find namespace for " + kind + " " + name + ", " +
+                                 "assuming it is fully qualified class name");
+                }
+
+                if (namespace) {
+                    absoluteName = namespace + '.' + kind + '.' + name;
+                    shortName    = name;
+                }
+                else {
+                    absoluteName = name;
+                }
+            }
+
+            return {
+                absoluteName: absoluteName,
+                shortName:    shortName
+            };
+        }
+    },
+    
+    /**
+     * The {@link Ext.app.Application} for this controller.
+     *
+     * @property {Ext.app.Application}
+     * @readonly
+     */
+    application: null,
+
+    /**
+     * @cfg {String/String[]} models
+     * Array of models to require from AppName.model namespace. For example:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *          models: ['User', 'Vehicle']
+     *      });
+     *
+     * This is equivalent of:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *          requires: ['MyApp.model.User', 'MyApp.model.Vehicle'],
+     *          
+     *          getUserModel: function() {
+     *              return this.getModel("User");
+     *          },
+     *          
+     *          getVehicleModel: function() {
+     *              return this.getModel("Vehicle");
+     *          }
+     *      });
+     *
+     */
+
+    /**
+     * @cfg {String/String[]} views
+     * Array of views to require from AppName.view namespace and to generate getter methods for.
+     * For example:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *          views: ['List', 'Detail']
+     *      });
+     *
+     * This is equivalent of:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *          requires: ['MyApp.view.List', 'MyApp.view.Detail'],
+     *          
+     *          getListView: function() {
+     *              return this.getView("List");
+     *          },
+     *          
+     *          getDetailView: function() {
+     *              return this.getView("Detail");
+     *          }
+     *      });
+     */
+
+    /**
+     * @cfg {String/String[]} stores
+     * Array of stores to require from AppName.store namespace and to generate getter methods for.
+     * For example:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *          stores: ['Users', 'Vehicles']
+     *      });
+     *
+     * This is equivalent to:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *         
+     *          requires: [
+     *              'MyApp.store.Users',
+     *              'MyApp.store.Vehicles'
+     *          ]
+     *         
+     *          getUsersStore: function() {
+     *              return this.getStore("Users");
+     *          },
+     *
+     *          getVehiclesStore: function() {
+     *              return this.getStore("Vehicles");
+     *          }
+     *      });
+     */
+
+    /**
+     * @cfg {Object[]} refs
+     * Array of configs to build up references to views on page. For example:
+     *
+     *      Ext.define("MyApp.controller.Foo", {
+     *          extend: "Ext.app.Controller",
+     *          
+     *          refs: [{
+     *              ref: 'list',
+     *              selector: 'grid'
+     *          }],
+     *      });
+     *
+     * This will add method `getList` to the controller which will internally use
+     * Ext.ComponentQuery to reference the grid component on page.
+     *
+     * The following fields can be used in ref definition:
+     *
+     * - `ref` - name of the reference.
+     * - `selector` - Ext.ComponentQuery selector to access the component.
+     * - `autoCreate` - True to create the component automatically if not found on page.
+     * - `forceCreate` - Forces the creation of the component every time reference is accessed
+     *   (when `get<REFNAME>` is called).
+     * - `xtype` - Used to create component by its xtype with autoCreate or forceCreate. If
+     *   you don't provide xtype, an Ext.Component instance will be created.
+     */
+
+    onClassExtended: function(cls, data, hooks) {
+        var onBeforeClassCreated = hooks.onBeforeCreated;
+
+        hooks.onBeforeCreated = function(cls, data) {
+            var Controller = Ext.app.Controller,
+                ctrlRegex  = Controller.controllerRegex,
+                requires   = [],
+                className, namespace, requires, proto, match;
+
+            proto = cls.prototype;
+            
+            /*
+             * Namespace resolution is tricky business: we should know what namespace
+             * this Controller descendant belongs to, or model/store/view dependency
+             * resolution will be either ambiguous or plainly not possible. To avoid
+             * guessing games we try to look for a forward hint ($namespace) that
+             * Application class sets when its onClassExtended gets processed; if that
+             * fails we try to deduce namespace from class name.
+             *
+             * Note that for Ext.app.Application, Controller.onClassExtended gets executed
+             * *before* Application.onClassExtended so we have to delay namespace handling
+             * until after Application.onClassExtended kicks in, hence it is done in this hook.
+             */
+            className = Ext.getClassName(cls);
+            namespace = data.$namespace                 ||
+                        Ext.app.getNamespace(className) ||
+                        ((match = ctrlRegex.exec(className)) && match[1]);
+
+            if (namespace) {
+                proto.$namespace = namespace;
+            }
+            else {
+                Ext.log.warn("Missing namespace for " + className + ", please define it "+
+                             "in namespaces property of your Application class.");
+            }
+
+            Controller.processDependencies(proto, requires, namespace, 'model',      data.models);
+            Controller.processDependencies(proto, requires, namespace, 'view',       data.views);
+            Controller.processDependencies(proto, requires, namespace, 'store',      data.stores);
+            Controller.processDependencies(proto, requires, namespace, 'controller', data.controllers);
+
+            Ext.require(requires, Ext.Function.pass(onBeforeClassCreated, arguments, this));
+        };
+    },
+
+    /**
+     * Creates new Controller.
+     *
+     * @param {Object} [config] Configuration object.
+     */
+    constructor: function (config) {
+        var me = this;
+
+        me.mixins.observable.constructor.call(me, config);
+
+        if (me.refs) {
+            me.ref(me.refs);
+        }
+
+        me.eventbus = Ext.app.EventBus;
+        
+        me.initAutoGetters();
+    },
+    
+    initAutoGetters: function() {
+        var proto = this.self.prototype,
+            prop, fn;
+
+        for (prop in proto) {
+            fn = proto[prop];
+
+            // Look for the marker placed on the getters by processDependencies so that
+            // we can know what to call cheaply:
+            if (fn && fn['Ext.app.getter']) {
+                fn.call(this);
+            }
+        }
+    },
+
+    doInit: function(app) {
+        var me = this;
+
+        if (!me._initialized) {
+            me.init(app);
+            me._initialized = true;
+        }
+    },
+    
+    finishInit: function(app) {
+        var me = this,
+            controllers = me.controllers,
+            controller, i, l;
+        
+        if (me._initialized && controllers && controllers.length) {
+            for (i = 0, l = controllers.length; i < l; i++) {
+                controller = me.getController(controllers[i]);
+                controller.finishInit(app);
+            }
+        }
+    },
+
+    /**
+     * A template method that is called when your application boots. It is called before the
+     * {@link Ext.app.Application Application}'s launch function is executed so gives a hook point
+     * to run any code before your Viewport is created.
+     *
+     * @param {Ext.app.Application} application
+     *
+     * @template
+     */
+    init: Ext.emptyFn,
+
+    /**
+     * A template method like {@link #init}, but called after the viewport is created.
+     * This is called after the {@link Ext.app.Application#launch launch} method of Application
+     * is executed.
+     *
+     * @param {Ext.app.Application} application
+     *
+     * @template
+     */
+    onLaunch: Ext.emptyFn,
+
+    ref: function(refs) {
+        var me = this,
+            i = 0,
+            length = refs.length,
+            info, ref, fn;
+
+        refs = Ext.Array.from(refs);
+
+        me.references = me.references || [];
+
+        for (; i < length; i++) {
+            info = refs[i];
+            ref  = info.ref;
+            fn   = 'get' + Ext.String.capitalize(ref);
+
+            if (!me[fn]) {
+                me[fn] = Ext.Function.pass(me.getRef, [ref, info], me);
+            }
+            me.references.push(ref.toLowerCase());
+        }
+    },
+
+    /**
+     * Registers one or more {@link #refs references}.
+     *
+     * @param {Object/Object[]} refs
+     */
+    addRef: function(refs) {
+        this.ref(refs);
+    },
+
+    getRef: function(ref, info, config) {
+        var me = this,
+            refCache = me.refCache || (me.refCache = {}),
+            cached = refCache[ref];
+
+        info = info || {};
+        config = config || {};
+
+        Ext.apply(info, config);
+
+        if (info.forceCreate) {
+            return Ext.ComponentManager.create(info, 'component');
+        }
+
+        if (!cached) {
+            if (info.selector) {
+                refCache[ref] = cached = Ext.ComponentQuery.query(info.selector)[0];
+            }
+            
+            if (!cached && info.autoCreate) {
+                refCache[ref] = cached = Ext.ComponentManager.create(info, 'component');
+            }
+            
+            if (cached) {
+                cached.on('beforedestroy', function() {
+                    refCache[ref] = null;
+                });
+            }
+        }
+
+        return cached;
+    },
+
+    /**
+     * Returns `true` if a {@link #refs reference} is registered.
+     *
+     * @return {Boolean}
+     */
+    hasRef: function(ref) {
+        var references = this.references;
+        return references && Ext.Array.indexOf(references, ref.toLowerCase()) !== -1;
+    },
+
+    /**
+     * Adds listeners to components selected via {@link Ext.ComponentQuery}. Accepts an
+     * object containing component paths mapped to a hash of listener functions.
+     *
+     * In the following example the `updateUser` function is mapped to to the `click`
+     * event on a button component, which is a child of the `useredit` component.
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.control({
+     *                  'useredit button[action=save]': {
+     *                      click: this.updateUser
+     *                  }
+     *              });
+     *          },
+     *          
+     *          updateUser: function(button) {
+     *              console.log('clicked the Save button');
+     *          }
+     *      });
+     *
+     * Or alternatively one call `control` with two arguments:
+     *
+     *      this.control('useredit button[action=save]', {
+     *          click: this.updateUser
+     *      });
+     *
+     * See {@link Ext.ComponentQuery} for more information on component selectors.
+     *
+     * @param {String/Object} selectors If a String, the second argument is used as the
+     * listeners, otherwise an object of selectors -> listeners is assumed
+     * @param {Object} [listeners] Config for listeners.
+     */
+    control: function(selectors, listeners, controller) {
+        var me = this,
+            ctrl = controller,
+            obj;
+
+        if (Ext.isString(selectors)) {
+            obj = {};
+            obj[selectors] = listeners;
+        }
+        else {
+            obj = selectors;
+            ctrl = listeners;
+        }
+
+        me.eventbus.control(obj, ctrl || me);
+    },
+
+    /**
+     * Adds listeners to different event sources (also called "event domains"). The
+     * primary event domain is that of components, but there are also other event domains:
+     * {@link Ext.app.domain.Global Global} domain that intercepts events fired from
+     * {@link Ext#globalEvents} Observable instance, {@link Ext.app.domain.Controller Controller}
+     * domain can be used to listen to events fired by other Controllers,
+     * {@link Ext.app.domain.Store Store} domain gives access to Store events, and
+     * {@link Ext.app.domain.Direct Direct} domain can be used with Ext.Direct Providers
+     * to listen to their events.
+     * 
+     * To listen to "bar" events fired by a controller with id="foo":
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.listen({
+     *                  controller: {
+     *                      '#foo': {
+     *                         bar: this.onFooBar
+     *                      }
+     *                  }
+     *              });
+     *          },
+     *          ...
+     *      });
+     * 
+     * To listen to "bar" events fired by any controller, and "baz" events
+     * fired by Store with storeId="baz":
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.listen({
+     *                  controller: {
+     *                      '*': {
+     *                         bar: this.onAnyControllerBar
+     *                      }
+     *                  },
+     *                  store: {
+     *                      '#baz': {
+     *                          baz: this.onStoreBaz
+     *                      }
+     *                  }
+     *              });
+     *          },
+     *          ...
+     *      });
+     *
+     * To listen to "idle" events fired by {@link Ext#globalEvents} when other event
+     * processing is complete and Ext JS is about to return control to the browser:
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.listen({
+     *                  global: {               // Global events are always fired
+     *                      idle: this.onIdle   // from the same object, so there
+     *                  }                       // are no selectors
+     *              });
+     *          }
+     *      });
+     * 
+     * As this relates to components, the following example:
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.listen({
+     *                  component: {
+     *                      'useredit button[action=save]': {
+     *                         click: this.updateUser
+     *                      }
+     *                  }
+     *              });
+     *          },
+     *          ...
+     *      });
+     * 
+     * Is equivalent to:
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.control({
+     *                  'useredit button[action=save]': {
+     *                     click: this.updateUser
+     *                  }
+     *              });
+     *          },
+     *          ...
+     *      });
+     *
+     * Of course, these can all be combined in a single call and used instead of
+     * `control`, like so:
+     *
+     *      Ext.define('AM.controller.Users', {
+     *          init: function() {
+     *              this.listen({
+     *                  global: {
+     *                      idle: this.onIdle
+     *                  },
+     *                  controller: {
+     *                      '*': {
+     *                         foobar: this.onAnyFooBar
+     *                      },
+     *                      '#foo': {
+     *                         bar: this.onFooBar
+     *                      }
+     *                  },
+     *                  component: {
+     *                      'useredit button[action=save]': {
+     *                         click: this.updateUser
+     *                      }
+     *                  },
+     *                  store: {
+     *                      '#qux': {
+     *                          load: this.onQuxLoad
+     *                      }
+     *                  }
+     *              });
+     *          },
+     *          ...
+     *      });
+     *
+     * @param {Object} to Config object containing domains, selectors and listeners.
+     */
+    listen: function (to, controller) {
+        this.eventbus.listen(to, controller || this);
+    },
+
+    /**
+     * Returns instance of a {@link Ext.app.Controller Controller} with the given id.
+     * When controller doesn't exist yet, it's created. Note that this method depends
+     * on Application instance and will return undefined when Application is not
+     * accessible. The only exception is when this Controller instance's id is requested;
+     * in that case we always return the instance even if Application is no available.
+     *
+     * @param {String} id
+     *
+     * @return {Ext.app.Controller} controller instance or undefined.
+     */
+    getController: function(id) {
+        var me = this,
+            app = me.application;
+
+        if (id === me.id) {
+            return me;
+        }
+
+        return app && app.getController(id);
+    },
+
+    /**
+     * Returns instance of a {@link Ext.data.Store Store} with the given name.
+     * When store doesn't exist yet, it's created.
+     *
+     * @param {String} name
+     *
+     * @return {Ext.data.Store} a store instance.
+     */
+    getStore: function(name) {
+        var storeId, store;
+
+        storeId = (name.indexOf('@') == -1) ? name : name.split('@')[0];
+        store   = Ext.StoreManager.get(storeId);
+
+        if (!store) {
+            name = Ext.app.Controller.getFullName(name, 'store', this.$namespace);
+
+            if (name) {
+                store = Ext.create(name.absoluteName, {
+                    storeId: storeId
+                });
+            }
+        }
+
+        return store;
+    },
+
+    /**
+     * Returns a {@link Ext.data.Model Model} class with the given name.
+     * A shorthand for using {@link Ext.ModelManager#getModel}.
+     *
+     * @param {String} name
+     *
+     * @return {Ext.data.Model} a model class.
+     */
+    getModel: function(model) {
+        var name = Ext.app.Controller.getFullName(model, 'model', this.$namespace);
+
+        return name && Ext.ModelManager.getModel(name.absoluteName);
+    },
+
+    /**
+     * Returns a View class with the given name.  To create an instance of the view,
+     * you can use it like it's used by Application to create the Viewport:
+     *
+     *     this.getView('Viewport').create();
+     *
+     * @param {String} name
+     *
+     * @return {Ext.Base} a view class.
+     */
+    getView: function(view) {
+        var name = Ext.app.Controller.getFullName(view, 'view', this.$namespace);
+
+        return name && Ext.ClassManager.get(name.absoluteName);
+    },
+
+    /**
+     * Returns the base {@link Ext.app.Application} for this controller.
+     *
+     * @return {Ext.app.Application} the application
+     */
+    getApplication: function() {
+        return this.application;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ *
+ */
+Ext.define('Ext.container.DockingContainer', {
+
+    /* Begin Definitions */
+
+                                                           
+
+    /* End Definitions */
+
+    isDockingContainer: true,
+    
+    /**
+     * @event dockedadd
+     * Fires when any {@link Ext.Component} is added or inserted as a docked item.
+     * @param {Ext.panel.Panel} this
+     * @param {Ext.Component} component The component being added
+     * @param {Number} index The index at which the component will be added docked items collection
+     */
+    
+    /**
+     * @event dockedremove
+     * Fires when any {@link Ext.Component} is removed from the docked items.
+     * @param {Ext.panel.Panel} this
+     * @param {Ext.Component} component The component being removed
+     */
+
+    /**
+     * @cfg {Object} defaultDockWeights
+     * This object holds the default weights applied to dockedItems that have no weight. These start with a
+     * weight of 1, to allow negative weights to insert before top items and are odd numbers
+     * so that even weights can be used to get between different dock orders.
+     *
+     * To make default docking order match border layout, do this:
+     *
+     *      Ext.panel.AbstractPanel.prototype.defaultDockWeights = { top: 1, bottom: 3, left: 5, right: 7 };
+     *
+     * Changing these defaults as above or individually on this object will effect all Panels.
+     * To change the defaults on a single panel, you should replace the entire object:
+     *
+     *      initComponent: function () {
+     *          // NOTE: Don't change members of defaultDockWeights since the object is shared.
+     *          this.defaultDockWeights = { top: 1, bottom: 3, left: 5, right: 7 };
+     *
+     *          this.callParent();
+     *      }
+     *
+     * To change only one of the default values, you do this:
+     *
+     *      initComponent: function () {
+     *          // NOTE: Don't change members of defaultDockWeights since the object is shared.
+     *          this.defaultDockWeights = Ext.applyIf({ top: 10 }, this.defaultDockWeights);
+     * 
+     *          this.callParent();
+     *      }
+     */
+    defaultDockWeights: {
+        top:    { render: 1, visual: 1 },
+        left:   { render: 3, visual: 5 },
+        right:  { render: 5, visual: 7 },
+        bottom: { render: 7, visual: 3 }
+    },
+
+    // @private
+    // Values to decide which side of the body element docked items must go
+    // This overides any weight. A left/top will *always* sort before a right/bottom
+    // regardless of any weight value. Weights sort at either side of the "body" dividing point.
+    dockOrder: {
+        top: -1,
+        left: -1,
+        right: 1,
+        bottom: 1
+    },
+
+    /**
+     * @private
+     * Number of dock 'left' and 'right' items.
+     */
+    horizontalDocks: 0,
+
+    /**
+     * Adds docked item(s) to the container.
+     *
+     * @param {Object/Object[]} component The Component or array of components to add. The components
+     * must include a 'dock' parameter on each component to indicate where it should be docked
+     * ('top', 'right', 'bottom', 'left').
+     * @param {Number} [pos] The index at which the Component will be added
+     * @return {Ext.Component[]} The added components.
+     */
+    addDocked : function(items, pos) {
+        var me = this,
+            i = 0,
+            item, length;
+
+        items = me.prepareItems(items);
+        length = items.length;
+
+        for (; i < length; i++) {
+            item = items[i];
+            item.dock = item.dock || 'top';
+            if (item.dock === 'left' || item.dock === 'right') {
+                me.horizontalDocks++;
+            }
+
+            if (pos !== undefined) {
+                i += pos;
+                me.dockedItems.insert(i, item);
+            } else {
+                me.dockedItems.add(item);
+            }
+            
+            item.onAdded(me, i);
+            if (me.hasListeners.dockedadd) {
+                me.fireEvent('dockedadd', me, item, i);
+            }
+            if (me.onDockedAdd !== Ext.emptyFn) {
+                me.onDockedAdd(item);
+            }
+        }
+
+        if (me.rendered && !me.suspendLayout) {
+            me.updateLayout();
+        }
+        return items;
+    },
+
+    destroyDockedItems: function(){
+        var dockedItems = this.dockedItems,
+            c;
+
+        if (dockedItems) {
+            while ((c = dockedItems.first())) {
+                this.removeDocked(c, true);
+            }
+        }
+    },
+
+    doRenderDockedItems: function (out, renderData, after) {
+        // Careful! This method is bolted on to the frameTpl and renderTpl so all we get for
+        // context is the renderData! The "this" pointer is either the frameTpl or the
+        // renderTpl instance!
+
+        // Due to framing, we will be called in two different ways: in the frameTpl or in
+        // the renderTpl. The frameTpl version enters via doRenderFramingDockedItems which
+        // sets "$skipDockedItems" on the renderTpl's renderData.
+        //
+        var me = renderData.$comp,
+            layout = me.componentLayout,
+            items,
+            tree;
+
+        if (layout.getDockedItems && !renderData.$skipDockedItems) {
+            items = layout.getDockedItems('render', !after);
+            tree = items && layout.getItemsRenderTree(items);
+
+            if (tree) {
+                Ext.DomHelper.generateMarkup(tree, out);
+            }
+        }
+    },
+
+    /**
+     * Finds a docked component by id, itemId or position. Also see {@link #getDockedItems}
+     * @param {String/Number} comp The id, itemId or position of the docked component (see {@link Ext.panel.AbstractPanel#getComponent getComponent} for details)
+     * @return {Ext.Component} The docked component (if found)
+     */
+    getDockedComponent: function(comp) {
+        if (Ext.isObject(comp)) {
+            comp = comp.getItemId();
+        }
+        return this.dockedItems.get(comp);
+    },
+
+    /**
+     * Retrieves an array of all currently docked Components.
+     *
+     * For example to find a toolbar that has been docked at top:
+     *
+     *     panel.getDockedItems('toolbar[dock="top"]');
+     *
+     * @param {String} selector A {@link Ext.ComponentQuery ComponentQuery} selector string to filter the returned items.
+     * @param {Boolean} beforeBody An optional flag to limit the set of items to only those
+     *  before the body (true) or after the body (false). All components are returned by
+     *  default.
+     * @return {Ext.Component[]} The array of docked components meeting the specified criteria.
+     */
+    getDockedItems : function(selector, beforeBody) {
+        var dockedItems = this.getComponentLayout().getDockedItems('render', beforeBody);
+
+        if (selector && dockedItems.length) {
+            dockedItems = Ext.ComponentQuery.query(selector, dockedItems);
+        }
+
+        return dockedItems;
+    },
+
+    getDockingRefItems: function(deep, containerItems) {
+        // deep fetches the docked items and their descendants using '*' and then '* *'
+        var selector = deep && '*,* *',
+            // start with only the top/left docked items (and maybe their children)
+            dockedItems = this.getDockedItems(selector, true),
+            items;
+
+        // push container items (and maybe their children) after top/left docked items:
+        dockedItems.push.apply(dockedItems, containerItems);
+
+        // push right/bottom docked items (and maybe their children) after container items:
+        items = this.getDockedItems(selector, false);
+        dockedItems.push.apply(dockedItems, items);
+
+        return dockedItems;
+    },
+
+    initDockingItems: function() {
+        var me = this,
+            items = me.dockedItems;
+
+        me.dockedItems = new Ext.util.AbstractMixedCollection(false, me.getComponentId);
+        if (items) {
+            me.addDocked(items);
+        }
+    },
+
+    /**
+     * Inserts docked item(s) to the panel at the indicated position.
+     * @param {Number} pos The index at which the Component will be inserted
+     * @param {Object/Object[]} component The Component or array of components to add. The components
+     * must include a 'dock' paramater on each component to indicate where it should be docked ('top', 'right',
+     * 'bottom', 'left').
+     */
+    insertDocked : function(pos, items) {
+        this.addDocked(items, pos);
+    },
+
+    // Placeholder empty functions
+    /**
+     * Invoked after a docked item is added to the Panel.
+     * @param {Ext.Component} component
+     * @template
+     * @protected
+     */
+    onDockedAdd : Ext.emptyFn,
+    /**
+     * Invoked after a docked item is removed from the Panel.
+     * @param {Ext.Component} component
+     * @template
+     * @protected
+     */
+    onDockedRemove : Ext.emptyFn,
+
+    /**
+     * Removes the docked item from the panel.
+     * @param {Ext.Component} item The Component to remove.
+     * @param {Boolean} autoDestroy (optional) Destroy the component after removal.
+     */
+    removeDocked : function(item, autoDestroy) {
+        var me = this,
+            layout,
+            hasLayout;
+
+        autoDestroy = autoDestroy === true || (autoDestroy !== false && me.autoDestroy);
+        if (!me.dockedItems.contains(item)) {
+            return item;
+        }
+        if (item.dock === 'left' || item.dock === 'right') {
+            me.horizontalDocks--;
+        }
+
+        layout = me.componentLayout;
+        hasLayout = layout && me.rendered;
+
+        if (hasLayout) {
+            layout.onRemove(item);
+        }
+
+        me.dockedItems.remove(item);
+        // destroying flag is true if the removal is taking place as part of destruction, OR if removal is intended to *cause* destruction
+        item.onRemoved(item.destroying || autoDestroy);
+        me.onDockedRemove(item);
+
+        if (autoDestroy) {
+            item.destroy();
+        } else if (hasLayout) {
+            // not destroying, make any layout related removals
+            layout.afterRemove(item);
+        }
+        
+        if (me.hasListeners.dockedremove) {
+            me.fireEvent('dockedremove', me, item);
+        }
+
+        if (!me.destroying && !me.suspendLayout) {
+            me.updateLayout();
+        }
+
+        return item;
+    },
+
+    setupDockingRenderTpl: function (renderTpl) {
+        renderTpl.renderDockedItems = this.doRenderDockedItems;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A non-rendering placeholder item which instructs the Toolbar's Layout to begin using
+ * the right-justified button container.
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *          title: 'Toolbar Fill Example',
+ *          width: 300,
+ *          height: 200,
+ *          tbar : [
+ *              'Item 1',
+ *              { xtype: 'tbfill' },
+ *              'Item 2'
+ *          ],
+ *          renderTo: Ext.getBody()
+ *      });
+ */
+Ext.define('Ext.toolbar.Fill', {
+    extend:  Ext.Component ,
+    alias: 'widget.tbfill',
+    alternateClassName: 'Ext.Toolbar.Fill',
+    /**
+     * @property {Boolean} isFill
+     * `true` in this class to identify an object as an instantiated Fill, or subclass thereof.
+     */
+    isFill : true,
+    flex: 1
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ * Base class for Box Layout overflow handlers. These specialized classes are invoked when a Box Layout
+ * (either an HBox or a VBox) has child items that are either too wide (for HBox) or too tall (for VBox)
+ * for its container.
+ */
+Ext.define('Ext.layout.container.boxOverflow.None', {
+    alternateClassName: 'Ext.layout.boxOverflow.None',
+    
+    constructor: function(layout, config) {
+        this.layout = layout;
+        Ext.apply(this, config);
+    },
+
+    handleOverflow: Ext.emptyFn,
+
+    clearOverflow: Ext.emptyFn,
+
+    beginLayout: Ext.emptyFn,
+    beginLayoutCycle: Ext.emptyFn,
+
+    calculate: function(ownerContext) {
+        var me = this,
+            plan = ownerContext.state.boxPlan,
+            overflow;
+
+        if (plan && plan.tooNarrow) {
+            overflow = me.handleOverflow(ownerContext);
+
+            if (overflow) {
+                if (overflow.reservedSpace) {
+                    me.layout.publishInnerCtSize(ownerContext, overflow.reservedSpace);
+                }
+
+                // TODO: If we need to use the code below then we will need to pass along
+                // the new targetSize as state and use it calculate somehow...
+                //
+                //if (overflow.recalculate) {
+                //    ownerContext.invalidate({
+                //        state: {
+                //            overflow: overflow
+                //        }
+                //    });
+                //}
+            }
+        } else {
+            me.clearOverflow();
+        }
+    },
+
+    completeLayout: Ext.emptyFn,
+
+    finishedLayout: function (ownerContext) {
+        var me = this,
+            owner = me.layout.owner,
+            hiddens,
+            hiddenCount;
+
+        // Only count hidden children if someone is interested when the overflow state changes
+        if (owner.hasListeners.overflowchange) {
+            hiddens = owner.query('>[hidden]');
+            hiddenCount = hiddens.length;
+            if (hiddenCount !== me.lastHiddenCount) {
+                owner.fireEvent('overflowchange', me.lastHiddenCount, hiddenCount, hiddens);
+                me.lastHiddenCount = hiddenCount;
+            }
+        }
+    },
+
+    onRemove: Ext.emptyFn,
+
+    /**
+     * @private
+     * Normalizes an item reference, string id or numerical index into a reference to the item
+     * @param {Ext.Component/String/Number} item The item reference, id or index
+     * @return {Ext.Component} The item
+     */
+    getItem: function(item) {
+        return this.layout.owner.getComponent(item);
+    },
+    
+    getOwnerType: function(owner){
+        var type;
+        if (owner.isToolbar) {
+            type = 'toolbar';
+        } else if (owner.isTabBar) {
+            type = 'tabbar';
+        } else if (owner.isMenu) {
+            type = 'menu';
+        } else {
+            type = owner.getXType();
+        }
+        
+        return type;
+    },
+
+    getPrefixConfig: Ext.emptyFn,
+    getSuffixConfig: Ext.emptyFn,
+    getOverflowCls: function() {
+        return '';
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * The base class that other non-interacting Toolbar Item classes should extend in order to
+ * get some basic common toolbar item functionality.
+ */
+Ext.define('Ext.toolbar.Item', {
+    extend:  Ext.Component ,
+    alias: 'widget.tbitem',
+    alternateClassName: 'Ext.Toolbar.Item',
+    enable:Ext.emptyFn,
+    disable:Ext.emptyFn,
+    focus:Ext.emptyFn
+    /**
+     * @cfg {String} overflowText
+     * Text to be used for the menu if the item is overflowed.
+     */
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A simple class that adds a vertical separator bar between toolbar items (css class: 'x-toolbar-separator').
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *         title: 'Toolbar Separator Example',
+ *         width: 300,
+ *         height: 200,
+ *         tbar : [
+ *             'Item 1',
+ *             { xtype: 'tbseparator' },
+ *             'Item 2'
+ *         ],
+ *         renderTo: Ext.getBody()
+ *     });
+ */
+Ext.define('Ext.toolbar.Separator', {
+    extend:  Ext.toolbar.Item ,
+    alias: 'widget.tbseparator',
+    alternateClassName: 'Ext.Toolbar.Separator',
+    baseCls: Ext.baseCSSPrefix + 'toolbar-separator',
+    focusable: false
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.button.Manager', {
+    singleton: true,
+
+    alternateClassName: 'Ext.ButtonToggleManager',
+
+    groups: {},
+
+    pressedButton: null,
+
+    buttonSelector: '.' + Ext.baseCSSPrefix + 'btn',
+
+    init: function() {
+        var me = this;
+        if (!me.initialized) {
+            Ext.getDoc().on({
+                keydown: me.onDocumentKeyDown,
+                mouseup: me.onDocumentMouseUp,
+                scope: me
+            });
+            me.initialized = true;
+        }
+    },
+
+    // Buttons must react to SPACE and ENTER to trigger the click handler.
+    // Now that they are `<a>` elements, we use a keydown listener.
+    onDocumentKeyDown: function(e) {
+        var k = e.getKey(),
+            btn;
+
+        // SPACE and ENTER trigger a click
+        if (k === e.SPACE || k === e.ENTER) {
+
+            // Look for a Button's encapsulating element
+            btn = e.getTarget(this.buttonSelector);
+
+            // If found, fire the Button's onClick
+            if (btn) {
+                Ext.getCmp(btn.id).onClick(e);
+            }
+        }
+    },
+
+    // Called by buton instances.
+    // Track the button which was mousedowned upon so that the next *document* mouseup can be delivered to it
+    // in case mouse is moved outside of button element.
+    onButtonMousedown: function(button, e) {
+        var pressed = this.pressedButton;
+        if (pressed) {
+            pressed.onMouseUp(e);
+        }
+        this.pressedButton = button;
+    },
+
+    onDocumentMouseUp: function(e) {
+        var pressed = this.pressedButton;
+        
+        if (pressed) {
+            pressed.onMouseUp(e);
+            this.pressedButton = null;
+        }
+    },
+
+    toggleGroup: function(btn, state) {
+        if (state) {
+            var g = this.groups[btn.toggleGroup],
+                length = g.length,
+                i;
+
+            for (i = 0; i < length; i++) {
+                if (g[i] !== btn) {
+                    g[i].toggle(false);
+                }
+            }
+        }
+    },
+
+    register: function(btn) {
+        var me = this,
+            groups = this.groups,
+            group = groups[btn.toggleGroup];
+
+        me.init();
+        if (!btn.toggleGroup) {
+            return;
+        }
+
+        if (!group) {
+            group = groups[btn.toggleGroup] = [];
+        }
+        group.push(btn);
+        btn.on('toggle', me.toggleGroup, me);
+    },
+
+    unregister: function(btn) {
+        if (!btn.toggleGroup) {
+            return;
+        }
+        var me = this,
+            group = me.groups[btn.toggleGroup];
+
+        if (group) {
+            Ext.Array.remove(group, btn);
+            btn.un('toggle', me.toggleGroup, me);
+        }
+    },
+
+    // Gets the pressed button in the passed group or null
+    // @param {String} group
+    // @return {Ext.button.Button}
+    getPressed: function(group) {
+        var g = this.groups[group],
+            i = 0,
+            len;
+
+        if (g) {
+            for (len = g.length; i < len; i++) {
+                if (g[i].pressed === true) {
+                    return g[i];
+                }
+            }
+        }
+        return null;
+    } 
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This ComponentLayout handles docking for Panels. It takes care of panels that are
+ * part of a ContainerLayout that sets this Panel's size and Panels that are part of
+ * an AutoContainerLayout in which this panel get his height based of the CSS or
+ * or its content.
+ * @private
+ */
+Ext.define('Ext.layout.component.Dock', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.layout.component.Component ,
+
+    alias: 'layout.dock',
+
+    alternateClassName: 'Ext.layout.component.AbstractDock',
+
+    /* End Definitions */
+
+    type: 'dock',
+    
+    horzAxisProps: {
+        name: 'horz',
+        oppositeName: 'vert',
+        dockBegin: 'left',
+        dockEnd: 'right',
+        horizontal: true,
+        marginBegin: 'margin-left',
+        maxSize: 'maxWidth',
+        minSize: 'minWidth',
+        pos: 'x',
+        setSize: 'setWidth',
+        shrinkWrapDock: 'shrinkWrapDockWidth',
+        size: 'width',
+        sizeModel: 'widthModel'
+    },
+
+    vertAxisProps: {
+        name: 'vert',
+        oppositeName: 'horz',
+        dockBegin: 'top',
+        dockEnd: 'bottom',
+        horizontal: false,
+        marginBegin: 'margin-top',
+        maxSize: 'maxHeight',
+        minSize: 'minHeight',
+        pos: 'y',
+        setSize: 'setHeight',
+        shrinkWrapDock: 'shrinkWrapDockHeight',
+        size: 'height',
+        sizeModel: 'heightModel'
+    },
+
+    initializedBorders: -1,
+
+    horizontalCollapsePolicy: { width: true, x: true },
+
+    verticalCollapsePolicy: { height: true, y: true },
+
+    finishRender: function () {
+        var me = this,
+            target, items;
+
+        me.callParent();
+
+        target = me.getRenderTarget();
+        items = me.getDockedItems();
+
+        me.finishRenderItems(target, items);
+    },
+
+    isItemBoxParent: function (itemContext) {
+        return true;
+    },
+
+    isItemShrinkWrap: function (item) {
+        return true;
+    },
+
+    noBorderClasses: [
+        Ext.baseCSSPrefix + 'docked-noborder-top',
+        Ext.baseCSSPrefix + 'docked-noborder-right',
+        Ext.baseCSSPrefix + 'docked-noborder-bottom',
+        Ext.baseCSSPrefix + 'docked-noborder-left'
+    ],
+
+    noBorderClassesSides: {
+        top: Ext.baseCSSPrefix + 'docked-noborder-top',
+        right: Ext.baseCSSPrefix + 'docked-noborder-right',
+        bottom: Ext.baseCSSPrefix + 'docked-noborder-bottom',
+        left: Ext.baseCSSPrefix + 'docked-noborder-left'
+    },
+
+    borderWidthProps: {
+        top: 'border-top-width',
+        right: 'border-right-width',
+        bottom: 'border-bottom-width',
+        left: 'border-left-width'
+    },
+
+    handleItemBorders: function() {
+        var me = this,
+            owner = me.owner,
+            borders, docked,
+            lastItems = me.lastDockedItems,
+            oldBorders = me.borders,
+            currentGeneration = owner.dockedItems.generation,
+            noBorderClassesSides = me.noBorderClassesSides,
+            borderWidthProps = me.borderWidthProps,
+            i, ln, item, dock, side,
+            collapsed = me.collapsed;
+
+        if (me.initializedBorders == currentGeneration || (owner.border && !owner.manageBodyBorders)) {
+            return;
+        }
+
+        me.initializedBorders = currentGeneration;
+
+        // Borders have to be calculated using expanded docked item collection.
+        me.collapsed = false;
+        me.lastDockedItems = docked = me.getLayoutItems();
+        me.collapsed = collapsed;
+
+        borders = { top: [], right: [], bottom: [], left: [] };
+
+        for (i = 0, ln = docked.length; i < ln; i++) {
+            item = docked[i];
+            dock = item.dock;
+
+            if (item.ignoreBorderManagement) {
+                continue;
+            }
+
+            if (!borders[dock].satisfied) {
+                borders[dock].push(item);
+                borders[dock].satisfied = true;
+            }
+
+            if (!borders.top.satisfied && dock !== 'bottom') {
+                borders.top.push(item);
+            }
+            if (!borders.right.satisfied && dock !== 'left') {
+                borders.right.push(item);
+            }
+            if (!borders.bottom.satisfied && dock !== 'top') {
+                borders.bottom.push(item);
+            }
+            if (!borders.left.satisfied && dock !== 'right') {
+                borders.left.push(item);
+            }
+        }
+
+        if (lastItems) {
+            for (i = 0, ln = lastItems.length; i < ln; i++) {
+                item = lastItems[i];
+                if (!item.isDestroyed && !item.ignoreBorderManagement && !owner.manageBodyBorders) {
+                    item.removeCls(me.noBorderClasses);
+                }
+            }
+        }
+
+        if (oldBorders) {
+            for (side in oldBorders) {
+                if (owner.manageBodyBorders && oldBorders[side].satisfied) {
+                    owner.setBodyStyle(borderWidthProps[side], '');
+                }
+            }
+        }
+
+        for (side in borders) {
+            ln = borders[side].length;
+            if (!owner.manageBodyBorders) {
+                for (i = 0; i < ln; i++) {
+                    borders[side][i].addCls(noBorderClassesSides[side]);
+                }
+                if ((!borders[side].satisfied && !owner.bodyBorder) || owner.bodyBorder === false) {
+                    owner.addBodyCls(noBorderClassesSides[side]);
+                }
+            }
+            else if (borders[side].satisfied) {
+                owner.setBodyStyle(borderWidthProps[side], '1px');
+            }
+        }
+
+        me.borders = borders;
+    },
+
+    beforeLayoutCycle: function (ownerContext) {
+        var me = this,
+            owner = me.owner,
+            shrinkWrap = me.sizeModels.shrinkWrap,
+            shrinkWrapDock = owner.shrinkWrapDock,
+            collapsedHorz, collapsedVert;
+
+        if (owner.collapsed) {
+            if (owner.collapsedVertical()) {
+                collapsedVert = true;
+                ownerContext.measureDimensions = 1;
+            } else {
+                collapsedHorz = true;
+                ownerContext.measureDimensions = 2;
+            }
+        }
+
+        ownerContext.collapsedVert = collapsedVert;
+        ownerContext.collapsedHorz = collapsedHorz;
+
+        // If we are collapsed, we want to auto-layout using the placeholder/expander
+        // instead of the normal items/dockedItems. This must be done here since we could
+        // be in a box layout w/stretchmax which sets the width/heightModel to allow it to
+        // control the size.
+        if (collapsedVert) {
+            ownerContext.heightModel = shrinkWrap;
+        } else if (collapsedHorz) {
+            ownerContext.widthModel = shrinkWrap;
+        }
+        
+        shrinkWrapDock = shrinkWrapDock === true ? 3 : (shrinkWrapDock || 0);
+        ownerContext.shrinkWrapDockHeight = (shrinkWrapDock & 1) && ownerContext.heightModel.shrinkWrap;
+        ownerContext.shrinkWrapDockWidth = (shrinkWrapDock & 2) && ownerContext.widthModel.shrinkWrap;
+    },
+
+    beginLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            docked = me.getLayoutItems(),
+            layoutContext = ownerContext.context,
+            dockedItemCount = docked.length,
+            dockedItems, i, item, itemContext, offsets,
+            collapsed, dock;
+
+        me.callParent(arguments);
+
+        // Cache the children as ContextItems (like a Container). Also setup to handle
+        // collapsed state:
+        collapsed = owner.getCollapsed();
+        if (collapsed !== me.lastCollapsedState && Ext.isDefined(me.lastCollapsedState)) {
+            // If we are collapsing...
+            if (me.owner.collapsed) {
+                ownerContext.isCollapsingOrExpanding = 1;
+                // Add the collapsed class now, so that collapsed CSS rules are applied before measurements are taken by the layout.
+                owner.addClsWithUI(owner.collapsedCls);
+            } else {
+                ownerContext.isCollapsingOrExpanding = 2;
+                // Remove the collapsed class now, before layout calculations are done.
+                owner.removeClsWithUI(owner.collapsedCls);
+                ownerContext.lastCollapsedState = me.lastCollapsedState;
+            }
+        }
+        me.lastCollapsedState = collapsed;
+
+        ownerContext.dockedItems = dockedItems = [];
+
+        for (i = 0; i < dockedItemCount; i++) {
+            item = docked[i];
+            if (item.rendered) {
+                dock = item.dock;
+                itemContext = layoutContext.getCmp(item);
+                itemContext.dockedAt = { x: 0, y: 0 };
+                itemContext.offsets = offsets = Ext.Element.parseBox(item.offsets || 0);
+                itemContext.horizontal = dock == 'top' || dock == 'bottom';
+                offsets.width = offsets.left + offsets.right;
+                offsets.height = offsets.top + offsets.bottom;
+                dockedItems.push(itemContext);
+            }
+        }
+
+        ownerContext.bodyContext = ownerContext.getEl('body');
+    },
+
+    beginLayoutCycle: function(ownerContext) {
+        var me = this,
+            docked = ownerContext.dockedItems,
+            len = docked.length,
+            owner = me.owner,
+            frameBody = owner.frameBody,
+            lastHeightModel = me.lastHeightModel,
+            i, item, dock;
+
+        me.callParent(arguments);
+
+        if (me.owner.manageHeight) {
+            // Reset in case manageHeight gets turned on during lifecycle.
+            // See below for why display could be set to non-default value.
+            if (me.lastBodyDisplay) {
+                owner.body.dom.style.display = me.lastBodyDisplay = '';
+            }
+        } else {
+            // When manageHeight is false, the body stretches the outer el by using wide margins to force it to
+            // accommodate the docked items. When overflow is visible (when panel is resizable and has embedded handles),
+            // the body must be inline-block so as not to collapse its margins
+            if (me.lastBodyDisplay !== 'inline-block') {
+                owner.body.dom.style.display = me.lastBodyDisplay = 'inline-block';
+            }
+
+            if (lastHeightModel && lastHeightModel.shrinkWrap &&
+                        !ownerContext.heightModel.shrinkWrap) {
+                owner.body.dom.style.marginBottom = '';
+            }
+        }
+
+        if (ownerContext.widthModel.auto) {
+            if (ownerContext.widthModel.shrinkWrap) {
+                owner.el.setWidth(null);
+            }
+            owner.body.setWidth(null);
+            if (frameBody) {
+                frameBody.setWidth(null);
+            }
+        }
+        if (ownerContext.heightModel.auto) {
+            owner.body.setHeight(null);
+            //owner.el.setHeight(null); Disable this for now
+            if (frameBody) {
+                frameBody.setHeight(null);
+            }
+        }
+
+        // Each time we begin (2nd+ would be due to invalidate) we need to publish the
+        // known contentWidth/Height if we are collapsed:
+        if (ownerContext.collapsedVert) {
+            ownerContext.setContentHeight(0);
+        } else if (ownerContext.collapsedHorz) {
+            ownerContext.setContentWidth(0);
+        }
+
+        // dock: 'right' items, when a panel gets narrower get "squished". Moving them to
+        // left:0px avoids this!
+        for (i = 0; i < len; i++) {
+            item = docked[i].target;
+            dock = item.dock;
+
+            if (dock == 'right') {
+                item.setLocalX(0);
+            } else if (dock != 'left') {
+                continue;
+            }
+
+            // TODO - clear width/height?
+        }
+    },
+
+    calculate: function (ownerContext) {
+        var me = this,
+            measure = me.measureAutoDimensions(ownerContext, ownerContext.measureDimensions),
+            state = ownerContext.state,
+            horzDone = state.horzDone,
+            vertDone = state.vertDone,
+            bodyContext = ownerContext.bodyContext,
+            framing, horz, vert, forward, backward;
+
+        // make sure we can use these value w/o calling methods to get them
+        ownerContext.borderInfo  || ownerContext.getBorderInfo();
+        ownerContext.paddingInfo || ownerContext.getPaddingInfo();
+        ownerContext.frameInfo   || ownerContext.getFrameInfo();
+        bodyContext.borderInfo   || bodyContext.getBorderInfo();
+        bodyContext.paddingInfo  || bodyContext.getPaddingInfo();
+
+        // On CSS3 browsers, the border and padding frame the outer el. On non-CSS3
+        // browsers, the outer el has no border or padding - all that appears on the
+        // framing elements as padding and height. In CSS3, the border size effects the
+        // origin of the dockedItems but the padding does not (so that must be added in
+        // most of the time). In non-CSS3 mode, the dockedItems are outside the framing:
+        //
+        //      ... top / left dockedItems ...
+        //      <div id="...-ml" style="padding-left: border-radius-left;">
+        //          <div id="...-mr" style="padding-right: border-radius-right;">
+        //              <div id="...-mc" style="padding: extra;">
+        //                  ... body ...
+        //              </div>
+        //          </div>
+        //      </div>
+        //      ... bottom / right dockedItems ...
+        // 
+        // For the sake of sanity, we perform all the calculations in CSS3 mode. We test
+        // for the presence of non-CSS3 framing only when necessary.
+        //
+        if (!ownerContext.frameBorder) {
+            if (!(framing = ownerContext.framing)) {
+                ownerContext.frameBorder = ownerContext.borderInfo;
+                ownerContext.framePadding = ownerContext.paddingInfo;
+            } else {
+                // These values match what they would have been in CSS3.
+                ownerContext.frameBorder = framing.border;
+                ownerContext.framePadding = framing.padding;
+            }
+        }
+
+        // Start the axes so they are ready to proceed inwards (fixed-size) or outwards
+        // (shrinkWrap) and stash key property names as well:
+        horz = !horzDone &&
+               me.createAxis(ownerContext, measure.contentWidth, ownerContext.widthModel,
+                             me.horzAxisProps, ownerContext.collapsedHorz);
+        vert = !vertDone &&
+               me.createAxis(ownerContext, measure.contentHeight, ownerContext.heightModel,
+                             me.vertAxisProps, ownerContext.collapsedVert);
+
+        // We iterate forward and backward over the dockedItems at the same time based on
+        // whether an axis is shrinkWrap or fixed-size. For a fixed-size axis, the outer box
+        // axis is allocated to docked items in forward order and is reduced accordingly.
+        // To handle a shrinkWrap axis, the box starts at the inner (body) size and is used to
+        // size docked items in backwards order. This is because the last docked item shares
+        // an edge with the body. The item size is used to adjust the shrinkWrap axis outwards
+        // until the first docked item (at the outermost edge) is processed. This backwards
+        // order ensures that docked items never get an incorrect size for any dimension.
+        for (forward = 0, backward = ownerContext.dockedItems.length; backward--; ++forward) {
+            if (horz) {
+                me.dockChild(ownerContext, horz, backward, forward);
+            }
+            if (vert) {
+                me.dockChild(ownerContext, vert, backward, forward);
+            }
+        }
+        
+        if (horz && me.finishAxis(ownerContext, horz)) {
+            state.horzDone = horzDone = horz;
+        }
+        
+        if (vert && me.finishAxis(ownerContext, vert)) {
+            state.vertDone = vertDone = vert;
+        }
+
+        // Once all items are docked, the final size of the outer panel or inner body can
+        // be determined. If we can determine both width and height, we are done.
+        if (horzDone && vertDone && me.finishConstraints(ownerContext, horzDone, vertDone)) {
+            // Size information is published as we dock items but position is hard to do
+            // that way (while avoiding published multiple times) so we publish all the
+            // positions at the end.
+            me.finishPositions(ownerContext, horzDone, vertDone);
+        } else {
+            me.done = false;
+        }
+    },
+
+    /**
+     * Creates an axis object given the particulars. The process starts by placing the
+     * dockedItems in an idealized box where this method is called once for each side.
+     * The ideal box is defined by the CSS3 border and padding values (which account for
+     * the influence of border-radius). The origin (the (0,0) point) of the ideal box is
+     * the top-left edge of the border or the border-box. Normal dockedItems are placed
+     * inside this box at an offset to clear the border and padding and sit properly in
+     * the panel next to the body.
+     * 
+     * The origin has to be started differently if the axis is in shrinkWrap mode. When
+     * shrink-wrapping an axis, the axis starts at the edge of the body and expands
+     * outwards as items are docked. This means the ideal (0,0) for shrinkWrap is on the
+     * top-left corner of the body.
+     * 
+     * The following diagram illustrates this using the vertical axis.
+     * 
+     *      +---------------------------+ 10px (border)
+     *      |                           |
+     *      |  xxxxxxxxxxxxxxxxxxxxxxx  | 5px (padding)   shrinkWrap    other
+     *      |  +=====================+  |                   -50         15
+     *      |  |  Header             |  | 30px
+     *      |  |                     |  |
+     *      |  +=====================+  |
+     *      |  +---------------------+  |                   -20         45
+     *      |  |  tbar               |  | 20 px
+     *      |  +---------------------+  |
+     *      |  +---------------------+  |                   0           65
+     *      |  |  Body               |  | 100px
+     *      |  |                     |  |
+     *      |  |                     |  |
+     *      |  +---------------------+  |
+     *      |  +---------------------+  |                   100         165
+     *      |  |  bbar               |  | 15px
+     *      |  +---------------------+  |
+     *      |  xxxxxxxxxxxxxxxxxxxxxxx  | 5px
+     *      |                           |
+     *      +---------------------------+ 10px
+     *
+     * These are sufficient to determine sizes of things, but to finalize this process
+     * and assign proper positions, the tentative coordinates have to be adjusted by an
+     * amount appropriate for the item. Because dockedItems are position:absolute, they
+     * sit inside the border and so must be adjusted for padding. The body is different
+     * because it is position:relative and so it naturally sits inside the padding and
+     * the padding must not be included in its position.
+     * 
+     * Headers and footers that use `ignoreParentFrame` interact with this process by
+     * moving themselves outside the border and padding. So in the above diagram, the
+     * Header would move up by 15px and *everything else* would move up by 10px. When
+     * shrinkWrap is taking place, the 10px of border on the top is removed from the
+     * height as well.
+     * 
+     * The bbar behaves slightly different when it is `ignoreParentFrame`. In shrinkWrap
+     * mode, it alone would move down by the padding and the bottom border would not be
+     * included in the height. Otherwise, the bbar would be moved down 15px (since the
+     * edge is fixed) and the next dockedItem would be placed at, or the body would be
+     * stretched down to, 5px (padding) pixels above the bbar.
+     *
+     * @private
+     */
+    createAxis: function (ownerContext, contentSize, sizeModel, axisProps, collapsedAxis) {
+        var me = this,
+            begin = 0,
+            owner = me.owner,
+            maxSize = owner[axisProps.maxSize],
+            minSize = owner[axisProps.minSize] || 0,
+            dockBegin = axisProps.dockBegin,
+            dockEnd = axisProps.dockEnd,
+            posProp = axisProps.pos,
+            sizeProp = axisProps.size,
+            hasMaxSize = maxSize != null, // exactly the same as "maxSize !== null && maxSize !== undefined"
+            shrinkWrap = sizeModel.shrinkWrap,
+            bodyContext, framing, padding, end;
+
+        if (shrinkWrap) {
+            // End position before adding docks around the content is content size plus the body borders in this axis.
+            // If collapsed in this axis, the body borders will not be shown.
+            if (collapsedAxis) {
+                end = 0;
+            } else {
+                bodyContext = ownerContext.bodyContext;
+                end = contentSize + bodyContext.borderInfo[sizeProp];
+            }
+        } else {
+            framing = ownerContext.frameBorder;
+            padding = ownerContext.framePadding;
+
+            begin = framing[dockBegin] + padding[dockBegin];
+            end = ownerContext.getProp(sizeProp) - (framing[dockEnd] + padding[dockEnd]);
+        }
+
+        return {
+            shrinkWrap: sizeModel.shrinkWrap,
+            sizeModel: sizeModel,
+            // An axis tracks start and end+1 px positions. eg 0 to 10 for 10px high
+            initialBegin: begin,
+            begin: begin,
+            end: end,
+            collapsed: collapsedAxis,
+            horizontal: axisProps.horizontal,
+            ignoreFrameBegin: null,
+            ignoreFrameEnd: null,
+            initialSize: end - begin,
+            maxChildSize: 0,
+            hasMinMaxConstraints: (minSize || hasMaxSize) && sizeModel.shrinkWrap,
+            minSize: minSize,
+            maxSize: hasMaxSize ? maxSize : 1e9,
+            bodyPosProp: me.owner.manageHeight ? posProp : axisProps.marginBegin,
+            dockBegin: dockBegin,    // 'left' or 'top'
+            dockEnd: dockEnd,        // 'right' or 'end'
+            posProp: posProp,        // 'x' or 'y'
+            sizeProp: sizeProp,      // 'width' or 'height'
+            setSize: axisProps.setSize,
+            shrinkWrapDock: ownerContext[axisProps.shrinkWrapDock],
+            sizeModelName: axisProps.sizeModel,
+            dockedPixelsEnd: 0
+        };
+    },
+
+    /**
+     * Docks a child item on the specified axis. This boils down to determining if the item
+     * is docked at the "beginning" of the axis ("left" if horizontal, "top" if vertical),
+     * the "end" of the axis ("right" if horizontal, "bottom" if vertical) or stretches
+     * along the axis ("top" or "bottom" if horizontal, "left" or "right" if vertical). It
+     * also has to differentiate between fixed and shrinkWrap sized dimensions.
+     * @private
+     */
+    dockChild: function (ownerContext, axis, backward, forward) {
+        var me = this,
+            itemContext = ownerContext.dockedItems[axis.shrinkWrap ? backward : forward],
+            item = itemContext.target,
+            dock = item.dock, // left/top/right/bottom
+            sizeProp = axis.sizeProp,
+            pos, size;
+
+        if (item.ignoreParentFrame && ownerContext.isCollapsingOrExpanding) {
+            // collapsed window header margins may differ from expanded window header margins
+            // so we need to make sure the old cached values are not used in axis calculations
+            itemContext.clearMarginCache();
+        }
+
+        itemContext.marginInfo || itemContext.getMarginInfo(); // get marginInfo ready
+
+        if (dock == axis.dockBegin) {
+            if (axis.shrinkWrap) {
+                pos = me.dockOutwardBegin(ownerContext, itemContext, item, axis);
+            } else {
+                pos = me.dockInwardBegin(ownerContext, itemContext, item, axis);
+            }
+        } else if (dock == axis.dockEnd) {
+            if (axis.shrinkWrap) {
+                pos = me.dockOutwardEnd(ownerContext, itemContext, item, axis);
+            } else {
+                pos = me.dockInwardEnd(ownerContext, itemContext, item, axis);
+            }
+        } else {
+            if (axis.shrinkWrapDock) {
+                // we are still shrinkwrapping transversely... so we need to include the
+                // size of this item in the max calculation
+                size = itemContext.getProp(sizeProp) + itemContext.marginInfo[sizeProp];
+                axis.maxChildSize = Math.max(axis.maxChildSize, size);
+                pos = 0;
+            } else {
+                pos = me.dockStretch(ownerContext, itemContext, item, axis);
+            }
+        }
+
+        itemContext.dockedAt[axis.posProp] = pos;
+    },
+
+    /**
+     * Docks an item on a fixed-size axis at the "beginning". The "beginning" of the horizontal
+     * axis is "left" and the vertical is "top". For a fixed-size axis, the size works from
+     * the outer element (the panel) towards the body.
+     * @private
+     */
+    dockInwardBegin: function (ownerContext, itemContext, item, axis) {
+        var pos = axis.begin,
+            sizeProp = axis.sizeProp,
+            ignoreParentFrame = item.ignoreParentFrame,
+            delta,
+            size, 
+            dock;
+
+        if (ignoreParentFrame) {
+            axis.ignoreFrameBegin = itemContext;
+            dock = item.dock;
+
+            // We need to move everything up by the border-width.
+            delta = ownerContext.frameBorder[dock];
+
+            // We need to move the header "up" by the padding as well.
+            pos -= delta + ownerContext.framePadding[dock];
+        }
+
+        if (!item.overlay) {
+            size = itemContext.getProp(sizeProp) + itemContext.marginInfo[sizeProp];
+            axis.begin += size;
+            if (ignoreParentFrame) {
+                axis.begin -= delta;
+            }
+        }
+
+        return pos;
+    },
+
+    /**
+     * Docks an item on a fixed-size axis at the "end". The "end" of the horizontal axis is
+     * "right" and the vertical is "bottom".
+     * @private
+     */
+    dockInwardEnd: function (ownerContext, itemContext, item, axis) {
+        var sizeProp = axis.sizeProp,
+            size = itemContext.getProp(sizeProp) + itemContext.marginInfo[sizeProp],
+            pos = axis.end - size,
+            frameEnd;
+
+        if (!item.overlay) {
+            axis.end = pos;
+        }
+
+        if (item.ignoreParentFrame) {
+            axis.ignoreFrameEnd = itemContext;
+            frameEnd = ownerContext.frameBorder[item.dock];
+            pos += frameEnd + ownerContext.framePadding[item.dock];
+            axis.end += frameEnd;
+        }
+
+        return pos;
+    },
+
+    /**
+     * Docks an item on a shrinkWrap axis at the "beginning". The "beginning" of the horizontal
+     * axis is "left" and the vertical is "top". For a shrinkWrap axis, the size works from
+     * the body outward to the outermost element (the panel).
+     * 
+     * During the docking process, coordinates are allowed to be negative. We start with the
+     * body at (0,0) so items docked "top" or "left" will simply be assigned negative x/y. In
+     * the {@link #finishPositions} method these are corrected and framing is added. This way
+     * the correction is applied as a simple translation of delta x/y on all coordinates to
+     * bring the origin back to (0,0).
+     * @private
+     */
+    dockOutwardBegin: function (ownerContext, itemContext, item, axis) {
+        var pos = axis.begin,
+            sizeProp = axis.sizeProp,
+            size;
+
+        if (axis.collapsed) {
+            axis.ignoreFrameBegin = axis.ignoreFrameEnd = itemContext;
+        } else if (item.ignoreParentFrame) {
+            axis.ignoreFrameBegin = itemContext;
+        }
+        // NOTE - When shrinkWrapping an ignoreParentFrame, this must be the last item
+        // on the axis. Since that is so, we let finishAxis take this in to account.
+
+        if (!item.overlay) {
+            size = itemContext.getProp(sizeProp) + itemContext.marginInfo[sizeProp];
+            pos -= size;
+            axis.begin = pos;
+        }
+
+        return pos;
+    },
+
+    /**
+     * Docks an item on a shrinkWrap axis at the "end". The "end" of the horizontal axis is
+     * "right" and the vertical is "bottom".
+     * @private
+     */
+    dockOutwardEnd: function (ownerContext, itemContext, item, axis) {
+        var pos = axis.end,
+            sizeProp = axis.sizeProp,
+            size;
+
+        size = itemContext.getProp(sizeProp) + itemContext.marginInfo[sizeProp];
+
+        if (axis.collapsed) {
+            axis.ignoreFrameBegin = axis.ignoreFrameEnd = itemContext;
+        } else if (item.ignoreParentFrame) {
+            axis.ignoreFrameEnd = itemContext;
+        }
+        // NOTE - When shrinkWrapping an ignoreParentFrame, this must be the last item
+        // on the axis. Since that is so, we let finishAxis take this in to account.
+
+        if (!item.overlay) {
+            axis.end = pos + size;
+            axis.dockedPixelsEnd += size;
+        }
+
+        return pos;
+    },
+
+    /**
+     * Docks an item that might stretch across an axis. This is done for dock "top" and
+     * "bottom" items on the horizontal axis and dock "left" and "right" on the vertical.
+     * @private
+     */
+    dockStretch: function (ownerContext, itemContext, item, axis) {
+        var dock = item.dock, // left/top/right/bottom (also used to index padding/border)
+            sizeProp = axis.sizeProp, // 'width' or 'height'
+            horizontal = dock == 'top' || dock == 'bottom',
+            border = ownerContext.frameBorder,
+            offsets = itemContext.offsets,
+            padding = ownerContext.framePadding,
+            endProp = horizontal ? 'right' : 'bottom',
+            startProp = horizontal ? 'left' : 'top',
+            pos = axis.begin + offsets[startProp],
+            margin, size;
+
+        if (item.stretch !== false) {
+            size = axis.end - pos - offsets[endProp];
+
+            if (item.ignoreParentFrame) {
+                // In CSS3, the border and padding need to be ignored specifically. In
+                // non-CSS3 / framing mode, the border and padding will be 0 **but** the
+                // header is not rendered inside the framing elements and so we do not
+                // want to do anything anyway!
+                pos -= padding[startProp] + border[startProp];
+                size += padding[sizeProp] + border[sizeProp];
+            }
+
+            margin = itemContext.marginInfo;
+            size -= margin[sizeProp];
+
+            itemContext[axis.setSize](size);
+        }
+
+        return pos;
+    },
+
+    /**
+     * Finishes the calculation of an axis by determining its size. In non-shrink-wrap
+     * cases, this is also where we set the body size.
+     * @private
+     */
+    finishAxis: function (ownerContext, axis) {
+        // If the maxChildSize is NaN it means at some point we tried to determine
+        // The size of a docked item but we couldn't, so just jump out straight
+        // away before doing any other processing
+        if (isNaN(axis.maxChildSize)) {
+            return false;
+        }
+        
+        var axisBegin = axis.begin,
+            size = axis.end - axisBegin,
+            collapsed = axis.collapsed,
+            setSizeMethod = axis.setSize,
+            beginName = axis.dockBegin, // left or top
+            endName = axis.dockEnd, // right or bottom
+            padding = ownerContext.framePadding,
+            border = ownerContext.frameBorder,
+            borderBegin = border[beginName],
+            framing = ownerContext.framing,
+            framingBegin = framing && framing[beginName],
+            // The padding is in play unless the axis is collapsed.
+            paddingBegin = collapsed ? 0 : padding[beginName],
+            sizeProp = axis.sizeProp,
+            ignoreFrameBegin = axis.ignoreFrameBegin,
+            ignoreFrameEnd = axis.ignoreFrameEnd,
+            bodyContext = ownerContext.bodyContext,
+            extraPaddingBegin = Math.max(borderBegin + paddingBegin - framingBegin, 0),
+            bodyPos, bodySize, delta, dirty;
+
+        if (axis.shrinkWrap) {
+            // Since items docked left/top on a shrinkWrap axis go into negative coordinates,
+            // we apply a delta to all coordinates to adjust their relative origin back to
+            // a (0,0) inside the border.
+
+            bodySize = axis.initialSize;
+
+            if (framing) {
+                // In CSS3 mode, things are compartively simple because "framing" is just
+                // borders and padding. In non-CSS3 mode, however, the framing elements
+                // are given a size equal to the max of the border-width and border-radius
+                // and this pushes the body down accordingly. Further, the dockedItems are
+                // all rendered outside the framing elements, so their origin equals the
+                // ideal box origin. To translate this to match CSS3, we have to add on
+                // the border-top.
+
+                delta = -axisBegin + borderBegin + paddingBegin;
+                bodyPos = delta - framingBegin - extraPaddingBegin;
+            } else {
+                bodyPos = -axisBegin;
+                delta = bodyPos + paddingBegin;
+            }
+
+            if (!collapsed) {
+                size += padding[sizeProp];
+            }
+
+            if (ignoreFrameBegin) {
+                // When some component ignores the begin framing, we move everything "up"
+                // by that amount of framing. We also do not include that amount of the
+                // framing in the shrinkWrap size.
+                delta -= borderBegin;
+                bodyPos -= borderBegin;
+
+                // The item ignoring the framing must also escape the padding. Since the
+                // axis.delta includes the padding and we want to apply this to only the
+                // one item, we just poke its dockedAt.x/y property so that when we add
+                // axis.begin the padding will cancel out. (Note: when we are collapsed
+                // paddingBegin will be 0).
+                
+                ignoreFrameBegin.dockedAt[axis.posProp] -= paddingBegin;
+            } else {
+                size += borderBegin;
+            }
+
+            if (collapsed) {
+                // in this case "ignoreFrameBegin === ignoreFrameEnd" so we can take the
+                // special cases out of the mix here...
+            } else if (ignoreFrameEnd) {
+                // When a component ignores the end framing, we simply move it further
+                // "down" by the end padding and we do not add the end framing to the
+                // shrinkWrap size.
+                ignoreFrameEnd.dockedAt[axis.posProp] += padding[endName];
+            } else {
+                size += border[endName];
+            }
+
+            axis.size = size; // we have to wait for min/maxWidth/Height processing
+
+            if (!axis.horizontal && !this.owner.manageHeight) {
+                // the height of the bodyEl will give the proper height to the outerEl so
+                // we don't need to set heights in the DOM
+                dirty = false;
+            }
+        } else {
+            // For a fixed-size axis, we started at the outer box and already have the
+            // proper origin... almost... except for the owner's border.
+            if (framing) {
+                // since dockedItems are rendered outside the framing, they have the
+                // proper origin already:
+                delta = 0;
+                bodyPos = axisBegin - framingBegin - extraPaddingBegin;
+            } else {
+                delta = -borderBegin;
+                bodyPos = axisBegin - paddingBegin - borderBegin;
+            }
+
+            // Body size is remaining space between ends of Axis.
+            bodySize = size;
+        }
+
+        axis.delta = delta;
+        bodyContext[setSizeMethod](bodySize, dirty);
+        bodyContext.setProp(axis.bodyPosProp, bodyPos);
+
+        return !isNaN(size);
+    },
+    
+    beforeInvalidateShrinkWrapDock: function(itemContext, options){
+        var sizeModelName = options.axis.sizeModelName;
+        if (!itemContext[sizeModelName].constrainedMin) {
+            // if the child hit a min constraint, it needs to be at its configured size, so
+            // we leave the sizeModel alone
+            itemContext[sizeModelName] = Ext.layout.SizeModel.calculated;
+        }
+    },
+    
+    afterInvalidateShrinkWrapDock: function(itemContext, options){
+        var axis = options.axis,
+            me = options.layout,
+            pos;
+
+        if (itemContext[axis.sizeModelName].calculated) {
+            pos = me.dockStretch(options.ownerContext, itemContext, itemContext.target, axis);
+            itemContext.setProp(axis.posProp, axis.delta + pos);
+        }
+    },
+    
+    /**
+     * Finishes processing of each axis by applying the min/max size constraints.
+     * @private
+     */
+    finishConstraints: function (ownerContext, horz, vert) {
+        var me = this,
+            sizeModels = me.sizeModels,
+            publishWidth = horz.shrinkWrap,
+            publishHeight = vert.shrinkWrap,
+            owner = me.owner,
+            dirty, height, width, heightModel, widthModel, size, 
+            minSize, maxSize, maxChildSize, desiredSize;
+
+        // In these calculations, maxChildSize will only be > 0 in the scenario where
+        // we are dock shrink wrapping in that direction, otherwise it is not measured.
+        // As such, the additions are done to simplify the logic, even though in most
+        // cases, it will have no impact on the overall result.
+        
+        if (publishWidth) {
+            size = horz.size;
+            minSize = horz.collapsed ? 0 : horz.minSize;
+            maxSize = horz.maxSize;
+            maxChildSize = horz.maxChildSize;
+            desiredSize = Math.max(size, maxChildSize);
+
+            if (desiredSize > maxSize) {
+                widthModel = sizeModels.constrainedMax;
+                width = maxSize;
+            } else if (desiredSize < minSize) {
+                widthModel = sizeModels.constrainedMin;
+                width = minSize;
+            } else if (size < maxChildSize) {
+                widthModel = sizeModels.constrainedDock;
+                owner.dockConstrainedWidth = width = maxChildSize;
+            } else {
+                width = size;
+            }
+        }
+
+        if (publishHeight) {
+            size = vert.size;
+            minSize = vert.collapsed ? 0 : vert.minSize;
+            maxSize = vert.maxSize;
+            maxChildSize = vert.maxChildSize;
+            // For vertical docks, their weighting means the height is affected by top/bottom
+            // docked items, so we need to subtract them here
+            desiredSize = Math.max(size, maxChildSize + size - vert.initialSize);
+
+            if (desiredSize > maxSize) {
+                heightModel = sizeModels.constrainedMax;
+                height = maxSize;
+            } else if (desiredSize < minSize) {
+                heightModel = sizeModels.constrainedMin;
+                height = minSize;
+            } else if (size < maxChildSize) {
+                heightModel = sizeModels.constrainedDock;
+                owner.dockConstrainedHeight = height = maxChildSize;
+            } else {
+                if (!ownerContext.collapsedVert && !owner.manageHeight) {
+                    // height of the outerEl is provided by the height (including margins)
+                    // of the bodyEl, so this value does not need to be written to the DOM
+                    dirty = false;
+
+                    // so long as we set top and bottom margins on the bodyEl!
+                    ownerContext.bodyContext.setProp('margin-bottom', vert.dockedPixelsEnd);
+                }
+
+                height = size;
+            }
+        }
+
+        // Handle the constraints...
+
+        if (widthModel || heightModel) {
+            // See ContextItem#init for an analysis of why this case is special. Basically,
+            // in this case, we only know the width and the height could be anything.
+            if (widthModel && heightModel &&
+                        widthModel.constrainedMax &&  heightModel.constrainedByMin) {
+                ownerContext.invalidate({ widthModel: widthModel });
+                return false;
+            }
+
+            // To process a width or height other than that to which we have shrinkWrapped,
+            // we need to invalidate our component and carry forward w/these constrains...
+            // unless the ownerLayout wants these results and will invalidate us anyway.
+            if (!ownerContext.widthModel.calculatedFromShrinkWrap &&
+                        !ownerContext.heightModel.calculatedFromShrinkWrap) {
+                // nope, just us to handle the constraint...
+                ownerContext.invalidate({ widthModel: widthModel, heightModel: heightModel });
+                return false;
+            }
+
+            // We have a constraint to deal with, so we just adjust the size models and
+            // allow the ownerLayout to invalidate us with its contribution to our final
+            // size...
+        } else {
+            // We're not invalidating, the ownerContext, so if we're shrink wrapping we'll need to
+            // tell any docked items to invalidate themselves if necessary.'
+            me.invalidateAxes(ownerContext, horz, vert);
+            
+        }
+
+        // we only publish the sizes if we are not invalidating the result...
+
+        if (publishWidth) {
+            ownerContext.setWidth(width);
+            if (widthModel) {
+                ownerContext.widthModel = widthModel; // important to the ownerLayout
+            }
+        }
+        if (publishHeight) {
+            ownerContext.setHeight(height, dirty);
+            if (heightModel) {
+                ownerContext.heightModel = heightModel; // important to the ownerLayout
+            }
+        }
+
+        return true;
+    },
+    
+    /**
+     * 
+     * The default weighting of docked items produces this arrangement:
+     * 
+     *      +--------------------------------------------+
+     *      |                    Top 1                   |
+     *      +--------------------------------------------+
+     *      |                    Top 2                   |
+     *      +-----+-----+--------------------+-----+-----+
+     *      |     |     |                    |     |     |
+     *      |     |     |                    |     |     |
+     *      |     |     |                    |  R  |  R  |
+     *      |  L  |  L  |                    |  I  |  I  |
+     *      |  E  |  E  |                    |  G  |  G  |
+     *      |  F  |  F  |                    |  H  |  H  |
+     *      |  T  |  T  |                    |  T  |  T  |
+     *      |     |     |                    |     |     |
+     *      |  2  |  1  |                    |  1  |  2  |
+     *      |     |     |                    |     |     |
+     *      |     |     |                    |     |     |
+     *      +-----+-----+--------------------+-----+-----+
+     *      |                  Bottom 1                  |
+     *      +--------------------------------------------+
+     *      |                  Bottom 2                  |
+     *      +--------------------------------------------+
+     * 
+     * So when we are shrinkWrapDock on the horizontal, the stretch size for top/bottom
+     * docked items is the final axis size. For the vertical axis, however, the stretch
+     *
+     */ 
+    invalidateAxes: function(ownerContext, horz, vert){
+        var before = this.beforeInvalidateShrinkWrapDock,
+            after = this.afterInvalidateShrinkWrapDock,
+            horzSize = horz.end - horz.begin,
+            vertSize = vert.initialSize,
+            invalidateHorz = horz.shrinkWrapDock && horz.maxChildSize < horzSize,
+            invalidateVert = vert.shrinkWrapDock && vert.maxChildSize < vertSize,
+            dockedItems, len, i, itemContext, itemSize, isHorz, axis, sizeProp;
+
+        if (invalidateHorz || invalidateVert) {
+            if (invalidateVert) {
+                // For vertical, we need to reset the initial position because they are affected
+                // by the horizontally docked items
+                vert.begin = vert.initialBegin;
+                vert.end = vert.begin + vert.initialSize;
+            }
+            dockedItems = ownerContext.dockedItems;
+            for (i = 0, len = dockedItems.length; i < len; ++i) {
+                itemContext = dockedItems[i];
+                isHorz = itemContext.horizontal;
+                axis = null;
+                if (invalidateHorz && isHorz) {
+                    sizeProp = horz.sizeProp;
+                    itemSize = horzSize;
+                    axis = horz;
+                } else if (invalidateVert && !isHorz) {
+                    sizeProp = vert.sizeProp;
+                    itemSize = vertSize;
+                    axis = vert;
+                }
+                
+                if (axis) {
+                    // subtract any margins
+                    itemSize -= itemContext.getMarginInfo()[sizeProp];
+                    if (itemSize !== itemContext.props[sizeProp]) {
+                        itemContext.invalidate({
+                            before: before,
+                            after: after,
+                            axis: axis,
+                            ownerContext: ownerContext,
+                            layout: this
+                        });
+                    }
+                }
+            }
+        }
+    },
+
+    /**
+     * Finishes the calculation by setting positions on the body and all of the items.
+     * @private
+     */
+    finishPositions: function (ownerContext, horz, vert) {
+        var dockedItems = ownerContext.dockedItems,
+            length = dockedItems.length,
+            deltaX = horz.delta,
+            deltaY = vert.delta,
+            index, itemContext;
+
+        for (index = 0; index < length; ++index) {
+            itemContext = dockedItems[index];
+
+            itemContext.setProp('x', deltaX + itemContext.dockedAt.x);
+            itemContext.setProp('y', deltaY + itemContext.dockedAt.y);
+        }
+    },
+
+    finishedLayout: function(ownerContext) {
+        var me = this,
+            target = ownerContext.target;
+
+        me.callParent(arguments);
+
+        if (!ownerContext.animatePolicy) {
+            if (ownerContext.isCollapsingOrExpanding === 1) {
+                target.afterCollapse(false);
+            } else if (ownerContext.isCollapsingOrExpanding === 2) {
+                target.afterExpand(false);
+            }
+        }
+    },
+
+    getAnimatePolicy: function(ownerContext) {
+        var me = this,
+            lastCollapsedState, policy;
+
+        if (ownerContext.isCollapsingOrExpanding == 1) {
+            lastCollapsedState = me.lastCollapsedState;
+        } else if (ownerContext.isCollapsingOrExpanding == 2) {
+            lastCollapsedState = ownerContext.lastCollapsedState;
+        }
+
+        if (lastCollapsedState == 'left' || lastCollapsedState == 'right') {
+            policy = me.horizontalCollapsePolicy;
+        } else if (lastCollapsedState == 'top' || lastCollapsedState == 'bottom') {
+            policy = me.verticalCollapsePolicy;
+        }
+
+        return policy;
+    },
+
+    /**
+     * Retrieve an ordered and/or filtered array of all docked Components.
+     * @param {String} [order='render'] The desired ordering of the items ('render' or 'visual').
+     * @param {Boolean} [beforeBody] An optional flag to limit the set of items to only those
+     *  before the body (true) or after the body (false). All components are returned by
+     *  default.
+     * @return {Ext.Component[]} An array of components.
+     * @protected
+     */
+    getDockedItems: function(order, beforeBody) {
+        var me = this,
+            renderedOnly = (order === 'visual'),
+            all = renderedOnly ? Ext.ComponentQuery.query('[rendered]', me.owner.dockedItems.items) : me.owner.dockedItems.items,
+            sort = all && all.length && order !== false,
+            renderOrder,
+            dock, dockedItems, i, isBefore, length;
+
+        if (beforeBody == null) {
+            dockedItems = sort && !renderedOnly ? all.slice() : all;
+        } else {
+            dockedItems = [];
+
+            for (i = 0, length = all.length; i < length; ++i) {
+                dock = all[i].dock;
+                isBefore = (dock == 'top' || dock == 'left');
+                if (beforeBody ? isBefore : !isBefore) {
+                    dockedItems.push(all[i]);
+                }
+            }
+
+            sort = sort && dockedItems.length;
+        }
+
+        if (sort) {
+            renderOrder = (order = order || 'render') == 'render';
+            Ext.Array.sort(dockedItems, function(a, b) {
+                var aw,
+                    bw;
+
+                // If the two items are on opposite sides of the body, they must not be sorted by any weight value:
+                // For rendering purposes, left/top *always* sorts before right/bottom
+                if (renderOrder && ((aw = me.owner.dockOrder[a.dock]) !== (bw = me.owner.dockOrder[b.dock]))) {
+
+                    // The two dockOrder values cancel out when two items are on opposite sides.
+                    if (!(aw + bw)) {
+                        return aw - bw;
+                    }
+                }
+
+                aw = me.getItemWeight(a, order);
+                bw = me.getItemWeight(b, order);
+                if ((aw !== undefined) && (bw !== undefined)) {
+                    return aw - bw;
+                }
+                return 0;
+            });
+        }
+
+        return dockedItems || [];
+    },
+
+    getItemWeight: function (item, order) {
+        var weight = item.weight || this.owner.defaultDockWeights[item.dock];
+        return weight[order] || weight;
+    },
+
+    /**
+     * @protected
+     * Returns an array containing all the **visible** docked items inside this layout's owner Panel
+     * @return {Array} An array containing all the **visible** docked items of the Panel
+     */
+    getLayoutItems : function() {
+        var me = this,
+            items,
+            itemCount,
+            item,
+            i,
+            result;
+
+        if (me.owner.collapsed) {
+            result = me.owner.getCollapsedDockedItems();
+        } else {
+            items = me.getDockedItems('visual');
+            itemCount = items.length;
+            result = [];
+            for (i = 0; i < itemCount; i++) {
+                item = items[i];
+                if (!item.hidden) {
+                    result.push(item);
+                }
+            }
+        }
+        return result;
+    },
+
+    // Content size includes padding but not borders, so subtract them off
+    measureContentWidth: function (ownerContext) {
+        var bodyContext = ownerContext.bodyContext;
+        return bodyContext.el.getWidth() - bodyContext.getBorderInfo().width;
+    },
+
+    measureContentHeight: function (ownerContext) {
+        var bodyContext = ownerContext.bodyContext;
+        return bodyContext.el.getHeight() - bodyContext.getBorderInfo().height;
+    },
+    
+    redoLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner;
+        
+        // If we are collapsing...
+        if (ownerContext.isCollapsingOrExpanding == 1) {
+            if (owner.reExpander) {
+                owner.reExpander.el.show();
+            }
+            // Add the collapsed class now, so that collapsed CSS rules are applied before measurements are taken by the layout.
+            owner.addClsWithUI(owner.collapsedCls);
+            ownerContext.redo(true);
+        } else if (ownerContext.isCollapsingOrExpanding == 2) {
+            // Remove the collapsed class now, before layout calculations are done.
+            owner.removeClsWithUI(owner.collapsedCls);
+            ownerContext.bodyContext.redo();
+        } 
+    },
+
+    // @private override inherited.
+    // We need to render in the correct order, top/left before bottom/right
+    renderChildren: function() {
+        var me = this,
+            items = me.getDockedItems(),
+            target = me.getRenderTarget();
+
+        me.handleItemBorders();
+
+        me.renderItems(items, target);
+    },
+
+    /**
+     * @protected
+     * Render the top and left docked items before any existing DOM nodes in our render target,
+     * and then render the right and bottom docked items after. This is important, for such things
+     * as tab stops and ARIA readers, that the DOM nodes are in a meaningful order.
+     * Our collection of docked items will already be ordered via Panel.getDockedItems().
+     */
+    renderItems: function(items, target) {
+        var me = this,
+            dockedItemCount = items.length,
+            itemIndex = 0,
+            correctPosition = 0,
+            staticNodeCount = 0,
+            targetNodes = me.getRenderTarget().dom.childNodes,
+            targetChildCount = targetNodes.length,
+            i, j, targetChildNode, item;
+
+        // Calculate the number of DOM nodes in our target that are not our docked items
+        for (i = 0, j = 0; i < targetChildCount; i++) {
+            targetChildNode = targetNodes[i];
+            if (Ext.fly(targetChildNode).hasCls(Ext.baseCSSPrefix + 'resizable-handle')) {
+                break;
+            }
+            for (j = 0; j < dockedItemCount; j++) {
+                item = items[j];
+                if (item.rendered && item.el.dom === targetChildNode) {
+                    break;
+                }
+            }
+            // Walked off the end of the docked items without matching the found child node;
+            // Then it's a static node.
+            if (j === dockedItemCount) {
+                staticNodeCount++;
+            }
+        }
+
+        // Now we go through our docked items and render/move them
+        for (; itemIndex < dockedItemCount; itemIndex++, correctPosition++) {
+            item = items[itemIndex];
+
+            // If we're now at the first right/bottom docked item, we jump over the body element.
+            //
+            // TODO: This is affected if users provide custom weight values to their
+            // docked items, which puts it out of (t,l,r,b) order. Avoiding a second
+            // sort operation here, for now, in the name of performance. getDockedItems()
+            // needs the sort operation not just for this layout-time rendering, but
+            // also for getRefItems() to return a logical ordering (FocusManager, CQ, et al).
+            if (itemIndex === correctPosition && (item.dock === 'right' || item.dock === 'bottom')) {
+                correctPosition += staticNodeCount;
+            }
+
+            // Same logic as Layout.renderItems()
+            if (item && !item.rendered) {
+                me.renderItem(item, target, correctPosition);
+            }
+            else if (!me.isValidParent(item, target, correctPosition)) {
+                me.moveItem(item, target, correctPosition);
+            }
+        }
+    },
+
+    undoLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner;
+        
+        // If we are collapsing...
+        if (ownerContext.isCollapsingOrExpanding == 1) {
+
+            // We do not want to see the re-expander header until the final collapse is complete
+            if (owner.reExpander) {
+                owner.reExpander.el.hide();
+            }
+            // Add the collapsed class now, so that collapsed CSS rules are applied before measurements are taken by the layout.
+            owner.removeClsWithUI(owner.collapsedCls);
+            ownerContext.undo(true);
+        } else if (ownerContext.isCollapsingOrExpanding == 2) {
+            // Remove the collapsed class now, before layout calculations are done.
+            owner.addClsWithUI(owner.collapsedCls);
+            ownerContext.bodyContext.undo();
+        } 
+    },
+
+    sizePolicy: {
+        nostretch: {
+            setsWidth: 0,
+            setsHeight: 0
+        },
+
+        horz: { // item goes horizontally (top or bottom docked)
+            shrinkWrap: {
+                // This is how we manage the width of a top/bottom docked item when its
+                // shrinkWrapWidth and ours need to be maxed (calculatedFromShrinkWrap)
+                setsWidth: 1,
+                setsHeight: 0,
+                readsWidth: 1
+            },
+            stretch: {
+                setsWidth: 1,
+                setsHeight: 0
+            }
+        },
+
+        vert: { // item goes vertically (left or right docked)
+            shrinkWrap: {
+                setsWidth: 0,
+                setsHeight: 1,
+                readsHeight: 1
+            },
+            stretch: {
+                setsWidth: 0,
+                setsHeight: 1
+            }
+        },
+
+        stretchV: {
+            setsWidth: 0,
+            setsHeight: 1
+        },
+
+        // Circular dependency with partial auto-sized panels:
+        //
+        // If we have an autoHeight docked item being stretched horizontally (top/bottom),
+        // that stretching will determine its width and its width must be set before its
+        // autoHeight can be determined. If that item is docked in an autoWidth panel, the
+        // body will need its height set before it can determine its width, but the height
+        // of the docked item is needed to subtract from the panel height in order to set
+        // the body height.
+        //
+        // This same pattern occurs with autoHeight panels with autoWidth docked items on
+        // left or right. If the panel is fully auto or fully fixed, these problems don't
+        // come up because there is no dependency between the dimensions.
+        //
+        // Cutting the Gordian Knot: In these cases, we have to allow something to measure
+        // itself without full context. This is OK as long as the managed dimension doesn't
+        // effect the auto-dimension, which is often the case for things like toolbars. The
+        // managed dimension only effects overflow handlers and such and does not change the
+        // auto-dimension. To encourage the item to measure itself without waiting for the
+        // managed dimension, we have to tell it that the layout will also be reading that
+        // dimension. This is similar to how stretchmax works.
+
+        autoStretchH: {
+            readsWidth: 1,
+            setsWidth: 1,
+            setsHeight: 0
+        },
+        autoStretchV: {
+            readsHeight: 1,
+            setsWidth: 0,
+            setsHeight: 1
+        }
+    },
+
+    getItemSizePolicy: function (item, ownerSizeModel) {
+        var me = this,
+            policy = me.sizePolicy,
+            shrinkWrapDock = me.owner.shrinkWrapDock,
+            dock, vertical;
+
+        if (item.stretch === false) {
+            return policy.nostretch;
+        }
+
+        dock = item.dock;
+        vertical = (dock == 'left' || dock == 'right');
+
+        shrinkWrapDock = shrinkWrapDock === true ? 3 : (shrinkWrapDock || 0);
+        if (vertical) {
+            policy = policy.vert;
+            shrinkWrapDock = shrinkWrapDock & 1;
+        } else {
+            policy = policy.horz;
+            shrinkWrapDock = shrinkWrapDock & 2;
+        }
+
+        if (shrinkWrapDock) {
+            // Getting the size model is expensive, so only do so if we really need it
+            if (!ownerSizeModel) {
+                ownerSizeModel = me.owner.getSizeModel();
+            }
+            if (ownerSizeModel[vertical ? 'height' : 'width'].shrinkWrap) {
+                return policy.shrinkWrap;
+            }
+        }
+
+        return policy.stretch;
+    },
+
+    /**
+     * @protected
+     * We are overriding the Ext.layout.Layout configureItem method to also add a class that
+     * indicates the position of the docked item. We use the itemCls (x-docked) as a prefix.
+     * An example of a class added to a dock: right item is x-docked-right
+     * @param {Ext.Component} item The item we are configuring
+     */
+    configureItem : function(item, pos) {
+        this.callParent(arguments);
+
+        item.addCls(Ext.baseCSSPrefix + 'docked');
+        item.addClsWithUI(this.getDockCls(item.dock));
+    },
+
+    /**
+     * Get's the css class name for a given dock position.
+     * @param {String} dock `top`, `right`, `bottom`, or `left`
+     * @return {String}
+     * @private 
+     */
+    getDockCls: function(dock) {
+        return 'docked-' + dock;
+    },
+
+    afterRemove : function(item) {
+        this.callParent(arguments);
+        if (this.itemCls) {
+            item.el.removeCls(this.itemCls + '-' + item.dock);
+        }
+        var dom = item.el.dom;
+
+        if (!item.destroying && dom) {
+            dom.parentNode.removeChild(dom);
+        }
+        this.childrenChanged = true;
+    },
+
+    /**
+     * This object is indexed by a component's `baseCls` to yield another object which
+     * is then indexed by the component's `ui` to produce an array of CSS class names.
+     * This array is indexed in the same manner as the `noBorderClassTable` and indicates
+     * the a particular edge of a docked item or the body element is actually "collapsed"
+     * with the component's outer border.
+     * @private
+     */
+    borderCollapseMap: {
+        /*
+        'x-panel': {
+            'default': []
+        }
+        */
+    },
+
+    /**
+     * Returns the array of class names to add to a docked item or body element when for
+     * the edges that should collapse with the outer component border. Basically, the
+     * panel's outer border must look visually like a contiguous border but may need to
+     * be realized by using the border of docked items and/or the body. This class name
+     * allows the border color and width to be controlled accordingly and distinctly from
+     * the border of the docked item or body element when it is not having its border
+     * collapsed.
+     * @private
+     */
+    getBorderCollapseTable: function () {
+        var me = this,
+            map = me.borderCollapseMap,
+            owner = me.owner,
+            baseCls = owner.baseCls,
+            ui = owner.ui,
+            table;
+
+        map = map[baseCls] || (map[baseCls] = {});
+        table = map[ui];
+
+        if (!table) {
+            baseCls += '-' + ui + '-outer-border-';
+            map[ui] = table = [
+                0,                  // TRBL
+                baseCls + 'l',      // 0001 = 1
+                baseCls + 'b',      // 0010 = 2
+                baseCls + 'bl',     // 0011 = 3
+                baseCls + 'r',      // 0100 = 4
+                baseCls + 'rl',     // 0101 = 5
+                baseCls + 'rb',     // 0110 = 6
+                baseCls + 'rbl',    // 0111 = 7
+                baseCls + 't',      // 1000 = 8
+                baseCls + 'tl',     // 1001 = 9
+                baseCls + 'tb',     // 1010 = 10
+                baseCls + 'tbl',    // 1011 = 11
+                baseCls + 'tr',     // 1100 = 12
+                baseCls + 'trl',    // 1101 = 13
+                baseCls + 'trb',    // 1110 = 14
+                baseCls + 'trbl'    // 1111 = 15
+            ];
+        }
+
+        return table;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides a common registry of all menus on a page.
+ * @singleton
+ */
+Ext.define('Ext.menu.Manager', {
+    singleton: true,
+               
+                                   
+                         
+      
+    alternateClassName: 'Ext.menu.MenuMgr',
+
+                            
+    
+    menuSelector: '.' + Ext.baseCSSPrefix + 'menu',
+
+    menus: {},
+    groups: {},
+    attached: false,
+    lastShow: new Date(),
+
+    init: function() {
+        var me = this;
+        
+        me.active = new Ext.util.MixedCollection();
+        Ext.getDoc().addKeyListener(27, function() {
+            if (me.active.length > 0) {
+                me.hideAll();
+            }
+        }, me);
+    },
+
+    /**
+     * Hides all menus that are currently visible
+     * @return {Boolean} success True if any active menus were hidden.
+     */
+    hideAll: function() {
+        var active = this.active,
+            menus, m, mLen;
+
+        if (active && active.length > 0) {
+            menus = Ext.Array.slice(active.items);
+            mLen  = menus.length;
+
+            for (m = 0; m < mLen; m++) {
+                menus[m].hide();
+            }
+
+            return true;
+        }
+        return false;
+    },
+
+    onHide: function(m) {
+        var me = this,
+            active = me.active;
+        active.remove(m);
+        if (active.length < 1) {
+            Ext.getDoc().un('mousedown', me.onMouseDown, me);
+            me.attached = false;
+        }
+    },
+
+    onShow: function(m) {
+        var me = this,
+            active   = me.active,
+            attached = me.attached;
+
+        me.lastShow = new Date();
+        active.add(m);
+        if (!attached) {
+            Ext.getDoc().on('mousedown', me.onMouseDown, me, {
+                // On IE we have issues with the menu stealing focus at certain points
+                // during the head, so give it a short buffer
+                buffer: Ext.isIE9m ? 10 : undefined
+            });
+            me.attached = true;
+        }
+        m.toFront();
+    },
+
+    onBeforeHide: function(m) {
+        if (m.activeChild) {
+            m.activeChild.hide();
+        }
+        if (m.autoHideTimer) {
+            clearTimeout(m.autoHideTimer);
+            delete m.autoHideTimer;
+        }
+    },
+
+    onBeforeShow: function(m) {
+        var active = this.active,
+            parentMenu = m.parentMenu;
+            
+        active.remove(m);
+        if (!parentMenu && !m.allowOtherMenus) {
+            this.hideAll();
+        }
+        else if (parentMenu && parentMenu.activeChild && m != parentMenu.activeChild) {
+            parentMenu.activeChild.hide();
+        }
+    },
+
+    // @private
+    onMouseDown: function(e) {
+        var me = this,
+            active = me.active,
+            lastShow = me.lastShow,
+            doHide = true;
+
+        if (Ext.Date.getElapsed(lastShow) > 50 && active.length > 0 && !e.getTarget(me.menuSelector)) {
+            // Because we use a buffer in IE, the target may have been removed from the
+            // DOM by the time we get here, so the selector will never find the menu. In this
+            // case, it's safer to not hide than menus than to do so
+            if (Ext.isIE9m && !Ext.getDoc().contains(e.target)) {
+                doHide = false;
+            }
+            if (doHide) {
+                me.hideAll();
+            }
+        }
+    },
+
+    // @private
+    register: function(menu) {
+        var me = this;
+
+        if (!me.active) {
+            me.init();
+        }
+
+        if (menu.floating) {
+            me.menus[menu.id] = menu;
+            menu.on({
+                beforehide: me.onBeforeHide,
+                hide: me.onHide,
+                beforeshow: me.onBeforeShow,
+                show: me.onShow,
+                scope: me
+            });
+        }
+    },
+
+    /**
+     * Returns a {@link Ext.menu.Menu} object
+     * @param {String/Object} menu The string menu id, an existing menu object reference, or a Menu config that will
+     * be used to generate and return a new Menu this.
+     * @return {Ext.menu.Menu} The specified menu, or null if none are found
+     */
+    get: function(menu) {
+        var menus = this.menus;
+        
+        if (typeof menu == 'string') { // menu id
+            if (!menus) {  // not initialized, no menus to return
+                return null;
+            }
+            return menus[menu];
+        } else if (menu.isMenu) {  // menu instance
+            return menu;
+        } else if (Ext.isArray(menu)) { // array of menu items
+            return new Ext.menu.Menu({items:menu});
+        } else { // otherwise, must be a config
+            return Ext.ComponentManager.create(menu, 'menu');
+        }
+    },
+
+    // @private
+    unregister: function(menu) {
+        var me = this,
+            menus = me.menus,
+            active = me.active;
+
+        delete menus[menu.id];
+        active.remove(menu);
+        menu.un({
+            beforehide: me.onBeforeHide,
+            hide: me.onHide,
+            beforeshow: me.onBeforeShow,
+            show: me.onShow,
+            scope: me
+        });
+    },
+
+    // @private
+    registerCheckable: function(menuItem) {
+        var groups  = this.groups,
+            groupId = menuItem.group;
+
+        if (groupId) {
+            if (!groups[groupId]) {
+                groups[groupId] = [];
+            }
+
+            groups[groupId].push(menuItem);
+        }
+    },
+
+    // @private
+    unregisterCheckable: function(menuItem) {
+        var groups  = this.groups,
+            groupId = menuItem.group;
+
+        if (groupId) {
+            Ext.Array.remove(groups[groupId], menuItem);
+        }
+    },
+
+    onCheckChange: function(menuItem, state) {
+        var groups  = this.groups,
+            groupId = menuItem.group,
+            i       = 0,
+            group, ln, curr;
+
+        if (groupId && state) {
+            group = groups[groupId];
+            ln = group.length;
+            for (; i < ln; i++) {
+                curr = group[i];
+                if (curr != menuItem) {
+                    curr.setChecked(false);
+                }
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A wrapper class which can be applied to any element. Fires a "click" event while the
+ * mouse is pressed. The interval between firings may be specified in the config but
+ * defaults to 20 milliseconds.
+ *
+ * Optionally, a CSS class may be applied to the element during the time it is pressed.
+ */
+Ext.define('Ext.util.ClickRepeater', {
+    extend:  Ext.util.Observable ,
+
+    /**
+     * Creates new ClickRepeater.
+     * @param {String/HTMLElement/Ext.Element} el The element or its ID to listen on
+     * @param {Object} [config] Config object.
+     */
+    constructor : function(el, config){
+        var me = this;
+
+        me.el = Ext.get(el);
+        me.el.unselectable();
+
+        Ext.apply(me, config);
+
+        me.callParent();
+
+        me.addEvents(
+        /**
+         * @event mousedown
+         * Fires when the mouse button is depressed.
+         * @param {Ext.util.ClickRepeater} this
+         * @param {Ext.EventObject} e
+         */
+        "mousedown",
+        /**
+         * @event click
+         * Fires on a specified interval during the time the element is pressed.
+         * @param {Ext.util.ClickRepeater} this
+         * @param {Ext.EventObject} e
+         */
+        "click",
+        /**
+         * @event mouseup
+         * Fires when the mouse key is released.
+         * @param {Ext.util.ClickRepeater} this
+         * @param {Ext.EventObject} e
+         */
+        "mouseup"
+        );
+
+        if(!me.disabled){
+            me.disabled = true;
+            me.enable();
+        }
+
+        // allow inline handler
+        if(me.handler){
+            me.on("click", me.handler,  me.scope || me);
+        }
+    },
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} el
+     * The element to act as a button.
+     */
+
+    /**
+     * @cfg {String} pressedCls
+     * A CSS class name to be applied to the element while pressed.
+     */
+
+    /**
+     * @cfg {Boolean} accelerate
+     * True if autorepeating should start slowly and accelerate.
+     * "interval" and "delay" are ignored.
+     */
+
+    /**
+     * @cfg {Number} interval
+     * The interval between firings of the "click" event (in milliseconds).
+     */
+    interval : 20,
+
+    /**
+     * @cfg {Number} delay
+     * The initial delay before the repeating event begins firing.
+     * Similar to an autorepeat key delay.
+     */
+    delay: 250,
+
+    /**
+     * @cfg {Boolean} preventDefault
+     * True to prevent the default click event
+     */
+    preventDefault : true,
+
+    /**
+     * @cfg {Boolean} stopDefault
+     * True to stop the default click event
+     */
+    stopDefault : false,
+
+    timer : 0,
+
+    /**
+     * Enables the repeater and allows events to fire.
+     */
+    enable: function(){
+        if(this.disabled){
+            this.el.on('mousedown', this.handleMouseDown, this);
+            // IE versions will detect clicks as in sequence as dblclicks
+            // if they happen in quick succession
+            if (Ext.isIE && !(Ext.isIE10p || (Ext.isStrict && Ext.isIE9))){
+                this.el.on('dblclick', this.handleDblClick, this);
+            }
+            if(this.preventDefault || this.stopDefault){
+                this.el.on('click', this.eventOptions, this);
+            }
+        }
+        this.disabled = false;
+    },
+
+    /**
+     * Disables the repeater and stops events from firing.
+     */
+    disable: function(/* private */ force){
+        if(force || !this.disabled){
+            clearTimeout(this.timer);
+            if(this.pressedCls){
+                this.el.removeCls(this.pressedCls);
+            }
+            Ext.getDoc().un('mouseup', this.handleMouseUp, this);
+            this.el.removeAllListeners();
+        }
+        this.disabled = true;
+    },
+
+    /**
+     * Convenience function for setting disabled/enabled by boolean.
+     * @param {Boolean} disabled
+     */
+    setDisabled: function(disabled){
+        this[disabled ? 'disable' : 'enable']();
+    },
+
+    eventOptions: function(e){
+        if(this.preventDefault){
+            e.preventDefault();
+        }
+        if(this.stopDefault){
+            e.stopEvent();
+        }
+    },
+
+    // @private
+    destroy : function() {
+        this.disable(true);
+        Ext.destroy(this.el);
+        this.clearListeners();
+    },
+
+    handleDblClick : function(e){
+        clearTimeout(this.timer);
+        this.el.blur();
+
+        this.fireEvent("mousedown", this, e);
+        this.fireEvent("click", this, e);
+    },
+
+    // @private
+    handleMouseDown : function(e){
+        clearTimeout(this.timer);
+        this.el.blur();
+        if(this.pressedCls){
+            this.el.addCls(this.pressedCls);
+        }
+        this.mousedownTime = new Date();
+
+        Ext.getDoc().on("mouseup", this.handleMouseUp, this);
+        this.el.on("mouseout", this.handleMouseOut, this);
+
+        this.fireEvent("mousedown", this, e);
+        this.fireEvent("click", this, e);
+
+        // Do not honor delay or interval if acceleration wanted.
+        if (this.accelerate) {
+            this.delay = 400;
+        }
+
+        // Re-wrap the event object in a non-shared object, so it doesn't lose its context if
+        // the global shared EventObject gets a new Event put into it before the timer fires.
+        e = new Ext.EventObjectImpl(e);
+
+        this.timer =  Ext.defer(this.click, this.delay || this.interval, this, [e]);
+    },
+
+    // @private
+    click : function(e){
+        this.fireEvent("click", this, e);
+        this.timer =  Ext.defer(this.click, this.accelerate ?
+            this.easeOutExpo(Ext.Date.getElapsed(this.mousedownTime),
+                400,
+                -390,
+                12000) :
+            this.interval, this, [e]);
+    },
+
+    easeOutExpo : function (t, b, c, d) {
+        return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+    },
+
+    // @private
+    handleMouseOut : function(){
+        clearTimeout(this.timer);
+        if(this.pressedCls){
+            this.el.removeCls(this.pressedCls);
+        }
+        this.el.on("mouseover", this.handleMouseReturn, this);
+    },
+
+    // @private
+    handleMouseReturn : function(){
+        this.el.un("mouseover", this.handleMouseReturn, this);
+        if(this.pressedCls){
+            this.el.addCls(this.pressedCls);
+        }
+        this.click();
+    },
+
+    // @private
+    handleMouseUp : function(e){
+        clearTimeout(this.timer);
+        this.el.un("mouseover", this.handleMouseReturn, this);
+        this.el.un("mouseout", this.handleMouseOut, this);
+        Ext.getDoc().un("mouseup", this.handleMouseUp, this);
+        if(this.pressedCls){
+            this.el.removeCls(this.pressedCls);
+        }
+        this.fireEvent("mouseup", this, e);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Component layout for buttons
+ * @private
+ */
+Ext.define('Ext.layout.component.Button', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.button'],
+
+    extend:  Ext.layout.component.Auto ,
+
+    /* End Definitions */
+
+    type: 'button',
+
+    htmlRE: /<.*>/,
+
+    beginLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            text = owner.text;
+
+        me.callParent(arguments);
+        ownerContext.btnWrapContext = ownerContext.getEl('btnWrap');
+        ownerContext.btnElContext = ownerContext.getEl('btnEl');
+        ownerContext.btnInnerElContext = ownerContext.getEl('btnInnerEl');
+        ownerContext.btnIconElContext = ownerContext.getEl('btnIconEl');
+
+        if (text && me.htmlRE.test(text)) {
+            ownerContext.isHtmlText = true;
+            // If the text contains HTML tag(s) we need to account for the possibility
+            // of multi-line-text. We have to remove the default line-height set by the
+            // stylesheet so that we can allow the browser to measure the natural
+            // height of the html content.
+            owner.btnInnerEl.setStyle('line-height', 'normal');
+            owner.btnInnerEl.setStyle('padding-top', '');
+        }
+    },
+
+    beginLayoutCycle: function(ownerContext) {
+        var owner = this.owner,
+            lastWidthModel = this.lastWidthModel;
+
+        this.callParent(arguments);
+
+        if (lastWidthModel && !this.lastWidthModel.shrinkWrap &&
+            ownerContext.widthModel.shrinkWrap) {
+            // clear any heights we set last time around if needed
+            owner.btnWrap.setStyle('height', '');
+            owner.btnEl.setStyle('height', '');
+            owner.btnInnerEl.setStyle('line-height', '');
+        }
+    },
+
+    calculate: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            btnElContext = ownerContext.btnElContext,
+            btnInnerElContext = ownerContext.btnInnerElContext,
+            btnWrapContext = ownerContext.btnWrapContext,
+            mmax = Math.max,
+            ownerHeight, contentHeight, btnElHeight, innerElHeight;
+
+        me.callParent(arguments);
+
+        if (ownerContext.heightModel.shrinkWrap) {
+            // Buttons that have a shrink-wrapped height usually do not need any layout
+            // adjustments beause their layout is handled in CSS. An exception is made
+            // for buttons that contain html tags in their "text".  These buttons need
+            // special handling to vertically center the inner element inside the button.
+
+            // measure the btnEl (the anchor element) to determine the available
+            // height for centering the inner element.
+            btnElHeight = owner.btnEl.getHeight();
+            if (ownerContext.isHtmlText) {
+                me.centerInnerEl(
+                    ownerContext,
+                    btnElHeight
+                );
+                me.ieCenterIcon(ownerContext, btnElHeight);
+            }
+        } else {
+            // Buttons with configured or calculated heights may need to stretch their
+            // inner elements to fit.
+            ownerHeight = ownerContext.getProp('height');
+
+            // If height is 0, skip out all this
+            if (ownerHeight) {
+                // contentHeight is the total available height inside the button's padding
+                // and framing
+                contentHeight = ownerHeight - ownerContext.getFrameInfo().height - ownerContext.getPaddingInfo().height;
+
+                // The btnElHeight is the total available height to be shared by the button's
+                // icon and text.  For standard buttons this is the same as the contentHeight
+                // but must be adjusted for arrow height if the button has an arrow.
+                btnElHeight = contentHeight;
+                if ((owner.menu || owner.split) && owner.arrowAlign === 'bottom') {
+                    // If the button has an arrow, subtract its size from the btnElHeight
+                    // padding to account for the possibility of an arrow
+                    btnElHeight -= btnWrapContext.getPaddingInfo().bottom;
+                }
+
+                // The innerElHeight is the total vertical space available for vertically
+                // centering the button text.  By default this is the same as btnElHeight
+                // but it must be adjusted by the icon size if the button has a top
+                // or bottom icon.
+                innerElHeight = btnElHeight;
+                if ((owner.icon || owner.iconCls || owner.glyph) &&
+                    (owner.iconAlign === 'top' || owner.iconAlign === 'bottom')) {
+                    innerElHeight -= btnInnerElContext.getPaddingInfo().height;
+                }
+
+                btnWrapContext.setProp('height', mmax(0, contentHeight));
+                btnElContext.setProp('height', mmax(0, btnElHeight));
+                // ensure the button's text is vertically centered
+                if (ownerContext.isHtmlText) {
+                    // if the button text contains html it must be vertically centered
+                    // by measuring it and adding top padding.
+                    me.centerInnerEl(ownerContext, btnElHeight);
+                } else {
+                    // if the button text does not contain html we can just center it
+                    // using line-height to avoid the extra measurement that happens
+                    // inside of centerInnerEl() since multi-line text is not a possiblity
+                    btnInnerElContext.setProp('line-height', mmax(0, innerElHeight) + 'px');
+                }
+                me.ieCenterIcon(ownerContext, btnElHeight);
+            } else if (ownerHeight !== 0) {
+                // Only fail if height was undefined, since it could be 0
+                me.done = false;
+            }
+        }
+    },
+
+    centerInnerEl: function(ownerContext, btnElHeight) {
+        var me = this,
+            btnInnerElContext = ownerContext.btnInnerElContext,
+            innerElHeight = me.owner.btnInnerEl.getHeight();
+
+        if (ownerContext.heightModel.shrinkWrap && (btnElHeight < innerElHeight)) {
+            // if the natural height of the html content is greater than the height
+            // of the button element (the anchor el), then expand the button element
+            // to fit
+            ownerContext.btnElContext.setHeight(innerElHeight);
+        } else if (btnElHeight > innerElHeight) {
+            // if the natural height of the html content is smaller than the height
+            // of the button element then we need to pad the top of the btnInnerEl
+            // so that it is vertically centered within the btnEl
+            btnInnerElContext.setProp(
+                'padding-top', 
+                Math.round((btnElHeight - innerElHeight) / 2) +
+                    // if the inner element already has top padding, as is the case
+                    // when the button has a top-aligned icon, then add the existing
+                    // padding to the padding adjustment.
+                    btnInnerElContext.getPaddingInfo().top 
+            );
+        }
+    },
+
+    ieCenterIcon: function(ownerContext, btnElHeight) {
+        var iconAlign = this.owner.iconAlign;
+
+        if ((Ext.isIEQuirks || Ext.isIE6) &&
+            (iconAlign === 'left' || iconAlign === 'right')) {
+            // Normally right/left aligned icon elements are vertically stretched using
+            // top:0, bottom:0, and the icon is vertically centered inside this element
+            // using background-position.  This technique for vertical centering does not
+            // work in IE6 and IE quirks, so the stylesheet sets a fixed height on the
+            // icon element in these browsers.  If the layout changes the height of the
+            // button the height of the icon element must also be modified.
+            ownerContext.btnIconElContext.setHeight(btnElHeight);
+        }
+    },
+
+    publishInnerWidth: function(ownerContext, width) {
+        if (this.owner.getFrameInfo().table) {
+            // if the framing template uses a table, we need to set the width of the
+            // inner element.  Otherwise long text may stretch the element past its
+            // allowable width in IE.
+            ownerContext.btnInnerElContext.setWidth(
+                width -
+                // the inner el must be sized inside the owner's framing and padding
+                ownerContext.getFrameInfo().width - ownerContext.getPaddingInfo().width -
+                // There may also be padding on the btnWrap el, e.g. tab with close icon
+                // or button with arrow. This reduces the inner el size even further.
+                ownerContext.btnWrapContext.getPaddingInfo().width
+            );
+        }
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides precise pixel measurements for blocks of text so that you can determine exactly how high and
+ * wide, in pixels, a given block of text will be. Note that when measuring text, it should be plain text and
+ * should not contain any HTML, otherwise it may not be measured correctly.
+ *
+ * The measurement works by copying the relevant CSS styles that can affect the font related display, 
+ * then checking the size of an element that is auto-sized. Note that if the text is multi-lined, you must 
+ * provide a **fixed width** when doing the measurement.
+ *
+ * If multiple measurements are being done on the same element, you create a new instance to initialize 
+ * to avoid the overhead of copying the styles to the element repeatedly.
+ */
+Ext.define('Ext.util.TextMetrics', {
+    statics: {
+        shared: null,
+        /**
+         * Measures the size of the specified text
+         * @param {String/HTMLElement} el The element, dom node or id from which to copy existing CSS styles
+         * that can affect the size of the rendered text
+         * @param {String} text The text to measure
+         * @param {Number} fixedWidth (optional) If the text will be multiline, you have to set a fixed width
+         * in order to accurately measure the text height
+         * @return {Object} An object containing the text's size `{width: (width), height: (height)}`
+         * @static
+         */
+        measure: function(el, text, fixedWidth){
+            var me = this,
+                shared = me.shared;
+            
+            if(!shared){
+                shared = me.shared = new me(el, fixedWidth);
+            }
+            shared.bind(el);
+            shared.setFixedWidth(fixedWidth || 'auto');
+            return shared.getSize(text);
+        },
+        
+        /**
+         * Destroy the TextMetrics instance created by {@link #measure}.
+         * @static
+         */
+        destroy: function(){
+            var me = this;
+            Ext.destroy(me.shared);
+            me.shared = null;
+        }
+    },
+    
+    /**
+     * Creates new TextMetrics.
+     * @param {String/HTMLElement/Ext.Element} bindTo The element or its ID to bind to.
+     * @param {Number} [fixedWidth] A fixed width to apply to the measuring element.
+     */
+    constructor: function(bindTo, fixedWidth){
+        var me = this,
+            measure = Ext.getBody().createChild({
+                cls: Ext.baseCSSPrefix + 'textmetrics'
+            });
+            
+        me.measure = measure; 
+        if (bindTo) {
+            me.bind(bindTo);
+        }
+        
+        measure.position('absolute');
+        measure.setLocalXY(-1000, -1000);
+        measure.hide();
+
+        if (fixedWidth) {
+           measure.setWidth(fixedWidth);
+        }
+    },
+    
+    /**
+     * Returns the size of the specified text based on the internal element's style and width properties
+     * @param {String} text The text to measure
+     * @return {Object} An object containing the text's size `{width: (width), height: (height)}`
+     */
+    getSize: function(text){
+        var measure = this.measure,
+            size;
+        
+        measure.update(text);
+        size = measure.getSize();
+        measure.update('');
+        return size;
+    },
+    
+    /**
+     * Binds this TextMetrics instance to a new element
+     * @param {String/HTMLElement/Ext.Element} el The element or its ID.
+     */
+    bind: function(el){
+        var me = this;
+        
+        me.el = Ext.get(el);
+        me.measure.setStyle(
+            me.el.getStyles('font-size','font-style', 'font-weight', 'font-family','line-height', 'text-transform', 'letter-spacing')
+        );
+    },
+    
+    /**
+     * Sets a fixed width on the internal measurement element.  If the text will be multiline, you have
+     * to set a fixed width in order to accurately measure the text height.
+     * @param {Number} width The width to set on the element
+     */
+     setFixedWidth : function(width){
+         this.measure.setWidth(width);
+     },
+     
+     /**
+      * Returns the measured width of the specified text
+      * @param {String} text The text to measure
+      * @return {Number} width The width in pixels
+      */
+     getWidth : function(text){
+         this.measure.dom.style.width = 'auto';
+         return this.getSize(text).width;
+     },
+     
+     /**
+      * Returns the measured height of the specified text
+      * @param {String} text The text to measure
+      * @return {Number} height The height in pixels
+      */
+     getHeight : function(text){
+         return this.getSize(text).height;
+     },
+     
+     /**
+      * Destroy this instance
+      */
+     destroy: function(){
+         var me = this;
+         me.measure.remove();
+         delete me.el;
+         delete me.measure;
+     }
+}, function(){
+    Ext.Element.addMethods({
+        /**
+         * Returns the width in pixels of the passed text, or the width of the text in this Element.
+         * @param {String} text The text to measure. Defaults to the innerHTML of the element.
+         * @param {Number} [min] The minumum value to return.
+         * @param {Number} [max] The maximum value to return.
+         * @return {Number} The text width in pixels.
+         * @member Ext.dom.Element
+         */
+        getTextWidth : function(text, min, max){
+            return Ext.Number.constrain(Ext.util.TextMetrics.measure(this.dom, Ext.value(text, this.dom.innerHTML, true)).width, min || 0, max || 1000000);
+        }
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Robert Dougan <rob at sencha.com>
+ *
+ * Create simple buttons with this component. Customisations include {@link #iconAlign aligned}
+ * {@link #iconCls icons}, {@link #cfg-menu dropdown menus}, {@link #tooltip tooltips}
+ * and {@link #scale sizing options}. Specify a {@link #handler handler} to run code when
+ * a user clicks the button, or use {@link #listeners listeners} for other events such as
+ * {@link #mouseover mouseover}. Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.Button', {
+ *         text: 'Click me',
+ *         renderTo: Ext.getBody(),
+ *         handler: function() {
+ *             alert('You clicked the button!');
+ *         }
+ *     });
+ *
+ * The {@link #handler} configuration can also be updated dynamically using the {@link #setHandler}
+ * method.  Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.Button', {
+ *         text    : 'Dynamic Handler Button',
+ *         renderTo: Ext.getBody(),
+ *         handler : function() {
+ *             // this button will spit out a different number every time you click it.
+ *             // so firstly we must check if that number is already set:
+ *             if (this.clickCount) {
+ *                 // looks like the property is already set, so lets just add 1 to that number and alert the user
+ *                 this.clickCount++;
+ *                 alert('You have clicked the button "' + this.clickCount + '" times.\n\nTry clicking it again..');
+ *             } else {
+ *                 // if the clickCount property is not set, we will set it and alert the user
+ *                 this.clickCount = 1;
+ *                 alert('You just clicked the button for the first time!\n\nTry pressing it again..');
+ *             }
+ *         }
+ *     });
+ *
+ * A button within a container:
+ *
+ *     @example
+ *     Ext.create('Ext.Container', {
+ *         renderTo: Ext.getBody(),
+ *         items   : [
+ *             {
+ *                 xtype: 'button',
+ *                 text : 'My Button'
+ *             }
+ *         ]
+ *     });
+ *
+ * A useful option of Button is the {@link #scale} configuration. This configuration has three different options:
+ *
+ * - `'small'`
+ * - `'medium'`
+ * - `'large'`
+ *
+ * Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.Button', {
+ *         renderTo: document.body,
+ *         text    : 'Click me',
+ *         scale   : 'large'
+ *     });
+ *
+ * Buttons can also be toggled. To enable this, you simple set the {@link #enableToggle} property to `true`.
+ * Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.Button', {
+ *         renderTo: Ext.getBody(),
+ *         text: 'Click Me',
+ *         enableToggle: true
+ *     });
+ *
+ * You can assign a menu to a button by using the {@link #cfg-menu} configuration. This standard configuration
+ * can either be a reference to a {@link Ext.menu.Menu menu} object, a {@link Ext.menu.Menu menu} id or a
+ * {@link Ext.menu.Menu menu} config blob. When assigning a menu to a button, an arrow is automatically
+ * added to the button.  You can change the alignment of the arrow using the {@link #arrowAlign} configuration
+ * on button.  Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.Button', {
+ *         text      : 'Menu button',
+ *         renderTo  : Ext.getBody(),
+ *         arrowAlign: 'bottom',
+ *         menu      : [
+ *             {text: 'Item 1'},
+ *             {text: 'Item 2'},
+ *             {text: 'Item 3'},
+ *             {text: 'Item 4'}
+ *         ]
+ *     });
+ *
+ * Using listeners, you can easily listen to events fired by any component, using the {@link #listeners}
+ * configuration or using the {@link #addListener} method.  Button has a variety of different listeners:
+ *
+ * - `click`
+ * - `toggle`
+ * - `mouseover`
+ * - `mouseout`
+ * - `mouseshow`
+ * - `menuhide`
+ * - `menutriggerover`
+ * - `menutriggerout`
+ *
+ * Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.Button', {
+ *         text     : 'Button',
+ *         renderTo : Ext.getBody(),
+ *         listeners: {
+ *             click: function() {
+ *                 // this == the button, as we are in the local scope
+ *                 this.setText('I was clicked!');
+ *             },
+ *             mouseover: function() {
+ *                 // set a new config which says we moused over, if not already set
+ *                 if (!this.mousedOver) {
+ *                     this.mousedOver = true;
+ *                     alert('You moused over a button!\n\nI wont do this again.');
+ *                 }
+ *             }
+ *         }
+ *     });
+ */
+Ext.define('Ext.button.Button', {
+
+    /* Begin Definitions */
+    alias: 'widget.button',
+    extend:  Ext.Component ,
+
+               
+                             
+                           
+                                 
+                                      
+                               
+                         
+      
+    
+    mixins: {
+        queryable:  Ext.Queryable 
+    },
+
+    alternateClassName: 'Ext.Button',
+    /* End Definitions */
+
+    /*
+     * @property {Boolean} isAction
+     * `true` in this class to identify an object as an instantiated Button, or subclass thereof.
+     */
+    isButton: true,
+    componentLayout: 'button',
+
+    /**
+     * @property {Boolean} hidden
+     * True if this button is hidden.
+     * @readonly
+     */
+    hidden: false,
+
+    /**
+     * @property {Boolean} disabled
+     * True if this button is disabled.
+     * @readonly
+     */
+    disabled: false,
+
+    /**
+     * @property {Boolean} pressed
+     * True if this button is pressed (only if enableToggle = true).
+     * @readonly
+     */
+    pressed: false,
+
+    /**
+     * @cfg {String} text
+     * The button text to be used as innerHTML (html tags are accepted).
+     */
+
+    /**
+     * @cfg {String} icon
+     * The path to an image to display in the button.
+     */
+
+    /**
+     * @cfg {Function} handler
+     * A function called when the button is clicked (can be used instead of click event).
+     * @cfg {Ext.button.Button} handler.button This button.
+     * @cfg {Ext.EventObject} handler.e The click event.
+     */
+
+    /**
+     * @cfg {Number} minWidth
+     * The minimum width for this button (used to give a set of buttons a common width).
+     * See also {@link Ext.panel.Panel}.{@link Ext.panel.Panel#minButtonWidth minButtonWidth}.
+     */
+
+    /**
+     * @cfg {String/Object} tooltip
+     * The tooltip for the button - can be a string to be used as innerHTML (html tags are accepted) or
+     * QuickTips config object.
+     */
+
+    /**
+     * @cfg {Boolean} [hidden=false]
+     * True to start hidden.
+     */
+
+    /**
+     * @cfg {Boolean} [disabled=false]
+     * True to start disabled.
+     */
+
+    /**
+     * @cfg {Boolean} [pressed=false]
+     * True to start pressed (only if enableToggle = true)
+     */
+
+    /**
+     * @cfg {String} toggleGroup
+     * The group this toggle button is a member of (only 1 per group can be pressed). If a toggleGroup
+     * is specified, the {@link #enableToggle} configuration will automatically be set to true.
+     */
+
+    /**
+     * @cfg {Boolean/Object} [repeat=false]
+     * True to repeat fire the click event while the mouse is down. This can also be a
+     * {@link Ext.util.ClickRepeater ClickRepeater} config object.
+     */
+
+    /**
+     * @cfg {Number} tabIndex
+     * Set a DOM tabIndex for this button.
+     */
+    tabIndex: 0,
+
+    /**
+     * @cfg {Boolean} [allowDepress=true]
+     * False to not allow a pressed Button to be depressed. Only valid when {@link #enableToggle} is true.
+     */
+
+    /**
+     * @cfg {Boolean} [enableToggle=false]
+     * True to enable pressed/not pressed toggling. If a {@link #toggleGroup} is specified, this
+     * option will be set to true.
+     */
+    enableToggle: false,
+
+    /**
+     * @cfg {Function} toggleHandler
+     * Function called when a Button with {@link #enableToggle} set to true is clicked.
+     * @cfg {Ext.button.Button} toggleHandler.button This button.
+     * @cfg {Boolean} toggleHandler.state The next state of the Button, true means pressed.
+     */
+
+    /**
+     * @cfg {Ext.menu.Menu/String/Object} menu
+     * Standard menu attribute consisting of a reference to a menu object, a menu id or a menu config blob.
+     */
+
+    /**
+     * @cfg {String} menuAlign
+     * The position to align the menu to (see {@link Ext.util.Positionable#alignTo} for more details).
+     */
+    menuAlign: 'tl-bl?',
+
+    /**
+     * @cfg {Boolean} showEmptyMenu
+     * True to force an attached {@link #cfg-menu} with no items to be shown when clicking 
+     * this button. By default, the menu will not show if it is empty.
+     */
+    showEmptyMenu: false,
+
+    /**
+     * @cfg {String} textAlign
+     * The text alignment for this button (center, left, right).
+     */
+    textAlign: 'center',
+
+    /**
+     * @cfg {String} overflowText
+     * If used in a {@link Ext.toolbar.Toolbar Toolbar}, the text to be used if this item is shown in the overflow menu.
+     * See also {@link Ext.toolbar.Item}.`{@link Ext.toolbar.Item#overflowText overflowText}`.
+     */
+
+    /**
+     * @cfg {String} iconCls
+     * A css class which sets a background image to be used as the icon for this button.
+     */
+
+    /**
+     * @cfg {Number/String} glyph
+     * A numeric unicode character code to use as the icon for this button. The default
+     * font-family for glyphs can be set globally using
+     * {@link Ext#setGlyphFontFamily Ext.setGlyphFontFamily()}. Alternatively, this
+     * config option accepts a string with the charCode and font-family separated by the
+     * `@` symbol. For example '65 at My Font Family'.
+     */
+
+    /**
+     * @cfg {String} clickEvent
+     * The DOM event that will fire the handler of the button. This can be any valid event name (dblclick, contextmenu).
+     */
+    clickEvent: 'click',
+
+    /**
+     * @cfg {Boolean} preventDefault
+     * True to prevent the default action when the {@link #clickEvent} is processed.
+     */
+    preventDefault: true,
+
+    /**
+     * @cfg {Boolean} handleMouseEvents
+     * False to disable visual cues on mouseover, mouseout and mousedown.
+     */
+    handleMouseEvents: true,
+
+    /**
+     * @cfg {String} tooltipType
+     * The type of tooltip to use. Either 'qtip' for QuickTips or 'title' for title attribute.
+     */
+    tooltipType: 'qtip',
+
+    /**
+     * @cfg {String} [baseCls='x-btn']
+     * The base CSS class to add to all buttons.
+     */
+    baseCls: Ext.baseCSSPrefix + 'btn',
+
+    /**
+     * @cfg {String} pressedCls
+     * The CSS class to add to a button when it is in the pressed state.
+     */
+    pressedCls: 'pressed',
+
+    /**
+     * @cfg {String} overCls
+     * The CSS class to add to a button when it is in the over (hovered) state.
+     */
+    overCls: 'over',
+
+    /**
+     * @cfg {String} focusCls
+     * The CSS class to add to a button when it is in the focussed state.
+     */
+    focusCls: 'focus',
+
+    /**
+     * @cfg {String} menuActiveCls
+     * The CSS class to add to a button when it's menu is active.
+     */
+    menuActiveCls: 'menu-active',
+
+    /**
+     * @cfg {String} href
+     * The URL to open when the button is clicked. Specifying this config causes the Button to be
+     * rendered with the specified URL as the `href` attribute of its `<a>` Element.
+     *
+     * This is better than specifying a click handler of
+     *
+     *     function() { window.location = "http://www.sencha.com" }
+     *
+     * because the UI will provide meaningful hints to the user as to what to expect upon clicking
+     * the button, and will also allow the user to open in a new tab or window, bookmark or drag the URL, or directly save
+     * the URL stream to disk.
+     *
+     * See also the {@link #hrefTarget} config.
+     */
+
+    /**
+      * @cfg {String} [hrefTarget="_blank"]
+      * The target attribute to use for the underlying anchor. Only used if the {@link #href}
+      * property is specified.
+      */
+     hrefTarget: '_blank',
+
+     /**
+     * @cfg {Boolean} destroyMenu
+     * Whether or not to destroy any associated menu when this button is destroyed. The menu
+     * will be destroyed unless this is explicitly set to false.
+     */
+
+    /**
+     * @cfg {Object} baseParams
+     * An object literal of parameters to pass to the url when the {@link #href} property is specified.
+     */
+
+    /**
+     * @cfg {Object} params
+     * An object literal of parameters to pass to the url when the {@link #href} property is specified. Any params
+     * override {@link #baseParams}. New params can be set using the {@link #setParams} method.
+     */
+
+    childEls: [
+        'btnEl', 'btnWrap', 'btnInnerEl', 'btnIconEl'
+    ],
+
+    // We have to keep "unselectable" attribute on all elements because it's not inheritable.
+    // Without it, clicking anywhere on a button disrupts current selection and cursor position
+    // in HtmlEditor.
+    renderTpl: [
+        '<span id="{id}-btnWrap" class="{baseCls}-wrap',
+            '<tpl if="splitCls"> {splitCls}</tpl>',
+            '{childElCls}" unselectable="on">',
+            '<span id="{id}-btnEl" class="{baseCls}-button">',
+                '<span id="{id}-btnInnerEl" class="{baseCls}-inner {innerCls}',
+                    '{childElCls}" unselectable="on">',
+                    '{text}',
+                '</span>',
+                '<span role="img" id="{id}-btnIconEl" class="{baseCls}-icon-el {iconCls}',
+                    '{childElCls} {glyphCls}" unselectable="on" style="',
+                    '<tpl if="iconUrl">background-image:url({iconUrl});</tpl>',
+                    '<tpl if="glyph && glyphFontFamily">font-family:{glyphFontFamily};</tpl>">',
+                    '<tpl if="glyph">&#{glyph};</tpl><tpl if="iconCls || iconUrl"> </tpl>',
+                '</span>',
+            '</span>',
+        '</span>',
+        // if "closable" (tab) add a close element icon
+        '<tpl if="closable">',
+            '<span id="{id}-closeEl" class="{baseCls}-close-btn" title="{closeText}" tabIndex="0"></span>',
+        '</tpl>'
+    ],
+
+    /**
+     * @cfg {"small"/"medium"/"large"} scale
+     * The size of the Button. Three values are allowed:
+     *
+     * - 'small' - Results in the button element being 16px high.
+     * - 'medium' - Results in the button element being 24px high.
+     * - 'large' - Results in the button element being 32px high.
+     */
+    scale: 'small',
+
+    /**
+     * @private
+     * An array of allowed scales.
+     */
+    allowedScales: ['small', 'medium', 'large'],
+
+    /**
+     * @cfg {Object} scope
+     * The scope (**this** reference) in which the `{@link #handler}` and `{@link #toggleHandler}` is executed.
+     * Defaults to this Button.
+     */
+
+    /**
+     * @cfg {String} iconAlign
+     * The side of the Button box to render the icon. Four values are allowed:
+     *
+     * - 'top'
+     * - 'right'
+     * - 'bottom'
+     * - 'left'
+     */
+    iconAlign: 'left',
+
+    /**
+     * @cfg {String} arrowAlign
+     * The side of the Button box to render the arrow if the button has an associated {@link #cfg-menu}. Two
+     * values are allowed:
+     *
+     * - 'right'
+     * - 'bottom'
+     */
+    arrowAlign: 'right',
+
+    /**
+     * @cfg {String} arrowCls
+     * The className used for the inner arrow element if the button has a menu.
+     */
+    arrowCls: 'arrow',
+
+    /**
+     * @property {Ext.Template} template
+     * A {@link Ext.Template Template} used to create the Button's DOM structure.
+     *
+     * Instances, or subclasses which need a different DOM structure may provide a different template layout in
+     * conjunction with an implementation of {@link #getTemplateArgs}.
+     */
+
+    /**
+     * @cfg {String} cls
+     * A CSS class string to apply to the button's main element.
+     */
+
+    /**
+     * @property {Ext.menu.Menu} menu
+     * The {@link Ext.menu.Menu Menu} object associated with this Button when configured with the {@link #cfg-menu} config
+     * option.
+     */
+
+    maskOnDisable: false,
+
+    shrinkWrap: 3,
+
+    frame: true,
+
+    // A reusable object used by getTriggerRegion to avoid excessive object creation.
+    _triggerRegion: {},
+
+    // inherit docs
+    initComponent: function() {
+        var me = this;
+
+        // the autoEl object can't be on the prototype because we add tabIndex and href
+        // properties to it conditionally.
+        me.autoEl = {
+            tag: 'a',
+            role: 'button',
+            hidefocus: 'on',
+            unselectable: 'on'
+        };
+
+        // Ensure no selection happens
+        me.addCls('x-unselectable');
+
+        me.callParent(arguments);
+
+        me.addEvents(
+            /**
+             * @event click
+             * Fires when this button is clicked, before the configured {@link #handler} is invoked. Execution of the
+             * {@link #handler} may be vetoed by returning <code>false</code> to this event.
+             * @param {Ext.button.Button} this
+             * @param {Event} e The click event
+             */
+            'click',
+
+            /**
+             * @event toggle
+             * Fires when the 'pressed' state of this button changes (only if enableToggle = true)
+             * @param {Ext.button.Button} this
+             * @param {Boolean} pressed
+             */
+            'toggle',
+
+            /**
+             * @event mouseover
+             * Fires when the mouse hovers over the button
+             * @param {Ext.button.Button} this
+             * @param {Event} e The event object
+             */
+            'mouseover',
+
+            /**
+             * @event mouseout
+             * Fires when the mouse exits the button
+             * @param {Ext.button.Button} this
+             * @param {Event} e The event object
+             */
+            'mouseout',
+
+            /**
+             * @event menushow
+             * If this button has a menu, this event fires when it is shown
+             * @param {Ext.button.Button} this
+             * @param {Ext.menu.Menu} menu
+             */
+            'menushow',
+
+            /**
+             * @event menuhide
+             * If this button has a menu, this event fires when it is hidden
+             * @param {Ext.button.Button} this
+             * @param {Ext.menu.Menu} menu
+             */
+            'menuhide',
+
+            /**
+             * @event menutriggerover
+             * If this button has a menu, this event fires when the mouse enters the menu triggering element
+             * @param {Ext.button.Button} this
+             * @param {Ext.menu.Menu} menu
+             * @param {Event} e
+             */
+            'menutriggerover',
+
+            /**
+             * @event menutriggerout
+             * If this button has a menu, this event fires when the mouse leaves the menu triggering element
+             * @param {Ext.button.Button} this
+             * @param {Ext.menu.Menu} menu
+             * @param {Event} e
+             */
+            'menutriggerout',
+
+            /**
+             * @event textchange
+             * Fired when the button's text is changed by the {@link #setText} method.
+             * @param {Ext.button.Button} this
+             * @param {String} oldText
+             * @param {String} newText
+             */
+            'textchange',
+
+            /**
+             * @event iconchange
+             * Fired when the button's icon is changed by the {@link #setIcon} or {@link #setIconCls} methods.
+             * @param {Ext.button.Button} this
+             * @param {String} oldIcon
+             * @param {String} newIcon
+             */
+            'iconchange',
+
+            /**
+             * @event glyphchange
+             * Fired when the button's glyph is changed by the {@link #setGlyph} method.
+             * @param {Ext.button.Button} this
+             * @param {Number/String} newGlyph
+             * @param {Number/String} oldGlyph
+             */
+            'glyphchange'
+        );
+
+        if (me.menu) {
+            // Flag that we'll have a splitCls
+            me.split = true;
+
+            // retrieve menu by id or instantiate instance if needed
+            me.menu = Ext.menu.Manager.get(me.menu);
+
+            // Use ownerButton as the upward link. Menus *must have no ownerCt* - they are global floaters.
+            // Upward navigation is done using the up() method.
+            me.menu.ownerButton = me;
+        }
+
+        // Accept url as a synonym for href
+        if (me.url) {
+            me.href = me.url;
+        }
+
+        // preventDefault defaults to false for links
+        if (me.href && !me.hasOwnProperty('preventDefault')) {
+            me.preventDefault = false;
+        }
+
+        if (Ext.isString(me.toggleGroup) && me.toggleGroup !== '') {
+            me.enableToggle = true;
+        }
+
+        if (me.html && !me.text) {
+            me.text = me.html;
+            delete me.html;
+        }
+
+        me.glyphCls = me.baseCls + '-glyph';
+    },
+
+    // inherit docs
+    getActionEl: function() {
+        return this.el;
+    },
+
+    // inherit docs
+    getFocusEl: function() {
+        return this.el;
+    },
+
+    // See comments in onFocus
+    onDisable: function(){
+        this.callParent(arguments);
+    },
+
+    // @private
+    setComponentCls: function() {
+        var me = this,
+            cls = me.getComponentCls();
+
+        if (!Ext.isEmpty(me.oldCls)) {
+            me.removeClsWithUI(me.oldCls);
+            me.removeClsWithUI(me.pressedCls);
+        }
+
+        me.oldCls = cls;
+        me.addClsWithUI(cls);
+    },
+
+    getComponentCls: function() {
+        var me = this,
+            cls;
+
+        // Check whether the button has an icon or not, and if it has an icon, what is the alignment
+        if (me.iconCls || me.icon || me.glyph) {
+            cls = [me.text ? 'icon-text-' + me.iconAlign : 'icon'];
+        } else if (me.text) {
+            cls = ['noicon'];
+        } else {
+            cls = [];
+        }
+
+        if (me.pressed) {
+            cls[cls.length] = me.pressedCls;
+        }
+        return cls;
+    },
+
+    beforeRender: function () {
+        var me = this,
+            autoEl = me.autoEl,
+            href = me.getHref(),
+            hrefTarget = me.hrefTarget;
+
+        if (!me.disabled) {
+            autoEl.tabIndex = me.tabIndex;
+        }
+
+        if (href) {
+            autoEl.href = href;
+            if (hrefTarget) {
+                autoEl.target = hrefTarget;
+            }
+        }
+
+        me.callParent();
+
+        // Add all needed classes to the protoElement.
+        me.oldCls = me.getComponentCls();
+        me.addClsWithUI(me.oldCls);
+
+        // Apply the renderData to the template args
+        Ext.applyIf(me.renderData, me.getTemplateArgs());
+    },
+
+    // @private
+    onRender: function() {
+        var me = this,
+            addOnclick,
+            btn,
+            btnListeners;
+
+        me.doc = Ext.getDoc();
+        me.callParent(arguments);
+
+        // Set btn as a local variable for easy access
+        btn = me.el;
+
+        if (me.tooltip) {
+            me.setTooltip(me.tooltip, true);
+        }
+
+        // Add the mouse events to the button
+        if (me.handleMouseEvents) {
+            btnListeners = {
+                scope: me,
+                mouseover: me.onMouseOver,
+                mouseout: me.onMouseOut,
+                mousedown: me.onMouseDown
+            };
+            if (me.split) {
+                btnListeners.mousemove = me.onMouseMove;
+            }
+        } else {
+            btnListeners = {
+                scope: me
+            };
+        }
+
+        // Check if the button has a menu
+        if (me.menu) {
+            me.mon(me.menu, {
+                scope: me,
+                show: me.onMenuShow,
+                hide: me.onMenuHide
+            });
+
+            me.keyMap = new Ext.util.KeyMap({
+                target: me.el,
+                key: Ext.EventObject.DOWN,
+                handler: me.onDownKey,
+                scope: me
+            });
+        }
+
+        // Check if it is a repeat button
+        if (me.repeat) {
+            me.mon(new Ext.util.ClickRepeater(btn, Ext.isObject(me.repeat) ? me.repeat: {}), 'click', me.onRepeatClick, me);
+        } else {
+
+            // If the activation event already has a handler, make a note to add the handler later
+            if (btnListeners[me.clickEvent]) {
+                addOnclick = true;
+            } else {
+                btnListeners[me.clickEvent] = me.onClick;
+            }
+        }
+
+        // Add whatever button listeners we need
+        me.mon(btn, btnListeners);
+
+        // If the listeners object had an entry for our clickEvent, add a listener now
+        if (addOnclick) {
+            me.mon(btn, me.clickEvent, me.onClick, me);
+        }
+
+        Ext.button.Manager.register(me);
+    },
+
+    /**
+     * This method returns an object which provides substitution parameters for the {@link #renderTpl XTemplate} used to
+     * create this Button's DOM structure.
+     *
+     * Instances or subclasses which use a different Template to create a different DOM structure may need to provide
+     * their own implementation of this method.
+     * @protected
+     *
+     * @return {Object} Substitution data for a Template. The default implementation which provides data for the default
+     * {@link #template} returns an Object containing the following properties:
+     * @return {String} return.innerCls A CSS class to apply to the button's text element.
+     * @return {String} return.splitCls A CSS class to determine the presence and position of an arrow icon.
+     * (`'x-btn-arrow'` or `'x-btn-arrow-bottom'` or `''`)
+     * @return {String} return.iconUrl The url for the button icon.
+     * @return {String} return.iconCls The CSS class for the button icon.
+     * @return {String} return.glyph The glyph to use as the button icon.
+     * @return {String} return.glyphCls The CSS class to use for the glyph element.
+     * @return {String} return.glyphFontFamily The CSS font-family to use for the glyph element.
+     * @return {String} return.text The {@link #text} to display ion the Button.
+     */
+    getTemplateArgs: function() {
+        var me = this,
+            glyph = me.glyph,
+            glyphFontFamily = Ext._glyphFontFamily,
+            glyphParts;
+
+        if (typeof glyph === 'string') {
+            glyphParts = glyph.split('@');
+            glyph = glyphParts[0];
+            glyphFontFamily = glyphParts[1];
+        }
+
+        return {
+            innerCls : me.getInnerCls(),
+            splitCls : me.getSplitCls(),
+            iconUrl  : me.icon,
+            iconCls  : me.iconCls,
+            glyph: glyph,
+            glyphCls: glyph ? me.glyphCls : '', 
+            glyphFontFamily: glyphFontFamily,
+            text     : me.text || ' '
+        };
+    },
+
+    /**
+     * Sets the href of the embedded anchor element to the passed URL.
+     *
+     * Also appends any configured {@link #cfg-baseParams} and parameters set through {@link #setParams}.
+     * @param {String} href The URL to set in the anchor element.
+     *
+     */
+    setHref: function(href) {
+        this.href = href;
+        this.el.dom.href = this.getHref();
+    },
+
+    /**
+     * @private
+     * If there is a configured href for this Button, returns the href with parameters appended.
+     * @return {String/Boolean} The href string with parameters appended.
+     */
+    getHref: function() {
+        var me = this,
+            href = me.href;
+
+        return href ? Ext.urlAppend(href, Ext.Object.toQueryString(Ext.apply({}, me.params, me.baseParams))) : false;
+    },
+
+    /**
+     * Sets the href of the link dynamically according to the params passed, and any {@link #baseParams} configured.
+     *
+     * **Only valid if the Button was originally configured with a {@link #href}**
+     *
+     * @param {Object} params Parameters to use in the href URL.
+     */
+    setParams: function(params) {
+        this.params = params;
+        this.el.dom.href = this.getHref();
+    },
+
+    getSplitCls: function() {
+        var me = this;
+        return me.split ? (me.baseCls + '-' + me.arrowCls) + ' ' + (me.baseCls + '-' + me.arrowCls + '-' + me.arrowAlign) : '';
+    },
+
+    getInnerCls: function() {
+        return this.textAlign ? this.baseCls + '-inner-' + this.textAlign : '';
+    },
+
+    /**
+     * Sets the background image (inline style) of the button. This method also changes the value of the {@link #icon}
+     * config internally.
+     * @param {String} icon The path to an image to display in the button
+     * @return {Ext.button.Button} this
+     */
+    setIcon: function(icon) {
+        icon = icon || '';
+        var me = this,
+            btnIconEl = me.btnIconEl,
+            oldIcon = me.icon || '';
+
+        me.icon = icon;
+        if (icon != oldIcon) {
+            if (btnIconEl) {
+                btnIconEl.setStyle('background-image', icon ? 'url(' + icon + ')': '');
+                me.setComponentCls();
+                if (me.didIconStateChange(oldIcon, icon)) {
+                    me.updateLayout();
+                }
+            }
+            me.fireEvent('iconchange', me, oldIcon, icon);
+        }
+        return me;
+    },
+
+    /**
+     * Sets the CSS class that provides a background image to use as the button's icon. This method also changes the
+     * value of the {@link #iconCls} config internally.
+     * @param {String} cls The CSS class providing the icon image
+     * @return {Ext.button.Button} this
+     */
+    setIconCls: function(cls) {
+        cls = cls || '';
+        var me = this,
+            btnIconEl = me.btnIconEl,
+            oldCls = me.iconCls || '';
+
+        me.iconCls = cls;
+        if (oldCls != cls) {
+            if (btnIconEl) {
+                // Remove the previous iconCls from the button
+                btnIconEl.removeCls(oldCls);
+                btnIconEl.addCls(cls);
+                me.setComponentCls();
+                if (me.didIconStateChange(oldCls, cls)) {
+                    me.updateLayout();
+                }
+            }
+            me.fireEvent('iconchange', me, oldCls, cls);
+        }
+        return me;
+    },
+
+    /**
+     * Sets this button's glyph
+     * @param {Number/String} glyph the numeric charCode or string charCode/font-family.
+     * This parameter expects a format consistent with that of {@link #glyph}
+     * @return {Ext.button.Button} this
+     */
+    setGlyph: function(glyph) {
+        glyph = glyph || 0;
+        var me = this,
+            btnIconEl = me.btnIconEl,
+            oldGlyph = me.glyph,
+            fontFamily, glyphParts;
+
+        me.glyph = glyph;
+
+        if (btnIconEl) {
+            if (typeof glyph === 'string') {
+                glyphParts = glyph.split('@');
+                glyph = glyphParts[0];
+                fontFamily = glyphParts[1] || Ext._glyphFontFamily;
+            }
+
+            if (!glyph) {
+                btnIconEl.dom.innerHTML = '';
+            } else if (oldGlyph != glyph) {
+                btnIconEl.dom.innerHTML = '&#' + glyph + ';';
+            }
+
+            if (fontFamily) {
+                btnIconEl.setStyle('font-family', fontFamily);
+            }
+        }
+
+        me.fireEvent('glyphchange', me, me.glyph, oldGlyph);
+
+        return me;
+    },
+
+    /**
+     * Sets the tooltip for this Button.
+     *
+     * @param {String/Object} tooltip This may be:
+     *
+     *   - **String** : A string to be used as innerHTML (html tags are accepted) to show in a tooltip
+     *   - **Object** : A configuration object for {@link Ext.tip.QuickTipManager#register}.
+     *
+     * @return {Ext.button.Button} this
+     */
+    setTooltip: function(tooltip, initial) {
+        var me = this;
+
+        if (me.rendered) {
+            if (!initial || !tooltip) {
+                me.clearTip();
+            }
+            if (tooltip) {
+                if (Ext.quickTipsActive && Ext.isObject(tooltip)) {
+                    Ext.tip.QuickTipManager.register(Ext.apply({
+                        target: me.el.id
+                    },
+                    tooltip));
+                    me.tooltip = tooltip;
+                } else {
+                    me.el.dom.setAttribute(me.getTipAttr(), tooltip);
+                }
+            }
+        } else {
+            me.tooltip = tooltip;
+        }
+        return me;
+    },
+
+    /**
+     * Sets the text alignment for this button.
+     * @param {String} align The new alignment of the button text. See {@link #textAlign}.
+     */
+    setTextAlign: function(align) {
+        var me = this,
+            btnEl = me.btnEl;
+
+        if (btnEl) {
+            btnEl.removeCls(me.baseCls + '-inner-' + me.textAlign);
+            btnEl.addCls(me.baseCls + '-inner-' + align);
+        }
+        me.textAlign = align;
+        return me;
+    },
+
+    getTipAttr: function(){
+        return this.tooltipType == 'qtip' ? 'data-qtip' : 'title';
+    },
+
+    // @private
+    getRefItems: function(deep){
+        var menu = this.menu,
+            items;
+
+        if (menu) {
+            items = menu.getRefItems(deep);
+            items.unshift(menu);
+        }
+        return items || [];
+    },
+
+    // @private
+    clearTip: function() {
+        var me = this,
+            el = me.el;
+
+        if (Ext.quickTipsActive && Ext.isObject(me.tooltip)) {
+            Ext.tip.QuickTipManager.unregister(el);
+        } else {
+            el.dom.removeAttribute(me.getTipAttr());
+        }
+    },
+
+    // @private
+    beforeDestroy: function() {
+        var me = this;
+        if (me.rendered) {
+            me.clearTip();
+        }
+        if (me.menu && me.destroyMenu !== false) {
+            Ext.destroy(me.menu);
+        }
+        Ext.destroy(me.btnInnerEl, me.repeater);
+        me.callParent();
+    },
+
+    // @private
+    onDestroy: function() {
+        var me = this;
+        if (me.rendered) {
+            me.doc.un('mouseover', me.monitorMouseOver, me);
+            delete me.doc;
+
+            Ext.destroy(me.keyMap);
+            delete me.keyMap;
+        }
+        Ext.button.Manager.unregister(me);
+        me.callParent();
+    },
+
+    /**
+     * Assigns this Button's click handler
+     * @param {Function} handler The function to call when the button is clicked
+     * @param {Object} [scope] The scope (`this` reference) in which the handler function is executed.
+     * Defaults to this Button.
+     * @return {Ext.button.Button} this
+     */
+    setHandler: function(handler, scope) {
+        this.handler = handler;
+        this.scope = scope;
+        return this;
+    },
+
+    /**
+     * Sets this Button's text
+     * @param {String} text The button text
+     * @return {Ext.button.Button} this
+     */
+    setText: function(text) {
+        text = text || '';
+        var me = this,
+            oldText = me.text || '';
+
+        if (text != oldText) {
+            me.text = text;
+            if (me.rendered) {
+                me.btnInnerEl.update(text || ' ');
+                me.setComponentCls();
+                if (Ext.isStrict && Ext.isIE8) {
+                    // weird repaint issue causes it to not resize
+                    me.el.repaint();
+                }
+                me.updateLayout();
+            }
+            me.fireEvent('textchange', me, oldText, text);
+        }
+        return me;
+    },
+
+    /**
+     * Checks if the icon/iconCls changed from being empty to having a value, or having a value to being empty.
+     * @private
+     * @param {String} old The old icon/iconCls
+     * @param {String} current The current icon/iconCls
+     * @return {Boolean} True if the icon state changed
+     */
+    didIconStateChange: function(old, current) {
+        var currentEmpty = Ext.isEmpty(current);
+        return Ext.isEmpty(old) ? !currentEmpty : currentEmpty;
+    },
+
+    /**
+     * Gets the text for this Button
+     * @return {String} The button text
+     */
+    getText: function() {
+        return this.text;
+    },
+
+    /**
+     * If a state it passed, it becomes the pressed state otherwise the current state is toggled.
+     * @param {Boolean} [state] Force a particular state
+     * @param {Boolean} [suppressEvent=false] True to stop events being fired when calling this method.
+     * @return {Ext.button.Button} this
+     */
+    toggle: function(state, suppressEvent) {
+        var me = this;
+        state = state === undefined ? !me.pressed: !!state;
+        if (state !== me.pressed) {
+            if (me.rendered) {
+                me[state ? 'addClsWithUI': 'removeClsWithUI'](me.pressedCls);
+            }
+            me.pressed = state;
+            if (!suppressEvent) {
+                me.fireEvent('toggle', me, state);
+                Ext.callback(me.toggleHandler, me.scope || me, [me, state]);
+            }
+        }
+        return me;
+    },
+
+    maybeShowMenu: function(){
+        var me = this;
+        if (me.menu && !me.hasVisibleMenu() && !me.ignoreNextClick) {
+            me.showMenu(true);
+        }
+    },
+
+    /**
+     * Shows this button's menu (if it has one)
+     */
+    showMenu: function(/* private */ fromEvent) {
+        var me = this,
+            menu = me.menu;
+
+        if (me.rendered) {
+            if (me.tooltip && Ext.quickTipsActive && me.getTipAttr() != 'title') {
+                Ext.tip.QuickTipManager.getQuickTip().cancelShow(me.el);
+            }
+            if (menu.isVisible()) {
+                menu.hide();
+            }
+
+            if (!fromEvent || me.showEmptyMenu || menu.items.getCount() > 0) {
+                menu.showBy(me.el, me.menuAlign);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Hides this button's menu (if it has one)
+     */
+    hideMenu: function() {
+        if (this.hasVisibleMenu()) {
+            this.menu.hide();
+        }
+        return this;
+    },
+
+    /**
+     * Returns true if the button has a menu and it is visible
+     * @return {Boolean}
+     */
+    hasVisibleMenu: function() {
+        var menu = this.menu;
+        return menu && menu.rendered && menu.isVisible();
+    },
+
+    // @private
+    onRepeatClick: function(repeat, e) {
+        this.onClick(e);
+    },
+
+    // @private
+    onClick: function(e) {
+        var me = this;
+        if (me.preventDefault || (me.disabled && me.getHref()) && e) {
+            e.preventDefault();
+        }
+
+        // Can be triggered by ENTER or SPACE keydown events which set the button property.
+        // Only veto event handling if it's a mouse event with an alternative button.
+        if (e.type !== 'keydown' && e.button !== 0) {
+            return;
+        }
+        if (!me.disabled) {
+            me.doToggle();
+            me.maybeShowMenu();
+            me.fireHandler(e);
+        }
+    },
+
+    fireHandler: function(e) {
+        var me = this,
+            handler = me.handler;
+
+        if (me.fireEvent('click', me, e) !== false) {
+            if (handler) {
+                handler.call(me.scope || me, me, e);
+            }
+        }
+    },
+
+    doToggle: function() {
+        var me = this;    
+        if (me.enableToggle && (me.allowDepress !== false || !me.pressed)) {
+            me.toggle();
+        }
+    },
+
+    /**
+     * @private mouseover handler called when a mouseover event occurs anywhere within the encapsulating element.
+     * The targets are interrogated to see what is being entered from where.
+     * @param e
+     */
+    onMouseOver: function(e) {
+        var me = this;
+        if (!me.disabled && !e.within(me.el, true, true)) {
+            me.onMouseEnter(e);
+        }
+    },
+
+    /**
+     * @private
+     * mouseout handler called when a mouseout event occurs anywhere within the encapsulating element -
+     * or the mouse leaves the encapsulating element.
+     * The targets are interrogated to see what is being exited to where.
+     * @param e
+     */
+    onMouseOut: function(e) {
+        var me = this;
+        if (!e.within(me.el, true, true)) {
+            if (me.overMenuTrigger) {
+                me.onMenuTriggerOut(e);
+            }
+            me.onMouseLeave(e);
+        }
+    },
+
+    /**
+     * @private
+     * mousemove handler called when the mouse moves anywhere within the encapsulating element.
+     * The position is checked to determine if the mouse is entering or leaving the trigger area. Using
+     * mousemove to check this is more resource intensive than we'd like, but it is necessary because
+     * the trigger area does not line up exactly with sub-elements so we don't always get mouseover/out
+     * events when needed. In the future we should consider making the trigger a separate element that
+     * is absolutely positioned and sized over the trigger area.
+     */
+    onMouseMove: function(e) {
+        var me = this,
+            el = me.el,
+            over = me.overMenuTrigger,
+            overPosition, triggerRegion;
+
+        if (me.split) {
+            overPosition = (me.arrowAlign === 'right') ?
+                e.getX() - me.getX() : e.getY() - el.getY();
+            triggerRegion = me.getTriggerRegion();
+
+            if (overPosition > triggerRegion.begin && overPosition < triggerRegion.end) {
+                if (!over) {
+                    me.onMenuTriggerOver(e);
+                }
+            } else {
+                if (over) {
+                    me.onMenuTriggerOut(e);
+                }
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Returns an object containing `begin` and `end` properties that indicate the 
+     * left/right bounds of a right trigger or the top/bottom bounds of a bottom trigger.
+     * @return {Object}
+     */
+    getTriggerRegion: function() {
+        var me = this,
+            region = me._triggerRegion,
+            triggerSize = me.getTriggerSize(),
+            btnSize = me.arrowAlign === 'right' ? me.getWidth() : me.getHeight();
+
+        region.begin = btnSize - triggerSize;
+        region.end = btnSize;
+        return region;
+    },
+
+    /**
+     * @private
+     * Measures the size of the trigger area for menu and split buttons. Will be a width for
+     * a right-aligned trigger and a height for a bottom-aligned trigger. Cached after first measurement.
+     */
+    getTriggerSize: function() {
+        var me = this,
+            size = me.triggerSize,
+            side, sideFirstLetter;
+
+        if (size == null) { // Same as (size === null || size === undefined)
+            side = me.arrowAlign;
+            sideFirstLetter = side.charAt(0);
+            size = me.triggerSize = me.el.getFrameWidth(sideFirstLetter) + me.getBtnWrapFrameWidth(sideFirstLetter)
+            if (me.frameSize) {
+                size = me.triggerSize += me.frameSize[side];
+            }
+        }
+        return size;
+    },
+
+    /**
+     * @private
+     */
+    getBtnWrapFrameWidth: function(side) {
+        return this.btnWrap.getFrameWidth(side);
+    },
+
+    addOverCls: function() {
+        if (!this.disabled) {
+            this.addClsWithUI(this.overCls);
+        }
+    },
+    removeOverCls: function() {
+        this.removeClsWithUI(this.overCls);
+    },
+
+    /**
+     * @private
+     * virtual mouseenter handler called when it is detected that the mouseout event
+     * signified the mouse entering the encapsulating element.
+     * @param e
+     */
+    onMouseEnter: function(e) {
+        // overCls is handled by AbstractComponent
+        this.fireEvent('mouseover', this, e);
+    },
+
+    /**
+     * @private
+     * virtual mouseleave handler called when it is detected that the mouseover event
+     * signified the mouse entering the encapsulating element.
+     * @param e
+     */
+    onMouseLeave: function(e) {
+        // overCls is handled by AbstractComponent
+        this.fireEvent('mouseout', this, e);
+    },
+
+    /**
+     * @private
+     * virtual mouseenter handler called when it is detected that the mouseover event
+     * signified the mouse entering the arrow area of the button - the `<em>`.
+     * @param e
+     */
+    onMenuTriggerOver: function(e) {
+        var me = this,
+            arrowTip = me.arrowTooltip;
+
+        me.overMenuTrigger = true;
+        // We don't have a separate arrow element, so we only add the tip attribute if
+        // we're over that part of the button
+        if (me.split && arrowTip) {
+            me.btnWrap.dom.setAttribute(me.getTipAttr(), arrowTip);
+        }
+        me.fireEvent('menutriggerover', me, me.menu, e);
+    },
+
+    /**
+     * @private
+     * virtual mouseleave handler called when it is detected that the mouseout event
+     * signified the mouse leaving the arrow area of the button - the `<em>`.
+     * @param e
+     */
+    onMenuTriggerOut: function(e) {
+        var me = this;
+        delete me.overMenuTrigger;
+        // See onMenuTriggerOver
+        if (me.split && me.arrowTooltip) {
+            me.btnWrap.dom.setAttribute(me.getTipAttr(), '');
+        }
+        me.fireEvent('menutriggerout', me, me.menu, e);
+    },
+
+    // inherit docs
+    enable: function(silent) {
+        var me = this;
+
+        me.callParent(arguments);
+
+        me.removeClsWithUI('disabled');
+        if (me.rendered) {
+            me.el.dom.setAttribute('tabIndex', me.tabIndex);
+        }
+
+        return me;
+    },
+
+    // inherit docs
+    disable: function(silent) {
+        var me = this;
+
+        me.callParent(arguments);
+
+        me.addClsWithUI('disabled');
+        me.removeClsWithUI(me.overCls);
+        if (me.rendered) {
+            me.el.dom.removeAttribute('tabIndex');
+        }
+
+        // IE renders disabled text by layering gray text on top of white text, offset by 1 pixel. Normally this is fine
+        // but in some circumstances (such as using formBind) it gets confused and renders them side by side instead.
+        if (me.btnInnerEl && Ext.isIE7m) {
+            me.btnInnerEl.repaint();
+        }
+
+        return me;
+    },
+
+    /**
+     * Method to change the scale of the button. See {@link #scale} for allowed configurations.
+     * @param {String} scale The scale to change to.
+     */
+    setScale: function(scale) {
+        var me = this,
+            ui = me.ui.replace('-' + me.scale, '');
+
+        //check if it is an allowed scale
+        if (!Ext.Array.contains(me.allowedScales, scale)) {
+            throw('#setScale: scale must be an allowed scale (' + me.allowedScales.join(', ') + ')');
+        }
+
+        me.scale = scale;
+        me.setUI(ui);
+    },
+
+    // inherit docs
+    setUI: function(ui) {
+        var me = this;
+
+        //we need to append the scale to the UI, if not already done
+        if (me.scale && !ui.match(me.scale)) {
+            ui = ui + '-' + me.scale;
+        }
+
+        me.callParent([ui]);
+
+        // Set all the state classNames, as they need to include the UI
+        // me.disabledCls += ' ' + me.baseCls + '-' + me.ui + '-disabled';
+    },
+
+
+    // @private
+    onMouseDown: function(e) {
+        var me = this;
+
+        if (Ext.isIE) {
+            // In IE the use of unselectable on the button's elements causes the element
+            // to not receive focus, even when it is directly clicked.
+            me.getFocusEl().focus();
+        }
+
+        if (!me.disabled && e.button === 0) {
+            Ext.button.Manager.onButtonMousedown(me, e);
+            me.addClsWithUI(me.pressedCls);
+        }
+    },
+    // @private
+    onMouseUp: function(e) {
+        var me = this;
+        if (e.button === 0) {
+            if (!me.pressed) {
+                me.removeClsWithUI(me.pressedCls);
+            }
+        }
+    },
+    // @private
+    onMenuShow: function(e) {
+        var me = this;
+        me.ignoreNextClick = 0;
+        me.addClsWithUI(me.menuActiveCls);
+        me.fireEvent('menushow', me, me.menu);
+    },
+
+    // @private
+    onMenuHide: function(e) {
+        var me = this;
+        me.removeClsWithUI(me.menuActiveCls);
+        me.ignoreNextClick = Ext.defer(me.restoreClick, 250, me);
+        me.fireEvent('menuhide', me, me.menu);
+        me.focus();
+    },
+
+    // @private
+    restoreClick: function() {
+        this.ignoreNextClick = 0;
+    },
+
+    // @private
+    onDownKey: function(k, e) {
+        var me = this;
+
+        if (me.menu && !me.disabled) {
+            me.showMenu();
+            e.stopEvent();
+            return false;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.layout.container.boxOverflow.Menu', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.layout.container.boxOverflow.None ,
+                                                             
+    alternateClassName: 'Ext.layout.boxOverflow.Menu',
+    
+    /* End Definitions */
+
+    /**
+     * @cfg {String} triggerButtonCls
+     * CSS class added to the Button which shows the overflow menu.
+     */
+
+    /**
+     * @property {String} noItemsMenuText
+     * HTML fragment to render into the toolbar overflow menu if there are no items to display
+     */
+    noItemsMenuText : '<div class="' + Ext.baseCSSPrefix + 'toolbar-no-items">(None)</div>',
+
+    constructor: function(layout) {
+        var me = this;
+
+        me.callParent(arguments);
+
+        me.triggerButtonCls = me.triggerButtonCls || Ext.baseCSSPrefix + 'box-menu-after';
+        /**
+         * @property {Array} menuItems
+         * Array of all items that are currently hidden and should go into the dropdown menu
+         */
+        me.menuItems = [];
+    },
+
+    beginLayout: function (ownerContext) {
+        this.callParent(arguments);
+
+        // Before layout, we need to re-show all items which we may have hidden due to a
+        // previous overflow...
+        this.clearOverflow(ownerContext);
+    },
+
+    beginLayoutCycle: function (ownerContext, firstCycle) {
+        this.callParent(arguments);
+
+        if (!firstCycle) {
+            // if we are being re-run, we need to clear any overflow from the last run and
+            // recache the childItems collection
+            this.clearOverflow(ownerContext);
+
+            this.layout.cacheChildItems(ownerContext);
+        }
+    },
+
+    onRemove: function(comp){
+        Ext.Array.remove(this.menuItems, comp);
+    },
+
+    // We don't define a prefix in menu overflow.
+    getSuffixConfig: function() {
+        var me = this,
+            layout = me.layout,
+            owner = layout.owner,
+            oid = owner.id;
+
+        /**
+         * @private
+         * @property {Ext.menu.Menu} menu
+         * The expand menu - holds items for every item that cannot be shown
+         * because the container is currently not large enough.
+         */
+        me.menu = new Ext.menu.Menu({
+            listeners: {
+                scope: me,
+                beforeshow: me.beforeMenuShow
+            }
+        });
+
+        /**
+         * @private
+         * @property {Ext.button.Button} menuTrigger
+         * The expand button which triggers the overflow menu to be shown
+         */
+        me.menuTrigger = new Ext.button.Button({
+            id: oid + '-menu-trigger',
+            cls: Ext.layout.container.Box.prototype.innerCls + ' ' + me.triggerButtonCls + ' ' + Ext.baseCSSPrefix + 'toolbar-item',
+            plain: owner.usePlainButtons,
+            ownerCt: owner, // To enable the Menu to ascertain a valid zIndexManager owner in the same tree
+            ownerLayout: layout,
+            iconCls: Ext.baseCSSPrefix + me.getOwnerType(owner) + '-more-icon',
+            ui: owner instanceof Ext.toolbar.Toolbar ? 'default-toolbar' : 'default',
+            menu: me.menu,
+            // Menu will be empty when we're showing it because we populate items after
+            showEmptyMenu: true,
+            getSplitCls: function() { return '';}
+        });
+
+        return me.menuTrigger.getRenderTree();
+    },
+    
+    getOverflowCls: function() {
+        return Ext.baseCSSPrefix + this.layout.direction + '-box-overflow-body';
+    },
+
+    handleOverflow: function(ownerContext) {
+        var me = this,
+            layout = me.layout,
+            names = layout.names,
+            plan = ownerContext.state.boxPlan,
+            posArgs = [null, null];
+
+        me.showTrigger(ownerContext);
+
+        // Center the menuTrigger button only if we are not vertical.
+        // TODO: Should we emulate align: 'middle' like this, or should we 'stretchmax' the menuTrigger?
+        if (me.layout.direction !== 'vertical') {
+            posArgs[names.heightIndex] = (plan.maxSize - me.menuTrigger[names.getHeight]()) / 2;
+            me.menuTrigger.setPosition.apply(me.menuTrigger, posArgs);
+        }
+
+        return {
+            reservedSpace: me.triggerTotalWidth
+        };
+    },
+
+    /**
+     * Finishes the render operation of the trigger Button.
+     * @private
+     */
+    captureChildElements: function() {
+        var me = this,
+            menuTrigger = me.menuTrigger,
+            names = me.layout.names;
+
+        // The rendering flag is set when getRenderTree is called which we do when returning markup string for the owning layout's "suffix"
+        if (menuTrigger.rendering) {
+            menuTrigger.finishRender();
+            me.triggerTotalWidth = menuTrigger[names.getWidth]() + menuTrigger.el.getMargin(names.parallelMargins);
+        }
+    },
+
+    _asLayoutRoot: { isRoot: true },
+
+    /**
+     * @private
+     * Called by the layout, when it determines that there is no overflow.
+     * Also called as an interceptor to the layout's onLayout method to reshow
+     * previously hidden overflowing items.
+     */
+    clearOverflow: function(ownerContext) {
+        var me = this,
+            items = me.menuItems,
+            item,
+            i = 0,
+            length = items.length,
+            owner = me.layout.owner,
+            asLayoutRoot = me._asLayoutRoot;
+
+        owner.suspendLayouts();
+        me.captureChildElements();
+        me.hideTrigger();
+        owner.resumeLayouts();
+
+        for (; i < length; i++) {
+            item = items[i];
+
+            // What we are doing here is preventing the layout bubble from invalidating our
+            // owner component. We need just the button to be added to the layout run.
+            item.suspendLayouts();
+            item.show();
+            item.resumeLayouts(asLayoutRoot);
+        }
+
+        items.length = 0;
+    },
+
+    /**
+     * @private
+     * Shows the overflow trigger when enableOverflow is set to true and the items
+     * in the layout are too wide to fit in the space available
+     */
+    showTrigger: function(ownerContext) {
+        var me = this,
+            layout = me.layout,
+            owner = layout.owner,
+            names = layout.names,
+            startProp = names.x,
+            sizeProp = names.width,
+            plan = ownerContext.state.boxPlan,
+            available = plan.targetSize[sizeProp],
+            childItems = ownerContext.childItems,
+            len = childItems.length,
+            menuTrigger = me.menuTrigger,
+            childContext,
+            comp, i, props;
+
+        // We don't want the menuTrigger.show to cause owner's layout to be invalidated, so
+        // we force just the button to be invalidated and added to the current run.
+        menuTrigger.suspendLayouts();
+        menuTrigger.show();
+        menuTrigger.resumeLayouts(me._asLayoutRoot);
+
+        available -= me.triggerTotalWidth;
+
+        owner.suspendLayouts();
+
+        // Hide all items which are off the end, and store them to allow them to be restored
+        // before each layout operation.
+        me.menuItems.length = 0;
+        for (i = 0; i < len; i++) {
+            childContext = childItems[i];
+            props = childContext.props;
+            if (props[startProp] + props[sizeProp] > available) {
+                comp = childContext.target;
+                me.menuItems.push(comp);
+                comp.hide();
+            }
+        }
+
+        owner.resumeLayouts();
+    },
+
+    /**
+     * @private
+     */
+    hideTrigger: function() {
+        var menuTrigger = this.menuTrigger;
+        if (menuTrigger) {
+            menuTrigger.hide();
+        }
+    },
+
+    /**
+     * @private
+     * Called before the overflow menu is shown. This constructs the menu's items, caching them for as long as it can.
+     */
+    beforeMenuShow: function(menu) {
+        var me = this,
+            items = me.menuItems,
+            i = 0,
+            len   = items.length,
+            item,
+            prev,
+            needsSep = function(group, prev){
+                return group.isXType('buttongroup') && !(prev instanceof Ext.toolbar.Separator);
+            };
+
+        menu.suspendLayouts();
+        me.clearMenu();
+        menu.removeAll();
+
+        for (; i < len; i++) {
+            item = items[i];
+
+            // Do not show a separator as a first item
+            if (!i && (item instanceof Ext.toolbar.Separator)) {
+                continue;
+            }
+            if (prev && (needsSep(item, prev) || needsSep(prev, item))) {
+                menu.add('-');
+            }
+
+            me.addComponentToMenu(menu, item);
+            prev = item;
+        }
+
+        // put something so the menu isn't empty if no compatible items found
+        if (menu.items.length < 1) {
+            menu.add(me.noItemsMenuText);
+        }
+        menu.resumeLayouts();
+    },
+    
+    /**
+     * @private
+     * Returns a menu config for a given component. This config is used to create a menu item
+     * to be added to the expander menu
+     * @param {Ext.Component} component The component to create the config for
+     * @param {Boolean} hideOnClick Passed through to the menu item
+     */
+    createMenuConfig : function(component, hideOnClick) {
+        var me = this,
+            config = Ext.apply({}, component.initialConfig),
+            group  = component.toggleGroup;
+
+        Ext.copyTo(config, component, [
+            'iconCls', 'icon', 'itemId', 'disabled', 'handler', 'scope', 'menu', 'tabIndex'
+        ]);
+
+        Ext.apply(config, {
+            text       : component.overflowText || component.text,
+            hideOnClick: hideOnClick,
+            destroyMenu: false,
+            listeners  : {}
+        });
+
+        // Clone must have same value, and must sync original's value on change
+        if (component.isFormField) {
+            config.value = component.getValue();
+
+            // Sync the original component's value when the clone changes value.
+            // This intentionally overwrites any developer-configured change listener on the clone.
+            // That's because we monitor the clone's change event, and sync the
+            // original field by calling setValue, so the original field's change
+            // event will still fire.
+            config.listeners.change = function(c, newVal, oldVal) {                            
+                component.setValue(newVal);
+            }
+        }
+
+        // ToggleButtons become CheckItems
+        else if (group || component.enableToggle) {
+            Ext.apply(config, {
+                hideOnClick: false,
+                group  : group,
+                checked: component.pressed,
+                handler: function(item, e) {
+                    component.onClick(e);
+                }
+            });
+        }
+
+        // Buttons may have their text or icon changed - this must be propagated to the clone in the overflow menu
+        if (component.isButton && !component.changeListenersAdded) {
+            component.on({
+                textchange: me.onButtonAttrChange,
+                iconchange: me.onButtonAttrChange,
+                toggle:     me.onButtonToggle
+            });
+            component.changeListenersAdded = true;
+        }
+
+        // Typically margins are used to separate items in a toolbar
+        // but don't really make a lot of sense in a menu, so we strip
+        // them out here.
+        delete config.margin;
+        delete config.ownerCt;
+        delete config.xtype;
+        delete config.id;
+        delete config.itemId;
+        return config;
+    },
+
+    onButtonAttrChange: function(btn) {
+        var clone = btn.overflowClone;
+        clone.suspendLayouts();
+        clone.setText(btn.text);
+        clone.setIcon(btn.icon);
+        clone.setIconCls(btn.iconCls);
+        clone.resumeLayouts(true);
+    },
+
+    onButtonToggle: function(btn, state) {
+        // Keep the clone in sync with the original if necessary
+        if (btn.overflowClone.checked !== state) {
+            btn.overflowClone.setChecked(state);
+        }
+    },
+
+    /**
+     * @private
+     * Adds the given Toolbar item to the given menu. Buttons inside a buttongroup are added individually.
+     * @param {Ext.menu.Menu} menu The menu to add to
+     * @param {Ext.Component} component The component to add
+     * TODO: Implement overrides in Ext.layout.container.boxOverflow which create overrides
+     * for SplitButton, Button, ButtonGroup, and TextField. And a generic one for Component
+     * which create clones suitable for use in an overflow menu.
+     */
+    addComponentToMenu : function(menu, component) {
+        var me = this,
+        i, items, iLen;
+
+        if (component instanceof Ext.toolbar.Separator) {
+            menu.add('-');
+        } else if (component.isComponent) {
+            if (component.isXType('splitbutton')) {
+                component.overflowClone = menu.add(me.createMenuConfig(component, true));
+
+            } else if (component.isXType('button')) {
+                component.overflowClone = menu.add(me.createMenuConfig(component, !component.menu));
+
+            } else if (component.isXType('buttongroup')) {
+                items = component.items.items;
+                iLen  = items.length;
+
+                for (i = 0; i < iLen; i++) {
+                    me.addComponentToMenu(menu, items[i]);
+                }
+            } else {
+                component.overflowClone = menu.add(Ext.create(Ext.getClassName(component), me.createMenuConfig(component)));
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Deletes the sub-menu of each item in the expander menu. Submenus are created for items such as
+     * splitbuttons and buttongroups, where the Toolbar item cannot be represented by a single menu item
+     */
+    clearMenu : function() {
+        var menu = this.menu,
+            items, i, iLen, item;
+        
+        if (menu && menu.items) {
+            items = menu.items.items;
+            iLen  = items.length;
+            
+            for (i = 0; i < iLen; i++) {
+                item = items[i];
+                if (item.setMenu) {
+                    item.setMenu(null);
+                }
+            }
+        }
+    },
+
+    /**
+     * @private
+     */
+    destroy: function() {
+        var trigger = this.menuTrigger;
+            
+        if (trigger && !this.layout.owner.items.contains(trigger)) {
+            // Ensure we delete the ownerCt if it's not in the items
+            // so we don't get spurious container remove warnings.
+            delete trigger.ownerCt;
+        }
+        Ext.destroy(this.menu, trigger);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.layout.container.boxOverflow.Scroller', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.layout.container.boxOverflow.None ,
+                                                        
+    alternateClassName: 'Ext.layout.boxOverflow.Scroller',
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+    
+    /* End Definitions */
+
+    /**
+     * @cfg {Boolean} animateScroll
+     * True to animate the scrolling of items within the layout (ignored if enableScroll is false)
+     */
+    animateScroll: false,
+
+    /**
+     * @cfg {Number} scrollIncrement
+     * The number of pixels to scroll by on scroller click
+     */
+    scrollIncrement: 20,
+
+    /**
+     * @cfg {Number} wheelIncrement
+     * The number of pixels to increment on mouse wheel scrolling.
+     */
+    wheelIncrement: 10,
+
+    /**
+     * @cfg {Number} scrollRepeatInterval
+     * Number of milliseconds between each scroll while a scroller button is held down
+     */
+    scrollRepeatInterval: 60,
+
+    /**
+     * @cfg {Number} scrollDuration
+     * Number of milliseconds that each scroll animation lasts
+     */
+    scrollDuration: 400,
+
+    /**
+     * @cfg {String} beforeCtCls
+     * CSS class added to the beforeCt element. This is the element that holds any special items such as scrollers,
+     * which must always be present at the leftmost edge of the Container
+     */
+
+    /**
+     * @cfg {String} afterCtCls
+     * CSS class added to the afterCt element. This is the element that holds any special items such as scrollers,
+     * which must always be present at the rightmost edge of the Container
+     */
+
+    /**
+     * @cfg {String} [scrollerCls='x-box-scroller']
+     * CSS class added to both scroller elements if enableScroll is used
+     */
+    scrollerCls: Ext.baseCSSPrefix + 'box-scroller',
+
+    /**
+     * @cfg {String} beforeScrollerCls
+     * CSS class added to the left scroller element if enableScroll is used
+     */
+
+    /**
+     * @cfg {String} afterScrollerCls
+     * CSS class added to the right scroller element if enableScroll is used
+     */
+
+    constructor: function(layout, config) {
+        var me = this;
+
+        me.layout = layout;
+        Ext.apply(me, config || {});
+
+        // Dont pass the config so that it is not applied to 'this' again
+        me.mixins.observable.constructor.call(me);
+
+        me.addEvents(
+            /**
+             * @event scroll
+             * @param {Ext.layout.container.boxOverflow.Scroller} scroller The layout scroller
+             * @param {Number} newPosition The new position of the scroller
+             * @param {Boolean/Object} animate If animating or not. If true, it will be a animation configuration, else it will be false
+             */
+            'scroll'
+        );
+        me.scrollPosition = 0;
+        me.scrollSize = 0;
+    },
+
+    getPrefixConfig: function() {
+        var me = this,
+            layout = me.layout,
+            owner = layout.owner,
+            cls;
+
+        me.initCSSClasses();
+        cls = Ext.layout.container.Box.prototype.innerCls + ' ' + me.beforeCtCls;
+        if (owner.plain) {
+            // Add plain class for components that need separate "plain" styling (e.g. tab bar)
+            cls += ' ' + me.scrollerCls + '-plain';
+        }
+        return {
+            cls: cls,
+            cn : {
+                id : owner.id + layout.names.beforeScrollerSuffix,
+                cls: me.scrollerCls + ' ' + me.beforeScrollerCls,
+                style: 'display:none'
+            }
+        };
+    },
+
+    getSuffixConfig: function() {
+        var me = this,
+            layout = me.layout,
+            owner = layout.owner,
+            cls = Ext.layout.container.Box.prototype.innerCls + ' ' + me.afterCtCls;
+
+        if (owner.plain) {
+            // Add plain class for components that need separate "plain" styling (e.g. tab bar)
+            cls += ' ' + me.scrollerCls + '-plain';
+        }
+        return {
+            cls: cls,
+            cn : {
+                id : owner.id + layout.names.afterScrollerSuffix,
+                cls: me.scrollerCls + ' ' + me.afterScrollerCls,
+                style: 'display:none'
+            }
+        };
+    },
+
+    getOverflowCls: function() {
+        return Ext.baseCSSPrefix + this.layout.direction + '-box-overflow-body';
+    },
+
+    initCSSClasses: function() {
+        var me = this,
+            prefix = Ext.baseCSSPrefix,
+            layout = me.layout,
+            names = layout.names,
+            beforeXName = names.beforeX,
+            afterXName = names.afterX,
+            type = me.getOwnerType(layout.owner);
+
+        me.beforeCtCls = me.beforeCtCls || prefix + 'box-scroller-' + beforeXName;
+        me.afterCtCls  = me.afterCtCls  || prefix + 'box-scroller-' + afterXName;
+        
+        me.beforeScrollerCls = me.beforeScrollerCls || prefix + type + '-scroll-' + beforeXName;
+        me.afterScrollerCls  = me.afterScrollerCls  || prefix + type + '-scroll-' + afterXName;
+    },
+
+    beginLayout: function (ownerContext) {
+        var layout = this.layout;
+
+        ownerContext.innerCtScrollPos = this.getScrollPosition();
+
+        this.callParent(arguments);
+    },
+
+    completeLayout: function(ownerContext) {
+        var me = this,
+            plan = ownerContext.state.boxPlan,
+            names = me.layout.names,
+            last;
+
+        // If there is overflow...
+        if (plan && plan.tooNarrow) {
+            last = ownerContext.childItems[ownerContext.childItems.length - 1];
+
+            // capture this before callParent since it calls handle/clearOverflow:
+            me.scrollSize = last.props[names.x] + last.props[names.width];
+            me.updateScrollButtons();
+        }
+        this.callParent(arguments);
+    },
+
+    finishedLayout: function(ownerContext) {
+        var me = this,
+            layout = me.layout,
+            scrollPos = Math.min(me.getMaxScrollPosition(), ownerContext.innerCtScrollPos);
+
+        layout.innerCt[layout.names.setScrollLeft](scrollPos);
+    },
+
+    handleOverflow: function(ownerContext) {
+        var me = this,
+            methodName = me.layout.names.getWidth;
+
+        me.showScrollers();
+        return {
+            reservedSpace: me.beforeCt[methodName]() + me.afterCt[methodName]()
+        };
+    },
+
+    /**
+     * @private
+     * Gets references to the beforeCt and afterCt elements if they have not already been captured
+     * and creates click handlers for them.
+     */
+    captureChildElements: function() {
+        var me = this,
+            el = me.layout.owner.el,
+            before, after, hoverCls, pressedSuffix, pressedCls, hoverSuffix;
+
+        // Grab the scroll click receiving elements
+        if (!me.beforeCt) {
+            hoverSuffix = '-hover';
+            pressedSuffix = '-pressed';
+            hoverCls = me.scrollerCls + hoverSuffix;
+            pressedCls = me.scrollerCls + pressedSuffix;
+            before = me.beforeScroller = el.getById(me.layout.owner.id + '-before-scroller');
+            after = me.afterScroller = el.getById(me.layout.owner.id + '-after-scroller');
+            me.beforeCt = before.up('');
+            me.afterCt = after.up('');
+            me.createWheelListener();
+
+            before.addClsOnOver(hoverCls);
+            before.addClsOnOver(me.beforeScrollerCls + hoverSuffix);
+            before.addClsOnClick(pressedCls);
+            before.addClsOnClick(me.beforeScrollerCls + pressedSuffix);
+            after.addClsOnOver(hoverCls);
+            after.addClsOnOver(me.afterScrollerCls + hoverSuffix);
+            after.addClsOnClick(pressedCls);
+            after.addClsOnClick(me.afterScrollerCls + pressedSuffix);
+
+            before.setVisibilityMode(Ext.Element.DISPLAY);
+            after.setVisibilityMode(Ext.Element.DISPLAY);
+
+            me.beforeRepeater = new Ext.util.ClickRepeater(before, {
+                interval: me.scrollRepeatInterval,
+                handler : me.scrollLeft,
+                scope   : me
+            });
+
+            me.afterRepeater = new Ext.util.ClickRepeater(after, {
+                interval: me.scrollRepeatInterval,
+                handler : me.scrollRight,
+                scope   : me
+            });
+        }
+    },
+
+    /**
+     * @private
+     * Sets up an listener to scroll on the layout's innerCt mousewheel event
+     */
+    createWheelListener: function() {
+        var me = this;
+        me.layout.innerCt.on({
+            mousewheel: function(e) {
+                me.scrollBy(me.getWheelDelta(e) * me.wheelIncrement * -1, false);
+            },
+            stopEvent: true
+        });
+    },
+
+    getWheelDelta: function (e) {
+        return e.getWheelDelta();
+    },
+
+    /**
+     * @private
+     */
+    clearOverflow: function () {
+        this.hideScrollers();
+    },
+
+    /**
+     * @private
+     * Shows the scroller elements in the beforeCt and afterCt. Creates the scrollers first if they are not already
+     * present. 
+     */
+    showScrollers: function() {
+        var me = this;
+
+        me.captureChildElements();
+        me.beforeScroller.show();
+        me.afterScroller.show();
+        me.layout.owner.addClsWithUI(me.layout.direction === 'vertical' ? 'vertical-scroller' : 'scroller');
+        // TODO - this may invalidates data in the ContextItem's styleCache
+    },
+
+    /**
+     * @private
+     * Hides the scroller elements in the beforeCt and afterCt
+     */
+    hideScrollers: function() {
+        var me = this;
+
+        if (me.beforeScroller !== undefined) {
+            me.beforeScroller.hide();
+            me.afterScroller.hide();
+            me.layout.owner.removeClsWithUI(me.layout.direction === 'vertical' ? 'vertical-scroller' : 'scroller');
+            // TODO - this may invalidates data in the ContextItem's styleCache
+        }
+    },
+
+    /**
+     * @private
+     */
+    destroy: function() {
+        var me = this;
+
+        Ext.destroy(me.beforeRepeater, me.afterRepeater, me.beforeScroller, me.afterScroller, me.beforeCt, me.afterCt);
+    },
+
+    /**
+     * @private
+     * Scrolls left or right by the number of pixels specified
+     * @param {Number} delta Number of pixels to scroll to the right by. Use a negative number to scroll left
+     */
+    scrollBy: function(delta, animate) {
+        this.scrollTo(this.getScrollPosition() + delta, animate);
+    },
+
+    /**
+     * @private
+     * @return {Object} Object passed to scrollTo when scrolling
+     */
+    getScrollAnim: function() {
+        return {
+            duration: this.scrollDuration, 
+            callback: this.updateScrollButtons, 
+            scope   : this
+        };
+    },
+
+    /**
+     * @private
+     * Enables or disables each scroller button based on the current scroll position
+     */
+    updateScrollButtons: function() {
+        var me = this,
+            beforeMeth,
+            afterMeth,
+            beforeCls,
+            afterCls,
+            disabledCls,
+            suffix = '-disabled';
+            
+        if (me.beforeScroller == null || me.afterScroller == null) {
+            return;
+        }
+
+        beforeMeth = me.atExtremeBefore()  ? 'addCls' : 'removeCls';
+        afterMeth  = me.atExtremeAfter() ? 'addCls' : 'removeCls';
+        disabledCls = me.scrollerCls + suffix;
+        beforeCls = [disabledCls, me.beforeScrollerCls + suffix];
+        afterCls = [disabledCls, me.afterScrollerCls  + suffix];
+
+        me.beforeScroller[beforeMeth](beforeCls);
+        me.afterScroller[afterMeth](afterCls);
+        me.scrolling = false;
+    },
+
+    /**
+     * @private
+     * Scrolls to the left by the configured amount
+     */
+    scrollLeft: function() {
+        this.scrollBy(-this.scrollIncrement, false);
+    },
+
+    /**
+     * @private
+     * Scrolls to the right by the configured amount
+     */
+    scrollRight: function() {
+        this.scrollBy(this.scrollIncrement, false);
+    },
+
+    /**
+     * Returns the current scroll position of the innerCt element
+     * @return {Number} The current scroll position
+     */
+    getScrollPosition: function(){
+        var me = this,
+            layout = me.layout,
+            result;
+
+        // Until we actually scroll, the scroll[Top|Left] is stored as zero to avoid DOM
+        // hits, after that it's NaN.
+        if (isNaN(me.scrollPosition)) {
+            result = layout.innerCt[layout.names.getScrollLeft]();
+        } else {
+            result = me.scrollPosition;
+        }
+        return result;
+    },
+
+    /**
+     * @private
+     * Returns the maximum value we can scrollTo
+     * @return {Number} The max scroll value
+     */
+    getMaxScrollPosition: function() {
+        var me = this,
+            layout = me.layout,
+            maxScrollPos = me.scrollSize - layout.innerCt[layout.names.getWidth]();
+
+        return (maxScrollPos < 0) ? 0 : maxScrollPos;
+    },
+
+    /**
+     * @private
+     * Returns true if the innerCt scroll is already at its left-most point
+     * @return {Boolean} True if already at furthest left point
+     */
+    atExtremeBefore: function() {
+        return !this.getScrollPosition();
+    },
+
+    /**
+     * @private
+     * Returns true if the innerCt scroll is already at its right-most point
+     * @return {Boolean} True if already at furthest right point
+     */
+    atExtremeAfter: function() {
+        return this.getScrollPosition() >= this.getMaxScrollPosition();
+    },
+
+    /**
+     * @private
+     * Scrolls to the given position. Performs bounds checking.
+     * @param {Number} position The position to scroll to. This is constrained.
+     * @param {Boolean} animate True to animate. If undefined, falls back to value of this.animateScroll
+     */
+    scrollTo: function(position, animate) {
+        var me = this,
+            layout = me.layout,
+            names = layout.names,
+            oldPosition = me.getScrollPosition(),
+            newPosition = Ext.Number.constrain(position, 0, me.getMaxScrollPosition());
+
+        if (newPosition != oldPosition && !me.scrolling) {
+            me.scrollPosition = NaN;
+            if (animate === undefined) {
+                animate = me.animateScroll;
+            }
+
+            layout.innerCt[names.scrollTo](names.beforeScrollX, newPosition, animate ? me.getScrollAnim() : false);
+            if (animate) {
+                me.scrolling = true;
+            } else {
+                me.updateScrollButtons();
+            }
+            me.fireEvent('scroll', me, newPosition, animate ? me.getScrollAnim() : false);
+        }
+    },
+
+    /**
+     * Scrolls to the given component.
+     * @param {String/Number/Ext.Component} item The item to scroll to. Can be a numerical index, component id 
+     * or a reference to the component itself.
+     * @param {Boolean} animate True to animate the scrolling
+     */
+    scrollToItem: function(item, animate) {
+        var me = this,
+            layout = me.layout,
+            owner = layout.owner,
+            names = layout.names,
+            visibility,
+            box,
+            newPos;
+
+        item = me.getItem(item);
+        if (item !== undefined) {
+            if (item == owner.items.first()) {
+                newPos = 0
+            } else if (item === owner.items.last()) {
+                newPos = me.getMaxScrollPosition();
+            } else {
+                visibility = me.getItemVisibility(item);
+                if (!visibility.fullyVisible) {
+                    box = item.getBox(false, true);
+                    newPos = box[names.x];
+                    if (visibility.hiddenEnd) {
+                        newPos -= (me.layout.innerCt[names.getWidth]() - box[names.width]);
+                    }
+                }
+            }
+            if (newPos !== undefined) {
+                me.scrollTo(newPos, animate);
+            }
+        }
+    },
+
+    /**
+     * @private
+     * For a given item in the container, return an object with information on whether the item is visible
+     * with the current innerCt scroll value.
+     * @param {Ext.Component} item The item
+     * @return {Object} Values for fullyVisible, hiddenStart and hiddenEnd
+     */
+    getItemVisibility: function(item) {
+        var me          = this,
+            box         = me.getItem(item).getBox(true, true),
+            layout      = me.layout,
+            names       = layout.names,
+            itemStart   = box[names.x],
+            itemEnd     = itemStart + box[names.width],
+            scrollStart = me.getScrollPosition(),
+            scrollEnd   = scrollStart + layout.innerCt[names.getWidth]();
+
+        return {
+            hiddenStart : itemStart < scrollStart,
+            hiddenEnd   : itemEnd > scrollEnd,
+            fullyVisible: itemStart > scrollStart && itemEnd < scrollEnd
+        };
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @require Ext.CompositeElement
+/**
+ * @private
+ */
+Ext.define('Ext.util.Offset', {
+
+    /* Begin Definitions */
+
+    statics: {
+        fromObject: function(obj) {
+            return new this(obj.x, obj.y);
+        }
+    },
+
+    /* End Definitions */
+
+    constructor: function(x, y) {
+        this.x = (x != null && !isNaN(x)) ? x : 0;
+        this.y = (y != null && !isNaN(y)) ? y : 0;
+
+        return this;
+    },
+
+    copy: function() {
+        return new Ext.util.Offset(this.x, this.y);
+    },
+
+    copyFrom: function(p) {
+        this.x = p.x;
+        this.y = p.y;
+    },
+
+    toString: function() {
+        return "Offset[" + this.x + "," + this.y + "]";
+    },
+
+    equals: function(offset) {
+        if(!(offset instanceof this.statics())) {
+            Ext.Error.raise('Offset must be an instance of Ext.util.Offset');
+        }
+
+        return (this.x == offset.x && this.y == offset.y);
+    },
+
+    round: function(to) {
+        if (!isNaN(to)) {
+            var factor = Math.pow(10, to);
+            this.x = Math.round(this.x * factor) / factor;
+            this.y = Math.round(this.y * factor) / factor;
+        } else {
+            this.x = Math.round(this.x);
+            this.y = Math.round(this.y);
+        }
+    },
+
+    isZero: function() {
+        return this.x == 0 && this.y == 0;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class represents a rectangular region in X,Y space, and performs geometric
+ * transformations or tests upon the region.
+ *
+ * This class may be used to compare the document regions occupied by elements.
+ */
+Ext.define('Ext.util.Region', {
+
+    /* Begin Definitions */
+
+                                  
+
+    statics: {
+        /**
+         * @static
+         * Retrieves an Ext.util.Region for a particular element.
+         * @param {String/HTMLElement/Ext.Element} el An element ID, htmlElement or Ext.Element representing an element in the document.
+         * @returns {Ext.util.Region} region
+         */
+        getRegion: function(el) {
+            return Ext.fly(el).getRegion();
+        },
+
+        /**
+         * @static
+         * Creates a Region from a "box" Object which contains four numeric properties `top`, `right`, `bottom` and `left`.
+         * @param {Object} o An object with `top`, `right`, `bottom` and `left` properties.
+         * @return {Ext.util.Region} region The Region constructed based on the passed object
+         */
+        from: function(o) {
+            return new this(o.top, o.right, o.bottom, o.left);
+        }
+    },
+
+    /* End Definitions */
+
+    /**
+     * Creates a region from the bounding sides.
+     * @param {Number} top Top The topmost pixel of the Region.
+     * @param {Number} right Right The rightmost pixel of the Region.
+     * @param {Number} bottom Bottom The bottom pixel of the Region.
+     * @param {Number} left Left The leftmost pixel of the Region.
+     */
+    constructor : function(t, r, b, l) {
+        var me = this;
+        me.y = me.top = me[1] = t;
+        me.right = r;
+        me.bottom = b;
+        me.x = me.left = me[0] = l;
+    },
+
+    /**
+     * Checks if this region completely contains the region that is passed in.
+     * @param {Ext.util.Region} region
+     * @return {Boolean}
+     */
+    contains : function(region) {
+        var me = this;
+        return (region.x >= me.x &&
+                region.right <= me.right &&
+                region.y >= me.y &&
+                region.bottom <= me.bottom);
+
+    },
+
+    /**
+     * Checks if this region intersects the region passed in.
+     * @param {Ext.util.Region} region
+     * @return {Ext.util.Region/Boolean} Returns the intersected region or false if there is no intersection.
+     */
+    intersect : function(region) {
+        var me = this,
+            t = Math.max(me.y, region.y),
+            r = Math.min(me.right, region.right),
+            b = Math.min(me.bottom, region.bottom),
+            l = Math.max(me.x, region.x);
+
+        if (b > t && r > l) {
+            return new this.self(t, r, b, l);
+        }
+        else {
+            return false;
+        }
+    },
+
+    /**
+     * Returns the smallest region that contains the current AND targetRegion.
+     * @param {Ext.util.Region} region
+     * @return {Ext.util.Region} a new region
+     */
+    union : function(region) {
+        var me = this,
+            t = Math.min(me.y, region.y),
+            r = Math.max(me.right, region.right),
+            b = Math.max(me.bottom, region.bottom),
+            l = Math.min(me.x, region.x);
+
+        return new this.self(t, r, b, l);
+    },
+
+    /**
+     * Modifies the current region to be constrained to the targetRegion.
+     * @param {Ext.util.Region} targetRegion
+     * @return {Ext.util.Region} this
+     */
+    constrainTo : function(r) {
+        var me = this,
+            constrain = Ext.Number.constrain;
+        me.top = me.y = constrain(me.top, r.y, r.bottom);
+        me.bottom = constrain(me.bottom, r.y, r.bottom);
+        me.left = me.x = constrain(me.left, r.x, r.right);
+        me.right = constrain(me.right, r.x, r.right);
+        return me;
+    },
+
+    /**
+     * Modifies the current region to be adjusted by offsets.
+     * @param {Number} top top offset
+     * @param {Number} right right offset
+     * @param {Number} bottom bottom offset
+     * @param {Number} left left offset
+     * @return {Ext.util.Region} this
+     */
+    adjust : function(t, r, b, l) {
+        var me = this;
+        me.top = me.y += t;
+        me.left = me.x += l;
+        me.right += r;
+        me.bottom += b;
+        return me;
+    },
+
+    /**
+     * Get the offset amount of a point outside the region
+     * @param {String} [axis]
+     * @param {Ext.util.Point} [p] the point
+     * @return {Ext.util.Offset}
+     */
+    getOutOfBoundOffset: function(axis, p) {
+        if (!Ext.isObject(axis)) {
+            if (axis == 'x') {
+                return this.getOutOfBoundOffsetX(p);
+            } else {
+                return this.getOutOfBoundOffsetY(p);
+            }
+        } else {
+            p = axis;
+            var d = new Ext.util.Offset();
+            d.x = this.getOutOfBoundOffsetX(p.x);
+            d.y = this.getOutOfBoundOffsetY(p.y);
+            return d;
+        }
+
+    },
+
+    /**
+     * Get the offset amount on the x-axis
+     * @param {Number} p the offset
+     * @return {Number}
+     */
+    getOutOfBoundOffsetX: function(p) {
+        if (p <= this.x) {
+            return this.x - p;
+        } else if (p >= this.right) {
+            return this.right - p;
+        }
+
+        return 0;
+    },
+
+    /**
+     * Get the offset amount on the y-axis
+     * @param {Number} p the offset
+     * @return {Number}
+     */
+    getOutOfBoundOffsetY: function(p) {
+        if (p <= this.y) {
+            return this.y - p;
+        } else if (p >= this.bottom) {
+            return this.bottom - p;
+        }
+
+        return 0;
+    },
+
+    /**
+     * Check whether the point / offset is out of bound
+     * @param {String} [axis]
+     * @param {Ext.util.Point/Number} [p] the point / offset
+     * @return {Boolean}
+     */
+    isOutOfBound: function(axis, p) {
+        if (!Ext.isObject(axis)) {
+            if (axis == 'x') {
+                return this.isOutOfBoundX(p);
+            } else {
+                return this.isOutOfBoundY(p);
+            }
+        } else {
+            p = axis;
+            return (this.isOutOfBoundX(p.x) || this.isOutOfBoundY(p.y));
+        }
+    },
+
+    /**
+     * Check whether the offset is out of bound in the x-axis
+     * @param {Number} p the offset
+     * @return {Boolean}
+     */
+    isOutOfBoundX: function(p) {
+        return (p < this.x || p > this.right);
+    },
+
+    /**
+     * Check whether the offset is out of bound in the y-axis
+     * @param {Number} p the offset
+     * @return {Boolean}
+     */
+    isOutOfBoundY: function(p) {
+        return (p < this.y || p > this.bottom);
+    },
+
+    /**
+     * Restrict a point within the region by a certain factor.
+     * @param {String} [axis]
+     * @param {Ext.util.Point/Ext.util.Offset/Object} [p]
+     * @param {Number} [factor]
+     * @return {Ext.util.Point/Ext.util.Offset/Object/Number}
+     * @private
+     */
+    restrict: function(axis, p, factor) {
+        if (Ext.isObject(axis)) {
+            var newP;
+
+            factor = p;
+            p = axis;
+
+            if (p.copy) {
+                newP = p.copy();
+            }
+            else {
+                newP = {
+                    x: p.x,
+                    y: p.y
+                };
+            }
+
+            newP.x = this.restrictX(p.x, factor);
+            newP.y = this.restrictY(p.y, factor);
+            return newP;
+        } else {
+            if (axis == 'x') {
+                return this.restrictX(p, factor);
+            } else {
+                return this.restrictY(p, factor);
+            }
+        }
+    },
+
+    /**
+     * Restrict an offset within the region by a certain factor, on the x-axis
+     * @param {Number} p
+     * @param {Number} [factor=1] The factor.
+     * @return {Number}
+     * @private
+     */
+    restrictX : function(p, factor) {
+        if (!factor) {
+            factor = 1;
+        }
+
+        if (p <= this.x) {
+            p -= (p - this.x) * factor;
+        }
+        else if (p >= this.right) {
+            p -= (p - this.right) * factor;
+        }
+        return p;
+    },
+
+    /**
+     * Restrict an offset within the region by a certain factor, on the y-axis
+     * @param {Number} p
+     * @param {Number} [factor] The factor, defaults to 1
+     * @return {Number}
+     * @private
+     */
+    restrictY : function(p, factor) {
+        if (!factor) {
+            factor = 1;
+        }
+
+        if (p <= this.y) {
+            p -= (p - this.y) * factor;
+        }
+        else if (p >= this.bottom) {
+            p -= (p - this.bottom) * factor;
+        }
+        return p;
+    },
+
+    /**
+     * Get the width / height of this region
+     * @return {Object} an object with width and height properties
+     * @private
+     */
+    getSize: function() {
+        return {
+            width: this.right - this.x,
+            height: this.bottom - this.y
+        };
+    },
+
+    /**
+     * Create a copy of this Region.
+     * @return {Ext.util.Region}
+     */
+    copy: function() {
+        return new this.self(this.y, this.right, this.bottom, this.x);
+    },
+
+    /**
+     * Copy the values of another Region to this Region
+     * @param {Ext.util.Region} p The region to copy from.
+     * @return {Ext.util.Region} This Region
+     */
+    copyFrom: function(p) {
+        var me = this;
+        me.top = me.y = me[1] = p.y;
+        me.right = p.right;
+        me.bottom = p.bottom;
+        me.left = me.x = me[0] = p.x;
+
+        return this;
+    },
+
+    /*
+     * Dump this to an eye-friendly string, great for debugging
+     * @return {String}
+     */
+    toString: function() {
+        return "Region[" + this.top + "," + this.right + "," + this.bottom + "," + this.left + "]";
+    },
+
+    /**
+     * Translate this region by the given offset amount
+     * @param {Ext.util.Offset/Object} x Object containing the `x` and `y` properties.
+     * Or the x value is using the two argument form.
+     * @param {Number} y The y value unless using an Offset object.
+     * @return {Ext.util.Region} this This Region
+     */
+    translateBy: function(x, y) {
+        if (arguments.length == 1) {
+            y = x.y;
+            x = x.x;
+        }
+        var me = this;
+        me.top = me.y += y;
+        me.right += x;
+        me.bottom += y;
+        me.left = me.x += x;
+
+        return me;
+    },
+
+    /**
+     * Round all the properties of this region
+     * @return {Ext.util.Region} this This Region
+     */
+    round: function() {
+        var me = this;
+        me.top = me.y = Math.round(me.y);
+        me.right = Math.round(me.right);
+        me.bottom = Math.round(me.bottom);
+        me.left = me.x = Math.round(me.x);
+
+        return me;
+    },
+
+    /**
+     * Check whether this region is equivalent to the given region
+     * @param {Ext.util.Region} region The region to compare with
+     * @return {Boolean}
+     */
+    equals: function(region) {
+        return (this.top == region.top && this.right == region.right && this.bottom == region.bottom && this.left == region.left);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/*
+ * This is a derivative of the similarly named class in the YUI Library.
+ * The original license:
+ * Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ */
+
+
+/**
+ * DragDropManager is a singleton that tracks the element interaction for
+ * all DragDrop items in the window.  Generally, you will not call
+ * this class directly, but it does have helper methods that could
+ * be useful in your DragDrop implementations.
+ */
+Ext.define('Ext.dd.DragDropManager', {
+    singleton: true,
+
+                                  
+
+                                      
+
+    // shorter ClassName, to save bytes and use internally
+    alternateClassName: ['Ext.dd.DragDropMgr', 'Ext.dd.DDM'],
+
+    /**
+     * @property {String[]} ids
+     * Two dimensional Array of registered DragDrop objects.  The first
+     * dimension is the DragDrop item group, the second the DragDrop
+     * object.
+     * @private
+     */
+    ids: {},
+
+    /**
+     * @property {String[]} handleIds
+     * Array of element ids defined as drag handles.  Used to determine
+     * if the element that generated the mousedown event is actually the
+     * handle and not the html element itself.
+     * @private
+     */
+    handleIds: {},
+
+    /**
+     * @property {Ext.dd.DragDrop} dragCurrent
+     * the DragDrop object that is currently being dragged
+     * @private
+     */
+    dragCurrent: null,
+
+    /**
+     * @property {Ext.dd.DragDrop[]} dragOvers
+     * the DragDrop object(s) that are being hovered over
+     * @private
+     */
+    dragOvers: {},
+
+    /**
+     * @property {Number} deltaX
+     * the X distance between the cursor and the object being dragged
+     * @private
+     */
+    deltaX: 0,
+
+    /**
+     * @property {Number} deltaY
+     * the Y distance between the cursor and the object being dragged
+     * @private
+     */
+    deltaY: 0,
+
+    /**
+     * @property {Boolean} preventDefault
+     * Flag to determine if we should prevent the default behavior of the
+     * events we define. By default this is true, but this can be set to
+     * false if you need the default behavior (not recommended)
+     */
+    preventDefault: true,
+
+    /**
+     * @property {Boolean} stopPropagation
+     * Flag to determine if we should stop the propagation of the events
+     * we generate. This is true by default but you may want to set it to
+     * false if the html element contains other features that require the
+     * mouse click.
+     */
+    stopPropagation: true,
+
+    /**
+     * Internal flag that is set to true when drag and drop has been
+     * intialized
+     * @property initialized
+     * @private
+     */
+    initialized: false,
+
+    /**
+     * All drag and drop can be disabled.
+     * @property locked
+     * @private
+     */
+    locked: false,
+
+    /**
+     * Called the first time an element is registered.
+     * @private
+     */
+    init: function() {
+        this.initialized = true;
+    },
+
+    /**
+     * @property {Number} POINT
+     * In point mode, drag and drop interaction is defined by the
+     * location of the cursor during the drag/drop
+     */
+    POINT: 0,
+
+    /**
+     * @property {Number} INTERSECT
+     * In intersect mode, drag and drop interaction is defined by the
+     * overlap of two or more drag and drop objects.
+     */
+    INTERSECT: 1,
+
+    /**
+     * @property {Number} mode
+     * The current drag and drop mode.  Default: POINT
+     */
+    mode: 0,
+
+    /**
+     * @property {Boolean} [notifyOccluded=false]
+     * This config is only provided to provide old, usually unwanted drag/drop behaviour.
+     *
+     * From ExtJS 4.1.0 onwards, when drop targets are contained in floating, absolutely positioned elements
+     * such as in {@link Ext.window.Window Windows}, which may overlap each other, `over` and `drop` events
+     * are only delivered to the topmost drop target at the mouse position.
+     *
+     * If all targets below that in zIndex order should also receive notifications, set
+     * `notifyOccluded` to `true`.
+     */
+    notifyOccluded: false,
+
+    /**
+     * @property {String} dragCls
+     * @readonly
+     * Class to add to the {@link Ext.dd.DragDrop#getDragEl dragged element} of a DragDrop instance.
+     */
+    dragCls: Ext.baseCSSPrefix + 'dd-drag-current',
+
+    /**
+     * Runs method on all drag and drop objects
+     * @private
+     */
+    _execOnAll: function(sMethod, args) {
+        var i, j, oDD;
+        for (i in this.ids) {
+            for (j in this.ids[i]) {
+                oDD = this.ids[i][j];
+                if (! this.isTypeOfDD(oDD)) {
+                    continue;
+                }
+                oDD[sMethod].apply(oDD, args);
+            }
+        }
+    },
+
+    /**
+     * Drag and drop initialization.  Sets up the global event handlers
+     * @private
+     */
+    _onLoad: function() {
+
+        this.init();
+
+        var Event = Ext.EventManager;
+        Event.on(document, "mouseup",   this.handleMouseUp, this, true);
+        Event.on(document, "mousemove", this.handleMouseMove, this, true);
+        Event.on(window,   "unload",    this._onUnload, this, true);
+        Event.on(window,   "resize",    this._onResize, this, true);
+        // Event.on(window,   "mouseout",    this._test);
+
+    },
+
+    /**
+     * Reset constraints on all drag and drop objs
+     * @private
+     */
+    _onResize: function(e) {
+        this._execOnAll("resetConstraints", []);
+    },
+
+    /**
+     * Lock all drag and drop functionality
+     */
+    lock: function() { this.locked = true; },
+
+    /**
+     * Unlock all drag and drop functionality
+     */
+    unlock: function() { this.locked = false; },
+
+    /**
+     * Is drag and drop locked?
+     * @return {Boolean} True if drag and drop is locked, false otherwise.
+     */
+    isLocked: function() { return this.locked; },
+
+    /**
+     * @property {Object} locationCache
+     * Location cache that is set for all drag drop objects when a drag is
+     * initiated, cleared when the drag is finished.
+     * @private
+     */
+    locationCache: {},
+
+    /**
+     * @property {Boolean} useCache
+     * Set useCache to false if you want to force object the lookup of each
+     * drag and drop linked element constantly during a drag.
+     */
+    useCache: true,
+
+    /**
+     * @property {Number} clickPixelThresh
+     * The number of pixels that the mouse needs to move after the
+     * mousedown before the drag is initiated.  Default=3;
+     */
+    clickPixelThresh: 3,
+
+    /**
+     * @property {Number} clickTimeThresh
+     * The number of milliseconds after the mousedown event to initiate the
+     * drag if we don't get a mouseup event. Default=350
+     */
+    clickTimeThresh: 350,
+
+    /**
+     * @property {Boolean} dragThreshMet
+     * Flag that indicates that either the drag pixel threshold or the
+     * mousdown time threshold has been met
+     * @private
+     */
+    dragThreshMet: false,
+
+    /**
+     * @property {Object} clickTimeout
+     * Timeout used for the click time threshold
+     * @private
+     */
+    clickTimeout: null,
+
+    /**
+     * @property {Number} startX
+     * The X position of the mousedown event stored for later use when a
+     * drag threshold is met.
+     * @private
+     */
+    startX: 0,
+
+    /**
+     * @property {Number} startY
+     * The Y position of the mousedown event stored for later use when a
+     * drag threshold is met.
+     * @private
+     */
+    startY: 0,
+
+    /**
+     * Each DragDrop instance must be registered with the DragDropManager.
+     * This is executed in DragDrop.init()
+     * @param {Ext.dd.DragDrop} oDD the DragDrop object to register
+     * @param {String} sGroup the name of the group this element belongs to
+     */
+    regDragDrop: function(oDD, sGroup) {
+        if (!this.initialized) { this.init(); }
+
+        if (!this.ids[sGroup]) {
+            this.ids[sGroup] = {};
+        }
+        this.ids[sGroup][oDD.id] = oDD;
+    },
+
+    /**
+     * Removes the supplied dd instance from the supplied group. Executed
+     * by DragDrop.removeFromGroup, so don't call this function directly.
+     * @private
+     */
+    removeDDFromGroup: function(oDD, sGroup) {
+        if (!this.ids[sGroup]) {
+            this.ids[sGroup] = {};
+        }
+
+        var obj = this.ids[sGroup];
+        if (obj && obj[oDD.id]) {
+            delete obj[oDD.id];
+        }
+    },
+
+    /**
+     * Unregisters a drag and drop item.  This is executed in
+     * DragDrop.unreg, use that method instead of calling this directly.
+     * @private
+     */
+    _remove: function(oDD) {
+        for (var g in oDD.groups) {
+            if (g && this.ids[g] && this.ids[g][oDD.id]) {
+                delete this.ids[g][oDD.id];
+            }
+        }
+        delete this.handleIds[oDD.id];
+    },
+
+    /**
+     * Each DragDrop handle element must be registered.  This is done
+     * automatically when executing DragDrop.setHandleElId()
+     * @param {String} sDDId the DragDrop id this element is a handle for
+     * @param {String} sHandleId the id of the element that is the drag
+     * handle
+     */
+    regHandle: function(sDDId, sHandleId) {
+        if (!this.handleIds[sDDId]) {
+            this.handleIds[sDDId] = {};
+        }
+        this.handleIds[sDDId][sHandleId] = sHandleId;
+    },
+
+    /**
+     * Utility function to determine if a given element has been
+     * registered as a drag drop item.
+     * @param {String} id the element id to check
+     * @return {Boolean} true if this element is a DragDrop item,
+     * false otherwise
+     */
+    isDragDrop: function(id) {
+        return ( this.getDDById(id) ) ? true : false;
+    },
+
+    /**
+     * Returns the drag and drop instances that are in all groups the
+     * passed in instance belongs to.
+     * @param {Ext.dd.DragDrop} p_oDD the obj to get related data for
+     * @param {Boolean} bTargetsOnly if true, only return targetable objs
+     * @return {Ext.dd.DragDrop[]} the related instances
+     */
+    getRelated: function(p_oDD, bTargetsOnly) {
+        var oDDs = [],
+            i, j, dd;
+        for (i in p_oDD.groups) {
+            for (j in this.ids[i]) {
+                dd = this.ids[i][j];
+                if (! this.isTypeOfDD(dd)) {
+                    continue;
+                }
+                if (!bTargetsOnly || dd.isTarget) {
+                    oDDs[oDDs.length] = dd;
+                }
+            }
+        }
+
+        return oDDs;
+    },
+
+    /**
+     * Returns true if the specified dd target is a legal target for
+     * the specifice drag obj
+     * @param {Ext.dd.DragDrop} oDD the drag obj
+     * @param {Ext.dd.DragDrop} oTargetDD the target
+     * @return {Boolean} true if the target is a legal target for the
+     * dd obj
+     */
+    isLegalTarget: function (oDD, oTargetDD) {
+        var targets = this.getRelated(oDD, true),
+            i, len;
+        for (i=0, len=targets.length;i<len;++i) {
+            if (targets[i].id == oTargetDD.id) {
+                return true;
+            }
+        }
+
+        return false;
+    },
+
+    /**
+     * My goal is to be able to transparently determine if an object is
+     * typeof DragDrop, and the exact subclass of DragDrop.  typeof
+     * returns "object", oDD.constructor.toString() always returns
+     * "DragDrop" and not the name of the subclass.  So for now it just
+     * evaluates a well-known variable in DragDrop.
+     * @param {Object} the object to evaluate
+     * @return {Boolean} true if typeof oDD = DragDrop
+     */
+    isTypeOfDD: function (oDD) {
+        return (oDD && oDD.__ygDragDrop);
+    },
+
+    /**
+     * Utility function to determine if a given element has been
+     * registered as a drag drop handle for the given Drag Drop object.
+     * @param {String} id the element id to check
+     * @return {Boolean} true if this element is a DragDrop handle, false
+     * otherwise
+     */
+    isHandle: function(sDDId, sHandleId) {
+        return ( this.handleIds[sDDId] &&
+                        this.handleIds[sDDId][sHandleId] );
+    },
+
+    /**
+     * Returns the DragDrop instance for a given id
+     * @param {String} id the id of the DragDrop object
+     * @return {Ext.dd.DragDrop} the drag drop object, null if it is not found
+     */
+    getDDById: function(id) {
+        var i, dd;
+        for (i in this.ids) {
+            dd = this.ids[i][id];
+            if (dd instanceof Ext.dd.DDTarget) {
+                return dd;
+            }
+        }
+        return null;
+    },
+
+    /**
+     * Fired after a registered DragDrop object gets the mousedown event.
+     * Sets up the events required to track the object being dragged
+     * @param {Event} e the event
+     * @param {Ext.dd.DragDrop} oDD the DragDrop object being dragged
+     * @private
+     */
+    handleMouseDown: function(e, oDD) {
+        var me = this,
+            el;
+
+        if (Ext.quickTipsActive){
+            Ext.tip.QuickTipManager.ddDisable();
+        }
+        if (me.dragCurrent){
+            // the original browser mouseup wasn't handled (e.g. outside FF browser window)
+            // so clean up first to avoid breaking the next drag
+            me.handleMouseUp(e);
+        }
+
+        me.currentTarget = e.getTarget();
+        me.dragCurrent = oDD;
+
+        el = oDD.getEl();
+
+        // We use this to handle an issue where a mouseup will not be detected 
+        // if the mouseup event happens outside of the browser window. When the 
+        // mouse comes back, any drag will still be active
+        // http://msdn.microsoft.com/en-us/library/ms537630(VS.85).aspx
+        if (Ext.isIE9m && el.setCapture) {
+            el.setCapture();
+        }
+
+        // track start position
+        me.startX = e.getPageX();
+        me.startY = e.getPageY();
+
+        me.deltaX = me.startX - el.offsetLeft;
+        me.deltaY = me.startY - el.offsetTop;
+
+        me.dragThreshMet = false;
+
+        me.clickTimeout = setTimeout(
+            function() {
+                me.startDrag(me.startX, me.startY);
+            },
+            me.clickTimeThresh
+        );
+    },
+
+    /**
+     * Fired when either the drag pixel threshold or the mousedown hold
+     * time threshold has been met.
+     * @param {Number} x the X position of the original mousedown
+     * @param {Number} y the Y position of the original mousedown
+     */
+    startDrag: function(x, y) {
+        var me = this,
+            current = me.dragCurrent,
+            dragEl;
+
+        clearTimeout(me.clickTimeout);
+        if (current) {
+            current.b4StartDrag(x, y);
+            current.startDrag(x, y);
+            dragEl = current.getDragEl();
+
+            // Add current drag class to dragged element
+            if (dragEl) {
+                Ext.fly(dragEl).addCls(me.dragCls);
+            }
+        }
+        me.dragThreshMet = true;
+    },
+
+    /**
+     * Internal function to handle the mouseup event.  Will be invoked
+     * from the context of the document.
+     * @param {Event} e the event
+     * @private
+     */
+    handleMouseUp: function(e) {
+        var me = this;
+
+        if (Ext.quickTipsActive){
+            Ext.tip.QuickTipManager.ddEnable();
+        }
+        if (!me.dragCurrent) {
+            return;
+        }
+
+        // See setCapture call in handleMouseDown
+        if (Ext.isIE && document.releaseCapture) {
+            document.releaseCapture();
+        }
+
+        clearTimeout(me.clickTimeout);
+
+        if (me.dragThreshMet) {
+            me.fireEvents(e, true);
+        }
+
+        me.stopDrag(e);
+
+        me.stopEvent(e);
+    },
+
+    /**
+     * Utility to stop event propagation and event default, if these
+     * features are turned on.
+     * @param {Event} e the event as returned by this.getEvent()
+     */
+    stopEvent: function(e) {
+        if (this.stopPropagation) {
+            e.stopPropagation();
+        }
+
+        if (this.preventDefault) {
+            e.preventDefault();
+        }
+    },
+
+    /**
+     * Internal function to clean up event handlers after the drag
+     * operation is complete
+     * @param {Event} e the event
+     * @private
+     */
+    stopDrag: function(e) {
+        var me = this,
+            current = me.dragCurrent,
+            dragEl;
+
+        // Fire the drag end event for the item that was dragged
+        if (current) {
+            if (me.dragThreshMet) {
+
+                // Remove current drag class from dragged element
+                dragEl = current.getDragEl();
+                if (dragEl) {
+                    Ext.fly(dragEl).removeCls(me.dragCls);
+                }
+
+                current.b4EndDrag(e);
+                current.endDrag(e);
+            }
+
+            me.dragCurrent.onMouseUp(e);
+        }
+
+        me.dragCurrent = null;
+        me.dragOvers = {};
+    },
+
+    /**
+     * Internal function to handle the mousemove event.  Will be invoked
+     * from the context of the html element.
+     *
+     * TODO: figure out what we can do about mouse events lost when the
+     * user drags objects beyond the window boundary.  Currently we can
+     * detect this in internet explorer by verifying that the mouse is
+     * down during the mousemove event.  Firefox doesn't give us the
+     * button state on the mousemove event.
+     *
+     * @param {Event} e the event
+     * @private
+     */
+    handleMouseMove: function(e) {
+        var me = this,
+            current = me.dragCurrent,
+            diffX,
+            diffY;
+
+        if (!current) {
+            return true;
+        }
+
+        if (!me.dragThreshMet) {
+            diffX = Math.abs(me.startX - e.getPageX());
+            diffY = Math.abs(me.startY - e.getPageY());
+            if (diffX > me.clickPixelThresh || diffY > me.clickPixelThresh) {
+                me.startDrag(me.startX, me.startY);
+            }
+        }
+
+        if (me.dragThreshMet) {
+            current.b4Drag(e);
+            current.onDrag(e);
+            if (!current.moveOnly) {
+                me.fireEvents(e, false);
+            }
+        }
+
+        me.stopEvent(e);
+
+        return true;
+    },
+
+    /**
+     * Iterates over all of the DragDrop elements to find ones we are
+     * hovering over or dropping on
+     * @param {Event} e the event
+     * @param {Boolean} isDrop is this a drop op or a mouseover op?
+     * @private
+     */
+    fireEvents: function(e, isDrop) {
+        var me = this,
+            dragCurrent = me.dragCurrent,
+            dragEl,
+            oldDragElTop,
+            mousePoint = e.getPoint(),
+            overTarget,
+            overTargetEl,
+            allTargets = [],
+            oldOvers  = [],  // cache the previous dragOver array
+            outEvts   = [],
+            overEvts  = [],
+            dropEvts  = [],
+            enterEvts = [],
+            xy,
+            needsSort,
+            i,
+            len,
+            sGroup;
+
+        // If the user did the mouse up outside of the window, we could
+        // get here even though we have ended the drag.
+        if (!dragCurrent || dragCurrent.isLocked()) {
+            return;
+        }
+
+        // If we need to use the current mousemove target to find the over el,
+        // but pointer-events is not supported, AND the delta position does not place the mouse outside of the dragEl,
+        // temporarily move the dragEl away, and fake the mousemove target by using document.elementFromPoint
+        // while it's out of the way.
+        // The pointer events implementation is bugged in IE9/10 and opera, so fallback even if they report that they support it.
+        // IE8m do not support it so they will auto fall back
+        if (!me.notifyOccluded && (!Ext.supports.PointerEvents || Ext.isIE10m || Ext.isOpera) && !(dragCurrent.deltaX < 0 || dragCurrent.deltaY < 0)) {
+            dragEl = dragCurrent.getDragEl();
+            oldDragElTop = dragEl.style.top;
+            dragEl.style.top = '-10000px';
+            xy = e.getXY();
+            e.target = document.elementFromPoint(xy[0], xy[1]);
+            dragEl.style.top = oldDragElTop;
+        }
+
+        // Check to see if the object(s) we were hovering over is no longer
+        // being hovered over so we can fire the onDragOut event
+        for (i in me.dragOvers) {
+
+            overTarget = me.dragOvers[i];
+
+            if (!me.isTypeOfDD(overTarget)) {
+                continue;
+            }
+
+            // If notifyOccluded set, we use mouse position
+            if (me.notifyOccluded) {
+                if (!this.isOverTarget(mousePoint, overTarget, me.mode)) {
+                    outEvts.push(overTarget);
+                }
+            }
+            // Otherwise we use event source of the mousemove event
+            else {
+                if (!e.within(overTarget.getEl())) {
+                    outEvts.push(overTarget);
+                }
+            }
+
+            oldOvers[i] = true;
+            delete me.dragOvers[i];
+        }
+
+        // Collect all targets which are members of the same ddGoups that the dragCurrent is a member of, and which may recieve mouseover and drop notifications.
+        // This is preparatory to seeing which one(s) we are currently over
+        // Begin by iterating through the ddGroups of which the dragCurrent is a member
+        for (sGroup in dragCurrent.groups) {
+
+            if ("string" != typeof sGroup) {
+                continue;
+            }
+
+            // Loop over the registered members of each group, testing each as a potential target
+            for (i in me.ids[sGroup]) {
+                overTarget = me.ids[sGroup][i];
+
+                // The target is valid if it is a DD type
+                // And it's got a DOM element
+                // And it's configured to be a drop target
+                // And it's not locked
+                // And the DOM element is fully visible with no hidden ancestors
+                // And it's either not the dragCurrent, or, if it is, tha dragCurrent is configured to not ignore itself.
+                if (me.isTypeOfDD(overTarget) &&
+                    (overTargetEl = overTarget.getEl()) &&
+                    (overTarget.isTarget) &&
+                    (!overTarget.isLocked()) &&
+                    (Ext.fly(overTargetEl).isVisible(true)) &&
+                    ((overTarget != dragCurrent) || (dragCurrent.ignoreSelf === false))) {
+
+                    // If notifyOccluded set, we use mouse position
+                    if (me.notifyOccluded) {
+
+                        // Only sort by zIndex if there were some which had a floating zIndex value
+                        if ((overTarget.zIndex = me.getZIndex(overTargetEl)) !== -1) {
+                            needsSort = true;
+                        }
+                        allTargets.push(overTarget);
+                    }
+                    // Otherwise we use event source of the mousemove event
+                    else {
+                        if (e.within(overTarget.getEl())) {
+                            allTargets.push(overTarget);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        // If there were floating targets, sort the highest zIndex to the top
+        if (needsSort) {
+            Ext.Array.sort(allTargets, me.byZIndex);
+        }
+
+        // Loop through possible targets, notifying the one(s) we are over.
+        // Usually we only deliver events to the topmost.
+        for (i = 0, len = allTargets.length; i < len; i++) {
+            overTarget = allTargets[i];
+
+            // If we are over the overTarget, queue it up to recieve an event of whatever type we are handling
+            if (me.isOverTarget(mousePoint, overTarget, me.mode)) {
+                // look for drop interactions
+                if (isDrop) {
+                    dropEvts.push( overTarget );
+                // look for drag enter and drag over interactions
+                } else {
+
+                    // initial drag over: dragEnter fires
+                    if (!oldOvers[overTarget.id]) {
+                        enterEvts.push( overTarget );
+                    // subsequent drag overs: dragOver fires
+                    } else {
+                        overEvts.push( overTarget );
+                    }
+                    me.dragOvers[overTarget.id] = overTarget;
+                }
+
+                // Unless this DragDropManager has been explicitly configured to deliver events to multiple targets, then we are done.
+                if (!me.notifyOccluded) {
+                    break;
+                }
+            }
+        }
+
+        if (me.mode) {
+            if (outEvts.length) {
+                dragCurrent.b4DragOut(e, outEvts);
+                dragCurrent.onDragOut(e, outEvts);
+            }
+
+            if (enterEvts.length) {
+                dragCurrent.onDragEnter(e, enterEvts);
+            }
+
+            if (overEvts.length) {
+                dragCurrent.b4DragOver(e, overEvts);
+                dragCurrent.onDragOver(e, overEvts);
+            }
+
+            if (dropEvts.length) {
+                dragCurrent.b4DragDrop(e, dropEvts);
+                dragCurrent.onDragDrop(e, dropEvts);
+            }
+
+        } else {
+            // fire dragout events
+            for (i=0, len=outEvts.length; i<len; ++i) {
+                dragCurrent.b4DragOut(e, outEvts[i].id);
+                dragCurrent.onDragOut(e, outEvts[i].id);
+            }
+
+            // fire enter events
+            for (i=0,len=enterEvts.length; i<len; ++i) {
+                // dc.b4DragEnter(e, oDD.id);
+                dragCurrent.onDragEnter(e, enterEvts[i].id);
+            }
+
+            // fire over events
+            for (i=0,len=overEvts.length; i<len; ++i) {
+                dragCurrent.b4DragOver(e, overEvts[i].id);
+                dragCurrent.onDragOver(e, overEvts[i].id);
+            }
+
+            // fire drop events
+            for (i=0, len=dropEvts.length; i<len; ++i) {
+                dragCurrent.b4DragDrop(e, dropEvts[i].id);
+                dragCurrent.onDragDrop(e, dropEvts[i].id);
+            }
+
+        }
+
+        // notify about a drop that did not find a target
+        if (isDrop && !dropEvts.length) {
+            dragCurrent.onInvalidDrop(e);
+        }
+
+    },
+
+    /**
+     * @private
+     * Collects the z-index of the passed element, looking up the parentNode axis to find an absolutely positioned ancestor
+     * which is able to yield a z-index. If found to be not absolutely positionedm returns -1.
+     *
+     * This is used when sorting potential drop targets into z-index order so that only the topmost receives `over` and `drop` events.
+     *
+     * @return {Number} The z-index of the element, or of its topmost absolutely positioned ancestor. Returns -1 if the element is not
+     * absolutely positioned.
+     */
+    getZIndex: function(element) {
+        var body = document.body,
+            z,
+            zIndex = -1;
+
+        element = Ext.getDom(element);
+        while (element !== body) {
+            if (!isNaN(z = Number(Ext.fly(element).getStyle('zIndex')))) {
+                zIndex = z;
+            }
+            element = element.parentNode;
+        }
+        return zIndex;
+    },
+
+    /**
+     * @private
+     * Utility method to pass to {@link Ext.Array#sort} when sorting potential drop targets by z-index.
+     */
+    byZIndex: function(d1, d2) {
+        return d1.zIndex < d2.zIndex;
+    },
+
+    /**
+     * Helper function for getting the best match from the list of drag
+     * and drop objects returned by the drag and drop events when we are
+     * in INTERSECT mode.  It returns either the first object that the
+     * cursor is over, or the object that has the greatest overlap with
+     * the dragged element.
+     * @param  {Ext.dd.DragDrop[]} dds The array of drag and drop objects
+     * targeted
+     * @return {Ext.dd.DragDrop}       The best single match
+     */
+    getBestMatch: function(dds) {
+        var winner = null,
+            len = dds.length,
+            i, dd;
+        // Return null if the input is not what we expect
+        //if (!dds || !dds.length || dds.length == 0) {
+           // winner = null;
+        // If there is only one item, it wins
+        //} else if (dds.length == 1) {
+
+
+        if (len == 1) {
+            winner = dds[0];
+        } else {
+            // Loop through the targeted items
+            for (i=0; i<len; ++i) {
+                dd = dds[i];
+                // If the cursor is over the object, it wins.  If the
+                // cursor is over multiple matches, the first one we come
+                // to wins.
+                if (dd.cursorIsOver) {
+                    winner = dd;
+                    break;
+                // Otherwise the object with the most overlap wins
+                } else {
+                    if (!winner ||
+                        winner.overlap.getArea() < dd.overlap.getArea()) {
+                        winner = dd;
+                    }
+                }
+            }
+        }
+
+        return winner;
+    },
+
+    /**
+     * Refreshes the cache of the top-left and bottom-right points of the
+     * drag and drop objects in the specified group(s).  This is in the
+     * format that is stored in the drag and drop instance, so typical
+     * usage is:
+     *
+     *     Ext.dd.DragDropManager.refreshCache(ddinstance.groups);
+     *
+     * Alternatively:
+     *
+     *     Ext.dd.DragDropManager.refreshCache({group1:true, group2:true});
+     *
+     * TODO: this really should be an indexed array.  Alternatively this
+     * method could accept both.
+     *
+     * @param {Object} groups an associative array of groups to refresh
+     */
+    refreshCache: function(groups) {
+        var sGroup, i, oDD, loc;
+        for (sGroup in groups) {
+            if ("string" != typeof sGroup) {
+                continue;
+            }
+            for (i in this.ids[sGroup]) {
+                oDD = this.ids[sGroup][i];
+
+                if (this.isTypeOfDD(oDD)) {
+                // if (this.isTypeOfDD(oDD) && oDD.isTarget) {
+                    loc = this.getLocation(oDD);
+                    if (loc) {
+                        this.locationCache[oDD.id] = loc;
+                    } else {
+                        delete this.locationCache[oDD.id];
+                        // this will unregister the drag and drop object if
+                        // the element is not in a usable state
+                        // oDD.unreg();
+                    }
+                }
+            }
+        }
+    },
+
+    /**
+     * This checks to make sure an element exists and is in the DOM.  The
+     * main purpose is to handle cases where innerHTML is used to remove
+     * drag and drop objects from the DOM.  IE provides an 'unspecified
+     * error' when trying to access the offsetParent of such an element
+     * @param {HTMLElement} el the element to check
+     * @return {Boolean} true if the element looks usable
+     */
+    verifyEl: function(el) {
+        if (el) {
+            var parent;
+            if(Ext.isIE){
+                try{
+                    parent = el.offsetParent;
+                }catch(e){}
+            }else{
+                parent = el.offsetParent;
+            }
+            if (parent) {
+                return true;
+            }
+        }
+
+        return false;
+    },
+
+    /**
+     * Returns a Region object containing the drag and drop element's position
+     * and size, including the padding configured for it
+     * @param {Ext.dd.DragDrop} oDD the drag and drop object to get the location for.
+     * @return {Ext.util.Region} a Region object representing the total area
+     * the element occupies, including any padding
+     * the instance is configured for.
+     */
+    getLocation: function(oDD) {
+        if (! this.isTypeOfDD(oDD)) {
+            return null;
+        }
+
+        //delegate getLocation method to the
+        //drag and drop target.
+        if (oDD.getRegion) {
+            return oDD.getRegion();
+        }
+
+        var el = oDD.getEl(), pos, x1, x2, y1, y2, t, r, b, l;
+
+        try {
+            pos= Ext.Element.getXY(el);
+        } catch (e) { }
+
+        if (!pos) {
+            return null;
+        }
+
+        x1 = pos[0];
+        x2 = x1 + el.offsetWidth;
+        y1 = pos[1];
+        y2 = y1 + el.offsetHeight;
+
+        t = y1 - oDD.padding[0];
+        r = x2 + oDD.padding[1];
+        b = y2 + oDD.padding[2];
+        l = x1 - oDD.padding[3];
+
+        return new Ext.util.Region(t, r, b, l);
+    },
+
+    /**
+     * Checks the cursor location to see if it over the target
+     * @param {Ext.util.Point} pt The point to evaluate
+     * @param {Ext.dd.DragDrop} oTarget the DragDrop object we are inspecting
+     * @return {Boolean} true if the mouse is over the target
+     * @private
+     */
+    isOverTarget: function(pt, oTarget, intersect) {
+        // use cache if available
+        var loc = this.locationCache[oTarget.id],
+            dc,
+            pos,
+            el,
+            curRegion,
+            overlap;
+
+        if (!loc || !this.useCache) {
+            loc = this.getLocation(oTarget);
+            this.locationCache[oTarget.id] = loc;
+        }
+
+        if (!loc) {
+            return false;
+        }
+
+        oTarget.cursorIsOver = loc.contains( pt );
+
+        // DragDrop is using this as a sanity check for the initial mousedown
+        // in this case we are done.  In POINT mode, if the drag obj has no
+        // contraints, we are also done. Otherwise we need to evaluate the
+        // location of the target as related to the actual location of the
+        // dragged element.
+        dc = this.dragCurrent;
+        if (!dc || !dc.getTargetCoord ||
+                (!intersect && !dc.constrainX && !dc.constrainY)) {
+            return oTarget.cursorIsOver;
+        }
+
+        oTarget.overlap = null;
+
+        // Get the current location of the drag element, this is the
+        // location of the mouse event less the delta that represents
+        // where the original mousedown happened on the element.  We
+        // need to consider constraints and ticks as well.
+        pos = dc.getTargetCoord(pt.x, pt.y);
+
+        el = dc.getDragEl();
+        curRegion = new Ext.util.Region(pos.y,
+            pos.x + el.offsetWidth,
+            pos.y + el.offsetHeight,
+            pos.x
+        );
+
+        overlap = curRegion.intersect(loc);
+
+        if (overlap) {
+            oTarget.overlap = overlap;
+            return (intersect) ? true : oTarget.cursorIsOver;
+        } else {
+            return false;
+        }
+    },
+
+    /**
+     * unload event handler
+     * @private
+     */
+    _onUnload: function(e, me) {
+        Ext.dd.DragDropManager.unregAll();
+    },
+
+    /**
+     * Cleans up the drag and drop events and objects.
+     * @private
+     */
+    unregAll: function() {
+
+        if (this.dragCurrent) {
+            this.stopDrag();
+            this.dragCurrent = null;
+        }
+
+        this._execOnAll("unreg", []);
+
+        for (var i in this.elementCache) {
+            delete this.elementCache[i];
+        }
+
+        this.elementCache = {};
+        this.ids = {};
+    },
+
+    /**
+     * @property {Object} elementCache
+     * A cache of DOM elements
+     * @private
+     */
+    elementCache: {},
+
+    /**
+     * Get the wrapper for the DOM element specified
+     * @param {String} id the id of the element to get
+     * @return {Ext.dd.DragDropManager.ElementWrapper} the wrapped element
+     * @private
+     * @deprecated This wrapper isn't that useful
+     */
+    getElWrapper: function(id) {
+        var oWrapper = this.elementCache[id];
+        if (!oWrapper || !oWrapper.el) {
+            oWrapper = this.elementCache[id] =
+                new this.ElementWrapper(Ext.getDom(id));
+        }
+        return oWrapper;
+    },
+
+    /**
+     * Returns the actual DOM element
+     * @param {String} id the id of the elment to get
+     * @return {Object} The element
+     * @deprecated use Ext.lib.Ext.getDom instead
+     */
+    getElement: function(id) {
+        return Ext.getDom(id);
+    },
+
+    /**
+     * Returns the style property for the DOM element (i.e.,
+     * document.getElById(id).style)
+     * @param {String} id the id of the elment to get
+     * @return {Object} The style property of the element
+     */
+    getCss: function(id) {
+        var el = Ext.getDom(id);
+        return (el) ? el.style : null;
+    },
+
+    /**
+     * @class Ext.dd.DragDropManager.ElementWrapper
+     * Deprecated inner class for cached elements.
+     * @private
+     * @deprecated This wrapper isn't that useful
+     */
+    ElementWrapper: function(el) {
+        /** The element */
+        this.el = el || null;
+        /** The element id */
+        this.id = this.el && el.id;
+        /** A reference to the style property */
+        this.css = this.el && el.style;
+    },
+
+    // Continue class docs
+    /** @class Ext.dd.DragDropElement */
+
+    /**
+     * Returns the X position of an html element
+     * @param {HTMLElement} el the element for which to get the position
+     * @return {Number} the X coordinate
+     */
+    getPosX: function(el) {
+        return Ext.Element.getX(el);
+    },
+
+    /**
+     * Returns the Y position of an html element
+     * @param {HTMLElement} el the element for which to get the position
+     * @return {Number} the Y coordinate
+     */
+    getPosY: function(el) {
+        return Ext.Element.getY(el);
+    },
+
+    /**
+     * Swap two nodes.  In IE, we use the native method, for others we
+     * emulate the IE behavior
+     * @param {HTMLElement} n1 the first node to swap
+     * @param {HTMLElement} n2 the other node to swap
+     */
+    swapNode: function(n1, n2) {
+        if (n1.swapNode) {
+            n1.swapNode(n2);
+        } else {
+            var p = n2.parentNode,
+                s = n2.nextSibling;
+
+            if (s == n1) {
+                p.insertBefore(n1, n2);
+            } else if (n2 == n1.nextSibling) {
+                p.insertBefore(n2, n1);
+            } else {
+                n1.parentNode.replaceChild(n2, n1);
+                p.insertBefore(n1, s);
+            }
+        }
+    },
+
+    /**
+     * Returns the current scroll position
+     * @private
+     */
+    getScroll: function () {
+        var doc   = window.document,
+            docEl = doc.documentElement,
+            body  = doc.body,
+            top   = 0,
+            left  = 0;
+
+        if (Ext.isGecko4) {
+            top  = window.scrollYOffset;
+            left = window.scrollXOffset;
+        } else {
+            if (docEl && (docEl.scrollTop || docEl.scrollLeft)) {
+                top  = docEl.scrollTop;
+                left = docEl.scrollLeft;
+            } else if (body) {
+                top  = body.scrollTop;
+                left = body.scrollLeft;
+            }
+        }
+        return {
+            top: top,
+            left: left
+        };
+    },
+
+    /**
+     * Returns the specified element style property
+     * @param {HTMLElement} el          the element
+     * @param {String}      styleProp   the style property
+     * @return {String} The value of the style property
+     */
+    getStyle: function(el, styleProp) {
+        return Ext.fly(el).getStyle(styleProp);
+    },
+
+    /**
+     * Gets the scrollTop
+     * @return {Number} the document's scrollTop
+     */
+    getScrollTop: function () {
+        return this.getScroll().top;
+    },
+
+    /**
+     * Gets the scrollLeft
+     * @return {Number} the document's scrollTop
+     */
+    getScrollLeft: function () {
+        return this.getScroll().left;
+    },
+
+    /**
+     * Sets the x/y position of an element to the location of the
+     * target element.
+     * @param {HTMLElement} moveEl      The element to move
+     * @param {HTMLElement} targetEl    The position reference element
+     */
+    moveToEl: function (moveEl, targetEl) {
+        var aCoord = Ext.Element.getXY(targetEl);
+        Ext.Element.setXY(moveEl, aCoord);
+    },
+
+    /**
+     * Numeric array sort function
+     * @param {Number} a
+     * @param {Number} b
+     * @returns {Number} positive, negative or 0
+     */
+    numericSort: function(a, b) {
+        return (a - b);
+    },
+
+    /**
+     * @property {Number} _timeoutCount
+     * Internal counter
+     * @private
+     */
+    _timeoutCount: 0,
+
+    /**
+     * Trying to make the load order less important.  Without this we get
+     * an error if this file is loaded before the Event Utility.
+     * @private
+     */
+    _addListeners: function() {
+        if ( document ) {
+            this._onLoad();
+        } else {
+            if (this._timeoutCount <= 2000) {
+                setTimeout(this._addListeners, 10);
+                if (document && document.body) {
+                    this._timeoutCount += 1;
+                }
+            }
+        }
+    },
+
+    /**
+     * Recursively searches the immediate parent and all child nodes for
+     * the handle element in order to determine wheter or not it was
+     * clicked.
+     * @param {HTMLElement} node the html element to inspect
+     */
+    handleWasClicked: function(node, id) {
+        if (this.isHandle(id, node.id)) {
+            return true;
+        } else {
+            // check to see if this is a text node child of the one we want
+            var p = node.parentNode;
+
+            while (p) {
+                if (this.isHandle(id, p.id)) {
+                    return true;
+                } else {
+                    p = p.parentNode;
+                }
+            }
+        }
+
+        return false;
+    }
+}, function() {
+    this._addListeners();
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Base Class for HBoxLayout and VBoxLayout Classes. Generally it should not need to be used directly.
+ */
+Ext.define('Ext.layout.container.Box', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.box'],
+    extend:  Ext.layout.container.Container ,
+    alternateClassName: 'Ext.layout.BoxLayout',
+
+               
+                                                
+                                                
+                                                    
+                          
+                                
+      
+
+    /* End Definitions */
+
+    /**
+     * @cfg {Object} defaultMargins
+     * If the individual contained items do not have a margins property specified or margin specified via CSS, the
+     * default margins from this property will be applied to each item.
+     *
+     * This property may be specified as an object containing margins to apply in the format:
+     *
+     *     {
+     *         top: (top margin),
+     *         right: (right margin),
+     *         bottom: (bottom margin),
+     *         left: (left margin)
+     *     }
+     *
+     * This property may also be specified as a string containing space-separated, numeric margin values. The order of
+     * the sides associated with each value matches the way CSS processes margin values:
+     *
+     *   - If there is only one value, it applies to all sides.
+     *   - If there are two values, the top and bottom borders are set to the first value and the right and left are
+     *     set to the second.
+     *   - If there are three values, the top is set to the first value, the left and right are set to the second,
+     *     and the bottom is set to the third.
+     *   - If there are four values, they apply to the top, right, bottom, and left, respectively.
+     */
+    defaultMargins: {
+        top: 0,
+        right: 0,
+        bottom: 0,
+        left: 0
+    },
+
+    /**
+     * @cfg {String} padding
+     * Sets the padding to be applied to all child items managed by this layout.
+     *
+     * This property must be specified as a string containing space-separated, numeric padding values. The order of the
+     * sides associated with each value matches the way CSS processes padding values:
+     *
+     *   - If there is only one value, it applies to all sides.
+     *   - If there are two values, the top and bottom borders are set to the first value and the right and left are
+     *     set to the second.
+     *   - If there are three values, the top is set to the first value, the left and right are set to the second,
+     *     and the bottom is set to the third.
+     *   - If there are four values, they apply to the top, right, bottom, and left, respectively.
+     */
+    padding: 0,
+
+    /**
+     * @cfg {String} pack
+     * Controls how the child items of the container are packed together. Acceptable configuration values for this
+     * property are:
+     *
+     *   - **start** - child items are packed together at **left** (HBox) or **top** (VBox) side of container (*default**)
+     *   - **center** - child items are packed together at **mid-width** (HBox) or **mid-height** (VBox) of container
+     *   - **end** - child items are packed together at **right** (HBox) or **bottom** (VBox) side of container
+     */
+    pack: 'start',
+
+    /**
+     * @cfg {Number} flex
+     * This configuration option is to be applied to **child items** of the container managed by this layout. Each child
+     * item with a flex property will be flexed (horizontally in `hbox`, vertically in `vbox`) according to each item's
+     * **relative** flex value compared to the sum of all items with a flex value specified. Any child items that have
+     * either a `flex = 0` or `flex = undefined` will not be 'flexed' (the initial size will not be changed).
+     */
+    flex: undefined,
+
+    /**
+     * @cfg {String/Ext.Component} stretchMaxPartner
+     * Allows stretchMax calculation to take into account the max perpendicular size (height for HBox layout and width
+     * for VBox layout) of another Box layout when calculating its maximum perpendicular child size.
+     *
+     * If specified as a string, this may be either a known Container ID, or a ComponentQuery selector which is rooted
+     * at this layout's Container (ie, to find a sibling, use `"^>#siblingItemId`).
+     */
+    stretchMaxPartner: undefined,
+
+    alignRoundingMethod: 'round',
+
+    type: 'box',
+    scrollOffset: 0,
+    itemCls: Ext.baseCSSPrefix + 'box-item',
+    targetCls: Ext.baseCSSPrefix + 'box-layout-ct',
+    targetElCls: Ext.baseCSSPrefix + 'box-target',
+    innerCls: Ext.baseCSSPrefix + 'box-inner',
+
+    // availableSpaceOffset is used to adjust the availableWidth, typically used
+    // to reserve space for a scrollbar
+    availableSpaceOffset: 0,
+
+    // whether or not to reserve the availableSpaceOffset in layout calculations
+    reserveOffset: true,
+
+    manageMargins: true,
+    
+    createsInnerCt: true,
+
+    childEls: [
+        'innerCt',
+        'targetEl'
+    ],
+
+    renderTpl: [
+        '{%var oc,l=values.$comp.layout,oh=l.overflowHandler;',
+        'if (oh.getPrefixConfig!==Ext.emptyFn) {',
+            'if(oc=oh.getPrefixConfig())dh.generateMarkup(oc, out)',
+        '}%}',
+        '<div id="{ownerId}-innerCt" class="{[l.innerCls]} {[oh.getOverflowCls()]}" role="presentation">',
+            '<div id="{ownerId}-targetEl" class="{targetElCls}">',
+                '{%this.renderBody(out, values)%}',
+            '</div>',
+        '</div>',
+        '{%if (oh.getSuffixConfig!==Ext.emptyFn) {',
+            'if(oc=oh.getSuffixConfig())dh.generateMarkup(oc, out)',
+        '}%}',
+        {
+            disableFormats: true,
+            definitions: 'var dh=Ext.DomHelper;'
+        }
+    ],
+
+    constructor: function(config) {
+        var me = this,
+            type;
+
+        me.callParent(arguments);
+
+        // The sort function needs access to properties in this, so must be bound.
+        me.flexSortFn = Ext.Function.bind(me.flexSort, me);
+
+        me.initOverflowHandler();
+
+        type = typeof me.padding;
+        if (type == 'string' || type == 'number') {
+            me.padding = Ext.util.Format.parseBox(me.padding);
+            me.padding.height = me.padding.top  + me.padding.bottom;
+            me.padding.width  = me.padding.left + me.padding.right;
+        }
+    },
+
+    // Matches: `<spaces>digits[.digits]<spaces>%<spaces>`
+    // Captures: `digits[.digits]`
+    _percentageRe: /^\s*(\d+(?:\.\d*)?)\s*[%]\s*$/,
+
+    getItemSizePolicy: function (item, ownerSizeModel) {
+        var me = this,
+            policy = me.sizePolicy,
+            align = me.align,
+            flex = item.flex,
+            key = align,
+            names = me.names,
+            width = item[names.width],
+            height = item[names.height],
+            percentageRe = me._percentageRe,
+            percentageWidth = percentageRe.test(width),
+            isStretch = (align == 'stretch'),
+            isStretchMax = (align == 'stretchmax'),
+            constrain = me.constrainAlign;
+            
+        // Getting the size model is expensive, so we only want to do so if we really need it
+        if (!ownerSizeModel && (isStretch || flex || percentageWidth || (constrain && !isStretchMax))) {
+            ownerSizeModel = me.owner.getSizeModel();
+        }
+
+        if (isStretch) {
+            // If we are height.shrinkWrap, we behave as if we were stretchmax (for more
+            // details, see beginLayoutCycle)...
+            if (!percentageRe.test(height) && ownerSizeModel[names.height].shrinkWrap) {
+                key = 'stretchmax';
+                // We leave %age height as stretch since it will not participate in the
+                // stretchmax size calculation. This avoid running such a child in its
+                // shrinkWrap mode prior to supplying the calculated size.
+            }
+        } else if (!isStretchMax) {
+            if (percentageRe.test(height)) {
+                // Height %ages are calculated based on container size, so they are the
+                // same as align=stretch for this purpose...
+                key = 'stretch';
+            } else if (constrain && !ownerSizeModel[names.height].shrinkWrap) {
+                // Same functionality as stretchmax, only the max is going to be the size
+                // of the container, not the largest item
+                key = 'stretchmax';
+            } else {
+                key = '';
+            }
+        }
+
+        if (flex || percentageWidth) {
+            // If we are width.shrinkWrap, we won't be flexing since that requires a
+            // container width...
+            if (!ownerSizeModel[names.width].shrinkWrap) {
+                policy = policy.flex; // both flex and %age width are calculated
+            }
+        }
+
+        return policy[key];
+    },
+
+    flexSort: function (a, b) {
+        // We need to sort the flexed items to ensure that we have
+        // the items with max/min width first since when we set the
+        // values we may have the value constrained, so we need to
+        // react accordingly. Precedence is given from the largest
+        // value through to the smallest value
+        var maxWidthName = this.names.maxWidth,
+            minWidthName = this.names.minWidth,
+            infiniteValue = Infinity,
+            aTarget = a.target,
+            bTarget = b.target,
+            result = 0,
+            aMin, bMin, aMax, bMax,
+            hasMin, hasMax;
+
+        aMax = aTarget[maxWidthName] || infiniteValue;
+        bMax = bTarget[maxWidthName] || infiniteValue;
+        aMin = aTarget[minWidthName] || 0;
+        bMin = bTarget[minWidthName] || 0;
+        
+        hasMin = isFinite(aMin) || isFinite(bMin);
+        hasMax = isFinite(aMax) || isFinite(bMax);
+
+        if (hasMin || hasMax) {
+            if (hasMax) {
+                result = aMax - bMax;
+            }
+            
+            // If the result is 0, it means either
+            // a) hasMax was false
+            // b) The max values were the same
+            if (result === 0 && hasMin) {
+                result = bMin - aMin;
+            }
+        }
+        return result;
+    },
+
+    isItemBoxParent: function (itemContext) {
+        return true;
+    },
+
+    isItemShrinkWrap: function (item) {
+        return true;
+    },
+
+    roundFlex: function(width) {
+        return Math.ceil(width);
+    },
+
+    /**
+     * @private
+     * Called by an owning Panel before the Panel begins its collapse process.
+     * Most layouts will not need to override the default Ext.emptyFn implementation.
+     */
+    beginCollapse: function(child) {
+        var me = this;
+
+        if (me.direction === 'vertical' && child.collapsedVertical()) {
+            child.collapseMemento.capture(['flex']);
+            delete child.flex;
+        } else if (me.direction === 'horizontal' && child.collapsedHorizontal()) {
+            child.collapseMemento.capture(['flex']);
+            delete child.flex;
+        }
+    },
+
+    /**
+     * @private
+     * Called by an owning Panel before the Panel begins its expand process.
+     * Most layouts will not need to override the default Ext.emptyFn implementation.
+     */
+    beginExpand: function(child) {
+
+        // Restores the flex if we used to be flexed before
+        child.collapseMemento.restore(['flex']);
+    },
+
+    beginLayout: function (ownerContext) {
+        var me = this,
+            owner = me.owner,
+            smp = owner.stretchMaxPartner,
+            style = me.innerCt.dom.style,
+            names = me.names;
+
+        ownerContext.boxNames = names;
+
+        // this must happen before callParent to allow the overflow handler to do its work
+        // that can effect the childItems collection...
+        me.overflowHandler.beginLayout(ownerContext);
+
+        // get the contextItem for our stretchMax buddy:
+        if (typeof smp === 'string') {
+            smp = Ext.getCmp(smp) || owner.query(smp)[0];
+        }
+
+        ownerContext.stretchMaxPartner = smp && ownerContext.context.getCmp(smp);
+
+        me.callParent(arguments);
+
+        ownerContext.innerCtContext = ownerContext.getEl('innerCt', me);
+
+        // Capture whether the owning Container is scrolling in the parallel direction
+        me.scrollParallel = owner.scrollFlags[names.x];
+
+        // Capture whether the owning Container is scrolling in the perpendicular direction
+        me.scrollPerpendicular = owner.scrollFlags[names.y];
+
+        // If we *are* scrolling parallel, capture the scroll position of the encapsulating element
+        if (me.scrollParallel) {
+            me.scrollPos = owner.getTargetEl().dom[names.scrollLeft];
+        }
+
+        // Don't allow sizes burned on to the innerCt to influence measurements.
+        style.width = '';
+        style.height = '';
+    },
+
+    beginLayoutCycle: function (ownerContext, firstCycle) {
+        var me = this,
+            align = me.align,
+            names = ownerContext.boxNames,
+            pack = me.pack,
+            heightModelName = names.heightModel;
+
+        // this must happen before callParent to allow the overflow handler to do its work
+        // that can effect the childItems collection...
+        me.overflowHandler.beginLayoutCycle(ownerContext, firstCycle);
+
+        me.callParent(arguments);
+
+        // Cache several of our string concat/compare results (since width/heightModel can
+        // change if we are invalidated, we cannot do this in beginLayout)
+
+        ownerContext.parallelSizeModel      = ownerContext[names.widthModel];
+        ownerContext.perpendicularSizeModel = ownerContext[heightModelName];
+
+        ownerContext.boxOptions = {
+            align: align = {
+                stretch:    align == 'stretch',
+                stretchmax: align == 'stretchmax',
+                center:     align == names.center,
+                bottom:     align == names.afterY
+            },
+            pack: pack = {
+                center: pack == 'center',
+                end:    pack == 'end'
+            }
+        };
+
+        // Consider an hbox w/stretch which means "assign all items the container's height".
+        // The spirit of this request is make all items the same height, but when shrinkWrap
+        // height is also requested, the height of the tallest item determines the height.
+        // This is exactly what the stretchmax option does, so we jiggle the flags here to
+        // act as if stretchmax were requested.
+
+        if (align.stretch && ownerContext.perpendicularSizeModel.shrinkWrap) {
+            align.stretchmax = true;
+            align.stretch = false;
+        }
+
+        // This is handy for knowing that we might need to apply height %ages
+        align.nostretch = !(align.stretch || align.stretchmax);
+
+        // In our example hbox, packing items to the right (end) or center can only work if
+        // there is a container width. So, if we are shrinkWrap, we just turn off the pack
+        // options for the run.
+
+        if (ownerContext.parallelSizeModel.shrinkWrap) {
+            pack.center = pack.end = false;
+        }
+
+        me.cacheFlexes(ownerContext);
+
+        // We set the width of the target el equal to the width of the innerCt
+        // when the layout cycle is finished, so we need to clear the width here
+        // to prevent the children from being crushed.
+        // IE needs it because of its scrollIntoView bug: https://sencha.jira.com/browse/EXTJSIV-6520
+        // Webkit needs it because of its mouse drag bug: https://sencha.jira.com/browse/EXTJSIV-5962
+        // FF needs it because of a vertical tab bug: https://sencha.jira.com/browse/EXTJSIV-8614
+        me.targetEl.setWidth(20000);
+    },
+
+    /**
+     * This method is called to (re)cache our understanding of flexes. This happens during beginLayout and may need to
+     * be called again if the flexes are changed during the layout (e.g., like ColumnLayout).
+     * @param {Object} ownerContext
+     * @protected
+     */
+    cacheFlexes: function (ownerContext) {
+        var me = this,
+            names = ownerContext.boxNames,
+            widthModelName = names.widthModel,
+            heightModelName = names.heightModel,
+            nostretch = ownerContext.boxOptions.align.nostretch,
+            totalFlex = 0,
+            childItems = ownerContext.childItems,
+            i = childItems.length,
+            flexedItems = [],
+            minWidth = 0,
+            minWidthName = names.minWidth,
+            percentageRe = me._percentageRe,
+            percentageWidths = 0,
+            percentageHeights = 0,
+            child, childContext, flex, match;
+
+        while (i--) {
+            childContext = childItems[i];
+            child = childContext.target;
+
+            // check widthModel to see if we are the sizing layout. If so, copy the flex
+            // from the item to the contextItem and add it to totalFlex
+            //
+            if (childContext[widthModelName].calculated) {
+                childContext.flex = flex = child.flex;
+                if (flex) {
+                    totalFlex += flex;
+                    flexedItems.push(childContext);
+                    minWidth += child[minWidthName] || 0;
+                } else { // a %age width...
+                    match = percentageRe.exec(child[names.width]);
+                    childContext.percentageParallel = parseFloat(match[1]) / 100;
+                    ++percentageWidths;
+                }
+            }
+            // the above means that "childContext.flex" is properly truthy/falsy, which is
+            // often times quite convenient...
+
+            if (nostretch && childContext[heightModelName].calculated) {
+                // the only reason we would be calculated height in this case is due to a
+                // height %age...
+                match = percentageRe.exec(child[names.height]);
+                childContext.percentagePerpendicular = parseFloat(match[1]) / 100;
+                ++percentageHeights;
+            }
+        }
+
+        ownerContext.flexedItems = flexedItems;
+        ownerContext.flexedMinSize = minWidth;
+        ownerContext.totalFlex = totalFlex;
+        ownerContext.percentageWidths = percentageWidths;
+        ownerContext.percentageHeights = percentageHeights;
+
+        // The flexed boxes need to be sorted in ascending order of maxSize to work properly
+        // so that unallocated space caused by maxWidth being less than flexed width can be
+        // reallocated to subsequent flexed boxes.
+        Ext.Array.sort(flexedItems, me.flexSortFn);
+    },
+
+    calculate: function(ownerContext) {
+        var me = this,
+            targetSize = me.getContainerSize(ownerContext),
+            names = ownerContext.boxNames,
+            state = ownerContext.state,
+            plan = state.boxPlan || (state.boxPlan = {}),
+            targetContext = ownerContext.targetContext;
+
+        plan.targetSize = targetSize;
+
+        // If we are not widthModel.shrinkWrap, we need the width before we can lay out boxes:
+        if (!ownerContext.parallelSizeModel.shrinkWrap && !targetSize[names.gotWidth]) {
+            me.done = false;
+            return;
+        }
+
+        if (!state.parallelDone) {
+            state.parallelDone = me.calculateParallel(ownerContext, names, plan);
+        }
+
+        if (!state.perpendicularDone) {
+            state.perpendicularDone = me.calculatePerpendicular(ownerContext, names, plan);
+        }
+
+        if (state.parallelDone && state.perpendicularDone) {
+            // Fix for left and right docked Components in a dock component layout. This is for docked Headers and docked Toolbars.
+            // Older Microsoft browsers do not size a position:absolute element's width to match its content.
+            // So in this case, in the publishInnerCtSize method we may need to adjust the size of the owning Container's element explicitly based upon
+            // the discovered max width. So here we put a calculatedWidth property in the metadata to facilitate this.
+            if (me.owner.dock && (Ext.isIE7m || Ext.isIEQuirks) && !me.owner.width && !me.horizontal) {
+                plan.isIEVerticalDock = true;
+                plan.calculatedWidth = plan.maxSize + ownerContext.getPaddingInfo().width + ownerContext.getFrameInfo().width;
+                if (targetContext !== ownerContext) {
+                    // targetContext can have additional padding, e.g. vertically
+                    // oriented toolbar body element has a few px of left or right padding
+                    // to make room for the tab strip.
+                    plan.calculatedWidth += targetContext.getPaddingInfo().width;
+                }
+            }
+
+            me.publishInnerCtSize(ownerContext, me.reserveOffset ? me.availableSpaceOffset : 0);
+
+            // Calculate stretchmax only if there is >1 child item, or there is a stretchMaxPartner wanting the info
+            if (me.done && (ownerContext.childItems.length > 1 || ownerContext.stretchMaxPartner) && ownerContext.boxOptions.align.stretchmax && !state.stretchMaxDone) {
+                me.calculateStretchMax(ownerContext, names, plan);
+                state.stretchMaxDone = true;
+            }
+            me.overflowHandler.calculate(ownerContext);
+        } else {
+            me.done = false;
+        }
+    },
+
+    calculateParallel: function(ownerContext, names, plan) {
+        var me = this,
+            widthName = names.width,
+            childItems = ownerContext.childItems,
+            beforeXName = names.beforeX,
+            afterXName = names.afterX,
+            setWidthName = names.setWidth,
+            childItemsLength = childItems.length,
+            flexedItems = ownerContext.flexedItems,
+            flexedItemsLength = flexedItems.length,
+            pack = ownerContext.boxOptions.pack,
+            padding = me.padding,
+            containerWidth = plan.targetSize[widthName],
+            totalMargin = 0,
+            left = padding[beforeXName],
+            nonFlexWidth = left + padding[afterXName] + me.scrollOffset +
+                                    (me.reserveOffset ? me.availableSpaceOffset : 0),
+            scrollbarWidth = Ext.getScrollbarSize()[names.width],
+            i, childMargins, remainingWidth, remainingFlex, childContext, flex, flexedWidth,
+            contentWidth, mayNeedScrollbarAdjust, childWidth, percentageSpace;
+
+        // We may need to add scrollbar size to parallel size if
+        //     Scrollbars take up space
+        //     and we are scrolling in the perpendicular direction
+        //     and shrinkWrapping in the parallel direction,
+        //     and NOT stretching perpendicular dimensions to fit
+        //     and NOT shrinkWrapping in the perpendicular direction
+        if (scrollbarWidth &&
+            me.scrollPerpendicular &&
+            ownerContext.parallelSizeModel.shrinkWrap &&
+            !ownerContext.boxOptions.align.stretch &&
+            !ownerContext.perpendicularSizeModel.shrinkWrap) {
+
+            // If its possible that we may need to add scrollbar size to the parallel size
+            // then we need to wait until the perpendicular size has been determined,
+            // so that we know if there is a scrollbar.
+            if (!ownerContext.state.perpendicularDone) {
+                return false;
+            }
+            mayNeedScrollbarAdjust = true;
+        }
+
+        // Gather the total size taken up by non-flexed items:
+        for (i = 0; i < childItemsLength; ++i) {
+            childContext = childItems[i];
+            childMargins = childContext.marginInfo || childContext.getMarginInfo();
+
+            totalMargin += childMargins[widthName];
+
+            if (!childContext[names.widthModel].calculated) {
+                childWidth = childContext.getProp(widthName);
+                nonFlexWidth += childWidth; // min/maxWidth safe
+                if (isNaN(nonFlexWidth)) {
+                    return false;
+                }
+            }
+        }
+
+        nonFlexWidth += totalMargin;
+        if (ownerContext.percentageWidths) {
+            percentageSpace = containerWidth - totalMargin;
+            if (isNaN(percentageSpace)) {
+                return false;
+            }
+
+            for (i = 0; i < childItemsLength; ++i) {
+                childContext = childItems[i];
+                if (childContext.percentageParallel) {
+                    childWidth = Math.ceil(percentageSpace * childContext.percentageParallel);
+                    childWidth = childContext.setWidth(childWidth);
+                    nonFlexWidth += childWidth;
+                }
+            }
+        }
+
+        // if we get here, we have all the childWidths for non-flexed items...
+
+        if (ownerContext.parallelSizeModel.shrinkWrap) {
+            plan.availableSpace = 0;
+            plan.tooNarrow = false;
+        } else {
+            plan.availableSpace = containerWidth - nonFlexWidth;
+
+            // If we're going to need space for a parallel scrollbar, then we need to redo the perpendicular measurements
+            plan.tooNarrow = plan.availableSpace < ownerContext.flexedMinSize;
+            if (plan.tooNarrow && Ext.getScrollbarSize()[names.height] && me.scrollParallel && ownerContext.state.perpendicularDone) {
+                ownerContext.state.perpendicularDone = false;
+                for (i = 0; i < childItemsLength; ++i) {
+                    childItems[i].invalidate();
+                }
+            }
+        }
+
+        contentWidth = nonFlexWidth;
+        remainingWidth = plan.availableSpace;
+        remainingFlex = ownerContext.totalFlex;
+
+        // Calculate flexed item sizes:
+        for (i = 0; i < flexedItemsLength; i++) {
+            childContext = flexedItems[i];
+            flex         = childContext.flex;
+            flexedWidth  = me.roundFlex((flex / remainingFlex) * remainingWidth);
+            flexedWidth  = childContext[setWidthName](flexedWidth); // constrained
+
+            // due to minWidth constraints, it may be that flexedWidth > remainingWidth
+
+            contentWidth   += flexedWidth;
+            // Remaining space has already had margins subtracted, so just subtract size
+            remainingWidth  = Math.max(0, remainingWidth - flexedWidth); // no negatives!
+            remainingFlex  -= flex;
+        }
+
+        if (pack.center) {
+            left += remainingWidth / 2;
+
+            // If content is too wide to pack to center, do not allow the centering calculation to place it off the left edge.
+            if (left < 0) {
+                left = 0;
+            }
+        } else if (pack.end) {
+            left += remainingWidth;
+        }
+
+        // Assign parallel position for the boxes:
+        for (i = 0; i < childItemsLength; ++i) {
+            childContext = childItems[i];
+            childMargins = childContext.marginInfo; // already cached by first loop
+
+            left += childMargins[beforeXName];
+
+            childContext.setProp(names.x, left);
+
+            // We can read directly from "props.width" because we have already properly
+            // requested it in the calculation of nonFlexedWidths or we calculated it.
+            // We cannot call getProp because that would be inappropriate for flexed items
+            // and we don't need any extra function call overhead:
+            left += childMargins[afterXName] + childContext.props[widthName];
+        }
+
+        contentWidth += ownerContext.targetContext.getPaddingInfo()[widthName];
+
+        // Stash the contentWidth on the state so that it can always be accessed later in the calculation
+        ownerContext.state.contentWidth = contentWidth; 
+
+        // if there is perpendicular overflow, the published parallel content size includes
+        // the size of the perpendicular scrollbar.
+        if (mayNeedScrollbarAdjust &&
+            (ownerContext.peek(names.contentHeight) > plan.targetSize[names.height])) {
+            contentWidth += scrollbarWidth;
+            ownerContext[names.hasOverflowY] = true;
+
+            // tell the component layout to set the parallel size in the dom
+            ownerContext.target.componentLayout[names.setWidthInDom] = true;
+
+            // IE8 in what passes for "strict" mode will not create a scrollbar if 
+            // there is just the *exactly correct* spare space created for it. We
+            // have to force that to happen once all the styles have been flushed
+            // to the DOM (see completeLayout):
+            ownerContext[names.invalidateScrollY] = Ext.isStrict && Ext.isIE8;
+        }
+        ownerContext[names.setContentWidth](contentWidth);
+
+        return true;
+    },
+
+    calculatePerpendicular: function(ownerContext, names, plan) {
+        var me = this,
+            heightShrinkWrap = ownerContext.perpendicularSizeModel.shrinkWrap,
+            targetSize = plan.targetSize,
+            childItems = ownerContext.childItems,
+            childItemsLength = childItems.length,
+            mmax = Math.max,
+            heightName = names.height,
+            setHeightName = names.setHeight,
+            beforeYName = names.beforeY,
+            topPositionName = names.y,
+            padding = me.padding,
+            top = padding[beforeYName],
+            availHeight = targetSize[heightName] - top - padding[names.afterY],
+            align = ownerContext.boxOptions.align,
+            isStretch    = align.stretch, // never true if heightShrinkWrap (see beginLayoutCycle)
+            isStretchMax = align.stretchmax,
+            isCenter     = align.center,
+            isBottom     = align.bottom,
+            constrain    = me.constrainAlign,
+            maxHeight = 0,
+            hasPercentageSizes = 0,
+            onBeforeInvalidateChild = me.onBeforeConstrainInvalidateChild,
+            onAfterInvalidateChild = me.onAfterConstrainInvalidateChild,
+            scrollbarHeight = Ext.getScrollbarSize().height,
+            childTop, i, childHeight, childMargins, diff, height, childContext,
+            stretchMaxPartner, stretchMaxChildren, shrinkWrapParallelOverflow, 
+            percentagePerpendicular;
+
+        if (isStretch || ((isCenter || isBottom) && !heightShrinkWrap)) {
+            if (isNaN(availHeight)) {
+                return false;
+            }
+        }
+
+        // If the intention is to horizontally scroll child components, but the container is too narrow,
+        // then:
+        //     if we are shrinkwrapping height:
+        //         Set a flag because we are going to expand the height taken by the perpendicular dimension to accommodate the scrollbar
+        //     else
+        //         We must allow for the parallel scrollbar to intrude into the height
+        if (me.scrollParallel && plan.tooNarrow) {
+            if (heightShrinkWrap) {
+                shrinkWrapParallelOverflow = true;
+            } else {
+                availHeight -= scrollbarHeight;
+                plan.targetSize[heightName] -= scrollbarHeight;
+            }
+        }
+
+        if (isStretch) {
+            height = availHeight; // never heightShrinkWrap...
+        } else {
+            for (i = 0; i < childItemsLength; i++) {
+                childContext = childItems[i];
+                childMargins = (childContext.marginInfo || childContext.getMarginInfo())[heightName];
+
+                if (!(percentagePerpendicular = childContext.percentagePerpendicular)) {
+                    childHeight = childContext.getProp(heightName);
+                } else {
+                    ++hasPercentageSizes;
+                    if (heightShrinkWrap) {
+                        // height %age items cannot contribute to maxHeight... they are going
+                        // to be a %age of that maxHeight!
+                        continue;
+                    } else {
+                        childHeight = percentagePerpendicular * availHeight - childMargins;
+                        childHeight = childContext[names.setHeight](childHeight);
+                    }
+                }
+                
+                // Summary:
+                // 1) Not shrink wrapping height, so the height is not determined by the children
+                // 2) Constrain is set
+                // 3) The child item is shrink wrapping
+                // 4) It execeeds the max
+                if (!heightShrinkWrap && constrain && childContext[names.heightModel].shrinkWrap && childHeight > availHeight) {
+                    childContext.invalidate({
+                        before: onBeforeInvalidateChild,
+                        after: onAfterInvalidateChild,
+                        layout: me,
+                        childHeight: availHeight,
+                        names: names
+                    });
+                    
+                    // By invalidating the height, it could mean the width can change, so we need
+                    // to recalculate in the parallel direction.
+                    ownerContext.state.parallelDone = false; 
+                }
+
+                // Max perpendicular measurement (used for stretchmax) must take the min perpendicular size of each child into account in case any fall short.
+                if (isNaN(maxHeight = mmax(maxHeight, childHeight + childMargins,
+                                           childContext.target[names.minHeight] || 0))) {
+                    return false; // heightShrinkWrap || isCenter || isStretchMax ??
+                }
+            }
+
+            // If there is going to be a parallel scrollbar maxHeight must include it to the outside world.
+            // ie: a stretchmaxPartner, and the setContentHeight
+            if (shrinkWrapParallelOverflow) {
+                maxHeight += scrollbarHeight;
+                ownerContext[names.hasOverflowX] = true;
+
+                // tell the component layout to set the perpendicular size in the dom
+                ownerContext.target.componentLayout[names.setHeightInDom] = true;
+
+                // IE8 in what passes for "strict" mode will not create a scrollbar if 
+                // there is just the *exactly correct* spare space created for it. We
+                // have to force that to happen once all the styles have been flushed
+                // to the DOM (see completeLayout):
+                ownerContext[names.invalidateScrollX] = Ext.isStrict && Ext.isIE8;
+            }
+
+            // If we are associated with another box layout, grab its maxChildHeight
+            // This must happen before we calculate and publish our contentHeight
+            stretchMaxPartner = ownerContext.stretchMaxPartner;
+            if (stretchMaxPartner) {
+                // Publish maxChildHeight as soon as it has been calculated for our partner:
+                ownerContext.setProp('maxChildHeight', maxHeight);
+                stretchMaxChildren = stretchMaxPartner.childItems;
+                // Only wait for maxChildHeight if our partner has visible items:
+                if (stretchMaxChildren && stretchMaxChildren.length) {
+                    maxHeight = mmax(maxHeight, stretchMaxPartner.getProp('maxChildHeight'));
+                    if (isNaN(maxHeight)) {
+                        return false;
+                    }
+                }
+            }
+
+            ownerContext[names.setContentHeight](maxHeight + me.padding[heightName] +
+                    ownerContext.targetContext.getPaddingInfo()[heightName]);
+
+            // We have to publish the contentHeight with the additional scrollbarHeight
+            // to encourage our container to accomodate it, but we must remove the height
+            // of the scrollbar as we go to sizing or centering the children.
+            if (shrinkWrapParallelOverflow) {
+                maxHeight -= scrollbarHeight;
+            }
+            plan.maxSize = maxHeight;
+
+            if (isStretchMax) {
+                height = maxHeight;
+            } else if (isCenter || isBottom || hasPercentageSizes) {
+                if (constrain) {
+                    height = heightShrinkWrap ? maxHeight : availHeight;
+                } else {
+                    height = heightShrinkWrap ? maxHeight : mmax(availHeight, maxHeight);
+                }
+
+                // When calculating a centered position within the content box of the innerCt,
+                // the width of the borders must be subtracted from the size to yield the
+                // space available to center within. The publishInnerCtSize method explicitly
+                // adds the border widths to the set size of the innerCt.
+                height -= ownerContext.innerCtContext.getBorderInfo()[heightName];
+            }
+        }
+
+        for (i = 0; i < childItemsLength; i++) {
+            childContext = childItems[i];
+            childMargins = childContext.marginInfo || childContext.getMarginInfo();
+
+            childTop = top + childMargins[beforeYName];
+
+            if (isStretch) {
+                childContext[setHeightName](height - childMargins[heightName]);
+            } else {
+                percentagePerpendicular = childContext.percentagePerpendicular;
+                if (heightShrinkWrap && percentagePerpendicular) {
+                    childMargins = childContext.marginInfo || childContext.getMarginInfo();
+                    childHeight = percentagePerpendicular * height - childMargins[heightName];
+                    childHeight = childContext.setHeight(childHeight);
+                }
+
+                if (isCenter) {
+                    diff = height - childContext.props[heightName];
+                    if (diff > 0) {
+                        childTop = top + Math[me.alignRoundingMethod](diff / 2);
+                    }
+                } else if (isBottom) {
+                    childTop = mmax(0, height - childTop - childContext.props[heightName]);
+                }
+            }
+
+            childContext.setProp(topPositionName, childTop);
+        }
+
+        return true;
+    },
+    
+    onBeforeConstrainInvalidateChild: function(childContext, options){
+        // NOTE: No "this" pointer in here...
+        var heightModelName = options.names.heightModel;
+        if (!childContext[heightModelName].constrainedMin) {
+            // if the child hit a min constraint, it needs to be at its configured size, so
+            // we leave the sizeModel alone
+            childContext[heightModelName] = Ext.layout.SizeModel.calculated;
+        }
+    },
+    
+    onAfterConstrainInvalidateChild: function(childContext, options){
+         // NOTE: No "this" pointer in here...
+        var names = options.names;
+
+        // We use 0 here because we know the size exceeds the available size.
+        // This was chosen on purpose, even for align: 'bottom', because it doesn't
+        // make practical sense to place the item at the bottom and then have it overflow
+        // over the top of the container, since it's not possible to scroll to it. As such,
+        // we always put the component at the top to follow normal document flow.
+        childContext.setProp(names.beforeY, 0);
+        if (childContext[names.heightModel].calculated) {
+            childContext[names.setHeight](options.childHeight);
+        }
+    },
+
+    calculateStretchMax: function (ownerContext, names, plan) {
+        var me = this,
+            heightName = names.height,
+            widthName = names.width,
+            childItems = ownerContext.childItems,
+            length = childItems.length,
+            height = plan.maxSize,
+            onBeforeStretchMaxInvalidateChild = me.onBeforeStretchMaxInvalidateChild,
+            onAfterStretchMaxInvalidateChild = me.onAfterStretchMaxInvalidateChild,
+            childContext, props, i, childHeight;
+
+        for (i = 0; i < length; ++i) {
+            childContext = childItems[i];
+
+            props = childContext.props;
+            childHeight = height - childContext.getMarginInfo()[heightName];
+
+            if (childHeight != props[heightName] ||   // if (wrong height ...
+                childContext[names.heightModel].constrained) { // ...or needs invalidation)
+                // When we invalidate a child, since we won't be around to size or position
+                // it, we include an after callback that will be run after the invalidate
+                // that will (re)do that work. The good news here is that we can read the
+                // results of all that from the childContext props.
+                //
+                // We also include a before callback to change the sizeModel to calculated
+                // prior to the layout being invoked.
+                childContext.invalidate({
+                    before: onBeforeStretchMaxInvalidateChild,
+                    after: onAfterStretchMaxInvalidateChild,
+                    layout: me,
+                    // passing this data avoids a 'scope' and its Function.bind
+                    childWidth: props[widthName],
+                    // subtract margins from the maximum value
+                    childHeight: childHeight,
+                    childX: props.x,
+                    childY: props.y,
+                    names: names
+                });
+            }
+        }
+    },
+    
+    onBeforeStretchMaxInvalidateChild: function (childContext, options) {
+        // NOTE: No "this" pointer in here...
+        var heightModelName = options.names.heightModel;
+
+        // Change the childItem to calculated (i.e., "set by ownerCt"). The component layout
+        // of the child can course-correct (like dock layout does for a collapsed panel),
+        // so we must make these changes here before that layout's beginLayoutCycle is
+        // called.
+        if (!childContext[heightModelName].constrainedMax) {
+            // if the child hit a max constraint, it needs to be at its configured size, so
+            // we leave the sizeModel alone...
+            childContext[heightModelName] = Ext.layout.SizeModel.calculated;
+        }
+    },
+
+    onAfterStretchMaxInvalidateChild: function (childContext, options) {
+        // NOTE: No "this" pointer in here...
+        var names = options.names,
+            childHeight = options.childHeight,
+            childWidth = options.childWidth;
+
+        childContext.setProp('x', options.childX);
+        childContext.setProp('y', options.childY);
+
+        if (childContext[names.heightModel].calculated) {
+            // We need to respect a child that is still not calculated (such as a collapsed
+            // panel)...
+            childContext[names.setHeight](childHeight);
+        }
+
+        if (childContext[names.widthModel].calculated) {
+            childContext[names.setWidth](childWidth);
+        }
+    },
+
+    completeLayout: function(ownerContext) {
+        var me = this,
+            names = ownerContext.boxNames,
+            invalidateScrollX = ownerContext.invalidateScrollX,
+            invalidateScrollY = ownerContext.invalidateScrollY,
+            dom, el, overflowX, overflowY, styles;
+
+        me.overflowHandler.completeLayout(ownerContext);
+
+        if (invalidateScrollX || invalidateScrollY) {
+            el = me.getTarget();
+            dom = el.dom;
+            styles = dom.style;
+
+            if (invalidateScrollX) {
+                // get computed style to see if we are 'auto'
+                overflowX = el.getStyle('overflowX');
+                if (overflowX == 'auto') {
+                    // capture the inline style (if any) so we can restore it later:
+                    overflowX = styles.overflowX;
+                    styles.overflowX = 'scroll'; // force the scrollbar to appear
+                } else {
+                    invalidateScrollX = false; // no work really since not 'auto'
+                }
+            }
+
+            if (invalidateScrollY) {
+                // get computed style to see if we are 'auto'
+                overflowY = el.getStyle('overflowY');
+                if (overflowY == 'auto') {
+                    // capture the inline style (if any) so we can restore it later:
+                    overflowY = styles.overflowY;
+                    styles.overflowY = 'scroll'; // force the scrollbar to appear
+                } else {
+                    invalidateScrollY = false; // no work really since not 'auto'
+                }
+            }
+
+            if (invalidateScrollX || invalidateScrollY) { // if (some form of 'auto' in play)
+                // force a reflow...
+                dom.scrollWidth;
+
+                if (invalidateScrollX) {
+                    styles.overflowX = overflowX; // restore inline style
+                }
+                if (invalidateScrollY) {
+                    styles.overflowY = overflowY; // restore inline style
+                }
+            }
+        }
+
+        // If we are scrolling parallel, restore the saved scroll position
+        if (me.scrollParallel) {
+            me.owner.getTargetEl().dom[names.scrollLeft] = me.scrollPos;
+        }
+    },
+
+    finishedLayout: function(ownerContext) {
+        this.overflowHandler.finishedLayout(ownerContext);
+        this.callParent(arguments);
+
+        // Fix for an obscure webkit bug (EXTJSIV-5962) caused by the targetEl's 20000px
+        // width.  We set a very large width on the targetEl at the beginning of the 
+        // layout cycle to prevent any "crushing" effect on the child items, however
+        // in some cases the very large width makes it possible to scroll the innerCt
+        // by dragging on certain child elements. To prevent this from happening we ensure
+        // that the targetEl's width is the same as the innerCt.
+        // IE needs it because of its scrollIntoView bug: https://sencha.jira.com/browse/EXTJSIV-6520
+        // Webkit needs it because of its mouse drag bug: https://sencha.jira.com/browse/EXTJSIV-5962
+        // FF needs it because of a vertical tab bug: https://sencha.jira.com/browse/EXTJSIV-8614
+        this.targetEl.setWidth(ownerContext.innerCtContext.props.width);
+    },
+
+    publishInnerCtSize: function(ownerContext, reservedSpace) {
+        var me = this,
+            names = ownerContext.boxNames,
+            heightName = names.height,
+            widthName = names.width,
+            align = ownerContext.boxOptions.align,
+            dock = me.owner.dock,
+            padding = me.padding,
+            plan = ownerContext.state.boxPlan,
+            targetSize = plan.targetSize,
+            height = targetSize[heightName],
+            innerCtContext = ownerContext.innerCtContext,
+            innerCtWidth = (ownerContext.parallelSizeModel.shrinkWrap || (plan.tooNarrow && me.scrollParallel)
+                    ? ownerContext.state.contentWidth - ownerContext.targetContext.getPaddingInfo()[widthName]
+                    : targetSize[widthName]) - (reservedSpace || 0),
+            innerCtHeight;
+
+        if (align.stretch) {
+            innerCtHeight = height;
+        } else {
+            innerCtHeight = plan.maxSize + padding[names.beforeY] + padding[names.afterY] + innerCtContext.getBorderInfo()[heightName];
+
+            if (!ownerContext.perpendicularSizeModel.shrinkWrap && (align.center || align.bottom)) {
+                innerCtHeight = Math.max(height, innerCtHeight);
+            }
+        }
+
+        innerCtContext[names.setWidth](innerCtWidth);
+        innerCtContext[names.setHeight](innerCtHeight);
+
+        // If unable to publish both dimensions, this layout needs to run again
+        if (isNaN(innerCtWidth + innerCtHeight)) {
+            me.done = false;
+        }
+
+        // If a calculated width has been found (this only happens for widthModel.shrinkWrap
+        // vertical docked Components in old Microsoft browsers) then, if the Component has
+        // not assumed the size of its content, set it to do so.
+        //
+        // We MUST pass the dirty flag to get that into the DOM, and because we are a Container
+        // layout, and not really supposed to perform sizing, we must also use the force flag.
+        if (plan.calculatedWidth && (dock == 'left' || dock == 'right')) {
+            // TODO: setting the owner size should be the job of the component layout.
+            ownerContext.setWidth(plan.calculatedWidth, true, true);
+        }
+    },
+
+    onRemove: function(comp){
+        var me = this;
+        me.callParent(arguments);
+        if (me.overflowHandler) {
+            me.overflowHandler.onRemove(comp);
+        }
+        if (comp.layoutMarginCap == me.id) {
+            delete comp.layoutMarginCap;
+        }
+    },
+
+    /**
+     * @private
+     */
+    initOverflowHandler: function() {
+        var me = this,
+            handler = me.overflowHandler,
+            handlerType,
+            constructor;
+
+        if (typeof handler == 'string') {
+            handler = {
+                type: handler
+            };
+        }
+
+        handlerType = 'None';
+        if (handler && handler.type !== undefined) {
+            handlerType = handler.type;
+        }
+
+        constructor = Ext.layout.container.boxOverflow[handlerType];
+        if (constructor[me.type]) {
+            constructor = constructor[me.type];
+        }
+
+        me.overflowHandler = Ext.create('Ext.layout.container.boxOverflow.' + handlerType, me, handler);
+    },
+
+    // Overridden method from Ext.layout.container.Container.
+    // Used in the beforeLayout method to render all items into.
+    getRenderTarget: function() {
+        return this.targetEl;
+    },
+
+    // Overridden method from Ext.layout.container.Container.
+    // Used by Container classes to insert special DOM elements which must exist in addition to the child components
+    getElementTarget: function() {
+        return this.innerCt;
+    },
+
+    calculateChildBox: Ext.deprecated(),
+    calculateChildBoxes: Ext.deprecated(),
+    updateChildBoxes: Ext.deprecated(),
+
+    /**
+     * @private
+     */
+    destroy: function() {
+        Ext.destroy(this.innerCt, this.overflowHandler);
+        this.callParent(arguments);
+    },
+
+    getRenderData: function() {
+        var data = this.callParent();
+
+        data.targetElCls = this.targetElCls;
+
+        return data;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A layout that arranges items horizontally across a Container. This layout optionally divides available horizontal
+ * space between child items containing a numeric `flex` configuration.
+ *
+ * This layout may also be used to set the heights of child items by configuring it with the {@link #align} option.
+ *
+ *     @example
+ *     Ext.create('Ext.Panel', {
+ *         width: 500,
+ *         height: 300,
+ *         title: "HBoxLayout Panel",
+ *         layout: {
+ *             type: 'hbox',
+ *             align: 'stretch'
+ *         },
+ *         renderTo: document.body,
+ *         items: [{
+ *             xtype: 'panel',
+ *             title: 'Inner Panel One',
+ *             flex: 2
+ *         },{
+ *             xtype: 'panel',
+ *             title: 'Inner Panel Two',
+ *             flex: 1
+ *         },{
+ *             xtype: 'panel',
+ *             title: 'Inner Panel Three',
+ *             flex: 1
+ *         }]
+ *     });
+ */
+Ext.define('Ext.layout.container.HBox', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.hbox'],
+    extend:  Ext.layout.container.Box ,
+    alternateClassName: 'Ext.layout.HBoxLayout',
+
+    /* End Definitions */
+
+    /**
+     * @cfg {String} align
+     * Controls how the child items of the container are aligned. Acceptable configuration values for this property are:
+     *
+     * - **top** : **Default** child items are aligned vertically at the **top** of the container.
+     * - **middle** : child items are aligned vertically in the **middle** of the container.
+     * - **bottom** : child items are aligned vertically at the **bottom** of the container.
+     * - **stretch** : child items are stretched vertically to fill the height of the container.
+     * - **stretchmax** : child items are stretched vertically to the height of the largest item.
+     */
+    align: 'top', // top, middle, stretch, strechmax
+
+    /**
+     * @cfg {"round"/"floor"/"ceil"} [alignRoundingMethod='round'] The Math method to use
+     * for rounding fractional pixels when `{@link #align}:middle` is used.
+     */
+    
+    /**
+     * @cfg {Boolean} constrainAlign
+     * Limits the size of {@link #align aligned} components to the size of the container under certain circumstances.
+     * Firstly, the container height must not be determined by the height of the child components. Secondly, the child
+     * components must have their height {@link Ext.AbstractComponent#shrinkWrap shrinkwrapped}.
+     */
+    constrainAlign: false,
+
+    type : 'hbox',
+
+    direction: 'horizontal',
+
+    horizontal: true,
+
+    names: {
+        // parallel
+        beforeX: 'left',
+        beforeScrollX: 'left',
+        beforeScrollerSuffix: '-before-scroller',
+        afterScrollerSuffix: '-after-scroller',
+        leftCap: 'Left',
+        afterX: 'right',
+        width: 'width',
+        contentWidth: 'contentWidth',
+        minWidth: 'minWidth',
+        maxWidth: 'maxWidth',
+        widthCap: 'Width',
+        widthModel: 'widthModel',
+        widthIndex: 0,
+        x: 'x',
+        scrollLeft: 'scrollLeft',
+        overflowX: 'overflowX',
+        hasOverflowX: 'hasOverflowX',
+        invalidateScrollX: 'invalidateScrollX',
+        parallelMargins: 'lr',
+
+        // perpendicular
+        center: 'middle',
+        beforeY: 'top',
+        afterY: 'bottom',
+        height: 'height',
+        contentHeight: 'contentHeight',
+        minHeight: 'minHeight',
+        maxHeight: 'maxHeight',
+        heightCap: 'Height',
+        heightModel: 'heightModel',
+        heightIndex: 1,
+        y: 'y',
+        overflowY: 'overflowY',
+        hasOverflowY: 'hasOverflowY',
+        invalidateScrollY: 'invalidateScrollY',
+        perpendicularMargins: 'tb',
+
+        // Methods
+        getWidth: 'getWidth',
+        getHeight: 'getHeight',
+        setWidth: 'setWidth',
+        setHeight: 'setHeight',
+        gotWidth: 'gotWidth',
+        gotHeight: 'gotHeight',
+        setContentWidth: 'setContentWidth',
+        setContentHeight: 'setContentHeight',
+        setWidthInDom: 'setWidthInDom',
+        setHeightInDom: 'setHeightInDom',
+        getScrollLeft: 'getScrollLeft',
+        setScrollLeft: 'setScrollLeft',
+        scrollTo: 'scrollTo'
+    },
+
+    sizePolicy: {
+        flex: {
+            '': {
+                readsWidth : 0,
+                readsHeight: 1,
+                setsWidth  : 1,
+                setsHeight : 0
+            },
+            stretch: {
+                readsWidth : 0,
+                readsHeight: 0,
+                setsWidth  : 1,
+                setsHeight : 1
+            },
+            stretchmax: {
+                readsWidth : 0,
+                readsHeight: 1,
+                setsWidth  : 1,
+                setsHeight : 1
+            }
+        },
+        '': {
+            readsWidth : 1,
+            readsHeight: 1,
+            setsWidth  : 0,
+            setsHeight : 0
+        },
+        stretch: {
+            readsWidth : 1,
+            readsHeight: 0,
+            setsWidth  : 0,
+            setsHeight : 1
+        },
+        stretchmax: {
+            readsWidth : 1,
+            readsHeight: 1,
+            setsWidth  : 0,
+            setsHeight : 1
+        }
+    }            
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A layout that arranges items vertically down a Container. This layout optionally divides available vertical space
+ * between child items containing a numeric `flex` configuration.
+ *
+ * This layout may also be used to set the widths of child items by configuring it with the {@link #align} option.
+ *
+ *     @example
+ *     Ext.create('Ext.Panel', {
+ *         width: 500,
+ *         height: 400,
+ *         title: "VBoxLayout Panel",
+ *         layout: {
+ *             type: 'vbox',
+ *             align: 'center'
+ *         },
+ *         renderTo: document.body,
+ *         items: [{
+ *             xtype: 'panel',
+ *             title: 'Inner Panel One',
+ *             width: 250,
+ *             flex: 2
+ *         },
+ *         {
+ *             xtype: 'panel',
+ *             title: 'Inner Panel Two',
+ *             width: 250,
+ *             flex: 4
+ *         },
+ *         {
+ *             xtype: 'panel',
+ *             title: 'Inner Panel Three',
+ *             width: '50%',
+ *             flex: 4
+ *         }]
+ *     });
+ */
+Ext.define('Ext.layout.container.VBox', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.vbox'],
+    extend:  Ext.layout.container.Box ,
+    alternateClassName: 'Ext.layout.VBoxLayout',
+
+    /* End Definitions */
+
+    /**
+     * @cfg {String} align
+     * Controls how the child items of the container are aligned. Acceptable configuration values for this property are:
+     *
+     * - **left** : **Default** child items are aligned horizontally at the **left** side of the container.
+     * - **center** : child items are aligned horizontally at the **mid-width** of the container.
+     * - **right** : child items are aligned horizontally at the **right** of the container.
+     * - **stretch** : child items are stretched horizontally to fill the width of the container.
+     * - **stretchmax** : child items are stretched horizontally to the size of the largest item.
+     */
+    align : 'left', // left, center, stretch, strechmax
+
+    /**
+     * @cfg {"round"/"floor"/"ceil"} [alignRoundingMethod='round'] The Math method to use
+     * for rounding fractional pixels when `{@link #align}:center` is used.
+     */
+    
+    /**
+     * @cfg {Boolean} constrainAlign
+     * Limits the size of {@link #align aligned} components to the size of the container under certain circumstances.
+     * Firstly, the container width must not be determined by the width of the child components. Secondly, the child
+     * components must have their width {@link Ext.AbstractComponent#shrinkWrap shrinkwrapped}.
+     */
+    constrainAlign: false,
+
+    type: 'vbox',
+
+    direction: 'vertical',
+
+    horizontal: false,
+
+    names: {
+        // parallel
+        beforeX: 'top',
+        beforeScrollX: 'top',
+        beforeScrollerSuffix: '-before-scroller',
+        afterScrollerSuffix: '-after-scroller',
+        leftCap: 'Top',
+        afterX: 'bottom',
+        width: 'height',
+        contentWidth: 'contentHeight',
+        minWidth: 'minHeight',
+        maxWidth: 'maxHeight',
+        widthCap: 'Height',
+        widthModel: 'heightModel',
+        widthIndex: 1,
+        x: 'y',
+        scrollLeft: 'scrollTop',
+        overflowX: 'overflowY',
+        hasOverflowX: 'hasOverflowY',
+        invalidateScrollX: 'invalidateScrollY',
+        parallelMargins: 'tb',
+
+        // perpendicular
+        center: 'center',
+        beforeY: 'left',
+        afterY: 'right',
+        height: 'width',
+        contentHeight: 'contentWidth',
+        minHeight: 'minWidth',
+        maxHeight: 'maxWidth',
+        heightCap: 'Width',
+        heightModel: 'widthModel',
+        heightIndex: 0,
+        y: 'x',
+        overflowY: 'overflowX',
+        hasOverflowY: 'hasOverflowX',
+        invalidateScrollY: 'invalidateScrollX',
+        perpendicularMargins: 'lr',
+
+        // Methods
+        getWidth: 'getHeight',
+        getHeight: 'getWidth',
+        setWidth: 'setHeight',
+        setHeight: 'setWidth',
+        gotWidth: 'gotHeight',
+        gotHeight: 'gotWidth',
+        setContentWidth: 'setContentHeight',
+        setContentHeight: 'setContentWidth',
+        setWidthInDom: 'setHeightInDom',
+        setHeightInDom: 'setWidthInDom',
+        getScrollLeft: 'getScrollTop',
+        setScrollLeft: 'setScrollTop',
+        scrollTo: 'scrollTo'
+    },
+
+    sizePolicy: {
+        flex: {
+            '': {
+                readsWidth : 1,
+                readsHeight: 0,
+                setsWidth  : 0,
+                setsHeight : 1
+            },
+            stretch: {
+                readsWidth : 0,
+                readsHeight: 0,
+                setsWidth  : 1,
+                setsHeight : 1
+            },
+            stretchmax: {
+                readsWidth : 1,
+                readsHeight: 0,
+                setsWidth  : 1,
+                setsHeight : 1
+            }
+        },
+        '': {
+            readsWidth : 1,
+            readsHeight: 1,
+            setsWidth  : 0,
+            setsHeight : 0
+        },
+        stretch: {
+            readsWidth : 0,
+            readsHeight: 1,
+            setsWidth  : 1,
+            setsHeight : 0
+        },
+        stretchmax: {
+            readsWidth : 1,
+            readsHeight: 1,
+            setsWidth  : 1,
+            setsHeight : 0
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Basic Toolbar class. Although the {@link Ext.container.Container#defaultType defaultType} for
+ * Toolbar is {@link Ext.button.Button button}, Toolbar elements (child items for the Toolbar container)
+ * may be virtually any type of Component. Toolbar elements can be created explicitly via their
+ * constructors, or implicitly via their xtypes, and can be {@link #method-add}ed dynamically.
+ *
+ * ## Some items have shortcut strings for creation:
+ *
+ * | Shortcut | xtype         | Class                         | Description
+ * |:---------|:--------------|:------------------------------|:---------------------------------------------------
+ * | '->'     | `tbfill`      | {@link Ext.toolbar.Fill}      | begin using the right-justified button container
+ * | '-'      | `tbseparator` | {@link Ext.toolbar.Separator} | add a vertical separator bar between toolbar items
+ * | ' '      | `tbspacer`    | {@link Ext.toolbar.Spacer}    | add horizontal space between elements
+ *
+ *     @example
+ *     Ext.create('Ext.toolbar.Toolbar', {
+ *         renderTo: document.body,
+ *         width   : 500,
+ *         items: [
+ *             {
+ *                 // xtype: 'button', // default for Toolbars
+ *                 text: 'Button'
+ *             },
+ *             {
+ *                 xtype: 'splitbutton',
+ *                 text : 'Split Button'
+ *             },
+ *             // begin using the right-justified button container
+ *             '->', // same as { xtype: 'tbfill' }
+ *             {
+ *                 xtype    : 'textfield',
+ *                 name     : 'field1',
+ *                 emptyText: 'enter search term'
+ *             },
+ *             // add a vertical separator bar between toolbar items
+ *             '-', // same as {xtype: 'tbseparator'} to create Ext.toolbar.Separator
+ *             'text 1', // same as {xtype: 'tbtext', text: 'text1'} to create Ext.toolbar.TextItem
+ *             { xtype: 'tbspacer' },// same as ' ' to create Ext.toolbar.Spacer
+ *             'text 2',
+ *             { xtype: 'tbspacer', width: 50 }, // add a 50px space
+ *             'text 3'
+ *         ]
+ *     });
+ *
+ * Toolbars have {@link #method-enable} and {@link #method-disable} methods which when called, will
+ * enable/disable all items within your toolbar.
+ *
+ *     @example
+ *     Ext.create('Ext.toolbar.Toolbar', {
+ *         renderTo: document.body,
+ *         width   : 400,
+ *         items: [
+ *             {
+ *                 text: 'Button'
+ *             },
+ *             {
+ *                 xtype: 'splitbutton',
+ *                 text : 'Split Button'
+ *             },
+ *             '->',
+ *             {
+ *                 xtype    : 'textfield',
+ *                 name     : 'field1',
+ *                 emptyText: 'enter search term'
+ *             }
+ *         ]
+ *     });
+ *
+ * Example
+ *
+ *     @example
+ *     var enableBtn = Ext.create('Ext.button.Button', {
+ *         text    : 'Enable All Items',
+ *         disabled: true,
+ *         scope   : this,
+ *         handler : function() {
+ *             //disable the enable button and enable the disable button
+ *             enableBtn.disable();
+ *             disableBtn.enable();
+ *
+ *             //enable the toolbar
+ *             toolbar.enable();
+ *         }
+ *     });
+ *
+ *     var disableBtn = Ext.create('Ext.button.Button', {
+ *         text    : 'Disable All Items',
+ *         scope   : this,
+ *         handler : function() {
+ *             //enable the enable button and disable button
+ *             disableBtn.disable();
+ *             enableBtn.enable();
+ *
+ *             //disable the toolbar
+ *             toolbar.disable();
+ *         }
+ *     });
+ *
+ *     var toolbar = Ext.create('Ext.toolbar.Toolbar', {
+ *         renderTo: document.body,
+ *         width   : 400,
+ *         margin  : '5 0 0 0',
+ *         items   : [enableBtn, disableBtn]
+ *     });
+ *
+ * Adding items to and removing items from a toolbar is as simple as calling the {@link #method-add}
+ * and {@link #method-remove} methods. There is also a {@link #removeAll} method
+ * which remove all items within the toolbar.
+ *
+ *     @example
+ *     var toolbar = Ext.create('Ext.toolbar.Toolbar', {
+ *         renderTo: document.body,
+ *         width   : 700,
+ *         items: [
+ *             {
+ *                 text: 'Example Button'
+ *             }
+ *         ]
+ *     });
+ *
+ *     var addedItems = [];
+ *
+ *     Ext.create('Ext.toolbar.Toolbar', {
+ *         renderTo: document.body,
+ *         width   : 700,
+ *         margin  : '5 0 0 0',
+ *         items   : [
+ *             {
+ *                 text   : 'Add a button',
+ *                 scope  : this,
+ *                 handler: function() {
+ *                     var text = prompt('Please enter the text for your button:');
+ *                     addedItems.push(toolbar.add({
+ *                         text: text
+ *                     }));
+ *                 }
+ *             },
+ *             {
+ *                 text   : 'Add a text item',
+ *                 scope  : this,
+ *                 handler: function() {
+ *                     var text = prompt('Please enter the text for your item:');
+ *                     addedItems.push(toolbar.add(text));
+ *                 }
+ *             },
+ *             {
+ *                 text   : 'Add a toolbar separator',
+ *                 scope  : this,
+ *                 handler: function() {
+ *                     addedItems.push(toolbar.add('-'));
+ *                 }
+ *             },
+ *             {
+ *                 text   : 'Add a toolbar spacer',
+ *                 scope  : this,
+ *                 handler: function() {
+ *                     addedItems.push(toolbar.add('->'));
+ *                 }
+ *             },
+ *             '->',
+ *             {
+ *                 text   : 'Remove last inserted item',
+ *                 scope  : this,
+ *                 handler: function() {
+ *                     if (addedItems.length) {
+ *                         toolbar.remove(addedItems.pop());
+ *                     } else if (toolbar.items.length) {
+ *                         toolbar.remove(toolbar.items.last());
+ *                     } else {
+ *                         alert('No items in the toolbar');
+ *                     }
+ *                 }
+ *             },
+ *             {
+ *                 text   : 'Remove all items',
+ *                 scope  : this,
+ *                 handler: function() {
+ *                     toolbar.removeAll();
+ *                 }
+ *             }
+ *         ]
+ *     });
+ *
+ * @constructor
+ * Creates a new Toolbar
+ * @param {Object/Object[]} config A config object or an array of buttons to {@link #method-add}
+ * @docauthor Robert Dougan <rob at sencha.com>
+ */
+Ext.define('Ext.toolbar.Toolbar', {
+    extend:  Ext.container.Container ,
+               
+                           
+                                    
+                                   
+      
+           
+                               
+      
+    alias: 'widget.toolbar',
+    alternateClassName: 'Ext.Toolbar',
+
+    /**
+     * @property {Boolean} isToolbar
+     * `true` in this class to identify an object as an instantiated Toolbar, or subclass thereof.
+     */
+    isToolbar: true,
+    baseCls  : Ext.baseCSSPrefix + 'toolbar',
+    ariaRole : 'toolbar',
+
+    defaultType: 'button',
+
+    /**
+     * @cfg {Boolean} vertical
+     * Set to `true` to make the toolbar vertical. The layout will become a `vbox`.
+     */
+    vertical: false,
+
+    /**
+     * @cfg {Ext.enums.Layout/Object} layout
+     * This class assigns a default layout (`layout: 'hbox'`).
+     * Developers _may_ override this configuration option if another layout
+     * is required (the constructor must be passed a configuration object in this
+     * case instead of an array).
+     * See {@link Ext.container.Container#layout} for additional information.
+     */
+
+    /**
+     * @cfg {Boolean} enableOverflow
+     * Configure true to make the toolbar provide a button which activates a dropdown Menu to show
+     * items which overflow the Toolbar's width.
+     */
+    enableOverflow: false,
+
+    /**
+     * @cfg {String} menuTriggerCls
+     * Configure the icon class of the overflow button.
+     */
+    menuTriggerCls: Ext.baseCSSPrefix + 'toolbar-more-icon',
+
+    /**
+     * @cfg {String} defaultButtonUI
+     * A default {@link Ext.Component#ui ui} to use for {@link Ext.button.Button Button} items
+     */
+    
+    // @private
+    trackMenus: true,
+
+    itemCls: Ext.baseCSSPrefix + 'toolbar-item',
+
+    statics: {
+        shortcuts: {
+            '-' : 'tbseparator',
+            ' ' : 'tbspacer'
+        },
+
+        shortcutsHV: {
+            // horizontal
+            0: {
+                '->': { xtype: 'tbfill', height: 0 }
+            },
+            // vertical
+            1: {
+                '->': { xtype: 'tbfill', width: 0 }
+            }
+        }
+    },
+
+    initComponent: function() {
+        var me = this;
+
+        // check for simplified (old-style) overflow config:
+        if (!me.layout && me.enableOverflow) {
+            me.layout = { overflowHandler: 'Menu' };
+        }
+
+        if (me.dock === 'right' || me.dock === 'left') {
+            me.vertical = true;
+        }
+
+        me.layout = Ext.applyIf(Ext.isString(me.layout) ? {
+            type: me.layout
+        } : me.layout || {}, {
+            type: me.vertical ? 'vbox' : 'hbox',
+            align: me.vertical ? 'stretchmax' : 'middle'
+        });
+
+        if (me.vertical) {
+            me.addClsWithUI('vertical');
+        }
+
+        // @TODO: remove this hack and implement a more general solution
+        if (me.ui === 'footer') {
+            me.ignoreBorderManagement = true;
+        }
+
+        me.callParent();
+
+        /**
+         * @event overflowchange
+         * Fires after the overflow state has changed.
+         * @param {Number} lastHiddenCount The number of overflowing items that used to be hidden.
+         * @param {Number} hiddenCount The number of overflowing items that are hidden now.
+         * @param {Array} The hidden items
+         */
+        me.addEvents('overflowchange');
+    },
+
+    getRefItems: function(deep) {
+        var me = this,
+            items = me.callParent(arguments),
+            layout = me.layout,
+            handler;
+
+        if (deep && me.enableOverflow) {
+            handler = layout.overflowHandler;
+            if (handler && handler.menu) {
+                items = items.concat(handler.menu.getRefItems(deep));
+            }
+        }
+        return items;
+    },
+
+    /**
+     * Adds element(s) to the toolbar -- this function takes a variable number of
+     * arguments of mixed type and adds them to the toolbar.
+     *
+     * **Note**: See the notes within {@link Ext.container.Container#method-add}.
+     *
+     * @param {Ext.Component.../Object.../String.../HTMLElement...} args The following types of arguments are all valid:
+     *
+     *  - `{@link Ext.button.Button config}`: A valid button config object
+     *  - `HtmlElement`: Any standard HTML element
+     *  - `Field`: Any form field
+     *  - `Item`: Any subclass of {@link Ext.toolbar.Item}
+     *  - `String`: Any generic string (gets wrapped in a {@link Ext.toolbar.TextItem}).
+     *
+     *    Note that there are a few special strings that are treated differently as explained next:
+     *
+     *      - `'-'`: Creates a separator element
+     *      - `' '`: Creates a spacer element
+     *      - `'->'`: Creates a fill element
+     *
+     * @return {Ext.Component[]/Ext.Component} The Components that were added.
+     *
+     * @method add
+     */
+    
+    /**
+     * Inserts a Component into this Container at a specified index.
+     *
+     * @param {Number} index The index at which the Component will be inserted.
+     * @param {Ext.Component/Object/String/HTMLElement} component
+     * See {@link #method-add} method for overview of possible values.
+     * @return {Ext.Component} The component that was inserted.
+     * @method insert
+     */
+
+    // @private
+    lookupComponent: function(c) {
+        var args = arguments;
+        if (typeof c == 'string') {
+            var T = Ext.toolbar.Toolbar,
+                shortcut = T.shortcutsHV[this.vertical ? 1 : 0][c] || T.shortcuts[c];
+
+            if (typeof shortcut == 'string') {
+                c = {
+                    xtype: shortcut
+                };
+            } else if (shortcut) {
+                c = Ext.apply({}, shortcut);
+            } else {
+                c = {
+                    xtype: 'tbtext',
+                    text: c
+                };
+            }
+
+            this.applyDefaults(c);
+            
+            // See: EXTJSIV-7578
+            args = [c];
+        }
+
+        return this.callParent(args);
+    },
+
+    // @private
+    applyDefaults: function(c) {
+        if (!Ext.isString(c)) {
+            c = this.callParent(arguments);
+        }
+        return c;
+    },
+
+    // @private
+    trackMenu: function(item, remove) {
+        if (this.trackMenus && item.menu) {
+            var method = remove ? 'mun' : 'mon',
+                me = this;
+
+            me[method](item, 'mouseover', me.onButtonOver, me);
+            me[method](item, 'menushow', me.onButtonMenuShow, me);
+            me[method](item, 'menuhide', me.onButtonMenuHide, me);
+        }
+    },
+
+    // @private
+    onBeforeAdd: function(component) {
+        var me = this,
+            isButton = component.isButton;
+
+        if (isButton && me.defaultButtonUI && component.ui === 'default' &&
+            !component.hasOwnProperty('ui')) {
+            component.ui = me.defaultButtonUI;
+        } else if ((isButton || component.isFormField) && me.ui !== 'footer') {
+            component.ui = component.ui + '-toolbar';
+            component.addCls(component.baseCls + '-toolbar');
+        }
+
+        // Any separators needs to know if is vertical or not
+        if (component instanceof Ext.toolbar.Separator) {
+            component.setUI((me.vertical) ? 'vertical' : 'horizontal');
+        }
+
+        me.callParent(arguments);
+    },
+
+    // @private
+    onAdd: function(component) {
+        this.callParent(arguments);
+        this.trackMenu(component);
+    },
+    
+    // @private
+    onRemove: function(c) {
+        this.callParent(arguments);
+        this.trackMenu(c, true);
+    },
+    
+    getChildItemsToDisable: function() {
+        return this.items.getRange();   
+    },
+
+    // @private
+    onButtonOver: function(btn){
+        if (this.activeMenuBtn && this.activeMenuBtn != btn) {
+            this.activeMenuBtn.hideMenu();
+            btn.showMenu();
+            this.activeMenuBtn = btn;
+        }
+    },
+
+    // @private
+    onButtonMenuShow: function(btn) {
+        this.activeMenuBtn = btn;
+    },
+
+    // @private
+    onButtonMenuHide: function(btn) {
+        delete this.activeMenuBtn;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.panel.AbstractPanel
+ * @private
+ *
+ * A base class which provides methods common to Panel classes across the Sencha product range.
+ *
+ * Please refer to sub class's documentation
+ */
+Ext.define('Ext.panel.AbstractPanel', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.container.Container ,
+
+    mixins: {
+        docking:  Ext.container.DockingContainer 
+    },
+
+                                                                                 
+
+    /* End Definitions */
+
+    /**
+     * @cfg {String} [baseCls=x-panel]
+     * The base CSS class to apply to this panel's element.
+     * @since 2.3.0
+     */
+    baseCls : Ext.baseCSSPrefix + 'panel',
+
+    /**
+     * @cfg {Number/String} bodyPadding
+     * A shortcut for setting a padding style on the body element. The value can either be
+     * a number to be applied to all sides, or a normal css string describing padding.
+     * Defaults to <code>undefined</code>.
+     */
+
+    /**
+     * @cfg {Boolean} bodyBorder
+     * A shortcut to add or remove the border on the body of a panel. In the classic theme
+     * this only applies to a panel which has the {@link #frame} configuration set to `true`.
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String/Object/Function} bodyStyle
+     * Custom CSS styles to be applied to the panel's body element, which can be supplied as a valid CSS style string,
+     * an object containing style property name/value pairs or a function that returns such a string or object.
+     * For example, these two formats are interpreted to be equivalent:<pre><code>
+bodyStyle: 'background:#ffc; padding:10px;'
+
+bodyStyle: {
+    background: '#ffc',
+    padding: '10px'
+}
+     * </code></pre>
+     *
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String/String[]} bodyCls
+     * A CSS class, space-delimited string of classes, or array of classes to be applied to the panel's body element.
+     * The following examples are all valid:<pre><code>
+bodyCls: 'foo'
+bodyCls: 'foo bar'
+bodyCls: ['foo', 'bar']
+     * </code></pre>
+     */
+
+    /**
+     * @property {Boolean} isPanel
+     * `true` in this class to identify an object as an instantiated Panel, or subclass thereof.
+     */
+    isPanel: true,
+    
+    /**
+     * @property {Ext.dom.Element} body
+     * The Panel's body {@link Ext.dom.Element Element} which may be used to contain HTML content.
+     * The content may be specified in the {@link #html} config, or it may be loaded using the
+     * {@link #loader} config. Read-only.
+     *
+     * If this is used to load visible HTML elements in either way, then
+     * the Panel may not be used as a Layout for hosting nested Panels.
+     *
+     * If this Panel is intended to be used as the host of a Layout (See {@link #layout}
+     * then the body Element must not be loaded or changed - it is under the control
+     * of the Panel's Layout.
+     *
+     * @readonly
+     */
+
+    /**
+     * @property {String} [contentPaddingProperty='bodyPadding']
+     * @inheritdoc
+     */ 
+    contentPaddingProperty: 'bodyPadding',
+    
+    /**
+     * @cfg {Boolean/Number} shrinkWrapDock
+     * Allows for this panel to include the {@link #dockedItems} when trying to determine the overall
+     * size of the panel. This option is only applicable when this panel is also shrink wrapping in the
+     * same dimensions. See {@link Ext.AbstractComponent#shrinkWrap} for an explanation of the configuration options.
+     */
+    shrinkWrapDock: false,
+
+    componentLayout: 'dock',
+
+    childEls: [
+        'body'
+    ],
+
+    renderTpl: [
+        // If this Panel is framed, the framing template renders the docked items round the frame
+        '{% this.renderDockedItems(out,values,0); %}',
+        // This empty div solves an IE6/7/Quirks problem where the margin-top on the bodyEl
+        // is ignored. Best we can figure, this is triggered by the previousSibling being
+        // position absolute (a docked item). The goal is to use margins to position the
+        // bodyEl rather than left/top since that allows us to avoid writing a height on the
+        // panel and the body. This in turn allows CSS height to expand or contract the
+        // panel during things like portlet dragging where we want to avoid running a ton
+        // of layouts during the drag operation.
+        // This empty div also has to be relatively positioned, otherwise it crashes IE6-9 Quirks
+        // when panel is rendered in a table-based layout.
+        (Ext.isIE7m || Ext.isIEQuirks) ? '<div style="position:relative"></div>' : '',
+        '<div id="{id}-body" class="{baseCls}-body<tpl if="bodyCls"> {bodyCls}</tpl>',
+            ' {baseCls}-body-{ui}<tpl if="uiCls">',
+                '<tpl for="uiCls"> {parent.baseCls}-body-{parent.ui}-{.}</tpl>',
+            '</tpl>{childElCls}"',
+            '<tpl if="bodyStyle"> style="{bodyStyle}"</tpl>>',
+            '{%this.renderContainer(out,values);%}',
+        '</div>',
+        '{% this.renderDockedItems(out,values,1); %}'
+    ],
+
+    bodyPosProps: {
+        x: 'x',
+        y: 'y'
+    },
+
+    // TODO: Move code examples into product-specific files. The code snippet below is Touch only.
+    /**
+     * @cfg {Object/Object[]} dockedItems
+     * A component or series of components to be added as docked items to this panel.
+     * The docked items can be docked to either the top, right, left or bottom of a panel.
+     * This is typically used for things like toolbars or tab bars:
+     * <pre><code>
+var panel = new Ext.panel.Panel({
+    fullscreen: true,
+    dockedItems: [{
+        xtype: 'toolbar',
+        dock: 'top',
+        items: [{
+            text: 'Docked to the top'
+        }]
+    }]
+});</code></pre>
+     */
+
+    // @since 2.3.0
+    border: true,
+
+    /**
+     * @private
+     */
+    emptyArray: [],
+
+    initComponent : function() {
+        this.initBorderProps();
+        this.callParent();
+    },
+
+    initBorderProps: function() {
+        var me = this;
+
+        if (me.frame && me.border && me.bodyBorder === undefined) {
+            me.bodyBorder = false;
+        }
+        if (me.frame && me.border && (me.bodyBorder === false || me.bodyBorder === 0)) {
+            me.manageBodyBorders = true;
+        }
+    },
+
+    beforeDestroy: function(){
+        this.destroyDockedItems();
+        this.callParent();
+    },
+
+    // @private
+    initItems : function() {
+        this.callParent();
+        this.initDockingItems();
+    },
+
+    /**
+     * Initialized the renderData to be used when rendering the renderTpl.
+     * @return {Object} Object with keys and values that are going to be applied to the renderTpl
+     * @private
+     */
+    initRenderData: function() {
+        var me = this,
+            data = me.callParent();
+
+        me.initBodyStyles();
+        me.protoBody.writeTo(data);
+        delete me.protoBody;
+
+        return data;
+    },
+
+    /**
+     * Attempts a default component lookup (see {@link Ext.container.Container#getComponent}). If the component is not found in the normal
+     * items, the dockedItems are searched and the matched component (if any) returned (see {@link #getDockedComponent}). Note that docked
+     * items will only be matched by component id or itemId -- if you pass a numeric index only non-docked child components will be searched.
+     * @param {String/Number} comp The component id, itemId or position to find
+     * @return {Ext.Component} The component (if found)
+     * @since 2.3.0
+     */
+    getComponent: function(comp) {
+        var component = this.callParent(arguments);
+        if (component === undefined && !Ext.isNumber(comp)) {
+            // If the arg is a numeric index skip docked items
+            component = this.getDockedComponent(comp);
+        }
+        return component;
+    },
+
+    getProtoBody: function () {
+        var me = this,
+            body = me.protoBody;
+
+        if (!body) {
+            me.protoBody = body = new Ext.util.ProtoElement({
+                cls: me.bodyCls,
+                style: me.bodyStyle,
+                clsProp: 'bodyCls',
+                styleProp: 'bodyStyle',
+                styleIsText: true
+            });
+        }
+
+        return body;
+    },
+
+    /**
+     * Parses the {@link #bodyStyle} config if available to create a style string that will be applied to the body element.
+     * This also includes {@link #bodyPadding} and {@link #bodyBorder} if available.
+     * @return {String} A CSS style string with body styles, padding and border.
+     * @private
+     */
+    initBodyStyles: function() {
+        var me = this,
+            body = me.getProtoBody();
+
+        if (me.bodyPadding !== undefined) {
+            if (me.layout.managePadding) {
+                // If the container layout manages padding, the layout will apply the 
+                // padding to an inner element rather than the body element.  The
+                // assumed intent is for the configured padding to override any padding
+                // that is applied to the body element via stylesheet rules.  It is
+                // therefore necessary to set the body element's padding to "0".
+                body.setStyle('padding', 0);
+            } else {
+                body.setStyle('padding', this.unitizeBox((me.bodyPadding === true) ? 5 : me.bodyPadding));
+            }
+        }
+        me.initBodyBorder();
+    },
+
+    initBodyBorder: function() {
+        var me = this;
+
+        if (me.frame && me.bodyBorder) {
+            if (!Ext.isNumber(me.bodyBorder)) {
+                me.bodyBorder = 1;
+            }
+            me.getProtoBody().setStyle('border-width', this.unitizeBox(me.bodyBorder));
+        }
+    },
+
+    getCollapsedDockedItems: function () {
+        var me = this;
+        return me.header === false || me.collapseMode == 'placeholder' ? me.emptyArray : [ me.getReExpander() ];
+    },
+
+    /**
+     * Sets the body style according to the passed parameters.
+     * @param {Mixed} style A full style specification string, or object, or the name of a style property to set.
+     * @param {String} value If the first param was a style property name, the style property value.
+     * @return {Ext.panel.Panel} this
+     */
+    setBodyStyle: function(style, value) {
+        var me = this,
+            body = me.rendered ? me.body : me.getProtoBody();
+
+        if (Ext.isFunction(style)) {
+            style = style();
+        }
+        if (arguments.length == 1) {
+            if (Ext.isString(style)) {
+                style = Ext.Element.parseStyles(style);     
+            }
+            body.setStyle(style);
+        } else {
+            body.setStyle(style, value);
+        }
+        return me;
+    },
+
+    /**
+     * Adds a CSS class to the body element. If not rendered, the class will
+     * be added when the panel is rendered. 
+     * @param {String} cls The class to add
+     * @return {Ext.panel.Panel} this
+     */
+    addBodyCls: function(cls) {
+        var me = this,
+            body = me.rendered ? me.body : me.getProtoBody();
+
+        body.addCls(cls);
+        return me;
+    },
+
+    /**
+     * Removes a CSS class from the body element.
+     * @param {String} cls The class to remove
+     * @return {Ext.panel.Panel} this
+     */
+    removeBodyCls: function(cls) {
+        var me = this,
+            body = me.rendered ? me.body : me.getProtoBody();
+
+        body.removeCls(cls);
+        return me;
+    },
+
+    // inherit docs
+    addUIClsToElement: function(cls) {
+        var me = this,
+            result = me.callParent(arguments);
+
+        me.addBodyCls([Ext.baseCSSPrefix + cls, me.baseCls + '-body-' + cls, me.baseCls + '-body-' + me.ui + '-' + cls]);
+        return result;
+    },
+
+    // inherit docs
+    removeUIClsFromElement: function(cls) {
+        var me = this,
+            result = me.callParent(arguments);
+
+        me.removeBodyCls([Ext.baseCSSPrefix + cls, me.baseCls + '-body-' + cls, me.baseCls + '-body-' + me.ui + '-' + cls]);
+        return result;
+    },
+
+    // inherit docs
+    addUIToElement: function() {
+        var me = this;
+
+        me.callParent(arguments);
+        me.addBodyCls(me.baseCls + '-body-' + me.ui);
+    },
+
+    // inherit docs
+    removeUIFromElement: function() {
+        var me = this;
+
+        me.callParent(arguments);
+        me.removeBodyCls(me.baseCls + '-body-' + me.ui);
+    },
+
+    // @private
+    getTargetEl : function() {
+        return this.body;
+    },
+
+    applyTargetCls: function(targetCls) {
+        this.getProtoBody().addCls(targetCls);
+    },
+
+    getRefItems: function(deep) {
+        var items = this.callParent(arguments);
+
+        return this.getDockingRefItems(deep, items);
+    },
+
+    setupRenderTpl: function (renderTpl) {
+        this.callParent(arguments);
+        this.setupDockingRenderTpl(renderTpl);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Simple header class which is used for on {@link Ext.panel.Panel} and {@link Ext.window.Window}.
+ */
+Ext.define('Ext.panel.Header', {
+    extend:  Ext.container.Container ,
+                                                                                     
+    alias: 'widget.header',
+
+    /**
+     * @property {Boolean} isHeader
+     * `true` in this class to identify an object as an instantiated Header, or subclass thereof.
+     */
+    isHeader       : true,
+    defaultType    : 'tool',
+    indicateDrag   : false,
+    weight         : -1,
+    componentLayout: 'body',
+
+    /**
+     * @cfg {String} [titleAlign]
+     * The alignment of the title text within the available space between the
+     * icon and the tools.
+     *
+     * May be `"left"`, `"right"` or `"center"`. Defaults to the browser's natural
+     * behavior depending on the css direction property - `"left"` when direction
+     * is ltr  and `"right"` when direction is rtl
+     * (see {@link Ext.AbstractComponent#rtl}).
+     */
+
+    childEls: [
+        'body'
+    ],
+
+    renderTpl: [
+        '<div id="{id}-body" class="{headerCls}-body {baseCls}-body {bodyCls} {bodyTargetCls}',
+        '<tpl for="uiCls"> {parent.baseCls}-body-{parent.ui}-{.}</tpl>"',
+        '<tpl if="bodyStyle"> style="{bodyStyle}"</tpl>>',
+            '{%this.renderContainer(out,values)%}',
+        '</div>'
+    ],
+
+    headingTpl: [
+        // unselectable="on" is required for Opera, other browsers inherit unselectability from the header
+        '<span id="{id}-textEl" class="{headerCls}-text {cls}-text {cls}-text-{ui}" unselectable="on">{title}</span>'
+    ],
+
+    shrinkWrap: 3,
+
+    /**
+     * @cfg {String} title
+     * The title text to display.
+     */
+
+    /**
+     * @cfg {Number} [titlePosition]
+     * The ordinal position among the header items (tools and other components specified using the {@link #cfg-items} config)
+     * at which the title component is inserted. See {@link Ext.panel.Panel#cfg-header Panel's header config}.
+     *
+     * If not specified, the title is inserted after any {@link #cfg-items}, but *before* any {@link Ext.panel.Panel#tools}.
+     *
+     * Note that if an {@link #icon} or {@link #iconCls} has been configured, then the icon component will be the
+     * first item before all specified tools or {@link #cfg-items}. This configuration does not include the icon.
+     */
+    titlePosition: 0,
+
+    /**
+     * @cfg {String} iconCls
+     * CSS class for an icon in the header. Used for displaying an icon to the left of a title.
+     */
+
+    /**
+     * @cfg {String} icon
+     * Path to image for an icon in the header. Used for displaying an icon to the left of a title.
+     */
+
+    /**
+     * @cfg {Number/String} glyph
+     * A numeric unicode character code to use as the icon for the panel header. The
+     * default font-family for glyphs can be set globally using
+     * {@link Ext#setGlyphFontFamily Ext.setGlyphFontFamily()}. Alternatively, this
+     * config option accepts a string with the charCode and font-family separated by the
+     * `@` symbol. For example '65 at My Font Family'.
+     */
+
+    // a class for styling that is shared between panel and window headers
+    headerCls: Ext.baseCSSPrefix + 'header',
+
+    initComponent: function() {
+        var me = this,
+            hasPosition = me.hasOwnProperty('titlePosition'),
+            items = me.items,
+            titlePosition = hasPosition ? me.titlePosition : (items ? items.length : 0),
+            uiClasses = [me.orientation, me.getDockName()],
+            ownerCt = me.ownerCt;
+
+        me.addEvents(
+            /**
+             * @event click
+             * Fires when the header is clicked. This event will not be fired
+             * if the click was on a {@link Ext.panel.Tool}
+             * @param {Ext.panel.Header} this
+             * @param {Ext.EventObject} e
+             */
+            'click',
+
+            /**
+             * @event dblclick
+             * Fires when the header is double clicked. This event will not
+             * be fired if the click was on a {@link Ext.panel.Tool}
+             * @param {Ext.panel.Header} this
+             * @param {Ext.EventObject} e
+             */
+            'dblclick'
+        );
+
+        me.indicateDragCls = me.headerCls + '-draggable';
+        me.title = me.title || ' ';
+        me.tools = me.tools || [];
+        items = me.items = (items ? Ext.Array.slice(items) : []);
+        me.orientation = me.orientation || 'horizontal';
+        me.dock = (me.dock) ? me.dock : (me.orientation == 'horizontal') ? 'top' : 'left';
+
+        if (ownerCt ? (!ownerCt.border && !ownerCt.frame) : !me.border) {
+            uiClasses.push(me.orientation + '-noborder');
+        }
+        me.addClsWithUI(uiClasses);
+        me.addCls([me.headerCls, me.headerCls + '-' + me.orientation]);
+
+        if (me.indicateDrag) {
+            me.addCls(me.indicateDragCls);
+        }
+
+        // Add Icon
+        if (me.iconCls || me.icon || me.glyph) {
+            me.initIconCmp();
+            // If we didn't provide a position or items, the icon should
+            // appear before the title
+            if (!hasPosition && !items.length) {
+                ++titlePosition;
+            }
+            items.push(me.iconCmp);
+        }
+
+        // Add Title
+        me.titleCmp = new Ext.Component({
+            ariaRole  : 'heading',
+            focusable : false,
+            noWrap    : true,
+            flex      : 1,
+            rtl       : me.rtl,
+            id        : me.id + '_hd',
+            style     : me.titleAlign ? ('text-align:' + me.titleAlign) : '',
+            cls       : me.headerCls + '-text-container ' +
+                        me.baseCls + '-text-container ' +
+                        me.baseCls + '-text-container-' + me.ui,
+            renderTpl : me.getTpl('headingTpl'),
+            renderData: {
+                title: me.title,
+                cls  : me.baseCls,
+                headerCls: me.headerCls,
+                ui   : me.ui
+            },
+            childEls  : ['textEl'],
+            autoEl: {
+                // Required for Opera
+                unselectable: 'on'
+            },
+            listeners: {
+                render: me.onTitleRender,
+                scope: me
+            }
+        });
+        me.layout = (me.orientation == 'vertical') ? {
+            type : 'vbox',
+            align: 'center',
+            alignRoundingMethod: 'ceil'
+        } : {
+            type : 'hbox',
+            align: 'middle',
+            alignRoundingMethod: 'floor'
+        };
+
+        // Add Tools
+        Ext.Array.push(items, me.tools);
+        // Clear the tools so we can have only the instances. Intentional mutation of passed in array
+        // Owning code in Panel uses this array as its pubic tools property.
+        me.tools.length = 0;
+        me.callParent();
+
+        if (items.length < titlePosition) {
+            titlePosition = items.length;
+        }
+        me.titlePosition = titlePosition;
+
+        // Insert the titleComponent at the specified position
+        me.insert(titlePosition, me.titleCmp);
+
+        me.on({
+            dblclick: me.onDblClick,
+            click: me.onClick,
+            element: 'el',
+            scope: me
+        });
+    },
+
+    initIconCmp: function() {
+        var me = this,
+            cls = [me.headerCls + '-icon', me.baseCls + '-icon', me.iconCls],
+            cfg;
+       
+        if (me.glyph) {
+            cls.push(me.baseCls + '-glyph');
+        }
+
+        cfg = {
+            focusable: false,
+            src: Ext.BLANK_IMAGE_URL,
+            cls: cls,
+            baseCls: me.baseCls + '-icon',
+            id: me.id + '-iconEl',
+            iconCls: me.iconCls,
+            glyph:  me.glyph
+        };
+
+        if (!Ext.isEmpty(me.icon)) {
+            delete cfg.iconCls;
+            cfg.src = me.icon;
+        }
+
+        me.iconCmp = new Ext.Img(cfg);
+    },
+
+    beforeRender: function() {
+        this.protoEl.unselectable();
+        this.callParent();
+    },
+
+    afterLayout: function() {
+        var me = this,
+            frameBR, frameTR, frameTL, xPos;
+
+        if (me.orientation === 'vertical') {
+            me.adjustTitlePosition();
+            frameTR = me.frameTR;
+            if (frameTR) {
+                // The corners sprite currently requires knowledge of the vertical header's
+                // width to correctly set the background position of the bottom right corner.
+                // TODO: rearrange the sprite so that this can be done with pure css.
+                frameBR = me.frameBR;
+                frameTL = me.frameTL;
+                xPos = (me.getWidth() - frameTR.getPadding('r') -
+                    ((frameTL) ? frameTL.getPadding('l') : me.el.getBorderWidth('l'))) + 'px';
+                frameBR.setStyle('background-position-x', xPos);
+                frameTR.setStyle('background-position-x', xPos);
+            }
+            if (Ext.isIE7 && Ext.isStrict && me.frame) {
+                // EXTJSIV-7283: framed header background is initally off in IE7 strict
+                // unless we repaint
+                me.el.repaint();
+            }
+        }
+    },
+
+    beforeLayout: function () {
+        this.callParent();
+        this.syncBeforeAfterTitleClasses();
+    },
+
+    adjustTitlePosition: function() {
+        var titleCmp = this.titleCmp,
+            titleEl;
+
+        if (!Ext.isIE9m && titleCmp) { // some Headers don't have a titleCmp, e.g. TabBar
+            // In IE9 and below we use a BasicImage filter to rotate the title
+            // element 90 degrees.  The result is that what was the bottom left
+            // corner is positioned exactly where the top left corner was
+            // originally.  Since this is the desired result, no additional
+            // positioning is needed in IE9 and below.  In modern browsers,
+            // however, we use transform: rotate(90deg) to rotate the element.
+            // CSS3 also provides a way to specify the position the rotated element
+            // by changing the axis on which it is rotated using the transform-origin
+            // property, but the required transform origin varies based on the
+            // elements size, and would require some complex math to calculate.
+            // To achieve the desired rotated position in modern browsers we use
+            // a transform-origin of "0, 0" which means the top left corner of
+            // the element is the rotation axis. After rotating 90 degrees we
+            // simply move the element to the right by the same number of pixels
+            // as its width.
+            titleEl = titleCmp.el;
+            titleEl.setStyle('left', titleEl.getWidth() + 'px');
+        }
+    },
+
+    onTitleRender: function() {
+        if (this.orientation === 'vertical') {
+            this.titleCmp.el.setVertical(90);
+        }
+    },
+
+    // inherit docs
+    addUIClsToElement: function(cls) {
+        var me = this,
+            result = me.callParent(arguments),
+            classes = [me.baseCls + '-body-' + cls, me.baseCls + '-body-' + me.ui + '-' + cls],
+            array, i;
+
+        if (me.bodyCls) {
+            array = me.bodyCls.split(' ');
+
+            for (i = 0; i < classes.length; i++) {
+                if (!Ext.Array.contains(array, classes[i])) {
+                    array.push(classes[i]);
+                }
+            }
+
+            me.bodyCls = array.join(' ');
+        } else {
+            me.bodyCls = classes.join(' ');
+        }
+
+        return result;
+    },
+
+    // inherit docs
+    removeUIClsFromElement: function(cls) {
+        var me = this,
+            result = me.callParent(arguments),
+            classes = [me.baseCls + '-body-' + cls, me.baseCls + '-body-' + me.ui + '-' + cls],
+            array, i;
+
+        if (me.bodyCls) {
+            array = me.bodyCls.split(' ');
+
+            for (i = 0; i < classes.length; i++) {
+                Ext.Array.remove(array, classes[i]);
+            }
+
+            me.bodyCls = array.join(' ');
+        }
+
+        return result;
+    },
+
+    // inherit docs
+    addUIToElement: function() {
+        var me = this,
+            array, cls;
+
+        me.callParent(arguments);
+
+        cls = me.baseCls + '-body-' + me.ui;
+        if (me.rendered) {
+            if (me.bodyCls) {
+                me.body.addCls(me.bodyCls);
+            } else {
+                me.body.addCls(cls);
+            }
+        } else {
+            if (me.bodyCls) {
+                array = me.bodyCls.split(' ');
+
+                if (!Ext.Array.contains(array, cls)) {
+                    array.push(cls);
+                }
+
+                me.bodyCls = array.join(' ');
+            } else {
+                me.bodyCls = cls;
+            }
+        }
+
+        if (me.titleCmp && me.titleCmp.rendered) {
+            me.titleCmp.addCls(me.baseCls + '-text-container-' + me.ui);
+        }
+    },
+
+    // inherit docs
+    removeUIFromElement: function() {
+        var me = this,
+            array, cls;
+
+        me.callParent(arguments);
+
+        cls = me.baseCls + '-body-' + me.ui;
+        if (me.rendered) {
+            if (me.bodyCls) {
+                me.body.removeCls(me.bodyCls);
+            } else {
+                me.body.removeCls(cls);
+            }
+        } else {
+            if (me.bodyCls) {
+                array = me.bodyCls.split(' ');
+                Ext.Array.remove(array, cls);
+                me.bodyCls = array.join(' ');
+            } else {
+                me.bodyCls = cls;
+            }
+        }
+
+        if (me.titleCmp && me.titleCmp.rendered) {
+            me.titleCmp.removeCls(me.baseCls + '-text-container-' + me.ui);
+        }
+    },
+
+    onClick: function(e) {
+        this.fireClickEvent('click', e);
+    },
+
+    onDblClick: function(e){
+        this.fireClickEvent('dblclick', e);
+    },
+
+    fireClickEvent: function(type, e){
+        var toolCls = '.' + Ext.panel.Tool.prototype.baseCls;
+        if (!e.getTarget(toolCls)) {
+            this.fireEvent(type, this, e);
+        }
+    },
+
+    getFocusEl: function() {
+        return this.el;
+    },
+
+    getTargetEl: function() {
+        return this.body || this.frameBody || this.el;
+    },
+
+    applyTargetCls: function(targetCls) {
+        this.bodyTargetCls = targetCls;
+    },
+
+    /**
+     * Sets the title of the header.
+     * @param {String} title The title to be set
+     */
+    setTitle: function(title) {
+        var me = this,
+            titleCmp = me.titleCmp;
+
+        me.title = title;
+        if (titleCmp.rendered) {
+            titleCmp.textEl.update(me.title || ' ');
+            titleCmp.updateLayout();
+        } else {
+            me.titleCmp.on({
+                render: function() {
+                    me.setTitle(title);
+                },
+                single: true
+            });
+        }
+    },
+
+    /**
+     * @private
+     * Used when shrink wrapping a Panel to either content width or header width.
+     * This returns the minimum width required to display the header, icon and tools.
+     * **This is only intended for use with horizontal headers.**
+     */
+    getMinWidth: function() {
+        var me = this,
+            textEl = me.titleCmp.textEl.dom,
+            result,
+            tools = me.tools,
+            l, i;
+
+        // Measure text width as inline element so it doesn't stretch
+        textEl.style.display = 'inline';
+        result = textEl.offsetWidth;
+        textEl.style.display = '';
+
+        // Add tools width
+        if (tools && (l = tools.length)) {
+            for (i = 0; i < l; i++) {
+                if (tools[i].el) {
+                    result += tools[i].el.dom.offsetWidth;
+                }
+            }
+        }
+
+        // Add iconWidth
+        if (me.iconCmp) {
+            result += me.iconCmp.el.dom.offsetWidth;
+        }
+
+        // Return with some space between title and tools/end of header.
+        return result + 10;
+    },
+
+    /**
+     * Sets the CSS class that provides the icon image for this header.  This method will replace any existing
+     * icon class if one has already been set.
+     * @param {String} cls The new CSS class name
+     */
+    setIconCls: function(cls) {
+        var me = this,
+            isEmpty = !cls || !cls.length,
+            iconCmp = me.iconCmp;
+
+        me.iconCls = cls;
+        if (!me.iconCmp && !isEmpty) {
+            me.initIconCmp();
+            me.insert(0, me.iconCmp);
+        } else if (iconCmp) {
+            if (isEmpty) {
+                me.iconCmp.destroy();
+                delete me.iconCmp;
+            } else {
+                iconCmp.removeCls(iconCmp.iconCls);
+                iconCmp.addCls(cls);
+                iconCmp.iconCls = cls;
+            }
+        }
+    },
+
+    /**
+     * Sets the image path that provides the icon image for this header.  This method will replace any existing
+     * icon if one has already been set.
+     * @param {String} icon The new icon path
+     */
+    setIcon: function(icon) {
+        var me = this,
+            isEmpty = !icon || !icon.length,
+            iconCmp = me.iconCmp;
+
+        me.icon = icon;
+        if (!me.iconCmp && !isEmpty) {
+            me.initIconCmp();
+            me.insert(0, me.iconCmp);
+        } else if (iconCmp) {
+            if (isEmpty) {
+                me.iconCmp.destroy();
+                delete me.iconCmp;
+            } else {
+                iconCmp.setSrc(me.icon);
+            }
+        }
+    },
+
+     /**
+     * Sets glyph that provides the icon image for this header.  This method will replace any existing
+     * glyph if one has already been set.
+     * @param {Number/String} glyph the numeric charCode or string charCode/font-family.
+     * This parameter expects a format consistent with that of {@link #glyph}
+     */
+    setGlyph: function(glyph) {
+        var me = this,
+            iconCmp = me.iconCmp;
+        
+        if (!me.iconCmp) {
+            me.initIconCmp();
+            me.insert(0, me.iconCmp);
+        } else if (iconCmp) {
+            if (glyph) {
+                me.iconCmp.setGlyph(glyph);
+            } else {
+                me.iconCmp.destroy();
+                delete me.iconCmp;
+            }
+        }
+    },
+
+    /**
+     * Gets the tools for this header.
+     * @return {Ext.panel.Tool[]} The tools
+     */
+    getTools: function(){
+        return this.tools.slice();
+    },
+
+    /**
+     * Add a tool to the header
+     * @param {Object} tool
+     */
+    addTool: function(tool) {
+        // Even though the defaultType is tool, it may be changed,
+        // so let's be safe and forcibly specify tool
+        this.add(Ext.ComponentManager.create(tool, 'tool'));
+    },
+
+    syncBeforeAfterTitleClasses: function() {
+        var me = this,
+            items = me.items,
+            childItems = items.items,
+            titlePosition = me.titlePosition,
+            itemCount = childItems.length,
+            itemGeneration = items.generation,
+            syncGen = me.syncBeforeAfterGen,
+            afterCls, beforeCls, i, item;
+
+        if (syncGen === itemGeneration) {
+            return;
+        }
+        me.syncBeforeAfterGen = itemGeneration;
+
+        for (i = 0; i < itemCount; ++i) {
+            item = childItems[i];
+
+            afterCls  = item.afterTitleCls  || (item.afterTitleCls  = item.baseCls + '-after-title')
+            beforeCls = item.beforeTitleCls || (item.beforeTitleCls = item.baseCls + '-before-title')
+
+            if (!me.title || i < titlePosition) {
+                if (syncGen) {
+                    item.removeCls(afterCls);
+                } // else first time we won't need to remove anything...
+                item.addCls(beforeCls);
+            } else if (i > titlePosition) {
+                if (syncGen) {
+                    item.removeCls(beforeCls);
+                }
+                item.addCls(afterCls);
+            }
+        }
+    },
+
+    /**
+     * @protected
+     * Set up the `tools.<tool type>` link in the owning Panel.
+     * @param component
+     * @param index
+     */
+    onAdd: function(component, index) {
+        var tools = this.tools;
+        this.callParent(arguments);
+        if (component.isTool) {
+            tools.push(component);
+            tools[component.type] = component;
+        }
+    },
+
+    /**
+     * Add bodyCls to the renderData object
+     * @return {Object} Object with keys and values that are going to be applied to the renderTpl
+     * @private
+     */
+    initRenderData: function() {
+        return Ext.applyIf(this.callParent(), {
+            bodyCls: this.bodyCls,
+            bodyTargetCls: this.bodyTargetCls,
+            headerCls: this.headerCls
+        });
+    },
+
+    getDockName: function() {
+        return this.dock;
+    },
+    
+    getFramingInfoCls: function(){
+        var me = this,
+            cls = me.callParent(),
+            owner = me.ownerCt;
+            
+        if (!me.expanding && (owner && owner.collapsed) || me.isCollapsedExpander) {
+            cls += '-' + owner.collapsedCls; 
+        }
+        return cls + '-' + me.dock;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/*
+ * This is a derivative of the similarly named class in the YUI Library.
+ * The original license:
+ * Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ */
+
+
+/**
+ * Defines the interface and base operation of items that that can be
+ * dragged or can be drop targets.  It was designed to be extended, overriding
+ * the event handlers for startDrag, onDrag, onDragOver and onDragOut.
+ * Up to three html elements can be associated with a DragDrop instance:
+ *
+ * - linked element: the element that is passed into the constructor.
+ *   This is the element which defines the boundaries for interaction with
+ *   other DragDrop objects.
+ *
+ * - handle element(s): The drag operation only occurs if the element that
+ *   was clicked matches a handle element.  By default this is the linked
+ *   element, but there are times that you will want only a portion of the
+ *   linked element to initiate the drag operation, and the setHandleElId()
+ *   method provides a way to define this.
+ *
+ * - drag element: this represents the element that would be moved along
+ *   with the cursor during a drag operation.  By default, this is the linked
+ *   element itself as in {@link Ext.dd.DD}.  setDragElId() lets you define
+ *   a separate element that would be moved, as in {@link Ext.dd.DDProxy}.
+ *
+ * This class should not be instantiated until the onload event to ensure that
+ * the associated elements are available.
+ * The following would define a DragDrop obj that would interact with any
+ * other DragDrop obj in the "group1" group:
+ *
+ *     dd = new Ext.dd.DragDrop("div1", "group1");
+ *
+ * Since none of the event handlers have been implemented, nothing would
+ * actually happen if you were to run the code above.  Normally you would
+ * override this class or one of the default implementations, but you can
+ * also override the methods you want on an instance of the class...
+ *
+ *     dd.onDragDrop = function(e, id) {
+ *         alert("dd was dropped on " + id);
+ *     }
+ *
+ */
+Ext.define('Ext.dd.DragDrop', {
+                                         
+
+    /**
+     * Creates new DragDrop.
+     * @param {String} id of the element that is linked to this instance
+     * @param {String} sGroup the group of related DragDrop objects
+     * @param {Object} config an object containing configurable attributes.
+     * Valid properties for DragDrop:
+     *
+     * - padding
+     * - isTarget
+     * - maintainOffset
+     * - primaryButtonOnly
+     */
+    constructor: function(id, sGroup, config) {
+        if(id) {
+            this.init(id, sGroup, config);
+        }
+    },
+
+    /**
+     * @property {Boolean} ignoreSelf
+     * Set to false to enable a DragDrop object to fire drag events while dragging
+     * over its own Element. Defaults to true - DragDrop objects do not by default
+     * fire drag events to themselves.
+     */
+
+    /**
+     * @property {String} id
+     * The id of the element associated with this object.  This is what we
+     * refer to as the "linked element" because the size and position of
+     * this element is used to determine when the drag and drop objects have
+     * interacted.
+     */
+    id: null,
+
+    /**
+     * @property {Object} config
+     * Configuration attributes passed into the constructor
+     */
+    config: null,
+
+    /**
+     * @property {String} dragElId
+     * The id of the element that will be dragged.  By default this is same
+     * as the linked element, but could be changed to another element. Ex:
+     * Ext.dd.DDProxy
+     * @private
+     */
+    dragElId: null,
+
+    /**
+     * @property {String} handleElId
+     * The ID of the element that initiates the drag operation.  By default
+     * this is the linked element, but could be changed to be a child of this
+     * element.  This lets us do things like only starting the drag when the
+     * header element within the linked html element is clicked.
+     * @private
+     */
+    handleElId: null,
+
+    /**
+     * @property {Object} invalidHandleTypes
+     * An object who's property names identify HTML tags to be considered invalid as drag handles.
+     * A non-null property value identifies the tag as invalid. Defaults to the
+     * following value which prevents drag operations from being initiated by `<a>` elements:
+     *
+     *     {
+     *         A: "A"
+     *     }
+     */
+    invalidHandleTypes: null,
+
+    /**
+     * @property {Object} invalidHandleIds
+     * An object who's property names identify the IDs of elements to be considered invalid as drag handles.
+     * A non-null property value identifies the ID as invalid. For example, to prevent
+     * dragging from being initiated on element ID "foo", use:
+     *
+     *     {
+     *         foo: true
+     *     }
+     */
+    invalidHandleIds: null,
+
+    /**
+     * @property {String[]} invalidHandleClasses
+     * An Array of CSS class names for elements to be considered in valid as drag handles.
+     */
+    invalidHandleClasses: null,
+
+    /**
+     * @property {Number} startPageX
+     * The linked element's absolute X position at the time the drag was
+     * started
+     * @private
+     */
+    startPageX: 0,
+
+    /**
+     * @property {Number} startPageY
+     * The linked element's absolute X position at the time the drag was
+     * started
+     * @private
+     */
+    startPageY: 0,
+
+    /**
+     * @property {Object} groups
+     * The group defines a logical collection of DragDrop objects that are
+     * related.  Instances only get events when interacting with other
+     * DragDrop object in the same group.  This lets us define multiple
+     * groups using a single DragDrop subclass if we want.
+     *
+     * An object in the format {'group1':true, 'group2':true}
+     */
+    groups: null,
+
+    /**
+     * @property {Boolean} locked
+     * Individual drag/drop instances can be locked.  This will prevent
+     * onmousedown start drag.
+     * @private
+     */
+    locked: false,
+
+    /**
+     * Locks this instance
+     */
+    lock: function() {
+        this.locked = true;
+    },
+
+    /**
+     * @property {Boolean} moveOnly
+     * When set to true, other DD objects in cooperating DDGroups do not receive
+     * notification events when this DD object is dragged over them.
+     */
+    moveOnly: false,
+
+    /**
+     * Unlocks this instace
+     */
+    unlock: function() {
+        this.locked = false;
+    },
+
+    /**
+     * @property {Boolean} isTarget
+     * By default, all instances can be a drop target.  This can be disabled by
+     * setting isTarget to false.
+     */
+    isTarget: true,
+
+    /**
+     * @property {Number[]} padding
+     * The padding configured for this drag and drop object for calculating
+     * the drop zone intersection with this object.
+     * An array containing the 4 padding values: [top, right, bottom, left]
+     */
+    padding: null,
+
+    /**
+     * @property _domRef
+     * Cached reference to the linked element
+     * @private
+     */
+    _domRef: null,
+
+    /**
+     * @property __ygDragDrop
+     * Internal typeof flag
+     * @private
+     */
+    __ygDragDrop: true,
+
+    /**
+     * @property {Boolean} constrainX
+     * Set to true when horizontal contraints are applied
+     * @private
+     */
+    constrainX: false,
+
+    /**
+     * @property {Boolean} constrainY
+     * Set to true when vertical contraints are applied
+     * @private
+     */
+    constrainY: false,
+
+    /**
+     * @property {Number} minX
+     * The left constraint
+     * @private
+     */
+    minX: 0,
+
+    /**
+     * @property {Number} maxX
+     * The right constraint
+     * @private
+     */
+    maxX: 0,
+
+    /**
+     * @property {Number} minY
+     * The up constraint
+     * @private
+     */
+    minY: 0,
+
+    /**
+     * @property {Number} maxY
+     * The down constraint
+     * @private
+     */
+    maxY: 0,
+
+    /**
+     * @property {Boolean} maintainOffset
+     * Maintain offsets when we resetconstraints.  Set to true when you want
+     * the position of the element relative to its parent to stay the same
+     * when the page changes
+     */
+    maintainOffset: false,
+
+    /**
+     * @property {Number[]} xTicks
+     * Array of pixel locations the element will snap to if we specified a
+     * horizontal graduation/interval.  This array is generated automatically
+     * when you define a tick interval.
+     */
+    xTicks: null,
+
+    /**
+     * @property {Number[]} yTicks
+     * Array of pixel locations the element will snap to if we specified a
+     * vertical graduation/interval.  This array is generated automatically
+     * when you define a tick interval.
+     */
+    yTicks: null,
+
+    /**
+     * @property {Boolean} primaryButtonOnly
+     * By default the drag and drop instance will only respond to the primary
+     * button click (left button for a right-handed mouse).  Set to true to
+     * allow drag and drop to start with any mouse click that is propogated
+     * by the browser
+     */
+    primaryButtonOnly: true,
+
+    /**
+     * @property {Boolean} available
+     * The available property is false until the linked dom element is accessible.
+     */
+    available: false,
+
+    /**
+     * @property {Boolean} hasOuterHandles
+     * By default, drags can only be initiated if the mousedown occurs in the
+     * region the linked element is.  This is done in part to work around a
+     * bug in some browsers that mis-report the mousedown if the previous
+     * mouseup happened outside of the window.  This property is set to true
+     * if outer handles are defined. Defaults to false.
+     */
+    hasOuterHandles: false,
+
+    /**
+     * Code that executes immediately before the startDrag event
+     * @private
+     */
+    b4StartDrag: function(x, y) { },
+
+    /**
+     * Abstract method called after a drag/drop object is clicked
+     * and the drag or mousedown time thresholds have beeen met.
+     * @param {Number} x X click location
+     * @param {Number} y Y click location
+     */
+    startDrag: function(x, y) { /* override this */ },
+
+    /**
+     * Code that executes immediately before the onDrag event
+     * @private
+     */
+    b4Drag: function(e) { },
+
+    /**
+     * Abstract method called during the onMouseMove event while dragging an
+     * object.
+     * @param {Event} e the mousemove event
+     */
+    onDrag: function(e) { /* override this */ },
+
+    /**
+     * Abstract method called when this element fist begins hovering over
+     * another DragDrop obj
+     * @param {Event} e the mousemove event
+     * @param {String/Ext.dd.DragDrop[]} id In POINT mode, the element
+     * id this is hovering over.  In INTERSECT mode, an array of one or more
+     * dragdrop items being hovered over.
+     */
+    onDragEnter: function(e, id) { /* override this */ },
+
+    /**
+     * Code that executes immediately before the onDragOver event
+     * @private
+     */
+    b4DragOver: function(e) { },
+
+    /**
+     * Abstract method called when this element is hovering over another
+     * DragDrop obj
+     * @param {Event} e the mousemove event
+     * @param {String/Ext.dd.DragDrop[]} id In POINT mode, the element
+     * id this is hovering over.  In INTERSECT mode, an array of dd items
+     * being hovered over.
+     */
+    onDragOver: function(e, id) { /* override this */ },
+
+    /**
+     * Code that executes immediately before the onDragOut event
+     * @private
+     */
+    b4DragOut: function(e) { },
+
+    /**
+     * Abstract method called when we are no longer hovering over an element
+     * @param {Event} e the mousemove event
+     * @param {String/Ext.dd.DragDrop[]} id In POINT mode, the element
+     * id this was hovering over.  In INTERSECT mode, an array of dd items
+     * that the mouse is no longer over.
+     */
+    onDragOut: function(e, id) { /* override this */ },
+
+    /**
+     * Code that executes immediately before the onDragDrop event
+     * @private
+     */
+    b4DragDrop: function(e) { },
+
+    /**
+     * Abstract method called when this item is dropped on another DragDrop
+     * obj
+     * @param {Event} e the mouseup event
+     * @param {String/Ext.dd.DragDrop[]} id In POINT mode, the element
+     * id this was dropped on.  In INTERSECT mode, an array of dd items this
+     * was dropped on.
+     */
+    onDragDrop: function(e, id) { /* override this */ },
+
+    /**
+     * Abstract method called when this item is dropped on an area with no
+     * drop target
+     * @param {Event} e the mouseup event
+     */
+    onInvalidDrop: function(e) { /* override this */ },
+
+    /**
+     * Code that executes immediately before the endDrag event
+     * @private
+     */
+    b4EndDrag: function(e) { },
+
+    /**
+     * Called when we are done dragging the object
+     * @param {Event} e the mouseup event
+     */
+    endDrag: function(e) { /* override this */ },
+
+    /**
+     * Code executed immediately before the onMouseDown event
+     * @param {Event} e the mousedown event
+     * @private
+     */
+    b4MouseDown: function(e) {  },
+
+    /**
+     * Called when a drag/drop obj gets a mousedown
+     * @param {Event} e the mousedown event
+     */
+    onMouseDown: function(e) { /* override this */ },
+
+    /**
+     * Called when a drag/drop obj gets a mouseup
+     * @param {Event} e the mouseup event
+     */
+    onMouseUp: function(e) { /* override this */ },
+
+    /**
+     * Override the onAvailable method to do what is needed after the initial
+     * position was determined.
+     */
+    onAvailable: function () {
+    },
+
+    /**
+     * @property {Object} defaultPadding
+     * Provides default constraint padding to "constrainTo" elements.
+     */
+    defaultPadding: {
+        left: 0,
+        right: 0,
+        top: 0,
+        bottom: 0
+    },
+
+    /**
+     * Initializes the drag drop object's constraints to restrict movement to a certain element.
+     *
+     * Usage:
+     *
+     *     var dd = new Ext.dd.DDProxy("dragDiv1", "proxytest",
+     *                    { dragElId: "existingProxyDiv" });
+     *     dd.startDrag = function(){
+     *         this.constrainTo("parent-id");
+     *     };
+     *
+     * Or you can initalize it using the {@link Ext.Element} object:
+     *
+     *     Ext.get("dragDiv1").initDDProxy("proxytest", {dragElId: "existingProxyDiv"}, {
+     *         startDrag : function(){
+     *             this.constrainTo("parent-id");
+     *         }
+     *     });
+     *
+     * @param {String/HTMLElement/Ext.Element} constrainTo The element or element ID to constrain to.
+     * @param {Object/Number} pad (optional) Pad provides a way to specify "padding" of the constraints,
+     * and can be either a number for symmetrical padding (4 would be equal to `{left:4, right:4, top:4, bottom:4}`) or
+     * an object containing the sides to pad. For example: `{right:10, bottom:10}`
+     * @param {Boolean} inContent (optional) Constrain the draggable in the content box of the element (inside padding and borders)
+     */
+    constrainTo : function(constrainTo, pad, inContent){
+        if(Ext.isNumber(pad)){
+            pad = {left: pad, right:pad, top:pad, bottom:pad};
+        }
+        pad = pad || this.defaultPadding;
+        var b = Ext.get(this.getEl()).getBox(),
+            ce = Ext.get(constrainTo),
+            s = ce.getScroll(),
+            c,
+            cd = ce.dom,
+            xy,
+            topSpace,
+            leftSpace;
+        if(cd == document.body){
+            c = { x: s.left, y: s.top, width: Ext.Element.getViewWidth(), height: Ext.Element.getViewHeight()};
+        }else{
+            xy = ce.getXY();
+            c = {x : xy[0], y: xy[1], width: cd.clientWidth, height: cd.clientHeight};
+        }
+
+        topSpace = b.y - c.y;
+        leftSpace = b.x - c.x;
+
+        this.resetConstraints();
+        this.setXConstraint(leftSpace - (pad.left||0), // left
+                c.width - leftSpace - b.width - (pad.right||0), //right
+        this.xTickSize
+        );
+        this.setYConstraint(topSpace - (pad.top||0), //top
+                c.height - topSpace - b.height - (pad.bottom||0), //bottom
+        this.yTickSize
+        );
+    },
+
+    /**
+     * Returns a reference to the linked element
+     * @return {HTMLElement} the html element
+     */
+    getEl: function() {
+        if (!this._domRef) {
+            this._domRef = Ext.getDom(this.id);
+        }
+
+        return this._domRef;
+    },
+
+    /**
+     * Returns a reference to the actual element to drag.  By default this is
+     * the same as the html element, but it can be assigned to another
+     * element. An example of this can be found in Ext.dd.DDProxy
+     * @return {HTMLElement} the html element
+     */
+    getDragEl: function() {
+        return Ext.getDom(this.dragElId);
+    },
+
+    /**
+     * Sets up the DragDrop object.  Must be called in the constructor of any
+     * Ext.dd.DragDrop subclass
+     * @param {String} id the id of the linked element
+     * @param {String} sGroup the group of related items
+     * @param {Object} config configuration attributes
+     */
+    init: function(id, sGroup, config) {
+        this.initTarget(id, sGroup, config);
+        Ext.EventManager.on(this.id, "mousedown", this.handleMouseDown, this);
+        // Ext.EventManager.on(this.id, "selectstart", Event.preventDefault);
+    },
+
+    /**
+     * Initializes Targeting functionality only... the object does not
+     * get a mousedown handler.
+     * @param {String} id the id of the linked element
+     * @param {String} sGroup the group of related items
+     * @param {Object} config configuration attributes
+     */
+    initTarget: function(id, sGroup, config) {
+        // configuration attributes
+        this.config = config || {};
+
+        // create a local reference to the drag and drop manager
+        this.DDMInstance = Ext.dd.DragDropManager;
+        // initialize the groups array
+        this.groups = {};
+
+        // assume that we have an element reference instead of an id if the
+        // parameter is not a string
+        if (typeof id !== "string") {
+            id = Ext.id(id);
+        }
+
+        // set the id
+        this.id = id;
+
+        // add to an interaction group
+        this.addToGroup((sGroup) ? sGroup : "default");
+
+        // We don't want to register this as the handle with the manager
+        // so we just set the id rather than calling the setter.
+        this.handleElId = id;
+
+        // the linked element is the element that gets dragged by default
+        this.setDragElId(id);
+
+        // by default, clicked anchors will not start drag operations.
+        this.invalidHandleTypes = { A: "A" };
+        this.invalidHandleIds = {};
+        this.invalidHandleClasses = [];
+
+        this.applyConfig();
+
+        this.handleOnAvailable();
+    },
+
+    /**
+     * Applies the configuration parameters that were passed into the constructor.
+     * This is supposed to happen at each level through the inheritance chain.  So
+     * a DDProxy implentation will execute apply config on DDProxy, DD, and
+     * DragDrop in order to get all of the parameters that are available in
+     * each object.
+     */
+    applyConfig: function() {
+
+        // configurable properties:
+        //    padding, isTarget, maintainOffset, primaryButtonOnly
+        this.padding           = this.config.padding || [0, 0, 0, 0];
+        this.isTarget          = (this.config.isTarget !== false);
+        this.maintainOffset    = (this.config.maintainOffset);
+        this.primaryButtonOnly = (this.config.primaryButtonOnly !== false);
+
+    },
+
+    /**
+     * Executed when the linked element is available
+     * @private
+     */
+    handleOnAvailable: function() {
+        this.available = true;
+        this.resetConstraints();
+        this.onAvailable();
+    },
+
+    /**
+     * Configures the padding for the target zone in px.  Effectively expands
+     * (or reduces) the virtual object size for targeting calculations.
+     * Supports css-style shorthand; if only one parameter is passed, all sides
+     * will have that padding, and if only two are passed, the top and bottom
+     * will have the first param, the left and right the second.
+     * @param {Number} iTop    Top pad
+     * @param {Number} iRight  Right pad
+     * @param {Number} iBot    Bot pad
+     * @param {Number} iLeft   Left pad
+     */
+    setPadding: function(iTop, iRight, iBot, iLeft) {
+        // this.padding = [iLeft, iRight, iTop, iBot];
+        if (!iRight && 0 !== iRight) {
+            this.padding = [iTop, iTop, iTop, iTop];
+        } else if (!iBot && 0 !== iBot) {
+            this.padding = [iTop, iRight, iTop, iRight];
+        } else {
+            this.padding = [iTop, iRight, iBot, iLeft];
+        }
+    },
+
+    /**
+     * Stores the initial placement of the linked element.
+     * @param {Number} diffX   the X offset, default 0
+     * @param {Number} diffY   the Y offset, default 0
+     */
+    setInitPosition: function(diffX, diffY) {
+        var el = this.getEl(),
+            dx, dy, p;
+
+        if (!this.DDMInstance.verifyEl(el)) {
+            return;
+        }
+
+        dx = diffX || 0;
+        dy = diffY || 0;
+
+        p = Ext.Element.getXY( el );
+
+        this.initPageX = p[0] - dx;
+        this.initPageY = p[1] - dy;
+
+        this.lastPageX = p[0];
+        this.lastPageY = p[1];
+
+        this.setStartPosition(p);
+    },
+
+    /**
+     * Sets the start position of the element.  This is set when the obj
+     * is initialized, the reset when a drag is started.
+     * @param pos current position (from previous lookup)
+     * @private
+     */
+    setStartPosition: function(pos) {
+        var p = pos || Ext.Element.getXY( this.getEl() );
+        this.deltaSetXY = null;
+
+        this.startPageX = p[0];
+        this.startPageY = p[1];
+    },
+
+    /**
+     * Adds this instance to a group of related drag/drop objects.  All
+     * instances belong to at least one group, and can belong to as many
+     * groups as needed.
+     * @param {String} sGroup the name of the group
+     */
+    addToGroup: function(sGroup) {
+        this.groups[sGroup] = true;
+        this.DDMInstance.regDragDrop(this, sGroup);
+    },
+
+    /**
+     * Removes this instance from the supplied interaction group
+     * @param {String} sGroup  The group to drop
+     */
+    removeFromGroup: function(sGroup) {
+        if (this.groups[sGroup]) {
+            delete this.groups[sGroup];
+        }
+
+        this.DDMInstance.removeDDFromGroup(this, sGroup);
+    },
+
+    /**
+     * Allows you to specify that an element other than the linked element
+     * will be moved with the cursor during a drag
+     * @param {String} id the id of the element that will be used to initiate the drag
+     */
+    setDragElId: function(id) {
+        this.dragElId = id;
+    },
+
+    /**
+     * Allows you to specify a child of the linked element that should be
+     * used to initiate the drag operation.  An example of this would be if
+     * you have a content div with text and links.  Clicking anywhere in the
+     * content area would normally start the drag operation.  Use this method
+     * to specify that an element inside of the content div is the element
+     * that starts the drag operation.
+     * @param {String} id the id of the element that will be used to
+     * initiate the drag.
+     */
+    setHandleElId: function(id) {
+        if (typeof id !== "string") {
+            id = Ext.id(id);
+        }
+        this.handleElId = id;
+        this.DDMInstance.regHandle(this.id, id);
+    },
+
+    /**
+     * Allows you to set an element outside of the linked element as a drag
+     * handle
+     * @param {String} id the id of the element that will be used to initiate the drag
+     */
+    setOuterHandleElId: function(id) {
+        if (typeof id !== "string") {
+            id = Ext.id(id);
+        }
+        Ext.EventManager.on(id, "mousedown", this.handleMouseDown, this);
+        this.setHandleElId(id);
+
+        this.hasOuterHandles = true;
+    },
+
+    /**
+     * Removes all drag and drop hooks for this element
+     */
+    unreg: function() {
+        Ext.EventManager.un(this.id, "mousedown", this.handleMouseDown, this);
+        this._domRef = null;
+        this.DDMInstance._remove(this);
+    },
+
+    /**
+     * Destroy this DragDrop instance
+     */
+    destroy : function(){
+        this.unreg();
+    },
+
+    /**
+     * Returns true if this instance is locked, or the drag drop mgr is locked
+     * (meaning that all drag/drop is disabled on the page.)
+     * @return {Boolean} true if this obj or all drag/drop is locked, else
+     * false
+     */
+    isLocked: function() {
+        return (this.DDMInstance.isLocked() || this.locked);
+    },
+
+    /**
+     * Called when this object is clicked
+     * @param {Event} e
+     * @param {Ext.dd.DragDrop} oDD the clicked dd object (this dd obj)
+     * @private
+     */
+    handleMouseDown: function(e, oDD){
+        var me = this;
+
+        if ((me.primaryButtonOnly && e.button != 0) || me.isLocked()) {
+            return;
+        }
+
+        me.DDMInstance.refreshCache(me.groups);
+
+        if (me.hasOuterHandles || me.DDMInstance.isOverTarget(e.getPoint(), me))  {
+            if (me.clickValidator(e)) {
+                // set the initial element position
+                me.setStartPosition();
+                me.b4MouseDown(e);
+                me.onMouseDown(e);
+
+                me.DDMInstance.handleMouseDown(e, me);
+
+                me.DDMInstance.stopEvent(e);
+            }
+        }
+    },
+
+    clickValidator: function(e) {
+        var target = e.getTarget();
+        return ( this.isValidHandleChild(target) &&
+                    (this.id == this.handleElId ||
+                        this.DDMInstance.handleWasClicked(target, this.id)) );
+    },
+
+    /**
+     * Allows you to specify a tag name that should not start a drag operation
+     * when clicked.  This is designed to facilitate embedding links within a
+     * drag handle that do something other than start the drag.
+     * @method addInvalidHandleType
+     * @param {String} tagName the type of element to exclude
+     */
+    addInvalidHandleType: function(tagName) {
+        var type = tagName.toUpperCase();
+        this.invalidHandleTypes[type] = type;
+    },
+
+    /**
+     * Lets you to specify an element id for a child of a drag handle
+     * that should not initiate a drag
+     * @method addInvalidHandleId
+     * @param {String} id the element id of the element you wish to ignore
+     */
+    addInvalidHandleId: function(id) {
+        if (typeof id !== "string") {
+            id = Ext.id(id);
+        }
+        this.invalidHandleIds[id] = id;
+    },
+
+    /**
+     * Lets you specify a css class of elements that will not initiate a drag
+     * @param {String} cssClass the class of the elements you wish to ignore
+     */
+    addInvalidHandleClass: function(cssClass) {
+        this.invalidHandleClasses.push(cssClass);
+    },
+
+    /**
+     * Unsets an excluded tag name set by addInvalidHandleType
+     * @param {String} tagName the type of element to unexclude
+     */
+    removeInvalidHandleType: function(tagName) {
+        var type = tagName.toUpperCase();
+        // this.invalidHandleTypes[type] = null;
+        delete this.invalidHandleTypes[type];
+    },
+
+    /**
+     * Unsets an invalid handle id
+     * @param {String} id the id of the element to re-enable
+     */
+    removeInvalidHandleId: function(id) {
+        if (typeof id !== "string") {
+            id = Ext.id(id);
+        }
+        delete this.invalidHandleIds[id];
+    },
+
+    /**
+     * Unsets an invalid css class
+     * @param {String} cssClass the class of the element(s) you wish to
+     * re-enable
+     */
+    removeInvalidHandleClass: function(cssClass) {
+        for (var i=0, len=this.invalidHandleClasses.length; i<len; ++i) {
+            if (this.invalidHandleClasses[i] == cssClass) {
+                delete this.invalidHandleClasses[i];
+            }
+        }
+    },
+
+    /**
+     * Checks the tag exclusion list to see if this click should be ignored
+     * @param {HTMLElement} node the HTMLElement to evaluate
+     * @return {Boolean} true if this is a valid tag type, false if not
+     */
+    isValidHandleChild: function(node) {
+
+        var valid = true,
+            nodeName,
+            i, len;
+        // var n = (node.nodeName == "#text") ? node.parentNode : node;
+        try {
+            nodeName = node.nodeName.toUpperCase();
+        } catch(e) {
+            nodeName = node.nodeName;
+        }
+        valid = valid && !this.invalidHandleTypes[nodeName];
+        valid = valid && !this.invalidHandleIds[node.id];
+
+        for (i=0, len=this.invalidHandleClasses.length; valid && i<len; ++i) {
+            valid = !Ext.fly(node).hasCls(this.invalidHandleClasses[i]);
+        }
+
+
+        return valid;
+
+    },
+
+    /**
+     * Creates the array of horizontal tick marks if an interval was specified
+     * in setXConstraint().
+     * @private
+     */
+    setXTicks: function(iStartX, iTickSize) {
+        this.xTicks = [];
+        this.xTickSize = iTickSize;
+
+        var tickMap = {},
+            i;
+
+        for (i = this.initPageX; i >= this.minX; i = i - iTickSize) {
+            if (!tickMap[i]) {
+                this.xTicks[this.xTicks.length] = i;
+                tickMap[i] = true;
+            }
+        }
+
+        for (i = this.initPageX; i <= this.maxX; i = i + iTickSize) {
+            if (!tickMap[i]) {
+                this.xTicks[this.xTicks.length] = i;
+                tickMap[i] = true;
+            }
+        }
+
+        Ext.Array.sort(this.xTicks, this.DDMInstance.numericSort);
+    },
+
+    /**
+     * Creates the array of vertical tick marks if an interval was specified in
+     * setYConstraint().
+     * @private
+     */
+    setYTicks: function(iStartY, iTickSize) {
+        this.yTicks = [];
+        this.yTickSize = iTickSize;
+
+        var tickMap = {},
+            i;
+
+        for (i = this.initPageY; i >= this.minY; i = i - iTickSize) {
+            if (!tickMap[i]) {
+                this.yTicks[this.yTicks.length] = i;
+                tickMap[i] = true;
+            }
+        }
+
+        for (i = this.initPageY; i <= this.maxY; i = i + iTickSize) {
+            if (!tickMap[i]) {
+                this.yTicks[this.yTicks.length] = i;
+                tickMap[i] = true;
+            }
+        }
+
+        Ext.Array.sort(this.yTicks, this.DDMInstance.numericSort);
+    },
+
+    /**
+     * By default, the element can be dragged any place on the screen.  Use
+     * this method to limit the horizontal travel of the element.  Pass in
+     * 0,0 for the parameters if you want to lock the drag to the y axis.
+     * @param {Number} iLeft the number of pixels the element can move to the left
+     * @param {Number} iRight the number of pixels the element can move to the
+     * right
+     * @param {Number} iTickSize (optional) parameter for specifying that the
+     * element should move iTickSize pixels at a time.
+     */
+    setXConstraint: function(iLeft, iRight, iTickSize) {
+        this.leftConstraint = iLeft;
+        this.rightConstraint = iRight;
+
+        this.minX = this.initPageX - iLeft;
+        this.maxX = this.initPageX + iRight;
+        if (iTickSize) { this.setXTicks(this.initPageX, iTickSize); }
+
+        this.constrainX = true;
+    },
+
+    /**
+     * Clears any constraints applied to this instance.  Also clears ticks
+     * since they can't exist independent of a constraint at this time.
+     */
+    clearConstraints: function() {
+        this.constrainX = false;
+        this.constrainY = false;
+        this.clearTicks();
+    },
+
+    /**
+     * Clears any tick interval defined for this instance
+     */
+    clearTicks: function() {
+        this.xTicks = null;
+        this.yTicks = null;
+        this.xTickSize = 0;
+        this.yTickSize = 0;
+    },
+
+    /**
+     * By default, the element can be dragged any place on the screen.  Set
+     * this to limit the vertical travel of the element.  Pass in 0,0 for the
+     * parameters if you want to lock the drag to the x axis.
+     * @param {Number} iUp the number of pixels the element can move up
+     * @param {Number} iDown the number of pixels the element can move down
+     * @param {Number} iTickSize (optional) parameter for specifying that the
+     * element should move iTickSize pixels at a time.
+     */
+    setYConstraint: function(iUp, iDown, iTickSize) {
+        this.topConstraint = iUp;
+        this.bottomConstraint = iDown;
+
+        this.minY = this.initPageY - iUp;
+        this.maxY = this.initPageY + iDown;
+        if (iTickSize) { this.setYTicks(this.initPageY, iTickSize); }
+
+        this.constrainY = true;
+
+    },
+
+    /**
+     * Must be called if you manually reposition a dd element.
+     * @param {Boolean} maintainOffset
+     */
+    resetConstraints: function() {
+        // Maintain offsets if necessary
+        if (this.initPageX || this.initPageX === 0) {
+            // figure out how much this thing has moved
+            var dx = (this.maintainOffset) ? this.lastPageX - this.initPageX : 0,
+                dy = (this.maintainOffset) ? this.lastPageY - this.initPageY : 0;
+
+            this.setInitPosition(dx, dy);
+
+        // This is the first time we have detected the element's position
+        } else {
+            this.setInitPosition();
+        }
+
+        if (this.constrainX) {
+            this.setXConstraint( this.leftConstraint,
+                                 this.rightConstraint,
+                                 this.xTickSize        );
+        }
+
+        if (this.constrainY) {
+            this.setYConstraint( this.topConstraint,
+                                 this.bottomConstraint,
+                                 this.yTickSize         );
+        }
+    },
+
+    /**
+     * Normally the drag element is moved pixel by pixel, but we can specify
+     * that it move a number of pixels at a time.  This method resolves the
+     * location when we have it set up like this.
+     * @param {Number} val where we want to place the object
+     * @param {Number[]} tickArray sorted array of valid points
+     * @return {Number} the closest tick
+     * @private
+     */
+    getTick: function(val, tickArray) {
+        if (!tickArray) {
+            // If tick interval is not defined, it is effectively 1 pixel,
+            // so we return the value passed to us.
+            return val;
+        } else if (tickArray[0] >= val) {
+            // The value is lower than the first tick, so we return the first
+            // tick.
+            return tickArray[0];
+        } else {
+            var i, len, next, diff1, diff2;
+            for (i=0, len=tickArray.length; i<len; ++i) {
+                next = i + 1;
+                if (tickArray[next] && tickArray[next] >= val) {
+                    diff1 = val - tickArray[i];
+                    diff2 = tickArray[next] - val;
+                    return (diff2 > diff1) ? tickArray[i] : tickArray[next];
+                }
+            }
+
+            // The value is larger than the last tick, so we return the last
+            // tick.
+            return tickArray[tickArray.length - 1];
+        }
+    },
+
+    /**
+     * toString method
+     * @return {String} string representation of the dd obj
+     */
+    toString: function() {
+        return ("DragDrop " + this.id);
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/*
+ * This is a derivative of the similarly named class in the YUI Library.
+ * The original license:
+ * Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ */
+
+
+/**
+ * A DragDrop implementation where the linked element follows the
+ * mouse cursor during a drag.
+ */
+Ext.define('Ext.dd.DD', {
+    extend:  Ext.dd.DragDrop ,
+                                         
+
+    /**
+     * Creates new DD instance.
+     * @param {String} id the id of the linked element
+     * @param {String} sGroup the group of related DragDrop items
+     * @param {Object} config an object containing configurable attributes.
+     * Valid properties for DD: scroll
+     */
+    constructor: function(id, sGroup, config) {
+        if (id) {
+            this.init(id, sGroup, config);
+        }
+    },
+
+    /**
+     * @property {Boolean} scroll
+     * When set to true, the utility automatically tries to scroll the browser
+     * window when a drag and drop element is dragged near the viewport boundary.
+     */
+    scroll: true,
+
+    /**
+     * Sets the pointer offset to the distance between the linked element's top
+     * left corner and the location the element was clicked.
+     * @param {Number} iPageX the X coordinate of the click
+     * @param {Number} iPageY the Y coordinate of the click
+     */
+    autoOffset: function(iPageX, iPageY) {
+        var x = iPageX - this.startPageX,
+            y = iPageY - this.startPageY;
+        this.setDelta(x, y);
+    },
+
+    /**
+     * Sets the pointer offset.  You can call this directly to force the
+     * offset to be in a particular location (e.g., pass in 0,0 to set it
+     * to the center of the object)
+     * @param {Number} iDeltaX the distance from the left
+     * @param {Number} iDeltaY the distance from the top
+     */
+    setDelta: function(iDeltaX, iDeltaY) {
+        this.deltaX = iDeltaX;
+        this.deltaY = iDeltaY;
+    },
+
+    /**
+     * Sets the drag element to the location of the mousedown or click event,
+     * maintaining the cursor location relative to the location on the element
+     * that was clicked.  Override this if you want to place the element in a
+     * location other than where the cursor is.
+     * @param {Number} iPageX the X coordinate of the mousedown or drag event
+     * @param {Number} iPageY the Y coordinate of the mousedown or drag event
+     */
+    setDragElPos: function(iPageX, iPageY) {
+        // the first time we do this, we are going to check to make sure
+        // the element has css positioning
+
+        var el = this.getDragEl();
+        this.alignElWithMouse(el, iPageX, iPageY);
+    },
+
+    /**
+     * Sets the element to the location of the mousedown or click event,
+     * maintaining the cursor location relative to the location on the element
+     * that was clicked.  Override this if you want to place the element in a
+     * location other than where the cursor is.
+     * @param {HTMLElement} el the element to move
+     * @param {Number} iPageX the X coordinate of the mousedown or drag event
+     * @param {Number} iPageY the Y coordinate of the mousedown or drag event
+     */
+    alignElWithMouse: function(el, iPageX, iPageY) {
+        var oCoord = this.getTargetCoord(iPageX, iPageY),
+            fly = el.dom ? el : Ext.fly(el, '_dd'),
+            elSize = fly.getSize(),
+            EL = Ext.Element,
+            vpSize,
+            aCoord,
+            newLeft,
+            newTop;
+
+        if (!this.deltaSetXY) {
+            vpSize = this.cachedViewportSize = { width: EL.getDocumentWidth(), height: EL.getDocumentHeight() };
+            aCoord = [
+                Math.max(0, Math.min(oCoord.x, vpSize.width - elSize.width)),
+                Math.max(0, Math.min(oCoord.y, vpSize.height - elSize.height))
+            ];
+            fly.setXY(aCoord);
+            newLeft = this.getLocalX(fly);
+            newTop  = fly.getLocalY();
+            this.deltaSetXY = [newLeft - oCoord.x, newTop - oCoord.y];
+        } else {
+            vpSize = this.cachedViewportSize;
+            this.setLocalXY(
+                fly,
+                Math.max(0, Math.min(oCoord.x + this.deltaSetXY[0], vpSize.width - elSize.width)),
+                Math.max(0, Math.min(oCoord.y + this.deltaSetXY[1], vpSize.height - elSize.height))
+            );
+        }
+
+        this.cachePosition(oCoord.x, oCoord.y);
+        this.autoScroll(oCoord.x, oCoord.y, el.offsetHeight, el.offsetWidth);
+        return oCoord;
+    },
+
+    /**
+     * Saves the most recent position so that we can reset the constraints and
+     * tick marks on-demand.  We need to know this so that we can calculate the
+     * number of pixels the element is offset from its original position.
+     *
+     * @param {Number} [iPageX] the current x position (this just makes it so we
+     * don't have to look it up again)
+     * @param {Number} [iPageY] the current y position (this just makes it so we
+     * don't have to look it up again)
+     */
+    cachePosition: function(iPageX, iPageY) {
+        if (iPageX) {
+            this.lastPageX = iPageX;
+            this.lastPageY = iPageY;
+        } else {
+            var aCoord = Ext.Element.getXY(this.getEl());
+            this.lastPageX = aCoord[0];
+            this.lastPageY = aCoord[1];
+        }
+    },
+
+    /**
+     * Auto-scroll the window if the dragged object has been moved beyond the
+     * visible window boundary.
+     * @param {Number} x the drag element's x position
+     * @param {Number} y the drag element's y position
+     * @param {Number} h the height of the drag element
+     * @param {Number} w the width of the drag element
+     * @private
+     */
+    autoScroll: function(x, y, h, w) {
+
+        if (this.scroll) {
+            // The client height
+            var clientH = Ext.Element.getViewHeight(),
+                // The client width
+                clientW = Ext.Element.getViewWidth(),
+                // The amt scrolled down
+                st = this.DDMInstance.getScrollTop(),
+                // The amt scrolled right
+                sl = this.DDMInstance.getScrollLeft(),
+                // Location of the bottom of the element
+                bot = h + y,
+                // Location of the right of the element
+                right = w + x,
+                // The distance from the cursor to the bottom of the visible area,
+                // adjusted so that we don't scroll if the cursor is beyond the
+                // element drag constraints
+                toBot = (clientH + st - y - this.deltaY),
+                // The distance from the cursor to the right of the visible area
+                toRight = (clientW + sl - x - this.deltaX),
+                // How close to the edge the cursor must be before we scroll
+                // var thresh = (document.all) ? 100 : 40;
+                thresh = 40,
+                // How many pixels to scroll per autoscroll op.  This helps to reduce
+                // clunky scrolling. IE is more sensitive about this ... it needs this
+                // value to be higher.
+                scrAmt = (document.all) ? 80 : 30;
+
+            // Scroll down if we are near the bottom of the visible page and the
+            // obj extends below the crease
+            if ( bot > clientH && toBot < thresh ) {
+                window.scrollTo(sl, st + scrAmt);
+            }
+
+            // Scroll up if the window is scrolled down and the top of the object
+            // goes above the top border
+            if ( y < st && st > 0 && y - st < thresh ) {
+                window.scrollTo(sl, st - scrAmt);
+            }
+
+            // Scroll right if the obj is beyond the right border and the cursor is
+            // near the border.
+            if ( right > clientW && toRight < thresh ) {
+                window.scrollTo(sl + scrAmt, st);
+            }
+
+            // Scroll left if the window has been scrolled to the right and the obj
+            // extends past the left border
+            if ( x < sl && sl > 0 && x - sl < thresh ) {
+                window.scrollTo(sl - scrAmt, st);
+            }
+        }
+    },
+
+    /**
+     * Finds the location the element should be placed if we want to move
+     * it to where the mouse location less the click offset would place us.
+     * @param {Number} iPageX the X coordinate of the click
+     * @param {Number} iPageY the Y coordinate of the click
+     * @return {Object} An object that contains the coordinates (Object.x and Object.y)
+     * @return {Number} return.x
+     * @return {Number} return.y
+     * @private
+     */
+    getTargetCoord: function(iPageX, iPageY) {
+        var x = iPageX - this.deltaX,
+            y = iPageY - this.deltaY;
+
+        if (this.constrainX) {
+            if (x < this.minX) {
+                x = this.minX;
+            }
+            if (x > this.maxX) {
+                x = this.maxX;
+            }
+        }
+
+        if (this.constrainY) {
+            if (y < this.minY) {
+                y = this.minY;
+            }
+            if (y > this.maxY) {
+                y = this.maxY;
+            }
+        }
+
+        x = this.getTick(x, this.xTicks);
+        y = this.getTick(y, this.yTicks);
+
+
+        return {x: x, y: y};
+    },
+
+    /**
+     * Sets up config options specific to this class. Overrides
+     * Ext.dd.DragDrop, but all versions of this method through the
+     * inheritance chain are called
+     */
+    applyConfig: function() {
+        this.callParent();
+        this.scroll = (this.config.scroll !== false);
+    },
+
+    /**
+     * Event that fires prior to the onMouseDown event.  Overrides
+     * Ext.dd.DragDrop.
+     */
+    b4MouseDown: function(e) {
+        // this.resetConstraints();
+        this.autoOffset(e.getPageX(), e.getPageY());
+    },
+
+    /**
+     * Event that fires prior to the onDrag event.  Overrides
+     * Ext.dd.DragDrop.
+     */
+    b4Drag: function(e) {
+        this.setDragElPos(e.getPageX(), e.getPageY());
+    },
+
+    toString: function() {
+        return ("DD " + this.id);
+    },
+    
+    getLocalX: function(el) {
+        return el.getLocalX();
+    },
+
+    setLocalXY: function(el, x, y) {
+        el.setLocalXY(x, y);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Debugging ygDragDrop events that can be overridden
+    //////////////////////////////////////////////////////////////////////////
+    /*
+    startDrag: function(x, y) {
+    },
+
+    onDrag: function(e) {
+    },
+
+    onDragEnter: function(e, id) {
+    },
+
+    onDragOver: function(e, id) {
+    },
+
+    onDragOut: function(e, id) {
+    },
+
+    onDragDrop: function(e, id) {
+    },
+
+    endDrag: function(e) {
+    }
+
+    */
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/*
+ * This is a derivative of the similarly named class in the YUI Library.
+ * The original license:
+ * Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ */
+
+/**
+ * A DragDrop implementation that inserts an empty, bordered div into
+ * the document that follows the cursor during drag operations.  At the time of
+ * the click, the frame div is resized to the dimensions of the linked html
+ * element, and moved to the exact location of the linked element.
+ *
+ * References to the "frame" element refer to the single proxy element that
+ * was created to be dragged in place of all DDProxy elements on the
+ * page.
+ */
+Ext.define('Ext.dd.DDProxy', {
+    extend:  Ext.dd.DD ,
+
+    statics: {
+        /**
+         * The default drag frame div id
+         * @static
+         */
+        dragElId: "ygddfdiv"
+    },
+
+    /**
+     * Creates new DDProxy.
+     * @param {String} id the id of the linked html element
+     * @param {String} sGroup the group of related DragDrop objects
+     * @param {Object} config an object containing configurable attributes.
+     * Valid properties for DDProxy in addition to those in DragDrop:
+     * 
+     * - resizeFrame
+     * - centerFrame
+     * - dragElId
+     */
+    constructor: function(id, sGroup, config) {
+        if (id) {
+            this.init(id, sGroup, config);
+            this.initFrame();
+        }
+    },
+
+    /**
+     * @property {Boolean} resizeFrame
+     * By default we resize the drag frame to be the same size as the element
+     * we want to drag (this is to get the frame effect).  We can turn it off
+     * if we want a different behavior.
+     */
+    resizeFrame: true,
+
+    /**
+     * @property {Boolean} centerFrame
+     * By default the frame is positioned exactly where the drag element is, so
+     * we use the cursor offset provided by Ext.dd.DD.  Another option that works only if
+     * you do not have constraints on the obj is to have the drag frame centered
+     * around the cursor.  Set centerFrame to true for this effect.
+     */
+    centerFrame: false,
+
+    /**
+     * Creates the proxy element if it does not yet exist
+     */
+    createFrame: function() {
+        var self = this,
+            body = document.body,
+            div,
+            s;
+
+        if (!body || !body.firstChild) {
+            setTimeout( function() { self.createFrame(); }, 50 );
+            return;
+        }
+
+        div = this.getDragEl();
+
+        if (!div) {
+            div    = document.createElement("div");
+            div.id = this.dragElId;
+            s  = div.style;
+
+            s.position   = "absolute";
+            s.visibility = "hidden";
+            s.cursor     = "move";
+            s.border     = "2px solid #aaa";
+            s.zIndex     = 999;
+
+            // appendChild can blow up IE if invoked prior to the window load event
+            // while rendering a table.  It is possible there are other scenarios
+            // that would cause this to happen as well.
+            body.insertBefore(div, body.firstChild);
+        }
+    },
+
+    /**
+     * Initialization for the drag frame element.  Must be called in the
+     * constructor of all subclasses
+     */
+    initFrame: function() {
+        this.createFrame();
+    },
+
+    applyConfig: function() {
+        this.callParent();
+
+        this.resizeFrame = (this.config.resizeFrame !== false);
+        this.centerFrame = (this.config.centerFrame);
+        this.setDragElId(this.config.dragElId || Ext.dd.DDProxy.dragElId);
+    },
+
+    /**
+     * Resizes the drag frame to the dimensions of the clicked object, positions
+     * it over the object, and finally displays it
+     * @param {Number} iPageX X click position
+     * @param {Number} iPageY Y click position
+     * @private
+     */
+    showFrame: function(iPageX, iPageY) {
+        var el = this.getEl(),
+            dragEl = this.getDragEl(),
+            s = dragEl.style;
+
+        this._resizeProxy();
+
+        if (this.centerFrame) {
+            this.setDelta( Math.round(parseInt(s.width,  10)/2),
+                           Math.round(parseInt(s.height, 10)/2) );
+        }
+
+        this.setDragElPos(iPageX, iPageY);
+
+        Ext.fly(dragEl).show();
+    },
+
+    /**
+     * The proxy is automatically resized to the dimensions of the linked
+     * element when a drag is initiated, unless resizeFrame is set to false
+     * @private
+     */
+    _resizeProxy: function() {
+        if (this.resizeFrame) {
+            var el = this.getEl();
+            Ext.fly(this.getDragEl()).setSize(el.offsetWidth, el.offsetHeight);
+        }
+    },
+
+    // overrides Ext.dd.DragDrop
+    b4MouseDown: function(e) {
+        var x = e.getPageX(),
+            y = e.getPageY();
+        this.autoOffset(x, y);
+        this.setDragElPos(x, y);
+    },
+
+    // overrides Ext.dd.DragDrop
+    b4StartDrag: function(x, y) {
+        // show the drag frame
+        this.showFrame(x, y);
+    },
+
+    // overrides Ext.dd.DragDrop
+    b4EndDrag: function(e) {
+        Ext.fly(this.getDragEl()).hide();
+    },
+
+    // overrides Ext.dd.DragDrop
+    // By default we try to move the element to the last location of the frame.
+    // This is so that the default behavior mirrors that of Ext.dd.DD.
+    endDrag: function(e) {
+
+        var lel = this.getEl(),
+            del = this.getDragEl();
+
+        // Show the drag frame briefly so we can get its position
+        del.style.visibility = "";
+
+        this.beforeMove();
+        // Hide the linked element before the move to get around a Safari
+        // rendering bug.
+        lel.style.visibility = "hidden";
+        Ext.dd.DDM.moveToEl(lel, del);
+        del.style.visibility = "hidden";
+        lel.style.visibility = "";
+
+        this.afterDrag();
+    },
+
+    beforeMove : function(){
+
+    },
+
+    afterDrag : function(){
+
+    },
+
+    toString: function() {
+        return ("DDProxy " + this.id);
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A specialized floating Component that supports a drop status icon, {@link Ext.Layer} styles
+ * and auto-repair.  This is the default drag proxy used by all Ext.dd components.
+ */
+Ext.define('Ext.dd.StatusProxy', {
+    extend:  Ext.Component ,
+    animRepair: false,
+
+    childEls: [
+        'ghost'
+    ],
+
+    renderTpl: [
+        '<div class="' + Ext.baseCSSPrefix + 'dd-drop-icon"></div>' +
+        '<div id="{id}-ghost" class="' + Ext.baseCSSPrefix + 'dd-drag-ghost"></div>'
+    ],
+    
+    repairCls: Ext.baseCSSPrefix + 'dd-drag-repair',
+
+    /**
+     * Creates new StatusProxy.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        var me = this;
+
+        config = config || {};
+
+        Ext.apply(me, {
+            hideMode: 'visibility',
+            hidden: true,
+            floating: true,
+            id: me.id || Ext.id(),
+            cls: Ext.baseCSSPrefix + 'dd-drag-proxy ' + this.dropNotAllowed,
+            shadow: config.shadow || false,
+            renderTo: Ext.getDetachedBody()
+        });
+        me.callParent(arguments);
+        this.dropStatus = this.dropNotAllowed;
+    },
+
+    /**
+     * @cfg {String} dropAllowed
+     * The CSS class to apply to the status element when drop is allowed.
+     */
+    dropAllowed : Ext.baseCSSPrefix + 'dd-drop-ok',
+
+    /**
+     * @cfg {String} dropNotAllowed
+     * The CSS class to apply to the status element when drop is not allowed.
+     */
+    dropNotAllowed : Ext.baseCSSPrefix + 'dd-drop-nodrop',
+
+    /**
+     * Updates the proxy's visual element to indicate the status of whether or not drop is allowed
+     * over the current target element.
+     * @param {String} cssClass The css class for the new drop status indicator image
+     */
+    setStatus : function(cssClass){
+        cssClass = cssClass || this.dropNotAllowed;
+        if (this.dropStatus != cssClass) {
+            this.el.replaceCls(this.dropStatus, cssClass);
+            this.dropStatus = cssClass;
+        }
+    },
+
+    /**
+     * Resets the status indicator to the default dropNotAllowed value
+     * @param {Boolean} clearGhost True to also remove all content from the ghost, false to preserve it
+     */
+    reset : function(clearGhost){
+        var me = this,
+            clsPrefix = Ext.baseCSSPrefix + 'dd-drag-proxy ';
+
+        me.el.replaceCls(clsPrefix + me.dropAllowed, clsPrefix + me.dropNotAllowed);
+        me.dropStatus = me.dropNotAllowed;
+        if (clearGhost) {
+            me.ghost.update('');
+        }
+    },
+
+    /**
+     * Updates the contents of the ghost element
+     * @param {String/HTMLElement} html The html that will replace the current innerHTML of the ghost element, or a
+     * DOM node to append as the child of the ghost element (in which case the innerHTML will be cleared first).
+     */
+    update : function(html){
+        if (typeof html == "string") {
+            this.ghost.update(html);
+        } else {
+            this.ghost.update("");
+            html.style.margin = "0";
+            this.ghost.dom.appendChild(html);
+        }
+        var el = this.ghost.dom.firstChild;
+        if (el) {
+            Ext.fly(el).setStyle('float', 'none');
+        }
+    },
+
+    /**
+     * Returns the ghost element
+     * @return {Ext.Element} el
+     */
+    getGhost : function(){
+        return this.ghost;
+    },
+
+    /**
+     * Hides the proxy
+     * @param {Boolean} clear True to reset the status and clear the ghost contents,
+     * false to preserve them
+     */
+    hide : function(clear) {
+        this.callParent();
+        if (clear) {
+            this.reset(true);
+        }
+    },
+
+    /**
+     * Stops the repair animation if it's currently running
+     */
+    stop : function(){
+        if (this.anim && this.anim.isAnimated && this.anim.isAnimated()) {
+            this.anim.stop();
+        }
+    },
+
+    /**
+     * Force the Layer to sync its shadow and shim positions to the element
+     */
+    sync : function(){
+        this.el.sync();
+    },
+
+    /**
+     * Causes the proxy to return to its position of origin via an animation.
+     * Should be called after an invalid drop operation by the item being dragged.
+     * @param {Number[]} xy The XY position of the element ([x, y])
+     * @param {Function} callback The function to call after the repair is complete.
+     * @param {Object} scope The scope (`this` reference) in which the callback function is executed.
+     * Defaults to the browser window.
+     */
+    repair : function(xy, callback, scope) {
+        var me = this;
+
+        me.callback = callback;
+        me.scope = scope;
+        if (xy && me.animRepair !== false) {
+            me.el.addCls(me.repairCls);
+            me.el.hideUnders(true);
+            me.anim = me.el.animate({
+                duration: me.repairDuration || 500,
+                easing: 'ease-out',
+                to: {
+                    x: xy[0],
+                    y: xy[1]
+                },
+                stopAnimation: true,
+                callback: me.afterRepair,
+                scope: me
+            });
+        } else {
+            me.afterRepair();
+        }
+    },
+
+    // private
+    afterRepair : function() {
+        var me = this;
+    
+        me.hide(true);
+        me.el.removeCls(me.repairCls);
+        if (typeof me.callback == "function") {
+            me.callback.call(me.scope || me);
+        }
+        delete me.callback;
+        delete me.scope;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A simple class that provides the basic implementation needed to make any element draggable.
+ */
+Ext.define('Ext.dd.DragSource', {
+    extend:  Ext.dd.DDProxy ,
+               
+                             
+                                
+      
+
+    /**
+     * @cfg {String} ddGroup
+     * A named drag drop group to which this object belongs.  If a group is specified, then this object will only
+     * interact with other drag drop objects in the same group.
+     */
+
+    /**
+     * @property {Object} dragData
+     * This property contains the data representing the dragged object. This data is set up by the implementation of the
+     * {@link #getDragData} method. It must contain a ddel property, but can contain any other data according to the
+     * application's needs.
+     */
+
+    /**
+     * @cfg {String} dropAllowed
+     * The CSS class returned to the drag source when drop is allowed.
+     */
+    dropAllowed : Ext.baseCSSPrefix + 'dd-drop-ok',
+    /**
+     * @cfg {String} dropNotAllowed
+     * The CSS class returned to the drag source when drop is not allowed.
+     */
+    dropNotAllowed : Ext.baseCSSPrefix + 'dd-drop-nodrop',
+
+    /**
+     * @cfg {Boolean} animRepair
+     * If true, animates the proxy element back to the position of the handle element used to trigger the drag.
+     */
+    animRepair: true,
+
+    /**
+     * @cfg {String} repairHighlightColor
+     * The color to use when visually highlighting the drag source in the afterRepair
+     * method after a failed drop (defaults to light blue). The color must be a 6 digit hex value, without
+     * a preceding '#'.
+     */
+    repairHighlightColor: 'c3daf9',
+
+    /**
+     * Creates new drag-source.
+     * @param {String/HTMLElement/Ext.Element} el The container element or ID of it.
+     * @param {Object} config (optional) Config object.
+     */
+    constructor: function(el, config) {
+        this.el = Ext.get(el);
+        if(!this.dragData){
+            this.dragData = {};
+        }
+
+        Ext.apply(this, config);
+
+        if(!this.proxy){
+            this.proxy = new Ext.dd.StatusProxy({
+                id: this.el.id + '-drag-status-proxy',
+                animRepair: this.animRepair
+            });
+        }
+        this.callParent([this.el.dom, this.ddGroup || this.group,
+              {dragElId : this.proxy.id, resizeFrame: false, isTarget: false, scroll: this.scroll === true}]);
+
+        this.dragging = false;
+    },
+
+    /**
+     * Returns the data object associated with this drag source
+     * @return {Object} data An object containing arbitrary data
+     */
+    getDragData : function(e){
+        return this.dragData;
+    },
+
+    // @private
+    onDragEnter : function(e, id){
+        var target = Ext.dd.DragDropManager.getDDById(id),
+            status;
+        this.cachedTarget = target;
+        if (this.beforeDragEnter(target, e, id) !== false) {
+            if (target.isNotifyTarget) {
+                status = target.notifyEnter(this, e, this.dragData);
+                this.proxy.setStatus(status);
+            } else {
+                this.proxy.setStatus(this.dropAllowed);
+            }
+
+            if (this.afterDragEnter) {
+                /**
+                 * An empty function by default, but provided so that you can perform a custom action
+                 * when the dragged item enters the drop target by providing an implementation.
+                 * @param {Ext.dd.DragDrop} target The drop target
+                 * @param {Event} e The event object
+                 * @param {String} id The id of the dragged element
+                 * @method afterDragEnter
+                 */
+                this.afterDragEnter(target, e, id);
+            }
+        }
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action
+     * before the dragged item enters the drop target and optionally cancel the onDragEnter.
+     * @param {Ext.dd.DragDrop} target The drop target
+     * @param {Event} e The event object
+     * @param {String} id The id of the dragged element
+     * @return {Boolean} isValid True if the drag event is valid, else false to cancel
+     * @template
+     */
+    beforeDragEnter: function(target, e, id) {
+        return true;
+    },
+
+    // @private
+    onDragOver: function(e, id) {
+        var target = this.cachedTarget || Ext.dd.DragDropManager.getDDById(id),
+            status;
+        if (this.beforeDragOver(target, e, id) !== false) {
+            if(target.isNotifyTarget){
+                status = target.notifyOver(this, e, this.dragData);
+                this.proxy.setStatus(status);
+            }
+
+            if (this.afterDragOver) {
+                /**
+                 * An empty function by default, but provided so that you can perform a custom action
+                 * while the dragged item is over the drop target by providing an implementation.
+                 * @param {Ext.dd.DragDrop} target The drop target
+                 * @param {Event} e The event object
+                 * @param {String} id The id of the dragged element
+                 * @method afterDragOver
+                 */
+                this.afterDragOver(target, e, id);
+            }
+        }
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action
+     * while the dragged item is over the drop target and optionally cancel the onDragOver.
+     * @param {Ext.dd.DragDrop} target The drop target
+     * @param {Event} e The event object
+     * @param {String} id The id of the dragged element
+     * @return {Boolean} isValid True if the drag event is valid, else false to cancel
+     * @template
+     */
+    beforeDragOver: function(target, e, id) {
+        return true;
+    },
+
+    // @private
+    onDragOut: function(e, id) {
+        var target = this.cachedTarget || Ext.dd.DragDropManager.getDDById(id);
+        if (this.beforeDragOut(target, e, id) !== false) {
+            if (target.isNotifyTarget) {
+                target.notifyOut(this, e, this.dragData);
+            }
+            this.proxy.reset();
+            if (this.afterDragOut) {
+                /**
+                 * An empty function by default, but provided so that you can perform a custom action
+                 * after the dragged item is dragged out of the target without dropping.
+                 * @param {Ext.dd.DragDrop} target The drop target
+                 * @param {Event} e The event object
+                 * @param {String} id The id of the dragged element
+                 * @method afterDragOut
+                 */
+                this.afterDragOut(target, e, id);
+            }
+        }
+        this.cachedTarget = null;
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action before the dragged
+     * item is dragged out of the target without dropping, and optionally cancel the onDragOut.
+     * @param {Ext.dd.DragDrop} target The drop target
+     * @param {Event} e The event object
+     * @param {String} id The id of the dragged element
+     * @return {Boolean} isValid True if the drag event is valid, else false to cancel
+     * @template
+     */
+    beforeDragOut: function(target, e, id){
+        return true;
+    },
+
+    // @private
+    onDragDrop: function(e, id){
+        var target = this.cachedTarget || Ext.dd.DragDropManager.getDDById(id);
+        if (this.beforeDragDrop(target, e, id) !== false) {
+            if (target.isNotifyTarget) {
+                if (target.notifyDrop(this, e, this.dragData) !== false) { // valid drop?
+                    this.onValidDrop(target, e, id);
+                } else {
+                    this.onInvalidDrop(target, e, id);
+                }
+            } else {
+                this.onValidDrop(target, e, id);
+            }
+
+            if (this.afterDragDrop) {
+                /**
+                 * An empty function by default, but provided so that you can perform a custom action
+                 * after a valid drag drop has occurred by providing an implementation.
+                 * @param {Ext.dd.DragDrop} target The drop target
+                 * @param {Event} e The event object
+                 * @param {String} id The id of the dropped element
+                 * @method afterDragDrop
+                 */
+                this.afterDragDrop(target, e, id);
+            }
+        }
+        delete this.cachedTarget;
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action before the dragged
+     * item is dropped onto the target and optionally cancel the onDragDrop.
+     * @param {Ext.dd.DragDrop} target The drop target
+     * @param {Event} e The event object
+     * @param {String} id The id of the dragged element
+     * @return {Boolean} isValid True if the drag drop event is valid, else false to cancel
+     * @template
+     */
+    beforeDragDrop: function(target, e, id){
+        return true;
+    },
+
+    // @private
+    onValidDrop: function(target, e, id){
+        this.hideProxy();
+        if(this.afterValidDrop){
+            /**
+             * An empty function by default, but provided so that you can perform a custom action
+             * after a valid drop has occurred by providing an implementation.
+             * @param {Object} target The target DD
+             * @param {Event} e The event object
+             * @param {String} id The id of the dropped element
+             * @method afterValidDrop
+             */
+            this.afterValidDrop(target, e, id);
+        }
+    },
+
+    // @private
+    getRepairXY: function(e, data){
+        return this.el.getXY();
+    },
+
+    // @private
+    onInvalidDrop: function(target, e, id) {
+        // This method may be called by the DragDropManager.
+        // To preserve backwards compat, it only passes the event object
+        // Here we correct the arguments.
+        var me = this;
+        
+        if (!e) {
+            e = target;
+            target = null;
+            id = e.getTarget().id;
+        }
+        if (me.beforeInvalidDrop(target, e, id) !== false) {
+            if (me.cachedTarget) {
+                if(me.cachedTarget.isNotifyTarget){
+                    me.cachedTarget.notifyOut(me, e, me.dragData);
+                }
+                me.cacheTarget = null;
+            }
+            me.proxy.repair(me.getRepairXY(e, me.dragData), me.afterRepair, me);
+
+            if (me.afterInvalidDrop) {
+                /**
+                * An empty function by default, but provided so that you can perform a custom action
+                * after an invalid drop has occurred by providing an implementation.
+                * @param {Event} e The event object
+                * @param {String} id The id of the dropped element
+                * @method afterInvalidDrop
+                */
+                me.afterInvalidDrop(e, id);
+            }
+        }
+    },
+
+    // @private
+    afterRepair: function() {
+        var me = this;
+        if (Ext.enableFx) {
+            me.el.highlight(me.repairHighlightColor);
+        }
+        me.dragging = false;
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action after an invalid
+     * drop has occurred.
+     * @param {Ext.dd.DragDrop} target The drop target
+     * @param {Event} e The event object
+     * @param {String} id The id of the dragged element
+     * @return {Boolean} isValid True if the invalid drop should proceed, else false to cancel
+     * @template
+     */
+    beforeInvalidDrop: function(target, e, id) {
+        return true;
+    },
+
+    // @private
+    handleMouseDown: function(e) {
+        if (this.dragging) {
+            return;
+        }
+        var data = this.getDragData(e);
+        if (data && this.onBeforeDrag(data, e) !== false) {
+            this.dragData = data;
+            this.proxy.stop();
+            this.callParent(arguments);
+        }
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action before the initial
+     * drag event begins and optionally cancel it.
+     * @param {Object} data An object containing arbitrary data to be shared with drop targets
+     * @param {Event} e The event object
+     * @return {Boolean} isValid True if the drag event is valid, else false to cancel
+     * @template
+     */
+    onBeforeDrag: function(data, e){
+        return true;
+    },
+
+    /**
+     * An empty function by default, but provided so that you can perform a custom action once the initial
+     * drag event has begun.  The drag cannot be canceled from this function.
+     * @param {Number} x The x position of the click on the dragged object
+     * @param {Number} y The y position of the click on the dragged object
+     * @method
+     * @template
+     */
+    onStartDrag: Ext.emptyFn,
+
+    alignElWithMouse: function() {
+        this.proxy.ensureAttachedToBody(true);
+        return this.callParent(arguments);
+    },
+
+    // @private
+    startDrag: function(x, y) {
+        this.proxy.reset();
+        this.proxy.hidden = false;
+        this.dragging = true;
+        this.proxy.update("");
+        this.onInitDrag(x, y);
+        this.proxy.show();
+    },
+
+    // @private
+    onInitDrag: function(x, y) {
+        var clone = this.el.dom.cloneNode(true);
+        clone.id = Ext.id(); // prevent duplicate ids
+        this.proxy.update(clone);
+        this.onStartDrag(x, y);
+        return true;
+    },
+
+    /**
+     * Returns the drag source's underlying {@link Ext.dd.StatusProxy}
+     * @return {Ext.dd.StatusProxy} proxy The StatusProxy
+     */
+    getProxy: function() {
+        return this.proxy;
+    },
+
+    /**
+     * Hides the drag source's {@link Ext.dd.StatusProxy}
+     */
+    hideProxy: function() {
+        this.proxy.hide();
+        this.proxy.reset(true);
+        this.dragging = false;
+    },
+
+    // @private
+    triggerCacheRefresh: function() {
+        Ext.dd.DDM.refreshCache(this.groups);
+    },
+
+    // @private
+    b4EndDrag: function(e) {
+    },
+
+    // @private
+    endDrag : function(e){
+        this.onEndDrag(this.dragData, e);
+    },
+
+    // @private
+    onEndDrag : function(data, e){
+    },
+
+    // @private
+    autoOffset : function(x, y) {
+        this.setDelta(-12, -20);
+    },
+
+    destroy: function(){
+        this.callParent();
+        Ext.destroy(this.proxy);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A custom drag proxy implementation specific to {@link Ext.panel.Panel}s. This class
+ * is primarily used internally for the Panel's drag drop implementation, and
+ * should never need to be created directly.
+ * @private
+ */
+Ext.define('Ext.panel.Proxy', {
+
+    alternateClassName: 'Ext.dd.PanelProxy',
+    
+    /**
+     * @cfg {Boolean} [moveOnDrag=true]
+     * True to move the panel to the dragged position when dropped
+     */
+    moveOnDrag: true,
+
+    /**
+     * Creates new panel proxy.
+     * @param {Ext.panel.Panel} panel The {@link Ext.panel.Panel} to proxy for
+     * @param {Object} [config] Config object
+     */
+    constructor: function(panel, config){
+        var me = this;
+        
+        /**
+         * @property panel
+         * @type Ext.panel.Panel
+         */
+        me.panel = panel;
+        me.id = me.panel.id +'-ddproxy';
+        Ext.apply(me, config);
+    },
+
+    /**
+     * @cfg {Boolean} insertProxy
+     * True to insert a placeholder proxy element while dragging the panel, false to drag with no proxy.
+     * Most Panels are not absolute positioned and therefore we need to reserve this space.
+     */
+    insertProxy: true,
+
+    // private overrides
+    setStatus: Ext.emptyFn,
+    reset: Ext.emptyFn,
+    update: Ext.emptyFn,
+    stop: Ext.emptyFn,
+    sync: Ext.emptyFn,
+
+    /**
+     * Gets the proxy's element
+     * @return {Ext.Element} The proxy's element
+     */
+    getEl: function(){
+        return this.ghost.el;
+    },
+
+    /**
+     * Gets the proxy's ghost Panel
+     * @return {Ext.panel.Panel} The proxy's ghost Panel
+     */
+    getGhost: function(){
+        return this.ghost;
+    },
+
+    /**
+     * Gets the proxy element. This is the element that represents where the
+     * Panel was before we started the drag operation.
+     * @return {Ext.Element} The proxy's element
+     */
+    getProxy: function(){
+        return this.proxy;
+    },
+
+    /**
+     * Hides the proxy
+     */
+    hide : function(){
+        var me = this;
+        
+        if (me.ghost) {
+            if (me.proxy) {
+                me.proxy.remove();
+                delete me.proxy;
+            }
+
+            // Unghost the Panel, do not move the Panel to where the ghost was
+            me.panel.unghost(null, me.moveOnDrag);
+            delete me.ghost;
+        }
+    },
+
+    /**
+     * Shows the proxy
+     */
+    show: function(){
+        var me = this,
+            panelSize;
+            
+        if (!me.ghost) {
+            panelSize = me.panel.getSize();
+            me.panel.el.setVisibilityMode(Ext.Element.DISPLAY);
+            me.ghost = me.panel.ghost();
+            if (me.insertProxy) {
+                // bc Panels aren't absolute positioned we need to take up the space
+                // of where the panel previously was
+                me.proxy = me.panel.el.insertSibling({cls: Ext.baseCSSPrefix + 'panel-dd-spacer'});
+                me.proxy.setSize(panelSize);
+            }
+        }
+    },
+
+    // private
+    repair: function(xy, callback, scope) {
+        this.hide();
+        Ext.callback(callback, scope || this);
+    },
+
+    /**
+     * Moves the proxy to a different position in the DOM.  This is typically
+     * called while dragging the Panel to keep the proxy sync'd to the Panel's
+     * location.
+     * @param {HTMLElement} parentNode The proxy's parent DOM node
+     * @param {HTMLElement} [before] The sibling node before which the
+     * proxy should be inserted. Defaults to the parent's last child if not
+     * specified.
+     */
+    moveProxy : function(parentNode, before){
+        if (this.proxy) {
+            parentNode.insertBefore(this.proxy.dom, before);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * DD implementation for Panels.
+ * @private
+ */
+Ext.define('Ext.panel.DD', {
+    extend:  Ext.dd.DragSource ,
+                                  
+
+    constructor : function(panel, cfg){
+        var me = this;
+        
+        me.panel = panel;
+        me.dragData = {panel: panel};
+        me.panelProxy = new Ext.panel.Proxy(panel, cfg);
+        me.proxy = me.panelProxy.proxy;
+
+        me.callParent([panel.el, cfg]);
+        me.setupEl(panel);
+    },
+    
+    setupEl: function(panel){
+        var me = this,
+            header = panel.header,
+            el = panel.body;
+            
+        if (header) {
+            me.setHandleElId(header.id);
+            el = header.el;
+        }
+        if (el) {
+            el.setStyle('cursor', 'move');
+            me.scroll = false;
+        } else {
+            // boxready fires after first layout, so we'll definitely be rendered
+            panel.on('boxready', me.setupEl, me, {single: true});
+        }
+    },
+
+    showFrame: Ext.emptyFn,
+    startDrag: Ext.emptyFn,
+    
+    b4StartDrag: function(x, y) {
+        this.panelProxy.show();
+    },
+    
+    b4MouseDown: function(e) {
+        var x = e.getPageX(),
+            y = e.getPageY();
+            
+        this.autoOffset(x, y);
+    },
+    
+    onInitDrag : function(x, y){
+        this.onStartDrag(x, y);
+        return true;
+    },
+    
+    createFrame : Ext.emptyFn,
+    
+    getDragEl : function(e){
+        var ghost = this.panelProxy.ghost;
+        if (ghost) {
+            return ghost.el.dom;
+        }
+    },
+    
+    endDrag : function(e){
+        this.panelProxy.hide();
+        this.panel.saveState();
+    },
+
+    autoOffset : function(x, y) {
+        x -= this.startPageX;
+        y -= this.startPageY;
+        this.setDelta(x, y);
+    },
+    
+    // Override this, we don't want to repair on an "invalid" drop, the panel
+    // should main it's position
+    onInvalidDrop: function(target, e, id) {
+        var me = this;
+        
+        if (me.beforeInvalidDrop(target, e, id) !== false) {
+            if (me.cachedTarget) {
+                if(me.cachedTarget.isNotifyTarget){
+                    me.cachedTarget.notifyOut(me, e, me.dragData);
+                }
+                me.cacheTarget = null;
+            }
+
+            if (me.afterInvalidDrop) {
+                /**
+                * An empty function by default, but provided so that you can perform a custom action
+                * after an invalid drop has occurred by providing an implementation.
+                * @param {Event} e The event object
+                * @param {String} id The id of the dropped element
+                * @method afterInvalidDrop
+                */
+                me.afterInvalidDrop(e, id);
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.util.Memento
+ * This class manages a set of captured properties from an object. These captured properties
+ * can later be restored to an object.
+ */
+Ext.define('Ext.util.Memento', (function () {
+
+    function captureOne (src, target, prop, prefix) {
+        src[prefix ? prefix + prop : prop] = target[prop];
+    }
+
+    function removeOne (src, target, prop) {
+        delete src[prop];
+    }
+
+    function restoreOne (src, target, prop, prefix) {
+        var name = prefix ? prefix + prop : prop,
+            value = src[name];
+
+        if (value || src.hasOwnProperty(name)) {
+            restoreValue(target, prop, value);
+        }
+    }
+
+    function restoreValue (target, prop, value) {
+        if (Ext.isDefined(value)) {
+            target[prop] = value;
+        } else {
+            delete target[prop];
+        }
+    }
+
+    function doMany (doOne, src, target, props, prefix) {
+        if (src) {
+            if (Ext.isArray(props)) {
+                var p, pLen = props.length;
+                for (p = 0; p < pLen; p++) {
+                    doOne(src, target, props[p], prefix);
+                }
+            } else {
+                doOne(src, target, props, prefix);
+            }
+        }
+    }
+
+    return {
+        /**
+         * @property data
+         * The collection of captured properties.
+         * @private
+         */
+        data: null,
+
+        /**
+         * @property target
+         * The default target object for capture/restore (passed to the constructor).
+         */
+        target: null,
+
+        /**
+         * Creates a new memento and optionally captures properties from the target object.
+         * @param {Object} target The target from which to capture properties. If specified in the
+         * constructor, this target becomes the default target for all other operations.
+         * @param {String/String[]} props The property or array of properties to capture.
+         */
+        constructor: function (target, props) {
+            if (target) {
+                this.target = target;
+                if (props) {
+                    this.capture(props);
+                }
+            }
+        },
+
+        /**
+         * Captures the specified properties from the target object in this memento.
+         * @param {String/String[]} props The property or array of properties to capture.
+         * @param {Object} target The object from which to capture properties.
+         */
+        capture: function (props, target, prefix) {
+            var me = this;
+            doMany(captureOne, me.data || (me.data = {}), target || me.target, props, prefix);
+        },
+
+        /**
+         * Removes the specified properties from this memento. These properties will not be
+         * restored later without re-capturing their values.
+         * @param {String/String[]} props The property or array of properties to remove.
+         */
+        remove: function (props) {
+            doMany(removeOne, this.data, null, props);
+        },
+
+        /**
+         * Restores the specified properties from this memento to the target object.
+         * @param {String/String[]} props The property or array of properties to restore.
+         * @param {Boolean} clear True to remove the restored properties from this memento or
+         * false to keep them (default is true).
+         * @param {Object} target The object to which to restore properties.
+         */
+        restore: function (props, clear, target, prefix) {
+            doMany(restoreOne, this.data, target || this.target, props, prefix);
+            if (clear !== false) {
+                this.remove(props);
+            }
+        },
+
+        /**
+         * Restores all captured properties in this memento to the target object.
+         * @param {Boolean} clear True to remove the restored properties from this memento or
+         * false to keep them (default is true).
+         * @param {Object} target The object to which to restore properties.
+         */
+        restoreAll: function (clear, target) {
+            var me   = this,
+                t    = target || this.target,
+                data = me.data,
+                prop;
+
+            for (prop in data) {
+                if (data.hasOwnProperty(prop)) {
+                    restoreValue(t, prop, data[prop]);
+                }
+            }
+
+            if (clear !== false) {
+                delete me.data;
+            }
+        }
+    };
+}()));
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Component layout for components which maintain an inner body element which must be resized to synchronize with the
+ * Component size.
+ * @private
+ */
+Ext.define('Ext.layout.component.Body', {
+
+    /* Begin Definitions */
+
+    alias: ['layout.body'],
+
+    extend:  Ext.layout.component.Auto ,
+
+    /* End Definitions */
+
+    type: 'body',
+
+    beginLayout: function (ownerContext) {
+        this.callParent(arguments);
+
+        ownerContext.bodyContext = ownerContext.getEl('body');
+    },
+
+    beginLayoutCycle: function(ownerContext, firstCycle){
+        var me = this,
+            lastWidthModel = me.lastWidthModel,
+            lastHeightModel = me.lastHeightModel,
+            body = me.owner.body;
+
+        me.callParent(arguments);
+
+        if (lastWidthModel && lastWidthModel.fixed && ownerContext.widthModel.shrinkWrap) {
+            body.setWidth(null);
+        }
+
+        if (lastHeightModel && lastHeightModel.fixed && ownerContext.heightModel.shrinkWrap) {
+            body.setHeight(null);
+        }
+    },
+
+    // Padding is exciting here because we have 2 el's: owner.el and owner.body. Content
+    // size always includes the padding of the targetEl, which should be owner.body. But
+    // it is common to have padding on owner.el also (such as a panel header), so we need
+    // to do some more padding work if targetContext is not owner.el. The base class has
+    // already handled the ownerContext's frameInfo (border+framing) so all that is left
+    // is padding.
+
+    calculateOwnerHeightFromContentHeight: function (ownerContext, contentHeight) {
+        var height = this.callParent(arguments);
+
+        if (ownerContext.targetContext != ownerContext) {
+            height += ownerContext.getPaddingInfo().height;
+        }
+
+        return height;
+    },
+
+    calculateOwnerWidthFromContentWidth: function (ownerContext, contentWidth) {
+        var width = this.callParent(arguments);
+
+        if (ownerContext.targetContext != ownerContext) {
+            width += ownerContext.getPaddingInfo().width;
+        }
+
+        return width;
+    },
+
+    measureContentWidth: function (ownerContext) {
+        return ownerContext.bodyContext.setWidth(ownerContext.bodyContext.el.dom.offsetWidth, false);
+    },
+
+    measureContentHeight: function (ownerContext) {
+        return ownerContext.bodyContext.setHeight(ownerContext.bodyContext.el.dom.offsetHeight, false);
+    },
+
+    publishInnerHeight: function (ownerContext, height) {
+        var innerHeight = height - ownerContext.getFrameInfo().height,
+            targetContext = ownerContext.targetContext;
+
+        if (targetContext != ownerContext) {
+            innerHeight -= ownerContext.getPaddingInfo().height;
+        }
+
+        // return the value here, it may get used in a subclass
+        return ownerContext.bodyContext.setHeight(innerHeight, !ownerContext.heightModel.natural);
+    },
+
+    publishInnerWidth: function (ownerContext, width) {
+        var innerWidth = width - ownerContext.getFrameInfo().width,
+            targetContext = ownerContext.targetContext;
+
+        if (targetContext != ownerContext) {
+            innerWidth -= ownerContext.getPaddingInfo().width;
+        }
+
+        ownerContext.bodyContext.setWidth(innerWidth, !ownerContext.widthModel.natural);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Panel is a container that has specific functionality and structural components that make it the perfect building
+ * block for application-oriented user interfaces.
+ *
+ * Panels are, by virtue of their inheritance from {@link Ext.container.Container}, capable of being configured with a
+ * {@link Ext.container.Container#layout layout}, and containing child Components.
+ *
+ * When either specifying child {@link #cfg-items} of a Panel, or dynamically {@link Ext.container.Container#method-add adding}
+ * Components to a Panel, remember to consider how you wish the Panel to arrange those child elements, and whether those
+ * child elements need to be sized using one of Ext's built-in `{@link Ext.container.Container#layout layout}`
+ * schemes. By default, Panels use the {@link Ext.layout.container.Auto Auto} scheme. This simply renders child
+ * components, appending them one after the other inside the Container, and **does not apply any sizing** at all.
+ *
+ * {@img Ext.panel.Panel/panel.png Panel components}
+ *
+ * A Panel may also contain {@link #bbar bottom} and {@link #tbar top} toolbars, along with separate {@link
+ * Ext.panel.Header header}, {@link #fbar footer} and body sections.
+ *
+ * Panel also provides built-in {@link #collapsible collapsible, expandable} and {@link #closable} behavior. Panels can
+ * be easily dropped into any {@link Ext.container.Container Container} or layout, and the layout and rendering pipeline
+ * is {@link Ext.container.Container#method-add completely managed by the framework}.
+ *
+ * **Note:** By default, the `{@link #closable close}` header tool _destroys_ the Panel resulting in removal of the
+ * Panel and the destruction of any descendant Components. This makes the Panel object, and all its descendants
+ * **unusable**. To enable the close tool to simply _hide_ a Panel for later re-use, configure the Panel with
+ * `{@link #closeAction closeAction}: 'hide'`.
+ *
+ * Usually, Panels are used as constituents within an application, in which case, they would be used as child items of
+ * Containers, and would themselves use Ext.Components as child {@link #cfg-items}. However to illustrate simply rendering a
+ * Panel into the document, here's how to do it:
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *         title: 'Hello',
+ *         width: 200,
+ *         html: '<p>World!</p>',
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * A more realistic scenario is a Panel created to house input fields which will not be rendered, but used as a
+ * constituent part of a Container:
+ *
+ *     @example
+ *     var filterPanel = Ext.create('Ext.panel.Panel', {
+ *         bodyPadding: 5,  // Don't want content to crunch against the borders
+ *         width: 300,
+ *         title: 'Filters',
+ *         items: [{
+ *             xtype: 'datefield',
+ *             fieldLabel: 'Start date'
+ *         }, {
+ *             xtype: 'datefield',
+ *             fieldLabel: 'End date'
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * Note that the Panel above is configured to render into the document and assigned a size. In a real world scenario,
+ * the Panel will often be added inside a Container which will use a {@link #layout} to render, size and position its
+ * child Components.
+ *
+ * Panels will often use specific {@link #layout}s to provide an application with shape and structure by containing and
+ * arranging child Components:
+ *
+ *     @example
+ *     var resultsPanel = Ext.create('Ext.panel.Panel', {
+ *         title: 'Results',
+ *         width: 600,
+ *         height: 400,
+ *         renderTo: Ext.getBody(),
+ *         layout: {
+ *             type: 'vbox',       // Arrange child items vertically
+ *             align: 'stretch',    // Each takes up full width
+ *             padding: 5
+ *         },
+ *         items: [{               // Results grid specified as a config object with an xtype of 'grid'
+ *             xtype: 'grid',
+ *             columns: [{header: 'Column One'}],            // One header just for show. There's no data,
+ *             store: Ext.create('Ext.data.ArrayStore', {}), // A dummy empty data store
+ *             flex: 1                                       // Use 1/3 of Container's height (hint to Box layout)
+ *         }, {
+ *             xtype: 'splitter'   // A splitter between the two child items
+ *         }, {                    // Details Panel specified as a config object (no xtype defaults to 'panel').
+ *             title: 'Details',
+ *             bodyPadding: 5,
+ *             items: [{
+ *                 fieldLabel: 'Data item',
+ *                 xtype: 'textfield'
+ *             }], // An array of form fields
+ *             flex: 2             // Use 2/3 of Container's height (hint to Box layout)
+ *         }]
+ *     });
+ *
+ * The example illustrates one possible method of displaying search results. The Panel contains a grid with the
+ * resulting data arranged in rows. Each selected row may be displayed in detail in the Panel below. The {@link
+ * Ext.layout.container.VBox vbox} layout is used to arrange the two vertically. It is configured to stretch child items
+ * horizontally to full width. Child items may either be configured with a numeric height, or with a `flex` value to
+ * distribute available space proportionately.
+ *
+ * This Panel itself may be a child item of, for exaple, a {@link Ext.tab.Panel} which will size its child items to fit
+ * within its content area.
+ *
+ * Using these techniques, as long as the **layout** is chosen and configured correctly, an application may have any
+ * level of nested containment, all dynamically sized according to configuration, the user's preference and available
+ * browser size.
+ */
+Ext.define('Ext.panel.Panel', {
+    extend:  Ext.panel.AbstractPanel ,
+               
+                           
+                      
+                          
+                       
+                        
+                                    
+                          
+      
+    alias: 'widget.panel',
+    alternateClassName: 'Ext.Panel',
+
+    /**
+     * @cfg {String} collapsedCls
+     * A CSS class to add to the panel's element after it has been collapsed.
+     */
+    collapsedCls: 'collapsed',
+
+    /**
+     * @cfg {Boolean} animCollapse
+     * `true` to animate the transition when the panel is collapsed, `false` to skip the animation (defaults to `true`
+     * if the {@link Ext.fx.Anim} class is available, otherwise `false`). May also be specified as the animation
+     * duration in milliseconds.
+     */
+    animCollapse: Ext.enableFx,
+
+    /**
+     * @cfg {Number} minButtonWidth
+     * Minimum width of all footer toolbar buttons in pixels. If set, this will be used as the default
+     * value for the {@link Ext.button.Button#minWidth} config of each Button added to the **footer toolbar** via the
+     * {@link #fbar} or {@link #buttons} configurations. It will be ignored for buttons that have a minWidth configured
+     * some other way, e.g. in their own config object or via the {@link Ext.container.Container#defaults defaults} of
+     * their parent container.
+     */
+    minButtonWidth: 75,
+
+    /**
+     * @cfg {Boolean} collapsed
+     * `true` to render the panel collapsed, `false` to render it expanded.
+     */
+    collapsed: false,
+
+    /**
+     * @cfg {Boolean} collapseFirst
+     * `true` to make sure the collapse/expand toggle button always renders first (to the left of) any other tools in
+     * the panel's title bar, `false` to render it last.
+     */
+    collapseFirst: true,
+
+    /**
+     * @cfg {Boolean} hideCollapseTool
+     * `true` to hide the expand/collapse toggle button when `{@link #collapsible} == true`, `false` to display it.
+     */
+    hideCollapseTool: false,
+
+    /**
+     * @cfg {Boolean} titleCollapse
+     * `true` to allow expanding and collapsing the panel (when `{@link #collapsible} = true`) by clicking anywhere in
+     * the header bar, `false`) to allow it only by clicking to tool button). When a panel is used in a 
+     * {@link Ext.layout.container.Border border layout}, the {@link #floatable} option can influence the behavior of collapsing.
+     */
+    titleCollapse: undefined,
+
+    /**
+     * @cfg {String} collapseMode
+     * **Important: this config is only effective for {@link #collapsible} Panels which are direct child items of a
+     * {@link Ext.layout.container.Border border layout}.**
+     *
+     * When _not_ a direct child item of a {@link Ext.layout.container.Border border layout}, then the Panel's header
+     * remains visible, and the body is collapsed to zero dimensions. If the Panel has no header, then a new header
+     * (orientated correctly depending on the {@link #collapseDirection}) will be inserted to show a the title and a re-
+     * expand tool.
+     *
+     * When a child item of a {@link Ext.layout.container.Border border layout}, this config has three possible values:
+     *
+     * - `undefined` - When collapsed, a placeholder {@link Ext.panel.Header Header} is injected into the layout to
+     *   represent the Panel and to provide a UI with a Tool to allow the user to re-expand the Panel.
+     *
+     * - `"header"` - The Panel collapses to leave its header visible as when not inside a
+     *   {@link Ext.layout.container.Border border layout}.
+     *
+     * - `"mini"` - The Panel collapses without a visible header.
+     */
+
+    /**
+     * @cfg {Ext.Component/Object} placeholder
+     * **Important: This config is only effective for {@link #collapsible} Panels which are direct child items of a
+     * {@link Ext.layout.container.Border border layout} when not using the `'header'` {@link #collapseMode}.**
+     *
+     * **Optional.** A Component (or config object for a Component) to show in place of this Panel when this Panel is
+     * collapsed by a {@link Ext.layout.container.Border border layout}. Defaults to a generated {@link Ext.panel.Header
+     * Header} containing a {@link Ext.panel.Tool Tool} to re-expand the Panel.
+     */
+
+    /**
+     * @cfg {Boolean} floatable
+     * **Important: This config is only effective for {@link #collapsible} Panels which are direct child items of a
+     * {@link Ext.layout.container.Border border layout}.**
+     *
+     * true to allow clicking a collapsed Panel's {@link #placeholder} to display the Panel floated above the layout,
+     * false to force the user to fully expand a collapsed region by clicking the expand button to see it again.
+     */
+    floatable: true,
+
+    /**
+     * @cfg {Boolean} overlapHeader
+     * True to overlap the header in a panel over the framing of the panel itself. This is needed when frame:true (and
+     * is done automatically for you). Otherwise it is undefined. If you manually add rounded corners to a panel header
+     * which does not have frame:true, this will need to be set to true.
+     */
+
+    /**
+     * @cfg {Boolean} collapsible
+     * True to make the panel collapsible and have an expand/collapse toggle Tool added into the header tool button
+     * area. False to keep the panel sized either statically, or by an owning layout manager, with no toggle Tool.
+     * When a panel is used in a {@link Ext.layout.container.Border border layout}, the {@link #floatable} option
+     * can influence the behavior of collapsing.
+     * See {@link #collapseMode} and {@link #collapseDirection}
+     */
+    collapsible: undefined,
+
+    /**
+     * @cfg {String} collapseDirection
+     * The direction to collapse the Panel when the toggle button is clicked.
+     *
+     * Defaults to the {@link #headerPosition}
+     *
+     * **Important: This config is _ignored_ for {@link #collapsible} Panels which are direct child items of a {@link
+     * Ext.layout.container.Border border layout}.**
+     *
+     * Specify as `'top'`, `'bottom'`, `'left'` or `'right'`.
+     */
+
+    /**
+     * @cfg {Boolean} closable
+     * True to display the 'close' tool button and allow the user to close the window, false to hide the button and
+     * disallow closing the window.
+     *
+     * By default, when close is requested by clicking the close button in the header, the {@link #method-close} method will be
+     * called. This will _{@link Ext.Component#method-destroy destroy}_ the Panel and its content meaning that it may not be
+     * reused.
+     *
+     * To make closing a Panel _hide_ the Panel so that it may be reused, set {@link #closeAction} to 'hide'.
+     */
+    closable: false,
+
+    /**
+     * @cfg {String} closeAction
+     * The action to take when the close header tool is clicked:
+     *
+     * - **`'{@link #method-destroy}'`** :
+     *
+     *   {@link #method-remove remove} the window from the DOM and {@link Ext.Component#method-destroy destroy} it and all descendant
+     *   Components. The window will **not** be available to be redisplayed via the {@link #method-show} method.
+     *
+     * - **`'{@link #method-hide}'`** :
+     *
+     *   {@link #method-hide} the window by setting visibility to hidden and applying negative offsets. The window will be
+     *   available to be redisplayed via the {@link #method-show} method.
+     *
+     * **Note:** This behavior has changed! setting *does* affect the {@link #method-close} method which will invoke the
+     * approriate closeAction.
+     */
+    closeAction: 'destroy',
+
+    /**
+     * @cfg {Object/Object[]} dockedItems
+     * A component or series of components to be added as docked items to this panel. The docked items can be docked to
+     * either the top, right, left or bottom of a panel. This is typically used for things like toolbars or tab bars:
+     *
+     *     var panel = new Ext.panel.Panel({
+     *         dockedItems: [{
+     *             xtype: 'toolbar',
+     *             dock: 'top',
+     *             items: [{
+     *                 text: 'Docked to the top'
+     *             }]
+     *         }]
+     *     });
+     */
+
+    /**
+     * @cfg {Number} placeholderCollapseHideMode
+     * The {@link Ext.dom.Element#setVisibilityMode mode} for hiding collapsed panels when
+     * using {@link #collapseMode} "placeholder".
+     */
+    placeholderCollapseHideMode: Ext.Element.VISIBILITY,
+
+    /**
+     * @cfg {Boolean} preventHeader
+     * @deprecated 4.1.0 Use {@link #header} instead.
+     * Prevent a Header from being created and shown.
+     */
+     preventHeader: false,
+
+    /**
+     * @cfg {Boolean/Object} [header]
+     * Pass as `false` to prevent a Header from being created and shown.
+     *
+     * Pass as a config object (optionally containing an `xtype`) to custom-configure this Panel's header.
+     *
+     * See {@link Ext.panel.Header} for all the options that may be specified here.
+     *
+     * A {@link Ext.panel.Header panel header} is a {@link Ext.container.Container} which contains the Panel's {@link #title} and {@link #tools}.
+     * You may also configure the Panel's `header` option with its own child items which go *before* the {@link #tools}
+     *
+     * By default the panel {@link #title} is inserted after items configured in this config, but before any tools.
+     * To insert the title at any point in the full array, specify the {@link Ext.panel.Header #titlePosition} config:
+     *
+     *    new Ext.panel.Panel({
+     *        title: 'Test',
+     *        tools: [{
+     *            type: 'refresh
+     *        }, {
+     *            type: 'help'
+     *        }],
+     *        titlePosition: 2 // Title will come AFTER the two tools
+     *        ...
+     *    });
+     *
+     */
+    header: undefined,
+
+    /**
+     * @cfg {String} headerPosition
+     * Specify as `'top'`, `'bottom'`, `'left'` or `'right'`.
+     */
+    headerPosition: 'top',
+
+    /**
+     * @cfg {Boolean} frame
+     * True to apply a frame to the panel.
+     */
+    frame: false,
+
+    /**
+     * @cfg {Boolean} frameHeader
+     * True to apply a frame to the panel panels header (if 'frame' is true).
+     */
+    frameHeader: true,
+
+    /**
+     * @cfg {Object[]/Ext.panel.Tool[]} tools
+     * An array of {@link Ext.panel.Tool} configs/instances to be added to the header tool area. The tools are stored as
+     * child components of the header container. They can be accessed using {@link #down} and {#query}, as well as the
+     * other component methods. The toggle tool is automatically created if {@link #collapsible} is set to true.
+     *
+     * Note that, apart from the toggle tool which is provided when a panel is collapsible, these tools only provide the
+     * visual button. Any required functionality must be provided by adding handlers that implement the necessary
+     * behavior.
+     *
+     * Example usage:
+     *
+     *     tools:[{
+     *         type:'refresh',
+     *         tooltip: 'Refresh form Data',
+     *         // hidden:true,
+     *         handler: function(event, toolEl, panelHeader) {
+     *             // refresh logic
+     *         }
+     *     },
+     *     {
+     *         type:'help',
+     *         tooltip: 'Get Help',
+     *         callback: function(panel, tool, event) {
+     *             // show help here
+     *         }
+     *     }]
+     * 
+     * The difference between `handler` and `callback` is the signature. For details on
+     * the distinction, see {@link Ext.panel.Tool}.
+     */
+
+    /**
+     * @cfg {String} [title='']
+     * The title text to be used to display in the {@link Ext.panel.Header panel header}. When a
+     * `title` is specified the {@link Ext.panel.Header} will automatically be created and displayed unless
+     * {@link #header} is set to `false`.
+     */
+
+    /**
+     * @cfg {String} [titleAlign]
+     * The alignment of the title text within the available space between the
+     * icon and the tools. 
+     * 
+     * May be `"left"`, `"right"` or `"center"`. Defaults to the browser's natural
+     * behavior depending on the css direction property - `"left"` when direction
+     * is ltr and `"right"` when direction is rtl
+     * (see {@link Ext.AbstractComponent#rtl}).
+     */
+
+    /**
+     * @cfg {Boolean} [manageHeight=true] When true, the dock component layout writes
+     * height information to the panel's DOM elements based on its shrink wrap height
+     * calculation. This ensures that the browser respects the calculated height.
+     * When false, the dock component layout will not write heights on the panel or its
+     * body element. In some simple layout cases, not writing the heights to the DOM may
+     * be desired because this allows the browser to respond to direct DOM manipulations
+     * (like animations).
+     */
+    manageHeight: true,
+
+    /**
+     * @cfg {String} iconCls
+     * CSS class for an icon in the header. Used for displaying an icon to the left of a title.
+     */
+    
+    /**
+     * @cfg {String} icon
+     * Path to image for an icon in the header. Used for displaying an icon to the left of a title.
+     */
+
+    /**
+     * @cfg {Number/String} glyph
+     * @inheritdoc Ext.panel.Header#glyph
+     */
+
+    /**
+     * @cfg {String} headerOverCls
+     * Optional CSS class to apply to the header element on mouseover
+     */
+
+    /**
+     * @override
+     * @cfg {Boolean} constrain
+     * True to constrain the panel within its containing element, false to allow it to fall outside of its containing
+     * element. By default floating components such as Windows will be rendered to `document.body`. To render and constrain the window within
+     * another element specify {@link #renderTo}. Optionally the header only can be constrained
+     * using {@link #constrainHeader}.
+     */
+    constrain: false,
+
+    /**
+     * @cfg {Boolean} constrainHeader
+     * True to constrain the panel header within its containing element (allowing the panel body to fall outside of
+     * its containing element) or false to allow the header to fall outside its containing element.
+     * Optionally the entire panel can be constrained using {@link #constrain}.
+     */
+    constrainHeader: false,
+
+    /**
+     * @cfg {Boolean} [simpleDrag=false]
+     * When {@link #cfg-draggable} is `true`, Specify this as `true` to  cause the `draggable` config
+     * to work the same as it does in {@link Ext.window.Window Window}. This Panel
+     * just becomes movable. No DragDrop instances receive any notifications.
+     * For example:
+     *
+     *     @example
+     *     var win = Ext.create('widget.window', {
+     *         height: 300,
+     *         width: 300,
+     *         title: 'Constraining Window',
+     *         closable: false,
+     *         items: {
+     *             title: "Floating Panel",
+     *             width: 100,
+     *             height: 100,
+     *             floating: true,
+     *             draggable: true,
+     *             constrain: true,
+     *             simpleDrag: true
+     *         }
+     *     });
+     *     win.show();
+     *     // Floating components begin life hidden
+     *     win.child('[title=Floating Panel]').show();
+     * 
+     */
+    
+    initComponent: function() {
+        var me = this;
+
+        me.addEvents(
+
+            /**
+             * @event beforeclose
+             * Fires before the user closes the panel. Return false from any listener to stop the close event being
+             * fired
+             * @param {Ext.panel.Panel} panel The Panel object
+             */
+            'beforeclose',
+            
+            /**
+             * @event close
+             * Fires when the user closes the panel.
+             * @param {Ext.panel.Panel} panel The Panel object
+             */
+            'close',
+
+            /**
+             * @event beforeexpand
+             * Fires before this panel is expanded. Return false to prevent the expand.
+             * @param {Ext.panel.Panel} p The Panel being expanded.
+             * @param {Boolean} animate True if the expand is animated, else false.
+             */
+            "beforeexpand",
+
+            /**
+             * @event beforecollapse
+             * Fires before this panel is collapsed. Return false to prevent the collapse.
+             * @param {Ext.panel.Panel} p The Panel being collapsed.
+             * @param {String} direction . The direction of the collapse. One of
+             *
+             *   - Ext.Component.DIRECTION_TOP
+             *   - Ext.Component.DIRECTION_RIGHT
+             *   - Ext.Component.DIRECTION_BOTTOM
+             *   - Ext.Component.DIRECTION_LEFT
+             *
+             * @param {Boolean} animate True if the collapse is animated, else false.
+             */
+            "beforecollapse",
+
+            /**
+             * @event expand
+             * Fires after this Panel has expanded.
+             * @param {Ext.panel.Panel} p The Panel that has been expanded.
+             */
+            "expand",
+
+            /**
+             * @event collapse
+             * Fires after this Panel has collapsed.
+             * @param {Ext.panel.Panel} p The Panel that has been collapsed.
+             */
+            "collapse",
+
+            /**
+             * @event titlechange
+             * Fires after the Panel title has been set or changed.
+             * @param {Ext.panel.Panel} p the Panel which has been resized.
+             * @param {String} newTitle The new title.
+             * @param {String} oldTitle The previous panel title.
+             */
+            'titlechange',
+
+            /**
+             * @event iconchange
+             * Fires after the Panel icon has been set or changed.
+             * @param {Ext.panel.Panel} p The Panel which has the icon changed.
+             * @param {String} newIcon The path to the new icon image.
+             * @param {String} oldIcon The path to the previous panel icon image.
+             */
+            'iconchange',
+            
+            /**
+             * @event iconclschange
+             * Fires after the Panel iconCls has been set or changed.
+             * @param {Ext.panel.Panel} p The Panel which has the iconCls changed.
+             * @param {String} newIconCls The new iconCls.
+             * @param {String} oldIconCls The previous panel iconCls.
+             */
+            'iconclschange',
+
+            /**
+             * @event glyphchange
+             * Fired when the Panel glyph has been changed by the {@link #setGlyph} method.
+             * @param {Ext.panel.Panel} this
+             * @param {Number/String} newGlyph
+             * @param {Number/String} oldGlyph
+             */
+            'glyphchange',
+
+            /**
+             * @event float
+             * Fires after a collapsed Panel has been "floated" by clicking on
+             * it's header. Only applicable when the Panel is an item in a
+             * {@link Ext.layout.container.Border Border Layout}.
+             */
+            'float',
+
+            /**
+             * @event unfloat
+             * Fires after a "floated" Panel has returned to it's collapsed state
+             * as a result of the mouse leaving the Panel. Only applicable when
+             * the Panel is an item in a
+             * {@link Ext.layout.container.Border Border Layout}.
+             */
+            'unfloat'
+        );
+
+        if (me.collapsible) {
+        // Save state on these two events.
+            this.addStateEvents(['expand', 'collapse']);
+        }
+        if (me.unstyled) {
+            me.setUI('plain');
+        }
+
+        if (me.frame) {
+            me.setUI(me.ui + '-framed');
+        }
+
+        // Backwards compatibility
+        me.bridgeToolbars();
+
+        me.callParent();
+        me.collapseDirection = me.collapseDirection || me.headerPosition || Ext.Component.DIRECTION_TOP;
+
+        // Used to track hidden content elements during collapsed state
+        me.hiddenOnCollapse = new Ext.dom.CompositeElement();
+
+    },
+
+    beforeDestroy: function() {
+        var me = this;
+        Ext.destroy(
+            me.placeholder,
+            me.ghostPanel,
+            me.dd
+        );
+        me.callParent();
+    },
+
+    initAria: function() {
+        this.callParent();
+        this.initHeaderAria();
+    },
+
+    getFocusEl: function() {
+        return  this.el;
+    },
+
+    initHeaderAria: function() {
+        var me = this,
+            el = me.el,
+            header = me.header;
+        if (el && header) {
+            el.dom.setAttribute('aria-labelledby', header.titleCmp.id);
+        }
+    },
+
+    /**
+     * Gets the {@link Ext.panel.Header Header} for this panel.
+     */
+    getHeader: function() {
+        return this.header;
+    },
+
+    /**
+     * Set a title for the panel's header. See {@link Ext.panel.Header#title}.
+     * @param {String} newTitle
+     */
+    setTitle: function(newTitle) {
+        var me = this,
+            oldTitle = me.title,
+            header = me.header,
+            reExpander = me.reExpander,
+            placeholder = me.placeholder;
+
+        me.title = newTitle;
+
+        if (header) {
+            if (header.isHeader) {
+                header.setTitle(newTitle);
+            } else {
+                header.title = newTitle;
+            }
+        } else if (me.rendered) {
+            me.updateHeader();
+        }
+
+        if (reExpander) {
+            reExpander.setTitle(newTitle);
+        }
+
+        if (placeholder && placeholder.setTitle) {
+            placeholder.setTitle(newTitle);
+        }
+
+        me.fireEvent('titlechange', me, newTitle, oldTitle);
+    },
+
+    /**
+     * Set the iconCls for the panel's header. See {@link Ext.panel.Header#iconCls}. It will fire the
+     * {@link #iconclschange} event after completion.
+     * @param {String} newIconCls The new CSS class name
+     */
+    setIconCls: function(newIconCls) {
+        var me = this,
+            oldIconCls = me.iconCls,
+            header = me.header,
+            placeholder = me.placeholder;
+
+        me.iconCls = newIconCls;
+
+        if (header) {
+            if (header.isHeader) {
+                header.setIconCls(newIconCls);
+            } else {
+                header.iconCls = newIconCls;
+            }
+        } else {
+            me.updateHeader();
+        }
+
+        if (placeholder && placeholder.setIconCls) {
+            placeholder.setIconCls(newIconCls);
+        }
+
+        me.fireEvent('iconclschange', me, newIconCls, oldIconCls);
+    },
+    
+    /**
+     * Set the icon for the panel's header. See {@link Ext.panel.Header#icon}. It will fire the
+     * {@link #iconchange} event after completion.
+     * @param {String} newIcon The new icon path
+     */
+    setIcon: function(newIcon) {
+        var me = this,
+            oldIcon = me.icon,
+            header = me.header,
+            placeholder = me.placeholder;
+
+        me.icon = newIcon;
+
+        if (header) {
+            if (header.isHeader) {
+                header.setIcon(newIcon);
+            } else {
+                header.icon = newIcon;
+            }
+        } else {
+            me.updateHeader();
+        }
+
+        if (placeholder && placeholder.setIcon) {
+            placeholder.setIcon(newIcon);
+        }
+
+        me.fireEvent('iconchange', me, newIcon, oldIcon);
+    },
+
+    /**
+     * Set the glyph for the panel's header. See {@link Ext.panel.Header#glyph}. It will
+     * fire the {@link #glyphchange} event after completion.
+     * @param {Number/String} newGlyph The new glyph
+     * This parameter expects a format consistent with that of {@link #glyph}
+     */
+    setGlyph: function(newGlyph) {
+        var me = this,
+            oldGlyph = me.glyph,
+            header = me.header,
+            placeholder = me.placeholder;
+
+        me.glyph = newGlyph;
+
+        if (header) {
+            if (header.isHeader) {
+                header.setGlyph(newGlyph);
+            } else {
+                header.glyph = newGlyph;
+            }
+        } else {
+            me.updateHeader();
+        }
+
+        if (placeholder && placeholder.setGlyph) {
+            placeholder.setIcon(newGlyph);
+        }
+
+        me.fireEvent('glyphchange', me, newGlyph, oldGlyph);
+    },
+
+    bridgeToolbars: function() {
+        var me = this,
+            docked = [],
+            fbar,
+            fbarDefaults,
+            minButtonWidth = me.minButtonWidth;
+
+        function initToolbar (toolbar, pos, useButtonAlign) {
+            if (Ext.isArray(toolbar)) {
+                toolbar = {
+                    xtype: 'toolbar',
+                    items: toolbar
+                };
+            }
+            else if (!toolbar.xtype) {
+                toolbar.xtype = 'toolbar';
+            }
+            toolbar.dock = pos;
+            if (pos == 'left' || pos == 'right') {
+                toolbar.vertical = true;
+            }
+
+            // Legacy support for buttonAlign (only used by buttons/fbar)
+            if (useButtonAlign) {
+                toolbar.layout = Ext.applyIf(toolbar.layout || {}, {
+                    // default to 'end' (right-aligned) if me.buttonAlign is undefined or invalid
+                    pack: { left:'start', center:'center' }[me.buttonAlign] || 'end'
+                });
+            }
+            return toolbar;
+        }
+
+        // Short-hand toolbars (tbar, bbar and fbar plus new lbar and rbar):
+
+        /**
+         * @cfg {String} buttonAlign
+         * The alignment of any buttons added to this panel. Valid values are 'right', 'left' and 'center' (defaults to
+         * 'right' for buttons/fbar, 'left' for other toolbar types).
+         *
+         * **NOTE:** The prefered way to specify toolbars is to use the dockedItems config. Instead of buttonAlign you
+         * would add the layout: { pack: 'start' | 'center' | 'end' } option to the dockedItem config.
+         */
+
+        /**
+         * @cfg {Object/Object[]} tbar
+         * Convenience config. Short for 'Top Bar'.
+         *
+         *     tbar: [
+         *       { xtype: 'button', text: 'Button 1' }
+         *     ]
+         *
+         * is equivalent to
+         *
+         *     dockedItems: [{
+         *         xtype: 'toolbar',
+         *         dock: 'top',
+         *         items: [
+         *             { xtype: 'button', text: 'Button 1' }
+         *         ]
+         *     }]
+         */
+        if (me.tbar) {
+            docked.push(initToolbar(me.tbar, 'top'));
+            me.tbar = null;
+        }
+
+        /**
+         * @cfg {Object/Object[]} bbar
+         * Convenience config. Short for 'Bottom Bar'.
+         *
+         *     bbar: [
+         *       { xtype: 'button', text: 'Button 1' }
+         *     ]
+         *
+         * is equivalent to
+         *
+         *     dockedItems: [{
+         *         xtype: 'toolbar',
+         *         dock: 'bottom',
+         *         items: [
+         *             { xtype: 'button', text: 'Button 1' }
+         *         ]
+         *     }]
+         */
+        if (me.bbar) {
+            docked.push(initToolbar(me.bbar, 'bottom'));
+            me.bbar = null;
+        }
+
+        /**
+         * @cfg {Object/Object[]} buttons
+         * Convenience config used for adding buttons docked to the bottom of the panel. This is a
+         * synonym for the {@link #fbar} config.
+         *
+         *     buttons: [
+         *       { text: 'Button 1' }
+         *     ]
+         *
+         * is equivalent to
+         *
+         *     dockedItems: [{
+         *         xtype: 'toolbar',
+         *         dock: 'bottom',
+         *         ui: 'footer',
+         *         defaults: {minWidth: {@link #minButtonWidth}},
+         *         items: [
+         *             { xtype: 'component', flex: 1 },
+         *             { xtype: 'button', text: 'Button 1' }
+         *         ]
+         *     }]
+         *
+         * The {@link #minButtonWidth} is used as the default {@link Ext.button.Button#minWidth minWidth} for
+         * each of the buttons in the buttons toolbar.
+         */
+        if (me.buttons) {
+            me.fbar = me.buttons;
+            me.buttons = null;
+        }
+
+        /**
+         * @cfg {Object/Object[]} fbar
+         * Convenience config used for adding items to the bottom of the panel. Short for Footer Bar.
+         *
+         *     fbar: [
+         *       { type: 'button', text: 'Button 1' }
+         *     ]
+         *
+         * is equivalent to
+         *
+         *     dockedItems: [{
+         *         xtype: 'toolbar',
+         *         dock: 'bottom',
+         *         ui: 'footer',
+         *         defaults: {minWidth: {@link #minButtonWidth}},
+         *         items: [
+         *             { xtype: 'component', flex: 1 },
+         *             { xtype: 'button', text: 'Button 1' }
+         *         ]
+         *     }]
+         *
+         * The {@link #minButtonWidth} is used as the default {@link Ext.button.Button#minWidth minWidth} for
+         * each of the buttons in the fbar.
+         */
+        if (me.fbar) {
+            fbar = initToolbar(me.fbar, 'bottom', true); // only we useButtonAlign
+            fbar.ui = 'footer';
+
+            // Apply the minButtonWidth config to buttons in the toolbar
+            if (minButtonWidth) {
+                fbarDefaults = fbar.defaults;
+                fbar.defaults = function(config) {
+                    var defaults = fbarDefaults || {};
+                    if ((!config.xtype || config.xtype === 'button' || (config.isComponent && config.isXType('button'))) &&
+                            !('minWidth' in defaults)) {
+                        defaults = Ext.apply({minWidth: minButtonWidth}, defaults);
+                    }
+                    return defaults;
+                };
+            }
+
+            docked.push(fbar);
+            me.fbar = null;
+        }
+
+        /**
+         * @cfg {Object/Object[]} lbar
+         * Convenience config. Short for 'Left Bar' (left-docked, vertical toolbar).
+         *
+         *     lbar: [
+         *       { xtype: 'button', text: 'Button 1' }
+         *     ]
+         *
+         * is equivalent to
+         *
+         *     dockedItems: [{
+         *         xtype: 'toolbar',
+         *         dock: 'left',
+         *         items: [
+         *             { xtype: 'button', text: 'Button 1' }
+         *         ]
+         *     }]
+         */
+        if (me.lbar) {
+            docked.push(initToolbar(me.lbar, 'left'));
+            me.lbar = null;
+        }
+
+        /**
+         * @cfg {Object/Object[]} rbar
+         * Convenience config. Short for 'Right Bar' (right-docked, vertical toolbar).
+         *
+         *     rbar: [
+         *       { xtype: 'button', text: 'Button 1' }
+         *     ]
+         *
+         * is equivalent to
+         *
+         *     dockedItems: [{
+         *         xtype: 'toolbar',
+         *         dock: 'right',
+         *         items: [
+         *             { xtype: 'button', text: 'Button 1' }
+         *         ]
+         *     }]
+         */
+        if (me.rbar) {
+            docked.push(initToolbar(me.rbar, 'right'));
+            me.rbar = null;
+        }
+
+        if (me.dockedItems) {
+            if (!Ext.isArray(me.dockedItems)) {
+                me.dockedItems = [me.dockedItems];
+            }
+            me.dockedItems = me.dockedItems.concat(docked);
+        } else {
+            me.dockedItems = docked;
+        }
+    },
+
+    isPlaceHolderCollapse: function(){
+        return this.collapseMode == 'placeholder';
+    },
+
+    onBoxReady: function(){
+        this.callParent();
+        if (this.collapsed) {
+            this.setHiddenDocked();
+        }    
+    },
+
+    beforeRender: function() {
+        var me = this,
+            wasCollapsed;
+
+        me.callParent();
+
+        // Add class-specific header tools.
+        // Panel adds collapsible and closable.
+        me.initTools();
+
+        // Dock the header/title unless we are configured specifically not to create a header
+        if (!(me.preventHeader || (me.header === false))) {
+            me.updateHeader();
+        }
+
+        // If we are rendering collapsed, we still need to save and modify various configs
+        if (me.collapsed) {
+            if (me.isPlaceHolderCollapse()) {
+                if (!me.hidden) {
+                    me.setHiddenState(true);
+
+                    // This will insert the placeholder Component into the ownerCt's child collection
+                    // Its getRenderTree call which is calling this will then iterate again and
+                    // recreate the child items array to include the new Component. Prevent the first
+                    // collapse from firing
+                    me.preventCollapseFire = true;
+                    me.placeholderCollapse();
+                    delete me.preventCollapseFire;
+                    wasCollapsed = me.collapsed;
+
+                    // Temporarily clear the flag so that the header is rendered with a collapse tool in it.
+                    // Placeholder collapse panels never really collapse, they just hide. The tool is always
+                    // a collapse tool.
+                    me.collapsed = false;
+                }
+            } else {
+                me.beginCollapse();
+                me.addClsWithUI(me.collapsedCls);
+            }
+        }
+
+        // Restore the flag if we are being rendered initially placeholder collapsed.
+        if (wasCollapsed) {
+            me.collapsed = wasCollapsed;
+        }
+    },
+
+    /**
+     * @private
+     * Tools are a Panel-specific capabilty.
+     * Panel uses initTools. Subclasses may contribute tools by implementing addTools.
+     */
+    initTools: function() {
+        var me = this,
+            tools = me.tools,
+            i, tool;
+
+        me.tools = [];
+        for (i = tools && tools.length; i; ) {
+            --i;
+            me.tools[i] = tool = tools[i];
+            tool.toolOwner = me;
+        }
+
+        // Add a collapse tool unless configured to not show a collapse tool
+        // or to not even show a header.
+        if (me.collapsible && !(me.hideCollapseTool || me.header === false || me.preventHeader)) {
+            me.collapseDirection = me.collapseDirection || me.headerPosition || 'top';
+            me.collapseTool = me.expandTool = Ext.widget({
+                xtype: 'tool',
+                handler: me.toggleCollapse,
+                scope: me
+            });
+
+            me.updateCollapseTool();
+            // Prepend collapse tool is configured to do so.
+            if (me.collapseFirst) {
+                me.tools.unshift(me.collapseTool);
+            }
+        }
+
+        // Add subclass-specific tools.
+        me.addTools();
+
+        // Make Panel closable.
+        if (me.closable) {
+            me.addClsWithUI('closable');
+            me.addTool(Ext.widget({
+                xtype : 'tool',
+                type: 'close',
+                handler: Ext.Function.bind(me.close, me, [])
+            }));
+        }
+
+        // Append collapse tool if needed.
+        if (me.collapseTool && !me.collapseFirst) {
+            me.addTool(me.collapseTool);
+        }
+    },
+
+    /**
+     * @private
+     * @template
+     * Template method to be implemented in subclasses to add their tools after the collapsible tool.
+     */
+    addTools: Ext.emptyFn,
+
+    updateCollapseTool: function () {
+        var me = this,
+            collapseTool = me.collapseTool;
+    
+        if (collapseTool) {
+            if (me.collapsed && !me.isPlaceHolderCollapse()) {
+                collapseTool.setType('expand-' + me.getOppositeDirection(me.collapseDirection));
+            } else {
+                collapseTool.setType('collapse-' + me.collapseDirection);
+            }
+        }
+    },
+
+    /**
+     * Closes the Panel. By default, this method, removes it from the DOM, {@link Ext.Component#method-destroy destroy}s the
+     * Panel object and all its descendant Components. The {@link #beforeclose beforeclose} event is fired before the
+     * close happens and will cancel the close action if it returns false.
+     *
+     * **Note:** This method is also affected by the {@link #closeAction} setting. For more explicit control use
+     * {@link #method-destroy} and {@link #method-hide} methods.
+     */
+    close: function() {
+        if (this.fireEvent('beforeclose', this) !== false) {
+            this.doClose();
+        }
+    },
+
+    // @private
+    doClose: function() {
+        this.fireEvent('close', this);
+        this[this.closeAction]();
+    },
+
+    /**
+     * Create, hide, or show the header component as appropriate based on the current config.
+     * @private
+     * @param {Boolean} force True to force the header to be created
+     */
+    updateHeader: function(force) {
+        var me = this,
+            header = me.header,
+            title = me.title,
+            tools = me.tools,
+            icon = me.icon || me.iconCls,
+            vertical = me.headerPosition === 'left' || me.headerPosition === 'right';
+
+        if (Ext.isObject(header) || (header !== false && (force || (title || icon) || (tools && tools.length) || (me.collapsible && !me.titleCollapse)))) {
+            if (header && header.isHeader) {
+                header.show();
+            } else {
+                // Apply the header property to the header config
+                header = me.header = Ext.widget(Ext.apply({
+                    xtype       : 'header',
+                    title       : title,
+                    titleAlign  : me.titleAlign,
+                    orientation : vertical ? 'vertical' : 'horizontal',
+                    dock        : me.headerPosition || 'top',
+                    textCls     : me.headerTextCls,
+                    iconCls     : me.iconCls,
+                    icon        : me.icon,
+                    glyph       : me.glyph,
+                    baseCls     : me.baseCls + '-header',
+                    tools       : tools,
+                    ui          : me.ui,
+                    id          : me.id + '_header',
+                    overCls: me.headerOverCls,
+                    indicateDrag: me.draggable,
+                    frame       : (me.frame || me.alwaysFramed) && me.frameHeader,
+                    ignoreParentFrame : me.frame || me.overlapHeader,
+                    ignoreBorderManagement: me.frame || me.ignoreHeaderBorderManagement,
+                    ownerCt     : me,
+                    listeners   : me.collapsible && me.titleCollapse ? {
+                        click: me.toggleCollapse,
+                        scope: me
+                    } : null
+                }, me.header));
+                // Header's onAdd mutates the tools array.
+                // It replaces tool configs at each index with the instantiated tool
+                // It also injects the tool instances as properties keyed by their type.
+                me.addDocked(header, 0);
+            }
+            me.initHeaderAria();
+        } else if (header) {
+            header.hide();
+        }
+    },
+
+    // @inheritdoc
+    setUI: function(ui) {
+        var me = this;
+
+        me.callParent(arguments);
+
+        if (me.header && me.header.rendered) {
+            me.header.setUI(ui);
+        }
+    },
+
+    // @private
+    getDefaultContentTarget: function() {
+        return this.body;
+    },
+
+    getTargetEl: function() {
+        var me = this;
+        return me.body || me.protoBody || me.frameBody || me.el;
+    },
+
+    // the overrides below allow for collapsed regions inside the border layout to be hidden
+
+    // @inheritdoc
+    isVisible: function(deep){
+        var me = this;
+        if (me.collapsed && me.placeholder) {
+            return me.placeholder.isVisible(deep);
+        }
+        return me.callParent(arguments);
+    },
+
+    // @inheritdoc
+    onHide: function() {
+        var me = this;
+        if (me.collapsed && me.placeholder) {
+            me.placeholder.hide();
+        } else {
+            me.callParent(arguments);
+        }
+    },
+
+    // @inheritdoc
+    onShow: function() {
+        var me = this;
+        if (me.collapsed && me.isPlaceHolderCollapse()) {
+            // force hidden back to true, since this gets set by the layout
+            me.setHiddenState(true);
+            me.placeholderCollapse();
+        } else {
+            me.callParent(arguments);
+        }
+    },
+
+    onRemoved: function(destroying) {
+        var me = this;
+
+        // If we are removed but not being destroyed, ensure our placeholder is also removed but not destroyed
+        // If we are being destroyed, our destroy processing will destroy the placeholder.
+        // Must run before callParent because that breaks the ownerCt link
+        if (me.placeholder && !destroying) {
+            me.ownerCt.remove(me.placeholder, false);
+        }
+
+        me.callParent(arguments);
+    },
+
+    /**
+     * Add tools to this panel
+     * @param {Object[]/Ext.panel.Tool[]} tools The tools to add
+     */
+    addTool: function(tools) {
+        if (!Ext.isArray(tools)) {
+            tools = [tools];
+        }
+
+        var me     = this,
+            header = me.header,
+            t,
+            tLen   = tools.length,
+            tool;
+
+        for (t = 0; t < tLen; t++) {
+            tool = tools[t];
+            tool.toolOwner = me;
+            
+            if (header && header.isHeader) {
+                header.addTool(tool);
+            } else {
+                // only modify the tools array if the header isn't created,
+                // otherwise, defer to the header to manage
+                me.tools.push(tool);
+            }
+        }
+
+        me.updateHeader();
+    },
+
+    getOppositeDirection: function(d) {
+        var c = Ext.Component;
+        switch (d) {
+            case c.DIRECTION_TOP:
+                return c.DIRECTION_BOTTOM;
+            case c.DIRECTION_RIGHT:
+                return c.DIRECTION_LEFT;
+            case c.DIRECTION_BOTTOM:
+                return c.DIRECTION_TOP;
+            case c.DIRECTION_LEFT:
+                return c.DIRECTION_RIGHT;
+        }
+    },
+
+    getWidthAuthority: function() {
+        if (this.collapsed && this.collapsedHorizontal()) {
+            return 1; // the panel determine's its own width
+        }
+
+        return this.callParent();
+    },
+
+    getHeightAuthority: function() {
+        if (this.collapsed && this.collapsedVertical()) {
+            return 1; // the panel determine's its own height
+        }
+
+        return this.callParent();
+    },
+
+    collapsedHorizontal: function () {
+        var dir = this.getCollapsed();
+        return dir === 'left' || dir === 'right';
+    },
+
+    collapsedVertical: function () {
+        var dir = this.getCollapsed();
+        return dir === 'top' || dir === 'bottom';
+    },
+
+    restoreDimension: function(){
+        var dir = this.collapseDirection;
+        // If we're collapsing top/bottom, we want to restore the height
+        // If we're collapsing left/right, we want to restore the width
+        return (dir === 'top' || dir === 'bottom') ? 'height' : 'width';    
+    },
+
+    /**
+     * Returns the current collapsed state of the panel.
+     * @return {Boolean/String} False when not collapsed, otherwise the value of {@link #collapseDirection}.
+     */
+    getCollapsed: function() {
+        var me = this;
+        // The collapsed flag, when the Panel is collapsed acts as the direction in which the collapse took
+        // place. It can still be tested as truthy/falsy if only a truth value is required.
+        if (me.collapsed === true) {
+            return me.collapseDirection;
+        }
+        return me.collapsed;
+    },
+
+    getState: function() {
+        var me = this,
+            state = me.callParent(),
+            memento;
+
+        state = me.addPropertyToState(state, 'collapsed');
+
+        // If a collapse has taken place, use remembered values as the dimensions.
+        if (me.collapsed) {
+            memento = me.collapseMemento;
+            memento = memento && memento.data;
+
+            if (me.collapsedVertical()) {
+                if (state) {
+                    delete state.height;
+                }
+                if (memento) {
+                    state = me.addPropertyToState(state, 'height', memento.height);
+                }
+            } else {
+                if (state) {
+                    delete state.width;
+                }
+                if (memento) {
+                    state = me.addPropertyToState(state, 'width', memento.width);
+                }
+            }
+        }
+
+        return state;
+    },
+
+    findReExpander: function (direction) {
+        var me = this,
+            c = Ext.Component,
+            dockedItems = me.dockedItems.items,
+            dockedItemCount = dockedItems.length,
+            comp, i;
+            
+        // never use the header if we're in collapseMode mini
+        if (me.collapseMode === 'mini') {
+            return;
+        }
+
+        switch (direction) {
+            case c.DIRECTION_TOP:
+            case c.DIRECTION_BOTTOM:
+
+                // Attempt to find a reExpander Component (docked in a horizontal orientation)
+                // Also, collect all other docked items which we must hide after collapse. 
+                for (i = 0; i < dockedItemCount; i++) {
+                    comp = dockedItems[i];
+                    if (!comp.hidden) {
+                        if (comp.isHeader && (!comp.dock || comp.dock === 'top' || comp.dock === 'bottom')) {
+                            return comp;
+                        }
+                    }
+                }
+                break;
+
+            case c.DIRECTION_LEFT:
+            case c.DIRECTION_RIGHT:
+
+                // Attempt to find a reExpander Component (docked in a vecrtical orientation)
+                // Also, collect all other docked items which we must hide after collapse. 
+                for (i = 0; i < dockedItemCount; i++) {
+                    comp = dockedItems[i];
+                    if (!comp.hidden) {
+                        if (comp.isHeader && (comp.dock === 'left' || comp.dock === 'right')) {
+                            return comp;
+                        }
+                    }
+                }
+                break;
+
+            default:
+                throw('Panel#findReExpander must be passed a valid collapseDirection');
+        }
+    },
+
+    getReExpander: function (direction) {
+        var me = this,
+            collapseDir = direction || me.collapseDirection,
+            reExpander = me.reExpander || me.findReExpander(collapseDir);
+
+        me.expandDirection = me.getOppositeDirection(collapseDir);
+
+        if (!reExpander) {
+        // We did not find a Header of the required orientation: create one.
+            me.reExpander = reExpander = me.createReExpander(collapseDir, {
+                dock: collapseDir,
+                cls: Ext.baseCSSPrefix + 'docked ' + me.baseCls + '-' + me.ui + '-collapsed',
+                isCollapsedExpander: true
+            });
+
+            me.dockedItems.insert(0, reExpander);
+        }
+        return reExpander;
+    },
+
+    createReExpander: function(direction, defaults) {
+        var me = this,
+            isLeft = direction === 'left',
+            isRight = direction === 'right',
+            isVertical = isLeft || isRight,
+            result = Ext.apply({
+                hideMode: 'offsets',
+                title: me.title || ' ',
+                titleAlign: me.titleAlign,
+                orientation: isVertical ? 'vertical' : 'horizontal',
+                textCls: me.headerTextCls,
+                icon: me.icon,
+                iconCls: me.iconCls,
+                glyph: me.glyph,
+                baseCls: me.self.prototype.baseCls + '-header',
+                ui: me.ui,
+                frame: me.frame && me.frameHeader,
+                ignoreParentFrame: me.frame || me.overlapHeader,
+                indicateDrag: me.draggable,
+                collapseImmune: true,
+                ownerCt: me.ownerCt,
+                ownerLayout: me.componentLayout,
+                margin: me.margin
+            }, defaults);
+            
+        // If we're in mini mode, set the placeholder size to only 1px since
+        // we don't need it to show up.
+        if (me.collapseMode === 'mini') {
+            if (isVertical) {
+                result.width = 1;
+            } else {
+                result.height = 1;
+            }
+        }
+
+        // Create the re expand tool
+        // For UI consistency reasons, collapse:left reExpanders, and region: 'west' placeHolders
+        // have the re expand tool at the *top* with a bit of space.
+        if (!me.hideCollapseTool) {
+            if (isLeft || (isRight && me.isPlaceHolderCollapse())) {
+                // adjust the title position if the collapse tool needs to be at the
+                // top of a vertical header
+                result.titlePosition = 1;
+            }
+            result.tools = [{
+                xtype: 'tool',
+                type: 'expand-' + me.getOppositeDirection(direction),
+                uiCls: ['top'],
+                handler: me.toggleCollapse,
+                scope: me
+            }];
+        }
+        result = new Ext.panel.Header(result);
+        result.addClsWithUI(me.getHeaderCollapsedClasses(result));
+        return result;
+    },
+
+    // @private
+    // Create the class array to add to the Header when collpsed.
+    getHeaderCollapsedClasses: function(header) {
+        var me = this,
+            collapsedCls = me.collapsedCls,
+            collapsedClasses;
+
+        collapsedClasses = [ collapsedCls, collapsedCls + '-' + header.getDockName()];
+        if (me.border && (!me.frame || (me.frame && Ext.supports.CSS3BorderRadius))) {
+            collapsedClasses.push(collapsedCls + '-border-' + header.getDockName());
+        }
+        return collapsedClasses;
+    },
+
+    /**
+     * @private
+     * Called before the change from default, configured state into the collapsed state.
+     * This method may be called at render time to enable rendering in an initially collapsed state,
+     * or at runtime when an existing, fully layed out Panel may be collapsed.
+     * It basically saves configs which need to be clobbered for the duration of the collapsed state.
+     */
+    beginCollapse: function() {
+        var me = this,
+            lastBox = me.lastBox,
+            rendered = me.rendered,
+            collapseMemento = me.collapseMemento || (me.collapseMemento = new Ext.util.Memento(me)),
+            sizeModel = me.getSizeModel(),
+            header = me.header,
+            reExpander;
+
+        // When we collapse a panel, the panel is in control of one dimension (depending on
+        // collapse direction) and sets that on the component. We must restore the user's
+        // original value (including non-existance) when we expand. Using this technique, we
+        // mimic setCalculatedSize for the dimension we do not control and setSize for the
+        // one we do (only while collapsed).
+        // Additionally, the panel may have a shrink wrapped width and/or height. For shrinkWrapped
+        // panels this can be problematic, since a collapsed, shrink-wrapped panel has no way 
+        // of determining its width (or height if the collapse direction is horizontal). It is
+        // therefore necessary to capture both the width and height regardless of collapse direction.
+        // This allows us to set a configured width or height on the panel when it is collapsed,
+        // and it will be restored to an unconfigured-width shrinkWrapped state on expand.
+        collapseMemento.capture(['height', 'minHeight', 'width', 'minWidth']);
+        if (lastBox) {
+            collapseMemento.capture(me.restoreDimension(), lastBox, 'last.');
+        }
+        // If the panel has a shrinkWrapped height/width and is already rendered, configure its width/height as its calculated width/height,
+        // so that the collapsed header will have the same width or height as the panel did before it was collapsed.
+        // If the shrinkWrapped panel has not yet been rendered, as will be the case when a panel is initially configured with
+        // collapsed:true, we attempt to use the configured width/height, and fall back to minWidth or minHeight if
+        // width/height has not been configured, and fall back to a value of 100 if a minWidth/minHeight has not been configured.
+        if (me.collapsedVertical()) {
+            if (sizeModel.width.shrinkWrap) {
+                me.width = rendered ? me.getWidth() : me.width || me.minWidth || 100;
+            }
+            delete me.height;
+            me.minHeight = 0;
+        } else if (me.collapsedHorizontal()) {
+            if (sizeModel.height.shrinkWrap) {
+                me.height = rendered ? me.getHeight() : me.height || me.minHeight || 100;
+            }
+            delete me.width;
+            me.minWidth = 0;
+        }
+
+        if (me.ownerCt) {
+            me.ownerCt.getLayout().beginCollapse(me);
+        }
+
+        // Get a reExpander header. This will return the Panel Header if the Header is in the correct orientation
+        // If we are using the Header as the reExpander, change its UI to collapsed state
+        if (!me.isPlaceHolderCollapse() && header !== false) {
+            if (header === (reExpander = me.getReExpander())) {
+                header.collapseImmune = true;
+                header.getHierarchyState().collapseImmune = true;
+                header.addClsWithUI(me.getHeaderCollapsedClasses(header));
+
+                // Ensure that the reExpander has the correct framing applied.
+                if (header.rendered) {
+                    header.updateFrame();
+                }
+            } else if (reExpander.el) {
+                // We're going to use a temporary reExpander: show it.
+                reExpander.el.show();
+                reExpander.hidden = false;
+            }
+        }
+        if (me.resizer) {
+            me.resizer.disable();
+        }
+    },
+
+    beginExpand: function() {
+        var me = this,
+            lastBox = me.lastBox,
+            collapseMemento = me.collapseMemento,
+            restoreDimension = this.restoreDimension(),
+            header = me.header,
+            reExpander;
+
+        if (collapseMemento) {
+            collapseMemento.restore(['minHeight', 'minWidth', restoreDimension]);
+            if (lastBox) {
+                collapseMemento.restore(restoreDimension, true, lastBox, 'last.');
+            }
+        }
+
+        if (me.ownerCt) {
+            me.ownerCt.getLayout().beginExpand(me);
+        }
+
+        if (!me.isPlaceHolderCollapse() && header !== false) {
+            // If we have been using our Header as the reExpander then restore the Header to expanded UI
+            if (header === (reExpander = me.getReExpander())) {
+                delete header.collapseImmune;
+                delete header.getHierarchyState().collapseImmune;
+                header.removeClsWithUI(me.getHeaderCollapsedClasses(header));
+
+                // Ensure that the reExpander has the correct framing applied.
+                if (header.rendered) {
+                    header.expanding = true;
+                    header.updateFrame();
+                    delete header.expanding;
+                }
+            } else {
+                // We've been using a temporary reExpander: hide it.
+                reExpander.hidden = true;
+                reExpander.el.hide();
+            }
+        }
+        if (me.resizer) {
+            me.resizer.enable();
+        }
+    },
+
+    /**
+     * Collapses the panel body so that the body becomes hidden. Docked Components parallel to the border towards which
+     * the collapse takes place will remain visible. Fires the {@link #beforecollapse} event which will cancel the
+     * collapse action if it returns false.
+     *
+     * @param {String} [direction] The direction to collapse towards. Must be one of
+     *
+     *   - Ext.Component.DIRECTION_TOP
+     *   - Ext.Component.DIRECTION_RIGHT
+     *   - Ext.Component.DIRECTION_BOTTOM
+     *   - Ext.Component.DIRECTION_LEFT
+     *
+     * Defaults to {@link #collapseDirection}.
+     *
+     * @param {Boolean} [animate] True to animate the transition, else false
+     * (defaults to the value of the {@link #animCollapse} panel config). May
+     * also be specified as the animation duration in milliseconds.
+     * @return {Ext.panel.Panel} this
+     */
+    collapse: function(direction, animate) {
+        var me = this,
+            collapseDir = direction || me.collapseDirection,
+            ownerCt = me.ownerCt;
+
+        if (me.isCollapsingOrExpanding) {
+            return me;
+        }
+
+        if (arguments.length < 2) {
+            animate = me.animCollapse;
+        }
+
+        if (me.collapsed || me.fireEvent('beforecollapse', me, direction, animate) === false) {
+            return me;
+        }
+
+        if (ownerCt && me.isPlaceHolderCollapse()) {
+            return me.placeholderCollapse(direction, animate);
+        }
+
+        me.collapsed = collapseDir;
+        me.beginCollapse();
+
+        me.getHierarchyState().collapsed = true;
+        me.fireHierarchyEvent('collapse');
+
+        return me.doCollapseExpand(1, animate);
+    },
+
+    doCollapseExpand: function (flags, animate) {
+        var me = this,
+            originalAnimCollapse = me.animCollapse,
+            ownerLayout = me.ownerLayout;
+
+        // we need to temporarily set animCollapse to the animate value here because ContextItem
+        // uses the animCollapse property to determine if the collapse/expand should be animated
+        me.animCollapse = animate;
+
+        // Flag used by the layout ContextItem to impose an animation policy based upon the
+        // collapse direction and the animCollapse setting.
+        me.isCollapsingOrExpanding = flags;
+
+        // The x-animating-size class sets overflow:hidden so that overflowing
+        // content is clipped during animation.
+        if (animate) {
+            me.addCls(Ext.baseCSSPrefix + 'animating-size');
+        }
+
+        if (ownerLayout && !animate) {
+            ownerLayout.onContentChange(me);
+        } else {
+            me.updateLayout({ isRoot: true });
+        }
+
+        // set animCollapse back to its original value
+        me.animCollapse = originalAnimCollapse;
+
+        return me;
+    },
+
+    /**
+     * Invoked after the Panel is Collapsed.
+     *
+     * @param {Boolean} animated
+     *
+     * @template
+     * @protected
+     */
+    afterCollapse: function(animated) {
+        var me = this,
+            ownerLayout = me.ownerLayout;
+
+        me.isCollapsingOrExpanding = 0;
+        me.updateCollapseTool();
+
+        // The x-animating-size class sets overflow:hidden so that overflowing
+        // content is clipped during animation.
+        if (animated) {
+            me.removeCls(Ext.baseCSSPrefix + 'animating-size');
+        }
+
+        if (ownerLayout && animated) {
+            ownerLayout.onContentChange(me);
+        }
+
+        me.setHiddenDocked();
+        me.fireEvent('collapse', me);
+    },
+    
+    setHiddenDocked: function(){
+        // Hide Panel content except reExpander using visibility to prevent focusing of contained elements.
+        // Track what we hide to re-show on expand
+        var me = this,
+            toHide = me.hiddenOnCollapse,
+            items = me.getDockedItems(),
+            len = items.length,
+            i = 0,
+            item, reExpander;
+            
+        if (me.header !== false) {
+            reExpander = me.getReExpander();
+        }
+            
+        toHide.add(me.body);
+        for (; i < len; i++) {
+            item = items[i];
+            if (item && item !== reExpander && item.el) {
+                toHide.add(item.el);
+            }
+        }
+        toHide.setStyle('visibility', 'hidden');
+    },
+    
+    restoreHiddenDocked: function(){
+        var toShow = this.hiddenOnCollapse;
+        // Re-show Panel content which was hidden after collapse.
+        toShow.setStyle('visibility', '');
+        toShow.clear();
+    },
+
+    getPlaceholder: function(direction) {
+        var me = this,
+            collapseDir = direction || me.collapseDirection,
+            listeners = null,
+            placeholder = me.placeholder,
+            floatable = me.floatable,
+            titleCollapse = me.titleCollapse;
+
+        if (!placeholder) {
+            if (floatable || (me.collapsible && titleCollapse)) {
+                listeners = {
+                    click: {
+                        // titleCollapse needs to take precedence over floatable
+                        fn: (!titleCollapse && floatable) ? me.floatCollapsedPanel : me.toggleCollapse,
+                        element: 'el',
+                        scope: me
+                    }
+                };
+            }
+
+            me.placeholder = placeholder = Ext.widget(me.createReExpander(collapseDir, {
+                id: me.id + '-placeholder',
+                listeners: listeners
+            }));
+        }
+
+        // User created placeholder was passed in
+        if (!placeholder.placeholderFor) {
+            // Handle the case of a placeholder config
+            if (!placeholder.isComponent) {
+                me.placeholder = placeholder = me.lookupComponent(placeholder);
+            }
+            Ext.applyIf(placeholder, {
+                margins: me.margins,
+                placeholderFor: me
+            });
+
+            placeholder.addCls([Ext.baseCSSPrefix + 'region-collapsed-placeholder', Ext.baseCSSPrefix + 'region-collapsed-' + collapseDir + '-placeholder', me.collapsedCls]);
+        }
+
+        return placeholder;
+    },
+
+    placeholderCollapse: function(direction, animate) {
+        var me = this,
+            ownerCt = me.ownerCt,
+            collapseDir = direction || me.collapseDirection,
+            floatCls = Ext.baseCSSPrefix + 'border-region-slide-in',
+            placeholder = me.getPlaceholder(collapseDir),
+            slideInDirection;
+
+        me.isCollapsingOrExpanding = 1;
+
+        // Upcoming layout run will ignore this Component
+        me.setHiddenState(true);
+        me.collapsed = collapseDir;
+
+        if (placeholder.rendered) {
+            // We may have been added to another Container from that in which we rendered the placeholder
+            if (placeholder.el.dom.parentNode !== me.el.dom.parentNode) {
+                me.el.dom.parentNode.insertBefore(placeholder.el.dom, me.el.dom);
+            }
+
+            placeholder.hidden = false;
+            placeholder.el.show();
+            ownerCt.updateLayout();
+        } else {
+            ownerCt.insert(ownerCt.items.indexOf(me), placeholder);
+        }
+
+        if (me.rendered) {
+            // We MUST NOT hide using display because that resets all scroll information.
+            me.el.setVisibilityMode(me.placeholderCollapseHideMode);
+            if (animate) {
+                me.el.addCls(floatCls);
+                placeholder.el.hide();
+                slideInDirection = me.convertCollapseDir(collapseDir);
+
+                me.el.slideOut(slideInDirection, {
+                    preserveScroll: true,
+                    duration: Ext.Number.from(animate, Ext.fx.Anim.prototype.duration),
+                    listeners: {
+                        afteranimate: function() {
+                            me.el.removeCls(floatCls);
+                            /* We need to show the element so that slideIn will work correctly. However, if we leave it
+                               visible then it can be seen before the animation starts, causing a flicker. The solution,
+                               borrowed from date picker, is to hide it using display none. The slideIn effect includes
+                               a call to fixDisplay() that will undo the display none at the appropriate time.
+                             */
+                            placeholder.el.show().setStyle('display', 'none').slideIn(slideInDirection, {
+                                easing: 'linear',
+                                duration: 100,
+                                listeners: {
+                                    afteranimate: function() {
+                                        placeholder.focus();
+                                        me.isCollapsingOrExpanding = 0;
+                                        me.fireEvent('collapse', me);
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+            } else {
+                me.el.hide();
+                me.isCollapsingOrExpanding = 0;
+                me.fireEvent('collapse', me);
+            }
+        } else {
+            me.isCollapsingOrExpanding = 0;
+            if (!me.preventCollapseFire) {
+                me.fireEvent('collapse', me);
+            }
+        }
+
+        return me;
+    },
+
+    floatCollapsedPanel: function() {
+        var me = this,
+            placeholder = me.placeholder,
+            ps = placeholder.getSize(),
+            myBox,
+            floatCls = Ext.baseCSSPrefix + 'border-region-slide-in',
+            collapsed = me.collapsed,
+            layoutOwner = me.ownerCt || me,
+            slideDirection;
+
+        if (me.isSliding) {
+            return;
+        }
+
+        // Already floated
+        if (me.el.hasCls(floatCls)) {
+            me.slideOutFloatedPanel();
+            return;
+        }
+        me.isSliding = true;
+
+        // Lay out in fully expanded mode to ensure we are at the correct size, and collect our expanded box
+        placeholder.el.hide();
+        placeholder.hidden = true;
+        me.el.show();
+        me.setHiddenState(false);
+        me.collapsed = false;
+        layoutOwner.updateLayout();
+        myBox = me.getBox(false, true);
+
+        // Then go back immediately to collapsed state from which to initiate the float into view.
+        placeholder.el.show();
+        placeholder.hidden = false;
+        me.el.hide();
+        me.setHiddenState(true);
+        me.collapsed = collapsed;
+        layoutOwner.updateLayout();
+
+        me.slideOutTask = me.slideOutTask || new Ext.util.DelayedTask(me.slideOutFloatedPanel, me);
+        placeholder.el.on('mouseleave', me.onMouseLeaveFloated, me);
+        me.el.on('mouseleave', me.onMouseLeaveFloated, me);
+        placeholder.el.on('mouseenter', me.onMouseEnterFloated, me);
+        me.el.on('mouseenter', me.onMouseEnterFloated, me);
+
+        me.el.addCls(floatCls);
+        me.floated = true;
+
+        // Hide collapse tool in header if there is one (we might be headerless)
+        if (me.collapseTool) {
+            me.collapseTool.el.hide();
+        }
+
+        switch (me.collapsed) {
+            case 'top':
+                me.setLocalXY(myBox.x, myBox.y + ps.height - 1);
+                break;
+            case 'right':
+                me.setLocalXY(myBox.x - ps.width + 1, myBox.y);
+                break;
+            case 'bottom':
+                me.setLocalXY(myBox.x, myBox.y - ps.height + 1);
+                break;
+            case 'left':
+                me.setLocalXY(myBox.x + ps.width - 1, myBox.y);
+                break;
+        }
+        slideDirection = me.convertCollapseDir(me.collapsed);
+
+        // Remember how we are really collapsed so we can restore it, but also so we can
+        // become a layoutRoot while we are floated:
+        me.floatedFromCollapse = me.collapsed;
+        me.collapsed = false;
+        me.setHiddenState(false);
+
+        me.el.slideIn(slideDirection, {
+            preserveScroll: true,
+            duration: Ext.Number.from(me.animCollapse, Ext.fx.Anim.prototype.duration),
+            listeners: {
+                afteranimate: function() {
+                    me.isSliding = false;
+                    me.fireEvent('float', me);
+                }
+            }
+        });
+    },
+
+    onMouseLeaveFloated: function(e) {
+        this.slideOutTask.delay(500);
+    },
+
+    onMouseEnterFloated: function(e) {
+        this.slideOutTask.cancel();
+    },
+
+    isLayoutRoot: function() {
+        if (this.floatedFromCollapse) {
+            return true;
+        }
+        return this.callParent();
+    },
+
+    slideOutFloatedPanel: function() {
+        var me = this,
+            compEl = this.el,
+            collapseDirection;
+
+        if (me.isSliding || me.isDestroyed) {
+            return;
+        }
+
+        me.isSliding = true;
+        me.floated = false;
+
+        me.slideOutFloatedPanelBegin();
+
+        if (typeof me.collapsed == 'string') {
+            collapseDirection = me.convertCollapseDir(me.collapsed);
+        }
+
+        compEl.slideOut(collapseDirection, {
+            preserveScroll: true,
+            duration: Ext.Number.from(me.animCollapse, Ext.fx.Anim.prototype.duration),
+            listeners: {
+                afteranimate: function() {
+                    me.slideOutFloatedPanelEnd();
+                    // this would be in slideOutFloatedPanelEnd except that the only other
+                    // caller removes this cls later
+                    me.el.removeCls(Ext.baseCSSPrefix + 'border-region-slide-in');
+                }
+            }
+        });
+    },
+
+    /**
+     * This method begins the slide out of the floated panel.
+     * @private
+     */
+    slideOutFloatedPanelBegin: function() {
+        var me = this,
+            placeholderEl = me.placeholder.el,
+            el = me.el;
+
+        me.collapsed = me.floatedFromCollapse;
+        me.setHiddenState(true);
+        me.floatedFromCollapse = null;
+
+        // Remove mouse leave/enter monitors
+        placeholderEl.un('mouseleave', me.onMouseLeaveFloated, me);
+        el.un('mouseleave', me.onMouseLeaveFloated, me);
+        placeholderEl.un('mouseenter', me.onMouseEnterFloated, me);
+        el.un('mouseenter', me.onMouseEnterFloated, me);
+    },
+
+    /**
+     * This method cleans up after the slide out of the floated panel.
+     * @private
+     */
+    slideOutFloatedPanelEnd: function() {
+        var me = this;
+
+        if (me.collapseTool) {
+            me.collapseTool.el.show();
+        }
+        me.slideOutTask.cancel();
+        me.isSliding = false;
+        me.fireEvent('unfloat', me);
+    },
+
+    /**
+     * Expands the panel body so that it becomes visible.  Fires the {@link #beforeexpand} event which will
+     * cancel the expand action if it returns false.
+     * @param {Boolean} [animate] True to animate the transition, else false
+     * (defaults to the value of the {@link #animCollapse} panel config).  May
+     * also be specified as the animation duration in milliseconds.
+     * @return {Ext.panel.Panel} this
+     */
+    expand: function(animate) {
+        var me = this;
+
+        if (me.isCollapsingOrExpanding) {
+            return me;
+        }
+
+        if (!arguments.length) {
+            animate = me.animCollapse;
+        }
+
+        if (!me.collapsed && !me.floatedFromCollapse) {
+            return me;
+        }
+
+        if (me.fireEvent('beforeexpand', me, animate) === false) {
+            return me;
+        }
+
+        delete this.getHierarchyState().collapsed;
+
+        if (me.isPlaceHolderCollapse()) {
+            return me.placeholderExpand(animate);
+        }
+
+        me.restoreHiddenDocked();
+        me.beginExpand();
+        me.collapsed = false;
+
+        return me.doCollapseExpand(2, animate);
+    },
+
+    placeholderExpand: function(animate) {
+        var me = this,
+            collapseDir = me.collapsed,
+            floatCls = Ext.baseCSSPrefix + 'border-region-slide-in',
+            finalPos,
+            floatedPos,
+            center = me.ownerLayout ? me.ownerLayout.centerRegion: null;
+
+        // Layouts suspended - don't bother with animation shenanigans
+        if (Ext.AbstractComponent.layoutSuspendCount) {
+            animate = false;
+        }
+
+        if (me.floatedFromCollapse) {
+            floatedPos = me.getPosition(true);
+            // these are the same cleanups performed by the normal slideOut mechanism:
+            me.slideOutFloatedPanelBegin();
+            me.slideOutFloatedPanelEnd();
+            me.floated = false;
+        }
+
+        if (animate) {
+
+            // Expand me and hide the placeholder
+            Ext.suspendLayouts();
+            me.placeholder.hide();
+            me.el.show();
+            me.collapsed = false;
+            me.setHiddenState(false);
+
+            // Stop the center region from moving when layed out without the placeholder there.
+            // Unless we are expanding from a floated out situation. In that case, it's layed out immediately.
+            if (center && !floatedPos) {
+                center.hidden = true;
+            }
+
+            Ext.resumeLayouts(true);
+            center.hidden = false;
+            me.el.addCls(floatCls);
+
+            // At this point, this Panel is arranged in its correct, expanded layout.
+            // The center region has not been affected because it has been flagged as hidden.
+            //
+            // If we are proceeding from floated, the center region has also been arranged
+            // in its new layout to accommodate this expansion, so no further layout is needed, just
+            // element animation.
+            //
+            // If we are proceeding from fully collapsed, the center region has *not* been relayed out because
+            // the UI look and feel dictates that it stays stable until the expanding panel has slid in all the
+            // way, and *then* it snaps into place.
+
+            me.isCollapsingOrExpanding = 2;
+
+            // Floated, move it back to the floated pos, and thence into the correct place
+            if (floatedPos) {
+                finalPos = me.getXY();
+                me.setLocalXY(floatedPos[0], floatedPos[1]);
+                me.setXY([finalPos[0], finalPos[1]], {
+                    duration: Ext.Number.from(animate, Ext.fx.Anim.prototype.duration),
+                    listeners: {
+                        afteranimate: function() {
+                            me.el.removeCls(floatCls);
+                            me.isCollapsingOrExpanding = 0;
+                            me.fireEvent('expand', me);
+                        }
+                    }
+                });
+            }
+            // Not floated, slide it in to the correct place
+            else {
+                me.el.hide();
+                me.placeholder.el.show();
+                me.placeholder.hidden = false;
+
+                // Slide this Component's el back into place, after which we lay out AGAIN
+                me.setHiddenState(false);
+                me.el.slideIn(me.convertCollapseDir(collapseDir), {
+                    preserveScroll: true,
+                    duration: Ext.Number.from(animate, Ext.fx.Anim.prototype.duration),
+                    listeners: {
+                        afteranimate: function() {
+                            // the ordering of these two lines appears to be important in
+                            // IE9.  There is an odd expand issue in IE 9 in the border layout
+                            // example that causes the index1 child of the south dock region
+                            // to get 'hidden' after a collapse / expand cycle.  See
+                            // EXTJSIV-5318 for details
+                            me.el.removeCls(floatCls);
+                            me.placeholder.hide();
+
+                            // The center region has been left in its larger size, so a layout is needed now
+                            me.updateLayout();
+
+                            me.isCollapsingOrExpanding = 0;
+                            me.fireEvent('expand', me);
+                        }
+                    }
+                });
+            }
+
+        } else {
+            me.floated = me.collapsed = false;
+            me.el.removeCls(floatCls);
+            Ext.suspendLayouts();
+            me.placeholder.hide();
+            me.show();
+            Ext.resumeLayouts(true);
+            me.fireEvent('expand', me);
+        }
+
+        return me;
+    },
+
+    /**
+     * Invoked after the Panel is Expanded.
+     *
+     * @param {Boolean} animated
+     *
+     * @template
+     * @protected
+     */
+    afterExpand: function(animated) {
+        var me = this,
+            ownerLayout = me.ownerLayout;
+
+        me.isCollapsingOrExpanding = 0;
+        me.updateCollapseTool();
+
+        // The x-animating-size class sets overflow:hidden so that overflowing
+        // content is clipped during animation.
+        if (animated) {
+            me.removeCls(Ext.baseCSSPrefix + 'animating-size');
+        }
+
+        if (ownerLayout && animated) {
+            ownerLayout.onContentChange(me);
+        }
+
+        me.fireEvent('expand', me);
+        me.fireHierarchyEvent('expand');
+    },
+    
+    // @inheritdoc
+    setBorder: function(border, targetEl) {
+        if (targetEl) {
+            // skip out here, the panel will set the border on the body/header during rendering
+            return;
+        }
+        
+        var me = this,
+            header = me.header;
+            
+        if (!border) {
+            border = 0;
+        } else if (border === true) {
+            border = '1px';
+        } else {
+            border = me.unitizeBox(border);
+        }
+        
+        if (header) {
+            if (header.isHeader) {
+                header.setBorder(border);
+            } else {
+                header.border = border;
+            }
+        }
+        
+        if (me.rendered && me.bodyBorder !== false) {
+            me.body.setStyle('border-width', border);
+        }
+        me.updateLayout();
+        
+        me.border = border;
+    },
+
+    /**
+     * Shortcut for performing an {@link #method-expand} or {@link #method-collapse} based on the current state of the panel.
+     * @return {Ext.panel.Panel} this
+     */
+    toggleCollapse: function() {
+        return (this.collapsed || this.floatedFromCollapse) ? this.expand() : this.collapse();
+    },
+
+    // @private
+    getKeyMap : function() {
+        return this.keyMap || (this.keyMap = new Ext.util.KeyMap(Ext.apply({
+            target: this.el
+        }, this.keys)));
+    },
+
+    // @private
+    initDraggable : function() {
+        
+        // For just simple dragging like Windows
+        if (this.simpleDrag) {
+            this.initSimpleDraggable();
+        }
+        // For DD package aware dragging of Panels
+        else {
+            /**
+             * @property {Ext.dd.DragSource/Ext.util.ComponentDragger} dd
+             *
+             * Only present if this Panel has been configured with {@link #cfg-draggable} `true`.
+             *
+             * ##Simple dragging##
+             *
+             * If this Panel is configured {@link #cfg-simpleDrag} `true` (the default is `false`), this property
+             * will reference an instance of {@link Ext.util.ComponentDragger} (A subclass of
+             * {@link Ext.dd.DragTracker DragTracker}) which handles moving the Panel's DOM Element,
+             * and constraining according to the {@link #constrain} and {@link #constrainHeader} .
+             *
+             * This object fires various events during its lifecycle and during a drag operation.
+             * 
+             * ##Complex dragging interacting with other DragDrop instances##
+             *
+             * By default, this property in a {@link #cfg-draggable} Panel will contain an instance of {@link
+             * Ext.dd.DragSource} which handles dragging the Panel.
+             *
+             * The developer must provide implementations of the abstract methods of {@link Ext.dd.DragSource} in order to
+             * supply behaviour for each stage of the drag/drop process. See {@link #cfg-draggable}.
+             */
+            this.dd = new Ext.panel.DD(this, Ext.isBoolean(this.draggable) ? null : this.draggable);
+        }
+    },
+
+    /**
+     * @private
+     * Override Component.initDraggable.
+     * Panel (and subclasses) use the header element as the delegate.
+     */
+    initSimpleDraggable: function() {
+        var me = this,
+            ddConfig, dd;
+
+        if (!me.header) {
+            me.updateHeader(true);
+        }
+
+        /*
+         * Check the header here again. If for whatever reason it wasn't created in
+         * updateHeader (we were configured with header: false) then we'll just ignore the rest since the
+         * header acts as the drag handle.
+         */
+        if (me.header) {
+            ddConfig = Ext.applyIf({
+                el: me.el,
+                delegate: '#' + Ext.escapeId(me.header.id)
+            }, me.draggable);
+
+            // Add extra configs if Window is specified to be constrained
+            if (me.constrain || me.constrainHeader) {
+                ddConfig.constrain = me.constrain;
+                ddConfig.constrainDelegate = me.constrainHeader;
+                ddConfig.constrainTo = me.constrainTo || me.container;
+            }
+
+            dd = me.dd = new Ext.util.ComponentDragger(this, ddConfig);
+            me.relayEvents(dd, ['dragstart', 'drag', 'dragend']);
+            if (me.maximized) {
+                dd.disable();
+            }
+        }
+    },
+    
+    // @private
+    // helper function for ghost
+    ghostTools : function() {
+        var tools = [],
+            header = this.header,
+            headerTools = header ? header.query('tool[hidden=false]') : [],
+            t, tLen, tool;
+
+        if (headerTools.length) {
+            t = 0;
+            tLen = headerTools.length;
+
+            for (; t < tLen; t++) {
+                tool = headerTools[t];
+
+                // Some tools can be full components, and copying them into the ghost
+                // actually removes them from the owning panel. You could also potentially
+                // end up with duplicate DOM ids as well. To avoid any issues we just make
+                // a simple bare-minimum clone of each tool for ghosting purposes.
+                tools.push({
+                    type: tool.type
+                });
+            }
+        } else {
+            tools = [{
+                type: 'placeholder'
+            }];
+        }
+        return tools;
+    },
+
+    // @private
+    // used for dragging
+    ghost: function(cls) {
+        var me = this,
+            ghostPanel = me.ghostPanel,
+            box = me.getBox(),
+            header;
+
+        if (!ghostPanel) {
+            ghostPanel = new Ext.panel.Panel({
+                renderTo: Ext.getBody(),
+                floating: {
+                    shadow: false
+                },
+                frame: me.frame && !me.alwaysFramed,
+                alwaysFramed: me.alwaysFramed,
+                overlapHeader: me.overlapHeader,
+                headerPosition: me.headerPosition,
+                baseCls: me.baseCls,
+                cls: me.baseCls + '-ghost ' + (cls ||'')
+            });
+            me.ghostPanel = ghostPanel;
+        } else {
+            ghostPanel.el.show();
+        }
+        me.ghostPanel.hidden = false;
+        ghostPanel.floatParent = me.floatParent;
+        if (me.floating) {
+            ghostPanel.zIndexManager.assignZIndices();
+        } else {
+            ghostPanel.toFront();
+        }
+        if (!(me.preventHeader || (me.header === false))) {
+            header = ghostPanel.header;
+            // restore options
+            if (header) {
+                header.suspendLayouts();
+                Ext.Array.forEach(header.query('tool'), header.remove, header);
+                header.resumeLayouts();
+            }
+            ghostPanel.addTool(me.ghostTools());
+            ghostPanel.setTitle(me.title);
+
+            if (me.iconCls) {
+                ghostPanel.setIconCls(me.iconCls);
+            } else if (me.icon) {
+                ghostPanel.setIcon(me.icon);
+            } else if (me.glyph) {
+                ghostPanel.setGlyph(me.glyph);
+            }
+            
+            ghostPanel.header.addCls(Ext.baseCSSPrefix + 'header-ghost');
+        }
+
+        ghostPanel.setPagePosition(box.x, box.y);
+        ghostPanel.setSize(box.width, box.height);
+        me.el.hide();
+        return ghostPanel;
+    },
+
+    // @private
+    unghost: function(show, matchPosition) {
+        var me = this;
+        if (!me.ghostPanel) {
+            return;
+        }
+        if (show !== false) {
+            // Show el first, so that position adjustment in setPagePosition
+            // will work when relative positioned elements have their XY read.
+            me.el.show();
+            if (matchPosition !== false) {
+                me.setPagePosition(me.ghostPanel.getXY());
+                if (me.hideMode == 'offsets') {
+                    // clear the hidden style because we just repositioned
+                    delete me.el.hideModeStyles;
+                }
+            }
+            Ext.defer(me.focus, 10, me);
+        }
+        me.ghostPanel.el.hide();
+        me.ghostPanel.hidden = true;
+    },
+
+    beginDrag: function() {
+        if (this.floatingDescendants) {
+            this.floatingDescendants.hide();
+        }
+    },
+
+    endDrag: function() {
+        if (this.floatingDescendants) {
+            this.floatingDescendants.show();
+        }
+    },
+
+    initResizable: function() {
+        this.callParent(arguments);
+        if (this.collapsed) {
+            this.resizer.disable();
+        }
+    },
+
+    /**
+     * converts a collapsdDir into an anchor argument for Element.slideIn
+     * overridden in rtl mode to switch "l" and "r"
+     */
+    convertCollapseDir: function(collapseDir) {
+        return collapseDir.substr(0, 1);
+    }
+}, function() {
+    this.prototype.animCollapse = Ext.enableFx;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is the base class for {@link Ext.tip.QuickTip} and {@link Ext.tip.ToolTip} that provides the basic layout and
+ * positioning that all tip-based classes require. This class can be used directly for simple, statically-positioned
+ * tips that are displayed programmatically, or it can be extended to provide custom tip implementations.
+ * @xtype tip
+ */
+Ext.define('Ext.tip.Tip', {
+    extend:  Ext.panel.Panel ,
+
+    alternateClassName: 'Ext.Tip',
+
+    /**
+     * @cfg {Boolean} [closable=false]
+     * True to render a close tool button into the tooltip header.
+     */
+    
+    /**
+     * @cfg {Number} [width='auto']
+     * Width in pixels of the tip.  Width will be ignored if it
+     * exceeds the bounds of {@link #minWidth} or {@link #maxWidth}.
+     */
+    
+    /**
+     * @cfg {Number} minWidth
+     * The minimum width of the tip in pixels.
+     */
+    minWidth : 40,
+    /**
+     * @cfg {Number} maxWidth
+     * The maximum width of the tip in pixels.  The maximum supported value is 500.
+     */
+    maxWidth : 500,
+    /**
+     * @cfg {Boolean/String} shadow
+     * `true` or "sides" for the default effect, "frame" for 4-way shadow, and "drop"
+     * for bottom-right shadow.
+     */
+    shadow : "sides",
+
+    /**
+     * @cfg {String} defaultAlign
+     * **Experimental**. The default {@link Ext.util.Positionable#alignTo} anchor position value
+     * for this tip relative to its element of origin.
+     */
+    defaultAlign : "tl-bl?",
+    /**
+     * @cfg {Boolean} constrainPosition
+     * If `true`, then the tooltip will be automatically constrained to stay within
+     * the browser viewport.
+     */
+    constrainPosition : true,
+
+    // private panel overrides
+    autoRender: true,
+    hidden: true,
+    baseCls: Ext.baseCSSPrefix + 'tip',
+    floating: {
+        shadow: true,
+        shim: true
+    },
+    focusOnToFront: false,
+
+    /**
+     * @cfg {String} closeAction
+     * The action to take when the close header tool is clicked:
+     *
+     * - **{@link #method-destroy}** : {@link #method-remove remove} the window from the DOM and
+     *   {@link Ext.Component#method-destroy destroy} it and all descendant Components. The
+     *   window will **not** be available to be redisplayed via the {@link #method-show} method.
+     *
+     * - **{@link #method-hide}** : **Default.** {@link #method-hide} the window by setting visibility
+     *   to hidden and applying negative offsets. The window will be available to be
+     *   redisplayed via the {@link #method-show} method.
+     *
+     * **Note:** This behavior has changed! setting *does* affect the {@link #method-close} method
+     * which will invoke the approriate closeAction.
+     */
+    closeAction: 'hide',
+
+    ariaRole: 'tooltip',
+
+    // Flag to Renderable to always look up the framing styles for this Component
+    alwaysFramed: true,
+
+    frameHeader: false,
+
+    initComponent: function() {
+        var me = this;
+
+        me.floating = Ext.apply( {}, {
+            shadow: me.shadow,
+            constrain: me.constrainPosition
+        }, me.self.prototype.floating);
+        me.callParent(arguments);
+
+        // Or in the deprecated config. Floating.doConstrain only constrains if the constrain property is truthy.
+        me.constrain = me.constrain || me.constrainPosition;
+    },
+
+    /**
+     * Shows this tip at the specified XY position.  Example usage:
+     *
+     *     // Show the tip at x:50 and y:100
+     *     tip.showAt([50,100]);
+     *
+     * @param {Number[]} xy An array containing the x and y coordinates
+     */
+    showAt : function(xy){
+        var me = this;
+        this.callParent(arguments);
+        // Show may have been vetoed.
+        if (me.isVisible()) {
+            me.setPagePosition(xy[0], xy[1]);
+            if (me.constrainPosition || me.constrain) {
+                me.doConstrain();
+            }
+            me.toFront(true);
+        }
+    },
+
+    /**
+     * @private
+     * Set Tip draggable using base Component's draggability.
+     */
+    initDraggable : function(){
+        var me = this;
+        me.draggable = {
+            el: me.getDragEl(),
+            delegate: me.header.el,
+            constrain: me,
+            constrainTo: me.el.dom.parentNode
+        };
+        // Important: Bypass Panel's initDraggable. Call direct to Component's implementation.
+        Ext.Component.prototype.initDraggable.call(me);
+    },
+
+    // Tip does not ghost. Drag is "live"
+    ghost: undefined,
+    unghost: undefined
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * ToolTip is a {@link Ext.tip.Tip} implementation that handles the common case of displaying a
+ * tooltip when hovering over a certain element or elements on the page. It allows fine-grained
+ * control over the tooltip's alignment relative to the target element or mouse, and the timing
+ * of when it is automatically shown and hidden.
+ *
+ * This implementation does **not** have a built-in method of automatically populating the tooltip's
+ * text based on the target element; you must either configure a fixed {@link #html} value for each
+ * ToolTip instance, or implement custom logic (e.g. in a {@link #beforeshow} event listener) to
+ * generate the appropriate tooltip content on the fly. See {@link Ext.tip.QuickTip} for a more
+ * convenient way of automatically populating and configuring a tooltip based on specific DOM
+ * attributes of each target element.
+ *
+ * # Basic Example
+ *
+ *     var tip = Ext.create('Ext.tip.ToolTip', {
+ *         target: 'clearButton',
+ *         html: 'Press this button to clear the form'
+ *     });
+ *
+ * {@img Ext.tip.ToolTip/Ext.tip.ToolTip1.png Basic Ext.tip.ToolTip}
+ *
+ * # Delegation
+ *
+ * In addition to attaching a ToolTip to a single element, you can also use delegation to attach
+ * one ToolTip to many elements under a common parent. This is more efficient than creating many
+ * ToolTip instances. To do this, point the {@link #target} config to a common ancestor of all the
+ * elements, and then set the {@link #delegate} config to a CSS selector that will select all the
+ * appropriate sub-elements.
+ *
+ * When using delegation, it is likely that you will want to programmatically change the content
+ * of the ToolTip based on each delegate element; you can do this by implementing a custom
+ * listener for the {@link #beforeshow} event. Example:
+ *
+ *     var store = Ext.create('Ext.data.ArrayStore', {
+ *         fields: ['company', 'price', 'change'],
+ *         data: [
+ *             ['3m Co',                               71.72, 0.02],
+ *             ['Alcoa Inc',                           29.01, 0.42],
+ *             ['Altria Group Inc',                    83.81, 0.28],
+ *             ['American Express Company',            52.55, 0.01],
+ *             ['American International Group, Inc.',  64.13, 0.31],
+ *             ['AT&T Inc.',                           31.61, -0.48]
+ *         ]
+ *     });
+ *
+ *     var grid = Ext.create('Ext.grid.Panel', {
+ *         title: 'Array Grid',
+ *         store: store,
+ *         columns: [
+ *             {text: 'Company', flex: 1, dataIndex: 'company'},
+ *             {text: 'Price', width: 75, dataIndex: 'price'},
+ *             {text: 'Change', width: 75, dataIndex: 'change'}
+ *         ],
+ *         height: 200,
+ *         width: 400,
+ *         renderTo: Ext.getBody()
+ *     });
+ *     
+ *     var view = grid.getView();
+ *     var tip = Ext.create('Ext.tip.ToolTip', {
+ *         // The overall target element.
+ *         target: view.el,
+ *         // Each grid row causes its own separate show and hide.
+ *         delegate: view.itemSelector,
+ *         // Moving within the row should not hide the tip.
+ *         trackMouse: true,
+ *         // Render immediately so that tip.body can be referenced prior to the first show.
+ *         renderTo: Ext.getBody(),
+ *         listeners: {
+ *             // Change content dynamically depending on which element triggered the show.
+ *             beforeshow: function updateTipBody(tip) {
+ *                 tip.update('Over company "' + view.getRecord(tip.triggerElement).get('company') + '"');
+ *             }
+ *         }
+ *     });
+ *
+ * {@img Ext.tip.ToolTip/Ext.tip.ToolTip2.png Ext.tip.ToolTip with delegation}
+ *
+ * # Alignment
+ *
+ * The following configuration properties allow control over how the ToolTip is aligned relative to
+ * the target element and/or mouse pointer:
+ *
+ * - {@link #anchor}
+ * - {@link #anchorToTarget}
+ * - {@link #anchorOffset}
+ * - {@link #trackMouse}
+ * - {@link #mouseOffset}
+ *
+ * # Showing/Hiding
+ *
+ * The following configuration properties allow control over how and when the ToolTip is automatically
+ * shown and hidden:
+ *
+ * - {@link #autoHide}
+ * - {@link #showDelay}
+ * - {@link #hideDelay}
+ * - {@link #dismissDelay}
+ *
+ * @docauthor Jason Johnston <jason at sencha.com>
+ */
+Ext.define('Ext.tip.ToolTip', {
+    extend:  Ext.tip.Tip ,
+    alias: 'widget.tooltip',
+    alternateClassName: 'Ext.ToolTip',
+    /**
+     * @property {HTMLElement} triggerElement
+     * When a ToolTip is configured with the `{@link #delegate}`
+     * option to cause selected child elements of the `{@link #target}`
+     * Element to each trigger a separate show event, this property is set to
+     * the DOM element which triggered the show.
+     */
+    /**
+     * @cfg {HTMLElement/Ext.Element/String} target
+     * The target element or string id to monitor for mouseover events to trigger
+     * showing this ToolTip.
+     */
+    /**
+     * @cfg {Boolean} [autoHide=true]
+     * True to automatically hide the tooltip after the
+     * mouse exits the target element or after the `{@link #dismissDelay}`
+     * has expired if set.  If `{@link #closable} = true`
+     * a close tool button will be rendered into the tooltip header.
+     */
+    autoHide: true,
+    
+    /**
+     * @cfg {Number} showDelay
+     * Delay in milliseconds before the tooltip displays after the mouse enters the target element.
+     */
+    showDelay: 500,
+    /**
+     * @cfg {Number} hideDelay
+     * Delay in milliseconds after the mouse exits the target element but before the tooltip actually hides.
+     * Set to 0 for the tooltip to hide immediately.
+     */
+    hideDelay: 200,
+    /**
+     * @cfg {Number} dismissDelay
+     * Delay in milliseconds before the tooltip automatically hides. To disable automatic hiding, set
+     * dismissDelay = 0.
+     */
+    dismissDelay: 5000,
+    /**
+     * @cfg {Number[]} [mouseOffset=[15,18]]
+     * An XY offset from the mouse position where the tooltip should be shown.
+     */
+    /**
+     * @cfg {Boolean} trackMouse
+     * True to have the tooltip follow the mouse as it moves over the target element.
+     */
+    trackMouse: false,
+    /**
+     * @cfg {String} anchor
+     * If specified, indicates that the tip should be anchored to a
+     * particular side of the target element or mouse pointer ("top", "right", "bottom",
+     * or "left"), with an arrow pointing back at the target or mouse pointer. If
+     * {@link #constrainPosition} is enabled, this will be used as a preferred value
+     * only and may be flipped as needed.
+     */
+    /**
+     * @cfg {Boolean} anchorToTarget
+     * True to anchor the tooltip to the target element, false to anchor it relative to the mouse coordinates.
+     * When `anchorToTarget` is true, use `{@link #defaultAlign}` to control tooltip alignment to the
+     * target element.  When `anchorToTarget` is false, use `{@link #anchor}` instead to control alignment.
+     */
+    anchorToTarget: true,
+    /**
+     * @cfg {Number} anchorOffset
+     * A numeric pixel value used to offset the default position of the anchor arrow.  When the anchor
+     * position is on the top or bottom of the tooltip, `anchorOffset` will be used as a horizontal offset.
+     * Likewise, when the anchor position is on the left or right side, `anchorOffset` will be used as
+     * a vertical offset.
+     */
+    anchorOffset: 0,
+    /**
+     * @cfg {String} delegate
+     *
+     * A {@link Ext.DomQuery DomQuery} selector which allows selection of individual elements within the
+     * `{@link #target}` element to trigger showing and hiding the ToolTip as the mouse moves within the
+     * target.
+     *
+     * When specified, the child element of the target which caused a show event is placed into the
+     * `{@link #triggerElement}` property before the ToolTip is shown.
+     *
+     * This may be useful when a Component has regular, repeating elements in it, each of which need a
+     * ToolTip which contains information specific to that element.
+     *
+     * See the delegate example in class documentation of {@link Ext.tip.ToolTip}.
+     */
+
+    // @private
+    targetCounter: 0,
+    quickShowInterval: 250,
+
+    // @private
+    initComponent: function() {
+        var me = this;
+        me.callParent(arguments);
+        me.lastActive = new Date();
+        me.setTarget(me.target);
+        me.origAnchor = me.anchor;
+    },
+
+    // @private
+    onRender: function(ct, position) {
+        var me = this;
+        me.callParent(arguments);
+        me.anchorCls = Ext.baseCSSPrefix + 'tip-anchor-' + me.getAnchorPosition();
+        me.anchorEl = me.el.createChild({
+            cls: Ext.baseCSSPrefix + 'tip-anchor ' + me.anchorCls
+        });
+    },
+
+    /**
+     * Binds this ToolTip to the specified element. The tooltip will be displayed when the mouse moves over the element.
+     * @param {String/HTMLElement/Ext.Element} t The Element, HtmlElement, or ID of an element to bind to
+     */
+    setTarget: function(target) {
+        var me = this,
+            t = Ext.get(target),
+            tg;
+
+        if (me.target) {
+            tg = Ext.get(me.target);
+            me.mun(tg, 'mouseover', me.onTargetOver, me);
+            me.mun(tg, 'mouseout', me.onTargetOut, me);
+            me.mun(tg, 'mousemove', me.onMouseMove, me);
+        }
+
+        me.target = t;
+        if (t) {
+
+            me.mon(t, {
+                // TODO - investigate why IE6/7 seem to fire recursive resize in e.getXY
+                // breaking QuickTip#onTargetOver (EXTJSIV-1608)
+                freezeEvent: true,
+
+                mouseover: me.onTargetOver,
+                mouseout: me.onTargetOut,
+                mousemove: me.onMouseMove,
+                scope: me
+            });
+        }
+        if (me.anchor) {
+            me.anchorTarget = me.target;
+        }
+    },
+
+    // @private
+    onMouseMove: function(e) {
+        var me = this,
+            t = me.delegate ? e.getTarget(me.delegate) : me.triggerElement = true,
+            xy;
+        if (t) {
+            me.targetXY = e.getXY();
+            if (t === me.triggerElement) {
+                if (!me.hidden && me.trackMouse) {
+                    xy = me.getTargetXY();
+                    if (me.constrainPosition) {
+                        xy = me.el.adjustForConstraints(xy, me.el.parent());
+                    }
+                    me.setPagePosition(xy);
+                }
+            } else {
+                me.hide();
+                me.lastActive = new Date(0);
+                me.onTargetOver(e);
+            }
+        } else if ((!me.closable && me.isVisible()) && me.autoHide !== false) {
+            me.hide();
+        }
+    },
+
+    // @private
+    getTargetXY: function() {
+        var me = this,
+            mouseOffset,
+            offsets, xy, dw, dh, de, bd, scrollX, scrollY, axy, sz, constrainPosition;
+        if (me.delegate) {
+            me.anchorTarget = me.triggerElement;
+        }
+        if (me.anchor) {
+            me.targetCounter++;
+            offsets = me.getOffsets();
+            xy = (me.anchorToTarget && !me.trackMouse) ? me.getAlignToXY(me.anchorTarget, me.getAnchorAlign()) : me.targetXY;
+            dw = Ext.Element.getViewWidth() - 5;
+            dh = Ext.Element.getViewHeight() - 5;
+            de = document.documentElement;
+            bd = document.body;
+            scrollX = (de.scrollLeft || bd.scrollLeft || 0) + 5;
+            scrollY = (de.scrollTop || bd.scrollTop || 0) + 5;
+            axy = [xy[0] + offsets[0], xy[1] + offsets[1]];
+            sz = me.getSize();
+            constrainPosition = me.constrainPosition;
+
+            me.anchorEl.removeCls(me.anchorCls);
+
+            if (me.targetCounter < 2 && constrainPosition) {
+                if (axy[0] < scrollX) {
+                    if (me.anchorToTarget) {
+                        me.defaultAlign = 'l-r';
+                        if (me.mouseOffset) {
+                            me.mouseOffset[0] *= -1;
+                        }
+                    }
+                    me.anchor = 'left';
+                    return me.getTargetXY();
+                }
+                if (axy[0] + sz.width > dw) {
+                    if (me.anchorToTarget) {
+                        me.defaultAlign = 'r-l';
+                        if (me.mouseOffset) {
+                            me.mouseOffset[0] *= -1;
+                        }
+                    }
+                    me.anchor = 'right';
+                    return me.getTargetXY();
+                }
+                if (axy[1] < scrollY) {
+                    if (me.anchorToTarget) {
+                        me.defaultAlign = 't-b';
+                        if (me.mouseOffset) {
+                            me.mouseOffset[1] *= -1;
+                        }
+                    }
+                    me.anchor = 'top';
+                    return me.getTargetXY();
+                }
+                if (axy[1] + sz.height > dh) {
+                    if (me.anchorToTarget) {
+                        me.defaultAlign = 'b-t';
+                        if (me.mouseOffset) {
+                            me.mouseOffset[1] *= -1;
+                        }
+                    }
+                    me.anchor = 'bottom';
+                    return me.getTargetXY();
+                }
+            }
+
+            me.anchorCls = Ext.baseCSSPrefix + 'tip-anchor-' + me.getAnchorPosition();
+            me.anchorEl.addCls(me.anchorCls);
+            me.targetCounter = 0;
+            return axy;
+        } else {
+            mouseOffset = me.getMouseOffset();
+            return (me.targetXY) ? [me.targetXY[0] + mouseOffset[0], me.targetXY[1] + mouseOffset[1]] : mouseOffset;
+        }
+    },
+
+    getMouseOffset: function() {
+        var me = this,
+        offset = me.anchor ? [0, 0] : [15, 18];
+        if (me.mouseOffset) {
+            offset[0] += me.mouseOffset[0];
+            offset[1] += me.mouseOffset[1];
+        }
+        return offset;
+    },
+
+    // @private
+    getAnchorPosition: function() {
+        var me = this,
+            m;
+        if (me.anchor) {
+            me.tipAnchor = me.anchor.charAt(0);
+        } else {
+            m = me.defaultAlign.match(/^([a-z]+)-([a-z]+)(\?)?$/);
+            if (!m) {
+                Ext.Error.raise('The AnchorTip.defaultAlign value "' + me.defaultAlign + '" is invalid.');
+            }
+            me.tipAnchor = m[1].charAt(0);
+        }
+
+        switch (me.tipAnchor) {
+        case 't':
+            return 'top';
+        case 'b':
+            return 'bottom';
+        case 'r':
+            return 'right';
+        }
+        return 'left';
+    },
+
+    // @private
+    getAnchorAlign: function() {
+        switch (this.anchor) {
+        case 'top':
+            return 'tl-bl';
+        case 'left':
+            return 'tl-tr';
+        case 'right':
+            return 'tr-tl';
+        default:
+            return 'bl-tl';
+        }
+    },
+
+    // @private
+    getOffsets: function() {
+        var me = this,
+            mouseOffset,
+            offsets,
+            ap = me.getAnchorPosition().charAt(0);
+        if (me.anchorToTarget && !me.trackMouse) {
+            switch (ap) {
+            case 't':
+                offsets = [0, 9];
+                break;
+            case 'b':
+                offsets = [0, -13];
+                break;
+            case 'r':
+                offsets = [ - 13, 0];
+                break;
+            default:
+                offsets = [9, 0];
+                break;
+            }
+        } else {
+            switch (ap) {
+            case 't':
+                offsets = [ - 15 - me.anchorOffset, 30];
+                break;
+            case 'b':
+                offsets = [ - 19 - me.anchorOffset, -13 - me.el.dom.offsetHeight];
+                break;
+            case 'r':
+                offsets = [ - 15 - me.el.dom.offsetWidth, -13 - me.anchorOffset];
+                break;
+            default:
+                offsets = [25, -13 - me.anchorOffset];
+                break;
+            }
+        }
+        mouseOffset = me.getMouseOffset();
+        offsets[0] += mouseOffset[0];
+        offsets[1] += mouseOffset[1];
+
+        return offsets;
+    },
+
+    // @private
+    onTargetOver: function(e) {
+        var me = this,
+            delegate = me.delegate,
+            t;
+
+        if (me.disabled || e.within(me.target.dom, true)) {
+            return;
+        }
+        t = delegate ? e.getTarget(delegate) : true;
+        if (t) {
+            me.triggerElement = t;
+            me.triggerEvent = e;
+            me.clearTimer('hide');
+            me.targetXY = e.getXY();
+            me.delayShow();
+        }
+    },
+
+    // @private
+    delayShow: function() {
+        var me = this;
+        if (me.hidden && !me.showTimer) {
+            if (Ext.Date.getElapsed(me.lastActive) < me.quickShowInterval) {
+                me.show();
+            } else {
+                me.showTimer = Ext.defer(me.showFromDelay, me.showDelay, me);
+            }
+        }
+        else if (!me.hidden && me.autoHide !== false) {
+            me.show();
+        }
+    },
+    
+    showFromDelay: function(){
+        this.fromDelayShow = true;
+        this.show();
+        delete this.fromDelayShow;
+    },
+    
+    onShowVeto: function(){
+        this.callParent();
+        delete this.triggerElement;
+        this.clearTimer('show');
+    },
+
+    // @private
+    onTargetOut: function(e) {
+        var me = this,
+            triggerEl = me.triggerElement,
+            // If we don't have a delegate, then the target is set
+            // to true, so set it to the main target.
+            target = triggerEl === true ? me.target : triggerEl;
+
+        // If disabled, moving within the current target, ignore the mouseout
+        // EventObject.within is the only correct way to determine this.
+        if (me.disabled || !triggerEl || e.within(target, true)) {
+            return;
+        }
+        if (me.showTimer) {
+            me.clearTimer('show');
+            me.triggerElement = null;
+        }
+        if (me.autoHide !== false) {
+            me.delayHide();
+        }
+    },
+
+    // @private
+    delayHide: function() {
+        var me = this;
+        if (!me.hidden && !me.hideTimer) {
+            me.hideTimer = Ext.defer(me.hide, me.hideDelay, me);
+        }
+    },
+
+    /**
+     * Hides this tooltip if visible.
+     */
+    hide: function() {
+        var me = this;
+        me.clearTimer('dismiss');
+        me.lastActive = new Date();
+        if (me.anchorEl) {
+            me.anchorEl.hide();
+        }
+        me.callParent(arguments);
+        delete me.triggerElement;
+    },
+
+    /**
+     * Shows this tooltip at the current event target XY position.
+     */
+    show: function() {
+        var me = this;
+
+        // Show this Component first, so that sizing can be calculated
+        // pre-show it off screen so that the el will have dimensions
+        this.callParent();
+        if (this.hidden === false) {
+            me.setPagePosition(-10000, -10000);
+
+            if (me.anchor) {
+                me.anchor = me.origAnchor;
+            }
+            
+            if (!me.calledFromShowAt) {
+                me.showAt(me.getTargetXY());
+            }
+
+            if (me.anchor) {
+                me.syncAnchor();
+                me.anchorEl.show();
+            } else {
+                me.anchorEl.hide();
+            }
+        }
+    },
+
+    // @inheritdoc
+    showAt: function(xy) {
+        var me = this;
+        me.lastActive = new Date();
+        me.clearTimers();
+        me.calledFromShowAt = true;
+
+        // Only call if this is hidden. May have been called from show above.
+        if (!me.isVisible()) {
+            this.callParent(arguments);
+        }
+
+        // Show may have been vetoed.
+        if (me.isVisible()) {
+            me.setPagePosition(xy[0], xy[1]);
+            if (me.constrainPosition || me.constrain) {
+                me.doConstrain();
+            }
+            me.toFront(true);
+            me.el.sync(true);
+            if (me.dismissDelay && me.autoHide !== false) {
+                me.dismissTimer = Ext.defer(me.hide, me.dismissDelay, me);
+            }
+            if (me.anchor) {
+                me.syncAnchor();
+                if (!me.anchorEl.isVisible()) {
+                    me.anchorEl.show();
+                }
+            } else {
+                me.anchorEl.hide();
+            }
+        }
+        delete me.calledFromShowAt;
+    },
+
+    // @private
+    syncAnchor: function() {
+        var me = this,
+            anchorPos,
+            targetPos,
+            offset;
+        switch (me.tipAnchor.charAt(0)) {
+        case 't':
+            anchorPos = 'b';
+            targetPos = 'tl';
+            offset = [20 + me.anchorOffset, 1];
+            break;
+        case 'r':
+            anchorPos = 'l';
+            targetPos = 'tr';
+            offset = [ - 1, 12 + me.anchorOffset];
+            break;
+        case 'b':
+            anchorPos = 't';
+            targetPos = 'bl';
+            offset = [20 + me.anchorOffset, -1];
+            break;
+        default:
+            anchorPos = 'r';
+            targetPos = 'tl';
+            offset = [1, 12 + me.anchorOffset];
+            break;
+        }
+        me.anchorEl.alignTo(me.el, anchorPos + '-' + targetPos, offset);
+        me.anchorEl.setStyle('z-index', parseInt(me.el.getZIndex(), 10) || 0 + 1).setVisibilityMode(Ext.Element.DISPLAY);
+    },
+
+    // @private
+    setPagePosition: function(x, y) {
+        var me = this;
+        me.callParent(arguments);
+        if (me.anchor) {
+            me.syncAnchor();
+        }
+    },
+
+    _timerNames: {},
+    // @private
+    clearTimer: function (name) {
+        var me = this,
+            names = me._timerNames,
+            propName = names[name] || (names[name] = name + 'Timer'),
+            timer = me[propName];
+
+        if (timer) {
+            clearTimeout(timer);
+            me[propName] = null;
+        }
+    },
+
+    // @private
+    clearTimers: function() {
+        var me = this;
+        me.clearTimer('show');
+        me.clearTimer('dismiss');
+        me.clearTimer('hide');
+    },
+
+    // @private
+    onShow: function() {
+        var me = this;
+        me.callParent();
+        me.mon(Ext.getDoc(), 'mousedown', me.onDocMouseDown, me);
+    },
+
+    // @private
+    onHide: function() {
+        var me = this;
+        me.callParent();
+        me.mun(Ext.getDoc(), 'mousedown', me.onDocMouseDown, me);
+    },
+
+    // @private
+    onDocMouseDown: function(e) {
+        var me = this;
+        if (!me.closable && !e.within(me.el.dom)) {
+            me.disable();
+            Ext.defer(me.doEnable, 100, me);
+        }
+    },
+
+    // @private
+    doEnable: function() {
+        if (!this.isDestroyed) {
+            this.enable();
+        }
+    },
+
+    // @private
+    onDisable: function() {
+        this.callParent();
+        this.clearTimers();
+        this.hide();
+    },
+
+    beforeDestroy: function() {
+        var me = this;
+        me.clearTimers();
+        Ext.destroy(me.anchorEl);
+        delete me.anchorEl;
+        delete me.target;
+        delete me.anchorTarget;
+        delete me.triggerElement;
+        me.callParent();
+    },
+
+    // @private
+    onDestroy: function() {
+        Ext.getDoc().un('mousedown', this.onDocMouseDown, this);
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A specialized tooltip class for tooltips that can be specified in markup and automatically managed
+ * by the global {@link Ext.tip.QuickTipManager} instance.  See the QuickTipManager documentation for
+ * additional usage details and examples.
+ */
+Ext.define('Ext.tip.QuickTip', {
+    extend:  Ext.tip.ToolTip ,
+    alias: 'widget.quicktip',
+    alternateClassName: 'Ext.QuickTip',
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} target
+     * The target HTMLElement, {@link Ext.Element} or id to associate with this Quicktip.
+     * 
+     * Defaults to the document.
+     */
+
+    /**
+     * @cfg {Boolean} interceptTitles
+     * `true` to automatically use the element's DOM title value if available.
+     */
+    interceptTitles : false,
+
+    // Force creation of header Component
+    title: ' ',
+
+    // @private
+    tagConfig : {
+        namespace : 'data-',
+        attribute : 'qtip',
+        width : 'qwidth',
+        target : 'target',
+        title : 'qtitle',
+        hide : 'hide',
+        cls : 'qclass',
+        align : 'qalign',
+        anchor : 'anchor',
+        showDelay: 'qshowDelay'
+    },
+
+    // @private
+    initComponent : function(){
+        var me = this;
+
+        me.target = me.target || Ext.getDoc();
+        me.targets = me.targets || {};
+        me.callParent();
+    },
+
+    /**
+     * Configures a new quick tip instance and assigns it to a target element.
+     *
+     * For example usage, see the {@link Ext.tip.QuickTipManager} class header.
+     *
+     * @param {Object} config The config object with the following properties:
+     * @param config.autoHide
+     * @param config.cls
+     * @param config.dismissDelay overrides the singleton value
+     * @param config.target required
+     * @param config.text required
+     * @param config.title
+     * @param config.width
+     */
+    register : function(config){
+        var configs = Ext.isArray(config) ? config : arguments,
+            i = 0,
+            len = configs.length,
+            target, j, targetLen;
+
+        for (; i < len; i++) {
+            config = configs[i];
+            target = config.target;
+            if (target) {
+                if (Ext.isArray(target)) {
+                    for (j = 0, targetLen = target.length; j < targetLen; j++) {
+                        this.targets[Ext.id(target[j])] = config;
+                    }
+                } else{
+                    this.targets[Ext.id(target)] = config;
+                }
+            }
+        }
+    },
+
+    /**
+     * Removes this quick tip from its element and destroys it.
+     * @param {String/HTMLElement/Ext.Element} el The element from which the quick tip
+     * is to be removed or ID of the element.
+     */
+    unregister : function(el){
+        delete this.targets[Ext.id(el)];
+    },
+
+    /**
+     * Hides a visible tip or cancels an impending show for a particular element.
+     * @param {String/HTMLElement/Ext.Element} el The element that is the target of
+     * the tip or ID of the element.
+     */
+    cancelShow: function(el){
+        var me = this,
+            activeTarget = me.activeTarget;
+
+        el = Ext.get(el).dom;
+        if (me.isVisible()) {
+            if (activeTarget && activeTarget.el == el) {
+                me.hide();
+            }
+        } else if (activeTarget && activeTarget.el == el) {
+            me.clearTimer('show');
+        }
+    },
+
+    /**
+     * @private
+     * Reads the tip text from the closest node to the event target which contains the
+     * attribute we are configured to look for. Returns an object containing the text
+     * from the attribute, and the target element from which the text was read.
+     */
+    getTipCfg: function(e) {
+        var t = e.getTarget(),
+            titleText = t.title,
+            cfg;
+
+        if (this.interceptTitles && titleText && Ext.isString(titleText)) {
+            t.qtip = titleText;
+            t.removeAttribute("title");
+            e.preventDefault();
+            return {
+                text: titleText
+            };
+        }
+        else {
+            cfg = this.tagConfig;
+            t = e.getTarget('[' + cfg.namespace + cfg.attribute + ']');
+            if (t) {
+                return {
+                    target: t,
+                    text: t.getAttribute(cfg.namespace + cfg.attribute)
+                };
+            }
+        }
+    },
+
+    // @private
+    onTargetOver : function(e){
+        var me = this,
+            target = e.getTarget(me.delegate),
+            hasShowDelay,
+            delay,
+            elTarget,
+            cfg,
+            ns,
+            tipConfig,
+            autoHide,
+            targets, targetEl, value, key;
+
+        if (me.disabled) {
+            return;
+        }
+
+        // TODO - this causes "e" to be recycled in IE6/7 (EXTJSIV-1608) so ToolTip#setTarget
+        // was changed to include freezeEvent. The issue seems to be a nested 'resize' event
+        // that smashed Ext.EventObject.
+        me.targetXY = e.getXY();
+
+        // If the over target was filtered out by the delegate selector, or is not an HTMLElement, or is the <html> or the <body>, then return
+        if(!target || target.nodeType !== 1 || target == document.documentElement || target == document.body){
+            return;
+        }
+
+        if (me.activeTarget && ((target == me.activeTarget.el) || Ext.fly(me.activeTarget.el).contains(target))) {
+            // We may have started a delayed show where we have an active target.
+            // If the timer is yet to be fired, but the mouse moves, it will try to
+            // show it immediately. If the attribute has been removed from the element,
+            // we want to cancel the show.
+            if (me.targetTextEmpty()) {
+                me.onShowVeto();
+                delete me.activeTarget;
+            } else {
+                me.clearTimer('hide');
+                me.show();
+            }
+            return;
+        }
+
+        if (target) {
+            targets = me.targets;
+
+            for (key in targets) {
+                if (targets.hasOwnProperty(key)) {
+                    value = targets[key];
+
+                    targetEl = Ext.fly(value.target);
+                    if (targetEl && (targetEl.dom === target || targetEl.contains(target))) {
+                        elTarget = targetEl.dom;
+                        break;
+                    }
+                }
+            }
+
+            if (elTarget) {
+                me.activeTarget = me.targets[elTarget.id];
+                me.activeTarget.el = target;
+                me.anchor = me.activeTarget.anchor;
+                if (me.anchor) {
+                    me.anchorTarget = target;
+                }
+                hasShowDelay = parseInt(me.activeTarget.showDelay, 10);
+                if (hasShowDelay) {
+                    delay = me.showDelay;
+                    me.showDelay = hasShowDelay;
+                }
+                me.delayShow();
+                if (hasShowDelay) {
+                    me.showDelay = delay;
+                }
+                return;
+            }
+        }
+
+        // Should be a fly.
+        elTarget = Ext.fly(target, '_quicktip-target');
+        cfg = me.tagConfig;
+        ns = cfg.namespace;
+        tipConfig = me.getTipCfg(e);
+
+        if (tipConfig) {
+
+            // getTipCfg may look up the parentNode axis for a tip text attribute and will return the new target node.
+            // Change our target element to match that from which the tip text attribute was read.
+            if (tipConfig.target) {
+                target = tipConfig.target;
+                elTarget = Ext.fly(target, '_quicktip-target');
+            }
+            autoHide = elTarget.getAttribute(ns + cfg.hide);
+
+            me.activeTarget = {
+                el: target,
+                text: tipConfig.text,
+                width: +elTarget.getAttribute(ns + cfg.width) || null,
+                autoHide: autoHide != "user" && autoHide !== 'false',
+                title: elTarget.getAttribute(ns + cfg.title),
+                cls: elTarget.getAttribute(ns + cfg.cls),
+                align: elTarget.getAttribute(ns + cfg.align),
+                showDelay: parseInt(elTarget.getAttribute(ns + cfg.showDelay), 10)
+            };
+            me.anchor = elTarget.getAttribute(ns + cfg.anchor);
+            if (me.anchor) {
+                me.anchorTarget = target;
+            }
+            hasShowDelay = parseInt(me.activeTarget.showDelay, 10);
+            if (hasShowDelay) {
+                delay = me.showDelay;
+                me.showDelay = hasShowDelay;
+            }
+            me.delayShow();
+            if (hasShowDelay) {
+                me.showDelay = delay;
+            }
+        }
+    },
+
+    // @private
+    onTargetOut : function(e){
+        var me = this,
+            active = me.activeTarget,
+            hasHideDelay,
+            delay;
+
+        // If moving within the current target, and it does not have a new tip, ignore the mouseout
+        // EventObject.within is the only correct way to determine this.
+        if (active && e.within(me.activeTarget.el) && !me.getTipCfg(e)) {
+            return;
+        }
+
+        me.clearTimer('show');
+        delete me.activeTarget;
+        if (me.autoHide !== false) {
+            hasHideDelay = active && parseInt(active.hideDelay, 10);
+            if (hasHideDelay) {
+                delay = me.hideDelay;
+                me.hideDelay = hasHideDelay;
+            }
+            me.delayHide();
+            if (hasHideDelay) {
+                me.hideDelay = delay;
+            }
+        }
+    },
+    
+    targetTextEmpty: function(){
+        var me = this,
+            target = me.activeTarget,
+            cfg = me.tagConfig,
+            el, text;
+            
+         if (target) {
+             el = target.el;
+             if (el) {
+                 text = el.getAttribute(cfg.namespace + cfg.attribute);
+                 // Note that the quicktip could also have been registered with the QuickTipManager.
+                 // If this was the case, then we don't want to veto showing it.
+                 // Simply do a lookup in the registered targets collection.
+                 if (!text && !me.targets[target.target]) {
+                     return true;
+                 }
+             }
+         }
+         return false;
+    },
+    
+    show: function(){
+        var me = this,
+            fromDelay = me.fromDelayShow;
+            
+        // We're coming from a delayed show, so check whether
+        // the attribute has been removed before we show it 
+        if (fromDelay && me.targetTextEmpty()) {
+            me.onShowVeto();
+            delete me.activeTarget;
+            return;
+        }
+        me.callParent(arguments);    
+    },
+
+    // @inheritdoc
+    showAt : function(xy){
+        var me = this,
+            target = me.activeTarget,
+            header = me.header,
+            cls;
+
+        if (target) {
+            if (!me.rendered) {
+                me.render(Ext.getBody());
+                me.activeTarget = target;
+            }
+            me.suspendLayouts();
+            if (target.title) {
+                me.setTitle(target.title);
+                header.show();
+            } else if (header) {
+                header.hide();
+            }
+            me.update(target.text);
+            me.autoHide = target.autoHide;
+            me.dismissDelay = target.dismissDelay || me.dismissDelay;
+            if (target.mouseOffset) {
+                xy[0] += target.mouseOffset[0];
+                xy[1] += target.mouseOffset[1];
+            }
+
+            cls = me.lastCls;
+            if (cls) {
+                me.removeCls(cls);
+                delete me.lastCls;
+            }
+
+            cls = target.cls;
+            if (cls) {
+                me.addCls(cls);
+                me.lastCls = cls;
+            }
+
+            me.setWidth(target.width);
+
+            if (me.anchor) {
+                me.constrainPosition = false;
+            } else if (target.align) { // TODO: this doesn't seem to work consistently
+                xy = me.getAlignToXY(target.el, target.align);
+                me.constrainPosition = false;
+            }else{
+                me.constrainPosition = true;
+            }
+            me.resumeLayouts(true);
+        }
+        me.callParent([xy]);
+    },
+
+    // @inheritdoc
+    hide: function(){
+        delete this.activeTarget;
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides attractive and customizable tooltips for any element. The QuickTips
+ * singleton is used to configure and manage tooltips globally for multiple elements
+ * in a generic manner.  To create individual tooltips with maximum customizability,
+ * you should consider either {@link Ext.tip.Tip} or {@link Ext.tip.ToolTip}.
+ *
+ * Quicktips can be configured via tag attributes directly in markup, or by
+ * registering quick tips programmatically via the {@link #register} method.
+ *
+ * The singleton's instance of {@link Ext.tip.QuickTip} is available via
+ * {@link #getQuickTip}, and supports all the methods, and all the all the
+ * configuration properties of Ext.tip.QuickTip. These settings will apply to all
+ * tooltips shown by the singleton.
+ *
+ * Below is the summary of the configuration properties which can be used.
+ * For detailed descriptions see the config options for the
+ * {@link Ext.tip.QuickTip QuickTip} class
+ *
+ * ## QuickTips singleton configs (all are optional)
+ *
+ *  - `dismissDelay`
+ *  - `hideDelay`
+ *  - `maxWidth`
+ *  - `minWidth`
+ *  - `showDelay`
+ *  - `trackMouse`
+ *
+ * ## Target element configs (optional unless otherwise noted)
+ *
+ *  - `autoHide`
+ *  - `cls`
+ *  - `dismissDelay` (overrides singleton value)
+ *  - `target` (required)
+ *  - `text` (required)
+ *  - `title`
+ *  - `width`
+ *
+ * Here is an example showing how some of these config options could be used:
+ *
+ *     @example
+ *     // Init the singleton.  Any tag-based quick tips will start working.
+ *     Ext.tip.QuickTipManager.init();
+ *
+ *     // Apply a set of config properties to the singleton
+ *     Ext.apply(Ext.tip.QuickTipManager.getQuickTip(), {
+ *         maxWidth: 200,
+ *         minWidth: 100,
+ *         showDelay: 50      // Show 50ms after entering target
+ *     });
+ *
+ *     // Create a small panel to add a quick tip to
+ *     Ext.create('Ext.container.Container', {
+ *         id: 'quickTipContainer',
+ *         width: 200,
+ *         height: 150,
+ *         style: {
+ *             backgroundColor:'#000000'
+ *         },
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ *
+ *     // Manually register a quick tip for a specific element
+ *     Ext.tip.QuickTipManager.register({
+ *         target: 'quickTipContainer',
+ *         title: 'My Tooltip',
+ *         text: 'This tooltip was added in code',
+ *         width: 100,
+ *         dismissDelay: 10000 // Hide after 10 seconds hover
+ *     });
+ *
+ * To register a quick tip in markup, you simply add one or more of the valid QuickTip
+ * attributes prefixed with the **data-** namespace.  The HTML element itself is
+ * automatically set as the quick tip target. Here is the summary of supported attributes
+ * (optional unless otherwise noted):
+ *
+ *  - `hide`: Specifying "user" is equivalent to setting autoHide = false.
+ *     Any other value will be the same as autoHide = true.
+ *  - `qclass`: A CSS class to be applied to the quick tip
+ *     (equivalent to the 'cls' target element config).
+ *  - `qtip (required)`: The quick tip text (equivalent to the 'text' target element config).
+ *  - `qtitle`: The quick tip title (equivalent to the 'title' target element config).
+ *  - `qwidth`: The quick tip width (equivalent to the 'width' target element config).
+ *
+ * Here is an example of configuring an HTML element to display a tooltip from markup:
+ *
+ *     // Add a quick tip to an HTML button
+ *     <input type="button" value="OK" data-qtitle="OK Button" data-qwidth="100"
+ *          data-qtip="This is a quick tip from markup!"></input>
+ *
+ * @singleton
+ */
+Ext.define('Ext.tip.QuickTipManager', {
+                                   
+    singleton: true,
+    alternateClassName: 'Ext.QuickTips',
+    disabled: false,
+
+    /**
+     * Initializes the global QuickTips instance and prepare any quick tips.
+     * @param {Boolean} [autoRender=true] True to render the QuickTips container
+     * immediately to preload images.
+     * @param {Object} [config] config object for the created QuickTip. By
+     * default, the {@link Ext.tip.QuickTip QuickTip} class is instantiated, but this can
+     * be changed by supplying an xtype property or a className property in this object.
+     * All other properties on this object are configuration for the created component.
+     */
+    init : function (autoRender, config) {
+        var me = this;
+
+        if (!me.tip) {
+            if (!Ext.isReady) {
+                Ext.onReady(function(){
+                    Ext.tip.QuickTipManager.init(autoRender, config);
+                });
+                return;
+            }
+
+            var tipConfig = Ext.apply({ disabled: me.disabled, id: 'ext-quicktips-tip' }, config),
+                className = tipConfig.className,
+                xtype = tipConfig.xtype;
+
+            if (className) {
+                delete tipConfig.className;
+            } else if (xtype) {
+                className = 'widget.' + xtype;
+                delete tipConfig.xtype;
+            }
+
+            if (autoRender !== false) {
+                tipConfig.renderTo = document.body;
+
+                if (tipConfig.renderTo.tagName.toUpperCase() != 'BODY') { // e.g., == 'FRAMESET'
+                    Ext.Error.raise({
+                        sourceClass: 'Ext.tip.QuickTipManager',
+                        sourceMethod: 'init',
+                        msg: 'Cannot init QuickTipManager: no document body'
+                    });
+                }
+            }
+
+            me.tip = Ext.create(className || 'Ext.tip.QuickTip', tipConfig);
+
+            // private.
+            // Need a globally accessble way of testing whether QuickTipsManager is both loaded AND initialized.
+            Ext.quickTipsActive = true;
+        }
+    },
+
+    /**
+     * Destroys the QuickTips instance.
+     */
+    destroy: function() {
+        Ext.destroy(this.tip);
+        this.tip = undefined;
+    },
+
+    // Protected method called by the dd classes
+    ddDisable : function() {
+        var me = this,
+            tip = me.tip;
+
+        // don't disable it if we don't need to
+        if (tip && !me.disabled) {
+            tip.disable();
+        }
+    },
+
+    // Protected method called by the dd classes
+    ddEnable : function() {
+        var me = this,
+            tip = me.tip;
+
+        // only enable it if it hasn't been disabled
+        if (tip && !me.disabled) {
+            tip.enable();
+        }
+    },
+
+    /**
+     * Enables quick tips globally.
+     */
+    enable : function(){
+        var me = this,
+            tip = me.tip;
+
+        if (tip) {
+            tip.enable();
+        }
+        me.disabled = false;
+    },
+
+    /**
+     * Disables quick tips globally.
+     */
+    disable : function(){
+        var me = this,
+            tip = me.tip;
+
+        if(tip){
+            tip.disable();
+        }
+        me.disabled = true;
+    },
+
+    /**
+     * Returns true if quick tips are enabled, else false.
+     * @return {Boolean}
+     */
+    isEnabled : function(){
+        var tip = this.tip;
+
+        return tip !== undefined && !tip.disabled;
+    },
+
+    /**
+     * Gets the single {@link Ext.tip.QuickTip QuickTip} instance used to show tips
+     * from all registered elements.
+     * @return {Ext.tip.QuickTip}
+     */
+    getQuickTip : function(){
+        return this.tip;
+    },
+
+    /**
+     * Configures a new quick tip instance and assigns it to a target element.  See
+     * {@link Ext.tip.QuickTip#register} for details.
+     * @param {Object} config The config object
+     */
+    register : function(){
+        var tip = this.tip;
+
+        tip.register.apply(tip, arguments);
+    },
+
+    /**
+     * Removes any registered quick tip from the target element and destroys it.
+     * @param {String/HTMLElement/Ext.Element} el The element from which the quick tip
+     * is to be removed or ID of the element.
+     */
+    unregister : function(){
+        var tip = this.tip;
+
+        tip.unregister.apply(tip, arguments);
+    },
+
+    /**
+     * Alias of {@link #register}.
+     * @inheritdoc Ext.tip.QuickTipManager#register
+     */
+    tips : function(){
+        var tip = this.tip;
+
+        tip.register.apply(tip, arguments);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents an Ext JS 4 application, which is typically a single page app using a {@link Ext.container.Viewport Viewport}.
+ * A typical Ext.app.Application might look like this:
+ *
+ *     Ext.application({
+ *         name: 'MyApp',
+ *         launch: function() {
+ *             Ext.create('Ext.container.Viewport', {
+ *                 items: {
+ *                     html: 'My App'
+ *                 }
+ *             });
+ *         }
+ *     });
+ *
+ * This does several things. First it creates a global variable called 'MyApp' - all of your Application's classes (such
+ * as its Models, Views and Controllers) will reside under this single namespace, which drastically lowers the chances
+ * of colliding global variables. The MyApp global will also have a getApplication method to get a reference to
+ * the current application:
+ *
+ *     var app = MyApp.getApplication();
+ *
+ * When the page is ready and all of your JavaScript has loaded, your Application's {@link #launch} function is called,
+ * at which time you can run the code that starts your app. Usually this consists of creating a Viewport, as we do in
+ * the example above.
+ *
+ * # Telling Application about the rest of the app
+ *
+ * Because an Ext.app.Application represents an entire app, we should tell it about the other parts of the app - namely
+ * the Models, Views and Controllers that are bundled with the application. Let's say we have a blog management app; we
+ * might have Models and Controllers for Posts and Comments, and Views for listing, adding and editing Posts and Comments.
+ * Here's how we'd tell our Application about all these things:
+ *
+ *     Ext.application({
+ *         name: 'Blog',
+ *         models: ['Post', 'Comment'],
+ *         controllers: ['Posts', 'Comments'],
+ *
+ *         launch: function() {
+ *             ...
+ *         }
+ *     });
+ *
+ * Note that we didn't actually list the Views directly in the Application itself. This is because Views are managed by
+ * Controllers, so it makes sense to keep those dependencies there. The Application will load each of the specified
+ * Controllers using the pathing conventions laid out in the [application architecture guide][mvc] - in this case
+ * expecting the controllers to reside in app/controller/Posts.js and app/controller/Comments.js. In turn, each
+ * Controller simply needs to list the Views it uses and they will be automatically loaded. Here's how our Posts
+ * controller like be defined:
+ *
+ *     Ext.define('MyApp.controller.Posts', {
+ *         extend: 'Ext.app.Controller',
+ *         views: ['posts.List', 'posts.Edit'],
+ *
+ *         //the rest of the Controller here
+ *     });
+ *
+ * Because we told our Application about our Models and Controllers, and our Controllers about their Views, Ext JS will
+ * automatically load all of our app files for us. This means we don't have to manually add script tags into our html
+ * files whenever we add a new class, but more importantly it enables us to create a minimized build of our entire
+ * application using Sencha Cmd.
+ *
+ * # Deriving from Ext.app.Application
+ *
+ * Typically, applications do not derive directly from Ext.app.Application. Rather, the
+ * configuration passed to `Ext.application` mimics what you might do in a derived class.
+ * In some cases, however, it can be desirable to share logic by using a derived class
+ * from `Ext.app.Application`.
+ *
+ * Derivation works as you would expect, but using the derived class should still be the
+ * job of the `Ext.application` method.
+ *
+ *     Ext.define('MyApp.app.Application', {
+ *         extend: 'Ext.app.Application',
+ *         name: 'MyApp',
+ *         ...
+ *     });
+ *
+ *     Ext.application('MyApp.app.Application');
+ *
+ * For more information about writing Ext JS 4 applications, please see the [application architecture guide][mvc].
+ *
+ * [mvc]: #/guide/application_architecture
+ *
+ * @docauthor Ed Spencer
+ */
+Ext.define('Ext.app.Application', {
+    extend:  Ext.app.Controller ,
+
+               
+                                 
+      
+
+    /**
+     * @cfg {String} name
+     * The name of your application. This will also be the namespace for your views, controllers
+     * models and stores. Don't use spaces or special characters in the name. **Application name
+     * is mandatory**.
+     */
+
+    /**
+     * @cfg {String/String[]} controllers
+     * Names of controllers that the app uses.
+     */
+
+    /**
+     * @cfg {Object} scope
+     * The scope to execute the {@link #launch} function in. Defaults to the Application instance.
+     */
+    scope: undefined,
+
+    /**
+     * @cfg {Boolean} enableQuickTips
+     * True to automatically set up Ext.tip.QuickTip support.
+     */
+    enableQuickTips: true,
+
+    /**
+     * @cfg {String} appFolder
+     * The path to the directory which contains all application's classes.
+     * This path will be registered via {@link Ext.Loader#setPath} for the namespace specified
+     * in the {@link #name name} config.
+     */
+    appFolder: 'app',
+    // NOTE - this config has to be processed by Ext.application
+
+    /**
+     * @cfg {String} appProperty
+     * The name of a property to be assigned to the main namespace to gain a reference to
+     * this application. Can be set to an empty value to prevent the reference from
+     * being created
+     *
+     *     Ext.application({
+     *         name: 'MyApp',
+     *         appProperty: 'myProp',
+     *
+     *         launch: function() {
+     *             console.log(MyApp.myProp === this);
+     *         }
+     *     });
+     */
+    appProperty: 'app',
+
+    /**
+     * @cfg {String/String[]} [namespaces]
+     *
+     * The list of namespace prefixes used in the application to resolve dependencies
+     * like Views and Stores:
+     *
+     *      Ext.application({
+     *          name: 'MyApp',
+     *
+     *          namespaces: ['Common.code'],
+     *
+     *          controllers: [ 'Common.code.controller.Foo', 'Bar' ]
+     *      });
+     *
+     *      Ext.define('Common.code.controller.Foo', {
+     *          extend: 'Ext.app.Controller',
+     *
+     *          models: ['Foo'],    // Loads Common.code.model.Foo
+     *          views:  ['Bar']     // Loads Common.code.view.Bar
+     *      });
+     *
+     *      Ext.define('MyApp.controller.Bar', {
+     *          extend: 'Ext.app.Controller',
+     *
+     *          models: ['Foo'],    // Loads MyApp.model.Foo
+     *          views:  ['Bar']     // Loads MyApp.view.Bar
+     *      });
+     *
+     * You don't need to include main namespace (MyApp), it will be added to the list
+     * automatically.
+     */
+    namespaces: [],
+
+    /**
+     * @cfg {Boolean} [autoCreateViewport=false]
+     * True to automatically load and instantiate AppName.view.Viewport before firing the launch
+     * function.
+     */
+    autoCreateViewport: false,
+
+    /**
+     * @cfg {Object} paths
+     * Additional load paths to add to Ext.Loader.
+     * See {@link Ext.Loader#paths} config for more details.
+     */
+    paths: null,
+    
+    onClassExtended: function(cls, data, hooks) {
+        var Controller = Ext.app.Controller,
+            proto = cls.prototype,
+            requires = [],
+            onBeforeClassCreated, paths, namespace, ns, appFolder;
+        
+        // Ordinary inheritance does not work here so we collect
+        // necessary data from current class data and its superclass
+        namespace = data.name      || cls.superclass.name;
+        appFolder = data.appFolder || cls.superclass.appFolder;
+        
+        if (namespace) {
+            data.$namespace = namespace;
+            Ext.app.addNamespaces(namespace);
+        }
+
+        if (data.namespaces) {
+            Ext.app.addNamespaces(data.namespaces);
+        }
+
+        if (!data['paths processed']) {
+            if (namespace && appFolder) {
+                Ext.Loader.setPath(namespace, appFolder);
+            }
+            
+            paths = data.paths;
+
+            if (paths) {
+                for (ns in paths) {
+                    if (paths.hasOwnProperty(ns)) {
+                        Ext.Loader.setPath(ns, paths[ns]);
+                    }
+                }
+            }
+        }
+        else {
+            delete data['paths processed'];
+        }
+
+        if (data.autoCreateViewport) {
+            if (!namespace) {
+                Ext.Error.raise("[Ext.app.Application] Can't resolve namespace for " +
+                                data.$className + ", did you forget to specify 'name' property?");
+            }
+            
+            Controller.processDependencies(proto, requires, namespace, 'view', ['Viewport']);
+        }
+
+        // Any "requires" also have to be processed before we fire up the App instance.
+        if (requires.length) {
+            onBeforeClassCreated = hooks.onBeforeCreated;
+
+            hooks.onBeforeCreated = function(cls, data) {
+                var args = Ext.Array.clone(arguments);
+                
+                Ext.require(requires, function () {
+                    return onBeforeClassCreated.apply(this, args);
+                });
+            };
+        }
+    },
+
+    /**
+     * Creates new Application.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        var me = this;
+
+        if (Ext.isEmpty(me.name)) {
+            Ext.Error.raise("[Ext.app.Application] Name property is required");
+        }
+
+        me.callParent(arguments);
+
+        me.doInit(me);
+
+        me.initNamespace();
+        me.initControllers();
+        me.onBeforeLaunch();
+        
+        me.finishInitControllers();
+    },
+
+    initNamespace: function() {
+        var me = this,
+            appProperty = me.appProperty,
+            ns;
+
+        ns = Ext.namespace(me.name);
+
+        if (ns) {
+            ns.getApplication = function() {
+                return me;
+            };
+
+            if (appProperty) {
+                if (!ns[appProperty]) {
+                    ns[appProperty] = me;
+                }
+                else if (ns[appProperty] !== me) {
+                    Ext.log.warn('An existing reference is being overwritten for ' + name + '.' + appProperty +
+                        '. See the appProperty config.'
+                    );
+                }
+            }
+        }
+    },
+
+    initControllers: function() {
+        var me = this,
+            controllers = Ext.Array.from(me.controllers);
+
+        me.controllers = new Ext.util.MixedCollection();
+
+        for (var i = 0, ln = controllers.length; i < ln; i++) {
+            me.getController(controllers[i]);
+        }
+    },
+    
+    finishInitControllers: function() {
+        var me = this,
+            controllers, i, l;
+        
+        controllers = me.controllers.getRange();
+        
+        for (i = 0, l = controllers.length; i < l; i++) {
+            controllers[i].finishInit(me);
+        }
+    },
+
+    /**
+     * @method
+     * @template
+     * Called automatically when the page has completely loaded. This is an empty function that should be
+     * overridden by each application that needs to take action on page load.
+     * @param {String} profile The detected application profile
+     * @return {Boolean} By default, the Application will dispatch to the configured startup controller and
+     * action immediately after running the launch function. Return false to prevent this behavior.
+     */
+    launch: Ext.emptyFn,
+
+    /**
+     * @private
+     */
+    onBeforeLaunch: function() {
+        var me = this,
+            controllers, c, cLen, controller;
+
+        if (me.enableQuickTips) {
+            me.initQuickTips();
+        }
+
+        if (me.autoCreateViewport) {
+            me.initViewport();
+        }
+
+        me.launch.call(me.scope || me);
+        me.launched = true;
+        me.fireEvent('launch', me);
+
+        controllers = me.controllers.items;
+        cLen        = controllers.length;
+
+        for (c = 0; c < cLen; c++) {
+            controller = controllers[c];
+            controller.onLaunch(me);
+        }
+    },
+
+    getModuleClassName: function(name, kind) {
+        return Ext.app.Controller.getFullName(name, kind, this.name).absoluteName;
+    },
+
+    initQuickTips: function() {
+        Ext.tip.QuickTipManager.init();
+    },
+
+    initViewport: function() {
+        var viewport = this.getView('Viewport');
+
+        if (viewport) {
+            viewport.create();
+        }
+    },
+
+    getController: function(name) {
+        var me          = this,
+            controllers = me.controllers,
+            className, controller;
+
+        controller = controllers.get(name);
+
+        if (!controller) {
+            className  = me.getModuleClassName(name, 'controller');
+
+            controller = Ext.create(className, {
+                application: me,
+                id:          name
+            });
+
+            controllers.add(controller);
+
+            if (me._initialized) {
+                controller.doInit(me);
+            }
+        }
+
+        return controller;
+    },
+
+    getApplication: function() {
+        return this;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.panel.Panel', {
+    override: 'Ext.panel.Panel',
+    border: false,
+    bodyBorder: false,
+
+    initBorderProps: Ext.emptyFn,
+
+    initBodyBorder: function() {
+        // The superclass method converts a truthy bodyBorder into a number and sets
+        // an inline border-width style on the body element.  This prevents that from
+        // happening if borderBody === true so that the body will get its border-width
+        // the stylesheet.
+        if (this.bodyBorder !== true) {
+            this.callParent();
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.toolbar.Toolbar', {
+    override: 'Ext.toolbar.Toolbar',
+    usePlainButtons: false,
+    border: false
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.layout.component.Dock', {
+    override: 'Ext.layout.component.Dock',
+
+    /**
+     * This table contains the border removal classes indexed by the sum of the edges to
+     * remove. Each edge is assigned a value:
+     * 
+     *  * `left` = 1
+     *  * `bottom` = 2
+     *  * `right` = 4
+     *  * `top` = 8
+     * 
+     * @private
+     */
+    noBorderClassTable: [
+        0,                                      // TRBL
+        Ext.baseCSSPrefix + 'noborder-l',       // 0001 = 1
+        Ext.baseCSSPrefix + 'noborder-b',       // 0010 = 2
+        Ext.baseCSSPrefix + 'noborder-bl',      // 0011 = 3
+        Ext.baseCSSPrefix + 'noborder-r',       // 0100 = 4
+        Ext.baseCSSPrefix + 'noborder-rl',      // 0101 = 5
+        Ext.baseCSSPrefix + 'noborder-rb',      // 0110 = 6
+        Ext.baseCSSPrefix + 'noborder-rbl',     // 0111 = 7
+        Ext.baseCSSPrefix + 'noborder-t',       // 1000 = 8
+        Ext.baseCSSPrefix + 'noborder-tl',      // 1001 = 9
+        Ext.baseCSSPrefix + 'noborder-tb',      // 1010 = 10
+        Ext.baseCSSPrefix + 'noborder-tbl',     // 1011 = 11
+        Ext.baseCSSPrefix + 'noborder-tr',      // 1100 = 12
+        Ext.baseCSSPrefix + 'noborder-trl',     // 1101 = 13
+        Ext.baseCSSPrefix + 'noborder-trb',     // 1110 = 14
+        Ext.baseCSSPrefix + 'noborder-trbl'     // 1111 = 15
+    ],
+
+    /**
+     * The numeric values assigned to each edge indexed by the `dock` config value.
+     * @private
+     */
+    edgeMasks: {
+        top: 8,
+        right: 4,
+        bottom: 2,
+        left: 1
+    },
+
+    handleItemBorders: function() {
+        var me     = this,
+            edges  = 0,
+            maskT  = 8,
+            maskR  = 4,
+            maskB  = 2,
+            maskL  = 1,
+            owner  = me.owner,
+            bodyBorder  = owner.bodyBorder,
+            ownerBorder = owner.border,
+            collapsed   = me.collapsed,
+            edgeMasks   = me.edgeMasks,
+            noBorderCls = me.noBorderClassTable,
+            dockedItemsGen = owner.dockedItems.generation,
+            b, borderCls, docked, edgesTouched, i, ln, item, dock, lastValue, mask,
+            addCls, removeCls;
+
+        if (me.initializedBorders === dockedItemsGen) {
+            return;
+        }
+
+        addCls = [];
+        removeCls = [];
+
+        borderCls   = me.getBorderCollapseTable();
+        noBorderCls = me.getBorderClassTable ? me.getBorderClassTable() : noBorderCls;
+
+        me.initializedBorders = dockedItemsGen;
+
+        // Borders have to be calculated using expanded docked item collection.
+        me.collapsed = false;
+        docked = me.getDockedItems();
+        me.collapsed = collapsed;
+
+        for (i = 0, ln = docked.length; i < ln; i++) {
+            item = docked[i];
+            if (item.ignoreBorderManagement) {
+                // headers in framed panels ignore border management, so we do not want
+                // to set "satisfied" on the edge in question
+                continue;
+            }
+
+            dock = item.dock;
+            mask = edgesTouched = 0;
+            addCls.length = 0;
+            removeCls.length = 0;
+
+            if (dock !== 'bottom') {
+                if (edges & maskT) { // if (not touching the top edge)
+                    b = item.border;
+                } else {
+                    b = ownerBorder;
+                    if (b !== false) {
+                        edgesTouched += maskT;
+                    }
+                }
+                if (b === false) {
+                    mask += maskT;
+                }
+            }
+            if (dock !== 'left') {
+                if (edges & maskR) { // if (not touching the right edge)
+                    b = item.border;
+                } else {
+                    b = ownerBorder;
+                    if (b !== false) {
+                        edgesTouched += maskR;
+                    }
+                }
+                if (b === false) {
+                    mask += maskR;
+                }
+            }
+            if (dock !== 'top') {
+                if (edges & maskB) { // if (not touching the bottom edge)
+                    b = item.border;
+                } else {
+                    b = ownerBorder;
+                    if (b !== false) {
+                        edgesTouched += maskB;
+                    }
+                }
+                if (b === false) {
+                    mask += maskB;
+                }
+            }
+            if (dock !== 'right') {
+                if (edges & maskL) { // if (not touching the left edge)
+                    b = item.border;
+                } else {
+                    b = ownerBorder;
+                    if (b !== false) {
+                        edgesTouched += maskL;
+                    }
+                }
+                if (b === false) {
+                    mask += maskL;
+                }
+            }
+
+            if ((lastValue = item.lastBorderMask) !== mask) {
+                item.lastBorderMask = mask;
+                if (lastValue) {
+                    removeCls[0] = noBorderCls[lastValue];
+                }
+                if (mask) {
+                    addCls[0] = noBorderCls[mask];
+                }
+            }
+
+            if ((lastValue = item.lastBorderCollapse) !== edgesTouched) {
+                item.lastBorderCollapse = edgesTouched;
+                if (lastValue) {
+                    removeCls[removeCls.length] = borderCls[lastValue];
+                }
+                if (edgesTouched) {
+                    addCls[addCls.length] = borderCls[edgesTouched];
+                }
+            }
+
+            if (removeCls.length) {
+                item.removeCls(removeCls);
+            }
+            if (addCls.length) {
+                item.addCls(addCls);
+            }
+
+            // mask can use += but edges must use |= because there can be multiple items
+            // on an edge but the mask is reset per item
+
+            edges |= edgeMasks[dock]; // = T, R, B or L (8, 4, 2 or 1)
+        }
+
+        mask = edgesTouched = 0;
+        addCls.length = 0;
+        removeCls.length = 0;
+
+        if (edges & maskT) { // if (not touching the top edge)
+            b = bodyBorder;
+        } else {
+            b = ownerBorder;
+            if (b !== false) {
+                edgesTouched += maskT;
+            }
+        }
+        if (b === false) {
+            mask += maskT;
+        }
+
+        if (edges & maskR) { // if (not touching the right edge)
+            b = bodyBorder;
+        } else {
+            b = ownerBorder;
+            if (b !== false) {
+                edgesTouched += maskR;
+            }
+        }
+        if (b === false) {
+            mask += maskR;
+        }
+
+        if (edges & maskB) { // if (not touching the bottom edge)
+            b = bodyBorder;
+        } else {
+            b = ownerBorder;
+            if (b !== false) {
+                edgesTouched += maskB;
+            }
+        }
+        if (b === false) {
+            mask += maskB;
+        }
+
+        if (edges & maskL) { // if (not touching the left edge)
+            b = bodyBorder;
+        } else {
+            b = ownerBorder;
+            if (b !== false) {
+                edgesTouched += maskL;
+            }
+        }
+        if (b === false) {
+            mask += maskL;
+        }
+
+        if ((lastValue = me.lastBodyBorderMask) !== mask) {
+            me.lastBodyBorderMask = mask;
+            if (lastValue) {
+                removeCls[0] = noBorderCls[lastValue];
+            }
+            if (mask) {
+                addCls[0] = noBorderCls[mask];
+            }
+        }
+
+        if ((lastValue = me.lastBodyBorderCollapse) !== edgesTouched) {
+            me.lastBodyBorderCollapse = edgesTouched;
+            if (lastValue) {
+                removeCls[removeCls.length] = borderCls[lastValue];
+            }
+            if (edgesTouched) {
+                addCls[addCls.length] = borderCls[edgesTouched];
+            }
+        }
+
+        if (removeCls.length) {
+            owner.removeBodyCls(removeCls);
+        }
+        if (addCls.length) {
+            owner.addBodyCls(addCls);
+        }
+    },
+
+    onRemove: function (item) {
+        var lastBorderMask = item.lastBorderMask;
+
+        if (!item.isDestroyed && !item.ignoreBorderManagement && lastBorderMask) {
+            item.lastBorderMask = 0;
+            item.removeCls(this.noBorderClassTable[lastBorderMask]);
+        }
+
+        this.callParent([item]);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class implements the controller event domain. All classes extending from
+ * {@link Ext.app.Controller} are included in this domain. The selectors are simply id's or the
+ * wildcard "*" to match any controller.
+ * 
+ * @protected
+ */
+Ext.define('Ext.app.domain.Controller', {
+    extend:  Ext.app.EventDomain ,
+    singleton: true,
+
+               
+                            
+      
+
+    type: 'controller',
+    idProperty: 'id',
+
+    constructor: function() {
+        var me = this;
+        
+        me.callParent();
+        me.monitor(Ext.app.Controller);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is a utility class for being able to track all items of a particular type
+ * inside any level at a container. This can be used in favour of bubbling add/remove events
+ * which can add a large perf cost when implemented globally
+ * @private
+ */
+Ext.define('Ext.container.Monitor', {
+    target: null,
+    selector: '',
+    
+    scope: null,
+    addHandler: null,
+    removeHandler: null,
+    
+    disabled: 0,
+    
+    constructor: function(config){
+        Ext.apply(this, config);
+    },
+    
+    bind: function(target){
+        var me = this;
+        
+        me.target = target;
+        target.on('beforedestroy', me.disable, me);
+        me.onContainerAdd(target);
+    },
+    
+    unbind: function() {
+        var me = this,
+            target = me.target;
+            
+        if (target) {
+            target.un('beforedestroy', me.disable, me);
+        }
+        me.items = null;
+    },
+    
+    disable: function(){
+        ++this.disabled;    
+    },
+    
+    enable: function(){
+        if (this.disabled > 0) {
+            --this.disabled;
+        }
+    },
+    
+    handleAdd: function(ct, comp) {
+        if (!this.disabled) {
+            if (comp.is(this.selector)) {
+                this.onItemAdd(comp.ownerCt, comp);
+            }
+        
+            if (comp.isQueryable) {
+                this.onContainerAdd(comp);
+            }
+        }
+    },
+    
+    onItemAdd: function(ct, comp){
+        var me = this,
+            items = me.items,
+            handler = me.addHandler;
+            
+        if (!me.disabled) {
+            if (handler) {
+                handler.call(me.scope || comp, comp);
+            }
+            if (items) {
+                items.add(comp);
+            }
+        }
+    },
+    
+    onItemRemove: function(ct, comp){
+        var me = this,
+            items = me.items,
+            handler = me.removeHandler;
+            
+        if (!me.disabled) {
+            if (handler) {
+                handler.call(me.scope || comp, comp);
+            }
+            if (items) {
+                items.remove(comp);
+            }
+        }
+    },
+    
+    onContainerAdd: function(ct, preventChildren) {
+        var me = this,
+            items, len,
+            handleAdd = me.handleAdd,
+            handleRemove = me.handleRemove,
+            i, comp;
+        
+        if (ct.isContainer) {
+            ct.on('add', handleAdd, me);
+            ct.on('dockedadd', handleAdd, me);
+            ct.on('remove', handleRemove, me);
+            ct.on('dockedremove', handleRemove, me);
+        }
+        
+        // Means we've been called by a parent container so the selector
+        // matchers have already been processed
+        if (preventChildren !== true) {
+            items = ct.query(me.selector);
+            for (i = 0, len = items.length; i < len; ++i) {
+                comp = items[i];
+                me.onItemAdd(comp.ownerCt, comp);
+            }
+        }
+         
+        items = ct.query('container');
+        for (i = 0, len = items.length; i < len; ++i) {
+            me.onContainerAdd(items[i], true);
+        }
+        
+    },
+    
+    handleRemove: function(ct, comp) {
+        var me = this;
+            
+        // During a destroy we don't want to maintain any of this information,
+        // so typically we'll be disabled here
+        if (!me.disabled) {
+            if (comp.is(me.selector)) {
+                me.onItemRemove(ct, comp);
+            }
+        
+            if (comp.isQueryable) {
+                me.onContainerRemove(ct, comp);
+            }
+        }
+    },
+    
+    onContainerRemove: function(ct, comp){
+        var me = this,
+            items, i, len, item;
+            
+        // If it's not a container, it means it's a queryable that isn't a container.
+        // For example a button with a menu
+        if (!comp.isDestroyed && !comp.destroying && comp.isContainer) {
+            me.removeCtListeners(comp);
+            
+            items = comp.query(me.selector);
+            for (i = 0, len = items.length; i < len; ++i) {
+                item = items[i];
+                me.onItemRemove(item.ownerCt, item);
+            }
+            
+            items = comp.query('container');
+            for (i = 0, len = items.length; i < len; ++i) {
+                me.removeCtListeners(items[i]);
+            }
+        } else {
+            // comp destroying, or we need to invalidate the collection
+            me.invalidateItems();
+        }
+    },
+    
+    removeCtListeners: function(comp){
+        var me = this;
+        comp.un('add', me.handleAdd, me);
+        comp.un('dockedadd', me.handleAdd, me);
+        comp.un('remove', me.handleRemove, me);
+        comp.un('dockedremove', me.handleRemove, me);
+    },
+    
+    getItems: function(){
+        var me = this,
+            items = me.items;
+            
+        if (!items) {
+            items = me.items = new Ext.util.MixedCollection();
+            items.addAll(me.target.query(me.selector));
+        }
+        return items;
+    },
+    
+    invalidateItems: function(){
+        this.items = null;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A specialized container representing the viewable application area (the browser viewport).
+ *
+ * The Viewport renders itself to the document body, and automatically sizes itself to the size of
+ * the browser viewport and manages window resizing. There may only be one Viewport created
+ * in a page.
+ *
+ * Like any {@link Ext.container.Container Container}, a Viewport will only perform sizing and positioning
+ * on its child Components if you configure it with a {@link #layout}.
+ *
+ * A Common layout used with Viewports is {@link Ext.layout.container.Border border layout}, but if the
+ * required layout is simpler, a different layout should be chosen.
+ *
+ * For example, to simply make a single child item occupy all available space, use
+ * {@link Ext.layout.container.Fit fit layout}.
+ *
+ * To display one "active" item at full size from a choice of several child items, use
+ * {@link Ext.layout.container.Card card layout}.
+ *
+ * Inner layouts are available because all {@link Ext.panel.Panel Panel}s
+ * added to the Viewport, either through its {@link #cfg-items}, or the {@link #method-add}
+ * method of any of its child Panels may themselves have a layout.
+ *
+ * The Viewport does not provide scrolling, so child Panels within the Viewport should provide
+ * for scrolling if needed using the {@link #autoScroll} config.
+ *
+ * An example showing a classic application border layout:
+ *
+ *     @example
+ *     Ext.create('Ext.container.Viewport', {
+ *         layout: 'border',
+ *         items: [{
+ *             region: 'north',
+ *             html: '<h1 class="x-panel-header">Page Title</h1>',
+ *             border: false,
+ *             margins: '0 0 5 0'
+ *         }, {
+ *             region: 'west',
+ *             collapsible: true,
+ *             title: 'Navigation',
+ *             width: 150
+ *             // could use a TreePanel or AccordionLayout for navigational items
+ *         }, {
+ *             region: 'south',
+ *             title: 'South Panel',
+ *             collapsible: true,
+ *             html: 'Information goes here',
+ *             split: true,
+ *             height: 100,
+ *             minHeight: 100
+ *         }, {
+ *             region: 'east',
+ *             title: 'East Panel',
+ *             collapsible: true,
+ *             split: true,
+ *             width: 150
+ *         }, {
+ *             region: 'center',
+ *             xtype: 'tabpanel', // TabPanel itself has no title
+ *             activeTab: 0,      // First tab active by default
+ *             items: {
+ *                 title: 'Default Tab',
+ *                 html: 'The first tab\'s content. Others may be added dynamically'
+ *             }
+ *         }]
+ *     });
+ */
+Ext.define('Ext.container.Viewport', {
+    extend:  Ext.container.Container ,
+    alias: 'widget.viewport',
+                                   
+    alternateClassName: 'Ext.Viewport',
+
+    // Privatize config options which, if used, would interfere with the
+    // correct operation of the Viewport as the sole manager of the
+    // layout of the document body.
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} applyTo
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} allowDomMove
+     * @private
+     */
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} renderTo
+     * Always renders to document body.
+     * @private
+     */
+
+    /**
+     * @cfg {Number} height
+     * Sets itself to viewport width.
+     * @private
+     */
+
+    /**
+     * @cfg {Number} width
+     * Sets itself to viewport height.
+     * @private
+     */
+
+    /**
+     * @property {Boolean} isViewport
+     * `true` in this class to identify an object as an instantiated Viewport, or subclass thereof.
+     */
+    isViewport: true,
+
+    ariaRole: 'application',
+    
+    preserveElOnDestroy: true,
+    
+    viewportCls: Ext.baseCSSPrefix + 'viewport',
+
+    initComponent : function() {
+        var me = this,
+            html = document.body.parentNode,
+            el = me.el = Ext.getBody();
+
+        // Get the DOM disruption over with before the Viewport renders and begins a layout
+        Ext.getScrollbarSize();
+        
+        // Clear any dimensions, we will size later on
+        me.width = me.height = undefined;
+
+        me.callParent(arguments);
+        Ext.fly(html).addCls(me.viewportCls);
+        if (me.autoScroll) {
+            Ext.fly(html).setStyle(me.getOverflowStyle());
+            delete me.autoScroll;
+        }
+        el.setHeight = el.setWidth = Ext.emptyFn;
+        el.dom.scroll = 'no';
+        me.allowDomMove = false;
+        me.renderTo = me.el;
+    },
+    
+    // override here to prevent an extraneous warning
+    applyTargetCls: function(targetCls) {
+        this.el.addCls(targetCls);
+    },
+    
+    onRender: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // Important to start life as the proper size (to avoid extra layouts)
+        // But after render so that the size is not stamped into the body
+        me.width = Ext.Element.getViewportWidth();
+        me.height = Ext.Element.getViewportHeight();
+    },
+
+    afterFirstLayout: function() {
+        var me = this;
+
+        me.callParent(arguments);
+        setTimeout(function() {
+            Ext.EventManager.onWindowResize(me.fireResize, me);
+        }, 1);
+    },
+
+    fireResize : function(width, height){
+        // In IE we can get resize events that have our current size, so we ignore them
+        // to avoid the useless layout...
+        if (width != this.width || height != this.height) {
+            this.setSize(width, height);
+        }
+    },
+
+    initHierarchyState: function(hierarchyState) {
+        this.callParent([this.hierarchyState = Ext.rootHierarchyState]);
+    },
+    
+    beforeDestroy: function(){
+        var me = this;
+        
+        me.removeUIFromElement();
+        me.el.removeCls(me.baseCls);
+        Ext.fly(document.body.parentNode).removeCls(me.viewportCls);
+        me.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Don Griffin
+ *
+ * This class is a base for all id generators. It also provides lookup of id generators by
+ * their id.
+ * 
+ * Generally, id generators are used to generate a primary key for new model instances. There
+ * are different approaches to solving this problem, so this mechanism has both simple use
+ * cases and is open to custom implementations. A {@link Ext.data.Model} requests id generation
+ * using the {@link Ext.data.Model#idgen} property.
+ *
+ * # Identity, Type and Shared IdGenerators
+ *
+ * It is often desirable to share IdGenerators to ensure uniqueness or common configuration.
+ * This is done by giving IdGenerator instances an id property by which they can be looked
+ * up using the {@link #get} method. To configure two {@link Ext.data.Model Model} classes
+ * to share one {@link Ext.data.SequentialIdGenerator sequential} id generator, you simply
+ * assign them the same id:
+ *
+ *     Ext.define('MyApp.data.MyModelA', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: {
+ *             type: 'sequential',
+ *             id: 'foo'
+ *         }
+ *     });
+ *
+ *     Ext.define('MyApp.data.MyModelB', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: {
+ *             type: 'sequential',
+ *             id: 'foo'
+ *         }
+ *     });
+ *
+ * To make this as simple as possible for generator types that are shared by many (or all)
+ * Models, the IdGenerator types (such as 'sequential' or 'uuid') are also reserved as
+ * generator id's. This is used by the {@link Ext.data.UuidGenerator} which has an id equal
+ * to its type ('uuid'). In other words, the following Models share the same generator:
+ *
+ *     Ext.define('MyApp.data.MyModelX', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: 'uuid'
+ *     });
+ *
+ *     Ext.define('MyApp.data.MyModelY', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: 'uuid'
+ *     });
+ *
+ * This can be overridden (by specifying the id explicitly), but there is no particularly
+ * good reason to do so for this generator type.
+ *
+ * # Creating Custom Generators
+ * 
+ * An id generator should derive from this class and implement the {@link #generate} method.
+ * The constructor will apply config properties on new instances, so a constructor is often
+ * not necessary.
+ *
+ * To register an id generator type, a derived class should provide an `alias` like so:
+ *
+ *     Ext.define('MyApp.data.CustomIdGenerator', {
+ *         extend: 'Ext.data.IdGenerator',
+ *         alias: 'idgen.custom',
+ *
+ *         configProp: 42, // some config property w/default value
+ *
+ *         generate: function () {
+ *             return ... // a new id
+ *         }
+ *     });
+ *
+ * Using the custom id generator is then straightforward:
+ *
+ *     Ext.define('MyApp.data.MyModel', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: 'custom'
+ *     });
+ *     // or...
+ *
+ *     Ext.define('MyApp.data.MyModel', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: {
+ *             type: 'custom',
+ *             configProp: value
+ *         }
+ *     });
+ *
+ * It is not recommended to mix shared generators with generator configuration. This leads
+ * to unpredictable results unless all configurations match (which is also redundant). In
+ * such cases, a custom generator with a default id is the best approach.
+ *
+ *     Ext.define('MyApp.data.CustomIdGenerator', {
+ *         extend: 'Ext.data.SequentialIdGenerator',
+ *         alias: 'idgen.custom',
+ *
+ *         id: 'custom', // shared by default
+ *
+ *         prefix: 'ID_',
+ *         seed: 1000
+ *     });
+ *
+ *     Ext.define('MyApp.data.MyModelX', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: 'custom'
+ *     });
+ *
+ *     Ext.define('MyApp.data.MyModelY', {
+ *         extend: 'Ext.data.Model',
+ *         idgen: 'custom'
+ *     });
+ *
+ *     // the above models share a generator that produces ID_1000, ID_1001, etc..
+ *
+ */
+Ext.define('Ext.data.IdGenerator', {
+
+    /**
+     * @property {Boolean} isGenerator
+     * `true` in this class to identify an object as an instantiated IdGenerator, or subclass thereof.
+     */
+    isGenerator: true,
+
+    /**
+     * Initializes a new instance.
+     * @param {Object} config (optional) Configuration object to be applied to the new instance.
+     */
+    constructor: function(config) {
+        var me = this;
+
+        Ext.apply(me, config);
+
+        if (me.id) {
+            Ext.data.IdGenerator.all[me.id] = me;
+        }
+    },
+
+    /**
+     * @cfg {String} id
+     * The id by which to register a new instance. This instance can be found using the
+     * {@link Ext.data.IdGenerator#get} static method.
+     */
+
+    getRecId: function (rec) {
+        return rec.modelName + '-' + rec.internalId;
+    },
+
+    /**
+     * Generates and returns the next id. This method must be implemented by the derived
+     * class.
+     *
+     * @return {String} The next id.
+     * @method generate
+     * @abstract
+     */
+
+    statics: {
+        /**
+         * @property {Object} all
+         * This object is keyed by id to lookup instances.
+         * @private
+         * @static
+         */
+        all: {},
+
+        /**
+         * Returns the IdGenerator given its config description.
+         * @param {String/Object} config If this parameter is an IdGenerator instance, it is
+         * simply returned. If this is a string, it is first used as an id for lookup and
+         * then, if there is no match, as a type to create a new instance. This parameter
+         * can also be a config object that contains a `type` property (among others) that
+         * are used to create and configure the instance.
+         * @static
+         */
+        get: function (config) {
+            var generator,
+                id,
+                type;
+
+            if (typeof config == 'string') {
+                id = type = config;
+                config = null;
+            } else if (config.isGenerator) {
+                return config;
+            } else {
+                id = config.id || config.type;
+                type = config.type;
+            }
+
+            generator = this.all[id];
+            if (!generator) {
+                generator = Ext.create('idgen.' + type, config);
+            }
+
+            return generator;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.data.SortTypes
+ * This class defines a series of static methods that are used on a
+ * {@link Ext.data.Field} for performing sorting. The methods cast the 
+ * underlying values into a data type that is appropriate for sorting on
+ * that particular field.  If a {@link Ext.data.Field#type} is specified, 
+ * the sortType will be set to a sane default if the sortType is not 
+ * explicitly defined on the field. The sortType will make any necessary
+ * modifications to the value and return it.
+ * <ul>
+ * <li><b>asText</b> - Removes any tags and converts the value to a string</li>
+ * <li><b>asUCText</b> - Removes any tags and converts the value to an uppercase string</li>
+ * <li><b>asUCText</b> - Converts the value to an uppercase string</li>
+ * <li><b>asDate</b> - Converts the value into Unix epoch time</li>
+ * <li><b>asFloat</b> - Converts the value to a floating point number</li>
+ * <li><b>asInt</b> - Converts the value to an integer number</li>
+ * </ul>
+ * <p>
+ * It is also possible to create a custom sortType that can be used throughout
+ * an application.
+ * <pre><code>
+Ext.apply(Ext.data.SortTypes, {
+    asPerson: function(person){
+        // expects an object with a first and last name property
+        return person.lastName.toUpperCase() + person.firstName.toLowerCase();
+    }    
+});
+
+Ext.define('Employee', {
+    extend: 'Ext.data.Model',
+    fields: [{
+        name: 'person',
+        sortType: 'asPerson'
+    }, {
+        name: 'salary',
+        type: 'float' // sortType set to asFloat
+    }]
+});
+ * </code></pre>
+ * </p>
+ * @singleton
+ * @docauthor Evan Trimboli <evan at sencha.com>
+ */
+Ext.define('Ext.data.SortTypes', {
+    
+    singleton: true,
+    
+    /**
+     * Default sort that does nothing
+     * @param {Object} s The value being converted
+     * @return {Object} The comparison value
+     */
+    none : Ext.identityFn,
+
+    /**
+     * The regular expression used to strip tags
+     * @type {RegExp}
+     * @property
+     */
+    stripTagsRE : /<\/?[^>]+>/gi,
+
+    /**
+     * Strips all HTML tags to sort on text only
+     * @param {Object} s The value being converted
+     * @return {String} The comparison value
+     */
+    asText : function(s) {
+        return String(s).replace(this.stripTagsRE, "");
+    },
+
+    /**
+     * Strips all HTML tags to sort on text only - Case insensitive
+     * @param {Object} s The value being converted
+     * @return {String} The comparison value
+     */
+    asUCText : function(s) {
+        return String(s).toUpperCase().replace(this.stripTagsRE, "");
+    },
+
+    /**
+     * Case insensitive string
+     * @param {Object} s The value being converted
+     * @return {String} The comparison value
+     */
+    asUCString : function(s) {
+        return String(s).toUpperCase();
+    },
+
+    /**
+     * Date sorting
+     * @param {Object} s The value being converted
+     * @return {Number} The comparison value
+     */
+    asDate : function(s) {
+        if(!s){
+            return 0;
+        }
+        if(Ext.isDate(s)){
+            return s.getTime();
+        }
+        return Date.parse(String(s));
+    },
+
+    /**
+     * Float sorting
+     * @param {Object} s The value being converted
+     * @return {Number} The comparison value
+     */
+    asFloat : function(s) {
+        var val = parseFloat(String(s).replace(/,/g, ""));
+        return isNaN(val) ? 0 : val;
+    },
+
+    /**
+     * Integer sorting
+     * @param {Object} s The value being converted
+     * @return {Number} The comparison value
+     */
+    asInt : function(s) {
+        var val = parseInt(String(s).replace(/,/g, ""), 10);
+        return isNaN(val) ? 0 : val;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is a static class containing the system-supplied data types
+ * which may be given to a {@link Ext.data.Field Field}.
+ *
+ * The properties in this class are used as type indicators in the
+ * {@link Ext.data.Field Field} class, so to test whether a Field is
+ * of a certain type, compare the {@link Ext.data.Field#type type}
+ * property against properties of this class.
+ *
+ * Developers may add their own application-specific data types to
+ * this class. Definition names must be UPPERCASE. Each type
+ * definition must contain three properties:
+ *
+ *   - `convert` : Function<br>
+ *     A function to convert raw data values from a data block into
+ *     the data to be stored in the Field. The function is passed the
+ *     collowing parameters:
+ *
+ *       - **v** : Mixed<br>
+ *         The data value as read by the Reader, if undefined will use
+ *         the configured {@link Ext.data.Field#defaultValue defaultValue}.
+ *       - **rec** : Mixed<br>
+ *         The data object containing the row as read by the Reader.
+ *         Depending on the Reader type, this could be an Array
+ *         ({@link Ext.data.reader.Array ArrayReader}), an object
+ *         ({@link Ext.data.reader.Json JsonReader}), or an XML element.
+ * 
+ *   - `sortType` : Function<br>
+ *     A function to convert the stored data into comparable form, as
+ *     defined by {@link Ext.data.SortTypes}.
+ *
+ *   - `type` : String<br>
+ *     A textual data type name.
+ *
+ * For example, to create a VELatLong field (See the Microsoft Bing
+ * Mapping API) containing the latitude/longitude value of a datapoint
+ * on a map from a JsonReader data block
+ *
+ * which contained the properties `lat` and `long`, you would define a
+ * new data type like this:
+ *
+ *     // Add a new Field data type which stores a VELatLong object in the Record.
+ *     Ext.data.Types.VELATLONG = {
+ *         convert: function(v, data) {
+ *             return new VELatLong(data.lat, data.long);
+ *         },
+ *         sortType: function(v) {
+ *             return v.Latitude;  // When sorting, order by latitude
+ *         },
+ *         type: 'VELatLong'
+ *     };
+ *
+ * Then, when declaring a Model, use:
+ *
+ *     var types = Ext.data.Types; // allow shorthand type access
+ *     Ext.define('Unit',
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             { name: 'unitName', mapping: 'UnitName' },
+ *             { name: 'curSpeed', mapping: 'CurSpeed', type: types.INT },
+ *             { name: 'latitude', mapping: 'lat', type: types.FLOAT },
+ *             { name: 'longitude', mapping: 'long', type: types.FLOAT },
+ *             { name: 'position', type: types.VELATLONG }
+ *         ]
+ *     });
+ *
+ */
+Ext.define('Ext.data.Types', {
+    singleton: true 
+                                    
+}, function() {
+    var st = Ext.data.SortTypes;
+
+    Ext.apply(Ext.data.Types, {
+        /**
+         * @property {RegExp} stripRe
+         * A regular expression for stripping non-numeric characters from a numeric value.
+         * This should be overridden for localization.
+         */
+        stripRe: /[\$,%]/g,
+
+        /**
+         * @property {Object} AUTO
+         * This data type means that no conversion is applied to the raw data before it is placed into a Record.
+         */
+        AUTO: {
+            sortType: st.none,
+            type: 'auto'
+        },
+
+        /**
+         * @property {Object} STRING
+         * This data type means that the raw data is converted into a String before it is placed into a Record.
+         */
+        STRING: {
+            convert: function(v) {
+                var defaultValue = this.useNull ? null : '';
+                return (v === undefined || v === null) ? defaultValue : String(v);
+            },
+            sortType: st.asUCString,
+            type: 'string'
+        },
+
+        /**
+         * @property {Object} INT
+         * This data type means that the raw data is converted into an integer before it is placed into a Record.
+         *
+         * The synonym `INTEGER` is equivalent.
+         */
+        INT: {
+            convert: function(v) {
+                // Handle values which are already numbers.
+                // Value truncation behaviour of parseInt is historic and must be maintained.
+                // parseInt(35.9)  and parseInt("35.9") returns 35
+                if (typeof v == 'number') {
+                    return parseInt(v);
+                }
+                return v !== undefined && v !== null && v !== '' ?
+                    parseInt(String(v).replace(Ext.data.Types.stripRe, ''), 10) : (this.useNull ? null : 0);
+            },
+            sortType: st.none,
+            type: 'int'
+        },
+
+        /**
+         * @property {Object} FLOAT
+         * This data type means that the raw data is converted into a number before it is placed into a Record.
+         *
+         * The synonym `NUMBER` is equivalent.
+         */
+        FLOAT: {
+            convert: function(v) {
+                if (typeof v === 'number') {
+                    return v;
+                }
+                return v !== undefined && v !== null && v !== '' ?
+                    parseFloat(String(v).replace(Ext.data.Types.stripRe, ''), 10) : (this.useNull ? null : 0);
+            },
+            sortType: st.none,
+            type: 'float'
+        },
+
+        /**
+         * @property {Object} BOOL
+         * This data type means that the raw data is converted into a boolean before it is placed into
+         * a Record. The string "true" and the number 1 are converted to boolean true.
+         *
+         * The synonym `BOOLEAN` is equivalent.
+         */
+        BOOL: {
+            convert: function(v) {
+                if (typeof v === 'boolean') {
+                    return v;
+                }
+                if (this.useNull && (v === undefined || v === null || v === '')) {
+                    return null;
+                }
+                return v === 'true' || v == 1;
+            },
+            sortType: st.none,
+            type: 'bool'
+        },
+
+        /**
+         * @property {Object} DATE
+         * This data type means that the raw data is converted into a Date before it is placed into a Record.
+         * The date format is specified in the constructor of the {@link Ext.data.Field} to which this type is
+         * being applied.
+         */
+        DATE: {
+            convert: function(v) {
+                var df = this.dateReadFormat || this.dateFormat,
+                    parsed;
+
+                if (!v) {
+                    return null;
+                }
+                // instanceof check ~10 times faster than Ext.isDate. Values here will not be cross-document objects
+                if (v instanceof Date) {
+                    return v;
+                }
+                if (df) {
+                    return Ext.Date.parse(v, df);
+                }
+
+                parsed = Date.parse(v);
+                return parsed ? new Date(parsed) : null;
+            },
+            sortType: st.asDate,
+            type: 'date'
+        }
+    });
+
+    Ext.apply(Ext.data.Types, {
+        /**
+         * @property {Object} BOOLEAN
+         * This data type means that the raw data is converted into a boolean before it is placed into
+         * a Record. The string "true" and the number 1 are converted to boolean `true`.
+         *
+         * The synonym `BOOL` is equivalent.
+         */
+        BOOLEAN: this.BOOL,
+
+        /**
+         * @property {Object} INTEGER
+         * This data type means that the raw data is converted into an integer before it is placed into a Record.
+         *
+         * The synonym `INT` is equivalent.
+         */
+        INTEGER: this.INT,
+
+        /**
+         * @property {Object} NUMBER
+         * This data type means that the raw data is converted into a number before it is placed into a Record.
+         *
+         * The synonym `FLOAT` is equivalent.
+         */
+        NUMBER: this.FLOAT
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Fields are used to define what a Model is. They aren't instantiated directly - instead, when we create a class that
+ * extends {@link Ext.data.Model}, it will automatically create a Field instance for each field configured in a {@link
+ * Ext.data.Model Model}. For example, we might set up a model like this:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             'name', 'email',
+ *             {name: 'age', type: 'int'},
+ *             {name: 'gender', type: 'string', defaultValue: 'Unknown'}
+ *         ]
+ *     });
+ *
+ * Four fields will have been created for the User Model - name, email, age and gender. Note that we specified a couple
+ * of different formats here; if we only pass in the string name of the field (as with name and email), the field is set
+ * up with the 'auto' type. It's as if we'd done this instead:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             {name: 'name', type: 'auto'},
+ *             {name: 'email', type: 'auto'},
+ *             {name: 'age', type: 'int'},
+ *             {name: 'gender', type: 'string', defaultValue: 'Unknown'}
+ *         ]
+ *     });
+ *
+ * # Types and conversion
+ *
+ * The {@link #type} is important - it's used to automatically convert data passed to the field into the correct format.
+ * In our example above, the name and email fields used the 'auto' type and will just accept anything that is passed
+ * into them. The 'age' field had an 'int' type however, so if we passed 25.4 this would be rounded to 25.
+ *
+ * Sometimes a simple type isn't enough, or we want to perform some processing when we load a Field's data. We can do
+ * this using a {@link #convert} function. Here, we're going to create a new field based on another:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             {
+ *                 name: 'firstName',
+ *                 convert: function(value, record) {
+ *                     var fullName  = record.get('name'),
+ *                         splits    = fullName.split(" "),
+ *                         firstName = splits[0];
+ *
+ *                     return firstName;
+ *                 }
+ *             },
+ *             'name', 'email',
+ *             {name: 'age', type: 'int'},
+ *             {name: 'gender', type: 'string', defaultValue: 'Unknown'}
+ *         ]
+ *     });
+ *
+ * Now when we create a new User, the firstName is populated automatically based on the name:
+ *
+ *     var ed = Ext.create('User', {name: 'Ed Spencer'});
+ *
+ *     console.log(ed.get('firstName')); //logs 'Ed', based on our convert function
+ *     
+ * Fields which are configured with a custom ```convert``` function are read *after* all other fields
+ * when constructing and reading records, so that if convert functions rely on other, non-converted fields
+ * (as in this example), they can be sure of those fields being present.
+ *
+ * In fact, if we log out all of the data inside ed, we'll see this:
+ *
+ *     console.log(ed.data);
+ *
+ *     //outputs this:
+ *     {
+ *         age: 0,
+ *         email: "",
+ *         firstName: "Ed",
+ *         gender: "Unknown",
+ *         name: "Ed Spencer"
+ *     }
+ *
+ * The age field has been given a default of zero because we made it an int type. As an auto field, email has defaulted
+ * to an empty string. When we registered the User model we set gender's {@link #defaultValue} to 'Unknown' so we see
+ * that now. Let's correct that and satisfy ourselves that the types work as we expect:
+ *
+ *     ed.set('gender', 'Male');
+ *     ed.get('gender'); //returns 'Male'
+ *
+ *     ed.set('age', 25.4);
+ *     ed.get('age'); //returns 25 - we wanted an int, not a float, so no decimal places allowed
+ */
+Ext.define('Ext.data.Field', {
+                                                       
+    alias: 'data.field',
+
+    isField: true,
+    
+    constructor : function(config) {
+        var me = this,
+            types = Ext.data.Types,
+            st;
+        
+        if (Ext.isString(config)) {
+            config = {name: config};
+        }
+        Ext.apply(me, config);
+
+        st = me.sortType;
+
+        if (me.type) {
+            if (Ext.isString(me.type)) {
+                me.type = types[me.type.toUpperCase()] || types.AUTO;
+            }
+        } else {
+            me.type = types.AUTO;
+        }
+
+        // named sortTypes are supported, here we look them up
+        if (Ext.isString(st)) {
+            me.sortType = Ext.data.SortTypes[st];
+        } else if(Ext.isEmpty(st)) {
+            me.sortType = me.type.sortType;
+        }
+
+        // Reference this type's default converter if we did not recieve one in configuration.
+        if (!config.hasOwnProperty('convert')) {
+            me.convert = me.type.convert; // this may be undefined (e.g., AUTO)
+        } else if (!me.convert && me.type.convert && !config.hasOwnProperty('defaultValue')) {
+            // If the converter has been nulled out, and we have not been configured
+            // with a field-specific defaultValue, then coerce the inherited defaultValue into our data type.
+            me.defaultValue = me.type.convert(me.defaultValue);
+        }
+
+        if (config.convert) {
+            me.hasCustomConvert = true;
+        }
+    },
+    
+    /**
+     * @cfg {String} name
+     *
+     * The name by which the field is referenced within the Model. This is referenced by, for example, the `dataIndex`
+     * property in column definition objects passed to {@link Ext.grid.property.HeaderContainer}.
+     *
+     * Note: In the simplest case, if no properties other than `name` are required, a field definition may consist of
+     * just a String for the field name.
+     */
+    
+    /**
+     * @cfg {String/Object} type
+     *
+     * The data type for automatic conversion from received data to the *stored* value if
+     * `{@link Ext.data.Field#convert convert}` has not been specified. This may be specified as a string value.
+     * Possible values are
+     *
+     * - auto (Default, implies no conversion)
+     * - string
+     * - int
+     * - float
+     * - boolean
+     * - date
+     *
+     * This may also be specified by referencing a member of the {@link Ext.data.Types} class.
+     *
+     * Developers may create their own application-specific data types by defining new members of the {@link
+     * Ext.data.Types} class.
+     */
+
+    /**
+     * @cfg {Function} [convert]
+     *
+     * A function which converts the value provided by the Reader into an object that will be stored in the Model.
+     * 
+     * If configured as `null`, then no conversion will be applied to the raw data property when this Field
+     * is read. This will increase performance. but you must ensure that the data is of the correct type and does
+     * not *need* converting.
+     * 
+     * It is passed the following parameters:
+     *
+     * - **v** : Mixed
+     *
+     *   The data value as read by the Reader, if undefined will use the configured `{@link Ext.data.Field#defaultValue
+     *   defaultValue}`.
+     *
+     * - **rec** : Ext.data.Model
+     *
+     *   The data object containing the Model as read so far by the Reader. Note that the Model may not be fully populated
+     *   at this point as the fields are read in the order that they are defined in your
+     *   {@link Ext.data.Model#cfg-fields fields} array.
+     *
+     * Example of convert functions:
+     *
+     *     function fullName(v, record){
+     *         return record.data.last + ', ' + record.data.first;
+     *     }
+     *
+     *     function location(v, record){
+     *         return !record.data.city ? '' : (record.data.city + ', ' + record.data.state);
+     *     }
+     *
+     *     Ext.define('Dude', {
+     *         extend: 'Ext.data.Model',
+     *         fields: [
+     *             {name: 'fullname',  convert: fullName},
+     *             {name: 'firstname', mapping: 'name.first'},
+     *             {name: 'lastname',  mapping: 'name.last'},
+     *             {name: 'city', defaultValue: 'homeless'},
+     *             'state',
+     *             {name: 'location',  convert: location}
+     *         ]
+     *     });
+     *
+     *     // create the data store
+     *     var store = Ext.create('Ext.data.Store', {
+     *         reader: {
+     *             type: 'json',
+     *             model: 'Dude',
+     *             idProperty: 'key',
+     *             root: 'daRoot',
+     *             totalProperty: 'total'
+     *         }
+     *     });
+     *
+     *     var myData = [
+     *         { key: 1,
+     *           name: { first: 'Fat',    last:  'Albert' }
+     *           // notice no city, state provided in data object
+     *         },
+     *         { key: 2,
+     *           name: { first: 'Barney', last:  'Rubble' },
+     *           city: 'Bedrock', state: 'Stoneridge'
+     *         },
+     *         { key: 3,
+     *           name: { first: 'Cliff',  last:  'Claven' },
+     *           city: 'Boston',  state: 'MA'
+     *         }
+     *     ];
+     */
+
+    /**
+     * @cfg {Function} [serialize]
+     * A function which converts the Model's value for this Field into a form which can be used by whatever {@link Ext.data.writer.Writer Writer}
+     * is being used to sync data with the server.
+     * 
+     * The function should return a string which represents the Field's value.
+     *
+     * It is passed the following parameters:
+     *
+     * - **v** : Mixed
+     *
+     *   The Field's value - the value to be serialized.
+     *
+     * - **rec** : Ext.data.Model
+     *
+     *   The record being serialized.
+     *
+     */
+
+    /**
+     * @cfg {String} dateFormat
+     *
+     * Serves as a default for the {@link #dateReadFormat} and {@link #dateWriteFormat} config options. This
+     * will be used in place of those other configurations if not specified.
+     * 
+     * A format string for the {@link Ext.Date#parse Ext.Date.parse} function, or "timestamp" if the value provided by
+     * the Reader is a UNIX timestamp, or "time" if the value provided by the Reader is a javascript millisecond
+     * timestamp. See {@link Ext.Date}.
+     * 
+     * It is quite important to note that while this config is optional, it will default to using the base
+     * JavaScript Date object's `parse` function if not specified, rather than {@link Ext.Date#parse Ext.Date.parse}.
+     * This can cause unexpected issues, especially when converting between timezones, or when converting dates that
+     * do not have a timezone specified. The behavior of the native `Date.parse` is implementation-specific, and
+     * depending on the value of the date string, it might return the UTC date or the local date. __For this reason
+     * it is strongly recommended that you always specify an explicit date format when parsing dates.__
+     */
+    dateFormat: null,
+    
+    /**
+     * @cfg {String} dateReadFormat
+     * Used when converting received data into a Date when the {@link #type} is specified as `"date"`.
+     * This configuration takes precedence over {@link #dateFormat}.
+     * See {@link #dateFormat} for more information.
+     */
+    dateReadFormat: null,
+    
+    /** 
+     * @cfg {String} dateWriteFormat
+     * Used to provide a custom format when serializing dates with a {@link Ext.data.writer.Writer}.
+     * If this is not specified, the {@link #dateFormat} will be used. See the {@link Ext.data.writer.Writer} 
+     * docs for more information on writing dates. 
+     *
+     * **Note that to use a {@link Ext.data.JsonWriter JsonWriter} to send Microsoft format "JSON" dates, which are in fact
+     * invalid JSON, it is not possible to use the standard date serialization pathway or
+     * {@link Ext#USE_NATIVE_JSON native browser JSON production}.**
+     *
+     * To use a {@link Ext.data.JsonWriter JsonWriter} to write dates in a JSON packet in the form `"\/Date(1357372800000)\/"`
+     * configure the field like this:
+     *
+     *    {
+     *        type: 'date',
+     *        dateFormat: 'MS',             // To parse incoming dates from server correctly
+     *        serialize: Ext.identityFn     // An ExtJS-supplied function which returns the arg unchanged
+     *    }
+     *
+     * Then override ExtJS's JSON date serialize function:
+     *
+     *    Ext.JSON.encodeDate = function (d) {
+     *        return '"' + Ext.Date.format(d, 'MS') + '"';
+     *    };
+     */
+    dateWriteFormat: null,
+    
+    /**
+     * @cfg {Boolean} useNull
+     *
+     * Use when converting received data into a INT, FLOAT, BOOL or STRING type. If the value cannot be
+     * parsed, `null` will be used if useNull is true, otherwise a default value for that type will be used:
+     *
+     * - for INT and FLOAT - `0`.
+     * - for STRING - `""`.
+     * - for BOOL - `false`.
+     *
+     * Note that when parsing of DATE type fails, the value will be `null` regardless of this setting.
+     */
+    useNull: false,
+    
+    /**
+     * @cfg {Object} [defaultValue=""]
+     *
+     * The default value used when the creating an instance from a raw data object, and the property referenced by the
+     * `{@link Ext.data.Field#mapping mapping}` does not exist in that data object.
+     * 
+     * May be specified as `undefined` to prevent defaulting in a value.
+     */
+    defaultValue: "",
+
+    /**
+     * @cfg {String/Number} mapping
+     *
+     * (Optional) A path expression for use by the {@link Ext.data.reader.Reader} implementation that is creating the
+     * {@link Ext.data.Model Model} to extract the Field value from the data object. If the path expression is the same
+     * as the field name, the mapping may be omitted.
+     *
+     * The form of the mapping expression depends on the Reader being used.
+     *
+     * - {@link Ext.data.reader.Json}
+     *
+     *   The mapping is a string containing the javascript expression to reference the data from an element of the data
+     *   item's {@link Ext.data.reader.Json#cfg-root root} Array. Defaults to the field name.
+     *
+     * - {@link Ext.data.reader.Xml}
+     *
+     *   The mapping is an {@link Ext.DomQuery} path to the data item relative to the DOM element that represents the
+     *   {@link Ext.data.reader.Xml#record record}. Defaults to the field name.
+     *
+     * - {@link Ext.data.reader.Array}
+     *
+     *   The mapping is a number indicating the Array index of the field's value. Defaults to the field specification's
+     *   Array position.
+     *
+     * If a more complex value extraction strategy is required, then configure the Field with a {@link #convert}
+     * function. This is passed the whole row object, and may interrogate it in whatever way is necessary in order to
+     * return the desired data.
+     */
+    mapping: null,
+
+    /**
+     * @cfg {Function/String} sortType
+     *
+     * A function which converts a Field's value to a comparable value in order to ensure correct sort ordering.
+     * Predefined functions are provided in {@link Ext.data.SortTypes}. A custom sort example:
+     *
+     *     // current sort     after sort we want
+     *     // +-+------+          +-+------+
+     *     // |1|First |          |1|First |
+     *     // |2|Last  |          |3|Second|
+     *     // |3|Second|          |2|Last  |
+     *     // +-+------+          +-+------+
+     *
+     *     sortType: function(value) {
+     *        switch (value.toLowerCase()) // native toLowerCase():
+     *        {
+     *           case 'first': return 1;
+     *           case 'second': return 2;
+     *           default: return 3;
+     *        }
+     *     }
+     *
+     * May also be set to a String value, corresponding to one of the named sort types in {@link Ext.data.SortTypes}.
+     */
+    sortType : null,
+
+    /**
+     * @cfg {String} sortDir
+     *
+     * Initial direction to sort (`"ASC"` or `"DESC"`). Defaults to `"ASC"`.
+     */
+    sortDir : "ASC",
+
+    /**
+     * @cfg {Boolean} allowBlank
+     * @private
+     *
+     * Used for validating a {@link Ext.data.Model model}. Defaults to true. An empty value here will cause
+     * {@link Ext.data.Model}.{@link Ext.data.Model#isValid isValid} to evaluate to false.
+     */
+    allowBlank : true,
+
+    /**
+     * @cfg {Boolean} persist
+     *
+     * False to exclude this field from the {@link Ext.data.Model#modified} fields in a model. This will also exclude
+     * the field from being written using a {@link Ext.data.writer.Writer}. This option is useful when model fields are
+     * used to keep state on the client but do not need to be persisted to the server. Defaults to true.
+     */
+    persist: true
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * @class Ext.data.Errors
+ *
+ * <p>Wraps a collection of validation error responses and provides convenient functions for
+ * accessing and errors for specific fields.</p>
+ *
+ * <p>Usually this class does not need to be instantiated directly - instances are instead created
+ * automatically when {@link Ext.data.Model#validate validate} on a model instance:</p>
+ *
+<pre><code>
+//validate some existing model instance - in this case it returned 2 failures messages
+var errors = myModel.validate();
+
+errors.isValid(); //false
+
+errors.length; //2
+errors.getByField('name');  // [{field: 'name',  message: 'must be present'}]
+errors.getByField('title'); // [{field: 'title', message: 'is too short'}]
+</code></pre>
+ */
+Ext.define('Ext.data.Errors', {
+    extend:  Ext.util.MixedCollection ,
+
+    /**
+     * Returns true if there are no errors in the collection
+     * @return {Boolean}
+     */
+    isValid: function() {
+        return this.length === 0;
+    },
+
+    /**
+     * Returns all of the errors for the given field
+     * @param {String} fieldName The field to get errors for
+     * @return {Object[]} All errors for the given field
+     */
+    getByField: function(fieldName) {
+        var errors = [],
+            error, i;
+
+        for (i = 0; i < this.length; i++) {
+            error = this.items[i];
+
+            if (error.field == fieldName) {
+                errors.push(error);
+            }
+        }
+
+        return errors;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * This singleton contains a set of validation functions that can be used to validate any type of data. They are most
+ * often used in {@link Ext.data.Model Models}, where they are automatically set up and executed.
+ */
+Ext.define('Ext.data.validations', {
+    singleton: true,
+    
+    /**
+     * @property {String} presenceMessage
+     * The default error message used when a presence validation fails.
+     */
+    presenceMessage: 'must be present',
+    
+    /**
+     * @property {String} lengthMessage
+     * The default error message used when a length validation fails.
+     */
+    lengthMessage: 'is the wrong length',
+    
+    /**
+     * @property {String} formatMessage
+     * The default error message used when a format validation fails.
+     */
+    formatMessage: 'is the wrong format',
+    
+    /**
+     * @property {String} inclusionMessage
+     * The default error message used when an inclusion validation fails.
+     */
+    inclusionMessage: 'is not included in the list of acceptable values',
+    
+    /**
+     * @property {String} exclusionMessage
+     * The default error message used when an exclusion validation fails.
+     */
+    exclusionMessage: 'is not an acceptable value',
+    
+    /**
+     * @property {String} emailMessage
+     * The default error message used when an email validation fails
+     */
+    emailMessage: 'is not a valid email address',
+    
+    /**
+     * @property {RegExp} emailRe
+     * The regular expression used to validate email addresses
+     */
+    emailRe: /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,
+    
+    /**
+     * Validates that the given value is present.
+     * For example:
+     *
+     *     validations: [{type: 'presence', field: 'age'}]
+     *
+     * @param {Object} config Config object
+     * @param {Object} value The value to validate
+     * @return {Boolean} True if validation passed
+     */
+    presence: function(config, value) {
+        // No configs read, so allow just value to be passed
+        if (arguments.length === 1) {
+            value = config;
+        }
+        
+        //we need an additional check for zero here because zero is an acceptable form of present data
+        return !!value || value === 0 || value === false;
+    },
+    
+    /**
+     * Returns true if the given value is between the configured min and max values.
+     * For example:
+     *
+     *     validations: [{type: 'length', field: 'name', min: 2}]
+     *
+     * @param {Object} config Config object
+     * @param {String} value The value to validate
+     * @return {Boolean} True if the value passes validation
+     */
+    length: function(config, value) {
+        if (value === undefined || value === null) {
+            return false;
+        }
+        
+        var length = value.length,
+            min    = config.min,
+            max    = config.max;
+        
+        if ((min && length < min) || (max && length > max)) {
+            return false;
+        } else {
+            return true;
+        }
+    },
+    
+    /**
+     * Validates that an email string is in the correct format
+     * @param {Object} config Config object
+     * @param {String} email The email address
+     * @return {Boolean} True if the value passes validation
+     */
+    email: function(config, email) {
+        return Ext.data.validations.emailRe.test(email);
+    },
+    
+    /**
+     * Returns true if the given value passes validation against the configured `matcher` regex.
+     * For example:
+     *
+     *     validations: [{type: 'format', field: 'username', matcher: /([a-z]+)[0-9]{2,3}/}]
+     *
+     * @param {Object} config Config object
+     * @param {String} value The value to validate
+     * @return {Boolean} True if the value passes the format validation
+     */
+    format: function(config, value) {
+        return !!(config.matcher && config.matcher.test(value));
+    },
+    
+    /**
+     * Validates that the given value is present in the configured `list`.
+     * For example:
+     *
+     *     validations: [{type: 'inclusion', field: 'gender', list: ['Male', 'Female']}]
+     *
+     * @param {Object} config Config object
+     * @param {String} value The value to validate
+     * @return {Boolean} True if the value is present in the list
+     */
+    inclusion: function(config, value) {
+        return config.list && Ext.Array.indexOf(config.list,value) != -1;
+    },
+    
+    /**
+     * Validates that the given value is not present in the configured `list`.
+     * For example:
+     *
+     *     validations: [{type: 'exclusion', field: 'username', list: ['Admin', 'Operator']}]
+     *
+     * @param {Object} config Config object
+     * @param {String} value The value to validate
+     * @return {Boolean} True if the value is not present in the list
+     */
+    exclusion: function(config, value) {
+        return config.list && Ext.Array.indexOf(config.list,value) == -1;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * A Model represents some object that your application manages. For example, one might define a Model for Users,
+ * Products, Cars, or any other real-world object that we want to model in the system. Models are registered via the
+ * {@link Ext.ModelManager model manager}, and are used by {@link Ext.data.Store stores}, which are in turn used by many
+ * of the data-bound components in Ext.
+ *
+ * Models are defined as a set of fields and any arbitrary methods and properties relevant to the model. For example:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             {name: 'name',  type: 'string'},
+ *             {name: 'age',   type: 'int', convert: null},
+ *             {name: 'phone', type: 'string'},
+ *             {name: 'alive', type: 'boolean', defaultValue: true, convert: null}
+ *         ],
+ *
+ *         changeName: function() {
+ *             var oldName = this.get('name'),
+ *                 newName = oldName + " The Barbarian";
+ *
+ *             this.set('name', newName);
+ *         }
+ *     });
+ *
+ * The fields array is turned into a {@link Ext.util.MixedCollection MixedCollection} automatically by the {@link
+ * Ext.ModelManager ModelManager}, and all other functions and properties are copied to the new Model's prototype.
+ *
+ * A Model definition always has an *identifying field* which should yield a unique key for each instance. By default, a field
+ * named "id" will be created with a {@link Ext.data.Field#mapping mapping} of "id". This happens because of the default
+ * {@link #idProperty} provided in Model definitions.
+ *
+ * To alter which field is the identifying field, use the {@link #idProperty} config.
+ *
+ * If the Model should not have any identifying field (for example if you are defining ab abstract base class for your
+ * application models), configure the {@liknk #idProperty} as `null`.
+ *
+ * By default, the built in numeric and boolean field types have a {@link Ext.data.Field#convert} function which coerces string
+ * values in raw data into the field's type. For better performance with {@link Ext.data.reader.Json Json} or {@link Ext.data.reader.Array Array}
+ * readers *if you are in control of the data fed into this Model*, you can null out the default convert function which will cause
+ * the raw property to be copied directly into the Field's value.
+ *
+ * Now we can create instances of our User model and call any model logic we defined:
+ *
+ *     var user = Ext.create('User', {
+ *         id   : 'ABCD12345',
+ *         name : 'Conan',
+ *         age  : 24,
+ *         phone: '555-555-5555'
+ *     });
+ *
+ *     user.changeName();
+ *     user.get('name'); //returns "Conan The Barbarian"
+ *
+ * # Validations
+ *
+ * Models have built-in support for validations, which are executed against the validator functions in {@link
+ * Ext.data.validations} ({@link Ext.data.validations see all validation functions}). Validations are easy to add to
+ * models:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             {name: 'name',     type: 'string'},
+ *             {name: 'age',      type: 'int'},
+ *             {name: 'phone',    type: 'string'},
+ *             {name: 'gender',   type: 'string'},
+ *             {name: 'username', type: 'string'},
+ *             {name: 'alive',    type: 'boolean', defaultValue: true}
+ *         ],
+ *
+ *         validations: [
+ *             {type: 'presence',  field: 'age'},
+ *             {type: 'length',    field: 'name',     min: 2},
+ *             {type: 'inclusion', field: 'gender',   list: ['Male', 'Female']},
+ *             {type: 'exclusion', field: 'username', list: ['Admin', 'Operator']},
+ *             {type: 'format',    field: 'username', matcher: /([a-z]+)[0-9]{2,3}/}
+ *         ]
+ *     });
+ *
+ * The validations can be run by simply calling the {@link #validate} function, which returns a {@link Ext.data.Errors}
+ * object:
+ *
+ *     var instance = Ext.create('User', {
+ *         name: 'Ed',
+ *         gender: 'Male',
+ *         username: 'edspencer'
+ *     });
+ *
+ *     var errors = instance.validate();
+ *
+ * # Associations
+ *
+ * Models can have associations with other Models via {@link Ext.data.association.HasOne},
+ * {@link Ext.data.association.BelongsTo belongsTo} and {@link Ext.data.association.HasMany hasMany} associations.
+ * For example, let's say we're writing a blog administration application which deals with Users, Posts and Comments.
+ * We can express the relationships between these models like this:
+ *
+ *     Ext.define('Post', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'user_id'],
+ *
+ *         belongsTo: 'User',
+ *         hasMany  : {model: 'Comment', name: 'comments'}
+ *     });
+ *
+ *     Ext.define('Comment', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'user_id', 'post_id'],
+ *
+ *         belongsTo: 'Post'
+ *     });
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id'],
+ *
+ *         hasMany: [
+ *             'Post',
+ *             {model: 'Comment', name: 'comments'}
+ *         ]
+ *     });
+ *
+ * See the docs for {@link Ext.data.association.HasOne}, {@link Ext.data.association.BelongsTo} and
+ * {@link Ext.data.association.HasMany} for details on the usage and configuration of associations.
+ * Note that associations can also be specified like this:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id'],
+ *
+ *         associations: [
+ *             {type: 'hasMany', model: 'Post',    name: 'posts'},
+ *             {type: 'hasMany', model: 'Comment', name: 'comments'}
+ *         ]
+ *     });
+ *
+ * # Using a Proxy
+ *
+ * Models are great for representing types of data and relationships, but sooner or later we're going to want to load or
+ * save that data somewhere. All loading and saving of data is handled via a {@link Ext.data.proxy.Proxy Proxy}, which
+ * can be set directly on the Model:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'name', 'email'],
+ *
+ *         proxy: {
+ *             type: 'rest',
+ *             url : '/users'
+ *         }
+ *     });
+ *
+ * Here we've set up a {@link Ext.data.proxy.Rest Rest Proxy}, which knows how to load and save data to and from a
+ * RESTful backend. Let's see how this works:
+ *
+ *     var user = Ext.create('User', {name: 'Ed Spencer', email: 'ed at sencha.com'});
+ *
+ *     user.save(); //POST /users
+ *
+ * Calling {@link #save} on the new Model instance tells the configured RestProxy that we wish to persist this Model's
+ * data onto our server. RestProxy figures out that this Model hasn't been saved before because it doesn't have an id,
+ * and performs the appropriate action - in this case issuing a POST request to the url we configured (/users). We
+ * configure any Proxy on any Model and always follow this API - see {@link Ext.data.proxy.Proxy} for a full list.
+ *
+ * Loading data via the Proxy is equally easy:
+ *
+ *     //get a reference to the User model class
+ *     var User = Ext.ModelManager.getModel('User');
+ *
+ *     //Uses the configured RestProxy to make a GET request to /users/123
+ *     User.load(123, {
+ *         success: function(user) {
+ *             console.log(user.getId()); //logs 123
+ *         }
+ *     });
+ *
+ * Models can also be updated and destroyed easily:
+ *
+ *     //the user Model we loaded in the last snippet:
+ *     user.set('name', 'Edward Spencer');
+ *
+ *     //tells the Proxy to save the Model. In this case it will perform a PUT request to /users/123 as this Model already has an id
+ *     user.save({
+ *         success: function() {
+ *             console.log('The User was updated');
+ *         }
+ *     });
+ *
+ *     //tells the Proxy to destroy the Model. Performs a DELETE request to /users/123
+ *     user.destroy({
+ *         success: function() {
+ *             console.log('The User was destroyed!');
+ *         }
+ *     });
+ *
+ * # Usage in Stores
+ *
+ * It is very common to want to load a set of Model instances to be displayed and manipulated in the UI. We do this by
+ * creating a {@link Ext.data.Store Store}:
+ *
+ *     var store = Ext.create('Ext.data.Store', {
+ *         model: 'User'
+ *     });
+ *
+ *     //uses the Proxy we set up on Model to load the Store data
+ *     store.load();
+ *
+ * A Store is just a collection of Model instances - usually loaded from a server somewhere. Store can also maintain a
+ * set of added, updated and removed Model instances to be synchronized with the server via the Proxy. See the {@link
+ * Ext.data.Store Store docs} for more information on Stores.
+ */
+Ext.define('Ext.data.Model', {
+    alternateClassName: 'Ext.data.Record',
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+               
+                           
+                               
+                         
+                          
+                             
+                               
+                                  
+      
+
+    compareConvertFields: function(f1, f2) {
+        var f1SpecialConvert = f1.convert && f1.type && f1.convert !== f1.type.convert,
+            f2SpecialConvert = f2.convert && f2.type && f2.convert !== f2.type.convert;
+
+        if (f1SpecialConvert && !f2SpecialConvert) {
+            return 1;
+        }
+
+        if (!f1SpecialConvert && f2SpecialConvert) {
+            return -1;
+        }
+        return 0;
+    },
+
+    itemNameFn: function(item) {
+        return item.name;
+    },
+
+    onClassExtended: function(cls, data, hooks) {
+        var onBeforeClassCreated = hooks.onBeforeCreated;
+
+        hooks.onBeforeCreated = function(cls, data) {
+            var me = this,
+                name = Ext.getClassName(cls),
+                prototype = cls.prototype,
+                superCls = cls.prototype.superclass,
+
+                validations = data.validations || [],
+                fields = data.fields || [],
+                field,
+                associationsConfigs = data.associations || [],
+                addAssociations = function(items, type) {
+                    var i = 0,
+                        len,
+                        item;
+
+                    if (items) {
+                        items = Ext.Array.from(items);
+
+                        for (len = items.length; i < len; ++i) {
+                            item = items[i];
+
+                            if (!Ext.isObject(item)) {
+                                item = {model: item};
+                            }
+
+                            item.type = type;
+                            associationsConfigs.push(item);
+                        }
+                    }
+                },
+                idgen = data.idgen,
+
+                fieldsMixedCollection = new Ext.util.MixedCollection(false, prototype.itemNameFn),
+
+                associationsMixedCollection = new Ext.util.MixedCollection(false, prototype.itemNameFn),
+
+                superValidations = superCls.validations,
+                superFields = superCls.fields,
+                superAssociations = superCls.associations,
+
+                associationConfig, i, ln,
+                dependencies = [],
+
+                // Use the idProperty from the configuration if there is one, else fall back to the default from the prototype
+                idProperty = 'idProperty' in data ? data.idProperty : prototype.idProperty,
+
+                // If an idProperty was specified, we create an idField
+                idField = idProperty ? (idProperty.isField ? idProperty : new Ext.data.Field(idProperty)) : null,
+
+                // Set if there is a Field in the defined fields which encapsulates the idProperty
+                idFieldDefined = false,
+
+                // Process each Field upon add into the collection
+                onFieldAddReplace = function(arg0, arg1, arg2) {
+                    var newField,
+                        pos;
+
+                    if (fieldsMixedCollection.events.add.firing) {
+                        // Add event signature is (position, value, key);
+                        pos = arg0;
+                        newField  = arg1;
+                    } else {
+                        // Replace event signature is (key, oldValue, newValue);
+                        newField = arg2;
+                        pos = arg1.originalIndex;
+                    }
+
+                    // Set the originalIndex for ArrayReader to get the default mapping from in case
+                    // compareConvertFields changes the order due to some fields having custom convert functions.
+                    newField.originalIndex = pos;
+
+                    // If a defined Field encapsulates the idProperty, then we do not have to create a separate identifying field.
+                    // Also, this field must never have a default value set if no value arrives from the server side.
+                    // So override any possible prototype-provided defaultValue with undefined which will inhibit generation of defaulting code in Reader.buildRecordDataExtractor
+                    if (idField && ((newField.mapping && (newField.mapping === idField.mapping)) || (newField.name === idField.name))) {
+                        prototype.idField = newField;
+                        idFieldDefined = true;
+                        newField.defaultValue = undefined;
+                    }
+                },
+
+                // The configured Proxy if any. If there is none, we may inherit one from the superclass, or fall back to the defaultProxyType
+                clsProxy = data.proxy,
+
+                // Sort upon add function to be used in case of dynamically added Fields
+                fieldConvertSortFn = function() {
+                    fieldsMixedCollection.sortBy(prototype.compareConvertFields);
+                };
+
+            // Save modelName on class and its prototype
+            cls.modelName = name;
+            prototype.modelName = name;
+
+            // Merge the validations of the superclass and the new subclass
+            if (superValidations) {
+                validations = superValidations.concat(validations);
+            }
+
+            data.validations = validations;
+
+            // Merge the fields of the superclass and the new subclass
+            if (superFields) {
+                fields = superFields.items.concat(fields);
+            }
+
+            fieldsMixedCollection.on({
+                add:     onFieldAddReplace,
+                replace: onFieldAddReplace
+            });  
+
+            for (i = 0, ln = fields.length; i < ln; ++i) {
+                field = fields[i];
+                fieldsMixedCollection.add(field.isField ? field : new Ext.data.Field(field));
+            }
+
+            // If there was an idProperty specified, and there has *not* been a field defined which encapsulates that property,
+            // then create a field which encapsulates that property.
+            // This must never provide a default value.
+            if (idField && !idFieldDefined) {
+                prototype.idField = idField;
+                idField.defaultValue = undefined;
+                fieldsMixedCollection.add(idField);
+            }
+
+            // Ensure the Fields are on correct order: Fields with custom convert function last
+            fieldConvertSortFn();
+            fieldsMixedCollection.on({
+                add:     fieldConvertSortFn,
+                replace: fieldConvertSortFn
+            });
+
+            data.fields = fieldsMixedCollection;
+
+            if (idgen) {
+                data.idgen = Ext.data.IdGenerator.get(idgen);
+            }
+
+            //associations can be specified in the more convenient format (e.g. not inside an 'associations' array).
+            //we support that here
+            addAssociations(data.belongsTo, 'belongsTo');
+            delete data.belongsTo;
+            addAssociations(data.hasMany, 'hasMany');
+            delete data.hasMany;
+            addAssociations(data.hasOne, 'hasOne');
+            delete data.hasOne;
+
+            if (superAssociations) {
+                associationsConfigs = superAssociations.items.concat(associationsConfigs);
+            }
+
+            for (i = 0, ln = associationsConfigs.length; i < ln; ++i) {
+                dependencies.push('association.' + associationsConfigs[i].type.toLowerCase());
+            }
+
+            // If we have been configured with a proxy *configuration* (not a full Proxy), push it onto our dependency requirements
+            if (clsProxy) {
+                if (!clsProxy.isProxy) {
+                    dependencies.push('proxy.' + (clsProxy.type || clsProxy));
+                }
+            }
+            // Not inheriting a proxy, push the defaultProxyType onto our dependency requirements, and set the
+            // proxy type for instantiation later.
+            else if (!cls.prototype.proxy) {
+                cls.prototype.proxy = cls.prototype.defaultProxyType;
+                dependencies.push('proxy.' + cls.prototype.defaultProxyType);
+            }
+
+            Ext.require(dependencies, function() {
+                Ext.ModelManager.registerType(name, cls);
+
+                for (i = 0, ln = associationsConfigs.length; i < ln; ++i) {
+                    associationConfig = associationsConfigs[i];
+                    if (associationConfig.isAssociation) {
+                        associationConfig = Ext.applyIf({
+                            ownerModel: name,
+                            associatedModel: associationConfig.model
+                        }, associationConfig.initialConfig);
+                    } else {
+                        Ext.apply(associationConfig, {
+                            ownerModel: name,
+                            associatedModel: associationConfig.model
+                        });
+                    }
+
+                    if (Ext.ModelManager.getModel(associationConfig.model) === undefined) {
+                        Ext.ModelManager.registerDeferredAssociation(associationConfig);
+                    } else {
+                        associationsMixedCollection.add(Ext.data.association.Association.create(associationConfig));
+                    }
+                }
+
+                data.associations = associationsMixedCollection;
+
+                // onBeforeCreated may get called *asynchronously* if any of those required classes caused
+                // an asynchronous script load. This would mean that the class definition object
+                // has not been applied to the prototype when the Model definition has returned.
+                // The Reader constructor does not attempt to buildExtractors if the fields MixedCollection
+                // has not yet been set. The cls.setProxy call triggers a build of extractor methods.
+                onBeforeClassCreated.call(me, cls, data, hooks);
+
+                // If we have been configured with an instantiated proxy, set it now.
+                if (clsProxy && clsProxy.isProxy) {
+                    cls.setProxy(clsProxy);
+                }
+
+                // Fire the onModelDefined template method on ModelManager
+                Ext.ModelManager.onModelDefined(cls);
+            });
+        };
+    },
+
+    inheritableStatics: {
+        /**
+         * Sets the Proxy to use for this model. Accepts any options that can be accepted by
+         * {@link Ext#createByAlias Ext.createByAlias}.
+         * @param {String/Object/Ext.data.proxy.Proxy} proxy The proxy
+         * @return {Ext.data.proxy.Proxy}
+         * @static
+         * @inheritable
+         */
+        setProxy: function(proxy) {
+            //make sure we have an Ext.data.proxy.Proxy object
+            if (!proxy.isProxy) {
+                if (typeof proxy == "string") {
+                    proxy = {
+                        type: proxy
+                    };
+                }
+                proxy = Ext.createByAlias("proxy." + proxy.type, proxy);
+            }
+            proxy.setModel(this);
+            this.proxy = this.prototype.proxy = proxy;
+
+            return proxy;
+        },
+
+        /**
+         * Returns the configured Proxy for this Model
+         * @return {Ext.data.proxy.Proxy} The proxy
+         * @static
+         * @inheritable
+         */
+        getProxy: function() {
+
+            var proxy = this.proxy;
+
+            // Not yet been created wither from prototype property set in onClassExtended, or by cloning superclass's Proxy...
+            if (!proxy) {
+                proxy = this.prototype.proxy;
+
+                // If we inherited an instantiated Propxy, we can't share it, so clone it.
+                if (proxy.isProxy) {
+                    proxy = proxy.clone()
+                }
+
+                return this.setProxy(proxy);
+            }
+
+            return proxy;
+        },
+
+        /**
+         * Apply a new set of field and/or property definitions to the existing model. This will replace any existing
+         * fields, including fields inherited from superclasses. Mainly for reconfiguring the
+         * model based on changes in meta data (called from Reader's onMetaChange method).
+         * @static
+         * @inheritable
+         */
+        setFields: function(fields, idProperty, clientIdProperty) {
+            var me = this,
+                newField,
+                idField,
+                idFieldDefined = false,
+                proto = me.prototype,
+                prototypeFields = proto.fields,
+                superFields = proto.superclass.fields,
+                len,
+                i;
+
+            if (idProperty) {
+                proto.idProperty = idProperty;
+                idField = idProperty.isField ? idProperty : new Ext.data.Field(idProperty);
+
+            }
+            if (clientIdProperty) {
+                proto.clientIdProperty = clientIdProperty;
+            }
+
+            if (prototypeFields) {
+                prototypeFields.clear();
+            }
+            else {
+                prototypeFields = me.prototype.fields = new Ext.util.MixedCollection(false, function(field) {
+                    return field.name;
+                });
+            }
+
+            // Merge the fields of the superclass and the passed in fields
+            if (superFields) {
+                fields = superFields.items.concat(fields);
+            }
+
+            for (i = 0, len = fields.length; i < len; i++) {
+                newField = new Ext.data.Field(fields[i]);
+
+                // If a defined Field encapsulates the idProperty, then we do not have to create a separate identifying field.
+                // Also, this field must never have a default value set if no value arrives from the server side.
+                // So override any possible prototype-provided defaultValue with undefined which will inhibit generation of defaulting code in Reader.buildRecordDataExtractor
+                if (idField && ((newField.mapping && (newField.mapping === idField.mapping)) || (newField.name === idField.name))) {
+                    idFieldDefined = true;
+                    newField.defaultValue = undefined;
+                }
+                prototypeFields.add(newField);
+            }
+
+            // If there was an idProperty specified, and there has *not* been a field defined which encapsulates that property,
+            // then create a field which encapsulates that property.
+            // This must never provide a default value.
+            if (idField && !idFieldDefined) {
+                idField.defaultValue = undefined;
+                prototypeFields.add(idField);
+            }
+
+            me.fields = prototypeFields;
+
+            return prototypeFields;
+        },
+
+        /**
+         * Returns an Array of {@link Ext.data.Field Field} definitions which define this Model's structure
+         *
+         * Fields are sorted upon Model class definition. Fields with custom {@link Ext.data.Field#convert convert} functions
+         * are moved to *after* fields with no convert functions. This is so that convert functions which rely on existing
+         * field values will be able to read those field values.
+         *
+         * @return {Ext.data.Field[]} The defined Fields for this Model.
+         *
+         */
+        getFields: function() {
+            return this.prototype.fields.items;
+        },
+
+        /**
+         * Asynchronously loads a model instance by id. Sample usage:
+         *
+         *     Ext.define('MyApp.User', {
+         *         extend: 'Ext.data.Model',
+         *         fields: [
+         *             {name: 'id', type: 'int'},
+         *             {name: 'name', type: 'string'}
+         *         ]
+         *     });
+         *
+         *     MyApp.User.load(10, {
+         *         scope: this,
+         *         failure: function(record, operation) {
+         *             //do something if the load failed
+         *             //record is null
+         *         },
+         *         success: function(record, operation) {
+         *             //do something if the load succeeded
+         *         },
+         *         callback: function(record, operation, success) {
+         *             //do something whether the load succeeded or failed
+         *             //if operation is unsuccessful, record is null
+         *         }
+         *     });
+         *
+         * @param {Number/String} id The id of the model to load
+         * @param {Object} config (optional) config object containing success, failure and callback functions, plus
+         * optional scope
+         * @static
+         * @inheritable
+         */
+        load: function(id, config) {
+            config = Ext.apply({}, config);
+            config = Ext.applyIf(config, {
+                action: 'read',
+                id    : id
+            });
+
+            var operation  = new Ext.data.Operation(config),
+                scope      = config.scope || this,
+                callback;
+
+            callback = function(operation) {
+                var record = null,
+                    success = operation.wasSuccessful();
+                
+                if (success) {
+                    record = operation.getRecords()[0];
+                    // If the server didn't set the id, do it here
+                    if (!record.hasId()) {
+                        record.setId(id);
+                    }
+                    Ext.callback(config.success, scope, [record, operation]);
+                } else {
+                    Ext.callback(config.failure, scope, [record, operation]);
+                }
+                Ext.callback(config.callback, scope, [record, operation, success]);
+            };
+
+            this.getProxy().read(operation, callback, this);
+        }
+    },
+
+    statics: {
+        /**
+         * @property
+         * @static
+         * @private
+         */
+        PREFIX : 'ext-record',
+        /**
+         * @property
+         * @static
+         * @private
+         */
+        AUTO_ID: 1,
+        /**
+         * @property
+         * @static
+         * The update operation of type 'edit'. Used by {@link Ext.data.Store#event-update Store.update} event.
+         */
+        EDIT   : 'edit',
+        /**
+         * @property
+         * @static
+         * The update operation of type 'reject'. Used by {@link Ext.data.Store#event-update Store.update} event.
+         */
+        REJECT : 'reject',
+        /**
+         * @property
+         * @static
+         * The update operation of type 'commit'. Used by {@link Ext.data.Store#event-update Store.update} event.
+         */
+        COMMIT : 'commit',
+
+        /**
+         * Generates a sequential id. This method is typically called when a record is {@link Ext#create
+         * create}d and {@link #constructor no id has been specified} either as a parameter, or through the {@link #idProperty}
+         * in the passed data. The generated id will automatically be assigned to the
+         * record. The returned id takes the form: {PREFIX}-{AUTO_ID}.
+         *
+         * - **PREFIX** : String - Ext.data.Model.PREFIX (defaults to 'ext-record')
+         * - **AUTO_ID** : String - Ext.data.Model.AUTO_ID (defaults to 1 initially)
+         *
+         * @param {Ext.data.Model} rec The record being created. The record does not exist, it's a {@link #phantom}.
+         * @return {String} auto-generated string id, `"ext-record-i++"`;
+         * @static
+         */
+        id: function(rec) {
+            var id = [this.PREFIX, '-', this.AUTO_ID++].join('');
+            rec.phantom = true;
+            rec.internalId = id;
+            return id;
+        }
+    },
+
+    /**
+     * @cfg {String/Object} idgen
+     * The id generator to use for this model. The default id generator does not generate
+     * values for the {@link #idProperty}.
+     *
+     * This can be overridden at the model level to provide a custom generator for a model.
+     * The simplest form of this would be:
+     *
+     *      Ext.define('MyApp.data.MyModel', {
+     *          extend: 'Ext.data.Model',
+     *          requires: ['Ext.data.SequentialIdGenerator'],
+     *          idgen: 'sequential',
+     *          ...
+     *      });
+     *
+     * The above would generate {@link Ext.data.SequentialIdGenerator sequential} id's such
+     * as 1, 2, 3 etc..
+     *
+     * Another useful id generator is {@link Ext.data.UuidGenerator}:
+     *
+     *      Ext.define('MyApp.data.MyModel', {
+     *          extend: 'Ext.data.Model',
+     *          requires: ['Ext.data.UuidGenerator'],
+     *          idgen: 'uuid',
+     *          ...
+     *      });
+     *
+     * An id generation can also be further configured:
+     *
+     *      Ext.define('MyApp.data.MyModel', {
+     *          extend: 'Ext.data.Model',
+     *          idgen: {
+     *              type: 'sequential',
+     *              seed: 1000,
+     *              prefix: 'ID_'
+     *          }
+     *      });
+     *
+     * The above would generate id's such as ID_1000, ID_1001, ID_1002 etc..
+     *
+     * If multiple models share an id space, a single generator can be shared:
+     *
+     *      Ext.define('MyApp.data.MyModelX', {
+     *          extend: 'Ext.data.Model',
+     *          idgen: {
+     *              type: 'sequential',
+     *              id: 'xy'
+     *          }
+     *      });
+     *
+     *      Ext.define('MyApp.data.MyModelY', {
+     *          extend: 'Ext.data.Model',
+     *          idgen: {
+     *              type: 'sequential',
+     *              id: 'xy'
+     *          }
+     *      });
+     *
+     * For more complex, shared id generators, a custom generator is the best approach.
+     * See {@link Ext.data.IdGenerator} for details on creating custom id generators.
+     *
+     * @markdown
+     */
+    idgen: {
+        isGenerator: true,
+        type: 'default',
+
+        generate: function () {
+            return null;
+        },
+        getRecId: function (rec) {
+            return rec.modelName + '-' + rec.internalId;
+        }
+    },
+
+    /**
+     * @property {Boolean} editing
+     * Internal flag used to track whether or not the model instance is currently being edited.
+     * @readonly
+     */
+    editing : false,
+
+    /**
+     * @property {Boolean} dirty
+     * True if this Record has been modified.
+     * @readonly
+     */
+    dirty : false,
+
+    /**
+     * @cfg {String} persistenceProperty
+     * The name of the property on this Persistable object that its data is saved to. Defaults to 'data'
+     * (i.e: all persistable data resides in `this.data`.)
+     * @deprecated This config is deprecated. In future this will no longer be configurable and will be data.
+     */
+    persistenceProperty: 'data',
+
+    evented: false,
+
+    /**
+     * @property {Boolean} isModel
+     * `true` in this class to identify an object as an instantiated Model, or subclass thereof.
+     */
+    isModel: true,
+
+    /**
+     * @property {Boolean} phantom
+     * True when the record does not yet exist in a server-side database (see {@link #setDirty}).
+     * Any record which has a real database pk set as its id property is NOT a phantom -- it's real.
+     */
+    phantom : false,
+
+    /**
+     * @cfg {String/Object/Ext.data.Field} idProperty
+     * The name of the field treated as this Model's unique id. Defaults to 'id'.
+     *
+     * This may also be specified as a Field config object. This means that the identifying field can be calculated
+     * using a {@link Ext.data.Field#convert convert} function which might aggregate several values from the
+     * raw data object to use as an identifier.
+     *
+     * The resulting {@link Ext.data.Field Field} is added to the Model's field collection unless there is already
+     * a configured field with a mapping that reads the same property.
+     *
+     * If defining an **abstract** base Model class, the `idProperty` may be configured as `null` which will mean that
+     * no identifying field will be generated.
+     */
+    idProperty: 'id',
+
+    /**
+     * @cfg {String} [clientIdProperty]
+     * The name of a property that is used for submitting this Model's unique client-side identifier
+     * to the server when multiple phantom records are saved as part of the same {@link Ext.data.Operation Operation}.
+     * In such a case, the server response should include the client id for each record
+     * so that the server response data can be used to update the client-side records if necessary.
+     * This property cannot have the same name as any of this Model's fields.
+     */
+    clientIdProperty: null,
+
+    /**
+     * @cfg {String} defaultProxyType
+     * The string type of the default Model Proxy. Defaults to 'ajax'.
+     */
+    defaultProxyType: 'ajax',
+
+    // Used as a dummy source array when constructor is called with no args
+    emptyData: [],
+
+    // Fields config and property
+    /**
+     * @cfg {Object[]/String[]} fields
+     * The fields for this model. This is an Array of **{@link Ext.data.Field Field}** definition objects. A Field
+     * definition may simply be the *name* of the Field, but a Field encapsulates {@link Ext.data.Field#type data type},
+     * {@link Ext.data.Field#convert custom conversion} of raw data, and a {@link Ext.data.Field#mapping mapping}
+     * property to specify by name of index, how to extract a field's value from a raw data object, so it is best practice
+     * to specify a full set of {@link Ext.data.Field Field} config objects.
+     */
+    /**
+     * @property {Ext.util.MixedCollection} fields
+     * A {@link Ext.util.MixedCollection Collection} of the fields defined for this Model (including fields defined in superclasses)
+     *
+     * This is a collection of {@link Ext.data.Field} instances, each of which encapsulates information that the field was configured with.
+     * By default, you can specify a field as simply a String, representing the *name* of the field, but a Field encapsulates
+     * {@link Ext.data.Field#type data type}, {@link Ext.data.Field#convert custom conversion} of raw data, and a {@link Ext.data.Field#mapping mapping}
+     * property to specify by name of index, how to extract a field's value from a raw data object.
+     */
+
+    /**
+     * @cfg {Object[]} validations
+     * An array of {@link Ext.data.validations validations} for this model.
+     */
+
+    // Associations configs and properties
+    /**
+     * @cfg {Object[]} associations
+     * An array of {@link Ext.data.Association associations} for this model.
+     */
+    /**
+     * @cfg {String/Object/String[]/Object[]} hasMany
+     * One or more {@link Ext.data.HasManyAssociation HasMany associations} for this model.
+     */
+    /**
+     * @cfg {String/Object/String[]/Object[]} belongsTo
+     * One or more {@link Ext.data.BelongsToAssociation BelongsTo associations} for this model.
+     */
+    /**
+     * @cfg {String/Object/Ext.data.proxy.Proxy} proxy
+     * The {@link Ext.data.proxy.Proxy proxy} to use for this model.
+     */
+
+    /**
+     * @event idchanged
+     * Fired when this model's id changes
+     * @param {Ext.data.Model} this
+     * @param {Number/String} oldId The old id
+     * @param {Number/String} newId The new id
+     */
+
+    /**
+     * Creates new Model instance.
+     * @param {Object} data An object containing keys corresponding to this model's fields, and their associated values
+     */
+    constructor: function(data, id, raw, convertedData) {
+        // id, raw and convertedData not documented intentionally, meant to be used internally.
+        // TODO: find where "raw" is used and remove it. The first parameter, "data" is raw, unconverted data.
+        // 
+        // The "convertedData" parameter is a converted object hash with all properties corresponding to defined Fields
+        // and all values of the defined type. It is used directly as this record's data property.
+        // When the convertedData parameter is used, raw data is passed in using the "raw" parameter and
+        // is not processed
+
+        var me = this,
+            passedId = (id || id === 0),
+            hasId,
+            fields,
+            length,
+            field,
+            name,
+            value,
+            newId,
+            persistenceProperty,
+            idProperty = me.idProperty,
+            idField = me.idField,
+            i;
+
+        /**
+         * @property {Object} raw The raw data used to create this model if created via a reader.
+         */
+        me.raw = raw || data; // If created using data in constructor, use data
+
+        /**
+         * @property {Object} modified Key: value pairs of all fields whose values have changed
+         */
+        me.modified = {};
+
+        // exclude types since it's new
+        if (me.persistenceProperty !== 'data') {
+            Ext.log.warn(this.$className, 'The persistenceProperty will be deprecated, all data will be stored in the underlying data property.');
+        }
+        persistenceProperty = me[me.persistenceProperty] = convertedData || {};
+
+        // Until persistenceProperty is deprecated, keep a reference in me.data
+        me.data = me[me.persistenceProperty];
+
+        me.mixins.observable.constructor.call(me);
+
+        if (!convertedData) {
+
+            if (data) {
+                // If no ID passed, use the id property from the converted data
+                if (!passedId && idProperty) {
+                    id = data[idProperty];
+                    hasId = (id || id === 0);
+                }
+            }
+            // No data passed. Use the static empty array.
+            else {
+                data = me.emptyData;
+            } 
+
+            //add default field values if present
+            fields = me.fields.items;
+            length = fields.length;
+            i = 0;
+
+            if (Ext.isArray(data)) {
+                for (; i < length; i++) {
+                    field = fields[i];
+                    name  = field.name;
+
+                    // Use the original ordinal position at which the Model inserted the field into its collection.
+                    // Fields are sorted to place fields with a *convert* function last.
+                    value = data[field.originalIndex];
+
+                    if (value === undefined) {
+                        value = field.defaultValue;
+                    }
+                    // Have to map array data so the values get assigned to the named fields
+                    // rather than getting set as the field names with undefined values.
+                    if (field.convert) {
+                        value = field.convert(value, me);
+                    }
+                    // On instance construction, do not create data properties based on undefined input properties
+                    if (value !== undefined) {
+                        persistenceProperty[name] = value;
+                    }
+                }
+
+            } else {
+               for (; i < length; i++) {
+                    field = fields[i];
+                    name  = field.name;
+                    value = data[name];
+                    if (value === undefined) {
+                        value = field.defaultValue;
+                    }
+                    if (field.convert) {
+                        value = field.convert(value, me);
+                    }
+                    // On instance construction, do not create data properties based on undefined input properties
+                    if (value !== undefined) {
+                        persistenceProperty[name] = value;
+                    }
+               }
+            }
+        }
+
+        /**
+         * @property {Ext.data.Store[]} stores
+         * The {@link Ext.data.Store Stores} to which this instance is bound.
+         */
+        me.stores = [];
+
+        // Caller passed an id, put the converted value into our data object.
+        // The *unconverted* value is used as the internalId.
+        if (passedId) {
+            hasId = true;
+            persistenceProperty[idProperty] = idField && idField.convert ? idField.convert(id) : id;
+        }
+
+        // If there's no id, we are a phantom so we have to generate an id.
+        else if (!hasId) {
+            // Generate a key using the supplied idgen function
+            newId = me.idgen.generate();
+            if (newId != null) {
+                me.preventInternalUpdate = true;
+                me.setId(newId);
+                delete me.preventInternalUpdate;
+            }
+        }
+
+        /**
+         * @property {Number/String} internalId
+         * An internal unique ID for each Model instance, used to identify Models that don't have an ID yet
+         * @private
+         */
+        me.internalId = hasId ? id : Ext.data.Model.id(me);
+        // The Ext.data.Model.id call sets the phantom property. So it will be set now if !hasId
+
+        if (typeof me.init == 'function') {
+            me.init();
+        }
+
+        // Generate an observable ID
+        me.id = me.idgen.getRecId(me);
+    },
+
+    /**
+     * Returns the value of the given field
+     * @param {String} fieldName The field to fetch the value for
+     * @return {Object} The value
+     */
+    get: function(field) {
+        return this[this.persistenceProperty][field];
+    },
+
+    // This object is used whenever the set() method is called and given a string as the
+    // first argument. This approach saves memory (and GC costs) since we could be called
+    // a lot.
+    _singleProp: {},
+
+    /**
+     * Sets the given field to the given value, marks the instance as dirty
+     * @param {String/Object} fieldName The field to set, or an object containing key/value pairs
+     * @param {Object} newValue The value to set
+     * @return {String[]} The array of modified field names or null if nothing was modified.
+     */
+    set: function (fieldName, newValue) {
+        var me = this,
+            data = me[me.persistenceProperty],
+            fields = me.fields,
+            modified = me.modified,
+            single = (typeof fieldName == 'string'),
+            currentValue, field, idChanged, key, modifiedFieldNames, name, oldId,
+            newId, value, values;
+
+        if (single) {
+            values = me._singleProp;
+            values[fieldName] = newValue;
+        } else {
+            values = fieldName;
+        }
+
+        for (name in values) {
+            if (values.hasOwnProperty(name)) {
+                value = values[name];
+
+                if (fields && (field = fields.get(name)) && field.convert) {
+                    value = field.convert(value, me);
+                }
+
+                currentValue = data[name];
+                if (me.isEqual(currentValue, value)) {
+                    continue; // new value is the same, so no change...
+                }
+
+                data[name] = value;
+                (modifiedFieldNames || (modifiedFieldNames = [])).push(name);
+
+                if (field && field.persist) {
+                    if (modified.hasOwnProperty(name)) {
+                        if (me.isEqual(modified[name], value)) {
+                            // The original value in me.modified equals the new value, so
+                            // the field is no longer modified:
+                            delete modified[name];
+
+                            // We might have removed the last modified field, so check to
+                            // see if there are any modified fields remaining and correct
+                            // me.dirty:
+                            me.dirty = false;
+                            for (key in modified) {
+                                if (modified.hasOwnProperty(key)){
+                                    me.dirty = true;
+                                    break;
+                                }
+                            }
+                        }
+                    } else {
+                        me.dirty = true;
+                        modified[name] = currentValue;
+                    }
+                }
+
+                if (name == me.idProperty) {
+                    idChanged = true;
+                    oldId = currentValue;
+                    newId = value;
+                }
+            }
+        }
+
+        if (single) {
+            // cleanup our reused object for next time... important to do this before
+            // we fire any events or call anyone else (like afterEdit)!
+            delete values[fieldName];
+        }
+
+        if (idChanged) {
+            me.changeId(oldId, newId);
+        }
+
+        if (!me.editing && modifiedFieldNames) {
+            me.afterEdit(modifiedFieldNames);
+        }
+
+        return modifiedFieldNames || null;
+    },
+
+    /**
+     * @private
+     * Copies data from the passed record into this record. If the passed record is undefined, does nothing.
+     *
+     * If this is a phantom record (represented only in the client, with no corresponding database entry), and
+     * the source record is not a phantom, then this record acquires the id of the source record.
+     *
+     * @param {Ext.data.Model} sourceRecord The record to copy data from.
+     * @return {String[]} The names of the fields which changed value.
+     */
+    copyFrom: function(sourceRecord) {
+        var me = this,
+            fields = me.fields.items,
+            fieldCount = fields.length,
+            modifiedFieldNames = [],
+            field, i = 0,
+            myData,
+            sourceData,
+            idProperty = me.idProperty,
+            name,
+            value;
+
+        if (sourceRecord) {
+            myData = me[me.persistenceProperty];
+            sourceData = sourceRecord[sourceRecord.persistenceProperty];
+            for (; i < fieldCount; i++) {
+                field = fields[i];
+                name = field.name;
+
+                // Do not use setters.
+                // Copy returned values in directly from the data object.
+                // Converters have already been called because new Records
+                // have been created to copy from.
+                // This is a direct record-to-record value copy operation.
+                // don't copy the id, we'll do it at the end
+                if (name != idProperty) {
+                    value = sourceData[name];
+
+                    // If source property is specified, and value is different
+                    // copy field value in and build updatedFields
+                    if (value !== undefined && !me.isEqual(myData[name], value)) {
+                        myData[name] = value;
+                        modifiedFieldNames.push(name);
+                    }
+                }
+            }
+
+            // If this is a phantom record being updated from a concrete record, copy the ID in.
+            if (me.phantom && !sourceRecord.phantom) {
+                // beginEdit to prevent events firing
+                // commit at the end to prevent dirty being set
+                me.beginEdit();
+                me.setId(sourceRecord.getId());
+                me.endEdit(true);
+                me.commit(true);
+            }
+        }
+        return modifiedFieldNames;
+    },
+
+    /**
+     * Checks if two values are equal, taking into account certain
+     * special factors, for example dates.
+     * @private
+     * @param {Object} a The first value
+     * @param {Object} b The second value
+     * @return {Boolean} True if the values are equal
+     */
+    isEqual: function(a, b) {
+        // instanceof is ~10 times faster then Ext.isDate. Values here will not be cross-document objects
+        if (a instanceof Date && b instanceof Date) {
+            return a.getTime() === b.getTime();
+        }
+        return a === b;
+    },
+
+    /**
+     * Begins an edit. While in edit mode, no events (e.g.. the `update` event) are relayed to the containing store.
+     * When an edit has begun, it must be followed by either {@link #endEdit} or {@link #cancelEdit}.
+     */
+    beginEdit : function(){
+        var me = this,
+            key,
+            data,
+            o;
+
+        if (!me.editing) {
+            me.editing = true;
+            me.dirtySave = me.dirty;
+
+            o = me[me.persistenceProperty];
+            data = me.dataSave = {};
+            for (key in o) {
+                if (o.hasOwnProperty(key)) {
+                    data[key] = o[key];
+                }
+            }
+
+            o = me.modified;
+            data = me.modifiedSave = {}; 
+            for (key in o) {
+                if (o.hasOwnProperty(key)) {
+                    data[key] = o[key];
+                }
+            }
+        }
+    },
+
+    /**
+     * Cancels all changes made in the current edit operation.
+     */
+    cancelEdit : function(){
+        var me = this;
+        if (me.editing) {
+            me.editing = false;
+            // reset the modified state, nothing changed since the edit began
+            me.modified = me.modifiedSave;
+            me[me.persistenceProperty] = me.dataSave;
+            me.dirty = me.dirtySave;
+            me.modifiedSave = me.dataSave = me.dirtySave = null;
+        }
+    },
+
+    /**
+     * Ends an edit. If any data was modified, the containing store is notified
+     * (ie, the store's `update` event will fire).
+     * @param {Boolean} [silent] True to not notify the store of the change
+     * @param {String[]} [modifiedFieldNames] Array of field names changed during edit.
+     */
+    endEdit : function(silent, modifiedFieldNames){
+        var me = this,
+            dataSave,
+            changed;
+
+        silent = silent === true;
+        if (me.editing) {
+            me.editing = false;
+            dataSave = me.dataSave;
+            me.modifiedSave = me.dataSave = me.dirtySave = null;
+            if (!silent) {
+                if (!modifiedFieldNames) {
+                    modifiedFieldNames = me.getModifiedFieldNames(dataSave);
+                }
+                changed = me.dirty || modifiedFieldNames.length > 0;
+                if (changed) {
+                    me.afterEdit(modifiedFieldNames);
+                }
+            }
+        }
+    },
+
+    /**
+     * Gets the names of all the fields that were modified during an edit
+     * @param {Object} [saved] The currently saved data. Defaults to
+     * the dataSave property on the object.
+     * @private
+     * @return {String[]} An array of modified field names
+     */
+    getModifiedFieldNames: function(saved){
+        var me = this,
+            data = me[me.persistenceProperty],
+            modified = [],
+            key;
+
+        saved = saved || me.dataSave;
+        for (key in data) {
+            if (data.hasOwnProperty(key)) {
+                if (!me.isEqual(data[key], saved[key])) {
+                    modified.push(key);
+                }
+            }
+        }
+        return modified; 
+    },
+
+    /**
+     * Gets a hash of only the fields that have been modified since this Model was created or commited.
+     * @return {Object}
+     */
+    getChanges : function(){
+        var modified = this.modified,
+            changes  = {},
+            field;
+
+        for (field in modified) {
+            if (modified.hasOwnProperty(field)){
+                changes[field] = this.get(field);
+            }
+        }
+
+        return changes;
+    },
+
+    /**
+     * Returns true if the passed field name has been `{@link #modified}` since the load or last commit.
+     * @param {String} fieldName {@link Ext.data.Field#name}
+     * @return {Boolean}
+     */
+    isModified : function(fieldName) {
+        return this.modified.hasOwnProperty(fieldName);
+    },
+
+    /**
+     * Marks this **Record** as `{@link #dirty}`. This method is used interally when adding `{@link #phantom}` records
+     * to a {@link Ext.data.proxy.Server#writer writer enabled store}.
+     *
+     * Marking a record `{@link #dirty}` causes the phantom to be returned by {@link Ext.data.Store#getUpdatedRecords}
+     * where it will have a create action composed for it during {@link Ext.data.Model#save model save} operations.
+     */
+    setDirty : function() {
+        var me     = this,
+            fields = me.fields.items,
+            fLen   = fields.length,
+            field, name, f;
+
+        me.dirty = true;
+
+        for (f = 0; f < fLen; f++) {
+            field = fields[f];
+
+            if (field.persist) {
+                name  = field.name;
+                me.modified[name] = me.get(name);
+            }
+        }
+    },
+
+    markDirty : function() {
+        Ext.log.warn('Ext.data.Model: markDirty has been deprecated. Use setDirty instead.');
+
+        return this.setDirty.apply(this, arguments);
+    },
+
+    /**
+     * Usually called by the {@link Ext.data.Store} to which this model instance has been {@link #join joined}. Rejects
+     * all changes made to the model instance since either creation, or the last commit operation. Modified fields are
+     * reverted to their original values.
+     *
+     * Developers should subscribe to the {@link Ext.data.Store#event-update} event to have their code notified of reject
+     * operations.
+     *
+     * @param {Boolean} silent (optional) True to skip notification of the owning store of the change.
+     * Defaults to false.
+     */
+    reject : function(silent) {
+        var me = this,
+            modified = me.modified,
+            field;
+
+        for (field in modified) {
+            if (modified.hasOwnProperty(field)) {
+                if (typeof modified[field] != "function") {
+                    me[me.persistenceProperty][field] = modified[field];
+                }
+            }
+        }
+
+        me.dirty = false;
+        me.editing = false;
+        me.modified = {};
+
+        if (silent !== true) {
+            me.afterReject();
+        }
+    },
+
+    /**
+     * Usually called by the {@link Ext.data.Store} which owns the model instance. Commits all changes made to the
+     * instance since either creation or the last commit operation.
+     *
+     * Developers should subscribe to the {@link Ext.data.Store#event-update} event to have their code notified of commit
+     * operations.
+     *
+     * @param {Boolean} [silent=false] Pass `true` to skip notification of the owning store of the change.
+     * @param {String[]} [modifiedFieldNames] Array of field names changed during sync with server if known.
+     * Omit or pass `null` if unknown. An empty array means that it is known that no fields were modified
+     * by the server's response.
+     * Defaults to false.
+     */
+    commit : function(silent, modifiedFieldNames) {
+        var me = this;
+
+        me.phantom = me.dirty = me.editing = false;
+        me.modified = {};
+
+        if (silent !== true) {
+            me.afterCommit(modifiedFieldNames);
+        }
+    },
+
+    /**
+     * Creates a copy (clone) of this Model instance.
+     *
+     * @param {String} [id] A new id, defaults to the id of the instance being copied.
+     * See `{@link Ext.data.Model#id id}`. To generate a phantom instance with a new id use:
+     *
+     *     var rec = record.copy(); // clone the record
+     *     Ext.data.Model.id(rec); // automatically generate a unique sequential id
+     *
+     * @return {Ext.data.Model}
+     */
+    copy : function(newId) {
+        var me = this;
+        return new me.self(me.raw, newId, null, Ext.apply({}, me[me.persistenceProperty]));
+    },
+
+    /**
+     * Sets the Proxy to use for this model. Accepts any options that can be accepted by
+     * {@link Ext#createByAlias Ext.createByAlias}.
+     *
+     * @param {String/Object/Ext.data.proxy.Proxy} proxy The proxy
+     * @return {Ext.data.proxy.Proxy}
+     */
+    setProxy: function(proxy) {
+        //make sure we have an Ext.data.proxy.Proxy object
+        if (!proxy.isProxy) {
+            if (typeof proxy === "string") {
+                proxy = {
+                    type: proxy
+                };
+            }
+            proxy = Ext.createByAlias("proxy." + proxy.type, proxy);
+        }
+        proxy.setModel(this.self);
+        this.proxy = proxy;
+
+        return proxy;
+    },
+
+    /**
+     * Returns the configured Proxy for this Model.
+     * @return {Ext.data.proxy.Proxy} The proxy
+     */
+    getProxy: function() {
+        return this.hasOwnProperty('proxy') ? this.proxy : this.self.getProxy();
+    },
+
+    /**
+     * Validates the current data against all of its configured {@link #validations}.
+     * @return {Ext.data.Errors} The errors object
+     */
+    validate: function() {
+        var errors      = new Ext.data.Errors(),
+            validations = this.validations,
+            validators  = Ext.data.validations,
+            length, validation, field, valid, type, i;
+
+        if (validations) {
+            length = validations.length;
+
+            for (i = 0; i < length; i++) {
+                validation = validations[i];
+                field = validation.field || validation.name;
+                type  = validation.type;
+                valid = validators[type](validation, this.get(field));
+
+                if (!valid) {
+                    errors.add({
+                        field  : field,
+                        message: validation.message || validators[type + 'Message']
+                    });
+                }
+            }
+        }
+
+        return errors;
+    },
+
+    /**
+     * Checks if the model is valid. See {@link #validate}.
+     * @return {Boolean} True if the model is valid.
+     */
+    isValid: function(){
+        return this.validate().isValid();
+    },
+
+    /**
+     * Saves the model instance using the configured proxy.
+     * @param {Object} [options] Options to pass to the proxy. Config object for {@link Ext.data.Operation}.
+     * @return {Ext.data.Model} The Model instance
+     */
+    save: function(options) {
+        options = Ext.apply({}, options);
+
+        var me     = this,
+            action = me.phantom ? 'create' : 'update',
+            scope  = options.scope || me,
+            stores = me.stores,
+            i = 0,
+            storeCount,
+            store,
+            operation,
+            callback;
+
+        Ext.apply(options, {
+            records: [me],
+            action : action
+        });
+
+        operation = new Ext.data.Operation(options);
+
+        callback = function(operation) {
+            var success = operation.wasSuccessful();
+            
+            if (success) {
+                for(storeCount = stores.length; i < storeCount; i++) {
+                    store = stores[i];
+                    store.fireEvent('write', store, operation);
+                    store.fireEvent('datachanged', store);
+                    // Not firing refresh here, since it's a single record
+                }
+                Ext.callback(options.success, scope, [me, operation]);
+            }
+            else {
+                Ext.callback(options.failure, scope, [me, operation]);
+            }
+
+            Ext.callback(options.callback, scope, [me, operation, success]);
+        };
+
+        me.getProxy()[action](operation, callback, me);
+
+        return me;
+    },
+
+    /**
+     * Destroys the model using the configured proxy.
+     * @param {Object} options Options to pass to the proxy. Config object for {@link Ext.data.Operation}.
+     * @return {Ext.data.Model} The Model instance
+     */
+    destroy: function(options) {
+        options = Ext.apply({
+            records: [this],
+            action : 'destroy'
+        }, options);
+
+        var me = this,
+            isNotPhantom = me.phantom !== true,
+            scope  = options.scope || me,
+            stores,
+            i = 0,
+            storeCount,
+            store,
+            args,
+            operation,
+            callback;
+
+        operation = new Ext.data.Operation(options);
+
+        callback = function(operation) {
+            args = [me, operation];
+
+            // The stores property will be mutated, so clone it first
+            stores = Ext.Array.clone(me.stores);
+            if (operation.wasSuccessful()) {
+                for (storeCount = stores.length; i < storeCount; i++) {
+                    store = stores[i];
+
+                    // If the store has a remove (it's not a TreeStore), then
+                    // remove this record from Store. Avoid Store handling anything by passing the "isMove" flag
+                    if (store.remove) {
+                        store.remove(me, true);
+                    }
+
+                    // Other parties may need to know that the record as gone
+                    // eg View SelectionModels
+                    store.fireEvent('bulkremove', store, [me], [store.indexOf(me)], false);
+                    if (isNotPhantom) {
+                        store.fireEvent('write', store, operation);
+                    }
+                }
+                me.clearListeners();
+                Ext.callback(options.success, scope, args);
+            } else {
+                Ext.callback(options.failure, scope, args);
+            }
+            Ext.callback(options.callback, scope, args);
+        };
+
+        // Not a phantom, then we must perform this operation on the remote datasource.
+        // Record will be removed from the store in the callback upon a success response
+        if (isNotPhantom) {
+            me.getProxy().destroy(operation, callback, me);
+        }
+        // If it's a phantom, then call the callback directly with a dummy successful ResultSet
+        else {
+            operation.complete = operation.success = true;
+            operation.resultSet = me.getProxy().reader.nullResultSet;
+            callback(operation);
+        }
+        return me;
+    },
+
+    /**
+     * Returns the unique ID allocated to this model instance as defined by {@link #idProperty}.
+     * @return {Number/String} The id
+     */
+    getId: function() {
+        return this.get(this.idField.name);
+    },
+
+    /**
+     * @private
+     */
+    getObservableId: function() {
+        return this.id;
+    },
+
+    /**
+     * Sets the model instance's id field to the given id.
+     * @param {Number/String} id The new id
+     */
+    setId: function(id) {
+        this.set(this.idProperty, id);
+    },
+
+    changeId: function(oldId, newId) {
+        var me = this,
+            hasOldId, hasId, oldInternalId;
+
+        if (!me.preventInternalUpdate) { 
+            hasOldId = me.hasId(oldId);
+            hasId = me.hasId(newId);
+            oldInternalId = me.internalId;
+            me.phantom  = !hasId;
+            // The internal id changes if:
+            // a) We had an id before and now we don't
+            // b) We didn't have an id before and now we do
+            // c) We had an id and we're setting a new id
+            if (hasId !== hasOldId || (hasId && hasOldId)) {
+                me.internalId = hasId ? newId : Ext.data.Model.id(me);
+            }
+
+            me.fireEvent('idchanged', me, oldId, newId, oldInternalId);
+            me.callStore('onIdChanged', oldId, newId, oldInternalId);
+         }
+    },
+
+    /**
+     * @private
+     * Checks if this model has an id assigned
+     * @param {Object} [id] The id, if not passed it will call getId()
+     * @return {Boolean} True if the model has an id
+     */
+    hasId: function(id) {
+        if (arguments.length === 0) {
+            id = this.getId();
+        }
+        return !!(id || id === 0);
+    },
+
+    /**
+     * Tells this model instance that it has been added to a store.
+     * @param {Ext.data.Store} store The store to which this model has been added.
+     */
+    join : function(store) {
+        var me = this;
+
+        // Code for the 99% use case using fast way!
+        if (!me.stores.length) {
+            me.stores[0] = store;
+        } else {
+            Ext.Array.include(this.stores, store);
+        }
+
+        /**
+         * @property {Ext.data.Store} store
+         * The {@link Ext.data.Store Store} to which this instance belongs. NOTE: If this
+         * instance is bound to multiple stores, this property will reference only the
+         * first. To examine all the stores, use the {@link #stores} property instead.
+         */
+        this.store = this.stores[0]; // compat w/all releases ever
+    },
+
+    /**
+     * Tells this model instance that it has been removed from the store.
+     * @param {Ext.data.Store} store The store from which this model has been removed.
+     */
+    unjoin: function(store) {
+        Ext.Array.remove(this.stores, store);
+        this.store = this.stores[0] || null; // compat w/all releases ever
+    },
+
+    /**
+     * @private
+     * If this Model instance has been {@link #join joined} to a {@link Ext.data.Store store}, the store's
+     * afterEdit method is called.
+     * @param {String[]} [modifiedFieldNames] Array of field names changed during edit.
+     */
+    afterEdit : function(modifiedFieldNames) {
+        this.callStore('afterEdit', modifiedFieldNames);
+    },
+
+    /**
+     * @private
+     * If this Model instance has been {@link #join joined} to a {@link Ext.data.Store store}, the store's
+     * afterReject method is called.
+     */
+    afterReject : function() {
+        this.callStore('afterReject');
+    },
+
+    /**
+     * @private
+     * If this Model instance has been {@link #join joined} to a {@link Ext.data.Store store}, the store's
+     * afterCommit method is called,
+     * @param {String[]} [modifiedFieldNames] Array of field names changed by syncing this field with the server.
+     */
+    afterCommit: function(modifiedFieldNames) {
+        this.callStore('afterCommit', modifiedFieldNames);
+    },
+
+    /**
+     * @private
+     * Helper function used by afterEdit, afterReject and afterCommit. Calls the given method on the
+     * {@link Ext.data.Store store} that this instance has {@link #join joined}, if any. The store function
+     * will always be called with the model instance as its single argument. If this model is joined to 
+     * a Ext.data.NodeStore, then this method calls the given method on the NodeStore and the associated Ext.data.TreeStore
+     * @param {String} fn The function to call on the store
+     */
+    callStore: function(fn) {
+        var args = Ext.Array.clone(arguments),
+            stores = this.stores,
+            i = 0,
+            len = stores.length,
+            store;
+
+        args[0] = this;
+        for (; i < len; ++i) {
+            store = stores[i];
+            if (store && Ext.isFunction(store[fn])) {
+                store[fn].apply(store, args);
+            }
+        }
+    },
+
+    /**
+     * Gets all values for each field in this model and returns an object
+     * containing the current data.
+     * @param {Boolean} includeAssociated True to also include associated data. Defaults to false.
+     * @return {Object} An object hash containing all the values in this model
+     */
+    getData: function(includeAssociated){
+        var me     = this,
+            fields = me.fields.items,
+            fLen   = fields.length,
+            data   = {},
+            name, f;
+
+        for (f = 0; f < fLen; f++) {
+            name = fields[f].name;
+            data[name] = me.get(name);
+        }
+
+        if (includeAssociated === true) {
+            Ext.apply(data, me.getAssociatedData());
+        }
+        return data;
+    },
+
+    /**
+     * Gets all of the data from this Models *loaded* associations. It does this recursively - for example if we have a
+     * User which hasMany Orders, and each Order hasMany OrderItems, it will return an object like this:
+     *
+     *     {
+     *         orders: [
+     *             {
+     *                 id: 123,
+     *                 status: 'shipped',
+     *                 orderItems: [
+     *                     ...
+     *                 ]
+     *             }
+     *         ]
+     *     }
+     *
+     * @return {Object} The nested data set for the Model's loaded associations
+     */
+    getAssociatedData: function(){
+        return this.prepareAssociatedData({}, 1);
+    },
+
+    /**
+     * @private
+     * This complex-looking method takes a given Model instance and returns an object containing all data from
+     * all of that Model's *loaded* associations. See {@link #getAssociatedData}
+     * @param {Object} seenKeys A hash of all the associations we've already seen
+     * @param {Number} depth The current depth
+     * @return {Object} The nested data set for the Model's loaded associations
+     */
+    prepareAssociatedData: function(seenKeys, depth) {
+        /*
+         * In this method we use a breadth first strategy instead of depth
+         * first. The reason for doing so is that it prevents messy & difficult
+         * issues when figuring out which associations we've already processed
+         * & at what depths.
+         */
+        var me               = this,
+            associations     = me.associations.items,
+            associationCount = associations.length,
+            associationData  = {},
+            // We keep 3 lists at the same index instead of using an array of objects.
+            // The reasoning behind this is that this method gets called a lot
+            // So we want to minimize the amount of objects we create for GC.
+            toRead           = [],
+            toReadKey        = [],
+            toReadIndex      = [],
+            associatedStore, associatedRecords, associatedRecord, o, index, result, seenDepth,
+            associationId, associatedRecordCount, association, i, j, type, name;
+
+        for (i = 0; i < associationCount; i++) {
+            association = associations[i];
+            associationId = association.associationId;
+
+            seenDepth = seenKeys[associationId];
+            if (seenDepth && seenDepth !== depth) {
+                continue;
+            }
+            seenKeys[associationId] = depth;
+
+            type = association.type;
+            name = association.name;
+            if (type == 'hasMany') {
+                //this is the hasMany store filled with the associated data
+                associatedStore = me[association.storeName];
+
+                //we will use this to contain each associated record's data
+                associationData[name] = [];
+
+                //if it's loaded, put it into the association data
+                if (associatedStore && associatedStore.getCount() > 0) {
+                    associatedRecords = associatedStore.data.items;
+                    associatedRecordCount = associatedRecords.length;
+
+                    //now we're finally iterating over the records in the association. Get
+                    // all the records so we can process them
+                    for (j = 0; j < associatedRecordCount; j++) {
+                        associatedRecord = associatedRecords[j];
+                        associationData[name][j] = associatedRecord.getData();
+                        toRead.push(associatedRecord);
+                        toReadKey.push(name);
+                        toReadIndex.push(j);
+                    }
+                }
+            } else if (type == 'belongsTo' || type == 'hasOne') {
+                associatedRecord = me[association.instanceName];
+                // If we have a record, put it onto our list
+                if (associatedRecord !== undefined) {
+                    associationData[name] = associatedRecord.getData();
+                    toRead.push(associatedRecord);
+                    toReadKey.push(name);
+                    toReadIndex.push(-1);
+                }
+            }
+        }
+
+        for (i = 0, associatedRecordCount = toRead.length; i < associatedRecordCount; ++i) {
+            associatedRecord = toRead[i];
+            o = associationData[toReadKey[i]];
+            index = toReadIndex[i];
+            result = associatedRecord.prepareAssociatedData(seenKeys, depth + 1);
+            if (index === -1) {
+                Ext.apply(o, result);
+            } else {
+                Ext.apply(o[index], result);
+            }
+        }
+
+        return associationData;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * ServerProxy is a superclass of {@link Ext.data.proxy.JsonP JsonPProxy} and {@link Ext.data.proxy.Ajax AjaxProxy}, and
+ * would not usually be used directly.
+ *
+ * ServerProxy should ideally be named HttpProxy as it is a superclass for all HTTP proxies - for Ext JS 4.x it has been
+ * called ServerProxy to enable any 3.x applications that reference the HttpProxy to continue to work (HttpProxy is now
+ * an alias of AjaxProxy).
+ * @private
+ */
+Ext.define('Ext.data.proxy.Server', {
+    extend:  Ext.data.proxy.Proxy ,
+    alias : 'proxy.server',
+    alternateClassName: 'Ext.data.ServerProxy',
+                                 
+
+    /**
+     * @cfg {String} url
+     * The URL from which to request the data object.
+     */
+
+    /**
+     * @cfg {String} [pageParam="page"]
+     * The name of the 'page' parameter to send in a request. Defaults to 'page'. Set this to undefined if you don't
+     * want to send a page parameter.
+     */
+    pageParam: 'page',
+
+    /**
+     * @cfg {String} [startParam="start"]
+     * The name of the 'start' parameter to send in a request. Defaults to 'start'. Set this to undefined if you don't
+     * want to send a start parameter.
+     */
+    startParam: 'start',
+
+    /**
+     * @cfg {String} [limitParam="limit"]
+     * The name of the 'limit' parameter to send in a request. Defaults to 'limit'. Set this to undefined if you don't
+     * want to send a limit parameter.
+     */
+    limitParam: 'limit',
+
+    /**
+     * @cfg {String} [groupParam="group"]
+     * The name of the 'group' parameter to send in a request. Defaults to 'group'. Set this to undefined if you don't
+     * want to send a group parameter.
+     */
+    groupParam: 'group',
+
+    /**
+     * @cfg {String} [groupDirectionParam="groupDir"]
+     * The name of the direction parameter to send in a request. **This is only used when simpleGroupMode is set to
+     * true.**
+     */
+    groupDirectionParam: 'groupDir',
+
+    /**
+     * @cfg {String} [sortParam="sort"]
+     * The name of the 'sort' parameter to send in a request. Defaults to 'sort'. Set this to undefined if you don't
+     * want to send a sort parameter.
+     */
+    sortParam: 'sort',
+
+    /**
+     * @cfg {String} [filterParam="filter"]
+     * The name of the 'filter' parameter to send in a request. Defaults to 'filter'. Set this to undefined if you don't
+     * want to send a filter parameter.
+     */
+    filterParam: 'filter',
+
+    /**
+     * @cfg {String} [directionParam="dir"]
+     * The name of the direction parameter to send in a request. **This is only used when simpleSortMode is set to
+     * true.**
+     */
+    directionParam: 'dir',
+
+    /**
+     * @cfg {String} [idParam="id"]
+     * The name of the parameter which carries the id of the entity being operated upon.
+     */
+    idParam: 'id',
+
+    /**
+     * @cfg {Boolean} [simpleSortMode=false]
+     * Enabling simpleSortMode in conjunction with remoteSort will only send one sort property and a direction when a
+     * remote sort is requested. The {@link #directionParam} and {@link #sortParam} will be sent with the property name
+     * and either 'ASC' or 'DESC'.
+     */
+    simpleSortMode: false,
+
+    /**
+     * @cfg {Boolean} [simpleGroupMode=false]
+     * Enabling simpleGroupMode in conjunction with remoteGroup will only send one group property and a direction when a
+     * remote group is requested. The {@link #groupDirectionParam} and {@link #groupParam} will be sent with the property name and either 'ASC'
+     * or 'DESC'.
+     */
+    simpleGroupMode: false,
+
+    /**
+     * @cfg {Boolean} [noCache=true]
+     * Disable caching by adding a unique parameter name to the request. Set to false to allow caching. Defaults to true.
+     */
+    noCache : true,
+
+    /**
+     * @cfg {String} [cacheString="_dc"]
+     * The name of the cache param added to the url when using noCache. Defaults to "_dc".
+     */
+    cacheString: "_dc",
+
+    /**
+     * @cfg {Number} timeout
+     * The number of milliseconds to wait for a response. Defaults to 30000 milliseconds (30 seconds).
+     */
+    timeout : 30000,
+
+    /**
+     * @cfg {Object} api
+     * Specific urls to call on CRUD action methods "create", "read", "update" and "destroy". Defaults to:
+     *
+     *     api: {
+     *         create  : undefined,
+     *         read    : undefined,
+     *         update  : undefined,
+     *         destroy : undefined
+     *     }
+     *
+     * The url is built based upon the action being executed [create|read|update|destroy] using the commensurate
+     * {@link #api} property, or if undefined default to the configured
+     * {@link Ext.data.Store}.{@link Ext.data.proxy.Server#url url}.
+     *
+     * For example:
+     *
+     *     api: {
+     *         create  : '/controller/new',
+     *         read    : '/controller/load',
+     *         update  : '/controller/update',
+     *         destroy : '/controller/destroy_action'
+     *     }
+     *
+     * If the specific URL for a given CRUD action is undefined, the CRUD action request will be directed to the
+     * configured {@link Ext.data.proxy.Server#url url}.
+     */
+
+    constructor: function(config) {
+        var me = this;
+
+        config = config || {};
+        /**
+         * @event exception
+         * Fires when the server returns an exception. This event may also be listened
+         * to in the event that a request has timed out or has been aborted.
+         * @param {Ext.data.proxy.Proxy} this
+         * @param {Object} response The response from the AJAX request
+         * @param {Ext.data.Operation} operation The operation that triggered request
+         */
+        me.callParent([config]);
+
+        /**
+         * @cfg {Object} extraParams
+         * Extra parameters that will be included on every request. Individual requests with params of the same name
+         * will override these params when they are in conflict.
+         */
+        me.extraParams = config.extraParams || {};
+
+        me.api = Ext.apply({}, config.api || me.api);
+        
+
+        //backwards compatibility, will be deprecated in 5.0
+        me.nocache = me.noCache;
+    },
+
+    //in a ServerProxy all four CRUD operations are executed in the same manner, so we delegate to doRequest in each case
+    create: function() {
+        return this.doRequest.apply(this, arguments);
+    },
+
+    read: function() {
+        return this.doRequest.apply(this, arguments);
+    },
+
+    update: function() {
+        return this.doRequest.apply(this, arguments);
+    },
+
+    destroy: function() {
+        return this.doRequest.apply(this, arguments);
+    },
+
+    /**
+     * Sets a value in the underlying {@link #extraParams}.
+     * @param {String} name The key for the new value
+     * @param {Object} value The value
+     */
+    setExtraParam: function(name, value) {
+        this.extraParams[name] = value;
+    },
+
+    /**
+     * Creates an {@link Ext.data.Request Request} object from {@link Ext.data.Operation Operation}.
+     *
+     * This gets called from doRequest methods in subclasses of Server proxy.
+     * 
+     * @param {Ext.data.Operation} operation The operation to execute
+     * @return {Ext.data.Request} The request object
+     */
+    buildRequest: function(operation) {
+        var me = this,
+            // Clone params right now so that they can be mutated at any point further down the call stack
+            params = operation.params = Ext.apply({}, operation.params, me.extraParams),
+            request;
+
+        //copy any sorters, filters etc into the params so they can be sent over the wire
+        Ext.applyIf(params, me.getParams(operation));
+
+        // Set up the entity id parameter according to the configured name.
+        // This defaults to "id". But TreeStore has a "nodeParam" configuration which
+        // specifies the id parameter name of the node being loaded.
+        if (operation.id !== undefined && params[me.idParam] === undefined) {
+            params[me.idParam] = operation.id;
+        }
+
+        request = new Ext.data.Request({
+            params   : params,
+            action   : operation.action,
+            records  : operation.records,
+            operation: operation,
+            url      : operation.url,
+
+            // this is needed by JsonSimlet in order to properly construct responses for
+            // requests from this proxy
+            proxy: me
+        });
+
+        request.url = me.buildUrl(request);
+
+        /*
+         * Save the request on the Operation. Operations don't usually care about Request and Response data, but in the
+         * ServerProxy and any of its subclasses we add both request and response as they may be useful for further processing
+         */
+        operation.request = request;
+
+        return request;
+    },
+
+    // Should this be documented as protected method?
+    processResponse: function(success, operation, request, response, callback, scope) {
+        var me = this,
+            reader,
+            result;
+
+        if (success === true) {
+            reader = me.getReader();
+
+            // Apply defaults to incoming data only for read operations.
+            // For create and update, there will already be a client-side record
+            // to match with which will contain any defaulted in values.
+            reader.applyDefaults = operation.action === 'read';
+
+            result = reader.read(me.extractResponseData(response));
+
+            if (result.success !== false) {
+                //see comment in buildRequest for why we include the response object here
+                Ext.apply(operation, {
+                    response: response,
+                    resultSet: result
+                });
+
+                operation.commitRecords(result.records);
+                operation.setCompleted();
+                operation.setSuccessful();
+            } else {
+                operation.setException(result.message);
+                me.fireEvent('exception', this, response, operation);
+            }
+        } else {
+            me.setException(operation, response);
+            me.fireEvent('exception', this, response, operation);
+        }
+
+        //this callback is the one that was passed to the 'read' or 'write' function above
+        if (typeof callback == 'function') {
+            callback.call(scope || me, operation);
+        }
+
+        me.afterRequest(request, success);
+    },
+
+    /**
+     * Sets up an exception on the operation
+     * @private
+     * @param {Ext.data.Operation} operation The operation
+     * @param {Object} response The response
+     */
+    setException: function(operation, response) {
+        operation.setException({
+            status: response.status,
+            statusText: response.statusText
+        });
+    },
+
+    /**
+     * Template method to allow subclasses to specify how to get the response for the reader.
+     * @template
+     * @private
+     * @param {Object} response The server response
+     * @return {Object} The response data to be used by the reader
+     */
+    extractResponseData: Ext.identityFn,
+
+    /**
+     * Encode any values being sent to the server. Can be overridden in subclasses.
+     * @private
+     * @param {Array} value An array of sorters/filters.
+     * @return {Object} The encoded value
+     */
+    applyEncoding: function(value) {
+        return Ext.encode(value);
+    },
+
+    /**
+     * Encodes the array of {@link Ext.util.Sorter} objects into a string to be sent in the request url. By default,
+     * this simply JSON-encodes the sorter data
+     * @param {Ext.util.Sorter[]} sorters The array of {@link Ext.util.Sorter Sorter} objects
+     * @return {String} The encoded sorters
+     */
+    encodeSorters: function(sorters) {
+        var min = [],
+            length = sorters.length,
+            i = 0;
+
+        for (; i < length; i++) {
+            min[i] = {
+                property : sorters[i].property,
+                direction: sorters[i].direction
+            };
+        }
+        return this.applyEncoding(min);
+
+    },
+
+    /**
+     * Encodes the array of {@link Ext.util.Filter} objects into a string to be sent in the request url. By default,
+     * this simply JSON-encodes the filter data
+     * @param {Ext.util.Filter[]} filters The array of {@link Ext.util.Filter Filter} objects
+     * @return {String} The encoded filters
+     */
+    encodeFilters: function(filters) {
+        var min = [],
+            length = filters.length,
+            i = 0;
+
+        for (; i < length; i++) {
+            min[i] = {
+                property: filters[i].property,
+                value   : filters[i].value
+            };
+        }
+        return this.applyEncoding(min);
+    },
+
+    /**
+     * @private
+     * Copy any sorters, filters etc into the params so they can be sent over the wire
+     */
+    getParams: function(operation) {
+        var me = this,
+            params = {},
+            isDef = Ext.isDefined,
+            groupers = operation.groupers,
+            sorters = operation.sorters,
+            filters = operation.filters,
+            page = operation.page,
+            start = operation.start,
+            limit = operation.limit,
+            simpleSortMode = me.simpleSortMode,
+            simpleGroupMode = me.simpleGroupMode,
+            pageParam = me.pageParam,
+            startParam = me.startParam,
+            limitParam = me.limitParam,
+            groupParam = me.groupParam,
+            groupDirectionParam = me.groupDirectionParam,
+            sortParam = me.sortParam,
+            filterParam = me.filterParam,
+            directionParam = me.directionParam,
+            hasGroups, index;
+
+        if (pageParam && isDef(page)) {
+            params[pageParam] = page;
+        }
+
+        if (startParam && isDef(start)) {
+            params[startParam] = start;
+        }
+
+        if (limitParam && isDef(limit)) {
+            params[limitParam] = limit;
+        }
+
+        hasGroups = groupParam && groupers && groupers.length > 0;
+        if (hasGroups) {
+            // Grouper is a subclass of sorter, so we can just use the sorter method
+            if (simpleGroupMode) {
+                params[groupParam] = groupers[0].property;
+                params[groupDirectionParam] = groupers[0].direction || 'ASC';
+            } else {
+                params[groupParam] = me.encodeSorters(groupers);
+            }
+        }
+
+        if (sortParam && sorters && sorters.length > 0) {
+            if (simpleSortMode) {
+                index = 0;
+                // Group will be included in sorters, so grab the next one
+                if (sorters.length > 1 && hasGroups) {
+                    index = 1;
+                }
+                params[sortParam] = sorters[index].property;
+                params[directionParam] = sorters[index].direction;
+            } else {
+                params[sortParam] = me.encodeSorters(sorters);
+            }
+
+        }
+
+        if (filterParam && filters && filters.length > 0) {
+            params[filterParam] = me.encodeFilters(filters);
+        }
+
+        return params;
+    },
+
+    /**
+     * Generates a url based on a given Ext.data.Request object. By default, ServerProxy's buildUrl will add the
+     * cache-buster param to the end of the url. Subclasses may need to perform additional modifications to the url.
+     * @param {Ext.data.Request} request The request object
+     * @return {String} The url
+     */
+    buildUrl: function(request) {
+        var me = this,
+            url = me.getUrl(request);
+
+        if (!url) {
+            Ext.Error.raise("You are using a ServerProxy but have not supplied it with a url.");
+        }
+
+        if (me.noCache) {
+            url = Ext.urlAppend(url, Ext.String.format("{0}={1}", me.cacheString, Ext.Date.now()));
+        }
+
+        return url;
+    },
+
+    /**
+     * Get the url for the request taking into account the order of priority,
+     * - The request
+     * - The api
+     * - The url
+     * @private
+     * @param {Ext.data.Request} request The request
+     * @return {String} The url
+     */
+    getUrl: function(request) {
+        return request.url || this.api[request.action] || this.url;
+    },
+
+    /**
+     * In ServerProxy subclasses, the {@link #create}, {@link #read}, {@link #update} and {@link #destroy} methods all
+     * pass through to doRequest. Each ServerProxy subclass must implement the doRequest method - see {@link
+     * Ext.data.proxy.JsonP} and {@link Ext.data.proxy.Ajax} for examples. This method carries the same signature as
+     * each of the methods that delegate to it.
+     *
+     * @param {Ext.data.Operation} operation The Ext.data.Operation object
+     * @param {Function} callback The callback function to call when the Operation has completed
+     * @param {Object} scope The scope in which to execute the callback
+     */
+    doRequest: function(operation, callback, scope) {
+        Ext.Error.raise("The doRequest function has not been implemented on your Ext.data.proxy.Server subclass. See src/data/ServerProxy.js for details");
+    },
+
+    /**
+     * Optional callback function which can be used to clean up after a request has been completed.
+     * @param {Ext.data.Request} request The Request object
+     * @param {Boolean} success True if the request was successful
+     * @protected
+     * @template
+     * @method
+     */
+    afterRequest: Ext.emptyFn,
+
+    onDestroy: function() {
+        Ext.destroy(this.reader, this.writer);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * AjaxProxy is one of the most widely-used ways of getting data into your application. It uses AJAX requests to load
+ * data from the server, usually to be placed into a {@link Ext.data.Store Store}. Let's take a look at a typical setup.
+ * Here we're going to set up a Store that has an AjaxProxy. To prepare, we'll also set up a {@link Ext.data.Model
+ * Model}:
+ *
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: ['id', 'name', 'email']
+ *     });
+ *
+ *     //The Store contains the AjaxProxy as an inline configuration
+ *     var store = Ext.create('Ext.data.Store', {
+ *         model: 'User',
+ *         proxy: {
+ *             type: 'ajax',
+ *             url : 'users.json'
+ *         }
+ *     });
+ *
+ *     store.load();
+ *
+ * Our example is going to load user data into a Store, so we start off by defining a {@link Ext.data.Model Model} with
+ * the fields that we expect the server to return. Next we set up the Store itself, along with a
+ * {@link Ext.data.Store#proxy proxy} configuration. This configuration was automatically turned into an
+ * Ext.data.proxy.Ajax instance, with the url we specified being passed into AjaxProxy's constructor.
+ * It's as if we'd done this:
+ *
+ *     new Ext.data.proxy.Ajax({
+ *         url: 'users.json',
+ *         model: 'User',
+ *         reader: 'json'
+ *     });
+ *
+ * A couple of extra configurations appeared here - {@link #model} and {@link #reader}. These are set by default when we
+ * create the proxy via the Store - the Store already knows about the Model, and Proxy's default {@link
+ * Ext.data.reader.Reader Reader} is {@link Ext.data.reader.Json JsonReader}.
+ *
+ * Now when we call store.load(), the AjaxProxy springs into action, making a request to the url we configured
+ * ('users.json' in this case). As we're performing a read, it sends a GET request to that url (see
+ * {@link #actionMethods} to customize this - by default any kind of read will be sent as a GET request and any kind of write
+ * will be sent as a POST request).
+ *
+ * # Limitations
+ *
+ * AjaxProxy cannot be used to retrieve data from other domains. If your application is running on http://domainA.com it
+ * cannot load data from http://domainB.com because browsers have a built-in security policy that prohibits domains
+ * talking to each other via AJAX.
+ *
+ * If you need to read data from another domain and can't set up a proxy server (some software that runs on your own
+ * domain's web server and transparently forwards requests to http://domainB.com, making it look like they actually came
+ * from http://domainA.com), you can use {@link Ext.data.proxy.JsonP} and a technique known as JSON-P (JSON with
+ * Padding), which can help you get around the problem so long as the server on http://domainB.com is set up to support
+ * JSON-P responses. See {@link Ext.data.proxy.JsonP JsonPProxy}'s introduction docs for more details.
+ *
+ * # Readers and Writers
+ *
+ * AjaxProxy can be configured to use any type of {@link Ext.data.reader.Reader Reader} to decode the server's response.
+ * If no Reader is supplied, AjaxProxy will default to using a {@link Ext.data.reader.Json JsonReader}. Reader
+ * configuration can be passed in as a simple object, which the Proxy automatically turns into a {@link
+ * Ext.data.reader.Reader Reader} instance:
+ *
+ *     var proxy = new Ext.data.proxy.Ajax({
+ *         model: 'User',
+ *         reader: {
+ *             type: 'xml',
+ *             root: 'users'
+ *         }
+ *     });
+ *
+ *     proxy.getReader(); //returns an {@link Ext.data.reader.Xml XmlReader} instance based on the config we supplied
+ *
+ * # Url generation
+ *
+ * AjaxProxy automatically inserts any sorting, filtering, paging and grouping options into the url it generates for
+ * each request. These are controlled with the following configuration options:
+ *
+ * - {@link #pageParam} - controls how the page number is sent to the server (see also {@link #startParam} and {@link #limitParam})
+ * - {@link #sortParam} - controls how sort information is sent to the server
+ * - {@link #groupParam} - controls how grouping information is sent to the server
+ * - {@link #filterParam} - controls how filter information is sent to the server
+ *
+ * Each request sent by AjaxProxy is described by an {@link Ext.data.Operation Operation}. To see how we can customize
+ * the generated urls, let's say we're loading the Proxy with the following Operation:
+ *
+ *     var operation = new Ext.data.Operation({
+ *         action: 'read',
+ *         page  : 2
+ *     });
+ *
+ * Now we'll issue the request for this Operation by calling {@link #read}:
+ *
+ *     var proxy = new Ext.data.proxy.Ajax({
+ *         url: '/users'
+ *     });
+ *
+ *     proxy.read(operation); //GET /users?page=2
+ *
+ * Easy enough - the Proxy just copied the page property from the Operation. We can customize how this page data is sent
+ * to the server:
+ *
+ *     var proxy = new Ext.data.proxy.Ajax({
+ *         url: '/users',
+ *         pageParam: 'pageNumber'
+ *     });
+ *
+ *     proxy.read(operation); //GET /users?pageNumber=2
+ *
+ * Alternatively, our Operation could have been configured to send start and limit parameters instead of page:
+ *
+ *     var operation = new Ext.data.Operation({
+ *         action: 'read',
+ *         start : 50,
+ *         limit : 25
+ *     });
+ *
+ *     var proxy = new Ext.data.proxy.Ajax({
+ *         url: '/users'
+ *     });
+ *
+ *     proxy.read(operation); //GET /users?start=50&limit;=25
+ *
+ * Again we can customize this url:
+ *
+ *     var proxy = new Ext.data.proxy.Ajax({
+ *         url: '/users',
+ *         startParam: 'startIndex',
+ *         limitParam: 'limitIndex'
+ *     });
+ *
+ *     proxy.read(operation); //GET /users?startIndex=50&limitIndex;=25
+ *
+ * AjaxProxy will also send sort and filter information to the server. Let's take a look at how this looks with a more
+ * expressive Operation object:
+ *
+ *     var operation = new Ext.data.Operation({
+ *         action: 'read',
+ *         sorters: [
+ *             new Ext.util.Sorter({
+ *                 property : 'name',
+ *                 direction: 'ASC'
+ *             }),
+ *             new Ext.util.Sorter({
+ *                 property : 'age',
+ *                 direction: 'DESC'
+ *             })
+ *         ],
+ *         filters: [
+ *             new Ext.util.Filter({
+ *                 property: 'eyeColor',
+ *                 value   : 'brown'
+ *             })
+ *         ]
+ *     });
+ *
+ * This is the type of object that is generated internally when loading a {@link Ext.data.Store Store} with sorters and
+ * filters defined. By default the AjaxProxy will JSON encode the sorters and filters, resulting in something like this
+ * (note that the url is escaped before sending the request, but is left unescaped here for clarity):
+ *
+ *     var proxy = new Ext.data.proxy.Ajax({
+ *         url: '/users'
+ *     });
+ *
+ *     proxy.read(operation); //GET /users?sort=[{"property":"name","direction":"ASC"},{"property":"age","direction":"DESC"}]&filter;=[{"property":"eyeColor","value":"brown"}]
+ *
+ * We can again customize how this is created by supplying a few configuration options. Let's say our server is set up
+ * to receive sorting information is a format like "sortBy=name#ASC,age#DESC". We can configure AjaxProxy to provide
+ * that format like this:
+ *
+ *      var proxy = new Ext.data.proxy.Ajax({
+ *          url: '/users',
+ *          sortParam: 'sortBy',
+ *          filterParam: 'filterBy',
+ *
+ *          //our custom implementation of sorter encoding - turns our sorters into "name#ASC,age#DESC"
+ *          encodeSorters: function(sorters) {
+ *              var length   = sorters.length,
+ *                  sortStrs = [],
+ *                  sorter, i;
+ *
+ *              for (i = 0; i < length; i++) {
+ *                  sorter = sorters[i];
+ *
+ *                  sortStrs[i] = sorter.property + '#' + sorter.direction
+ *              }
+ *
+ *              return sortStrs.join(",");
+ *          }
+ *      });
+ *
+ *      proxy.read(operation); //GET /users?sortBy=name#ASC,age#DESC&filterBy;=[{"property":"eyeColor","value":"brown"}]
+ *
+ * We can also provide a custom {@link #encodeFilters} function to encode our filters.
+ *
+ * @constructor
+ * Note that if this HttpProxy is being used by a {@link Ext.data.Store Store}, then the Store's call to
+ * {@link Ext.data.Store#method-load load} will override any specified callback and params options. In this case, use the
+ * {@link Ext.data.Store Store}'s events to modify parameters, or react to loading events.
+ *
+ * @param {Object} config (optional) Config object.
+ * If an options parameter is passed, the singleton {@link Ext.Ajax} object will be used to make the request.
+ */
+Ext.define('Ext.data.proxy.Ajax', {
+                                                       
+    extend:  Ext.data.proxy.Server ,
+    alias: 'proxy.ajax',
+    alternateClassName: ['Ext.data.HttpProxy', 'Ext.data.AjaxProxy'],
+    
+    /**
+     * @property {Object} actionMethods
+     * Mapping of action name to HTTP request method. In the basic AjaxProxy these are set to 'GET' for 'read' actions
+     * and 'POST' for 'create', 'update' and 'destroy' actions. The {@link Ext.data.proxy.Rest} maps these to the
+     * correct RESTful methods.
+     */
+    actionMethods: {
+        create : 'POST',
+        read   : 'GET',
+        update : 'POST',
+        destroy: 'POST'
+    },
+
+    /**
+     * @cfg {Boolean} binary
+     * True to request binary data from the server.  This feature requires
+     * the use of a binary reader such as {@link Ext.data.amf.Reader AMF Reader}
+     */
+    binary: false,
+    
+    /**
+     * @cfg {Object} headers
+     * Any headers to add to the Ajax request. Defaults to undefined.
+     */
+    
+    doRequest: function(operation, callback, scope) {
+        var writer  = this.getWriter(),
+            request = this.buildRequest(operation);
+            
+        if (operation.allowWrite()) {
+            request = writer.write(request);
+        }
+        
+        Ext.apply(request, {
+            binary        : this.binary,
+            headers       : this.headers,
+            timeout       : this.timeout,
+            scope         : this,
+            callback      : this.createRequestCallback(request, operation, callback, scope),
+            method        : this.getMethod(request),
+            disableCaching: false // explicitly set it to false, ServerProxy handles caching
+        });
+        
+        Ext.Ajax.request(request);
+        
+        return request;
+    },
+    
+    /**
+     * Returns the HTTP method name for a given request. By default this returns based on a lookup on
+     * {@link #actionMethods}.
+     * @param {Ext.data.Request} request The request object
+     * @return {String} The HTTP method to use (should be one of 'GET', 'POST', 'PUT' or 'DELETE')
+     */
+    getMethod: function(request) {
+        return this.actionMethods[request.action];
+    },
+    
+    /**
+     * @private
+     * TODO: This is currently identical to the JsonPProxy version except for the return function's signature. There is a lot
+     * of code duplication inside the returned function so we need to find a way to DRY this up.
+     * @param {Ext.data.Request} request The Request object
+     * @param {Ext.data.Operation} operation The Operation being executed
+     * @param {Function} callback The callback function to be called when the request completes. This is usually the callback
+     * passed to doRequest
+     * @param {Object} scope The scope in which to execute the callback function
+     * @return {Function} The callback function
+     */
+    createRequestCallback: function(request, operation, callback, scope) {
+        var me = this;
+        
+        return function(options, success, response) {
+            me.processResponse(success, operation, request, response, callback, scope);
+        };
+    }
+}, function() {
+    //backwards compatibility, remove in Ext JS 5.0
+    Ext.data.HttpProxy = this;
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Base class for any client-side storage. Used as a superclass for {@link Ext.data.proxy.Memory Memory} and
+ * {@link Ext.data.proxy.WebStorage Web Storage} proxies. Do not use directly, use one of the subclasses instead.
+ * @private
+ */
+Ext.define('Ext.data.proxy.Client', {
+    extend:  Ext.data.proxy.Proxy ,
+    alternateClassName: 'Ext.data.ClientProxy',
+    
+    /**
+     * @property {Boolean} isSynchronous
+     * `true` in this class to identify that requests made on this proxy are
+     * performed synchronously
+     */
+    isSynchronous: true,
+
+    /**
+     * Abstract function that must be implemented by each ClientProxy subclass. This should purge all record data
+     * from the client side storage, as well as removing any supporting data (such as lists of record IDs)
+     */
+    clear: function() {
+        Ext.Error.raise("The Ext.data.proxy.Client subclass that you are using has not defined a 'clear' function. See src/data/ClientProxy.js for details.");
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * In-memory proxy. This proxy simply uses a local variable for data storage/retrieval, so its contents are lost on
+ * every page refresh.
+ *
+ * Usually this Proxy isn't used directly, serving instead as a helper to a {@link Ext.data.Store Store} where a reader
+ * is required to load data. For example, say we have a Store for a User model and have some inline data we want to
+ * load, but this data isn't in quite the right format: we can use a MemoryProxy with a JsonReader to read it into our
+ * Store:
+ *
+ *     //this is the model we will be using in the store
+ *     Ext.define('User', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             {name: 'id',    type: 'int'},
+ *             {name: 'name',  type: 'string'},
+ *             {name: 'phone', type: 'string', mapping: 'phoneNumber'}
+ *         ]
+ *     });
+ *
+ *     //this data does not line up to our model fields - the phone field is called phoneNumber
+ *     var data = {
+ *         users: [
+ *             {
+ *                 id: 1,
+ *                 name: 'Ed Spencer',
+ *                 phoneNumber: '555 1234'
+ *             },
+ *             {
+ *                 id: 2,
+ *                 name: 'Abe Elias',
+ *                 phoneNumber: '666 1234'
+ *             }
+ *         ]
+ *     };
+ *
+ *     //note how we set the 'root' in the reader to match the data structure above
+ *     var store = Ext.create('Ext.data.Store', {
+ *         autoLoad: true,
+ *         model: 'User',
+ *         data : data,
+ *         proxy: {
+ *             type: 'memory',
+ *             reader: {
+ *                 type: 'json',
+ *                 root: 'users'
+ *             }
+ *         }
+ *     });
+ */
+Ext.define('Ext.data.proxy.Memory', {
+    extend:  Ext.data.proxy.Client ,
+    alias: 'proxy.memory',
+    alternateClassName: 'Ext.data.MemoryProxy',
+
+    /**
+     * @cfg {Boolean} [enablePaging=false]
+     * Configure as `true` to enable this MemoryProxy to honour a read operation's `start` and `limit` options.
+     *
+     * When `true`, read operations will be able to read *pages* of records from the data object.
+     */
+
+    /**
+     * @cfg {Object} data
+     * Optional data to pass to configured Reader.
+     */
+
+    constructor: function(config) {
+        this.callParent([config]);
+
+        //ensures that the reader has been instantiated properly
+        this.setReader(this.reader);
+    },
+    
+    /**
+     * @private
+     * Fake processing function to commit the records, set the current operation
+     * to successful and call the callback if provided. This function is shared
+     * by the create, update and destroy methods to perform the bare minimum
+     * processing required for the proxy to register a result from the action.
+     */
+    updateOperation: function(operation, callback, scope) {
+        var i = 0,
+            recs = operation.getRecords(),
+            len = recs.length;
+            
+        for (i; i < len; i++) {
+            recs[i].commit();
+        }
+        operation.setCompleted();
+        operation.setSuccessful();
+        
+        Ext.callback(callback, scope || this, [operation]);
+    },
+    
+    /**
+     * Currently this is a hard-coded method that simply commits any records and sets the operation to successful,
+     * then calls the callback function, if provided. It is essentially mocking a server call in memory, but since
+     * there is no real back end in this case there's not much else to do. This method can be easily overridden to 
+     * implement more complex logic if needed.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    create: function() {
+        this.updateOperation.apply(this, arguments);
+    },
+    
+    /**
+     * Currently this is a hard-coded method that simply commits any records and sets the operation to successful,
+     * then calls the callback function, if provided. It is essentially mocking a server call in memory, but since
+     * there is no real back end in this case there's not much else to do. This method can be easily overridden to 
+     * implement more complex logic if needed.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    update: function() {
+        this.updateOperation.apply(this, arguments);
+    },
+    
+    /**
+     * Currently this is a hard-coded method that simply commits any records and sets the operation to successful,
+     * then calls the callback function, if provided. It is essentially mocking a server call in memory, but since
+     * there is no real back end in this case there's not much else to do. This method can be easily overridden to 
+     * implement more complex logic if needed.
+     * @param {Ext.data.Operation} operation The Operation to perform
+     * @param {Function} callback Callback function to be called when the Operation has completed (whether
+     * successful or not)
+     * @param {Object} scope Scope to execute the callback function in
+     * @method
+     */
+    destroy: function() {
+        this.updateOperation.apply(this, arguments);
+    },
+
+    /**
+     * Reads data from the configured {@link #data} object. Uses the Proxy's {@link #reader}, if present.
+     * @param {Ext.data.Operation} operation The read Operation
+     * @param {Function} callback The callback to call when reading has completed
+     * @param {Object} scope The scope to call the callback function in
+     */
+    read: function(operation, callback, scope) {
+        var me = this,
+            resultSet = operation.resultSet = me.getReader().read(me.data),
+            records = resultSet.records,
+            sorters = operation.sorters,
+            groupers = operation.groupers,
+            filters = operation.filters;
+
+        operation.setCompleted();
+
+        // Apply filters, sorters, and start/limit options
+        if (resultSet.success) {
+
+            // Filter the resulting array of records
+            if (filters && filters.length) {
+                records = resultSet.records = Ext.Array.filter(records, Ext.util.Filter.createFilterFn(filters));
+            }
+
+            // Remotely, groupers just mean top priority sorters
+            if (groupers && groupers.length) {
+                // Must concat so as not to mutate passed sorters array which could be the items property of the sorters collection
+                sorters = sorters ? sorters.concat(groupers) : sorters;
+            }
+
+            // Sort by the specified groupers and sorters
+            if (sorters && sorters.length) {
+                resultSet.records = Ext.Array.sort(records, Ext.util.Sortable.createComparator(sorters));
+            }
+
+            // Reader reads the whole passed data object.
+            // If successful and we were given a start and limit, slice the result.
+            if (me.enablePaging && operation.start !== undefined && operation.limit !== undefined) {
+
+                // Attempt to read past end of memory dataset - convert to failure
+                if (operation.start >= resultSet.total) {
+                    resultSet.success = false;
+                    resultSet.count = 0;
+                    resultSet.records = [];
+                }
+                // Range is valid, slice it up.
+                else {
+                    resultSet.records = Ext.Array.slice(resultSet.records, operation.start, operation.start + operation.limit);
+                    resultSet.count = resultSet.records.length;
+                }
+            }
+        }
+
+        if (resultSet.success) {
+            operation.setSuccessful();
+        } else {
+            me.fireEvent('exception', me, null, operation);
+        }
+        Ext.callback(callback, scope || me, [operation]);
+    },
+
+    clear: Ext.emptyFn
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ * @class Ext.util.LruCache
+ * @extend Ext.util.HashMap
+ * A linked {@link Ext.util.HashMap HashMap} implementation which maintains most recently accessed
+ * items at the end of the list, and purges the cache down to the most recently accessed {@link #maxSize} items
+ * upon add.
+ */
+Ext.define('Ext.util.LruCache', {
+    extend:  Ext.util.HashMap ,
+
+    /**
+     * @cfg {Number} maxSize The maximum size the cache is allowed to grow to before further additions cause
+     * removal of the least recently used entry.
+     */
+
+    constructor: function(config) {
+        Ext.apply(this, config);
+        this.callParent([config]);
+    },
+
+    /*
+     * @inheritdoc
+     */
+    add: function(key, newValue) {
+        var me = this,
+            existingKey = me.findKey(newValue),
+            entry;
+
+        // "new" value is in the list.
+        if (existingKey) {
+            me.unlinkEntry(entry = me.map[existingKey]);
+            entry.prev = me.last;
+            entry.next = null;
+        }
+        // Genuinely new: create an entry for it.
+        else {
+            entry = {
+                prev: me.last,
+                next: null,
+                key: key,
+                value: newValue
+            };
+        }
+
+        // If the list is not empty, update the last entry
+        if (me.last) {
+            me.last.next = entry;
+        }
+        // List is empty
+        else {
+            me.first = entry;
+        }
+        me.last = entry;
+        me.callParent([key, entry]);
+        me.prune();
+        return newValue;
+    },
+
+    // @private
+    insertBefore: function(key, newValue, sibling) {
+        var me = this,
+            existingKey,
+            entry;
+
+        // NOT an assignment.
+        // If there is a following sibling
+        if (sibling = this.map[this.findKey(sibling)]) {
+            existingKey = me.findKey(newValue);
+
+            // "new" value is in the list.
+            if (existingKey) {
+                me.unlinkEntry(entry = me.map[existingKey]);
+            }
+            // Genuinely new: create an entry for it.
+            else {
+                entry = {
+                    prev: sibling.prev,
+                    next: sibling,
+                    key: key,
+                    value: newValue
+                };
+            }
+
+            if (sibling.prev) {
+                entry.prev.next = entry;
+            } else {
+                me.first = entry;
+            }
+            entry.next = sibling;
+            sibling.prev = entry;
+            me.prune();
+            return newValue;
+        }
+        // No following sibling, it's just an add.
+        else {
+            return me.add(key, newValue);
+        }
+    },
+
+    /*
+     * @inheritdoc
+     */
+    get: function(key) {
+        var entry = this.map[key];
+        if (entry) {
+
+            // If it's not the end, move to end of list on get
+            if (entry.next) {
+                this.moveToEnd(entry);
+            }
+            return entry.value;
+        }
+    },
+
+    /*
+     * @private
+     */
+    removeAtKey: function(key) {
+        this.unlinkEntry(this.map[key]);
+        return this.callParent(arguments);
+    },
+
+    /*
+     * @inheritdoc
+     */
+    clear: function(/* private */ initial) {
+        this.first = this.last = null;
+        return this.callParent(arguments);
+    },
+
+    // private. Only used by internal methods.
+    unlinkEntry: function(entry) {
+        // Stitch the list back up.
+        if (entry) {
+            if (entry.next) {
+                entry.next.prev = entry.prev;
+            } else {
+                this.last = entry.prev;
+            }
+            if (entry.prev) {
+                entry.prev.next = entry.next;
+            } else {
+                this.first = entry.next;
+            }
+            entry.prev = entry.next = null;
+        }
+    },
+
+    // private. Only used by internal methods.
+    moveToEnd: function(entry) {
+        this.unlinkEntry(entry);
+
+        // NOT an assignment.
+        // If the list is not empty, update the last entry
+        if (entry.prev = this.last) {
+            this.last.next = entry;
+        }
+        // List is empty
+        else {
+            this.first = entry;
+        }
+        this.last = entry;
+    },
+
+    /*
+     * @private
+     */
+    getArray: function(isKey) {
+        var arr = [],
+            entry = this.first;
+
+        while (entry) {
+            arr.push(isKey ? entry.key: entry.value);
+            entry = entry.next;
+        }
+        return arr;
+    },
+
+    /**
+     * Executes the specified function once for each item in the cache.
+     * Returning false from the function will cease iteration.
+     *
+     * By default, iteration is from least recently used to most recent.
+     *
+     * The paramaters passed to the function are:
+     * <div class="mdetail-params"><ul>
+     * <li><b>key</b> : String<p class="sub-desc">The key of the item</p></li>
+     * <li><b>value</b> : Number<p class="sub-desc">The value of the item</p></li>
+     * <li><b>length</b> : Number<p class="sub-desc">The total number of items in the hash</p></li>
+     * </ul></div>
+     * @param {Function} fn The function to execute.
+     * @param {Object} scope The scope (<code>this</code> reference) to execute in. Defaults to this LruCache.
+     * @param {Boolean} [reverse=false] Pass <code>true</code> to iterate the list in reverse (most recent first) order.
+     * @return {Ext.util.LruCache} this
+     */
+    each: function(fn, scope, reverse) {
+        var me = this,
+            entry = reverse ? me.last : me.first,
+            length = me.length;
+
+        scope = scope || me;
+        while (entry) {
+            if (fn.call(scope, entry.key, entry.value, length) === false) {
+                break;
+            }
+            entry = reverse ? entry.prev : entry.next;
+        }
+        return me;
+    },
+
+    /**
+     * @private
+     */
+    findKey: function(value) {
+        var key,
+            map = this.map;
+
+        for (key in map) {
+            // Attention. Differs from subclass in that this compares the value property
+            // of the entry.
+            if (map.hasOwnProperty(key) && map[key].value === value) {
+                return key;
+            }
+        }
+        return undefined;
+    },
+
+    /**
+     * Performs a shallow copy on this haLruCachesh.
+     * @return {Ext.util.HashMap} The new hash object.
+     */
+    clone: function() {
+        var newCache = new this.self(this.initialConfig),
+            map = this.map,
+            key;
+
+        newCache.suspendEvents();
+        for (key in map) {
+            if (map.hasOwnProperty(key)) {
+                newCache.add(key, map[key].value);
+            }
+        }
+        newCache.resumeEvents();
+        return newCache;
+    },
+
+    /**
+     * Purge the least recently used entries if the maxSize has been exceeded.
+     */
+    prune: function() {
+        var me = this,
+            purgeCount = me.maxSize ? (me.length - me.maxSize) : 0;
+
+        if (purgeCount > 0) {
+            for (; me.first && purgeCount; purgeCount--) {
+                me.removeAtKey(me.first.key);
+            }
+        }
+    }
+
+  /**
+   * @method containsKey
+   * @private
+   */
+  /**
+   * @method contains
+   * @private
+   */
+  /**
+   * @method getKeys
+   * @private
+   */
+  /**
+   * @method getValues
+   * @private
+   */
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.data.PageMap
+ * @extends Ext.util.LruCache
+ * Private class for use by only Store when configured `buffered: true`.
+ * @private
+ */
+Ext.define('Ext.data.PageMap', {
+    extend:  Ext.util.LruCache ,
+
+    // Maintain a generation counter, so that the Store can reject incoming pages destined for the previous generation
+    clear: function(initial) {
+        var me = this;
+        me.pageMapGeneration = (me.pageMapGeneration || 0) + 1;
+        me.callParent(arguments);
+    },
+
+    forEach: function(fn, scope) {
+        var me = this,
+            pageNumbers = Ext.Object.getKeys(me.map),
+            pageCount = pageNumbers.length,
+            i, j,
+            pageNumber,
+            page,
+            pageSize;
+
+        for (i = 0; i < pageCount; i++) {
+            pageNumbers[i] = Number(pageNumbers[i]);
+        }
+        Ext.Array.sort(pageNumbers);
+        scope = scope || me;
+        for (i = 0; i < pageCount; i++) {
+            pageNumber = pageNumbers[i];
+            page = me.getPage(pageNumber);
+            pageSize = page.length;
+            for (j = 0; j < pageSize; j++) {
+                if (fn.call(scope, page[j], (pageNumber - 1) * me.pageSize + j) === false) {
+                    return;
+                }
+            }
+        }
+    },
+
+    /**
+    * Returns the first record in this page map which elicits a true return value from the
+    * passed selection function.
+    *
+    * **IMPORTANT
+    * This can ONLY find records which happen to be cached in the page cache. This will be parts of the dataset around the currently
+    * visible zone, or recently visited zones if the pages have not yet been purged from the cache.
+    * 
+    * This CAN NOT find records which have not been loaded into the cache.**
+    *
+    * If full client side searching is required, do not use a buffered store, instead use a regular, fully loaded store and
+    * use the {@link Ext.grid.plugin.BufferedRenderer BufferedRenderer} plugin to minimize DOM footprint.
+    * @param {Function} fn The selection function to execute for each item.
+    *  @param {Mixed} fn.rec The record.
+    *  @param {Mixed} fn.index The index in the total dataset of the record.
+    * @param {Object} [scope] The scope (`this` reference) in which the function is executed. Defaults to this PageMap.
+    * @return {Object} The first record in this page map which returned true from the selection
+    * function, or null if none was found.
+    */
+    findBy: function(fn, scope) {
+        var me = this,
+            result = null;
+
+        scope = scope || me;
+        me.forEach(function(rec, index) {
+            if (fn.call(scope, rec, index)) {
+                result = rec;
+                return false;
+            }
+        });
+        return result;
+    },
+
+    /**
+    * Returns the index *in the whole dataset* of the first record in this page map which elicits a true return value from the
+    * passed selection function.
+    *
+    * **IMPORTANT
+    * This can ONLY find records which happen to be cached in the page cache. This will be parts of the dataset around the currently
+    * visible zone, or recently visited zones if the pages have not yet been purged from the cache.
+    * 
+    * This CAN NOT find records which have not been loaded into the cache.**
+    *
+    * If full client side searching is required, do not use a buffered store, instead use a regular, fully loaded store and
+    * use the {@link Ext.grid.plugin.BufferedRenderer BufferedRenderer} plugin to minimize DOM footprint.
+    * @param {Function} fn The selection function to execute for each item.
+    *  @param {Mixed} fn.rec The record.
+    *  @param {Mixed} fn.index The index in the total dataset of the record.
+    * @param {Object} [scope] The scope (`this` reference) in which the function is executed. Defaults to this PageMap.
+    * @return {Number} The index first record in this page map which returned true from the selection
+    * function, or -1 if none was found.
+    */
+    findIndexBy: function(fn, scope) {
+        var me = this,
+            result = -1;
+
+        scope = scope || me;
+        me.forEach(function(rec, index) {
+            if (fn.call(scope, rec)) {
+                result = index;
+                return false;
+            }
+        });
+        return result;
+    },
+
+    getPageFromRecordIndex: function() {
+        return Ext.data.Store.prototype.getPageFromRecordIndex.apply(this, arguments);
+    },
+
+    addAll: function(records) {
+        if (this.getCount()) {
+            Ext.Error.raise('Cannot addAll to a non-empty PageMap');
+        }
+        this.addPage(1, records);
+    },
+
+    addPage: function(pageNumber, records) {
+        var me = this,
+            lastPage = pageNumber + Math.floor((records.length - 1) / me.pageSize),
+            startIdx,
+            page;
+
+        // Account for being handed a block of records spanning several pages.
+        // This can happen when loading from a MemoryProxy before a viewSize has been determined.
+        for (startIdx = 0; pageNumber <= lastPage; pageNumber++, startIdx += me.pageSize) {
+            page = Ext.Array.slice(records, startIdx, startIdx + me.pageSize);
+            me.add(pageNumber, page);
+            me.fireEvent('pageAdded', pageNumber, page);
+        }
+    },
+
+    getCount: function() {
+        var result = this.callParent();
+        if (result) {
+            result = (result - 1) * this.pageSize + this.last.value.length;
+        }
+        return result;
+    },
+
+    indexOf: function(record) {
+        return record ? record.index : -1;
+    },
+
+    insert: function() {
+        Ext.Error.raise('insert operation not suppported into buffered Store');
+    },
+
+    remove: function() {
+        Ext.Error.raise('remove operation not suppported from buffered Store');
+    },
+
+    removeAt: function() {
+        Ext.Error.raise('removeAt operation not suppported from buffered Store');
+    },
+
+    getPage: function(pageNumber) {
+        return this.get(pageNumber);
+    },
+
+    hasRange: function(start, end) {
+        var pageNumber = this.getPageFromRecordIndex(start),
+            endPageNumber = this.getPageFromRecordIndex(end);
+
+        for (; pageNumber <= endPageNumber; pageNumber++) {
+            if (!this.hasPage(pageNumber)) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    hasPage: function(pageNumber) {
+        // We must use this.get to trigger an access so that the page which is checked for presence is not eligible for pruning
+        return !!this.get(pageNumber);
+    },
+
+    getAt: function(index) {
+        return this.getRange(index, index)[0];
+    },
+
+    getRange: function(start, end) {
+        if (!this.hasRange(start, end)) {
+            Ext.Error.raise('PageMap asked for range which it does not have');
+        }
+        var me = this,
+            startPageNumber = me.getPageFromRecordIndex(start),
+            endPageNumber = me.getPageFromRecordIndex(end),
+            dataStart = (startPageNumber - 1) * me.pageSize,
+            dataEnd = (endPageNumber * me.pageSize) - 1,
+            pageNumber = startPageNumber,
+            result = [],
+            sliceBegin, sliceEnd, doSlice,
+            i = 0, len;
+
+        for (; pageNumber <= endPageNumber; pageNumber++) {
+
+            // First and last pages will need slicing to cut into the actual wanted records
+            if (pageNumber == startPageNumber) {
+                sliceBegin = start - dataStart;
+                doSlice = true;
+            } else {
+                sliceBegin = 0;
+                doSlice = false;
+            }
+            if (pageNumber == endPageNumber) {
+                sliceEnd = me.pageSize - (dataEnd - end);
+                doSlice = true;
+            }
+
+            // First and last pages will need slicing
+            if (doSlice) {
+                Ext.Array.push(result, Ext.Array.slice(me.getPage(pageNumber), sliceBegin, sliceEnd));
+            } else {
+                Ext.Array.push(result, me.getPage(pageNumber));
+            }
+        }
+
+        // Inject the dataset ordinal position into the record as the index
+        for (len = result.length; i < len; i++) {
+            result[i].index = start++;
+        }
+        return result;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/** */
+Ext.define('Ext.data.Group', {
+
+    extend:  Ext.util.Observable ,
+
+    key: undefined,
+
+    dirty: true,
+
+    constructor: function(){
+        this.callParent(arguments);
+        this.records = [];    
+    },
+
+    contains: function(record){
+        return Ext.Array.indexOf(this.records, record) !== -1;
+    },
+
+    add: function(records) {
+        Ext.Array.push(this.records, records);
+        this.dirty = true;  
+    },
+
+    remove: function(records) {
+        if (!Ext.isArray(records)) {
+            records = [records];
+        }
+
+        var len = records.length,
+            i;
+
+        for (i = 0; i < len; ++i) {
+            Ext.Array.remove(this.records, records[i]);
+        }
+        this.dirty = true;
+    },
+
+    isDirty: function(){
+        return this.dirty;    
+    },
+
+    hasAggregate: function(){
+        return !!this.aggregate;
+    },
+
+    setDirty: function(){
+        this.dirty = true;
+    },
+
+    commit: function(){
+        this.dirty = false;
+    },
+
+    isCollapsed: function(){
+        return this.collapsed;    
+    },
+
+    getAggregateRecord: function(forceNew){
+        var me = this,
+            Model;
+
+        if (forceNew === true || me.dirty || !me.aggregate) {
+            Model = me.store.model;
+            me.aggregate = new Model();
+            me.aggregate.isSummary = true;
+        }
+        return me.aggregate;
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * The Store class encapsulates a client side cache of {@link Ext.data.Model Model} objects. Stores load data via a
+ * {@link Ext.data.proxy.Proxy Proxy}, and also provide functions for {@link #sort sorting}, {@link #filter filtering}
+ * and querying the {@link Ext.data.Model model} instances contained within it.
+ *
+ * Creating a Store is easy - we just tell it the Model and the Proxy to use for loading and saving its data:
+ *
+ *      // Set up a {@link Ext.data.Model model} to use in our Store
+ *      Ext.define('User', {
+ *          extend: 'Ext.data.Model',
+ *          fields: [
+ *              {name: 'firstName', type: 'string'},
+ *              {name: 'lastName',  type: 'string'},
+ *              {name: 'age',       type: 'int'},
+ *              {name: 'eyeColor',  type: 'string'}
+ *          ]
+ *      });
+ *
+ *      var myStore = Ext.create('Ext.data.Store', {
+ *          model: 'User',
+ *          proxy: {
+ *              type: 'ajax',
+ *              url: '/users.json',
+ *              reader: {
+ *                  type: 'json',
+ *                  root: 'users'
+ *              }
+ *          },
+ *          autoLoad: true
+ *      });
+ *
+ * In the example above we configured an AJAX proxy to load data from the url '/users.json'. We told our Proxy to use a
+ * {@link Ext.data.reader.Json JsonReader} to parse the response from the server into Model object - {@link
+ * Ext.data.reader.Json see the docs on JsonReader} for details.
+ *
+ * ## Inline data
+ *
+ * Stores can also load data inline. Internally, Store converts each of the objects we pass in as {@link #cfg-data} into
+ * Model instances:
+ *
+ *      Ext.create('Ext.data.Store', {
+ *          model: 'User',
+ *          data : [
+ *              {firstName: 'Ed',    lastName: 'Spencer'},
+ *              {firstName: 'Tommy', lastName: 'Maintz'},
+ *              {firstName: 'Aaron', lastName: 'Conran'},
+ *              {firstName: 'Jamie', lastName: 'Avins'}
+ *          ]
+ *      });
+ *
+ * Loading inline data using the method above is great if the data is in the correct format already (e.g. it doesn't
+ * need to be processed by a {@link Ext.data.reader.Reader reader}). If your inline data requires processing to decode
+ * the data structure, use a {@link Ext.data.proxy.Memory MemoryProxy} instead (see the {@link Ext.data.proxy.Memory
+ * MemoryProxy} docs for an example).
+ *
+ * Additional data can also be loaded locally using {@link #method-add}.
+ * 
+ * ## Dynamic Loading
+ *
+ * Stores can be dynamically updated by calling the {@link #method-load} method:
+ *
+ *     store.load({
+ *         params: {
+ *             group: 3,
+ *             type: 'user'
+ *         },
+ *         callback: function(records, operation, success) {
+ *             // do something after the load finishes
+ *         },
+ *         scope: this
+ *     });
+ *
+ * Here a bunch of arbitrary parameters is passed along with the load request and a callback function is set
+ * up to do something after the loading is over.
+ *
+ * ## Loading Nested Data
+ *
+ * Applications often need to load sets of associated data - for example a CRM system might load a User and her Orders.
+ * Instead of issuing an AJAX request for the User and a series of additional AJAX requests for each Order, we can load
+ * a nested dataset and allow the Reader to automatically populate the associated models. Below is a brief example, see
+ * the {@link Ext.data.reader.Reader} intro docs for a full explanation:
+ *
+ *      var store = Ext.create('Ext.data.Store', {
+ *          autoLoad: true,
+ *          model: "User",
+ *          proxy: {
+ *              type: 'ajax',
+ *              url: 'users.json',
+ *              reader: {
+ *                  type: 'json',
+ *                  root: 'users'
+ *              }
+ *          }
+ *      });
+ *
+ * Which would consume a response like this:
+ *
+ *      {
+ *          "users": [{
+ *              "id": 1,
+ *              "name": "Ed",
+ *              "orders": [{
+ *                  "id": 10,
+ *                  "total": 10.76,
+ *                  "status": "invoiced"
+ *             },{
+ *                  "id": 11,
+ *                  "total": 13.45,
+ *                  "status": "shipped"
+ *             }]
+ *          }]
+ *      }
+ *
+ * See the {@link Ext.data.reader.Reader} intro docs for a full explanation.
+ *
+ * ## Filtering and Sorting
+ *
+ * Stores can be sorted and filtered - in both cases either remotely or locally. The {@link #cfg-sorters} and
+ * {@link #cfg-filters} are held inside {@link Ext.util.MixedCollection MixedCollection} instances to make them easy to manage.
+ * Usually it is sufficient to either just specify sorters and filters in the Store configuration or call {@link #sort}
+ * or {@link #filter}:
+ *
+ *      var store = Ext.create('Ext.data.Store', {
+ *          model: 'User',
+ *          sorters: [{
+ *              property: 'age',
+ *              direction: 'DESC'
+ *          }, {
+ *              property: 'firstName',
+ *              direction: 'ASC'
+ *          }],
+ *
+ *          filters: [{
+ *              property: 'firstName',
+ *              value: /Ed/
+ *          }]
+ *      });
+ *
+ * The new Store will keep the configured sorters and filters in the MixedCollection instances mentioned above. By
+ * default, sorting and filtering are both performed locally by the Store - see {@link #remoteSort} and
+ * {@link #remoteFilter} to allow the server to perform these operations instead.
+ *
+ * Filtering and sorting after the Store has been instantiated is also easy. Calling {@link #filter} adds another filter
+ * to the Store and automatically filters the dataset (calling {@link #filter} with no arguments simply re-applies all
+ * existing filters). Note that by default {@link #sortOnFilter} is set to true, which means that your sorters are
+ * automatically reapplied if using local sorting.
+ *
+ *     store.filter('eyeColor', 'Brown');
+ *
+ * Change the sorting at any time by calling {@link #sort}:
+ *
+ *     store.sort('height', 'ASC');
+ *
+ * Note that all existing sorters will be removed in favor of the new sorter data (if {@link #sort} is called with no
+ * arguments, the existing sorters are just reapplied instead of being removed). To keep existing sorters and add new
+ * ones, just add them to the MixedCollection:
+ *
+ *     store.sorters.add(new Ext.util.Sorter({
+ *         property : 'shoeSize',
+ *         direction: 'ASC'
+ *     }));
+ *
+ *     store.sort();
+ *
+ * ## Registering with StoreManager
+ *
+ * Any Store that is instantiated with a {@link #storeId} will automatically be registered with the {@link
+ * Ext.data.StoreManager StoreManager}. This makes it easy to reuse the same store in multiple views:
+ *
+ *     //this store can be used several times
+ *     Ext.create('Ext.data.Store', {
+ *         model: 'User',
+ *         storeId: 'usersStore'
+ *     });
+ *
+ *     new Ext.List({
+ *         store: 'usersStore',
+ *         //other config goes here
+ *     });
+ *
+ *     new Ext.view.View({
+ *         store: 'usersStore',
+ *         //other config goes here
+ *     });
+ *
+ * ## Further Reading
+ *
+ * Stores are backed up by an ecosystem of classes that enables their operation. To gain a full understanding of these
+ * pieces and how they fit together, see:
+ *
+ *   - {@link Ext.data.proxy.Proxy Proxy} - overview of what Proxies are and how they are used
+ *   - {@link Ext.data.Model Model} - the core class in the data package
+ *   - {@link Ext.data.reader.Reader Reader} - used by any subclass of {@link Ext.data.proxy.Server ServerProxy} to read a response
+ *
+ * @author Ed Spencer
+ */
+Ext.define('Ext.data.Store', {
+    extend:  Ext.data.AbstractStore ,
+
+    alias: 'store.store',
+
+    // Required classes must be loaded before the definition callback runs
+    // The class definition callback creates a dummy Store which requires that
+    // all the classes below have been loaded.
+               
+                                
+                         
+                              
+                                
+                               
+                               
+                           
+                        
+      
+
+           
+                           
+                          
+      
+
+    /**
+     * @cfg {Boolean} [remoteSort=false]
+     * `true` if the sorting should be performed on the server side, false if it is local only.
+     *
+     * {@link #buffered Buffered} stores automatically set this to `true`. Buffered stores contain an abitrary
+     * subset of the full dataset which depends upon various configurations and which pages have been requested
+     * for rendering. Such *sparse* datasets are ineligible for local sorting.
+     */
+    remoteSort: false,
+
+    /**
+     * @cfg {Boolean} [remoteFilter=false]
+     * `true` if the grouping should be performed on the server side, false if it is local only.
+     *
+     * {@link #buffered Buffered} stores automatically set this to `true`. Buffered stores contain an abitrary
+     * subset of the full dataset which depends upon various configurations and which pages have been requested
+     * for rendering. Such *sparse* datasets are ineligible for local filtering.
+     */
+    remoteFilter: false,
+
+    /**
+     * @cfg {Boolean} [remoteGroup=false]
+     * `true` if the grouping should apply on the server side, false if it is local only.  If the
+     * grouping is local, it can be applied immediately to the data.  If it is remote, then it will simply act as a
+     * helper, automatically sending the grouping information to the server.
+     *
+     * {@link #buffered Buffered} stores automatically set this to `true`. Buffered stores contain an abitrary
+     * subset of the full dataset which depends upon various configurations and which pages have been requested
+     * for rendering. Such *sparse* datasets are ineligible for local grouping.
+     */
+    remoteGroup : false,
+
+    /**
+     * @cfg {Boolean} [autoDestroy=false]
+     * When a Store is used by only one {@link Ext.view.View DataView}, and should only exist for the lifetime of that view, then
+     * configure the autoDestroy flag as `true`. This causes the destruction of the view to trigger the destruction of its Store.
+     */
+
+    /**
+     * @cfg {String/Ext.data.proxy.Proxy/Object} proxy
+     * The Proxy to use for this Store. This can be either a string, a config object or a Proxy instance -
+     * see {@link #setProxy} for details.
+     */
+
+    /**
+     * @cfg {Object[]/Ext.data.Model[]} data
+     * Array of Model instances or data objects to load locally. See "Inline data" above for details.
+     */
+
+    /**
+     * @cfg {String} groupField
+     * The field by which to group data in the store. Internally, grouping is very similar to sorting - the
+     * groupField and {@link #groupDir} are injected as the first sorter (see {@link #sort}). Stores support a single
+     * level of grouping, and groups can be fetched via the {@link #getGroups} method.
+     */
+    groupField: undefined,
+
+    /**
+     * @cfg {String} groupDir
+     * The direction in which sorting should be applied when grouping. Supported values are "ASC" and "DESC".
+     */
+    groupDir: "ASC",
+
+    /**
+     * @cfg {Number} trailingBufferZone
+     * When {@link #buffered}, the number of extra records to keep cached on the trailing side of scrolling buffer
+     * as scrolling proceeds. A larger number means fewer replenishments from the server.
+     */
+    trailingBufferZone: 25,
+
+    /**
+     * @cfg {Number} leadingBufferZone
+     * When {@link #buffered}, the number of extra rows to keep cached on the leading side of scrolling buffer
+     * as scrolling proceeds. A larger number means fewer replenishments from the server.
+     */
+    leadingBufferZone: 200,
+
+    /**
+     * @cfg {Number} pageSize
+     * The number of records considered to form a 'page'. This is used to power the built-in
+     * paging using the nextPage and previousPage functions when the grid is paged using a
+     * {@link Ext.toolbar.Paging PagingToolbar} Defaults to 25.
+     *
+     * If this Store is {@link #buffered}, pages are loaded into a page cache before the Store's
+     * data is updated from the cache. The pageSize is the number of rows loaded into the cache in one request.
+     * This will not affect the rendering of a buffered grid, but a larger page size will mean fewer loads.
+     *
+     * In a buffered grid, scrolling is monitored, and the page cache is kept primed with data ahead of the
+     * direction of scroll to provide rapid access to data when scrolling causes it to be required. Several pages
+     * in advance may be requested depending on various parameters.
+     *
+     * It is recommended to tune the {@link #pageSize}, {@link #trailingBufferZone} and
+     * {@link #leadingBufferZone} configurations based upon the conditions pertaining in your deployed application.
+     *
+     * The provided SDK example `examples/grid/infinite-scroll-grid-tuner.html` can be used to experiment with
+     * different settings including simulating Ajax latency.
+     */
+    pageSize: undefined,
+
+    /**
+     * @property {Number} currentPage
+     * The page that the Store has most recently loaded (see {@link #loadPage})
+     */
+    currentPage: 1,
+
+    /**
+     * @cfg {Boolean} clearOnPageLoad
+     * True to empty the store when loading another page via {@link #loadPage},
+     * {@link #nextPage} or {@link #previousPage}. Setting to false keeps existing records, allowing
+     * large data sets to be loaded one page at a time but rendered all together.
+     */
+    clearOnPageLoad: true,
+
+    /**
+     * @property {Boolean} loading
+     * `true` if the Store is currently loading via its Proxy.
+     * @private
+     */
+    loading: false,
+
+    /**
+     * @cfg {Boolean} sortOnFilter
+     * For local filtering only, causes {@link #sort} to be called whenever {@link #filter} is called,
+     * causing the sorters to be reapplied after filtering.
+     */
+    sortOnFilter: true,
+
+    /**
+     * @cfg {Boolean} buffered
+     * Allows the Store to prefetch and cache in a **page cache**, pages of Records, and to then satisfy
+     * loading requirements from this page cache.
+     *
+     * To use buffered Stores, initiate the process by loading the first page. The number of rows rendered are
+     * determined automatically, and the range of pages needed to keep the cache primed for scrolling is
+     * requested and cached.
+     * Example:
+     *
+     *     myStore.loadPage(1); // Load page 1
+     *
+     * A {@link Ext.grid.plugin.BufferedRenderer BufferedRenderer} is instantiated which will monitor the scrolling in the grid, and
+     * refresh the view's rows from the page cache as needed. It will also pull new data into the page
+     * cache when scrolling of the view draws upon data near either end of the prefetched data.
+     *
+     * The margins which trigger view refreshing from the prefetched data are {@link Ext.grid.plugin.BufferedRenderer#numFromEdge},
+     * {@link Ext.grid.plugin.BufferedRenderer#leadingBufferZone} and {@link Ext.grid.plugin.BufferedRenderer#trailingBufferZone}.
+     *
+     * The margins which trigger loading more data into the page cache are, {@link #leadingBufferZone} and
+     * {@link #trailingBufferZone}.
+     *
+     * By default, only 5 pages of data are cached in the page cache, with pages "scrolling" out of the buffer
+     * as the view moves down through the dataset.
+     * Setting this value to zero means that no pages are *ever* scrolled out of the page cache, and
+     * that eventually the whole dataset may become present in the page cache. This is sometimes desirable
+     * as long as datasets do not reach astronomical proportions.
+     *
+     * Selection state may be maintained across page boundaries by configuring the SelectionModel not to discard
+     * records from its collection when those Records cycle out of the Store's primary collection. This is done
+     * by configuring the SelectionModel like this:
+     *
+     *     selModel: {
+     *         pruneRemoved: false
+     *     }
+     *
+     */
+    buffered: false,
+
+    /**
+     * @cfg {Number} purgePageCount
+     * *Valid only when used with a {@link Ext.data.Store#buffered buffered} Store.*
+     *
+     * The number of pages *additional to the required buffered range* to keep in the prefetch cache before purging least recently used records.
+     *
+     * For example, if the height of the view area and the configured {@link #trailingBufferZone} and {@link #leadingBufferZone} require that there
+     * are three pages in the cache, then a `purgePageCount` of 5 ensures that up to 8 pages can be in the page cache any any one time.
+     *
+     * A value of 0 indicates to never purge the prefetched data.
+     */
+    purgePageCount: 5,
+
+    /**
+     * @cfg {Boolean} [clearRemovedOnLoad=true]
+     * `true` to clear anything in the {@link #removed} record collection when the store loads.
+     */
+    clearRemovedOnLoad: true,
+
+    defaultPageSize: 25,
+
+    // Number of records to load into a buffered grid before it has been bound to a view of known size
+    defaultViewSize: 100,
+
+    // Private. Used as parameter to loadRecords
+    addRecordsOptions: {
+        addRecords: true
+    },
+
+    statics: {
+        recordIdFn: function(record) {
+            return record.internalId;
+        },
+        recordIndexFn: function(record) {
+            return record.index;
+        },
+        grouperIdFn: function(grouper) {
+            return grouper.id || grouper.property;
+        },
+        groupIdFn: function(group) {
+            return group.key;
+        }
+    },
+
+    /**
+     * Creates the store.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        // Clone the config so we don't modify the original config object
+        config = Ext.apply({}, config);
+
+        var me = this,
+            groupers = config.groupers || me.groupers,
+            groupField = config.groupField || me.groupField,
+            proxy,
+            data;
+
+        /**
+         * @event beforeprefetch
+         * Fires before a prefetch occurs. Return `false` to cancel.
+         * @param {Ext.data.Store} this
+         * @param {Ext.data.Operation} operation The associated operation.
+         */
+        /**
+         * @event groupchange
+         * Fired whenever the grouping in the grid changes.
+         * @param {Ext.data.Store} store The store.
+         * @param {Ext.util.Grouper[]} groupers The array of Grouper objects.
+         */
+        /**
+         * @event prefetch
+         * Fires whenever records have been prefetched.
+         * @param {Ext.data.Store} this
+         * @param {Ext.data.Model[]} records An array of records.
+         * @param {Boolean} successful `true` if the operation was successful.
+         * @param {Ext.data.Operation} operation The associated operation.
+         */
+        /**
+         * @event filterchange
+         * Fired whenever the filter set changes.
+         * @param {Ext.data.Store} store The store.
+         * @param {Ext.util.Filter[]} filters The array of Filter objects.
+         */
+        data = config.data || me.data;
+
+        if (data) {
+            me.inlineData = data;
+            delete config.data;
+        }
+
+        if (!groupers && groupField) {
+            groupers = [{
+                property : groupField,
+                direction: config.groupDir || me.groupDir
+            }];
+        
+            // Allow a custom getGroupString implementation to prevail
+            if (config.getGroupString || (me.getGroupString !== Ext.data.Store.prototype.getGroupString)) {
+                groupers[0].getGroupString = function(record) {
+                    return me.getGroupString(record);
+                }
+            }
+        }
+        delete config.groupers;
+
+        /**
+         * @cfg {Ext.util.MixedCollection} groupers
+         * The collection of {@link Ext.util.Grouper Groupers} currently applied to this Store.
+         */
+        me.groupers = new Ext.util.MixedCollection(false, Ext.data.Store.grouperIdFn);
+        me.groupers.addAll(me.decodeGroupers(groupers));
+
+        me.groups = new Ext.util.MixedCollection(false, Ext.data.Store.groupIdFn);
+
+        // AbstractStore.constructor initializes the sorters collection
+        me.callParent([config]);
+        // don't use *config* anymore from here on... use *me* instead...
+
+        if (me.buffered) {
+            me.data = new Ext.data.PageMap({
+                store: me,
+                keyFn: Ext.data.Store.recordIdFn,
+                pageSize: me.pageSize,
+                maxSize: me.purgePageCount,
+                listeners: {
+                    // Whenever PageMap gets cleared, it means we re no longer interested in 
+                    // any outstanding page prefetches, so cancel tham all
+                    clear: me.onPageMapClear,
+                    scope: me
+                }
+            });
+            me.pageRequests = {};
+
+            // Sorting, grouping and filtering may only be remote for buffered stores.
+            me.remoteSort = me.remoteGroup = me.remoteFilter = true;
+
+            me.sortOnLoad = false;
+            me.filterOnLoad = false;
+        } else {
+           /**
+            * @property {Ext.util.MixedCollection/Ext.data.Store.PageMap} data
+            * When this Store is not {@link #buffered}, the `data` property is a MixedCollection which holds this store's local cache of records.
+            * 
+            * When this store *is* {@link #buffered}, the `data` property is a cache of *pages* of records used to satisfy load requests from the Store when the associated view
+            * scrolls. Depending on how the {@link #leadingBufferZone buffer zone} and {@link #purgePageCount} are configured,
+            * pages which are scrolled out of view may be evicted from the cache, and need to be re-requested from the server
+            * when scrolled back into view. For this reason, if using {@link #buffered}, it is recommended that you configure
+            * your Model definitions with a unique {@link Ext.data.Model#idProperty} so that records which return to the page
+            * cache may be matched against previously selected records. 
+            *
+            * Pages in the direction of scroll are prefetched from the remote server and loaded into this cache *before*
+            * they are needed based upon the {@link #leadingBufferZone buffer zone} so that scrolling can proceed without visible pauses for data loading.
+            */
+            me.data = new Ext.util.MixedCollection({
+                getKey: Ext.data.Store.recordIdFn,
+                maintainIndices: true
+            });
+            me.data.pageSize = me.pageSize;
+        }
+
+        // Only sort by group fields if we are doing local grouping
+        if (me.remoteGroup) {
+            me.remoteSort = true;
+        }
+
+        // Keep sorters updated with prepended groupers so that subsequent adds work
+        me.sorters.insert(0, me.groupers.getRange());
+
+        proxy = me.proxy;
+        data = me.inlineData;
+
+        // Page size for non-buffered Store defaults to 25
+        // For a buffered Store, the default page size is taken from the initial call to prefetch.
+        if (!me.buffered && !me.pageSize) {
+            me.pageSize = me.defaultPageSize;
+        }
+
+        // Load inline data
+        if (data) {
+            if (proxy instanceof Ext.data.proxy.Memory) {
+                proxy.data = data;
+                me.read();
+            } else {
+                me.add.apply(me, [data]);
+            }
+            
+            // If there are sorters (These will include any groupers by this stage) and we are sorting locally,
+            // then call group. This will sort, and create groups only if this store has groupers.
+            if (me.sorters.items.length && !me.remoteSort) {
+                me.group(null, null, true);
+            }
+
+            delete me.inlineData;
+        }
+        else if (me.autoLoad) {
+            // Defer the load until after the current event handler has finished and set up any associated views.
+            Ext.defer(me.load, 1, me, [ typeof me.autoLoad === 'object' ? me.autoLoad : undefined ]);
+        }
+    },
+
+    onBeforeSort: function() {
+        var groupers = this.groupers;
+        if (groupers.getCount() > 0) {
+            this.sort(groupers.items, 'prepend', false);
+        }
+    },
+
+    /**
+     * @private
+     * Normalizes an array of grouper objects, ensuring that they are all Ext.util.Grouper instances
+     * @param {Object[]} groupers The groupers array
+     * @return {Ext.util.Grouper[]} Array of Ext.util.Grouper objects
+     */
+    decodeGroupers: function(groupers) {
+        if (!Ext.isArray(groupers)) {
+            if (groupers === undefined) {
+                groupers = [];
+            } else {
+                groupers = [groupers];
+            }
+        }
+
+        var length = groupers.length,
+            Grouper = Ext.util.Grouper,
+            config, i, result = [];
+
+        for (i = 0; i < length; i++) {
+            config = groupers[i];
+
+            if (!(config instanceof Grouper)) {
+                if (Ext.isString(config)) {
+                    config = {
+                        property: config
+                    };
+                }
+
+                config = Ext.apply({
+                    root     : 'data',
+                    direction: "ASC"
+                }, config);
+
+                //support for 3.x style sorters where a function can be defined as 'fn'
+                if (config.fn) {
+                    config.sorterFn = config.fn;
+                }
+
+                //support a function to be passed as a sorter definition
+                if (typeof config == 'function') {
+                    config = {
+                        sorterFn: config
+                    };
+                }
+
+                // return resulting Groupers in a separate array so as not to mutate passed in data objects.
+                result.push(new Grouper(config));
+            } else {
+                result.push(config);
+            }
+        }
+        return result;
+    },
+
+    /**
+     * Groups data inside the store.
+     * @param {String/Object[]} groupers Either a string name of one of the fields in this Store's
+     * configured {@link Ext.data.Model Model}, or an Array of grouper configurations.
+     * @param {String} [direction="ASC"] The overall direction to group the data by.
+     */
+    group: function(groupers, direction, /* private - for initial group */ suppressEvent) {
+        var me = this,
+            grouper,
+            newGroupers;
+
+        // If we were passed groupers, we replace the existing groupers in the sorter collection with the new ones
+        if (groupers) {
+
+            // remove existing groupers from the sorter set
+            me.sorters.removeAll(me.groupers.items);
+
+            if (Ext.isArray(groupers)) {
+                newGroupers = groupers;
+            } else if (Ext.isObject(groupers)) {
+                newGroupers = [groupers];
+            } else if (Ext.isString(groupers)) {
+                grouper = me.groupers.get(groupers);
+
+                if (!grouper) {
+                    grouper = {
+                        property : groupers,
+                        direction: direction || 'ASC'
+                    };
+                    newGroupers = [grouper];
+                } else if (direction === undefined) {
+                    grouper.toggle();
+                } else {
+                    grouper.setDirection(direction);
+                }
+            }
+
+            // If we were passed groupers, replace our grouper collection
+            if (newGroupers && newGroupers.length) {
+                me.groupers.clear();
+                me.groupers.addAll(me.decodeGroupers(newGroupers));
+            }
+
+            // Groupers are prepended into sorter set
+            me.sorters.insert(0, me.groupers.items);
+        }
+
+        if (me.remoteGroup) {
+            if (me.buffered) {
+                me.data.clear();
+                me.loadPage(1, { groupChange: true });
+            } else {
+                me.load({
+                    scope: me,
+                    callback: suppressEvent ? null : me.fireGroupChange
+                });
+            }
+        } else {
+            me.doSort(me.generateComparator());
+            me.constructGroups();
+            if (!suppressEvent) {
+                me.fireGroupChange();
+            }
+        }
+    },
+
+    getGroupField: function(){
+        var first = this.groupers.first(),
+            group;
+
+        if (first) {
+            group = first.property;
+        }   
+        return group; 
+    },
+
+    constructGroups: function(){
+        var me = this,
+            data = this.data.items,
+            len = data.length,
+            groups = me.groups,
+            groupValue, i, group, rec;
+
+        groups.clear();
+
+        if (me.isGrouped()) {
+            for (i = 0; i < len; ++i) {
+                rec = data[i];
+                groupValue = me.getGroupString(rec);
+                group = groups.get(groupValue);
+                if (!group) {
+                    group = new Ext.data.Group({
+                        key: groupValue,
+                        store: me
+                    });
+                    groups.add(groupValue, group);
+                }
+                group.add(rec);
+            }
+        }
+    },
+
+    /**
+     * Clear any groupers in the store
+     */
+    clearGrouping: function() {
+        var me       = this,
+            groupers = me.groupers.items,
+            gLen     = groupers.length,
+            g;
+
+        // Trim groupers out of the sorter set
+        for (g = 0; g < gLen; g++) {
+            me.sorters.remove(groupers[g]);
+        }
+        me.groupers.clear();
+        if (me.remoteGroup) {
+            if (me.buffered) {
+                me.data.clear();
+                me.loadPage(1, { groupChange: true });
+            } else {
+                me.load({
+                    scope: me,
+                    callback: me.fireGroupChange
+                });
+            }
+        } else {
+            me.groups.clear();
+            if (me.sorters.length) {
+                me.sort();
+            } else {
+                me.fireEvent('datachanged', me);
+                me.fireEvent('refresh', me);
+            }
+            me.fireGroupChange();
+        }
+    },
+
+    /**
+     * Checks if the store is currently grouped
+     * @return {Boolean} `true` if the store is grouped.
+     */
+    isGrouped: function() {
+        return this.groupers.getCount() > 0;
+    },
+
+    /**
+     * Fires the groupchange event. Abstracted out so we can use it
+     * as a callback
+     * @private
+     */
+    fireGroupChange: function() {
+        this.fireEvent('groupchange', this, this.groupers);
+    },
+
+    /**
+     * Returns an array containing the result of applying grouping to the records in this store.
+     * See {@link #groupField}, {@link #groupDir} and {@link #getGroupString}. Example for a store
+     * containing records with a color field:
+     *
+     *     var myStore = Ext.create('Ext.data.Store', {
+     *         groupField: 'color',
+     *         groupDir  : 'DESC'
+     *     });
+     *
+     *     myStore.getGroups(); // returns:
+     *     [
+     *         {
+     *             name: 'yellow',
+     *             children: [
+     *                 // all records where the color field is 'yellow'
+     *             ]
+     *         },
+     *         {
+     *             name: 'red',
+     *             children: [
+     *                 // all records where the color field is 'red'
+     *             ]
+     *         }
+     *     ]
+     *
+     * Group contents are effected by filtering.
+     *
+     * @param {String} [groupName] Pass in an optional groupName argument to access a specific
+     * group as defined by {@link #getGroupString}.
+     * @return {Object/Object[]} The grouped data
+     */
+    getGroups: function(requestGroupString) {
+        var records = this.data.items,
+            length = records.length,
+            groups = [],
+            pointers = {},
+            record,
+            groupStr,
+            group,
+            i;
+
+        for (i = 0; i < length; i++) {
+            record = records[i];
+            groupStr = this.getGroupString(record);
+            group = pointers[groupStr];
+
+            if (group === undefined) {
+                group = {
+                    name: groupStr,
+                    children: []
+                };
+
+                groups.push(group);
+                pointers[groupStr] = group;
+            }
+
+            group.children.push(record);
+        }
+
+        return requestGroupString ? pointers[requestGroupString] : groups;
+    },
+
+    /**
+     * @private
+     * For a given set of records and a Grouper, returns an array of arrays - each of which is the set of records
+     * matching a certain group.
+     */
+    getGroupsForGrouper: function(records, grouper) {
+        var length = records.length,
+            groups = [],
+            oldValue,
+            newValue,
+            record,
+            group,
+            i;
+
+        for (i = 0; i < length; i++) {
+            record = records[i];
+            newValue = grouper.getGroupString(record);
+
+            if (newValue !== oldValue) {
+                group = {
+                    name: newValue,
+                    grouper: grouper,
+                    records: []
+                };
+                groups.push(group);
+            }
+
+            group.records.push(record);
+
+            oldValue = newValue;
+        }
+
+        return groups;
+    },
+
+    /**
+     * @private
+     * This is used recursively to gather the records into the configured Groupers. The data MUST have been sorted for
+     * this to work properly (see {@link #getGroupData} and {@link #getGroupsForGrouper}) Most of the work is done by
+     * {@link #getGroupsForGrouper} - this function largely just handles the recursion.
+     *
+     * @param {Ext.data.Model[]} records The set or subset of records to group
+     * @param {Number} grouperIndex The grouper index to retrieve
+     * @return {Object[]} The grouped records
+     */
+    getGroupsForGrouperIndex: function(records, grouperIndex) {
+        var me = this,
+            groupers = me.groupers,
+            grouper = groupers.getAt(grouperIndex),
+            groups = me.getGroupsForGrouper(records, grouper),
+            length = groups.length,
+            i;
+
+        if (grouperIndex + 1 < groupers.length) {
+            for (i = 0; i < length; i++) {
+                groups[i].children = me.getGroupsForGrouperIndex(groups[i].records, grouperIndex + 1);
+            }
+        }
+
+        for (i = 0; i < length; i++) {
+            groups[i].depth = grouperIndex;
+        }
+
+        return groups;
+    },
+
+    /**
+     * @private
+     * Returns records grouped by the configured {@link #groupers grouper} configuration. Sample return value (in
+     * this case grouping by genre and then author in a fictional books dataset):
+     *
+     *     [
+     *         {
+     *             name: 'Fantasy',
+     *             depth: 0,
+     *             records: [
+     *                 //book1, book2, book3, book4
+     *             ],
+     *             children: [
+     *                 {
+     *                     name: 'Rowling',
+     *                     depth: 1,
+     *                     records: [
+     *                         //book1, book2
+     *                     ]
+     *                 },
+     *                 {
+     *                     name: 'Tolkein',
+     *                     depth: 1,
+     *                     records: [
+     *                         //book3, book4
+     *                     ]
+     *                 }
+     *             ]
+     *         }
+     *     ]
+     *
+     * @param {Boolean} [sort=true] `true` to call {@link #sort} before finding groups. Sorting is required to make grouping
+     * function correctly so this should only be set to false if the Store is known to already be sorted correctly.
+     * @return {Object[]} The group data
+     */
+    getGroupData: function(sort) {
+        var me = this;
+        if (sort !== false) {
+            me.sort();
+        }
+
+        return me.getGroupsForGrouperIndex(me.data.items, 0);
+    },
+
+    /**
+     * Returns the string to group on for a given model instance. The default implementation of this method returns
+     * the model's {@link #groupField}, but this can be overridden to group by an arbitrary string. For example, to
+     * group by the first letter of a model's 'name' field, use the following code:
+     *
+     *     Ext.create('Ext.data.Store', {
+     *         groupDir: 'ASC',
+     *         getGroupString: function(instance) {
+     *             return instance.get('name')[0];
+     *         }
+     *     });
+     *
+     * @param {Ext.data.Model} instance The model instance
+     * @return {String} The string to compare when forming groups
+     */
+    getGroupString: function(instance) {
+        var group = this.groupers.first();
+        if (group) {
+            return group.getGroupString(instance);
+        }
+        return '';
+    },
+
+    /**
+     * Inserts Model instances into the Store at the given index and fires the {@link #event-add} event.
+     * See also {@link #method-add}.
+     *
+     * @param {Number} index The start index at which to insert the passed Records.
+     * @param {Ext.data.Model[]} records An Array of Ext.data.Model objects to add to the store.
+     * @return {Ext.data.Model[]} records The added records
+     */
+    insert: function(index, records) {
+        var me = this,
+            sync = false,
+            i, len, record,
+            defaults = me.modelDefaults,
+            out;
+
+        // isIterable allows an argument list of multiple records to be passed unchanged (from add)
+        if (!Ext.isIterable(records)) {
+            out = records = [records];
+        } else {
+            out = [];
+        }
+        len = records.length;
+
+        if (len) {
+            for (i = 0; i < len; i++) {
+                record = records[i];
+                if (!record.isModel) {
+                    record = me.createModel(record);
+                }
+                out[i] = record;
+                if (defaults) {
+                    record.set(defaults);
+                }
+
+                record.join(me);
+                sync = sync || record.phantom === true;
+            }
+            // Add records to data in one shot
+            me.data.insert(index, out);
+
+            if (me.snapshot) {
+                me.snapshot.addAll(out);
+            }
+
+            if (me.requireSort) {
+                // suspend events so the usual data changed events don't get fired.
+                me.suspendEvents();
+                me.sort();
+                me.resumeEvents();
+            }
+
+            if (me.isGrouped()) {
+                me.updateGroupsOnAdd(out);
+            }
+
+            me.fireEvent('add', me, out, index);
+            me.fireEvent('datachanged', me);
+            if (me.autoSync && sync && !me.autoSyncSuspended) {
+                me.sync();
+            }
+        }
+        return out;
+    },
+
+    updateGroupsOnAdd: function(records) {
+        var me = this,
+            groups = me.groups,
+            len = records.length,
+            i, groupName, group, rec;
+
+        for (i = 0; i < len; ++i) {
+            rec = records[i];
+            groupName = me.getGroupString(rec);
+            group = groups.getByKey(groupName);
+            if (!group) {
+                group = groups.add(new Ext.data.Group({
+                    key: groupName,
+                    store: me
+                }));
+            }
+            group.add(rec);
+        }
+    },
+
+    updateGroupsOnRemove: function(records) {
+        var me = this,
+            groups = me.groups,
+            len = records.length,
+            i, groupName, group, rec;
+
+        for (i = 0; i < len; ++i) {
+            rec = records[i];
+            groupName = me.getGroupString(rec);
+            group = groups.getByKey(groupName);
+
+            if (group) {
+                group.remove(rec);
+                if (group.records.length === 0) {
+                    groups.remove(group);
+                }    
+            }
+        }
+    },
+
+    updateGroupsOnUpdate: function(record, modifiedFieldNames){
+        var me = this,
+            groupField = me.getGroupField(),
+            groupName = me.getGroupString(record),
+            groups = me.groups,
+            len, i, items, group;
+
+        if (modifiedFieldNames && Ext.Array.indexOf(modifiedFieldNames, groupField) !== -1) {
+
+            // Sorting is remote for buffered stores, we cannot update a field which is a sort key
+            if (me.buffered) {
+                Ext.Error.raise({
+                    msg: 'Cannot move records between groups in a buffered store record'
+                });
+            }
+
+            // First find the old group and remove the record
+            items = groups.items;
+            for (i = 0, len = items.length; i < len; ++i) {
+                group = items[i];
+                if (group.contains(record)) {
+                    group.remove(record);
+                    break;
+                }
+            }
+            group = groups.getByKey(groupName);
+            if (!group) {
+                group = groups.add(new Ext.data.Group({
+                    key: groupName,
+                    store: me
+                }));
+            }
+            group.add(record);
+
+            // At this point we know that we're sorted, so re-insert the record.
+            // Without adding to the "removed" list or firing events!
+            me.data.remove(record);
+            me.data.insert(me.data.findInsertionIndex(record, me.generateComparator()), record);
+
+            // Keep subsequent indices up to date
+            for (i = 0, len = this.getCount(); i < len; i++) {
+                me.data.items[i].index = i;
+            }
+
+        } else {
+            // some other field changed, just mark the group as dirty
+            groups.getByKey(groupName).setDirty();    
+        }
+    },
+
+    /**
+     * Adds Model instance to the Store. This method accepts either:
+     *
+     * - An array of Model instances or Model configuration objects.
+     * - Any number of Model instance or Model configuration object arguments.
+     *
+     * The new Model instances will be added at the end of the existing collection.
+     *
+     * Sample usage:
+     *
+     *     myStore.add({some: 'data'}, {some: 'other data'});
+     *
+     * Note that if this Store is sorted, the new Model instances will be inserted
+     * at the correct point in the Store to maintain the sort order.
+     *
+     * @param {Ext.data.Model[]/Ext.data.Model.../Object[]/Object...} model An array of Model instances
+     * or Model configuration objects, or variable number of Model instance or config arguments.
+     * @return {Ext.data.Model[]} The model instances that were added
+     */
+    add: function(arg) {
+        var me = this,
+            records,
+            length, isSorted;
+
+        if (me.buffered) {
+            Ext.Error.raise({
+                msg: 'add method may not be called on a buffered store'
+            });
+        }
+
+        // Accept both a single-argument array of records, or any number of record arguments
+        if (Ext.isArray(arg)) {
+            records = arg;
+        } else {
+            records = arguments;
+        }
+
+        length = records.length;
+        isSorted = !me.remoteSort && me.sorters && me.sorters.items.length;
+
+        // If this Store is sorted, and they only passed one Record (99% or use cases)
+        // then it's much more efficient to add it sorted than to append and then sort.
+        if (isSorted && length === 1) {
+            return [ me.addSorted(me.createModel(records[0])) ];
+        }
+
+        // If this sort is sorted, set the flag used by the insert method to sort
+        // before firing events.
+        if (isSorted) {
+            me.requireSort = true;
+        }
+
+        records = me.insert(me.data.length, records);
+        delete me.requireSort;
+
+        return records;
+    },
+
+    /**
+     * (Local sort only) Inserts the passed Record into the Store at the index where it
+     * should go based on the current sort information.
+     *
+     * @param {Ext.data.Record} record
+     */
+    addSorted: function(record) {
+        var me = this,
+            index = me.data.findInsertionIndex(record, me.generateComparator());
+
+        me.insert(index, record);
+        return record;
+    },
+
+    /**
+     * Converts a literal to a model, if it's not a model already
+     * @private
+     * @param {Ext.data.Model/Object} record The record to create
+     * @return {Ext.data.Model}
+     */
+    createModel: function(record) {
+        if (!record.isModel) {
+            record = Ext.ModelManager.create(record, this.model);
+        }
+
+        return record;
+    },
+
+    onUpdate: function(record, type, modifiedFieldNames){
+        if (this.isGrouped()) {
+            this.updateGroupsOnUpdate(record, modifiedFieldNames);
+        }
+    },
+
+    /**
+     * Calls the specified function for each {@link Ext.data.Model record} in the store.
+     *
+     * When store is filtered, only loops over the filtered records.
+     *
+     * @param {Function} fn The function to call. The {@link Ext.data.Model Record} is passed as the first parameter.
+     * Returning `false` aborts and exits the iteration.
+     * @param {Object} [scope] The scope (this reference) in which the function is executed.
+     * Defaults to the current {@link Ext.data.Model record} in the iteration.
+     */
+    each: function(fn, scope) {
+        var data = this.data.items,
+            dLen = data.length,
+            record, d;
+
+        for (d = 0; d < dLen; d++) {
+            record = data[d];
+            if (fn.call(scope || record, record, d, dLen) === false) {
+                break;
+            }
+        }
+    },
+
+    /**
+     * Removes the specified record(s) from the Store, firing the {@link #event-remove} event for each instance that is removed.
+     * 
+     * A {@link #event-bulkremove} event is called at the end passing all removed records and their indices.
+     * plus a single 'datachanged' event after removal.
+     *
+     * @param {Ext.data.Model/Ext.data.Model[]/Number/Number[]} records Model instance or array of instances to remove or an array of indices from which to remove records.
+     */
+    remove: function(records, /* private */ isMove, silent) {
+        /*
+         * Pass the isMove parameter if we know we're going to be re-inserting this record
+         */
+        isMove = isMove === true;
+
+        var me = this,
+            sync = false,
+            snapshot = me.snapshot,
+            data = me.data,
+            i = 0,
+            length,
+            info = [],
+            allRecords = [],
+            indexes = [],
+            item,
+            isNotPhantom,
+            index,
+            record,
+            removeRange,
+            removeCount,
+            fireRemoveEvent = !silent && me.hasListeners.remove;
+
+        // Remove a single record
+        if (records.isModel) {
+            records = [records];
+            length = 1;
+        }
+
+        // Or remove(myRecord)
+        else if (Ext.isIterable(records)) {
+            length = records.length;
+        }
+
+        // Allow remove({start:100: end: 110})
+        // Private API used by removeAt to remove multiple, contiguous records
+        else if (typeof records === 'object') {
+            removeRange = true;
+            i = records.start;
+            length = records.end + 1;
+            removeCount = length - i;
+        }
+
+        // Build an array of {record: rec, index: idx} objects to sort into index order.
+        // Not necessary if we are removing a contiguous range
+        if (!removeRange) {
+            for (i = 0; i < length; ++i) {
+
+                record = records[i];
+
+                // Encountered a record index
+                if (typeof record == 'number') {
+                    index = record;
+                    record = data.getAt(index);
+                }
+                // Removing a record instance
+                else {
+                    index = me.indexOf(record);
+                }
+
+                // Check record. If number passed, it may not exist.
+                if (record && index > -1) {
+                    info.push({
+                        record: record,
+                        index: index
+                    });
+                }
+
+                // record guaranteed to be a record now
+                if (snapshot) {
+                    snapshot.remove(record);
+                }
+            }
+
+            // Sort records into ascending order so that removalscan be processed in a deterministic order
+            info = Ext.Array.sort(info, function(o1, o2) {
+                var index1 = o1.index,
+                    index2 = o2.index;
+
+                return index1 === o2.index2 ? 0 : (index1 < index2 ? -1 : 1);
+            });
+
+            // The loop below loops through the info array if not removing contiguous range
+            i = 0;
+            length = info.length;
+        }
+
+        // we need to maintain a set of indexes since we're not guaranteed to
+        // be removing the records in order
+        // Start value of i is calculated!
+        for (; i < length; i++) {
+            if (removeRange) {
+                record = data.getAt(i);
+                index = i;
+            } else {
+                item = info[i];
+                record = item.record;
+                index = item.index;
+            }
+
+            allRecords.push(record);
+            indexes.push(index);
+
+            isNotPhantom = record.phantom !== true;
+            // don't push phantom records onto removed
+            if (!isMove && isNotPhantom) {
+
+                // Store the index the record was removed from so that rejectChanges can re-insert at the correct place.
+                // The record's index property won't do, as that is the index in the overall dataset when Store is buffered.
+                record.removedFrom = index;
+                me.removed.push(record);
+            }
+
+            record.unjoin(me);
+
+            // Remove using the index, but subtract any intervening removed records which would cause the data
+            // array to shuffle up.
+            index -= i;
+            sync = sync || isNotPhantom;
+
+            // If we have not been asked to remove a range we must remove individual records
+            // and fire the individual remove event..
+            if (!removeRange) {
+                data.removeAt(index);
+
+                // Only fire individual remove events if not silent, and there are listeners.
+                if (fireRemoveEvent) {
+                    me.fireEvent('remove', me, record, index, !!isMove);
+                }
+            }
+        }
+
+        // If there was no listener for the single remove event, remove all records
+        // from collection in one call
+        if (removeRange) {
+            data.removeRange(records.start, removeCount);
+        }
+
+        if (!silent) {
+            me.fireEvent('bulkremove', me, allRecords, indexes, !!isMove);
+            me.fireEvent('datachanged', me);
+        }
+        if (!isMove && me.autoSync && sync && !me.autoSyncSuspended) {
+            me.sync();
+        }
+    },
+
+    /**
+     * Removes the model instance(s) at the given index
+     * @param {Number} index The record index
+     * @param {Number} [count=1] The number of records to delete
+     */
+    removeAt: function(index, count) {
+        var me = this,
+            storeCount = me.getCount();
+
+        if (index <= storeCount) {
+            if (arguments.length === 1) {
+                me.remove([ index ]);
+            } else if (count) {
+                me.remove({
+                    start: index,
+                    end: Math.min(index + count, storeCount) - 1
+                });
+            }
+        }
+    },
+
+    /**
+     * Removes all items from the store.
+     *
+     * Individual record `{@link #event-remove}` events are not fired by this method.
+     *
+     * @param {Boolean} [silent=false] Pass `true` to prevent the record `{@link #event-bulkremove}`
+     * and `{@link #event-clear}` events from being fired.
+     */
+    removeAll: function(silent) {
+        var me = this,
+            snapshot = me.snapshot,
+            data = me.data;
+            
+        if (snapshot) {
+            snapshot.removeAll(data.getRange());
+        }
+
+        if (me.buffered) {
+            if (data) {
+                if (silent) {
+                    me.suspendEvent('clear');
+                }
+                data.clear();
+                if (silent) {
+                    me.resumeEvent('clear');
+                }
+            }            
+        }
+
+        else {
+            // Use the remove range interface to remove the entire record set, passing the silent flag to mute the bulkremove event.
+            // The remove range interface does not fire individual remove events.
+            me.remove({
+                start: 0,
+                end: me.getCount() - 1
+            }, false, silent);
+            if (silent !== true) {
+                me.fireEvent('clear', me);
+            }
+        }
+    },
+
+    /**
+     * Loads data into the Store via the configured {@link #proxy}. This uses the Proxy to make an
+     * asynchronous call to whatever storage backend the Proxy uses, automatically adding the retrieved
+     * instances into the Store and calling an optional callback if required. Example usage:
+     *
+     *     store.load({
+     *         scope: this,
+     *         callback: function(records, operation, success) {
+     *             // the {@link Ext.data.Operation operation} object
+     *             // contains all of the details of the load operation
+     *             console.log(records);
+     *         }
+     *     });
+     *
+     * If the callback scope does not need to be set, a function can simply be passed:
+     *
+     *     store.load(function(records, operation, success) {
+     *         console.log('loaded records');
+     *     });
+     *
+     * @param {Object/Function} [options] config object, passed into the Ext.data.Operation object before loading.
+     * Additionally `addRecords: true` can be specified to add these records to the existing records, default is
+     * to remove the Store's existing records first.
+     */
+    load: function(options) {
+        var me = this;
+
+        options = options || {};
+
+        if (typeof options == 'function') {
+            options = {
+                callback: options
+            };
+        }
+
+        options.groupers = options.groupers ||  me.groupers.items;
+        options.page = options.page || me.currentPage;
+        options.start = (options.start !== undefined) ? options.start : (options.page - 1) * me.pageSize;
+        options.limit = options.limit || me.pageSize;
+        options.addRecords = options.addRecords || false;
+
+        if (me.buffered) {
+            options.limit = me.viewSize || me.defaultViewSize;
+            return me.loadToPrefetch(options);
+        }
+        return me.callParent([options]);
+    },
+
+    reload: function(options) {
+        var me = this,
+            startIdx,
+            endIdx,
+            startPage,
+            endPage,
+            i,
+            waitForReload,
+            bufferZone,
+            records,
+            count = me.getCount();
+
+        if (!options) {
+            options = {};
+        }
+
+        // If buffered, we have to clear the page cache and then
+        // cache the page range surrounding store's loaded range.
+        if (me.buffered) {
+
+            // So that prefetchPage does not consider the store to be fully loaded if the local count is equal to the total count
+            delete me.totalCount;
+
+            waitForReload = function() {
+                if (me.rangeCached(startIdx, endIdx)) {
+                    me.loading = false;
+                    me.data.un('pageAdded', waitForReload);
+                    records = me.data.getRange(startIdx, endIdx);
+                    me.fireEvent('load', me, records, true);
+                }
+            };
+            bufferZone = Math.ceil((me.leadingBufferZone + me.trailingBufferZone) / 2);
+
+            // Get our record index range in the dataset
+            startIdx = options.start || (count ? me.getAt(0).index : 0);
+            endIdx = startIdx + (options.count || (count ? count : me.pageSize)) - 1;
+
+            // Calculate a page range which encompasses the Store's loaded range plus both buffer zones
+            startPage = me.getPageFromRecordIndex(Math.max(startIdx - bufferZone, 0));
+            endPage = me.getPageFromRecordIndex(endIdx + bufferZone);
+
+            // Clear cache (with initial flag so that any listening BufferedRenderer does not reset to page 1).
+            me.data.clear(true);
+
+            if (me.fireEvent('beforeload', me, options) !== false) {
+                me.loading = true;
+
+                // Wait for the requested range to become available in the page map
+                // Load the range as soon as the whole range is available
+                me.data.on('pageAdded', waitForReload);
+
+                // Recache the page range which encapsulates our visible records
+                for (i = startPage; i <= endPage; i++) {
+                    me.prefetchPage(i, options);
+                }
+            }
+        } else {
+            return me.callParent(arguments);
+        }
+    },
+
+    /**
+     * @private
+     * Called internally when a Proxy has completed a load request
+     */
+    onProxyLoad: function(operation) {
+        var me = this,
+            resultSet = operation.getResultSet(),
+            records = operation.getRecords(),
+            successful = operation.wasSuccessful();
+
+        if (me.isDestroyed) {
+            return;
+        }
+        
+        if (resultSet) {
+            me.totalCount = resultSet.total;
+        }
+
+        // Loading should be set to false before loading the records.
+        // loadRecords doesn't expose any hooks or events until refresh
+        // and datachanged, so by that time loading should be false
+        me.loading = false;
+        if (successful) {
+            me.loadRecords(records, operation);
+        }
+
+        if (me.hasListeners.load) {
+            me.fireEvent('load', me, records, successful);
+        }
+
+        //TODO: deprecate this event, it should always have been 'load' instead. 'load' is now documented, 'read' is not.
+        //People are definitely using this so can't deprecate safely until 2.x
+        if (me.hasListeners.read) {
+            me.fireEvent('read', me, records, successful);
+        }
+
+        //this is a callback that would have been passed to the 'read' function and is optional
+        Ext.callback(operation.callback, operation.scope || me, [records, operation, successful]);
+    },
+
+    //inherit docs
+    getNewRecords: function() {
+        return this.data.filterBy(this.filterNew).items;
+    },
+
+    //inherit docs
+    getUpdatedRecords: function() {
+        return this.data.filterBy(this.filterUpdated).items;
+    },
+
+    /**
+     * Filters the loaded set of records by a given set of filters.
+     *
+     * By default, the passed filter(s) are *added* to the collection of filters being used to filter this Store.
+     *
+     * To remove existing filters before applying a new set of filters use
+     *
+     *     // Clear the filter collection without updating the UI
+     *     store.clearFilter(true);
+     *
+     * see {@link #clearFilter}.
+     *
+     * Alternatively, if filters are configured with an `id`, then existing filters store may be *replaced* by new
+     * filters having the same `id`.
+     *
+     * Filtering by single field:
+     *
+     *     store.filter("email", /\.com$/);
+     *
+     * Using multiple filters:
+     *
+     *     store.filter([
+     *         {property: "email", value: /\.com$/},
+     *         {filterFn: function(item) { return item.get("age") > 10; }}
+     *     ]);
+     *
+     * Using Ext.util.Filter instances instead of config objects
+     * (note that we need to specify the {@link Ext.util.Filter#root root} config option in this case):
+     *
+     *     store.filter([
+     *         Ext.create('Ext.util.Filter', {property: "email", value: /\.com$/, root: 'data'}),
+     *         Ext.create('Ext.util.Filter', {filterFn: function(item) { return item.get("age") > 10; }, root: 'data'})
+     *     ]);
+     *
+     * When store is filtered, most of the methods for accessing store data will be working only
+     * within the set of filtered records. Two notable exceptions are {@link #queryBy} and
+     * {@link #getById}.
+     *
+     * @param {Object[]/Ext.util.Filter[]/String} [filters] The set of filters to apply to the data.
+     * These are stored internally on the store, but the filtering itself is done on the Store's
+     * {@link Ext.util.MixedCollection MixedCollection}. See MixedCollection's
+     * {@link Ext.util.MixedCollection#filter filter} method for filter syntax.
+     * Alternatively, pass in a property string.
+     *
+     * If no parameters are passed, the Store's existing filter set is applied.
+     * @param {String} [value] value to filter by (only if using a property string as the first argument)
+     */
+    filter: function(filters, value) {
+        if (Ext.isString(filters)) {
+            filters = {
+                property: filters,
+                value: value
+            };
+        }
+
+        var me = this,
+            decoded = me.decodeFilters(filters),
+            i,
+            doLocalSort = me.sorters.length && me.sortOnFilter && !me.remoteSort,
+            length = decoded.length;
+
+        // Merge new filters into current filter set.
+        for (i = 0; i < length; i++) {
+            me.filters.replace(decoded[i]);
+        }
+
+        filters = me.filters.items;
+
+        // If there are filters, filter the data.
+        // This method can not cut a filter set down to zero, it can only add or replace,
+        // so if there are no filters, the store is not filtered, and they did not pass a filter.
+        if (filters.length) {
+            if (me.remoteFilter) {
+                // So that prefetchPage does not consider the store to be fully loaded if the local count is equal to the total count
+                delete me.totalCount;
+
+                // For a buffered Store, we have to clear the prefetch cache because the dataset will change upon filtering.
+                // Then we must prefetch the new page 1, and when that arrives, reload the visible part of the Store
+                // via the guaranteedrange event
+                if (me.buffered) {
+                    me.data.clear();
+                    me.loadPage(1);
+                } else {
+                    // Reset to the first page, the filter is likely to produce a smaller data set
+                    me.currentPage = 1;
+                    //the load function will pick up the new filters and request the filtered data from the proxy
+                    me.load();
+                }
+            } else {
+                /**
+                * @property {Ext.util.MixedCollection} snapshot
+                * A pristine (unfiltered) collection of the records in this store. This is used to reinstate
+                * records when a filter is removed or changed
+                */
+                me.snapshot = me.snapshot || me.data.clone();
+
+                // Filter the unfiltered dataset using the filter set
+                me.data = me.snapshot.filter(filters);
+
+                // Groups will change when filters change
+                me.constructGroups();
+
+                if (doLocalSort) {
+                    me.sort();
+                } else {
+                    // fire datachanged event if it hasn't already been fired by doSort
+                    me.fireEvent('datachanged', me);
+                    me.fireEvent('refresh', me);
+                }
+            }
+            me.fireEvent('filterchange', me, filters);
+        }
+    },
+
+    /**
+     * Reverts to a view of the Record cache with no filtering applied.
+     * @param {Boolean} [suppressEvent] If `true` the filter is cleared silently.
+     *
+     * For a locally filtered Store, this means that the filter collection is cleared without firing the
+     * {@link #datachanged} event.
+     *
+     * For a remotely filtered Store, this means that the filter collection is cleared, but the store
+     * is not reloaded from the server.
+     */
+    clearFilter: function(suppressEvent) {
+        var me = this;
+
+        me.filters.clear();
+
+        if (me.remoteFilter) {
+
+            // In a buffered Store, the meaning of suppressEvent is to simply clear the filters collection
+            if (suppressEvent) {
+                return;
+            }
+
+            // So that prefetchPage does not consider the store to be fully loaded if the local count is equal to the total count
+            delete me.totalCount;
+
+            // For a buffered Store, we have to clear the prefetch cache because the dataset will change upon filtering.
+            // Then we must prefetch the new page 1, and when that arrives, reload the visible part of the Store
+            // via the guaranteedrange event
+            if (me.buffered) {
+                me.data.clear();
+                me.loadPage(1);
+            } else {
+                // Reset to the first page, clearing a filter will destroy the context of the current dataset
+                me.currentPage = 1;
+                me.load();
+            }
+        } else if (me.isFiltered()) {
+            me.data = me.snapshot;
+            delete me.snapshot;
+
+            // Groups will change when filters change
+            me.constructGroups();
+
+            if (suppressEvent !== true) {
+                me.fireEvent('datachanged', me);
+                me.fireEvent('refresh', me);
+            }
+        }
+        me.fireEvent('filterchange', me, me.filters.items);
+    },
+
+    /**
+     * Removes an individual Filter from the current {@link #property-filters filter set} using the passed Filter/Filter id and
+     * by default, applys the updated filter set to the Store's unfiltered dataset.
+     *
+     * @param {Mixed} toRemove The id of a Filter to remove from the filter set, or a Filter instance to remove.
+     * @param {Boolean} [applyFilters=true] Pass as `false` to remove the filter but not apply the updated filter set.
+     *
+     * If `null` is passed, all anonymous Filters (Filters with no `id` property) will be removed.
+     */
+    removeFilter: function(toRemove, applyFilters) {
+        var me = this;
+
+        if (!me.remoteFilter && me.isFiltered()) {
+            if (toRemove instanceof Ext.util.Filter) {
+                me.filters.remove(toRemove);
+            } else {
+                me.filters.removeAtKey(toRemove);
+            }
+
+            if (applyFilters !== false) {
+
+                // Not gone down to zero filters - re-filter Store
+                if (me.filters.length) {
+                    me.filter();
+                }
+
+                // No filters left - let clearFilter do its thing.
+                else {
+                    me.clearFilter();
+                }
+            } else {
+                me.fireEvent('filterchange', me, me.filters.items);
+            }
+        }
+    },
+
+    /**
+     * Adds a new Filter to this Store's {@link #property-filters filter set} and
+     * by default, applys the updated filter set to the Store's unfiltered dataset.
+     * @param {Object[]/Ext.util.Filter[]} filters The set of filters to add to the current {@link #property-filters filter set}.
+     * @param {Boolean} [applyFilters=true] Pass as `false` to add the filter but not apply the updated filter set.
+     *
+     */
+    addFilter: function(filters, applyFilters) {
+        var me = this,
+            decoded,
+            i,
+            length;
+
+        // Decode passed filters and replace/add into the filter set
+        decoded = me.decodeFilters(filters);
+        length = decoded.length;
+        for (i = 0; i < length; i++) {
+            me.filters.replace(decoded[i]);
+        }
+
+        if (applyFilters !== false && me.filters.length) {
+            me.filter();
+        } else {
+            me.fireEvent('filterchange', me, me.filters.items);
+        }
+    },
+
+    /**
+     * Returns `true` if this store is currently filtered
+     * @return {Boolean}
+     */
+    isFiltered: function() {
+        var snapshot = this.snapshot;
+        return !!(snapshot && snapshot !== this.data);
+    },
+
+    /**
+     * Filters by a function. The specified function will be called for each
+     * Record in this Store. If the function returns `true` the Record is included,
+     * otherwise it is filtered out.
+     *
+     * When store is filtered, most of the methods for accessing store data will be working only
+     * within the set of filtered records. Two notable exceptions are {@link #queryBy} and
+     * {@link #getById}.
+     *
+     * @param {Function} fn The function to be called. It will be passed the following parameters:
+     *  @param {Ext.data.Model} fn.record The record to test for filtering. Access field values
+     *  using {@link Ext.data.Model#get}.
+     *  @param {Object} fn.id The ID of the Record passed.
+     * @param {Object} [scope] The scope (this reference) in which the function is executed.
+     * Defaults to this Store.
+     */
+    filterBy: function(fn, scope) {
+        var me = this;
+
+        me.snapshot = me.snapshot || me.data.clone();
+        me.data = me.queryBy(fn, scope || me);
+        me.fireEvent('datachanged', me);
+        me.fireEvent('refresh', me);
+    },
+
+    /**
+     * Query all the cached records in this Store using a filtering function. The specified function
+     * will be called with each record in this Store. If the function returns `true` the record is
+     * included in the results.
+     *
+     * This method is not effected by filtering, it will always look from all records inside the store
+     * no matter if filter is applied or not.
+     *
+     * @param {Function} fn The function to be called. It will be passed the following parameters:
+     *  @param {Ext.data.Model} fn.record The record to test for filtering. Access field values
+     *  using {@link Ext.data.Model#get}.
+     *  @param {Object} fn.id The ID of the Record passed.
+     * @param {Object} [scope] The scope (this reference) in which the function is executed
+     * Defaults to this Store.
+     * @return {Ext.util.MixedCollection} Returns an Ext.util.MixedCollection of the matched records
+     */
+    queryBy: function(fn, scope) {
+        var me = this;
+        return (me.snapshot || me.data).filterBy(fn, scope || me);
+    },
+
+    /**
+     * Query all the cached records in this Store by name/value pair.
+     * The parameters will be used to generated a filter function that is given
+     * to the queryBy method.
+     *
+     * This method compliments queryBy by generating the query function automatically.
+     *
+     * @param {String} property The property to create the filter function for
+     * @param {String/RegExp} value The string/regex to compare the property value to
+     * @param {Boolean} [anyMatch=false] `true` if we don't care if the filter value is not the full value.
+     * @param {Boolean} [caseSensitive=false] `true` to create a case-sensitive regex.
+     * @param {Boolean} [exactMatch=false] `true` to force exact match (^ and $ characters added to the regex).
+     * Ignored if `anyMatch` is `true`.
+     * @return {Ext.util.MixedCollection} Returns an Ext.util.MixedCollection of the matched records
+     */
+    query: function(property, value, anyMatch, caseSensitive, exactMatch) {
+        var me = this,
+            queryFn = me.createFilterFn(property, value, anyMatch, caseSensitive, exactMatch),
+            results = me.queryBy(queryFn);
+
+        //create an empty mixed collection for use if queryBy returns null
+        if(!results) {
+            results = new Ext.util.MixedCollection();
+        }
+
+        return results;
+    },
+
+    /**
+     * Loads an array of data straight into the Store.
+     *
+     * Using this method is great if the data is in the correct format already (e.g. it doesn't need to be
+     * processed by a reader). If your data requires processing to decode the data structure, use a
+     * {@link Ext.data.proxy.Memory MemoryProxy} or {@link #loadRawData}.
+     *
+     * @param {Ext.data.Model[]/Object[]} data Array of data to load. Any non-model instances will be cast
+     * into model instances first.
+     * @param {Boolean} [append=false] `true` to add the records to the existing records in the store, `false`
+     * to remove the old ones first.
+     */
+    loadData: function(data, append) {
+        var length = data.length,
+            newData = [],
+            i;
+
+        //make sure each data element is an Ext.data.Model instance
+        for (i = 0; i < length; i++) {
+            newData.push(this.createModel(data[i]));
+        }
+
+        this.loadRecords(newData, append ? this.addRecordsOptions : undefined);
+    },
+
+    /**
+     * Loads data via the bound Proxy's reader
+     *
+     * Use this method if you are attempting to load data and want to utilize the configured data reader.
+     *
+     * @param {Object[]} data The full JSON object you'd like to load into the Data store.
+     * @param {Boolean} [append=false] `true` to add the records to the existing records in the store, `false`
+     * to remove the old ones first.
+     */
+    loadRawData : function(data, append) {
+         var me      = this,
+             result  = me.proxy.reader.read(data),
+             records = result.records;
+
+         if (result.success) {
+             me.totalCount = result.total;
+             me.loadRecords(records, append ? me.addRecordsOptions : undefined);
+         }
+     },
+
+    /**
+     * Loads an array of {@link Ext.data.Model model} instances into the store, fires the datachanged event. This should only usually
+     * be called internally when loading from the {@link Ext.data.proxy.Proxy Proxy}, when adding records manually use {@link #method-add} instead
+     * @param {Ext.data.Model[]} records The array of records to load
+     * @param {Object} options
+     * @param {Boolean} [options.addRecords=false] Pass `true` to add these records to the existing records, `false` to remove the Store's existing records first.
+     * @param {Number}  [options.start] Only used by buffered Stores. The index *within the overall dataset* of the first record in the array.
+     */
+    loadRecords: function(records, options) {
+        var me     = this,
+            i      = 0,
+            length = records.length,
+            start,
+            addRecords,
+            snapshot = me.snapshot;
+
+        if (options) {
+            start = options.start;
+            addRecords = options.addRecords;
+        }
+
+        if (!addRecords) {
+            delete me.snapshot;
+            me.clearData(true);
+        } else if (snapshot) {
+            snapshot.addAll(records);
+        }
+
+        me.data.addAll(records);
+
+        if (start !== undefined) {
+            for (; i < length; i++) {
+                records[i].index = start + i;
+                records[i].join(me);
+            }
+        } else {
+            for (; i < length; i++) {
+                records[i].join(me);
+            }
+        }
+
+        /*
+         * this rather inelegant suspension and resumption of events is required because both the filter and sort functions
+         * fire an additional datachanged event, which is not wanted. Ideally we would do this a different way. The first
+         * datachanged event is fired by the call to this.add, above.
+         */
+        me.suspendEvents();
+
+        if (me.filterOnLoad && !me.remoteFilter) {
+            me.filter();
+        }
+
+        if (me.sortOnLoad && !me.remoteSort) {
+            me.sort(undefined, undefined, undefined, true);
+        }
+
+        me.resumeEvents();
+        if (me.isGrouped()) {
+            me.constructGroups();
+        }
+        me.fireEvent('datachanged', me);
+        me.fireEvent('refresh', me);
+    },
+
+    // PAGING METHODS
+    /**
+     * Loads a given 'page' of data by setting the start and limit values appropriately. Internally this just causes a normal
+     * load operation, passing in calculated 'start' and 'limit' params.
+     * @param {Number} page The number of the page to load.
+     * @param {Object} [options] See options for {@link #method-load}.
+     */
+    loadPage: function(page, options) {
+        var me = this;
+
+        me.currentPage = page;
+
+        // Copy options into a new object so as not to mutate passed in objects
+        options = Ext.apply({
+            page: page,
+            start: (page - 1) * me.pageSize,
+            limit: me.pageSize,
+            addRecords: !me.clearOnPageLoad
+        }, options);
+
+        if (me.buffered) {
+            options.limit = me.viewSize || me.defaultViewSize;
+            return me.loadToPrefetch(options);
+        }
+        me.read(options);
+    },
+
+    /**
+     * Loads the next 'page' in the current data set
+     * @param {Object} options See options for {@link #method-load}
+     */
+    nextPage: function(options) {
+        this.loadPage(this.currentPage + 1, options);
+    },
+
+    /**
+     * Loads the previous 'page' in the current data set
+     * @param {Object} options See options for {@link #method-load}
+     */
+    previousPage: function(options) {
+        this.loadPage(this.currentPage - 1, options);
+    },
+
+    // private
+    clearData: function(isLoad) {
+        var me = this,
+            records,
+            i;
+
+        // We only have to do the unjoining if not buffered. PageMap will unjoin its records when it clears itself.
+        // There is a potential for a race condition in stores configured with autoDestroy: true;
+        // if loading was initiated but didn't complete by the time the store is destroyed,
+        // the data MC may not have been created yet so we have to check for its existence
+        // here and below.
+        if (!me.buffered && me.data) {
+            records = me.data.items;
+            i = records.length;
+            while (i--) {
+                records[i].unjoin(me);
+            }
+        }
+
+        // Remove all data from the Collection/PageMap. PageMap will perform unjoining.
+        if (me.data) {
+            me.data.clear();
+        }
+        
+        if (isLoad !== true || me.clearRemovedOnLoad) {
+            me.removed.length = 0;
+        }
+    },
+
+    loadToPrefetch: function(options) {
+        var me = this,
+            i,
+            records,
+            dataSetSize,
+            prefetchOptions = options,
+
+            // Get the requested record index range in the dataset
+            startIdx = options.start,
+            endIdx = options.start + options.limit - 1,
+
+            // The end index to load into the store's live record collection
+            loadEndIdx = Math.min(endIdx, options.start + (me.viewSize || options.limit) - 1),
+
+            // Calculate a page range which encompasses the requested range plus both buffer zones.
+            // The endPage will be adjusted to be in the dataset size range as soon as the first data block returns.
+            startPage = me.getPageFromRecordIndex(Math.max(startIdx - me.trailingBufferZone, 0)),
+            endPage = me.getPageFromRecordIndex(endIdx + me.leadingBufferZone),
+
+            // Wait for the viewable range to be available
+            waitForRequestedRange = function() {
+                if (me.rangeCached(startIdx, loadEndIdx)) {
+                    me.loading = false;
+                    records = me.data.getRange(startIdx, loadEndIdx);
+                    me.data.un('pageAdded', waitForRequestedRange);
+
+                    // If there is a listener for guranteedrange then fire that event
+                    if (me.hasListeners.guaranteedrange) {
+                        me.guaranteeRange(startIdx, loadEndIdx, options.callback, options.scope);
+                    }
+                    if (options.callback) {
+                        options.callback.call(options.scope||me, records, startIdx, endIdx, options);
+                    }
+                    me.fireEvent('datachanged', me);
+                    me.fireEvent('refresh', me);
+                    me.fireEvent('load', me, records, true);
+                    if (options.groupChange) {
+                        me.fireGroupChange();
+                    }
+                }
+            };
+
+        if (me.fireEvent('beforeload', me, options) !== false) {
+
+            // So that prefetchPage does not consider the store to be fully loaded if the local count is equal to the total count
+            delete me.totalCount;
+
+            me.loading = true;
+
+            // Any configured callback is handled in waitForRequestedRange above.
+            // It should not be processed by onProxyPrefetch.
+            if (options.callback) {
+                prefetchOptions = Ext.apply({}, options);
+                delete prefetchOptions.callback;
+            }
+
+            // Load the first page in the range, which will give us the initial total count.
+            // Once it is loaded, go ahead and prefetch any subsequent pages, if necessary.
+            // The prefetchPage has a check to prevent us loading more than the totalCount,
+            // so we don't want to blindly load up <n> pages where it isn't required. 
+            me.on('prefetch', function(store, records, successful, operation) {
+
+                if (successful) {
+                    // If there is data in the dataset, we can go ahead and add the pageAdded listener which waits for the visible range
+                    // and we can also issue the requests to fill the surrounding buffer zones.
+                    if ((dataSetSize = me.getTotalCount())) {
+
+                        // Wait for the requested range to become available in the page map
+                        me.data.on('pageAdded', waitForRequestedRange);
+
+                        // As soon as we have the size of the dataset, ensure we are not waiting for more than can ever arrive,
+                        loadEndIdx = Math.min(loadEndIdx, dataSetSize - 1);
+
+                        // And make sure we never ask for pages beyond the end of the dataset.
+                        endPage = me.getPageFromRecordIndex(Math.min(loadEndIdx + me.leadingBufferZone, dataSetSize - 1));
+
+                        for (i = startPage + 1; i <= endPage; ++i) {
+                            me.prefetchPage(i, prefetchOptions);
+                        }
+                    } else {
+                        me.fireEvent('datachanged', me);
+                        me.fireEvent('refresh', me);
+                        me.fireEvent('load', me, records, true);
+                    }
+                }
+                // Unsuccessful prefetch: fire a load event with success false.
+                else {
+                    me.fireEvent('load', me, records, false);
+                }
+            }, null, {single: true});
+
+            me.prefetchPage(startPage, prefetchOptions);
+        }
+    },
+
+    // Buffering
+    /**
+     * Prefetches data into the store using its configured {@link #proxy}.
+     * @param {Object} options (Optional) config object, passed into the Ext.data.Operation object before loading.
+     * See {@link #method-load}
+     */
+    prefetch: function(options) {
+        var me = this,
+            pageSize = me.pageSize,
+            proxy,
+            operation;
+
+        // Check pageSize has not been tampered with. That would break page caching
+        if (pageSize) {
+            if (me.lastPageSize && pageSize != me.lastPageSize) {
+                Ext.Error.raise("pageSize cannot be dynamically altered");
+            }
+            if (!me.data.pageSize) {
+                me.data.pageSize = pageSize;
+            }
+        }
+
+        // Allow first prefetch call to imply the required page size.
+        else {
+            me.pageSize = me.data.pageSize = pageSize = options.limit;
+        }
+
+        // So that we can check for tampering next time through
+        me.lastPageSize = pageSize;
+
+        // Always get whole pages.
+        if (!options.page) {
+            options.page = me.getPageFromRecordIndex(options.start);
+            options.start = (options.page - 1) * pageSize;
+            options.limit = Math.ceil(options.limit / pageSize) * pageSize;
+        }
+
+        // Currently not requesting this page, then request it...
+        if (!me.pageRequests[options.page]) {
+
+            // Copy options into a new object so as not to mutate passed in objects
+            options = Ext.apply({
+                action : 'read',
+                filters: me.filters.items,
+                sorters: me.sorters.items,
+                groupers: me.groupers.items,
+
+                // Generation # of the page map to which the requested records belong.
+                // If page map is cleared while this request is in flight, the pageMapGeneration will increment and the payload will be rejected
+                pageMapGeneration: me.data.pageMapGeneration
+            }, options);
+
+            operation = new Ext.data.Operation(options);
+
+            if (me.fireEvent('beforeprefetch', me, operation) !== false) {
+                proxy = me.proxy;
+                me.pageRequests[options.page] = proxy.read(operation, me.onProxyPrefetch, me);
+                if (proxy.isSynchronous) {
+                    delete me.pageRequests[options.page];
+                }
+            }
+        }
+
+        return me;
+    },
+
+    /**
+     * @private
+     * Cancels all pending prefetch requests.
+     *
+     * This is called when the page map is cleared.
+     *
+     * Any requests which still make it through will be for the previous pageMapGeneration
+     * (pageMapGeneration is incremented upon clear), and so will be rejected upon arrival.
+     */
+    onPageMapClear: function() {
+        var me = this,
+            loadingFlag = me.wasLoading,
+            reqs = me.pageRequests,
+            req,
+            page;
+
+        // If any requests return, we no longer respond to them.
+        if (me.data.events.pageadded) {
+            me.data.events.pageadded.clearListeners();
+        }
+
+        // If the page cache gets cleared it's because a full reload is in progress.
+        // Setting the loading flag prevents linked Views from displaying the empty text
+        // during a load... we don't know whether ther dataset is empty or not.
+        me.loading = true;
+        me.totalCount = 0;
+
+        // Cancel all outstanding requests
+        for (page in reqs) {
+            if (reqs.hasOwnProperty(page)) {
+                req = reqs[page];
+                delete reqs[page];
+                delete req.callback;
+            }
+        }
+
+        // This will update any views. 
+        me.fireEvent('clear', me);
+
+        // Restore loading flag. The beforeload event could still veto the process.
+        // The flag does not get set for real until we pass the beforeload event.
+        me.loading = loadingFlag;
+    },
+
+    /**
+     * Prefetches a page of data.
+     * @param {Number} page The page to prefetch
+     * @param {Object} options (Optional) config object, passed into the Ext.data.Operation object before loading.
+     * See {@link #method-load}
+     */
+    prefetchPage: function(page, options) {
+        var me = this,
+            pageSize = me.pageSize || me.defaultPageSize,
+            start = (page - 1) * me.pageSize,
+            total = me.totalCount;
+
+        // No more data to prefetch.
+        if (total !== undefined && me.getCount() === total) {
+            return;
+        }
+
+        // Copy options into a new object so as not to mutate passed in objects
+        me.prefetch(Ext.applyIf({
+            page     : page,
+            start    : start,
+            limit    : pageSize
+        }, options));
+    },
+
+    /**
+     * Called after the configured proxy completes a prefetch operation.
+     * @private
+     * @param {Ext.data.Operation} operation The operation that completed
+     */
+    onProxyPrefetch: function(operation) {
+        var me = this,
+            resultSet = operation.getResultSet(),
+            records = operation.getRecords(),
+            successful = operation.wasSuccessful(),
+            page = operation.page;
+
+        // Only cache the data if the operation was invoked for the current pageMapGeneration.
+        // If the pageMapGeneration has changed since the request was fired off, it will have been cancelled.
+        if (operation.pageMapGeneration === me.data.pageMapGeneration) {
+
+            if (resultSet) {
+                me.totalCount = resultSet.total;
+                me.fireEvent('totalcountchange', me.totalCount);
+            }
+
+            // Remove the loaded page from the outstanding pages hash
+            if (page !== undefined) {
+                delete me.pageRequests[page];
+            }
+
+            // Prefetch is broadcast before the page is cached
+            me.loading = false;
+            me.fireEvent('prefetch', me, records, successful, operation);
+
+            // Add the page into the page map.
+            // pageAdded event may trigger the onGuaranteedRange
+            if (successful) {
+                me.cachePage(records, operation.page);
+            }
+
+            //this is a callback that would have been passed to the 'read' function and is optional
+            Ext.callback(operation.callback, operation.scope || me, [records, operation, successful]);
+        }
+    },
+
+    /**
+     * Caches the records in the prefetch and stripes them with their server-side
+     * index.
+     * @private
+     * @param {Ext.data.Model[]} records The records to cache
+     * @param {Ext.data.Operation} page The associated operation
+     */
+    cachePage: function(records, page) {
+        var me = this,
+            len = records.length, i;
+
+        if (!Ext.isDefined(me.totalCount)) {
+            me.totalCount = records.length;
+            me.fireEvent('totalcountchange', me.totalCount);
+        }
+
+        // Add the fetched page into the pageCache
+        for (i = 0; i < len; i++) {
+            records[i].join(me);
+        }
+        me.data.addPage(page, records);
+    },
+
+    /**
+     * Determines if the passed range is available in the page cache.
+     * @private
+     * @param {Number} start The start index
+     * @param {Number} end The end index in the range
+     */
+    rangeCached: function(start, end) {
+        return this.data && this.data.hasRange(start, end);
+    },
+
+    /**
+     * Determines if the passed page is available in the page cache.
+     * @private
+     * @param {Number} page The page to find in the page cache.
+     */
+    pageCached: function(page) {
+        return this.data && this.data.hasPage(page);
+    },
+    
+    /**
+     * Determines if a request for a page is currently running
+     * @private
+     * @param {Number} page The page to check for
+     */
+    pagePending: function(page) {
+        return !!this.pageRequests[page];
+    },
+
+    /**
+     * Determines if the passed range is available in the page cache.
+     * @private
+     * @deprecated 4.1.0 use {@link #rangeCached} instead
+     * @param {Number} start The start index
+     * @param {Number} end The end index in the range
+     * @return {Boolean}
+     */
+    rangeSatisfied: function(start, end) {
+        return this.rangeCached(start, end);
+    },
+
+    /**
+     * Determines the page from a record index
+     * @param {Number} index The record index
+     * @return {Number} The page the record belongs to
+     */
+    getPageFromRecordIndex: function(index) {
+        return Math.floor(index / this.pageSize) + 1;
+    },
+
+    /**
+     * Handles a guaranteed range being loaded
+     * @private
+     */
+    onGuaranteedRange: function(options) {
+        var me = this,
+            totalCount = me.getTotalCount(),
+            start = options.prefetchStart,
+            end = (options.prefetchEnd > totalCount - 1) ? totalCount - 1 : options.prefetchEnd,
+            range;
+
+        end = Math.max(0, end);
+
+        if (start > end) {
+            Ext.log({
+                level: 'warn',
+                msg: 'Start (' + start + ') was greater than end (' + end +
+                    ') for the range of records requested (' + start + '-' +
+                    options.prefetchEnd + ')' + (this.storeId ? ' from store "' + this.storeId + '"' : '')
+            });
+        }
+
+        range = me.data.getRange(start, end);
+        if (options.fireEvent !== false) {
+            me.fireEvent('guaranteedrange', range, start, end, options);
+        }
+        if (options.callback) {
+            options.callback.call(options.scope || me, range, start, end, options);
+        }
+    },
+
+    /**
+     * Guarantee a specific range, this will load the store with a range (that
+     * must be the `pageSize` or smaller) and take care of any loading that may
+     * be necessary.
+     * @deprecated Use {@link #getRange}
+     */
+    guaranteeRange: function(start, end, callback, scope, options) {
+         options = Ext.apply({
+             callback: callback,
+             scope: scope
+         }, options);
+         this.getRange(start, end, options)
+     },
+
+    /**
+     * Ensures that the specified range of rows is present in the cache.
+     *
+     * Converts the row range to a page range and then only load pages which are not already
+     * present in the page cache.
+     */
+    prefetchRange: function(start, end) {
+        var me = this,
+            startPage, endPage, page;
+        if (!me.rangeCached(start, end)) {
+            startPage = me.getPageFromRecordIndex(start);
+            endPage = me.getPageFromRecordIndex(end);
+
+            // Ensure that the page cache's max size is correct.
+            // Our purgePageCount is the number of additional pages *outside of the required range* which
+            // may be kept in the cache. A purgePageCount of zero means unlimited.
+            me.data.maxSize = me.purgePageCount ? (endPage - startPage + 1) + me.purgePageCount : 0;
+
+            // We have the range, but ensure that we have a "buffer" of pages around it.
+            for (page = startPage; page <= endPage; page++) {
+                if (!me.pageCached(page)) {
+                    me.prefetchPage(page);
+                }
+            }
+        }
+    },
+
+    primeCache: function(start, end, direction) {
+        var me = this;
+
+        // Scrolling up
+        if (direction === -1) {
+            start = Math.max(start - me.leadingBufferZone, 0);
+            end   = Math.min(end   + me.trailingBufferZone, me.totalCount - 1);
+        }
+        // Scrolling down
+        else if (direction === 1) {
+            start = Math.max(Math.min(start - me.trailingBufferZone, me.totalCount - me.pageSize), 0);
+            end   = Math.min(end + me.leadingBufferZone, me.totalCount - 1);
+        }
+        // Teleporting
+        else {
+            start = Math.min(Math.max(Math.floor(start - ((me.leadingBufferZone + me.trailingBufferZone) / 2)), 0), me.totalCount - me.pageSize);
+            end =   Math.min(Math.max(Math.ceil (end   + ((me.leadingBufferZone + me.trailingBufferZone) / 2)), 0), me.totalCount - 1);
+        }
+        me.prefetchRange(start, end);
+    },
+
+    // because prefetchData is stored by index
+    // this invalidates all of the prefetchedData
+    sort: function() {
+        var me = this;
+
+        if (me.buffered && me.remoteSort) {
+            me.data.clear();
+        }
+        return me.callParent(arguments);
+    },
+
+    // overriden to provide striping of the indexes as sorting occurs.
+    // this cannot be done inside of sort because datachanged has already
+    // fired and will trigger a repaint of the bound view.
+    doSort: function(sorterFn) {
+        var me = this,
+            range,
+            ln,
+            i;
+
+        if (me.remoteSort) {
+
+            // For a buffered Store, we have to clear the prefetch cache since it is keyed by the index within the dataset.
+            // Then we must prefetch the new page 1, and when that arrives, reload the visible part of the Store
+            // via the guaranteedrange event
+            if (me.buffered) {
+                me.data.clear();
+                me.loadPage(1);
+            } else {
+                //the load function will pick up the new sorters and request the sorted data from the proxy
+                me.load();
+            }
+        } else {
+            if (me.buffered) {
+                Ext.Error.raise({
+                    msg: 'Local sorting may not be used on a buffered store'
+                });
+            }
+            me.data.sortBy(sorterFn);
+            if (!me.buffered) {
+                range = me.getRange();
+                ln = range.length;
+                for (i = 0; i < ln; i++) {
+                    range[i].index = i;
+                }
+            }
+            me.fireEvent('datachanged', me);
+            me.fireEvent('refresh', me);
+        }
+    },
+
+    /**
+     * Finds the index of the first matching Record in this store by a specific field value.
+     *
+     * When store is filtered, finds records only within filter.
+     *
+     * **IMPORTANT
+     *
+     * If this store is {@link #buffered}, this can ONLY find records which happen to be cached in the page cache.
+     * This will be parts of the dataset around the currently visible zone, or recently visited zones if the pages
+     * have not yet been purged from the cache.**
+     *
+     * @param {String} fieldName The name of the Record field to test.
+     * @param {String/RegExp} value Either a string that the field value
+     * should begin with, or a RegExp to test against the field.
+     * @param {Number} [startIndex=0] The index to start searching at
+     * @param {Boolean} [anyMatch=false] True to match any part of the string, not just the beginning
+     * @param {Boolean} [caseSensitive=false] True for case sensitive comparison
+     * @param {Boolean} [exactMatch=false] True to force exact match (^ and $ characters added to the regex).
+     * @return {Number} The matched index or -1
+     */
+    find: function(property, value, start, anyMatch, caseSensitive, exactMatch) {
+        var fn = this.createFilterFn(property, value, anyMatch, caseSensitive, exactMatch);
+        return fn ? this.data.findIndexBy(fn, null, start) : -1;
+    },
+
+    /**
+     * Finds the first matching Record in this store by a specific field value.
+     *
+     * When store is filtered, finds records only within filter.
+     *
+     * **IMPORTANT
+     *
+     * If this store is {@link #buffered}, this can ONLY find records which happen to be cached in the page cache.
+     * This will be parts of the dataset around the currently visible zone, or recently visited zones if the pages
+     * have not yet been purged from the cache.**
+     *
+     * @param {String} fieldName The name of the Record field to test.
+     * @param {String/RegExp} value Either a string that the field value
+     * should begin with, or a RegExp to test against the field.
+     * @param {Number} [startIndex=0] The index to start searching at
+     * @param {Boolean} [anyMatch=false] True to match any part of the string, not just the beginning
+     * @param {Boolean} [caseSensitive=false] True for case sensitive comparison
+     * @param {Boolean} [exactMatch=false] True to force exact match (^ and $ characters added to the regex).
+     * @return {Ext.data.Model} The matched record or null
+     */
+    findRecord: function() {
+        var me = this,
+            index = me.find.apply(me, arguments);
+        return index !== -1 ? me.getAt(index) : null;
+    },
+
+    /**
+     * @private
+     * Returns a filter function used to test a the given property's value. Defers most of the work to
+     * Ext.util.MixedCollection's createValueMatcher function.
+     *
+     * @param {String} property The property to create the filter function for
+     * @param {String/RegExp} value The string/regex to compare the property value to
+     * @param {Boolean} [anyMatch=false] True if we don't care if the filter value is not the full value.
+     * @param {Boolean} [caseSensitive=false] True to create a case-sensitive regex.
+     * @param {Boolean} [exactMatch=false] True to force exact match (^ and $ characters added to the regex).
+     * Ignored if anyMatch is true.
+     */
+    createFilterFn: function(property, value, anyMatch, caseSensitive, exactMatch) {
+        if (Ext.isEmpty(value)) {
+            return false;
+        }
+        value = this.data.createValueMatcher(value, anyMatch, caseSensitive, exactMatch);
+        return function(r) {
+            return value.test(r.data[property]);
+        };
+    },
+
+    /**
+     * Finds the index of the first matching Record in this store by a specific field value.
+     *
+     * When store is filtered, finds records only within filter.
+     *
+     * **IMPORTANT
+     *
+     * If this store is {@link #buffered}, this can ONLY find records which happen to be cached in the page cache.
+     * This will be parts of the dataset around the currently visible zone, or recently visited zones if the pages
+     * have not yet been purged from the cache.**
+     *
+     * @param {String} fieldName The name of the Record field to test.
+     * @param {Object} value The value to match the field against.
+     * @param {Number} [startIndex=0] The index to start searching at
+     * @return {Number} The matched index or -1
+     */
+    findExact: function(property, value, start) {
+        return this.data.findIndexBy(function(rec) {
+            return rec.isEqual(rec.get(property), value);
+        },
+        this, start);
+    },
+
+    /**
+     * Find the index of the first matching Record in this Store by a function.
+     * If the function returns `true` it is considered a match.
+     *
+     * When store is filtered, finds records only within filter.
+     *
+     * **IMPORTANT
+     *
+     * If this store is {@link #buffered}, this can ONLY find records which happen to be cached in the page cache.
+     * This will be parts of the dataset around the currently visible zone, or recently visited zones if the pages
+     * have not yet been purged from the cache.**
+     *
+     * @param {Function} fn The function to be called. It will be passed the following parameters:
+     *  @param {Ext.data.Model} fn.record The record to test for filtering. Access field values
+     *  using {@link Ext.data.Model#get}.
+     *  @param {Object} fn.id The ID of the Record passed.
+     * @param {Object} [scope] The scope (this reference) in which the function is executed.
+     * Defaults to this Store.
+     * @param {Number} [startIndex=0] The index to start searching at
+     * @return {Number} The matched index or -1
+     */
+    findBy: function(fn, scope, start) {
+        return this.data.findIndexBy(fn, scope, start);
+    },
+
+    /**
+     * Collects unique values for a particular dataIndex from this store.
+     *
+     * @param {String} dataIndex The property to collect
+     * @param {Boolean} [allowNull] Pass true to allow null, undefined or empty string values
+     * @param {Boolean} [bypassFilter] Pass true to collect from all records, even ones which are filtered.
+     * @return {Object[]} An array of the unique values
+     */
+    collect: function(dataIndex, allowNull, bypassFilter) {
+        var me = this,
+            data = (bypassFilter === true && me.snapshot) ? me.snapshot : me.data;
+
+        return data.collect(dataIndex, 'data', allowNull);
+    },
+
+    /**
+     * Gets the number of records in store.
+     *
+     * If using paging, this may not be the total size of the dataset. If the data object
+     * used by the Reader contains the dataset size, then the {@link #getTotalCount} function returns
+     * the dataset size.  **Note**: see the Important note in {@link #method-load}.
+     *
+     * When store is filtered, it's the number of records matching the filter.
+     *
+     * @return {Number} The number of Records in the Store.
+     */
+    getCount: function() {
+        return this.data.getCount();
+    },
+
+    /**
+     * Returns the total number of {@link Ext.data.Model Model} instances that the {@link Ext.data.proxy.Proxy Proxy}
+     * indicates exist. This will usually differ from {@link #getCount} when using paging - getCount returns the
+     * number of records loaded into the Store at the moment, getTotalCount returns the number of records that
+     * could be loaded into the Store if the Store contained all data
+     * @return {Number} The total number of Model instances available via the Proxy. 0 returned if
+     * no value has been set via the reader.
+     */
+    getTotalCount: function() {
+        return this.totalCount || 0;
+    },
+
+    /**
+     * Get the Record at the specified index.
+     *
+     * The index is effected by filtering.
+     *
+     * @param {Number} index The index of the Record to find.
+     * @return {Ext.data.Model} The Record at the passed index. Returns undefined if not found.
+     */
+    getAt: function(index) {
+        return this.data.getAt(index);
+    },
+
+    /**
+     * Gathers a range of Records between specified indices.
+     * 
+     * If this store is {@link #buffered}, the indices are relative to the entire dataset, not the local record cache.
+     * 
+     * If this store is {@link #buffered}, then the requested data range *may* not be immediately available, and will
+     * be returned through a passed callback function.
+     *
+     * This method is affected by filtering.
+     *
+     * @param {Number} start The starting index. Defaults to zero for non {@link #buffered} Stores.
+     * @param {Number} end The ending index. Defaults to the last Record for non {@link #buffered} Stores.
+     * @param {Object} [options] Used when the Store is {@link #buffered] and the range may not be available synchronously.
+     *  @param {Object} options.callback A function to call when the range becomes available.
+     *  @param {Ext.data.Model[]} options.callback.range The requested range of records.
+     *   @param {Number} options.callback.start The delivered start index.
+     *   @param {Number} options.callback.end The delivered end index
+     *   @param {Number} options.callback.options The passed options object.
+     * @return {Ext.data.Model[]} An array of records **if the records are immediately available**. For {@link #buffered}
+     * stores, you should pass the callback option **unless you know that the range will be present** - see {@link #rangeCached}.
+     */
+    getRange: function(start, end, options) {
+        if (options && options.cb) {
+            options.callback = options.cb;
+            Ext.Error.raise({
+                msg: 'guaranteeRange options.cb is deprecated, use options.callback'
+            });
+        }
+
+        var me = this,
+            requiredStart,
+            requiredEnd,
+            maxIndex = me.totalCount - 1,
+            lastRequestStart = me.lastRequestStart,
+            pageAddHandler,
+            result;
+
+        options = Ext.apply({
+            prefetchStart: start,
+            prefetchEnd: end
+        }, options);
+
+        if (me.buffered) {
+            // Sanity check end point to be within dataset range
+            end = (end >= me.totalCount) ? maxIndex : end;
+
+            // We must wait for a slightly wider range to be cached.
+            // This is to allow grouping features to peek at the two surrounding records
+            // when rendering a *range* of records to see whether the start of the range
+            // really is a group start and the end of the range really is a group end.
+            requiredStart = start === 0 ? 0 : start - 1;
+            requiredEnd = end === maxIndex ? end : end + 1;
+
+            // Keep track of range we are being asked for so we can track direction of movement through the dataset
+            me.lastRequestStart = start;
+
+            // If data request can be satisfied from the page cache
+            if (me.rangeCached(requiredStart, requiredEnd)) {
+                me.onGuaranteedRange(options);
+                result = me.data.getRange(start, end);
+            }
+            // At least some of the requested range needs loading from server
+            else {
+                // Private event used by the LoadMask class to perform masking when the range required for rendering is not found in the cache
+                me.fireEvent('cachemiss', me, start, end);
+
+                // Add a pageAdded listener, and as soon as the requested range is loaded, fire the guaranteedrange event
+                pageAddHandler = function(page, records) {
+                    if (me.rangeCached(requiredStart, requiredEnd)) {
+                        // Private event used by the LoadMask class to unmask when the range required for rendering has been loaded into the cache
+                        me.fireEvent('cachefilled', me, start, end);
+                        me.data.un('pageAdded', pageAddHandler);
+                        me.onGuaranteedRange(options);
+                    }
+                };
+                me.data.on('pageAdded', pageAddHandler);
+
+                // Prioritize the request for the *exact range that the UI is asking for*.
+                // When a page request is in flight, it will not be requested again by checking the me.pageRequests hash,
+                // so the request after this will only request the *remaining* unrequested pages .
+                me.prefetchRange(start, end);
+
+            }
+            // Load the pages around the requested range required by the leadingBufferZone and trailingBufferZone.
+            me.primeCache(start, end, start < lastRequestStart ? -1 : 1);
+        } else {
+            result = me.data.getRange(start, end);
+
+            // Someone *may* use the callback interface to process their results even if the store is not buffered and always synchronous
+            if (options.callback) {
+                options.callback.call(options.scope || me, result, start, end, options)
+            }
+        }
+
+        return result;
+    },
+
+    /**
+     * Get the Record with the specified id.
+     *
+     * This method is not effected by filtering, lookup will be performed from all records
+     * inside the store, filtered or not.
+     *
+     * @param {Mixed} id The id of the Record to find.
+     * @return {Ext.data.Model} The Record with the passed id. Returns null if not found.
+     */
+    getById: function(id) {
+        var result = (this.snapshot || this.data).findBy(function(record) {
+            return record.getId() === id;
+        });
+        if (this.buffered && !result) {
+            Ext.Error.raise('getById called for ID that is not present in local cache');
+        }
+        return result;
+    },
+
+    /**
+     * Get the index of the record within the store.
+     *
+     * When store is filtered, records outside of filter will not be found.
+     *
+     * @param {Ext.data.Model} record The Ext.data.Model object to find.
+     * @return {Number} The index of the passed Record. Returns -1 if not found.
+     */
+    indexOf: function(record) {
+        return this.data.indexOf(record);
+    },
+
+    /**
+     * Get the index within the entire dataset. From 0 to the totalCount.
+     *
+     * Like #indexOf, this method is effected by filtering.
+     *
+     * @param {Ext.data.Model} record The Ext.data.Model object to find.
+     * @return {Number} The index of the passed Record. Returns -1 if not found.
+     */
+    indexOfTotal: function(record) {
+        var index = record.index;
+        if (index || index === 0) {
+            return index;
+        }
+        return this.indexOf(record);
+    },
+
+    /**
+     * Get the index within the store of the Record with the passed id.
+     *
+     * Like #indexOf, this method is effected by filtering.
+     *
+     * @param {String} id The id of the Record to find.
+     * @return {Number} The index of the Record. Returns -1 if not found.
+     */
+    indexOfId: function(id) {
+        return this.indexOf(this.getById(id));
+    },
+
+    /*
+     * Aggregation methods
+     */
+
+    /**
+     * Convenience function for getting the first model instance in the store.
+     *
+     * When store is filtered, will return first item within the filter.
+     *
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the first record being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Ext.data.Model/undefined} The first model instance in the store, or undefined
+     */
+    first: function(grouped) {
+        var me = this;
+
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(function(records) {
+                return records.length ? records[0] : undefined;
+            }, me, true);
+        } else {
+            return me.data.first();
+        }
+    },
+
+    /**
+     * Convenience function for getting the last model instance in the store.
+     *
+     * When store is filtered, will return last item within the filter.
+     *
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the last record being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Ext.data.Model/undefined} The last model instance in the store, or undefined
+     */
+    last: function(grouped) {
+        var me = this;
+
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(function(records) {
+                var len = records.length;
+                return len ? records[len - 1] : undefined;
+            }, me, true);
+        } else {
+            return me.data.last();
+        }
+    },
+
+    /**
+     * Sums the value of `field` for each {@link Ext.data.Model record} in store
+     * and returns the result.
+     *
+     * When store is filtered, only sums items within the filter.
+     *
+     * @param {String} field A field in each record
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the sum for that group being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Number} The sum
+     */
+    sum: function(field, grouped) {
+        var me = this;
+
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(me.getSum, me, true, [field]);
+        } else {
+            return me.getSum(me.data.items, field);
+        }
+    },
+
+    // @private, see sum
+    getSum: function(records, field) {
+        var total = 0,
+            i = 0,
+            len = records.length;
+
+        for (; i < len; ++i) {
+            total += records[i].get(field);
+        }
+
+        return total;
+    },
+
+    /**
+     * Gets the count of items in the store.
+     *
+     * When store is filtered, only items within the filter are counted.
+     *
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the count for each group being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Number} the count
+     */
+    count: function(grouped) {
+        var me = this;
+
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(function(records) {
+                return records.length;
+            }, me, true);
+        } else {
+            return me.getCount();
+        }
+    },
+
+    /**
+     * Gets the minimum value in the store.
+     *
+     * When store is filtered, only items within the filter are aggregated.
+     *
+     * @param {String} field The field in each record
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the minimum in the group being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Object} The minimum value, if no items exist, undefined.
+     */
+    min: function(field, grouped) {
+        var me = this;
+
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(me.getMin, me, true, [field]);
+        } else {
+            return me.getMin(me.data.items, field);
+        }
+    },
+
+    // @private, see min
+    getMin: function(records, field) {
+        var i = 1,
+            len = records.length,
+            value, min;
+
+        if (len > 0) {
+            min = records[0].get(field);
+        }
+
+        for (; i < len; ++i) {
+            value = records[i].get(field);
+            if (value < min) {
+                min = value;
+            }
+        }
+        return min;
+    },
+
+    /**
+     * Gets the maximum value in the store.
+     *
+     * When store is filtered, only items within the filter are aggregated.
+     *
+     * @param {String} field The field in each record
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the maximum in the group being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Object} The maximum value, if no items exist, undefined.
+     */
+    max: function(field, grouped) {
+        var me = this;
+
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(me.getMax, me, true, [field]);
+        } else {
+            return me.getMax(me.data.items, field);
+        }
+    },
+
+    // @private, see max
+    getMax: function(records, field) {
+        var i = 1,
+            len = records.length,
+            value,
+            max;
+
+        if (len > 0) {
+            max = records[0].get(field);
+        }
+
+        for (; i < len; ++i) {
+            value = records[i].get(field);
+            if (value > max) {
+                max = value;
+            }
+        }
+        return max;
+    },
+
+    /**
+     * Gets the average value in the store.
+     *
+     * When store is filtered, only items within the filter are aggregated.
+     *
+     * @param {String} field The field in each record
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the group average being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @return {Object} The average value, if no items exist, 0.
+     */
+    average: function(field, grouped) {
+        var me = this;
+        if (grouped && me.isGrouped()) {
+            return me.aggregate(me.getAverage, me, true, [field]);
+        } else {
+            return me.getAverage(me.data.items, field);
+        }
+    },
+
+    // @private, see average
+    getAverage: function(records, field) {
+        var i = 0,
+            len = records.length,
+            sum = 0;
+
+        if (records.length > 0) {
+            for (; i < len; ++i) {
+                sum += records[i].get(field);
+            }
+            return sum / len;
+        }
+        return 0;
+    },
+
+    /**
+     * Runs the aggregate function for all the records in the store.
+     *
+     * When store is filtered, only items within the filter are aggregated.
+     *
+     * @param {Function} fn The function to execute. The function is called with a single parameter,
+     * an array of records for that group.
+     * @param {Object} [scope] The scope to execute the function in. Defaults to the store.
+     * @param {Boolean} [grouped] True to perform the operation for each group
+     * in the store. The value returned will be an object literal with the key being the group
+     * name and the group average being the value. The grouped parameter is only honored if
+     * the store has a groupField.
+     * @param {Array} [args] Any arguments to append to the function call
+     * @return {Object} An object literal with the group names and their appropriate values.
+     */
+    aggregate: function(fn, scope, grouped, args) {
+        args = args || [];
+        if (grouped && this.isGrouped()) {
+            var groups = this.getGroups(),
+                len = groups.length,
+                out = {},
+                group, i;
+
+            for (i = 0; i < len; ++i) {
+                group = groups[i];
+                out[group.name] = this.getAggregate(fn, scope || this, group.children, args);
+            }
+            return out;
+        } else {
+            return this.getAggregate(fn, scope, this.data.items, args);
+        }
+    },
+
+    getAggregate: function(fn, scope, records, args){
+        args = args || [];
+        return fn.apply(scope || this, [records].concat(args));
+    },
+
+    onIdChanged: function(rec, oldId, newId, oldInternalId){
+        var snapshot = this.snapshot;
+        if (snapshot) {
+            snapshot.updateKey(oldInternalId, newId);
+        }
+        this.data.updateKey(oldInternalId, newId);
+        this.callParent(arguments);
+    },
+
+    /**
+     * Commits all Records with {@link #getModifiedRecords outstanding changes}. To handle updates for changes,
+     * subscribe to the Store's {@link #event-update update event}, and perform updating when the third parameter is
+     * Ext.data.Record.COMMIT.
+     */
+    commitChanges : function(){
+        var me = this,
+            recs = me.getModifiedRecords(),
+            len = recs.length,
+            i = 0;
+
+        for (; i < len; i++){
+            recs[i].commit();
+        }
+
+        // Since removals are cached in a simple array we can simply reset it here.
+        // Adds and updates are managed in the data MixedCollection and should already be current.
+        me.removed.length = 0;
+    },
+
+    filterNewOnly: function(item){
+        return item.phantom === true;
+    },
+
+    // Ideally in the future this will use getModifiedRecords, where there will be a param
+    // to getNewRecords & getUpdatedRecords to indicate whether to get only the valid
+    // records or grab all of them
+    getRejectRecords: function() {
+        // Return phantom records + updated records
+        return Ext.Array.push(this.data.filterBy(this.filterNewOnly).items, this.getUpdatedRecords());
+    },
+
+    /**
+     * {@link Ext.data.Model#reject Rejects} outstanding changes on all {@link #getModifiedRecords modified records}
+     * and re-insert any records that were removed locally. Any phantom records will be removed.
+     */
+    rejectChanges : function() {
+        var me = this,
+            recs = me.getRejectRecords(),
+            len = recs.length,
+            i = 0,
+            rec;
+
+        for (; i < len; i++) {
+            rec = recs[i];
+            rec.reject();
+            if (rec.phantom) {
+                me.remove(rec);
+            }
+        }
+
+        // Restore removed records back to their original positions
+        recs = me.removed;
+        len = recs.length;
+        for (i = 0; i < len; i++) {
+            rec = recs[i];
+            me.insert(rec.removedFrom || 0, rec);
+            rec.reject();
+        }
+
+        // Since removals are cached in a simple array we can simply reset it here.
+        // Adds and updates are managed in the data MixedCollection and should already be current.
+        me.removed.length = 0;
+    }
+}, function() {
+    // A dummy empty store with a fieldless Model defined in it.
+    // Just for binding to Views which are instantiated with no Store defined.
+    // They will be able to run and render fine, and be bound to a generated Store later.
+    Ext.regStore('ext-empty-store', {fields: [], proxy: 'memory'});
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * @class Ext.data.reader.Array
+ * 
+ * <p>Data reader class to create an Array of {@link Ext.data.Model} objects from an Array.
+ * Each element of that Array represents a row of data fields. The
+ * fields are pulled into a Record object using as a subscript, the <code>mapping</code> property
+ * of the field definition if it exists, or the field's ordinal position in the definition.</p>
+ * 
+ * <p><u>Example code:</u></p>
+ * 
+<pre><code>
+Employee = Ext.define('Employee', {
+    extend: 'Ext.data.Model',
+    fields: [
+        'id',
+        {name: 'name', mapping: 1},         // "mapping" only needed if an "id" field is present which
+        {name: 'occupation', mapping: 2}    // precludes using the ordinal position as the index.        
+    ]
+});
+
+var myReader = new Ext.data.reader.Array({
+    model: 'Employee'
+}, Employee);
+</code></pre>
+ * 
+ * <p>This would consume an Array like this:</p>
+ * 
+<pre><code>
+[ [1, 'Bill', 'Gardener'], [2, 'Ben', 'Horticulturalist'] ]
+</code></pre>
+ * 
+ * @constructor
+ * Create a new ArrayReader
+ * @param {Object} meta Metadata configuration options.
+ */
+Ext.define('Ext.data.reader.Array', {
+    extend:  Ext.data.reader.Json ,
+    alternateClassName: 'Ext.data.ArrayReader',
+    alias : 'reader.array',
+
+    // For Array Reader, methods in the base which use these properties must not see the defaults
+    totalProperty: undefined,
+    successProperty: undefined,
+
+    /**
+     * @private
+     * Returns an accessor expression for the passed Field from an Array using either the Field's mapping, or
+     * its ordinal position in the fields collsction as the index.
+     * This is used by buildExtractors to create optimized on extractor function which converts raw data into model instances.
+     */
+    createFieldAccessExpression: function(field, fieldVarName, dataName) {
+            // In the absence of a mapping property, use the original ordinal position
+            // at which the Model inserted the field into its collection.
+        var index  = (field.mapping == null) ? field.originalIndex : field.mapping,
+            result;
+
+        if (typeof index === 'function') {
+            result = fieldVarName + '.mapping(' + dataName + ', this)';
+        } else {
+            if (isNaN(index)) {
+                index = '"' + index + '"';
+            }
+            result = dataName + "[" + index + "]";
+        }
+        return result;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ *
+ * Small helper class to make creating {@link Ext.data.Store}s from Array data easier. An ArrayStore will be
+ * automatically configured with a {@link Ext.data.reader.Array}.
+ *
+ * A store configuration would be something like:
+ *
+ *     var store = Ext.create('Ext.data.ArrayStore', {
+ *         // store configs
+ *         storeId: 'myStore',
+ *         // reader configs
+ *         fields: [
+ *            'company',
+ *            {name: 'price', type: 'float'},
+ *            {name: 'change', type: 'float'},
+ *            {name: 'pctChange', type: 'float'},
+ *            {name: 'lastChange', type: 'date', dateFormat: 'n/j h:ia'}
+ *         ]
+ *     });
+ *
+ * This store is configured to consume a returned object of the form:
+ *
+ *     var myData = [
+ *         ['3m Co',71.72,0.02,0.03,'9/1 12:00am'],
+ *         ['Alcoa Inc',29.01,0.42,1.47,'9/1 12:00am'],
+ *         ['Boeing Co.',75.43,0.53,0.71,'9/1 12:00am'],
+ *         ['Hewlett-Packard Co.',36.53,-0.03,-0.08,'9/1 12:00am'],
+ *         ['Wal-Mart Stores, Inc.',45.45,0.73,1.63,'9/1 12:00am']
+ *     ];
+ *
+ * An object literal of this form could also be used as the {@link #cfg-data} config option.
+ *
+ */
+Ext.define('Ext.data.ArrayStore', {
+    extend:  Ext.data.Store ,
+    alias: 'store.array',
+               
+                                
+                               
+      
+
+    constructor: function(config) {
+        config = Ext.apply({
+            proxy: {
+                type: 'memory',
+                reader: 'array'
+            }
+        }, config);
+        this.callParent([config]);
+    },
+
+    loadData: function(data, append) {
+        if (this.expandData === true) {
+            var r = [],
+                i = 0,
+                ln = data.length;
+
+            for (; i < ln; i++) {
+                r[r.length] = [data[i]];
+            }
+
+            data = r;
+        }
+
+        this.callParent([data, append]);
+    }
+}, function() {
+    // backwards compat
+    Ext.data.SimpleStore = Ext.data.ArrayStore;
+    // Ext.reg('simplestore', Ext.data.SimpleStore);
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * @class Ext.data.Batch
+ *
+ * <p>Provides a mechanism to run one or more {@link Ext.data.Operation operations} in a given order. Fires the 'operationcomplete' event
+ * after the completion of each Operation, and the 'complete' event when all Operations have been successfully executed. Fires an 'exception'
+ * event if any of the Operations encounter an exception.</p>
+ *
+ * <p>Usually these are only used internally by {@link Ext.data.proxy.Proxy} classes</p>
+ *
+ */
+Ext.define('Ext.data.Batch', {
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @cfg {Boolean} autoStart
+     * True to immediately start processing the batch as soon as it is constructed (defaults to false)
+     */
+    autoStart: false,
+    
+    /**
+     * @cfg {Boolean} pauseOnException
+     * True to pause the execution of the batch if any operation encounters an exception
+     * (defaults to false). If you set this to true you are responsible for implementing the appropriate
+     * handling logic and restarting or discarding the batch as needed. There are different ways you could 
+     * do this, e.g. by handling the batch's {@link #exception} event directly, or perhaps by overriding
+     * {@link Ext.data.AbstractStore#onBatchException onBatchException} at the store level. If you do pause
+     * and attempt to handle the exception you can call {@link #retry} to process the same operation again. 
+     * 
+     * Note that {@link Ext.data.Operation operations} are atomic, so any operations that may have succeeded
+     * prior to an exception (and up until pausing the batch) will be finalized at the server level and will
+     * not be automatically reversible. Any transactional / rollback behavior that might be desired would have
+     * to be implemented at the application level. Pausing on exception will likely be most beneficial when
+     * used in coordination with such a scheme, where an exception might actually affect subsequent operations
+     * in the same batch and so should be handled before continuing with the next operation.
+     * 
+     * If you have not implemented transactional operation handling then this option should typically be left 
+     * to the default of false (e.g. process as many operations as possible, and handle any exceptions 
+     * asynchronously without holding up the rest of the batch).
+     */
+    pauseOnException: false,
+
+    /**
+     * @property {Number} current
+     * The index of the current operation being executed. Read only
+     */
+    current: -1,
+
+    /**
+     * @property {Number} total
+     * The total number of operations in this batch. Read only
+     */
+    total: 0,
+
+    /**
+     * @property {Boolean} isRunning
+     * True if the batch is currently running. Read only
+     */
+    isRunning: false,
+
+    /**
+     * @property {Boolean} isComplete
+     * True if this batch has been executed completely. Read only
+     */
+    isComplete: false,
+
+    /**
+     * @property {Boolean} hasException
+     * True if this batch has encountered an exception. This is cleared at the start of each operation. Read only
+     */
+    hasException: false,
+
+    /**
+     * Creates new Batch object.
+     * @param {Object} [config] Config object
+     */
+    constructor: function(config) {
+        var me = this;
+
+        /**
+         * @event complete
+         * Fired when all operations of this batch have been completed
+         * @param {Ext.data.Batch} batch The batch object
+         * @param {Object} operation The last operation that was executed
+         */
+
+        /**
+         * @event exception
+         * Fired when a operation encountered an exception
+         * @param {Ext.data.Batch} batch The batch object
+         * @param {Object} operation The operation that encountered the exception
+         */
+
+        /**
+         * @event operationcomplete
+         * Fired when each operation of the batch completes
+         * @param {Ext.data.Batch} batch The batch object
+         * @param {Object} operation The operation that just completed
+         */
+
+        me.mixins.observable.constructor.call(me, config);
+
+        /**
+         * Ordered array of operations that will be executed by this batch
+         * @property {Ext.data.Operation[]} operations
+         */
+        me.operations = [];
+        
+        /**
+         * Ordered array of operations that raised an exception during the most recent
+         * batch execution and did not successfully complete
+         * @property {Ext.data.Operation[]} exceptions
+         */
+        me.exceptions = [];
+    },
+
+    /**
+     * Adds a new operation to this batch at the end of the {@link #operations} array
+     * @param {Object} operation The {@link Ext.data.Operation Operation} object
+     * @return {Ext.data.Batch} this
+     */
+    add: function(operation) {
+        this.total++;
+
+        operation.setBatch(this);
+
+        this.operations.push(operation);
+        
+        return this;
+    },
+
+    /**
+     * Kicks off execution of the batch, continuing from the next operation if the previous
+     * operation encountered an exception, or if execution was paused. Use this method to start
+     * the batch for the first time or to restart a paused batch by skipping the current
+     * unsuccessful operation.
+     * 
+     * To retry processing the current operation before continuing to the rest of the batch (e.g.
+     * because you explicitly handled the operation's exception), call {@link #retry} instead.
+     * 
+     * Note that if the batch is already running any call to start will be ignored.
+     * 
+     * @return {Ext.data.Batch} this
+     */
+    start: function(/* private */ index) {
+        var me = this;
+        
+        if (me.isRunning) {
+            return me;
+        }
+        
+        me.exceptions.length = 0;
+        me.hasException = false;
+        me.isRunning = true;
+
+        return me.runOperation(Ext.isDefined(index) ? index : me.current + 1);
+    },
+    
+    /**
+     * Kicks off execution of the batch, continuing from the current operation. This is intended
+     * for restarting a {@link #pause paused} batch after an exception, and the operation that raised
+     * the exception will now be retried. The batch will then continue with its normal processing until
+     * all operations are complete or another exception is encountered.
+     * 
+     * Note that if the batch is already running any call to retry will be ignored.
+     * 
+     * @return {Ext.data.Batch} this
+     */
+    retry: function() {
+        return this.start(this.current);
+    },
+
+    /**
+     * @private
+     * Runs the next operation, relative to this.current.
+     * @return {Ext.data.Batch} this
+     */
+    runNextOperation: function() {
+        return this.runOperation(this.current + 1);
+    },
+
+    /**
+     * Pauses execution of the batch, but does not cancel the current operation
+     * @return {Ext.data.Batch} this
+     */
+    pause: function() {
+        this.isRunning = false;
+        return this;
+    },
+
+    /**
+     * Executes an operation by its numeric index in the {@link #operations} array
+     * @param {Number} index The operation index to run
+     * @return {Ext.data.Batch} this
+     */
+    runOperation: function(index) {
+        var me = this,
+            operations = me.operations,
+            operation = operations[index],
+            onProxyReturn;
+
+        if (operation === undefined) {
+            me.isRunning = false;
+            me.isComplete = true;
+            me.fireEvent('complete', me, operations[operations.length - 1]);
+        } else {
+            me.current = index;
+
+            onProxyReturn = function(operation) {
+                var hasException = operation.hasException();
+
+                if (hasException) {
+                    me.hasException = true;
+                    me.exceptions.push(operation);
+                    me.fireEvent('exception', me, operation);
+                }
+
+                if (hasException && me.pauseOnException) {
+                    me.pause();
+                } else {
+                    operation.setCompleted();
+                    me.fireEvent('operationcomplete', me, operation);
+                    me.runNextOperation();
+                }
+            };
+
+            operation.setStarted();
+
+            me.proxy[operation.action](operation, onProxyReturn, me);
+        }
+        
+        return me;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * 
+ * Simple class that represents a Request that will be made by any {@link Ext.data.proxy.Server} subclass.
+ * All this class does is standardize the representation of a Request as used by any ServerProxy subclass,
+ * it does not contain any actual logic or perform the request itself.
+ */
+Ext.define('Ext.data.Request', {
+    /**
+     * @cfg {String} action
+     * The name of the action this Request represents. Usually one of 'create', 'read', 'update' or 'destroy'.
+     */
+    action: undefined,
+    
+    /**
+     * @cfg {Object} params
+     * HTTP request params. The Proxy and its Writer have access to and can modify this object.
+     */
+    params: undefined,
+    
+    /**
+     * @cfg {String} method
+     * The HTTP method to use on this Request. Should be one of 'GET', 'POST', 'PUT' or 'DELETE'.
+     */
+    method: 'GET',
+    
+    /**
+     * @cfg {String} url
+     * The url to access on this Request
+     */
+    url: undefined,
+
+    /**
+     * Creates the Request object.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        Ext.apply(this, config);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * @class Ext.data.association.BelongsTo
+ *
+ * Represents a many to one association with another model. The owner model is expected to have
+ * a foreign key which references the primary key of the associated model:
+ *
+ *     Ext.define('Category', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             { name: 'id',   type: 'int' },
+ *             { name: 'name', type: 'string' }
+ *         ]
+ *     });
+ *
+ *     Ext.define('Product', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             { name: 'id',          type: 'int' },
+ *             { name: 'category_id', type: 'int' },
+ *             { name: 'name',        type: 'string' }
+ *         ],
+ *         // we can use the belongsTo shortcut on the model to create a belongsTo association
+ *         associations: [
+ *             { type: 'belongsTo', model: 'Category' }
+ *         ]
+ *     });
+ *
+ * In the example above we have created models for Products and Categories, and linked them together
+ * by saying that each Product belongs to a Category. This automatically links each Product to a Category
+ * based on the Product's category_id, and provides new functions on the Product model:
+ *
+ * ## Generated getter function
+ *
+ * The first function that is added to the owner model is a getter function:
+ *
+ *     var product = new Product({
+ *         id: 100,
+ *         category_id: 20,
+ *         name: 'Sneakers'
+ *     });
+ *
+ *     product.getCategory(function(category, operation) {
+ *         // do something with the category object
+ *         alert(category.get('id')); // alerts 20
+ *     }, this);
+ *
+ * The getCategory function was created on the Product model when we defined the association. This uses the
+ * Category's configured {@link Ext.data.proxy.Proxy proxy} to load the Category asynchronously, calling the provided
+ * callback when it has loaded.
+ *
+ * The new getCategory function will also accept an object containing success, failure and callback properties
+ * - callback will always be called, success will only be called if the associated model was loaded successfully
+ * and failure will only be called if the associatied model could not be loaded:
+ *
+ *     product.getCategory({
+ *         reload: true, // force a reload if the owner model is already cached
+ *         callback: function(category, operation) {}, // a function that will always be called
+ *         success : function(category, operation) {}, // a function that will only be called if the load succeeded
+ *         failure : function(category, operation) {}, // a function that will only be called if the load did not succeed
+ *         scope   : this // optionally pass in a scope object to execute the callbacks in
+ *     });
+ *
+ * In each case above the callbacks are called with two arguments - the associated model instance and the
+ * {@link Ext.data.Operation operation} object that was executed to load that instance. The Operation object is
+ * useful when the instance could not be loaded.
+ * 
+ * Once the getter has been called on the model, it will be cached if the getter is called a second time. To
+ * force the model to reload, specify reload: true in the options object.
+ *
+ * ## Generated setter function
+ *
+ * The second generated function sets the associated model instance - if only a single argument is passed to
+ * the setter then the following two calls are identical:
+ *
+ *     // this call...
+ *     product.setCategory(10);
+ *
+ *     // is equivalent to this call:
+ *     product.set('category_id', 10);
+ *     
+ * An instance of the owner model can also be passed as a parameter.
+ *
+ * If we pass in a second argument, the model will be automatically saved and the second argument passed to
+ * the owner model's {@link Ext.data.Model#save save} method:
+ *
+ *     product.setCategory(10, function(product, operation) {
+ *         // the product has been saved
+ *         alert(product.get('category_id')); //now alerts 10
+ *     });
+ *
+ *     //alternative syntax:
+ *     product.setCategory(10, {
+ *         callback: function(product, operation), // a function that will always be called
+ *         success : function(product, operation), // a function that will only be called if the load succeeded
+ *         failure : function(product, operation), // a function that will only be called if the load did not succeed
+ *         scope   : this //optionally pass in a scope object to execute the callbacks in
+ *     })
+ *
+ * ## Customisation
+ *
+ * Associations reflect on the models they are linking to automatically set up properties such as the
+ * {@link #primaryKey} and {@link #foreignKey}. These can alternatively be specified:
+ *
+ *     Ext.define('Product', {
+ *         fields: [...],
+ *
+ *         associations: [
+ *             { type: 'belongsTo', model: 'Category', primaryKey: 'unique_id', foreignKey: 'cat_id' }
+ *         ]
+ *     });
+ *
+ * Here we replaced the default primary key (defaults to 'id') and foreign key (calculated as 'category_id')
+ * with our own settings. Usually this will not be needed.
+ */
+Ext.define('Ext.data.association.BelongsTo', {
+    extend:  Ext.data.association.Association ,
+    alternateClassName: 'Ext.data.BelongsToAssociation',
+    alias: 'association.belongsto',
+
+    /**
+     * @cfg {String} foreignKey The name of the foreign key on the owner model that links it to the associated
+     * model. Defaults to the lowercased name of the associated model plus "_id", e.g. an association with a
+     * model called Product would set up a product_id foreign key.
+     *
+     *     Ext.define('Order', {
+     *         extend: 'Ext.data.Model',
+     *         fields: ['id', 'date'],
+     *         hasMany: 'Product'
+     *     });
+     *
+     *     Ext.define('Product', {
+     *         extend: 'Ext.data.Model',
+     *         fields: ['id', 'name', 'order_id'], // refers to the id of the order that this product belongs to
+     *         belongsTo: 'Order'
+     *     });
+     *     var product = new Product({
+     *         id: 1,
+     *         name: 'Product 1',
+     *         order_id: 22
+     *     }, 1);
+     *     product.getOrder(); // Will make a call to the server asking for order_id 22
+     *
+     */
+
+    /**
+     * @cfg {String} getterName The name of the getter function that will be added to the local model's prototype.
+     * Defaults to 'get' + the name of the foreign model, e.g. getCategory
+     */
+
+    /**
+     * @cfg {String} setterName The name of the setter function that will be added to the local model's prototype.
+     * Defaults to 'set' + the name of the foreign model, e.g. setCategory
+     */
+
+    /**
+     * @cfg {String} type The type configuration can be used when creating associations using a configuration object.
+     * Use 'belongsTo' to create a BelongsTo association.
+     *
+     *     associations: [{
+     *         type: 'belongsTo',
+     *         model: 'User'
+     *     }]
+     */
+    constructor: function(config) {
+        this.callParent(arguments);
+
+        var me             = this,
+            ownerProto     = me.ownerModel.prototype,
+            associatedName = me.associatedName,
+            getterName     = me.getterName || 'get' + associatedName,
+            setterName     = me.setterName || 'set' + associatedName;
+
+        Ext.applyIf(me, {
+            name        : associatedName,
+            foreignKey  : associatedName.toLowerCase() + "_id",
+            instanceName: associatedName + 'BelongsToInstance',
+            associationKey: associatedName.toLowerCase()
+        });
+
+        ownerProto[getterName] = me.createGetter();
+        ownerProto[setterName] = me.createSetter();
+    },
+
+    /**
+     * @private
+     * Returns a setter function to be placed on the owner model's prototype
+     * @return {Function} The setter function
+     */
+    createSetter: function() {
+        var me = this,
+            foreignKey = me.foreignKey,
+            instanceName = me.instanceName;
+
+        //'this' refers to the Model instance inside this function
+        return function(value, options, scope) {
+            // If we were passed a record, the value to set is the key of that record.
+            var setByRecord = value && value.isModel,
+                valueToSet = setByRecord ? value.getId() : value;
+
+            // Setter was passed a record.
+            if (setByRecord) {
+                this[instanceName] = value;
+            }
+
+            // Otherwise, if the key of foreign record !== passed value, delete the cached foreign record
+            else if (this[instanceName] instanceof Ext.data.Model && !this.isEqual(this.get(foreignKey), valueToSet)) {
+                delete this[instanceName];
+            }
+
+            // Set the forign key value
+            this.set(foreignKey, valueToSet);
+
+            if (Ext.isFunction(options)) {
+                options = {
+                    callback: options,
+                    scope: scope || this
+                };
+            }
+
+            if (Ext.isObject(options)) {
+                return this.save(options);
+            }
+        };
+    },
+
+    /**
+     * @private
+     * Returns a getter function to be placed on the owner model's prototype. We cache the loaded instance
+     * the first time it is loaded so that subsequent calls to the getter always receive the same reference.
+     * @return {Function} The getter function
+     */
+    createGetter: function() {
+        var me              = this,
+            associatedName  = me.associatedName,
+            associatedModel = me.associatedModel,
+            foreignKey      = me.foreignKey,
+            primaryKey      = me.primaryKey,
+            instanceName    = me.instanceName;
+
+        //'this' refers to the Model instance inside this function
+        return function(options, scope) {
+            options = options || {};
+
+            var model = this,
+                foreignKeyId = model.get(foreignKey),
+                success,
+                instance,
+                args;
+
+            if (options.reload === true || model[instanceName] === undefined) {
+                instance = Ext.ModelManager.create({}, associatedName);
+                instance.set(primaryKey, foreignKeyId);
+
+                if (typeof options == 'function') {
+                    options = {
+                        callback: options,
+                        scope: scope || model
+                    };
+                }
+                
+                // Overwrite the success handler so we can assign the current instance
+                success = options.success;
+                options.success = function(rec){
+                    model[instanceName] = rec;
+                    if (success) {
+                        success.apply(this, arguments);
+                    }
+                };
+
+                associatedModel.load(foreignKeyId, options);
+                // assign temporarily while we wait for data to return
+                model[instanceName] = instance;
+                return instance;
+            } else {
+                instance = model[instanceName];
+                args = [instance];
+                scope = scope || options.scope || model;
+
+                //TODO: We're duplicating the callback invokation code that the instance.load() call above
+                //makes here - ought to be able to normalize this - perhaps by caching at the Model.load layer
+                //instead of the association layer.
+                Ext.callback(options, scope, args);
+                Ext.callback(options.success, scope, args);
+                Ext.callback(options.failure, scope, args);
+                Ext.callback(options.callback, scope, args);
+
+                return instance;
+            }
+        };
+    },
+
+    /**
+     * Read associated data
+     * @private
+     * @param {Ext.data.Model} record The record we're writing to
+     * @param {Ext.data.reader.Reader} reader The reader for the associated model
+     * @param {Object} associationData The raw associated data
+     */
+    read: function(record, reader, associationData){
+        record[this.instanceName] = reader.read([associationData]).records[0];
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * General purpose inflector class that {@link #pluralize pluralizes}, {@link #singularize singularizes} and
+ * {@link #ordinalize ordinalizes} words. Sample usage:
+ *
+ *     //turning singular words into plurals
+ *     Ext.util.Inflector.pluralize('word'); //'words'
+ *     Ext.util.Inflector.pluralize('person'); //'people'
+ *     Ext.util.Inflector.pluralize('sheep'); //'sheep'
+ *
+ *     //turning plurals into singulars
+ *     Ext.util.Inflector.singularize('words'); //'word'
+ *     Ext.util.Inflector.singularize('people'); //'person'
+ *     Ext.util.Inflector.singularize('sheep'); //'sheep'
+ *
+ *     //ordinalizing numbers
+ *     Ext.util.Inflector.ordinalize(11); //"11th"
+ *     Ext.util.Inflector.ordinalize(21); //"21st"
+ *     Ext.util.Inflector.ordinalize(1043); //"1043rd"
+ *
+ * # Customization
+ *
+ * The Inflector comes with a default set of US English pluralization rules. These can be augmented with additional
+ * rules if the default rules do not meet your application's requirements, or swapped out entirely for other languages.
+ * Here is how we might add a rule that pluralizes "ox" to "oxen":
+ *
+ *     Ext.util.Inflector.plural(/^(ox)$/i, "$1en");
+ *
+ * Each rule consists of two items - a regular expression that matches one or more rules, and a replacement string. In
+ * this case, the regular expression will only match the string "ox", and will replace that match with "oxen". Here's
+ * how we could add the inverse rule:
+ *
+ *     Ext.util.Inflector.singular(/^(ox)en$/i, "$1");
+ *
+ * Note that the ox/oxen rules are present by default.
+ */
+Ext.define('Ext.util.Inflector', {
+
+    /* Begin Definitions */
+
+    singleton: true,
+
+    /* End Definitions */
+
+    /**
+     * @private
+     * The registered plural tuples. Each item in the array should contain two items - the first must be a regular
+     * expression that matchers the singular form of a word, the second must be a String that replaces the matched
+     * part of the regular expression. This is managed by the {@link #plural} method.
+     * @property {Array} plurals
+     */
+    plurals: [
+        [(/(quiz)$/i),                "$1zes"  ],
+        [(/^(ox)$/i),                 "$1en"   ],
+        [(/([m|l])ouse$/i),           "$1ice"  ],
+        [(/(matr|vert|ind)ix|ex$/i),  "$1ices" ],
+        [(/(x|ch|ss|sh)$/i),          "$1es"   ],
+        [(/([^aeiouy]|qu)y$/i),       "$1ies"  ],
+        [(/(hive)$/i),                "$1s"    ],
+        [(/(?:([^f])fe|([lr])f)$/i),  "$1$2ves"],
+        [(/sis$/i),                   "ses"    ],
+        [(/([ti])um$/i),              "$1a"    ],
+        [(/(buffal|tomat|potat)o$/i), "$1oes"  ],
+        [(/(bu)s$/i),                 "$1ses"  ],
+        [(/(alias|status|sex)$/i),    "$1es"   ],
+        [(/(octop|vir)us$/i),         "$1i"    ],
+        [(/(ax|test)is$/i),           "$1es"   ],
+        [(/^person$/),                "people" ],
+        [(/^man$/),                   "men"    ],
+        [(/^(child)$/),               "$1ren"  ],
+        [(/s$/i),                     "s"      ],
+        [(/$/),                       "s"      ]
+    ],
+
+    /**
+     * @private
+     * The set of registered singular matchers. Each item in the array should contain two items - the first must be a
+     * regular expression that matches the plural form of a word, the second must be a String that replaces the
+     * matched part of the regular expression. This is managed by the {@link #singular} method.
+     * @property {Array} singulars
+     */
+    singulars: [
+      [(/(quiz)zes$/i),                                                    "$1"     ],
+      [(/(matr)ices$/i),                                                   "$1ix"   ],
+      [(/(vert|ind)ices$/i),                                               "$1ex"   ],
+      [(/^(ox)en/i),                                                       "$1"     ],
+      [(/(alias|status)es$/i),                                             "$1"     ],
+      [(/(octop|vir)i$/i),                                                 "$1us"   ],
+      [(/(cris|ax|test)es$/i),                                             "$1is"   ],
+      [(/(shoe)s$/i),                                                      "$1"     ],
+      [(/(o)es$/i),                                                        "$1"     ],
+      [(/(bus)es$/i),                                                      "$1"     ],
+      [(/([m|l])ice$/i),                                                   "$1ouse" ],
+      [(/(x|ch|ss|sh)es$/i),                                               "$1"     ],
+      [(/(m)ovies$/i),                                                     "$1ovie" ],
+      [(/(s)eries$/i),                                                     "$1eries"],
+      [(/([^aeiouy]|qu)ies$/i),                                            "$1y"    ],
+      [(/([lr])ves$/i),                                                    "$1f"    ],
+      [(/(tive)s$/i),                                                      "$1"     ],
+      [(/(hive)s$/i),                                                      "$1"     ],
+      [(/([^f])ves$/i),                                                    "$1fe"   ],
+      [(/(^analy)ses$/i),                                                  "$1sis"  ],
+      [(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i), "$1$2sis"],
+      [(/([ti])a$/i),                                                      "$1um"   ],
+      [(/(n)ews$/i),                                                       "$1ews"  ],
+      [(/people$/i),                                                       "person" ],
+      [(/s$/i),                                                            ""       ]
+    ],
+
+    /**
+     * @private
+     * The registered uncountable words
+     * @property {String[]} uncountable
+     */
+     uncountable: [
+        "sheep",
+        "fish",
+        "series",
+        "species",
+        "money",
+        "rice",
+        "information",
+        "equipment",
+        "grass",
+        "mud",
+        "offspring",
+        "deer",
+        "means"
+    ],
+
+    /**
+     * Adds a new singularization rule to the Inflector. See the intro docs for more information
+     * @param {RegExp} matcher The matcher regex
+     * @param {String} replacer The replacement string, which can reference matches from the matcher argument
+     */
+    singular: function(matcher, replacer) {
+        this.singulars.unshift([matcher, replacer]);
+    },
+
+    /**
+     * Adds a new pluralization rule to the Inflector. See the intro docs for more information
+     * @param {RegExp} matcher The matcher regex
+     * @param {String} replacer The replacement string, which can reference matches from the matcher argument
+     */
+    plural: function(matcher, replacer) {
+        this.plurals.unshift([matcher, replacer]);
+    },
+
+    /**
+     * Removes all registered singularization rules
+     */
+    clearSingulars: function() {
+        this.singulars = [];
+    },
+
+    /**
+     * Removes all registered pluralization rules
+     */
+    clearPlurals: function() {
+        this.plurals = [];
+    },
+
+    /**
+     * Returns true if the given word is transnumeral (the word is its own singular and plural form - e.g. sheep, fish)
+     * @param {String} word The word to test
+     * @return {Boolean} True if the word is transnumeral
+     */
+    isTransnumeral: function(word) {
+        return Ext.Array.indexOf(this.uncountable, word) != -1;
+    },
+
+    /**
+     * Returns the pluralized form of a word (e.g. Ext.util.Inflector.pluralize('word') returns 'words')
+     * @param {String} word The word to pluralize
+     * @return {String} The pluralized form of the word
+     */
+    pluralize: function(word) {
+        if (this.isTransnumeral(word)) {
+            return word;
+        }
+
+        var plurals = this.plurals,
+            length  = plurals.length,
+            tuple, regex, i;
+
+        for (i = 0; i < length; i++) {
+            tuple = plurals[i];
+            regex = tuple[0];
+
+            if (regex == word || (regex.test && regex.test(word))) {
+                return word.replace(regex, tuple[1]);
+            }
+        }
+
+        return word;
+    },
+
+    /**
+     * Returns the singularized form of a word (e.g. Ext.util.Inflector.singularize('words') returns 'word')
+     * @param {String} word The word to singularize
+     * @return {String} The singularized form of the word
+     */
+    singularize: function(word) {
+        if (this.isTransnumeral(word)) {
+            return word;
+        }
+
+        var singulars = this.singulars,
+            length    = singulars.length,
+            tuple, regex, i;
+
+        for (i = 0; i < length; i++) {
+            tuple = singulars[i];
+            regex = tuple[0];
+
+            if (regex == word || (regex.test && regex.test(word))) {
+                return word.replace(regex, tuple[1]);
+            }
+        }
+
+        return word;
+    },
+
+    /**
+     * Returns the correct {@link Ext.data.Model Model} name for a given string. Mostly used internally by the data
+     * package
+     * @param {String} word The word to classify
+     * @return {String} The classified version of the word
+     */
+    classify: function(word) {
+        return Ext.String.capitalize(this.singularize(word));
+    },
+
+    /**
+     * Ordinalizes a given number by adding a prefix such as 'st', 'nd', 'rd' or 'th' based on the last digit of the
+     * number. 21 -> 21st, 22 -> 22nd, 23 -> 23rd, 24 -> 24th etc
+     * @param {Number} number The number to ordinalize
+     * @return {String} The ordinalized number
+     */
+    ordinalize: function(number) {
+        var parsed = parseInt(number, 10),
+            mod10  = parsed % 10,
+            mod100 = parsed % 100;
+
+        //11 through 13 are a special case
+        if (11 <= mod100 && mod100 <= 13) {
+            return number + "th";
+        } else {
+            switch(mod10) {
+                case 1 : return number + "st";
+                case 2 : return number + "nd";
+                case 3 : return number + "rd";
+                default: return number + "th";
+            }
+        }
+    }
+}, function() {
+    //aside from the rules above, there are a number of words that have irregular pluralization so we add them here
+    var irregulars = {
+            alumnus: 'alumni',
+            cactus : 'cacti',
+            focus  : 'foci',
+            nucleus: 'nuclei',
+            radius: 'radii',
+            stimulus: 'stimuli',
+            ellipsis: 'ellipses',
+            paralysis: 'paralyses',
+            oasis: 'oases',
+            appendix: 'appendices',
+            index: 'indexes',
+            beau: 'beaux',
+            bureau: 'bureaux',
+            tableau: 'tableaux',
+            woman: 'women',
+            child: 'children',
+            man: 'men',
+            corpus:	'corpora',
+            criterion: 'criteria',
+            curriculum:	'curricula',
+            genus: 'genera',
+            memorandum:	'memoranda',
+            phenomenon:	'phenomena',
+            foot: 'feet',
+            goose: 'geese',
+            tooth: 'teeth',
+            antenna: 'antennae',
+            formula: 'formulae',
+            nebula: 'nebulae',
+            vertebra: 'vertebrae',
+            vita: 'vitae'
+        },
+        singular;
+
+    for (singular in irregulars) {
+        this.plural(singular, irregulars[singular]);
+        this.singular(irregulars[singular], singular);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @author Ed Spencer
+ * @class Ext.data.association.HasMany
+ * 
+ * <p>Represents a one-to-many relationship between two models. Usually created indirectly via a model definition:</p>
+ * 
+<pre><code>
+Ext.define('Product', {
+    extend: 'Ext.data.Model',
+    fields: [
+        {name: 'id',      type: 'int'},
+        {name: 'user_id', type: 'int'},
+        {name: 'name',    type: 'string'}
+    ]
+});
+
+Ext.define('User', {
+    extend: 'Ext.data.Model',
+    fields: [
+        {name: 'id',   type: 'int'},
+        {name: 'name', type: 'string'}
+    ],
+    // we can use the hasMany shortcut on the model to create a hasMany association
+    hasMany: {model: 'Product', name: 'products'}
+});
+</code></pre>
+* 
+ * <p>Above we created Product and User models, and linked them by saying that a User hasMany Products. This gives
+ * us a new function on every User instance, in this case the function is called 'products' because that is the name
+ * we specified in the association configuration above.</p>
+ * 
+ * <p>This new function returns a specialized {@link Ext.data.Store Store} which is automatically filtered to load
+ * only Products for the given model instance:</p>
+ * 
+<pre><code>
+//first, we load up a User with id of 1
+var user = Ext.create('User', {id: 1, name: 'Ed'});
+
+//the user.products function was created automatically by the association and returns a {@link Ext.data.Store Store}
+//the created store is automatically scoped to the set of Products for the User with id of 1
+var products = user.products();
+
+//we still have all of the usual Store functions, for example it's easy to add a Product for this User
+products.add({
+    name: 'Another Product'
+});
+
+//saves the changes to the store - this automatically sets the new Product's user_id to 1 before saving
+products.sync();
+</code></pre>
+ * 
+ * <p>The new Store is only instantiated the first time you call products() to conserve memory and processing time,
+ * though calling products() a second time returns the same store instance.</p>
+ * 
+ * <p><u>Custom filtering</u></p>
+ * 
+ * <p>The Store is automatically furnished with a filter - by default this filter tells the store to only return
+ * records where the associated model's foreign key matches the owner model's primary key. For example, if a User
+ * with ID = 100 hasMany Products, the filter loads only Products with user_id == 100.</p>
+ * 
+ * <p>Sometimes we want to filter by another field - for example in the case of a Twitter search application we may
+ * have models for Search and Tweet:</p>
+ * 
+<pre><code>
+Ext.define('Search', {
+    extend: 'Ext.data.Model',
+    fields: [
+        'id', 'query'
+    ],
+
+    hasMany: {
+        model: 'Tweet',
+        name : 'tweets',
+        filterProperty: 'query'
+    }
+});
+
+Ext.define('Tweet', {
+    extend: 'Ext.data.Model',
+    fields: [
+        'id', 'text', 'from_user'
+    ]
+});
+
+//returns a Store filtered by the filterProperty
+var store = new Search({query: 'Sencha Touch'}).tweets();
+</code></pre>
+ * 
+ * <p>The tweets association above is filtered by the query property by setting the {@link #filterProperty}, and is
+ * equivalent to this:</p>
+ * 
+<pre><code>
+var store = Ext.create('Ext.data.Store', {
+    model: 'Tweet',
+    filters: [
+        {
+            property: 'query',
+            value   : 'Sencha Touch'
+        }
+    ]
+});
+</code></pre>
+ */
+Ext.define('Ext.data.association.HasMany', {
+    extend:  Ext.data.association.Association ,
+    alternateClassName: 'Ext.data.HasManyAssociation',
+                                     
+
+    alias: 'association.hasmany',
+
+    /**
+     * @cfg {String} foreignKey The name of the foreign key on the associated model that links it to the owner
+     * model. Defaults to the lowercased name of the owner model plus "_id", e.g. an association with a where a
+     * model called Group hasMany Users would create 'group_id' as the foreign key. When the remote store is loaded,
+     * the store is automatically filtered so that only records with a matching foreign key are included in the 
+     * resulting child store. This can be overridden by specifying the {@link #filterProperty}.
+     * <pre><code>
+Ext.define('Group', {
+    extend: 'Ext.data.Model',
+    fields: ['id', 'name'],
+    hasMany: 'User'
+});
+
+Ext.define('User', {
+    extend: 'Ext.data.Model',
+    fields: ['id', 'name', 'group_id'], // refers to the id of the group that this user belongs to
+    belongsTo: 'Group'
+});
+     * </code></pre>
+     */
+    
+    /**
+     * @cfg {String} name The name of the function to create on the owner model to retrieve the child store.
+     * If not specified, the pluralized name of the child model is used.
+     * <pre><code>
+// This will create a users() method on any Group model instance
+Ext.define('Group', {
+    extend: 'Ext.data.Model',
+    fields: ['id', 'name'],
+    hasMany: 'User'
+});
+var group = new Group();
+console.log(group.users());
+
+// The method to retrieve the users will now be getUserList
+Ext.define('Group', {
+    extend: 'Ext.data.Model',
+    fields: ['id', 'name'],
+    hasMany: {model: 'User', name: 'getUserList'}
+});
+var group = new Group();
+console.log(group.getUserList());
+     * </code></pre>
+     */
+    
+    /**
+     * @cfg {Object} storeConfig Optional configuration object that will be passed to the generated Store. Defaults to 
+     * undefined.
+     */
+    
+    /**
+     * @cfg {String} filterProperty Optionally overrides the default filter that is set up on the associated Store. If
+     * this is not set, a filter is automatically created which filters the association based on the configured 
+     * {@link #foreignKey}. See intro docs for more details. Defaults to undefined
+     */
+    
+    /**
+     * @cfg {Boolean} autoLoad True to automatically load the related store from a remote source when instantiated.
+     * Defaults to <tt>false</tt>.
+     */
+    
+    /**
+     * @cfg {String} type The type configuration can be used when creating associations using a configuration object.
+     * Use 'hasMany' to create a HasMany association
+     * <pre><code>
+associations: [{
+    type: 'hasMany',
+    model: 'User'
+}]
+     * </code></pre>
+     */
+    
+    constructor: function(config) {
+        var me = this,
+            ownerProto,
+            name;
+            
+        me.callParent(arguments);
+        
+        me.name = me.name || Ext.util.Inflector.pluralize(me.associatedName.toLowerCase());
+        
+        ownerProto = me.ownerModel.prototype;
+        name = me.name;
+        
+        Ext.applyIf(me, {
+            storeName : name + "Store",
+            foreignKey: me.ownerName.toLowerCase() + "_id"
+        });
+        
+        ownerProto[name] = me.createStore();
+    },
+    
+    /**
+     * @private
+     * Creates a function that returns an Ext.data.Store which is configured to load a set of data filtered
+     * by the owner model's primary key - e.g. in a hasMany association where Group hasMany Users, this function
+     * returns a Store configured to return the filtered set of a single Group's Users.
+     * @return {Function} The store-generating function
+     */
+    createStore: function() {
+        var that            = this,
+            associatedModel = that.associatedModel,
+            storeName       = that.storeName,
+            foreignKey      = that.foreignKey,
+            primaryKey      = that.primaryKey,
+            filterProperty  = that.filterProperty,
+            autoLoad        = that.autoLoad,
+            storeConfig     = that.storeConfig || {};
+        
+        return function() {
+            var me = this,
+                config, filter,
+                modelDefaults = {};
+                
+            if (me[storeName] === undefined) {
+                if (filterProperty) {
+                    filter = {
+                        property  : filterProperty,
+                        value     : me.get(filterProperty),
+                        exactMatch: true
+                    };
+                } else {
+                    filter = {
+                        property  : foreignKey,
+                        value     : me.get(primaryKey),
+                        exactMatch: true
+                    };
+                }
+                
+                modelDefaults[foreignKey] = me.get(primaryKey);
+                
+                config = Ext.apply({}, storeConfig, {
+                    model        : associatedModel,
+                    filters      : [filter],
+                    remoteFilter : false,
+                    modelDefaults: modelDefaults,
+                    disableMetaChangeEvent: true
+                });
+                
+                me[storeName] = Ext.data.AbstractStore.create(config);
+                if (autoLoad) {
+                    me[storeName].load();
+                }
+            }
+            
+            return me[storeName];
+        };
+    },
+    
+    /**
+     * Read associated data
+     * @private
+     * @param {Ext.data.Model} record The record we're writing to
+     * @param {Ext.data.reader.Reader} reader The reader for the associated model
+     * @param {Object} associationData The raw associated data
+     */
+    read: function(record, reader, associationData){
+        var store = record[this.name](),
+            inverse,
+            items, iLen, i;
+    
+        store.add(reader.read(associationData).records);
+    
+        //now that we've added the related records to the hasMany association, set the inverse belongsTo
+        //association on each of them if it exists
+        inverse = this.associatedModel.prototype.associations.findBy(function(assoc){
+            return assoc.type === 'belongsTo' && assoc.associatedName === record.$className;
+        });
+    
+        //if the inverse association was found, set it now on each record we've just created
+        if (inverse) {
+            items = store.data.items;
+            iLen  = items.length;
+
+            for (i = 0; i < iLen; i++) {
+                items[i][inverse.instanceName] = record;
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.data.association.HasOne
+ * 
+ * Represents a one to one association with another model. The owner model is expected to have
+ * a foreign key which references the primary key of the associated model:
+ *
+ *     Ext.define('Address', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             { name: 'id',          type: 'int' },
+ *             { name: 'number', type: 'string' },
+ *             { name: 'street', type: 'string' },
+ *             { name: 'city', type: 'string' },
+ *             { name: 'zip', type: 'string' },
+ *         ]
+ *     });
+ *
+ *     Ext.define('Person', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             { name: 'id',   type: 'int' },
+ *             { name: 'name', type: 'string' },
+ *             { name: 'address_id', type: 'int'}
+ *         ],
+ *         // we can use the hasOne shortcut on the model to create a hasOne association
+ *         associations: [{ type: 'hasOne', model: 'Address' }]
+ *     });
+ *
+ * In the example above we have created models for People and Addresses, and linked them together
+ * by saying that each Person has a single Address. This automatically links each Person to an Address
+ * based on the Persons address_id, and provides new functions on the Person model:
+ *
+ * ## Generated getter function
+ *
+ * The first function that is added to the owner model is a getter function:
+ *
+ *     var person = new Person({
+ *         id: 100,
+ *         address_id: 20,
+ *         name: 'John Smith'
+ *     });
+ *
+ *     person.getAddress(function(address, operation) {
+ *         // do something with the address object
+ *         alert(address.get('id')); // alerts 20
+ *     }, this);
+ *
+ * The getAddress function was created on the Person model when we defined the association. This uses the
+ * Persons configured {@link Ext.data.proxy.Proxy proxy} to load the Address asynchronously, calling the provided
+ * callback when it has loaded.
+ *
+ * The new getAddress function will also accept an object containing success, failure and callback properties
+ * - callback will always be called, success will only be called if the associated model was loaded successfully
+ * and failure will only be called if the associatied model could not be loaded:
+ *
+ *     person.getAddress({
+ *         reload: true, // force a reload if the owner model is already cached
+ *         callback: function(address, operation) {}, // a function that will always be called
+ *         success : function(address, operation) {}, // a function that will only be called if the load succeeded
+ *         failure : function(address, operation) {}, // a function that will only be called if the load did not succeed
+ *         scope   : this // optionally pass in a scope object to execute the callbacks in
+ *     });
+ *
+ * In each case above the callbacks are called with two arguments - the associated model instance and the
+ * {@link Ext.data.Operation operation} object that was executed to load that instance. The Operation object is
+ * useful when the instance could not be loaded.
+ * 
+ * Once the getter has been called on the model, it will be cached if the getter is called a second time. To
+ * force the model to reload, specify reload: true in the options object.
+ *
+ * ## Generated setter function
+ *
+ * The second generated function sets the associated model instance - if only a single argument is passed to
+ * the setter then the following two calls are identical:
+ *
+ *     // this call...
+ *     person.setAddress(10);
+ *
+ *     // is equivalent to this call:
+ *     person.set('address_id', 10);
+ *     
+ * An instance of the owner model can also be passed as a parameter.
+ *
+ * If we pass in a second argument, the model will be automatically saved and the second argument passed to
+ * the owner model's {@link Ext.data.Model#save save} method:
+ *
+ *     person.setAddress(10, function(address, operation) {
+ *         // the address has been saved
+ *         alert(address.get('address_id')); //now alerts 10
+ *     });
+ *
+ *     //alternative syntax:
+ *     person.setAddress(10, {
+ *         callback: function(address, operation), // a function that will always be called
+ *         success : function(address, operation), // a function that will only be called if the load succeeded
+ *         failure : function(address, operation), // a function that will only be called if the load did not succeed
+ *         scope   : this //optionally pass in a scope object to execute the callbacks in
+ *     })
+ *
+ * ## Customisation
+ *
+ * Associations reflect on the models they are linking to automatically set up properties such as the
+ * {@link #primaryKey} and {@link #foreignKey}. These can alternatively be specified:
+ *
+ *     Ext.define('Person', {
+ *         fields: [...],
+ *
+ *         associations: [
+ *             { type: 'hasOne', model: 'Address', primaryKey: 'unique_id', foreignKey: 'addr_id' }
+ *         ]
+ *     });
+ *
+ * Here we replaced the default primary key (defaults to 'id') and foreign key (calculated as 'address_id')
+ * with our own settings. Usually this will not be needed.
+ */
+Ext.define('Ext.data.association.HasOne', {
+    extend:  Ext.data.association.Association ,
+    alternateClassName: 'Ext.data.HasOneAssociation',
+
+    alias: 'association.hasone',
+    
+    /**
+     * @cfg {String} foreignKey The name of the foreign key on the owner model that links it to the associated
+     * model. Defaults to the lowercased name of the associated model plus "_id", e.g. an association with a
+     * model called Person would set up a address_id foreign key.
+     *
+     *     Ext.define('Person', {
+     *         extend: 'Ext.data.Model',
+     *         fields: ['id', 'name', 'address_id'], // refers to the id of the address object
+     *         hasOne: 'Address'
+     *     });
+     *
+     *     Ext.define('Address', {
+     *         extend: 'Ext.data.Model',
+     *         fields: ['id', 'number', 'street', 'city', 'zip'], 
+     *         belongsTo: 'Person'
+     *     });
+     *     var Person = new Person({
+     *         id: 1,
+     *         name: 'John Smith',
+     *         address_id: 13
+     *     }, 1);
+     *     person.getAddress(); // Will make a call to the server asking for address_id 13
+     *
+     */
+
+    /**
+     * @cfg {String} getterName The name of the getter function that will be added to the local model's prototype.
+     * Defaults to 'get' + the name of the foreign model, e.g. getAddress
+     */
+
+    /**
+     * @cfg {String} setterName The name of the setter function that will be added to the local model's prototype.
+     * Defaults to 'set' + the name of the foreign model, e.g. setAddress
+     */
+
+    /**
+     * @cfg {String} type The type configuration can be used when creating associations using a configuration object.
+     * Use 'hasOne' to create a HasOne association.
+     *
+     *     associations: [{
+     *         type: 'hasOne',
+     *         model: 'Address'
+     *     }]
+     */
+    
+    constructor: function(config) {
+        this.callParent(arguments);
+
+        var me             = this,
+            ownerProto     = me.ownerModel.prototype,
+            associatedName = me.associatedName,
+            getterName     = me.getterName || 'get' + associatedName,
+            setterName     = me.setterName || 'set' + associatedName;
+
+        Ext.applyIf(me, {
+            name        : associatedName,
+            foreignKey  : associatedName.toLowerCase() + "_id",
+            instanceName: associatedName + 'HasOneInstance',
+            associationKey: associatedName.toLowerCase()
+        });
+
+        ownerProto[getterName] = me.createGetter();
+        ownerProto[setterName] = me.createSetter();
+    },
+    
+    /**
+     * @private
+     * Returns a setter function to be placed on the owner model's prototype
+     * @return {Function} The setter function
+     */
+    createSetter: function() {
+        var me              = this,
+            foreignKey      = me.foreignKey,
+            instanceName = me.instanceName;
+
+        //'this' refers to the Model instance inside this function
+        return function(value, options, scope) {
+            // If we were passed a record, the value to set is the key of that record.
+            var setByRecord = value && value.isModel,
+                valueToSet = setByRecord ? value.getId() : value;
+
+            // Setter was passed a record.
+            if (setByRecord) {
+                this[instanceName] = value;
+            }
+
+            // Otherwise, if the key of foreign record !== passed value, delete the cached foreign record
+            else if (this[instanceName] instanceof Ext.data.Model && !this.isEqual(this.get(foreignKey), valueToSet)) {
+                delete this[instanceName];
+            }
+
+            // Set the forign key value
+            this.set(foreignKey, valueToSet);
+
+            if (Ext.isFunction(options)) {
+                options = {
+                    callback: options,
+                    scope: scope || this
+                };
+            }
+
+            if (Ext.isObject(options)) {
+                return this.save(options);
+            }
+        };
+    },
+
+    /**
+     * @private
+     * Returns a getter function to be placed on the owner model's prototype. We cache the loaded instance
+     * the first time it is loaded so that subsequent calls to the getter always receive the same reference.
+     * @return {Function} The getter function
+     */
+    createGetter: function() {
+        var me              = this,
+            ownerModel      = me.ownerModel,
+            associatedName  = me.associatedName,
+            associatedModel = me.associatedModel,
+            foreignKey      = me.foreignKey,
+            primaryKey      = me.primaryKey,
+            instanceName    = me.instanceName;
+
+        //'this' refers to the Model instance inside this function
+        return function(options, scope) {
+            options = options || {};
+
+            var model = this,
+                foreignKeyId = model.get(foreignKey),
+                success,
+                instance,
+                args;
+
+            if (options.reload === true || model[instanceName] === undefined) {
+                instance = Ext.ModelManager.create({}, associatedName);
+                instance.set(primaryKey, foreignKeyId);
+
+                if (typeof options == 'function') {
+                    options = {
+                        callback: options,
+                        scope: scope || model
+                    };
+                }
+                
+                // Overwrite the success handler so we can assign the current instance
+                success = options.success;
+                options.success = function(rec){
+                    model[instanceName] = rec;
+                    if (success) {
+                        success.apply(this, arguments);
+                    }
+                };
+
+                associatedModel.load(foreignKeyId, options);
+                // assign temporarily while we wait for data to return
+                model[instanceName] = instance;
+                return instance;
+            } else {
+                instance = model[instanceName];
+                args = [instance];
+                scope = scope || options.scope || model;
+
+                //TODO: We're duplicating the callback invokation code that the instance.load() call above
+                //makes here - ought to be able to normalize this - perhaps by caching at the Model.load layer
+                //instead of the association layer.
+                Ext.callback(options, scope, args);
+                Ext.callback(options.success, scope, args);
+                Ext.callback(options.failure, scope, args);
+                Ext.callback(options.callback, scope, args);
+
+                return instance;
+            }
+        };
+    },
+    
+    /**
+     * Read associated data
+     * @private
+     * @param {Ext.data.Model} record The record we're writing to
+     * @param {Ext.data.reader.Reader} reader The reader for the associated model
+     * @param {Object} associationData The raw associated data
+     */
+    read: function(record, reader, associationData){
+        var inverse = this.associatedModel.prototype.associations.findBy(function(assoc){
+            return assoc.type === 'belongsTo' && assoc.associatedName === record.$className;
+        }), newRecord = reader.read([associationData]).records[0];
+        
+        record[this.instanceName] = newRecord;
+    
+        //if the inverse association was found, set it now on each record we've just created
+        if (inverse) {
+            newRecord[inverse.instanceName] = record;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/*
+ * This is a derivative of the similarly named class in the YUI Library.
+ * The original license:
+ * Copyright (c) 2006, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ */
+
+
+/**
+ * A DragDrop implementation that does not move, but can be a drop
+ * target.  You would get the same result by simply omitting implementation
+ * for the event callbacks, but this way we reduce the processing cost of the
+ * event listener and the callbacks.
+ */
+Ext.define('Ext.dd.DDTarget', {
+    extend:  Ext.dd.DragDrop ,
+
+    /**
+     * Creates new DDTarget.
+     * @param {String} id the id of the element that is a drop target
+     * @param {String} sGroup the group of related DragDrop objects
+     * @param {Object} config an object containing configurable attributes.
+     * Valid properties for DDTarget in addition to those in DragDrop: none.
+     */
+    constructor: function(id, sGroup, config) {
+        if (id) {
+            this.initTarget(id, sGroup, config);
+        }
+    },
+
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    getDragEl: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    isValidHandleChild: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    startDrag: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    endDrag: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onDrag: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onDragDrop: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onDragEnter: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onDragOut: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onDragOver: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onInvalidDrop: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onMouseDown: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    onMouseUp: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    setXConstraint: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    setYConstraint: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    resetConstraints: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    clearConstraints: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    clearTicks: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    setInitPosition: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    setDragElId: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    setHandleElId: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    setOuterHandleElId: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    addInvalidHandleClass: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    addInvalidHandleId: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    addInvalidHandleType: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    removeInvalidHandleClass: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    removeInvalidHandleId: Ext.emptyFn,
+    /**
+     * Overridden and disabled. A DDTarget does not support being dragged.
+     * @method
+     */
+    removeInvalidHandleType: Ext.emptyFn,
+
+    toString: function() {
+        return ("DDTarget " + this.id);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A DragTracker listens for drag events on an Element and fires events at the start and end of the drag,
+ * as well as during the drag. This is useful for components such as {@link Ext.slider.Multi}, where there is
+ * an element that can be dragged around to change the Slider's value.
+ *
+ * DragTracker provides a series of template methods that should be overridden to provide functionality
+ * in response to detected drag operations. These are onBeforeStart, onStart, onDrag and onEnd.
+ * See {@link Ext.slider.Multi}'s initEvents function for an example implementation.
+ */
+Ext.define('Ext.dd.DragTracker', {
+
+                              
+
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+
+    /**
+     * @property {Boolean} active
+     * Indicates whether the user is currently dragging this tracker.
+     * @readonly
+     */
+    active: false,
+
+    /**
+     * @property {HTMLElement} dragTarget
+     * The element being dragged.
+     *
+     * Only valid during drag operations.
+     *
+     * If the {@link #delegate} option is used, this will be the delegate element which was mousedowned.
+     * @readonly
+     */
+
+    /**
+     * @cfg {Boolean} trackOver
+     * Set to true to fire mouseover and mouseout events when the mouse enters or leaves the target element.
+     *
+     * This is implicitly set when an {@link #overCls} is specified.
+     *
+     * If the {@link #delegate} option is used, these events fire only when a delegate element is entered of left.
+     */
+    trackOver: false,
+
+    /**
+     * @cfg {String} overCls
+     * A CSS class to add to the DragTracker's target element when the element (or, if the {@link #delegate}
+     * option is used, when a delegate element) is mouseovered.
+     *
+     * If the {@link #delegate} option is used, these events fire only when a delegate element is entered of left.
+     */
+
+    /**
+     * @cfg {Ext.util.Region/Ext.Element} constrainTo
+     * A {@link Ext.util.Region Region} (Or an element from which a Region measurement will be read)
+     * which is used to constrain the result of the {@link #getOffset} call.
+     *
+     * This may be set any time during the DragTracker's lifecycle to set a dynamic constraining region.
+     */
+
+    /**
+     * @cfg {Number} tolerance
+     * Number of pixels the drag target must be moved before dragging is
+     * considered to have started.
+     */
+    tolerance: 5,
+
+    /**
+     * @cfg {Boolean/Number} autoStart
+     * Specify `true` to defer trigger start by 1000 ms.
+     * Specify a Number for the number of milliseconds to defer trigger start.
+     */
+    autoStart: false,
+
+    /**
+     * @cfg {String} delegate
+     * A {@link Ext.DomQuery DomQuery} selector which identifies child elements within the DragTracker's encapsulating
+     * Element which are the tracked elements. This limits tracking to only begin when the matching elements are mousedowned.
+     *
+     * This may also be a specific child element within the DragTracker's encapsulating element to use as the tracked element.
+     */
+
+    /**
+     * @cfg {Boolean} [preventDefault=true]
+     * Specify `false` to enable default actions on onMouseDown events.
+     */
+
+    /**
+     * @cfg {Boolean} [stopEvent=false]
+     * Specify `true` to stop the `mousedown` event from bubbling to outer listeners from the target element (or its delegates).
+     */
+
+    constructor : function(config){
+        var me = this;
+        Ext.apply(me, config);
+        me.addEvents(
+            /**
+             * @event mouseover
+             * Fires when the mouse enters the DragTracker's target element (or if {@link #delegate} is
+             * used, when the mouse enters a delegate element).
+             *
+             * **Only available when {@link #trackOver} is `true`**
+             *
+             * @param {Object} this
+             * @param {Object} e event object
+             * @param {HTMLElement} target The element mouseovered.
+             */
+            'mouseover',
+
+            /**
+             * @event mouseout
+             * Fires when the mouse exits the DragTracker's target element (or if {@link #delegate} is
+             * used, when the mouse exits a delegate element).
+             * 
+             * **Only available when {@link #trackOver} is `true`**
+             *
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'mouseout',
+
+            /**
+             * @event mousedown
+             * Fires when the mouse button is pressed down, but before a drag operation begins. The
+             * drag operation begins after either the mouse has been moved by {@link #tolerance} pixels,
+             * or after the {@link #autoStart} timer fires.
+             *
+             * Return `false` to veto the drag operation.
+             *
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'mousedown',
+
+            /**
+             * @event mouseup
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'mouseup',
+
+            /**
+             * @event mousemove
+             * Fired when the mouse is moved. Returning false cancels the drag operation.
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'mousemove',
+
+            /**
+             * @event beforestart
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'beforedragstart',
+
+            /**
+             * @event dragstart
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'dragstart',
+
+            /**
+             * @event dragend
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'dragend',
+
+            /**
+             * @event drag
+             * @param {Object} this
+             * @param {Object} e event object
+             */
+            'drag'
+        );
+
+        me.dragRegion = new Ext.util.Region(0,0,0,0);
+
+        if (me.el) {
+            me.initEl(me.el);
+        }
+
+        // Dont pass the config so that it is not applied to 'this' again
+        me.mixins.observable.constructor.call(me);
+        if (me.disabled) {
+            me.disable();
+        }
+
+    },
+
+    /**
+     * Initializes the DragTracker on a given element.
+     * @param {Ext.Element/HTMLElement} el The element
+     */
+    initEl: function(el) {
+        var me = this;
+
+        me.el = Ext.get(el);
+
+        // The delegate option may also be an element on which to listen
+        me.handle = Ext.get(me.delegate);
+
+        // If delegate specified an actual element to listen on, we do not use the delegate listener option
+        me.delegate = me.handle ? undefined : me.delegate;
+
+        if (!me.handle) {
+            me.handle = me.el;
+        }
+
+        // Add a mousedown listener which reacts only on the elements targeted by the delegate config.
+        // We process mousedown to begin tracking.
+        me.handleListeners = {
+            scope: me,
+            delegate: me.delegate,
+            mousedown: me.onMouseDown
+        };
+
+        // If configured to do so, track mouse entry and exit into the target (or delegate).
+        // The mouseover and mouseout CANNOT be replaced with mouseenter and mouseleave
+        // because delegate cannot work with those pseudoevents. Entry/exit checking is done in the handler.
+        if (me.trackOver || me.overCls) {
+            Ext.apply(me.handleListeners, {
+                mouseover: me.onMouseOver,
+                mouseout: me.onMouseOut
+            });
+        }
+        me.mon(me.handle, me.handleListeners);
+    },
+
+    disable: function() {
+        this.disabled = true;
+    },
+
+    enable: function() {
+        this.disabled = false;
+    },
+
+    destroy : function() {
+        var me = this;
+
+        if (me.active) {
+            // endDrag has a mandatory event parameter
+            me.endDrag({});
+        }
+        me.clearListeners();
+        me.mun(me.handle, me.handleListeners);
+        me.el = me.handle = null;
+    },
+
+    // When the pointer enters a tracking element, fire a mouseover if the mouse entered from outside.
+    // This is mouseenter functionality, but we cannot use mouseenter because we are using "delegate" to filter mouse targets
+    onMouseOver: function(e, target) {
+        var me = this;
+        if (!me.disabled) {
+            if (Ext.EventManager.contains(e) || me.delegate) {
+                me.mouseIsOut = false;
+                if (me.overCls) {
+                    me.el.addCls(me.overCls);
+                }
+                me.fireEvent('mouseover', me, e, me.delegate ? e.getTarget(me.delegate, target) : me.handle);
+            }
+        }
+    },
+
+    // When the pointer exits a tracking element, fire a mouseout.
+    // This is mouseleave functionality, but we cannot use mouseleave because we are using "delegate" to filter mouse targets
+    onMouseOut: function(e) {
+        var me = this;
+
+        if (me.mouseIsDown) {
+            me.mouseIsOut = true;
+        } else {
+            if (me.overCls) {
+                me.el.removeCls(me.overCls);
+            }
+            me.fireEvent('mouseout', me, e);
+        }
+    },
+
+    onMouseDown: function(e, target){
+        var me = this,
+            el;
+
+        // If this is disabled, or the mousedown has been processed by an upstream DragTracker, return
+        if (me.disabled ||e.dragTracked) {
+            return;
+        }
+
+        // This information should be available in mousedown listener and onBeforeStart implementations
+        me.dragTarget = me.delegate ? target : me.handle.dom;
+        me.startXY = me.lastXY = e.getXY();
+        me.startRegion = Ext.fly(me.dragTarget).getRegion();
+
+        if (me.fireEvent('mousedown', me, e) === false ||
+            me.fireEvent('beforedragstart', me, e) === false ||
+            me.onBeforeStart(e) === false) {
+            return;
+        }
+
+        // Track when the mouse is down so that mouseouts while the mouse is down are not processed.
+        // The onMouseOut method will only ever be called after mouseup.
+        me.mouseIsDown = true;
+
+        // Flag for downstream DragTracker instances that the mouse is being tracked.
+        e.dragTracked = true;
+
+        // See Ext.dd.DragDropManager::handleMouseDown
+        el = me.el.dom;
+        if (Ext.isIE && el.setCapture) {
+            el.setCapture();
+        }
+
+        if (me.preventDefault !== false) {
+            e.preventDefault();
+        }
+        Ext.getDoc().on({
+            scope: me,
+            mouseup: me.onMouseUp,
+            mousemove: me.onMouseMove,
+            selectstart: me.stopSelect
+        });
+        if (me.autoStart) {
+            me.timer =  Ext.defer(me.triggerStart, me.autoStart === true ? 1000 : me.autoStart, me, [e]);
+        }
+    },
+
+    onMouseMove: function(e, target){
+        var me = this,
+            xy = e.getXY(),
+            s = me.startXY;
+
+        e.preventDefault();
+
+        me.lastXY = xy;
+        if (!me.active) {
+            if (Math.max(Math.abs(s[0]-xy[0]), Math.abs(s[1]-xy[1])) > me.tolerance) {
+                me.triggerStart(e);
+            } else {
+                return;
+            }
+        }
+
+        // Returning false from a mousemove listener deactivates
+        if (me.fireEvent('mousemove', me, e) === false) {
+            me.onMouseUp(e);
+        } else {
+            me.onDrag(e);
+            me.fireEvent('drag', me, e);
+        }
+    },
+
+    onMouseUp: function(e) {
+        var me = this;
+        // Clear the flag which ensures onMouseOut fires only after the mouse button
+        // is lifted if the mouseout happens *during* a drag.
+        me.mouseIsDown = false;
+
+        // If we mouseouted the el *during* the drag, the onMouseOut method will not have fired. Ensure that it gets processed.
+        if (me.mouseIsOut) {
+            me.mouseIsOut = false;
+            me.onMouseOut(e);
+        }
+        e.preventDefault();
+
+        // See Ext.dd.DragDropManager::handleMouseDown
+        if (Ext.isIE && document.releaseCapture) {
+            document.releaseCapture();
+        }
+
+        me.fireEvent('mouseup', me, e);
+        me.endDrag(e);
+    },
+
+    /**
+     * @private
+     * Stop the drag operation, and remove active mouse listeners.
+     */
+    endDrag: function(e) {
+        var me = this,
+            wasActive = me.active;
+
+        Ext.getDoc().un({
+            mousemove: me.onMouseMove,
+            mouseup: me.onMouseUp,
+            selectstart: me.stopSelect,
+            scope: me
+        });
+        me.clearStart();
+        me.active = false;
+        if (wasActive) {
+            me.onEnd(e);
+            me.fireEvent('dragend', me, e);
+        }
+        // Private property calculated when first required and only cached during a drag
+        // Remove flag from event singleton.  Using "Ext.EventObject" here since "endDrag" is called directly in some cases without an "e" param
+        me._constrainRegion = Ext.EventObject.dragTracked = null
+    },
+
+    triggerStart: function(e) {
+        var me = this;
+        me.clearStart();
+        me.active = true;
+        me.onStart(e);
+        me.fireEvent('dragstart', me, e);
+    },
+
+    clearStart : function() {
+        var timer = this.timer;
+        if (timer) {
+            clearTimeout(timer);
+            this.timer = null;
+        }
+    },
+
+    stopSelect : function(e) {
+        e.stopEvent();
+        return false;
+    },
+
+    /**
+     * Template method which should be overridden by each DragTracker instance. Called when the user first clicks and
+     * holds the mouse button down. Return false to disallow the drag
+     * @param {Ext.EventObject} e The event object
+     * @template
+     */
+    onBeforeStart : function(e) {
+
+    },
+
+    /**
+     * Template method which should be overridden by each DragTracker instance. Called when a drag operation starts
+     * (e.g. the user has moved the tracked element beyond the specified tolerance)
+     * @param {Ext.EventObject} e The event object
+     * @template
+     */
+    onStart : function(xy) {
+
+    },
+
+    /**
+     * Template method which should be overridden by each DragTracker instance. Called whenever a drag has been detected.
+     * @param {Ext.EventObject} e The event object
+     * @template
+     */
+    onDrag : function(e) {
+
+    },
+
+    /**
+     * Template method which should be overridden by each DragTracker instance. Called when a drag operation has been completed
+     * (e.g. the user clicked and held the mouse down, dragged the element and then released the mouse button)
+     * @param {Ext.EventObject} e The event object
+     * @template
+     */
+    onEnd : function(e) {
+
+    },
+
+    /**
+     * Returns the drag target. This is usually the DragTracker's encapsulating element.
+     *
+     * If the {@link #delegate} option is being used, this may be a child element which matches the
+     * {@link #delegate} selector.
+     *
+     * @return {Ext.Element} The element currently being tracked.
+     */
+    getDragTarget : function(){
+        return this.dragTarget;
+    },
+
+    /**
+     * @private
+     * @returns {Ext.Element} The DragTracker's encapsulating element.
+     */
+    getDragCt : function(){
+        return this.el;
+    },
+
+    /**
+     * @private
+     * Return the Region into which the drag operation is constrained.
+     * Either the XY pointer itself can be constrained, or the dragTarget element
+     * The private property _constrainRegion is cached until onMouseUp
+     */
+    getConstrainRegion: function() {
+        var me = this;
+
+        if (me.constrainTo) {
+            if (me.constrainTo instanceof Ext.util.Region) {
+                return me.constrainTo;
+            }
+            if (!me._constrainRegion) {
+                me._constrainRegion = Ext.fly(me.constrainTo).getViewRegion();
+            }
+        } else {
+            if (!me._constrainRegion) {
+                me._constrainRegion = me.getDragCt().getViewRegion();
+            }
+        }
+        return me._constrainRegion;
+    },
+
+    getXY : function(constrain){
+        return constrain ? this.constrainModes[constrain](this, this.lastXY) : this.lastXY;
+    },
+
+    /**
+     * Returns the X, Y offset of the current mouse position from the mousedown point.
+     *
+     * This method may optionally constrain the real offset values, and returns a point coerced in one
+     * of two modes:
+     *
+     *  - `point`
+     *    The current mouse position is coerced into the constrainRegion and the resulting position is returned.
+     *  - `dragTarget`
+     *    The new {@link Ext.util.Region Region} of the {@link #getDragTarget dragTarget} is calculated
+     *    based upon the current mouse position, and then coerced into the constrainRegion. The returned
+     *    mouse position is then adjusted by the same delta as was used to coerce the region.\
+     *
+     * @param {String} constrainMode (Optional) If omitted the true mouse position is returned. May be passed
+     * as `point` or `dragTarget`. See above.
+     * @returns {Number[]} The `X, Y` offset from the mousedown point, optionally constrained.
+     */
+    getOffset : function(constrain){
+        var xy = this.getXY(constrain),
+            s = this.startXY;
+
+        return [xy[0]-s[0], xy[1]-s[1]];
+    },
+
+    constrainModes: {
+        // Constrain the passed point to within the constrain region
+        point: function(me, xy) {
+            var dr = me.dragRegion,
+                constrainTo = me.getConstrainRegion();
+
+            // No constraint
+            if (!constrainTo) {
+                return xy;
+            }
+
+            dr.x = dr.left = dr[0] = dr.right = xy[0];
+            dr.y = dr.top = dr[1] = dr.bottom = xy[1];
+            dr.constrainTo(constrainTo);
+
+            return [dr.left, dr.top];
+        },
+
+        // Constrain the dragTarget to within the constrain region. Return the passed xy adjusted by the same delta.
+        dragTarget: function(me, xy) {
+            var s = me.startXY,
+                dr = me.startRegion.copy(),
+                constrainTo = me.getConstrainRegion(),
+                adjust;
+
+            // No constraint
+            if (!constrainTo) {
+                return xy;
+            }
+
+            // See where the passed XY would put the dragTarget if translated by the unconstrained offset.
+            // If it overflows, we constrain the passed XY to bring the potential
+            // region back within the boundary.
+            dr.translateBy(xy[0]-s[0], xy[1]-s[1]);
+
+            // Constrain the X coordinate by however much the dragTarget overflows
+            if (dr.right > constrainTo.right) {
+                xy[0] += adjust = (constrainTo.right - dr.right);    // overflowed the right
+                dr.left += adjust;
+            }
+            if (dr.left < constrainTo.left) {
+                xy[0] += (constrainTo.left - dr.left);      // overflowed the left
+            }
+
+            // Constrain the Y coordinate by however much the dragTarget overflows
+            if (dr.bottom > constrainTo.bottom) {
+                xy[1] += adjust = (constrainTo.bottom - dr.bottom);  // overflowed the bottom
+                dr.top += adjust;
+            }
+            if (dr.top < constrainTo.top) {
+                xy[1] += (constrainTo.top - dr.top);        // overflowed the top
+            }
+            return xy;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * An internal Queue class.
+ * @private
+ */
+Ext.define('Ext.util.Queue', {
+
+    constructor: function() {
+        this.clear();
+    },
+
+    add : function(obj) {
+        var me = this,
+            key = me.getKey(obj);
+
+        if (!me.map[key]) {
+            ++me.length;
+            me.items.push(obj);
+            me.map[key] = obj;
+        }
+
+        return obj;
+    },
+
+    /**
+     * Removes all items from the collection.
+     */
+    clear : function(){
+        var me = this,
+            items = me.items;
+
+        me.items = [];
+        me.map = {};
+        me.length = 0;
+
+        return items;
+    },
+
+    contains: function (obj) {
+        var key = this.getKey(obj);
+
+        return this.map.hasOwnProperty(key);
+    },
+
+    /**
+     * Returns the number of items in the collection.
+     * @return {Number} the number of items in the collection.
+     */
+    getCount : function(){
+        return this.length;
+    },
+
+    getKey : function(obj){
+         return obj.id;
+    },
+
+    /**
+     * Remove an item from the collection.
+     * @param {Object} obj The item to remove.
+     * @return {Object} The item removed or false if no item was removed.
+     */
+    remove : function(obj){
+        var me = this,
+            key = me.getKey(obj),
+            items = me.items,
+            index;
+
+        if (me.map[key]) {
+            index = Ext.Array.indexOf(items, obj);
+            Ext.Array.erase(items, index, 1);
+            delete me.map[key];
+            --me.length;
+        }
+
+        return obj;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class provides a DOM ClassList API to buffer access to an element's class.
+ * Instances of this class are created by {@link Ext.layout.ContextItem#getClassList}.
+ */
+Ext.define('Ext.layout.ClassList', (function () {
+
+    var splitWords = Ext.String.splitWords,
+        toMap = Ext.Array.toMap;
+
+    return {
+        dirty: false,
+
+        constructor: function (owner) {
+            this.owner = owner;
+            this.map = toMap(this.classes = splitWords(owner.el.className));
+        },
+
+        /**
+         * Adds a single class to the class list.
+         */
+        add: function (cls) {
+            var me = this;
+
+            if (!me.map[cls]) {
+                me.map[cls] = true;
+                me.classes.push(cls);
+                if (!me.dirty) {
+                    me.dirty = true;
+                    me.owner.markDirty();
+                }
+            }
+        },
+
+        /**
+         * Adds one or more classes in an array or space-delimited string to the class list.
+         */
+        addMany: function (classes) {
+            Ext.each(splitWords(classes), this.add, this);
+        },
+
+        contains: function (cls) {
+            return this.map[cls];
+        },
+
+        flush: function () {
+            this.owner.el.className = this.classes.join(' ');
+            this.dirty = false;
+        },
+
+        /**
+         * Removes a single class from the class list.
+         */
+        remove: function (cls) {
+            var me = this;
+
+            if (me.map[cls]) {
+                delete me.map[cls];
+                me.classes = Ext.Array.filter(me.classes, function (c) {
+                    return c != cls;
+                });
+                if (!me.dirty) {
+                    me.dirty = true;
+                    me.owner.markDirty();
+                }
+            }
+        },
+
+        /**
+         * Removes one or more classes in an array or space-delimited string from the class
+         * list.
+         */
+        removeMany: function (classes) {
+            var me = this,
+                remove = toMap(splitWords(classes));
+
+            me.classes = Ext.Array.filter(me.classes, function (c) {
+                if (!remove[c]) {
+                    return true;
+                }
+
+                delete me.map[c];
+                if (!me.dirty) {
+                    me.dirty = true;
+                    me.owner.markDirty();
+                }
+                return false;
+            });
+        }
+    };
+}()));
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class manages state information for a component or element during a layout.
+ * 
+ * # Blocks
+ *
+ * A "block" is a required value that is preventing further calculation. When a layout has
+ * encountered a situation where it cannot possibly calculate results, it can associate
+ * itself with the context item and missing property so that it will not be rescheduled
+ * until that property is set.
+ * 
+ * Blocks are a one-shot registration. Once the property changes, the block is removed.
+ * 
+ * Be careful with blocks. If *any* further calculations can be made, a block is not the
+ * right choice.
+ * 
+ * # Triggers
+ *
+ * Whenever any call to {@link #getProp}, {@link #getDomProp}, {@link #hasProp} or
+ * {@link #hasDomProp} is made, the current layout is automatically registered as being
+ * dependent on that property in the appropriate state. Any changes to the property will
+ * trigger the layout and it will be queued in the {@link Ext.layout.Context}.
+ *
+ * Triggers, once added, remain for the entire layout. Any changes to the property will
+ * reschedule all unfinished layouts in their trigger set.
+ *
+ * @private
+ */
+Ext.define('Ext.layout.ContextItem', {
+
+                                       
+
+    heightModel: null,
+    widthModel: null,
+    sizeModel: null,
+
+    /**
+     * There are several cases that allow us to skip (opt out) of laying out a component
+     * and its children as long as its `lastBox` is not marked as `invalid`. If anything
+     * happens to change things, the `lastBox` is marked as `invalid` by `updateLayout`
+     * as it ascends the component hierarchy.
+     * 
+     * @property {Boolean} optOut
+     * @private
+     * @readonly
+     */
+    optOut: false,
+
+    ownerSizePolicy: null, // plaed here by AbstractComponent.getSizeModel
+
+    boxChildren: null,
+
+    boxParent: null,
+    isBorderBoxValue: null,
+
+    children: [],
+
+    dirty: null,
+
+    // The number of dirty properties
+    dirtyCount: 0,
+
+    hasRawContent: true,
+
+    isContextItem: true,
+
+    isTopLevel: false,
+
+    consumersContentHeight: 0,
+    consumersContentWidth: 0,
+    consumersContainerHeight: 0,
+    consumersContainerWidth: 0,
+    consumersHeight: 0,
+    consumersWidth: 0,
+
+    ownerCtContext: null,
+
+    remainingChildDimensions: 0,
+
+    // the current set of property values:
+    props: null,
+
+    /**
+     * @property {Object} state
+     * State variables that are cleared when invalidated. Only applies to component items.
+     */
+    state: null,
+
+    /**
+     * @property {Boolean} wrapsComponent
+     * True if this item wraps a Component (rather than an Element).
+     * @readonly
+     */
+    wrapsComponent: false,
+
+    constructor: function (config) {
+        var me = this,
+            sizeModels = Ext.layout.SizeModel.sizeModels,
+            configured = sizeModels.configured,
+            shrinkWrap = sizeModels.shrinkWrap,
+            el, lastBox, ownerCt, ownerCtContext, props, sizeModel, target,
+            lastWidth, lastHeight, sameWidth, sameHeight, widthModel, heightModel, optOut;
+
+        Ext.apply(me, config);
+
+        el = me.el;
+        me.id = el.id;
+
+        // These hold collections of layouts that are either blocked or triggered by sets
+        // to our properties (either ASAP or after flushing to the DOM). All of them have
+        // the same structure:
+        //
+        //      me.blocks = {
+        //          width: {
+        //              'layout-1001': layout1001
+        //          }
+        //      }
+        //
+        // The property name is the primary key which yields an object keyed by layout id
+        // with the layout instance as the value. This prevents duplicate entries for one
+        // layout and gives O(1) access to the layout instance when we need to iterate and
+        // process them.
+        // 
+        // me.blocks = {};
+        // me.domBlocks = {};
+        // me.domTriggers = {};
+        // me.triggers = {};
+
+        me.flushedProps = {};
+        me.props = props = {};
+
+        // the set of cached styles for the element:
+        me.styles = {};
+
+        target = me.target;
+
+        if (!target.isComponent) {
+            lastBox = el.lastBox;
+        } else {
+            me.wrapsComponent = true;
+            me.framing = target.frameSize || null;
+            me.isComponentChild = target.ownerLayout && target.ownerLayout.isComponentLayout;
+
+            lastBox = target.lastBox;
+
+            // These items are created top-down, so the ContextItem of our ownerCt should
+            // be available (if it is part of this layout run).
+            ownerCt = target.ownerCt;
+            if (ownerCt && (ownerCtContext = ownerCt.el && me.context.items[ownerCt.el.id])) {
+                me.ownerCtContext = ownerCtContext;
+            }
+
+            // If our ownerCtContext is in the run, it will have a SizeModel that we use to
+            // optimize the determination of our sizeModel.
+            me.sizeModel = sizeModel = target.getSizeModel(ownerCtContext &&
+                ownerCtContext.widthModel.pairsByHeightOrdinal[ownerCtContext.heightModel.ordinal]);
+
+            // NOTE: The initial determination of sizeModel is valid (thankfully) and is
+            // needed to cope with adding components to a layout run on-the-fly (e.g., in
+            // the menu overflow handler of a box layout). Since this is the case, we do
+            // not need to recompute the sizeModel in init unless it is a "full" init (as
+            // our ownerCt's sizeModel could have changed in that case).
+
+            me.widthModel = widthModel = sizeModel.width;
+            me.heightModel = heightModel = sizeModel.height;
+
+            // The lastBox is populated early but does not get an "invalid" property
+            // until layout has occurred. The "false" value is placed in the lastBox
+            // by Component.finishedLayout.
+            if (lastBox && lastBox.invalid === false) {
+                sameWidth = (target.width === (lastWidth = lastBox.width));
+                sameHeight = (target.height === (lastHeight = lastBox.height));
+
+                if (widthModel === shrinkWrap && heightModel === shrinkWrap) {
+                    optOut = true;
+                } else if (widthModel === configured && sameWidth) {
+                    optOut = heightModel === shrinkWrap ||
+                            (heightModel === configured && sameHeight);
+                }
+
+                if (optOut) {
+                    // Flag this component and capture its last size...
+                    me.optOut = true;
+                    props.width = lastWidth;
+                    props.height = lastHeight;
+                }
+            }
+        }
+
+        me.lastBox = lastBox;
+    },
+
+    /**
+     * Clears all properties on this object except (perhaps) those not calculated by this
+     * component. This is more complex than it would seem because a layout can decide to
+     * invalidate its results and run the component's layouts again, but since some of the
+     * values may be calculated by the container, care must be taken to preserve those
+     * values.
+     *
+     * @param {Boolean} full True if all properties are to be invalidated, false to keep
+     * those calculated by the ownerCt.
+     * @return {Mixed} A value to pass as the first argument to {@link #initContinue}.
+     * @private
+     */
+    init: function (full, options) {
+        var me = this,
+            oldProps = me.props,
+            oldDirty = me.dirty,
+            ownerCtContext = me.ownerCtContext,
+            ownerLayout = me.target.ownerLayout,
+            firstTime = !me.state,
+            ret = full || firstTime,
+            children, i, n, ownerCt, sizeModel, target,
+            oldHeightModel = me.heightModel,
+            oldWidthModel = me.widthModel,
+            newHeightModel, newWidthModel,
+            remainingCount = 0;
+
+        me.dirty = me.invalid = false;
+        me.props = {};
+
+        // Reset the number of child dimensions since the children will add their part:
+        me.remainingChildDimensions = 0;
+
+        if (me.boxChildren) {
+            me.boxChildren.length = 0; // keep array (more GC friendly)
+        }
+
+        if (!firstTime) {
+            me.clearAllBlocks('blocks');
+            me.clearAllBlocks('domBlocks');
+        }
+
+        // For Element wrappers, we are done...
+        if (!me.wrapsComponent) {
+            return ret;
+        }
+
+        // From here on, we are only concerned with Component wrappers...
+        target = me.target;
+        me.state = {}; // only Component wrappers need a "state"
+
+        if (firstTime) {
+            // This must occur before we proceed since it can do many things (like add
+            // child items perhaps):
+            if (target.beforeLayout && target.beforeLayout !== Ext.emptyFn) {
+                target.beforeLayout();
+            }
+
+            // Determine the ownerCtContext if we aren't given one. Normally the firstTime
+            // we meet a component is before the context is run, but it is possible for
+            // components to be added to a run that is already in progress. If so, we have
+            // to lookup the ownerCtContext since the odds are very high that the new
+            // component is a child of something already in the run. It is currently
+            // unsupported to drag in the owner of a running component (needs testing).
+            if (!ownerCtContext && (ownerCt = target.ownerCt)) {
+                ownerCtContext = me.context.items[ownerCt.el.id];
+            }
+
+            if (ownerCtContext) {
+                me.ownerCtContext = ownerCtContext;
+                me.isBoxParent = target.ownerLayout.isItemBoxParent(me);
+            } else {
+                me.isTopLevel = true; // this is used by initAnimation...
+            }
+
+            me.frameBodyContext = me.getEl('frameBody');
+        } else {
+            ownerCtContext = me.ownerCtContext;
+
+            // In theory (though untested), this flag can change on-the-fly...
+            me.isTopLevel = !ownerCtContext;
+
+            // Init the children element items since they may have dirty state (no need to
+            // do this the firstTime).
+            children = me.children;
+            for (i = 0, n = children.length; i < n; ++i) {
+                children[i].init(true);
+            }
+        }
+
+        // We need to know how we will determine content size: containers can look at the
+        // results of their items but non-containers or item-less containers with just raw
+        // markup need to be measured in the DOM:
+        me.hasRawContent = !(target.isContainer && target.items.items.length > 0);
+
+        if (full) {
+            // We must null these out or getSizeModel will assume they are the correct,
+            // dynamic size model and return them (the previous dynamic sizeModel).
+            me.widthModel = me.heightModel = null;
+            sizeModel = target.getSizeModel(ownerCtContext && 
+                ownerCtContext.widthModel.pairsByHeightOrdinal[ownerCtContext.heightModel.ordinal]);
+
+            if (firstTime) {
+                me.sizeModel = sizeModel;
+            }
+
+            me.widthModel = sizeModel.width;
+            me.heightModel = sizeModel.height;
+
+            // if we are a container child (e.g., not a docked item), and this is a full
+            // init, that means our parent was invalidated, and therefore both our width
+            // and our height are included in remainingChildDimensions
+            if (ownerCtContext && !me.isComponentChild) {
+                ownerCtContext.remainingChildDimensions += 2;
+            }
+        } else if (oldProps) {
+            // these are almost always calculated by the ownerCt (we might need to track
+            // this at some point more carefully):
+            me.recoverProp('x', oldProps, oldDirty);
+            me.recoverProp('y', oldProps, oldDirty);
+            
+            // if these are calculated by the ownerCt, don't trash them:
+            if (me.widthModel.calculated) {
+                me.recoverProp('width', oldProps, oldDirty);
+            } else if ('width' in oldProps) {
+                ++remainingCount;
+            }
+            if (me.heightModel.calculated) {
+                me.recoverProp('height', oldProps, oldDirty);
+            } else if ('height' in oldProps) {
+                ++remainingCount;
+            }
+            
+            // if we are a container child and this is not a full init, that means our
+            // parent was not invalidated and therefore only the dimensions that were
+            // set last time and removed from remainingChildDimensions last time, need to
+            // be added back to remainingChildDimensions. This only needs to happen for
+            // properties that we don't recover above (model=calculated)
+            if (ownerCtContext && !me.isComponentChild) {
+                ownerCtContext.remainingChildDimensions += remainingCount;
+            }
+        }
+
+        if (oldProps && ownerLayout && ownerLayout.manageMargins) {
+            me.recoverProp('margin-top', oldProps, oldDirty);
+            me.recoverProp('margin-right', oldProps, oldDirty);
+            me.recoverProp('margin-bottom', oldProps, oldDirty);
+            me.recoverProp('margin-left', oldProps, oldDirty);
+        }
+
+        // Process any invalidate options present. These can only come from explicit calls
+        // to the invalidate() method.
+        if (options) {
+            // Consider a container box with wrapping text. If the box is made wider, the
+            // text will take up less height (until there is no more wrapping). Conversely,
+            // if the box is made narrower, the height starts to increase due to wrapping.
+            //
+            // Imposing a minWidth constraint would increase the width. This may decrease
+            // the height. If the box is shrinkWrap, however, the width will already be
+            // such that there is no wrapping, so the height will not further decrease.
+            // Since the height will also not increase if we widen the box, there is no
+            // problem simultaneously imposing a minHeight or maxHeight constraint.
+            //
+            // When we impose as maxWidth constraint, however, we are shrinking the box
+            // which may increase the height. If we are imposing a maxHeight constraint,
+            // that is fine because a further increased height will still need to be
+            // constrained. But if we are imposing a minHeight constraint, we cannot know
+            // whether the increase in height due to wrapping will be greater than the
+            // minHeight. If we impose a minHeight constraint at the same time, then, we
+            // could easily be locking in the wrong height.
+            //
+            // It is important to note that this logic applies to simultaneously *adding*
+            // both a maxWidth and a minHeight constraint. It is perfectly fine to have
+            // a state with both constraints, but we cannot add them both at once.
+            newHeightModel = options.heightModel;
+            newWidthModel = options.widthModel;
+            if (newWidthModel && newHeightModel && oldWidthModel && oldHeightModel) {
+                if (oldWidthModel.shrinkWrap && oldHeightModel.shrinkWrap) {
+                    if (newWidthModel.constrainedMax && newHeightModel.constrainedMin) {
+                        newHeightModel = null;
+                    }
+                }
+            }
+
+            // Apply size model updates (if any) and state updates (if any).
+            if (newWidthModel) {
+                me.widthModel = newWidthModel;
+            }
+            if (newHeightModel) {
+                me.heightModel = newHeightModel;
+            }
+
+            if (options.state) {
+                Ext.apply(me.state, options.state);
+            }
+        }
+
+        return ret;
+    },
+
+    /**
+     * @private
+     */
+    initContinue: function (full) {
+        var me = this,
+            ownerCtContext = me.ownerCtContext,
+            comp = me.target,
+            widthModel = me.widthModel,
+            hierarchyState = comp.getHierarchyState(),
+            boxParent;
+
+        if (widthModel.fixed) { // calculated or configured
+            hierarchyState.inShrinkWrapTable = false;
+        } else {
+            delete hierarchyState.inShrinkWrapTable;
+        }
+
+        if (full) {
+            if (ownerCtContext && widthModel.shrinkWrap) {
+                boxParent = ownerCtContext.isBoxParent ? ownerCtContext : ownerCtContext.boxParent;
+                if (boxParent) {
+                    boxParent.addBoxChild(me);
+                }
+            } else if (widthModel.natural) {
+                me.boxParent = ownerCtContext;
+            }
+        }
+
+        return full;
+    },
+
+    /**
+     * @private
+     */
+    initDone: function(containerLayoutDone) {
+        var me = this,
+            props = me.props,
+            state = me.state;
+
+        // These properties are only set when they are true:
+        if (me.remainingChildDimensions === 0) {
+            props.containerChildrenSizeDone = true;
+        }
+        if (containerLayoutDone) {
+            props.containerLayoutDone = true;
+        }
+
+        if (me.boxChildren && me.boxChildren.length && me.widthModel.shrinkWrap) {
+            // set a very large width to allow the children to measure their natural
+            // widths (this is cleared once all children have been measured):
+            me.el.setWidth(10000);
+
+            // don't run layouts for this component until we clear this width...
+            state.blocks = (state.blocks || 0) + 1;
+        }
+    },
+
+    /**
+     * @private
+     */
+    initAnimation: function() {
+        var me = this,
+            target = me.target,
+            ownerCtContext = me.ownerCtContext;
+
+        if (ownerCtContext && ownerCtContext.isTopLevel) {
+            // See which properties we are supposed to animate to their new state.
+            // If there are any, queue ourself to be animated by the owning Context
+            me.animatePolicy = target.ownerLayout.getAnimatePolicy(me);
+        } else if (!ownerCtContext && target.isCollapsingOrExpanding && target.animCollapse) {
+            // Collapsing/expnding a top level Panel with animation. We need to fabricate
+            // an animatePolicy depending on which dimension the collapse is using,
+            // isCollapsingOrExpanding is set during the collapse/expand process.
+            me.animatePolicy = target.componentLayout.getAnimatePolicy(me);
+        }
+
+        if (me.animatePolicy) {
+            me.context.queueAnimation(me);
+        }
+    },
+
+    /**
+     * Queue the addition of a class name (or array of class names) to this ContextItem's target when next flushed.
+     */
+    addCls: function(newCls) {
+        this.getClassList().addMany(newCls);
+    },
+
+    /**
+     * Queue the removal of a class name (or array of class names) from this ContextItem's target when next flushed.
+     */
+    removeCls: function(removeCls) {
+        this.getClassList().removeMany(removeCls);
+    },
+
+    /**
+     * Adds a block.
+     * 
+     * @param {String} name The name of the block list ('blocks' or 'domBlocks').
+     * @param {Ext.layout.Layout} layout The layout that is blocked.
+     * @param {String} propName The property name that blocked the layout (e.g., 'width').
+     * @private
+     */
+    addBlock: function (name, layout, propName) {
+        var me = this,
+            collection = me[name] || (me[name] = {}),
+            blockedLayouts = collection[propName] || (collection[propName] = {});
+
+        if (!blockedLayouts[layout.id]) {
+            blockedLayouts[layout.id] = layout;
+            ++layout.blockCount;
+            ++me.context.blockCount;
+        }
+    },
+
+    addBoxChild: function (boxChildItem) {
+        var me = this,
+            children,
+            widthModel = boxChildItem.widthModel;
+
+        boxChildItem.boxParent = this;
+
+        // Children that are widthModel.auto (regardless of heightModel) that measure the
+        // DOM (by virtue of hasRawContent), need to wait for their "box parent" to be sized.
+        // If they measure too early, they will be wrong results. In the widthModel.shrinkWrap
+        // case, the boxParent "crushes" the child. In the case of widthModel.natural, the
+        // boxParent's width is likely a key part of the child's width (e.g., "50%" or just
+        // normal block-level behavior of 100% width)
+        boxChildItem.measuresBox = widthModel.shrinkWrap ? boxChildItem.hasRawContent : widthModel.natural;
+
+        if (boxChildItem.measuresBox) {
+            children = me.boxChildren;
+
+            if (children) {
+                children.push(boxChildItem);
+            } else {
+                me.boxChildren = [ boxChildItem ];
+            }
+        }
+    },
+
+    /**
+     * Adds x and y values from a props object to a styles object as "left" and "top" values.
+     * Overridden to add the x property as "right" in rtl mode.
+     * @property {Object} styles A styles object for an Element
+     * @property {Object} props A ContextItem props object
+     * @return {Number} count The number of styles that were set.
+     * @private
+     */
+    addPositionStyles: function(styles, props) {
+        var x = props.x,
+            y = props.y,
+            count = 0;
+
+        if (x !== undefined) {
+            styles.left = x + 'px';
+            ++count;
+        }
+        if (y !== undefined) {
+            styles.top = y + 'px';
+            ++count;
+        }
+        return count;
+    },
+
+    /**
+     * Adds a trigger.
+     * 
+     * @param {String} propName The property name that triggers the layout (e.g., 'width').
+     * @param {Boolean} inDom True if the trigger list is `domTriggers`, false if `triggers`.
+     * @private
+     */
+    addTrigger: function (propName, inDom) {
+        var me = this,
+            name = inDom ? 'domTriggers' : 'triggers',
+            collection = me[name] || (me[name] = {}),
+            context = me.context,
+            layout = context.currentLayout,
+            triggers = collection[propName] || (collection[propName] = {});
+
+        if (!triggers[layout.id]) {
+            triggers[layout.id] = layout;
+            ++layout.triggerCount;
+
+            triggers = context.triggers[inDom ? 'dom' : 'data'];
+            (triggers[layout.id] || (triggers[layout.id] = [])).push({
+                item: this,
+                prop: propName
+            });
+
+            if (me.props[propName] !== undefined) {
+                if (!inDom || !(me.dirty && (propName in me.dirty))) {
+                    ++layout.firedTriggers;
+                }
+            }
+        }
+    },
+
+    boxChildMeasured: function () {
+        var me = this,
+            state = me.state,
+            count = (state.boxesMeasured = (state.boxesMeasured || 0) + 1);
+
+        if (count == me.boxChildren.length) {
+            // all of our children have measured themselves, so we can clear the width
+            // and resume layouts for this component...
+            state.clearBoxWidth = 1;
+            ++me.context.progressCount;
+            me.markDirty();
+        }
+    },
+
+    borderNames: [ 'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'],
+    marginNames: [ 'margin-top', 'margin-right', 'margin-bottom', 'margin-left' ],
+    paddingNames: [ 'padding-top', 'padding-right', 'padding-bottom', 'padding-left' ],
+    trblNames: [ 'top', 'right', 'bottom', 'left' ],
+
+    cacheMissHandlers: {
+        borderInfo: function (me) {
+            var info = me.getStyles(me.borderNames, me.trblNames);
+
+            info.width = info.left + info.right;
+            info.height = info.top + info.bottom;
+
+            return info;
+        },
+
+        marginInfo: function (me) {
+            var info = me.getStyles(me.marginNames, me.trblNames);
+
+            info.width = info.left + info.right;
+            info.height = info.top + info.bottom;
+
+            return info;
+        },
+
+        paddingInfo: function (me) {
+            // if this context item's target is a framed component the padding is on the frameBody, not on the main el
+            var item = me.frameBodyContext || me,
+                info = item.getStyles(me.paddingNames, me.trblNames);
+
+            info.width = info.left + info.right;
+            info.height = info.top + info.bottom;
+
+            return info;
+        }
+    },
+
+    checkCache: function (entry) {
+        return this.cacheMissHandlers[entry](this);
+    },
+
+    clearAllBlocks: function (name) {
+        var collection = this[name],
+            propName;
+
+        if (collection) {
+            for (propName in collection) {
+                this.clearBlocks(name, propName);
+            }
+        }
+    },
+
+    /**
+     * Removes any blocks on a property in the specified set. Any layouts that were blocked
+     * by this property and are not still blocked (by other properties) will be rescheduled.
+     * 
+     * @param {String} name The name of the block list ('blocks' or 'domBlocks').
+     * @param {String} propName The property name that blocked the layout (e.g., 'width').
+     * @private
+     */
+    clearBlocks: function (name, propName) {
+        var collection = this[name],
+            blockedLayouts = collection && collection[propName],
+            context, layout, layoutId;
+
+        if (blockedLayouts) {
+            delete collection[propName];
+
+            context = this.context;
+
+            for (layoutId in blockedLayouts) {
+                layout = blockedLayouts[layoutId];
+
+                --context.blockCount;
+                if (! --layout.blockCount && !layout.pending && !layout.done) {
+                    context.queueLayout(layout);
+                }
+            }
+        }
+    },
+
+    /**
+     * Registers a layout in the block list for the given property. Once the property is
+     * set in the {@link Ext.layout.Context}, the layout is unblocked.
+     * 
+     * @param {Ext.layout.Layout} layout
+     * @param {String} propName The property name that blocked the layout (e.g., 'width').
+     */
+    block: function (layout, propName) {
+        this.addBlock('blocks', layout, propName);
+    },
+
+    /**
+     * Registers a layout in the DOM block list for the given property. Once the property
+     * flushed to the DOM by the {@link Ext.layout.Context}, the layout is unblocked.
+     * 
+     * @param {Ext.layout.Layout} layout
+     * @param {String} propName The property name that blocked the layout (e.g., 'width').
+     */
+    domBlock: function (layout, propName) {
+        this.addBlock('domBlocks', layout, propName);
+    },
+
+    /**
+     * Reschedules any layouts associated with a given trigger.
+     * 
+     * @param {String} name The name of the trigger list ('triggers' or 'domTriggers').
+     * @param {String} propName The property name that triggers the layout (e.g., 'width').
+     * @private
+     */
+    fireTriggers: function (name, propName) {
+        var collection = this[name],
+            triggers = collection && collection[propName],
+            context = this.context,
+            layout, layoutId;
+
+        if (triggers) {
+            for (layoutId in triggers) {
+                layout = triggers[layoutId];
+                ++layout.firedTriggers;
+                if (!layout.done && !layout.blockCount && !layout.pending) {
+                    context.queueLayout(layout);
+                }
+            }
+        }
+    },
+
+    /**
+     * Flushes any updates in the dirty collection to the DOM. This is only called if there
+     * are dirty entries because this object is only added to the flushQueue of the
+     * {@link Ext.layout.Context} when entries become dirty.
+     */
+    flush: function () {
+        var me = this,
+            dirty = me.dirty,
+            state = me.state,
+            targetEl = me.el;
+
+        me.dirtyCount = 0;
+
+        // Flush added/removed classes
+        if (me.classList && me.classList.dirty) {
+            me.classList.flush();
+        }
+
+        // Set any queued DOM attributes
+        if ('attributes' in me) {
+            targetEl.set(me.attributes);
+            delete me.attributes;
+        }
+
+        // Set any queued DOM HTML content
+        if ('innerHTML' in me) {
+            targetEl.innerHTML = me.innerHTML;
+            delete me.innerHTML;
+        }
+
+        if (state && state.clearBoxWidth) {
+            state.clearBoxWidth = 0;
+            me.el.setStyle('width', null);
+
+            if (! --state.blocks) {
+                me.context.queueItemLayouts(me);
+            }
+        }
+
+        if (dirty) {
+            delete me.dirty;
+            me.writeProps(dirty, true);
+        }
+    },
+
+    /**
+     * @private
+     */
+    flushAnimations: function() {
+        var me = this,
+            animateFrom = me.previousSize,
+            target, targetAnim, duration, animateProps, anim,
+            changeCount, j, propsLen, propName, oldValue, newValue;
+
+        // Only animate if the Component has been previously layed out: first layout should not animate
+        if (animateFrom) {
+            target = me.target;
+            targetAnim = target.layout && target.layout.animate;
+            if (targetAnim) {
+                duration = Ext.isNumber(targetAnim) ? targetAnim : targetAnim.duration;
+            }
+            animateProps = Ext.Object.getKeys(me.animatePolicy);
+
+            // Create an animation block using the targetAnim configuration to provide defaults.
+            // They may want custom duration, or easing, or listeners.
+            anim = Ext.apply({}, {
+                from: {},
+                to: {},
+                duration: duration || Ext.fx.Anim.prototype.duration
+            }, targetAnim);
+
+            for (changeCount = 0, j = 0, propsLen = animateProps.length; j < propsLen; j++) {
+                propName = animateProps[j];
+                oldValue = animateFrom[propName];
+                newValue = me.peek(propName);
+                if (oldValue != newValue) {
+                    propName = me.translateProps[propName]||propName;
+                    anim.from[propName] = oldValue;
+                    anim.to[propName] = newValue;
+                    ++changeCount;
+                }
+            }
+
+            // If any values have changed, kick off animation from the cached old values to the new values
+            if (changeCount) {
+                // It'a Panel being collapsed. rollback, and then fix the class name string
+                if (me.isCollapsingOrExpanding === 1) {
+                    target.componentLayout.undoLayout(me);
+                }
+
+                // Otherwise, undo just the animated properties so the animation can proceed from the old layout.
+                else {
+                    me.writeProps(anim.from);
+                }
+                me.el.animate(anim);
+
+                Ext.fx.Manager.getFxQueue(me.el.id)[0].on({
+                    afteranimate: function() {
+                        if (me.isCollapsingOrExpanding === 1) {
+                            target.componentLayout.redoLayout(me);
+                            target.afterCollapse(true);
+                        } else if (me.isCollapsingOrExpanding === 2) {
+                            target.afterExpand(true);
+                        }
+                    }
+                });
+            }
+        }
+    },
+
+    /**
+     * Gets the border information for the element as an object with left, top, right and
+     * bottom properties holding border size in pixels. This object is only read from the
+     * DOM on first request and is cached.
+     * @return {Object}
+     */
+    getBorderInfo: function () {
+        var me = this,
+            info = me.borderInfo;
+
+        if (!info) {
+            me.borderInfo = info = me.checkCache('borderInfo');
+        }
+
+        return info;
+    },
+
+    /**
+     * Returns a ClassList-like object to buffer access to this item's element's classes.
+     */
+    getClassList: function () {
+        return this.classList || (this.classList = new Ext.layout.ClassList(this));
+    },
+
+    /**
+     * @member Ext.layout.ContextItem
+     * Returns the context item for an owned element. This should only be called on a
+     * component's item. The list of child items is used to manage invalidating calculated
+     * results.
+     * @param {String/Ext.dom.Element} nameOrEl The element or the name of an owned element
+     * @param {Ext.layout.container.Container/Ext.Component} [owner] The owner of the
+     * named element if the passed "nameOrEl" parameter is a String. Defaults to this
+     * ContextItem's "target" property.  For more details on owned elements see
+     * {@link Ext.Component#cfg-childEls childEls} and
+     * {@link Ext.Component#renderSelectors renderSelectors}
+     * @return {Ext.layout.ContextItem}
+     */
+    getEl: function (nameOrEl, owner) {
+        var me = this,
+            src, el, elContext;
+
+        if (nameOrEl) {
+            if (nameOrEl.dom) {
+                el = nameOrEl;
+            } else {
+                src = me.target;
+                if (owner) {
+                    src = owner;
+                }
+
+                el = src[nameOrEl];
+                if (typeof el == 'function') { // ex 'getTarget'
+                    el = el.call(src);
+                    if (el === me.el) {
+                        return this; // comp.getTarget() often returns comp.el
+                    }
+                }
+            }
+
+            if (el) {
+                elContext = me.context.getEl(me, el);
+            }
+        }
+
+        return elContext || null;
+    },
+
+    /**
+     * Gets the "frame" information for the element as an object with left, top, right and
+     * bottom properties holding border+framing size in pixels. This object is calculated
+     * on first request and is cached.
+     * @return {Object}
+     */
+    getFrameInfo: function () {
+        var me = this,
+            info = me.frameInfo,
+            framing, border;
+
+        if (!info) {
+            framing = me.framing;
+            border = me.getBorderInfo();
+
+            me.frameInfo = info = 
+                framing ? {
+                    top   : framing.top    + border.top,
+                    right : framing.right  + border.right,
+                    bottom: framing.bottom + border.bottom,
+                    left  : framing.left   + border.left,
+                    width : framing.width  + border.width,
+                    height: framing.height + border.height
+                } : border;
+        }
+
+        return info;
+    },
+
+    /**
+     * Gets the margin information for the element as an object with left, top, right and
+     * bottom properties holding margin size in pixels. This object is only read from the
+     * DOM on first request and is cached.
+     * @return {Object}
+     */
+    getMarginInfo: function () {
+        var me = this,
+            info = me.marginInfo,
+            comp, manageMargins, margins, ownerLayout, ownerLayoutId;
+
+        if (!info) {
+            if (!me.wrapsComponent) {
+                info = me.checkCache('marginInfo');
+            } else {
+                comp = me.target;
+                ownerLayout = comp.ownerLayout;
+                ownerLayoutId = ownerLayout ? ownerLayout.id : null;
+                manageMargins = ownerLayout && ownerLayout.manageMargins;
+
+                // Option #1 for configuring margins on components is the "margin" config
+                // property. When supplied, this config is written to the DOM during the
+                // render process (see AbstractComponent#initStyles).
+                //
+                // Option #2 is available to some layouts (e.g., Box, Border, Fit) that
+                // handle margin calculations themselves. These layouts support a "margins"
+                // config property on their items and they have a "defaultMargins" config
+                // property. These margin values are added to the "natural" margins read
+                // from the DOM and 0's are written to the DOM after they are added.
+
+                // To avoid having to do all this on every layout, we cache the results on
+                // the component in the (private) "margin$" property. We identify the cache
+                // results as belonging to the appropriate ownerLayout in case items are
+                // moved around.
+
+                info = comp.margin$;
+                if (info && info.ownerId !== ownerLayoutId) {
+                    // got one but from the wrong owner
+                    info = null;
+
+                    //  if (manageMargins) {
+                    //      TODO: clear inline margins (the 0's we wrote last time)???
+                    //  }
+                }
+
+                if (!info) { // if (no cache)
+                    // CSS margins are only checked if there isn't a margin property on the component
+                    info = me.parseMargins(comp, comp.margin) || me.checkCache('marginInfo');
+
+                    // Some layouts also support margins and defaultMargins, e.g. Fit, Border, Box
+                    if (manageMargins) {
+                        margins = me.parseMargins(comp, comp.margins, ownerLayout.defaultMargins);
+
+                        if (margins) { // if (using 'margins' and/or 'defaultMargins')
+                            // margin and margins can both be present at the same time and must be combined
+                            info = {
+                                top:    info.top    + margins.top,
+                                right:  info.right  + margins.right,
+                                bottom: info.bottom + margins.bottom,
+                                left:   info.left   + margins.left
+                            };
+                        }
+
+                        me.setProp('margin-top', 0);
+                        me.setProp('margin-right', 0);
+                        me.setProp('margin-bottom', 0);
+                        me.setProp('margin-left', 0);
+                    }
+
+                    // cache the layout margins and tag them with the layout id:
+                    info.ownerId = ownerLayoutId;
+                    comp.margin$ = info;
+                }
+
+                info.width  = info.left + info.right;
+                info.height = info.top  + info.bottom;
+            }
+
+            me.marginInfo = info;
+        }
+
+        return info;
+    },
+
+    /**
+     * clears the margin cache so that marginInfo get re-read from the dom on the next call to getMarginInfo()
+     * This is needed in some special cases where the margins have changed since the last layout, making the cached
+     * values invalid.  For example collapsed window headers have different margin than expanded ones.
+     */
+    clearMarginCache: function() {
+        delete this.marginInfo;
+        delete this.target.margin$;
+    },
+
+    /**
+     * Gets the padding information for the element as an object with left, top, right and
+     * bottom properties holding padding size in pixels. This object is only read from the
+     * DOM on first request and is cached.
+     * @return {Object}
+     */
+    getPaddingInfo: function () {
+        var me = this,
+            info = me.paddingInfo;
+
+        if (!info) {
+            me.paddingInfo = info = me.checkCache('paddingInfo');
+        }
+
+        return info;
+    },
+
+    /**
+     * Gets a property of this object. Also tracks the current layout as dependent on this
+     * property so that changes to it will trigger the layout to be recalculated.
+     * @param {String} propName The property name that blocked the layout (e.g., 'width').
+     * @return {Object} The property value or undefined if not yet set.
+     */
+    getProp: function (propName) {
+        var me = this,
+            result = me.props[propName];
+
+        me.addTrigger(propName);
+        return result;
+    },
+
+    /**
+     * Gets a property of this object if it is correct in the DOM. Also tracks the current
+     * layout as dependent on this property so that DOM writes of it will trigger the
+     * layout to be recalculated.
+     * @param {String} propName The property name (e.g., 'width').
+     * @return {Object} The property value or undefined if not yet set or is dirty.
+     */
+    getDomProp: function (propName) {
+        var me = this,
+            result = (me.dirty && (propName in me.dirty)) ? undefined : me.props[propName];
+
+        me.addTrigger(propName, true);
+        return result;
+    },
+
+    /**
+     * Returns a style for this item. Each style is read from the DOM only once on first
+     * request and is then cached. If the value is an integer, it is parsed automatically
+     * (so '5px' is not returned, but rather 5).
+     *
+     * @param {String} styleName The CSS style name.
+     * @return {Object} The value of the DOM style (parsed as necessary).
+     */
+    getStyle: function (styleName) {
+        var me = this,
+            styles = me.styles,
+            info, value;
+
+        if (styleName in styles) {
+            value = styles[styleName];
+        } else {
+            info = me.styleInfo[styleName];
+            value = me.el.getStyle(styleName);
+
+            if (info && info.parseInt) {
+                value = parseInt(value, 10) || 0;
+            }
+
+            styles[styleName] = value;
+        }
+
+        return value;
+    },
+
+    /**
+     * Returns styles for this item. Each style is read from the DOM only once on first
+     * request and is then cached. If the value is an integer, it is parsed automatically
+     * (so '5px' is not returned, but rather 5).
+     *
+     * @param {String[]} styleNames The CSS style names.
+     * @param {String[]} [altNames] The alternate names for the returned styles. If given,
+     * these names must correspond one-for-one to the `styleNames`.
+     * @return {Object} The values of the DOM styles (parsed as necessary).
+     */
+    getStyles: function (styleNames, altNames) {
+        var me = this,
+            styleCache = me.styles,
+            values = {},
+            hits = 0,
+            n = styleNames.length,
+            i, missing, missingAltNames, name, info, styleInfo, styles, value;
+
+        altNames = altNames || styleNames;
+
+        // We are optimizing this for all hits or all misses. If we hit on all styles, we
+        // don't create a missing[]. If we miss on all styles, we also don't create one.
+        for (i = 0; i < n; ++i) {
+            name = styleNames[i];
+
+            if (name in styleCache) {
+                values[altNames[i]] = styleCache[name];
+                ++hits;
+
+                if (i && hits==1) { // if (first hit was after some misses)
+                    missing = styleNames.slice(0, i);
+                    missingAltNames = altNames.slice(0, i);
+                }
+            } else if (hits) {
+                (missing || (missing = [])).push(name);
+                (missingAltNames || (missingAltNames = [])).push(altNames[i]);
+            }
+        }
+
+        if (hits < n) {
+            missing = missing || styleNames;
+            missingAltNames = missingAltNames || altNames;
+            styleInfo = me.styleInfo;
+
+            styles = me.el.getStyle(missing);
+
+            for (i = missing.length; i--; ) {
+                name = missing[i];
+                info = styleInfo[name];
+                value = styles[name];
+
+                if (info && info.parseInt) {
+                    value = parseInt(value, 10) || 0;
+                }
+
+                values[missingAltNames[i]] = value;
+                styleCache[name] = value;
+            }
+        }
+
+        return values;
+    },
+
+    /**
+     * Returns true if the given property has been set. This is equivalent to calling
+     * {@link #getProp} and not getting an undefined result. In particular, this call
+     * registers the current layout to be triggered by changes to this property.
+     * 
+     * @param {String} propName The property name (e.g., 'width').
+     * @return {Boolean}
+     */
+    hasProp: function (propName) {
+        return this.getProp(propName) != null;
+    },
+
+    /**
+     * Returns true if the given property is correct in the DOM. This is equivalent to
+     * calling {@link #getDomProp} and not getting an undefined result. In particular,
+     * this call registers the current layout to be triggered by flushes of this property.
+     * 
+     * @param {String} propName The property name (e.g., 'width').
+     * @return {Boolean}
+     */
+    hasDomProp: function (propName) {
+        return this.getDomProp(propName) != null;
+    },
+
+    /**
+     * Invalidates the component associated with this item. The layouts for this component
+     * and all of its contained items will be re-run after first clearing any computed
+     * values.
+     * 
+     * If state needs to be carried forward beyond the invalidation, the `options` parameter
+     * can be used.
+     *
+     * @param {Object} options An object describing how to handle the invalidation.
+     * @param {Object} options.state An object to {@link Ext#apply} to the {@link #state}
+     *  of this item after invalidation clears all other properties.
+     * @param {Function} options.before A function to call after the context data is cleared
+     * and before the {@link Ext.layout.Layout#beginLayoutCycle} methods are called.
+     * @param {Ext.layout.ContextItem} options.before.item This ContextItem.
+     * @param {Object} options.before.options The options object passed to {@link #invalidate}.
+     * @param {Function} options.after A function to call after the context data is cleared
+     * and after the {@link Ext.layout.Layout#beginLayoutCycle} methods are called.
+     * @param {Ext.layout.ContextItem} options.after.item This ContextItem.
+     * @param {Object} options.after.options The options object passed to {@link #invalidate}.
+     * @param {Object} options.scope The scope to use when calling the callback functions.
+     */
+    invalidate: function (options) {
+        this.context.queueInvalidate(this, options);
+    },
+
+    markDirty: function () {
+        if (++this.dirtyCount == 1) {
+            // our first dirty property... queue us for flush
+            this.context.queueFlush(this);
+        }
+    },
+
+    onBoxMeasured: function () {
+        var boxParent = this.boxParent,
+            state = this.state;
+
+        if (boxParent && boxParent.widthModel.shrinkWrap && !state.boxMeasured && this.measuresBox) {
+            // since an autoWidth boxParent is holding a width on itself to allow each
+            // child to measure
+            state.boxMeasured = 1; // best to only call once per child
+            boxParent.boxChildMeasured();
+        }
+    },
+
+    parseMargins: function (comp, margins, defaultMargins) {
+        if (margins === true) {
+            margins = 5;
+        }
+
+        var type = typeof margins,
+            ret;
+
+        if (type == 'string' || type == 'number') {
+            ret = comp.parseBox(margins);
+        } else if (margins || defaultMargins) {
+            ret = { top: 0, right: 0, bottom: 0, left: 0 }; // base defaults
+
+            if (defaultMargins) {
+                Ext.apply(ret, this.parseMargins(comp, defaultMargins)); // + layout defaults
+            }
+
+            if (margins) {
+                margins = Ext.apply(ret, comp.parseBox(margins)); // + config
+            }
+        }
+
+        return ret;
+    },
+
+    peek: function (propName) {
+        return this.props[propName];
+    },
+
+    /**
+     * Recovers a property value from the last computation and restores its value and
+     * dirty state.
+     * 
+     * @param {String} propName The name of the property to recover.
+     * @param {Object} oldProps The old "props" object from which to recover values.
+     * @param {Object} oldDirty The old "dirty" object from which to recover state.
+     */
+    recoverProp: function (propName, oldProps, oldDirty) {
+        var me = this,
+            props = me.props,
+            dirty;
+
+        if (propName in oldProps) {
+            props[propName] = oldProps[propName];
+
+            if (oldDirty && propName in oldDirty) {
+                dirty = me.dirty || (me.dirty = {});
+                dirty[propName] = oldDirty[propName];
+            }
+        }
+    },
+
+    redo: function(deep) {
+        var me = this,
+            items, len, i;
+
+        me.revertProps(me.props);
+
+        if (deep && me.wrapsComponent) {
+            // Rollback the state of child Components
+            if (me.childItems) {
+                for (i = 0, items = me.childItems, len = items.length; i < len; i++) {
+                    items[i].redo(deep);
+                }
+            }
+
+            // Rollback the state of child Elements
+            for (i = 0, items = me.children, len = items.length; i < len; i++) {
+                items[i].redo();
+            }
+        }
+    },
+
+    /**
+     * Removes a cached ContextItem that was created using {@link #getEl}.  It may be
+     * necessary to call this method if the dom reference for owned element changes so 
+     * that {@link #getEl} can be called again to reinitialize the ContextItem with the
+     * new element.
+     * @param {String/Ext.dom.Element} nameOrEl The element or the name of an owned element
+     * @param {Ext.layout.container.Container/Ext.Component} [owner] The owner of the
+     * named element if the passed "nameOrEl" parameter is a String. Defaults to this
+     * ContextItem's "target" property.
+     */
+    removeEl: function(nameOrEl, owner) {
+        var me = this,
+            src, el;
+
+        if (nameOrEl) {
+            if (nameOrEl.dom) {
+                el = nameOrEl;
+            } else {
+                src = me.target;
+                if (owner) {
+                    src = owner;
+                }
+
+                el = src[nameOrEl];
+                if (typeof el == 'function') { // ex 'getTarget'
+                    el = el.call(src);
+                    if (el === me.el) {
+                        return this; // comp.getTarget() often returns comp.el
+                    }
+                }
+            }
+
+            if (el) {
+                me.context.removeEl(me, el);
+            }
+        }
+    },
+
+    revertProps: function (props) {
+        var name,
+            flushed = this.flushedProps,
+            reverted = {};
+
+        for (name in props) {
+            if (flushed.hasOwnProperty(name)) {
+                reverted[name] = props[name];
+            }
+        }
+
+        this.writeProps(reverted);
+    },
+
+    /**
+     * Queue the setting of a DOM attribute on this ContextItem's target when next flushed.
+     */
+    setAttribute: function(name, value) {
+        var me = this;
+        if (!me.attributes) {
+            me.attributes = {};
+        }
+        me.attributes[name] = value;
+        me.markDirty();
+    },
+
+    setBox: function (box) {
+        var me = this;
+
+        if ('left' in box) {
+            me.setProp('x', box.left);
+        }
+        if ('top' in box) {
+            me.setProp('y', box.top);
+        }
+
+        // if sizeModel says we should not be setting these, the appropriate calls will be
+        // null operations... otherwise, we must set these values, so what we have in box
+        // is what we go with (undefined, NaN and no change are handled at a lower level):
+        me.setSize(box.width, box.height);
+    },
+
+    /**
+     * Sets the contentHeight property. If the component uses raw content, then only the
+     * measured height is acceptable.
+     *
+     * Calculated values can sometimes be NaN or undefined, which generally mean the
+     * calculation is not done. To indicate that such as value was passed, 0 is returned.
+     * Otherwise, 1 is returned.
+     *
+     * If the caller is not measuring (i.e., they are calculating) and the component has raw
+     * content, 1 is returned indicating that the caller is done.
+     */
+    setContentHeight: function (height, measured) {
+        if (!measured && this.hasRawContent) {
+            return 1;
+        }
+
+        return this.setProp('contentHeight', height);
+    },
+
+    /**
+     * Sets the contentWidth property. If the component uses raw content, then only the
+     * measured width is acceptable.
+     * 
+     * Calculated values can sometimes be NaN or undefined, which generally means that the
+     * calculation is not done. To indicate that such as value was passed, 0 is returned.
+     * Otherwise, 1 is returned.
+     *
+     * If the caller is not measuring (i.e., they are calculating) and the component has raw
+     * content, 1 is returned indicating that the caller is done.
+     */
+    setContentWidth: function (width, measured) {
+        if (!measured && this.hasRawContent) {
+            return 1;
+        }
+
+        return this.setProp('contentWidth', width);
+    },
+
+    /**
+     * Sets the contentWidth and contentHeight properties. If the component uses raw content,
+     * then only the measured values are acceptable.
+     * 
+     * Calculated values can sometimes be NaN or undefined, which generally means that the
+     * calculation is not done. To indicate that either passed value was such a value, false
+     * returned. Otherwise, true is returned.
+     *
+     * If the caller is not measuring (i.e., they are calculating) and the component has raw
+     * content, true is returned indicating that the caller is done.
+     */
+    setContentSize: function (width, height, measured) {
+        return this.setContentWidth(width, measured) +
+               this.setContentHeight(height, measured) == 2;
+    },
+
+    /**
+     * Sets a property value. This will unblock and/or trigger dependent layouts if the
+     * property value is being changed. Values of NaN and undefined are not accepted by
+     * this method.
+     * 
+     * @param {String} propName The property name (e.g., 'width').
+     * @param {Object} value The new value of the property.
+     * @param {Boolean} dirty Optionally specifies if the value is currently in the DOM
+     *  (default is `true` which indicates the value is not in the DOM and must be flushed
+     *  at some point).
+     * @return {Number} 1 if this call specified the property value, 0 if not.
+     */
+    setProp: function (propName, value, dirty) {
+        var me = this,
+            valueType = typeof value,
+            borderBox, info;
+
+        if (valueType == 'undefined' || (valueType === 'number' && isNaN(value))) {
+            return 0;
+        }
+        if (me.props[propName] === value) {
+            return 1;
+        }
+
+        me.props[propName] = value;
+        ++me.context.progressCount;
+
+        if (dirty === false) {
+            // if the prop is equivalent to what is in the DOM (we won't be writing it),
+            // we need to clear hard blocks (domBlocks) on that property.
+            me.fireTriggers('domTriggers', propName);
+            me.clearBlocks('domBlocks', propName);
+        } else {
+            info = me.styleInfo[propName];
+            if (info) {
+                if (!me.dirty) {
+                    me.dirty = {};
+                }
+
+                if (propName == 'width' || propName == 'height') {
+                    borderBox = me.isBorderBoxValue;
+                    if (borderBox === null) {
+                        me.isBorderBoxValue = borderBox = !!me.el.isBorderBox();
+                    }
+
+                    if (!borderBox) {
+                        me.borderInfo || me.getBorderInfo();
+                        me.paddingInfo || me.getPaddingInfo();
+                    }
+                }
+                me.dirty[propName] = value;
+                me.markDirty();
+            }
+        }
+
+        // we always clear soft blocks on set
+        me.fireTriggers('triggers', propName);
+        me.clearBlocks('blocks', propName);
+        return 1;
+    },
+
+    /**
+     * Sets the height and constrains the height to min/maxHeight range.
+     * 
+     * @param {Number} height The height.
+     * @param {Boolean} [dirty=true] Specifies if the value is currently in the DOM. A
+     * value of `false` indicates that the value is already in the DOM.
+     * @return {Number} The actual height after constraining.
+     */
+    setHeight: function (height, dirty /*, private {Boolean} force */) {
+        var me = this,
+            comp = me.target,
+            ownerCtContext = me.ownerCtContext,
+            frameBody, frameInfo, min, oldHeight, rem;
+
+        if (height < 0) {
+            height = 0;
+        }
+        if (!me.wrapsComponent) {
+            if (!me.setProp('height', height, dirty)) {
+                return NaN;
+            }
+        } else {
+            min = me.collapsedVert ? 0 : (comp.minHeight || 0);
+            height = Ext.Number.constrain(height, min, comp.maxHeight);
+            oldHeight = me.props.height;
+            if (!me.setProp('height', height, dirty)) {
+                return NaN;
+            }
+
+            // if we are a container child, since the height is now known we can decrement
+            // the number of remainingChildDimensions that the ownerCtContext is waiting on.
+            if (ownerCtContext && !me.isComponentChild && isNaN(oldHeight)) {
+                rem = --ownerCtContext.remainingChildDimensions;
+                if (!rem) {
+                    // if there are 0 remainingChildDimensions set containerChildrenSizeDone
+                    // on the ownerCtContext to indicate that all of its children's dimensions
+                    // are known
+                    ownerCtContext.setProp('containerChildrenSizeDone', true);
+                }
+            }
+
+            frameBody = me.frameBodyContext;
+            if (frameBody){
+                frameInfo = me.getFrameInfo();
+                frameBody.setHeight(height - frameInfo.height, dirty);
+            }
+        }
+
+        return height;
+    },
+
+    /**
+     * Sets the height and constrains the width to min/maxWidth range.
+     * 
+     * @param {Number} width The width.
+     * @param {Boolean} [dirty=true] Specifies if the value is currently in the DOM. A
+     * value of `false` indicates that the value is already in the DOM.
+     * @return {Number} The actual width after constraining.
+     */
+    setWidth: function (width, dirty /*, private {Boolean} force */) {
+        var me = this,
+            comp = me.target,
+            ownerCtContext = me.ownerCtContext,
+            frameBody, frameInfo, min, oldWidth, rem;
+
+        if (width < 0) {
+            width = 0;
+        }
+        if (!me.wrapsComponent) {
+            if (!me.setProp('width', width, dirty)) {
+                return NaN;
+            }
+        } else {
+            min = me.collapsedHorz ? 0 : (comp.minWidth || 0);
+            width = Ext.Number.constrain(width, min, comp.maxWidth);
+            oldWidth = me.props.width
+            if (!me.setProp('width', width, dirty)) {
+                return NaN;
+            }
+
+            // if we are a container child, since the width is now known we can decrement
+            // the number of remainingChildDimensions that the ownerCtContext is waiting on.
+            if (ownerCtContext && !me.isComponentChild && isNaN(oldWidth)) {
+                rem = --ownerCtContext.remainingChildDimensions;
+                if (!rem) {
+                    // if there are 0 remainingChildDimensions set containerChildrenSizeDone
+                    // on the ownerCtContext to indicate that all of its children's dimensions
+                    // are known
+                    ownerCtContext.setProp('containerChildrenSizeDone', true);
+                }
+            }
+
+            //if ((frameBody = me.target.frameBody) && (frameBody = me.getEl(frameBody))){
+            frameBody = me.frameBodyContext;
+            if (frameBody) {
+                frameInfo = me.getFrameInfo();
+                frameBody.setWidth(width - frameInfo.width, dirty);
+            }
+
+            /*if (owner.frameMC) {
+                frameContext = ownerContext.frameContext ||
+                        (ownerContext.frameContext = ownerContext.getEl('frameMC'));
+                width += (frameContext.paddingInfo || frameContext.getPaddingInfo()).width;
+            }*/
+        }
+
+        return width;
+    },
+
+    setSize: function (width, height, dirty) {
+        this.setWidth(width, dirty);
+        this.setHeight(height, dirty);
+    },
+
+    translateProps: {
+        x: 'left',
+        y: 'top'
+    },
+
+    undo: function(deep) {
+        var me = this,
+            items, len, i;
+
+        me.revertProps(me.lastBox);
+
+        if (deep && me.wrapsComponent) {
+            // Rollback the state of child Components
+            if (me.childItems) {
+                for (i = 0, items = me.childItems, len = items.length; i < len; i++) {
+                    items[i].undo(deep);
+                }
+            }
+
+            // Rollback the state of child Elements
+            for (i = 0, items = me.children, len = items.length; i < len; i++) {
+                items[i].undo();
+            }
+        }
+    },
+
+    unsetProp: function (propName) {
+        var dirty = this.dirty;
+
+        delete this.props[propName];
+        if (dirty) {
+            delete dirty[propName];
+        }
+    },
+
+    writeProps: function(dirtyProps, flushing) {
+        if (!(dirtyProps && typeof dirtyProps == 'object')) {
+            Ext.Logger.warn('writeProps expected dirtyProps to be an object');
+            return;
+        }
+
+        var me = this,
+            el = me.el,
+            styles = {},
+            styleCount = 0, // used as a boolean, the exact count doesn't matter
+            styleInfo = me.styleInfo,
+
+            info,
+            propName,
+            numericValue,
+            width = dirtyProps.width,
+            height = dirtyProps.height,
+            isBorderBox = me.isBorderBoxValue,
+            target = me.target,
+            max = Math.max,
+            paddingWidth = 0,
+            paddingHeight = 0,
+            hasWidth, hasHeight, isAbsolute, scrollbarSize, style, targetEl;
+
+        // Process non-style properties:
+        if ('displayed' in dirtyProps) {
+            el.setDisplayed(dirtyProps.displayed);
+        }
+
+        // Unblock any hard blocks (domBlocks) and copy dom styles into 'styles'
+        for (propName in dirtyProps) {
+            if (flushing) {
+                me.fireTriggers('domTriggers', propName);
+                me.clearBlocks('domBlocks', propName);
+                me.flushedProps[propName] = 1;
+            }
+
+            info = styleInfo[propName];
+            if (info && info.dom) {
+                // Numeric dirty values should have their associated suffix added
+                if (info.suffix && (numericValue = parseInt(dirtyProps[propName], 10))) {
+                    styles[propName] = numericValue + info.suffix;
+                }
+                // Non-numeric (eg "auto") go in unchanged.
+                else {
+                    styles[propName] = dirtyProps[propName];
+                }
+                ++styleCount;
+            }
+        }
+
+        // convert x/y into setPosition (for a component) or left/top styles (for an el)
+        if ('x' in dirtyProps || 'y' in dirtyProps) {
+            if (target.isComponent) {
+                target.setPosition(dirtyProps.x, dirtyProps.y);
+            } else {
+                // we wrap an element, so convert x/y to styles:
+                styleCount += me.addPositionStyles(styles, dirtyProps);
+            }
+        }
+
+        // Support for the content-box box model...
+        if (!isBorderBox && (width > 0 || height > 0)) { // no need to subtract from 0
+            // The width and height values assume the border-box box model,
+            // so we must remove the padding & border to calculate the content-box.
+            if (!(me.borderInfo && me.paddingInfo)) {
+                throw Error("Needed to have gotten the borderInfo and paddingInfo when the width or height was setProp'd");
+            }
+            if(!me.frameBodyContext) {
+                // Padding needs to be removed only if the element is not framed.
+                paddingWidth = me.paddingInfo.width;
+                paddingHeight = me.paddingInfo.height;
+            }
+            if (width) {
+                width = max(parseInt(width, 10) - (me.borderInfo.width + paddingWidth), 0);
+                styles.width = width + 'px';
+                ++styleCount;
+            }
+            if (height) {
+                height = max(parseInt(height, 10) - (me.borderInfo.height + paddingHeight), 0);
+                styles.height = height + 'px';
+                ++styleCount;
+            }
+        }
+
+        // IE9 strict subtracts the scrollbar size from the element size when the element
+        // is absolutely positioned and uses box-sizing: border-box. To workaround this
+        // issue we have to add the the scrollbar size.
+        // 
+        // See http://social.msdn.microsoft.com/Forums/da-DK/iewebdevelopment/thread/47c5148f-a142-4a99-9542-5f230c78cb3b
+        //
+        if (me.wrapsComponent && Ext.isIE9 && Ext.isStrict) {
+            // when we set a width and we have a vertical scrollbar (overflowY), we need
+            // to add the scrollbar width... conversely for the height and overflowX
+            if ((hasWidth = width !== undefined && me.hasOverflowY) ||
+                (hasHeight = height !== undefined && me.hasOverflowX)) {
+                // check that the component is absolute positioned and border-box:
+                isAbsolute = me.isAbsolute;
+                if (isAbsolute === undefined) {
+                    isAbsolute = false;
+                    targetEl = me.target.getTargetEl();
+                    style = targetEl.getStyle('position');
+
+                    if (style == 'absolute') {
+                        style = targetEl.getStyle('box-sizing');
+                        isAbsolute = (style == 'border-box');
+                    }
+
+                    me.isAbsolute = isAbsolute; // cache it
+                }
+
+                if (isAbsolute) {
+                    scrollbarSize = Ext.getScrollbarSize();
+
+                    if (hasWidth) {
+                        width = parseInt(width, 10) + scrollbarSize.width;
+                        styles.width = width + 'px';
+                        ++styleCount;
+                    }
+                    if (hasHeight) {
+                        height = parseInt(height, 10) + scrollbarSize.height;
+                        styles.height = height + 'px';
+                        ++styleCount;
+                    }
+                }
+            }
+        }
+
+        // we make only one call to setStyle to allow it to optimize itself:
+        if (styleCount) {
+            el.setStyle(styles);
+        }
+    }
+}, function () {
+
+    var px =    { dom: true, parseInt: true, suffix: 'px' },
+        isDom = { dom: true },
+        faux =  { dom: false };
+
+    // If a property exists in styleInfo, it participates in some way with the DOM. It may
+    // be virtualized (like 'x' and y') and be indirect, but still requires a flush cycle
+    // to reach the DOM. Properties (like 'contentWidth' and 'contentHeight') have no real
+    // presence in the DOM and hence have no flush intanglements.
+    // 
+    // For simple styles, the object value on the right contains properties that help in
+    // decoding values read by getStyle and preparing values to pass to setStyle.
+    //
+    this.prototype.styleInfo = {
+        containerChildrenSizeDone:  faux,
+        containerLayoutDone:    faux,
+        displayed:              faux,
+        done:                   faux,
+        x:                      faux,
+        y:                      faux,
+
+        // For Ext.grid.ColumnLayout
+        columnWidthsDone:       faux,
+
+        left:                   px,
+        top:                    px,
+        right:                  px,
+        bottom:                 px,
+        width:                  px,
+        height:                 px,
+
+        'border-top-width':     px,
+        'border-right-width':   px,
+        'border-bottom-width':  px,
+        'border-left-width':    px,
+
+        'margin-top':           px,
+        'margin-right':         px,
+        'margin-bottom':        px,
+        'margin-left':          px,
+
+        'padding-top':          px,
+        'padding-right':        px,
+        'padding-bottom':       px,
+        'padding-left':         px,
+
+        'line-height':          isDom,
+        display:                isDom
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Manages context information during a layout.
+ *
+ * # Algorithm
+ *
+ * This class performs the following jobs:
+ *
+ *  - Cache DOM reads to avoid reading the same values repeatedly.
+ *  - Buffer DOM writes and flush them as a block to avoid read/write interleaving.
+ *  - Track layout dependencies so each layout does not have to figure out the source of
+ *    its dependent values.
+ *  - Intelligently run layouts when the values on which they depend change (a trigger).
+ *  - Allow layouts to avoid processing when required values are unavailable (a block).
+ *
+ * Work done during layout falls into either a "read phase" or a "write phase" and it is
+ * essential to always be aware of the current phase. Most methods in
+ * {@link Ext.layout.Layout Layout} are called during a read phase:
+ * {@link Ext.layout.Layout#calculate calculate},
+ * {@link Ext.layout.Layout#completeLayout completeLayout} and
+ * {@link Ext.layout.Layout#finalizeLayout finalizeLayout}. The exceptions to this are
+ * {@link Ext.layout.Layout#beginLayout beginLayout},
+ * {@link Ext.layout.Layout#beginLayoutCycle beginLayoutCycle} and
+ * {@link Ext.layout.Layout#finishedLayout finishedLayout} which are called during
+ * a write phase. While {@link Ext.layout.Layout#finishedLayout finishedLayout} is called
+ * a write phase, it is really intended to be a catch-all for post-processing after a
+ * layout run.
+ * 
+ * In a read phase, it is OK to read the DOM but this should be done using the appropriate
+ * {@link Ext.layout.ContextItem ContextItem} where possible since that provides a cache
+ * to avoid redundant reads. No writes should be made to the DOM in a read phase! Instead,
+ * the values should be written to the proper ContextItem for later write-back.
+ * 
+ * The rules flip-flop in a write phase. The only difference is that ContextItem methods
+ * like {@link Ext.layout.ContextItem#getStyle getStyle} will still read the DOM unless the
+ * value was previously read. This detail is unknowable from the outside of ContextItem, so
+ * read calls to ContextItem should also be avoided in a write phase.
+ *
+ * Calculating interdependent layouts requires a certain amount of iteration. In a given
+ * cycle, some layouts will contribute results that allow other layouts to proceed. The
+ * general flow then is to gather all of the layouts (both component and container) in a
+ * component tree and queue them all for processing. The initial queue order is bottom-up
+ * and component layout first, then container layout (if applicable) for each component.
+ *
+ * This initial step also calls the beginLayout method on all layouts to clear any values
+ * from the DOM that might interfere with calculations and measurements. In other words,
+ * this is a "write phase" and reads from the DOM should be strictly avoided.
+ * 
+ * Next the layout enters into its iterations or "cycles". Each cycle consists of calling
+ * the {@link Ext.layout.Layout#calculate calculate} method on all layouts in the
+ * {@link #layoutQueue}. These calls are part of a "read phase" and writes to the DOM should
+ * be strictly avoided.
+ *
+ * # Considerations
+ *
+ * **RULE 1**: Respect the read/write cycles. Always use the {@link Ext.layout.ContextItem#getProp getProp}
+ * or {@link Ext.layout.ContextItem#getDomProp getDomProp} methods to get calculated values;
+ * only use the {@link Ext.layout.ContextItem#getStyle getStyle} method to read styles; use
+ * {@link Ext.layout.ContextItem#setProp setProp} to set DOM values. Some reads will, of
+ * course, still go directly to the DOM, but if there is a method in
+ * {@link Ext.layout.ContextItem ContextItem} to do a certain job, it should be used instead
+ * of a lower-level equivalent.
+ *
+ * The basic logic flow in {@link Ext.layout.Layout#calculate calculate} consists of gathering
+ * values by calling {@link Ext.layout.ContextItem#getProp getProp} or
+ * {@link Ext.layout.ContextItem#getDomProp getDomProp}, calculating results and publishing
+ * them by calling {@link Ext.layout.ContextItem#setProp setProp}. It is important to realize
+ * that {@link Ext.layout.ContextItem#getProp getProp} will return `undefined` if the value
+ * is not yet known. But the act of calling the method is enough to track the fact that the
+ * calling layout depends (in some way) on this value. In other words, the calling layout is
+ * "triggered" by the properties it requests.
+ *
+ * **RULE 2**: Avoid calling {@link Ext.layout.ContextItem#getProp getProp} unless the value
+ * is needed. Gratuitous calls cause inefficiency because the layout will appear to depend on
+ * values that it never actually uses. This applies equally to
+ * {@link Ext.layout.ContextItem#getDomProp getDomProp} and the test-only methods
+ * {@link Ext.layout.ContextItem#hasProp hasProp} and {@link Ext.layout.ContextItem#hasDomProp hasDomProp}.
+ *
+ * Because {@link Ext.layout.ContextItem#getProp getProp} can return `undefined`, it is often
+ * the case that subsequent math will produce NaN's. This is usually not a problem as the
+ * NaN's simply propagate along and result in final results that are NaN. Both `undefined`
+ * and NaN are ignored by {@link Ext.layout.ContextItem#setProp}, so it is often not necessary
+ * to even know that this is happening. It does become important for determining if a layout
+ * is not done or if it might lead to publishing an incorrect (but not NaN or `undefined`)
+ * value.
+ * 
+ * **RULE 3**: If a layout has not calculated all the values it is required to calculate, it
+ * must set {@link Ext.layout.Layout#done done} to `false` before returning from
+ * {@link Ext.layout.Layout#calculate calculate}. This value is always `true` on entry because
+ * it is simpler to detect the incomplete state rather than the complete state (especially up
+ * and down a class hierarchy).
+ * 
+ * **RULE 4**: A layout must never publish an incomplete (wrong) result. Doing so would cause
+ * dependent layouts to run their calculations on those wrong values, producing more wrong
+ * values and some layouts may even incorrectly flag themselves as {@link Ext.layout.Layout#done done}
+ * before the correct values are determined and republished. Doing this will poison the
+ * calculations.
+ *
+ * **RULE 5**: Each value should only be published by one layout. If multiple layouts attempt
+ * to publish the same values, it would be nearly impossible to avoid breaking **RULE 4**. To
+ * help detect this problem, the layout diagnostics will trap on an attempt to set a value
+ * from different layouts.
+ *
+ * Complex layouts can produce many results as part of their calculations. These values are
+ * important for other layouts to proceed and need to be published by the earliest possible
+ * call to {@link Ext.layout.Layout#calculate} to avoid unnecessary cycles and poor performance. It is
+ * also possible, however, for some results to be related in a way such that publishing them
+ * may be an all-or-none proposition (typically to avoid breaking *RULE 4*).
+ * 
+ * **RULE 6**: Publish results as soon as they are known to be correct rather than wait for
+ * all values to be calculated. Waiting for everything to be complete can lead to deadlock.
+ * The key here is not to forget **RULE 4** in the process.
+ *
+ * Some layouts depend on certain critical values as part of their calculations. For example,
+ * HBox depends on width and cannot do anything until the width is known. In these cases, it
+ * is best to use {@link Ext.layout.ContextItem#block block} or
+ * {@link Ext.layout.ContextItem#domBlock domBlock} and thereby avoid processing the layout
+ * until the needed value is available.
+ *
+ * **RULE 7**: Use {@link Ext.layout.ContextItem#block block} or
+ * {@link Ext.layout.ContextItem#domBlock domBlock} when values are required to make progress.
+ * This will mimize wasted recalculations.
+ *
+ * **RULE 8**: Blocks should only be used when no forward progress can be made. If even one
+ * value could still be calculated, a block could result in a deadlock.
+ *
+ * Historically, layouts have been invoked directly by component code, sometimes in places
+ * like an `afterLayout` method for a child component. With the flexibility now available
+ * to solve complex, iterative issues, such things should be done in a responsible layout
+ * (be it component or container).
+ *
+ * **RULE 9**: Use layouts to solve layout issues and don't wait for the layout to finish to
+ * perform further layouts. This is especially important now that layouts process entire
+ * component trees and not each layout in isolation.
+ *
+ * # Sequence Diagram
+ *
+ * The simplest sequence diagram for a layout run looks roughly like this:
+ *
+ *       Context         Layout 1     Item 1     Layout 2     Item 2
+ *          |               |           |           |           |
+ *     ---->X-------------->X           |           |           |
+ *     run  X---------------|-----------|---------->X           |
+ *          X beginLayout   |           |           |           |
+ *          X               |           |           |           |
+ *        A X-------------->X           |           |           |
+ *          X  calculate    X---------->X           |           |
+ *          X             C X  getProp  |           |           |
+ *        B X               X---------->X           |           |
+ *          X               |  setProp  |           |           |
+ *          X               |           |           |           |
+ *        D X---------------|-----------|---------->X           |
+ *          X  calculate    |           |           X---------->X
+ *          X               |           |           |  setProp  |
+ *        E X               |           |           |           |
+ *          X---------------|-----------|---------->X           |
+ *          X completeLayout|           |         F |           |
+ *          X               |           |           |           |
+ *        G X               |           |           |           |
+ *        H X-------------->X           |           |           |
+ *          X  calculate    X---------->X           |           |
+ *          X             I X  getProp  |           |           |
+ *          X               X---------->X           |           |
+ *          X               |  setProp  |           |           |
+ *        J X-------------->X           |           |           |
+ *          X completeLayout|           |           |           |
+ *          X               |           |           |           |
+ *        K X-------------->X           |           |           |
+ *          X---------------|-----------|---------->X           |
+ *          X finalizeLayout|           |           |           |
+ *          X               |           |           |           |
+ *        L X-------------->X           |           |           |
+ *          X---------------|-----------|---------->X           |
+ *          X finishedLayout|           |           |           |
+ *          X               |           |           |           |
+ *        M X-------------->X           |           |           |
+ *          X---------------|-----------|---------->X           |
+ *          X notifyOwner   |           |           |           |
+ *        N |               |           |           |           |
+ *          -               -           -           -           -
+ *
+ *
+ * Notes:
+ *
+ * **A.** This is a call from the {@link #run} method to the {@link #runCycle} method.
+ * Each layout in the queue will have its {@link Ext.layout.Layout#calculate calculate}
+ * method called.
+ *
+ * **B.** After each {@link Ext.layout.Layout#calculate calculate} method is called the
+ * {@link Ext.layout.Layout#done done} flag is checked to see if the Layout has completed.
+ * If it has completed and that layout object implements a
+ * {@link Ext.layout.Layout#completeLayout completeLayout} method, this layout is queued to
+ * receive its call. Otherwise, the layout will be queued again unless there are blocks or
+ * triggers that govern its requeueing.
+ * 
+ * **C.** The call to {@link Ext.layout.ContextItem#getProp getProp} is made to the Item
+ * and that will be tracked as a trigger (keyed by the name of the property being requested).
+ * Changes to this property will cause this layout to be requeued. The call to
+ * {@link Ext.layout.ContextItem#setProp setProp} will place a value in the item and not
+ * directly into the DOM.
+ * 
+ * **D.** Call the other layouts now in the first cycle (repeat **B** and **C** for each
+ * layout).
+ * 
+ * **E.** After completing a cycle, if progress was made (new properties were written to
+ * the context) and if the {@link #layoutQueue} is not empty, the next cycle is run. If no
+ * progress was made or no layouts are ready to run, all buffered values are written to
+ * the DOM (a flush).
+ *
+ * **F.** After flushing, any layouts that were marked as {@link Ext.layout.Layout#done done}
+ * that also have a {@link Ext.layout.Layout#completeLayout completeLayout} method are called.
+ * This can cause them to become no longer done (see {@link #invalidate}). As with
+ * {@link Ext.layout.Layout#calculate calculate}, this is considered a "read phase" and
+ * direct DOM writes should be avoided.
+ * 
+ * **G.** Flushing and calling any pending {@link Ext.layout.Layout#completeLayout completeLayout}
+ * methods will likely trigger layouts that called {@link Ext.layout.ContextItem#getDomProp getDomProp}
+ * and unblock layouts that have called {@link Ext.layout.ContextItem#domBlock domBlock}.
+ * These variants are used when a layout needs the value to be correct in the DOM and not
+ * simply known. If this does not cause at least one layout to enter the queue, we have a
+ * layout FAILURE. Otherwise, we continue with the next cycle.
+ * 
+ * **H.** Call {@link Ext.layout.Layout#calculate calculate} on any layouts in the queue
+ * at the start of this cycle. Just a repeat of **B** through **G**.
+ * 
+ * **I.** Once the layout has calculated all that it is resposible for, it can leave itself
+ * in the {@link Ext.layout.Layout#done done} state. This is the value on entry to
+ * {@link Ext.layout.Layout#calculate calculate} and must be cleared in that call if the
+ * layout has more work to do.
+ * 
+ * **J.** Now that all layouts are done, flush any DOM values and
+ * {@link Ext.layout.Layout#completeLayout completeLayout} calls. This can again cause
+ * layouts to become not done, and so we will be back on another cycle if that happens.
+ * 
+ * **K.** After all layouts are done, call the {@link Ext.layout.Layout#finalizeLayout finalizeLayout}
+ * method on any layouts that have one. As with {@link Ext.layout.Layout#completeLayout completeLayout},
+ * this can cause layouts to become no longer done. This is less desirable than using
+ * {@link Ext.layout.Layout#completeLayout completeLayout} because it will cause all
+ * {@link Ext.layout.Layout#finalizeLayout finalizeLayout} methods to be called again
+ * when we think things are all wrapped up.
+ *
+ * **L.** After finishing the last iteration, layouts that have a
+ * {@link Ext.layout.Layout#finishedLayout finishedLayout} method will be called. This
+ * call will only happen once per run and cannot cause layouts to be run further.
+ *
+ * **M.** After calling finahedLayout, layouts that have a
+ * {@link Ext.layout.Layout#notifyOwner notifyOwner} method will be called. This
+ * call will only happen once per run and cannot cause layouts to be run further.
+ *
+ * **N.** One last flush to make sure everything has been written to the DOM.
+ *
+ * # Inter-Layout Collaboration
+ * 
+ * Many layout problems require collaboration between multiple layouts. In some cases, this
+ * is as simple as a component's container layout providing results used by its component
+ * layout or vise-versa. A slightly more distant collaboration occurs in a box layout when
+ * stretchmax is used: the child item's component layout provides results that are consumed
+ * by the ownerCt's box layout to determine the size of the children.
+ *
+ * The various forms of interdependence between a container and its children are described by
+ * each components' {@link Ext.AbstractComponent#getSizeModel size model}.
+ *
+ * To facilitate this collaboration, the following pairs of properties are published to the
+ * component's {@link Ext.layout.ContextItem ContextItem}:
+ *
+ *  - width/height: These hold the final size of the component. The layout indicated by the
+ *    {@link Ext.AbstractComponent#getSizeModel size model} is responsible for setting these.
+ *  - contentWidth/contentHeight: These hold size information published by the container
+ *    layout or from DOM measurement. These describe the content only. These values are
+ *    used by the component layout to determine the outer width/height when that component
+ *    is {@link Ext.AbstractComponent#shrinkWrap shrink-wrapped}. They are also used to
+ *    determine overflow. All container layouts must publish these values for dimensions
+ *    that are shrink-wrapped. If a component has raw content (not container items), the
+ *    componentLayout must publish these values instead.
+ * 
+ * @private
+ */
+Ext.define('Ext.layout.Context', {
+               
+                         
+                                 
+                            
+                      
+                        
+      
+
+    remainingLayouts: 0,
+
+    /**
+     * @property {Number} state One of these values:
+     *
+     *  - 0 - Before run
+     *  - 1 - Running
+     *  - 2 - Run complete
+     */
+    state: 0,
+
+    constructor: function (config) {
+        var me = this;
+
+        Ext.apply(me, config);
+
+        // holds the ContextItem collection, keyed by element id
+        me.items = {};
+
+        // a collection of layouts keyed by layout id
+        me.layouts = {};
+
+        // the number of blocks of any kind:
+        me.blockCount = 0;
+        // the number of cycles that have been run:
+        me.cycleCount = 0;
+        // the number of flushes to the DOM:
+        me.flushCount = 0;
+        // the number of layout calculate calls:
+        me.calcCount = 0;
+
+        me.animateQueue = me.newQueue();
+        me.completionQueue = me.newQueue();
+        me.finalizeQueue = me.newQueue();
+        me.finishQueue = me.newQueue();
+        me.flushQueue = me.newQueue();
+
+        me.invalidateData = {};
+
+        /**
+         * @property {Ext.util.Queue} layoutQueue
+         * List of layouts to perform.
+         */
+        me.layoutQueue = me.newQueue();
+
+        // this collection is special because we ensure that there are no parent/child pairs
+        // present, only distinct top-level components
+        me.invalidQueue = [];
+
+        me.triggers = {
+            data: {
+                /*
+                layoutId: [
+                    { item: contextItem, prop: propertyName }
+                ]
+                */
+            },
+            dom: {}
+        };
+    },
+
+    callLayout: function (layout, methodName) {
+        this.currentLayout = layout;
+        layout[methodName](this.getCmp(layout.owner));
+    },
+
+    cancelComponent: function (comp, isChild, isDestroying) {
+        var me = this,
+            components = comp,
+            isArray = !comp.isComponent,
+            length = isArray ? components.length : 1,
+            i, k, klen, items, layout, newQueue, oldQueue, entry, temp,
+            ownerCtContext;
+
+        for (i = 0; i < length; ++i) {
+            if (isArray) {
+                comp = components[i];
+            }
+
+            // If the component is being destroyed, remove the component's ContextItem from its parent's contextItem.childItems array
+            if (isDestroying && comp.ownerCt) {
+                ownerCtContext = this.items[comp.ownerCt.el.id];
+                if (ownerCtContext) {
+                    Ext.Array.remove(ownerCtContext.childItems, me.getCmp(comp));
+                }
+            }
+
+            if (!isChild) {
+                oldQueue = me.invalidQueue;
+                klen = oldQueue.length;
+
+                if (klen) {
+                    me.invalidQueue = newQueue = [];
+                    for (k = 0; k < klen; ++k) {
+                        entry = oldQueue[k];
+                        temp = entry.item.target;
+                        if (temp != comp && !temp.isDescendant(comp)) {
+                            newQueue.push(entry);
+                        }
+                    }
+                }
+            }
+
+            layout = comp.componentLayout;
+            me.cancelLayout(layout);
+
+            if (layout.getLayoutItems) {
+                items = layout.getLayoutItems();
+                if (items.length) {
+                    me.cancelComponent(items, true);
+                }
+            }
+
+            if (comp.isContainer && !comp.collapsed) {
+                layout = comp.layout;
+                me.cancelLayout(layout);
+
+                items = layout.getVisibleItems();
+                if (items.length) {
+                    me.cancelComponent(items, true);
+                }
+            }
+        }
+    },
+
+    cancelLayout: function (layout) {
+        var me = this;
+
+        me.completionQueue.remove(layout);
+        me.finalizeQueue.remove(layout);
+        me.finishQueue.remove(layout);
+        me.layoutQueue.remove(layout);
+
+        if (layout.running) {
+            me.layoutDone(layout);
+        }
+
+        layout.ownerContext = null;
+    },
+
+    clearTriggers: function (layout, inDom) {
+        var id = layout.id,
+            collection = this.triggers[inDom ? 'dom' : 'data'],
+            triggers = collection && collection[id],
+            length = (triggers && triggers.length) || 0,
+            i, item, trigger;
+
+        for (i = 0; i < length; ++i) {
+            trigger = triggers[i];
+            item = trigger.item;
+
+            collection = inDom ? item.domTriggers : item.triggers;
+            delete collection[trigger.prop][id];
+        }
+    },
+
+    /**
+     * Flushes any pending writes to the DOM by calling each ContextItem in the flushQueue.
+     */
+    flush: function () {
+        var me = this,
+            items = me.flushQueue.clear(),
+            length = items.length, i;
+
+        if (length) {
+            ++me.flushCount;
+
+            for (i = 0; i < length; ++i) {
+                items[i].flush();
+            }
+        }
+    },
+
+    flushAnimations: function() {
+        var me = this,
+            items = me.animateQueue.clear(),
+            len = items.length,
+            i;
+
+        if (len) {
+            for (i = 0; i < len; i++) {
+                // Each Component may refuse to participate in animations.
+                // This is used by the BoxReorder plugin which drags a Component,
+                // during which that Component must be exempted from layout positioning.
+                if (items[i].target.animate !== false) {
+                    items[i].flushAnimations();
+                }
+            }
+
+            // Ensure the first frame fires now to avoid a browser repaint with the elements in the "to" state
+            // before they are returned to their "from" state by the animation.
+            Ext.fx.Manager.runner();
+        }
+    },
+
+    flushInvalidates: function () {
+        var me = this,
+            queue = me.invalidQueue,
+            length = queue && queue.length,
+            comp, components, entry, i;
+
+        me.invalidQueue = [];
+
+        if (length) {
+            components = [];
+            for (i = 0; i < length; ++i) {
+                comp = (entry = queue[i]).item.target;
+                // we filter out-of-body components here but allow them into the queue to
+                // ensure that their child components are coalesced out (w/no additional
+                // cost beyond our normal effort to avoid parent/child components in the
+                // queue)
+                if (!comp.container.isDetachedBody) {
+                    components.push(comp);
+
+                    if (entry.options) {
+                        me.invalidateData[comp.id] = entry.options;
+                    }
+                }
+            }
+
+            me.invalidate(components, null);
+        }
+    },
+
+    flushLayouts: function (queueName, methodName, dontClear) {
+        var me = this,
+            layouts = dontClear ? me[queueName].items : me[queueName].clear(),
+            length = layouts.length,
+            i, layout;
+
+        if (length) {
+            for (i = 0; i < length; ++i) {
+                layout = layouts[i];
+                if (!layout.running) {
+                    me.callLayout(layout, methodName);
+                }
+            }
+            me.currentLayout = null;
+        }
+    },
+
+    /**
+     * Returns the ContextItem for a component.
+     * @param {Ext.Component} cmp
+     */
+    getCmp: function (cmp) {
+        return this.getItem(cmp, cmp.el);
+    },
+
+    /**
+     * Returns the ContextItem for an element.
+     * @param {Ext.layout.ContextItem} parent
+     * @param {Ext.dom.Element} el
+     */
+    getEl: function (parent, el) {
+        var item = this.getItem(el, el);
+
+        if (!item.parent) {
+            item.parent = parent;
+
+            // all items share an empty children array (to avoid null checks), so we can
+            // only push on to the children array if there is already something there (we
+            // copy-on-write):
+            if (parent.children.length) {
+                parent.children.push(item);
+            } else {
+                parent.children = [ item ]; // now parent has its own children[] (length=1)
+            }
+        }
+
+        return item;
+    },
+
+    getItem: function (target, el) {
+        var id = el.id,
+            items = this.items,
+            item = items[id] ||
+                  (items[id] = new Ext.layout.ContextItem({
+                                    context: this,
+                                    target: target,
+                                    el: el
+                                }));
+
+        return item;
+    },
+
+    handleFailure: function () {
+        // This method should never be called, but is need when layouts fail (hence the
+        // "should never"). We just disconnect any of the layouts from the run and return
+        // them to the state they would be in had the layout completed properly.
+        var layouts = this.layouts,
+            layout, key;
+
+        Ext.failedLayouts = (Ext.failedLayouts || 0) + 1;
+
+        for (key in layouts) {
+            layout = layouts[key];
+
+            if (layouts.hasOwnProperty(key)) {
+                layout.running      = false;
+                layout.ownerContext = null;
+            }
+        }
+
+        if (Ext.repoDevMode && !this.pageAnalyzerMode) {
+            Ext.Error.raise('Layout run failed');
+        } else {
+            Ext.log.error('Layout run failed');
+        }
+    },
+
+    /**
+     * Invalidates one or more components' layouts (component and container). This can be
+     * called before run to identify the components that need layout or during the run to
+     * restart the layout of a component. This is called internally to flush any queued
+     * invalidations at the start of a cycle. If called during a run, it is not expected
+     * that new components will be introduced to the layout.
+     * 
+     * @param {Ext.Component/Array} components An array of Components or a single Component.
+     * @param {Boolean} full True if all properties should be invalidated, otherwise only
+     *  those calculated by the component should be invalidated.
+     */
+    invalidate: function (components, full) {
+        var me = this,
+            isArray = !components.isComponent,
+            containerLayoutDone,
+            firstTime, i, comp, item, items, length, componentLayout, layout,
+            invalidateOptions, token;
+
+        for (i = 0, length = isArray ? components.length : 1; i < length; ++i) {
+            comp = isArray ? components[i] : components;
+
+            if (comp.rendered && !comp.hidden) {
+                item = me.getCmp(comp);
+                
+                // Layout optimizations had to be disabled because they break
+                // Dock layout behavior.
+//                 if (item.optOut) {
+//                     continue;
+//                 }
+
+                componentLayout = comp.componentLayout;
+                firstTime = !componentLayout.ownerContext;
+                layout = (comp.isContainer && !comp.collapsed) ? comp.layout : null;
+
+                // Extract any invalidate() options for this item.
+                invalidateOptions = me.invalidateData[item.id];
+                delete me.invalidateData[item.id];
+
+                // We invalidate the contextItem's in a top-down manner so that SizeModel
+                // info for containers is available to their children. This is a critical
+                // optimization since sizeModel determination often requires knowing the
+                // sizeModel of the ownerCt. If this weren't cached as we descend, this
+                // would be an O(N^2) operation! (where N=number of components, or 300+/-
+                // in Themes)
+                token = item.init(full, invalidateOptions);
+
+                if (invalidateOptions) {
+                    me.processInvalidate(invalidateOptions, item, 'before');
+                }
+
+                // Allow the component layout a chance to effect its size model before we
+                // recurse down the component hierarchy (since children need to know the
+                // size model of their ownerCt).
+                if (componentLayout.beforeLayoutCycle) {
+                    componentLayout.beforeLayoutCycle(item);
+                }
+                
+                if (layout && layout.beforeLayoutCycle) {
+                    // allow the container layout take a peek as well. Table layout can
+                    // influence its children's styling due to the interaction of nesting
+                    // table-layout:fixed and auto inside each other without intervening
+                    // elements of known size.
+                    layout.beforeLayoutCycle(item);
+                }
+
+                // Finish up the item-level processing that is based on the size model of
+                // the component.
+                token = item.initContinue(token);
+
+                // Start this state variable at true, since that is the value we want if
+                // they do not apply (i.e., no work of this kind on which to wait).
+                containerLayoutDone = true;
+
+                // A ComponentLayout MUST implement getLayoutItems to allow its children
+                // to be collected. Ext.container.Container does this, but non-Container
+                // Components which manage Components as part of their structure (e.g.,
+                // HtmlEditor) must still return child Components via getLayoutItems.
+                if (componentLayout.getLayoutItems) {
+                    componentLayout.renderChildren();
+
+                    items = componentLayout.getLayoutItems();
+                    if (items.length) {
+                        me.invalidate(items, true);
+                    }
+                }
+
+                if (layout) {
+                    containerLayoutDone = false;
+                    layout.renderChildren();
+
+                    items = layout.getVisibleItems();
+                    if (items.length) {
+                        me.invalidate(items, true);
+                    }
+                }
+
+                // Finish the processing that requires the size models of child items to
+                // be determined (and some misc other stuff).
+                item.initDone(containerLayoutDone);
+
+                // Inform the layouts that we are about to begin (or begin again) now that
+                // the size models of the component and its children are setup.
+                me.resetLayout(componentLayout, item, firstTime);
+                if (layout) {
+                    me.resetLayout(layout, item, firstTime);
+                }
+
+                // This has to occur after the component layout has had a chance to begin
+                // so that we can determine what kind of animation might be needed. TODO-
+                // move this determination into the layout itself.
+                item.initAnimation();
+
+                if (invalidateOptions) {
+                    me.processInvalidate(invalidateOptions, item, 'after');
+                }
+            }
+        }
+
+        me.currentLayout = null;
+    },
+
+    layoutDone: function (layout) {
+        var ownerContext = layout.ownerContext;
+
+        layout.running = false;
+
+        // Once a component layout completes, we can mark it as "done".
+        if (layout.isComponentLayout) {
+            if (ownerContext.measuresBox) {
+                ownerContext.onBoxMeasured(); // be sure to release our boxParent
+            }
+
+            ownerContext.setProp('done', true);
+        } else {
+            ownerContext.setProp('containerLayoutDone', true);
+        }
+
+        --this.remainingLayouts;
+        ++this.progressCount; // a layout completion is progress
+    },
+
+    newQueue: function () {
+        return new Ext.util.Queue();
+    },
+
+    processInvalidate: function (options, item, name) {
+        // When calling a callback, the currentLayout needs to be adjusted so
+        // that whichever layout caused the invalidate is the currentLayout...
+        if (options[name]) {
+            var me = this,
+                currentLayout = me.currentLayout;
+
+            me.currentLayout = options.layout || null;
+
+            options[name](item, options);
+
+            me.currentLayout = currentLayout;
+        }
+    },
+
+    /**
+     * Queues a ContextItem to have its {@link Ext.layout.ContextItem#flushAnimations} method called.
+     *
+     * @param {Ext.layout.ContextItem} item
+     * @private
+     */
+    queueAnimation: function (item) {
+        this.animateQueue.add(item);
+    },
+
+    /**
+     * Queues a layout to have its {@link Ext.layout.Layout#completeLayout} method called.
+     *
+     * @param {Ext.layout.Layout} layout
+     * @private
+     */
+    queueCompletion: function (layout) {
+        this.completionQueue.add(layout);
+    },
+
+    /**
+     * Queues a layout to have its {@link Ext.layout.Layout#finalizeLayout} method called.
+     *
+     * @param {Ext.layout.Layout} layout
+     * @private
+     */
+    queueFinalize: function (layout) {
+        this.finalizeQueue.add(layout);
+    },
+
+    /**
+     * Queues a ContextItem for the next flush to the DOM. This should only be called by
+     * the {@link Ext.layout.ContextItem} class.
+     *
+     * @param {Ext.layout.ContextItem} item
+     * @private
+     */
+    queueFlush: function (item) {
+        this.flushQueue.add(item);
+    },
+
+    chainFns: function (oldOptions, newOptions, funcName) {
+        var me = this,
+            oldLayout = oldOptions.layout,
+            newLayout = newOptions.layout,
+            oldFn = oldOptions[funcName],
+            newFn = newOptions[funcName];
+
+        // Call newFn last so it can get the final word on things... also, the "this"
+        // pointer will be passed correctly by createSequence with oldFn first.
+        return function (contextItem) {
+            var prev = me.currentLayout;
+            if (oldFn) {
+                me.currentLayout = oldLayout;
+                oldFn.call(oldOptions.scope || oldOptions, contextItem, oldOptions);
+            }
+            me.currentLayout = newLayout;
+            newFn.call(newOptions.scope || newOptions, contextItem, newOptions);
+            me.currentLayout = prev;
+        };
+    },
+
+    /**
+     * Queue a component (and its tree) to be invalidated on the next cycle.
+     *
+     * @param {Ext.Component/Ext.layout.ContextItem} item The component or ContextItem to invalidate.
+     * @param {Object} options An object describing how to handle the invalidation (see
+     *  {@link Ext.layout.ContextItem#invalidate} for details).
+     * @private
+     */
+    queueInvalidate: function (item, options) {
+        var me = this,
+            newQueue = [],
+            oldQueue = me.invalidQueue,
+            index = oldQueue.length,
+            comp, old, oldComp, oldOptions, oldState;
+
+        if (item.isComponent) {
+            item = me.getCmp(comp = item);
+        } else {
+            comp = item.target;
+        }
+
+        item.invalid = true;
+
+        // See if comp is contained by any component already in the queue (ignore comp if
+        // that is the case). Eliminate any components in the queue that are contained by
+        // comp (by not adding them to newQueue).
+        while (index--) {
+            old = oldQueue[index];
+            oldComp = old.item.target;
+
+            if (comp.isDescendant(oldComp)) {
+                return; // oldComp contains comp, so this invalidate is redundant
+            }
+
+            if (oldComp == comp) {
+                // if already in the queue, update the options...
+                if (!(oldOptions = old.options)) {
+                    old.options = options;
+                } else if (options) {
+                    if (options.widthModel) {
+                        oldOptions.widthModel = options.widthModel;
+                    }
+                    if (options.heightModel) {
+                        oldOptions.heightModel = options.heightModel;
+                    }
+                    if (!(oldState = oldOptions.state)) {
+                        oldOptions.state = options.state;
+                    } else if (options.state) {
+                        Ext.apply(oldState, options.state);
+                    }
+
+                    if (options.before) {
+                        oldOptions.before = me.chainFns(oldOptions, options, 'before');
+                    }
+                    if (options.after) {
+                        oldOptions.after = me.chainFns(oldOptions, options, 'after');
+                    }
+                }
+
+                // leave the old queue alone now that we've update this comp's entry...
+                return;
+            }
+
+            if (!oldComp.isDescendant(comp)) {
+                newQueue.push(old); // comp does not contain oldComp
+            }
+            // else if (oldComp isDescendant of comp) skip
+        }
+        // newQueue contains only those components not a descendant of comp
+
+        // to get here, comp must not be a child of anything already in the queue, so it
+        // needs to be added along with its "options":
+        newQueue.push({ item: item, options: options });
+
+        me.invalidQueue = newQueue;
+    },
+
+    queueItemLayouts: function (item) {
+        var comp = item.isComponent ? item : item.target,
+            layout = comp.componentLayout;
+
+        if (!layout.pending && !layout.invalid && !layout.done) {
+            this.queueLayout(layout);
+        }
+
+        layout = comp.layout;
+        if (layout && !layout.pending && !layout.invalid && !layout.done) {
+            this.queueLayout(layout);
+        }
+    },
+
+    /**
+     * Queues a layout for the next calculation cycle. This should not be called if the
+     * layout is done, blocked or already in the queue. The only classes that should call
+     * this method are this class and {@link Ext.layout.ContextItem}.
+     *
+     * @param {Ext.layout.Layout} layout The layout to add to the queue.
+     * @private
+     */
+    queueLayout: function (layout) {
+        this.layoutQueue.add(layout);
+        layout.pending = true;
+    },
+
+    /**
+     * Removes the ContextItem for an element from the cache and from the parent's
+     * "children" array.
+     * @param {Ext.layout.ContextItem} parent
+     * @param {Ext.dom.Element} el
+     */
+    removeEl: function (parent, el) {
+        var id = el.id,
+            children = parent.children,
+            items = this.items;
+
+        if(children) {
+            Ext.Array.remove(children, items[id]);
+        }
+        delete items[id];
+    },
+
+    /**
+     * Resets the given layout object. This is called at the start of the run and can also
+     * be called during the run by calling {@link #invalidate}.
+     */
+    resetLayout: function (layout, ownerContext, firstTime) {
+        var me = this;
+
+        me.currentLayout = layout;
+
+        layout.done = false;
+        layout.pending = true;
+        layout.firedTriggers = 0;
+
+        me.layoutQueue.add(layout);
+
+        if (firstTime) {
+            me.layouts[layout.id] = layout; // track the layout for this run by its id
+            layout.running = true;
+
+            if (layout.finishedLayout) {
+                me.finishQueue.add(layout);
+            }
+
+            // reset or update per-run counters:
+
+            ++me.remainingLayouts;
+            ++layout.layoutCount; // the number of whole layouts run for the layout
+
+            layout.ownerContext = ownerContext;
+            layout.beginCount = 0; // the number of beginLayout calls
+            layout.blockCount = 0; // the number of blocks set for the layout
+            layout.calcCount = 0; // the number of times calculate is called
+            layout.triggerCount = 0; // the number of triggers set for the layout
+
+            if (!layout.initialized) {
+                layout.initLayout();
+            }
+
+            layout.beginLayout(ownerContext);
+        } else {
+            ++layout.beginCount;
+
+            if (!layout.running) {
+                // back into the mahem with this one:
+                ++me.remainingLayouts;
+                layout.running = true;
+
+                if (layout.isComponentLayout) {
+                    // this one is fun... if we call setProp('done', false) that would still
+                    // trigger/unblock layouts, but what layouts are really looking for with
+                    // this property is for it to go to true, not just be set to a value...
+                    ownerContext.unsetProp('done');
+                }
+
+                // and it needs to be removed from the completion and/or finalize queues...
+                me.completionQueue.remove(layout);
+                me.finalizeQueue.remove(layout);
+            }
+        }
+
+        layout.beginLayoutCycle(ownerContext, firstTime);
+    },
+
+    /**
+     * Runs the layout calculations. This can be called only once on this object.
+     * @return {Boolean} True if all layouts were completed, false if not.
+     */
+    run: function () {
+        var me = this,
+            flushed = false,
+            watchDog = 100;
+
+        me.flushInvalidates();
+
+        me.state = 1;
+        me.totalCount = me.layoutQueue.getCount();
+
+        // We may start with unflushed data placed by beginLayout calls. Since layouts may
+        // use setProp as a convenience, even in a write phase, we don't want to transition
+        // to a read phase with unflushed data since we can write it now "cheaply". Also,
+        // these value could easily be needed in the DOM in order to really get going with
+        // the calculations. In particular, fixed (configured) dimensions fall into this
+        // category.
+        me.flush();
+
+        // While we have layouts that have not completed...
+        while ((me.remainingLayouts || me.invalidQueue.length) && watchDog--) {
+            if (me.invalidQueue.length) {
+                me.flushInvalidates();
+            }
+
+            // if any of them can run right now, run them
+            if (me.runCycle()) {
+                flushed = false; // progress means we probably need to flush something
+                // but not all progress appears in the flushQueue (e.g. 'contentHeight')
+            } else if (!flushed) {
+                // as long as we are making progress, flush updates to the DOM and see if
+                // that triggers or unblocks any layouts...
+                me.flush();
+                flushed = true; // all flushed now, so more progress is required
+
+                me.flushLayouts('completionQueue', 'completeLayout');
+            } else if (!me.invalidQueue.length) {
+                // after a flush, we must make progress or something is WRONG
+                me.state = 2;
+                break;
+            }
+
+            if (!(me.remainingLayouts || me.invalidQueue.length)) {
+                me.flush();
+                me.flushLayouts('completionQueue', 'completeLayout');
+                me.flushLayouts('finalizeQueue', 'finalizeLayout');
+            }
+        }
+
+        return me.runComplete();
+    },
+
+    runComplete: function () {
+        var me = this;
+
+        me.state = 2;
+
+        if (me.remainingLayouts) {
+            me.handleFailure();
+            return false;
+        }
+
+        me.flush();
+
+        // Call finishedLayout on all layouts, but do not clear the queue.
+        me.flushLayouts('finishQueue', 'finishedLayout', true);
+
+        // Call notifyOwner on all layouts and then clear the queue.
+        me.flushLayouts('finishQueue', 'notifyOwner');
+
+        me.flush(); // in case any setProp calls were made
+
+        me.flushAnimations();
+
+        return true;
+    },
+
+    /**
+     * Performs one layout cycle by calling each layout in the layout queue.
+     * @return {Boolean} True if some progress was made, false if not.
+     * @protected
+     */
+    runCycle: function () {
+        var me = this,
+            layouts = me.layoutQueue.clear(),
+            length = layouts.length,
+            i;
+
+        ++me.cycleCount;
+
+        // This value is incremented by ContextItem#setProp whenever new values are set
+        // (thereby detecting forward progress):
+        me.progressCount = 0;
+
+        for (i = 0; i < length; ++i) {
+            me.runLayout(me.currentLayout = layouts[i]);
+        }
+
+        me.currentLayout = null;
+
+        return me.progressCount > 0;
+    },
+
+    /**
+     * Runs one layout as part of a cycle.
+     * @private
+     */
+    runLayout: function (layout) {
+        var me = this,
+            ownerContext = me.getCmp(layout.owner);
+
+        layout.pending = false;
+
+        if (ownerContext.state.blocks) {
+            return;
+        }
+
+        // We start with the assumption that the layout will finish and if it does not, it
+        // must clear this flag. It turns out this is much simpler than knowing when a layout
+        // is done (100% correctly) when base classes and derived classes are collaborating.
+        // Knowing that some part of the layout is not done is much more obvious.
+        layout.done = true;
+
+        ++layout.calcCount;
+        ++me.calcCount;
+
+        layout.calculate(ownerContext);
+
+        if (layout.done) {
+            me.layoutDone(layout);
+
+            if (layout.completeLayout) {
+                me.queueCompletion(layout);
+            }
+            if (layout.finalizeLayout) {
+                me.queueFinalize(layout);
+            }
+        } else if (!layout.pending && !layout.invalid && !(layout.blockCount + layout.triggerCount - layout.firedTriggers)) {
+            // A layout that is not done and has no blocks or triggers that will queue it
+            // automatically, must be queued now:
+            me.queueLayout(layout);
+        }
+    },
+
+    /**
+     * Set the size of a component, element or composite or an array of components or elements.
+     * @param {Ext.Component/Ext.Component[]/Ext.dom.Element/Ext.dom.Element[]/Ext.dom.CompositeElement} items
+     * The item(s) to size.
+     * @param {Number} width The new width to set (ignored if undefined or NaN).
+     * @param {Number} height The new height to set (ignored if undefined or NaN).
+     */
+    setItemSize: function(item, width, height) {
+        var items = item,
+            len = 1,
+            contextItem, i;
+
+        // NOTE: we don't pre-check for validity because:
+        //  - maybe only one dimension is valid
+        //  - the diagnostics layer will track the setProp call to help find who is trying
+        //      (but failing) to set a property
+        //  - setProp already checks this anyway
+
+        if (item.isComposite) {
+            items = item.elements;
+            len = items.length;
+            item = items[0];
+        } else if (!item.dom && !item.el) { // array by process of elimination
+            len = items.length;
+            item = items[0];
+        }
+        // else len = 1 and items = item (to avoid error on "items[++i]")
+
+        for (i = 0; i < len; ) {
+            contextItem = this.get(item);
+            contextItem.setSize(width, height);
+
+            item = items[++i]; // this accomodation avoids making an array of 1
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * An extended {@link Ext.Element} object that supports a shadow and shim, constrain to viewport and
+ * automatic maintaining of shadow/shim positions.
+ */
+Ext.define('Ext.dom.Layer', {
+    extend:  Ext.Element ,
+                         
+    alternateClassName: 'Ext.Layer',
+
+    /**
+     * @cfg {Boolean} [shim=true]
+     * False to disable the iframe shim in browsers which need one.
+     */
+
+    /**
+     * @cfg {String/Boolean} [shadow=false]
+     * True to automatically create an {@link Ext.Shadow}, or a string indicating the
+     * shadow's display {@link Ext.Shadow#mode}. False to disable the shadow.
+     */
+
+    /**
+     * @cfg {Object} [dh={tag: 'div', cls: 'x-layer'}]
+     * DomHelper object config to create element with.
+     */
+
+    /**
+     * @cfg {Boolean} [constrain=true]
+     * False to disable constrain to viewport.
+     */
+
+    /**
+     * @cfg {String} cls
+     * CSS class to add to the element
+     */
+
+    /**
+     * @cfg {Number} [zindex=11000]
+     * Starting z-index.
+     */
+
+    /**
+     * @cfg {Number} [shadowOffset=4]
+     * Number of pixels to offset the shadow
+     */
+
+    /**
+     * @cfg {Boolean} [useDisplay=false]
+     * Defaults to use css offsets to hide the Layer. Specify <tt>true</tt>
+     * to use css style <tt>'display:none;'</tt> to hide the Layer.
+     */
+
+    /**
+     * @cfg {String} visibilityCls
+     * The CSS class name to add in order to hide this Layer if this layer
+     * is configured with <code>{@link #hideMode}: 'asclass'</code>
+     */
+
+    /**
+     * @cfg {String} hideMode
+     * A String which specifies how this Layer will be hidden.
+     * Values may be:
+     *
+     * - `'display'` : The Component will be hidden using the `display: none` style.
+     * - `'visibility'` : The Component will be hidden using the `visibility: hidden` style.
+     * - `'offsets'` : The Component will be hidden by absolutely positioning it out of the visible area
+     *   of the document. This is useful when a hidden Component must maintain measurable dimensions.
+     *   Hiding using `display` results in a Component having zero dimensions.
+     */
+
+    // shims are shared among layer to keep from having 100 iframes
+    statics: {
+        shims: []
+    },
+    
+    isLayer: true,
+
+    localXYNames: {
+        get: 'getLocalXY',
+        set: 'setLocalXY'
+    },
+
+    /**
+     * Creates new Layer.
+     * @param {Object} [config] An object with config options.
+     * @param {String/HTMLElement} [existingEl] Uses an existing DOM element.
+     * If the element is not found it creates it.
+     */
+    constructor: function(config, existingEl) {
+        config = config || {};
+        var me = this,
+            dh = Ext.DomHelper,
+            cp = config.parentEl,
+            pel = cp ? Ext.getDom(cp) : document.body,
+            hm = config.hideMode,
+            cls = Ext.baseCSSPrefix + (config.fixed && !(Ext.isIE6 || Ext.isIEQuirks) ? 'fixed-layer' : 'layer');
+
+        // set an "el" property that references "this".  This allows
+        // Ext.util.Positionable methods to operate on this.el.dom since it
+        // gets mixed into both Element and Component
+        me.el = me;
+
+        if (existingEl) {
+            me.dom = Ext.getDom(existingEl);
+        }
+        if (!me.dom) {
+            me.dom = dh.append(pel, config.dh || {
+                tag: 'div',
+                cls: cls // primarily to give el 'position:absolute' or, if fixed, 'position:fixed'
+            });
+        } else {
+            me.addCls(cls);
+            if (!me.dom.parentNode) {
+                pel.appendChild(me.dom);
+            }
+        }
+        
+        if (config.preventSync) {
+            me.preventSync = true;
+        }
+
+        if (config.id) {
+            me.id = me.dom.id = config.id;
+        } else {
+            me.id = Ext.id(me.dom);
+        }
+
+        Ext.Element.addToCache(me);
+
+        if (config.cls) {
+            me.addCls(config.cls);
+        }
+        me.constrain = config.constrain !== false;
+
+        // Allow Components to pass their hide mode down to the Layer if they are floating.
+        // Otherwise, allow useDisplay to override the default hiding method which is visibility.
+        // TODO: Have ExtJS's Element implement visibilityMode by using classes as in Mobile.
+        if (hm) {
+            me.setVisibilityMode(Ext.Element[hm.toUpperCase()]);
+            if (me.visibilityMode == Ext.Element.ASCLASS) {
+                me.visibilityCls = config.visibilityCls;
+            }
+        } else if (config.useDisplay) {
+            me.setVisibilityMode(Ext.Element.DISPLAY);
+        } else {
+            me.setVisibilityMode(Ext.Element.VISIBILITY);
+        }
+
+        if (config.shadow) {
+            me.shadowOffset = config.shadowOffset || 4;
+            me.shadow = new Ext.Shadow({
+                offset: me.shadowOffset,
+                mode: config.shadow,
+                fixed: config.fixed
+            });
+            me.disableShadow();
+        } else {
+            me.shadowOffset = 0;
+        }
+        me.useShim = config.shim !== false && Ext.useShims;
+        if (config.hidden === true) {
+            me.hide();
+        } else {
+            me.show();
+        }
+    },
+
+    getZIndex: function() {
+        return parseInt((this.getShim() || this).getStyle('z-index'), 10);
+    },
+
+    getShim: function() {
+        var me = this,
+            shim, pn;
+
+        if (!me.useShim) {
+            return null;
+        }
+        if (!me.shim) {
+            shim = me.self.shims.shift();
+            if (!shim) {
+                shim = me.createShim();
+                shim.enableDisplayMode('block');
+                shim.hide();
+            }
+            pn = me.dom.parentNode;
+            if (shim.dom.parentNode != pn) {
+                pn.insertBefore(shim.dom, me.dom);
+            }
+            me.shim = shim;
+        }
+        return me.shim;
+    },
+
+    hideShim: function() {
+        var me = this;
+        
+        if (me.shim) {
+            me.shim.setDisplayed(false);
+            me.self.shims.push(me.shim);
+            delete me.shim;
+        }
+    },
+
+    disableShadow: function() {
+        var me = this;
+        
+        if (me.shadow && !me.shadowDisabled) {
+            me.shadowDisabled = true;
+            me.shadow.hide();
+            me.lastShadowOffset = me.shadowOffset;
+            me.shadowOffset = 0;
+        }
+    },
+
+    enableShadow: function(show) {
+        var me = this;
+        
+        if (me.shadow && me.shadowDisabled) {
+            me.shadowDisabled = false;
+            me.shadowOffset = me.lastShadowOffset;
+            delete me.lastShadowOffset;
+            if (show) {
+                me.sync(true);
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Synchronize this Layer's associated elements, the shadow, and possibly the shim.
+     *
+     * This code can execute repeatedly in milliseconds,
+     * eg: dragging a Component configured liveDrag: true, or which has no ghost method
+     * so code size was sacrificed for efficiency (e.g. no getBox/setBox, no XY calls)
+     *
+     * @param {Boolean} doShow Pass true to ensure that the shadow is shown.
+     */
+    sync: function(doShow) {
+        var me = this,
+            shadow = me.shadow,
+            shadowPos, shimStyle, shadowSize,
+            shim, xy, x, y, w, h, shimIndex;
+            
+        if (me.preventSync) {
+            return;
+        }
+
+        if (!me.updating && me.isVisible() && (shadow || me.useShim)) {
+            shim = me.getShim();
+            xy = me[me.localXYNames.get]();
+            x = xy[0];
+            y = xy[1];
+            w = me.dom.offsetWidth;
+            h = me.dom.offsetHeight;
+
+            if (shadow && !me.shadowDisabled) {
+                if (doShow && !shadow.isVisible()) {
+                    shadow.show(me);
+                } else {
+                    shadow.realign(x, y, w, h);
+                }
+                if (shim) {
+                    // TODO: Determine how the shims zIndex is above the layer zIndex at this point
+                    shimIndex = shim.getStyle('z-index');
+                    if (shimIndex > me.zindex) {
+                        me.shim.setStyle('z-index', me.zindex - 2);
+                    }
+                    shim.show();
+                    // fit the shim behind the shadow, so it is shimmed too
+                    if (shadow.isVisible()) {
+                        shadowPos = shadow.el.getXY();
+                        shimStyle = shim.dom.style;
+                        shadowSize = shadow.el.getSize();
+                        if (Ext.supports.CSS3BoxShadow) {
+                            shadowSize.height += 6;
+                            shadowSize.width += 4;
+                            shadowPos[0] -= 2;
+                            shadowPos[1] -= 4;
+                        }
+                        shimStyle.left = (shadowPos[0]) + 'px';
+                        shimStyle.top = (shadowPos[1]) + 'px';
+                        shimStyle.width = (shadowSize.width) + 'px';
+                        shimStyle.height = (shadowSize.height) + 'px';
+                    } else {
+                        shim.setSize(w, h);
+                        shim[me.localXYNames.set](x, y);
+                    }
+                }
+            } else if (shim) {
+                // TODO: Determine how the shims zIndex is above the layer zIndex at this point
+                shimIndex = shim.getStyle('z-index');
+                if (shimIndex > me.zindex) {
+                    me.shim.setStyle('z-index', me.zindex - 2);
+                }
+                shim.show();
+                shim.setSize(w, h);
+                shim[me.localXYNames.set](x, y);
+            }
+        }
+        return me;
+    },
+
+    remove: function() {
+        this.hideUnders();
+        this.callParent();
+    },
+
+    // @private
+    beginUpdate: function() {
+        this.updating = true;
+    },
+
+    // @private
+    endUpdate: function() {
+        this.updating = false;
+        this.sync(true);
+    },
+
+    // @private
+    hideUnders: function() {
+        if (this.shadow) {
+            this.shadow.hide();
+        }
+        this.hideShim();
+    },
+
+    // @private
+    constrainXY: function() {
+        if (this.constrain) {
+            var vw = Ext.Element.getViewWidth(),
+                vh = Ext.Element.getViewHeight(),
+                s = Ext.getDoc().getScroll(),
+                xy = this.getXY(),
+                x = xy[0],
+                y = xy[1],
+                so = this.shadowOffset,
+                w = this.dom.offsetWidth + so,
+                h = this.dom.offsetHeight + so,
+                moved = false; // only move it if it needs it
+            // first validate right/bottom
+            if ((x + w) > vw + s.left) {
+                x = vw - w - so;
+                moved = true;
+            }
+            if ((y + h) > vh + s.top) {
+                y = vh - h - so;
+                moved = true;
+            }
+            // then make sure top/left isn't negative
+            if (x < s.left) {
+                x = s.left;
+                moved = true;
+            }
+            if (y < s.top) {
+                y = s.top;
+                moved = true;
+            }
+            if (moved) {
+                Ext.Layer.superclass.setXY.call(this, [x, y]);
+                this.sync();
+            }
+        }
+        return this;
+    },
+
+    getConstrainOffset: function() {
+        return this.shadowOffset;
+    },
+
+    // overridden Element method
+    setVisible: function(visible, animate, duration, callback, easing) {
+        var me = this,
+            cb;
+
+        // post operation processing
+        cb = function() {
+            if (visible) {
+                me.sync(true);
+            }
+            if (callback) {
+                callback();
+            }
+        };
+
+        // Hide shadow and shim if hiding
+        if (!visible) {
+            me.hideUnders(true);
+        }
+        me.callParent([visible, animate, duration, callback, easing]);
+        if (!animate) {
+            cb();
+        }
+        return me;
+    },
+
+    // @private
+    beforeFx: function() {
+        this.beforeAction();
+        return this.callParent(arguments);
+    },
+
+    // @private
+    afterFx: function() {
+        this.callParent(arguments);
+        this.sync(this.isVisible());
+    },
+
+    // @private
+    beforeAction: function() {
+        if (!this.updating && this.shadow) {
+            this.shadow.hide();
+        }
+    },
+
+    // overridden Element method
+    setLeft: function(left) {
+        this.callParent(arguments);
+        return this.sync();
+    },
+
+    setTop: function(top) {
+        this.callParent(arguments);
+        return this.sync();
+    },
+
+    setLeftTop: function(left, top) {
+        this.callParent(arguments);
+        return this.sync();
+    },
+
+    setLocalX: function() {
+        this.callParent(arguments);
+        return this.sync();
+    },
+
+    setLocalXY: function() {
+        this.callParent(arguments);
+        return this.sync();
+    },
+
+    setLocalY: function() {
+        this.callParent(arguments);
+        return this.sync();
+    },
+
+    setXY: function(xy, animate, duration, callback, easing) {
+        var me = this;
+        
+        // Callback will restore shadow state and call the passed callback
+        callback = me.createCB(callback);
+
+        me.fixDisplay();
+        me.beforeAction();
+        me.callParent([xy, animate, duration, callback, easing]);
+        if (!animate) {
+            callback();
+        }
+        return me;
+    },
+
+    // @private
+    createCB: function(callback) {
+        var me = this,
+            showShadow = me.shadow && me.shadow.isVisible();
+
+        return function() {
+            me.constrainXY();
+            me.sync(showShadow);
+            if (callback) {
+                callback();
+            }
+        };
+    },
+
+    // overridden Element method
+    setX: function(x, animate, duration, callback, easing) {
+        this.setXY([x, this.getY()], animate, duration, callback, easing);
+        return this;
+    },
+
+    // overridden Element method
+    setY: function(y, animate, duration, callback, easing) {
+        this.setXY([this.getX(), y], animate, duration, callback, easing);
+        return this;
+    },
+
+    // overridden Element method
+    setSize: function(w, h, animate, duration, callback, easing) {
+        var me = this;
+        
+        // Callback will restore shadow state and call the passed callback
+        callback = me.createCB(callback);
+
+        me.beforeAction();
+        me.callParent([w, h, animate, duration, callback, easing]);
+        if (!animate) {
+            callback();
+        }
+        return me;
+    },
+
+    // overridden Element method
+    setWidth: function(w, animate, duration, callback, easing) {
+        var me = this;
+        
+        // Callback will restore shadow state and call the passed callback
+        callback = me.createCB(callback);
+
+        me.beforeAction();
+        me.callParent([w, animate, duration, callback, easing]);
+        if (!animate) {
+            callback();
+        }
+        return me;
+    },
+
+    // overridden Element method
+    setHeight: function(h, animate, duration, callback, easing) {
+        var me = this;
+        
+        // Callback will restore shadow state and call the passed callback
+        callback = me.createCB(callback);
+
+        me.beforeAction();
+        me.callParent([h, animate, duration, callback, easing]);
+        if (!animate) {
+            callback();
+        }
+        return me;
+    },
+
+    // overridden Element method
+    setBounds: function(x, y, width, height, animate, duration, callback, easing) {
+        var me = this;
+        
+        // Callback will restore shadow state and call the passed callback
+        callback = me.createCB(callback);
+
+        me.beforeAction();
+        if (!animate) {
+            Ext.Layer.superclass.setXY.call(me, [x, y]);
+            Ext.Layer.superclass.setSize.call(me, width, height);
+            callback();
+        } else {
+            me.callParent([x, y, width, height, animate, duration, callback, easing]);
+        }
+        return me;
+    },
+
+    /**
+     * Sets the z-index of this layer and adjusts any shadow and shim z-indexes. The layer
+     * z-index is automatically incremented depending upon the presence of a shim or a
+     * shadow in so that it always shows above those two associated elements.
+     *
+     * Any shim, will be assigned the passed z-index. A shadow will be assigned the next
+     * highet z-index, and the Layer's element will receive the highest  z-index.
+     *
+     * @param {Number} zindex The new z-index to set
+     * @return {Ext.Layer} The Layer
+     */
+    setZIndex: function(zindex) {
+        var me = this;
+        
+        me.zindex = zindex;
+        if (me.getShim()) {
+            me.shim.setStyle('z-index', zindex++);
+        }
+        if (me.shadow) {
+            me.shadow.setZIndex(zindex++);
+        }
+        return me.setStyle('z-index', zindex);
+    },
+    
+    onOpacitySet: function(opacity){
+        var shadow = this.shadow;
+        if (shadow) {
+            shadow.setOpacity(opacity);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * The subclasses of this class provide actions to perform upon {@link Ext.form.Basic Form}s.
+ *
+ * Instances of this class are only created by a {@link Ext.form.Basic Form} when the Form needs to perform an action
+ * such as submit or load. The Configuration options listed for this class are set through the Form's action methods:
+ * {@link Ext.form.Basic#submit submit}, {@link Ext.form.Basic#load load} and {@link Ext.form.Basic#doAction doAction}
+ *
+ * The instance of Action which performed the action is passed to the success and failure callbacks of the Form's action
+ * methods ({@link Ext.form.Basic#submit submit}, {@link Ext.form.Basic#load load} and
+ * {@link Ext.form.Basic#doAction doAction}), and to the {@link Ext.form.Basic#actioncomplete actioncomplete} and
+ * {@link Ext.form.Basic#actionfailed actionfailed} event handlers.
+ */
+Ext.define('Ext.form.action.Action', {
+    alternateClassName: 'Ext.form.Action',
+
+    /**
+     * @cfg {Ext.form.Basic} form
+     * The {@link Ext.form.Basic BasicForm} instance that is invoking this Action. Required.
+     */
+
+    /**
+     * @cfg {String} url
+     * The URL that the Action is to invoke. Will default to the {@link Ext.form.Basic#url url} configured on the
+     * {@link #form}.
+     */
+
+    /**
+     * @cfg {Boolean} reset
+     * When set to **true**, causes the Form to be {@link Ext.form.Basic#reset reset} on Action success. If specified,
+     * this happens before the {@link #success} callback is called and before the Form's
+     * {@link Ext.form.Basic#actioncomplete actioncomplete} event fires.
+     */
+
+    /**
+     * @cfg {String} method
+     * The HTTP method to use to access the requested URL.
+     * Defaults to the {@link Ext.form.Basic#method BasicForm's method}, or 'POST' if not specified.
+     */
+
+    /**
+     * @cfg {Object/String} params
+     * Extra parameter values to pass. These are added to the Form's {@link Ext.form.Basic#baseParams} and passed to the
+     * specified URL along with the Form's input fields.
+     *
+     * Parameters are encoded as standard HTTP parameters using {@link Ext#urlEncode Ext.Object.toQueryString}.
+     */
+
+    /**
+     * @cfg {Object} headers
+     * Extra headers to be sent in the AJAX request for submit and load actions.
+     * See {@link Ext.data.proxy.Ajax#headers}.
+     * 
+     * **Note:** Headers are not sent during file upload.
+     */
+
+    /**
+     * @cfg {Number} timeout
+     * The number of seconds to wait for a server response before failing with the {@link #failureType} as
+     * {@link Ext.form.action.Action#CONNECT_FAILURE}. If not specified, defaults to the configured
+     * {@link Ext.form.Basic#timeout timeout} of the {@link #form}.
+     */
+
+    /**
+     * @cfg {Function} success
+     * The function to call when a valid success return packet is received.
+     * @cfg {Ext.form.Basic} success.form The form that requested the action
+     * @cfg {Ext.form.action.Action} success.action The Action class. The {@link #result} property of this object may
+     * be examined to perform custom postprocessing.
+     */
+
+    /**
+     * @cfg {Function} failure
+     * The function to call when a failure packet was received, or when an error ocurred in the Ajax communication.
+     * @cfg {Ext.form.Basic} failure.form The form that requested the action
+     * @cfg {Ext.form.action.Action} failure.action The Action class. If an Ajax error ocurred, the failure type will
+     * be in {@link #failureType}. The {@link #result} property of this object may be examined to perform custom
+     * postprocessing.
+     */
+
+    /**
+     * @cfg {Object} scope
+     * The scope in which to call the configured #success and #failure callback functions
+     * (the `this` reference for the callback functions).
+     */
+
+    /**
+     * @cfg {String} waitMsg
+     * The message to be displayed by a call to {@link Ext.window.MessageBox#wait} during the time the action is being
+     * processed.
+     */
+
+    /**
+     * @cfg {String} waitTitle
+     * The title to be displayed by a call to {@link Ext.window.MessageBox#wait} during the time the action is being
+     * processed.
+     */
+
+    /**
+     * @cfg {Boolean} submitEmptyText
+     * If set to true, the emptyText value will be sent with the form when it is submitted.
+     */
+    submitEmptyText : true,
+
+    /**
+     * @property {String} type
+     * The type of action this Action instance performs. Currently only "submit" and "load" are supported.
+     */
+
+    /**
+     * @property {String} failureType
+     * The type of failure detected will be one of these:
+     * {@link #CLIENT_INVALID}, {@link #SERVER_INVALID}, {@link #CONNECT_FAILURE}, or {@link #LOAD_FAILURE}.
+     *
+     * Usage:
+     *
+     *     var fp = new Ext.form.Panel({
+     *     ...
+     *     buttons: [{
+     *         text: 'Save',
+     *         formBind: true,
+     *         handler: function(){
+     *             if(fp.getForm().isValid()){
+     *                 fp.getForm().submit({
+     *                     url: 'form-submit.php',
+     *                     waitMsg: 'Submitting your data...',
+     *                     success: function(form, action){
+     *                         // server responded with success = true
+     *                         var result = action.{@link #result};
+     *                     },
+     *                     failure: function(form, action){
+     *                         if (action.{@link #failureType} === Ext.form.action.Action.CONNECT_FAILURE) {
+     *                             Ext.Msg.alert('Error',
+     *                                 'Status:'+action.{@link #response}.status+': '+
+     *                                 action.{@link #response}.statusText);
+     *                         }
+     *                         if (action.failureType === Ext.form.action.Action.SERVER_INVALID){
+     *                             // server responded with success = false
+     *                             Ext.Msg.alert('Invalid', action.{@link #result}.errormsg);
+     *                         }
+     *                     }
+     *                 });
+     *             }
+     *         }
+     *     },{
+     *         text: 'Reset',
+     *         handler: function(){
+     *             fp.getForm().reset();
+     *         }
+     *     }]
+     */
+
+    /**
+     * @property {Object} response
+     * The raw XMLHttpRequest object used to perform the action.
+     */
+
+    /**
+     * @property {Object} result
+     * The decoded response object containing a boolean `success` property and other, action-specific properties.
+     */
+
+    /**
+     * Creates new Action.
+     * @param {Object} [config] Config object.
+     */
+    constructor: function(config) {
+        if (config) {
+            Ext.apply(this, config);
+        }
+
+        // Normalize the params option to an Object
+        var params = config.params;
+        if (Ext.isString(params)) {
+            this.params = Ext.Object.fromQueryString(params);
+        }
+    },
+
+    /**
+     * @method
+     * Invokes this action using the current configuration.
+     */
+    run: Ext.emptyFn,
+
+    /**
+     * @private
+     * @method onSuccess
+     * Callback method that gets invoked when the action completes successfully. Must be implemented by subclasses.
+     * @param {Object} response
+     */
+
+    /**
+     * @private
+     * @method handleResponse
+     * Handles the raw response and builds a result object from it. Must be implemented by subclasses.
+     * @param {Object} response
+     */
+
+    /**
+     * @private
+     * Handles a failure response.
+     * @param {Object} response
+     */
+    onFailure : function(response){
+        this.response = response;
+        this.failureType = Ext.form.action.Action.CONNECT_FAILURE;
+        this.form.afterAction(this, false);
+    },
+
+    /**
+     * @private
+     * Validates that a response contains either responseText or responseXML and invokes
+     * {@link #handleResponse} to build the result object.
+     * @param {Object} response The raw response object.
+     * @return {Object/Boolean} The result object as built by handleResponse, or `true` if
+     * the response had empty responseText and responseXML.
+     */
+    processResponse : function(response){
+        this.response = response;
+        if (!response.responseText && !response.responseXML) {
+            return true;
+        }
+        return (this.result = this.handleResponse(response));
+    },
+
+    /**
+     * @private
+     * Build the URL for the AJAX request. Used by the standard AJAX submit and load actions.
+     * @return {String} The URL.
+     */
+    getUrl: function() {
+        return this.url || this.form.url;
+    },
+
+    /**
+     * @private
+     * Determine the HTTP method to be used for the request.
+     * @return {String} The HTTP method
+     */
+    getMethod: function() {
+        return (this.method || this.form.method || 'POST').toUpperCase();
+    },
+
+    /**
+     * @private
+     * Get the set of parameters specified in the BasicForm's baseParams and/or the params option.
+     * Items in params override items of the same name in baseParams.
+     * @return {Object} the full set of parameters
+     */
+    getParams: function() {
+        return Ext.apply({}, this.params, this.form.baseParams);
+    },
+
+    /**
+     * @private
+     * Creates a callback object.
+     */
+    createCallback: function() {
+        var me = this,
+            undef,
+            form = me.form;
+        return {
+            success: me.onSuccess,
+            failure: me.onFailure,
+            scope: me,
+            timeout: (this.timeout * 1000) || (form.timeout * 1000),
+            upload: form.fileUpload ? me.onSuccess : undef
+        };
+    },
+
+    statics: {
+        /**
+         * @property
+         * Failure type returned when client side validation of the Form fails thus aborting a submit action. Client
+         * side validation is performed unless {@link Ext.form.action.Submit#clientValidation} is explicitly set to
+         * false.
+         * @static
+         */
+        CLIENT_INVALID: 'client',
+
+        /**
+         * @property
+         * Failure type returned when server side processing fails and the {@link #result}'s `success` property is set to
+         * false.
+         *
+         * In the case of a form submission, field-specific error messages may be returned in the {@link #result}'s
+         * errors property.
+         * @static
+         */
+        SERVER_INVALID: 'server',
+
+        /**
+         * @property
+         * Failure type returned when a communication error happens when attempting to send a request to the remote
+         * server. The {@link #response} may be examined to provide further information.
+         * @static
+         */
+        CONNECT_FAILURE: 'connect',
+
+        /**
+         * @property
+         * Failure type returned when the response's `success` property is set to false, or no field values are returned
+         * in the response's data property.
+         * @static
+         */
+        LOAD_FAILURE: 'load'
+
+
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A class which handles loading of data from a server into the Fields of an {@link Ext.form.Basic}.
+ *
+ * Instances of this class are only created by a {@link Ext.form.Basic Form} when {@link Ext.form.Basic#load load}ing.
+ *
+ * ## Response Packet Criteria
+ *
+ * A response packet **must** contain:
+ *
+ *   - **`success`** property : Boolean
+ *   - **`data`** property : Object
+ *
+ * The `data` property contains the values of Fields to load. The individual value object for each Field is passed to
+ * the Field's {@link Ext.form.field.Field#setValue setValue} method.
+ *
+ * ## JSON Packets
+ *
+ * By default, response packets are assumed to be JSON, so for the following form load call:
+ *
+ *     var myFormPanel = new Ext.form.Panel({
+ *         title: 'Client and routing info',
+ *         renderTo: Ext.getBody(),
+ *         defaults: {
+ *             xtype: 'textfield'
+ *         },
+ *         items: [{
+ *             fieldLabel: 'Client',
+ *             name: 'clientName'
+ *         }, {
+ *             fieldLabel: 'Port of loading',
+ *             name: 'portOfLoading'
+ *         }, {
+ *             fieldLabel: 'Port of discharge',
+ *             name: 'portOfDischarge'
+ *         }]
+ *     });
+ *     myFormPanel.{@link Ext.form.Panel#getForm getForm}().{@link Ext.form.Basic#load load}({
+ *         url: '/getRoutingInfo.php',
+ *         params: {
+ *             consignmentRef: myConsignmentRef
+ *         },
+ *         failure: function(form, action) {
+ *             Ext.Msg.alert("Load failed", action.result.errorMessage);
+ *         }
+ *     });
+ *
+ * a **success response** packet may look like this:
+ *
+ *     {
+ *         success: true,
+ *         data: {
+ *             clientName: "Fred. Olsen Lines",
+ *             portOfLoading: "FXT",
+ *             portOfDischarge: "OSL"
+ *         }
+ *     }
+ *
+ * while a **failure response** packet may look like this:
+ *
+ *     {
+ *         success: false,
+ *         errorMessage: "Consignment reference not found"
+ *     }
+ *
+ * Other data may be placed into the response for processing the {@link Ext.form.Basic Form}'s callback or event handler
+ * methods. The object decoded from this JSON is available in the {@link Ext.form.action.Action#result result} property.
+ */
+Ext.define('Ext.form.action.Load', {
+    extend: Ext.form.action.Action ,
+                                      
+    alternateClassName: 'Ext.form.Action.Load',
+    alias: 'formaction.load',
+
+    type: 'load',
+
+    /**
+     * @private
+     */
+    run: function() {
+        Ext.Ajax.request(Ext.apply(
+            this.createCallback(),
+            {
+                method: this.getMethod(),
+                url: this.getUrl(),
+                headers: this.headers,
+                params: this.getParams()
+            }
+        ));
+    },
+
+    /**
+     * @private
+     */
+    onSuccess: function(response){
+        var result = this.processResponse(response),
+            form = this.form;
+        if (result === true || !result.success || !result.data) {
+            this.failureType = Ext.form.action.Action.LOAD_FAILURE;
+            form.afterAction(this, false);
+            return;
+        }
+        form.clearInvalid();
+        form.setValues(result.data);
+        form.afterAction(this, true);
+    },
+
+    /**
+     * @private
+     */
+    handleResponse: function(response) {
+        var reader = this.form.reader,
+            rs, data;
+        if (reader) {
+            rs = reader.read(response);
+            data = rs.records && rs.records[0] ? rs.records[0].data : null;
+            return {
+                success : rs.success,
+                data : data
+            };
+        }
+        return Ext.decode(response.responseText);
+    }
+});
+
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A class which handles submission of data from {@link Ext.form.Basic Form}s and processes the returned response.
+ *
+ * Instances of this class are only created by a {@link Ext.form.Basic Form} when
+ * {@link Ext.form.Basic#submit submit}ting.
+ *
+ * # Response Packet Criteria
+ *
+ * A response packet may contain:
+ *
+ *   - **`success`** property : Boolean - required.
+ *
+ *   - **`errors`** property : Object - optional, contains error messages for invalid fields.
+ *
+ * # JSON Packets
+ *
+ * By default, response packets are assumed to be JSON, so a typical response packet may look like this:
+ *
+ *     {
+ *         success: false,
+ *         errors: {
+ *             clientCode: "Client not found",
+ *             portOfLoading: "This field must not be null"
+ *         }
+ *     }
+ *
+ * Other data may be placed into the response for processing by the {@link Ext.form.Basic}'s callback or event handler
+ * methods. The object decoded from this JSON is available in the {@link Ext.form.action.Action#result result} property.
+ *
+ * Alternatively, if an {@link Ext.form.Basic#errorReader errorReader} is specified as an
+ * {@link Ext.data.reader.Xml XmlReader}:
+ *
+ *     errorReader: new Ext.data.reader.Xml({
+ *             record : 'field',
+ *             success: '@success'
+ *         }, [
+ *             'id', 'msg'
+ *         ]
+ *     )
+ *
+ * then the results may be sent back in XML format:
+ *
+ *     <?xml version="1.0" encoding="UTF-8"?>
+ *     <message success="false">
+ *     <errors>
+ *         <field>
+ *             <id>clientCode</id>
+ *             <msg><![CDATA[Code not found. <br /><i>This is a test validation message from the server </i>]]></msg>
+ *         </field>
+ *         <field>
+ *             <id>portOfLoading</id>
+ *             <msg><![CDATA[Port not found. <br /><i>This is a test validation message from the server </i>]]></msg>
+ *         </field>
+ *     </errors>
+ *     </message>
+ *
+ * Other elements may be placed into the response XML for processing by the {@link Ext.form.Basic}'s callback or event
+ * handler methods. The XML document is available in the {@link Ext.form.Basic#errorReader errorReader}'s
+ * {@link Ext.data.reader.Xml#xmlData xmlData} property.
+ */
+Ext.define('Ext.form.action.Submit', {
+    extend: Ext.form.action.Action ,
+    alternateClassName: 'Ext.form.Action.Submit',
+    alias: 'formaction.submit',
+
+    type: 'submit',
+
+    /**
+     * @cfg {Boolean} [clientValidation=true]
+     * Determines whether a Form's fields are validated in a final call to {@link Ext.form.Basic#isValid isValid} prior
+     * to submission. Pass false in the Form's submit options to prevent this.
+     */
+
+    // inherit docs
+    run : function(){
+        var me = this,
+            form = me.form;
+            
+        if (me.clientValidation === false || form.isValid()) {
+            me.doSubmit();
+        } else {
+            // client validation failed
+            me.failureType = Ext.form.action.Action.CLIENT_INVALID;
+            form.afterAction(me, false);
+        }
+    },
+
+    /**
+     * @private
+     * Performs the submit of the form data.
+     */
+    doSubmit: function() {
+        var me = this,
+            ajaxOptions = Ext.apply(me.createCallback(), {
+                url: me.getUrl(),
+                method: me.getMethod(),
+                headers: me.headers
+            }),
+            form = me.form,
+            jsonSubmit = me.jsonSubmit || form.jsonSubmit,
+            paramsProp = jsonSubmit ? 'jsonData' : 'params',
+            formEl, formInfo;
+
+        // For uploads we need to create an actual form that contains the file upload fields,
+        // and pass that to the ajax call so it can do its iframe-based submit method.
+        if (form.hasUpload()) {
+            formInfo = me.buildForm();
+            ajaxOptions.form = formInfo.formEl;
+            ajaxOptions.isUpload = true;
+        } else {
+            ajaxOptions[paramsProp] = me.getParams(jsonSubmit);
+        }
+
+        Ext.Ajax.request(ajaxOptions);
+        if (formInfo) {
+            me.cleanup(formInfo);
+        }
+    },
+    
+    cleanup: function(formInfo) {
+        var formEl = formInfo.formEl,
+            uploadEls = formInfo.uploadEls,
+            uploadFields = formInfo.uploadFields,
+            len = uploadFields.length,
+            i, field;
+            
+        for (i = 0; i < len; ++i) {
+            field = uploadFields[i];
+            if (!field.clearOnSubmit) {
+                field.restoreInput(uploadEls[i]);
+            }    
+        }
+        
+        if (formEl) {
+            Ext.removeNode(formEl);
+        }    
+    },
+
+    /**
+     * @private
+     * Builds the full set of parameters from the field values plus any additional configured params.
+     */
+    getParams: function(useModelValues) {
+        var falseVal = false,
+            configParams = this.callParent(),
+            fieldParams = this.form.getValues(falseVal, falseVal, this.submitEmptyText !== falseVal, useModelValues);
+        return Ext.apply({}, fieldParams, configParams);
+    },
+
+    /**
+     * @private
+     * Builds a form element containing fields corresponding to all the parameters to be
+     * submitted (everything returned by {@link #getParams}.
+     *
+     * NOTE: the form element is automatically added to the DOM, so any code that uses
+     * it must remove it from the DOM after finishing with it.
+     *
+     * @return {HTMLElement}
+     */
+    buildForm: function() {
+        var me = this,
+            fieldsSpec = [],
+            formSpec,
+            formEl,
+            basicForm = me.form,
+            params = me.getParams(),
+            uploadFields = [],
+            uploadEls = [],
+            fields = basicForm.getFields().items,
+            i,
+            len   = fields.length,
+            field, key, value, v, vLen,
+            el;
+
+        for (i = 0; i < len; ++i) {
+            field = fields[i];
+
+            // can only have a selected file value after being rendered
+            if (field.rendered && field.isFileUpload()) {
+                uploadFields.push(field);
+            }
+        }
+
+        for (key in params) {
+            if (params.hasOwnProperty(key)) {
+                value = params[key];
+
+                if (Ext.isArray(value)) {
+                    vLen = value.length;
+                    for (v = 0; v < vLen; v++) {
+                        fieldsSpec.push(me.getFieldConfig(key, value[v]));
+                    }
+                } else {
+                    fieldsSpec.push(me.getFieldConfig(key, value));
+                }
+            }
+        }
+
+        formSpec = {
+            tag: 'form',
+            action: me.getUrl(),
+            method: me.getMethod(),
+            target: me.target || '_self',
+            style: 'display:none',
+            cn: fieldsSpec
+        };
+
+        // Set the proper encoding for file uploads
+        if (uploadFields.length) {
+            formSpec.encoding = formSpec.enctype = 'multipart/form-data';
+        }
+
+        // Create the form
+        formEl = Ext.DomHelper.append(Ext.getBody(), formSpec);
+
+        // Special handling for file upload fields: since browser security measures prevent setting
+        // their values programatically, and prevent carrying their selected values over when cloning,
+        // we have to move the actual field instances out of their components and into the form.
+        len = uploadFields.length;
+
+        for (i = 0; i < len; ++i) {
+            el = uploadFields[i].extractFileInput();
+            formEl.appendChild(el);
+            uploadEls.push(el);
+        }
+
+        return {
+            formEl: formEl,
+            uploadFields: uploadFields,
+            uploadEls: uploadEls
+        };
+    },
+
+    getFieldConfig: function(name, value) {
+        return {
+            tag: 'input',
+            type: 'hidden',
+            name: name,
+            value: Ext.String.htmlEncode(value)
+        };
+    },
+
+    /**
+     * @private
+     */
+    onSuccess: function(response) {
+        var form = this.form,
+            success = true,
+            result = this.processResponse(response);
+        if (result !== true && !result.success) {
+            if (result.errors) {
+                form.markInvalid(result.errors);
+            }
+            this.failureType = Ext.form.action.Action.SERVER_INVALID;
+            success = false;
+        }
+        form.afterAction(this, success);
+    },
+
+    /**
+     * @private
+     */
+    handleResponse: function(response) {
+        var form = this.form,
+            errorReader = form.errorReader,
+            rs, errors, i, len, records, result;
+            
+        if (errorReader) {
+            rs = errorReader.read(response);
+            records = rs.records;
+            errors = [];
+            if (records) {
+                for(i = 0, len = records.length; i < len; i++) {
+                    errors[i] = records[i].data;
+                }
+            }
+            if (errors.length < 1) {
+                errors = null;
+            }
+            result = {
+                success : rs.success,
+                errors : errors
+            };
+        } else {
+            try {
+                result = Ext.decode(response.responseText);    
+            } catch (e) {
+                result = {
+                    success: false,
+                    errors: []
+                };
+            }
+            
+        }
+        return result;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A subclass of Ext.dd.DragTracker which handles dragging any Component.
+ *
+ * This is configured with a Component to be made draggable, and a config object for the {@link Ext.dd.DragTracker}
+ * class.
+ *
+ * A {@link #delegate} may be provided which may be either the element to use as the mousedown target or a {@link
+ * Ext.DomQuery} selector to activate multiple mousedown targets.
+ *
+ * When the Component begins to be dragged, its `beginDrag` method will be called if implemented.
+ *
+ * When the drag ends, its `endDrag` method will be called if implemented.
+ */
+Ext.define('Ext.util.ComponentDragger', {
+    extend:  Ext.dd.DragTracker ,
+
+    /**
+     * @cfg {Boolean} constrain
+     * Specify as `true` to constrain the Component to within the bounds of the {@link #constrainTo} region.
+     */
+
+    /**
+     * @cfg {String/Ext.Element} delegate
+     * A {@link Ext.DomQuery DomQuery} selector which identifies child elements within the Component's encapsulating
+     * Element which are the drag handles. This limits dragging to only begin when the matching elements are
+     * mousedowned.
+     *
+     * This may also be a specific child element within the Component's encapsulating element to use as the drag handle.
+     */
+
+    /**
+     * @cfg {Boolean} constrainDelegate
+     * Specify as `true` to constrain the drag handles within the {@link #constrainTo} region.
+     */
+
+    autoStart: 500,
+
+    /**
+     * Creates new ComponentDragger.
+     * @param {Object} comp The Component to provide dragging for.
+     * @param {Object} [config] Config object
+     */
+    constructor: function(comp, config) {
+        this.comp = comp;
+        this.initialConstrainTo = config.constrainTo;
+        this.callParent([ config ]);
+    },
+
+    onStart: function(e) {
+        var me = this,
+            comp = me.comp;
+
+        // Cache the start [X, Y] array
+        me.startPosition = comp.getXY();
+
+        // If client Component has a ghost method to show a lightweight version of itself
+        // then use that as a drag proxy unless configured to liveDrag.
+        if (comp.ghost && !comp.liveDrag) {
+             me.proxy = comp.ghost();
+             me.dragTarget = me.proxy.header.el;
+        }
+
+        // Set the constrainTo Region before we start dragging.
+        if (me.constrain || me.constrainDelegate) {
+            me.constrainTo = me.calculateConstrainRegion();
+        }
+
+        if (comp.beginDrag) {
+            comp.beginDrag();
+        }
+    },
+
+    calculateConstrainRegion: function() {
+        var me = this,
+            comp = me.comp,
+            constrainTo = me.initialConstrainTo,
+            constraintInsets = comp.constraintInsets,
+            constrainEl,
+            delegateRegion,
+            elRegion,
+            dragEl = me.proxy ? me.proxy.el : comp.el,
+            shadowSize = (!me.constrainDelegate && dragEl.shadow && comp.constrainShadow && !dragEl.shadowDisabled) ? dragEl.shadow.getShadowSize() : 0;
+
+        // The configured constrainTo might be a Region or an element
+        if (!(constrainTo instanceof Ext.util.Region)) {
+            constrainEl = Ext.fly(constrainTo);
+            constrainTo =  constrainEl.getViewRegion();
+
+            // Do not allow to move into vertical scrollbar
+            constrainTo.right = constrainTo.left + constrainEl.dom.clientWidth;
+        } else {
+            // Create a clone so we don't modify the original
+            constrainTo = constrainTo.copy();
+        }
+
+        // Apply constraintInsets
+        if (constraintInsets) {
+            constraintInsets = Ext.isObject(constraintInsets) ? constraintInsets : Ext.Element.parseBox(constraintInsets);
+            constrainTo.adjust(constraintInsets.top, constraintInsets.right, constraintInsets.bottom, constraintInsets.length);
+        }
+
+        // Reduce the constrain region to allow for shadow
+        if (shadowSize) {
+            constrainTo.adjust(shadowSize[0], -shadowSize[1], -shadowSize[2], shadowSize[3]);
+        }
+
+        // If they only want to constrain the *delegate* to within the constrain region,
+        // adjust the region to be larger based on the insets of the delegate from the outer
+        // edges of the Component.
+        if (!me.constrainDelegate) {
+            delegateRegion = Ext.fly(me.dragTarget).getRegion();
+            elRegion = dragEl.getRegion();
+
+            constrainTo.adjust(
+                delegateRegion.top - elRegion.top,
+                delegateRegion.right - elRegion.right,
+                delegateRegion.bottom - elRegion.bottom,
+                delegateRegion.left - elRegion.left
+            );
+        }
+        return constrainTo;
+    },
+
+    // Move either the ghost Component or the target Component to its new position on drag
+    onDrag: function(e) {
+        var me = this,
+            comp = (me.proxy && !me.comp.liveDrag) ? me.proxy : me.comp,
+            offset = me.getOffset(me.constrain || me.constrainDelegate ? 'dragTarget' : null);
+
+        comp.setPagePosition(me.startPosition[0] + offset[0], me.startPosition[1] + offset[1]);
+    },
+
+    onEnd: function(e) {
+        var comp = this.comp;
+        if (comp.isDestroyed || comp.destroying) {
+            return;
+        }
+        
+        if (this.proxy && !comp.liveDrag) {
+            comp.unghost();
+        }
+        if (comp.endDrag) {
+            comp.endDrag();
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A specialized panel intended for use as an application window. Windows are floated, {@link #resizable}, and
+ * {@link #cfg-draggable} by default. Windows can be {@link #maximizable maximized} to fill the viewport, restored to
+ * their prior size, and can be {@link #method-minimize}d.
+ *
+ * Windows can also be linked to a {@link Ext.ZIndexManager} or managed by the {@link Ext.WindowManager} to provide
+ * grouping, activation, to front, to back and other application-specific behavior.
+ *
+ * By default, Windows will be rendered to document.body. To {@link #constrain} a Window to another element specify
+ * {@link Ext.Component#renderTo renderTo}.
+ *
+ * **As with all {@link Ext.container.Container Container}s, it is important to consider how you want the Window to size
+ * and arrange any child Components. Choose an appropriate {@link #layout} configuration which lays out child Components
+ * in the required manner.**
+ *
+ *     @example
+ *     Ext.create('Ext.window.Window', {
+ *         title: 'Hello',
+ *         height: 200,
+ *         width: 400,
+ *         layout: 'fit',
+ *         items: {  // Let's put an empty grid in just to illustrate fit layout
+ *             xtype: 'grid',
+ *             border: false,
+ *             columns: [{header: 'World'}],                 // One header just for show. There's no data,
+ *             store: Ext.create('Ext.data.ArrayStore', {}) // A dummy empty data store
+ *         }
+ *     }).show();
+ */
+Ext.define('Ext.window.Window', {
+    extend:  Ext.panel.Panel ,
+
+    alternateClassName: 'Ext.Window',
+
+                                                                                   
+
+    alias: 'widget.window',
+
+    /**
+     * @cfg {Number} x
+     * The X position of the left edge of the window on initial showing. Defaults to centering the Window within the
+     * width of the Window's container {@link Ext.Element Element} (The Element that the Window is rendered to).
+     */
+
+    /**
+     * @cfg {Number} y
+     * The Y position of the top edge of the window on initial showing. Defaults to centering the Window within the
+     * height of the Window's container {@link Ext.Element Element} (The Element that the Window is rendered to).
+     */
+
+    /**
+     * @cfg {Boolean} [modal=false]
+     * True to make the window modal and mask everything behind it when displayed, false to display it without
+     * restricting access to other UI elements.
+     */
+
+    /**
+     * @cfg {String/Ext.Element} [animateTarget=null]
+     * Id or element from which the window should animate while opening.
+     */
+
+    /**
+     * @cfg {Boolean/Function} ghost
+     * Set to false to disable the ghost panel during dragging the window.
+     * Do note that you should not set this to true, by default it is a function.
+     */
+
+    /**
+     * @cfg {String/Number/Ext.Component} defaultFocus
+     * Specifies a Component to receive focus when this Window is focused.
+     *
+     * This may be one of:
+     *
+     *   - The index of a footer Button.
+     *   - The id or {@link Ext.AbstractComponent#itemId} of a descendant Component.
+     *   - A Component.
+     */
+
+    /**
+     * @cfg {Function} onEsc
+     * Allows override of the built-in processing for the escape key. Default action is to close the Window (performing
+     * whatever action is specified in {@link #closeAction}. To prevent the Window closing when the escape key is
+     * pressed, specify this as {@link Ext#emptyFn Ext.emptyFn}.
+     */
+
+    /**
+     * @cfg {Boolean} [collapsed=false]
+     * True to render the window collapsed, false to render it expanded. Note that if {@link #expandOnShow}
+     * is true (the default) it will override the `collapsed` config and the window will always be
+     * expanded when shown.
+     */
+
+    /**
+     * @cfg {Boolean} [maximized=false]
+     * True to initially display the window in a maximized state.
+     */
+    
+    /**
+     * @cfg {Boolean} [hideShadowOnDeactivate=false]
+     * True to hide this Window's shadow when another floating item in the same z-index stack is activated.
+     */
+
+    /**
+    * @cfg {String} [baseCls='x-window']
+    * The base CSS class to apply to this panel's element.
+    */
+    baseCls: Ext.baseCSSPrefix + 'window',
+
+    /**
+     * @cfg {Boolean/Object} resizable
+     * Specify as `true` to allow user resizing at each edge and corner of the window, false to disable resizing.
+     *
+     * This may also be specified as a config object to Ext.resizer.Resizer
+     */
+    resizable: true,
+
+    /**
+     * @cfg {Boolean} draggable
+     * True to allow the window to be dragged by the header bar, false to disable dragging. Note that
+     * by default the window will be centered in the viewport, so if dragging is disabled the window may need to be
+     * positioned programmatically after render (e.g., `myWindow.setPosition(100, 100);`).
+     */
+    draggable: true,
+
+    /**
+     * @override
+     * @cfg {Boolean} constrain
+     * True to constrain the window within its containing element, false to allow it to fall outside of its containing
+     * element. By default the window will be rendered to `document.body`. To render and constrain the window within
+     * another element specify {@link #renderTo}. Optionally the header only can be constrained
+     * using {@link #constrainHeader}.
+     */
+    constrain: false,
+
+    /**
+     * @override
+     * @cfg {Boolean} constrainHeader
+     * True to constrain the window header within its containing element (allowing the window body to fall outside of
+     * its containing element) or false to allow the header to fall outside its containing element.
+     * Optionally the entire window can be constrained using {@link #constrain}.
+     */
+    constrainHeader: false,
+
+    /**
+     * @cfg simpleDrag @hide
+     */
+
+    /**
+     * @cfg {Boolean} plain
+     * True to render the window body with a transparent background so that it will blend into the framing elements,
+     * false to add a lighter background color to visually highlight the body element and separate it more distinctly
+     * from the surrounding frame.
+     */
+    plain: false,
+
+    /**
+     * @cfg {Boolean} minimizable
+     * True to display the 'minimize' tool button and allow the user to minimize the window, false to hide the button
+     * and disallow minimizing the window. Note that this button provides no implementation -- the
+     * behavior of minimizing a window is implementation-specific, so the minimize event must be handled and a custom
+     * minimize behavior implemented for this option to be useful.
+     */
+    minimizable: false,
+
+    /**
+     * @cfg {Boolean} maximizable
+     * True to display the 'maximize' tool button and allow the user to maximize the window, false to hide the button
+     * and disallow maximizing the window. Note that when a window is maximized, the tool button
+     * will automatically change to a 'restore' button with the appropriate behavior already built-in that will restore
+     * the window to its previous size.
+     */
+    maximizable: false,
+
+    // inherit docs
+    minHeight: 50,
+
+    // inherit docs
+    minWidth: 50,
+
+    /**
+     * @cfg {Boolean} expandOnShow
+     * True to always expand the window when it is displayed, false to keep it in its current state (which may be
+     * {@link #collapsed}) when displayed.
+     */
+    expandOnShow: true,
+
+    // inherited docs, same default
+    collapsible: false,
+
+    /**
+     * @cfg {Boolean} closable
+     * True to display the 'close' tool button and allow the user to close the window, false to hide the button and
+     * disallow closing the window.
+     *
+     * By default, when close is requested by either clicking the close button in the header or pressing ESC when the
+     * Window has focus, the {@link #method-close} method will be called. This will _{@link Ext.Component#method-destroy destroy}_ the
+     * Window and its content meaning that it may not be reused.
+     *
+     * To make closing a Window _hide_ the Window so that it may be reused, set {@link #closeAction} to 'hide'.
+     */
+    closable: true,
+
+    /**
+     * @cfg {Boolean} hidden
+     * Render this Window hidden. If `true`, the {@link #method-hide} method will be called internally.
+     */
+    hidden: true,
+
+    /**
+     * @cfg {Boolean}
+     * @inheritdoc
+     * Windows render to the body on first show.
+     */
+    autoRender: true,
+
+    /**
+     * @cfg {String}
+     * @inheritdoc
+     * Windows hide using offsets in order to preserve the scroll positions of their descendants.
+     */
+    hideMode: 'offsets',
+
+    /**
+     * @property {Boolean}
+     * A Window is always floating.
+     * @private
+     * @readonly
+     */
+    floating: true,
+
+    itemCls: Ext.baseCSSPrefix + 'window-item',
+    
+    initialAlphaNum: /^[a-z0-9]/,
+
+    overlapHeader: true,
+
+    ignoreHeaderBorderManagement: true,
+
+    // Flag to Renderable to always look up the framing styles for this Component
+    alwaysFramed: true,
+    
+    // Buffer this so we don't recreate the same object
+    isRootCfg: {
+        isRoot: true    
+    },
+
+    /**
+     * @property {Boolean} isWindow
+     * `true` in this class to identify an object as an instantiated Window, or subclass thereof.
+     */
+    isWindow: true,
+
+    // @private
+    initComponent: function() {
+        var me = this;
+        // Explicitly set frame to false, since alwaysFramed is
+        // true, we only want to lookup framing in a specific instance
+        me.frame = false;
+        me.callParent();
+        me.addEvents(
+            /**
+             * @event activate
+             * Fires after the window has been visually activated via {@link #setActive}.
+             * @param {Ext.window.Window} this
+             */
+
+            /**
+             * @event deactivate
+             * Fires after the window has been visually deactivated via {@link #setActive}.
+             * @param {Ext.window.Window} this
+             */
+
+            /**
+             * @event resize
+             * Fires after the window has been resized.
+             * @param {Ext.window.Window} this
+             * @param {Number} width The window's new width
+             * @param {Number} height The window's new height
+             */
+            'resize',
+
+            /**
+             * @event maximize
+             * Fires after the window has been maximized.
+             * @param {Ext.window.Window} this
+             */
+            'maximize',
+
+            /**
+             * @event minimize
+             * Fires after the window has been minimized.
+             * @param {Ext.window.Window} this
+             */
+            'minimize',
+
+            /**
+             * @event restore
+             * Fires after the window has been restored to its original size after being maximized.
+             * @param {Ext.window.Window} this
+             */
+            'restore'
+        );
+
+        if (me.plain) {
+            me.addClsWithUI('plain');
+        }
+
+        if (me.modal) {
+            me.ariaRole = 'dialog';
+        }
+
+        me.addStateEvents(['maximize', 'restore', 'resize', 'dragend']);
+    },
+
+    getElConfig: function () {
+        var me = this,
+            elConfig;
+
+        elConfig = me.callParent();
+        elConfig.tabIndex = -1;
+        return elConfig;
+    },
+
+    // State Management
+    
+    // @private
+    getState: function() {
+        var me = this,
+            state = me.callParent() || {},
+            maximized = !!me.maximized,
+            ghostBox = me.ghostBox,
+            pos;
+
+        
+        state.maximized = maximized;
+        if (maximized) {
+            pos = me.restorePos;
+        } else if (ghostBox) {
+            // If we're animating a show, it will be from offscreen, so
+            // grab the position from the final box
+            pos = [ghostBox.x, ghostBox.y];
+        } else {
+            pos = me.getPosition();
+        }
+        Ext.apply(state, {
+            size: maximized ? me.restoreSize : me.getSize(),
+            pos: pos
+        });
+        return state;
+    },
+
+    applyState: function(state){
+        var me = this;
+
+        if (state) {
+            me.maximized = state.maximized;
+            if (me.maximized) {
+                me.hasSavedRestore = true;
+                me.restoreSize = state.size;
+                me.restorePos = state.pos;
+            } else {
+                Ext.apply(me, {
+                    width: state.size.width,
+                    height: state.size.height,
+                    x: state.pos[0],
+                    y: state.pos[1]
+                });
+            }
+        }
+    },
+
+    // @private
+    onRender: function(ct, position) {
+        var me = this;
+        me.callParent(arguments);
+        me.focusEl = me.el;
+
+        // Double clicking a header will toggleMaximize
+        if (me.maximizable) {
+            me.header.on({
+                scope: me,
+                dblclick: me.toggleMaximize
+            });
+        }
+    },
+
+    // @private
+    afterRender: function() {
+        var me = this,
+            header = me.header,
+            keyMap;
+
+        me.callParent();
+
+        // Initialize
+        if (me.maximized) {
+            me.maximized = false;
+            me.maximize();
+            if (header) {
+                header.removeCls(header.indicateDragCls)
+            }
+        }
+
+        if (me.closable) {
+            keyMap = me.getKeyMap();
+            keyMap.on(27, me.onEsc, me);
+        } else {
+            keyMap = me.keyMap;
+        }
+        if (keyMap && me.hidden) {
+            keyMap.disable();
+        }
+    },
+
+    // Override. Windows are always simple draggable, they do not use Ext.Panel.DDs
+    // The dd property in a Window is always a ComponentDragger
+    initDraggable: function() {
+        /**
+         * @property {Ext.util.ComponentDragger} dd
+         * If this Window is configured {@link #cfg-draggable}, this property will contain an instance of
+         * {@link Ext.util.ComponentDragger} (A subclass of {@link Ext.dd.DragTracker DragTracker}) which handles dragging
+         * the Window's DOM Element, and constraining according to the {@link #constrain} and {@link #constrainHeader} .
+         *
+         * This has implementations of `onBeforeStart`, `onDrag` and `onEnd` which perform the dragging action. If
+         * extra logic is needed at these points, use {@link Ext.Function#createInterceptor createInterceptor} or
+         * {@link Ext.Function#createSequence createSequence} to augment the existing implementations.
+         */
+        this.initSimpleDraggable();
+    },
+
+    initResizable: function(){
+        this.callParent(arguments);
+        if (this.maximized) {
+            this.resizer.disable();
+        }
+    },
+
+    // @private
+    onEsc: function(k, e) {
+        // Only process ESC if the FocusManager is not doing it
+        if (!Ext.FocusManager || !Ext.FocusManager.enabled || Ext.FocusManager.focusedCmp === this) {
+            e.stopEvent();
+            this.close();
+        }
+    },
+
+    // @private
+    beforeDestroy: function() {
+        var me = this;
+        if (me.rendered) {
+            delete this.animateTarget;
+            me.hide();
+            Ext.destroy(
+                me.keyMap
+            );
+        }
+        me.callParent();
+    },
+
+    /**
+     * @private
+     * Contribute class-specific tools to the header.
+     * Called by Panel's initTools.
+     */
+    addTools: function() {
+        var me = this;
+
+        // Call Panel's initTools
+        me.callParent();
+
+        if (me.minimizable) {
+            me.addTool({
+                type: 'minimize',
+                handler: Ext.Function.bind(me.minimize, me, [])
+            });
+        }
+        if (me.maximizable) {
+            me.addTool({
+                type: 'maximize',
+                handler: Ext.Function.bind(me.maximize, me, [])
+            });
+            me.addTool({
+                type: 'restore',
+                handler: Ext.Function.bind(me.restore, me, []),
+                hidden: true
+            });
+        }
+    },
+
+    /**
+     * @private
+     * Returns the focus holder element associated with this Window. By default, this is the Window's element.
+     * @returns {Ext.Element/Ext.Component} the focus holding element or Component.
+     */
+    getFocusEl: function() {
+        return this.getDefaultFocus();
+    },
+
+    /**
+     * Gets the configured default focus item.  If a {@link #defaultFocus} is set, it will
+     * receive focus when the Window's <code>focus</code> method is called, otherwise the
+     * Window itself will receive focus.
+     */
+    getDefaultFocus: function() {
+        var me = this,
+            result,
+            defaultComp = me.defaultButton || me.defaultFocus,
+            selector;
+
+        if (defaultComp !== undefined) {
+            // Number is index of Button
+            if (Ext.isNumber(defaultComp)) {
+                result = me.query('button')[defaultComp];
+            }
+            // String is ID or CQ selector
+            else if (Ext.isString(defaultComp)) {
+                selector = defaultComp;
+                
+                // Try id/itemId match if selector begins with alphanumeric
+                if (selector.match(me.initialAlphaNum)) {
+                    result = me.down('#' + selector);
+                }
+                // If not found, use as selector
+                if (!result) {
+                    result = me.down(selector);
+                }
+            }
+            // Otherwise, if it's got a focus method, use it
+            else if (defaultComp.focus) {
+                result = defaultComp;
+            }
+        }
+        return result || me.el;
+    },
+
+    /**
+     * @private
+     * Called when a Component's focusEl receives focus.
+     * If there is a valid default focus Component to jump to, focus that,
+     * otherwise continue as usual, focus this Component.
+     */
+    onFocus: function() {
+        var me = this,
+            focusDescendant;
+
+        // If the FocusManager is enabled, then we must noy jumpt to focus the default focus. We must focus the Window
+        if ((Ext.FocusManager && Ext.FocusManager.enabled) || ((focusDescendant = me.getDefaultFocus()) === me)) {
+            me.callParent(arguments);
+        } else {
+            focusDescendant.focus();
+        }
+    },
+
+    onShow: function() {
+        var me = this;
+
+        me.callParent(arguments);
+        if (me.expandOnShow) {
+            me.expand(false);
+        }
+        me.syncMonitorWindowResize();
+
+        if (me.keyMap) {
+            me.keyMap.enable();
+        }
+   },
+
+    // @private
+    doClose: function() {
+        var me = this;
+
+        // Being called as callback after going through the hide call below
+        if (me.hidden) {
+            me.fireEvent('close', me);
+            if (me.closeAction == 'destroy') {
+                this.destroy();
+            }
+        } else {
+            // close after hiding
+            me.hide(me.animateTarget, me.doClose, me);
+        }
+    },
+
+    // @private
+    afterHide: function() {
+        var me = this;
+
+        // No longer subscribe to resizing now that we're hidden
+        me.syncMonitorWindowResize();
+
+        // Turn off keyboard handling once window is hidden
+        if (me.keyMap) {
+            me.keyMap.disable();
+        }
+
+        // Perform superclass's afterHide tasks.
+        me.callParent(arguments);
+    },
+
+    // @private
+    onWindowResize: function() {
+        var me = this,
+            sizeModel;
+
+        if (me.maximized) {
+            me.fitContainer();
+        } else {
+            sizeModel = me.getSizeModel();
+            if (sizeModel.width.natural || sizeModel.height.natural) {
+                me.updateLayout();
+            }
+            me.doConstrain();
+        }
+
+    },
+
+    /**
+     * Placeholder method for minimizing the window. By default, this method simply fires the {@link #event-minimize} event
+     * since the behavior of minimizing a window is application-specific. To implement custom minimize behavior, either
+     * the minimize event can be handled or this method can be overridden.
+     * @return {Ext.window.Window} this
+     */
+    minimize: function() {
+        this.fireEvent('minimize', this);
+        return this;
+    },
+    
+    resumeHeaderLayout: function(changed) {
+        this.header.resumeLayouts(changed ? this.isRootCfg : null);    
+    },
+
+    afterCollapse: function() {
+        var me = this,
+            header = me.header,
+            tools = me.tools;
+
+        if (header && me.maximizable) {
+            header.suspendLayouts();
+            tools.maximize.hide();
+            tools.restore.hide();
+            this.resumeHeaderLayout(true);
+        }
+        if (me.resizer) {
+            me.resizer.disable();
+        }
+        me.callParent(arguments);
+    },
+
+    afterExpand: function() {
+        var me = this,
+            header = me.header,
+            tools = me.tools,
+            changed;
+
+        
+        if (header) {
+            header.suspendLayouts();
+            if (me.maximized) {
+                tools.restore.show();
+                changed = true;
+            } else if (me.maximizable) {
+                tools.maximize.show();
+                changed = true;
+            }
+            this.resumeHeaderLayout(changed);
+        }
+        if (me.resizer) {
+            me.resizer.enable();
+        }
+        me.callParent(arguments);
+    },
+
+    /**
+     * Fits the window within its current container and automatically replaces the {@link #maximizable 'maximize' tool
+     * button} with the 'restore' tool button. Also see {@link #toggleMaximize}.
+     * @param {Boolean} animate `true` to animate this Window to full size.
+     * @return {Ext.window.Window} this
+     */
+    maximize: function(animate) {
+        var me = this,
+            header = me.header,
+            tools = me.tools,
+            changed;
+
+        if (!me.maximized) {
+            me.expand(false);
+            if (!me.hasSavedRestore) {
+                me.restoreSize = me.getSize();
+                me.restorePos = me.getPosition(true);
+            }
+
+            // Manipulate visibility of header tools if there is a header
+            if (header) {
+                header.suspendLayouts();
+                if (tools.maximize) {
+                    tools.maximize.hide();
+                    changed = true;
+                }
+                if (tools.restore) {
+                    tools.restore.show();
+                    changed = true;
+                }
+                if (me.collapseTool) {
+                    me.collapseTool.hide();
+                    changed = true;
+                }
+                me.resumeHeaderLayout(changed);
+            }
+
+            me.maximized = true;
+            me.el.disableShadow();
+
+            if (me.dd) {
+                me.dd.disable();
+                if (header) {
+                   header.removeCls(header.indicateDragCls)
+                }
+            }
+            if (me.resizer) {
+                me.resizer.disable();
+            }
+            
+            me.el.addCls(Ext.baseCSSPrefix + 'window-maximized');
+            me.container.addCls(Ext.baseCSSPrefix + 'window-maximized-ct');
+
+            me.syncMonitorWindowResize();
+            me.fitContainer(animate = (animate || !!me.animateTarget) ? {
+                callback: function() {
+                    me.fireEvent('maximize', me);
+                }
+            } : null);
+            if (!animate) {
+                me.fireEvent('maximize', me);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Restores a {@link #maximizable maximized} window back to its original size and position prior to being maximized
+     * and also replaces the 'restore' tool button with the 'maximize' tool button. Also see {@link #toggleMaximize}.
+     * @return {Ext.window.Window} this
+     */
+    restore: function(animate) {
+        var me = this,
+            tools = me.tools,
+            header = me.header,
+            newBox = me.restoreSize,
+            changed;
+
+        if (me.maximized) {
+            me.hasSavedRestore = null;
+            me.removeCls(Ext.baseCSSPrefix + 'window-maximized');
+
+            // Manipulate visibility of header tools if there is a header
+            if (header) {
+                header.suspendLayouts();
+                if (tools.restore) {
+                    tools.restore.hide();
+                    changed = true;
+                }
+                if (tools.maximize) {
+                    tools.maximize.show();
+                    changed = true;
+                }
+                if (me.collapseTool) {
+                    me.collapseTool.show();
+                    changed = true;
+                }
+                me.resumeHeaderLayout(changed);
+            }
+
+            me.maximized = false;
+
+            // Restore the position/sizing
+            newBox.x = me.restorePos[0];
+            newBox.y = me.restorePos[1];
+            me.setBox(newBox, animate = (animate || !!me.animateTarget) ? {
+                callback: function() {
+                    me.el.enableShadow(true);
+                    me.fireEvent('restore', me);
+                }
+            } : null);
+
+            // Unset old position/sizing
+            me.restorePos = me.restoreSize = null;
+
+            // Allow users to drag and drop again
+            if (me.dd) {
+                me.dd.enable();
+                if (header) {
+                    header.addCls(header.indicateDragCls)
+                }
+            }
+            
+            if (me.resizer) {
+                me.resizer.enable();
+            }
+
+            me.container.removeCls(Ext.baseCSSPrefix + 'window-maximized-ct');
+
+            me.syncMonitorWindowResize();
+
+            if (!animate) {
+                me.el.enableShadow(true);
+                me.fireEvent('restore', me);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Synchronizes the presence of our listener for window resize events. This method
+     * should be called whenever this status might change.
+     * @private
+     */
+    syncMonitorWindowResize: function () {
+        var me = this,
+            currentlyMonitoring = me._monitoringResize,
+            // all the states where we should be listening to window resize:
+            yes = me.monitorResize || me.constrain || me.constrainHeader || me.maximized,
+            // all the states where we veto this:
+            veto = me.hidden || me.destroying || me.isDestroyed;
+
+        if (yes && !veto) {
+            // we should be listening...
+            if (!currentlyMonitoring) {
+                // but we aren't, so set it up.
+                // Delay so that we jump over any Viewport resize activity
+                Ext.EventManager.onWindowResize(me.onWindowResize, me, {delay: 1});
+                me._monitoringResize = true;
+            }
+        } else if (currentlyMonitoring) {
+            // we should not be listening, but we are, so tear it down
+            Ext.EventManager.removeResizeListener(me.onWindowResize, me);
+            me._monitoringResize = false;
+        }
+    },
+
+    /**
+     * A shortcut method for toggling between {@link #method-maximize} and {@link #method-restore} based on the current maximized
+     * state of the window.
+     * @return {Ext.window.Window} this
+     */
+    toggleMaximize: function() {
+        return this[this.maximized ? 'restore': 'maximize']();
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A mixin which allows a component to be configured and decorated with a label and/or error message as is
+ * common for form fields. This is used by e.g. Ext.form.field.Base and Ext.form.FieldContainer
+ * to let them be managed by the Field layout.
+ *
+ * NOTE: This mixin is mainly for internal library use and most users should not need to use it directly. It
+ * is more likely you will want to use one of the component classes that import this mixin, such as
+ * Ext.form.field.Base or Ext.form.FieldContainer.
+ *
+ * Use of this mixin does not make a component a field in the logical sense, meaning it does not provide any
+ * logic or state related to values or validation; that is handled by the related Ext.form.field.Field
+ * mixin. These two mixins may be used separately (for example Ext.form.FieldContainer is Labelable but not a
+ * Field), or in combination (for example Ext.form.field.Base implements both and has logic for connecting the
+ * two.)
+ *
+ * Component classes which use this mixin should use the Field layout
+ * or a derivation thereof to properly size and position the label and message according to the component config.
+ * They must also call the {@link #initLabelable} method during component initialization to ensure the mixin gets
+ * set up correctly.
+ *
+ * @docauthor Jason Johnston <jason at sencha.com>
+ */
+Ext.define("Ext.form.Labelable", {
+                                
+
+    autoEl: {
+        tag: 'table',
+        cellpadding: 0
+    },
+
+    childEls: [
+        /**
+         * @property {Ext.Element} labelCell
+         * The `<TD>` Element which contains the label Element for this component. Only available after the component has been rendered.
+         */
+        'labelCell',
+
+        /**
+         * @property {Ext.Element} labelEl
+         * The label Element for this component. Only available after the component has been rendered.
+         */
+        'labelEl',
+
+        /**
+         * @property {Ext.Element} bodyEl
+         * The div Element wrapping the component's contents. Only available after the component has been rendered.
+         */
+        'bodyEl',
+
+        // private - the TD which contains the msgTarget: 'side' error icon
+        'sideErrorCell',
+
+        /**
+         * @property {Ext.Element} errorEl
+         * The div Element that will contain the component's error message(s). Note that depending on the configured
+         * {@link #msgTarget}, this element may be hidden in favor of some other form of presentation, but will always
+         * be present in the DOM for use by assistive technologies.
+         */
+        'errorEl',
+
+        'inputRow'
+    ],
+
+    /**
+     * @cfg {String/String[]/Ext.XTemplate} labelableRenderTpl
+     * The rendering template for the field decorations. Component classes using this mixin
+     * should include logic to use this as their {@link Ext.AbstractComponent#renderTpl renderTpl},
+     * and implement the {@link #getSubTplMarkup} method to generate the field body content.
+     *
+     * The structure of a field is a table as follows:
+     * 
+     * If `labelAlign: 'left', `msgTarget: 'side'`
+     * 
+     *      +----------------------+----------------------+-------------+
+     *      | Label:               | InputField           | sideErrorEl |
+     *      +----------------------+----------------------+-------------+
+     *
+     * If `labelAlign: 'left', `msgTarget: 'under'`
+     * 
+     *      +----------------------+------------------------------------+
+     *      | Label:               | InputField      (colspan=2)        |
+     *      |                      | underErrorEl                       |
+     *      +----------------------+------------------------------------+
+     *
+     * If `labelAlign: 'top', `msgTarget: 'side'`
+     *
+     *      +---------------------------------------------+-------------+
+     *      | label                                       |             |
+     *      | InputField                                  | sideErrorEl |
+     *      +---------------------------------------------+-------------+
+     *
+     * If `labelAlign: 'top', `msgTarget: 'under'`
+     * 
+     *      +-----------------------------------------------------------+
+     *      | label                                                     |
+     *      | InputField                      (colspan=2)               |
+     *      | underErrorEl                                              |
+     *      +-----------------------------------------------------------+
+     *
+     * The total columns always the same for fields with each setting of {@link #labelAlign} because when
+     * rendered into a {@link Ext.layout.container.Form} layout, just the `TR` of the table
+     * will be placed into the form's main `TABLE`, and the columns of all the siblings
+     * must match so that they all line up. In a {@link Ext.layout.container.Form} layout, different
+     * settings of {@link #labelAlign} are not supported because of the incompatible column structure.
+     *
+     * When the triggerCell or side error cell are hidden or shown, the input cell's colspan
+     * is recalculated to maintain the correct 3 visible column count.
+     * @private
+     */
+    labelableRenderTpl: [
+
+        // body row. If a heighted Field (eg TextArea, HtmlEditor, this must greedily consume height.
+        '<tr role="presentation" id="{id}-inputRow" <tpl if="inFormLayout">id="{id}"</tpl> class="{inputRowCls}">',
+
+            // Label cell
+            '<tpl if="labelOnLeft">',
+                '<td role="presentation" id="{id}-labelCell" style="{labelCellStyle}" {labelCellAttrs}>',
+                    '{beforeLabelTpl}',
+                    '<label id="{id}-labelEl" {labelAttrTpl}<tpl if="inputId"> for="{inputId}"</tpl> class="{labelCls}"',
+                        '<tpl if="labelStyle"> style="{labelStyle}"</tpl>',
+                        // Required for Opera
+                        ' unselectable="on"',
+                    '>',
+                        '{beforeLabelTextTpl}',
+                        '<tpl if="fieldLabel">{fieldLabel}{labelSeparator}</tpl>',
+                        '{afterLabelTextTpl}',
+                    '</label>',
+                    '{afterLabelTpl}',
+                '</td>',
+            '</tpl>',
+
+            // Body of the input. That will be an input element, or, from a TriggerField, a table containing an input cell and trigger cell(s)
+            '<td role="presentation" class="{baseBodyCls} {fieldBodyCls} {extraFieldBodyCls}" id="{id}-bodyEl" colspan="{bodyColspan}" role="presentation">',
+                '{beforeBodyEl}',
+
+                // Label just sits on top of the input field if labelAlign === 'top'
+                '<tpl if="labelAlign==\'top\'">',
+                    '{beforeLabelTpl}',
+                    '<div role="presentation" id="{id}-labelCell" style="{labelCellStyle}">',
+                        '<label id="{id}-labelEl" {labelAttrTpl}<tpl if="inputId"> for="{inputId}"</tpl> class="{labelCls}"',
+                            '<tpl if="labelStyle"> style="{labelStyle}"</tpl>',
+                            // Required for Opera
+                            ' unselectable="on"',
+                        '>',
+                            '{beforeLabelTextTpl}',
+                            '<tpl if="fieldLabel">{fieldLabel}{labelSeparator}</tpl>',
+                            '{afterLabelTextTpl}',
+                        '</label>',
+                    '</div>',
+                    '{afterLabelTpl}',
+                '</tpl>',
+
+                '{beforeSubTpl}',
+                '{[values.$comp.getSubTplMarkup(values)]}',
+                '{afterSubTpl}',
+
+            // Final TD. It's a side error element unless there's a floating external one
+            '<tpl if="msgTarget===\'side\'">',
+                '{afterBodyEl}',
+                '</td>',
+                '<td role="presentation" id="{id}-sideErrorCell" vAlign="{[values.labelAlign===\'top\' && !values.hideLabel ? \'bottom\' : \'middle\']}" style="{[values.autoFitErrors ? \'display:none\' : \'\']}" width="{errorIconWidth}">',
+                    '<div role="presentation" id="{id}-errorEl" class="{errorMsgCls}" style="display:none"></div>',
+                '</td>',
+            '<tpl elseif="msgTarget==\'under\'">',
+                '<div role="presentation" id="{id}-errorEl" class="{errorMsgClass}" colspan="2" style="display:none"></div>',
+                '{afterBodyEl}',
+                '</td>',
+            '</tpl>',
+        '</tr>',
+        {
+            disableFormats: true
+        }
+    ],
+
+    /**
+     * @cfg {String/String[]/Ext.XTemplate} activeErrorsTpl
+     * The template used to format the Array of error messages passed to {@link #setActiveErrors} into a single HTML
+     * string. if the {@link #msgTarget} is title, it defaults to a list separated by new lines. Otherwise, it 
+     * renders each message as an item in an unordered list.
+     */
+    activeErrorsTpl: undefined,
+
+    htmlActiveErrorsTpl: [
+        '<tpl if="errors && errors.length">',
+            '<ul class="{listCls}"><tpl for="errors"><li role="alert">{.}</li></tpl></ul>',
+        '</tpl>'
+    ],
+    
+    plaintextActiveErrorsTpl: [
+        '<tpl if="errors && errors.length">',
+            '<tpl for="errors"><tpl if="xindex > 1">\n</tpl>{.}</tpl>',
+        '</tpl>'
+    ],
+
+    /**
+     * @property {Boolean} isFieldLabelable
+     * Flag denoting that this object is labelable as a field. Always true.
+     */
+    isFieldLabelable: true,
+
+    /**
+     * @cfg {String} formItemCls
+     * A CSS class to be applied to the outermost element to denote that it is participating in the form field layout.
+     */
+    formItemCls: Ext.baseCSSPrefix + 'form-item',
+
+    /**
+     * @cfg {String} labelCls
+     * The CSS class to be applied to the label element. This (single) CSS class is used to formulate the renderSelector
+     * and drives the field layout where it is concatenated with a hyphen ('-') and {@link #labelAlign}. To add
+     * additional classes, use {@link #labelClsExtra}.
+     */
+    labelCls: Ext.baseCSSPrefix + 'form-item-label',
+
+    /**
+     * @cfg {String} labelClsExtra
+     * An optional string of one or more additional CSS classes to add to the label element. Defaults to empty.
+     */
+
+    /**
+     * @cfg {String} errorMsgCls
+     * The CSS class to be applied to the error message element.
+     */
+    errorMsgCls: Ext.baseCSSPrefix + 'form-error-msg',
+
+    /**
+     * @cfg {String} baseBodyCls
+     * The CSS class to be applied to the body content element.
+     */
+    baseBodyCls: Ext.baseCSSPrefix + 'form-item-body',
+
+    // private
+    inputRowCls: Ext.baseCSSPrefix + 'form-item-input-row',
+
+    /**
+     * @cfg {String} fieldBodyCls
+     * An extra CSS class to be applied to the body content element in addition to {@link #baseBodyCls}.
+     */
+    fieldBodyCls: '',
+
+    /**
+     * @cfg {String} clearCls
+     * The CSS class to be applied to the special clearing div rendered directly after the field contents wrapper to
+     * provide field clearing.
+     */
+    clearCls: Ext.baseCSSPrefix + 'clear',
+
+    /**
+     * @cfg {String} invalidCls
+     * The CSS class to use when marking the component invalid.
+     */
+    invalidCls : Ext.baseCSSPrefix + 'form-invalid',
+
+    /**
+     * @cfg {String} fieldLabel
+     * The label for the field. It gets appended with the {@link #labelSeparator}, and its position and sizing is
+     * determined by the {@link #labelAlign}, {@link #labelWidth}, and {@link #labelPad} configs.
+     */
+    fieldLabel: undefined,
+
+    /**
+     * @cfg {String} labelAlign
+     * Controls the position and alignment of the {@link #fieldLabel}. Valid values are:
+     *
+     *   - "left" (the default) - The label is positioned to the left of the field, with its text aligned to the left.
+     *     Its width is determined by the {@link #labelWidth} config.
+     *   - "top" - The label is positioned above the field.
+     *   - "right" - The label is positioned to the left of the field, with its text aligned to the right.
+     *     Its width is determined by the {@link #labelWidth} config.
+     */
+    labelAlign : 'left',
+
+    /**
+     * @cfg {Number} labelWidth
+     * The width of the {@link #fieldLabel} in pixels. Only applicable if the {@link #labelAlign} is set to "left" or
+     * "right".
+     */
+    labelWidth: 100,
+
+    /**
+     * @cfg {Number} labelPad
+     * The amount of space in pixels between the {@link #fieldLabel} and the input field.
+     */
+    labelPad : 5,
+
+    //<locale>
+    /**
+     * @cfg {String} labelSeparator
+     * Character(s) to be inserted at the end of the {@link #fieldLabel label text}.
+     *
+     * Set to empty string to hide the separator completely.
+     */
+    labelSeparator : ':',
+    //</locale>
+
+    /**
+     * @cfg {String} labelStyle
+     * A CSS style specification string to apply directly to this field's label.
+     */
+
+    /**
+     * @cfg {Boolean} hideLabel
+     * Set to true to completely hide the label element ({@link #fieldLabel} and {@link #labelSeparator}). Also see
+     * {@link #hideEmptyLabel}, which controls whether space will be reserved for an empty fieldLabel.
+     */
+    hideLabel: false,
+
+    /**
+     * @cfg {Boolean} hideEmptyLabel
+     * When set to true, the label element ({@link #fieldLabel} and {@link #labelSeparator}) will be automatically
+     * hidden if the {@link #fieldLabel} is empty. Setting this to false will cause the empty label element to be
+     * rendered and space to be reserved for it; this is useful if you want a field without a label to line up with
+     * other labeled fields in the same form.
+     *
+     * If you wish to unconditionall hide the label even if a non-empty fieldLabel is configured, then set the
+     * {@link #hideLabel} config to true.
+     */
+    hideEmptyLabel: true,
+
+    /**
+     * @cfg {Boolean} preventMark
+     * true to disable displaying any {@link #setActiveError error message} set on this object.
+     */
+    preventMark: false,
+
+    /**
+     * @cfg {Boolean} autoFitErrors
+     * Whether to adjust the component's body area to make room for 'side' or 'under' {@link #msgTarget error messages}.
+     */
+    autoFitErrors: true,
+
+    /**
+     * @cfg {String} msgTarget
+     * The location where the error message text should display. Must be one of the following values:
+     *
+     *   - `qtip` Display a quick tip containing the message when the user hovers over the field.
+     *     This is the default.
+     *
+     *     **{@link Ext.tip.QuickTipManager#init} must have been called for this setting to work.**
+     *
+     *   - `title` Display the message in a default browser title attribute popup.
+     *   - `under` Add a block div beneath the field containing the error message.
+     *   - `side` Add an error icon to the right of the field, displaying the message in a popup on hover.
+     *   - `none` Don't display any error message. This might be useful if you are implementing custom error display.
+     *   - `[element id]` Add the error message directly to the innerHTML of the specified element.
+     */
+    msgTarget: 'qtip',
+
+    /**
+     * @cfg {String} activeError
+     * If specified, then the component will be displayed with this value as its active error when first rendered. Use
+     * {@link #setActiveError} or {@link #unsetActiveError} to change it after component creation.
+     */
+
+    /**
+     * @private
+     * Tells the layout system that the height can be measured immediately because the width does not need setting.
+     */
+    noWrap: true,
+
+    labelableInsertions: [
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} beforeBodyEl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * at the beginning of the input containing element. If an `XTemplate` is used, the component's {@link Ext.AbstractComponent#renderData render data}
+         * serves as the context.
+         */
+        'beforeBodyEl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} afterBodyEl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * at the end of the input containing element. If an `XTemplate` is used, the component's {@link Ext.AbstractComponent#renderData render data}
+         * serves as the context.
+         */
+        'afterBodyEl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} beforeLabelTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * before the label element. If an `XTemplate` is used, the component's {@link Ext.AbstractComponent#renderData render data}
+         * serves as the context.
+         */
+        'beforeLabelTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} afterLabelTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * after the label element. If an `XTemplate` is used, the component's {@link Ext.AbstractComponent#renderData render data}
+         * serves as the context.
+         */
+        'afterLabelTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} beforeSubTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * before the {@link #getSubTplMarkup subTpl markup}. If an `XTemplate` is used, the
+         * component's {@link Ext.AbstractComponent#renderData render data} serves as the context.
+         */
+        'beforeSubTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} afterSubTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * after the {@link #getSubTplMarkup subTpl markup}. If an `XTemplate` is used, the
+         * component's {@link Ext.AbstractComponent#renderData render data} serves as the context.
+         */
+        'afterSubTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} beforeLabelTextTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * before the label text. If an `XTemplate` is used, the component's {@link Ext.AbstractComponent#renderData render data}
+         * serves as the context.
+         */
+        'beforeLabelTextTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} afterLabelTextTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * after the label text. If an `XTemplate` is used, the component's {@link Ext.AbstractComponent#renderData render data}
+         * serves as the context.
+         */
+        'afterLabelTextTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} labelAttrTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * inside the label element (as attributes). If an `XTemplate` is used, the component's
+         * {@link Ext.AbstractComponent#renderData render data} serves as the context.
+         */
+        'labelAttrTpl'
+    ],
+
+    // This is an array to avoid a split on every call to Ext.copyTo
+    labelableRenderProps: ['allowBlank', 'id', 'labelAlign', 'fieldBodyCls', 'extraFieldBodyCls', 
+        'baseBodyCls', 'clearCls', 'labelSeparator', 'msgTarget', 'inputRowCls'],
+
+    /**
+     * Performs initialization of this mixin. Component classes using this mixin should call this method during their
+     * own initialization.
+     */
+    initLabelable: function() {
+        var me = this,
+            padding = me.padding;
+
+        // This Component is rendered as a table. Padding doesn't work on tables
+        // Before padding can be applied to the encapsulating table element, copy the padding into
+        // an extraMargins property which is to be added to all computed margins post render :(
+        if (padding) {
+            me.padding = undefined;
+            me.extraMargins = Ext.Element.parseBox(padding);
+        }
+        
+        if (!me.activeErrorsTpl) {
+            if (me.msgTarget == 'title') {
+                me.activeErrorsTpl = me.plaintextActiveErrorsTpl;
+            } else {
+                me.activeErrorsTpl = me.htmlActiveErrorsTpl;
+            }
+        }
+
+        me.addCls(Ext.plainTableCls);
+        me.addCls(me.formItemCls);
+        
+        // Prevent first render of active error, at Field render time from signalling a change from undefined to "
+        me.lastActiveError = '';
+
+        me.addEvents(
+            /**
+             * @event errorchange
+             * Fires when the active error message is changed via {@link #setActiveError}.
+             * @param {Ext.form.Labelable} this
+             * @param {String} error The active error message
+             */
+            'errorchange'
+        );
+
+        // bubbleEvents on the prototype of a mixin won't work, so call enableBubble
+        me.enableBubble('errorchange');
+    },
+
+    /**
+     * Returns the trimmed label by slicing off the label separator character. Can be overridden.
+     * @return {String} The trimmed field label, or empty string if not defined
+     */
+    trimLabelSeparator: function() {
+        var me = this,
+            separator = me.labelSeparator,
+            label = me.fieldLabel || '',
+            lastChar = label.substr(label.length - 1);
+
+        // if the last char is the same as the label separator then slice it off otherwise just return label value
+        return lastChar === separator ? label.slice(0, -1) : label;
+    },
+
+    /**
+     * Returns the label for the field. Defaults to simply returning the {@link #fieldLabel} config. Can be overridden
+     * to provide a custom generated label.
+     * @template
+     * @return {String} The configured field label, or empty string if not defined
+     */
+    getFieldLabel: function() {
+        return this.trimLabelSeparator();
+    },
+    
+    /**
+     * Set the label of this field.
+     * @param {String} label The new label. The {@link #labelSeparator} will be automatically appended to the label
+     * string.
+     */
+    setFieldLabel: function(label){
+        label = label || '';
+        
+        var me = this,
+            separator = me.labelSeparator,
+            labelEl = me.labelEl;
+        
+        me.fieldLabel = label;
+        if (me.rendered) {
+            if (Ext.isEmpty(label) && me.hideEmptyLabel) {
+                labelEl.parent().setDisplayed('none');
+            } else {
+                if (separator) {
+                    label = me.trimLabelSeparator() + separator;
+                }
+                labelEl.update(label);
+                labelEl.parent().setDisplayed('');
+            }
+            me.updateLayout();
+        }
+    },
+
+    getInsertionRenderData: function (data, names) {
+        var i = names.length,
+            name, value;
+
+        while (i--) {
+            name = names[i];
+            value = this[name];
+
+            if (value) {
+                if (typeof value != 'string') {
+                    if (!value.isTemplate) {
+                        value = Ext.XTemplate.getTpl(this, name);
+                    }
+                    value = value.apply(data);
+                }
+            }
+
+            data[name] = value || '';
+        }
+
+        return data;
+    },
+
+    /**
+     * Generates the arguments for the field decorations {@link #labelableRenderTpl rendering template}.
+     * @return {Object} The template arguments
+     * @protected
+     */
+    getLabelableRenderData: function() {
+        var me = this,
+            data,
+            tempEl,
+            topLabel = me.labelAlign === 'top';
+
+        if (!Ext.form.Labelable.errorIconWidth) {
+            tempEl = Ext.getBody().createChild({style: 'position:absolute', cls: Ext.baseCSSPrefix + 'form-invalid-icon'});
+            Ext.form.Labelable.errorIconWidth = tempEl.getWidth() + tempEl.getMargin('l');
+            tempEl.remove();
+        }
+
+        data = Ext.copyTo({
+            inFormLayout   : me.ownerLayout && me.ownerLayout.type === 'form',
+            inputId        : me.getInputId(),
+            labelOnLeft    : !topLabel,
+            hideLabel      : !me.hasVisibleLabel(),
+            fieldLabel     : me.getFieldLabel(),
+            labelCellStyle : me.getLabelCellStyle(),
+            labelCellAttrs : me.getLabelCellAttrs(),
+            labelCls       : me.getLabelCls(),
+            labelStyle     : me.getLabelStyle(),
+            bodyColspan    : me.getBodyColspan(),
+            externalError  : !me.autoFitErrors,
+            errorMsgCls    : me.getErrorMsgCls(),
+            errorIconWidth : Ext.form.Labelable.errorIconWidth
+        },
+        me, me.labelableRenderProps, true);
+
+        me.getInsertionRenderData(data, me.labelableInsertions);
+
+        return data;
+    },
+
+    xhooks: {
+        beforeRender: function() {
+            var me = this;
+            me.setFieldDefaults(me.getHierarchyState().fieldDefaults);
+            if (me.ownerLayout) {
+                me.addCls(Ext.baseCSSPrefix + me.ownerLayout.type + '-form-item');
+            }
+        },
+
+        onRender: function() {
+            var me = this,
+                margins,
+                side,
+                style = {};
+
+            if (me.extraMargins) {
+                margins = me.el.getMargin();
+                for (side in margins) {
+                    if (margins.hasOwnProperty(side)) {
+                        style['margin-' + side] = (margins[side] + me.extraMargins[side]) + 'px';
+                    }
+                }
+                me.el.setStyle(style);
+            }
+        }
+    },
+    
+    /**
+     * Checks if the field has a visible label
+     * @return {Boolean} True if the field has a visible label
+     */
+    hasVisibleLabel: function(){
+        if (this.hideLabel) {
+            return false;
+        }
+        return !(this.hideEmptyLabel && !this.getFieldLabel());
+    },
+    
+    /**
+     * Gets the width of the label (if visible)
+     * @return {Number} The label width
+     */
+    getLabelWidth: function(){
+        var me = this;
+        if (!me.hasVisibleLabel()) {
+            return 0;
+        }
+        return me.labelWidth + me.labelPad;
+    },
+    
+    /**
+     * @private
+     * Calculates the colspan value for the body cell - the cell which contains the input field.
+     *
+     * The field table structure contains 4 columns:
+     */
+    getBodyColspan: function() {
+        var me = this,
+            result;
+
+        if (me.msgTarget === 'side' && (!me.autoFitErrors || me.hasActiveError())) {
+            result = 1;
+        } else {
+            result = 2;
+        }
+        if (me.labelAlign !== 'top' && !me.hasVisibleLabel()) {
+            result++;
+        }
+        return result;
+    },
+    
+    getLabelCls: function() {
+        var labelCls = this.labelCls + ' ' + Ext.dom.Element.unselectableCls,
+            labelClsExtra = this.labelClsExtra;
+
+        return labelClsExtra ? labelCls + ' ' + labelClsExtra : labelCls;
+    },
+
+    getLabelCellStyle: function() {
+        var me = this,
+            hideLabelCell = me.hideLabel || (!me.getFieldLabel() && me.hideEmptyLabel);
+
+        return hideLabelCell ? 'display:none;' : '';
+    },
+    
+    getErrorMsgCls: function() {
+        var me = this,
+            hideLabelCell = (me.hideLabel || (!me.fieldLabel && me.hideEmptyLabel));
+        
+        return me.errorMsgCls + (!hideLabelCell && me.labelAlign === 'top' ? ' ' + Ext.baseCSSPrefix + 'lbl-top-err-icon' : '');
+    },
+
+    getLabelCellAttrs: function() {
+        var me = this,
+            labelAlign = me.labelAlign,
+            result = '';
+
+        if (labelAlign !== 'top') {
+            result = 'valign="top" halign="' + labelAlign + '" width="' + (me.labelWidth + me.labelPad) + '"';
+        }
+        return result + ' class="' + Ext.baseCSSPrefix + 'field-label-cell"';
+    },
+    
+    /**
+     * Gets any label styling for the labelEl
+     * @private
+     * @return {String} The label styling
+     */
+    getLabelStyle: function(){
+        var me = this,
+            labelPad = me.labelPad,
+            labelStyle = '';
+
+        // Calculate label styles up front rather than in the Field layout for speed; this
+        // is safe because label alignment/width/pad are not expected to change.
+        if (me.labelAlign !== 'top') {
+            if (me.labelWidth) {
+                labelStyle = 'width:' + me.labelWidth + 'px;';
+            }
+            if (labelPad) {
+                labelStyle += 'margin-right:' + labelPad + 'px;';
+            }
+        }
+        
+        return labelStyle + (me.labelStyle || '');
+    },
+
+    /**
+     * Gets the markup to be inserted into the outer template's bodyEl. Defaults to empty string, should be implemented
+     * by classes including this mixin as needed.
+     * @return {String} The markup to be inserted
+     * @protected
+     */
+    getSubTplMarkup: function() {
+        return '';
+    },
+
+    /**
+     * Get the input id, if any, for this component. This is used as the "for" attribute on the label element.
+     * Implementing subclasses may also use this as e.g. the id for their own input element.
+     * @return {String} The input id
+     */
+    getInputId: function() {
+        return '';
+    },
+
+    /**
+     * Gets the active error message for this component, if any. This does not trigger validation on its own, it merely
+     * returns any message that the component may already hold.
+     * @return {String} The active error message on the component; if there is no error, an empty string is returned.
+     */
+    getActiveError : function() {
+        return this.activeError || '';
+    },
+
+    /**
+     * Tells whether the field currently has an active error message. This does not trigger validation on its own, it
+     * merely looks for any message that the component may already hold.
+     * @return {Boolean}
+     */
+    hasActiveError: function() {
+        return !!this.getActiveError();
+    },
+
+    /**
+     * Sets the active error message to the given string. This replaces the entire error message contents with the given
+     * string. Also see {@link #setActiveErrors} which accepts an Array of messages and formats them according to the
+     * {@link #activeErrorsTpl}. Note that this only updates the error message element's text and attributes, you'll
+     * have to call doComponentLayout to actually update the field's layout to match. If the field extends {@link
+     * Ext.form.field.Base} you should call {@link Ext.form.field.Base#markInvalid markInvalid} instead.
+     * @param {String} msg The error message
+     */
+    setActiveError: function(msg) {
+        this.setActiveErrors(msg);
+    },
+
+    /**
+     * Gets an Array of any active error messages currently applied to the field. This does not trigger validation on
+     * its own, it merely returns any messages that the component may already hold.
+     * @return {String[]} The active error messages on the component; if there are no errors, an empty Array is
+     * returned.
+     */
+    getActiveErrors: function() {
+        return this.activeErrors || [];
+    },
+
+    /**
+     * Set the active error message to an Array of error messages. The messages are formatted into a single message
+     * string using the {@link #activeErrorsTpl}. Also see {@link #setActiveError} which allows setting the entire error
+     * contents with a single string. Note that this only updates the error message element's text and attributes,
+     * you'll have to call doComponentLayout to actually update the field's layout to match. If the field extends
+     * {@link Ext.form.field.Base} you should call {@link Ext.form.field.Base#markInvalid markInvalid} instead.
+     * @param {String[]} errors The error messages
+     */
+    setActiveErrors: function(errors) {
+        errors = Ext.Array.from(errors);
+        this.activeError = errors[0];
+        this.activeErrors = errors;
+        this.activeError = this.getTpl('activeErrorsTpl').apply({
+            errors: errors,
+            listCls: Ext.plainListCls 
+        });
+        this.renderActiveError();
+    },
+
+    /**
+     * Clears the active error message(s). Note that this only clears the error message element's text and attributes,
+     * you'll have to call doComponentLayout to actually update the field's layout to match. If the field extends {@link
+     * Ext.form.field.Base} you should call {@link Ext.form.field.Base#clearInvalid clearInvalid} instead.
+     */
+    unsetActiveError: function() {
+        delete this.activeError;
+        delete this.activeErrors;
+        this.renderActiveError();
+    },
+
+    /**
+     * @private
+     * Updates the rendered DOM to match the current activeError. This only updates the content and
+     * attributes, you'll have to call doComponentLayout to actually update the display.
+     */
+    renderActiveError: function() {
+        var me = this,
+            activeError = me.getActiveError(),
+            hasError = !!activeError;
+
+        if (activeError !== me.lastActiveError) {
+            me.fireEvent('errorchange', me, activeError);
+            me.lastActiveError = activeError;
+        }
+
+        if (me.rendered && !me.isDestroyed && !me.preventMark) {
+            // Add/remove invalid class
+            me.el[hasError ? 'addCls' : 'removeCls'](me.invalidCls);
+
+            // Update the aria-invalid attribute
+            me.getActionEl().dom.setAttribute('aria-invalid', hasError);
+
+            // Update the errorEl (There will only be one if msgTarget is 'side' or 'under') with the error message text
+            if (me.errorEl) {
+                me.errorEl.dom.innerHTML = activeError;
+            }
+        }
+    },
+
+    /**
+     * Applies a set of default configuration values to this Labelable instance. For each of the properties in the given
+     * object, check if this component hasOwnProperty that config; if not then it's inheriting a default value from its
+     * prototype and we should apply the default value.
+     * @param {Object} defaults The defaults to apply to the object.
+     */
+    setFieldDefaults: function(defaults) {
+        var key;
+
+        for (key in defaults) {
+            if (!this.hasOwnProperty(key)) {
+                this[key] = defaults[key];
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ *
+ * This mixin provides a common interface for the logical behavior and state of form fields, including:
+ *
+ * - Getter and setter methods for field values
+ * - Events and methods for tracking value and validity changes
+ * - Methods for triggering validation
+ *
+ * **NOTE**: When implementing custom fields, it is most likely that you will want to extend the {@link Ext.form.field.Base}
+ * component class rather than using this mixin directly, as BaseField contains additional logic for generating an
+ * actual DOM complete with {@link Ext.form.Labelable label and error message} display and a form input field,
+ * plus methods that bind the Field value getters and setters to the input field's value.
+ *
+ * If you do want to implement this mixin directly and don't want to extend {@link Ext.form.field.Base}, then
+ * you will most likely want to override the following methods with custom implementations: {@link #getValue},
+ * {@link #setValue}, and {@link #getErrors}. Other methods may be overridden as needed but their base
+ * implementations should be sufficient for common cases. You will also need to make sure that {@link #initField}
+ * is called during the component's initialization.
+ */
+Ext.define('Ext.form.field.Field', {
+    /**
+     * @property {Boolean} isFormField
+     * Flag denoting that this component is a Field. Always true.
+     */
+    isFormField : true,
+
+    /**
+     * @cfg {Object} value
+     * A value to initialize this field with.
+     */
+
+    /**
+     * @cfg {String} name
+     * The name of the field. By default this is used as the parameter name when including the
+     * {@link #getSubmitData field value} in a {@link Ext.form.Basic#submit form submit()}. To prevent the field from
+     * being included in the form submit, set {@link #submitValue} to false.
+     */
+
+    /**
+     * @cfg {Boolean} disabled
+     * True to disable the field. Disabled Fields will not be {@link Ext.form.Basic#submit submitted}.
+     */
+    disabled : false,
+
+    /**
+     * @cfg {Boolean} submitValue
+     * Setting this to false will prevent the field from being {@link Ext.form.Basic#submit submitted} even when it is
+     * not disabled.
+     */
+    submitValue: true,
+
+    /**
+     * @cfg {Boolean} validateOnChange
+     * Specifies whether this field should be validated immediately whenever a change in its value is detected.
+     * If the validation results in a change in the field's validity, a {@link #validitychange} event will be
+     * fired. This allows the field to show feedback about the validity of its contents immediately as the user is
+     * typing.
+     *
+     * When set to false, feedback will not be immediate. However the form will still be validated before submitting if
+     * the clientValidation option to {@link Ext.form.Basic#doAction} is enabled, or if the field or form are validated
+     * manually.
+     *
+     * See also {@link Ext.form.field.Base#checkChangeEvents} for controlling how changes to the field's value are
+     * detected.
+     */
+    validateOnChange: true,
+
+    /**
+     * @private
+     */
+    suspendCheckChange: 0,
+
+    /**
+     * Initializes this Field mixin on the current instance. Components using this mixin should call this method during
+     * their own initialization process.
+     */
+    initField: function() {
+        this.addEvents(
+            /**
+             * @event change
+             * Fires when the value of a field is changed via the {@link #setValue} method.
+             * @param {Ext.form.field.Field} this
+             * @param {Object} newValue The new value
+             * @param {Object} oldValue The original value
+             */
+            'change',
+            /**
+             * @event validitychange
+             * Fires when a change in the field's validity is detected.
+             * @param {Ext.form.field.Field} this
+             * @param {Boolean} isValid Whether or not the field is now valid
+             */
+            'validitychange',
+            /**
+             * @event dirtychange
+             * Fires when a change in the field's {@link #isDirty} state is detected.
+             * @param {Ext.form.field.Field} this
+             * @param {Boolean} isDirty Whether or not the field is now dirty
+             */
+            'dirtychange'
+        );
+
+        this.initValue();
+        
+        var badNames = [
+            'tagName',
+            'nodeName',
+            'children',
+            'childNodes'
+        ], name = this.name;
+            
+        if (name && Ext.Array.indexOf(badNames, name) > -1) {
+            Ext.log.warn(
+                ['It is recommended to not use "', name, '" as a field name, because it ',
+                'can cause naming collisions during form submission.'].join('')
+            );
+        }
+    },
+
+    /**
+     * Initializes the field's value based on the initial config.
+     */
+    initValue: function() {
+        var me = this;
+
+        me.value = me.transformOriginalValue(me.value);
+        /**
+         * @property {Object} originalValue
+         * The original value of the field as configured in the {@link #value} configuration, or as loaded by the last
+         * form load operation if the form's {@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad} setting is `true`.
+         */
+        me.originalValue = me.lastValue = me.value;
+
+        // Set the initial value - prevent validation on initial set
+        me.suspendCheckChange++;
+        me.setValue(me.value);
+        me.suspendCheckChange--;
+    },
+    
+    /**
+     * Allows for any necessary modifications before the original
+     * value is set
+     * @protected
+     * @param {Object} value The initial value
+     * @return {Object} The modified initial value
+     */
+    transformOriginalValue: Ext.identityFn,
+
+    /**
+     * Returns the {@link Ext.form.field.Field#name name} attribute of the field. This is used as the parameter name
+     * when including the field value in a {@link Ext.form.Basic#submit form submit()}.
+     * @return {String} name The field {@link Ext.form.field.Field#name name}
+     */
+    getName: function() {
+        return this.name;
+    },
+
+    /**
+     * Returns the current data value of the field. The type of value returned is particular to the type of the
+     * particular field (e.g. a Date object for {@link Ext.form.field.Date}).
+     * @return {Object} value The field value
+     */
+    getValue: function() {
+        return this.value;
+    },
+
+    /**
+     * Sets a data value into the field and runs the change detection and validation.
+     * @param {Object} value The value to set
+     * @return {Ext.form.field.Field} this
+     */
+    setValue: function(value) {
+        var me = this;
+        me.value = value;
+        me.checkChange();
+        return me;
+    },
+
+    /**
+     * Returns whether two field {@link #getValue values} are logically equal. Field implementations may override this
+     * to provide custom comparison logic appropriate for the particular field's data type.
+     * @param {Object} value1 The first value to compare
+     * @param {Object} value2 The second value to compare
+     * @return {Boolean} True if the values are equal, false if inequal.
+     */
+    isEqual: function(value1, value2) {
+        return String(value1) === String(value2);
+    },
+
+    /**
+     * Returns whether two values are logically equal.
+     * Similar to {@link #isEqual}, however null or undefined values will be treated as empty strings.
+     * @private
+     * @param {Object} value1 The first value to compare
+     * @param {Object} value2 The second value to compare
+     * @return {Boolean} True if the values are equal, false if inequal.
+     */
+    isEqualAsString: function(value1, value2){
+        return String(Ext.value(value1, '')) === String(Ext.value(value2, ''));
+    },
+
+    /**
+     * Returns the parameter(s) that would be included in a standard form submit for this field. Typically this will be
+     * an object with a single name-value pair, the name being this field's {@link #getName name} and the value being
+     * its current stringified value. More advanced field implementations may return more than one name-value pair.
+     *
+     * Note that the values returned from this method are not guaranteed to have been successfully {@link #validate
+     * validated}.
+     *
+     * @return {Object} A mapping of submit parameter names to values; each value should be a string, or an array of
+     * strings if that particular name has multiple values. It can also return null if there are no parameters to be
+     * submitted.
+     */
+    getSubmitData: function() {
+        var me = this,
+            data = null;
+        if (!me.disabled && me.submitValue && !me.isFileUpload()) {
+            data = {};
+            data[me.getName()] = '' + me.getValue();
+        }
+        return data;
+    },
+
+    /**
+     * Returns the value(s) that should be saved to the {@link Ext.data.Model} instance for this field, when {@link
+     * Ext.form.Basic#updateRecord} is called. Typically this will be an object with a single name-value pair, the name
+     * being this field's {@link #getName name} and the value being its current data value. More advanced field
+     * implementations may return more than one name-value pair. The returned values will be saved to the corresponding
+     * field names in the Model.
+     *
+     * Note that the values returned from this method are not guaranteed to have been successfully {@link #validate
+     * validated}.
+     *
+     * @return {Object} A mapping of submit parameter names to values; each value should be a string, or an array of
+     * strings if that particular name has multiple values. It can also return null if there are no parameters to be
+     * submitted.
+     */
+    getModelData: function() {
+        var me = this,
+            data = null;
+        if (!me.disabled && !me.isFileUpload()) {
+            data = {};
+            data[me.getName()] = me.getValue();
+        }
+        return data;
+    },
+
+    /**
+     * Resets the current field value to the originally loaded value and clears any validation messages. See {@link
+     * Ext.form.Basic}.{@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad}
+     */
+    reset : function(){
+        var me = this;
+
+        me.beforeReset();
+        me.setValue(me.originalValue);
+        me.clearInvalid();
+        // delete here so we reset back to the original state
+        delete me.wasValid;
+    },
+    
+    /**
+     * Template method before a field is reset.
+     * @protected
+     */
+    beforeReset: Ext.emptyFn,
+
+    /**
+     * Resets the field's {@link #originalValue} property so it matches the current {@link #getValue value}. This is
+     * called by {@link Ext.form.Basic}.{@link Ext.form.Basic#setValues setValues} if the form's
+     * {@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad} property is set to true.
+     */
+    resetOriginalValue: function() {
+        this.originalValue = this.getValue();
+        this.checkDirty();
+    },
+
+    /**
+     * Checks whether the value of the field has changed since the last time it was checked.
+     * If the value has changed, it:
+     *
+     * 1. Fires the {@link #change change event},
+     * 2. Performs validation if the {@link #validateOnChange} config is enabled, firing the
+     *    {@link #validitychange validitychange event} if the validity has changed, and
+     * 3. Checks the {@link #isDirty dirty state} of the field and fires the {@link #dirtychange dirtychange event}
+     *    if it has changed.
+     */
+    checkChange: function() {
+        if (!this.suspendCheckChange) {
+            var me = this,
+                newVal = me.getValue(),
+                oldVal = me.lastValue;
+            if (!me.isEqual(newVal, oldVal) && !me.isDestroyed) {
+                me.lastValue = newVal;
+                me.fireEvent('change', me, newVal, oldVal);
+                me.onChange(newVal, oldVal);
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Called when the field's value changes. Performs validation if the {@link #validateOnChange}
+     * config is enabled, and invokes the dirty check.
+     */
+    onChange: function(newVal, oldVal) {
+        if (this.validateOnChange) {
+            this.validate();
+        }
+        this.checkDirty();
+    },
+
+    /**
+     * Returns true if the value of this Field has been changed from its {@link #originalValue}.
+     * Will always return false if the field is disabled.
+     *
+     * Note that if the owning {@link Ext.form.Basic form} was configured with
+     * {@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad} then the {@link #originalValue} is updated when
+     * the values are loaded by {@link Ext.form.Basic}.{@link Ext.form.Basic#setValues setValues}.
+     * @return {Boolean} True if this field has been changed from its original value (and is not disabled),
+     * false otherwise.
+     */
+    isDirty : function() {
+        var me = this;
+        return !me.disabled && !me.isEqual(me.getValue(), me.originalValue);
+    },
+
+    /**
+     * Checks the {@link #isDirty} state of the field and if it has changed since the last time it was checked,
+     * fires the {@link #dirtychange} event.
+     */
+    checkDirty: function() {
+        var me = this,
+            isDirty = me.isDirty();
+        if (isDirty !== me.wasDirty) {
+            me.fireEvent('dirtychange', me, isDirty);
+            me.onDirtyChange(isDirty);
+            me.wasDirty = isDirty;
+        }
+    },
+
+    /**
+     * @private Called when the field's dirty state changes.
+     * @param {Boolean} isDirty
+     */
+    onDirtyChange: Ext.emptyFn,
+
+    /**
+     * Runs this field's validators and returns an array of error messages for any validation failures. This is called
+     * internally during validation and would not usually need to be used manually.
+     *
+     * Each subclass should override or augment the return value to provide their own errors.
+     *
+     * @param {Object} value The value to get errors for (defaults to the current field value)
+     * @return {String[]} All error messages for this field; an empty Array if none.
+     */
+    getErrors: function(value) {
+        return [];
+    },
+
+    /**
+     * Returns whether or not the field value is currently valid by {@link #getErrors validating} the field's current
+     * value. The {@link #validitychange} event will not be fired; use {@link #validate} instead if you want the event
+     * to fire. **Note**: {@link #disabled} fields are always treated as valid.
+     *
+     * Implementations are encouraged to ensure that this method does not have side-effects such as triggering error
+     * message display.
+     *
+     * @return {Boolean} True if the value is valid, else false
+     */
+    isValid : function() {
+        var me = this;
+        return me.disabled || Ext.isEmpty(me.getErrors());
+    },
+
+    /**
+     * Returns whether or not the field value is currently valid by {@link #getErrors validating} the field's current
+     * value, and fires the {@link #validitychange} event if the field's validity has changed since the last validation.
+     * **Note**: {@link #disabled} fields are always treated as valid.
+     *
+     * Custom implementations of this method are allowed to have side-effects such as triggering error message display.
+     * To validate without side-effects, use {@link #isValid}.
+     *
+     * @return {Boolean} True if the value is valid, else false
+     */
+    validate : function() {
+        var me = this,
+            isValid = me.isValid();
+        if (isValid !== me.wasValid) {
+            me.wasValid = isValid;
+            me.fireEvent('validitychange', me, isValid);
+        }
+        return isValid;
+    },
+
+    /**
+     * A utility for grouping a set of modifications which may trigger value changes into a single transaction, to
+     * prevent excessive firing of {@link #change} events. This is useful for instance if the field has sub-fields which
+     * are being updated as a group; you don't want the container field to check its own changed state for each subfield
+     * change.
+     * @param {Object} fn A function containing the transaction code
+     */
+    batchChanges: function(fn) {
+        try {
+            this.suspendCheckChange++;
+            fn();
+        } catch(e){
+            throw e;
+        } finally {
+            this.suspendCheckChange--;
+        }
+        this.checkChange();
+    },
+
+    /**
+     * Returns whether this Field is a file upload field; if it returns true, forms will use special techniques for
+     * {@link Ext.form.Basic#submit submitting the form} via AJAX. See {@link Ext.form.Basic#hasUpload} for details. If
+     * this returns true, the {@link #extractFileInput} method must also be implemented to return the corresponding file
+     * input element.
+     * @return {Boolean}
+     */
+    isFileUpload: function() {
+        return false;
+    },
+
+    /**
+     * Only relevant if the instance's {@link #isFileUpload} method returns true. Returns a reference to the file input
+     * DOM element holding the user's selected file. The input will be appended into the submission form and will not be
+     * returned, so this method should also create a replacement.
+     * @return {HTMLElement}
+     */
+    extractFileInput: function() {
+        return null;
+    },
+
+    /**
+     * @method markInvalid
+     * Associate one or more error messages with this field. Components using this mixin should implement this method to
+     * update the component's rendering to display the messages.
+     *
+     * **Note**: this method does not cause the Field's {@link #validate} or {@link #isValid} methods to return `false`
+     * if the value does _pass_ validation. So simply marking a Field as invalid will not prevent submission of forms
+     * submitted with the {@link Ext.form.action.Submit#clientValidation} option set.
+     *
+     * @param {String/String[]} errors The error message(s) for the field.
+     */
+    markInvalid: Ext.emptyFn,
+
+    /**
+     * @method clearInvalid
+     * Clear any invalid styles/messages for this field. Components using this mixin should implement this method to
+     * update the components rendering to clear any existing messages.
+     *
+     * **Note**: this method does not cause the Field's {@link #validate} or {@link #isValid} methods to return `true`
+     * if the value does not _pass_ validation. So simply clearing a field's errors will not necessarily allow
+     * submission of forms submitted with the {@link Ext.form.action.Submit#clientValidation} option set.
+     */
+    clearInvalid: Ext.emptyFn
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Layout class for components with {@link Ext.form.Labelable field labeling}, handling the sizing and alignment of
+ * the form control, label, and error message treatment.
+ * @private
+ */
+Ext.define('Ext.layout.component.field.Field', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.layout.component.Auto ,
+
+    alias: 'layout.field',
+
+                                                                       
+
+    /* End Definitions */
+
+    type: 'field',
+    
+    naturalSizingProp: 'size',
+
+    beginLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner;
+
+        me.callParent(arguments);
+
+        ownerContext.labelStrategy = me.getLabelStrategy();
+        ownerContext.errorStrategy = me.getErrorStrategy();
+
+        ownerContext.labelContext = ownerContext.getEl('labelEl');
+        ownerContext.bodyCellContext = ownerContext.getEl('bodyEl');
+        ownerContext.inputContext = ownerContext.getEl('inputEl');
+        ownerContext.errorContext = ownerContext.getEl('errorEl');
+
+        // width:100% on an element inside a table in IE6/7 "strict" sizes the content box.
+        // store the input element's border and padding info so that subclasses can take it into consideration if needed
+        if (Ext.isIE7m && Ext.isStrict && ownerContext.inputContext) {
+            me.ieInputWidthAdjustment = ownerContext.inputContext.getPaddingInfo().width + ownerContext.inputContext.getBorderInfo().width;
+        }
+
+        // perform preparation on the label and error (setting css classes, qtips, etc.)
+        ownerContext.labelStrategy.prepare(ownerContext, owner);
+        ownerContext.errorStrategy.prepare(ownerContext, owner);
+    },
+    
+    beginLayoutCycle: function(ownerContext){
+        var me = this,
+            owner = me.owner,
+            widthModel = ownerContext.widthModel,
+            ownerNaturalSize = owner[me.naturalSizingProp],
+            width;
+            
+        me.callParent(arguments);
+        // Body cell must stretch to use up available width unless the field is auto width
+        if (widthModel.shrinkWrap) {
+            // When the width needs to be auto, table-layout cannot be fixed
+            me.beginLayoutShrinkWrap(ownerContext);
+        } else if (widthModel.natural) {
+
+            // When a size specified, natural becomes fixed width unless the inpiutWidth is specified - we shrinkwrap that
+            if (typeof ownerNaturalSize == 'number' && !owner.inputWidth) {
+                me.beginLayoutFixed(ownerContext, (width = ownerNaturalSize * 6.5 + 20), 'px');
+            }
+
+            // Otherwise it is the same as shrinkWrap
+            else {
+                me.beginLayoutShrinkWrap(ownerContext);
+            }
+            ownerContext.setWidth(width, false);
+        } else {
+            me.beginLayoutFixed(ownerContext, '100', '%');
+        }    
+    },
+
+    beginLayoutFixed: function (ownerContext, width, suffix) {
+        var owner = ownerContext.target,
+            inputEl = owner.inputEl,
+            inputWidth = owner.inputWidth;
+
+        owner.el.setStyle('table-layout', 'fixed');
+        owner.bodyEl.setStyle('width', width + suffix);
+        if (inputEl) {
+            if (inputWidth) {
+                inputEl.setStyle('width', inputWidth + 'px');
+            } else {
+                inputEl.setStyle('width', owner.stretchInputElFixed ? '100%' : '');
+            }
+        }
+        ownerContext.isFixed = true;
+    },
+
+    beginLayoutShrinkWrap: function (ownerContext) {
+        var owner = ownerContext.target,
+            inputEl = owner.inputEl,
+            inputWidth = owner.inputWidth;
+
+        if (inputEl && inputEl.dom) {
+            inputEl.dom.removeAttribute('size');
+            if (inputWidth) {
+                inputEl.setStyle('width', inputWidth + 'px');
+            } else {
+                inputEl.setStyle('width', '');
+            }
+        }
+        owner.el.setStyle('table-layout', 'auto');
+        owner.bodyEl.setStyle('width', '');
+    },
+
+    finishedLayout: function(ownerContext){
+        var owner = this.owner;
+
+        this.callParent(arguments);        
+        ownerContext.labelStrategy.finishedLayout(ownerContext, owner);
+        ownerContext.errorStrategy.finishedLayout(ownerContext, owner);
+    },
+
+    calculateOwnerHeightFromContentHeight: function(ownerContext, contentHeight) {
+        return contentHeight;
+    },
+
+    measureContentHeight: function (ownerContext) {
+        return ownerContext.el.getHeight();
+    },
+    
+    measureContentWidth: function (ownerContext) {
+        return ownerContext.el.getWidth();
+    },
+
+    measureLabelErrorHeight: function (ownerContext) {
+        return ownerContext.labelStrategy.getHeight(ownerContext) +
+               ownerContext.errorStrategy.getHeight(ownerContext);
+    },
+
+    onFocus: function() {
+        this.getErrorStrategy().onFocus(this.owner);    
+    },
+
+    /**
+     * Return the set of strategy functions from the {@link #labelStrategies labelStrategies collection}
+     * that is appropriate for the field's {@link Ext.form.Labelable#labelAlign labelAlign} config.
+     */
+    getLabelStrategy: function() {
+        var me = this,
+            strategies = me.labelStrategies,
+            labelAlign = me.owner.labelAlign;
+        return strategies[labelAlign] || strategies.base;
+    },
+
+    /**
+     * Return the set of strategy functions from the {@link #errorStrategies errorStrategies collection}
+     * that is appropriate for the field's {@link Ext.form.Labelable#msgTarget msgTarget} config.
+     */
+    getErrorStrategy: function() {
+        var me = this,
+            owner = me.owner,
+            strategies = me.errorStrategies,
+            msgTarget = owner.msgTarget;
+        return !owner.preventMark && Ext.isString(msgTarget) ?
+                (strategies[msgTarget] || strategies.elementId) :
+                strategies.none;
+    },
+
+    /**
+     * Collection of named strategies for laying out and adjusting labels to accommodate error messages.
+     * An appropriate one will be chosen based on the owner field's {@link Ext.form.Labelable#labelAlign} config.
+     */
+    labelStrategies: (function() {
+        var base = {
+                prepare: function(ownerContext, owner) {
+                    var cls = owner.labelCls + '-' + owner.labelAlign,
+                        labelEl = owner.labelEl;
+
+                    if (labelEl) {
+                        labelEl.addCls(cls);
+                    }
+                },
+
+                getHeight: function () {
+                    return 0;
+                },
+                
+                finishedLayout: Ext.emptyFn
+            };
+
+        return {
+            base: base,
+
+            /**
+             * Label displayed above the bodyEl
+             */
+            top: Ext.applyIf({        
+                        
+                getHeight: function (ownerContext) {
+                    var labelContext = ownerContext.labelContext,
+                        props = labelContext.props,
+                        height = props.height;
+                        
+                    if (height === undefined) {
+                        props.height = height = labelContext.el.getHeight();
+                    }
+
+                    return height;
+                }
+            }, base),
+
+            /**
+             * Label displayed to the left of the bodyEl
+             */
+            left: base,
+
+            /**
+             * Same as left, only difference is text-align in CSS
+             */
+            right: base
+        };
+    }()),
+
+    /**
+     * Collection of named strategies for laying out and adjusting insets to accommodate error messages.
+     * An appropriate one will be chosen based on the owner field's {@link Ext.form.Labelable#msgTarget} config.
+     */
+    errorStrategies: (function() {
+        function showTip(owner) {
+            var tip = Ext.layout.component.field.Field.tip,
+                target;
+                
+            if (tip && tip.isVisible()) {
+                target = tip.activeTarget;
+                if (target && target.el === owner.getActionEl().dom) {
+                    tip.toFront(true);
+                }
+            }
+        }
+
+        var applyIf = Ext.applyIf,
+            emptyFn = Ext.emptyFn,
+            iconCls = Ext.baseCSSPrefix + 'form-invalid-icon',
+            iconWidth,
+            base = {
+                prepare: function(ownerContext, owner) {
+                    var el = owner.errorEl;
+                    if (el) {
+                        el.setDisplayed(false);
+                    }
+                },
+                getHeight: function () {
+                    return 0;
+                },
+                onFocus: emptyFn,
+                finishedLayout: emptyFn
+            };
+
+        return {
+            none: base,
+
+            /**
+             * Error displayed as icon (with QuickTip on hover) to right of the bodyEl
+             */
+            side: applyIf({
+                prepare: function(ownerContext, owner) {
+                    var errorEl = owner.errorEl,
+                        sideErrorCell = owner.sideErrorCell,
+                        displayError = owner.hasActiveError(),
+                        tempEl;
+
+                    // Capture error icon width once
+                    if (!iconWidth) {
+                        iconWidth = (tempEl = Ext.getBody().createChild({style: 'position:absolute', cls: iconCls})).getWidth();
+                        tempEl.remove();
+                    }
+
+                    errorEl.addCls(iconCls);
+                    errorEl.set({'data-errorqtip': owner.getActiveError() || ''});
+                    if (owner.autoFitErrors) {
+                        errorEl.setDisplayed(displayError);
+                    }
+                    // Not autofitting, the space must still be allocated.
+                    else {
+                        errorEl.setVisible(displayError);
+                    }
+
+                    // If we are auto fitting, then hide and show the entire cell
+                    if (sideErrorCell && owner.autoFitErrors) {
+                        sideErrorCell.setDisplayed(displayError);
+                    }
+                    owner.bodyEl.dom.colSpan = owner.getBodyColspan();
+
+                    // TODO: defer the tip call until after the layout to avoid immediate DOM reads now
+                    Ext.layout.component.field.Field.initTip();
+                },
+                onFocus: showTip
+            }, base),
+
+            /**
+             * Error message displayed underneath the bodyEl
+             */
+            under: applyIf({
+                prepare: function(ownerContext, owner) {
+                    var errorEl = owner.errorEl,
+                        cls = Ext.baseCSSPrefix + 'form-invalid-under';
+
+                    errorEl.addCls(cls);
+                    errorEl.setDisplayed(owner.hasActiveError());
+                },
+                getHeight: function (ownerContext) {
+                    var height = 0,
+                        errorContext, props;
+
+                    if (ownerContext.target.hasActiveError()) {
+                        errorContext = ownerContext.errorContext;
+                        props = errorContext.props;
+                        height = props.height;
+
+                        if (height === undefined) {
+                            props.height = height = errorContext.el.getHeight();
+                        }
+                    }
+
+                    return height;
+                }
+            }, base),
+
+            /**
+             * Error displayed as QuickTip on hover of the field container
+             */
+            qtip: applyIf({
+                prepare: function(ownerContext, owner) {
+                    Ext.layout.component.field.Field.initTip();
+                    owner.getActionEl().dom.setAttribute('data-errorqtip', owner.getActiveError() || '');
+                },
+                onFocus: showTip
+            }, base),
+
+            /**
+             * Error displayed as title tip on hover of the field container
+             */
+            title: applyIf({
+                prepare: function(ownerContext, owner) {
+                    owner.getActionEl().dom.setAttribute('title', owner.getActiveError() || '');
+                }
+            }, base),
+
+            /**
+             * Error message displayed as content of an element with a given id elsewhere in the app
+             */
+            elementId: applyIf({
+                prepare: function(ownerContext, owner) {
+                    var targetEl = Ext.fly(owner.msgTarget);
+                    if (targetEl) {
+                        targetEl.dom.innerHTML = owner.getActiveError() || '';
+                        targetEl.setDisplayed(owner.hasActiveError());
+                    }
+                }
+            }, base)
+        };
+    }()),
+
+    statics: {
+        /**
+         * Use a custom QuickTip instance separate from the main QuickTips singleton, so that we
+         * can give it a custom frame style. Responds to errorqtip rather than the qtip property.
+         * @static
+         */
+        initTip: function() {
+            var tip = this.tip;
+            if (!tip) {
+                tip = this.tip = Ext.create('Ext.tip.QuickTip', {
+                    ui: 'form-invalid'
+                });
+                tip.tagConfig = Ext.apply({}, {attribute: 'errorqtip'}, tip.tagConfig);
+            }
+        },
+
+        /**
+         * Destroy the error tip instance.
+         * @static
+         */
+        destroyTip: function() {
+            var tip = this.tip;
+            if (tip) {
+                tip.destroy();
+                delete this.tip;
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ *
+ * Base class for form fields that provides default event handling, rendering, and other common functionality
+ * needed by all form field types. Utilizes the {@link Ext.form.field.Field} mixin for value handling and validation,
+ * and the {@link Ext.form.Labelable} mixin to provide label and error message display.
+ *
+ * In most cases you will want to use a subclass, such as {@link Ext.form.field.Text} or {@link Ext.form.field.Checkbox},
+ * rather than creating instances of this class directly. However if you are implementing a custom form field,
+ * using this as the parent class is recommended.
+ *
+ * # Values and Conversions
+ *
+ * Because Base implements the Field mixin, it has a main value that can be initialized with the
+ * {@link #value} config and manipulated via the {@link #getValue} and {@link #setValue} methods. This main
+ * value can be one of many data types appropriate to the current field, for instance a {@link Ext.form.field.Date Date}
+ * field would use a JavaScript Date object as its value type. However, because the field is rendered as a HTML
+ * input, this value data type can not always be directly used in the rendered field.
+ *
+ * Therefore Base introduces the concept of a "raw value". This is the value of the rendered HTML input field,
+ * and is normally a String. The {@link #getRawValue} and {@link #setRawValue} methods can be used to directly
+ * work with the raw value, though it is recommended to use getValue and setValue in most cases.
+ *
+ * Conversion back and forth between the main value and the raw value is handled by the {@link #valueToRaw} and
+ * {@link #rawToValue} methods. If you are implementing a subclass that uses a non-String value data type, you
+ * should override these methods to handle the conversion.
+ *
+ * # Rendering
+ *
+ * The content of the field body is defined by the {@link #fieldSubTpl} XTemplate, with its argument data
+ * created by the {@link #getSubTplData} method. Override this template and/or method to create custom
+ * field renderings.
+ *
+ * # Example usage:
+ *
+ *     @example
+ *     // A simple subclass of Base that creates a HTML5 search field. Redirects to the
+ *     // searchUrl when the Enter key is pressed.222
+ *     Ext.define('Ext.form.SearchField', {
+ *         extend: 'Ext.form.field.Base',
+ *         alias: 'widget.searchfield',
+ *     
+ *         inputType: 'search',
+ *     
+ *         // Config defining the search URL
+ *         searchUrl: 'http://www.google.com/search?q={0}',
+ *     
+ *         // Add specialkey listener
+ *         initComponent: function() {
+ *             this.callParent();
+ *             this.on('specialkey', this.checkEnterKey, this);
+ *         },
+ *     
+ *         // Handle enter key presses, execute the search if the field has a value
+ *         checkEnterKey: function(field, e) {
+ *             var value = this.getValue();
+ *             if (e.getKey() === e.ENTER && !Ext.isEmpty(value)) {
+ *                 location.href = Ext.String.format(this.searchUrl, value);
+ *             }
+ *         }
+ *     });
+ *     
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Base Example',
+ *         bodyPadding: 5,
+ *         width: 250,
+ *     
+ *         // Fields will be arranged vertically, stretched to full width
+ *         layout: 'anchor',
+ *         defaults: {
+ *             anchor: '100%'
+ *         },
+ *         items: [{
+ *             xtype: 'searchfield',
+ *             fieldLabel: 'Search',
+ *             name: 'query'
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ */
+Ext.define('Ext.form.field.Base', {
+    extend:  Ext.Component ,
+    mixins: {
+        labelable:  Ext.form.Labelable ,
+        field:  Ext.form.field.Field 
+    },
+    alias: 'widget.field',
+    alternateClassName: ['Ext.form.Field', 'Ext.form.BaseField'],
+                                                                                            
+
+    /**
+     * @cfg {Ext.XTemplate} fieldSubTpl
+     * The content of the field body is defined by this config option.
+     * @private
+     */
+    fieldSubTpl: [ // note: {id} here is really {inputId}, but {cmpId} is available
+        '<input id="{id}" type="{type}" {inputAttrTpl}',
+            ' size="1"', // allows inputs to fully respect CSS widths across all browsers
+            '<tpl if="name"> name="{name}"</tpl>',
+            '<tpl if="value"> value="{[Ext.util.Format.htmlEncode(values.value)]}"</tpl>',
+            '<tpl if="placeholder"> placeholder="{placeholder}"</tpl>',
+            '{%if (values.maxLength !== undefined){%} maxlength="{maxLength}"{%}%}',
+            '<tpl if="readOnly"> readonly="readonly"</tpl>',
+            '<tpl if="disabled"> disabled="disabled"</tpl>',
+            '<tpl if="tabIdx"> tabIndex="{tabIdx}"</tpl>',
+            '<tpl if="fieldStyle"> style="{fieldStyle}"</tpl>',
+        ' class="{fieldCls} {typeCls} {editableCls} {inputCls}" autocomplete="off"/>',
+        {
+            disableFormats: true
+        }
+    ],
+
+    subTplInsertions: [
+        /**
+         * @cfg {String/Array/Ext.XTemplate} inputAttrTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * inside the input element (as attributes). If an `XTemplate` is used, the component's
+         * {@link #getSubTplData subTpl data} serves as the context.
+         */
+        'inputAttrTpl'
+    ],
+
+    /**
+     * @cfg {String} name
+     * The name of the field. This is used as the parameter name when including the field value
+     * in a {@link Ext.form.Basic#submit form submit()}. If no name is configured, it falls back to the {@link #inputId}.
+     * To prevent the field from being included in the form submit, set {@link #submitValue} to false.
+     */
+
+    /**
+     * @cfg {String} inputType
+     * The type attribute for input fields -- e.g. radio, text, password, file. The extended types
+     * supported by HTML5 inputs (url, email, etc.) may also be used, though using them will cause older browsers to
+     * fall back to 'text'.
+     *
+     * The type 'password' must be used to render that field type currently -- there is no separate Ext component for
+     * that. You can use {@link Ext.form.field.File} which creates a custom-rendered file upload field, but if you want
+     * a plain unstyled file input you can use a Base with inputType:'file'.
+     */
+    inputType: 'text',
+
+    /**
+     * @cfg {Number} tabIndex
+     * The tabIndex for this field. Note this only applies to fields that are rendered, not those which are built via
+     * applyTo
+     */
+
+    //<locale>
+    /**
+     * @cfg {String} invalidText
+     * The error text to use when marking a field invalid and no message is provided
+     */
+    invalidText : 'The value in this field is invalid',
+    //</locale>
+
+    /**
+     * @cfg {String} [fieldCls='x-form-field']
+     * The default CSS class for the field input
+     */
+    fieldCls : Ext.baseCSSPrefix + 'form-field',
+
+    /**
+     * @cfg {String} fieldStyle
+     * Optional CSS style(s) to be applied to the {@link #inputEl field input element}. Should be a valid argument to
+     * {@link Ext.Element#applyStyles}. Defaults to undefined. See also the {@link #setFieldStyle} method for changing
+     * the style after initialization.
+     */
+
+    /**
+     * @cfg {String} [focusCls='x-form-focus']
+     * The CSS class to use when the field receives focus
+     */
+    focusCls : 'form-focus',
+
+    /**
+     * @cfg {String} dirtyCls
+     * The CSS class to use when the field value {@link #isDirty is dirty}.
+     */
+    dirtyCls : Ext.baseCSSPrefix + 'form-dirty',
+
+    /**
+     * @cfg {String[]} checkChangeEvents
+     * A list of event names that will be listened for on the field's {@link #inputEl input element}, which will cause
+     * the field's value to be checked for changes. If a change is detected, the {@link #change change event} will be
+     * fired, followed by validation if the {@link #validateOnChange} option is enabled.
+     *
+     * Defaults to ['change', 'propertychange', 'keyup'] in Internet Explorer, and ['change', 'input', 'textInput', 'keyup',
+     * 'dragdrop'] in other browsers. This catches all the ways that field values can be changed in most supported
+     * browsers; the only known exceptions at the time of writing are:
+     *
+     *   - Safari 3.2 and older: cut/paste in textareas via the context menu, and dragging text into textareas
+     *   - Opera 10 and 11: dragging text into text fields and textareas, and cut via the context menu in text fields
+     *     and textareas
+     *   - Opera 9: Same as Opera 10 and 11, plus paste from context menu in text fields and textareas
+     *
+     * If you need to guarantee on-the-fly change notifications including these edge cases, you can call the
+     * {@link #checkChange} method on a repeating interval, e.g. using {@link Ext.TaskManager}, or if the field is within
+     * a {@link Ext.form.Panel}, you can use the FormPanel's {@link Ext.form.Panel#pollForChanges} configuration to set up
+     * such a task automatically.
+     */
+    checkChangeEvents: Ext.isIE && (!document.documentMode || document.documentMode < 9) ?
+                        ['change', 'propertychange', 'keyup'] :
+                        ['change', 'input', 'textInput', 'keyup', 'dragdrop'],
+
+    /**
+     * @cfg {Number} checkChangeBuffer
+     * Defines a timeout in milliseconds for buffering {@link #checkChangeEvents} that fire in rapid succession.
+     * Defaults to 50 milliseconds.
+     */
+    checkChangeBuffer: 50,
+
+    componentLayout: 'field',
+
+    /**
+     * @cfg {Boolean} readOnly
+     * true to mark the field as readOnly in HTML.
+     *
+     * **Note**: this only sets the element's readOnly DOM attribute. Setting `readOnly=true`, for example, will not
+     * disable triggering a ComboBox or Date; it gives you the option of forcing the user to choose via the trigger
+     * without typing in the text box. To hide the trigger use `{@link Ext.form.field.Trigger#hideTrigger hideTrigger}`.
+     */
+    readOnly : false,
+
+    /**
+     * @cfg {String} readOnlyCls
+     * The CSS class applied to the component's main element when it is {@link #readOnly}.
+     */
+    readOnlyCls: Ext.baseCSSPrefix + 'form-readonly',
+
+    /**
+     * @cfg {String} inputId
+     * The id that will be given to the generated input DOM element. Defaults to an automatically generated id. If you
+     * configure this manually, you must make sure it is unique in the document.
+     */
+
+    /**
+     * @cfg {Boolean} validateOnBlur
+     * Whether the field should validate when it loses focus. This will cause fields to be validated
+     * as the user steps through the fields in the form regardless of whether they are making changes to those fields
+     * along the way. See also {@link #validateOnChange}.
+     */
+    validateOnBlur: true,
+
+    // private
+    hasFocus : false,
+
+    baseCls: Ext.baseCSSPrefix + 'field',
+
+    maskOnDisable: false,
+    
+    // Instructs the layout to stretch the inputEl to 100% width when laying
+    // out under fixed conditions. Defaults to true for all fields except check/radio
+    // Doesn't seem worth it to introduce a whole new layout class just for this flag
+    stretchInputElFixed: true,
+
+    // private
+    initComponent : function() {
+        var me = this;
+
+        me.callParent();
+
+        me.subTplData = me.subTplData || {};
+
+        me.addEvents(
+            /**
+             * @event specialkey
+             * Fires when any key related to navigation (arrows, tab, enter, esc, etc.) is pressed. To handle other keys
+             * see {@link Ext.util.KeyMap}. You can check {@link Ext.EventObject#getKey} to determine which key was
+             * pressed. For example:
+             *
+             *     var form = new Ext.form.Panel({
+             *         ...
+             *         items: [{
+             *                 fieldLabel: 'Field 1',
+             *                 name: 'field1',
+             *                 allowBlank: false
+             *             },{
+             *                 fieldLabel: 'Field 2',
+             *                 name: 'field2',
+             *                 listeners: {
+             *                     specialkey: function(field, e){
+             *                         // e.HOME, e.END, e.PAGE_UP, e.PAGE_DOWN,
+             *                         // e.TAB, e.ESC, arrow keys: e.LEFT, e.RIGHT, e.UP, e.DOWN
+             *                         if (e.{@link Ext.EventObject#getKey getKey()} == e.ENTER) {
+             *                             var form = field.up('form').getForm();
+             *                             form.submit();
+             *                         }
+             *                     }
+             *                 }
+             *             }
+             *         ],
+             *         ...
+             *     });
+             *
+             * @param {Ext.form.field.Base} this
+             * @param {Ext.EventObject} e The event object
+             */
+            'specialkey',
+
+            /**
+             * @event writeablechange
+             * Fires when this field changes its read-only status.
+             * @param {Ext.form.field.Base} this
+             * @param {Boolean} Read only flag
+             */
+            'writeablechange'
+        );
+
+        // Init mixins
+        me.initLabelable();
+        me.initField();
+
+        // Default name to inputId
+        if (!me.name) {
+            me.name = me.getInputId();
+        }
+        // Add to protoEl before render
+        if (me.readOnly) {
+            me.addCls(me.readOnlyCls);
+        }
+        
+        me.addCls(Ext.baseCSSPrefix + 'form-type-' + me.inputType);
+    },
+
+    /**
+     * Returns the input id for this field. If none was specified via the {@link #inputId} config, then an id will be
+     * automatically generated.
+     */
+    getInputId: function() {
+        return this.inputId || (this.inputId = this.id + '-inputEl');
+    },
+
+    /**
+     * Creates and returns the data object to be used when rendering the {@link #fieldSubTpl}.
+     * @return {Object} The template data
+     * @template
+     */
+    getSubTplData: function() {
+        var me = this,
+            type = me.inputType,
+            inputId = me.getInputId(),
+            data;
+        
+        data = Ext.apply({
+            id         : inputId,
+            cmpId      : me.id,
+            name       : me.name || inputId,
+            disabled   : me.disabled,
+            readOnly   : me.readOnly,
+            value      : me.getRawValue(),
+            type       : type,
+            fieldCls   : me.fieldCls,
+            fieldStyle : me.getFieldStyle(),
+            tabIdx     : me.tabIndex,
+            inputCls   : me.inputCls,
+            typeCls    : Ext.baseCSSPrefix + 'form-' + (type === 'password' ? 'text' : type)
+        }, me.subTplData);
+
+        me.getInsertionRenderData(data, me.subTplInsertions);
+
+        return data;
+    },
+
+    applyRenderSelectors: function() {
+        var me = this;
+
+        me.callParent();
+
+        // This is added here rather than defined in Ext.form.Labelable since inputEl isn't related to Labelable.
+        // It's important to add inputEl to the childEls so it can be properly destroyed.
+        me.addChildEls('inputEl');
+
+        /**
+         * @property {Ext.Element} inputEl
+         * The input Element for this Field. Only available after the field has been rendered.
+         */
+        me.inputEl = me.el.getById(me.getInputId());
+    },
+
+    /**
+     * Gets the markup to be inserted into the outer template's bodyEl. For fields this is the actual input element.
+     */
+    getSubTplMarkup: function() {
+        return this.getTpl('fieldSubTpl').apply(this.getSubTplData());
+    },
+
+    initRenderTpl: function() {
+        var me = this;
+        if (!me.hasOwnProperty('renderTpl')) {
+            me.renderTpl = me.getTpl('labelableRenderTpl');
+        }
+        return me.callParent();
+    },
+
+    initRenderData: function() {
+        return Ext.applyIf(this.callParent(), this.getLabelableRenderData());
+    },
+
+    /**
+     * Set the {@link #fieldStyle CSS style} of the {@link #inputEl field input element}.
+     * @param {String/Object/Function} style The style(s) to apply. Should be a valid argument to {@link
+     * Ext.Element#applyStyles}.
+     */
+    setFieldStyle: function(style) {
+        var me = this,
+            inputEl = me.inputEl;
+        if (inputEl) {
+            inputEl.applyStyles(style);
+        }
+        me.fieldStyle = style;
+    },
+
+    getFieldStyle: function() {
+        return Ext.isObject(this.fieldStyle) ? Ext.DomHelper.generateStyles(this.fieldStyle) : this.fieldStyle ||'';
+    },
+
+    // private
+    onRender : function() {
+        this.callParent(arguments);
+        this.renderActiveError();
+    },
+
+    getFocusEl: function() {
+        return this.inputEl;
+    },
+
+    isFileUpload: function() {
+        return this.inputType === 'file';
+    },
+
+    // private override to use getSubmitValue() as a convenience
+    getSubmitData: function() {
+        var me = this,
+            data = null,
+            val;
+        if (!me.disabled && me.submitValue && !me.isFileUpload()) {
+            val = me.getSubmitValue();
+            if (val !== null) {
+                data = {};
+                data[me.getName()] = val;
+            }
+        }
+        return data;
+    },
+
+    /**
+     * Returns the value that would be included in a standard form submit for this field. This will be combined with the
+     * field's name to form a name=value pair in the {@link #getSubmitData submitted parameters}. If an empty string is
+     * returned then just the name= will be submitted; if null is returned then nothing will be submitted.
+     *
+     * Note that the value returned will have been {@link #processRawValue processed} but may or may not have been
+     * successfully {@link #validate validated}.
+     *
+     * @return {String} The value to be submitted, or null.
+     */
+    getSubmitValue: function() {
+        return this.processRawValue(this.getRawValue());
+    },
+
+    /**
+     * Returns the raw value of the field, without performing any normalization, conversion, or validation. To get a
+     * normalized and converted value see {@link #getValue}.
+     * @return {String} value The raw String value of the field
+     */
+    getRawValue: function() {
+        var me = this,
+            v = (me.inputEl ? me.inputEl.getValue() : Ext.value(me.rawValue, ''));
+        me.rawValue = v;
+        return v;
+    },
+
+    /**
+     * Sets the field's raw value directly, bypassing {@link #valueToRaw value conversion}, change detection, and
+     * validation. To set the value with these additional inspections see {@link #setValue}.
+     * @param {Object} value The value to set
+     * @return {Object} value The field value that is set
+     */
+    setRawValue: function(value) {
+        var me = this;
+        value = Ext.value(me.transformRawValue(value), '');
+        me.rawValue = value;
+
+        // Some Field subclasses may not render an inputEl
+        if (me.inputEl) {
+            me.inputEl.dom.value = value;
+        }
+        return value;
+    },
+    
+    /**
+     * Transform the raw value before it is set
+     * @protected
+     * @param {Object} value The value
+     * @return {Object} The value to set
+     */
+    transformRawValue: Ext.identityFn,
+
+    /**
+     * Converts a mixed-type value to a raw representation suitable for displaying in the field. This allows controlling
+     * how value objects passed to {@link #setValue} are shown to the user, including localization. For instance, for a
+     * {@link Ext.form.field.Date}, this would control how a Date object passed to {@link #setValue} would be converted
+     * to a String for display in the field.
+     *
+     * See {@link #rawToValue} for the opposite conversion.
+     *
+     * The base implementation simply does a standard toString conversion, and converts {@link Ext#isEmpty empty values}
+     * to an empty string.
+     *
+     * @param {Object} value The mixed-type value to convert to the raw representation.
+     * @return {Object} The converted raw value.
+     */
+    valueToRaw: function(value) {
+        return '' + Ext.value(value, '');
+    },
+
+    /**
+     * Converts a raw input field value into a mixed-type value that is suitable for this particular field type. This
+     * allows controlling the normalization and conversion of user-entered values into field-type-appropriate values,
+     * e.g. a Date object for {@link Ext.form.field.Date}, and is invoked by {@link #getValue}.
+     *
+     * It is up to individual implementations to decide how to handle raw values that cannot be successfully converted
+     * to the desired object type.
+     *
+     * See {@link #valueToRaw} for the opposite conversion.
+     *
+     * The base implementation does no conversion, returning the raw value untouched.
+     *
+     * @param {Object} rawValue
+     * @return {Object} The converted value.
+     * @method
+     */
+    rawToValue: Ext.identityFn,
+
+    /**
+     * Performs any necessary manipulation of a raw field value to prepare it for {@link #rawToValue conversion} and/or
+     * {@link #validate validation}, for instance stripping out ignored characters. In the base implementation it does
+     * nothing; individual subclasses may override this as needed.
+     *
+     * @param {Object} value The unprocessed string value
+     * @return {Object} The processed string value
+     * @method
+     */
+    processRawValue: Ext.identityFn,
+
+    /**
+     * Returns the current data value of the field. The type of value returned is particular to the type of the
+     * particular field (e.g. a Date object for {@link Ext.form.field.Date}), as the result of calling {@link #rawToValue} on
+     * the field's {@link #processRawValue processed} String value. To return the raw String value, see {@link #getRawValue}.
+     * @return {Object} value The field value
+     */
+    getValue: function() {
+        var me = this,
+            val = me.rawToValue(me.processRawValue(me.getRawValue()));
+        me.value = val;
+        return val;
+    },
+
+    /**
+     * Sets a data value into the field and runs the change detection and validation. To set the value directly
+     * without these inspections see {@link #setRawValue}.
+     * @param {Object} value The value to set
+     * @return {Ext.form.field.Field} this
+     */
+    setValue: function(value) {
+        var me = this;
+        me.setRawValue(me.valueToRaw(value));
+        return me.mixins.field.setValue.call(me, value);
+    },
+
+    onBoxReady: function() {
+        var me = this;
+        me.callParent();
+        
+        if (me.setReadOnlyOnBoxReady) {
+            me.setReadOnly(me.readOnly);
+        }
+            
+    },
+
+    //private
+    onDisable: function() {
+        var me = this,
+            inputEl = me.inputEl;
+            
+        me.callParent();
+        if (inputEl) {
+            inputEl.dom.disabled = true;
+            if (me.hasActiveError()) {
+                // clear invalid state since the field is now disabled
+                me.clearInvalid();
+                me.needsValidateOnEnable = true;
+            }
+        }
+    },
+
+    //private
+    onEnable: function() {
+        var me = this,
+            inputEl = me.inputEl;
+            
+        me.callParent();
+        if (inputEl) {
+            inputEl.dom.disabled = false;
+            if (me.needsValidateOnEnable) {
+                delete me.needsValidateOnEnable;
+                // will trigger errors to be shown
+                me.forceValidation = true;
+                me.isValid();
+                delete me.forceValidation;
+            }
+        }
+    },
+
+    /**
+     * Sets the read only state of this field.
+     * @param {Boolean} readOnly Whether the field should be read only.
+     */
+    setReadOnly: function(readOnly) {
+        var me = this,
+            inputEl = me.inputEl;
+        readOnly = !!readOnly;
+        me[readOnly ? 'addCls' : 'removeCls'](me.readOnlyCls);
+        me.readOnly = readOnly;
+        if (inputEl) {
+            inputEl.dom.readOnly = readOnly;
+        } else if (me.rendering) {
+            me.setReadOnlyOnBoxReady = true;
+        }
+        me.fireEvent('writeablechange', me, readOnly);
+    },
+
+    // private
+    fireKey: function(e){
+        if(e.isSpecialKey()){
+            this.fireEvent('specialkey', this, new Ext.EventObjectImpl(e));
+        }
+    },
+
+    // private
+    initEvents : function(){
+        var me = this,
+            inputEl = me.inputEl,
+            onChangeTask,
+            onChangeEvent,
+            events = me.checkChangeEvents,
+            e,
+            eLen   = events.length,
+            event;
+
+        if (inputEl) {
+            me.mon(inputEl, Ext.EventManager.getKeyEvent(), me.fireKey,  me);
+
+            // listen for immediate value changes
+            onChangeTask = new Ext.util.DelayedTask(me.checkChange, me);
+            me.onChangeEvent = onChangeEvent = function() {
+                onChangeTask.delay(me.checkChangeBuffer);
+            };
+
+            for (e = 0; e < eLen; e++) {
+                event = events[e];
+
+                if (event === 'propertychange') {
+                    me.usesPropertychange = true;
+                }
+
+                me.mon(inputEl, event, onChangeEvent);
+            }
+        }
+        me.callParent();
+    },
+
+    doComponentLayout: function() {
+        var me = this,
+            inputEl = me.inputEl,
+            usesPropertychange = me.usesPropertychange,
+            ename = 'propertychange',
+            onChangeEvent = me.onChangeEvent;
+
+        // In IE if propertychange is one of the checkChangeEvents, we need to remove
+        // the listener prior to layout and re-add it after, to prevent it from firing
+        // needlessly for attribute and style changes applied to the inputEl.
+        if (usesPropertychange) {
+            me.mun(inputEl, ename, onChangeEvent);
+        }
+        me.callParent(arguments);
+        if (usesPropertychange) {
+            me.mon(inputEl, ename, onChangeEvent);
+        }
+    },
+
+    /**
+     * @private Called when the field's dirty state changes. Adds/removes the {@link #dirtyCls} on the main element.
+     * @param {Boolean} isDirty
+     */
+    onDirtyChange: function(isDirty) {
+        this[isDirty ? 'addCls' : 'removeCls'](this.dirtyCls);
+    },
+
+
+    /**
+     * Returns whether or not the field value is currently valid by {@link #getErrors validating} the
+     * {@link #processRawValue processed raw value} of the field. **Note**: {@link #disabled} fields are
+     * always treated as valid.
+     *
+     * @return {Boolean} True if the value is valid, else false
+     */
+    isValid : function() {
+        var me = this,
+            disabled = me.disabled,
+            validate = me.forceValidation || !disabled;
+            
+        
+        return validate ? me.validateValue(me.processRawValue(me.getRawValue())) : disabled;
+    },
+
+
+    /**
+     * Uses {@link #getErrors} to build an array of validation errors. If any errors are found, they are passed to
+     * {@link #markInvalid} and false is returned, otherwise true is returned.
+     *
+     * Previously, subclasses were invited to provide an implementation of this to process validations - from 3.2
+     * onwards {@link #getErrors} should be overridden instead.
+     *
+     * @param {Object} value The value to validate
+     * @return {Boolean} True if all validations passed, false if one or more failed
+     */
+    validateValue: function(value) {
+        var me = this,
+            errors = me.getErrors(value),
+            isValid = Ext.isEmpty(errors);
+        if (!me.preventMark) {
+            if (isValid) {
+                me.clearInvalid();
+            } else {
+                me.markInvalid(errors);
+            }
+        }
+
+        return isValid;
+    },
+
+    /**
+     * Display one or more error messages associated with this field, using {@link #msgTarget} to determine how to
+     * display the messages and applying {@link #invalidCls} to the field's UI element.
+     *
+     * **Note**: this method does not cause the Field's {@link #validate} or {@link #isValid} methods to return `false`
+     * if the value does _pass_ validation. So simply marking a Field as invalid will not prevent submission of forms
+     * submitted with the {@link Ext.form.action.Submit#clientValidation} option set.
+     *
+     * @param {String/String[]} errors The validation message(s) to display.
+     */
+    markInvalid : function(errors) {
+        // Save the message and fire the 'invalid' event
+        var me = this,
+            oldMsg = me.getActiveError(),
+            active;
+            
+        me.setActiveErrors(Ext.Array.from(errors));
+        active = me.getActiveError();
+        if (oldMsg !== active) {
+            me.setError(active);
+        }
+    },
+
+    /**
+     * Clear any invalid styles/messages for this field.
+     *
+     * **Note**: this method does not cause the Field's {@link #validate} or {@link #isValid} methods to return `true`
+     * if the value does not _pass_ validation. So simply clearing a field's errors will not necessarily allow
+     * submission of forms submitted with the {@link Ext.form.action.Submit#clientValidation} option set.
+     */
+    clearInvalid : function() {
+        // Clear the message and fire the 'valid' event
+        var me = this,
+            hadError = me.hasActiveError();
+            
+        delete me.needsValidateOnEnable;
+        me.unsetActiveError();
+        if (hadError) {
+            me.setError('');
+        }
+    },
+    
+    /**
+     * Set the current error state
+     * @private
+     * @param {String} error The error message to set
+     */
+    setError: function(active){
+        var me = this,
+            msgTarget = me.msgTarget,
+            prop;
+            
+        if (me.rendered) {
+            if (msgTarget == 'title' || msgTarget == 'qtip') {
+                if (me.rendered) {
+                    prop = msgTarget == 'qtip' ? 'data-errorqtip' : 'title';
+                }
+                me.getActionEl().dom.setAttribute(prop, active || '');
+            } else {
+                me.updateLayout();
+            }
+        }
+    },
+
+    /**
+     * @private Overrides the method from the Ext.form.Labelable mixin to also add the invalidCls to the inputEl,
+     * as that is required for proper styling in IE with nested fields (due to lack of child selector)
+     */
+    renderActiveError: function() {
+        var me = this,
+            hasError = me.hasActiveError();
+        if (me.inputEl) {
+            // Add/remove invalid class
+            me.inputEl[hasError ? 'addCls' : 'removeCls'](me.invalidCls + '-field');
+        }
+        me.mixins.labelable.renderActiveError.call(me);
+    },
+
+
+    getActionEl: function() {
+        return this.inputEl || this.el;
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @singleton
+ * @alternateClassName Ext.form.VTypes
+ *
+ * This is a singleton object which contains a set of commonly used field validation functions
+ * and provides a mechanism for creating reusable custom field validations.
+ * The following field validation functions are provided out of the box:
+ *
+ * - {@link #alpha}
+ * - {@link #alphanum}
+ * - {@link #email}
+ * - {@link #url}
+ *
+ * VTypes can be applied to a {@link Ext.form.field.Text Text Field} using the `{@link Ext.form.field.Text#vtype vtype}` configuration:
+ *
+ *     Ext.create('Ext.form.field.Text', {
+ *         fieldLabel: 'Email Address',
+ *         name: 'email',
+ *         vtype: 'email' // applies email validation rules to this field
+ *     });
+ *
+ * To create custom VTypes:
+ *
+ *     // custom Vtype for vtype:'time'
+ *     var timeTest = /^([1-9]|1[0-9]):([0-5][0-9])(\s[a|p]m)$/i;
+ *     Ext.apply(Ext.form.field.VTypes, {
+ *         //  vtype validation function
+ *         time: function(val, field) {
+ *             return timeTest.test(val);
+ *         },
+ *         // vtype Text property: The error text to display when the validation function returns false
+ *         timeText: 'Not a valid time.  Must be in the format "12:34 PM".',
+ *         // vtype Mask property: The keystroke filter mask
+ *         timeMask: /[\d\s:amp]/i
+ *     });
+ *
+ * In the above example the `time` function is the validator that will run when field validation occurs,
+ * `timeText` is the error message, and `timeMask` limits what characters can be typed into the field.
+ * Note that the `Text` and `Mask` functions must begin with the same name as the validator function.
+ *
+ * Using a custom validator is the same as using one of the build-in validators - just use the name of the validator function
+ * as the `{@link Ext.form.field.Text#vtype vtype}` configuration on a {@link Ext.form.field.Text Text Field}:
+ *
+ *     Ext.create('Ext.form.field.Text', {
+ *         fieldLabel: 'Departure Time',
+ *         name: 'departureTime',
+ *         vtype: 'time' // applies custom time validation rules to this field
+ *     });
+ *
+ * Another example of a custom validator:
+ *
+ *     // custom Vtype for vtype:'IPAddress'
+ *     Ext.apply(Ext.form.field.VTypes, {
+ *         IPAddress:  function(v) {
+ *             return /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(v);
+ *         },
+ *         IPAddressText: 'Must be a numeric IP address',
+ *         IPAddressMask: /[\d\.]/i
+ *     });
+ *
+ * It's important to note that using {@link Ext#apply Ext.apply()} means that the custom validator function
+ * as well as `Text` and `Mask` fields are added as properties of the `Ext.form.field.VTypes` singleton.
+ */
+Ext.define('Ext.form.field.VTypes', (function(){
+    // closure these in so they are only created once.
+    var alpha = /^[a-zA-Z_]+$/,
+        alphanum = /^[a-zA-Z0-9_]+$/,
+
+        // http://en.wikipedia.org/wiki/Email_address#Local_part
+        // http://stackoverflow.com/a/2049510
+        // http://isemail.info/
+        // http://blog.stevenlevithan.com/archives/capturing-vs-non-capturing-groups
+        //
+        // 1. Can begin with a double-quote ONLY IF the local part also ends in a double-quote.
+        // 2. Can NOT BEGIN with a period.
+        // 3. Can NOT END with a period.
+        // 4. Can not have MORE THAN ONE period in a row.
+        //
+        // Let's break this down:
+        //
+        // ^(")?
+        // The local part may begin with double-quotes, but only if it also ends with it.
+        // See the back-reference.  Capturing.
+        //
+        // (?:[^\."])
+        // Here we've defined that the local part cannot begin with a period or a double-quote.  Non-capturing.
+        //
+        // (?:(?:[\.])?(?:[\w\-!#$%&'*+/=?^_`{|}~]))*
+        // After the first character is matched, the regex ensures that there is not more than one period
+        // in a row.  Then, this nested grouping allows for zero or more of the accepted characters.
+        // NOTE that this also ensures that any character not defined in the character class
+        // is invalid as an ending character for the local part (such as the period).
+        //
+        // \1@
+        // The local part of the address is a backreference to the first (and only) capturing group that allows
+        // for a double-quote to wrap the local part of an email address.
+        email = /^(")?(?:[^\."])(?:(?:[\.])?(?:[\w\-!#$%&'*+/=?^_`{|}~]))*\1@(\w[\-\w]*\.){1,5}([A-Za-z]){2,6}$/,
+        url = /(((^https?)|(^ftp)):\/\/((([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*)|(localhost|LOCALHOST))\/?)/i;
+
+    // All these messages and functions are configurable
+    return {
+        singleton: true,
+        alternateClassName: 'Ext.form.VTypes',
+
+        /**
+         * The function used to validate email addresses. Note that complete validation per the email RFC
+         * specifications is very complex and beyond the scope of this class, although this function can be
+         * overridden if a more comprehensive validation scheme is desired. See the validation section
+         * of the [Wikipedia article on email addresses][1] for additional information. This implementation is
+         * intended to validate the following types of emails:
+         *
+         * - `barney at example.de`
+         * - `barney.rubble at example.com`
+         * - `barney-rubble at example.coop`
+         * - `barney+rubble at example.com`
+         * - `barney'rubble at example.com`
+         * - `b.arne.y_r.ubbl.e at example.com`
+         * - `barney4rubble at example.com`
+         * - `barney4rubble!@example.com`
+         * - `_barney+rubble at example.com`
+         * - `"barney+rubble"@example.com`
+         *
+         * [1]: http://en.wikipedia.org/wiki/E-mail_address
+         *
+         * @param {String} value The email address
+         * @return {Boolean} true if the RegExp test passed, and false if not.
+         */
+        'email' : function(v){
+            return email.test(v);
+        },
+        //<locale>
+        /**
+         * @property {String} emailText
+         * The error text to display when the email validation function returns false.
+         * Defaults to: 'This field should be an e-mail address in the format "user at example.com"'
+         */
+        'emailText' : 'This field should be an e-mail address in the format "user at example.com"',
+        //</locale>
+        /**
+         * @property {RegExp} emailMask
+         * The keystroke filter mask to be applied on email input. See the {@link #email} method for information about
+         * more complex email validation. Defaults to: /[a-z0-9_\.\-@]/i
+         */
+        'emailMask' : /[\w.\-@'"!#$%&'*+/=?^_`{|}~]/i,
+
+        /**
+         * The function used to validate URLs
+         * @param {String} value The URL
+         * @return {Boolean} true if the RegExp test passed, and false if not.
+         */
+        'url' : function(v){
+            return url.test(v);
+        },
+        //<locale>
+        /**
+         * @property {String} urlText
+         * The error text to display when the url validation function returns false.
+         * Defaults to: 'This field should be a URL in the format "http:/'+'/www.example.com"'
+         */
+        'urlText' : 'This field should be a URL in the format "http:/'+'/www.example.com"',
+        //</locale>
+
+        /**
+         * The function used to validate alpha values
+         * @param {String} value The value
+         * @return {Boolean} true if the RegExp test passed, and false if not.
+         */
+        'alpha' : function(v){
+            return alpha.test(v);
+        },
+        //<locale>
+        /**
+         * @property {String} alphaText
+         * The error text to display when the alpha validation function returns false.
+         * Defaults to: 'This field should only contain letters and _'
+         */
+        'alphaText' : 'This field should only contain letters and _',
+        //</locale>
+        /**
+         * @property {RegExp} alphaMask
+         * The keystroke filter mask to be applied on alpha input. Defaults to: /[a-z_]/i
+         */
+        'alphaMask' : /[a-z_]/i,
+
+        /**
+         * The function used to validate alphanumeric values
+         * @param {String} value The value
+         * @return {Boolean} true if the RegExp test passed, and false if not.
+         */
+        'alphanum' : function(v){
+            return alphanum.test(v);
+        },
+        //<locale>
+        /**
+         * @property {String} alphanumText
+         * The error text to display when the alphanumeric validation function returns false.
+         * Defaults to: 'This field should only contain letters, numbers and _'
+         */
+        'alphanumText' : 'This field should only contain letters, numbers and _',
+        //</locale>
+        /**
+         * @property {RegExp} alphanumMask
+         * The keystroke filter mask to be applied on alphanumeric input. Defaults to: /[a-z0-9_]/i
+         */
+        'alphanumMask' : /[a-z0-9_]/i
+    };
+}()));
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Layout class for {@link Ext.form.field.Text} fields. Handles sizing the input field.
+ * @private
+ */
+Ext.define('Ext.layout.component.field.Text', {
+    extend:  Ext.layout.component.field.Field ,
+    alias: 'layout.textfield',
+                                       
+
+    type: 'textfield',
+    
+    canGrowWidth: true,
+
+    beginLayoutCycle: function(ownerContext) {
+        this.callParent(arguments);
+        
+        // Clear height, in case a previous layout cycle stretched it.
+        if (ownerContext.heightModel.shrinkWrap) {
+            ownerContext.inputContext.el.setStyle('height', '');
+        }
+    },
+
+    measureContentWidth: function (ownerContext) {
+        var me = this,
+            owner = me.owner,
+            width = me.callParent(arguments),
+            inputContext = ownerContext.inputContext,
+            inputEl, value, calcWidth, max, min;
+
+        if (owner.grow && me.canGrowWidth && !ownerContext.state.growHandled) {
+            inputEl = owner.inputEl;
+
+            // Find the width that contains the whole text value
+            value = Ext.util.Format.htmlEncode(inputEl.dom.value || (owner.hasFocus ? '' : owner.emptyText) || '');
+            value += owner.growAppend;
+            calcWidth = inputEl.getTextWidth(value) + inputContext.getFrameInfo().width;
+
+            max = owner.growMax;
+            min = Math.min(max, width);
+            max = Math.max(owner.growMin, max, min);
+
+            // Constrain
+            calcWidth = Ext.Number.constrain(calcWidth, owner.growMin, max);
+            inputContext.setWidth(calcWidth);
+            ownerContext.state.growHandled = true;
+            
+            // Now that we've set the inputContext, we need to recalculate the width
+            inputContext.domBlock(me, 'width');
+            width = NaN;
+        }
+        return width;
+    },
+    
+    publishInnerHeight: function(ownerContext, height) {
+        ownerContext.inputContext.setHeight(height - this.measureLabelErrorHeight(ownerContext));
+    },
+
+    beginLayoutFixed: function(ownerContext, width, suffix) {
+        var me = this,
+            ieInputWidthAdjustment = me.ieInputWidthAdjustment;
+
+        if (ieInputWidthAdjustment) {
+            me.adjustIEInputPadding(ownerContext);
+            if(suffix === 'px') {
+                width -= ieInputWidthAdjustment;
+            }
+        }
+
+        me.callParent(arguments);
+    },
+
+    adjustIEInputPadding: function(ownerContext) {
+        // adjust for IE 6/7 strict content-box model
+        this.owner.bodyEl.setStyle('padding-right', this.ieInputWidthAdjustment + 'px');
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ *
+ * A basic text field.  Can be used as a direct replacement for traditional text inputs,
+ * or as the base class for more sophisticated input controls (like {@link Ext.form.field.TextArea}
+ * and {@link Ext.form.field.ComboBox}). Has support for empty-field placeholder values (see {@link #emptyText}).
+ *
+ * # Validation
+ *
+ * The Text field has a useful set of validations built in:
+ *
+ * - {@link #allowBlank} for making the field required
+ * - {@link #minLength} for requiring a minimum value length
+ * - {@link #maxLength} for setting a maximum value length (with {@link #enforceMaxLength} to add it
+ *   as the `maxlength` attribute on the input element)
+ * - {@link #regex} to specify a custom regular expression for validation
+ *
+ * In addition, custom validations may be added:
+ *
+ * - {@link #vtype} specifies a virtual type implementation from {@link Ext.form.field.VTypes} which can contain
+ *   custom validation logic
+ * - {@link #validator} allows a custom arbitrary function to be called during validation
+ *
+ * The details around how and when each of these validation options get used are described in the
+ * documentation for {@link #getErrors}.
+ *
+ * By default, the field value is checked for validity immediately while the user is typing in the
+ * field. This can be controlled with the {@link #validateOnChange}, {@link #checkChangeEvents}, and
+ * {@link #checkChangeBuffer} configurations. Also see the details on Form Validation in the
+ * {@link Ext.form.Panel} class documentation.
+ *
+ * # Masking and Character Stripping
+ *
+ * Text fields can be configured with custom regular expressions to be applied to entered values before
+ * validation: see {@link #maskRe} and {@link #stripCharsRe} for details.
+ *
+ * # Example usage
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Contact Info',
+ *         width: 300,
+ *         bodyPadding: 10,
+ *         renderTo: Ext.getBody(),
+ *         items: [{
+ *             xtype: 'textfield',
+ *             name: 'name',
+ *             fieldLabel: 'Name',
+ *             allowBlank: false  // requires a non-empty value
+ *         }, {
+ *             xtype: 'textfield',
+ *             name: 'email',
+ *             fieldLabel: 'Email Address',
+ *             vtype: 'email'  // requires value to be a valid email address format
+ *         }]
+ *     });
+ */
+Ext.define('Ext.form.field.Text', {
+    extend: Ext.form.field.Base ,
+    alias: 'widget.textfield',
+                                                                           
+    alternateClassName: ['Ext.form.TextField', 'Ext.form.Text'],
+
+    /**
+     * @cfg {String} vtypeText
+     * A custom error message to display in place of the default message provided for the **`{@link #vtype}`** currently
+     * set for this field. **Note**: only applies if **`{@link #vtype}`** is set, else ignored.
+     */
+
+    /**
+     * @cfg {RegExp} stripCharsRe
+     * A JavaScript RegExp object used to strip unwanted content from the value
+     * during input. If `stripCharsRe` is specified,
+     * every *character sequence* matching `stripCharsRe` will be removed.
+     */
+
+    /**
+     * @cfg {Number} size
+     * An initial value for the 'size' attribute on the text input element. This is only used if the field has no
+     * configured {@link #width} and is not given a width by its container's layout. Defaults to 20.
+     */
+    size: 20,
+
+    /**
+     * @cfg {Boolean} [grow=false]
+     * true if this field should automatically grow and shrink to its content
+     */
+
+    /**
+     * @cfg {Number} growMin
+     * The minimum width to allow when `{@link #grow} = true`
+     */
+    growMin : 30,
+
+    /**
+     * @cfg {Number} growMax
+     * The maximum width to allow when `{@link #grow} = true`
+     */
+    growMax : 800,
+
+    //<locale>
+    /**
+     * @cfg {String} growAppend
+     * A string that will be appended to the field's current value for the purposes of calculating the target field
+     * size. Only used when the {@link #grow} config is true. Defaults to a single capital "W" (the widest character in
+     * common fonts) to leave enough space for the next typed character and avoid the field value shifting before the
+     * width is adjusted.
+     */
+    growAppend: 'W',
+    //</locale>
+
+    /**
+     * @cfg {String} vtype
+     * A validation type name as defined in {@link Ext.form.field.VTypes}
+     */
+
+    /**
+     * @cfg {RegExp} maskRe An input mask regular expression that will be used to filter keystrokes (character being
+     * typed) that do not match.
+     * Note: It does not filter characters already in the input.
+     */
+
+    /**
+     * @cfg {Boolean} [disableKeyFilter=false]
+     * Specify true to disable input keystroke filtering
+     */
+
+    /**
+     * @cfg {Boolean} [allowBlank=true]
+     * Specify false to validate that the value's length must be > 0. If `true`, then a blank value is **always** taken to be valid regardless of any {@link #vtype}
+     * validation that may be applied.
+     *
+     * If {@link #vtype} validation must still be applied to blank values, configure {@link #validateBlank} as `true`;
+     */
+    allowBlank : true,
+
+    /**
+     * @cfg {Boolean} [validateBlank=false]
+     * Specify as `true` to modify the behaviour of {@link #allowBlank} so that blank values are not passed as valid, but are subject to any configure {@link #vtype} validation.
+     */
+    validateBlank: false,
+
+    /**
+     * @cfg {Boolean} allowOnlyWhitespace
+     * Specify false to automatically trim the value before validating
+     * the whether the value is blank. Setting this to false automatically
+     * sets {@link #allowBlank} to false.
+     */
+    allowOnlyWhitespace: true,
+
+    /**
+     * @cfg {Number} minLength
+     * Minimum input field length required
+     */
+    minLength : 0,
+
+    /**
+     * @cfg {Number} maxLength
+     * Maximum input field length allowed by validation. This behavior is intended to
+     * provide instant feedback to the user by improving usability to allow pasting and editing or overtyping and back
+     * tracking. To restrict the maximum number of characters that can be entered into the field use the
+     * **{@link Ext.form.field.Text#enforceMaxLength enforceMaxLength}** option.
+     *
+     * Defaults to Number.MAX_VALUE.
+     */
+    maxLength : Number.MAX_VALUE,
+
+    /**
+     * @cfg {Boolean} enforceMaxLength
+     * True to set the maxLength property on the underlying input field. Defaults to false
+     */
+
+    //<locale>
+    /**
+     * @cfg {String} minLengthText
+     * Error text to display if the **{@link #minLength minimum length}** validation fails.
+     */
+    minLengthText : 'The minimum length for this field is {0}',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} maxLengthText
+     * Error text to display if the **{@link #maxLength maximum length}** validation fails
+     */
+    maxLengthText : 'The maximum length for this field is {0}',
+    //</locale>
+
+    /**
+     * @cfg {Boolean} [selectOnFocus=false]
+     * true to automatically select any existing field text when the field receives input focus
+     */
+
+    //<locale>
+    /**
+     * @cfg {String} blankText
+     * The error text to display if the **{@link #allowBlank}** validation fails
+     */
+    blankText : 'This field is required',
+    //</locale>
+
+    /**
+     * @cfg {Function} validator
+     * A custom validation function to be called during field validation ({@link #getErrors}).
+     * If specified, this function will be called first, allowing the developer to override the default validation
+     * process.
+     *
+     * This function will be passed the following parameters:
+     *
+     * @cfg {Object} validator.value The current field value
+     * @cfg {Boolean/String} validator.return
+     *
+     * - True if the value is valid
+     * - An error message if the value is invalid
+     */
+
+    /**
+     * @cfg {RegExp} regex
+     * A JavaScript RegExp object to be tested against the field value during validation.
+     * If the test fails, the field will be marked invalid using
+     * either **{@link #regexText}** or **{@link #invalidText}**.
+     */
+
+    /**
+     * @cfg {String} regexText
+     * The error text to display if **{@link #regex}** is used and the test fails during validation
+     */
+    regexText : '',
+
+    /**
+     * @cfg {String} emptyText
+     * The default text to place into an empty field.
+     *
+     * Note that normally this value will be submitted to the server if this field is enabled; to prevent this you can
+     * set the {@link Ext.form.action.Action#submitEmptyText submitEmptyText} option of {@link Ext.form.Basic#submit} to
+     * false.
+     *
+     * Also note that if you use {@link #inputType inputType}:'file', {@link #emptyText} is not supported and should be
+     * avoided.
+     *
+     * Note that for browsers that support it, setting this property will use the HTML 5 placeholder attribute, and for
+     * older browsers that don't support the HTML 5 placeholder attribute the value will be placed directly into the input
+     * element itself as the raw value. This means that older browsers will obfuscate the {@link #emptyText} value for
+     * password input fields.
+     */
+
+    /**
+     * @cfg {String} [emptyCls='x-form-empty-field']
+     * The CSS class to apply to an empty field to style the **{@link #emptyText}**.
+     * This class is automatically added and removed as needed depending on the current field value.
+     */
+    emptyCls : Ext.baseCSSPrefix + 'form-empty-field',
+
+    /**
+     * @cfg {String} [requiredCls='x-form-required-field']
+     * The CSS class to apply to a required field, i.e. a field where **{@link #allowBlank}** is false.
+     */
+    requiredCls : Ext.baseCSSPrefix + 'form-required-field',
+
+    /**
+     * @cfg {Boolean} [enableKeyEvents=false]
+     * true to enable the proxying of key events for the HTML input field
+     */
+
+    componentLayout: 'textfield',
+
+    // private
+    valueContainsPlaceholder : false,
+
+
+    initComponent: function () {
+        var me = this;
+        
+        if (me.allowOnlyWhitespace === false) {
+            me.allowBlank = false;
+        }
+
+        me.callParent();
+
+        me.addEvents(
+            /**
+             * @event autosize
+             * Fires when the **{@link #autoSize}** function is triggered and the field is resized according to the
+             * {@link #grow}/{@link #growMin}/{@link #growMax} configs as a result. This event provides a hook for the
+             * developer to apply additional logic at runtime to resize the field if needed.
+             * @param {Ext.form.field.Text} this This text field
+             * @param {Number} width The new field width
+             */
+            'autosize',
+
+            /**
+             * @event keydown
+             * Keydown input field event. This event only fires if **{@link #enableKeyEvents}** is set to true.
+             * @param {Ext.form.field.Text} this This text field
+             * @param {Ext.EventObject} e
+             */
+            'keydown',
+            /**
+             * @event keyup
+             * Keyup input field event. This event only fires if **{@link #enableKeyEvents}** is set to true.
+             * @param {Ext.form.field.Text} this This text field
+             * @param {Ext.EventObject} e
+             */
+            'keyup',
+            /**
+             * @event keypress
+             * Keypress input field event. This event only fires if **{@link #enableKeyEvents}** is set to true.
+             * @param {Ext.form.field.Text} this This text field
+             * @param {Ext.EventObject} e
+             */
+            'keypress'
+        );
+        me.addStateEvents('change');
+        me.setGrowSizePolicy();
+    },
+
+    // private
+    setGrowSizePolicy: function(){
+        if (this.grow) {
+            this.shrinkWrap |= 1; // width must shrinkWrap
+        }    
+    },
+
+    // private
+    initEvents : function(){
+        var me = this,
+            el = me.inputEl;
+
+        me.callParent();
+        if(me.selectOnFocus || me.emptyText){
+            me.mon(el, 'mousedown', me.onMouseDown, me);
+        }
+        if(me.maskRe || (me.vtype && me.disableKeyFilter !== true && (me.maskRe = Ext.form.field.VTypes[me.vtype+'Mask']))){
+            me.mon(el, 'keypress', me.filterKeys, me);
+        }
+
+        if (me.enableKeyEvents) {
+            me.mon(el, {
+                scope: me,
+                keyup: me.onKeyUp,
+                keydown: me.onKeyDown,
+                keypress: me.onKeyPress
+            });
+        }
+    },
+
+    /**
+     * @private
+     * Override. Treat undefined and null values as equal to an empty string value.
+     */
+    isEqual: function(value1, value2) {
+        return this.isEqualAsString(value1, value2);
+    },
+
+    /**
+     * @private
+     * If grow=true, invoke the autoSize method when the field's value is changed.
+     */
+    onChange: function(newVal, oldVal) {
+        this.callParent(arguments);
+        this.autoSize();
+    },
+
+    getSubTplData: function() {
+        var me = this,
+            value = me.getRawValue(),
+            isEmpty = me.emptyText && value.length < 1,
+            maxLength = me.maxLength,
+            placeholder;
+            
+        // We can't just dump the value here, since MAX_VALUE ends up
+        // being something like 1.xxxxe+300, which gets interpreted as 1
+        // in the markup
+        if (me.enforceMaxLength) {
+            if (maxLength === Number.MAX_VALUE) {
+                maxLength = undefined;
+            }
+        } else {
+            maxLength = undefined;
+        }
+
+        if (isEmpty) {
+            if (Ext.supports.Placeholder) {
+                placeholder = me.emptyText;
+            } else {
+                value = me.emptyText;
+                me.valueContainsPlaceholder = true;
+            }
+        }
+
+        return Ext.apply(me.callParent(), {
+            maxLength   : maxLength,
+            readOnly    : me.readOnly,
+            placeholder : placeholder,
+            value       : value,
+            fieldCls    : me.fieldCls + ((isEmpty && (placeholder || value)) ? ' ' + me.emptyCls : '') + (me.allowBlank ? '' :  ' ' + me.requiredCls)
+        });
+    },
+
+    afterRender: function(){
+        this.autoSize();
+        this.callParent();
+    },
+
+    onMouseDown: function(e){
+        var me = this;
+        if(!me.hasFocus){
+            me.mon(me.inputEl, 'mouseup', Ext.emptyFn, me, { single: true, preventDefault: true });
+        }
+    },
+
+    /**
+     * Performs any necessary manipulation of a raw String value to prepare it for conversion and/or
+     * {@link #validate validation}. For text fields this applies the configured {@link #stripCharsRe}
+     * to the raw value.
+     * @param {String} value The unprocessed string value
+     * @return {String} The processed string value
+     */
+    processRawValue: function(value) {
+        var me = this,
+            stripRe = me.stripCharsRe,
+            newValue;
+
+        if (stripRe) {
+            newValue = value.replace(stripRe, '');
+            if (newValue !== value) {
+                me.setRawValue(newValue);
+                value = newValue;
+            }
+        }
+        return value;
+    },
+
+    //private
+    onDisable: function(){
+        this.callParent();
+        if (Ext.isIE) {
+            this.inputEl.dom.unselectable = 'on';
+        }
+    },
+
+    //private
+    onEnable: function(){
+        this.callParent();
+        if (Ext.isIE) {
+            this.inputEl.dom.unselectable = '';
+        }
+    },
+
+    onKeyDown: function(e) {
+        this.fireEvent('keydown', this, e);
+    },
+
+    onKeyUp: function(e) {
+        this.fireEvent('keyup', this, e);
+    },
+
+    onKeyPress: function(e) {
+        this.fireEvent('keypress', this, e);
+    },
+
+    /**
+     * Resets the current field value to the originally-loaded value and clears any validation messages.
+     * Also adds **{@link #emptyText}** and **{@link #emptyCls}** if the original value was blank.
+     */
+    reset : function(){
+        this.callParent();
+        this.applyEmptyText();
+    },
+
+    applyEmptyText : function(){
+        var me = this,
+            emptyText = me.emptyText,
+            isEmpty;
+
+        if (me.rendered && emptyText) {
+            isEmpty = me.getRawValue().length < 1 && !me.hasFocus;
+
+            if (Ext.supports.Placeholder) {
+                me.inputEl.dom.placeholder = emptyText;
+            } else if (isEmpty) {
+                me.setRawValue(emptyText);
+                me.valueContainsPlaceholder = true;
+            }
+
+            //all browsers need this because of a styling issue with chrome + placeholders.
+            //the text isnt vertically aligned when empty (and using the placeholder)
+            if (isEmpty) {
+                me.inputEl.addCls(me.emptyCls);
+            }
+
+            me.autoSize();
+        }
+    },
+    
+    afterFirstLayout: function() {
+        this.callParent();
+        if (Ext.isIE && this.disabled) {
+            var el = this.inputEl;
+            if (el) {
+                el.dom.unselectable = 'on';
+            }
+        }
+    },
+    
+    // private
+    beforeFocus : function(){
+        var me = this,
+            inputEl = me.inputEl,
+            emptyText = me.emptyText,
+            isEmpty;
+
+        me.callParent(arguments);
+        if ((emptyText && !Ext.supports.Placeholder) && (inputEl.dom.value === me.emptyText && me.valueContainsPlaceholder)) {
+            me.setRawValue('');
+            isEmpty = true;
+            inputEl.removeCls(me.emptyCls);
+            me.valueContainsPlaceholder = false;
+        } else if (Ext.supports.Placeholder) {
+            me.inputEl.removeCls(me.emptyCls);
+        }
+        if (me.selectOnFocus || isEmpty) {
+            // see: http://code.google.com/p/chromium/issues/detail?id=4505
+            if (Ext.isWebKit) {
+                if (!me.inputFocusTask) {
+                    me.inputFocusTask = new Ext.util.DelayedTask(me.focusInput, me);
+                }
+                me.inputFocusTask.delay(1);
+            } else {
+                inputEl.dom.select();
+            }
+        }
+    },
+    
+    focusInput: function(){
+        var input = this.inputEl;
+        if (input) {
+            input = input.dom;
+            if (input) {
+                input.select();
+            }
+        }    
+    },
+
+    onFocus: function() {
+        var me = this;
+        me.callParent(arguments);
+        if (me.emptyText) {
+            me.autoSize();
+        }
+    },
+
+    // private
+    postBlur : function(){
+        this.callParent(arguments);
+        this.applyEmptyText();
+    },
+
+    // private
+    filterKeys : function(e){
+        /*
+         * On European keyboards, the right alt key, Alt Gr, is used to type certain special characters.
+         * JS detects a keypress of this as ctrlKey & altKey. As such, we check that alt isn't pressed
+         * so we can still process these special characters.
+         */
+        if (e.ctrlKey && !e.altKey) {
+            return;
+        }
+        var key = e.getKey(),
+            charCode = String.fromCharCode(e.getCharCode());
+
+        if((Ext.isGecko || Ext.isOpera) && (e.isNavKeyPress() || key === e.BACKSPACE || (key === e.DELETE && e.button === -1))){
+            return;
+        }
+
+        if((!Ext.isGecko && !Ext.isOpera) && e.isSpecialKey() && !charCode){
+            return;
+        }
+        if(!this.maskRe.test(charCode)){
+            e.stopEvent();
+        }
+    },
+
+    getState: function() {
+        return this.addPropertyToState(this.callParent(), 'value');
+    },
+
+    applyState: function(state) {
+        this.callParent(arguments);
+        if(state.hasOwnProperty('value')) {
+            this.setValue(state.value);
+        }
+    },
+
+    /**
+     * Returns the raw String value of the field, without performing any normalization, conversion, or validation. Gets
+     * the current value of the input element if the field has been rendered, ignoring the value if it is the
+     * {@link #emptyText}. To get a normalized and converted value see {@link #getValue}.
+     * @return {String} The raw String value of the field
+     */
+    getRawValue: function() {
+        var me = this,
+            v = me.callParent();
+        if (v === me.emptyText && me.valueContainsPlaceholder) {
+            v = '';
+        }
+        return v;
+    },
+
+    /**
+     * Sets a data value into the field and runs the change detection and validation. Also applies any configured
+     * {@link #emptyText} for text fields. To set the value directly without these inspections see {@link #setRawValue}.
+     * @param {Object} value The value to set
+     * @return {Ext.form.field.Text} this
+     */
+    setValue: function(value) {
+        var me = this,
+            inputEl = me.inputEl;
+
+        if (inputEl && me.emptyText && !Ext.isEmpty(value)) {
+            inputEl.removeCls(me.emptyCls);
+            me.valueContainsPlaceholder = false;
+        }
+
+        me.callParent(arguments);
+
+        me.applyEmptyText();
+        return me;
+    },
+
+    /**
+     * Validates a value according to the field's validation rules and returns an array of errors
+     * for any failing validations. Validation rules are processed in the following order:
+     *
+     * 1. **Field specific validator**
+     *
+     *     A validator offers a way to customize and reuse a validation specification.
+     *     If a field is configured with a `{@link #validator}`
+     *     function, it will be passed the current field value.  The `{@link #validator}`
+     *     function is expected to return either:
+     *
+     *     - Boolean `true`  if the value is valid (validation continues).
+     *     - a String to represent the invalid message if invalid (validation halts).
+     *
+     * 2. **Basic Validation**
+     *
+     *     If the `{@link #validator}` has not halted validation,
+     *     basic validation proceeds as follows:
+     *
+     *     - `{@link #allowBlank}` : (Invalid message = `{@link #blankText}`)
+     *
+     *         Depending on the configuration of `{@link #allowBlank}`, a
+     *         blank field will cause validation to halt at this step and return
+     *         Boolean true or false accordingly.
+     *
+     *     - `{@link #minLength}` : (Invalid message = `{@link #minLengthText}`)
+     *
+     *         If the passed value does not satisfy the `{@link #minLength}`
+     *         specified, validation halts.
+     *
+     *     -  `{@link #maxLength}` : (Invalid message = `{@link #maxLengthText}`)
+     *
+     *         If the passed value does not satisfy the `{@link #maxLength}`
+     *         specified, validation halts.
+     *
+     * 3. **Preconfigured Validation Types (VTypes)**
+     *
+     *     If none of the prior validation steps halts validation, a field
+     *     configured with a `{@link #vtype}` will utilize the
+     *     corresponding {@link Ext.form.field.VTypes VTypes} validation function.
+     *     If invalid, either the field's `{@link #vtypeText}` or
+     *     the VTypes vtype Text property will be used for the invalid message.
+     *     Keystrokes on the field will be filtered according to the VTypes
+     *     vtype Mask property.
+     *
+     * 4. **Field specific regex test**
+     *
+     *     If none of the prior validation steps halts validation, a field's
+     *     configured `{@link #regex}` test will be processed.
+     *     The invalid message for this test is configured with `{@link #regexText}`
+     *
+     * @param {Object} value The value to validate. The processed raw value will be used if nothing is passed.
+     * @return {String[]} Array of any validation errors
+     */
+    getErrors: function(value) {
+        var me = this,
+            errors = me.callParent(arguments),
+            validator = me.validator,
+            vtype = me.vtype,
+            vtypes = Ext.form.field.VTypes,
+            regex = me.regex,
+            format = Ext.String.format,
+            msg, trimmed, isBlank;
+
+        value = value || me.processRawValue(me.getRawValue());
+
+        if (Ext.isFunction(validator)) {
+            msg = validator.call(me, value);
+            if (msg !== true) {
+                errors.push(msg);
+            }
+        }
+        
+        trimmed = me.allowOnlyWhitespace ? value : Ext.String.trim(value);
+
+        if (trimmed.length < 1 || (value === me.emptyText && me.valueContainsPlaceholder)) {
+            if (!me.allowBlank) {
+                errors.push(me.blankText);
+            }
+            // If we are not configured to validate blank values, there cannot be any additional errors
+            if (!me.validateBlank) {
+                return errors;
+            }
+            isBlank = true;
+        }
+
+        // If a blank value has been allowed through, then exempt it dfrom the minLength check.
+        // It must be allowed to hit the vtype validation.
+        if (!isBlank && value.length < me.minLength) {
+            errors.push(format(me.minLengthText, me.minLength));
+        }
+
+        if (value.length > me.maxLength) {
+            errors.push(format(me.maxLengthText, me.maxLength));
+        }
+
+        if (vtype) {
+            if (!vtypes[vtype](value, me)) {
+                errors.push(me.vtypeText || vtypes[vtype +'Text']);
+            }
+        }
+
+        if (regex && !regex.test(value)) {
+            errors.push(me.regexText || me.invalidText);
+        }
+
+        return errors;
+    },
+
+    /**
+     * Selects text in this field
+     * @param {Number} [start=0] The index where the selection should start
+     * @param {Number} [end] The index where the selection should end (defaults to the text length)
+     */
+    selectText : function(start, end){
+        var me = this,
+            v = me.getRawValue(),
+            doFocus = true,
+            el = me.inputEl.dom,
+            undef,
+            range;
+
+        if (v.length > 0) {
+            start = start === undef ? 0 : start;
+            end = end === undef ? v.length : end;
+            if (el.setSelectionRange) {
+                el.setSelectionRange(start, end);
+            }
+            else if(el.createTextRange) {
+                range = el.createTextRange();
+                range.moveStart('character', start);
+                range.moveEnd('character', end - v.length);
+                range.select();
+            }
+            doFocus = Ext.isGecko || Ext.isOpera;
+        }
+        if (doFocus) {
+            me.focus();
+        }
+    },
+
+    /**
+     * Automatically grows the field to accomodate the width of the text up to the maximum field width allowed. This
+     * only takes effect if {@link #grow} = true, and fires the {@link #autosize} event if the width changes.
+     */
+    autoSize: function() {
+        var me = this;
+        if (me.grow && me.rendered) {
+            me.autoSizing = true;
+            me.updateLayout();
+        }
+    },
+
+    afterComponentLayout: function() {
+        var me = this,
+            width;
+
+        me.callParent(arguments);
+        if (me.autoSizing) {
+            width = me.inputEl.getWidth();
+            if (width !== me.lastInputWidth) {
+                me.fireEvent('autosize', me, width);
+                me.lastInputWidth = width;
+                delete me.autoSizing;
+            }
+        }
+    },
+    
+    onDestroy: function(){
+        var me = this;
+        me.callParent();
+        
+        if (me.inputFocusTask) {
+            me.inputFocusTask.cancel();
+            me.inputFocusTask = null;
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Layout class for {@link Ext.form.field.TextArea} fields. Handles sizing the textarea field.
+ * @private
+ */
+Ext.define('Ext.layout.component.field.TextArea', {
+    extend:  Ext.layout.component.field.Text ,
+    alias: 'layout.textareafield',
+
+    type: 'textareafield',
+    
+    canGrowWidth: false,
+    
+    naturalSizingProp: 'cols',
+    
+    beginLayout: function(ownerContext){
+        this.callParent(arguments);
+        ownerContext.target.inputEl.setStyle('height', '');
+    },
+
+    measureContentHeight: function (ownerContext) {
+        var me = this,
+            owner = me.owner,
+            height = me.callParent(arguments),
+            inputContext, inputEl, value, max, curWidth, calcHeight;
+
+        if (owner.grow && !ownerContext.state.growHandled) {
+            inputContext = ownerContext.inputContext;
+            inputEl = owner.inputEl;
+            curWidth = inputEl.getWidth(true); //subtract border/padding to get the available width for the text
+
+            // Get and normalize the field value for measurement
+            value = Ext.util.Format.htmlEncode(inputEl.dom.value) || ' ';
+            value += owner.growAppend;
+            
+            // Translate newlines to <br> tags
+            value = value.replace(/\n/g, '<br/>');
+
+            // Find the height that contains the whole text value
+            calcHeight = Ext.util.TextMetrics.measure(inputEl, value, curWidth).height +
+                         inputContext.getBorderInfo().height + inputContext.getPaddingInfo().height;
+
+            // Constrain
+            calcHeight = Ext.Number.constrain(calcHeight, owner.growMin, owner.growMax);
+            inputContext.setHeight(calcHeight);
+            ownerContext.state.growHandled = true;
+            
+            // Now that we've set the inputContext, we need to recalculate the width
+            inputContext.domBlock(me, 'height');
+            height = NaN;
+        }
+        return height;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Robert Dougan <rob at sencha.com>
+ *
+ * This class creates a multiline text field, which can be used as a direct replacement for traditional
+ * textarea fields. In addition, it supports automatically {@link #grow growing} the height of the textarea to
+ * fit its content.
+ *
+ * All of the configuration options from {@link Ext.form.field.Text} can be used on TextArea.
+ *
+ * Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.form.FormPanel', {
+ *         title      : 'Sample TextArea',
+ *         width      : 400,
+ *         bodyPadding: 10,
+ *         renderTo   : Ext.getBody(),
+ *         items: [{
+ *             xtype     : 'textareafield',
+ *             grow      : true,
+ *             name      : 'message',
+ *             fieldLabel: 'Message',
+ *             anchor    : '100%'
+ *         }]
+ *     });
+ *
+ * Some other useful configuration options when using {@link #grow} are {@link #growMin} and {@link #growMax}.
+ * These allow you to set the minimum and maximum grow heights for the textarea.
+ * 
+ * **NOTE:** In some browsers, carriage returns ('\r', not to be confused with new lines)
+ * will be automatically stripped out the value is set to the textarea. Since we cannot
+ * use any reasonable method to attempt to re-insert these, they will automatically be
+ * stripped out to ensure the behaviour is consistent across browser.
+ */
+Ext.define('Ext.form.field.TextArea', {
+    extend: Ext.form.field.Text ,
+    alias: ['widget.textareafield', 'widget.textarea'],
+    alternateClassName: 'Ext.form.TextArea',
+               
+                         
+                                              
+                              
+      
+
+    // This template includes a `\n` after `<textarea>` opening tag so that an
+    // initial value starting with `\n` does not lose its first character when
+    // the markup is parsed. Both textareas below have the same value:
+    //
+    //     <textarea>initial value</textarea>
+    //
+    //     <textarea>
+    //     initial value
+    //     </textarea>
+    //
+    fieldSubTpl: [
+        '<textarea id="{id}" {inputAttrTpl}',
+            '<tpl if="name"> name="{name}"</tpl>',
+            '<tpl if="rows"> rows="{rows}" </tpl>',
+            '<tpl if="cols"> cols="{cols}" </tpl>',
+            '<tpl if="placeholder"> placeholder="{placeholder}"</tpl>',
+            '<tpl if="size"> size="{size}"</tpl>',
+            '<tpl if="maxLength !== undefined"> maxlength="{maxLength}"</tpl>',
+            '<tpl if="readOnly"> readonly="readonly"</tpl>',
+            '<tpl if="disabled"> disabled="disabled"</tpl>',
+            '<tpl if="tabIdx"> tabIndex="{tabIdx}"</tpl>',
+            ' class="{fieldCls} {typeCls} {inputCls}" ',
+            '<tpl if="fieldStyle"> style="{fieldStyle}"</tpl>',
+            ' autocomplete="off">\n',
+            '<tpl if="value">{[Ext.util.Format.htmlEncode(values.value)]}</tpl>',
+        '</textarea>',
+        {
+            disableFormats: true
+        }
+    ],
+
+    /**
+     * @cfg {Number} growMin
+     * The minimum height to allow when {@link #grow}=true
+     */
+    growMin: 60,
+
+    /**
+     * @cfg {Number} growMax
+     * The maximum height to allow when {@link #grow}=true
+     */
+    growMax: 1000,
+
+    /**
+     * @cfg {String} growAppend
+     * A string that will be appended to the field's current value for the purposes of calculating the target field
+     * size. Only used when the {@link #grow} config is true. Defaults to a newline for TextArea to ensure there is
+     * always a space below the current line.
+     */
+    growAppend: '\n-',
+
+    /**
+     * @cfg {Number} cols
+     * An initial value for the 'cols' attribute on the textarea element. This is only used if the component has no
+     * configured {@link #width} and is not given a width by its container's layout.
+     */
+    cols: 20,
+
+    /**
+     * @cfg {Number} rows
+     * An initial value for the 'rows' attribute on the textarea element. This is only used if the component has no
+     * configured {@link #height} and is not given a height by its container's layout. Defaults to 4.
+     */
+    rows: 4,
+
+    /**
+     * @cfg {Boolean} enterIsSpecial
+     * True if you want the ENTER key to be classed as a special key and the {@link #specialkey} event to be fired
+     * when ENTER is pressed.
+     */
+    enterIsSpecial: false,
+
+    /**
+     * @cfg {Boolean} preventScrollbars
+     * true to prevent scrollbars from appearing regardless of how much text is in the field. This option is only
+     * relevant when {@link #grow} is true. Equivalent to setting overflow: hidden.
+     */
+    preventScrollbars: false,
+
+    // private
+    componentLayout: 'textareafield',
+    
+    setGrowSizePolicy: Ext.emptyFn,
+    
+    returnRe: /\r/g,
+
+    inputCls: Ext.baseCSSPrefix + 'form-textarea',
+
+    // private
+    getSubTplData: function() {
+        var me = this,
+            fieldStyle = me.getFieldStyle(),
+            ret = me.callParent();
+
+        if (me.grow) {
+            if (me.preventScrollbars) {
+                ret.fieldStyle = (fieldStyle||'') + ';overflow:hidden;height:' + me.growMin + 'px';
+            }
+        }
+
+        Ext.applyIf(ret, {
+            cols: me.cols,
+            rows: me.rows
+        });
+
+        return ret;
+    },
+
+    afterRender: function () {
+        var me = this;
+
+        me.callParent(arguments);
+
+        me.needsMaxCheck = me.enforceMaxLength && me.maxLength !== Number.MAX_VALUE && !Ext.supports.TextAreaMaxLength;
+        if (me.needsMaxCheck) {
+            me.inputEl.on('paste', me.onPaste, me);
+        }
+    },
+    
+    // The following overrides deal with an issue whereby some browsers
+    // will strip carriage returns from the textarea input, while others
+    // will not. Since there's no way to be sure where to insert returns,
+    // the best solution is to strip them out in all cases to ensure that
+    // the behaviour is consistent in a cross browser fashion. As such,
+    // we override in all cases when setting the value to control this.
+    transformRawValue: function(value){
+        return this.stripReturns(value);
+    },
+    
+    transformOriginalValue: function(value){
+        return this.stripReturns(value); 
+    },
+    
+    getValue: function(){
+        return this.stripReturns(this.callParent());    
+    },
+    
+    valueToRaw: function(value){
+        value = this.stripReturns(value);
+        return this.callParent([value]);
+    },
+    
+    stripReturns: function(value){
+        if (value && typeof value === 'string') {
+            value = value.replace(this.returnRe, '');
+        }
+        return value;
+    },
+
+    onPaste: function(e){
+        var me = this;
+        if (!me.pasteTask) {
+            me.pasteTask = new Ext.util.DelayedTask(me.pasteCheck, me);
+        }
+        // since we can't get the paste data, we'll give the area a chance to populate
+        me.pasteTask.delay(1);
+    },
+    
+    pasteCheck: function(){
+        var me = this,
+            value = me.getValue(),
+            max = me.maxLength;
+            
+        if (value.length > max) {
+            value = value.substr(0, max);
+            me.setValue(value);
+        }
+    },
+
+    // private
+    fireKey: function(e) {
+        var me = this,
+            key = e.getKey(),
+            value;
+            
+        if (e.isSpecialKey() && (me.enterIsSpecial || (key !== e.ENTER || e.hasModifier()))) {
+            me.fireEvent('specialkey', me, e);
+        }
+        
+        if (me.needsMaxCheck && key !== e.BACKSPACE && key !== e.DELETE && !e.isNavKeyPress() && !me.isCutCopyPasteSelectAll(e, key)) {
+            value = me.getValue();
+            if (value.length >= me.maxLength) {
+                e.stopEvent();
+            }
+        }
+    },
+    
+    isCutCopyPasteSelectAll: function(e, key) {
+        if (e.ctrlKey) {
+            return key === e.A || key === e.C || key === e.V || key === e.X;
+        }
+        return false;
+    },
+
+    /**
+     * Automatically grows the field to accomodate the height of the text up to the maximum field height allowed. This
+     * only takes effect if {@link #grow} = true, and fires the {@link #autosize} event if the height changes.
+     */
+    autoSize: function() {
+        var me = this,
+            height;
+
+        if (me.grow && me.rendered) {
+            me.updateLayout();
+            height = me.inputEl.getHeight();
+            if (height !== me.lastInputHeight) {
+                /**
+                 * @event autosize
+                 * Fires when the {@link #autoSize} function is triggered and the field is resized according to
+                 * the grow/growMin/growMax configs as a result. This event provides a hook for the developer
+                 * to apply additional logic at runtime to resize the field if needed.
+                 * @param {Ext.form.field.Text} this
+                 * @param {Number} height
+                 */
+                me.fireEvent('autosize', me, height);
+                me.lastInputHeight = height;
+            }
+        }
+    },
+
+    // private
+    initAria: function() {
+        this.callParent(arguments);
+        this.getActionEl().dom.setAttribute('aria-multiline', true);
+    },
+    
+    beforeDestroy: function(){
+        var task = this.pasteTask;
+        if (task) {
+            task.cancel();
+            this.pasteTask = null;
+        }    
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A display-only text field which is not validated and not submitted. This is useful for when you want to display a
+ * value from a form's {@link Ext.form.Basic#load loaded data} but do not want to allow the user to edit or submit that
+ * value. The value can be optionally {@link #htmlEncode HTML encoded} if it contains HTML markup that you do not want
+ * to be rendered.
+ *
+ * If you have more complex content, or need to include components within the displayed content, also consider using a
+ * {@link Ext.form.FieldContainer} instead.
+ *
+ * Example:
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         renderTo: Ext.getBody(),
+ *         width: 175,
+ *         height: 120,
+ *         bodyPadding: 10,
+ *         title: 'Final Score',
+ *         items: [{
+ *             xtype: 'displayfield',
+ *             fieldLabel: 'Home',
+ *             name: 'home_score',
+ *             value: '10'
+ *         }, {
+ *             xtype: 'displayfield',
+ *             fieldLabel: 'Visitor',
+ *             name: 'visitor_score',
+ *             value: '11'
+ *         }],
+ *         buttons: [{
+ *             text: 'Update'
+ *         }]
+ *     });
+ */
+Ext.define('Ext.form.field.Display', {
+    extend: Ext.form.field.Base ,
+    alias: 'widget.displayfield',
+                                                   
+    alternateClassName: ['Ext.form.DisplayField', 'Ext.form.Display'],
+    fieldSubTpl: [
+        '<div id="{id}" role="input" ',
+        '<tpl if="fieldStyle"> style="{fieldStyle}"</tpl>', 
+        ' class="{fieldCls}">{value}</div>',
+        {
+            compiled: true,
+            disableFormats: true
+        }
+    ],
+
+    /**
+     * @cfg {Boolean} readOnly
+     * @private
+     */
+    readOnly: true,
+
+    /**
+     * @cfg {String} [fieldCls="x-form-display-field"]
+     * The default CSS class for the field.
+     */
+    fieldCls: Ext.baseCSSPrefix + 'form-display-field',
+
+    fieldBodyCls: Ext.baseCSSPrefix + 'form-display-field-body',
+
+    /**
+     * @cfg {Boolean} htmlEncode
+     * True to escape HTML in text when rendering it.
+     */
+    htmlEncode: false,
+    
+    /**
+     * @cfg {Function} renderer
+     * A function to transform the raw value for display in the field. The function will receive 2 arguments, the raw value
+     * and the {@link Ext.form.field.Display} object.
+     */
+    
+    /**
+     * @cfg {Object} scope
+     * The scope to execute the {@link #renderer} function. Defaults to this.
+     */
+
+    noWrap: false,
+    
+    /**
+     * @cfg {Boolean} validateOnChange
+     * @private
+     */
+    validateOnChange: false,
+
+    initEvents: Ext.emptyFn,
+
+    submitValue: false,
+    
+    isDirty: function(){
+        return false;
+    },
+
+    isValid: function() {
+        return true;
+    },
+
+    validate: function() {
+        return true;
+    },
+
+    getRawValue: function() {
+        return this.rawValue;
+    },
+
+    setRawValue: function(value) {
+        var me = this;
+            
+        value = Ext.value(value, '');
+        me.rawValue = value;
+        if (me.rendered) {
+            me.inputEl.dom.innerHTML = me.getDisplayValue();
+            me.updateLayout();
+        }
+        return value;
+    },
+
+    /**
+     * @private
+     * Format the value to display.
+     */
+    getDisplayValue: function() {
+        var me = this,
+            value = this.getRawValue(),
+            display;
+        if (me.renderer) {
+             display = me.renderer.call(me.scope || me, value, me);
+        } else {
+             display = me.htmlEncode ? Ext.util.Format.htmlEncode(value) : value;
+        }
+        return display;
+    },
+        
+    getSubTplData: function() {
+        var ret = this.callParent(arguments);
+
+        ret.value = this.getDisplayValue();
+
+        return ret;
+    }
+
+    /**
+     * @cfg {String} inputType
+     * @private
+     */
+    /**
+     * @cfg {Boolean} disabled
+     * @private
+     */
+    /**
+     * @cfg {Number} checkChangeEvents
+     * @private
+     */
+    /**
+     * @cfg {Number} checkChangeBuffer
+     * @private
+     */
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is a layout that enables anchoring of contained elements relative to the container's dimensions.
+ * If the container is resized, all anchored items are automatically rerendered according to their
+ * `{@link #anchor}` rules.
+ *
+ * This class is intended to be extended or created via the {@link Ext.container.AbstractContainer#layout layout}: 'anchor' 
+ * config, and should generally not need to be created directly via the new keyword.
+ * 
+ * AnchorLayout does not have any direct config options (other than inherited ones). By default,
+ * AnchorLayout will calculate anchor measurements based on the size of the container itself. However, the
+ * container using the AnchorLayout can supply an anchoring-specific config property of `anchorSize`.
+ *
+ * If anchorSize is specifed, the layout will use it as a virtual container for the purposes of calculating
+ * anchor measurements based on it instead, allowing the container to be sized independently of the anchoring
+ * logic if necessary.
+ *
+ *     @example
+ *     Ext.create('Ext.Panel', {
+ *         width: 500,
+ *         height: 400,
+ *         title: "AnchorLayout Panel",
+ *         layout: 'anchor',
+ *         renderTo: Ext.getBody(),
+ *         items: [
+ *             {
+ *                 xtype: 'panel',
+ *                 title: '75% Width and 20% Height',
+ *                 anchor: '75% 20%'
+ *             },
+ *             {
+ *                 xtype: 'panel',
+ *                 title: 'Offset -300 Width & -200 Height',
+ *                 anchor: '-300 -200'		
+ *             },
+ *             {
+ *                 xtype: 'panel',
+ *                 title: 'Mixed Offset and Percent',
+ *                 anchor: '-250 20%'
+ *             }
+ *         ]
+ *     });
+ */
+Ext.define('Ext.layout.container.Anchor', {
+
+    /* Begin Definitions */
+
+    alias: 'layout.anchor',
+    extend:  Ext.layout.container.Auto ,
+    alternateClassName: 'Ext.layout.AnchorLayout',
+
+    /* End Definitions */
+
+    type: 'anchor',
+
+    /**
+     * @cfg {String} anchor
+     *
+     * This configuation option is to be applied to **child `items`** of a container managed by
+     * this layout (ie. configured with `layout:'anchor'`).
+     *
+     * This value is what tells the layout how an item should be anchored to the container. `items`
+     * added to an AnchorLayout accept an anchoring-specific config property of **anchor** which is a string
+     * containing two values: the horizontal anchor value and the vertical anchor value (for example, '100% 50%').
+     * The following types of anchor values are supported:
+     *
+     * - **Percentage** : Any value between 1 and 100, expressed as a percentage.
+     *
+     *   The first anchor is the percentage width that the item should take up within the container, and the
+     *   second is the percentage height.  For example:
+     *
+     *       // two values specified
+     *       anchor: '100% 50%' // render item complete width of the container and
+     *                          // 1/2 height of the container
+     *       // one value specified
+     *       anchor: '100%'     // the width value; the height will default to auto
+     *
+     * - **Offsets** : Any positive or negative integer value.
+     *
+     *   This is a raw adjustment where the first anchor is the offset from the right edge of the container,
+     *   and the second is the offset from the bottom edge. For example:
+     *
+     *       // two values specified
+     *       anchor: '-50 -100' // render item the complete width of the container
+     *                          // minus 50 pixels and
+     *                          // the complete height minus 100 pixels.
+     *       // one value specified
+     *       anchor: '-50'      // anchor value is assumed to be the right offset value
+     *                          // bottom offset will default to 0
+     *
+     * - **Sides** : Valid values are `right` (or `r`) and `bottom` (or `b`).
+     *
+     *   Either the container must have a fixed size or an anchorSize config value defined at render time in
+     *   order for these to have any effect.
+     *   
+     * - **Mixed** :
+     *
+     *   Anchor values can also be mixed as needed.  For example, to render the width offset from the container
+     *   right edge by 50 pixels and 75% of the container's height use:
+     *   
+     *       anchor:   '-50 75%'
+     */
+
+    /**
+     * @cfg {String} defaultAnchor
+     * Default anchor for all child **container** items applied if no anchor or specific width is set on the child item.
+     */
+    defaultAnchor: '100%',
+
+    parseAnchorRE: /^(r|right|b|bottom)$/i,
+
+    manageOverflow: true,
+
+    beginLayoutCycle: function (ownerContext) {
+        var me = this,
+            dimensions = 0,
+            anchorSpec, childContext, childItems, i, length, target;
+
+        me.callParent(arguments);
+
+        childItems = ownerContext.childItems; // populated by callParent
+        length = childItems.length;
+
+        for (i = 0; i < length; ++i) {
+            childContext = childItems[i];
+            anchorSpec = childContext.target.anchorSpec;
+
+            if (anchorSpec) {
+                if (childContext.widthModel.calculated && anchorSpec.right) {
+                    dimensions |= 1;
+                }
+                if (childContext.heightModel.calculated && anchorSpec.bottom) {
+                    dimensions |= 2;
+                }
+
+                if (dimensions == 3) { // if (both dimensions in play)
+                    break;
+                }
+            }
+        }
+
+        ownerContext.anchorDimensions = dimensions;
+
+        me.sanityCheck(ownerContext);
+    },
+
+    calculateItems: function (ownerContext, containerSize) {
+        var me = this,
+            childItems = ownerContext.childItems,
+            length = childItems.length,
+            gotHeight = containerSize.gotHeight,
+            gotWidth = containerSize.gotWidth,
+            ownerHeight = containerSize.height,
+            ownerWidth = containerSize.width,
+            knownDimensions = (gotWidth ? 1 : 0) | (gotHeight ? 2 : 0),
+            anchorDimensions = ownerContext.anchorDimensions,
+            anchorSpec, childContext, childMargins, height, i, width;
+
+        if (!anchorDimensions) {
+            return true;
+        }
+
+        for (i = 0; i < length; i++) {
+            childContext = childItems[i];
+            childMargins = childContext.getMarginInfo();
+            anchorSpec = childContext.target.anchorSpec;
+
+            // Check widthModel in case "defaults" has applied an anchor to a component
+            // that also has width (which must win). If we did not make this check in this
+            // way, we would attempt to calculate a width where it had been configured.
+            //
+            if (gotWidth && childContext.widthModel.calculated) {
+                width = anchorSpec.right(ownerWidth) - childMargins.width;
+                width = me.adjustWidthAnchor(width, childContext);
+
+                childContext.setWidth(width);
+            }
+
+            // Repeat for height
+            if (gotHeight && childContext.heightModel.calculated) {
+                height = anchorSpec.bottom(ownerHeight) - childMargins.height;
+                height = me.adjustHeightAnchor(height, childContext);
+
+                childContext.setHeight(height);
+            }
+        }
+
+        // If all required dimensions are known, we're done
+        return (knownDimensions & anchorDimensions) === anchorDimensions;
+    },
+
+    sanityCheck: function (ownerContext) {
+        var shrinkWrapWidth = ownerContext.widthModel.shrinkWrap,
+            shrinkWrapHeight = ownerContext.heightModel.shrinkWrap,
+            children = ownerContext.childItems,
+            anchorSpec, comp, childContext,
+            i, length;
+
+        for (i = 0, length = children.length; i < length; ++i) {
+            childContext = children[i];
+            comp = childContext.target;
+            anchorSpec = comp.anchorSpec;
+
+            if (anchorSpec) {
+                if (childContext.widthModel.calculated && anchorSpec.right) {
+                    if (shrinkWrapWidth) {
+                        Ext.log({
+                            level: 'warn',
+                            msg: 'Right anchor on '+comp.id+' in shrinkWrap width container'
+                        });
+                    }
+                }
+
+                if (childContext.heightModel.calculated && anchorSpec.bottom) {
+                    if (shrinkWrapHeight) {
+                        Ext.log({
+                            level: 'warn',
+                            msg: 'Bottom anchor on '+comp.id+' in shrinkWrap height container'
+                        });
+                    }
+                }
+            }
+        }
+    },
+
+    // private
+    anchorFactory: {
+        offset: function (delta) {
+            return function(v) {
+                return v + delta;
+            };
+        },
+        ratio: function (ratio) {
+            return function(v) {
+                return Math.floor(v * ratio);
+            };
+        },
+        standard: function (diff) {
+            return function(v) {
+                return v - diff;
+            };
+        }
+    },
+
+    parseAnchor: function(a, start, cstart) {
+        if (a && a != 'none') {
+            var factory = this.anchorFactory,
+                delta;
+
+            if (this.parseAnchorRE.test(a)) {
+                return factory.standard(cstart - start);
+            }    
+            if (a.indexOf('%') != -1) {
+                return factory.ratio(parseFloat(a.replace('%', '')) * 0.01);
+            }    
+            delta = parseInt(a, 10);
+            if (!isNaN(delta)) {
+                return factory.offset(delta);
+            }
+        }
+        return null;
+    },
+
+    // private
+    adjustWidthAnchor: function(value, childContext) {
+        return value;
+    },
+
+    // private
+    adjustHeightAnchor: function(value, childContext) {
+        return value;
+    },
+
+    configureItem: function(item) {
+        var me = this,
+            owner = me.owner,
+            anchor= item.anchor,
+            anchorsArray,
+            anchorWidth,
+            anchorHeight;
+
+        me.callParent(arguments);
+
+        if (!item.anchor && item.items && !Ext.isNumber(item.width) && !(Ext.isIE6 && Ext.isStrict)) {
+            item.anchor = anchor = me.defaultAnchor;
+        }
+
+        /**
+         * @cfg {Number/Object} anchorSize
+         * Defines the anchoring size of container.
+         * Either a number to define the width of the container or an object with `width` and `height` fields.
+         * @member Ext.container.Container
+         */ 
+        if (owner.anchorSize) {
+            if (typeof owner.anchorSize == 'number') {
+                anchorWidth = owner.anchorSize;
+            } else {
+                anchorWidth = owner.anchorSize.width;
+                anchorHeight = owner.anchorSize.height;
+            }
+        } else {
+            anchorWidth = owner.initialConfig.width;
+            anchorHeight = owner.initialConfig.height;
+        }
+
+        if (anchor) {
+            // cache all anchor values
+            anchorsArray = anchor.split(' ');
+            item.anchorSpec = {
+                right: me.parseAnchor(anchorsArray[0], item.initialConfig.width, anchorWidth),
+                bottom: me.parseAnchor(anchorsArray[1], item.initialConfig.height, anchorHeight)
+            };
+        }
+    },
+
+    sizePolicy: {
+        $: {
+            readsWidth: 1,
+            readsHeight: 1,
+            setsWidth: 0,
+            setsHeight: 0
+        },
+        b: {
+            readsWidth: 1,
+            readsHeight: 0,
+            setsWidth: 0,
+            setsHeight: 1
+        },
+        r: {
+            $: {
+                readsWidth: 0,
+                readsHeight: 1,
+                setsWidth: 1,
+                setsHeight: 0
+            },
+            b: {
+                readsWidth: 0,
+                readsHeight: 0,
+                setsWidth: 1,
+                setsHeight: 1
+            }
+        }
+    },
+
+    getItemSizePolicy: function (item) {
+        var anchorSpec = item.anchorSpec,
+            key = '$',
+            policy = this.sizePolicy,
+            sizeModel;
+
+        if (anchorSpec) {
+            sizeModel = this.owner.getSizeModel();
+            if (anchorSpec.right && !sizeModel.width.shrinkWrap) {
+                policy = policy.r;
+            }
+            if (anchorSpec.bottom && !sizeModel.height.shrinkWrap) {
+                key = 'b';
+            }
+        }
+
+        return policy[key];
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+// @define Ext.MessageBox, Ext.Msg
+
+/**
+ * Utility class for generating different styles of message boxes.  The singleton instance, Ext.MessageBox
+ * alias `Ext.Msg` can also be used.
+ *
+ * Note that a MessageBox is asynchronous.  Unlike a regular JavaScript `alert` (which will halt
+ * browser execution), showing a MessageBox will not cause the code to stop.  For this reason, if you have code
+ * that should only run *after* some user feedback from the MessageBox, you must use a callback function
+ * (see the `function` parameter for {@link #method-show} for more details).
+ *
+ * Basic alert
+ *
+ *     @example
+ *     Ext.Msg.alert('Status', 'Changes saved successfully.');
+ *
+ * Prompt for user data and process the result using a callback
+ *
+ *     @example
+ *     Ext.Msg.prompt('Name', 'Please enter your name:', function(btn, text){
+ *         if (btn == 'ok'){
+ *             // process text value and close...
+ *         }
+ *     });
+ *
+ * Show a dialog using config options
+ *
+ *     @example
+ *     Ext.Msg.show({
+ *          title:'Save Changes?',
+ *          msg: 'You are closing a tab that has unsaved changes. Would you like to save your changes?',
+ *          buttons: Ext.Msg.YESNOCANCEL,
+ *          icon: Ext.Msg.QUESTION
+ *     });
+ */
+Ext.define('Ext.window.MessageBox', {
+    extend:  Ext.window.Window ,
+
+               
+                              
+                              
+                                  
+                                 
+                            
+                                      
+                                    
+                         
+      
+
+    alias: 'widget.messagebox',
+
+    /**
+     * @property
+     * Button config that displays a single OK button
+     */
+    OK : 1,
+    /**
+     * @property
+     * Button config that displays a single Yes button
+     */
+    YES : 2,
+    /**
+     * @property
+     * Button config that displays a single No button
+     */
+    NO : 4,
+    /**
+     * @property
+     * Button config that displays a single Cancel button
+     */
+    CANCEL : 8,
+    /**
+     * @property
+     * Button config that displays OK and Cancel buttons
+     */
+    OKCANCEL : 9,
+    /**
+     * @property
+     * Button config that displays Yes and No buttons
+     */
+    YESNO : 6,
+    /**
+     * @property
+     * Button config that displays Yes, No and Cancel buttons
+     */
+    YESNOCANCEL : 14,
+    /**
+     * @property
+     * The CSS class that provides the INFO icon image
+     */
+    INFO : Ext.baseCSSPrefix + 'message-box-info',
+    /**
+     * @property
+     * The CSS class that provides the WARNING icon image
+     */
+    WARNING : Ext.baseCSSPrefix + 'message-box-warning',
+    /**
+     * @property
+     * The CSS class that provides the QUESTION icon image
+     */
+    QUESTION : Ext.baseCSSPrefix + 'message-box-question',
+    /**
+     * @property
+     * The CSS class that provides the ERROR icon image
+     */
+    ERROR : Ext.baseCSSPrefix + 'message-box-error',
+
+    // hide it by offsets. Windows are hidden on render by default.
+    hideMode: 'offsets',
+    closeAction: 'hide',
+    resizable: false,
+    title: ' ',
+
+    defaultMinWidth: 250,
+    defaultMaxWidth: 600,
+    defaultMinHeight: 110,
+    defaultMaxHeight: 500,
+    
+    // Forcibly set these to null on the prototype to override anything set higher in
+    // the hierarchy
+    minWidth: null,
+    maxWidth: null,
+    minHeight: null,
+    maxHeight: null,
+    constrain: true,
+
+    cls: [Ext.baseCSSPrefix + 'message-box', Ext.baseCSSPrefix + 'hide-offsets'],
+
+    layout: {
+        type: 'vbox',
+        align: 'stretch'
+    },
+
+    // We want to shrinkWrap around all docked items
+    shrinkWrapDock: true,
+
+    /**
+     * @property
+     * The default height in pixels of the message box's multiline textarea if displayed.
+     */
+    defaultTextHeight : 75,
+    /**
+     * @property
+     * The minimum width in pixels of the message box if it is a progress-style dialog.  This is useful
+     * for setting a different minimum width than text-only dialogs may need.
+     */
+    minProgressWidth : 250,
+    /**
+     * @property
+     * The minimum width in pixels of the message box if it is a prompt dialog.  This is useful
+     * for setting a different minimum width than text-only dialogs may need.
+     */
+    minPromptWidth: 250,
+    //<locale type="object">
+    /**
+     * @property
+     * An object containing the default button text strings that can be overriden for localized language support.
+     * Supported properties are: ok, cancel, yes and no.  Generally you should include a locale-specific
+     * resource file for handling language support across the framework.
+     * Customize the default text like so:
+     *
+     *     Ext.window.MessageBox.buttonText.yes = "oui"; //french
+     */
+    buttonText: {
+        ok: 'OK',
+        yes: 'Yes',
+        no: 'No',
+        cancel: 'Cancel'
+    },
+    //</locale>
+
+    buttonIds: [
+        'ok', 'yes', 'no', 'cancel'
+    ],
+
+    //<locale type="object">
+    titleText: {
+        confirm: 'Confirm',
+        prompt: 'Prompt',
+        wait: 'Loading...',
+        alert: 'Attention'
+    },
+    //</locale>
+
+    iconHeight: 35,
+    iconWidth: 50,
+
+    makeButton: function(btnIdx) {
+        var btnId = this.buttonIds[btnIdx];
+        return new Ext.button.Button({
+            handler: this.btnCallback,
+            itemId: btnId,
+            scope: this,
+            text: this.buttonText[btnId],
+            minWidth: 75
+        });
+    },
+
+    btnCallback: function(btn) {
+        var me = this,
+            value,
+            field;
+
+        if (me.cfg.prompt || me.cfg.multiline) {
+            if (me.cfg.multiline) {
+                field = me.textArea;
+            } else {
+                field = me.textField;
+            }
+            value = field.getValue();
+            field.reset();
+        }
+
+        // Component.onHide blurs the active element if the Component contains the active element
+        me.hide();
+        me.userCallback(btn.itemId, value, me.cfg);
+    },
+
+    hide: function() {
+        var me = this,
+            cls = me.cfg.cls;
+
+        me.dd.endDrag();
+        me.progressBar.reset();
+        if (cls) {
+            me.removeCls(cls);
+        }
+        me.callParent(arguments);
+    },
+
+    constructor: function(cfg) {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // set the default min/max/Width/Height to the initially configured min/max/Width/Height
+        // so that it will be used as the default when reconfiguring.
+        me.minWidth = me.defaultMinWidth = (me.minWidth || me.defaultMinWidth);
+        me.maxWidth = me.defaultMaxWidth = (me.maxWidth || me.defaultMaxWidth);
+        me.minHeight = me.defaultMinHeight = (me.minHeight || me.defaultMinHeight);
+        me.maxHeight = me.defaultMaxHeight = (me.maxHeight || me.defaultMaxHeight);
+    },
+
+    initComponent: function(cfg) {
+        var me = this,
+            baseId = me.id,
+            i, button;
+
+        me.title = ' ';
+
+        me.topContainer = new Ext.container.Container({
+            layout: 'hbox',
+            padding: 10,
+            style: {
+                overflow: 'hidden'
+            },
+            items: [
+                me.iconComponent = new Ext.Component({
+                    width: me.iconWidth,
+                    height: me.iconHeight
+                }),
+                me.promptContainer = new Ext.container.Container({
+                    flex: 1,
+                    layout: 'anchor',
+                    items: [
+                        me.msg = new Ext.form.field.Display({
+                            id: baseId + '-displayfield',
+                            cls: me.baseCls + '-text'
+                        }),
+                        me.textField = new Ext.form.field.Text({
+                            id: baseId + '-textfield',
+                            anchor: '100%',
+                            enableKeyEvents: true,
+                            listeners: {
+                                keydown: me.onPromptKey,
+                                scope: me
+                            }
+                        }),
+                        me.textArea = new Ext.form.field.TextArea({
+                            id: baseId + '-textarea',
+                            anchor: '100%',
+                            height: 75
+                        })
+                    ]
+                })
+            ]
+        });
+        me.progressBar = new Ext.ProgressBar({
+            id: baseId + '-progressbar',
+            margins: '0 10 10 10'
+        });
+
+        me.items = [me.topContainer, me.progressBar];
+
+        // Create the buttons based upon passed bitwise config
+        me.msgButtons = [];
+        for (i = 0; i < 4; i++) {
+            button = me.makeButton(i);
+            me.msgButtons[button.itemId] = button;
+            me.msgButtons.push(button);
+        }
+        me.bottomTb = new Ext.toolbar.Toolbar({
+            id: baseId + '-toolbar',
+            ui: 'footer',
+            dock: 'bottom',
+            layout: {
+                pack: 'center'
+            },
+            items: [
+                me.msgButtons[0],
+                me.msgButtons[1],
+                me.msgButtons[2],
+                me.msgButtons[3]
+            ]
+        });
+        me.dockedItems = [me.bottomTb];
+        me.on('close', me.onClose, me);
+        me.callParent();
+    },
+
+    onClose: function(){
+        var btn = this.header.child('[type=close]');
+        // Give a temporary itemId so it can act like the cancel button
+        btn.itemId = 'cancel';
+        this.btnCallback(btn);
+        delete btn.itemId;
+    },
+
+    onPromptKey: function(textField, e) {
+        var me = this;
+
+        if (e.keyCode === e.RETURN || e.keyCode === 10) {
+            if (me.msgButtons.ok.isVisible()) {
+                me.msgButtons.ok.handler.call(me, me.msgButtons.ok);
+            } else if (me.msgButtons.yes.isVisible()) {
+                me.msgButtons.yes.handler.call(me, me.msgButtons.yes);
+            }
+        }
+    },
+
+    reconfigure: function(cfg) {
+        var me = this,
+            buttons = 0,
+            hideToolbar = true,
+            oldButtonText = me.buttonText,
+            resizer = me.resizer,
+            resizeTracker, width, height, i, textArea, textField,
+            msg, progressBar, msgButtons;
+
+        // Restore default buttonText before reconfiguring.
+        me.updateButtonText();
+
+        cfg = cfg || {};
+        me.cfg = cfg;
+        if (cfg.width) {
+            width = cfg.width;
+        }
+
+        if (cfg.height) {
+            height = cfg.height;
+        }
+
+        me.minWidth = cfg.minWidth || me.defaultMinWidth;
+        me.maxWidth = cfg.maxWidth || me.defaultMaxWidth;
+        me.minHeight = cfg.minHeight || me.defaultMinHeight;
+        me.maxHeight = cfg.maxHeight || me.defaultMaxHeight;
+
+        if (resizer) {
+            resizeTracker = resizer.resizeTracker;
+            resizer.minWidth = resizeTracker.minWidth = me.minWidth;
+            resizer.maxWidth = resizeTracker.maxWidth = me.maxWidth;
+            resizer.minHeight = resizeTracker.minHeight = me.minHeight;
+            resizer.maxHeight = resizeTracker.maxHeight = me.maxHeight;
+        }
+
+        // Default to allowing the Window to take focus.
+        delete me.defaultFocus;
+        if (cfg.defaultFocus) {
+            me.defaultFocus = cfg.defaultFocus;
+        }
+
+        // clear any old animateTarget
+        me.animateTarget = cfg.animateTarget || undefined;
+
+        // Defaults to modal
+        me.modal = cfg.modal !== false;
+
+        // Show the title/icon
+        me.setTitle(cfg.title || '');
+        me.setIconCls(cfg.iconCls || '');
+
+        // Extract button configs
+        if (Ext.isObject(cfg.buttons)) {
+            me.buttonText = cfg.buttons;
+            buttons = 0;
+        } else {
+            me.buttonText = cfg.buttonText || me.buttonText;
+            buttons = Ext.isNumber(cfg.buttons) ? cfg.buttons : 0;
+        }
+
+        // Apply custom-configured buttonText
+        // Infer additional buttons from the specified property names in the buttonText object
+        buttons = buttons | me.updateButtonText();
+
+        // Restore buttonText. Next run of reconfigure will restore to prototype's buttonText
+        me.buttonText = oldButtonText;
+
+        // During the on render, or size resetting layouts, and in subsequent hiding and showing, we need to
+        // suspend layouts, and flush at the end when the Window's children are at their final visibility.
+        Ext.suspendLayouts();
+        delete me.width;
+        delete me.height;
+        if (width || height) {
+            if (width) {
+                me.setWidth(width);
+            }
+
+            if (height) {
+                me.setHeight(height);
+            }
+        }
+        me.hidden = false;
+        if (!me.rendered) {
+            me.render(Ext.getBody());
+        }
+
+        // Hide or show the close tool
+        me.closable = cfg.closable !== false && !cfg.wait;
+        me.header.child('[type=close]').setVisible(me.closable);
+
+        // Hide or show the header
+        if (!cfg.title && !me.closable && !cfg.iconCls) {
+            me.header.hide();
+        } else {
+            me.header.show();
+        }
+
+        // Default to dynamic drag: drag the window, not a ghost
+        me.liveDrag = !cfg.proxyDrag;
+
+        // wrap the user callback
+        me.userCallback = Ext.Function.bind(cfg.callback ||cfg.fn || Ext.emptyFn, cfg.scope || Ext.global);
+
+        // Hide or show the icon Component
+        me.setIcon(cfg.icon, cfg.iconWidth, cfg.iconHeight);
+
+        // Hide or show the message area
+        msg = me.msg;
+        if (cfg.msg) {
+            msg.setValue(cfg.msg);
+            msg.show();
+        } else {
+            msg.hide();
+        }
+
+        // Hide or show the input field
+        textArea = me.textArea;
+        textField = me.textField;
+        if (cfg.prompt || cfg.multiline) {
+            me.multiline = cfg.multiline;
+            if (cfg.multiline) {
+                textArea.setValue(cfg.value);
+                textArea.setHeight(cfg.defaultTextHeight || me.defaultTextHeight);
+                textArea.show();
+                textField.hide();
+                me.defaultFocus = textArea;
+            } else {
+                textField.setValue(cfg.value);
+                textArea.hide();
+                textField.show();
+                me.defaultFocus = textField;
+            }
+        } else {
+            textArea.hide();
+            textField.hide();
+        }
+
+        // Hide or show the progress bar
+        progressBar = me.progressBar;
+        if (cfg.progress || cfg.wait) {
+            progressBar.show();
+            me.updateProgress(0, cfg.progressText);
+            if(cfg.wait === true){
+                progressBar.wait(cfg.waitConfig);
+            }
+        } else {
+            progressBar.hide();
+        }
+
+        // Hide or show buttons depending on flag value sent.
+        msgButtons = me.msgButtons;
+        for (i = 0; i < 4; i++) {
+            if (buttons & Math.pow(2, i)) {
+
+                // Default to focus on the first visible button if focus not already set
+                if (!me.defaultFocus) {
+                    me.defaultFocus = msgButtons[i];
+                }
+                msgButtons[i].show();
+                hideToolbar = false;
+            } else {
+                msgButtons[i].hide();
+            }
+        }
+
+        // Hide toolbar if no buttons to show
+        if (hideToolbar) {
+            me.bottomTb.hide();
+        } else {
+            me.bottomTb.show();
+        }
+        Ext.resumeLayouts(true);
+    },
+
+    /**
+     * @private
+     * Set button text according to current buttonText property object
+     * @return {Number} The buttons bitwise flag based upon the button IDs specified in the buttonText property.
+     */
+    updateButtonText: function() {
+        var me = this,
+            buttonText = me.buttonText,
+            buttons = 0,
+            btnId,
+            btn;
+
+        for (btnId in buttonText) {
+            if (buttonText.hasOwnProperty(btnId)) {
+                btn = me.msgButtons[btnId];
+                if (btn) {
+                    if (me.cfg && me.cfg.buttonText) {
+                        buttons = buttons | Math.pow(2, Ext.Array.indexOf(me.buttonIds, btnId));
+                    }
+                    if (btn.text != buttonText[btnId]) {
+                        btn.setText(buttonText[btnId]);
+                    }
+                }
+            }
+        }
+        return buttons;
+    },
+
+    /**
+     * Displays a new message box, or reinitializes an existing message box, based on the config options passed in. All
+     * display functions (e.g. prompt, alert, etc.) on MessageBox call this function internally, although those calls
+     * are basic shortcuts and do not support all of the config options allowed here.
+     *
+     * Example usage:
+     *
+     *     Ext.Msg.show({
+     *         title: 'Address',
+     *         msg: 'Please enter your address:',
+     *         width: 300,
+     *         buttons: Ext.Msg.OKCANCEL,
+     *         multiline: true,
+     *         fn: saveAddress,
+     *         animateTarget: 'addAddressBtn',
+     *         icon: Ext.window.MessageBox.INFO
+     *     });
+     *
+     * @param {Object} config The following config options are supported:
+     *
+     * @param {String/Ext.dom.Element} config.animateTarget
+     * An id or Element from which the message box should animate as it opens and closes.
+     *
+     * @param {Number} [config.buttons=false]
+     * A bitwise button specifier consisting of the sum of any of the following constants:
+     *
+     *  - Ext.MessageBox.OK
+     *  - Ext.MessageBox.YES
+     *  - Ext.MessageBox.NO
+     *  - Ext.MessageBox.CANCEL
+     *
+     * Some common combinations have already been predefined:
+     *
+     *  - Ext.MessageBox.OKCANCEL
+     *  - Ext.MessageBox.YESNO
+     *  - Ext.MessageBox.YESNOCANCEL
+     *
+     * Or false to not show any buttons.
+     *
+     * This may also be specified as an object hash containing custom button text in the same format as the
+     * {@link #buttonText} config. Button IDs present as property names will be made visible.
+     *
+     * @param {Boolean} config.closable
+     * False to hide the top-right close button (defaults to true). Note that progress and wait dialogs will ignore this
+     * property and always hide the close button as they can only be closed programmatically.
+     *
+     * @param {String} config.cls
+     * A custom CSS class to apply to the message box's container element
+     *
+     * @param {Number} [config.defaultTextHeight=75]
+     * The default height in pixels of the message box's multiline textarea if displayed.
+     *
+     * @param {Function} config.fn
+     * A callback function which is called when the dialog is dismissed either by clicking on the configured buttons, or
+     * on the dialog close button, or by pressing the return button to enter input.
+     *
+     * Progress and wait dialogs will ignore this option since they do not respond to user actions and can only be
+     * closed programmatically, so any required function should be called by the same code after it closes the dialog.
+     * Parameters passed:
+     *
+     *  @param {String} config.fn.buttonId The ID of the button pressed, one of:
+     *
+     * - ok
+     * - yes
+     * - no
+     * - cancel
+     *
+     *  @param {String} config.fn.text Value of the input field if either `prompt` or `multiline` is true
+     *  @param {Object} config.fn.opt The config object passed to show.
+     *
+     * @param {Object} config.buttonText
+     * An object containing string properties which override the system-supplied button text values just for this
+     * invocation. The property names are:
+     *
+     * - ok
+     * - yes
+     * - no
+     * - cancel
+     *
+     * @param {Object} config.scope
+     * The scope (`this` reference) in which the function will be executed.
+     *
+     * @param {String} config.icon
+     * A CSS class that provides a background image to be used as the body icon for the dialog.
+     * One can use a predefined icon class:
+     *
+     *  - Ext.MessageBox.INFO
+     *  - Ext.MessageBox.WARNING
+     *  - Ext.MessageBox.QUESTION
+     *  - Ext.MessageBox.ERROR
+     *
+     * or use just any `'custom-class'`. Defaults to empty string.
+     *
+     * @param {String} config.iconCls
+     * The standard {@link Ext.window.Window#iconCls} to add an optional header icon (defaults to '')
+     * 
+     * @param {String} config.defaultFocus
+     * The button to focus when showing the dialog. If not specified, defaults to
+     * the first visible button.
+     *
+     * @param {Number} config.maxWidth
+     * The maximum width in pixels of the message box (defaults to 600)
+     *
+     * @param {Number} config.minWidth
+     * The minimum width in pixels of the message box (defaults to 100)
+     *
+     * @param {Boolean} config.modal
+     * False to allow user interaction with the page while the message box is displayed (defaults to true)
+     *
+     * @param {String} config.msg
+     * A string that will replace the existing message box body text (defaults to the XHTML-compliant non-breaking space
+     * character ' ')
+     *
+     * @param {Boolean} config.multiline
+     * True to prompt the user to enter multi-line text (defaults to false)
+     *
+     * @param {Boolean} config.progress
+     * True to display a progress bar (defaults to false)
+     *
+     * @param {String} config.progressText
+     * The text to display inside the progress bar if progress = true (defaults to '')
+     *
+     * @param {Boolean} config.prompt
+     * True to prompt the user to enter single-line text (defaults to false)
+     *
+     * @param {Boolean} config.proxyDrag
+     * True to display a lightweight proxy while dragging (defaults to false)
+     *
+     * @param {String} config.title
+     * The title text
+     *
+     * @param {String} config.value
+     * The string value to set into the active textbox element if displayed
+     *
+     * @param {Boolean} config.wait
+     * True to display a progress bar (defaults to false)
+     *
+     * @param {Object} config.waitConfig
+     * A {@link Ext.ProgressBar#wait} config object (applies only if wait = true)
+     *
+     * @param {Number} config.width
+     * The width of the dialog in pixels
+     *
+     * @return {Ext.window.MessageBox} this
+     */
+    show: function(cfg) {
+        var me = this,
+            visibleFocusables;
+
+        // If called during global layout suspension, make the call after layout resumption
+        if (Ext.AbstractComponent.layoutSuspendCount) {
+            Ext.on({
+                resumelayouts: function() {
+                    me.show(cfg);
+                },
+                single: true
+            });
+            return me;
+        }
+
+        me.reconfigure(cfg);
+        if (cfg.cls) {
+            me.addCls(cfg.cls);
+        }
+
+        // Do not steal focus from anything that may be focused if the MessageBox has no visible focusable
+        // items. For example, a "wait" message box should not get focus.
+        visibleFocusables = me.query('textfield:not([hidden]),textarea:not([hidden]),button:not([hidden])');
+        me.preventFocusOnActivate = !visibleFocusables.length;
+
+        // Set the flag, so that the parent show method performs the show procedure that we need.
+        // ie: animation from animTarget, onShow processing and focusing.
+        me.hidden = true;
+        me.callParent();
+        return me;
+    },
+
+    onShow: function() {
+        this.callParent(arguments);
+        this.center();
+    },
+
+    updateText: function(text) {
+        this.msg.setValue(text);
+    },
+
+    /**
+     * Adds the specified icon to the dialog.  By default, the class 'x-messagebox-icon' is applied for default
+     * styling, and the class passed in is expected to supply the background image url. Pass in empty string ('')
+     * to clear any existing icon. This method must be called before the MessageBox is shown.
+     * The following built-in icon classes are supported, but you can also pass in a custom class name:
+     *
+     *     Ext.window.MessageBox.INFO
+     *     Ext.window.MessageBox.WARNING
+     *     Ext.window.MessageBox.QUESTION
+     *     Ext.window.MessageBox.ERROR
+     *
+     * @param {String} icon A CSS classname specifying the icon's background image url, or empty string to clear the icon
+     * @param {Number} [width] The width of the icon. If not specified, the default is used
+     * @param {Number} [height] The height of the icon. If not specified, the default is used
+     * @return {Ext.window.MessageBox} this
+     */
+    setIcon : function(icon, width, height) {
+        var me = this,
+            iconCmp = me.iconComponent,
+            cls = me.messageIconCls;
+
+        if (cls) {
+            iconCmp.removeCls(cls);
+        }
+
+        if (icon) {
+            iconCmp.show();
+            iconCmp.setSize(width || me.iconWidth, height || me.iconHeight);
+            iconCmp.addCls(Ext.baseCSSPrefix + 'dlg-icon');
+            iconCmp.addCls(me.messageIconCls = icon);
+        } else {
+            iconCmp.removeCls(Ext.baseCSSPrefix + 'dlg-icon');
+            iconCmp.hide();
+        }
+        return me;
+    },
+
+    /**
+     * Updates a progress-style message box's text and progress bar. Only relevant on message boxes
+     * initiated via {@link Ext.window.MessageBox#progress} or {@link Ext.window.MessageBox#wait},
+     * or by calling {@link Ext.window.MessageBox#method-show} with progress: true.
+     *
+     * @param {Number} [value=0] Any number between 0 and 1 (e.g., .5)
+     * @param {String} [progressText=''] The progress text to display inside the progress bar.
+     * @param {String} [msg] The message box's body text is replaced with the specified string (defaults to undefined
+     * so that any existing body text will not get overwritten by default unless a new value is passed in)
+     * @return {Ext.window.MessageBox} this
+     */
+    updateProgress : function(value, progressText, msg){
+        this.progressBar.updateProgress(value, progressText);
+        if (msg){
+            this.updateText(msg);
+        }
+        return this;
+    },
+
+    onEsc: function() {
+        if (this.closable !== false) {
+            this.callParent(arguments);
+        }
+    },
+
+    /**
+     * Displays a confirmation message box with Yes and No buttons (comparable to JavaScript's confirm).
+     * If a callback function is passed it will be called after the user clicks either button,
+     * and the id of the button that was clicked will be passed as the only parameter to the callback
+     * (could also be the top-right close button, which will always report as "cancel").
+     *
+     * @param {String} title The title bar text
+     * @param {String} msg The message box body text
+     * @param {Function} [fn] The callback function invoked after the message box is closed.
+     * See {@link #method-show} method for details.
+     * @param {Object} [scope=window] The scope (`this` reference) in which the callback is executed.
+     * @return {Ext.window.MessageBox} this
+     */
+    confirm: function(cfg, msg, fn, scope) {
+        if (Ext.isString(cfg)) {
+            cfg = {
+                title: cfg,
+                icon: this.QUESTION,
+                msg: msg,
+                buttons: this.YESNO,
+                callback: fn,
+                scope: scope
+            };
+        }
+        return this.show(cfg);
+    },
+
+    /**
+     * Displays a message box with OK and Cancel buttons prompting the user to enter some text (comparable to JavaScript's prompt).
+     * The prompt can be a single-line or multi-line textbox.  If a callback function is passed it will be called after the user
+     * clicks either button, and the id of the button that was clicked (could also be the top-right
+     * close button, which will always report as "cancel") and the text that was entered will be passed as the two parameters to the callback.
+     *
+     * @param {String} title The title bar text
+     * @param {String} msg The message box body text
+     * @param {Function} [fn] The callback function invoked after the message box is closed.
+     * See {@link #method-show} method for details.
+     * @param {Object} [scope=window] The scope (`this` reference) in which the callback is executed.
+     * @param {Boolean/Number} [multiline=false] True to create a multiline textbox using the defaultTextHeight
+     * property, or the height in pixels to create the textbox/
+     * @param {String} [value=''] Default value of the text input element
+     * @return {Ext.window.MessageBox} this
+     */
+    prompt : function(cfg, msg, fn, scope, multiline, value){
+        if (Ext.isString(cfg)) {
+            cfg = {
+                prompt: true,
+                title: cfg,
+                minWidth: this.minPromptWidth,
+                msg: msg,
+                buttons: this.OKCANCEL,
+                callback: fn,
+                scope: scope,
+                multiline: multiline,
+                value: value
+            };
+        }
+        return this.show(cfg);
+    },
+
+    /**
+     * Displays a message box with an infinitely auto-updating progress bar.  This can be used to block user
+     * interaction while waiting for a long-running process to complete that does not have defined intervals.
+     * You are responsible for closing the message box when the process is complete.
+     *
+     * @param {String} msg The message box body text
+     * @param {String} [title] The title bar text
+     * @param {Object} [config] A {@link Ext.ProgressBar#wait} config object
+     * @return {Ext.window.MessageBox} this
+     */
+    wait : function(cfg, title, config){
+        if (Ext.isString(cfg)) {
+            cfg = {
+                title : title,
+                msg : cfg,
+                closable: false,
+                wait: true,
+                modal: true,
+                minWidth: this.minProgressWidth,
+                waitConfig: config
+            };
+        }
+        return this.show(cfg);
+    },
+
+    /**
+     * Displays a standard read-only message box with an OK button (comparable to the basic JavaScript alert prompt).
+     * If a callback function is passed it will be called after the user clicks the button, and the
+     * id of the button that was clicked will be passed as the only parameter to the callback
+     * (could also be the top-right close button, which will always report as "cancel").
+     *
+     * @param {String} title The title bar text
+     * @param {String} msg The message box body text
+     * @param {Function} [fn] The callback function invoked after the message box is closed.
+     * See {@link #method-show} method for details.
+     * @param {Object} [scope=window] The scope (<code>this</code> reference) in which the callback is executed.
+     * @return {Ext.window.MessageBox} this
+     */
+    alert: function(cfg, msg, fn, scope) {
+        if (Ext.isString(cfg)) {
+            cfg = {
+                title : cfg,
+                msg : msg,
+                buttons: this.OK,
+                fn: fn,
+                scope : scope,
+                minWidth: this.minWidth
+            };
+        }
+        return this.show(cfg);
+    },
+
+    /**
+     * Displays a message box with a progress bar.
+     *
+     * You are responsible for updating the progress bar as needed via {@link Ext.window.MessageBox#updateProgress}
+     * and closing the message box when the process is complete.
+     *
+     * @param {String} title The title bar text
+     * @param {String} msg The message box body text
+     * @param {String} [progressText=''] The text to display inside the progress bar
+     * @return {Ext.window.MessageBox} this
+     */
+    progress : function(cfg, msg, progressText){
+        if (Ext.isString(cfg)) {
+            cfg = {
+                title: cfg,
+                msg: msg,
+                progress: true,
+                progressText: progressText
+            };
+        }
+        return this.show(cfg);
+    }
+}, function() {
+    /**
+     * @class Ext.MessageBox
+     * @alternateClassName Ext.Msg
+     * @extends Ext.window.MessageBox
+     * @singleton
+     * Singleton instance of {@link Ext.window.MessageBox}.
+     */
+    Ext.MessageBox = Ext.Msg = new this();
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides input field management, validation, submission, and form loading services for the collection
+ * of {@link Ext.form.field.Field Field} instances within a {@link Ext.container.Container}. It is recommended
+ * that you use a {@link Ext.form.Panel} as the form container, as that has logic to automatically
+ * hook up an instance of {@link Ext.form.Basic} (plus other conveniences related to field configuration.)
+ *
+ * ## Form Actions
+ *
+ * The Basic class delegates the handling of form loads and submits to instances of {@link Ext.form.action.Action}.
+ * See the various Action implementations for specific details of each one's functionality, as well as the
+ * documentation for {@link #doAction} which details the configuration options that can be specified in
+ * each action call.
+ *
+ * The default submit Action is {@link Ext.form.action.Submit}, which uses an Ajax request to submit the
+ * form's values to a configured URL. To enable normal browser submission of an Ext form, use the
+ * {@link #standardSubmit} config option.
+ *
+ * ## File uploads
+ *
+ * File uploads are not performed using normal 'Ajax' techniques; see the description for
+ * {@link #hasUpload} for details. If you're using file uploads you should read the method description.
+ *
+ * ## Example usage:
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Basic Form',
+ *         renderTo: Ext.getBody(),
+ *         bodyPadding: 5,
+ *         width: 350,
+ *
+ *         // Any configuration items here will be automatically passed along to
+ *         // the Ext.form.Basic instance when it gets created.
+ *
+ *         // The form will submit an AJAX request to this URL when submitted
+ *         url: 'save-form.php',
+ *
+ *         items: [{
+ *             xtype: 'textfield',
+ *             fieldLabel: 'Field',
+ *             name: 'theField'
+ *         }],
+ *
+ *         buttons: [{
+ *             text: 'Submit',
+ *             handler: function() {
+ *                 // The getForm() method returns the Ext.form.Basic instance:
+ *                 var form = this.up('form').getForm();
+ *                 if (form.isValid()) {
+ *                     // Submit the Ajax request and handle the response
+ *                     form.submit({
+ *                         success: function(form, action) {
+ *                            Ext.Msg.alert('Success', action.result.message);
+ *                         },
+ *                         failure: function(form, action) {
+ *                             Ext.Msg.alert('Failed', action.result ? action.result.message : 'No response');
+ *                         }
+ *                     });
+ *                 }
+ *             }
+ *         }]
+ *     });
+ *
+ * @docauthor Jason Johnston <jason at sencha.com>
+ */
+Ext.define('Ext.form.Basic', {
+    extend:  Ext.util.Observable ,
+    alternateClassName: 'Ext.form.BasicForm',
+                                                                                            
+                                                                                   
+
+    /**
+     * Creates new form.
+     * @param {Ext.container.Container} owner The component that is the container for the form, usually a {@link Ext.form.Panel}
+     * @param {Object} config Configuration options. These are normally specified in the config to the
+     * {@link Ext.form.Panel} constructor, which passes them along to the BasicForm automatically.
+     */
+    constructor: function(owner, config) {
+        var me = this,
+            reader;
+
+        /**
+         * @property {Ext.container.Container} owner
+         * The container component to which this BasicForm is attached.
+         */
+        me.owner = owner;
+        
+        me.checkValidityTask = new Ext.util.DelayedTask(me.checkValidity, me);
+        me.checkDirtyTask = new Ext.util.DelayedTask(me.checkDirty, me);
+        
+        // We use the monitor here as opposed to event bubbling. The problem with bubbling is it doesn't
+        // let us react to items being added/remove at different places in the hierarchy which may have an
+        // impact on the dirty/valid state.
+        me.monitor = new Ext.container.Monitor({
+            selector: '[isFormField]',
+            scope: me,
+            addHandler: me.onFieldAdd,
+            removeHandler: me.onFieldRemove
+        });
+        me.monitor.bind(owner);
+
+        Ext.apply(me, config);
+
+        // Normalize the paramOrder to an Array
+        if (Ext.isString(me.paramOrder)) {
+            me.paramOrder = me.paramOrder.split(/[\s,|]/);
+        }
+        
+        reader = me.reader;
+        if (reader && !reader.isReader) {
+            if (typeof reader === 'string') {
+                reader = {
+                    type: reader
+                };
+            }
+            me.reader = Ext.createByAlias('reader.' + reader.type, reader);
+        }
+        
+        reader = me.errorReader;
+        if (reader && !reader.isReader) {
+            if (typeof reader === 'string') {
+                reader = {
+                    type: reader
+                };
+            }
+            me.errorReader = Ext.createByAlias('reader.' + reader.type, reader);
+        }
+
+        me.addEvents(
+            /**
+             * @event beforeaction
+             * Fires before any action is performed. Return false to cancel the action.
+             * @param {Ext.form.Basic} this
+             * @param {Ext.form.action.Action} action The {@link Ext.form.action.Action} to be performed
+             */
+            'beforeaction',
+            /**
+             * @event actionfailed
+             * Fires when an action fails.
+             * @param {Ext.form.Basic} this
+             * @param {Ext.form.action.Action} action The {@link Ext.form.action.Action} that failed
+             */
+            'actionfailed',
+            /**
+             * @event actioncomplete
+             * Fires when an action is completed.
+             * @param {Ext.form.Basic} this
+             * @param {Ext.form.action.Action} action The {@link Ext.form.action.Action} that completed
+             */
+            'actioncomplete',
+            /**
+             * @event validitychange
+             * Fires when the validity of the entire form changes.
+             * @param {Ext.form.Basic} this
+             * @param {Boolean} valid `true` if the form is now valid, `false` if it is now invalid.
+             */
+            'validitychange',
+            /**
+             * @event dirtychange
+             * Fires when the dirty state of the entire form changes.
+             * @param {Ext.form.Basic} this
+             * @param {Boolean} dirty `true` if the form is now dirty, `false` if it is no longer dirty.
+             */
+            'dirtychange'
+        );
+        me.callParent();
+    },
+
+    /**
+     * Do any post layout initialization
+     * @private
+     */
+    initialize : function() {
+        this.initialized = true;
+        this.onValidityChange(!this.hasInvalidField());
+    },
+
+
+    /**
+     * @cfg {String} method
+     * The request method to use (GET or POST) for form actions if one isn't supplied in the action options.
+     */
+
+    /**
+     * @cfg {Object/Ext.data.reader.Reader} reader
+     * An Ext.data.reader.Reader (e.g. {@link Ext.data.reader.Xml}) instance or
+     * configuration to be used to read data when executing 'load' actions. This 
+     * is optional as there is built-in support for processing JSON responses.
+     */
+
+    /**
+     * @cfg {Object/Ext.data.reader.Reader} errorReader
+     * An Ext.data.reader.Reader (e.g. {@link Ext.data.reader.Xml}) instance or
+     * configuration to be used to read field error messages returned from 'submit' actions. 
+     * This is optional as there is built-in support for processing JSON responses.
+     *
+     * The Records which provide messages for the invalid Fields must use the
+     * Field name (or id) as the Record ID, and must contain a field called 'msg'
+     * which contains the error message.
+     *
+     * The errorReader does not have to be a full-blown implementation of a
+     * Reader. It simply needs to implement a `read(xhr)` function
+     * which returns an Array of Records in an object with the following
+     * structure:
+     *
+     *     {
+     *         records: recordArray
+     *     }
+     */
+
+    /**
+     * @cfg {String} url
+     * The URL to use for form actions if one isn't supplied in the
+     * {@link #doAction doAction} options.
+     */
+
+    /**
+     * @cfg {Object} baseParams
+     * Parameters to pass with all requests. e.g. baseParams: `{id: '123', foo: 'bar'}`.
+     *
+     * Parameters are encoded as standard HTTP parameters using {@link Ext.Object#toQueryString}.
+     */
+
+    /**
+     * @cfg {Number} timeout
+     * Timeout for form actions in seconds.
+     */
+    timeout: 30,
+
+    /**
+     * @cfg {Object} api
+     * If specified, load and submit actions will be handled with {@link Ext.form.action.DirectLoad DirectLoad}
+     * and {@link Ext.form.action.DirectSubmit DirectSubmit}.  Methods which have been imported by
+     * {@link Ext.direct.Manager} can be specified here to load and submit forms. API methods may also be
+     * specified as strings. See {@link Ext.data.proxy.Direct#directFn}.  Such as the following:
+     *
+     *     api: {
+     *         load: App.ss.MyProfile.load,
+     *         submit: App.ss.MyProfile.submit
+     *     }
+     *
+     * Load actions can use {@link #paramOrder} or {@link #paramsAsHash} to customize how the load method
+     * is invoked.  Submit actions will always use a standard form submit. The `formHandler` configuration
+     * (see Ext.direct.RemotingProvider#action) must be set on the associated server-side method which has
+     * been imported by {@link Ext.direct.Manager}.
+     */
+
+    /**
+     * @cfg {String/String[]} paramOrder
+     * A list of params to be executed server side. Only used for the {@link #api} `load`
+     * configuration.
+     *
+     * Specify the params in the order in which they must be executed on the
+     * server-side as either (1) an Array of String values, or (2) a String of params
+     * delimited by either whitespace, comma, or pipe. For example,
+     * any of the following would be acceptable:
+     *
+     *     paramOrder: ['param1','param2','param3']
+     *     paramOrder: 'param1 param2 param3'
+     *     paramOrder: 'param1,param2,param3'
+     *     paramOrder: 'param1|param2|param'
+     */
+
+    /**
+     * @cfg {Boolean} paramsAsHash
+     * Only used for the {@link #api} `load` configuration. If true, parameters will be sent as a
+     * single hash collection of named arguments. Providing a {@link #paramOrder} nullifies this
+     * configuration.
+     */
+    paramsAsHash: false,
+
+    //<locale>
+    /**
+     * @cfg {String} waitTitle
+     * The default title to show for the waiting message box
+     */
+    waitTitle: 'Please Wait...',
+    //</locale>
+
+    /**
+     * @cfg {Boolean} trackResetOnLoad
+     * If set to true, {@link #reset}() resets to the last loaded or {@link #setValues}() data instead of
+     * when the form was first created.
+     */
+    trackResetOnLoad: false,
+
+    /**
+     * @cfg {Boolean} standardSubmit
+     * If set to true, a standard HTML form submit is used instead of a XHR (Ajax) style form submission.
+     * All of the field values, plus any additional params configured via {@link #baseParams}
+     * and/or the `options` to {@link #submit}, will be included in the values submitted in the form.
+     */
+
+    /**
+     * @cfg {Boolean} jsonSubmit
+     * If set to true, the field values are sent as JSON in the request body.
+     * All of the field values, plus any additional params configured via {@link #baseParams}
+     * and/or the `options` to {@link #submit}, will be included in the values POSTed in the body of the request.
+     */
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} waitMsgTarget
+     * By default wait messages are displayed with Ext.MessageBox.wait. You can target a specific
+     * element by passing it or its id or mask the form itself by passing in true.
+     */
+
+
+    // Private
+    wasDirty: false,
+
+
+    /**
+     * Destroys this object.
+     */
+    destroy: function() {
+        var me = this,
+            mon = me.monitor;
+        
+        if (mon) {
+            mon.unbind();
+            me.monitor = null;
+        }
+        me.clearListeners();
+        me.checkValidityTask.cancel();
+        me.checkDirtyTask.cancel();
+    },
+    
+    onFieldAdd: function(field){
+        var me = this;
+        
+        me.mon(field, 'validitychange', me.checkValidityDelay, me);
+        me.mon(field, 'dirtychange', me.checkDirtyDelay, me);
+        if (me.initialized) {
+            me.checkValidityDelay();
+        }
+    },
+    
+    onFieldRemove: function(field){
+        var me = this;
+        
+        me.mun(field, 'validitychange', me.checkValidityDelay, me);
+        me.mun(field, 'dirtychange', me.checkDirtyDelay, me);
+        if (me.initialized) {
+            me.checkValidityDelay();
+        }
+    },
+    
+    /**
+     * Return all the {@link Ext.form.field.Field} components in the owner container.
+     * @return {Ext.util.MixedCollection} Collection of the Field objects
+     */
+    getFields: function() {
+        return this.monitor.getItems();
+    },
+
+    /**
+     * @private
+     * Finds and returns the set of all items bound to fields inside this form
+     * @return {Ext.util.MixedCollection} The set of all bound form field items
+     */
+    getBoundItems: function() {
+        var boundItems = this._boundItems;
+        
+        if (!boundItems || boundItems.getCount() === 0) {
+            boundItems = this._boundItems = new Ext.util.MixedCollection();
+            boundItems.addAll(this.owner.query('[formBind]'));
+        }
+        
+        return boundItems;
+    },
+
+    /**
+     * Returns true if the form contains any invalid fields. No fields will be marked as invalid
+     * as a result of calling this; to trigger marking of fields use {@link #isValid} instead.
+     */
+    hasInvalidField: function() {
+        return !!this.getFields().findBy(function(field) {
+            var preventMark = field.preventMark,
+                isValid;
+            field.preventMark = true;
+            isValid = field.isValid();
+            field.preventMark = preventMark;
+            return !isValid;
+        });
+    },
+
+    /**
+     * Returns true if client-side validation on the form is successful. Any invalid fields will be
+     * marked as invalid. If you only want to determine overall form validity without marking anything,
+     * use {@link #hasInvalidField} instead.
+     * @return {Boolean}
+     */
+    isValid: function() {
+        var me = this,
+            invalid;
+        Ext.suspendLayouts();
+        invalid = me.getFields().filterBy(function(field) {
+            return !field.validate();
+        });
+        Ext.resumeLayouts(true);
+        return invalid.length < 1;
+    },
+
+    /**
+     * Check whether the validity of the entire form has changed since it was last checked, and
+     * if so fire the {@link #validitychange validitychange} event. This is automatically invoked
+     * when an individual field's validity changes.
+     */
+    checkValidity: function() {
+        var me = this,
+            valid = !me.hasInvalidField();
+        if (valid !== me.wasValid) {
+            me.onValidityChange(valid);
+            me.fireEvent('validitychange', me, valid);
+            me.wasValid = valid;
+        }
+    },
+    
+    checkValidityDelay: function(){
+        this.checkValidityTask.delay(10);
+    },
+
+    /**
+     * @private
+     * Handle changes in the form's validity. If there are any sub components with
+     * `formBind=true` then they are enabled/disabled based on the new validity.
+     * @param {Boolean} valid
+     */
+    onValidityChange: function(valid) {
+        var boundItems = this.getBoundItems(),
+            items, i, iLen, cmp;
+
+        if (boundItems) {
+            items = boundItems.items;
+            iLen  = items.length;
+
+            for (i = 0; i < iLen; i++) {
+                cmp = items[i];
+
+                if (cmp.disabled === valid) {
+                    cmp.setDisabled(!valid);
+                }
+            }
+        }
+    },
+
+    /**
+     * Returns `true` if any fields in this form have changed from their original values.
+     *
+     * Note that if this BasicForm was configured with {@link Ext.form.Basic#trackResetOnLoad
+     * trackResetOnLoad} then the Fields' *original values* are updated when the values are
+     * loaded by {@link Ext.form.Basic#setValues setValues} or {@link #loadRecord}.
+     *
+     * @return {Boolean}
+     */
+    isDirty: function() {
+        return !!this.getFields().findBy(function(f) {
+            return f.isDirty();
+        });
+    },
+    
+    checkDirtyDelay: function(){
+        this.checkDirtyTask.delay(10);
+    },
+
+    /**
+     * Check whether the dirty state of the entire form has changed since it was last checked, and
+     * if so fire the {@link #dirtychange dirtychange} event. This is automatically invoked
+     * when an individual field's `dirty` state changes.
+     */
+    checkDirty: function() {
+        var dirty = this.isDirty();
+        if (dirty !== this.wasDirty) {
+            this.fireEvent('dirtychange', this, dirty);
+            this.wasDirty = dirty;
+        }
+    },
+
+    /**
+     * Returns `true` if the form contains a file upload field. This is used to determine the method for submitting the
+     * form: File uploads are not performed using normal 'Ajax' techniques, that is they are **not** performed using
+     * XMLHttpRequests. Instead a hidden `<form>` element containing all the fields is created temporarily and submitted
+     * with its [target][1] set to refer to a dynamically generated, hidden `<iframe>` which is inserted into the document
+     * but removed after the return data has been gathered.
+     *
+     * The server response is parsed by the browser to create the document for the IFRAME. If the server is using JSON
+     * to send the return object, then the [Content-Type][2] header must be set to "text/html" in order to tell the
+     * browser to insert the text unchanged into the document body.
+     *
+     * Characters which are significant to an HTML parser must be sent as HTML entities, so encode `"<"` as `"<"`,
+     * `"&"` as `"&"` etc.
+     *
+     * The response text is retrieved from the document, and a fake XMLHttpRequest object is created containing a
+     * responseText property in order to conform to the requirements of event handlers and callbacks.
+     *
+     * Be aware that file upload packets are sent with the content type [multipart/form][3] and some server technologies
+     * (notably JEE) may require some custom processing in order to retrieve parameter names and parameter values from
+     * the packet content.
+     *
+     * [1]: http://www.w3.org/TR/REC-html40/present/frames.html#adef-target
+     * [2]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17
+     * [3]: http://www.faqs.org/rfcs/rfc2388.html
+     *
+     * @return {Boolean}
+     */
+    hasUpload: function() {
+        return !!this.getFields().findBy(function(f) {
+            return f.isFileUpload();
+        });
+    },
+
+    /**
+     * Performs a predefined action (an implementation of {@link Ext.form.action.Action}) to perform application-
+     * specific processing.
+     *
+     * @param {String/Ext.form.action.Action} action The name of the predefined action type, or instance of {@link
+     * Ext.form.action.Action} to perform.
+     *
+     * @param {Object} [options] The options to pass to the {@link Ext.form.action.Action} that will get created,
+     * if the action argument is a String.
+     *
+     * All of the config options listed below are supported by both the {@link Ext.form.action.Submit submit} and
+     * {@link Ext.form.action.Load load} actions unless otherwise noted (custom actions could also accept other
+     * config options):
+     *
+     * @param {String} options.url
+     * The url for the action (defaults to the form's {@link #url}.)
+     *
+     * @param {String} options.method
+     * The form method to use (defaults to the form's method, or POST if not defined)
+     *
+     * @param {String/Object} options.params
+     * The params to pass (defaults to the form's baseParams, or none if not defined)
+     *
+     * Parameters are encoded as standard HTTP parameters using {@link Ext#urlEncode Ext.Object.toQueryString}.
+     *
+     * @param {Object} options.headers
+     * Request headers to set for the action.
+     *
+     * @param {Function} options.success
+     * The callback that will be invoked after a successful response (see top of {@link Ext.form.action.Submit submit}
+     * and {@link Ext.form.action.Load load} for a description of what constitutes a successful response).
+     * @param {Ext.form.Basic} options.success.form The form that requested the action.
+     * @param {Ext.form.action.Action} options.success.action The Action object which performed the operation.
+     * The action object contains these properties of interest:
+     *
+     *  - {@link Ext.form.action.Action#response response}
+     *  - {@link Ext.form.action.Action#result result} - interrogate for custom postprocessing
+     *  - {@link Ext.form.action.Action#type type}
+     *
+     * @param {Function} options.failure
+     * The callback that will be invoked after a failed transaction attempt.
+     * @param {Ext.form.Basic} options.failure.form The form that requested the action.
+     * @param {Ext.form.action.Action} options.failure.action The Action object which performed the operation.
+     * The action object contains these properties of interest:
+     *
+     * - {@link Ext.form.action.Action#failureType failureType}
+     * - {@link Ext.form.action.Action#response response}
+     * - {@link Ext.form.action.Action#result result} - interrogate for custom postprocessing
+     * - {@link Ext.form.action.Action#type type}
+     *
+     * @param {Object} options.scope
+     * The scope in which to call the callback functions (The this reference for the callback functions).
+     *
+     * @param {Boolean} options.clientValidation
+     * Submit Action only. Determines whether a Form's fields are validated in a final call to {@link
+     * Ext.form.Basic#isValid isValid} prior to submission. Set to false to prevent this. If undefined, pre-submission
+     * field validation is performed.
+     *
+     * @return {Ext.form.Basic} this
+     */
+    doAction: function(action, options) {
+        if (Ext.isString(action)) {
+            action = Ext.ClassManager.instantiateByAlias('formaction.' + action, Ext.apply({}, options, {form: this}));
+        }
+        if (this.fireEvent('beforeaction', this, action) !== false) {
+            this.beforeAction(action);
+            Ext.defer(action.run, 100, action);
+        }
+        return this;
+    },
+
+    /**
+     * Shortcut to {@link #doAction do} a {@link Ext.form.action.Submit submit action}. This will use the
+     * {@link Ext.form.action.Submit AJAX submit action} by default. If the {@link #standardSubmit} config
+     * is enabled it will use a standard form element to submit, or if the {@link #api} config is present
+     * it will use the {@link Ext.form.action.DirectLoad Ext.direct.Direct submit action}.
+     *
+     * The following code:
+     *
+     *     myFormPanel.getForm().submit({
+     *         clientValidation: true,
+     *         url: 'updateConsignment.php',
+     *         params: {
+     *             newStatus: 'delivered'
+     *         },
+     *         success: function(form, action) {
+     *            Ext.Msg.alert('Success', action.result.msg);
+     *         },
+     *         failure: function(form, action) {
+     *             switch (action.failureType) {
+     *                 case Ext.form.action.Action.CLIENT_INVALID:
+     *                     Ext.Msg.alert('Failure', 'Form fields may not be submitted with invalid values');
+     *                     break;
+     *                 case Ext.form.action.Action.CONNECT_FAILURE:
+     *                     Ext.Msg.alert('Failure', 'Ajax communication failed');
+     *                     break;
+     *                 case Ext.form.action.Action.SERVER_INVALID:
+     *                    Ext.Msg.alert('Failure', action.result.msg);
+     *            }
+     *         }
+     *     });
+     *
+     * would process the following server response for a successful submission:
+     *
+     *     {
+     *         "success":true, // note this is Boolean, not string
+     *         "msg":"Consignment updated"
+     *     }
+     *
+     * and the following server response for a failed submission:
+     *
+     *     {
+     *         "success":false, // note this is Boolean, not string
+     *         "msg":"You do not have permission to perform this operation"
+     *     }
+     *
+     * @param {Object} options The options to pass to the action (see {@link #doAction} for details).
+     * @return {Ext.form.Basic} this
+     */
+    submit: function(options) {
+        options = options || {};
+        var me = this,
+            action;
+            
+        if (options.standardSubmit || me.standardSubmit) {
+            action = 'standardsubmit';
+        } else {
+            action = me.api ? 'directsubmit' : 'submit';
+        }
+            
+        return me.doAction(action, options);
+    },
+
+    /**
+     * Shortcut to {@link #doAction do} a {@link Ext.form.action.Load load action}.
+     * @param {Object} options The options to pass to the action (see {@link #doAction} for details)
+     * @return {Ext.form.Basic} this
+     */
+    load: function(options) {
+        return this.doAction(this.api ? 'directload' : 'load', options);
+    },
+
+    /**
+     * Persists the values in this form into the passed {@link Ext.data.Model} object in a beginEdit/endEdit block.
+     * If the record is not specified, it will attempt to update (if it exists) the record provided to loadRecord.
+     * @param {Ext.data.Model} [record] The record to edit
+     * @return {Ext.form.Basic} this
+     */
+    updateRecord: function(record) {
+        record = record || this._record;
+        if (!record) {
+            Ext.Error.raise("A record is required.");
+            return this;
+        }
+        
+        var fields = record.fields.items,
+            values = this.getFieldValues(),
+            obj = {},
+            i = 0,
+            len = fields.length,
+            name;
+
+        for (; i < len; ++i) {
+            name  = fields[i].name;
+
+            if (values.hasOwnProperty(name)) {
+                obj[name] = values[name];
+            }
+        }
+
+        record.beginEdit();
+        record.set(obj);
+        record.endEdit();
+
+        return this;
+    },
+
+    /**
+     * Loads an {@link Ext.data.Model} into this form by calling {@link #setValues} with the
+     * {@link Ext.data.Model#raw record data}.
+     * See also {@link #trackResetOnLoad}.
+     * @param {Ext.data.Model} record The record to load
+     * @return {Ext.form.Basic} this
+     */
+    loadRecord: function(record) {
+        this._record = record;
+        return this.setValues(record.getData());
+    },
+
+    /**
+     * Returns the last Ext.data.Model instance that was loaded via {@link #loadRecord}
+     * @return {Ext.data.Model} The record
+     */
+    getRecord: function() {
+        return this._record;
+    },
+
+    /**
+     * @private
+     * Called before an action is performed via {@link #doAction}.
+     * @param {Ext.form.action.Action} action The Action instance that was invoked
+     */
+    beforeAction: function(action) {
+        var me = this,
+            waitMsg = action.waitMsg,
+            maskCls = Ext.baseCSSPrefix + 'mask-loading',
+            fields  = me.getFields().items,
+            f,
+            fLen    = fields.length,
+            field, waitMsgTarget;
+
+        // Call HtmlEditor's syncValue before actions
+        for (f = 0; f < fLen; f++) {
+            field = fields[f];
+
+            if (field.isFormField && field.syncValue) {
+                field.syncValue();
+            }
+        }
+
+        if (waitMsg) {
+            waitMsgTarget = me.waitMsgTarget;
+            if (waitMsgTarget === true) {
+                me.owner.el.mask(waitMsg, maskCls);
+            } else if (waitMsgTarget) {
+                waitMsgTarget = me.waitMsgTarget = Ext.get(waitMsgTarget);
+                waitMsgTarget.mask(waitMsg, maskCls);
+            } else {
+                me.floatingAncestor = me.owner.up('[floating]');
+
+                // https://sencha.jira.com/browse/EXTJSIV-6397
+                // When the "wait" MessageBox is hidden, the ZIndexManager activates the previous
+                // topmost floating item which would be any Window housing this form.
+                // That kicks off a delayed focus call on that Window.
+                // So if any form post submit processing displayed a MessageBox, that gets
+                // stomped on.
+                // The solution is to not move focus at all during this process.
+                if (me.floatingAncestor) {
+                    me.savePreventFocusOnActivate = me.floatingAncestor.preventFocusOnActivate;
+                    me.floatingAncestor.preventFocusOnActivate = true;
+                }
+                Ext.MessageBox.wait(waitMsg, action.waitTitle || me.waitTitle);
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Called after an action is performed via {@link #doAction}.
+     * @param {Ext.form.action.Action} action The Action instance that was invoked
+     * @param {Boolean} success True if the action completed successfully, false, otherwise.
+     */
+    afterAction: function(action, success) {
+        var me = this;
+        if (action.waitMsg) {
+            var messageBox = Ext.MessageBox,
+                waitMsgTarget = me.waitMsgTarget;
+            if (waitMsgTarget === true) {
+                me.owner.el.unmask();
+            } else if (waitMsgTarget) {
+                waitMsgTarget.unmask();
+            } else {
+                messageBox.hide();
+            }
+        }
+        // Restore setting of any floating ancestor which was manipulated in beforeAction
+        if (me.floatingAncestor) {
+            me.floatingAncestor.preventFocusOnActivate = me.savePreventFocusOnActivate;
+        }
+        if (success) {
+            if (action.reset) {
+                me.reset();
+            }
+            Ext.callback(action.success, action.scope || action, [me, action]);
+            me.fireEvent('actioncomplete', me, action);
+        } else {
+            Ext.callback(action.failure, action.scope || action, [me, action]);
+            me.fireEvent('actionfailed', me, action);
+        }
+    },
+
+
+    /**
+     * Find a specific {@link Ext.form.field.Field} in this form by id or name.
+     * @param {String} id The value to search for (specify either a {@link Ext.Component#id id} or
+     * {@link Ext.form.field.Field#getName name or hiddenName}).
+     * @return {Ext.form.field.Field} The first matching field, or `null` if none was found.
+     */
+    findField: function(id) {
+        return this.getFields().findBy(function(f) {
+            return f.id === id || f.getName() === id;
+        });
+    },
+
+
+    /**
+     * Mark fields in this form invalid in bulk.
+     * @param {Object/Object[]/Ext.data.Errors} errors
+     * Either an array in the form `[{id:'fieldId', msg:'The message'}, ...]`,
+     * an object hash of `{id: msg, id2: msg2}`, or a {@link Ext.data.Errors} object.
+     * @return {Ext.form.Basic} this
+     */
+    markInvalid: function(errors) {
+        var me = this,
+            e, eLen, error, value,
+            key;
+
+        function mark(fieldId, msg) {
+            var field = me.findField(fieldId);
+            if (field) {
+                field.markInvalid(msg);
+            }
+        }
+
+        if (Ext.isArray(errors)) {
+            eLen = errors.length;
+
+            for (e = 0; e < eLen; e++) {
+                error = errors[e];
+                mark(error.id, error.msg);
+            }
+        } else if (errors instanceof Ext.data.Errors) {
+            eLen  = errors.items.length;
+            for (e = 0; e < eLen; e++) {
+                error = errors.items[e];
+
+                mark(error.field, error.message);
+            }
+        } else {
+            for (key in errors) {
+                if (errors.hasOwnProperty(key)) {
+                    value = errors[key];
+                    mark(key, value, errors);
+                }
+            }
+        }
+        return this;
+    },
+
+    /**
+     * Set values for fields in this form in bulk.
+     *
+     * @param {Object/Object[]} values Either an array in the form:
+     *
+     *     [{id:'clientName', value:'Fred. Olsen Lines'},
+     *      {id:'portOfLoading', value:'FXT'},
+     *      {id:'portOfDischarge', value:'OSL'} ]
+     *
+     * or an object hash of the form:
+     *
+     *     {
+     *         clientName: 'Fred. Olsen Lines',
+     *         portOfLoading: 'FXT',
+     *         portOfDischarge: 'OSL'
+     *     }
+     *
+     * @return {Ext.form.Basic} this
+     */
+    setValues: function(values) {
+        var me = this,
+            v, vLen, val, field;
+
+        function setVal(fieldId, val) {
+            var field = me.findField(fieldId);
+            if (field) {
+                field.setValue(val);
+                if (me.trackResetOnLoad) {
+                    field.resetOriginalValue();
+                }
+            }
+        }
+
+        // Suspend here because setting the value on a field could trigger
+        // a layout, for example if an error gets set, or it's a display field
+        Ext.suspendLayouts();
+        if (Ext.isArray(values)) {
+            // array of objects
+            vLen = values.length;
+
+            for (v = 0; v < vLen; v++) {
+                val = values[v];
+
+                setVal(val.id, val.value);
+            }
+        } else {
+            // object hash
+            Ext.iterate(values, setVal);
+        }
+        Ext.resumeLayouts(true);
+        return this;
+    },
+
+    /**
+     * Retrieves the fields in the form as a set of key/value pairs, using their
+     * {@link Ext.form.field.Field#getSubmitData getSubmitData()} method to collect the values.
+     * If multiple fields return values under the same name those values will be combined into an Array.
+     * This is similar to {@link Ext.form.Basic#getFieldValues getFieldValues} except that this method
+     * collects only String values for submission, while getFieldValues collects type-specific data
+     * values (e.g. Date objects for date fields.)
+     *
+     * @param {Boolean} [asString=false] If true, will return the key/value collection as a single
+     * URL-encoded param string.
+     * @param {Boolean} [dirtyOnly=false] If true, only fields that are dirty will be included in the result.
+     * @param {Boolean} [includeEmptyText=false] If true, the configured emptyText of empty fields will be used.
+     * @param {Boolean} [useDataValues=false] If true, the {@link Ext.form.field.Field#getModelData getModelData}
+     * method is used to retrieve values from fields, otherwise the {@link Ext.form.field.Field#getSubmitData getSubmitData}
+     * method is used.
+     * @return {String/Object}
+     */
+    getValues: function(asString, dirtyOnly, includeEmptyText, useDataValues) {
+        var values  = {},
+            fields  = this.getFields().items,
+            f,
+            fLen    = fields.length,
+            isArray = Ext.isArray,
+            field, data, val, bucket, name;
+
+        for (f = 0; f < fLen; f++) {
+            field = fields[f];
+
+            if (!dirtyOnly || field.isDirty()) {
+                data = field[useDataValues ? 'getModelData' : 'getSubmitData'](includeEmptyText);
+
+                if (Ext.isObject(data)) {
+                    for (name in data) {
+                        if (data.hasOwnProperty(name)) {
+                            val = data[name];
+
+                            if (includeEmptyText && val === '') {
+                                val = field.emptyText || '';
+                            }
+
+                            if (values.hasOwnProperty(name)) {
+                                bucket = values[name];
+
+                                if (!isArray(bucket)) {
+                                    bucket = values[name] = [bucket];
+                                }
+
+                                if (isArray(val)) {
+                                    values[name] = bucket.concat(val);
+                                } else {
+                                    bucket.push(val);
+                                }
+                            } else {
+                                values[name] = val;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (asString) {
+            values = Ext.Object.toQueryString(values);
+        }
+        return values;
+    },
+
+    /**
+     * Retrieves the fields in the form as a set of key/value pairs, using their
+     * {@link Ext.form.field.Field#getModelData getModelData()} method to collect the values.
+     * If multiple fields return values under the same name those values will be combined into an Array.
+     * This is similar to {@link #getValues} except that this method collects type-specific data values
+     * (e.g. Date objects for date fields) while getValues returns only String values for submission.
+     *
+     * @param {Boolean} [dirtyOnly=false] If true, only fields that are dirty will be included in the result.
+     * @return {Object}
+     */
+    getFieldValues: function(dirtyOnly) {
+        return this.getValues(false, dirtyOnly, false, true);
+    },
+
+    /**
+     * Clears all invalid field messages in this form.
+     * @return {Ext.form.Basic} this
+     */
+    clearInvalid: function() {
+        Ext.suspendLayouts();
+
+        var me     = this,
+            fields = me.getFields().items,
+            f,
+            fLen   = fields.length;
+
+        for (f = 0; f < fLen; f++) {
+            fields[f].clearInvalid();
+        }
+
+        Ext.resumeLayouts(true);
+        return me;
+    },
+
+    /**
+     * Resets all fields in this form. By default, any record bound by {@link #loadRecord}
+     * will be retained.
+     * @param {Boolean} [resetRecord=false] True to unbind any record set
+     * by {@link #loadRecord}
+     * @return {Ext.form.Basic} this
+     */
+    reset: function(resetRecord) {
+        Ext.suspendLayouts();
+
+        var me     = this,
+            fields = me.getFields().items,
+            f,
+            fLen   = fields.length;
+
+        for (f = 0; f < fLen; f++) {
+            fields[f].reset();
+        }
+
+        Ext.resumeLayouts(true);
+        
+        if (resetRecord === true) {
+            delete me._record;
+        }
+        return me;
+    },
+
+    /**
+     * Calls {@link Ext#apply Ext.apply} for all fields in this form with the passed object.
+     * @param {Object} obj The object to be applied
+     * @return {Ext.form.Basic} this
+     */
+    applyToFields: function(obj) {
+        var fields = this.getFields().items,
+            f,
+            fLen   = fields.length;
+
+        for (f = 0; f < fLen; f++) {
+            Ext.apply(fields[f], obj);
+        }
+
+        return this;
+    },
+
+    /**
+     * Calls {@link Ext#applyIf Ext.applyIf} for all field in this form with the passed object.
+     * @param {Object} obj The object to be applied
+     * @return {Ext.form.Basic} this
+     */
+    applyIfToFields: function(obj) {
+        var fields = this.getFields().items,
+            f,
+            fLen   = fields.length;
+
+        for (f = 0; f < fLen; f++) {
+            Ext.applyIf(fields[f], obj);
+        }
+
+        return this;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A mixin for {@link Ext.container.Container} components that are likely to have form fields in their
+ * items subtree. Adds the following capabilities:
+ *
+ * - Methods for handling the addition and removal of {@link Ext.form.Labelable} and {@link Ext.form.field.Field}
+ *   instances at any depth within the container.
+ * - Events ({@link #fieldvaliditychange} and {@link #fielderrorchange}) for handling changes to the state
+ *   of individual fields at the container level.
+ * - Automatic application of {@link #fieldDefaults} config properties to each field added within the
+ *   container, to facilitate uniform configuration of all fields.
+ *
+ * This mixin is primarily for internal use by {@link Ext.form.Panel} and {@link Ext.form.FieldContainer},
+ * and should not normally need to be used directly.
+ *
+ * @docauthor Jason Johnston <jason at sencha.com>
+ */
+Ext.define('Ext.form.FieldAncestor', {
+    
+               
+                               
+      
+
+    /**
+     * @cfg {Object} fieldDefaults
+     * If specified, the properties in this object are used as default config values for each {@link Ext.form.Labelable}
+     * instance (e.g. {@link Ext.form.field.Base} or {@link Ext.form.FieldContainer}) that is added as a descendant of
+     * this container. Corresponding values specified in an individual field's own configuration, or from the {@link
+     * Ext.container.Container#defaults defaults config} of its parent container, will take precedence. See the
+     * documentation for {@link Ext.form.Labelable} to see what config options may be specified in the fieldDefaults.
+     *
+     * Example:
+     *
+     *     new Ext.form.Panel({
+     *         fieldDefaults: {
+     *             labelAlign: 'left',
+     *             labelWidth: 100
+     *         },
+     *         items: [{
+     *             xtype: 'fieldset',
+     *             defaults: {
+     *                 labelAlign: 'top'
+     *             },
+     *             items: [{
+     *                 name: 'field1'
+     *             }, {
+     *                 name: 'field2'
+     *             }]
+     *         }, {
+     *             xtype: 'fieldset',
+     *             items: [{
+     *                 name: 'field3',
+     *                 labelWidth: 150
+     *             }, {
+     *                 name: 'field4'
+     *             }]
+     *         }]
+     *     });
+     *
+     * In this example, field1 and field2 will get labelAlign:'top' (from the fieldset's defaults) and labelWidth:100
+     * (from fieldDefaults), field3 and field4 will both get labelAlign:'left' (from fieldDefaults and field3 will use
+     * the labelWidth:150 from its own config.
+     */
+
+
+    xhooks: {
+        initHierarchyState: function(hierarchyState) {
+            if (this.fieldDefaults) {
+                if (hierarchyState.fieldDefaults) {
+                    hierarchyState.fieldDefaults = Ext.apply(Ext.Object.chain(hierarchyState.fieldDefaults), this.fieldDefaults);
+                } else {
+                    hierarchyState.fieldDefaults = this.fieldDefaults;
+                }
+            }
+        }
+    },
+
+    /**
+     * Initializes the FieldAncestor's state; this must be called from the initComponent method of any components
+     * importing this mixin.
+     * @protected
+     */
+    initFieldAncestor: function() {
+        var me = this;
+
+        me.addEvents(
+            /**
+             * @event fieldvaliditychange
+             * Fires when the validity state of any one of the {@link Ext.form.field.Field} instances within this
+             * container changes.
+             * @param {Ext.form.FieldAncestor} this
+             * @param {Ext.form.Labelable} The Field instance whose validity changed
+             * @param {String} isValid The field's new validity state
+             */
+            'fieldvaliditychange',
+
+            /**
+             * @event fielderrorchange
+             * Fires when the active error message is changed for any one of the {@link Ext.form.Labelable} instances
+             * within this container.
+             * @param {Ext.form.FieldAncestor} this
+             * @param {Ext.form.Labelable} The Labelable instance whose active error was changed
+             * @param {String} error The active error message
+             */
+            'fielderrorchange'
+        );
+
+        // We use the monitor here as opposed to event bubbling. The problem with bubbling is it doesn't
+        // let us react to items being added/remove at different places in the hierarchy which may have an
+        // impact on the error/valid state.
+        me.monitor = new Ext.container.Monitor({
+            scope: me,
+            selector: '[isFormField]',
+            addHandler: me.onChildFieldAdd,
+            removeHandler: me.onChildFieldRemove
+        });
+        me.initFieldDefaults();
+    },
+    
+    initMonitor: function() {
+        this.monitor.bind(this);    
+    },
+    
+    onChildFieldAdd: function(field) {
+        var me = this;
+        me.mon(field, 'errorchange', me.handleFieldErrorChange, me);
+        me.mon(field, 'validitychange', me.handleFieldValidityChange, me);
+    },
+    
+    onChildFieldRemove: function(field) {
+        var me = this;
+        me.mun(field, 'errorchange', me.handleFieldErrorChange, me);
+        me.mun(field, 'validitychange', me.handleFieldValidityChange, me);
+    },
+
+    /**
+     * @private Initialize the {@link #fieldDefaults} object
+     */
+    initFieldDefaults: function() {
+        if (!this.fieldDefaults) {
+            this.fieldDefaults = {};
+        }
+    },
+
+    /**
+     * @private Handle bubbled validitychange events from descendants; invoke the aggregated event and method
+     */
+    handleFieldValidityChange: function(field, isValid) {
+        var me = this;
+        if (field !== me) {
+            me.fireEvent('fieldvaliditychange', me, field, isValid);
+            me.onFieldValidityChange(field, isValid);
+        }
+    },
+
+    /**
+     * @private Handle bubbled errorchange events from descendants; invoke the aggregated event and method
+     */
+    handleFieldErrorChange: function(labelable, activeError) {
+        var me = this;
+        if (labelable !== me) {
+            me.fireEvent('fielderrorchange', me, labelable, activeError);
+            me.onFieldErrorChange(labelable, activeError);
+        }
+    },
+
+    /**
+     * Fired when the validity of any field within the container changes.
+     * @param {Ext.form.field.Field} field The sub-field whose validity changed
+     * @param {Boolean} valid The new validity state
+     * @protected
+     */
+    onFieldValidityChange: Ext.emptyFn,
+
+    /**
+     * Fired when the error message of any field within the container changes.
+     * @param {Ext.form.Labelable} field The sub-field whose active error changed
+     * @param {String} error The new active error message
+     * @protected
+     */
+    onFieldErrorChange: Ext.emptyFn,
+    
+    beforeDestroy: function(){
+        this.monitor.unbind();
+        this.callParent();
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.layout.component.field.FieldContainer', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.layout.component.field.Field ,
+
+    alias: 'layout.fieldcontainer',
+
+    /* End Definitions */
+
+    type: 'fieldcontainer',
+
+    waitForOuterHeightInDom: true,
+    waitForOuterWidthInDom: true,
+
+    beginLayout: function(ownerContext) {
+        var owner = this.owner;
+        this.callParent(arguments);
+
+        // Tell Component.measureAutoDimensions to measure the DOM when containerChildrenSizeDone is true
+        ownerContext.hasRawContent = true;
+        owner.bodyEl.setStyle('height', '');
+        owner.containerEl.setStyle('height', '');
+        ownerContext.containerElContext = ownerContext.getEl('containerEl');
+    },
+
+    measureContentHeight: function (ownerContext) {
+        // since we are measuring the outer el, we have to wait for whatever is in our
+        // container to be flushed to the DOM... especially for things like box layouts
+        // that size the innerCt since that is all that will contribute to our size!
+        return ownerContext.hasDomProp('containerLayoutDone') ? this.callParent(arguments) : NaN;
+    },
+
+    measureContentWidth: function (ownerContext) {
+        // see measureContentHeight
+        return ownerContext.hasDomProp('containerLayoutDone') ? this.callParent(arguments) : NaN;
+    },
+
+    publishInnerWidth: function (ownerContext, width) {
+        var bodyContext = ownerContext.bodyCellContext,
+            innerWidth = bodyContext.el.getWidth();
+
+        bodyContext.setWidth(innerWidth, false);
+        ownerContext.containerElContext.setWidth(innerWidth, false);
+    },
+    
+    publishInnerHeight: function (ownerContext, height) {
+        var bodyContext = ownerContext.bodyCellContext,
+            containerElContext = ownerContext.containerElContext;
+            
+        height -= this.measureLabelErrorHeight(ownerContext);
+        bodyContext.setHeight(height);
+        containerElContext.setHeight(height);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * FieldContainer is a derivation of {@link Ext.container.Container Container} that implements the
+ * {@link Ext.form.Labelable Labelable} mixin. This allows it to be configured so that it is rendered with
+ * a {@link #fieldLabel field label} and optional {@link #msgTarget error message} around its sub-items.
+ * This is useful for arranging a group of fields or other components within a single item in a form, so
+ * that it lines up nicely with other fields. A common use is for grouping a set of related fields under
+ * a single label in a form.
+ * 
+ * The container's configured {@link #cfg-items} will be layed out within the field body area according to the
+ * configured {@link #layout} type. The default layout is `'autocontainer'`.
+ * 
+ * Like regular fields, FieldContainer can inherit its decoration configuration from the
+ * {@link Ext.form.Panel#fieldDefaults fieldDefaults} of an enclosing FormPanel. In addition,
+ * FieldContainer itself can pass {@link #fieldDefaults} to any {@link Ext.form.Labelable fields}
+ * it may itself contain.
+ * 
+ * If you are grouping a set of {@link Ext.form.field.Checkbox Checkbox} or {@link Ext.form.field.Radio Radio}
+ * fields in a single labeled container, consider using a {@link Ext.form.CheckboxGroup}
+ * or {@link Ext.form.RadioGroup} instead as they are specialized for handling those types.
+ *
+ * # Example
+ * 
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'FieldContainer Example',
+ *         width: 550,
+ *         bodyPadding: 10,
+ * 
+ *         items: [{
+ *             xtype: 'fieldcontainer',
+ *             fieldLabel: 'Last Three Jobs',
+ *             labelWidth: 100,
+ * 
+ *             // The body area will contain three text fields, arranged
+ *             // horizontally, separated by draggable splitters.
+ *             layout: 'hbox',
+ *             items: [{
+ *                 xtype: 'textfield',
+ *                 flex: 1
+ *             }, {
+ *                 xtype: 'splitter'
+ *             }, {
+ *                 xtype: 'textfield',
+ *                 flex: 1
+ *             }, {
+ *                 xtype: 'splitter'
+ *             }, {
+ *                 xtype: 'textfield',
+ *                 flex: 1
+ *             }]
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ * 
+ * # Usage of fieldDefaults
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'FieldContainer Example',
+ *         width: 350,
+ *         bodyPadding: 10,
+ * 
+ *         items: [{
+ *             xtype: 'fieldcontainer',
+ *             fieldLabel: 'Your Name',
+ *             labelWidth: 75,
+ *             defaultType: 'textfield',
+ * 
+ *             // Arrange fields vertically, stretched to full width
+ *             layout: 'anchor',
+ *             defaults: {
+ *                 layout: '100%'
+ *             },
+ * 
+ *             // These config values will be applied to both sub-fields, except
+ *             // for Last Name which will use its own msgTarget.
+ *             fieldDefaults: {
+ *                 msgTarget: 'under',
+ *                 labelAlign: 'top'
+ *             },
+ * 
+ *             items: [{
+ *                 fieldLabel: 'First Name',
+ *                 name: 'firstName'
+ *             }, {
+ *                 fieldLabel: 'Last Name',
+ *                 name: 'lastName',
+ *                 msgTarget: 'under'
+ *             }]
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ * 
+ * @docauthor Jason Johnston <jason at sencha.com>
+ */
+Ext.define('Ext.form.FieldContainer', {
+    extend:  Ext.container.Container ,
+    mixins: {
+        labelable:  Ext.form.Labelable ,
+        fieldAncestor:  Ext.form.FieldAncestor 
+    },
+                                                          
+
+    alias: 'widget.fieldcontainer',
+
+    componentLayout: 'fieldcontainer',
+
+    componentCls: Ext.baseCSSPrefix + 'form-fieldcontainer',
+    
+    // Used by the layout system, typically the scrolling el is the targetEl, however we need
+    // to let it know we're using something different
+    customOverflowEl: 'containerEl',
+    
+    childEls: [
+        'containerEl'
+    ],
+
+    /**
+     * @cfg autoScroll @hide
+     */
+
+    /**
+     * @cfg {Boolean} combineLabels
+     * If set to true, and there is no defined {@link #fieldLabel}, the field container will automatically
+     * generate its label by combining the labels of all the fields it contains. Defaults to false.
+     */
+    combineLabels: false,
+
+    //<locale>
+    /**
+     * @cfg {String} labelConnector
+     * The string to use when joining the labels of individual sub-fields, when {@link #combineLabels} is
+     * set to true. Defaults to ', '.
+     */
+    labelConnector: ', ',
+    //</locale>
+
+    /**
+     * @cfg {Boolean} combineErrors
+     * If set to true, the field container will automatically combine and display the validation errors from
+     * all the fields it contains as a single error on the container, according to the configured
+     * {@link #msgTarget}. Defaults to false.
+     */
+    combineErrors: false,
+
+    maskOnDisable: false,
+    // If we allow this to mark with the invalidCls it will cascade to all
+    // child fields, let them handle themselves
+    invalidCls: '',
+
+    fieldSubTpl: '<div id="{id}-containerEl" class="{containerElCls}">{%this.renderContainer(out,values)%}</div>',
+
+    initComponent: function() {
+        var me = this;
+
+        // Init mixins
+        me.initLabelable();
+        me.initFieldAncestor();
+        
+        me.callParent();
+        me.initMonitor();
+    },
+    
+    getOverflowEl: function(){
+        return this.containerEl;    
+    },
+
+    /**
+     * @protected Called when a {@link Ext.form.Labelable} instance is added to the container's subtree.
+     * @param {Ext.form.Labelable} labelable The instance that was added
+     */
+    onAdd: function(labelable) {
+        var me = this;
+        
+        // Fix for https://sencha.jira.com/browse/EXTJSIV-6424
+        // In FF, positioning absolutely within a TD positions relative to the TR!
+        // So we must add the width of a visible, left-aligned label cell to the x coordinate.
+        if (Ext.isGecko && me.layout.type === 'absolute' && !me.hideLabel && me.labelAlign !== 'top') {
+            labelable.x += (me.labelWidth + me.labelPad);
+        }
+        me.callParent(arguments);
+        if (me.combineLabels) {
+            labelable.oldHideLabel = labelable.hideLabel;
+            labelable.hideLabel = true;
+        }
+        me.updateLabel();
+    },
+
+    /**
+     * @protected Called when a {@link Ext.form.Labelable} instance is removed from the container's subtree.
+     * @param {Ext.form.Labelable} labelable The instance that was removed
+     */
+    onRemove: function(labelable, isDestroying) {
+        var me = this;
+        me.callParent(arguments);
+        if (!isDestroying) {
+            if (me.combineLabels) {
+                labelable.hideLabel = labelable.oldHideLabel;
+            }
+            me.updateLabel();
+        }   
+    },
+
+    initRenderTpl: function() {
+        var me = this;
+        if (!me.hasOwnProperty('renderTpl')) {
+            me.renderTpl = me.getTpl('labelableRenderTpl');
+        }
+        return me.callParent();
+    },
+
+    initRenderData: function() {
+        var me = this,
+            data = me.callParent();
+
+        data.containerElCls = me.containerElCls;
+        return Ext.applyIf(data, me.getLabelableRenderData());
+    },
+
+    /**
+     * Returns the combined field label if {@link #combineLabels} is set to true and if there is no
+     * set {@link #fieldLabel}. Otherwise returns the fieldLabel like normal. You can also override
+     * this method to provide a custom generated label.
+     * @template
+     * @return {String} The label, or empty string if none.
+     */
+    getFieldLabel: function() {
+        var label = this.fieldLabel || '';
+        if (!label && this.combineLabels) {
+            label = Ext.Array.map(this.query('[isFieldLabelable]'), function(field) {
+                return field.getFieldLabel();
+            }).join(this.labelConnector);
+        }
+        return label;
+    },
+
+    getSubTplData: function() {
+        var ret = this.initRenderData();
+
+        Ext.apply(ret, this.subTplData);
+        return ret;
+    },
+
+    getSubTplMarkup: function() {
+        var me = this,
+            tpl = me.getTpl('fieldSubTpl'),
+            html;
+
+        if (!tpl.renderContent) {
+            me.setupRenderTpl(tpl);
+        }
+
+        html = tpl.apply(me.getSubTplData());
+        return html;
+    },
+
+    /**
+     * @private Updates the content of the labelEl if it is rendered
+     */
+    updateLabel: function() {
+        var me = this,
+            label = me.labelEl;
+            
+        if (label) {
+            me.setFieldLabel(me.getFieldLabel());
+        }
+    },
+
+
+    /**
+     * @private Fired when the error message of any field within the container changes, and updates the
+     * combined error message to match.
+     */
+    onFieldErrorChange: function(field, activeError) {
+        if (this.combineErrors) {
+            var me = this,
+                oldError = me.getActiveError(),
+                invalidFields = Ext.Array.filter(me.query('[isFormField]'), function(field) {
+                    return field.hasActiveError();
+                }),
+                newErrors = me.getCombinedErrors(invalidFields);
+
+            if (newErrors) {
+                me.setActiveErrors(newErrors);
+            } else {
+                me.unsetActiveError();
+            }
+
+            if (oldError !== me.getActiveError()) {
+                me.doComponentLayout();
+            }
+        }
+    },
+
+    /**
+     * Takes an Array of invalid {@link Ext.form.field.Field} objects and builds a combined list of error
+     * messages from them. Defaults to prepending each message by the field name and a colon. This
+     * can be overridden to provide custom combined error message handling, for instance changing
+     * the format of each message or sorting the array (it is sorted in order of appearance by default).
+     * @param {Ext.form.field.Field[]} invalidFields An Array of the sub-fields which are currently invalid.
+     * @return {String[]} The combined list of error messages
+     */
+    getCombinedErrors: function(invalidFields) {
+        var errors = [],
+            f,
+            fLen   = invalidFields.length,
+            field,
+            activeErrors, a, aLen,
+            error, label;
+
+        for (f = 0; f < fLen; f++) {
+            field = invalidFields[f];
+            activeErrors = field.getActiveErrors();
+            aLen         = activeErrors.length;
+
+            for (a = 0; a < aLen; a++) {
+                error = activeErrors[a];
+                label = field.getFieldLabel();
+
+                errors.push((label ? label + ': ' : '') + error);
+            }
+        }
+
+        return errors;
+    },
+
+    getTargetEl: function() {
+        return this.containerEl;
+    },
+
+    applyTargetCls: function(targetCls) {
+        var containerElCls = this.containerElCls;
+
+        this.containerElCls = containerElCls ? containerElCls + ' ' + targetCls : targetCls;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This layout implements the column arrangement for {@link Ext.form.CheckboxGroup} and {@link Ext.form.RadioGroup}.
+ * It groups the component's sub-items into columns based on the component's
+ * {@link Ext.form.CheckboxGroup#columns columns} and {@link Ext.form.CheckboxGroup#vertical} config properties.
+ */
+Ext.define('Ext.layout.container.CheckboxGroup', {
+    extend:  Ext.layout.container.Container ,
+    alias: ['layout.checkboxgroup'],
+
+    /**
+     * @cfg {Boolean} [autoFlex=true]
+     * By default,  CheckboxGroup allocates all available space to the configured columns meaning that
+     * column are evenly spaced across the container.
+     *
+     * To have each column only be wide enough to fit the container Checkboxes (or Radios), set `autoFlex` to `false`
+     */
+    autoFlex: true,
+
+    type: 'checkboxgroup',
+    
+    createsInnerCt: true,
+
+    childEls: [
+        'innerCt'
+    ],
+
+    renderTpl: [
+        '<table id="{ownerId}-innerCt" class="' + Ext.plainTableCls + '" cellpadding="0"',
+            'role="presentation" style="{tableStyle}"><tbody><tr>',
+            '<tpl for="columns">',
+                '<td class="{parent.colCls}" valign="top" style="{style}">',
+                    '{% this.renderColumn(out,parent,xindex-1) %}',
+                '</td>',
+            '</tpl>',
+        '</tr></tbody></table>'
+    ],
+
+    lastOwnerItemsGeneration : null,
+
+    beginLayout: function(ownerContext) {
+        var me = this,
+            columns,
+            numCols,
+            i, width, cwidth,
+            totalFlex = 0, flexedCols = 0,
+            autoFlex = me.autoFlex,
+            innerCtStyle = me.innerCt.dom.style;
+
+        me.callParent(arguments);
+
+        columns = me.columnNodes;
+        ownerContext.innerCtContext = ownerContext.getEl('innerCt', me);
+
+        // The columns config may be an array of widths. Any value < 1 is taken to be a fraction:
+        if (!ownerContext.widthModel.shrinkWrap) {
+            numCols = columns.length;
+
+            // If columns is an array of numeric widths
+            if (me.columnsArray) {
+
+                // first calculate total flex
+                for (i = 0; i < numCols; i++) {
+                    width = me.owner.columns[i];
+                    if (width < 1) {
+                        totalFlex += width;
+                        flexedCols++;
+                    }
+                }
+
+                // now apply widths
+                for (i = 0; i < numCols; i++) {
+                    width = me.owner.columns[i];
+                    if (width < 1) {
+                        cwidth = ((width / totalFlex) * 100) + '%';
+                    } else {
+                        cwidth = width + 'px';
+                    }
+                    columns[i].style.width = cwidth;
+                }
+            }
+
+            // Otherwise it's the *number* of columns, so distributed the widths evenly
+            else {
+                for (i = 0; i < numCols; i++) {
+                    // autoFlex: true will automatically calculate % widths
+                    // autoFlex: false allows the table to decide (shrinkWrap, in effect)
+                    // on a per-column basis
+                    cwidth = autoFlex
+                        ? (1 / numCols * 100) + '%'
+                        : '';
+                    columns[i].style.width = cwidth;
+                    flexedCols++;
+                }
+            }
+
+            // no flexed cols -- all widths are fixed
+            if (!flexedCols) {
+                innerCtStyle.tableLayout = 'fixed';
+                innerCtStyle.width = '';
+            // some flexed cols -- need to fix some
+            } else if (flexedCols < numCols) {
+                innerCtStyle.tableLayout = 'fixed';
+                innerCtStyle.width = '100%';
+            // let the table decide
+            } else {
+                innerCtStyle.tableLayout = 'auto';
+                // if autoFlex, fill available space, else compact down
+                if (autoFlex) {
+                    innerCtStyle.width = '100%';
+                } else {
+                    innerCtStyle.width = '';
+                }
+            }
+
+        } else {
+            innerCtStyle.tableLayout = 'auto';
+            innerCtStyle.width = '';
+        }
+    },
+
+    cacheElements: function () {
+        var me = this;
+
+        // Grab defined childEls
+        me.callParent();
+
+        me.rowEl = me.innerCt.down('tr');
+
+        // Grab columns TDs
+        me.columnNodes = me.rowEl.dom.childNodes;
+    },
+
+    /*
+     * Just wait for the child items to all lay themselves out in the width we are configured
+     * to make available to them. Then we can measure our height.
+     */
+    calculate: function(ownerContext) {
+        var me = this,
+            targetContext, widthShrinkWrap, heightShrinkWrap, shrinkWrap, table, targetPadding;
+
+        // The columnNodes are widthed using their own width attributes, we just need to wait
+        // for all children to have arranged themselves in that width, and then collect our height.
+        if (!ownerContext.getDomProp('containerChildrenSizeDone')) {
+            me.done = false;
+        } else {
+            targetContext = ownerContext.innerCtContext;
+            widthShrinkWrap = ownerContext.widthModel.shrinkWrap;
+            heightShrinkWrap = ownerContext.heightModel.shrinkWrap;
+            shrinkWrap = heightShrinkWrap || widthShrinkWrap;
+            table = targetContext.el.dom;
+            targetPadding = shrinkWrap && targetContext.getPaddingInfo();
+
+            if (widthShrinkWrap) {
+                ownerContext.setContentWidth(table.offsetWidth + targetPadding.width, true);
+            }
+
+            if (heightShrinkWrap) {
+                ownerContext.setContentHeight(table.offsetHeight + targetPadding.height, true);
+            }
+        }
+    },
+
+    doRenderColumn: function (out, renderData, columnIndex) {
+        // Careful! This method is bolted on to the renderTpl so all we get for context is
+        // the renderData! The "this" pointer is the renderTpl instance!
+
+        var me = renderData.$layout,
+            owner = me.owner,
+            columnCount = renderData.columnCount,
+            items = owner.items.items,
+            itemCount = items.length,
+            item, itemIndex, rowCount, increment, tree;
+
+        // Example:
+        //      columnCount = 3
+        //      items.length = 10
+
+        if (owner.vertical) {
+            //        0   1   2
+            //      +---+---+---+
+            //    0 | 0 | 4 | 8 |
+            //      +---+---+---+
+            //    1 | 1 | 5 | 9 |
+            //      +---+---+---+
+            //    2 | 2 | 6 |   |
+            //      +---+---+---+
+            //    3 | 3 | 7 |   |
+            //      +---+---+---+
+
+            rowCount = Math.ceil(itemCount / columnCount); // = 4
+            itemIndex = columnIndex * rowCount;
+            itemCount = Math.min(itemCount, itemIndex + rowCount);
+            increment = 1;
+        } else {
+            //        0   1   2
+            //      +---+---+---+
+            //    0 | 0 | 1 | 2 |
+            //      +---+---+---+
+            //    1 | 3 | 4 | 5 |
+            //      +---+---+---+
+            //    2 | 6 | 7 | 8 |
+            //      +---+---+---+
+            //    3 | 9 |   |   |
+            //      +---+---+---+
+
+            itemIndex = columnIndex;
+            increment = columnCount;
+        }
+
+        for ( ; itemIndex < itemCount; itemIndex += increment) {
+            item = items[itemIndex];
+            me.configureItem(item);
+            tree = item.getRenderTree();
+            Ext.DomHelper.generateMarkup(tree, out);
+        }
+    },
+
+    /**
+     * Returns the number of columns in the checkbox group.
+     * @private
+     */
+    getColumnCount: function() {
+        var me = this,
+            owner = me.owner,
+            ownerColumns = owner.columns;
+
+        // Our columns config is an array of numeric widths.
+        // Calculate our total width
+        if (me.columnsArray) {
+            return ownerColumns.length;
+        }
+
+        if (Ext.isNumber(ownerColumns)) {
+            return ownerColumns;
+        }
+        return owner.items.length;
+    },
+
+    getItemSizePolicy: function (item) {
+        return this.autoSizePolicy;
+    },
+
+    getRenderData: function () {
+        var me = this,
+            data = me.callParent(),
+            owner = me.owner,
+            i, columns = me.getColumnCount(),
+            width, column, cwidth,
+            autoFlex = me.autoFlex,
+            totalFlex = 0, flexedCols = 0;
+
+        // calculate total flex
+        if (me.columnsArray) {
+            for (i=0; i < columns; i++) {
+                width = me.owner.columns[i];
+                if (width < 1) {
+                    totalFlex += width;
+                    flexedCols++;
+                }
+            }
+        }
+
+        data.colCls = owner.groupCls;
+        data.columnCount = columns;
+
+        data.columns = [];
+        for (i = 0; i < columns; i++) {
+            column = (data.columns[i] = {});
+
+            if (me.columnsArray) {
+                width = me.owner.columns[i];
+                if (width < 1) {
+                    cwidth = ((width / totalFlex) * 100) + '%';
+                } else {
+                    cwidth = width + 'px';
+                }
+                column.style = 'width:' + cwidth;
+            } else {
+                column.style = 'width:' + (1 / columns * 100) + '%';
+                flexedCols++;
+            }
+        }
+
+        // If the columns config was an array of column widths, allow table to auto width
+        data.tableStyle =
+            !flexedCols ? 'table-layout:fixed;' :
+            (flexedCols < columns) ? 'table-layout:fixed;width:100%' :
+            (autoFlex) ? 'table-layout:auto;width:100%' : 'table-layout:auto;';
+
+        return data;
+    },
+
+    initLayout: function () {
+        var me = this,
+            owner = me.owner;
+
+        me.columnsArray = Ext.isArray(owner.columns);
+        me.autoColumns = !owner.columns || owner.columns === 'auto';
+        me.vertical = owner.vertical;
+
+        me.callParent();
+    },
+
+    // Always valid. beginLayout ensures the encapsulating elements of all children are in the correct place
+    isValidParent: function() {
+        return true;
+    },
+
+    setupRenderTpl: function (renderTpl) {
+        this.callParent(arguments);
+
+        renderTpl.renderColumn = this.doRenderColumn;
+    },
+
+    renderChildren: function () {
+        var me = this,
+            generation = me.owner.items.generation;
+
+        if (me.lastOwnerItemsGeneration !== generation) {
+            me.lastOwnerItemsGeneration = generation;
+            me.renderItems(me.getLayoutItems());
+        }
+    },
+
+    /**
+     * Iterates over all passed items, ensuring they are rendered.  If the items are already rendered,
+     * also determines if the items are in the proper place in the dom.
+     * @protected
+     */
+    renderItems : function(items) {
+        var me = this,
+            itemCount = items.length,
+            i,
+            item,
+            rowCount,
+            columnCount,
+            rowIndex,
+            columnIndex;
+
+        if (itemCount) {
+            Ext.suspendLayouts();
+
+            if (me.autoColumns) {
+                me.addMissingColumns(itemCount);
+            }
+
+            columnCount = me.columnNodes.length;
+            rowCount = Math.ceil(itemCount / columnCount);
+
+            for (i = 0; i < itemCount; i++) {
+                item = items[i];
+                rowIndex = me.getRenderRowIndex(i, rowCount, columnCount);
+                columnIndex = me.getRenderColumnIndex(i, rowCount, columnCount);
+
+                if (!item.rendered) {
+                    me.renderItem(item, rowIndex, columnIndex);
+                } else if (!me.isItemAtPosition(item, rowIndex, columnIndex)) {
+                    me.moveItem(item, rowIndex, columnIndex);
+                }
+            }
+
+            if (me.autoColumns) {
+                me.removeExceedingColumns(itemCount);
+            }
+
+            Ext.resumeLayouts(true);
+        }
+    },
+
+    isItemAtPosition : function(item, rowIndex, columnIndex) {
+        return item.el.dom === this.getNodeAt(rowIndex, columnIndex);
+    },
+
+    getRenderColumnIndex : function(itemIndex, rowCount, columnCount) {
+        if (this.vertical) {
+            return Math.floor(itemIndex / rowCount);
+        } else {
+            return itemIndex % columnCount;
+        }
+    },
+
+    getRenderRowIndex : function(itemIndex, rowCount, columnCount) {
+        var me = this;
+        if (me.vertical) {
+            return itemIndex % rowCount;
+        } else {
+            return Math.floor(itemIndex / columnCount);
+        }
+    },
+
+    getNodeAt : function(rowIndex, columnIndex) {
+        return this.columnNodes[columnIndex].childNodes[rowIndex];
+    },
+
+    addMissingColumns : function(itemsCount) {
+        var me = this,
+            existingColumnsCount = me.columnNodes.length,
+            missingColumnsCount,
+            row,
+            cls,
+            i;
+        if (existingColumnsCount < itemsCount) {
+            missingColumnsCount = itemsCount - existingColumnsCount;
+            row = me.rowEl;
+            cls = me.owner.groupCls;
+            for (i = 0; i < missingColumnsCount; i++) {
+                row.createChild({
+                    cls: cls,
+                    tag: 'td',
+                    vAlign: 'top'
+                });
+            }
+        }
+    },
+
+    removeExceedingColumns : function(itemsCount) {
+        var me = this,
+            existingColumnsCount = me.columnNodes.length,
+            exceedingColumnsCount,
+            row,
+            i;
+        if (existingColumnsCount > itemsCount) {
+            exceedingColumnsCount = existingColumnsCount - itemsCount;
+            row = me.rowEl;
+            for (i = 0; i < exceedingColumnsCount; i++) {
+                row.last().remove();
+            }
+        }
+    },
+
+    /**
+     * Renders the given Component into the specified row and column
+     * @param {Ext.Component} item The Component to render
+     * @param {number} rowIndex row index
+     * @param {number} columnIndex column index
+     * @private
+     */
+    renderItem : function(item, rowIndex, columnIndex) {
+        var me = this;
+
+        me.configureItem(item);
+        item.render(Ext.get(me.columnNodes[columnIndex]), rowIndex);
+        me.afterRenderItem(item);
+    },
+
+    /**
+     * Moves the given already rendered Component to the specified row and column
+     * @param {Ext.Component} item The Component to move
+     * @param {number} rowIndex row index
+     * @param {number} columnIndex column index
+     * @private
+     */
+    moveItem : function(item, rowIndex, columnIndex) {
+        var me = this,
+            column = me.columnNodes[columnIndex],
+            targetNode = column.childNodes[rowIndex];
+        column.insertBefore(item.el.dom, targetNode || null);
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ * Private utility class for managing all {@link Ext.form.field.Checkbox} fields grouped by name.
+ */
+Ext.define('Ext.form.CheckboxManager', {
+    extend:  Ext.util.MixedCollection ,
+    singleton: true,
+
+    getByName: function(name, formId) {
+        return this.filterBy(function(item) {
+            return item.name == name && item.getFormId() == formId;
+        });
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Robert Dougan <rob at sencha.com>
+ *
+ * Single checkbox field. Can be used as a direct replacement for traditional checkbox fields. Also serves as a
+ * parent class for {@link Ext.form.field.Radio radio buttons}.
+ *
+ * # Labeling
+ *
+ * In addition to the {@link Ext.form.Labelable standard field labeling options}, checkboxes
+ * may be given an optional {@link #boxLabel} which will be displayed immediately after checkbox. Also see
+ * {@link Ext.form.CheckboxGroup} for a convenient method of grouping related checkboxes.
+ *
+ * # Values
+ *
+ * The main value of a checkbox is a boolean, indicating whether or not the checkbox is checked.
+ * The following values will check the checkbox:
+ *
+ * - `true`
+ * - `'true'`
+ * - `'1'`
+ * - `'on'`
+ *
+ * Any other value will uncheck the checkbox.
+ *
+ * In addition to the main boolean value, you may also specify a separate {@link #inputValue}. This will be
+ * sent as the parameter value when the form is {@link Ext.form.Basic#submit submitted}. You will want to set
+ * this value if you have multiple checkboxes with the same {@link #name}. If not specified, the value `on`
+ * will be used.
+ *
+ * # Example usage
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         bodyPadding: 10,
+ *         width: 300,
+ *         title: 'Pizza Order',
+ *         items: [
+ *             {
+ *                 xtype: 'fieldcontainer',
+ *                 fieldLabel: 'Toppings',
+ *                 defaultType: 'checkboxfield',
+ *                 items: [
+ *                     {
+ *                         boxLabel  : 'Anchovies',
+ *                         name      : 'topping',
+ *                         inputValue: '1',
+ *                         id        : 'checkbox1'
+ *                     }, {
+ *                         boxLabel  : 'Artichoke Hearts',
+ *                         name      : 'topping',
+ *                         inputValue: '2',
+ *                         checked   : true,
+ *                         id        : 'checkbox2'
+ *                     }, {
+ *                         boxLabel  : 'Bacon',
+ *                         name      : 'topping',
+ *                         inputValue: '3',
+ *                         id        : 'checkbox3'
+ *                     }
+ *                 ]
+ *             }
+ *         ],
+ *         bbar: [
+ *             {
+ *                 text: 'Select Bacon',
+ *                 handler: function() {
+ *                     Ext.getCmp('checkbox3').setValue(true);
+ *                 }
+ *             },
+ *             '-',
+ *             {
+ *                 text: 'Select All',
+ *                 handler: function() {
+ *                     Ext.getCmp('checkbox1').setValue(true);
+ *                     Ext.getCmp('checkbox2').setValue(true);
+ *                     Ext.getCmp('checkbox3').setValue(true);
+ *                 }
+ *             },
+ *             {
+ *                 text: 'Deselect All',
+ *                 handler: function() {
+ *                     Ext.getCmp('checkbox1').setValue(false);
+ *                     Ext.getCmp('checkbox2').setValue(false);
+ *                     Ext.getCmp('checkbox3').setValue(false);
+ *                 }
+ *             }
+ *         ],
+ *         renderTo: Ext.getBody()
+ *     });
+ */
+Ext.define('Ext.form.field.Checkbox', {
+    extend:  Ext.form.field.Base ,
+    alias: ['widget.checkboxfield', 'widget.checkbox'],
+    alternateClassName: 'Ext.form.Checkbox',
+                                                             
+
+    componentLayout: 'field',
+    
+    // inputEl should always retain the same size, never stretch
+    stretchInputElFixed: false,
+
+    childEls: [
+        /**
+         * @property {Ext.Element} boxLabelEl
+         * A reference to the label element created for the {@link #boxLabel}. Only present if the component has been
+         * rendered and has a boxLabel configured.
+         */
+        'boxLabelEl'
+    ],
+
+    // note: {id} here is really {inputId}, but {cmpId} is available
+    fieldSubTpl: [
+        '<tpl if="boxLabel && boxLabelAlign == \'before\'">',
+            '{beforeBoxLabelTpl}',
+            '<label id="{cmpId}-boxLabelEl" {boxLabelAttrTpl} class="{boxLabelCls} {boxLabelCls}-{boxLabelAlign}" for="{id}">',
+                '{beforeBoxLabelTextTpl}',
+                '{boxLabel}',
+                '{afterBoxLabelTextTpl}',
+            '</label>',
+            '{afterBoxLabelTpl}',
+        '</tpl>',
+        // Creates an input of the configured type. By default, this is "button" to enable theming.
+        // When ARIA is enabled, this reverts to a "checkbox"
+        '<input type="{inputTypeAttr}" id="{id}" {inputAttrTpl}',
+            '<tpl if="tabIdx"> tabIndex="{tabIdx}"</tpl>',
+            '<tpl if="disabled"> disabled="disabled"</tpl>',
+            '<tpl if="fieldStyle"> style="{fieldStyle}"</tpl>',
+            '<tpl if="ariaAttrs"> {ariaAttrs}</tpl>',
+            ' class="{fieldCls} {typeCls} {inputCls} {childElCls}" autocomplete="off" hidefocus="true" />',
+        '<tpl if="boxLabel && boxLabelAlign == \'after\'">',
+            '{beforeBoxLabelTpl}',
+            '<label id="{cmpId}-boxLabelEl" {boxLabelAttrTpl} class="{boxLabelCls} {boxLabelCls}-{boxLabelAlign}" for="{id}">',
+                '{beforeBoxLabelTextTpl}',
+                '{boxLabel}',
+                '{afterBoxLabelTextTpl}',
+            '</label>',
+            '{afterBoxLabelTpl}',
+        '</tpl>',
+        {
+            disableFormats: true,
+            compiled: true
+        }
+    ],
+
+    subTplInsertions: [
+        /**
+         * @cfg {String/Array/Ext.XTemplate} beforeBoxLabelTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * before the box label element. If an `XTemplate` is used, the component's
+         * {@link Ext.form.field.Base#getSubTplData subTpl data} serves as the context.
+         */
+        'beforeBoxLabelTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} afterBoxLabelTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * after the box label element. If an `XTemplate` is used, the component's
+         * {@link Ext.form.field.Base#getSubTplData subTpl data} serves as the context.
+         */
+        'afterBoxLabelTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} beforeBoxLabelTextTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * before the box label text. If an `XTemplate` is used, the component's
+         * {@link Ext.form.field.Base#getSubTplData subTpl data} serves as the context.
+         */
+        'beforeBoxLabelTextTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} afterBoxLabelTextTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * after the box label text. If an `XTemplate` is used, the component's
+         * {@link Ext.form.field.Base#getSubTplData subTpl data} serves as the context.
+         */
+        'afterBoxLabelTextTpl',
+
+        /**
+         * @cfg {String/Array/Ext.XTemplate} boxLabelAttrTpl
+         * An optional string or `XTemplate` configuration to insert in the field markup
+         * inside the box label element (as attributes). If an `XTemplate` is used, the component's
+         * {@link Ext.form.field.Base#getSubTplData subTpl data} serves as the context.
+         */
+        'boxLabelAttrTpl',
+
+        // inherited
+        'inputAttrTpl'
+    ],
+
+    /*
+     * @property {Boolean} isCheckbox
+     * `true` in this class to identify an object as an instantiated Checkbox, or subclass thereof.
+     */
+    isCheckbox: true,
+
+    /**
+     * @cfg {String} [focusCls='x-form-checkbox-focus']
+     * The CSS class to use when the checkbox receives focus
+     */
+    focusCls: 'form-checkbox-focus',
+
+    /**
+     * @cfg {String} [fieldCls='x-form-field']
+     * The default CSS class for the checkbox
+     */
+    
+    // private
+    extraFieldBodyCls: Ext.baseCSSPrefix + 'form-cb-wrap',
+
+    /**
+     * @cfg {Boolean} checked
+     * true if the checkbox should render initially checked
+     */
+    checked: false,
+
+    /**
+     * @cfg {String} [checkedCls='x-form-cb-checked']
+     * The CSS class(es) added to the component's main element when it is in the checked state.
+     * You can add your own class (checkedCls='myClass x-form-cb-checked') or replace the default 
+     * class altogether (checkedCls='myClass').
+     */
+    checkedCls: Ext.baseCSSPrefix + 'form-cb-checked',
+
+    /**
+     * @cfg {String} boxLabel
+     * An optional text label that will appear next to the checkbox. Whether it appears before or after the checkbox is
+     * determined by the {@link #boxLabelAlign} config.
+     */
+
+    /**
+     * @cfg {String} [boxLabelCls='x-form-cb-label']
+     * The CSS class to be applied to the {@link #boxLabel} element
+     */
+    boxLabelCls: Ext.baseCSSPrefix + 'form-cb-label',
+
+    /**
+     * @cfg {String} boxLabelAlign
+     * The position relative to the checkbox where the {@link #boxLabel} should appear. Recognized values are 'before'
+     * and 'after'.
+     */
+    boxLabelAlign: 'after',
+
+    /**
+     * @cfg {String} inputValue
+     * The value that should go into the generated input element's value attribute and should be used as the parameter
+     * value when submitting as part of a form.
+     */
+    inputValue: 'on',
+
+    /**
+     * @cfg {String} uncheckedValue
+     * If configured, this will be submitted as the checkbox's value during form submit if the checkbox is unchecked. By
+     * default this is undefined, which results in nothing being submitted for the checkbox field when the form is
+     * submitted (the default behavior of HTML checkboxes).
+     */
+
+    /**
+     * @cfg {Function} handler
+     * A function called when the {@link #checked} value changes (can be used instead of handling the {@link #change
+     * change event}).
+     * @cfg {Ext.form.field.Checkbox} handler.checkbox The Checkbox being toggled.
+     * @cfg {Boolean} handler.checked The new checked state of the checkbox.
+     */
+
+    /**
+     * @cfg {Object} scope
+     * An object to use as the scope ('this' reference) of the {@link #handler} function.
+     *
+     * Defaults to this Checkbox.
+     */
+
+    // private overrides
+    checkChangeEvents: [],
+    inputType: 'checkbox',
+    
+    // private - the actual input type to use. inputType is just used to generate a class name
+    inputTypeAttr: 'button',
+
+
+    // private
+    onRe: /^on$/i,
+
+    // the form-cb css class is for styling shared between checkbox and subclasses (radio)
+    inputCls: Ext.baseCSSPrefix + 'form-cb',
+
+    initComponent: function() {
+        this.callParent(arguments);
+        this.getManager().add(this);
+    },
+
+    initValue: function() {
+        var me = this,
+            checked = !!me.checked;
+
+        /**
+         * @property {Object} originalValue
+         * The original value of the field as configured in the {@link #checked} configuration, or as loaded by the last
+         * form load operation if the form's {@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad} setting is `true`.
+         */
+        me.originalValue = me.lastValue = checked;
+
+        // Set the initial checked state
+        me.setValue(checked);
+    },
+
+    getElConfig: function() {
+        var me = this;
+
+        // Add the checked class if this begins checked
+        if (me.isChecked(me.rawValue, me.inputValue)) {
+            me.addCls(me.checkedCls);
+        }
+        return me.callParent();
+    },
+
+    getFieldStyle: function() {
+        return Ext.isObject(this.fieldStyle) ? Ext.DomHelper.generateStyles(this.fieldStyle) : this.fieldStyle ||'';
+    },
+
+    getSubTplData: function() {
+        var me = this;
+        return Ext.apply(me.callParent(), {
+            disabled      : me.readOnly || me.disabled,
+            boxLabel      : me.boxLabel,
+            boxLabelCls   : me.boxLabelCls,
+            boxLabelAlign : me.boxLabelAlign,
+            inputTypeAttr : me.inputTypeAttr
+        });
+    },
+
+    initEvents: function() {
+        var me = this;
+        me.callParent();
+        me.mon(me.inputEl, 'click', me.onBoxClick, me);
+    },
+    
+    /**
+     * Sets the {@link #boxLabel} for this checkbox.
+     * @param {String} boxLabel The new label
+     */
+    setBoxLabel: function(boxLabel){
+        var me = this;
+        
+        me.boxLabel = boxLabel;
+        if (me.rendered) {
+            me.boxLabelEl.update(boxLabel);
+        }
+    },
+
+    /**
+     * @private Handle click on the checkbox button
+     */
+    onBoxClick: function(e) {
+        var me = this;
+        if (!me.disabled && !me.readOnly) {
+            this.setValue(!this.checked);
+        }
+    },
+
+    /**
+     * Returns the checked state of the checkbox.
+     * @return {Boolean} True if checked, else false
+     */
+    getRawValue: function() {
+        return this.checked;
+    },
+
+    /**
+     * Returns the checked state of the checkbox.
+     * @return {Boolean} True if checked, else false
+     */
+    getValue: function() {
+        return this.checked;
+    },
+
+    /**
+     * Returns the submit value for the checkbox which can be used when submitting forms.
+     * @return {String} If checked the {@link #inputValue} is returned; otherwise the {@link #uncheckedValue}
+     * (or null if the latter is not configured).
+     */
+    getSubmitValue: function() {
+        var unchecked = this.uncheckedValue,
+            uncheckedVal = Ext.isDefined(unchecked) ? unchecked : null;
+        return this.checked ? this.inputValue : uncheckedVal;
+    },
+
+    isChecked: function(rawValue, inputValue) {
+        return (rawValue === true || rawValue === 'true' || rawValue === '1' || rawValue === 1 ||
+                      (((Ext.isString(rawValue) || Ext.isNumber(rawValue)) && inputValue) ? rawValue == inputValue : this.onRe.test(rawValue)));
+    },
+
+    /**
+     * Sets the checked state of the checkbox.
+     *
+     * @param {Boolean/String/Number} value The following values will check the checkbox:
+     * `true, 'true', '1', 1, or 'on'`, as well as a String that matches the {@link #inputValue}.
+     * Any other value will uncheck the checkbox.
+     * @return {Boolean} the new checked state of the checkbox
+     */
+    setRawValue: function(value) {
+        var me = this,
+            inputEl = me.inputEl,
+            checked = me.isChecked(value, me.inputValue);
+
+        if (inputEl) {
+            me[checked ? 'addCls' : 'removeCls'](me.checkedCls);
+        }
+
+        me.checked = me.rawValue = checked;
+        return checked;
+    },
+
+    /**
+     * Sets the checked state of the checkbox, and invokes change detection.
+     * @param {Boolean/String} checked The following values will check the checkbox: `true, 'true', '1', or 'on'`, as
+     * well as a String that matches the {@link #inputValue}. Any other value will uncheck the checkbox.
+     * @return {Ext.form.field.Checkbox} this
+     */
+    setValue: function(checked) {
+        var me = this,
+            boxes, i, len, box;
+
+        // If an array of strings is passed, find all checkboxes in the group with the same name as this
+        // one and check all those whose inputValue is in the array, unchecking all the others. This is to
+        // facilitate setting values from Ext.form.Basic#setValues, but is not publicly documented as we
+        // don't want users depending on this behavior.
+        if (Ext.isArray(checked)) {
+            boxes = me.getManager().getByName(me.name, me.getFormId()).items;
+            len = boxes.length;
+
+            for (i = 0; i < len; ++i) {
+                box = boxes[i];
+                box.setValue(Ext.Array.contains(checked, box.inputValue));
+            }
+        } else {
+            me.callParent(arguments);
+        }
+
+        return me;
+    },
+
+    // private
+    valueToRaw: function(value) {
+        // No extra conversion for checkboxes
+        return value;
+    },
+
+    /**
+     * @private
+     * Called when the checkbox's checked state changes. Invokes the {@link #handler} callback
+     * function if specified.
+     */
+    onChange: function(newVal, oldVal) {
+        var me = this,
+            handler = me.handler;
+        if (handler) {
+            handler.call(me.scope || me, me, newVal);
+        }
+        me.callParent(arguments);
+    },
+    
+    resetOriginalValue: function(/* private */ fromBoxInGroup){
+        var me = this,
+            boxes,
+            box,
+            len,
+            i;
+            
+        // If we're resetting the value of a field in a group, also reset the others.
+        if (!fromBoxInGroup) {
+            boxes = me.getManager().getByName(me.name, me.getFormId()).items;
+            len  = boxes.length;
+            
+            for (i = 0; i < len; ++i) {
+                box = boxes[i];
+                if (box !== me) {
+                    boxes[i].resetOriginalValue(true);
+                }
+            }
+        }
+        me.callParent();
+    },
+
+    // inherit docs
+    beforeDestroy: function(){
+        this.callParent();
+        this.getManager().removeAtKey(this.id);
+    },
+
+    // inherit docs
+    getManager: function() {
+        return Ext.form.CheckboxManager;
+    },
+
+    onEnable: function() {
+        var me = this,
+            inputEl = me.inputEl;
+        me.callParent();
+        if (inputEl) {
+            // Can still be disabled if the field is readOnly
+            inputEl.dom.disabled = me.readOnly;
+        }
+    },
+
+    setReadOnly: function(readOnly) {
+        var me = this,
+            inputEl = me.inputEl;
+        if (inputEl) {
+            // Set the button to disabled when readonly
+            inputEl.dom.disabled = !!readOnly || me.disabled;
+        }
+        me.callParent(arguments);
+    },
+
+    getFormId: function(){
+        var me = this,
+            form;
+
+        if (!me.formId) {
+            form = me.up('form');
+            if (form) {
+                me.formId = form.id;
+            }
+        }
+        return me.formId;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A {@link Ext.form.FieldContainer field container} which has a specialized layout for arranging
+ * {@link Ext.form.field.Checkbox} controls into columns, and provides convenience
+ * {@link Ext.form.field.Field} methods for {@link #getValue getting}, {@link #setValue setting},
+ * and {@link #validate validating} the group of checkboxes as a whole.
+ *
+ * # Validation
+ *
+ * Individual checkbox fields themselves have no default validation behavior, but
+ * sometimes you want to require a user to select at least one of a group of checkboxes. CheckboxGroup
+ * allows this by setting the config `{@link #allowBlank}:false`; when the user does not check at
+ * least one of the checkboxes, the entire group will be highlighted as invalid and the
+ * {@link #blankText error message} will be displayed according to the {@link #msgTarget} config.
+ *
+ * # Layout
+ *
+ * The default layout for CheckboxGroup makes it easy to arrange the checkboxes into
+ * columns; see the {@link #columns} and {@link #vertical} config documentation for details. You may also
+ * use a completely different layout by setting the {@link #layout} to one of the other supported layout
+ * types; for instance you may wish to use a custom arrangement of hbox and vbox containers. In that case
+ * the checkbox components at any depth will still be managed by the CheckboxGroup's validation.
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Checkbox Group',
+ *         width: 300,
+ *         height: 125,
+ *         bodyPadding: 10,
+ *         renderTo: Ext.getBody(),
+ *         items:[{
+ *             xtype: 'checkboxgroup',
+ *             fieldLabel: 'Two Columns',
+ *             // Arrange checkboxes into two columns, distributed vertically
+ *             columns: 2,
+ *             vertical: true,
+ *             items: [
+ *                 { boxLabel: 'Item 1', name: 'rb', inputValue: '1' },
+ *                 { boxLabel: 'Item 2', name: 'rb', inputValue: '2', checked: true },
+ *                 { boxLabel: 'Item 3', name: 'rb', inputValue: '3' },
+ *                 { boxLabel: 'Item 4', name: 'rb', inputValue: '4' },
+ *                 { boxLabel: 'Item 5', name: 'rb', inputValue: '5' },
+ *                 { boxLabel: 'Item 6', name: 'rb', inputValue: '6' }
+ *             ]
+ *         }]
+ *     });
+ */
+Ext.define('Ext.form.CheckboxGroup', {
+    extend: Ext.form.FieldContainer ,
+    mixins: {
+        field:  Ext.form.field.Field 
+    },
+    alias: 'widget.checkboxgroup',
+               
+                                             
+                                  
+                             
+      
+
+    /**
+     * @cfg {String} name
+     * @private
+     */
+
+    /**
+     * @cfg {Ext.form.field.Checkbox[]/Object[]} items
+     * An Array of {@link Ext.form.field.Checkbox Checkbox}es or Checkbox config objects to arrange in the group.
+     */
+
+    /**
+     * @cfg {String/Number/Number[]} columns
+     * Specifies the number of columns to use when displaying grouped checkbox/radio controls using automatic layout.
+     * This config can take several types of values:
+     *
+     * - 'auto' - The controls will be rendered one per column on one row and the width of each column will be evenly
+     *   distributed based on the width of the overall field container. This is the default.
+     * - Number - If you specific a number (e.g., 3) that number of columns will be created and the contained controls
+     *   will be automatically distributed based on the value of {@link #vertical}.
+     * - Array - You can also specify an array of column widths, mixing integer (fixed width) and float (percentage
+     *   width) values as needed (e.g., [100, .25, .75]). Any integer values will be rendered first, then any float
+     *   values will be calculated as a percentage of the remaining space. Float values do not have to add up to 1
+     *   (100%) although if you want the controls to take up the entire field container you should do so.
+     */
+    columns : 'auto',
+
+    /**
+     * @cfg {Boolean} vertical
+     * True to distribute contained controls across columns, completely filling each column top to bottom before
+     * starting on the next column. The number of controls in each column will be automatically calculated to keep
+     * columns as even as possible. The default value is false, so that controls will be added to columns one at a time,
+     * completely filling each row left to right before starting on the next row.
+     */
+    vertical : false,
+
+    /**
+     * @cfg {Boolean} allowBlank
+     * False to validate that at least one item in the group is checked. If no items are selected at
+     * validation time, {@link #blankText} will be used as the error text.
+     */
+    allowBlank : true,
+
+    //<locale>
+    /**
+     * @cfg {String} blankText
+     * Error text to display if the {@link #allowBlank} validation fails
+     */
+    blankText : "You must select at least one item in this group",
+    //</locale>
+
+    // private
+    defaultType : 'checkboxfield',
+
+    // private
+    groupCls : Ext.baseCSSPrefix + 'form-check-group',
+
+    // private
+    extraFieldBodyCls: Ext.baseCSSPrefix + 'form-checkboxgroup-body',
+
+    // private
+    layout: 'checkboxgroup',
+
+    componentCls: Ext.baseCSSPrefix + 'form-checkboxgroup',
+
+    initComponent: function() {
+        var me = this;
+        me.callParent();
+        me.initField();
+    },
+
+    /**
+     * Initializes the field's value based on the initial config. If the {@link #value} config is specified then we use
+     * that to set the value; otherwise we initialize the originalValue by querying the values of all sub-checkboxes
+     * after they have been initialized.
+     * @protected
+     */
+    initValue: function() {
+        var me = this,
+            valueCfg = me.value;
+        me.originalValue = me.lastValue = valueCfg || me.getValue();
+        if (valueCfg) {
+            me.setValue(valueCfg);
+        }
+    },
+
+    /**
+     * When a checkbox is added to the group, monitor it for changes
+     * @param {Object} field
+     * @protected
+     */
+    onAdd: function(item) {
+        var me = this,
+            items,
+            len, i;
+
+        if (item.isCheckbox) {
+            me.mon(item, 'change', me.checkChange, me);
+        } else if (item.isContainer) {
+            items = item.items.items;
+            for (i = 0, len = items.length; i < len; i++) {
+                me.onAdd(items[i]);
+            }
+        }
+        me.callParent(arguments);
+    },
+
+    onRemove: function(item) {
+        var me = this,
+            items,
+            len, i;
+
+        if (item.isCheckbox) {
+            me.mun(item, 'change', me.checkChange, me);
+        } else if (item.isContainer) {
+            items = item.items.items;
+            for (i = 0, len = items.length; i < len; i++) {
+                me.onRemove(items[i]);
+            }
+        }
+        me.callParent(arguments);
+    },
+
+    // private override - the group value is a complex object, compare using object serialization
+    isEqual: function(value1, value2) {
+        var toQueryString = Ext.Object.toQueryString;
+        return toQueryString(value1) === toQueryString(value2);
+    },
+
+    /**
+     * Runs CheckboxGroup's validations and returns an array of any errors. The only error by default is if allowBlank
+     * is set to true and no items are checked.
+     * @return {String[]} Array of all validation errors
+     */
+    getErrors: function() {
+        var errors = [];
+        if (!this.allowBlank && Ext.isEmpty(this.getChecked())) {
+            errors.push(this.blankText);
+        }
+        return errors;
+    },
+
+    /**
+     * @private Returns all checkbox components within the container
+     * @param {String} [query] An additional query to add to the selector.
+     */
+    getBoxes: function(query) {
+        return this.query('[isCheckbox]' + (query||''));
+    },
+
+    /**
+     * @private Convenience function which calls the given function for every checkbox in the group
+     * @param {Function} fn The function to call
+     * @param {Object} [scope] scope object
+     */
+    eachBox: function(fn, scope) {
+        Ext.Array.forEach(this.getBoxes(), fn, scope || this);
+    },
+
+    /**
+     * Returns an Array of all checkboxes in the container which are currently checked
+     * @return {Ext.form.field.Checkbox[]} Array of Ext.form.field.Checkbox components
+     */
+    getChecked: function() {
+        return this.getBoxes('[checked]');
+    },
+
+    // private override
+    isDirty: function(){
+        var boxes = this.getBoxes(),
+            b ,
+            bLen  = boxes.length;
+
+        for (b = 0; b < bLen; b++) {
+            if (boxes[b].isDirty()) {
+                return true;
+            }
+        }
+    },
+
+    // private override
+    setReadOnly: function(readOnly) {
+        var boxes = this.getBoxes(),
+            b,
+            bLen  = boxes.length;
+
+        for (b = 0; b < bLen; b++) {
+            boxes[b].setReadOnly(readOnly);
+        }
+
+        this.readOnly = readOnly;
+    },
+
+    /**
+     * Resets the checked state of all {@link Ext.form.field.Checkbox checkboxes} in the group to their originally
+     * loaded values and clears any validation messages.
+     * See {@link Ext.form.Basic}.{@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad}
+     */
+    reset: function() {
+        var me = this,
+            hadError = me.hasActiveError(),
+            preventMark = me.preventMark;
+        me.preventMark = true;
+        me.batchChanges(function() {
+            var boxes = me.getBoxes(),
+                b,
+                bLen  = boxes.length;
+
+            for (b = 0; b < bLen; b++) {
+                boxes[b].reset();
+            }
+        });
+        me.preventMark = preventMark;
+        me.unsetActiveError();
+        if (hadError) {
+            me.updateLayout();
+        }
+    },
+
+    resetOriginalValue: function(){
+        var me    = this,
+            boxes = me.getBoxes(),
+            b,
+            bLen  = boxes.length;
+
+        for (b = 0; b < bLen; b++) {
+            boxes[b].resetOriginalValue();
+        }
+
+        me.originalValue = me.getValue();
+        me.checkDirty();
+    },
+
+
+    /**
+     * Sets the value(s) of all checkboxes in the group. The expected format is an Object of name-value pairs
+     * corresponding to the names of the checkboxes in the group. Each pair can have either a single or multiple values:
+     *
+     *   - A single Boolean or String value will be passed to the `setValue` method of the checkbox with that name.
+     *     See the rules in {@link Ext.form.field.Checkbox#setValue} for accepted values.
+     *   - An Array of String values will be matched against the {@link Ext.form.field.Checkbox#inputValue inputValue}
+     *     of checkboxes in the group with that name; those checkboxes whose inputValue exists in the array will be
+     *     checked and others will be unchecked.
+     *
+     * If a checkbox's name is not in the mapping at all, it will be unchecked.
+     *
+     * An example:
+     *
+     *     var myCheckboxGroup = new Ext.form.CheckboxGroup({
+     *         columns: 3,
+     *         items: [{
+     *             name: 'cb1',
+     *             boxLabel: 'Single 1'
+     *         }, {
+     *             name: 'cb2',
+     *             boxLabel: 'Single 2'
+     *         }, {
+     *             name: 'cb3',
+     *             boxLabel: 'Single 3'
+     *         }, {
+     *             name: 'cbGroup',
+     *             boxLabel: 'Grouped 1'
+     *             inputValue: 'value1'
+     *         }, {
+     *             name: 'cbGroup',
+     *             boxLabel: 'Grouped 2'
+     *             inputValue: 'value2'
+     *         }, {
+     *             name: 'cbGroup',
+     *             boxLabel: 'Grouped 3'
+     *             inputValue: 'value3'
+     *         }]
+     *     });
+     *
+     *     myCheckboxGroup.setValue({
+     *         cb1: true,
+     *         cb3: false,
+     *         cbGroup: ['value1', 'value3']
+     *     });
+     *
+     * The above code will cause the checkbox named 'cb1' to be checked, as well as the first and third checkboxes named
+     * 'cbGroup'. The other three checkboxes will be unchecked.
+     *
+     * @param {Object} value The mapping of checkbox names to values.
+     * @return {Ext.form.CheckboxGroup} this
+     */
+    setValue: function(value) {
+        var me    = this,
+            boxes = me.getBoxes(),
+            b,
+            bLen  = boxes.length,
+            box, name,
+            cbValue;
+
+        me.batchChanges(function() {
+            for (b = 0; b < bLen; b++) {
+                box = boxes[b];
+                name = box.getName();
+                cbValue = false;
+
+                if (value && value.hasOwnProperty(name)) {
+                    if (Ext.isArray(value[name])) {
+                        cbValue = Ext.Array.contains(value[name], box.inputValue);
+                    } else {
+                        // single value, let the checkbox's own setValue handle conversion
+                        cbValue = value[name];
+                    }
+                }
+
+                box.setValue(cbValue);
+            }
+        });
+        return me;
+    },
+
+
+    /**
+     * Returns an object containing the values of all checked checkboxes within the group. Each key-value pair in the
+     * object corresponds to a checkbox {@link Ext.form.field.Checkbox#name name}. If there is only one checked checkbox
+     * with a particular name, the value of that pair will be the String {@link Ext.form.field.Checkbox#inputValue
+     * inputValue} of that checkbox. If there are multiple checked checkboxes with that name, the value of that pair
+     * will be an Array of the selected inputValues.
+     *
+     * The object format returned from this method can also be passed directly to the {@link #setValue} method.
+     *
+     * NOTE: In Ext 3, this method returned an array of Checkbox components; this was changed to make it more consistent
+     * with other field components and with the {@link #setValue} argument signature. If you need the old behavior in
+     * Ext 4+, use the {@link #getChecked} method instead.
+     */
+    getValue: function() {
+        var values = {},
+            boxes  = this.getBoxes(),
+            b,
+            bLen   = boxes.length,
+            box, name, inputValue, bucket;
+
+        for (b = 0; b < bLen; b++) {
+            box        = boxes[b];
+            name       = box.getName();
+            inputValue = box.inputValue;
+
+            if (box.getValue()) {
+                if (values.hasOwnProperty(name)) {
+                    bucket = values[name];
+                    if (!Ext.isArray(bucket)) {
+                        bucket = values[name] = [bucket];
+                    }
+                    bucket.push(inputValue);
+                } else {
+                    values[name] = inputValue;
+                }
+            }
+        }
+
+        return values;
+    },
+
+    /*
+     * Don't return any data for submit; the form will get the info from the individual checkboxes themselves.
+     */
+    getSubmitData: function() {
+        return null;
+    },
+
+    /*
+     * Don't return any data for the model; the form will get the info from the individual checkboxes themselves.
+     */
+    getModelData: function() {
+        return null;
+    },
+
+    validate: function() {
+        var me = this,
+            errors,
+            isValid,
+            wasValid;
+
+        if (me.disabled) {
+            isValid = true;
+        } else {
+            errors = me.getErrors();
+            isValid = Ext.isEmpty(errors);
+            wasValid = me.wasValid;
+            if (isValid) {
+                me.unsetActiveError();
+            } else {
+                me.setActiveError(errors);
+            }
+        }
+        if (isValid !== wasValid) {
+            me.wasValid = isValid;
+            me.fireEvent('validitychange', me, isValid);
+            me.updateLayout();
+        }
+
+        return isValid;
+    }
+
+}, function() {
+
+    this.borrow(Ext.form.field.Base, ['markInvalid', 'clearInvalid', 'setError']);
+
+});
+
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ *
+ * Produces a standalone `<label />` element which can be inserted into a form and be associated with a field
+ * in that form using the {@link #forId} property.
+ * 
+ * **NOTE:** in most cases it will be more appropriate to use the {@link Ext.form.Labelable#fieldLabel fieldLabel}
+ * and associated config properties ({@link Ext.form.Labelable#labelAlign}, {@link Ext.form.Labelable#labelWidth},
+ * etc.) in field components themselves, as that allows labels to be uniformly sized throughout the form.
+ * Ext.form.Label should only be used when your layout can not be achieved with the standard
+ * {@link Ext.form.Labelable field layout}.
+ * 
+ * You will likely be associating the label with a field component that extends {@link Ext.form.field.Base}, so
+ * you should make sure the {@link #forId} is set to the same value as the {@link Ext.form.field.Base#inputId inputId}
+ * of that field.
+ * 
+ * The label's text can be set using either the {@link #text} or {@link #html} configuration properties; the
+ * difference between the two is that the former will automatically escape HTML characters when rendering, while
+ * the latter will not.
+ *
+ * # Example
+ * 
+ * This example creates a Label after its associated Text field, an arrangement that cannot currently
+ * be achieved using the standard Field layout's labelAlign.
+ * 
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Field with Label',
+ *         width: 400,
+ *         bodyPadding: 10,
+ *         renderTo: Ext.getBody(),
+ *         layout: {
+ *             type: 'hbox',
+ *             align: 'middle'
+ *         },
+ *         items: [{
+ *             xtype: 'textfield',
+ *             hideLabel: true,
+ *             flex: 1
+ *         }, {
+ *             xtype: 'label',
+ *             forId: 'myFieldId',
+ *             text: 'My Awesome Field',
+ *             margin: '0 0 0 10'
+ *         }]
+ *     });
+ */
+Ext.define('Ext.form.Label', {
+    extend: Ext.Component ,
+    alias: 'widget.label',
+                                  
+
+    autoEl: 'label',
+
+    /**
+     * @cfg {String} [text='']
+     * The plain text to display within the label. If you need to include HTML
+     * tags within the label's innerHTML, use the {@link #html} config instead.
+     */
+    /**
+     * @cfg {String} forId
+     * The id of the input element to which this label will be bound via the standard HTML 'for'
+     * attribute. If not specified, the attribute will not be added to the label. In most cases you will be
+     * associating the label with a {@link Ext.form.field.Base} component, so you should make sure this matches
+     * the {@link Ext.form.field.Base#inputId inputId} of that field.
+     */
+    /**
+     * @cfg {String} [html='']
+     * An HTML fragment that will be used as the label's innerHTML.
+     * Note that if {@link #text} is specified it will take precedence and this value will be ignored.
+     */
+    
+    maskOnDisable: false,
+
+    getElConfig: function(){
+        var me = this;
+
+        me.html = me.text ? Ext.util.Format.htmlEncode(me.text) : (me.html || '');
+        return Ext.apply(me.callParent(), {
+            htmlFor: me.forId || ''
+        });
+    },
+
+    /**
+     * Updates the label's innerHTML with the specified string.
+     * @param {String} text The new label text
+     * @param {Boolean} [encode=true] False to skip HTML-encoding the text when rendering it
+     * to the label. This might be useful if you want to include tags in the label's innerHTML rather
+     * than rendering them as string literals per the default logic.
+     * @return {Ext.form.Label} this
+     */
+    setText : function(text, encode){
+        var me = this;
+        
+        encode = encode !== false;
+        if(encode) {
+            me.text = text;
+            delete me.html;
+        } else {
+            me.html = text;
+            delete me.text;
+        }
+        
+        if(me.rendered){
+            me.el.dom.innerHTML = encode !== false ? Ext.util.Format.htmlEncode(text) : text;
+            me.updateLayout();
+        }
+        return me;
+    }
+});
+
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ * 
+ * FormPanel provides a standard container for forms. It is essentially a standard {@link Ext.panel.Panel} which
+ * automatically creates a {@link Ext.form.Basic BasicForm} for managing any {@link Ext.form.field.Field}
+ * objects that are added as descendants of the panel. It also includes conveniences for configuring and
+ * working with the BasicForm and the collection of Fields.
+ * 
+ * # Layout
+ * 
+ * By default, FormPanel is configured with `{@link Ext.layout.container.Anchor layout:'anchor'}` for
+ * the layout of its immediate child items. This can be changed to any of the supported container layouts.
+ * The layout of sub-containers is configured in {@link Ext.container.Container#layout the standard way}.
+ * 
+ * # BasicForm
+ * 
+ * Although **not listed** as configuration options of FormPanel, the FormPanel class accepts all
+ * of the config options supported by the {@link Ext.form.Basic} class, and will pass them along to
+ * the internal BasicForm when it is created.
+ * 
+ * The following events fired by the BasicForm will be re-fired by the FormPanel and can therefore be
+ * listened for on the FormPanel itself:
+ * 
+ * - {@link Ext.form.Basic#beforeaction beforeaction}
+ * - {@link Ext.form.Basic#actionfailed actionfailed}
+ * - {@link Ext.form.Basic#actioncomplete actioncomplete}
+ * - {@link Ext.form.Basic#validitychange validitychange}
+ * - {@link Ext.form.Basic#dirtychange dirtychange}
+ * 
+ * # Field Defaults
+ * 
+ * The {@link #fieldDefaults} config option conveniently allows centralized configuration of default values
+ * for all fields added as descendants of the FormPanel. Any config option recognized by implementations
+ * of {@link Ext.form.Labelable} may be included in this object. See the {@link #fieldDefaults} documentation
+ * for details of how the defaults are applied.
+ * 
+ * # Form Validation
+ * 
+ * With the default configuration, form fields are validated on-the-fly while the user edits their values.
+ * This can be controlled on a per-field basis (or via the {@link #fieldDefaults} config) with the field
+ * config properties {@link Ext.form.field.Field#validateOnChange} and {@link Ext.form.field.Base#checkChangeEvents},
+ * and the FormPanel's config properties {@link #pollForChanges} and {@link #pollInterval}.
+ * 
+ * Any component within the FormPanel can be configured with `formBind: true`. This will cause that
+ * component to be automatically disabled when the form is invalid, and enabled when it is valid. This is most
+ * commonly used for Button components to prevent submitting the form in an invalid state, but can be used on
+ * any component type.
+ * 
+ * For more information on form validation see the following:
+ * 
+ * - {@link Ext.form.field.Field#validateOnChange}
+ * - {@link #pollForChanges} and {@link #pollInterval}
+ * - {@link Ext.form.field.VTypes}
+ * - {@link Ext.form.Basic#doAction BasicForm.doAction clientValidation notes}
+ * 
+ * # Form Submission
+ * 
+ * By default, Ext Forms are submitted through Ajax, using {@link Ext.form.action.Action}. See the documentation for
+ * {@link Ext.form.Basic} for details.
+ *
+ * # Example usage
+ * 
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Simple Form',
+ *         bodyPadding: 5,
+ *         width: 350,
+ * 
+ *         // The form will submit an AJAX request to this URL when submitted
+ *         url: 'save-form.php',
+ * 
+ *         // Fields will be arranged vertically, stretched to full width
+ *         layout: 'anchor',
+ *         defaults: {
+ *             anchor: '100%'
+ *         },
+ * 
+ *         // The fields
+ *         defaultType: 'textfield',
+ *         items: [{
+ *             fieldLabel: 'First Name',
+ *             name: 'first',
+ *             allowBlank: false
+ *         },{
+ *             fieldLabel: 'Last Name',
+ *             name: 'last',
+ *             allowBlank: false
+ *         }],
+ * 
+ *         // Reset and Submit buttons
+ *         buttons: [{
+ *             text: 'Reset',
+ *             handler: function() {
+ *                 this.up('form').getForm().reset();
+ *             }
+ *         }, {
+ *             text: 'Submit',
+ *             formBind: true, //only enabled once the form is valid
+ *             disabled: true,
+ *             handler: function() {
+ *                 var form = this.up('form').getForm();
+ *                 if (form.isValid()) {
+ *                     form.submit({
+ *                         success: function(form, action) {
+ *                            Ext.Msg.alert('Success', action.result.msg);
+ *                         },
+ *                         failure: function(form, action) {
+ *                             Ext.Msg.alert('Failed', action.result.msg);
+ *                         }
+ *                     });
+ *                 }
+ *             }
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ */
+Ext.define('Ext.form.Panel', {
+    extend: Ext.panel.Panel ,
+    mixins: {
+        fieldAncestor:  Ext.form.FieldAncestor 
+    },
+    alias: 'widget.form',
+    alternateClassName: ['Ext.FormPanel', 'Ext.form.FormPanel'],
+                                                        
+
+    /**
+     * @cfg {Boolean} pollForChanges
+     * If set to `true`, sets up an interval task (using the {@link #pollInterval}) in which the
+     * panel's fields are repeatedly checked for changes in their values. This is in addition to the normal detection
+     * each field does on its own input element, and is not needed in most cases. It does, however, provide a
+     * means to absolutely guarantee detection of all changes including some edge cases in some browsers which
+     * do not fire native events. Defaults to `false`.
+     */
+
+    /**
+     * @cfg {Number} pollInterval
+     * Interval in milliseconds at which the form's fields are checked for value changes. Only used if
+     * the {@link #pollForChanges} option is set to `true`. Defaults to 500 milliseconds.
+     */
+
+    /**
+     * @cfg {Ext.enums.Layout/Object} layout
+     * The {@link Ext.container.Container#layout} for the form panel's immediate child items.
+     */
+    layout: 'anchor',
+
+    ariaRole: 'form',
+    
+    basicFormConfigs: [
+        'api', 
+        'baseParams', 
+        'errorReader', 
+        'jsonSubmit',
+        'method', 
+        'paramOrder',
+        'paramsAsHash',
+        'reader',
+        'standardSubmit',
+        'timeout',
+        'trackResetOnLoad',
+        'url',
+        'waitMsgTarget',
+        'waitTitle'
+    ],
+
+    initComponent: function() {
+        var me = this;
+
+        if (me.frame) {
+            me.border = false;
+        }
+
+        me.initFieldAncestor();
+        me.callParent();
+
+        me.relayEvents(me.form, [
+            /**
+             * @event beforeaction
+             * @inheritdoc Ext.form.Basic#beforeaction
+             */
+            'beforeaction',
+            /**
+             * @event actionfailed
+             * @inheritdoc Ext.form.Basic#actionfailed
+             */
+            'actionfailed',
+            /**
+             * @event actioncomplete
+             * @inheritdoc Ext.form.Basic#actioncomplete
+             */
+            'actioncomplete',
+            /**
+             * @event validitychange
+             * @inheritdoc Ext.form.Basic#validitychange
+             */
+            'validitychange',
+            /**
+             * @event dirtychange
+             * @inheritdoc Ext.form.Basic#dirtychange
+             */
+            'dirtychange'
+        ]);
+
+        // Start polling if configured
+        if (me.pollForChanges) {
+            me.startPolling(me.pollInterval || 500);
+        }
+    },
+
+    initItems: function() {
+        // Create the BasicForm
+        this.callParent();
+        this.initMonitor();
+        this.form = this.createForm();
+    },
+
+    // Initialize the BasicForm after all layouts have been completed.
+    afterFirstLayout: function() {
+        this.callParent(arguments);
+        this.form.initialize();
+    },
+
+    /**
+     * @private
+     */
+    createForm: function() {
+        var cfg = {},
+            props = this.basicFormConfigs,
+            len = props.length,
+            i = 0,
+            prop;
+            
+        for (; i < len; ++i) {
+            prop = props[i];
+            cfg[prop] = this[prop];
+        }
+        return new Ext.form.Basic(this, cfg);
+    },
+
+    /**
+     * Provides access to the {@link Ext.form.Basic Form} which this Panel contains.
+     * @return {Ext.form.Basic} The {@link Ext.form.Basic Form} which this Panel contains.
+     */
+    getForm: function() {
+        return this.form;
+    },
+
+    /**
+     * Loads an {@link Ext.data.Model} into this form (internally just calls {@link Ext.form.Basic#loadRecord})
+     * See also {@link Ext.form.Basic#trackResetOnLoad trackResetOnLoad}.
+     * @param {Ext.data.Model} record The record to load
+     * @return {Ext.form.Basic} The Ext.form.Basic attached to this FormPanel
+     */
+    loadRecord: function(record) {
+        return this.getForm().loadRecord(record);
+    },
+
+    /**
+     * Returns the currently loaded Ext.data.Model instance if one was loaded via {@link #loadRecord}.
+     * @return {Ext.data.Model} The loaded instance
+     */
+    getRecord: function() {
+        return this.getForm().getRecord();
+    },
+    
+    /**
+     * Persists the values in this form into the passed {@link Ext.data.Model} object in a beginEdit/endEdit block.
+     * If the record is not specified, it will attempt to update (if it exists) the record provided to {@link #loadRecord}.
+     * @param {Ext.data.Model} [record] The record to edit
+     * @return {Ext.form.Basic} The Ext.form.Basic attached to this FormPanel
+     */
+    updateRecord: function(record) {
+        return this.getForm().updateRecord(record);
+    },
+
+    /**
+     * Convenience function for fetching the current value of each field in the form. This is the same as calling
+     * {@link Ext.form.Basic#getValues this.getForm().getValues()}.
+     *
+     * @inheritdoc Ext.form.Basic#getValues
+     */
+    getValues: function(asString, dirtyOnly, includeEmptyText, useDataValues) {
+        return this.getForm().getValues(asString, dirtyOnly, includeEmptyText, useDataValues);
+    },
+    
+    /**
+     * Convenience function to check if the form has any dirty fields. This is the same as calling
+     * {@link Ext.form.Basic#isDirty this.getForm().isDirty()}.
+     *
+     * @inheritdoc Ext.form.Basic#isDirty
+     */
+    isDirty: function () {
+        return this.form.isDirty();
+    },
+    
+    /**
+     * Convenience function to check if the form has all valid fields. This is the same as calling
+     * {@link Ext.form.Basic#isValid this.getForm().isValid()}.
+     *
+     * @inheritdoc Ext.form.Basic#isValid
+     */
+    isValid: function () {
+       return this.form.isValid();
+    },
+    
+    /**
+     * Convenience function to check if the form has any invalid fields. This is the same as calling
+     * {@link Ext.form.Basic#hasInvalidField this.getForm().hasInvalidField()}.
+     *
+     * @inheritdoc Ext.form.Basic#hasInvalidField
+     */
+    hasInvalidField: function () {
+        return this.form.hasInvalidField();
+    },
+
+    beforeDestroy: function() {
+        this.stopPolling();
+        this.form.destroy();
+        this.callParent();
+    },
+
+    /**
+     * This is a proxy for the underlying BasicForm's {@link Ext.form.Basic#load} call.
+     * @param {Object} options The options to pass to the action (see {@link Ext.form.Basic#load} and
+     * {@link Ext.form.Basic#doAction} for details)
+     */
+    load: function(options) {
+        this.form.load(options);
+    },
+
+    /**
+     * This is a proxy for the underlying BasicForm's {@link Ext.form.Basic#submit} call.
+     * @param {Object} options The options to pass to the action (see {@link Ext.form.Basic#submit} and
+     * {@link Ext.form.Basic#doAction} for details)
+     */
+    submit: function(options) {
+        this.form.submit(options);
+    },
+
+    /**
+     * Start an interval task to continuously poll all the fields in the form for changes in their
+     * values. This is normally started automatically by setting the {@link #pollForChanges} config.
+     * @param {Number} interval The interval in milliseconds at which the check should run.
+     */
+    startPolling: function(interval) {
+        this.stopPolling();
+        var task = new Ext.util.TaskRunner(interval);
+        task.start({
+            interval: 0,
+            run: this.checkChange,
+            scope: this
+        });
+        this.pollTask = task;
+    },
+
+    /**
+     * Stop a running interval task that was started by {@link #startPolling}.
+     */
+    stopPolling: function() {
+        var task = this.pollTask;
+        if (task) {
+            task.stopAll();
+            delete this.pollTask;
+        }
+    },
+
+    /**
+     * Forces each field within the form panel to
+     * {@link Ext.form.field.Field#checkChange check if its value has changed}.
+     */
+    checkChange: function() {
+        var fields = this.form.getFields().items,
+            f,
+            fLen   = fields.length;
+
+        for (f = 0; f < fLen; f++) {
+            fields[f].checkChange();
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ * Private utility class for managing all {@link Ext.form.field.Radio} fields grouped by name.
+ */
+Ext.define('Ext.form.RadioManager', {
+    extend:  Ext.util.MixedCollection ,
+    singleton: true,
+
+    getByName: function(name, formId) {
+        return this.filterBy(function(item) {
+            return item.name == name && item.getFormId() == formId;
+        });
+    },
+
+    getWithValue: function(name, value, formId) {
+        return this.filterBy(function(item) {
+            return item.name == name && item.inputValue == value && item.getFormId() == formId;
+        });
+    },
+
+    getChecked: function(name, formId) {
+        return this.findBy(function(item) {
+            return item.name == name && item.checked && item.getFormId() == formId;
+        });
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Robert Dougan <rob at sencha.com>
+ *
+ * Single radio field. Similar to checkbox, but automatically handles making sure only one radio is checked
+ * at a time within a group of radios with the same name.
+ *
+ * # Labeling
+ *
+ * In addition to the {@link Ext.form.Labelable standard field labeling options}, radio buttons
+ * may be given an optional {@link #boxLabel} which will be displayed immediately to the right of the input. Also
+ * see {@link Ext.form.RadioGroup} for a convenient method of grouping related radio buttons.
+ *
+ * # Values
+ *
+ * The main value of a Radio field is a boolean, indicating whether or not the radio is checked.
+ *
+ * The following values will check the radio:
+ *
+ * - `true`
+ * - `'true'`
+ * - `'1'`
+ * - `'on'`
+ *
+ * Any other value will uncheck it.
+ *
+ * In addition to the main boolean value, you may also specify a separate {@link #inputValue}. This will be sent
+ * as the parameter value when the form is {@link Ext.form.Basic#submit submitted}. You will want to set this
+ * value if you have multiple radio buttons with the same {@link #name}, as is almost always the case.
+ *
+ * # Example usage
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title      : 'Order Form',
+ *         width      : 300,
+ *         bodyPadding: 10,
+ *         renderTo   : Ext.getBody(),
+ *         items: [
+ *             {
+ *                 xtype      : 'fieldcontainer',
+ *                 fieldLabel : 'Size',
+ *                 defaultType: 'radiofield',
+ *                 defaults: {
+ *                     flex: 1
+ *                 },
+ *                 layout: 'hbox',
+ *                 items: [
+ *                     {
+ *                         boxLabel  : 'M',
+ *                         name      : 'size',
+ *                         inputValue: 'm',
+ *                         id        : 'radio1'
+ *                     }, {
+ *                         boxLabel  : 'L',
+ *                         name      : 'size',
+ *                         inputValue: 'l',
+ *                         id        : 'radio2'
+ *                     }, {
+ *                         boxLabel  : 'XL',
+ *                         name      : 'size',
+ *                         inputValue: 'xl',
+ *                         id        : 'radio3'
+ *                     }
+ *                 ]
+ *             },
+ *             {
+ *                 xtype      : 'fieldcontainer',
+ *                 fieldLabel : 'Color',
+ *                 defaultType: 'radiofield',
+ *                 defaults: {
+ *                     flex: 1
+ *                 },
+ *                 layout: 'hbox',
+ *                 items: [
+ *                     {
+ *                         boxLabel  : 'Blue',
+ *                         name      : 'color',
+ *                         inputValue: 'blue',
+ *                         id        : 'radio4'
+ *                     }, {
+ *                         boxLabel  : 'Grey',
+ *                         name      : 'color',
+ *                         inputValue: 'grey',
+ *                         id        : 'radio5'
+ *                     }, {
+ *                         boxLabel  : 'Black',
+ *                         name      : 'color',
+ *                         inputValue: 'black',
+ *                         id        : 'radio6'
+ *                     }
+ *                 ]
+ *             }
+ *         ],
+ *         bbar: [
+ *             {
+ *                 text: 'Smaller Size',
+ *                 handler: function() {
+ *                     var radio1 = Ext.getCmp('radio1'),
+ *                         radio2 = Ext.getCmp('radio2'),
+ *                         radio3 = Ext.getCmp('radio3');
+ *
+ *                     //if L is selected, change to M
+ *                     if (radio2.getValue()) {
+ *                         radio1.setValue(true);
+ *                         return;
+ *                     }
+ *
+ *                     //if XL is selected, change to L
+ *                     if (radio3.getValue()) {
+ *                         radio2.setValue(true);
+ *                         return;
+ *                     }
+ *
+ *                     //if nothing is set, set size to S
+ *                     radio1.setValue(true);
+ *                 }
+ *             },
+ *             {
+ *                 text: 'Larger Size',
+ *                 handler: function() {
+ *                     var radio1 = Ext.getCmp('radio1'),
+ *                         radio2 = Ext.getCmp('radio2'),
+ *                         radio3 = Ext.getCmp('radio3');
+ *
+ *                     //if M is selected, change to L
+ *                     if (radio1.getValue()) {
+ *                         radio2.setValue(true);
+ *                         return;
+ *                     }
+ *
+ *                     //if L is selected, change to XL
+ *                     if (radio2.getValue()) {
+ *                         radio3.setValue(true);
+ *                         return;
+ *                     }
+ *
+ *                     //if nothing is set, set size to XL
+ *                     radio3.setValue(true);
+ *                 }
+ *             },
+ *             '-',
+ *             {
+ *                 text: 'Select color',
+ *                 menu: {
+ *                     indent: false,
+ *                     items: [
+ *                         {
+ *                             text: 'Blue',
+ *                             handler: function() {
+ *                                 var radio = Ext.getCmp('radio4');
+ *                                 radio.setValue(true);
+ *                             }
+ *                         },
+ *                         {
+ *                             text: 'Grey',
+ *                             handler: function() {
+ *                                 var radio = Ext.getCmp('radio5');
+ *                                 radio.setValue(true);
+ *                             }
+ *                         },
+ *                         {
+ *                             text: 'Black',
+ *                             handler: function() {
+ *                                 var radio = Ext.getCmp('radio6');
+ *                                 radio.setValue(true);
+ *                             }
+ *                         }
+ *                     ]
+ *                 }
+ *             }
+ *         ]
+ *     });
+ */
+Ext.define('Ext.form.field.Radio', {
+    extend: Ext.form.field.Checkbox ,
+    alias: ['widget.radiofield', 'widget.radio'],
+    alternateClassName: 'Ext.form.Radio',
+                                        
+
+    /**
+     * @property {Boolean} isRadio
+     * `true` in this class to identify an object as an instantiated Radio, or subclass thereof.
+     */
+    isRadio: true,
+
+    /**
+     * @cfg {String} [focusCls='x-form-radio-focus']
+     * The CSS class to use when the radio field receives focus
+     */
+    focusCls: 'form-radio-focus',
+
+    /**
+     * @cfg {String} uncheckedValue
+     * @private
+     */
+
+    // private
+    inputType: 'radio',
+    ariaRole: 'radio',
+    
+    formId: null,
+
+    /**
+     * If this radio is part of a group, it will return the selected value
+     * @return {String}
+     */
+    getGroupValue: function() {
+        var selected = this.getManager().getChecked(this.name, this.getFormId());
+        return selected ? selected.inputValue : null;
+    },
+
+    /**
+     * @private Handle click on the radio button
+     */
+    onBoxClick: function(e) {
+        var me = this;
+        if (!me.disabled && !me.readOnly) {
+            this.setValue(true);
+        }
+    },
+    
+    onRemoved: function(){
+        this.callParent(arguments);
+        this.formId = null;
+    },
+
+    /**
+     * Sets either the checked/unchecked status of this Radio, or, if a string value is passed, checks a sibling Radio
+     * of the same name whose value is the value specified.
+     * @param {String/Boolean} value Checked value, or the value of the sibling radio button to check.
+     * @return {Ext.form.field.Radio} this
+     */
+    setValue: function(v) {
+        var me = this,
+            active;
+
+        if (Ext.isBoolean(v)) {
+            me.callParent(arguments);
+        } else {
+            active = me.getManager().getWithValue(me.name, v, me.getFormId()).getAt(0);
+            if (active) {
+                active.setValue(true);
+            }
+        }
+        return me;
+    },
+
+    /**
+     * Returns the submit value for the checkbox which can be used when submitting forms.
+     * @return {Boolean/Object} True if checked, null if not.
+     */
+    getSubmitValue: function() {
+        return this.checked ? this.inputValue : null;
+    },
+
+    getModelData: function() {
+        return this.getSubmitData();
+    },
+
+    // inherit docs
+    onChange: function(newVal, oldVal) {
+        var me = this,
+            r, rLen, radio, radios;
+
+        me.callParent(arguments);
+
+        if (newVal) {
+            radios = me.getManager().getByName(me.name, me.getFormId()).items;
+            rLen   = radios.length;
+
+            for (r = 0; r < rLen; r++) {
+                radio = radios[r];
+
+                if (radio !== me) {
+                    radio.setValue(false);
+                }
+            }
+        }
+    },
+
+    // inherit docs
+    getManager: function() {
+        return Ext.form.RadioManager;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A {@link Ext.form.FieldContainer field container} which has a specialized layout for arranging
+ * {@link Ext.form.field.Radio} controls into columns, and provides convenience {@link Ext.form.field.Field}
+ * methods for {@link #getValue getting}, {@link #setValue setting}, and {@link #validate validating} the
+ * group of radio buttons as a whole.
+ *
+ * # Validation
+ *
+ * Individual radio buttons themselves have no default validation behavior, but
+ * sometimes you want to require a user to select one of a group of radios. RadioGroup
+ * allows this by setting the config `{@link #allowBlank}:false`; when the user does not check at
+ * one of the radio buttons, the entire group will be highlighted as invalid and the
+ * {@link #blankText error message} will be displayed according to the {@link #msgTarget} config.
+ *
+ * # Layout
+ *
+ * The default layout for RadioGroup makes it easy to arrange the radio buttons into
+ * columns; see the {@link #columns} and {@link #vertical} config documentation for details. You may also
+ * use a completely different layout by setting the {@link #layout} to one of the other supported layout
+ * types; for instance you may wish to use a custom arrangement of hbox and vbox containers. In that case
+ * the Radio components at any depth will still be managed by the RadioGroup's validation.
+ *
+ * # Example usage
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'RadioGroup Example',
+ *         width: 300,
+ *         height: 125,
+ *         bodyPadding: 10,
+ *         renderTo: Ext.getBody(),
+ *         items:[{
+ *             xtype: 'radiogroup',
+ *             fieldLabel: 'Two Columns',
+ *             // Arrange radio buttons into two columns, distributed vertically
+ *             columns: 2,
+ *             vertical: true,
+ *             items: [
+ *                 { boxLabel: 'Item 1', name: 'rb', inputValue: '1' },
+ *                 { boxLabel: 'Item 2', name: 'rb', inputValue: '2', checked: true},
+ *                 { boxLabel: 'Item 3', name: 'rb', inputValue: '3' },
+ *                 { boxLabel: 'Item 4', name: 'rb', inputValue: '4' },
+ *                 { boxLabel: 'Item 5', name: 'rb', inputValue: '5' },
+ *                 { boxLabel: 'Item 6', name: 'rb', inputValue: '6' }
+ *             ]
+ *         }]
+ *     });
+ *
+ */
+Ext.define('Ext.form.RadioGroup', {
+    extend:  Ext.form.CheckboxGroup ,
+    alias: 'widget.radiogroup',
+
+               
+                              
+      
+
+    /**
+     * @cfg {Ext.form.field.Radio[]/Object[]} items
+     * An Array of {@link Ext.form.field.Radio Radio}s or Radio config objects to arrange in the group.
+     */
+    /**
+     * @cfg {Boolean} allowBlank
+     * True to allow every item in the group to be blank.
+     * If allowBlank = false and no items are selected at validation time, {@link #blankText} will
+     * be used as the error text.
+     */
+    allowBlank : true,
+    //<locale>
+    /**
+     * @cfg {String} blankText
+     * Error text to display if the {@link #allowBlank} validation fails
+     */
+    blankText : 'You must select one item in this group',
+    //</locale>
+
+    // private
+    defaultType : 'radiofield',
+
+    // private
+    groupCls : Ext.baseCSSPrefix + 'form-radio-group',
+
+    getBoxes: function(query) {
+        return this.query('[isRadio]' + (query||''));
+    },
+    
+    checkChange: function() {
+        var value = this.getValue(),
+            key = Ext.Object.getKeys(value)[0];
+            
+        // If the value is an array we skip out here because it's during a change
+        // between multiple items, so we never want to fire a change
+        if (Ext.isArray(value[key])) {
+            return;
+        }
+        this.callParent(arguments);    
+    },
+
+    /**
+     * Sets the value of the radio group. The radio with corresponding name and value will be set.
+     * This method is simpler than {@link Ext.form.CheckboxGroup#setValue} because only 1 value is allowed
+     * for each name.
+     * 
+     * @param {Object} value The map from names to values to be set.
+     * @return {Ext.form.CheckboxGroup} this
+     */
+    setValue: function(value) {
+        var cbValue, first, formId, radios,
+            i, len, name;
+
+        if (Ext.isObject(value)) {
+            for (name in value) {
+                if (value.hasOwnProperty(name)) {
+                    cbValue = value[name];
+                    first = this.items.first();
+                    formId = first ? first.getFormId() : null;
+                    radios = Ext.form.RadioManager.getWithValue(name, cbValue, formId).items;
+                    len = radios.length;
+
+                    for (i = 0; i < len; ++i) {
+                        radios[i].setValue(true);
+                    }
+                }
+            }
+        }
+        return this;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Layout class for {@link Ext.form.field.Trigger} fields. Adjusts the input field size to accommodate
+ * the trigger button(s).
+ * @private
+ */
+Ext.define('Ext.layout.component.field.Trigger', {
+
+    /* Begin Definitions */
+
+    alias: 'layout.triggerfield',
+
+    extend:  Ext.layout.component.field.Field ,
+
+    /* End Definitions */
+
+    type: 'triggerfield',
+
+    // Private. Cached extra width values containing width of all a trigger field's "furniture" round the actual input element
+    borderWidths: {},
+
+    beginLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            flags;
+
+        ownerContext.triggerWrap = ownerContext.getEl('triggerWrap');
+
+        me.callParent(arguments);
+
+        // if any of these important states have changed, sync them now:
+        flags = owner.getTriggerStateFlags();
+        if (flags != owner.lastTriggerStateFlags) {
+            owner.lastTriggerStateFlags = flags;
+            me.updateEditState();
+        }
+    },
+    
+    beginLayoutCycle: function(ownerContext){
+        this.callParent(arguments);
+        
+        // Clear width, in case a previous layout cycle set an explicit width.
+        if (ownerContext.widthModel.shrinkWrap && !this.owner.inputWidth) {
+            ownerContext.inputContext.el.setStyle('width', '');
+        }    
+    },
+
+    beginLayoutFixed: function (ownerContext, width, suffix) {
+        var me = this,
+            owner = ownerContext.target,
+            ieInputWidthAdjustment = me.ieInputWidthAdjustment || 0,
+            inputWidth = '100%',
+            triggerWrap = owner.triggerWrap;
+
+        me.callParent(arguments);
+
+        owner.inputCell.setStyle('width', '100%');
+        if(ieInputWidthAdjustment) {
+            me.adjustIEInputPadding(ownerContext);
+            if(suffix === 'px') {
+                if (owner.inputWidth) {
+                    inputWidth = owner.inputWidth - me.getExtraWidth(ownerContext);
+                } else {
+                    inputWidth = width - ieInputWidthAdjustment - me.getExtraWidth(ownerContext);
+                }
+                inputWidth += 'px';
+            }
+        }
+        owner.inputEl.setStyle('width', inputWidth);
+        inputWidth = owner.inputWidth;
+        if (inputWidth) {
+            triggerWrap.setStyle('width', inputWidth + (ieInputWidthAdjustment) + 'px');
+        } else {
+            triggerWrap.setStyle('width', width + suffix);
+        }
+        triggerWrap.setStyle('table-layout', 'fixed');
+    },
+
+    adjustIEInputPadding: function(ownerContext) {
+        // adjust for IE 6/7 strict content-box model
+        this.owner.inputCell.setStyle('padding-right', this.ieInputWidthAdjustment + 'px');
+    },
+
+    /**
+     * @private
+     * Returns the width of the "extras" around the input field. This includes the total width
+     * of all the triggers in the field and any outer bordering.
+     * 
+     * This measurement is used when explicitly sizing the contained input field to a smaller inner
+     * width while keeping the outer component width the same. This extra width is subtracted from the
+     * total component width to calculate the new width for the input field.
+     */
+    getExtraWidth: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            borderWidths = me.borderWidths,
+            ui = owner.ui + owner.triggerEl.getCount();
+
+        if (!(ui in borderWidths)) {
+            borderWidths[ui] = ownerContext.triggerWrap.getBorderInfo().width
+        }
+        return borderWidths[ui] + owner.getTriggerWidth();
+    },
+
+    beginLayoutShrinkWrap: function (ownerContext) {
+        var owner = ownerContext.target,
+            emptyString = '',
+            inputWidth = owner.inputWidth,
+            triggerWrap = owner.triggerWrap;
+
+        this.callParent(arguments);
+
+        if (inputWidth) {
+            triggerWrap.setStyle('width', inputWidth + 'px');
+            inputWidth = (inputWidth - this.getExtraWidth(ownerContext)) + 'px';
+            owner.inputEl.setStyle('width', inputWidth);
+            owner.inputCell.setStyle('width', inputWidth);
+        } else {
+            owner.inputCell.setStyle('width', emptyString);
+            owner.inputEl.setStyle('width', emptyString);
+            triggerWrap.setStyle('width', emptyString);
+            triggerWrap.setStyle('table-layout', 'auto');
+        }
+    },
+
+    getTextWidth: function () {
+        var me = this,
+            owner = me.owner,
+            inputEl = owner.inputEl,
+            value;
+
+        // Find the width that contains the whole text value
+        value = (inputEl.dom.value || (owner.hasFocus ? '' : owner.emptyText) || '') + owner.growAppend;
+        return inputEl.getTextWidth(value);
+    },
+    
+    publishOwnerWidth: function(ownerContext, width) {
+        var owner = this.owner;
+        this.callParent(arguments);
+        if (!owner.grow && !owner.inputWidth) {
+            width -= this.getExtraWidth(ownerContext);
+            if (owner.labelAlign != 'top') {
+                width -= owner.getLabelWidth();
+            }
+            ownerContext.inputContext.setWidth(width);
+        }    
+    },
+
+    publishInnerHeight: function(ownerContext, height) {
+        ownerContext.inputContext.setHeight(height - this.measureLabelErrorHeight(ownerContext));
+    },
+
+    measureContentWidth: function (ownerContext) {
+        var me = this,
+            owner = me.owner,
+            width = me.callParent(arguments),
+            inputContext = ownerContext.inputContext,
+            calcWidth, max, min;
+
+        if (owner.grow && !ownerContext.state.growHandled) {
+            calcWidth = me.getTextWidth() + ownerContext.inputContext.getFrameInfo().width;
+
+            max = owner.growMax;
+            min = Math.min(max, width);
+            max = Math.max(owner.growMin, max, min);
+
+            // Constrain
+            calcWidth = Ext.Number.constrain(calcWidth, owner.growMin, max);
+            inputContext.setWidth(calcWidth);
+            ownerContext.state.growHandled = true;
+            
+            // Now that we've set the inputContext, we need to recalculate the width
+            inputContext.domBlock(me, 'width');
+            width = NaN;
+        } else if (!owner.inputWidth) {
+            width -= me.getExtraWidth(ownerContext);
+        }
+        return width;
+    },
+
+    updateEditState: function() {
+        var me = this,
+            owner = me.owner,
+            inputEl = owner.inputEl,
+            noeditCls = Ext.baseCSSPrefix + 'trigger-noedit',
+            displayed,
+            readOnly;
+
+        if (me.owner.readOnly) {
+            inputEl.addCls(noeditCls);
+            readOnly = true;
+            displayed = false;
+        } else {
+            if (me.owner.editable) {
+                inputEl.removeCls(noeditCls);
+                readOnly = false;
+            } else {
+                inputEl.addCls(noeditCls);
+                readOnly = true;
+            }
+            displayed = !me.owner.hideTrigger;
+        }
+
+        owner.triggerCell.setDisplayed(displayed);
+        inputEl.dom.readOnly = readOnly;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Provides a convenient wrapper for TextFields that adds a clickable trigger button (looks like a combobox by default).
+ * The trigger has no default action, so you must assign a function to implement the trigger click handler by overriding
+ * {@link #onTriggerClick}. You can create a Trigger field directly, as it renders exactly like a combobox for which you
+ * can provide a custom implementation.
+ *
+ * For example:
+ *
+ *     @example
+ *     Ext.define('Ext.ux.CustomTrigger', {
+ *         extend: 'Ext.form.field.Trigger',
+ *         alias: 'widget.customtrigger',
+ *
+ *         // override onTriggerClick
+ *         onTriggerClick: function() {
+ *             Ext.Msg.alert('Status', 'You clicked my trigger!');
+ *         }
+ *     });
+ *
+ *     Ext.create('Ext.form.FormPanel', {
+ *         title: 'Form with TriggerField',
+ *         bodyPadding: 5,
+ *         width: 350,
+ *         renderTo: Ext.getBody(),
+ *         items:[{
+ *             xtype: 'customtrigger',
+ *             fieldLabel: 'Sample Trigger',
+ *             emptyText: 'click the trigger'
+ *         }]
+ *     });
+ *
+ * However, in general you will most likely want to use Trigger as the base class for a reusable component.
+ * {@link Ext.form.field.Date} and {@link Ext.form.field.ComboBox} are perfect examples of this.
+ */
+Ext.define('Ext.form.field.Trigger', {
+    extend: Ext.form.field.Text ,
+    alias: ['widget.triggerfield', 'widget.trigger'],
+                                                                                                 
+    alternateClassName: ['Ext.form.TriggerField', 'Ext.form.TwinTriggerField', 'Ext.form.Trigger'],
+
+    childEls: [
+        /**
+         * @property {Ext.CompositeElement} triggerEl
+         * A composite of all the trigger button elements. Only set after the field has been rendered.
+         */
+        { name: 'triggerCell', select: '.' + Ext.baseCSSPrefix + 'trigger-cell' },
+        { name: 'triggerEl', select: '.' + Ext.baseCSSPrefix + 'form-trigger' },
+
+        /**
+         * @property {Ext.Element} triggerWrap
+         * A reference to the `TABLE` element which encapsulates the input field and all trigger button(s). Only set after the field has been rendered.
+         */
+        'triggerWrap',
+
+        /**
+         * @property {Ext.Element} inputCell
+         * A reference to the `TD` element wrapping the input element. Only set after the field has been rendered.
+         */
+        'inputCell'
+    ],
+
+    /**
+     * @cfg {String} triggerCls
+     * An additional CSS class used to style the trigger button. The trigger will always get the {@link #triggerBaseCls}
+     * by default and triggerCls will be **appended** if specified.
+     */
+
+    /**
+     * @cfg
+     * The base CSS class that is always added to the trigger button. The {@link #triggerCls} will be appended in
+     * addition to this class.
+     */
+    triggerBaseCls: Ext.baseCSSPrefix + 'form-trigger',
+
+    /**
+     * @cfg
+     * The CSS class that is added to the div wrapping the trigger button(s).
+     */
+    triggerWrapCls: Ext.baseCSSPrefix + 'form-trigger-wrap',
+
+    /**
+     * @cfg
+     * The CSS class that is added to the text field when component is read-only or not editable.
+     */
+    triggerNoEditCls: Ext.baseCSSPrefix + 'trigger-noedit',
+
+    /**
+     * @cfg {Boolean} hideTrigger
+     * true to hide the trigger element and display only the base text field
+     */
+    hideTrigger: false,
+
+    /**
+     * @cfg {Boolean} editable
+     * false to prevent the user from typing text directly into the field; the field can only have its value set via an
+     * action invoked by the trigger.
+     */
+    editable: true,
+
+    /**
+     * @cfg {Boolean} readOnly
+     * true to prevent the user from changing the field, and hides the trigger. Supercedes the editable and hideTrigger
+     * options if the value is true.
+     */
+    readOnly: false,
+
+    /**
+     * @cfg {Boolean} [selectOnFocus=false]
+     * true to select any existing text in the field immediately on focus. Only applies when
+     * {@link #editable editable} = true
+     */
+
+    /**
+     * @cfg {Boolean} repeatTriggerClick
+     * true to attach a {@link Ext.util.ClickRepeater click repeater} to the trigger.
+     */
+    repeatTriggerClick: false,
+
+
+    /**
+     * @method autoSize
+     * @private
+     */
+    autoSize: Ext.emptyFn,
+    // @private
+    monitorTab: true,
+    // @private
+    mimicing: false,
+    // @private
+    triggerIndexRe: /trigger-index-(\d+)/,
+    
+    extraTriggerCls: '',
+
+    componentLayout: 'triggerfield',
+
+    initComponent: function() {
+        this.wrapFocusCls = this.triggerWrapCls + '-focus';
+        this.callParent(arguments);
+    },
+
+    getSubTplMarkup: function(values) {
+        var me = this,
+            childElCls = values.childElCls, // either '' or ' x-foo'
+            field = me.callParent(arguments);
+
+        return '<table id="' + me.id + '-triggerWrap" class="' + Ext.baseCSSPrefix + 'form-trigger-wrap' + childElCls + '" cellpadding="0" cellspacing="0"><tbody><tr>' +
+            '<td id="' + me.id + '-inputCell" class="' + Ext.baseCSSPrefix + 'form-trigger-input-cell' + childElCls + '">' + field + '</td>' +
+            me.getTriggerMarkup() +
+            '</tr></tbody></table>';
+    },
+    
+    getSubTplData: function(){
+        var me = this,
+            data = me.callParent(),
+            readOnly = me.readOnly === true,
+            editable = me.editable !== false;
+        
+        return Ext.apply(data, {
+            editableCls: (readOnly || !editable) ? ' ' + me.triggerNoEditCls : '',
+            readOnly: !editable || readOnly
+        });  
+    },
+
+    getLabelableRenderData: function() {
+        var me = this,
+            triggerWrapCls = me.triggerWrapCls,
+            result = me.callParent(arguments);
+
+        return Ext.applyIf(result, {
+            triggerWrapCls: triggerWrapCls,
+            triggerMarkup: me.getTriggerMarkup()
+        });
+    },
+
+    getTriggerMarkup: function() {
+        var me = this,
+            i = 0,
+            hideTrigger = (me.readOnly || me.hideTrigger),
+            triggerCls,
+            triggerBaseCls = me.triggerBaseCls,
+            triggerConfigs = [],
+            unselectableCls = Ext.dom.Element.unselectableCls,
+            style = 'width:' + me.triggerWidth + 'px;' + (hideTrigger ? 'display:none;' : ''),
+            cls = me.extraTriggerCls + ' ' + Ext.baseCSSPrefix + 'trigger-cell ' + unselectableCls;
+
+        // TODO this trigger<n>Cls API design doesn't feel clean, especially where it butts up against the
+        // single triggerCls config. Should rethink this, perhaps something more structured like a list of
+        // trigger config objects that hold cls, handler, etc.
+        // triggerCls is a synonym for trigger1Cls, so copy it.
+        if (!me.trigger1Cls) {
+            me.trigger1Cls = me.triggerCls;
+        }
+
+        // Create as many trigger elements as we have trigger<n>Cls configs, but always at least one
+        for (i = 0; (triggerCls = me['trigger' + (i + 1) + 'Cls']) || i < 1; i++) {
+            triggerConfigs.push({
+                tag: 'td',
+                valign: 'top',
+                cls: cls,
+                style: style,
+                cn: {
+                    cls: [Ext.baseCSSPrefix + 'trigger-index-' + i, triggerBaseCls, triggerCls].join(' '),
+                    role: 'button'
+                }
+            });
+        }
+        triggerConfigs[0].cn.cls += ' ' + triggerBaseCls + '-first';
+
+        return Ext.DomHelper.markup(triggerConfigs);
+    },
+    
+    disableCheck: function() {
+        return !this.disabled;    
+    },
+
+    // @private
+    beforeRender: function() {
+        var me = this,
+            triggerBaseCls = me.triggerBaseCls,
+            tempEl;
+            
+        /**
+         * @property {Number} triggerWidth
+         * Width of the trigger element. Unless set explicitly, it will be
+         * automatically calculated through creating a temporary element
+         * on page. (That will be done just once per app run.)
+         * @private
+         */
+        if (!me.triggerWidth) {
+            tempEl = Ext.getBody().createChild({
+                style: 'position: absolute;', 
+                cls: Ext.baseCSSPrefix + 'form-trigger'
+            });
+            Ext.form.field.Trigger.prototype.triggerWidth = tempEl.getWidth();
+            tempEl.remove();
+        }
+
+        me.callParent();
+
+        if (triggerBaseCls != Ext.baseCSSPrefix + 'form-trigger') {
+            // we may need to change the selectors by which we extract trigger elements if is triggerBaseCls isn't the value we
+            // stuck in childEls
+            me.addChildEls({ name: 'triggerEl', select: '.' + triggerBaseCls });
+        }
+
+        // these start correct in the fieldSubTpl:
+        me.lastTriggerStateFlags = me.getTriggerStateFlags();
+    },
+
+    onRender: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        me.doc = Ext.getDoc();
+        me.initTrigger();
+    },
+
+    /**
+     * Get the total width of the trigger button area.
+     * @return {Number} The total trigger width
+     */
+    getTriggerWidth: function() {
+        var me = this,
+            totalTriggerWidth = 0;
+
+        if (me.triggerWrap && !me.hideTrigger && !me.readOnly) {
+            totalTriggerWidth = me.triggerEl.getCount() * me.triggerWidth;
+        }
+        return totalTriggerWidth;
+    },
+
+    setHideTrigger: function(hideTrigger) {
+        if (hideTrigger != this.hideTrigger) {
+            this.hideTrigger = hideTrigger;
+            this.updateLayout();
+        }
+    },
+
+    /**
+     * Sets the editable state of this field. This method is the runtime equivalent of setting the 'editable' config
+     * option at config time.
+     * @param {Boolean} editable True to allow the user to directly edit the field text. If false is passed, the user
+     * will only be able to modify the field using the trigger. Will also add a click event to the text field which
+     * will call the trigger. 
+     */
+    setEditable: function(editable) {
+        if (editable != this.editable) {
+            this.editable = editable;
+            this.updateLayout();
+        }
+    },
+
+    /**
+     * Sets the read-only state of this field. This method is the runtime equivalent of setting the 'readOnly' config
+     * option at config time.
+     * @param {Boolean} readOnly True to prevent the user changing the field and explicitly hide the trigger. Setting
+     * this to true will supercede settings editable and hideTrigger. Setting this to false will defer back to editable
+     * and hideTrigger.
+     */
+    setReadOnly: function(readOnly) {
+        var me = this,
+            old = me.readOnly;
+            
+        me.callParent(arguments);
+        if (readOnly != old) {
+            me.updateLayout();
+        }
+    },
+
+    // @private
+    initTrigger: function() {
+        var me = this,
+            triggerWrap = me.triggerWrap,
+            triggerEl = me.triggerEl,
+            disableCheck = me.disableCheck,
+            els, eLen, el, e, idx;
+
+        if (me.repeatTriggerClick) {
+            me.triggerRepeater = new Ext.util.ClickRepeater(triggerWrap, {
+                preventDefault: true,
+                handler: me.onTriggerWrapClick,
+                listeners: {
+                    mouseup: me.onTriggerWrapMouseup,
+                    scope: me
+                },
+                scope: me
+            });
+        } else {
+            me.mon(triggerWrap, {
+                click: me.onTriggerWrapClick,
+                mouseup: me.onTriggerWrapMouseup,
+                scope: me
+            });
+        }
+
+        triggerEl.setVisibilityMode(Ext.Element.DISPLAY);
+        triggerEl.addClsOnOver(me.triggerBaseCls + '-over', disableCheck, me);
+
+        els  = triggerEl.elements;
+        eLen = els.length;
+
+        for (e = 0; e < eLen; e++) {
+            el = els[e];
+            idx = e+1;
+            el.addClsOnOver(me['trigger' + (idx) + 'Cls'] + '-over', disableCheck, me);
+            el.addClsOnClick(me['trigger' + (idx) + 'Cls'] + '-click', disableCheck, me);
+        }
+
+        triggerEl.addClsOnClick(me.triggerBaseCls + '-click', disableCheck, me);
+
+    },
+
+    // @private
+    onDestroy: function() {
+        var me = this;
+        Ext.destroyMembers(me, 'triggerRepeater', 'triggerWrap', 'triggerEl');
+        delete me.doc;
+        me.callParent();
+    },
+
+    // @private
+    onFocus: function() {
+        var me = this;
+        me.callParent(arguments);
+        if (!me.mimicing) {
+            me.bodyEl.addCls(me.wrapFocusCls);
+            me.mimicing = true;
+            me.mon(me.doc, 'mousedown', me.mimicBlur, me, {
+                delay: 10
+            });
+            if (me.monitorTab) {
+                me.on('specialkey', me.checkTab, me);
+            }
+        }
+    },
+
+    // @private
+    checkTab: function(me, e) {
+        if (!this.ignoreMonitorTab && e.getKey() == e.TAB) {
+            this.triggerBlur();
+        }
+    },
+
+    /**
+     * Returns a set of flags that describe the trigger state. These are just used to easily
+     * determine if the DOM is out-of-sync with the component's properties.
+     * @private
+     */
+    getTriggerStateFlags: function () {
+        var me = this,
+            state = 0;
+
+        if (me.readOnly) {
+            state += 1;
+        }
+        if (me.editable) {
+            state += 2;
+        }
+        if (me.hideTrigger) {
+            state += 4;
+        }
+        return state;
+    },
+
+    /**
+     * @private
+     * The default blur handling must not occur for a TriggerField, implementing this template method as emptyFn disables that.
+     * Instead the tab key is monitored, and the superclass's onBlur is called when tab is detected
+     */
+    onBlur: Ext.emptyFn,
+
+    // @private
+    mimicBlur: function(e) {
+        if (!this.isDestroyed && !this.bodyEl.contains(e.target) && this.validateBlur(e)) {
+            this.triggerBlur(e);
+        }
+    },
+
+    // @private
+    triggerBlur: function(e) {
+        var me = this;
+        me.mimicing = false;
+        me.mun(me.doc, 'mousedown', me.mimicBlur, me);
+        if (me.monitorTab && me.inputEl) {
+            me.un('specialkey', me.checkTab, me);
+        }
+        Ext.form.field.Trigger.superclass.onBlur.call(me, e);
+        if (me.bodyEl) {
+            me.bodyEl.removeCls(me.wrapFocusCls);
+        }
+    },
+
+    // @private
+    // This should be overridden by any subclass that needs to check whether or not the field can be blurred.
+    validateBlur: function(e) {
+        return true;
+    },
+
+    // @private
+    // process clicks upon triggers.
+    // determine which trigger index, and dispatch to the appropriate click handler
+    onTriggerWrapClick: function() {
+        var me = this,
+            targetEl, match,
+            triggerClickMethod,
+            event;
+
+        event = arguments[me.triggerRepeater ? 1 : 0];
+        if (event && !me.readOnly && !me.disabled) {
+                targetEl = event.getTarget('.' + me.triggerBaseCls, null);
+                match = targetEl && targetEl.className.match(me.triggerIndexRe);
+
+            if (match) {
+                triggerClickMethod = me['onTrigger' + (parseInt(match[1], 10) + 1) + 'Click'] || me.onTriggerClick;
+                if (triggerClickMethod) {
+                    triggerClickMethod.call(me, event);
+                }
+            }
+        }
+    },
+
+    // @private
+    // Handle trigger mouse up gesture. To be implemented in subclasses.
+    // Currently the Spinner subclass refocuses the input element upon end of spin.
+    onTriggerWrapMouseup: Ext.emptyFn,
+
+    /**
+     * @method onTriggerClick
+     * @protected
+     * The function that should handle the trigger's click event. This method does nothing by default until overridden
+     * by an implementing function. See Ext.form.field.ComboBox and Ext.form.field.Date for sample implementations.
+     * @param {Ext.EventObject} e
+     */
+    onTriggerClick: Ext.emptyFn
+
+    /**
+     * @cfg {Boolean} grow
+     * @private
+     */
+    /**
+     * @cfg {Number} growMin
+     * @private
+     */
+    /**
+     * @cfg {Number} growMax
+     * @private
+     */
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * An abstract class for fields that have a single trigger which opens a "picker" popup below the field, e.g. a combobox
+ * menu list or a date picker. It provides a base implementation for toggling the picker's visibility when the trigger
+ * is clicked, as well as keyboard navigation and some basic events. Sizing and alignment of the picker can be
+ * controlled via the {@link #matchFieldWidth} and {@link #pickerAlign}/{@link #pickerOffset} config properties
+ * respectively.
+ *
+ * You would not normally use this class directly, but instead use it as the parent class for a specific picker field
+ * implementation. Subclasses must implement the {@link #createPicker} method to create a picker component appropriate
+ * for the field.
+ */
+Ext.define('Ext.form.field.Picker', {
+    extend:  Ext.form.field.Trigger ,
+    alias: 'widget.pickerfield',
+    alternateClassName: 'Ext.form.Picker',
+                                  
+
+    /**
+     * @cfg {Boolean} matchFieldWidth
+     * Whether the picker dropdown's width should be explicitly set to match the width of the field. Defaults to true.
+     */
+    matchFieldWidth: true,
+
+    /**
+     * @cfg {String} pickerAlign
+     * The {@link Ext.util.Positionable#alignTo alignment position} with which to align the picker. Defaults to "tl-bl?"
+     */
+    pickerAlign: 'tl-bl?',
+
+    /**
+     * @cfg {Number[]} pickerOffset
+     * An offset [x,y] to use in addition to the {@link #pickerAlign} when positioning the picker.
+     * Defaults to undefined.
+     */
+
+    /**
+     * @cfg {String} [openCls='x-pickerfield-open']
+     * A class to be added to the field's {@link #bodyEl} element when the picker is opened.
+     */
+    openCls: Ext.baseCSSPrefix + 'pickerfield-open',
+
+    /**
+     * @property {Boolean} isExpanded
+     * True if the picker is currently expanded, false if not.
+     */
+
+    /**
+     * @cfg {Boolean} editable
+     * False to prevent the user from typing text directly into the field; the field can only have its value set via
+     * selecting a value from the picker. In this state, the picker can also be opened by clicking directly on the input
+     * field itself.
+     */
+    editable: true,
+
+
+    initComponent: function() {
+        this.callParent();
+
+        // Custom events
+        this.addEvents(
+            /**
+             * @event expand
+             * Fires when the field's picker is expanded.
+             * @param {Ext.form.field.Picker} field This field instance
+             */
+            'expand',
+            /**
+             * @event collapse
+             * Fires when the field's picker is collapsed.
+             * @param {Ext.form.field.Picker} field This field instance
+             */
+            'collapse',
+            /**
+             * @event select
+             * Fires when a value is selected via the picker.
+             * @param {Ext.form.field.Picker} field This field instance
+             * @param {Object} value The value that was selected. The exact type of this value is dependent on
+             * the individual field and picker implementations.
+             */
+            'select'
+        );
+    },
+
+
+    initEvents: function() {
+        var me = this;
+        me.callParent();
+
+        // Add handlers for keys to expand/collapse the picker
+        me.keyNav = new Ext.util.KeyNav(me.inputEl, {
+            down: me.onDownArrow,
+            esc: {
+                handler: me.onEsc,
+                scope: me,
+                defaultEventAction: false
+            },
+            scope: me,
+            forceKeyDown: true
+        });
+
+        // Non-editable allows opening the picker by clicking the field
+        if (!me.editable) {
+            me.mon(me.inputEl, 'click', me.onTriggerClick, me);
+        }
+
+        // Disable native browser autocomplete
+        if (Ext.isGecko) {
+            me.inputEl.dom.setAttribute('autocomplete', 'off');
+        }
+    },
+
+    // private
+    onEsc: function(e) {
+        if (Ext.isIE) {
+            // Stop the esc key from "restoring" the previous value in IE
+            // For example, type "foo". Highlight all the text, hit backspace.
+            // Hit esc, "foo" will be restored. This behaviour doesn't occur
+            // in any other browsers
+            e.preventDefault();
+        }
+        
+        if (this.isExpanded) {
+            this.collapse();
+            e.stopEvent();
+        }
+    },
+
+    onDownArrow: function(e) {
+        if (!this.isExpanded) {
+            // Don't call expand() directly as there may be additional processing involved before
+            // expanding, e.g. in the case of a ComboBox query.
+            this.onTriggerClick();
+        }
+    },
+
+    /**
+     * Expands this field's picker dropdown.
+     */
+    expand: function() {
+        var me = this,
+            bodyEl, picker, collapseIf;
+
+        if (me.rendered && !me.isExpanded && !me.isDestroyed) {
+            me.expanding = true;
+            bodyEl = me.bodyEl;
+            picker = me.getPicker();
+            collapseIf = me.collapseIf;
+
+            // show the picker and set isExpanded flag
+            picker.show();
+            me.isExpanded = true;
+            me.alignPicker();
+            bodyEl.addCls(me.openCls);
+
+            // monitor clicking and mousewheel
+            me.mon(Ext.getDoc(), {
+                mousewheel: collapseIf,
+                mousedown: collapseIf,
+                scope: me
+            });
+            Ext.EventManager.onWindowResize(me.alignPicker, me);
+            me.fireEvent('expand', me);
+            me.onExpand();
+            delete me.expanding;
+        }
+    },
+
+    onExpand: Ext.emptyFn,
+
+    /**
+     * Aligns the picker to the input element
+     * @protected
+     */
+    alignPicker: function() {
+        var me = this,
+            picker = me.getPicker();
+
+        if (me.isExpanded) {
+            if (me.matchFieldWidth) {
+                // Auto the height (it will be constrained by min and max width) unless there are no records to display.
+                picker.setWidth(me.bodyEl.getWidth());
+            }
+            if (picker.isFloating()) {
+                me.doAlign();
+            }
+        }
+    },
+
+    /**
+     * Performs the alignment on the picker using the class defaults
+     * @private
+     */
+    doAlign: function(){
+        var me = this,
+            picker = me.picker,
+            aboveSfx = '-above',
+            isAbove;
+
+        // Align to the trigger wrap because the border isn't always on the input element, which
+        // can cause the offset to be off
+        me.picker.alignTo(me.triggerWrap, me.pickerAlign, me.pickerOffset);
+        // add the {openCls}-above class if the picker was aligned above
+        // the field due to hitting the bottom of the viewport
+        isAbove = picker.el.getY() < me.inputEl.getY();
+        me.bodyEl[isAbove ? 'addCls' : 'removeCls'](me.openCls + aboveSfx);
+        picker[isAbove ? 'addCls' : 'removeCls'](picker.baseCls + aboveSfx);
+    },
+
+    /**
+     * Collapses this field's picker dropdown.
+     */
+    collapse: function() {
+        if (this.isExpanded && !this.isDestroyed) {
+            var me = this,
+                openCls = me.openCls,
+                picker = me.picker,
+                doc = Ext.getDoc(),
+                collapseIf = me.collapseIf,
+                aboveSfx = '-above';
+
+            // hide the picker and set isExpanded flag
+            picker.hide();
+            me.isExpanded = false;
+
+            // remove the openCls
+            me.bodyEl.removeCls([openCls, openCls + aboveSfx]);
+            picker.el.removeCls(picker.baseCls + aboveSfx);
+
+            // remove event listeners
+            doc.un('mousewheel', collapseIf, me);
+            doc.un('mousedown', collapseIf, me);
+            Ext.EventManager.removeResizeListener(me.alignPicker, me);
+            me.fireEvent('collapse', me);
+            me.onCollapse();
+        }
+    },
+
+    onCollapse: Ext.emptyFn,
+
+
+    /**
+     * @private
+     * Runs on mousewheel and mousedown of doc to check to see if we should collapse the picker
+     */
+    collapseIf: function(e) {
+        var me = this;
+
+        if (!me.isDestroyed && !e.within(me.bodyEl, false, true) && !e.within(me.picker.el, false, true) && !me.isEventWithinPickerLoadMask(e)) {
+            me.collapse();
+        }
+    },
+
+    /**
+     * Returns a reference to the picker component for this field, creating it if necessary by
+     * calling {@link #createPicker}.
+     * @return {Ext.Component} The picker component
+     */
+    getPicker: function() {
+        var me = this;
+        return me.picker || (me.picker = me.createPicker());
+    },
+
+    /**
+     * @method
+     * Creates and returns the component to be used as this field's picker. Must be implemented by subclasses of Picker.
+     * The current field should also be passed as a configuration option to the picker component as the pickerField
+     * property.
+     */
+    createPicker: Ext.emptyFn,
+
+    /**
+     * Handles the trigger click; by default toggles between expanding and collapsing the picker component.
+     * @protected
+     */
+    onTriggerClick: function() {
+        var me = this;
+        if (!me.readOnly && !me.disabled) {
+            if (me.isExpanded) {
+                me.collapse();
+            } else {
+                me.expand();
+            }
+            me.inputEl.focus();
+        }
+    },
+    
+    triggerBlur: function() {
+        var picker = this.picker;
+            
+        this.callParent(arguments);
+        if (picker && picker.isVisible()) {
+            picker.hide();
+        }
+    },
+
+    mimicBlur: function(e) {
+        var me = this,
+            picker = me.picker;
+        // ignore mousedown events within the picker element
+        if (!picker || !e.within(picker.el, false, true) && !me.isEventWithinPickerLoadMask(e)) {
+            me.callParent(arguments);
+        }
+    },
+
+    onDestroy : function(){
+        var me = this,
+            picker = me.picker;
+
+        Ext.EventManager.removeResizeListener(me.alignPicker, me);
+        Ext.destroy(me.keyNav);
+        if (picker) {
+            delete picker.pickerField;
+            picker.destroy();
+        }
+        me.callParent();
+    },
+
+    /**
+     * returns true if the picker has a load mask and the passed event is within the load mask
+     * @private
+     * @param {Ext.EventObject} e
+     * @return {Boolean}
+     */
+    isEventWithinPickerLoadMask: function(e) {
+        var loadMask = this.picker.loadMask;
+
+        return loadMask ? e.within(loadMask.maskEl, false, true) || e.within(loadMask.el, false, true) : false;
+    }
+
+});
+
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Tracks what records are currently selected in a databound component.
+ *
+ * This is an abstract class and is not meant to be directly used. Databound UI widgets such as
+ * {@link Ext.grid.Panel Grid} and {@link Ext.tree.Panel Tree} should subclass Ext.selection.Model
+ * and provide a way to binding to the component.
+ *
+ * The abstract methods `onSelectChange` and `onLastFocusChanged` should be implemented in these
+ * subclasses to update the UI widget.
+ */
+Ext.define('Ext.selection.Model', {
+    extend:  Ext.util.Observable ,
+    alternateClassName: 'Ext.AbstractSelectionModel',
+                                        
+    mixins: {
+        bindable:  Ext.util.Bindable     
+    },
+    // lastSelected
+
+    /**
+     * @cfg {"SINGLE"/"SIMPLE"/"MULTI"} mode
+     * Mode of selection.  Valid values are:
+     *
+     * - **"SINGLE"** - Only allows selecting one item at a time.  Use {@link #allowDeselect} to allow
+     *   deselecting that item.  Also see {@link #toggleOnClick}. This is the default.
+     * - **"SIMPLE"** - Allows simple selection of multiple items one-by-one. Each click in grid will either
+     *   select or deselect an item.
+     * - **"MULTI"** - Allows complex selection of multiple items using Ctrl and Shift keys.
+     */
+
+    /**
+     * @cfg {Boolean} allowDeselect
+     * Allow users to deselect a record in a DataView, List or Grid.
+     * Only applicable when the {@link #mode} is 'SINGLE'.
+     */
+    allowDeselect: undefined,
+    
+    /**
+     * @cfg {Boolean} toggleOnClick
+     * `true` to toggle the selection state of an item when clicked.
+     * Only applicable when the {@link #mode} is 'SINGLE'.
+     * Only applicable when the {@link #allowDeselect} is 'true'.
+     */
+    toggleOnClick: true,
+
+    /**
+     * @property {Ext.util.MixedCollection} [selected=undefined]
+     * A MixedCollection that maintains all of the currently selected records.
+     * @readonly
+     */
+    selected: null,
+
+    /**
+     * @cfg {Boolean} [pruneRemoved=true]
+     * Remove records from the selection when they are removed from the store.
+     *
+     * **Important:** When using {@link Ext.toolbar.Paging paging} or a {@link Ext.data.Store#buffered sparsely populated (buffered) Store},
+     * records which are cached in the Store's {@link Ext.data.Store#property-data data collection} may be removed from the Store when pages change,
+     * or when rows are scrolled out of view. For this reason `pruneRemoved` should be set to `false` when using a buffered Store.
+     *
+     * Also, when previously pruned pages are returned to the cache, the records objects in the page will be
+     * *new instances*, and will not match the instances in the selection model's collection. For this reason,
+     * you MUST ensure that the Model definition's {@link Ext.data.Model#idProperty idProperty} references a unique
+     * key because in this situation, records in the Store have their **IDs** compared to records in the SelectionModel
+     * in order to re-select a record which is scrolled back into view.
+     */
+    pruneRemoved: true,
+    
+    suspendChange: 0,
+
+    constructor: function(cfg) {
+        var me = this;
+
+        cfg = cfg || {};
+        Ext.apply(me, cfg);
+
+        me.addEvents(
+            /**
+             * @event
+             * Fired after a selection change has occurred
+             * @param {Ext.selection.Model} this
+             * @param {Ext.data.Model[]} selected The selected records
+             */
+            'selectionchange',
+            /**
+             * @event
+             * Fired when a row is focused
+             * @param {Ext.selection.Model} this
+             * @param {Ext.data.Model} oldFocused The previously focused record
+             * @param {Ext.data.Model} newFocused The newly focused record
+             */
+            'focuschange'
+        );
+
+        me.modes = {
+            SINGLE: true,
+            SIMPLE: true,
+            MULTI: true
+        };
+
+        // sets this.selectionMode
+        me.setSelectionMode(cfg.mode || me.mode);
+
+        // maintains the currently selected records.
+        me.selected = new Ext.util.MixedCollection(null, me.getSelectionId);
+
+        me.callParent(arguments);
+    },
+
+    // binds the store to the selModel.
+    bindStore: function(store, initial){
+        var me = this;
+        me.mixins.bindable.bindStore.apply(me, arguments);
+        if(me.store && !initial) {
+            me.refresh();
+        }
+    },
+
+    getStoreListeners: function() {
+        var me = this;
+        return {
+            add: me.onStoreAdd,
+            clear: me.onStoreClear,
+            bulkremove: me.onStoreRemove,
+            update: me.onStoreUpdate,
+            load: me.onStoreLoad,
+            idchanged: me.onModelIdChanged,
+            refresh: me.onStoreRefresh
+        };
+    },
+    
+    suspendChanges: function(){
+        ++this.suspendChange;
+    },
+    
+    resumeChanges: function(){
+        if (this.suspendChange) {
+            --this.suspendChange;
+        }
+    },
+
+    /**
+     * Selects all records in the view.
+     * @param {Boolean} suppressEvent True to suppress any select events
+     */
+    selectAll: function(suppressEvent) {
+        var me = this,
+            selections = me.store.getRange(),
+            i = 0,
+            len = selections.length,
+            start = me.getSelection().length;
+
+        me.suspendChanges();
+        for (; i < len; i++) {
+            me.doSelect(selections[i], true, suppressEvent);
+        }
+        me.resumeChanges();
+        // fire selection change only if the number of selections differs
+        if (!suppressEvent) {
+            me.maybeFireSelectionChange(me.getSelection().length !== start);
+        }
+    },
+
+    /**
+     * Deselects all records in the view.
+     * @param {Boolean} [suppressEvent] True to suppress any deselect events
+     */
+    deselectAll: function(suppressEvent) {
+        var me = this,
+            selections = me.getSelection(),
+            selIndexes = {},
+            store = me.store,
+            start = selections.length,
+            i, l, rec;
+
+        // Cache selection records' indexes first to avoid
+        // looking them up on every sort comparison below.
+        // We can't rely on store.indexOf being fast because
+        // for whatever reason the Store in question may force
+        // sequential index lookup, which will result in O(n^2)
+        // sort performance below.
+        for (i = 0, l = selections.length; i < l; i++) {
+            rec = selections[i];
+            
+            selIndexes[rec.internalId] = store.indexOf(rec);
+        }
+        
+        // Sort the selections so that the events fire in
+        // a predictable order like selectAll
+        selections = Ext.Array.sort(selections, function(r1, r2){
+            var idx1 = selIndexes[r1.internalId],
+                idx2 = selIndexes[r2.internalId];
+            
+            // Don't check for equality since indexes will be unique
+            return idx1 < idx2 ? -1 : 1;
+        });
+        
+        me.suspendChanges();
+        me.doDeselect(selections, suppressEvent);
+        me.resumeChanges();
+        // fire selection change only if the number of selections differs
+        if (!suppressEvent) {
+            me.maybeFireSelectionChange(me.getSelection().length !== start);
+        }
+    },
+
+    // Provides differentiation of logic between MULTI, SIMPLE and SINGLE
+    // selection modes. Requires that an event be passed so that we can know
+    // if user held ctrl or shift.
+    selectWithEvent: function(record, e) {
+        var me = this,
+            isSelected = me.isSelected(record),
+            shift = e.shiftKey,
+            ctrl = e.ctrlKey,
+            start = me.selectionStart,
+            selected = me.getSelection(),
+            len = selected.length,
+            allowDeselect = me.allowDeselect,
+            toDeselect, i, item;
+
+        switch (me.selectionMode) {
+            case 'MULTI':
+                if (shift && start) {
+                    me.selectRange(start, record, ctrl);
+                } else if (ctrl && isSelected) {
+                    me.doDeselect(record, false);
+                } else if (ctrl) {
+                    me.doSelect(record, true, false);
+                } else if (isSelected && !shift && !ctrl && len > 1) {
+                    toDeselect = [];
+                    
+                    for (i = 0; i < len; ++i) {
+                        item = selected[i];
+                        if (item !== record) {
+                            toDeselect.push(item);    
+                        }
+                    }
+                    
+                    me.doDeselect(toDeselect);
+                } else if (!isSelected) {
+                    me.doSelect(record, false);
+                }
+                break;
+            case 'SIMPLE':
+                if (isSelected) {
+                    me.doDeselect(record);
+                } else {
+                    me.doSelect(record, true);
+                }
+                break;
+            case 'SINGLE':
+                if (allowDeselect && !ctrl) {
+                    allowDeselect = me.toggleOnClick;
+                }
+                if (allowDeselect && isSelected) {
+                    me.doDeselect(record);
+                } else {
+                    me.doSelect(record, false);
+                }
+                break;
+        }
+
+        // selectionStart is a start point for shift/mousedown to create a range from.
+        // If the mousedowned record was not already selected, then it becomes the
+        // start of any range created from now on.
+        // If we drop to no records selected, then there is no range start any more.
+        if (!shift) {
+            if (me.isSelected(record)) {
+                me.selectionStart = record;
+            } else {
+                me.selectionStart = null;
+            }
+        }
+    },
+
+    // Private
+    // Called after a new record has been navigated to by a keystroke.
+    // Event is passed so that shift and ctrl can be handled.
+    afterKeyNavigate: function(e, record) {
+        var me = this,
+            recIdx,
+            fromIdx,
+            isSelected = me.isSelected(record),
+            from = (me.selectionStart && me.isSelected(me.lastFocused)) ? me.selectionStart : (me.selectionStart = me.lastFocused),
+            key = e.getCharCode(),
+            isSpace = key === e.SPACE,
+            direction = key === e.UP || key === e.PAGE_UP ? 'up' : (key === e.DOWN || key === e.DOWN ? 'down' : null);
+
+        switch (me.selectionMode) {
+            case 'MULTI':
+
+                if (isSpace) {
+                    // SHIFT+SPACE, select range
+                    if (e.shiftKey) {
+                        me.selectRange(from, record, e.ctrlKey);
+                    } else {
+                        // SPACE pessed on a selected item: deselect but leave it focused.
+                        // e.ctrlKey means "keep existing"
+                        if (isSelected) {
+                            me.doDeselect(record, e.ctrlKey);
+
+                            // This record is already focused. To get the focus effect put on it (as opposed to selected)
+                            // we have to focus null first.
+                            me.setLastFocused(null);
+                            me.setLastFocused(record);
+                        }
+                        // SPACE on an unselected item: select it
+                        else {
+                            me.doSelect(record, e.ctrlKey);
+                        }
+                    }
+                }
+
+                // SHIFT-navigate selects intervening rows from the last selected (or last focused) item and target item
+                else if (e.shiftKey && from) {
+
+                    // If we are going back *into* the selected range, we deselect.
+                    fromIdx = me.store.indexOf(from);
+                    recIdx = me.store.indexOf(record);
+
+                    // If we are heading back TOWARDS the start rec - deselect skipped range...
+                    if (direction === 'up' && fromIdx <= recIdx) {
+                        me.deselectRange(me.lastFocused, recIdx + 1);
+                    }
+                    else if (direction === 'down' && fromIdx >= recIdx) {
+                        me.deselectRange(me.lastFocused, recIdx - 1);
+                    }
+
+                    // If we are heading AWAY from start point, or no CTRL key, so just select the range and let the CTRL control "keepExisting"...
+                    else if (from !== record) {
+                        me.selectRange(from, record, e.ctrlKey);
+                    }
+                    me.lastSelected = record;
+                    me.setLastFocused(record);
+                }
+
+                // CTRL-navigate onto a selected item just focuses it
+                else if (e.ctrlKey && isSelected) {
+                    me.setLastFocused(record);
+                }
+
+                // CTRL-navigate, just move focus
+                else if (e.ctrlKey) {
+                    me.setLastFocused(record);
+                }
+
+                // Just navigation - select the target
+                else {
+                    me.doSelect(record, false);
+                }
+                break;
+            case 'SIMPLE':
+                if (isSelected) {
+                    me.doDeselect(record);
+                } else {
+                    me.doSelect(record, true);
+                }
+                break;
+            case 'SINGLE':
+                // Space hit
+                if (isSpace) {
+                    if (isSelected) {
+                        me.doDeselect(record);
+                        me.setLastFocused(record);
+                    } else {
+                        me.doSelect(record);
+                    }
+                }
+
+                // CTRL-navigation: just move focus
+                else if (e.ctrlKey) {
+                    me.setLastFocused(record);
+                }
+
+                // if allowDeselect is on and this record isSelected, deselect it
+                else if (me.allowDeselect && isSelected) {
+                    me.doDeselect(record);
+                }
+
+                // select the record and do NOT maintain existing selections
+                else {
+                    me.doSelect(record, false);
+                }
+                break;
+        }
+
+        // selectionStart is a start point for shift/mousedown to create a range from.
+        // If the mousedowned record was not already selected, then it becomes the
+        // start of any range created from now on.
+        // If we drop to no records selected, then there is no range start any more.
+        if (!e.shiftKey) {
+            if (me.isSelected(record)) {
+                me.selectionStart = record;
+            }
+        }
+    },
+
+    /**
+     * Selects a range of rows if the selection model {@link #isLocked is not locked}.
+     * All rows in between startRow and endRow are also selected.
+     * @param {Ext.data.Model/Number} startRow The record or index of the first row in the range
+     * @param {Ext.data.Model/Number} endRow The record or index of the last row in the range
+     * @param {Boolean} keepExisting (optional) True to retain existing selections
+     */
+    selectRange : function(startRow, endRow, keepExisting) {
+        var me = this,
+            store = me.store,
+            selected = me.selected.items,
+            result, i, len, toSelect, toDeselect, idx, rec;
+
+        if (me.isLocked()){
+            return;
+        }
+
+        result = me.normalizeRowRange(startRow, endRow);
+        startRow = result[0];
+        endRow = result[1];
+
+        toSelect = [];
+        for (i = startRow; i <= endRow; i++){
+            if (!me.isSelected(store.getAt(i))) {
+                toSelect.push(store.getAt(i));
+            }
+        }
+        
+        if (!keepExisting) {
+            // prevent selectionchange from firing
+            toDeselect = [];
+            me.suspendChanges();
+            
+            for (i = 0, len = selected.length; i < len; ++i) {
+                rec = selected[i];
+                idx = store.indexOf(rec);
+                if (idx < startRow || idx > endRow) {
+                    toDeselect.push(rec)
+                }
+            }
+            
+            for (i = 0, len = toDeselect.length; i < len; ++i) {
+                me.doDeselect(toDeselect[i]);
+            }
+            me.resumeChanges();
+        }
+        
+        me.doMultiSelect(toSelect, true);
+    },
+
+    /**
+     * Deselects a range of rows if the selection model {@link #isLocked is not locked}.
+     * @param {Ext.data.Model/Number} startRow The record or index of the first row in the range
+     * @param {Ext.data.Model/Number} endRow The record or index of the last row in the range
+     */
+    deselectRange : function(startRow, endRow) {
+        var me = this,
+            store = me.store,
+            result, i, toDeselect, record;
+
+        if (me.isLocked()){
+            return;
+        }
+
+        result = me.normalizeRowRange(startRow, endRow);
+        startRow = result[0];
+        endRow = result[1];
+
+        toDeselect = [];
+        for (i = startRow; i <= endRow; i++) {
+            record = store.getAt(i);
+            if (me.isSelected(record)) {
+                toDeselect.push(record);
+            }
+        }
+        me.doDeselect(toDeselect);
+    },
+    
+    normalizeRowRange: function(startRow, endRow) {
+        var store = this.store,
+            tmp;
+        
+        if (!Ext.isNumber(startRow)) {
+            startRow = store.indexOf(startRow);
+        }
+        startRow = Math.max(0, startRow);
+        
+        if (!Ext.isNumber(endRow)) {
+            endRow = store.indexOf(endRow);
+        }
+        endRow = Math.min(endRow, store.getCount() - 1);
+        
+        // swap values
+        if (startRow > endRow){
+            tmp = endRow;
+            endRow = startRow;
+            startRow = tmp;
+        }    
+        
+        return [startRow, endRow];
+    },
+
+    onModelIdChanged: function(store, model, oldId, newId, oldInternalId) {
+        this.selected.updateKey(oldInternalId, newId);
+    },
+
+    /**
+     * Selects a record instance by record instance or index.
+     * @param {Ext.data.Model[]/Number} records An array of records or an index
+     * @param {Boolean} [keepExisting=false] True to retain existing selections
+     * @param {Boolean} [suppressEvent=false] True to not fire a select event
+     */
+    select: function(records, keepExisting, suppressEvent) {
+        // Automatically selecting eg store.first() or store.last() will pass undefined, so that must just return;
+        if (Ext.isDefined(records)) {
+            this.doSelect(records, keepExisting, suppressEvent);
+        }
+    },
+
+    /**
+     * Deselects a record instance by record instance or index.
+     * @param {Ext.data.Model[]/Number} records An array of records or an index
+     * @param {Boolean} [suppressEvent=false] True to not fire a deselect event
+     */
+    deselect: function(records, suppressEvent) {
+        this.doDeselect(records, suppressEvent);
+    },
+
+    doSelect: function(records, keepExisting, suppressEvent) {
+        var me = this,
+            record;
+
+        if (me.locked || !me.store) {
+            return;
+        }
+        if (typeof records === "number") {
+            record = me.store.getAt(records);
+            // No matching record, jump out
+            if (!record) {
+                return;
+            }
+            records = [record];
+        }
+        if (me.selectionMode == "SINGLE" && records) {
+            record = records.length ? records[0] : records;
+            me.doSingleSelect(record, suppressEvent);
+        } else {
+            me.doMultiSelect(records, keepExisting, suppressEvent);
+        }
+    },
+
+    doMultiSelect: function(records, keepExisting, suppressEvent) {
+        var me = this,
+            selected = me.selected,
+            change = false,
+            result, i, len, record, commit;
+
+        if (me.locked) {
+            return;
+        }
+
+        records = !Ext.isArray(records) ? [records] : records;
+        len = records.length;
+        if (!keepExisting && selected.getCount() > 0) {
+            result = me.deselectDuringSelect(records, selected.getRange(), suppressEvent);
+            if (result[0]) {
+                // We had a failure during seletion, so jump out
+                // Fire selection change if we did deselect anything
+                me.maybeFireSelectionChange(result[1] > 0 && !suppressEvent);
+                return;
+            }
+        }
+
+        commit = function() {
+            selected.add(record);
+            change = true;
+        };
+
+        for (i = 0; i < len; i++) {
+            record = records[i];
+            if (me.isSelected(record)) {
+                continue;
+            }
+            me.lastSelected = record;
+
+            me.onSelectChange(record, true, suppressEvent, commit);
+        }
+        if (!me.preventFocus) {
+            me.setLastFocused(record, suppressEvent);
+        }
+        // fire selchange if there was a change and there is no suppressEvent flag
+        me.maybeFireSelectionChange(change && !suppressEvent);
+    },
+    
+    deselectDuringSelect: function(toSelect, selected, suppressEvent) {
+        var me = this,
+            len = selected.length,
+            changed = 0,
+            failed = false,
+            item, i;
+            
+        // Prevent selection change events from firing, will happen during select
+        me.suspendChanges();
+        for (i = 0; i < len; ++i) {
+            item = selected[i];
+            if (!Ext.Array.contains(toSelect, item)) {
+                if (me.doDeselect(item, suppressEvent)) {
+                    ++changed;
+                } else {
+                    failed = true;
+                }
+            }
+        }
+        me.resumeChanges();
+        
+        return [failed, changed];
+    },
+
+    // records can be an index, a record or an array of records
+    doDeselect: function(records, suppressEvent) {
+        var me = this,
+            selected = me.selected,
+            i = 0,
+            len, record,
+            attempted = 0,
+            accepted = 0,
+            commit;
+
+        if (me.locked || !me.store) {
+            return false;
+        }
+
+        if (typeof records === "number") {
+            // No matching record, jump out
+            record = me.store.getAt(records);
+            if (!record) {
+                return false;
+            }
+            records = [record];
+        } else if (!Ext.isArray(records)) {
+            records = [records];
+        }
+
+        commit = function() {
+            ++accepted;
+            selected.remove(record);
+        };
+
+        len = records.length;
+
+        me.suspendChanges();
+        for (; i < len; i++) {
+            record = records[i];
+            if (me.isSelected(record)) {
+                if (me.lastSelected === record) {
+                    me.lastSelected = selected.last();
+                    if (me.lastFocused === record) {
+                        me.setLastFocused(null);
+                    }
+                }
+                ++attempted;
+                me.onSelectChange(record, false, suppressEvent, commit);
+            }
+        }
+        me.resumeChanges();
+
+        // fire selchange if there was a change and there is no suppressEvent flag
+        me.maybeFireSelectionChange(accepted > 0 && !suppressEvent);
+        return accepted === attempted;
+    },
+
+    doSingleSelect: function(record, suppressEvent) {
+        var me = this,
+            changed = false,
+            selected = me.selected,
+            commit;
+
+        if (me.locked) {
+            return;
+        }
+        // already selected.
+        // should we also check beforeselect?
+        if (me.isSelected(record)) {
+            return;
+        }
+        
+        if (selected.getCount()) {
+            me.suspendChanges();
+            if (!me.doDeselect(me.lastSelected, suppressEvent)) {
+                me.resumeChanges();
+                return;
+            }
+            me.resumeChanges();
+        }
+
+        commit = function() {
+            selected.add(record);
+            me.lastSelected = record;
+            changed = true;
+        };
+
+        me.onSelectChange(record, true, suppressEvent, commit);
+
+        if (changed) {
+            if (!suppressEvent && !me.preventFocus) {
+                me.setLastFocused(record);
+            }
+            me.maybeFireSelectionChange(!suppressEvent);
+        }
+    },
+
+    /**
+     * Sets a record as the last focused record. This does NOT mean
+     * that the record has been selected.
+     * @param {Ext.data.Model} record
+     */
+    setLastFocused: function(record, supressFocus) {
+        var me = this,
+            recordBeforeLast = me.lastFocused;
+
+        // Only call the changed method if in fact the selected record *has* changed.
+        if (record !== recordBeforeLast) {
+            me.lastFocused = record;
+            me.onLastFocusChanged(recordBeforeLast, record, supressFocus);
+        }
+    },
+
+    /**
+     * Determines if this record is currently focused.
+     * @param {Ext.data.Model} record
+     */
+    isFocused: function(record) {
+        return record === this.getLastFocused();
+    },
+
+    // fire selection change as long as true is not passed
+    // into maybeFireSelectionChange
+    maybeFireSelectionChange: function(fireEvent) {
+        var me = this;
+        if (fireEvent && !me.suspendChange) {
+            me.fireEvent('selectionchange', me, me.getSelection());
+        }
+    },
+
+    /**
+     * @return {Ext.data.Model} Returns the last selected record.
+     */
+    getLastSelected: function() {
+        return this.lastSelected;
+    },
+
+    getLastFocused: function() {
+        return this.lastFocused;
+    },
+
+    /**
+     * Returns an array of the currently selected records.
+     * @return {Ext.data.Model[]} The selected records
+     */
+    getSelection: function() {
+        return this.selected.getRange();
+    },
+
+    /**
+     * Returns the current selectionMode.
+     * @return {String} The selectionMode: 'SINGLE', 'MULTI' or 'SIMPLE'.
+     */
+    getSelectionMode: function() {
+        return this.selectionMode;
+    },
+
+    /**
+     * Sets the current selectionMode.
+     * @param {String} selMode 'SINGLE', 'MULTI' or 'SIMPLE'.
+     */
+    setSelectionMode: function(selMode) {
+        selMode = selMode ? selMode.toUpperCase() : 'SINGLE';
+        // set to mode specified unless it doesnt exist, in that case
+        // use single.
+        this.selectionMode = this.modes[selMode] ? selMode : 'SINGLE';
+    },
+
+    /**
+     * Returns true if the selections are locked.
+     * @return {Boolean}
+     */
+    isLocked: function() {
+        return this.locked;
+    },
+
+    /**
+     * Locks the current selection and disables any changes from happening to the selection.
+     * @param {Boolean} locked  True to lock, false to unlock.
+     */
+    setLocked: function(locked) {
+        this.locked = !!locked;
+    },
+
+    /**
+     * Returns true if the specified row is selected.
+     * @param {Ext.data.Model/Number} from The start of the range to check.
+     * @param {Ext.data.Model/Number} to The end of the range to check.
+     * @return {Boolean}
+     */
+    isRangeSelected: function(startRow, endRow) {
+        var me = this,
+            store = me.store,
+            i, result;
+
+        result = me.normalizeRowRange(startRow, endRow);
+        startRow = result[0];
+        endRow = result[1];
+
+        // Loop through. If any of the range is not selected, the answer is false.
+        for (i = startRow; i <= endRow; i++) {
+            if (!me.isSelected(store.getAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    },
+
+    /**
+     * Returns true if the specified row is selected.
+     * @param {Ext.data.Model/Number} record The record or index of the record to check
+     * @return {Boolean}
+     */
+    isSelected: function(record) {
+        record = Ext.isNumber(record) ? this.store.getAt(record) : record;
+        return this.selected.contains(record);
+    },
+
+    /**
+     * Returns true if there are any a selected records.
+     * @return {Boolean}
+     */
+    hasSelection: function() {
+        return this.selected.getCount() > 0;
+    },
+
+    getSelectionId: function(record){
+        return record.internalId;
+    },
+
+    pruneIf: function() {
+        var me = this,
+            selected = me.selected,
+            toRemove = [],
+            len = selected.length,
+            i, item;
+
+        if (me.pruneRemoved) {
+            for (i = 0; i < len; i++) {
+                item = selected.getAt(i);
+                if (!this.storeHasSelected(item)) {
+                    toRemove.push(item);
+                }
+            }
+            if (toRemove.length) {
+                for (i = 0, len = toRemove.length; i < len; i++) {
+                    selected.remove(toRemove[i]);
+                }
+                me.maybeFireSelectionChange(true);
+            }
+        }
+    },
+
+    // We need this special check because we could have a model
+    // without an idProperty. getById() is fast, so we use that
+    // if possible, otherwise we need to check the internalId
+    storeHasSelected: function(record) {
+        var store = this.store,
+            records,
+            len, id, i;
+
+        if (record.hasId() && store.getById(record)) {
+            return true;
+        } else {
+            records = store.data.items;
+            len = records.length;
+            id = record.internalId;
+
+            for (i = 0; i < len; ++i) {
+                if (id === records[i].internalId) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    },
+
+    refresh: function() {
+        var me = this,
+            store = me.store,
+            rec,
+            toBeSelected = [],
+            toBeReAdded = [],
+            oldSelections = me.getSelection(),
+            len = oldSelections.length,
+            selection,
+            change,
+            i = 0,
+            lastFocused = me.getLastFocused();
+
+        // Not been bound yet.
+        if (!store) {
+            return;
+        }
+
+        // Add currently records to the toBeSelected list if present in the Store
+        // If they are not present, and pruneRemoved is false, we must still retain the record
+        for (; i < len; i++) {
+            selection = oldSelections[i];
+            if (store.indexOf(selection) !== -1) {
+                toBeSelected.push(selection);
+            }
+
+            // Selected records no longer represented in Store must be retained
+            else if (!me.pruneRemoved) {
+                // See if a record by the same ID exists. If so, select it
+                rec = store.getById(selection.getId());
+                if (rec) {
+                    toBeSelected.push(rec);
+                }
+                // If it does not exist, we have to re-add it to the selection
+                else {
+                    toBeReAdded.push(selection)
+                }
+            }
+
+            // In single select mode, only one record may be selected
+            if (me.mode === 'SINGLE' && toBeReAdded.length) {
+                break;
+            }
+        }
+
+        // there was a change from the old selected and
+        // the new selection
+        if (me.selected.getCount() != (toBeSelected.length + toBeReAdded.length)) {
+            change = true;
+        }
+
+        me.clearSelections();
+
+        if (store.indexOf(lastFocused) !== -1) {
+            // restore the last focus but supress restoring focus
+            me.setLastFocused(lastFocused, true);
+        }
+
+        if (toBeSelected.length) {
+            // perform the selection again
+            me.doSelect(toBeSelected, false, true);
+        }
+
+        // If some of the selections were not present in the Store, but pruneRemoved is false, we must add them back
+        if (toBeReAdded.length) {
+            me.selected.addAll(toBeReAdded);
+
+            // No records reselected.
+            if (!me.lastSelected) {
+                me.lastSelected = toBeReAdded[toBeReAdded.length - 1];
+            }
+        }
+
+        me.maybeFireSelectionChange(change);
+    },
+
+    /**
+     * A fast reset of the selections without firing events, updating the ui, etc.
+     * For private usage only.
+     * @private
+     */
+    clearSelections: function() {
+        // reset the entire selection to nothing
+        this.selected.clear();
+        this.lastSelected = null;
+        this.setLastFocused(null);
+    },
+
+    // when a record is added to a store
+    onStoreAdd: Ext.emptyFn,
+
+    // when a store is cleared remove all selections
+    // (if there were any)
+    onStoreClear: function() {
+        if (this.selected.getCount() > 0) {
+            this.clearSelections();
+            this.maybeFireSelectionChange(true);
+        }
+    },
+
+    // prune records from the SelectionModel if
+    // they were selected at the time they were
+    // removed.
+    onStoreRemove: function(store, records, indexes, isMove) {
+        var me = this;
+
+        // If the selection start point is among records being removed, we no longer have a selection start point.
+        if (me.selectionStart && Ext.Array.contains(records, me.selectionStart)) {
+            me.selectionStart = null;
+        }
+
+        if (isMove || me.locked || !me.pruneRemoved) {
+            return;
+        }
+        me.deselectDeletedRecords(records);
+    },
+
+    // @private
+    // Called by subclasses to deselect records upon detection of deletion from the store
+    deselectDeletedRecords: function(records) {
+        var me = this,
+            selected = me.selected,
+            i, length = records.length,
+            removed = 0,
+            record;
+
+        // Deselect records which were removed
+        for (i = 0; i < length; i++) {
+            record = records[i];
+            if (selected.remove(record)) {
+                if (me.lastSelected == record) {
+                    me.lastSelected = null;
+                }
+                if (me.getLastFocused() == record) {
+                    me.setLastFocused(null);
+                }
+                ++removed;
+            }
+        }
+        if (removed) {
+            me.maybeFireSelectionChange(true);
+        }
+    },
+
+    /**
+     * Returns the count of selected records.
+     * @return {Number} The number of selected records
+     */
+    getCount: function() {
+        return this.selected.getCount();
+    },
+
+    // Called when the contents of the node are updated, perform any processing here.
+    onUpdate: Ext.emptyFn,
+
+    // cleanup.
+    destroy: function(){
+        this.clearListeners();    
+    },
+
+    // if records are updated
+    onStoreUpdate: Ext.emptyFn,
+
+    onStoreRefresh: Ext.emptyFn,
+
+    /**
+     * @abstract
+     * @private
+     */
+    onStoreLoad: Ext.emptyFn,
+
+    // @abstract
+    onSelectChange: function(record, isSelected, suppressEvent, commitFn) {
+        var me = this,
+            eventName = isSelected ? 'select' : 'deselect';
+
+        if ((suppressEvent || me.fireEvent('before' + eventName, me, record)) !== false &&
+           commitFn() !== false) {
+
+            if (!suppressEvent) {
+                me.fireEvent(eventName, me, record);
+            }
+        }   
+    },
+
+    // @abstract
+    onLastFocusChanged: function(oldFocused, newFocused) {
+        this.fireEvent('focuschange', this, oldFocused, newFocused);
+    },
+
+    // @abstract
+    onEditorKey: Ext.emptyFn,
+
+    // @abstract
+    beforeViewRender: function(view) {
+        this.views = this.views || [];
+        this.views.push(view);
+        this.bindStore(view.getStore(), true);
+    },
+
+    // @abstract
+    bindComponent: Ext.emptyFn
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.selection.DataViewModel', {
+    extend:  Ext.selection.Model ,
+
+                                  
+
+    deselectOnContainerClick: true,
+
+    /**
+     * @cfg {Boolean} enableKeyNav
+     *
+     * Turns on/off keyboard navigation within the DataView.
+     */
+    enableKeyNav: true,
+
+    constructor: function(cfg){
+        this.addEvents(
+            /**
+             * @event beforedeselect
+             * Fired before a record is deselected. If any listener returns false, the
+             * deselection is cancelled.
+             * @param {Ext.selection.DataViewModel} this
+             * @param {Ext.data.Model} record The deselected record
+             */
+            'beforedeselect',
+
+            /**
+             * @event beforeselect
+             * Fired before a record is selected. If any listener returns false, the
+             * selection is cancelled.
+             * @param {Ext.selection.DataViewModel} this
+             * @param {Ext.data.Model} record The selected record
+             */
+            'beforeselect',
+
+            /**
+             * @event deselect
+             * Fired after a record is deselected
+             * @param {Ext.selection.DataViewModel} this
+             * @param  {Ext.data.Model} record The deselected record
+             */
+            'deselect',
+
+            /**
+             * @event select
+             * Fired after a record is selected
+             * @param {Ext.selection.DataViewModel} this
+             * @param  {Ext.data.Model} record The selected record
+             */
+            'select'
+        );
+        this.callParent(arguments);
+    },
+
+    bindComponent: function(view) {
+        var me = this,
+            eventListeners = {
+                refresh: me.refresh,
+                scope: me
+            };
+
+        me.view = view;
+        me.bindStore(view.getStore());
+
+        eventListeners[view.triggerEvent] = me.onItemClick;
+        eventListeners[view.triggerCtEvent] = me.onContainerClick;
+
+        view.on(eventListeners);
+
+        if (me.enableKeyNav) {
+            me.initKeyNav(view);
+        }
+    },
+    
+    onUpdate: function(record){
+        var view = this.view;
+        if (view && this.isSelected(record)) {
+            view.onItemSelect(record);
+        }
+    },
+
+    onItemClick: function(view, record, item, index, e) {
+        this.selectWithEvent(record, e);
+    },
+
+    onContainerClick: function() {
+        if (this.deselectOnContainerClick) {
+            this.deselectAll();
+        }
+    },
+
+    initKeyNav: function(view) {
+        var me = this;
+
+        if (!view.rendered) {
+            view.on({
+                render: Ext.Function.bind(me.initKeyNav, me, [view]),
+                single: true
+            });
+            return;
+        }
+
+        view.el.set({
+            tabIndex: -1
+        });
+        me.keyNav = new Ext.util.KeyNav({
+            target: view.el,
+            ignoreInputFields: true,
+            down: Ext.pass(me.onNavKey, [1], me),
+            right: Ext.pass(me.onNavKey, [1], me),
+            left: Ext.pass(me.onNavKey, [-1], me),
+            up: Ext.pass(me.onNavKey, [-1], me),
+            scope: me
+        });
+    },
+
+    onNavKey: function(step) {
+        step = step || 1;
+        var me = this,
+            view = me.view,
+            selected = me.getSelection()[0],
+            numRecords = me.view.store.getCount(),
+            idx;
+
+        if (selected) {
+            idx = view.indexOf(view.getNode(selected)) + step;
+        } else {
+            idx = 0;
+        }
+
+        if (idx < 0) {
+            idx = numRecords - 1;
+        } else if (idx >= numRecords) {
+            idx = 0;
+        }
+
+        me.select(idx);
+    },
+
+    // Allow the DataView to update the ui
+    onSelectChange: function(record, isSelected, suppressEvent, commitFn) {
+        var me = this,
+            view = me.view,
+            eventName = isSelected ? 'select' : 'deselect';
+
+        if ((suppressEvent || me.fireEvent('before' + eventName, me, record)) !== false &&
+                commitFn() !== false) {
+
+            if (view) {
+                if (isSelected) {
+                    view.onItemSelect(record);
+                } else {
+                    view.onItemDeselect(record);
+                }
+            }
+
+            if (!suppressEvent) {
+                me.fireEvent(eventName, me, record);
+            }
+        }
+    },
+    
+    onLastFocusChanged: function(oldFocus, newFocus, suppressFocus){
+        var view = this.view;
+        if (view && !suppressFocus && newFocus) {
+            view.focusNode(newFocus);
+            this.fireEvent('focuschange', this, oldFocus, newFocus);
+        }
+    },
+    
+    destroy: function(){
+        Ext.destroy(this.keyNav);
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.view.AbstractView
+ * This is an abstract superclass and should not be used directly. Please see {@link Ext.view.View}.
+ * @private
+ */
+Ext.define('Ext.view.AbstractView', {
+    extend:  Ext.Component ,
+               
+                       
+                                
+                                   
+                       
+                                     
+      
+    mixins: {
+        bindable:  Ext.util.Bindable 
+    },
+
+    inheritableStatics: {
+        getRecord: function(node) {
+            return this.getBoundView(node).getRecord(node);
+        },
+
+        getBoundView: function(node) {
+            return Ext.getCmp(node.boundView);
+        }
+    },
+
+    /**
+     * @cfg {String/String[]/Ext.XTemplate} tpl (required)
+     * The HTML fragment or an array of fragments that will make up the template used by this DataView.  This should
+     * be specified in the same format expected by the constructor of {@link Ext.XTemplate}.
+     * @since 2.3.0
+     */
+    /**
+     * @cfg {Ext.data.Store} store (required)
+     * The {@link Ext.data.Store} to bind this DataView to.
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {Boolean} deferInitialRefresh
+     * <p>Defaults to <code>true</code> to defer the initial refresh of the view.</p>
+     * <p>This allows the View to execute its render and initial layout more quickly because the process will not be encumbered
+     * by the expensive update of the view structure.</p>
+     * <p><b>Important: </b>Be aware that this will mean that the View's item elements will not be available immediately upon render, so
+     * <i>selection</i> may not take place at render time. To access a View's item elements as soon as possible, use the {@link #viewready} event.
+     * Or set <code>deferInitialrefresh</code> to false, but this will be at the cost of slower rendering.</p>
+     */
+    deferInitialRefresh: true,
+
+    /**
+     * @cfg {String} itemSelector (required)
+     * <b>This is a required setting</b>. A simple CSS selector (e.g. <tt>div.some-class</tt> or
+     * <tt>span:first-child</tt>) that will be used to determine what nodes this DataView will be
+     * working with. The itemSelector is used to map DOM nodes to records. As such, there should
+     * only be one root level element that matches the selector for each record.
+     * @since 2.3.0
+     */
+
+    /**
+     * @cfg {String} itemCls
+     * Specifies the class to be assigned to each element in the view when used in conjunction with the
+     * {@link #itemTpl} configuration.
+     * @since 2.3.0
+     */
+    itemCls: Ext.baseCSSPrefix + 'dataview-item',
+
+    /**
+     * @cfg {String/String[]/Ext.XTemplate} itemTpl
+     * The inner portion of the item template to be rendered. Follows an XTemplate
+     * structure and will be placed inside of a tpl.
+     */
+
+    /**
+     * @cfg {String} overItemCls
+     * A CSS class to apply to each item in the view on mouseover.
+     * Setting this will automatically set {@link #trackOver} to `true`.
+     */
+
+    //<locale>
+    /**
+     * @cfg {String} loadingText
+     * A string to display during data load operations.  If specified, this text will be
+     * displayed in a loading div and the view's contents will be cleared while loading, otherwise the view's
+     * contents will continue to display normally until the new data is loaded and the contents are replaced.
+     * @since 2.3.0
+     */
+    loadingText: 'Loading...',
+    //</locale>
+
+    /**
+     * @cfg {Boolean/Object} loadMask
+     * False to disable a load mask from displaying while the view is loading. This can also be a
+     * {@link Ext.LoadMask} configuration object.
+     */
+    loadMask: true,
+
+    /**
+     * @cfg {String} loadingCls
+     * The CSS class to apply to the loading message element. Defaults to Ext.LoadMask.prototype.msgCls "x-mask-loading".
+     */
+
+    /**
+     * @cfg {Boolean} loadingUseMsg
+     * Whether or not to use the loading message.
+     * @private
+     */
+    loadingUseMsg: true,
+
+
+    /**
+     * @cfg {Number} loadingHeight
+     * If specified, gives an explicit height for the data view when it is showing the {@link #loadingText},
+     * if that is specified. This is useful to prevent the view's height from collapsing to zero when the
+     * loading mask is applied and there are no other contents in the data view.
+     */
+
+    /**
+     * @cfg {String} selectedItemCls
+     * A CSS class to apply to each selected item in the view.
+     */
+    selectedItemCls: Ext.baseCSSPrefix + 'item-selected',
+
+    //<locale>
+    /**
+     * @cfg {String} emptyText
+     * The text to display in the view when there is no data to display.
+     * Note that when using local data the emptyText will not be displayed unless you set
+     * the {@link #deferEmptyText} option to false.
+     * @since 2.3.0
+     */
+    emptyText: "",
+    //</locale>
+
+    /**
+     * @cfg {Boolean} deferEmptyText
+     * True to defer emptyText being applied until the store's first load.
+     * @since 2.3.0
+     */
+    deferEmptyText: true,
+
+    /**
+     * @cfg {Boolean} trackOver
+     * When `true` the {@link #overItemCls} will be applied to rows when hovered over.
+     * This in return will also cause {@link Ext.view.View#highlightitem highlightitem} and
+     * {@link Ext.view.View#unhighlightitem unhighlightitem} events to be fired.
+     *
+     * Enabled automatically when the {@link #overItemCls} config is set.
+     *
+     * @since 2.3.0
+     */
+    trackOver: false,
+
+    /**
+     * @cfg {Boolean} blockRefresh
+     * Set this to true to ignore refresh events on the bound store. This is useful if
+     * you wish to provide custom transition animations via a plugin
+     * @since 3.4.0
+     */
+    blockRefresh: false,
+
+    /**
+     * @cfg {Boolean} disableSelection
+     * True to disable selection within the DataView. This configuration will lock the selection model
+     * that the DataView uses.
+     */
+
+    /**
+     * @cfg {Boolean} preserveScrollOnRefresh
+     * True to preserve scroll position across refresh operations.
+     */
+    preserveScrollOnRefresh: false,
+
+    //private
+    last: false,
+
+    triggerEvent: 'itemclick',
+    triggerCtEvent: 'containerclick',
+
+    addCmpEvents: function() {
+
+    },
+
+    // private
+    initComponent : function(){
+        var me = this,
+            isDef = Ext.isDefined,
+            itemTpl = me.itemTpl,
+            memberFn = {};
+
+        if (itemTpl) {
+            if (Ext.isArray(itemTpl)) {
+                // string array
+                itemTpl = itemTpl.join('');
+            } else if (Ext.isObject(itemTpl)) {
+                // tpl instance
+                memberFn = Ext.apply(memberFn, itemTpl.initialConfig);
+                itemTpl = itemTpl.html;
+            }
+
+            if (!me.itemSelector) {
+                me.itemSelector = '.' + me.itemCls;
+            }
+
+            itemTpl = Ext.String.format('<tpl for="."><div class="{0}">{1}</div></tpl>', me.itemCls, itemTpl);
+            me.tpl = new Ext.XTemplate(itemTpl, memberFn);
+        }
+
+        if (!isDef(me.tpl) || !isDef(me.itemSelector)) {
+            Ext.Error.raise({
+                sourceClass: 'Ext.view.View',
+                tpl: me.tpl,
+                itemSelector: me.itemSelector,
+                msg: "DataView requires both tpl and itemSelector configurations to be defined."
+            });
+        }
+
+        me.callParent();
+        me.tpl = me.getTpl('tpl');
+
+        // backwards compat alias for overClass/selectedClass
+        // TODO: Consider support for overCls generation Ext.Component config
+        if (isDef(me.overCls) || isDef(me.overClass)) {
+            if (Ext.isDefined(Ext.global.console)) {
+                Ext.global.console.warn('Ext.view.View: Using the deprecated overCls or overClass configuration. Use overItemCls instead.');
+            }
+            me.overItemCls = me.overCls || me.overClass;
+            delete me.overCls;
+            delete me.overClass;
+        }
+
+        if (isDef(me.selectedCls) || isDef(me.selectedClass)) {
+            if (Ext.isDefined(Ext.global.console)) {
+                Ext.global.console.warn('Ext.view.View: Using the deprecated selectedCls or selectedClass configuration. Use selectedItemCls instead.');
+            }
+            me.selectedItemCls = me.selectedCls || me.selectedClass;
+            delete me.selectedCls;
+            delete me.selectedClass;
+        }
+        
+        if (me.overItemCls) {
+            me.trackOver = true;
+        }
+
+        me.addEvents(
+            /**
+             * @event beforerefresh
+             * Fires before the view is refreshed
+             * @param {Ext.view.View} this The DataView object
+             */
+            'beforerefresh',
+            /**
+             * @event refresh
+             * Fires when the view is refreshed
+             * @param {Ext.view.View} this The DataView object
+             */
+            'refresh',
+            /**
+             * @event viewready
+             * Fires when the View's item elements representing Store items has been rendered. If the {@link #deferInitialRefresh} flag
+             * was set (and it is <code>true</code> by default), this will be <b>after</b> initial render, and no items will be available
+             * for selection until this event fires.
+             * @param {Ext.view.View} this
+             */
+            'viewready',
+            /**
+             * @event itemupdate
+             * Fires when the node associated with an individual record is updated
+             * @param {Ext.data.Model} record The model instance
+             * @param {Number} index The index of the record/node
+             * @param {HTMLElement} node The node that has just been updated
+             */
+            'itemupdate',
+            /**
+             * @event itemadd
+             * Fires when the nodes associated with an recordset have been added to the underlying store
+             * @param {Ext.data.Model[]} records The model instance
+             * @param {Number} index The index at which the set of record/nodes starts
+             * @param {HTMLElement[]} node The node that has just been updated
+             */
+            'itemadd',
+            /**
+             * @event itemremove
+             * Fires when the node associated with an individual record is removed
+             * @param {Ext.data.Model} record The model instance
+             * @param {Number} index The index of the record/node
+             */
+            'itemremove'
+        );
+
+        me.addCmpEvents();
+
+        // Look up the configured Store. If none configured, use the fieldless, empty Store defined in Ext.data.Store.
+        me.store = Ext.data.StoreManager.lookup(me.store || 'ext-empty-store');
+
+        // Use the provided store as the data source unless a Feature or plugin has injected a special one
+        if (!me.dataSource) {
+            me.dataSource = me.store;
+        }
+        // Bind to the data  source. Cache it by the property name "dataSource".
+        // The store property is public and must reference the provided store.
+        me.bindStore(me.dataSource, true, 'dataSource');
+        if (!me.all) {
+            me.all = new Ext.CompositeElementLite();
+        }
+
+        // We track the scroll position
+        me.scrollState = {
+            top: 0,
+            left: 0
+        };
+        me.on({
+            scroll: me.onViewScroll,
+            element: 'el',
+            scope: me
+        });
+    },
+
+    onRender: function() {
+        var me = this,
+            mask = me.loadMask,
+            maskStore = me.getMaskStore(),
+            cfg = {
+                target: me,
+                msg: me.loadingText,
+                msgCls: me.loadingCls,
+                useMsg: me.loadingUseMsg,
+                // The store gets bound in initComponent, so while
+                // rendering let's push on the store
+                store: maskStore
+            };
+
+        me.callParent(arguments);
+
+        if (mask && !maskStore.proxy.isSynchronous) {
+            // either a config object 
+            if (Ext.isObject(mask)) {
+                cfg = Ext.apply(cfg, mask);
+            }
+            // Attach the LoadMask to a *Component* so that it can be sensitive to resizing during long loads.
+            // If this DataView is floating, then mask this DataView.
+            // Otherwise, mask its owning Container (or this, if there *is* no owning Container).
+            // LoadMask captures the element upon render.
+            me.loadMask = new Ext.LoadMask(cfg);
+            me.loadMask.on({
+                scope: me,
+                beforeshow: me.onMaskBeforeShow,
+                hide: me.onMaskHide
+            });
+        }
+    },
+    
+    finishRender: function() {
+        var me = this;
+        me.callParent(arguments);
+        // Kick off the refresh before layouts are resumed after the render 
+        // completes, but after afterrender is fired on the view
+        if (!me.up('[collapsed],[hidden]')) {
+            me.doFirstRefresh(me.dataSource);
+        }
+    },
+
+    onBoxReady: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // If the refresh was not kicked off on render due to a collapsed or hidden ancestor,
+        // kick it off as soon as we get layed out
+        if (!me.firstRefreshDone) {
+            me.doFirstRefresh(me.dataSource);
+        }
+    },
+
+    getMaskStore: function(){
+        return this.store;    
+    },
+
+    onMaskBeforeShow: function(){
+        var me = this,
+            loadingHeight = me.loadingHeight;
+
+        if (loadingHeight && loadingHeight > me.getHeight()) {
+            me.hasLoadingHeight = true;
+            me.oldMinHeight = me.minHeight;
+            me.minHeight = loadingHeight;
+            me.updateLayout();
+        }
+    },
+
+    onMaskHide: function(){
+        var me = this;
+
+        if (!me.destroying && me.hasLoadingHeight) {
+            me.minHeight = me.oldMinHeight;
+            me.updateLayout();
+            delete me.hasLoadingHeight;
+        }
+    },
+
+    beforeRender: function() {
+        this.callParent(arguments);
+        this.getSelectionModel().beforeViewRender(this);
+    },
+
+    afterRender: function() {
+        this.callParent(arguments);
+
+        // Init the SelectionModel after any on('render') listeners have been added.
+        // Drag plugins create a DragDrop instance in a render listener, and that needs
+        // to see an itemmousedown event first.
+        this.getSelectionModel().bindComponent(this);
+    },
+
+    /**
+     * Gets the selection model for this view.
+     * @return {Ext.selection.Model} The selection model
+     */
+    getSelectionModel: function(){
+        var me = this,
+            mode = 'SINGLE';
+
+        if (me.simpleSelect) {
+            mode = 'SIMPLE';
+        } else if (me.multiSelect) {
+            mode = 'MULTI';
+        }
+
+        // No selModel specified, or it's just a config; Instantiate
+        if (!me.selModel || !me.selModel.events) {
+            me.selModel = new Ext.selection.DataViewModel(Ext.apply({
+                allowDeselect: me.allowDeselect,
+                mode: mode
+            }, me.selModel));
+        }
+
+        if (!me.selModel.hasRelaySetup) {
+            me.relayEvents(me.selModel, [
+                'selectionchange', 'beforeselect', 'beforedeselect', 'select', 'deselect', 'focuschange'
+            ]);
+            me.selModel.hasRelaySetup = true;
+        }
+
+        // lock the selection model if user
+        // has disabled selection
+        if (me.disableSelection) {
+            me.selModel.locked = true;
+        }
+
+        return me.selModel;
+    },
+
+    /**
+     * Refreshes the view by reloading the data from the store and re-rendering the template.
+     * @since 2.3.0
+     */
+    refresh: function() {
+        var me = this,
+            targetEl,
+            targetParent,
+            oldDisplay,
+            nextSibling,
+            dom,
+            records;
+
+        if (!me.rendered || me.isDestroyed) {
+            return;
+        }
+
+        if (!me.hasListeners.beforerefresh || me.fireEvent('beforerefresh', me) !== false) {
+            targetEl = me.getTargetEl();
+            records = me.getViewRange();
+            dom = targetEl.dom;
+
+            // Updating is much quicker if done when the targetEl is detached from the document, and not displayed.
+            // But this resets the scroll position, so when preserving scroll position, this cannot be done.
+            if (!me.preserveScrollOnRefresh) {
+                targetParent = dom.parentNode;
+                oldDisplay = dom.style.display;
+                dom.style.display = 'none';
+                nextSibling = dom.nextSibling;
+                targetParent.removeChild(dom);
+            }
+
+            if (me.refreshCounter) {
+                me.clearViewEl();
+            } else {
+                me.fixedNodes = targetEl.dom.childNodes.length;
+                me.refreshCounter = 1;
+            }
+
+            // Always attempt to create the required markup after the fixedNodes.
+            // Usually, for an empty record set, this would be blank, but when the Template
+            // Creates markup outside of the record loop, this must still be honoured even if there are no
+            // records.
+            me.tpl.append(targetEl, me.collectData(records, me.all.startIndex));
+
+            // The emptyText is now appended to the View's element
+            // after any fixedNodes.
+            if (records.length < 1) {
+                // Process empty text unless the store is being cleared.
+                if (!this.store.loading && (!me.deferEmptyText || me.hasFirstRefresh)) {
+                    Ext.core.DomHelper.insertHtml('beforeEnd', targetEl.dom, me.emptyText);
+                }
+                me.all.clear();
+            } else {
+                me.collectNodes(targetEl.dom);
+                me.updateIndexes(0);
+            }
+
+            // Don't need to do this on the first refresh
+            if (me.hasFirstRefresh) {
+                // Some subclasses do not need to do this. TableView does not need to do this.
+                if (me.refreshSelmodelOnRefresh !== false) {
+                    me.selModel.refresh();
+                } else {
+                    // However, even if that is not needed, pruning if pruneRemoved is true (the default) still needs doing.
+                    me.selModel.pruneIf();
+                }
+            }
+
+            me.hasFirstRefresh = true;
+
+            if (!me.preserveScrollOnRefresh) {
+                targetParent.insertBefore(dom, nextSibling);
+                dom.style.display = oldDisplay;
+            }
+
+            // Ensure layout system knows about new content size
+            this.refreshSize();
+
+            me.fireEvent('refresh', me);
+
+            // Upon first refresh, fire the viewready event.
+            // Reconfiguring the grid "renews" this event.
+            if (!me.viewReady) {
+                // Fire an event when deferred content becomes available.
+                // This supports grid Panel's deferRowRender capability
+                me.viewReady = true;
+                me.fireEvent('viewready', me);
+            }
+        }
+    },
+
+    // Private
+    // Called by refresh to collect the view item nodes.
+    collectNodes: function(targetEl) {
+        this.all.fill(Ext.query(this.getItemSelector(), Ext.getDom(targetEl)), this.all.startIndex);
+    },
+
+    getViewRange: function() {
+        return this.dataSource.getRange();
+    },
+
+    /**
+     * @private
+     * Called by the framework when the view is refreshed, or when rows are added or deleted.
+     * 
+     * These operations may cause the view's dimensions to change, and if the owning container
+     * is shrinkwrapping this view, then the layout must be updated to accommodate these new dimensions.
+     */
+    refreshSize: function() {
+        var sizeModel = this.getSizeModel();
+        if (sizeModel.height.shrinkWrap || sizeModel.width.shrinkWrap) {
+            this.updateLayout();
+        }
+    },
+
+    clearViewEl: function(){
+        // The purpose of this is to allow boilerplate HTML nodes to remain in place inside a View
+        // while the transient, templated data can be discarded and recreated.
+        // The first time through this code, we take a count of the number of existing child nodes.
+        // Subsequent refreshes then do not clear the entire element, but remove all nodes
+        // *after* the fixedNodes count.
+        // In particular, this is used in infinite grid scrolling: A very tall "stretcher" element is
+        // inserted into the View's element to create a scrollbar of the correct proportion.
+
+        var me = this,
+            el = me.getTargetEl();
+
+        if (me.fixedNodes) {
+            while (el.dom.childNodes[me.fixedNodes]) {
+                el.dom.removeChild(el.dom.childNodes[me.fixedNodes]);
+            }
+        } else {
+            el.update('');
+        }
+        me.refreshCounter++;
+    },
+
+    // Private template method to be overridden in subclasses.
+    onViewScroll: Ext.emptyFn,
+    
+    onIdChanged: Ext.emptyFn,
+
+    /**
+     * Saves the scrollState in a private variable. Must be used in conjunction with restoreScrollState.
+     * @private
+     */
+    saveScrollState: function() {
+        if (this.rendered) {
+            var dom = this.el.dom,
+                state = this.scrollState;
+
+            state.left = dom.scrollLeft;
+            state.top = dom.scrollTop;
+        }
+    },
+
+    /**
+     * Restores the scrollState.
+     * Must be used in conjunction with saveScrollState
+     * @private
+     */
+    restoreScrollState: function() {
+        if (this.rendered) {
+            var dom = this.el.dom, 
+                state = this.scrollState;
+
+            dom.scrollLeft = state.left;
+            dom.scrollTop = state.top;
+        }
+    },
+
+    /**
+     * Function which can be overridden to provide custom formatting for each Record that is used by this
+     * DataView's {@link #tpl template} to render each node.
+     * @param {Object/Object[]} data The raw data object that was used to create the Record.
+     * @param {Number} recordIndex the index number of the Record being prepared for rendering.
+     * @param {Ext.data.Model} record The Record being prepared for rendering.
+     * @return {Array/Object} The formatted data in a format expected by the internal {@link #tpl template}'s overwrite() method.
+     * (either an array if your params are numeric (i.e. {0}) or an object (i.e. {foo: 'bar'}))
+     * @since 2.3.0
+     */
+    prepareData: function(data, index, record) {
+        var associatedData, attr, hasCopied;
+        if (record) {
+            associatedData = record.getAssociatedData();
+            for (attr in associatedData) {
+                if (associatedData.hasOwnProperty(attr)) {
+                    // This would be better done in collectData, however
+                    // we only need to copy the data object if we have any associations,
+                    // so we optimize it by only copying if we must.
+                    // We do this so we don't mutate the underlying record.data
+                    if (!hasCopied) {
+                        data = Ext.Object.chain(data);
+                        hasCopied = true;
+                    }
+                    data[attr] = associatedData[attr];
+                }
+            }
+        }
+        return data;
+    },
+
+    /**
+     * Function which can be overridden which returns the data object passed to this
+     * DataView's {@link #cfg-tpl template} to render the whole DataView.
+     * 
+     * This is usually an Array of data objects, each element of which is processed by an
+     * {@link Ext.XTemplate XTemplate} which uses `'<tpl for=".">'` to iterate over its supplied
+     * data object as an Array. However, <i>named</i> properties may be placed into the data object to
+     * provide non-repeating data such as headings, totals etc.
+     * 
+     * @param {Ext.data.Model[]} records An Array of {@link Ext.data.Model}s to be rendered into the DataView.
+     * @param {Number} startIndex the index number of the Record being prepared for rendering.
+     * @return {Object[]} An Array of data objects to be processed by a repeating XTemplate. May also
+     * contain <i>named</i> properties.
+     * @since 2.3.0
+     */
+    collectData: function(records, startIndex){
+        var data = [],
+            i = 0,
+            len = records.length,
+            record;
+
+        for (; i < len; i++) {
+            record = records[i];
+            data[i] = this.prepareData(record.data, startIndex + i, record);
+        }
+        return data;
+    },
+
+    // private
+    bufferRender : function(records, index) {
+        var me = this,
+            div = me.renderBuffer || (me.renderBuffer = document.createElement('div'));
+
+        me.tpl.overwrite(div, me.collectData(records, index));
+        return  Ext.DomQuery.select(me.getItemSelector(), div);
+    },
+    
+    getNodeContainer: function() {
+        return this.getTargetEl();
+    },
+
+    // private
+    onUpdate : function(ds, record){
+        var me = this,
+            index,
+            node;
+
+        if (me.viewReady) {
+            index = me.dataSource.indexOf(record);
+            if (index > -1) {
+                node = me.bufferRender([record], index)[0];
+                // ensure the node actually exists in the DOM
+                if (me.getNode(record)) {
+                    me.all.replaceElement(index, node, true);
+                    me.updateIndexes(index, index);
+                    // Maintain selection after update
+                    me.selModel.onUpdate(record);
+                    if (me.hasListeners.itemupdate) {
+                        me.fireEvent('itemupdate', record, index, node);
+                    }
+                    return node;
+                }
+            }
+        }
+
+    },
+
+    // private
+    onAdd : function(store, records, index) {
+        var me = this,
+            nodes;
+
+        if (me.rendered) {
+            // If we are adding into an empty view, we must refresh in order that the *full tpl* is applied
+            // which might create boilerplate content *around* the record nodes.
+            if (me.all.getCount() === 0) {
+                me.refresh();
+                nodes = me.all.slice();
+            } else {
+                nodes = me.doAdd(records, index);
+                // Some subclasses do not need to do this. TableView does not need to do this.
+                if (me.refreshSelmodelOnRefresh !== false) {
+                    me.selModel.refresh();
+                }
+                me.updateIndexes(index);
+
+                // Ensure layout system knows about new content size
+                me.refreshSize();
+            }
+
+            if (me.hasListeners.itemadd) {
+                me.fireEvent('itemadd', records, index, nodes);
+            }
+        }
+
+    },
+
+    doAdd: function(records, index) {
+        var me = this,
+            nodes = me.bufferRender(records, index, true),
+            all = me.all,
+            count = all.getCount(),
+            i, l;
+
+        if (count === 0) {
+            for (i = 0, l = nodes.length; i < l; i++) {
+                this.getNodeContainer().appendChild(nodes[i]);
+            }
+        } else if (index < count) {
+            if (index === 0) {
+                all.item(index).insertSibling(nodes, 'before', true);
+            } else {
+                all.item(index - 1).insertSibling(nodes, 'after', true);
+            }
+        } else {
+            all.last().insertSibling(nodes, 'after', true);
+        }
+
+        all.insert(index, nodes);
+        return nodes;
+    },
+
+    // private
+    onRemove : function(ds, records, indexes) {
+        var me = this,
+            fireItemRemove = me.hasListeners.itemremove,
+            i,
+            record,
+            index;
+
+        if (me.all.getCount()) {
+            if (me.dataSource.getCount() === 0) {
+                // Refresh so emptyText can be applied if necessary
+                if (fireItemRemove) {
+                    for (i = indexes.length - 1; i >= 0; --i) {
+                        me.fireEvent('itemremove', records[i], indexes[i]);
+                    }
+                }
+                me.refresh();
+            } else {
+                // Just remove the elements which corresponds to the removed records
+                // The tpl's full HTML will still be in place.
+                for (i = indexes.length - 1; i >= 0; --i) {
+                    record = records[i];
+                    index = indexes[i];
+                    me.doRemove(record, index);
+                    if (fireItemRemove) {
+                        me.fireEvent('itemremove', record, index);
+                    }
+                }
+                me.updateIndexes(indexes[0]);
+            }
+
+            // Ensure layout system knows about new content height
+            this.refreshSize();
+        }
+    },
+
+    // private
+    doRemove: function(record, index) {
+        this.all.removeElement(index, true);
+    },
+
+    /**
+     * Refreshes an individual node's data from the store.
+     * @param {Number} index The item's data index in the store
+     * @since 2.3.0
+     */
+    refreshNode : function(index) {
+        this.onUpdate(this.dataSource, this.dataSource.getAt(index));
+    },
+
+    // private
+    updateIndexes : function(startIndex, endIndex) {
+        var nodes = this.all.elements,
+            records = this.getViewRange(),
+            i;
+
+        startIndex = startIndex || 0;
+        endIndex = endIndex || ((endIndex === 0) ? 0 : (nodes.length - 1));
+        for (i = startIndex; i <= endIndex; i++) {
+            nodes[i].viewIndex = i;
+            nodes[i].viewRecordId = records[i].internalId;
+            if (!nodes[i].boundView) {
+                nodes[i].boundView = this.id;
+            }
+        }
+    },
+
+    /**
+     * Returns the store associated with this DataView.
+     * @return {Ext.data.Store} The store
+     */
+    getStore : function() {
+        return this.store;
+    },
+
+    /**
+     * Changes the data store bound to this view and refreshes it.
+     * @param {Ext.data.Store} store The store to bind to this view
+     * @since 3.4.0
+     */
+    bindStore : function(store, initial, propName) {
+        var me = this;
+        me.mixins.bindable.bindStore.apply(me, arguments);
+
+        // Bind the store to our selection model unless it's the initial bind.
+        // Initial bind takes place afterRender
+        if (!initial) {
+            me.getSelectionModel().bindStore(store);
+        }
+
+        // If we have already achieved our first layout, refresh immediately.
+        // If we have bound to the Store before the first layout, then onBoxReady will
+        // call doFirstRefresh
+        if (me.componentLayoutCounter) {
+            me.doFirstRefresh(store);
+        }
+    },
+
+    /**
+     * @private
+     * Perform the first refresh of the View from a newly bound store.
+     * 
+     * This is called when this View has been sized for the first time.
+     */
+    doFirstRefresh: function(store) {
+        var me = this;
+
+        // Flag to prevent a second "first" refresh from onBoxReady
+        me.firstRefreshDone = true;
+
+        // 4.1.0: If we have a store, and the Store is *NOT* already loading (a refresh is on the way), then
+        // on first layout, refresh regardless of record count.
+        // Template may contain boilerplate HTML outside of record iteration loop.
+        // Also, emptyText is appended by the refresh method.
+        // We call refresh on a defer if this is the initial call, and we are configured to defer the initial refresh.
+        if (store && !store.loading) {
+            if (me.deferInitialRefresh) {
+                me.applyFirstRefresh();
+            } else {
+                me.refresh();
+            }
+        }
+    },
+    
+    applyFirstRefresh: function(){
+        var me = this;
+        if (me.isDestroyed) {
+            return;
+        }
+        
+        // In the case of an animated collapse/expand, the layout will
+        // be marked as though it's complete, yet the element itself may
+        // still be animating, which means we could trigger a layout while
+        // everything is not in the correct place. As such, wait until the
+        // animation has finished before kicking off the refresh. The problem
+        // occurs because both the refresh and the animation are running on
+        // a timer which makes it impossible to control the order of when
+        // the refresh is fired.
+        if (me.up('[isCollapsingOrExpanding]')) {
+            Ext.Function.defer(me.applyFirstRefresh, 100, me);
+        } else {
+            Ext.Function.defer(function () {
+                if (!me.isDestroyed) {
+                    me.refresh();
+                }
+            }, 1);
+        }
+    },
+
+    onUnbindStore: function(store) {
+        this.setMaskBind(null);
+    },
+
+    onBindStore: function(store, initial, propName) {
+        this.setMaskBind(store);
+        if (!initial && propName === 'store') {
+            this.bindStore(store, false, 'dataSource');
+        }
+    },
+
+    setMaskBind: function(store) {
+        var mask = this.loadMask;
+        if (mask && mask.bindStore) {
+            mask.bindStore(store);
+        }
+    },
+
+    getStoreListeners: function() {
+        var me = this;
+        return {
+            idchanged: me.onIdChanged,
+            refresh: me.onDataRefresh,
+            add: me.onAdd,
+            bulkremove: me.onRemove,
+            update: me.onUpdate,
+            clear: me.refresh
+        };
+    },
+
+    /**
+     * @private
+     * Calls this.refresh if this.blockRefresh is not true
+     * @since 3.4.0
+     */
+    onDataRefresh: function() {
+        this.refreshView();
+    },
+    
+    refreshView: function() {
+        var me = this,
+            // If we have an ancestor in a non-boxready state (collapsed or in-transition, or hidden), and we are still waiting
+            // for the first refresh, then block the refresh because that first visible, expanded layout will trigger the refresh
+            blockedByAncestor = !me.firstRefreshDone && (!me.rendered || me.up('[collapsed],[isCollapsingOrExpanding],[hidden]'));
+
+        // If are blocking *an initial refresh* because of an ancestor in a non-boxready state,
+        // then cancel any defer on the initial refresh that is going to happen on boxReady - that will be a data-driven refresh, NOT
+        // a render-time, delayable refresh. This is particularly important if the boxready occurs because of the "preflight" layout
+        // of an animated expand. If refresh is delayed it occur during the expand animation and cause errors.
+        if (blockedByAncestor) {
+            me.deferInitialRefresh = false;
+        } else if (me.blockRefresh !== true) {
+            me.firstRefreshDone = true;
+            me.refresh();
+        }
+    },
+
+    /**
+     * Returns the template node the passed child belongs to, or null if it doesn't belong to one.
+     * @param {HTMLElement} node
+     * @return {HTMLElement} The template node
+     */
+    findItemByChild: function(node){
+        return Ext.fly(node).findParent(this.getItemSelector(), this.getTargetEl());
+    },
+
+    /**
+     * Returns the template node by the Ext.EventObject or null if it is not found.
+     * @param {Ext.EventObject} e
+     */
+    findTargetByEvent: function(e) {
+        return e.getTarget(this.getItemSelector(), this.getTargetEl());
+    },
+
+
+    /**
+     * Gets the currently selected nodes.
+     * @return {HTMLElement[]} An array of HTMLElements
+     * @since 2.3.0
+     */
+    getSelectedNodes: function(){
+        var nodes   = [],
+            records = this.selModel.getSelection(),
+            ln = records.length,
+            i  = 0;
+
+        for (; i < ln; i++) {
+            nodes.push(this.getNode(records[i]));
+        }
+
+        return nodes;
+    },
+
+    /**
+     * Gets an array of the records from an array of nodes
+     * @param {HTMLElement[]} nodes The nodes to evaluate
+     * @return {Ext.data.Model[]} records The {@link Ext.data.Model} objects
+     * @since 2.3.0
+     */
+    getRecords: function(nodes) {
+        var records = [],
+            i = 0,
+            len = nodes.length,
+            data = this.dataSource.data;
+
+        for (; i < len; i++) {
+            records[records.length] = data.getByKey(nodes[i].viewRecordId);
+        }
+
+        return records;
+    },
+
+    /**
+     * Gets a record from a node
+     * @param {Ext.Element/HTMLElement} node The node to evaluate
+     *
+     * @return {Ext.data.Model} record The {@link Ext.data.Model} object
+     * @since 2.3.0
+     */
+    getRecord: function(node){
+        return this.dataSource.data.getByKey(Ext.getDom(node).viewRecordId);
+    },
+
+
+    /**
+     * Returns true if the passed node is selected, else false.
+     * @param {HTMLElement/Number/Ext.data.Model} node The node, node index or record to check
+     * @return {Boolean} True if selected, else false
+     * @since 2.3.0
+     */
+    isSelected : function(node) {
+        // TODO: El/Idx/Record
+        var r = this.getRecord(node);
+        return this.selModel.isSelected(r);
+    },
+
+    /**
+     * Selects a record instance by record instance or index.
+     * @param {Ext.data.Model[]/Number} records An array of records or an index
+     * @param {Boolean} keepExisting
+     * @param {Boolean} suppressEvent Set to false to not fire a select event
+     * @deprecated 4.0 Use {@link Ext.selection.Model#select} instead.
+     * @since 2.3.0
+     */
+    select: function(records, keepExisting, suppressEvent) {
+        this.selModel.select(records, keepExisting, suppressEvent);
+    },
+
+    /**
+     * Deselects a record instance by record instance or index.
+     * @param {Ext.data.Model[]/Number} records An array of records or an index
+     * @param {Boolean} suppressEvent Set to false to not fire a deselect event
+     * @since 2.3.0
+     */
+    deselect: function(records, suppressEvent) {
+        this.selModel.deselect(records, suppressEvent);
+    },
+
+    /**
+     * Gets a template node.
+     * @param {HTMLElement/String/Number/Ext.data.Model} nodeInfo An HTMLElement template node, index of a template node,
+     * the id of a template node or the record associated with the node.
+     * @return {HTMLElement} The node or null if it wasn't found
+     * @since 2.3.0
+     */
+    getNode : function(nodeInfo) {
+        if ((!nodeInfo && nodeInfo !== 0) || !this.rendered) {
+            return null;
+        }
+
+        if (Ext.isString(nodeInfo)) {
+            return document.getElementById(nodeInfo);
+        }
+        if (Ext.isNumber(nodeInfo)) {
+            return this.all.elements[nodeInfo];
+        }
+        if (nodeInfo.isModel) {
+            return this.getNodeByRecord(nodeInfo);
+        }
+        return nodeInfo; // already an HTMLElement
+    },
+
+    /**
+     * @private
+     */
+    getNodeByRecord: function(record) {
+        var ns = this.all.elements,
+            ln = ns.length,
+            i = 0;
+
+        for (; i < ln; i++) {
+            if (ns[i].viewRecordId === record.internalId) {
+                return ns[i];
+            }
+        }
+
+        return null;
+    },
+
+    /**
+     * Gets a range nodes.
+     * @param {Number} start (optional) The index of the first node in the range
+     * @param {Number} end (optional) The index of the last node in the range
+     * @return {HTMLElement[]} An array of nodes
+     * @since 2.3.0
+     */
+    getNodes: function(start, end) {
+        var all = this.all;
+
+        if (end === undefined) {
+            end = all.getCount();
+        } else {
+            end++;
+        }
+        return all.slice(start||0, end);
+    },
+
+    /**
+     * Finds the index of the passed node.
+     * @param {HTMLElement/String/Number/Ext.data.Model} nodeInfo An HTMLElement template node, index of a template node, the id of a template node
+     * or a record associated with a node.
+     * @return {Number} The index of the node or -1
+     * @since 2.3.0
+     */
+    indexOf: function(node) {
+        node = this.getNode(node);
+        if (!node && node !== 0) {
+            return -1;
+        }
+        if (Ext.isNumber(node.viewIndex)) {
+            return node.viewIndex;
+        }
+        return this.all.indexOf(node);
+    },
+
+    onDestroy : function() {
+        var me = this;
+
+        me.all.clear();
+        me.callParent();
+        me.bindStore(null);
+        me.selModel.destroy();
+    },
+
+    // invoked by the selection model to maintain visual UI cues
+    onItemSelect: function(record) {
+        var node = this.getNode(record);
+
+        if (node) {
+            Ext.fly(node).addCls(this.selectedItemCls);
+        }
+    },
+
+    // invoked by the selection model to maintain visual UI cues
+    onItemDeselect: function(record) {
+        var node = this.getNode(record);
+
+        if (node) {
+            Ext.fly(node).removeCls(this.selectedItemCls);
+        }
+    },
+
+    getItemSelector: function() {
+        return this.itemSelector;
+    }
+}, function() {
+    // all of this information is available directly
+    // from the SelectionModel itself, the only added methods
+    // to DataView regarding selection will perform some transformation/lookup
+    // between HTMLElement/Nodes to records and vice versa.
+    Ext.deprecate('extjs', '4.0', function() {
+        Ext.view.AbstractView.override({
+            /**
+             * @cfg {Boolean} [multiSelect=false]
+             * True to allow selection of more than one item at a time, false to allow selection of only a single item
+             * at a time or no selection at all, depending on the value of {@link #singleSelect}.
+             * @deprecated 4.0 Use {@link Ext.selection.Model#mode} 'MULTI' instead.
+             * @since 2.3.0
+             */
+            /**
+             * @cfg {Boolean} [singleSelect]
+             * Allows selection of exactly one item at a time. As this is the default selection mode anyway, this config
+             * is completely ignored.
+             * @removed 4.0 Use {@link Ext.selection.Model#mode} 'SINGLE' instead.
+             * @since 2.3.0
+             */
+            /**
+             * @cfg {Boolean} [simpleSelect=false]
+             * True to enable multiselection by clicking on multiple items without requiring the user to hold Shift or Ctrl,
+             * false to force the user to hold Ctrl or Shift to select more than on item.
+             * @deprecated 4.0 Use {@link Ext.selection.Model#mode} 'SIMPLE' instead.
+             * @since 2.3.0
+             */
+
+            /**
+             * Gets the number of selected nodes.
+             * @return {Number} The node count
+             * @deprecated 4.0 Use {@link Ext.selection.Model#getCount} instead.
+             * @since 2.3.0
+             */
+            getSelectionCount : function(){
+                if (Ext.global.console) {
+                    Ext.global.console.warn("DataView: getSelectionCount will be removed, please interact with the Ext.selection.DataViewModel");
+                }
+                return this.selModel.getSelection().length;
+            },
+
+            /**
+             * Gets an array of the selected records
+             * @return {Ext.data.Model[]} An array of {@link Ext.data.Model} objects
+             * @deprecated 4.0 Use {@link Ext.selection.Model#getSelection} instead.
+             * @since 2.3.0
+             */
+            getSelectedRecords : function(){
+                if (Ext.global.console) {
+                    Ext.global.console.warn("DataView: getSelectedRecords will be removed, please interact with the Ext.selection.DataViewModel");
+                }
+                return this.selModel.getSelection();
+            },
+
+            // documented above
+            // @ignore
+            select: function(records, keepExisting, supressEvents) {
+                if (Ext.global.console) {
+                    Ext.global.console.warn("DataView: select will be removed, please access select through a DataView's SelectionModel, ie: view.getSelectionModel().select()");
+                }
+                var sm = this.getSelectionModel();
+                return sm.select.apply(sm, arguments);
+            },
+
+            /**
+             * Deselects all selected records.
+             * @deprecated 4.0 Use {@link Ext.selection.Model#deselectAll} instead.
+             * @since 2.3.0
+             */
+            clearSelections: function() {
+                if (Ext.global.console) {
+                    Ext.global.console.warn("DataView: clearSelections will be removed, please access deselectAll through DataView's SelectionModel, ie: view.getSelectionModel().deselectAll()");
+                }
+                var sm = this.getSelectionModel();
+                return sm.deselectAll();
+            }
+        });
+    });
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A mechanism for displaying data using custom layout templates and formatting.
+ *
+ * The View uses an {@link Ext.XTemplate} as its internal templating mechanism, and is bound to an
+ * {@link Ext.data.Store} so that as the data in the store changes the view is automatically updated
+ * to reflect the changes. The view also provides built-in behavior for many common events that can
+ * occur for its contained items including click, doubleclick, mouseover, mouseout, etc. as well as a
+ * built-in selection model. **In order to use these features, an {@link #itemSelector} config must
+ * be provided for the View to determine what nodes it will be working with.**
+ *
+ * The example below binds a View to a {@link Ext.data.Store} and renders it into an {@link Ext.panel.Panel}.
+ *
+ *     @example
+ *     Ext.define('Image', {
+ *         extend: 'Ext.data.Model',
+ *         fields: [
+ *             { name:'src', type:'string' },
+ *             { name:'caption', type:'string' }
+ *         ]
+ *     });
+ *
+ *     Ext.create('Ext.data.Store', {
+ *         id:'imagesStore',
+ *         model: 'Image',
+ *         data: [
+ *             { src:'http://www.sencha.com/img/20110215-feat-drawing.png', caption:'Drawing & Charts' },
+ *             { src:'http://www.sencha.com/img/20110215-feat-data.png', caption:'Advanced Data' },
+ *             { src:'http://www.sencha.com/img/20110215-feat-html5.png', caption:'Overhauled Theme' },
+ *             { src:'http://www.sencha.com/img/20110215-feat-perf.png', caption:'Performance Tuned' }
+ *         ]
+ *     });
+ *
+ *     var imageTpl = new Ext.XTemplate(
+ *         '<tpl for=".">',
+ *             '<div style="margin-bottom: 10px;" class="thumb-wrap">',
+ *               '<img src="{src}" />',
+ *               '<br/><span>{caption}</span>',
+ *             '</div>',
+ *         '</tpl>'
+ *     );
+ *
+ *     Ext.create('Ext.view.View', {
+ *         store: Ext.data.StoreManager.lookup('imagesStore'),
+ *         tpl: imageTpl,
+ *         itemSelector: 'div.thumb-wrap',
+ *         emptyText: 'No images available',
+ *         renderTo: Ext.getBody()
+ *     });
+ */
+Ext.define('Ext.view.View', {
+    extend:  Ext.view.AbstractView ,
+    alternateClassName: 'Ext.DataView',
+    alias: 'widget.dataview',
+
+    // private delay to buffer row highlighting/unhighlighting on mouse move.
+    // This is ignored if the public mouseOverOutBuffer remains a non-zero value
+    deferHighlight: Ext.isIE7m ? 100 : 0,
+
+    /**
+     * @cfg {Number} [mouseOverOutBuffer=20]
+     * The number of milliseconds to buffer mouseover and mouseout event handling on view items.
+     * 
+     * Configure this as `false` to process mouseover and mouseout events immediately.
+     */
+    mouseOverOutBuffer: 20,
+
+    inputTagRe: /^textarea$|^input$/i,
+
+    inheritableStatics: {
+        EventMap: {
+            mousedown: 'MouseDown',
+            mouseup: 'MouseUp',
+            click: 'Click',
+            dblclick: 'DblClick',
+            contextmenu: 'ContextMenu',
+            mouseover: 'MouseOver',
+            mouseout: 'MouseOut',
+            mouseenter: 'MouseEnter',
+            mouseleave: 'MouseLeave',
+            keydown: 'KeyDown',
+            focus: 'Focus'
+        }
+    },
+
+    initComponent: function() {
+        var me = this;
+        me.callParent();
+        
+        // 
+        if (me.mouseOverOutBuffer) {
+            me.handleMouseOverOrOut = 
+                Ext.Function.createBuffered(me.handleMouseOverOrOut, me.mouseOverOutBuffer, me);
+            me.lastMouseOverOutEvent = new Ext.EventObjectImpl();
+        }
+        
+        // Not buffering mouse over/out handling - buffer item highlighting.
+        else if (me.deferHighlight){
+            me.setHighlightedItem =
+                Ext.Function.createBuffered(me.setHighlightedItem, me.deferHighlight, me);
+        }
+    },
+
+    addCmpEvents: function() {
+        this.addEvents(
+            /**
+             * @event beforeitemmousedown
+             * Fires before the mousedown event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemmousedown',
+            /**
+             * @event beforeitemmouseup
+             * Fires before the mouseup event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemmouseup',
+            /**
+             * @event beforeitemmouseenter
+             * Fires before the mouseenter event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemmouseenter',
+            /**
+             * @event beforeitemmouseleave
+             * Fires before the mouseleave event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemmouseleave',
+            /**
+             * @event beforeitemclick
+             * Fires before the click event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemclick',
+            /**
+             * @event beforeitemdblclick
+             * Fires before the dblclick event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemdblclick',
+            /**
+             * @event beforeitemcontextmenu
+             * Fires before the contextmenu event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforeitemcontextmenu',
+            /**
+             * @event beforeitemkeydown
+             * Fires before the keydown event on an item is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object. Use {@link Ext.EventObject#getKey getKey()} to retrieve the key that was pressed.
+             */
+            'beforeitemkeydown',
+            /**
+             * @event itemmousedown
+             * Fires when there is a mouse down on an item
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemmousedown',
+            /**
+             * @event itemmouseup
+             * Fires when there is a mouse up on an item
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemmouseup',
+            /**
+             * @event itemmouseenter
+             * Fires when the mouse enters an item.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemmouseenter',
+            /**
+             * @event itemmouseleave
+             * Fires when the mouse leaves an item.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemmouseleave',
+            /**
+             * @event itemclick
+             * Fires when an item is clicked.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemclick',
+            /**
+             * @event itemdblclick
+             * Fires when an item is double clicked.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemdblclick',
+            /**
+             * @event itemcontextmenu
+             * Fires when an item is right clicked.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'itemcontextmenu',
+            /**
+             * @event itemkeydown
+             * Fires when a key is pressed while an item is currently selected.
+             * @param {Ext.view.View} this
+             * @param {Ext.data.Model} record The record that belongs to the item
+             * @param {HTMLElement} item The item's element
+             * @param {Number} index The item's index
+             * @param {Ext.EventObject} e The raw event object. Use {@link Ext.EventObject#getKey getKey()} to retrieve the key that was pressed.
+             */
+            'itemkeydown',
+            /**
+             * @event beforecontainermousedown
+             * Fires before the mousedown event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainermousedown',
+            /**
+             * @event beforecontainermouseup
+             * Fires before the mouseup event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainermouseup',
+            /**
+             * @event beforecontainermouseover
+             * Fires before the mouseover event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainermouseover',
+            /**
+             * @event beforecontainermouseout
+             * Fires before the mouseout event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainermouseout',
+            /**
+             * @event beforecontainerclick
+             * Fires before the click event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainerclick',
+            /**
+             * @event beforecontainerdblclick
+             * Fires before the dblclick event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainerdblclick',
+            /**
+             * @event beforecontainercontextmenu
+             * Fires before the contextmenu event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'beforecontainercontextmenu',
+            /**
+             * @event beforecontainerkeydown
+             * Fires before the keydown event on the container is processed. Returns false to cancel the default action.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object. Use {@link Ext.EventObject#getKey getKey()} to retrieve the key that was pressed.
+             */
+            'beforecontainerkeydown',
+            /**
+             * @event containermouseup
+             * Fires when there is a mouse up on the container
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'containermouseup',
+            /**
+             * @event containermouseover
+             * Fires when you move the mouse over the container.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'containermouseover',
+            /**
+             * @event containermouseout
+             * Fires when you move the mouse out of the container.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'containermouseout',
+            /**
+             * @event containerclick
+             * Fires when the container is clicked.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'containerclick',
+            /**
+             * @event containerdblclick
+             * Fires when the container is double clicked.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'containerdblclick',
+            /**
+             * @event containercontextmenu
+             * Fires when the container is right clicked.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object
+             */
+            'containercontextmenu',
+            /**
+             * @event containerkeydown
+             * Fires when a key is pressed while the container is focused, and no item is currently selected.
+             * @param {Ext.view.View} this
+             * @param {Ext.EventObject} e The raw event object. Use {@link Ext.EventObject#getKey getKey()} to retrieve the key that was pressed.
+             */
+            'containerkeydown',
+
+            /**
+             * @event
+             * @inheritdoc Ext.selection.DataViewModel#selectionchange
+             */
+            'selectionchange',
+            /**
+             * @event
+             * @inheritdoc Ext.selection.DataViewModel#beforeselect
+             */
+            'beforeselect',
+            /**
+             * @event
+             * @inheritdoc Ext.selection.DataViewModel#beforedeselect
+             */
+            'beforedeselect',
+            /**
+             * @event
+             * @inheritdoc Ext.selection.DataViewModel#select
+             */
+            'select',
+            /**
+             * @event
+             * @inheritdoc Ext.selection.DataViewModel#deselect
+             */
+            'deselect',
+            /**
+             * @event
+             * @inheritdoc Ext.selection.DataViewModel#focuschange
+             */
+            'focuschange',
+            
+            /**
+             * @event highlightitem
+             * Fires when a node is highlighted using keyboard navigation, or mouseover.
+             * @param {Ext.view.View} view This View Component.
+             * @param {Ext.Element} node The highlighted node.
+             */
+            'highlightitem',
+            
+            /**
+             * @event unhighlightitem
+             * Fires when a node is unhighlighted using keyboard navigation, or mouseout.
+             * @param {Ext.view.View} view This View Component.
+             * @param {Ext.Element} node The previously highlighted node.
+             */
+            'unhighlightitem'
+        );
+    },
+
+    getFocusEl: function() {
+        return this.getTargetEl();
+    },
+
+    // @private
+    afterRender: function(){
+        var me = this,
+            onMouseOverOut = me.mouseOverOutBuffer ? me.onMouseOverOut : me.handleMouseOverOrOut;
+
+        me.callParent();
+        me.mon(me.getTargetEl(), {
+            scope: me,
+            /*
+             * We need to make copies of this since some of the events fired here will end up triggering
+             * a new event to be called and the shared event object will be mutated. In future we should
+             * investigate if there are any issues with creating a new event object for each event that
+             * is fired.
+             */
+            freezeEvent: true,
+            click: me.handleEvent,
+            mousedown: me.handleEvent,
+            mouseup: me.handleEvent,
+            dblclick: me.handleEvent,
+            contextmenu: me.handleEvent,
+            keydown: me.handleEvent,
+            mouseover: onMouseOverOut,
+            mouseout:  onMouseOverOut
+        });
+    },
+
+    onMouseOverOut: function(e) {
+        var me = this;
+
+        // Determining if we are entering or leaving view items is deferred until
+        // mouse move churn settles down.
+        me.lastMouseOverOutEvent.setEvent(e.browserEvent, true);
+        me.handleMouseOverOrOut(me.lastMouseOverOutEvent);
+    },
+
+    handleMouseOverOrOut: function(e) {
+        var me = this,
+            isMouseout = e.type === 'mouseout',
+            method = isMouseout ? e.getRelatedTarget : e.getTarget,
+            nowOverItem = method.call(e, me.itemSelector) || method.call(e, me.dataRowSelector);
+
+        // If the mouse event of whatever type tells use that we are no longer over the current mouseOverItem...
+        if (!me.mouseOverItem || nowOverItem !== me.mouseOverItem) {
+
+            // First fire mouseleave for the item we just left
+            if (me.mouseOverItem) {
+                e.item = me.mouseOverItem;
+                e.newType = 'mouseleave';
+                me.handleEvent(e);
+            }
+
+            // If we are over an item, fire the mouseenter
+            me.mouseOverItem = nowOverItem;
+            if (me.mouseOverItem) {
+                e.item = me.mouseOverItem;
+                e.newType = 'mouseenter';
+                me.handleEvent(e);
+            }
+        }
+    },
+
+    handleEvent: function(e) {
+        var me = this,
+            key = e.type == 'keydown' && e.getKey();
+
+        if (me.processUIEvent(e) !== false) {
+            me.processSpecialEvent(e);
+        }
+
+        // After all listeners have processed the event, then unless the user is typing into an input field,
+        // prevent browser's default action on SPACE which is to focus the event's target element.
+        // Focusing causes the browser to attempt to scroll the element into view.
+        if (key === e.SPACE) {
+            if (!me.inputTagRe.test(e.getTarget().tagName)) {
+                e.stopEvent();
+            }
+        }
+    },
+
+    // Private template method
+    processItemEvent: Ext.emptyFn,
+    processContainerEvent: Ext.emptyFn,
+    processSpecialEvent: Ext.emptyFn,
+
+    processUIEvent: function(e) {
+
+        // If the target event has been removed from the body (data update causing view DOM to be updated),
+        // do not process. isAncestor uses native methods to check.
+        if (!Ext.getBody().isAncestor(e.target)) {
+            return;
+        }
+
+        var me = this,
+            item = e.getTarget(me.getItemSelector(), me.getTargetEl()),
+            map = this.statics().EventMap,
+            index, record,
+            type = e.type,
+            newType = e.type,
+            sm;
+
+        // If the event is a mouseover/mouseout event converted to a mouseenter/mouseleave,
+        // use that event type and ensure that the item is correct.
+        if (e.newType) {
+            newType = e.newType;
+            item = e.item;
+        }
+
+        // For keydown events, try to get either the last focused item or the selected item.
+        // If we have not focused an item, we'll just fire a container keydown event.
+        if (!item && type == 'keydown') {
+            sm = me.getSelectionModel();
+            record = sm.lastFocused || sm.getLastSelected();
+            if (record) {
+                item = me.getNode(record, true);
+            }
+        }
+
+        if (item) {
+            if (!record) {
+                record = me.getRecord(item);
+            }
+            index = me.indexInStore ? me.indexInStore(record) : me.indexOf(item);
+
+            // It is possible for an event to arrive for which there is no record... this
+            // can happen with dblclick where the clicks are on removal actions (think a
+            // grid w/"delete row" action column)
+            if (!record || me.processItemEvent(record, item, index, e) === false) {
+                return false;
+            }
+
+            if (
+                (me['onBeforeItem' + map[newType]](record, item, index, e) === false) ||
+                (me.fireEvent('beforeitem' + newType, me, record, item, index, e) === false) ||
+                (me['onItem' + map[newType]](record, item, index, e) === false)
+            ) {
+                return false;
+            }
+
+            me.fireEvent('item' + newType, me, record, item, index, e);
+        }
+        else {
+            if (
+                (me.processContainerEvent(e) === false) ||
+                (me['onBeforeContainer' + map[type]](e) === false) ||
+                (me.fireEvent('beforecontainer' + type, me, e) === false) ||
+                (me['onContainer' + map[type]](e) === false)
+            ) {
+                return false;
+            }
+
+            me.fireEvent('container' + type, me, e);
+        }
+
+        return true;
+    },
+
+    // @private
+    onItemMouseEnter: function(record, item, index, e) {
+        if (this.trackOver) {
+            this.highlightItem(item);
+        }
+    },
+
+    // @private
+    onItemMouseLeave : function(record, item, index, e) {
+        if (this.trackOver) {
+            this.clearHighlight();
+        }
+    },
+
+    // private, template methods
+    onItemMouseDown: Ext.emptyFn,
+    onItemMouseUp: Ext.emptyFn,
+    onItemFocus: Ext.emptyFn,
+    onItemClick: Ext.emptyFn,
+    onItemDblClick: Ext.emptyFn,
+    onItemContextMenu: Ext.emptyFn,
+    onItemKeyDown: Ext.emptyFn,
+    onBeforeItemMouseDown: Ext.emptyFn,
+    onBeforeItemMouseUp: Ext.emptyFn,
+    onBeforeItemFocus: Ext.emptyFn,
+    onBeforeItemMouseEnter: Ext.emptyFn,
+    onBeforeItemMouseLeave: Ext.emptyFn,
+    onBeforeItemClick: Ext.emptyFn,
+    onBeforeItemDblClick: Ext.emptyFn,
+    onBeforeItemContextMenu: Ext.emptyFn,
+    onBeforeItemKeyDown: Ext.emptyFn,
+
+    // private, template methods
+    onContainerMouseDown: Ext.emptyFn,
+    onContainerMouseUp: Ext.emptyFn,
+    onContainerMouseOver: Ext.emptyFn,
+    onContainerMouseOut: Ext.emptyFn,
+    onContainerClick: Ext.emptyFn,
+    onContainerDblClick: Ext.emptyFn,
+    onContainerContextMenu: Ext.emptyFn,
+    onContainerKeyDown: Ext.emptyFn,
+    onBeforeContainerMouseDown: Ext.emptyFn,
+    onBeforeContainerMouseUp: Ext.emptyFn,
+    onBeforeContainerMouseOver: Ext.emptyFn,
+    onBeforeContainerMouseOut: Ext.emptyFn,
+    onBeforeContainerClick: Ext.emptyFn,
+    onBeforeContainerDblClick: Ext.emptyFn,
+    onBeforeContainerContextMenu: Ext.emptyFn,
+    onBeforeContainerKeyDown: Ext.emptyFn,
+
+    // @private
+    setHighlightedItem: function(item){
+        var me = this,
+            highlighted = me.highlightedItem,
+            overItemCls = me.overItemCls,
+            beforeOverItemCls = me.beforeOverItemCls,
+            previous;
+
+        if (highlighted != item){
+            if (highlighted) {
+                Ext.fly(highlighted).removeCls(overItemCls);
+                previous = highlighted.previousSibling;
+                if (beforeOverItemCls && previous) {
+                    Ext.fly(previous).removeCls(beforeOverItemCls);
+                }
+                me.fireEvent('unhighlightitem', me, highlighted);
+            }
+
+            me.highlightedItem = item;
+
+            if (item) {
+                Ext.fly(item).addCls(me.overItemCls);
+                previous = item.previousSibling;
+                if (beforeOverItemCls && previous) {
+                    Ext.fly(previous).addCls(beforeOverItemCls);
+                }
+                me.fireEvent('highlightitem', me, item);
+            }
+        }
+    },
+
+    /**
+     * Highlights a given item in the View. This is called by the mouseover handler if {@link #overItemCls}
+     * and {@link #trackOver} are configured, but can also be called manually by other code, for instance to
+     * handle stepping through the list via keyboard navigation.
+     * @param {HTMLElement} item The item to highlight
+     */
+    highlightItem: function(item) {
+        this.setHighlightedItem(item);
+    },
+
+    /**
+     * Un-highlights the currently highlighted item, if any.
+     */
+    clearHighlight: function() {
+        this.setHighlightedItem(undefined);
+    },
+    
+    onUpdate: function(store, record){
+        var me = this,
+            node,
+            newNode,
+            highlighted;
+        
+        if (me.viewReady) {
+            node = me.getNode(record);
+            newNode = me.callParent(arguments);
+            highlighted = me.highlightedItem;
+            
+            if (highlighted && highlighted === node) {
+                delete me.highlightedItem;
+                if (newNode) {
+                    me.highlightItem(newNode);
+                }
+            }
+        }
+    },
+
+    refresh: function() {
+        this.clearHighlight();
+        this.callParent(arguments);
+    },
+    
+    /**
+     * Focuses a node in the view.
+     * @param {Ext.data.Model} rec The record associated to the node that is to be focused.
+     */
+    focusNode: function(rec){
+        var me          = this,
+            node        = me.getNode(rec, true),
+            el          = me.el,
+            adjustmentY = 0,
+            adjustmentX = 0,
+            elRegion    = el.getRegion(),
+            nodeRegion;
+
+        // Viewable region must not include scrollbars, so use
+        // DOM client dimensions
+        elRegion.bottom = elRegion.top + el.dom.clientHeight;
+        elRegion.right = elRegion.left + el.dom.clientWidth;
+        if (node) {
+            nodeRegion = Ext.fly(node).getRegion();
+            // node is above
+            if (nodeRegion.top < elRegion.top) {
+                adjustmentY = nodeRegion.top - elRegion.top;
+            // node is below
+            } else if (nodeRegion.bottom > elRegion.bottom) {
+                adjustmentY = nodeRegion.bottom - elRegion.bottom;
+            }
+
+            // node is left
+            if (nodeRegion.left < elRegion.left) {
+                adjustmentX = nodeRegion.left - elRegion.left;
+            // node is right
+            } else if (nodeRegion.right > elRegion.right) {
+                adjustmentX = nodeRegion.right - elRegion.right;
+            }
+
+            if (adjustmentX || adjustmentY) {
+                me.scrollBy(adjustmentX, adjustmentY, false);
+            }
+            el.focus();
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Component layout for {@link Ext.view.BoundList}.
+ * @private
+ */
+Ext.define('Ext.layout.component.BoundList', {
+    extend:  Ext.layout.component.Auto ,
+    alias: 'layout.boundlist',
+
+    type: 'component',
+    
+    beginLayout: function(ownerContext) {
+        var me = this,
+            owner = me.owner,
+            toolbar = owner.pagingToolbar;
+
+        me.callParent(arguments);
+        
+        if (owner.floating) {
+            ownerContext.savedXY = owner.getXY();
+            // move way offscreen to prevent any constraining
+            // only move on the y axis to avoid triggering a horizontal scrollbar in rtl mode
+            owner.setXY([0, -9999]);
+        }
+        
+        if (toolbar) {
+            ownerContext.toolbarContext = ownerContext.context.getCmp(toolbar);
+        }
+        ownerContext.listContext = ownerContext.getEl('listEl');
+    },
+    
+    beginLayoutCycle: function(ownerContext){
+        var owner = this.owner;
+        
+        this.callParent(arguments);
+        if (ownerContext.heightModel.auto) {
+            // Set the el/listEl to be autoHeight since they may have been previously sized
+            // by another layout process. If the el was at maxHeight first, the listEl will
+            // always size to the maxHeight regardless of the content.
+            owner.el.setHeight('auto');
+            owner.listEl.setHeight('auto');
+        }
+    },
+
+    getLayoutItems: function() {
+        var toolbar = this.owner.pagingToolbar;
+        return toolbar ? [toolbar] : [];
+    },
+    
+    isValidParent: function() {
+        // this only ever gets called with the toolbar, since it's rendered inside we
+        // know the parent is always valid
+        return true;
+    },
+
+    finishedLayout: function(ownerContext) {
+        var xy = ownerContext.savedXY;
+        
+        this.callParent(arguments);
+        if (xy) {
+            this.owner.setXY(xy);
+        }
+    },
+    
+    measureContentWidth: function(ownerContext) {
+        return this.owner.listEl.getWidth();
+    },
+    
+    measureContentHeight: function(ownerContext) {
+        return this.owner.listEl.getHeight();
+    },
+    
+    publishInnerHeight: function(ownerContext, height) {
+        var toolbar = ownerContext.toolbarContext,
+            toolbarHeight = 0;
+            
+        if (toolbar) {
+            toolbarHeight = toolbar.getProp('height');
+        }
+        
+        if (toolbarHeight === undefined) {
+            this.done = false;
+        } else {
+            ownerContext.listContext.setHeight(height - ownerContext.getFrameInfo().height - toolbarHeight);
+        }
+    },
+    
+    calculateOwnerHeightFromContentHeight: function(ownerContext){
+        var height = this.callParent(arguments),
+            toolbar = ownerContext.toolbarContext;
+            
+        if (toolbar) {
+            height += toolbar.getProp('height');
+        }
+        return height;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A simple class that renders text directly into a toolbar.
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *         title: 'Panel with TextItem',
+ *         width: 300,
+ *         height: 200,
+ *         tbar: [
+ *             { xtype: 'tbtext', text: 'Sample Text Item' }
+ *         ],
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * @constructor
+ * Creates a new TextItem
+ * @param {Object} text A text string, or a config object containing a #text property
+ */
+Ext.define('Ext.toolbar.TextItem', {
+    extend:  Ext.toolbar.Item ,
+                                
+    alias: 'widget.tbtext',
+    alternateClassName: 'Ext.Toolbar.TextItem',
+
+    /**
+     * @cfg {String} text
+     * The text to be used as innerHTML (html tags are accepted).
+     */
+    text: '',
+
+    renderTpl: '{text}',
+    //
+    baseCls: Ext.baseCSSPrefix + 'toolbar-text',
+
+    beforeRender : function() {
+        var me = this;
+
+        me.callParent();
+
+        Ext.apply(me.renderData, {
+            text: me.text
+        });
+    },
+
+    /**
+     * Updates this item's text, setting the text to be used as innerHTML.
+     * @param {String} text The text to display (html accepted).
+     */
+    setText : function(text) {
+        var me = this;
+        me.text = text;
+        if (me.rendered) {
+            me.el.update(text);
+            me.updateLayout();
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A field with a pair of up/down spinner buttons. This class is not normally instantiated directly,
+ * instead it is subclassed and the {@link #onSpinUp} and {@link #onSpinDown} methods are implemented
+ * to handle when the buttons are clicked. A good example of this is the {@link Ext.form.field.Number}
+ * field which uses the spinner to increment and decrement the field's value by its
+ * {@link Ext.form.field.Number#step step} config value.
+ *
+ * For example:
+ *
+ *     @example
+ *     Ext.define('Ext.ux.CustomSpinner', {
+ *         extend: 'Ext.form.field.Spinner',
+ *         alias: 'widget.customspinner',
+ *
+ *         // override onSpinUp (using step isn't neccessary)
+ *         onSpinUp: function() {
+ *             var me = this;
+ *             if (!me.readOnly) {
+ *                 var val = parseInt(me.getValue().split(' '), 10)||0; // gets rid of " Pack", defaults to zero on parse failure
+ *                 me.setValue((val + me.step) + ' Pack');
+ *             }
+ *         },
+ *
+ *         // override onSpinDown
+ *         onSpinDown: function() {
+ *             var me = this;
+ *             if (!me.readOnly) {
+ *                var val = parseInt(me.getValue().split(' '), 10)||0; // gets rid of " Pack", defaults to zero on parse failure
+ *                if (val <= me.step) {
+ *                    me.setValue('Dry!');
+ *                } else {
+ *                    me.setValue((val - me.step) + ' Pack');
+ *                }
+ *             }
+ *         }
+ *     });
+ *
+ *     Ext.create('Ext.form.FormPanel', {
+ *         title: 'Form with SpinnerField',
+ *         bodyPadding: 5,
+ *         width: 350,
+ *         renderTo: Ext.getBody(),
+ *         items:[{
+ *             xtype: 'customspinner',
+ *             fieldLabel: 'How Much Beer?',
+ *             step: 6
+ *         }]
+ *     });
+ *
+ * By default, pressing the up and down arrow keys will also trigger the onSpinUp and onSpinDown methods;
+ * to prevent this, set `{@link #keyNavEnabled} = false`.
+ */
+Ext.define('Ext.form.field.Spinner', {
+    extend:  Ext.form.field.Trigger ,
+    alias: 'widget.spinnerfield',
+    alternateClassName: 'Ext.form.Spinner',
+                                  
+
+    trigger1Cls: Ext.baseCSSPrefix + 'form-spinner-up',
+    trigger2Cls: Ext.baseCSSPrefix + 'form-spinner-down',
+
+    /**
+     * @cfg {Boolean} spinUpEnabled
+     * Specifies whether the up spinner button is enabled. Defaults to true. To change this after the component is
+     * created, use the {@link #setSpinUpEnabled} method.
+     */
+    spinUpEnabled: true,
+
+    /**
+     * @cfg {Boolean} spinDownEnabled
+     * Specifies whether the down spinner button is enabled. Defaults to true. To change this after the component is
+     * created, use the {@link #setSpinDownEnabled} method.
+     */
+    spinDownEnabled: true,
+
+    /**
+     * @cfg {Boolean} keyNavEnabled
+     * Specifies whether the up and down arrow keys should trigger spinning up and down. Defaults to true.
+     */
+    keyNavEnabled: true,
+
+    /**
+     * @cfg {Boolean} mouseWheelEnabled
+     * Specifies whether the mouse wheel should trigger spinning up and down while the field has focus.
+     * Defaults to true.
+     */
+    mouseWheelEnabled: true,
+
+    /**
+     * @cfg {Boolean} repeatTriggerClick
+     * Whether a {@link Ext.util.ClickRepeater click repeater} should be attached to the spinner buttons.
+     * Defaults to true.
+     */
+    repeatTriggerClick: true,
+
+    /**
+     * @method
+     * @protected
+     * This method is called when the spinner up button is clicked, or when the up arrow key is pressed if
+     * {@link #keyNavEnabled} is true. Must be implemented by subclasses.
+     */
+    onSpinUp: Ext.emptyFn,
+
+    /**
+     * @method
+     * @protected
+     * This method is called when the spinner down button is clicked, or when the down arrow key is pressed if
+     * {@link #keyNavEnabled} is true. Must be implemented by subclasses.
+     */
+    onSpinDown: Ext.emptyFn,
+
+    triggerTpl: '<td style="{triggerStyle}" class="{triggerCls}">' +
+                    '<div class="' + Ext.baseCSSPrefix + 'trigger-index-0 ' + Ext.baseCSSPrefix + 'form-trigger ' + Ext.baseCSSPrefix + 'form-spinner-up {spinnerUpCls} {childElCls}" role="button"></div>' +
+                    '<div class="' + Ext.baseCSSPrefix + 'trigger-index-1 ' + Ext.baseCSSPrefix + 'form-trigger ' + Ext.baseCSSPrefix + 'form-spinner-down {spinnerDownCls} {childElCls}" role="button"></div>' +
+                '</td>' +
+            '</tr>',
+
+    initComponent: function() {
+        this.callParent();
+
+        this.addEvents(
+            /**
+             * @event spin
+             * Fires when the spinner is made to spin up or down.
+             * @param {Ext.form.field.Spinner} this
+             * @param {String} direction Either 'up' if spinning up, or 'down' if spinning down.
+             */
+            'spin',
+
+            /**
+             * @event spinup
+             * Fires when the spinner is made to spin up.
+             * @param {Ext.form.field.Spinner} this
+             */
+            'spinup',
+
+            /**
+             * @event spindown
+             * Fires when the spinner is made to spin down.
+             * @param {Ext.form.field.Spinner} this
+             */
+            'spindown'
+        );
+    },
+
+    /**
+     * @private
+     * Override.
+     */
+    onRender: function() {
+        var me = this,
+            triggers;
+
+        me.callParent(arguments);
+        triggers = me.triggerEl;
+        
+        /**
+         * @property {Ext.Element} spinUpEl
+         * The spinner up button element
+         */
+        me.spinUpEl = triggers.item(0);
+        /**
+         * @property {Ext.Element} spinDownEl
+         * The spinner down button element
+         */
+        me.spinDownEl = triggers.item(1);
+        
+        me.triggerCell = me.spinUpEl.parent(); 
+
+        // Init up/down arrow keys
+        if (me.keyNavEnabled) {
+            me.spinnerKeyNav = new Ext.util.KeyNav(me.inputEl, {
+                scope: me,
+                up: me.spinUp,
+                down: me.spinDown
+            });
+        }
+
+        // Init mouse wheel
+        if (me.mouseWheelEnabled) {
+            me.mon(me.bodyEl, 'mousewheel', me.onMouseWheel, me);
+        }
+    },
+
+    getSubTplMarkup: function(values) {
+        var me = this,
+            childElCls = values.childElCls, // either '' or ' x-foo'
+            field = Ext.form.field.Base.prototype.getSubTplMarkup.apply(me, arguments);
+
+        return '<table id="' + me.id + '-triggerWrap" class="' + Ext.baseCSSPrefix + 'form-trigger-wrap' + childElCls + '" cellpadding="0" cellspacing="0">' +
+            '<tbody>' +
+                '<tr><td id="' + me.id + '-inputCell" class="' + Ext.baseCSSPrefix + 'form-trigger-input-cell' + childElCls + '">' + field + '</td>' +
+                me.getTriggerMarkup() +
+            '</tbody></table>';
+    },
+
+    getTriggerMarkup: function() {
+        return this.getTpl('triggerTpl').apply(this.getTriggerData());
+    },
+    
+    getTriggerData: function(){
+        var me = this,
+            hideTrigger = (me.readOnly || me.hideTrigger);
+            
+        return {
+            triggerCls: Ext.baseCSSPrefix + 'trigger-cell',
+            triggerStyle: hideTrigger ? 'display:none' : '',
+            spinnerUpCls: !me.spinUpEnabled ? me.trigger1Cls + '-disabled': '',
+            spinnerDownCls: !me.spinDownEnabled ? me.trigger2Cls + '-disabled': ''
+        };
+    },
+
+    /**
+     * Get the total width of the spinner button area.
+     * @return {Number} The total spinner button width
+     */
+    getTriggerWidth: function() {
+        var me = this,
+            totalTriggerWidth = 0;
+
+        if (me.triggerWrap && !me.hideTrigger && !me.readOnly) {
+            totalTriggerWidth = me.triggerWidth;
+        }
+        return totalTriggerWidth;
+    },
+
+    /**
+     * @private
+     * Handles the spinner up button clicks.
+     */
+    onTrigger1Click: function() {
+        this.spinUp();
+    },
+
+    /**
+     * @private
+     * Handles the spinner down button clicks.
+     */
+    onTrigger2Click: function() {
+        this.spinDown();
+    },
+
+    // private
+    // Handle trigger mouse up gesture; refocuses the input element upon end of spin.
+    onTriggerWrapMouseup: function() {
+        this.inputEl.focus();
+    },
+
+    /**
+     * Triggers the spinner to step up; fires the {@link #spin} and {@link #spinup} events and calls the
+     * {@link #onSpinUp} method. Does nothing if the field is {@link #disabled} or if {@link #spinUpEnabled}
+     * is false.
+     */
+    spinUp: function() {
+        var me = this;
+        if (me.spinUpEnabled && !me.disabled) {
+            me.fireEvent('spin', me, 'up');
+            me.fireEvent('spinup', me);
+            me.onSpinUp();
+        }
+    },
+
+    /**
+     * Triggers the spinner to step down; fires the {@link #spin} and {@link #spindown} events and calls the
+     * {@link #onSpinDown} method. Does nothing if the field is {@link #disabled} or if {@link #spinDownEnabled}
+     * is false.
+     */
+    spinDown: function() {
+        var me = this;
+        if (me.spinDownEnabled && !me.disabled) {
+            me.fireEvent('spin', me, 'down');
+            me.fireEvent('spindown', me);
+            me.onSpinDown();
+        }
+    },
+
+    /**
+     * Sets whether the spinner up button is enabled.
+     * @param {Boolean} enabled true to enable the button, false to disable it.
+     */
+    setSpinUpEnabled: function(enabled) {
+        var me = this,
+            wasEnabled = me.spinUpEnabled;
+        me.spinUpEnabled = enabled;
+        if (wasEnabled !== enabled && me.rendered) {
+            me.spinUpEl[enabled ? 'removeCls' : 'addCls'](me.trigger1Cls + '-disabled');
+        }
+    },
+
+    /**
+     * Sets whether the spinner down button is enabled.
+     * @param {Boolean} enabled true to enable the button, false to disable it.
+     */
+    setSpinDownEnabled: function(enabled) {
+        var me = this,
+            wasEnabled = me.spinDownEnabled;
+        me.spinDownEnabled = enabled;
+        if (wasEnabled !== enabled && me.rendered) {
+            me.spinDownEl[enabled ? 'removeCls' : 'addCls'](me.trigger2Cls + '-disabled');
+        }
+    },
+
+    /**
+     * @private
+     * Handles mousewheel events on the field
+     */
+    onMouseWheel: function(e) {
+        var me = this,
+            delta;
+        if (me.hasFocus) {
+            delta = e.getWheelDelta();
+            if (delta > 0) {
+                me.spinUp();
+            } else if (delta < 0) {
+                me.spinDown();
+            }
+            e.stopEvent();
+        }
+    },
+
+    onDestroy: function() {
+        Ext.destroyMembers(this, 'spinnerKeyNav', 'spinUpEl', 'spinDownEl');
+        this.callParent();
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ *
+ * A numeric text field that provides automatic keystroke filtering to disallow non-numeric characters,
+ * and numeric validation to limit the value to a range of valid numbers. The range of acceptable number
+ * values can be controlled by setting the {@link #minValue} and {@link #maxValue} configs, and fractional
+ * decimals can be disallowed by setting {@link #allowDecimals} to `false`.
+ *
+ * By default, the number field is also rendered with a set of up/down spinner buttons and has
+ * up/down arrow key and mouse wheel event listeners attached for incrementing/decrementing the value by the
+ * {@link #step} value. To hide the spinner buttons set `{@link #hideTrigger hideTrigger}:true`; to disable
+ * the arrow key and mouse wheel handlers set `{@link #keyNavEnabled keyNavEnabled}:false` and
+ * `{@link #mouseWheelEnabled mouseWheelEnabled}:false`. See the example below.
+ *
+ * # Example usage
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'On The Wall',
+ *         width: 300,
+ *         bodyPadding: 10,
+ *         renderTo: Ext.getBody(),
+ *         items: [{
+ *             xtype: 'numberfield',
+ *             anchor: '100%',
+ *             name: 'bottles',
+ *             fieldLabel: 'Bottles of Beer',
+ *             value: 99,
+ *             maxValue: 99,
+ *             minValue: 0
+ *         }],
+ *         buttons: [{
+ *             text: 'Take one down, pass it around',
+ *             handler: function() {
+ *                 this.up('form').down('[name=bottles]').spinDown();
+ *             }
+ *         }]
+ *     });
+ *
+ * # Removing UI Enhancements
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Personal Info',
+ *         width: 300,
+ *         bodyPadding: 10,
+ *         renderTo: Ext.getBody(),
+ *         items: [{
+ *             xtype: 'numberfield',
+ *             anchor: '100%',
+ *             name: 'age',
+ *             fieldLabel: 'Age',
+ *             minValue: 0, //prevents negative numbers
+ *
+ *             // Remove spinner buttons, and arrow key and mouse wheel listeners
+ *             hideTrigger: true,
+ *             keyNavEnabled: false,
+ *             mouseWheelEnabled: false
+ *         }]
+ *     });
+ *
+ * # Using Step
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         renderTo: Ext.getBody(),
+ *         title: 'Step',
+ *         width: 300,
+ *         bodyPadding: 10,
+ *         items: [{
+ *             xtype: 'numberfield',
+ *             anchor: '100%',
+ *             name: 'evens',
+ *             fieldLabel: 'Even Numbers',
+ *
+ *             // Set step so it skips every other number
+ *             step: 2,
+ *             value: 0,
+ *
+ *             // Add change handler to force user-entered numbers to evens
+ *             listeners: {
+ *                 change: function(field, value) {
+ *                     value = parseInt(value, 10);
+ *                     field.setValue(value + value % 2);
+ *                 }
+ *             }
+ *         }]
+ *     });
+ */
+Ext.define('Ext.form.field.Number', {
+    extend: Ext.form.field.Spinner ,
+    alias: 'widget.numberfield',
+    alternateClassName: ['Ext.form.NumberField', 'Ext.form.Number'],
+
+    /**
+     * @cfg {RegExp} stripCharsRe
+     * @private
+     */
+    /**
+     * @cfg {RegExp} maskRe
+     * @private
+     */
+     
+    /**
+     * @cfg {Boolean} [allowExponential=true]
+     * Set to `false` to disallow Exponential number notation
+     */
+    allowExponential: true,
+
+    /**
+     * @cfg {Boolean} [allowDecimals=true]
+     * False to disallow decimal values
+     */
+    allowDecimals : true,
+
+    //<locale>
+    /**
+     * @cfg {String} decimalSeparator
+     * Character(s) to allow as the decimal separator
+     */
+    decimalSeparator : '.',
+    //</locale>
+    
+    //<locale>
+    /**
+     * @cfg {Boolean} [submitLocaleSeparator=true]
+     * False to ensure that the {@link #getSubmitValue} method strips
+     * always uses `.` as the separator, regardless of the {@link #decimalSeparator}
+     * configuration.
+     */
+    submitLocaleSeparator: true,
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {Number} decimalPrecision
+     * The maximum precision to display after the decimal separator
+     */
+    decimalPrecision : 2,
+    //</locale>
+
+    /**
+     * @cfg {Number} minValue
+     * The minimum allowed value. Will be used by the field's validation logic,
+     * and for {@link Ext.form.field.Spinner#setSpinUpEnabled enabling/disabling the down spinner button}.
+     *
+     * Defaults to Number.NEGATIVE_INFINITY.
+     */
+    minValue: Number.NEGATIVE_INFINITY,
+
+    /**
+     * @cfg {Number} maxValue
+     * The maximum allowed value. Will be used by the field's validation logic, and for
+     * {@link Ext.form.field.Spinner#setSpinUpEnabled enabling/disabling the up spinner button}.
+     *
+     * Defaults to Number.MAX_VALUE.
+     */
+    maxValue: Number.MAX_VALUE,
+
+    /**
+     * @cfg {Number} step
+     * Specifies a numeric interval by which the field's value will be incremented or decremented when the user invokes
+     * the spinner.
+     */
+    step: 1,
+
+    //<locale>
+    /**
+     * @cfg {String} minText
+     * Error text to display if the minimum value validation fails.
+     */
+    minText : 'The minimum value for this field is {0}',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} maxText
+     * Error text to display if the maximum value validation fails.
+     */
+    maxText : 'The maximum value for this field is {0}',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} nanText
+     * Error text to display if the value is not a valid number. For example, this can happen if a valid character like
+     * '.' or '-' is left in the field with no number.
+     */
+    nanText : '{0} is not a valid number',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} negativeText
+     * Error text to display if the value is negative and {@link #minValue} is set to 0. This is used instead of the
+     * {@link #minText} in that circumstance only.
+     */
+    negativeText : 'The value cannot be negative',
+    //</locale>
+
+    /**
+     * @cfg {String} baseChars
+     * The base set of characters to evaluate as valid numbers.
+     */
+    baseChars : '0123456789',
+
+    /**
+     * @cfg {Boolean} autoStripChars
+     * True to automatically strip not allowed characters from the field.
+     */
+    autoStripChars: false,
+
+    initComponent: function() {
+        var me = this;
+        me.callParent();
+
+        me.setMinValue(me.minValue);
+        me.setMaxValue(me.maxValue);
+    },
+
+    /**
+     * Runs all of Number's validations and returns an array of any errors. Note that this first runs Text's
+     * validations, so the returned array is an amalgamation of all field errors. The additional validations run test
+     * that the value is a number, and that it is within the configured min and max values.
+     * @param {Object} [value] The value to get errors for (defaults to the current field value)
+     * @return {String[]} All validation errors for this field
+     */
+    getErrors: function(value) {
+        var me = this,
+            errors = me.callParent(arguments),
+            format = Ext.String.format,
+            num;
+
+        value = Ext.isDefined(value) ? value : this.processRawValue(this.getRawValue());
+
+        if (value.length < 1) { // if it's blank and textfield didn't flag it then it's valid
+             return errors;
+        }
+
+        value = String(value).replace(me.decimalSeparator, '.');
+
+        if(isNaN(value)){
+            errors.push(format(me.nanText, value));
+        }
+
+        num = me.parseValue(value);
+
+        if (me.minValue === 0 && num < 0) {
+            errors.push(this.negativeText);
+        }
+        else if (num < me.minValue) {
+            errors.push(format(me.minText, me.minValue));
+        }
+
+        if (num > me.maxValue) {
+            errors.push(format(me.maxText, me.maxValue));
+        }
+
+
+        return errors;
+    },
+
+    rawToValue: function(rawValue) {
+        var value = this.fixPrecision(this.parseValue(rawValue));
+        if (value === null) {
+            value = rawValue || null;
+        }
+        return  value;
+    },
+
+    valueToRaw: function(value) {
+        var me = this,
+            decimalSeparator = me.decimalSeparator;
+        value = me.parseValue(value);
+        value = me.fixPrecision(value);
+        value = Ext.isNumber(value) ? value : parseFloat(String(value).replace(decimalSeparator, '.'));
+        value = isNaN(value) ? '' : String(value).replace('.', decimalSeparator);
+        return value;
+    },
+    
+    getSubmitValue: function() {
+        var me = this,
+            value = me.callParent();
+            
+        if (!me.submitLocaleSeparator) {
+            value = value.replace(me.decimalSeparator, '.');
+        }  
+        return value;
+    },
+
+    onChange: function() {
+        this.toggleSpinners();
+        this.callParent(arguments);
+    },
+    
+    toggleSpinners: function(){
+        var me = this,
+            value = me.getValue(),
+            valueIsNull = value === null,
+            enabled;
+        
+        // If it's disabled, only allow it to be re-enabled if we are
+        // the ones who are disabling it.
+        if (me.spinUpEnabled || me.spinUpDisabledByToggle) {
+            enabled = valueIsNull || value < me.maxValue;
+            me.setSpinUpEnabled(enabled, true);
+        }
+        
+        
+        if (me.spinDownEnabled || me.spinDownDisabledByToggle) {
+            enabled = valueIsNull || value > me.minValue;
+            me.setSpinDownEnabled(enabled, true);
+        }
+    },
+
+    /**
+     * Replaces any existing {@link #minValue} with the new value.
+     * @param {Number} value The minimum value
+     */
+    setMinValue : function(value) {
+        var me = this,
+            allowed;
+        
+        me.minValue = Ext.Number.from(value, Number.NEGATIVE_INFINITY);
+        me.toggleSpinners();
+        
+        // Build regexes for masking and stripping based on the configured options
+        if (me.disableKeyFilter !== true) {
+            allowed = me.baseChars + '';
+            
+            if (me.allowExponential) {
+                allowed += me.decimalSeparator + 'e+-';
+            }
+            else {
+                if (me.allowDecimals) {
+                    allowed += me.decimalSeparator;
+                }
+                if (me.minValue < 0) {
+                    allowed += '-';
+                }
+            }
+            
+            allowed = Ext.String.escapeRegex(allowed);
+            me.maskRe = new RegExp('[' + allowed + ']');
+            if (me.autoStripChars) {
+                me.stripCharsRe = new RegExp('[^' + allowed + ']', 'gi');
+            }
+        }
+    },
+
+    /**
+     * Replaces any existing {@link #maxValue} with the new value.
+     * @param {Number} value The maximum value
+     */
+    setMaxValue: function(value) {
+        this.maxValue = Ext.Number.from(value, Number.MAX_VALUE);
+        this.toggleSpinners();
+    },
+
+    // private
+    parseValue : function(value) {
+        value = parseFloat(String(value).replace(this.decimalSeparator, '.'));
+        return isNaN(value) ? null : value;
+    },
+
+    /**
+     * @private
+     */
+    fixPrecision : function(value) {
+        var me = this,
+            nan = isNaN(value),
+            precision = me.decimalPrecision;
+
+        if (nan || !value) {
+            return nan ? '' : value;
+        } else if (!me.allowDecimals || precision <= 0) {
+            precision = 0;
+        }
+
+        return parseFloat(Ext.Number.toFixed(parseFloat(value), precision));
+    },
+
+    beforeBlur : function() {
+        var me = this,
+            v = me.parseValue(me.getRawValue());
+
+        if (!Ext.isEmpty(v)) {
+            me.setValue(v);
+        }
+    },
+    
+    setSpinUpEnabled: function(enabled, /* private */ internal){
+        this.callParent(arguments);
+        if (!internal) {
+            delete this.spinUpDisabledByToggle;
+        } else {
+            this.spinUpDisabledByToggle = !enabled;
+        }
+    },
+
+    onSpinUp: function() {
+        var me = this;
+            
+        if (!me.readOnly) {
+            me.setSpinValue(Ext.Number.constrain(me.getValue() + me.step, me.minValue, me.maxValue));
+        }
+    },
+    
+    setSpinDownEnabled: function(enabled, /* private */ internal){
+        this.callParent(arguments);
+        if (!internal) {
+            delete this.spinDownDisabledByToggle;
+        } else {
+            this.spinDownDisabledByToggle = !enabled;
+        }   
+    },
+
+    onSpinDown: function() {
+        var me = this;
+        
+        if (!me.readOnly) {
+            me.setSpinValue(Ext.Number.constrain(me.getValue() - me.step, me.minValue, me.maxValue));
+        }
+    },
+    
+    setSpinValue: function(value) {
+        var me = this,
+            len;
+            
+        if (me.enforceMaxLength) {
+            // We need to round the value here, otherwise we could end up with a
+            // very long number (think 0.1 + 0.2)
+            if (me.fixPrecision(value).toString().length > me.maxLength) {
+                return;
+            }
+        }
+        me.setValue(value);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * As the number of records increases, the time required for the browser to render them increases. Paging is used to
+ * reduce the amount of data exchanged with the client. Note: if there are more records/rows than can be viewed in the
+ * available screen area, vertical scrollbars will be added.
+ *
+ * Paging is typically handled on the server side (see exception below). The client sends parameters to the server side,
+ * which the server needs to interpret and then respond with the appropriate data.
+ *
+ * Ext.toolbar.Paging is a specialized toolbar that is bound to a {@link Ext.data.Store} and provides automatic
+ * paging control. This Component {@link Ext.data.Store#method-load load}s blocks of data into the {@link #store} by passing
+ * parameters used for paging criteria.
+ *
+ * {@img Ext.toolbar.Paging/Ext.toolbar.Paging.png Ext.toolbar.Paging component}
+ *
+ * Paging Toolbar is typically used as one of the Grid's toolbars:
+ *
+ *     @example
+ *     var itemsPerPage = 2;   // set the number of items you want per page
+ *
+ *     var store = Ext.create('Ext.data.Store', {
+ *         id:'simpsonsStore',
+ *         autoLoad: false,
+ *         fields:['name', 'email', 'phone'],
+ *         pageSize: itemsPerPage, // items per page
+ *         proxy: {
+ *             type: 'ajax',
+ *             url: 'pagingstore.js',  // url that will load data with respect to start and limit params
+ *             reader: {
+ *                 type: 'json',
+ *                 root: 'items',
+ *                 totalProperty: 'total'
+ *             }
+ *         }
+ *     });
+ *
+ *     // specify segment of data you want to load using params
+ *     store.load({
+ *         params:{
+ *             start:0,
+ *             limit: itemsPerPage
+ *         }
+ *     });
+ *
+ *     Ext.create('Ext.grid.Panel', {
+ *         title: 'Simpsons',
+ *         store: store,
+ *         columns: [
+ *             { header: 'Name',  dataIndex: 'name' },
+ *             { header: 'Email', dataIndex: 'email', flex: 1 },
+ *             { header: 'Phone', dataIndex: 'phone' }
+ *         ],
+ *         width: 400,
+ *         height: 125,
+ *         dockedItems: [{
+ *             xtype: 'pagingtoolbar',
+ *             store: store,   // same store GridPanel is using
+ *             dock: 'bottom',
+ *             displayInfo: true
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * To use paging, you need to set a pageSize configuration on the Store, and pass the paging requirements to
+ * the server when the store is first loaded.
+ *
+ *     store.load({
+ *         params: {
+ *             // specify params for the first page load if using paging
+ *             start: 0,
+ *             limit: myPageSize,
+ *             // other params
+ *             foo:   'bar'
+ *         }
+ *     });
+ *
+ * If using {@link Ext.data.Store#autoLoad store's autoLoad} configuration:
+ *
+ *     var myStore = Ext.create('Ext.data.Store', {
+ *         {@link Ext.data.Store#autoLoad autoLoad}: {start: 0, limit: 25},
+ *         ...
+ *     });
+ *
+ * The packet sent back from the server would have this form:
+ *
+ *     {
+ *         "success": true,
+ *         "results": 2000,
+ *         "rows": [ // ***Note:** this must be an Array
+ *             { "id":  1, "name": "Bill", "occupation": "Gardener" },
+ *             { "id":  2, "name":  "Ben", "occupation": "Horticulturalist" },
+ *             ...
+ *             { "id": 25, "name":  "Sue", "occupation": "Botanist" }
+ *         ]
+ *     }
+ *
+ * ## Paging with Local Data
+ *
+ * Paging can also be accomplished with local data using extensions:
+ *
+ *   - [Ext.ux.data.PagingStore][1]
+ *   - Paging Memory Proxy (examples/ux/PagingMemoryProxy.js)
+ *
+ *    [1]: http://sencha.com/forum/showthread.php?t=71532
+ */
+Ext.define('Ext.toolbar.Paging', {
+    extend:  Ext.toolbar.Toolbar ,
+    alias: 'widget.pagingtoolbar',
+    alternateClassName: 'Ext.PagingToolbar',
+                                                                
+    mixins: {
+        bindable:  Ext.util.Bindable     
+    },
+    /**
+     * @cfg {Ext.data.Store} store (required)
+     * The {@link Ext.data.Store} the paging toolbar should use as its data source.
+     */
+
+    /**
+     * @cfg {Boolean} displayInfo
+     * true to display the displayMsg
+     */
+    displayInfo: false,
+
+    /**
+     * @cfg {Boolean} prependButtons
+     * true to insert any configured items _before_ the paging buttons.
+     */
+    prependButtons: false,
+
+    //<locale>
+    /**
+     * @cfg {String} displayMsg
+     * The paging status message to display. Note that this string is
+     * formatted using the braced numbers {0}-{2} as tokens that are replaced by the values for start, end and total
+     * respectively. These tokens should be preserved when overriding this string if showing those values is desired.
+     */
+    displayMsg : 'Displaying {0} - {1} of {2}',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} emptyMsg
+     * The message to display when no records are found.
+     */
+    emptyMsg : 'No data to display',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} beforePageText
+     * The text displayed before the input item.
+     */
+    beforePageText : 'Page',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} afterPageText
+     * Customizable piece of the default paging text. Note that this string is formatted using
+     * {0} as a token that is replaced by the number of total pages. This token should be preserved when overriding this
+     * string if showing the total page count is desired.
+     */
+    afterPageText : 'of {0}',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} firstText
+     * The quicktip text displayed for the first page button.
+     * **Note**: quick tips must be initialized for the quicktip to show.
+     */
+    firstText : 'First Page',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} prevText
+     * The quicktip text displayed for the previous page button.
+     * **Note**: quick tips must be initialized for the quicktip to show.
+     */
+    prevText : 'Previous Page',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} nextText
+     * The quicktip text displayed for the next page button.
+     * **Note**: quick tips must be initialized for the quicktip to show.
+     */
+    nextText : 'Next Page',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} lastText
+     * The quicktip text displayed for the last page button.
+     * **Note**: quick tips must be initialized for the quicktip to show.
+     */
+    lastText : 'Last Page',
+    //</locale>
+
+    //<locale>
+    /**
+     * @cfg {String} refreshText
+     * The quicktip text displayed for the Refresh button.
+     * **Note**: quick tips must be initialized for the quicktip to show.
+     */
+    refreshText : 'Refresh',
+    //</locale>
+
+    /**
+     * @cfg {Number} inputItemWidth
+     * The width in pixels of the input field used to display and change the current page number.
+     */
+    inputItemWidth : 30,
+
+    /**
+     * Gets the standard paging items in the toolbar
+     * @private
+     */
+    getPagingItems: function() {
+        var me = this;
+
+        return [{
+            itemId: 'first',
+            tooltip: me.firstText,
+            overflowText: me.firstText,
+            iconCls: Ext.baseCSSPrefix + 'tbar-page-first',
+            disabled: true,
+            handler: me.moveFirst,
+            scope: me
+        },{
+            itemId: 'prev',
+            tooltip: me.prevText,
+            overflowText: me.prevText,
+            iconCls: Ext.baseCSSPrefix + 'tbar-page-prev',
+            disabled: true,
+            handler: me.movePrevious,
+            scope: me
+        },
+        '-',
+        me.beforePageText,
+        {
+            xtype: 'numberfield',
+            itemId: 'inputItem',
+            name: 'inputItem',
+            cls: Ext.baseCSSPrefix + 'tbar-page-number',
+            allowDecimals: false,
+            minValue: 1,
+            hideTrigger: true,
+            enableKeyEvents: true,
+            keyNavEnabled: false,
+            selectOnFocus: true,
+            submitValue: false,
+            // mark it as not a field so the form will not catch it when getting fields
+            isFormField: false,
+            width: me.inputItemWidth,
+            margins: '-1 2 3 2',
+            listeners: {
+                scope: me,
+                keydown: me.onPagingKeyDown,
+                blur: me.onPagingBlur
+            }
+        },{
+            xtype: 'tbtext',
+            itemId: 'afterTextItem',
+            text: Ext.String.format(me.afterPageText, 1)
+        },
+        '-',
+        {
+            itemId: 'next',
+            tooltip: me.nextText,
+            overflowText: me.nextText,
+            iconCls: Ext.baseCSSPrefix + 'tbar-page-next',
+            disabled: true,
+            handler: me.moveNext,
+            scope: me
+        },{
+            itemId: 'last',
+            tooltip: me.lastText,
+            overflowText: me.lastText,
+            iconCls: Ext.baseCSSPrefix + 'tbar-page-last',
+            disabled: true,
+            handler: me.moveLast,
+            scope: me
+        },
+        '-',
+        {
+            itemId: 'refresh',
+            tooltip: me.refreshText,
+            overflowText: me.refreshText,
+            iconCls: Ext.baseCSSPrefix + 'tbar-loading',
+            handler: me.doRefresh,
+            scope: me
+        }];
+    },
+
+    initComponent : function(){
+        var me = this,
+            pagingItems = me.getPagingItems(),
+            userItems   = me.items || me.buttons || [];
+
+        if (me.prependButtons) {
+            me.items = userItems.concat(pagingItems);
+        } else {
+            me.items = pagingItems.concat(userItems);
+        }
+        delete me.buttons;
+
+        if (me.displayInfo) {
+            me.items.push('->');
+            me.items.push({xtype: 'tbtext', itemId: 'displayItem'});
+        }
+
+        me.callParent();
+
+        me.addEvents(
+            /**
+             * @event change
+             * Fires after the active page has been changed.
+             * @param {Ext.toolbar.Paging} this
+             * @param {Object} pageData An object that has these properties:
+             *
+             * - `total` : Number
+             *
+             *   The total number of records in the dataset as returned by the server
+             *
+             * - `currentPage` : Number
+             *
+             *   The current page number
+             *
+             * - `pageCount` : Number
+             *
+             *   The total number of pages (calculated from the total number of records in the dataset as returned by the
+             *   server and the current {@link Ext.data.Store#pageSize pageSize})
+             *
+             * - `toRecord` : Number
+             *
+             *   The starting record index for the current page
+             *
+             * - `fromRecord` : Number
+             *
+             *   The ending record index for the current page
+             */
+            'change',
+
+            /**
+             * @event beforechange
+             * Fires just before the active page is changed. Return false to prevent the active page from being changed.
+             * @param {Ext.toolbar.Paging} this
+             * @param {Number} page The page number that will be loaded on change
+             */
+            'beforechange'
+        );
+        me.on('beforerender', me.onLoad, me, {single: true});
+
+        me.bindStore(me.store || 'ext-empty-store', true);
+    },
+    // @private
+    updateInfo : function(){
+        var me = this,
+            displayItem = me.child('#displayItem'),
+            store = me.store,
+            pageData = me.getPageData(),
+            count, msg;
+
+        if (displayItem) {
+            count = store.getCount();
+            if (count === 0) {
+                msg = me.emptyMsg;
+            } else {
+                msg = Ext.String.format(
+                    me.displayMsg,
+                    pageData.fromRecord,
+                    pageData.toRecord,
+                    pageData.total
+                );
+            }
+            displayItem.setText(msg);
+        }
+    },
+
+    // @private
+    onLoad : function(){
+        var me = this,
+            pageData,
+            currPage,
+            pageCount,
+            afterText,
+            count,
+            isEmpty,
+            item;
+
+        count = me.store.getCount();
+        isEmpty = count === 0;
+        if (!isEmpty) {
+            pageData = me.getPageData();
+            currPage = pageData.currentPage;
+            pageCount = pageData.pageCount;
+            afterText = Ext.String.format(me.afterPageText, isNaN(pageCount) ? 1 : pageCount);
+        } else {
+            currPage = 0;
+            pageCount = 0;
+            afterText = Ext.String.format(me.afterPageText, 0);
+        }
+
+        Ext.suspendLayouts();
+        item = me.child('#afterTextItem');
+        if (item) {    
+            item.setText(afterText);
+        }
+        item = me.getInputItem();
+        if (item) {
+            item.setDisabled(isEmpty).setValue(currPage);
+        }
+        me.setChildDisabled('#first', currPage === 1 || isEmpty);
+        me.setChildDisabled('#prev', currPage === 1 || isEmpty);
+        me.setChildDisabled('#next', currPage === pageCount  || isEmpty);
+        me.setChildDisabled('#last', currPage === pageCount  || isEmpty);
+        me.setChildDisabled('#refresh', false);
+        me.updateInfo();
+        Ext.resumeLayouts(true);
+
+        if (me.rendered) {
+            me.fireEvent('change', me, pageData);
+        }
+    },
+    
+    setChildDisabled: function(selector, disabled){
+        var item = this.child(selector);
+        if (item) {
+            item.setDisabled(disabled);
+        }
+    },
+
+    // @private
+    getPageData : function(){
+        var store = this.store,
+            totalCount = store.getTotalCount();
+
+        return {
+            total : totalCount,
+            currentPage : store.currentPage,
+            pageCount: Math.ceil(totalCount / store.pageSize),
+            fromRecord: ((store.currentPage - 1) * store.pageSize) + 1,
+            toRecord: Math.min(store.currentPage * store.pageSize, totalCount)
+
+        };
+    },
+
+    // @private
+    onLoadError : function(){
+        if (!this.rendered) {
+            return;
+        }
+        this.setChildDisabled('#refresh', false);
+    },
+    
+    getInputItem: function(){
+        return this.child('#inputItem');
+    },
+
+    // @private
+    readPageFromInput : function(pageData){
+        var inputItem = this.getInputItem(),
+            pageNum = false,
+            v;
+
+        if (inputItem) {
+            v = inputItem.getValue();
+            pageNum = parseInt(v, 10);
+            if (!v || isNaN(pageNum)) {
+                inputItem.setValue(pageData.currentPage);
+                return false;
+            }
+        }
+        return pageNum;
+    },
+
+    onPagingFocus : function(){
+        var inputItem = this.getInputItem();
+        if (inputItem) {
+            inputItem.select();
+        }
+    },
+
+    // @private
+    onPagingBlur : function(e){
+        var inputItem = this.getInputItem(),
+            curPage;
+            
+        if (inputItem) {
+            curPage = this.getPageData().currentPage;
+            inputItem.setValue(curPage);
+        }
+    },
+
+    // @private
+    onPagingKeyDown : function(field, e){
+        var me = this,
+            k = e.getKey(),
+            pageData = me.getPageData(),
+            increment = e.shiftKey ? 10 : 1,
+            pageNum;
+
+        if (k == e.RETURN) {
+            e.stopEvent();
+            pageNum = me.readPageFromInput(pageData);
+            if (pageNum !== false) {
+                pageNum = Math.min(Math.max(1, pageNum), pageData.pageCount);
+                if(me.fireEvent('beforechange', me, pageNum) !== false){
+                    me.store.loadPage(pageNum);
+                }
+            }
+        } else if (k == e.HOME || k == e.END) {
+            e.stopEvent();
+            pageNum = k == e.HOME ? 1 : pageData.pageCount;
+            field.setValue(pageNum);
+        } else if (k == e.UP || k == e.PAGE_UP || k == e.DOWN || k == e.PAGE_DOWN) {
+            e.stopEvent();
+            pageNum = me.readPageFromInput(pageData);
+            if (pageNum) {
+                if (k == e.DOWN || k == e.PAGE_DOWN) {
+                    increment *= -1;
+                }
+                pageNum += increment;
+                if (pageNum >= 1 && pageNum <= pageData.pageCount) {
+                    field.setValue(pageNum);
+                }
+            }
+        }
+    },
+
+    // @private
+    beforeLoad : function(){
+        if (this.rendered) {
+            this.setChildDisabled('#refresh', true);
+        }
+    },
+
+    /**
+     * Move to the first page, has the same effect as clicking the 'first' button.
+     */
+    moveFirst : function(){
+        if (this.fireEvent('beforechange', this, 1) !== false){
+            this.store.loadPage(1);
+        }
+    },
+
+    /**
+     * Move to the previous page, has the same effect as clicking the 'previous' button.
+     */
+    movePrevious : function(){
+        var me = this,
+            prev = me.store.currentPage - 1;
+
+        if (prev > 0) {
+            if (me.fireEvent('beforechange', me, prev) !== false) {
+                me.store.previousPage();
+            }
+        }
+    },
+
+    /**
+     * Move to the next page, has the same effect as clicking the 'next' button.
+     */
+    moveNext : function(){
+        var me = this,
+            total = me.getPageData().pageCount,
+            next = me.store.currentPage + 1;
+
+        if (next <= total) {
+            if (me.fireEvent('beforechange', me, next) !== false) {
+                me.store.nextPage();
+            }
+        }
+    },
+
+    /**
+     * Move to the last page, has the same effect as clicking the 'last' button.
+     */
+    moveLast : function(){
+        var me = this,
+            last = me.getPageData().pageCount;
+
+        if (me.fireEvent('beforechange', me, last) !== false) {
+            me.store.loadPage(last);
+        }
+    },
+
+    /**
+     * Refresh the current page, has the same effect as clicking the 'refresh' button.
+     */
+    doRefresh : function(){
+        var me = this,
+            current = me.store.currentPage;
+
+        if (me.fireEvent('beforechange', me, current) !== false) {
+            me.store.loadPage(current);
+        }
+    },
+    
+    getStoreListeners: function() {
+        return {
+            beforeload: this.beforeLoad,
+            load: this.onLoad,
+            exception: this.onLoadError
+        };
+    },
+
+    /**
+     * Unbinds the paging toolbar from the specified {@link Ext.data.Store} **(deprecated)**
+     * @param {Ext.data.Store} store The data store to unbind
+     */
+    unbind : function(store){
+        this.bindStore(null);
+    },
+
+    /**
+     * Binds the paging toolbar to the specified {@link Ext.data.Store} **(deprecated)**
+     * @param {Ext.data.Store} store The data store to bind
+     */
+    bind : function(store){
+        this.bindStore(store);
+    },
+
+    // @private
+    onDestroy : function(){
+        this.unbind();
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * An internally used DataView for {@link Ext.form.field.ComboBox ComboBox}.
+ */
+Ext.define('Ext.view.BoundList', {
+    extend:  Ext.view.View ,
+    alias: 'widget.boundlist',
+    alternateClassName: 'Ext.BoundList',
+                                                                       
+    
+    mixins: {
+        queryable:  Ext.Queryable 
+    },
+
+    /**
+     * @cfg {Number} [pageSize=0]
+     * If greater than `0`, a {@link Ext.toolbar.Paging} is displayed at the bottom of the list and store
+     * queries will execute with page {@link Ext.data.Operation#start start} and
+     * {@link Ext.data.Operation#limit limit} parameters.
+     */
+    pageSize: 0,
+
+    /**
+     * @cfg {String} [displayField=""]
+     * The field from the store to show in the view.
+     */
+
+    /**
+     * @property {Ext.toolbar.Paging} pagingToolbar
+     * A reference to the PagingToolbar instance in this view. Only populated if {@link #pageSize} is greater
+     * than zero and the BoundList has been rendered.
+     */
+
+    // private overrides
+    baseCls: Ext.baseCSSPrefix + 'boundlist',
+    itemCls: Ext.baseCSSPrefix + 'boundlist-item',
+    listItemCls: '',
+    shadow: false,
+    trackOver: true,
+    refreshed: 0,
+
+    // This Component is used as a popup, not part of a complex layout. Display data immediately.
+    deferInitialRefresh: false,
+
+    componentLayout: 'boundlist',
+
+    childEls: [
+        'listEl'
+    ],
+
+    renderTpl: [
+        '<div id="{id}-listEl" class="{baseCls}-list-ct ', Ext.dom.Element.unselectableCls, '" style="overflow:auto"></div>',
+        '{%',
+            'var me=values.$comp, pagingToolbar=me.pagingToolbar;',
+            'if (pagingToolbar) {',
+                'pagingToolbar.ownerLayout = me.componentLayout;',
+                'Ext.DomHelper.generateMarkup(pagingToolbar.getRenderTree(), out);',
+            '}',
+        '%}',
+        {
+            disableFormats: true
+        }
+    ],
+
+    /**
+     * @cfg {String/Ext.XTemplate} tpl
+     * A String or Ext.XTemplate instance to apply to inner template.
+     *
+     * {@link Ext.view.BoundList} is used for the dropdown list of {@link Ext.form.field.ComboBox}.
+     * To customize the template you can do this:
+     *
+     *     Ext.create('Ext.form.field.ComboBox', {
+     *         fieldLabel   : 'State',
+     *         queryMode    : 'local',
+     *         displayField : 'text',
+     *         valueField   : 'abbr',
+     *         store        : Ext.create('StateStore', {
+     *             fields : ['abbr', 'text'],
+     *             data   : [
+     *                 {"abbr":"AL", "name":"Alabama"},
+     *                 {"abbr":"AK", "name":"Alaska"},
+     *                 {"abbr":"AZ", "name":"Arizona"}
+     *                 //...
+     *             ]
+     *         }),
+     *         listConfig : {
+     *             tpl : '<tpl for="."><div class="x-boundlist-item">{abbr}</div></tpl>'
+     *         }
+     *     });
+     *
+     * Defaults to:
+     *
+     *     Ext.create('Ext.XTemplate',
+     *         '<ul><tpl for=".">',
+     *             '<li role="option" class="' + itemCls + '">' + me.getInnerTpl(me.displayField) + '</li>',
+     *         '</tpl></ul>'
+     *     );
+     *
+     */
+
+    initComponent: function() {
+        var me = this,
+            baseCls = me.baseCls,
+            itemCls = me.itemCls;
+
+        me.selectedItemCls = baseCls + '-selected';
+        if (me.trackOver) {
+            me.overItemCls = baseCls + '-item-over';
+        }
+        me.itemSelector = "." + itemCls;
+
+        if (me.floating) {
+            me.addCls(baseCls + '-floating');
+        }
+
+        if (!me.tpl) {
+            // should be setting aria-posinset based on entire set of data
+            // not filtered set
+            me.tpl = new Ext.XTemplate(
+                '<ul class="' + Ext.plainListCls + '"><tpl for=".">',
+                    '<li role="option" unselectable="on" class="' + itemCls + '">' + me.getInnerTpl(me.displayField) + '</li>',
+                '</tpl></ul>'
+            );
+        } else if (!me.tpl.isTemplate) {
+            me.tpl = new Ext.XTemplate(me.tpl);
+        }
+
+        if (me.pageSize) {
+            me.pagingToolbar = me.createPagingToolbar();
+        }
+
+        me.callParent();
+    },
+
+    beforeRender: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // If there's a Menu among our ancestors, then add the menu class.
+        // This is so that the MenuManager does not see a mousedown in this Component as a document mousedown, outside the Menu
+        if (me.up('menu')) {
+            me.addCls(Ext.baseCSSPrefix + 'menu');
+        }
+    },
+
+    getRefOwner: function() {
+        return this.pickerField || this.callParent();
+    },
+
+    getRefItems: function() {
+        return this.pagingToolbar ? [ this.pagingToolbar ] : [];
+    },
+
+    createPagingToolbar: function() {
+        return Ext.widget('pagingtoolbar', {
+            id: this.id + '-paging-toolbar',
+            pageSize: this.pageSize,
+            store: this.dataSource,
+            border: false,
+            ownerCt: this,
+            ownerLayout: this.getComponentLayout()
+        });
+    },
+
+    // Do the job of a container layout at this point even though we are not a Container.
+    // TODO: Refactor as a Container.
+    finishRenderChildren: function () {
+        var toolbar = this.pagingToolbar;
+
+        this.callParent(arguments);
+
+        if (toolbar) {
+            toolbar.finishRender();
+        }
+    },
+
+    refresh: function(){
+        var me = this,
+            tpl = me.tpl,
+            toolbar = me.pagingToolbar,
+            rendered = me.rendered;
+
+        // Allow access to the context for XTemplate scriptlets
+        tpl.field = me.pickerField;
+        tpl.store = me.store;
+        me.callParent();
+        tpl.field =  tpl.store = null;
+
+        // The view removes the targetEl from the DOM before updating the template
+        // Ensure the toolbar goes to the end
+        if (rendered && toolbar && toolbar.rendered && !me.preserveScrollOnRefresh) {
+            me.el.appendChild(toolbar.el);
+        }
+
+        // IE6 strict can sometimes have repaint issues when showing
+        // the list from a remote data source
+        if (rendered && Ext.isIE6 && Ext.isStrict) {
+            me.listEl.repaint();
+        }
+    },
+
+    bindStore : function(store, initial) {
+        var toolbar = this.pagingToolbar;
+
+        this.callParent(arguments);
+        if (toolbar) {
+            toolbar.bindStore(store, initial);
+        }
+    },
+
+    getTargetEl: function() {
+        return this.listEl || this.el;
+    },
+
+    /**
+     * A method that returns the inner template for displaying items in the list.
+     * This method is useful to override when using a more complex display value, for example
+     * inserting an icon along with the text.
+     *
+     * The XTemplate is created with a reference to the owning form field in the `field` property to provide access
+     * to context. For example to highlight the currently typed value, the getInnerTpl may be configured into a 
+     * ComboBox as part of the {@link Ext.form.field.ComboBox#listConfig listConfig}:
+     *
+     *    listConfig: {
+     *        getInnerTpl: function() {
+     *            return '{[values.name.replace(this.field.getRawValue(), "<b>" + this.field.getRawValue() + "</b>")]}';
+     *        }
+     *    }
+     * @param {String} displayField The {@link #displayField} for the BoundList.
+     * @return {String} The inner template
+     */
+    getInnerTpl: function(displayField) {
+        return '{' + displayField + '}';
+    },
+
+    onDestroy: function() {
+        Ext.destroyMembers(this, 'pagingToolbar', 'listEl');
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A specialized {@link Ext.util.KeyNav} implementation for navigating a {@link Ext.view.BoundList} using
+ * the keyboard. The up, down, pageup, pagedown, home, and end keys move the active highlight
+ * through the list. The enter key invokes the selection model's select action using the highlighted item.
+ */
+Ext.define('Ext.view.BoundListKeyNav', {
+    extend:  Ext.util.KeyNav ,
+                                   
+
+    /**
+     * @cfg {Ext.view.BoundList} boundList (required)
+     * The {@link Ext.view.BoundList} instance for which key navigation will be managed.
+     */
+
+    constructor: function(el, config) {
+        var me = this;
+        me.boundList = config.boundList;
+        me.callParent([el, Ext.apply({}, config, me.defaultHandlers)]);
+    },
+
+    defaultHandlers: {
+        up: function() {
+            var me = this,
+                boundList = me.boundList,
+                allItems = boundList.all,
+                oldItem = boundList.highlightedItem,
+                oldItemIdx = oldItem ? boundList.indexOf(oldItem) : -1,
+                newItemIdx = oldItemIdx > 0 ? oldItemIdx - 1 : allItems.getCount() - 1; //wraps around
+            me.highlightAt(newItemIdx);
+        },
+
+        down: function() {
+            var me = this,
+                boundList = me.boundList,
+                allItems = boundList.all,
+                oldItem = boundList.highlightedItem,
+                oldItemIdx = oldItem ? boundList.indexOf(oldItem) : -1,
+                newItemIdx = oldItemIdx < allItems.getCount() - 1 ? oldItemIdx + 1 : 0; //wraps around
+            me.highlightAt(newItemIdx);
+        },
+
+        pageup: function() {
+            //TODO
+        },
+
+        pagedown: function() {
+            //TODO
+        },
+
+        home: function() {
+            this.highlightAt(0);
+        },
+
+        end: function() {
+            var me = this;
+            me.highlightAt(me.boundList.all.getCount() - 1);
+        },
+
+        enter: function(e) {
+            this.selectHighlighted(e);
+        }
+    },
+
+    /**
+     * Highlights the item at the given index.
+     * @param {Number} index
+     */
+    highlightAt: function(index) {
+        var boundList = this.boundList,
+            item = boundList.all.item(index);
+        if (item) {
+            item = item.dom;
+            boundList.highlightItem(item);
+            boundList.getTargetEl().scrollChildIntoView(item, false);
+        }
+    },
+
+    /**
+     * Triggers selection of the currently highlighted item according to the behavior of
+     * the configured SelectionModel.
+     */
+    selectHighlighted: function(e) {
+        var me = this,
+            boundList = me.boundList,
+            highlighted = boundList.highlightedItem,
+            selModel = boundList.getSelectionModel();
+        if (highlighted) {
+            selModel.selectWithEvent(boundList.getRecord(highlighted), e);
+        }
+    }
+
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Layout class for {@link Ext.form.field.ComboBox} fields. Handles sizing the input field.
+ * @private
+ */
+Ext.define('Ext.layout.component.field.ComboBox', {
+    extend:  Ext.layout.component.field.Trigger ,
+    alias: 'layout.combobox',
+                                       
+
+    type: 'combobox',
+
+    startingWidth: null,
+
+    getTextWidth: function () {
+        var me = this,
+            owner = me.owner,
+            store = owner.store,
+            field = owner.displayField,
+            storeLn = store.data.length,
+            value = '',
+            i = 0, n = 0, ln, item, width;
+
+        for (; i < storeLn; i++) {
+            item = store.getAt(i).data[field];
+            ln = item.length;
+            // compare the current item's length with the current longest length and store the value
+            if (ln > n) {
+                n = ln;
+                value = item;
+            }
+        }
+
+        width = Math.max(me.callParent(arguments), owner.inputEl.getTextWidth(value + owner.growAppend));
+
+        // it's important to know the starting width else the inputEl could be resized smaller than the boundlist
+        // NOTE that when removing items from the store that the startingWidth needs to be recalculated
+        if (!me.startingWidth || owner.removingRecords) {
+            me.startingWidth = width;
+
+            // also, if the width is less than growMin reset the default boundlist width
+            // or it will appear wider than the component if the trigger is clicked
+            if (width < owner.growMin) {
+                owner.defaultListConfig.minWidth = owner.growMin;
+            }
+
+            owner.removingRecords = false;
+        }
+ 
+        // only resize if the new width is greater than the starting width
+        return (width < me.startingWidth) ? me.startingWidth : width;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @docauthor Jason Johnston <jason at sencha.com>
+ *
+ * A combobox control with support for autocomplete, remote loading, and many other features.
+ *
+ * A ComboBox is like a combination of a traditional HTML text `<input>` field and a `<select>`
+ * field; the user is able to type freely into the field, and/or pick values from a dropdown selection
+ * list. The user can input any value by default, even if it does not appear in the selection list;
+ * to prevent free-form values and restrict them to items in the list, set {@link #forceSelection} to `true`.
+ *
+ * The selection list's options are populated from any {@link Ext.data.Store}, including remote
+ * stores. The data items in the store are mapped to each option's displayed text and backing value via
+ * the {@link #valueField} and {@link #displayField} configurations, respectively.
+ *
+ * If your store is not remote, i.e. it depends only on local data and is loaded up front, you should be
+ * sure to set the {@link #queryMode} to `'local'`, as this will improve responsiveness for the user.
+ *
+ * # Example usage:
+ *
+ *     @example
+ *     // The data store containing the list of states
+ *     var states = Ext.create('Ext.data.Store', {
+ *         fields: ['abbr', 'name'],
+ *         data : [
+ *             {"abbr":"AL", "name":"Alabama"},
+ *             {"abbr":"AK", "name":"Alaska"},
+ *             {"abbr":"AZ", "name":"Arizona"}
+ *             //...
+ *         ]
+ *     });
+ *
+ *     // Create the combo box, attached to the states data store
+ *     Ext.create('Ext.form.ComboBox', {
+ *         fieldLabel: 'Choose State',
+ *         store: states,
+ *         queryMode: 'local',
+ *         displayField: 'name',
+ *         valueField: 'abbr',
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * # Events
+ *
+ * To do something when something in ComboBox is selected, configure the select event:
+ *
+ *     var cb = Ext.create('Ext.form.ComboBox', {
+ *         // all of your config options
+ *         listeners:{
+ *              scope: yourScope,
+ *              'select': yourFunction
+ *         }
+ *     });
+ *
+ *     // Alternatively, you can assign events after the object is created:
+ *     var cb = new Ext.form.field.ComboBox(yourOptions);
+ *     cb.on('select', yourFunction, yourScope);
+ *
+ * # Multiple Selection
+ *
+ * ComboBox also allows selection of multiple items from the list; to enable multi-selection set the
+ * {@link #multiSelect} config to `true`.
+ * 
+ * # Filtered Stores
+ * 
+ * If you have a local store that is already filtered, you can use the {@link #lastQuery} config option
+ * to prevent the store from having the filter being cleared on first expand.
+ *
+ * ## Customized combobox
+ *
+ * Both the text shown in dropdown menu and text field can be easily customized:
+ *
+ *     @example
+ *     var states = Ext.create('Ext.data.Store', {
+ *         fields: ['abbr', 'name'],
+ *         data : [
+ *             {"abbr":"AL", "name":"Alabama"},
+ *             {"abbr":"AK", "name":"Alaska"},
+ *             {"abbr":"AZ", "name":"Arizona"}
+ *         ]
+ *     });
+ *
+ *     Ext.create('Ext.form.ComboBox', {
+ *         fieldLabel: 'Choose State',
+ *         store: states,
+ *         queryMode: 'local',
+ *         valueField: 'abbr',
+ *         renderTo: Ext.getBody(),
+ *         // Template for the dropdown menu.
+ *         // Note the use of "x-boundlist-item" class,
+ *         // this is required to make the items selectable.
+ *         tpl: Ext.create('Ext.XTemplate',
+ *             '<tpl for=".">',
+ *                 '<div class="x-boundlist-item">{abbr} - {name}</div>',
+ *             '</tpl>'
+ *         ),
+ *         // template for the content inside text field
+ *         displayTpl: Ext.create('Ext.XTemplate',
+ *             '<tpl for=".">',
+ *                 '{abbr} - {name}',
+ *             '</tpl>'
+ *         )
+ *     });
+ *
+ * See also the {@link #listConfig} option for additional configuration of the dropdown.
+ *
+ */
+Ext.define('Ext.form.field.ComboBox', {
+    extend: Ext.form.field.Picker ,
+                                                                                                                                                                            
+    alternateClassName: 'Ext.form.ComboBox',
+    alias: ['widget.combobox', 'widget.combo'],
+    mixins: {
+        bindable:  Ext.util.Bindable     
+    },
+
+    componentLayout: 'combobox',
+
+    /**
+     * @cfg {String} [triggerCls='x-form-arrow-trigger']
+     * An additional CSS class used to style the trigger button. The trigger will always get the {@link #triggerBaseCls}
+     * by default and `triggerCls` will be **appended** if specified.
+     */
+    triggerCls: Ext.baseCSSPrefix + 'form-arrow-trigger',
+    
+    /**
+     * @cfg {String} [hiddenName=""]
+     * The name of an underlying hidden field which will be synchronized with the underlying value of the combo.
+     * This option is useful if the combo is part of a form element doing a regular form post. The hidden field
+     * will not be created unless a hiddenName is specified.
+     */
+    hiddenName: '',
+    
+    /**
+     * @property {Ext.Element} hiddenDataEl
+     * @private
+     */
+
+    /**
+     * @private
+     * @cfg {String}
+     * CSS class used to find the {@link #hiddenDataEl}
+     */
+    hiddenDataCls: Ext.baseCSSPrefix + 'hide-display ' + Ext.baseCSSPrefix + 'form-data-hidden',
+
+    /**
+     * @cfg
+     * @inheritdoc
+     */
+    fieldSubTpl: [
+        '<div class="{hiddenDataCls}" role="presentation"></div>',
+        '<input id="{id}" type="{type}" {inputAttrTpl} class="{fieldCls} {typeCls} {editableCls}" autocomplete="off"',
+            '<tpl if="value"> value="{[Ext.util.Format.htmlEncode(values.value)]}"</tpl>',
+            '<tpl if="name"> name="{name}"</tpl>',
+            '<tpl if="placeholder"> placeholder="{placeholder}"</tpl>',
+            '<tpl if="size"> size="{size}"</tpl>',
+            '<tpl if="maxLength !== undefined"> maxlength="{maxLength}"</tpl>',
+            '<tpl if="readOnly"> readonly="readonly"</tpl>',
+            '<tpl if="disabled"> disabled="disabled"</tpl>',
+            '<tpl if="tabIdx"> tabIndex="{tabIdx}"</tpl>',
+            '<tpl if="fieldStyle"> style="{fieldStyle}"</tpl>',
+            '/>',
+        {
+            compiled: true,
+            disableFormats: true
+        }
+    ],
+
+    getSubTplData: function(){
+        var me = this;
+        Ext.applyIf(me.subTplData, {
+            hiddenDataCls: me.hiddenDataCls
+        });
+        return me.callParent(arguments);
+    },
+
+    afterRender: function(){
+        var me = this;
+        me.callParent(arguments);
+        me.setHiddenValue(me.value);
+    },
+
+    /**
+     * @cfg {Ext.data.Store/String/Array} store
+     * The data source to which this combo is bound. Acceptable values for this property are:
+     *
+     *   - **any {@link Ext.data.Store Store} subclass**
+     *   - **an {@link Ext.data.Store#storeId ID of a store}**
+     *   - **an Array** : Arrays will be converted to a {@link Ext.data.Store} internally, automatically generating
+     *     {@link Ext.data.Field#name field names} to work with all data components.
+     *
+     *     - **1-dimensional array** : (e.g., `['Foo','Bar']`)
+     *
+     *       A 1-dimensional array will automatically be expanded (each array item will be used for both the combo
+     *       {@link #valueField} and {@link #displayField})
+     *
+     *     - **2-dimensional array** : (e.g., `[['f','Foo'],['b','Bar']]`)
+     *
+     *       For a multi-dimensional array, the value in index 0 of each item will be assumed to be the combo
+     *       {@link #valueField}, while the value at index 1 is assumed to be the combo {@link #displayField}.
+     *
+     * See also {@link #queryMode}.
+     */
+
+    /**
+     * @cfg {Boolean} multiSelect
+     * If set to `true`, allows the combo field to hold more than one value at a time, and allows selecting multiple
+     * items from the dropdown list. The combo's text field will show all selected values separated by the
+     * {@link #delimiter}.
+     */
+    multiSelect: false,
+
+    //<locale>
+    /**
+     * @cfg {String} delimiter
+     * The character(s) used to separate the {@link #displayField display values} of multiple selected items when
+     * `{@link #multiSelect} = true`.
+     */
+    delimiter: ', ',
+    //</locale>
+
+    /**
+     * @cfg {String} displayField
+     * The underlying {@link Ext.data.Field#name data field name} to bind to this ComboBox.
+     *
+     * See also `{@link #valueField}`.
+     */
+    displayField: 'text',
+
+    /**
+     * @cfg {String} valueField (required)
+     * The underlying {@link Ext.data.Field#name data value name} to bind to this ComboBox.
+     *
+     * **Note**: use of a `valueField` requires the user to make a selection in order for a value to be mapped. See also
+     * `{@link #displayField}`.
+     *
+     * Defaults to match the value of the {@link #displayField} config.
+     */
+
+    /**
+     * @cfg {String} triggerAction
+     * The action to execute when the trigger is clicked.
+     *
+     *   - **`'all'`** :
+     *
+     *     {@link #doQuery run the query} specified by the `{@link #allQuery}` config option
+     *
+     *   - **`'last'`** :
+     *
+     *     {@link #doQuery run the query} using the `{@link #lastQuery last query value}`.
+     *
+     *   - **`'query'`** :
+     *
+     *     {@link #doQuery run the query} using the {@link Ext.form.field.Base#getRawValue raw value}.
+     *
+     * See also `{@link #queryParam}`.
+     */
+    triggerAction: 'all',
+
+    /**
+     * @cfg {String} allQuery
+     * The text query to send to the server to return all records for the list with no filtering
+     */
+    allQuery: '',
+
+    /**
+     * @cfg {String} queryParam
+     * Name of the parameter used by the Store to pass the typed string when the ComboBox is configured with
+     * `{@link #queryMode}: 'remote'`. If explicitly set to a falsy value it will not be sent.
+     */
+    queryParam: 'query',
+
+    /**
+     * @cfg {String} queryMode
+     * The mode in which the ComboBox uses the configured Store. Acceptable values are:
+     *
+     *   - **`'remote'`** :
+     *
+     *     In `queryMode: 'remote'`, the ComboBox loads its Store dynamically based upon user interaction.
+     *
+     *     This is typically used for "autocomplete" type inputs, and after the user finishes typing, the Store is {@link
+     *     Ext.data.Store#method-load load}ed.
+     *
+     *     A parameter containing the typed string is sent in the load request. The default parameter name for the input
+     *     string is `query`, but this can be configured using the {@link #queryParam} config.
+     *
+     *     In `queryMode: 'remote'`, the Store may be configured with `{@link Ext.data.Store#remoteFilter remoteFilter}:
+     *     true`, and further filters may be _programatically_ added to the Store which are then passed with every load
+     *     request which allows the server to further refine the returned dataset.
+     *
+     *     Typically, in an autocomplete situation, {@link #hideTrigger} is configured `true` because it has no meaning for
+     *     autocomplete.
+     *
+     *   - **`'local'`** :
+     *
+     *     ComboBox loads local data
+     *
+     *         var combo = new Ext.form.field.ComboBox({
+     *             renderTo: document.body,
+     *             queryMode: 'local',
+     *             store: new Ext.data.ArrayStore({
+     *                 id: 0,
+     *                 fields: [
+     *                     'myId',  // numeric value is the key
+     *                     'displayText'
+     *                 ],
+     *                 data: [[1, 'item1'], [2, 'item2']]  // data is local
+     *             }),
+     *             valueField: 'myId',
+     *             displayField: 'displayText',
+     *             triggerAction: 'all'
+     *         });
+     */
+    queryMode: 'remote',
+
+    /**
+     * @cfg {Boolean} [queryCaching=true]
+     * When true, this prevents the combo from re-querying (either locally or remotely) when the current query
+     * is the same as the previous query.
+     */
+    queryCaching: true,
+
+    /**
+     * @cfg {Number} pageSize
+     * If greater than `0`, a {@link Ext.toolbar.Paging} is displayed in the footer of the dropdown list and the
+     * {@link #doQuery filter queries} will execute with page start and {@link Ext.view.BoundList#pageSize limit}
+     * parameters. Only applies when `{@link #queryMode} = 'remote'`.
+     */
+    pageSize: 0,
+
+    /**
+     * @cfg {Number} queryDelay
+     * The length of time in milliseconds to delay between the start of typing and sending the query to filter the
+     * dropdown list.
+     *
+     * Defaults to `500` if `{@link #queryMode} = 'remote'` or `10` if `{@link #queryMode} = 'local'`
+     */
+
+    /**
+     * @cfg {Number} minChars
+     * The minimum number of characters the user must type before autocomplete and {@link #typeAhead} activate.
+     *
+     * Defaults to `4` if `{@link #queryMode} = 'remote'` or `0` if `{@link #queryMode} = 'local'`,
+     * does not apply if `{@link Ext.form.field.Trigger#editable editable} = false`.
+     */
+
+    /**
+     * @cfg {Boolean} [anyMatch=false]
+     * Configure as `true` to allow match the typed characters at any position in the {@link #valueField}'s value.
+     */
+    anyMatch: false,
+
+    /**
+     * @cfg {Boolean} [caseSensitive=false]
+     * Configure as `true` to make the filtering match with exact case matching
+     */
+    caseSensitive: false,
+
+    /**
+     * @cfg {Boolean} autoSelect
+     * `true` to automatically highlight the first result gathered by the data store in the dropdown list when it is
+     * opened. A false value would cause nothing in the list to be highlighted automatically, so
+     * the user would have to manually highlight an item before pressing the enter or {@link #selectOnTab tab} key to
+     * select it (unless the value of ({@link #typeAhead}) were true), or use the mouse to select a value.
+     */
+    autoSelect: true,
+
+    /**
+     * @cfg {Boolean} typeAhead
+     * `true` to populate and autoselect the remainder of the text being typed after a configurable delay
+     * ({@link #typeAheadDelay}) if it matches a known value.
+     */
+    typeAhead: false,
+
+    /**
+     * @cfg {Number} typeAheadDelay
+     * The length of time in milliseconds to wait until the typeahead text is displayed if `{@link #typeAhead} = true`
+     */
+    typeAheadDelay: 250,
+
+    /**
+     * @cfg {Boolean} selectOnTab
+     * Whether the Tab key should select the currently highlighted item.
+     */
+    selectOnTab: true,
+
+    /**
+     * @cfg {Boolean} forceSelection
+     * `true` to restrict the selected value to one of the values in the list, `false` to allow the user to set
+     * arbitrary text into the field.
+     */
+    forceSelection: false,
+
+    /**
+     * @cfg {Boolean} growToLongestValue
+     * `false` to not allow the component to resize itself when its data changes
+     * (and its {@link #grow} property is `true`)
+     */
+    growToLongestValue: true,
+    
+    /**
+     * @cfg {Boolean} enableRegEx
+     * *When {@link #queryMode} is `'local'` only*
+     *
+     * Set to `true` to have the ComboBox use the typed value as a RegExp source to filter the store to get possible matches.
+     */
+
+    /**
+     * @cfg {String} valueNotFoundText
+     * When using a name/value combo, if the value passed to setValue is not found in the store, valueNotFoundText will
+     * be displayed as the field text if defined. If this default text is used, it means there
+     * is no value set and no validation will occur on this field.
+     */
+
+    /**
+     * @property {String} lastQuery
+     * The value of the match string used to filter the store. Delete this property to force a requery. Example use:
+     *
+     *     var combo = new Ext.form.field.ComboBox({
+     *         ...
+     *         queryMode: 'remote',
+     *         listeners: {
+     *             // delete the previous query in the beforequery event or set
+     *             // combo.lastQuery = null (this will reload the store the next time it expands)
+     *             beforequery: function(qe){
+     *                 delete qe.combo.lastQuery;
+     *             }
+     *         }
+     *     });
+     *
+     * To make sure the filter in the store is not cleared the first time the ComboBox trigger is used configure the
+     * combo with `lastQuery=''`. Example use:
+     *
+     *     var combo = new Ext.form.field.ComboBox({
+     *         ...
+     *         queryMode: 'local',
+     *         triggerAction: 'all',
+     *         lastQuery: ''
+     *     });
+     */
+
+    /**
+     * @cfg {Object} defaultListConfig
+     * Set of options that will be used as defaults for the user-configured {@link #listConfig} object.
+     */
+    defaultListConfig: {
+        loadingHeight: 70,
+        minWidth: 70,
+        maxHeight: 300,
+        shadow: 'sides'
+    },
+
+    /**
+     * @cfg {String/HTMLElement/Ext.Element} transform
+     * The id, DOM node or {@link Ext.Element} of an existing HTML `<select>` element to convert into a ComboBox. The
+     * target select's options will be used to build the options in the ComboBox dropdown; a configured {@link #store}
+     * will take precedence over this.
+     */
+
+    /**
+     * @cfg {Object} listConfig
+     * An optional set of configuration properties that will be passed to the {@link Ext.view.BoundList}'s constructor.
+     * Any configuration that is valid for BoundList can be included. Some of the more useful ones are:
+     *
+     *   - {@link Ext.view.BoundList#cls cls} - defaults to empty
+     *   - {@link Ext.view.BoundList#emptyText emptyText} - defaults to empty string
+     *   - {@link Ext.view.BoundList#itemSelector itemSelector} - defaults to the value defined in BoundList
+     *   - {@link Ext.view.BoundList#loadingText loadingText} - defaults to `'Loading...'`
+     *   - {@link Ext.view.BoundList#minWidth minWidth} - defaults to `70`
+     *   - {@link Ext.view.BoundList#maxWidth maxWidth} - defaults to `undefined`
+     *   - {@link Ext.view.BoundList#maxHeight maxHeight} - defaults to `300`
+     *   - {@link Ext.view.BoundList#resizable resizable} - defaults to `false`
+     *   - {@link Ext.view.BoundList#shadow shadow} - defaults to `'sides'`
+     *   - {@link Ext.view.BoundList#width width} - defaults to `undefined` (automatically set to the width of the ComboBox
+     *     field if {@link #matchFieldWidth} is true)
+     *     {@link Ext.view.BoundList#getInnerTpl getInnerTpl} A function which returns a template string which renders
+     *     the ComboBox's {@link #displayField} value in the dropdown. This defaults to just outputting the raw value,
+     *     but may use any {@link Ext.XTemplate XTemplate} methods to produce output.
+     *     
+     *     The running template is configured with some extra properties that provide some context:
+     *         - field {@link Ext.form.field.ComboBox ComboBox} This combobox
+     *         - store {@link Ext.data.Store Store} This combobox's data store
+     */
+
+    //private
+    ignoreSelection: 0,
+
+    //private, tells the layout to recalculate its startingWidth when a record is removed from its bound store
+    removingRecords: null,
+
+    //private helper
+    resizeComboToGrow: function () {
+        var me = this;
+        return me.grow && me.growToLongestValue;
+    },
+
+    initComponent: function() {
+        var me = this,
+            isDefined = Ext.isDefined,
+            store = me.store,
+            transform = me.transform,
+            transformSelect, isLocalMode;
+
+        Ext.applyIf(me.renderSelectors, {
+            hiddenDataEl: '.' + me.hiddenDataCls.split(' ').join('.')
+        });
+        
+        if (me.typeAhead && me.multiSelect) {
+            Ext.Error.raise('typeAhead and multiSelect are mutually exclusive options -- please remove one of them.');
+        }
+        if (me.typeAhead && !me.editable) {
+            Ext.Error.raise('If typeAhead is enabled the combo must be editable: true -- please change one of those settings.');
+        }
+        if (me.selectOnFocus && !me.editable) {
+            Ext.Error.raise('If selectOnFocus is enabled the combo must be editable: true -- please change one of those settings.');
+        }
+
+        this.addEvents(
+            /**
+             * @event beforequery
+             * Fires before all queries are processed. Return false to cancel the query or set the queryPlan's cancel
+             * property to true.
+             *
+             * @param {Object} queryPlan An object containing details about the query to be executed.
+             * @param {Ext.form.field.ComboBox} queryPlan.combo A reference to this ComboBox.
+             * @param {String} queryPlan.query The query value to be used to match against the ComboBox's {@link #valueField}.
+             * @param {Boolean} queryPlan.forceAll If `true`, causes the query to be executed even if the minChars threshold is not met.
+             * @param {Boolean} queryPlan.cancel A boolean value which, if set to `true` upon return, causes the query not to be executed.
+             * @param {Boolean} queryPlan.rawQuery If `true` indicates that the raw input field value is being used, and upon store load,
+             */
+            'beforequery',
+
+            /**
+             * @event select
+             * Fires when at least one list item is selected.
+             * @param {Ext.form.field.ComboBox} combo This combo box
+             * @param {Array} records The selected records
+             */
+            'select',
+
+            /**
+             * @event beforeselect
+             * Fires before the selected item is added to the collection
+             * @param {Ext.form.field.ComboBox} combo This combo box
+             * @param {Ext.data.Record} record The selected record
+             * @param {Number} index The index of the selected record
+             */
+            'beforeselect',
+
+            /**
+             * @event beforedeselect
+             * Fires before the deselected item is removed from the collection
+             * @param {Ext.form.field.ComboBox} combo This combo box
+             * @param {Ext.data.Record} record The deselected record
+             * @param {Number} index The index of the deselected record
+             */
+            'beforedeselect'
+        );
+
+        // Build store from 'transform' HTML select element's options
+        if (transform) {
+            transformSelect = Ext.getDom(transform);
+            if (transformSelect) {
+                if (!me.store) {
+                    store = Ext.Array.map(Ext.Array.from(transformSelect.options), function(option){
+                        return [option.value, option.text];
+                    });
+                }
+                if (!me.name) {
+                    me.name = transformSelect.name;
+                }
+                if (!('value' in me)) {
+                    me.value = transformSelect.value;
+                }
+            }
+        }
+
+        me.bindStore(store || 'ext-empty-store', true);
+        store = me.store;
+        if (store.autoCreated) {
+            me.queryMode = 'local';
+            me.valueField = me.displayField = 'field1';
+            if (!store.expanded) {
+                me.displayField = 'field2';
+            }
+        }
+
+        if (!isDefined(me.valueField)) {
+            me.valueField = me.displayField;
+        }
+
+        isLocalMode = me.queryMode === 'local';
+        if (!isDefined(me.queryDelay)) {
+            me.queryDelay = isLocalMode ? 10 : 500;
+        }
+        if (!isDefined(me.minChars)) {
+            me.minChars = isLocalMode ? 0 : 4;
+        }
+
+        if (!me.displayTpl) {
+            me.displayTpl = new Ext.XTemplate(
+                '<tpl for=".">' +
+                    '{[typeof values === "string" ? values : values["' + me.displayField + '"]]}' +
+                    '<tpl if="xindex < xcount">' + me.delimiter + '</tpl>' +
+                '</tpl>'
+            );
+        } else if (Ext.isString(me.displayTpl)) {
+            me.displayTpl = new Ext.XTemplate(me.displayTpl);
+        }
+
+        me.callParent();
+
+        me.doQueryTask = new Ext.util.DelayedTask(me.doRawQuery, me);
+
+        // store has already been loaded, setValue
+        if (me.store.getCount() > 0) {
+            me.setValue(me.value);
+        }
+
+        // render in place of 'transform' select
+        if (transformSelect) {
+            me.render(transformSelect.parentNode, transformSelect);
+            Ext.removeNode(transformSelect);
+            delete me.renderTo;
+        }
+    },
+
+    /**
+     * Returns the store associated with this ComboBox.
+     * @return {Ext.data.Store} The store
+     */
+    getStore : function(){
+        return this.store;
+    },
+
+    beforeBlur: function() {
+        this.doQueryTask.cancel();
+        this.assertValue();
+    },
+
+    // private
+    assertValue: function() {
+        var me = this,
+            value = me.getRawValue(),
+            rec, currentValue;
+
+        if (me.forceSelection) {
+            if (me.multiSelect) {
+                // For multiselect, check that the current displayed value matches the current
+                // selection, if it does not then revert to the most recent selection.
+                if (value !== me.getDisplayValue()) {
+                    me.setValue(me.lastSelection);
+                }
+            } else {
+                // For single-select, match the displayed value to a record and select it,
+                // if it does not match a record then revert to the most recent selection.
+                rec = me.findRecordByDisplay(value);
+                if (rec) {
+                    currentValue = me.value;
+                    // Prevent an issue where we have duplicate display values with
+                    // different underlying values.
+                    if (!me.findRecordByValue(currentValue)) {
+                        me.select(rec, true);
+                    }
+                } else {
+                    me.setValue(me.lastSelection);
+                }
+            }
+        }
+        me.collapse();
+    },
+
+    onTypeAhead: function() {
+        var me = this,
+            displayField = me.displayField,
+            record = me.store.findRecord(displayField, me.getRawValue()),
+            boundList = me.getPicker(),
+            newValue, len, selStart;
+
+        if (record) {
+            newValue = record.get(displayField);
+            len = newValue.length;
+            selStart = me.getRawValue().length;
+
+            boundList.highlightItem(boundList.getNode(record));
+
+            if (selStart !== 0 && selStart !== len) {
+                me.setRawValue(newValue);
+                me.selectText(selStart, newValue.length);
+            }
+        }
+    },
+
+    // invoked when a different store is bound to this combo
+    // than the original
+    resetToDefault: Ext.emptyFn,
+
+    beforeReset: function() {
+        this.callParent();
+
+        // If filtered on typed value, unfilter.
+        if (this.queryFilter && !this.queryFilter.disabled) {
+            this.queryFilter.disabled = true;
+            this.store.filter();
+        }
+    },
+
+    onUnbindStore: function(store) {
+        var me = this,
+            picker = me.picker;
+
+        // If we'd added a local filter, remove it
+        if (me.queryFilter) {
+            me.store.removeFilter(me.queryFilter);
+        }
+        if (!store && picker) {
+            picker.bindStore(null);
+        }
+    },
+
+    onBindStore: function(store, initial) {
+        var picker = this.picker;
+        if (!initial) {
+            this.resetToDefault();
+        }
+
+        if (picker) {
+            picker.bindStore(store);
+        }
+    },
+
+    getStoreListeners: function() {
+        var me = this;
+
+        return {
+            beforeload: me.onBeforeLoad,
+            clear: me.onClear,
+            datachanged: me.onDataChanged,
+            load: me.onLoad,
+            exception: me.onException,
+            remove: me.onRemove
+        }; 
+    },
+
+    onBeforeLoad: function(){
+        // If we're remote loading, the load mask will show which will trigger a deslectAll.
+        // This selection change will trigger the collapse in onListSelectionChange. As such
+        // we'll veto it for now and restore selection listeners when we've loaded.
+        ++this.ignoreSelection;    
+    },
+
+    onDataChanged: function() {
+        var me = this;
+
+        if (me.resizeComboToGrow()) {
+            me.updateLayout();
+        }
+    },
+
+    onClear: function() {
+        var me = this;
+
+        if (me.resizeComboToGrow()) {
+            me.removingRecords = true;
+            me.onDataChanged();
+        }
+    },
+
+    onRemove: function() {
+        var me = this;
+
+        if (me.resizeComboToGrow()) {
+            me.removingRecords = true;
+        }
+    },
+
+    onException: function(){
+        if (this.ignoreSelection > 0) {
+            --this.ignoreSelection;
+        }
+        this.collapse();    
+    },
+
+    onLoad: function(store, records, success) {
+        var me = this;
+
+        if (me.ignoreSelection > 0) {
+            --me.ignoreSelection;
+        }
+
+        // If not querying using the raw field value, we can set the value now we have data
+        if (success && !store.lastOptions.rawQuery) {
+            // Set the value on load
+
+            // There's no value.
+            if (me.value == null) {
+                // Highlight the first item in the list if autoSelect: true
+                if (me.store.getCount()) {
+                    me.doAutoSelect();
+                } else {
+                    // assign whatever empty value we have to prevent change from firing
+                    me.setValue(me.value);
+                }
+            } else {
+                me.setValue(me.value);
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Execute the query with the raw contents within the textfield.
+     */
+    doRawQuery: function() {
+        this.doQuery(this.getRawValue(), false, true);
+    },
+
+    /**
+     * Executes a query to filter the dropdown list. Fires the {@link #beforequery} event prior to performing the query
+     * allowing the query action to be canceled if needed.
+     *
+     * @param {String} queryString The string to use to filter available items by matching against the configured {@link #valueField}.
+     * @param {Boolean} [forceAll=false] `true` to force the query to execute even if there are currently fewer characters in
+     * the field than the minimum specified by the `{@link #minChars}` config option. It also clears any filter
+     * previously saved in the current store.
+     * @param {Boolean} [rawQuery=false] Pass as true if the raw typed value is being used as the query string. This causes the
+     * resulting store load to leave the raw value undisturbed.
+     * @return {Boolean} true if the query was permitted to run, false if it was cancelled by a {@link #beforequery}
+     * handler.
+     */
+    doQuery: function(queryString, forceAll, rawQuery) {
+        var me = this,
+
+            // Decide if, and how we are going to query the store
+            queryPlan = me.beforeQuery({
+                query: queryString || '',
+                rawQuery: rawQuery,
+                forceAll: forceAll,
+                combo: me,
+                cancel: false
+            });
+
+        // Allow veto.
+        if (queryPlan === false || queryPlan.cancel) {
+            return false;
+        }
+
+        // If they're using the same value as last time, just show the dropdown
+        if (me.queryCaching && queryPlan.query === me.lastQuery) {
+            me.expand();
+        }
+        
+        // Otherwise filter or load the store
+        else {
+            me.lastQuery = queryPlan.query;
+
+            if (me.queryMode === 'local') {
+                me.doLocalQuery(queryPlan);
+
+            } else {
+                me.doRemoteQuery(queryPlan);
+            }
+        }
+
+        return true;
+    },
+
+    /**
+     * @template
+     * A method which may modify aspects of how the store is to be filtered (if {@link #queryMode} is `"local"`)
+     * of loaded (if {@link #queryMode} is `"remote"`).
+     *
+     * This is called by the {@link #doQuery method, and may be overridden in subclasses to modify
+     * the default behaviour.
+     *
+     * This method is passed an object containing information about the upcoming query operation which it may modify
+     * before returning.
+     *
+     * @param {Object} queryPlan An object containing details about the query to be executed.
+     * @param {String} queryPlan.query The query value to be used to match against the ComboBox's {@link #valueField}.
+     * @param {Boolean} queryPlan.forceAll If `true`, causes the query to be executed even if the minChars threshold is not met.
+     * @param {Boolean} queryPlan.cancel A boolean value which, if set to `true` upon return, causes the query not to be executed.
+     * @param {Boolean} queryPlan.rawQuery If `true` indicates that the raw input field value is being used, and upon store load,
+     * the input field value should **not** be overwritten.
+     *
+     */
+    beforeQuery: function(queryPlan) {
+        var me = this;
+
+        // Allow beforequery event to veto by returning false
+        if (me.fireEvent('beforequery', queryPlan) === false) {
+            queryPlan.cancel = true;
+        }
+
+        // Allow beforequery event to veto by returning setting the cancel flag
+        else if (!queryPlan.cancel) {
+
+            // If the minChars threshold has not been met, and we're not forcing an "all" query, cancel the query
+            if (queryPlan.query.length < me.minChars && !queryPlan.forceAll) {
+                queryPlan.cancel = true;
+            }
+        }
+        return queryPlan;
+    },
+
+    doLocalQuery: function(queryPlan) {
+        var me = this,
+            queryString = queryPlan.query;
+
+        // Create our filter when first needed
+        if (!me.queryFilter) {
+            // Create the filter that we will use during typing to filter the Store
+            me.queryFilter = new Ext.util.Filter({
+                id: me.id + '-query-filter',
+                anyMatch: me.anyMatch,
+                caseSensitive: me.caseSensitive,
+                root: 'data',
+                property: me.displayField
+            });
+            me.store.addFilter(me.queryFilter, false);
+        }
+
+        // Querying by a string...
+        if (queryString || !queryPlan.forceAll) {
+            me.queryFilter.disabled = false;
+            me.queryFilter.setValue(me.enableRegEx ? new RegExp(queryString) : queryString);
+        }
+
+        // If forceAll being used, or no query string, disable the filter
+        else {
+            me.queryFilter.disabled = true;
+        }
+
+        // Filter the Store according to the updated filter
+        me.store.filter();
+
+        // Expand after adjusting the filter unless there are no matches
+        if (me.store.getCount()) {
+            me.expand();
+        } else {
+            me.collapse();
+        }
+
+        me.afterQuery(queryPlan);
+    },
+
+    doRemoteQuery: function(queryPlan) {
+        var me = this,
+            loadCallback = function() {
+                me.afterQuery(queryPlan);
+            };
+
+        // expand before loading so LoadMask can position itself correctly
+        me.expand();
+
+        // In queryMode: 'remote', we assume Store filters are added by the developer as remote filters,
+        // and these are automatically passed as params with every load call, so we do *not* call clearFilter.
+        if (me.pageSize) {
+            // if we're paging, we've changed the query so start at page 1.
+            me.loadPage(1, {
+                rawQuery: queryPlan.rawQuery,
+                callback: loadCallback
+            });
+        } else {
+            me.store.load({
+                params: me.getParams(queryPlan.query),
+                rawQuery: queryPlan.rawQuery,
+                callback: loadCallback
+            });
+        }
+    },
+
+    /**
+     * @template
+     * A method called when the filtering caused by the {@link #doQuery} call is complete and the store has been
+     * either filtered locally (if {@link #queryMode} is `"local"`), or has been loaded using the specified filtering.
+     *
+     * @param {Object} queryPlan An object containing details about the query was executed.
+     * @param {String} queryPlan.query The query value to be used to match against the ComboBox's {@link #valueField}.
+     * @param {Boolean} queryPlan.forceAll If `true`, causes the query to be executed even if the minChars threshold is not met.
+     * @param {Boolean} queryPlan.cancel A boolean value which, if set to `true` upon return, causes the query not to be executed.
+     * @param {Boolean} queryPlan.rawQuery If `true` indicates that the raw input field value is being used, and upon store load,
+     * the input field value should **not** be overwritten.
+     * 
+     */
+    afterQuery: function(queryPlan) {
+        var me = this;
+
+        if (me.store.getCount()) {
+            if (me.typeAhead) {
+                me.doTypeAhead();
+            }
+
+            // Clear current selection if it does not match the current value in the field
+            if (me.getRawValue() !== me.getDisplayValue()) {
+                me.ignoreSelection++;
+                me.picker.getSelectionModel().deselectAll();
+                me.ignoreSelection--;
+            }
+
+            if (queryPlan.rawQuery) {
+                me.syncSelection();
+                if (me.picker && !me.picker.getSelectionModel().hasSelection()) {
+                    me.doAutoSelect();
+                }
+            } else {
+                me.doAutoSelect();
+            }
+        }
+    },
+
+    loadPage: function(pageNum, options) {
+        this.store.loadPage(pageNum, Ext.apply({
+            params: this.getParams(this.lastQuery)
+        }, options));
+    },
+
+    onPageChange: function(toolbar, newPage){
+        /*
+         * Return false here so we can call load ourselves and inject the query param.
+         * We don't want to do this for every store load since the developer may load
+         * the store through some other means so we won't add the query param.
+         */
+        this.loadPage(newPage);
+        return false;
+    },
+
+    // private
+    getParams: function(queryString) {
+        var params = {},
+            param = this.queryParam;
+
+        if (param) {
+            params[param] = queryString;
+        }
+        return params;
+    },
+
+    /**
+     * @private
+     * If the autoSelect config is true, and the picker is open, highlights the first item.
+     */
+    doAutoSelect: function() {
+        var me = this,
+            picker = me.picker,
+            lastSelected, itemNode;
+        if (picker && me.autoSelect && me.store.getCount() > 0) {
+            // Highlight the last selected item and scroll it into view
+            lastSelected = picker.getSelectionModel().lastSelected;
+            itemNode = picker.getNode(lastSelected || 0);
+            if (itemNode) {
+                picker.highlightItem(itemNode);
+                picker.listEl.scrollChildIntoView(itemNode, false);
+            }
+        }
+    },
+
+    doTypeAhead: function() {
+        if (!this.typeAheadTask) {
+            this.typeAheadTask = new Ext.util.DelayedTask(this.onTypeAhead, this);
+        }
+        if (this.lastKey != Ext.EventObject.BACKSPACE && this.lastKey != Ext.EventObject.DELETE) {
+            this.typeAheadTask.delay(this.typeAheadDelay);
+        }
+    },
+
+    onTriggerClick: function() {
+        var me = this;
+        if (!me.readOnly && !me.disabled) {
+            if (me.isExpanded) {
+                me.collapse();
+            } else {
+                me.onFocus({});
+                if (me.triggerAction === 'all') {
+                    me.doQuery(me.allQuery, true);
+                } else if (me.triggerAction === 'last') {
+                    me.doQuery(me.lastQuery, true);
+                } else {
+                    me.doQuery(me.getRawValue(), false, true);
+                }
+            }
+            me.inputEl.focus();
+        }
+    },
+
+    onPaste: function(){
+        var me = this;
+        
+        if (!me.readOnly && !me.disabled && me.editable) {
+            me.doQueryTask.delay(me.queryDelay);
+        }
+    },
+
+    // store the last key and doQuery if relevant
+    onKeyUp: function(e, t) {
+        var me = this,
+            key = e.getKey();
+
+        if (!me.readOnly && !me.disabled && me.editable) {
+            me.lastKey = key;
+            // we put this in a task so that we can cancel it if a user is
+            // in and out before the queryDelay elapses
+
+            // perform query w/ any normal key or backspace or delete
+            if (!e.isSpecialKey() || key == e.BACKSPACE || key == e.DELETE) {
+                me.doQueryTask.delay(me.queryDelay);
+            }
+        }
+
+        if (me.enableKeyEvents) {
+            me.callParent(arguments);
+        }
+    },
+
+    initEvents: function() {
+        var me = this;
+        me.callParent();
+
+        /*
+         * Setup keyboard handling. If enableKeyEvents is true, we already have
+         * a listener on the inputEl for keyup, so don't create a second.
+         */
+        if (!me.enableKeyEvents) {
+            me.mon(me.inputEl, 'keyup', me.onKeyUp, me);
+        }
+        me.mon(me.inputEl, 'paste', me.onPaste, me);
+    },
+
+    onDestroy: function() {
+        Ext.destroy(this.listKeyNav);
+        this.bindStore(null);
+        this.callParent();
+    },
+
+    // The picker (the dropdown) must have its zIndex managed by the same ZIndexManager which is
+    // providing the zIndex of our Container.
+    onAdded: function() {
+        var me = this;
+        me.callParent(arguments);
+        if (me.picker) {
+            me.picker.ownerCt = me.up('[floating]');
+            me.picker.registerWithOwnerCt();
+        }
+    },
+
+    createPicker: function() {
+        var me = this,
+            picker,
+            pickerCfg = Ext.apply({
+                xtype: 'boundlist',
+                pickerField: me,
+                selModel: {
+                    mode: me.multiSelect ? 'SIMPLE' : 'SINGLE'
+                },
+                floating: true,
+                hidden: true,
+                store: me.store,
+                displayField: me.displayField,
+                focusOnToFront: false,
+                pageSize: me.pageSize,
+                tpl: me.tpl
+            }, me.listConfig, me.defaultListConfig);
+
+        picker = me.picker = Ext.widget(pickerCfg);
+        if (me.pageSize) {
+            picker.pagingToolbar.on('beforechange', me.onPageChange, me);
+        }
+
+        me.mon(picker, {
+            itemclick: me.onItemClick,
+            refresh: me.onListRefresh,
+            scope: me
+        });
+
+        me.mon(picker.getSelectionModel(), {
+            beforeselect: me.onBeforeSelect,
+            beforedeselect: me.onBeforeDeselect,
+            selectionchange: me.onListSelectionChange,
+            scope: me
+        });
+
+        return picker;
+    },
+
+    alignPicker: function(){
+        var me = this,
+            picker = me.getPicker(),
+            heightAbove = me.getPosition()[1] - Ext.getBody().getScroll().top,
+            heightBelow = Ext.Element.getViewHeight() - heightAbove - me.getHeight(),
+            space = Math.max(heightAbove, heightBelow);
+
+        // Allow the picker to height itself naturally.
+        if (picker.height) {
+            delete picker.height;
+            picker.updateLayout();
+        }
+        // Then ensure that vertically, the dropdown will fit into the space either above or below the inputEl.
+        if (picker.getHeight() > space - 5) {
+            picker.setHeight(space - 5); // have some leeway so we aren't flush against
+        }
+        me.callParent();
+    },
+
+    onListRefresh: function() {
+        // Picker will be aligned during the expand call
+        if (!this.expanding) {
+            this.alignPicker();
+        }
+        this.syncSelection();
+    },
+
+    onItemClick: function(picker, record){
+        /*
+         * If we're doing single selection, the selection change events won't fire when
+         * clicking on the selected element. Detect it here.
+         */
+        var me = this,
+            selection = me.picker.getSelectionModel().getSelection(),
+            valueField = me.valueField;
+
+        if (!me.multiSelect && selection.length) {
+            if (record.get(valueField) === selection[0].get(valueField)) {
+                // Make sure we also update the display value if it's only partial
+                me.displayTplData = [record.data];
+                me.setRawValue(me.getDisplayValue());
+                me.collapse();
+            }
+        }
+    },
+
+    onBeforeSelect: function(list, record) {
+        return this.fireEvent('beforeselect', this, record, record.index);
+    },
+
+    onBeforeDeselect: function(list, record) {
+        return this.fireEvent('beforedeselect', this, record, record.index);
+    },
+
+    onListSelectionChange: function(list, selectedRecords) {
+        var me = this,
+            isMulti = me.multiSelect,
+            hasRecords = selectedRecords.length > 0;
+        // Only react to selection if it is not called from setValue, and if our list is
+        // expanded (ignores changes to the selection model triggered elsewhere)
+        if (!me.ignoreSelection && me.isExpanded) {
+            if (!isMulti) {
+                Ext.defer(me.collapse, 1, me);
+            }
+            /*
+             * Only set the value here if we're in multi selection mode or we have
+             * a selection. Otherwise setValue will be called with an empty value
+             * which will cause the change event to fire twice.
+             */
+            if (isMulti || hasRecords) {
+                me.setValue(selectedRecords, false);
+            }
+            if (hasRecords) {
+                me.fireEvent('select', me, selectedRecords);
+            }
+            me.inputEl.focus();
+        }
+    },
+
+    /**
+     * @private
+     * Enables the key nav for the BoundList when it is expanded.
+     */
+    onExpand: function() {
+        var me = this,
+            keyNav = me.listKeyNav,
+            selectOnTab = me.selectOnTab,
+            picker = me.getPicker();
+
+        // Handle BoundList navigation from the input field. Insert a tab listener specially to enable selectOnTab.
+        if (keyNav) {
+            keyNav.enable();
+        } else {
+            keyNav = me.listKeyNav = new Ext.view.BoundListKeyNav(this.inputEl, {
+                boundList: picker,
+                forceKeyDown: true,
+                tab: function(e) {
+                    if (selectOnTab) {
+                        this.selectHighlighted(e);
+                        me.triggerBlur();
+                    }
+                    // Tab key event is allowed to propagate to field
+                    return true;
+                },
+                enter: function(e){
+                    var selModel = picker.getSelectionModel(),
+                        count = selModel.getCount();
+                        
+                    this.selectHighlighted(e);
+                    
+                    // Handle the case where the highlighted item is already selected
+                    // In this case, the change event won't fire, so just collapse
+                    if (!me.multiSelect && count === selModel.getCount()) {
+                        me.collapse();
+                    }
+                }
+            });
+        }
+
+        // While list is expanded, stop tab monitoring from Ext.form.field.Trigger so it doesn't short-circuit selectOnTab
+        if (selectOnTab) {
+            me.ignoreMonitorTab = true;
+        }
+
+        Ext.defer(keyNav.enable, 1, keyNav); //wait a bit so it doesn't react to the down arrow opening the picker
+        me.inputEl.focus();
+    },
+
+    /**
+     * @private
+     * Disables the key nav for the BoundList when it is collapsed.
+     */
+    onCollapse: function() {
+        var me = this,
+            keyNav = me.listKeyNav;
+        if (keyNav) {
+            keyNav.disable();
+            me.ignoreMonitorTab = false;
+        }
+    },
+
+    /**
+     * Selects an item by a {@link Ext.data.Model Model}, or by a key value.
+     * @param {Object} r
+     */
+    select: function(r, /* private */ assert) {
+        var me = this,
+            picker = me.picker,
+            doSelect = true,
+            fireSelect;
+        
+        if (r && r.isModel && assert === true && picker) {
+            fireSelect = !picker.getSelectionModel().isSelected(r);
+        }
+        
+        me.setValue(r, true);
+        // Select needs to be fired after setValue, so that when we call getValue
+        // in select it returns the correct value
+        if (fireSelect) {
+            me.fireEvent('select', me, r);
+        }
+    },
+
+    /**
+     * Finds the record by searching for a specific field/value combination.
+     * @param {String} field The name of the field to test.
+     * @param {Object} value The value to match the field against.
+     * @return {Ext.data.Model} The matched record or false.
+     */
+    findRecord: function(field, value) {
+        var ds = this.store,
+            idx = ds.findExact(field, value);
+        return idx !== -1 ? ds.getAt(idx) : false;
+    },
+
+    /**
+     * Finds the record by searching values in the {@link #valueField}.
+     * @param {Object} value The value to match the field against.
+     * @return {Ext.data.Model} The matched record or false.
+     */
+    findRecordByValue: function(value) {
+        return this.findRecord(this.valueField, value);
+    },
+
+    /**
+     * Finds the record by searching values in the {@link #displayField}.
+     * @param {Object} value The value to match the field against.
+     * @return {Ext.data.Model} The matched record or false.
+     */
+    findRecordByDisplay: function(value) {
+        return this.findRecord(this.displayField, value);
+    },
+
+    /**
+     * Sets the specified value(s) into the field. For each value, if a record is found in the {@link #store} that
+     * matches based on the {@link #valueField}, then that record's {@link #displayField} will be displayed in the
+     * field. If no match is found, and the {@link #valueNotFoundText} config option is defined, then that will be
+     * displayed as the default field text. Otherwise a blank value will be shown, although the value will still be set.
+     * @param {String/String[]} value The value(s) to be set. Can be either a single String or {@link Ext.data.Model},
+     * or an Array of Strings or Models.
+     * @return {Ext.form.field.Field} this
+     */
+    setValue: function(value, doSelect) {
+        var me = this,
+            valueNotFoundText = me.valueNotFoundText,
+            inputEl = me.inputEl,
+            i, len, record,
+            dataObj,
+            matchedRecords = [],
+            displayTplData = [],
+            processedValue = [];
+
+        if (me.store.loading) {
+            // Called while the Store is loading. Ensure it is processed by the onLoad method.
+            me.value = value;
+            me.setHiddenValue(me.value);
+            return me;
+        }
+
+        // This method processes multi-values, so ensure value is an array.
+        value = Ext.Array.from(value);
+
+        // Loop through values, matching each from the Store, and collecting matched records
+        for (i = 0, len = value.length; i < len; i++) {
+            record = value[i];
+            if (!record || !record.isModel) {
+                record = me.findRecordByValue(record);
+            }
+            // record found, select it.
+            if (record) {
+                matchedRecords.push(record);
+                displayTplData.push(record.data);
+                processedValue.push(record.get(me.valueField));
+            }
+            // record was not found, this could happen because
+            // store is not loaded or they set a value not in the store
+            else {
+                // If we are allowing insertion of values not represented in the Store, then push the value and
+                // create a fake record data object to push as a display value for use by the displayTpl
+                if (!me.forceSelection) {
+                    processedValue.push(value[i]);
+                    dataObj = {};
+                    dataObj[me.displayField] = value[i];
+                    displayTplData.push(dataObj);
+                    // TODO: Add config to create new records on selection of a value that has no match in the Store
+                }
+                // Else, if valueNotFoundText is defined, display it, otherwise display nothing for this value
+                else if (Ext.isDefined(valueNotFoundText)) {
+                    displayTplData.push(valueNotFoundText);
+                }
+            }
+        }
+
+        // Set the value of this field. If we are multiselecting, then that is an array.
+        me.setHiddenValue(processedValue);
+        me.value = me.multiSelect ? processedValue : processedValue[0];
+        if (!Ext.isDefined(me.value)) {
+            me.value = null;
+        }
+        me.displayTplData = displayTplData; //store for getDisplayValue method
+        me.lastSelection = me.valueModels = matchedRecords;
+
+        if (inputEl && me.emptyText && !Ext.isEmpty(value)) {
+            inputEl.removeCls(me.emptyCls);
+        }
+
+        // Calculate raw value from the collection of Model data
+        me.setRawValue(me.getDisplayValue());
+        me.checkChange();
+
+        if (doSelect !== false) {
+            me.syncSelection();
+        }
+        me.applyEmptyText();
+
+        return me;
+    },
+
+    /**
+     * @private
+     * Set the value of {@link #hiddenDataEl}
+     * Dynamically adds and removes input[type=hidden] elements
+     */
+    setHiddenValue: function(values){
+        var me = this,
+            name = me.hiddenName, 
+            i,
+            dom, childNodes, input, valueCount, childrenCount;
+            
+        if (!me.hiddenDataEl || !name) {
+            return;
+        }
+        values = Ext.Array.from(values);
+        dom = me.hiddenDataEl.dom;
+        childNodes = dom.childNodes;
+        input = childNodes[0];
+        valueCount = values.length;
+        childrenCount = childNodes.length;
+        
+        if (!input && valueCount > 0) {
+            me.hiddenDataEl.update(Ext.DomHelper.markup({
+                tag: 'input', 
+                type: 'hidden', 
+                name: name
+            }));
+            childrenCount = 1;
+            input = dom.firstChild;
+        }
+        while (childrenCount > valueCount) {
+            dom.removeChild(childNodes[0]);
+            -- childrenCount;
+        }
+        while (childrenCount < valueCount) {
+            dom.appendChild(input.cloneNode(true));
+            ++ childrenCount;
+        }
+        for (i = 0; i < valueCount; i++) {
+            childNodes[i].value = values[i];
+        }
+    },
+
+    /**
+     * @private Generates the string value to be displayed in the text field for the currently stored value
+     */
+    getDisplayValue: function() {
+        return this.displayTpl.apply(this.displayTplData);
+    },
+
+    getValue: function() {
+        // If the user has not changed the raw field value since a value was selected from the list,
+        // then return the structured value from the selection. If the raw field value is different
+        // than what would be displayed due to selection, return that raw value.
+        var me = this,
+            picker = me.picker,
+            rawValue = me.getRawValue(), //current value of text field
+            value = me.value; //stored value from last selection or setValue() call
+
+        if (me.getDisplayValue() !== rawValue) {
+            value = rawValue;
+            me.value = me.displayTplData = me.valueModels = null;
+            if (picker) {
+                me.ignoreSelection++;
+                picker.getSelectionModel().deselectAll();
+                me.ignoreSelection--;
+            }
+        }
+
+        return value;
+    },
+
+    getSubmitValue: function() {
+        var value = this.getValue();
+        // If the value is null/undefined, we still return an empty string. If we
+        // don't, the field will never get posted to the server since nulls are ignored.
+        if (Ext.isEmpty(value)) {
+            value = '';
+        }
+        return value;
+    },
+
+    isEqual: function(v1, v2) {
+        var fromArray = Ext.Array.from,
+            i, len;
+
+        v1 = fromArray(v1);
+        v2 = fromArray(v2);
+        len = v1.length;
+
+        if (len !== v2.length) {
+            return false;
+        }
+
+        for(i = 0; i < len; i++) {
+            if (v2[i] !== v1[i]) {
+                return false;
+            }
+        }
+
+        return true;
+    },
+
+    /**
+     * Clears any value currently set in the ComboBox.
+     */
+    clearValue: function() {
+        this.setValue([]);
+    },
+
+    /**
+     * @private Synchronizes the selection in the picker to match the current value of the combobox.
+     */
+    syncSelection: function() {
+        var me = this,
+            picker = me.picker,
+            selection, selModel,
+            values = me.valueModels || [],
+            vLen  = values.length, v, value;
+
+        if (picker) {
+            // From the value, find the Models that are in the store's current data
+            selection = [];
+            for (v = 0; v < vLen; v++) {
+                value = values[v];
+
+                if (value && value.isModel && me.store.indexOf(value) >= 0) {
+                    selection.push(value);
+                }
+            }
+
+            // Update the selection to match
+            me.ignoreSelection++;
+            selModel = picker.getSelectionModel();
+            selModel.deselectAll();
+            if (selection.length) {
+                selModel.select(selection, undefined, true);
+            }
+            me.ignoreSelection--;
+        }
+    },
+    
+    onEditorTab: function(e){
+        var keyNav = this.listKeyNav;
+        
+        if (this.selectOnTab && keyNav) {
+            keyNav.selectHighlighted(e);
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.toolbar.Paging', {
+    override: 'Ext.toolbar.Paging',
+    defaultButtonUI: 'plain-toolbar',
+    
+    inputItemWidth: 40
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is a base class for layouts that contain a single item that automatically expands to fill the layout's
+ * container. This class is intended to be extended or created via the layout:'fit'
+ * {@link Ext.container.Container#layout} config, and should generally not need to be created directly via the new keyword.
+ *
+ * Fit layout does not have any direct config options (other than inherited ones). To fit a panel to a container using
+ * Fit layout, simply set `layout: 'fit'` on the container and add a single panel to it.
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *         title: 'Fit Layout',
+ *         width: 300,
+ *         height: 150,
+ *         layout:'fit',
+ *         items: {
+ *             title: 'Inner Panel',
+ *             html: 'This is the inner panel content',
+ *             bodyPadding: 20,
+ *             border: false
+ *         },
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * If the container has multiple items, all of the items will all be equally sized. This is usually not
+ * desired, so to avoid this, place only a **single** item in the container. This sizing of all items
+ * can be used to provide a background {@link Ext.Img image} that is "behind" another item
+ * such as a {@link Ext.view.View dataview} if you also absolutely position the items.
+ */
+Ext.define('Ext.layout.container.Fit', {
+
+    /* Begin Definitions */
+    extend:  Ext.layout.container.Container ,
+    alternateClassName: 'Ext.layout.FitLayout',
+
+    alias: 'layout.fit',
+
+    /* End Definitions */
+
+    itemCls: Ext.baseCSSPrefix + 'fit-item',
+    targetCls: Ext.baseCSSPrefix + 'layout-fit',
+    type: 'fit',
+   
+    /**
+     * @cfg {Object} defaultMargins
+     * If the individual contained items do not have a margins property specified or margin specified via CSS, the
+     * default margins from this property will be applied to each item.
+     *
+     * This property may be specified as an object containing margins to apply in the format:
+     *
+     *     {
+     *         top: (top margin),
+     *         right: (right margin),
+     *         bottom: (bottom margin),
+     *         left: (left margin)
+     *     }
+     *
+     * This property may also be specified as a string containing space-separated, numeric margin values. The order of
+     * the sides associated with each value matches the way CSS processes margin values:
+     *
+     *   - If there is only one value, it applies to all sides.
+     *   - If there are two values, the top and bottom borders are set to the first value and the right and left are
+     *     set to the second.
+     *   - If there are three values, the top is set to the first value, the left and right are set to the second,
+     *     and the bottom is set to the third.
+     *   - If there are four values, they apply to the top, right, bottom, and left, respectively.
+     *
+     */
+    defaultMargins: {
+        top: 0,
+        right: 0,
+        bottom: 0,
+        left: 0
+    },
+
+    manageMargins: true,
+
+    sizePolicies: {
+        0: { readsWidth: 1, readsHeight: 1, setsWidth: 0, setsHeight: 0 },
+        1: { readsWidth: 0, readsHeight: 1, setsWidth: 1, setsHeight: 0 },
+        2: { readsWidth: 1, readsHeight: 0, setsWidth: 0, setsHeight: 1 },
+        3: { readsWidth: 0, readsHeight: 0, setsWidth: 1, setsHeight: 1 }
+    },
+
+    getItemSizePolicy: function (item, ownerSizeModel) {
+        // this layout's sizePolicy is derived from its owner's sizeModel:
+        var sizeModel = ownerSizeModel || this.owner.getSizeModel(),
+            mode = (sizeModel.width.shrinkWrap ? 0 : 1) |
+                   (sizeModel.height.shrinkWrap ? 0 : 2);
+
+       return this.sizePolicies[mode];
+    },
+
+    beginLayoutCycle: function (ownerContext, firstCycle) {
+        var me = this,
+            // determine these before the lastSizeModels get updated:
+            resetHeight = me.lastHeightModel && me.lastHeightModel.calculated,
+            resetWidth = me.lastWidthModel && me.lastWidthModel.calculated,
+            resetSizes = resetWidth || resetHeight,
+            maxChildMinHeight = 0, maxChildMinWidth = 0,
+            c, childItems, i, item, length, margins, minHeight, minWidth, style, undef;
+
+        me.callParent(arguments);
+
+        // Clear any dimensions which we set before calculation, in case the current
+        // settings affect the available size. This particularly effects self-sizing
+        // containers such as fields, in which the target element is naturally sized,
+        // and should not be stretched by a sized child item.
+        if (resetSizes && ownerContext.targetContext.el.dom.tagName.toUpperCase() != 'TD') {
+            resetSizes = resetWidth = resetHeight = false;
+        }
+
+        childItems = ownerContext.childItems;
+        length = childItems.length;
+
+        for (i = 0; i < length; ++i) {
+            item = childItems[i];
+
+            // On the firstCycle, we determine the max of the minWidth/Height of the items
+            // since these can cause the container to grow scrollbars despite our attempts
+            // to fit the child to the container.
+            if (firstCycle) {
+                c = item.target;
+                minHeight = c.minHeight;
+                minWidth = c.minWidth;
+
+                if (minWidth || minHeight) {
+                    margins = item.marginInfo || item.getMarginInfo();
+                    // if the child item has undefined minWidth/Height, these will become
+                    // NaN by adding the margins...
+                    minHeight += margins.height;
+                    minWidth += margins.height;
+
+                    // if the child item has undefined minWidth/Height, these comparisons
+                    // will evaluate to false... that is, "0 < NaN" == false...
+                    if (maxChildMinHeight < minHeight) {
+                        maxChildMinHeight = minHeight;
+                    }
+                    if (maxChildMinWidth < minWidth) {
+                        maxChildMinWidth = minWidth;
+                    }
+                }
+            }
+
+            if (resetSizes) {
+                style = item.el.dom.style;
+
+                if (resetHeight) {
+                    style.height = '';
+                }
+                if (resetWidth) {
+                    style.width = '';
+                }
+            }
+        }
+
+        if (firstCycle) {
+            ownerContext.maxChildMinHeight = maxChildMinHeight;
+            ownerContext.maxChildMinWidth = maxChildMinWidth;
+        }
+
+        // Cache the overflowX/Y flags, but make them false in shrinkWrap mode (since we
+        // won't be triggering overflow in that case) and false if we have no minSize (so
+        // no child to trigger an overflow).
+        c = ownerContext.target;
+        ownerContext.overflowX = (!ownerContext.widthModel.shrinkWrap && 
+                                   ownerContext.maxChildMinWidth &&
+                                   c.scrollFlags.x) || undef;
+
+        ownerContext.overflowY = (!ownerContext.heightModel.shrinkWrap &&
+                                   ownerContext.maxChildMinHeight &&
+                                   c.scrollFlags.y) || undef;
+    },
+
+    calculate : function (ownerContext) {
+        var me = this,
+            childItems = ownerContext.childItems,
+            length = childItems.length,
+            containerSize = me.getContainerSize(ownerContext),
+            info = {
+                length: length,
+                ownerContext: ownerContext,
+                targetSize: containerSize
+            },
+            shrinkWrapWidth = ownerContext.widthModel.shrinkWrap,
+            shrinkWrapHeight = ownerContext.heightModel.shrinkWrap,
+            overflowX = ownerContext.overflowX,
+            overflowY = ownerContext.overflowY,
+            scrollbars, scrollbarSize, padding, i, contentWidth, contentHeight;
+
+        if (overflowX || overflowY) {
+            // If we have children that have minHeight/Width, we may be forced to overflow
+            // and gain scrollbars. If so, we want to remove their space from the other
+            // axis so that we fit things inside the scrollbars rather than under them.
+            scrollbars = me.getScrollbarsNeeded(
+                    overflowX && containerSize.width, overflowY && containerSize.height,
+                    ownerContext.maxChildMinWidth, ownerContext.maxChildMinHeight);
+
+            if (scrollbars) {
+                scrollbarSize = Ext.getScrollbarSize();
+                if (scrollbars & 1) { // if we need the hscrollbar, remove its height
+                    containerSize.height -= scrollbarSize.height;
+                }
+                if (scrollbars & 2) { // if we need the vscrollbar, remove its width
+                    containerSize.width -= scrollbarSize.width;
+                }
+            }
+        }
+
+        // Size the child items to the container (if non-shrinkWrap):
+        for (i = 0; i < length; ++i) {
+            info.index = i;
+            me.fitItem(childItems[i], info);
+        }
+        
+        if (shrinkWrapHeight || shrinkWrapWidth) {
+            padding = ownerContext.targetContext.getPaddingInfo();
+            
+            if (shrinkWrapWidth) {
+                if (overflowY && !containerSize.gotHeight) {
+                    // if we might overflow vertically and don't have the container height,
+                    // we don't know if we will need a vscrollbar or not, so we must wait
+                    // for that height so that we can determine the contentWidth...
+                    me.done = false;
+                } else {
+                    contentWidth = info.contentWidth + padding.width;
+                    // the scrollbar flag (if set) will indicate that an overflow exists on
+                    // the horz(1) or vert(2) axis... if not set, then there could never be
+                    // an overflow...
+                    if (scrollbars & 2) { // if we need the vscrollbar, add its width
+                        contentWidth += scrollbarSize.width;
+                    }
+                    if (!ownerContext.setContentWidth(contentWidth)) {
+                        me.done = false;
+                    }
+                }
+            }
+
+            if (shrinkWrapHeight) {
+                if (overflowX && !containerSize.gotWidth) {
+                    // if we might overflow horizontally and don't have the container width,
+                    // we don't know if we will need a hscrollbar or not, so we must wait
+                    // for that width so that we can determine the contentHeight...
+                    me.done = false;
+                } else {
+                    contentHeight = info.contentHeight + padding.height;
+                    // the scrollbar flag (if set) will indicate that an overflow exists on
+                    // the horz(1) or vert(2) axis... if not set, then there could never be
+                    // an overflow...
+                    if (scrollbars & 1) { // if we need the hscrollbar, add its height
+                        contentHeight += scrollbarSize.height;
+                    }
+                    if (!ownerContext.setContentHeight(contentHeight)) {
+                        me.done = false;
+                    }
+                }
+            }
+        }
+    },
+
+    fitItem: function (itemContext, info) {
+        var me = this;
+
+        if (itemContext.invalid) {
+            me.done = false;
+            return;
+        }
+
+        info.margins = itemContext.getMarginInfo();
+        info.needed = info.got = 0;
+
+        me.fitItemWidth(itemContext, info);
+        me.fitItemHeight(itemContext, info);
+
+        // If not all required dimensions have been satisfied, we're not done.
+        if (info.got != info.needed) {
+            me.done = false;
+        }
+    },
+
+    fitItemWidth: function (itemContext, info) {
+        var contentWidth, width;
+        // Attempt to set only dimensions that are being controlled, not shrinkWrap dimensions
+        if (info.ownerContext.widthModel.shrinkWrap) {
+            // contentWidth must include the margins to be consistent with setItemWidth
+            width = itemContext.getProp('width') + info.margins.width;
+            // because we add margins, width will be NaN or a number (not undefined)
+
+            contentWidth = info.contentWidth;
+            if (contentWidth === undefined) {
+                info.contentWidth = width;
+            } else {
+                info.contentWidth = Math.max(contentWidth, width);
+            }
+        } else if (itemContext.widthModel.calculated) {
+            ++info.needed;
+            if (info.targetSize.gotWidth) {
+                ++info.got;
+                this.setItemWidth(itemContext, info);
+            }
+        }
+
+        this.positionItemX(itemContext, info);
+    },
+
+    fitItemHeight: function (itemContext, info) {
+        var contentHeight, height;
+        if (info.ownerContext.heightModel.shrinkWrap) {
+            // contentHeight must include the margins to be consistent with setItemHeight
+            height = itemContext.getProp('height') + info.margins.height;
+            // because we add margins, height will be NaN or a number (not undefined)
+
+            contentHeight = info.contentHeight;
+            if (contentHeight === undefined) {
+                info.contentHeight = height;
+            } else {
+                info.contentHeight = Math.max(contentHeight, height);
+            }
+        } else if (itemContext.heightModel.calculated) {
+            ++info.needed;
+            if (info.targetSize.gotHeight) {
+                ++info.got;
+                this.setItemHeight(itemContext, info);
+            }
+        }
+
+        this.positionItemY(itemContext, info);
+    },
+
+    positionItemX: function (itemContext, info) {
+        var margins = info.margins;
+
+        // Adjust position to account for configured margins or if we have multiple items
+        // (all items should overlap):
+        if (info.index || margins.left) {
+            itemContext.setProp('x', margins.left);
+        }
+
+        if (margins.width) {
+            // Need the margins for shrink-wrapping but old IE sometimes collapses the left margin into the padding
+            itemContext.setProp('margin-right', margins.width);
+        }
+    },
+
+    positionItemY: function (itemContext, info) {
+        var margins = info.margins;
+
+        if (info.index || margins.top) {
+            itemContext.setProp('y', margins.top);
+        }
+
+        if (margins.height) {
+            // Need the margins for shrink-wrapping but old IE sometimes collapses the top margin into the padding
+            itemContext.setProp('margin-bottom', margins.height);
+        }
+    },
+
+    setItemHeight: function (itemContext, info) {
+        itemContext.setHeight(info.targetSize.height - info.margins.height);
+    },
+
+    setItemWidth: function (itemContext, info) {
+        itemContext.setWidth(info.targetSize.width - info.margins.width);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Utility class for manipulating CSS rules
+ * @singleton
+ */
+Ext.define('Ext.util.CSS', function() {
+    var CSS,
+        rules = null,
+        doc = document,
+        camelRe = /(-[a-z])/gi,
+        camelFn = function(m, a){ return a.charAt(1).toUpperCase(); };
+
+    return {
+
+        singleton: true,
+
+        rules: rules,
+
+        initialized: false,
+
+        constructor: function() {
+            // Cache a reference to the singleton
+            CSS = this;
+        },
+
+        /**
+         * Creates a stylesheet from a text blob of rules.
+         * These rules will be wrapped in a STYLE tag and appended to the HEAD of the document.
+         * @param {String} cssText The text containing the css rules
+         * @param {String} id An id to add to the stylesheet for later removal
+         * @return {CSSStyleSheet}
+         */
+        createStyleSheet : function(cssText, id) {
+            var ss,
+                head = doc.getElementsByTagName("head")[0],
+                styleEl = doc.createElement("style");
+
+            styleEl.setAttribute("type", "text/css");
+            if (id) {
+               styleEl.setAttribute("id", id);
+            }
+
+            if (Ext.isIE) {
+               head.appendChild(styleEl);
+               ss = styleEl.styleSheet;
+               ss.cssText = cssText;
+            } else {
+                try{
+                    styleEl.appendChild(doc.createTextNode(cssText));
+                } catch(e) {
+                   styleEl.cssText = cssText;
+                }
+                head.appendChild(styleEl);
+                ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || doc.styleSheets[doc.styleSheets.length-1]);
+            }
+            CSS.cacheStyleSheet(ss);
+            return ss;
+        },
+
+        /**
+         * Removes a style or link tag by id
+         * @param {String} id The id of the tag
+         */
+        removeStyleSheet : function(id) {
+            var existing = doc.getElementById(id);
+            if (existing) {
+                existing.parentNode.removeChild(existing);
+            }
+        },
+
+        /**
+         * Dynamically swaps an existing stylesheet reference for a new one
+         * @param {String} id The id of an existing link tag to remove
+         * @param {String} url The href of the new stylesheet to include
+         */
+        swapStyleSheet : function(id, url) {
+            var ss;
+            CSS.removeStyleSheet(id);
+            ss = doc.createElement("link");
+            ss.setAttribute("rel", "stylesheet");
+            ss.setAttribute("type", "text/css");
+            ss.setAttribute("id", id);
+            ss.setAttribute("href", url);
+            doc.getElementsByTagName("head")[0].appendChild(ss);
+        },
+
+        /**
+         * Refresh the rule cache if you have dynamically added stylesheets
+         * @return {Object} An object (hash) of rules indexed by selector
+         */
+        refreshCache : function() {
+            return CSS.getRules(true);
+        },
+
+        // @private
+        cacheStyleSheet : function(ss) {
+            if (!rules) {
+                rules = CSS.rules = {};
+            }
+            try {// try catch for cross domain access issue
+                var ssRules = ss.cssRules || ss.rules,
+                    i = ssRules.length - 1,
+                    imports = ss.imports,
+                    len = imports ? imports.length : 0,
+                    rule, j;
+                    
+                // Old IE has a different way of handling imports
+                for (j = 0; j < len; ++j) {
+                    CSS.cacheStyleSheet(imports[j]);
+                }
+
+                for (; i >= 0; --i) {
+                    rule = ssRules[i];
+                    // If it's an @import rule, import its stylesheet
+                    if (rule.styleSheet) {
+                        CSS.cacheStyleSheet(rule.styleSheet);
+                    }
+                    CSS.cacheRule(rule, ss);
+                }
+            } catch(e) {}
+        },
+
+        cacheRule: function(cssRule, styleSheet) {
+            // If it's an @import rule, import its stylesheet
+            if (cssRule.styleSheet) {
+                return CSS.cacheStyleSheet(cssRule.styleSheet);
+            }
+
+            var selectorText = cssRule.selectorText,
+                selectorCount, j;
+
+            if (selectorText) {
+
+                // Split in case there are multiple, comma-delimited selectors
+                selectorText = selectorText.split(',');
+                selectorCount = selectorText.length;
+                for (j = 0; j < selectorCount; j++) {
+                    // IE<8 does not keep a reference to parentStyleSheet in the rule, so we
+                    // must cache an object like this until IE<8 is deprecated.
+                    rules[Ext.String.trim(selectorText[j]).toLowerCase()] = {
+                        parentStyleSheet: styleSheet,
+                        cssRule: cssRule
+                    };
+                };
+            }
+        },
+
+        /**
+         * Gets all css rules for the document
+         * @param {Boolean} refreshCache true to refresh the internal cache
+         * @return {Object} An object (hash) of rules indexed by selector
+         */
+        getRules : function(refreshCache) {
+            var result = {},
+                selector;
+
+            if (rules === null || refreshCache) {
+                CSS.refreshCache();
+            }
+            for (selector in rules) {
+                result[selector] = rules[selector].cssRule;
+            }
+            return result;
+        },
+        
+        refreshCache: function() {
+            var ds = doc.styleSheets,
+                i = 0,
+                len = ds.length;
+
+            rules = CSS.rules = {}
+            for (; i < len; i++) {
+                try {
+                    if (!ds[i].disabled) {
+                        CSS.cacheStyleSheet(ds[i]);
+                    }
+                } catch(e) {}
+            }
+        },
+
+        /**
+         * Gets an an individual CSS rule by selector(s)
+         * @param {String/String[]} selector The CSS selector or an array of selectors to try. The first selector that is found is returned.
+         * @param {Boolean} refreshCache true to refresh the internal cache if you have recently updated any rules or added styles dynamically
+         * @return {CSSStyleRule} The CSS rule or null if one is not found
+         */
+        getRule: function(selector, refreshCache, rawCache) {
+            var i, result;
+
+            if (!rules || refreshCache) {
+                CSS.refreshCache();
+            }
+            if (!Ext.isArray(selector)) {
+                result = rules[selector.toLowerCase()]
+                if (result && !rawCache) {
+                    result = result.cssRule;
+                }
+                return result || null;
+            }
+            for (i = 0; i < selector.length; i++) {
+                if (rules[selector[i]]) {
+                    return rawCache ? rules[selector[i].toLowerCase()] : rules[selector[i].toLowerCase()].cssRule;
+                }
+            }
+            return null;
+        },
+
+        /**
+         * Creates a rule.
+         * @param {CSSStyleSheet} styleSheet The StyleSheet to create the rule in as returned from {@link #createStyleSheet}.
+         * @param {String} selector The selector to target the rule.
+         * @param {String} property The cssText specification eg `"color:red;font-weight:bold;text-decoration:underline"`
+         * @return {CSSStyleRule} The created rule
+         */
+        createRule: function(styleSheet, selector, cssText) {
+            var result,
+                ruleSet = styleSheet.cssRules || styleSheet.rules,
+                index = ruleSet.length;
+
+            if (styleSheet.insertRule) {
+                styleSheet.insertRule(selector + '{' + cssText + '}', index);
+            } else {
+                styleSheet.addRule(selector, cssText||' ');
+            }
+            CSS.cacheRule(result = ruleSet[index], styleSheet);
+            return result;
+        },
+
+        /**
+         * Updates a rule property
+         * @param {String/String[]} selector If it's an array it tries each selector until it finds one. Stops immediately once one is found.
+         * @param {String} property The css property or a cssText specification eg `"color:red;font-weight:bold;text-decoration:underline"`
+         * @param {String} value The new value for the property
+         * @return {Boolean} true If a rule was found and updated
+         */
+        updateRule : function(selector, property, value) {
+            var rule, i, styles;
+            if (!Ext.isArray(selector)) {
+                rule = CSS.getRule(selector);
+                if (rule) {
+                    // 2 arg form means cssText sent, so parse it and update each style
+                    if (arguments.length == 2) {
+                        styles = Ext.Element.parseStyles(property);
+                        for (property in styles) {
+                            rule.style[property.replace(camelRe, camelFn)] = styles[property];
+                        }
+                    } else {
+                        rule.style[property.replace(camelRe, camelFn)] = value;
+                    }
+                    return true;
+                }
+            } else {
+                for (i = 0; i < selector.length; i++) {
+                    if (CSS.updateRule(selector[i], property, value)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        },
+
+        deleteRule: function(selector) {
+            var rule = CSS.getRule(selector, false, true),
+                styleSheet, index;
+
+            if (rule) {
+                styleSheet = rule.parentStyleSheet;
+                index = Ext.Array.indexOf(styleSheet.cssRules || styleSheet.rules, rule.cssRule);
+                if (styleSheet.deleteRule) {
+                    styleSheet.deleteRule(index);
+                } else {
+                    styleSheet.removeRule(index);
+                }
+                delete rules[selector];
+            }
+        }
+    };
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is a layout that inherits the anchoring of {@link Ext.layout.container.Anchor} and adds the
+ * ability for x/y positioning using the standard x and y component config options.
+ *
+ * This class is intended to be extended or created via the {@link Ext.container.Container#layout layout}
+ * configuration property.  See {@link Ext.container.Container#layout} for additional details.
+ *
+ *     @example
+ *     Ext.create('Ext.form.Panel', {
+ *         title: 'Absolute Layout',
+ *         width: 300,
+ *         height: 275,
+ *         layout: {
+ *             type: 'absolute'
+ *             // layout-specific configs go here
+ *             //itemCls: 'x-abs-layout-item',
+ *         },
+ *         url:'save-form.php',
+ *         defaultType: 'textfield',
+ *         items: [{
+ *             x: 10,
+ *             y: 10,
+ *             xtype:'label',
+ *             text: 'Send To:'
+ *         },{
+ *             x: 80,
+ *             y: 10,
+ *             name: 'to',
+ *             anchor:'90%'  // anchor width by percentage
+ *         },{
+ *             x: 10,
+ *             y: 40,
+ *             xtype:'label',
+ *             text: 'Subject:'
+ *         },{
+ *             x: 80,
+ *             y: 40,
+ *             name: 'subject',
+ *             anchor: '90%'  // anchor width by percentage
+ *         },{
+ *             x:0,
+ *             y: 80,
+ *             xtype: 'textareafield',
+ *             name: 'msg',
+ *             anchor: '100% 100%'  // anchor width and height
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ */
+Ext.define('Ext.layout.container.Absolute', {
+
+    /* Begin Definitions */
+
+    alias: 'layout.absolute',
+    extend:  Ext.layout.container.Anchor ,
+    alternateClassName: 'Ext.layout.AbsoluteLayout',
+
+    /* End Definitions */
+
+    targetCls: Ext.baseCSSPrefix + 'abs-layout-ct',
+    itemCls: Ext.baseCSSPrefix + 'abs-layout-item',
+
+    /**
+     * @cfg {Boolean} ignoreOnContentChange
+     * True indicates that changes to one item in this layout do not effect the layout in
+     * general. This may need to be set to false if {@link Ext.Component#autoScroll}
+     * is enabled for the container.
+     */
+    ignoreOnContentChange: true,
+
+    type: 'absolute',
+
+    // private
+    adjustWidthAnchor: function(value, childContext) {
+        var padding = this.targetPadding,
+            x = childContext.getStyle('left');
+
+        return value - x + padding.left;
+    },
+
+    // private
+    adjustHeightAnchor: function(value, childContext) {
+        var padding = this.targetPadding,
+            y = childContext.getStyle('top');
+
+        return value - y + padding.top;
+    },
+
+    isItemLayoutRoot: function (item) {
+        return this.ignoreOnContentChange || this.callParent(arguments);
+    },
+
+    isItemShrinkWrap: function (item) {
+        return true;
+    },
+
+    beginLayout: function (ownerContext) {
+        var me = this,
+            target = me.getTarget();
+
+        me.callParent(arguments);
+
+        // Do not set position: relative; when the absolute layout target is the body
+        if (target.dom !== document.body) {
+            target.position();
+        }
+
+        me.targetPadding = ownerContext.targetContext.getPaddingInfo();
+    },
+
+    isItemBoxParent: function (itemContext) {
+        return true;
+    },
+
+    onContentChange: function () {
+        if (this.ignoreOnContentChange) {
+            return false;
+        }
+        return this.callParent(arguments);
+    },
+
+    calculateContentSize: function (ownerContext, dimensions) {
+        var me = this,
+            containerDimensions = (dimensions || 0) |
+                   ((ownerContext.widthModel.shrinkWrap ? 1 : 0) |
+                    (ownerContext.heightModel.shrinkWrap ? 2 : 0)),
+            calcWidth = (containerDimensions & 1) || undefined,
+            calcHeight = (containerDimensions & 2) || undefined,
+            childItems = ownerContext.childItems,
+            length = childItems.length,
+            contentHeight = 0,
+            contentWidth = 0,
+            needed = 0,
+            props = ownerContext.props,
+            targetPadding, child, childContext, height, i, margins, width;
+
+        if (calcWidth) {
+            if (isNaN(props.contentWidth)) {
+                ++needed;
+            } else {
+                calcWidth = undefined;
+            }
+        }
+        if (calcHeight) {
+            if (isNaN(props.contentHeight)) {
+                ++needed;
+            } else {
+                calcHeight = undefined;
+            }
+        }
+
+        if (needed) {
+            for (i = 0; i < length; ++i) {
+                childContext = childItems[i];
+                child = childContext.target;
+                height = calcHeight && childContext.getProp('height');
+                width = calcWidth && childContext.getProp('width');
+                margins = childContext.getMarginInfo();
+
+                height += margins.bottom;
+                width  += margins.right;
+
+                contentHeight = Math.max(contentHeight, (child.y || 0) + height);
+                contentWidth = Math.max(contentWidth, (child.x || 0) + width);
+
+                if (isNaN(contentHeight) && isNaN(contentWidth)) {
+                    me.done = false;
+                    return;
+                }
+            }
+
+            if (calcWidth || calcHeight) {
+                targetPadding = ownerContext.targetContext.getPaddingInfo();
+            }
+            if (calcWidth && !ownerContext.setContentWidth(contentWidth + targetPadding.width)) {
+                me.done = false;
+            }
+            if (calcHeight && !ownerContext.setContentHeight(contentHeight + targetPadding.height)) {
+                me.done = false;
+            }
+
+            /* add a '/' to turn on this log ('//* enables, '/*' disables)
+            if (me.done) {
+                var el = ownerContext.targetContext.el.dom;
+                Ext.log(this.owner.id, '.contentSize: ', contentWidth, 'x', contentHeight,
+                    ' => scrollSize: ', el.scrollWidth, 'x', el.scrollHeight);
+            }/**/
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class functions **between siblings of a {@link Ext.layout.container.VBox VBox} or {@link Ext.layout.container.HBox HBox}
+ * layout** to resize both immediate siblings.
+ *
+ * A Splitter will preserve the flex ratio of any flexed siblings it is required to resize. It does this by setting the `flex` property of *all* flexed siblings
+ * to equal their pixel size. The actual numerical `flex` property in the Components will change, but the **ratio** to the total flex value will be preserved.
+ *
+ * A Splitter may be configured to show a centered mini-collapse tool orientated to collapse the {@link #collapseTarget}.
+ * The Splitter will then call that sibling Panel's {@link Ext.panel.Panel#method-collapse collapse} or {@link Ext.panel.Panel#method-expand expand} method
+ * to perform the appropriate operation (depending on the sibling collapse state). To create the mini-collapse tool but take care
+ * of collapsing yourself, configure the splitter with `{@link #performCollapse}: false`.
+ */
+Ext.define('Ext.resizer.Splitter', {
+    extend:  Ext.Component ,
+                                
+                                          
+    alias: 'widget.splitter',
+
+    childEls: [
+        'collapseEl'
+    ],
+
+    renderTpl: [
+        '<tpl if="collapsible===true">',
+            '<div id="{id}-collapseEl" class="', Ext.baseCSSPrefix, 'collapse-el ',
+                Ext.baseCSSPrefix, 'layout-split-{collapseDir}{childElCls}"> ',
+            '</div>',
+        '</tpl>'
+    ],
+
+    baseCls: Ext.baseCSSPrefix + 'splitter',
+    collapsedClsInternal: Ext.baseCSSPrefix + 'splitter-collapsed',
+    
+    // Default to tree, allow internal classes to disable resizing
+    canResize: true,
+
+    /**
+     * @cfg {Boolean} collapsible
+     * True to show a mini-collapse tool in the Splitter to toggle expand and collapse on the {@link #collapseTarget} Panel.
+     * Defaults to the {@link Ext.panel.Panel#collapsible collapsible} setting of the Panel.
+     */
+    collapsible: false,
+
+    /**
+     * @cfg {Boolean} performCollapse
+     * Set to false to prevent this Splitter's mini-collapse tool from managing the collapse
+     * state of the {@link #collapseTarget}.
+     */
+
+    /**
+     * @cfg {Boolean} collapseOnDblClick
+     * True to enable dblclick to toggle expand and collapse on the {@link #collapseTarget} Panel.
+     */
+    collapseOnDblClick: true,
+
+    /**
+     * @cfg {Number} defaultSplitMin
+     * Provides a default minimum width or height for the two components
+     * that the splitter is between.
+     */
+    defaultSplitMin: 40,
+
+    /**
+     * @cfg {Number} defaultSplitMax
+     * Provides a default maximum width or height for the two components
+     * that the splitter is between.
+     */
+    defaultSplitMax: 1000,
+
+    /**
+     * @cfg {String} collapsedCls
+     * A class to add to the splitter when it is collapsed. See {@link #collapsible}.
+     */
+
+    /**
+     * @cfg {String/Ext.panel.Panel} collapseTarget
+     * A string describing the relative position of the immediate sibling Panel to collapse. May be 'prev' or 'next'.
+     *
+     * Or the immediate sibling Panel to collapse.
+     *
+     * The orientation of the mini-collapse tool will be inferred from this setting.
+     *
+     * **Note that only Panels may be collapsed.**
+     */
+    collapseTarget: 'next',
+
+    /**
+     * @property {String} orientation
+     * Orientation of this Splitter. `'vertical'` when used in an hbox layout, `'horizontal'`
+     * when used in a vbox layout.
+     */
+
+    horizontal: false,
+    vertical: false,
+
+    /**
+     * @cfg {Number} size
+     * The size of the splitter. This becomes the height for vertical splitters and 
+     * width for horizontal splitters.
+     */
+    size: 5,
+
+    /**
+     * Returns the config object (with an `xclass` property) for the splitter tracker. This
+     * is overridden by {@link Ext.resizer.BorderSplitter BorderSplitter} to create a
+     * {@link Ext.resizer.BorderSplitterTracker BorderSplitterTracker}.
+     * @protected
+     */
+    getTrackerConfig: function () {
+        return {
+            xclass: 'Ext.resizer.SplitterTracker',
+            el: this.el,
+            splitter: this
+        };
+    },
+
+    beforeRender: function() {
+        var me = this,
+            target = me.getCollapseTarget();
+
+        me.callParent();
+
+        if (target.collapsed) {
+            me.addCls(me.collapsedClsInternal);
+        }
+        if (!me.canResize) {
+            me.addCls(me.baseCls + '-noresize');
+        }
+
+        Ext.applyIf(me.renderData, {
+            collapseDir: me.getCollapseDirection(),
+            collapsible: me.collapsible || target.collapsible
+        });
+
+        me.protoEl.unselectable();
+    },
+
+    onRender: function() {
+        var me = this,
+            collapseEl;
+
+        me.callParent(arguments);
+
+        // Add listeners on the mini-collapse tool unless performCollapse is set to false
+        if (me.performCollapse !== false) {
+            if (me.renderData.collapsible) {
+                me.mon(me.collapseEl, 'click', me.toggleTargetCmp, me);
+            }
+            if (me.collapseOnDblClick) {
+                me.mon(me.el, 'dblclick', me.toggleTargetCmp, me);
+            }
+        }
+
+        // Ensure the mini collapse icon is set to the correct direction when the target is collapsed/expanded by any means
+        me.mon(me.getCollapseTarget(), {
+            collapse: me.onTargetCollapse,
+            expand: me.onTargetExpand,
+            beforeexpand: me.onBeforeTargetExpand,
+            beforecollapse: me.onBeforeTargetCollapse,
+            scope: me
+        });
+
+        if (me.canResize) {
+            me.tracker = Ext.create(me.getTrackerConfig());
+            // Relay the most important events to our owner (could open wider later):
+            me.relayEvents(me.tracker, [ 'beforedragstart', 'dragstart', 'dragend' ]);
+        }
+
+        collapseEl = me.collapseEl;
+        if (collapseEl) {
+            collapseEl.lastCollapseDirCls = me.collapseDirProps[me.collapseDirection].cls;
+        }
+    },
+
+    getCollapseDirection: function() {
+        var me = this,
+            dir = me.collapseDirection,
+            collapseTarget, idx, items, type;
+
+        if (!dir) {
+            collapseTarget = me.collapseTarget;
+            if (collapseTarget.isComponent) {
+                dir = collapseTarget.collapseDirection;
+            }
+
+            if (!dir) {
+                // Avoid duplication of string tests.
+                // Create a two bit truth table of the configuration of the Splitter:
+                // Collapse Target | orientation
+                //        0              0             = next, horizontal
+                //        0              1             = next, vertical
+                //        1              0             = prev, horizontal
+                //        1              1             = prev, vertical
+                type = me.ownerCt.layout.type;
+                if (collapseTarget.isComponent) {
+                    items = me.ownerCt.items;
+                    idx = Number(items.indexOf(collapseTarget) === items.indexOf(me) - 1) << 1 | Number(type === 'hbox');
+                } else {
+                    idx = Number(me.collapseTarget === 'prev') << 1 | Number(type === 'hbox');
+                }
+
+                // Read the data out the truth table
+                dir = ['bottom', 'right', 'top', 'left'][idx];
+            }
+
+            me.collapseDirection = dir;
+        }
+
+        me.setOrientation((dir === 'top' || dir === 'bottom') ? 'horizontal' : 'vertical');
+
+        return dir;
+    },
+
+    getCollapseTarget: function() {
+        var me = this;
+
+        return me.collapseTarget.isComponent ? me.collapseTarget
+                    : me.collapseTarget === 'prev' ? me.previousSibling() : me.nextSibling();
+    },
+    
+    setCollapseEl: function(display){
+        var el = this.collapseEl;
+        if (el) {
+            el.setDisplayed(display);
+        }
+    },
+    
+    onBeforeTargetExpand: function(target) {
+        this.setCollapseEl('none');
+    },
+    
+    onBeforeTargetCollapse: function(){
+        this.setCollapseEl('none');
+    },
+
+    onTargetCollapse: function(target) {
+        this.el.addCls([this.collapsedClsInternal, this.collapsedCls]);
+        this.setCollapseEl('');
+    },
+
+    onTargetExpand: function(target) {
+        this.el.removeCls([this.collapsedClsInternal, this.collapsedCls]);
+        this.setCollapseEl('');
+    },
+
+    collapseDirProps: {
+        top: {
+            cls: Ext.baseCSSPrefix + 'layout-split-top'
+        },
+        right: {
+            cls: Ext.baseCSSPrefix + 'layout-split-right'
+        },
+        bottom: {
+            cls: Ext.baseCSSPrefix + 'layout-split-bottom'
+        },
+        left: {
+            cls: Ext.baseCSSPrefix + 'layout-split-left'
+        }
+    },
+
+    orientationProps: {
+        horizontal: {
+            opposite: 'vertical',
+            fixedAxis: 'height',
+            stretchedAxis: 'width'
+        },
+        vertical: {
+            opposite: 'horizontal',
+            fixedAxis: 'width',
+            stretchedAxis: 'height'
+        }
+    },
+
+    applyCollapseDirection: function () {
+        var me = this,
+            collapseEl = me.collapseEl,
+            collapseDirProps = me.collapseDirProps[me.collapseDirection],
+            cls;
+
+        if (collapseEl) {
+            cls = collapseEl.lastCollapseDirCls;
+            if (cls) {
+                collapseEl.removeCls(cls);
+            }
+
+            collapseEl.addCls(collapseEl.lastCollapseDirCls = collapseDirProps.cls);
+        }
+    },
+
+    applyOrientation: function () {
+        var me = this,
+            orientation = me.orientation,
+            orientationProps = me.orientationProps[orientation],
+            defaultSize = me.size,
+            fixedSizeProp = orientationProps.fixedAxis,
+            stretchSizeProp = orientationProps.stretchedAxis,
+            cls = me.baseCls + '-';
+
+        me[orientation] = true;
+        me[orientationProps.opposite] = false;
+
+        if (!me.hasOwnProperty(fixedSizeProp) || me[fixedSizeProp] === '100%') {
+            me[fixedSizeProp] = defaultSize;
+        }
+        if (!me.hasOwnProperty(stretchSizeProp) || me[stretchSizeProp] === defaultSize) {
+            me[stretchSizeProp] = '100%';
+        }
+
+        me.removeCls(cls + orientationProps.opposite);
+        me.addCls(cls + orientation);
+    },
+
+    setOrientation: function (orientation) {
+        var me = this;
+
+        if (me.orientation !== orientation) {
+            me.orientation = orientation;
+            me.applyOrientation();
+        }
+    },
+    
+    updateOrientation: function () {
+        delete this.collapseDirection; // recompute
+        this.getCollapseDirection();
+        this.applyCollapseDirection();
+    },
+
+    toggleTargetCmp: function(e, t) {
+        var cmp = this.getCollapseTarget(),
+            placeholder = cmp.placeholder,
+            toggle;
+
+        // We can only toggle the target if it offers the expand/collapse API
+        if (Ext.isFunction(cmp.expand) && Ext.isFunction(cmp.collapse)) {
+            if (placeholder && !placeholder.hidden) {
+                toggle = true;
+            } else {
+                toggle = !cmp.hidden;
+            }
+
+            if (toggle) {
+                if (cmp.collapsed) {
+                    cmp.expand();
+                } else if (cmp.collapseDirection) {
+                    cmp.collapse();
+                } else {
+                    cmp.collapse(this.renderData.collapseDir);
+                }
+            }
+        }
+    },
+
+    /*
+     * Work around IE bug. %age margins do not get recalculated on element resize unless repaint called.
+     */
+    setSize: function() {
+        var me = this;
+        me.callParent(arguments);
+        if (Ext.isIE && me.el) {
+            me.el.repaint();
+        }
+    },
+    
+    beforeDestroy: function(){
+        Ext.destroy(this.tracker);
+        this.callParent();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Private utility class for Ext.layout.container.Border.
+ * @private
+ */
+Ext.define('Ext.resizer.BorderSplitter', {
+    extend:  Ext.resizer.Splitter ,
+
+                                                
+
+    alias: 'widget.bordersplitter',
+
+    // must be configured in by the border layout:
+    collapseTarget: null,
+
+    getTrackerConfig: function () {
+        var trackerConfig = this.callParent();
+
+        trackerConfig.xclass = 'Ext.resizer.BorderSplitterTracker';
+
+        return trackerConfig;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This is a multi-pane, application-oriented UI layout style that supports multiple nested panels, automatic bars
+ * between regions and built-in {@link Ext.panel.Panel#collapsible expanding and collapsing} of regions.
+ *
+ * This class is intended to be extended or created via the `layout:'border'` {@link Ext.container.Container#layout}
+ * config, and should generally not need to be created directly via the new keyword.
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *         width: 500,
+ *         height: 300,
+ *         title: 'Border Layout',
+ *         layout: 'border',
+ *         items: [{
+ *             title: 'South Region is resizable',
+ *             region: 'south',     // position for region
+ *             xtype: 'panel',
+ *             height: 100,
+ *             split: true,         // enable resizing
+ *             margins: '0 5 5 5'
+ *         },{
+ *             // xtype: 'panel' implied by default
+ *             title: 'West Region is collapsible',
+ *             region:'west',
+ *             xtype: 'panel',
+ *             margins: '5 0 0 5',
+ *             width: 200,
+ *             collapsible: true,   // make collapsible
+ *             id: 'west-region-container',
+ *             layout: 'fit'
+ *         },{
+ *             title: 'Center Region',
+ *             region: 'center',     // center region is required, no width/height specified
+ *             xtype: 'panel',
+ *             layout: 'fit',
+ *             margins: '5 5 0 0'
+ *         }],
+ *         renderTo: Ext.getBody()
+ *     });
+ *
+ * # Notes
+ * 
+ *   - When using the split option, the layout will automatically insert a {@link Ext.resizer.Splitter}
+ *     into the appropriate place. This will modify the underlying
+ *     {@link Ext.container.Container#property-items items} collection in the container.
+ *
+ *   - Any Container using the Border layout **must** have a child item with `region:'center'`.
+ *     The child item in the center region will always be resized to fill the remaining space
+ *     not used by the other regions in the layout.
+ *
+ *   - Any child items with a region of `west` or `east` may be configured with either an initial
+ *     `width`, or a {@link Ext.layout.container.Box#flex} value, or an initial percentage width
+ *     **string** (Which is simply divided by 100 and used as a flex value).
+ *     The 'center' region has a flex value of `1`.
+ *
+ *   - Any child items with a region of `north` or `south` may be configured with either an initial
+ *     `height`, or a {@link Ext.layout.container.Box#flex} value, or an initial percentage height
+ *     **string** (Which is simply divided by 100 and used as a flex value).
+ *     The 'center' region has a flex value of `1`.
+ *
+ *   - **There is no BorderLayout.Region class in ExtJS 4.0+**
+ */
+Ext.define('Ext.layout.container.Border', {
+
+    extend:  Ext.layout.container.Container ,
+    alias: 'layout.border',
+    alternateClassName: 'Ext.layout.BorderLayout',
+
+               
+                                     
+                      
+
+                                                                  
+                                            
+      
+
+
+    targetCls: Ext.baseCSSPrefix + 'border-layout-ct',
+
+    itemCls: [Ext.baseCSSPrefix + 'border-item', Ext.baseCSSPrefix + 'box-item'],
+
+    type: 'border',
+
+    isBorderLayout: true,
+
+    /**
+     * @cfg {Boolean} split
+     * This configuration option is to be applied to the **child `items`** managed by this layout.
+     * Each region with `split:true` will get a {@link Ext.resizer.BorderSplitter Splitter} that
+     * allows for manual resizing of the container. Except for the `center` region.
+     */
+    
+    /**
+     * @cfg {Boolean} [splitterResize=true]
+     * This configuration option is to be applied to the **child `items`** managed by this layout and
+     * is used in conjunction with {@link #split}. By default, when specifying {@link #split}, the region
+     * can be dragged to be resized. Set this option to false to show the split bar but prevent resizing.
+     */
+
+    /**
+     * @cfg {Number/String/Object} padding
+     * Sets the padding to be applied to all child items managed by this layout.
+     * 
+     * This property can be specified as a string containing space-separated, numeric
+     * padding values. The order of the sides associated with each value matches the way
+     * CSS processes padding values:
+     *
+     *  - If there is only one value, it applies to all sides.
+     *  - If there are two values, the top and bottom borders are set to the first value
+     *    and the right and left are set to the second.
+     *  - If there are three values, the top is set to the first value, the left and right
+     *    are set to the second, and the bottom is set to the third.
+     *  - If there are four values, they apply to the top, right, bottom, and left,
+     *    respectively.
+     *
+     */
+    padding: undefined,
+
+    percentageRe: /(\d+)%/,
+    
+    horzMarginProp: 'left',
+    padOnContainerProp: 'left',
+    padNotOnContainerProp: 'right',
+
+    /**
+     * Reused meta-data objects that describe axis properties.
+     * @private
+     */
+    axisProps: {
+        horz: {
+            borderBegin: 'west',
+            borderEnd: 'east',
+            horizontal: true,
+            posProp: 'x',
+            sizeProp: 'width',
+            sizePropCap: 'Width'
+        },
+        vert: {
+            borderBegin: 'north',
+            borderEnd: 'south',
+            horizontal: false,
+            posProp: 'y',
+            sizeProp: 'height',
+            sizePropCap: 'Height'
+        }
+    },
+
+    // @private
+    centerRegion: null,
+
+    manageMargins: true,
+
+    panelCollapseAnimate: true,
+
+    panelCollapseMode: 'placeholder',
+
+    /**
+     * @cfg {Object} regionWeights
+     * The default weights to assign to regions in the border layout. These values are
+     * used when a region does not contain a `weight` property. This object must have
+     * properties for all regions ("north", "south", "east" and "west").
+     * 
+     * **IMPORTANT:** Since this is an object, changing its properties will impact ALL
+     * instances of Border layout. If this is not desired, provide a replacement object as
+     * a config option instead:
+     * 
+     *      layout: {
+     *          type: 'border',
+     *          regionWeights: {
+     *              west: 20,
+     *              north: 10,
+     *              south: -10,
+     *              east: -20
+     *          }
+     *      }
+     *
+     * The region with the highest weight is assigned space from the border before other
+     * regions. Regions of equal weight are assigned space based on their position in the
+     * owner's items list (first come, first served).
+     */
+    regionWeights: {
+        north: 20,
+        south: 10,
+        center: 0,
+        west: -10,
+        east: -20
+    },
+
+    //----------------------------------
+    // Layout processing
+
+    /**
+     * Creates the axis objects for the layout. These are only missing size information
+     * which is added during {@link #calculate}.
+     * @private
+     */
+    beginAxis: function (ownerContext, regions, name) {
+        var me = this,
+            props = me.axisProps[name],
+            isVert = !props.horizontal,
+            sizeProp = props.sizeProp,
+            totalFlex = 0,
+            childItems = ownerContext.childItems,
+            length = childItems.length,
+            center, i, childContext, centerFlex, comp, region, match, size, type, target, placeholder;
+
+        for (i = 0; i < length; ++i) {
+            childContext = childItems[i];
+            comp = childContext.target;
+
+            childContext.layoutPos = {};
+
+            if (comp.region) {
+                childContext.region = region = comp.region;
+
+                childContext.isCenter = comp.isCenter;
+                childContext.isHorz = comp.isHorz;
+                childContext.isVert = comp.isVert;
+
+                childContext.weight = comp.weight || me.regionWeights[region] || 0;
+                regions[comp.id] = childContext;
+
+                if (comp.isCenter) {
+                    center = childContext;
+                    centerFlex = comp.flex;
+                    ownerContext.centerRegion = center;
+
+                    continue;
+                }
+
+                if (isVert !== childContext.isVert) {
+                    continue;
+                }
+
+                // process regions "isVert ? north||south : east||center||west"
+
+                childContext.reverseWeighting = (region == props.borderEnd);
+
+                size = comp[sizeProp];
+                type = typeof size;
+
+                if (!comp.collapsed) {
+                    if (type == 'string' && (match = me.percentageRe.exec(size))) {
+                        childContext.percentage = parseInt(match[1], 10);
+                    } else if (comp.flex) {
+                        totalFlex += childContext.flex = comp.flex;
+                    }
+                }
+            }
+        }
+
+        // Special cases for a collapsed center region
+        if (center) {
+            target = center.target;
+
+            if ((placeholder = target.placeholderFor)) {
+                if (!centerFlex && isVert === placeholder.collapsedVertical()) {
+                    // The center region is a placeholder, collapsed in this axis
+                    centerFlex = 0;
+                    center.collapseAxis = name;
+                }
+            } else if (target.collapsed && (isVert === target.collapsedVertical())) {
+                // The center region is a collapsed header, collapsed in this axis
+                centerFlex = 0;
+                center.collapseAxis = name;
+            }
+        }
+
+        if (centerFlex == null) {
+            // If we still don't have a center flex, default to 1
+            centerFlex = 1;
+        }
+
+        totalFlex += centerFlex;
+
+        return Ext.apply({
+            before         : isVert ? 'top' : 'left',
+            totalFlex      : totalFlex
+        }, props);
+    },
+
+    beginLayout: function (ownerContext) {
+        var me = this,
+            items = me.getLayoutItems(),
+            pad = me.padding,
+            type = typeof pad,
+            padOnContainer = false,
+            childContext, item, length, i, regions, collapseTarget,
+            doShow, hidden, region;
+
+        // We sync the visibility state of splitters with their region:
+        if (pad) {
+            if (type == 'string' || type == 'number') {
+                pad = Ext.util.Format.parseBox(pad);
+            }
+        } else {
+            pad = ownerContext.getEl('getTargetEl').getPaddingInfo();
+            padOnContainer = true;
+        }
+        ownerContext.outerPad = pad;
+        ownerContext.padOnContainer = padOnContainer;
+
+        for (i = 0, length = items.length; i < length; ++i) {
+            item = items[i];
+            collapseTarget = me.getSplitterTarget(item);
+            if (collapseTarget) {  // if (splitter)
+                doShow = undefined;
+                hidden = !!item.hidden;
+                if (!collapseTarget.split) {
+                    if (collapseTarget.isCollapsingOrExpanding) {
+                        doShow = !!collapseTarget.collapsed;
+                    }
+                } else if (hidden !== collapseTarget.hidden) {
+                    doShow = !collapseTarget.hidden;
+                }
+
+                if (doShow) {
+                    item.show();
+                } else if (doShow === false) {
+                    item.hide();
+                }
+            }
+        }
+
+        // The above synchronized visibility of splitters with their regions, so we need
+        // to make this call after that so that childItems and visibleItems are correct:
+        //
+        me.callParent(arguments);
+
+        items = ownerContext.childItems;
+        length = items.length;
+        regions = {};
+
+        ownerContext.borderAxisHorz = me.beginAxis(ownerContext, regions, 'horz');
+        ownerContext.borderAxisVert = me.beginAxis(ownerContext, regions, 'vert');
+
+        // Now that weights are assigned to the region's contextItems, we assign those
+        // same weights to the contextItem for the splitters. We also cross link the
+        // contextItems for the collapseTarget and its splitter.
+        for (i = 0; i < length; ++i) {
+            childContext = items[i];
+            collapseTarget = me.getSplitterTarget(childContext.target);
+
+            if (collapseTarget) { // if (splitter)
+                region = regions[collapseTarget.id]
+                if (!region) {
+                        // if the region was hidden it will not be part of childItems, and
+                        // so beginAxis() won't add it to the regions object, so we have
+                        // to create the context item here.
+                        region = ownerContext.getEl(collapseTarget.el, me);
+                        region.region = collapseTarget.region;
+                }
+                childContext.collapseTarget = collapseTarget = region;
+                childContext.weight = collapseTarget.weight;
+                childContext.reverseWeighting = collapseTarget.reverseWeighting;
+                collapseTarget.splitter = childContext;
+                childContext.isHorz = collapseTarget.isHorz;
+                childContext.isVert = collapseTarget.isVert;
+            }
+        }
+
+        // Now we want to sort the childItems by their weight.
+        me.sortWeightedItems(items, 'reverseWeighting');
+        me.setupSplitterNeighbors(items);
+    },
+
+    calculate: function (ownerContext) {
+        var me = this,
+            containerSize = me.getContainerSize(ownerContext),
+            childItems = ownerContext.childItems,
+            length = childItems.length,
+            horz = ownerContext.borderAxisHorz,
+            vert = ownerContext.borderAxisVert,
+            pad = ownerContext.outerPad,
+            padOnContainer = ownerContext.padOnContainer,
+            i, childContext, childMargins, size, horzPercentTotal, vertPercentTotal;
+
+        horz.begin = pad[me.padOnContainerProp];
+        vert.begin = pad.top;
+        // If the padding is already on the container we need to add it to the space
+        // If not on the container, it's "virtual" padding.
+        
+        horzPercentTotal = horz.end = horz.flexSpace = containerSize.width + (padOnContainer ? pad[me.padOnContainerProp] : -pad[me.padNotOnContainerProp]);
+        vertPercentTotal = vert.end = vert.flexSpace = containerSize.height + (padOnContainer ? pad.top : -pad.bottom);
+
+        // Reduce flexSpace on each axis by the fixed/auto sized dimensions of items that
+        // aren't flexed along that axis.
+        for (i = 0; i < length; ++i) {
+            childContext = childItems[i];
+            childMargins = childContext.getMarginInfo();
+
+            // Margins are always fixed size and must be removed from the space used for percentages and flexes
+            if (childContext.isHorz || childContext.isCenter) {
+                horz.addUnflexed(childMargins.width);
+                horzPercentTotal -= childMargins.width;
+            }
+
+            if (childContext.isVert || childContext.isCenter) {
+                vert.addUnflexed(childMargins.height);
+                vertPercentTotal -= childMargins.height;
+            }
+
+            // Fixed size components must have their sizes removed from the space used for flex
+            if (!childContext.flex && !childContext.percentage) {
+                if (childContext.isHorz || (childContext.isCenter && childContext.collapseAxis === 'horz')) {
+                    size = childContext.getProp('width');
+
+                    horz.addUnflexed(size);
+
+                    // splitters should not count towards percentages
+                    if (childContext.collapseTarget) {
+                        horzPercentTotal -= size;
+                    }
+                } else if (childContext.isVert || (childContext.isCenter && childContext.collapseAxis === 'vert')) {
+                    size = childContext.getProp('height');
+
+                    vert.addUnflexed(size);
+
+                    // splitters should not count towards percentages
+                    if (childContext.collapseTarget) {
+                        vertPercentTotal -= size;
+                    }
+                }
+                // else ignore center since it is fully flexed
+            }
+        }
+
+        for (i = 0; i < length; ++i) {
+            childContext = childItems[i];
+            childMargins = childContext.getMarginInfo();
+
+            // Calculate the percentage sizes. After this calculation percentages are very similar to fixed sizes
+            if (childContext.percentage) {
+                if (childContext.isHorz) {
+                    size = Math.ceil(horzPercentTotal * childContext.percentage / 100);
+                    size = childContext.setWidth(size);
+                    horz.addUnflexed(size);
+                } else if (childContext.isVert) {
+                    size = Math.ceil(vertPercentTotal * childContext.percentage / 100);
+                    size = childContext.setHeight(size);
+                    vert.addUnflexed(size);
+                }
+                // center shouldn't have a percentage but if it does it should be ignored
+            }
+        }
+
+
+        // If we haven't gotten sizes for all unflexed dimensions on an axis, the flexSpace
+        // will be NaN so we won't be calculating flexed dimensions until that is resolved.
+
+        for (i = 0; i < length; ++i) {
+            childContext = childItems[i];
+
+            if (!childContext.isCenter) {
+                me.calculateChildAxis(childContext, horz);
+                me.calculateChildAxis(childContext, vert);
+            }
+        }
+
+        // Once all items are placed, the final size of the center can be determined. If we
+        // can determine both width and height, we are done. We use '+' instead of '&&' to
+        // avoid short-circuiting (we want to call both):
+        if (me.finishAxis(ownerContext, vert) + me.finishAxis(ownerContext, horz) < 2) {
+            me.done = false;
+        } else {
+            // Size information is published as we place regions but position is hard to do
+            // that way (while avoiding published multiple times) so we publish all the
+            // positions at the end.
+            me.finishPositions(childItems);
+        }
+    },
+
+    /**
+     * Performs the calculations for a region on a specified axis.
+     * @private
+     */
+    calculateChildAxis: function (childContext, axis) {
+        var collapseTarget = childContext.collapseTarget,
+            setSizeMethod = 'set' + axis.sizePropCap,
+            sizeProp = axis.sizeProp,
+            childMarginSize = childContext.getMarginInfo()[sizeProp],
+            region, isBegin, flex, pos, size;
+
+        if (collapseTarget) { // if (splitter)
+            region = collapseTarget.region;
+        } else {
+            region = childContext.region;
+            flex = childContext.flex;
+        }
+
+        isBegin = region == axis.borderBegin;
+
+        if (!isBegin && region != axis.borderEnd) {
+            // a north/south region on the horizontal axis or an east/west region on the
+            // vertical axis: stretch to fill remaining space:
+            childContext[setSizeMethod](axis.end - axis.begin - childMarginSize);
+            pos = axis.begin;
+        } else {
+            if (flex) {
+                size = Math.ceil(axis.flexSpace * (flex / axis.totalFlex));
+                size = childContext[setSizeMethod](size);
+            } else if (childContext.percentage) {
+                // Like getProp but without registering a dependency - we calculated the size, we don't depend on it
+                size = childContext.peek(sizeProp);
+            } else {
+                size = childContext.getProp(sizeProp);
+            }
+
+            size += childMarginSize;
+
+            if (isBegin) {
+                pos = axis.begin;
+                axis.begin += size;
+            } else {
+                axis.end = pos = axis.end - size;
+            }
+        }
+
+        childContext.layoutPos[axis.posProp] = pos;
+    },
+
+    /**
+     * Finishes the calculations on an axis. This basically just assigns the remaining
+     * space to the center region.
+     * @private
+     */
+    finishAxis: function (ownerContext, axis) {
+        var size = axis.end - axis.begin,
+            center = ownerContext.centerRegion;
+
+        if (center) {
+            center['set' + axis.sizePropCap](size - center.getMarginInfo()[axis.sizeProp]);
+            center.layoutPos[axis.posProp] = axis.begin;
+        }
+
+        return Ext.isNumber(size) ? 1 : 0;
+    },
+
+    /**
+     * Finishes by setting the positions on the child items.
+     * @private
+     */
+    finishPositions: function (childItems) {
+        var length = childItems.length,
+            index, childContext,
+            marginProp = this.horzMarginProp;
+
+        for (index = 0; index < length; ++index) {
+            childContext = childItems[index];
+
+            childContext.setProp('x', childContext.layoutPos.x + childContext.marginInfo[marginProp]);
+            childContext.setProp('y', childContext.layoutPos.y + childContext.marginInfo.top);
+        }
+    },
+
+    getLayoutItems: function() {
+        var owner = this.owner,
+            ownerItems = (owner && owner.items && owner.items.items) || [],
+            length = ownerItems.length,
+            items = [],
+            i = 0,
+            ownerItem, placeholderFor;
+
+        for (; i < length; i++) {
+            ownerItem = ownerItems[i];
+            placeholderFor = ownerItem.placeholderFor;
+            // There are a couple of scenarios where we do NOT want an item to
+            // be included in the layout items:
+            //
+            // 1. If the item is floated. This can happen when a region's header
+            // is clicked to "float" the item, then another region's header or
+            // is clicked quickly before the first floated region has had a
+            // chance to slide out. When this happens, the second click triggers
+            // a layout, the purpose of which is to determine what the size of the 
+            // second region will be after it is floated, so it can be animated
+            // to that size. In this case the existing floated item should not be
+            // included in the layout items because it will not be visible once
+            // it's slideout animation has completed.
+            //
+            // 2. If the item is a placeholder for a panel that is currently
+            // being expanded. Similar to scenario 1, a second layout can be
+            // triggered by another panel being expanded/collapsed/floated before
+            // the first panel has finished it's expand animation. If this is the
+            // case we do not want the placeholder to be included in the layout
+            // items because it will not be once the panel has finished expanding.
+            //
+            // If the component is hidden, we need none of these shenanigans
+            if (ownerItem.hidden || ((!ownerItem.floated || ownerItem.isCollapsingOrExpanding === 2) &&
+                !(placeholderFor && placeholderFor.isCollapsingOrExpanding === 2))) {
+                items.push(ownerItem);
+            } 
+        }
+
+        return items;
+    },
+
+    getPlaceholder: function (comp) {
+        return comp.getPlaceholder && comp.getPlaceholder();
+    },
+
+    getSplitterTarget: function (splitter) {
+        var collapseTarget = splitter.collapseTarget;
+
+        if (collapseTarget && collapseTarget.collapsed) {
+            return collapseTarget.placeholder || collapseTarget;
+        }
+
+        return collapseTarget;
+    },
+
+    isItemBoxParent: function (itemContext) {
+        return true;
+    },
+
+    isItemShrinkWrap: function (item) {
+        return true;
+    },
+
+    //----------------------------------
+    // Event handlers
+
+    /**
+     * Inserts the splitter for a given region. A reference to the splitter is also stored
+     * on the component as "splitter".
+     * @private
+     */
+    insertSplitter: function (item, index, hidden, splitterCfg) {
+        var region = item.region,
+            splitter = Ext.apply({
+                xtype: 'bordersplitter',
+                collapseTarget: item,
+                id: item.id + '-splitter',
+                hidden: hidden,
+                canResize: item.splitterResize !== false,
+                splitterFor: item
+            }, splitterCfg),
+            at = index + ((region === 'south' || region === 'east') ? 0 : 1);
+
+        if (item.collapseMode === 'mini') {
+            splitter.collapsedCls = item.collapsedCls;
+        }
+
+        item.splitter = this.owner.add(at, splitter);
+    },
+
+    /**
+     * Called when a region (actually when any component) is added to the container. The
+     * region is decorated with some helpful properties (isCenter, isHorz, isVert) and its
+     * splitter is added if its "split" property is true.
+     * @private
+     */
+    onAdd: function (item, index) {
+        var me = this,
+            placeholderFor = item.placeholderFor,
+            region = item.region,
+            split,
+            hidden,
+            cfg;
+
+        me.callParent(arguments);
+
+        if (region) {
+            Ext.apply(item, me.regionFlags[region]);
+
+            if (item.initBorderRegion) {
+                // This method should always be present but perhaps the override is being
+                // excluded.
+                item.initBorderRegion();
+            }
+
+            if (region === 'center') {
+                if (me.centerRegion) {
+                    Ext.Error.raise("Cannot have multiple center regions in a BorderLayout.");
+                }
+                me.centerRegion = item;
+            } else {
+                split = item.split;
+                hidden = !!item.hidden;
+                
+                if (typeof split === 'object') {
+                    cfg = split;
+                    split = true;
+                }
+                
+                if ((item.isHorz || item.isVert) && (split || item.collapseMode == 'mini')) {
+                    me.insertSplitter(item, index, hidden || !split, cfg);
+                }
+            }
+
+            if (!item.hasOwnProperty('collapseMode')) {
+                item.collapseMode = me.panelCollapseMode;
+            }
+
+            if (!item.hasOwnProperty('animCollapse')) {
+                if (item.collapseMode !== 'placeholder') {
+                    // other collapse modes do not animate nicely in a border layout, so
+                    // default them to off:
+                    item.animCollapse = false;
+                } else {
+                    item.animCollapse = me.panelCollapseAnimate;
+                }
+            }
+        } else if (placeholderFor) {
+            Ext.apply(item, me.regionFlags[placeholderFor.region]);
+            item.region = placeholderFor.region;
+            item.weight = placeholderFor.weight;
+        }
+    },
+
+    onDestroy: function() {
+        this.centerRegion = null;
+        this.callParent();
+    },
+
+    onRemove: function (item) {
+        var me = this,
+            region = item.region,
+            splitter = item.splitter;
+
+        if (region) {
+            if (item.isCenter) {
+                me.centerRegion = null;
+            }
+
+            delete item.isCenter;
+            delete item.isHorz;
+            delete item.isVert;
+
+            if (splitter) {
+                me.owner.doRemove(splitter, true); // avoid another layout
+                delete item.splitter;
+            }
+        }
+
+        me.callParent(arguments);
+    },
+
+    //----------------------------------
+    // Misc
+
+    regionMeta: {
+        center: { splitterDelta: 0 },
+
+        north: { splitterDelta:  1 },
+        south: { splitterDelta: -1 },
+
+        west:  { splitterDelta:  1 },
+        east:  { splitterDelta: -1 }
+    },
+
+    /**
+     * Flags and configs that get set of regions based on their `region` property.
+     * @private
+     */
+    regionFlags: {
+        center: { isCenter: true, isHorz: false, isVert: false },
+
+        north: { isCenter: false, isHorz: false, isVert: true, collapseDirection: 'top' },
+        south: { isCenter: false, isHorz: false, isVert: true, collapseDirection: 'bottom' },
+
+        west: { isCenter: false, isHorz: true, isVert: false, collapseDirection: 'left' },
+        east: { isCenter: false, isHorz: true, isVert: false, collapseDirection: 'right' }
+    },
+
+    setupSplitterNeighbors: function (items) {
+        var edgeRegions = {
+                //north: null,
+                //south: null,
+                //east: null,
+                //west: null
+            },
+            length = items.length,
+            touchedRegions = this.touchedRegions,
+            i, j, center, count, edge, comp, region, splitter, touched;
+
+        for (i = 0; i < length; ++i) {
+            comp = items[i].target;
+            region = comp.region;
+
+            if (comp.isCenter) {
+                center = comp;
+            } else if (region) {
+                touched = touchedRegions[region];
+
+                for (j = 0, count = touched.length; j < count; ++j) {
+                    edge = edgeRegions[touched[j]];
+                    if (edge) {
+                        edge.neighbors.push(comp);
+                    }
+                }
+                
+                if (comp.placeholderFor) {
+                    // placeholder, so grab the splitter for the actual panel
+                    splitter = comp.placeholderFor.splitter;
+                } else {
+                    splitter = comp.splitter;
+                }
+                if (splitter) {
+                    splitter.neighbors = [];
+                }
+
+                edgeRegions[region] = splitter;
+            }
+        }
+
+        if (center) {
+            touched = touchedRegions.center;
+
+            for (j = 0, count = touched.length; j < count; ++j) {
+                edge = edgeRegions[touched[j]];
+                if (edge) {
+                    edge.neighbors.push(center);
+                }
+            }
+        }
+    },
+
+    /**
+     * Lists the regions that would consider an interior region a neighbor. For example,
+     * a north region would consider an east or west region its neighbords (as well as
+     * an inner north region).
+     * @private
+     */
+    touchedRegions: {
+        center: [ 'north', 'south', 'east',  'west' ],
+
+        north:  [ 'north', 'east',  'west'  ],
+        south:  [ 'south', 'east',  'west'  ],
+        east:   [ 'east',  'north', 'south' ],
+        west:   [ 'west',  'north', 'south' ]
+    },
+
+    sizePolicies: {
+        vert: {
+            readsWidth: 0,
+            readsHeight: 1,
+            setsWidth: 1,
+            setsHeight: 0
+        },
+        horz: {
+            readsWidth: 1,
+            readsHeight: 0,
+            setsWidth: 0,
+            setsHeight: 1
+        },
+        flexAll: {
+            readsWidth: 0,
+            readsHeight: 0,
+            setsWidth: 1,
+            setsHeight: 1
+        }
+    },
+
+    getItemSizePolicy: function (item) {
+        var me = this,
+            policies = this.sizePolicies,
+            collapseTarget, size, policy, placeholderFor;
+
+        if (item.isCenter) {
+            placeholderFor = item.placeholderFor;
+
+            if (placeholderFor) {
+                if (placeholderFor.collapsedVertical()) {
+                    return policies.vert;
+                }
+                return policies.horz;
+            }
+            if (item.collapsed) {
+                if (item.collapsedVertical()) {
+                    return policies.vert;
+                }
+                return policies.horz;
+            }
+            return policies.flexAll;
+        }
+
+        collapseTarget = item.collapseTarget;
+
+        if (collapseTarget) {
+            return collapseTarget.isVert ? policies.vert : policies.horz;
+        }
+
+        if (item.region) {
+            if (item.isVert) {
+                size = item.height;
+                policy = policies.vert;
+            } else {
+                size = item.width;
+                policy = policies.horz;
+            }
+
+            if (item.flex || (typeof size == 'string' && me.percentageRe.test(size))) {
+                return policies.flexAll;
+            }
+
+            return policy;
+        }
+
+        return me.autoSizePolicy;
+    }
+}, function () {
+    var methods = {
+        addUnflexed: function (px) {
+            this.flexSpace = Math.max(this.flexSpace - px, 0);
+        }
+    },
+    props = this.prototype.axisProps;
+
+    Ext.apply(props.horz, methods);
+    Ext.apply(props.vert, methods);
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.resizer.Splitter', {
+    override: 'Ext.resizer.Splitter',
+    size: 8
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A base class for all menu items that require menu-related functionality such as click handling,
+ * sub-menus, icons, etc.
+ *
+ *     @example
+ *     Ext.create('Ext.menu.Menu', {
+ *         width: 100,
+ *         height: 100,
+ *         floating: false,  // usually you want this set to True (default)
+ *         renderTo: Ext.getBody(),  // usually rendered by it's containing component
+ *         items: [{
+ *             text: 'icon item',
+ *             iconCls: 'add16'
+ *         },{
+ *             text: 'text item'
+ *         },{
+ *             text: 'plain item',
+ *             plain: true
+ *         }]
+ *     });
+ */
+Ext.define('Ext.menu.Item', {
+    extend:  Ext.Component ,
+    alias: 'widget.menuitem',
+    alternateClassName: 'Ext.menu.TextItem',
+    
+    mixins: {
+        queryable:  Ext.Queryable 
+    },
+
+    /**
+     * @property {Boolean} activated
+     * Whether or not this item is currently activated
+     */
+
+    /**
+     * @property {Ext.menu.Menu} parentMenu
+     * The parent Menu of this item.
+     */
+
+    /**
+     * @cfg {String} activeCls
+     * The CSS class added to the menu item when the item is activated (focused/mouseover).
+     */
+    activeCls: Ext.baseCSSPrefix + 'menu-item-active',
+
+    /**
+     * @cfg {String} ariaRole
+     * @private
+     */
+    ariaRole: 'menuitem',
+
+    /**
+     * @cfg {Boolean} canActivate
+     * Whether or not this menu item can be activated when focused/mouseovered.
+     */
+    canActivate: true,
+
+    /**
+     * @cfg {Number} clickHideDelay
+     * The delay in milliseconds to wait before hiding the menu after clicking the menu item.
+     * This only has an effect when `hideOnClick: true`.
+     */
+    clickHideDelay: 0,
+
+    /**
+     * @cfg {Boolean} destroyMenu
+     * Whether or not to destroy any associated sub-menu when this item is destroyed.
+     */
+    destroyMenu: true,
+
+    /**
+     * @cfg {String} disabledCls
+     * The CSS class added to the menu item when the item is disabled.
+     */
+    disabledCls: Ext.baseCSSPrefix + 'menu-item-disabled',
+
+    /**
+     * @cfg {String} [href='#']
+     * The href attribute to use for the underlying anchor link.
+     */
+
+    /**
+     * @cfg {String} hrefTarget
+     * The target attribute to use for the underlying anchor link.
+     */
+
+    /**
+     * @cfg {Boolean} hideOnClick
+     * Whether to not to hide the owning menu when this item is clicked.
+     */
+    hideOnClick: true,
+
+    /**
+     * @cfg {String} icon
+     * The path to an icon to display in this item.
+     *
+     * Defaults to `Ext.BLANK_IMAGE_URL`.
+     */
+
+    /**
+     * @cfg {String} iconCls
+     * A CSS class that specifies a `background-image` to use as the icon for this item.
+     */
+
+    /**
+     * @cfg {Number/String} glyph
+     * A numeric unicode character code to use as the icon for this item. The default
+     * font-family for glyphs can be set globally using
+     * {@link Ext#setGlyphFontFamily Ext.setGlyphFontFamily()}. Alternatively, this
+     * config option accepts a string with the charCode and font-family separated by the
+     * `@` symbol. For example '65 at My Font Family'.
+     */
+
+    isMenuItem: true,
+
+    /**
+     * @cfg {Ext.menu.Menu/Object} menu
+     * Either an instance of {@link Ext.menu.Menu} or a config object for an {@link Ext.menu.Menu}
+     * which will act as a sub-menu to this item.
+     */
+
+    /**
+     * @property {Ext.menu.Menu} menu The sub-menu associated with this item, if one was configured.
+     */
+
+    /**
+     * @cfg {String} menuAlign
+     * The default {@link Ext.util.Positionable#getAlignToXY Ext.util.Positionable.getAlignToXY} anchor position value for this
+     * item's sub-menu relative to this item's position.
+     */
+    menuAlign: 'tl-tr?',
+
+    /**
+     * @cfg {Number} menuExpandDelay
+     * The delay in milliseconds before this item's sub-menu expands after this item is moused over.
+     */
+    menuExpandDelay: 200,
+
+    /**
+     * @cfg {Number} menuHideDelay
+     * The delay in milliseconds before this item's sub-menu hides after this item is moused out.
+     */
+    menuHideDelay: 200,
+
+    /**
+     * @cfg {Boolean} plain
+     * Whether or not this item is plain text/html with no icon or visual activation.
+     */
+
+    /**
+     * @cfg {String/Object} tooltip
+     * The tooltip for the button - can be a string to be used as innerHTML (html tags are accepted) or
+     * QuickTips config object.
+     */
+
+    /**
+     * @cfg {String} tooltipType
+     * The type of tooltip to use. Either 'qtip' for QuickTips or 'title' for title attribute.
+     */
+    tooltipType: 'qtip',
+
+    arrowCls: Ext.baseCSSPrefix + 'menu-item-arrow',
+
+    childEls: [
+        'itemEl', 'iconEl', 'textEl', 'arrowEl'
+    ],
+
+    renderTpl: [
+        '<tpl if="plain">',
+            '{text}',
+        '<tpl else>',
+            '<a id="{id}-itemEl"',
+                ' class="' + Ext.baseCSSPrefix + 'menu-item-link{childElCls}"',
+                ' href="{href}"',
+                '<tpl if="hrefTarget"> target="{hrefTarget}"</tpl>',
+                ' hidefocus="true"',
+                // For most browsers the text is already unselectable but Opera needs an explicit unselectable="on".
+                ' unselectable="on"',
+                '<tpl if="tabIndex">',
+                    ' tabIndex="{tabIndex}"',
+                '</tpl>',
+            '>',
+                '<div role="img" id="{id}-iconEl" class="' + Ext.baseCSSPrefix + 'menu-item-icon {iconCls}',
+                    '{childElCls} {glyphCls}" style="<tpl if="icon">background-image:url({icon});</tpl>',
+                    '<tpl if="glyph && glyphFontFamily">font-family:{glyphFontFamily};</tpl>">',
+                    '<tpl if="glyph">&#{glyph};</tpl>',
+                '</div>',
+                '<span id="{id}-textEl" class="' + Ext.baseCSSPrefix + 'menu-item-text" unselectable="on">{text}</span>',
+                '<img id="{id}-arrowEl" src="{blank}" class="{arrowCls}',
+                    '{childElCls}"/>',
+            '</a>',
+        '</tpl>'
+    ],
+
+    maskOnDisable: false,
+
+    /**
+     * @cfg {String} text
+     * The text/html to display in this item.
+     */
+
+    /**
+     * @cfg {Function} handler
+     * A function called when the menu item is clicked (can be used instead of {@link #click} event).
+     * @cfg {Ext.menu.Item} handler.item The item that was clicked
+     * @cfg {Ext.EventObject} handler.e The underyling {@link Ext.EventObject}.
+     */
+
+    activate: function() {
+        var me = this;
+
+        if (!me.activated && me.canActivate && me.rendered && !me.isDisabled() && me.isVisible()) {
+            me.el.addCls(me.activeCls);
+            me.focus();
+            me.activated = true;
+            me.fireEvent('activate', me);
+        }
+    },
+
+    getFocusEl: function() {
+        return this.itemEl;
+    },
+
+    deactivate: function() {
+        var me = this;
+
+        if (me.activated) {
+            me.el.removeCls(me.activeCls);
+            me.blur();
+            me.hideMenu();
+            me.activated = false;
+            me.fireEvent('deactivate', me);
+        }
+    },
+
+    deferHideMenu: function() {
+        if (this.menu.isVisible()) {
+            this.menu.hide();
+        }
+    },
+    
+    cancelDeferHide: function(){
+        clearTimeout(this.hideMenuTimer);
+    },
+
+    deferHideParentMenus: function() {
+        var ancestor;
+        Ext.menu.Manager.hideAll();
+
+        if (!Ext.Element.getActiveElement()) {
+            // If we have just hidden all Menus, and there is no currently focused element in the dom, transfer focus to the first visible ancestor if any.
+            ancestor = this.up(':not([hidden])');
+            if (ancestor) {
+                ancestor.focus();
+            }
+        }
+    },
+
+    expandMenu: function(delay) {
+        var me = this;
+
+        if (me.menu) {
+            me.cancelDeferHide();
+            if (delay === 0) {
+                me.doExpandMenu();
+            } else {
+                clearTimeout(me.expandMenuTimer);
+                me.expandMenuTimer = Ext.defer(me.doExpandMenu, Ext.isNumber(delay) ? delay : me.menuExpandDelay, me);
+            }
+        }
+    },
+
+    doExpandMenu: function() {
+        var me = this,
+            menu = me.menu;
+
+        if (me.activated && (!menu.rendered || !menu.isVisible())) {
+            me.parentMenu.activeChild = menu;
+            menu.parentItem = me;
+            menu.parentMenu = me.parentMenu;
+            menu.showBy(me, me.menuAlign);
+        }
+    },
+
+    getRefItems: function(deep) {
+        var menu = this.menu,
+            items;
+
+        if (menu) {
+            items = menu.getRefItems(deep);
+            items.unshift(menu);
+        }
+        return items || [];
+    },
+
+    hideMenu: function(delay) {
+        var me = this;
+
+        if (me.menu) {
+            clearTimeout(me.expandMenuTimer);
+            me.hideMenuTimer = Ext.defer(me.deferHideMenu, Ext.isNumber(delay) ? delay : me.menuHideDelay, me);
+        }
+    },
+
+    initComponent: function() {
+        var me = this,
+            prefix = Ext.baseCSSPrefix,
+            cls = [prefix + 'menu-item'],
+            menu;
+
+        me.addEvents(
+            /**
+             * @event activate
+             * Fires when this item is activated
+             * @param {Ext.menu.Item} item The activated item
+             */
+            'activate',
+
+            /**
+             * @event click
+             * Fires when this item is clicked
+             * @param {Ext.menu.Item} item The item that was clicked
+             * @param {Ext.EventObject} e The underyling {@link Ext.EventObject}.
+             */
+            'click',
+
+            /**
+             * @event deactivate
+             * Fires when this tiem is deactivated
+             * @param {Ext.menu.Item} item The deactivated item
+             */
+            'deactivate',
+
+            /**
+             * @event textchange
+             * Fired when the item's text is changed by the {@link #setText} method.
+             * @param {Ext.menu.Item} this
+             * @param {String} oldText
+             * @param {String} newText
+             */
+            'textchange',
+
+            /**
+             * @event iconchange
+             * Fired when the item's icon is changed by the {@link #setIcon} or {@link #setIconCls} methods.
+             * @param {Ext.menu.Item} this
+             * @param {String} oldIcon
+             * @param {String} newIcon
+             */
+            'iconchange'
+        );
+
+        if (me.plain) {
+            cls.push(prefix + 'menu-item-plain');
+        }
+
+        if (me.cls) {
+            cls.push(me.cls);
+        }
+
+        me.cls = cls.join(' ');
+
+        if (me.menu) {
+            menu = me.menu;
+            delete me.menu;
+            me.setMenu(menu);
+        }
+
+        me.callParent(arguments);
+    },
+
+    onClick: function(e) {
+        var me = this,
+            clickHideDelay = me.clickHideDelay;
+
+        if (!me.href) {
+            e.stopEvent();
+        }
+
+        if (me.disabled) {
+            return;
+        }
+
+        if (me.hideOnClick) {
+            if (!clickHideDelay) {
+                me.deferHideParentMenus();
+            } else {
+                me.deferHideParentMenusTimer = Ext.defer(me.deferHideParentMenus, clickHideDelay, me);
+            }
+        }
+
+        Ext.callback(me.handler, me.scope || me, [me, e]);
+        me.fireEvent('click', me, e);
+
+        if (!me.hideOnClick) {
+            me.focus();
+        }
+    },
+
+    onRemoved: function() {
+        var me = this;
+
+        // Removing the active item, must deactivate it.
+        if (me.activated && me.parentMenu.activeItem === me) {
+            me.parentMenu.deactivateActiveItem();
+        }
+        me.callParent(arguments);
+        me.parentMenu = me.ownerButton = null;
+    },
+
+    // @private
+    beforeDestroy: function() {
+        var me = this;
+        if (me.rendered) {
+            me.clearTip();
+        }
+        me.callParent();
+    },
+
+    onDestroy: function() {
+        var me = this;
+
+        clearTimeout(me.expandMenuTimer);
+        me.cancelDeferHide();
+        clearTimeout(me.deferHideParentMenusTimer);
+
+        me.setMenu(null);
+        me.callParent(arguments);
+    },
+
+    beforeRender: function() {
+        var me = this,
+            blank = Ext.BLANK_IMAGE_URL,
+            glyph = me.glyph,
+            glyphFontFamily = Ext._glyphFontFamily,
+            glyphParts, iconCls, arrowCls;
+
+        me.callParent();
+
+        if (me.iconAlign === 'right') {
+            iconCls = me.checkChangeDisabled ? me.disabledCls : '';
+            arrowCls = Ext.baseCSSPrefix + 'menu-item-icon-right ' + me.iconCls;
+        } else {
+            iconCls = (me.iconCls || '') + (me.checkChangeDisabled ? ' ' + me.disabledCls : '');
+            arrowCls = me.menu ? me.arrowCls : '';
+        }
+
+        if (typeof glyph === 'string') {
+            glyphParts = glyph.split('@');
+            glyph = glyphParts[0];
+            glyphFontFamily = glyphParts[1];
+        }
+
+        Ext.applyIf(me.renderData, {
+            href: me.href || '#',
+            hrefTarget: me.hrefTarget,
+            icon: me.icon,
+            iconCls: iconCls,
+            glyph: glyph,
+            glyphCls: glyph ? Ext.baseCSSPrefix + 'menu-item-glyph' : undefined,
+            glyphFontFamily: glyphFontFamily,
+            hasIcon: !!(me.icon || me.iconCls || glyph),
+            iconAlign: me.iconAlign,
+            plain: me.plain,
+            text: me.text,
+            arrowCls: arrowCls,
+            blank: blank,
+            tabIndex: me.tabIndex
+        });
+    },
+
+    onRender: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        if (me.tooltip) {
+            me.setTooltip(me.tooltip, true);
+        }
+    },
+    
+    /**
+     * Set a child menu for this item. See the {@link #cfg-menu} configuration.
+     * @param {Ext.menu.Menu/Object} menu A menu, or menu configuration. null may be
+     * passed to remove the menu.
+     * @param {Boolean} [destroyMenu] True to destroy any existing menu. False to
+     * prevent destruction. If not specified, the {@link #destroyMenu} configuration
+     * will be used.
+     */
+    setMenu: function(menu, destroyMenu) {
+        var me = this,
+            oldMenu = me.menu,
+            arrowEl = me.arrowEl;
+            
+        if (oldMenu) {
+            delete oldMenu.parentItem;
+            delete oldMenu.parentMenu;
+            delete oldMenu.ownerItem;
+            
+            if (destroyMenu === true || (destroyMenu !== false && me.destroyMenu)) {
+                Ext.destroy(oldMenu);
+            }
+        }
+        if (menu) {
+            me.menu = Ext.menu.Manager.get(menu);
+            me.menu.ownerItem = me;
+        } else {
+            me.menu = null;
+        }
+        
+        if (me.rendered && !me.destroying && arrowEl) {
+            arrowEl[me.menu ? 'addCls' : 'removeCls'](me.arrowCls);
+        }
+    },
+
+    /**
+     * Sets the {@link #click} handler of this item
+     * @param {Function} fn The handler function
+     * @param {Object} [scope] The scope of the handler function
+     */
+    setHandler: function(fn, scope) {
+        this.handler = fn || null;
+        this.scope = scope;
+    },
+
+    /**
+     * Sets the {@link #icon} on this item.
+     * @param {String} icon The new icon 
+     */
+    setIcon: function(icon){
+        var iconEl = this.iconEl,
+            oldIcon = this.icon;
+        if (iconEl) {
+            iconEl.src = icon || Ext.BLANK_IMAGE_URL;
+        }
+        this.icon = icon;
+        this.fireEvent('iconchange', this, oldIcon, icon);
+    },
+
+    /**
+     * Sets the {@link #iconCls} of this item
+     * @param {String} iconCls The CSS class to set to {@link #iconCls}
+     */
+    setIconCls: function(iconCls) {
+        var me = this,
+            iconEl = me.iconEl,
+            oldCls = me.iconCls;
+
+        if (iconEl) {
+            if (me.iconCls) {
+                iconEl.removeCls(me.iconCls);
+            }
+
+            if (iconCls) {
+                iconEl.addCls(iconCls);
+            }
+        }
+
+        me.iconCls = iconCls;
+        me.fireEvent('iconchange', me, oldCls, iconCls);
+    },
+
+    /**
+     * Sets the {@link #text} of this item
+     * @param {String} text The {@link #text}
+     */
+    setText: function(text) {
+        var me = this,
+            el = me.textEl || me.el,
+            oldText = me.text;
+
+        me.text = text;
+
+        if (me.rendered) {
+            el.update(text || '');
+            // cannot just call layout on the component due to stretchmax
+            me.ownerCt.updateLayout();
+        }
+        me.fireEvent('textchange', me, oldText, text);
+    },
+
+    getTipAttr: function(){
+        return this.tooltipType == 'qtip' ? 'data-qtip' : 'title';
+    },
+
+    //private
+    clearTip: function() {
+        if (Ext.quickTipsActive && Ext.isObject(this.tooltip)) {
+            Ext.tip.QuickTipManager.unregister(this.itemEl);
+        }
+    },
+
+    /**
+     * Sets the tooltip for this menu item.
+     *
+     * @param {String/Object} tooltip This may be:
+     *
+     *   - **String** : A string to be used as innerHTML (html tags are accepted) to show in a tooltip
+     *   - **Object** : A configuration object for {@link Ext.tip.QuickTipManager#register}.
+     *
+     * @return {Ext.menu.Item} this
+     */
+    setTooltip: function(tooltip, initial) {
+        var me = this;
+
+        if (me.rendered) {
+            if (!initial) {
+                me.clearTip();
+            }
+
+            if (Ext.quickTipsActive && Ext.isObject(tooltip)) {
+                Ext.tip.QuickTipManager.register(Ext.apply({
+                    target: me.itemEl.id
+                },
+                tooltip));
+                me.tooltip = tooltip;
+            } else {
+                me.itemEl.dom.setAttribute(me.getTipAttr(), tooltip);
+            }
+        } else {
+            me.tooltip = tooltip;
+        }
+
+        return me;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A menu item that contains a togglable checkbox by default, but that can also be a part of a radio group.
+ *
+ *     @example
+ *     Ext.create('Ext.menu.Menu', {
+ *         width: 100,
+ *         height: 110,
+ *         floating: false,  // usually you want this set to True (default)
+ *         renderTo: Ext.getBody(),  // usually rendered by it's containing component
+ *         items: [{
+ *             xtype: 'menucheckitem',
+ *             text: 'select all'
+ *         },{
+ *             xtype: 'menucheckitem',
+ *             text: 'select specific'
+ *         },{
+ *             iconCls: 'add16',
+ *             text: 'icon item'
+ *         },{
+ *             text: 'regular item'
+ *         }]
+ *     });
+ */
+Ext.define('Ext.menu.CheckItem', {
+    extend:  Ext.menu.Item ,
+    alias: 'widget.menucheckitem',
+    
+    /**
+     * @cfg {Boolean} [checked=false]
+     * True to render the menuitem initially checked.
+     */
+    
+    /**
+     * @cfg {Function} checkHandler
+     * Alternative for the {@link #checkchange} event.  Gets called with the same parameters.
+     */
+
+    /**
+     * @cfg {Object} scope
+     * Scope for the {@link #checkHandler} callback.
+     */
+    
+    /**
+     * @cfg {String} group
+     * Name of a radio group that the item belongs.
+     *
+     * Specifying this option will turn check item into a radio item.
+     *
+     * Note that the group name must be globally unique.
+     */
+
+    /**
+     * @cfg {String} checkedCls
+     * The CSS class used by {@link #cls} to show the checked state.
+     * Defaults to `Ext.baseCSSPrefix + 'menu-item-checked'`.
+     */
+    checkedCls: Ext.baseCSSPrefix + 'menu-item-checked',
+    /**
+     * @cfg {String} uncheckedCls
+     * The CSS class used by {@link #cls} to show the unchecked state.
+     * Defaults to `Ext.baseCSSPrefix + 'menu-item-unchecked'`.
+     */
+    uncheckedCls: Ext.baseCSSPrefix + 'menu-item-unchecked',
+    /**
+     * @cfg {String} groupCls
+     * The CSS class applied to this item's icon image to denote being a part of a radio group.
+     * Defaults to `Ext.baseCSSClass + 'menu-group-icon'`.
+     * Any specified {@link #iconCls} overrides this.
+     */
+    groupCls: Ext.baseCSSPrefix + 'menu-group-icon',
+
+    /**
+     * @cfg {Boolean} [hideOnClick=false]
+     * Whether to not to hide the owning menu when this item is clicked.
+     * Defaults to `false` for checkbox items, and to `true` for radio group items.
+     */
+    hideOnClick: false,
+    
+    /**
+     * @cfg {Boolean} [checkChangeDisabled=false]
+     * True to prevent the checked item from being toggled. Any submenu will still be accessible.
+     */
+    checkChangeDisabled: false,
+
+    childEls: [
+        'itemEl', 'iconEl', 'textEl', 'checkEl'
+    ],
+    
+    showCheckbox: true,
+
+    renderTpl: [
+        '<tpl if="plain">',
+            '{text}',
+        '<tpl else>',
+            '{%var showCheckbox = values.showCheckbox,',
+            '      rightCheckbox = showCheckbox && values.hasIcon && (values.iconAlign !== "left"), textCls = rightCheckbox ? "' + Ext.baseCSSPrefix + 'right-check-item-text" : "";%}',
+            '<a id="{id}-itemEl" class="' + Ext.baseCSSPrefix + 'menu-item-link{childElCls}" href="{href}" <tpl if="hrefTarget">target="{hrefTarget}"</tpl> hidefocus="true" unselectable="on"',
+                '<tpl if="tabIndex">',
+                    ' tabIndex="{tabIndex}"',
+                '</tpl>',
+            '>',
+                '{%if (values.hasIcon && (values.iconAlign !== "left")) {%}',
+                    '<div role="img" id="{id}-iconEl" class="' + Ext.baseCSSPrefix + 'menu-item-icon {iconCls}',
+                        '{childElCls} {glyphCls}" style="<tpl if="icon">background-image:url({icon});</tpl>',
+                        '<tpl if="glyph && glyphFontFamily">font-family:{glyphFontFamily};</tpl>">',
+                        '<tpl if="glyph">&#{glyph};</tpl>',
+                    '</div>',
+                '{%} else if (showCheckbox){%}',
+                    '<img id="{id}-checkEl" src="{blank}" class="' + Ext.baseCSSPrefix + 'menu-item-icon{childElCls}" />',
+                '{%}%}',
+                '<span id="{id}-textEl" class="' + Ext.baseCSSPrefix + 'menu-item-text {[textCls]}{childElCls}" <tpl if="arrowCls">style="margin-right: 17px;"</tpl> >{text}</span>',
+
+                // CheckItem with an icon puts the icon on the right unless iconAlign=='left'
+                '{%if (rightCheckbox) {%}',
+                    '<img id="{id}-checkEl" src="{blank}" class="' + Ext.baseCSSPrefix + 'menu-item-icon-right{childElCls}" />',
+                '{%} else if (values.arrowCls) {%}',
+                    '<img id="{id}-arrowEl" src="{blank}" class="{arrowCls}{childElCls}"/>',
+                '{%}%}',
+            '</a>',
+        '</tpl>'
+    ],
+
+    initComponent: function() {
+        var me = this;
+        
+        // coerce to bool straight away
+        me.checked = !!me.checked;
+        me.addEvents(
+            /**
+             * @event beforecheckchange
+             * Fires before a change event. Return false to cancel.
+             * @param {Ext.menu.CheckItem} this
+             * @param {Boolean} checked
+             */
+            'beforecheckchange',
+
+            /**
+             * @event checkchange
+             * Fires after a change event.
+             * @param {Ext.menu.CheckItem} this
+             * @param {Boolean} checked
+             */
+            'checkchange'
+        );
+
+        me.callParent(arguments);
+
+        Ext.menu.Manager.registerCheckable(me);
+
+        if (me.group) {
+            me.showCheckbox = false
+            if (!(me.iconCls || me.icon || me.glyph)) {
+                me.iconCls = me.groupCls;
+            }
+            if (me.initialConfig.hideOnClick !== false) {
+                me.hideOnClick = true;
+            }
+        }
+    },
+    
+    beforeRender: function() {
+        this.callParent();
+        this.renderData.showCheckbox = this.showCheckbox;
+    },
+    
+    afterRender: function() {
+        var me = this;
+        me.callParent();
+        me.checked = !me.checked;
+        me.setChecked(!me.checked, true);
+        if (me.checkChangeDisabled) {
+            me.disableCheckChange();
+        }
+    },
+    
+    /**
+     * Disables just the checkbox functionality of this menu Item. If this menu item has a submenu, that submenu
+     * will still be accessible
+     */
+    disableCheckChange: function() {
+        var me = this,
+            checkEl = me.checkEl;
+
+        if (checkEl) {
+            checkEl.addCls(me.disabledCls);
+        }
+        // In some cases the checkbox will disappear until repainted
+        // Happens in everything except IE9 strict, see: EXTJSIV-6412
+        if (!(Ext.isIE10p || (Ext.isIE9 && Ext.isStrict)) && me.rendered) {
+            me.el.repaint();
+        }
+        me.checkChangeDisabled = true;
+    },
+
+    /**
+     * Reenables the checkbox functionality of this menu item after having been disabled by {@link #disableCheckChange}
+     */
+    enableCheckChange: function() {
+        var me = this,
+            checkEl = me.checkEl;
+            
+        if (checkEl) {
+            checkEl.removeCls(me.disabledCls);
+        }
+        me.checkChangeDisabled = false;
+    },
+
+    onClick: function(e) {
+        var me = this;
+        if(!me.disabled && !me.checkChangeDisabled && !(me.checked && me.group)) {
+            me.setChecked(!me.checked);
+        }
+        this.callParent([e]);
+    },
+
+    onDestroy: function() {
+        Ext.menu.Manager.unregisterCheckable(this);
+        this.callParent(arguments);
+    },
+
+    /**
+     * Sets the checked state of the item
+     * @param {Boolean} checked True to check, false to uncheck
+     * @param {Boolean} [suppressEvents=false] True to prevent firing the checkchange events.
+     */
+    setChecked: function(checked, suppressEvents) {
+        var me = this;
+        if (me.checked !== checked && (suppressEvents || me.fireEvent('beforecheckchange', me, checked) !== false)) {
+            if (me.el) {
+                me.el[checked  ? 'addCls' : 'removeCls'](me.checkedCls)[!checked ? 'addCls' : 'removeCls'](me.uncheckedCls);
+            }
+            me.checked = checked;
+            Ext.menu.Manager.onCheckChange(me, checked);
+            if (!suppressEvents) {
+                Ext.callback(me.checkHandler, me.scope, [me, checked]);
+                me.fireEvent('checkchange', me, checked);
+            }
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @private
+ */
+Ext.define('Ext.menu.KeyNav', {
+    extend:  Ext.util.KeyNav ,
+
+                                   
+    
+    constructor: function(config) {
+        var me = this;
+
+        me.menu = config.target;
+        me.callParent([Ext.apply({
+            down: me.down,
+            enter: me.enter,
+            esc: me.escape,
+            left: me.left,
+            right: me.right,
+            space: me.enter,
+            tab: me.tab,
+            up: me.up
+        }, config)]);
+    },
+
+    down: function(e) {
+        var me = this,
+            fi = me.menu.focusedItem;
+
+        if (fi && e.getKey() == Ext.EventObject.DOWN && me.isWhitelisted(fi)) {
+            return true;
+        }
+        me.focusNextItem(1);
+    },
+
+    enter: function(e) {
+        var menu = this.menu,
+            focused = menu.focusedItem;
+ 
+        if (menu.activeItem) {
+            menu.onClick(e);
+        } else if (focused && focused.isFormField) {
+            // prevent stopEvent being called
+            return true;
+        }
+    },
+
+    escape: function(e) {
+        Ext.menu.Manager.hideAll();
+    },
+
+    focusNextItem: function(step) {
+        var menu = this.menu,
+            items = menu.items,
+            focusedItem = menu.focusedItem,
+            startIdx = focusedItem ? items.indexOf(focusedItem) : -1,
+            idx = startIdx + step,
+            len = items.length,
+            count = 0,
+            item;
+
+        // Limit the count, since we might not be able to find something to focus
+        while (count < len && idx !== startIdx) {
+            if (idx < 0) {
+                idx = len - 1;
+            } else if (idx >= len) {
+                idx = 0;
+            }
+
+            item = items.getAt(idx);
+            if (menu.canActivateItem(item)) {
+                menu.setActiveItem(item);
+                break;
+            }
+            idx += step;
+            ++count;
+        }
+    },
+
+    isWhitelisted: function(item) {
+        return Ext.FocusManager.isWhitelisted(item);
+    },
+
+    left: function(e) {
+        var menu = this.menu,
+            fi = menu.focusedItem;
+
+        if (fi && this.isWhitelisted(fi)) {
+            return true;
+        }
+
+        menu.hide();
+        if (menu.parentMenu) {
+            menu.parentMenu.focus();
+        }
+    },
+
+    right: function(e) {
+        var menu = this.menu,
+            fi = menu.focusedItem,
+            ai = menu.activeItem,
+            am;
+
+        if (fi && this.isWhitelisted(fi)) {
+            return true;
+        }
+
+        if (ai) {
+            am = menu.activeItem.menu;
+            if (am) {
+                ai.expandMenu(0);
+                am.setActiveItem(am.child(':focusable'));
+            }
+        }
+    },
+
+    tab: function(e) {
+        var me = this;
+
+        if (e.shiftKey) {
+            me.up(e);
+        } else {
+            me.down(e);
+        }
+    },
+
+    up: function(e) {
+        var me = this,
+            fi = me.menu.focusedItem;
+
+        if (fi && e.getKey() == Ext.EventObject.UP && me.isWhitelisted(fi)) {
+            return true;
+        }
+        me.focusNextItem(-1);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Adds a separator bar to a menu, used to divide logical groups of menu items. Generally you will
+ * add one of these by using "-" in your call to add() or in your items config rather than creating one directly.
+ *
+ *     @example
+ *     Ext.create('Ext.menu.Menu', {
+ *         width: 100,
+ *         height: 100,
+ *         floating: false,  // usually you want this set to True (default)
+ *         renderTo: Ext.getBody(),  // usually rendered by it's containing component
+ *         items: [{
+ *             text: 'icon item',
+ *             iconCls: 'add16'
+ *         },{
+ *             xtype: 'menuseparator'
+ *         },{
+ *            text: 'separator above'
+ *         },{
+ *            text: 'regular item'
+ *         }]
+ *     });
+ */
+Ext.define('Ext.menu.Separator', {
+    extend:  Ext.menu.Item ,
+    alias: 'widget.menuseparator',
+
+    /**
+     * @cfg {String} activeCls
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} canActivate
+     * @private
+     */
+    canActivate: false,
+
+    /**
+     * @cfg {Boolean} clickHideDelay
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} destroyMenu
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} disabledCls
+     * @private
+     */
+
+    focusable: false,
+
+    /**
+     * @cfg {String} href
+     * @private
+     */
+
+    /**
+     * @cfg {String} hrefTarget
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} hideOnClick
+     * @private
+     */
+    hideOnClick: false,
+
+    /**
+     * @cfg {String} icon
+     * @private
+     */
+
+    /**
+     * @cfg {String} iconCls
+     * @private
+     */
+
+    /**
+     * @cfg {Object} menu
+     * @private
+     */
+
+    /**
+     * @cfg {String} menuAlign
+     * @private
+     */
+
+    /**
+     * @cfg {Number} menuExpandDelay
+     * @private
+     */
+
+    /**
+     * @cfg {Number} menuHideDelay
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} plain
+     * @private
+     */
+    plain: true,
+
+    /**
+     * @cfg {String} separatorCls
+     * The CSS class used by the separator item to show the incised line.
+     */
+    separatorCls: Ext.baseCSSPrefix + 'menu-item-separator',
+
+    /**
+     * @cfg {String} text
+     * @private
+     */
+    text: ' ',
+
+    beforeRender: function(ct, pos) {
+        var me = this;
+
+        me.callParent();
+
+        me.addCls(me.separatorCls);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * A menu object. This is the container to which you may add {@link Ext.menu.Item menu items}.
+ *
+ * Menus may contain either {@link Ext.menu.Item menu items}, or general {@link Ext.Component Components}.
+ * Menus may also contain {@link Ext.panel.AbstractPanel#dockedItems docked items} because it extends {@link Ext.panel.Panel}.
+ *
+ * By default, non {@link Ext.menu.Item menu items} are indented so that they line up with the text of menu items. clearing
+ * the icon column. To make a contained general {@link Ext.Component Component} left aligned configure the child
+ * Component with `indent: false.
+ *
+ * By default, Menus are absolutely positioned, floating Components. By configuring a Menu with `{@link #floating}: false`,
+ * a Menu may be used as a child of a {@link Ext.container.Container Container}.
+ *
+ *     @example
+ *     Ext.create('Ext.menu.Menu', {
+ *         width: 100,
+ *         margin: '0 0 10 0',
+ *         floating: false,  // usually you want this set to True (default)
+ *         renderTo: Ext.getBody(),  // usually rendered by it's containing component
+ *         items: [{
+ *             text: 'regular item 1'
+ *         },{
+ *             text: 'regular item 2'
+ *         },{
+ *             text: 'regular item 3'
+ *         }]
+ *     });
+ *
+ *     Ext.create('Ext.menu.Menu', {
+ *         width: 100,
+ *         plain: true,
+ *         floating: false,  // usually you want this set to True (default)
+ *         renderTo: Ext.getBody(),  // usually rendered by it's containing component
+ *         items: [{
+ *             text: 'plain item 1'
+ *         },{
+ *             text: 'plain item 2'
+ *         },{
+ *             text: 'plain item 3'
+ *         }]
+ *     });
+ */
+Ext.define('Ext.menu.Menu', {
+    extend:  Ext.panel.Panel ,
+    alias: 'widget.menu',
+               
+                                   
+                                    
+                             
+                        
+                          
+                           
+                            
+      
+
+    /**
+     * @property {Ext.menu.Menu} parentMenu
+     * The parent Menu of this Menu.
+     */
+    
+    /**
+     * @cfg {Boolean} [enableKeyNav=true]
+     * True to enable keyboard navigation for controlling the menu.
+     * This option should generally be disabled when form fields are
+     * being used inside the menu.
+     */
+    enableKeyNav: true,
+
+    /**
+     * @cfg {Boolean} [allowOtherMenus=false]
+     * True to allow multiple menus to be displayed at the same time.
+     */
+    allowOtherMenus: false,
+
+    /**
+     * @cfg {String} ariaRole
+     * @private
+     */
+    ariaRole: 'menu',
+
+    /**
+     * @cfg {Boolean} autoRender
+     * Floating is true, so autoRender always happens.
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} [floating=true]
+     * A Menu configured as `floating: true` (the default) will be rendered as an absolutely positioned,
+     * {@link Ext.Component#floating floating} {@link Ext.Component Component}. If configured as `floating: false`, the Menu may be
+     * used as a child item of another {@link Ext.container.Container Container}.
+     */
+    floating: true,
+
+    /**
+     * @cfg {Boolean} constrain
+     * Menus are constrained to the document body by default.
+     * @private
+     */
+    constrain: true,
+
+    /**
+     * @cfg {Boolean} [hidden=undefined]
+     * True to initially render the Menu as hidden, requiring to be shown manually.
+     *
+     * Defaults to `true` when `floating: true`, and defaults to `false` when `floating: false`.
+     */
+    hidden: true,
+
+    hideMode: 'visibility',
+
+    /**
+     * @cfg {Boolean} [ignoreParentClicks=false]
+     * True to ignore clicks on any item in this menu that is a parent item (displays a submenu)
+     * so that the submenu is not dismissed when clicking the parent item.
+     */
+    ignoreParentClicks: false,
+
+    /**
+     * @property {Boolean} isMenu
+     * `true` in this class to identify an object as an instantiated Menu, or subclass thereof.
+     */
+    isMenu: true,
+
+    /**
+     * @cfg {Ext.enums.Layout/Object} layout
+     * @private
+     */
+
+    /**
+     * @cfg {Boolean} [showSeparator=true]
+     * True to show the icon separator.
+     */
+    showSeparator : true,
+
+    /**
+     * @cfg {Number} [minWidth=120]
+     * The minimum width of the Menu. The default minWidth only applies when the {@link #floating} config is true.
+     */
+    minWidth: undefined,
+
+    defaultMinWidth: 120,
+
+    /**
+     * @cfg {Boolean} [plain=false]
+     * True to remove the incised line down the left side of the menu and to not indent general Component items.
+     * 
+     * {@link Ext.menu.Item MenuItem}s will *always* have space at their start for an icon. With the `plain` setting,
+     * non {@link Ext.menu.Item MenuItem} child components will not be indented to line up.
+     * 
+     * Basically, `plain:true` makes a Menu behave more like a regular {@link Ext.layout.container.HBox HBox layout}
+     * {@link Ext.panel.Panel Panel} which just has the same background as a Menu.
+     * 
+     * See also the {@link #showSeparator} config.
+     */
+
+    initComponent: function() {
+        var me = this,
+            prefix = Ext.baseCSSPrefix,
+            cls = [prefix + 'menu'],
+            bodyCls = me.bodyCls ? [me.bodyCls] : [],
+            isFloating = me.floating !== false;
+
+        me.addEvents(
+            /**
+             * @event click
+             * Fires when this menu is clicked
+             * @param {Ext.menu.Menu} menu The menu which has been clicked
+             * @param {Ext.Component} item The menu item that was clicked. `undefined` if not applicable.
+             * @param {Ext.EventObject} e The underlying {@link Ext.EventObject}.
+             */
+            'click',
+
+            /**
+             * @event mouseenter
+             * Fires when the mouse enters this menu
+             * @param {Ext.menu.Menu} menu The menu
+             * @param {Ext.EventObject} e The underlying {@link Ext.EventObject}
+             */
+            'mouseenter',
+
+            /**
+             * @event mouseleave
+             * Fires when the mouse leaves this menu
+             * @param {Ext.menu.Menu} menu The menu
+             * @param {Ext.EventObject} e The underlying {@link Ext.EventObject}
+             */
+            'mouseleave',
+
+            /**
+             * @event mouseover
+             * Fires when the mouse is hovering over this menu
+             * @param {Ext.menu.Menu} menu The menu
+             * @param {Ext.Component} item The menu item that the mouse is over. `undefined` if not applicable.
+             * @param {Ext.EventObject} e The underlying {@link Ext.EventObject}
+             */
+            'mouseover'
+        );
+
+        Ext.menu.Manager.register(me);
+
+        // Menu classes
+        if (me.plain) {
+            cls.push(prefix + 'menu-plain');
+        }
+        me.cls = cls.join(' ');
+
+        // Menu body classes
+        bodyCls.push(prefix + 'menu-body', Ext.dom.Element.unselectableCls);
+        me.bodyCls = bodyCls.join(' ');
+
+        // Internal vbox layout, with scrolling overflow
+        // Placed in initComponent (rather than prototype) in order to support dynamic layout/scroller
+        // options if we wish to allow for such configurations on the Menu.
+        // e.g., scrolling speed, vbox align stretch, etc.
+        if (!me.layout) {
+            me.layout = {
+                type: 'vbox',
+                align: 'stretchmax',
+                overflowHandler: 'Scroller'
+            };
+        }
+
+        if (isFloating)  {
+            // only apply the minWidth when we're floating & one hasn't already been set
+            if (me.minWidth === undefined) {
+                me.minWidth = me.defaultMinWidth;
+            }
+        } else {
+            // hidden defaults to false if floating is configured as false
+            me.hidden = !!me.initialConfig.hidden;
+            me.constrain = false;
+        }
+
+        me.callParent(arguments);
+    },
+
+    // Private implementation for Menus. They are a special case.
+    // They are always global floaters, never contained.
+    registerWithOwnerCt: function() {
+        if (this.floating) {
+            this.ownerCt = null;
+            Ext.WindowManager.register(this);
+        }
+    },
+
+    // Menus do not have owning containers on which they depend for visibility. They stand outside
+    // any container hierarchy.
+    initHierarchyEvents: Ext.emptyFn,
+
+    // Menus are never contained, and must not ascertain their visibility from the ancestor hierarchy
+    isVisible: function() {
+        return this.callParent();
+    },
+
+    // As menus are never contained, a Menu's visibility only ever depends upon its own hidden state.
+    // Ignore hiddenness from the ancestor hierarchy, override it with local hidden state.
+    getHierarchyState: function() {
+        var result = this.callParent();
+        result.hidden = this.hidden;
+        return result;
+    },
+
+    beforeRender: function() {
+        this.callParent(arguments);
+
+        // Menus are usually floating: true, which means they shrink wrap their items.
+        // However, when they are contained, and not auto sized, we must stretch the items.
+        if (!this.getSizeModel().width.shrinkWrap) {
+            this.layout.align = 'stretch';
+        }
+    },
+
+    onBoxReady: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // TODO: Move this to a subTemplate When we support them in the future
+        if (me.showSeparator) {
+            me.iconSepEl = me.layout.getElementTarget().insertFirst({
+                cls: Ext.baseCSSPrefix + 'menu-icon-separator',
+                html: ' '
+            });
+        }
+
+        me.mon(me.el, {
+            click: me.onClick,
+            mouseover: me.onMouseOver,
+            scope: me
+        });
+        me.mouseMonitor = me.el.monitorMouseLeave(100, me.onMouseLeave, me);
+
+        // A Menu is a Panel. The KeyNav can use the Panel's KeyMap
+        if (me.enableKeyNav) {
+            me.keyNav = new Ext.menu.KeyNav({
+                target: me,
+                keyMap: me.getKeyMap()
+            });
+        }
+    },
+
+    getRefOwner: function() {
+        // If a submenu, this will have a parentMenu property
+        // If a menu of a Button, it will have an ownerButton property
+        // Else use the default method.
+        return this.parentMenu || this.ownerButton || this.callParent(arguments);
+    },
+
+    /**
+     * Returns whether a menu item can be activated or not.
+     * @return {Boolean}
+     */
+    canActivateItem: function(item) {
+        return item && !item.isDisabled() && item.isVisible() && (item.canActivate || item.getXTypes().indexOf('menuitem') < 0);
+    },
+
+    /**
+     * Deactivates the current active item on the menu, if one exists.
+     */
+    deactivateActiveItem: function(andBlurFocusedItem) {
+        var me = this,
+            activeItem = me.activeItem,
+            focusedItem = me.focusedItem;
+
+        if (activeItem) {
+            activeItem.deactivate();
+            if (!activeItem.activated) {
+                delete me.activeItem;
+            }
+        }
+
+        // Blur the focused item if we are being asked to do that too
+        // Only needed if we are being hidden - mouseout does not blur.
+        if (focusedItem && andBlurFocusedItem) {
+            focusedItem.blur();
+            delete me.focusedItem;
+        }
+    },
+
+    // @inheritdoc
+    getFocusEl: function() {
+        return this.focusedItem || this.el;
+    },
+
+    // @inheritdoc
+    hide: function() {
+        this.deactivateActiveItem(true);
+        this.callParent(arguments);
+    },
+
+    // @private
+    getItemFromEvent: function(e) {
+        return this.getChildByElement(e.getTarget());
+    },
+
+    lookupComponent: function(cmp) {
+        var me = this;
+
+        if (typeof cmp == 'string') {
+            cmp = me.lookupItemFromString(cmp);
+        } else if (Ext.isObject(cmp)) {
+            cmp = me.lookupItemFromObject(cmp);
+        }
+
+        // Apply our minWidth to all of our child components so it's accounted
+        // for in our VBox layout
+        cmp.minWidth = cmp.minWidth || me.minWidth;
+
+        return cmp;
+    },
+
+    // @private
+    lookupItemFromObject: function(cmp) {
+        var me = this,
+            prefix = Ext.baseCSSPrefix,
+            cls;
+
+        if (!cmp.isComponent) {
+            if (!cmp.xtype) {
+                cmp = Ext.create('Ext.menu.' + (Ext.isBoolean(cmp.checked) ? 'Check': '') + 'Item', cmp);
+            } else {
+                cmp = Ext.ComponentManager.create(cmp, cmp.xtype);
+            }
+        }
+
+        if (cmp.isMenuItem) {
+            cmp.parentMenu = me;
+        }
+
+        if (!cmp.isMenuItem && !cmp.dock) {
+            cls = [prefix + 'menu-item-cmp'];
+
+            // The "plain" setting means that the menu does not look so much like a menu. It's more like a grey Panel.
+            // So it has no vertical separator.
+            // Plain menus also will not indent non MenuItem components; there is nothing to indent them to the right of.
+            if (!me.plain && (cmp.indent !== false || cmp.iconCls === 'no-icon')) {
+                cls.push(prefix + 'menu-item-indent');
+            }
+
+            if (cmp.rendered) {
+                cmp.el.addCls(cls);
+            } else {
+                cmp.cls = (cmp.cls || '') + ' ' + cls.join(' ');
+            }
+        }
+        return cmp;
+    },
+
+    // @private
+    lookupItemFromString: function(cmp) {
+        return (cmp == 'separator' || cmp == '-') ?
+            new Ext.menu.Separator()
+            : new Ext.menu.Item({
+                canActivate: false,
+                hideOnClick: false,
+                plain: true,
+                text: cmp
+            });
+    },
+
+    onClick: function(e) {
+        var me = this,
+            item;
+
+        if (me.disabled) {
+            e.stopEvent();
+            return;
+        }
+
+        item = (e.type === 'click') ? me.getItemFromEvent(e) : me.activeItem;
+        if (item && item.isMenuItem) {
+            if (!item.menu || !me.ignoreParentClicks) {
+                item.onClick(e);
+            } else {
+                e.stopEvent();
+            }
+        }
+        // Click event may be fired without an item, so we need a second check
+        if (!item || item.disabled) {
+            item = undefined;
+        }
+        me.fireEvent('click', me, item, e);
+    },
+
+    onDestroy: function() {
+        var me = this;
+
+        Ext.menu.Manager.unregister(me);
+        me.parentMenu = me.ownerButton = null;
+        if (me.rendered) {
+            me.el.un(me.mouseMonitor);
+            Ext.destroy(me.keyNav);
+            me.keyNav = null;
+        }
+        me.callParent(arguments);
+    },
+
+    onMouseLeave: function(e) {
+        var me = this;
+
+        me.deactivateActiveItem();
+
+        if (me.disabled) {
+            return;
+        }
+
+        me.fireEvent('mouseleave', me, e);
+    },
+
+    onMouseOver: function(e) {
+        var me = this,
+            fromEl = e.getRelatedTarget(),
+            mouseEnter = !me.el.contains(fromEl),
+            item = me.getItemFromEvent(e),
+            parentMenu = me.parentMenu,
+            parentItem = me.parentItem;
+
+        if (mouseEnter && parentMenu) {
+            parentMenu.setActiveItem(parentItem);
+            parentItem.cancelDeferHide();
+            parentMenu.mouseMonitor.mouseenter();
+        }
+
+        if (me.disabled) {
+            return;
+        }
+
+        // Do not activate the item if the mouseover was within the item, and it's already active
+        if (item && !item.activated) {
+            me.setActiveItem(item);
+            if (item.activated && item.expandMenu) {
+                item.expandMenu();
+            }
+        }
+        if (mouseEnter) {
+            me.fireEvent('mouseenter', me, e);
+        }
+        me.fireEvent('mouseover', me, item, e);
+    },
+
+    setActiveItem: function(item) {
+        var me = this;
+
+        if (item && (item != me.activeItem)) {
+            me.deactivateActiveItem();
+            if (me.canActivateItem(item)) {
+                if (item.activate) {
+                    item.activate();
+                    if (item.activated) {
+                        me.activeItem = item;
+                        me.focusedItem = item;
+                        me.focus();
+                    }
+                } else {
+                    item.focus();
+                    me.focusedItem = item;
+                }
+            }
+            item.el.scrollIntoView(me.layout.getRenderTarget());
+        }
+    },
+
+    showBy: function(cmp, pos, off) {
+        var me = this;
+
+        me.callParent(arguments);
+        if (!me.hidden) {
+            // show may have been vetoed
+            me.setVerticalPosition();
+        }
+        return me;
+    },
+
+    beforeShow: function() {
+        var me = this,
+            viewHeight;
+
+        // Constrain the height to the containing element's viewable area
+        if (me.floating) {
+            me.savedMaxHeight = me.maxHeight;
+            viewHeight = me.container.getViewSize().height;
+            me.maxHeight = Math.min(me.maxHeight || viewHeight, viewHeight);
+        }
+
+        me.callParent(arguments);
+    },
+
+    afterShow: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        // Restore configured maxHeight
+        if (me.floating) {
+            me.maxHeight = me.savedMaxHeight;
+        }
+    },
+
+    // @private
+    // adjust the vertical position of the menu if the height of the
+    // menu is equal (or greater than) the viewport size
+    setVerticalPosition: function() {
+        var me = this,
+            max,
+            y = me.getY(),
+            returnY = y,
+            height = me.getHeight(),
+            viewportHeight = Ext.Element.getViewportHeight().height,
+            parentEl = me.el.parent(),
+            viewHeight = parentEl.getViewSize().height,
+            normalY = y - parentEl.getScroll().top; // factor in scrollTop of parent
+
+        parentEl = null;
+
+        if (me.floating) {
+            max = me.maxHeight ? me.maxHeight : viewHeight - normalY;
+            if (height > viewHeight) {
+                returnY = y - normalY;
+            } else if (max < height) {
+                returnY = y - (height - max);
+            } else if((y + height) > viewportHeight){ // keep the document from scrolling
+                returnY = viewportHeight - height;
+            }
+        }
+        me.setY(returnY);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.menu.Menu', {
+    override: 'Ext.menu.Menu',
+    showSeparator: false
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.menu.Separator', {
+    override: 'Ext.menu.Separator',
+    border: true
+});
+    
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * This class is used to display small visual icons in the header of a panel. There are a set of
+ * 25 icons that can be specified by using the {@link #type} config. The {@link #callback} config
+ * can be used to provide a function that will respond to any click events. In general, this class
+ * will not be instantiated directly, rather it will be created by specifying the {@link Ext.panel.Panel#tools}
+ * configuration on the Panel itself.
+ *
+ *     @example
+ *     Ext.create('Ext.panel.Panel', {
+ *         width: 200,
+ *         height: 200,
+ *         renderTo: document.body,
+ *         title: 'A Panel',
+ *         tools: [{
+ *             type: 'help',
+ *             callback: function() {
+ *                 // show help here
+ *             }
+ *         }, {
+ *             itemId: 'refresh',
+ *             type: 'refresh',
+ *             hidden: true,
+ *             callback: function() {
+ *                 // do refresh
+ *             }
+ *         }, {
+ *             type: 'search',
+ *             callback: function (panel) {
+ *                 // do search
+ *                 panel.down('#refresh').show();
+ *             }
+ *         }]
+ *     });
+ *
+ * The `callback` config was added in Ext JS 4.2.1 as an alternative to {@link #handler}
+ * to provide a more convenient list of arguments. In Ext JS 4.2.1 it is also possible to
+ * pass a method name instead of a direct function:
+ * 
+ *      tools: [{
+ *          type: 'help',
+ *          callback: 'onHelp',
+ *          scope: this
+ *      },
+ *      ...
+ * 
+ * The `callback` (or `handler`) name is looked up on the `scope` which will also be the
+ * `this` reference when the method is called.
+ */
+Ext.define('Ext.panel.Tool', {
+    extend:  Ext.Component ,
+                                          
+    alias: 'widget.tool',
+
+    /**
+     * @property {Boolean} isTool
+     * `true` in this class to identify an object as an instantiated Tool, or subclass thereof.
+     */
+    isTool: true,
+
+    baseCls: Ext.baseCSSPrefix + 'tool',
+    disabledCls: Ext.baseCSSPrefix + 'tool-disabled',
+    
+    /**
+     * @cfg
+     * @private
+     */
+    toolPressedCls: Ext.baseCSSPrefix + 'tool-pressed',
+    /**
+     * @cfg
+     * @private
+     */
+    toolOverCls: Ext.baseCSSPrefix + 'tool-over',
+
+    ariaRole: 'button',
+
+    childEls: [
+        'toolEl'
+    ],
+
+    renderTpl: [
+        '<img role="presentation" id="{id}-toolEl" src="{blank}" class="{baseCls}-img {baseCls}-{type}' +
+            '{childElCls}" role="presentation"/>'
+    ],
+
+    /**
+     * @cfg {Ext.Component} toolOwner
+     * The owner to report to the `callback` method. Default is `null` for the `ownerCt`.
+     * @since 4.2
+     */
+    toolOwner: null,
+
+    /**
+     * @cfg {Function} callback A function to execute when the tool is clicked.
+     * @cfg {Ext.Component} callback.owner The logical owner of the tool. In a typical
+     * `Ext.panel.Panel`, this is set to the owning panel. This value comes from the
+     * `toolOwner` config.
+     * @cfg {Ext.panel.Tool} callback.tool The tool that is calling.
+     * @cfg {Ext.EventObject} callback.event The click event.
+     * @since 4.2
+     */
+
+    /**
+     * @cfg {Function} handler
+     * A function to execute when the tool is clicked. Arguments passed are:
+     *
+     * - **event** : Ext.EventObject - The click event.
+     * - **toolEl** : Ext.Element - The tool Element.
+     * - **owner** : Ext.panel.Header - The host panel header.
+     * - **tool** : Ext.panel.Tool - The tool object
+     */
+
+    /**
+     * @cfg {Object} scope
+     * The scope to execute the {@link #callback} or {@link #handler} function. Defaults
+     * to the tool.
+     */
+
+    /**
+     * @cfg {String} type
+     * The type of tool to render. The following types are available:
+     *
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-close"></span> close
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-minimize"></span> minimize
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-maximize"></span> maximize
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-restore"></span> restore
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-toggle"></span> toggle
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-gear"></span> gear
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-prev"></span> prev
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-next"></span> next
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-pin"></span> pin
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-unpin"></span> unpin
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-right"></span> right
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-left"></span> left
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-down"></span> down
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-up"></span> up
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-refresh"></span> refresh
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-plus"></span> plus
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-minus"></span> minus
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-search"></span> search
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-save"></span> save
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-help"></span> help
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-print"></span> print
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-expand"></span> expand
+     * - <span class="x-tool"><img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" class="x-tool-collapse"></span> collapse
+     */
+
+    /**
+     * @cfg {String/Object} tooltip
+     * The tooltip for the tool - can be a string to be used as innerHTML (html tags are accepted) or QuickTips config
+     * object
+     */
+
+     /**
+     * @cfg {String} tooltipType
+     * The type of tooltip to use. Either 'qtip' (default) for QuickTips or 'title' for title attribute.
+     */
+    tooltipType: 'qtip',
+
+    /**
+     * @cfg {Boolean} stopEvent
+     * Specify as false to allow click event to propagate.
+     */
+    stopEvent: true,
+
+    // Tool size is fixed so that Box layout can avoid measurements.
+    height: 15,
+    width: 15,
+
+    _toolTypes: {
+        close:1,
+        collapse:1,
+        down:1,
+        expand:1,
+        gear:1,
+        help:1,
+        left:1,
+        maximize:1,
+        minimize:1,
+        minus:1,
+        //move:1,
+        next:1,
+        pin:1,
+        plus:1,
+        prev:1,
+        print:1,
+        refresh:1,
+        //resize:1,
+        restore:1,
+        right:1,
+        save:1,
+        search:1,
+        toggle:1,
+        unpin:1,
+        up:1
+    },
+
+    initComponent: function() {
+        var me = this;
+        me.addEvents(
+            /**
+             * @event click
+             * Fires when the tool is clicked
+             * @param {Ext.panel.Tool} this
+             * @param {Ext.EventObject} e The event object
+             */
+            'click'
+        );
+
+        if (me.id && me._toolTypes[me.id] && Ext.global.console) {
+            Ext.global.console.warn('When specifying a tool you should use the type option, the id can conflict now that tool is a Component');
+        }
+
+        me.type = me.type || me.id;
+
+        Ext.applyIf(me.renderData, {
+            baseCls: me.baseCls,
+            blank: Ext.BLANK_IMAGE_URL,
+            type: me.type
+        });
+
+        // alias qtip, should use tooltip since it's what we have in the docs
+        me.tooltip = me.tooltip || me.qtip;
+        me.callParent();
+    },
+
+    // inherit docs
+    afterRender: function() {
+        var me = this,
+            attr;
+
+        me.callParent(arguments);
+
+        me.el.on({
+            click: me.onClick,
+            mousedown: me.onMouseDown,
+            mouseover: me.onMouseOver,
+            mouseout: me.onMouseOut,
+            scope: me
+        });
+
+        if (me.tooltip) {
+            if (Ext.quickTipsActive && Ext.isObject(me.tooltip)) {
+                Ext.tip.QuickTipManager.register(Ext.apply({
+                    target: me.id
+                }, me.tooltip));
+            }
+            else {
+                attr = me.tooltipType == 'qtip' ? 'data-qtip' : 'title';
+                me.el.dom.setAttribute(attr, me.tooltip);
+            }
+        }
+    },
+
+    getFocusEl: function() {
+        return this.el;
+    },
+
+    /**
+     * Sets the type of the tool. Allows the icon to be changed.
+     * @param {String} type The new type. See the {@link #type} config.
+     * @return {Ext.panel.Tool} this
+     */
+    setType: function(type) {
+        var me = this,
+            oldType = me.type;
+
+        me.type = type;
+        if (me.rendered) {
+            if (oldType) {
+                me.toolEl.removeCls(me.baseCls + '-' + oldType);
+            }
+            me.toolEl.addCls(me.baseCls + '-' + type);
+        } else {
+            me.renderData.type = type;
+        }
+        return me;
+    },
+
+    /**
+     * Called when the tool element is clicked
+     * @private
+     * @param {Ext.EventObject} e
+     * @param {HTMLElement} target The target element
+     */
+    onClick: function(e, target) {
+        var me = this;
+
+        if (me.disabled) {
+            return false;
+        }
+
+        //remove the pressed + over class
+        me.el.removeCls(me.toolPressedCls);
+        me.el.removeCls(me.toolOverCls);
+
+        if (me.stopEvent !== false) {
+            e.stopEvent();
+        }
+
+        if (me.handler) {
+            Ext.callback(me.handler, me.scope || me, [e, target, me.ownerCt, me]);
+        } else if (me.callback) {
+            Ext.callback(me.callback, me.scope || me, [me.toolOwner || me.ownerCt, me, e]);
+        }
+        me.fireEvent('click', me, e);
+        return true;
+    },
+
+    // inherit docs
+    onDestroy: function(){
+        if (Ext.quickTipsActive && Ext.isObject(this.tooltip)) {
+            Ext.tip.QuickTipManager.unregister(this.id);
+        }
+        this.callParent();
+    },
+
+    /**
+     * Called when the user presses their mouse button down on a tool
+     * Adds the press class ({@link #toolPressedCls})
+     * @private
+     */
+    onMouseDown: function() {
+        if (this.disabled) {
+            return false;
+        }
+
+        this.el.addCls(this.toolPressedCls);
+    },
+
+    /**
+     * Called when the user rolls over a tool
+     * Adds the over class ({@link #toolOverCls})
+     * @private
+     */
+    onMouseOver: function() {
+        if (this.disabled) {
+            return false;
+        }
+        this.el.addCls(this.toolOverCls);
+    },
+
+    /**
+     * Called when the user rolls out from a tool.
+     * Removes the over class ({@link #toolOverCls})
+     * @private
+     */
+    onMouseOut: function() {
+        this.el.removeCls(this.toolOverCls);
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+Ext.define('ExtThemeNeptune.panel.Tool', {
+    override: 'Ext.panel.Tool',
+    height: 16,
+    width: 16
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Private utility class for Ext.Splitter.
+ * @private
+ */
+Ext.define('Ext.resizer.SplitterTracker', {
+    extend:  Ext.dd.DragTracker ,
+                                  
+    enabled: true,
+    
+    overlayCls: Ext.baseCSSPrefix + 'resizable-overlay',
+
+    createDragOverlay: function () {
+        var overlay;
+
+        overlay = this.overlay =  Ext.getBody().createChild({
+            cls: this.overlayCls, 
+            html: ' '
+        });
+
+        overlay.unselectable();
+        overlay.setSize(Ext.Element.getViewWidth(true), Ext.Element.getViewHeight(true));
+        overlay.show();
+    },
+
+    getPrevCmp: function() {
+        var splitter = this.getSplitter();
+        return splitter.previousSibling(':not([hidden])');
+    },
+
+    getNextCmp: function() {
+        var splitter = this.getSplitter();
+        return splitter.nextSibling(':not([hidden])');
+    },
+
+    // ensure the tracker is enabled, store boxes of previous and next
+    // components and calculate the constrain region
+    onBeforeStart: function(e) {
+        var me = this,
+            prevCmp = me.getPrevCmp(),
+            nextCmp = me.getNextCmp(),
+            collapseEl = me.getSplitter().collapseEl,
+            target = e.getTarget(),
+            box;
+            
+        if (!prevCmp || !nextCmp) {
+            return false;
+        }
+
+        if (collapseEl && target === me.getSplitter().collapseEl.dom) {
+            return false;
+        }
+
+        // SplitterTracker is disabled if any of its adjacents are collapsed.
+        if (nextCmp.collapsed || prevCmp.collapsed) {
+            return false;
+        }
+
+        // store boxes of previous and next
+        me.prevBox  = prevCmp.getEl().getBox();
+        me.nextBox  = nextCmp.getEl().getBox();
+        me.constrainTo = box = me.calculateConstrainRegion();
+
+        if (!box) {
+            return false;
+        }
+
+        return box;
+    },
+
+    // We move the splitter el. Add the proxy class.
+    onStart: function(e) {
+        var splitter = this.getSplitter();
+        this.createDragOverlay();
+        splitter.addCls(splitter.baseCls + '-active');
+    },
+
+    // calculate the constrain Region in which the splitter el may be moved.
+    calculateConstrainRegion: function() {
+        var me         = this,
+            splitter   = me.getSplitter(),
+            splitWidth = splitter.getWidth(),
+            defaultMin = splitter.defaultSplitMin,
+            orient     = splitter.orientation,
+            prevBox    = me.prevBox,
+            prevCmp    = me.getPrevCmp(),
+            nextBox    = me.nextBox,
+            nextCmp    = me.getNextCmp(),
+            // prev and nextConstrainRegions are the maximumBoxes minus the
+            // minimumBoxes. The result is always the intersection
+            // of these two boxes.
+            prevConstrainRegion, nextConstrainRegion, constrainOptions;
+
+        // vertical splitters, so resizing left to right
+        if (orient === 'vertical') {
+            constrainOptions = {
+                prevCmp: prevCmp,
+                nextCmp: nextCmp,
+                prevBox: prevBox,
+                nextBox: nextBox,
+                defaultMin: defaultMin,
+                splitWidth: splitWidth
+            };
+            // Region constructor accepts (top, right, bottom, left)
+            // anchored/calculated from the left
+            prevConstrainRegion = new Ext.util.Region(
+                prevBox.y,
+                me.getVertPrevConstrainRight(constrainOptions),
+                prevBox.bottom,
+                me.getVertPrevConstrainLeft(constrainOptions)
+            );
+            // anchored/calculated from the right
+            nextConstrainRegion = new Ext.util.Region(
+                nextBox.y,
+                me.getVertNextConstrainRight(constrainOptions),
+                nextBox.bottom,
+                me.getVertNextConstrainLeft(constrainOptions)
+            );
+        } else {
+            // anchored/calculated from the top
+            prevConstrainRegion = new Ext.util.Region(
+                prevBox.y + (prevCmp.minHeight || defaultMin),
+                prevBox.right,
+                // Bottom boundary is y + maxHeight if there IS a maxHeight.
+                // Otherwise it is calculated based upon the minWidth of the next Component
+                (prevCmp.maxHeight ? prevBox.y + prevCmp.maxHeight : nextBox.bottom - (nextCmp.minHeight || defaultMin)) + splitWidth,
+                prevBox.x
+            );
+            // anchored/calculated from the bottom
+            nextConstrainRegion = new Ext.util.Region(
+                // Top boundary is bottom - maxHeight if there IS a maxHeight.
+                // Otherwise it is calculated based upon the minHeight of the previous Component
+                (nextCmp.maxHeight ? nextBox.bottom - nextCmp.maxHeight : prevBox.y + (prevCmp.minHeight || defaultMin)) - splitWidth,
+                nextBox.right,
+                nextBox.bottom - (nextCmp.minHeight || defaultMin),
+                nextBox.x
+            );
+        }
+
+        // intersection of the two regions to provide region draggable
+        return prevConstrainRegion.intersect(nextConstrainRegion);
+    },
+
+    // Performs the actual resizing of the previous and next components
+    performResize: function(e, offset) {
+        var me        = this,
+            splitter  = me.getSplitter(),
+            orient    = splitter.orientation,
+            prevCmp   = me.getPrevCmp(),
+            nextCmp   = me.getNextCmp(),
+            owner     = splitter.ownerCt,
+            flexedSiblings = owner.query('>[flex]'),
+            len       = flexedSiblings.length,
+            vertical  = orient === 'vertical',
+            i         = 0,
+            dimension = vertical ? 'width' : 'height',
+            totalFlex = 0,
+            item, size;
+
+        // Convert flexes to pixel values proportional to the total pixel width of all flexes.
+        for (; i < len; i++) {
+            item = flexedSiblings[i];
+            size = vertical ? item.getWidth() : item.getHeight();
+            totalFlex += size;
+            item.flex = size;
+        }
+
+        offset = vertical ? offset[0] : offset[1];
+
+        if (prevCmp) {
+            size = me.prevBox[dimension] + offset;
+            if (prevCmp.flex) {
+                prevCmp.flex = size;
+            } else {
+                prevCmp[dimension] = size;
+            }
+        }
+        if (nextCmp) {
+            size = me.nextBox[dimension] - offset;
+            if (nextCmp.flex) {
+                nextCmp.flex = size;
+            } else {
+                nextCmp[dimension] = size;
+            }
+        }
+
+        owner.updateLayout();
+    },
+
+    // Cleans up the overlay (if we have one) and calls the base. This cannot be done in
+    // onEnd, because onEnd is only called if a drag is detected but the overlay is created
+    // regardless (by onBeforeStart).
+    endDrag: function () {
+        var me = this;
+
+        if (me.overlay) {
+             me.overlay.remove();
+             delete me.overlay;
+        }
+
+        me.callParent(arguments); // this calls onEnd
+    },
+
+    // perform the resize and remove the proxy class from the splitter el
+    onEnd: function(e) {
+        var me = this,
+            splitter = me.getSplitter();
+            
+        splitter.removeCls(splitter.baseCls + '-active');
+        me.performResize(e, me.getResizeOffset());
+    },
+
+    // Track the proxy and set the proper XY coordinates
+    // while constraining the drag
+    onDrag: function(e) {
+        var me        = this,
+            offset    = me.getOffset('dragTarget'),
+            splitter  = me.getSplitter(),
+            splitEl   = splitter.getEl(),
+            orient    = splitter.orientation;
+
+        if (orient === "vertical") {
+            splitEl.setX(me.startRegion.left + offset[0]);
+        } else {
+            splitEl.setY(me.startRegion.top + offset[1]);
+        }
+    },
+
+    getSplitter: function() {
+        return this.splitter;
+    },
+
+    getVertPrevConstrainRight: function(o) {
+        // Right boundary is x + maxWidth if there IS a maxWidth.
+        // Otherwise it is calculated based upon the minWidth of the next Component
+        return (o.prevCmp.maxWidth ? o.prevBox.x + o.prevCmp.maxWidth :
+            o.nextBox.right - (o.nextCmp.minWidth || o.defaultMin)) + o.splitWidth;
+    },
+
+    getVertPrevConstrainLeft: function(o) {
+        return o.prevBox.x + (o.prevCmp.minWidth || o.defaultMin);
+    },
+
+
+    getVertNextConstrainRight: function(o) {
+        return o.nextBox.right - (o.nextCmp.minWidth || o.defaultMin);
+    },
+
+    getVertNextConstrainLeft: function(o) {
+        // Left boundary is right - maxWidth if there IS a maxWidth.
+        // Otherwise it is calculated based upon the minWidth of the previous Component
+        return (o.nextCmp.maxWidth ? o.nextBox.right - o.nextCmp.maxWidth :
+            o.prevBox.x + (o.prevBox.minWidth || o.defaultMin)) - o.splitWidth;
+    },
+
+    getResizeOffset: function() {
+        return this.getOffset('dragTarget');
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Private utility class for Ext.BorderSplitter.
+ * @private
+ */
+Ext.define('Ext.resizer.BorderSplitterTracker', {
+    extend:  Ext.resizer.SplitterTracker ,
+                                  
+
+    getPrevCmp: null,
+    getNextCmp: null,
+
+    // calculate the constrain Region in which the splitter el may be moved.
+    calculateConstrainRegion: function() {
+        var me = this,
+            splitter = me.splitter,
+            collapseTarget = splitter.collapseTarget,
+            defaultSplitMin = splitter.defaultSplitMin,
+            sizePropCap = splitter.vertical ? 'Width' : 'Height',
+            minSizeProp = 'min' + sizePropCap,
+            maxSizeProp = 'max' + sizePropCap,
+            getSizeMethod = 'get' + sizePropCap,
+            neighbors = splitter.neighbors,
+            length = neighbors.length,
+            box = collapseTarget.el.getBox(),
+            left = box.x,
+            top = box.y,
+            right = box.right,
+            bottom = box.bottom,
+            size = splitter.vertical ? (right - left) : (bottom - top),
+            //neighborSizes = [],
+            i, neighbor, minRange, maxRange, maxGrowth, maxShrink, targetSize;
+
+        // if size=100 and minSize=80, we can reduce by 20 so minRange = minSize-size = -20
+        minRange = (collapseTarget[minSizeProp] || Math.min(size,defaultSplitMin)) - size;
+
+        // if maxSize=150, maxRange = maxSize - size = 50
+        maxRange = collapseTarget[maxSizeProp];
+        if (!maxRange) {
+            maxRange = 1e9;
+        } else {
+            maxRange -= size;
+        }
+        targetSize = size;
+
+        for (i = 0; i < length; ++i) {
+            neighbor = neighbors[i];
+            size = neighbor[getSizeMethod]();
+            //neighborSizes.push(size);
+
+            maxGrowth = size - neighbor[maxSizeProp]; // NaN if no maxSize or negative
+            maxShrink = size - (neighbor[minSizeProp] || Math.min(size,defaultSplitMin));
+
+            if (!isNaN(maxGrowth)) {
+                // if neighbor can only grow by 10 (maxGrowth = -10), minRange cannot be
+                // -20 anymore, but now only -10:
+                if (minRange < maxGrowth) {
+                    minRange = maxGrowth;
+                }
+            }
+
+            // if neighbor can shrink by 20 (maxShrink=20), maxRange cannot be 50 anymore,
+            // but now only 20:
+            if (maxRange > maxShrink) {
+                maxRange = maxShrink;
+            }
+        }
+
+        if (maxRange - minRange < 2) {
+            return null;
+        }
+
+        box = new Ext.util.Region(top, right, bottom, left);
+
+        me.constraintAdjusters[me.getCollapseDirection()](box, minRange, maxRange, splitter);
+
+        me.dragInfo = {
+            minRange: minRange,
+            maxRange: maxRange,
+            //neighborSizes: neighborSizes,
+            targetSize: targetSize
+        };
+
+        return box;
+    },
+
+    constraintAdjusters: {
+        // splitter is to the right of the box
+        left: function (box, minRange, maxRange, splitter) {
+            box[0] = box.x = box.left = box.right + minRange;
+            box.right += maxRange + splitter.getWidth();
+        },
+
+        // splitter is below the box
+        top: function (box, minRange, maxRange, splitter) {
+            box[1] = box.y = box.top = box.bottom + minRange;
+            box.bottom += maxRange + splitter.getHeight();
+        },
+
+        // splitter is above the box
+        bottom: function (box, minRange, maxRange, splitter) {
+            box.bottom = box.top - minRange;
+            box.top -= maxRange + splitter.getHeight();
+        },
+
+        // splitter is to the left of the box
+        right: function (box, minRange, maxRange, splitter) {
+            box.right = box.left - minRange;
+            box[0] = box.x = box.left = box.x - maxRange + splitter.getWidth();
+        }
+    },
+
+    onBeforeStart: function(e) {
+        var me = this,
+            splitter = me.splitter,
+            collapseTarget = splitter.collapseTarget,
+            neighbors = splitter.neighbors,
+            collapseEl = me.getSplitter().collapseEl,
+            target = e.getTarget(),
+            length = neighbors.length,
+            i, neighbor;
+
+        if (collapseEl && target === splitter.collapseEl.dom) {
+            return false;
+        }
+
+        if (collapseTarget.collapsed) {
+            return false;
+        }
+
+        // disabled if any neighbors are collapsed in parallel direction.
+        for (i = 0; i < length; ++i) {
+            neighbor = neighbors[i];
+
+            if (neighbor.collapsed && neighbor.isHorz === collapseTarget.isHorz) {
+                return false;
+            }
+        }
+
+        if (!(me.constrainTo = me.calculateConstrainRegion())) {
+            return false;
+        }
+
+        return true;
+    },
+
+    performResize: function(e, offset) {
+        var me = this,
+            splitter = me.splitter,
+            collapseDirection = splitter.getCollapseDirection(),
+            collapseTarget = splitter.collapseTarget,
+            // a vertical splitter adjusts horizontal dimensions
+            adjusters = me.splitAdjusters[splitter.vertical ? 'horz' : 'vert'],
+            delta = offset[adjusters.index],
+            dragInfo = me.dragInfo,
+            //neighbors = splitter.neighbors,
+            //length = neighbors.length,
+            //neighborSizes = dragInfo.neighborSizes,
+            //isVert = collapseTarget.isVert,
+            //i, neighbor,
+            owner;
+
+        if (collapseDirection == 'right' || collapseDirection == 'bottom') {
+            // these splitters grow by moving left/up, so flip the sign of delta...
+            delta = -delta;
+        }
+
+        // now constrain delta to our computed range:
+        delta = Math.min(Math.max(dragInfo.minRange, delta), dragInfo.maxRange);
+
+        if (delta) {
+            (owner = splitter.ownerCt).suspendLayouts();
+
+            adjusters.adjustTarget(collapseTarget, dragInfo.targetSize, delta);
+
+            //for (i = 0; i < length; ++i) {
+            //    neighbor = neighbors[i];
+            //    if (!neighbor.isCenter && !neighbor.maintainFlex && neighbor.isVert == isVert) {
+            //        delete neighbor.flex;
+            //        adjusters.adjustNeighbor(neighbor, neighborSizes[i], delta);
+            //    }
+            //}
+
+            owner.resumeLayouts(true);
+        }
+    },
+
+    splitAdjusters: {
+        horz: {
+            index: 0,
+            //adjustNeighbor: function (neighbor, size, delta) {
+            //    neighbor.setSize(size - delta);
+            //},
+            adjustTarget: function (target, size, delta) {
+                target.flex = null;
+                target.setSize(size + delta);
+            }
+        },
+        vert: {
+            index: 1,
+            //adjustNeighbor: function (neighbor, size, delta) {
+            //    neighbor.setSize(undefined, size - delta);
+            //},
+            adjustTarget: function (target, targetSize, delta) {
+                target.flex = null;
+                target.setSize(undefined, targetSize + delta);
+            }
+        }
+    },
+
+    getCollapseDirection: function() {
+        return this.splitter.getCollapseDirection();
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Private utility class for Ext.resizer.Resizer.
+ * @private
+ */
+Ext.define('Ext.resizer.ResizeTracker', {
+    extend:  Ext.dd.DragTracker ,
+    dynamic: true,
+    preserveRatio: false,
+
+    // Default to no constraint
+    constrainTo: null,
+    
+    proxyCls:  Ext.baseCSSPrefix + 'resizable-proxy',
+
+    constructor: function(config) {
+        var me = this,
+            widthRatio, heightRatio,
+            throttledResizeFn;
+
+        if (!config.el) {
+            if (config.target.isComponent) {
+                me.el = config.target.getEl();
+            } else {
+                me.el = config.target;
+            }
+        }
+        this.callParent(arguments);
+
+        // Ensure that if we are preserving aspect ratio, the largest minimum is honoured
+        if (me.preserveRatio && me.minWidth && me.minHeight) {
+            widthRatio = me.minWidth / me.el.getWidth();
+            heightRatio = me.minHeight / me.el.getHeight();
+
+            // largest ratio of minimum:size must be preserved.
+            // So if a 400x200 pixel image has
+            // minWidth: 50, maxWidth: 50, the maxWidth will be 400 * (50/200)... that is 100
+            if (heightRatio > widthRatio) {
+                me.minWidth = me.el.getWidth() * heightRatio;
+            } else {
+                me.minHeight = me.el.getHeight() * widthRatio;
+            }
+        }
+
+        // If configured as throttled, create an instance version of resize which calls
+        // a throttled function to perform the resize operation.
+        if (me.throttle) {
+            throttledResizeFn = Ext.Function.createThrottled(function() {
+                    Ext.resizer.ResizeTracker.prototype.resize.apply(me, arguments);
+                }, me.throttle);
+
+            me.resize = function(box, direction, atEnd) {
+                if (atEnd) {
+                    Ext.resizer.ResizeTracker.prototype.resize.apply(me, arguments);
+                } else {
+                    throttledResizeFn.apply(null, arguments);
+                }
+            };
+        }
+    },
+
+    onBeforeStart: function(e) {
+        // record the startBox
+        this.startBox = this.target.getBox();
+    },
+
+    /**
+     * @private
+     * Returns the object that will be resized on every mousemove event.
+     * If dynamic is false, this will be a proxy, otherwise it will be our actual target.
+     */
+    getDynamicTarget: function() {
+        var me = this,
+            target = me.target;
+            
+        if (me.dynamic) {
+            return target;
+        } else if (!me.proxy) {
+            me.proxy = me.createProxy(target);
+        }
+        me.proxy.show();
+        return me.proxy;
+    },
+
+    /**
+     * Create a proxy for this resizer
+     * @param {Ext.Component/Ext.Element} target The target
+     * @return {Ext.Element} A proxy element
+     */
+    createProxy: function(target){
+        var proxy,
+            cls = this.proxyCls;
+
+        if (target.isComponent) {
+            proxy = target.getProxy().addCls(cls);
+        } else {
+            proxy = target.createProxy({
+                tag: 'div',
+                cls: cls,
+                id: target.id + '-rzproxy'
+            }, Ext.getBody());
+        }
+        proxy.removeCls(Ext.baseCSSPrefix + 'proxy-el');
+        return proxy;
+    },
+
+    onStart: function(e) {
+        // returns the Ext.ResizeHandle that the user started dragging
+        this.activeResizeHandle = Ext.get(this.getDragTarget().id);
+
+        // If we are using a proxy, ensure it is sized.
+        if (!this.dynamic) {
+            this.resize(this.startBox, {
+                horizontal: 'none',
+                vertical: 'none'
+            });
+        }
+    },
+
+    onDrag: function(e) {
+        // dynamic resizing, update dimensions during resize
+        if (this.dynamic || this.proxy) {
+            this.updateDimensions(e);
+        }
+    },
+
+    updateDimensions: function(e, atEnd) {
+        var me = this,
+            region = me.activeResizeHandle.region,
+            offset = me.getOffset(me.constrainTo ? 'dragTarget' : null),
+            box = me.startBox,
+            ratio,
+            widthAdjust = 0,
+            heightAdjust = 0,
+            snappedWidth,
+            snappedHeight,
+            adjustX = 0,
+            adjustY = 0,
+            dragRatio,
+            horizDir = offset[0] < 0 ? 'right' : 'left',
+            vertDir = offset[1] < 0 ? 'down' : 'up',
+            oppositeCorner,
+            axis, // 1 = x, 2 = y, 3 = x and y.
+            newBox,
+            newHeight, newWidth;
+
+        region = me.convertRegionName(region);
+
+        switch (region) {
+            case 'south':
+                heightAdjust = offset[1];
+                axis = 2;
+                break;
+            case 'north':
+                heightAdjust = -offset[1];
+                adjustY = -heightAdjust;
+                axis = 2;
+                break;
+            case 'east':
+                widthAdjust = offset[0];
+                axis = 1;
+                break;
+            case 'west':
+                widthAdjust = -offset[0];
+                adjustX = -widthAdjust;
+                axis = 1;
+                break;
+            case 'northeast':
+                heightAdjust = -offset[1];
+                adjustY = -heightAdjust;
+                widthAdjust = offset[0];
+                oppositeCorner = [box.x, box.y + box.height];
+                axis = 3;
+                break;
+            case 'southeast':
+                heightAdjust = offset[1];
+                widthAdjust = offset[0];
+                oppositeCorner = [box.x, box.y];
+                axis = 3;
+                break;
+            case 'southwest':
+                widthAdjust = -offset[0];
+                adjustX = -widthAdjust;
+                heightAdjust = offset[1];
+                oppositeCorner = [box.x + box.width, box.y];
+                axis = 3;
+                break;
+            case 'northwest':
+                heightAdjust = -offset[1];
+                adjustY = -heightAdjust;
+                widthAdjust = -offset[0];
+                adjustX = -widthAdjust;
+                oppositeCorner = [box.x + box.width, box.y + box.height];
+                axis = 3;
+                break;
+        }
+
+        newBox = {
+            width: box.width + widthAdjust,
+            height: box.height + heightAdjust,
+            x: box.x + adjustX,
+            y: box.y + adjustY
+        };
+
+        // Snap value between stops according to configured increments
+        snappedWidth = Ext.Number.snap(newBox.width, me.widthIncrement);
+        snappedHeight = Ext.Number.snap(newBox.height, me.heightIncrement);
+        if (snappedWidth != newBox.width || snappedHeight != newBox.height){
+            switch (region) {
+                case 'northeast':
+                    newBox.y -= snappedHeight - newBox.height;
+                    break;
+                case 'north':
+                    newBox.y -= snappedHeight - newBox.height;
+                    break;
+                case 'southwest':
+                    newBox.x -= snappedWidth - newBox.width;
+                    break;
+                case 'west':
+                    newBox.x -= snappedWidth - newBox.width;
+                    break;
+                case 'northwest':
+                    newBox.x -= snappedWidth - newBox.width;
+                    newBox.y -= snappedHeight - newBox.height;
+            }
+            newBox.width = snappedWidth;
+            newBox.height = snappedHeight;
+        }
+
+        // out of bounds
+        if (newBox.width < me.minWidth || newBox.width > me.maxWidth) {
+            newBox.width = Ext.Number.constrain(newBox.width, me.minWidth, me.maxWidth);
+
+            // Re-adjust the X position if we were dragging the west side
+            if (adjustX) {
+                newBox.x = box.x + (box.width - newBox.width);
+            }
+        } else {
+            me.lastX = newBox.x;
+        }
+        if (newBox.height < me.minHeight || newBox.height > me.maxHeight) {
+            newBox.height = Ext.Number.constrain(newBox.height, me.minHeight, me.maxHeight);
+
+            // Re-adjust the Y position if we were dragging the north side
+            if (adjustY) {
+                newBox.y = box.y + (box.height - newBox.height);
+            }
+        } else {
+            me.lastY = newBox.y;
+        }
+
+        // If this is configured to preserve the aspect ratio, or they are dragging using the shift key
+        if (me.preserveRatio || e.shiftKey) {
+            ratio = me.startBox.width / me.startBox.height;
+
+            // Calculate aspect ratio constrained values.
+            newHeight = Math.min(Math.max(me.minHeight, newBox.width / ratio), me.maxHeight);
+            newWidth = Math.min(Math.max(me.minWidth, newBox.height * ratio), me.maxWidth);
+
+            // X axis: width-only change, height must obey
+            if (axis == 1) {
+                newBox.height = newHeight;
+            }
+
+            // Y axis: height-only change, width must obey
+            else if (axis == 2) {
+                newBox.width = newWidth;
+            }
+
+            // Corner drag.
+            else {
+                // Drag ratio is the ratio of the mouse point from the opposite corner.
+                // Basically what edge we are dragging, a horizontal edge or a vertical edge.
+                dragRatio = Math.abs(oppositeCorner[0] - this.lastXY[0]) / Math.abs(oppositeCorner[1] - this.lastXY[1]);
+
+                // If drag ratio > aspect ratio then width is dominant and height must obey
+                if (dragRatio > ratio) {
+                    newBox.height = newHeight;
+                } else {
+                    newBox.width = newWidth;
+                }
+
+                // Handle dragging start coordinates
+                if (region == 'northeast') {
+                    newBox.y = box.y - (newBox.height - box.height);
+                } else if (region == 'northwest') {
+                    newBox.y = box.y - (newBox.height - box.height);
+                    newBox.x = box.x - (newBox.width - box.width);
+                } else if (region == 'southwest') {
+                    newBox.x = box.x - (newBox.width - box.width);
+                }
+            }
+        }
+
+        if (heightAdjust === 0) {
+            vertDir = 'none';
+        }
+        if (widthAdjust === 0) {
+            horizDir = 'none';
+        }
+        me.resize(newBox, {
+            horizontal: horizDir,
+            vertical: vertDir
+        }, atEnd);
+    },
+
+    getResizeTarget: function(atEnd) {
+        return atEnd ? this.target : this.getDynamicTarget();
+    },
+
+    resize: function(box, direction, atEnd) {
+        var me = this,
+            target = me.getResizeTarget(atEnd);
+
+        target.setBox(box);
+
+        // update the originalTarget if it was wrapped, and the target passed in was the wrap el.
+        if (me.originalTarget && (me.dynamic || atEnd)) {
+            me.originalTarget.setBox(box);
+        }
+    },
+
+    onEnd: function(e) {
+        this.updateDimensions(e, true);
+        if (this.proxy) {
+            this.proxy.hide();
+        }
+    },
+
+    convertRegionName: function(name) {
+        return name;
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Applies drag handles to an element or component to make it resizable. The drag handles are inserted into the element
+ * (or component's element) and positioned absolute.
+ *
+ * Textarea and img elements will be wrapped with an additional div because these elements do not support child nodes.
+ * The original element can be accessed through the originalTarget property.
+ *
+ * Here is the list of valid resize handles:
+ *
+ *     Value   Description
+ *     ------  -------------------
+ *      'n'     north
+ *      's'     south
+ *      'e'     east
+ *      'w'     west
+ *      'nw'    northwest
+ *      'sw'    southwest
+ *      'se'    southeast
+ *      'ne'    northeast
+ *      'all'   all
+ *
+ * {@img Ext.resizer.Resizer/Ext.resizer.Resizer.png Ext.resizer.Resizer component}
+ *
+ * Here's an example showing the creation of a typical Resizer:
+ *
+ *     Ext.create('Ext.resizer.Resizer', {
+ *         el: 'elToResize',
+ *         handles: 'all',
+ *         minWidth: 200,
+ *         minHeight: 100,
+ *         maxWidth: 500,
+ *         maxHeight: 400,
+ *         pinned: true
+ *     });
+ */
+Ext.define('Ext.resizer.Resizer', {
+    mixins: {
+        observable:  Ext.util.Observable 
+    },
+                                                         
+
+    alternateClassName: 'Ext.Resizable',
+
+    handleCls: Ext.baseCSSPrefix + 'resizable-handle',
+    pinnedCls: Ext.baseCSSPrefix + 'resizable-pinned',
+    overCls:   Ext.baseCSSPrefix + 'resizable-over',
+    wrapCls:   Ext.baseCSSPrefix + 'resizable-wrap',
+    delimiterRe: /(?:\s*[,;]\s*)|\s+/,
+
+    /**
+     * @cfg {Boolean} dynamic
+     * Specify as true to update the {@link #target} (Element or {@link Ext.Component Component}) dynamically during
+     * dragging. This is `true` by default, but the {@link Ext.Component Component} class passes `false` when it is
+     * configured as {@link Ext.Component#resizable}.
+     *
+     * If specified as `false`, a proxy element is displayed during the resize operation, and the {@link #target} is
+     * updated on mouseup.
+     */
+    dynamic: true,
+
+    /**
+     * @cfg {String} handles
+     * String consisting of the resize handles to display. Defaults to 's e se' for Elements and fixed position
+     * Components. Defaults to 8 point resizing for floating Components (such as Windows). Specify either `'all'` or any
+     * of `'n s e w ne nw se sw'`.
+     */
+    handles: 's e se',
+
+    /**
+     * @cfg {Number} height
+     * Optional. The height to set target to in pixels
+     */
+    height : null,
+
+    /**
+     * @cfg {Number} width
+     * Optional. The width to set the target to in pixels
+     */
+    width : null,
+
+    /**
+     * @cfg {Number} heightIncrement
+     * The increment to snap the height resize in pixels.
+     */
+    heightIncrement : 0,
+
+    /**
+     * @cfg {Number} widthIncrement
+     * The increment to snap the width resize in pixels.
+     */
+    widthIncrement : 0,
+
+    /**
+     * @cfg {Number} minHeight
+     * The minimum height for the element
+     */
+    minHeight : 20,
+
+    /**
+     * @cfg {Number} minWidth
+     * The minimum width for the element
+     */
+    minWidth : 20,
+
+    /**
+     * @cfg {Number} maxHeight
+     * The maximum height for the element
+     */
+    maxHeight : 10000,
+
+    /**
+     * @cfg {Number} maxWidth
+     * The maximum width for the element
+     */
+    maxWidth : 10000,
+
+    /**
+     * @cfg {Boolean} pinned
+     * True to ensure that the resize handles are always visible, false indicates resizing by cursor changes only
+     */
+    pinned: false,
+
+    /**
+     * @cfg {Boolean} preserveRatio
+     * True to preserve the original ratio between height and width during resize
+     */
+    preserveRatio: false,
+
+    /**
+     * @cfg {Boolean} transparent
+     * True for transparent handles. This is only applied at config time.
+     */
+    transparent: false,
+
+    /**
+     * @cfg {Ext.Element/Ext.util.Region} constrainTo
+     * An element, or a {@link Ext.util.Region Region} into which the resize operation must be constrained.
+     */
+
+    possiblePositions: {
+        n:  'north',
+        s:  'south',
+        e:  'east',
+        w:  'west',
+        se: 'southeast',
+        sw: 'southwest',
+        nw: 'northwest',
+        ne: 'northeast'
+    },
+
+    /**
+     * @cfg {Ext.Element/Ext.Component} target
+     * The Element or Component to resize.
+     */
+
+    /**
+     * @property {Ext.Element} el
+     * Outer element for resizing behavior.
+     */
+
+    constructor: function(config) {
+        var me = this,
+            target,
+            targetEl,
+            tag,
+            handles = me.handles,
+            handleCls,
+            possibles,
+            len,
+            i = 0,
+            pos, 
+            handleEls = [],
+            eastWestStyle, style,
+            box, targetBaseCls,
+            unselectableCls = Ext.dom.Element.unselectableCls;
+
+        me.addEvents(
+            /**
+             * @event beforeresize
+             * Fired before resize is allowed. Return false to cancel resize.
+             * @param {Ext.resizer.Resizer} this
+             * @param {Number} width The start width
+             * @param {Number} height The start height
+             * @param {Ext.EventObject} e The mousedown event
+             */
+            'beforeresize',
+            /**
+             * @event resizedrag
+             * Fires during resizing. Return false to cancel resize.
+             * @param {Ext.resizer.Resizer} this
+             * @param {Number} width The new width
+             * @param {Number} height The new height
+             * @param {Ext.EventObject} e The mousedown event
+             */
+            'resizedrag',
+            /**
+             * @event resize
+             * Fired after a resize.
+             * @param {Ext.resizer.Resizer} this
+             * @param {Number} width The new width
+             * @param {Number} height The new height
+             * @param {Ext.EventObject} e The mouseup event
+             */
+            'resize'
+        );
+
+        if (Ext.isString(config) || Ext.isElement(config) || config.dom) {
+            target = config;
+            config = arguments[1] || {};
+            config.target = target;
+        }
+        // will apply config to this
+        me.mixins.observable.constructor.call(me, config);
+
+        // If target is a Component, ensure that we pull the element out.
+        // Resizer must examine the underlying Element.
+        target = me.target;
+        if (target) {
+            if (target.isComponent) {
+
+                // Resizable Components get a new UI class on them which makes them overflow:visible
+                // if the border width is non-zero and therefore the SASS has embedded the handles 
+                // in the borders using -ve position.
+                target.addClsWithUI('resizable');
+
+                me.el = target.getEl();
+                if (target.minWidth) {
+                    me.minWidth = target.minWidth;
+                }
+                if (target.minHeight) {
+                    me.minHeight = target.minHeight;
+                }
+                if (target.maxWidth) {
+                    me.maxWidth = target.maxWidth;
+                }
+                if (target.maxHeight) {
+                    me.maxHeight = target.maxHeight;
+                }
+                if (target.floating) {
+                    if (!me.hasOwnProperty('handles')) {
+                        me.handles = 'n ne e se s sw w nw';
+                    }
+                }
+            } else {
+                me.el = me.target = Ext.get(target);
+            }
+        }
+        // Backwards compatibility with Ext3.x's Resizable which used el as a config.
+        else {
+            me.target = me.el = Ext.get(me.el);
+        }
+
+        // Tags like textarea and img cannot
+        // have children and therefore must
+        // be wrapped
+        tag = me.el.dom.tagName.toUpperCase();
+        if (tag == 'TEXTAREA' || tag == 'IMG' || tag == 'TABLE') {
+            /**
+             * @property {Ext.Element/Ext.Component} originalTarget
+             * Reference to the original resize target if the element of the original resize target was a
+             * {@link Ext.form.field.Field Field}, or an IMG or a TEXTAREA which must be wrapped in a DIV.
+             */
+            me.originalTarget = me.target;
+            targetEl = me.el;
+            box = targetEl.getBox();
+            me.target = me.el = me.el.wrap({
+                cls: me.wrapCls,
+                id: me.el.id + '-rzwrap',
+                style: targetEl.getStyles('margin-top', 'margin-bottom')
+            });
+
+            // Transfer originalTarget's positioning+sizing+margins
+            me.el.setPositioning(targetEl.getPositioning());
+            targetEl.clearPositioning();
+            me.el.setBox(box);
+
+            // Position the wrapped element absolute so that it does not stretch the wrapper
+            targetEl.setStyle('position', 'absolute');
+        }
+
+        // Position the element, this enables us to absolute position
+        // the handles within this.el
+        me.el.position();
+        if (me.pinned) {
+            me.el.addCls(me.pinnedCls);
+        }
+
+        /**
+         * @property {Ext.resizer.ResizeTracker} resizeTracker
+         */
+        me.resizeTracker = new Ext.resizer.ResizeTracker({
+            disabled: me.disabled,
+            target: me.target,
+            constrainTo: me.constrainTo,
+            overCls: me.overCls,
+            throttle: me.throttle,
+            originalTarget: me.originalTarget,
+            delegate: '.' + me.handleCls,
+            dynamic: me.dynamic,
+            preserveRatio: me.preserveRatio,
+            heightIncrement: me.heightIncrement,
+            widthIncrement: me.widthIncrement,
+            minHeight: me.minHeight,
+            maxHeight: me.maxHeight,
+            minWidth: me.minWidth,
+            maxWidth: me.maxWidth
+        });
+
+        // Relay the ResizeTracker's superclass events as our own resize events
+        me.resizeTracker.on({
+            mousedown: me.onBeforeResize,
+            drag: me.onResize,
+            dragend: me.onResizeEnd,
+            scope: me
+        });
+
+        if (me.handles == 'all') {
+            me.handles = 'n s e w ne nw se sw';
+        }
+
+        handles = me.handles = me.handles.split(me.delimiterRe);
+        possibles = me.possiblePositions;
+        len = handles.length;
+
+        handleCls = me.handleCls + ' ' + me.handleCls + '-{0}';
+        if (me.target.isComponent) {
+            targetBaseCls = me.target.baseCls
+            handleCls += ' ' + targetBaseCls + '-handle ' + targetBaseCls + '-handle-{0}';
+            if (Ext.supports.CSS3BorderRadius) {
+                handleCls += ' ' + targetBaseCls + '-handle-{0}-br';
+            }
+        }
+
+        // Needs heighting on IE6!
+        eastWestStyle = Ext.isIE6 ? ' style="height:' + me.el.getHeight() + 'px"' : '';
+
+        for (; i < len; i++){
+            // if specified and possible, create
+            if (handles[i] && possibles[handles[i]]) {
+                pos = possibles[handles[i]];
+                if (pos === 'east' || pos === 'west') {
+                    style = eastWestStyle;
+                } else {
+                    style = '';
+                }
+
+                handleEls.push(
+                    '<div id="', me.el.id, '-', pos, '-handle"',
+                        ' class="', Ext.String.format(handleCls, pos), ' ', unselectableCls, '"',
+                        ' unselectable="on"',
+                        style,
+                    '></div>'
+                );
+            }
+        }
+        Ext.DomHelper.append(me.el, handleEls.join(''));
+
+        // store a reference to each handle element in this.east, this.west, etc
+        for (i = 0; i < len; i++){
+            // if specified and possible, create
+            if (handles[i] && possibles[handles[i]]) {
+                pos = possibles[handles[i]];
+                me[pos] = me.el.getById(me.el.id + '-' + pos + '-handle');
+                me[pos].region = pos;
+
+                if (me.transparent) {
+                    me[pos].setOpacity(0);
+                }
+            }
+        }
+
+        // Constrain within configured maxima
+        if (Ext.isNumber(me.width)) {
+            me.width = Ext.Number.constrain(me.width, me.minWidth, me.maxWidth);
+        }
+        if (Ext.isNumber(me.height)) {
+            me.height = Ext.Number.constrain(me.height, me.minHeight, me.maxHeight);
+        }
+
+        // Size the target (and originalTarget)
+        if (me.width !== null || me.height !== null) {
+            if (me.originalTarget) {
+                me.originalTarget.setWidth(me.width);
+                me.originalTarget.setHeight(me.height);
+            }
+            me.resizeTo(me.width, me.height);
+        }
+
+        me.forceHandlesHeight();
+    },
+
+    disable: function() {
+        this.resizeTracker.disable();
+    },
+
+    enable: function() {
+        this.resizeTracker.enable();
+    },
+
+    /**
+     * @private Relay the Tracker's mousedown event as beforeresize
+     * @param tracker The Resizer
+     * @param e The Event
+     */
+    onBeforeResize: function(tracker, e) {
+        var box = this.el.getBox();
+        return this.fireEvent('beforeresize', this, box.width, box.height, e);
+    },
+
+    /**
+     * @private Relay the Tracker's drag event as resizedrag
+     * @param tracker The Resizer
+     * @param e The Event
+     */
+    onResize: function(tracker, e) {
+        var me = this,
+            box = me.el.getBox();
+            
+        me.forceHandlesHeight();
+        return me.fireEvent('resizedrag', me, box.width, box.height, e);
+    },
+
+    /**
+     * @private Relay the Tracker's dragend event as resize
+     * @param tracker The Resizer
+     * @param e The Event
+     */
+    onResizeEnd: function(tracker, e) {
+        var me = this,
+            box = me.el.getBox();
+            
+        me.forceHandlesHeight();
+        return me.fireEvent('resize', me, box.width, box.height, e);
+    },
+
+    /**
+     * Perform a manual resize and fires the 'resize' event.
+     * @param {Number} width
+     * @param {Number} height
+     */
+    resizeTo : function(width, height) {
+        var me = this;
+        me.target.setSize(width, height);
+        me.fireEvent('resize', me, width, height, null);
+    },
+
+    /**
+     * Returns the element that was configured with the el or target config property. If a component was configured with
+     * the target property then this will return the element of this component.
+     *
+     * Textarea and img elements will be wrapped with an additional div because these elements do not support child
+     * nodes. The original element can be accessed through the originalTarget property.
+     * @return {Ext.Element} element
+     */
+    getEl : function() {
+        return this.el;
+    },
+
+    /**
+     * Returns the element or component that was configured with the target config property.
+     *
+     * Textarea and img elements will be wrapped with an additional div because these elements do not support child
+     * nodes. The original element can be accessed through the originalTarget property.
+     * @return {Ext.Element/Ext.Component}
+     */
+    getTarget: function() {
+        return this.target;
+    },
+
+    destroy: function() {
+        var me = this,
+            i,
+            handles = me.handles,
+            len = handles.length,
+            positions = me.possiblePositions,
+            handle;
+
+        me.resizeTracker.destroy();
+        for (i = 0; i < len; i++) {
+            if (handle = me[positions[handles[i]]]) {
+                handle.remove();
+            }
+        }
+    },
+
+    /**
+     * @private
+     * Fix IE6 handle height issue.
+     */
+    forceHandlesHeight : function() {
+        var me = this,
+            handle;
+        if (Ext.isIE6) {
+            handle = me.east;
+            if (handle) {
+                handle.setHeight(me.el.getHeight());
+            }
+            handle = me.west;
+            if (handle) {
+                handle.setHeight(me.el.getHeight());
+            }
+            me.el.repaint();
+        }
+    }
+});
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * Represents a 2D point with x and y properties, useful for comparison and instantiation
+ * from an event:
+ *
+ *     var point = Ext.util.Point.fromEvent(e);
+ *
+ */
+Ext.define('Ext.util.Point', {
+
+    /* Begin Definitions */
+    extend:  Ext.util.Region ,
+
+    statics: {
+
+        /**
+         * Returns a new instance of Ext.util.Point base on the pageX / pageY values of the given event
+         * @static
+         * @param {Ext.EventObject/Event} e The event
+         * @return {Ext.util.Point}
+         */
+        fromEvent: function(e) {
+            e = e.browserEvent || e;
+            e = (e.changedTouches && e.changedTouches.length > 0) ? e.changedTouches[0] : e;
+            return new this(e.pageX, e.pageY);
+        }
+    },
+
+    /* End Definitions */
+
+    /**
+     * Creates a point from two coordinates.
+     * @param {Number} x X coordinate.
+     * @param {Number} y Y coordinate.
+     */
+    constructor: function(x, y) {
+        this.callParent([y, x, y, x]);
+    },
+
+    /**
+     * Returns a human-eye-friendly string that represents this point,
+     * useful for debugging
+     * @return {String}
+     */
+    toString: function() {
+        return "Point[" + this.x + "," + this.y + "]";
+    },
+
+    /**
+     * Compare this point and another point
+     * @param {Ext.util.Point/Object} p The point to compare with, either an instance
+     * of Ext.util.Point or an object with left and top properties
+     * @return {Boolean} Returns whether they are equivalent
+     */
+    equals: function(p) {
+        return (this.x == p.x && this.y == p.y);
+    },
+
+    /**
+     * Whether the given point is not away from this point within the given threshold amount.
+     * @param {Ext.util.Point/Object} p The point to check with, either an instance
+     * of Ext.util.Point or an object with left and top properties
+     * @param {Object/Number} threshold Can be either an object with x and y properties or a number
+     * @return {Boolean}
+     */
+    isWithin: function(p, threshold) {
+        if (!Ext.isObject(threshold)) {
+            threshold = {
+                x: threshold,
+                y: threshold
+            };
+        }
+
+        return (this.x <= p.x + threshold.x && this.x >= p.x - threshold.x &&
+                this.y <= p.y + threshold.y && this.y >= p.y - threshold.y);
+    },
+
+    /**
+     * Determins whether this Point contained by the passed Region, Component or element.
+     * @param {Ext.util.Region/Ext.Component/Ext.dom.Element/HTMLElement} region
+     * The rectangle to check that this Point is within.
+     * @return {Boolean}
+     */
+    isContainedBy: function(region) {
+        if (!(region instanceof Ext.util.Region)) {
+            region = Ext.get(region.el || region).getRegion();
+        }
+        return region.contains(this);
+    },
+
+    /**
+     * Compare this point with another point when the x and y values of both points are rounded. E.g:
+     * [100.3,199.8] will equals to [100, 200]
+     * @param {Ext.util.Point/Object} p The point to compare with, either an instance
+     * of Ext.util.Point or an object with x and y properties
+     * @return {Boolean}
+     */
+    roundedEquals: function(p) {
+        return (Math.round(this.x) == Math.round(p.x) && Math.round(this.y) == Math.round(p.y));
+    }
+}, function() {
+    /**
+     * @method
+     * Alias for {@link #translateBy}
+     * @inheritdoc Ext.util.Region#translateBy
+     */
+    this.prototype.translate = Ext.util.Region.prototype.translateBy;
+});
+
+Ext.define("ExtThemeNeptune.Component",{override:"Ext.Component",initComponent:function(){this.callParent();if(this.dock&&this.border===undefined){this.border=false}},initStyles:function(){var b=this,a=b.border;if(b.dock){b.border=null}b.callParent(arguments);b.border=a}});Ext.define("ExtThemeNeptune.panel.Panel",{override:"Ext.panel.Panel",border:false,bodyBorder:false,initBorderProps:Ext.emptyFn,initBodyBorder:function(){if(this.bodyBorder!==true){this.callParent()}}});Ext.define("ExtT [...]
+
+/*
+This file is part of Ext JS 4.2
+
+Copyright (c) 2011-2013 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+GNU General Public License Usage
+This file may be used under the terms of the GNU General Public License version 3.0 as
+published by the Free Software Foundation and appearing in the file LICENSE included in the
+packaging of this file.
+
+Please review the following information to ensure the GNU General Public License version 3.0
+requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+
+If you are unsure which license is appropriate for your use, please contact the sales department
+at http://www.sencha.com/contact.
+
+Build date: 2013-05-16 14:36:50 (f9be68accb407158ba2b1be2c226a6ce1f649314)
+*/
+/**
+ * @class Ext.util.Grouper
+
+Represents a single grouper that can be applied to a Store. The grouper works
+in the same fashion as the {@link Ext.util.Sorter}.
+
+ * @markdown
+ */
+ 
+Ext.define('Ext.util.Grouper', {
+
+    /* Begin Definitions */
+
+    extend:  Ext.util.Sorter ,
+
+    /* End Definitions */
+   
+   isGrouper: true,
+
+    /**
+     * Returns the value for grouping to be used.
+     * @param {Ext.data.Model} instance The Model instance
+     * @return {String} The group string for this model
+     */
+    getGroupString: function(instance) {
+        return instance.get(this.property);
+    }
+});
+
+/*
+ * File: app/controller/ExcController.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.controller.ExcController', {
+    extend:  Ext.app.Controller ,
+
+    onFormBeforeRender: function(component, eOpts) {
+            exc = component.extraParams.d;
+
+            // Init Component
+            if(exc.status === 'verified'){
+                component.getComponent('verified').setValue(true);
+            }
+
+            component.getComponent('excType').setValue(exc.message);
+            component.getComponent('excProcess').setValue(exc.process);
+            component.getComponent('excDate').setValue(exc.datetime);
+            component.getComponent('excDetails').setValue(exc.details);
+            // Add eventListener
+            component.getComponent('verified').on('change',this.onChange);
+            component.getComponent('delete').on('click', this.onClick);
+    },
+
+    onLaunch: function() {
+            _excDetController = this;
+    },
+
+    onChange: function(field, newValue, oldValue, eOpts) {
+            var status = 'pending';
+            var id = this.id.split('*')[1];
+
+            if(newValue === true)
+                status = 'verified';
+
+            function confirmFunction(buttonId, text, opt){
+
+                if (buttonId === 'yes'){
+                    Ext.Ajax.request({
+                        url: '/istsos/wa/istsos/services/'+ service +'/logs/'+ id,
+                        jsonData: {
+                            newstatus: status
+                        },
+                        success: function(){ Ext.Msg.show({  title:'status changed',
+                                                             msg: 'New status set',
+                                                             buttons: Ext.Msg.YES
+                                                           });},
+                        method: 'PUT'
+                    });
+                }
+                else{
+                    field.un('change',_excDetController.onChange); // disable listener
+                    field.setValue(oldValue);
+                    field.on('change',_excDetController.onChange); // re enable listener
+                }
+            }
+            Ext.Msg.show({
+                title: 'Status change',
+                msg: 'Would you change the exception status?',
+                buttons: Ext.Msg.YESNO,
+                icons: Ext.Msg.WARNING,
+                fn: confirmFunction
+            });
+    },
+
+    onClick: function(button, e, eOpts) {
+            var id = this.id.split('*')[1];
+
+
+            function confirmFunction(buttonId, text, opt){
+                if (buttonId === 'yes'){
+                    Ext.Ajax.request({
+                        url: '/istsos/wa/istsos/services/'+ service +'/logs/'+ id,
+                        success: function(){ Ext.Msg.show({  title:'Delete',
+                                                             msg: 'Exception removed',
+                                                             buttons: Ext.Msg.YES
+                                                           });},
+                        method: 'DELETE'
+                    });
+                }
+                else{
+                    console.log('Exception not removed');
+                }
+            }
+
+            Ext.Msg.show({
+                title: 'Conf',
+                msg: 'Would you remove the exception ?',
+                buttons: Ext.Msg.YESNO,
+                icons: Ext.Msg.WARNING,
+                fn: confirmFunction
+            });
+    },
+
+    init: function(application) {
+        this.control({
+            "#ExcView": {
+                beforerender: this.onFormBeforeRender
+            }
+        });
+    }
+
+});
+
+/*
+ * File: app/controller/MainController.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.controller.MainController', {
+    extend:  Ext.app.Controller ,
+
+    id: 'mainController',
+
+    requestStatus: function(target) {
+            service = Ext.getCmp('serviceSelector').getValue();
+            Ext.getCmp('loadingicons').show();
+
+            if(service === null){
+                Ext.Msg.show({
+                     title:'Select a service',
+                     msg: 'Please select a service',
+                     buttons: Ext.Msg.OK,
+                     icon: Ext.Msg.WARNING
+                });
+                Ext.getCmp('loadingicons').hide();
+            }else{
+                console.log("require status for " + service);
+                Ext.Ajax.request({
+                    url: '../../wa/istsos/services/'+service+'/status/',
+                    timeout: 120000,
+                    success: _mainController.onStatusResponse,
+                    method: 'GET'
+                 });
+            }
+    },
+
+    onRadiogroupChange: function(field, newValue, oldValue, eOpts) {
+        type = newValue.rb;
+        updateColor();
+
+        if(type === "cycle" ){
+            console.log("cicle");
+            Ext.getCmp('minValue').setValue(minCycle.toFixed(3));
+            Ext.getCmp('maxValue').setValue(maxCycle.toFixed(3));
+        }else{
+            console.log("time");
+            Ext.getCmp('minValue').setValue(minNot.toFixed(3));
+            Ext.getCmp('maxValue').setValue(maxNot.toFixed(3));
+        }
+    },
+
+    onContainerClick: function(container) {
+            this.requestStatus();
+    },
+
+    onButtonToggle: function(button, pressed, eOpts) {
+        if(pressed){
+
+            var rate = Ext.getCmp('refreshRate').getValue();
+            var uom =  Ext.getCmp('uomSelector').getValue();
+            var delay = _mainController.convertToMs(rate,uom);
+
+            if(delay !== 0){
+
+                if(typeof intr !== 'undefined')
+                    window.clearInterval(intr);
+
+                intr = window.setInterval(this.requestStatus, delay);
+                console.log("set interval every: " + rate + " "+ uom);
+                Ext.getCmp('timeset').setValue(rate + " "+ uom);
+
+                // requeire immediately the status
+                _mainController.requestStatus();
+
+            }else{
+                button.toggle();
+                Ext.Msg.show({
+                         title:'No interval ',
+                         msg: 'Please select a interval',
+                         buttons: Ext.Msg.OK,
+                         icon: Ext.Msg.WARNING
+                    });
+            }
+
+        }else{
+            if(typeof intr !== 'undefined')
+                window.clearInterval(intr);
+            console.log("clear interval");
+            Ext.getCmp('timeset').setValue("");
+        }
+    },
+
+    onContainerResize: function(component, width, height, oldWidth, oldHeight, eOpts) {
+        if(root.hasOwnProperty('children'))
+             _mainController.drawFullMap();
+    },
+
+    onStatusResponse: function(response, option) {
+            Ext.getCmp('loadingicons').hide();
+            var jsonRest = eval("(" + response.responseText + ")");
+
+            if(jsonRest.success !== true || jsonRest.total ===0){
+                    Ext.Msg.show({
+                         title:'No data found',
+                         msg: 'No data found',
+                         buttons: Ext.Msg.OK,
+                         icon: Ext.Msg.WARNING
+                    });
+                    console.log("No data found");
+                    return 0;
+            }
+
+            hidePopup();
+
+            root = {
+                "name" : "root",
+                "children" : jsonRest.data
+            };
+
+            type = "cycle";
+            tmpName = "root";
+
+            Ext.getCmp('radioGroup').setValue({'rb': 'cycle'});
+
+            ok = "ok";
+            notok = "pending";
+            verified = "verified";
+
+            maxNot = maxCycle = maxOk = 0;
+            minNot = minCycle = minOk = Number.MAX_VALUE;
+
+            var arrayOp = root.children; // [air-temperture, air-wind-velocity]
+
+            for(var i = 0; i < arrayOp.length; i++){
+                var arrayStatus = arrayOp[i].children; // [ok, verified, pending]
+                for(var j=0; j < arrayStatus.length; j++){
+                    var arrayProcedure = arrayStatus[j].children; // [{procedure 1},{...}]
+
+                    if(arrayStatus[j].name === notok){
+                        var tmpMaxCycle = d3.max(arrayProcedure, getCycle);
+                        var tmpMinCycle = d3.min(arrayProcedure, getCycle);
+
+                        var tmpMaxNot = d3.max(arrayProcedure, getDelay);
+                        var tmpMinNot = d3.min(arrayProcedure, getDelay);
+
+                        if(tmpMinCycle < minCycle) minCycle = tmpMinCycle;
+                        if(tmpMaxCycle > maxCycle) maxCycle = tmpMaxCycle;
+                        if(tmpMinNot < minNot) minNot = tmpMinNot;
+                        if(tmpMaxNot > maxNot) maxNot = tmpMaxNot;
+                    }
+                    else if (arrayStatus[j].name === ok){
+                        var tmpMaxOk = d3.max(arrayProcedure, getDelay);
+                        var tmpMinOk = d3.min(arrayProcedure, getDelay);
+
+                        if(tmpMinOk < minOk) minOk = tmpMinOk;
+                        if(tmpMaxOk > maxOk) maxOk = tmpMaxOk;
+                    }
+                }
+            }
+
+            stepNot = (maxNot - minNot) / 179;
+            if(stepNot === 0) stepNot = 1;
+
+            stepOk = (maxOk - minOk) / 229;
+
+            if(stepOk === 0) stepOk = 1;
+
+            stepCycle = (maxCycle - minCycle) / 199;
+            if(stepCycle === 0) stepCycle = 1;
+
+            Ext.getCmp('minValue').setValue(minCycle.toFixed(3));
+            Ext.getCmp('maxValue').setValue(maxCycle.toFixed(3));
+
+            _mainController.drawFullMap();
+
+            d3.select(window).on('resize', _mainController.drawFullMap);
+
+
+    },
+
+    onLaunch: function() {
+            Ext.getCmp('loadingicons').hide();
+
+            Ext.getCmp('exc1').setValue('ParsingError');
+            Ext.getCmp('exc2').setValue('TypeError');
+            Ext.getCmp('exc3').setValue('EOFError');
+            Ext.getCmp('exc4').setValue('IndexError');
+            Ext.getCmp('exc5').setValue('BufferError');
+    },
+
+    convertToMs: function(time, uom) {
+            if(uom === 's')
+                return (time*1000);
+            else if (uom === 'min')
+                return (time * 60*1000);
+            else if (uom === 'hour')
+                return (time *60*60*1000);
+            else if (uom === 'day')
+                return (time *24*60* 60*1000);
+            else
+                return 0;
+    },
+
+    drawTreeMap: function(tree) {
+            d3.select("svg").remove();
+
+            w = document.getElementById('grid').offsetWidth - 20;
+            h = document.getElementById('grid').offsetHeight - 20;
+            x = d3.scale.linear().range([0, w]);
+            y = d3.scale.linear().range([0, h]);
+
+            var treemap = d3.layout.treemap()
+                .size([w, h])
+                .padding([20, 1, 1, 1])
+                .value(function(d) {
+                    return !d.name ? 0: ((d.type === ok || d.type === verified) ? 20:50);
+                });
+
+            svg = d3.select("#grid-innerCt").append("svg")
+                .style("position", "relative")
+                .style("width", w + "px")
+                .style("height", h + "px")
+                .append("g")
+                .attr("transform", "translate(-.5,-.5)");
+
+            node = treemap.nodes(tree).filter(function(d){ return (d.name !== "root");});
+
+            var cell = svg.selectAll("g")
+                .data(node)
+                .enter().append("g")
+                .attr("class", "cell")
+                .attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")";})
+                .on("click", function(d) { return zoom(root == d.parent ? root: d.parent); })
+                .on('mouseover', showPopup).on('mouseout',hidePopup)
+                .on("mousemove", movePopup);
+
+            cell.append("rect")
+                .attr("width", function(d) { return d.dx - 1; })
+                .attr("height", function(d) { return d.dy - 1; })
+                .style("stroke","#111111").style("stroke-width",getStroke)
+                .style("fill", getColor);
+
+            cell.append("svg:text")
+                .on("click",exceptionPage)
+                .attr("x", getX).attr("y", getY)
+                .attr("dy", ".35em")
+                .attr("text-anchor", function (d){return d.children ? "start": "middle";})
+                .attr("lenghtAdjuct","spacing")
+                .append("tspan").style("display","")
+                .text(getText);
+
+    },
+
+    init: function(application) {
+                _mainController = this;
+                root = {};
+
+        this.control({
+            "#actionButton": {
+                click: this.requestStatus
+            },
+            "#radioGroup": {
+                change: this.onRadiogroupChange
+            },
+            "#submenu": {
+                click: this.onContainerClick
+            },
+            "#refRate": {
+                toggle: this.onButtonToggle
+            },
+            "#grid": {
+                resize: this.onContainerResize
+            }
+        });
+    },
+
+    drawSubMap: function(d) {
+            _mainController.drawTreeMap(d);
+    },
+
+    drawFullMap: function() {
+        tmpName = root;
+        _mainController.drawTreeMap(root);
+    }
+
+});
+
+/*
+ * File: app/controller/ProcController.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.controller.ProcController', {
+    extend:  Ext.app.Controller ,
+
+    onWindowShow: function(component, eOpts) {
+        if(component.hasOwnProperty('extraParams')){
+            var d = component.extraParams.d;
+
+            Ext.getCmp('ProcView').setTitle(d.name + " "+ d.parent.parent.name);
+
+            Ext.getCmp('lastObs').setValue(d.lastObservation);
+            Ext.getCmp('lastMes').setValue(d.lastMeasure + " " + d.oum);
+            Ext.getCmp('cycle').setValue(d.cycle.toFixed(3));
+            Ext.getCmp('cycleStep').setValue((d.delay /d.cycle).toFixed(3));
+            Ext.getCmp('status').setValue(d.parent.name);
+            Ext.getCmp('delay').setValue(toDHMS(d.delay));
+
+            if(d.exceptions[0].id){
+                for(var i = d.exceptions.length -1 ; i >= 0; i--){
+
+                    var myForm = Ext.create('istsosStatus.view.ExcView');
+
+                    var exc = d.exceptions[i];
+                    var id = 'exc_'+ i;
+
+                    myForm.extraParams = {d: exc, id:id};
+                    myForm.id = id;
+                    myForm.getComponent('verified').id = 'verified*' + exc.id;
+
+                    myForm.getComponent('excType').id = 'excType' + id;
+                    myForm.getComponent('excProcess').id = 'excProcess'+ id;
+                    myForm.getComponent('excDate').id = 'excDate'+ id;
+                    myForm.getComponent('excDetails').id = 'excDetails'+id;
+                    myForm.getComponent('delete').id = 'delete*' + exc.id;
+
+                    Ext.getCmp('exception').add(myForm);
+                }
+            }
+        }
+    },
+
+    onWindowClose: function(panel, eOpts) {
+        _mainController.requestStatus();
+    },
+
+    init: function(application) {
+        this.control({
+            "window": {
+                show: this.onWindowShow,
+                close: this.onWindowClose
+            }
+        });
+    }
+
+});
+
+!function(){function n(n,t){return t>n?-1:n>t?1:n>=t?0:0/0}function t(n){return null!=n&&!isNaN(n)}function r(n){return{left:function(t,r,e,u){for(arguments.length<3&&(e=0),arguments.length<4&&(u=t.length);u>e;){var i=e+u>>>1;n(t[i],r)<0?e=i+1:u=i}return e},right:function(t,r,e,u){for(arguments.length<3&&(e=0),arguments.length<4&&(u=t.length);u>e;){var i=e+u>>>1;n(t[i],r)>0?u=i:e=i+1}return e}}}function e(n){return n.length}function u(n){for(var t=1;n*t%1;)t*=10;return t}function i(n,t){ [...]
+}function u(){return l&&(l.valid=!1,l=null),t}var i,o,a,c,s,l,f=ne(function(n,t){return n=i(n,t),[n[0]*h+c,s-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,y=0,x=0,M=Ac,_=At,b=null,w=null;return t.stream=function(n){return l&&(l.valid=!1),l=oe(M(o,f(_(n)))),l.valid=!0,l},t.clipAngle=function(n){return arguments.length?(M=null==n?(b=n,Ac):Hr((b=+n)*za),u()):b},t.clipExtent=function(n){return arguments.length?(w=n,_=n?Or(n[0][0],n[0][1],n[1][0],n[1][1]):At,u()):w},t.scale=function(n){return argum [...]
+},e.domain=function(t){return arguments.length?(n.domain(t),e):n.domain().map(Vo)},e.nice=function(n,t){function r(r){return!isNaN(r)&&!n.range(r,Vo(+r+1),t).length}var i=e.domain(),o=Di(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),e.domain(ji(i,t>1?{floor:function(t){for(;r(t=n.floor(t));)t=Vo(t-1);return t},ceil:function(t){for(;r(t=n.ceil(t));)t=Vo(+t+1);return t}}:n))},e.ticks=function(n,t){var r=Di(e.domain()),i=null==n?u(r,10):"number"==typeof n?u(r,n): [...]
+}}(),Bo.geo.centroid=function(n){vc=dc=mc=yc=xc=Mc=_c=bc=wc=Sc=kc=0,Bo.geo.stream(n,Ec);var t=wc,r=Sc,e=kc,u=t*t+r*r+e*e;return Na>u&&(t=Mc,r=_c,e=bc,Ca>dc&&(t=mc,r=yc,e=xc),u=t*t+r*r+e*e,Na>u)?[0/0,0/0]:[Math.atan2(r,t)*La,G(e/Math.sqrt(u))*La]};var vc,dc,mc,yc,xc,Mc,_c,bc,wc,Sc,kc,Ec={sphere:v,point:br,lineStart:Sr,lineEnd:kr,polygonStart:function(){Ec.lineStart=Er},polygonEnd:function(){Ec.lineStart=Sr}},Ac=Lr(Ar,Pr,jr,[-ka,-ka/2]),Cc=1e9;Bo.geo.clipExtent=function(){var n,t,r,e,u,i,o [...]
+return c>=_s?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,"+n+"A"+n+","+n+" 0 1,0 0,"+-n+"A"+n+","+n+" 0 1,0 0,"+n+"Z":"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"Z":n?"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L"+n*h+","+n*g+"A"+n+","+n+" 0 "+s+",0 "+n*l+","+n*f+"Z":"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L0,0"+"Z"}var t=eo,r=uo,e=io,u=oo;return n.innerRadius=function(r){return arguments.length?(t=Et(r),n):t},n.outerRadi [...]
+
+function getColor(d){      
+    
+    if(!d.name) 
+        return 'rgba(200,200,200,1)';
+    if (d.parent.name === verified)
+        return ( 'rgba(255,255,0,1)');
+    if(d.parent.name === ok )
+        return 'rgba('+ ( getColorOk(d))+',230,0,1)';
+    if (d.parent.name === notok)
+        return ( 'rgba(255,' + getColorNot(d) + ',0,1)');
+    if((d.name === ok ) || (d.name === notok) || d.name === verified)
+        return 'rgba(150,150,150,1)';
+    return 'rgba(200,200,200,1)';   
+}
+
+function getColorNot(d){
+    return type==="cycle"? (200 - parseInt(((d.cycle - minCycle) / stepCycle),0)):(200- parseInt(((d.delay - minNot) / stepNot),0));
+}
+
+function getColorOk(d){return type ==="cycle" ? parseInt(230 * d.cycle,0) : (parseInt(((d.delay - minOk) / stepOk),0));}
+
+function zoom(d) {
+    tmpName = d.name;
+    
+    _mainController.drawSubMap(d);
+    /*
+    tmpName = d.name;
+    var kx = w / d.dx; 
+    var ky = h  / d.dy;
+    
+    x.domain([d.x, d.x + d.dx]);
+    y.domain([d.y,d.y + d.dy]); 
+    
+    var t = svg.selectAll("g.cell").transition().duration(1000)
+        .attr("transform", function(d) {return "translate(" + x(d.x) + "," + y(d.y) + ")"; });
+    
+    t.select("rect")
+        .attr("width",  function(d) {return kx * d.dx - 1; })
+        .attr("height", function(d) {return ky * d.dy - 1; });  
+    
+    t.select("text")
+        .attr("x", function(d) { return d.children ? 10 : kx * getX(d); })
+        .attr("y", function(d) { return ky * getY(d); })
+        .text(getText);
+    
+    d3.event.stopPropagation();   */
+}
+
+function updateColor(){ svg.selectAll("g.cell").select("rect").style("fill", getColor);}
+
+function getX(d){ return !d.children ? (d.dx/2)  : 10;}
+
+function getY(d){ return !d.children ? (d.dy/2)  : 10;}
+
+function getXIcon(d){ return !d.children ? (d.dx/2) - 18  : 10;}
+
+function getYIcon(d){ return !d.children ? (d.dy/2) - 18  : 10;}
+
+function getStroke(d){ return d.parent == root ? 3 : 0;}
+
+function showPopup(d){
+    if(!d.children && d.name){
+        var popupText = 'name    : ' + d.name + '<br/>';
+        if(d.parent.name === ok)
+            popupText += 'Next data : ' + toDHMS(d.delay) + '<br/>';
+        else
+            popupText += 'delay : ' + toDHMS(d.delay) + '<br/>';
+        popupText += 'cycle : ' + d.cycle.toFixed(3) + '<br/>';
+        
+        if(d.code) popupText += 'code : ' + d.code + '<br/>';
+        if(d.exceptions) popupText += 'details : ' + d.exceptions[0].details + '<br/>';
+        d3.select('#popup').style('visibility','visible').html(popupText);
+    }
+}
+
+function toDHMS(seconds){
+    var res = "";
+    
+    var d = parseInt(seconds / 86400);
+    var h = parseInt(seconds / 3600 ) % 24;
+    var m = parseInt(seconds / 60) % 60;
+    var sec = seconds % 60;
+    
+    return d + "d     " + h + "h " + m+"m " + sec.toFixed(3) +"s";
+}
+
+function hidePopup(){ d3.select('#popup').style('visibility','hidden');}
+
+function movePopup(d){
+    if(!d.children && d.name){
+        d3.select('#popup').style("top", (d3.event.pageY - 150)+"px").style("left",(d3.event.pageX + 10)+"px");
+    }
+}
+
+function getText(d){ 
+    
+    if(d.area === 0)
+        return "";
+    if(d.children){
+        if(d.depth === 2 && !d.children[0].name){
+            return "";
+        }
+        return d.name;
+    }else{
+        if(tmpName === verified || tmpName === notok ){   
+            return d.code ? (d.name +" " + ((d.code.length > 1) ? d.code[0] + " *": d.code[0])) : d.name;
+        } else{
+            return d.code ? ((d.code.length > 1) ? d.code[0] + " *": d.code[0]) : (d.parent.name == tmpName ? d.name :"");
+        }
+    }
+}
+
+function getDelay(d){return d.delay;}
+function getCycle(d){return d.cycle;}
+
+function exceptionPage(d){
+    if(d.children)
+        return;
+    var myForm = Ext.create('istsosStatus.view.ProcView');
+    myForm.extraParams = {d: d};
+    myForm.show();
+}
+
+function getIcon(d){
+    if(d.children || !d.name) 
+        return '';
+    else{
+        if(d.parent.name !== ok ){ 
+            if(d.code)
+                return 'resources/images/icon/Exc-'+d.code[0]+'-icon.png';
+            else
+                return 'resources/images/exc-icon.png';
+        }
+    } 
+}
+
+/*
+ * File: app/model/UomModel.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.model.UomModel', {
+    extend:  Ext.data.Model ,
+
+               
+                        
+      
+
+    idProperty: 'uom',
+
+    fields: [
+        {
+            name: 'uom',
+            type: 'string'
+        }
+    ]
+});
+
+/*
+ * File: app/store/storeServices.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.store.storeServices', {
+    extend:  Ext.data.Store ,
+
+               
+                         
+                              
+                              
+      
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            storeId: 'storeServices',
+            fields: [
+                {
+                    name: 'service'
+                },
+                {
+                    name: 'path',
+                    type: 'string'
+                }
+            ],
+            proxy: {
+                type: 'ajax',
+                url: '../../wa/istsos/services',
+                reader: {
+                    type: 'json',
+                    idProperty: 'service',
+                    root: 'data'
+                }
+            }
+        }, cfg)]);
+    }
+});
+
+/*
+ * File: app/store/uomStore.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.store.uomStore', {
+    extend:  Ext.data.Store ,
+
+               
+                                     
+      
+
+    constructor: function(cfg) {
+        var me = this;
+        cfg = cfg || {};
+        me.callParent([Ext.apply({
+            filterOnLoad: false,
+            model: 'istsosStatus.model.UomModel',
+            sortOnLoad: false,
+            storeId: 'uomStore',
+            data: [
+                {
+                    uom: 's'
+                },
+                {
+                    uom: 'min'
+                },
+                {
+                    uom: 'hour'
+                },
+                {
+                    uom: 'day'
+                }
+            ]
+        }, cfg)]);
+    }
+});
+
+/*
+ * File: app/view/ExcView.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.view.ExcView', {
+    extend:  Ext.form.Panel ,
+
+               
+                                  
+                                  
+                           
+      
+
+    cls: 'ExcDetView',
+    height: 150,
+    itemId: 'ExcView',
+    maxHeight: 150,
+    minHeight: 150,
+    width: 350,
+    bodyPadding: 10,
+    frameHeader: false,
+    header: false,
+    title: 'My Form',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'textfield',
+                    id: '',
+                    itemId: 'excType',
+                    fieldLabel: 'Type',
+                    labelWidth: 60,
+                    readOnly: true
+                },
+                {
+                    xtype: 'textfield',
+                    itemId: 'excProcess',
+                    fieldLabel: 'process',
+                    labelWidth: 60,
+                    readOnly: true
+                },
+                {
+                    xtype: 'textfield',
+                    itemId: 'excDate',
+                    width: 320,
+                    fieldLabel: 'Date',
+                    labelWidth: 60,
+                    readOnly: true
+                },
+                {
+                    xtype: 'textareafield',
+                    height: 45,
+                    itemId: 'excDetails',
+                    width: 320,
+                    fieldLabel: 'Details',
+                    labelWidth: 60,
+                    readOnly: true
+                },
+                {
+                    xtype: 'checkboxfield',
+                    anchor: '100%',
+                    cls: 'check',
+                    itemId: 'verified',
+                    maxWidth: 100,
+                    minWidth: 100,
+                    width: 100,
+                    fieldLabel: '',
+                    labelWidth: 0,
+                    boxLabel: 'Verified'
+                },
+                {
+                    xtype: 'button',
+                    cls: 'delete',
+                    height: 24,
+                    itemId: 'delete',
+                    maxHeight: 24,
+                    minHeight: 24,
+                    minWidth: 100,
+                    text: 'DELETE'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+
+});
+
+/*
+ * File: app/view/MainView.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.view.MainView', {
+    extend:  Ext.container.Viewport ,
+
+               
+                          
+                                  
+                                
+                            
+                         
+                              
+                              
+      
+
+    id: 'mainView',
+    itemId: 'mainView',
+    layout: 'border',
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            items: [
+                {
+                    xtype: 'panel',
+                    region: 'north',
+                    split: false,
+                    height: 150,
+                    id: 'header',
+                    itemId: 'headerPanel',
+                    bodyBorder: false,
+                    constrainHeader: true,
+                    header: {
+                        xtype: 'container',
+                        html: '<div class=\'mainHeaderTitle\'><a  href=\'http://istgeo.ist.supsi.ch/software/istsos/\' target=\'_BLANK\'><img height=28 src=\'resources/images/istsos-logo.png\'/></a></div>'
+                    },
+                    overlapHeader: false,
+                    title: ' ',
+                    titleAlign: 'right',
+                    items: [
+                        {
+                            xtype: 'container',
+                            listeners: {
+                                render: function(c){
+                                    c.getEl().on('click',function(){this.fireEvent('click',c);},c);
+                                }
+                            },
+                            cls: 'divButton',
+                            disabledCls: 'submenu',
+                            id: 'submenu',
+                            overCls: 'submenuOver',
+                            items: [
+                                {
+                                    xtype: 'container',
+                                    cls: 'submenuIcon',
+                                    html: '<img src="resources/images/status_1.svg" width="46"> <div style="padding-top:4px;"> request status</div>',
+                                    id: 'submenuIcon'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            cls: 'selector',
+                            id: 'selService',
+                            itemId: 'selService',
+                            items: [
+                                {
+                                    xtype: 'combobox',
+                                    cls: 'textLabel',
+                                    id: 'serviceSelector',
+                                    itemId: 'service',
+                                    fieldLabel: 'Service',
+                                    labelWidth: 60,
+                                    displayField: 'service',
+                                    queryCaching: false,
+                                    store: 'storeServices',
+                                    valueField: 'service'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            cls: 'selector',
+                            id: 'selTime',
+                            items: [
+                                {
+                                    xtype: 'numberfield',
+                                    cls: 'textLabel',
+                                    id: 'refreshRate',
+                                    width: 230,
+                                    fieldLabel: 'Refresh rate',
+                                    labelWidth: 80,
+                                    minValue: 0
+                                },
+                                {
+                                    xtype: 'combobox',
+                                    cls: 'textLabel',
+                                    id: 'uomSelector',
+                                    width: 230,
+                                    fieldLabel: 'Uom',
+                                    labelWidth: 80,
+                                    autoSelect: false,
+                                    displayField: 'uom',
+                                    queryCaching: false,
+                                    queryMode: 'local',
+                                    store: 'uomStore',
+                                    valueField: 'uom'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textLabel',
+                                    id: 'timeset',
+                                    style: {
+                                        position: 'absolute',
+                                        right: '50px'
+                                    },
+                                    width: 145,
+                                    labelWidth: 0,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'button',
+                                    id: 'refRate',
+                                    enableToggle: true,
+                                    text: 'refresh'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    region: 'center',
+                    id: 'content',
+                    itemId: 'contentPanel',
+                    style: {
+                        position: 'relative',
+                        width: '100%',
+                        height: '100%'
+                    },
+                    defaultDockWeights: {
+                        top: {
+                            render: 1,
+                            visual: 1
+                        },
+                        left: {
+                            render: 3,
+                            visual: 5
+                        },
+                        right: {
+                            render: 5,
+                            visual: 7
+                        },
+                        bottom: {
+                            render: 7,
+                            visual: 3
+                        }
+                    },
+                    bodyPadding: 10,
+                    shrinkWrapDock: 2,
+                    title: 'Status',
+                    titleAlign: 'left',
+                    items: [
+                        {
+                            xtype: 'container',
+                            id: 'grid',
+                            items: [
+                                {
+                                    xtype: 'container',
+                                    id: 'loadingicons'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            id: 'legend',
+                            maxWidth: 220,
+                            minWidth: 220,
+                            width: 220,
+                            items: [
+                                {
+                                    xtype: 'label',
+                                    cls: 'label',
+                                    text: 'Delay'
+                                },
+                                {
+                                    xtype: 'radiogroup',
+                                    cls: 'legendElement',
+                                    id: 'radioGroup',
+                                    itemId: 'radioGroup',
+                                    width: 170,
+                                    fieldLabel: 'Type',
+                                    labelWidth: 30,
+                                    items: [
+                                        {
+                                            xtype: 'radiofield',
+                                            labelWidth: 40,
+                                            name: 'rb',
+                                            boxLabel: 'Time',
+                                            inputValue: 'delay'
+                                        },
+                                        {
+                                            xtype: 'radiofield',
+                                            name: 'rb',
+                                            boxLabel: 'Cycle',
+                                            checked: true,
+                                            inputValue: 'cycle'
+                                        }
+                                    ]
+                                },
+                                {
+                                    xtype: 'label',
+                                    cls: 'label',
+                                    text: 'Range'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'minValue',
+                                    minWidth: 185,
+                                    width: 185,
+                                    fieldLabel: 'Min value',
+                                    labelWidth: 65,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'maxValue',
+                                    width: 185,
+                                    fieldLabel: 'Max value',
+                                    labelWidth: 65,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'label',
+                                    cls: 'label',
+                                    id: 'legendTitle',
+                                    text: 'Error code'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'exc1',
+                                    maxWidth: 185,
+                                    minWidth: 185,
+                                    width: 185,
+                                    fieldLabel: '1',
+                                    labelWidth: 20,
+                                    name: '',
+                                    readOnly: true,
+                                    blankText: 'ParsingError',
+                                    emptyText: 'ParsingError'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'exc2',
+                                    maxWidth: 185,
+                                    minWidth: 185,
+                                    width: 185,
+                                    fieldLabel: '2',
+                                    labelWidth: 20,
+                                    name: '',
+                                    readOnly: true,
+                                    blankText: 'ParsongError',
+                                    emptyText: 'TypeError'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'exc3',
+                                    maxWidth: 185,
+                                    minWidth: 185,
+                                    width: 185,
+                                    fieldLabel: '3',
+                                    labelWidth: 20,
+                                    name: '',
+                                    readOnly: true,
+                                    blankText: '',
+                                    emptyText: 'EOFError'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'exc4',
+                                    maxWidth: 185,
+                                    minWidth: 185,
+                                    width: 185,
+                                    fieldLabel: '4',
+                                    labelWidth: 20,
+                                    name: '',
+                                    readOnly: true,
+                                    blankText: 'ParsiongError',
+                                    emptyText: 'IndexError'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'legendElement',
+                                    id: 'exc5',
+                                    maxWidth: 185,
+                                    minWidth: 185,
+                                    width: 185,
+                                    fieldLabel: '5',
+                                    labelWidth: 20,
+                                    name: '',
+                                    readOnly: true,
+                                    blankText: 'ParsiongError',
+                                    emptyText: 'BufferError'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            id: 'popup'
+                        }
+                    ]
+                },
+                {
+                    xtype: 'panel',
+                    region: 'south',
+                    baseCls: 'mainFooter',
+                    height: 150,
+                    html: '<a style="color: white; text-decoration: none;" href="http://www.supsi.ch/ist" target="_BLANK">Open Source Software by Institute of Earth Science - SUPSI</a>',
+                    id: 'bottomPanel',
+                    maxHeight: 25,
+                    minHeight: 25,
+                    layout: 'absolute',
+                    title: '     ',
+                    titleAlign: 'center'
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+
+});
+
+/*
+ * File: app/view/ProcView.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+Ext.define('istsosStatus.view.ProcView', {
+    extend:  Ext.window.Window ,
+
+               
+                          
+                         
+                             
+      
+
+    height: 600,
+    id: 'ProcView',
+    itemId: 'ProcView',
+    maxHeight: 600,
+    maxWidth: 800,
+    minHeight: 600,
+    minWidth: 800,
+    width: 800,
+    modal: true,
+
+    initComponent: function() {
+        var me = this;
+
+        Ext.applyIf(me, {
+            style: {
+                position: 'relative',
+                width: '100%',
+                height: '100%'
+            },
+            items: [
+                {
+                    xtype: 'panel',
+                    height: 561,
+                    style: {
+                        position: 'absolute'
+                    },
+                    frameHeader: false,
+                    header: false,
+                    manageHeight: false,
+                    title: '',
+                    items: [
+                        {
+                            xtype: 'container',
+                            id: 'details',
+                            itemId: 'details',
+                            items: [
+                                {
+                                    xtype: 'label',
+                                    cls: 'labelProc',
+                                    id: 'detailLabel',
+                                    text: 'Details'
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textField',
+                                    id: 'status',
+                                    itemId: 'status',
+                                    fieldLabel: 'Status',
+                                    labelWidth: 120,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textField',
+                                    id: 'lastObs',
+                                    itemId: 'lastObs',
+                                    fieldLabel: 'Last observation',
+                                    labelWidth: 120,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textField',
+                                    id: 'lastMes',
+                                    itemId: 'lastMes',
+                                    fieldLabel: 'Last measure',
+                                    labelWidth: 120,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textField',
+                                    id: 'cycle',
+                                    itemId: 'cycle',
+                                    fieldLabel: 'Cycle delay',
+                                    labelWidth: 120,
+                                    fieldStyle: 'width:40%',
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textField',
+                                    id: 'cycleStep',
+                                    fieldLabel: 'Cycle step (s)',
+                                    labelWidth: 120,
+                                    readOnly: true
+                                },
+                                {
+                                    xtype: 'textfield',
+                                    cls: 'textField',
+                                    id: 'delay',
+                                    fieldLabel: 'Time delay (s)',
+                                    labelWidth: 120,
+                                    readOnly: true
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            height: 556,
+                            id: 'exception',
+                            autoScroll: true,
+                            items: [
+                                {
+                                    xtype: 'label',
+                                    cls: 'labelProc',
+                                    id: 'excLabel',
+                                    text: 'Exception'
+                                }
+                            ]
+                        },
+                        {
+                            xtype: 'container',
+                            height: 280,
+                            id: 'map',
+                            itemId: 'map'
+                        }
+                    ]
+                }
+            ]
+        });
+
+        me.callParent(arguments);
+    }
+
+});
+
+/*
+ * File: app.js
+ *
+ * This file was generated by Sencha Architect version 3.0.4.
+ * http://www.sencha.com/products/architect/
+ *
+ * This file requires use of the Ext JS 4.2.x library, under independent license.
+ * License of Sencha Architect does not include license for Ext JS 4.2.x. For more
+ * details see http://www.sencha.com/license or contact license at sencha.com.
+ *
+ * This file will be auto-generated each and everytime you save your project.
+ *
+ * Do NOT hand edit this file.
+ */
+
+// @require @packageOverrides
+Ext.Loader.setConfig({
+    enabled: true
+});
+
+
+Ext.application({
+    models: [
+        'UomModel'
+    ],
+    stores: [
+        'storeServices',
+        'uomStore'
+    ],
+    views: [
+        'MainView',
+        'ExcView',
+        'ProcView'
+    ],
+    controllers: [
+        'ExcController',
+        'ProcController',
+        'MainController'
+    ],
+    name: 'istsosStatus',
+
+    launch: function() {
+        Ext.create('istsosStatus.view.MainView');
+    }
+
+});
+
+// @tag full-page
+// @require /home/ist/workspace/istsos/interface/modules/status/src/ext/ext-theme-neptune.js
+// @require /home/ist/workspace/istsos/interface/modules/status/src/app/function.js
+// @require /home/ist/workspace/istsos/interface/modules/status/src/app/d3.v3.min.js
+// @require /home/ist/workspace/istsos/interface/modules/status/src/app.js
+
diff --git a/html/modules/status/app/style.css b/html/modules/status/app/style.css
new file mode 100755
index 0000000..6e8dc8f
--- /dev/null
+++ b/html/modules/status/app/style.css
@@ -0,0 +1,400 @@
+/*******************************************/
+/* MainView header */
+/*******************************************/
+.x-panel-header-default {
+    font-family: 'Electrolize', sans-serif, tahoma, arial, verdana, sans-serif !important;
+    font-size: 10px;
+    line-height: 10px;
+    height:50px;
+    color: withe;
+    vertical-align:middle;
+    border-color: #99BBE8;
+    border-width: 1px;
+    border-style: solid;
+    background-image: none;
+    background-color: #FF0000;
+    background-image: -webkit-gradient(linear,50% 0,50% 100%,color-stop(0%,#DAE7F6),color-stop(45%,#CDDEF3),color-stop(46%,#ABC7EC),color-stop(50%,#ABC7EC),color-stop(51%,#B8CFEE),color-stop(100%,#CBDDF3));
+    background-image: -moz-linear-gradient(top,#DAE7F6,#CDDEF3 45%,#ABC7EC 46%,#ABC7EC 50%,#B8CFEE 51%,#CBDDF3);
+    background-image: linear-gradient(135deg, #008000 0%,#0e0e0e 100%);
+    -moz-box-shadow: #f4f8fd 0 1px 0 0 inset;
+    -webkit-box-shadow: #F4F8FD 0 1px 0 0 inset;
+    -o-box-shadow: #f4f8fd 0 1px 0 0 inset;
+    box-shadow: #F4F8FD 0 1px 0 0 inset;
+}
+
+#content_header.x-panel-header-default{
+    padding: 4px 0 0 10px;
+    height:25px;
+    top:0;
+}
+
+
+.divButton{
+    position:absolute;
+    width:100px;
+    left:0;
+    top:0;
+    border-color:green;
+    background-color: rgba(0,0,0,0);
+    height:100px;
+}
+
+#submenuIcon{
+    height:93px;
+    padding-left: 5px;
+    padding-top:8px;
+}
+
+.textLabel{
+    right:10px !important;
+}
+
+
+.selector{
+    position:absolute;
+    background-color:rgba(0,0,0,0);
+    width:250px;
+    height: 100px;
+    top:0;
+    padding-top:10px;
+    padding-left:10px;
+}
+
+#selService.selector {
+    left: 100px !important;
+}
+
+#selTime.selector{
+    left: 350px;
+}
+
+
+.mainHeaderTitle {
+    padding-top:10px;
+    padding-right: 10px;
+    font-weight: bold;
+    font-size: 24px;
+    height: 48px;
+    text-align: right;
+}
+
+.submenu{
+    text-align: center;
+    color: darkolivegreen;
+    position: relative;
+    border-bottom: 4px transparent solid;
+
+}
+.submenuOver{
+    color: green;
+    text-align: center;
+    position: relative;
+    border-bottom: 5px grey solid;
+}
+.submenuSelect{
+    color: green;
+    text-align: center;
+    position: relative;
+    border-bottom: 5px green solid;
+}
+
+.submenuContent{
+    position: absolute;
+    bottom: 6;
+    text-align: center;
+    width: 100%;
+}
+.submenuIcon{
+    position: absolute;
+    top: 0;
+    text-align: center;
+    width: 100%;
+}
+
+.pressed-button{
+    background-color: gray !important;
+}
+
+
+
+.exc{
+    border-width: 1px !important;
+    border-color: green !important;
+}
+
+/*******************************************/
+/* MainView body */
+/*******************************************/
+
+
+#grid{
+    left:0;
+    top:0;
+    width:calc(100% - 220px);
+    height:100%;
+    
+}
+#loadingicons{
+    position:absolute;
+    top:calc(50% - 125px);
+    left:calc(50% - 150px);
+    width:300px;
+    height:250px;
+    background-color:transparent;
+    background-image:url("../resources/images/loadingwheel.gif");
+    background-position: center center;
+	background-size: contain;
+}
+
+#legend{
+    position:absolute;
+    right:0;
+    top:0;
+    width:220px;
+    height:100%;
+}
+
+#popup{
+    position:absolute;
+    display:block;
+    z-index:100;
+    visibility:hidden;
+    line-height:1;
+    font-weight:bold;
+    padding:12px;
+    background:rgba(0,0,0,0.7);
+    color:#fff;
+    border-radius:2px;
+}
+
+.label{
+    display: inline-block;
+    width:100%;
+    border-bottom: 5px green solid;
+    font-size:20px;
+    margin-left: 0px;
+    margin-top:5px;
+    margin-bottom:5px;
+}
+
+.legendElement{
+    margin-left:5px;
+}
+
+/*******************************************/
+/* MainView footer */
+/*******************************************/
+.mainFooter {
+    position:absolute;
+    bottom:0;
+    left:0;
+    font-weight: bold !important;
+    font-family: 'Electrolize', sans-serif, tahoma, arial, verdana, sans-serif !important;
+    font-size: 10px !important;
+    line-height:10px;
+    color: white !important;
+    padding-top: 8px;
+    /*background-color: green !important;*/
+    text-align: center;
+    background: #008000 !important;
+    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
+    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
+    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
+    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
+    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
+
+}
+
+/*******************************************/
+/* ProcView body */
+/*******************************************/
+#details{
+    position:absolute;
+    left:0;
+    width:50%;
+    height:40% !important;
+    padding-left:1%;
+    padding-right: 1%;
+    padding-top:2%;
+    border-top: 2px green !important;
+}
+
+#map{
+    position:absolute;
+    left:0;
+    bottom:10px;
+    width:50%;
+    height:50%;
+    padding-left:1%;
+    padding-bottom:1%;
+}
+
+#exception{
+    position:absolute;
+    right:0;
+    width:50%;
+    height:100%;
+    padding-left:1%;
+    padding-top:2%;
+}
+
+.labelProc{
+    display: inline-block;
+    width:98%;
+    border-bottom: 5px green solid;
+    font-size:20px;
+    margin-left: 5px;
+    margin-bottom:10px;
+}
+
+.textField{
+    width:100%;
+    padding-left:15px;
+}
+
+
+
+/*******************************************/
+/* ExcView */
+/*******************************************/
+
+.check{
+    position:absolute;
+    right:15px;
+    top:10px;
+}
+
+.delete{
+    position: absolute;
+    right:15px;
+    top:39px;
+}
+
+
+
+
+/*******************************************/
+/* ???? */
+/*******************************************/
+.x-panel-body-default {
+    background: whitesmoke;
+    border-color: green !important;
+    color: black;
+    border-width: 2px !important;
+    border-style: solid;
+}
+
+.x-panel-collapsed .x-window-header-default, .x-panel-collapsed .x-panel-header-default {
+    border-color: BLACK !important;
+}
+
+.x-window-default {
+    background-color: green !important;
+    border-color: green !important;
+}
+.x-window-header-text-default {
+    color: white !important;
+    font-family: 'Electrolize', sans-serif, tahoma, arial, verdana, sans-serif !important;
+}
+.x-message-box .x-window-body {
+    background-color: white !important;
+}
+.x-window-header-default-top {
+    background-color: green !important;
+    border-color: green !important;
+}
+.x-window-header-default .x-tool-img {
+    background-color: green !important;
+}
+.x-tool-close{
+    background-color:green !important;
+}
+
+.x-grid-checkheader-editor .x-form-cb-wrap {
+    text-align: center;
+}
+.x-grid-checkheader-editor .x-form-cb-wrap {
+    text-align: center;
+}
+
+.x-form-trigger {
+    font-family: inherit;
+    font-size: inherit;
+    color: inherit;
+    /*border-right: inherit;
+    border-bottom: inherit;*/
+    border-width: 1px !important;
+    border-color: green !important;
+}
+
+.x-btn-default-small .x-btn-inner {
+    color: white !important;
+}
+
+.x-btn-default-small {
+    background-color: green !important;
+    background-image: none !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-inner {
+    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
+    font-size: 16px !important;
+}
+
+.x-btn-group-default-framed {
+    background-color: white !important;
+}
+
+.x-btn-default-toolbar-small {
+    border-color: #cbcbcb !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.x-btn-default-toolbar-small .x-btn-inner {
+    color: white !important;
+}
+
+.x-btn-default-toolbar-small-over {
+    background-color: green !important;
+    background-image:  none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-toolbar-small-focus {
+    background-color: green !important;
+    background-image:  none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-toolbar-small-menu-active, .x-btn-default-toolbar-small-pressed {
+    background-color: grey !important;
+    background-image:  none  !important;
+    border-color: black !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+
+.x-btn-default-small-over {
+    background-color: grey !important;
+    background-image:  none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-small-focus {
+    background-color: green !important;
+    background-image: none  !important;
+    border-color: white !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-btn-default-small-menu-active, .x-btn-default-small-pressed {
+    background-color: yellowgreen !important;
+    background-image: none  !important;
+    border-color: green !important;
+    border-radius: 5px 5px 5px 5px !important;
+}
+.x-form-trigger-input-cell{
+    border-width:1;
+    border-color: green !important;
+}
\ No newline at end of file
diff --git a/html/modules/status/index.html b/html/modules/status/index.html
new file mode 100755
index 0000000..1f58b63
--- /dev/null
+++ b/html/modules/status/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>status</title>
+<link rel="stylesheet" href="resources/istsosStatus-all.css"/>
+<script type="text/javascript" src="app.js"></script>
+    <link rel="stylesheet" href="app/style.css">
+</head>
+<body>
+</body>
+</html>
diff --git a/html/modules/status/resources/Readme.md b/html/modules/status/resources/Readme.md
new file mode 100755
index 0000000..fe784ee
--- /dev/null
+++ b/html/modules/status/resources/Readme.md
@@ -0,0 +1,3 @@
+# ext-theme-neptune/resources
+
+This folder contains static resources (typically an `"images"` folder as well).
diff --git a/html/modules/status/resources/images/btn-group/btn-group-default-framed-corners.gif b/html/modules/status/resources/images/btn-group/btn-group-default-framed-corners.gif
new file mode 100755
index 0000000..ca4889a
Binary files /dev/null and b/html/modules/status/resources/images/btn-group/btn-group-default-framed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn-group/btn-group-default-framed-notitle-corners.gif b/html/modules/status/resources/images/btn-group/btn-group-default-framed-notitle-corners.gif
new file mode 100755
index 0000000..ca4889a
Binary files /dev/null and b/html/modules/status/resources/images/btn-group/btn-group-default-framed-notitle-corners.gif differ
diff --git a/html/modules/status/resources/images/btn-group/btn-group-default-framed-notitle-sides.gif b/html/modules/status/resources/images/btn-group/btn-group-default-framed-notitle-sides.gif
new file mode 100755
index 0000000..897cd3b
Binary files /dev/null and b/html/modules/status/resources/images/btn-group/btn-group-default-framed-notitle-sides.gif differ
diff --git a/html/modules/status/resources/images/btn-group/btn-group-default-framed-sides.gif b/html/modules/status/resources/images/btn-group/btn-group-default-framed-sides.gif
new file mode 100755
index 0000000..41e6802
Binary files /dev/null and b/html/modules/status/resources/images/btn-group/btn-group-default-framed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-bg.gif b/html/modules/status/resources/images/btn/btn-default-large-bg.gif
new file mode 100755
index 0000000..9a96af0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-corners.gif b/html/modules/status/resources/images/btn/btn-default-large-corners.gif
new file mode 100755
index 0000000..9a9ff6e
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-disabled-bg.gif b/html/modules/status/resources/images/btn/btn-default-large-disabled-bg.gif
new file mode 100755
index 0000000..9a96af0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-disabled-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-disabled-corners.gif b/html/modules/status/resources/images/btn/btn-default-large-disabled-corners.gif
new file mode 100755
index 0000000..a6e2d6b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-disabled-fbg.gif b/html/modules/status/resources/images/btn/btn-default-large-disabled-fbg.gif
new file mode 100755
index 0000000..02da23e
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-disabled-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-disabled-sides.gif b/html/modules/status/resources/images/btn/btn-default-large-disabled-sides.gif
new file mode 100755
index 0000000..ac6747a
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-fbg.gif b/html/modules/status/resources/images/btn/btn-default-large-fbg.gif
new file mode 100755
index 0000000..02da23e
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-focus-bg.gif b/html/modules/status/resources/images/btn/btn-default-large-focus-bg.gif
new file mode 100755
index 0000000..fc86cde
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-focus-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-focus-corners.gif b/html/modules/status/resources/images/btn/btn-default-large-focus-corners.gif
new file mode 100755
index 0000000..e360dea
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-focus-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-focus-fbg.gif b/html/modules/status/resources/images/btn/btn-default-large-focus-fbg.gif
new file mode 100755
index 0000000..f6b43fa
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-focus-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-focus-sides.gif b/html/modules/status/resources/images/btn/btn-default-large-focus-sides.gif
new file mode 100755
index 0000000..434bf10
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-focus-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-over-bg.gif b/html/modules/status/resources/images/btn/btn-default-large-over-bg.gif
new file mode 100755
index 0000000..fc86cde
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-over-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-over-corners.gif b/html/modules/status/resources/images/btn/btn-default-large-over-corners.gif
new file mode 100755
index 0000000..e360dea
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-over-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-over-fbg.gif b/html/modules/status/resources/images/btn/btn-default-large-over-fbg.gif
new file mode 100755
index 0000000..f6b43fa
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-over-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-over-sides.gif b/html/modules/status/resources/images/btn/btn-default-large-over-sides.gif
new file mode 100755
index 0000000..434bf10
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-over-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-pressed-bg.gif b/html/modules/status/resources/images/btn/btn-default-large-pressed-bg.gif
new file mode 100755
index 0000000..dbc9ab6
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-pressed-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-pressed-corners.gif b/html/modules/status/resources/images/btn/btn-default-large-pressed-corners.gif
new file mode 100755
index 0000000..876309d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-pressed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-pressed-fbg.gif b/html/modules/status/resources/images/btn/btn-default-large-pressed-fbg.gif
new file mode 100755
index 0000000..0b6e990
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-pressed-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-pressed-sides.gif b/html/modules/status/resources/images/btn/btn-default-large-pressed-sides.gif
new file mode 100755
index 0000000..ed032e3
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-pressed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-large-sides.gif b/html/modules/status/resources/images/btn/btn-default-large-sides.gif
new file mode 100755
index 0000000..2335678
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-large-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-bg.gif b/html/modules/status/resources/images/btn/btn-default-medium-bg.gif
new file mode 100755
index 0000000..a378e4c
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-corners.gif b/html/modules/status/resources/images/btn/btn-default-medium-corners.gif
new file mode 100755
index 0000000..8a9e0c9
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-disabled-bg.gif b/html/modules/status/resources/images/btn/btn-default-medium-disabled-bg.gif
new file mode 100755
index 0000000..a378e4c
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-disabled-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-disabled-corners.gif b/html/modules/status/resources/images/btn/btn-default-medium-disabled-corners.gif
new file mode 100755
index 0000000..54ec11e
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-disabled-fbg.gif b/html/modules/status/resources/images/btn/btn-default-medium-disabled-fbg.gif
new file mode 100755
index 0000000..c162017
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-disabled-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-disabled-sides.gif b/html/modules/status/resources/images/btn/btn-default-medium-disabled-sides.gif
new file mode 100755
index 0000000..d4e1610
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-fbg.gif b/html/modules/status/resources/images/btn/btn-default-medium-fbg.gif
new file mode 100755
index 0000000..c162017
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-focus-bg.gif b/html/modules/status/resources/images/btn/btn-default-medium-focus-bg.gif
new file mode 100755
index 0000000..5957b5f
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-focus-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-focus-corners.gif b/html/modules/status/resources/images/btn/btn-default-medium-focus-corners.gif
new file mode 100755
index 0000000..1c1227b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-focus-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-focus-fbg.gif b/html/modules/status/resources/images/btn/btn-default-medium-focus-fbg.gif
new file mode 100755
index 0000000..dada571
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-focus-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-focus-sides.gif b/html/modules/status/resources/images/btn/btn-default-medium-focus-sides.gif
new file mode 100755
index 0000000..0791664
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-focus-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-over-bg.gif b/html/modules/status/resources/images/btn/btn-default-medium-over-bg.gif
new file mode 100755
index 0000000..5957b5f
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-over-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-over-corners.gif b/html/modules/status/resources/images/btn/btn-default-medium-over-corners.gif
new file mode 100755
index 0000000..1c1227b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-over-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-over-fbg.gif b/html/modules/status/resources/images/btn/btn-default-medium-over-fbg.gif
new file mode 100755
index 0000000..dada571
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-over-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-over-sides.gif b/html/modules/status/resources/images/btn/btn-default-medium-over-sides.gif
new file mode 100755
index 0000000..0791664
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-over-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-pressed-bg.gif b/html/modules/status/resources/images/btn/btn-default-medium-pressed-bg.gif
new file mode 100755
index 0000000..a72537c
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-pressed-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-pressed-corners.gif b/html/modules/status/resources/images/btn/btn-default-medium-pressed-corners.gif
new file mode 100755
index 0000000..82e9aed
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-pressed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-pressed-fbg.gif b/html/modules/status/resources/images/btn/btn-default-medium-pressed-fbg.gif
new file mode 100755
index 0000000..12d7736
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-pressed-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-pressed-sides.gif b/html/modules/status/resources/images/btn/btn-default-medium-pressed-sides.gif
new file mode 100755
index 0000000..ddb7644
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-pressed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-medium-sides.gif b/html/modules/status/resources/images/btn/btn-default-medium-sides.gif
new file mode 100755
index 0000000..1f11696
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-medium-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-bg.gif b/html/modules/status/resources/images/btn/btn-default-small-bg.gif
new file mode 100755
index 0000000..3e1fee3
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-corners.gif b/html/modules/status/resources/images/btn/btn-default-small-corners.gif
new file mode 100755
index 0000000..8ea1123
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-disabled-bg.gif b/html/modules/status/resources/images/btn/btn-default-small-disabled-bg.gif
new file mode 100755
index 0000000..3e1fee3
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-disabled-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-disabled-corners.gif b/html/modules/status/resources/images/btn/btn-default-small-disabled-corners.gif
new file mode 100755
index 0000000..5a8dc21
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-disabled-fbg.gif b/html/modules/status/resources/images/btn/btn-default-small-disabled-fbg.gif
new file mode 100755
index 0000000..4e8d6ad
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-disabled-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-disabled-sides.gif b/html/modules/status/resources/images/btn/btn-default-small-disabled-sides.gif
new file mode 100755
index 0000000..dfe47a7
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-fbg.gif b/html/modules/status/resources/images/btn/btn-default-small-fbg.gif
new file mode 100755
index 0000000..4e8d6ad
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-focus-bg.gif b/html/modules/status/resources/images/btn/btn-default-small-focus-bg.gif
new file mode 100755
index 0000000..cd401c0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-focus-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-focus-corners.gif b/html/modules/status/resources/images/btn/btn-default-small-focus-corners.gif
new file mode 100755
index 0000000..68b693b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-focus-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-focus-fbg.gif b/html/modules/status/resources/images/btn/btn-default-small-focus-fbg.gif
new file mode 100755
index 0000000..d708d52
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-focus-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-focus-sides.gif b/html/modules/status/resources/images/btn/btn-default-small-focus-sides.gif
new file mode 100755
index 0000000..43b3c76
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-focus-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-over-bg.gif b/html/modules/status/resources/images/btn/btn-default-small-over-bg.gif
new file mode 100755
index 0000000..cd401c0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-over-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-over-corners.gif b/html/modules/status/resources/images/btn/btn-default-small-over-corners.gif
new file mode 100755
index 0000000..37973c0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-over-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-over-fbg.gif b/html/modules/status/resources/images/btn/btn-default-small-over-fbg.gif
new file mode 100755
index 0000000..d708d52
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-over-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-over-sides.gif b/html/modules/status/resources/images/btn/btn-default-small-over-sides.gif
new file mode 100755
index 0000000..43b3c76
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-over-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-pressed-bg.gif b/html/modules/status/resources/images/btn/btn-default-small-pressed-bg.gif
new file mode 100755
index 0000000..edb183e
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-pressed-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-pressed-corners.gif b/html/modules/status/resources/images/btn/btn-default-small-pressed-corners.gif
new file mode 100755
index 0000000..e6a4d42
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-pressed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-pressed-fbg.gif b/html/modules/status/resources/images/btn/btn-default-small-pressed-fbg.gif
new file mode 100755
index 0000000..f51c3ed
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-pressed-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-pressed-sides.gif b/html/modules/status/resources/images/btn/btn-default-small-pressed-sides.gif
new file mode 100755
index 0000000..c6009b2
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-pressed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-small-sides.gif b/html/modules/status/resources/images/btn/btn-default-small-sides.gif
new file mode 100755
index 0000000..df7e41d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-small-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-bg.gif
new file mode 100755
index 0000000..08665f0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-corners.gif
new file mode 100755
index 0000000..6e6dd29
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-bg.gif
new file mode 100755
index 0000000..08665f0
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-corners.gif
new file mode 100755
index 0000000..6e6dd29
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-fbg.gif
new file mode 100755
index 0000000..fe34b62
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-sides.gif
new file mode 100755
index 0000000..29f443b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-fbg.gif
new file mode 100755
index 0000000..fe34b62
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-bg.gif
new file mode 100755
index 0000000..39a96cd
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-corners.gif
new file mode 100755
index 0000000..0d7210c
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-fbg.gif
new file mode 100755
index 0000000..577568f
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-sides.gif
new file mode 100755
index 0000000..57ead3d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-focus-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-bg.gif
new file mode 100755
index 0000000..39a96cd
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-corners.gif
new file mode 100755
index 0000000..0d7210c
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-fbg.gif
new file mode 100755
index 0000000..577568f
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-sides.gif
new file mode 100755
index 0000000..57ead3d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-over-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-bg.gif
new file mode 100755
index 0000000..620098d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-corners.gif
new file mode 100755
index 0000000..45deae7
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-fbg.gif
new file mode 100755
index 0000000..badff7d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-sides.gif
new file mode 100755
index 0000000..c8ee38d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-pressed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-large-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-large-sides.gif
new file mode 100755
index 0000000..29f443b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-large-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-bg.gif
new file mode 100755
index 0000000..7015f11
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-corners.gif
new file mode 100755
index 0000000..c4152af
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-bg.gif
new file mode 100755
index 0000000..7015f11
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-corners.gif
new file mode 100755
index 0000000..d0c424b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-fbg.gif
new file mode 100755
index 0000000..804354b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-sides.gif
new file mode 100755
index 0000000..efeaf83
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-fbg.gif
new file mode 100755
index 0000000..804354b
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-bg.gif
new file mode 100755
index 0000000..05a3417
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-corners.gif
new file mode 100755
index 0000000..ada0a05
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-fbg.gif
new file mode 100755
index 0000000..3aae975
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-sides.gif
new file mode 100755
index 0000000..ef4597d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-focus-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-bg.gif
new file mode 100755
index 0000000..05a3417
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-corners.gif
new file mode 100755
index 0000000..ada0a05
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-fbg.gif
new file mode 100755
index 0000000..3aae975
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-sides.gif
new file mode 100755
index 0000000..ef4597d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-over-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-bg.gif
new file mode 100755
index 0000000..4854098
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-corners.gif
new file mode 100755
index 0000000..1b1d311
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-fbg.gif
new file mode 100755
index 0000000..c5d4e67
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-sides.gif
new file mode 100755
index 0000000..ace88e5
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-pressed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-medium-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-sides.gif
new file mode 100755
index 0000000..efeaf83
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-medium-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-bg.gif
new file mode 100755
index 0000000..4f97a13
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-corners.gif
new file mode 100755
index 0000000..c4152af
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-bg.gif
new file mode 100755
index 0000000..4f97a13
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-corners.gif
new file mode 100755
index 0000000..c4152af
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-fbg.gif
new file mode 100755
index 0000000..b362e82
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-sides.gif
new file mode 100755
index 0000000..97109aa
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-fbg.gif
new file mode 100755
index 0000000..b362e82
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-bg.gif
new file mode 100755
index 0000000..807f687
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-corners.gif
new file mode 100755
index 0000000..ada0a05
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-fbg.gif
new file mode 100755
index 0000000..108a3dd
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-sides.gif
new file mode 100755
index 0000000..9b85341
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-focus-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-bg.gif
new file mode 100755
index 0000000..807f687
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-corners.gif
new file mode 100755
index 0000000..ada0a05
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-fbg.gif
new file mode 100755
index 0000000..108a3dd
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-sides.gif
new file mode 100755
index 0000000..9b85341
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-over-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-bg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-bg.gif
new file mode 100755
index 0000000..35a6c84
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-bg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-corners.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-corners.gif
new file mode 100755
index 0000000..1b1d311
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-corners.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-fbg.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-fbg.gif
new file mode 100755
index 0000000..ed016e1
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-fbg.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-sides.gif
new file mode 100755
index 0000000..d6ad46d
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-pressed-sides.gif differ
diff --git a/html/modules/status/resources/images/btn/btn-default-toolbar-small-sides.gif b/html/modules/status/resources/images/btn/btn-default-toolbar-small-sides.gif
new file mode 100755
index 0000000..97109aa
Binary files /dev/null and b/html/modules/status/resources/images/btn/btn-default-toolbar-small-sides.gif differ
diff --git a/html/modules/status/resources/images/button/default-large-arrow-rtl.png b/html/modules/status/resources/images/button/default-large-arrow-rtl.png
new file mode 100755
index 0000000..76beeab
Binary files /dev/null and b/html/modules/status/resources/images/button/default-large-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-large-arrow.png b/html/modules/status/resources/images/button/default-large-arrow.png
new file mode 100755
index 0000000..32674e4
Binary files /dev/null and b/html/modules/status/resources/images/button/default-large-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-large-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/default-large-s-arrow-b-rtl.png
new file mode 100755
index 0000000..79677a4
Binary files /dev/null and b/html/modules/status/resources/images/button/default-large-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-large-s-arrow-b.png b/html/modules/status/resources/images/button/default-large-s-arrow-b.png
new file mode 100755
index 0000000..9f3928a
Binary files /dev/null and b/html/modules/status/resources/images/button/default-large-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/default-large-s-arrow-rtl.png b/html/modules/status/resources/images/button/default-large-s-arrow-rtl.png
new file mode 100755
index 0000000..7985050
Binary files /dev/null and b/html/modules/status/resources/images/button/default-large-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-large-s-arrow.png b/html/modules/status/resources/images/button/default-large-s-arrow.png
new file mode 100755
index 0000000..06ad27b
Binary files /dev/null and b/html/modules/status/resources/images/button/default-large-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-medium-arrow-rtl.png b/html/modules/status/resources/images/button/default-medium-arrow-rtl.png
new file mode 100755
index 0000000..d54d3a0
Binary files /dev/null and b/html/modules/status/resources/images/button/default-medium-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-medium-arrow.png b/html/modules/status/resources/images/button/default-medium-arrow.png
new file mode 100755
index 0000000..e565db4
Binary files /dev/null and b/html/modules/status/resources/images/button/default-medium-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-medium-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/default-medium-s-arrow-b-rtl.png
new file mode 100755
index 0000000..f2fb53b
Binary files /dev/null and b/html/modules/status/resources/images/button/default-medium-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-medium-s-arrow-b.png b/html/modules/status/resources/images/button/default-medium-s-arrow-b.png
new file mode 100755
index 0000000..ee39ae2
Binary files /dev/null and b/html/modules/status/resources/images/button/default-medium-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/default-medium-s-arrow-rtl.png b/html/modules/status/resources/images/button/default-medium-s-arrow-rtl.png
new file mode 100755
index 0000000..fb11140
Binary files /dev/null and b/html/modules/status/resources/images/button/default-medium-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-medium-s-arrow.png b/html/modules/status/resources/images/button/default-medium-s-arrow.png
new file mode 100755
index 0000000..c1d1875
Binary files /dev/null and b/html/modules/status/resources/images/button/default-medium-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-small-arrow-rtl.png b/html/modules/status/resources/images/button/default-small-arrow-rtl.png
new file mode 100755
index 0000000..3538445
Binary files /dev/null and b/html/modules/status/resources/images/button/default-small-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-small-arrow.png b/html/modules/status/resources/images/button/default-small-arrow.png
new file mode 100755
index 0000000..17a9beb
Binary files /dev/null and b/html/modules/status/resources/images/button/default-small-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-small-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/default-small-s-arrow-b-rtl.png
new file mode 100755
index 0000000..2f8b2e5
Binary files /dev/null and b/html/modules/status/resources/images/button/default-small-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-small-s-arrow-b.png b/html/modules/status/resources/images/button/default-small-s-arrow-b.png
new file mode 100755
index 0000000..afd13fb
Binary files /dev/null and b/html/modules/status/resources/images/button/default-small-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/default-small-s-arrow-rtl.png b/html/modules/status/resources/images/button/default-small-s-arrow-rtl.png
new file mode 100755
index 0000000..f59b792
Binary files /dev/null and b/html/modules/status/resources/images/button/default-small-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-small-s-arrow.png b/html/modules/status/resources/images/button/default-small-s-arrow.png
new file mode 100755
index 0000000..eaffbdc
Binary files /dev/null and b/html/modules/status/resources/images/button/default-small-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-large-arrow-rtl.png b/html/modules/status/resources/images/button/default-toolbar-large-arrow-rtl.png
new file mode 100755
index 0000000..d8f0151
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-large-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-large-arrow.png b/html/modules/status/resources/images/button/default-toolbar-large-arrow.png
new file mode 100755
index 0000000..31fc36e
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-large-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-b-rtl.png
new file mode 100755
index 0000000..379d2d9
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-b.png b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-b.png
new file mode 100755
index 0000000..dcfe8ea
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-rtl.png b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-rtl.png
new file mode 100755
index 0000000..612a6b1
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-large-s-arrow.png b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow.png
new file mode 100755
index 0000000..731b207
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-large-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-medium-arrow-rtl.png b/html/modules/status/resources/images/button/default-toolbar-medium-arrow-rtl.png
new file mode 100755
index 0000000..1648e51
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-medium-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-medium-arrow.png b/html/modules/status/resources/images/button/default-toolbar-medium-arrow.png
new file mode 100755
index 0000000..65fdd03
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-medium-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-b-rtl.png
new file mode 100755
index 0000000..8d2232b
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-b.png b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-b.png
new file mode 100755
index 0000000..2489479
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-rtl.png b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-rtl.png
new file mode 100755
index 0000000..c81c5f2
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow.png b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow.png
new file mode 100755
index 0000000..0a6857a
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-medium-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-small-arrow-rtl.png b/html/modules/status/resources/images/button/default-toolbar-small-arrow-rtl.png
new file mode 100755
index 0000000..8919138
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-small-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-small-arrow.png b/html/modules/status/resources/images/button/default-toolbar-small-arrow.png
new file mode 100755
index 0000000..b56c2a6
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-small-arrow.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-b-rtl.png
new file mode 100755
index 0000000..1142351
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-b.png b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-b.png
new file mode 100755
index 0000000..bb1b08e
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-rtl.png b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-rtl.png
new file mode 100755
index 0000000..9e9e16b
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/default-toolbar-small-s-arrow.png b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow.png
new file mode 100755
index 0000000..9a72857
Binary files /dev/null and b/html/modules/status/resources/images/button/default-toolbar-small-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-large-arrow-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-large-arrow-rtl.png
new file mode 100755
index 0000000..d8f0151
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-large-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-large-arrow.png b/html/modules/status/resources/images/button/plain-toolbar-large-arrow.png
new file mode 100755
index 0000000..31fc36e
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-large-arrow.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-b-rtl.png
new file mode 100755
index 0000000..379d2d9
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-b.png b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-b.png
new file mode 100755
index 0000000..dcfe8ea
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-rtl.png
new file mode 100755
index 0000000..612a6b1
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow.png b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow.png
new file mode 100755
index 0000000..731b207
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-large-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-medium-arrow-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-medium-arrow-rtl.png
new file mode 100755
index 0000000..1648e51
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-medium-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-medium-arrow.png b/html/modules/status/resources/images/button/plain-toolbar-medium-arrow.png
new file mode 100755
index 0000000..65fdd03
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-medium-arrow.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-b-rtl.png
new file mode 100755
index 0000000..8d2232b
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-b.png b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-b.png
new file mode 100755
index 0000000..2489479
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-rtl.png
new file mode 100755
index 0000000..c81c5f2
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow.png b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow.png
new file mode 100755
index 0000000..0a6857a
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-medium-s-arrow.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-small-arrow-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-small-arrow-rtl.png
new file mode 100755
index 0000000..8919138
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-small-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-small-arrow.png b/html/modules/status/resources/images/button/plain-toolbar-small-arrow.png
new file mode 100755
index 0000000..b56c2a6
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-small-arrow.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-b-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-b-rtl.png
new file mode 100755
index 0000000..1142351
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-b-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-b.png b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-b.png
new file mode 100755
index 0000000..bb1b08e
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-b.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-rtl.png b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-rtl.png
new file mode 100755
index 0000000..9e9e16b
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow-rtl.png differ
diff --git a/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow.png b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow.png
new file mode 100755
index 0000000..9a72857
Binary files /dev/null and b/html/modules/status/resources/images/button/plain-toolbar-small-s-arrow.png differ
diff --git a/html/modules/status/resources/images/datepicker/arrow-left.png b/html/modules/status/resources/images/datepicker/arrow-left.png
new file mode 100755
index 0000000..fc09f9a
Binary files /dev/null and b/html/modules/status/resources/images/datepicker/arrow-left.png differ
diff --git a/html/modules/status/resources/images/datepicker/arrow-right.png b/html/modules/status/resources/images/datepicker/arrow-right.png
new file mode 100755
index 0000000..a22b876
Binary files /dev/null and b/html/modules/status/resources/images/datepicker/arrow-right.png differ
diff --git a/html/modules/status/resources/images/datepicker/month-arrow.png b/html/modules/status/resources/images/datepicker/month-arrow.png
new file mode 100755
index 0000000..f0b572f
Binary files /dev/null and b/html/modules/status/resources/images/datepicker/month-arrow.png differ
diff --git a/html/modules/status/resources/images/dd/drop-add.png b/html/modules/status/resources/images/dd/drop-add.png
new file mode 100755
index 0000000..a7b8f28
Binary files /dev/null and b/html/modules/status/resources/images/dd/drop-add.png differ
diff --git a/html/modules/status/resources/images/dd/drop-no.png b/html/modules/status/resources/images/dd/drop-no.png
new file mode 100755
index 0000000..02e219a
Binary files /dev/null and b/html/modules/status/resources/images/dd/drop-no.png differ
diff --git a/html/modules/status/resources/images/dd/drop-yes.png b/html/modules/status/resources/images/dd/drop-yes.png
new file mode 100755
index 0000000..a7b8f28
Binary files /dev/null and b/html/modules/status/resources/images/dd/drop-yes.png differ
diff --git a/html/modules/status/resources/images/editor/tb-sprite.png b/html/modules/status/resources/images/editor/tb-sprite.png
new file mode 100755
index 0000000..9886118
Binary files /dev/null and b/html/modules/status/resources/images/editor/tb-sprite.png differ
diff --git a/html/modules/status/resources/images/fieldset/collapse-tool.png b/html/modules/status/resources/images/fieldset/collapse-tool.png
new file mode 100755
index 0000000..97eb83f
Binary files /dev/null and b/html/modules/status/resources/images/fieldset/collapse-tool.png differ
diff --git a/html/modules/status/resources/images/form/checkbox.png b/html/modules/status/resources/images/form/checkbox.png
new file mode 100755
index 0000000..fc2709c
Binary files /dev/null and b/html/modules/status/resources/images/form/checkbox.png differ
diff --git a/html/modules/status/resources/images/form/clear-trigger-rtl.png b/html/modules/status/resources/images/form/clear-trigger-rtl.png
new file mode 100755
index 0000000..73e1dbe
Binary files /dev/null and b/html/modules/status/resources/images/form/clear-trigger-rtl.png differ
diff --git a/html/modules/status/resources/images/form/clear-trigger.png b/html/modules/status/resources/images/form/clear-trigger.png
new file mode 100755
index 0000000..73e1dbe
Binary files /dev/null and b/html/modules/status/resources/images/form/clear-trigger.png differ
diff --git a/html/modules/status/resources/images/form/date-trigger-rtl.png b/html/modules/status/resources/images/form/date-trigger-rtl.png
new file mode 100755
index 0000000..9489493
Binary files /dev/null and b/html/modules/status/resources/images/form/date-trigger-rtl.png differ
diff --git a/html/modules/status/resources/images/form/date-trigger.png b/html/modules/status/resources/images/form/date-trigger.png
new file mode 100755
index 0000000..9489493
Binary files /dev/null and b/html/modules/status/resources/images/form/date-trigger.png differ
diff --git a/html/modules/status/resources/images/form/exclamation.png b/html/modules/status/resources/images/form/exclamation.png
new file mode 100755
index 0000000..3e6e3d0
Binary files /dev/null and b/html/modules/status/resources/images/form/exclamation.png differ
diff --git a/html/modules/status/resources/images/form/radio.png b/html/modules/status/resources/images/form/radio.png
new file mode 100755
index 0000000..86644bb
Binary files /dev/null and b/html/modules/status/resources/images/form/radio.png differ
diff --git a/html/modules/status/resources/images/form/search-trigger-rtl.png b/html/modules/status/resources/images/form/search-trigger-rtl.png
new file mode 100755
index 0000000..15e15f5
Binary files /dev/null and b/html/modules/status/resources/images/form/search-trigger-rtl.png differ
diff --git a/html/modules/status/resources/images/form/search-trigger.png b/html/modules/status/resources/images/form/search-trigger.png
new file mode 100755
index 0000000..15e15f5
Binary files /dev/null and b/html/modules/status/resources/images/form/search-trigger.png differ
diff --git a/html/modules/status/resources/images/form/spinner-rtl.png b/html/modules/status/resources/images/form/spinner-rtl.png
new file mode 100755
index 0000000..28d140f
Binary files /dev/null and b/html/modules/status/resources/images/form/spinner-rtl.png differ
diff --git a/html/modules/status/resources/images/form/spinner.png b/html/modules/status/resources/images/form/spinner.png
new file mode 100755
index 0000000..28d140f
Binary files /dev/null and b/html/modules/status/resources/images/form/spinner.png differ
diff --git a/html/modules/status/resources/images/form/trigger-rtl.png b/html/modules/status/resources/images/form/trigger-rtl.png
new file mode 100755
index 0000000..b4e2d5c
Binary files /dev/null and b/html/modules/status/resources/images/form/trigger-rtl.png differ
diff --git a/html/modules/status/resources/images/form/trigger.png b/html/modules/status/resources/images/form/trigger.png
new file mode 100755
index 0000000..b4e2d5c
Binary files /dev/null and b/html/modules/status/resources/images/form/trigger.png differ
diff --git a/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-bottom-corners.gif b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-bottom-corners.gif
new file mode 100755
index 0000000..c662c0d
Binary files /dev/null and b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-bottom-corners.gif differ
diff --git a/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-bottom-sides.gif b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-bottom-sides.gif
new file mode 100755
index 0000000..13f5c29
Binary files /dev/null and b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-bottom-sides.gif differ
diff --git a/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-top-corners.gif b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-top-corners.gif
new file mode 100755
index 0000000..ffc713e
Binary files /dev/null and b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-top-corners.gif differ
diff --git a/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-top-sides.gif b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-top-sides.gif
new file mode 100755
index 0000000..13f5c29
Binary files /dev/null and b/html/modules/status/resources/images/grid-row-editor-buttons/grid-row-editor-buttons-default-top-sides.gif differ
diff --git a/html/modules/status/resources/images/grid/col-move-bottom.png b/html/modules/status/resources/images/grid/col-move-bottom.png
new file mode 100755
index 0000000..9782219
Binary files /dev/null and b/html/modules/status/resources/images/grid/col-move-bottom.png differ
diff --git a/html/modules/status/resources/images/grid/col-move-top.png b/html/modules/status/resources/images/grid/col-move-top.png
new file mode 100755
index 0000000..6e28535
Binary files /dev/null and b/html/modules/status/resources/images/grid/col-move-top.png differ
diff --git a/html/modules/status/resources/images/grid/columns.png b/html/modules/status/resources/images/grid/columns.png
new file mode 100755
index 0000000..70a5c87
Binary files /dev/null and b/html/modules/status/resources/images/grid/columns.png differ
diff --git a/html/modules/status/resources/images/grid/dd-insert-arrow-left.png b/html/modules/status/resources/images/grid/dd-insert-arrow-left.png
new file mode 100755
index 0000000..e8177d0
Binary files /dev/null and b/html/modules/status/resources/images/grid/dd-insert-arrow-left.png differ
diff --git a/html/modules/status/resources/images/grid/dd-insert-arrow-right.png b/html/modules/status/resources/images/grid/dd-insert-arrow-right.png
new file mode 100755
index 0000000..d610f9d
Binary files /dev/null and b/html/modules/status/resources/images/grid/dd-insert-arrow-right.png differ
diff --git a/html/modules/status/resources/images/grid/dirty-rtl.png b/html/modules/status/resources/images/grid/dirty-rtl.png
new file mode 100755
index 0000000..5f84122
Binary files /dev/null and b/html/modules/status/resources/images/grid/dirty-rtl.png differ
diff --git a/html/modules/status/resources/images/grid/dirty.png b/html/modules/status/resources/images/grid/dirty.png
new file mode 100755
index 0000000..fc06fdd
Binary files /dev/null and b/html/modules/status/resources/images/grid/dirty.png differ
diff --git a/html/modules/status/resources/images/grid/drop-no.png b/html/modules/status/resources/images/grid/drop-no.png
new file mode 100755
index 0000000..02e219a
Binary files /dev/null and b/html/modules/status/resources/images/grid/drop-no.png differ
diff --git a/html/modules/status/resources/images/grid/drop-yes.png b/html/modules/status/resources/images/grid/drop-yes.png
new file mode 100755
index 0000000..a7b8f28
Binary files /dev/null and b/html/modules/status/resources/images/grid/drop-yes.png differ
diff --git a/html/modules/status/resources/images/grid/group-by.png b/html/modules/status/resources/images/grid/group-by.png
new file mode 100755
index 0000000..8508ade
Binary files /dev/null and b/html/modules/status/resources/images/grid/group-by.png differ
diff --git a/html/modules/status/resources/images/grid/group-collapse.png b/html/modules/status/resources/images/grid/group-collapse.png
new file mode 100755
index 0000000..49fcc4f
Binary files /dev/null and b/html/modules/status/resources/images/grid/group-collapse.png differ
diff --git a/html/modules/status/resources/images/grid/group-expand-sprite.png b/html/modules/status/resources/images/grid/group-expand-sprite.png
new file mode 100755
index 0000000..57cf2d2
Binary files /dev/null and b/html/modules/status/resources/images/grid/group-expand-sprite.png differ
diff --git a/html/modules/status/resources/images/grid/group-expand.png b/html/modules/status/resources/images/grid/group-expand.png
new file mode 100755
index 0000000..d65a7df
Binary files /dev/null and b/html/modules/status/resources/images/grid/group-expand.png differ
diff --git a/html/modules/status/resources/images/grid/hd-pop.png b/html/modules/status/resources/images/grid/hd-pop.png
new file mode 100755
index 0000000..3ad96ef
Binary files /dev/null and b/html/modules/status/resources/images/grid/hd-pop.png differ
diff --git a/html/modules/status/resources/images/grid/hmenu-asc.png b/html/modules/status/resources/images/grid/hmenu-asc.png
new file mode 100755
index 0000000..a206d35
Binary files /dev/null and b/html/modules/status/resources/images/grid/hmenu-asc.png differ
diff --git a/html/modules/status/resources/images/grid/hmenu-desc.png b/html/modules/status/resources/images/grid/hmenu-desc.png
new file mode 100755
index 0000000..55a714e
Binary files /dev/null and b/html/modules/status/resources/images/grid/hmenu-desc.png differ
diff --git a/html/modules/status/resources/images/grid/hmenu-lock.png b/html/modules/status/resources/images/grid/hmenu-lock.png
new file mode 100755
index 0000000..b293e10
Binary files /dev/null and b/html/modules/status/resources/images/grid/hmenu-lock.png differ
diff --git a/html/modules/status/resources/images/grid/hmenu-unlock.png b/html/modules/status/resources/images/grid/hmenu-unlock.png
new file mode 100755
index 0000000..e9e9df5
Binary files /dev/null and b/html/modules/status/resources/images/grid/hmenu-unlock.png differ
diff --git a/html/modules/status/resources/images/grid/loading.gif b/html/modules/status/resources/images/grid/loading.gif
new file mode 100755
index 0000000..81b0f12
Binary files /dev/null and b/html/modules/status/resources/images/grid/loading.gif differ
diff --git a/html/modules/status/resources/images/grid/page-first.png b/html/modules/status/resources/images/grid/page-first.png
new file mode 100755
index 0000000..7691f32
Binary files /dev/null and b/html/modules/status/resources/images/grid/page-first.png differ
diff --git a/html/modules/status/resources/images/grid/page-last.png b/html/modules/status/resources/images/grid/page-last.png
new file mode 100755
index 0000000..49b13d7
Binary files /dev/null and b/html/modules/status/resources/images/grid/page-last.png differ
diff --git a/html/modules/status/resources/images/grid/page-next.png b/html/modules/status/resources/images/grid/page-next.png
new file mode 100755
index 0000000..c3e72ba
Binary files /dev/null and b/html/modules/status/resources/images/grid/page-next.png differ
diff --git a/html/modules/status/resources/images/grid/page-prev.png b/html/modules/status/resources/images/grid/page-prev.png
new file mode 100755
index 0000000..cace90b
Binary files /dev/null and b/html/modules/status/resources/images/grid/page-prev.png differ
diff --git a/html/modules/status/resources/images/grid/pick-button.png b/html/modules/status/resources/images/grid/pick-button.png
new file mode 100755
index 0000000..acaface
Binary files /dev/null and b/html/modules/status/resources/images/grid/pick-button.png differ
diff --git a/html/modules/status/resources/images/grid/refresh.png b/html/modules/status/resources/images/grid/refresh.png
new file mode 100755
index 0000000..5320ddd
Binary files /dev/null and b/html/modules/status/resources/images/grid/refresh.png differ
diff --git a/html/modules/status/resources/images/grid/sort_asc.png b/html/modules/status/resources/images/grid/sort_asc.png
new file mode 100755
index 0000000..a206d35
Binary files /dev/null and b/html/modules/status/resources/images/grid/sort_asc.png differ
diff --git a/html/modules/status/resources/images/grid/sort_desc.png b/html/modules/status/resources/images/grid/sort_desc.png
new file mode 100755
index 0000000..55a714e
Binary files /dev/null and b/html/modules/status/resources/images/grid/sort_desc.png differ
diff --git a/interface/images/istsos-logo.png b/html/modules/status/resources/images/istsos-logo.png
similarity index 100%
rename from interface/images/istsos-logo.png
rename to html/modules/status/resources/images/istsos-logo.png
diff --git a/html/modules/status/resources/images/loadingwheel.gif b/html/modules/status/resources/images/loadingwheel.gif
new file mode 100644
index 0000000..fcd54b5
Binary files /dev/null and b/html/modules/status/resources/images/loadingwheel.gif differ
diff --git a/html/modules/status/resources/images/loadmask/loading.gif b/html/modules/status/resources/images/loadmask/loading.gif
new file mode 100755
index 0000000..8471b4f
Binary files /dev/null and b/html/modules/status/resources/images/loadmask/loading.gif differ
diff --git a/html/modules/status/resources/images/menu/checked.png b/html/modules/status/resources/images/menu/checked.png
new file mode 100755
index 0000000..4f5157d
Binary files /dev/null and b/html/modules/status/resources/images/menu/checked.png differ
diff --git a/html/modules/status/resources/images/menu/group-checked.png b/html/modules/status/resources/images/menu/group-checked.png
new file mode 100755
index 0000000..a9f0b80
Binary files /dev/null and b/html/modules/status/resources/images/menu/group-checked.png differ
diff --git a/html/modules/status/resources/images/menu/menu-item-active-bg.gif b/html/modules/status/resources/images/menu/menu-item-active-bg.gif
new file mode 100755
index 0000000..4ccf5af
Binary files /dev/null and b/html/modules/status/resources/images/menu/menu-item-active-bg.gif differ
diff --git a/html/modules/status/resources/images/menu/menu-parent-left.png b/html/modules/status/resources/images/menu/menu-parent-left.png
new file mode 100755
index 0000000..d457564
Binary files /dev/null and b/html/modules/status/resources/images/menu/menu-parent-left.png differ
diff --git a/html/modules/status/resources/images/menu/menu-parent.png b/html/modules/status/resources/images/menu/menu-parent.png
new file mode 100755
index 0000000..2d2331e
Binary files /dev/null and b/html/modules/status/resources/images/menu/menu-parent.png differ
diff --git a/html/modules/status/resources/images/menu/scroll-bottom.png b/html/modules/status/resources/images/menu/scroll-bottom.png
new file mode 100755
index 0000000..d89a459
Binary files /dev/null and b/html/modules/status/resources/images/menu/scroll-bottom.png differ
diff --git a/html/modules/status/resources/images/menu/scroll-top.png b/html/modules/status/resources/images/menu/scroll-top.png
new file mode 100755
index 0000000..bbbf4af
Binary files /dev/null and b/html/modules/status/resources/images/menu/scroll-top.png differ
diff --git a/html/modules/status/resources/images/menu/unchecked.png b/html/modules/status/resources/images/menu/unchecked.png
new file mode 100755
index 0000000..bce8817
Binary files /dev/null and b/html/modules/status/resources/images/menu/unchecked.png differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-bottom-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-bottom-corners.gif
new file mode 100755
index 0000000..06be61f
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-bottom-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-bottom-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-bottom-sides.gif
new file mode 100755
index 0000000..04ae2be
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-bottom-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif
new file mode 100755
index 0000000..41022fd
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif
new file mode 100755
index 0000000..04ae2be
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-corners-rtl.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-corners-rtl.gif
new file mode 100755
index 0000000..db29ab9
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-corners.gif
new file mode 100755
index 0000000..41022fd
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-sides.gif
new file mode 100755
index 0000000..d5a75a3
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-left-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-corners-rtl.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-corners-rtl.gif
new file mode 100755
index 0000000..db29ab9
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-corners.gif
new file mode 100755
index 0000000..41022fd
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-sides.gif
new file mode 100755
index 0000000..d5a75a3
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-right-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-top-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-top-corners.gif
new file mode 100755
index 0000000..41022fd
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-top-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-top-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-top-sides.gif
new file mode 100755
index 0000000..04ae2be
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-collapsed-top-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-corners-rtl.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-corners-rtl.gif
new file mode 100755
index 0000000..ca19537
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-corners.gif
new file mode 100755
index 0000000..556dde5
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-sides.gif
new file mode 100755
index 0000000..d5a75a3
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-left-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-corners-rtl.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-corners-rtl.gif
new file mode 100755
index 0000000..e3f86b8
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-corners.gif
new file mode 100755
index 0000000..f720c5d
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-sides.gif
new file mode 100755
index 0000000..d5a75a3
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-right-sides.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-top-corners.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-top-corners.gif
new file mode 100755
index 0000000..2d33c40
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-top-corners.gif differ
diff --git a/html/modules/status/resources/images/panel-header/panel-header-default-framed-top-sides.gif b/html/modules/status/resources/images/panel-header/panel-header-default-framed-top-sides.gif
new file mode 100755
index 0000000..04ae2be
Binary files /dev/null and b/html/modules/status/resources/images/panel-header/panel-header-default-framed-top-sides.gif differ
diff --git a/html/modules/status/resources/images/panel/panel-default-framed-corners.gif b/html/modules/status/resources/images/panel/panel-default-framed-corners.gif
new file mode 100755
index 0000000..ba182e7
Binary files /dev/null and b/html/modules/status/resources/images/panel/panel-default-framed-corners.gif differ
diff --git a/html/modules/status/resources/images/panel/panel-default-framed-sides.gif b/html/modules/status/resources/images/panel/panel-default-framed-sides.gif
new file mode 100755
index 0000000..7281f43
Binary files /dev/null and b/html/modules/status/resources/images/panel/panel-default-framed-sides.gif differ
diff --git a/html/modules/status/resources/images/shared/icon-error.png b/html/modules/status/resources/images/shared/icon-error.png
new file mode 100755
index 0000000..458c098
Binary files /dev/null and b/html/modules/status/resources/images/shared/icon-error.png differ
diff --git a/html/modules/status/resources/images/shared/icon-info.png b/html/modules/status/resources/images/shared/icon-info.png
new file mode 100755
index 0000000..8704641
Binary files /dev/null and b/html/modules/status/resources/images/shared/icon-info.png differ
diff --git a/html/modules/status/resources/images/shared/icon-question.png b/html/modules/status/resources/images/shared/icon-question.png
new file mode 100755
index 0000000..cac922e
Binary files /dev/null and b/html/modules/status/resources/images/shared/icon-question.png differ
diff --git a/html/modules/status/resources/images/shared/icon-warning.png b/html/modules/status/resources/images/shared/icon-warning.png
new file mode 100755
index 0000000..042ca05
Binary files /dev/null and b/html/modules/status/resources/images/shared/icon-warning.png differ
diff --git a/html/modules/status/resources/images/sizer/e-handle.png b/html/modules/status/resources/images/sizer/e-handle.png
new file mode 100755
index 0000000..2fe5cb1
Binary files /dev/null and b/html/modules/status/resources/images/sizer/e-handle.png differ
diff --git a/html/modules/status/resources/images/sizer/ne-handle.png b/html/modules/status/resources/images/sizer/ne-handle.png
new file mode 100755
index 0000000..8d8eb63
Binary files /dev/null and b/html/modules/status/resources/images/sizer/ne-handle.png differ
diff --git a/html/modules/status/resources/images/sizer/nw-handle.png b/html/modules/status/resources/images/sizer/nw-handle.png
new file mode 100755
index 0000000..9835bea
Binary files /dev/null and b/html/modules/status/resources/images/sizer/nw-handle.png differ
diff --git a/html/modules/status/resources/images/sizer/s-handle.png b/html/modules/status/resources/images/sizer/s-handle.png
new file mode 100755
index 0000000..06f914e
Binary files /dev/null and b/html/modules/status/resources/images/sizer/s-handle.png differ
diff --git a/html/modules/status/resources/images/sizer/se-handle.png b/html/modules/status/resources/images/sizer/se-handle.png
new file mode 100755
index 0000000..5a2c695
Binary files /dev/null and b/html/modules/status/resources/images/sizer/se-handle.png differ
diff --git a/html/modules/status/resources/images/sizer/sw-handle.png b/html/modules/status/resources/images/sizer/sw-handle.png
new file mode 100755
index 0000000..7f68f40
Binary files /dev/null and b/html/modules/status/resources/images/sizer/sw-handle.png differ
diff --git a/html/modules/status/resources/images/slider/slider-bg.png b/html/modules/status/resources/images/slider/slider-bg.png
new file mode 100755
index 0000000..1ade292
Binary files /dev/null and b/html/modules/status/resources/images/slider/slider-bg.png differ
diff --git a/html/modules/status/resources/images/slider/slider-thumb.png b/html/modules/status/resources/images/slider/slider-thumb.png
new file mode 100755
index 0000000..f920313
Binary files /dev/null and b/html/modules/status/resources/images/slider/slider-thumb.png differ
diff --git a/html/modules/status/resources/images/slider/slider-v-bg.png b/html/modules/status/resources/images/slider/slider-v-bg.png
new file mode 100755
index 0000000..c24663e
Binary files /dev/null and b/html/modules/status/resources/images/slider/slider-v-bg.png differ
diff --git a/html/modules/status/resources/images/slider/slider-v-thumb.png b/html/modules/status/resources/images/slider/slider-v-thumb.png
new file mode 100755
index 0000000..f920313
Binary files /dev/null and b/html/modules/status/resources/images/slider/slider-v-thumb.png differ
diff --git a/interface/images/menu/status_1.svg b/html/modules/status/resources/images/status_1.svg
similarity index 100%
rename from interface/images/menu/status_1.svg
rename to html/modules/status/resources/images/status_1.svg
diff --git a/html/modules/status/resources/images/tab-bar/default-plain-scroll-bottom.png b/html/modules/status/resources/images/tab-bar/default-plain-scroll-bottom.png
new file mode 100755
index 0000000..813a4d5
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-plain-scroll-bottom.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-plain-scroll-left.png b/html/modules/status/resources/images/tab-bar/default-plain-scroll-left.png
new file mode 100755
index 0000000..9120ea4
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-plain-scroll-left.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-plain-scroll-right.png b/html/modules/status/resources/images/tab-bar/default-plain-scroll-right.png
new file mode 100755
index 0000000..67fd5a4
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-plain-scroll-right.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-plain-scroll-top.png b/html/modules/status/resources/images/tab-bar/default-plain-scroll-top.png
new file mode 100755
index 0000000..01ad4ee
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-plain-scroll-top.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-scroll-bottom.png b/html/modules/status/resources/images/tab-bar/default-scroll-bottom.png
new file mode 100755
index 0000000..ffff826
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-scroll-bottom.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-scroll-left.png b/html/modules/status/resources/images/tab-bar/default-scroll-left.png
new file mode 100755
index 0000000..2c35294
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-scroll-left.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-scroll-right.png b/html/modules/status/resources/images/tab-bar/default-scroll-right.png
new file mode 100755
index 0000000..82dfe01
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-scroll-right.png differ
diff --git a/html/modules/status/resources/images/tab-bar/default-scroll-top.png b/html/modules/status/resources/images/tab-bar/default-scroll-top.png
new file mode 100755
index 0000000..b2fabfc
Binary files /dev/null and b/html/modules/status/resources/images/tab-bar/default-scroll-top.png differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-active-corners.gif b/html/modules/status/resources/images/tab/tab-default-bottom-active-corners.gif
new file mode 100755
index 0000000..e0723a3
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-active-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-active-sides.gif b/html/modules/status/resources/images/tab/tab-default-bottom-active-sides.gif
new file mode 100755
index 0000000..92c8579
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-active-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-corners.gif b/html/modules/status/resources/images/tab/tab-default-bottom-corners.gif
new file mode 100755
index 0000000..77c8dbd
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-disabled-corners.gif b/html/modules/status/resources/images/tab/tab-default-bottom-disabled-corners.gif
new file mode 100755
index 0000000..77c8dbd
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-disabled-sides.gif b/html/modules/status/resources/images/tab/tab-default-bottom-disabled-sides.gif
new file mode 100755
index 0000000..a61d840
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-over-corners.gif b/html/modules/status/resources/images/tab/tab-default-bottom-over-corners.gif
new file mode 100755
index 0000000..69aadbc
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-over-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-over-sides.gif b/html/modules/status/resources/images/tab/tab-default-bottom-over-sides.gif
new file mode 100755
index 0000000..15de0ea
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-over-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-bottom-sides.gif b/html/modules/status/resources/images/tab/tab-default-bottom-sides.gif
new file mode 100755
index 0000000..a61d840
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-bottom-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-close.png b/html/modules/status/resources/images/tab/tab-default-close.png
new file mode 100755
index 0000000..46cc89f
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-close.png differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-active-corners.gif b/html/modules/status/resources/images/tab/tab-default-top-active-corners.gif
new file mode 100755
index 0000000..1ccadce
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-active-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-active-sides.gif b/html/modules/status/resources/images/tab/tab-default-top-active-sides.gif
new file mode 100755
index 0000000..92c8579
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-active-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-corners.gif b/html/modules/status/resources/images/tab/tab-default-top-corners.gif
new file mode 100755
index 0000000..7bda1e6
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-disabled-corners.gif b/html/modules/status/resources/images/tab/tab-default-top-disabled-corners.gif
new file mode 100755
index 0000000..66c930e
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-disabled-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-disabled-sides.gif b/html/modules/status/resources/images/tab/tab-default-top-disabled-sides.gif
new file mode 100755
index 0000000..a61d840
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-disabled-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-over-corners.gif b/html/modules/status/resources/images/tab/tab-default-top-over-corners.gif
new file mode 100755
index 0000000..8ad4b16
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-over-corners.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-over-sides.gif b/html/modules/status/resources/images/tab/tab-default-top-over-sides.gif
new file mode 100755
index 0000000..15de0ea
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-over-sides.gif differ
diff --git a/html/modules/status/resources/images/tab/tab-default-top-sides.gif b/html/modules/status/resources/images/tab/tab-default-top-sides.gif
new file mode 100755
index 0000000..a61d840
Binary files /dev/null and b/html/modules/status/resources/images/tab/tab-default-top-sides.gif differ
diff --git a/html/modules/status/resources/images/tip/tip-default-corners.gif b/html/modules/status/resources/images/tip/tip-default-corners.gif
new file mode 100755
index 0000000..1b37201
Binary files /dev/null and b/html/modules/status/resources/images/tip/tip-default-corners.gif differ
diff --git a/html/modules/status/resources/images/tip/tip-default-sides.gif b/html/modules/status/resources/images/tip/tip-default-sides.gif
new file mode 100755
index 0000000..1add4b7
Binary files /dev/null and b/html/modules/status/resources/images/tip/tip-default-sides.gif differ
diff --git a/html/modules/status/resources/images/tip/tip-form-invalid-corners.gif b/html/modules/status/resources/images/tip/tip-form-invalid-corners.gif
new file mode 100755
index 0000000..1b37201
Binary files /dev/null and b/html/modules/status/resources/images/tip/tip-form-invalid-corners.gif differ
diff --git a/html/modules/status/resources/images/tip/tip-form-invalid-sides.gif b/html/modules/status/resources/images/tip/tip-form-invalid-sides.gif
new file mode 100755
index 0000000..1add4b7
Binary files /dev/null and b/html/modules/status/resources/images/tip/tip-form-invalid-sides.gif differ
diff --git a/html/modules/status/resources/images/toolbar/more.png b/html/modules/status/resources/images/toolbar/more.png
new file mode 100755
index 0000000..b6756e6
Binary files /dev/null and b/html/modules/status/resources/images/toolbar/more.png differ
diff --git a/html/modules/status/resources/images/toolbar/scroll-left.png b/html/modules/status/resources/images/toolbar/scroll-left.png
new file mode 100755
index 0000000..5ff969e
Binary files /dev/null and b/html/modules/status/resources/images/toolbar/scroll-left.png differ
diff --git a/html/modules/status/resources/images/toolbar/scroll-right.png b/html/modules/status/resources/images/toolbar/scroll-right.png
new file mode 100755
index 0000000..6fed21a
Binary files /dev/null and b/html/modules/status/resources/images/toolbar/scroll-right.png differ
diff --git a/html/modules/status/resources/images/tools/tool-sprites-dark.png b/html/modules/status/resources/images/tools/tool-sprites-dark.png
new file mode 100755
index 0000000..d617c45
Binary files /dev/null and b/html/modules/status/resources/images/tools/tool-sprites-dark.png differ
diff --git a/html/modules/status/resources/images/tools/tool-sprites.png b/html/modules/status/resources/images/tools/tool-sprites.png
new file mode 100755
index 0000000..17fbc0f
Binary files /dev/null and b/html/modules/status/resources/images/tools/tool-sprites.png differ
diff --git a/html/modules/status/resources/images/tree/arrows-rtl.png b/html/modules/status/resources/images/tree/arrows-rtl.png
new file mode 100755
index 0000000..d0777e5
Binary files /dev/null and b/html/modules/status/resources/images/tree/arrows-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/arrows.png b/html/modules/status/resources/images/tree/arrows.png
new file mode 100755
index 0000000..3f33225
Binary files /dev/null and b/html/modules/status/resources/images/tree/arrows.png differ
diff --git a/html/modules/status/resources/images/tree/drop-above.png b/html/modules/status/resources/images/tree/drop-above.png
new file mode 100755
index 0000000..5782531
Binary files /dev/null and b/html/modules/status/resources/images/tree/drop-above.png differ
diff --git a/interface/ext/resources/themes/images/default/dd/drop-add.gif b/html/modules/status/resources/images/tree/drop-add.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/dd/drop-add.gif
rename to html/modules/status/resources/images/tree/drop-add.gif
diff --git a/html/modules/status/resources/images/tree/drop-append.png b/html/modules/status/resources/images/tree/drop-append.png
new file mode 100755
index 0000000..5782531
Binary files /dev/null and b/html/modules/status/resources/images/tree/drop-append.png differ
diff --git a/html/modules/status/resources/images/tree/drop-below.png b/html/modules/status/resources/images/tree/drop-below.png
new file mode 100755
index 0000000..5782531
Binary files /dev/null and b/html/modules/status/resources/images/tree/drop-below.png differ
diff --git a/html/modules/status/resources/images/tree/drop-between.png b/html/modules/status/resources/images/tree/drop-between.png
new file mode 100755
index 0000000..5782531
Binary files /dev/null and b/html/modules/status/resources/images/tree/drop-between.png differ
diff --git a/interface/ext/resources/themes/images/access/tree/drop-no.gif b/html/modules/status/resources/images/tree/drop-no.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-no.gif
rename to html/modules/status/resources/images/tree/drop-no.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-over.gif b/html/modules/status/resources/images/tree/drop-over.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-over.gif
rename to html/modules/status/resources/images/tree/drop-over.gif
diff --git a/interface/ext/resources/themes/images/access/tree/drop-under.gif b/html/modules/status/resources/images/tree/drop-under.gif
similarity index 100%
rename from interface/ext/resources/themes/images/access/tree/drop-under.gif
rename to html/modules/status/resources/images/tree/drop-under.gif
diff --git a/interface/ext/resources/themes/images/default/dd/drop-yes.gif b/html/modules/status/resources/images/tree/drop-yes.gif
similarity index 100%
rename from interface/ext/resources/themes/images/default/dd/drop-yes.gif
rename to html/modules/status/resources/images/tree/drop-yes.gif
diff --git a/html/modules/status/resources/images/tree/elbow-end-minus-rtl.png b/html/modules/status/resources/images/tree/elbow-end-minus-rtl.png
new file mode 100755
index 0000000..3fbf4d4
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-end-minus-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-end-minus.png b/html/modules/status/resources/images/tree/elbow-end-minus.png
new file mode 100755
index 0000000..b39a71d
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-end-minus.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-end-plus-rtl.png b/html/modules/status/resources/images/tree/elbow-end-plus-rtl.png
new file mode 100755
index 0000000..bea9892
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-end-plus-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-end-plus.png b/html/modules/status/resources/images/tree/elbow-end-plus.png
new file mode 100755
index 0000000..630438f
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-end-plus.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-end-rtl.png b/html/modules/status/resources/images/tree/elbow-end-rtl.png
new file mode 100755
index 0000000..1d0821b
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-end-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-end.png b/html/modules/status/resources/images/tree/elbow-end.png
new file mode 100755
index 0000000..2eb0ed0
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-end.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-line-rtl.png b/html/modules/status/resources/images/tree/elbow-line-rtl.png
new file mode 100755
index 0000000..e26b768
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-line-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-line.png b/html/modules/status/resources/images/tree/elbow-line.png
new file mode 100755
index 0000000..ac37424
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-line.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-minus-nl-rtl.png b/html/modules/status/resources/images/tree/elbow-minus-nl-rtl.png
new file mode 100755
index 0000000..1008a54
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-minus-nl-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-minus-nl.png b/html/modules/status/resources/images/tree/elbow-minus-nl.png
new file mode 100755
index 0000000..f2a805d
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-minus-nl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-minus-rtl.png b/html/modules/status/resources/images/tree/elbow-minus-rtl.png
new file mode 100755
index 0000000..cefb704
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-minus-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-minus.png b/html/modules/status/resources/images/tree/elbow-minus.png
new file mode 100755
index 0000000..a256b48
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-minus.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-plus-nl-rtl.png b/html/modules/status/resources/images/tree/elbow-plus-nl-rtl.png
new file mode 100755
index 0000000..e1e6ece
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-plus-nl-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-plus-nl.png b/html/modules/status/resources/images/tree/elbow-plus-nl.png
new file mode 100755
index 0000000..3a401ea
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-plus-nl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-plus-rtl.png b/html/modules/status/resources/images/tree/elbow-plus-rtl.png
new file mode 100755
index 0000000..487f27a
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-plus-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-plus.png b/html/modules/status/resources/images/tree/elbow-plus.png
new file mode 100755
index 0000000..03e202a
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-plus.png differ
diff --git a/html/modules/status/resources/images/tree/elbow-rtl.png b/html/modules/status/resources/images/tree/elbow-rtl.png
new file mode 100755
index 0000000..166e163
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/elbow.png b/html/modules/status/resources/images/tree/elbow.png
new file mode 100755
index 0000000..4bf9ae5
Binary files /dev/null and b/html/modules/status/resources/images/tree/elbow.png differ
diff --git a/html/modules/status/resources/images/tree/folder-open-rtl.png b/html/modules/status/resources/images/tree/folder-open-rtl.png
new file mode 100755
index 0000000..bb896d8
Binary files /dev/null and b/html/modules/status/resources/images/tree/folder-open-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/folder-open.png b/html/modules/status/resources/images/tree/folder-open.png
new file mode 100755
index 0000000..50397da
Binary files /dev/null and b/html/modules/status/resources/images/tree/folder-open.png differ
diff --git a/html/modules/status/resources/images/tree/folder-rtl.png b/html/modules/status/resources/images/tree/folder-rtl.png
new file mode 100755
index 0000000..6901879
Binary files /dev/null and b/html/modules/status/resources/images/tree/folder-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/folder.png b/html/modules/status/resources/images/tree/folder.png
new file mode 100755
index 0000000..4b02054
Binary files /dev/null and b/html/modules/status/resources/images/tree/folder.png differ
diff --git a/html/modules/status/resources/images/tree/leaf-rtl.png b/html/modules/status/resources/images/tree/leaf-rtl.png
new file mode 100755
index 0000000..b2e6f6e
Binary files /dev/null and b/html/modules/status/resources/images/tree/leaf-rtl.png differ
diff --git a/html/modules/status/resources/images/tree/leaf.png b/html/modules/status/resources/images/tree/leaf.png
new file mode 100755
index 0000000..6acb635
Binary files /dev/null and b/html/modules/status/resources/images/tree/leaf.png differ
diff --git a/html/modules/status/resources/images/tree/loading.png b/html/modules/status/resources/images/tree/loading.png
new file mode 100755
index 0000000..81b0f12
Binary files /dev/null and b/html/modules/status/resources/images/tree/loading.png differ
diff --git a/html/modules/status/resources/images/util/splitter/mini-bottom.png b/html/modules/status/resources/images/util/splitter/mini-bottom.png
new file mode 100755
index 0000000..241209e
Binary files /dev/null and b/html/modules/status/resources/images/util/splitter/mini-bottom.png differ
diff --git a/html/modules/status/resources/images/util/splitter/mini-left.png b/html/modules/status/resources/images/util/splitter/mini-left.png
new file mode 100755
index 0000000..1c40b78
Binary files /dev/null and b/html/modules/status/resources/images/util/splitter/mini-left.png differ
diff --git a/html/modules/status/resources/images/util/splitter/mini-right.png b/html/modules/status/resources/images/util/splitter/mini-right.png
new file mode 100755
index 0000000..505c329
Binary files /dev/null and b/html/modules/status/resources/images/util/splitter/mini-right.png differ
diff --git a/html/modules/status/resources/images/util/splitter/mini-top.png b/html/modules/status/resources/images/util/splitter/mini-top.png
new file mode 100755
index 0000000..4a378a3
Binary files /dev/null and b/html/modules/status/resources/images/util/splitter/mini-top.png differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-bottom-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-bottom-corners.gif
new file mode 100755
index 0000000..920616c
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-bottom-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-bottom-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-bottom-sides.gif
new file mode 100755
index 0000000..edd9bc6
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-bottom-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-bottom-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-bottom-corners.gif
new file mode 100755
index 0000000..13f2ab8
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-bottom-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-bottom-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-bottom-sides.gif
new file mode 100755
index 0000000..edd9bc6
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-bottom-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-corners-rtl.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-corners-rtl.gif
new file mode 100755
index 0000000..b9f3b33
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-corners.gif
new file mode 100755
index 0000000..13f2ab8
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-sides.gif
new file mode 100755
index 0000000..b243204
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-left-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-corners-rtl.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-corners-rtl.gif
new file mode 100755
index 0000000..7bc50a8
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-corners.gif
new file mode 100755
index 0000000..ab2efe9
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-sides.gif
new file mode 100755
index 0000000..b243204
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-right-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-top-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-top-corners.gif
new file mode 100755
index 0000000..13f2ab8
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-top-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-collapsed-top-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-collapsed-top-sides.gif
new file mode 100755
index 0000000..edd9bc6
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-collapsed-top-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-left-corners-rtl.gif b/html/modules/status/resources/images/window-header/window-header-default-left-corners-rtl.gif
new file mode 100755
index 0000000..876bb6f
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-left-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-left-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-left-corners.gif
new file mode 100755
index 0000000..104dcb6
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-left-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-left-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-left-sides.gif
new file mode 100755
index 0000000..b243204
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-left-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-right-corners-rtl.gif b/html/modules/status/resources/images/window-header/window-header-default-right-corners-rtl.gif
new file mode 100755
index 0000000..7c19cb2
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-right-corners-rtl.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-right-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-right-corners.gif
new file mode 100755
index 0000000..8dcdd33
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-right-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-right-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-right-sides.gif
new file mode 100755
index 0000000..b243204
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-right-sides.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-top-corners.gif b/html/modules/status/resources/images/window-header/window-header-default-top-corners.gif
new file mode 100755
index 0000000..ec77a67
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-top-corners.gif differ
diff --git a/html/modules/status/resources/images/window-header/window-header-default-top-sides.gif b/html/modules/status/resources/images/window-header/window-header-default-top-sides.gif
new file mode 100755
index 0000000..edd9bc6
Binary files /dev/null and b/html/modules/status/resources/images/window-header/window-header-default-top-sides.gif differ
diff --git a/html/modules/status/resources/images/window/window-default-corners.gif b/html/modules/status/resources/images/window/window-default-corners.gif
new file mode 100755
index 0000000..3213b0d
Binary files /dev/null and b/html/modules/status/resources/images/window/window-default-corners.gif differ
diff --git a/html/modules/status/resources/images/window/window-default-sides.gif b/html/modules/status/resources/images/window/window-default-sides.gif
new file mode 100755
index 0000000..b243204
Binary files /dev/null and b/html/modules/status/resources/images/window/window-default-sides.gif differ
diff --git a/html/modules/status/resources/istsosStatus-all.css b/html/modules/status/resources/istsosStatus-all.css
new file mode 100755
index 0000000..b2c8c23
--- /dev/null
+++ b/html/modules/status/resources/istsosStatus-all.css
@@ -0,0 +1,17543 @@
+/* including package ext-theme-base */
+/**
+ * Creates a background gradient.
+ *
+ * Example usage:
+ *     .foo {
+ *          @include background-gradient(#808080, matte, left);
+ *     }
+ *
+ * @param {Color} $bg-color The background color of the gradient
+ * @param {String/List} [$type=$base-gradient] The type of gradient to be used. Can either
+ * be a String which is a predefined gradient name, or it can can be a list of color stops.
+ * If null is passed, this mixin will still set the `background-color` to $bg-color.
+ * The available predefined gradient names are:
+ *
+ * * bevel
+ * * glossy
+ * * recessed
+ * * matte
+ * * matte-reverse
+ * * panel-header
+ * * tabbar
+ * * tab
+ * * tab-active
+ * * tab-over
+ * * tab-disabled
+ * * grid-header
+ * * grid-header-over
+ * * grid-row-over
+ * * grid-cell-special
+ * * glossy-button
+ * * glossy-button-over
+ * * glossy-button-pressed
+ *
+ * Each of these gradient names corresponds to a function named linear-gradient[name].
+ * Themes can override these functions to customize the color stops that they return.
+ * For example, to override the glossy-button gradient function add a function named
+ * "linear-gradient-glossy-button" to a file named "sass/etc/mixins/background-gradient.scss"
+ * in your theme.  The function should return the result of calling the Compass linear-gradient
+ * function with the desired direction and color-stop information for the gradient.  For example:
+ *
+ *     @function linear-gradient-glossy-button($direction, $bg-color) {
+ *         @return linear-gradient($direction, color_stops(
+ *             mix(#fff, $bg-color, 10%),
+ *             $bg-color 50%,
+ *             mix(#000, $bg-color, 5%) 51%,
+ *             $bg-color
+ *         ));
+ *     }
+ *
+ * @param {String} [$direction=top] The direction of the gradient. Can either be
+ * `top` or `left`.
+ *
+ * @member Global_CSS
+ */
+/*
+ * Method which inserts a full background-image property for a theme image.
+ * It checks if the file exists and if it doesn't, it'll throw an error.
+ * By default it will not include the background-image property if it is not found,
+ * but this can be changed by changing the default value of $include-missing-images to
+ * be true.
+ */
+/* including package ext-theme-neutral */
+/* including package ext-theme-neptune */
+/* including package ext-theme-neptune */
+/**
+ * @var {boolean}
+ * True to include the "light" panel UI
+ */
+/**
+ * @var {boolean}
+ * True to include the "light-framed" panel UI
+ */
+/**
+ * @var {color} $form-field-focus-border-color
+ * In the default neptune color scheme this is the same as $base-highlight-color
+ * but it does not change automatically when one changes the $base-color.  This is because
+ * checkboxes and radio buttons have this focus color hard coded into their background
+ * images.  If this color is changed, you should also modify checkbox and radio button
+ * background images to match
+ */
+/* including package ext-theme-neutral */
+/**
+ * @class Global_CSS
+ */
+/**
+ * @var {color} $color
+ * The default text color to be used throughout the theme.
+ */
+/**
+ * @var {string} $font-family
+ * The default font-family to be used throughout the theme.
+ */
+/**
+ * @var {string} $font-size
+ * The default font-family to be used throughout the theme.
+ */
+/**
+ * @var {string} $base-gradient
+ * The base gradient to be used throughout the theme.
+ */
+/**
+ * @var {color} $base-color
+ * The base color to be used throughout the theme.
+ */
+/**
+ * @var {color} $neutral-color
+ * The neutral color to be used throughout the theme.
+ */
+/**
+ * @var {color} $body-background-color
+ * Background color to apply to the body element
+ */
+/**
+ * @class Ext.FocusManager
+ */
+/**
+ * @var {color}
+ * The border-color of the focusFrame.  See {@link #method-enable}.
+ */
+/**
+ * @var {color}
+ * The border-style of the focusFrame.  See {@link #method-enable}.
+ */
+/**
+ * @var {color}
+ * The border-width of the focusFrame.  See {@link #method-enable}.
+ */
+/**
+ * @class Ext.LoadMask
+ */
+/**
+ * @var {number}
+ * Opacity of the LoadMask
+ */
+/**
+ * @var {color}
+ * The background-color of the LoadMask
+ */
+/**
+ * @var {string}
+ * The type of cursor to dislay when the cursor is over the LoadMask
+ */
+/**
+ * @var {number/list}
+ * The padding to apply to the LoadMask's message element
+ */
+/**
+ * @var {string}
+ * The border-style of the LoadMask's message element
+ */
+/**
+ * @var {color}
+ * The border-color of the LoadMask's message element
+ */
+/**
+ * @var {number}
+ * The border-width of the LoadMask's message element
+ */
+/**
+ * @var {color}
+ * The background-color of the LoadMask's message element
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the LoadMask's message element. Can be either the name
+ * of a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {number/list}
+ * The padding of the message inner element
+ */
+/**
+ * @var {string}
+ * The icon to display in the message inner element
+ */
+/**
+ * @var {list}
+ * The background-position of the icon
+ */
+/**
+ * @var {string}
+ * The border-style of the message inner element
+ */
+/**
+ * @var {color}
+ * The border-color of the message inner element
+ */
+/**
+ * @var {number}
+ * The border-width of the message inner element
+ */
+/**
+ * @var {color}
+ * The background-color of the message inner element
+ */
+/**
+ * @var {color}
+ * The text color of the message inner element
+ */
+/**
+ * @var {number}
+ * The font-size of the message inner element
+ */
+/**
+ * @var {string}
+ * The font-weight of the message inner element
+ */
+/**
+ * @var {string}
+ * The font-family of the message inner element
+ */
+/**
+ * @var {number/list}
+ * The padding of the message element
+ */
+/**
+ * @var {number}
+ * The border-radius of the message element
+ */
+/**
+ * @class Ext.ProgressBar
+ */
+/**
+ * @var {number}
+ * The height of the ProgressBar
+ */
+/**
+ * @var {color}
+ * The border-color of the ProgressBar
+ */
+/**
+ * @var {number}
+ * The border-width of the ProgressBar
+ */
+/**
+ * @var {number}
+ * The border-radius of the ProgressBar
+ */
+/**
+ * @var {color}
+ * The background-color of the ProgressBar
+ */
+/**
+ * @var {color}
+ * The background-color of the ProgressBar's moving element
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the ProgressBar's moving element. Can be either the name of
+ * a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The color of the ProgressBar's text when in front of the ProgressBar's moving element
+ */
+/**
+ * @var {color}
+ * The color of the ProgressBar's text when the ProgressBar's 'moving element is not under it
+ */
+/**
+ * @var {string}
+ * The text-align of the ProgressBar's text
+ */
+/**
+ * @var {number}
+ * The font-size of the ProgressBar's text
+ */
+/**
+ * @var {string}
+ * The font-weight of the ProgressBar's text
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" ProgressBar UI
+ */
+/**
+ * @class Ext.button.Button
+ */
+/**
+ * @var {number}
+ * The default width for a button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default height for a button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default width for a {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default height for a {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default space between a button's icon and text
+ */
+/**
+ * @var {number}
+ * The default border-radius for a small {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default border-width for a small {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default padding for a small {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default horizontal padding to add to the left and right of the text element for
+ * a small {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default font-size for a small {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default font-size for a small {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {number}
+ * The default font-size for a small {@link #scale} button when the button is focused
+ */
+/**
+ * @var {number}
+ * The default font-size for a small {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {number}
+ * The default font-size for a small {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {string}
+ * The default font-weight for a small {@link #scale} button
+ */
+/**
+ * @var {string}
+ * The default font-weight for a small {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {string}
+ * The default font-weight for a small {@link #scale} button when the button is focused
+ */
+/**
+ * @var {string}
+ * The default font-weight for a small {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {string}
+ * The default font-weight for a small {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {string}
+ * The default font-family for a small {@link #scale} button
+ */
+/**
+ * @var {string}
+ * The default font-family for a small {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {string}
+ * The default font-family for a small {@link #scale} button when the button is focused
+ */
+/**
+ * @var {string}
+ * The default font-family for a small {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {string}
+ * The default font-family for a small {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {number}
+ * The default icon size for a small {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default width of a small {@link #scale} button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default height of a small {@link #scale} button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default width of a small {@link #scale} {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default height of a small {@link #scale} {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default border-radius for a medium {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default border-width for a medium {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default padding for a medium {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default horizontal padding to add to the left and right of the text element for
+ * a medium {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default font-size for a medium {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default font-size for a medium {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {number}
+ * The default font-size for a medium {@link #scale} button when the button is focused
+ */
+/**
+ * @var {number}
+ * The default font-size for a medium {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {number}
+ * The default font-size for a medium {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {string}
+ * The default font-weight for a medium {@link #scale} button
+ */
+/**
+ * @var {string}
+ * The default font-weight for a medium {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {string}
+ * The default font-weight for a medium {@link #scale} button when the button is focused
+ */
+/**
+ * @var {string}
+ * The default font-weight for a medium {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {string}
+ * The default font-weight for a medium {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {string}
+ * The default font-family for a medium {@link #scale} button
+ */
+/**
+ * @var {string}
+ * The default font-family for a medium {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {string}
+ * The default font-family for a medium {@link #scale} button when the button is focused
+ */
+/**
+ * @var {string}
+ * The default font-family for a medium {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {string}
+ * The default font-family for a medium {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {number}
+ * The default icon size for a medium {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default width of a medium {@link #scale} button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default height of a medium {@link #scale} button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default width of a medium {@link #scale} {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default height of a medium {@link #scale} {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default border-radius for a large {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default border-width for a large {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default padding for a large {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default horizontal padding to add to the left and right of the text element for
+ * a large {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default font-size for a large {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default font-size for a large {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {number}
+ * The default font-size for a large {@link #scale} button when the button is focused
+ */
+/**
+ * @var {number}
+ * The default font-size for a large {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {number}
+ * The default font-size for a large {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {string}
+ * The default font-weight for a large {@link #scale} button
+ */
+/**
+ * @var {string}
+ * The default font-weight for a large {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {string}
+ * The default font-weight for a large {@link #scale} button when the button is focused
+ */
+/**
+ * @var {string}
+ * The default font-weight for a large {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {string}
+ * The default font-weight for a large {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {string}
+ * The default font-family for a large {@link #scale} button
+ */
+/**
+ * @var {string}
+ * The default font-family for a large {@link #scale} button when the cursor is over the button
+ */
+/**
+ * @var {string}
+ * The default font-family for a large {@link #scale} button when the button is focused
+ */
+/**
+ * @var {string}
+ * The default font-family for a large {@link #scale} button when the button is pressed
+ */
+/**
+ * @var {string}
+ * The default font-family for a large {@link #scale} button when the button is disabled
+ */
+/**
+ * @var {number}
+ * The default icon size for a large {@link #scale} button
+ */
+/**
+ * @var {number}
+ * The default width of a large {@link #scale} button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default height of a large {@link #scale} button's {@link #cfg-menu} arrow
+ */
+/**
+ * @var {number}
+ * The default width of a large {@link #scale} {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {number}
+ * The default height of a large {@link #scale} {@link Ext.button.Split Split Button}'s arrow
+ */
+/**
+ * @var {color}
+ * The base color for the `default` button UI
+ */
+/**
+ * @var {color}
+ * The base color for the `default` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The base color for the `default` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The base color for the `default` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The base color for the `default` button UI when the button is disabled
+ */
+/**
+ * @var {color}
+ * The border-color for the `default` button UI
+ */
+/**
+ * @var {color}
+ * The border-color for the `default` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The border-color for the `default` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The border-color for the `default` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The border-color for the `default` button UI when the button is disabled
+ */
+/**
+ * @var {color}
+ * The background-color for the `default` button UI
+ */
+/**
+ * @var {color}
+ * The background-color for the `default` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The background-color for the `default` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The background-color for the `default` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The background-color for the `default` button UI when the button is disabled
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default` button UI.  Can be either the name of a
+ * predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default` button UI when the cursor is over the button.
+ * Can be either the name of a predefined gradient or a list of color stops. Used as the
+ * `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default` button UI when the button is focused.  Can be
+ * either the name of a predefined gradient or a list of color stops. Used as the `$type`
+ * parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default` button UI when the button is pressed.  Can be
+ * either the name of a predefined gradient or a list of color stops. Used as the `$type`
+ * parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default` button UI when the button is disabled.  Can be
+ * either the name of a predefined gradient or a list of color stops. Used as the `$type`
+ * parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The text color for the `default` button UI
+ */
+/**
+ * @var {color}
+ * The text color for the `default` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The text color for the `default` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The text color for the `default` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The text color for the `default` button UI when the button is disabled
+ */
+/**
+ * @var {color}
+ * The color of the {@link #glyph} icon for the `default` button UI
+ */
+/**
+ * @var {color}
+ * The opacity of the {@link #glyph} icon for the `default` button UI
+ */
+/**
+ * @var {color}
+ * The border-color for the `default-toolbar` button UI
+ */
+/**
+ * @var {color}
+ * The border-color for the `default-toolbar` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The border-color for the `default-toolbar` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The border-color for the `default-toolbar` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The border-color for the `default-toolbar` button UI when the button is disabled
+ */
+/**
+ * @var {color}
+ * The background-color for the `default-toolbar` button UI
+ */
+/**
+ * @var {color}
+ * The background-color for the `default-toolbar` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The background-color for the `default-toolbar` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The background-color for the `default-toolbar` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The background-color for the `default-toolbar` button UI when the button is disabled
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default-toolbar` button UI.  Can be either the name of
+ * a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default-toolbar` button UI when the cursor is over the
+ * button. Can be either the name of a predefined gradient or a list of color stops. Used
+ * as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default-toolbar` button UI when the button is focused.
+ * Can be either the name of a predefined gradient or a list of color stops. Used as the
+ * `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default-toolbar` button UI when the button is pressed.
+ * Can be either the name of a predefined gradient or a list of color stops. Used as the
+ * `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the `default-toolbar` button UI when the button is disabled.
+ * Can be either the name of a predefined gradient or a list of color stops. Used as the
+ * `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The text color for the `default-toolbar` button UI
+ */
+/**
+ * @var {color}
+ * The text color for the `default-toolbar` button UI when the cursor is over the button
+ */
+/**
+ * @var {color}
+ * The text color for the `default-toolbar` button UI when the button is focused
+ */
+/**
+ * @var {color}
+ * The text color for the `default-toolbar` button UI when the button is pressed
+ */
+/**
+ * @var {color}
+ * The text color for the `default-toolbar` button UI when the button is disabled
+ */
+/**
+ * @var {color}
+ * The color of the {@link #glyph} icon for the `default-toolbar` button UI
+ */
+/**
+ * @var {color}
+ * The opacity of the {@link #glyph} icon for the `default-toolbar` button UI
+ */
+/**
+ * @var {boolean} $button-include-ui-menu-arrows
+ * True to use a different image url for the menu button arrows for each button UI
+ */
+/**
+ * @var {boolean} $button-include-ui-split-arrows
+ * True to use a different image url for the split button arrows for each button UI
+ */
+/**
+ * @var {boolean} $button-include-split-over-arrows
+ * True to include different split arrows for buttons' hover state.
+ */
+/**
+ * @var {boolean} $button-toolbar-include-split-noline-arrows
+ * True to include "noline" split arrows for toolbar buttons in their default state.
+ */
+/**
+ * @var {number} $button-opacity-disabled
+ * opacity to apply to the button's main element when the buton is disabled
+ */
+/**
+ * @var {number} $button-inner-opacity-disabled
+ * opacity to apply to the button's inner elements (icon and text) when the buton is disabled
+ */
+/**
+ * @var {number} $button-toolbar-opacity-disabled
+ * opacity to apply to the toolbar button's main element when the buton is disabled
+ */
+/**
+ * @var {number} $button-toolbar-inner-opacity-disabled
+ * opacity to apply to the toolbar button's inner elements (icon and text) when the buton is disabled
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" button UI
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" button UI for "small" scale buttons
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" button UI for "medium" scale buttons
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" button UI for "large" scale buttons
+ */
+/**
+ * @var {boolean}
+ * True to include the "default-toolbar" button UI
+ */
+/**
+ * @var {boolean}
+ * True to include the "default-toolbar" button UI for "small" scale buttons
+ */
+/**
+ * @var {boolean}
+ * True to include the "default-toolbar" button UI for "medium" scale buttons
+ */
+/**
+ * @var {boolean}
+ * True to include the "default-toolbar" button UI for "large" scale buttons
+ */
+/**
+ * @class Ext.toolbar.Toolbar
+ */
+/**
+ * @var {number}
+ * The default font-size of Toolbar text
+ */
+/**
+ * @var {color}
+ * The background-color of the Toolbar
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the Toolbar.  Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {number}
+ * The horizontal spacing of Toolbar items
+ */
+/**
+ * @var {number}
+ * The vertical spacing of Toolbar items
+ */
+/**
+ * @var {number}
+ * The horizontal spacing of {@link Ext.panel.Panel#fbar footer} Toolbar items
+ */
+/**
+ * @var {number}
+ * The vertical spacing of {@link Ext.panel.Panel#fbar footer} Toolbar items
+ */
+/**
+ * @var {color}
+ * The background-color of {@link Ext.panel.Panel#fbar footer} Toolbars
+ */
+/**
+ * @var {number}
+ * The border-width of {@link Ext.panel.Panel#fbar footer} Toolbars
+ */
+/**
+ * @var {number/list}
+ * The margin of {@link Ext.panel.Panel#fbar footer} Toolbars
+ */
+/**
+ * @var {color}
+ * The border-color of Toolbars
+ */
+/**
+ * @var {number}
+ * The border-width of Toolbars
+ */
+/**
+ * @var {string}
+ * The border-style of Toolbars
+ */
+/**
+ * @var {number}
+ * The width of Toolbar {@link Ext.toolbar.Spacer Spacers}
+ */
+/**
+ * @var {color}
+ * The main border-color of Toolbar {@link Ext.toolbar.Separator Separators}
+ */
+/**
+ * @var {color}
+ * The highlight border-color of Toolbar {@link Ext.toolbar.Separator Separators}
+ */
+/**
+ * @var {number/list}
+ * The margin of {@link Ext.toolbar.Separator Separators} on a horizontally oriented Toolbar
+ */
+/**
+ * @var {number}
+ * The height of {@link Ext.toolbar.Separator Separators} on a horizontally oriented Toolbar
+ */
+/**
+ * @var {string}
+ * The border-style of {@link Ext.toolbar.Separator Separators} on a horizontally oriented Toolbar
+ */
+/**
+ * @var {number}
+ * The border-width of {@link Ext.toolbar.Separator Separators} on a horizontally oriented Toolbar
+ */
+/**
+ * @var {number/list}
+ * The margin of {@link Ext.toolbar.Separator Separators} on a vertically oriented Toolbar
+ */
+/**
+ * @var {string}
+ * The border-style of {@link Ext.toolbar.Separator Separators} on a vertically oriented Toolbar
+ */
+/**
+ * @var {number}
+ * The border-width of {@link Ext.toolbar.Separator Separators} on a vertically oriented Toolbar
+ */
+/**
+ * @var {string}
+ * The default font-family of Toolbar text
+ */
+/**
+ * @var {number}
+ * The default font-size of Toolbar text
+ */
+/**
+ * @var {number}
+ * The default font-size of Toolbar text
+ */
+/**
+ * @var {number/list}
+ * The margin of Toolbar text
+ */
+/**
+ * @var {color}
+ * The text-color of Toolbar text
+ */
+/**
+ * @var {number/list}
+ * The padding of Toolbar text
+ */
+/**
+ * @var {number}
+ * The line-height of Toolbar text
+ */
+/**
+ * @var {number}
+ * The width of Toolbar scrollers
+ */
+/**
+ * @var {number}
+ * The height of Toolbar scrollers
+ */
+/**
+ * @var {color}
+ * The border-color of Toolbar scrollers
+ */
+/**
+ * @var {number}
+ * The border-width of Toolbar scrollers
+ */
+/**
+ * @var {string}
+ * The cursor of Toolbar scrollers
+ */
+/**
+ * @var {string}
+ * The cursor of disabled Toolbar scrollers
+ */
+/**
+ * @var {number}
+ * The opacity of disabled Toolbar scrollers
+ */
+/**
+ * @var {string}
+ * The sprite to use for {@link Ext.panel.Tool Tools} on a Toolbar
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" toolbar UI
+ */
+/**
+ * @class Ext.panel.Panel
+ */
+/**
+ * @var {number}
+ * The default border-width of Panels
+ */
+/**
+ * @var {color}
+ * The base color of Panels
+ */
+/**
+ * @var {color}
+ * The default border-color of Panels
+ */
+/**
+ * @var {$border-width-threshold}
+ * The maximum width a Panel's border can be before resizer handles are embedded into the borders using negative absolute positions.
+ *
+ * This defaults to 2, so that in the classic theme which uses 1 pixel borders, resize handles are in the content area
+ * within the border as they always have been.
+ *
+ * In the Neptune theme, the handles are embedded into the 5 pixel wide borders of any framed panel.
+ */
+/**
+ * @var {string}
+ * The default border-style of Panels
+ */
+/**
+ * @var {color}
+ * The default body background-color of Panels
+ */
+/**
+ * @var {color}
+ * The default color of text inside a Panel's body
+ */
+/**
+ * @var {color}
+ * The default border-color of the Panel body
+ */
+/**
+ * @var {number}
+ * The default border-width of the Panel body
+ */
+/**
+ * @var {number}
+ * The default font-size of the Panel body
+ */
+/**
+ * @var {string}
+ * The default font-weight of the Panel body
+ */
+/**
+ * @var {number}
+ * The space between the Panel {@link Ext.panel.Tool Tools}
+ */
+/**
+ * @var {string}
+ * The background sprite to use for Panel {@link Ext.panel.Tool Tools}
+ */
+/**
+ * @var {number}
+ * The border-width of Panel Headers
+ */
+/**
+ * @var {string}
+ * The border-style of Panel Headers
+ */
+/**
+ * @var {number/list}
+ * The padding of Panel Headers
+ */
+/**
+ * @var {number}
+ * The font-size of Panel Headers
+ */
+/**
+ * @var {number}
+ * The line-height of Panel Headers
+ */
+/**
+ * @var {string}
+ * The font-weight of Panel Headers
+ */
+/**
+ * @var {string}
+ * The font-family of Panel Headers
+ */
+/**
+ * @var {string}
+ * The text-transform of Panel Headers
+ */
+/**
+ * @var {number/list}
+ * The padding of the Panel Header's text element
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the Panel Header. Can be either the name of a predefined
+ * gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The border-color of the Panel Header
+ */
+/**
+ * @var {color}
+ * The inner border-color of the Panel Header
+ */
+/**
+ * @var {number}
+ * The inner border-width of the Panel Header
+ */
+/**
+ * @var {color}
+ * The text color of the Panel Header
+ */
+/**
+ * @var {color}
+ * The background-color of the Panel Header
+ */
+/**
+ * @var {number}
+ * The width of the Panel Header icon
+ */
+/**
+ * @var {number}
+ * The height of the Panel Header icon
+ */
+/**
+ * @var {number}
+ * The space between the Panel Header icon and text
+ */
+/**
+ * @var {list}
+ * The background-position of  the Panel Header icon
+ */
+/**
+ * @var {color}
+ * The color of the Panel Header glyph icon
+ */
+/**
+ * @var {number}
+ * The opacity of the Panel Header glyph icon
+ */
+/**
+ * @var {color}
+ * The base color of the framed Panels
+ */
+/**
+ * @var {number}
+ * The border-radius of framed Panels
+ */
+/**
+ * @var {number}
+ * The border-width of framed Panels
+ */
+/**
+ * @var {string}
+ * The border-style of framed Panels
+ */
+/**
+ * @var {number}
+ * The padding of framed Panels
+ */
+/**
+ * @var {color}
+ * The background-color of framed Panels
+ */
+/**
+ * @var {color}
+ * The border-color of framed Panels
+ */
+/**
+ * @var {number}
+ * The border-width of the body element of framed Panels
+ */
+/**
+ * @var {number}
+ * The border-width of framed Panel Headers
+ */
+/**
+ * @var {color}
+ * The inner border-color of framed Panel Headers
+ */
+/**
+ * @var {number}
+ * The inner border-width of framed Panel Headers
+ */
+/**
+ * @var {number/list}
+ * The padding of framed Panel Headers
+ */
+/**
+ * @var {number}
+ * The opacity of ghost Panels while dragging
+ */
+/**
+ * @var {string}
+ * The direction to strech the background-gradient of top docked Headers when slicing images
+ * for IE using Sencha Cmd
+ */
+/**
+ * @var {string}
+ * The direction to strech the background-gradient of bottom docked Headers when slicing images
+ * for IE using Sencha Cmd
+ */
+/**
+ * @var {string}
+ * The direction to strech the background-gradient of right docked Headers when slicing images
+ * for IE using Sencha Cmd
+ */
+/**
+ * @var {string}
+ * The direction to strech the background-gradient of left docked Headers when slicing images
+ * for IE using Sencha Cmd
+ */
+/**
+ * @var {boolean}
+ * True to include neptune style border management rules.
+ */
+/**
+ * @var {color}
+ * The color to apply to the border that wraps the body and docked items in a framed
+ * panel. The presence of the wrap border in a framed panel is controlled by the
+ * {@link #border} config. Only applicable when `$panel-include-border-management-rules` is
+ * `true`.
+ */
+/**
+ * @var {number}
+ * The width to apply to the border that wraps the body and docked items in a framed
+ * panel. The presence of the wrap border in a framed panel is controlled by the
+ * {@link #border} config. Only applicable when `$panel-include-border-management-rules` is
+ * `true`.
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" panel UI
+ */
+/**
+ * @var {boolean}
+ * True to include the "default-framed" panel UI
+ */
+/**
+ * @class Ext.tip.Tip
+ */
+/**
+ * @var {color}
+ * The background-color of the Tip
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the Tip. Can be either the name of a predefined gradient or a
+ * list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The text color of the Tip body
+ */
+/**
+ * @var {number}
+ * The font-size of the Tip body
+ */
+/**
+ * @var {string}
+ * The font-weight of the Tip body
+ */
+/**
+ * @var {number/list}
+ * The padding of the Tip body
+ */
+/**
+ * @var {color}
+ * The text color of any anchor tags inside the Tip body
+ */
+/**
+ * @var {color}
+ * The text color of the Tip header
+ */
+/**
+ * @var {number}
+ * The font-size of the Tip header
+ */
+/**
+ * @var {string}
+ * The font-weight of the Tip header
+ */
+/**
+ * @var {number/list}
+ * The padding of the Tip header's body element
+ */
+/**
+ * @var {color}
+ * The border-color of the Tip
+ */
+/**
+ * @var {number}
+ * The border-width of the Tip
+ */
+/**
+ * @var {number}
+ * The border-radius of the Tip
+ */
+/**
+ * @var {color}
+ * The inner border-color of the form field error Tip
+ */
+/**
+ * @var {number}
+ * The inner border-width of the form field error Tip
+ */
+/**
+ * @var {color}
+ * The border-color of the form field error Tip
+ */
+/**
+ * @var {number}
+ * The border-radius of the form field error Tip
+ */
+/**
+ * @var {number}
+ * The border-width of the form field error Tip
+ */
+/**
+ * @var {color}
+ * The background-color of the form field error Tip
+ */
+/**
+ * @var {number/list}
+ * The padding of the form field error Tip's body element
+ */
+/**
+ * @var {color}
+ * The text color of the form field error Tip's body element
+ */
+/**
+ * @var {number}
+ * The font-size of the form field error Tip's body element
+ */
+/**
+ * @var {string}
+ * The font-weight of the form field error Tip's body element
+ */
+/**
+ * @var {color}
+ * The color of anchor tags in the form field error Tip's body element
+ */
+/**
+ * @var {number}
+ * The space between {@link Ext.panel.Tool Tools} in the header
+ */
+/**
+ * @var {string}
+ * The sprite to use for the header {@link Ext.panel.Tool Tools}
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" tip UI
+ */
+/**
+ * @var {boolean}
+ * True to include the "form-invalid" tip UI
+ */
+/**
+ * @class Ext.container.ButtonGroup
+ */
+/**
+ * @var {color}
+ * The background-color of the ButtonGroup
+ */
+/**
+ * @var {color}
+ * The border-color of the ButtonGroup
+ */
+/**
+ * @var {number}
+ * The border-radius of the ButtonGroup
+ */
+/**
+ * @var {number}
+ * The border-radius of framed ButtonGroups
+ */
+/**
+ * @var {number}
+ * The border-width of the ButtonGroup
+ */
+/**
+ * @var {number/list}
+ * The body padding of the ButtonGroup
+ */
+/**
+ * @var {number/list}
+ * The inner border-width of the ButtonGroup
+ */
+/**
+ * @var {color}
+ * The inner border-color of the ButtonGroup
+ */
+/**
+ * @var {number/list}
+ * The margin of the header element. Used to add space around the header.
+ */
+/**
+ * @var {number}
+ * The font-size of the header
+ */
+/**
+ * @var {number}
+ * The font-weight of the header
+ */
+/**
+ * @var {number}
+ * The font-family of the header
+ */
+/**
+ * @var {number}
+ * The line-height of the header
+ */
+/**
+ * @var {number}
+ * The text color of the header
+ */
+/**
+ * @var {number}
+ * The padding of the header
+ */
+/**
+ * @var {number}
+ * The background-color of the header
+ */
+/**
+ * @var {number}
+ * The border-spacing to use on the table layout element
+ */
+/**
+ * @var {number}
+ * The background-color of framed ButtonGroups
+ */
+/**
+ * @var {number}
+ * The border-width of framed ButtonGroups
+ */
+/**
+ * @var {string}
+ * Sprite image to use for header {@link Ext.panel.Tool Tools}
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" button group UI
+ */
+/**
+ * @var {boolean}
+ * True to include the "default-framed" button group UI
+ */
+/**
+ * @class Ext.window.Window
+ */
+/**
+ * @var {color}
+ * The base color of Windows
+ */
+/**
+ * @var {number}
+ * The padding of Windows
+ */
+/**
+ * @var {number}
+ * The border-radius of Windows
+ */
+/**
+ * @var {number}
+ * The border-width of Windows
+ */
+/**
+ * @var {color}
+ * The border-color of Windows
+ */
+/**
+ * @var {color}
+ * The inner border-color of Windows
+ */
+/**
+ * @var {number}
+ * The inner border-width of Windows
+ */
+/**
+ * @var {color}
+ * The background-color of Windows
+ */
+/**
+ * @var {number}
+ * The body border-width of Windows
+ */
+/**
+ * @var {string}
+ * The body border-style of Windows
+ */
+/**
+ * @var {color}
+ * The body border-color of Windows
+ */
+/**
+ * @var {color}
+ * The body background-color of Windows
+ */
+/**
+ * @var {color}
+ * The body text color of Windows
+ */
+/**
+ * @var {number/list}
+ * The padding of Window Headers
+ */
+/**
+ * @var {number}
+ * The font-size of Window Headers
+ */
+/**
+ * @var {number}
+ * The line-height of Window Headers
+ */
+/**
+ * @var {color}
+ * The text color of Window Headers
+ */
+/**
+ * @var {color}
+ * The background-color of Window Headers
+ */
+/**
+ * @var {string}
+ * The font-weight of Window Headers
+ */
+/**
+ * @var {number}
+ * The space between the Window {@link Ext.panel.Tool Tools}
+ */
+/**
+ * @var {string}
+ * The background sprite to use for Window {@link Ext.panel.Tool Tools}
+ */
+/**
+ * @var {string}
+ * The font-family of Window Headers
+ */
+/**
+ * @var {number/list}
+ * The padding of the Window Header's text element
+ */
+/**
+ * @var {string}
+ * The text-transform of Window Headers
+ */
+/**
+ * @var {number}
+ * The width of the Window Header icon
+ */
+/**
+ * @var {number}
+ * The height of the Window Header icon
+ */
+/**
+ * @var {number}
+ * The space between the Window Header icon and text
+ */
+/**
+ * @var {list}
+ * The background-position of  the Window Header icon
+ */
+/**
+ * @var {color}
+ * The color of the Window Header glyph icon
+ */
+/**
+ * @var {number}
+ * The opacity of the Window Header glyph icon
+ */
+/**
+ * @var {number}
+ * The border-width of Window Headers
+ */
+/**
+ * @var {color}
+ * The inner border-color of Window Headers
+ */
+/**
+ * @var {number}
+ * The inner border-width of Window Headers
+ */
+/**
+ * @var {boolean} $ui-force-header-border
+ * True to force the window header to have a border on the side facing the window body.
+ * Overrides dock layout's border management border removal rules.
+ */
+/**
+ * @var {number}
+ * The opacity of ghost Windows while dragging
+ */
+/**
+ * @var {boolean}
+ * True to include neptune style border management rules.
+ */
+/**
+ * @var {color}
+ * The color to apply to the border that wraps the body and docked items. The presence of
+ * the wrap border is controlled by the {@link #border} config. Only applicable when
+ * `$window-include-border-management-rules` is `true`.
+ */
+/**
+ * @var {number}
+ * The width to apply to the border that wraps the body and docked items. The presence of
+ * the wrap border is controlled by the {@link #border} config. Only applicable when
+ * `$window-include-border-management-rules` is `true`.
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" window UI
+ */
+/**
+ * @class Ext.form.Labelable
+ */
+/**
+ * @var {color}
+ * The text color of form field labels
+ */
+/**
+ * @var {string}
+ * The font-weight of form field labels
+ */
+/**
+ * @var {number}
+ * The font-size of form field labels
+ */
+/**
+ * @var {string}
+ * The font-family of form field labels
+ */
+/**
+ * @var {number}
+ * The line-height of form field labels
+ */
+/**
+ * @var {color}
+ * The text color of toolbar field labels
+ */
+/**
+ * @var {string}
+ * The font-weight of toolbar field labels
+ */
+/**
+ * @var {number}
+ * The font-size of toolbar field labels
+ */
+/**
+ * @var {string}
+ * The font-family of toolbar field labels
+ */
+/**
+ * @var {number}
+ * The line-height of toolbar field labels
+ */
+/**
+ * @var {number}
+ * Width for form error icons.
+ */
+/**
+ * @var {number}
+ * Height for form error icons.
+ */
+/**
+ * @var {number/list}
+ * Margin for error icons that are aligned to the side of the field
+ */
+/**
+ * @var {number}
+ * The space between the icon and the message for errors that display under the field
+ */
+/**
+ * @var {number/list}
+ * The padding on errors that display under the form field
+ */
+/**
+ * @var {color}
+ * The text color of form error messages
+ */
+/**
+ * @var {string}
+ * The font-weight of form error messages
+ */
+/**
+ * @var {number}
+ * The font-size of form error messages
+ */
+/**
+ * @var {string}
+ * The font-family of form error messages
+ */
+/**
+ * @var {number}
+ * The line-height of form error messages
+ */
+/**
+ * @var {measurement} $form-item-margin-bottom
+ * The bottom margin to apply to form items when in auto, anchor, vbox, or table layout
+ */
+/**
+ * @class Ext.form.field.Base
+ */
+/**
+ * @var {number} $form-field-height
+ * Height for form fields.
+ */
+/**
+ * @var {number} $form-toolbar-field-height
+ * Height for form fields in toolbar.
+ */
+/**
+ * @var {number} $form-field-padding
+ * Padding around form fields.
+ */
+/**
+ * @var {number} $form-field-font-size
+ * Font size for form fields.
+ */
+/**
+ * @var {string} $form-field-font-family
+ * Font family for form fields.
+ */
+/**
+ * @var {string} $form-field-font-weight
+ * Font weight for form fields.
+ */
+/**
+ * @var {font} $form-field-font
+ * Font for form fields.
+ */
+/**
+ * @var {number} $form-toolbar-field-font-size
+ * Font size for toolbar form fields.
+ */
+/**
+ * @var {string} $form-toolbar-field-font-family
+ * Font family for toolbar form fields.
+ */
+/**
+ * @var {string} $form-toolbar-field-font-weight
+ * Font weight for toolbar form fields.
+ */
+/**
+ * @var {font} $form-toolbar-field-font
+ * Font for toolbar form fields.
+ */
+/**
+ * @var {color} $form-field-color
+ * Text color for form fields.
+ */
+/**
+ * @var {color} $form-field-empty-color
+ * Text color for empty form fields.
+ */
+/**
+ * @var {color} $form-field-border-color
+ * Border color for form fields.
+ */
+/**
+ * @var {number} $form-field-border-width
+ * Border width for form fields.
+ */
+/**
+ * @var {string} $form-field-border-style
+ * Border style for form fields.
+ */
+/**
+ * @var {color} $form-field-focus-border-color
+ * Border color for focused form fields.
+ */
+/**
+ * @var {color} $form-field-invalid-border-color
+ * Border color for invalid form fields.
+ */
+/**
+ * @var {color} $form-field-background-color
+ * Background color for form fields.
+ */
+/**
+ * @var {string} $form-field-background-image
+ * Background image for form fields.
+ */
+/**
+ * @var {color} $form-field-invalid-background-color
+ * Background color for invalid form fields.
+ */
+/**
+ * @var {string} $form-field-invalid-background-image
+ * Background image for invalid form fields.
+ */
+/**
+ * @var {string} $form-field-invalid-background-repeat
+ * Background repeat for invalid form fields.
+ */
+/**
+ * @var {string/list} $form-field-invalid-background-position
+ * Background position for invalid form fields.
+ */
+/**
+ * @var {number} $form-field-disabled-opacity
+ */
+/**
+ * @class Ext.form.field.TextArea
+ */
+/**
+ * @var {number/string}
+ * The line-height to use for the TextArea's text
+ */
+/**
+ * @class Ext.form.field.Display
+ */
+/**
+ * @var {color}
+ * The text color of display fields
+ */
+/**
+ * @var {string}
+ * The font-weight of display fields
+ */
+/**
+ * @var {number}
+ * The font-size of display fields
+ */
+/**
+ * @var {string}
+ * The font-family of display fields
+ */
+/**
+ * @var {number}
+ * The line-height of display fields
+ */
+/**
+ * @var {string}
+ * The font-weight of toolbar display fields
+ */
+/**
+ * @var {number}
+ * The font-size of toolbar display fields
+ */
+/**
+ * @var {string}
+ * The font-family of toolbar display fields
+ */
+/**
+ * @var {number}
+ * The line-height of toolbar display fields
+ */
+/**
+ * @class Ext.window.MessageBox
+ */
+/**
+ * @var {color}
+ * The background-color of the MessageBox body
+ */
+/**
+ * @var {number}
+ * The border-width of the MessageBox body
+ */
+/**
+ * @var {color}
+ * The border-color of the MessageBox body
+ */
+/**
+ * @var {string}
+ * The border-style of the MessageBox body
+ */
+/**
+ * @var {list}
+ * The background-position of the MessageBox icon
+ */
+/**
+ * @class Ext.form.field.Checkbox
+ */
+/**
+ * @var {number}
+ * The size of the checkbox
+ */
+/**
+ * @var {number}
+ * The space between the boxLabel and the checkbox.
+ */
+/**
+ * @class Ext.form.CheckboxGroup
+ */
+/**
+ * @var {number/list}
+ * The padding of the CheckboxGroup body element
+ */
+/**
+ * @var {color}
+ * The text color of the CheckboxGroup label
+ */
+/**
+ * @var {number}
+ * The padding of the CheckboxGroup label
+ */
+/**
+ * @var {number}
+ * The margin of the CheckboxGroup label
+ */
+/**
+ * @var {number}
+ * The border-width of the CheckboxGroup label
+ */
+/**
+ * @var {number}
+ * The border-style of the CheckboxGroup label
+ */
+/**
+ * @var {number}
+ * The border-color of the CheckboxGroup label
+ */
+/**
+ * @class Ext.form.FieldSet
+ */
+/**
+ * @var {number}
+ * The font-size of the FieldSet header
+ */
+/**
+ * @var {string}
+ * The font-weight of the FieldSet header
+ */
+/**
+ * @var {string}
+ * The font-family of the FieldSet header
+ */
+/**
+ * @var {number/string}
+ * The line-height of the FieldSet header
+ */
+/**
+ * @var {color}
+ * The text color of the FieldSet header
+ */
+/**
+ * @var {number}
+ * The border-width of the FieldSet
+ */
+/**
+ * @var {string}
+ * The border-style of the FieldSet
+ */
+/**
+ * @var {color}
+ * The border-color of the FieldSet
+ */
+/**
+ * @var {number/list}
+ * The FieldSet's padding
+ */
+/**
+ * @var {number/list}
+ * The FieldSet's margin
+ */
+/**
+ * @var {number/list}
+ * The padding to apply to the FieldSet's header
+ */
+/**
+ * @var {number/list}
+ * The margin to apply to the FieldSet's collapse tool
+ */
+/**
+ * @var {number/list}
+ * The padding to apply to the FieldSet's collapse tool
+ */
+/**
+ * @var {number/list}
+ * The margin to apply to the FieldSet's checkbox (for FieldSets that use
+ * {@link #checkboxToggle})
+ */
+/**
+ * @var {number}
+ * The size of the FieldSet's collapse tool
+ */
+/**
+ * @var {string} $fieldset-collapse-tool-background-image
+ * The background-image to use for the collapse tool. If null the default tool
+ * sprite will be used.  Defaults to null.
+ */
+/**
+ * @class Ext.form.field.Radio
+ */
+/**
+ * @var {number}
+ * The size of the radio button
+ */
+/**
+ * @class Ext.form.field.Trigger
+ */
+/**
+ * @var {number}
+ * The width of the Trigger field's trigger element
+ */
+/**
+ * @var {number/list}
+ * The width of the trigger's border
+ */
+/**
+ * @var {color}
+ * The color of the trigger's border
+ */
+/**
+ * @var {string}
+ * The style of the trigger's border
+ */
+/**
+ * @var {color}
+ * The color of the trigger's border when hovered
+ */
+/**
+ * @var {color}
+ * The color of the trigger's border when the field is focused
+ */
+/**
+ * @var {color}
+ * The color of the trigger's border when the field is focused and the trigger is hovered
+ */
+/**
+ * @class Ext.form.field.Spinner
+ */
+/**
+ * @var {number}
+ * The height of the Spinner trigger buttons
+ */
+/**
+ * @var {number}
+ * The height of the Spinner trigger buttons when the Spinner is used on a
+ * {@link Ext.toolbar.Toolbar Toolbar}
+ */
+/**
+ * @class Ext.toolbar.Paging
+ */
+/**
+ * @var {boolean}
+ * True to include different icons when the paging toolbar buttons are disabled.
+ */
+/**
+ * @class Ext.view.BoundList
+ */
+/**
+ * @var {color}
+ * The background-color of the BoundList
+ */
+/**
+ * @var {color}
+ * The border-color of the BoundList
+ */
+/**
+ * @var {number}
+ * The border-width of the BoundList
+ */
+/**
+ * @var {string}
+ * The border-style of the BoundList
+ */
+/**
+ * @var {number}
+ * The height of BoundList items
+ */
+/**
+ * @var {number/list}
+ * The padding of BoundList items
+ */
+/**
+ * @var {number}
+ * The border-width of BoundList items
+ */
+/**
+ * @var {string}
+ * The border-style of BoundList items
+ */
+/**
+ * @var {color}
+ * The border-color of BoundList items
+ */
+/**
+ * @var {color}
+ * The border-color of hovered BoundList items
+ */
+/**
+ * @var {color}
+ * The border-color of selected BoundList items
+ */
+/**
+ * @var {color}
+ * The background-color of hovered BoundList items
+ */
+/**
+ * @var {color}
+ * The background-color of selected BoundList items
+ */
+/**
+ * @class Ext.picker.Date
+ */
+/**
+ * @var {number}
+ * The border-width of the DatePicker
+ */
+/**
+ * @var {string}
+ * The border-style of the DatePicker
+ */
+/**
+ * @var {color}
+ * The background-color of the DatePicker
+ */
+/**
+ * @var {string}
+ * The background-image of the DatePicker next arrow
+ */
+/**
+ * @var {string}
+ * The background-image of the DatePicker previous arrow
+ */
+/**
+ * @var {number}
+ * The width of DatePicker arrows
+ */
+/**
+ * @var {number}
+ * The height of DatePicker arrows
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over a DatePicker arrow
+ */
+/**
+ * @var {number}
+ * The opacity of the DatePicker arrows
+ */
+/**
+ * @var {number}
+ * The opacity of the DatePicker arrows when hovered
+ */
+/**
+ * @var {string/list}
+ * The Date Picker header background gradient. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {number/list}
+ * The padding of the Date Picker header
+ */
+/**
+ * @var {color}
+ * The color of the Date Picker month button
+ */
+/**
+ * @var {number}
+ * The width of the arrow on the Date Picker month button
+ */
+/**
+ * @var {string}
+ * The background-image of the arrow on the Date Picker month button
+ */
+/**
+ * @var {boolean}
+ * True to render the month button as transparent
+ */
+/**
+ * @var {string}
+ * The text-align of the Date Picker header
+ */
+/**
+ * @var {number}
+ * The height of Date Picker items
+ */
+/**
+ * @var {number}
+ * The width of Date Picker items
+ */
+/**
+ * @var {number/list}
+ * The padding of Date Picker items
+ */
+/**
+ * @var {string}
+ * The font-family of Date Picker items
+ */
+/**
+ * @var {number}
+ * The font-size of Date Picker items
+ */
+/**
+ * @var {string}
+ * The font-weight of Date Picker items
+ */
+/**
+ * @var {string}
+ * The text-align of Date Picker items
+ */
+/**
+ * @var {color}
+ * The text color of Date Picker items
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over a Date Picker item
+ */
+/**
+ * @var {string}
+ * The font-family of Date Picker column headers
+ */
+/**
+ * @var {number}
+ * The font-size of Date Picker column headers
+ */
+/**
+ * @var {string}
+ * The font-weight of Date Picker column headers
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of Date Picker column headers. Can be either the name of a
+ * predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string}
+ * The border-style of Date Picker column headers
+ */
+/**
+ * @var {number}
+ * The border-width of Date Picker column headers
+ */
+/**
+ * @var {string}
+ * The text-align of Date Picker column headers
+ */
+/**
+ * @var {number}
+ * The height of Date Picker column headers
+ */
+/**
+ * @var {number/list}
+ * The padding of Date Picker column headers
+ */
+/**
+ * @var {number}
+ * The border-width of Date Picker items
+ */
+/**
+ * @var {string}
+ * The border-style of Date Picker items
+ */
+/**
+ * @var {color}
+ * The border-color of Date Picker items
+ */
+/**
+ * @var {string}
+ * The border-style of today's date on the Date Picker
+ */
+/**
+ * @var {string}
+ * The border-style of the selected item
+ */
+/**
+ * @var {string}
+ * The font-weight of the selected item
+ */
+/**
+ * @var {color}
+ * The text color of the items in the previous and next months
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over a disabled item
+ */
+/**
+ * @var {color}
+ * The text color of disabled Date Picker items
+ */
+/**
+ * @var {color}
+ * The background-color of disabled Date Picker items
+ */
+/**
+ * @var {color}
+ * The background-color of the Date Picker footer
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the Date Picker footer. Can be either the name of a
+ * predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {number/list}
+ * The border-width of the Date Picker footer
+ */
+/**
+ * @var {string}
+ * The border-style of the Date Picker footer
+ */
+/**
+ * @var {string}
+ * The text-align of the Date Picker footer
+ */
+/**
+ * @var {number/list}
+ * The padding of the Date Picker footer
+ */
+/**
+ * @var {number}
+ * The space between the footer buttons
+ */
+/**
+ * @var {color}
+ * The border-color of the Month Picker
+ */
+/**
+ * @var {number}
+ * The border-width of the Month Picker
+ */
+/**
+ * @var {string}
+ * The border-style of the Month Picker
+ */
+/**
+ * @var {color}
+ * The text color of Month Picker items
+ */
+/**
+ * @var {color}
+ * The text color of Month Picker items
+ */
+/**
+ * @var {color}
+ * The border-color of Month Picker items
+ */
+/**
+ * @var {string}
+ * The border-style of Month Picker items
+ */
+/**
+ * @var {string}
+ * The font-family of Month Picker items
+ */
+/**
+ * @var {number}
+ * The font-size of Month Picker items
+ */
+/**
+ * @var {string}
+ * The font-weight of Month Picker items
+ */
+/**
+ * @var {number/list}
+ * The margin of Month Picker items
+ */
+/**
+ * @var {string}
+ * The text-align of Month Picker items
+ */
+/**
+ * @var {number}
+ * The height of Month Picker items
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over a Month Picker item
+ */
+/**
+ * @var {color}
+ * The background-color of hovered Month Picker items
+ */
+/**
+ * @var {color}
+ * The background-color of selected Month Picker items
+ */
+/**
+ * @var {string}
+ * The border-style of selected Month Picker items
+ */
+/**
+ * @var {color}
+ * The border-color of selected Month Picker items
+ */
+/**
+ * @var {number}
+ * The height of the Month Picker year navigation buttons 
+ */
+/**
+ * @var {number}
+ * The width of the Month Picker year navigation buttons 
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over a Month Picker year navigation button 
+ */
+/**
+ * @var {number}
+ * The opacity of the Month Picker year navigation buttons 
+ */
+/**
+ * @var {number}
+ * The opacity of hovered Month Picker year navigation buttons 
+ */
+/**
+ * @var {string}
+ * The background-image of the Month Picker next year navigation button
+ */
+/**
+ * @var {string}
+ * The background-image of the Month Picker previous year navigation button
+ */
+/**
+ * @var {list}
+ * The background-poisition of the Month Picker next year navigation button
+ */
+/**
+ * @var {list}
+ * The background-poisition of the hovered Month Picker next year navigation button
+ */
+/**
+ * @var {list}
+ * The background-poisition of the Month Picker previous year navigation button
+ */
+/**
+ * @var {list}
+ * The background-poisition of the hovered Month Picker previous year navigation button
+ */
+/**
+ * @var {string}
+ * The border-style of the Month Picker separator
+ */
+/**
+ * @var {number}
+ * The border-width of the Month Picker separator
+ */
+/**
+ * @var {color}
+ * The border-color of the Month Picker separator
+ */
+/**
+ * @var {number/list}
+ * The margin of Month Picker items when the datepicker does not have footer buttons
+ */
+/**
+ * @var {number}
+ * The height of Month Picker items when the datepicker does not have footer buttons
+ */
+/**
+ * @class Ext.picker.Color
+ */
+/**
+ * @var {color}
+ * The background-color of Color Pickers
+ */
+/**
+ * @var {color}
+ * The border-color of Color Pickers
+ */
+/**
+ * @var {number}
+ * The border-width of Color Pickers
+ */
+/**
+ * @var {string}
+ * The border-style of Color Pickers
+ */
+/**
+ * @var {number}
+ * The number of columns to display in the Color Picker
+ */
+/**
+ * @var {number}
+ * The number of rows to display in the Color Picker
+ */
+/**
+ * @var {number}
+ * The height of each Color Picker item
+ */
+/**
+ * @var {number}
+ * The width of each Color Picker item
+ */
+/**
+ * @var {number}
+ * The padding of each Color Picker item
+ */
+/**
+ * @var {string}
+ * The cursor to display when the mouse is over a Color Picker item
+ */
+/**
+ * @var {color}
+ * The border-color of Color Picker items
+ */
+/**
+ * @var {number}
+ * The border-width of Color Picker items
+ */
+/**
+ * @var {string}
+ * The border-style of Color Picker items
+ */
+/**
+ * @var {color}
+ * The border-color of hovered Color Picker items
+ */
+/**
+ * @var {color}
+ * The background-color of Color Picker items
+ */
+/**
+ * @var {color}
+ * The background-color of hovered Color Picker items
+ */
+/**
+ * @var {color}
+ * The border-color of the selected Color Picker item
+ */
+/**
+ * @var {color}
+ * The background-color of the selected Color Picker item
+ */
+/**
+ * @var {color}
+ * The inner border-color of Color Picker items
+ */
+/**
+ * @var {number}
+ * The inner border-width of Color Picker items
+ */
+/**
+ * @var {string}
+ * The inner border-style of Color Picker items
+ */
+/**
+ * @class Ext.form.field.HtmlEditor
+ */
+/**
+ * @var {number}
+ * The border-width of the HtmlEditor
+ */
+/**
+ * @var {color}
+ * The border-color of the HtmlEditor
+ */
+/**
+ * @var {color}
+ * The background-color of the HtmlEditor
+ */
+/**
+ * @var {number}
+ * The size of the HtmlEditor toolbar icons
+ */
+/**
+ * @var {number}
+ * The font-size of the HtmlEditor's font selection control
+ */
+/**
+ * @var {number}
+ * The font-family of the HtmlEditor's font selection control
+ */
+/**
+ * @class Ext.panel.Table
+ */
+/**
+ * @var {color}
+ * The color of the text in the grid cells
+ */
+/**
+ * @var {number}
+ * The font size of the text in the grid cells
+ */
+/**
+ * var {number} $grid-row-cell-line-height
+ * The line-height of the text inside the grid cells.
+ */
+/**
+ * @var {string}
+ * The font-weight of the text in the grid cells
+ */
+/**
+ * @var {string}
+ * The font-family of the text in the grid cells
+ */
+/**
+ * @var {color}
+ * The background-color of the grid cells
+ */
+/**
+ * @var {color}
+ * The border-color of row/column borders. Can be specified as a single color, or as a list
+ * of colors containing the row border color followed by the column border color.
+ */
+/**
+ * @var {string}
+ * The border-style of the row/column borders.
+ */
+/**
+ * @var {number}
+ * The border-width of the row and column borders.
+ */
+/**
+ * @var {color}
+ * The background-color of "special" cells.  Special cells are created by {@link
+ * Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel Checkbox Selection
+ * Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ */
+/**
+ * @var {string}
+ * The background-gradient to use for "special" cells.  Special cells are created by {@link
+ * Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel Checkbox Selection
+ * Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ */
+/**
+ * @var {number}
+ * The border-width of "special" cells.  Special cells are created by {@link
+ * Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel Checkbox Selection
+ * Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ * Only applies to the vertical border, since the row border width is determined by
+ * {#$grid-row-cell-border-width}.
+ */
+/**
+ * @var {color}
+ * The border-color of "special" cells.  Special cells are created by {@link
+ * Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel Checkbox Selection
+ * Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ * Only applies to the vertical border, since the row border color is determined by
+ * {#$grid-row-cell-border-color}.
+ */
+/**
+ * @var {string}
+ * The border-style of "special" cells.  Special cells are created by {@link
+ * Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel Checkbox Selection
+ * Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ * Only applies to the vertical border, since the row border style is determined by
+ * {#$grid-row-cell-border-style}.
+ */
+/**
+ * @var {color}
+ * The border-color of "special" cells when the row is selected using a {@link
+ * Ext.selection.RowModel Row Selection Model}.  Special cells are created by {@link
+ * Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel Checkbox Selection
+ * Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ * Only applies to the vertical border, since the selected row border color is determined by
+ * {#$grid-row-cell-selected-border-color}.
+ */
+/**
+ * @var {color} 
+ * The background-color of "special" cells when the row is hovered. Special cells are
+ * created by {@link Ext.grid.RowNumberer RowNumberer}, {@link Ext.selection.CheckboxModel
+ * Checkbox Selection Model} and {@link Ext.grid.plugin.RowExpander RowExpander}.
+ */
+/**
+ * @var {color}
+ * The background-color color of odd-numbered rows when the table view is configured with
+ * `{@link Ext.view.Table#stripeRows stripeRows}: true`.
+ */
+/**
+ * @var {string}
+ * The border-style of the hovered row
+ */
+/**
+ * @var {color}
+ * The text color of the hovered row
+ */
+/**
+ * @var {color}
+ * The background-color of the hovered row
+ */
+/**
+ * @var {color}
+ * The border-color of the hovered row
+ */
+/**
+ * @var {string}
+ * The border-style of the selected row
+ */
+/**
+ * @var {color}
+ * The text color of the selected row
+ */
+/**
+ * @var {color}
+ * The background-color of the selected row
+ */
+/**
+ * @var {color}
+ * The border-color of the selected row
+ */
+/**
+ * @var {color}
+ * The border-color of the focused row
+ */
+/**
+ * @var {string}
+ * The border-style of the focused row
+ */
+/**
+ * @var {color}
+ * The text color of the focused row
+ */
+/**
+ * @var {color}
+ * The background-color of the focused row
+ */
+/**
+ * @var {boolean}
+ * True to show the focus border when a row is focused even if the grid has no 
+ * {@link Ext.panel.Table#rowLines rowLines}.  
+ */
+/**
+ * @var {color} 
+ * The text color of a selected cell when using a {@link Ext.selection.CellModel
+ * Cell Selection Model}.
+ */
+/**
+ * @var {color} 
+ * The background-color of a selected cell when using a {@link Ext.selection.CellModel
+ * Cell Selection Model}.
+ */
+/**
+ * @var {number}
+ * The amount of padding to apply to the grid cell's inner div element
+ */
+/**
+ * @var {string}
+ * The type of text-overflow to use on the grid cell's inner div element
+ */
+/**
+ * @var {color}
+ * The border-color of the grid body
+ */
+/**
+ * @var {number}
+ * The border-width of the grid body border
+ */
+/**
+ * @var {string}
+ * The border-style of the grid body border
+ */
+/**
+ * @var {color}
+ * The background-color of the grid body
+ */
+/**
+ * @var {number}
+ * The amount of padding to apply to the grid body when the grid contains no data.
+ */
+/**
+ * @var {color}
+ * The text color of the {@link Ext.view.Table#emptyText emptyText} in the grid body when
+ * the grid contains no data.
+ */
+/**
+ * @var {color}
+ * The background color of the grid body when the grid contains no data.
+ */
+/**
+ * @var {number}
+ * The font-size of the {@link Ext.view.Table#emptyText emptyText} in the grid body when
+ * the grid contains no data.
+ */
+/**
+ * @var {number}
+ * The font-weight of the {@link Ext.view.Table#emptyText emptyText} in the grid body when
+ * the grid contains no data.
+ */
+/**
+ * @var {number}
+ * The font-family of the {@link Ext.view.Table#emptyText emptyText} in the grid body when
+ * the grid contains no data.
+ */
+/**
+ * @var {color}
+ * The color of the resize markers that display when dragging a column border to resize
+ * the column
+ */
+/**
+ * @class Ext.grid.header.DropZone
+ */
+/**
+ * @var {number}
+ * The size of the column move icon
+ */
+/**
+ * @class Ext.grid.header.Container
+ */
+/**
+ * @var {color}
+ * The background-color of grid headers
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of grid headers.  Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The border-color of grid headers
+ */
+/**
+ * @var {number}
+ * The border-width of grid headers
+ */
+/**
+ * @var {string}
+ * The border-style of grid headers
+ */
+/**
+ * @var {color}
+ * The background-color of grid headers when the cursor is over the header
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of grid headers when the cursor is over the header.  Can be
+ * either the name of a predefined gradient or a list of color stops. Used as the `$type`
+ * parameter for {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The background-color of a grid header when its menu is open
+ */
+/**
+ * @var {number/list}
+ * The padding to apply to grid headers
+ */
+/**
+ * @var {number}
+ * The height of grid header triggers
+ */
+/**
+ * @var {number}
+ * The width of grid header triggers
+ */
+/**
+ * @var {number}
+ * The width of the grid header sort icon
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over a grid header trigger
+ */
+/**
+ * @var {number}
+ * The amount of space between the header trigger and text
+ */
+/**
+ * @var {list}
+ * The background-position of the header trigger
+ */
+/**
+ * @var {color}
+ * The background-color of the header trigger
+ */
+/**
+ * @var {color}
+ * The background-color of the header trigger when the menu is open
+ */
+/**
+ * @var {number}
+ * The space between the grid header sort icon and the grid header text
+ */
+/**
+ * @class Ext.grid.column.Column
+ */
+/**
+ * @var {string}
+ * The font-family of grid column headers
+ */
+/**
+ * @var {number}
+ * The font-size of grid column headers
+ */
+/**
+ * @var {string}
+ * The font-weight of grid column headers
+ */
+/**
+ * @var {number}
+ * The line-height of grid column headers
+ */
+/**
+ * @var {color}
+ * The text color of grid column headers
+ */
+/**
+ * @var {number}
+ * The border-width of grid column headers
+ */
+/**
+ * @var {string}
+ * The border-style of grid column headers
+ */
+/**
+ * @class Ext.grid.column.Action
+ */
+/**
+ * @var {number}
+ * The height of action column icons
+ */
+/**
+ * @var {number}
+ * The width of action column icons
+ */
+/**
+ * @var {string}
+ * The type of cursor to display when the cursor is over an action column icon
+ */
+/**
+ * @var {number}
+ * The opacity of disabled action column icons
+ */
+/**
+ * @var {number}
+ * The amount of padding to add to the left and right of the action column cell
+ */
+/**
+ * @class Ext.grid.column.CheckColumn
+ */
+/**
+ * @var {number}
+ * Opacity of disabled CheckColumns
+ */
+/**
+ * @class Ext.grid.column.RowNumberer
+ */
+/**
+ * @var {number}
+ * The horizontal space before the number in the RowNumberer cell
+ */
+/**
+ * @var {number}
+ * The horizontal space after the number in the RowNumberer cell
+ */
+/**
+ * @class Ext.grid.feature.Grouping
+ */
+/**
+ * @var {color}
+ * The background color of group headers
+ */
+/**
+ * @var {number/list}
+ * The border-width of group headers
+ */
+/**
+ * @var {string}
+ * The border-style of group headers
+ */
+/**
+ * @var {color}
+ * The border-color of group headers
+ */
+/**
+ * @var {number/list}
+ * The padding of group headers
+ */
+/**
+ * @var {string}
+ * The cursor of group headers
+ */
+/**
+ * @var {color}
+ * The text color of group header titles
+ */
+/**
+ * @var {string}
+ * The font-family of group header titles
+ */
+/**
+ * @var {number}
+ * The font-size of group header titles
+ */
+/**
+ * @var {string}
+ * The font-weight of group header titles
+ */
+/**
+ * @var {number}
+ * The line-height of group header titles
+ */
+/**
+ * @var {number/list}
+ * The amount of padding to add to the group title element.  This is typically used
+ * to reserve space for an icon by setting the amountof space to be reserved for the icon
+ * as the left value and setting the remaining sides to 0.
+ */
+/**
+ * @class Ext.grid.feature.RowBody
+ */
+/**
+ * @var {number}
+ * The font-size of the RowBody
+ */
+/**
+ * @var {number}
+ * The line-height of the RowBody
+ */
+/**
+ * @var {string}
+ * The font-family of the RowBody
+ */
+/**
+ * @var {number}
+ * The font-weight of the RowBody
+ */
+/**
+ * @var {number/list}
+ * The padding of the RowBody
+ */
+/**
+ * @class Ext.grid.feature.RowWrap
+ */
+/**
+ * @var {color}
+ * The border-color of wrapped rows
+ */
+/**
+ * @var {string}
+ * The border-style of wrapped rows
+ */
+/**
+ * @class Ext.grid.locking.Lockable
+ */
+/**
+ * @var {number}
+ * The width of the border between the locked views
+ */
+/**
+ * @var {string}
+ * The border-style of the border between the locked views
+ */
+/**
+ * @class Ext.grid.plugin.Editing
+ */
+/**
+ * The height of grid editor text fields.  Defaults to $form-field-height.  If grid row
+ * height is smaller than $form-field-height, defaults to the grid row height.  Grid row
+ * height is caluclated by adding $grid-row-cell-line-height to the top and bottom values of
+ * $grid-cell-inner-padding.
+ */
+/**
+ * The padding of grid editor text fields.
+ */
+/**
+ * @var {number}
+ * The font size of the grid editor text
+ */
+/**
+ * @var {string}
+ * The font-weight of the grid editor text
+ */
+/**
+ * @var {string}
+ * The font-family of the grid editor text
+ */
+/**
+ * @class Ext.grid.plugin.RowEditing
+ */
+/**
+ * @var {color}
+ * The background-color of the RowEditor
+ */
+/**
+ * @var {color}
+ * The border-color of the RowEditor
+ */
+/**
+ * @var {number}
+ * The border-width of the RowEditor
+ */
+/**
+ * @var {number/list}
+ * The padding of the RowEditor
+ */
+/**
+ * @var {number}
+ * The amount of space in between the editor fields
+ */
+/**
+ * @var {number}
+ * The space between the RowEditor buttons
+ */
+/**
+ * @var {number}
+ * The border-radius of the RowEditor button container
+ */
+/**
+ * @var {number/list}
+ * The padding of the RowEditor button container
+ */
+/**
+ * @var {number/list}
+ * Padding to apply to the body element of the error tooltip
+ */
+/**
+ * @var {string}
+ * The list-style of the error tooltip's list items
+ */
+/**
+ * @var {number}
+ * Space to add before each list item on the error tooltip
+ */
+/**
+ * @class Ext.grid.plugin.RowExpander
+ */
+/**
+ * @var {number}
+ * The height of the RowExpander icon
+ */
+/**
+ * @var {number}
+ * The width of the RowExpander icon
+ */
+/**
+ * @var {number}
+ * The horizontal space before the RowExpander icon
+ */
+/**
+ * @var {number}
+ * The horizontal space after the RowExpander icon
+ */
+/**
+ * @var {string}
+ * The cursor for the RowExpander icon
+ */
+/**
+ * @class Ext.grid.property.Grid
+ */
+/**
+ * @var {string}
+ * The background-image of property grid cells
+ */
+/**
+ * @var {string}
+ * The background-position of property grid cells
+ */
+/**
+ * @var {number/string}
+ * The padding to add before the text of property grid cells to make room for the
+ * background-image. Only applies if $grid-property-cell-background-image is not null
+ */
+/**
+ * @class Ext.layout.container.Accordion
+ */
+/**
+ * @var {color}
+ * The text color of Accordion headers
+ */
+/**
+ * @var {color}
+ * The background-color of Accordion headers
+ */
+/**
+ * @var {number}
+ * The size of {@link Ext.panel.Tool Tools} in Accordion headers
+ */
+/**
+ * @var {number/list}
+ * The border-width of Accordion headers
+ */
+/**
+ * @var {number/list}
+ * The padding of Accordion headers
+ */
+/**
+ * @var {string}
+ * The font-weight of Accordion headers
+ */
+/**
+ * @var {string}
+ * The font-family of Accordion headers
+ */
+/**
+ * @var {string}
+ * The text-transform property of Accordion headers
+ */
+/**
+ * @var {string}
+ * The text-transform property of Accordion headers
+ */
+/**
+ * @var {color}
+ * The background-color of the Accordion layout element
+ */
+/**
+ * @var {color}
+ * The background-color of the Accordion layout element
+ */
+/**
+ * @var {number/list}
+ * The padding of the Accordion layout element
+ */
+/**
+ * @var {string}
+ * The sprite image to use for {@link Ext.panel.Tool Tools} in Accordion headers
+ */
+/**
+ * @class Ext.resizer.Splitter
+ */
+/**
+ * @var {number}
+ * The size of the Splitter
+ */
+/**
+ * @var {color}
+ * The background-color of the active Splitter (the Splitter currently being dragged)
+ */
+/**
+ * @var {number}
+ * The opacity of the active Splitter (the Splitter currently being dragged)
+ */
+/**
+ * @var {number}
+ * The opacity of the collapse tool on the active Splitter (the Splitter currently being dragged)
+ */
+/**
+ * @var {string}
+ * The the type of cursor to display when the cursor is over the collapse tool
+ */
+/**
+ * @var {number}
+ * The size of the collapse tool. This becomes the width of the collapse tool for
+ * horizontal splitters, and the height for vertical splitters.
+ */
+/**
+ * @class Ext.layout.container.Border
+ */
+/**
+ * @var {color}
+ * The background-color of the Border layout element
+ */
+/**
+ * @class Ext.menu.Menu
+ */
+/**
+ * @var {color}
+ * The background-color of the Menu
+ */
+/**
+ * @var {color}
+ * The border-color of {@link Ext.menu.Separator Menu Separators}
+ */
+/**
+ * @var {color}
+ * The background-color of {@link Ext.menu.Separator Menu Separators}
+ */
+/**
+ * @var {number}
+ * The size of {@link Ext.menu.Separator Menu Separators}
+ */
+/**
+ * @var {color}
+ * The border-color of the Menu
+ */
+/**
+ * @var {string}
+ * The border-style of the Menu
+ */
+/**
+ * @var {number}
+ * The border-width of the Menu
+ */
+/**
+ * @var {number}
+ * The font-size of {@link Ext.menu.Item Menu Items}
+ */
+/**
+ * @var {number}
+ * The margin of {@link Ext.menu.Item Menu Items}
+ */
+/**
+ * @var {number}
+ * The height of {@link Ext.menu.Item Menu Items}
+ */
+/**
+ * @var {number}
+ * The border-width of {@link Ext.menu.Item Menu Items}
+ */
+/**
+ * @var {string}
+ * The style of cursor to display when the cursor is over a {@link Ext.menu.Item Menu Item}
+ */
+/**
+ * @var {color}
+ * The background-color of the active {@link Ext.menu.Item Menu Item}
+ */
+/**
+ * @var {color}
+ * The border-color of the active {@link Ext.menu.Item Menu Item}
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for {@link Ext.menu.Item Menu Items}. Can be either the name
+ * of a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {number}
+ * The border-radius of {@link Ext.menu.Item Menu Items}
+ */
+/**
+ * @var {number}
+ * The size of {@link Ext.menu.Item Menu Item} icons
+ */
+/**
+ * @var {number}
+ * The space to the left and right of {@link Ext.menu.Item Menu Item} icons
+ */
+/**
+ * @var {list}
+ * The background-position of {@link Ext.menu.Item Menu Item} icons
+ */
+/**
+ * @var {number}
+ * The space to the left and right of {@link Ext.menu.Item Menu Item} text
+ */
+/**
+ * @var {number/list}
+ * The margin of {@link Ext.menu.Separator Menu Separators}
+ */
+/**
+ * @var {number}
+ * The padding to the right of {@link Ext.menu.CheckItem Check Items}, to make room
+ * for the checkbox
+ */
+/**
+ * @var {number}
+ * The height of {@link Ext.menu.Item Menu Item} arrows
+ */
+/**
+ * @var {number}
+ * The width of {@link Ext.menu.Item Menu Item} arrows
+ */
+/**
+ * @var {number}
+ * The space to the left and right of {@link Ext.menu.Item Menu Item} arrows
+ */
+/**
+ * @var {number}
+ * The opacity of disabled {@link Ext.menu.Item Menu Items}
+ */
+/**
+ * @var {number}
+ * The height of Menu crollers
+ */
+/**
+ * @var {number}
+ * The opacity of Menu crollers
+ */
+/**
+ * @var {number}
+ * The opacity of Menu crollers when hovered
+ */
+/**
+ * @var {number}
+ * The opacity of Menu crollers when pressed
+ */
+/**
+ * @var {number/list}
+ * The padding to apply to the Menu body element
+ */
+/**
+ * @var {color}
+ * The color of Menu Item text
+ */
+/**
+ * @var {number/list}
+ * The margin non-MenuItems placed in a Menu
+ */
+/**
+ * @var {color} $menu-glyph-color
+ * The color to use for menu icons configured using {@link Ext.menu.Item#glyph glyph}
+ */
+/**
+ * @var {number} $menu-glyph-opacity
+ * The opacity to use for menu icons configured using {@link Ext.menu.Item#glyph glyph}
+ */
+/**
+ * @class Ext.panel.Tool
+ */
+/**
+ * @var {number}
+ * The size of Tools
+ */
+/**
+ * @var {boolean}
+ * True to change the background-position of the Tool on hover. Allows for a separate
+ * hover state icon in the sprite.
+ */
+/**
+ * @var {string}
+ * The cursor to display when the mouse cursor is over a Tool
+ */
+/**
+ * @var {number}
+ * The opacity of Tools
+ */
+/**
+ * @var {number}
+ * The opacity of hovered Tools
+ */
+/**
+ * @var {number}
+ * The opacity of pressed Tools
+ */
+/**
+ * @var {string}
+ * The sprite to use as the background-image for Tools
+ */
+/**
+ * @class Ext.slider.Multi
+ */
+/**
+ * @var {number}
+ * The horizontal slider thumb width
+ */
+/**
+ * @var {number}
+ * The horizontal slider thumb height
+ */
+/**
+ * @var {number}
+ * The width of the horizontal slider end caps
+ */
+/**
+ * @var {number}
+ * The vertical slider thumb width
+ */
+/**
+ * @var {number}
+ * The vertical slider thumb height
+ */
+/**
+ * @var {number}
+ * The height of the vertical slider end caps
+ */
+/**
+ * @class Ext.tab.Tab
+ */
+/**
+ * @var {color}
+ * The base color of Tabs
+ */
+/**
+ * @var {color}
+ * The base color of hovered Tabs
+ */
+/**
+ * @var {color}
+ * The base color of the active Tabs
+ */
+/**
+ * @var {color}
+ * The base color of disabled Tabs
+ */
+/**
+ * @var {color}
+ * The text color of Tabs
+ */
+/**
+ * @var {color}
+ * The text color of hovered Tabs
+ */
+/**
+ * @var {color}
+ * The text color of the active Tab
+ */
+/**
+ * @var {color}
+ * The text color of disabled Tabs
+ */
+/**
+ * @var {number}
+ * The font-size of Tabs
+ */
+/**
+ * @var {number}
+ * The font-size of hovered Tabs
+ */
+/**
+ * @var {number}
+ * The font-size of the active Tab
+ */
+/**
+ * @var {number}
+ * The font-size of disabled Tabs
+ */
+/**
+ * @var {string}
+ * The font-family of Tabs
+ */
+/**
+ * @var {string}
+ * The font-family of hovered Tabs
+ */
+/**
+ * @var {string}
+ * The font-family of the active Tab
+ */
+/**
+ * @var {string}
+ * The font-family of disabled Tabs
+ */
+/**
+ * @var {string}
+ * The font-weight of Tabs
+ */
+/**
+ * @var {string}
+ * The font-weight of hovered Tabs
+ */
+/**
+ * @var {string}
+ * The font-weight of the active Tab
+ */
+/**
+ * @var {string}
+ * The font-weight of disabled Tabs
+ */
+/**
+ * @var {string}
+ * The Tab cursor
+ */
+/**
+ * @var {string}
+ * The cursor of disabled Tabs
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for Tabs. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for 
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for hovered Tabs. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for 
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for the active Tab. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for 
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {string/list}
+ * The background-gradient for disabled Tabs. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for 
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {list}
+ * The border-radius of Tabs
+ */
+/**
+ * @var {number}
+ * The border-width of Tabs
+ */
+/**
+ * @var {number/list}
+ * The inner border-width of Tabs
+ */
+/**
+ * @var {color}
+ * The inner border-color of Tabs
+ */
+/**
+ * @var {color}
+ * The border-color of Tabs
+ */
+/**
+ * @var {color}
+ * The border-color of hovered Tabs
+ */
+/**
+ * @var {color}
+ * The border-color of the active Tab
+ */
+/**
+ * @var {color}
+ * The border-color of disabled Tabs
+ */
+/**
+ * @var {number/list}
+ * The padding of Tabs
+ */
+/**
+ * @var {number/list}
+ * The padding of the Tab's text element
+ */
+/**
+ * @var {number}
+ * The line-height of Tabs
+ */
+/**
+ * @var {number/list}
+ * The margin of Tabs. Typically used to add horizontal space between the tabs.
+ */
+/**
+ * @var {number}
+ * The width of the Tab close icon
+ */
+/**
+ * @var {number}
+ * The height of the Tab close icon
+ */
+/**
+ * @var {number}
+ * The distance to offset the Tab close icon from the top of the tab
+ */
+/**
+ * @var {number}
+ * The distance to offset the Tab close icon from the right of the tab
+ */
+/**
+ * @var {number}
+ * the space in between the text and the close button
+ */
+/**
+ * @var {number}
+ * The opacity of the Tab close icon
+ */
+/**
+ * @var {number}
+ * The opacity of the Tab close icon when hovered
+ */
+/**
+ * @var {number}
+ * The opacity of the Tab close icon when the Tab is disabled
+ */
+/**
+ * @var {boolean}
+ * True to change the x background-postition of the close icon background image on hover
+ * to allow for a horizontally aligned background image sprite
+ */
+/**
+ * @var {boolean}
+ * True to change the x background-postition of the close icon background image on click
+ * to allow for a horizontally aligned background image sprite
+ */
+/**
+ * @var {number}
+ * The width of Tab icons
+ */
+/**
+ * @var {number}
+ * The height of Tab icons
+ */
+/**
+ * @var {number}
+ * The space between the Tab icon and the Tab text
+ */
+/**
+ * @var {number}
+ * The background-position of Tab icons
+ */
+/**
+ * @var {color}
+ * The color of Tab glyph icons
+ */
+/**
+ * @var {color}
+ * The color of a Tab glyph icon when the Tab is hovered
+ */
+/**
+ * @var {color}
+ * The color of a Tab glyph icon when the Tab is active
+ */
+/**
+ * @var {color}
+ * The color of a Tab glyph icon when the Tab is disabled
+ */
+/**
+ * @var {number}
+ * The opacity of a Tab glyph icon
+ */
+/**
+ * @var {number}
+ * The opacity of a Tab glyph icon when the Tab is disabled
+ */
+/**
+ * @var {number}
+ * opacity to apply to the tab's main element when the tab is disabled
+ */
+/**
+ * @var {number}
+ * opacity to apply to the tab's text element when the tab is disabled
+ */
+/**
+ * @var {number}
+ * opacity to apply to the tab's icon element when the tab is disabled
+ */
+/**
+ * @var {string}
+ * Experimental - Has issues with IE
+ * The direction to rotate the contents of a left-aligned tab.  `right` to rotate
+ * clockwise or `left` to rotate counterclockwise. Defaults to `left`.
+ */
+/**
+ * @var {string}
+ * Experimental - Has issues with IE
+ * The direction to rotate the contents of a right-aligned tab.  `right` to rotate
+ * clockwise or `left` to rotate counterclockwise. Defaults to `right`.
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" tab UI
+ */
+/**
+ * @class Ext.tab.Bar
+ */
+/**
+ * @var {number/list}
+ * The padding of the Tab Bar
+ */
+/**
+ * @var {number/list}
+ * The padding of the {@link Ext.tab.Panel#plain plain} Tab Bar
+ */
+/**
+ * @var {color}
+ * The base color of the Tab Bar
+ */
+/**
+ * @var {string/list}
+ * The background-gradient of the Tab Bar. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for 
+ * {@link Global_CSS#background-gradient}.
+ */
+/**
+ * @var {color}
+ * The border-color of the Tab Bar
+ */
+/**
+ * @var {number/list}
+ * The border-width of the Tab Bar
+ */
+/**
+ * @var {number/list}
+ * The border-width of the {@link Ext.tab.Panel#plain plain} Tab Bar
+ */
+/**
+ * @var {number}
+ * The height of the Tab Bar strip
+ */
+/**
+ * @var {color}
+ * The border-color of the Tab Bar strip
+ */
+/**
+ * @var {color}
+ * The background-color of the Tab Bar strip
+ */
+/**
+ * @var {number/list}
+ * The border-width of the Tab Bar strip
+ */
+/**
+ * @var {number/list}
+ * The border-width of the {@link Ext.tab.Panel#plain plain} Tab Bar strip
+ */
+/**
+ * @var {number}
+ * The width of the Tab Bar scrollers
+ */
+/**
+ * @var {string}
+ * The cursor of the Tab Bar scrollers
+ */
+/**
+ * @var {string}
+ * The cursor of disabled Tab Bar scrollers
+ */
+/**
+ * @var {number}
+ * The opacity of Tab Bar scrollers
+ */
+/**
+ * @var {number}
+ * The opacity of hovered Tab Bar scrollers
+ */
+/**
+ * @var {number}
+ * The opacity of pressed Tab Bar scrollers
+ */
+/**
+ * @var {number}
+ * The opacity of disabled Tab Bar scrollers
+ */
+/**
+ * @var {boolean}
+ * true to change the x postition of the background image on hover to allow for a
+ * horizonatlly alined background image sprite
+ */
+/**
+ * @var {boolean}
+ * true to include separate scroller icons for "plain" tabbars
+ */
+/**
+ * @var {boolean}
+ * if true, the tabbar will use symmetrical scroller icons.  Top and bottom tabbars
+ * will share icons, and Left and right will share icons.
+ */
+/**
+ * @var {boolean}
+ * True to include the "default" tabbar UI
+ */
+/**
+ * @class Ext.selection.CheckboxModel
+ */
+/**
+ * @var {number}
+ * The horizontal space before the checkbox
+ */
+/**
+ * @var {number}
+ * The horizontal space after the checkbox
+ */
+/**
+ * @class Ext.tree.Panel
+ */
+/**
+ * @var {number} $tree-elbow-width
+ * The width of the tree elbow/arrow icons
+ */
+/**
+ * @var {number} $tree-icon-width
+ * The width of the tree folder/leaf icons
+ */
+/**
+ * @var {number} $tree-elbow-spacing 
+ * The amount of spacing between the tree elbows or arrows, and the checkbox or icon.
+ */
+/**
+ * @var {number} $tree-checkbox-spacing
+ * The amount of space (in pixels) between the tree checkbox and the folder/leaf icon
+ */
+/**
+ * @var {number} $tree-icon-spacing
+ * The amount of space (in pixels) between the folder/leaf icons and the text
+ */
+/**
+ * @var {string} $tree-expander-cursor
+ * The type of cursor to display when the mouse is over a tree expander (+, - or arrow icon)
+ */
+/**
+ * @var {number/list}
+ * The amount of padding to apply to the tree cell's inner div element
+ */
+/* including package ext-theme-base */
+/**
+ * @class Global_CSS
+ */
+/**
+ * @var {string} $prefix
+ * The prefix to be applied to all CSS selectors. If this is changed, it must also be changed in your
+ * JavaScript application.
+ */
+/**
+ * @var {boolean/string} $relative-image-path-for-uis
+ * True to use a relative image path for all new UIs. If true, the path will be "../images/".
+ * It can also be a string of the path value.
+ * It defaults to false, which means it will look for the images in the ExtJS SDK folder.
+ */
+/**
+ * @var {boolean} $include-not-found-images
+ * True to include files which are not found when compiling your SASS
+ */
+/**
+ * @var {boolean} $include-ie
+ * True to include Internet Explorer specific rules
+ */
+/**
+ * @var {boolean} $include-content-box
+ * True to include rules for browsers that do not support the border-box model
+ * (IE6 strict and IE7 strict)
+ */
+/**
+ * @var {boolean} $include-ff
+ * True to include Firefox specific rules
+ */
+/**
+ * @var {boolean} $include-chrome
+ * True to include Chrome specific rules
+ */
+/**
+ * @var {boolean} $include-safari
+ * True to include Safari specific rules
+ */
+/**
+ * @var {boolean} $include-opera
+ * True to include Opera specific rules
+ */
+/**
+ * @var {boolean} $include-webkit
+ * True to include Webkit specific rules
+ */
+/**
+ * @var {measurement} $css-shadow-border-radius
+ * The border radius for CSS shadows
+ */
+/**
+ * @var {color} $include-shadow-images
+ * True to include all shadow images.
+ */
+/**
+ * @var {string} $image-extension
+ * default file extension to use for images (defaults to 'png').
+ */
+/**
+ * @var {string} $slicer-image-extension
+ * default file extension to use for slicer images (defaults to 'gif').
+ */
+/**
+ * Default search path for images
+ */
+/**
+ * @var {boolean}
+ * True to include the default UI for each component.
+ */
+/**
+ * @var {string}
+ * The base path relative to the CSS output directory to use for theme resources.  For example
+ * if the theme's images live one directory up from the generated CSS output in a directory
+ * named 'foo/images/', you would need to set this variable to '../foo/' in order for the image
+ * paths in the CSS output to be generated correctly. By default this is the same as the
+ * CSS output directory.
+ */
+/* including package ext-theme-base */
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-body {
+  margin: 0;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+img {
+  border: 0;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-border-box,
+.x-border-box * {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
+/* line 17, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-rtl {
+  direction: rtl;
+}
+
+/* line 21, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-ltr {
+  direction: ltr;
+}
+
+/* line 25, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-clear {
+  overflow: hidden;
+  clear: both;
+  font-size: 0;
+  line-height: 0;
+  display: table;
+}
+
+/* line 33, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-strict .x-ie7 .x-clear {
+  height: 0;
+  width: 0;
+}
+
+/* line 41, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-layer {
+  position: absolute !important;
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 49, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-fixed-layer {
+  position: fixed !important;
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 55, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-shim {
+  position: absolute;
+  left: 0;
+  top: 0;
+  overflow: hidden;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+
+/* line 63, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-hide-display {
+  display: none !important;
+}
+
+/* line 67, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-hide-visibility {
+  visibility: hidden !important;
+}
+
+/* line 72, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-ie6 .x-item-disabled {
+  filter: none;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-hidden,
+.x-hide-offsets {
+  display: block !important;
+  visibility: hidden !important;
+  position: absolute !important;
+  top: -10000px !important;
+}
+
+/* line 88, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-hide-nosize {
+  height: 0 !important;
+  width: 0 !important;
+}
+
+/* line 94, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-hide-clip {
+  position: absolute!important;
+  clip: rect(0, 0, 0, 0);
+  clip: rect(0 0 0 0);
+}
+
+/* line 102, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-masked-relative {
+  position: relative;
+}
+
+/* line 108, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-ie-shadow {
+  background-color: #777;
+  display: none;
+  position: absolute;
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 117, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-unselectable {
+  user-select: none;
+  -o-user-select: none;
+  -ms-user-select: none;
+  -moz-user-select: -moz-none;
+  -webkit-user-select: none;
+  cursor: default;
+}
+
+/* line 121, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-selectable {
+  cursor: auto;
+  -moz-user-select: text;
+  -webkit-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+  -o-user-select: text;
+}
+
+/* line 136, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-list-plain {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+
+/* line 143, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-table-plain {
+  border-collapse: collapse;
+  border-spacing: 0;
+  font-size: 1em;
+}
+
+/* line 156, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-frame-tl,
+.x-frame-tr,
+.x-frame-tc,
+.x-frame-bl,
+.x-frame-br,
+.x-frame-bc {
+  overflow: hidden;
+  background-repeat: no-repeat;
+}
+
+/* line 162, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-frame-tc,
+.x-frame-bc {
+  background-repeat: repeat-x;
+}
+
+/* line 166, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-frame-mc {
+  background-repeat: repeat-x;
+  overflow: hidden;
+}
+
+/* line 171, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-proxy-el {
+  position: absolute;
+  background: #b4b4b4;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+  opacity: 0.8;
+}
+
+/* line 178, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-css-shadow {
+  position: absolute;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -o-border-radius: 5px;
+  border-radius: 5px;
+}
+
+/* line 184, ../../../../ext/packages/ext-theme-base/sass/src/Component.scss */
+.x-item-disabled,
+.x-item-disabled * {
+  cursor: default;
+}
+
+/* line 3, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Container.scss */
+.x-box-item {
+  position: absolute !important;
+  left: 0;
+  top: 0;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/LoadMask.scss */
+.x-mask {
+  z-index: 100;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  zoom: 1;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/LoadMask.scss */
+.x-mask-shim {
+  z-index: 100;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/src/LoadMask.scss */
+.x-mask-msg {
+  z-index: 20001;
+  position: absolute;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/ProgressBar.scss */
+.x-progress {
+  position: relative;
+  border-style: solid;
+  overflow: hidden;
+}
+
+/* line 7, ../../../../ext/packages/ext-theme-base/sass/src/ProgressBar.scss */
+.x-progress-bar {
+  overflow: hidden;
+  position: absolute;
+  width: 0;
+  height: 100%;
+}
+
+/* line 14, ../../../../ext/packages/ext-theme-base/sass/src/ProgressBar.scss */
+.x-progress-text {
+  overflow: hidden;
+  position: absolute;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked {
+  position: absolute !important;
+  z-index: 1;
+}
+
+/* line 7, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-vertical {
+  position: static;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-top {
+  border-bottom-width: 0 !important;
+}
+
+/* line 15, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-bottom {
+  border-top-width: 0 !important;
+}
+
+/* line 19, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-left {
+  border-right-width: 0 !important;
+}
+
+/* line 23, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-right {
+  border-left-width: 0 !important;
+}
+
+/* line 27, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-noborder-top {
+  border-top-width: 0 !important;
+}
+
+/* line 31, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-noborder-right {
+  border-right-width: 0 !important;
+}
+
+/* line 35, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-noborder-bottom {
+  border-bottom-width: 0 !important;
+}
+
+/* line 39, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-docked-noborder-left {
+  border-left-width: 0 !important;
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-l {
+  border-left-width: 0 !important;
+}
+
+/* line 48, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-b {
+  border-bottom-width: 0 !important;
+}
+
+/* line 51, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-bl {
+  border-bottom-width: 0 !important;
+  border-left-width: 0 !important;
+}
+
+/* line 55, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-r {
+  border-right-width: 0 !important;
+}
+
+/* line 58, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-rl {
+  border-right-width: 0 !important;
+  border-left-width: 0 !important;
+}
+
+/* line 62, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-rb {
+  border-right-width: 0 !important;
+  border-bottom-width: 0 !important;
+}
+
+/* line 66, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-rbl {
+  border-right-width: 0 !important;
+  border-bottom-width: 0 !important;
+  border-left-width: 0 !important;
+}
+
+/* line 71, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-t {
+  border-top-width: 0 !important;
+}
+
+/* line 74, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-tl {
+  border-top-width: 0 !important;
+  border-left-width: 0 !important;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-tb {
+  border-top-width: 0 !important;
+  border-bottom-width: 0 !important;
+}
+
+/* line 82, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-tbl {
+  border-top-width: 0 !important;
+  border-bottom-width: 0 !important;
+  border-left-width: 0 !important;
+}
+
+/* line 87, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-tr {
+  border-top-width: 0 !important;
+  border-right-width: 0 !important;
+}
+
+/* line 91, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-trl {
+  border-top-width: 0 !important;
+  border-right-width: 0 !important;
+  border-left-width: 0 !important;
+}
+
+/* line 96, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-trb {
+  border-top-width: 0 !important;
+  border-right-width: 0 !important;
+  border-bottom-width: 0 !important;
+}
+
+/* line 101, ../../../../ext/packages/ext-theme-base/sass/src/layout/component/Dock.scss */
+.x-noborder-trbl {
+  border-width: 0 !important;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn {
+  display: inline-block;
+  position: relative;
+  zoom: 1;
+  *display: inline;
+  outline: 0;
+  cursor: pointer;
+  white-space: nowrap;
+  vertical-align: middle;
+  text-decoration: none;
+}
+
+/* line 15, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-wrap {
+  position: relative;
+  display: block;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-button {
+  position: relative;
+  display: block;
+  text-decoration: none;
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 28, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-inner {
+  display: block;
+  white-space: nowrap;
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 35, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-icon-el {
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  background-repeat: no-repeat;
+  text-align: center;
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-inner-center {
+  text-align: center;
+}
+
+/* line 49, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-inner-left {
+  text-align: left;
+}
+
+/* line 59, ../../../../ext/packages/ext-theme-base/sass/src/button/Button.scss */
+.x-btn-inner-right {
+  text-align: right;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-layout-ct {
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-target {
+  position: absolute;
+  width: 20000px;
+  top: 0;
+  left: 0;
+  height: 1px;
+}
+
+/* line 31, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-inner {
+  overflow: hidden;
+  zoom: 1;
+  position: relative;
+  left: 0;
+  top: 0;
+}
+
+/* line 41, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-horizontal-box-overflow-body {
+  float: left;
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-scroller {
+  position: relative;
+  background-repeat: no-repeat;
+}
+
+/* line 51, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-scroller-left,
+.x-box-scroller-right {
+  float: left;
+  height: 100%;
+  z-index: 5;
+}
+
+/* line 59, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-scroller-top .x-box-scroller,
+.x-box-scroller-bottom .x-box-scroller {
+  line-height: 0;
+  font-size: 0;
+  background-position: center 0;
+}
+
+/* line 66, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Box.scss */
+.x-box-menu-after {
+  float: right;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-text {
+  white-space: nowrap;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-separator {
+  display: block;
+  font-size: 1px;
+  overflow: hidden;
+  cursor: default;
+  border: 0;
+  width: 0;
+  height: 0;
+  line-height: 0px;
+}
+
+/* line 17, ../../../../ext/packages/ext-theme-base/sass/src/toolbar/Toolbar.scss */
+.x-quirks .x-ie .x-toolbar .x-toolbar-separator-horizontal {
+  width: 2px;
+}
+
+/* line 22, ../../../../ext/packages/ext-theme-base/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-scroller {
+  padding-left: 0;
+}
+
+/* line 29, ../../../../ext/packages/ext-theme-base/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-plain {
+  border: 0;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/panel/Header.scss */
+.x-header-icon {
+  background-repeat: no-repeat;
+  background-position: 0 0;
+  vertical-align: middle;
+  text-align: center;
+}
+
+/* line 8, ../../../../ext/packages/ext-theme-base/sass/src/panel/Header.scss */
+.x-header-text-container {
+  overflow: hidden;
+  -o-text-overflow: ellipsis;
+  text-overflow: ellipsis;
+}
+
+/* line 4, ../../../../ext/packages/ext-theme-base/sass/src/dd/DD.scss */
+.x-dd-drag-proxy,
+.x-dd-drag-current {
+  z-index: 1000000!important;
+  pointer-events: none;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drag-repair .x-dd-drag-ghost {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
+  opacity: 0.6;
+}
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drag-repair .x-dd-drop-icon {
+  display: none;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drag-ghost {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=85);
+  opacity: 0.85;
+  padding: 5px;
+  padding-left: 20px;
+  white-space: nowrap;
+  color: #000;
+  font: normal 12px helvetica, arial, verdana, sans-serif;
+  border: 1px solid;
+  border-color: #ddd #bbb #bbb #ddd;
+  background-color: #fff;
+}
+
+/* line 28, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drop-icon {
+  position: absolute;
+  top: 3px;
+  left: 3px;
+  display: block;
+  width: 16px;
+  height: 16px;
+  background-color: transparent;
+  background-position: center;
+  background-repeat: no-repeat;
+  z-index: 1;
+}
+
+/* line 66, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drop-ok .x-dd-drop-icon {
+  background-image: url(images/dd/drop-yes.png);
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drop-ok-add .x-dd-drop-icon {
+  background-image: url(images/dd/drop-add.png);
+}
+
+/* line 75, ../../../../ext/packages/ext-theme-base/sass/src/dd/StatusProxy.scss */
+.x-dd-drop-nodrop div.x-dd-drop-icon {
+  background-image: url(images/dd/drop-no.png);
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-panel,
+.x-plain {
+  overflow: hidden;
+  position: relative;
+}
+
+/* line 7, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-panel {
+  outline: none;
+}
+
+/* line 23, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-ie .x-panel-header,
+.x-ie .x-panel-header-tl,
+.x-ie .x-panel-header-tc,
+.x-ie .x-panel-header-tr,
+.x-ie .x-panel-header-ml,
+.x-ie .x-panel-header-mc,
+.x-ie .x-panel-header-mr,
+.x-ie .x-panel-header-bl,
+.x-ie .x-panel-header-bc,
+.x-ie .x-panel-header-br {
+  zoom: 1;
+}
+
+/* line 29, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-ie8 td.x-frame-mc {
+  vertical-align: top;
+}
+
+/* line 35, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-panel-body {
+  overflow: hidden;
+  position: relative;
+}
+
+/* line 42, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-nlg .x-panel-header-vertical .x-frame-mc {
+  background-repeat: repeat-y;
+}
+
+/* line 49, ../../../../ext/packages/ext-theme-base/sass/src/panel/Panel.scss */
+.x-panel-header-plain,
+.x-panel-body-plain {
+  border: 0;
+  padding: 0;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/tip/Tip.scss */
+.x-tip {
+  position: absolute;
+  overflow: visible;
+  /*pointer needs to be able to stick out*/
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/src/tip/Tip.scss */
+.x-tip-body {
+  overflow: hidden;
+  position: relative;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-base/sass/src/tip/Tip.scss */
+.x-tip-anchor {
+  position: absolute;
+  overflow: hidden;
+  border-style: solid;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/container/Viewport.scss */
+.x-viewport, .x-viewport body {
+  margin: 0;
+  padding: 0;
+  border: 0 none;
+  overflow: hidden;
+  height: 100%;
+  position: static;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/window/Window.scss */
+.x-window {
+  outline: none;
+  overflow: hidden;
+}
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/window/Window.scss */
+.x-window .x-window-wrap {
+  position: relative;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/window/Window.scss */
+.x-window-body {
+  position: relative;
+  overflow: hidden;
+}
+
+/* line 15, ../../../../ext/packages/ext-theme-base/sass/src/window/Window.scss */
+.x-window-body-plain {
+  background: transparent;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/form/Labelable.scss */
+.x-form-item-label {
+  display: block;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/form/Labelable.scss */
+.x-form-item-label-right {
+  text-align: right;
+}
+
+/* line 9, ../../../../ext/packages/ext-theme-base/sass/src/form/Labelable.scss */
+.x-form-item-label-top {
+  display: block;
+  zoom: 1;
+}
+
+/* line 15, ../../../../ext/packages/ext-theme-base/sass/src/form/Labelable.scss */
+.x-form-invalid-icon {
+  overflow: hidden;
+}
+/* line 17, ../../../../ext/packages/ext-theme-base/sass/src/form/Labelable.scss */
+.x-form-invalid-icon ul {
+  display: none;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/form/field/TextArea.scss */
+.x-form-textarea {
+  overflow: auto;
+  resize: none;
+}
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/form/field/TextArea.scss */
+.x-safari.x-mac .x-form-textarea {
+  margin-bottom: -2px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Display.scss */
+.x-form-display-field-body {
+  vertical-align: top;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Checkbox.scss */
+.x-form-cb-wrap {
+  vertical-align: top;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Checkbox.scss */
+.x-form-cb {
+  vertical-align: top;
+  overflow: hidden;
+  padding: 0;
+  border: 0;
+}
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Checkbox.scss */
+.x-form-cb::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Checkbox.scss */
+.x-form-cb-label {
+  display: inline-block;
+  zoom: 1;
+}
+
+/*misc*/
+/* line 4, ../../../../ext/packages/ext-theme-base/sass/src/form/Panel.scss */
+.x-webkit *:focus {
+  outline: none !important;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-base/sass/src/form/Panel.scss */
+.x-form-item {
+  vertical-align: top;
+  table-layout: fixed;
+}
+
+/* line 17, ../../../../ext/packages/ext-theme-base/sass/src/form/Panel.scss */
+.x-form-item-body {
+  position: relative;
+}
+
+/* line 33, ../../../../ext/packages/ext-theme-base/sass/src/form/Panel.scss */
+.x-form-form-item td {
+  border-top: 1px solid transparent;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Trigger.scss */
+.x-form-trigger {
+  cursor: pointer;
+  overflow: hidden;
+  background-repeat: no-repeat;
+}
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Trigger.scss */
+.x-item-disabled .x-form-trigger {
+  cursor: default;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Trigger.scss */
+.x-trigger-noedit {
+  cursor: default;
+}
+
+/* line 14, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Trigger.scss */
+.x-form-trigger-wrap {
+  vertical-align: top;
+  border-collapse: separate;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/src/form/field/Spinner.scss */
+.x-form-spinner-up,
+.x-form-spinner-down {
+  font-size: 0;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Fit.scss */
+.x-fit-item {
+  position: relative;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Absolute.scss */
+.x-abs-layout-ct {
+  position: relative;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Absolute.scss */
+.x-abs-layout-item {
+  position: absolute !important;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/resizer/Splitter.scss */
+.x-splitter {
+  font-size: 1px;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/resizer/Splitter.scss */
+.x-splitter-horizontal {
+  cursor: e-resize;
+  cursor: row-resize;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/resizer/Splitter.scss */
+.x-splitter-vertical {
+  cursor: e-resize;
+  cursor: col-resize;
+}
+
+/* line 17, ../../../../ext/packages/ext-theme-base/sass/src/resizer/Splitter.scss */
+.x-splitter-collapsed,
+.x-splitter-horizontal-noresize,
+.x-splitter-vertical-noresize {
+  cursor: default;
+}
+
+/* line 21, ../../../../ext/packages/ext-theme-base/sass/src/resizer/Splitter.scss */
+.x-splitter-active {
+  z-index: 4;
+}
+
+/* line 25, ../../../../ext/packages/ext-theme-base/sass/src/resizer/Splitter.scss */
+.x-collapse-el {
+  position: absolute;
+  background-repeat: no-repeat;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Border.scss */
+.x-border-layout-ct {
+  overflow: hidden;
+  zoom: 1;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Border.scss */
+.x-border-layout-ct {
+  position: relative;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Border.scss */
+.x-border-region-slide-in {
+  z-index: 5;
+}
+
+/* line 14, ../../../../ext/packages/ext-theme-base/sass/src/layout/container/Border.scss */
+.x-region-collapsed-placeholder {
+  z-index: 4;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu {
+  outline: none;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-item {
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-item-cmp {
+  margin: 2px;
+}
+/* line 14, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-item-cmp .x-field-label-cell {
+  vertical-align: middle;
+}
+
+/* line 22, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-icon-separator {
+  position: absolute;
+  top: 0px;
+  z-index: 0;
+  height: 100%;
+  overflow: hidden;
+}
+/* line 28, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-plain .x-menu-icon-separator {
+  display: none;
+}
+
+/* line 33, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-item-link {
+  text-decoration: none;
+  outline: 0;
+  zoom: 1;
+}
+
+/* line 40, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-item-text {
+  zoom: 1;
+}
+
+/* line 47, ../../../../ext/packages/ext-theme-base/sass/src/menu/Menu.scss */
+.x-menu-item-icon,
+.x-menu-item-icon-right,
+.x-menu-item-arrow {
+  position: absolute;
+  text-align: center;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-base/sass/src/resizer/SplitterTracker.scss */
+.x-resizable-overlay {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  display: none;
+  z-index: 200000;
+  background-color: #fff;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+
+/* including package ext-theme-neutral */
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/Component.scss */
+.x-body {
+  color: black;
+  font-size: 13px;
+  font-family: helvetica, arial, verdana, sans-serif;
+  background: #f5f5f5;
+}
+
+/* line 13, ../../../../ext/packages/ext-theme-neutral/sass/src/Component.scss */
+.x-animating-size,
+.x-collapsed {
+  overflow: hidden!important;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/FocusManager.scss */
+.x-focus-element {
+  position: absolute;
+  top: -10px;
+  left: -10px;
+  width: 0px;
+  height: 0px;
+}
+
+/* line 9, ../../../../ext/packages/ext-theme-neutral/sass/src/FocusManager.scss */
+.x-focus-frame {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  z-index: 100000000;
+  width: 0px;
+  height: 0px;
+}
+
+/* line 21, ../../../../ext/packages/ext-theme-neutral/sass/src/FocusManager.scss */
+.x-focus-frame-top,
+.x-focus-frame-bottom,
+.x-focus-frame-left,
+.x-focus-frame-right {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+}
+
+/* line 28, ../../../../ext/packages/ext-theme-neutral/sass/src/FocusManager.scss */
+.x-focus-frame-top,
+.x-focus-frame-bottom {
+  border-top: solid 2px #15428b;
+  height: 2px;
+}
+
+/* line 34, ../../../../ext/packages/ext-theme-neutral/sass/src/FocusManager.scss */
+.x-focus-frame-left,
+.x-focus-frame-right {
+  border-left: solid 2px #15428b;
+  width: 2px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/LoadMask.scss */
+.x-mask {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
+  opacity: 0.7;
+  background: white;
+}
+
+/* line 9, ../../../../ext/packages/ext-theme-neutral/sass/src/LoadMask.scss */
+.x-mask-msg {
+  padding: 8px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  background-image: none;
+  background-color: #e5e5e5;
+}
+
+/* line 29, ../../../../ext/packages/ext-theme-neutral/sass/src/LoadMask.scss */
+.x-mask-msg-inner {
+  padding: 0;
+  background-color: transparent;
+  color: #666666;
+  font: normal 13px helvetica, arial, verdana, sans-serif;
+}
+
+/* line 41, ../../../../ext/packages/ext-theme-neutral/sass/src/LoadMask.scss */
+.x-mask-msg-text {
+  padding: 21px 0 0;
+  background-image: url(images/loadmask/loading.gif);
+  background-repeat: no-repeat;
+  background-position: center 0;
+}
+
+/**
+ * Creates a visual theme for an Ext.ProgressBar
+ *
+ * @param {string} $ui-label
+ * The name of the UI being created. Can not included spaces or special punctuation
+ * (used in CSS class names).
+ *
+ * @param {color} [$ui-border-color=$progress-border-color]
+ * The border-color of the ProgressBar
+ *
+ * @param {color} [$ui-background-color=$progress-background-color]
+ * The background-color of the ProgressBar
+ *
+ * @param {color} [$ui-bar-background-color=$progress-bar-background-color]
+ * The background-color of the ProgressBar's moving element
+ *
+ * @param {string/list} [$ui-bar-background-gradient=$progress-bar-background-gradient]
+ * The background-gradient of the ProgressBar's moving element. Can be either the name of
+ * a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ *
+ * @param {color} [$ui-color-front=$progress-text-color-front]
+ * The color of the ProgressBar's text when in front of the ProgressBar's moving element
+ *
+ * @param {color} [$ui-color-back=$progress-text-color-back]
+ * The color of the ProgressBar's text when the ProgressBar's 'moving element is not under it
+ *
+ * @param {number} [$ui-height=$progress-height]
+ * The height of the ProgressBar
+ *
+ * @param {number} [$ui-border-width=$progress-border-width]
+ * The border-width of the ProgressBar
+ *
+ * @param {number} [$ui-border-radius=$progress-border-radius]
+ * The border-radius of the ProgressBar
+ *
+ * @param {string} [$ui-text-text-align=$progress-text-text-align]
+ * The text-align of the ProgressBar's text
+ *
+ * @param {number} [$ui-text-font-size=$progress-text-font-size]
+ * The font-size of the ProgressBar's text
+ *
+ * @param {string} [$ui-text-font-weight=$progress-text-font-weight]
+ * The font-weight of the ProgressBar's text
+ *
+ * @member Ext.ProgressBar
+ */
+/* line 67, ../../../../ext/packages/ext-theme-neutral/sass/src/ProgressBar.scss */
+.x-progress-default {
+  background-color: #f5f5f5;
+  border-width: 0;
+  height: 20px;
+  border-color: #157fcc;
+}
+/* line 72, ../../../../ext/packages/ext-theme-neutral/sass/src/ProgressBar.scss */
+.x-content-box .x-progress-default {
+  height: 20px;
+}
+/* line 84, ../../../../ext/packages/ext-theme-neutral/sass/src/ProgressBar.scss */
+.x-progress-default .x-progress-bar-default {
+  background-image: none;
+  background-color: #c1ddf1;
+}
+/* line 99, ../../../../ext/packages/ext-theme-neutral/sass/src/ProgressBar.scss */
+.x-progress-default .x-progress-text {
+  color: #666666;
+  font-weight: bold;
+  font-size: 13px;
+  text-align: center;
+  line-height: 20px;
+}
+/* line 107, ../../../../ext/packages/ext-theme-neutral/sass/src/ProgressBar.scss */
+.x-progress-default .x-progress-text-back {
+  color: #666666;
+  line-height: 20px;
+}
+
+/**
+ * Creates a visual theme for a Button
+ *
+ * @param {string} $ui
+ * The name of the UI being created. Can not included spaces or special punctuation
+ * (used in CSS class names).
+ *
+ * @param {number} [$border-radius=0px]
+ * The border-radius of the button
+ *
+ * @param {number} [$border-width=0px]
+ * The border-width of the button
+ *
+ * @param {color} $border-color
+ * The border-color of the button
+ *
+ * @param {color} $border-color-over
+ * The border-color of the button when the cursor is over the button
+ *
+ * @param {color} $border-color-focus
+ * The border-color of the button when focused
+ *
+ * @param {color} $border-color-pressed
+ * The border-color of the button when pressed
+ *
+ * @param {color} $border-color-disabled
+ * The border-color of the button when disabled
+ *
+ * @param {number} $padding
+ * The amount of padding inside the border of the button on all sides
+ *
+ * @param {number} $text-padding
+ * The amount of horizontal space to add to the left and right of the button text
+ *
+ * @param {color} $background-color
+ * The background-color of the button
+ *
+ * @param {color} $background-color-over
+ * The background-color of the button when the cursor is over the button
+ *
+ * @param {color} $background-color-focus
+ * The background-color of the button when focused
+ *
+ * @param {color} $background-color-pressed
+ * The background-color of the button when pressed
+ *
+ * @param {color} $background-color-disabled
+ * The background-color of the button when disabled
+ *
+ * @param {string/list} $background-gradient
+ * The background-gradient for the button.  Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ *
+ * @param {string} $background-gradient-over
+ * The background-gradient to use when the cursor is over the button. Can be either the
+ * name of a predefined gradient or a list of color stops. Used as the `$type` parameter
+ * for {@link Global_CSS#background-gradient}.
+ *
+ * @param {string} $background-gradient-focus
+ * The background-gradient to use when the the button is focused. Can be either the name
+ * of a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ *
+ * @param {string} $background-gradient-pressed
+ * The background-gradient to use when the the button is pressed. Can be either the name
+ * of a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ *
+ * @param {string} $background-gradient-disabled
+ * The background-gradient to use when the the button is disabled. Can be either the name
+ * of a predefined gradient or a list of color stops. Used as the `$type` parameter for
+ * {@link Global_CSS#background-gradient}.
+ *
+ * @param {color} $color
+ * The text color of the button
+ *
+ * @param {color} $color-over
+ * The text color of the button when the cursor is over the button
+ *
+ * @param {color} $color-focus
+ * The text color of the button when the button is focused
+ *
+ * @param {color} $color-pressed
+ * The text color of the button when the button is pressed
+ *
+ * @param {color} $color-disabled
+ * The text color of the button when the button is disabled
+ *
+ * @param {number} $font-size
+ * The font-size of the button
+ *
+ * @param {number} $font-size-over
+ * The font-size of the button when the cursor is over the button
+ *
+ * @param {number} $font-size-focus
+ * The font-size of the button when the button is focused
+ *
+ * @param {number} $font-size-pressed
+ * The font-size of the button when the button is pressed
+ *
+ * @param {number} $font-size-disabled
+ * The font-size of the button when the button is disabled
+ *
+ * @param {string} $font-weight
+ * The font-weight of the button
+ *
+ * @param {string} $font-weight-over
+ * The font-weight of the button when the cursor is over the button
+ *
+ * @param {string} $font-weight-focus
+ * The font-weight of the button when the button is focused
+ *
+ * @param {string} $font-weight-pressed
+ * The font-weight of the button when the button is pressed
+ *
+ * @param {string} $font-weight-disabled
+ * The font-weight of the button when the button is disabled
+ *
+ * @param {string} $font-family
+ * The font-family of the button
+ *
+ * @param {string} $font-family-over
+ * The font-family of the button when the cursor is over the button
+ *
+ * @param {string} $font-family-focus
+ * The font-family of the button when the button is focused
+ *
+ * @param {string} $font-family-pressed
+ * The font-family of the button when the button is pressed
+ *
+ * @param {string} $font-family-disabled
+ * The font-family of the button when the button is disabled
+ *
+ * @param {number} $icon-size
+ * The size of the button icon
+ *
+ * @param {color} $glyph-color
+ * The color of the button's {@link #glyph} icon
+ *
+ * @param {number} [$glyph-opacity=1]
+ * The opacity of the button's {@link #glyph} icon
+ *
+ * @param {number} $arrow-width
+ * The width of the button's {@link #cfg-menu} arrow
+ *
+ * @param {number} $arrow-height
+ * The height of the button's {@link #cfg-menu} arrow
+ *
+ * @param {number} $split-width
+ * The width of a {@link Ext.button.Split Split Button}'s arrow
+ *
+ * @param {number} $split-height
+ * The height of a {@link Ext.button.Split Split Button}'s arrow
+ *
+ * @param {boolean} [$include-ui-menu-arrows=$button-include-ui-menu-arrows]
+ * True to include the UI name in the file name of the {@link #cfg-menu}
+ * arrow icon. Set this to false to share the same arrow bewteen multiple UIs.
+ *
+ * @param {boolean} [$include-ui-split-arrows=$button-include-ui-split-arrows]
+ * True to include the UI name in the file name of the {@link Ext.button.Split Split Button}'s
+ * arrow icon. Set this to false to share the same arrow bewteen multiple UIs.
+ *
+ * @param {boolean} [$include-split-noline-arrows=false]
+ * True to add a "-noline" suffix to the file name of the {@link Ext.button.Split Split Button}'s 
+ * arrow icon.  Used for hiding the split line when toolbar buttons are in their default
+ * state.
+ *
+ * @param {boolean} [$include-split-over-arrows=$button-include-split-over-arrows]
+ * True to use a separate icon for {@link Ext.button.Split Split Button}s when the cursor
+ * is over the button.  The over icon file name will have a "-o" suffix
+ *
+ * @param {number} [$opacity-disabled=1]
+ * The opacity of the button when it is disabled
+ *
+ * @param {number} [$inner-opacity-disabled=1]
+ * The opacity of the button's text and icon elements when when the button is disabled
+ * 
+ * @member Ext.button.Button
+ */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small {
+  border-color: #126daf;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: #3892d3;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4b9cd7), color-stop(50%, #3892d3), color-stop(51%, #358ac8), color-stop(100%, #3892d3));
+  background-image: -webkit-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: -moz-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: -o-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-mc {
+  background-image: url(images/btn/btn-default-small-fbg.gif);
+  background-position: 0 top;
+  background-color: #3892d3;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-default-small {
+  background-image: url(images/btn/btn-default-small-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-default-small {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-default-small-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tr,
+.x-btn-default-small-br,
+.x-btn-default-small-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tl,
+.x-btn-default-small-bl,
+.x-btn-default-small-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-tl,
+.x-btn-default-small-bl,
+.x-btn-default-small-tr,
+.x-btn-default-small-br,
+.x-btn-default-small-tc,
+.x-btn-default-small-bc,
+.x-btn-default-small-ml,
+.x-btn-default-small-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-small-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-ml,
+.x-btn-default-small-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-small-sides.gif);
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-small-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-default-small-tl,
+.x-strict .x-ie7 .x-btn-default-small-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-small:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-default-small-fbg.gif), bg:url(images/btn/btn-default-small-bg.gif), corners:url(images/btn/btn-default-small-corners.gif), sides:url(images/btn/btn-default-small-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-inner {
+  font-size: 12px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: white;
+  padding: 0 5px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-arrow {
+  background-image: url(images/button/default-small-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-arrow-right {
+  padding-right: 21px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-arrow-bottom {
+  padding-bottom: 18px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-glyph {
+  font-size: 16px;
+  line-height: 16px;
+  color: white;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-default-small .x-btn-glyph {
+  color: #9bc8e9;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-disabled {
+  border-color: #157fcc;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon .x-btn-button,
+.x-btn-default-small-noicon .x-btn-button {
+  height: 16px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon .x-btn-inner,
+.x-btn-default-small-noicon .x-btn-inner {
+  line-height: 16px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-small-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-small-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon .x-btn-inner {
+  width: 16px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon .x-btn-icon-el {
+  width: 16px;
+  height: 16px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-left .x-btn-button {
+  height: 16px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-left .x-btn-inner {
+  line-height: 16px;
+  padding-left: 21px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-left .x-btn-icon-el {
+  width: 16px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-small-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-default-small-icon-text-left .x-btn-icon-el {
+  height: 16px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-right .x-btn-button {
+  height: 16px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-right .x-btn-inner {
+  line-height: 16px;
+  padding-right: 21px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-right .x-btn-icon-el {
+  width: 16px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-small-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-default-small-icon-text-right .x-btn-icon-el {
+  height: 16px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-top .x-btn-inner {
+  padding-top: 21px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-top .x-btn-icon-el {
+  height: 16px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-small-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-small-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-bottom .x-btn-inner {
+  padding-bottom: 21px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-icon-text-bottom .x-btn-icon-el {
+  height: 16px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-small-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-small-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-over {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #3386c2;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4792c8), color-stop(50%, #3386c2), color-stop(51%, #307fb8), color-stop(100%, #3386c2));
+  background-image: -webkit-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -moz-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -o-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-focus {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #3386c2;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4792c8), color-stop(50%, #3386c2), color-stop(51%, #307fb8), color-stop(100%, #3386c2));
+  background-image: -webkit-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -moz-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -o-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-menu-active,
+.x-btn-default-small-pressed {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #2a6d9e;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a6d9e), color-stop(50%, #276796), color-stop(51%, #2a6d9e), color-stop(100%, #3f7ba7));
+  background-image: -webkit-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: -moz-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: -o-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-over .x-frame-tl,
+.x-btn-default-small-over .x-frame-bl,
+.x-btn-default-small-over .x-frame-tr,
+.x-btn-default-small-over .x-frame-br,
+.x-btn-default-small-over .x-frame-tc,
+.x-btn-default-small-over .x-frame-bc {
+  background-image: url(images/btn/btn-default-small-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-over .x-frame-ml,
+.x-btn-default-small-over .x-frame-mr {
+  background-image: url(images/btn/btn-default-small-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-over .x-frame-mc {
+  background-color: #3386c2;
+  background-image: url(images/btn/btn-default-small-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-focus .x-frame-tl,
+.x-btn-default-small-focus .x-frame-bl,
+.x-btn-default-small-focus .x-frame-tr,
+.x-btn-default-small-focus .x-frame-br,
+.x-btn-default-small-focus .x-frame-tc,
+.x-btn-default-small-focus .x-frame-bc {
+  background-image: url(images/btn/btn-default-small-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-focus .x-frame-ml,
+.x-btn-default-small-focus .x-frame-mr {
+  background-image: url(images/btn/btn-default-small-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-focus .x-frame-mc {
+  background-color: #3386c2;
+  background-image: url(images/btn/btn-default-small-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-menu-active .x-frame-tl,
+.x-btn-default-small-menu-active .x-frame-bl,
+.x-btn-default-small-menu-active .x-frame-tr,
+.x-btn-default-small-menu-active .x-frame-br,
+.x-btn-default-small-menu-active .x-frame-tc,
+.x-btn-default-small-menu-active .x-frame-bc,
+.x-btn-default-small-pressed .x-frame-tl,
+.x-btn-default-small-pressed .x-frame-bl,
+.x-btn-default-small-pressed .x-frame-tr,
+.x-btn-default-small-pressed .x-frame-br,
+.x-btn-default-small-pressed .x-frame-tc,
+.x-btn-default-small-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-default-small-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-menu-active .x-frame-ml,
+.x-btn-default-small-menu-active .x-frame-mr,
+.x-btn-default-small-pressed .x-frame-ml,
+.x-btn-default-small-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-default-small-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-menu-active .x-frame-mc,
+.x-btn-default-small-pressed .x-frame-mc {
+  background-color: #2a6d9e;
+  background-image: url(images/btn/btn-default-small-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-disabled .x-frame-tl,
+.x-btn-default-small-disabled .x-frame-bl,
+.x-btn-default-small-disabled .x-frame-tr,
+.x-btn-default-small-disabled .x-frame-br,
+.x-btn-default-small-disabled .x-frame-tc,
+.x-btn-default-small-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-default-small-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-disabled .x-frame-ml,
+.x-btn-default-small-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-default-small-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-disabled .x-frame-mc {
+  background-color: null;
+  background-image: url(images/btn/btn-default-small-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-small-over {
+  background-image: url(images/btn/btn-default-small-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-small-focus {
+  background-image: url(images/btn/btn-default-small-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-small-menu-active,
+.x-nlg .x-btn-default-small-pressed {
+  background-image: url(images/btn/btn-default-small-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-small-disabled {
+  background-image: url(images/btn/btn-default-small-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-default-small {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-split-right {
+  background-image: url(images/button/default-small-s-arrow.png);
+  padding-right: 23px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small .x-btn-split-bottom {
+  background-image: url(images/button/default-small-s-arrow-b.png);
+  padding-bottom: 20px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-small-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-small-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-small-over-corners.gif), sides:url(images/btn/btn-default-small-over-sides.gif), frame-bg:url(images/btn/btn-default-small-over-fbg.gif), bg:url(images/btn/btn-default-small-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-small-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-small-focus-corners.gif), sides:url(images/btn/btn-default-small-focus-sides.gif), frame-bg:url(images/btn/btn-default-small-focus-fbg.gif), bg:url(images/btn/btn-default-small-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-small-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-small-pressed-corners.gif), sides:url(images/btn/btn-default-small-pressed-sides.gif), frame-bg:url(images/btn/btn-default-small-pressed-fbg.gif), bg:url(images/btn/btn-default-small-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-small-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-small-disabled-corners.gif), sides:url(images/btn/btn-default-small-disabled-sides.gif), frame-bg:url(images/btn/btn-default-small-disabled-fbg.gif), bg:url(images/btn/btn-default-small-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium {
+  border-color: #126daf;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: #3892d3;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4b9cd7), color-stop(50%, #3892d3), color-stop(51%, #358ac8), color-stop(100%, #3892d3));
+  background-image: -webkit-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: -moz-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: -o-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-mc {
+  background-image: url(images/btn/btn-default-medium-fbg.gif);
+  background-position: 0 top;
+  background-color: #3892d3;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-default-medium {
+  background-image: url(images/btn/btn-default-medium-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-default-medium {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-default-medium-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tr,
+.x-btn-default-medium-br,
+.x-btn-default-medium-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tl,
+.x-btn-default-medium-bl,
+.x-btn-default-medium-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-tl,
+.x-btn-default-medium-bl,
+.x-btn-default-medium-tr,
+.x-btn-default-medium-br,
+.x-btn-default-medium-tc,
+.x-btn-default-medium-bc,
+.x-btn-default-medium-ml,
+.x-btn-default-medium-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-medium-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-ml,
+.x-btn-default-medium-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-medium-sides.gif);
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-medium-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-default-medium-tl,
+.x-strict .x-ie7 .x-btn-default-medium-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-medium:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-default-medium-fbg.gif), bg:url(images/btn/btn-default-medium-bg.gif), corners:url(images/btn/btn-default-medium-corners.gif), sides:url(images/btn/btn-default-medium-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-inner {
+  font-size: 14px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: white;
+  padding: 0 8px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-arrow {
+  background-image: url(images/button/default-medium-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-arrow-right {
+  padding-right: 30px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-arrow-bottom {
+  padding-bottom: 26px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-glyph {
+  font-size: 24px;
+  line-height: 24px;
+  color: white;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-default-medium .x-btn-glyph {
+  color: #9bc8e9;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-disabled {
+  border-color: #157fcc;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon .x-btn-button,
+.x-btn-default-medium-noicon .x-btn-button {
+  height: 24px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon .x-btn-inner,
+.x-btn-default-medium-noicon .x-btn-inner {
+  line-height: 24px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-medium-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-medium-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon .x-btn-inner {
+  width: 24px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon .x-btn-icon-el {
+  width: 24px;
+  height: 24px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-left .x-btn-button {
+  height: 24px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-left .x-btn-inner {
+  line-height: 24px;
+  padding-left: 29px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-left .x-btn-icon-el {
+  width: 24px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-medium-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-default-medium-icon-text-left .x-btn-icon-el {
+  height: 24px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-right .x-btn-button {
+  height: 24px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-right .x-btn-inner {
+  line-height: 24px;
+  padding-right: 29px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-right .x-btn-icon-el {
+  width: 24px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-medium-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-default-medium-icon-text-right .x-btn-icon-el {
+  height: 24px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-top .x-btn-inner {
+  padding-top: 29px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-top .x-btn-icon-el {
+  height: 24px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-medium-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-medium-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-bottom .x-btn-inner {
+  padding-bottom: 29px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-icon-text-bottom .x-btn-icon-el {
+  height: 24px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-medium-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-medium-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-over {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #3386c2;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4792c8), color-stop(50%, #3386c2), color-stop(51%, #307fb8), color-stop(100%, #3386c2));
+  background-image: -webkit-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -moz-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -o-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-focus {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #3386c2;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4792c8), color-stop(50%, #3386c2), color-stop(51%, #307fb8), color-stop(100%, #3386c2));
+  background-image: -webkit-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -moz-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -o-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-menu-active,
+.x-btn-default-medium-pressed {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #2a6d9e;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a6d9e), color-stop(50%, #276796), color-stop(51%, #2a6d9e), color-stop(100%, #3f7ba7));
+  background-image: -webkit-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: -moz-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: -o-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-over .x-frame-tl,
+.x-btn-default-medium-over .x-frame-bl,
+.x-btn-default-medium-over .x-frame-tr,
+.x-btn-default-medium-over .x-frame-br,
+.x-btn-default-medium-over .x-frame-tc,
+.x-btn-default-medium-over .x-frame-bc {
+  background-image: url(images/btn/btn-default-medium-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-over .x-frame-ml,
+.x-btn-default-medium-over .x-frame-mr {
+  background-image: url(images/btn/btn-default-medium-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-over .x-frame-mc {
+  background-color: #3386c2;
+  background-image: url(images/btn/btn-default-medium-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-focus .x-frame-tl,
+.x-btn-default-medium-focus .x-frame-bl,
+.x-btn-default-medium-focus .x-frame-tr,
+.x-btn-default-medium-focus .x-frame-br,
+.x-btn-default-medium-focus .x-frame-tc,
+.x-btn-default-medium-focus .x-frame-bc {
+  background-image: url(images/btn/btn-default-medium-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-focus .x-frame-ml,
+.x-btn-default-medium-focus .x-frame-mr {
+  background-image: url(images/btn/btn-default-medium-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-focus .x-frame-mc {
+  background-color: #3386c2;
+  background-image: url(images/btn/btn-default-medium-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-menu-active .x-frame-tl,
+.x-btn-default-medium-menu-active .x-frame-bl,
+.x-btn-default-medium-menu-active .x-frame-tr,
+.x-btn-default-medium-menu-active .x-frame-br,
+.x-btn-default-medium-menu-active .x-frame-tc,
+.x-btn-default-medium-menu-active .x-frame-bc,
+.x-btn-default-medium-pressed .x-frame-tl,
+.x-btn-default-medium-pressed .x-frame-bl,
+.x-btn-default-medium-pressed .x-frame-tr,
+.x-btn-default-medium-pressed .x-frame-br,
+.x-btn-default-medium-pressed .x-frame-tc,
+.x-btn-default-medium-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-default-medium-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-menu-active .x-frame-ml,
+.x-btn-default-medium-menu-active .x-frame-mr,
+.x-btn-default-medium-pressed .x-frame-ml,
+.x-btn-default-medium-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-default-medium-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-menu-active .x-frame-mc,
+.x-btn-default-medium-pressed .x-frame-mc {
+  background-color: #2a6d9e;
+  background-image: url(images/btn/btn-default-medium-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-disabled .x-frame-tl,
+.x-btn-default-medium-disabled .x-frame-bl,
+.x-btn-default-medium-disabled .x-frame-tr,
+.x-btn-default-medium-disabled .x-frame-br,
+.x-btn-default-medium-disabled .x-frame-tc,
+.x-btn-default-medium-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-default-medium-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-disabled .x-frame-ml,
+.x-btn-default-medium-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-default-medium-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-disabled .x-frame-mc {
+  background-color: null;
+  background-image: url(images/btn/btn-default-medium-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-medium-over {
+  background-image: url(images/btn/btn-default-medium-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-medium-focus {
+  background-image: url(images/btn/btn-default-medium-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-medium-menu-active,
+.x-nlg .x-btn-default-medium-pressed {
+  background-image: url(images/btn/btn-default-medium-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-medium-disabled {
+  background-image: url(images/btn/btn-default-medium-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-default-medium {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-split-right {
+  background-image: url(images/button/default-medium-s-arrow.png);
+  padding-right: 32px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium .x-btn-split-bottom {
+  background-image: url(images/button/default-medium-s-arrow-b.png);
+  padding-bottom: 28px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-medium-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-medium-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-medium-over-corners.gif), sides:url(images/btn/btn-default-medium-over-sides.gif), frame-bg:url(images/btn/btn-default-medium-over-fbg.gif), bg:url(images/btn/btn-default-medium-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-medium-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-medium-focus-corners.gif), sides:url(images/btn/btn-default-medium-focus-sides.gif), frame-bg:url(images/btn/btn-default-medium-focus-fbg.gif), bg:url(images/btn/btn-default-medium-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-medium-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-medium-pressed-corners.gif), sides:url(images/btn/btn-default-medium-pressed-sides.gif), frame-bg:url(images/btn/btn-default-medium-pressed-fbg.gif), bg:url(images/btn/btn-default-medium-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-medium-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-medium-disabled-corners.gif), sides:url(images/btn/btn-default-medium-disabled-sides.gif), frame-bg:url(images/btn/btn-default-medium-disabled-fbg.gif), bg:url(images/btn/btn-default-medium-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large {
+  border-color: #126daf;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: #3892d3;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4b9cd7), color-stop(50%, #3892d3), color-stop(51%, #358ac8), color-stop(100%, #3892d3));
+  background-image: -webkit-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: -moz-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: -o-linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+  background-image: linear-gradient(top, #4b9cd7, #3892d3 50%, #358ac8 51%, #3892d3);
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-mc {
+  background-image: url(images/btn/btn-default-large-fbg.gif);
+  background-position: 0 top;
+  background-color: #3892d3;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-default-large {
+  background-image: url(images/btn/btn-default-large-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-default-large {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-default-large-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tr,
+.x-btn-default-large-br,
+.x-btn-default-large-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tl,
+.x-btn-default-large-bl,
+.x-btn-default-large-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-tl,
+.x-btn-default-large-bl,
+.x-btn-default-large-tr,
+.x-btn-default-large-br,
+.x-btn-default-large-tc,
+.x-btn-default-large-bc,
+.x-btn-default-large-ml,
+.x-btn-default-large-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-large-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-ml,
+.x-btn-default-large-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-large-sides.gif);
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-large-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-default-large-tl,
+.x-strict .x-ie7 .x-btn-default-large-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-large:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-default-large-fbg.gif), bg:url(images/btn/btn-default-large-bg.gif), corners:url(images/btn/btn-default-large-corners.gif), sides:url(images/btn/btn-default-large-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-inner {
+  font-size: 16px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: white;
+  padding: 0 10px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-arrow {
+  background-image: url(images/button/default-large-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-arrow-right {
+  padding-right: 36px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-arrow-bottom {
+  padding-bottom: 32px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-glyph {
+  font-size: 32px;
+  line-height: 32px;
+  color: white;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-default-large .x-btn-glyph {
+  color: #9bc8e9;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-disabled {
+  border-color: #157fcc;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon .x-btn-button,
+.x-btn-default-large-noicon .x-btn-button {
+  height: 32px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon .x-btn-inner,
+.x-btn-default-large-noicon .x-btn-inner {
+  line-height: 32px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-large-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-large-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon .x-btn-inner {
+  width: 32px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon .x-btn-icon-el {
+  width: 32px;
+  height: 32px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-left .x-btn-button {
+  height: 32px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-left .x-btn-inner {
+  line-height: 32px;
+  padding-left: 37px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-left .x-btn-icon-el {
+  width: 32px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-large-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-default-large-icon-text-left .x-btn-icon-el {
+  height: 32px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-right .x-btn-button {
+  height: 32px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-right .x-btn-inner {
+  line-height: 32px;
+  padding-right: 37px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-right .x-btn-icon-el {
+  width: 32px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-large-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-default-large-icon-text-right .x-btn-icon-el {
+  height: 32px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-top .x-btn-inner {
+  padding-top: 37px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-top .x-btn-icon-el {
+  height: 32px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-large-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-large-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-bottom .x-btn-inner {
+  padding-bottom: 37px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-icon-text-bottom .x-btn-icon-el {
+  height: 32px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-large-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-large-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-over {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #3386c2;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4792c8), color-stop(50%, #3386c2), color-stop(51%, #307fb8), color-stop(100%, #3386c2));
+  background-image: -webkit-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -moz-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -o-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-focus {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #3386c2;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4792c8), color-stop(50%, #3386c2), color-stop(51%, #307fb8), color-stop(100%, #3386c2));
+  background-image: -webkit-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -moz-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: -o-linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+  background-image: linear-gradient(top, #4792c8, #3386c2 50%, #307fb8 51%, #3386c2);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-menu-active,
+.x-btn-default-large-pressed {
+  border-color: #157fcc;
+  background-image: none;
+  background-color: #2a6d9e;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a6d9e), color-stop(50%, #276796), color-stop(51%, #2a6d9e), color-stop(100%, #3f7ba7));
+  background-image: -webkit-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: -moz-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: -o-linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+  background-image: linear-gradient(top, #2a6d9e, #276796 50%, #2a6d9e 51%, #3f7ba7);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-over .x-frame-tl,
+.x-btn-default-large-over .x-frame-bl,
+.x-btn-default-large-over .x-frame-tr,
+.x-btn-default-large-over .x-frame-br,
+.x-btn-default-large-over .x-frame-tc,
+.x-btn-default-large-over .x-frame-bc {
+  background-image: url(images/btn/btn-default-large-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-over .x-frame-ml,
+.x-btn-default-large-over .x-frame-mr {
+  background-image: url(images/btn/btn-default-large-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-over .x-frame-mc {
+  background-color: #3386c2;
+  background-image: url(images/btn/btn-default-large-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-focus .x-frame-tl,
+.x-btn-default-large-focus .x-frame-bl,
+.x-btn-default-large-focus .x-frame-tr,
+.x-btn-default-large-focus .x-frame-br,
+.x-btn-default-large-focus .x-frame-tc,
+.x-btn-default-large-focus .x-frame-bc {
+  background-image: url(images/btn/btn-default-large-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-focus .x-frame-ml,
+.x-btn-default-large-focus .x-frame-mr {
+  background-image: url(images/btn/btn-default-large-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-focus .x-frame-mc {
+  background-color: #3386c2;
+  background-image: url(images/btn/btn-default-large-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-menu-active .x-frame-tl,
+.x-btn-default-large-menu-active .x-frame-bl,
+.x-btn-default-large-menu-active .x-frame-tr,
+.x-btn-default-large-menu-active .x-frame-br,
+.x-btn-default-large-menu-active .x-frame-tc,
+.x-btn-default-large-menu-active .x-frame-bc,
+.x-btn-default-large-pressed .x-frame-tl,
+.x-btn-default-large-pressed .x-frame-bl,
+.x-btn-default-large-pressed .x-frame-tr,
+.x-btn-default-large-pressed .x-frame-br,
+.x-btn-default-large-pressed .x-frame-tc,
+.x-btn-default-large-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-default-large-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-menu-active .x-frame-ml,
+.x-btn-default-large-menu-active .x-frame-mr,
+.x-btn-default-large-pressed .x-frame-ml,
+.x-btn-default-large-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-default-large-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-menu-active .x-frame-mc,
+.x-btn-default-large-pressed .x-frame-mc {
+  background-color: #2a6d9e;
+  background-image: url(images/btn/btn-default-large-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-disabled .x-frame-tl,
+.x-btn-default-large-disabled .x-frame-bl,
+.x-btn-default-large-disabled .x-frame-tr,
+.x-btn-default-large-disabled .x-frame-br,
+.x-btn-default-large-disabled .x-frame-tc,
+.x-btn-default-large-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-default-large-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-disabled .x-frame-ml,
+.x-btn-default-large-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-default-large-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-disabled .x-frame-mc {
+  background-color: null;
+  background-image: url(images/btn/btn-default-large-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-large-over {
+  background-image: url(images/btn/btn-default-large-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-large-focus {
+  background-image: url(images/btn/btn-default-large-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-large-menu-active,
+.x-nlg .x-btn-default-large-pressed {
+  background-image: url(images/btn/btn-default-large-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-large-disabled {
+  background-image: url(images/btn/btn-default-large-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-default-large {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-split-right {
+  background-image: url(images/button/default-large-s-arrow.png);
+  padding-right: 38px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large .x-btn-split-bottom {
+  background-image: url(images/button/default-large-s-arrow-b.png);
+  padding-bottom: 34px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-large-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-large-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-large-over-corners.gif), sides:url(images/btn/btn-default-large-over-sides.gif), frame-bg:url(images/btn/btn-default-large-over-fbg.gif), bg:url(images/btn/btn-default-large-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-large-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-large-focus-corners.gif), sides:url(images/btn/btn-default-large-focus-sides.gif), frame-bg:url(images/btn/btn-default-large-focus-fbg.gif), bg:url(images/btn/btn-default-large-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-large-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-large-pressed-corners.gif), sides:url(images/btn/btn-default-large-pressed-sides.gif), frame-bg:url(images/btn/btn-default-large-pressed-fbg.gif), bg:url(images/btn/btn-default-large-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-large-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-large-disabled-corners.gif), sides:url(images/btn/btn-default-large-disabled-sides.gif), frame-bg:url(images/btn/btn-default-large-disabled-fbg.gif), bg:url(images/btn/btn-default-large-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small {
+  border-color: #e1e1e1;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: #f5f5f5;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(50%, #f5f5f5), color-stop(51%, #e8e8e8), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-mc {
+  background-image: url(images/btn/btn-default-toolbar-small-fbg.gif);
+  background-position: 0 top;
+  background-color: #f5f5f5;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-default-toolbar-small {
+  background-image: url(images/btn/btn-default-toolbar-small-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-default-toolbar-small {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-default-toolbar-small-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tr,
+.x-btn-default-toolbar-small-br,
+.x-btn-default-toolbar-small-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tl,
+.x-btn-default-toolbar-small-bl,
+.x-btn-default-toolbar-small-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-tl,
+.x-btn-default-toolbar-small-bl,
+.x-btn-default-toolbar-small-tr,
+.x-btn-default-toolbar-small-br,
+.x-btn-default-toolbar-small-tc,
+.x-btn-default-toolbar-small-bc,
+.x-btn-default-toolbar-small-ml,
+.x-btn-default-toolbar-small-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-toolbar-small-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-ml,
+.x-btn-default-toolbar-small-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-toolbar-small-sides.gif);
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-small-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-default-toolbar-small-tl,
+.x-strict .x-ie7 .x-btn-default-toolbar-small-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-small:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-default-toolbar-small-fbg.gif), bg:url(images/btn/btn-default-toolbar-small-bg.gif), corners:url(images/btn/btn-default-toolbar-small-corners.gif), sides:url(images/btn/btn-default-toolbar-small-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-inner {
+  font-size: 12px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: #666666;
+  padding: 0 5px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-arrow {
+  background-image: url(images/button/default-toolbar-small-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-arrow-right {
+  padding-right: 21px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-arrow-bottom {
+  padding-bottom: 18px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-glyph {
+  font-size: 16px;
+  line-height: 16px;
+  color: #666666;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-default-toolbar-small .x-btn-glyph {
+  color: #adadad;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-disabled {
+  background-image: none;
+  background-color: #f5f5f5;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(50%, #f5f5f5), color-stop(51%, #e8e8e8), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon .x-btn-button,
+.x-btn-default-toolbar-small-noicon .x-btn-button {
+  height: 16px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon .x-btn-inner,
+.x-btn-default-toolbar-small-noicon .x-btn-inner {
+  line-height: 16px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-toolbar-small-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-toolbar-small-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon .x-btn-inner {
+  width: 16px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon .x-btn-icon-el {
+  width: 16px;
+  height: 16px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-left .x-btn-button {
+  height: 16px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-left .x-btn-inner {
+  line-height: 16px;
+  padding-left: 21px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-left .x-btn-icon-el {
+  width: 16px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-small-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-default-toolbar-small-icon-text-left .x-btn-icon-el {
+  height: 16px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-right .x-btn-button {
+  height: 16px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-right .x-btn-inner {
+  line-height: 16px;
+  padding-right: 21px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-right .x-btn-icon-el {
+  width: 16px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-small-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-default-toolbar-small-icon-text-right .x-btn-icon-el {
+  height: 16px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-top .x-btn-inner {
+  padding-top: 21px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-top .x-btn-icon-el {
+  height: 16px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-small-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-toolbar-small-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-bottom .x-btn-inner {
+  padding-bottom: 21px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-icon-text-bottom .x-btn-icon-el {
+  height: 16px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-small-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-toolbar-small-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-over {
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-focus {
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-menu-active,
+.x-btn-default-toolbar-small-pressed {
+  background-image: none;
+  background-color: #e1e1e1;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e1e1e1), color-stop(50%, #d5d5d5), color-stop(51%, #e1e1e1), color-stop(100%, #e4e4e4));
+  background-image: -webkit-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -moz-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -o-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-over .x-frame-tl,
+.x-btn-default-toolbar-small-over .x-frame-bl,
+.x-btn-default-toolbar-small-over .x-frame-tr,
+.x-btn-default-toolbar-small-over .x-frame-br,
+.x-btn-default-toolbar-small-over .x-frame-tc,
+.x-btn-default-toolbar-small-over .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-small-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-over .x-frame-ml,
+.x-btn-default-toolbar-small-over .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-small-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-over .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-default-toolbar-small-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-focus .x-frame-tl,
+.x-btn-default-toolbar-small-focus .x-frame-bl,
+.x-btn-default-toolbar-small-focus .x-frame-tr,
+.x-btn-default-toolbar-small-focus .x-frame-br,
+.x-btn-default-toolbar-small-focus .x-frame-tc,
+.x-btn-default-toolbar-small-focus .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-small-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-focus .x-frame-ml,
+.x-btn-default-toolbar-small-focus .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-small-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-focus .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-default-toolbar-small-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-menu-active .x-frame-tl,
+.x-btn-default-toolbar-small-menu-active .x-frame-bl,
+.x-btn-default-toolbar-small-menu-active .x-frame-tr,
+.x-btn-default-toolbar-small-menu-active .x-frame-br,
+.x-btn-default-toolbar-small-menu-active .x-frame-tc,
+.x-btn-default-toolbar-small-menu-active .x-frame-bc,
+.x-btn-default-toolbar-small-pressed .x-frame-tl,
+.x-btn-default-toolbar-small-pressed .x-frame-bl,
+.x-btn-default-toolbar-small-pressed .x-frame-tr,
+.x-btn-default-toolbar-small-pressed .x-frame-br,
+.x-btn-default-toolbar-small-pressed .x-frame-tc,
+.x-btn-default-toolbar-small-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-small-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-menu-active .x-frame-ml,
+.x-btn-default-toolbar-small-menu-active .x-frame-mr,
+.x-btn-default-toolbar-small-pressed .x-frame-ml,
+.x-btn-default-toolbar-small-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-small-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-menu-active .x-frame-mc,
+.x-btn-default-toolbar-small-pressed .x-frame-mc {
+  background-color: #e1e1e1;
+  background-image: url(images/btn/btn-default-toolbar-small-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-disabled .x-frame-tl,
+.x-btn-default-toolbar-small-disabled .x-frame-bl,
+.x-btn-default-toolbar-small-disabled .x-frame-tr,
+.x-btn-default-toolbar-small-disabled .x-frame-br,
+.x-btn-default-toolbar-small-disabled .x-frame-tc,
+.x-btn-default-toolbar-small-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-small-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-disabled .x-frame-ml,
+.x-btn-default-toolbar-small-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-small-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-disabled .x-frame-mc {
+  background-color: #f5f5f5;
+  background-image: url(images/btn/btn-default-toolbar-small-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-small-over {
+  background-image: url(images/btn/btn-default-toolbar-small-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-small-focus {
+  background-image: url(images/btn/btn-default-toolbar-small-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-small-menu-active,
+.x-nlg .x-btn-default-toolbar-small-pressed {
+  background-image: url(images/btn/btn-default-toolbar-small-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-small-disabled {
+  background-image: url(images/btn/btn-default-toolbar-small-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-default-toolbar-small {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-split-right {
+  background-image: url(images/button/default-toolbar-small-s-arrow.png);
+  padding-right: 23px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small .x-btn-split-bottom {
+  background-image: url(images/button/default-toolbar-small-s-arrow-b.png);
+  padding-bottom: 20px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-small-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-small-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-small-over-corners.gif), sides:url(images/btn/btn-default-toolbar-small-over-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-small-over-fbg.gif), bg:url(images/btn/btn-default-toolbar-small-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-small-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-small-focus-corners.gif), sides:url(images/btn/btn-default-toolbar-small-focus-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-small-focus-fbg.gif), bg:url(images/btn/btn-default-toolbar-small-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-small-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-small-pressed-corners.gif), sides:url(images/btn/btn-default-toolbar-small-pressed-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-small-pressed-fbg.gif), bg:url(images/btn/btn-default-toolbar-small-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-small-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-small-disabled-corners.gif), sides:url(images/btn/btn-default-toolbar-small-disabled-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-small-disabled-fbg.gif), bg:url(images/btn/btn-default-toolbar-small-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium {
+  border-color: #e1e1e1;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: #f5f5f5;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(50%, #f5f5f5), color-stop(51%, #e8e8e8), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-mc {
+  background-image: url(images/btn/btn-default-toolbar-medium-fbg.gif);
+  background-position: 0 top;
+  background-color: #f5f5f5;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-default-toolbar-medium {
+  background-image: url(images/btn/btn-default-toolbar-medium-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-default-toolbar-medium {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-default-toolbar-medium-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tr,
+.x-btn-default-toolbar-medium-br,
+.x-btn-default-toolbar-medium-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tl,
+.x-btn-default-toolbar-medium-bl,
+.x-btn-default-toolbar-medium-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-tl,
+.x-btn-default-toolbar-medium-bl,
+.x-btn-default-toolbar-medium-tr,
+.x-btn-default-toolbar-medium-br,
+.x-btn-default-toolbar-medium-tc,
+.x-btn-default-toolbar-medium-bc,
+.x-btn-default-toolbar-medium-ml,
+.x-btn-default-toolbar-medium-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-toolbar-medium-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-ml,
+.x-btn-default-toolbar-medium-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-toolbar-medium-sides.gif);
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-medium-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-default-toolbar-medium-tl,
+.x-strict .x-ie7 .x-btn-default-toolbar-medium-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-medium:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-default-toolbar-medium-fbg.gif), bg:url(images/btn/btn-default-toolbar-medium-bg.gif), corners:url(images/btn/btn-default-toolbar-medium-corners.gif), sides:url(images/btn/btn-default-toolbar-medium-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-inner {
+  font-size: 14px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: #666666;
+  padding: 0 8px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-arrow {
+  background-image: url(images/button/default-toolbar-medium-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-arrow-right {
+  padding-right: 30px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-arrow-bottom {
+  padding-bottom: 26px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-glyph {
+  font-size: 24px;
+  line-height: 24px;
+  color: #666666;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-default-toolbar-medium .x-btn-glyph {
+  color: #adadad;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-disabled {
+  background-image: none;
+  background-color: #f5f5f5;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(50%, #f5f5f5), color-stop(51%, #e8e8e8), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon .x-btn-button,
+.x-btn-default-toolbar-medium-noicon .x-btn-button {
+  height: 24px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon .x-btn-inner,
+.x-btn-default-toolbar-medium-noicon .x-btn-inner {
+  line-height: 24px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-toolbar-medium-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-toolbar-medium-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon .x-btn-inner {
+  width: 24px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon .x-btn-icon-el {
+  width: 24px;
+  height: 24px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-left .x-btn-button {
+  height: 24px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-left .x-btn-inner {
+  line-height: 24px;
+  padding-left: 29px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-left .x-btn-icon-el {
+  width: 24px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-medium-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-default-toolbar-medium-icon-text-left .x-btn-icon-el {
+  height: 24px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-right .x-btn-button {
+  height: 24px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-right .x-btn-inner {
+  line-height: 24px;
+  padding-right: 29px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-right .x-btn-icon-el {
+  width: 24px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-medium-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-default-toolbar-medium-icon-text-right .x-btn-icon-el {
+  height: 24px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-top .x-btn-inner {
+  padding-top: 29px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-top .x-btn-icon-el {
+  height: 24px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-medium-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-toolbar-medium-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-bottom .x-btn-inner {
+  padding-bottom: 29px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-icon-text-bottom .x-btn-icon-el {
+  height: 24px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-medium-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-toolbar-medium-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-over {
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-focus {
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-menu-active,
+.x-btn-default-toolbar-medium-pressed {
+  background-image: none;
+  background-color: #e1e1e1;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e1e1e1), color-stop(50%, #d5d5d5), color-stop(51%, #e1e1e1), color-stop(100%, #e4e4e4));
+  background-image: -webkit-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -moz-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -o-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-over .x-frame-tl,
+.x-btn-default-toolbar-medium-over .x-frame-bl,
+.x-btn-default-toolbar-medium-over .x-frame-tr,
+.x-btn-default-toolbar-medium-over .x-frame-br,
+.x-btn-default-toolbar-medium-over .x-frame-tc,
+.x-btn-default-toolbar-medium-over .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-medium-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-over .x-frame-ml,
+.x-btn-default-toolbar-medium-over .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-medium-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-over .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-default-toolbar-medium-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-focus .x-frame-tl,
+.x-btn-default-toolbar-medium-focus .x-frame-bl,
+.x-btn-default-toolbar-medium-focus .x-frame-tr,
+.x-btn-default-toolbar-medium-focus .x-frame-br,
+.x-btn-default-toolbar-medium-focus .x-frame-tc,
+.x-btn-default-toolbar-medium-focus .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-medium-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-focus .x-frame-ml,
+.x-btn-default-toolbar-medium-focus .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-medium-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-focus .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-default-toolbar-medium-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-menu-active .x-frame-tl,
+.x-btn-default-toolbar-medium-menu-active .x-frame-bl,
+.x-btn-default-toolbar-medium-menu-active .x-frame-tr,
+.x-btn-default-toolbar-medium-menu-active .x-frame-br,
+.x-btn-default-toolbar-medium-menu-active .x-frame-tc,
+.x-btn-default-toolbar-medium-menu-active .x-frame-bc,
+.x-btn-default-toolbar-medium-pressed .x-frame-tl,
+.x-btn-default-toolbar-medium-pressed .x-frame-bl,
+.x-btn-default-toolbar-medium-pressed .x-frame-tr,
+.x-btn-default-toolbar-medium-pressed .x-frame-br,
+.x-btn-default-toolbar-medium-pressed .x-frame-tc,
+.x-btn-default-toolbar-medium-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-medium-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-menu-active .x-frame-ml,
+.x-btn-default-toolbar-medium-menu-active .x-frame-mr,
+.x-btn-default-toolbar-medium-pressed .x-frame-ml,
+.x-btn-default-toolbar-medium-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-medium-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-menu-active .x-frame-mc,
+.x-btn-default-toolbar-medium-pressed .x-frame-mc {
+  background-color: #e1e1e1;
+  background-image: url(images/btn/btn-default-toolbar-medium-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-disabled .x-frame-tl,
+.x-btn-default-toolbar-medium-disabled .x-frame-bl,
+.x-btn-default-toolbar-medium-disabled .x-frame-tr,
+.x-btn-default-toolbar-medium-disabled .x-frame-br,
+.x-btn-default-toolbar-medium-disabled .x-frame-tc,
+.x-btn-default-toolbar-medium-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-medium-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-disabled .x-frame-ml,
+.x-btn-default-toolbar-medium-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-medium-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-disabled .x-frame-mc {
+  background-color: #f5f5f5;
+  background-image: url(images/btn/btn-default-toolbar-medium-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-medium-over {
+  background-image: url(images/btn/btn-default-toolbar-medium-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-medium-focus {
+  background-image: url(images/btn/btn-default-toolbar-medium-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-medium-menu-active,
+.x-nlg .x-btn-default-toolbar-medium-pressed {
+  background-image: url(images/btn/btn-default-toolbar-medium-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-medium-disabled {
+  background-image: url(images/btn/btn-default-toolbar-medium-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-default-toolbar-medium {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-split-right {
+  background-image: url(images/button/default-toolbar-medium-s-arrow.png);
+  padding-right: 32px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium .x-btn-split-bottom {
+  background-image: url(images/button/default-toolbar-medium-s-arrow-b.png);
+  padding-bottom: 28px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-medium-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-medium-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-medium-over-corners.gif), sides:url(images/btn/btn-default-toolbar-medium-over-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-medium-over-fbg.gif), bg:url(images/btn/btn-default-toolbar-medium-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-medium-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-medium-focus-corners.gif), sides:url(images/btn/btn-default-toolbar-medium-focus-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-medium-focus-fbg.gif), bg:url(images/btn/btn-default-toolbar-medium-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-medium-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-medium-pressed-corners.gif), sides:url(images/btn/btn-default-toolbar-medium-pressed-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-medium-pressed-fbg.gif), bg:url(images/btn/btn-default-toolbar-medium-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-medium-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-medium-disabled-corners.gif), sides:url(images/btn/btn-default-toolbar-medium-disabled-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-medium-disabled-fbg.gif), bg:url(images/btn/btn-default-toolbar-medium-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large {
+  border-color: #e1e1e1;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: #f5f5f5;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(50%, #f5f5f5), color-stop(51%, #e8e8e8), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-mc {
+  background-image: url(images/btn/btn-default-toolbar-large-fbg.gif);
+  background-position: 0 top;
+  background-color: #f5f5f5;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-default-toolbar-large {
+  background-image: url(images/btn/btn-default-toolbar-large-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-default-toolbar-large {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-default-toolbar-large-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tr,
+.x-btn-default-toolbar-large-br,
+.x-btn-default-toolbar-large-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tl,
+.x-btn-default-toolbar-large-bl,
+.x-btn-default-toolbar-large-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-tl,
+.x-btn-default-toolbar-large-bl,
+.x-btn-default-toolbar-large-tr,
+.x-btn-default-toolbar-large-br,
+.x-btn-default-toolbar-large-tc,
+.x-btn-default-toolbar-large-bc,
+.x-btn-default-toolbar-large-ml,
+.x-btn-default-toolbar-large-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-toolbar-large-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-ml,
+.x-btn-default-toolbar-large-mr {
+  zoom: 1;
+  background-image: url(images/btn/btn-default-toolbar-large-sides.gif);
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-default-toolbar-large-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-default-toolbar-large-tl,
+.x-strict .x-ie7 .x-btn-default-toolbar-large-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-large:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-default-toolbar-large-fbg.gif), bg:url(images/btn/btn-default-toolbar-large-bg.gif), corners:url(images/btn/btn-default-toolbar-large-corners.gif), sides:url(images/btn/btn-default-toolbar-large-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-inner {
+  font-size: 16px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: #666666;
+  padding: 0 10px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-arrow {
+  background-image: url(images/button/default-toolbar-large-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-arrow-right {
+  padding-right: 36px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-arrow-bottom {
+  padding-bottom: 32px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-glyph {
+  font-size: 32px;
+  line-height: 32px;
+  color: #666666;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-default-toolbar-large .x-btn-glyph {
+  color: #adadad;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-disabled {
+  background-image: none;
+  background-color: #f5f5f5;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(50%, #f5f5f5), color-stop(51%, #e8e8e8), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -moz-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: -o-linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+  background-image: linear-gradient(top, #f6f6f6, #f5f5f5 50%, #e8e8e8 51%, #f5f5f5);
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon .x-btn-button,
+.x-btn-default-toolbar-large-noicon .x-btn-button {
+  height: 32px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon .x-btn-inner,
+.x-btn-default-toolbar-large-noicon .x-btn-inner {
+  line-height: 32px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-toolbar-large-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-default-toolbar-large-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon .x-btn-inner {
+  width: 32px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon .x-btn-icon-el {
+  width: 32px;
+  height: 32px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-left .x-btn-button {
+  height: 32px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-left .x-btn-inner {
+  line-height: 32px;
+  padding-left: 37px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-left .x-btn-icon-el {
+  width: 32px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-large-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-default-toolbar-large-icon-text-left .x-btn-icon-el {
+  height: 32px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-right .x-btn-button {
+  height: 32px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-right .x-btn-inner {
+  line-height: 32px;
+  padding-right: 37px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-right .x-btn-icon-el {
+  width: 32px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-large-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-default-toolbar-large-icon-text-right .x-btn-icon-el {
+  height: 32px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-top .x-btn-inner {
+  padding-top: 37px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-top .x-btn-icon-el {
+  height: 32px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-large-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-toolbar-large-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-bottom .x-btn-inner {
+  padding-bottom: 37px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-icon-text-bottom .x-btn-icon-el {
+  height: 32px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-default-toolbar-large-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-default-toolbar-large-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-over {
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-focus {
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-menu-active,
+.x-btn-default-toolbar-large-pressed {
+  background-image: none;
+  background-color: #e1e1e1;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e1e1e1), color-stop(50%, #d5d5d5), color-stop(51%, #e1e1e1), color-stop(100%, #e4e4e4));
+  background-image: -webkit-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -moz-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -o-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-over .x-frame-tl,
+.x-btn-default-toolbar-large-over .x-frame-bl,
+.x-btn-default-toolbar-large-over .x-frame-tr,
+.x-btn-default-toolbar-large-over .x-frame-br,
+.x-btn-default-toolbar-large-over .x-frame-tc,
+.x-btn-default-toolbar-large-over .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-large-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-over .x-frame-ml,
+.x-btn-default-toolbar-large-over .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-large-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-over .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-default-toolbar-large-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-focus .x-frame-tl,
+.x-btn-default-toolbar-large-focus .x-frame-bl,
+.x-btn-default-toolbar-large-focus .x-frame-tr,
+.x-btn-default-toolbar-large-focus .x-frame-br,
+.x-btn-default-toolbar-large-focus .x-frame-tc,
+.x-btn-default-toolbar-large-focus .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-large-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-focus .x-frame-ml,
+.x-btn-default-toolbar-large-focus .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-large-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-focus .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-default-toolbar-large-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-menu-active .x-frame-tl,
+.x-btn-default-toolbar-large-menu-active .x-frame-bl,
+.x-btn-default-toolbar-large-menu-active .x-frame-tr,
+.x-btn-default-toolbar-large-menu-active .x-frame-br,
+.x-btn-default-toolbar-large-menu-active .x-frame-tc,
+.x-btn-default-toolbar-large-menu-active .x-frame-bc,
+.x-btn-default-toolbar-large-pressed .x-frame-tl,
+.x-btn-default-toolbar-large-pressed .x-frame-bl,
+.x-btn-default-toolbar-large-pressed .x-frame-tr,
+.x-btn-default-toolbar-large-pressed .x-frame-br,
+.x-btn-default-toolbar-large-pressed .x-frame-tc,
+.x-btn-default-toolbar-large-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-large-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-menu-active .x-frame-ml,
+.x-btn-default-toolbar-large-menu-active .x-frame-mr,
+.x-btn-default-toolbar-large-pressed .x-frame-ml,
+.x-btn-default-toolbar-large-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-large-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-menu-active .x-frame-mc,
+.x-btn-default-toolbar-large-pressed .x-frame-mc {
+  background-color: #e1e1e1;
+  background-image: url(images/btn/btn-default-toolbar-large-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-disabled .x-frame-tl,
+.x-btn-default-toolbar-large-disabled .x-frame-bl,
+.x-btn-default-toolbar-large-disabled .x-frame-tr,
+.x-btn-default-toolbar-large-disabled .x-frame-br,
+.x-btn-default-toolbar-large-disabled .x-frame-tc,
+.x-btn-default-toolbar-large-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-default-toolbar-large-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-disabled .x-frame-ml,
+.x-btn-default-toolbar-large-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-default-toolbar-large-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-disabled .x-frame-mc {
+  background-color: #f5f5f5;
+  background-image: url(images/btn/btn-default-toolbar-large-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-large-over {
+  background-image: url(images/btn/btn-default-toolbar-large-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-large-focus {
+  background-image: url(images/btn/btn-default-toolbar-large-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-large-menu-active,
+.x-nlg .x-btn-default-toolbar-large-pressed {
+  background-image: url(images/btn/btn-default-toolbar-large-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-default-toolbar-large-disabled {
+  background-image: url(images/btn/btn-default-toolbar-large-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-default-toolbar-large {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-split-right {
+  background-image: url(images/button/default-toolbar-large-s-arrow.png);
+  padding-right: 38px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large .x-btn-split-bottom {
+  background-image: url(images/button/default-toolbar-large-s-arrow-b.png);
+  padding-bottom: 34px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-default-toolbar-large-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-large-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-large-over-corners.gif), sides:url(images/btn/btn-default-toolbar-large-over-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-large-over-fbg.gif), bg:url(images/btn/btn-default-toolbar-large-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-large-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-large-focus-corners.gif), sides:url(images/btn/btn-default-toolbar-large-focus-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-large-focus-fbg.gif), bg:url(images/btn/btn-default-toolbar-large-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-large-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-large-pressed-corners.gif), sides:url(images/btn/btn-default-toolbar-large-pressed-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-large-pressed-fbg.gif), bg:url(images/btn/btn-default-toolbar-large-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-default-toolbar-large-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-default-toolbar-large-disabled-corners.gif), sides:url(images/btn/btn-default-toolbar-large-disabled-sides.gif), frame-bg:url(images/btn/btn-default-toolbar-large-disabled-fbg.gif), bg:url(images/btn/btn-default-toolbar-large-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 1161, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-icon-text-left .x-btn-icon-el {
+  background-position: left center;
+}
+
+/* line 1173, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-icon-text-right .x-btn-icon-el {
+  background-position: right center;
+}
+
+/* line 1184, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-icon-text-top .x-btn-icon-el {
+  background-position: center top;
+}
+
+/* line 1188, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-icon-text-bottom .x-btn-icon-el {
+  background-position: center bottom;
+}
+
+/* line 1192, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-arrow-right {
+  background-position: right center;
+}
+
+/* line 1202, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-arrow-bottom {
+  background-position: center bottom;
+}
+
+/* line 1206, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-arrow {
+  background-repeat: no-repeat;
+}
+
+/* line 1211, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-split {
+  display: block;
+  background-repeat: no-repeat;
+}
+
+/* line 1216, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-split-right {
+  background-position: right center;
+}
+
+/* line 1226, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-split-bottom {
+  background-position: center bottom;
+}
+
+/* line 1230, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-cycle-fixed-width .x-btn-inner {
+  text-align: inherit;
+}
+
+/**
+ * Creates a visual theme for a Toolbar.
+ * @param {String} $ui
+ * The name of the UI
+ *
+ * @param {color} [$background-color=$toolbar-background-color]
+ * The background color of the toolbar
+ *
+ * @param {string/list} [$background-gradient=$toolbar-background-gradient]
+ * The background gradient of the toolbar
+ *
+ * @param {color} [$border-color=$toolbar-border-color]
+ * The border color of the toolbar
+ *
+ * @param {number} [$border-width=$toolbar-border-width]
+ * The border-width of the toolbar
+ *
+ * @param {string} [$scroller-cursor=$toolbar-scroller-cursor]
+ * The cursor of Toolbar scrollers
+ *
+ * @param {string} [$scroller-cursor-disabled=$toolbar-scroller-cursor-disabled]
+ * The cursor of disabled Toolbar scrollers
+ *
+ * @param {number} [$scroller-opacity-disabled=$toolbar-scroller-opacity-disabled]
+ * The opacity of disabled Toolbar scrollers
+ *
+ * @param {string} [$tool-background-image=$toolbar-tool-background-image]
+ * The sprite to use for {@link Ext.panel.Tool Tools} on a Toolbar
+ *
+ * @member Ext.toolbar.Toolbar
+ */
+/* line 94, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar {
+  font-size: 13px;
+  border-style: solid;
+  padding: 6px 0 6px 8px;
+}
+
+/* line 101, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-item {
+  margin: 0 8px 0 0;
+}
+
+/* line 112, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-text {
+  margin: 0 6px 0 4px;
+  color: #333f49;
+  line-height: 16px;
+  font-family: helvetica, arial, verdana, sans-serif;
+  font-size: 12px;
+  font-weight: normal;
+}
+
+/* line 121, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-separator-horizontal {
+  margin: 0 8px 0 0;
+  height: 14px;
+  border-style: solid;
+  border-width: 0 0 0 1px;
+  border-left-color: #e1e1e1;
+  border-right-color: white;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-footer {
+  background: #dfeaf2;
+  border: 0;
+  margin: 0;
+  padding: 6px 0 6px 6px;
+}
+/* line 144, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-footer .x-toolbar-item {
+  margin: 0 6px 0 0;
+}
+
+/* line 149, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-spacer {
+  width: 2px;
+}
+
+/* line 154, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-more-icon {
+  background-image: url(images/toolbar/more.png) !important;
+  background-position: center center !important;
+  background-repeat: no-repeat;
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default {
+  border-color: silver;
+  border-width: 1px;
+  background-image: none;
+  background-color: white;
+}
+/* line 51, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-box-scroller {
+  cursor: pointer;
+}
+/* line 55, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-box-scroller-disabled {
+  cursor: default;
+}
+/* line 65, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-tool-img {
+  background-image: url(images/tools/tool-sprites-dark.png);
+  background-color: white;
+}
+
+/* line 166, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-scroll-left {
+  background-image: url(images/toolbar/scroll-left.png);
+  background-position: 0 0;
+  width: 16px;
+  height: 16px;
+  border-style: solid;
+  border-color: #8db2e3;
+  border-width: 0;
+  margin-top: 4px;
+}
+
+/* line 177, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-scroll-left-hover {
+  background-position: 0 0;
+}
+
+/* line 181, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-scroll-right {
+  background-image: url(images/toolbar/scroll-right.png);
+  width: 16px;
+  height: 16px;
+  border-style: solid;
+  border-color: #8db2e3;
+  border-width: 0;
+  margin-top: 4px;
+}
+
+/* line 191, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-scroll-right-hover {
+  background-position: -16px 0;
+}
+
+/* line 195, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar .x-box-menu-after {
+  margin: 0 8px 0 8px;
+}
+
+/* line 199, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-vertical {
+  padding: 6px 8px 0 8px;
+}
+/* line 202, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-vertical .x-toolbar-item {
+  margin: 0 0 6px 0;
+}
+/* line 206, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-vertical .x-toolbar-text {
+  margin: 4px 0 6px 0;
+}
+/* line 210, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-vertical .x-toolbar-separator-vertical {
+  margin: 0 5px 6px;
+  border-style: solid none;
+  border-width: 1px 0 0;
+  border-top-color: #e1e1e1;
+  border-bottom-color: white;
+}
+/* line 219, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-vertical .x-box-menu-after,
+.x-toolbar-vertical .x-rtl.x-box-menu-after {
+  margin: 6px 0 6px 0;
+  display: block;
+  float: none;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Header.scss */
+.x-header-draggable .x-header-body,
+.x-header-ghost {
+  cursor: move;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Header.scss */
+.x-header-text {
+  white-space: nowrap;
+}
+
+/**
+ * Creates a visual theme for a Panel
+ *
+ * @param {string} $ui-label
+ * The name of the UI being created. Can not included spaces or special punctuation
+ * (used in CSS class names).
+ * 
+ * @param {color} [$ui-border-color=$panel-border-color]
+ * The border-color of the Panel
+ *
+ * @param {number} [$ui-border-radius=$panel-border-radius]
+ * The border-radius of the Panel
+ *
+ * @param {number} [$ui-border-width=$panel-border-width]
+ * The border-width of the Panel
+ *
+ * @param {number} [$ui-padding=$panel-padding]
+ * The padding of the Panel
+ *
+ * @param {color} [$ui-header-color=$panel-header-color]
+ * The text color of the Header
+ *
+ * @param {string} [$ui-header-font-family=$panel-header-font-family]
+ * The font-family of the Header
+ *
+ * @param {number} [$ui-header-font-size=$panel-header-font-size]
+ * The font-size of the Header
+ *
+ * @param {string} [$ui-header-font-weight=$panel-header-font-weight]
+ * The font-weight of the Header
+ *
+ * @param {number} [$ui-header-line-height=$panel-header-line-height]
+ * The line-height of the Header
+ *
+ * @param {color} [$ui-header-border-color=$panel-header-border-color]
+ * The border-color of the Header
+ *
+ * @param {number} [$ui-header-border-width=$panel-header-border-width]
+ * The border-width of the Header
+ *
+ * @param {string} [$ui-header-border-style=$panel-header-border-style]
+ * The border-style of the Header
+ *
+ * @param {color} [$ui-header-background-color=$panel-header-background-color]
+ * The background-color of the Header
+ *
+ * @param {string/list} [$ui-header-background-gradient=$panel-header-background-gradient]
+ * The background-gradient of the Header. Can be either the name of a predefined gradient
+ * or a list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ *
+ * @param {color} [$ui-header-inner-border-color=$panel-header-inner-border-color]
+ * The inner border-color of the Header
+ *
+ * @param {number} [$ui-header-inner-border-width=$panel-header-inner-border-width]
+ * The inner border-width of the Header
+ *
+ * @param {number/list} [$ui-header-text-padding=$panel-header-text-padding]
+ * The padding of the Header's text element
+ *
+ * @param {string} [$ui-header-text-transform=$panel-header-text-transform]
+ * The text-transform of the Header
+ *
+ * @param {number/list} [$ui-header-padding=$panel-header-padding]
+ * The padding of the Header
+ *
+ * @param {number} [$ui-header-icon-width=$panel-header-icon-width]
+ * The width of the Header icon
+ *
+ * @param {number} [$ui-header-icon-height=$panel-header-icon-height]
+ * The height of the Header icon
+ *
+ * @param {number} [$ui-header-icon-spacing=$panel-header-icon-spacing]
+ * The space between the Header icon and text
+ *
+ * @param {list} [$ui-header-icon-background-position=$panel-header-icon-background-position]
+ * The background-position of the Header icon
+ *
+ * @param {color} [$ui-header-glyph-color=$panel-header-glyph-color]
+ * The color of the Header glyph icon
+ *
+ * @param {number} [$ui-header-glyph-opacity=$panel-header-glyph-opacity]
+ * The opacity of the Header glyph icon
+ *
+ * @param {number} [$ui-tool-spacing=$panel-tool-spacing]
+ * The space between the Panel {@link Ext.panel.Tool Tools}
+ *
+ * @param {string} [$ui-tool-background-image=$panel-tool-background-image]
+ * The background sprite to use for Panel {@link Ext.panel.Tool Tools}
+ *
+ * @param {color} [$ui-body-color=$panel-body-color]
+ * The color of text inside the Panel body
+ *
+ * @param {color} [$ui-body-border-color=$panel-body-border-color]
+ * The border-color of the Panel body
+ *
+ * @param {number} [$ui-body-border-width=$panel-body-border-width]
+ * The border-width of the Panel body
+ *
+ * @param {string} [$ui-body-border-style=$panel-body-border-style]
+ * The border-style of the Panel body
+ *
+ * @param {color} [$ui-body-background-color=$panel-body-background-color]
+ * The background-color of the Panel body
+ *
+ * @param {number} [$ui-body-font-size=$panel-body-font-size]
+ * The font-size of the Panel body
+ *
+ * @param {string} [$ui-body-font-weight=$panel-body-font-weight]
+ * The font-weight of the Panel body
+ *
+ * @param {string} [$ui-background-stretch-top=$panel-background-stretch-top]
+ * The direction to strech the background-gradient of top docked Headers when slicing images
+ * for IE using Sencha Cmd
+ *
+ * @param {string} [$ui-background-stretch-bottom=$panel-background-stretch-bottom]
+ * The direction to strech the background-gradient of bottom docked Headers when slicing images
+ * for IE using Sencha Cmd
+ *
+ * @param {string} [$ui-background-stretch-right=$panel-background-stretch-right]
+ * The direction to strech the background-gradient of right docked Headers when slicing images
+ * for IE using Sencha Cmd
+ *
+ * @param {string} [$ui-background-stretch-left=$panel-background-stretch-left]
+ * The direction to strech the background-gradient of left docked Headers when slicing images
+ * for IE using Sencha Cmd
+ *
+ * @param {boolean} [$ui-include-border-management-rules=$panel-include-border-management-rules]
+ * True to include neptune style border management rules.
+ *
+ * @param {color} [$ui-wrap-border-color=$panel-wrap-border-color]
+ * The color to apply to the border that wraps the body and docked items in a framed
+ * panel. The presence of the wrap border in a framed panel is controlled by the
+ * {@link #border} config. Only applicable when `$ui-include-border-management-rules` is
+ * `true`.
+ *
+ * @param {color} [$ui-wrap-border-width=$panel-wrap-border-width]
+ * The width to apply to the border that wraps the body and docked items in a framed
+ * panel. The presence of the wrap border in a framed panel is controlled by the
+ * {@link #border} config. Only applicable when `$ui-include-border-management-rules` is
+ * `true`.
+ *
+ * @member Ext.panel.Panel
+ */
+/* line 736, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-ghost {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/* line 206, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default {
+  border-color: #157fcc;
+  padding: 0;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default {
+  font-size: 13px;
+  border: 1px solid #157fcc;
+}
+/* line 219, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default .x-tool-img {
+  background-color: #157fcc;
+}
+
+/* line 232, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-horizontal {
+  padding: 9px 9px 10px 9px;
+}
+
+/* line 236, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-horizontal-noborder {
+  padding: 10px 10px 10px 10px;
+}
+
+/* line 240, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical {
+  padding: 9px 9px 9px 10px;
+}
+
+/* line 244, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical-noborder {
+  padding: 10px 10px 10px 10px;
+}
+
+/* line 260, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-text-container-default {
+  color: white;
+  font-size: 13px;
+  font-weight: bold;
+  font-family: arial, helvetica, verdana, sans-serif;
+  line-height: 15px;
+  padding: 1px 0 0;
+  text-transform: none;
+}
+
+/* line 272, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-body-default {
+  background: white;
+  border-color: #157fcc;
+  color: black;
+  font-size: 13px;
+  font-size: normal;
+  border-width: 1px;
+  border-style: solid;
+}
+
+/* line 432, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default {
+  background-image: none;
+  background-color: #157fcc;
+}
+
+/* line 436, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical {
+  background-image: none;
+  background-color: #157fcc;
+}
+
+/* line 494, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-collapsed-border-top {
+  border-bottom-width: 1px !important;
+}
+/* line 498, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-collapsed-border-right {
+  border-left-width: 1px !important;
+}
+/* line 502, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-collapsed-border-bottom {
+  border-top-width: 1px !important;
+}
+/* line 506, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-collapsed-border-left {
+  border-right-width: 1px !important;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-top:after {
+  display: none;
+  content: "x-slicer:stretch:bottom";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-bottom:after {
+  display: none;
+  content: "x-slicer:stretch:bottom";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-left:after {
+  display: none;
+  content: "x-slicer:stretch:left";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-right:after {
+  display: none;
+  content: "x-slicer:stretch:left";
+}
+
+/*</if slicer>*/
+/* */
+/* line 522, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical .x-panel-header-text-container {
+  -webkit-transform: rotate(90deg);
+  -webkit-transform-origin: 0 0;
+  -moz-transform: rotate(90deg);
+  -moz-transform-origin: 0 0;
+  -o-transform: rotate(90deg);
+  -o-transform-origin: 0 0;
+  transform: rotate(90deg);
+  transform-origin: 0 0;
+}
+/* line 36, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/rotate-element.scss */
+.x-ie9m .x-panel-header-default-vertical .x-panel-header-text-container {
+  background-color: #157fcc;
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1), progid:DXImageTransform.Microsoft.Chroma(color=#157fcc);
+}
+
+/* line 551, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default .x-panel-header-icon {
+  width: 16px;
+  height: 16px;
+  background-position: center center;
+}
+/* line 556, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default .x-panel-header-glyph {
+  color: white;
+  font-size: 16px;
+  line-height: 16px;
+  opacity: 0.5;
+}
+/* line 572, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-ie8m .x-panel-header-default .x-panel-header-glyph {
+  color: #8abfe5;
+}
+
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-horizontal .x-panel-header-icon-before-title {
+  margin: 0 6px 0 0;
+}
+/* line 590, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-horizontal .x-panel-header-icon-after-title {
+  margin: 0 0 0 6px;
+}
+
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical .x-panel-header-icon-before-title {
+  margin: 0 0 6px 0;
+}
+/* line 612, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical .x-panel-header-icon-after-title {
+  margin: 6px 0 0 0;
+}
+
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-horizontal .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 635, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-horizontal .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical .x-tool-after-title {
+  margin: 6px 0 0 0;
+}
+/* line 657, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-vertical .x-tool-before-title {
+  margin: 0 0 6px 0;
+}
+
+/* line 687, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-resizable .x-panel-handle {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-l {
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-b {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-bl {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-r {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-rl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-rb {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 32, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-rbl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 40, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-t {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+}
+
+/* line 44, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-tl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-tb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 56, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-tbl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 64, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-tr {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-trl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-trb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 86, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-outer-border-trbl {
+  border-color: #157fcc !important;
+  border-width: 1px !important;
+}
+
+/* line 206, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed {
+  border-color: #157fcc;
+  padding: 0;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed {
+  font-size: 13px;
+  border: 5px solid #157fcc;
+}
+/* line 219, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed .x-tool-img {
+  background-color: #157fcc;
+}
+
+/* line 232, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-horizontal {
+  padding: 5px;
+}
+
+/* line 236, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-horizontal-noborder {
+  padding: 10px 10px 5px 10px;
+}
+
+/* line 240, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 244, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical-noborder {
+  padding: 10px 10px 10px 5px;
+}
+
+/* line 260, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-text-container-default-framed {
+  color: white;
+  font-size: 13px;
+  font-weight: bold;
+  font-family: arial, helvetica, verdana, sans-serif;
+  line-height: 15px;
+  padding: 1px 0 0;
+  text-transform: none;
+}
+
+/* line 272, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-body-default-framed {
+  background: white;
+  border-color: #157fcc;
+  color: black;
+  font-size: 13px;
+  font-size: normal;
+  border-width: 1px;
+  border-style: solid;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 0px 0px 0px 0px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: white;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-mc {
+  background-color: white;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-default-framed {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-default-framed-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-0-0-0-0;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tr,
+.x-panel-default-framed-br,
+.x-panel-default-framed-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tl,
+.x-panel-default-framed-bl,
+.x-panel-default-framed-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-tl,
+.x-panel-default-framed-bl,
+.x-panel-default-framed-tr,
+.x-panel-default-framed-br,
+.x-panel-default-framed-tc,
+.x-panel-default-framed-bc,
+.x-panel-default-framed-ml,
+.x-panel-default-framed-mr {
+  zoom: 1;
+  background-image: url(images/panel/panel-default-framed-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-ml,
+.x-panel-default-framed-mr {
+  zoom: 1;
+  background-image: url(images/panel/panel-default-framed-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-default-framed-mc {
+  padding: 0px 0px 0px 0px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-default-framed-tl,
+.x-strict .x-ie7 .x-panel-default-framed-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-default-framed:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel/panel-default-framed-corners.gif), sides:url(images/panel/panel-default-framed-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 0 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-top {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-top-frameInfo {
+  font-family: dh-4-4-0-0-5-5-0-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tr,
+.x-panel-header-default-framed-top-br,
+.x-panel-header-default-framed-top-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tl,
+.x-panel-header-default-framed-top-bl,
+.x-panel-header-default-framed-top-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-bc {
+  height: 0;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-tl,
+.x-panel-header-default-framed-top-bl,
+.x-panel-header-default-framed-top-tr,
+.x-panel-header-default-framed-top-br,
+.x-panel-header-default-framed-top-tc,
+.x-panel-header-default-framed-top-bc,
+.x-panel-header-default-framed-top-ml,
+.x-panel-header-default-framed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-top-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-ml,
+.x-panel-header-default-framed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-top-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-top-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-top-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-top-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-top:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-top-corners.gif), sides:url(images/panel-header/panel-header-default-framed-top-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 5px 0;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-right {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-right-frameInfo {
+  font-family: dh-0-4-4-0-5-5-5-0-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-ml {
+  background-position: 0 right;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-mr {
+  background-position: right right;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tr,
+.x-panel-header-default-framed-right-br,
+.x-panel-header-default-framed-right-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tl,
+.x-panel-header-default-framed-right-bl,
+.x-panel-header-default-framed-right-ml {
+  padding-left: 0;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-tl,
+.x-panel-header-default-framed-right-bl,
+.x-panel-header-default-framed-right-tr,
+.x-panel-header-default-framed-right-br,
+.x-panel-header-default-framed-right-tc,
+.x-panel-header-default-framed-right-bc,
+.x-panel-header-default-framed-right-ml,
+.x-panel-header-default-framed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-right-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-ml,
+.x-panel-header-default-framed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-right-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-right-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-right-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-right-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-right:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-right-corners.gif), sides:url(images/panel-header/panel-header-default-framed-right-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 0 5px 5px 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-bottom {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-bottom-frameInfo {
+  font-family: dh-0-0-4-4-0-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-ml {
+  background-position: 0 bottom;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-mr {
+  background-position: right bottom;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tr,
+.x-panel-header-default-framed-bottom-br,
+.x-panel-header-default-framed-bottom-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tl,
+.x-panel-header-default-framed-bottom-bl,
+.x-panel-header-default-framed-bottom-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tc {
+  height: 0;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-tl,
+.x-panel-header-default-framed-bottom-bl,
+.x-panel-header-default-framed-bottom-tr,
+.x-panel-header-default-framed-bottom-br,
+.x-panel-header-default-framed-bottom-tc,
+.x-panel-header-default-framed-bottom-bc,
+.x-panel-header-default-framed-bottom-ml,
+.x-panel-header-default-framed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-bottom-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-ml,
+.x-panel-header-default-framed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-bottom-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-bottom-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-bottom-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-bottom-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-bottom:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-bottom-corners.gif), sides:url(images/panel-header/panel-header-default-framed-bottom-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 0 5px 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-left {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-left-frameInfo {
+  font-family: dh-4-0-0-4-5-0-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-ml {
+  background-position: 0 left;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-mr {
+  background-position: right left;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tr,
+.x-panel-header-default-framed-left-br,
+.x-panel-header-default-framed-left-mr {
+  padding-right: 0;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tl,
+.x-panel-header-default-framed-left-bl,
+.x-panel-header-default-framed-left-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-tl,
+.x-panel-header-default-framed-left-bl,
+.x-panel-header-default-framed-left-tr,
+.x-panel-header-default-framed-left-br,
+.x-panel-header-default-framed-left-tc,
+.x-panel-header-default-framed-left-bc,
+.x-panel-header-default-framed-left-ml,
+.x-panel-header-default-framed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-left-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-ml,
+.x-panel-header-default-framed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-left-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-left-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-left-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-left-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-left:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-left-corners.gif), sides:url(images/panel-header/panel-header-default-framed-left-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-top {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-collapsed-top-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tr,
+.x-panel-header-default-framed-collapsed-top-br,
+.x-panel-header-default-framed-collapsed-top-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tl,
+.x-panel-header-default-framed-collapsed-top-bl,
+.x-panel-header-default-framed-collapsed-top-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-tl,
+.x-panel-header-default-framed-collapsed-top-bl,
+.x-panel-header-default-framed-collapsed-top-tr,
+.x-panel-header-default-framed-collapsed-top-br,
+.x-panel-header-default-framed-collapsed-top-tc,
+.x-panel-header-default-framed-collapsed-top-bc,
+.x-panel-header-default-framed-collapsed-top-ml,
+.x-panel-header-default-framed-collapsed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-top-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-ml,
+.x-panel-header-default-framed-collapsed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-top-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-top-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-top-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-top-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-collapsed-top:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-collapsed-top-corners.gif), sides:url(images/panel-header/panel-header-default-framed-collapsed-top-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-right {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-collapsed-right-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-ml {
+  background-position: 0 right;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-mr {
+  background-position: right right;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tr,
+.x-panel-header-default-framed-collapsed-right-br,
+.x-panel-header-default-framed-collapsed-right-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tl,
+.x-panel-header-default-framed-collapsed-right-bl,
+.x-panel-header-default-framed-collapsed-right-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-tl,
+.x-panel-header-default-framed-collapsed-right-bl,
+.x-panel-header-default-framed-collapsed-right-tr,
+.x-panel-header-default-framed-collapsed-right-br,
+.x-panel-header-default-framed-collapsed-right-tc,
+.x-panel-header-default-framed-collapsed-right-bc,
+.x-panel-header-default-framed-collapsed-right-ml,
+.x-panel-header-default-framed-collapsed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-right-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-ml,
+.x-panel-header-default-framed-collapsed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-right-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-right-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-right-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-right-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-collapsed-right:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-collapsed-right-corners.gif), sides:url(images/panel-header/panel-header-default-framed-collapsed-right-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-bottom {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-collapsed-bottom-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-ml {
+  background-position: 0 bottom;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-mr {
+  background-position: right bottom;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tr,
+.x-panel-header-default-framed-collapsed-bottom-br,
+.x-panel-header-default-framed-collapsed-bottom-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tl,
+.x-panel-header-default-framed-collapsed-bottom-bl,
+.x-panel-header-default-framed-collapsed-bottom-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-tl,
+.x-panel-header-default-framed-collapsed-bottom-bl,
+.x-panel-header-default-framed-collapsed-bottom-tr,
+.x-panel-header-default-framed-collapsed-bottom-br,
+.x-panel-header-default-framed-collapsed-bottom-tc,
+.x-panel-header-default-framed-collapsed-bottom-bc,
+.x-panel-header-default-framed-collapsed-bottom-ml,
+.x-panel-header-default-framed-collapsed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-ml,
+.x-panel-header-default-framed-collapsed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-bottom-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-bottom-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-bottom-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-collapsed-bottom:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif), sides:url(images/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #157fcc;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-mc {
+  background-color: #157fcc;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-left {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-default-framed-collapsed-left-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-ml {
+  background-position: 0 left;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-mr {
+  background-position: right left;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tr,
+.x-panel-header-default-framed-collapsed-left-br,
+.x-panel-header-default-framed-collapsed-left-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tl,
+.x-panel-header-default-framed-collapsed-left-bl,
+.x-panel-header-default-framed-collapsed-left-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-tl,
+.x-panel-header-default-framed-collapsed-left-bl,
+.x-panel-header-default-framed-collapsed-left-tr,
+.x-panel-header-default-framed-collapsed-left-br,
+.x-panel-header-default-framed-collapsed-left-tc,
+.x-panel-header-default-framed-collapsed-left-bc,
+.x-panel-header-default-framed-collapsed-left-ml,
+.x-panel-header-default-framed-collapsed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-left-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-ml,
+.x-panel-header-default-framed-collapsed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-default-framed-collapsed-left-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-default-framed-collapsed-left-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-left-tl,
+.x-strict .x-ie7 .x-panel-header-default-framed-collapsed-left-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-default-framed-collapsed-left:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-default-framed-collapsed-left-corners.gif), sides:url(images/panel-header/panel-header-default-framed-collapsed-left-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 396, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-framed-top {
+  border-bottom-width: 5px !important;
+}
+/* line 400, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-framed-right {
+  border-left-width: 5px !important;
+}
+/* line 404, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-framed-bottom {
+  border-top-width: 5px !important;
+}
+/* line 408, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-default-framed-left {
+  border-right-width: 5px !important;
+}
+
+/* line 414, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-top {
+  border-bottom-width: 0 !important;
+}
+/* line 418, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-right {
+  border-left-width: 0 !important;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-bottom {
+  border-top-width: 0 !important;
+}
+/* line 426, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-default-framed-collapsed-left {
+  border-right-width: 0 !important;
+}
+
+/* line 522, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical .x-panel-header-text-container {
+  -webkit-transform: rotate(90deg);
+  -webkit-transform-origin: 0 0;
+  -moz-transform: rotate(90deg);
+  -moz-transform-origin: 0 0;
+  -o-transform: rotate(90deg);
+  -o-transform-origin: 0 0;
+  transform: rotate(90deg);
+  transform-origin: 0 0;
+}
+/* line 36, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/rotate-element.scss */
+.x-ie9m .x-panel-header-default-framed-vertical .x-panel-header-text-container {
+  background-color: #157fcc;
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1), progid:DXImageTransform.Microsoft.Chroma(color=#157fcc);
+}
+
+/* line 551, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed .x-panel-header-icon {
+  width: 16px;
+  height: 16px;
+  background-position: center center;
+}
+/* line 556, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed .x-panel-header-glyph {
+  color: white;
+  font-size: 16px;
+  line-height: 16px;
+  opacity: 0.5;
+}
+/* line 572, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-ie8m .x-panel-header-default-framed .x-panel-header-glyph {
+  color: #8abfe5;
+}
+
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-horizontal .x-panel-header-icon-before-title {
+  margin: 0 6px 0 0;
+}
+/* line 590, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-horizontal .x-panel-header-icon-after-title {
+  margin: 0 0 0 6px;
+}
+
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical .x-panel-header-icon-before-title {
+  margin: 0 0 6px 0;
+}
+/* line 612, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical .x-panel-header-icon-after-title {
+  margin: 6px 0 0 0;
+}
+
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-horizontal .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 635, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-horizontal .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical .x-tool-after-title {
+  margin: 6px 0 0 0;
+}
+/* line 657, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-default-framed-vertical .x-tool-before-title {
+  margin: 0 0 6px 0;
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable {
+  overflow: visible;
+}
+/* line 687, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+/* line 696, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-north-br {
+  top: -5px;
+}
+/* line 699, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-south-br {
+  bottom: -5px;
+}
+/* line 702, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-east-br {
+  right: -5px;
+}
+/* line 705, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-west-br {
+  left: -5px;
+}
+/* line 708, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-northwest-br {
+  left: -5px;
+  top: -5px;
+}
+/* line 712, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-northeast-br {
+  right: -5px;
+  top: -5px;
+}
+/* line 716, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-southeast-br {
+  right: -5px;
+  bottom: -5px;
+}
+/* line 720, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-default-framed-resizable .x-panel-handle-southwest-br {
+  left: -5px;
+  bottom: -5px;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-l {
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-b {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-bl {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-r {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-rl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-rb {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 32, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-rbl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 40, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-t {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+}
+
+/* line 44, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-tl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-tb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 56, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-tbl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 64, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-tr {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-trl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-trb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 86, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-default-framed-outer-border-trbl {
+  border-color: #157fcc !important;
+  border-width: 1px !important;
+}
+
+/**
+ * Creates a visual theme for a Ext.tip.Tip
+ *
+ * @param {string} $ui-label
+ * The name of the UI being created. Can not included spaces or special punctuation
+ * (used in CSS class names).
+ *
+ * @param {color} [$ui-border-color=$tip-border-color]
+ * The border-color of the Tip
+ *
+ * @param {number} [$ui-border-width=$tip-border-width]
+ * The border-width of the Tip
+ *
+ * @param {number} [$ui-border-radius=$tip-border-radius]
+ * The border-radius of the Tip
+ *
+ * @param {color} [$ui-background-color=$tip-background-color]
+ * The background-color of the Tip
+ *
+ * @param {string/list} [$ui-background-gradient=$tip-background-gradient]
+ * The background-gradient of the Tip. Can be either the name of a predefined gradient or a
+ * list of color stops. Used as the `$type` parameter for {@link Global_CSS#background-gradient}.
+ *
+ * @param {number} [$ui-tool-spacing=$tip-tool-spacing]
+ * The space between {@link Ext.panel.Tool Tools} in the header
+ *
+ * @param {string} [$ui-tool-background-image=$tip-tool-background-image]
+ * The sprite to use for the header {@link Ext.panel.Tool Tools}
+ *
+ * @param {number/list} [$ui-header-body-padding=$tip-header-body-padding]
+ * The padding of the Tip header's body element
+ *
+ * @param {color} [$ui-header-color=$tip-header-color]
+ * The text color of the Tip header
+ *
+ * @param {number} [$ui-header-font-size=$tip-header-font-size]
+ * The font-size of the Tip header
+ *
+ * @param {string} [$ui-header-font-weight=$tip-header-font-weight]
+ * The font-weight of the Tip header
+ *
+ * @param {number/list} [$ui-body-padding=$tip-body-padding]
+ * The padding of the Tip body
+ *
+ * @param {color} [$ui-body-color=$tip-body-color]
+ * The text color of the Tip body
+ *
+ * @param {number} [$ui-body-font-size=$tip-body-font-size]
+ * The font-size of the Tip body
+ *
+ * @param {string} [$ui-body-font-weight=$tip-body-font-weight]
+ * The font-weight of the Tip body
+ *
+ * @param {color} [$ui-body-link-color=$tip-body-link-color]
+ * The text color of any anchor tags inside the Tip body
+ *
+ * @param {number} [$ui-inner-border-width=0]
+ * The inner border-width of the Tip
+ *
+ * @param {color} [$ui-inner-border-color=#fff]
+ * The inner border-color of the Tip
+ *
+ * @member Ext.tip.Tip
+ */
+/* line 167, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-anchor {
+  position: absolute;
+  overflow: hidden;
+  height: 10px;
+  width: 10px;
+  border-style: solid;
+  border-width: 5px;
+  border-color: #e1e1e1;
+  zoom: 1;
+}
+/* line 182, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-content-box .x-tip-anchor {
+  height: 0;
+  width: 0;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-anchor-top {
+  border-top-color: transparent;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  _border-top-color: pink;
+  _border-left-color: pink;
+  _border-right-color: pink;
+  _filter: chroma(color=pink);
+}
+
+/* line 202, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-anchor-bottom {
+  border-bottom-color: transparent;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  _border-bottom-color: pink;
+  _border-left-color: pink;
+  _border-right-color: pink;
+  _filter: chroma(color=pink);
+}
+
+/* line 215, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-anchor-left {
+  border-top-color: transparent;
+  border-bottom-color: transparent;
+  border-left-color: transparent;
+  _border-top-color: pink;
+  _border-bottom-color: pink;
+  _border-left-color: pink;
+  _filter: chroma(color=pink);
+}
+
+/* line 228, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-anchor-right {
+  border-top-color: transparent;
+  border-bottom-color: transparent;
+  border-right-color: transparent;
+  _border-top-color: pink;
+  _border-bottom-color: pink;
+  _border-right-color: pink;
+  _filter: chroma(color=pink);
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 2px 2px 2px 2px;
+  border-width: 1px;
+  border-style: solid;
+  background-color: #eaf3fa;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-mc {
+  background-color: #eaf3fa;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-tip-default {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-tip-default-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-2-2-2-2;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tr,
+.x-tip-default-br,
+.x-tip-default-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tl,
+.x-tip-default-bl,
+.x-tip-default-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-tl,
+.x-tip-default-bl,
+.x-tip-default-tr,
+.x-tip-default-br,
+.x-tip-default-tc,
+.x-tip-default-bc,
+.x-tip-default-ml,
+.x-tip-default-mr {
+  zoom: 1;
+  background-image: url(images/tip/tip-default-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-ml,
+.x-tip-default-mr {
+  zoom: 1;
+  background-image: url(images/tip/tip-default-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-default-mc {
+  padding: 0px 0px 0px 0px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-tip-default-tl,
+.x-strict .x-ie7 .x-tip-default-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-tip-default:after {
+  display: none;
+  content: "x-slicer:corners:url(images/tip/tip-default-corners.gif), sides:url(images/tip/tip-default-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 100, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-default {
+  border-color: #e1e1e1;
+}
+/* line 109, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-default .x-tool-img {
+  background-image: url(images/tools/tool-sprites-dark.png);
+  background-color: #eaf3fa;
+}
+
+/* line 124, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-default .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 134, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-default .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 145, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-body-default {
+  padding: 3px 3px 0 3px;
+}
+
+/* line 149, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-text-container-default {
+  color: black;
+  font-size: 13px;
+  font-weight: bold;
+}
+
+/* line 155, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-default {
+  padding: 3px;
+  color: black;
+  font-size: 13px;
+  font-weight: normal;
+}
+/* line 160, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-default a {
+  color: black;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 2px 2px 2px 2px;
+  border-width: 1px;
+  border-style: solid;
+  background-color: #eaf3fa;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-mc {
+  background-color: #eaf3fa;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-tip-form-invalid {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-tip-form-invalid-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-2-2-2-2;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tr,
+.x-tip-form-invalid-br,
+.x-tip-form-invalid-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tl,
+.x-tip-form-invalid-bl,
+.x-tip-form-invalid-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-tl,
+.x-tip-form-invalid-bl,
+.x-tip-form-invalid-tr,
+.x-tip-form-invalid-br,
+.x-tip-form-invalid-tc,
+.x-tip-form-invalid-bc,
+.x-tip-form-invalid-ml,
+.x-tip-form-invalid-mr {
+  zoom: 1;
+  background-image: url(images/tip/tip-form-invalid-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-ml,
+.x-tip-form-invalid-mr {
+  zoom: 1;
+  background-image: url(images/tip/tip-form-invalid-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-tip-form-invalid-mc {
+  padding: 0px 0px 0px 0px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-tip-form-invalid-tl,
+.x-strict .x-ie7 .x-tip-form-invalid-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-tip-form-invalid:after {
+  display: none;
+  content: "x-slicer:corners:url(images/tip/tip-form-invalid-corners.gif), sides:url(images/tip/tip-form-invalid-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 100, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-form-invalid {
+  border-color: #e1e1e1;
+}
+/* line 109, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-form-invalid .x-tool-img {
+  background-image: url(images/tools/tool-sprites-dark.png);
+  background-color: #eaf3fa;
+}
+
+/* line 124, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-form-invalid .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 134, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-form-invalid .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 145, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-body-form-invalid {
+  padding: 3px 3px 0 3px;
+}
+
+/* line 149, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-header-text-container-form-invalid {
+  color: black;
+  font-size: 13px;
+  font-weight: bold;
+}
+
+/* line 155, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-form-invalid {
+  padding: 3px 3px 3px 22px;
+  color: black;
+  font-size: 13px;
+  font-weight: normal;
+}
+/* line 160, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-form-invalid a {
+  color: black;
+}
+
+/* line 265, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-form-invalid {
+  background: 1px 1px no-repeat;
+  background-image: url(images/form/exclamation.png);
+}
+/* line 268, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-form-invalid li {
+  margin-bottom: 4px;
+}
+/* line 270, ../../../../ext/packages/ext-theme-neutral/sass/src/tip/Tip.scss */
+.x-tip-body-form-invalid li.last {
+  margin-bottom: 0;
+}
+
+/**
+ * Creates a visual theme for a Window
+ *
+ * @param {string} $ui-label
+ * The name of the UI being created. Can not included spaces or special punctuation
+ * (used in CSS class names).
+ *
+ * @param {number} [$ui-padding=$window-padding]
+ * The padding of the Window
+ *
+ * @param {number} [$ui-border-radius=$window-border-radius]
+ * The border-radius of the Window
+ *
+ * @param {color} [$ui-border-color=$window-border-color]
+ * The border-color of the Window
+ *
+ * @param {number} [$ui-border-width=$window-border-width]
+ * The border-width of the Window
+ *
+ * @param {color} [$ui-inner-border-color=$window-inner-border-color]
+ * The inner border-color of the Window
+ *
+ * @param {number} [$ui-inner-border-width=$window-inner-border-width]
+ * The inner border-width of the Window
+ *
+ * @param {color} [$ui-header-color=$window-header-color]
+ * The text color of the Header
+ *
+ * @param {color} [$ui-header-background-color=$window-header-background-color]
+ * The background-color of the Header
+ *
+ * @param {number/list} [$ui-header-padding=$window-header-padding]
+ * The padding of the Header
+ *
+ * @param {string} [$ui-header-font-family=$window-header-font-family]
+ * The font-family of the Header
+ *
+ * @param {number} [$ui-header-font-size=$window-header-font-size]
+ * The font-size of the Header
+ *
+ * @param {string} [$ui-header-font-weight=$window-header-font-weight]
+ * The font-weight of the Header
+ *
+ * @param {number} [$ui-header-line-height=$window-header-line-height]
+ * The line-height of the Header
+ *
+ * @param {number/list} [$ui-header-text-padding=$window-header-text-padding]
+ * The padding of the Header's text element
+ *
+ * @param {string} [$ui-header-text-transform=$window-header-text-transform]
+ * The text-transform of the Header
+ *
+ * @param {color} [$ui-header-border-color=$ui-border-color]
+ * The border-color of the Header
+ *
+ * @param {number} [$ui-header-border-width=$window-header-border-width]
+ * The border-width of the Header
+ *
+ * @param {color} [$ui-header-inner-border-color=$window-header-inner-border-color]
+ * The inner border-color of the Header
+ *
+ * @param {number} [$ui-header-inner-border-width=$window-header-inner-border-width]
+ * The inner border-width of the Header
+ *
+ * @param {number} [$ui-header-icon-width=$window-header-icon-width]
+ * The width of the Header icon
+ *
+ * @param {number} [$ui-header-icon-height=$window-header-icon-height]
+ * The height of the Header icon
+ *
+ * @param {number} [$ui-header-icon-spacing=$window-header-icon-spacing]
+ * The space between the Header icon and text
+ *
+ * @param {list} [$ui-header-icon-background-position=$window-header-icon-background-position]
+ * The background-position of the Header icon
+ *
+ * @param {color} [$ui-header-glyph-color=$window-header-glyph-color]
+ * The color of the Header glyph icon
+ *
+ * @param {number} [$ui-header-glyph-opacity=$window-header-glyph-opacity]
+ * The opacity of the Header glyph icon
+ *
+ * @param {number} [$ui-tool-spacing=$window-tool-spacing]
+ * The space between the {@link Ext.panel.Tool Tools}
+ *
+ * @param {string} [$ui-tool-background-image=$window-tool-background-image]
+ * The background sprite to use for {@link Ext.panel.Tool Tools}
+ *
+ * @param {color} [$ui-body-border-color=$window-body-border-color]
+ * The border-color of the Window body
+ *
+ * @param {color} [$ui-body-background-color=$window-body-background-color]
+ * The background-color of the Window body
+ *
+ * @param {number} [$ui-body-border-width=$window-body-border-width]
+ * The border-width of the Window body
+ *
+ * @param {string} [$ui-body-border-style=$window-body-border-style]
+ * The border-style of the Window body
+ *
+ * @param {color} [$ui-body-color=$window-body-color]
+ * The color of text inside the Window body
+ *
+ * @param {color} [$ui-background-color=$window-background-color]
+ * The background-color of the Window
+ *
+ * @param {boolean} [$ui-force-header-border=$window-force-header-border]
+ * True to force the window header to have a border on the side facing
+ * the window body.  Overrides dock layout's border management border
+ * removal rules.
+ *
+ * @param {boolean} [$ui-include-border-management-rules=$window-include-border-management-rules]
+ * True to include neptune style border management rules.
+ *
+ * @param {color} [$ui-wrap-border-color=$window-wrap-border-color]
+ * The color to apply to the border that wraps the body and docked items. The presence of
+ * the wrap border is controlled by the {@link #border} config. Only applicable when
+ * `$ui-include-border-management-rules` is `true`.
+ *
+ * @param {color} [$ui-wrap-border-width=$window-wrap-border-width]
+ * The width to apply to the border that wraps the body and docked items. The presence of
+ * the wrap border is controlled by the {@link #border} config. Only applicable when
+ * `$ui-include-border-management-rules` is `true`.
+ *
+ * @member Ext.window.Window
+ */
+/* line 545, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-ghost {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/* line 174, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default {
+  border-color: #3892d3;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 0px 0px 0px 0px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: white;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-mc {
+  background-color: white;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-default {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-default-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-0-0-0-0;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tr,
+.x-window-default-br,
+.x-window-default-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tl,
+.x-window-default-bl,
+.x-window-default-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-tl,
+.x-window-default-bl,
+.x-window-default-tr,
+.x-window-default-br,
+.x-window-default-tc,
+.x-window-default-bc,
+.x-window-default-ml,
+.x-window-default-mr {
+  zoom: 1;
+  background-image: url(images/window/window-default-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-ml,
+.x-window-default-mr {
+  zoom: 1;
+  background-image: url(images/window/window-default-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-default-mc {
+  padding: 0px 0px 0px 0px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-default-tl,
+.x-strict .x-ie7 .x-window-default-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-default:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window/window-default-corners.gif), sides:url(images/window/window-default-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 195, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-body-default {
+  border-color: #3892d3;
+  border-width: 1px;
+  border-style: solid;
+  background: white;
+  color: black;
+}
+
+/* line 206, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default {
+  font-size: 13px;
+  border-color: #3892d3;
+  zoom: 1;
+  background-color: #3892d3;
+}
+/* line 212, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default .x-tool-img {
+  background-color: #3892d3;
+}
+
+/* line 223, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-vertical .x-window-header-text-container {
+  -webkit-transform: rotate(90deg);
+  -webkit-transform-origin: 0 0;
+  -moz-transform: rotate(90deg);
+  -moz-transform-origin: 0 0;
+  -o-transform: rotate(90deg);
+  -o-transform-origin: 0 0;
+  transform: rotate(90deg);
+  transform-origin: 0 0;
+}
+/* line 36, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/rotate-element.scss */
+.x-ie9m .x-window-header-default-vertical .x-window-header-text-container {
+  background-color: #3892d3;
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1), progid:DXImageTransform.Microsoft.Chroma(color=#3892d3);
+}
+
+/* line 233, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-text-container-default {
+  color: white;
+  font-weight: bold;
+  line-height: 15px;
+  font-family: arial, helvetica, verdana, sans-serif;
+  font-size: 13px;
+  padding: 1px 0 0;
+  text-transform: none;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 5px 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-top {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-top-frameInfo {
+  font-family: dh-4-4-0-0-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tr,
+.x-window-header-default-top-br,
+.x-window-header-default-top-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tl,
+.x-window-header-default-top-bl,
+.x-window-header-default-top-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-tl,
+.x-window-header-default-top-bl,
+.x-window-header-default-top-tr,
+.x-window-header-default-top-br,
+.x-window-header-default-top-tc,
+.x-window-header-default-top-bc,
+.x-window-header-default-top-ml,
+.x-window-header-default-top-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-top-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-ml,
+.x-window-header-default-top-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-top-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-top-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-top-tl,
+.x-strict .x-ie7 .x-window-header-default-top-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-top:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-top-corners.gif), sides:url(images/window-header/window-header-default-top-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 5px 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-right {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-right-frameInfo {
+  font-family: dh-0-4-4-0-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tr,
+.x-window-header-default-right-br,
+.x-window-header-default-right-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tl,
+.x-window-header-default-right-bl,
+.x-window-header-default-right-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-tl,
+.x-window-header-default-right-bl,
+.x-window-header-default-right-tr,
+.x-window-header-default-right-br,
+.x-window-header-default-right-tc,
+.x-window-header-default-right-bc,
+.x-window-header-default-right-ml,
+.x-window-header-default-right-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-right-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-ml,
+.x-window-header-default-right-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-right-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-right-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-right-tl,
+.x-strict .x-ie7 .x-window-header-default-right-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-right:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-right-corners.gif), sides:url(images/window-header/window-header-default-right-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 5px 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-bottom {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-bottom-frameInfo {
+  font-family: dh-0-0-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tr,
+.x-window-header-default-bottom-br,
+.x-window-header-default-bottom-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tl,
+.x-window-header-default-bottom-bl,
+.x-window-header-default-bottom-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-tl,
+.x-window-header-default-bottom-bl,
+.x-window-header-default-bottom-tr,
+.x-window-header-default-bottom-br,
+.x-window-header-default-bottom-tc,
+.x-window-header-default-bottom-bc,
+.x-window-header-default-bottom-ml,
+.x-window-header-default-bottom-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-bottom-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-ml,
+.x-window-header-default-bottom-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-bottom-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-bottom-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-bottom-tl,
+.x-strict .x-ie7 .x-window-header-default-bottom-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-bottom:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-bottom-corners.gif), sides:url(images/window-header/window-header-default-bottom-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 5px 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-left {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-left-frameInfo {
+  font-family: dh-4-0-0-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tr,
+.x-window-header-default-left-br,
+.x-window-header-default-left-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tl,
+.x-window-header-default-left-bl,
+.x-window-header-default-left-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-tl,
+.x-window-header-default-left-bl,
+.x-window-header-default-left-tr,
+.x-window-header-default-left-br,
+.x-window-header-default-left-tc,
+.x-window-header-default-left-bc,
+.x-window-header-default-left-ml,
+.x-window-header-default-left-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-left-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-ml,
+.x-window-header-default-left-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-left-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-left-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-left-tl,
+.x-strict .x-ie7 .x-window-header-default-left-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-left:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-left-corners.gif), sides:url(images/window-header/window-header-default-left-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-collapsed-top {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-collapsed-top-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tr,
+.x-window-header-default-collapsed-top-br,
+.x-window-header-default-collapsed-top-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tl,
+.x-window-header-default-collapsed-top-bl,
+.x-window-header-default-collapsed-top-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-tl,
+.x-window-header-default-collapsed-top-bl,
+.x-window-header-default-collapsed-top-tr,
+.x-window-header-default-collapsed-top-br,
+.x-window-header-default-collapsed-top-tc,
+.x-window-header-default-collapsed-top-bc,
+.x-window-header-default-collapsed-top-ml,
+.x-window-header-default-collapsed-top-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-top-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-ml,
+.x-window-header-default-collapsed-top-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-top-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-top-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-collapsed-top-tl,
+.x-strict .x-ie7 .x-window-header-default-collapsed-top-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-collapsed-top:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-collapsed-top-corners.gif), sides:url(images/window-header/window-header-default-collapsed-top-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-collapsed-right {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-collapsed-right-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tr,
+.x-window-header-default-collapsed-right-br,
+.x-window-header-default-collapsed-right-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tl,
+.x-window-header-default-collapsed-right-bl,
+.x-window-header-default-collapsed-right-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-tl,
+.x-window-header-default-collapsed-right-bl,
+.x-window-header-default-collapsed-right-tr,
+.x-window-header-default-collapsed-right-br,
+.x-window-header-default-collapsed-right-tc,
+.x-window-header-default-collapsed-right-bc,
+.x-window-header-default-collapsed-right-ml,
+.x-window-header-default-collapsed-right-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-right-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-ml,
+.x-window-header-default-collapsed-right-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-right-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-right-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-collapsed-right-tl,
+.x-strict .x-ie7 .x-window-header-default-collapsed-right-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-collapsed-right:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-collapsed-right-corners.gif), sides:url(images/window-header/window-header-default-collapsed-right-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-collapsed-bottom {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-collapsed-bottom-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tr,
+.x-window-header-default-collapsed-bottom-br,
+.x-window-header-default-collapsed-bottom-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tl,
+.x-window-header-default-collapsed-bottom-bl,
+.x-window-header-default-collapsed-bottom-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-tl,
+.x-window-header-default-collapsed-bottom-bl,
+.x-window-header-default-collapsed-bottom-tr,
+.x-window-header-default-collapsed-bottom-br,
+.x-window-header-default-collapsed-bottom-tc,
+.x-window-header-default-collapsed-bottom-bc,
+.x-window-header-default-collapsed-bottom-ml,
+.x-window-header-default-collapsed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-bottom-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-ml,
+.x-window-header-default-collapsed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-bottom-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-bottom-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-collapsed-bottom-tl,
+.x-strict .x-ie7 .x-window-header-default-collapsed-bottom-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-collapsed-bottom:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-collapsed-bottom-corners.gif), sides:url(images/window-header/window-header-default-collapsed-bottom-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #3892d3;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-mc {
+  background-color: #3892d3;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-window-header-default-collapsed-left {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-window-header-default-collapsed-left-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tr,
+.x-window-header-default-collapsed-left-br,
+.x-window-header-default-collapsed-left-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tl,
+.x-window-header-default-collapsed-left-bl,
+.x-window-header-default-collapsed-left-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-tl,
+.x-window-header-default-collapsed-left-bl,
+.x-window-header-default-collapsed-left-tr,
+.x-window-header-default-collapsed-left-br,
+.x-window-header-default-collapsed-left-tc,
+.x-window-header-default-collapsed-left-bc,
+.x-window-header-default-collapsed-left-ml,
+.x-window-header-default-collapsed-left-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-left-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-ml,
+.x-window-header-default-collapsed-left-mr {
+  zoom: 1;
+  background-image: url(images/window-header/window-header-default-collapsed-left-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-window-header-default-collapsed-left-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-window-header-default-collapsed-left-tl,
+.x-strict .x-ie7 .x-window-header-default-collapsed-left-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-window-header-default-collapsed-left:after {
+  display: none;
+  content: "x-slicer:corners:url(images/window-header/window-header-default-collapsed-left-corners.gif), sides:url(images/window-header/window-header-default-collapsed-left-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 355, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default .x-window-header-icon {
+  width: 16px;
+  height: 16px;
+  color: white;
+  font-size: 16px;
+  line-height: 16px;
+  background-position: center center;
+}
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default .x-window-header-glyph {
+  color: white;
+  font-size: 16px;
+  line-height: 16px;
+  opacity: 0.5;
+}
+/* line 380, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-ie8m .x-window-header-default .x-window-header-glyph {
+  color: #9bc8e9;
+}
+
+/* line 388, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-horizontal .x-window-header-icon-before-title {
+  margin: 0 6px 0 0;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-horizontal .x-window-header-icon-after-title {
+  margin: 0 0 0 6px;
+}
+
+/* line 410, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-vertical .x-window-header-icon-before-title {
+  margin: 0 0 6px 0;
+}
+/* line 420, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-vertical .x-window-header-icon-after-title {
+  margin: 6px 0 0 0;
+}
+
+/* line 433, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-horizontal .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 443, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-horizontal .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 455, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-vertical .x-tool-after-title {
+  margin: 6px 0 0 0;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default-vertical .x-tool-before-title {
+  margin: 0 0 6px 0;
+}
+
+/* line 479, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-header-default {
+  border-width: 5px !important;
+}
+
+/* line 489, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-nbr .x-window-default-collapsed .x-window-header {
+  border-width: 0 !important;
+}
+
+/* line 500, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable {
+  overflow: visible;
+}
+/* line 505, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-north-br {
+  top: -5px;
+}
+/* line 508, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-south-br {
+  bottom: -5px;
+}
+/* line 511, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-east-br {
+  right: -5px;
+}
+/* line 514, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-west-br {
+  left: -5px;
+}
+/* line 517, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-northwest-br {
+  left: -5px;
+  top: -5px;
+}
+/* line 521, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-northeast-br {
+  right: -5px;
+  top: -5px;
+}
+/* line 525, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-southeast-br {
+  right: -5px;
+  bottom: -5px;
+}
+/* line 529, ../../../../ext/packages/ext-theme-neutral/sass/src/window/Window.scss */
+.x-window-default-resizable .x-window-handle-southwest-br {
+  left: -5px;
+  bottom: -5px;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-l {
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-b {
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-bl {
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-r {
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-rl {
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-rb {
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 32, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-rbl {
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 40, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-t {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+}
+
+/* line 44, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-tl {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-tb {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 56, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-tbl {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 64, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-tr {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-trl {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+  border-left-color: #3892d3 !important;
+  border-left-width: 1px !important;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-trb {
+  border-top-color: #3892d3 !important;
+  border-top-width: 1px !important;
+  border-right-color: #3892d3 !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #3892d3 !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 86, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-window-default-outer-border-trbl {
+  border-color: #3892d3 !important;
+  border-width: 1px !important;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+.x-form-invalid-under {
+  padding: 2px 2px 2px 20px;
+  color: #cf4c35;
+  font: normal 13px helvetica, arial, verdana, sans-serif;
+  line-height: 16px;
+  background: no-repeat 0 2px;
+  background-image: url(images/form/exclamation.png);
+}
+
+/* line 14, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+div.x-lbl-top-err-icon {
+  margin-bottom: 4px;
+}
+
+/* line 18, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+.x-form-invalid-icon {
+  width: 16px;
+  height: 16px;
+  margin: 0 5px;
+  background-image: url(images/form/exclamation.png);
+  background-repeat: no-repeat;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+.x-form-item-label {
+  color: black;
+  font: normal 13px/17px helvetica, arial, verdana, sans-serif;
+  margin-top: 4px;
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+.x-autocontainer-form-item,
+.x-anchor-form-item,
+.x-vbox-form-item,
+.x-table-form-item {
+  margin-bottom: 5px;
+}
+
+/* line 53, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+.x-ie6 .x-form-form-item td {
+  border-top-width: 0;
+}
+/* line 59, ../../../../ext/packages/ext-theme-neutral/sass/src/form/Labelable.scss */
+.x-ie6 td.x-form-item-pad {
+  height: 5px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Base.scss */
+.x-form-field {
+  color: black;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Base.scss */
+.x-form-item,
+.x-form-field {
+  font: normal 13px helvetica, arial, verdana, sans-serif;
+}
+
+/* line 21, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Base.scss */
+.x-form-type-text textarea.x-form-invalid-field, .x-form-type-text input.x-form-invalid-field,
+.x-form-type-password textarea.x-form-invalid-field,
+.x-form-type-password input.x-form-invalid-field,
+.x-form-type-number textarea.x-form-invalid-field,
+.x-form-type-number input.x-form-invalid-field,
+.x-form-type-email textarea.x-form-invalid-field,
+.x-form-type-email input.x-form-invalid-field,
+.x-form-type-search textarea.x-form-invalid-field,
+.x-form-type-search input.x-form-invalid-field,
+.x-form-type-tel textarea.x-form-invalid-field,
+.x-form-type-tel input.x-form-invalid-field {
+  background-color: white;
+  border-color: #cf4c35;
+}
+
+/* line 37, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Base.scss */
+.x-item-disabled .x-form-item-label,
+.x-item-disabled .x-form-field,
+.x-item-disabled .x-form-display-field,
+.x-item-disabled .x-form-cb-label,
+.x-item-disabled .x-form-trigger {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30);
+  opacity: 0.3;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Text.scss */
+.x-form-text {
+  color: black;
+  padding: 4px 6px 3px 6px;
+  background: white repeat-x 0 0;
+  border-width: 1px;
+  border-style: solid;
+  border-color: silver #d9d9d9 #d9d9d9;
+  height: 24px;
+  line-height: 15px;
+}
+/* line 21, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Text.scss */
+.x-content-box .x-form-text {
+  height: 15px;
+}
+
+/* line 34, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Text.scss */
+.x-form-focus {
+  border-color: #3892d3;
+}
+
+/* line 39, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Text.scss */
+.x-form-empty-field,
+textarea.x-form-empty-field {
+  color: gray;
+}
+
+/* line 48, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Text.scss */
+.x-quirks .x-ie .x-form-text,
+.x-ie7m .x-form-text {
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/TextArea.scss */
+.x-form-textarea {
+  line-height: normal;
+  height: auto;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Display.scss */
+.x-form-display-field-body {
+  height: 24px;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Display.scss */
+.x-form-display-field {
+  font: normal 13px/17px helvetica, arial, verdana, sans-serif;
+  color: black;
+  margin-top: 4px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/window/MessageBox.scss */
+.x-message-box .x-window-body {
+  background-color: white;
+  border-width: 0;
+}
+
+/* line 13, ../../../../ext/packages/ext-theme-neutral/sass/src/window/MessageBox.scss */
+.x-message-box-info,
+.x-message-box-warning,
+.x-message-box-question,
+.x-message-box-error {
+  background-position: top left;
+  background-repeat: no-repeat;
+}
+
+/* line 29, ../../../../ext/packages/ext-theme-neutral/sass/src/window/MessageBox.scss */
+.x-message-box-info {
+  background-image: url(images/shared/icon-info.png);
+}
+
+/* line 33, ../../../../ext/packages/ext-theme-neutral/sass/src/window/MessageBox.scss */
+.x-message-box-warning {
+  background-image: url(images/shared/icon-warning.png);
+}
+
+/* line 37, ../../../../ext/packages/ext-theme-neutral/sass/src/window/MessageBox.scss */
+.x-message-box-question {
+  background-image: url(images/shared/icon-question.png);
+}
+
+/* line 41, ../../../../ext/packages/ext-theme-neutral/sass/src/window/MessageBox.scss */
+.x-message-box-error {
+  background-image: url(images/shared/icon-error.png);
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb-wrap {
+  height: 24px;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb {
+  margin-top: 5px;
+}
+
+/* line 19, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-checkbox {
+  width: 15px;
+  height: 15px;
+  background: url(images/form/checkbox.png) no-repeat;
+}
+
+/* line 25, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb-checked .x-form-checkbox {
+  background-position: 0 -15px;
+}
+
+/* Focused */
+/* line 30, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-checkbox-focus {
+  background-position: -15px 0;
+}
+
+/* line 34, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb-checked .x-form-checkbox-focus {
+  background-position: -15px -15px;
+}
+
+/* boxLabel */
+/* line 40, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb-label {
+  margin-top: 4px;
+  font: normal 13px/17px helvetica, arial, verdana, sans-serif;
+}
+
+/* line 53, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb-label-before {
+  margin-right: 4px;
+}
+
+/* line 64, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Checkbox.scss */
+.x-form-cb-label-after {
+  margin-left: 4px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/CheckboxGroup.scss */
+.x-form-checkboxgroup-body {
+  padding: 0 4px;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-neutral/sass/src/form/CheckboxGroup.scss */
+.x-form-invalid .x-form-checkboxgroup-body {
+  border: 1px solid #cf4c35;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-neutral/sass/src/form/CheckboxGroup.scss */
+.x-check-group-alt {
+  background: #f5f5f5;
+  border-top: 1px dotted #f5f5f5;
+  border-bottom: 1px dotted #f5f5f5;
+}
+
+/* line 22, ../../../../ext/packages/ext-theme-neutral/sass/src/form/CheckboxGroup.scss */
+.x-form-check-group-label {
+  color: black;
+  padding: 2px;
+  margin: 0 30px 5px 0;
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: black;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Radio.scss */
+.x-form-radio {
+  width: 15px;
+  height: 15px;
+  background: url(images/form/radio.png) no-repeat;
+}
+
+/* line 7, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Radio.scss */
+.x-form-cb-checked .x-form-radio {
+  background-position: 0 -15px;
+}
+
+/* line 11, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Radio.scss */
+.x-form-radio-focus {
+  background-position: -15px 0;
+}
+
+/* line 15, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Radio.scss */
+.x-form-cb-checked .x-form-radio-focus {
+  background-position: -15px -15px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-trigger {
+  background: url(images/form/trigger.png);
+  width: 22px;
+}
+
+/* line 18, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-trigger-cell {
+  background-color: white;
+  width: 22px;
+}
+
+/* line 23, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-trigger-over {
+  background-position: -22px 0;
+}
+
+/* line 30, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-trigger-wrap-focus .x-form-trigger {
+  background-position: -66px 0;
+}
+
+/* line 37, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-trigger-wrap-focus .x-form-trigger-over {
+  background-position: -88px 0;
+}
+
+/* line 42, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-trigger-click,
+.x-form-trigger-wrap-focus .x-form-trigger-click {
+  background-position: -44px 0;
+}
+
+/* line 49, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-clear-trigger {
+  background-image: url(images/form/clear-trigger.png);
+}
+
+/* line 59, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-form-search-trigger {
+  background-image: url(images/form/search-trigger.png);
+}
+
+/* line 73, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-quirks .prefixie6 .x-form-trigger-input-cell {
+  height: 24px;
+}
+/* line 77, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Trigger.scss */
+.x-quirks .prefixie6 .x-field-toolbar .x-form-trigger-input-cell {
+  height: 24px;
+}
+
+/* line 3, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Spinner.scss */
+div.x-form-spinner-up,
+div.x-form-spinner-down {
+  background-image: url(images/form/spinner.png);
+  background-color: white;
+  width: 22px;
+  height: 11px;
+}
+
+/* line 19, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Spinner.scss */
+.x-form-spinner-down {
+  background-position: 0 -11px;
+}
+
+/* line 23, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Spinner.scss */
+.x-form-trigger-wrap-focus .x-form-spinner-down {
+  background-position: -66px -11px;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Spinner.scss */
+.x-form-trigger-wrap .x-form-spinner-down-over {
+  background-position: -22px -11px;
+}
+
+/* line 29, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Spinner.scss */
+.x-form-trigger-wrap-focus .x-form-spinner-down-over {
+  background-position: -88px -11px;
+}
+
+/* line 32, ../../../../ext/packages/ext-theme-neutral/sass/src/form/field/Spinner.scss */
+.x-form-trigger-wrap .x-form-spinner-down-click {
+  background-position: -44px -11px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Paging.scss */
+.x-tbar-page-number {
+  width: 30px;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Paging.scss */
+.x-tbar-page-first {
+  background-image: url(images/grid/page-first.png);
+}
+
+/* line 9, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Paging.scss */
+.x-tbar-page-prev {
+  background-image: url(images/grid/page-prev.png);
+}
+
+/* line 13, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Paging.scss */
+.x-tbar-page-next {
+  background-image: url(images/grid/page-next.png);
+}
+
+/* line 17, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Paging.scss */
+.x-tbar-page-last {
+  background-image: url(images/grid/page-last.png);
+}
+
+/* line 21, ../../../../ext/packages/ext-theme-neutral/sass/src/toolbar/Paging.scss */
+.x-tbar-loading {
+  background-image: url(images/grid/refresh.png);
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-boundlist {
+  border-width: 1px;
+  border-style: solid;
+  border-color: #e1e1e1;
+  background: white;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-strict .x-ie7m .x-boundlist-list-ct {
+  position: relative;
+}
+
+/* line 15, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-boundlist-item {
+  padding: 0 6px;
+  line-height: 22px;
+  cursor: pointer;
+  cursor: hand;
+  position: relative;
+  /*allow hover in IE on empty items*/
+  zoom: 1;
+  border-width: 1px;
+  border-style: dotted;
+  border-color: white;
+}
+
+/* line 33, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-boundlist-selected {
+  background: #c1ddf1;
+  border-color: #c1ddf1;
+}
+
+/* line 38, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-boundlist-item-over {
+  background: #d6e8f6;
+  border-color: #d6e8f6;
+}
+
+/* line 43, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-boundlist-floating {
+  border-top-width: 0;
+}
+
+/* line 47, ../../../../ext/packages/ext-theme-neutral/sass/src/view/BoundList.scss */
+.x-boundlist-above {
+  border-top-width: 1px;
+  border-bottom-width: 1px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-collapse-el {
+  cursor: pointer;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-layout-split-left,
+.x-layout-split-right {
+  top: 50%;
+  margin-top: -24px;
+  width: 8px;
+  height: 48px;
+}
+
+/* line 14, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-layout-split-top,
+.x-layout-split-bottom {
+  left: 50%;
+  width: 48px;
+  height: 8px;
+  margin-left: -24px;
+}
+
+/* line 21, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-layout-split-left {
+  background-image: url(images/util/splitter/mini-left.png);
+}
+
+/* line 25, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-layout-split-right {
+  background-image: url(images/util/splitter/mini-right.png);
+}
+
+/* line 41, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-layout-split-top {
+  background-image: url(images/util/splitter/mini-top.png);
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-layout-split-bottom {
+  background-image: url(images/util/splitter/mini-bottom.png);
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-splitter-collapsed .x-layout-split-left {
+  background-image: url(images/util/splitter/mini-right.png);
+}
+/* line 54, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-splitter-collapsed .x-layout-split-right {
+  background-image: url(images/util/splitter/mini-left.png);
+}
+/* line 70, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-splitter-collapsed .x-layout-split-top {
+  background-image: url(images/util/splitter/mini-bottom.png);
+}
+/* line 74, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-splitter-collapsed .x-layout-split-bottom {
+  background-image: url(images/util/splitter/mini-top.png);
+}
+
+/* line 79, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-splitter-active {
+  background-color: #b4b4b4;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+  opacity: 0.8;
+}
+/* line 83, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Splitter.scss */
+.x-splitter-active .x-collapse-el {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30);
+  opacity: 0.3;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/layout/container/Border.scss */
+.x-border-layout-ct {
+  background-color: #3892d3;
+}
+
+/* line 7, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu {
+  border-style: solid;
+  border-width: 1px;
+  border-color: #e1e1e1;
+}
+
+/* line 14, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-body {
+  background: white;
+  padding: 0;
+}
+
+/* line 19, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-icon-separator {
+  left: 22px;
+  border-left: solid 1px #e1e1e1;
+  background-color: white;
+  width: 1px;
+}
+
+/* line 33, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item {
+  cursor: pointer;
+}
+
+/* line 46, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-indent {
+  margin-left: 27px;
+}
+
+/* line 57, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-active {
+  background-image: none;
+  background-color: #d6e8f6;
+  border-color: #0079d2;
+}
+/* line 75, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-nlg .x-menu-item-active {
+  background: #d6e8f6 repeat-x left top;
+  background-image: url(images/menu/menu-item-active-bg.gif);
+}
+
+/* line 82, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-link {
+  line-height: 24px;
+  padding: 0 4px 0 27px;
+  display: inline-block;
+}
+
+/* line 98, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-right-check-item-text {
+  padding-right: 22px;
+}
+
+/* line 108, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-icon {
+  width: 16px;
+  height: 16px;
+  top: 5px;
+  left: 3px;
+  background-position: center center;
+}
+
+/* line 116, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-glyph {
+  font-size: 16px;
+  line-height: 16px;
+  color: gray;
+  opacity: 0.5;
+}
+/* line 132, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-ie8m .x-menu-item-glyph {
+  color: #bfbfbf;
+}
+
+/* line 168, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-icon-right {
+  width: 16px;
+  height: 16px;
+  top: 4px;
+  right: 3px;
+  background-position: center center;
+}
+
+/* line 183, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-text {
+  font-size: 13px;
+  color: black;
+  cursor: pointer;
+  margin-right: 16px;
+}
+
+/* line 201, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-checked .x-menu-item-icon, .x-menu-item-checked .x-menu-item-icon-right {
+  background-image: url(images/menu/checked.png);
+}
+/* line 204, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-checked .x-menu-group-icon {
+  background-image: url(images/menu/group-checked.png);
+}
+
+/* line 210, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-unchecked .x-menu-item-icon, .x-menu-item-unchecked .x-menu-item-icon-right {
+  background-image: url(images/menu/unchecked.png);
+}
+/* line 213, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-unchecked .x-menu-group-icon {
+  background-image: none;
+}
+
+/* line 218, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-separator {
+  height: 1px;
+  border-top: solid 1px #e1e1e1;
+  background-color: white;
+  margin: 2px 0;
+  padding: 0;
+}
+
+/* line 226, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-arrow {
+  width: 12px;
+  height: 9px;
+  top: 8px;
+  right: 0;
+  background-image: url(images/menu/menu-parent.png);
+}
+
+/* line 264, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/* line 270, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-content-box .x-menu-icon-separator {
+  width: 0px;
+}
+/* line 274, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-content-box .x-menu-item-separator {
+  height: 0px;
+}
+
+/* line 281, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-ie .x-menu-item-disabled .x-menu-item-icon {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+/* line 285, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-ie .x-menu-item-disabled .x-menu-item-text {
+  background-color: transparent;
+}
+
+/* line 294, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-date-item {
+  border-color: #99BBE8;
+}
+
+/* line 300, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-item .x-form-item-label {
+  font-size: 13px;
+  color: black;
+}
+
+/* line 306, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-scroll-top {
+  height: 16px;
+  background-image: url(images/menu/scroll-top.png);
+}
+
+/* line 310, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-scroll-bottom {
+  height: 16px;
+  background-image: url(images/menu/scroll-bottom.png);
+}
+
+/* line 316, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-scroll-top, .x-menu-scroll-bottom {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+  background-color: white;
+}
+
+/* line 329, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-scroll-top-hover, .x-menu-scroll-bottom-hover {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
+  opacity: 0.6;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/menu/Menu.scss */
+.x-menu-scroll-top-pressed, .x-menu-scroll-bottom-pressed {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
+  opacity: 0.7;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-menu-item-link:after {
+  display: none;
+  content: "x-slicer:bg:url(images/menu/menu-item-active-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool {
+  cursor: pointer;
+}
+
+/* line 5, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-img {
+  overflow: hidden;
+  width: 16px;
+  height: 16px;
+  background-image: url(images/tools/tool-sprites.png);
+  margin: 0;
+}
+/* line 12, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool .x-tool-img {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+/* line 17, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-over .x-tool-img {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
+  opacity: 0.6;
+}
+/* line 22, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-pressed .x-tool-img {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
+  opacity: 0.7;
+}
+
+/* line 30, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-placeholder {
+  visibility: hidden;
+}
+
+/* line 34, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-close {
+  background-position: 0 0;
+}
+
+/* line 38, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-minimize {
+  background-position: 0 -16px;
+}
+
+/* line 42, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-maximize {
+  background-position: 0 -32px;
+}
+
+/* line 46, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-restore {
+  background-position: 0 -48px;
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-toggle {
+  background-position: 0 -64px;
+}
+/* line 53, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-panel-collapsed .x-tool-toggle {
+  background-position: 0 -80px;
+}
+
+/* line 58, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-gear {
+  background-position: 0 -96px;
+}
+
+/* line 62, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-prev {
+  background-position: 0 -112px;
+}
+
+/* line 66, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-next {
+  background-position: 0 -128px;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-pin {
+  background-position: 0 -144px;
+}
+
+/* line 74, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-unpin {
+  background-position: 0 -160px;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-right {
+  background-position: 0 -176px;
+}
+
+/* line 82, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-left {
+  background-position: 0 -192px;
+}
+
+/* line 86, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-down {
+  background-position: 0 -208px;
+}
+
+/* line 90, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-up {
+  background-position: 0 -224px;
+}
+
+/* line 94, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-refresh {
+  background-position: 0 -240px;
+}
+
+/* line 98, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-plus {
+  background-position: 0 -256px;
+}
+
+/* line 102, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-minus {
+  background-position: 0 -272px;
+}
+
+/* line 106, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-search {
+  background-position: 0 -288px;
+}
+
+/* line 110, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-save {
+  background-position: 0 -304px;
+}
+
+/* line 114, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-help {
+  background-position: 0 -320px;
+}
+
+/* line 118, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-print {
+  background-position: 0 -336px;
+}
+
+/* line 122, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-expand {
+  background-position: 0 -352px;
+}
+
+/* line 126, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-collapse {
+  background-position: 0 -368px;
+}
+
+/* line 130, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-resize {
+  background-position: 0 -384px;
+}
+
+/* line 134, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-move {
+  background-position: 0 -400px;
+}
+
+/* line 139, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-expand-bottom,
+.x-tool-collapse-bottom {
+  background-position: 0 -208px;
+}
+
+/* line 144, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-expand-top,
+.x-tool-collapse-top {
+  background-position: 0 -224px;
+}
+
+/* line 149, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-expand-left,
+.x-tool-collapse-left {
+  background-position: 0 -192px;
+}
+
+/* line 154, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Tool.scss */
+.x-tool-expand-right,
+.x-tool-collapse-right {
+  background-position: 0 -176px;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle {
+  position: absolute;
+  z-index: 100;
+  font-size: 1px;
+  line-height: 6px;
+  overflow: hidden;
+  zoom: 1;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+  background-color: #fff;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  -ms-border-radius: 6px;
+  -o-border-radius: 6px;
+  border-radius: 6px;
+}
+
+/* line 18, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-collapsed .x-resizable-handle {
+  display: none;
+}
+
+/* line 23, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-north {
+  cursor: n-resize;
+}
+/* line 26, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-south {
+  cursor: s-resize;
+}
+/* line 29, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-east {
+  cursor: e-resize;
+}
+/* line 32, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-west {
+  cursor: w-resize;
+}
+/* line 35, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-southeast {
+  cursor: se-resize;
+}
+/* line 38, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-northwest {
+  cursor: nw-resize;
+}
+/* line 41, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-northeast {
+  cursor: ne-resize;
+}
+/* line 44, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-southwest {
+  cursor: sw-resize;
+}
+
+/* line 49, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-east {
+  width: 6px;
+  height: 100%;
+  right: 0;
+  top: 0;
+}
+
+/* line 56, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-south {
+  width: 100%;
+  height: 6px;
+  left: 0;
+  bottom: 0;
+}
+
+/* line 63, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-west {
+  width: 6px;
+  height: 100%;
+  left: 0;
+  top: 0;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-north {
+  width: 100%;
+  height: 6px;
+  left: 0;
+  top: 0;
+}
+
+/* line 77, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-southeast {
+  width: 6px;
+  height: 6px;
+  right: 0;
+  bottom: 0;
+  z-index: 101;
+}
+
+/* line 85, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-northwest {
+  width: 6px;
+  height: 6px;
+  left: 0;
+  top: 0;
+  z-index: 101;
+}
+
+/* line 93, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-northeast {
+  width: 6px;
+  height: 6px;
+  right: 0;
+  top: 0;
+  z-index: 101;
+}
+
+/* line 101, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-handle-southwest {
+  width: 6px;
+  height: 6px;
+  left: 0;
+  bottom: 0;
+  z-index: 101;
+}
+
+/*IE rounding error*/
+/* line 111, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-ie .x-resizable-handle-east {
+  margin-right: -1px;
+  /*IE rounding error*/
+}
+/* line 115, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-ie .x-resizable-handle-south {
+  margin-bottom: -1px;
+}
+
+/* line 122, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-pinned .x-resizable-handle,
+.x-resizable-over .x-resizable-handle {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+  opacity: 1;
+}
+
+/* line 127, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-window .x-window-handle {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+
+/* line 131, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-window-collapsed .x-window-handle {
+  display: none;
+}
+
+/* line 136, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-proxy {
+  border: 1px dashed #3b5a82;
+  position: absolute;
+  overflow: hidden;
+  z-index: 50000;
+}
+
+/* line 148, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-east,
+.x-resizable-over .x-resizable-handle-west,
+.x-resizable-pinned .x-resizable-handle-east,
+.x-resizable-pinned .x-resizable-handle-west {
+  background-image: url(images/sizer/e-handle.png);
+}
+/* line 154, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-south,
+.x-resizable-over .x-resizable-handle-north,
+.x-resizable-pinned .x-resizable-handle-south,
+.x-resizable-pinned .x-resizable-handle-north {
+  background-image: url(images/sizer/s-handle.png);
+}
+/* line 159, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-southeast,
+.x-resizable-pinned .x-resizable-handle-southeast {
+  background-position: top left;
+  background-image: url(images/sizer/se-handle.png);
+}
+/* line 164, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-northwest,
+.x-resizable-pinned .x-resizable-handle-northwest {
+  background-position: bottom right;
+  background-image: url(images/sizer/nw-handle.png);
+}
+/* line 169, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-northeast,
+.x-resizable-pinned .x-resizable-handle-northeast {
+  background-position: bottom left;
+  background-image: url(images/sizer/ne-handle.png);
+}
+/* line 174, ../../../../ext/packages/ext-theme-neutral/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-southwest,
+.x-resizable-pinned .x-resizable-handle-southwest {
+  background-position: top right;
+  background-image: url(images/sizer/sw-handle.png);
+}
+
+/* including package ext-theme-neptune */
+/* line 1, ../../../../ext/packages/ext-theme-neptune/sass/src/Component.scss */
+body {
+  background-color: #f5f5f5;
+}
+
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small {
+  border-color: transparent;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: transparent;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-mc {
+  background-image: url(images/btn/btn-plain-toolbar-small-fbg.gif);
+  background-position: 0 top;
+  background-color: transparent;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-plain-toolbar-small {
+  background-image: url(images/btn/btn-plain-toolbar-small-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-plain-toolbar-small {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-plain-toolbar-small-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tr,
+.x-btn-plain-toolbar-small-br,
+.x-btn-plain-toolbar-small-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tl,
+.x-btn-plain-toolbar-small-bl,
+.x-btn-plain-toolbar-small-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-tl,
+.x-btn-plain-toolbar-small-bl,
+.x-btn-plain-toolbar-small-tr,
+.x-btn-plain-toolbar-small-br,
+.x-btn-plain-toolbar-small-tc,
+.x-btn-plain-toolbar-small-bc,
+.x-btn-plain-toolbar-small-ml,
+.x-btn-plain-toolbar-small-mr {
+  zoom: 1;
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-ml,
+.x-btn-plain-toolbar-small-mr {
+  zoom: 1;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-small-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-plain-toolbar-small-tl,
+.x-strict .x-ie7 .x-btn-plain-toolbar-small-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-small:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-plain-toolbar-small-fbg.gif), bg:url(images/btn/btn-plain-toolbar-small-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-inner {
+  font-size: 12px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: #666666;
+  padding: 0 5px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-arrow {
+  background-image: url(images/button/plain-toolbar-small-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-arrow-right {
+  padding-right: 21px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-arrow-bottom {
+  padding-bottom: 18px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-glyph {
+  font-size: 16px;
+  line-height: 16px;
+  color: #666666;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-plain-toolbar-small .x-btn-glyph {
+  color: #b2b2b2;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-disabled {
+  background-image: none;
+  background-color: transparent;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon .x-btn-button,
+.x-btn-plain-toolbar-small-noicon .x-btn-button {
+  height: 16px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon .x-btn-inner,
+.x-btn-plain-toolbar-small-noicon .x-btn-inner {
+  line-height: 16px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-plain-toolbar-small-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-plain-toolbar-small-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon .x-btn-inner {
+  width: 16px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon .x-btn-icon-el {
+  width: 16px;
+  height: 16px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-left .x-btn-button {
+  height: 16px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-left .x-btn-inner {
+  line-height: 16px;
+  padding-left: 21px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-left .x-btn-icon-el {
+  width: 16px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-small-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-plain-toolbar-small-icon-text-left .x-btn-icon-el {
+  height: 16px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-right .x-btn-button {
+  height: 16px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-right .x-btn-inner {
+  line-height: 16px;
+  padding-right: 21px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-right .x-btn-icon-el {
+  width: 16px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-small-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-plain-toolbar-small-icon-text-right .x-btn-icon-el {
+  height: 16px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-top .x-btn-inner {
+  padding-top: 21px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-top .x-btn-icon-el {
+  height: 16px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-small-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-plain-toolbar-small-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-bottom .x-btn-inner {
+  padding-bottom: 21px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-icon-text-bottom .x-btn-icon-el {
+  height: 16px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-small-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-plain-toolbar-small-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-over {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-focus {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-menu-active,
+.x-btn-plain-toolbar-small-pressed {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #e1e1e1;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e1e1e1), color-stop(50%, #d5d5d5), color-stop(51%, #e1e1e1), color-stop(100%, #e4e4e4));
+  background-image: -webkit-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -moz-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -o-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-over .x-frame-tl,
+.x-btn-plain-toolbar-small-over .x-frame-bl,
+.x-btn-plain-toolbar-small-over .x-frame-tr,
+.x-btn-plain-toolbar-small-over .x-frame-br,
+.x-btn-plain-toolbar-small-over .x-frame-tc,
+.x-btn-plain-toolbar-small-over .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-small-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-over .x-frame-ml,
+.x-btn-plain-toolbar-small-over .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-small-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-over .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-plain-toolbar-small-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-focus .x-frame-tl,
+.x-btn-plain-toolbar-small-focus .x-frame-bl,
+.x-btn-plain-toolbar-small-focus .x-frame-tr,
+.x-btn-plain-toolbar-small-focus .x-frame-br,
+.x-btn-plain-toolbar-small-focus .x-frame-tc,
+.x-btn-plain-toolbar-small-focus .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-small-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-focus .x-frame-ml,
+.x-btn-plain-toolbar-small-focus .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-small-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-focus .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-plain-toolbar-small-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-menu-active .x-frame-tl,
+.x-btn-plain-toolbar-small-menu-active .x-frame-bl,
+.x-btn-plain-toolbar-small-menu-active .x-frame-tr,
+.x-btn-plain-toolbar-small-menu-active .x-frame-br,
+.x-btn-plain-toolbar-small-menu-active .x-frame-tc,
+.x-btn-plain-toolbar-small-menu-active .x-frame-bc,
+.x-btn-plain-toolbar-small-pressed .x-frame-tl,
+.x-btn-plain-toolbar-small-pressed .x-frame-bl,
+.x-btn-plain-toolbar-small-pressed .x-frame-tr,
+.x-btn-plain-toolbar-small-pressed .x-frame-br,
+.x-btn-plain-toolbar-small-pressed .x-frame-tc,
+.x-btn-plain-toolbar-small-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-small-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-menu-active .x-frame-ml,
+.x-btn-plain-toolbar-small-menu-active .x-frame-mr,
+.x-btn-plain-toolbar-small-pressed .x-frame-ml,
+.x-btn-plain-toolbar-small-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-small-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-menu-active .x-frame-mc,
+.x-btn-plain-toolbar-small-pressed .x-frame-mc {
+  background-color: #e1e1e1;
+  background-image: url(images/btn/btn-plain-toolbar-small-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-disabled .x-frame-tl,
+.x-btn-plain-toolbar-small-disabled .x-frame-bl,
+.x-btn-plain-toolbar-small-disabled .x-frame-tr,
+.x-btn-plain-toolbar-small-disabled .x-frame-br,
+.x-btn-plain-toolbar-small-disabled .x-frame-tc,
+.x-btn-plain-toolbar-small-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-small-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-disabled .x-frame-ml,
+.x-btn-plain-toolbar-small-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-small-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-disabled .x-frame-mc {
+  background-color: transparent;
+  background-image: url(images/btn/btn-plain-toolbar-small-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-small-over {
+  background-image: url(images/btn/btn-plain-toolbar-small-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-small-focus {
+  background-image: url(images/btn/btn-plain-toolbar-small-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-small-menu-active,
+.x-nlg .x-btn-plain-toolbar-small-pressed {
+  background-image: url(images/btn/btn-plain-toolbar-small-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-small-disabled {
+  background-image: url(images/btn/btn-plain-toolbar-small-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-plain-toolbar-small {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-split-right {
+  background-image: url(images/button/plain-toolbar-small-s-arrow.png);
+  padding-right: 23px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small .x-btn-split-bottom {
+  background-image: url(images/button/plain-toolbar-small-s-arrow-b.png);
+  padding-bottom: 20px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-small-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-small-over-corners.gif), sides:url(images/btn/btn-plain-toolbar-small-over-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-small-over-fbg.gif), bg:url(images/btn/btn-plain-toolbar-small-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-small-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-small-focus-corners.gif), sides:url(images/btn/btn-plain-toolbar-small-focus-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-small-focus-fbg.gif), bg:url(images/btn/btn-plain-toolbar-small-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-small-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-small-pressed-corners.gif), sides:url(images/btn/btn-plain-toolbar-small-pressed-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-small-pressed-fbg.gif), bg:url(images/btn/btn-plain-toolbar-small-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-small-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-small-disabled-corners.gif), sides:url(images/btn/btn-plain-toolbar-small-disabled-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-small-disabled-fbg.gif), bg:url(images/btn/btn-plain-toolbar-small-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium {
+  border-color: transparent;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: transparent;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-mc {
+  background-image: url(images/btn/btn-plain-toolbar-medium-fbg.gif);
+  background-position: 0 top;
+  background-color: transparent;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-plain-toolbar-medium {
+  background-image: url(images/btn/btn-plain-toolbar-medium-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-plain-toolbar-medium {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-plain-toolbar-medium-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tr,
+.x-btn-plain-toolbar-medium-br,
+.x-btn-plain-toolbar-medium-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tl,
+.x-btn-plain-toolbar-medium-bl,
+.x-btn-plain-toolbar-medium-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-tl,
+.x-btn-plain-toolbar-medium-bl,
+.x-btn-plain-toolbar-medium-tr,
+.x-btn-plain-toolbar-medium-br,
+.x-btn-plain-toolbar-medium-tc,
+.x-btn-plain-toolbar-medium-bc,
+.x-btn-plain-toolbar-medium-ml,
+.x-btn-plain-toolbar-medium-mr {
+  zoom: 1;
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-ml,
+.x-btn-plain-toolbar-medium-mr {
+  zoom: 1;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-medium-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-plain-toolbar-medium-tl,
+.x-strict .x-ie7 .x-btn-plain-toolbar-medium-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-medium:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-plain-toolbar-medium-fbg.gif), bg:url(images/btn/btn-plain-toolbar-medium-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-inner {
+  font-size: 14px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: #666666;
+  padding: 0 8px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-arrow {
+  background-image: url(images/button/plain-toolbar-medium-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-arrow-right {
+  padding-right: 30px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-arrow-bottom {
+  padding-bottom: 26px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-glyph {
+  font-size: 24px;
+  line-height: 24px;
+  color: #666666;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-plain-toolbar-medium .x-btn-glyph {
+  color: #b2b2b2;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-disabled {
+  background-image: none;
+  background-color: transparent;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon .x-btn-button,
+.x-btn-plain-toolbar-medium-noicon .x-btn-button {
+  height: 24px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon .x-btn-inner,
+.x-btn-plain-toolbar-medium-noicon .x-btn-inner {
+  line-height: 24px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-plain-toolbar-medium-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-plain-toolbar-medium-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon .x-btn-inner {
+  width: 24px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon .x-btn-icon-el {
+  width: 24px;
+  height: 24px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-left .x-btn-button {
+  height: 24px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-left .x-btn-inner {
+  line-height: 24px;
+  padding-left: 29px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-left .x-btn-icon-el {
+  width: 24px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-medium-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-plain-toolbar-medium-icon-text-left .x-btn-icon-el {
+  height: 24px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-right .x-btn-button {
+  height: 24px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-right .x-btn-inner {
+  line-height: 24px;
+  padding-right: 29px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-right .x-btn-icon-el {
+  width: 24px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-medium-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-plain-toolbar-medium-icon-text-right .x-btn-icon-el {
+  height: 24px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-top .x-btn-inner {
+  padding-top: 29px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-top .x-btn-icon-el {
+  height: 24px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-medium-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-plain-toolbar-medium-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-bottom .x-btn-inner {
+  padding-bottom: 29px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-icon-text-bottom .x-btn-icon-el {
+  height: 24px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-medium-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-plain-toolbar-medium-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-over {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-focus {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-menu-active,
+.x-btn-plain-toolbar-medium-pressed {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #e1e1e1;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e1e1e1), color-stop(50%, #d5d5d5), color-stop(51%, #e1e1e1), color-stop(100%, #e4e4e4));
+  background-image: -webkit-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -moz-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -o-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-over .x-frame-tl,
+.x-btn-plain-toolbar-medium-over .x-frame-bl,
+.x-btn-plain-toolbar-medium-over .x-frame-tr,
+.x-btn-plain-toolbar-medium-over .x-frame-br,
+.x-btn-plain-toolbar-medium-over .x-frame-tc,
+.x-btn-plain-toolbar-medium-over .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-medium-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-over .x-frame-ml,
+.x-btn-plain-toolbar-medium-over .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-medium-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-over .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-plain-toolbar-medium-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-focus .x-frame-tl,
+.x-btn-plain-toolbar-medium-focus .x-frame-bl,
+.x-btn-plain-toolbar-medium-focus .x-frame-tr,
+.x-btn-plain-toolbar-medium-focus .x-frame-br,
+.x-btn-plain-toolbar-medium-focus .x-frame-tc,
+.x-btn-plain-toolbar-medium-focus .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-medium-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-focus .x-frame-ml,
+.x-btn-plain-toolbar-medium-focus .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-medium-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-focus .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-plain-toolbar-medium-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-menu-active .x-frame-tl,
+.x-btn-plain-toolbar-medium-menu-active .x-frame-bl,
+.x-btn-plain-toolbar-medium-menu-active .x-frame-tr,
+.x-btn-plain-toolbar-medium-menu-active .x-frame-br,
+.x-btn-plain-toolbar-medium-menu-active .x-frame-tc,
+.x-btn-plain-toolbar-medium-menu-active .x-frame-bc,
+.x-btn-plain-toolbar-medium-pressed .x-frame-tl,
+.x-btn-plain-toolbar-medium-pressed .x-frame-bl,
+.x-btn-plain-toolbar-medium-pressed .x-frame-tr,
+.x-btn-plain-toolbar-medium-pressed .x-frame-br,
+.x-btn-plain-toolbar-medium-pressed .x-frame-tc,
+.x-btn-plain-toolbar-medium-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-medium-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-menu-active .x-frame-ml,
+.x-btn-plain-toolbar-medium-menu-active .x-frame-mr,
+.x-btn-plain-toolbar-medium-pressed .x-frame-ml,
+.x-btn-plain-toolbar-medium-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-medium-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-menu-active .x-frame-mc,
+.x-btn-plain-toolbar-medium-pressed .x-frame-mc {
+  background-color: #e1e1e1;
+  background-image: url(images/btn/btn-plain-toolbar-medium-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-disabled .x-frame-tl,
+.x-btn-plain-toolbar-medium-disabled .x-frame-bl,
+.x-btn-plain-toolbar-medium-disabled .x-frame-tr,
+.x-btn-plain-toolbar-medium-disabled .x-frame-br,
+.x-btn-plain-toolbar-medium-disabled .x-frame-tc,
+.x-btn-plain-toolbar-medium-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-medium-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-disabled .x-frame-ml,
+.x-btn-plain-toolbar-medium-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-medium-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-disabled .x-frame-mc {
+  background-color: transparent;
+  background-image: url(images/btn/btn-plain-toolbar-medium-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-medium-over {
+  background-image: url(images/btn/btn-plain-toolbar-medium-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-medium-focus {
+  background-image: url(images/btn/btn-plain-toolbar-medium-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-medium-menu-active,
+.x-nlg .x-btn-plain-toolbar-medium-pressed {
+  background-image: url(images/btn/btn-plain-toolbar-medium-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-medium-disabled {
+  background-image: url(images/btn/btn-plain-toolbar-medium-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-plain-toolbar-medium {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-split-right {
+  background-image: url(images/button/plain-toolbar-medium-s-arrow.png);
+  padding-right: 32px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium .x-btn-split-bottom {
+  background-image: url(images/button/plain-toolbar-medium-s-arrow-b.png);
+  padding-bottom: 28px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-medium-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-medium-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-medium-over-corners.gif), sides:url(images/btn/btn-plain-toolbar-medium-over-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-medium-over-fbg.gif), bg:url(images/btn/btn-plain-toolbar-medium-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-medium-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-medium-focus-corners.gif), sides:url(images/btn/btn-plain-toolbar-medium-focus-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-medium-focus-fbg.gif), bg:url(images/btn/btn-plain-toolbar-medium-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-medium-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-medium-pressed-corners.gif), sides:url(images/btn/btn-plain-toolbar-medium-pressed-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-medium-pressed-fbg.gif), bg:url(images/btn/btn-plain-toolbar-medium-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-medium-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-medium-disabled-corners.gif), sides:url(images/btn/btn-plain-toolbar-medium-disabled-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-medium-disabled-fbg.gif), bg:url(images/btn/btn-plain-toolbar-medium-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 246, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large {
+  border-color: transparent;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  padding: 3px 3px 3px 3px;
+  border-width: 1px;
+  border-style: solid;
+  background-image: none;
+  background-color: transparent;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-mc {
+  background-image: url(images/btn/btn-plain-toolbar-large-fbg.gif);
+  background-position: 0 top;
+  background-color: transparent;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nlg .x-btn-plain-toolbar-large {
+  background-image: url(images/btn/btn-plain-toolbar-large-bg.gif);
+  background-position: 0 top;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-btn-plain-toolbar-large {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+  background-image: none;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-btn-plain-toolbar-large-frameInfo {
+  font-family: th-3-3-3-3-1-1-1-1-3-3-3-3;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tl {
+  background-position: 0 -6px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tr {
+  background-position: right -9px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-bl {
+  background-position: 0 -12px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-br {
+  background-position: right -15px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-bc {
+  background-position: 0 -3px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tr,
+.x-btn-plain-toolbar-large-br,
+.x-btn-plain-toolbar-large-mr {
+  padding-right: 3px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tl,
+.x-btn-plain-toolbar-large-bl,
+.x-btn-plain-toolbar-large-ml {
+  padding-left: 3px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tc {
+  height: 3px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-bc {
+  height: 3px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-tl,
+.x-btn-plain-toolbar-large-bl,
+.x-btn-plain-toolbar-large-tr,
+.x-btn-plain-toolbar-large-br,
+.x-btn-plain-toolbar-large-tc,
+.x-btn-plain-toolbar-large-bc,
+.x-btn-plain-toolbar-large-ml,
+.x-btn-plain-toolbar-large-mr {
+  zoom: 1;
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-ml,
+.x-btn-plain-toolbar-large-mr {
+  zoom: 1;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-btn-plain-toolbar-large-mc {
+  padding: 1px 1px 1px 1px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-btn-plain-toolbar-large-tl,
+.x-strict .x-ie7 .x-btn-plain-toolbar-large-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-large:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, frame-bg:url(images/btn/btn-plain-toolbar-large-fbg.gif), bg:url(images/btn/btn-plain-toolbar-large-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 253, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-inner {
+  font-size: 16px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  color: #666666;
+  padding: 0 10px;
+}
+/* line 261, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-arrow {
+  background-image: url(images/button/plain-toolbar-large-arrow.png);
+}
+/* line 269, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-arrow-right {
+  padding-right: 36px;
+}
+/* line 280, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-arrow-bottom {
+  padding-bottom: 32px;
+}
+/* line 284, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-glyph {
+  font-size: 32px;
+  line-height: 32px;
+  color: #666666;
+  opacity: 0.5;
+}
+/* line 303, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie8m .x-btn-plain-toolbar-large .x-btn-glyph {
+  color: #b2b2b2;
+}
+
+/* line 309, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-disabled {
+  background-image: none;
+  background-color: transparent;
+}
+
+/* line 335, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon .x-btn-button,
+.x-btn-plain-toolbar-large-noicon .x-btn-button {
+  height: 32px;
+}
+/* line 339, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon .x-btn-inner,
+.x-btn-plain-toolbar-large-noicon .x-btn-inner {
+  line-height: 32px;
+}
+
+/* line 349, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon .x-btn-arrow-right .x-btn-inner,
+.x-btn-plain-toolbar-large-noicon .x-btn-arrow-right .x-btn-inner,
+.x-btn-plain-toolbar-large-icon-text-left .x-btn-arrow-right .x-btn-inner {
+  padding-right: 0;
+}
+
+/* line 364, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon .x-btn-inner {
+  width: 32px;
+  padding: 0;
+}
+/* line 370, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon .x-btn-icon-el {
+  width: 32px;
+  height: 32px;
+}
+
+/* line 377, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-left .x-btn-button {
+  height: 32px;
+}
+/* line 382, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-left .x-btn-inner {
+  line-height: 32px;
+  padding-left: 37px;
+}
+/* line 398, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-left .x-btn-icon-el {
+  width: 32px;
+  right: auto;
+}
+/* line 403, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-large-icon-text-left .x-btn-icon-el, .x-quirks .x-btn-plain-toolbar-large-icon-text-left .x-btn-icon-el {
+  height: 32px;
+}
+
+/* line 417, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-right .x-btn-button {
+  height: 32px;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-right .x-btn-inner {
+  line-height: 32px;
+  padding-right: 37px;
+}
+/* line 434, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-right .x-btn-icon-el {
+  width: 32px;
+  left: auto;
+}
+/* line 439, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-large-icon-text-right .x-btn-icon-el, .x-quirks .x-btn-plain-toolbar-large-icon-text-right .x-btn-icon-el {
+  height: 32px;
+}
+
+/* line 453, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-top .x-btn-inner {
+  padding-top: 37px;
+}
+/* line 457, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-top .x-btn-icon-el {
+  height: 32px;
+  bottom: auto;
+}
+/* line 465, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-large-icon-text-top .x-btn-icon-el, .x-quirks .x-ie .x-btn-plain-toolbar-large-icon-text-top .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 473, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-bottom .x-btn-inner {
+  padding-bottom: 37px;
+}
+/* line 477, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-icon-text-bottom .x-btn-icon-el {
+  height: 32px;
+  top: auto;
+}
+/* line 485, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-ie6 .x-btn-plain-toolbar-large-icon-text-bottom .x-btn-icon-el, .x-quirks .x-ie .x-btn-plain-toolbar-large-icon-text-bottom .x-btn-icon-el {
+  width: 100%;
+}
+
+/* line 492, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-over {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 516, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-focus {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #ebebeb;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ededed), color-stop(50%, #ebebeb), color-stop(51%, #dfdfdf), color-stop(100%, #ebebeb));
+  background-image: -webkit-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -moz-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: -o-linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+  background-image: linear-gradient(top, #ededed, #ebebeb 50%, #dfdfdf 51%, #ebebeb);
+}
+
+/* line 541, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-menu-active,
+.x-btn-plain-toolbar-large-pressed {
+  border-color: #e1e1e1;
+  background-image: none;
+  background-color: #e1e1e1;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e1e1e1), color-stop(50%, #d5d5d5), color-stop(51%, #e1e1e1), color-stop(100%, #e4e4e4));
+  background-image: -webkit-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -moz-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: -o-linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+  background-image: linear-gradient(top, #e1e1e1, #d5d5d5 50%, #e1e1e1 51%, #e4e4e4);
+}
+
+/* line 573, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-over .x-frame-tl,
+.x-btn-plain-toolbar-large-over .x-frame-bl,
+.x-btn-plain-toolbar-large-over .x-frame-tr,
+.x-btn-plain-toolbar-large-over .x-frame-br,
+.x-btn-plain-toolbar-large-over .x-frame-tc,
+.x-btn-plain-toolbar-large-over .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-large-over-corners.gif);
+}
+/* line 577, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-over .x-frame-ml,
+.x-btn-plain-toolbar-large-over .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-large-over-sides.gif);
+}
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-over .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-plain-toolbar-large-over-fbg.gif);
+}
+
+/* line 595, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-focus .x-frame-tl,
+.x-btn-plain-toolbar-large-focus .x-frame-bl,
+.x-btn-plain-toolbar-large-focus .x-frame-tr,
+.x-btn-plain-toolbar-large-focus .x-frame-br,
+.x-btn-plain-toolbar-large-focus .x-frame-tc,
+.x-btn-plain-toolbar-large-focus .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-large-focus-corners.gif);
+}
+/* line 599, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-focus .x-frame-ml,
+.x-btn-plain-toolbar-large-focus .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-large-focus-sides.gif);
+}
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-focus .x-frame-mc {
+  background-color: #ebebeb;
+  background-image: url(images/btn/btn-plain-toolbar-large-focus-fbg.gif);
+}
+
+/* line 618, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-menu-active .x-frame-tl,
+.x-btn-plain-toolbar-large-menu-active .x-frame-bl,
+.x-btn-plain-toolbar-large-menu-active .x-frame-tr,
+.x-btn-plain-toolbar-large-menu-active .x-frame-br,
+.x-btn-plain-toolbar-large-menu-active .x-frame-tc,
+.x-btn-plain-toolbar-large-menu-active .x-frame-bc,
+.x-btn-plain-toolbar-large-pressed .x-frame-tl,
+.x-btn-plain-toolbar-large-pressed .x-frame-bl,
+.x-btn-plain-toolbar-large-pressed .x-frame-tr,
+.x-btn-plain-toolbar-large-pressed .x-frame-br,
+.x-btn-plain-toolbar-large-pressed .x-frame-tc,
+.x-btn-plain-toolbar-large-pressed .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-large-pressed-corners.gif);
+}
+/* line 622, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-menu-active .x-frame-ml,
+.x-btn-plain-toolbar-large-menu-active .x-frame-mr,
+.x-btn-plain-toolbar-large-pressed .x-frame-ml,
+.x-btn-plain-toolbar-large-pressed .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-large-pressed-sides.gif);
+}
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-menu-active .x-frame-mc,
+.x-btn-plain-toolbar-large-pressed .x-frame-mc {
+  background-color: #e1e1e1;
+  background-image: url(images/btn/btn-plain-toolbar-large-pressed-fbg.gif);
+}
+
+/* line 640, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-disabled .x-frame-tl,
+.x-btn-plain-toolbar-large-disabled .x-frame-bl,
+.x-btn-plain-toolbar-large-disabled .x-frame-tr,
+.x-btn-plain-toolbar-large-disabled .x-frame-br,
+.x-btn-plain-toolbar-large-disabled .x-frame-tc,
+.x-btn-plain-toolbar-large-disabled .x-frame-bc {
+  background-image: url(images/btn/btn-plain-toolbar-large-disabled-corners.gif);
+}
+/* line 644, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-disabled .x-frame-ml,
+.x-btn-plain-toolbar-large-disabled .x-frame-mr {
+  background-image: url(images/btn/btn-plain-toolbar-large-disabled-sides.gif);
+}
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-disabled .x-frame-mc {
+  background-color: transparent;
+  background-image: url(images/btn/btn-plain-toolbar-large-disabled-fbg.gif);
+}
+
+/* line 659, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-large-over {
+  background-image: url(images/btn/btn-plain-toolbar-large-over-bg.gif);
+}
+
+/* line 667, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-large-focus {
+  background-image: url(images/btn/btn-plain-toolbar-large-focus-bg.gif);
+}
+
+/* line 676, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-large-menu-active,
+.x-nlg .x-btn-plain-toolbar-large-pressed {
+  background-image: url(images/btn/btn-plain-toolbar-large-pressed-bg.gif);
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nlg .x-btn-plain-toolbar-large-disabled {
+  background-image: url(images/btn/btn-plain-toolbar-large-disabled-bg.gif);
+}
+
+/* line 691, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-nbr .x-btn-plain-toolbar-large {
+  background-image: none;
+}
+
+/* line 709, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-split-right {
+  background-image: url(images/button/plain-toolbar-large-s-arrow.png);
+  padding-right: 38px;
+}
+/* line 722, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large .x-btn-split-bottom {
+  background-image: url(images/button/plain-toolbar-large-s-arrow-b.png);
+  padding-bottom: 34px;
+}
+
+/* line 745, ../../../../ext/packages/ext-theme-neutral/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-large-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-large-over:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-large-over-corners.gif), sides:url(images/btn/btn-plain-toolbar-large-over-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-large-over-fbg.gif), bg:url(images/btn/btn-plain-toolbar-large-over-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-large-focus:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-large-focus-corners.gif), sides:url(images/btn/btn-plain-toolbar-large-focus-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-large-focus-fbg.gif), bg:url(images/btn/btn-plain-toolbar-large-focus-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-large-pressed:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-large-pressed-corners.gif), sides:url(images/btn/btn-plain-toolbar-large-pressed-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-large-pressed-fbg.gif), bg:url(images/btn/btn-plain-toolbar-large-pressed-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-btn-plain-toolbar-large-disabled:after {
+  display: none;
+  content: "x-slicer:stretch:bottom, corners:url(images/btn/btn-plain-toolbar-large-disabled-corners.gif), sides:url(images/btn/btn-plain-toolbar-large-disabled-sides.gif), frame-bg:url(images/btn/btn-plain-toolbar-large-disabled-fbg.gif), bg:url(images/btn/btn-plain-toolbar-large-disabled-bg.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 210, ../../../../ext/packages/ext-theme-neptune/sass/src/button/Button.scss */
+.x-btn-plain-toolbar-small-disabled .x-btn-icon-el,
+.x-btn-plain-toolbar-medium-disabled .x-btn-icon-el,
+.x-btn-plain-toolbar-large-disabled .x-btn-icon-el {
+  background-color: white;
+}
+/* line 212, ../../../../ext/packages/ext-theme-neptune/sass/src/button/Button.scss */
+.x-strict .x-ie8 .x-btn-plain-toolbar-small-disabled .x-btn-icon-el, .x-strict .x-ie8
+.x-btn-plain-toolbar-medium-disabled .x-btn-icon-el, .x-strict .x-ie8
+.x-btn-plain-toolbar-large-disabled .x-btn-icon-el {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5;
+}
+
+/* line 3, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-toolbar-scroll-left {
+  margin-right: 4px;
+}
+/* line 7, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-toolbar-scroll-right {
+  margin-left: 4px;
+}
+/* line 12, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-toolbar-scroll-left, .x-toolbar-default .x-toolbar-scroll-right {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
+  opacity: 0.6;
+}
+/* line 17, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-toolbar-scroll-left-hover, .x-toolbar-default .x-toolbar-scroll-right-hover {
+  background-position: 0 0;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+  opacity: 0.8;
+}
+/* line 23, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-toolbar-scroll-left-pressed, .x-toolbar-default .x-toolbar-scroll-right-pressed {
+  background-position: 0 0;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+  opacity: 1;
+}
+/* line 29, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-box-scroller-disabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=25);
+  opacity: 0.25;
+}
+/* line 33, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-default .x-box-scroller {
+  background-color: white;
+}
+
+/* line 41, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-scroller {
+  padding: 6px 4px 6px 4px;
+}
+
+/* line 45, ../../../../ext/packages/ext-theme-neptune/sass/src/toolbar/Toolbar.scss */
+.x-toolbar-vertical-scroller {
+  padding: 3px 8px 3px 8px;
+}
+
+/* line 206, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light {
+  border-color: #157fcc;
+  padding: 0;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light {
+  font-size: 13px;
+  border: 1px solid #157fcc;
+}
+/* line 219, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light .x-tool-img {
+  background-image: url(images/tools/tool-sprites-dark.png);
+  background-color: #dfeaf2;
+}
+
+/* line 232, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-horizontal {
+  padding: 9px 9px 10px 9px;
+}
+
+/* line 236, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-horizontal-noborder {
+  padding: 10px 10px 10px 10px;
+}
+
+/* line 240, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical {
+  padding: 9px 9px 9px 10px;
+}
+
+/* line 244, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical-noborder {
+  padding: 10px 10px 10px 10px;
+}
+
+/* line 260, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-text-container-light {
+  color: #666666;
+  font-size: 13px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  line-height: 15px;
+  padding: 1px 0 0;
+  text-transform: none;
+}
+
+/* line 272, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-body-light {
+  background: white;
+  border-color: #157fcc;
+  color: black;
+  font-size: 13px;
+  font-size: normal;
+  border-width: 1px;
+  border-style: solid;
+}
+
+/* line 432, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light {
+  background-image: none;
+  background-color: #dfeaf2;
+}
+
+/* line 436, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical {
+  background-image: none;
+  background-color: #dfeaf2;
+}
+
+/* line 494, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-collapsed-border-top {
+  border-bottom-width: 1px !important;
+}
+/* line 498, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-collapsed-border-right {
+  border-left-width: 1px !important;
+}
+/* line 502, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-collapsed-border-bottom {
+  border-top-width: 1px !important;
+}
+/* line 506, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-collapsed-border-left {
+  border-right-width: 1px !important;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-top:after {
+  display: none;
+  content: "x-slicer:stretch:bottom";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-bottom:after {
+  display: none;
+  content: "x-slicer:stretch:bottom";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-left:after {
+  display: none;
+  content: "x-slicer:stretch:left";
+}
+
+/*</if slicer>*/
+/* */
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-right:after {
+  display: none;
+  content: "x-slicer:stretch:left";
+}
+
+/*</if slicer>*/
+/* */
+/* line 522, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical .x-panel-header-text-container {
+  -webkit-transform: rotate(90deg);
+  -webkit-transform-origin: 0 0;
+  -moz-transform: rotate(90deg);
+  -moz-transform-origin: 0 0;
+  -o-transform: rotate(90deg);
+  -o-transform-origin: 0 0;
+  transform: rotate(90deg);
+  transform-origin: 0 0;
+}
+/* line 36, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/rotate-element.scss */
+.x-ie9m .x-panel-header-light-vertical .x-panel-header-text-container {
+  background-color: #dfeaf2;
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1), progid:DXImageTransform.Microsoft.Chroma(color=#dfeaf2);
+}
+
+/* line 551, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light .x-panel-header-icon {
+  width: 16px;
+  height: 16px;
+  background-position: center center;
+}
+/* line 556, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light .x-panel-header-glyph {
+  color: white;
+  font-size: 16px;
+  line-height: 16px;
+  opacity: 0.5;
+}
+/* line 572, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-ie8m .x-panel-header-light .x-panel-header-glyph {
+  color: #eff4f8;
+}
+
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-horizontal .x-panel-header-icon-before-title {
+  margin: 0 6px 0 0;
+}
+/* line 590, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-horizontal .x-panel-header-icon-after-title {
+  margin: 0 0 0 6px;
+}
+
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical .x-panel-header-icon-before-title {
+  margin: 0 0 6px 0;
+}
+/* line 612, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical .x-panel-header-icon-after-title {
+  margin: 6px 0 0 0;
+}
+
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-horizontal .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 635, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-horizontal .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical .x-tool-after-title {
+  margin: 6px 0 0 0;
+}
+/* line 657, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-vertical .x-tool-before-title {
+  margin: 0 0 6px 0;
+}
+
+/* line 687, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-resizable .x-panel-handle {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-l {
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-b {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-bl {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-r {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-rl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-rb {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 32, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-rbl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 40, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-t {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+}
+
+/* line 44, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-tl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-tb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 56, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-tbl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 64, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-tr {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-trl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-trb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 86, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-outer-border-trbl {
+  border-color: #157fcc !important;
+  border-width: 1px !important;
+}
+
+/* line 206, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed {
+  border-color: #dfeaf2;
+  padding: 0;
+}
+
+/* line 212, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed {
+  font-size: 13px;
+  border: 5px solid #dfeaf2;
+}
+/* line 219, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed .x-tool-img {
+  background-image: url(images/tools/tool-sprites-dark.png);
+  background-color: #dfeaf2;
+}
+
+/* line 232, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-horizontal {
+  padding: 5px;
+}
+
+/* line 236, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-horizontal-noborder {
+  padding: 10px 10px 5px 10px;
+}
+
+/* line 240, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 244, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical-noborder {
+  padding: 10px 10px 10px 5px;
+}
+
+/* line 260, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-text-container-light-framed {
+  color: #666666;
+  font-size: 13px;
+  font-weight: bold;
+  font-family: helvetica, arial, verdana, sans-serif;
+  line-height: 15px;
+  padding: 1px 0 0;
+  text-transform: none;
+}
+
+/* line 272, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-body-light-framed {
+  background: white;
+  border-color: #dfeaf2;
+  color: black;
+  font-size: 13px;
+  font-size: normal;
+  border-width: 1px;
+  border-style: solid;
+}
+
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -o-border-radius: 4px;
+  border-radius: 4px;
+  padding: 0px 0px 0px 0px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: white;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-mc {
+  background-color: white;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-light-framed {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-light-framed-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-0-0-0-0;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tr,
+.x-panel-light-framed-br,
+.x-panel-light-framed-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tl,
+.x-panel-light-framed-bl,
+.x-panel-light-framed-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-tl,
+.x-panel-light-framed-bl,
+.x-panel-light-framed-tr,
+.x-panel-light-framed-br,
+.x-panel-light-framed-tc,
+.x-panel-light-framed-bc,
+.x-panel-light-framed-ml,
+.x-panel-light-framed-mr {
+  zoom: 1;
+  background-image: url(images/panel/panel-light-framed-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-ml,
+.x-panel-light-framed-mr {
+  zoom: 1;
+  background-image: url(images/panel/panel-light-framed-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-light-framed-mc {
+  padding: 0px 0px 0px 0px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-light-framed-tl,
+.x-strict .x-ie7 .x-panel-light-framed-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-light-framed:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel/panel-light-framed-corners.gif), sides:url(images/panel/panel-light-framed-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 0 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-top {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-top-frameInfo {
+  font-family: dh-4-4-0-0-5-5-0-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tr,
+.x-panel-header-light-framed-top-br,
+.x-panel-header-light-framed-top-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tl,
+.x-panel-header-light-framed-top-bl,
+.x-panel-header-light-framed-top-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-bc {
+  height: 0;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-tl,
+.x-panel-header-light-framed-top-bl,
+.x-panel-header-light-framed-top-tr,
+.x-panel-header-light-framed-top-br,
+.x-panel-header-light-framed-top-tc,
+.x-panel-header-light-framed-top-bc,
+.x-panel-header-light-framed-top-ml,
+.x-panel-header-light-framed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-top-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-ml,
+.x-panel-header-light-framed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-top-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-top-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-top-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-top-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-top:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-top-corners.gif), sides:url(images/panel-header/panel-header-light-framed-top-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 5px 5px 0;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-right {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-right-frameInfo {
+  font-family: dh-0-4-4-0-5-5-5-0-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-ml {
+  background-position: 0 right;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-mr {
+  background-position: right right;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tr,
+.x-panel-header-light-framed-right-br,
+.x-panel-header-light-framed-right-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tl,
+.x-panel-header-light-framed-right-bl,
+.x-panel-header-light-framed-right-ml {
+  padding-left: 0;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-tl,
+.x-panel-header-light-framed-right-bl,
+.x-panel-header-light-framed-right-tr,
+.x-panel-header-light-framed-right-br,
+.x-panel-header-light-framed-right-tc,
+.x-panel-header-light-framed-right-bc,
+.x-panel-header-light-framed-right-ml,
+.x-panel-header-light-framed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-right-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-ml,
+.x-panel-header-light-framed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-right-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-right-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-right-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-right-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-right:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-right-corners.gif), sides:url(images/panel-header/panel-header-light-framed-right-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom {
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 0 5px 5px 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-bottom {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-bottom-frameInfo {
+  font-family: dh-0-0-4-4-0-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-ml {
+  background-position: 0 bottom;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-mr {
+  background-position: right bottom;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tr,
+.x-panel-header-light-framed-bottom-br,
+.x-panel-header-light-framed-bottom-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tl,
+.x-panel-header-light-framed-bottom-bl,
+.x-panel-header-light-framed-bottom-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tc {
+  height: 0;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-tl,
+.x-panel-header-light-framed-bottom-bl,
+.x-panel-header-light-framed-bottom-tr,
+.x-panel-header-light-framed-bottom-br,
+.x-panel-header-light-framed-bottom-tc,
+.x-panel-header-light-framed-bottom-bc,
+.x-panel-header-light-framed-bottom-ml,
+.x-panel-header-light-framed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-bottom-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-ml,
+.x-panel-header-light-framed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-bottom-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-bottom-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-bottom-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-bottom-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-bottom:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-bottom-corners.gif), sides:url(images/panel-header/panel-header-light-framed-bottom-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px 0 5px 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-left {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-left-frameInfo {
+  font-family: dh-4-0-0-4-5-0-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-ml {
+  background-position: 0 left;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-mr {
+  background-position: right left;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tr,
+.x-panel-header-light-framed-left-br,
+.x-panel-header-light-framed-left-mr {
+  padding-right: 0;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tl,
+.x-panel-header-light-framed-left-bl,
+.x-panel-header-light-framed-left-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-tl,
+.x-panel-header-light-framed-left-bl,
+.x-panel-header-light-framed-left-tr,
+.x-panel-header-light-framed-left-br,
+.x-panel-header-light-framed-left-tc,
+.x-panel-header-light-framed-left-bc,
+.x-panel-header-light-framed-left-ml,
+.x-panel-header-light-framed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-left-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-ml,
+.x-panel-header-light-framed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-left-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-left-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-left-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-left-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-left:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-left-corners.gif), sides:url(images/panel-header/panel-header-light-framed-left-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-top {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-collapsed-top-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-ml {
+  background-position: 0 top;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-mr {
+  background-position: right top;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tr,
+.x-panel-header-light-framed-collapsed-top-br,
+.x-panel-header-light-framed-collapsed-top-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tl,
+.x-panel-header-light-framed-collapsed-top-bl,
+.x-panel-header-light-framed-collapsed-top-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-tl,
+.x-panel-header-light-framed-collapsed-top-bl,
+.x-panel-header-light-framed-collapsed-top-tr,
+.x-panel-header-light-framed-collapsed-top-br,
+.x-panel-header-light-framed-collapsed-top-tc,
+.x-panel-header-light-framed-collapsed-top-bc,
+.x-panel-header-light-framed-collapsed-top-ml,
+.x-panel-header-light-framed-collapsed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-top-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-ml,
+.x-panel-header-light-framed-collapsed-top-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-top-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-top-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-top-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-top-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-collapsed-top:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-collapsed-top-corners.gif), sides:url(images/panel-header/panel-header-light-framed-collapsed-top-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-right {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-collapsed-right-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-ml {
+  background-position: 0 right;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-mr {
+  background-position: right right;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tr,
+.x-panel-header-light-framed-collapsed-right-br,
+.x-panel-header-light-framed-collapsed-right-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tl,
+.x-panel-header-light-framed-collapsed-right-bl,
+.x-panel-header-light-framed-collapsed-right-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-tl,
+.x-panel-header-light-framed-collapsed-right-bl,
+.x-panel-header-light-framed-collapsed-right-tr,
+.x-panel-header-light-framed-collapsed-right-br,
+.x-panel-header-light-framed-collapsed-right-tc,
+.x-panel-header-light-framed-collapsed-right-bc,
+.x-panel-header-light-framed-collapsed-right-ml,
+.x-panel-header-light-framed-collapsed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-right-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-ml,
+.x-panel-header-light-framed-collapsed-right-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-right-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-right-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-right-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-right-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-collapsed-right:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-collapsed-right-corners.gif), sides:url(images/panel-header/panel-header-light-framed-collapsed-right-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-bottom {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-collapsed-bottom-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-ml {
+  background-position: 0 bottom;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-mr {
+  background-position: right bottom;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tr,
+.x-panel-header-light-framed-collapsed-bottom-br,
+.x-panel-header-light-framed-collapsed-bottom-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tl,
+.x-panel-header-light-framed-collapsed-bottom-bl,
+.x-panel-header-light-framed-collapsed-bottom-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-tl,
+.x-panel-header-light-framed-collapsed-bottom-bl,
+.x-panel-header-light-framed-collapsed-bottom-tr,
+.x-panel-header-light-framed-collapsed-bottom-br,
+.x-panel-header-light-framed-collapsed-bottom-tc,
+.x-panel-header-light-framed-collapsed-bottom-bc,
+.x-panel-header-light-framed-collapsed-bottom-ml,
+.x-panel-header-light-framed-collapsed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-bottom-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-ml,
+.x-panel-header-light-framed-collapsed-bottom-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-bottom-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-bottom-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-bottom-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-bottom-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-collapsed-bottom:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-collapsed-bottom-corners.gif), sides:url(images/panel-header/panel-header-light-framed-collapsed-bottom-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 137, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left {
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  padding: 5px 5px 5px 5px;
+  border-width: 5px;
+  border-style: solid;
+  background-color: #dfeaf2;
+}
+
+/* line 189, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-mc {
+  background-color: #dfeaf2;
+}
+
+/* line 235, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-left {
+  padding: 0 !important;
+  border-width: 0 !important;
+  -webkit-border-radius: 0px;
+  -moz-border-radius: 0px;
+  -ms-border-radius: 0px;
+  -o-border-radius: 0px;
+  border-radius: 0px;
+  background-color: transparent;
+}
+
+/* line 255, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+body.x-nbr .x-panel-header-light-framed-collapsed-left-frameInfo {
+  font-family: dh-4-4-4-4-5-5-5-5-5-5-5-5;
+}
+
+/* line 322, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tl {
+  background-position: 0 -10px;
+}
+
+/* line 326, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tr {
+  background-position: right -15px;
+}
+
+/* line 330, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-bl {
+  background-position: 0 -20px;
+}
+
+/* line 334, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-br {
+  background-position: right -25px;
+}
+
+/* line 338, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-ml {
+  background-position: 0 left;
+}
+
+/* line 342, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-mr {
+  background-position: right left;
+}
+
+/* line 346, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tc {
+  background-position: 0 0;
+}
+
+/* line 350, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-bc {
+  background-position: 0 -5px;
+}
+
+/* line 357, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tr,
+.x-panel-header-light-framed-collapsed-left-br,
+.x-panel-header-light-framed-collapsed-left-mr {
+  padding-right: 5px;
+}
+
+/* line 363, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tl,
+.x-panel-header-light-framed-collapsed-left-bl,
+.x-panel-header-light-framed-collapsed-left-ml {
+  padding-left: 5px;
+}
+
+/* line 367, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tc {
+  height: 5px;
+}
+
+/* line 370, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-bc {
+  height: 5px;
+}
+
+/* line 381, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-tl,
+.x-panel-header-light-framed-collapsed-left-bl,
+.x-panel-header-light-framed-collapsed-left-tr,
+.x-panel-header-light-framed-collapsed-left-br,
+.x-panel-header-light-framed-collapsed-left-tc,
+.x-panel-header-light-framed-collapsed-left-bc,
+.x-panel-header-light-framed-collapsed-left-ml,
+.x-panel-header-light-framed-collapsed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-left-corners.gif);
+}
+
+/* line 425, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-ml,
+.x-panel-header-light-framed-collapsed-left-mr {
+  zoom: 1;
+  background-image: url(images/panel-header/panel-header-light-framed-collapsed-left-sides.gif);
+  background-repeat: repeat-y;
+}
+
+/* line 437, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-panel-header-light-framed-collapsed-left-mc {
+  padding: 5px 5px 5px 5px;
+}
+
+/* line 446, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/frame.scss */
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-left-tl,
+.x-strict .x-ie7 .x-panel-header-light-framed-collapsed-left-bl {
+  position: relative;
+  right: 0;
+}
+
+/*<if slicer>*/
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/slicer.scss */
+.x-panel-header-light-framed-collapsed-left:after {
+  display: none;
+  content: "x-slicer:corners:url(images/panel-header/panel-header-light-framed-collapsed-left-corners.gif), sides:url(images/panel-header/panel-header-light-framed-collapsed-left-sides.gif)";
+}
+
+/*</if slicer>*/
+/* */
+/* line 396, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-framed-top {
+  border-bottom-width: 5px !important;
+}
+/* line 400, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-framed-right {
+  border-left-width: 5px !important;
+}
+/* line 404, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-framed-bottom {
+  border-top-width: 5px !important;
+}
+/* line 408, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel .x-panel-header-light-framed-left {
+  border-right-width: 5px !important;
+}
+
+/* line 414, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-top {
+  border-bottom-width: 0 !important;
+}
+/* line 418, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-right {
+  border-left-width: 0 !important;
+}
+/* line 422, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-bottom {
+  border-top-width: 0 !important;
+}
+/* line 426, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-nbr .x-panel-header-light-framed-collapsed-left {
+  border-right-width: 0 !important;
+}
+
+/* line 522, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical .x-panel-header-text-container {
+  -webkit-transform: rotate(90deg);
+  -webkit-transform-origin: 0 0;
+  -moz-transform: rotate(90deg);
+  -moz-transform-origin: 0 0;
+  -o-transform: rotate(90deg);
+  -o-transform-origin: 0 0;
+  transform: rotate(90deg);
+  transform-origin: 0 0;
+}
+/* line 36, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/rotate-element.scss */
+.x-ie9m .x-panel-header-light-framed-vertical .x-panel-header-text-container {
+  background-color: #dfeaf2;
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1), progid:DXImageTransform.Microsoft.Chroma(color=#dfeaf2);
+}
+
+/* line 551, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed .x-panel-header-icon {
+  width: 16px;
+  height: 16px;
+  background-position: center center;
+}
+/* line 556, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed .x-panel-header-glyph {
+  color: white;
+  font-size: 16px;
+  line-height: 16px;
+  opacity: 0.5;
+}
+/* line 572, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-ie8m .x-panel-header-light-framed .x-panel-header-glyph {
+  color: #eff4f8;
+}
+
+/* line 580, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-horizontal .x-panel-header-icon-before-title {
+  margin: 0 6px 0 0;
+}
+/* line 590, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-horizontal .x-panel-header-icon-after-title {
+  margin: 0 0 0 6px;
+}
+
+/* line 602, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical .x-panel-header-icon-before-title {
+  margin: 0 0 6px 0;
+}
+/* line 612, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical .x-panel-header-icon-after-title {
+  margin: 6px 0 0 0;
+}
+
+/* line 625, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-horizontal .x-tool-after-title {
+  margin: 0 0 0 6px;
+}
+/* line 635, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-horizontal .x-tool-before-title {
+  margin: 0 6px 0 0;
+}
+
+/* line 647, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical .x-tool-after-title {
+  margin: 6px 0 0 0;
+}
+/* line 657, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-header-light-framed-vertical .x-tool-before-title {
+  margin: 0 0 6px 0;
+}
+
+/* line 684, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable {
+  overflow: visible;
+}
+/* line 687, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+  opacity: 0;
+}
+/* line 696, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-north-br {
+  top: -5px;
+}
+/* line 699, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-south-br {
+  bottom: -5px;
+}
+/* line 702, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-east-br {
+  right: -5px;
+}
+/* line 705, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-west-br {
+  left: -5px;
+}
+/* line 708, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-northwest-br {
+  left: -5px;
+  top: -5px;
+}
+/* line 712, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-northeast-br {
+  right: -5px;
+  top: -5px;
+}
+/* line 716, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-southeast-br {
+  right: -5px;
+  bottom: -5px;
+}
+/* line 720, ../../../../ext/packages/ext-theme-neutral/sass/src/panel/Panel.scss */
+.x-panel-light-framed-resizable .x-panel-handle-southwest-br {
+  left: -5px;
+  bottom: -5px;
+}
+
+/* line 2, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-l {
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 6, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-b {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-bl {
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 16, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-r {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 20, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-rl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 26, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-rb {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 32, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-rbl {
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 40, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-t {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+}
+
+/* line 44, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-tl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 50, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-tb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 56, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-tbl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 64, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-tr {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+}
+
+/* line 70, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-trl {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-left-color: #157fcc !important;
+  border-left-width: 1px !important;
+}
+
+/* line 78, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-trb {
+  border-top-color: #157fcc !important;
+  border-top-width: 1px !important;
+  border-right-color: #157fcc !important;
+  border-right-width: 1px !important;
+  border-bottom-color: #157fcc !important;
+  border-bottom-width: 1px !important;
+}
+
+/* line 86, ../../../../ext/packages/ext-theme-base/sass/etc/mixins/border-management.scss */
+.x-panel-light-framed-outer-border-trbl {
+  border-color: #157fcc !important;
+  border-width: 1px !important;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neptune/sass/src/form/field/Trigger.scss */
+.x-form-trigger {
+  height: 22px;
+}
+
+/* line 9, ../../../../ext/packages/ext-theme-neptune/sass/src/form/field/Trigger.scss */
+.x-form-trigger-wrap {
+  border: 1px solid;
+  border-color: silver #d9d9d9 #d9d9d9;
+}
+/* line 12, ../../../../ext/packages/ext-theme-neptune/sass/src/form/field/Trigger.scss */
+.x-form-trigger-wrap .x-form-text {
+  border-width: 0;
+  height: 22px;
+}
+/* line 16, ../../../../ext/packages/ext-theme-neptune/sass/src/form/field/Trigger.scss */
+.x-content-box .x-form-trigger-wrap .x-form-text {
+  height: 15px;
+}
+/* line 22, ../../../../ext/packages/ext-theme-neptune/sass/src/form/field/Trigger.scss */
+.x-form-trigger-wrap-focus .x-form-trigger-wrap {
+  border-color: #3892d3;
+}
+/* line 26, ../../../../ext/packages/ext-theme-neptune/sass/src/form/field/Trigger.scss */
+.x-form-invalid .x-form-trigger-wrap {
+  border-color: #cf4c35;
+}
+
+/* line 1, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-handle {
+  background-color: #157fcc;
+  background-repeat: no-repeat;
+}
+
+/* line 10, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-east,
+.x-resizable-over .x-resizable-handle-west,
+.x-resizable-pinned .x-resizable-handle-east,
+.x-resizable-pinned .x-resizable-handle-west {
+  background-position: center;
+}
+/* line 15, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-south,
+.x-resizable-over .x-resizable-handle-north,
+.x-resizable-pinned .x-resizable-handle-south,
+.x-resizable-pinned .x-resizable-handle-north {
+  background-position: center;
+}
+/* line 19, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-southeast,
+.x-resizable-pinned .x-resizable-handle-southeast {
+  background-position: -2px -2px;
+}
+/* line 23, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-northwest,
+.x-resizable-pinned .x-resizable-handle-northwest {
+  background-position: 2px 2px;
+}
+/* line 27, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-northeast,
+.x-resizable-pinned .x-resizable-handle-northeast {
+  background-position: -2px 2px;
+}
+/* line 31, ../../../../ext/packages/ext-theme-neptune/sass/src/resizer/Resizer.scss */
+.x-resizable-over .x-resizable-handle-southwest,
+.x-resizable-pinned .x-resizable-handle-southwest {
+  background-position: 2px -2px;
+}
diff --git a/interface/app/Procedure.js b/interface/app/Procedure.js
deleted file mode 100755
index 7adf194..0000000
--- a/interface/app/Procedure.js
+++ /dev/null
@@ -1,1371 +0,0 @@
-/**
- * istSOS WebAdmin - Istituto Scienze della Terra
- * Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-Ext.define('istsos.store.ObservationEditor', {
-    extend: 'Ext.data.Store',
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            proxy: {
-                type: 'memory',
-                reader: {
-                    type: 'array',
-                    idProperty: 'micro'
-                }
-            }
-        }, cfg)]);
-        this.addEvents('seriesupdated');
-    }
-});
-
-Ext.define('istsos.store.EditorQiStore', {
-    extend: 'Ext.data.Store',
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'editorQiStore',
-            fields: [
-            {
-                name: 'name'
-            },
-            {
-                name: 'description'
-            }
-            ]
-        }, cfg)]);
-    }
-});
-
-Ext.define('istsos.Sensor', {
-    extend: 'Ext.util.Observable',
-    service: null,
-    offering: null,
-    sensor: null,
-    beginPosition: null,
-    endPosition: null,
-    meta: null,
-    data: null,
-    store: null,
-    iso8601Field: 'iso8601',
-    visible: true,
-    color: "#000000",
-    configsections: {},
-    /**
-     * {Array} storeFields
-     * Array used to initialize an Ext.data.Model object.
-     * 
-     * storeFields = [
-     *   {
-     *       name: "micro",
-     *       type: "int"
-     *   },
-     *   {
-     *       name: "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601",
-     *       type: "string"
-     *   },
-     *   {
-     *       name: "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature",
-     *       type: "string"
-     *   }
-     * ]
-     * 
-     */
-    storeFields: [],
-    constructor: function(service, offering, sensor, config){
-        
-        if (Ext.isEmpty(service) || Ext.isEmpty(offering) || Ext.isEmpty(sensor) ) {
-            throw "Service, offering and sensor parameters are mandatory!"
-        }
-        
-        this.addEvents({
-            "metadataLoaded" : true,
-            "observationLoaded" : true,
-            "observationSaved" : true,
-            "colorchanged" : true,
-            "visibilitychanged" : true
-        });
-        
-        this.service = service;
-        this.offering = offering;
-        this.sensor = sensor;
-        
-        Ext.applyIf(this, config);
-        this.callParent(arguments);
-        this._loadMetadata();
-        
-        
-    },
-    // can be an iso8601 date string, a Date object or microseconds in unix time
-    getObservation: function(from, to){
-        
-        if (Ext.isDate(from)) {
-            from = Ext.Date.format(from,'c');
-        }else if (Ext.isNumber(from)) {
-            from = istsos.utils.micro2iso(from);
-        }else{
-            // Check that is a valid string in iso format
-            var d = Ext.Date.parse(from,'c');
-        }
-        
-        if (Ext.isDate(to)) {
-            to = Ext.Date.format(to,'c');
-        }else if (Ext.isNumber(to)) {
-            to = istsos.utils.micro2iso(to);
-        }else{
-            // Check that is a valid string in iso format
-            var d = Ext.Date.parse(to,'c');
-        }
-        
-        Ext.Ajax.request({
-            url: Ext.String.format(
-                '{0}/istsos/services/{1}/operations/getobservation/' +
-                'offerings/{2}/procedures/{3}/observedproperties/{4}/' +
-                'eventtime/{5}/{6}', wa.url, this.service,  this.offering,
-                this.sensor, this.getObservedProperties().join(','), from, to),
-            scope: this,
-            method: "GET",
-            success: function(response){
-                var json = Ext.decode(response.responseText);
-                if (json.success) {
-                    for (var i = 0; i < json.data.length; i++) {
-                        if (json.data[i]['name']==this.sensor) {
-                            this.loadObservation(json.data[i]);
-                            break;
-                        }
-                    }
-                }
-            }
-        });
-        
-    },
-    loadObservation: function(data){
-        if (data['name']!=this.sensor) {
-            throw "wrong data object. The data belong to " + data['name'];
-        }
-        this.data = data;
-        var records = [], 
-        values = this.data['result']['DataArray']['values'],
-        field = this.data['result']['DataArray']['field'],
-        fieldIdx = {};
-        for (var f = 0; f < field.length; f++) {
-            fieldIdx[field[f]['definition']]=f;
-        }
-        for (var i = 0; i < values.length; i++) {
-            var row = [];
-            // Estrazione dei microsecondi dalla data
-            var micro = istsos.utils.iso2micro(values[i][0]);
-            row.push(micro, values[i][0]);
-            for (var f = 2; f < this.storeFields.length; f++) {
-                
-                var fieldName = this.storeConvertIdToField[this.storeFields[f]['name']];
-                row.push(parseFloat(values[i][fieldIdx[fieldName]]));
-                
-            //row.push(parseFloat(values[i][fieldIdx[this.storeFields[f]['name']]]));
-            }
-            records.push(row);
-        }
-        this.store.loadData(records);
-        this.fireEvent("observationLoaded", this);
-    },
-    insertObservation: function(){
-        var recs = this.store.getRange();
-        //var fields = this.storeFields;
-        var fields = this.data.result.DataArray.field;
-        var values = [];
-        for (var r = 0; r < recs.length; r++) {
-            var row = [];
-            for (var i = 0; i < fields.length; i++) {
-                
-                var def = fields[i].definition;
-                if (def == this.isodef) {
-                    row.push(istsos.utils.micro2iso(recs[r].get('micro')));
-                }else{
-                    row.push(""+(recs[r].get(this.storeConvertFieldToId[def])));
-                }
-                
-                /*
-                if (fields[i].name==this.iso8601Field) {
-                    continue;
-                }else if (fields[i].name=='micro') {
-                    row.push(istsos.utils.micro2iso(recs[r].get(fields[i].name)));
-                }else{
-                    row.push(""+(recs[r].get(fields[i].name)));
-                }*/
-            }
-            values.push(row);
-        }
-        this.data.result.DataArray.values = values;
-        this.data.result.DataArray.elementCount = ""+values.length;
-        this.data.samplingTime.beginPosition = istsos.utils.micro2iso(recs[0].get('micro'));
-        this.data.samplingTime.endPosition = istsos.utils.micro2iso(recs[recs.length-1].get('micro'));
-                
-        Ext.Ajax.request({
-            url: Ext.String.format('{0}/istsos/services/{1}/operations/insertobservation',wa.url,this.service),
-            scope: this,
-            method: "POST",
-            jsonData: {
-                "AssignedSensorId" : this.getId(),
-                "ForceInsert" : "true",
-                "Observation" : this.data
-            },
-            success: function(response){
-                var json = Ext.decode(response.responseText);
-                
-                this.commitModifications();
-                
-                this.fireEvent("observationSaved", this, json);
-            }
-        });
-        
-    },
-    rejectModifications: function(){
-        var recs = this.store.getUpdatedRecords();
-        for (var i = 0; i < recs.length; i++) {
-            recs[i].reject();
-        }
-    },
-    commitModifications: function(){
-        var recs = this.store.getUpdatedRecords();
-        for (var i = 0; i < recs.length; i++) {
-            recs[i].commit();
-        }
-    },
-    // This is a call to wa service for the describeSensor method
-    _loadMetadata: function(){
-        // First getting some sensors's service config
-        Ext.Ajax.request({          
-            url: Ext.String.format('{0}/istsos/services/{1}/configsections',wa.url,this.service),
-            scope: this,
-            method: "GET",
-            success: function(response){
-                var json = Ext.decode(response.responseText);
-                if (!json.success) {
-                    throw "Error retreiving general service config";
-                }
-                this.configsections = json.data;
-                this.isodef = this.configsections.urn.time;
-                Ext.Ajax.request({
-                    url: Ext.String.format('{0}/istsos/services/{1}/procedures/{2}',wa.url,this.service,this.sensor),
-                    scope: this,
-                    method: "GET",
-                    success: function(response){
-                        var json = Ext.decode(response.responseText);
-                        this.storeConvertFieldToId = ["'"+this.isodef+"': '"+this.iso8601Field+"'"];
-                        this.storeConvertIdToField = ["'"+this.iso8601Field+"': '"+this.isodef+"'"];
-                        if (json.success) {
-                            this.meta = json.data;
-                            // Configuring store fields
-                            this.storeFields = [{
-                                name: "micro", // Unixtime in µs
-                                type: 'int'
-                            },{
-                                name: this.iso8601Field,
-                                //name: this.isodef,
-                                type: 'string'
-                            }];
-                            for (var i = 1; i < this.meta.outputs.length; i++) {
-                                
-                                var one = Ext.id(), two = Ext.id();
-                                this.storeConvertFieldToId.push(
-                                    "'"+this.meta.outputs[i].definition+"': '"+one+"'",
-                                    "'"+this.meta.outputs[i].definition+":qualityIndex': '"+two+"'"
-                                    );
-                                this.storeConvertIdToField.push(
-                                    "'"+one+"': '"+this.meta.outputs[i].definition+"'",
-                                    "'"+two+"': '"+this.meta.outputs[i].definition+":qualityIndex"+"'"
-                                    );
-                                this.storeFields.push({
-                                    name: one,
-                                    type: 'float'
-                                },{
-                                    name: two,
-                                    type: 'float'
-                                });
-                            }
-                            this.storeConvertFieldToId = Ext.decode("{"+this.storeConvertFieldToId.join(',')+"}");
-                            this.storeConvertIdToField = Ext.decode("{"+this.storeConvertIdToField.join(',')+"}");
-                            
-                            Ext.define(this.service+'-'+this.sensor+'-model', {
-                                extend: 'Ext.data.Model',
-                                idProperty: "micro",
-                                fields: this.storeFields
-                            });
-                            this.storeId = Ext.id();
-                            this.store = Ext.create('istsos.store.ObservationEditor',{
-                                model: this.service+'-'+this.sensor+'-model',
-                                name: this.sensor
-                            });
-                            this.fireEvent("metadataLoaded", this);
-                        }
-                    }
-                });
-            }
-        });
-    },
-    getDuration: function(){
-        if (!Ext.isObject(this.data)) {
-            throw "Duration unknown. Observation object not loaded.";
-        }
-        return this.data["samplingTime"]["duration"]
-    },
-    getId: function(){
-        if (Ext.isEmpty(this.meta)) {
-            throw "Sensor metadata are not initialized at all!";
-        }
-        return this.meta['assignedSensorId'];
-    },
-    getName: function(){
-        return this.sensor;    
-    },
-    // return insitu-fixed-point, insitu-mobile-point or virtual
-    getSystemType: function(){
-        if (Ext.isEmpty(this.meta)) {
-            throw "Sensor metadata are not initialized at all!";
-        }
-        for (var i = 0; i < this.meta.classification.length; i++) {
-            if (this.meta.classification[i]['definition']=='urn:ogc:def:classifier:x-istsos:1.0:systemType') {
-                return this.meta.classification[i]['value'];
-            }
-        }
-    },
-    // The name of the sensor type
-    getSensorType: function(){
-        if (Ext.isEmpty(this.meta)) {
-            throw "Sensor metadata are not initialized at all!";
-        }
-        for (var i = 0; i < this.meta.classification.length; i++) {
-            if (this.meta.classification[i]['definition'].indexOf('urn:ogc:def:classifier:x-istsos:1.0:sensorType')) {
-                return this.meta.classification[i]['value'];
-            }
-        }
-    },
-    getGeoJSON: function(){
-        if (Ext.isEmpty(this.meta)) {
-            throw "Sensor metadata are not initialized at all!";
-        }
-        return this.meta['location']
-    },
-    getObservedProperties: function(){
-        var ret = [];
-        for (var i = 0; i < this.meta.outputs.length; i++) {
-            if (this.meta.outputs[i]['definition']!=this.isodef) {
-                ret.push(this.meta.outputs[i]['definition']);
-            }
-        }
-        return ret;
-    },
-    getObservedPropertiesName: function(){
-        var ret = [];
-        for (var i = 0; i < this.meta.outputs.length; i++) {
-            if (this.meta.outputs[i]['definition']!=this.isodef) {
-                ret.push(this.meta.outputs[i]['name']);
-            }
-        }
-        return ret;
-    },
-    getUomCode: function(definition){
-        for (var i = 0; i < this.meta.outputs.length; i++) {
-            if (this.meta.outputs[i]['definition']==definition) {
-                return this.meta.outputs[i]['uom'];
-            }
-        }
-    },
-    getBeginPosition: function(){
-        var ret = [];
-        for (var i = 0; i < this.meta.outputs.length; i++) {
-            if (this.meta.outputs[i]['definition']==this.isodef) {
-                if (Ext.isArray(this.meta.outputs[i]['constraint']['interval']) 
-                    && this.meta.outputs[i]['constraint']['interval'].length==2) {
-                    return this.meta.outputs[i]['constraint']['interval'][0];
-                }
-            }
-        }
-        return ret;
-    },
-    getEndPosition: function(){
-        var ret = [];
-        for (var i = 0; i < this.meta.outputs.length; i++) {
-            if (this.meta.outputs[i]['definition']==this.isodef) {
-                if (Ext.isArray(this.meta.outputs[i]['constraint']['interval']) 
-                    && this.meta.outputs[i]['constraint']['interval'].length==2) {
-                    return this.meta.outputs[i]['constraint']['interval'][1];
-                }
-            }
-        }
-        return ret;
-    },
-    getDefaultQI: function(){
-        return this.configsections.getobservation.defaultqi;
-    },
-    getDefaultNoData: function(){
-        return parseFloat(this.configsections.getobservation.aggregatenodata);
-    },
-    /*
-     * Change the color representing this procedure.
-     * If silent = true then the event will NOT be thrown
-     */
-    setColor: function(color, silent){
-        if (silent != true) {
-            silent = false;
-        }
-        var old = this.color;
-        this.color = color;
-        if (!silent && this.color != old) {
-            this.fireEvent("colorchanged", this, this.color, old);
-        }
-    },
-    getColor: function(){
-        return this.color;
-    },
-    /*
-     * Change the visibility of this procedure.
-     * If silent = true then the event will NOT be thrown
-     */
-    setVisibility: function(visible, silent){
-        if (silent != true) {
-            silent = false;
-        }
-        var old = this.visible;
-        this.visible = visible;
-        if (!silent && this.visible != old) {
-            this.fireEvent("visibilitychanged", this, this.visible);
-        }
-    },
-    getVisibility: function(){
-        return this.visible;
-    }
-});
-
-Ext.define('istsos.utils', {
-    extend: 'Ext.util.Observable',
-    statics: {
-        // Convert microseconds number to isodate string
-        // If offset in minutes is not given UTC will be returned
-        micro2iso: function(m, offset){
-            
-            var offsetObj = new Date();
-            offsetObj.setHours(0);
-            offsetObj.setMinutes(0);
-            var sign = "+";
-            
-            var date = new Date(parseInt(m/1000));
-            var micro = parseFloat("0."+m);
-            
-            
-            if (offset!=null) {
-                date.setUTCMinutes(date.getUTCMinutes()+offset);
-                if (offset<0) {
-                    sign = "-";
-                    offset = -1 * offset;
-                    offsetObj.setMinutes(offset);
-                }else{
-                    offsetObj.setMinutes(offset);
-                }
-            }
-            
-            var year = date.getUTCFullYear();
-            var month = (date.getUTCMonth()+1)<10?"0"+(date.getUTCMonth()+1):(date.getUTCMonth()+1);
-            var day = date.getUTCDate()<10?"0"+date.getUTCDate():date.getUTCDate();
-            var hour = date.getUTCHours()<10?"0"+date.getUTCHours():date.getUTCHours();
-            //hour = hour + offsetObj.getHours();
-            var minute = date.getUTCMinutes()<10?"0"+date.getUTCMinutes():date.getUTCMinutes();
-            //minute = minute + offsetObj.getMinutes();
-            
-            var second = date.getUTCSeconds()<10?"0"+date.getUTCSeconds():date.getUTCSeconds();
-            var micro = (""+parseFloat((""+(m/1000000)).replace(parseInt(m/1000000),"0"))).replace("0","");
-            
-            var tz = offset==null?"Z":sign+(offsetObj.getHours()<10?"0"+offsetObj.getHours():offsetObj.getHours())+(offsetObj.getMinutes()<10?"0"+offsetObj.getMinutes():offsetObj.getMinutes());
-            
-            return year + "-" + month + "-"  + day + "T" + hour+ ":" + minute + ":" + second + "" + micro + "" + tz;
-            
-        },
-        // Extract microseconds from an isodate string 
-        //  > iso date with micro seconds: "2012-10-28T01:00:00.123456+0100"
-        //  > iso date with micro seconds: "2012-10-28T01:00:00+0100"
-        iso2micro: function(iso){
-            
-            // iso = "2012-10-28T00:50:00.123456+0100" | "2012-10-28T00:50:00+0100"
-            //                0      1     2        3          4        5
-            // splitted = ["2012", "10", "28", "00:50:00", "123456", "0100"]
-            // splitted = ["2012", "10", "28", "00:50:00", "0100"]
-            var splitted = iso.split(/[T]|[.]|[,]|[+]|[-]|[z]|[Z]/g);
-            
-            // Splitting hours
-            var hours = splitted[3].split(":");
-            
-            // Calculating offset
-            var hoffset = 0;
-            var moffset = 0;
-            if (iso.match(/[Z]/g)==null) { // Already UTC
-                hoffset = parseInt(parseInt(splitted[splitted.length-1])/100);
-                moffset = parseInt(splitted[splitted.length-1]) - (hoffset*100);
-                if (iso.match(/[+]/g)==null) {
-                    hoffset = -1 * hoffset;
-                    moffset = -1 * moffset;
-                }
-            }
-            
-            var milli = Date.UTC(
-                parseInt(splitted[0]), // years
-                parseInt(splitted[1])-1, // months
-                parseInt(splitted[2]), // days
-                parseInt(hours[0])-hoffset, // hours
-                parseInt(hours[1])-moffset, // minutes
-                parseInt(hours[2]) // seconds
-                );
-                    
-            var match = iso.match(/[.]|[,]/g);
-            if (match != null && ( Ext.Array.contains(match, '.') || Ext.Array.contains(match, ','))) {
-                var micro = parseFloat("0."+splitted[4]);
-                
-                //console.log(istsos.utils.micro2iso((milli * 1000) + (micro * 1000000)));
-                return (milli * 1000) + (micro * 1000000);
-            } else {
-                //console.log(istsos.utils.micro2iso( milli*1000));
-                return milli*1000;
-            }
-            
-        },
-        getStore: function(procedure){
-            
-            var meta = procedure.meta;
-            var service = procedure.service;
-            var sensor = procedure.sensor;
-            
-            var storeFields = [{
-                name: "micro", // Tagliamo la testa al toro -> i mems misurano ogni mezzo millisecondo (500µs)!!
-                type: 'int'
-            },{
-                name: this.isodef,
-                type: 'string'
-            }];
-        
-            for (var i = 1; i < meta.outputs.length; i++) {
-                storeFields.push({
-                    name: meta.outputs[i].definition,
-                    type: 'float'
-                },{
-                    name: meta.outputs[i].definition+":qualityIndex",
-                    type: 'float'
-                });
-            }
-            
-            Ext.define(service+'-'+sensor+'-model', {
-                extend: 'Ext.data.Model',
-                idProperty: this.isodef,
-                fields: storeFields
-            });
-            
-            /*return Ext.create('istsos.store.ObservationEditor',{
-                model: service+'-'+sensor+'-model',
-                name: sensor
-            });*/
-            
-            return Ext.create('Ext.data.Store', {
-                model: service+'-'+sensor+'-model',
-                name: sensor,
-                proxy: {
-                    type: 'memory',
-                    reader: {
-                        type: 'array',
-                        idProperty: this.isodef
-                    }
-                }
-            });
-            
-        },
-        validatefilename: function(procedure, filename){
-            var tmp = filename.split(/[\\/]/);
-            if (tmp.length<2 || !Ext.isArray(tmp)) {
-                throw "File path error";
-            }
-            var ext  = tmp[tmp.length-1].split(".")[1];
-            if (ext != 'dat') {
-                throw "File extension wrong (must be *.dat)";
-            }
-            tmp = tmp[tmp.length-1].split(".")[0];
-            var ep = tmp.split("_");
-            if (ep.length<2 || !Ext.isArray(ep)) {
-                throw "File name format error";
-            }
-            ep = ep[ep.length-1];
-            // tmp = tmp.replace("_"+ep,"");
-            // Extracting the end position date
-            //  > date in file names are always in Greenwich time (GMT)
-            ep = Ext.Date.parse(ep+"0", "YmdHisZ");
-            // Checking File nema prefix must be equal the procedure name
-            if (tmp!=procedure.getName()) {
-                throw "File name format error, '" + tmp + "'"
-                + " is is not valid for '" + procedure.getName() + "' procedure";
-            }
-            return true;
-        },
-        parsecsvfile: function(procedure, fileList, filename, callback){
-            this.getParser().parsecsvfile(procedure, fileList, filename, function(progressEvent){
-                callback(istsos.utils.parsecsvstring(procedure, progressEvent.target.result));
-            });
-        },
-        // Return an object that can read the csv file and throw an event when finisched
-        getParser: function(){
-            return Ext.create('Ext.util.Observable', {
-                events: ['csvfileparsed'],
-                parsecsvfile: function(procedure, fileList, filename, callback){
-                    if (Ext.isFunction(callback)) {
-                        this.callback = callback;
-                    }else{
-                        delete this.callback;
-                    }
-                    var reader = new FileReader();
-                    try {
-                        for (var i = 0; i < fileList.length; i++) {
-                            reader.parser = this;
-                            reader.addEventListener('load', function (e) {
-                                if (Ext.isFunction(this.parser.callback)) {
-                                    this.parser.callback(e);
-                                }
-                                this.parser.fireEvent('csvfileparsed', e.target.result);
-                            }, false);     
-                            reader.readAsText(fileList[i]);
-                        }
-                    } catch (exception) { 
-                        Ext.Msg.alert('Warning', exception);           
-                    } 
-                }
-            });
-        },
-        // Convert microseconds number to isodate string
-        /*
-         * Parse a csv and return an object like this:
-         * {
-         *      "data": [
-         *          [
-         *              {
-         *                  "micro": 123234253456, // microseconds
-         *                  "urn:ogc:def:parameter:x-istsos::time:iso8601": "2012-12-09T14:12Z",
-         *                  "urn:ogc:def:parameter:x-istsos::foobar": "12.5",
-         *                  "urn:ogc:def:parameter:x-istsos::foobar:qualityIndex": "100"
-         *              },
-         *              ...
-         *          ]
-         *      ],
-         *      "total": 23,
-         *      "begin": "2012-12-09T14:12Z",
-         *      "end": "2012-12-10T14:00Z"
-         * }
-         */
-        parsecsvstring: function(procedure, csvstring){            
-            var lines = csvstring.split(/[\r\n|\n]+/);             
-            var ret = {
-                data: [],
-                header: ["micro"],
-                total: 0,
-                begin: null, 
-                end: null,
-                isregular: true,
-                timeresolutions: [],
-                timeresolutionscheck: []
-            }, header = lines[0].split(",");                
-            try {                
-                if (lines.length<2) {
-                    throw "CSV file contain less then the minimal 2 line (header + value)";
-                }
-                // Detecting procedure's observation properties order
-                var opcomposition = [];
-                var properties = procedure.meta.outputs;
-                for (c = 0; c < properties.length ; c++) {                    
-                    // Check if the output observed properties exist in the CSV
-                    if(!Ext.Array.contains(
-                        header, properties[c].definition) ){
-                        throw "CSV observed properties in header are not correct"
-                    }                    
-                    if (properties[c].definition == this.isodef) {
-                        opcomposition.push(properties[c].definition);
-                    }else{
-                        opcomposition.push(
-                            properties[c].definition,
-                            properties[c].definition+":qualityIndex"
-                            );
-                    }
-                }             
-                ret.header = ret.header.concat(opcomposition);
-                // Getting the time column position in the csv file
-                var idx = Ext.Array.indexOf(header, this.isodef);                
-                // csv begin position
-                var bp = Ext.Date.parse(lines[1].split(",")[idx],"c");                
-                // Get microseconds of first date
-                ret.begin = istsos.utils.iso2micro(lines[1].split(",")[idx]);                
-                // csv end position
-                var ep;
-                // reverse loop because sometimes last rows are empty
-                for(var c=(lines.length-1);c>0;c--) {
-                    if (lines[c].split(",").length==header.length) {
-                        ep = Ext.Date.parse(lines[c].split(",")[idx],"c");
-                        // Get microseconds of last date
-                        ret.end = istsos.utils.iso2micro(lines[1].split(",")[idx]);
-                        break;
-                    }
-                }
-                // statistics counters
-                var updated = 0, inserted = 0;
-                try {
-                    var idxStart=0;      
-                    var lastDate;
-                    for(c=1;c<lines.length;c++) { // start looping csv lines >>
-                        var row = [];
-                        var line = lines[c].split(",");
-                        // csv observed properties must be lenght exacly as 
-                        //   the procedure observed property 
-                        if (line.length!=header.length) {
-                            // Skip empty rows
-                            if (line.length==1 && line[0]=="") {
-                                continue;
-                            }
-                            throw ("Length mismatch from header definition");
-                        }
-                        for (var i = 0; i < opcomposition.length; i++) {
-                            // finding the observed property position in the csv
-                            idx = Ext.Array.indexOf(header, opcomposition[i]);      
-                            if (idx < 0) { // CSV does not have observed property
-                                if (opcomposition[i].indexOf(":qualityIndex")<0) {
-                                    // Quality index are not mandatory, other output obs.prop are mandatory
-                                    throw ("Mandatory procedures output observed property \"" + opcomposition[i] + "\" is not present in the CSV text");
-                                }
-                                row.push(parseInt(procedure.getDefaultQI()));
-                            }else{
-                                if (opcomposition[i]==this.isodef) { // If isodate field
-                                    var micro = istsos.utils.iso2micro(line[idx]);
-                                    //var date = Ext.Date.parse(line[idx],"c");
-                                    row.push(micro, line[idx]);
-                                    // Prepare info about time resolutions of this timeseries
-                                    if (lastDate) {
-                                        var delta = micro - lastDate;
-                                        if (!Ext.Array.contains(ret.timeresolutions, delta)) {
-                                            ret.isregular = false;
-                                            ret.timeresolutions.push(delta);
-                                            ret.timeresolutionscheck.push(line[idx]);
-                                        }
-                                    }
-                                    lastDate = micro;
-                                }else{
-                                    if(line[idx]!=''){ // All other observed properties
-                                        row.push(parseFloat(line[idx]));
-                                    }
-                                }
-                            }
-                        }
-                        ret.total += 1;
-                        ret.data.push(row);
-                    }
-                } catch (exception) { 
-                    throw "Riga [" + (c+1) + "]:" + exception;
-                }
-            } catch (exception) { 
-                Ext.Msg.alert('Warning', exception);   
-            }
-            return ret;
-        }
-    }
-});
-
-
-/*
-Ext.define('istsos.Procedure', {
-    extend: 'Ext.util.Observable',
-    constructor: function(config){
-        
-        
-        this.addEvents({
-            "saved" : true,
-            "loaded" : true
-        });
-        
-        Ext.applyIf(this, config);
-        
-        var qis = Ext.create('istsos.store.EditorQiStore',{
-            storeId: this.id+'-editorQiStore',
-            proxy: {
-                type: 'ajax',
-                url: Ext.String.format("{0}/istsos/services/{1}/dataqualities", wa.url,this.service),
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            }
-        });
-        qis.load();
-        
-        // init store
-        this.store = null;
-        this.callParent(arguments)
-    },
-    load: function(begin, end){
-    
-    },
-    commit: function(){
-    
-    },
-    isDirty: function(){
-        return true;
-    },
-    initStore: function(obsColl){
-        
-        this.template = obsColl;
-        
-        
-        // ***********************************************
-        // Initializing grid columns
-        //   dynamic column grid initialization
-        // ***********************************************
-        this.columns = [{
-            xtype: 'datecolumn',
-            dataIndex: wa.isodef, // isodate is always present at position one
-            flex: 0.7,
-            header: 'Date',
-            format: 'c'
-        }];
-        
-        var properties = obsColl.result.DataArray.field;
-        for (var i = 1; i < properties.length; i++) {
-            
-            this.columns.push({
-                xtype: 'numbercolumn',
-                format: '0,000.000000',
-                dataIndex: properties[i].definition,
-                flex: 0.4,
-                text: properties[i].name,
-                field: {
-                    xtype: 'numberfield',
-                    decimalPrecision: 6,
-                    hideLabel: true,
-                    listeners: {
-                        change: function(form, newValue, oldValue, eOpts){
-                            console.log("change: ");
-                            console.dir(arguments);
-                        }
-                    }
-                }
-            },{
-                xtype: 'gridcolumn',
-                dataIndex: Ext.String.format('{0}:qualityIndex',properties[i].definition),
-                flex: 0.3,
-                text: 'qualityIndex',
-                //text: Ext.String.format('{0}:qualityIndex',properties[i].name),
-                field: {
-                    xtype: 'combobox',
-                    queryMode: 'local',
-                    allowBlank: false,
-                    hideLabel: true,
-                    displayField: 'name',
-                    store: this.id+'-editorQiStore',
-                    valueField: 'name',
-                    anchor: '100%'
-                }
-            });
-            i++;
-        }
-        
-        
-        // ***********************************************
-        // Initializing store fields
-        // ***********************************************
-        // Dynamic fields store initialization
-        this.strFields = [{
-            dateFormat: 'c',
-            name: wa.isodef,
-            type: 'date'
-        }];
-        
-        //var properties = obsColl.result.DataArray.field;
-        for (var i = 1; i < properties.length; i++) {
-            this.strFields.push({
-                name: properties[i].definition,
-                type: 'float'
-            });
-        }
-        
-        
-        Ext.define(this.description.system_id+'Model', {
-            extend: 'Ext.data.Model',
-            idProperty: wa.isodef,
-            fields: this.strFields
-        });
-        
-        this.storeId = Ext.id();
-        var obs = obsColl.result.DataArray.values;
-        this.store = Ext.create('istsos.store.ObservationEditor',{
-            storeId: this.storeId,
-            name: obsColl.name,
-            model: this.description.system_id+'Model',
-            totalCount: obs.length
-        });
-        var data = [];
-        
-        // *****************************************************
-        // When loading data some extra statistics are collected
-        // *****************************************************
-        // 1. Number of observations
-        this.total = obs.length;
-        // 2. Time resolution/interval 
-        //this.timeresolution = null;
-        this.timeresolutions = [];
-        if(obs.length>=2){
-            //this.timeresolution = Ext.Date.parse(obs[1][0], "c").getTime()-Ext.Date.parse(obs[0][0], "c").getTime();
-            this.timeresolutions = [Ext.Date.parse(obs[1][0], "c").getTime()-Ext.Date.parse(obs[0][0], "c").getTime()];
-        }
-        // 3. regular or irregular timeseries boolean
-        this.isregular = true;
-        this.bp = Ext.Date.parse(obs[0][0], "c");
-        this.ep = Ext.Date.parse(obs[obs.length-1][0], "c");
-        for (i = 0; i < obs.length; i++) {
-            var rec = [];
-            rec.push(Ext.Date.parse(obs[i][0], "c"));
-            //chartStore[rec[0]]=[];
-            for (var c = 1; c < obs[i].length; c++) {
-                rec.push(parseFloat(obs[i][c]));
-            //chartStore[rec[0]].push(parseFloat(obs[i][c]));
-            }
-            data.push(rec);
-            // Check resolution
-            if (i>=1) {
-                var res = data[i][0].getTime()-data[i-1][0].getTime();
-                if (!Ext.Array.contains(this.timeresolutions, res)) {
-                    console.log(data[i][0]);
-                    this.isregular = false;
-                    this.timeresolutions.push(res);
-                }
-            }
-        }
-        this.store.loadData(data);
-        
-        this.timeresolutions = Ext.Array.unique(this.timeresolutions);
-        
-        var f = Ext.getCmp(this.resid);
-        
-        var tr = [];
-        for (i = 0; i < this.timeresolutions.length; i++) {
-            if (this.timeresolutions[i]>10) {
-                tr.push(centisecsToISODuration(this.timeresolutions[i]/10));
-            }
-        }
-        
-        f.setValue(tr.join(", "));
-        f.setVisible(true);
-        
-        f = Ext.getCmp(this.obsid);
-        f.setValue(this.total + " observations");
-        f.setVisible(true);
-        
-        if (!this.isregular) {
-            f = Ext.getCmp(this.intid);
-            f.setVisible(true);
-        }
-    
-    },
-    //Create a grid that fit the internal store
-    getGrid: function(observedProperty){
-        for (var i = 1; i < this.columns.length; i++) {
-            if (this.columns[i]['dataIndex']!=observedProperty && 
-                this.columns[i]['dataIndex']!=observedProperty+':qualityIndex') {
-                this.columns[i]['hidden']=true;
-            }
-        }
-        this.grid = Ext.create('Ext.grid.Panel', {
-            xtype: 'grid',
-            id: 'oegrid',
-            title: '',
-            store: this.storeId,
-            autoRender: true,
-            autoScroll: true,
-            viewConfig: {
-            
-            },
-            columns: this.columns,
-            plugins: [Ext.create('Ext.grid.plugin.CellEditing')],
-            selModel: Ext.create('Ext.selection.RowModel', {
-                allowDeselect: true,
-                mode: 'MULTI'
-            }),
-            dockedItems: [
-            {
-                xtype: 'toolbar',
-                dock: 'top',
-                items: [
-                {
-                    xtype: 'filefield',
-                    //fieldLabel : 'CSV',
-                    emptyText: 'Load CSV..',
-                    labelWidth: 40,
-                    listeners: {
-                        change: this.loadCsv,
-                        scope: this
-                    }
-                },
-                {
-                    xtype: 'button',
-                    flex: 1,
-                    id: 'btnSelectAll',
-                    text: 'Select all',
-                    handler: function(){
-                        var selectionModel = this.grid.getSelectionModel();
-                        selectionModel.selectAll(true);
-                    },
-                    scope: this
-                }
-                ]
-            }
-            ]
-        });
-        return this.grid;
-    },
-    loadCsv: function(field, value, eOpts){
-        console.dir(arguments);
-        var files = field.fileInputEl.dom.files;
-        var reader = new FileReader();
-        try {
-            
-            // Checking file path format
-            var tmp = value.split(/[\\/]/);
-            if (tmp.length<2 || !Ext.isArray(tmp)) {
-                throw "File path error";
-            }
-            // Checking the file name format
-            tmp = tmp[tmp.length-1].split(".")[0];
-            // getting end position
-            var ep = tmp.split("_");
-            
-            if (ep.length<2 || !Ext.isArray(ep)) {
-                throw "File name format error";
-            }
-            
-            ep = ep[ep.length-1];
-            tmp = tmp.replace("_"+ep,"");
-            
-            // Extracting the end position date
-            //  > date in file names are always in Greenwich time (GMT)
-            ep = Ext.Date.parse(ep+"0", "YmdHisZ");
-            console.log(ep);
-            
-            // Checking File nema prefix must be equal the procedure name
-            if (tmp!=this.description.system_id) {
-                throw "File name format error, '" + tmp + "'"
-                + " is different from '" + this.description.system_id + "'";
-            }
-            
-            for (var i = 0; i < files.length; i++) {
-                reader.istProcedure = this;
-                reader.addEventListener('load', function (e) {
-                    this.istProcedure.parseCSV(e.target.result);
-                }, false);     
-                reader.readAsText(files[i]);
-            }
-        
-        } catch (exception) { 
-            Ext.Msg.alert('Warning', exception);           
-        } 
-    },
-    parseCSV: function(csvstring){
-        var lines = csvstring.split(/[\r\n|\n]+/); 
-        try {
-            if (lines.length<2) {
-                throw "CSV file contain less then the minimal 2 line (header + value)";
-            }
-            // Comparing CSV obsprop and real procedure's obsprop
-            var csvObsProp = lines[0].split(",");
-            // Detecting local store observation properties order
-            var tplObsprop = [];
-            var properties = this.template.result.DataArray.field;
-            for (c = 0; c < properties.length ; c++) {
-                tplObsprop.push(properties[c].definition);
-                if(!Ext.Array.contains(
-                    csvObsProp, properties[c].definition) ){
-                    throw "CSV observed properties in header are not correct"
-                }
-            }
-            
-            // Getting the time column position in the csv file
-            var idx = Ext.Array.indexOf(csvObsProp, wa.isodef);
-            // csv begin position
-            var bp = Ext.Date.parse(lines[1].split(",")[idx],"c");
-            // csv end position
-            var ep;
-            // loop because sometimes last rows are empty
-            for(var c=(lines.length-1);c>0;c--) { 
-                if (lines[c].split(",").length==tplObsprop.length) {
-                    ep = Ext.Date.parse(lines[c].split(",")[idx],"c");
-                    break;
-                }
-            }
-            
-            // Some statistics counter
-            var updated = 0, inserted = 0;
-            
-            var data = [];
-            this.store.suspendEvents();
-            try {
-                var idxStart=0;      
-                var lastDate;
-                for(c=1;c<lines.length;c++) { // start looping csv lines >>
-                    var row = [];
-                    var line = lines[c].split(",");
-                    // csv observed properties must be exacly as 
-                    //   the procedure observed property 
-                    if (line.length==tplObsprop.length) { 
-                        var id;
-                        for (var i = 0; i < tplObsprop.length; i++) {
-                            // finding the csv observed property position
-                            idx = Ext.Array.indexOf(csvObsProp, tplObsprop[i]);                    
-                            if (tplObsprop[i]==wa.isodef) {
-                                id = Ext.Date.parse(line[idx],"c");
-                                row.push(Ext.Date.clone(id));
-                                // check regularity
-                                if (lastDate) {
-                                    var res = id.getTime() - lastDate;
-                                    if (!Ext.Array.contains(this.timeresolutions, res)) {
-                                        console.log(data[i][0]);
-                                        this.isregular = false;
-                                        this.timeresolutions.push(res);
-                                    }
-                                }
-                                lastDate = id.getTime();
-                            }else{
-                                if(line[idx]!=''){
-                                    row.push(parseFloat(line[idx]));
-                                }
-                            }
-                        }
-                        
-                        if (this.bp.getTime() > id.getTime() || 
-                            this.ep.getTime() < id.getTime()) {
-                            //this.store.loadData([row],true);
-                            data.push(row);
-                            inserted++;
-                        }else{
-                            var index = this.store.find(wa.isodef,id,idxStart);
-                            if (index==-1) {
-                                //this.store.loadData([row],true);
-                                data.push(row);
-                                inserted++;
-                            }else{
-                                var rec = this.store.getAt(index);
-                                rec.beginEdit();
-                                for (i = 0; i < tplObsprop.length; i++) {
-                                    if (tplObsprop[i]!=wa.isodef) {
-                                        rec.set(tplObsprop[i],row[i]);
-                                    }
-                                }
-                                rec.endEdit(true);
-                                idxStart = index+1;
-                                updated++;
-                            }
-                        }
-                    }
-                };
-                this.store.loadData(data,true);
-                
-                if (this.bp.getTime() > bp.getTime()){
-                    this.bp = bp;
-                }
-                
-                if (this.ep.getTime() < ep.getTime()){
-                    this.ep = ep;
-                }
-                
-            } catch (exception) { 
-                throw "Riga [" + (c+1) + "]:" + exception;
-            } finally {
-                console.log("Sorting.. and resuming events.");
-                this.store.sort(wa.isodef, 'ASC');
-                this.store.resumeEvents();        
-            }
-            
-            console.log("CSV stats:");
-            console.log("Updated: " + updated);
-            console.log("Inserted: " + inserted);
-            
-            var f = Ext.getCmp(this.resid);
-            var tr = [];
-            for (i = 0; i < this.timeresolutions.length; i++) {
-                if (this.timeresolutions[i]>10) {
-                    tr.push(centisecsToISODuration(this.timeresolutions[i]/10));
-                }
-            }
-            f.setValue(tr.join(", "));
-        
-            Ext.getCmp('chartpanel').initChartStore(false);
-            
-            
-        // Check empty / no data holes ;)
-            
-            
-            
-            
-        } catch (exception) { 
-            Ext.Msg.alert('Warning', exception);   
-        }
-    
-    },
-    getCheckbox: function(){
-        this.formid = "proc-" + Ext.id();
-        this.resid = Ext.id();
-        this.obsid = Ext.id();
-        this.intid = Ext.id();
-        var begin, end;
-        var obsprop = [];
-        var d = this.description;      
-        for (var i = 0; i < d.outputs.length; i++) {
-            if (d.outputs[i]["definition"]==wa.isodef) {
-                if (!Ext.isEmpty(d.outputs[i]['constraint']['interval'])) {
-                    var interval = Ext.Array.clone(d.outputs[i]['constraint']['interval']);
-                    try{
-                        //begin = Ext.Date.format(interval[0],'c');
-                        begin = interval[0];
-                    }catch (e){
-                        begin = "null";
-                    }
-                    try{
-                        //end = Ext.Date.format(interval[1],'c');
-                        end = interval[1];
-                    }catch (e){
-                        end = "null";
-                    }
-                }
-            }else{
-                obsprop.push(d.outputs[i]["name"]);
-            }
-        }
-        
-        return {
-            xtype: 'fieldset',
-            layout: {
-                type: 'column'
-            },
-            id: this.formid,
-            padding: 10,
-            collapsible: false,
-            checkboxToggle: true,
-            checkboxName: this.description.system_id,
-            title: this.description.system_id,
-            defaults: {
-                labelWidth: 70,
-                xtype: 'displayfield',
-                anchor: '100%',
-                columnWidth: 1
-            },
-            items: [
-            {
-                fieldLabel: 'From',
-                value: begin
-            },
-            {
-                fieldLabel: 'To',
-                value: end
-            },
-            {
-                fieldLabel: 'Observed',
-                value: obsprop.join(", ")
-            },
-            {
-                fieldLabel: 'Resolution',
-                id: this.resid,
-                hidden: true,
-                value: ""
-            },
-            {
-                fieldLabel: 'Loaded',
-                id: this.obsid,
-                hidden: true,
-                value: ""
-            },
-            {
-                fieldLabel: 'Interpolate',
-                id: this.intid,
-                xtype: 'checkbox',
-                hidden: true,
-                value: false,
-                listeners: {
-                    change: function (field, newValue, oldValue, eOpts) {
-                        console.log(arguments, "id: " + this.intid);
-                        if(newValue){
-                            this.interpolate();
-                        }
-                    },
-                    scope: this
-                }
-            }
-            ]
-        };
-    },
-    getObservedProperties: function(){
-        var out = this.description.outputs;
-        var ret = [];
-        for (var i = 0; i < out.length; i++) {
-            if (out[i].definition!=wa.isodef) {
-                ret.push(out[i].definition);
-            }
-        }
-        return ret;
-    },
-    interpolate: function(){
-        var obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
-        var chart = Ext.getCmp('chartpanel');
-        var cd = chart.chartdata;
-        var colIdx = chart.chart.indexFromSetName(this.store.name);
-        if(cd[0][colIdx]==null){
-            Ext.Msg.alert('Warning', 'Interpolation not possible if the series stars with no value.');
-        }
-        var templ = [];
-        var obsIdx = null; //Ext.Array.indexOf(this.strFields,obsprop);
-        for (i = 0; i < this.strFields.length; i++) {
-            if (this.strFields[i].name==obsprop) {
-                obsIdx = i;
-            }
-            templ.push(null);
-        }
-        this.store.suspendEvents();
-        for (var i = 1; i < cd.length; i++) {
-            if (cd[i][colIdx]==null) {
-                var id1 = i-1;
-                var id2 = id1+1;
-                var x = cd[i][0].getTime();
-                var rec0 = this.store.getAt(id1);
-                var rec1 = this.store.getAt(id2);
-                //var rec1 = this.store.findRecord(wa.isodef,id2);
-                var x0=rec0.get(wa.isodef).getTime();
-                var y0=rec0.get(obsprop);
-                var x1=rec1.get(wa.isodef).getTime();
-                var y1=rec1.get(obsprop);
-                // Interpolation function
-                var y = y0 + ((y1-y0)/(x1-x0))*(x-x0);
-                
-                var data = Ext.Array.clone(templ);
-                data[0] = Ext.Date.clone(cd[i][0]);
-                data[obsIdx] = y;
-                this.store.loadData([data],true);
-            }
-        }
-        this.store.sort(wa.isodef, 'ASC');
-        this.store.resumeEvents();
-        
-        chart._editedSeriesUpdate(this.store, this.store.getRange());
-    
-    }
-});*/
-
-
diff --git a/interface/app/store/Constraint.js b/interface/app/store/Constraint.js
deleted file mode 100755
index 64e25cf..0000000
--- a/interface/app/store/Constraint.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * File: app/store/Constraint.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.Constraint', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'constraint',
-            data: [
-                {
-                    name: ' -- ',
-                    'value': 0
-                },
-                {
-                    'name': 'Greater then',
-                    'value': 1
-                },
-                {
-                    'name': 'Less then',
-                    'value': 2
-                },
-                {
-                    'name': 'Between',
-                    'value': 3
-                },
-                {
-                    'name': 'Value list',
-                    'value': 4
-                },
-                
-            ],
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name'
-                },
-                {
-                    name: 'value'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/DataQualityStore.js b/interface/app/store/DataQualityStore.js
deleted file mode 100755
index 4ec2b86..0000000
--- a/interface/app/store/DataQualityStore.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * File: app/store/DataQualityStore.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.DataQualityStore', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'dataQualityStore',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name'
-                },
-                {
-                    name: 'code'
-                },
-                {
-                    name: 'description'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/Fake.js b/interface/app/store/Fake.js
deleted file mode 100755
index 66408e9..0000000
--- a/interface/app/store/Fake.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * File: app/store/Fake.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.Fake', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'fake',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name'
-                },
-                {
-                    name: 'value'
-                },
-                {
-                    name: 'definition',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/MyArrayStore.js b/interface/app/store/MyArrayStore.js
deleted file mode 100755
index d52edb1..0000000
--- a/interface/app/store/MyArrayStore.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * File: app/store/MyArrayStore.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.MyArrayStore', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'MyArrayStore',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'array',
-                    idProperty: 'xx'
-                }
-            }
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/Observations.js b/interface/app/store/Observations.js
deleted file mode 100755
index 61f6b8e..0000000
--- a/interface/app/store/Observations.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * File: app/store/Observations.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.Observations', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'observations',
-            proxy: {
-                type: 'ajax',
-                url: 'data/observations.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'isodate',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    dateFormat: 'c',
-                    name: 'isodate',
-                    type: 'date'
-                },
-                {
-                    name: 'value',
-                    type: 'float'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/ObservedProperties.js b/interface/app/store/ObservedProperties.js
deleted file mode 100755
index 544d2a6..0000000
--- a/interface/app/store/ObservedProperties.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * File: app/store/ObservedProperties.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.ObservedProperties', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'observedproperties',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    name: 'uom',
-                    type: 'string'
-                },
-                {
-                    name: 'definition',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/Offerings.js b/interface/app/store/Offerings.js
deleted file mode 100755
index 1e5e9cc..0000000
--- a/interface/app/store/Offerings.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * File: app/store/Offerings.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.Offerings', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'offerings',
-            proxy: {
-                type: 'ajax',
-                url: 'data/offerings.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'name',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/Procedures.js b/interface/app/store/Procedures.js
deleted file mode 100755
index 5276397..0000000
--- a/interface/app/store/Procedures.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * File: app/store/Procedures.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.Procedures', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'procedures',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    idProperty: 'name',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/RatingCurve.js b/interface/app/store/RatingCurve.js
deleted file mode 100755
index 9f95da2..0000000
--- a/interface/app/store/RatingCurve.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * File: app/store/RatingCurve.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.RatingCurve', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'ratingcurve',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json'
-                }
-            },
-            fields: [
-                {
-                    name: 'from',
-                    type: 'date'
-                },
-                {
-                    name: 'to',
-                    type: 'date'
-                },
-                {
-                    name: 'low_val',
-                    type: 'float'
-                },
-                {
-                    name: 'up_val',
-                    type: 'float'
-                },
-                {
-                    name: 'A',
-                    type: 'float'
-                },
-                {
-                    name: 'B',
-                    type: 'float'
-                },
-                {
-                    name: 'C',
-                    type: 'float'
-                },
-                {
-                    name: 'K',
-                    type: 'float'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/Services.js b/interface/app/store/Services.js
deleted file mode 100755
index 79a3a36..0000000
--- a/interface/app/store/Services.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * File: app/store/Services.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.Services', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'storeServices',
-            proxy: {
-                type: 'ajax',
-                url: '/istsos/wa/istsos/services',
-                reader: {
-                    type: 'json',
-                    idProperty: 'service',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'service',
-                    type: 'string'
-                },
-                {
-                    name: 'path',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/cmbDocumentFormat.js b/interface/app/store/cmbDocumentFormat.js
deleted file mode 100755
index e7931ec..0000000
--- a/interface/app/store/cmbDocumentFormat.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * File: app/store/cmbDocumentFormat.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.cmbDocumentFormat', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'cmbdocumentformat',
-            proxy: {
-                type: 'ajax',
-                url: 'app/data/cmbdocumentformat.json',
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'extension',
-                    type: 'string'
-                },
-                {
-                    name: 'format',
-                    sortType: 'asText',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/cmbIdentification.js b/interface/app/store/cmbIdentification.js
deleted file mode 100755
index 9649b1c..0000000
--- a/interface/app/store/cmbIdentification.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * File: app/store/cmbIdentification.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.cmbIdentification', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'identification',
-            proxy: {
-                type: 'ajax',
-                url: 'app/data/cmbIdentification.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'definition',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/cmbName.js b/interface/app/store/cmbName.js
deleted file mode 100755
index 76edddd..0000000
--- a/interface/app/store/cmbName.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * File: app/store/cmbName.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.cmbName', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'cmbname',
-            proxy: {
-                type: 'ajax',
-                url: 'app/data/cmbsystemtype.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/cmbNameDescription.js b/interface/app/store/cmbNameDescription.js
deleted file mode 100755
index b4cc1c9..0000000
--- a/interface/app/store/cmbNameDescription.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * File: app/store/cmbNameDescription.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.cmbNameDescription', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'namedescription',
-            proxy: {
-                type: 'ajax',
-                url: 'app/data/cmbsystemtype.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/cmbSml.js b/interface/app/store/cmbSml.js
deleted file mode 100755
index 82e9037..0000000
--- a/interface/app/store/cmbSml.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * File: app/store/cmbSml.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.cmbSml', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'cmbsml',
-            proxy: {
-                type: 'ajax',
-                url: 'app/data/cmbIdentification.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    name: 'definition',
-                    type: 'string'
-                },
-                {
-                    name: 'uom',
-                    type: 'string'
-                },
-                {
-                    name: 'value',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/cmbSystemType.js b/interface/app/store/cmbSystemType.js
deleted file mode 100755
index b1ef138..0000000
--- a/interface/app/store/cmbSystemType.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * File: app/store/cmbSystemType.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.cmbSystemType', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            autoLoad: true,
-            storeId: 'systemtype',
-            proxy: {
-                type: 'ajax',
-                url: 'app/data/cmbsystemtype.json',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/gridDocumentation.js b/interface/app/store/gridDocumentation.js
deleted file mode 100755
index 7611147..0000000
--- a/interface/app/store/gridDocumentation.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * File: app/store/gridDocumentation.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.gridDocumentation', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'griddocumentation',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    dateFormat: 'Y-m-d',
-                    name: 'date',
-                    type: 'date'
-                },
-                {
-                    name: 'format',
-                    type: 'string'
-                },
-                {
-                    name: 'link',
-                    type: 'string'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/gridObservedProperties.js b/interface/app/store/gridObservedProperties.js
deleted file mode 100755
index 202b0a1..0000000
--- a/interface/app/store/gridObservedProperties.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * File: app/store/gridObservedProperties.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.gridObservedProperties', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'gridobservedproperties',
-            proxy: {
-                type: 'ajax',
-                url: '',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'definition',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    name: 'procedures',
-                    type: 'string'
-                },
-                {
-                    name: 'constraint'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/gridOfferings.js b/interface/app/store/gridOfferings.js
deleted file mode 100755
index c532ce4..0000000
--- a/interface/app/store/gridOfferings.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * File: app/store/gridOfferings.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.gridOfferings', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'gridofferings',
-            proxy: {
-                type: 'ajax',
-                url: '',
-                reader: {
-                    type: 'json',
-                    idProperty: 'name',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    name: 'procedures'
-                },
-                {
-                    dateFormat: 'c',
-                    name: 'expiration',
-                    type: 'date'
-                },
-                {
-                    name: 'active',
-                    type: 'boolean'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/gridOutputs.js b/interface/app/store/gridOutputs.js
deleted file mode 100755
index ec1da76..0000000
--- a/interface/app/store/gridOutputs.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * File: app/store/gridOutputs.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.gridOutputs', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'gridoutputs',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    name: 'definition',
-                    type: 'string'
-                },
-                {
-                    name: 'uom',
-                    type: 'string'
-                },
-                {
-                    name: 'value',
-                    type: 'string'
-                },
-                {
-                    name: 'role'
-                },
-                {
-                    name: 'from',
-                    type: 'string'
-                },
-                {
-                    name: 'to',
-                    type: 'string'
-                },
-                {
-                    name: 'list',
-                    type: 'string'
-                },
-                {
-                    name: 'ctype'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/gridProceduresList.js b/interface/app/store/gridProceduresList.js
deleted file mode 100755
index f028384..0000000
--- a/interface/app/store/gridProceduresList.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * File: app/store/gridProceduresList.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.gridProceduresList', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'procedurelist',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    idProperty: 'name',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    sortType: 'asText',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    sortType: 'asText',
-                    type: 'string'
-                },
-                {
-                    name: 'sensortype',
-                    sortType: 'asText',
-                    type: 'string'
-                },
-                {
-                    name: 'offerings'
-                },
-                {
-                    name: 'observedproperties'
-                },
-                {
-                    name: 'samplingTime'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/gridUoms.js b/interface/app/store/gridUoms.js
deleted file mode 100755
index 2b1e897..0000000
--- a/interface/app/store/gridUoms.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * File: app/store/gridUoms.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.gridUoms', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'griduoms',
-            proxy: {
-                type: 'ajax',
-                url: '',
-                reader: {
-                    type: 'json',
-                    idProperty: 'definition',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    type: 'string'
-                },
-                {
-                    name: 'description',
-                    type: 'string'
-                },
-                {
-                    name: 'procedures'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/serverstatus.js b/interface/app/store/serverstatus.js
deleted file mode 100755
index e64cac2..0000000
--- a/interface/app/store/serverstatus.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * File: app/store/serverstatus.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.serverstatus', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'serverstatus',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    idProperty: 'service',
-                    messageProperty: 'message',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'getcapabilities',
-                    type: 'boolean'
-                },
-                {
-                    name: 'featuresOfInterest',
-                    type: 'int'
-                },
-                {
-                    name: 'describesensor',
-                    type: 'boolean'
-                },
-                {
-                    name: 'getobservation',
-                    type: 'boolean'
-                },
-                {
-                    name: 'service',
-                    type: 'string'
-                },
-                {
-                    name: 'database',
-                    type: 'string'
-                },
-                {
-                    name: 'availability',
-                    type: 'string'
-                },
-                {
-                    name: 'offerings',
-                    type: 'int'
-                },
-                {
-                    name: 'getfeatureofinterest',
-                    type: 'boolean'
-                },
-                {
-                    name: 'registersensor',
-                    type: 'boolean'
-                },
-                {
-                    name: 'procedures',
-                    type: 'int'
-                },
-                {
-                    name: 'observedProperties',
-                    type: 'int'
-                },
-                {
-                    name: 'insertobservation',
-                    type: 'boolean'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/store/vplist.js b/interface/app/store/vplist.js
deleted file mode 100755
index f5cc4db..0000000
--- a/interface/app/store/vplist.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * File: app/store/vplist.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.store.vplist', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'vplist',
-            proxy: {
-                type: 'ajax',
-                reader: {
-                    type: 'json',
-                    idProperty: 'name',
-                    root: 'data'
-                }
-            },
-            fields: [
-                {
-                    name: 'name',
-                    sortType: 'asText',
-                    type: 'string'
-                },
-                {
-                    name: 'offerings'
-                },
-                {
-                    name: 'observedproperties'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/MainMenu2.js b/interface/app/view/MainMenu2.js
deleted file mode 100755
index c182769..0000000
--- a/interface/app/view/MainMenu2.js
+++ /dev/null
@@ -1,306 +0,0 @@
-Ext.define('istsos.view.MainMenu2', {
-    extend: 'istsos.view.ui.MainMenu2',
-
-    initComponent: function() {
-        var me = this;
-        this.btnTemplate = new Ext.Template([
-            '<div class="submenuIcon">',
-            '<img src="images/menu/{icon}" width="46"/>',
-            '<div style="padding-top: 4px;">',
-            '{name}',
-            '</div>',
-            '</div>',
-            ]);
-        this.btnTemplate.compile();
-        
-        me.callParent(arguments);
-        
-        
-        Ext.Ajax.request({
-            url: Ext.String.format('{0}/istsos/operations/initialization',wa.url),
-            scope: this,
-            method: 'GET',
-            success: function(response){
-                var json = Ext.decode(response.responseText);
-                if (parseInt(json.data.level)>0) {
-                    //if (false) {
-                    Ext.getCmp('submenu').expand();
-                    this.loadServiceMenu();
-                    
-                }else{
-                    istsos.engine.pageManager.openWaPage({
-                        istService: "default",
-                        wizardName: "newservice",
-                        wapage: 'WizardPage'
-                    });
-                    Ext.getCmp('submenu').collapse();
-                }
-            }
-        });
-        
-        
-        // Registering click event on Server/Default button
-        
-        Ext.getCmp('menuServer').on("click",function(){
-            
-            var mainCenter = Ext.getCmp("mainCenter"), items = [];
-            mainCenter.removeAll(true);
-            
-            for (var h in istsos.engine.defaultConfig){
-                for (var l in istsos.engine.defaultConfig[h]){
-                    items.push(this.createSubButton({
-                        "name": l,
-                        "icon": istsos.engine.defaultConfig[h][l]['icon'],
-                        "istConfig": istsos.engine.defaultConfig[h][l]
-                    }));
-                }
-            }
-            
-            var sub = Ext.getCmp("submenu");
-            sub.removeAll();
-            var cmps = sub.add(items);
-            
-            var time = 250;
-            
-            for (var i = 0; i < cmps.length; i++) {
-                
-                //console.dir(cmps[i]);
-                
-                var el = cmps[i].getEl();
-                /*el.fadeIn({
-                    duration: time,
-                    easing: null
-                });*/
-                
-                el.on("click",function(e, t, eOpts){
-                    for (var c = 0; c < cmps.length; c++) {
-                        cmps[c].removeCls('submenuSelect');
-                    }
-                    this.addClass('submenuSelect');
-                    
-                    
-                    var conf = Ext.apply({
-                        istService: "default"
-                    },this.istConfig);
-                
-                    /*var conf = {
-                        istService: "default"
-                    };*/
-                    
-                    var url;
-                    if (Ext.isObject(conf.istOperation)) {
-                        url = conf.istOperation.restUrl;
-                        if (url.indexOf("@")>0) {
-                            conf.istOperation.restUrl = url.replace("@", istService);
-                        }
-                    }else if (Ext.isString(conf.istOperation)) {
-                        url = conf.istOperation;
-                        if (url.indexOf("@")>0) {
-                            conf.istOperation = url.replace("@", istService);
-                        }
-                    }
-                    
-                    istsos.engine.pageManager.openWaPage(conf);
-                    
-                },cmps[i]);
-                
-                time += 250;
-            }
-        },this);
-        
-        
-        Ext.getCmp('btnObservations').on("click",function(){
-            
-            var mainCenter = Ext.getCmp("mainCenter");
-            mainCenter.removeAll(true);
-            
-            var items = []
-            for (var h in istsos.engine.observationConfig){
-                for (var l in istsos.engine.observationConfig[h]){
-                    items.push(this.createSubButton({
-                        "name": l,
-                        "icon": istsos.engine.observationConfig[h][l]['icon'],
-                        "istConfig": istsos.engine.observationConfig[h][l]
-                    }));
-                }
-            }
-            
-            var sub = Ext.getCmp("submenu");
-            sub.removeAll();
-            if (items.length==1) {
-                items[0]['flex']=null;
-                items.push({
-                    xtype: 'container',
-                    id: 'imnotabutton',
-                    margin: '4 4 0 4',
-                    html: "",
-                    flex: 1,
-                    style: 'opacity: 0;'
-                });
-            }
-            var cmps = sub.add(items);
-            
-            var time = 250;
-            
-            for (var i = 0; i < cmps.length; i++) {
-                //console.dir(cmps[i]);
-                if (cmps[i].getId()!='imnotabutton') {
-                    var el = cmps[i].getEl();
-                    el.fadeIn({
-                        duration: time,
-                        easing: null
-                    
-                    });
-                    el.on("click",function(e, t, eOpts){
-                        for (var c = 0; c < cmps.length; c++) {
-                            cmps[c].removeCls('submenuSelect');
-                        }
-                        this.addClass('submenuSelect');
-                        var conf = Ext.apply({
-                            istService: "default"
-                        },this.istConfig);
-                        var url;
-                        if (Ext.isObject(conf.istOperation)) {
-                            url = conf.istOperation.restUrl;
-                            if (url.indexOf("@")>0) {
-                                conf.istOperation.restUrl = url.replace("@", istService);
-                            }
-                        }else if (Ext.isString(conf.istOperation)) {
-                            url = conf.istOperation;
-                            if (url.indexOf("@")>0) {
-                                conf.istOperation = url.replace("@", istService);
-                            }
-                        }
-                        istsos.engine.pageManager.openWaPage(conf);
-                    },cmps[i]);
-                    time += 250;
-                }
-            }
-        },this);
-    },
-    showMask: function(msg){
-        if (!Ext.isEmpty(this.mask)) {
-            this.mask.hide();
-        }
-        this.mask = new Ext.LoadMask(Ext.getCmp('mainCenter').body, {
-            msg: msg
-        });
-        this.mask.show();
-    },
-    hideMask: function(){
-        if (!Ext.isEmpty(this.mask)) {
-            this.mask.hide();
-        }
-    }, 
-    createSubButton: function(conf){
-        return {
-            xtype: 'container',
-            margin: '4 4 0 4',
-            html: this.btnTemplate.apply(conf),
-            istConfig: conf['istConfig'],
-            width: 60,
-            flex: 1,
-            //style: 'opacity: 0;',
-            overCls: 'submenuOver',
-            componentCls: 'submenu'
-        //styleHtmlCls: 'submenuContent'
-        }
-    },
-    loadServiceMenu: function(){
-        Ext.Ajax.request({
-            url: Ext.String.format('{0}/istsos/services', wa.url),
-            scope: this,
-            method: 'GET',
-            success: function(response){
-                var json = Ext.decode(response.responseText);
-                if (json.success) {
-                    var menu = Ext.getCmp("menuServices");
-                    menu.removeAll();
-                    var items = [];
-                    for (var i = 0; i < json.total; i++) {
-                        items.push({
-                            text: json.data[i].service,
-                            istConfig: json.data[i],
-                            iconCls: 'service_menu'
-                        });
-                    }
-                    var cmp = menu.add(items);
-                    for (i = 0; i < cmp.length; i++) {
-                        cmp[i].on("click",function(btn, e, eOpts){
-                            
-                            var mainCenter = Ext.getCmp("mainCenter");
-                            mainCenter.removeAll(true);
-                            this.loadServiceButtons(btn.istConfig);
-                            Ext.getCmp('btnService').toggle(true,true);
-                        },this)
-                    }
-                }else{
-                                    
-                }
-            }
-        });
-        Ext.getCmp('menuServer').fireEvent("click");
-        istsos.engine.pageManager.openWaPage(istsos.engine.defaultConfig.Server.Status);
-    },
-    loadServiceButtons: function(istConfig){
-        
-        var mainCenter = Ext.getCmp("mainCenter");
-        mainCenter.removeAll(true);
-        
-        var items = [];
-        
-        for (var h in istsos.engine.serviceConfig){
-            for (var l in istsos.engine.serviceConfig[h]){
-                items.push(this.createSubButton({
-                    "name": l,
-                    "icon": istsos.engine.serviceConfig[h][l]['icon'],
-                    "istConfig": istsos.engine.serviceConfig[h][l]
-                }));
-            }
-        }
-            
-        var sub = Ext.getCmp("submenu");
-        sub.removeAll();
-        var cmps = sub.add(items);
-            
-        var time = 250;
-            
-        for (var i = 0; i < cmps.length; i++) {
-                
-            var el = cmps[i].getEl();
-            el.fadeIn({
-                duration: time,
-                //easing: 'elasticIn'
-                //easing: 'ease'
-                //easing: 'easeInOut'
-                //easing: 'backIn'
-                easing: null
-            });
-                
-            el.on("click",function(e, t, eOpts){
-                for (var c = 0; c < cmps.length; c++) {
-                    cmps[c].removeCls('submenuSelect');
-                }
-                this.addClass('submenuSelect');
-                var conf = Ext.apply({
-                    istService: istConfig.service
-                },this.istConfig);
-                var url;
-                if (Ext.isObject(conf.istOperation)) {
-                    url = conf.istOperation.restUrl;
-                    if (url.indexOf("@")>0) {
-                        conf.istOperation.restUrl = url.replace("@", istConfig.service);
-                    }
-                }else if (Ext.isString(conf.istOperation)) {
-                    url = conf.istOperation;
-                    if (url.indexOf("@")>0) {
-                        conf.istOperation = url.replace("@", istConfig.service);
-                    }
-                }
-                istsos.engine.pageManager.openPage(conf);
-            },cmps[i]);
-            time += 250;
-            
-        }
-    }
-});
diff --git a/interface/app/view/ProcedureChart.js b/interface/app/view/ProcedureChart.js
deleted file mode 100755
index 4065c04..0000000
--- a/interface/app/view/ProcedureChart.js
+++ /dev/null
@@ -1,650 +0,0 @@
-/**
- * istSOS WebAdmin - Istituto Scienze della Terra
- * Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-Ext.define('istsos.view.ProcedureChart', {
-    extend: 'istsos.view.ui.ProcedureChart',
-    alias: 'widget.procedurechart',
-    
-    initComponent: function() {
-        var me = this;
-        
-        Ext.create('istsos.store.ObservedProperties');
-        this.procedures = {};
-        
-        me.callParent(arguments);
-        
-        this.addEvents('queueLoaded','observedPropertyIsSet','clickCallback','pointClickCallback', 'seriesSelected', 'underlayCallback');
-        
-        var offset = (new Date()).getTimezoneOffset()/-60;
-        var tz = ((offset > 0) ? "+"+this.pad(offset) : this.pad(offset));
-        Ext.getCmp('oeBeginTime').format = 'H:i ['+tz+']';
-        Ext.getCmp('oeBeginTime').setValue(Ext.Date.parse("00:00", 'H:i'));
-        Ext.getCmp('oeEndTime').format = 'H:i ['+tz+']';
-        Ext.getCmp('oeEndTime').setValue(Ext.Date.parse("00:00", 'H:i'));
-        
-        Ext.getCmp("btnPlot").on("click",this.loadObservation, this);
-        this.on("queueLoaded",this.rederChart, this);
-        
-        Ext.getCmp("btnRangeDay").on("click",function(btn, e, eOpts){
-            // 86400000 ms = 1 day
-            var range = this.chart.xAxisRange();
-            var extreme = this.chart.xAxisExtremes();
-            range[1] = range[0]+86400000000;
-            if (extreme[1]<range[1]) {
-                range[0] = extreme[1]-86400000000;
-                range[1] = extreme[1];
-            }
-            btn.toggle(true,true);
-            this.chart.updateOptions({
-                'dateWindow': [range[0], range[1]]
-            });
-        },this);
-        
-        Ext.getCmp("btnRangeWeek").on("click",function(btn, e, eOpts){
-            var range = this.chart.xAxisRange();
-            var extreme = this.chart.xAxisExtremes();
-            range[1] = range[0]+604800000000;
-            if (extreme[1]<range[1]) {
-                range[0] = extreme[1]-604800000000;
-                range[1] = extreme[1];
-            }
-            btn.toggle(true,true);
-            this.chart.updateOptions( {
-                'dateWindow': [range[0], range[1]]
-            } );
-        },this);
-        
-        Ext.getCmp("btnRangeAll").on("click",function(btn, e, eOpts){
-            btn.toggle(true,true);
-            this.chart.updateOptions( {
-                'dateWindow': this.chart.xAxisExtremes()
-            } );
-        },this);
-        
-        
-        this.on("resize",function(panel, adjWidth, adjHeight, eOpts){
-            if(this.chart){
-                this.chart.resize();
-            }
-        });
-        
-        Ext.getCmp('oeCbObservedProperty').on("select",function(combo, records, eOpts){
-            var op = null;
-            if (records.length==1) {
-                op = records[0].data;
-            }
-            this.fireEvent("observedPropertyIsSet", this, op);
-        },this);
-    
-    },
-    pad: function(n){
-        return n<10 ? '0'+n : n
-    },
-    rederChart: function(){
-        
-        var obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
-        var procs = [];
-        // get the json rapresentation of the tree menu of procedures
-        //var checked = Ext.getCmp('proceduresTree').getValues();
-        var visibility = []; // Initialize the chart series visibility
-        
-        this.labels = ["isodate"];
-        this.colors = [];
-        var template = [];
-        
-        this.chartStore = {};
-        
-        var valueFormatter = {
-        
-        }
-        var cc = 1;
-        
-        var keys = Object.keys(this.procedures);
-        keys = keys.sort();
-        
-        //for (var key in this.procedures) {
-        for (var c = 0; c < keys.length; c++) {
-            var key = keys[c];
-            // check if procedures loaded have the requested observed property
-            if (Ext.Array.contains(this.procedures[key].getObservedProperties(),obsprop)) {
-                procs.push(this.procedures[key]);
-                /*if (!Ext.isEmpty(checked[key])) { // if the checkbox is selected
-                    visibility.push(true);
-                }else{
-                    visibility.push(false);
-                }*/
-                // Preparing labels and single native row template
-                template.push(null);
-                this.labels.push(key);
-                this.colors.push(this.procedures[key].color);
-                valueFormatter[cc == 1 ? 'y': 'y'+cc] = {
-                    valueFormatter: function(ms, fn, p) {
-                        return ' '+ ms + ' '+ Ext.getCmp('chartpanel').procedures[p].getUomCode(
-                            Ext.getCmp("oeCbObservedProperty").getValue()    
-                            );
-                    }
-                } 
-            
-            }
-        }
-        // merging data
-        var idx = 0;
-        //for (var key in procs) {
-        for (var c = 0; c < procs.length; c++) {
-            var p = procs[c];
-            
-            p.store.on("update",this._storeUpdated,this);
-            p.store.on("seriesupdated",this._storeSeriesUpdated,this);
-            
-            var recs = p.store.getRange();
-            for (var j = 0, l = recs.length; j < l; j++) {
-                if (Ext.isEmpty(this.chartStore[recs[j].get("micro") ])) {
-                    this.chartStore[recs[j].get("micro")] = Ext.Array.clone(template);
-                }
-                // Set the property choosen in the chart store in the right column
-                var v = parseFloat(recs[j].get(p.storeConvertFieldToId[obsprop]));
-                if (v<-900) {
-                    this.chartStore[recs[j].get("micro")][idx] = NaN;  
-                }else{
-                    this.chartStore[recs[j].get("micro")][idx] = v;          
-                }
-            }
-            idx++;
-        }
-        
-        // Sorting array by dates
-        var sorted = Ext.Array.sort(Ext.Object.getKeys(this.chartStore), 
-            function (d1, d2) {
-                d1 = parseInt(d1);
-                d2 = parseInt(d2);
-                if (d1 > d2) return 1;
-                if (d1 < d2) return -1;
-                return 0;
-            });
-        this.chartdata = [];
-        for (var i = 0; i < sorted.length; i++) {
-            var rec = [];
-            rec.push(parseInt(sorted[i]));
-            var vals = this.chartStore[sorted[i]];
-            rec = rec.concat(vals);
-            this.chartdata.push(rec);
-        }
-        var initChart = true;
-        if (initChart) {
-            Ext.getCmp("btnRangeDay").toggle(false,true);
-            Ext.getCmp("btnRangeWeek").toggle(false,true);
-            Ext.getCmp("btnRangeAll").toggle(true,true);
-            this.chart = new Dygraph(
-                document.getElementById("chartCnt-body"),
-                this.chartdata,
-                {
-                    labels: this.labels,
-                    colors: this.colors,
-                    strokeWidth: 2,
-                    digitsAfterDecimal: 6,
-                    connectSeparatedPoints: true,
-                    //visibility: visibility,
-                    legend: 'always',
-                    title: this.obsprop,
-                    showRangeSelector: true,
-                    showRoller: true,
-                    rangeSelectorHeight: 30,
-                    rangeSelectorPlotStrokeColor: 'black',
-                    rangeSelectorPlotFillColor: 'green',
-                    labelsDivStyles: {
-                        'padding': '4px',
-                        'border': '1px solid black',
-                        'borderRadius': '3px',
-                        'boxShadow': '4px 4px 4px #888',
-                        'right': '10px'
-                    },
-                    labelsDivWidth: "100%",
-                    axisLineColor: 'green',
-                    axisLabelFontSize: 12,
-                    axisLabelWidth: 150,
-                    xAxisLabelWidth: 150,
-                    highlightCircleSize: 4,
-                    axes: Ext.apply({
-                        x: {
-                            valueFormatter: function(ms) {
-                                return istsos.utils.micro2iso(ms);
-                            },
-                            axisLabelFormatter: function(ms, gran, b, chart){
-                                
-                                // Get unix time in seconds
-                                var unix = parseInt(ms/1000000);
-                                // Extract microseconds only
-                                var micro = ms-(unix*1000000);
-                                // Date object without considering microseconds
-                                var date = Ext.Date.parse(unix,'U');
-                                
-                                var range = chart.xAxisRange();
-                                var delta = range[1]-range[0];
-                                
-                                var clip = function(m){
-                                    return (parseFloat('0.'+m)+"").substring(1);
-                                }
-                                if (delta<500000) { // less then a seconds range
-                                    if (micro == 0) {
-                                        if (date.getHours()==0 
-                                            && date.getMinutes()==0  
-                                            && date.getSeconds()==0) {
-                                            return Ext.Date.format(date,'Y-m-d');
-                                        }else{
-                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
-                                        }
-                                    }else{
-                                        if (micro==200000 || micro==400000 || micro==600000 || micro==800000) {
-                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
-                                        }else{
-                                            return micro/1000;
-                                        }
-                                    }
-                                }else if (delta<1000000) { // less then a seconds range
-                                    if (micro == 0) {
-                                        if (date.getHours()==0 
-                                            && date.getMinutes()==0  
-                                            && date.getSeconds()==0) {
-                                            return Ext.Date.format(date,'Y-m-d');
-                                        }else{
-                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
-                                        }
-                                    }else{
-                                        if (micro==500000) {
-                                            return Ext.Date.format(date,'H:i:s')+clip(micro);
-                                        }else{
-                                            return micro/1000;
-                                        }
-                                    }
-                                }else if(delta<1000000*60) { // less the a minute
-                                    if (date.getHours()==0 
-                                        && date.getMinutes()==0  
-                                        && date.getSeconds()==0) {
-                                        return Ext.Date.format(date,'Y-m-d');
-                                    }else{
-                                        return Ext.Date.format(date,'H:i:s')+clip(micro);
-                                    }
-                                }else if(delta<1000000*60*60) { // less the an hour
-                                    if (date.getHours()==0 
-                                        && date.getMinutes()==0  
-                                        && date.getSeconds()==0) {
-                                        return Ext.Date.format(date,'Y-m-d');
-                                    }else{
-                                        return Ext.Date.format(date,'H:i');
-                                    }
-                                }else if(delta<1000000*60*60*24) { // less the a day
-                                    if (date.getHours()==0 
-                                        && date.getMinutes()==0  
-                                        && date.getSeconds()==0) {
-                                        return Ext.Date.format(date,'Y-m-d');
-                                    }else if (date.getHours()==12 
-                                        && date.getMinutes()==0  
-                                        && date.getSeconds()==0) {
-                                        return Ext.Date.format(date,'Y-m-d') + "T" +
-                                        Ext.Date.format(date,'H:i');
-                                    }else{
-                                        return Ext.Date.format(date,'H:i');
-                                    }
-                                }else if(delta<1000000*60*60*24*4) { // less the a day
-                                    if (date.getHours()==0 
-                                        && date.getMinutes()==0  
-                                        && date.getSeconds()==0) {
-                                        return Ext.Date.format(date,'Y-m-d');
-                                    }else if (date.getHours()==12) {
-                                        return Ext.Date.format(date,'Y-m-d') + "<br>" +
-                                        Ext.Date.format(date,'H:i');
-                                    }else{
-                                        return Ext.Date.format(date,'H:i');
-                                    }
-                                }else  { // less the a day
-                                    return Ext.Date.format(date,'Y-m-d');
-                                }
-                            
-                            }
-                        }
-                    },valueFormatter),
-                    clickCallback: function(e, x, pts) {
-                        var chartpanel = Ext.getCmp('chartpanel');                        
-                        // Series selectd
-                        if (e.shiftKey && chartpanel.lastClick) {
-                            Ext.callback(function(e, x, pts){
-                                this.fireEvent("seriesSelected", this, e, x, this.lastClick, pts);
-                            }, chartpanel, [e, x, pts]);
-                            
-                        }else{ // Single point selected
-                            chartpanel.lastClick = x;
-                            Ext.callback(function(e, x, pts){
-                                this.fireEvent("clickCallback", this, e, x, pts);
-                            }, chartpanel, [e, x, pts]);
-                        }
-                        
-                    },
-                    pointClickCallback: function(e, p) {
-                        
-                        
-                        
-                        var chartpanel = Ext.getCmp('chartpanel');
-                        Ext.callback(function(e, p){
-                            this.fireEvent("clickCallback", this, e, p['xval']);
-                        }, chartpanel, [e, p]);
-                    },
-                    underlayCallback: function(canvas, area, g) {
-                        var chartpanel = Ext.getCmp('chartpanel');
-                        Ext.callback(function(canvas, area, g){
-                            this.fireEvent("underlayCallback", this, canvas, area, g);
-                        }, chartpanel, [canvas, area, g]);
-                    }
-                }
-                );
-        }else if (!Ext.isEmpty(this.chart)) {
-            this.chart.updateOptions({
-                file: this.chartdata,
-                visibility: visibility,
-                labels: this.labels
-            });
-        }
-        Ext.get('chartCnt-body').removeCls("viewerChart");
-        Ext.get('chartCnt').unmask();
-    },
-    highlightRegion: function(startMicro, endMicro){
-        if (this.chart) {
-            if (startMicro==null && endMicro==null) {
-                this.chart.updateOptions({
-                    "underlayCallback": function(canvas, area, chart) {
-                    
-                    }
-                });
-            }else if (endMicro==null) {
-                this.chart.updateOptions({
-                    "underlayCallback": function(canvas, area, chart) {
-                        //canvas.fillStyle = "rgba(194, 232, 184, 1)";
-                        canvas.fillStyle = "rgba(0, 255, 0, 0.8)";
-                        var canvas_left_x = chart.toDomXCoord(startMicro)-1;
-                        var canvas_width = 3;
-                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
-                        
-                        // Border left
-                        canvas.fillStyle = "rgba(0, 0, 0, 1)";
-                        canvas_left_x = chart.toDomXCoord(startMicro)-2;
-                        canvas_width = 1;
-                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
-                        
-                        // Border right
-                        canvas_left_x = chart.toDomXCoord(startMicro)+2;
-                        canvas_width = 1;
-                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
-                    }
-                });
-            }else{ 
-                this.chart.updateOptions({
-                    "underlayCallback": function(canvas, area, chart) {
-                        //canvas.fillStyle = "rgba(194, 232, 184, 1)";
-                        canvas.fillStyle = "rgba(0, 255, 0, 1)";
-                        var canvas_left_x = chart.toDomXCoord(startMicro);
-                        var canvas_right_x = chart.toDomXCoord(endMicro);
-                        var canvas_width = canvas_right_x - canvas_left_x;
-                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
-                        
-                        
-                        // Border left
-                        canvas.fillStyle = "rgba(0, 0, 0, 1)";
-                        canvas_left_x = chart.toDomXCoord(startMicro);
-                        canvas_width = 1;
-                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
-                        
-                        // Border right
-                        canvas_left_x = chart.toDomXCoord(endMicro)-1;
-                        canvas_width = 1;
-                        canvas.fillRect(canvas_left_x, area.y, canvas_width, area.h);
-                    }
-                });
-            }
-        }
-    },
-    addAnnotation: function(micro, annotation){
-        var series = Ext.getCmp('oeCbEditableProcedures').getValue();
-        var annotations = this.chart.annotations();
-        var a = {
-            series: series,
-            x: micro,
-            shortText: '\\/',
-            text: 'long test',
-            tickHeight: 10
-        };
-        if (!Ext.isEmpty(annotation)) {
-            Ext.apply(a,{
-                shortText: annotation
-            });
-        }
-        annotations.push(a);
-        this.chart.setAnnotations(annotations);
-    },
-    /*
-     * Remove all annotatione from the chart
-     */
-    removeAnnotations: function(){
-        this.chart.setAnnotations([]);
-    },
-    /*
-     * Load the observation for added procedures according to user configuration:
-     *  - begin / end
-     *  - observed property
-     */
-    loadObservation: function(){
-        // Mask the container with loading message
-        Ext.get('chartCnt').mask("Initializing chart..");
-        
-        var begin = Ext.getCmp('oeBegin').getValue();
-        var bt = Ext.getCmp('oeBeginTime').getValue();
-        begin.setHours(bt.getHours());
-        begin.setMinutes(bt.getMinutes());
-        
-        var end = Ext.getCmp('oeEnd').getValue();
-        var et = Ext.getCmp('oeEndTime').getValue();
-        end.setHours(et.getHours());
-        end.setMinutes(et.getMinutes());
-        
-        // Load data based on the date-time fields
-        this.loading = [];
-        for (var key in this.procedures) {
-            this.loading.push(key);
-            this.procedures[key].on("observationLoaded",function(p){
-                Ext.Array.remove(this.loading,p.getName());
-                if (this.loading.length==0) {
-                    this.fireEvent("queueLoaded",this);
-                }
-            },this,{
-                single: true
-            });
-            this.procedures[key].getObservation(begin,end);
-        }
-    },
-    _colorChanged: function(p, newColor, oldColor){
-        if (this.chart) {
-            var colors = this.chart.getColors();
-            var labels = this.chart.getLabels();
-            var index = Ext.Array.indexOf(labels, p.getName());
-            colors[index-1] = newColor;
-            this.chart.updateOptions( {
-                'colors': colors
-            });
-        }
-    },
-    _visibilityChanged: function(p, visibile){
-        if (this.chart) {
-            var labels = this.chart.getLabels();
-            var index = Ext.Array.indexOf(labels, p.getName())-1;
-            this.chart.setVisibility(index,visibile);
-        }
-    },
-    _storeUpdated: function( store, record){
-        var procedure = this.procedures[store.name];
-        var rec = [];
-        var obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
-        var colIdx = this.chart.indexFromSetName(store.name);
-        rec.push(record.get('micro'));
-        // @todo sync NaN with istSOS configuration
-        if (record.get(procedure.storeConvertFieldToId[obsprop])<-900) {
-            rec.push(NaN);
-        }else{
-            rec.push(record.get(procedure.storeConvertFieldToId[obsprop]));
-        }
-        for (var i = 0; i < this.chartdata.length; i++) {
-            if (this.chartdata[i][0]==rec[0]) {
-                this.chartdata[i][colIdx]=rec[1];
-                break;
-            }
-        }
-        this.chart.updateOptions({
-            file: this.chartdata
-        });
-        
-    },
-    _storeSeriesUpdated: function( store, records){
-        var obsprop = Ext.getCmp("oeCbObservedProperty").getValue();
-        var procedure = this.procedures[store.name];
-        var field = procedure.storeConvertFieldToId[obsprop];
-        var colIdx = this.chart.indexFromSetName(store.name);
-        for (var c = 0, i = 0; i < this.chartdata.length && c < records.length ; i++) {
-            if (this.chartdata[i][0]==records[c].get('micro')) {
-                this.chartdata[i][colIdx]=records[c].get(field);
-                c++;
-            }
-        }
-        this.chart.updateOptions({
-            file: this.chartdata
-        });
-    },
-    /*
-    * Configure the plot panel loading the observed properties into the combo
-    * and setting begin e end limits according to the procedures metadata.
-    */
-    addProcedure: function(procedure){
-        this.procedures[procedure.getName()] = procedure;
-        procedure.on("colorchanged",this._colorChanged,this);
-        procedure.on("visibilitychanged",this._visibilityChanged,this);
-        this.reconfigure();
-    },
-    removeProcedure: function(procedure){
-        procedure.un("colorchanged",this._colorChanged,this);
-        delete this.procedures[procedure.getName()];
-        this.reconfigure();
-        if (this.chart) {
-            if (Ext.Object.getSize(this.procedures)==0) {
-                Ext.destroy(Ext.get('chartCnt-body').child('*'));
-                Ext.get('chartCnt-body').addCls("viewerChart");
-                delete this.chart;
-            }else{
-                this.rederChart();
-            }
-        }
-    },
-    reconfigure: function(){
-        var oeBegin = Ext.getCmp('oeBegin'), 
-        oeEnd = Ext.getCmp('oeEnd'), 
-        os = Ext.getStore('observedproperties');
-        os.removeAll();
-        oeBegin.setMaxValue(null); 
-        oeBegin.setMinValue(null); 
-        oeEnd.setMaxValue(null); 
-        oeEnd.setMinValue(null); 
-        if (Ext.Object.getSize(this.procedures)==0) {
-            Ext.getCmp('oeCbObservedProperty').reset();
-            Ext.getCmp("btnPlot").disable();
-            oeBegin.reset();
-            oeEnd.reset();
-            return;
-        }
-        
-        for (var key in this.procedures) {
-            var procedure = this.procedures[key], begin, end;
-            
-            var meta = procedure.meta;
-            for (var i = 0; i < meta.outputs.length; i++) {
-                if (meta.outputs[i]["definition"]==procedure.isodef) {
-                    if (!Ext.isEmpty(meta.outputs[i]['constraint']['interval'])) {
-                        var interval = Ext.Array.clone(meta.outputs[i]['constraint']['interval']);
-                        try{
-                            interval[0] = Ext.Date.parse(interval[0],"c");
-                            if (Ext.isEmpty(begin) || (Ext.isDate(begin) && begin>interval[0])) {
-                                begin = Ext.Date.clone(interval[0]);
-                            }
-                        }catch (e){
-                            console.error("Unable to parse allowed begin date interval");
-                        }
-                        try{
-                            interval[1] = Ext.Date.parse(interval[1],"c");
-                            if (Ext.isEmpty(end) || (Ext.isDate(end) && end<interval[1])) {
-                                end = Ext.Date.clone(interval[1]);
-                            }
-                        }catch (e){
-                            console.error("Unable to parse allowed end date interval");
-                        }
-                    }
-                }else if (os.find('definition',meta.outputs[i]["definition"])==-1) {
-                    var data = [[
-                    meta.outputs[i]["name"],
-                    meta.outputs[i]["description"],
-                    meta.outputs[i]["uom"],
-                    meta.outputs[i]["definition"]
-                    ]];
-                    os.loadData(data,true);
-                }
-            }
-            if (!Ext.isEmpty(begin)) {
-                if (!Ext.isEmpty(oeBegin.minValue)) {
-                    if (oeBegin.minValue.getTime()>begin.getTime()) {
-                        oeBegin.setMinValue(begin); 
-                        oeEnd.setMinValue(begin); 
-                    }
-                }else{
-                    oeBegin.setMinValue(begin); 
-                    oeEnd.setMinValue(begin); 
-                }
-            }
-            
-            
-            if (!Ext.isEmpty(end)) {
-                
-                var endCopy = Ext.Date.clone(end);
-                var beginCopy = Ext.Date.add(Ext.Date.clone(end), Ext.Date.DAY,-7);
-                
-                if (!Ext.isEmpty(oeBegin.maxValue)) {
-                    if (oeBegin.maxValue.getTime()<end.getTime()) {
-                        oeBegin.setMaxValue(endCopy); 
-                        oeEnd.setMaxValue(endCopy); 
-                        oeBegin.setValue(beginCopy); 
-                        oeEnd.setValue(end);
-                    }
-                }else{
-                    oeBegin.setMaxValue(endCopy); 
-                    oeEnd.setMaxValue(endCopy); 
-                    oeBegin.setValue(beginCopy); 
-                    oeEnd.setValue(end);
-                }
-            
-            }
-        }
-        if (os.data.length==1) {
-            Ext.getCmp('oeCbObservedProperty').setValue(os.getAt(0));
-            this.fireEvent("observedPropertyIsSet", this, os.getAt(0).data);
-        }
-        //Ext.getCmp('oeCbObservedProperty').enable();
-        Ext.getCmp("btnPlot").enable();
-    }
-});
diff --git a/interface/app/view/ProcedureChooser.js b/interface/app/view/ProcedureChooser.js
deleted file mode 100755
index b0541ff..0000000
--- a/interface/app/view/ProcedureChooser.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * istSOS WebAdmin - Istituto Scienze della Terra
- * Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-
-/*
- * https://github.com/sterlingwes/RandomColor
- */
-(function(root,factory){
-    if(typeof exports==='object'){
-        module.exports=factory;
-    }else if(typeof define==='function'&&define.amd){
-        define(factory);
-    }else{
-        root.RColor=factory();
-    }
-}(this,function(){
-    var RColor=function(){
-        this.hue=Math.random(),this.goldenRatio=0.618033988749895;
-    };
-    RColor.prototype.hsvToRgb=function(h,s,v){
-        var h_i=Math.floor(h*6),f=h*6- h_i,p=v*(1-s),q=v*(1-f*s),t=v*(1-(1-f)*s),r=255,g=255,b=255;
-        switch(h_i){
-            case 0:
-                r=v,g=t,b=p;
-                break;
-            case 1:
-                r=q,g=v,b=p;
-                break;
-            case 2:
-                r=p,g=v,b=t;
-                break;
-            case 3:
-                r=p,g=q,b=v;
-                break;
-            case 4:
-                r=t,g=p,b=v;
-                break;
-            case 5:
-                r=v,g=p,b=q;
-                break;
-        }
-        return[Math.floor(r*256),Math.floor(g*256),Math.floor(b*256)];
-    };
-    RColor.prototype.get=function(hex,saturation,value){
-        this.hue+=this.goldenRatio;
-        this.hue%=1;
-        if(typeof saturation!=="number")saturation=0.5;
-        if(typeof value!=="number")value=0.95;
-        var rgb=this.hsvToRgb(this.hue,saturation,value);
-        if(hex)
-            return"#"+rgb[0].toString(16)+rgb[1].toString(16)+rgb[2].toString(16);else
-            return rgb;
-    };
-    return RColor;
-}));
-
-Ext.define('istsos.view.ProcedureChooser', {
-    extend: 'istsos.view.ui.ProcedureChooser',
-    alias: 'widget.procedurechooser',
-
-    initComponent: function() {
-        
-        var me = this;
-        this.color = new RColor;
-        
-        this.addEvents({
-            "procedureAdded" : true,
-            "procedureRemoved" : true
-        });
-        
-        Ext.create('istsos.store.Offerings');
-        Ext.create('istsos.store.gridProceduresList');
-        var ssrv = Ext.create('istsos.store.Services');
-        ssrv.getProxy().url = Ext.String.format('{0}/istsos/services',wa.url);
-        
-        this.procedures = {};
-        
-        me.callParent(arguments);
-        
-        Ext.getCmp("cmbServices").on("select",function(combo, records, eOpts){
-            var pr = Ext.getCmp('oeCbProcedure');
-            pr.reset();
-            pr.disable();
-            
-            var o = Ext.getCmp('oeCbOffering');
-            o.reset();
-            o.getStore().removeAll();
-            o.disable();
-            Ext.Ajax.request({
-                url: Ext.String.format('{0}/istsos/services/{1}/offerings/operations/getlist',
-                    wa.url,combo.getValue()),
-                scope: o,
-                method: "GET",
-                success: function(response){
-                    var json = Ext.decode(response.responseText);
-                    if (json.data.length>0) {
-                        this.getStore().loadData(json.data);
-                        this.enable();
-                    }else{
-                        this.disable();
-                        Ext.Msg.alert("Server message", "\"" + json['message'] + "\"<br/><br/>" + 
-                                "<small>Status response: " + response.statusText + "</small>");
-                    }
-                }
-            });
-            
-        /*o.disable();
-            o.getStore().load({
-                url: Ext.String.format('{0}/istsos/services/{1}/offerings/operations/getlist',
-                    wa.url,combo.getValue()),
-                callback: function(records, operation, success){
-                    this.enable();
-                },
-                scope: o
-            });*/
-        });
-        
-        Ext.getCmp("oeCbOffering").on("select",function(combo, records, eOpts){
-            var pr = Ext.getCmp('oeCbProcedure');
-            pr.reset();
-            pr.getStore().removeAll();
-            pr.disable();
-            Ext.Ajax.request({
-                url: Ext.String.format('{0}/istsos/services/{1}/offerings/{2}/procedures/operations/memberslist',
-                    wa.url,Ext.getCmp('cmbServices').getValue(),combo.getValue()),
-                scope: pr,
-                method: "GET",
-                success: function(response){
-                    var json = Ext.decode(response.responseText);
-                    if (json.data.length>0) {
-                        this.getStore().loadData(json.data);
-                        this.enable();
-                    }else{
-                        this.disable();
-                        Ext.Msg.alert("Server message", "\"" + json['message'] + "\"<br/><br/>" + 
-                                "<small>Status response: " + response.statusText + "</small>");
-                    }
-                }
-            });
-            /*
-            pr.getStore().load({
-                url: Ext.String.format('{0}/istsos/services/{1}/offerings/{2}/procedures/operations/memberslist',
-                    wa.url,Ext.getCmp('cmbServices').getValue(),combo.getValue()),
-                callback: function(records, operation, success){
-                    this.enable();
-                },
-                scope: pr
-            });*/
-        });
-        
-        Ext.getCmp("btnAdd").on("click",function(btn, e, eOpts){
-            
-            // Add an istsos.Procedure in the this.procedures array
-            // every row contains some describeSensor data
-            var service = Ext.getCmp("cmbServices").getValue();
-            var offering = Ext.getCmp("oeCbOffering").getValue();
-            var procedure = Ext.getCmp("oeCbProcedure").getValue();
-            
-            this.procedures[procedure] = Ext.create('istsos.Sensor', 
-                service, offering, procedure, {
-                    listeners: {
-                        metadataLoaded: this._getProcedureDetails,
-                        scope: this
-                    }
-                });
-            
-        },this);
-    },
-    _getProcedureDetails: function(proc){
-        var obsprop = [];
-        for (var i = 0; i < proc.meta.outputs.length; i++) {
-            if (proc.meta.outputs[i]['definition']!=proc.isodef) {
-                obsprop.push(proc.meta.outputs[i]['name'] + " (" + proc.meta.outputs[i]['uom']+ ")");
-            }
-        }
-        proc.color = this.color.get(true);
-        var idVisible = Ext.id(), idColor = Ext.id(), idRemove = Ext.id();
-        var cmp = Ext.getCmp('proceduresTree').add({
-            xtype: 'panel',
-            //id: 'fs-'+proc.getName(),
-            border: false,
-            istsos: {
-                procedure: proc,
-                idVisible: idVisible,
-                idColor: idColor,
-                idRemove: idRemove,
-                chooser: this
-            },
-            listeners: {
-                "added": {
-                    fn: function(panel, container, pos, eOpts){
-                        this.fireEvent("procedureAdded", proc);
-                    },
-                    scope: this,
-                    options: {
-                        single: true
-                    }
-                },
-                "afterrender": {
-                    fn: function(procedureDetailsPanel, layout, eOpts ){
-                        
-                        console.log("Afterrender: " + procedureDetailsPanel.istsos.procedure.getName());
-                        
-                        var v = Ext.get(procedureDetailsPanel.istsos.idVisible);
-                        v.on("click",function(){
-                            if (this.istsos.procedure.getVisibility()) {
-                                Ext.get(this.istsos.idVisible).addCls("pchooserBtnNotVisible");
-                            }else{
-                                Ext.get(this.istsos.idVisible).removeCls("pchooserBtnNotVisible");
-                            }
-                            this.istsos.procedure.setVisibility(!this.istsos.procedure.getVisibility());
-                        },procedureDetailsPanel);
-                    
-                        var c = Ext.get(procedureDetailsPanel.istsos.idColor);
-                        c.on("click",function(){
-                            Ext.create('Ext.window.Window', {
-                                title: this.istsos.procedure.getName() + ': color',
-                                height: 110,
-                                width: 200,
-                                closeAction: 'destroy',
-                                modal: true,
-                                layout: 'fit',
-                                items: Ext.create('Ext.picker.Color', {
-                                    listeners: {
-                                        select: function(picker, selColor) {
-                                            this.istsos.procedure.setColor("#"+selColor);
-                                            Ext.get(this.istsos.idColor).setStyle("background-color", "#"+selColor);
-                                            picker.ownerCt.close();
-                                        },
-                                        scope: this
-                                    }
-                                })
-                            }).show();
-                        },procedureDetailsPanel);
-                    
-                    
-                        var d = Ext.get(procedureDetailsPanel.istsos.idRemove);
-                        d.on("click",function(){
-                            var pchoose = this.ownerCt.ownerCt;
-                            this.ownerCt.remove(this);
-                            pchoose.fireEvent("procedureRemoved", proc);
-                        },procedureDetailsPanel,{
-                            single: true
-                        });
-                    
-                    },
-                    scope: this,
-                    options: {
-                        single: true
-                    }
-                }
-            },
-            html: 
-            "<div class='pchooser'>" +
-            "   <div style='border-bottom: thin solid white; padding: 2px; background-color: green; color: white; text-align: center;'>" +
-            "       <span style='font-weight: bold; font-size: 14px;'>" + proc.getName() + "</span>" +
-            "       <div id='"+idVisible+"' class='pchooserBtnVisible'></div>" +
-            "       <div id='"+idColor+"' class='pchooserBtnColor' style='background-color: "+proc.color+";'></div>" +
-            "       <div id='"+idRemove+"' class='pchooserBtnRemove'>x</div>" +
-            "   </div>" +
-            "   <div style='font-size: 12px; border-bottom: thin solid green; padding: 2px; background-color: white; color: black; text-align: center;'>" +
-            "       <span style='font-style: italic;'>" + proc.service + ":" + proc.offering + "</span><br/>" +
-            "       <span>Fr:" + proc.getBeginPosition() + "</span><br/>" +
-            "       <span>To:" + proc.getEndPosition() + "</span><br/>" +
-            "       <span style='font-weight: bold;'>" + obsprop.join("<br>") + "</span>" +
-            "   </div>" +
-            "</div>"
-        });
-        
-        
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ProcedureGrid.js b/interface/app/view/ProcedureGrid.js
deleted file mode 100755
index 2bddf7f..0000000
--- a/interface/app/view/ProcedureGrid.js
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * File: app/view/ProcedureGrid.js
- * Date: Mon Jan 21 2013 10:59:02 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be generated the first time you export.
- *
- * You should implement event handling and custom methods in this
- * class.
- */
-
-Ext.define('istsos.view.ProcedureGrid', {
-    extend: 'istsos.view.ui.ProcedureGrid',
-    alias: 'widget.proceduregrid',
-
-    initComponent: function() {
-        var me = this;
-        me.callParent(arguments);
-        this.addEvents('select','selectionchange','gridremoved');
-    },
-    resetConfig: function(conf){
-        this.readOnlyGrid = false;
-        this.observedProperty = null;
-        if (Ext.isObject(conf)) {
-            Ext.apply(this,conf);
-        }
-    },
-    initEditorGrid: function(procedures, procedureName, observedProperty){
-        
-        this.resetConfig({
-            readOnlyGrid: false,
-            observedProperty: observedProperty
-        });
-        
-        // @todo think something better shirker
-        this.procedures=procedures;
-        var procedure = procedures[procedureName];
-        this.procedure=procedure;
-        
-        if (!Ext.getStore('editorQiStore')) {
-            Ext.create('Ext.data.Store', {
-                storeId: 'editorQiStore',
-                autoLoad: true,
-                proxy: {
-                    type: 'ajax',
-                    url: Ext.String.format('{0}/istsos/services/{1}/dataqualities',wa.url, this.procedure.service),
-                    reader: {
-                        type: 'json',
-                        idProperty: 'code',
-                        root: 'data'
-                    }
-                },
-                fields: [
-                {
-                    name: 'code'
-                },
-                {
-                    name: 'combo',
-                    convert: function(v, record){
-                        return record.get('code')  + " - " + record.get('name');
-                    }
-                },
-                {
-                    name: 'name'
-                },
-                {
-                    name: 'description'
-                }
-                ]
-            });
-        }else{
-            Ext.getStore('editorQiStore').getProxy().url = Ext.String.format('{0}/istsos/services/{1}/dataqualities',wa.url, this.procedure.service);
-            Ext.getStore('editorQiStore').load();
-        }
-        
-        
-        
-        
-        Ext.get(this.id).mask("Initializing editor grid..");
-        
-        var properties = procedure.data.result.DataArray.field;
-        
-        var columns = [{
-            xtype: 'numbercolumn',
-            dataIndex: 'micro',
-            hidden: true,
-            hideable: false,
-            header: 'id'
-        },{
-            xtype: 'gridcolumn',
-            dataIndex: procedure.iso8601Field, // isodate is always present at position one
-            flex: 0.7,
-            header: 'Date'
-        }];
-        
-        for (var i = 1; i < properties.length; i++) {
-            
-            columns.push({
-                //xtype: 'numbercolumn',
-                header: properties[i].name,
-                dataIndex: procedure.storeConvertFieldToId[properties[i].definition],
-                definition: properties[i].definition,
-                flex: 0.4,
-                editor: {
-                    xtype: 'numberfield',
-                    decimalPrecision: 6,
-                    hideLabel: true,
-                    listeners: {
-                        change: function(form, newValue, oldValue, eOpts){
-                        //console.log("change: ");
-                        //console.dir(arguments);
-                        }
-                    }
-                }
-            },{
-                //xtype: 'gridcolumn',
-                header: 'qualityIndex',
-                dataIndex: procedure.storeConvertFieldToId[properties[i].definition+':qualityIndex'],
-                definition: Ext.String.format('{0}:qualityIndex',properties[i].definition),
-                flex: 0.3,
-                editor: {
-                    xtype: 'combobox',
-                    queryMode: 'local',
-                    allowBlank: false,
-                    hideLabel: true,
-                    displayField: 'combo',
-                    matchFieldWidth: false,
-                    listConfig: {
-                        minWidth: 200
-                    },
-                    store: 'editorQiStore',
-                    valueField: 'code',
-                    anchor: '100%'
-                }
-            });
-            i++;
-        }
-        
-        var observedProperty = this.observedProperty.definition;
-        for (var i = 2; i < columns.length; i++) {
-            if (//columns[i]['definition']==procedure.isodef && 
-                columns[i]['definition']!=observedProperty && 
-                columns[i]['definition']!=observedProperty+':qualityIndex') {
-                columns[i]['hidden']=true;
-            }
-        }
-        
-        this.grid = Ext.create('Ext.grid.Panel', {
-            xtype: 'grid',
-            //id: 'oegrid',
-            title: '',
-            store: procedure.store,
-            autoRender: true,
-            autoScroll: true,
-            viewConfig: {
-            
-            },
-            columns: columns,
-            plugins: [Ext.create('Ext.grid.plugin.CellEditing')],
-            selModel: Ext.create('Ext.selection.RowModel', {
-                allowDeselect: true,
-                mode: 'MULTI'
-            }),
-            listeners: {
-                select: function(grid, record, index, eOpts){
-                    this.fireEvent("select", this, grid, record, index, eOpts);
-                },
-                selectionchange: function(grid, selected, eOpts){
-                    this.fireEvent("selectionchange", this, grid, selected, eOpts);
-                },
-                scope: this
-            },
-            dockedItems: [
-            {
-                xtype: 'toolbar',
-                dock: 'top',
-                items: [
-                /*{
-                    xtype: 'filefield',
-                    emptyText: 'Load CSV..',
-                    labelWidth: 40
-                },*/
-                {
-                    xtype: 'button',
-                    flex: 1,
-                    id: 'btnSave',
-                    text: 'Save',
-                    disabled: true,
-                    handler: function(){
-                        if (this.procedure.store.getUpdatedRecords().length>0) {
-                            this.procedure.on("observationSaved",function(){
-                                this.destroyGrid();
-                            },this,{
-                                single: true
-                            });
-                            this.procedure.insertObservation();
-                        }else{
-                            Ext.Msg.alert('Info', 'Nothing to save.');
-                        }
-                    },
-                    scope: this
-                },
-                {
-                    xtype: 'button',
-                    flex: 1,
-                    id: 'btnCancel',
-                    text: 'Cancel',
-                    handler: function(){
-                        if (this.procedure.store.getUpdatedRecords().length>0) {
-                            Ext.Msg.show({
-                                title:'Confirm action',
-                                msg: 'There are unsaved changes, are you sure you want to continue this action?',
-                                buttons: Ext.Msg.YESNO,
-                                icon: Ext.Msg.QUESTION,
-                                fn: function(btn, text){
-                                    if (btn == 'yes'){
-                                        this.destroyGrid();
-                                        this.procedure.rejectModifications();
-                                    }
-                                },
-                                scope: this
-                            });
-                            
-                        }else{
-                            this.destroyGrid();
-                        }
-                    },
-                    scope: this
-                },
-                {
-                    xtype: 'button',
-                    flex: 1,
-                    id: 'btnCalc',
-                    text: 'Calculator',
-                    handler: function(){
-                        this.calcWin = Ext.create('Ext.window.Window', {
-                            title: 'Calculator',
-                            height: 190,
-                            width: 700,
-                            layout: 'fit',
-                            items: Ext.create('istsos.view.Calc',{
-                                id: 'calcpanel',
-                                grid: Ext.getCmp('proceduregrid').grid,
-                                procedure: this.procedure,
-                                procedures: this.procedures,
-                                observedproperty: this.observedProperty.definition
-                            })
-                        });
-                        this.calcWin.show();
-                    },
-                    scope: this
-                },
-                {
-                    xtype: 'button',
-                    flex: 1,
-                    id: 'btnSelectAll',
-                    text: 'Select all',
-                    handler: function(){
-                        var selectionModel = this.grid.getSelectionModel();
-                        selectionModel.selectAll(true);
-                    },
-                    scope: this
-                }
-                ]
-            }
-            ]
-        });
-        this.removeAll();
-        this.add(this.grid);
-        
-        this.procedure.store.on('update',function(){
-            this.enable();
-        },Ext.getCmp('btnSave'));
-        this.procedure.store.on('seriesupdated',function(){
-            this.enable();
-        },Ext.getCmp('btnSave'));
-        
-        Ext.get(this.id).unmask();
-        
-        
-    },
-    destroyGrid: function(){
-        Ext.getCmp('btnSave').disable();
-        this.removeAll();
-        delete this.grid;
-        this.fireEvent("gridremoved", this);
-    },
-    /*
- * procedures is a dictionary of istsos.Sensor objects
- * 
- * {
- *    "T_BIASCA": {istsos.Sensor}
- * }
- */
-    initReadOnlyGrid: function(procedures, observedProperty){
-        // @todo: Check if procedures has loaded some data
-        
-        
-        this.resetConfig({
-            readOnlyGrid: true,
-            observedProperty: observedProperty
-        });
-        this.procedures = procedures;
-        
-        Ext.get('gridpanel').mask("Initializing read only grid..");
-        
-        var keys = Object.keys(procedures);
-        keys = keys.sort();
-        
-        // Initialization of the grid store and the data model *****************
-        var modelFields = [
-        {
-            name: 'micro', 
-            type: 'int'
-        },
-
-        {
-            name: 'iso8601', 
-            type: 'string'
-        }            
-        ];
-        var template = {
-            micro: null,
-            iso8601: null
-        }
-        for (var c = 0; c < keys.length; c++) {
-            var key = keys[c];
-            if (Ext.Array.contains(procedures[key].getObservedProperties(),observedProperty)) {
-                modelFields.push({
-                    name: key, 
-                    type: 'string'
-                },{
-                    name: key+'_qi', 
-                    type: 'string'
-                });
-                template[key] = "-";
-                template[key+'_qi'] = "-";
-            }
-        }
-        // Creating data model
-        Ext.define('procedureGridDatamodel', {
-            extend: 'Ext.data.Model',
-            idProperty: "micro",
-            fields: modelFields
-        });
-        // Creating the store
-        this.store = Ext.create('Ext.data.Store', {
-            model: 'procedureGridDatamodel',
-            proxy: {
-                type: 'memory',
-                reader: {
-                    type: 'array',
-                    idProperty: 'micro'
-                }
-            }
-        });
-        // Suspends the firing of all events:
-        // Pass as true to queue up suspended events to be fired after 
-        // the resumeEvents call instead of discarding all suspended events.
-        this.store.suspendEvents(false);
-        // Merging loaded data to this grid store
-        
-        for (var c = 0; c < keys.length; c++) {
-            var key = keys[c];
-            if (Ext.Array.contains(procedures[key].getObservedProperties(),observedProperty)) {
-                
-                var recs = procedures[key].store.getRange();
-                
-                for (var j = 0, l = recs.length; j < l; j++) {
-                    
-                    var rec = null;
-                    var idx = this.store.indexOfId(recs[j].get("micro"));
-                    
-                    if (idx==-1) { // If record does not exist create a new one
-                        rec = Ext.create('procedureGridDatamodel', template);
-                        rec.set("micro",recs[j].get("micro"));
-                        rec.set("iso8601",recs[j].get("iso8601"));
-                        this.store.add(rec);
-                    }else{// if record exists then use it
-                        rec = this.store.getAt(idx);
-                    }
-                    
-                    // Set the property choosen in the chart store in the right column
-                    var v = parseFloat(recs[j].get(procedures[key].storeConvertFieldToId[observedProperty]));
-                    rec.set(key,v);
-                    rec.set(key+"_qi", recs[j].get(procedures[key].storeConvertFieldToId[observedProperty+":qualityIndex"]));   
-                    rec.commit(true);
-                }
-            }
-        }
-        this.store.sort('micro');
-        this.store.resumeEvents();
-        
-        
-        
-        // Initialization of the two always present columns ********************
-        var columns = [{
-            xtype: 'numbercolumn',
-            dataIndex: 'micro',
-            hidden: true,
-            hideable: false,
-            sortable: false,
-            header: 'id'
-        },{
-            xtype: 'gridcolumn',
-            dataIndex: 'iso8601', // isodate is always present at position one
-            sortable: false,
-            hideable: false,
-            width: 200,
-            //flex: 0.7,
-            header: 'Date'
-        }];
-        for (var c = 0; c < keys.length; c++) {
-            var key = keys[c];
-            // check if procedures loaded have the requested observed property
-            if (Ext.Array.contains(procedures[key].getObservedProperties(),observedProperty)) {
-                columns.push({
-                    xtype: 'gridcolumn',
-                    //xtype: 'numbercolumn',
-                    //format: "0'000.000000",
-                    dataIndex: key,
-                    hideable: false,
-                    sortable: false,
-                    //flex: 0.4,
-                    text: key
-                },{
-                    xtype: 'gridcolumn',
-                    dataIndex: key + "_qi",
-                    sortable: false,
-                    hideable: false,
-                    width: 40,
-                    flex: (c+1) == keys.length ? 1: null,
-                    text: 'QI'
-                });
-            }else{
-                console.log("Procedure \""+key+"\" has not the desired observed property: " + observedProperty);
-            }
-        }
-        
-        this.grid = Ext.create('Ext.grid.Panel', {
-            xtype: 'grid',
-            store: this.store,
-            autoRender: true,
-            autoScroll: true,
-            viewConfig: {
-            
-            },
-            columns: columns,
-            selModel: Ext.create('Ext.selection.RowModel', {
-                allowDeselect: true,
-                mode: 'MULTI'
-            }),
-            listeners: {
-                select: function(grid, record, index, eOpts){
-                    this.fireEvent("select", this, grid, record, index, eOpts);
-                },
-                selectionchange: function(grid, selected, eOpts){
-                    this.fireEvent("selectionchange", this, grid, selected, eOpts);
-                },
-                scope: this
-            }
-        });
-        
-        this.removeAll();
-        this.add(this.grid);
-        
-        Ext.get('gridpanel').unmask();
-        
-    },
-    /*
- * MicroArray can be of two type:
- * 1. one array with an integer representing a micro id to be highlighted
- *    example: [1351326600000000] 
- * 2. one array with two integers representing an interval of micro ids to be highlighted
- *    example: [1351326000000000,1351327000000000] 
- */
-    updateGridSelection: function(microArray){
-        if (!Ext.isEmpty(this.grid)) {
-            var selectionModel, store;
-            this.suspendEvents(false);
-            if (microArray.length==2) {
-                selectionModel = this.grid.getSelectionModel();
-                store = this.grid.getStore();
-                var idx1 = store.find('micro',microArray[0]);
-                var idx2 = store.find('micro',microArray[1]);
-                selectionModel.selectRange(idx1,idx2);
-            }else if (microArray.length==1) {
-                selectionModel = this.grid.getSelectionModel();
-                store = this.grid.getStore();
-                var idx1 = store.find('micro',microArray[0]);
-                selectionModel.select(idx1);
-            }
-            this.resumeEvents();
-        }
-    },
-    removeProcedure: function(procedure){
-        delete this.procedures[procedure.getName()];
-        if (Ext.Object.getSize(this.procedures)==0) {
-            this.removeAll();
-        }else{
-            if (this.readOnlyGrid) {
-                this.initReadOnlyGrid(
-                    this.procedures,
-                    this.observedProperty);
-            }
-        }
-    }
-});
diff --git a/interface/app/view/proceduresList.js b/interface/app/view/proceduresList.js
deleted file mode 100755
index 9315993..0000000
--- a/interface/app/view/proceduresList.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * File: app/view/proceduresList.js
- * Date: Thu Apr 26 2012 16:35:17 GMT+0200 (CEST)
- *
- * This file was generated by Ext Designer version 1.2.2.
- * http://www.sencha.com/products/designer/
- *
- * This file will be generated the first time you export.
- *
- * You should implement event handling and custom methods in this
- * class.
- */
-
-Ext.define('istsos.view.proceduresList', {
-    extend: 'istsos.view.ui.proceduresList',
-
-    initComponent: function() {
-        var me = this;
-        Ext.create('istsos.store.gridProceduresList');
-        me.callParent(arguments);
-        
-        
-        Ext.getCmp("btnRemove").on("click",function(){
-            var sm = this.getSelectionModel();
-            var rec = sm.getSelection();
-            if (rec.length==1) {
-                
-                var msg = '', deleteurl='';
-                if (rec[0].get('sensortype')=='virtual'){
-                    deleteurl=Ext.String.format('{0}/istsos/services/{1}/virtualprocedures/{2}', 
-                        wa.url, this.istService, rec[0].get('name')
-                    );
-                    msg = "Are you sure you want to erase the virtual " +
-                        "procedure and all of its python code?";
-                }else{
-                    deleteurl=Ext.String.format('{0}/istsos/services/{1}/procedures/{2}', 
-                        wa.url, this.istService, rec[0].get('name')
-                    );
-                    msg = "Are you sure you want to erase the procedure and all of its observations?";
-                }
-                
-                Ext.Msg.show({
-                    title:'Erasing procedure',
-                    msg: msg,
-                    buttons: Ext.Msg.YESNO,
-                    icon: Ext.Msg.QUESTION,
-                    fn: function(btn){
-                        if (btn == 'yes'){
-                            var sm = this.getSelectionModel();
-                            var rec = sm.getSelection();
-                            if (Ext.isEmpty(this.mask)) {
-                                this.mask = new Ext.LoadMask(this.body, {
-                                    msg:"Please wait..."
-                                });
-                            }
-                            this.mask.show();
-                            Ext.Ajax.request({
-                                url: deleteurl,
-                                scope: this,
-                                method: "DELETE",
-                                success: function(response){
-                                    Ext.Ajax.request({
-                                        url: Ext.String.format('{0}/istsos/services/{1}/procedures/operations/getlist', wa.url,this.istService),
-                                        scope: this,
-                                        method: "GET",
-                                        success: function(response){
-                                            var json = Ext.decode(response.responseText);
-                                            if (json.success) {
-                                                this.getStore().loadData(json.data);
-                                            }
-                                            this.mask.hide();
-                                        }
-                                    });
-                                },
-                                failure: function(){
-                                    
-                                }
-                            });      
-                        }
-                    },
-                    scope: this
-                });       
-            }
-        },this);
-        
-        this.columns[0].renderer = function(value, p, record){
-            var func=Ext.String.format("istsos.engine.pageManager.openPage({" + 
-                "istTitle: 'Edit procedure', " +
-                "istBody: ['istsos.view.procedure'], " +
-                "istFooter: istsos.SUBMIT, " +
-                "istService: '{0}'," + 
-                "istProcedure: '{1}'," + 
-                "istFunction: { " +
-                "   onLoad: 'executeGet'," +
-                "   onSubmit: 'executePut'" +
-                "}" +
-                "})",
-                this.istService,value);
-            return Ext.String.format('<span class="softLink" onclick="{0}">{1}</span>',func,value);
-        }
-        this.columns[3].renderer = function(value, p, record){
-            var ret = [];
-            for (var i = 0; i < value.length; i++) {
-                //var s = Ext.String.format('<span class="softLink" onclick="alert(\'load editor for: '+value[i]+'\')">{0}</span>',value[i]);
-                var s = Ext.String.format('{0}',value[i]);
-                ret.push(s);
-            }  
-            return ret.join(", ")
-        };
-        this.columns[4].renderer = function(value, p, record){
-            var ret = [];
-            for (var i = 0; i < value.length; i++) {
-                var v = value[i]['name'].split(':');
-                var s = Ext.String.format('{0} [{1}]',v[v.length-1],value[i]['uom']);
-                ret.push(s);
-            }  
-            return ret.join(", ")
-        };
-        this.columns[5].renderer = function(value, p, record){
-            return value['beginposition']
-        };
-        this.columns[6].renderer = function(value, p, record){
-            return value['endposition']
-        };
-    },
-    operationLoad: function(){
-        if (Ext.isEmpty(this.mask)) {
-            this.mask = new Ext.LoadMask(this.body, {
-                msg:"Please wait..."
-            });
-        }
-        this.mask.show();
-        Ext.Ajax.request({
-            url: Ext.String.format('{0}/istsos/services/{1}/procedures/operations/getlist', wa.url,this.istService),
-            scope: this,
-            method: "GET",
-            success: function(response){
-                var json = Ext.decode(response.responseText);
-                if (json.success) {
-                    this.istForm.getStore().loadData(json.data);
-                }
-                this.mask.hide();
-            }
-        });
-    }
-});
diff --git a/interface/app/view/ui/BasePage.js b/interface/app/view/ui/BasePage.js
deleted file mode 100755
index f2525f7..0000000
--- a/interface/app/view/ui/BasePage.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * File: app/view/ui/BasePage.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.BasePage', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    layout: {
-        type: 'border'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    hidden: true,
-                    layout: {
-                        type: 'fit'
-                    },
-                    bodyBorder: true,
-                    bodyCls: 'centerTitle',
-                    bodyPadding: '8px',
-                    region: 'north'
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    styleHtmlContent: true,
-                    autoScroll: true,
-                    layout: {
-                        type: 'anchor'
-                    },
-                    bodyBorder: true,
-                    bodyCls: 'centerBody',
-                    region: 'center'
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    height: 20,
-                    hidden: true,
-                    bodyPadding: '8px',
-                    region: 'south'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/Calc.js b/interface/app/view/ui/Calc.js
deleted file mode 100755
index 85ce387..0000000
--- a/interface/app/view/ui/Calc.js
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * File: app/view/ui/Calc.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.Calc', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    height: 150,
-    minWidth: 450,
-    width: 450,
-    layout: {
-        type: 'border'
-    },
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    height: 100,
-                    layout: {
-                        align: 'stretch',
-                        type: 'hbox'
-                    },
-                    title: '',
-                    region: 'north',
-                    items: [
-                        {
-                            xtype: 'gridpanel',
-                            border: 0,
-                            id: 'editableProcedureGrid',
-                            width: 180,
-                            title: '',
-                            store: 'editableProcedure',
-                            flex: 0.3,
-                            columns: [
-                                {
-                                    xtype: 'gridcolumn',
-                                    border: 0,
-                                    dataIndex: 'name',
-                                    flex: 1,
-                                    text: 'Procedures'
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            layout: {
-                                align: 'stretch',
-                                type: 'vbox'
-                            },
-                            title: '',
-                            flex: 0.7,
-                            items: [
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 30,
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    flex: 1,
-                                    items: [
-                                        {
-                                            xtype: 'button',
-                                            id: 'plus',
-                                            text: '+',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'moltiply',
-                                            text: '*',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'sqrt',
-                                            text: 'sqrt',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'sin',
-                                            text: 'sin',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'exp',
-                                            text: '^',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'acos',
-                                            text: 'acos',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'openparentesis',
-                                            text: '(',
-                                            flex: 1
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 30,
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    flex: 1,
-                                    items: [
-                                        {
-                                            xtype: 'button',
-                                            id: 'minus',
-                                            text: '-',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'divide',
-                                            text: '/',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'cos',
-                                            text: 'cos',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'asin',
-                                            text: 'asin',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'tan',
-                                            text: 'tan',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'atan',
-                                            text: 'atan',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'closedparentesis',
-                                            text: ')',
-                                            flex: 1
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 30,
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    flex: 1,
-                                    items: [
-                                        {
-                                            xtype: 'button',
-                                            id: 'less',
-                                            text: '<',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'grater',
-                                            text: '>',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'equal',
-                                            text: '=',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'lesseq',
-                                            text: '≤',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'gretereq',
-                                            text: '≥',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'andop',
-                                            text: 'AND',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'orop',
-                                            text: 'OR',
-                                            flex: 1
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    layout: {
-                        type: 'border'
-                    },
-                    title: '',
-                    region: 'center',
-                    items: [
-                        {
-                            xtype: 'form',
-                            border: 0,
-                            width: 120,
-                            bodyPadding: 10,
-                            title: '',
-                            region: 'west',
-                            items: [
-                                {
-                                    xtype: 'displayfield',
-                                    id: 'pEditing',
-                                    hideLabel: true,
-                                    anchor: '100%'
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            layout: {
-                                align: 'stretch',
-                                type: 'hbox'
-                            },
-                            title: '',
-                            region: 'center',
-                            items: [
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    id: 'codePanel',
-                                    layout: {
-                                        align: 'stretch',
-                                        padding: '6 0 0 0',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    flex: 0.5
-                                },
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    bodyPadding: 10,
-                                    title: '',
-                                    flex: 0.5,
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'calcQiCombo',
-                                            fieldLabel: 'QI',
-                                            labelSeparator: '=',
-                                            labelWidth: 40,
-                                            emptyText: 'choosing a qi will update the selectded values..',
-                                            displayField: 'combo',
-                                            queryMode: 'local',
-                                            store: 'calcQiStore',
-                                            valueField: 'code',
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            width: 40,
-                            layout: {
-                                align: 'stretch',
-                                padding: '5px',
-                                type: 'vbox'
-                            },
-                            title: '',
-                            region: 'east',
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnExecute',
-                                    text: '↵',
-                                    flex: 1
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/Chart.js b/interface/app/view/ui/Chart.js
deleted file mode 100755
index 5491f5d..0000000
--- a/interface/app/view/ui/Chart.js
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * File: app/view/ui/Chart.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.Chart', {
-    extend: 'Ext.panel.Panel',
-    requires: [
-        'istsos.view.ProcedurePlotter',
-        'istsos.view.ProcedureChooser'
-    ],
-
-    border: 0,
-    height: 600,
-    id: 'chartpanel',
-    minHeight: 400,
-    minWidth: 1130,
-    autoScroll: true,
-    layout: {
-        type: 'border'
-    },
-    bodyStyle: 'background-color: white;',
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'charttwo',
-                    minWidth: 500,
-                    layout: {
-                        align: 'stretch',
-                        type: 'vbox'
-                    },
-                    title: '',
-                    region: 'center',
-                    items: [
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            height: 150,
-                            id: 'plotcalc',
-                            activeItem: 0,
-                            layout: {
-                                type: 'card'
-                            },
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    padding: '0px 5px 5px 5px ',
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'fieldset',
-                                            title: '2. Plot data',
-                                            items: [
-                                                {
-                                                    xtype: 'procedureplotter',
-                                                    id: 'plotdatafrm'
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    id: 'calccnt',
-                                    padding: '9 10 0 10',
-                                    layout: {
-                                        type: 'fit'
-                                    },
-                                    title: ''
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            html: '<div style=\'border-radius: 3px 3px 3px 3px !important; background-color: white; border: thin solid green; width: 100%; height: 100%;\' id=\'chartCnt\'></div>',
-                            title: '',
-                            flex: 0.7,
-                            margins: '0 10 5 10'
-                        },
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            height: 30,
-                            padding: '0 10 5 10',
-                            layout: {
-                                align: 'middle',
-                                padding: '0 10 5 10',
-                                type: 'hbox'
-                            },
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnRangeDay',
-                                    enableToggle: true,
-                                    text: 'Day',
-                                    toggleGroup: 'timeline',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnRangeWeek',
-                                    enableToggle: true,
-                                    text: 'Week',
-                                    toggleGroup: 'timeline',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnRangeAll',
-                                    enableToggle: true,
-                                    pressed: true,
-                                    text: 'All',
-                                    toggleGroup: 'timeline',
-                                    flex: 1
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'chartthree',
-                    minWidth: 350,
-                    width: 350,
-                    layout: {
-                        align: 'stretch',
-                        type: 'vbox'
-                    },
-                    collapsed: false,
-                    region: 'east',
-                    items: [
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            height: 105,
-                            layout: {
-                                type: 'fit'
-                            },
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    id: 'chartfilterFrm',
-                                    bodyPadding: '0 10 5 0',
-                                    collapseFirst: false,
-                                    collapsed: false,
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'fieldset',
-                                            padding: 5,
-                                            title: '3. Start editing',
-                                            items: [
-                                                {
-                                                    xtype: 'combobox',
-                                                    id: 'oeCbEditableProcedures',
-                                                    name: 'procedure',
-                                                    fieldLabel: 'Procedure',
-                                                    labelWidth: 70,
-                                                    displayField: 'name',
-                                                    queryMode: 'local',
-                                                    store: 'editableProcedure',
-                                                    valueField: 'name',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'container',
-                                                    height: 25,
-                                                    layout: {
-                                                        align: 'stretch',
-                                                        type: 'hbox'
-                                                    },
-                                                    items: [
-                                                        {
-                                                            xtype: 'button',
-                                                            hidden: true,
-                                                            id: 'btnCancelEditor',
-                                                            text: 'Cancel',
-                                                            flex: 1
-                                                        },
-                                                        {
-                                                            xtype: 'button',
-                                                            id: 'btnStartEditor',
-                                                            text: 'Start editing',
-                                                            flex: 1
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            id: 'chartgridcnt',
-                            layout: {
-                                type: 'fit'
-                            },
-                            title: '',
-                            flex: 1,
-                            margins: '0 10 5 0'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    width: 300,
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'west',
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            padding: 5,
-                            layout: {
-                                type: 'fit'
-                            },
-                            title: '1. Choose procedure',
-                            items: [
-                                {
-                                    xtype: 'procedurechooser',
-                                    id: 'pchoose'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ChartContainer.js b/interface/app/view/ui/ChartContainer.js
deleted file mode 100755
index 5b98305..0000000
--- a/interface/app/view/ui/ChartContainer.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * File: app/view/ui/ChartContainer.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ChartContainer', {
-    extend: 'Ext.panel.Panel',
-    requires: [
-        'istsos.view.Chart'
-    ],
-
-    border: 0,
-    layout: {
-        type: 'fit'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'chart'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/CheckColumn.js b/interface/app/view/ui/CheckColumn.js
deleted file mode 100755
index 5f79e73..0000000
--- a/interface/app/view/ui/CheckColumn.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * File: app/view/ui/CheckColumn.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.CheckColumn', {
-    extend: 'Ext.grid.column.Column',
-
-    text: 'Interpolation',
-
-    initComponent: function() {
-        var me = this;
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/Editor1.js b/interface/app/view/ui/Editor1.js
deleted file mode 100755
index fe052ca..0000000
--- a/interface/app/view/ui/Editor1.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * File: app/view/ui/Editor1.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.Editor1', {
-    extend: 'Ext.panel.Panel',
-    requires: [
-        'istsos.view.ProcedureChart',
-        'istsos.view.ProcedureChooser',
-        'istsos.view.ProcedureGridEditor'
-    ],
-
-    border: 0,
-    padding: 0,
-    layout: {
-        type: 'border'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    layout: {
-                        type: 'border'
-                    },
-                    title: '',
-                    region: 'center',
-                    items: [
-                        {
-                            xtype: 'procedurechart',
-                            region: 'center'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'tabpanel',
-                    width: 450,
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    activeTab: 0,
-                    region: 'west',
-                    items: [
-                        {
-                            xtype: 'procedurechooser',
-                            border: 0,
-                            id: 'pchoose',
-                            title: 'Choose procedure'
-                        },
-                        {
-                            xtype: 'proceduregrideditor',
-                            id: 'proceduregrideditor',
-                            title: 'Editor'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/FormDataQuality.js b/interface/app/view/ui/FormDataQuality.js
deleted file mode 100755
index d7081ed..0000000
--- a/interface/app/view/ui/FormDataQuality.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * File: app/view/ui/FormDataQuality.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.FormDataQuality', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    layout: {
-        type: 'anchor'
-    },
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'form',
-                    border: 0,
-                    bodyPadding: 10,
-                    title: '',
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            title: 'Add new index',
-                            items: [
-                                {
-                                    xtype: 'textfield',
-                                    fieldLabel: 'Code',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    fieldLabel: 'Description',
-                                    anchor: '100%'
-                                }
-                            ]
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            anchor: '100%',
-                            dock: 'bottom',
-                            layout: {
-                                pack: 'end',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    text: 'Cancel'
-                                },
-                                {
-                                    xtype: 'button',
-                                    text: 'Add'
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'gridpanel',
-                    padding: '16 8 0 8',
-                    title: 'Quality indexes',
-                    store: 'dataQualityStore',
-                    viewConfig: {
-                        height: 120
-                    },
-                    columns: [
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'code',
-                            text: 'Code'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'description',
-                            text: 'Description'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/MainMenu2.js b/interface/app/view/ui/MainMenu2.js
deleted file mode 100755
index beaead0..0000000
--- a/interface/app/view/ui/MainMenu2.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * File: app/view/ui/MainMenu2.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.MainMenu2', {
-    extend: 'Ext.panel.Panel',
-
-    id: 'webadmincmp',
-    layout: {
-        type: 'border'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'mainCenter',
-                    autoScroll: true,
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'center'
-                },
-                {
-                    xtype: 'panel',
-                    height: 150,
-                    id: 'submenu',
-                    margin: '0px 0px 1px 0px ',
-                    layout: {
-                        align: 'stretch',
-                        type: 'hbox'
-                    },
-                    collapsed: true,
-                    hideCollapseTool: true,
-                    title: '',
-                    region: 'north',
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            flex: 1,
-                            dock: 'top',
-                            layout: {
-                                padding: '4 0 4 0',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    componentCls: 'test',
-                                    id: 'menuServer',
-                                    enableToggle: true,
-                                    pressed: true,
-                                    text: 'Server',
-                                    toggleGroup: 'mainmenu'
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnService',
-                                    enableToggle: true,
-                                    text: 'Services',
-                                    toggleGroup: 'mainmenu',
-                                    menu: {
-                                        xtype: 'menu',
-                                        id: 'menuServices'
-                                    }
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnObservations',
-                                    enableToggle: true,
-                                    text: 'Data viewer',
-                                    toggleGroup: 'mainmenu'
-                                },
-                                {
-                                    xtype: 'container',
-                                    html: ' <div class=\'mainHeaderTitle\'><a href=\'http://istgeo.ist.supsi.ch/software/istsos/\' target=\'_BLANK\'><img height=28 src=\'images/istsos-logo.png\'/></a></div>',
-                                    flex: 1
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    height: 25,
-                    html: '<a style=\'color: white; text-decoration: none;\' href=\'http://www.supsi.ch/ist\' target=\'_BLANK\'>Open Source Software by Institute of Earth Science - SUPSI</a>',
-                    id: 'mainFoot',
-                    bodyCls: 'mainFooter',
-                    bodyPadding: 8,
-                    title: '',
-                    region: 'south'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/MainPanel.js b/interface/app/view/ui/MainPanel.js
deleted file mode 100755
index 017f681..0000000
--- a/interface/app/view/ui/MainPanel.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * File: app/view/ui/MainPanel.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.MainPanel', {
-    extend: 'Ext.container.Viewport',
-
-    id: 'mainPanel',
-    itemId: '',
-    layout: {
-        type: 'border'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'mainCenter',
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'center'
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    height: 70,
-                    html: '<div class=\'mainHeaderTitle\'>istSOS manager</div>\n<div class=\'mainHeaderSubtitle\'> > Control Panel for Sensor Observation Service</div>',
-                    id: 'mainHead',
-                    bodyCls: 'mainHeader',
-                    bodyPadding: '15 0 0 8',
-                    title: '',
-                    region: 'north'
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    height: 25,
-                    html: 'Open Source Software by Institute of Earth Science - SUPSI',
-                    id: 'mainFoot',
-                    bodyCls: 'mainFooter',
-                    bodyPadding: 8,
-                    title: '',
-                    region: 'south'
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'panelMenu',
-                    width: 210,
-                    layout: {
-                        type: 'border'
-                    },
-                    title: '',
-                    region: 'west',
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            height: 30,
-                            style: 'background-color: white !important;',
-                            region: 'north',
-                            dock: 'top',
-                            layout: {
-                                align: 'stretch',
-                                padding: 2,
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnMainMenu',
-                                    enableToggle: true,
-                                    pressed: true,
-                                    text: 'Server',
-                                    toggleGroup: 'menugroup',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnServicesMenu',
-                                    enableToggle: true,
-                                    text: 'Services',
-                                    toggleGroup: 'menugroup',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnDataMenu',
-                                    enableToggle: true,
-                                    text: 'Data',
-                                    toggleGroup: 'menugroup',
-                                    flex: 1
-                                }
-                            ]
-                        }
-                    ],
-                    items: [
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            id: 'menuCard',
-                            activeItem: 0,
-                            layout: {
-                                type: 'card'
-                            },
-                            title: '',
-                            region: 'center',
-                            items: [
-                                {
-                                    xtype: 'component',
-                                    id: 'mainMenu',
-                                    padding: '10px',
-                                    style: 'background: #fff;',
-                                    styleHtmlContent: true,
-                                    width: 150
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    id: 'servicesMenu',
-                                    layout: {
-                                        type: 'accordion'
-                                    },
-                                    bodyPadding: '10px',
-                                    title: ''
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ObservationEditor.js b/interface/app/view/ui/ObservationEditor.js
deleted file mode 100755
index 79cf224..0000000
--- a/interface/app/view/ui/ObservationEditor.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * File: app/view/ui/ObservationEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ObservationEditor', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    height: 600,
-    width: 900,
-    layout: {
-        type: 'border'
-    },
-    bodyStyle: 'background-color: transparent;',
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'form',
-                    border: 0,
-                    height: 140,
-                    id: 'oeSettings',
-                    bodyPadding: 10,
-                    title: '',
-                    region: 'north',
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            title: 'Choose the procedure',
-                            items: [
-                                {
-                                    xtype: 'fieldcontainer',
-                                    height: 30,
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    fieldLabel: 'Label',
-                                    hideLabel: true,
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'cmbServices',
-                                            fieldLabel: 'Service',
-                                            displayField: 'service',
-                                            store: 'storeServices',
-                                            valueField: 'service',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            disabled: true,
-                                            id: 'oeCbOffering',
-                                            name: 'offering',
-                                            fieldLabel: 'Offering',
-                                            labelAlign: 'right',
-                                            labelWidth: 60,
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'offerings',
-                                            valueField: 'name',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            disabled: true,
-                                            id: 'oeCbProcedure',
-                                            name: 'procedure',
-                                            fieldLabel: 'Procedure',
-                                            labelAlign: 'right',
-                                            labelWidth: 80,
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'procedurelist',
-                                            valueField: 'name',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            disabled: true,
-                                            id: 'oeCbObservedProperty',
-                                            name: 'observedproperty',
-                                            fieldLabel: 'Property',
-                                            labelAlign: 'right',
-                                            labelWidth: 80,
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'observedproperties',
-                                            valueField: 'name',
-                                            flex: 1
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'fieldcontainer',
-                                    height: 25,
-                                    defaults: {
-                                        flex: 1,
-                                        hideLabel: true
-                                    },
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    fieldLabel: 'Time period',
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'datefield',
-                                            disabled: true,
-                                            id: 'oeBegin',
-                                            name: 'begin',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'timefield',
-                                            disabled: true,
-                                            id: 'oeBeginTime',
-                                            name: 'begintime',
-                                            value: '00:00',
-                                            fieldLabel: 'Label',
-                                            format: 'G:i',
-                                            increment: 10,
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            html: '<div style=\'text-align: center; width: 100%;\'>-</div>',
-                                            padding: '5 0 0 0 ',
-                                            width: 20,
-                                            layout: {
-                                                type: 'fit'
-                                            },
-                                            flex: 0
-                                        },
-                                        {
-                                            xtype: 'datefield',
-                                            disabled: true,
-                                            id: 'oeEnd',
-                                            name: 'end',
-                                            fieldLabel: 'Label',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'timefield',
-                                            disabled: true,
-                                            id: 'oeEndTime',
-                                            name: 'endtime',
-                                            value: '00:00',
-                                            fieldLabel: 'Label',
-                                            format: 'G:i',
-                                            increment: 10,
-                                            flex: 1
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            dock: 'bottom',
-                            layout: {
-                                align: 'middle',
-                                pack: 'center',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'oeBtnReset',
-                                    text: 'Reset'
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'oeBtnLoad',
-                                    text: 'Load'
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'oeEditor',
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'center'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ObservationEditorAdvancedOperations.js b/interface/app/view/ui/ObservationEditorAdvancedOperations.js
deleted file mode 100755
index 3ad189b..0000000
--- a/interface/app/view/ui/ObservationEditorAdvancedOperations.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * File: app/view/ui/ObservationEditorAdvancedOperations.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ObservationEditorAdvancedOperations', {
-    extend: 'Ext.form.Panel',
-
-    border: 1,
-    height: 45,
-    width: 300,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'textfield',
-                    id: 'oeaTf',
-                    name: 'val',
-                    fieldLabel: 'New value',
-                    enableKeyEvents: true,
-                    anchor: '100%'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ObservationEditorColumn.js b/interface/app/view/ui/ObservationEditorColumn.js
deleted file mode 100755
index f64a72e..0000000
--- a/interface/app/view/ui/ObservationEditorColumn.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * File: app/view/ui/ObservationEditorColumn.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ObservationEditorColumn', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    layout: {
-        align: 'stretch',
-        type: 'hbox'
-    },
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    id: 'chartContainer',
-                    padding: '16px',
-                    maintainFlex: true,
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    flex: 0.9
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    id: 'gridContainer',
-                    width: 300,
-                    maintainFlex: true,
-                    layout: {
-                        type: 'fit'
-                    },
-                    bodyPadding: '16px',
-                    title: ''
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ProcedureChart.js b/interface/app/view/ui/ProcedureChart.js
deleted file mode 100755
index 84f7f8a..0000000
--- a/interface/app/view/ui/ProcedureChart.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * File: app/view/ui/ProcedureChart.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ProcedureChart', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    id: 'chartpanel',
-    layout: {
-        type: 'border'
-    },
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    title: '',
-                    region: 'north',
-                    items: [
-                        {
-                            xtype: 'form',
-                            border: 0,
-                            id: 'plotdatafrm',
-                            padding: '5 10 0 10',
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'fieldcontainer',
-                                    border: 0,
-                                    defaults: {
-                                        flex: 1,
-                                        hideLabel: true
-                                    },
-                                    layout: {
-                                        type: 'hbox'
-                                    },
-                                    fieldLabel: 'From',
-                                    labelWidth: 35,
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'datefield',
-                                            id: 'oeBegin',
-                                            name: 'begin',
-                                            format: 'Y-m-d',
-                                            flex: 0.3
-                                        },
-                                        {
-                                            xtype: 'timefield',
-                                            id: 'oeBeginTime',
-                                            name: 'begintime',
-                                            fieldLabel: 'Label',
-                                            format: 'H:i ',
-                                            increment: 10,
-                                            flex: 0.2
-                                        },
-                                        {
-                                            xtype: 'label',
-                                            height: 22,
-                                            padding: '2px 0px 0px 10px',
-                                            width: 30,
-                                            text: 'To:',
-                                            flex: 0
-                                        },
-                                        {
-                                            xtype: 'datefield',
-                                            id: 'oeEnd',
-                                            name: 'end',
-                                            fieldLabel: 'Label',
-                                            format: 'Y-m-d',
-                                            flex: 0.3
-                                        },
-                                        {
-                                            xtype: 'timefield',
-                                            id: 'oeEndTime',
-                                            name: 'endtime',
-                                            fieldLabel: 'Label',
-                                            format: 'H:i ',
-                                            increment: 10,
-                                            flex: 0.2
-                                        },
-                                        {
-                                            xtype: 'label',
-                                            height: 22,
-                                            padding: '2px 0px 0px 10px',
-                                            width: 70,
-                                            text: 'Property:',
-                                            flex: 0
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'oeCbObservedProperty',
-                                            name: 'observedproperty',
-                                            fieldLabel: 'Property',
-                                            labelWidth: 70,
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'observedproperties',
-                                            valueField: 'definition',
-                                            flex: 0.6
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            disabled: true,
-                                            id: 'btnPlot',
-                                            text: 'Plot',
-                                            flex: 0.4
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    style: 'background-color: white;',
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'center',
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            dock: 'bottom',
-                            layout: {
-                                align: 'middle',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'tbspacer',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnRangeDay',
-                                    width: 60,
-                                    enableToggle: true,
-                                    text: 'Day',
-                                    toggleGroup: 'timeline'
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnRangeWeek',
-                                    width: 60,
-                                    enableToggle: true,
-                                    text: 'Week',
-                                    toggleGroup: 'timeline'
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnRangeAll',
-                                    width: 60,
-                                    enableToggle: true,
-                                    pressed: true,
-                                    text: 'All',
-                                    toggleGroup: 'timeline'
-                                }
-                            ]
-                        }
-                    ],
-                    items: [
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            id: 'chartCnt',
-                            layout: {
-                                type: 'fit'
-                            },
-                            bodyCls: 'viewerChart',
-                            title: ''
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ProcedureChooser.js b/interface/app/view/ui/ProcedureChooser.js
deleted file mode 100755
index 2961d56..0000000
--- a/interface/app/view/ui/ProcedureChooser.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * File: app/view/ui/ProcedureChooser.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ProcedureChooser', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    itemId: 'chartone',
-    minWidth: 280,
-    padding: '10px 0px 0px 0px',
-    layout: {
-        type: 'border'
-    },
-    bodyPadding: '',
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'form',
-                    border: 0,
-                    height: 120,
-                    id: 'oeSettings',
-                    bodyPadding: '0 10 0 10',
-                    title: '',
-                    region: 'north',
-                    items: [
-                        {
-                            xtype: 'combobox',
-                            id: 'cmbServices',
-                            fieldLabel: 'Service',
-                            labelWidth: 70,
-                            displayField: 'service',
-                            store: 'storeServices',
-                            valueField: 'service',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'combobox',
-                            disabled: true,
-                            id: 'oeCbOffering',
-                            name: 'offering',
-                            fieldLabel: 'Offering',
-                            labelWidth: 70,
-                            displayField: 'name',
-                            queryMode: 'local',
-                            store: 'offerings',
-                            valueField: 'name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'combobox',
-                            disabled: true,
-                            id: 'oeCbProcedure',
-                            name: 'procedure',
-                            fieldLabel: 'Procedure',
-                            labelWidth: 70,
-                            displayField: 'name',
-                            queryMode: 'local',
-                            store: 'procedurelist',
-                            valueField: 'name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'button',
-                            id: 'btnAdd',
-                            text: 'Add',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'form',
-                    border: 0,
-                    id: 'proceduresTree',
-                    autoScroll: true,
-                    bodyPadding: '0 10 0 10',
-                    title: '',
-                    region: 'center'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ProcedureGrid.js b/interface/app/view/ui/ProcedureGrid.js
deleted file mode 100755
index fabee0e..0000000
--- a/interface/app/view/ui/ProcedureGrid.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * File: app/view/ui/ProcedureGrid.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ProcedureGrid', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    layout: {
-        type: 'fit'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ProcedureGridEditor.js b/interface/app/view/ui/ProcedureGridEditor.js
deleted file mode 100755
index 88b22e3..0000000
--- a/interface/app/view/ui/ProcedureGridEditor.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * File: app/view/ui/ProcedureGridEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ProcedureGridEditor', {
-    extend: 'Ext.panel.Panel',
-    requires: [
-        'istsos.view.ProcedureGrid'
-    ],
-
-    id: 'proceduregrideditor',
-    minWidth: 350,
-    width: 350,
-    layout: {
-        type: 'border'
-    },
-    collapsed: false,
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    height: 30,
-                    itemId: 'buttonspanel',
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'north',
-                    items: [
-                        {
-                            xtype: 'form',
-                            border: 0,
-                            id: 'chartfilterFrm',
-                            layout: {
-                                align: 'middle',
-                                type: 'hbox'
-                            },
-                            bodyPadding: '0 10 0 10',
-                            collapseFirst: false,
-                            collapsed: false,
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'combobox',
-                                    id: 'oeCbEditableProcedures',
-                                    name: 'procedure',
-                                    fieldLabel: 'Procedure',
-                                    labelWidth: 70,
-                                    allowBlank: false,
-                                    displayField: 'name',
-                                    queryMode: 'local',
-                                    store: 'editableProcedure',
-                                    valueField: 'name',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'button',
-                                    hidden: true,
-                                    id: 'btnCancelEditor',
-                                    minWidth: 60,
-                                    text: 'Cancel',
-                                    flex: 0.5
-                                },
-                                {
-                                    xtype: 'button',
-                                    id: 'btnStartEditor',
-                                    minWidth: 60,
-                                    text: 'Start editing',
-                                    flex: 0.5
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'proceduregrid',
-                    region: 'center',
-                    id: 'proceduregrid'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/ProcedurePlotter.js b/interface/app/view/ui/ProcedurePlotter.js
deleted file mode 100755
index a839bde..0000000
--- a/interface/app/view/ui/ProcedurePlotter.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * File: app/view/ui/ProcedurePlotter.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.ProcedurePlotter', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    id: 'plotdatafrm',
-    padding: '5 10 0 10',
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'fieldcontainer',
-                    border: 0,
-                    defaults: {
-                        flex: 1,
-                        hideLabel: true
-                    },
-                    layout: {
-                        type: 'hbox'
-                    },
-                    fieldLabel: 'From',
-                    labelWidth: 35,
-                    anchor: '100%',
-                    items: [
-                        {
-                            xtype: 'datefield',
-                            id: 'oeBegin',
-                            name: 'begin',
-                            format: 'Y-m-d',
-                            flex: 0.3
-                        },
-                        {
-                            xtype: 'timefield',
-                            id: 'oeBeginTime',
-                            name: 'begintime',
-                            fieldLabel: 'Label',
-                            format: 'H:i ',
-                            increment: 10,
-                            flex: 0.2
-                        },
-                        {
-                            xtype: 'label',
-                            height: 22,
-                            padding: '2px 0px 0px 10px',
-                            width: 30,
-                            text: 'To:',
-                            flex: 0
-                        },
-                        {
-                            xtype: 'datefield',
-                            id: 'oeEnd',
-                            name: 'end',
-                            fieldLabel: 'Label',
-                            format: 'Y-m-d',
-                            flex: 0.3
-                        },
-                        {
-                            xtype: 'timefield',
-                            id: 'oeEndTime',
-                            name: 'endtime',
-                            fieldLabel: 'Label',
-                            format: 'H:i ',
-                            increment: 10,
-                            flex: 0.2
-                        },
-                        {
-                            xtype: 'label',
-                            height: 22,
-                            padding: '2px 0px 0px 10px',
-                            width: 70,
-                            text: 'Property:',
-                            flex: 0
-                        },
-                        {
-                            xtype: 'combobox',
-                            id: 'oeCbObservedProperty',
-                            name: 'observedproperty',
-                            fieldLabel: 'Property',
-                            labelWidth: 70,
-                            displayField: 'name',
-                            queryMode: 'local',
-                            store: 'observedproperties',
-                            valueField: 'definition',
-                            flex: 0.6
-                        },
-                        {
-                            xtype: 'button',
-                            disabled: true,
-                            id: 'btnPlot',
-                            text: 'Plot',
-                            flex: 0.4
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/TestCsv.js b/interface/app/view/ui/TestCsv.js
deleted file mode 100755
index 7b320ef..0000000
--- a/interface/app/view/ui/TestCsv.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * File: app/view/ui/TestCsv.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.TestCsv', {
-    extend: 'Ext.container.Viewport',
-
-    layout: {
-        type: 'fit'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    layout: {
-                        type: 'border'
-                    },
-                    title: '',
-                    items: [
-                        {
-                            xtype: 'form',
-                            width: 300,
-                            bodyPadding: 16,
-                            title: 'FILE',
-                            region: 'west',
-                            items: [
-                                {
-                                    xtype: 'combobox',
-                                    id: 'cmbServices',
-                                    fieldLabel: 'Service',
-                                    labelWidth: 70,
-                                    displayField: 'service',
-                                    store: 'storeServices',
-                                    valueField: 'service',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'combobox',
-                                    id: 'oeCbOffering',
-                                    name: 'offering',
-                                    fieldLabel: 'Offering',
-                                    labelWidth: 70,
-                                    displayField: 'name',
-                                    queryMode: 'local',
-                                    store: 'offerings',
-                                    valueField: 'name',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'combobox',
-                                    id: 'oeCbProcedure',
-                                    name: 'procedure',
-                                    fieldLabel: 'Procedure',
-                                    labelWidth: 70,
-                                    displayField: 'name',
-                                    queryMode: 'local',
-                                    store: 'procedurelist',
-                                    valueField: 'name',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'filefield',
-                                    id: 'btncsv',
-                                    fieldLabel: 'CSV',
-                                    labelWidth: 70,
-                                    anchor: '100%'
-                                }
-                            ],
-                            dockedItems: [
-                                {
-                                    xtype: 'toolbar',
-                                    dock: 'top',
-                                    layout: {
-                                        align: 'middle',
-                                        type: 'hbox'
-                                    },
-                                    items: [
-                                        {
-                                            xtype: 'button',
-                                            text: 'Action!',
-                                            flex: 1
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'form',
-                            bodyPadding: 16,
-                            title: '',
-                            region: 'center',
-                            items: [
-                                {
-                                    xtype: 'textareafield',
-                                    height: 155,
-                                    id: 'logger',
-                                    readOnly: true,
-                                    fieldLabel: 'Log',
-                                    hideLabel: true,
-                                    anchor: '100%'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/Viewer.js b/interface/app/view/ui/Viewer.js
deleted file mode 100755
index 6665006..0000000
--- a/interface/app/view/ui/Viewer.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * File: app/view/ui/Viewer.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.Viewer', {
-    extend: 'Ext.container.Viewport',
-    requires: [
-        'istsos.view.ProcedureChart',
-        'istsos.view.ProcedureGrid',
-        'istsos.view.ProcedureChooser'
-    ],
-
-    border: 0,
-    layout: {
-        type: 'border'
-    },
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    layout: {
-                        type: 'border'
-                    },
-                    title: '',
-                    region: 'center',
-                    items: [
-                        {
-                            xtype: 'procedurechart',
-                            region: 'center',
-                            id: 'chartpanel'
-                        },
-                        {
-                            xtype: 'panel',
-                            height: 250,
-                            layout: {
-                                type: 'fit'
-                            },
-                            collapsible: true,
-                            title: 'Grid',
-                            region: 'south',
-                            split: true,
-                            items: [
-                                {
-                                    xtype: 'proceduregrid',
-                                    id: 'gridpanel'
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    border: 0,
-                    height: 25,
-                    html: '<a style=\'color: white; text-decoration: none;\' href=\'http://www.supsi.ch/ist\' target=\'_BLANK\'>Open Source Software by Institute of Earth Science - SUPSI</a>',
-                    id: 'mainFoot',
-                    bodyCls: 'mainFooter',
-                    bodyPadding: 8,
-                    title: '',
-                    region: 'south'
-                },
-                {
-                    xtype: 'panel',
-                    width: 300,
-                    layout: {
-                        type: 'fit'
-                    },
-                    title: '',
-                    region: 'west',
-                    items: [
-                        {
-                            xtype: 'procedurechooser',
-                            border: 0,
-                            id: 'pchoose'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/VirtualProcedureEditor.js b/interface/app/view/ui/VirtualProcedureEditor.js
deleted file mode 100755
index c00dc10..0000000
--- a/interface/app/view/ui/VirtualProcedureEditor.js
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * File: app/view/ui/VirtualProcedureEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.VirtualProcedureEditor', {
-    extend: 'Ext.panel.Panel',
-
-    layout: {
-        type: 'border'
-    },
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'form',
-                    height: 50,
-                    bodyPadding: 10,
-                    title: '',
-                    region: 'north',
-                    items: [
-                        {
-                            xtype: 'combobox',
-                            id: 'vpcmbplist',
-                            fieldLabel: 'Virtual procedure',
-                            labelWidth: 150,
-                            allowBlank: false,
-                            displayField: 'name',
-                            forceSelection: true,
-                            store: 'vplist',
-                            valueField: 'name',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'tabpanel',
-                    id: 'vppanel',
-                    activeItem: 0,
-                    title: '',
-                    activeTab: 1,
-                    flex: 1,
-                    region: 'center',
-                    items: [
-                        {
-                            xtype: 'panel',
-                            layout: {
-                                align: 'stretch',
-                                type: 'vbox'
-                            },
-                            title: 'Rating curve',
-                            dockedItems: [
-                                {
-                                    xtype: 'toolbar',
-                                    flex: 1,
-                                    dock: 'top',
-                                    items: [
-                                        {
-                                            xtype: 'tbtext',
-                                            text: 'ADD'
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'vpbtnaddrc',
-                                            text: '> at end'
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            disabled: true,
-                                            id: 'vpbtnaddaboverc',
-                                            text: '> above selected'
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            disabled: true,
-                                            id: 'vpbtnaddbelowrc',
-                                            text: '> below selected'
-                                        },
-                                        {
-                                            xtype: 'tbseparator',
-                                            margin: '0px 8px 0px 8px'
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            disabled: true,
-                                            id: 'vpbtnremoverc',
-                                            text: 'Remove selected'
-                                        }
-                                    ]
-                                }
-                            ],
-                            items: [
-                                {
-                                    xtype: 'gridpanel',
-                                    border: 0,
-                                    id: 'vpgridratingcurve',
-                                    title: '',
-                                    store: 'ratingcurve',
-                                    flex: 1,
-                                    columns: [
-                                        {
-                                            xtype: 'datecolumn',
-                                            sortable: false,
-                                            dataIndex: 'from',
-                                            flex: 0.13,
-                                            text: 'From',
-                                            format: 'Y-m-d',
-                                            field: {
-                                                xtype: 'datefield',
-                                                name: 'from',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                format: 'Y-m-d'
-                                            }
-                                        },
-                                        {
-                                            xtype: 'datecolumn',
-                                            sortable: false,
-                                            dataIndex: 'to',
-                                            flex: 0.13,
-                                            text: 'To',
-                                            format: 'Y-m-d',
-                                            field: {
-                                                xtype: 'datefield',
-                                                name: 'to',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                format: 'Y-m-d'
-                                            }
-                                        },
-                                        {
-                                            xtype: 'numbercolumn',
-                                            sortable: false,
-                                            dataIndex: 'low_val',
-                                            flex: 0.13,
-                                            text: 'Low',
-                                            format: '0,000.0000',
-                                            field: {
-                                                xtype: 'numberfield',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                decimalPrecision: 4
-                                            }
-                                        },
-                                        {
-                                            xtype: 'numbercolumn',
-                                            sortable: false,
-                                            dataIndex: 'up_val',
-                                            flex: 0.13,
-                                            text: 'Up',
-                                            format: '0,000.0000',
-                                            field: {
-                                                xtype: 'numberfield',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                decimalPrecision: 4
-                                            }
-                                        },
-                                        {
-                                            xtype: 'numbercolumn',
-                                            sortable: false,
-                                            dataIndex: 'A',
-                                            flex: 0.13,
-                                            text: 'A',
-                                            format: '0,000.0000',
-                                            field: {
-                                                xtype: 'numberfield',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                decimalPrecision: 4
-                                            }
-                                        },
-                                        {
-                                            xtype: 'numbercolumn',
-                                            sortable: false,
-                                            dataIndex: 'B',
-                                            flex: 0.13,
-                                            text: 'B',
-                                            format: '0,000.0000',
-                                            field: {
-                                                xtype: 'numberfield',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                decimalPrecision: 4
-                                            }
-                                        },
-                                        {
-                                            xtype: 'numbercolumn',
-                                            sortable: false,
-                                            dataIndex: 'C',
-                                            flex: 0.13,
-                                            text: 'C',
-                                            format: '0,000.0000',
-                                            field: {
-                                                xtype: 'numberfield',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                decimalPrecision: 4
-                                            }
-                                        },
-                                        {
-                                            xtype: 'numbercolumn',
-                                            sortable: false,
-                                            dataIndex: 'K',
-                                            flex: 0.13,
-                                            text: 'K',
-                                            format: '0,000.0000',
-                                            field: {
-                                                xtype: 'numberfield',
-                                                fieldLabel: 'Label',
-                                                hideLabel: true,
-                                                decimalPrecision: 4
-                                            }
-                                        }
-                                    ],
-                                    viewConfig: {
-
-                                    },
-                                    plugins: [
-                                        Ext.create('Ext.grid.plugin.CellEditing', {
-
-                                        })
-                                    ],
-                                    selModel: Ext.create('Ext.selection.RowModel', {
-                                        allowDeselect: true
-                                    })
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 60,
-                                    layout: {
-                                        align: 'stretch',
-                                        padding: '8px 0px 8px 0px',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'container',
-                                            width: 40
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'vpbtndeleterc',
-                                            text: 'Delete Rating Curve File',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 40
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'vpbtnsaverc',
-                                            text: 'Store the File',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 40
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'panel',
-                            layout: {
-                                align: 'stretch',
-                                type: 'vbox'
-                            },
-                            title: 'Code',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    id: 'vpcodingform',
-                                    layout: {
-                                        type: 'fit'
-                                    },
-                                    bodyPadding: 10,
-                                    title: '',
-                                    flex: 1
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 60,
-                                    layout: {
-                                        align: 'stretch',
-                                        padding: '8px 0px 8px 0px',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'container',
-                                            width: 40
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'vpbtndeletecode',
-                                            text: 'Delete Code File',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 40
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'vpbtnsavecode',
-                                            text: 'Save the Python Code',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 40
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/about.js b/interface/app/view/ui/about.js
deleted file mode 100755
index b6cd885..0000000
--- a/interface/app/view/ui/about.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * File: app/view/ui/about.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.about', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'fieldset',
-                    title: 'istSOS',
-                    items: [
-                        {
-                            xtype: 'displayfield',
-                            name: 'istsos_version',
-                            fieldLabel: 'Version',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'displayfield',
-                            id: 'updates',
-                            name: 'istsos_message',
-                            fieldLabel: 'Updates',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'displayfield',
-                            hidden: true,
-                            id: 'download',
-                            name: 'download_url',
-                            fieldLabel: 'Download',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textareafield',
-                            hidden: true,
-                            id: 'changelog',
-                            name: 'latest_istsos_changelog',
-                            readOnly: true,
-                            fieldLabel: 'Change log',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    html: '<p>istSOS (Istituto Scienze della Terra Sensor Observation Service) is an implementation of the Sensor Observation Service standard from Open Geospatial Consortium.\n</p>\n<p>\nThe developement of istSOS has started in 2009 in order to provide a simple implementation of the SOS standard for the management, provision and integration of hydro-meteorological data collected in Canton Ticino (Switzerland).\n</p>\n<p>\nistSOS is entirely written in <a href="http://py [...]
-                    padding: '10 0 0 0',
-                    styleHtmlContent: true,
-                    anchor: '100%'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/config.js b/interface/app/view/ui/config.js
deleted file mode 100755
index e9b1c8f..0000000
--- a/interface/app/view/ui/config.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * File: app/view/ui/config.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.config', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Proxy URL (optional)',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            fieldLabel: 'Url',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            hidden: true,
-                            fieldLabel: 'POST',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'SensorML folder',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'smlpath',
-                            fieldLabel: 'Path',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Virtual procedures',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'vppath',
-                            fieldLabel: 'Path',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Coordinate system',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'defaultepsg',
-                            fieldLabel: 'Default EPSG',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'permittedepsg',
-                            fieldLabel: 'Permitted EPSG',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'xaxisname',
-                            fieldLabel: 'X axis name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'yaxisname',
-                            fieldLabel: 'Y axis name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'zaxisname',
-                            fieldLabel: 'Z axis name',
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/contactinfo.js b/interface/app/view/ui/contactinfo.js
deleted file mode 100755
index 011fa7f..0000000
--- a/interface/app/view/ui/contactinfo.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * File: app/view/ui/contactinfo.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.contactinfo', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    id: 'contactinfo',
-    bodyPadding: 10,
-    bodyStyle: 'centerBody',
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'contact',
-                    fieldLabel: 'Contact',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'organization',
-                    fieldLabel: 'Organization',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'position',
-                    fieldLabel: 'Position',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'addressType',
-                    fieldLabel: 'Address type',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'address',
-                    fieldLabel: 'Address',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'city',
-                    fieldLabel: 'City',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'state',
-                    fieldLabel: 'State',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'zipCode',
-                    fieldLabel: 'ZIP code',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'country',
-                    fieldLabel: 'Coutry',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'telephone',
-                    fieldLabel: 'Telephone',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'fax',
-                    fieldLabel: 'Fax',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'email',
-                    fieldLabel: 'Email',
-                    anchor: '100%'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/contacts.js b/interface/app/view/ui/contacts.js
deleted file mode 100755
index b57f1b8..0000000
--- a/interface/app/view/ui/contacts.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * File: app/view/ui/contacts.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.contacts', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Authority',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'name',
-                            fieldLabel: 'Name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'version',
-                            fieldLabel: 'Version',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Service Identification:',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'title',
-                            fieldLabel: 'Title',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'abstract',
-                            fieldLabel: 'Abstract',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'keywords',
-                            fieldLabel: 'Keywords',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'fees',
-                            fieldLabel: 'Fees',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'accessconstrains',
-                            fieldLabel: 'Access constrains',
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/database.js b/interface/app/view/ui/database.js
deleted file mode 100755
index af0ed26..0000000
--- a/interface/app/view/ui/database.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * File: app/view/ui/database.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.database', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'PostGIS database',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'user',
-                            fieldLabel: 'User',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            inputType: 'password',
-                            name: 'password',
-                            fieldLabel: 'Password',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'host',
-                            fieldLabel: 'Host',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'port',
-                            fieldLabel: 'Port',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'dbname',
-                            fieldLabel: 'DB name',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    items: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            layout: {
-                                pack: 'center',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnTestConnection',
-                                    text: 'Test connection'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/geo.js b/interface/app/view/ui/geo.js
deleted file mode 100755
index ceca0da..0000000
--- a/interface/app/view/ui/geo.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * File: app/view/ui/geo.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.geo', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Coordinate system',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            id: 'defaultepsg',
-                            name: 'istsosepsg',
-                            fieldLabel: 'Default EPSG',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'allowedepsg',
-                            fieldLabel: 'Permitted EPSG',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'xaxisname',
-                            fieldLabel: 'X axis name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'yaxisname',
-                            fieldLabel: 'Y axis name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'zaxisname',
-                            fieldLabel: 'Z axis name',
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/getobservation.js b/interface/app/view/ui/getobservation.js
deleted file mode 100755
index d525eb5..0000000
--- a/interface/app/view/ui/getobservation.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * File: app/view/ui/getobservation.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.getobservation', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'fieldset',
-                    id: 'getobsconfig',
-                    title: 'GetObservation configuration:',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'maxgoperiod',
-                            fieldLabel: 'Max request interval (hours)',
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/identification.js b/interface/app/view/ui/identification.js
deleted file mode 100755
index 990d4ca..0000000
--- a/interface/app/view/ui/identification.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * File: app/view/ui/identification.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.identification', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Service Identification:',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'title',
-                            fieldLabel: 'Title',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'abstract',
-                            fieldLabel: 'Abstract',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'keywords',
-                            fieldLabel: 'Keywords',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'fees',
-                            fieldLabel: 'Fees',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'accessconstrains',
-                            fieldLabel: 'Access constrains',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'authority',
-                            fieldLabel: 'URN authority',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'urnversion',
-                            fieldLabel: 'URN version',
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/newservice.js b/interface/app/view/ui/newservice.js
deleted file mode 100755
index a02f80c..0000000
--- a/interface/app/view/ui/newservice.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * File: app/view/ui/newservice.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.newservice', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'fieldset',
-                    title: 'Sensor Observation Service',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            id: 'nsservice',
-                            invalidText: 'The serivice name must be a single lower case word',
-                            name: 'service',
-                            fieldLabel: 'Service name',
-                            allowBlank: false,
-                            regex: /^[a-z]+$/,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'epsg',
-                            fieldLabel: 'EPSG',
-                            emptyText: 'if empty, the default EPSG will be used',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    padding: 10
-                },
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    id: 'fscustomdb',
-                    checkboxName: 'customdb',
-                    checkboxToggle: true,
-                    collapsed: true,
-                    collapsible: true,
-                    title: 'Customize database',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'user',
-                            fieldLabel: 'User',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'password',
-                            fieldLabel: 'Password',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'host',
-                            fieldLabel: 'Host',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'port',
-                            fieldLabel: 'Port',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'dbname',
-                            fieldLabel: 'DB name',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'container',
-                            items: [
-                                {
-                                    xtype: 'toolbar',
-                                    margin: '0 0 5 0',
-                                    ui: 'footer',
-                                    layout: {
-                                        pack: 'end',
-                                        type: 'hbox'
-                                    },
-                                    items: [
-                                        {
-                                            xtype: 'button',
-                                            id: 'btnTestConnection',
-                                            text: 'Test connection'
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/obsPropEditor.js b/interface/app/view/ui/obsPropEditor.js
deleted file mode 100755
index 30a13b5..0000000
--- a/interface/app/view/ui/obsPropEditor.js
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * File: app/view/ui/obsPropEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.obsPropEditor', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'gridpanel',
-                    id: 'gridop',
-                    margin: 8,
-                    maxHeight: 250,
-                    title: '',
-                    forceFit: true,
-                    store: 'gridobservedproperties',
-                    viewConfig: {
-
-                    },
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            dock: 'top',
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnNew',
-                                    text: 'New'
-                                },
-                                {
-                                    xtype: 'button',
-                                    disabled: true,
-                                    id: 'btnRemove',
-                                    text: 'Remove selected'
-                                }
-                            ]
-                        }
-                    ],
-                    columns: [
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'name',
-                            flex: 1,
-                            text: 'Name'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'definition',
-                            flex: 1,
-                            text: 'Definition'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'description',
-                            flex: 1,
-                            text: 'Description'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'procedures',
-                            flex: 1,
-                            text: 'Procedures'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'constraint2str',
-                            flex: 1,
-                            text: 'Constraint'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'form',
-                    border: 0,
-                    hidden: true,
-                    id: 'frmObservedProperties',
-                    bodyPadding: 10,
-                    title: '',
-                    trackResetOnLoad: true,
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            title: 'Observed property',
-                            items: [
-                                {
-                                    xtype: 'textfield',
-                                    id: 'opName',
-                                    name: 'name',
-                                    fieldLabel: 'Name',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    id: 'opDefinition',
-                                    name: 'definition',
-                                    fieldLabel: 'Definition URN',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    name: 'description',
-                                    fieldLabel: 'Description',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'fieldcontainer',
-                                    height: 28,
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    fieldLabel: 'Correct Quality Index Constraints',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'sqiChoose',
-                                            width: 110,
-                                            name: 'ctype',
-                                            fieldLabel: '',
-                                            labelWidth: 50,
-                                            emptyText: 'Choose...',
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'constraint',
-                                            valueField: 'value'
-                                        },
-                                        {
-                                            xtype: 'numberfield',
-                                            hidden: true,
-                                            id: 'sqiFrom',
-                                            name: 'from',
-                                            fieldLabel: 'From',
-                                            labelAlign: 'right',
-                                            labelWidth: 50,
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'numberfield',
-                                            hidden: true,
-                                            id: 'sqiTo',
-                                            name: 'to',
-                                            fieldLabel: 'To',
-                                            labelAlign: 'right',
-                                            labelWidth: 40,
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            hidden: true,
-                                            id: 'sqiList',
-                                            name: 'list',
-                                            fieldLabel: 'List',
-                                            labelAlign: 'right',
-                                            labelWidth: 40,
-                                            flex: 1
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            dock: 'bottom',
-                            layout: {
-                                pack: 'center',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnForm',
-                                    text: 'Insert'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/offeringsEditor.js b/interface/app/view/ui/offeringsEditor.js
deleted file mode 100755
index d398d6f..0000000
--- a/interface/app/view/ui/offeringsEditor.js
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * File: app/view/ui/offeringsEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.offeringsEditor', {
-    extend: 'Ext.tab.Panel',
-
-    minHeight: 400,
-    title: '',
-    activeTab: 0,
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'panel',
-                    height: 450,
-                    minHeight: 400,
-                    title: 'Offerings',
-                    items: [
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'gridpanel',
-                                    id: 'gridoff',
-                                    margin: 8,
-                                    maxHeight: 250,
-                                    minHeight: 150,
-                                    title: '',
-                                    forceFit: true,
-                                    store: 'gridofferings',
-                                    viewConfig: {
-
-                                    },
-                                    dockedItems: [
-                                        {
-                                            xtype: 'toolbar',
-                                            dock: 'top',
-                                            items: [
-                                                {
-                                                    xtype: 'button',
-                                                    id: 'btnNew',
-                                                    text: 'New'
-                                                },
-                                                {
-                                                    xtype: 'button',
-                                                    disabled: true,
-                                                    id: 'btnRemove',
-                                                    text: 'Remove selected'
-                                                }
-                                            ]
-                                        }
-                                    ],
-                                    columns: [
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'name',
-                                            text: 'Name'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'description',
-                                            text: 'Description'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'procedures',
-                                            text: 'Procedures'
-                                        },
-                                        {
-                                            xtype: 'datecolumn',
-                                            dataIndex: 'expiration',
-                                            text: 'Expiration',
-                                            format: 'c'
-                                        },
-                                        {
-                                            xtype: 'booleancolumn',
-                                            dataIndex: 'active',
-                                            text: 'Active'
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    hidden: true,
-                                    id: 'frmOfferings',
-                                    bodyPadding: 10,
-                                    title: '',
-                                    trackResetOnLoad: true,
-                                    items: [
-                                        {
-                                            xtype: 'fieldset',
-                                            title: 'Offerings',
-                                            items: [
-                                                {
-                                                    xtype: 'textfield',
-                                                    id: 'offName',
-                                                    name: 'name',
-                                                    fieldLabel: 'Name',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'description',
-                                                    fieldLabel: 'Description',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'datefield',
-                                                    name: 'expiration',
-                                                    fieldLabel: 'Expiration',
-                                                    format: 'c',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'checkboxfield',
-                                                    name: 'active',
-                                                    fieldLabel: 'Visibility',
-                                                    boxLabel: 'enabled',
-                                                    anchor: '100%'
-                                                }
-                                            ]
-                                        }
-                                    ],
-                                    dockedItems: [
-                                        {
-                                            xtype: 'toolbar',
-                                            ui: 'footer',
-                                            dock: 'bottom',
-                                            layout: {
-                                                pack: 'center',
-                                                type: 'hbox'
-                                            },
-                                            items: [
-                                                {
-                                                    xtype: 'button',
-                                                    id: 'btnForm',
-                                                    text: 'Insert'
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'panel',
-                    height: 450,
-                    layout: {
-                        align: 'stretch',
-                        type: 'vbox'
-                    },
-                    title: 'Offering-Procedure memberships',
-                    items: [
-                        {
-                            xtype: 'panel',
-                            border: 0,
-                            height: 40,
-                            html: 'Click & Drag procedures to add or remove membership',
-                            padding: '16 16 8 16',
-                            title: ''
-                        },
-                        {
-                            xtype: 'panel',
-                            autoRender: true,
-                            border: 0,
-                            minHeight: 400,
-                            layout: {
-                                align: 'stretch',
-                                type: 'hbox'
-                            },
-                            flex: 1,
-                            items: [
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 300,
-                                    minHeight: 350,
-                                    layout: {
-                                        type: 'fit'
-                                    },
-                                    bodyPadding: 8,
-                                    title: '',
-                                    flex: 0.5,
-                                    items: [
-                                        {
-                                            xtype: 'gridpanel',
-                                            id: 'gridMembers',
-                                            autoScroll: true,
-                                            title: '',
-                                            forceFit: true,
-                                            store: 'proceduresMembers',
-                                            viewConfig: {
-                                                multiSelect: true,
-                                                plugins: [
-                                                    Ext.create('Ext.grid.plugin.DragDrop', {
-                                                        ddGroup: 'offeringsprocedures',
-                                                        dragGroup: 'gridMembers',
-                                                        dropGroup: 'gridNonMembers'
-                                                    })
-                                                ]
-                                            },
-                                            dockedItems: [
-                                                {
-                                                    xtype: 'toolbar',
-                                                    dock: 'top',
-                                                    items: [
-                                                        {
-                                                            xtype: 'combobox',
-                                                            id: 'cbOfferings',
-                                                            fieldLabel: 'Choose an offering',
-                                                            labelStyle: 'color: white;',
-                                                            labelWidth: 140,
-                                                            displayField: 'name',
-                                                            store: 'cmbname',
-                                                            valueField: 'name',
-                                                            flex: 1
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            columns: [
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'name',
-                                                    text: 'Name'
-                                                },
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'description',
-                                                    text: 'Description'
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'panel',
-                                    border: 0,
-                                    height: 300,
-                                    minHeight: 350,
-                                    layout: {
-                                        type: 'fit'
-                                    },
-                                    bodyPadding: 8,
-                                    title: '',
-                                    flex: 0.5,
-                                    items: [
-                                        {
-                                            xtype: 'gridpanel',
-                                            id: 'gridNonMembers',
-                                            title: 'Not members',
-                                            forceFit: true,
-                                            store: 'proceduresNonmembers',
-                                            viewConfig: {
-                                                multiSelect: true,
-                                                plugins: [
-                                                    Ext.create('Ext.grid.plugin.DragDrop', {
-                                                        ddGroup: 'offeringsprocedures',
-                                                        dragGroup: 'gridNonMembers',
-                                                        dropGroup: 'gridMembers'
-                                                    })
-                                                ]
-                                            },
-                                            columns: [
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'name',
-                                                    text: 'Name'
-                                                },
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'description',
-                                                    text: 'Description'
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/paths.js b/interface/app/view/ui/paths.js
deleted file mode 100755
index 4ee54e4..0000000
--- a/interface/app/view/ui/paths.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * File: app/view/ui/paths.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.paths', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    bodyStyle: 'centerBody',
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'textfield',
-                    name: 'istsos',
-                    fieldLabel: 'istSOS lib',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'textfield',
-                    name: 'services',
-                    fieldLabel: 'istSOS config',
-                    anchor: '100%'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/procedure.js b/interface/app/view/ui/procedure.js
deleted file mode 100755
index 1638d7e..0000000
--- a/interface/app/view/ui/procedure.js
+++ /dev/null
@@ -1,1421 +0,0 @@
-/*
- * File: app/view/ui/procedure.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.procedure', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    id: 'newprocpanel',
-    autoScroll: true,
-    defaults: 'defaults: {\nanchor: \'100%\',\npadding: \'10px\',\n }',
-    layout: {
-        type: 'anchor'
-    },
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'container',
-                    border: 0,
-                    padding: 8,
-                    layout: {
-                        type: 'anchor'
-                    },
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            id: 'toolspanel',
-                            title: 'Tools',
-                            items: [
-                                {
-                                    xtype: 'container',
-                                    html: '<H4>Copy configuration from an existing procedure:</H4>'
-                                },
-                                {
-                                    xtype: 'fieldcontainer',
-                                    id: 'oeSettings',
-                                    layout: {
-                                        type: 'hbox'
-                                    },
-                                    fieldLabel: '',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'cmbServices',
-                                            fieldLabel: 'Service',
-                                            labelWidth: 60,
-                                            displayField: 'service',
-                                            store: 'storeServices',
-                                            valueField: 'service',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 15
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'oeCbOffering',
-                                            name: 'offering',
-                                            fieldLabel: 'Offering',
-                                            labelWidth: 60,
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'offerings',
-                                            valueField: 'name',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 15
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'oeCbProcedure',
-                                            name: 'procedure',
-                                            fieldLabel: 'Procedure',
-                                            labelWidth: 70,
-                                            displayField: 'name',
-                                            queryMode: 'local',
-                                            store: 'procedurelist',
-                                            valueField: 'name',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'container',
-                                            width: 15
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'btnTemplateFill',
-                                            text: 'Fill form',
-                                            flex: 1
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'container',
-                            height: 30,
-                            html: '<h2>Procedure:</h2>',
-                            padding: '0 0 16 0'
-                        },
-                        {
-                            xtype: 'form',
-                            border: 10,
-                            id: 'generalInfo',
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'fieldset',
-                                    border: 0,
-                                    margin: 0,
-                                    padding: 10,
-                                    checkboxName: 'cbproxy',
-                                    title: 'General info',
-                                    items: [
-                                        {
-                                            xtype: 'displayfield',
-                                            hidden: true,
-                                            id: 'asid',
-                                            name: 'assignedSensorId',
-                                            fieldLabel: 'Sensor ID',
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            id: 'procedurename',
-                                            name: 'system',
-                                            fieldLabel: 'Name',
-                                            allowBlank: false,
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'description',
-                                            fieldLabel: 'Description',
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'keywords',
-                                            fieldLabel: 'Keywords',
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'form',
-                            border: 0,
-                            id: 'classification',
-                            title: '',
-                            items: [
-                                {
-                                    xtype: 'fieldset',
-                                    border: 0,
-                                    margin: 0,
-                                    title: 'Classification',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'cmbsystemtype',
-                                            name: 'systemtype',
-                                            fieldLabel: 'System type',
-                                            allowBlank: false,
-                                            displayField: 'name',
-                                            forceSelection: true,
-                                            store: 'systemtype',
-                                            valueField: 'name',
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'sensortype',
-                                            fieldLabel: 'Sensor Type',
-                                            allowBlank: false,
-                                            emptyText: 'tipping-bucket gauge, ...',
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            margin: 0,
-                            title: 'Location',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    id: 'frmLocation',
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'name',
-                                            fieldLabel: 'FOI name',
-                                            allowBlank: false,
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'cbepsg',
-                                            name: 'epsg',
-                                            fieldLabel: 'EPSG',
-                                            allowBlank: false,
-                                            displayField: 'name',
-                                            forceSelection: true,
-                                            store: 'locationEPSG',
-                                            valueField: 'name',
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'fieldcontainer',
-                                            height: 30,
-                                            layout: {
-                                                type: 'column'
-                                            },
-                                            fieldLabel: 'Coordinates',
-                                            items: [
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'x',
-                                                    fieldLabel: 'X',
-                                                    labelWidth: 20,
-                                                    allowBlank: false,
-                                                    columnWidth: 0.33
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'y',
-                                                    fieldLabel: 'Y',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 20,
-                                                    allowBlank: false,
-                                                    columnWidth: 0.33
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'z',
-                                                    fieldLabel: 'Z',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 20,
-                                                    allowBlank: false,
-                                                    columnWidth: 0.34
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            id: 'smlOutputs',
-                            margin: 0,
-                            padding: 8,
-                            title: 'Outputs',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    id: 'frmSmlOutputs',
-                                    itemId: 'frmSml',
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'cmbObservedProperty',
-                                            itemId: 'cmbSml',
-                                            name: 'name',
-                                            fieldLabel: '<span class=\'softLink\' onclick=\'Ext.getCmp("newprocpanel").openObsPropEditorWin();\'>Observed property</span>',
-                                            labelWidth: 120,
-                                            allowBlank: false,
-                                            displayField: 'definition',
-                                            forceSelection: true,
-                                            store: 'cmbobservedproperties',
-                                            valueField: 'definition',
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'cmbUom',
-                                            name: 'uom',
-                                            fieldLabel: '<span class=\'softLink\' onclick=\'Ext.getCmp("newprocpanel").openUomsEditorWin();\'>Unit of measure</span>',
-                                            labelWidth: 120,
-                                            allowBlank: false,
-                                            displayField: 'name',
-                                            forceSelection: true,
-                                            store: 'cmbuom',
-                                            valueField: 'name',
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'description',
-                                            fieldLabel: 'Description',
-                                            labelWidth: 120,
-                                            anchor: '100%'
-                                        },
-                                        {
-                                            xtype: 'fieldcontainer',
-                                            height: 28,
-                                            layout: {
-                                                align: 'stretch',
-                                                type: 'hbox'
-                                            },
-                                            fieldLabel: 'Statistical Quality Index Constraints',
-                                            labelWidth: 230,
-                                            items: [
-                                                {
-                                                    xtype: 'combobox',
-                                                    id: 'constrChoose',
-                                                    width: 150,
-                                                    name: 'ctype',
-                                                    fieldLabel: '',
-                                                    labelWidth: 50,
-                                                    emptyText: 'Choose...',
-                                                    displayField: 'name',
-                                                    queryMode: 'local',
-                                                    store: 'constraint',
-                                                    valueField: 'value'
-                                                },
-                                                {
-                                                    xtype: 'numberfield',
-                                                    hidden: true,
-                                                    id: 'constrFrom',
-                                                    name: 'from',
-                                                    fieldLabel: 'From',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 50,
-                                                    flex: 1
-                                                },
-                                                {
-                                                    xtype: 'numberfield',
-                                                    hidden: true,
-                                                    id: 'constrTo',
-                                                    name: 'to',
-                                                    fieldLabel: 'To',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 40,
-                                                    flex: 1
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    hidden: true,
-                                                    id: 'constrList',
-                                                    name: 'list',
-                                                    fieldLabel: 'List',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 40,
-                                                    flex: 1
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            itemId: 'btnAddSml',
-                                            margin: '0 0 10 0',
-                                            text: 'Add',
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'gridpanel',
-                                    height: 120,
-                                    itemId: 'gridSml',
-                                    minHeight: 120,
-                                    title: '',
-                                    forceFit: true,
-                                    store: 'gridoutputs',
-                                    viewConfig: {
-
-                                    },
-                                    dockedItems: [
-                                        {
-                                            xtype: 'toolbar',
-                                            itemId: 'gridToolbar',
-                                            dock: 'top',
-                                            items: [
-                                                {
-                                                    xtype: 'button',
-                                                    itemId: 'btnRemoveSml',
-                                                    text: 'Remove selected'
-                                                }
-                                            ]
-                                        }
-                                    ],
-                                    columns: [
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'name',
-                                            text: 'Name'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'description',
-                                            text: 'Description'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'definition',
-                                            text: 'Definition'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'uom',
-                                            text: 'Uom'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            hidden: true,
-                                            dataIndex: 'role',
-                                            text: 'Role'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'from',
-                                            text: 'From'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'to',
-                                            text: 'To'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'list',
-                                            text: 'List'
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    border: 0,
-                    padding: 8,
-                    layout: {
-                        type: 'anchor'
-                    },
-                    items: [
-                        {
-                            xtype: 'container',
-                            height: 30,
-                            html: '<h4>Optional parameters:</h4>',
-                            layout: {
-                                type: 'fit'
-                            }
-                        },
-                        {
-                            xtype: 'fieldset',
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Contacts (optional)',
-                            items: [
-                                {
-                                    xtype: 'container',
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'form',
-                                            border: 0,
-                                            id: 'frmOwner',
-                                            title: '',
-                                            items: [
-                                                {
-                                                    xtype: 'hiddenfield',
-                                                    name: 'role',
-                                                    value: 'urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:owner',
-                                                    fieldLabel: 'Label',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'organizationName',
-                                                    fieldLabel: 'Owner',
-                                                    labelWidth: 130,
-                                                    allowBlank: false,
-                                                    emptyText: 'Organization name...',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'fieldset',
-                                                    collapsed: true,
-                                                    collapsible: true,
-                                                    title: 'Details (optional)',
-                                                    anchor: '100%',
-                                                    items: [
-                                                        {
-                                                            xtype: 'container',
-                                                            layout: {
-                                                                type: 'column'
-                                                            },
-                                                            anchor: '100%',
-                                                            items: [
-                                                                {
-                                                                    xtype: 'container',
-                                                                    padding: 6,
-                                                                    layout: {
-                                                                        type: 'anchor'
-                                                                    },
-                                                                    columnWidth: 0.5,
-                                                                    items: [
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'individualName',
-                                                                            fieldLabel: 'Person',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'voice',
-                                                                            fieldLabel: 'Telephone',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'fax',
-                                                                            fieldLabel: 'Fax',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'email',
-                                                                            fieldLabel: 'email',
-                                                                            anchor: '100%'
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    xtype: 'container',
-                                                                    padding: 6,
-                                                                    layout: {
-                                                                        type: 'anchor'
-                                                                    },
-                                                                    columnWidth: 0.5,
-                                                                    items: [
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'web',
-                                                                            fieldLabel: 'Web',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'deliveryPoint',
-                                                                            fieldLabel: 'Address',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'city',
-                                                                            fieldLabel: 'City',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'administrativeArea',
-                                                                            fieldLabel: 'Admin area',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'postalcode',
-                                                                            fieldLabel: 'Postal code',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'country',
-                                                                            fieldLabel: 'Country',
-                                                                            anchor: '100%'
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'container',
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'form',
-                                            border: 0,
-                                            id: 'frmManufacturer',
-                                            title: '',
-                                            items: [
-                                                {
-                                                    xtype: 'hiddenfield',
-                                                    name: 'role',
-                                                    value: 'urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:manufacturer',
-                                                    fieldLabel: 'Label',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'organizationName',
-                                                    fieldLabel: 'Manufacturer',
-                                                    labelWidth: 130,
-                                                    allowBlank: false,
-                                                    emptyText: 'Organization name...',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'fieldset',
-                                                    collapsed: true,
-                                                    collapsible: true,
-                                                    title: 'Details (optional)',
-                                                    items: [
-                                                        {
-                                                            xtype: 'container',
-                                                            layout: {
-                                                                type: 'column'
-                                                            },
-                                                            anchor: '100%',
-                                                            items: [
-                                                                {
-                                                                    xtype: 'container',
-                                                                    padding: 6,
-                                                                    layout: {
-                                                                        type: 'anchor'
-                                                                    },
-                                                                    columnWidth: 0.5,
-                                                                    items: [
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'individualName',
-                                                                            fieldLabel: 'Person',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'voice',
-                                                                            fieldLabel: 'Telephone',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'fax',
-                                                                            fieldLabel: 'Fax',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'email',
-                                                                            fieldLabel: 'email',
-                                                                            anchor: '100%'
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    xtype: 'container',
-                                                                    padding: 6,
-                                                                    layout: {
-                                                                        type: 'anchor'
-                                                                    },
-                                                                    columnWidth: 0.5,
-                                                                    items: [
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'web',
-                                                                            fieldLabel: 'Web',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'deliveryPoint',
-                                                                            fieldLabel: 'Address',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'city',
-                                                                            fieldLabel: 'City',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'administrativeArea',
-                                                                            fieldLabel: 'Admin area',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'postalcode',
-                                                                            fieldLabel: 'Postal code',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'country',
-                                                                            fieldLabel: 'Country',
-                                                                            anchor: '100%'
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'container',
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'form',
-                                            border: 0,
-                                            id: 'frmOperator',
-                                            title: '',
-                                            items: [
-                                                {
-                                                    xtype: 'hiddenfield',
-                                                    name: 'role',
-                                                    value: 'urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:operator',
-                                                    fieldLabel: 'Label',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'organizationName',
-                                                    fieldLabel: 'Operator',
-                                                    labelWidth: 130,
-                                                    allowBlank: false,
-                                                    emptyText: 'Organization name...',
-                                                    anchor: '100%'
-                                                },
-                                                {
-                                                    xtype: 'fieldset',
-                                                    collapsed: true,
-                                                    collapsible: true,
-                                                    title: 'Details (optional)',
-                                                    items: [
-                                                        {
-                                                            xtype: 'container',
-                                                            layout: {
-                                                                type: 'column'
-                                                            },
-                                                            anchor: '100%',
-                                                            items: [
-                                                                {
-                                                                    xtype: 'container',
-                                                                    padding: 6,
-                                                                    layout: {
-                                                                        type: 'anchor'
-                                                                    },
-                                                                    columnWidth: 0.5,
-                                                                    items: [
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'individualName',
-                                                                            fieldLabel: 'Person',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'voice',
-                                                                            fieldLabel: 'Telephone',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'fax',
-                                                                            fieldLabel: 'Fax',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'email',
-                                                                            fieldLabel: 'email',
-                                                                            anchor: '100%'
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    xtype: 'container',
-                                                                    padding: 6,
-                                                                    layout: {
-                                                                        type: 'anchor'
-                                                                    },
-                                                                    columnWidth: 0.5,
-                                                                    items: [
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'web',
-                                                                            fieldLabel: 'Web',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'deliveryPoint',
-                                                                            fieldLabel: 'Address',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'city',
-                                                                            fieldLabel: 'City',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'administrativeArea',
-                                                                            fieldLabel: 'Admin area',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'postalcode',
-                                                                            fieldLabel: 'Postal code',
-                                                                            anchor: '100%'
-                                                                        },
-                                                                        {
-                                                                            xtype: 'textfield',
-                                                                            name: 'country',
-                                                                            fieldLabel: 'Country',
-                                                                            anchor: '100%'
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            id: 'smlDocumentation',
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Documents (optional)',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    height: 150,
-                                    itemId: 'frmSml',
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'vbox'
-                                    },
-                                    bodyPadding: '10 0 5 0',
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'description',
-                                            fieldLabel: 'Description',
-                                            allowBlank: false
-                                        },
-                                        {
-                                            xtype: 'combobox',
-                                            id: 'applicationType',
-                                            itemId: 'cmbSml',
-                                            name: 'format',
-                                            fieldLabel: 'Format',
-                                            displayField: 'format',
-                                            forceSelection: true,
-                                            queryMode: 'local',
-                                            store: 'cmbdocumentformat',
-                                            typeAhead: true,
-                                            valueField: 'format',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'datefield',
-                                            name: 'date',
-                                            fieldLabel: 'Date',
-                                            format: 'Y-m-d',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'link',
-                                            fieldLabel: 'Link',
-                                            allowBlank: false,
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            itemId: 'btnAddSml',
-                                            width: 30,
-                                            text: 'Add'
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'gridpanel',
-                                    height: 120,
-                                    itemId: 'gridSml',
-                                    minHeight: 120,
-                                    title: '',
-                                    forceFit: true,
-                                    store: 'griddocumentation',
-                                    viewConfig: {
-
-                                    },
-                                    dockedItems: [
-                                        {
-                                            xtype: 'toolbar',
-                                            itemId: 'gridToolbar',
-                                            dock: 'top',
-                                            items: [
-                                                {
-                                                    xtype: 'button',
-                                                    itemId: 'btnRemoveSml',
-                                                    text: 'Remove selected'
-                                                }
-                                            ]
-                                        }
-                                    ],
-                                    columns: [
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'description',
-                                            text: 'Description'
-                                        },
-                                        {
-                                            xtype: 'datecolumn',
-                                            dataIndex: 'date',
-                                            text: 'Date',
-                                            format: 'Y-m-d'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'format',
-                                            text: 'Format'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'link',
-                                            text: 'Link'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Interfaces (optional)',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    id: 'frmInterfaces',
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'interfaces',
-                                            fieldLabel: 'Name list (csv)',
-                                            emptyText: 'RS-232,RS-485,BLUETOOTH,WIFI,IR ...',
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            hidden: true,
-                            id: 'smlInputs',
-                            padding: 8,
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Inputs (optional)',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    height: 30,
-                                    itemId: 'frmSml',
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            itemId: 'cmbSml',
-                                            margin: '0 6 0 0',
-                                            name: 'name',
-                                            fieldLabel: '<span class=\'softLink\' onclick=\'alert(\"to do\");\'>Name</span>',
-                                            labelWidth: 40,
-                                            allowBlank: false,
-                                            displayField: 'name',
-                                            store: 'cmbphenomenon',
-                                            valueField: 'name',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'description',
-                                            fieldLabel: 'Description',
-                                            labelAlign: 'right',
-                                            labelWidth: 80,
-                                            allowBlank: false,
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            itemId: 'btnAddSml',
-                                            margin: '0 0 0 6',
-                                            width: 50,
-                                            text: 'Add'
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'gridpanel',
-                                    height: 120,
-                                    itemId: 'gridSml',
-                                    margin: 8,
-                                    minHeight: 120,
-                                    title: '',
-                                    store: 'gridinput',
-                                    viewConfig: {
-
-                                    },
-                                    dockedItems: [
-                                        {
-                                            xtype: 'toolbar',
-                                            itemId: 'gridToolbar',
-                                            dock: 'top',
-                                            items: [
-                                                {
-                                                    xtype: 'button',
-                                                    itemId: 'btnRemoveSml',
-                                                    text: 'Remove selected'
-                                                }
-                                            ]
-                                        }
-                                    ],
-                                    columns: [
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'name',
-                                            text: 'Name'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'description',
-                                            flex: 0.5,
-                                            text: 'Description'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'definition',
-                                            flex: 1,
-                                            text: 'Definition'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            id: 'smlIdentification',
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Identification (optional)',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    height: 30,
-                                    id: 'frmIdentification',
-                                    itemId: 'frmSml',
-                                    layout: {
-                                        align: 'stretch',
-                                        type: 'hbox'
-                                    },
-                                    title: '',
-                                    anchor: '100%',
-                                    items: [
-                                        {
-                                            xtype: 'combobox',
-                                            itemId: 'cmbSml',
-                                            margin: '0 6 0 0',
-                                            name: 'name',
-                                            fieldLabel: 'Name',
-                                            labelWidth: 40,
-                                            allowBlank: false,
-                                            displayField: 'name',
-                                            store: 'cmbidentification',
-                                            valueField: 'name',
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'value',
-                                            fieldLabel: 'Value',
-                                            labelAlign: 'right',
-                                            labelWidth: 40,
-                                            allowBlank: false,
-                                            flex: 1
-                                        },
-                                        {
-                                            xtype: 'button',
-                                            id: 'btnAddIdentification',
-                                            itemId: 'btnAddSml',
-                                            margin: '0 0 0 6',
-                                            width: 50,
-                                            text: 'Add'
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'gridpanel',
-                                    height: 120,
-                                    id: 'gridIdentification',
-                                    itemId: 'gridSml',
-                                    margin: 8,
-                                    minHeight: 120,
-                                    title: '',
-                                    store: 'grididentification',
-                                    viewConfig: {
-
-                                    },
-                                    dockedItems: [
-                                        {
-                                            xtype: 'toolbar',
-                                            itemId: 'gridToolbar',
-                                            dock: 'top',
-                                            items: [
-                                                {
-                                                    xtype: 'button',
-                                                    id: 'btnRemoveIdentification',
-                                                    itemId: 'btnRemoveSml',
-                                                    text: 'Remove selected'
-                                                }
-                                            ]
-                                        }
-                                    ],
-                                    columns: [
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'name',
-                                            text: 'Name'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'value',
-                                            flex: 0.5,
-                                            text: 'Value'
-                                        },
-                                        {
-                                            xtype: 'gridcolumn',
-                                            dataIndex: 'definition',
-                                            flex: 1,
-                                            text: 'Definition'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Characteristics (optional)',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    id: 'characteristics',
-                                    margin: 0,
-                                    padding: 0,
-                                    collapsed: false,
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'textfield',
-                                            name: 'characteristics',
-                                            fieldLabel: 'Technical specification sheet URL',
-                                            labelWidth: 210,
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            xtype: 'fieldset',
-                            checkboxToggle: true,
-                            collapsed: true,
-                            collapsible: true,
-                            title: 'Capabilities',
-                            items: [
-                                {
-                                    xtype: 'form',
-                                    border: 0,
-                                    id: 'frmCapabilities',
-                                    collapsed: false,
-                                    title: '',
-                                    items: [
-                                        {
-                                            xtype: 'fieldcontainer',
-                                            height: 30,
-                                            layout: {
-                                                type: 'column'
-                                            },
-                                            fieldLabel: 'Sampling time resolution',
-                                            labelWidth: 180,
-                                            items: [
-                                                {
-                                                    xtype: 'combobox',
-                                                    id: 'strCombo',
-                                                    fieldLabel: 'Label',
-                                                    hideLabel: true,
-                                                    displayField: 'combo',
-                                                    store: 'cmbcapabilitiesuom',
-                                                    valueField: 'uom',
-                                                    columnWidth: 0.5
-                                                },
-                                                {
-                                                    xtype: 'numberfield',
-                                                    id: 'strValue',
-                                                    fieldLabel: 'Value',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 60,
-                                                    columnWidth: 0.5
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            xtype: 'fieldcontainer',
-                                            height: 30,
-                                            id: 'MyFieldContainer8',
-                                            layout: {
-                                                type: 'column'
-                                            },
-                                            fieldLabel: 'Acquisition time resolution',
-                                            labelWidth: 180,
-                                            items: [
-                                                {
-                                                    xtype: 'combobox',
-                                                    id: 'atrCombo',
-                                                    fieldLabel: 'Label',
-                                                    hideLabel: true,
-                                                    displayField: 'combo',
-                                                    store: 'cmbcapabilitiesuom2',
-                                                    valueField: 'uom',
-                                                    columnWidth: 0.5
-                                                },
-                                                {
-                                                    xtype: 'numberfield',
-                                                    id: 'atrValue',
-                                                    fieldLabel: 'Value',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 60,
-                                                    columnWidth: 0.5
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            xtype: 'textfield',
-                                            id: 'storeTypeValue',
-                                            fieldLabel: 'Storage type',
-                                            labelWidth: 180,
-                                            anchor: '100%'
-                                        }
-                                    ]
-                                },
-                                {
-                                    xtype: 'fieldset',
-                                    id: 'smlCapabilities',
-                                    padding: 8,
-                                    collapsed: true,
-                                    collapsible: true,
-                                    title: 'Additional Capabilities (optional)',
-                                    items: [
-                                        {
-                                            xtype: 'form',
-                                            border: 0,
-                                            height: 30,
-                                            itemId: 'frmSml',
-                                            layout: {
-                                                align: 'stretch',
-                                                type: 'hbox'
-                                            },
-                                            title: '',
-                                            anchor: '100%',
-                                            items: [
-                                                {
-                                                    xtype: 'combobox',
-                                                    itemId: 'cmbSml',
-                                                    margin: '0 6 0 0',
-                                                    name: 'name',
-                                                    fieldLabel: 'Name',
-                                                    labelWidth: 60,
-                                                    allowBlank: false,
-                                                    displayField: 'combo',
-                                                    store: 'cmbCapabilities',
-                                                    valueField: 'name',
-                                                    flex: 1
-                                                },
-                                                {
-                                                    xtype: 'textfield',
-                                                    name: 'value',
-                                                    fieldLabel: 'Value',
-                                                    labelAlign: 'right',
-                                                    labelWidth: 60,
-                                                    allowBlank: false,
-                                                    flex: 1
-                                                },
-                                                {
-                                                    xtype: 'button',
-                                                    itemId: 'btnAddSml',
-                                                    margin: '0 0 0 6',
-                                                    width: 50,
-                                                    text: 'Add'
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            xtype: 'gridpanel',
-                                            height: 120,
-                                            itemId: 'gridSml',
-                                            margin: 8,
-                                            minHeight: 120,
-                                            title: '',
-                                            store: 'gridCapabilities',
-                                            viewConfig: {
-
-                                            },
-                                            dockedItems: [
-                                                {
-                                                    xtype: 'toolbar',
-                                                    itemId: 'gridToolbar',
-                                                    dock: 'top',
-                                                    items: [
-                                                        {
-                                                            xtype: 'button',
-                                                            itemId: 'btnRemoveSml',
-                                                            text: 'Remove selected'
-                                                        }
-                                                    ]
-                                                }
-                                            ],
-                                            columns: [
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'name',
-                                                    text: 'Name'
-                                                },
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'value',
-                                                    flex: 0.5,
-                                                    text: 'Value'
-                                                },
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'uom',
-                                                    text: 'Unit of measure'
-                                                },
-                                                {
-                                                    xtype: 'gridcolumn',
-                                                    dataIndex: 'definition',
-                                                    flex: 1,
-                                                    text: 'Definition'
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/proceduresList.js b/interface/app/view/ui/proceduresList.js
deleted file mode 100755
index 7c094ca..0000000
--- a/interface/app/view/ui/proceduresList.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * File: app/view/ui/proceduresList.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.proceduresList', {
-    extend: 'Ext.grid.Panel',
-
-    height: 400,
-    autoScroll: true,
-    forceFit: true,
-    store: 'procedurelist',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            dockedItems: [
-                {
-                    xtype: 'toolbar',
-                    dock: 'top',
-                    items: [
-                        {
-                            xtype: 'button',
-                            id: 'btnRemove',
-                            text: 'Delete selected'
-                        }
-                    ]
-                }
-            ],
-            viewConfig: {
-
-            },
-            columns: [
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'name',
-                    text: 'Name'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'description',
-                    text: 'Description'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'sensortype',
-                    text: 'Sensor Type'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'offerings',
-                    text: 'Offerings'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'observedproperties',
-                    text: 'Observedproperties'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'samplingTime',
-                    text: 'BeginPosition'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'samplingTime',
-                    text: 'EndPosition'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/provider.js b/interface/app/view/ui/provider.js
deleted file mode 100755
index 6bf17d2..0000000
--- a/interface/app/view/ui/provider.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * File: app/view/ui/provider.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.provider', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'displayfield',
-                    hidden: true,
-                    id: 'messageField',
-                    fieldStyle: 'color: red;',
-                    name: 'message',
-                    fieldLabel: 'Message',
-                    labelStyle: 'color: red;',
-                    anchor: '100%'
-                },
-                {
-                    xtype: 'fieldset',
-                    title: 'Service Provider:',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'providername',
-                            fieldLabel: 'Name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'providersite',
-                            fieldLabel: 'Web site',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactname',
-                            fieldLabel: 'Contact name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactposition',
-                            fieldLabel: 'Contact position',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactvoice',
-                            fieldLabel: 'Voice',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactfax',
-                            fieldLabel: 'Fax',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactemail',
-                            fieldLabel: 'Email',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactdeliverypoint',
-                            fieldLabel: 'Address',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactpostalcode',
-                            fieldLabel: 'Postal code',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactcity',
-                            fieldLabel: 'City',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactadminarea',
-                            fieldLabel: 'State',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactcountry',
-                            fieldLabel: 'Country',
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/qualityindexEditor.js b/interface/app/view/ui/qualityindexEditor.js
deleted file mode 100755
index f3300b0..0000000
--- a/interface/app/view/ui/qualityindexEditor.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * File: app/view/ui/qualityindexEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.qualityindexEditor', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'gridpanel',
-                    id: 'gridop',
-                    margin: 8,
-                    maxHeight: 250,
-                    title: '',
-                    forceFit: true,
-                    store: 'qistore',
-                    viewConfig: {
-
-                    },
-                    columns: [
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'code',
-                            text: 'Code'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'name',
-                            text: 'Name'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'description',
-                            text: 'Description'
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            dock: 'top',
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnNew',
-                                    text: 'New'
-                                },
-                                {
-                                    xtype: 'button',
-                                    disabled: true,
-                                    id: 'btnRemove',
-                                    text: 'Remove selected'
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'form',
-                    border: 0,
-                    hidden: true,
-                    id: 'frmQuality',
-                    bodyPadding: 10,
-                    title: '',
-                    trackResetOnLoad: true,
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            title: 'Quality index',
-                            items: [
-                                {
-                                    xtype: 'textfield',
-                                    id: 'opCode',
-                                    name: 'code',
-                                    fieldLabel: 'Code',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    id: 'opName',
-                                    name: 'name',
-                                    fieldLabel: 'Name',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    name: 'description',
-                                    fieldLabel: 'Description',
-                                    anchor: '100%'
-                                }
-                            ]
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            dock: 'bottom',
-                            layout: {
-                                pack: 'center',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnForm',
-                                    text: 'Insert'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/serviceEditor.js b/interface/app/view/ui/serviceEditor.js
deleted file mode 100755
index d6bdff8..0000000
--- a/interface/app/view/ui/serviceEditor.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * File: app/view/ui/serviceEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.serviceEditor', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'form',
-                    border: 0,
-                    id: 'frmServices',
-                    bodyPadding: 10,
-                    title: '',
-                    trackResetOnLoad: true,
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            title: 'Quality index',
-                            items: [
-                                {
-                                    xtype: 'textfield',
-                                    id: 'opService',
-                                    name: 'service',
-                                    fieldLabel: 'Name',
-                                    anchor: '100%'
-                                }
-                            ]
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            dock: 'bottom',
-                            layout: {
-                                pack: 'center',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnForm',
-                                    text: 'New'
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    xtype: 'gridpanel',
-                    id: 'gridop',
-                    margin: 8,
-                    title: '',
-                    forceFit: true,
-                    store: 'storeServices',
-                    viewConfig: {
-
-                    },
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            dock: 'top',
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnNew',
-                                    text: 'New'
-                                },
-                                {
-                                    xtype: 'button',
-                                    disabled: true,
-                                    id: 'btnRemove',
-                                    text: 'Remove'
-                                }
-                            ]
-                        }
-                    ],
-                    columns: [
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'service',
-                            text: 'Service'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'path',
-                            text: 'Path'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/serviceconfig.js b/interface/app/view/ui/serviceconfig.js
deleted file mode 100755
index b252f91..0000000
--- a/interface/app/view/ui/serviceconfig.js
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * File: app/view/ui/serviceconfig.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.serviceconfig', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'container',
-                    html: '<h3>Service Provider:</h3>Here you can personalize the service provider information. It will be displayed in the getCapabilities document.',
-                    padding: '10 0 10 0'
-                },
-                {
-                    xtype: 'fieldset',
-                    id: 'provider',
-                    padding: 10,
-                    checkboxName: 'cbprovider',
-                    checkboxToggle: true,
-                    collapsed: true,
-                    collapsible: true,
-                    title: 'check to apply customizations',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'providername',
-                            fieldLabel: 'Name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'providersite',
-                            fieldLabel: 'Web site',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactname',
-                            fieldLabel: 'Contact name',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactposition',
-                            fieldLabel: 'Contact position',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactvoice',
-                            fieldLabel: 'Voice',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactfax',
-                            fieldLabel: 'Fax',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactemail',
-                            fieldLabel: 'Email',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactdeliverypoint',
-                            fieldLabel: 'Address',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactpostalcode',
-                            fieldLabel: 'Postal code',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactcity',
-                            fieldLabel: 'City',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactadminarea',
-                            fieldLabel: 'State',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'contactcountry',
-                            fieldLabel: 'Country',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    html: '<h3>Service Identification:</h3>Here you can personalize..',
-                    padding: '10 0 10 0'
-                },
-                {
-                    xtype: 'fieldset',
-                    id: 'identification',
-                    padding: 10,
-                    checkboxName: 'cbidentification',
-                    checkboxToggle: true,
-                    collapsed: true,
-                    collapsible: true,
-                    title: 'check to apply customizations',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'title',
-                            fieldLabel: 'Title',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'abstract',
-                            fieldLabel: 'Abstract',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'keywords',
-                            fieldLabel: 'Keywords',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'fees',
-                            fieldLabel: 'Fees',
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'accessconstrains',
-                            fieldLabel: 'Access constrains',
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    html: '<h3>Coordinate system:</h3>Here you can personalize..',
-                    padding: '10 0 10 0'
-                },
-                {
-                    xtype: 'fieldset',
-                    id: 'geo',
-                    padding: 10,
-                    checkboxName: 'cbcoordinates',
-                    checkboxToggle: true,
-                    collapsed: true,
-                    collapsible: true,
-                    title: 'check to apply customizations',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'istsosepsg',
-                            fieldLabel: 'Default EPSG',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'allowedepsg',
-                            fieldLabel: 'Permitted EPSG',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'xaxisname',
-                            fieldLabel: 'X axis name',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'yaxisname',
-                            fieldLabel: 'Y axis name',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'textfield',
-                            name: 'zaxisname',
-                            fieldLabel: 'Z axis name',
-                            allowBlank: false,
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    html: '<h3>GetObservation configuration:</h3>Here you can personalize..',
-                    padding: '10 0 10 0'
-                },
-                {
-                    xtype: 'fieldset',
-                    id: 'getobservation',
-                    padding: 10,
-                    checkboxName: 'cbgetobservation',
-                    checkboxToggle: true,
-                    collapsed: true,
-                    collapsible: true,
-                    title: 'check to apply customizations',
-                    items: [
-                        {
-                            xtype: 'numberfield',
-                            name: 'maxgoperiod',
-                            fieldLabel: 'Max request interval (hours)',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'numberfield',
-                            name: 'defaultqi',
-                            fieldLabel: 'Default quality index',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'numberfield',
-                            name: 'aggregatenodataqi',
-                            fieldLabel: 'Aggregation no-data quality index',
-                            allowBlank: false,
-                            anchor: '100%'
-                        },
-                        {
-                            xtype: 'numberfield',
-                            name: 'aggregatenodata',
-                            fieldLabel: 'Aggregation no-data value',
-                            allowBlank: false,
-                            anchor: '100%'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'container',
-                    html: '<h3>Proxy URL:</h3>Here you can personalize..',
-                    padding: '10 0 10 0'
-                },
-                {
-                    xtype: 'fieldset',
-                    id: 'proxyurl',
-                    padding: 10,
-                    checkboxName: 'cbgetobservation',
-                    checkboxToggle: true,
-                    collapsed: true,
-                    collapsible: true,
-                    title: 'check to apply customizations',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'url',
-                            fieldLabel: 'Url',
-                            allowBlank: false,
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/serviceurl.js b/interface/app/view/ui/serviceurl.js
deleted file mode 100755
index 5fa2ecb..0000000
--- a/interface/app/view/ui/serviceurl.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * File: app/view/ui/serviceurl.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.serviceurl', {
-    extend: 'Ext.form.Panel',
-
-    border: 0,
-    bodyPadding: 10,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'fieldset',
-                    padding: 10,
-                    checkboxName: 'cbproxy',
-                    title: 'Proxy url',
-                    items: [
-                        {
-                            xtype: 'textfield',
-                            name: 'url',
-                            fieldLabel: 'Url',
-                            allowBlank: false,
-                            anchor: '100%'
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/status.js b/interface/app/view/ui/status.js
deleted file mode 100755
index 095cb5f..0000000
--- a/interface/app/view/ui/status.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * File: app/view/ui/status.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.status', {
-    extend: 'Ext.grid.Panel',
-
-    title: '',
-    forceFit: true,
-    store: 'serverstatus',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            viewConfig: {
-
-            },
-            columns: [
-                {
-                    xtype: 'gridcolumn',
-                    dataIndex: 'service',
-                    text: 'Service'
-                },
-                {
-                    xtype: 'numbercolumn',
-                    dataIndex: 'featuresOfInterest',
-                    text: 'Features Of Interest',
-                    format: 0
-                },
-                {
-                    xtype: 'numbercolumn',
-                    dataIndex: 'offerings',
-                    text: 'Offerings',
-                    format: 0
-                },
-                {
-                    xtype: 'numbercolumn',
-                    dataIndex: 'procedures',
-                    text: 'Procedures',
-                    format: 0
-                },
-                {
-                    xtype: 'numbercolumn',
-                    dataIndex: 'observedProperties',
-                    text: 'Observed Properties',
-                    format: 0
-                },
-                {
-                    xtype: 'gridcolumn',
-                    id: 'colAvailability',
-                    dataIndex: 'availability',
-                    text: 'Availability'
-                },
-                {
-                    xtype: 'gridcolumn',
-                    id: 'colDatabase',
-                    dataIndex: 'database',
-                    text: 'Database'
-                },
-                {
-                    xtype: 'booleancolumn',
-                    id: 'colGetcapabilities',
-                    dataIndex: 'getcapabilities',
-                    text: 'GetCapabilities'
-                },
-                {
-                    xtype: 'booleancolumn',
-                    id: 'colDescribesensor',
-                    dataIndex: 'describesensor',
-                    text: 'DescribeSensor'
-                },
-                {
-                    xtype: 'booleancolumn',
-                    id: 'colGetobservation',
-                    dataIndex: 'getobservation',
-                    text: 'GetObservation'
-                },
-                {
-                    xtype: 'booleancolumn',
-                    id: 'colGetfeatureofinterest',
-                    dataIndex: 'getfeatureofinterest',
-                    text: 'GetFeatureOfInterest'
-                },
-                {
-                    xtype: 'booleancolumn',
-                    id: 'colInsertobservation',
-                    dataIndex: 'insertobservation',
-                    text: 'InsertObservation'
-                },
-                {
-                    xtype: 'booleancolumn',
-                    id: 'colRegistersensor',
-                    dataIndex: 'registersensor',
-                    text: 'RegisterSensor'
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/app/view/ui/uomsEditor.js b/interface/app/view/ui/uomsEditor.js
deleted file mode 100755
index 0777837..0000000
--- a/interface/app/view/ui/uomsEditor.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * File: app/view/ui/uomsEditor.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('istsos.view.ui.uomsEditor', {
-    extend: 'Ext.panel.Panel',
-
-    border: 0,
-    title: '',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'gridpanel',
-                    id: 'gridop',
-                    margin: 8,
-                    maxHeight: 250,
-                    title: '',
-                    forceFit: true,
-                    store: 'griduoms',
-                    viewConfig: {
-
-                    },
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            dock: 'top',
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnNew',
-                                    text: 'New'
-                                },
-                                {
-                                    xtype: 'button',
-                                    disabled: true,
-                                    id: 'btnRemove',
-                                    text: 'Remove selected'
-                                }
-                            ]
-                        }
-                    ],
-                    columns: [
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'name',
-                            text: 'Code'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'description',
-                            text: 'Description'
-                        },
-                        {
-                            xtype: 'gridcolumn',
-                            dataIndex: 'procedures',
-                            text: 'Procedures'
-                        }
-                    ]
-                },
-                {
-                    xtype: 'form',
-                    border: 0,
-                    hidden: true,
-                    id: 'frmUoms',
-                    bodyPadding: 10,
-                    title: '',
-                    trackResetOnLoad: true,
-                    items: [
-                        {
-                            xtype: 'fieldset',
-                            title: 'Observed property',
-                            items: [
-                                {
-                                    xtype: 'textfield',
-                                    id: 'opName',
-                                    name: 'name',
-                                    fieldLabel: 'Code',
-                                    anchor: '100%'
-                                },
-                                {
-                                    xtype: 'textfield',
-                                    name: 'description',
-                                    fieldLabel: 'Description',
-                                    anchor: '100%'
-                                }
-                            ]
-                        }
-                    ],
-                    dockedItems: [
-                        {
-                            xtype: 'toolbar',
-                            ui: 'footer',
-                            dock: 'bottom',
-                            layout: {
-                                pack: 'center',
-                                type: 'hbox'
-                            },
-                            items: [
-                                {
-                                    xtype: 'button',
-                                    id: 'btnForm',
-                                    text: 'Insert'
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/css/main.css b/interface/css/main.css
deleted file mode 100755
index b93fa6b..0000000
--- a/interface/css/main.css
+++ /dev/null
@@ -1,636 +0,0 @@
-body {
-    background: #fff;
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-    /*font-family: tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif;*/
-    text-align:left !important;
-}
-
-.x-grid-checkheader {
-    height: 14px;
-    background-image: url('images/unchecked.gif');
-    background-position: 50% -2px;
-    background-repeat: no-repeat;
-    background-color: transparent;
-}
-
-.x-grid-checkheader-checked {
-    background-image: url('images/checked.gif');
-}
-
-.x-grid-checkheader-editor .x-form-cb-wrap {
-    text-align: center;
-}
-
-.mainHeader {
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif, cursive;
-    color: white;
-    background-color: green;
-    background-image :url(../images/header.png); 
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-.mainHeaderTitle {
-    font-weight: bold;
-    font-size: 24px;
-    color: white;
-    text-align: right;
-    padding-right: 10px;
-}
-.mainHeaderSubtitle {
-    font-size: 10px;
-}
-.mainHeaderTitleSmall {
-    font-weight: bold;
-    font-size: 10px;
-    color: white;
-    text-align: right;
-}
-.mainHeaderSubtitleSmall {
-    font-size: 8px;
-    color: white;
-}
-
-
-.submenu{
-    text-align: center;
-    color: darkolivegreen;
-    position: relative;
-    border-bottom: 4px transparent solid;
-
-}
-.submenuOver{
-    color: green;
-    text-align: center;
-    position: relative;
-    border-bottom: 5px grey solid;
-}
-.submenuSelect{
-    color: green;
-    text-align: center;
-    position: relative;
-    border-bottom: 5px green solid;
-}
-
-.submenuContent{
-    position: absolute;
-    bottom: 6;
-    text-align: center;
-    width: 100%;
-}
-.submenuIcon{
-    position: absolute;
-    top: 0;
-    text-align: center;
-    width: 100%;
-}
-
-.softLink {
-    color: blue;
-    text-decoration: underline;
-    cursor: pointer;
-    font-size: inherit;
-}
-
-.softLink:hover {
-    color: red; 
-    text-decoration: underline;
-    cursor: pointer;
-    font-size: inherit; 
-}
-
-.mainFooter {
-    font-weight: bold !important;
-    font-size: 10px !important;
-    color: white !important;
-    /*background-color: green !important;*/
-    text-align: center;
-
-
-    background: #008000 !important;
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
-    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
-    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
-    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
-
-}
-
-.menuHead {
-    /*font-family: 'Patrick Hand', cursive;*/
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif, cursive;
-    font-weight: bold;
-    font-size: 18px;
-    color: green;
-}
-
-.menuLink {
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif, cursive;
-    font-size: 16px;
-    color: green;
-    text-decoration: underline;
-    cursor: pointer;
-}
-
-.service_menu {
-    background-image: url(../images/icon/libreoffice-extension.png) !important;
-    background-repeat: no-repeat !important;
-}
-
-.tab_db {
-    background-image:url(../images/icon/server.png) !important;
-}
-.btn_border {
-    background-image:url(../images/icon/btn_border.png) !important;
-}
-.btn_border_hover {
-    background-image:url(../images/icon/btn_border_hover.png) !important;
-}
-
-.centerTitle {
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif;
-    font-weight: bold;
-    font-size: 18px;
-    color: white !important;
-    text-align: center;
-    border: 5px black solid !important;
-    /*border-right: 0;
-    border-bottom: 0;
-    border-top: 5px black solid !important;
-    border-left: 0;*/
-    background-color: green !important;
-}
-
-.centerBody {
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif;
-    font-size: 16px;
-    color: green;
-    border-right: 0;
-    border-bottom: 0;
-    border-color: green;
-}
-
-.x-form-item {
-    font-family: inherit;
-    font-size: inherit;
-    color: inherit;
-    /*border-right: inherit;
-    border-bottom: inherit;*/
-    border-color: inherit;
-}
-
-.x-fieldset-header {
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-    font-size: 11px !important;
-    color: green;
-}
-.x-fieldset {
-    border: 1px solid green !important;
-}
-
-/*ACCORDATION CSS*/
-.x-accordion-hd {
-    background: none repeat scroll 0 0 GREEN !important;
-    box-shadow: 0 0 0 0 #D9E7F8 inset;
-}
-.x-panel-header-text-default {
-    color: WHITE !important;
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-    font-size: 14px !important;
-    font-weight: bold;
-}
-.x-panel-collapsed .x-window-header-default, .x-panel-collapsed .x-panel-header-default {
-    border-color: BLACK !important;
-}
-
-/*.x-panel-header-default {
-    background-color: GREEN !important;
-    background-image: -moz-linear-gradient(center top , #DAE7F6, #CDDEF3 45%, #ABC7EC 46%, #ABC7EC 50%, #B8CFEE 51%, #CBDDF3) !important;
-    border-color: black !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    box-shadow: 0 1px 0 0 black inset !important;
-    font-size: 11px !important;
-    line-height: 15px !important;
-}*/
-
-.x-panel-header-default {
-    font-size: 11px !important;
-    line-height: 15px !important;
-    
-    border-color: GREEN !important;
-    border-width: 0px !important;
-    border-style: solid !important;
-    /*background-image: none !important;
-    background-color: GREEN !important;*/
-
-    background: #008000 !important;
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
-    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
-    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
-    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
-
-}
-
-/*LOADING MASK CSS*/
-.x-mask-msg {
-    background-color: GREEN !important;
-    border: 1px solid GREEN !important;
-}
-.x-mask-msg div {
-    background-color: white;
-    background-image: url("../images/icon/loading_white.gif");
-    background-position: 5px center;
-    background-repeat: no-repeat;
-    border: 1px solid white;
-    color: black;
-    cursor: wait;
-    font: 14px 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-}
-
-/*COLORE GENERALE DELLO SFONDO*/
-.x-border-layout-ct {
-    background-color: green !important;
-}
-
-
-.x-toolbar-default {
-    border: 0px !important;
-    border-color: black !important;
-    background-image: none !important;
-    /*background-color: green !important;*/
-
-    background: #008000 !important;
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMTAwJSI+CiAgICA8c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjN2Q3ZTdkIiBzdG9wLW9wYWNpdHk9IjEiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3 [...]
-    background: -moz-linear-gradient(-45deg,  #008000 0%, #0e0e0e 100%) !important;
-    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#008000), color-stop(100%,#0e0e0e)) !important;
-    background: -webkit-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: -o-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: -ms-linear-gradient(-45deg,  #008000 0%,#0e0e0e 100%) !important;
-    background: linear-gradient(135deg,  #008000 0%,#0e0e0e 100%) !important;
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', endColorstr='#0e0e0e',GradientType=1 ) !important;
-
-}
-
-.x-btn-default-toolbar-small-menu-active, .x-btn-default-toolbar-small-pressed {
-    border-color: green !important;
-    background-image: none !important;
-    background-color: green !important;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #19ab19), color-stop(48%, #20b320), color-stop(52%, #119511), color-stop(100%, #008000));
-    background-image: -webkit-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: -moz-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: -o-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: -ms-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-}
-/*
-.x-btn-inner {
-    color: white !important;
-}*/
-
-.x-grid-header-ct {
-    border: 1px solid green !important;
-}
-.x-panel .x-grid-body {
-    border-color: green !important;
-}
-.x-column-header {
-    font: 11px 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-}
-
-
-.x-grid-row-selected .x-grid-cell, .x-grid-row-selected .x-grid-rowwrap-div {
-    border-color: green !important;
-    background-color: #c2e8b8 !important;
-}
-
-.x-panel-default {
-    border-color: green !important;
-}
-
-
-.x-window-default {
-    background-color: green !important;
-}
-.x-window-header-text-default {
-    color: white !important;
-    font-family: 'Electrolize', sans-serif, tahoma, arial, verdana, sans-serif !important;
-}
-.x-message-box .x-window-body {
-    background-color: white !important;
-}
-.x-window-header-default-top {
-    background-color: green !important;
-}
-
-.x-btn-default-small-focus {
-    background-color: green !important;
-    background-image: none !important;
-    background-color: white !important;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, white), color-stop(48%, #F9F9F9), color-stop(52%, #E2E2E2), color-stop(100%, #E7E7E7)) !important;
-    background-image: -moz-linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
-    background-image: linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
-}
-.x-btn-default-small-over {
-    background-color: green !important;
-    background-image: none !important;
-    background-color: white !important;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, white), color-stop(48%, #F9F9F9), color-stop(52%, #E2E2E2), color-stop(100%, #E7E7E7)) !important;
-    background-image: -moz-linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
-    background-image: linear-gradient(top, white,#F9F9F9 48%,#E2E2E2 52%,#E7E7E7) !important;
-}
-
-.x-panel-body-default {
-    background: whitesmoke;
-    border-color: green !important;
-    color: black;
-    border-width: 1px;
-    border-style: solid;
-}
-
-
-
-.x-tab-bar {
-    background-color: transparent !important;
-    background-image: none;
-    /*background-color: green;
-    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #19ab19), color-stop(48%, #20b320), color-stop(52%, #119511), color-stop(100%, #008000));
-    background-image: -webkit-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: -moz-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: -o-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: -ms-linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    background-image: linear-gradient(top, #19ab19,#20b320 48%,#119511 52%,#008000);
-    font-size: 11px;*/
-}
-
-.x-tab-inner {
-    font-family: 'Electrolize', sans-serif, Tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-    color: white !important;
-}
-.x-tab-bar-body-default-plain {
-    background-color: white !important;
-}
-.x-tab-default-top {
-    background-color: grey !important;
-    background-image: none !important;
-}
-.x-tab-bar-body {
-    border-color: transparent !important;
-}
-.x-tab-top-active {
-    background-color: green !important;
-}
-.x-tab {
-    border-color: black !important;
-}
-.x-tab-default-top {
-    -moz-box-shadow: green 0 0 0 0 inset, green 0 0 0 0 inset, green 0 0 0 0 inset !important;
-    -webkit-box-shadow: green 0 0 0 0 inset, green 0 0 0 0 inset, green 0 0 0 0 inset !important;
-    -o-box-shadow: green 0 0 0 0 inset, green 0 0 0 0 inset, green 0 0 0 0 inset !important;
-    box-shadow: green 0px 0px 0px 0px inset, green 0px 0px 0px 0px inset, green 0px 0px 0px 0px inset !important;
-    border-bottom: 0px solid green !important;
-}
-.x-tab-bar-strip-default, .x-tab-bar-strip-default-plain {
-    border-color: green !important;
-    background-color: green !important;
-}
-
-.x-btn-default-small .x-btn-inner {
-    color: white !important;
-}
-
-.x-btn-default-small {
-    background-color: green !important;
-    background-image: none !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-
-.x-btn-inner {
-    font-family: 'Electrolize', sans-serif, tahoma, "Lucida Sans Unicode", "Lucida Grande", Verdana, sans-serif !important;
-    font-size: 16px !important;
-}
-
-.x-btn-group-default-framed {
-    background-color: white !important;
-}
-
-.x-btn-default-toolbar-small {
-    border-color: #cbcbcb !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-
-.x-btn-default-toolbar-small .x-btn-inner {
-    color: white !important;
-}
-
-.x-btn-default-toolbar-small-over {
-    background-color: green !important;
-    background-image:  none  !important;
-    border-color: white !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-.x-btn-default-toolbar-small-focus {
-    background-color: green !important;
-    background-image:  none  !important;
-    border-color: white !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-.x-btn-default-toolbar-small-menu-active, .x-btn-default-toolbar-small-pressed {
-    background-color: grey !important;
-    background-image:  none  !important;
-    border-color: black !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-
-.x-btn-default-small-over {
-    background-color: grey !important;
-    background-image:  none  !important;
-    border-color: white !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-.x-btn-default-small-focus {
-    background-color: green !important;
-    background-image: none  !important;
-    border-color: white !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-.x-btn-default-small-menu-active, .x-btn-default-small-pressed {
-    background-color: black !important;
-    background-image: none  !important;
-    border-color: green !important;
-    border-radius: 5px 5px 5px 5px !important;
-}
-
-.x-menu-body {
-    background: white !important;
-}
-
-.x-menu-item-active .x-menu-item-link {
-    background-color: lightgrey !important;
-    background-image: none !important;     
-    border: 1px solid green !important;
-    /*background-image: -moz-linear-gradient(center top , #E7F0FC, #C7DDF9);
-    border: 1px solid #A9CBF5;
-    border-radius: 3px 3px 3px 3px;
-    cursor: pointer;
-    margin: 0;*/
-}
-
-
-#chartCnt {
-    position: absolute;
-    left: 0px;
-    right: 0px;
-    top: 0px;
-    bottom: 0px;
-}
-
-.x-fieldset {
-    border-radius: 5px 5px 5px 5px !important;
-}
-
-.CodeMirror {
-    font-size: 14px !important;
-}
-
-.codemirror-scroll {
-    overflow: auto !important;
-}
-
-.x-tip {
-    background-color: white !important;
-}
-
-.x-tip {
-    border-color: green !important;
-}
-
-
-.x-datepicker-header {
-    position: relative;
-    height: 26px;
-    background-image: none;
-    background-color: green !important;
-}
-
-.x-datepicker-footer, .x-monthpicker-buttons {
-    position: relative;
-    border-top: 1px solid green;
-    background-image: none;
-    background-color: #00A800;
-}
-
-.x-datepicker {
-    border: 1px solid black !important;
-}
-
-table.x-datepicker-inner th {
-    color: white !important;
-    border-bottom: 1px solid black !important;
-    background-image: none !important;
-    background-color: #00A800 !important;
-}
-table.x-datepicker-inner .x-datepicker-selected a {
-    background-color: #00A800 !important;
-    border: 1px solid black !important;
-    color: white !important;
-}
-
-.x-form-text, textarea.x-form-field {
-    border-color: #00A800 !important;
-}
-
-.x-boundlist-item-over{
-    background: green !important;
-    border-color: lightgrey !important;
-    color: white !important;
-}
-
-.x-boundlist {
-    border-color: green !important;
-}
-
-.x-boundlist-selected {
-    background: #00A800 !important;
-    border-color: green !important;
-}
-
-/*.dygraph-ylabel { 
-    font-size: 18px; 
-    text-shadow: gray -2px 2px 2px; 
-    height: 40px;
-}*/
-
-.dygraph-axis-label-x{
-    height: 30px;
-}
-
-.pchooserBtnVisible {
-    position: absolute;
-    left: 5px;
-    top: 2px;
-    width: 16px;
-    height: 16px;
-    background-image :url(../images/eye.png);
-    background-repeat: no-repeat;
-    background-position: center center;
-    cursor: pointer;
-} 
-.pchooserBtnNotVisible {
-    background-image :url(../images/forbidden.png) !important;
-    background-repeat: no-repeat;
-    background-position: center center;
-} 
-
-.pchooserBtnColor {
-    position: absolute;
-    right: 26px;
-    top: 3px;
-    width: 16px;
-    height: 16px;
-    cursor: pointer;
-    border: thin solid whitesmoke;
-} 
-.pchooserBtnRemove {
-    position: absolute;
-    right: 8px;
-    top: 3px;
-    width: 16px;
-    height: 16px;
-    font-size: 14;
-    font-weight: bolder;
-    cursor: pointer;
-} 
-
-.pchooser {
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    margin-bottom: 10px; 
-    border: thin solid green; 
-    width: 100%;
-    font-family: monospace;
-}
-
-/*.pchooser td {
-    padding: 2px 4px 2px 4px;    
-}*/
-
-.viewerChart {
-    background-image :url(../images/istsos-logo.png);
-    background-repeat: no-repeat;
-    background-position: center center;
-}
-
-
-.x-toolbar .x-toolbar-text {
-    color: white !important;
-}
-
-
diff --git a/interface/designer.html b/interface/designer.html
deleted file mode 100755
index a866ed9..0000000
--- a/interface/designer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Auto Generated with Ext Designer -->
-<!-- Modifications to this file will be overwritten. -->
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>istsos.xds</title>
-    <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-    <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-    <script type="text/javascript" src="designer.js"></script>
-</head>
-<body></body>
-</html>
\ No newline at end of file
diff --git a/interface/designer.js b/interface/designer.js
deleted file mode 100755
index 0ac1835..0000000
--- a/interface/designer.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * File: designer.js
- * Date: Tue Jan 28 2014 17:15:56 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.3.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.Loader.setConfig({
-    enabled: true
-});
-
-Ext.application({
-    name: 'istsos',
-
-    stores: [
-        'DataQualityStore',
-        'Offerings',
-        'Procedures',
-        'ObservedProperties',
-        'Observations',
-        'serverstatus',
-        'Fake',
-        'Constraint',
-        'cmbIdentification',
-        'cmbSml',
-        'gridOutputs',
-        'cmbSystemType',
-        'cmbName',
-        'cmbNameDescription',
-        'Services',
-        'gridDocumentation',
-        'cmbDocumentFormat',
-        'gridProceduresList',
-        'vplist',
-        'gridObservedProperties',
-        'gridUoms',
-        'gridOfferings',
-        'MyArrayStore',
-        'RatingCurve'
-    ],
-
-    launch: function() {
-        Ext.QuickTips.init();
-
-        var cmp1 = Ext.create('istsos.view.MainPanel', {
-            renderTo: Ext.getBody()
-        });
-        cmp1.show();
-        var cmp2 = Ext.create('istsos.view.BasePage', {
-            renderTo: Ext.getBody()
-        });
-        cmp2.show();
-        var cmp3 = Ext.create('istsos.view.contactinfo', {
-            renderTo: Ext.getBody()
-        });
-        cmp3.show();
-        var cmp4 = Ext.create('istsos.view.paths', {
-            renderTo: Ext.getBody()
-        });
-        cmp4.show();
-        var cmp5 = Ext.create('istsos.view.about', {
-            renderTo: Ext.getBody()
-        });
-        cmp5.show();
-        var cmp6 = Ext.create('istsos.view.contacts', {
-            renderTo: Ext.getBody()
-        });
-        cmp6.show();
-        var cmp7 = Ext.create('istsos.view.identification', {
-            renderTo: Ext.getBody()
-        });
-        cmp7.show();
-        var cmp8 = Ext.create('istsos.view.provider', {
-            renderTo: Ext.getBody()
-        });
-        cmp8.show();
-        var cmp9 = Ext.create('istsos.view.config', {
-            renderTo: Ext.getBody()
-        });
-        cmp9.show();
-        var cmp10 = Ext.create('istsos.view.geo', {
-            renderTo: Ext.getBody()
-        });
-        cmp10.show();
-        var cmp11 = Ext.create('istsos.view.getobservation', {
-            renderTo: Ext.getBody()
-        });
-        cmp11.show();
-        var cmp12 = Ext.create('istsos.view.database', {
-            renderTo: Ext.getBody()
-        });
-        cmp12.show();
-        var cmp13 = Ext.create('istsos.view.serviceurl', {
-            renderTo: Ext.getBody()
-        });
-        cmp13.show();
-        var cmp14 = Ext.create('istsos.view.procedure', {
-            renderTo: Ext.getBody()
-        });
-        cmp14.show();
-        var cmp15 = Ext.create('istsos.view.newservice', {
-            renderTo: Ext.getBody()
-        });
-        cmp15.show();
-        var cmp16 = Ext.create('istsos.view.FormDataQuality', {
-            renderTo: Ext.getBody()
-        });
-        cmp16.show();
-        var cmp17 = Ext.create('istsos.view.ObservationEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp17.show();
-        var cmp18 = Ext.create('istsos.view.ObservationEditorColumn', {
-            renderTo: Ext.getBody()
-        });
-        cmp18.show();
-        var cmp19 = Ext.create('istsos.view.serviceconfig', {
-            renderTo: Ext.getBody()
-        });
-        cmp19.show();
-        var cmp20 = Ext.create('istsos.view.status', {
-            renderTo: Ext.getBody()
-        });
-        cmp20.show();
-        var cmp21 = Ext.create('istsos.view.proceduresList', {
-            renderTo: Ext.getBody()
-        });
-        cmp21.show();
-        var cmp22 = Ext.create('istsos.view.obsPropEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp22.show();
-        var cmp23 = Ext.create('istsos.view.uomsEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp23.show();
-        var cmp24 = Ext.create('istsos.view.qualityindexEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp24.show();
-        var cmp25 = Ext.create('istsos.view.serviceEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp25.show();
-        var cmp26 = Ext.create('istsos.view.offeringsEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp26.show();
-        var cmp27 = Ext.create('istsos.view.MainMenu2', {
-            renderTo: Ext.getBody()
-        });
-        cmp27.show();
-        var cmp28 = Ext.create('istsos.view.ObservationEditorAdvancedOperations', {
-            renderTo: Ext.getBody()
-        });
-        cmp28.show();
-        var cmp29 = Ext.create('istsos.view.Calc', {
-            renderTo: Ext.getBody()
-        });
-        cmp29.show();
-        var cmp30 = Ext.create('istsos.view.CheckColumn', {
-            renderTo: Ext.getBody()
-        });
-        cmp30.show();
-        var cmp31 = Ext.create('istsos.view.ChartContainer', {
-            renderTo: Ext.getBody()
-        });
-        cmp31.show();
-        var cmp32 = Ext.create('istsos.view.TestCsv', {
-            renderTo: Ext.getBody()
-        });
-        cmp32.show();
-        var cmp33 = Ext.create('istsos.view.Viewer', {
-            renderTo: Ext.getBody()
-        });
-        cmp33.show();
-        var cmp34 = Ext.create('istsos.view.Editor1', {
-            renderTo: Ext.getBody()
-        });
-        cmp34.show();
-        var cmp35 = Ext.create('istsos.view.VirtualProcedureEditor', {
-            renderTo: Ext.getBody()
-        });
-        cmp35.show();
-    }
-});
diff --git a/interface/designer_includeOrder.txt b/interface/designer_includeOrder.txt
deleted file mode 100755
index 37b1fa2..0000000
--- a/interface/designer_includeOrder.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-<script type="text/javascript" src="app/view/ui/MainPanel.js"></script>
-<script type="text/javascript" src="app/view/MainPanel.js"></script>
-<script type="text/javascript" src="app/view/ui/BasePage.js"></script>
-<script type="text/javascript" src="app/view/BasePage.js"></script>
-<script type="text/javascript" src="app/view/ui/contactinfo.js"></script>
-<script type="text/javascript" src="app/view/contactinfo.js"></script>
-<script type="text/javascript" src="app/view/ui/paths.js"></script>
-<script type="text/javascript" src="app/view/paths.js"></script>
-<script type="text/javascript" src="app/view/ui/about.js"></script>
-<script type="text/javascript" src="app/view/about.js"></script>
-<script type="text/javascript" src="app/view/ui/contacts.js"></script>
-<script type="text/javascript" src="app/view/contacts.js"></script>
-<script type="text/javascript" src="app/view/ui/identification.js"></script>
-<script type="text/javascript" src="app/view/identification.js"></script>
-<script type="text/javascript" src="app/view/ui/provider.js"></script>
-<script type="text/javascript" src="app/view/provider.js"></script>
-<script type="text/javascript" src="app/view/ui/config.js"></script>
-<script type="text/javascript" src="app/view/config.js"></script>
-<script type="text/javascript" src="app/view/ui/geo.js"></script>
-<script type="text/javascript" src="app/view/geo.js"></script>
-<script type="text/javascript" src="app/view/ui/getobservation.js"></script>
-<script type="text/javascript" src="app/view/getobservation.js"></script>
-<script type="text/javascript" src="app/view/ui/database.js"></script>
-<script type="text/javascript" src="app/view/database.js"></script>
-<script type="text/javascript" src="app/view/ui/serviceurl.js"></script>
-<script type="text/javascript" src="app/view/serviceurl.js"></script>
-<script type="text/javascript" src="app/view/ui/procedure.js"></script>
-<script type="text/javascript" src="app/view/procedure.js"></script>
-<script type="text/javascript" src="app/view/ui/newservice.js"></script>
-<script type="text/javascript" src="app/view/newservice.js"></script>
-<script type="text/javascript" src="app/view/ui/FormDataQuality.js"></script>
-<script type="text/javascript" src="app/view/FormDataQuality.js"></script>
-<script type="text/javascript" src="app/view/ui/ObservationEditor.js"></script>
-<script type="text/javascript" src="app/view/ObservationEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/ObservationEditorColumn.js"></script>
-<script type="text/javascript" src="app/view/ObservationEditorColumn.js"></script>
-<script type="text/javascript" src="app/view/ui/serviceconfig.js"></script>
-<script type="text/javascript" src="app/view/serviceconfig.js"></script>
-<script type="text/javascript" src="app/view/ui/status.js"></script>
-<script type="text/javascript" src="app/view/status.js"></script>
-<script type="text/javascript" src="app/view/ui/proceduresList.js"></script>
-<script type="text/javascript" src="app/view/proceduresList.js"></script>
-<script type="text/javascript" src="app/view/ui/obsPropEditor.js"></script>
-<script type="text/javascript" src="app/view/obsPropEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/uomsEditor.js"></script>
-<script type="text/javascript" src="app/view/uomsEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/qualityindexEditor.js"></script>
-<script type="text/javascript" src="app/view/qualityindexEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/serviceEditor.js"></script>
-<script type="text/javascript" src="app/view/serviceEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/offeringsEditor.js"></script>
-<script type="text/javascript" src="app/view/offeringsEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/MainMenu2.js"></script>
-<script type="text/javascript" src="app/view/MainMenu2.js"></script>
-<script type="text/javascript" src="app/view/ui/ObservationEditorAdvancedOperations.js"></script>
-<script type="text/javascript" src="app/view/ObservationEditorAdvancedOperations.js"></script>
-<script type="text/javascript" src="app/view/ui/Chart.js"></script>
-<script type="text/javascript" src="app/view/Chart.js"></script>
-<script type="text/javascript" src="app/view/ui/Calc.js"></script>
-<script type="text/javascript" src="app/view/Calc.js"></script>
-<script type="text/javascript" src="app/view/ui/CheckColumn.js"></script>
-<script type="text/javascript" src="app/view/CheckColumn.js"></script>
-<script type="text/javascript" src="app/view/ui/ChartContainer.js"></script>
-<script type="text/javascript" src="app/view/ChartContainer.js"></script>
-<script type="text/javascript" src="app/view/ui/TestCsv.js"></script>
-<script type="text/javascript" src="app/view/TestCsv.js"></script>
-<script type="text/javascript" src="app/view/ui/Viewer.js"></script>
-<script type="text/javascript" src="app/view/Viewer.js"></script>
-<script type="text/javascript" src="app/view/ui/Editor1.js"></script>
-<script type="text/javascript" src="app/view/Editor1.js"></script>
-<script type="text/javascript" src="app/view/ui/ProcedureChooser.js"></script>
-<script type="text/javascript" src="app/view/ProcedureChooser.js"></script>
-<script type="text/javascript" src="app/view/ui/ProcedurePlotter.js"></script>
-<script type="text/javascript" src="app/view/ProcedurePlotter.js"></script>
-<script type="text/javascript" src="app/view/ui/ProcedureChart.js"></script>
-<script type="text/javascript" src="app/view/ProcedureChart.js"></script>
-<script type="text/javascript" src="app/view/ui/ProcedureGrid.js"></script>
-<script type="text/javascript" src="app/view/ProcedureGrid.js"></script>
-<script type="text/javascript" src="app/view/ui/ProcedureGridEditor.js"></script>
-<script type="text/javascript" src="app/view/ProcedureGridEditor.js"></script>
-<script type="text/javascript" src="app/view/ui/VirtualProcedureEditor.js"></script>
-<script type="text/javascript" src="app/view/VirtualProcedureEditor.js"></script>
-<script type="text/javascript" src="app/store/DataQualityStore.js"></script>
-<script type="text/javascript" src="app/store/Offerings.js"></script>
-<script type="text/javascript" src="app/store/Procedures.js"></script>
-<script type="text/javascript" src="app/store/ObservedProperties.js"></script>
-<script type="text/javascript" src="app/store/Observations.js"></script>
-<script type="text/javascript" src="app/store/serverstatus.js"></script>
-<script type="text/javascript" src="app/store/Fake.js"></script>
-<script type="text/javascript" src="app/store/Constraint.js"></script>
-<script type="text/javascript" src="app/store/cmbIdentification.js"></script>
-<script type="text/javascript" src="app/store/cmbSml.js"></script>
-<script type="text/javascript" src="app/store/gridOutputs.js"></script>
-<script type="text/javascript" src="app/store/cmbSystemType.js"></script>
-<script type="text/javascript" src="app/store/cmbName.js"></script>
-<script type="text/javascript" src="app/store/cmbNameDescription.js"></script>
-<script type="text/javascript" src="app/store/Services.js"></script>
-<script type="text/javascript" src="app/store/gridDocumentation.js"></script>
-<script type="text/javascript" src="app/store/cmbDocumentFormat.js"></script>
-<script type="text/javascript" src="app/store/gridProceduresList.js"></script>
-<script type="text/javascript" src="app/store/vplist.js"></script>
-<script type="text/javascript" src="app/store/gridObservedProperties.js"></script>
-<script type="text/javascript" src="app/store/gridUoms.js"></script>
-<script type="text/javascript" src="app/store/gridOfferings.js"></script>
-<script type="text/javascript" src="app/store/MyArrayStore.js"></script>
-<script type="text/javascript" src="app/store/RatingCurve.js"></script>
diff --git a/interface/dev.html b/interface/dev.html
deleted file mode 100755
index 1dc3633..0000000
--- a/interface/dev.html
+++ /dev/null
@@ -1,223 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>istSOS webadmin developer page</title>
-        <link rel="stylesheet" type="text/css" href="ext-dev/resources/css/ext-all.css"/>
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-
-        <link href='http://fonts.googleapis.com/css?family=Exo' rel='stylesheet' type='text/css'>
-        <!--
-        <link href='http://fonts.googleapis.com/css?family=Patrick+Hand' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Nova+Square' rel='stylesheet' type='text/css'>
-        -->
-        <script type="text/javascript" src="ext-dev/ext-all-debug.js"></script>
-
-        <script type="text/javascript" src="app/engine/wa.js"></script>
-        <script type="text/javascript" src="app/engine/pageConfig.js"></script>
-        <script type="text/javascript" src="app/engine/pageManager.js"></script>
-
-        <script type="text/javascript">
-            function ISO8601FromDate(isodate) {
-                function pad(n){return n<10 ? '0'+n : n}
-                var offset = isodate.getTimezoneOffset()/-60;
-                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
-                return isodate.getFullYear()+'-'
-                    + pad(isodate.getMonth()+1)+'-'
-                    + pad(isodate.getDate())+'T'
-                    + pad(isodate.getHours())+':'
-                    + pad(isodate.getMinutes())+':'
-                    + pad(isodate.getSeconds())+'.'
-                    + isodate.getMilliseconds() + tz;
-            }
-            String.prototype.capitalize = function(){
-                return this.toLowerCase().replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
-            };
-            Ext.override(Ext.layout.Layout, {
-                renderItem: function(item, target, position) {
-                    if (item && !item.rendered && item.isFieldLabelable && item.fieldLabel && item.allowBlank == false) {
-                        item.fieldLabel = '<span title="This is a mandatory parameter">' + item.fieldLabel + '<span style="color:red">*</span></span>';
-                    }
-                    this.callOverridden(arguments);
-                }
-            });
-            Ext.override(Ext.view.DropZone, {  
-                onNodeDrop: function (node, dragZone, e, data) {
-                    var me = this,
-                    dropHandled = false,
-                    dropHandlers = {
-                        wait : false,
-                        processDrop : function () {
-                            me.invalidateDrop();
-                            me.handleNodeDrop(data, me.overRecord, me.currentPosition);
-                            dropHandled = true;
-                            me.fireViewEvent('drop', node, data, me.overRecord, me.currentPosition);
-                        },
-                        cancelDrop : function () {
-                            me.invalidateDrop();
-                            dropHandled = true;
-                        }
-                    },
-                    performOperation = false;
-                    if (me.valid) {
-                        performOperation = me.fireViewEvent('beforedrop', node, data, me.overRecord, me.currentPosition, dropHandlers);
-                        if (dropHandlers.wait) {
-                            return;
-                        }
-                        if (performOperation !== false) {
-                            if (!dropHandled) {
-                                dropHandlers.processDrop();
-                            }
-                        }
-                    }
-                    return performOperation;
-                }
-            });
-        </script>
-
-        <!-- DEVELOPERS INCLUDE -->
-        <script type="text/javascript" src="app/view/ui/MainPanel.js"></script>
-        <script type="text/javascript" src="app/view/MainPanel.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/BasePage.js"></script>
-        <script type="text/javascript" src="app/view/BasePage.js"></script>
-        <script type="text/javascript" src="app/view/ui/CenterPage.js"></script>
-        <script type="text/javascript" src="app/view/ui/WizardPage.js"></script>
-
-
-        <script type="text/javascript" src="app/view/ui/BasePage.js"></script>
-        <script type="text/javascript" src="app/view/BasePage.js"></script>
-        <script type="text/javascript" src="app/view/ui/contactinfo.js"></script>
-        <script type="text/javascript" src="app/view/contactinfo.js"></script>
-        <script type="text/javascript" src="app/view/ui/paths.js"></script>
-        <script type="text/javascript" src="app/view/paths.js"></script>
-        <script type="text/javascript" src="app/view/ui/about.js"></script>
-        <script type="text/javascript" src="app/view/about.js"></script>
-        <script type="text/javascript" src="app/view/ui/contacts.js"></script>
-        <script type="text/javascript" src="app/view/contacts.js"></script>
-        <script type="text/javascript" src="app/view/ui/config.js"></script>
-        <script type="text/javascript" src="app/view/config.js"></script>
-        <script type="text/javascript" src="app/view/ui/database.js"></script>
-        <script type="text/javascript" src="app/view/database.js"></script>
-        <script type="text/javascript" src="app/view/ui/newservice.js"></script>
-        <script type="text/javascript" src="app/view/newservice.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/identification.js"></script>
-        <script type="text/javascript" src="app/view/identification.js"></script>
-        <script type="text/javascript" src="app/view/ui/provider.js"></script>
-        <script type="text/javascript" src="app/view/provider.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/FormDataQuality.js"></script>
-        <script type="text/javascript" src="app/view/FormDataQuality.js"></script>
-        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
-
-
-        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
-        <script type="text/javascript" src="app/store/Offerings.js"></script>
-        <script type="text/javascript" src="app/store/Procedures.js"></script>
-        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
-        <script type="text/javascript" src="app/store/Observations.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/ObservationEditorColumn.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditorColumn.js"></script>
-        <script type="text/javascript" src="app/view/ui/ObservationEditor.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditor.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/serviceconfig.js"></script>
-        <script type="text/javascript" src="app/view/serviceconfig.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/geo.js"></script>
-        <script type="text/javascript" src="app/view/geo.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/getobservation.js"></script>
-        <script type="text/javascript" src="app/view/getobservation.js"></script>
-
-        <script type="text/javascript" src="app/store/serverstatus.js"></script>
-
-
-        <script type="text/javascript" src="app/view/ui/status.js"></script>
-        <script type="text/javascript" src="app/view/status.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/serviceurl.js"></script>
-        <script type="text/javascript" src="app/view/serviceurl.js"></script>
-
-        <script type="text/javascript" src="app/store/cmbIdentification.js"></script>
-        <script type="text/javascript" src="app/store/cmbSystemType.js"></script>
-        <script type="text/javascript" src="app/store/cmbSml.js"></script>
-        <script type="text/javascript" src="app/store/cmbName.js"></script>
-        <script type="text/javascript" src="app/store/cmbDocumentFormat.js"></script>
-        <script type="text/javascript" src="app/store/gridDocumentation.js"></script>
-        <script type="text/javascript" src="app/store/gridOutputs.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/procedure.js"></script>
-        <script type="text/javascript" src="app/view/procedure.js"></script>
-
-        <script type="text/javascript" src="app/store/gridProceduresList.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/proceduresList.js"></script>
-        <script type="text/javascript" src="app/view/proceduresList.js"></script>
-
-        <script type="text/javascript" src="app/store/gridObservedProperties.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/obsPropEditor.js"></script>
-        <script type="text/javascript" src="app/view/obsPropEditor.js"></script>
-        <script type="text/javascript" src="app/view/uomsEditor.js"></script>
-
-        <script type="text/javascript" src="app/store/gridOfferings.js"></script>
-        <script type="text/javascript" src="app/view/ui/offeringsEditor.js"></script>
-        <script type="text/javascript" src="app/view/offeringsEditor.js"></script>
-
-        <script type="text/javascript" src="app/store/cmbNameDescription.js"></script>
-        <script type="text/javascript" src="app/view/ui/qualityindexEditor.js"></script>
-        <script type="text/javascript" src="app/view/qualityindexEditor.js"></script>
-
-
-        <script type="text/javascript">
-            
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-            
-            Ext.application({
-                name: 'istsos',
-
-                launch: function() {
-                    Ext.QuickTips.init();
-                    
-                    Ext.Ajax.on("requestexception",function(conn, response, options, eOpts ){
-                        try{
-                            var json = Ext.decode(response.responseText);
-                            if(!json.success && !Ext.isEmpty(json.message)){
-                                Ext.Msg.alert(response.statusText, json.message);
-                            }
-                        }catch(e){
-                            console.error(response);
-                        }
-                    });
-                    Ext.Ajax.on("requestcomplete",function(conn, response, options, eOpts ){
-                        try{
-                            var json = Ext.decode(response.responseText);
-                            if(!json.success && !Ext.isEmpty(json.message)){
-                                Ext.Msg.alert("Server message", "\"" + json.message + "\"<br/><br/>" + 
-                                    "<small>Status response: " + response.statusText + "</small>");
-                                console.error(json.message);
-                            }else if (json.success && !Ext.isEmpty(json.message)){
-                                console.log(json.message);
-                            }
-                        }catch(e){
-                            console.error(response);
-                        }
-                    });
-                    
-                    
-                    
-                    var cmp1 = Ext.create('istsos.view.MainPanel', {
-                        renderTo: Ext.getBody()
-                    });
-                    cmp1.show();
-                }
-            });
-        
-        </script>
-    </head>
-    <body></body>
-</html>
diff --git a/interface/ext/resources/themes/images/access/box/tb-blue.gif b/interface/ext/resources/themes/images/access/box/tb-blue.gif
deleted file mode 100755
index 4b1382c..0000000
Binary files a/interface/ext/resources/themes/images/access/box/tb-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-corners.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-corners.gif
deleted file mode 100755
index a566e9e..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-notitle-corners.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-notitle-corners.gif
deleted file mode 100755
index a566e9e..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-notitle-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-notitle-sides.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-notitle-sides.gif
deleted file mode 100755
index fef2284..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-notitle-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-sides.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-sides.gif
deleted file mode 100755
index 3334e4f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-default-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-corners.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-corners.gif
deleted file mode 100755
index af08662..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-notitle-corners.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-notitle-corners.gif
deleted file mode 100755
index 54fd6eb..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-notitle-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-notitle-sides.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-notitle-sides.gif
deleted file mode 100755
index 0aaf799..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-notitle-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-sides.gif b/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-sides.gif
deleted file mode 100755
index af4e726..0000000
Binary files a/interface/ext/resources/themes/images/access/btn-group/btn-group-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-bg.gif
deleted file mode 100755
index 87148ee..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-corners.gif
deleted file mode 100755
index 64b4423..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-bg.gif
deleted file mode 100755
index 33c469e..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-corners.gif
deleted file mode 100755
index 67310a1..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-sides.gif
deleted file mode 100755
index f2751fa..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-bg.gif
deleted file mode 100755
index ce9e359..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-corners.gif
deleted file mode 100755
index dc53444..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-sides.gif
deleted file mode 100755
index 63b96f2..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-over-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-over-bg.gif
deleted file mode 100755
index a9adb0d..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-over-corners.gif
deleted file mode 100755
index dc53444..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-over-sides.gif
deleted file mode 100755
index 768e07b..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-bg.gif
deleted file mode 100755
index 845885b..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-corners.gif
deleted file mode 100755
index b147bdf..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-sides.gif
deleted file mode 100755
index 57fbcb9..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-large-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-large-sides.gif
deleted file mode 100755
index 39f35ea..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-large-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-bg.gif
deleted file mode 100755
index 14cf679..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-corners.gif
deleted file mode 100755
index 64b4423..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-bg.gif
deleted file mode 100755
index 2c35b3b..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-corners.gif
deleted file mode 100755
index 0a092cd..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-sides.gif
deleted file mode 100755
index 9f79ef6..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-bg.gif
deleted file mode 100755
index f522fc8..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-corners.gif
deleted file mode 100755
index d404d0f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-sides.gif
deleted file mode 100755
index 2fa7f1a..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-bg.gif
deleted file mode 100755
index f522fc8..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-corners.gif
deleted file mode 100755
index d404d0f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-sides.gif
deleted file mode 100755
index 2fa7f1a..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-bg.gif
deleted file mode 100755
index 95828bd..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-corners.gif
deleted file mode 100755
index 6e70c65..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-sides.gif
deleted file mode 100755
index e4738d5..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-medium-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-medium-sides.gif
deleted file mode 100755
index 553ed4b..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-medium-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-bg.gif
deleted file mode 100755
index 23cfa11..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-corners.gif
deleted file mode 100755
index 1c31353..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-bg.gif
deleted file mode 100755
index d39b545..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-corners.gif
deleted file mode 100755
index 0a092cd..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-sides.gif
deleted file mode 100755
index 109ca82..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-bg.gif
deleted file mode 100755
index 78775ba..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-corners.gif
deleted file mode 100755
index e190818..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-sides.gif
deleted file mode 100755
index affc4b3..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-over-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-over-bg.gif
deleted file mode 100755
index 78775ba..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-over-corners.gif
deleted file mode 100755
index 07dda54..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-over-sides.gif
deleted file mode 100755
index affc4b3..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-bg.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-bg.gif
deleted file mode 100755
index 5542914..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-corners.gif
deleted file mode 100755
index 6e70c65..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-sides.gif
deleted file mode 100755
index 6411971..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-small-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-small-sides.gif
deleted file mode 100755
index d6203ef..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-small-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-corners.gif
deleted file mode 100755
index ff76693..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-disabled-corners.gif
deleted file mode 100755
index ff76693..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-disabled-sides.gif
deleted file mode 100755
index 28cf5d5..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-focus-corners.gif
deleted file mode 100755
index 6bd98f0..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-focus-sides.gif
deleted file mode 100755
index ab6770a..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-over-corners.gif
deleted file mode 100755
index 6bd98f0..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-over-sides.gif
deleted file mode 100755
index ab6770a..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-pressed-corners.gif
deleted file mode 100755
index 44c0031..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-pressed-sides.gif
deleted file mode 100755
index a1b6cfe..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-sides.gif
deleted file mode 100755
index 28cf5d5..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-large-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-corners.gif
deleted file mode 100755
index ff76693..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-disabled-corners.gif
deleted file mode 100755
index ff76693..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-disabled-sides.gif
deleted file mode 100755
index d1e5001..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-focus-corners.gif
deleted file mode 100755
index a5b0f5f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-focus-sides.gif
deleted file mode 100755
index e359f4b..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-over-corners.gif
deleted file mode 100755
index a5b0f5f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-over-sides.gif
deleted file mode 100755
index e359f4b..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-pressed-corners.gif
deleted file mode 100755
index 527e49f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-pressed-sides.gif
deleted file mode 100755
index 3eaaf74..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-sides.gif
deleted file mode 100755
index d1e5001..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-medium-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-corners.gif
deleted file mode 100755
index ff76693..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-disabled-corners.gif
deleted file mode 100755
index ff76693..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-disabled-sides.gif
deleted file mode 100755
index b50b4db..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-focus-corners.gif
deleted file mode 100755
index a5b0f5f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-focus-sides.gif
deleted file mode 100755
index 42e0f9f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-over-corners.gif
deleted file mode 100755
index a5b0f5f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-over-sides.gif
deleted file mode 100755
index 42e0f9f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-pressed-corners.gif
deleted file mode 100755
index 527e49f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-pressed-sides.gif
deleted file mode 100755
index f38c20e..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-sides.gif
deleted file mode 100755
index b50b4db..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-default-toolbar-small-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-corners.gif
deleted file mode 100755
index 2fb4c43..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-disabled-corners.gif
deleted file mode 100755
index 2fb4c43..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-disabled-sides.gif
deleted file mode 100755
index 338914f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-focus-corners.gif
deleted file mode 100755
index 165cacf..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-focus-sides.gif
deleted file mode 100755
index 8de9574..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-over-corners.gif
deleted file mode 100755
index 165cacf..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-over-sides.gif
deleted file mode 100755
index 8de9574..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-pressed-corners.gif
deleted file mode 100755
index 45dfef6..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-pressed-sides.gif
deleted file mode 100755
index 724a76d..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-sides.gif
deleted file mode 100755
index 338914f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-large-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-corners.gif
deleted file mode 100755
index 2fb4c43..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-disabled-corners.gif
deleted file mode 100755
index 2fb4c43..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-disabled-sides.gif
deleted file mode 100755
index cc48c8f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-focus-corners.gif
deleted file mode 100755
index 62ca4fe..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-focus-sides.gif
deleted file mode 100755
index adf64f0..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-over-corners.gif
deleted file mode 100755
index 62ca4fe..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-over-sides.gif
deleted file mode 100755
index adf64f0..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-pressed-corners.gif
deleted file mode 100755
index 51cb112..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-pressed-sides.gif
deleted file mode 100755
index 6c76ce6..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-sides.gif
deleted file mode 100755
index cc48c8f..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-medium-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-corners.gif
deleted file mode 100755
index 2fb4c43..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-disabled-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-disabled-corners.gif
deleted file mode 100755
index 2fb4c43..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-disabled-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-disabled-sides.gif
deleted file mode 100755
index 7f61b96..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-focus-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-focus-corners.gif
deleted file mode 100755
index 62ca4fe..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-focus-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-focus-sides.gif
deleted file mode 100755
index 3508cba..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-over-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-over-corners.gif
deleted file mode 100755
index 62ca4fe..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-over-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-over-sides.gif
deleted file mode 100755
index 3508cba..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-pressed-corners.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-pressed-corners.gif
deleted file mode 100755
index 51cb112..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-pressed-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-pressed-sides.gif
deleted file mode 100755
index 0253331..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-sides.gif b/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-sides.gif
deleted file mode 100755
index 7f61b96..0000000
Binary files a/interface/ext/resources/themes/images/access/btn/btn-toolbar-small-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/arrow.gif b/interface/ext/resources/themes/images/access/button/arrow.gif
deleted file mode 100755
index 087b450..0000000
Binary files a/interface/ext/resources/themes/images/access/button/arrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/btn.gif b/interface/ext/resources/themes/images/access/button/btn.gif
deleted file mode 100755
index 3e705ba..0000000
Binary files a/interface/ext/resources/themes/images/access/button/btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/group-cs.gif b/interface/ext/resources/themes/images/access/button/group-cs.gif
deleted file mode 100755
index aaf0d46..0000000
Binary files a/interface/ext/resources/themes/images/access/button/group-cs.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/group-lr.gif b/interface/ext/resources/themes/images/access/button/group-lr.gif
deleted file mode 100755
index 374ea75..0000000
Binary files a/interface/ext/resources/themes/images/access/button/group-lr.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/group-tb.gif b/interface/ext/resources/themes/images/access/button/group-tb.gif
deleted file mode 100755
index 50a9972..0000000
Binary files a/interface/ext/resources/themes/images/access/button/group-tb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow-b-noline.gif b/interface/ext/resources/themes/images/access/button/s-arrow-b-noline.gif
deleted file mode 100755
index 644e9f3..0000000
Binary files a/interface/ext/resources/themes/images/access/button/s-arrow-b-noline.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow-b.gif b/interface/ext/resources/themes/images/access/button/s-arrow-b.gif
deleted file mode 100755
index ba55d0a..0000000
Binary files a/interface/ext/resources/themes/images/access/button/s-arrow-b.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow-bo.gif b/interface/ext/resources/themes/images/access/button/s-arrow-bo.gif
deleted file mode 100755
index c672b60..0000000
Binary files a/interface/ext/resources/themes/images/access/button/s-arrow-bo.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow-noline.gif b/interface/ext/resources/themes/images/access/button/s-arrow-noline.gif
deleted file mode 100755
index f3cd351..0000000
Binary files a/interface/ext/resources/themes/images/access/button/s-arrow-noline.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow-o.gif b/interface/ext/resources/themes/images/access/button/s-arrow-o.gif
deleted file mode 100755
index 4bdafd0..0000000
Binary files a/interface/ext/resources/themes/images/access/button/s-arrow-o.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/button/s-arrow.gif b/interface/ext/resources/themes/images/access/button/s-arrow.gif
deleted file mode 100755
index a77be7f..0000000
Binary files a/interface/ext/resources/themes/images/access/button/s-arrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/datepicker/datepicker-footer-bg.gif b/interface/ext/resources/themes/images/access/datepicker/datepicker-footer-bg.gif
deleted file mode 100755
index 7a2f569..0000000
Binary files a/interface/ext/resources/themes/images/access/datepicker/datepicker-footer-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/datepicker/datepicker-header-bg.gif b/interface/ext/resources/themes/images/access/datepicker/datepicker-header-bg.gif
deleted file mode 100755
index f6353ad..0000000
Binary files a/interface/ext/resources/themes/images/access/datepicker/datepicker-header-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/editor/tb-sprite.gif b/interface/ext/resources/themes/images/access/editor/tb-sprite.gif
deleted file mode 100755
index bd4011d..0000000
Binary files a/interface/ext/resources/themes/images/access/editor/tb-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form-invalid-tip/form-invalid-tip-default-corners.gif b/interface/ext/resources/themes/images/access/form-invalid-tip/form-invalid-tip-default-corners.gif
deleted file mode 100755
index b817887..0000000
Binary files a/interface/ext/resources/themes/images/access/form-invalid-tip/form-invalid-tip-default-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/checkbox.gif b/interface/ext/resources/themes/images/access/form/checkbox.gif
deleted file mode 100755
index baf44f9..0000000
Binary files a/interface/ext/resources/themes/images/access/form/checkbox.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/checkbox_.gif b/interface/ext/resources/themes/images/access/form/checkbox_.gif
deleted file mode 100755
index 835b346..0000000
Binary files a/interface/ext/resources/themes/images/access/form/checkbox_.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/clear-trigger.gif b/interface/ext/resources/themes/images/access/form/clear-trigger.gif
deleted file mode 100755
index 9bfd184..0000000
Binary files a/interface/ext/resources/themes/images/access/form/clear-trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/date-trigger.gif b/interface/ext/resources/themes/images/access/form/date-trigger.gif
deleted file mode 100755
index 048506d..0000000
Binary files a/interface/ext/resources/themes/images/access/form/date-trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/exclamation.gif b/interface/ext/resources/themes/images/access/form/exclamation.gif
deleted file mode 100755
index daa88b8..0000000
Binary files a/interface/ext/resources/themes/images/access/form/exclamation.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/radio.gif b/interface/ext/resources/themes/images/access/form/radio.gif
deleted file mode 100755
index 1d7fd15..0000000
Binary files a/interface/ext/resources/themes/images/access/form/radio.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/radio_.gif b/interface/ext/resources/themes/images/access/form/radio_.gif
deleted file mode 100755
index 36bb91d..0000000
Binary files a/interface/ext/resources/themes/images/access/form/radio_.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/search-trigger.gif b/interface/ext/resources/themes/images/access/form/search-trigger.gif
deleted file mode 100755
index ab8b3b4..0000000
Binary files a/interface/ext/resources/themes/images/access/form/search-trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/spinner-small.gif b/interface/ext/resources/themes/images/access/form/spinner-small.gif
deleted file mode 100755
index c0944f9..0000000
Binary files a/interface/ext/resources/themes/images/access/form/spinner-small.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/spinner.gif b/interface/ext/resources/themes/images/access/form/spinner.gif
deleted file mode 100755
index c0944f9..0000000
Binary files a/interface/ext/resources/themes/images/access/form/spinner.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/spinner_.gif b/interface/ext/resources/themes/images/access/form/spinner_.gif
deleted file mode 100755
index f8c5ab5..0000000
Binary files a/interface/ext/resources/themes/images/access/form/spinner_.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/text-bg.gif b/interface/ext/resources/themes/images/access/form/text-bg.gif
deleted file mode 100755
index 4ce90bb..0000000
Binary files a/interface/ext/resources/themes/images/access/form/text-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/trigger-tpl.gif b/interface/ext/resources/themes/images/access/form/trigger-tpl.gif
deleted file mode 100755
index 2574ead..0000000
Binary files a/interface/ext/resources/themes/images/access/form/trigger-tpl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/form/trigger.gif b/interface/ext/resources/themes/images/access/form/trigger.gif
deleted file mode 100755
index bd25572..0000000
Binary files a/interface/ext/resources/themes/images/access/form/trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/cell-special-selected-bg.gif b/interface/ext/resources/themes/images/access/grid/cell-special-selected-bg.gif
deleted file mode 100755
index 291a404..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/cell-special-selected-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/column-header-bg.gif b/interface/ext/resources/themes/images/access/grid/column-header-bg.gif
deleted file mode 100755
index 707f6f1..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/column-header-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/column-header-over-bg.gif b/interface/ext/resources/themes/images/access/grid/column-header-over-bg.gif
deleted file mode 100755
index 8c66304..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/column-header-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/dirty.gif b/interface/ext/resources/themes/images/access/grid/dirty.gif
deleted file mode 100755
index d524ee5..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/dirty.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/grid-blue-split.gif b/interface/ext/resources/themes/images/access/grid/grid-blue-split.gif
deleted file mode 100755
index 1b0bae3..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/grid-blue-split.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/grid3-hd-btn.gif b/interface/ext/resources/themes/images/access/grid/grid3-hd-btn.gif
deleted file mode 100755
index 9ecd650..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/grid3-hd-btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/grid3-hrow-over.gif b/interface/ext/resources/themes/images/access/grid/grid3-hrow-over.gif
deleted file mode 100755
index 0405f6c..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/grid3-hrow-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/grid3-hrow.gif b/interface/ext/resources/themes/images/access/grid/grid3-hrow.gif
deleted file mode 100755
index 509737a..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/grid3-hrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/grid3-special-col-bg.gif b/interface/ext/resources/themes/images/access/grid/grid3-special-col-bg.gif
deleted file mode 100755
index 8ec57f5..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/grid3-special-col-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/grid3-special-col-sel-bg.gif b/interface/ext/resources/themes/images/access/grid/grid3-special-col-sel-bg.gif
deleted file mode 100755
index 93a9ca6..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/grid3-special-col-sel-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/group-collapse.gif b/interface/ext/resources/themes/images/access/grid/group-collapse.gif
deleted file mode 100755
index 9bd255e..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/group-collapse.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/group-expand-sprite.gif b/interface/ext/resources/themes/images/access/grid/group-expand-sprite.gif
deleted file mode 100755
index f230489..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/group-expand-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/group-expand.gif b/interface/ext/resources/themes/images/access/grid/group-expand.gif
deleted file mode 100755
index fd22e6b..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/group-expand.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/invalid_line.gif b/interface/ext/resources/themes/images/access/grid/invalid_line.gif
deleted file mode 100755
index 025cffc..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/invalid_line.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-first-disabled.gif b/interface/ext/resources/themes/images/access/grid/page-first-disabled.gif
deleted file mode 100755
index e4df7a7..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-first-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-first.gif b/interface/ext/resources/themes/images/access/grid/page-first.gif
deleted file mode 100755
index aa0a822..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-first.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-last-disabled.gif b/interface/ext/resources/themes/images/access/grid/page-last-disabled.gif
deleted file mode 100755
index 67fee75..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-last-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-last.gif b/interface/ext/resources/themes/images/access/grid/page-last.gif
deleted file mode 100755
index e0cf111..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-last.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-next-disabled.gif b/interface/ext/resources/themes/images/access/grid/page-next-disabled.gif
deleted file mode 100755
index e3e8e87..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-next-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-next.gif b/interface/ext/resources/themes/images/access/grid/page-next.gif
deleted file mode 100755
index 69899c0..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-next.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-prev-disabled.gif b/interface/ext/resources/themes/images/access/grid/page-prev-disabled.gif
deleted file mode 100755
index 0f94bf7..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-prev-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/page-prev.gif b/interface/ext/resources/themes/images/access/grid/page-prev.gif
deleted file mode 100755
index 289b126..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/page-prev.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/refresh.gif b/interface/ext/resources/themes/images/access/grid/refresh.gif
deleted file mode 100755
index 8435d1e..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/refresh.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/sort-hd.gif b/interface/ext/resources/themes/images/access/grid/sort-hd.gif
deleted file mode 100755
index 681628f..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/sort-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/sort_asc.gif b/interface/ext/resources/themes/images/access/grid/sort_asc.gif
deleted file mode 100755
index 371f5e4..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/sort_asc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/grid/sort_desc.gif b/interface/ext/resources/themes/images/access/grid/sort_desc.gif
deleted file mode 100755
index 000e363..0000000
Binary files a/interface/ext/resources/themes/images/access/grid/sort_desc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/group-checked.gif b/interface/ext/resources/themes/images/access/menu/group-checked.gif
deleted file mode 100755
index d8b08f5..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/group-checked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/item-over.gif b/interface/ext/resources/themes/images/access/menu/item-over.gif
deleted file mode 100755
index 0167839..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/item-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/menu-item-active-bg.gif b/interface/ext/resources/themes/images/access/menu/menu-item-active-bg.gif
deleted file mode 100755
index bd6c83b..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/menu-item-active-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/menu-item-active-corners.gif b/interface/ext/resources/themes/images/access/menu/menu-item-active-corners.gif
deleted file mode 100755
index 0df1469..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/menu-item-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/menu-item-active-sides.gif b/interface/ext/resources/themes/images/access/menu/menu-item-active-sides.gif
deleted file mode 100755
index 1894f23..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/menu-item-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/menu-parent.gif b/interface/ext/resources/themes/images/access/menu/menu-parent.gif
deleted file mode 100755
index 49286cd..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/menu-parent.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/menu/menu.gif b/interface/ext/resources/themes/images/access/menu/menu.gif
deleted file mode 100755
index 9bb3960..0000000
Binary files a/interface/ext/resources/themes/images/access/menu/menu.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-bg.gif
deleted file mode 100755
index 30b7e77..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-bottom-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-bottom-bg.gif
deleted file mode 100755
index 2c2eb4f..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-bg.gif
deleted file mode 100755
index 58049d5..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-corners.gif
deleted file mode 100755
index 7971476..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-bg.gif
deleted file mode 100755
index a649fb0..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-corners.gif
deleted file mode 100755
index 310bd7b..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-sides.gif
deleted file mode 100755
index fa628e8..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-noborder-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-sides.gif
deleted file mode 100755
index cf03b6d..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif
deleted file mode 100755
index e5e1d34..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif
deleted file mode 100755
index 9f136e1..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif
deleted file mode 100755
index 4b92e43..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-bg.gif
deleted file mode 100755
index a7069fe..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-corners.gif
deleted file mode 100755
index d58e9fd..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-sides.gif
deleted file mode 100755
index 275b158..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-left-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-bg.gif
deleted file mode 100755
index ef6d339..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-corners.gif
deleted file mode 100755
index 7405d51..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-sides.gif
deleted file mode 100755
index 2c3fd36..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-right-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-bg.gif
deleted file mode 100755
index 35d9129..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-corners.gif
deleted file mode 100755
index 42d67f3..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-sides.gif
deleted file mode 100755
index 6764adb..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-collapsed-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-bg.gif
deleted file mode 100755
index f891c0c..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-corners.gif
deleted file mode 100755
index dbc2200..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-bg.gif
deleted file mode 100755
index ae97f9b..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-corners.gif
deleted file mode 100755
index 932c0a0..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-sides.gif
deleted file mode 100755
index 12d4d70..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-noborder-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-sides.gif
deleted file mode 100755
index 83e96ff..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-left-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-bg.gif
deleted file mode 100755
index d2d02e5..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-corners.gif
deleted file mode 100755
index f37fc88..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-bg.gif
deleted file mode 100755
index bbbb021..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-corners.gif
deleted file mode 100755
index 9048968..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-sides.gif
deleted file mode 100755
index b1cb5be..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-noborder-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-sides.gif
deleted file mode 100755
index 5e69a27..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-right-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-bg.gif
deleted file mode 100755
index 938a755..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-corners.gif
deleted file mode 100755
index e1ad0d7..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-bg.gif
deleted file mode 100755
index 0dfb0f3..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-corners.gif
deleted file mode 100755
index 4096f03..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-sides.gif
deleted file mode 100755
index de2fbbb..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-noborder-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-sides.gif
deleted file mode 100755
index 35c2fa5..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-framed-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-left-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-left-bg.gif
deleted file mode 100755
index 330d689..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-right-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-right-bg.gif
deleted file mode 100755
index d95ba74..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-top-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-default-top-bg.gif
deleted file mode 100755
index f95a4dd..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-default-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-bg.gif
deleted file mode 100755
index 524cdfb..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-corners.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-corners.gif
deleted file mode 100755
index eb27561..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-sides.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-sides.gif
deleted file mode 100755
index f92110a..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel-header/panel-header-vertical-bg.gif b/interface/ext/resources/themes/images/access/panel-header/panel-header-vertical-bg.gif
deleted file mode 100755
index 410c9ee..0000000
Binary files a/interface/ext/resources/themes/images/access/panel-header/panel-header-vertical-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/corners-sprite.gif b/interface/ext/resources/themes/images/access/panel/corners-sprite.gif
deleted file mode 100755
index 43e2862..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/corners-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/left-right.gif b/interface/ext/resources/themes/images/access/panel/left-right.gif
deleted file mode 100755
index 51850b7..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/left-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/light-hd.gif b/interface/ext/resources/themes/images/access/panel/light-hd.gif
deleted file mode 100755
index 660bedb..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/light-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/panel-default-framed-corners.gif b/interface/ext/resources/themes/images/access/panel/panel-default-framed-corners.gif
deleted file mode 100755
index c0985ea..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/panel-default-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/panel-default-framed-noborder-corners.gif b/interface/ext/resources/themes/images/access/panel/panel-default-framed-noborder-corners.gif
deleted file mode 100755
index 087079f..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/panel-default-framed-noborder-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/panel-default-framed-noborder-sides.gif b/interface/ext/resources/themes/images/access/panel/panel-default-framed-noborder-sides.gif
deleted file mode 100755
index f4d4736..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/panel-default-framed-noborder-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/panel-default-framed-sides.gif b/interface/ext/resources/themes/images/access/panel/panel-default-framed-sides.gif
deleted file mode 100755
index 1676cd1..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/panel-default-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/panel-framed-corners.gif b/interface/ext/resources/themes/images/access/panel/panel-framed-corners.gif
deleted file mode 100755
index ca1184f..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/panel-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/panel-framed-sides.gif b/interface/ext/resources/themes/images/access/panel/panel-framed-sides.gif
deleted file mode 100755
index 3efa308..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/panel-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/tool-sprites.gif b/interface/ext/resources/themes/images/access/panel/tool-sprites.gif
deleted file mode 100755
index a3ffe58..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/tool-sprites.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/top-bottom.gif b/interface/ext/resources/themes/images/access/panel/top-bottom.gif
deleted file mode 100755
index 6b2649d..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/top-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/white-corners-sprite.gif b/interface/ext/resources/themes/images/access/panel/white-corners-sprite.gif
deleted file mode 100755
index 22d4bba..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/white-corners-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/white-left-right.gif b/interface/ext/resources/themes/images/access/panel/white-left-right.gif
deleted file mode 100755
index 51850b7..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/white-left-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/panel/white-top-bottom.gif b/interface/ext/resources/themes/images/access/panel/white-top-bottom.gif
deleted file mode 100755
index 08f8fae..0000000
Binary files a/interface/ext/resources/themes/images/access/panel/white-top-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/progress/progress-default-bg.gif b/interface/ext/resources/themes/images/access/progress/progress-default-bg.gif
deleted file mode 100755
index ade77c1..0000000
Binary files a/interface/ext/resources/themes/images/access/progress/progress-default-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/qtip/close.gif b/interface/ext/resources/themes/images/access/qtip/close.gif
deleted file mode 100755
index 69ab915..0000000
Binary files a/interface/ext/resources/themes/images/access/qtip/close.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/qtip/tip-anchor-sprite.gif b/interface/ext/resources/themes/images/access/qtip/tip-anchor-sprite.gif
deleted file mode 100755
index f46d31d..0000000
Binary files a/interface/ext/resources/themes/images/access/qtip/tip-anchor-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/qtip/tip-sprite.gif b/interface/ext/resources/themes/images/access/qtip/tip-sprite.gif
deleted file mode 100755
index 9f6a629..0000000
Binary files a/interface/ext/resources/themes/images/access/qtip/tip-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/shared/glass-bg.gif b/interface/ext/resources/themes/images/access/shared/glass-bg.gif
deleted file mode 100755
index ed3c886..0000000
Binary files a/interface/ext/resources/themes/images/access/shared/glass-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/shared/hd-sprite.gif b/interface/ext/resources/themes/images/access/shared/hd-sprite.gif
deleted file mode 100755
index 446be92..0000000
Binary files a/interface/ext/resources/themes/images/access/shared/hd-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/shared/left-btn.gif b/interface/ext/resources/themes/images/access/shared/left-btn.gif
deleted file mode 100755
index 0622439..0000000
Binary files a/interface/ext/resources/themes/images/access/shared/left-btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/shared/right-btn.gif b/interface/ext/resources/themes/images/access/shared/right-btn.gif
deleted file mode 100755
index 5e3215d..0000000
Binary files a/interface/ext/resources/themes/images/access/shared/right-btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/e-handle-dark.gif b/interface/ext/resources/themes/images/access/sizer/e-handle-dark.gif
deleted file mode 100755
index 70aad3f..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/e-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/e-handle.gif b/interface/ext/resources/themes/images/access/sizer/e-handle.gif
deleted file mode 100755
index 52c045e..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/e-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/ne-handle-dark.gif b/interface/ext/resources/themes/images/access/sizer/ne-handle-dark.gif
deleted file mode 100755
index 3a30ca2..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/ne-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/ne-handle.gif b/interface/ext/resources/themes/images/access/sizer/ne-handle.gif
deleted file mode 100755
index e48f9f9..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/ne-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/nw-handle-dark.gif b/interface/ext/resources/themes/images/access/sizer/nw-handle-dark.gif
deleted file mode 100755
index 5ea8b51..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/nw-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/nw-handle.gif b/interface/ext/resources/themes/images/access/sizer/nw-handle.gif
deleted file mode 100755
index 65d5cc2..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/nw-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/s-handle-dark.gif b/interface/ext/resources/themes/images/access/sizer/s-handle-dark.gif
deleted file mode 100755
index 421b534..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/s-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/s-handle.gif b/interface/ext/resources/themes/images/access/sizer/s-handle.gif
deleted file mode 100755
index 2b635de..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/s-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/se-handle-dark.gif b/interface/ext/resources/themes/images/access/sizer/se-handle-dark.gif
deleted file mode 100755
index 881a5c4..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/se-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/se-handle.gif b/interface/ext/resources/themes/images/access/sizer/se-handle.gif
deleted file mode 100755
index 5f1e3b8..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/se-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/square.gif b/interface/ext/resources/themes/images/access/sizer/square.gif
deleted file mode 100755
index 4dc5a2d..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/square.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/sw-handle-dark.gif b/interface/ext/resources/themes/images/access/sizer/sw-handle-dark.gif
deleted file mode 100755
index 030d8f8..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/sw-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/sizer/sw-handle.gif b/interface/ext/resources/themes/images/access/sizer/sw-handle.gif
deleted file mode 100755
index 79bcb84..0000000
Binary files a/interface/ext/resources/themes/images/access/sizer/sw-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-bg.gif b/interface/ext/resources/themes/images/access/slider/slider-bg.gif
deleted file mode 100755
index 50b7624..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-bg.png b/interface/ext/resources/themes/images/access/slider/slider-bg.png
deleted file mode 100755
index d213754..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-thumb.gif b/interface/ext/resources/themes/images/access/slider/slider-thumb.gif
deleted file mode 100755
index d7dadda..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-thumb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-thumb.png b/interface/ext/resources/themes/images/access/slider/slider-thumb.png
deleted file mode 100755
index 4991a74..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-thumb.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-v-bg.gif b/interface/ext/resources/themes/images/access/slider/slider-v-bg.gif
deleted file mode 100755
index 70b70ad..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-v-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-v-bg.png b/interface/ext/resources/themes/images/access/slider/slider-v-bg.png
deleted file mode 100755
index f1221c4..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-v-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-v-thumb.gif b/interface/ext/resources/themes/images/access/slider/slider-v-thumb.gif
deleted file mode 100755
index 7478fad..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-v-thumb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/slider/slider-v-thumb.png b/interface/ext/resources/themes/images/access/slider/slider-v-thumb.png
deleted file mode 100755
index e0c0e27..0000000
Binary files a/interface/ext/resources/themes/images/access/slider/slider-v-thumb.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/spinner.gif b/interface/ext/resources/themes/images/access/spinner.gif
deleted file mode 100755
index f764d31..0000000
Binary files a/interface/ext/resources/themes/images/access/spinner.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab-bar/scroll-left.gif b/interface/ext/resources/themes/images/access/tab-bar/scroll-left.gif
deleted file mode 100755
index 71a2e88..0000000
Binary files a/interface/ext/resources/themes/images/access/tab-bar/scroll-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab-bar/scroll-right.gif b/interface/ext/resources/themes/images/access/tab-bar/scroll-right.gif
deleted file mode 100755
index 8f3d659..0000000
Binary files a/interface/ext/resources/themes/images/access/tab-bar/scroll-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab-bar/tab-bar-default-bg.gif b/interface/ext/resources/themes/images/access/tab-bar/tab-bar-default-bg.gif
deleted file mode 100755
index 37e3369..0000000
Binary files a/interface/ext/resources/themes/images/access/tab-bar/tab-bar-default-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-active-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-active-corners.gif
deleted file mode 100755
index c6fbc8c..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-active-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-active-sides.gif
deleted file mode 100755
index 82fe92a..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-corners.gif
deleted file mode 100755
index cd3c32c..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-disabled-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-disabled-corners.gif
deleted file mode 100755
index aa733ef..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-disabled-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-disabled-sides.gif
deleted file mode 100755
index 305a1bb..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-over-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-over-corners.gif
deleted file mode 100755
index c21bb91..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-over-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-over-sides.gif
deleted file mode 100755
index 0a6ed0a..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-bottom-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-bottom-sides.gif
deleted file mode 100755
index f70390a..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-active-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-active-corners.gif
deleted file mode 100755
index 82de9b2..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-active-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-active-sides.gif
deleted file mode 100755
index 1ff28ac..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-corners.gif
deleted file mode 100755
index 8164892..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-disabled-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-disabled-corners.gif
deleted file mode 100755
index 6fbe9e3..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-disabled-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-disabled-sides.gif
deleted file mode 100755
index f4740f3..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-over-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-over-corners.gif
deleted file mode 100755
index a606de4..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-over-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-over-sides.gif
deleted file mode 100755
index 6cb80a2..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-bottom-sides.gif
deleted file mode 100755
index 122f7e7..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-active-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-active-corners.gif
deleted file mode 100755
index d999e09..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-active-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-active-sides.gif
deleted file mode 100755
index c7c6189..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-corners.gif
deleted file mode 100755
index fac36a9..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-disabled-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-disabled-corners.gif
deleted file mode 100755
index e71c109..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-disabled-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-disabled-sides.gif
deleted file mode 100755
index d7cd0d7..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-over-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-over-corners.gif
deleted file mode 100755
index 9685325..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-over-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-over-sides.gif
deleted file mode 100755
index d9bf081..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-default-top-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-default-top-sides.gif
deleted file mode 100755
index 8394350..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-default-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-active-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-top-active-corners.gif
deleted file mode 100755
index cf98156..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-active-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-top-active-sides.gif
deleted file mode 100755
index 1b27451..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-top-corners.gif
deleted file mode 100755
index 53babd7..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-disabled-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-top-disabled-corners.gif
deleted file mode 100755
index bf6e742..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-disabled-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-top-disabled-sides.gif
deleted file mode 100755
index 229b1d2..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-over-corners.gif b/interface/ext/resources/themes/images/access/tab/tab-top-over-corners.gif
deleted file mode 100755
index a17354d..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-over-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-top-over-sides.gif
deleted file mode 100755
index b13c25a..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tab/tab-top-sides.gif b/interface/ext/resources/themes/images/access/tab/tab-top-sides.gif
deleted file mode 100755
index 0744024..0000000
Binary files a/interface/ext/resources/themes/images/access/tab/tab-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-btm-inactive-left-bg.gif b/interface/ext/resources/themes/images/access/tabs/tab-btm-inactive-left-bg.gif
deleted file mode 100755
index 687af2b..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-btm-inactive-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-btm-inactive-right-bg.gif b/interface/ext/resources/themes/images/access/tabs/tab-btm-inactive-right-bg.gif
deleted file mode 100755
index 3c1b3eb..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-btm-inactive-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-btm-left-bg.gif b/interface/ext/resources/themes/images/access/tabs/tab-btm-left-bg.gif
deleted file mode 100755
index e5f827a..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-btm-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-btm-right-bg.gif b/interface/ext/resources/themes/images/access/tabs/tab-btm-right-bg.gif
deleted file mode 100755
index 2551f4c..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-btm-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-close.gif b/interface/ext/resources/themes/images/access/tabs/tab-close.gif
deleted file mode 100755
index ef9a7c2..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-close.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-strip-bg.gif b/interface/ext/resources/themes/images/access/tabs/tab-strip-bg.gif
deleted file mode 100755
index fc1fdcd..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-strip-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tab-strip-btm-bg.gif b/interface/ext/resources/themes/images/access/tabs/tab-strip-btm-bg.gif
deleted file mode 100755
index a151553..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tab-strip-btm-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tabs/tabs-sprite.gif b/interface/ext/resources/themes/images/access/tabs/tabs-sprite.gif
deleted file mode 100755
index 8194001..0000000
Binary files a/interface/ext/resources/themes/images/access/tabs/tabs-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tip/tip-corners.gif b/interface/ext/resources/themes/images/access/tip/tip-corners.gif
deleted file mode 100755
index dd2901c..0000000
Binary files a/interface/ext/resources/themes/images/access/tip/tip-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tip/tip-corners.png b/interface/ext/resources/themes/images/access/tip/tip-corners.png
deleted file mode 100755
index 4454e54..0000000
Binary files a/interface/ext/resources/themes/images/access/tip/tip-corners.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tip/tip-sides.gif b/interface/ext/resources/themes/images/access/tip/tip-sides.gif
deleted file mode 100755
index 27360d6..0000000
Binary files a/interface/ext/resources/themes/images/access/tip/tip-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tip/tip-sides.png b/interface/ext/resources/themes/images/access/tip/tip-sides.png
deleted file mode 100755
index dc4b87d..0000000
Binary files a/interface/ext/resources/themes/images/access/tip/tip-sides.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/bg.gif b/interface/ext/resources/themes/images/access/toolbar/bg.gif
deleted file mode 100755
index b67a54e..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/btn-arrow-light.gif b/interface/ext/resources/themes/images/access/toolbar/btn-arrow-light.gif
deleted file mode 100755
index b0e24b5..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/btn-arrow-light.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/btn-arrow.gif b/interface/ext/resources/themes/images/access/toolbar/btn-arrow.gif
deleted file mode 100755
index 8acb460..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/btn-arrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/btn-over-bg.gif b/interface/ext/resources/themes/images/access/toolbar/btn-over-bg.gif
deleted file mode 100755
index ee2dd98..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/btn-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/gray-bg.gif b/interface/ext/resources/themes/images/access/toolbar/gray-bg.gif
deleted file mode 100755
index bd49438..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/gray-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/more.gif b/interface/ext/resources/themes/images/access/toolbar/more.gif
deleted file mode 100755
index 4f01020..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/more.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/s-arrow-bo.gif b/interface/ext/resources/themes/images/access/toolbar/s-arrow-bo.gif
deleted file mode 100755
index 1505edd..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/s-arrow-bo.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/scroll-left.gif b/interface/ext/resources/themes/images/access/toolbar/scroll-left.gif
deleted file mode 100755
index 71a2e88..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/scroll-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/scroll-right.gif b/interface/ext/resources/themes/images/access/toolbar/scroll-right.gif
deleted file mode 100755
index 8f3d659..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/scroll-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/tb-btn-sprite.gif b/interface/ext/resources/themes/images/access/toolbar/tb-btn-sprite.gif
deleted file mode 100755
index 19bbef3..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/tb-btn-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/tb-xl-btn-sprite.gif b/interface/ext/resources/themes/images/access/toolbar/tb-xl-btn-sprite.gif
deleted file mode 100755
index 1bc0420..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/tb-xl-btn-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/tb-xl-sep.gif b/interface/ext/resources/themes/images/access/toolbar/tb-xl-sep.gif
deleted file mode 100755
index 30555ee..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/tb-xl-sep.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/toolbar/toolbar-default-bg.gif b/interface/ext/resources/themes/images/access/toolbar/toolbar-default-bg.gif
deleted file mode 100755
index 57b73f0..0000000
Binary files a/interface/ext/resources/themes/images/access/toolbar/toolbar-default-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tools/tool-sprite-tpl.gif b/interface/ext/resources/themes/images/access/tools/tool-sprite-tpl.gif
deleted file mode 100755
index e647867..0000000
Binary files a/interface/ext/resources/themes/images/access/tools/tool-sprite-tpl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tools/tool-sprites.gif b/interface/ext/resources/themes/images/access/tools/tool-sprites.gif
deleted file mode 100755
index a3ffe58..0000000
Binary files a/interface/ext/resources/themes/images/access/tools/tool-sprites.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tools/tools-sprites-trans.gif b/interface/ext/resources/themes/images/access/tools/tools-sprites-trans.gif
deleted file mode 100755
index ead931e..0000000
Binary files a/interface/ext/resources/themes/images/access/tools/tools-sprites-trans.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/arrows.gif b/interface/ext/resources/themes/images/access/tree/arrows.gif
deleted file mode 100755
index 2e635eb..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/arrows.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/drop-between.gif b/interface/ext/resources/themes/images/access/tree/drop-between.gif
deleted file mode 100755
index 5c6c09d..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/drop-between.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-end-minus-nl.gif b/interface/ext/resources/themes/images/access/tree/elbow-end-minus-nl.gif
deleted file mode 100755
index b4ae595..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-end-minus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-end-minus.gif b/interface/ext/resources/themes/images/access/tree/elbow-end-minus.gif
deleted file mode 100755
index 514cf3e..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-end-minus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-end-plus-nl.gif b/interface/ext/resources/themes/images/access/tree/elbow-end-plus-nl.gif
deleted file mode 100755
index 6af2e29..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-end-plus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-end-plus.gif b/interface/ext/resources/themes/images/access/tree/elbow-end-plus.gif
deleted file mode 100755
index 96df679..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-end-plus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-minus-nl.gif b/interface/ext/resources/themes/images/access/tree/elbow-minus-nl.gif
deleted file mode 100755
index b4ae595..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-minus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-minus.gif b/interface/ext/resources/themes/images/access/tree/elbow-minus.gif
deleted file mode 100755
index 68ba298..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-minus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-plus-nl.gif b/interface/ext/resources/themes/images/access/tree/elbow-plus-nl.gif
deleted file mode 100755
index 6af2e29..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-plus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/elbow-plus.gif b/interface/ext/resources/themes/images/access/tree/elbow-plus.gif
deleted file mode 100755
index 58ba9e4..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/elbow-plus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/folder-open.gif b/interface/ext/resources/themes/images/access/tree/folder-open.gif
deleted file mode 100755
index 7c52965..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/folder-open.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/tree/folder.gif b/interface/ext/resources/themes/images/access/tree/folder.gif
deleted file mode 100755
index 501e75c..0000000
Binary files a/interface/ext/resources/themes/images/access/tree/folder.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-bottom-corners.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-bottom-corners.gif
deleted file mode 100755
index b809d7f..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-bottom-sides.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-bottom-sides.gif
deleted file mode 100755
index ed742ca..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-left-corners.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-left-corners.gif
deleted file mode 100755
index c4705f7..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-left-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-left-sides.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-left-sides.gif
deleted file mode 100755
index dbafdc1..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-left-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-right-corners.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-right-corners.gif
deleted file mode 100755
index 00ba4b6..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-right-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-right-sides.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-right-sides.gif
deleted file mode 100755
index d97805a..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-right-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-top-corners.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-top-corners.gif
deleted file mode 100755
index b2dfd9d..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window-header/window-header-default-top-sides.gif b/interface/ext/resources/themes/images/access/window-header/window-header-default-top-sides.gif
deleted file mode 100755
index ed742ca..0000000
Binary files a/interface/ext/resources/themes/images/access/window-header/window-header-default-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/icon-error.gif b/interface/ext/resources/themes/images/access/window/icon-error.gif
deleted file mode 100755
index 05c713c..0000000
Binary files a/interface/ext/resources/themes/images/access/window/icon-error.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/icon-info.gif b/interface/ext/resources/themes/images/access/window/icon-info.gif
deleted file mode 100755
index adc0613..0000000
Binary files a/interface/ext/resources/themes/images/access/window/icon-info.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/icon-question.gif b/interface/ext/resources/themes/images/access/window/icon-question.gif
deleted file mode 100755
index 9b31a94..0000000
Binary files a/interface/ext/resources/themes/images/access/window/icon-question.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/icon-warning.gif b/interface/ext/resources/themes/images/access/window/icon-warning.gif
deleted file mode 100755
index 0d89077..0000000
Binary files a/interface/ext/resources/themes/images/access/window/icon-warning.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/window-corners.gif b/interface/ext/resources/themes/images/access/window/window-corners.gif
deleted file mode 100755
index 82d456b..0000000
Binary files a/interface/ext/resources/themes/images/access/window/window-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/window-default-corners.gif b/interface/ext/resources/themes/images/access/window/window-default-corners.gif
deleted file mode 100755
index a8998ec..0000000
Binary files a/interface/ext/resources/themes/images/access/window/window-default-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/window-default-sides.gif b/interface/ext/resources/themes/images/access/window/window-default-sides.gif
deleted file mode 100755
index eff9537..0000000
Binary files a/interface/ext/resources/themes/images/access/window/window-default-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/access/window/window-sides.gif b/interface/ext/resources/themes/images/access/window/window-sides.gif
deleted file mode 100755
index 43af359..0000000
Binary files a/interface/ext/resources/themes/images/access/window/window-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/boundlist/trigger-arrow.png b/interface/ext/resources/themes/images/default/boundlist/trigger-arrow.png
deleted file mode 100755
index 11daac3..0000000
Binary files a/interface/ext/resources/themes/images/default/boundlist/trigger-arrow.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/corners-blue.gif b/interface/ext/resources/themes/images/default/box/corners-blue.gif
deleted file mode 100755
index fa419b5..0000000
Binary files a/interface/ext/resources/themes/images/default/box/corners-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/corners.gif b/interface/ext/resources/themes/images/default/box/corners.gif
deleted file mode 100755
index 8aa8cae..0000000
Binary files a/interface/ext/resources/themes/images/default/box/corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/l-blue.gif b/interface/ext/resources/themes/images/default/box/l-blue.gif
deleted file mode 100755
index 5ed7f00..0000000
Binary files a/interface/ext/resources/themes/images/default/box/l-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/l.gif b/interface/ext/resources/themes/images/default/box/l.gif
deleted file mode 100755
index 0160f97..0000000
Binary files a/interface/ext/resources/themes/images/default/box/l.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/r-blue.gif b/interface/ext/resources/themes/images/default/box/r-blue.gif
deleted file mode 100755
index 3ea5cae..0000000
Binary files a/interface/ext/resources/themes/images/default/box/r-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/r.gif b/interface/ext/resources/themes/images/default/box/r.gif
deleted file mode 100755
index 34237f6..0000000
Binary files a/interface/ext/resources/themes/images/default/box/r.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/box/tb.gif b/interface/ext/resources/themes/images/default/box/tb.gif
deleted file mode 100755
index 435889b..0000000
Binary files a/interface/ext/resources/themes/images/default/box/tb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/button/s-arrow-light.gif b/interface/ext/resources/themes/images/default/button/s-arrow-light.gif
deleted file mode 100755
index 08783c9..0000000
Binary files a/interface/ext/resources/themes/images/default/button/s-arrow-light.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-sides.gif b/interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-sides.gif
deleted file mode 100755
index bd64f32..0000000
Binary files a/interface/ext/resources/themes/images/default/form-invalid-tip/form-invalid-tip-default-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/form/error-tip-corners.gif b/interface/ext/resources/themes/images/default/form/error-tip-corners.gif
deleted file mode 100755
index 6ea4c38..0000000
Binary files a/interface/ext/resources/themes/images/default/form/error-tip-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/arrow-left-white.gif b/interface/ext/resources/themes/images/default/grid/arrow-left-white.gif
deleted file mode 100755
index 63088f5..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/arrow-left-white.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/arrow-right-white.gif b/interface/ext/resources/themes/images/default/grid/arrow-right-white.gif
deleted file mode 100755
index e9e0678..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/arrow-right-white.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/cell-special-bg.gif b/interface/ext/resources/themes/images/default/grid/cell-special-bg.gif
deleted file mode 100755
index d76ffbc..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/cell-special-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/checked.gif b/interface/ext/resources/themes/images/default/grid/checked.gif
deleted file mode 100755
index fad5893..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/checked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/col-move-bottom.gif b/interface/ext/resources/themes/images/default/grid/col-move-bottom.gif
deleted file mode 100755
index cc1e473..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/col-move-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/col-move-top.gif b/interface/ext/resources/themes/images/default/grid/col-move-top.gif
deleted file mode 100755
index 58ff32c..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/col-move-top.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/columns.gif b/interface/ext/resources/themes/images/default/grid/columns.gif
deleted file mode 100755
index 2d3a823..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/columns.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-left.gif b/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-left.gif
deleted file mode 100755
index 5d923b2..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-left.png b/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-left.png
deleted file mode 100755
index 5dc6967..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-left.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-right.gif b/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-right.gif
deleted file mode 100755
index 8d154db..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-right.png b/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-right.png
deleted file mode 100755
index b1a1819..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/dd-insert-arrow-right.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/done.gif b/interface/ext/resources/themes/images/default/grid/done.gif
deleted file mode 100755
index a937cb2..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/done.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/drop-no.gif b/interface/ext/resources/themes/images/default/grid/drop-no.gif
deleted file mode 100755
index 31a332b..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/drop-no.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/drop-yes.gif b/interface/ext/resources/themes/images/default/grid/drop-yes.gif
deleted file mode 100755
index 926010e..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/drop-yes.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/footer-bg.gif b/interface/ext/resources/themes/images/default/grid/footer-bg.gif
deleted file mode 100755
index 126120f..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/footer-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/grid-blue-hd.gif b/interface/ext/resources/themes/images/default/grid/grid-blue-hd.gif
deleted file mode 100755
index 862094e..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/grid-blue-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/grid-hrow.gif b/interface/ext/resources/themes/images/default/grid/grid-hrow.gif
deleted file mode 100755
index 6374104..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/grid-hrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/grid-loading.gif b/interface/ext/resources/themes/images/default/grid/grid-loading.gif
deleted file mode 100755
index d112c54..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/grid-loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/grid-split.gif b/interface/ext/resources/themes/images/default/grid/grid-split.gif
deleted file mode 100755
index c76a16e..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/grid-split.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/grid-vista-hd.gif b/interface/ext/resources/themes/images/default/grid/grid-vista-hd.gif
deleted file mode 100755
index d097263..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/grid-vista-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/group-by.gif b/interface/ext/resources/themes/images/default/grid/group-by.gif
deleted file mode 100755
index d6075bb..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/group-by.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hd-pop.gif b/interface/ext/resources/themes/images/default/grid/hd-pop.gif
deleted file mode 100755
index eb8ba79..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hd-pop.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hmenu-asc.gif b/interface/ext/resources/themes/images/default/grid/hmenu-asc.gif
deleted file mode 100755
index 8917e0e..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hmenu-asc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hmenu-desc.gif b/interface/ext/resources/themes/images/default/grid/hmenu-desc.gif
deleted file mode 100755
index f26b7c2..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hmenu-desc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hmenu-lock.gif b/interface/ext/resources/themes/images/default/grid/hmenu-lock.gif
deleted file mode 100755
index 1596126..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hmenu-lock.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hmenu-lock.png b/interface/ext/resources/themes/images/default/grid/hmenu-lock.png
deleted file mode 100755
index 8b81e7f..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hmenu-lock.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hmenu-unlock.gif b/interface/ext/resources/themes/images/default/grid/hmenu-unlock.gif
deleted file mode 100755
index af59cf9..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hmenu-unlock.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/hmenu-unlock.png b/interface/ext/resources/themes/images/default/grid/hmenu-unlock.png
deleted file mode 100755
index 9dd5df3..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/hmenu-unlock.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/loading.gif b/interface/ext/resources/themes/images/default/grid/loading.gif
deleted file mode 100755
index e846e1d..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/mso-hd.gif b/interface/ext/resources/themes/images/default/grid/mso-hd.gif
deleted file mode 100755
index 669f3cf..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/mso-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/nowait.gif b/interface/ext/resources/themes/images/default/grid/nowait.gif
deleted file mode 100755
index 4c5862c..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/nowait.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/pick-button.gif b/interface/ext/resources/themes/images/default/grid/pick-button.gif
deleted file mode 100755
index 6957924..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/pick-button.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/property-cell-bg.gif b/interface/ext/resources/themes/images/default/grid/property-cell-bg.gif
deleted file mode 100755
index 77d029f..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/property-cell-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/refresh-disabled.gif b/interface/ext/resources/themes/images/default/grid/refresh-disabled.gif
deleted file mode 100755
index 607800b..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/refresh-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/row-check-sprite.gif b/interface/ext/resources/themes/images/default/grid/row-check-sprite.gif
deleted file mode 100755
index 6101164..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/row-check-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/row-expand-sprite.gif b/interface/ext/resources/themes/images/default/grid/row-expand-sprite.gif
deleted file mode 100755
index 6f4d874..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/row-expand-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/row-over.gif b/interface/ext/resources/themes/images/default/grid/row-over.gif
deleted file mode 100755
index b288e38..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/row-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/row-sel.gif b/interface/ext/resources/themes/images/default/grid/row-sel.gif
deleted file mode 100755
index 98209e6..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/row-sel.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/unchecked.gif b/interface/ext/resources/themes/images/default/grid/unchecked.gif
deleted file mode 100755
index 43823e5..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/unchecked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/grid/wait.gif b/interface/ext/resources/themes/images/default/grid/wait.gif
deleted file mode 100755
index 471c1a4..0000000
Binary files a/interface/ext/resources/themes/images/default/grid/wait.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/layout/mini-bottom.gif b/interface/ext/resources/themes/images/default/layout/mini-bottom.gif
deleted file mode 100755
index c18f9e3..0000000
Binary files a/interface/ext/resources/themes/images/default/layout/mini-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/layout/mini-left.gif b/interface/ext/resources/themes/images/default/layout/mini-left.gif
deleted file mode 100755
index 99f7993..0000000
Binary files a/interface/ext/resources/themes/images/default/layout/mini-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/layout/mini-right.gif b/interface/ext/resources/themes/images/default/layout/mini-right.gif
deleted file mode 100755
index 5b13c5a..0000000
Binary files a/interface/ext/resources/themes/images/default/layout/mini-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/layout/mini-top.gif b/interface/ext/resources/themes/images/default/layout/mini-top.gif
deleted file mode 100755
index a4ca2bb..0000000
Binary files a/interface/ext/resources/themes/images/default/layout/mini-top.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/menu/checked.gif b/interface/ext/resources/themes/images/default/menu/checked.gif
deleted file mode 100755
index fad5893..0000000
Binary files a/interface/ext/resources/themes/images/default/menu/checked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/menu/unchecked.gif b/interface/ext/resources/themes/images/default/menu/unchecked.gif
deleted file mode 100755
index 43823e5..0000000
Binary files a/interface/ext/resources/themes/images/default/menu/unchecked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/shared/blue-loading.gif b/interface/ext/resources/themes/images/default/shared/blue-loading.gif
deleted file mode 100755
index 3bbf639..0000000
Binary files a/interface/ext/resources/themes/images/default/shared/blue-loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/shared/icon-error.gif b/interface/ext/resources/themes/images/default/shared/icon-error.gif
deleted file mode 100755
index 397b655..0000000
Binary files a/interface/ext/resources/themes/images/default/shared/icon-error.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/shared/icon-info.gif b/interface/ext/resources/themes/images/default/shared/icon-info.gif
deleted file mode 100755
index 58281c3..0000000
Binary files a/interface/ext/resources/themes/images/default/shared/icon-info.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/shared/icon-question.gif b/interface/ext/resources/themes/images/default/shared/icon-question.gif
deleted file mode 100755
index 08abd82..0000000
Binary files a/interface/ext/resources/themes/images/default/shared/icon-question.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/shared/icon-warning.gif b/interface/ext/resources/themes/images/default/shared/icon-warning.gif
deleted file mode 100755
index 27ff98b..0000000
Binary files a/interface/ext/resources/themes/images/default/shared/icon-warning.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/shared/large-loading.gif b/interface/ext/resources/themes/images/default/shared/large-loading.gif
deleted file mode 100755
index b36b555..0000000
Binary files a/interface/ext/resources/themes/images/default/shared/large-loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tools/tool-sprite-tpl.gif b/interface/ext/resources/themes/images/default/tools/tool-sprite-tpl.gif
deleted file mode 100755
index e647867..0000000
Binary files a/interface/ext/resources/themes/images/default/tools/tool-sprite-tpl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tools/tools-sprites-trans.gif b/interface/ext/resources/themes/images/default/tools/tools-sprites-trans.gif
deleted file mode 100755
index ead931e..0000000
Binary files a/interface/ext/resources/themes/images/default/tools/tools-sprites-trans.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-above.gif b/interface/ext/resources/themes/images/default/tree/drop-above.gif
deleted file mode 100755
index 30d1ca7..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-above.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-add.gif b/interface/ext/resources/themes/images/default/tree/drop-add.gif
deleted file mode 100755
index b22cd14..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-add.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-append.gif b/interface/ext/resources/themes/images/default/tree/drop-append.gif
deleted file mode 100755
index b22cd14..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-append.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-below.gif b/interface/ext/resources/themes/images/default/tree/drop-below.gif
deleted file mode 100755
index 85f66b1..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-below.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-between.gif b/interface/ext/resources/themes/images/default/tree/drop-between.gif
deleted file mode 100755
index 5c6c09d..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-between.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-no.gif b/interface/ext/resources/themes/images/default/tree/drop-no.gif
deleted file mode 100755
index 9d9c6a9..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-no.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-over.gif b/interface/ext/resources/themes/images/default/tree/drop-over.gif
deleted file mode 100755
index 30d1ca7..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-under.gif b/interface/ext/resources/themes/images/default/tree/drop-under.gif
deleted file mode 100755
index 85f66b1..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-under.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/drop-yes.gif b/interface/ext/resources/themes/images/default/tree/drop-yes.gif
deleted file mode 100755
index 8aacb30..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/drop-yes.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-end.gif b/interface/ext/resources/themes/images/default/tree/elbow-end.gif
deleted file mode 100755
index f24ddee..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/elbow-end.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/elbow-line.gif b/interface/ext/resources/themes/images/default/tree/elbow-line.gif
deleted file mode 100755
index 75e6da4..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/elbow-line.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/elbow.gif b/interface/ext/resources/themes/images/default/tree/elbow.gif
deleted file mode 100755
index b8f4208..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/elbow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/leaf.gif b/interface/ext/resources/themes/images/default/tree/leaf.gif
deleted file mode 100755
index 445769d..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/leaf.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/loading.gif b/interface/ext/resources/themes/images/default/tree/loading.gif
deleted file mode 100755
index e846e1d..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/tree/s.gif b/interface/ext/resources/themes/images/default/tree/s.gif
deleted file mode 100755
index 1d11fa9..0000000
Binary files a/interface/ext/resources/themes/images/default/tree/s.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/util/splitter/mini-bottom.gif b/interface/ext/resources/themes/images/default/util/splitter/mini-bottom.gif
deleted file mode 100755
index c18f9e3..0000000
Binary files a/interface/ext/resources/themes/images/default/util/splitter/mini-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/util/splitter/mini-left.gif b/interface/ext/resources/themes/images/default/util/splitter/mini-left.gif
deleted file mode 100755
index 99f7993..0000000
Binary files a/interface/ext/resources/themes/images/default/util/splitter/mini-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/util/splitter/mini-right.gif b/interface/ext/resources/themes/images/default/util/splitter/mini-right.gif
deleted file mode 100755
index 5b13c5a..0000000
Binary files a/interface/ext/resources/themes/images/default/util/splitter/mini-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/default/util/splitter/mini-top.gif b/interface/ext/resources/themes/images/default/util/splitter/mini-top.gif
deleted file mode 100755
index a4ca2bb..0000000
Binary files a/interface/ext/resources/themes/images/default/util/splitter/mini-top.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/boundlist/trigger-arrow.png b/interface/ext/resources/themes/images/gray/boundlist/trigger-arrow.png
deleted file mode 100755
index 11daac3..0000000
Binary files a/interface/ext/resources/themes/images/gray/boundlist/trigger-arrow.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/corners-blue.gif b/interface/ext/resources/themes/images/gray/box/corners-blue.gif
deleted file mode 100755
index fa419b5..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/corners-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/corners.gif b/interface/ext/resources/themes/images/gray/box/corners.gif
deleted file mode 100755
index 8aa8cae..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/l-blue.gif b/interface/ext/resources/themes/images/gray/box/l-blue.gif
deleted file mode 100755
index 5ed7f00..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/l-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/l.gif b/interface/ext/resources/themes/images/gray/box/l.gif
deleted file mode 100755
index 0160f97..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/l.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/r-blue.gif b/interface/ext/resources/themes/images/gray/box/r-blue.gif
deleted file mode 100755
index 3ea5cae..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/r-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/r.gif b/interface/ext/resources/themes/images/gray/box/r.gif
deleted file mode 100755
index 34237f6..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/r.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/tb-blue.gif b/interface/ext/resources/themes/images/gray/box/tb-blue.gif
deleted file mode 100755
index 562fecc..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/tb-blue.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/box/tb.gif b/interface/ext/resources/themes/images/gray/box/tb.gif
deleted file mode 100755
index 435889b..0000000
Binary files a/interface/ext/resources/themes/images/gray/box/tb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-corners.gif b/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-corners.gif
deleted file mode 100755
index 70f2dd4..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-notitle-corners.gif b/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-notitle-corners.gif
deleted file mode 100755
index 70f2dd4..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-notitle-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-notitle-sides.gif b/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-notitle-sides.gif
deleted file mode 100755
index 44a9334..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-notitle-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-sides.gif b/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-sides.gif
deleted file mode 100755
index ebe97b7..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn-group/btn-group-default-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-bg.gif
deleted file mode 100755
index 6e5d399..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-corners.gif
deleted file mode 100755
index 29fe186..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-bg.gif
deleted file mode 100755
index f3706ba..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-corners.gif
deleted file mode 100755
index 9137750..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-sides.gif
deleted file mode 100755
index edff2b2..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-bg.gif
deleted file mode 100755
index 03ca692..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-corners.gif
deleted file mode 100755
index 7466b5d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-sides.gif
deleted file mode 100755
index 896e181..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-bg.gif
deleted file mode 100755
index 03ca692..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-corners.gif
deleted file mode 100755
index 7466b5d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-sides.gif
deleted file mode 100755
index 896e181..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-bg.gif
deleted file mode 100755
index fc79aea..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-corners.gif
deleted file mode 100755
index 477d5bb..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-sides.gif
deleted file mode 100755
index 1da24ee..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-large-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-large-sides.gif
deleted file mode 100755
index 8c18988..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-large-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-bg.gif
deleted file mode 100755
index c858645..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-corners.gif
deleted file mode 100755
index 29fe186..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-bg.gif
deleted file mode 100755
index b03af35..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-corners.gif
deleted file mode 100755
index 7d44a4e..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-sides.gif
deleted file mode 100755
index ef79b91..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-bg.gif
deleted file mode 100755
index 25b27ad..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-corners.gif
deleted file mode 100755
index 7466b5d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-sides.gif
deleted file mode 100755
index 9ca76f8..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-bg.gif
deleted file mode 100755
index 25b27ad..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-corners.gif
deleted file mode 100755
index 7466b5d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-sides.gif
deleted file mode 100755
index 9ca76f8..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-bg.gif
deleted file mode 100755
index 7299470..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-corners.gif
deleted file mode 100755
index 9533cde..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-sides.gif
deleted file mode 100755
index ab47f16..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-medium-sides.gif
deleted file mode 100755
index 7ec6186..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-medium-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-bg.gif
deleted file mode 100755
index eb930d1..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-corners.gif
deleted file mode 100755
index f075cbf..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-bg.gif
deleted file mode 100755
index cac2151..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-corners.gif
deleted file mode 100755
index 7d44a4e..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-sides.gif
deleted file mode 100755
index 28f51a8..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-bg.gif
deleted file mode 100755
index bfb864f..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-corners.gif
deleted file mode 100755
index 0326eef..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-sides.gif
deleted file mode 100755
index 2d90e1e..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-bg.gif
deleted file mode 100755
index bfb864f..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-corners.gif
deleted file mode 100755
index 252a7ad..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-sides.gif
deleted file mode 100755
index 2d90e1e..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-bg.gif
deleted file mode 100755
index d1d244b..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-corners.gif
deleted file mode 100755
index 9533cde..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-sides.gif
deleted file mode 100755
index 2675355..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-small-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-small-sides.gif
deleted file mode 100755
index fa4d868..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-small-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-corners.gif
deleted file mode 100755
index f19715a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-disabled-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-disabled-corners.gif
deleted file mode 100755
index f19715a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-disabled-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-disabled-sides.gif
deleted file mode 100755
index 51698b0..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-bg.gif
deleted file mode 100755
index 6ec023a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-corners.gif
deleted file mode 100755
index ca45195..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-sides.gif
deleted file mode 100755
index c081bb1..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-bg.gif
deleted file mode 100755
index 6ec023a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-corners.gif
deleted file mode 100755
index ca45195..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-sides.gif
deleted file mode 100755
index c081bb1..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-bg.gif
deleted file mode 100755
index 3362886..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-corners.gif
deleted file mode 100755
index b2927a9..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-sides.gif
deleted file mode 100755
index 73614a9..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-sides.gif
deleted file mode 100755
index 51698b0..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-large-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-corners.gif
deleted file mode 100755
index f19715a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-disabled-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-disabled-corners.gif
deleted file mode 100755
index f19715a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-disabled-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-disabled-sides.gif
deleted file mode 100755
index 94256ef..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-bg.gif
deleted file mode 100755
index 25b27ad..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-corners.gif
deleted file mode 100755
index 7466b5d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-sides.gif
deleted file mode 100755
index 9ca76f8..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-bg.gif
deleted file mode 100755
index 25b27ad..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-corners.gif
deleted file mode 100755
index 7466b5d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-sides.gif
deleted file mode 100755
index 9ca76f8..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-bg.gif
deleted file mode 100755
index 7299470..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-corners.gif
deleted file mode 100755
index 9533cde..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-sides.gif
deleted file mode 100755
index ab47f16..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-sides.gif
deleted file mode 100755
index 94256ef..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-medium-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-corners.gif
deleted file mode 100755
index f19715a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-disabled-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-disabled-corners.gif
deleted file mode 100755
index f19715a..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-disabled-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-disabled-sides.gif
deleted file mode 100755
index 522f864..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-bg.gif
deleted file mode 100755
index bfb864f..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-corners.gif
deleted file mode 100755
index 773747d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-sides.gif
deleted file mode 100755
index 2d90e1e..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-focus-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-bg.gif
deleted file mode 100755
index bfb864f..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-corners.gif
deleted file mode 100755
index 773747d..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-sides.gif
deleted file mode 100755
index 2d90e1e..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-bg.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-bg.gif
deleted file mode 100755
index d1d244b..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-corners.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-corners.gif
deleted file mode 100755
index 9533cde..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-sides.gif
deleted file mode 100755
index 2675355..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-pressed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-sides.gif b/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-sides.gif
deleted file mode 100755
index 522f864..0000000
Binary files a/interface/ext/resources/themes/images/gray/btn/btn-default-toolbar-small-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/arrow.gif b/interface/ext/resources/themes/images/gray/button/arrow.gif
deleted file mode 100755
index 3ab4f71..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/arrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/btn-arrow.gif b/interface/ext/resources/themes/images/gray/button/btn-arrow.gif
deleted file mode 100755
index f90d5df..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/btn-arrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/btn-sprite.gif b/interface/ext/resources/themes/images/gray/button/btn-sprite.gif
deleted file mode 100755
index 834ff97..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/btn-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/btn.gif b/interface/ext/resources/themes/images/gray/button/btn.gif
deleted file mode 100755
index 96ea61a..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/group-cs.gif b/interface/ext/resources/themes/images/gray/button/group-cs.gif
deleted file mode 100755
index 7059e2b..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/group-cs.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/group-lr.gif b/interface/ext/resources/themes/images/gray/button/group-lr.gif
deleted file mode 100755
index 3f41fbd..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/group-lr.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/group-tb.gif b/interface/ext/resources/themes/images/gray/button/group-tb.gif
deleted file mode 100755
index c5ea8ca..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/group-tb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow-b-noline.gif b/interface/ext/resources/themes/images/gray/button/s-arrow-b-noline.gif
deleted file mode 100755
index a4220ee..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow-b-noline.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow-b.gif b/interface/ext/resources/themes/images/gray/button/s-arrow-b.gif
deleted file mode 100755
index 84b6470..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow-b.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow-bo.gif b/interface/ext/resources/themes/images/gray/button/s-arrow-bo.gif
deleted file mode 100755
index fa5b2f4..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow-bo.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow-light.gif b/interface/ext/resources/themes/images/gray/button/s-arrow-light.gif
deleted file mode 100755
index 08783c9..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow-light.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow-noline.gif b/interface/ext/resources/themes/images/gray/button/s-arrow-noline.gif
deleted file mode 100755
index 0953eab..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow-noline.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow-o.gif b/interface/ext/resources/themes/images/gray/button/s-arrow-o.gif
deleted file mode 100755
index 52a5141..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow-o.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/button/s-arrow.gif b/interface/ext/resources/themes/images/gray/button/s-arrow.gif
deleted file mode 100755
index 8940774..0000000
Binary files a/interface/ext/resources/themes/images/gray/button/s-arrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/datepicker/datepicker-footer-bg.gif b/interface/ext/resources/themes/images/gray/datepicker/datepicker-footer-bg.gif
deleted file mode 100755
index e4993a2..0000000
Binary files a/interface/ext/resources/themes/images/gray/datepicker/datepicker-footer-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/datepicker/datepicker-footer-bg.png b/interface/ext/resources/themes/images/gray/datepicker/datepicker-footer-bg.png
deleted file mode 100755
index c062d0d..0000000
Binary files a/interface/ext/resources/themes/images/gray/datepicker/datepicker-footer-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/datepicker/datepicker-header-bg.gif b/interface/ext/resources/themes/images/gray/datepicker/datepicker-header-bg.gif
deleted file mode 100755
index 2427815..0000000
Binary files a/interface/ext/resources/themes/images/gray/datepicker/datepicker-header-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/datepicker/datepicker-header-bg.png b/interface/ext/resources/themes/images/gray/datepicker/datepicker-header-bg.png
deleted file mode 100755
index 45d74d7..0000000
Binary files a/interface/ext/resources/themes/images/gray/datepicker/datepicker-header-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/dd/drop-add.gif b/interface/ext/resources/themes/images/gray/dd/drop-add.gif
deleted file mode 100755
index b22cd14..0000000
Binary files a/interface/ext/resources/themes/images/gray/dd/drop-add.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/dd/drop-no.gif b/interface/ext/resources/themes/images/gray/dd/drop-no.gif
deleted file mode 100755
index 08d0833..0000000
Binary files a/interface/ext/resources/themes/images/gray/dd/drop-no.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/dd/drop-yes.gif b/interface/ext/resources/themes/images/gray/dd/drop-yes.gif
deleted file mode 100755
index 8aacb30..0000000
Binary files a/interface/ext/resources/themes/images/gray/dd/drop-yes.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/editor/tb-sprite.gif b/interface/ext/resources/themes/images/gray/editor/tb-sprite.gif
deleted file mode 100755
index fb70577..0000000
Binary files a/interface/ext/resources/themes/images/gray/editor/tb-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-corners.gif b/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-corners.gif
deleted file mode 100755
index a16f169..0000000
Binary files a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-default-corners.gif b/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-default-corners.gif
deleted file mode 100755
index a16f169..0000000
Binary files a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-default-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-default-sides.gif b/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-default-sides.gif
deleted file mode 100755
index bd64f32..0000000
Binary files a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-default-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-sides.gif b/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-sides.gif
deleted file mode 100755
index bd64f32..0000000
Binary files a/interface/ext/resources/themes/images/gray/form-invalid-tip/form-invalid-tip-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/checkbox.gif b/interface/ext/resources/themes/images/gray/form/checkbox.gif
deleted file mode 100755
index 835b346..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/checkbox.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/clear-trigger.gif b/interface/ext/resources/themes/images/gray/form/clear-trigger.gif
deleted file mode 100755
index be3ff58..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/clear-trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/date-trigger.gif b/interface/ext/resources/themes/images/gray/form/date-trigger.gif
deleted file mode 100755
index e0537cb..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/date-trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/error-tip-corners.gif b/interface/ext/resources/themes/images/gray/form/error-tip-corners.gif
deleted file mode 100755
index 6ea4c38..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/error-tip-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/exclamation.gif b/interface/ext/resources/themes/images/gray/form/exclamation.gif
deleted file mode 100755
index ea31a30..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/exclamation.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/radio.gif b/interface/ext/resources/themes/images/gray/form/radio.gif
deleted file mode 100755
index 36bb91d..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/radio.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/search-trigger.gif b/interface/ext/resources/themes/images/gray/form/search-trigger.gif
deleted file mode 100755
index 0cc4f59..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/search-trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/spinner-small.gif b/interface/ext/resources/themes/images/gray/form/spinner-small.gif
deleted file mode 100755
index e70f8d8..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/spinner-small.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/spinner.gif b/interface/ext/resources/themes/images/gray/form/spinner.gif
deleted file mode 100755
index 1e323bf..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/spinner.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/text-bg.gif b/interface/ext/resources/themes/images/gray/form/text-bg.gif
deleted file mode 100755
index 4179607..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/text-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/trigger-square.gif b/interface/ext/resources/themes/images/gray/form/trigger-square.gif
deleted file mode 100755
index 7a0f585..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/trigger-square.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/trigger-tpl.gif b/interface/ext/resources/themes/images/gray/form/trigger-tpl.gif
deleted file mode 100755
index e3701a3..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/trigger-tpl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/form/trigger.gif b/interface/ext/resources/themes/images/gray/form/trigger.gif
deleted file mode 100755
index b563474..0000000
Binary files a/interface/ext/resources/themes/images/gray/form/trigger.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/arrow-left-white.gif b/interface/ext/resources/themes/images/gray/grid/arrow-left-white.gif
deleted file mode 100755
index 63088f5..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/arrow-left-white.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/arrow-right-white.gif b/interface/ext/resources/themes/images/gray/grid/arrow-right-white.gif
deleted file mode 100755
index e9e0678..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/arrow-right-white.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/cell-special-bg.gif b/interface/ext/resources/themes/images/gray/grid/cell-special-bg.gif
deleted file mode 100755
index d76ffbc..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/cell-special-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/cell-special-bg.png b/interface/ext/resources/themes/images/gray/grid/cell-special-bg.png
deleted file mode 100755
index 0bcc236..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/cell-special-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/cell-special-selected-bg.gif b/interface/ext/resources/themes/images/gray/grid/cell-special-selected-bg.gif
deleted file mode 100755
index f1da867..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/cell-special-selected-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/cell-special-selected-bg.png b/interface/ext/resources/themes/images/gray/grid/cell-special-selected-bg.png
deleted file mode 100755
index 500c3bd..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/cell-special-selected-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/checked.gif b/interface/ext/resources/themes/images/gray/grid/checked.gif
deleted file mode 100755
index fad5893..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/checked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/col-move-bottom.gif b/interface/ext/resources/themes/images/gray/grid/col-move-bottom.gif
deleted file mode 100755
index c525f7e..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/col-move-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/col-move-top.gif b/interface/ext/resources/themes/images/gray/grid/col-move-top.gif
deleted file mode 100755
index ccc92b6..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/col-move-top.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/column-header-bg.gif b/interface/ext/resources/themes/images/gray/grid/column-header-bg.gif
deleted file mode 100755
index 5895dba..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/column-header-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/column-header-bg.png b/interface/ext/resources/themes/images/gray/grid/column-header-bg.png
deleted file mode 100755
index b181a47..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/column-header-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/column-header-over-bg.gif b/interface/ext/resources/themes/images/gray/grid/column-header-over-bg.gif
deleted file mode 100755
index 9a60738..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/column-header-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/column-header-over-bg.png b/interface/ext/resources/themes/images/gray/grid/column-header-over-bg.png
deleted file mode 100755
index 3f20649..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/column-header-over-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/columns.gif b/interface/ext/resources/themes/images/gray/grid/columns.gif
deleted file mode 100755
index 2d3a823..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/columns.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-left.gif b/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-left.gif
deleted file mode 100755
index 5d923b2..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-left.png b/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-left.png
deleted file mode 100755
index 5dc6967..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-left.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-right.gif b/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-right.gif
deleted file mode 100755
index 8d154db..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-right.png b/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-right.png
deleted file mode 100755
index b1a1819..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/dd-insert-arrow-right.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/dirty.gif b/interface/ext/resources/themes/images/gray/grid/dirty.gif
deleted file mode 100755
index 4f217a4..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/dirty.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/done.gif b/interface/ext/resources/themes/images/gray/grid/done.gif
deleted file mode 100755
index a937cb2..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/done.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/drop-no.gif b/interface/ext/resources/themes/images/gray/grid/drop-no.gif
deleted file mode 100755
index 31a332b..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/drop-no.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/drop-yes.gif b/interface/ext/resources/themes/images/gray/grid/drop-yes.gif
deleted file mode 100755
index 926010e..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/drop-yes.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/footer-bg.gif b/interface/ext/resources/themes/images/gray/grid/footer-bg.gif
deleted file mode 100755
index 126120f..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/footer-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid-blue-hd.gif b/interface/ext/resources/themes/images/gray/grid/grid-blue-hd.gif
deleted file mode 100755
index 862094e..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid-blue-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid-blue-split.gif b/interface/ext/resources/themes/images/gray/grid/grid-blue-split.gif
deleted file mode 100755
index 5286f58..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid-blue-split.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid-hrow.gif b/interface/ext/resources/themes/images/gray/grid/grid-hrow.gif
deleted file mode 100755
index 6374104..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid-hrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid-loading.gif b/interface/ext/resources/themes/images/gray/grid/grid-loading.gif
deleted file mode 100755
index d112c54..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid-loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid-split.gif b/interface/ext/resources/themes/images/gray/grid/grid-split.gif
deleted file mode 100755
index c76a16e..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid-split.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid-vista-hd.gif b/interface/ext/resources/themes/images/gray/grid/grid-vista-hd.gif
deleted file mode 100755
index d097263..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid-vista-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid3-hd-btn.gif b/interface/ext/resources/themes/images/gray/grid/grid3-hd-btn.gif
deleted file mode 100755
index daf1ef2..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid3-hd-btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid3-hrow-over.gif b/interface/ext/resources/themes/images/gray/grid/grid3-hrow-over.gif
deleted file mode 100755
index f9c07af..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid3-hrow-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid3-hrow.gif b/interface/ext/resources/themes/images/gray/grid/grid3-hrow.gif
deleted file mode 100755
index 8d459a3..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid3-hrow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/grid3-rowheader.gif b/interface/ext/resources/themes/images/gray/grid/grid3-rowheader.gif
deleted file mode 100755
index 2799b45..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/grid3-rowheader.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/group-by.gif b/interface/ext/resources/themes/images/gray/grid/group-by.gif
deleted file mode 100755
index d6075bb..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/group-by.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/group-collapse.gif b/interface/ext/resources/themes/images/gray/grid/group-collapse.gif
deleted file mode 100755
index c9ad30d..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/group-collapse.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/group-expand-sprite.gif b/interface/ext/resources/themes/images/gray/grid/group-expand-sprite.gif
deleted file mode 100755
index d24891d..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/group-expand-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/group-expand.gif b/interface/ext/resources/themes/images/gray/grid/group-expand.gif
deleted file mode 100755
index 663b5c8..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/group-expand.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hd-pop.gif b/interface/ext/resources/themes/images/gray/grid/hd-pop.gif
deleted file mode 100755
index eb8ba79..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hd-pop.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hmenu-asc.gif b/interface/ext/resources/themes/images/gray/grid/hmenu-asc.gif
deleted file mode 100755
index 8917e0e..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hmenu-asc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hmenu-desc.gif b/interface/ext/resources/themes/images/gray/grid/hmenu-desc.gif
deleted file mode 100755
index f26b7c2..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hmenu-desc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hmenu-lock.gif b/interface/ext/resources/themes/images/gray/grid/hmenu-lock.gif
deleted file mode 100755
index 1596126..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hmenu-lock.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hmenu-lock.png b/interface/ext/resources/themes/images/gray/grid/hmenu-lock.png
deleted file mode 100755
index 8b81e7f..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hmenu-lock.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hmenu-unlock.gif b/interface/ext/resources/themes/images/gray/grid/hmenu-unlock.gif
deleted file mode 100755
index af59cf9..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hmenu-unlock.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/hmenu-unlock.png b/interface/ext/resources/themes/images/gray/grid/hmenu-unlock.png
deleted file mode 100755
index 9dd5df3..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/hmenu-unlock.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/invalid_line.gif b/interface/ext/resources/themes/images/gray/grid/invalid_line.gif
deleted file mode 100755
index fb7e0f3..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/invalid_line.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/loading.gif b/interface/ext/resources/themes/images/gray/grid/loading.gif
deleted file mode 100755
index e846e1d..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/mso-hd.gif b/interface/ext/resources/themes/images/gray/grid/mso-hd.gif
deleted file mode 100755
index 669f3cf..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/mso-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/nowait.gif b/interface/ext/resources/themes/images/gray/grid/nowait.gif
deleted file mode 100755
index 4c5862c..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/nowait.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-first-disabled.gif b/interface/ext/resources/themes/images/gray/grid/page-first-disabled.gif
deleted file mode 100755
index 1e02c41..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-first-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-first.gif b/interface/ext/resources/themes/images/gray/grid/page-first.gif
deleted file mode 100755
index 60be4bc..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-first.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-last-disabled.gif b/interface/ext/resources/themes/images/gray/grid/page-last-disabled.gif
deleted file mode 100755
index 8697067..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-last-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-last.gif b/interface/ext/resources/themes/images/gray/grid/page-last.gif
deleted file mode 100755
index beb4a83..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-last.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-next-disabled.gif b/interface/ext/resources/themes/images/gray/grid/page-next-disabled.gif
deleted file mode 100755
index 90a7756..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-next-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-next.gif b/interface/ext/resources/themes/images/gray/grid/page-next.gif
deleted file mode 100755
index 97db1c2..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-next.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-prev-disabled.gif b/interface/ext/resources/themes/images/gray/grid/page-prev-disabled.gif
deleted file mode 100755
index 37154d6..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-prev-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/page-prev.gif b/interface/ext/resources/themes/images/gray/grid/page-prev.gif
deleted file mode 100755
index d07e61c..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/page-prev.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/pick-button.gif b/interface/ext/resources/themes/images/gray/grid/pick-button.gif
deleted file mode 100755
index 6957924..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/pick-button.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/property-cell-bg.gif b/interface/ext/resources/themes/images/gray/grid/property-cell-bg.gif
deleted file mode 100755
index 77d029f..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/property-cell-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/property-cell-selected-bg.gif b/interface/ext/resources/themes/images/gray/grid/property-cell-selected-bg.gif
deleted file mode 100755
index 1dfe9a6..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/property-cell-selected-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/refresh-disabled.gif b/interface/ext/resources/themes/images/gray/grid/refresh-disabled.gif
deleted file mode 100755
index 607800b..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/refresh-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/refresh.gif b/interface/ext/resources/themes/images/gray/grid/refresh.gif
deleted file mode 100755
index 868b2dc..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/refresh.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/row-check-sprite.gif b/interface/ext/resources/themes/images/gray/grid/row-check-sprite.gif
deleted file mode 100755
index 6101164..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/row-check-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/row-expand-sprite.gif b/interface/ext/resources/themes/images/gray/grid/row-expand-sprite.gif
deleted file mode 100755
index 09c00a6..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/row-expand-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/row-over.gif b/interface/ext/resources/themes/images/gray/grid/row-over.gif
deleted file mode 100755
index b288e38..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/row-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/row-sel.gif b/interface/ext/resources/themes/images/gray/grid/row-sel.gif
deleted file mode 100755
index 98209e6..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/row-sel.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/sort-hd.gif b/interface/ext/resources/themes/images/gray/grid/sort-hd.gif
deleted file mode 100755
index 4cf483d..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/sort-hd.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/sort_asc.gif b/interface/ext/resources/themes/images/gray/grid/sort_asc.gif
deleted file mode 100755
index 7e562e2..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/sort_asc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/sort_desc.gif b/interface/ext/resources/themes/images/gray/grid/sort_desc.gif
deleted file mode 100755
index 9b7a871..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/sort_desc.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/unchecked.gif b/interface/ext/resources/themes/images/gray/grid/unchecked.gif
deleted file mode 100755
index 43823e5..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/unchecked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/grid/wait.gif b/interface/ext/resources/themes/images/gray/grid/wait.gif
deleted file mode 100755
index 471c1a4..0000000
Binary files a/interface/ext/resources/themes/images/gray/grid/wait.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/layout/mini-bottom.gif b/interface/ext/resources/themes/images/gray/layout/mini-bottom.gif
deleted file mode 100755
index c18f9e3..0000000
Binary files a/interface/ext/resources/themes/images/gray/layout/mini-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/layout/mini-left.gif b/interface/ext/resources/themes/images/gray/layout/mini-left.gif
deleted file mode 100755
index 99f7993..0000000
Binary files a/interface/ext/resources/themes/images/gray/layout/mini-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/layout/mini-right.gif b/interface/ext/resources/themes/images/gray/layout/mini-right.gif
deleted file mode 100755
index 5b13c5a..0000000
Binary files a/interface/ext/resources/themes/images/gray/layout/mini-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/layout/mini-top.gif b/interface/ext/resources/themes/images/gray/layout/mini-top.gif
deleted file mode 100755
index a4ca2bb..0000000
Binary files a/interface/ext/resources/themes/images/gray/layout/mini-top.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/checked.gif b/interface/ext/resources/themes/images/gray/menu/checked.gif
deleted file mode 100755
index fad5893..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/checked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/group-checked.gif b/interface/ext/resources/themes/images/gray/menu/group-checked.gif
deleted file mode 100755
index c882488..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/group-checked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/item-over-disabled.gif b/interface/ext/resources/themes/images/gray/menu/item-over-disabled.gif
deleted file mode 100755
index 97d5ffa..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/item-over-disabled.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/item-over.gif b/interface/ext/resources/themes/images/gray/menu/item-over.gif
deleted file mode 100755
index e0dc5f7..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/item-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/menu-item-active-bg.gif b/interface/ext/resources/themes/images/gray/menu/menu-item-active-bg.gif
deleted file mode 100755
index 2edcaf8..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/menu-item-active-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/menu-item-active-corners.gif b/interface/ext/resources/themes/images/gray/menu/menu-item-active-corners.gif
deleted file mode 100755
index 45041a8..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/menu-item-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/menu-item-active-sides.gif b/interface/ext/resources/themes/images/gray/menu/menu-item-active-sides.gif
deleted file mode 100755
index 2f14a8c..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/menu-item-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/menu-parent.gif b/interface/ext/resources/themes/images/gray/menu/menu-parent.gif
deleted file mode 100755
index 5461a8b..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/menu-parent.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/menu.gif b/interface/ext/resources/themes/images/gray/menu/menu.gif
deleted file mode 100755
index 30a2c4b..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/menu.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/menu/unchecked.gif b/interface/ext/resources/themes/images/gray/menu/unchecked.gif
deleted file mode 100755
index 43823e5..0000000
Binary files a/interface/ext/resources/themes/images/gray/menu/unchecked.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-bottom-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-bottom-bg.gif
deleted file mode 100755
index 54f62aa..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-bg.gif
deleted file mode 100755
index 9b2f057..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-corners.gif
deleted file mode 100755
index 9d6aaaf..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-sides.gif
deleted file mode 100755
index b4eba79..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif
deleted file mode 100755
index f68ef47..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif
deleted file mode 100755
index 7d03854..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif
deleted file mode 100755
index e2bb230..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-bg.gif
deleted file mode 100755
index 360fbb0..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-corners.gif
deleted file mode 100755
index e4b7d1d..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-sides.gif
deleted file mode 100755
index 63526a7..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-left-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-bg.gif
deleted file mode 100755
index 82a5869..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-corners.gif
deleted file mode 100755
index 5cbcbb6..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-sides.gif
deleted file mode 100755
index a95bab4..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-right-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-bg.gif
deleted file mode 100755
index f1bf548..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-corners.gif
deleted file mode 100755
index 3b08d54..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-sides.gif
deleted file mode 100755
index 16f5233..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-collapsed-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-bg.gif
deleted file mode 100755
index 1285ccb..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-corners.gif
deleted file mode 100755
index 620f8db..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-sides.gif
deleted file mode 100755
index eecdf66..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-left-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-bg.gif
deleted file mode 100755
index 68113ab..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-corners.gif
deleted file mode 100755
index 80a12ba..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-sides.gif
deleted file mode 100755
index 825a104..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-right-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-bg.gif
deleted file mode 100755
index 0c64048..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-corners.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-corners.gif
deleted file mode 100755
index e94d882..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-sides.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-sides.gif
deleted file mode 100755
index b2dcaad..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-framed-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-left-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-left-bg.gif
deleted file mode 100755
index c95dd31..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-left-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-right-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-right-bg.gif
deleted file mode 100755
index cdc8017..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-right-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-top-bg.gif b/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-top-bg.gif
deleted file mode 100755
index d256e1b..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel-header/panel-header-default-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel/panel-default-framed-corners.gif b/interface/ext/resources/themes/images/gray/panel/panel-default-framed-corners.gif
deleted file mode 100755
index 06cb319..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel/panel-default-framed-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/panel/panel-default-framed-sides.gif b/interface/ext/resources/themes/images/gray/panel/panel-default-framed-sides.gif
deleted file mode 100755
index 3391ee6..0000000
Binary files a/interface/ext/resources/themes/images/gray/panel/panel-default-framed-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/progress/progress-default-bg.gif b/interface/ext/resources/themes/images/gray/progress/progress-default-bg.gif
deleted file mode 100755
index b29379d..0000000
Binary files a/interface/ext/resources/themes/images/gray/progress/progress-default-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/blue-loading.gif b/interface/ext/resources/themes/images/gray/shared/blue-loading.gif
deleted file mode 100755
index 3bbf639..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/blue-loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/calendar.gif b/interface/ext/resources/themes/images/gray/shared/calendar.gif
deleted file mode 100755
index 133cf23..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/calendar.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/glass-bg.gif b/interface/ext/resources/themes/images/gray/shared/glass-bg.gif
deleted file mode 100755
index 26fbbae..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/glass-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/hd-sprite.gif b/interface/ext/resources/themes/images/gray/shared/hd-sprite.gif
deleted file mode 100755
index 42da1ea..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/hd-sprite.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/icon-error.gif b/interface/ext/resources/themes/images/gray/shared/icon-error.gif
deleted file mode 100755
index 397b655..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/icon-error.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/icon-info.gif b/interface/ext/resources/themes/images/gray/shared/icon-info.gif
deleted file mode 100755
index 58281c3..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/icon-info.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/icon-question.gif b/interface/ext/resources/themes/images/gray/shared/icon-question.gif
deleted file mode 100755
index 08abd82..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/icon-question.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/icon-warning.gif b/interface/ext/resources/themes/images/gray/shared/icon-warning.gif
deleted file mode 100755
index 27ff98b..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/icon-warning.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/large-loading.gif b/interface/ext/resources/themes/images/gray/shared/large-loading.gif
deleted file mode 100755
index b36b555..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/large-loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/left-btn.gif b/interface/ext/resources/themes/images/gray/shared/left-btn.gif
deleted file mode 100755
index 3301054..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/left-btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/loading-balls.gif b/interface/ext/resources/themes/images/gray/shared/loading-balls.gif
deleted file mode 100755
index 9ce214b..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/loading-balls.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/right-btn.gif b/interface/ext/resources/themes/images/gray/shared/right-btn.gif
deleted file mode 100755
index c529110..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/right-btn.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/shadow-c.png b/interface/ext/resources/themes/images/gray/shared/shadow-c.png
deleted file mode 100755
index d435f80..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/shadow-c.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/shadow-lr.png b/interface/ext/resources/themes/images/gray/shared/shadow-lr.png
deleted file mode 100755
index bb88b6f..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/shadow-lr.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/shadow.png b/interface/ext/resources/themes/images/gray/shared/shadow.png
deleted file mode 100755
index 75c0eba..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/shadow.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/shared/warning.gif b/interface/ext/resources/themes/images/gray/shared/warning.gif
deleted file mode 100755
index 806d4bc..0000000
Binary files a/interface/ext/resources/themes/images/gray/shared/warning.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/e-handle-dark.gif b/interface/ext/resources/themes/images/gray/sizer/e-handle-dark.gif
deleted file mode 100755
index b5486c1..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/e-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/e-handle.gif b/interface/ext/resources/themes/images/gray/sizer/e-handle.gif
deleted file mode 100755
index a8ed0ed..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/e-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/ne-handle-dark.gif b/interface/ext/resources/themes/images/gray/sizer/ne-handle-dark.gif
deleted file mode 100755
index 04e5ecf..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/ne-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/ne-handle.gif b/interface/ext/resources/themes/images/gray/sizer/ne-handle.gif
deleted file mode 100755
index 6f7b0c2..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/ne-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/nw-handle-dark.gif b/interface/ext/resources/themes/images/gray/sizer/nw-handle-dark.gif
deleted file mode 100755
index 6e49d69..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/nw-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/nw-handle.gif b/interface/ext/resources/themes/images/gray/sizer/nw-handle.gif
deleted file mode 100755
index 92ad82c..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/nw-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/s-handle-dark.gif b/interface/ext/resources/themes/images/gray/sizer/s-handle-dark.gif
deleted file mode 100755
index 4eb5f0f..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/s-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/s-handle.gif b/interface/ext/resources/themes/images/gray/sizer/s-handle.gif
deleted file mode 100755
index d7eeae2..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/s-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/se-handle-dark.gif b/interface/ext/resources/themes/images/gray/sizer/se-handle-dark.gif
deleted file mode 100755
index c4c1087..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/se-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/se-handle.gif b/interface/ext/resources/themes/images/gray/sizer/se-handle.gif
deleted file mode 100755
index f011a3b..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/se-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/square.gif b/interface/ext/resources/themes/images/gray/sizer/square.gif
deleted file mode 100755
index 7751d5e..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/square.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/sw-handle-dark.gif b/interface/ext/resources/themes/images/gray/sizer/sw-handle-dark.gif
deleted file mode 100755
index 77224b0..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/sw-handle-dark.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/sizer/sw-handle.gif b/interface/ext/resources/themes/images/gray/sizer/sw-handle.gif
deleted file mode 100755
index aa903dd..0000000
Binary files a/interface/ext/resources/themes/images/gray/sizer/sw-handle.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-bg.gif b/interface/ext/resources/themes/images/gray/slider/slider-bg.gif
deleted file mode 100755
index fbf3ba8..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-bg.png b/interface/ext/resources/themes/images/gray/slider/slider-bg.png
deleted file mode 100755
index b3eaf52..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-thumb.gif b/interface/ext/resources/themes/images/gray/slider/slider-thumb.gif
deleted file mode 100755
index 5ba1dfb..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-thumb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-thumb.png b/interface/ext/resources/themes/images/gray/slider/slider-thumb.png
deleted file mode 100755
index 4bf01be..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-thumb.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-v-bg.gif b/interface/ext/resources/themes/images/gray/slider/slider-v-bg.gif
deleted file mode 100755
index 0cf8c4b..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-v-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-v-bg.png b/interface/ext/resources/themes/images/gray/slider/slider-v-bg.png
deleted file mode 100755
index 121450c..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-v-bg.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-v-thumb.gif b/interface/ext/resources/themes/images/gray/slider/slider-v-thumb.gif
deleted file mode 100755
index 58afe96..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-v-thumb.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/slider/slider-v-thumb.png b/interface/ext/resources/themes/images/gray/slider/slider-v-thumb.png
deleted file mode 100755
index 6b3eeb7..0000000
Binary files a/interface/ext/resources/themes/images/gray/slider/slider-v-thumb.png and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab-bar/scroll-left.gif b/interface/ext/resources/themes/images/gray/tab-bar/scroll-left.gif
deleted file mode 100755
index bbb3e3d..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab-bar/scroll-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab-bar/scroll-right.gif b/interface/ext/resources/themes/images/gray/tab-bar/scroll-right.gif
deleted file mode 100755
index feb6a76..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab-bar/scroll-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab-bar/tab-bar-default-bg.gif b/interface/ext/resources/themes/images/gray/tab-bar/tab-bar-default-bg.gif
deleted file mode 100755
index d0f507b..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab-bar/tab-bar-default-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-bg.gif
deleted file mode 100755
index 2c7b7b3..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-corners.gif
deleted file mode 100755
index a99eabf..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-sides.gif
deleted file mode 100755
index 0c90ec0..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-bg.gif
deleted file mode 100755
index e85bebe..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-corners.gif
deleted file mode 100755
index 95a6f12..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-bg.gif
deleted file mode 100755
index 7969299..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-corners.gif
deleted file mode 100755
index d856670..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-sides.gif
deleted file mode 100755
index 7364cfe..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-bg.gif
deleted file mode 100755
index 9b0e608..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-corners.gif
deleted file mode 100755
index 8129ad7..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-sides.gif
deleted file mode 100755
index 697ee94..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-sides.gif
deleted file mode 100755
index 39e70ae..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-close.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-close.gif
deleted file mode 100755
index 98d5da9..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-close.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-bg.gif
deleted file mode 100755
index 9bd16dd..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-corners.gif
deleted file mode 100755
index 10220d4..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-sides.gif
deleted file mode 100755
index 057bd7e..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-active-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-bg.gif
deleted file mode 100755
index 65e303b..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-corners.gif
deleted file mode 100755
index c1ac52e..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-bg.gif
deleted file mode 100755
index 6ba389c..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-corners.gif
deleted file mode 100755
index 30a99b0..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-sides.gif
deleted file mode 100755
index 8ed83d2..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-disabled-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-bg.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-bg.gif
deleted file mode 100755
index 64edaf0..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-corners.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-corners.gif
deleted file mode 100755
index 54efa0c..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-sides.gif
deleted file mode 100755
index 90c3f64..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-over-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tab/tab-default-top-sides.gif b/interface/ext/resources/themes/images/gray/tab/tab-default-top-sides.gif
deleted file mode 100755
index 39ea2d8..0000000
Binary files a/interface/ext/resources/themes/images/gray/tab/tab-default-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tip/tip-corners.gif b/interface/ext/resources/themes/images/gray/tip/tip-corners.gif
deleted file mode 100755
index b9000bd..0000000
Binary files a/interface/ext/resources/themes/images/gray/tip/tip-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tip/tip-sides.gif b/interface/ext/resources/themes/images/gray/tip/tip-sides.gif
deleted file mode 100755
index 48ad83d..0000000
Binary files a/interface/ext/resources/themes/images/gray/tip/tip-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/toolbar/more.gif b/interface/ext/resources/themes/images/gray/toolbar/more.gif
deleted file mode 100755
index 02c2509..0000000
Binary files a/interface/ext/resources/themes/images/gray/toolbar/more.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/toolbar/scroll-left.gif b/interface/ext/resources/themes/images/gray/toolbar/scroll-left.gif
deleted file mode 100755
index 2db8cf5..0000000
Binary files a/interface/ext/resources/themes/images/gray/toolbar/scroll-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/toolbar/scroll-right.gif b/interface/ext/resources/themes/images/gray/toolbar/scroll-right.gif
deleted file mode 100755
index 5d5a7ab..0000000
Binary files a/interface/ext/resources/themes/images/gray/toolbar/scroll-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/toolbar/toolbar-default-bg.gif b/interface/ext/resources/themes/images/gray/toolbar/toolbar-default-bg.gif
deleted file mode 100755
index cd96024..0000000
Binary files a/interface/ext/resources/themes/images/gray/toolbar/toolbar-default-bg.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tools/tool-sprite-tpl.gif b/interface/ext/resources/themes/images/gray/tools/tool-sprite-tpl.gif
deleted file mode 100755
index 18277a3..0000000
Binary files a/interface/ext/resources/themes/images/gray/tools/tool-sprite-tpl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tools/tool-sprites.gif b/interface/ext/resources/themes/images/gray/tools/tool-sprites.gif
deleted file mode 100755
index 36b6b67..0000000
Binary files a/interface/ext/resources/themes/images/gray/tools/tool-sprites.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tools/tools-sprites-trans.gif b/interface/ext/resources/themes/images/gray/tools/tools-sprites-trans.gif
deleted file mode 100755
index b6d7ba3..0000000
Binary files a/interface/ext/resources/themes/images/gray/tools/tools-sprites-trans.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/arrows.gif b/interface/ext/resources/themes/images/gray/tree/arrows.gif
deleted file mode 100755
index 2683463..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/arrows.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-above.gif b/interface/ext/resources/themes/images/gray/tree/drop-above.gif
deleted file mode 100755
index 30d1ca7..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-above.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-add.gif b/interface/ext/resources/themes/images/gray/tree/drop-add.gif
deleted file mode 100755
index b22cd14..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-add.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-append.gif b/interface/ext/resources/themes/images/gray/tree/drop-append.gif
deleted file mode 100755
index b22cd14..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-append.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-below.gif b/interface/ext/resources/themes/images/gray/tree/drop-below.gif
deleted file mode 100755
index 85f66b1..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-below.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-between.gif b/interface/ext/resources/themes/images/gray/tree/drop-between.gif
deleted file mode 100755
index 5c6c09d..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-between.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-no.gif b/interface/ext/resources/themes/images/gray/tree/drop-no.gif
deleted file mode 100755
index 9d9c6a9..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-no.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-over.gif b/interface/ext/resources/themes/images/gray/tree/drop-over.gif
deleted file mode 100755
index 30d1ca7..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-over.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-under.gif b/interface/ext/resources/themes/images/gray/tree/drop-under.gif
deleted file mode 100755
index 85f66b1..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-under.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/drop-yes.gif b/interface/ext/resources/themes/images/gray/tree/drop-yes.gif
deleted file mode 100755
index 8aacb30..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/drop-yes.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-end-minus-nl.gif b/interface/ext/resources/themes/images/gray/tree/elbow-end-minus-nl.gif
deleted file mode 100755
index 928779e..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-end-minus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-end-minus.gif b/interface/ext/resources/themes/images/gray/tree/elbow-end-minus.gif
deleted file mode 100755
index 9a8d727..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-end-minus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-end-plus-nl.gif b/interface/ext/resources/themes/images/gray/tree/elbow-end-plus-nl.gif
deleted file mode 100755
index 9f7f698..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-end-plus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-end-plus.gif b/interface/ext/resources/themes/images/gray/tree/elbow-end-plus.gif
deleted file mode 100755
index 5943a01..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-end-plus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-end.gif b/interface/ext/resources/themes/images/gray/tree/elbow-end.gif
deleted file mode 100755
index f24ddee..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-end.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-line.gif b/interface/ext/resources/themes/images/gray/tree/elbow-line.gif
deleted file mode 100755
index 75e6da4..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-line.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-minus-nl.gif b/interface/ext/resources/themes/images/gray/tree/elbow-minus-nl.gif
deleted file mode 100755
index 928779e..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-minus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-minus.gif b/interface/ext/resources/themes/images/gray/tree/elbow-minus.gif
deleted file mode 100755
index 97dcc71..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-minus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-plus-nl.gif b/interface/ext/resources/themes/images/gray/tree/elbow-plus-nl.gif
deleted file mode 100755
index 9f7f698..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-plus-nl.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow-plus.gif b/interface/ext/resources/themes/images/gray/tree/elbow-plus.gif
deleted file mode 100755
index 698de47..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow-plus.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/elbow.gif b/interface/ext/resources/themes/images/gray/tree/elbow.gif
deleted file mode 100755
index b8f4208..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/elbow.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/folder-open.gif b/interface/ext/resources/themes/images/gray/tree/folder-open.gif
deleted file mode 100755
index 56ba737..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/folder-open.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/folder.gif b/interface/ext/resources/themes/images/gray/tree/folder.gif
deleted file mode 100755
index 20412f7..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/folder.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/leaf.gif b/interface/ext/resources/themes/images/gray/tree/leaf.gif
deleted file mode 100755
index 445769d..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/leaf.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/loading.gif b/interface/ext/resources/themes/images/gray/tree/loading.gif
deleted file mode 100755
index e846e1d..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/loading.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/tree/s.gif b/interface/ext/resources/themes/images/gray/tree/s.gif
deleted file mode 100755
index 1d11fa9..0000000
Binary files a/interface/ext/resources/themes/images/gray/tree/s.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/util/splitter/mini-bottom.gif b/interface/ext/resources/themes/images/gray/util/splitter/mini-bottom.gif
deleted file mode 100755
index c18f9e3..0000000
Binary files a/interface/ext/resources/themes/images/gray/util/splitter/mini-bottom.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/util/splitter/mini-left.gif b/interface/ext/resources/themes/images/gray/util/splitter/mini-left.gif
deleted file mode 100755
index 99f7993..0000000
Binary files a/interface/ext/resources/themes/images/gray/util/splitter/mini-left.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/util/splitter/mini-right.gif b/interface/ext/resources/themes/images/gray/util/splitter/mini-right.gif
deleted file mode 100755
index 5b13c5a..0000000
Binary files a/interface/ext/resources/themes/images/gray/util/splitter/mini-right.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/util/splitter/mini-top.gif b/interface/ext/resources/themes/images/gray/util/splitter/mini-top.gif
deleted file mode 100755
index a4ca2bb..0000000
Binary files a/interface/ext/resources/themes/images/gray/util/splitter/mini-top.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-bottom-corners.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-bottom-corners.gif
deleted file mode 100755
index 2508ffa..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-bottom-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-bottom-sides.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-bottom-sides.gif
deleted file mode 100755
index 3693bd7..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-bottom-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-left-corners.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-left-corners.gif
deleted file mode 100755
index 2567539..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-left-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-left-sides.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-left-sides.gif
deleted file mode 100755
index a75896b..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-left-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-right-corners.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-right-corners.gif
deleted file mode 100755
index 6a630bc..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-right-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-right-sides.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-right-sides.gif
deleted file mode 100755
index 89d50f7..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-right-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-top-corners.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-top-corners.gif
deleted file mode 100755
index 2d2d8f6..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-top-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window-header/window-header-default-top-sides.gif b/interface/ext/resources/themes/images/gray/window-header/window-header-default-top-sides.gif
deleted file mode 100755
index 3693bd7..0000000
Binary files a/interface/ext/resources/themes/images/gray/window-header/window-header-default-top-sides.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window/icon-error.gif b/interface/ext/resources/themes/images/gray/window/icon-error.gif
deleted file mode 100755
index 397b655..0000000
Binary files a/interface/ext/resources/themes/images/gray/window/icon-error.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window/icon-info.gif b/interface/ext/resources/themes/images/gray/window/icon-info.gif
deleted file mode 100755
index 58281c3..0000000
Binary files a/interface/ext/resources/themes/images/gray/window/icon-info.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window/icon-question.gif b/interface/ext/resources/themes/images/gray/window/icon-question.gif
deleted file mode 100755
index 08abd82..0000000
Binary files a/interface/ext/resources/themes/images/gray/window/icon-question.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window/icon-warning.gif b/interface/ext/resources/themes/images/gray/window/icon-warning.gif
deleted file mode 100755
index 27ff98b..0000000
Binary files a/interface/ext/resources/themes/images/gray/window/icon-warning.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window/window-default-corners.gif b/interface/ext/resources/themes/images/gray/window/window-default-corners.gif
deleted file mode 100755
index f9bccbb..0000000
Binary files a/interface/ext/resources/themes/images/gray/window/window-default-corners.gif and /dev/null differ
diff --git a/interface/ext/resources/themes/images/gray/window/window-default-sides.gif b/interface/ext/resources/themes/images/gray/window/window-default-sides.gif
deleted file mode 100755
index d02950f..0000000
Binary files a/interface/ext/resources/themes/images/gray/window/window-default-sides.gif and /dev/null differ
diff --git a/interface/index.html b/interface/index.html
deleted file mode 100755
index 8bda3d1..0000000
--- a/interface/index.html
+++ /dev/null
@@ -1,468 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>istSOS webadmin developer page</title>
-	<link rel="icon" href="favicon.ico" />
-	<link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <!--[if gte IE 9]>
-            <style type="text/css">
-                .gradient {
-                filter: none;
-                }
-            </style>
-        <![endif]-->
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-
-        <link href='https://fonts.googleapis.com/css?family=Electrolize' rel='stylesheet' type='text/css'>
-        <!--
-        <link href='http://fonts.googleapis.com/css?family=Karla:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Exo' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Patrick+Hand' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Nova+Square' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Mate+SC' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Imprima' rel='stylesheet' type='text/css'>
-        -->
-
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-
-        <script type="text/javascript" src="dygraphs/dygraph-combined.js"></script>
-        <!--<script type="text/javascript" src="http://dygraphs.com/dygraph-dev.js"></script>-->
-
-        <script type="text/javascript" src="codemirror/lib/codemirror.js"></script>
-        <link   rel="stylesheet" href="codemirror/lib/codemirror.css">
-        <script type="text/javascript" src="codemirror/mode/javascript/javascript.js"></script>
-        <script type="text/javascript" src="codemirror/mode/python/python.js"></script>
-        <script type="text/javascript" src="ext/codemirror.js"></script>
-
-
-        <script type="text/javascript" src="app/engine/wa.js"></script>
-        <script type="text/javascript" src="app/engine/pageConfig.js"></script>
-        <script type="text/javascript" src="app/engine/pageManager.js"></script>
-
-        <script type="text/javascript">
-            
-            function pad(n){return n<10 ? '0'+n : n}
-            
-            function ISO8601FromDate(isodate) {
-                alert("ISO8601FromDate is deprecated!!");
-                function pad(n){return n<10 ? '0'+n : n}
-                var offset = isodate.getTimezoneOffset()/-60;
-                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
-                return isodate.getFullYear()+'-'
-                    + pad(isodate.getMonth()+1)+'-'
-                    + pad(isodate.getDate())+'T'
-                    + pad(isodate.getHours())+':'
-                    + pad(isodate.getMinutes())+':'
-                    + pad(isodate.getSeconds())+'.'
-                    + isodate.getMilliseconds() + tz;
-            }
-            String.prototype.capitalize = function(){
-                return this.toLowerCase().replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
-            };
-            Ext.override(Ext.layout.Layout, {
-                renderItem: function(item, target, position) {
-                    if (item && !item.rendered && item.isFieldLabelable && item.fieldLabel && item.allowBlank == false) {
-                        item.fieldLabel = '<span title="This is a mandatory parameter">' + item.fieldLabel + '<span style="color:red">*</span></span>';
-                    }
-                    this.callOverridden(arguments);
-                }
-            });
-            Function.prototype.defer =
-                function(n,o) {
-                // Get arguments as array
-                var a = [];
-                for(var i=2; i<arguments.length; i++)
-                    a.push(arguments[i]);
-                var that = this;
-                window.setTimeout(function(){return that.apply(o,a);},n);
-            };
-            Ext.override(Ext.chart.Chart, {  
-                onMouseUp: function(e) {
-                    var me = this,
-                    position = me.getEventXY(e),
-                    item;
-                    if (me.mask) {
-                        me.mixins.mask.onMouseUp.call(me, e);
-                    }
-                    me.series.each(function(series) {
-                        if (Ext.draw.Draw.withinBox(position[0], position[1], series.bbox)) {
-                            if (series.getItemForPoint) {
-                                item = series.getItemForPoint(position[0], position[1]);
-                                if (item) {
-                                    series.fireEvent('itemmouseup', item, e);
-                                }
-                            }
-                        }
-                    }, me);
-                }
-            });
-            Ext.override(Ext.view.DropZone, {  
-                onNodeDrop: function (node, dragZone, e, data) {
-                    var me = this,
-                    dropHandled = false,
-                    dropHandlers = {
-                        wait : false,
-                        processDrop : function () {
-                            me.invalidateDrop();
-                            me.handleNodeDrop(data, me.overRecord, me.currentPosition);
-                            dropHandled = true;
-                            me.fireViewEvent('drop', node, data, me.overRecord, me.currentPosition);
-                        },
-                        cancelDrop : function () {
-                            me.invalidateDrop();
-                            dropHandled = true;
-                        }
-                    },
-                    performOperation = false;
-                    if (me.valid) {
-                        performOperation = me.fireViewEvent('beforedrop', node, data, me.overRecord, me.currentPosition, dropHandlers);
-                        if (dropHandlers.wait) {
-                            return;
-                        }
-                        if (performOperation !== false) {
-                            if (!dropHandled) {
-                                dropHandlers.processDrop();
-                            }
-                        }
-                    }
-                    return performOperation;
-                }
-            });
-            
-            
-            Ext.override(Ext.form.FieldSet, {
-                setExpanded: function(expanded) {
-                    var me = this,
-                    checkboxCmp = me.checkboxCmp,
-                    toggleCmp = me.toggleCmp,
-                    event;
-
-                    expanded = !!expanded;
-        
-                    if (checkboxCmp) {
-                        checkboxCmp.setValue(expanded);
-                    }
-        
-                    if (toggleCmp) {
-                        toggleCmp.setType(expanded ? 'up' : 'down');
-                    }
-        
-                    if (expanded) {
-                        event = "expand";
-                        me.removeCls(me.baseCls + '-collapsed');
-                    } else {
-                        event = "collapse";
-                        me.addCls(me.baseCls + '-collapsed');
-                    }
-                    me.collapsed = !expanded;
-                    if (expanded) {
-                        // ensure subitems will get rendered and layed out when expanding
-                        me.getComponentLayout().childrenChanged = true;
-                    }
-                    me.doComponentLayout();
-                    me.fireEvent(event, me);
-                    return me;
-                }
-            });
-
-            /* 
-            This reusable script is copyrighted.
-            Copyright (c) 2004,2005,2006 Claude Ostyn
-            This script is free for use with attribution
-            under the Creative Commons Attribution-ShareAlike 2.5 License.
-            To view a copy of this license, visit
-            http://creativecommons.org/licenses/by-sa/2.5/
-            or send a letter to
-            Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-
-            For any other use, contact Claude Ostyn via tools at Ostyn.com.
-
-            USE AT YOUR OWN RISK!
-            THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-            EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-            OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-            NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER
-            BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-            ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-            CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-            SOFTWARE.
-             */
-
-            function centisecsToISODuration(n, bPrecise)
-            {
-                // Note: SCORM and IEEE 1484.11.1 require centisec precision
-                // Parameters:
-                // n = number of centiseconds
-                // bPrecise = optional parameter; if true, duration will
-                // be expressed without using year and/or month fields.
-                // If bPrecise is not true, and the duration is long,
-                // months are calculated by approximation based on average number
-                // of days over 4 years (365*4+1), not counting the extra days
-                // for leap years. If a reference date was available,
-                // the calculation could be more precise, but becomes complex,
-                // since the exact result depends on where the reference date
-                // falls within the period (e.g. beginning, end or ???)
-                // 1 year ~ (365*4+1)/4*60*60*24*100 = 3155760000 centiseconds
-                // 1 month ~ (365*4+1)/48*60*60*24*100 = 262980000 centiseconds
-                // 1 day = 8640000 centiseconds
-                // 1 hour = 360000 centiseconds
-                // 1 minute = 6000 centiseconds
-                var str = "P";
-                var nCs=n;
-                var nY=0, nM=0, nD=0, nH=0, nMin=0, nS=0;
-                n = Math.max(n,0); // there is no such thing as a negative duration
-                var nCs = n;
-                // Next set of operations uses whole seconds
-                with (Math)
-                {
-                    nCs = round(nCs);
-                    if (bPrecise == true)
-                    {
-                        nD = floor(nCs / 8640000);
-                    }
-                    else
-                    {
-                        nY = floor(nCs / 3155760000);
-                        nCs -= nY * 3155760000;
-                        nM = floor(nCs / 262980000);
-                        nCs -= nM * 262980000;
-                        nD = floor(nCs / 8640000);
-                    }
-                    nCs -= nD * 8640000;
-                    nH = floor(nCs / 360000);
-                    nCs -= nH * 360000;
-                    var nMin = floor(nCs /6000);
-                    nCs -= nMin * 6000
-                }
-                // Now we can construct string
-                if (nY > 0) str += nY + "Y";
-                if (nM > 0) str += nM + "M";
-                if (nD > 0) str += nD + "D";
-                if ((nH > 0) || (nMin > 0) || (nCs > 0))
-                {
-                    str += "T";
-                    if (nH > 0) str += nH + "H";
-                    if (nMin > 0) str += nMin + "M";
-                    if (nCs > 0) str += (nCs / 100) + "S";
-                }
-                if (str == "P") str = "PT0H0M0S";
-                // technically PT0S should do but SCORM test suite assumes longer form.
-                return str;
-            }
-        </script>
-        <script type="text/javascript" src="app/view/ui/BasePage.js"></script>
-        <script type="text/javascript" src="app/view/BasePage.js"></script>
-        <script type="text/javascript" src="app/view/ui/CenterPage.js"></script>
-        <script type="text/javascript" src="app/view/ui/WizardPage.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/contactinfo.js"></script>
-        <script type="text/javascript" src="app/view/contactinfo.js"></script>
-        <script type="text/javascript" src="app/view/ui/paths.js"></script>
-        <script type="text/javascript" src="app/view/paths.js"></script>
-        <script type="text/javascript" src="app/view/ui/about.js"></script>
-        <script type="text/javascript" src="app/view/about.js"></script>
-        <script type="text/javascript" src="app/view/ui/contacts.js"></script>
-        <script type="text/javascript" src="app/view/contacts.js"></script>
-        <script type="text/javascript" src="app/view/ui/config.js"></script>
-        <script type="text/javascript" src="app/view/config.js"></script>
-        <script type="text/javascript" src="app/view/ui/database.js"></script>
-        <script type="text/javascript" src="app/view/database.js"></script>
-        <script type="text/javascript" src="app/view/ui/newservice.js"></script>
-        <script type="text/javascript" src="app/view/newservice.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/identification.js"></script>
-        <script type="text/javascript" src="app/view/identification.js"></script>
-        <script type="text/javascript" src="app/view/ui/provider.js"></script>
-        <script type="text/javascript" src="app/view/provider.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/FormDataQuality.js"></script>
-        <script type="text/javascript" src="app/view/FormDataQuality.js"></script>
-        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
-
-
-        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
-        <script type="text/javascript" src="app/store/Offerings.js"></script>
-        <script type="text/javascript" src="app/store/Procedures.js"></script>
-        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
-        <!--<script type="text/javascript" src="app/store/Observations.js"></script>-->
-
-        <script type="text/javascript" src="app/store/Services.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/ObservationEditorColumn.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditorColumn.js"></script>
-        <script type="text/javascript" src="app/view/ui/ObservationEditor.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditor.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/serviceconfig.js"></script>
-        <script type="text/javascript" src="app/view/serviceconfig.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/geo.js"></script>
-        <script type="text/javascript" src="app/view/geo.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/getobservation.js"></script>
-        <script type="text/javascript" src="app/view/getobservation.js"></script>
-
-        <script type="text/javascript" src="app/store/serverstatus.js"></script>
-
-
-        <script type="text/javascript" src="app/view/ui/status.js"></script>
-        <script type="text/javascript" src="app/view/status.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/serviceurl.js"></script>
-        <script type="text/javascript" src="app/view/serviceurl.js"></script>
-
-        <script type="text/javascript" src="app/store/cmbIdentification.js"></script>
-        <script type="text/javascript" src="app/store/cmbSystemType.js"></script>
-        <script type="text/javascript" src="app/store/cmbSml.js"></script>
-        <script type="text/javascript" src="app/store/cmbName.js"></script>
-        <script type="text/javascript" src="app/store/cmbDocumentFormat.js"></script>
-        <script type="text/javascript" src="app/store/gridDocumentation.js"></script>
-        <script type="text/javascript" src="app/store/gridOutputs.js"></script>
-        <script type="text/javascript" src="app/store/Constraint.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/procedure.js"></script>
-        <script type="text/javascript" src="app/view/procedure.js"></script>
-
-        <script type="text/javascript" src="app/store/gridProceduresList.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/proceduresList.js"></script>
-        <script type="text/javascript" src="app/view/proceduresList.js"></script>
-
-        <script type="text/javascript" src="app/store/gridObservedProperties.js"></script>
-        <script type="text/javascript" src="app/store/gridUoms.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/obsPropEditor.js"></script>
-        <script type="text/javascript" src="app/view/obsPropEditor.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/uomsEditor.js"></script>
-        <script type="text/javascript" src="app/view/uomsEditor.js"></script>
-
-        <script type="text/javascript" src="app/store/gridOfferings.js"></script>
-        <script type="text/javascript" src="app/view/ui/offeringsEditor.js"></script>
-        <script type="text/javascript" src="app/view/offeringsEditor.js"></script>
-
-        <script type="text/javascript" src="app/store/cmbNameDescription.js"></script>
-        <script type="text/javascript" src="app/view/ui/qualityindexEditor.js"></script>
-        <script type="text/javascript" src="app/view/qualityindexEditor.js"></script>
-
-        <!-- DEVELOPERS INCLUDE -->
-        <script type="text/javascript" src="app/view/ui/MainMenu.js"></script>
-        <script type="text/javascript" src="app/view/MainMenu.js"></script>
-        <script type="text/javascript" src="app/view/ui/MainMenu2.js"></script>
-        <script type="text/javascript" src="app/view/MainMenu2.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/ObservationEditorAdvancedOperations.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditorAdvancedOperations.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/serviceEditor.js"></script>
-        <script type="text/javascript" src="app/view/serviceEditor.js"></script>
-
-
-        <script type="text/javascript" src="app/Procedure.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/ProcedureChooser.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureChooser.js"></script>
-        
-        <script type="text/javascript" src="app/view/ui/ProcedurePlotter.js"></script>
-        <script type="text/javascript" src="app/view/ProcedurePlotter.js"></script>
-        
-        <script type="text/javascript" src="app/view/ui/CheckColumn.js"></script>
-        <script type="text/javascript" src="app/view/CheckColumn.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/Calc.js"></script>
-        <script type="text/javascript" src="app/view/Calc.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/Chart.js"></script>
-        <script type="text/javascript" src="app/view/Chart.js"></script>
-        
-        
-        <script type="text/javascript" src="app/view/ui/ProcedureChart.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureChart.js"></script>
-        <script type="text/javascript" src="app/view/ui/ProcedureGrid.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureGrid.js"></script>
-        <script type="text/javascript" src="app/view/ui/ProcedureGridEditor.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureGridEditor.js"></script>
-        
-        
-        <script type="text/javascript" src="app/view/ui/Editor1.js"></script>
-        <script type="text/javascript" src="app/view/Editor1.js"></script>
-        
-        
-        <script type="text/javascript" src="app/store/RatingCurve.js"></script>
-        <script type="text/javascript" src="app/store/vplist.js"></script>
-        <script type="text/javascript" src="app/view/ui/VirtualProcedureEditor.js"></script>
-        <script type="text/javascript" src="app/view/VirtualProcedureEditor.js"></script>
-
-
-
-        <style type="text/css">
-            .x-btn-default-toolbar-small .x-btn-inner {
-                color: white !important;
-            }
-            .x-btn-arrow {
-                background-image: url('ext/resources/themes/images/default/button/arrow.gif');
-                display: block;
-            }
-        </style>
-
-        <script type="text/javascript">
-            
-            Ext.ns("wa");
-            wa.isodef = "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601";
-            wa.url = "../wa";
-
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-            
-            Ext.application({
-                
-                name: 'istsos',
-
-                launch: function() {
-                    
-                    Ext.QuickTips.init();
-                    
-                    Ext.Ajax.on("requestexception",function(conn, response, options, eOpts ){
-                        try{
-                            var json = Ext.decode(response.responseText);
-                            if(!json.success && !Ext.isEmpty(json.message)){
-                                Ext.Msg.alert(response.statusText, json.message);
-                            }
-                        }catch(e){
-                            console.error(response);
-                        }
-                    });
-                    
-                    Ext.Ajax.on("requestcomplete",function(conn, response, options, eOpts ){
-                        try{
-                            var json = Ext.decode(response.responseText);
-                            if(!json.success && !Ext.isEmpty(json.message)){
-                                Ext.Msg.alert("Server message",json.message + "<br/><br/>" + 
-                                    "<small>Status response: " + response.statusText + "</small><br/>" + 
-                                    "<small>Resource: " + json.resource + "</small><br/>" + 
-                                    "<small>Method: " + json.method + "</small><br/>" + 
-                                    "<small>Path " + json.path + "</small>");
-                                console.error(json.message);
-                            }else if (json.success && !Ext.isEmpty(json.message)){
-                                console.log(json.message);
-                            }
-                        }catch(e){
-                            console.error(response);
-                        }
-                    });
-                    
-                    
-                    
-                    Ext.create('Ext.Viewport', {
-                        layout: "fit",
-                        items: Ext.create('istsos.view.MainMenu2')
-                    }).show();
-                    
-                }
-            });
-        </script>
-    </head>
-    <body></body>
-</html>
diff --git a/interface/istsos-old.xds b/interface/istsos-old.xds
deleted file mode 100755
index 083d514..0000000
--- a/interface/istsos-old.xds
+++ /dev/null
@@ -1,10998 +0,0 @@
-{
-    "name": "istsos.xds",
-    "settings": {
-        "urlPrefix": "http://localhost/",
-        "directAPI": "",
-        "spacesToIndent": "4",
-        "codeGenFormat": "Class",
-        "exportPath": ".",
-        "extPath": "ext/",
-        "lineEnding": "LF",
-        "instantiateStore": true,
-        "exportXDSFiles": true,
-        "genTimestamps": true,
-        "appName": "istsos"
-    },
-    "xdsVersion": "1.2.3",
-    "components": [
-        {
-            "id": "ExtBox1-ext-gen1666",
-            "type": "viewport",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "id": "mainPanel",
-                "itemId": "",
-                "layout": "border",
-                "designer|userClassName": "MainPanel"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen1754",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "mainCenter",
-                        "layout": "fit",
-                        "bodyPadding": "8px",
-                        "title": "",
-                        "designer|userClassName": "MyPanel",
-                        "layout|region": "center"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2198",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "cls": null,
-                        "height": 70,
-                        "html": "<div class='mainHeaderTitle'>istSOS manager</div>\n<div class='mainHeaderSubtitle'> > Control Panel for Sensor Observation Service</div>",
-                        "id": "mainHead",
-                        "padding": null,
-                        "bodyCls": "mainHeader",
-                        "bodyPadding": "15 0 0 8",
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel2",
-                        "layout|region": "north"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2515",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 25,
-                        "html": "Open Source Software by Institute of Earth Science - SUPSI",
-                        "id": "mainFoot",
-                        "bodyCls": "mainFooter",
-                        "bodyPadding": 8,
-                        "title": "",
-                        "designer|userClassName": "MyPanel3",
-                        "layout|region": "south"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen5563",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "panelMenu",
-                        "width": 210,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel13",
-                        "layout|region": "west"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen12379",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 30,
-                                "style": "background-color: white !important;",
-                                "ui": null,
-                                "designer|userClassName": "MyToolbar5",
-                                "container|align": "stretch",
-                                "container|padding": 2,
-                                "layout|region": "north",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen12556",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnMainMenu",
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "Server",
-                                        "toggleGroup": "menugroup",
-                                        "designer|userClassName": "MyButton7",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen12776",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnServicesMenu",
-                                        "enableToggle": true,
-                                        "text": "Services",
-                                        "toggleGroup": "menugroup",
-                                        "designer|userClassName": "MyButton8",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen12998",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnDataMenu",
-                                        "enableToggle": true,
-                                        "text": "Data",
-                                        "toggleGroup": "menugroup",
-                                        "designer|userClassName": "MyButton9",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen6842",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "menuCard",
-                                "activeItem": 0,
-                                "layout": "card",
-                                "title": "",
-                                "designer|userClassName": "MyPanel15",
-                                "layout|region": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen2221",
-                                    "type": "component",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "baseCls": null,
-                                        "id": "mainMenu",
-                                        "padding": "10px",
-                                        "style": "background: #fff;",
-                                        "styleHtmlContent": true,
-                                        "width": 150,
-                                        "designer|userClassName": "MyComponent"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen16528",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "servicesMenu",
-                                        "layout": "accordion",
-                                        "bodyPadding": "10px",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel16"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen2664",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "style": null,
-                "width": null,
-                "layout": "border",
-                "bodyStyle": null,
-                "designer|userClassName": "BasePage"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen2804",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "cls": null,
-                        "componentCls": null,
-                        "height": null,
-                        "hidden": true,
-                        "padding": null,
-                        "layout": "fit",
-                        "bodyBorder": true,
-                        "bodyCls": "centerTitle",
-                        "bodyPadding": "8px",
-                        "designer|userClassName": "MyContainer1",
-                        "layout|region": "north"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2986",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": null,
-                        "margin": null,
-                        "style": null,
-                        "styleHtmlContent": true,
-                        "autoScroll": true,
-                        "layout": "anchor",
-                        "bodyBorder": true,
-                        "bodyCls": "centerBody",
-                        "bodyPadding": "8 8 8 16",
-                        "bodyStyle": null,
-                        "designer|userClassName": "MyContainer2",
-                        "layout|region": "center"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen3196",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 20,
-                        "hidden": true,
-                        "bodyPadding": "8px",
-                        "designer|userClassName": "MyContainer3",
-                        "layout|region": "south"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen9226",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": "contactinfo",
-                "width": null,
-                "bodyPadding": 10,
-                "bodyStyle": "centerBody",
-                "title": "",
-                "designer|userClassName": "contactinfo"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen6578",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen9554",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "contact",
-                        "fieldLabel": "Contact",
-                        "designer|userClassName": "MyTextField",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen9777",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "organization",
-                        "fieldLabel": "Organization",
-                        "designer|userClassName": "MyTextField1",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10003",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "position",
-                        "fieldLabel": "Position",
-                        "designer|userClassName": "MyTextField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10271",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "addressType",
-                        "fieldLabel": "Address type",
-                        "designer|userClassName": "MyTextField3",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10503",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "address",
-                        "fieldLabel": "Address",
-                        "designer|userClassName": "MyTextField4",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10738",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "city",
-                        "fieldLabel": "City",
-                        "designer|userClassName": "MyTextField5",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10976",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "state",
-                        "fieldLabel": "State",
-                        "designer|userClassName": "MyTextField6",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11217",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "zipCode",
-                        "fieldLabel": "ZIP code",
-                        "designer|userClassName": "MyTextField7",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11461",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "country",
-                        "fieldLabel": "Coutry",
-                        "designer|userClassName": "MyTextField8",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11708",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "telephone",
-                        "fieldLabel": "Telephone",
-                        "designer|userClassName": "MyTextField9",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen12079",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "fax",
-                        "fieldLabel": "Fax",
-                        "designer|userClassName": "MyTextField10",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen12332",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "email",
-                        "fieldLabel": "Email",
-                        "designer|userClassName": "MyTextField11",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen7237",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": null,
-                "width": null,
-                "bodyPadding": 10,
-                "bodyStyle": "centerBody",
-                "title": "",
-                "designer|userClassName": "paths",
-                "designer|userAlias": "paths"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen7247",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "istsos",
-                        "fieldLabel": "istSOS lib",
-                        "designer|userClassName": "MyTextField",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen7254",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "services",
-                        "fieldLabel": "istSOS config",
-                        "designer|userClassName": "MyTextField1",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen16479",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "defaults": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "about"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen8701",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "istSOS",
-                        "designer|userClassName": "MyFieldSet20"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen9791",
-                            "type": "displayfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "istsos_version",
-                                "fieldLabel": "Version",
-                                "designer|userClassName": "MyTextField92",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen10368",
-                            "type": "displayfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "updates",
-                                "name": "istsos_message",
-                                "fieldLabel": "Updates",
-                                "designer|userClassName": "MyTextField94",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11473",
-                            "type": "displayfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "id": "download",
-                                "name": "download_url",
-                                "fieldLabel": "Download",
-                                "designer|userClassName": "MyDisplayField3",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen10976",
-                            "type": "textareafield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "id": "changelog",
-                                "name": "latest_istsos_changelog",
-                                "readOnly": true,
-                                "fieldLabel": "Change log",
-                                "designer|userClassName": "MyTextArea",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen12714",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<p>istSOS (Istituto Scienze della Terra Sensor Observation Service) is an implementation of the Sensor Observation Service standard from Open Geospatial Consortium.\n</p>\n<p>\nThe developement of istSOS has started in 2009 in order to provide a simple implementation of the SOS standard for the management, provision and integration of hydro-meteorological data collected in Canton Ticino (Switzerland).\n</p>\n<p>\nistSOS is entirely written in <a href=\"ht [...]
-                        "padding": "10 0 0 0",
-                        "styleHtmlContent": true,
-                        "designer|userClassName": "MyContainer8",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen19556",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "contacts"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19251",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen26395",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Authority",
-                        "designer|userClassName": "MyFieldSet2"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen26579",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "name",
-                                "fieldLabel": "Name",
-                                "designer|userClassName": "MyTextField19",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen27009",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "version",
-                                "fieldLabel": "Version",
-                                "designer|userClassName": "MyTextField20",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen27520",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Service Identification:",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen27853",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "title",
-                                "fieldLabel": "Title",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen28163",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "abstract",
-                                "fieldLabel": "Abstract",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen28476",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "keywords",
-                                "fieldLabel": "Keywords",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen28792",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "fees",
-                                "fieldLabel": "Fees",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29111",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "accessconstrains",
-                                "fieldLabel": "Access constrains",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen19777",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "identification"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19780",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen19804",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Service Identification:",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19810",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "title",
-                                "fieldLabel": "Title",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19815",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "abstract",
-                                "fieldLabel": "Abstract",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19820",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "keywords",
-                                "fieldLabel": "Keywords",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19825",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "fees",
-                                "fieldLabel": "Fees",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19830",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "accessconstrains",
-                                "fieldLabel": "Access constrains",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen20513",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "provider"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen20516",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen20523",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Service Provider:",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen20529",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providername",
-                                "fieldLabel": "Name",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20534",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providersite",
-                                "fieldLabel": "Web site",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20539",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactname",
-                                "fieldLabel": "Contact name",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20544",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactposition",
-                                "fieldLabel": "Contact position",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20549",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactvoice",
-                                "fieldLabel": "Voice",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21279",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactfax",
-                                "fieldLabel": "Fax",
-                                "designer|userClassName": "MyTextField53",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21501",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactemail",
-                                "fieldLabel": "Email",
-                                "designer|userClassName": "MyTextField54",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21726",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactdeliverypoint",
-                                "fieldLabel": "Address",
-                                "designer|userClassName": "MyTextField55",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21954",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactpostalcode",
-                                "fieldLabel": "Postal code",
-                                "designer|userClassName": "MyTextField56",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen22232",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcity",
-                                "fieldLabel": "City",
-                                "designer|userClassName": "MyTextField57",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen22466",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactadminarea",
-                                "fieldLabel": "State",
-                                "designer|userClassName": "MyTextField58",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen22703",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcountry",
-                                "fieldLabel": "Country",
-                                "designer|userClassName": "MyTextField59",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen29943",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "config"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen21157",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen30217",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Proxy URL (optional)",
-                        "designer|userClassName": "MyFieldSet1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen30414",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "fieldLabel": "Url",
-                                "designer|userClassName": "MyTextField14",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen30618",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "fieldLabel": "POST",
-                                "designer|userClassName": "MyTextField15",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen30845",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "SensorML folder",
-                        "designer|userClassName": "MyFieldSet3"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen31051",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "smlpath",
-                                "fieldLabel": "Path",
-                                "designer|userClassName": "MyTextField16",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen31284",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Virtual procedures",
-                        "designer|userClassName": "MyFieldSet4"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen31496",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "vppath",
-                                "fieldLabel": "Path",
-                                "designer|userClassName": "MyTextField17",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen31735",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Coordinate system",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen31953",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "defaultepsg",
-                                "fieldLabel": "Default EPSG",
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33631",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "permittedepsg",
-                                "fieldLabel": "Permitted EPSG",
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen32198",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "xaxisname",
-                                "fieldLabel": "X axis name",
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33137",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "yaxisname",
-                                "fieldLabel": "Y axis name",
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33423",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "zaxisname",
-                                "fieldLabel": "Z axis name",
-                                "designer|userClassName": "MyTextField26",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen11516",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "geo"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen11519",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11567",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Coordinate system",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen11573",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "istsosepsg",
-                                "fieldLabel": "Default EPSG",
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11578",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "allowedepsg",
-                                "fieldLabel": "Permitted EPSG",
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11583",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "xaxisname",
-                                "fieldLabel": "X axis name",
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11588",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "yaxisname",
-                                "fieldLabel": "Y axis name",
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11593",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "zaxisname",
-                                "fieldLabel": "Z axis name",
-                                "designer|userClassName": "MyTextField26",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen24013",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "getobservation",
-                "designer|userAlias": "getobservation"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen24023",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "GetObservation configuration:",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen24034",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "maxgoperiod",
-                                "fieldLabel": "Max request interval (hours)",
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24044",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "defaultqi",
-                                "fieldLabel": "Default quality index",
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24039",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "aggregatenodataqi",
-                                "fieldLabel": "Aggregation no-data quality index",
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24029",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "aggregatenodata",
-                                "fieldLabel": "Aggregation no-data value",
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen35508",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "database",
-                "designer|userAlias": "database"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen22215",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35762",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "PostGIS database",
-                        "designer|userClassName": "MyFieldSet6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen35959",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "user",
-                                "fieldLabel": "User",
-                                "designer|userClassName": "MyTextField28",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36163",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "password",
-                                "fieldLabel": "Password",
-                                "designer|userClassName": "MyTextField29",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36370",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "host",
-                                "fieldLabel": "Host",
-                                "designer|userClassName": "MyTextField30",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36793",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "port",
-                                "fieldLabel": "Port",
-                                "designer|userClassName": "MyTextField32",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36580",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "dbname",
-                                "fieldLabel": "DB name",
-                                "designer|userClassName": "MyTextField31",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen7192",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyContainer5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen7344",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar3",
-                                "container|pack": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen7555",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnTestConnection",
-                                        "text": "Test connection",
-                                        "designer|userClassName": "MyButton7",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen17457",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "serviceurl"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen9215",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": null,
-                        "padding": 10,
-                        "checkboxName": "cbproxy",
-                        "title": "Proxy url",
-                        "designer|userClassName": "MyFieldSet1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen11353",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "url",
-                                "fieldLabel": "Url",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField14",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen88263",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": "newprocpanel",
-                "width": null,
-                "autoScroll": true,
-                "defaults": "defaults: {\nanchor: '100%',\npadding: '10px',\n }",
-                "layout": "anchor",
-                "bodyPadding": null,
-                "title": "",
-                "designer|userClassName": "procedure"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen88266",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "padding": 8,
-                        "width": null,
-                        "layout": "anchor",
-                        "designer|userClassName": "MyForm17"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen88272",
-                            "type": "container",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 60,
-                                "html": "<h3>Procedure</h3>\nBla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla Bla ",
-                                "padding": "0 0 16 0",
-                                "designer|userClassName": "MyContainer13"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen97361",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 10,
-                                "id": "generalInfo",
-                                "padding": null,
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyForm11"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen88279",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": null,
-                                        "margin": 0,
-                                        "padding": 10,
-                                        "checkboxName": "cbproxy",
-                                        "title": "General info",
-                                        "designer|userClassName": "MyFieldSet1"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88285",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "system",
-                                                "fieldLabel": "Name",
-                                                "labelSeparator": null,
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField14",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88290",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "designer|userClassName": "MyTextField93",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88295",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "keywords",
-                                                "fieldLabel": "Keywords",
-                                                "designer|userClassName": "MyTextField94",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen123882",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "classification",
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyForm24"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen88362",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "margin": 0,
-                                        "title": "Classification",
-                                        "designer|userClassName": "MyFieldSet39"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen121259",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "systemtype",
-                                                "fieldLabel": "System type",
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "forceSelection": true,
-                                                "store": "systemtype",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox5",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88373",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "sensortype",
-                                                "fieldLabel": "Sensor Type",
-                                                "allowBlank": false,
-                                                "emptyText": "tipping-bucket gauge, ...",
-                                                "designer|userClassName": "MyTextField174",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen23632",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "margin": 0,
-                                "title": "Location",
-                                "designer|userClassName": "MyFieldSet48"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen30448",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmLocation",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm23"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen30540",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "name",
-                                                "fieldLabel": "FOI name",
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField193",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen31516",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cbepsg",
-                                                "name": "epsg",
-                                                "fieldLabel": "EPSG",
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "forceSelection": true,
-                                                "store": "locationEPSG",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox7",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen32488",
-                                            "type": "fieldcontainer",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 30,
-                                                "layout": "column",
-                                                "fieldLabel": "Coordinates",
-                                                "designer|userClassName": "MyFieldContainer2"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen34690",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "x",
-                                                        "fieldLabel": "X",
-                                                        "labelWidth": 20,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField188",
-                                                        "layout|columnWidth": 0.5
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen35049",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "y",
-                                                        "fieldLabel": "Y",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 20,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField189",
-                                                        "layout|columnWidth": 0.5
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen49282",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlOutputs",
-                                "margin": 0,
-                                "padding": 8,
-                                "title": "Outputs",
-                                "designer|userClassName": "MyFieldSet36"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen51833",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmSmlOutputs",
-                                        "itemId": "frmSml",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm30"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen52528",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbObservedProperty",
-                                                "itemId": "cmbSml",
-                                                "name": "name",
-                                                "fieldLabel": "<span class='softLink' onclick='Ext.getCmp(\"newprocpanel\").openObsPropEditorWin();'>Observed property</span>",
-                                                "labelWidth": 120,
-                                                "allowBlank": false,
-                                                "displayField": "definition",
-                                                "forceSelection": true,
-                                                "store": "cmbobservedproperties",
-                                                "valueField": "definition",
-                                                "designer|userClassName": "MyComboBox10",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56600",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbUom",
-                                                "name": "uom",
-                                                "fieldLabel": "<span class='softLink' onclick='Ext.getCmp(\"newprocpanel\").openUomsEditorWin();'>Unit of measure</span>",
-                                                "labelWidth": 120,
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "forceSelection": true,
-                                                "store": "cmbuom",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox9",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen53233",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "labelWidth": 120,
-                                                "designer|userClassName": "MyTextField192",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen63834",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "collapsed": true,
-                                                "collapsible": true,
-                                                "title": "Quality index check: level 0 (optional)",
-                                                "designer|userClassName": "MyFieldSet52",
-                                                "layout|anchor": "100%"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen58081",
-                                                    "type": "fieldcontainer",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "height": 30,
-                                                        "layout": "column",
-                                                        "fieldLabel": "Constraint",
-                                                        "designer|userClassName": "MyFieldContainer2"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen58087",
-                                                            "type": "textfield",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "name": "from",
-                                                                "fieldLabel": "From",
-                                                                "labelWidth": 50,
-                                                                "designer|userClassName": "MyTextField188",
-                                                                "layout|columnWidth": 0.5
-                                                            }
-                                                        },
-                                                        {
-                                                            "id": "ExtBox1-ext-gen58092",
-                                                            "type": "textfield",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "name": "to",
-                                                                "fieldLabel": "To",
-                                                                "labelAlign": "right",
-                                                                "labelWidth": 40,
-                                                                "designer|userClassName": "MyTextField189",
-                                                                "layout|columnWidth": 0.5
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen70705",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "btnAddSml",
-                                                "margin": "0 0 10 0",
-                                                "padding": null,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton28",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen49314",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "id": null,
-                                        "itemId": "gridSml",
-                                        "margin": null,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "gridoutputs",
-                                        "designer|userClassName": "MyGridPanel3"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen49318",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView3"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen49321",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar7",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen49326",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": null,
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton11",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66797",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn26"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66806",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn27"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66815",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "definition",
-                                                "text": "Definition",
-                                                "designer|userClassName": "MyColumn28"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66824",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "uom",
-                                                "text": "Uom",
-                                                "designer|userClassName": "MyColumn29"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66842",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "hidden": true,
-                                                "dataIndex": "role",
-                                                "text": "Role",
-                                                "designer|userClassName": "MyColumn31"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66851",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "from",
-                                                "text": "From",
-                                                "designer|userClassName": "MyColumn32"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66860",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "to",
-                                                "text": "To",
-                                                "designer|userClassName": "MyColumn33"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen88755",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "padding": 8,
-                        "layout": "anchor",
-                        "designer|userClassName": "MyForm17"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16079",
-                            "type": "container",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 60,
-                                "html": "<h4>Optional parameters:</h4>\nasdf lékasdf klajd flk jadlé fjf éladj fléa.",
-                                "margin": null,
-                                "padding": null,
-                                "layout": "fit",
-                                "designer|userClassName": "MyContainer13"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88526",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Contacts (optional)",
-                                "designer|userClassName": "MyFieldSet38"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen136009",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyContainer48",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen136556",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "id": "frmOwner",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm27"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen137033",
-                                                    "type": "hiddenfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "role",
-                                                        "value": "urn:x-ogc:def:classifiers:x-ist:1.0:contactType:owner",
-                                                        "fieldLabel": "Label",
-                                                        "designer|userClassName": "MyHiddenField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen141855",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "organizationName",
-                                                        "fieldLabel": "Owner",
-                                                        "labelWidth": 130,
-                                                        "allowBlank": false,
-                                                        "emptyText": "Organization name...",
-                                                        "designer|userClassName": "MyTextField82",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen88532",
-                                                    "type": "fieldset",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "collapsed": true,
-                                                        "collapsible": true,
-                                                        "title": "Details (optional)",
-                                                        "designer|userClassName": "MyFieldSet32",
-                                                        "layout|anchor": "100%"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen88536",
-                                                            "type": "container",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "layout": "column",
-                                                                "designer|userClassName": "MyContainer18",
-                                                                "layout|anchor": "100%"
-                                                            },
-                                                            "cn": [
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88540",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer19",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88544",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "individualName",
-                                                                                "fieldLabel": "Person",
-                                                                                "designer|userClassName": "MyTextField152",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88549",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "voice",
-                                                                                "fieldLabel": "Telephone",
-                                                                                "designer|userClassName": "MyTextField154",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88554",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "fax",
-                                                                                "fieldLabel": "Fax",
-                                                                                "designer|userClassName": "MyTextField190",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88559",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "email",
-                                                                                "fieldLabel": "email",
-                                                                                "designer|userClassName": "MyTextField192",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88565",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer22",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88574",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "web",
-                                                                                "fieldLabel": "Web",
-                                                                                "designer|userClassName": "MyTextField193",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88579",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "deliveryPoint",
-                                                                                "fieldLabel": "Address",
-                                                                                "designer|userClassName": "MyTextField188",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88584",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "city",
-                                                                                "fieldLabel": "City",
-                                                                                "designer|userClassName": "MyTextField189",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen152718",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "administrativeArea",
-                                                                                "fieldLabel": "Admin area",
-                                                                                "designer|userClassName": "MyTextField121",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88589",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "postalcode",
-                                                                                "fieldLabel": "Postal code",
-                                                                                "designer|userClassName": "MyTextField191",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen145039",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyContainer48",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen145043",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "id": "frmManufacturer",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm27"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen145046",
-                                                    "type": "hiddenfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "role",
-                                                        "value": "urn:x-ogc:def:classifiers:x-ist:1.0:contactType:manufacturer",
-                                                        "fieldLabel": "Label",
-                                                        "designer|userClassName": "MyHiddenField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen145053",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "organizationName",
-                                                        "fieldLabel": "Manufacturer",
-                                                        "labelWidth": 130,
-                                                        "allowBlank": false,
-                                                        "emptyText": "Organization name...",
-                                                        "designer|userClassName": "MyTextField82",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen88597",
-                                                    "type": "fieldset",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "collapsed": true,
-                                                        "collapsible": true,
-                                                        "title": "Details (optional)",
-                                                        "designer|userClassName": "MyFieldSet32"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen88601",
-                                                            "type": "container",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "layout": "column",
-                                                                "designer|userClassName": "MyContainer18",
-                                                                "layout|anchor": "100%"
-                                                            },
-                                                            "cn": [
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88605",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer19",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88609",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "individualName",
-                                                                                "fieldLabel": "Person",
-                                                                                "designer|userClassName": "MyTextField152",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88614",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "voice",
-                                                                                "fieldLabel": "Telephone",
-                                                                                "designer|userClassName": "MyTextField154",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88619",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "fax",
-                                                                                "fieldLabel": "Fax",
-                                                                                "designer|userClassName": "MyTextField190",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88624",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "email",
-                                                                                "fieldLabel": "email",
-                                                                                "designer|userClassName": "MyTextField192",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88630",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer22",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88639",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "web",
-                                                                                "fieldLabel": "Web",
-                                                                                "designer|userClassName": "MyTextField193",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88644",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "deliveryPoint",
-                                                                                "fieldLabel": "Address",
-                                                                                "designer|userClassName": "MyTextField188",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88649",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "city",
-                                                                                "fieldLabel": "City",
-                                                                                "designer|userClassName": "MyTextField189",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen153278",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "administrativeArea",
-                                                                                "fieldLabel": "Admin area",
-                                                                                "designer|userClassName": "MyTextField121",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88654",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "postalcode",
-                                                                                "fieldLabel": "Postal code",
-                                                                                "designer|userClassName": "MyTextField191",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen146508",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyContainer48",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen146512",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "id": "frmOperator",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm27"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen146515",
-                                                    "type": "hiddenfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "role",
-                                                        "value": "urn:x-ogc:def:classifiers:x-ist:1.0:contactType:operator",
-                                                        "fieldLabel": "Label",
-                                                        "designer|userClassName": "MyHiddenField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen146522",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "organizationName",
-                                                        "fieldLabel": "Operator",
-                                                        "labelWidth": 130,
-                                                        "allowBlank": false,
-                                                        "emptyText": "Organization name...",
-                                                        "designer|userClassName": "MyTextField82",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen88662",
-                                                    "type": "fieldset",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "collapsed": true,
-                                                        "collapsible": true,
-                                                        "title": "Details (optional)",
-                                                        "designer|userClassName": "MyFieldSet32"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen88666",
-                                                            "type": "container",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "layout": "column",
-                                                                "designer|userClassName": "MyContainer18",
-                                                                "layout|anchor": "100%"
-                                                            },
-                                                            "cn": [
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88670",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer19",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88674",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "individualName",
-                                                                                "fieldLabel": "Person",
-                                                                                "designer|userClassName": "MyTextField152",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88679",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "voice",
-                                                                                "fieldLabel": "Telephone",
-                                                                                "designer|userClassName": "MyTextField154",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88684",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "fax",
-                                                                                "fieldLabel": "Fax",
-                                                                                "designer|userClassName": "MyTextField190",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88689",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "email",
-                                                                                "fieldLabel": "email",
-                                                                                "designer|userClassName": "MyTextField192",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88695",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer22",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88704",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "web",
-                                                                                "fieldLabel": "Web",
-                                                                                "designer|userClassName": "MyTextField193",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88709",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "deliveryPoint",
-                                                                                "fieldLabel": "Address",
-                                                                                "designer|userClassName": "MyTextField188",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88714",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "city",
-                                                                                "fieldLabel": "City",
-                                                                                "designer|userClassName": "MyTextField189",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen153841",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "administrativeArea",
-                                                                                "fieldLabel": "Admin area",
-                                                                                "designer|userClassName": "MyTextField121",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88719",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "postalcode",
-                                                                                "fieldLabel": "Postal code",
-                                                                                "designer|userClassName": "MyTextField191",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen155986",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlDocumentation",
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Documents (optional)",
-                                "designer|userClassName": "MyFieldSet61"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen156435",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 150,
-                                        "itemId": "frmSml",
-                                        "layout": "vbox",
-                                        "bodyPadding": "10 0 5 0",
-                                        "title": "",
-                                        "designer|userClassName": "MyForm30",
-                                        "container|align": "stretch"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen161584",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField276",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen161970",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "applicationType",
-                                                "itemId": "cmbSml",
-                                                "name": "format",
-                                                "fieldLabel": "Format",
-                                                "displayField": "format",
-                                                "forceSelection": true,
-                                                "queryMode": "local",
-                                                "store": "cmbdocumentformat",
-                                                "typeAhead": true,
-                                                "valueField": "format",
-                                                "designer|userClassName": "MyComboBox6",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen161200",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "date",
-                                                "fieldLabel": "Date",
-                                                "designer|userClassName": "MyDateField2",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen162358",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "link",
-                                                "fieldLabel": "Link",
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField277",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen164519",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "btnAddSml",
-                                                "width": 30,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton30",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen167273",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "itemId": "gridSml",
-                                        "margin": 8,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "griddocumentation",
-                                        "designer|userClassName": "MyGridPanel13"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen167309",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView13"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen168542",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar25",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen168902",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton31",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173222",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn21"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173231",
-                                            "type": "datecolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "date",
-                                                "text": "Date",
-                                                "designer|userClassName": "MyDateColumn2"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173240",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "format",
-                                                "text": "Format",
-                                                "designer|userClassName": "MyColumn22"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173249",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "link",
-                                                "text": "Link",
-                                                "designer|userClassName": "MyColumn23"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen40729",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Interfaces (optional)",
-                                "designer|userClassName": "MyFieldSet49"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen41301",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmInterfaces",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm22"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41714",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "interfaces",
-                                                "fieldLabel": "Name list (csv)",
-                                                "emptyText": "RS-232,RS-485,BLUETOOTH,WIFI,IR ...",
-                                                "designer|userClassName": "MyTextField187",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen43626",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlInputs",
-                                "padding": 8,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Inputs (optional)",
-                                "designer|userClassName": "MyFieldSet36"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen43630",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "id": null,
-                                        "itemId": "frmSml",
-                                        "padding": null,
-                                        "layout": "hbox",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm23",
-                                        "container|align": "stretch",
-                                        "container|padding": null,
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen43634",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "cmbSml",
-                                                "margin": "0 6 0 0",
-                                                "padding": null,
-                                                "name": "name",
-                                                "fieldLabel": "<span class='softLink' onclick='alert(\\\"to do\\\");'>Name</span>",
-                                                "labelWidth": 40,
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "store": "cmbphenomenon",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyTextField169",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43642",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "padding": null,
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "labelAlign": "right",
-                                                "labelWidth": 80,
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField170",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43650",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": null,
-                                                "itemId": "btnAddSml",
-                                                "margin": "0 0 0 6",
-                                                "width": 50,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton7",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen43658",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "id": null,
-                                        "itemId": "gridSml",
-                                        "margin": 8,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "store": "gridinput",
-                                        "designer|userClassName": "MyGridPanel3"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen43662",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView3"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43665",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar7",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen43670",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": null,
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton11",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43675",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "flex": null,
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn16"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43678",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "flex": 0.5,
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn17"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43681",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "definition",
-                                                "flex": 1,
-                                                "text": "Definition",
-                                                "designer|userClassName": "MyColumn18"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88301",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlIdentification",
-                                "padding": 8,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Identification (optional)",
-                                "designer|userClassName": "MyFieldSet36"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen102814",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "id": "frmIdentification",
-                                        "itemId": "frmSml",
-                                        "padding": null,
-                                        "layout": "hbox",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm23",
-                                        "container|align": "stretch",
-                                        "container|padding": null,
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88307",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "cmbSml",
-                                                "margin": "0 6 0 0",
-                                                "padding": null,
-                                                "name": "name",
-                                                "fieldLabel": "Name",
-                                                "labelWidth": 40,
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "store": "cmbidentification",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyTextField169",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88312",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "padding": null,
-                                                "name": "value",
-                                                "fieldLabel": "Value",
-                                                "labelAlign": "right",
-                                                "labelWidth": 40,
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField170",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88324",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "btnAddIdentification",
-                                                "itemId": "btnAddSml",
-                                                "margin": "0 0 0 6",
-                                                "width": 50,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton7",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen88336",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "id": "gridIdentification",
-                                        "itemId": "gridSml",
-                                        "margin": 8,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "store": "grididentification",
-                                        "designer|userClassName": "MyGridPanel3"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88339",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView3"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88343",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar7",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen88348",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "btnRemoveIdentification",
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton11",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen113184",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "flex": null,
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn16"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen113193",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "value",
-                                                "flex": 0.5,
-                                                "text": "Value",
-                                                "designer|userClassName": "MyColumn17"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen113202",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "definition",
-                                                "flex": 1,
-                                                "text": "Definition",
-                                                "designer|userClassName": "MyColumn18"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen125719",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "characteristics",
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyForm25"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen88438",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "collapsed": true,
-                                        "collapsible": true,
-                                        "title": "Characteristics (optional)",
-                                        "designer|userClassName": "MyFieldSet39"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88444",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "characteristics",
-                                                "fieldLabel": "Technical specification sheet URL",
-                                                "labelWidth": 210,
-                                                "designer|userClassName": "MyTextField173",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88450",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Capabilities",
-                                "designer|userClassName": "MyFieldSet39"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen27593",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmCapabilities",
-                                        "bodyPadding": null,
-                                        "collapsed": false,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm30"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88456",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "tfSamplingResolution",
-                                                "name": "systemType",
-                                                "fieldLabel": "Sampling time resolution",
-                                                "labelWidth": 180,
-                                                "emptyText": "P1DT12H (ISO8601 Duration)",
-                                                "designer|userClassName": "MyTextField173",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88461",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "tfAcquisitionResolution",
-                                                "name": "systemType",
-                                                "fieldLabel": "Acquisition time resolution",
-                                                "labelWidth": 180,
-                                                "emptyText": "P1DT12H (ISO8601 Duration)",
-                                                "designer|userClassName": "MyTextField173",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen127835",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "smlCapabilities",
-                                        "padding": 8,
-                                        "collapsed": true,
-                                        "collapsible": true,
-                                        "title": "Additional Capabilities (optional)",
-                                        "designer|userClassName": "MyFieldSet36"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen127839",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "height": 30,
-                                                "id": null,
-                                                "itemId": "frmSml",
-                                                "padding": null,
-                                                "layout": "hbox",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm23",
-                                                "container|align": "stretch",
-                                                "container|padding": null,
-                                                "layout|anchor": "100%"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen127843",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "itemId": "cmbSml",
-                                                        "margin": "0 6 0 0",
-                                                        "padding": null,
-                                                        "name": "name",
-                                                        "fieldLabel": "Name",
-                                                        "labelWidth": 60,
-                                                        "allowBlank": false,
-                                                        "displayField": "name",
-                                                        "store": "cmbCapabilities",
-                                                        "valueField": "name",
-                                                        "designer|userClassName": "MyTextField169",
-                                                        "layout|flex": 1
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127851",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "padding": null,
-                                                        "name": "value",
-                                                        "fieldLabel": "Value",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 60,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField170",
-                                                        "layout|flex": 1
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127859",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": null,
-                                                        "itemId": "btnAddSml",
-                                                        "margin": "0 0 0 6",
-                                                        "width": 50,
-                                                        "text": "Add",
-                                                        "designer|userClassName": "MyButton7",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen127867",
-                                            "type": "gridpanel",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 120,
-                                                "id": null,
-                                                "itemId": "gridSml",
-                                                "margin": 8,
-                                                "minHeight": 120,
-                                                "title": "",
-                                                "store": "gridCapabilities",
-                                                "designer|userClassName": "MyGridPanel3"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen127871",
-                                                    "type": "gridview",
-                                                    "reference": {
-                                                        "name": "viewConfig",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "designer|userClassName": "MyGridView3"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127874",
-                                                    "type": "toolbar",
-                                                    "reference": {
-                                                        "name": "dockedItems",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "itemId": "gridToolbar",
-                                                        "designer|userClassName": "MyToolbar7",
-                                                        "dock": "top"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen127879",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": null,
-                                                                "itemId": "btnRemoveSml",
-                                                                "text": "Remove selected",
-                                                                "designer|userClassName": "MyButton11",
-                                                                "layout|flex": null
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127884",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "name",
-                                                        "flex": null,
-                                                        "text": "Name",
-                                                        "designer|userClassName": "MyColumn16"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127887",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "value",
-                                                        "flex": 0.5,
-                                                        "text": "Value",
-                                                        "designer|userClassName": "MyColumn17"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen131383",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "uom",
-                                                        "text": "Unit of measure",
-                                                        "designer|userClassName": "MyColumn19"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127890",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "definition",
-                                                        "flex": 1,
-                                                        "text": "Definition",
-                                                        "designer|userClassName": "MyColumn18"
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen15774",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "newservice"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen16504",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Sensor Observation Service",
-                        "designer|userClassName": "MyFieldSet10"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16682",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "nsservice",
-                                "invalidText": "The serivice name must be a single lower case word",
-                                "name": "service",
-                                "fieldLabel": "Service name",
-                                "allowBlank": false,
-                                "regex": "/^[a-z]+$/",
-                                "designer|userClassName": "MyTextField35",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen11293",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "Piccola descrizione",
-                        "padding": 10,
-                        "designer|userClassName": "MyContainer3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15777",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15784",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "fscustomdb",
-                        "checkboxName": "customdb",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "Customize database",
-                        "designer|userClassName": "MyFieldSet6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen15790",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "user",
-                                "fieldLabel": "User",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField28",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15795",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "password",
-                                "fieldLabel": "Password",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField29",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15800",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "host",
-                                "fieldLabel": "Host",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField30",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15805",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "port",
-                                "fieldLabel": "Port",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField32",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15810",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "dbname",
-                                "fieldLabel": "DB name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField31",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen16882",
-                            "type": "container",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyContainer5"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16888",
-                                    "type": "toolbar",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": null,
-                                        "margin": "0 0 5 0",
-                                        "ui": "footer",
-                                        "designer|userClassName": "MyToolbar3",
-                                        "container|pack": "end"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen16891",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "btnTestConnection",
-                                                "text": "Test connection",
-                                                "designer|userClassName": "MyButton7",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen38532",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "anchor",
-                "title": "",
-                "designer|userClassName": "FormDataQuality"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen38760",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "bodyPadding": 10,
-                        "title": "",
-                        "designer|userClassName": "MyForm5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen38998",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Add new index",
-                                "designer|userClassName": "MyFieldSet7"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen39198",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "fieldLabel": "Code",
-                                        "designer|userClassName": "MyTextField34",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen39366",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTextField35",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen39737",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar2",
-                                "container|pack": "end",
-                                "layout|anchor": "100%",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen39743",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "text": "Cancel",
-                                        "designer|userClassName": "MyButton4",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen39749",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "text": "Add",
-                                        "designer|userClassName": "MyButton5",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen40349",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "padding": "16 8 0 8",
-                        "title": "Quality indexes",
-                        "store": "dataQualityStore",
-                        "designer|userClassName": "MyGridPanel"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen40387",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 120,
-                                "designer|userClassName": "MyGridView"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen42656",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "code",
-                                "text": "Code",
-                                "designer|userClassName": "MyColumn1"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen42665",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn2"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen6291",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": 600,
-                "width": 900,
-                "layout": "border",
-                "bodyStyle": "background-color: transparent;",
-                "title": "",
-                "designer|userClassName": "ObservationEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen6935",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 140,
-                        "id": "oeSettings",
-                        "bodyPadding": 10,
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyForm6",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen15261",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Choose the procedure",
-                                "designer|userClassName": "MyFieldSet8"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen24324",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "fieldLabel": "Label",
-                                        "hideLabel": true,
-                                        "designer|userClassName": "MyFieldContainer1",
-                                        "container|align": "stretch",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen18373",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbServices",
-                                                "fieldLabel": "Service",
-                                                "displayField": "service",
-                                                "store": "storeServices",
-                                                "valueField": "service",
-                                                "designer|userClassName": "MyComboBox12",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25132",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeCbOffering",
-                                                "itemId": null,
-                                                "name": "offering",
-                                                "fieldLabel": "Offering",
-                                                "labelAlign": "right",
-                                                "labelWidth": 60,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "offerings",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25356",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeCbProcedure",
-                                                "itemId": null,
-                                                "name": "procedure",
-                                                "fieldLabel": "Procedure",
-                                                "labelAlign": "right",
-                                                "labelWidth": 80,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "procedurelist",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox3",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25531",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeCbObservedProperty",
-                                                "name": "observedproperty",
-                                                "fieldLabel": "Property",
-                                                "labelAlign": "right",
-                                                "labelWidth": 80,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "observedproperties",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox4",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen10074",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 25,
-                                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                                        "layout": "hbox",
-                                        "fieldLabel": "Time period",
-                                        "designer|userClassName": "MyFieldContainer",
-                                        "container|align": "stretch",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen10377",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeBegin",
-                                                "name": "begin",
-                                                "fieldLabel": null,
-                                                "designer|userClassName": "MyDateField",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen24915",
-                                            "type": "timefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeBeginTime",
-                                                "name": "begintime",
-                                                "value": "00:00",
-                                                "fieldLabel": "Label",
-                                                "format": "G:i",
-                                                "increment": 10,
-                                                "designer|userClassName": "MyTimeField",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25323",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "html": "<div style='text-align: center; width: 100%;'>-</div>",
-                                                "padding": "5 0 0 0 ",
-                                                "width": 20,
-                                                "layout": "fit",
-                                                "designer|userClassName": "MyContainer26",
-                                                "layout|flex": 0
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen10564",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeEnd",
-                                                "name": "end",
-                                                "fieldLabel": "Label",
-                                                "designer|userClassName": "MyDateField1",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25118",
-                                            "type": "timefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeEndTime",
-                                                "name": "endtime",
-                                                "value": "00:00",
-                                                "fieldLabel": "Label",
-                                                "format": "G:i",
-                                                "increment": 10,
-                                                "designer|userClassName": "MyTimeField1",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20337",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar5",
-                                "container|align": "middle",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen20551",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeBtnReset",
-                                        "text": "Reset",
-                                        "designer|userClassName": "MyButton10",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen20772",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeBtnLoad",
-                                        "text": "Load",
-                                        "designer|userClassName": "MyButton11",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen7217",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "html": null,
-                        "id": "oeEditor",
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel9",
-                        "layout|region": "center"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen30261",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "hbox",
-                "title": "",
-                "designer|userClassName": "ObservationEditorColumn",
-                "container|align": "stretch"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen33639",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "id": "chartContainer",
-                        "padding": "16px",
-                        "maintainFlex": true,
-                        "layout": "fit",
-                        "bodyPadding": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel11",
-                        "layout|flex": 0.9
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen33799",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "gridContainer",
-                        "width": 300,
-                        "maintainFlex": true,
-                        "layout": "fit",
-                        "bodyPadding": "16px",
-                        "title": "",
-                        "designer|userClassName": "MyPanel12"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen14802",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": null,
-                "title": "",
-                "designer|userClassName": "serviceconfig"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen18952",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Service Provider:</h3>Here you can personalize the service provider information. It will be displayed in the getCapabilities document.",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen19232",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "provider",
-                        "padding": 10,
-                        "checkboxName": "cbprovider",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19238",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providername",
-                                "fieldLabel": "Name",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19243",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providersite",
-                                "fieldLabel": "Web site",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19248",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactname",
-                                "fieldLabel": "Contact name",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19253",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactposition",
-                                "fieldLabel": "Contact position",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19258",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactvoice",
-                                "fieldLabel": "Voice",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19263",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactfax",
-                                "fieldLabel": "Fax",
-                                "designer|userClassName": "MyTextField53",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19268",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactemail",
-                                "fieldLabel": "Email",
-                                "designer|userClassName": "MyTextField54",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19273",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactdeliverypoint",
-                                "fieldLabel": "Address",
-                                "designer|userClassName": "MyTextField55",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19278",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactpostalcode",
-                                "fieldLabel": "Postal code",
-                                "designer|userClassName": "MyTextField56",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19283",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcity",
-                                "fieldLabel": "City",
-                                "designer|userClassName": "MyTextField57",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19288",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactadminarea",
-                                "fieldLabel": "State",
-                                "designer|userClassName": "MyTextField58",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19293",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcountry",
-                                "fieldLabel": "Country",
-                                "designer|userClassName": "MyTextField59",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen19562",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Service Identification:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen7453",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "identification",
-                        "padding": 10,
-                        "checkboxName": "cbidentification",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen7459",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "title",
-                                "fieldLabel": "Title",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7464",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "abstract",
-                                "fieldLabel": "Abstract",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7469",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "keywords",
-                                "fieldLabel": "Keywords",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7474",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "fees",
-                                "fieldLabel": "Fees",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7479",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "accessconstrains",
-                                "fieldLabel": "Access constrains",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen20011",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Coordinate system:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13057",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "geo",
-                        "padding": 10,
-                        "checkboxName": "cbcoordinates",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen13063",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "istsosepsg",
-                                "fieldLabel": "Default EPSG",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13068",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "allowedepsg",
-                                "fieldLabel": "Permitted EPSG",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13073",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "xaxisname",
-                                "fieldLabel": "X axis name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13078",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "yaxisname",
-                                "fieldLabel": "Y axis name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13083",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "zaxisname",
-                                "fieldLabel": "Z axis name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField26",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen28721",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>GetObservation configuration:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen29667",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "getobservation",
-                        "padding": 10,
-                        "checkboxName": "cbgetobservation",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen29673",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "maxgoperiod",
-                                "fieldLabel": "Max request interval (hours)",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29678",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "defaultqi",
-                                "fieldLabel": "Default quality index",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29683",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "aggregatenodataqi",
-                                "fieldLabel": "Aggregation no-data quality index",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29688",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "aggregatenodata",
-                                "fieldLabel": "Aggregation no-data value",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen8383",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Proxy URL:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen39973",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "proxyurl",
-                        "padding": 10,
-                        "checkboxName": "cbgetobservation",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen40694",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "url",
-                                "fieldLabel": "Url",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField14",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen14182",
-            "type": "gridpanel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "width": null,
-                "title": "",
-                "forceFit": true,
-                "store": "serverstatus",
-                "designer|userClassName": "status"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen14217",
-                    "type": "gridview",
-                    "reference": {
-                        "name": "viewConfig",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyGridView2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8675",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "service",
-                        "text": "Service",
-                        "designer|userClassName": "MyColumn3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8648",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "featuresOfInterest",
-                        "text": "Features Of Interest",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8702",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "offerings",
-                        "text": "Offerings",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8729",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "procedures",
-                        "text": "Procedures",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn4"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8738",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "observedProperties",
-                        "text": "Observed Properties",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn5"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8693",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colAvailability",
-                        "dataIndex": "availability",
-                        "text": "Availability",
-                        "designer|userClassName": "MyColumn5"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8684",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colDatabase",
-                        "dataIndex": "database",
-                        "text": "Database",
-                        "designer|userClassName": "MyColumn4"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8639",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colGetcapabilities",
-                        "dataIndex": "getcapabilities",
-                        "text": "GetCapabilities",
-                        "designer|userClassName": "MyBooleanColumn1"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8657",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colDescribesensor",
-                        "dataIndex": "describesensor",
-                        "text": "DescribeSensor",
-                        "designer|userClassName": "MyBooleanColumn2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8666",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colGetobservation",
-                        "dataIndex": "getobservation",
-                        "text": "GetObservation",
-                        "designer|userClassName": "MyBooleanColumn3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8711",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colGetfeatureofinterest",
-                        "dataIndex": "getfeatureofinterest",
-                        "text": "GetFeatureOfInterest",
-                        "designer|userClassName": "MyBooleanColumn4"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8747",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colInsertobservation",
-                        "dataIndex": "insertobservation",
-                        "text": "InsertObservation",
-                        "designer|userClassName": "MyBooleanColumn6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8720",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colRegistersensor",
-                        "dataIndex": "registersensor",
-                        "text": "RegisterSensor",
-                        "designer|userClassName": "MyBooleanColumn5"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen22864",
-            "type": "gridpanel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": 400,
-                "maxHeight": null,
-                "width": null,
-                "autoScroll": true,
-                "title": null,
-                "forceFit": true,
-                "store": "procedurelist",
-                "designer|userClassName": "proceduresList"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen22899",
-                    "type": "gridview",
-                    "reference": {
-                        "name": "viewConfig",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyGridView13"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24898",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "name",
-                        "text": "Name",
-                        "designer|userClassName": "MyColumn31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24907",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "offerings",
-                        "text": "Offerings",
-                        "designer|userClassName": "MyColumn32"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24916",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "observedproperties",
-                        "text": "Observedproperties",
-                        "designer|userClassName": "MyColumn33"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen31862",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "obsPropEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen32116",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "frmObservedProperties",
-                        "bodyPadding": 10,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32343",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Observed property",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen32505",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opName",
-                                        "name": "name",
-                                        "fieldLabel": "Name",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen32673",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opDefinition",
-                                        "name": "definition",
-                                        "fieldLabel": "Definition URN",
-                                        "designer|userClassName": "MyTimeField1",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen63309",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "name": "description",
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTimeField1",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen37991",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen38253",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen32843",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "gridop",
-                        "margin": 8,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "gridobservedproperties",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32880",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen37413",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen37569",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen37779",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64210",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "name",
-                                "text": "Name",
-                                "designer|userClassName": "MyColumn42"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64219",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "definition",
-                                "text": "Definition",
-                                "designer|userClassName": "MyColumn43"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64228",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn44"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64237",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "procedures",
-                                "text": "Procedures",
-                                "designer|userClassName": "MyColumn45"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen60721",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "qualityindexEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen60724",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "frmObservedProperties",
-                        "bodyPadding": 10,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen60729",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Quality index",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen60735",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opName",
-                                        "name": "name",
-                                        "fieldLabel": "Name",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen60740",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "name": "description",
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTimeField1",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60746",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen60752",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen60759",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "gridop",
-                        "margin": 8,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "namedescription",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen60764",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60767",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "name",
-                                "text": "Name",
-                                "designer|userClassName": "MyColumn39"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60770",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn40"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60776",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen60781",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen60786",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen16414",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "serviceEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen16417",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "frmServices",
-                        "bodyPadding": 10,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16422",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Quality index",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16428",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opService",
-                                        "name": "service",
-                                        "fieldLabel": "Name",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen16439",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16445",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen16452",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "gridop",
-                        "margin": 8,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "storeServices",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16457",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen16466",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16471",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen16476",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen17592",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "service",
-                                "text": "Service",
-                                "designer|userClassName": "MyColumn42"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen17601",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "path",
-                                "text": "Path",
-                                "designer|userClassName": "MyColumn43"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen40828",
-            "type": "tabpanel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "minHeight": 400,
-                "width": null,
-                "title": "",
-                "activeTab": 0,
-                "designer|userClassName": "offeringsEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen41238",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": 400,
-                        "minHeight": 400,
-                        "title": "Offerings",
-                        "designer|userClassName": "MyPanel19"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen41841",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": null,
-                                "width": null,
-                                "title": "",
-                                "designer|userClassName": "MyPanel21"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen41844",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmOfferings",
-                                        "bodyPadding": 10,
-                                        "title": "",
-                                        "trackResetOnLoad": true,
-                                        "designer|userClassName": "MyForm33"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41849",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "title": "Offerings",
-                                                "designer|userClassName": "MyFieldSet54"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen41855",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "offName",
-                                                        "name": "name",
-                                                        "fieldLabel": "Name",
-                                                        "designer|userClassName": "MyTimeField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen41860",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "description",
-                                                        "fieldLabel": "Description",
-                                                        "designer|userClassName": "MyTimeField1",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen42436",
-                                                    "type": "datefield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "expiration",
-                                                        "fieldLabel": "Expiration",
-                                                        "format": "c",
-                                                        "designer|userClassName": "MyDateField6",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen42688",
-                                                    "type": "checkboxfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "active",
-                                                        "fieldLabel": "Visibility",
-                                                        "boxLabel": "enabled",
-                                                        "designer|userClassName": "MyCheckbox",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen41866",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "ui": "footer",
-                                                "designer|userClassName": "MyToolbar27",
-                                                "container|pack": "center",
-                                                "dock": "bottom"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen41872",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "btnForm",
-                                                        "text": "New",
-                                                        "designer|userClassName": "MyButton39",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen41879",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 150,
-                                        "id": "gridoff",
-                                        "margin": 8,
-                                        "minHeight": 150,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "gridofferings",
-                                        "designer|userClassName": "MyGridPanel16"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41884",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": null,
-                                                "designer|userClassName": "MyGridView16"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen41896",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyToolbar26",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen41901",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "btnNew",
-                                                        "text": "New",
-                                                        "designer|userClassName": "MyButton37",
-                                                        "layout|flex": null
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen41906",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "disabled": true,
-                                                        "id": "btnRemove",
-                                                        "text": "Remove",
-                                                        "designer|userClassName": "MyButton38",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44893",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn36"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44902",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn37"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44911",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "procedures",
-                                                "text": "Procedures",
-                                                "designer|userClassName": "MyColumn38"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44920",
-                                            "type": "datecolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "expiration",
-                                                "text": "Expiration",
-                                                "format": "c",
-                                                "designer|userClassName": "MyDateColumn2"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44929",
-                                            "type": "booleancolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "active",
-                                                "text": "Active",
-                                                "designer|userClassName": "MyBooleanColumn6"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen41402",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "autoRender": true,
-                        "height": 400,
-                        "minHeight": 400,
-                        "layout": "hbox",
-                        "title": "Offering-Procedure memberships",
-                        "designer|userClassName": "MyPanel20",
-                        "container|align": "stretch"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen48062",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 350,
-                                "html": null,
-                                "minHeight": 350,
-                                "layout": "fit",
-                                "bodyPadding": 8,
-                                "title": "",
-                                "designer|userClassName": "MyPanel23",
-                                "layout|flex": 0.5
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen49863",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "gridMembers",
-                                        "maxHeight": null,
-                                        "minHeight": null,
-                                        "autoScroll": true,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "proceduresMembers",
-                                        "designer|userClassName": "MyGridPanel15"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen49900",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "multiSelect": true,
-                                                "designer|userClassName": "MyGridView15"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen61828",
-                                                    "type": "griddragdropplugin",
-                                                    "reference": {
-                                                        "name": "plugins",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": "Ext.grid.plugin.DragDrop",
-                                                    "userConfig": {
-                                                        "ddGroup": "offeringsprocedures",
-                                                        "dragGroup": "gridMembers",
-                                                        "dropGroup": "gridNonMembers",
-                                                        "designer|userClassName": "MyGridDragDropPlugin"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen57050",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyToolbar24",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen57258",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "cbOfferings",
-                                                        "fieldLabel": "Choose an offering",
-                                                        "labelStyle": "color: white;",
-                                                        "labelWidth": 140,
-                                                        "displayField": "name",
-                                                        "store": "cmbname",
-                                                        "valueField": "name",
-                                                        "designer|userClassName": "MyComboBox12",
-                                                        "layout|flex": 1
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen21151",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn44"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen21160",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn45"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen48290",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 350,
-                                "html": null,
-                                "minHeight": 350,
-                                "layout": "fit",
-                                "bodyPadding": 8,
-                                "title": "",
-                                "designer|userClassName": "MyPanel24",
-                                "layout|flex": 0.5
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen55117",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "gridNonMembers",
-                                        "maxHeight": null,
-                                        "minHeight": null,
-                                        "title": "Not members",
-                                        "forceFit": true,
-                                        "store": "proceduresNonmembers",
-                                        "designer|userClassName": "MyGridPanel17"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen55154",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "multiSelect": true,
-                                                "designer|userClassName": "MyGridView17"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen62050",
-                                                    "type": "griddragdropplugin",
-                                                    "reference": {
-                                                        "name": "plugins",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": "Ext.grid.plugin.DragDrop",
-                                                    "userConfig": {
-                                                        "ddGroup": "offeringsprocedures",
-                                                        "dragGroup": "gridNonMembers",
-                                                        "dropGroup": "gridMembers",
-                                                        "designer|userClassName": "MyGridDragDropPlugin1"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen20601",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn47"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen20610",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn48"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen52391",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "id": "webadmincmp",
-                "maxWidth": null,
-                "minWidth": null,
-                "width": null,
-                "layout": "border",
-                "designer|userClassName": "MainMenu2"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen61717",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "mainCenter",
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel32",
-                        "layout|region": "center"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen62005",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "height": 150,
-                        "id": "submenu",
-                        "margin": "0px 0px 1px 0px ",
-                        "layout": "hbox",
-                        "collapsed": true,
-                        "hideCollapseTool": true,
-                        "title": "",
-                        "designer|userClassName": "MyPanel33",
-                        "container|align": "stretch",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen58083",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": null,
-                                "designer|userClassName": "MyToolbar3",
-                                "container|padding": "4 0 4 0",
-                                "layout|flex": 1,
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen58221",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "cls": null,
-                                        "componentCls": "test",
-                                        "id": "menuServer",
-                                        "style": null,
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "Server",
-                                        "toggleGroup": "mainmenu",
-                                        "designer|userClassName": "MyButton48",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen58413",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnService",
-                                        "enableToggle": true,
-                                        "text": "Services",
-                                        "toggleGroup": "mainmenu",
-                                        "designer|userClassName": "MyButton49",
-                                        "layout|flex": null
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen59073",
-                                            "type": "menu",
-                                            "reference": {
-                                                "name": "menu",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "menuServices",
-                                                "designer|userClassName": "MyMenu1"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen58607",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnObservations",
-                                        "enableToggle": true,
-                                        "text": "Data viewer",
-                                        "toggleGroup": "mainmenu",
-                                        "designer|userClassName": "MyButton50",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen59915",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "componentCls": null,
-                                        "html": "\n        <div class='mainHeaderTitle'>\n            istSOS manager [BETA]\n        </div>",
-                                        "designer|userClassName": "MyContainer2",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen63938",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 25,
-                        "html": "Open Source Software by Institute of Earth Science - SUPSI",
-                        "id": "mainFoot",
-                        "bodyCls": "mainFooter",
-                        "bodyPadding": 8,
-                        "title": "",
-                        "designer|userClassName": "MyPanel3",
-                        "layout|region": "south"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen27791",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 1,
-                "height": 45,
-                "width": 300,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "ObservationEditorAdvancedOperations"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen28609",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "oeaTf",
-                        "name": "val",
-                        "fieldLabel": "New value",
-                        "enableKeyEvents": true,
-                        "designer|userClassName": "MyTextField147",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen16552",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": 600,
-                "id": "chartpanel",
-                "minHeight": 400,
-                "padding": null,
-                "width": null,
-                "layout": "border",
-                "bodyStyle": "background-color: white;",
-                "title": "",
-                "designer|userClassName": "Chart",
-                "designer|userAlias": "chart"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen27604",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "width": 280,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel25",
-                        "layout|region": "west"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19598",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 150,
-                                "id": "oeSettings",
-                                "padding": null,
-                                "bodyPadding": "0 10 0 10",
-                                "bodyStyle": null,
-                                "title": "",
-                                "designer|userClassName": "MyForm6",
-                                "layout|region": "north"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen19609",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "padding": 5,
-                                        "title": "1. Choose procedure",
-                                        "designer|userClassName": "MyFieldSet8"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen19619",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbServices",
-                                                "fieldLabel": "Service",
-                                                "labelWidth": 70,
-                                                "displayField": "service",
-                                                "store": "storeServices",
-                                                "valueField": "service",
-                                                "designer|userClassName": "MyComboBox12",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen19625",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeCbOffering",
-                                                "itemId": null,
-                                                "name": "offering",
-                                                "fieldLabel": "Offering",
-                                                "labelWidth": 70,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "offerings",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen19631",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeCbProcedure",
-                                                "itemId": null,
-                                                "name": "procedure",
-                                                "fieldLabel": "Procedure",
-                                                "labelWidth": 70,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "procedurelist",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox3",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen19692",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "btnAdd",
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton11",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29107",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "proceduresTree",
-                                "autoScroll": true,
-                                "title": "",
-                                "designer|userClassName": "MyPanel26",
-                                "layout|region": "center"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen16832",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "html": null,
-                        "id": null,
-                        "layout": "vbox",
-                        "bodyPadding": null,
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel37",
-                        "container|align": "stretch",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen38046",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 150,
-                                "id": "plotcalc",
-                                "activeItem": 0,
-                                "layout": "card",
-                                "title": "",
-                                "designer|userClassName": "MyPanel32",
-                                "layout|flex": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen22938",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 130,
-                                        "id": "plotdatafrm",
-                                        "padding": "0 10 0 10",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel38"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen24163",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "padding": null,
-                                                "title": "2. Plot data",
-                                                "designer|userClassName": "MyFieldSet43"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen24169",
-                                                    "type": "fieldcontainer",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "border": 0,
-                                                        "height": null,
-                                                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                                                        "layout": "hbox",
-                                                        "fieldLabel": "From",
-                                                        "designer|userClassName": "MyFieldContainer",
-                                                        "container|padding": null,
-                                                        "layout|anchor": "100%"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen24173",
-                                                            "type": "datefield",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "oeBegin",
-                                                                "name": "begin",
-                                                                "fieldLabel": null,
-                                                                "format": "Y-m-d",
-                                                                "designer|userClassName": "MyDateField",
-                                                                "layout|flex": 0.6
-                                                            }
-                                                        },
-                                                        {
-                                                            "id": "ExtBox1-ext-gen24179",
-                                                            "type": "timefield",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "oeBeginTime",
-                                                                "minWidth": null,
-                                                                "width": null,
-                                                                "name": "begintime",
-                                                                "fieldLabel": "Label",
-                                                                "format": "H:i ",
-                                                                "increment": 10,
-                                                                "designer|userClassName": "MyTimeField",
-                                                                "layout|flex": 0.4
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen24186",
-                                                    "type": "fieldcontainer",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "height": null,
-                                                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                                                        "layout": "hbox",
-                                                        "fieldLabel": "To",
-                                                        "designer|userClassName": "MyFieldContainer",
-                                                        "layout|anchor": "100%"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen24190",
-                                                            "type": "datefield",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "oeEnd",
-                                                                "name": "end",
-                                                                "fieldLabel": "Label",
-                                                                "format": "Y-m-d",
-                                                                "designer|userClassName": "MyDateField1",
-                                                                "layout|flex": 0.6
-                                                            }
-                                                        },
-                                                        {
-                                                            "id": "ExtBox1-ext-gen24196",
-                                                            "type": "timefield",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "oeEndTime",
-                                                                "name": "endtime",
-                                                                "value": null,
-                                                                "fieldLabel": "Label",
-                                                                "format": "H:i ",
-                                                                "increment": 10,
-                                                                "designer|userClassName": "MyTimeField1",
-                                                                "layout|flex": 0.4
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen25642",
-                                                    "type": "fieldcontainer",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "height": null,
-                                                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                                                        "layout": "hbox",
-                                                        "fieldLabel": "Property",
-                                                        "designer|userClassName": "MyFieldContainer",
-                                                        "layout|anchor": "100%"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen24203",
-                                                            "type": "combobox",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "oeCbObservedProperty",
-                                                                "name": "observedproperty",
-                                                                "fieldLabel": "Property",
-                                                                "labelWidth": 70,
-                                                                "displayField": "name",
-                                                                "queryMode": "local",
-                                                                "store": "observedproperties",
-                                                                "valueField": "definition",
-                                                                "designer|userClassName": "MyComboBox4",
-                                                                "layout|flex": 0.6
-                                                            }
-                                                        },
-                                                        {
-                                                            "id": "ExtBox1-ext-gen26741",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "disabled": true,
-                                                                "id": "btnPlot",
-                                                                "margin": null,
-                                                                "padding": null,
-                                                                "text": "Plot",
-                                                                "designer|userClassName": "MyButton31",
-                                                                "layout|flex": 0.4,
-                                                                "layout|margins": null
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen23260",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "calccnt",
-                                        "padding": "9 10 0 10",
-                                        "layout": "fit",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel40"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen18479",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "html": "<div style='border-radius: 3px 3px 3px 3px !important; background-color: white; border: thin solid green; width: 100%; height: 100%;' id='chartCnt'></div>",
-                                "margin": null,
-                                "title": "",
-                                "designer|userClassName": "MyPanel36",
-                                "layout|flex": 0.7,
-                                "layout|margins": "0 10 5 10"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen38938",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 30,
-                                "padding": "0 10 5 10",
-                                "layout": "hbox",
-                                "title": "",
-                                "designer|userClassName": "MyPanel39",
-                                "container|align": "middle",
-                                "container|padding": "0 10 5 10",
-                                "layout|flex": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen39663",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeDay",
-                                        "enableToggle": true,
-                                        "text": "Day",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton35",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen39909",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeWeek",
-                                        "enableToggle": true,
-                                        "text": "Week",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen40157",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeAll",
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "All",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen46485",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": null,
-                        "width": 350,
-                        "layout": "vbox",
-                        "title": null,
-                        "designer|userClassName": "MyPanel28",
-                        "container|align": "stretch",
-                        "layout|region": "east"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen54346",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 105,
-                                "layout": "fit",
-                                "title": "",
-                                "designer|userClassName": "MyPanel29",
-                                "layout|flex": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen34866",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": null,
-                                        "id": "chartfilterFrm",
-                                        "padding": null,
-                                        "bodyPadding": "0 10 5 0",
-                                        "collapseFirst": false,
-                                        "collapsed": false,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm35",
-                                        "weight": null
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen56987",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "margin": null,
-                                                "padding": 5,
-                                                "title": "3. Start editing",
-                                                "designer|userClassName": "MyFieldSet44"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen19637",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "oeCbEditableProcedures",
-                                                        "name": "procedure",
-                                                        "fieldLabel": "Procedure",
-                                                        "labelWidth": 70,
-                                                        "displayField": "name",
-                                                        "queryMode": "local",
-                                                        "store": "editableProcedure",
-                                                        "valueField": "name",
-                                                        "designer|userClassName": "MyComboBox4",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen19398",
-                                                    "type": "container",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "height": 25,
-                                                        "layout": "hbox",
-                                                        "designer|userClassName": "MyContainer27",
-                                                        "container|align": "stretch"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen18753",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "hidden": true,
-                                                                "id": "btnCancelEditor",
-                                                                "text": "Cancel",
-                                                                "designer|userClassName": "MyButton31",
-                                                                "layout|flex": 1
-                                                            }
-                                                        },
-                                                        {
-                                                            "id": "ExtBox1-ext-gen57550",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "btnStartEditor",
-                                                                "text": "Start editing",
-                                                                "designer|userClassName": "MyButton31",
-                                                                "layout|flex": 1
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen53959",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "chartgridcnt",
-                                "layout": "fit",
-                                "title": "",
-                                "designer|userClassName": "MyPanel27",
-                                "layout|flex": 1,
-                                "layout|margins": "0 10 5 0"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen42461",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": 150,
-                "minWidth": 450,
-                "width": 450,
-                "layout": "border",
-                "title": "",
-                "designer|userClassName": "Calc",
-                "designer|userAlias": "calculator"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen43229",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "height": 100,
-                        "layout": "hbox",
-                        "title": "",
-                        "designer|userClassName": "MyPanel43",
-                        "container|align": "stretch",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen18207",
-                            "type": "gridpanel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "editableProcedureGrid",
-                                "width": 180,
-                                "title": "",
-                                "store": "editableProcedure",
-                                "designer|userClassName": "MyGridPanel14",
-                                "layout|flex": 0.4
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen18219",
-                                    "type": "gridcolumn",
-                                    "reference": {
-                                        "name": "columns",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "dataIndex": "name",
-                                        "flex": 1,
-                                        "text": "Procedures",
-                                        "designer|userClassName": "MyColumn43"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen42741",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "layout": "vbox",
-                                "title": "",
-                                "designer|userClassName": "MyPanel41",
-                                "container|align": "stretch",
-                                "layout|flex": 0.6
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen49480",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel44",
-                                        "container|align": "stretch",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen46403",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "plus",
-                                                "text": "+",
-                                                "designer|userClassName": "MyButton53",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen46191",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "moltiply",
-                                                "text": "*",
-                                                "designer|userClassName": "MyButton52",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45981",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "sqrt",
-                                                "text": "sqrt",
-                                                "designer|userClassName": "MyButton51",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45773",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "sin",
-                                                "text": "sin",
-                                                "designer|userClassName": "MyButton50",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45567",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "exp",
-                                                "text": "^",
-                                                "designer|userClassName": "MyButton49",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45363",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "acos",
-                                                "text": "acos",
-                                                "designer|userClassName": "MyButton48",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45161",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "openparentesis",
-                                                "text": "(",
-                                                "designer|userClassName": "MyButton47",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen54519",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel44",
-                                        "container|align": "stretch",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen54526",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "minus",
-                                                "text": "-",
-                                                "designer|userClassName": "MyButton53",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54533",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "divide",
-                                                "text": "/",
-                                                "designer|userClassName": "MyButton52",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54540",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cos",
-                                                "text": "cos",
-                                                "designer|userClassName": "MyButton51",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54547",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "asin",
-                                                "text": "asin",
-                                                "designer|userClassName": "MyButton50",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54554",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "tan",
-                                                "text": "tan",
-                                                "designer|userClassName": "MyButton49",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54561",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "atan",
-                                                "text": "atan",
-                                                "designer|userClassName": "MyButton48",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54568",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "closedparentesis",
-                                                "text": ")",
-                                                "designer|userClassName": "MyButton47",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen56491",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel44",
-                                        "container|align": "stretch",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen56498",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "less",
-                                                "text": "<",
-                                                "designer|userClassName": "MyButton53",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56505",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "grater",
-                                                "text": ">",
-                                                "designer|userClassName": "MyButton52",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56512",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "equal",
-                                                "text": "=",
-                                                "designer|userClassName": "MyButton51",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56519",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "lesseq",
-                                                "text": "≤",
-                                                "designer|userClassName": "MyButton50",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56526",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "gretereq",
-                                                "text": "≥",
-                                                "designer|userClassName": "MyButton49",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56533",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "andop",
-                                                "text": "AND",
-                                                "designer|userClassName": "MyButton48",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56540",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "orop",
-                                                "text": "OR",
-                                                "designer|userClassName": "MyButton47",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen60359",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": null,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel48",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen40754",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "width": 120,
-                                "bodyPadding": 10,
-                                "title": "",
-                                "designer|userClassName": "MyForm38",
-                                "layout|region": "west"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen41254",
-                                    "type": "displayfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "pEditing",
-                                        "fieldLabel": null,
-                                        "hideLabel": true,
-                                        "designer|userClassName": "MyDisplayField11",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36206",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": null,
-                                "padding": null,
-                                "layout": "hbox",
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyPanel47",
-                                "container|align": "stretch",
-                                "container|padding": null,
-                                "layout|region": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen25312",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "codePanel",
-                                        "padding": null,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel50",
-                                        "container|align": "stretch",
-                                        "container|padding": "6 0 0 0",
-                                        "layout|flex": 0.5
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen26476",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "bodyPadding": 10,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm39",
-                                        "layout|flex": 0.5
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen28131",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "calcQiCombo",
-                                                "fieldLabel": "QI",
-                                                "labelSeparator": "=",
-                                                "labelWidth": 40,
-                                                "emptyText": "choosing a qi will update the selectded values..",
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "calcQiStore",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox18",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36566",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "width": 40,
-                                "layout": "vbox",
-                                "title": "",
-                                "designer|userClassName": "MyPanel48",
-                                "container|align": "stretch",
-                                "container|padding": "5px",
-                                "layout|region": "east"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen34163",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnExecute",
-                                        "text": "↵",
-                                        "designer|userClassName": "MyButton61",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen22330",
-            "type": "gridcolumn",
-            "reference": {
-                "name": "columns",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "text": "Interpolation",
-                "designer|userClassName": "CheckColumn",
-                "designer|userAlias": "checkcolumn"
-            }
-        },
-        {
-            "id": "ExtBox1-ext-gen20039",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "fit",
-                "designer|userClassName": "ChartContainer"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen20456",
-                    "type": "linkedinstance",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {},
-                    "iconCls": "icon-linkedinstance",
-                    "masterInstanceId": "ExtBox1-ext-gen16552"
-                }
-            ]
-        }
-    ],
-    "stores": [
-        {
-            "id": "ExtBox1-ext-gen41866",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "dataQualityStore",
-                "designer|userClassName": "DataQualityStore"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen41870",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": null,
-                        "designer|userClassName": "Ajax Proxy"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen41876",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen22818",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": null,
-                        "designer|userClassName": "MyField67"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen42110",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "code",
-                        "designer|userClassName": "MyField"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen42117",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "designer|userClassName": "MyField1"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen12255",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "offerings",
-                "designer|userClassName": "Offerings"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen12259",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "data/offerings.json",
-                        "designer|userClassName": "Ajax Proxy1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen12265",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader1"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen12620",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13263",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField3"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen13495",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "procedures",
-                "designer|userClassName": "Procedures"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen13498",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen13501",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader1"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen13504",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13507",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField3"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen13909",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "observedproperties",
-                "designer|userClassName": "ObservedProperties"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen13912",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen13915",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader1"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen13918",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13921",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen21787",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "uom",
-                        "type": "string",
-                        "designer|userClassName": "MyField64"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen17477",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField66"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen35869",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "observations",
-                "designer|userClassName": "Observations"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen35873",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "data/observations.json",
-                        "designer|userClassName": "Ajax Proxy4"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen35879",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "isodate",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader4"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen36169",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dateFormat": "c",
-                        "name": "isodate",
-                        "type": "date",
-                        "designer|userClassName": "MyField8"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen36176",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "float",
-                        "designer|userClassName": "MyField9"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen14899",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "serverstatus",
-                "designer|userClassName": "serverstatus"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen14903",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen14909",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "service",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader5"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen15282",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "getcapabilities",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField10"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15289",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "featuresOfInterest",
-                        "type": "int",
-                        "designer|userClassName": "MyField11"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15296",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "describesensor",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField12"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15303",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "getobservation",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField13"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15310",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "service",
-                        "type": "string",
-                        "designer|userClassName": "MyField14"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15737",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "database",
-                        "type": "string",
-                        "designer|userClassName": "MyField15"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15744",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "availability",
-                        "type": "string",
-                        "designer|userClassName": "MyField16"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15751",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "offerings",
-                        "type": "int",
-                        "designer|userClassName": "MyField17"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15758",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "getfeatureofinterest",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField18"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15765",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "registersensor",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField19"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen16217",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "type": "int",
-                        "designer|userClassName": "MyField20"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen16224",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "observedProperties",
-                        "type": "int",
-                        "designer|userClassName": "MyField21"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen16231",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "insertobservation",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField22"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen36913",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "fake",
-                "designer|userClassName": "Fake",
-                "designer|userAlias": null
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen36917",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen36923",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader6"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen37157",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "designer|userClassName": "MyField23"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen112522",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "designer|userClassName": "MyField26"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen112702",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField27"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen100883",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "identification",
-                "designer|userClassName": "cmbIdentification"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen100887",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbIdentification.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen100893",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen101155",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen101162",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField25"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen130149",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "cmbsml",
-                "designer|userClassName": "cmbSml"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen130152",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbIdentification.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen130155",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen130158",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen47109",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField40"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen130161",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField25"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen130327",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "uom",
-                        "type": "string",
-                        "designer|userClassName": "MyField31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen132456",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "string",
-                        "designer|userClassName": "MyField33"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen65651",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "gridoutputs",
-                "designer|userClassName": "gridOutputs"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen65654",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": null,
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen65657",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen65660",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65663",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField40"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65666",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField25"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65669",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "uom",
-                        "type": "string",
-                        "designer|userClassName": "MyField31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65672",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "string",
-                        "designer|userClassName": "MyField33"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen66079",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "role",
-                        "designer|userClassName": "MyField46"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen66086",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "from",
-                        "designer|userClassName": "MyField47"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen66093",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "to",
-                        "designer|userClassName": "MyField48"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen122830",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "systemtype",
-                "designer|userClassName": "cmbSystemType"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen122833",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbsystemtype.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen122836",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen122839",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen170536",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "cmbname",
-                "designer|userClassName": "cmbName"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen170539",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbsystemtype.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen170542",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen170545",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen27957",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "namedescription",
-                "designer|userClassName": "cmbNameDescription"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen27960",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbsystemtype.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen27963",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen27966",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen28228",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField53"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen19975",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "storeServices",
-                "designer|userClassName": "Services"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19978",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "/wa/istsos/services",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19981",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "service",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen19984",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "service",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen19987",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "path",
-                        "type": "string",
-                        "designer|userClassName": "MyField53"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen172001",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "griddocumentation",
-                "designer|userClassName": "gridDocumentation"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen172005",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy11"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen172011",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader11"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen172273",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField34"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen172280",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dateFormat": "Y-m-d",
-                        "name": "date",
-                        "type": "date",
-                        "designer|userClassName": "MyField35"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen172287",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "format",
-                        "type": "string",
-                        "designer|userClassName": "MyField36"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen172294",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "link",
-                        "type": "string",
-                        "designer|userClassName": "MyField37"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen175055",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "cmbdocumentformat",
-                "designer|userClassName": "cmbDocumentFormat"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen175059",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbdocumentformat.json",
-                        "designer|userClassName": "Ajax Proxy12"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen175065",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": null,
-                                "messageProperty": null,
-                                "root": "data",
-                                "designer|userClassName": "Json Reader12"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen175420",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "extension",
-                        "type": "string",
-                        "designer|userClassName": "MyField38"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen175427",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "format",
-                        "type": "string",
-                        "designer|userClassName": "MyField39"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen23769",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "procedurelist",
-                "designer|userClassName": "gridProceduresList"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen23773",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen23779",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen24076",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "sortType": "asText",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24083",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "offerings",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24090",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "observedproperties",
-                        "designer|userClassName": "MyField51"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen24877",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "gridobservedproperties",
-                "designer|userClassName": "gridObservedProperties"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen24880",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "",
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen24883",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen24886",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen63840",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24889",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24892",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "designer|userClassName": "MyField51"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen43477",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "gridofferings",
-                "designer|userClassName": "gridOfferings"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen43480",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "",
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen43483",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen43486",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen43489",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen43492",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "designer|userClassName": "MyField51"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen44059",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dateFormat": "c",
-                        "name": "expiration",
-                        "type": "date",
-                        "designer|userClassName": "MyField60"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen44066",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "active",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField61"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen18026",
-            "type": "arraystore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "MyArrayStore",
-                "designer|userClassName": "MyArrayStore"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen18030",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy19"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen18036",
-                            "type": "arrayreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "xx",
-                                "designer|userClassName": "Array Reader"
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    ],
-    "framework": "ext40"
-}
\ No newline at end of file
diff --git a/interface/istsos.xds b/interface/istsos.xds
deleted file mode 100755
index 01da2d1..0000000
--- a/interface/istsos.xds
+++ /dev/null
@@ -1,14185 +0,0 @@
-{
-    "name": "istsos.xds",
-    "settings": {
-        "urlPrefix": "http://localhost/",
-        "directAPI": "",
-        "spacesToIndent": "4",
-        "codeGenFormat": "Class",
-        "exportPath": "/home/milan/workspace/istsos/google-svn/trunk/interface",
-        "extPath": "ext/",
-        "lineEnding": "LF",
-        "instantiateStore": true,
-        "exportXDSFiles": true,
-        "genTimestamps": true,
-        "appName": "istsos",
-        "cacheBust": false,
-        "buildShouldOverwriteIndex": true
-    },
-    "xdsVersion": "1.2.3",
-    "components": [
-        {
-            "id": "ExtBox1-ext-gen1666",
-            "type": "viewport",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "id": "mainPanel",
-                "itemId": "",
-                "layout": "border",
-                "designer|userClassName": "MainPanel"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen1754",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "mainCenter",
-                        "layout": "fit",
-                        "bodyPadding": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel",
-                        "layout|region": "center"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2198",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "cls": null,
-                        "height": 70,
-                        "html": "<div class='mainHeaderTitle'>istSOS manager</div>\n<div class='mainHeaderSubtitle'> > Control Panel for Sensor Observation Service</div>",
-                        "id": "mainHead",
-                        "padding": null,
-                        "bodyCls": "mainHeader",
-                        "bodyPadding": "15 0 0 8",
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel2",
-                        "layout|region": "north"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2515",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 25,
-                        "html": "Open Source Software by Institute of Earth Science - SUPSI",
-                        "id": "mainFoot",
-                        "bodyCls": "mainFooter",
-                        "bodyPadding": 8,
-                        "title": "",
-                        "designer|userClassName": "MyPanel3",
-                        "layout|region": "south"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen5563",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "panelMenu",
-                        "width": 210,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel13",
-                        "layout|region": "west"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen12379",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 30,
-                                "style": "background-color: white !important;",
-                                "ui": null,
-                                "designer|userClassName": "MyToolbar5",
-                                "container|align": "stretch",
-                                "container|padding": 2,
-                                "layout|region": "north",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen12556",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnMainMenu",
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "Server",
-                                        "toggleGroup": "menugroup",
-                                        "designer|userClassName": "MyButton7",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen12776",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnServicesMenu",
-                                        "enableToggle": true,
-                                        "text": "Services",
-                                        "toggleGroup": "menugroup",
-                                        "designer|userClassName": "MyButton8",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen12998",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnDataMenu",
-                                        "enableToggle": true,
-                                        "text": "Data",
-                                        "toggleGroup": "menugroup",
-                                        "designer|userClassName": "MyButton9",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen6842",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "menuCard",
-                                "activeItem": 0,
-                                "layout": "card",
-                                "title": "",
-                                "designer|userClassName": "MyPanel15",
-                                "layout|region": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen2221",
-                                    "type": "component",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "baseCls": null,
-                                        "id": "mainMenu",
-                                        "padding": "10px",
-                                        "style": "background: #fff;",
-                                        "styleHtmlContent": true,
-                                        "width": 150,
-                                        "designer|userClassName": "MyComponent"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen16528",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "servicesMenu",
-                                        "layout": "accordion",
-                                        "bodyPadding": "10px",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel16"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen2664",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "style": null,
-                "width": null,
-                "layout": "border",
-                "bodyStyle": null,
-                "designer|userClassName": "BasePage"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen2804",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "cls": null,
-                        "componentCls": null,
-                        "height": null,
-                        "hidden": true,
-                        "padding": null,
-                        "layout": "fit",
-                        "bodyBorder": true,
-                        "bodyCls": "centerTitle",
-                        "bodyPadding": "8px",
-                        "designer|userClassName": "MyContainer1",
-                        "layout|region": "north"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2986",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": null,
-                        "margin": null,
-                        "style": null,
-                        "styleHtmlContent": true,
-                        "autoScroll": true,
-                        "layout": "anchor",
-                        "bodyBorder": true,
-                        "bodyCls": "centerBody",
-                        "bodyPadding": null,
-                        "bodyStyle": null,
-                        "designer|userClassName": "MyContainer2",
-                        "layout|region": "center"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen3196",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 20,
-                        "hidden": true,
-                        "bodyPadding": "8px",
-                        "designer|userClassName": "MyContainer3",
-                        "layout|region": "south"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen9226",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": "contactinfo",
-                "width": null,
-                "bodyPadding": 10,
-                "bodyStyle": "centerBody",
-                "title": "",
-                "designer|userClassName": "contactinfo"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen6578",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen9554",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "contact",
-                        "fieldLabel": "Contact",
-                        "designer|userClassName": "MyTextField",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen9777",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "organization",
-                        "fieldLabel": "Organization",
-                        "designer|userClassName": "MyTextField1",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10003",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "position",
-                        "fieldLabel": "Position",
-                        "designer|userClassName": "MyTextField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10271",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "addressType",
-                        "fieldLabel": "Address type",
-                        "designer|userClassName": "MyTextField3",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10503",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "address",
-                        "fieldLabel": "Address",
-                        "designer|userClassName": "MyTextField4",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10738",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "city",
-                        "fieldLabel": "City",
-                        "designer|userClassName": "MyTextField5",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen10976",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "state",
-                        "fieldLabel": "State",
-                        "designer|userClassName": "MyTextField6",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11217",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "zipCode",
-                        "fieldLabel": "ZIP code",
-                        "designer|userClassName": "MyTextField7",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11461",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "country",
-                        "fieldLabel": "Coutry",
-                        "designer|userClassName": "MyTextField8",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11708",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "telephone",
-                        "fieldLabel": "Telephone",
-                        "designer|userClassName": "MyTextField9",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen12079",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "fax",
-                        "fieldLabel": "Fax",
-                        "designer|userClassName": "MyTextField10",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen12332",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "email",
-                        "fieldLabel": "Email",
-                        "designer|userClassName": "MyTextField11",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen7237",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": null,
-                "width": null,
-                "bodyPadding": 10,
-                "bodyStyle": "centerBody",
-                "title": "",
-                "designer|userClassName": "paths",
-                "designer|userAlias": "paths"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen7247",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "istsos",
-                        "fieldLabel": "istSOS lib",
-                        "designer|userClassName": "MyTextField",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen7254",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "services",
-                        "fieldLabel": "istSOS config",
-                        "designer|userClassName": "MyTextField1",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen16479",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "defaults": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "about"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen8701",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "istSOS",
-                        "designer|userClassName": "MyFieldSet20"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen9791",
-                            "type": "displayfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "istsos_version",
-                                "fieldLabel": "Version",
-                                "designer|userClassName": "MyTextField92",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen10368",
-                            "type": "displayfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "updates",
-                                "name": "istsos_message",
-                                "fieldLabel": "Updates",
-                                "designer|userClassName": "MyTextField94",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11473",
-                            "type": "displayfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "id": "download",
-                                "name": "download_url",
-                                "fieldLabel": "Download",
-                                "designer|userClassName": "MyDisplayField3",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen10976",
-                            "type": "textareafield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "id": "changelog",
-                                "name": "latest_istsos_changelog",
-                                "readOnly": true,
-                                "fieldLabel": "Change log",
-                                "designer|userClassName": "MyTextArea",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen12714",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<p>istSOS (Istituto Scienze della Terra Sensor Observation Service) is an implementation of the Sensor Observation Service standard from Open Geospatial Consortium.\n</p>\n<p>\nThe developement of istSOS has started in 2009 in order to provide a simple implementation of the SOS standard for the management, provision and integration of hydro-meteorological data collected in Canton Ticino (Switzerland).\n</p>\n<p>\nistSOS is entirely written in <a href=\"ht [...]
-                        "padding": "10 0 0 0",
-                        "styleHtmlContent": true,
-                        "designer|userClassName": "MyContainer8",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen19556",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "contacts"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19251",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen26395",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Authority",
-                        "designer|userClassName": "MyFieldSet2"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen26579",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "name",
-                                "fieldLabel": "Name",
-                                "designer|userClassName": "MyTextField19",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen27009",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "version",
-                                "fieldLabel": "Version",
-                                "designer|userClassName": "MyTextField20",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen27520",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Service Identification:",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen27853",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "title",
-                                "fieldLabel": "Title",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen28163",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "abstract",
-                                "fieldLabel": "Abstract",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen28476",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "keywords",
-                                "fieldLabel": "Keywords",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen28792",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "fees",
-                                "fieldLabel": "Fees",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29111",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "accessconstrains",
-                                "fieldLabel": "Access constrains",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen19777",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "identification"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19780",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen19804",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Service Identification:",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19810",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "title",
-                                "fieldLabel": "Title",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19815",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "abstract",
-                                "fieldLabel": "Abstract",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19820",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "keywords",
-                                "fieldLabel": "Keywords",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19825",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "fees",
-                                "fieldLabel": "Fees",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19830",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "accessconstrains",
-                                "fieldLabel": "Access constrains",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21298",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "authority",
-                                "fieldLabel": "URN authority",
-                                "designer|userClassName": "MyTextField158",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21520",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "urnversion",
-                                "fieldLabel": "URN version",
-                                "designer|userClassName": "MyTextField159",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen20513",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "provider"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen20516",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen20523",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Service Provider:",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen20529",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providername",
-                                "fieldLabel": "Name",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20534",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providersite",
-                                "fieldLabel": "Web site",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20539",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactname",
-                                "fieldLabel": "Contact name",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20544",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactposition",
-                                "fieldLabel": "Contact position",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20549",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactvoice",
-                                "fieldLabel": "Voice",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21279",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactfax",
-                                "fieldLabel": "Fax",
-                                "designer|userClassName": "MyTextField53",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21501",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactemail",
-                                "fieldLabel": "Email",
-                                "designer|userClassName": "MyTextField54",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21726",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactdeliverypoint",
-                                "fieldLabel": "Address",
-                                "designer|userClassName": "MyTextField55",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21954",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactpostalcode",
-                                "fieldLabel": "Postal code",
-                                "designer|userClassName": "MyTextField56",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen22232",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcity",
-                                "fieldLabel": "City",
-                                "designer|userClassName": "MyTextField57",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen22466",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactadminarea",
-                                "fieldLabel": "State",
-                                "designer|userClassName": "MyTextField58",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen22703",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcountry",
-                                "fieldLabel": "Country",
-                                "designer|userClassName": "MyTextField59",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen29943",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "config"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen21157",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen30217",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Proxy URL (optional)",
-                        "designer|userClassName": "MyFieldSet1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen30414",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "fieldLabel": "Url",
-                                "designer|userClassName": "MyTextField14",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen30618",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "fieldLabel": "POST",
-                                "designer|userClassName": "MyTextField15",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen30845",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "SensorML folder",
-                        "designer|userClassName": "MyFieldSet3"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen31051",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "smlpath",
-                                "fieldLabel": "Path",
-                                "designer|userClassName": "MyTextField16",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen31284",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Virtual procedures",
-                        "designer|userClassName": "MyFieldSet4"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen31496",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "vppath",
-                                "fieldLabel": "Path",
-                                "designer|userClassName": "MyTextField17",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen31735",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Coordinate system",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen31953",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "defaultepsg",
-                                "fieldLabel": "Default EPSG",
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33631",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "permittedepsg",
-                                "fieldLabel": "Permitted EPSG",
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen32198",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "xaxisname",
-                                "fieldLabel": "X axis name",
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33137",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "yaxisname",
-                                "fieldLabel": "Y axis name",
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33423",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "zaxisname",
-                                "fieldLabel": "Z axis name",
-                                "designer|userClassName": "MyTextField26",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen11516",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "geo"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen11519",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen11567",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Coordinate system",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen11573",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "defaultepsg",
-                                "name": "istsosepsg",
-                                "fieldLabel": "Default EPSG",
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11578",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "allowedepsg",
-                                "fieldLabel": "Permitted EPSG",
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11583",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "xaxisname",
-                                "fieldLabel": "X axis name",
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11588",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "yaxisname",
-                                "fieldLabel": "Y axis name",
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen11593",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "zaxisname",
-                                "fieldLabel": "Z axis name",
-                                "designer|userClassName": "MyTextField26",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen24013",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "getobservation",
-                "designer|userAlias": "getobservation"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen24023",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "getobsconfig",
-                        "title": "GetObservation configuration:",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen24034",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "maxgoperiod",
-                                "fieldLabel": "Max request interval (hours)",
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen35508",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "database",
-                "designer|userAlias": "database"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen22215",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35762",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "PostGIS database",
-                        "designer|userClassName": "MyFieldSet6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen35959",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "user",
-                                "fieldLabel": "User",
-                                "designer|userClassName": "MyTextField28",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36163",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "inputType": "password",
-                                "name": "password",
-                                "fieldLabel": "Password",
-                                "designer|userClassName": "MyTextField29",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36370",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "host",
-                                "fieldLabel": "Host",
-                                "designer|userClassName": "MyTextField30",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36793",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "port",
-                                "fieldLabel": "Port",
-                                "designer|userClassName": "MyTextField32",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36580",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "dbname",
-                                "fieldLabel": "DB name",
-                                "designer|userClassName": "MyTextField31",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen7192",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyContainer5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen7344",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar3",
-                                "container|pack": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen7555",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnTestConnection",
-                                        "text": "Test connection",
-                                        "designer|userClassName": "MyButton7",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen17457",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "serviceurl"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen9215",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": null,
-                        "padding": 10,
-                        "checkboxName": "cbproxy",
-                        "title": "Proxy url",
-                        "designer|userClassName": "MyFieldSet1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen11353",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "url",
-                                "fieldLabel": "Url",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField14",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen88263",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": "newprocpanel",
-                "width": null,
-                "autoScroll": true,
-                "defaults": "defaults: {\nanchor: '100%',\npadding: '10px',\n }",
-                "layout": "anchor",
-                "bodyPadding": null,
-                "title": "",
-                "designer|userClassName": "procedure"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen88266",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "padding": 8,
-                        "width": null,
-                        "layout": "anchor",
-                        "designer|userClassName": "MyForm17"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen26371",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "toolspanel",
-                                "title": "Tools",
-                                "designer|userClassName": "MyFieldSet46"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen34998",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "html": "<H4>Copy configuration from an existing procedure:</H4>",
-                                        "padding": null,
-                                        "designer|userClassName": "MyContainer31"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen28326",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": null,
-                                        "id": "oeSettings",
-                                        "layout": "hbox",
-                                        "fieldLabel": "",
-                                        "designer|userClassName": "MyFieldContainer6"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen27093",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbServices",
-                                                "fieldLabel": "Service",
-                                                "labelWidth": 60,
-                                                "displayField": "service",
-                                                "store": "storeServices",
-                                                "valueField": "service",
-                                                "designer|userClassName": "MyComboBox12",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen32218",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 15,
-                                                "designer|userClassName": "MyContainer28",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen27100",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeCbOffering",
-                                                "itemId": null,
-                                                "name": "offering",
-                                                "fieldLabel": "Offering",
-                                                "labelWidth": 60,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "offerings",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen33134",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 15,
-                                                "designer|userClassName": "MyContainer28",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen27107",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeCbProcedure",
-                                                "itemId": null,
-                                                "name": "procedure",
-                                                "fieldLabel": "Procedure",
-                                                "labelWidth": 70,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "procedurelist",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox3",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen33795",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 15,
-                                                "designer|userClassName": "MyContainer28",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen27114",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "btnTemplateFill",
-                                                "text": "Fill form",
-                                                "designer|userClassName": "MyButton11",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88272",
-                            "type": "container",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 30,
-                                "html": "<h2>Procedure:</h2>",
-                                "padding": "0 0 16 0",
-                                "designer|userClassName": "MyContainer13"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen97361",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 10,
-                                "id": "generalInfo",
-                                "padding": null,
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyForm11"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen88279",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": null,
-                                        "margin": 0,
-                                        "padding": 10,
-                                        "checkboxName": "cbproxy",
-                                        "title": "General info",
-                                        "designer|userClassName": "MyFieldSet1"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen32235",
-                                            "type": "displayfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "hidden": true,
-                                                "id": "asid",
-                                                "name": "assignedSensorId",
-                                                "value": null,
-                                                "fieldLabel": "Sensor ID",
-                                                "designer|userClassName": "MyDisplayField12",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88285",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "procedurename",
-                                                "name": "system",
-                                                "fieldLabel": "Name",
-                                                "labelSeparator": null,
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField14",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88290",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "designer|userClassName": "MyTextField93",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88295",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "keywords",
-                                                "fieldLabel": "Keywords",
-                                                "designer|userClassName": "MyTextField94",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen123882",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "classification",
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyForm24"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen88362",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "margin": 0,
-                                        "title": "Classification",
-                                        "designer|userClassName": "MyFieldSet39"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen121259",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbsystemtype",
-                                                "name": "systemtype",
-                                                "fieldLabel": "System type",
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "forceSelection": true,
-                                                "store": "systemtype",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox5",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88373",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "sensortype",
-                                                "fieldLabel": "Sensor Type",
-                                                "allowBlank": false,
-                                                "emptyText": "tipping-bucket gauge, ...",
-                                                "designer|userClassName": "MyTextField174",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen23632",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "margin": 0,
-                                "title": "Location",
-                                "designer|userClassName": "MyFieldSet48"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen30448",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmLocation",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm23"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen30540",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "name",
-                                                "fieldLabel": "FOI name",
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField193",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen31516",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cbepsg",
-                                                "name": "epsg",
-                                                "fieldLabel": "EPSG",
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "forceSelection": true,
-                                                "store": "locationEPSG",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox7",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen32488",
-                                            "type": "fieldcontainer",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 30,
-                                                "layout": "column",
-                                                "fieldLabel": "Coordinates",
-                                                "designer|userClassName": "MyFieldContainer2"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen34690",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "x",
-                                                        "fieldLabel": "X",
-                                                        "labelWidth": 20,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField188",
-                                                        "layout|columnWidth": 0.33
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen35049",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "y",
-                                                        "fieldLabel": "Y",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 20,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField189",
-                                                        "layout|columnWidth": 0.33
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen25333",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "z",
-                                                        "fieldLabel": "Z",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 20,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField189",
-                                                        "layout|columnWidth": 0.34
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen49282",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlOutputs",
-                                "margin": 0,
-                                "padding": 8,
-                                "title": "Outputs",
-                                "designer|userClassName": "MyFieldSet36"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen51833",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmSmlOutputs",
-                                        "itemId": "frmSml",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm30"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen52528",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbObservedProperty",
-                                                "itemId": "cmbSml",
-                                                "name": "name",
-                                                "fieldLabel": "<span class='softLink' onclick='Ext.getCmp(\"newprocpanel\").openObsPropEditorWin();'>Observed property</span>",
-                                                "labelWidth": 120,
-                                                "allowBlank": false,
-                                                "displayField": "definition",
-                                                "forceSelection": true,
-                                                "store": "cmbobservedproperties",
-                                                "valueField": "definition",
-                                                "designer|userClassName": "MyComboBox10",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56600",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbUom",
-                                                "name": "uom",
-                                                "fieldLabel": "<span class='softLink' onclick='Ext.getCmp(\"newprocpanel\").openUomsEditorWin();'>Unit of measure</span>",
-                                                "labelWidth": 120,
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "forceSelection": true,
-                                                "store": "cmbuom",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox9",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen53233",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "labelWidth": 120,
-                                                "designer|userClassName": "MyTextField192",
-                                                "layout|anchor": "100%"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen31276",
-                                            "type": "fieldcontainer",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 28,
-                                                "layout": "hbox",
-                                                "fieldLabel": "Statistical Quality Index Constraints",
-                                                "labelWidth": 230,
-                                                "designer|userClassName": "MyFieldContainer2",
-                                                "container|align": "stretch"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen31590",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "constrChoose",
-                                                        "width": 150,
-                                                        "name": "ctype",
-                                                        "fieldLabel": "",
-                                                        "labelWidth": 50,
-                                                        "emptyText": "Choose...",
-                                                        "displayField": "name",
-                                                        "queryMode": "local",
-                                                        "store": "constraint",
-                                                        "valueField": "value",
-                                                        "designer|userClassName": "MyComboBox29"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen31280",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "hidden": true,
-                                                        "id": "constrFrom",
-                                                        "name": "from",
-                                                        "fieldLabel": "From",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 50,
-                                                        "designer|userClassName": "MyTextField188",
-                                                        "layout|flex": 1
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen31285",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "hidden": true,
-                                                        "id": "constrTo",
-                                                        "name": "to",
-                                                        "fieldLabel": "To",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 40,
-                                                        "designer|userClassName": "MyTextField189",
-                                                        "layout|flex": 1
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen34923",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "hidden": true,
-                                                        "id": "constrList",
-                                                        "name": "list",
-                                                        "fieldLabel": "List",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 40,
-                                                        "designer|userClassName": "MyTextField189",
-                                                        "layout|flex": 1
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen70705",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "btnAddSml",
-                                                "margin": "0 0 10 0",
-                                                "padding": null,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton28",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen49314",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "id": null,
-                                        "itemId": "gridSml",
-                                        "margin": null,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "gridoutputs",
-                                        "designer|userClassName": "MyGridPanel3"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen49318",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView3"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen49321",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar7",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen49326",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": null,
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton11",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66797",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn26"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66806",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn27"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66815",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "definition",
-                                                "text": "Definition",
-                                                "designer|userClassName": "MyColumn28"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66824",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "uom",
-                                                "text": "Uom",
-                                                "designer|userClassName": "MyColumn29"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66842",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "hidden": true,
-                                                "dataIndex": "role",
-                                                "text": "Role",
-                                                "designer|userClassName": "MyColumn31"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66851",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "from",
-                                                "text": "From",
-                                                "designer|userClassName": "MyColumn32"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen66860",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "to",
-                                                "text": "To",
-                                                "designer|userClassName": "MyColumn33"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45466",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "list",
-                                                "text": "List",
-                                                "designer|userClassName": "MyColumn49"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen88755",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "padding": 8,
-                        "layout": "anchor",
-                        "designer|userClassName": "MyForm17"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16079",
-                            "type": "container",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 30,
-                                "html": "<h4>Optional parameters:</h4>",
-                                "margin": null,
-                                "padding": null,
-                                "layout": "fit",
-                                "designer|userClassName": "MyContainer13"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88526",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Contacts (optional)",
-                                "designer|userClassName": "MyFieldSet38"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen136009",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyContainer48",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen136556",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "id": "frmOwner",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm27"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen137033",
-                                                    "type": "hiddenfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "role",
-                                                        "value": "urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:owner",
-                                                        "fieldLabel": "Label",
-                                                        "designer|userClassName": "MyHiddenField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen141855",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "organizationName",
-                                                        "fieldLabel": "Owner",
-                                                        "labelWidth": 130,
-                                                        "allowBlank": false,
-                                                        "emptyText": "Organization name...",
-                                                        "designer|userClassName": "MyTextField82",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen88532",
-                                                    "type": "fieldset",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "collapsed": true,
-                                                        "collapsible": true,
-                                                        "title": "Details (optional)",
-                                                        "designer|userClassName": "MyFieldSet32",
-                                                        "layout|anchor": "100%"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen88536",
-                                                            "type": "container",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "layout": "column",
-                                                                "designer|userClassName": "MyContainer18",
-                                                                "layout|anchor": "100%"
-                                                            },
-                                                            "cn": [
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88540",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer19",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88544",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "individualName",
-                                                                                "fieldLabel": "Person",
-                                                                                "designer|userClassName": "MyTextField152",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88549",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "voice",
-                                                                                "fieldLabel": "Telephone",
-                                                                                "designer|userClassName": "MyTextField154",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88554",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "fax",
-                                                                                "fieldLabel": "Fax",
-                                                                                "designer|userClassName": "MyTextField190",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88559",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "email",
-                                                                                "fieldLabel": "email",
-                                                                                "designer|userClassName": "MyTextField192",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88565",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer22",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88574",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "web",
-                                                                                "fieldLabel": "Web",
-                                                                                "designer|userClassName": "MyTextField193",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88579",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "deliveryPoint",
-                                                                                "fieldLabel": "Address",
-                                                                                "designer|userClassName": "MyTextField188",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88584",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "city",
-                                                                                "fieldLabel": "City",
-                                                                                "designer|userClassName": "MyTextField189",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen152718",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "administrativeArea",
-                                                                                "fieldLabel": "Admin area",
-                                                                                "designer|userClassName": "MyTextField121",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88589",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "postalcode",
-                                                                                "fieldLabel": "Postal code",
-                                                                                "designer|userClassName": "MyTextField191",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen22817",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "country",
-                                                                                "fieldLabel": "Country",
-                                                                                "designer|userClassName": "MyTextField153",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen145039",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyContainer48",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen145043",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "id": "frmManufacturer",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm27"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen145046",
-                                                    "type": "hiddenfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "role",
-                                                        "value": "urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:manufacturer",
-                                                        "fieldLabel": "Label",
-                                                        "designer|userClassName": "MyHiddenField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen145053",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "organizationName",
-                                                        "fieldLabel": "Manufacturer",
-                                                        "labelWidth": 130,
-                                                        "allowBlank": false,
-                                                        "emptyText": "Organization name...",
-                                                        "designer|userClassName": "MyTextField82",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen88597",
-                                                    "type": "fieldset",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "collapsed": true,
-                                                        "collapsible": true,
-                                                        "title": "Details (optional)",
-                                                        "designer|userClassName": "MyFieldSet32"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen88601",
-                                                            "type": "container",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "layout": "column",
-                                                                "designer|userClassName": "MyContainer18",
-                                                                "layout|anchor": "100%"
-                                                            },
-                                                            "cn": [
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88605",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer19",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88609",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "individualName",
-                                                                                "fieldLabel": "Person",
-                                                                                "designer|userClassName": "MyTextField152",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88614",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "voice",
-                                                                                "fieldLabel": "Telephone",
-                                                                                "designer|userClassName": "MyTextField154",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88619",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "fax",
-                                                                                "fieldLabel": "Fax",
-                                                                                "designer|userClassName": "MyTextField190",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88624",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "email",
-                                                                                "fieldLabel": "email",
-                                                                                "designer|userClassName": "MyTextField192",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88630",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer22",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88639",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "web",
-                                                                                "fieldLabel": "Web",
-                                                                                "designer|userClassName": "MyTextField193",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88644",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "deliveryPoint",
-                                                                                "fieldLabel": "Address",
-                                                                                "designer|userClassName": "MyTextField188",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88649",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "city",
-                                                                                "fieldLabel": "City",
-                                                                                "designer|userClassName": "MyTextField189",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen153278",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "administrativeArea",
-                                                                                "fieldLabel": "Admin area",
-                                                                                "designer|userClassName": "MyTextField121",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88654",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "postalcode",
-                                                                                "fieldLabel": "Postal code",
-                                                                                "designer|userClassName": "MyTextField191",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen23655",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "country",
-                                                                                "fieldLabel": "Country",
-                                                                                "designer|userClassName": "MyTextField153",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen146508",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyContainer48",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen146512",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "id": "frmOperator",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm27"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen146515",
-                                                    "type": "hiddenfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "role",
-                                                        "value": "urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:operator",
-                                                        "fieldLabel": "Label",
-                                                        "designer|userClassName": "MyHiddenField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen146522",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "organizationName",
-                                                        "fieldLabel": "Operator",
-                                                        "labelWidth": 130,
-                                                        "allowBlank": false,
-                                                        "emptyText": "Organization name...",
-                                                        "designer|userClassName": "MyTextField82",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen88662",
-                                                    "type": "fieldset",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "collapsed": true,
-                                                        "collapsible": true,
-                                                        "title": "Details (optional)",
-                                                        "designer|userClassName": "MyFieldSet32"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen88666",
-                                                            "type": "container",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "layout": "column",
-                                                                "designer|userClassName": "MyContainer18",
-                                                                "layout|anchor": "100%"
-                                                            },
-                                                            "cn": [
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88670",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer19",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88674",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "individualName",
-                                                                                "fieldLabel": "Person",
-                                                                                "designer|userClassName": "MyTextField152",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88679",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "voice",
-                                                                                "fieldLabel": "Telephone",
-                                                                                "designer|userClassName": "MyTextField154",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88684",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "fax",
-                                                                                "fieldLabel": "Fax",
-                                                                                "designer|userClassName": "MyTextField190",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88689",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "email",
-                                                                                "fieldLabel": "email",
-                                                                                "designer|userClassName": "MyTextField192",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                },
-                                                                {
-                                                                    "id": "ExtBox1-ext-gen88695",
-                                                                    "type": "container",
-                                                                    "reference": {
-                                                                        "name": "items",
-                                                                        "type": "array"
-                                                                    },
-                                                                    "codeClass": null,
-                                                                    "userConfig": {
-                                                                        "padding": 6,
-                                                                        "layout": "anchor",
-                                                                        "designer|userClassName": "MyContainer22",
-                                                                        "layout|columnWidth": 0.5
-                                                                    },
-                                                                    "cn": [
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88704",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "web",
-                                                                                "fieldLabel": "Web",
-                                                                                "designer|userClassName": "MyTextField193",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88709",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "deliveryPoint",
-                                                                                "fieldLabel": "Address",
-                                                                                "designer|userClassName": "MyTextField188",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88714",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "city",
-                                                                                "fieldLabel": "City",
-                                                                                "designer|userClassName": "MyTextField189",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen153841",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "administrativeArea",
-                                                                                "fieldLabel": "Admin area",
-                                                                                "designer|userClassName": "MyTextField121",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen88719",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "postalcode",
-                                                                                "fieldLabel": "Postal code",
-                                                                                "designer|userClassName": "MyTextField191",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        },
-                                                                        {
-                                                                            "id": "ExtBox1-ext-gen24462",
-                                                                            "type": "textfield",
-                                                                            "reference": {
-                                                                                "name": "items",
-                                                                                "type": "array"
-                                                                            },
-                                                                            "codeClass": null,
-                                                                            "userConfig": {
-                                                                                "name": "country",
-                                                                                "fieldLabel": "Country",
-                                                                                "designer|userClassName": "MyTextField153",
-                                                                                "layout|anchor": "100%"
-                                                                            }
-                                                                        }
-                                                                    ]
-                                                                }
-                                                            ]
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen155986",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlDocumentation",
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Documents (optional)",
-                                "designer|userClassName": "MyFieldSet61"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen156435",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 150,
-                                        "itemId": "frmSml",
-                                        "layout": "vbox",
-                                        "bodyPadding": "10 0 5 0",
-                                        "title": "",
-                                        "designer|userClassName": "MyForm30",
-                                        "container|align": "stretch"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen161584",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField276",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen161970",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "applicationType",
-                                                "itemId": "cmbSml",
-                                                "name": "format",
-                                                "fieldLabel": "Format",
-                                                "displayField": "format",
-                                                "forceSelection": true,
-                                                "queryMode": "local",
-                                                "store": "cmbdocumentformat",
-                                                "typeAhead": true,
-                                                "valueField": "format",
-                                                "designer|userClassName": "MyComboBox6",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen161200",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "date",
-                                                "fieldLabel": "Date",
-                                                "format": "Y-m-d",
-                                                "designer|userClassName": "MyDateField2",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen162358",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "link",
-                                                "fieldLabel": "Link",
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField277",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen164519",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "btnAddSml",
-                                                "width": 30,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton30",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen167273",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "itemId": "gridSml",
-                                        "margin": null,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "griddocumentation",
-                                        "designer|userClassName": "MyGridPanel13"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen167309",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView13"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen168542",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar25",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen168902",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton31",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173222",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn21"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173231",
-                                            "type": "datecolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "date",
-                                                "text": "Date",
-                                                "format": "Y-m-d",
-                                                "designer|userClassName": "MyDateColumn2"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173240",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "format",
-                                                "text": "Format",
-                                                "designer|userClassName": "MyColumn22"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen173249",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "link",
-                                                "text": "Link",
-                                                "designer|userClassName": "MyColumn23"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen40729",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Interfaces (optional)",
-                                "designer|userClassName": "MyFieldSet49"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen41301",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmInterfaces",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm22"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41714",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "interfaces",
-                                                "fieldLabel": "Name list (csv)",
-                                                "emptyText": "RS-232,RS-485,BLUETOOTH,WIFI,IR ...",
-                                                "designer|userClassName": "MyTextField187",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen43626",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "hidden": true,
-                                "hideMode": null,
-                                "id": "smlInputs",
-                                "padding": 8,
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Inputs (optional)",
-                                "designer|userClassName": "MyFieldSet36"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen43630",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "id": null,
-                                        "itemId": "frmSml",
-                                        "padding": null,
-                                        "layout": "hbox",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm23",
-                                        "container|align": "stretch",
-                                        "container|padding": null,
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen43634",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "cmbSml",
-                                                "margin": "0 6 0 0",
-                                                "padding": null,
-                                                "name": "name",
-                                                "fieldLabel": "<span class='softLink' onclick='alert(\\\"to do\\\");'>Name</span>",
-                                                "labelWidth": 40,
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "store": "cmbphenomenon",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyTextField169",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43642",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "padding": null,
-                                                "name": "description",
-                                                "fieldLabel": "Description",
-                                                "labelAlign": "right",
-                                                "labelWidth": 80,
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField170",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43650",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": null,
-                                                "itemId": "btnAddSml",
-                                                "margin": "0 0 0 6",
-                                                "width": 50,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton7",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen43658",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "id": null,
-                                        "itemId": "gridSml",
-                                        "margin": 8,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "store": "gridinput",
-                                        "designer|userClassName": "MyGridPanel3"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen43662",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView3"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43665",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar7",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen43670",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": null,
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton11",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43675",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "flex": null,
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn16"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43678",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "flex": 0.5,
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn17"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen43681",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "definition",
-                                                "flex": 1,
-                                                "text": "Definition",
-                                                "designer|userClassName": "MyColumn18"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88301",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "smlIdentification",
-                                "padding": null,
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Identification (optional)",
-                                "designer|userClassName": "MyFieldSet36"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen102814",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "id": "frmIdentification",
-                                        "itemId": "frmSml",
-                                        "padding": null,
-                                        "layout": "hbox",
-                                        "bodyPadding": null,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm23",
-                                        "container|align": "stretch",
-                                        "container|padding": null,
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88307",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "cmbSml",
-                                                "margin": "0 6 0 0",
-                                                "padding": null,
-                                                "name": "name",
-                                                "fieldLabel": "Name",
-                                                "labelWidth": 40,
-                                                "allowBlank": false,
-                                                "displayField": "name",
-                                                "store": "cmbidentification",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyTextField169",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88312",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "padding": null,
-                                                "name": "value",
-                                                "fieldLabel": "Value",
-                                                "labelAlign": "right",
-                                                "labelWidth": 40,
-                                                "allowBlank": false,
-                                                "designer|userClassName": "MyTextField170",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88324",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "btnAddIdentification",
-                                                "itemId": "btnAddSml",
-                                                "margin": "0 0 0 6",
-                                                "width": 50,
-                                                "text": "Add",
-                                                "designer|userClassName": "MyButton7",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen88336",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 120,
-                                        "id": "gridIdentification",
-                                        "itemId": "gridSml",
-                                        "margin": 8,
-                                        "minHeight": 120,
-                                        "title": "",
-                                        "store": "grididentification",
-                                        "designer|userClassName": "MyGridPanel3"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88339",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView3"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen88343",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "itemId": "gridToolbar",
-                                                "designer|userClassName": "MyToolbar7",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen88348",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "btnRemoveIdentification",
-                                                        "itemId": "btnRemoveSml",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton11",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen113184",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "flex": null,
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn16"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen113193",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "value",
-                                                "flex": 0.5,
-                                                "text": "Value",
-                                                "designer|userClassName": "MyColumn17"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen113202",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "definition",
-                                                "flex": 1,
-                                                "text": "Definition",
-                                                "designer|userClassName": "MyColumn18"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88438",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Characteristics (optional)",
-                                "designer|userClassName": "MyFieldSet39"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen125719",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "characteristics",
-                                        "margin": 0,
-                                        "padding": 0,
-                                        "bodyPadding": null,
-                                        "collapsed": false,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm25"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen88444",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "name": "characteristics",
-                                                "fieldLabel": "Technical specification sheet URL",
-                                                "labelWidth": 210,
-                                                "designer|userClassName": "MyTextField173",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen88450",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "checkboxToggle": true,
-                                "collapsed": true,
-                                "collapsible": true,
-                                "title": "Capabilities",
-                                "designer|userClassName": "MyFieldSet39"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen27593",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "frmCapabilities",
-                                        "bodyPadding": null,
-                                        "collapsed": false,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm30"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen36148",
-                                            "type": "fieldcontainer",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 30,
-                                                "layout": "column",
-                                                "fieldLabel": "Sampling time resolution",
-                                                "labelWidth": 180,
-                                                "designer|userClassName": "MyFieldContainer7"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen37006",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "strCombo",
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "displayField": "combo",
-                                                        "store": "cmbcapabilitiesuom",
-                                                        "valueField": "uom",
-                                                        "designer|userClassName": "MyComboBox29",
-                                                        "layout|columnWidth": 0.5
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen37523",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "strValue",
-                                                        "fieldLabel": "Value",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 60,
-                                                        "designer|userClassName": "MyTextField159",
-                                                        "layout|columnWidth": 0.5
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen40621",
-                                            "type": "fieldcontainer",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 30,
-                                                "id": "MyFieldContainer8",
-                                                "layout": "column",
-                                                "fieldLabel": "Acquisition time resolution",
-                                                "labelWidth": 180,
-                                                "designer|userClassName": "MyFieldContainer7"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen40627",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "atrCombo",
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "displayField": "combo",
-                                                        "store": "cmbcapabilitiesuom2",
-                                                        "valueField": "uom",
-                                                        "designer|userClassName": "MyComboBox29",
-                                                        "layout|columnWidth": 0.5
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen40632",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "atrValue",
-                                                        "fieldLabel": "Value",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 60,
-                                                        "designer|userClassName": "MyTextField159",
-                                                        "layout|columnWidth": 0.5
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen42759",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "storeTypeValue",
-                                                "fieldLabel": "Storage type",
-                                                "labelWidth": 180,
-                                                "designer|userClassName": "MyTextField161",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen127835",
-                                    "type": "fieldset",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "smlCapabilities",
-                                        "padding": 8,
-                                        "collapsed": true,
-                                        "collapsible": true,
-                                        "title": "Additional Capabilities (optional)",
-                                        "designer|userClassName": "MyFieldSet36"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen127839",
-                                            "type": "form",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "border": 0,
-                                                "height": 30,
-                                                "id": null,
-                                                "itemId": "frmSml",
-                                                "padding": null,
-                                                "layout": "hbox",
-                                                "bodyPadding": null,
-                                                "title": "",
-                                                "designer|userClassName": "MyForm23",
-                                                "container|align": "stretch",
-                                                "container|padding": null,
-                                                "layout|anchor": "100%"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen127843",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "itemId": "cmbSml",
-                                                        "margin": "0 6 0 0",
-                                                        "padding": null,
-                                                        "name": "name",
-                                                        "fieldLabel": "Name",
-                                                        "labelWidth": 60,
-                                                        "allowBlank": false,
-                                                        "displayField": "combo",
-                                                        "store": "cmbCapabilities",
-                                                        "valueField": "name",
-                                                        "designer|userClassName": "MyTextField169",
-                                                        "layout|flex": 1
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127851",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "padding": null,
-                                                        "name": "value",
-                                                        "fieldLabel": "Value",
-                                                        "labelAlign": "right",
-                                                        "labelWidth": 60,
-                                                        "allowBlank": false,
-                                                        "designer|userClassName": "MyTextField170",
-                                                        "layout|flex": 1
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127859",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": null,
-                                                        "itemId": "btnAddSml",
-                                                        "margin": "0 0 0 6",
-                                                        "width": 50,
-                                                        "text": "Add",
-                                                        "designer|userClassName": "MyButton7",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen127867",
-                                            "type": "gridpanel",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 120,
-                                                "id": null,
-                                                "itemId": "gridSml",
-                                                "margin": 8,
-                                                "minHeight": 120,
-                                                "title": "",
-                                                "store": "gridCapabilities",
-                                                "designer|userClassName": "MyGridPanel3"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen127871",
-                                                    "type": "gridview",
-                                                    "reference": {
-                                                        "name": "viewConfig",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "designer|userClassName": "MyGridView3"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127874",
-                                                    "type": "toolbar",
-                                                    "reference": {
-                                                        "name": "dockedItems",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "itemId": "gridToolbar",
-                                                        "designer|userClassName": "MyToolbar7",
-                                                        "dock": "top"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen127879",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": null,
-                                                                "itemId": "btnRemoveSml",
-                                                                "text": "Remove selected",
-                                                                "designer|userClassName": "MyButton11",
-                                                                "layout|flex": null
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127884",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "name",
-                                                        "flex": null,
-                                                        "text": "Name",
-                                                        "designer|userClassName": "MyColumn16"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127887",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "value",
-                                                        "flex": 0.5,
-                                                        "text": "Value",
-                                                        "designer|userClassName": "MyColumn17"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen131383",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "uom",
-                                                        "text": "Unit of measure",
-                                                        "designer|userClassName": "MyColumn19"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen127890",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "definition",
-                                                        "flex": 1,
-                                                        "text": "Definition",
-                                                        "designer|userClassName": "MyColumn18"
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen15774",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "newservice"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen16504",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "title": "Sensor Observation Service",
-                        "designer|userClassName": "MyFieldSet10"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16682",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "nsservice",
-                                "invalidText": "The serivice name must be a single lower case word",
-                                "name": "service",
-                                "fieldLabel": "Service name",
-                                "allowBlank": false,
-                                "regex": "/^[a-z]+$/",
-                                "designer|userClassName": "MyTextField35",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20413",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "inputType": null,
-                                "name": "epsg",
-                                "fieldLabel": "EPSG",
-                                "emptyText": "if empty, the default EPSG will be used",
-                                "designer|userClassName": "MyTextField157",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen11293",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": null,
-                        "padding": 10,
-                        "designer|userClassName": "MyContainer3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15777",
-                    "type": "displayfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "hidden": true,
-                        "id": "messageField",
-                        "fieldStyle": "color: red;",
-                        "name": "message",
-                        "fieldLabel": "Message",
-                        "labelStyle": "color: red;",
-                        "designer|userClassName": "MyDisplayField2",
-                        "layout|anchor": "100%"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15784",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "fscustomdb",
-                        "checkboxName": "customdb",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "Customize database",
-                        "designer|userClassName": "MyFieldSet6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen15790",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "user",
-                                "fieldLabel": "User",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField28",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15795",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "password",
-                                "fieldLabel": "Password",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField29",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15800",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "host",
-                                "fieldLabel": "Host",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField30",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15805",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "port",
-                                "fieldLabel": "Port",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField32",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen15810",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "dbname",
-                                "fieldLabel": "DB name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField31",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen16882",
-                            "type": "container",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyContainer5"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16888",
-                                    "type": "toolbar",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": null,
-                                        "margin": "0 0 5 0",
-                                        "ui": "footer",
-                                        "designer|userClassName": "MyToolbar3",
-                                        "container|pack": "end"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen16891",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "btnTestConnection",
-                                                "text": "Test connection",
-                                                "designer|userClassName": "MyButton7",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen38532",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "anchor",
-                "title": "",
-                "designer|userClassName": "FormDataQuality"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen38760",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "bodyPadding": 10,
-                        "title": "",
-                        "designer|userClassName": "MyForm5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen38998",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Add new index",
-                                "designer|userClassName": "MyFieldSet7"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen39198",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "fieldLabel": "Code",
-                                        "designer|userClassName": "MyTextField34",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen39366",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTextField35",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen39737",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar2",
-                                "container|pack": "end",
-                                "layout|anchor": "100%",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen39743",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "text": "Cancel",
-                                        "designer|userClassName": "MyButton4",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen39749",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "text": "Add",
-                                        "designer|userClassName": "MyButton5",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen40349",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "padding": "16 8 0 8",
-                        "title": "Quality indexes",
-                        "store": "dataQualityStore",
-                        "designer|userClassName": "MyGridPanel"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen40387",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 120,
-                                "designer|userClassName": "MyGridView"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen42656",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "code",
-                                "text": "Code",
-                                "designer|userClassName": "MyColumn1"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen42665",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn2"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen6291",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": 600,
-                "width": 900,
-                "layout": "border",
-                "bodyStyle": "background-color: transparent;",
-                "title": "",
-                "designer|userClassName": "ObservationEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen6935",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 140,
-                        "id": "oeSettings",
-                        "bodyPadding": 10,
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyForm6",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen15261",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Choose the procedure",
-                                "designer|userClassName": "MyFieldSet8"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen24324",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "fieldLabel": "Label",
-                                        "hideLabel": true,
-                                        "designer|userClassName": "MyFieldContainer1",
-                                        "container|align": "stretch",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen18373",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cmbServices",
-                                                "fieldLabel": "Service",
-                                                "displayField": "service",
-                                                "store": "storeServices",
-                                                "valueField": "service",
-                                                "designer|userClassName": "MyComboBox12",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25132",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeCbOffering",
-                                                "itemId": null,
-                                                "name": "offering",
-                                                "fieldLabel": "Offering",
-                                                "labelAlign": "right",
-                                                "labelWidth": 60,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "offerings",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25356",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeCbProcedure",
-                                                "itemId": null,
-                                                "name": "procedure",
-                                                "fieldLabel": "Procedure",
-                                                "labelAlign": "right",
-                                                "labelWidth": 80,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "procedurelist",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox3",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25531",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeCbObservedProperty",
-                                                "name": "observedproperty",
-                                                "fieldLabel": "Property",
-                                                "labelAlign": "right",
-                                                "labelWidth": 80,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "observedproperties",
-                                                "valueField": "name",
-                                                "designer|userClassName": "MyComboBox4",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen10074",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 25,
-                                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                                        "layout": "hbox",
-                                        "fieldLabel": "Time period",
-                                        "designer|userClassName": "MyFieldContainer",
-                                        "container|align": "stretch",
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen10377",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeBegin",
-                                                "name": "begin",
-                                                "fieldLabel": null,
-                                                "designer|userClassName": "MyDateField",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen24915",
-                                            "type": "timefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeBeginTime",
-                                                "name": "begintime",
-                                                "value": "00:00",
-                                                "fieldLabel": "Label",
-                                                "format": "G:i",
-                                                "increment": 10,
-                                                "designer|userClassName": "MyTimeField",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25323",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "html": "<div style='text-align: center; width: 100%;'>-</div>",
-                                                "padding": "5 0 0 0 ",
-                                                "width": 20,
-                                                "layout": "fit",
-                                                "designer|userClassName": "MyContainer26",
-                                                "layout|flex": 0
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen10564",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeEnd",
-                                                "name": "end",
-                                                "fieldLabel": "Label",
-                                                "designer|userClassName": "MyDateField1",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen25118",
-                                            "type": "timefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "oeEndTime",
-                                                "name": "endtime",
-                                                "value": "00:00",
-                                                "fieldLabel": "Label",
-                                                "format": "G:i",
-                                                "increment": 10,
-                                                "designer|userClassName": "MyTimeField1",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20337",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar5",
-                                "container|align": "middle",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen20551",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeBtnReset",
-                                        "text": "Reset",
-                                        "designer|userClassName": "MyButton10",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen20772",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeBtnLoad",
-                                        "text": "Load",
-                                        "designer|userClassName": "MyButton11",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen7217",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "html": null,
-                        "id": "oeEditor",
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel9",
-                        "layout|region": "center"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen30261",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "hbox",
-                "title": "",
-                "designer|userClassName": "ObservationEditorColumn",
-                "container|align": "stretch"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen33639",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "id": "chartContainer",
-                        "padding": "16px",
-                        "maintainFlex": true,
-                        "layout": "fit",
-                        "bodyPadding": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel11",
-                        "layout|flex": 0.9
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen33799",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "gridContainer",
-                        "width": 300,
-                        "maintainFlex": true,
-                        "layout": "fit",
-                        "bodyPadding": "16px",
-                        "title": "",
-                        "designer|userClassName": "MyPanel12"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen14802",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "bodyPadding": null,
-                "title": "",
-                "designer|userClassName": "serviceconfig"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen18952",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Service Provider:</h3>Here you can personalize the service provider information. It will be displayed in the getCapabilities document.",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen19232",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "provider",
-                        "padding": 10,
-                        "checkboxName": "cbprovider",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19238",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providername",
-                                "fieldLabel": "Name",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19243",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "providersite",
-                                "fieldLabel": "Web site",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19248",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactname",
-                                "fieldLabel": "Contact name",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19253",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactposition",
-                                "fieldLabel": "Contact position",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19258",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactvoice",
-                                "fieldLabel": "Voice",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19263",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactfax",
-                                "fieldLabel": "Fax",
-                                "designer|userClassName": "MyTextField53",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19268",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactemail",
-                                "fieldLabel": "Email",
-                                "designer|userClassName": "MyTextField54",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19273",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactdeliverypoint",
-                                "fieldLabel": "Address",
-                                "designer|userClassName": "MyTextField55",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19278",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactpostalcode",
-                                "fieldLabel": "Postal code",
-                                "designer|userClassName": "MyTextField56",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19283",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcity",
-                                "fieldLabel": "City",
-                                "designer|userClassName": "MyTextField57",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19288",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactadminarea",
-                                "fieldLabel": "State",
-                                "designer|userClassName": "MyTextField58",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19293",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "contactcountry",
-                                "fieldLabel": "Country",
-                                "designer|userClassName": "MyTextField59",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen19562",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Service Identification:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen7453",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "identification",
-                        "padding": 10,
-                        "checkboxName": "cbidentification",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen7459",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "title",
-                                "fieldLabel": "Title",
-                                "designer|userClassName": "MyTextField12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7464",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "abstract",
-                                "fieldLabel": "Abstract",
-                                "designer|userClassName": "MyTextField13",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7469",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "keywords",
-                                "fieldLabel": "Keywords",
-                                "designer|userClassName": "MyTextField21",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7474",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "fees",
-                                "fieldLabel": "Fees",
-                                "designer|userClassName": "MyTextField22",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen7479",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "accessconstrains",
-                                "fieldLabel": "Access constrains",
-                                "designer|userClassName": "MyTextField23",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen20011",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Coordinate system:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13057",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "geo",
-                        "padding": 10,
-                        "checkboxName": "cbcoordinates",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen13063",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "istsosepsg",
-                                "fieldLabel": "Default EPSG",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13068",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "allowedepsg",
-                                "fieldLabel": "Permitted EPSG",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13073",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "xaxisname",
-                                "fieldLabel": "X axis name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13078",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "yaxisname",
-                                "fieldLabel": "Y axis name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen13083",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "zaxisname",
-                                "fieldLabel": "Z axis name",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField26",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen28721",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>GetObservation configuration:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen29667",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "getobservation",
-                        "padding": 10,
-                        "checkboxName": "cbgetobservation",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen29673",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "maxgoperiod",
-                                "fieldLabel": "Max request interval (hours)",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField27",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29678",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "defaultqi",
-                                "fieldLabel": "Default quality index",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField25",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29683",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "aggregatenodataqi",
-                                "fieldLabel": "Aggregation no-data quality index",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField24",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen29688",
-                            "type": "numberfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "aggregatenodata",
-                                "fieldLabel": "Aggregation no-data value",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField18",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen8383",
-                    "type": "container",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "html": "<h3>Proxy URL:</h3>Here you can personalize..",
-                        "padding": "10 0 10 0",
-                        "designer|userClassName": "MyContainer6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen39973",
-                    "type": "fieldset",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "proxyurl",
-                        "padding": 10,
-                        "checkboxName": "cbgetobservation",
-                        "checkboxToggle": true,
-                        "collapsed": true,
-                        "collapsible": true,
-                        "title": "check to apply customizations",
-                        "designer|userClassName": "MyFieldSet5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen40694",
-                            "type": "textfield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "name": "url",
-                                "fieldLabel": "Url",
-                                "allowBlank": false,
-                                "designer|userClassName": "MyTextField14",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen14182",
-            "type": "gridpanel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "width": null,
-                "title": "",
-                "forceFit": true,
-                "store": "serverstatus",
-                "designer|userClassName": "status"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen14217",
-                    "type": "gridview",
-                    "reference": {
-                        "name": "viewConfig",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyGridView2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8675",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "service",
-                        "text": "Service",
-                        "designer|userClassName": "MyColumn3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8648",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "featuresOfInterest",
-                        "text": "Features Of Interest",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8702",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "offerings",
-                        "text": "Offerings",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8729",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "procedures",
-                        "text": "Procedures",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn4"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8738",
-                    "type": "numbercolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "observedProperties",
-                        "text": "Observed Properties",
-                        "format": 0,
-                        "designer|userClassName": "MyNumberColumn5"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8693",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colAvailability",
-                        "dataIndex": "availability",
-                        "text": "Availability",
-                        "designer|userClassName": "MyColumn5"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8684",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colDatabase",
-                        "dataIndex": "database",
-                        "text": "Database",
-                        "designer|userClassName": "MyColumn4"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8639",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colGetcapabilities",
-                        "dataIndex": "getcapabilities",
-                        "text": "GetCapabilities",
-                        "designer|userClassName": "MyBooleanColumn1"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8657",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colDescribesensor",
-                        "dataIndex": "describesensor",
-                        "text": "DescribeSensor",
-                        "designer|userClassName": "MyBooleanColumn2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8666",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colGetobservation",
-                        "dataIndex": "getobservation",
-                        "text": "GetObservation",
-                        "designer|userClassName": "MyBooleanColumn3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8711",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colGetfeatureofinterest",
-                        "dataIndex": "getfeatureofinterest",
-                        "text": "GetFeatureOfInterest",
-                        "designer|userClassName": "MyBooleanColumn4"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8747",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colInsertobservation",
-                        "dataIndex": "insertobservation",
-                        "text": "InsertObservation",
-                        "designer|userClassName": "MyBooleanColumn6"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen8720",
-                    "type": "booleancolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "colRegistersensor",
-                        "dataIndex": "registersensor",
-                        "text": "RegisterSensor",
-                        "designer|userClassName": "MyBooleanColumn5"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen22864",
-            "type": "gridpanel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": 400,
-                "maxHeight": null,
-                "width": null,
-                "autoScroll": true,
-                "title": null,
-                "forceFit": true,
-                "store": "procedurelist",
-                "designer|userClassName": "proceduresList"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen21178",
-                    "type": "toolbar",
-                    "reference": {
-                        "name": "dockedItems",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyToolbar23",
-                        "dock": "top"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen21545",
-                            "type": "button",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "btnRemove",
-                                "text": "Delete selected",
-                                "designer|userClassName": "MyButton67",
-                                "layout|flex": null
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen22899",
-                    "type": "gridview",
-                    "reference": {
-                        "name": "viewConfig",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "MyGridView13"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24898",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "name",
-                        "text": "Name",
-                        "designer|userClassName": "MyColumn31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32540",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "description",
-                        "text": "Description",
-                        "designer|userClassName": "MyColumn31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32950",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "sensortype",
-                        "text": "Sensor Type",
-                        "designer|userClassName": "MyColumn31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24907",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "offerings",
-                        "text": "Offerings",
-                        "designer|userClassName": "MyColumn32"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24916",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "observedproperties",
-                        "text": "Observedproperties",
-                        "designer|userClassName": "MyColumn33"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32388",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "samplingTime",
-                        "text": "BeginPosition",
-                        "designer|userClassName": "MyColumn53"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen33294",
-                    "type": "gridcolumn",
-                    "reference": {
-                        "name": "columns",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dataIndex": "samplingTime",
-                        "text": "EndPosition",
-                        "designer|userClassName": "MyColumn53"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen31862",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "obsPropEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen32843",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": null,
-                        "id": "gridop",
-                        "margin": 8,
-                        "maxHeight": 250,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "gridobservedproperties",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32880",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen37413",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen37569",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen37779",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove selected",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64210",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "name",
-                                "flex": 1,
-                                "text": "Name",
-                                "designer|userClassName": "MyColumn42"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64219",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "definition",
-                                "flex": 1,
-                                "text": "Definition",
-                                "designer|userClassName": "MyColumn43"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64228",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "flex": 1,
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn44"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen64237",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "procedures",
-                                "flex": 1,
-                                "text": "Procedures",
-                                "designer|userClassName": "MyColumn45"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen54636",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "constraint2str",
-                                "flex": 1,
-                                "text": "Constraint",
-                                "designer|userClassName": "MyColumn50"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen32116",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "hidden": true,
-                        "id": "frmObservedProperties",
-                        "maxWidth": null,
-                        "width": null,
-                        "bodyPadding": 10,
-                        "animCollapse": null,
-                        "collapseFirst": null,
-                        "collapsed": null,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32343",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Observed property",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen32505",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opName",
-                                        "name": "name",
-                                        "fieldLabel": "Name",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen27021",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opDefinition",
-                                        "name": "definition",
-                                        "fieldLabel": "Definition URN",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen63309",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "name": "description",
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTimeField1",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen48594",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 28,
-                                        "layout": "hbox",
-                                        "fieldLabel": "Correct Quality Index Constraints",
-                                        "designer|userClassName": "MyFieldContainer2",
-                                        "container|align": "stretch"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen48598",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "sqiChoose",
-                                                "width": 110,
-                                                "name": "ctype",
-                                                "fieldLabel": "",
-                                                "labelWidth": 50,
-                                                "emptyText": "Choose...",
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "constraint",
-                                                "valueField": "value",
-                                                "designer|userClassName": "MyComboBox29"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen48604",
-                                            "type": "numberfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "hidden": true,
-                                                "id": "sqiFrom",
-                                                "name": "from",
-                                                "fieldLabel": "From",
-                                                "labelAlign": "right",
-                                                "labelWidth": 50,
-                                                "designer|userClassName": "MyTextField188",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen48610",
-                                            "type": "numberfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "hidden": true,
-                                                "id": "sqiTo",
-                                                "name": "to",
-                                                "fieldLabel": "To",
-                                                "labelAlign": "right",
-                                                "labelWidth": 40,
-                                                "designer|userClassName": "MyTextField189",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen48616",
-                                            "type": "textfield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "hidden": true,
-                                                "id": "sqiList",
-                                                "name": "list",
-                                                "fieldLabel": "List",
-                                                "labelAlign": "right",
-                                                "labelWidth": 40,
-                                                "designer|userClassName": "MyTextField189",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen37991",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen38253",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "Insert",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen21789",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "uomsEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen21792",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": null,
-                        "id": "gridop",
-                        "margin": 8,
-                        "maxHeight": 250,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "griduoms",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen21797",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21800",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen21805",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen21810",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove selected",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21815",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "name",
-                                "text": "Code",
-                                "designer|userClassName": "MyColumn42"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21821",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn44"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21824",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "procedures",
-                                "text": "Procedures",
-                                "designer|userClassName": "MyColumn45"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen21827",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "hidden": true,
-                        "id": "frmUoms",
-                        "bodyPadding": 10,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen21832",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Observed property",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen21838",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opName",
-                                        "name": "name",
-                                        "fieldLabel": "Code",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen21848",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "name": "description",
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTimeField1",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen21854",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen21860",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "Insert",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen60721",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "qualityindexEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen60759",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "gridop",
-                        "margin": 8,
-                        "maxHeight": 250,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "qistore",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen60764",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60767",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "code",
-                                "text": "Code",
-                                "designer|userClassName": "MyColumn39"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen46290",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "name",
-                                "text": "Name",
-                                "designer|userClassName": "MyColumn39"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60770",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "description",
-                                "text": "Description",
-                                "designer|userClassName": "MyColumn40"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60776",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen60781",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen60786",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove selected",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen60724",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "hidden": true,
-                        "id": "frmQuality",
-                        "bodyPadding": 10,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen60729",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Quality index",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen46576",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opCode",
-                                        "name": "code",
-                                        "fieldLabel": "Code",
-                                        "designer|userClassName": "MyTextField55",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen60735",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opName",
-                                        "name": "name",
-                                        "fieldLabel": "Name",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen60740",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "name": "description",
-                                        "fieldLabel": "Description",
-                                        "designer|userClassName": "MyTimeField1",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen60746",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen60752",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "Insert",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen16414",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "title": "",
-                "designer|userClassName": "serviceEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen16417",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "frmServices",
-                        "bodyPadding": 10,
-                        "title": "",
-                        "trackResetOnLoad": true,
-                        "designer|userClassName": "MyForm33"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16422",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "title": "Quality index",
-                                "designer|userClassName": "MyFieldSet54"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16428",
-                                    "type": "textfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "opService",
-                                        "name": "service",
-                                        "fieldLabel": "Name",
-                                        "designer|userClassName": "MyTimeField",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen16439",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": "footer",
-                                "designer|userClassName": "MyToolbar27",
-                                "container|pack": "center",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16445",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnForm",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen16452",
-                    "type": "gridpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "gridop",
-                        "margin": 8,
-                        "title": "",
-                        "forceFit": true,
-                        "store": "storeServices",
-                        "designer|userClassName": "MyGridPanel16"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen16457",
-                            "type": "gridview",
-                            "reference": {
-                                "name": "viewConfig",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": null,
-                                "designer|userClassName": "MyGridView16"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen16466",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar26",
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen16471",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnNew",
-                                        "text": "New",
-                                        "designer|userClassName": "MyButton37",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen16476",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "disabled": true,
-                                        "id": "btnRemove",
-                                        "text": "Remove",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen17592",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "service",
-                                "text": "Service",
-                                "designer|userClassName": "MyColumn42"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen17601",
-                            "type": "gridcolumn",
-                            "reference": {
-                                "name": "columns",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "dataIndex": "path",
-                                "text": "Path",
-                                "designer|userClassName": "MyColumn43"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen40828",
-            "type": "tabpanel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "minHeight": 400,
-                "width": null,
-                "title": "",
-                "activeTab": 0,
-                "designer|userClassName": "offeringsEditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen41238",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": 450,
-                        "minHeight": 400,
-                        "title": "Offerings",
-                        "designer|userClassName": "MyPanel19"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen41841",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": null,
-                                "width": null,
-                                "title": "",
-                                "designer|userClassName": "MyPanel21"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen41879",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": null,
-                                        "id": "gridoff",
-                                        "margin": 8,
-                                        "maxHeight": 250,
-                                        "minHeight": 150,
-                                        "title": "",
-                                        "forceFit": true,
-                                        "store": "gridofferings",
-                                        "designer|userClassName": "MyGridPanel16"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41884",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": null,
-                                                "designer|userClassName": "MyGridView16"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen41896",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyToolbar26",
-                                                "dock": "top"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen41901",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "btnNew",
-                                                        "text": "New",
-                                                        "designer|userClassName": "MyButton37",
-                                                        "layout|flex": null
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen41906",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "disabled": true,
-                                                        "id": "btnRemove",
-                                                        "text": "Remove selected",
-                                                        "designer|userClassName": "MyButton38",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44893",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "name",
-                                                "text": "Name",
-                                                "designer|userClassName": "MyColumn36"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44902",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "description",
-                                                "text": "Description",
-                                                "designer|userClassName": "MyColumn37"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44911",
-                                            "type": "gridcolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "procedures",
-                                                "text": "Procedures",
-                                                "designer|userClassName": "MyColumn38"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44920",
-                                            "type": "datecolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "expiration",
-                                                "text": "Expiration",
-                                                "format": "c",
-                                                "designer|userClassName": "MyDateColumn2"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44929",
-                                            "type": "booleancolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "dataIndex": "active",
-                                                "text": "Active",
-                                                "designer|userClassName": "MyBooleanColumn6"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen41844",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "hidden": true,
-                                        "id": "frmOfferings",
-                                        "bodyPadding": 10,
-                                        "title": "",
-                                        "trackResetOnLoad": true,
-                                        "designer|userClassName": "MyForm33"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41849",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "title": "Offerings",
-                                                "designer|userClassName": "MyFieldSet54"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen41855",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "offName",
-                                                        "name": "name",
-                                                        "fieldLabel": "Name",
-                                                        "designer|userClassName": "MyTimeField",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen41860",
-                                                    "type": "textfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "description",
-                                                        "fieldLabel": "Description",
-                                                        "designer|userClassName": "MyTimeField1",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen42436",
-                                                    "type": "datefield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "expiration",
-                                                        "fieldLabel": "Expiration",
-                                                        "format": "c",
-                                                        "designer|userClassName": "MyDateField6",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen42688",
-                                                    "type": "checkboxfield",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "active",
-                                                        "fieldLabel": "Visibility",
-                                                        "boxLabel": "enabled",
-                                                        "designer|userClassName": "MyCheckbox",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen41866",
-                                            "type": "toolbar",
-                                            "reference": {
-                                                "name": "dockedItems",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "ui": "footer",
-                                                "designer|userClassName": "MyToolbar27",
-                                                "container|pack": "center",
-                                                "dock": "bottom"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen41872",
-                                                    "type": "button",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "btnForm",
-                                                        "text": "Insert",
-                                                        "designer|userClassName": "MyButton39",
-                                                        "layout|flex": null
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen19906",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": 450,
-                        "layout": "vbox",
-                        "title": "Offering-Procedure memberships",
-                        "designer|userClassName": "MyPanel51",
-                        "container|align": "stretch"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen23416",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 40,
-                                "html": "Click & Drag procedures to add or remove membership",
-                                "padding": "16 16 8 16",
-                                "title": "",
-                                "designer|userClassName": "MyPanel52",
-                                "layout|flex": null
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen41402",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "autoRender": true,
-                                "border": 0,
-                                "height": null,
-                                "minHeight": 400,
-                                "layout": "hbox",
-                                "title": null,
-                                "designer|userClassName": "MyPanel20",
-                                "container|align": "stretch",
-                                "layout|flex": 1
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen48062",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 300,
-                                        "html": null,
-                                        "minHeight": 350,
-                                        "layout": "fit",
-                                        "bodyPadding": 8,
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel23",
-                                        "layout|flex": 0.5
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen49863",
-                                            "type": "gridpanel",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "gridMembers",
-                                                "maxHeight": null,
-                                                "minHeight": null,
-                                                "autoScroll": true,
-                                                "title": "",
-                                                "forceFit": true,
-                                                "store": "proceduresMembers",
-                                                "designer|userClassName": "MyGridPanel15"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen49900",
-                                                    "type": "gridview",
-                                                    "reference": {
-                                                        "name": "viewConfig",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "multiSelect": true,
-                                                        "designer|userClassName": "MyGridView15"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen61828",
-                                                            "type": "griddragdropplugin",
-                                                            "reference": {
-                                                                "name": "plugins",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": "Ext.grid.plugin.DragDrop",
-                                                            "userConfig": {
-                                                                "ddGroup": "offeringsprocedures",
-                                                                "dragGroup": "gridMembers",
-                                                                "dropGroup": "gridNonMembers",
-                                                                "designer|userClassName": "MyGridDragDropPlugin"
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen57050",
-                                                    "type": "toolbar",
-                                                    "reference": {
-                                                        "name": "dockedItems",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "designer|userClassName": "MyToolbar24",
-                                                        "dock": "top"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen57258",
-                                                            "type": "combobox",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "cbOfferings",
-                                                                "fieldLabel": "Choose an offering",
-                                                                "labelStyle": "color: white;",
-                                                                "labelWidth": 140,
-                                                                "displayField": "name",
-                                                                "store": "cmbname",
-                                                                "valueField": "name",
-                                                                "designer|userClassName": "MyComboBox12",
-                                                                "layout|flex": 1
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen21151",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "name",
-                                                        "text": "Name",
-                                                        "designer|userClassName": "MyColumn44"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen21160",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "description",
-                                                        "text": "Description",
-                                                        "designer|userClassName": "MyColumn45"
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen48290",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 300,
-                                        "html": null,
-                                        "minHeight": 350,
-                                        "layout": "fit",
-                                        "bodyPadding": 8,
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel24",
-                                        "layout|flex": 0.5
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen55117",
-                                            "type": "gridpanel",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "gridNonMembers",
-                                                "maxHeight": null,
-                                                "minHeight": null,
-                                                "title": "Not members",
-                                                "forceFit": true,
-                                                "store": "proceduresNonmembers",
-                                                "designer|userClassName": "MyGridPanel17"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen55154",
-                                                    "type": "gridview",
-                                                    "reference": {
-                                                        "name": "viewConfig",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "multiSelect": true,
-                                                        "designer|userClassName": "MyGridView17"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen62050",
-                                                            "type": "griddragdropplugin",
-                                                            "reference": {
-                                                                "name": "plugins",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": "Ext.grid.plugin.DragDrop",
-                                                            "userConfig": {
-                                                                "ddGroup": "offeringsprocedures",
-                                                                "dragGroup": "gridNonMembers",
-                                                                "dropGroup": "gridMembers",
-                                                                "designer|userClassName": "MyGridDragDropPlugin1"
-                                                            }
-                                                        }
-                                                    ]
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen20601",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "name",
-                                                        "text": "Name",
-                                                        "designer|userClassName": "MyColumn47"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen20610",
-                                                    "type": "gridcolumn",
-                                                    "reference": {
-                                                        "name": "columns",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "dataIndex": "description",
-                                                        "text": "Description",
-                                                        "designer|userClassName": "MyColumn48"
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen52391",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "id": "webadmincmp",
-                "maxWidth": null,
-                "minWidth": null,
-                "width": null,
-                "layout": "border",
-                "designer|userClassName": "MainMenu2"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen61717",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "mainCenter",
-                        "autoScroll": true,
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel32",
-                        "layout|region": "center"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen62005",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "height": 150,
-                        "id": "submenu",
-                        "margin": "0px 0px 1px 0px ",
-                        "layout": "hbox",
-                        "collapsed": true,
-                        "hideCollapseTool": true,
-                        "title": "",
-                        "designer|userClassName": "MyPanel33",
-                        "container|align": "stretch",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen58083",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "ui": null,
-                                "designer|userClassName": "MyToolbar3",
-                                "container|padding": "4 0 4 0",
-                                "layout|flex": 1,
-                                "dock": "top"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen58221",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "cls": null,
-                                        "componentCls": "test",
-                                        "id": "menuServer",
-                                        "style": null,
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "Server",
-                                        "toggleGroup": "mainmenu",
-                                        "designer|userClassName": "MyButton48",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen58413",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnService",
-                                        "enableToggle": true,
-                                        "text": "Services",
-                                        "toggleGroup": "mainmenu",
-                                        "designer|userClassName": "MyButton49",
-                                        "layout|flex": null
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen59073",
-                                            "type": "menu",
-                                            "reference": {
-                                                "name": "menu",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "menuServices",
-                                                "designer|userClassName": "MyMenu1"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen58607",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnObservations",
-                                        "enableToggle": true,
-                                        "text": "Data viewer",
-                                        "toggleGroup": "mainmenu",
-                                        "designer|userClassName": "MyButton50",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen59915",
-                                    "type": "container",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "componentCls": null,
-                                        "html": " <div class='mainHeaderTitle'><a href='http://istgeo.ist.supsi.ch/software/istsos/' target='_BLANK'><img height=28 src='images/istsos-logo.png'/></a></div>",
-                                        "designer|userClassName": "MyContainer2",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen63938",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 25,
-                        "html": "<a style='color: white; text-decoration: none;' href='http://www.supsi.ch/ist' target='_BLANK'>Open Source Software by Institute of Earth Science - SUPSI</a>",
-                        "id": "mainFoot",
-                        "bodyCls": "mainFooter",
-                        "bodyPadding": 8,
-                        "title": "",
-                        "designer|userClassName": "MyPanel3",
-                        "layout|region": "south"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen27791",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 1,
-                "height": 45,
-                "width": 300,
-                "bodyPadding": 10,
-                "title": "",
-                "designer|userClassName": "ObservationEditorAdvancedOperations"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen28609",
-                    "type": "textfield",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "oeaTf",
-                        "name": "val",
-                        "fieldLabel": "New value",
-                        "enableKeyEvents": true,
-                        "designer|userClassName": "MyTextField147",
-                        "layout|anchor": "100%"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen16552",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": 600,
-                "id": "chartpanel",
-                "minHeight": 400,
-                "minWidth": 1130,
-                "padding": null,
-                "width": null,
-                "autoScroll": true,
-                "layout": "border",
-                "bodyStyle": "background-color: white;",
-                "title": "",
-                "designer|userClassName": "Chart",
-                "designer|userAlias": "chart"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen16832",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "html": null,
-                        "id": "charttwo",
-                        "minWidth": 500,
-                        "layout": "vbox",
-                        "bodyPadding": null,
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel37",
-                        "container|align": "stretch",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen38046",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 150,
-                                "id": "plotcalc",
-                                "activeItem": 0,
-                                "layout": "card",
-                                "title": "",
-                                "designer|userClassName": "MyPanel32",
-                                "layout|flex": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen55251",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "padding": "0px 5px 5px 5px ",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel63"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen24163",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "padding": null,
-                                                "title": "2. Plot data",
-                                                "designer|userClassName": "MyFieldSet43"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen48190",
-                                                    "type": "linkedinstance",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "plotdatafrm",
-                                                        "designer|userClassName": "ProcedurePlotter",
-                                                        "designer|userAlias": "procedureplotter"
-                                                    },
-                                                    "iconCls": "icon-linkedinstance",
-                                                    "masterInstanceId": "ExtBox1-ext-gen22938"
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen23260",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "calccnt",
-                                        "padding": "9 10 0 10",
-                                        "layout": "fit",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel40"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen18479",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "html": "<div style='border-radius: 3px 3px 3px 3px !important; background-color: white; border: thin solid green; width: 100%; height: 100%;' id='chartCnt'></div>",
-                                "margin": null,
-                                "title": "",
-                                "designer|userClassName": "MyPanel36",
-                                "layout|flex": 0.7,
-                                "layout|margins": "0 10 5 10"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen38938",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 30,
-                                "padding": "0 10 5 10",
-                                "layout": "hbox",
-                                "title": "",
-                                "designer|userClassName": "MyPanel39",
-                                "container|align": "middle",
-                                "container|padding": "0 10 5 10",
-                                "layout|flex": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen39663",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeDay",
-                                        "enableToggle": true,
-                                        "text": "Day",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton35",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen39909",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeWeek",
-                                        "enableToggle": true,
-                                        "text": "Week",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen40157",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeAll",
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "All",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen46485",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "chartthree",
-                        "minWidth": 350,
-                        "width": 350,
-                        "layout": "vbox",
-                        "collapsed": false,
-                        "title": null,
-                        "designer|userClassName": "MyPanel28",
-                        "container|align": "stretch",
-                        "layout|region": "east"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen54346",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": 105,
-                                "layout": "fit",
-                                "title": "",
-                                "designer|userClassName": "MyPanel29",
-                                "layout|flex": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen34866",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": null,
-                                        "id": "chartfilterFrm",
-                                        "padding": null,
-                                        "bodyPadding": "0 10 5 0",
-                                        "collapseFirst": false,
-                                        "collapsed": false,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm35",
-                                        "weight": null
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen56987",
-                                            "type": "fieldset",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "margin": null,
-                                                "padding": 5,
-                                                "title": "3. Start editing",
-                                                "designer|userClassName": "MyFieldSet44"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen19637",
-                                                    "type": "combobox",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "id": "oeCbEditableProcedures",
-                                                        "name": "procedure",
-                                                        "fieldLabel": "Procedure",
-                                                        "labelWidth": 70,
-                                                        "displayField": "name",
-                                                        "queryMode": "local",
-                                                        "store": "editableProcedure",
-                                                        "valueField": "name",
-                                                        "designer|userClassName": "MyComboBox4",
-                                                        "layout|anchor": "100%"
-                                                    }
-                                                },
-                                                {
-                                                    "id": "ExtBox1-ext-gen19398",
-                                                    "type": "container",
-                                                    "reference": {
-                                                        "name": "items",
-                                                        "type": "array"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "height": 25,
-                                                        "layout": "hbox",
-                                                        "designer|userClassName": "MyContainer27",
-                                                        "container|align": "stretch"
-                                                    },
-                                                    "cn": [
-                                                        {
-                                                            "id": "ExtBox1-ext-gen18753",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "hidden": true,
-                                                                "id": "btnCancelEditor",
-                                                                "text": "Cancel",
-                                                                "designer|userClassName": "MyButton31",
-                                                                "layout|flex": 1
-                                                            }
-                                                        },
-                                                        {
-                                                            "id": "ExtBox1-ext-gen57550",
-                                                            "type": "button",
-                                                            "reference": {
-                                                                "name": "items",
-                                                                "type": "array"
-                                                            },
-                                                            "codeClass": null,
-                                                            "userConfig": {
-                                                                "id": "btnStartEditor",
-                                                                "text": "Start editing",
-                                                                "designer|userClassName": "MyButton31",
-                                                                "layout|flex": 1
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen53959",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "chartgridcnt",
-                                "layout": "fit",
-                                "title": "",
-                                "designer|userClassName": "MyPanel27",
-                                "layout|flex": 1,
-                                "layout|margins": "0 10 5 0"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen33626",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "padding": null,
-                        "width": 300,
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel57",
-                        "layout|region": "west"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19609",
-                            "type": "fieldset",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": null,
-                                "padding": 5,
-                                "layout": "fit",
-                                "title": "1. Choose procedure",
-                                "designer|userClassName": "MyFieldSet8"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen38983",
-                                    "type": "linkedinstance",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "pchoose"
-                                    },
-                                    "iconCls": "icon-linkedinstance",
-                                    "masterInstanceId": "ExtBox1-ext-gen27604"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen42461",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": 150,
-                "minWidth": 450,
-                "width": 450,
-                "layout": "border",
-                "title": "",
-                "designer|userClassName": "Calc",
-                "designer|userAlias": "calculator"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen43229",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "height": 100,
-                        "layout": "hbox",
-                        "title": "",
-                        "designer|userClassName": "MyPanel43",
-                        "container|align": "stretch",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen18207",
-                            "type": "gridpanel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "editableProcedureGrid",
-                                "width": 180,
-                                "title": "",
-                                "store": "editableProcedure",
-                                "designer|userClassName": "MyGridPanel14",
-                                "layout|flex": 0.3
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen18219",
-                                    "type": "gridcolumn",
-                                    "reference": {
-                                        "name": "columns",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "dataIndex": "name",
-                                        "flex": 1,
-                                        "text": "Procedures",
-                                        "designer|userClassName": "MyColumn43"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen42741",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "layout": "vbox",
-                                "title": "",
-                                "designer|userClassName": "MyPanel41",
-                                "container|align": "stretch",
-                                "layout|flex": 0.7
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen49480",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel44",
-                                        "container|align": "stretch",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen46403",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "plus",
-                                                "text": "+",
-                                                "designer|userClassName": "MyButton53",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen46191",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "moltiply",
-                                                "text": "*",
-                                                "designer|userClassName": "MyButton52",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45981",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "sqrt",
-                                                "text": "sqrt",
-                                                "designer|userClassName": "MyButton51",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45773",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "sin",
-                                                "text": "sin",
-                                                "designer|userClassName": "MyButton50",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45567",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "exp",
-                                                "text": "^",
-                                                "designer|userClassName": "MyButton49",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45363",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "acos",
-                                                "text": "acos",
-                                                "designer|userClassName": "MyButton48",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45161",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "openparentesis",
-                                                "text": "(",
-                                                "designer|userClassName": "MyButton47",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen54519",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel44",
-                                        "container|align": "stretch",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen54526",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "minus",
-                                                "text": "-",
-                                                "designer|userClassName": "MyButton53",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54533",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "divide",
-                                                "text": "/",
-                                                "designer|userClassName": "MyButton52",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54540",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "cos",
-                                                "text": "cos",
-                                                "designer|userClassName": "MyButton51",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54547",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "asin",
-                                                "text": "asin",
-                                                "designer|userClassName": "MyButton50",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54554",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "tan",
-                                                "text": "tan",
-                                                "designer|userClassName": "MyButton49",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54561",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "atan",
-                                                "text": "atan",
-                                                "designer|userClassName": "MyButton48",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen54568",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "closedparentesis",
-                                                "text": ")",
-                                                "designer|userClassName": "MyButton47",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen56491",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 30,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel44",
-                                        "container|align": "stretch",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen56498",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "less",
-                                                "text": "<",
-                                                "designer|userClassName": "MyButton53",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56505",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "grater",
-                                                "text": ">",
-                                                "designer|userClassName": "MyButton52",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56512",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "equal",
-                                                "text": "=",
-                                                "designer|userClassName": "MyButton51",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56519",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "lesseq",
-                                                "text": "≤",
-                                                "designer|userClassName": "MyButton50",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56526",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "gretereq",
-                                                "text": "≥",
-                                                "designer|userClassName": "MyButton49",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56533",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "andop",
-                                                "text": "AND",
-                                                "designer|userClassName": "MyButton48",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen56540",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "orop",
-                                                "text": "OR",
-                                                "designer|userClassName": "MyButton47",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen60359",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": null,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel48",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen40754",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "width": 120,
-                                "bodyPadding": 10,
-                                "title": "",
-                                "designer|userClassName": "MyForm38",
-                                "layout|region": "west"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen41254",
-                                    "type": "displayfield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "pEditing",
-                                        "fieldLabel": null,
-                                        "hideLabel": true,
-                                        "designer|userClassName": "MyDisplayField11",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36206",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": null,
-                                "padding": null,
-                                "layout": "hbox",
-                                "bodyPadding": null,
-                                "title": "",
-                                "designer|userClassName": "MyPanel47",
-                                "container|align": "stretch",
-                                "container|padding": null,
-                                "layout|region": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen25312",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "codePanel",
-                                        "padding": null,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel50",
-                                        "container|align": "stretch",
-                                        "container|padding": "6 0 0 0",
-                                        "layout|flex": 0.5
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen26476",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "bodyPadding": 10,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm39",
-                                        "layout|flex": 0.5
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen28131",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "calcQiCombo",
-                                                "fieldLabel": "QI",
-                                                "labelSeparator": "=",
-                                                "labelWidth": 40,
-                                                "emptyText": "choosing a qi will update the selectded values..",
-                                                "displayField": "combo",
-                                                "queryMode": "local",
-                                                "store": "calcQiStore",
-                                                "valueField": "code",
-                                                "designer|userClassName": "MyComboBox18",
-                                                "layout|anchor": "100%"
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen36566",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "width": 40,
-                                "layout": "vbox",
-                                "title": "",
-                                "designer|userClassName": "MyPanel48",
-                                "container|align": "stretch",
-                                "container|padding": "5px",
-                                "layout|region": "east"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen34163",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnExecute",
-                                        "text": "↵",
-                                        "designer|userClassName": "MyButton61",
-                                        "layout|flex": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen22330",
-            "type": "gridcolumn",
-            "reference": {
-                "name": "columns",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "text": "Interpolation",
-                "designer|userClassName": "CheckColumn",
-                "designer|userAlias": "checkcolumn"
-            }
-        },
-        {
-            "id": "ExtBox1-ext-gen20039",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "fit",
-                "designer|userClassName": "ChartContainer"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen20456",
-                    "type": "linkedinstance",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {},
-                    "iconCls": "icon-linkedinstance",
-                    "masterInstanceId": "ExtBox1-ext-gen16552"
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen21655",
-            "type": "viewport",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "layout": "fit",
-                "designer|userClassName": "TestCsv"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19880",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": null,
-                        "width": null,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "TestCSV"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen20124",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "width": 300,
-                                "bodyPadding": 16,
-                                "title": "FILE",
-                                "designer|userClassName": "MyForm41",
-                                "layout|region": "west"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen20977",
-                                    "type": "combobox",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "cmbServices",
-                                        "fieldLabel": "Service",
-                                        "labelWidth": 70,
-                                        "displayField": "service",
-                                        "store": "storeServices",
-                                        "valueField": "service",
-                                        "designer|userClassName": "MyComboBox12",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen20982",
-                                    "type": "combobox",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeCbOffering",
-                                        "itemId": null,
-                                        "name": "offering",
-                                        "fieldLabel": "Offering",
-                                        "labelWidth": 70,
-                                        "displayField": "name",
-                                        "queryMode": "local",
-                                        "store": "offerings",
-                                        "valueField": "name",
-                                        "designer|userClassName": "MyComboBox",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen20987",
-                                    "type": "combobox",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeCbProcedure",
-                                        "itemId": null,
-                                        "name": "procedure",
-                                        "fieldLabel": "Procedure",
-                                        "labelWidth": 70,
-                                        "displayField": "name",
-                                        "queryMode": "local",
-                                        "store": "procedurelist",
-                                        "valueField": "name",
-                                        "designer|userClassName": "MyComboBox3",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen21008",
-                                    "type": "filefield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btncsv",
-                                        "fieldLabel": "CSV",
-                                        "labelWidth": 70,
-                                        "designer|userClassName": "MyFileUpload",
-                                        "layout|anchor": "100%"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen23716",
-                                    "type": "toolbar",
-                                    "reference": {
-                                        "name": "dockedItems",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyToolbar22",
-                                        "container|align": "middle",
-                                        "dock": "top"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen23540",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "text": "Action!",
-                                                "designer|userClassName": "MyButton66",
-                                                "layout|flex": 1
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen20406",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "padding": null,
-                                "bodyPadding": 16,
-                                "title": "",
-                                "designer|userClassName": "MyPanel55",
-                                "layout|region": "center"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen22534",
-                                    "type": "textareafield",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "height": 155,
-                                        "id": "logger",
-                                        "readOnly": true,
-                                        "fieldLabel": "Log",
-                                        "hideLabel": true,
-                                        "designer|userClassName": "MyTextArea1",
-                                        "layout|anchor": "100%"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen20474",
-            "type": "viewport",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "layout": "border",
-                "designer|userClassName": "Viewer"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen44227",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel55",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen69897",
-                            "type": "linkedinstance",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "layout|region": "center",
-                                "id": "chartpanel"
-                            },
-                            "iconCls": "icon-linkedinstance",
-                            "masterInstanceId": "ExtBox1-ext-gen66433"
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen31930",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 250,
-                                "layout": "fit",
-                                "collapsible": true,
-                                "title": "Grid",
-                                "designer|userClassName": "MyPanel60",
-                                "layout|region": "south",
-                                "layout|split": true
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen28324",
-                                    "type": "linkedinstance",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "gridpanel"
-                                    },
-                                    "iconCls": "icon-linkedinstance",
-                                    "masterInstanceId": "ExtBox1-ext-gen27799"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen29581",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 25,
-                        "html": "<a style='color: white; text-decoration: none;' href='http://www.supsi.ch/ist' target='_BLANK'>Open Source Software by Institute of Earth Science - SUPSI</a>",
-                        "id": "mainFoot",
-                        "bodyCls": "mainFooter",
-                        "bodyPadding": 8,
-                        "title": "",
-                        "designer|userClassName": "MyPanel3",
-                        "layout|region": "south"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32436",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "width": 300,
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel58",
-                        "layout|region": "west"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32757",
-                            "type": "linkedinstance",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "pchoose"
-                            },
-                            "iconCls": "icon-linkedinstance",
-                            "masterInstanceId": "ExtBox1-ext-gen27604"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen32966",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "padding": 0,
-                "layout": "border",
-                "designer|userClassName": "Editor1",
-                "designer|userAlias": "editor1"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen32969",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "layout": "border",
-                        "title": "",
-                        "designer|userClassName": "MyPanel55",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen39719",
-                            "type": "linkedinstance",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "layout|region": "center"
-                            },
-                            "iconCls": "icon-linkedinstance",
-                            "masterInstanceId": "ExtBox1-ext-gen66433"
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen33170",
-                    "type": "tabpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": null,
-                        "width": 450,
-                        "layout": "fit",
-                        "title": "",
-                        "activeTab": 0,
-                        "designer|userClassName": "MyPanel58",
-                        "layout|region": "west"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen33179",
-                            "type": "linkedinstance",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "id": "pchoose",
-                                "title": "Choose procedure"
-                            },
-                            "iconCls": "icon-linkedinstance",
-                            "masterInstanceId": "ExtBox1-ext-gen27604"
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen45291",
-                            "type": "linkedinstance",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": null,
-                                "id": "proceduregrideditor",
-                                "title": "Editor",
-                                "designer|userClassName": "ProcedureGridEditor",
-                                "designer|userAlias": "proceduregrideditor"
-                            },
-                            "iconCls": "icon-linkedinstance",
-                            "masterInstanceId": "ExtBox1-ext-gen42142"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen27604",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "itemId": "chartone",
-                "minWidth": 280,
-                "padding": "10px 0px 0px 0px",
-                "layout": "border",
-                "bodyPadding": "",
-                "title": "",
-                "designer|userClassName": "ProcedureChooser",
-                "designer|userAlias": "procedurechooser"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19598",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 120,
-                        "id": "oeSettings",
-                        "padding": null,
-                        "bodyPadding": "0 10 0 10",
-                        "bodyStyle": null,
-                        "title": "",
-                        "designer|userClassName": "MyForm6",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19619",
-                            "type": "combobox",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "cmbServices",
-                                "fieldLabel": "Service",
-                                "labelWidth": 70,
-                                "displayField": "service",
-                                "store": "storeServices",
-                                "valueField": "service",
-                                "designer|userClassName": "MyComboBox12",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19625",
-                            "type": "combobox",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "disabled": true,
-                                "id": "oeCbOffering",
-                                "itemId": null,
-                                "name": "offering",
-                                "fieldLabel": "Offering",
-                                "labelWidth": 70,
-                                "displayField": "name",
-                                "queryMode": "local",
-                                "store": "offerings",
-                                "valueField": "name",
-                                "designer|userClassName": "MyComboBox",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19631",
-                            "type": "combobox",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "disabled": true,
-                                "id": "oeCbProcedure",
-                                "itemId": null,
-                                "name": "procedure",
-                                "fieldLabel": "Procedure",
-                                "labelWidth": 70,
-                                "displayField": "name",
-                                "queryMode": "local",
-                                "store": "procedurelist",
-                                "valueField": "name",
-                                "designer|userClassName": "MyComboBox3",
-                                "layout|anchor": "100%"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen19692",
-                            "type": "button",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "btnAdd",
-                                "text": "Add",
-                                "designer|userClassName": "MyButton11",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen29107",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": "proceduresTree",
-                        "autoScroll": true,
-                        "bodyPadding": "0 10 0 10",
-                        "title": "",
-                        "designer|userClassName": "MyPanel26",
-                        "layout|region": "center"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen22938",
-            "type": "form",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": "plotdatafrm",
-                "padding": "5 10 0 10",
-                "title": "",
-                "designer|userClassName": "ProcedurePlotter",
-                "designer|userAlias": "procedureplotter"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen24169",
-                    "type": "fieldcontainer",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": null,
-                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                        "layout": "hbox",
-                        "fieldLabel": "From",
-                        "labelWidth": 35,
-                        "designer|userClassName": "MyFieldContainer",
-                        "container|padding": null,
-                        "layout|anchor": "100%"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen24173",
-                            "type": "datefield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "oeBegin",
-                                "name": "begin",
-                                "fieldLabel": null,
-                                "format": "Y-m-d",
-                                "designer|userClassName": "MyDateField",
-                                "layout|flex": 0.3
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24179",
-                            "type": "timefield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "oeBeginTime",
-                                "minWidth": null,
-                                "width": null,
-                                "name": "begintime",
-                                "fieldLabel": "Label",
-                                "format": "H:i ",
-                                "increment": 10,
-                                "designer|userClassName": "MyTimeField",
-                                "layout|flex": 0.2
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen50979",
-                            "type": "label",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 22,
-                                "padding": "2px 0px 0px 10px",
-                                "width": 30,
-                                "text": "To:",
-                                "designer|userClassName": "MyLabel",
-                                "layout|flex": 0
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24190",
-                            "type": "datefield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "oeEnd",
-                                "name": "end",
-                                "fieldLabel": "Label",
-                                "format": "Y-m-d",
-                                "designer|userClassName": "MyDateField1",
-                                "layout|flex": 0.3
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24196",
-                            "type": "timefield",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "oeEndTime",
-                                "name": "endtime",
-                                "value": null,
-                                "fieldLabel": "Label",
-                                "format": "H:i ",
-                                "increment": 10,
-                                "designer|userClassName": "MyTimeField1",
-                                "layout|flex": 0.2
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen53946",
-                            "type": "label",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "height": 22,
-                                "padding": "2px 0px 0px 10px",
-                                "width": 70,
-                                "text": "Property:",
-                                "designer|userClassName": "MyLabel",
-                                "layout|flex": 0
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen24203",
-                            "type": "combobox",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "oeCbObservedProperty",
-                                "name": "observedproperty",
-                                "fieldLabel": "Property",
-                                "labelWidth": 70,
-                                "displayField": "name",
-                                "queryMode": "local",
-                                "store": "observedproperties",
-                                "valueField": "definition",
-                                "designer|userClassName": "MyComboBox4",
-                                "layout|flex": 0.6
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen26741",
-                            "type": "button",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "disabled": true,
-                                "id": "btnPlot",
-                                "margin": null,
-                                "padding": null,
-                                "text": "Plot",
-                                "designer|userClassName": "MyButton31",
-                                "layout|flex": 0.4,
-                                "layout|margins": null
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen66433",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "id": "chartpanel",
-                "width": null,
-                "layout": "border",
-                "title": "",
-                "designer|userClassName": "ProcedureChart",
-                "designer|userAlias": "procedurechart"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen67998",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel68",
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen68374",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": null,
-                                "id": "plotdatafrm",
-                                "padding": "5 10 0 10",
-                                "title": "",
-                                "designer|userClassName": "ProcedurePlotter",
-                                "designer|userAlias": "procedureplotter"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen68379",
-                                    "type": "fieldcontainer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": null,
-                                        "defaults": "{\n                    flex: 1,\n                    hideLabel: true\n                }",
-                                        "layout": "hbox",
-                                        "fieldLabel": "From",
-                                        "labelWidth": 35,
-                                        "designer|userClassName": "MyFieldContainer",
-                                        "container|padding": null,
-                                        "layout|anchor": "100%"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen68385",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeBegin",
-                                                "name": "begin",
-                                                "fieldLabel": null,
-                                                "format": "Y-m-d",
-                                                "designer|userClassName": "MyDateField",
-                                                "layout|flex": 0.3
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68391",
-                                            "type": "timefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeBeginTime",
-                                                "minWidth": null,
-                                                "width": null,
-                                                "name": "begintime",
-                                                "fieldLabel": "Label",
-                                                "format": "H:i ",
-                                                "increment": 10,
-                                                "designer|userClassName": "MyTimeField",
-                                                "layout|flex": 0.2
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68397",
-                                            "type": "label",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 22,
-                                                "padding": "2px 0px 0px 10px",
-                                                "width": 30,
-                                                "text": "To:",
-                                                "designer|userClassName": "MyLabel",
-                                                "layout|flex": 0
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68403",
-                                            "type": "datefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeEnd",
-                                                "name": "end",
-                                                "fieldLabel": "Label",
-                                                "format": "Y-m-d",
-                                                "designer|userClassName": "MyDateField1",
-                                                "layout|flex": 0.3
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68409",
-                                            "type": "timefield",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeEndTime",
-                                                "name": "endtime",
-                                                "value": null,
-                                                "fieldLabel": "Label",
-                                                "format": "H:i ",
-                                                "increment": 10,
-                                                "designer|userClassName": "MyTimeField1",
-                                                "layout|flex": 0.2
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68415",
-                                            "type": "label",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "height": 22,
-                                                "padding": "2px 0px 0px 10px",
-                                                "width": 70,
-                                                "text": "Property:",
-                                                "designer|userClassName": "MyLabel",
-                                                "layout|flex": 0
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68421",
-                                            "type": "combobox",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "oeCbObservedProperty",
-                                                "name": "observedproperty",
-                                                "fieldLabel": "Property",
-                                                "labelWidth": 70,
-                                                "displayField": "name",
-                                                "queryMode": "local",
-                                                "store": "observedproperties",
-                                                "valueField": "definition",
-                                                "designer|userClassName": "MyComboBox4",
-                                                "layout|flex": 0.6
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen68427",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "btnPlot",
-                                                "margin": null,
-                                                "padding": null,
-                                                "text": "Plot",
-                                                "designer|userClassName": "MyButton31",
-                                                "layout|flex": 0.4,
-                                                "layout|margins": null
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen67261",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "id": null,
-                        "style": "background-color: white;",
-                        "layout": "fit",
-                        "bodyCls": null,
-                        "title": "",
-                        "designer|userClassName": "MyPanel67",
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen75866",
-                            "type": "toolbar",
-                            "reference": {
-                                "name": "dockedItems",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "MyToolbar24",
-                                "container|align": "middle",
-                                "dock": "bottom"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen77565",
-                                    "type": "tbspacer",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MySpacer",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen74245",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeDay",
-                                        "width": 60,
-                                        "enableToggle": true,
-                                        "text": "Day",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton35"
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen74252",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeWeek",
-                                        "width": 60,
-                                        "enableToggle": true,
-                                        "text": "Week",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton38",
-                                        "layout|flex": null
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen74259",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnRangeAll",
-                                        "width": 60,
-                                        "enableToggle": true,
-                                        "pressed": true,
-                                        "text": "All",
-                                        "toggleGroup": "timeline",
-                                        "designer|userClassName": "MyButton39",
-                                        "layout|flex": null
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen26949",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "html": null,
-                                "id": "chartCnt",
-                                "layout": "fit",
-                                "bodyCls": "viewerChart",
-                                "title": "",
-                                "designer|userClassName": "MyPanel66"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen27799",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": 0,
-                "height": null,
-                "width": null,
-                "layout": "fit",
-                "title": null,
-                "designer|userClassName": "ProcedureGrid",
-                "designer|userAlias": "proceduregrid"
-            }
-        },
-        {
-            "id": "ExtBox1-ext-gen42142",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "border": null,
-                "id": "proceduregrideditor",
-                "minWidth": 350,
-                "width": 350,
-                "layout": "border",
-                "collapsed": false,
-                "title": null,
-                "designer|userClassName": "ProcedureGridEditor",
-                "designer|userAlias": "proceduregrideditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen42153",
-                    "type": "panel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "border": 0,
-                        "height": 30,
-                        "id": null,
-                        "itemId": "buttonspanel",
-                        "layout": "fit",
-                        "title": "",
-                        "designer|userClassName": "MyPanel29",
-                        "layout|flex": null,
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen42160",
-                            "type": "form",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "border": 0,
-                                "height": null,
-                                "id": "chartfilterFrm",
-                                "padding": null,
-                                "layout": "hbox",
-                                "bodyPadding": "0 10 0 10",
-                                "collapseFirst": false,
-                                "collapsed": false,
-                                "title": "",
-                                "designer|userClassName": "MyForm35",
-                                "container|align": "middle",
-                                "container|padding": null,
-                                "weight": null
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen42171",
-                                    "type": "combobox",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "oeCbEditableProcedures",
-                                        "name": "procedure",
-                                        "fieldLabel": "Procedure",
-                                        "labelWidth": 70,
-                                        "allowBlank": false,
-                                        "displayField": "name",
-                                        "queryMode": "local",
-                                        "store": "editableProcedure",
-                                        "valueField": "name",
-                                        "designer|userClassName": "MyComboBox4",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen42180",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "hidden": true,
-                                        "id": "btnCancelEditor",
-                                        "minWidth": 60,
-                                        "text": "Cancel",
-                                        "designer|userClassName": "MyButton31",
-                                        "layout|flex": 0.5
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen42186",
-                                    "type": "button",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "btnStartEditor",
-                                        "minWidth": 60,
-                                        "text": "Start editing",
-                                        "designer|userClassName": "MyButton31",
-                                        "layout|flex": 0.5
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen30813",
-                    "type": "linkedinstance",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "layout|region": "center",
-                        "id": "proceduregrid",
-                        "itemId": null
-                    },
-                    "iconCls": "icon-linkedinstance",
-                    "masterInstanceId": "ExtBox1-ext-gen27799"
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen32036",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": null,
-                "width": null,
-                "layout": "border",
-                "title": "",
-                "designer|userClassName": "VirtualProcedureEditor",
-                "designer|userAlias": "virtualprocedureeditor"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen32417",
-                    "type": "form",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": 50,
-                        "bodyPadding": 10,
-                        "title": "",
-                        "designer|userClassName": "MyForm46",
-                        "layout|flex": null,
-                        "layout|region": "north"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32929",
-                            "type": "combobox",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "id": "vpcmbplist",
-                                "fieldLabel": "Virtual procedure",
-                                "labelWidth": 150,
-                                "allowBlank": false,
-                                "displayField": "name",
-                                "forceSelection": true,
-                                "store": "vplist",
-                                "valueField": "name",
-                                "designer|userClassName": "MyComboBox31",
-                                "layout|anchor": "100%"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen32655",
-                    "type": "tabpanel",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "id": "vppanel",
-                        "activeItem": 0,
-                        "title": "",
-                        "activeTab": 1,
-                        "designer|userClassName": "MyPanel79",
-                        "layout|flex": 1,
-                        "layout|region": "center"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen33712",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "layout": "vbox",
-                                "title": "Rating curve",
-                                "designer|userClassName": "MyPanel81",
-                                "container|align": "stretch"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen40251",
-                                    "type": "toolbar",
-                                    "reference": {
-                                        "name": "dockedItems",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "designer|userClassName": "MyToolbar25",
-                                        "layout|flex": 1,
-                                        "dock": "top"
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen48175",
-                                            "type": "tbtext",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "style": null,
-                                                "text": "ADD",
-                                                "designer|userClassName": "MyTextItem",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen40471",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "vpbtnaddrc",
-                                                "text": "> at end",
-                                                "designer|userClassName": "MyButton77",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen46515",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "vpbtnaddaboverc",
-                                                "text": "> above selected",
-                                                "designer|userClassName": "MyButton77",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen46844",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "vpbtnaddbelowrc",
-                                                "text": "> below selected",
-                                                "designer|userClassName": "MyButton77",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen47502",
-                                            "type": "tbseparator",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "margin": "0px 8px 0px 8px",
-                                                "padding": null,
-                                                "designer|userClassName": "MySeparator1",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen40697",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "disabled": true,
-                                                "id": "vpbtnremoverc",
-                                                "text": "Remove selected",
-                                                "designer|userClassName": "MyButton78",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen37123",
-                                    "type": "gridpanel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "id": "vpgridratingcurve",
-                                        "title": "",
-                                        "store": "ratingcurve",
-                                        "designer|userClassName": "MyGridPanel16",
-                                        "layout|flex": 1
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen37146",
-                                            "type": "datecolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "from",
-                                                "flex": 0.13,
-                                                "text": "From",
-                                                "format": "Y-m-d",
-                                                "designer|userClassName": "MyDateColumn2"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen40882",
-                                                    "type": "datefield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "from",
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "format": "Y-m-d",
-                                                        "designer|userClassName": "MyDateField8"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen32244",
-                                            "type": "datecolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "to",
-                                                "flex": 0.13,
-                                                "text": "To",
-                                                "format": "Y-m-d",
-                                                "designer|userClassName": "MyDateColumn3"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen42591",
-                                                    "type": "datefield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "name": "to",
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "format": "Y-m-d",
-                                                        "designer|userClassName": "MyDateField9"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen37139",
-                                            "type": "numbercolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "low_val",
-                                                "flex": 0.13,
-                                                "text": "Low",
-                                                "format": "0,000.0000",
-                                                "designer|userClassName": "MyNumberColumn4"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen42933",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "decimalPrecision": 4,
-                                                        "designer|userClassName": "MyNumberField10"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen32714",
-                                            "type": "numbercolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "up_val",
-                                                "flex": 0.13,
-                                                "text": "Up",
-                                                "format": "0,000.0000",
-                                                "designer|userClassName": "MyNumberColumn5"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen43226",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "decimalPrecision": 4,
-                                                        "designer|userClassName": "MyNumberField11"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen33185",
-                                            "type": "numbercolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "A",
-                                                "flex": 0.13,
-                                                "text": "A",
-                                                "format": "0,000.0000",
-                                                "designer|userClassName": "MyNumberColumn6"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen43404",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "decimalPrecision": 4,
-                                                        "designer|userClassName": "MyNumberField12"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen33557",
-                                            "type": "numbercolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "B",
-                                                "flex": 0.13,
-                                                "text": "B",
-                                                "format": "0,000.0000",
-                                                "designer|userClassName": "MyNumberColumn7"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen43643",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "decimalPrecision": 4,
-                                                        "designer|userClassName": "MyNumberField13"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen33721",
-                                            "type": "numbercolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "C",
-                                                "flex": 0.13,
-                                                "text": "C",
-                                                "format": "0,000.0000",
-                                                "designer|userClassName": "MyNumberColumn8"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen43885",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "decimalPrecision": 4,
-                                                        "designer|userClassName": "MyNumberField14"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen33887",
-                                            "type": "numbercolumn",
-                                            "reference": {
-                                                "name": "columns",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "sortable": false,
-                                                "dataIndex": "K",
-                                                "flex": 0.13,
-                                                "text": "K",
-                                                "format": "0,000.0000",
-                                                "designer|userClassName": "MyNumberColumn9"
-                                            },
-                                            "cn": [
-                                                {
-                                                    "id": "ExtBox1-ext-gen44130",
-                                                    "type": "numberfield",
-                                                    "reference": {
-                                                        "name": "field",
-                                                        "type": "object"
-                                                    },
-                                                    "codeClass": null,
-                                                    "userConfig": {
-                                                        "fieldLabel": "Label",
-                                                        "hideLabel": true,
-                                                        "decimalPrecision": 4,
-                                                        "designer|userClassName": "MyNumberField15"
-                                                    }
-                                                }
-                                            ]
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen37160",
-                                            "type": "gridview",
-                                            "reference": {
-                                                "name": "viewConfig",
-                                                "type": "object"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "designer|userClassName": "MyGridView15"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen34510",
-                                            "type": "gridcelleditingplugin",
-                                            "reference": {
-                                                "name": "plugins",
-                                                "type": "array"
-                                            },
-                                            "codeClass": "Ext.grid.plugin.CellEditing",
-                                            "userConfig": {
-                                                "designer|userClassName": "MyCellEditingPlugin"
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen50406",
-                                            "type": "rowselectionmodel",
-                                            "reference": {
-                                                "name": "selModel",
-                                                "type": "object"
-                                            },
-                                            "codeClass": "Ext.selection.RowModel",
-                                            "userConfig": {
-                                                "allowDeselect": true,
-                                                "designer|userClassName": "MyRowSelectionModel"
-                                            }
-                                        }
-                                    ]
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen38481",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 60,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel83",
-                                        "container|align": "stretch",
-                                        "container|padding": "8px 0px 8px 0px",
-                                        "layout|flex": null
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen39412",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 40,
-                                                "designer|userClassName": "MyContainer32",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen38823",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "vpbtndeleterc",
-                                                "text": "Delete Rating Curve File",
-                                                "designer|userClassName": "MyButton75",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44408",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 40,
-                                                "designer|userClassName": "MyContainer32",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen39196",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "vpbtnsaverc",
-                                                "text": "Store the File",
-                                                "designer|userClassName": "MyButton76",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen44551",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 40,
-                                                "designer|userClassName": "MyContainer32",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen33858",
-                            "type": "panel",
-                            "reference": {
-                                "name": "items",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "layout": "vbox",
-                                "title": "Code",
-                                "designer|userClassName": "MyPanel82",
-                                "container|align": "stretch"
-                            },
-                            "cn": [
-                                {
-                                    "id": "ExtBox1-ext-gen33633",
-                                    "type": "form",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "id": "vpcodingform",
-                                        "layout": "fit",
-                                        "bodyPadding": 10,
-                                        "title": "",
-                                        "designer|userClassName": "MyForm47",
-                                        "layout|flex": 1
-                                    }
-                                },
-                                {
-                                    "id": "ExtBox1-ext-gen41982",
-                                    "type": "panel",
-                                    "reference": {
-                                        "name": "items",
-                                        "type": "array"
-                                    },
-                                    "codeClass": null,
-                                    "userConfig": {
-                                        "border": 0,
-                                        "height": 60,
-                                        "layout": "hbox",
-                                        "title": "",
-                                        "designer|userClassName": "MyPanel83",
-                                        "container|align": "stretch",
-                                        "container|padding": "8px 0px 8px 0px",
-                                        "layout|flex": null
-                                    },
-                                    "cn": [
-                                        {
-                                            "id": "ExtBox1-ext-gen41996",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 40,
-                                                "designer|userClassName": "MyContainer32",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen41989",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "vpbtndeletecode",
-                                                "text": "Delete Code File",
-                                                "designer|userClassName": "MyButton75",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45462",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 40,
-                                                "designer|userClassName": "MyContainer32",
-                                                "layout|flex": null
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen42003",
-                                            "type": "button",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "id": "vpbtnsavecode",
-                                                "text": "Save the Python Code",
-                                                "designer|userClassName": "MyButton76",
-                                                "layout|flex": 1
-                                            }
-                                        },
-                                        {
-                                            "id": "ExtBox1-ext-gen45637",
-                                            "type": "container",
-                                            "reference": {
-                                                "name": "items",
-                                                "type": "array"
-                                            },
-                                            "codeClass": null,
-                                            "userConfig": {
-                                                "width": 40,
-                                                "designer|userClassName": "MyContainer32",
-                                                "layout|flex": null
-                                            }
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ]
-                }
-            ]
-        }
-    ],
-    "stores": [
-        {
-            "id": "ExtBox1-ext-gen41866",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "dataQualityStore",
-                "designer|userClassName": "DataQualityStore"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen41870",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": null,
-                        "designer|userClassName": "Ajax Proxy"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen41876",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen22818",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": null,
-                        "designer|userClassName": "MyField67"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen42110",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "code",
-                        "designer|userClassName": "MyField"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen42117",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "designer|userClassName": "MyField1"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen12255",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "offerings",
-                "designer|userClassName": "Offerings"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen12259",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "data/offerings.json",
-                        "designer|userClassName": "Ajax Proxy1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen12265",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader1"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen12620",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13263",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField3"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen13495",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "procedures",
-                "designer|userClassName": "Procedures"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen13498",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen13501",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader1"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen13504",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13507",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField3"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen13909",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "observedproperties",
-                "designer|userClassName": "ObservedProperties"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen13912",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy1"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen13915",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader1"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen13918",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField2"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen13921",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField3"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen21787",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "uom",
-                        "type": "string",
-                        "designer|userClassName": "MyField64"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen17477",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField66"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen35869",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "observations",
-                "designer|userClassName": "Observations"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen35873",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "data/observations.json",
-                        "designer|userClassName": "Ajax Proxy4"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen35879",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "isodate",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader4"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen36169",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dateFormat": "c",
-                        "name": "isodate",
-                        "type": "date",
-                        "designer|userClassName": "MyField8"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen36176",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "float",
-                        "designer|userClassName": "MyField9"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen14899",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "serverstatus",
-                "designer|userClassName": "serverstatus"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen14903",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": null,
-                        "designer|userClassName": "Ajax Proxy5"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen14909",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "service",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader5"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen15282",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "getcapabilities",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField10"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15289",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "featuresOfInterest",
-                        "type": "int",
-                        "designer|userClassName": "MyField11"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15296",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "describesensor",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField12"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15303",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "getobservation",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField13"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15310",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "service",
-                        "type": "string",
-                        "designer|userClassName": "MyField14"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15737",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "database",
-                        "type": "string",
-                        "designer|userClassName": "MyField15"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15744",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "availability",
-                        "type": "string",
-                        "designer|userClassName": "MyField16"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15751",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "offerings",
-                        "type": "int",
-                        "designer|userClassName": "MyField17"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15758",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "getfeatureofinterest",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField18"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen15765",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "registersensor",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField19"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen16217",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "type": "int",
-                        "designer|userClassName": "MyField20"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen16224",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "observedProperties",
-                        "type": "int",
-                        "designer|userClassName": "MyField21"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen16231",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "insertobservation",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField22"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen36913",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "fake",
-                "designer|userClassName": "Fake",
-                "designer|userAlias": null
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen36917",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen36923",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader6"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen37157",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "designer|userClassName": "MyField23"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen112522",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "designer|userClassName": "MyField26"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen112702",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField27"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen32395",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "constraint",
-                "data": "[\n{\n  \"name\": \" -- \",\n  \"value\": 0\n},\n{\n  \"name\": \"Greater then\",\n  \"value\": 1\n},\n{\n  \"name\": \"Less then\",\n  \"value\": 2\n},\n{\n  \"name\": \"Between\",\n  \"value\": 3\n},\n{\n  \"name\": \"Value list\",\n  \"value\": 4\n},\n]",
-                "designer|userClassName": "Constraint"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen32398",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy6"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen32401",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader6"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen32404",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "designer|userClassName": "MyField23"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32407",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "designer|userClassName": "MyField26"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen100883",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "identification",
-                "designer|userClassName": "cmbIdentification"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen100887",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbIdentification.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen100893",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen101155",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen101162",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField25"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen130149",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "cmbsml",
-                "designer|userClassName": "cmbSml"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen130152",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbIdentification.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen130155",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen130158",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen47109",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField40"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen130161",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField25"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen130327",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "uom",
-                        "type": "string",
-                        "designer|userClassName": "MyField31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen132456",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "string",
-                        "designer|userClassName": "MyField33"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen65651",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "gridoutputs",
-                "designer|userClassName": "gridOutputs"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen65654",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": null,
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen65657",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen65660",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65663",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField40"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65666",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField25"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65669",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "uom",
-                        "type": "string",
-                        "designer|userClassName": "MyField31"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen65672",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "string",
-                        "designer|userClassName": "MyField33"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen66079",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "role",
-                        "designer|userClassName": "MyField46"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen66086",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "from",
-                        "type": "string",
-                        "designer|userClassName": "MyField47"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen66093",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "to",
-                        "type": "string",
-                        "designer|userClassName": "MyField48"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen45104",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "list",
-                        "type": "string",
-                        "designer|userClassName": "MyField73"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen45111",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "ctype",
-                        "designer|userClassName": "MyField74"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen122830",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "autoLoad": true,
-                "storeId": "systemtype",
-                "designer|userClassName": "cmbSystemType"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen122833",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbsystemtype.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen122836",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen122839",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen170536",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "cmbname",
-                "designer|userClassName": "cmbName"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen170539",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbsystemtype.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen170542",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen170545",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen27957",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "namedescription",
-                "designer|userClassName": "cmbNameDescription"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen27960",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbsystemtype.json",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen27963",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen27966",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen28228",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField53"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen19975",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "storeServices",
-                "designer|userClassName": "Services"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen19978",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "/istsos/wa/istsos/services",
-                        "designer|userClassName": "Ajax Proxy7"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen19981",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "service",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader7"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen19984",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "service",
-                        "type": "string",
-                        "designer|userClassName": "MyField24"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen19987",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "path",
-                        "type": "string",
-                        "designer|userClassName": "MyField53"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen172001",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "griddocumentation",
-                "designer|userClassName": "gridDocumentation"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen172005",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy11"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen172011",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "root": "data",
-                                "designer|userClassName": "Json Reader11"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen172273",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField34"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen172280",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dateFormat": "Y-m-d",
-                        "name": "date",
-                        "type": "date",
-                        "designer|userClassName": "MyField35"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen172287",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "format",
-                        "type": "string",
-                        "designer|userClassName": "MyField36"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen172294",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "link",
-                        "type": "string",
-                        "designer|userClassName": "MyField37"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen175055",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "cmbdocumentformat",
-                "designer|userClassName": "cmbDocumentFormat"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen175059",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/data/cmbdocumentformat.json",
-                        "designer|userClassName": "Ajax Proxy12"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen175065",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": null,
-                                "messageProperty": null,
-                                "root": "data",
-                                "designer|userClassName": "Json Reader12"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen175420",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "extension",
-                        "type": "string",
-                        "designer|userClassName": "MyField38"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen175427",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "format",
-                        "sortType": "asText",
-                        "type": "string",
-                        "designer|userClassName": "MyField39"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen23769",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "procedurelist",
-                "designer|userClassName": "gridProceduresList"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen23773",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen23779",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen24076",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "sortType": "asText",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32742",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "sortType": "asText",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32831",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "sensortype",
-                        "sortType": "asText",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24083",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "offerings",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24090",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "observedproperties",
-                        "designer|userClassName": "MyField51"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen32778",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "samplingTime",
-                        "designer|userClassName": "MyField89"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen35785",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "vplist",
-                "designer|userClassName": "vplist"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen35788",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen35791",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen35794",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "sortType": "asText",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35797",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "offerings",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35800",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "observedproperties",
-                        "designer|userClassName": "MyField51"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen24877",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "gridobservedproperties",
-                "designer|userClassName": "gridObservedProperties"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen24880",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "",
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen24883",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen24886",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen63840",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "definition",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24889",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen24892",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "type": "string",
-                        "designer|userClassName": "MyField51"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen54035",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "constraint",
-                        "designer|userClassName": "MyField75"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen23329",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "griduoms",
-                "designer|userClassName": "gridUoms"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen23332",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "",
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen23335",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "definition",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen23338",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen23344",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen23347",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "designer|userClassName": "MyField51"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen43477",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "gridofferings",
-                "designer|userClassName": "gridOfferings"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen43480",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "",
-                        "designer|userClassName": "Ajax Proxy14"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen43483",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "name",
-                                "messageProperty": "message",
-                                "root": "data",
-                                "designer|userClassName": "Json Reader14"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen43486",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "name",
-                        "type": "string",
-                        "designer|userClassName": "MyField49"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen43489",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "description",
-                        "type": "string",
-                        "designer|userClassName": "MyField50"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen43492",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "procedures",
-                        "designer|userClassName": "MyField51"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen44059",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "dateFormat": "c",
-                        "name": "expiration",
-                        "type": "date",
-                        "designer|userClassName": "MyField60"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen44066",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "active",
-                        "type": "boolean",
-                        "designer|userClassName": "MyField61"
-                    }
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen18026",
-            "type": "arraystore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "MyArrayStore",
-                "designer|userClassName": "MyArrayStore"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen18030",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy19"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen18036",
-                            "type": "arrayreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "idProperty": "xx",
-                                "designer|userClassName": "Array Reader"
-                            }
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "ExtBox1-ext-gen35230",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "ratingcurve",
-                "designer|userClassName": "RatingCurve",
-                "designer|userAlias": "ratingcurve"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen35234",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "designer|userClassName": "Ajax Proxy22"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen35240",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "Json Reader21"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen35565",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "from",
-                        "type": "date",
-                        "designer|userClassName": "MyField76"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35572",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "to",
-                        "type": "date",
-                        "designer|userClassName": "MyField77"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35579",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "low_val",
-                        "type": "float",
-                        "designer|userClassName": "MyField78"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35586",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "up_val",
-                        "type": "float",
-                        "designer|userClassName": "MyField79"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen35593",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "A",
-                        "type": "float",
-                        "designer|userClassName": "MyField80"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen36020",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "B",
-                        "type": "float",
-                        "designer|userClassName": "MyField81"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen36027",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "C",
-                        "type": "float",
-                        "designer|userClassName": "MyField82"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen36034",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "K",
-                        "type": "float",
-                        "designer|userClassName": "MyField83"
-                    }
-                }
-            ]
-        }
-    ],
-    "framework": "ext40"
-}
\ No newline at end of file
diff --git a/interface/nbproject/private/private.properties b/interface/nbproject/private/private.properties
deleted file mode 100755
index 92887b0..0000000
--- a/interface/nbproject/private/private.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-copy.src.files=false
-copy.src.target=/var/www/webAdmin
-index.file=index.html
-run.as=LOCAL
-url=http://localhost/istsosadmin
diff --git a/interface/nbproject/private/private.xml b/interface/nbproject/private/private.xml
deleted file mode 100755
index 92aa1db..0000000
--- a/interface/nbproject/private/private.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1">
-        <file>
-            <url>app/view/ProcedureGrid.js</url>
-            <line>283</line>
-        </file>
-        <file>
-            <url>app/view/Chart.js</url>
-            <line>126</line>
-            <line>148</line>
-            <line>672</line>
-        </file>
-        <file>
-            <url>app/view/Calc.js</url>
-            <line>191</line>
-        </file>
-    </editor-bookmarks>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/home/milan/workspace/istsos/svn/interface/app/view/getobservation.js</file>
-        <file>file:/home/milan/workspace/istsos/svn/interface/app/view/geo.js</file>
-    </open-files>
-</project-private>
diff --git a/interface/nbproject/private/retriever/catalog.xml b/interface/nbproject/private/retriever/catalog.xml
deleted file mode 100755
index b06a655..0000000
--- a/interface/nbproject/private/retriever/catalog.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
-    <system systemId="http://www.opengis.net/gml" uri="schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-    <system systemId="http://www.opengis.net/sos/1.0" uri="schemas.opengis.net/sos/1.0.0/sosAll.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosCommon.xsd" uri="schemas.opengis.net/sos/1.0.0/sosCommon.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd" uri="schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosDescribeFeatureType.xsd" uri="schemas.opengis.net/sos/1.0.0/sosDescribeFeatureType.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosDescribeSensor.xsd" uri="schemas.opengis.net/sos/1.0.0/sosDescribeSensor.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosDescribeObservationType.xsd" uri="schemas.opengis.net/sos/1.0.0/sosDescribeObservationType.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosDescribeResultModel.xsd" uri="schemas.opengis.net/sos/1.0.0/sosDescribeResultModel.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd" uri="schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosGetResult.xsd" uri="schemas.opengis.net/sos/1.0.0/sosGetResult.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterest.xsd" uri="schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterest.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterestTime.xsd" uri="schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterestTime.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosInsert.xsd" uri="schemas.opengis.net/sos/1.0.0/sosInsert.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosRegisterSensor.xsd" uri="schemas.opengis.net/sos/1.0.0/sosRegisterSensor.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosGetObservationById.xsd" uri="schemas.opengis.net/sos/1.0.0/sosGetObservationById.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd" uri="schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd" uri="schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-    <system systemId="http://schemas.opengis.net/sos/1.0.0/sosContents.xsd" uri="schemas.opengis.net/sos/1.0.0/sosContents.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsGetResourceByID.xsd" uri="schemas.opengis.net/ows/1.1.0/owsGetResourceByID.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd" uri="schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsDomainType.xsd" uri="schemas.opengis.net/ows/1.1.0/owsDomainType.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsContents.xsd" uri="schemas.opengis.net/ows/1.1.0/owsContents.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsInputOutputData.xsd" uri="schemas.opengis.net/ows/1.1.0/owsInputOutputData.xsd"/>
-    <system systemId="http://schemas.opengis.net/filter/1.1.0/filter.xsd" uri="schemas.opengis.net/filter/1.1.0/filter.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsDataIdentification.xsd" uri="schemas.opengis.net/ows/1.1.0/owsDataIdentification.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsGetCapabilities.xsd" uri="schemas.opengis.net/ows/1.1.0/owsGetCapabilities.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsCommon.xsd" uri="schemas.opengis.net/ows/1.1.0/owsCommon.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsManifest.xsd" uri="schemas.opengis.net/ows/1.1.0/owsManifest.xsd"/>
-    <system systemId="http://schemas.opengis.net/filter/1.1.0/filterAll.xsd" uri="schemas.opengis.net/filter/1.1.0/filterAll.xsd"/>
-    <system systemId="http://schemas.opengis.net/filter/1.1.0/expr.xsd" uri="schemas.opengis.net/filter/1.1.0/expr.xsd"/>
-    <system systemId="http://schemas.opengis.net/filter/1.1.0/sort.xsd" uri="schemas.opengis.net/filter/1.1.0/sort.xsd"/>
-    <system systemId="http://schemas.opengis.net/filter/1.1.0/filterCapabilities.xsd" uri="schemas.opengis.net/filter/1.1.0/filterCapabilities.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/ows19115subset.xsd" uri="schemas.opengis.net/ows/1.1.0/ows19115subset.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsServiceIdentification.xsd" uri="schemas.opengis.net/ows/1.1.0/owsServiceIdentification.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsServiceProvider.xsd" uri="schemas.opengis.net/ows/1.1.0/owsServiceProvider.xsd"/>
-    <system systemId="http://schemas.opengis.net/ows/1.1.0/owsOperationsMetadata.xsd" uri="schemas.opengis.net/ows/1.1.0/owsOperationsMetadata.xsd"/>
-    <system systemId="http://www.w3.org/1999/xlink" uri="www.w3.org/1999/xlink"/>
-    <system systemId="http://www.opengis.net/om/1.0" uri="schemas.opengis.net/om/1.0.0/om.xsd"/>
-    <system systemId="http://www.opengis.net/gml/3.2" uri="schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/dynamicFeature.xsd" uri="schemas.opengis.net/gml/3.2.1/dynamicFeature.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/topology.xsd" uri="schemas.opengis.net/gml/3.2.1/topology.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/coverage.xsd" uri="schemas.opengis.net/gml/3.2.1/coverage.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd" uri="schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/observation.xsd" uri="schemas.opengis.net/gml/3.2.1/observation.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/temporalReferenceSystems.xsd" uri="schemas.opengis.net/gml/3.2.1/temporalReferenceSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/deprecatedTypes.xsd" uri="schemas.opengis.net/gml/3.2.1/deprecatedTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/feature.xsd" uri="schemas.opengis.net/gml/3.2.1/feature.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/direction.xsd" uri="schemas.opengis.net/gml/3.2.1/direction.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/geometryComplexes.xsd" uri="schemas.opengis.net/gml/3.2.1/geometryComplexes.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/valueObjects.xsd" uri="schemas.opengis.net/gml/3.2.1/valueObjects.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/grids.xsd" uri="schemas.opengis.net/gml/3.2.1/grids.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/geometryAggregates.xsd" uri="schemas.opengis.net/gml/3.2.1/geometryAggregates.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/coordinateSystems.xsd" uri="schemas.opengis.net/gml/3.2.1/coordinateSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/datums.xsd" uri="schemas.opengis.net/gml/3.2.1/datums.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/coordinateOperations.xsd" uri="schemas.opengis.net/gml/3.2.1/coordinateOperations.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/temporalTopology.xsd" uri="schemas.opengis.net/gml/3.2.1/temporalTopology.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/dictionary.xsd" uri="schemas.opengis.net/gml/3.2.1/dictionary.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/temporal.xsd" uri="schemas.opengis.net/gml/3.2.1/temporal.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/geometryBasic0d1d.xsd" uri="schemas.opengis.net/gml/3.2.1/geometryBasic0d1d.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/geometryPrimitives.xsd" uri="schemas.opengis.net/gml/3.2.1/geometryPrimitives.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/referenceSystems.xsd" uri="schemas.opengis.net/gml/3.2.1/referenceSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/measures.xsd" uri="schemas.opengis.net/gml/3.2.1/measures.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/gmlBase.xsd" uri="schemas.opengis.net/gml/3.2.1/gmlBase.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/geometryBasic2d.xsd" uri="schemas.opengis.net/gml/3.2.1/geometryBasic2d.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/units.xsd" uri="schemas.opengis.net/gml/3.2.1/units.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/metadataApplication.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/metadataApplication.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.2.1/basicTypes.xsd" uri="schemas.opengis.net/gml/3.2.1/basicTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd" uri="schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/metadataEntity.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/metadataEntity.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gco/basicTypes.xsd" uri="schemas.opengis.net/iso/19139/20070417/gco/basicTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/spatialRepresentation.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/spatialRepresentation.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/metadataExtension.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/metadataExtension.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/content.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/content.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/applicationSchema.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/applicationSchema.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/portrayalCatalogue.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/portrayalCatalogue.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/dataQuality.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/dataQuality.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/freeText.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/freeText.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd" uri="schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gss/gss.xsd" uri="schemas.opengis.net/iso/19139/20070417/gss/gss.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/citation.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/citation.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/identification.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/identification.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gss/geometry.xsd" uri="schemas.opengis.net/iso/19139/20070417/gss/geometry.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/referenceSystem.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/referenceSystem.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/constraints.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/constraints.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/distribution.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/distribution.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/maintenance.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/maintenance.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gmd/extent.xsd" uri="schemas.opengis.net/iso/19139/20070417/gmd/extent.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gts/gts.xsd" uri="schemas.opengis.net/iso/19139/20070417/gts/gts.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gsr/gsr.xsd" uri="schemas.opengis.net/iso/19139/20070417/gsr/gsr.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gts/temporalObjects.xsd" uri="schemas.opengis.net/iso/19139/20070417/gts/temporalObjects.xsd"/>
-    <system systemId="http://schemas.opengis.net/iso/19139/20070417/gsr/spatialReferencing.xsd" uri="schemas.opengis.net/iso/19139/20070417/gsr/spatialReferencing.xsd"/>
-    <system systemId="http://www.opengis.net/sampling/1.0" uri="schemas.opengis.net/sampling/1.0.0/sampling.xsd"/>
-    <system systemId="http://schemas.opengis.net/sampling/1.0.0/samplingManifold.xsd" uri="schemas.opengis.net/sampling/1.0.0/samplingManifold.xsd"/>
-    <system systemId="http://schemas.opengis.net/sampling/1.0.0/specimen.xsd" uri="schemas.opengis.net/sampling/1.0.0/specimen.xsd"/>
-    <system systemId="http://schemas.opengis.net/sampling/1.0.0/samplingBase.xsd" uri="schemas.opengis.net/sampling/1.0.0/samplingBase.xsd"/>
-    <system systemId="http://schemas.opengis.net/sampling/1.0.0/surveyProcedure.xsd" uri="schemas.opengis.net/sampling/1.0.0/surveyProcedure.xsd"/>
-    <system systemId="http://schemas.opengis.net/sampling/1.0.0/LUTgeodesy.xsd" uri="schemas.opengis.net/sampling/1.0.0/LUTgeodesy.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd" uri="schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-    <system systemId="http://schemas.opengis.net/om/1.0.0/om.xsd" uri="schemas.opengis.net/om/1.0.0/om.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/dynamicFeature.xsd" uri="schemas.opengis.net/gml/3.1.1/base/dynamicFeature.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/topology.xsd" uri="schemas.opengis.net/gml/3.1.1/base/topology.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/coverage.xsd" uri="schemas.opengis.net/gml/3.1.1/base/coverage.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/coordinateReferenceSystems.xsd" uri="schemas.opengis.net/gml/3.1.1/base/coordinateReferenceSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/observation.xsd" uri="schemas.opengis.net/gml/3.1.1/base/observation.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/defaultStyle.xsd" uri="schemas.opengis.net/gml/3.1.1/base/defaultStyle.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/temporalReferenceSystems.xsd" uri="schemas.opengis.net/gml/3.1.1/base/temporalReferenceSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/positionTypes.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/positionTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/curveTypes.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/curveTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/data.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/data.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/temporalAggregates.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/temporalAggregates.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/phenomenon.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/phenomenon.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/xmlData.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/xmlData.xsd"/>
-    <system systemId="http://schemas.opengis.net/om/1.0.0/observation.xsd" uri="schemas.opengis.net/om/1.0.0/observation.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/feature.xsd" uri="schemas.opengis.net/gml/3.1.1/base/feature.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/direction.xsd" uri="schemas.opengis.net/gml/3.1.1/base/direction.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/geometryComplexes.xsd" uri="schemas.opengis.net/gml/3.1.1/base/geometryComplexes.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/valueObjects.xsd" uri="schemas.opengis.net/gml/3.1.1/base/valueObjects.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/grids.xsd" uri="schemas.opengis.net/gml/3.1.1/base/grids.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/geometryAggregates.xsd" uri="schemas.opengis.net/gml/3.1.1/base/geometryAggregates.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/coordinateSystems.xsd" uri="schemas.opengis.net/gml/3.1.1/base/coordinateSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/datums.xsd" uri="schemas.opengis.net/gml/3.1.1/base/datums.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/coordinateOperations.xsd" uri="schemas.opengis.net/gml/3.1.1/base/coordinateOperations.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/smil/smil20.xsd" uri="schemas.opengis.net/gml/3.1.1/smil/smil20.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/measures.xsd" uri="schemas.opengis.net/gml/3.1.1/base/measures.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/temporalTopology.xsd" uri="schemas.opengis.net/gml/3.1.1/base/temporalTopology.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/dictionary.xsd" uri="schemas.opengis.net/gml/3.1.1/base/dictionary.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/aggregateTypes.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/aggregateTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd" uri="schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/geometryBasic2d.xsd" uri="schemas.opengis.net/gml/3.1.1/base/geometryBasic2d.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/temporal.xsd" uri="schemas.opengis.net/gml/3.1.1/base/temporal.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/geometryBasic0d1d.xsd" uri="schemas.opengis.net/gml/3.1.1/base/geometryBasic0d1d.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/geometryPrimitives.xsd" uri="schemas.opengis.net/gml/3.1.1/base/geometryPrimitives.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/referenceSystems.xsd" uri="schemas.opengis.net/gml/3.1.1/base/referenceSystems.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/dataQuality.xsd" uri="schemas.opengis.net/gml/3.1.1/base/dataQuality.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/smil/smil20-language.xsd" uri="schemas.opengis.net/gml/3.1.1/smil/smil20-language.xsd"/>
-    <system systemId="http://www.w3.org/2001/xml.xsd" uri="www.w3.org/2001/xml.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/units.xsd" uri="schemas.opengis.net/gml/3.1.1/base/units.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/gmlBase.xsd" uri="schemas.opengis.net/gml/3.1.1/base/gmlBase.xsd"/>
-    <system systemId="http://www.w3.org/1999/xlink.xsd" uri="www.w3.org/1999/xlink.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/simpleTypes.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/simpleTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/encoding.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/encoding.xsd"/>
-    <system systemId="http://schemas.opengis.net/sensorML/1.0.1/system.xsd" uri="schemas.opengis.net/sensorML/1.0.1/system.xsd"/>
-    <system systemId="http://schemas.opengis.net/gml/3.1.1/base/basicTypes.xsd" uri="schemas.opengis.net/gml/3.1.1/base/basicTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/sweCommon/1.0.1/basicTypes.xsd" uri="schemas.opengis.net/sweCommon/1.0.1/basicTypes.xsd"/>
-    <system systemId="http://schemas.opengis.net/sensorML/1.0.1/process.xsd" uri="schemas.opengis.net/sensorML/1.0.1/process.xsd"/>
-    <system systemId="http://schemas.opengis.net/sensorML/1.0.1/method.xsd" uri="schemas.opengis.net/sensorML/1.0.1/method.xsd"/>
-    <system systemId="http://schemas.opengis.net/sensorML/1.0.1/base.xsd" uri="schemas.opengis.net/sensorML/1.0.1/base.xsd"/>
-    <system systemId="http://schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd" uri="schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd"/>
-</catalog>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/expr.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/expr.xsd
deleted file mode 100755
index bcf2e4f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/expr.xsd
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.opengis.net/ogc"
-   xmlns:ogc="http://www.opengis.net/ogc"
-   xmlns:gml="http://www.opengis.net/gml"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   elementFormDefault="qualified"
-   version="1.1.3">
-   <!-- 
-      filter is an OGC Standard.
-      Copyright (c) 2002,2003,2004,2010 Open Geospatial Consortium.
-      To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-      
-      Updated: 2012-07-21
-   -->
-   <xsd:element name="Add" type="ogc:BinaryOperatorType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="Sub" type="ogc:BinaryOperatorType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="Mul" type="ogc:BinaryOperatorType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="Div" type="ogc:BinaryOperatorType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="PropertyName" type="ogc:PropertyNameType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="Function" type="ogc:FunctionType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="Literal" type="ogc:LiteralType"
-      substitutionGroup="ogc:expression"/>
-   <xsd:element name="expression" type="ogc:ExpressionType" abstract="true"/>
-   <!-- <xsd:complexType name="ExpressionType" abstract="true" mixed="true"/>
-     -->
-   <xsd:complexType name="ExpressionType" abstract="true"/>
-   <xsd:complexType name="BinaryOperatorType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:ExpressionType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:expression" minOccurs="2" maxOccurs="2"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="FunctionType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:ExpressionType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:expression" minOccurs="0"
-                  maxOccurs="unbounded"/>
-            </xsd:sequence>
-            <xsd:attribute name="name" type="xsd:string" use="required"/>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="LiteralType">
-      <xsd:complexContent mixed="true">
-         <xsd:extension base="ogc:ExpressionType">
-            <xsd:sequence>
-               <xsd:any minOccurs="0"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="PropertyNameType">
-      <xsd:complexContent mixed="true">
-         <xsd:extension base="ogc:ExpressionType"/>
-      </xsd:complexContent>
-   </xsd:complexType>
-</xsd:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filter.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filter.xsd
deleted file mode 100755
index 0eb97d2..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filter.xsd
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.opengis.net/ogc"
-   xmlns:ogc="http://www.opengis.net/ogc"
-   xmlns:gml="http://www.opengis.net/gml"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   elementFormDefault="qualified"
-   version="1.1.3">
-
-   <xsd:annotation>
-      <xsd:documentation>
-         This XML Schema defines OGC query filter capabilities documents.
-         filter is an OGC Standard.
-
-         Copyright (c) 2002,2003,2004,2010 Open Geospatial Consortium.
-
-         To obtain additional rights of use, visit:
-         http://www.opengeospatial.org/legal/ .
-
-         Updated: 2012-07-21
-      </xsd:documentation>
-   </xsd:annotation>
-
-   <xsd:include schemaLocation="filterAll.xsd"/>
-   <xsd:include schemaLocation="expr.xsd"/>
-   <xsd:include schemaLocation="sort.xsd"/>
-   <xsd:include schemaLocation="filterCapabilities.xsd"/>
-
-   <xsd:import namespace="http://www.opengis.net/gml"
-               schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/geometryAggregates.xsd"/>
-
-   <xsd:element name="_Id" type="ogc:AbstractIdType" abstract="true"/>
-   <xsd:element name="FeatureId"
-                type="ogc:FeatureIdType"
-                substitutionGroup="ogc:_Id"/>
-   <xsd:element name="GmlObjectId"
-                type="ogc:GmlObjectIdType"
-                substitutionGroup="ogc:_Id"/>
-
-   <xsd:element name="Filter" type="ogc:FilterType"/>
-   <xsd:complexType name="FilterType">
-      <xsd:choice>
-         <xsd:element ref="ogc:spatialOps"/>
-         <xsd:element ref="ogc:comparisonOps"/>
-         <xsd:element ref="ogc:logicOps"/>
-         <xsd:element ref="ogc:_Id" maxOccurs="unbounded"/>
-      </xsd:choice>
-   </xsd:complexType>
-
-   <xsd:element name="comparisonOps"
-                type="ogc:ComparisonOpsType"
-                abstract="true"/>
-   <xsd:element name="PropertyIsEqualTo"
-                type="ogc:BinaryComparisonOpType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsNotEqualTo"
-                type="ogc:BinaryComparisonOpType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsLessThan"
-                type="ogc:BinaryComparisonOpType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsGreaterThan"
-                type="ogc:BinaryComparisonOpType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsLessThanOrEqualTo"
-                type="ogc:BinaryComparisonOpType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsGreaterThanOrEqualTo"
-                type="ogc:BinaryComparisonOpType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsLike"
-                type="ogc:PropertyIsLikeType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsNull"
-                type="ogc:PropertyIsNullType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:element name="PropertyIsBetween"
-                type="ogc:PropertyIsBetweenType"
-                substitutionGroup="ogc:comparisonOps"/>
-   <xsd:complexType name="ComparisonOpsType" abstract="true"/>
-   <xsd:element name="spatialOps" type="ogc:SpatialOpsType" abstract="true"/>
-   <xsd:element name="Equals"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Disjoint"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Touches"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Within"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Overlaps"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Crosses"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Intersects"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Contains"
-                type="ogc:BinarySpatialOpType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="DWithin"
-                type="ogc:DistanceBufferType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="Beyond"
-                type="ogc:DistanceBufferType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:element name="BBOX"
-                type="ogc:BBOXType"
-                substitutionGroup="ogc:spatialOps"/>
-   <xsd:complexType name="SpatialOpsType" abstract="true"/>
-   <xsd:element name="logicOps" type="ogc:LogicOpsType" abstract="true"/>
-   <xsd:element name="And"
-                type="ogc:BinaryLogicOpType"
-                substitutionGroup="ogc:logicOps"/>
-   <xsd:element name="Or"
-                type="ogc:BinaryLogicOpType"
-                substitutionGroup="ogc:logicOps"/>
-   <xsd:element name="Not"
-                type="ogc:UnaryLogicOpType"
-                substitutionGroup="ogc:logicOps"/>
-   <xsd:complexType name="LogicOpsType" abstract="true"/>
-   <xsd:complexType name="AbstractIdType" abstract="true"/>
-   <xsd:complexType name="FeatureIdType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:AbstractIdType">
-            <xsd:attribute name="fid" type="xsd:ID" use="required"/>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="GmlObjectIdType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:AbstractIdType">
-            <xsd:attribute ref="gml:id" use="required"/>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="BinaryComparisonOpType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:ComparisonOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:expression" minOccurs="2" maxOccurs="2"/>
-            </xsd:sequence>
-            <xsd:attribute name="matchCase" type="xsd:boolean" use="optional"
-                           default="true"/>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="PropertyIsLikeType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:ComparisonOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:PropertyName"/>
-               <xsd:element ref="ogc:Literal"/>
-            </xsd:sequence>
-            <xsd:attribute name="wildCard" type="xsd:string" use="required"/>
-            <xsd:attribute name="singleChar" type="xsd:string" use="required"/>
-            <xsd:attribute name="escapeChar" type="xsd:string" use="required"/>
-            <xsd:attribute name="matchCase" type="xsd:boolean" use="optional"
-                           default="true"/>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="PropertyIsNullType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:ComparisonOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:PropertyName"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="PropertyIsBetweenType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:ComparisonOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:expression"/>
-               <xsd:element name="LowerBoundary" type="ogc:LowerBoundaryType"/>
-               <xsd:element name="UpperBoundary" type="ogc:UpperBoundaryType"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="LowerBoundaryType">
-      <xsd:choice>
-         <xsd:element ref="ogc:expression"/>
-      </xsd:choice>
-   </xsd:complexType>
-   <xsd:complexType name="UpperBoundaryType">
-      <xsd:sequence>
-         <xsd:element ref="ogc:expression"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="BinarySpatialOpType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:SpatialOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:PropertyName"/>
-               <xsd:choice>
-                  <xsd:element ref="ogc:PropertyName"/>
-                  <xsd:element ref="gml:_Geometry"/>
-                  <xsd:element ref="gml:Envelope"/>
-               </xsd:choice>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="BBOXType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:SpatialOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:PropertyName" minOccurs="0"/>
-               <xsd:element ref="gml:Envelope"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="DistanceBufferType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:SpatialOpsType">
-            <xsd:sequence>
-               <xsd:element ref="ogc:PropertyName"/>
-               <xsd:element ref="gml:_Geometry"/>
-               <xsd:element name="Distance" type="ogc:DistanceType"/>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="DistanceType">
-      <xsd:simpleContent>
-         <xsd:extension base="xsd:double">
-            <xsd:attribute name="units" type="xsd:anyURI" use="required"/>
-         </xsd:extension>
-      </xsd:simpleContent>
-   </xsd:complexType>
-   <xsd:complexType name="BinaryLogicOpType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:LogicOpsType">
-            <xsd:choice minOccurs="2" maxOccurs="unbounded">
-               <xsd:element ref="ogc:comparisonOps"/>
-               <xsd:element ref="ogc:spatialOps"/>
-               <xsd:element ref="ogc:logicOps"/>
-               <xsd:element ref="ogc:Function"/>
-            </xsd:choice>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-   <xsd:complexType name="UnaryLogicOpType">
-      <xsd:complexContent>
-         <xsd:extension base="ogc:LogicOpsType">
-            <xsd:sequence>
-               <xsd:choice>
-                  <xsd:element ref="ogc:comparisonOps"/>
-                  <xsd:element ref="ogc:spatialOps"/>
-                  <xsd:element ref="ogc:logicOps"/>
-                  <xsd:element ref="ogc:Function"/>
-               </xsd:choice>
-            </xsd:sequence>
-         </xsd:extension>
-      </xsd:complexContent>
-   </xsd:complexType>
-</xsd:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filterAll.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filterAll.xsd
deleted file mode 100755
index 5054245..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filterAll.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-   targetNamespace="http://www.opengis.net/ogc"
-   xmlns:ogc="http://www.opengis.net/ogc"
-   xmlns:gml="http://www.opengis.net/gml"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   elementFormDefault="qualified"
-   version="1.1.3">
-   <!-- This version of filter/1.1.0 was previously versioned as '1.1.2' . -->
-
-   <xsd:annotation>
-      <xsd:documentation>
-         This XML Schema document includes and imports, directly or indirectly,
-         all the XML Schema defined by the Filter Encoding Standard.
-
-         Filter Encoding is an OGC Standard.
-         Copyright (c) 2010 Open Geospatial Consortium.
-         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-      </xsd:documentation>
-   </xsd:annotation>
-
-   <xsd:include schemaLocation="filter.xsd"/>
-   <xsd:include schemaLocation="expr.xsd"/>
-   <xsd:include schemaLocation="sort.xsd"/>
-   <xsd:include schemaLocation="filterCapabilities.xsd"/>
-</xsd:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filterCapabilities.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filterCapabilities.xsd
deleted file mode 100755
index 51f6d2d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/filterCapabilities.xsd
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-   targetNamespace="http://www.opengis.net/ogc"
-   xmlns:ogc="http://www.opengis.net/ogc"
-   xmlns:gml="http://www.opengis.net/gml"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   elementFormDefault="qualified"
-   version="1.1.3">
-   <xsd:annotation>
-      <xsd:documentation>
-         This XML Schema defines OGC query filter capabilities documents.
-         
-         filter is an OGC Standard.
-         Copyright (c) 2002,2003,2004,2010 Open Geospatial Consortium.
-         To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-         
-         Updated: 2012-07-21
-      </xsd:documentation>
-   </xsd:annotation>
-   <xsd:element name="Filter_Capabilities">
-      <xsd:complexType>
-         <xsd:sequence>
-            <xsd:element name="Spatial_Capabilities"
-                         type="ogc:Spatial_CapabilitiesType"/>
-            <xsd:element name="Scalar_Capabilities"
-                         type="ogc:Scalar_CapabilitiesType"/>
-            <xsd:element name="Id_Capabilities"
-                         type="ogc:Id_CapabilitiesType"/>
-         </xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
-   <xsd:complexType name="Spatial_CapabilitiesType">
-      <xsd:sequence>
-         <xsd:element name="GeometryOperands"
-                      type="ogc:GeometryOperandsType"/>
-         <xsd:element name="SpatialOperators"
-                      type="ogc:SpatialOperatorsType"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="GeometryOperandsType">
-      <xsd:sequence>
-         <xsd:element name="GeometryOperand"
-                      type="ogc:GeometryOperandType" maxOccurs="unbounded"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:simpleType name="GeometryOperandType">
-      <xsd:restriction base="xsd:QName">
-         <xsd:enumeration value="gml:Envelope"/>
-         <xsd:enumeration value="gml:Point"/>
-         <xsd:enumeration value="gml:LineString"/>
-         <xsd:enumeration value="gml:Polygon"/>
-         <xsd:enumeration value="gml:ArcByCenterPoint"/>
-         <xsd:enumeration value="gml:CircleByCenterPoint"/>
-         <xsd:enumeration value="gml:Arc"/>
-         <xsd:enumeration value="gml:Circle"/>
-         <xsd:enumeration value="gml:ArcByBulge"/>
-         <xsd:enumeration value="gml:Bezier"/>
-         <xsd:enumeration value="gml:Clothoid"/>
-         <xsd:enumeration value="gml:CubicSpline"/>
-         <xsd:enumeration value="gml:Geodesic"/>
-         <xsd:enumeration value="gml:OffsetCurve"/>
-         <xsd:enumeration value="gml:Triangle"/>
-         <xsd:enumeration value="gml:PolyhedralSurface"/>
-         <xsd:enumeration value="gml:TriangulatedSurface"/>
-         <xsd:enumeration value="gml:Tin"/>
-         <xsd:enumeration value="gml:Solid"/>
-      </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="SpatialOperatorsType">
-      <xsd:sequence>
-         <xsd:element name="SpatialOperator"
-                      type="ogc:SpatialOperatorType"
-                      maxOccurs="unbounded"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="SpatialOperatorType">
-      <xsd:sequence>
-         <xsd:element name="GeometryOperands"
-                      type="ogc:GeometryOperandsType"
-                      minOccurs="0"/>
-      </xsd:sequence>
-      <xsd:attribute name="name" type="ogc:SpatialOperatorNameType"/>
-   </xsd:complexType>
-   <xsd:simpleType name="SpatialOperatorNameType">
-      <xsd:restriction base="xsd:string">
-         <xsd:enumeration value="BBOX"/>
-         <xsd:enumeration value="Equals"/>
-         <xsd:enumeration value="Disjoint"/>
-         <xsd:enumeration value="Intersects"/>
-         <xsd:enumeration value="Touches"/>
-         <xsd:enumeration value="Crosses"/>
-         <xsd:enumeration value="Within"/>
-         <xsd:enumeration value="Contains"/>
-         <xsd:enumeration value="Overlaps"/>
-         <xsd:enumeration value="Beyond"/>
-         <xsd:enumeration value="DWithin"/>
-      </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="Scalar_CapabilitiesType">
-      <xsd:sequence>
-         <xsd:element ref="ogc:LogicalOperators"
-                      minOccurs="0" maxOccurs="1"/>
-         <xsd:element name="ComparisonOperators"
-                      type="ogc:ComparisonOperatorsType"
-                      minOccurs="0" maxOccurs="1"/>
-         <xsd:element name="ArithmeticOperators"
-                      type="ogc:ArithmeticOperatorsType"
-                      minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:element name="LogicalOperators">
-      <xsd:complexType/>
-   </xsd:element>
-   <xsd:complexType name="ComparisonOperatorsType">
-      <xsd:sequence maxOccurs="unbounded">
-         <xsd:element name="ComparisonOperator"
-                      type="ogc:ComparisonOperatorType"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:simpleType name="ComparisonOperatorType">
-      <xsd:restriction base="xsd:string">
-         <xsd:enumeration value="LessThan"/>
-         <xsd:enumeration value="GreaterThan"/>
-         <xsd:enumeration value="LessThanEqualTo"/>
-         <xsd:enumeration value="GreaterThanEqualTo"/>
-         <xsd:enumeration value="EqualTo"/>
-         <xsd:enumeration value="NotEqualTo"/>
-         <xsd:enumeration value="Like"/>
-         <xsd:enumeration value="Between"/>
-         <xsd:enumeration value="NullCheck"/>
-      </xsd:restriction>
-   </xsd:simpleType>
-   <xsd:complexType name="ArithmeticOperatorsType">
-      <xsd:choice maxOccurs="unbounded">
-         <xsd:element ref="ogc:SimpleArithmetic"/>
-         <xsd:element name="Functions" type="ogc:FunctionsType"/>
-      </xsd:choice>
-   </xsd:complexType>
-   <xsd:element name="SimpleArithmetic">
-      <xsd:complexType/>
-   </xsd:element>
-   <xsd:complexType name="FunctionsType">
-      <xsd:sequence>
-         <xsd:element name="FunctionNames" type="ogc:FunctionNamesType"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="FunctionNamesType">
-      <xsd:sequence maxOccurs="unbounded">
-         <xsd:element name="FunctionName" type="ogc:FunctionNameType"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="FunctionNameType">
-      <xsd:simpleContent>
-         <xsd:extension base="xsd:string">
-            <xsd:attribute name="nArgs" type="xsd:string" use="required"/>
-         </xsd:extension>
-      </xsd:simpleContent>
-   </xsd:complexType>
-   <xsd:complexType name="Id_CapabilitiesType">
-      <xsd:choice maxOccurs="unbounded">
-         <xsd:element ref="ogc:EID"/>
-         <xsd:element ref="ogc:FID"/>
-      </xsd:choice>
-   </xsd:complexType>
-   <xsd:element name="EID">
-      <xsd:complexType/>
-   </xsd:element>
-   <xsd:element name="FID">
-      <xsd:complexType/>
-   </xsd:element>
-</xsd:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/sort.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/sort.xsd
deleted file mode 100755
index 60d70b8..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/filter/1.1.0/sort.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-   targetNamespace="http://www.opengis.net/ogc"
-   xmlns:ogc="http://www.opengis.net/ogc"
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   elementFormDefault="qualified"
-   version="1.1.3">
-   <!-- 
-      filter is an OGC Standard.
-      Copyright (c) 2002,2003,2004,2010 Open Geospatial Consortium.
-      To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-      
-      Updated: 2012-07-21
-   -->
-   <xsd:include schemaLocation="filterAll.xsd"/>
-   <xsd:include schemaLocation="expr.xsd"/>
-
-   <!-- ============================================= -->
-   <!-- SORTBY EXPRESSION                             -->
-   <!-- ============================================= -->
-   <xsd:element name="SortBy" type="ogc:SortByType"/>
-
-   <!-- ============================================= -->
-   <!-- COMPLEX TYPES                                 -->
-   <!-- ============================================= -->
-   <xsd:complexType name="SortByType">
-      <xsd:sequence>
-         <xsd:element name="SortProperty"
-                      type="ogc:SortPropertyType"
-                      maxOccurs="unbounded"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:complexType name="SortPropertyType">
-      <xsd:sequence>
-         <xsd:element ref="ogc:PropertyName"/>
-         <xsd:element name="SortOrder"
-                      type="ogc:SortOrderType"
-                      minOccurs="0"/>
-      </xsd:sequence>
-   </xsd:complexType>
-   <xsd:simpleType name="SortOrderType">
-      <xsd:restriction base="xsd:string">
-         <xsd:enumeration value="DESC"/>
-         <xsd:enumeration value="ASC"/>
-      </xsd:restriction>
-   </xsd:simpleType>
-</xsd:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/basicTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/basicTypes.xsd
deleted file mode 100755
index 6aadb79..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/basicTypes.xsd
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
-  <annotation>
-    <appinfo source="urn:opengis:specification:gml:schema-xsd:basicTypes:3.1.1">basicTypes.xsd</appinfo>
-    <documentation>
-    Generic simpleContent components for use in GML
-    
-    GML is an OGC Standard.
-    Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-    </documentation>
-  </annotation>
-  <include schemaLocation="gml.xsd"/>
-  <!-- =========================================================== -->
-  <simpleType name="NullEnumeration">
-    <annotation>
-      <documentation> Some common reasons for a null value:   
-			
-        innapplicable - the object does not have a value
-        missing - The correct value is not readily available to the sender of this data.  
-                           Furthermore, a correct value may not exist.
-        template - the value will be available later
-        unknown - The correct value is not known to, and not computable by, the sender of this data. 
-                           However, a correct value probably exists.
-        withheld - the value is not divulged 
-        
-        other:reason - as indicated by "reason" string
-        
-        Specific communities may agree to assign more strict semantics when these terms are used in a particular context.  
-      </documentation>
-    </annotation>
-    <union>
-      <simpleType>
-        <restriction base="string">
-          <enumeration value="inapplicable"/>
-          <enumeration value="missing"/>
-          <enumeration value="template"/>
-          <enumeration value="unknown"/>
-          <enumeration value="withheld"/>
-        </restriction>
-      </simpleType>
-      <simpleType>
-        <restriction base="string">
-          <pattern value="other:\w{2,}"/>
-        </restriction>
-      </simpleType>
-    </union>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="NullType">
-    <annotation>
-      <documentation>Utility type for null elements.  The value may be selected from one of the enumerated tokens, or may be a URI in which case this should identify a resource which describes the reason for the null. </documentation>
-    </annotation>
-    <union memberTypes="gml:NullEnumeration anyURI"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <element name="Null" type="gml:NullType"/>
-  <!-- ===================================================== -->
-  <simpleType name="SignType">
-    <annotation>
-      <documentation>Utility type used in various places 
-      - e.g. to indicate the direction of topological objects;
-      "+" for forwards, or "-" for backwards.</documentation>
-    </annotation>
-    <restriction base="string">
-      <enumeration value="-"/>
-      <enumeration value="+"/>
-    </restriction>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="booleanOrNull">
-    <annotation>
-      <documentation>Union of the XML Schema boolean type and the GML Nulltype.  An element which uses this type may have content which is either a boolean {0,1,true,false} or a value from Nulltype</documentation>
-    </annotation>
-    <union memberTypes="gml:NullEnumeration boolean anyURI"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="booleanOrNullList">
-    <annotation>
-      <documentation>XML List based on the union type defined above.  An element declared with this type contains a space-separated list of boolean values {0,1,true,false} with null values interspersed as needed</documentation>
-    </annotation>
-    <list itemType="gml:booleanOrNull"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="booleanList">
-    <annotation>
-      <documentation>XML List based on XML Schema boolean type.  An element of this type contains a space-separated list of boolean values {0,1,true,false}</documentation>
-    </annotation>
-    <list itemType="boolean"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="stringOrNull">
-    <annotation>
-      <documentation>Union of the XML Schema string type and the GML Nulltype.  An element which uses this type may have content which is either a string or a value from Nulltype.  Note that a "string" may contain whitespace.  </documentation>
-    </annotation>
-    <union memberTypes="gml:NullEnumeration string anyURI"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="NameOrNull">
-    <annotation>
-      <documentation>Union of the XML Schema Name type and the GML Nulltype.  An element which uses this type may have content which is either a Name or a value from Nulltype.  Note that a "Name" may not contain whitespace.  </documentation>
-    </annotation>
-    <union memberTypes="gml:NullEnumeration Name anyURI"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="NameOrNullList">
-    <annotation>
-      <documentation>XML List based on the union type defined above.  An element declared with this type contains a space-separated list of Name values with null values interspersed as needed</documentation>
-    </annotation>
-    <list itemType="gml:NameOrNull"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="NameList">
-    <annotation>
-      <documentation>XML List based on XML Schema Name type.  An element of this type contains a space-separated list of Name values</documentation>
-    </annotation>
-    <list itemType="Name"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="doubleOrNull">
-    <annotation>
-      <documentation>Union of the XML Schema double type and the GML Nulltype.  An element which uses this type may have content which is either a double or a value from Nulltype</documentation>
-    </annotation>
-    <union memberTypes="gml:NullEnumeration double anyURI"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="doubleOrNullList">
-    <annotation>
-      <documentation>XML List based on the union type defined above.  An element declared with this type contains a space-separated list of double values with null values interspersed as needed</documentation>
-    </annotation>
-    <list itemType="gml:doubleOrNull"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="doubleList">
-    <annotation>
-      <documentation>XML List based on XML Schema double type.  An element of this type contains a space-separated list of double values</documentation>
-    </annotation>
-    <list itemType="double"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="integerOrNull">
-    <annotation>
-      <documentation>Union of the XML Schema integer type and the GML Nulltype.  An element which uses this type may have content which is either an integer or a value from Nulltype</documentation>
-    </annotation>
-    <union memberTypes="gml:NullEnumeration integer anyURI"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="integerOrNullList">
-    <annotation>
-      <documentation>XML List based on the union type defined above.  An element declared with this type contains a space-separated list of integer values with null values interspersed as needed</documentation>
-    </annotation>
-    <list itemType="gml:integerOrNull"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <simpleType name="integerList">
-    <annotation>
-      <documentation>XML List based on XML Schema integer type.  An element of this type contains a space-separated list of integer values</documentation>
-    </annotation>
-    <list itemType="integer"/>
-  </simpleType>
-  <!-- =========================================================== -->
-  <complexType name="CodeType">
-    <annotation>
-      <documentation>Name or code with an (optional) authority.  Text token.  
-      If the codeSpace attribute is present, then its value should identify a dictionary, thesaurus 
-      or authority for the term, such as the organisation who assigned the value, 
-      or the dictionary from which it is taken.  
-      A text string with an optional codeSpace attribute. </documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="string">
-        <attribute name="codeSpace" type="anyURI" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <complexType name="CodeListType">
-    <annotation>
-      <documentation>List of values on a uniform nominal scale.  List of text tokens.   
-      In a list context a token should not include any spaces, so xsd:Name is used instead of xsd:string.   
-      If a codeSpace attribute is present, then its value is a reference to 
-      a Reference System for the value, a dictionary or code list.</documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="gml:NameList">
-        <attribute name="codeSpace" type="anyURI" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <complexType name="CodeOrNullListType">
-    <annotation>
-      <documentation>List of values on a uniform nominal scale.  List of text tokens.   
-      In a list context a token should not include any spaces, so xsd:Name is used instead of xsd:string.  
-      A member of the list may be a typed null.  
-      If a codeSpace attribute is present, then its value is a reference to 
-      a Reference System for the value, a dictionary or code list.</documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="gml:NameOrNullList">
-        <attribute name="codeSpace" type="anyURI" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <complexType name="MeasureType">
-    <annotation>
-      <documentation>Number with a scale.  
-      The value of uom (Units Of Measure) attribute is a reference to a Reference System for the amount, either a ratio or position scale. </documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="double">
-        <attribute name="uom" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <complexType name="MeasureListType">
-    <annotation>
-      <documentation>List of numbers with a uniform scale.  
-      The value of uom (Units Of Measure) attribute is a reference to 
-      a Reference System for the amount, either a ratio or position scale. </documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="gml:doubleList">
-        <attribute name="uom" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <complexType name="MeasureOrNullListType">
-    <annotation>
-      <documentation>List of numbers with a uniform scale.  
-      A member of the list may be a typed null. 
-      The value of uom (Units Of Measure) attribute is a reference to 
-      a Reference System for the amount, either a ratio or position scale. </documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="gml:doubleOrNullList">
-        <attribute name="uom" type="anyURI" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <complexType name="CoordinatesType">
-    <annotation>
-      <documentation>Tables or arrays of tuples.  
-        May be used for text-encoding of values from a table.  
-        Actually just a string, but allows the user to indicate which characters are used as separators.  
-        The value of the 'cs' attribute is the separator for coordinate values, 
-        and the value of the 'ts' attribute gives the tuple separator (a single space by default); 
-        the default values may be changed to reflect local usage.
-        Defaults to CSV within a tuple, space between tuples.  
-        However, any string content will be schema-valid.  </documentation>
-    </annotation>
-    <simpleContent>
-      <extension base="string">
-        <attribute name="decimal" type="string" default="."/>
-        <attribute name="cs" type="string" default=","/>
-        <attribute name="ts" type="string" default="&#x20;"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  <!-- =========================================================== -->
-  <simpleType name="NCNameList">
-    <annotation>
-      <documentation>A set of values, representing a list of token with the lexical value space of NCName. The tokens are seperated by whitespace.</documentation>
-    </annotation>
-    <list itemType="NCName"/>
-  </simpleType>
-  <!-- ============================================================== -->
-  <simpleType name="QNameList">
-    <annotation>
-      <documentation>A set of values, representing a list of token with the lexical value space of QName. The tokens are seperated by whitespace.</documentation>
-    </annotation>
-    <list itemType="QName"/>
-  </simpleType>
-  <!-- ============================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateOperations.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateOperations.xsd
deleted file mode 100755
index d7b00fc..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateOperations.xsd
+++ /dev/null
@@ -1,790 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:coordinateOperations:3.1.1"/>
-		<documentation>How to encode coordinate operation definitions. Builds on referenceSystems.xsd to encode the data needed to define coordinate operations, including Transformations, Conversions, and other specific subtypes of operations. 
-		
-		This schema encodes the Coordinate Operation (CC_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ======================================================
-       includes and imports
-	====================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<include schemaLocation="dataQuality.xsd"/>
-	<!-- ======================================================
-       elements and types
-	====================================================== -->
-	<element name="_CoordinateOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractCoordinateOperationBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for coordinate operation objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:coordinateOperationName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="coordinateOperationName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this coordinate operation is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="AbstractCoordinateOperationType" abstract="true">
-		<annotation>
-			<documentation>A mathematical operation on coordinates that transforms or converts coordinates to another coordinate reference system. Many but not all coordinate operations (from CRS A to CRS B) also uniquely define the inverse operation (from CRS B to CRS A). In some cases, the operation method algorithm for the inverse operation is the same as for the forward algorithm, but the signs of some operation parameter values must be reversed. In other cases, different algorithms are requi [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationBaseType">
-				<sequence>
-					<element ref="gml:coordinateOperationID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this coordinate operation. The first coordinateOperationID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this coordinate operation, including source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:operationVersion" minOccurs="0"/>
-					<element ref="gml:validArea" minOccurs="0"/>
-					<element ref="gml:scope" minOccurs="0"/>
-					<element ref="gml:_positionalAccuracy" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered set of estimates of the impact of this coordinate operation on point position accuracy. Gives position error estimates for target coordinates of this coordinate operation, assuming no errors in source coordinates. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:sourceCRS" minOccurs="0"/>
-					<element ref="gml:targetCRS" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="coordinateOperationID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of a coordinate operation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="operationVersion" type="string">
-		<annotation>
-			<documentation>Version of the coordinate transformation (i.e., instantiation due to the stochastic nature of the parameters). Mandatory when describing a transformation, and should not be supplied for a conversion. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="sourceCRS" type="gml:CRSRefType">
-		<annotation>
-			<documentation>Association to the source CRS (coordinate reference system) of this coordinate operation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="targetCRS" type="gml:CRSRefType">
-		<annotation>
-			<documentation>Association to the target CRS (coordinate reference system) of this coordinate operation. For constraints on multiplicity of "sourceCRS" and "targetCRS", see UML model of Coordinate Operation package in OGC Abstract Specification topic 2. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="coordinateOperationRef" type="gml:CoordinateOperationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CoordinateOperationRefType">
-		<annotation>
-			<documentation>Association to a coordinate operation, either referencing or containing the definition of that coordinate operation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_CoordinateOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ConcatenatedOperation" type="gml:ConcatenatedOperationType" substitutionGroup="gml:_CoordinateOperation"/>
-	<!-- =================================================== -->
-	<complexType name="ConcatenatedOperationType">
-		<annotation>
-			<documentation>An ordered sequence of two or more single coordinate operations. The sequence of operations is constrained by the requirement that the source coordinate reference system of step (n+1) must be the same as the target coordinate reference system of step (n). The source coordinate reference system of the first step and the target coordinate reference system of the last step are the source and target coordinate reference system associated with the concatenated operation. Ins [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:usesSingleOperation" minOccurs="2" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Ordered sequence of associations to the two or more single operations used by this concatenated operation. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesSingleOperation" type="gml:SingleOperationRefType">
-		<annotation>
-			<documentation>Association to a single operation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="concatenatedOperationRef" type="gml:ConcatenatedOperationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ConcatenatedOperationRefType">
-		<annotation>
-			<documentation>Association to a concatenated operation, either referencing or containing the definition of that concatenated operation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ConcatenatedOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="_SingleOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:_CoordinateOperation">
-		<annotation>
-			<documentation>A single (not concatenated) coordinate operation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="singleOperationRef" type="gml:SingleOperationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="SingleOperationRefType">
-		<annotation>
-			<documentation>Association to a single operation, either referencing or containing the definition of that single operation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_SingleOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="PassThroughOperation" type="gml:PassThroughOperationType" substitutionGroup="gml:_SingleOperation"/>
-	<!-- =================================================== -->
-	<complexType name="PassThroughOperationType">
-		<annotation>
-			<documentation>A pass-through operation specifies that a subset of a coordinate tuple is subject to a specific coordinate operation. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:modifiedCoordinate" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Ordered sequence of positive integers defining the positions in a coordinate tuple of the coordinates affected by this pass-through operation. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:usesOperation"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="modifiedCoordinate" type="positiveInteger">
-		<annotation>
-			<documentation>A positive integer defining a position in a coordinate tuple. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesOperation" type="gml:OperationRefType">
-		<annotation>
-			<documentation>Association to the operation applied to the specified ordinates. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="passThroughOperationRef" type="gml:PassThroughOperationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="PassThroughOperationRefType">
-		<annotation>
-			<documentation>Association to a pass through operation, either referencing or containing the definition of that pass through operation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PassThroughOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="_Operation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:_SingleOperation">
-		<annotation>
-			<documentation>A parameterized mathematical operation on coordinates that transforms or converts coordinates to another coordinate reference system. This coordinate operation uses an operation method, usually with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type.
-
-This abstract complexType shall not be directly used, extended, or restricted in a compliant Application Schema. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="operationRef" type="gml:OperationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="OperationRefType">
-		<annotation>
-			<documentation>Association to an abstract operation, either referencing or containing the definition of that operation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Operation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="_GeneralConversion" type="gml:AbstractGeneralConversionType" abstract="true" substitutionGroup="gml:_Operation"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractGeneralConversionType" abstract="true">
-		<annotation>
-			<documentation>An abstract operation on coordinates that does not include any change of datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters.
-
-This abstract complexType is expected to be extended for well-known operation methods with many Conversion instances, in Application Schemas that define operation-method-specialized element names and contents. This conversion uses an operation method, usually with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to inclu [...]
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:coordinateOperationName"/>
-					<element ref="gml:coordinateOperationID" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:validArea" minOccurs="0"/>
-					<element ref="gml:scope" minOccurs="0"/>
-					<element ref="gml:_positionalAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="generalConversionRef" type="gml:GeneralConversionRefType"/>
-	<!-- =================================================== -->
-	<complexType name="GeneralConversionRefType">
-		<annotation>
-			<documentation>Association to a general conversion, either referencing or containing the definition of that conversion. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_GeneralConversion"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="Conversion" type="gml:ConversionType" substitutionGroup="gml:_GeneralConversion"/>
-	<!-- =================================================== -->
-	<complexType name="ConversionType">
-		<annotation>
-			<documentation>A concrete operation on coordinates that does not include any change of Datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters.
-
-This concrete complexType can be used with all operation methods, without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Conversion instance. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeneralConversionType">
-				<sequence>
-					<element ref="gml:usesMethod"/>
-					<element ref="gml:usesValue" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of composition associations to the set of parameter values used by this conversion operation. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesMethod" type="gml:OperationMethodRefType">
-		<annotation>
-			<documentation>Association to the operation method used by this coordinate operation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesValue" type="gml:ParameterValueType">
-		<annotation>
-			<documentation>Composition association to a parameter value used by this coordinate operation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="conversionRef" type="gml:ConversionRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ConversionRefType">
-		<annotation>
-			<documentation>Association to a concrete general-purpose conversion, either referencing or containing the definition of that conversion. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Conversion"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="_GeneralTransformation" type="gml:AbstractGeneralTransformationType" abstract="true" substitutionGroup="gml:_Operation"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractGeneralTransformationType" abstract="true">
-		<annotation>
-			<documentation>An abstract operation on coordinates that usually includes a change of Datum. The parameters of a coordinate transformation are empirically derived from data containing the coordinates of a series of points in both coordinate reference systems. This computational process is usually "over-determined", allowing derivation of error (or accuracy) estimates for the transformation. Also, the stochastic nature of the parameters may result in multiple (different) versions of th [...]
-
-This abstract complexType is expected to be extended for well-known operation methods with many Transformation instances, in Application Schemas that define operation-method-specialized value element names and contents. This transformation uses an operation method with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to  [...]
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:coordinateOperationName"/>
-					<element ref="gml:coordinateOperationID" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:operationVersion"/>
-					<element ref="gml:validArea" minOccurs="0"/>
-					<element ref="gml:scope" minOccurs="0"/>
-					<element ref="gml:_positionalAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:sourceCRS"/>
-					<element ref="gml:targetCRS"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="generalTransformationRef" type="gml:GeneralTransformationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="GeneralTransformationRefType">
-		<annotation>
-			<documentation>Association to a general transformation, either referencing or containing the definition of that transformation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_GeneralTransformation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="Transformation" type="gml:TransformationType" substitutionGroup="gml:_GeneralTransformation"/>
-	<!-- =================================================== -->
-	<complexType name="TransformationType">
-		<annotation>
-			<documentation>A concrete operation on coordinates that usually includes a change of datum. The parameters of a coordinate transformation are empirically derived from data containing the coordinates of a series of points in both coordinate reference systems. This computational process is usually "over-determined", allowing derivation of error (or accuracy) estimates for the transformation. Also, the stochastic nature of the parameters may result in multiple (different) versions of the [...]
-
-This concrete complexType can be used for all operation methods, without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Transformation instance. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeneralTransformationType">
-				<sequence>
-					<element ref="gml:usesMethod"/>
-					<element ref="gml:usesValue" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered set of composition associations to the set of parameter values used by this transformation operation. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="transformationRef" type="gml:TransformationRefType"/>
-	<!-- =================================================== -->
-	<complexType name="TransformationRefType">
-		<annotation>
-			<documentation>Association to a transformation, either referencing or containing the definition of that transformation. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Transformation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="_generalParameterValue" type="gml:AbstractGeneralParameterValueType" abstract="true"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractGeneralParameterValueType" abstract="true">
-		<annotation>
-			<documentation>Abstract parameter value or group of parameter values.
-			
-This abstract complexType is expected to be extended and restricted for well-known operation methods with many instances, in Application Schemas that define operation-method-specialized element names and contents. Specific parameter value elements are directly contained in concrete subtypes, not in this abstract type. All concrete types derived from this type shall extend this type to include one "...Value" element with an appropriate type, which should be one of the element types allowe [...]
-		</annotation>
-		<sequence/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="parameterValue" type="gml:ParameterValueType" substitutionGroup="gml:_generalParameterValue"/>
-	<!-- =================================================== -->
-	<complexType name="ParameterValueType">
-		<annotation>
-			<documentation>A parameter value, ordered sequence of values, or reference to a file of parameter values. This concrete complexType can be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one instance. This complexType can be used, extended, or restricted for well-known operation methods, especially for methods with many instances. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeneralParameterValueType">
-				<sequence>
-					<choice>
-						<element ref="gml:value"/>
-						<element ref="gml:dmsAngleValue"/>
-						<element ref="gml:stringValue"/>
-						<element ref="gml:integerValue"/>
-						<element ref="gml:booleanValue"/>
-						<element ref="gml:valueList"/>
-						<element ref="gml:integerValueList"/>
-						<element ref="gml:valueFile"/>
-					</choice>
-					<element ref="gml:valueOfParameter"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="value" type="gml:MeasureType">
-		<annotation>
-			<documentation>Numeric value of an operation parameter, with its associated unit of measure. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="dmsAngleValue" type="gml:DMSAngleType">
-		<annotation>
-			<documentation>Value of an angle operation parameter, in either degree-minute-second format or single value format. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="stringValue" type="string">
-		<annotation>
-			<documentation>String value of an operation parameter. A string value does not have an associated unit of measure. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="integerValue" type="positiveInteger">
-		<annotation>
-			<documentation>Positive integer value of an operation parameter, usually used for a count. An integer value does not have an associated unit of measure. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="booleanValue" type="boolean">
-		<annotation>
-			<documentation>Boolean value of an operation parameter. A Boolean value does not have an associated unit of measure. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="valueList" type="gml:MeasureListType">
-		<annotation>
-			<documentation>Ordered sequence of two or more numeric values of an operation parameter list, where each value has the same associated unit of measure. An element of this type contains a space-separated sequence of double values. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="integerValueList" type="gml:integerList">
-		<annotation>
-			<documentation>Ordered sequence of two or more integer values of an operation parameter list, usually used for counts. These integer values do not have an associated unit of measure. An element of this type contains a space-separated sequence of integer values. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="valueFile" type="anyURI">
-		<annotation>
-			<documentation>Reference to a file or a part of a file containing one or more parameter values, each numeric value with its associated unit of measure. When referencing a part of a file, that file must contain multiple identified parts, such as an XML encoded document. Furthermore, the referenced file or part of a file can reference another part of the same or different files, as allowed in XML documents. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="valueOfParameter" type="gml:OperationParameterRefType">
-		<annotation>
-			<documentation>Association to the operation parameter that this is a value of. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="parameterValueGroup" type="gml:ParameterValueGroupType" substitutionGroup="gml:_generalParameterValue"/>
-	<!-- =================================================== -->
-	<complexType name="ParameterValueGroupType">
-		<annotation>
-			<documentation>A group of related parameter values. The same group can be repeated more than once in a Conversion, Transformation, or higher level parameterValueGroup, if those instances contain different values of one or more parameterValues which suitably distinquish among those groups. This concrete complexType can be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only  [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeneralParameterValueType">
-				<sequence>
-					<element ref="gml:includesValue" minOccurs="2" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered set of composition associations to the parameter values and groups of values included in this group. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:valuesOfGroup"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="includesValue" type="gml:AbstractGeneralParameterValueType" substitutionGroup="gml:_generalParameterValue">
-		<annotation>
-			<documentation>A composition association to a parameter value or group of values included in this group. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="valuesOfGroup" type="gml:OperationParameterGroupRefType">
-		<annotation>
-			<documentation>Association to the operation parameter group for which this element provides parameter values. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="OperationMethod" type="gml:OperationMethodType" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="OperationMethodBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for operation method objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:methodName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="methodName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this operation method is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="OperationMethodType">
-		<annotation>
-			<documentation>Definition of an algorithm used to perform a coordinate operation. Most operation methods use a number of operation parameters, although some coordinate conversions use none. Each coordinate operation using the method assigns values to these parameters. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:OperationMethodBaseType">
-				<sequence>
-					<element ref="gml:methodID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this operation method. The first methodID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this operation method, including source information.</documentation>
-						</annotation>
-					</element>
-					<element ref="gml:methodFormula"/>
-					<element ref="gml:sourceDimensions"/>
-					<element ref="gml:targetDimensions"/>
-					<element ref="gml:usesParameter" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of associations to the set of operation parameters and parameter groups used by this operation method. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="methodID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of an operation method. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="methodFormula" type="gml:CodeType">
-		<annotation>
-			<documentation>Formula(s) used by this operation method. The value may be a reference to a publication. Note that the operation method may not be analytic, in which case this element references or contains the procedure, not an analytic formula.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="sourceDimensions" type="positiveInteger">
-		<annotation>
-			<documentation>Number of dimensions in the source CRS of this operation method. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="targetDimensions" type="positiveInteger">
-		<annotation>
-			<documentation>Number of dimensions in the target CRS of this operation method. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesParameter" type="gml:AbstractGeneralOperationParameterRefType">
-		<annotation>
-			<documentation>Association to an operation parameter or parameter group used by this operation method. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="operationMethodRef" type="gml:OperationMethodRefType"/>
-	<!-- =================================================== -->
-	<complexType name="OperationMethodRefType">
-		<annotation>
-			<documentation>Association to a concrete general-purpose operation method, either referencing or containing the definition of that method. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationMethod"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="_GeneralOperationParameter" type="gml:AbstractGeneralOperationParameterType" abstract="true" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractGeneralOperationParameterType" abstract="true">
-		<annotation>
-			<documentation>Abstract definition of a parameter or group of parameters used by an operation method. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:minimumOccurs" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="minimumOccurs" type="nonNegativeInteger">
-		<annotation>
-			<documentation>The minimum number of times that values for this parameter group or parameter are required. If this attribute is omitted, the minimum number is one. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="abstractGeneralOperationParameterRef" type="gml:AbstractGeneralOperationParameterRefType"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractGeneralOperationParameterRefType">
-		<annotation>
-			<documentation>Association to an operation parameter or group, either referencing or containing the definition of that parameter or group. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_GeneralOperationParameter"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="OperationParameter" type="gml:OperationParameterType" substitutionGroup="gml:_GeneralOperationParameter"/>
-	<!-- =================================================== -->
-	<complexType name="OperationParameterBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for operation parameter objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractGeneralOperationParameterType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:parameterName"/>
-					<element ref="gml:minimumOccurs" minOccurs="0"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="parameterName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this operation parameter is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="OperationParameterType">
-		<annotation>
-			<documentation>The definition of a parameter used by an operation method. Most parameter values are numeric, but other types of parameter values are possible. This complexType is expected to be used or extended for all operation methods, without defining operation-method-specialized element names.  </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:OperationParameterBaseType">
-				<sequence>
-					<element ref="gml:parameterID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this operation parameter. The first parameterID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this operation parameter, including source information. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="parameterID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of an operation parameter. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="operationParameterRef" type="gml:OperationParameterRefType"/>
-	<!-- =================================================== -->
-	<complexType name="OperationParameterRefType">
-		<annotation>
-			<documentation>Association to an operation parameter, either referencing or containing the definition of that parameter. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationParameter"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="OperationParameterGroup" type="gml:OperationParameterGroupType" substitutionGroup="gml:_GeneralOperationParameter"/>
-	<!-- =================================================== -->
-	<complexType name="OperationParameterGroupBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for operation parameter group objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractGeneralOperationParameterType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:groupName"/>
-					<element ref="gml:minimumOccurs" minOccurs="0"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="groupName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this operation parameter group is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="OperationParameterGroupType">
-		<annotation>
-			<documentation>The definition of a group of parameters used by an operation method. This complexType is expected to be used or extended for all applicable operation methods, without defining operation-method-specialized element names.  </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:OperationParameterGroupBaseType">
-				<sequence>
-					<element ref="gml:groupID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this operation parameter group. The first groupID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this operation parameter group, including source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:maximumOccurs" minOccurs="0"/>
-					<element ref="gml:includesParameter" minOccurs="2" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of associations to the set of operation parameters that are members of this group. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="groupID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of an operation parameter group. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="maximumOccurs" type="positiveInteger">
-		<annotation>
-			<documentation>The maximum number of times that values for this parameter group can be included. If this attribute is omitted, the maximum number is one. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="includesParameter" type="gml:AbstractGeneralOperationParameterRefType">
-		<annotation>
-			<documentation>Association to an operation parameter that is a member of a group. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="operationParameterGroupRef" type="gml:OperationParameterRefType"/>
-	<!-- =================================================== -->
-	<complexType name="OperationParameterGroupRefType">
-		<annotation>
-			<documentation>Association to an operation parameter, either referencing or containing the definition of that parameter. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationParameterGroup"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateReferenceSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateReferenceSystems.xsd
deleted file mode 100755
index 1e0abc5..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateReferenceSystems.xsd
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:coordinateReferenceSystems:3.1.1"/>
-		<documentation>How to encode coordinate reference system definitions. Builds on referenceSystems.xsd to encode the data needed to define coordinate reference systems, including the specific subtypes of coordinate reference systems. 
-		This schema encodes the Coordinate Reference System (SC_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates, with the exception of the abstract "SC_CRS" class. The "SC_CRS" class is encoded in referenceSystems.xsd, to eliminate the (circular) references from coordinateOperations.xsd to coordinateReferenceSystems.xsd. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. 
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ======================================================
-       includes and imports
-	====================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="coordinateSystems.xsd"/>
-	<include schemaLocation="datums.xsd"/>
-	<include schemaLocation="coordinateOperations.xsd"/>
-	<!-- ======================================================
-       elements and types
-	====================================================== -->
-	<element name="_CoordinateReferenceSystem" type="gml:AbstractReferenceSystemType" abstract="true" substitutionGroup="gml:_CRS">
-		<annotation>
-			<documentation>A coordinate reference system consists of an ordered sequence of coordinate system axes that are related to the earth through a datum. A coordinate reference system is defined by one datum and by one coordinate system. Most coordinate reference system do not move relative to the earth, except for engineering coordinate reference systems defined on moving platforms such as cars, ships, aircraft, and spacecraft. For further information, see OGC Abstract Specification Topic 2.
-
-Coordinate reference systems are commonly divided into sub-types. The common classification criterion for sub-typing of coordinate reference systems is the way in which they deal with earth curvature. This has a direct effect on the portion of the earth's surface that can be covered by that type of CRS with an acceptable degree of error. The exception to the rule is the subtype "Temporal" which has been added by analogy. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="coordinateReferenceSystemRef" type="gml:CoordinateReferenceSystemRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CoordinateReferenceSystemRefType">
-		<annotation>
-			<documentation>Association to a coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_CoordinateReferenceSystem"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="CompoundCRS" type="gml:CompoundCRSType" substitutionGroup="gml:_CRS"/>
-	<!-- =================================================== -->
-	<complexType name="CompoundCRSType">
-		<annotation>
-			<documentation>A coordinate reference system describing the position of points through two or more independent coordinate reference systems. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<element ref="gml:includesCRS" minOccurs="2" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Ordered sequence of associations to all the component coordinate reference systems included in this compound coordinate reference system. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="includesCRS" type="gml:CoordinateReferenceSystemRefType">
-		<annotation>
-			<documentation>An association to a component coordinate reference system included in this compound coordinate reference system. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="compoundCRSRef" type="gml:CompoundCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CompoundCRSRefType">
-		<annotation>
-			<documentation>Association to a compound coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CompoundCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="GeographicCRS" type="gml:GeographicCRSType" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="GeographicCRSType">
-		<annotation>
-			<documentation>A coordinate reference system based on an ellipsoidal approximation of the geoid; this provides an accurate representation of the geometry of geographic features for a large portion of the earth's surface.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<element ref="gml:usesEllipsoidalCS"/>
-					<element ref="gml:usesGeodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesEllipsoidalCS" type="gml:EllipsoidalCSRefType">
-		<annotation>
-			<documentation>Association to the ellipsoidal coordinate system used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesGeodeticDatum" type="gml:GeodeticDatumRefType">
-		<annotation>
-			<documentation>Association to the geodetic datum used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="geographicCRSRef" type="gml:GeographicCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="GeographicCRSRefType">
-		<annotation>
-			<documentation>Association to a geographic coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeographicCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="VerticalCRS" type="gml:VerticalCRSType" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalCRSType">
-		<annotation>
-			<documentation>A 1D coordinate reference system used for recording heights or depths. Vertical CRSs make use of the direction of gravity to define the concept of height or depth, but the relationship with gravity may not be straightforward. By implication, ellipsoidal heights (h) cannot be captured in a vertical coordinate reference system. Ellipsoidal heights cannot exist independently, but only as an inseparable part of a 3D coordinate tuple defined in a geographic 3D coordinate ref [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<element ref="gml:usesVerticalCS"/>
-					<element ref="gml:usesVerticalDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesVerticalCS" type="gml:VerticalCSRefType">
-		<annotation>
-			<documentation>Association to the vertical coordinate system used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesVerticalDatum" type="gml:VerticalDatumRefType">
-		<annotation>
-			<documentation>Association to the vertical datum used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="verticalCRSRef" type="gml:VerticalCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalCRSRefType">
-		<annotation>
-			<documentation>Association to a vertical coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="GeocentricCRS" type="gml:GeocentricCRSType" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="GeocentricCRSType">
-		<annotation>
-			<documentation>A 3D coordinate reference system with the origin at the approximate centre of mass of the earth. A geocentric CRS deals with the earth's curvature by taking a 3D spatial view, which obviates the need to model the earth's curvature. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<choice>
-						<element ref="gml:usesCartesianCS"/>
-						<element ref="gml:usesSphericalCS"/>
-					</choice>
-					<element ref="gml:usesGeodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesCartesianCS" type="gml:CartesianCSRefType">
-		<annotation>
-			<documentation>Association to the Cartesian coordinate system used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesSphericalCS" type="gml:SphericalCSRefType">
-		<annotation>
-			<documentation>Association to the spherical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="geocentricCRSRef" type="gml:GeocentricCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="GeocentricCRSRefType">
-		<annotation>
-			<documentation>Association to a geocentric coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeocentricCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="_GeneralDerivedCRS" type="gml:AbstractGeneralDerivedCRSType" abstract="true" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractGeneralDerivedCRSType" abstract="true">
-		<annotation>
-			<documentation>A coordinate reference system that is defined by its coordinate conversion from another coordinate reference system (not by a datum). This abstract complexType shall not be used, extended, or restricted, in an Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<element ref="gml:baseCRS"/>
-					<element ref="gml:definedByConversion"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="baseCRS" type="gml:CoordinateReferenceSystemRefType">
-		<annotation>
-			<documentation>Association to the coordinate reference system used by this derived CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="definedByConversion" type="gml:GeneralConversionRefType">
-		<annotation>
-			<documentation>Association to the coordinate conversion used to define this derived CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="ProjectedCRS" type="gml:ProjectedCRSType" substitutionGroup="gml:_GeneralDerivedCRS"/>
-	<!-- =================================================== -->
-	<complexType name="ProjectedCRSType">
-		<annotation>
-			<documentation>A 2D coordinate reference system used to approximate the shape of the earth on a planar surface, but in such a way that the distortion that is inherent to the approximation is carefully controlled and known. Distortion correction is commonly applied to calculated bearings and distances to produce values that are a close match to actual field values. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeneralDerivedCRSType">
-				<sequence>
-					<element ref="gml:usesCartesianCS"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="projectedCRSRef" type="gml:ProjectedCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ProjectedCRSRefType">
-		<annotation>
-			<documentation>Association to a projected coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ProjectedCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="DerivedCRS" type="gml:DerivedCRSType" substitutionGroup="gml:_GeneralDerivedCRS"/>
-	<!-- =================================================== -->
-	<complexType name="DerivedCRSType">
-		<annotation>
-			<documentation>A coordinate reference system that is defined by its coordinate conversion from another coordinate reference system but is not a projected coordinate reference system. This category includes coordinate reference systems derived from a projected coordinate reference system. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeneralDerivedCRSType">
-				<sequence>
-					<element ref="gml:derivedCRSType"/>
-					<element ref="gml:usesCS"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="derivedCRSType" type="gml:DerivedCRSTypeType"/>
-	<!-- =================================================== -->
-	<complexType name="DerivedCRSTypeType">
-		<annotation>
-			<documentation>Type of a derived coordinate reference system. </documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:CodeType">
-				<attribute name="codeSpace" type="anyURI" use="required">
-					<annotation>
-						<documentation>Reference to a source of information specifying the values and meanings of all the allowed string values for this DerivedCRSTypeType. </documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesCS" type="gml:CoordinateSystemRefType">
-		<annotation>
-			<documentation>Association to the coordinate system used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="derivedCRSRef" type="gml:DerivedCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="DerivedCRSRefType">
-		<annotation>
-			<documentation>Association to a non-projected derived coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:DerivedCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="EngineeringCRS" type="gml:EngineeringCRSType" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="EngineeringCRSType">
-		<annotation>
-			<documentation>A contextually local coordinate reference system; which can be divided into two broad categories:
-- earth-fixed systems applied to engineering activities on or near the surface of the earth;
-- CRSs on moving platforms such as road vehicles, vessels, aircraft, or spacecraft.
-For further information, see OGC Abstract Specification Topic 2. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<element ref="gml:usesCS"/>
-					<element ref="gml:usesEngineeringDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesEngineeringDatum" type="gml:EngineeringDatumRefType">
-		<annotation>
-			<documentation>Association to the engineering datum used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="engineeringCRSRef" type="gml:EngineeringCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="EngineeringCRSRefType">
-		<annotation>
-			<documentation>Association to an engineering coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EngineeringCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ImageCRS" type="gml:ImageCRSType" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="ImageCRSType">
-		<annotation>
-			<documentation>An engineering coordinate reference system applied to locations in images. Image coordinate reference systems are treated as a separate sub-type because a separate user community exists for images with its own terms of reference. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<choice>
-						<element ref="gml:usesCartesianCS"/>
-						<element ref="gml:usesObliqueCartesianCS"/>
-					</choice>
-					<element ref="gml:usesImageDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesObliqueCartesianCS" type="gml:ObliqueCartesianCSRefType">
-		<annotation>
-			<documentation>Association to the oblique Cartesian coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesImageDatum" type="gml:ImageDatumRefType">
-		<annotation>
-			<documentation>Association to the image datum used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="imageCRSRef" type="gml:ImageCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ImageCRSRefType">
-		<annotation>
-			<documentation>Association to an image coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ImageCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="TemporalCRS" type="gml:TemporalCRSType" substitutionGroup="gml:_CoordinateReferenceSystem"/>
-	<!-- =================================================== -->
-	<complexType name="TemporalCRSType">
-		<annotation>
-			<documentation>A 1D coordinate reference system used for the recording of time. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemType">
-				<sequence>
-					<element ref="gml:usesTemporalCS"/>
-					<element ref="gml:usesTemporalDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesTemporalCS" type="gml:TemporalCSRefType">
-		<annotation>
-			<documentation>Association to the temporal coordinate system used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesTemporalDatum" type="gml:TemporalDatumRefType">
-		<annotation>
-			<documentation>Association to the temporal datum used by this CRS. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="temporalCRSRef" type="gml:TemporalCRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="TemporalCRSRefType">
-		<annotation>
-			<documentation>Association to a temporal coordinate reference system, either referencing or containing the definition of that reference system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateSystems.xsd
deleted file mode 100755
index 12fc670..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coordinateSystems.xsd
+++ /dev/null
@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:coordinateSystems:3.1.1"/>
-		<documentation>How to encode coordinate system definitions. Builds on referenceSystems.xsd to encode the data needed to define coordinate systems, including the specific subtypes of coordinate systems. 
-		This schema encodes the Coordinate System (CS_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ======================================================
-       includes and imports
-	====================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<!-- ======================================================
-       elements and types
-	====================================================== -->
-	<element name="CoordinateSystemAxis" type="gml:CoordinateSystemAxisType" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="CoordinateSystemAxisBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for coordinate system axis objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:name">
-						<annotation>
-							<documentation>The name by which this coordinate system axis is identified. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<complexType name="CoordinateSystemAxisType">
-		<annotation>
-			<documentation>Definition of a coordinate system axis. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:CoordinateSystemAxisBaseType">
-				<sequence>
-					<element ref="gml:axisID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this coordinate system axis. The first axisID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this coordinate system axis, including data source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:axisAbbrev"/>
-					<element ref="gml:axisDirection"/>
-				</sequence>
-				<attribute ref="gml:uom" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="axisID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of a coordinate system axis. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="axisAbbrev" type="gml:CodeType">
-		<annotation>
-			<documentation>The abbreviation used for this coordinate system axis. This abbreviation can be used to identify the ordinates in a coordinate tuple. Examples are X and Y. The codeSpace attribute can reference a source of more information on a set of standardized abbreviations, or on this abbreviation. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="axisDirection" type="gml:CodeType">
-		<annotation>
-			<documentation>Direction of this coordinate system axis (or in the case of Cartesian projected coordinates, the direction of this coordinate system axis at the origin). Examples: north or south, east or west, up or down. Within any set of coordinate system axes, only one of each pair of terms can be used. For earth-fixed CRSs, this direction is often approximate and intended to provide a human interpretable meaning to the axis. When a geodetic datum is used, the precise directions of  [...]
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<attribute name="uom" type="anyURI">
-		<annotation>
-			<documentation>Identifier of the unit of measure used for this coordinate system axis. The value of this coordinate in a coordinate tuple shall be recorded using this unit of measure, whenever those coordinates use a coordinate reference system that uses a coordinate system that uses this axis.</documentation>
-		</annotation>
-	</attribute>
-	<!-- =================================================== -->
-	<element name="coordinateSystemAxisRef" type="gml:CoordinateSystemAxisRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CoordinateSystemAxisRefType">
-		<annotation>
-			<documentation>Association to a coordinate system axis, either referencing or containing the definition of that axis. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CoordinateSystemAxis"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="_CoordinateSystem" type="gml:AbstractCoordinateSystemType" abstract="true" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractCoordinateSystemBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for coordinate system objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:csName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="csName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this coordinate system is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="AbstractCoordinateSystemType" abstract="true">
-		<annotation>
-			<documentation>A coordinate system (CS) is the set of coordinate system axes that spans a given coordinate space. A CS is derived from a set of (mathematical) rules for specifying how coordinates in a given space are to be assigned to points. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded, whenever those coordinates use a coordinate reference system that uses this coordinate system. This abstract [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemBaseType">
-				<sequence>
-					<element ref="gml:csID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this coordinate system. The first csID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this coordinate system, including data source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:usesAxis" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Ordered sequence of associations to the coordinate system axes included in this coordinate system. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="csID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of a coordinate system. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesAxis" type="gml:CoordinateSystemAxisRefType">
-		<annotation>
-			<documentation>Association to a coordinate system axis. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="coordinateSystemRef" type="gml:CoordinateSystemRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CoordinateSystemRefType">
-		<annotation>
-			<documentation>Association to a coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_CoordinateSystem"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="EllipsoidalCS" type="gml:EllipsoidalCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="EllipsoidalCSType">
-		<annotation>
-			<documentation>A two- or three-dimensional coordinate system in which position is specified by geodetic latitude, geodetic longitude, and (in the three-dimensional case) ellipsoidal height. An EllipsoidalCS shall have two or three usesAxis associations. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ellipsoidalCSRef" type="gml:EllipsoidalCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="EllipsoidalCSRefType">
-		<annotation>
-			<documentation>Association to an ellipsoidal coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EllipsoidalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="CartesianCS" type="gml:CartesianCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="CartesianCSType">
-		<annotation>
-			<documentation>A 1-, 2-, or 3-dimensional coordinate system. Gives the position of points relative to orthogonal straight axes in the 2- and 3-dimensional cases. In the 1-dimensional case, it contains a single straight coordinate axis. In the multi-dimensional case, all axes shall have the same length unit of measure. A CartesianCS shall have one, two, or three usesAxis associations. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="cartesianCSRef" type="gml:CartesianCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CartesianCSRefType">
-		<annotation>
-			<documentation>Association to a Cartesian coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CartesianCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="VerticalCS" type="gml:VerticalCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalCSType">
-		<annotation>
-			<documentation>A one-dimensional coordinate system used to record the heights (or depths) of points. Such a coordinate system is usually dependent on the Earth's gravity field, perhaps loosely as when atmospheric pressure is the basis for the vertical coordinate system axis. A VerticalCS shall have one usesAxis association. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="verticalCSRef" type="gml:VerticalCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalCSRefType">
-		<annotation>
-			<documentation>Association to a vertical coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="TemporalCS" type="gml:TemporalCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="TemporalCSType">
-		<annotation>
-			<documentation>A one-dimensional coordinate system containing a single time axis, used to describe the temporal position of a point in the specified time units from a specified time origin. A TemporalCS shall have one usesAxis association. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="temporalCSRef" type="gml:TemporalCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="TemporalCSRefType">
-		<annotation>
-			<documentation>Association to a temporal coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="LinearCS" type="gml:LinearCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="LinearCSType">
-		<annotation>
-			<documentation>A one-dimensional coordinate system that consists of the points that lie on the single axis described. The associated ordinate is the distance from the specified origin to the point along the axis. Example: usage of the line feature representing a road to describe points on or along that road. A LinearCS shall have one usesAxis association. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="linearCSRef" type="gml:LinearCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="LinearCSRefType">
-		<annotation>
-			<documentation>Association to a linear coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:LinearCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="UserDefinedCS" type="gml:UserDefinedCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="UserDefinedCSType">
-		<annotation>
-			<documentation>A two- or three-dimensional coordinate system that consists of any combination of coordinate axes not covered by any other coordinate system type. An example is a multilinear coordinate system which contains one coordinate axis that may have any 1-D shape which has no intersections with itself. This non-straight axis is supplemented by one or two straight axes to complete a 2 or 3 dimensional coordinate system. The non-straight axis is typically incrementally straight o [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="userDefinedCSRef" type="gml:UserDefinedCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="UserDefinedCSRefType">
-		<annotation>
-			<documentation>Association to a user-defined coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:UserDefinedCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="SphericalCS" type="gml:SphericalCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="SphericalCSType">
-		<annotation>
-			<documentation>A three-dimensional coordinate system with one distance measured from the origin and two angular coordinates. Not to be confused with an ellipsoidal coordinate system based on an ellipsoid "degenerated" into a sphere. A SphericalCS shall have three usesAxis associations. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="sphericalCSRef" type="gml:SphericalCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="SphericalCSRefType">
-		<annotation>
-			<documentation>Association to a spherical coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:SphericalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="PolarCS" type="gml:PolarCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="PolarCSType">
-		<annotation>
-			<documentation>A two-dimensional coordinate system in which position is specified by the distance from the origin and the angle between the line from the origin to a point and a reference direction. A PolarCS shall have two usesAxis associations. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="polarCSRef" type="gml:PolarCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="PolarCSRefType">
-		<annotation>
-			<documentation>Association to a polar coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PolarCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="CylindricalCS" type="gml:CylindricalCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="CylindricalCSType">
-		<annotation>
-			<documentation>A three-dimensional coordinate system consisting of a polar coordinate system extended by a straight coordinate axis perpendicular to the plane spanned by the polar coordinate system. A CylindricalCS shall have three usesAxis associations. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="cylindricalCSRef" type="gml:CylindricalCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CylindricalCSRefType">
-		<annotation>
-			<documentation>Association to a cylindrical coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CylindricalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ObliqueCartesianCS" type="gml:ObliqueCartesianCSType" substitutionGroup="gml:_CoordinateSystem"/>
-	<!-- =================================================== -->
-	<complexType name="ObliqueCartesianCSType">
-		<annotation>
-			<documentation>A two- or three-dimensional coordinate system with straight axes that are not necessarily orthogonal. An ObliqueCartesianCS shall have two or three usesAxis associations. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="obliqueCartesianCSRef" type="gml:ObliqueCartesianCSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ObliqueCartesianCSRefType">
-		<annotation>
-			<documentation>Association to an oblique-Cartesian coordinate system, either referencing or containing the definition of that coordinate system. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ObliqueCartesianCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coverage.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coverage.xsd
deleted file mode 100755
index 4590432..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/coverage.xsd
+++ /dev/null
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:coverage:3.1.1">coverage.xsd</appinfo>
-		<documentation xml:lang="en">GML Coverage schema.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="valueObjects.xsd"/>
-	<include schemaLocation="grids.xsd"/>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<!-- ==============================================================
-       global types and elements
-	============================================================== -->
-	<!-- ================= Abstract coverage definition ================== -->
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="_Coverage" type="gml:AbstractCoverageType" abstract="true" substitutionGroup="gml:_Feature"/>
-	<!-- =========================================================== -->
-	<complexType name="AbstractCoverageType" abstract="true">
-		<annotation>
-			<documentation>Abstract element which acts as the head of a substitution group for coverages. Note that a coverage is a GML feature.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:domainSet"/>
-					<element ref="gml:rangeSet"/>
-				</sequence>
-				<attribute name="dimension" type="positiveInteger" use="optional"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="_ContinuousCoverage" type="gml:AbstractContinuousCoverageType" abstract="true" substitutionGroup="gml:_Coverage"/>
-	<!-- =========================================================== -->
-	<complexType name="AbstractContinuousCoverageType" abstract="true">
-		<annotation>
-			<documentation>A continuous coverage as defined in ISO 19123 is a coverage that can return different values for the same feature attribute at different direct positions within a single spatiotemporal object in its spatiotemporal domain</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoverageType">
-				<sequence>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="_DiscreteCoverage" type="gml:AbstractDiscreteCoverageType" abstract="true" substitutionGroup="gml:_Coverage"/>
-	<!-- =========================================================== -->
-	<complexType name="AbstractDiscreteCoverageType" abstract="true">
-		<annotation>
-			<documentation>A discrete coverage consists of a domain set, range set and optionally a coverage function. The domain set consists of either geometry or temporal objects, finite in number. The range set is comprised of a finite number of attribute values each of which is associated to every direct position within any single spatiotemporal object in the domain. In other words, the range values are constant on each spatiotemporal object in the domain. This coverage function maps each el [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoverageType">
-				<sequence>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="domainSet" type="gml:DomainSetType"/>
-	<!-- =========================================================== -->
-	<complexType name="DomainSetType">
-		<annotation>
-			<documentation>The spatiotemporal domain of a coverage.  
-  Typically 
-  * a geometry collection, 
-  * an implicit geometry (e.g. a grid), 
-  * an explicit or implicit collection of time instances or periods, or
-
-N.B. Temporal geometric complexes and temporal grids are not yet implemented in GML.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:_Geometry"/>
-				<element ref="gml:_TimeObject"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="rangeSet" type="gml:RangeSetType"/>
-	<!-- =========================================================== -->
-	<complexType name="RangeSetType">
-		<choice>
-			<element ref="gml:ValueArray" maxOccurs="unbounded">
-				<annotation>
-					<documentation>each member _Value holds a tuple or "row" from the equivalent table</documentation>
-				</annotation>
-			</element>
-			<group ref="gml:ScalarValueList" maxOccurs="unbounded">
-				<annotation>
-					<documentation>each list holds the complete set of one scalar component from the values - i.e. a "column" from the equivalent table</documentation>
-				</annotation>
-			</group>
-			<element ref="gml:DataBlock">
-				<annotation>
-					<documentation>Its tuple list holds the values as space-separated tuples each of which contains comma-separated components, and the tuple structure is specified using the rangeParameters property.</documentation>
-				</annotation>
-			</element>
-			<element ref="gml:File">
-				<annotation>
-					<documentation>a reference to an external source for the data, together with a description of how that external source is structured</documentation>
-				</annotation>
-			</element>
-		</choice>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="coverageFunction" type="gml:CoverageFunctionType"/>
-	<!-- =========================================================== -->
-	<complexType name="CoverageFunctionType">
-		<annotation>
-			<documentation>The function or rule which defines the map from members of the domainSet to the range.  
-      More functions will be added to this list</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:MappingRule"/>
-			<element ref="gml:GridFunction"/>
-		</choice>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- ============== Components for encoding the rangeSet ============= -->
-	<!-- =========================================================== -->
-	<element name="DataBlock" type="gml:DataBlockType"/>
-	<!-- =========================================================== -->
-	<complexType name="DataBlockType">
-		<sequence>
-			<element ref="gml:rangeParameters"/>
-			<choice>
-				<element ref="gml:tupleList"/>
-				<element ref="gml:doubleOrNullTupleList"/>
-			</choice>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="tupleList" type="gml:CoordinatesType"/>
-	<!-- =========================================================== -->
-	<element name="doubleOrNullTupleList" type="gml:doubleOrNullList"/>
-	<!-- =========================================================== -->
-	<element name="File" type="gml:FileType"/>
-	<!-- =========================================================== -->
-	<complexType name="FileType">
-		<sequence>
-			<element ref="gml:rangeParameters"/>
-			<element name="fileName" type="anyURI"/>
-			<element name="fileStructure" type="gml:FileValueModelType"/>
-			<element name="mimeType" type="anyURI" minOccurs="0"/>
-			<element name="compression" type="anyURI" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="FileValueModelType">
-		<annotation>
-			<documentation>List of codes that identifies the file structure model for records stored in files.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="Record Interleaved"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<element name="rangeParameters" type="gml:RangeParametersType"/>
-	<!-- =========================================================== -->
-	<complexType name="RangeParametersType">
-		<annotation>
-			<documentation>Metadata about the rangeSet.  Definition of record structure.   
-      This is required if the rangeSet is encoded in a DataBlock.  
-      We use a gml:_Value with empty values as a map of the composite value structure.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<group ref="gml:ValueObject"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- ============= Components for coverageFunctions ================ -->
-	<!-- =========================================================== -->
-	<element name="MappingRule" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>Description of a rule for associating members from the domainSet with members of the rangeSet.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="GridFunction" type="gml:GridFunctionType"/>
-	<!-- =========================================================== -->
-	<complexType name="GridFunctionType">
-		<annotation>
-			<documentation>Defines how values in the domain are mapped to the range set. The start point and the sequencing rule are specified here.</documentation>
-		</annotation>
-		<sequence>
-			<element name="sequenceRule" type="gml:SequenceRuleType" minOccurs="0">
-				<annotation>
-					<documentation>If absent, the implied value is "Linear".</documentation>
-				</annotation>
-			</element>
-			<element name="startPoint" type="gml:integerList" minOccurs="0">
-				<annotation>
-					<documentation>Index position of the first grid post, which must lie somwhere in the GridEnvelope.  If absent, the startPoint is equal to the value of gridEnvelope::low from the grid definition.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="IndexMap" type="gml:IndexMapType" substitutionGroup="gml:GridFunction"/>
-	<!-- =========================================================== -->
-	<complexType name="IndexMapType">
-		<annotation>
-			<documentation>Exends GridFunctionType with a lookUpTable.  This contains a list of indexes of members within the rangeSet corresponding with the members of the domainSet.  The domainSet is traversed in list order if it is enumerated explicitly, or in the order specified by a SequenceRule if the domain is an implicit set.    The length of the lookUpTable corresponds with the length of the subset of the domainSet for which the coverage is defined.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:GridFunctionType">
-				<sequence>
-					<element name="lookUpTable" type="gml:integerList"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="SequenceRuleType">
-		<simpleContent>
-			<extension base="gml:SequenceRuleNames">
-				<attribute name="order" type="gml:IncrementOrder" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="SequenceRuleNames">
-		<annotation>
-			<documentation>List of codes (adopted from ISO 19123 Annex C) that identifies the rule for traversing a grid to correspond with the sequence of members of the rangeSet.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="Linear"/>
-			<enumeration value="Boustrophedonic"/>
-			<enumeration value="Cantor-diagonal"/>
-			<enumeration value="Spiral"/>
-			<enumeration value="Morton"/>
-			<enumeration value="Hilbert"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="IncrementOrder">
-		<annotation>
-			<documentation>The enumeration value here indicates the incrementation order  to be used on the first 2 axes, i.e. "+x-y" means that the points on the first axis are to be traversed from lowest to highest and  the points on the second axis are to be traversed from highest to lowest. The points on all other axes (if any) beyond the first 2 are assumed to increment from lowest to highest.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="+x+y"/>
-			<enumeration value="+y+x"/>
-			<enumeration value="+x-y"/>
-			<enumeration value="-x-y"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<!-- == Specialised Coverage types - typed by the structure of the domain set == -->
-	<!-- =========================================================== -->
-	<element name="MultiPointCoverage" type="gml:MultiPointCoverageType" substitutionGroup="gml:_DiscreteCoverage"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiPointCoverageType">
-		<annotation>
-			<documentation>A discrete coverage type whose domain is defined by a collection of point</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDiscreteCoverageType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:multiPointDomain"/>
-					<element ref="gml:rangeSet"/>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiPointDomain" type="gml:MultiPointDomainType" substitutionGroup="gml:domainSet"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiPointDomainType">
-		<complexContent>
-			<restriction base="gml:DomainSetType">
-				<sequence minOccurs="0">
-					<element ref="gml:MultiPoint"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiCurveCoverage" type="gml:MultiCurveCoverageType" substitutionGroup="gml:_DiscreteCoverage"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiCurveCoverageType">
-		<annotation>
-			<documentation>A discrete coverage type whose domain is defined by a collection of curves.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDiscreteCoverageType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:multiCurveDomain"/>
-					<element ref="gml:rangeSet"/>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiCurveDomain" type="gml:MultiCurveDomainType" substitutionGroup="gml:domainSet"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiCurveDomainType">
-		<complexContent>
-			<restriction base="gml:DomainSetType">
-				<sequence minOccurs="0">
-					<element ref="gml:MultiCurve"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiSurfaceCoverage" type="gml:MultiSurfaceCoverageType" substitutionGroup="gml:_DiscreteCoverage"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiSurfaceCoverageType">
-		<annotation>
-			<documentation>A discrete coverage type whose domain is defined by a collection of surface patches (includes polygons, triangles, rectangles, etc).</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDiscreteCoverageType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:multiSurfaceDomain"/>
-					<element ref="gml:rangeSet"/>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiSurfaceDomain" type="gml:MultiSurfaceDomainType" substitutionGroup="gml:domainSet"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiSurfaceDomainType">
-		<complexContent>
-			<restriction base="gml:DomainSetType">
-				<sequence minOccurs="0">
-					<element ref="gml:MultiSurface"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiSolidCoverage" type="gml:MultiSolidCoverageType" substitutionGroup="gml:_DiscreteCoverage"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiSolidCoverageType">
-		<annotation>
-			<documentation>A discrete coverage type whose domain is defined by a collection of Solids.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDiscreteCoverageType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:multiSolidDomain"/>
-					<element ref="gml:rangeSet"/>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiSolidDomain" type="gml:MultiSolidDomainType" substitutionGroup="gml:domainSet"/>
-	<!-- =========================================================== -->
-	<complexType name="MultiSolidDomainType">
-		<complexContent>
-			<restriction base="gml:DomainSetType">
-				<sequence minOccurs="0">
-					<element ref="gml:MultiSolid"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="GridCoverage" type="gml:GridCoverageType" substitutionGroup="gml:_DiscreteCoverage"/>
-	<!-- =========================================================== -->
-	<complexType name="GridCoverageType">
-		<complexContent>
-			<restriction base="gml:AbstractDiscreteCoverageType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:gridDomain"/>
-					<element ref="gml:rangeSet"/>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="gridDomain" type="gml:GridDomainType" substitutionGroup="gml:domainSet"/>
-	<!-- =========================================================== -->
-	<complexType name="GridDomainType">
-		<complexContent>
-			<restriction base="gml:DomainSetType">
-				<sequence minOccurs="0">
-					<element ref="gml:Grid"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="RectifiedGridCoverage" type="gml:RectifiedGridCoverageType" substitutionGroup="gml:_DiscreteCoverage"/>
-	<!-- =========================================================== -->
-	<complexType name="RectifiedGridCoverageType">
-		<complexContent>
-			<restriction base="gml:AbstractDiscreteCoverageType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:rectifiedGridDomain"/>
-					<element ref="gml:rangeSet"/>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="rectifiedGridDomain" type="gml:RectifiedGridDomainType" substitutionGroup="gml:domainSet"/>
-	<!-- =========================================================== -->
-	<complexType name="RectifiedGridDomainType">
-		<complexContent>
-			<restriction base="gml:DomainSetType">
-				<sequence minOccurs="0">
-					<element ref="gml:RectifiedGrid"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dataQuality.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dataQuality.xsd
deleted file mode 100755
index 6b56f73..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dataQuality.xsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:dataQuality:3.1.1"/>
-		<documentation>How to encode positional data quality information. Builds on units.xsd to encode the data needed to describe the positional accuracy of coordinate operations. 
-		This schema encodes the Data Quality (DQ) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111. 
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ======================================================
-       includes and imports
-	====================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="units.xsd"/>
-	<!-- ======================================================
-       elements and types
-	====================================================== -->
-	<element name="_positionalAccuracy" type="gml:AbstractPositionalAccuracyType" abstract="true"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractPositionalAccuracyType" abstract="true">
-		<annotation>
-			<documentation>Position error estimate (or accuracy) data. </documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:measureDescription" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="measureDescription" type="gml:CodeType">
-		<annotation>
-			<documentation>A description of the position accuracy parameter(s) provided. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="absoluteExternalPositionalAccuracy" type="gml:AbsoluteExternalPositionalAccuracyType" substitutionGroup="gml:_positionalAccuracy"/>
-	<!-- =================================================== -->
-	<complexType name="AbsoluteExternalPositionalAccuracyType">
-		<annotation>
-			<documentation>Closeness of reported coordinate values to values accepted as or being true. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractPositionalAccuracyType">
-				<sequence>
-					<element ref="gml:result"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="relativeInternalPositionalAccuracy" type="gml:RelativeInternalPositionalAccuracyType" substitutionGroup="gml:_positionalAccuracy"/>
-	<!-- =================================================== -->
-	<complexType name="RelativeInternalPositionalAccuracyType">
-		<annotation>
-			<documentation>Closeness of the relative positions of two or more positions to their respective relative positions accepted as or being true. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractPositionalAccuracyType">
-				<sequence>
-					<element ref="gml:result"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="result" type="gml:MeasureType">
-		<annotation>
-			<documentation>A quantitative result defined by the evaluation procedure used, and identified by the measureDescription. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="covarianceMatrix" type="gml:CovarianceMatrixType" substitutionGroup="gml:_positionalAccuracy"/>
-	<!-- =================================================== -->
-	<complexType name="CovarianceMatrixType">
-		<annotation>
-			<documentation>Error estimate covariance matrix. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractPositionalAccuracyType">
-				<sequence>
-					<element ref="gml:unitOfMeasure" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Ordered sequence of units of measure, corresponding to the row and column index numbers of the covariance matrix, starting with row and column 1 and ending with row/column N. Each unit of measure is for the ordinate reflected in the relevant row and column of the covariance matrix. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:includesElement" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered set of elements in this covariance matrix. Because the covariance matrix is symmetrical, only the elements in the upper or lower diagonal part (including the main diagonal) of the matrix need to be specified. Any zero valued covariance elements can be omitted. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="includesElement" type="gml:CovarianceElementType"/>
-	<!-- =================================================== -->
-	<complexType name="CovarianceElementType">
-		<annotation>
-			<documentation>An element of a covariance matrix.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:rowIndex"/>
-			<element ref="gml:columnIndex"/>
-			<element ref="gml:covariance"/>
-		</sequence>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="rowIndex" type="positiveInteger">
-		<annotation>
-			<documentation>Row number of this covariance element value. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="columnIndex" type="positiveInteger">
-		<annotation>
-			<documentation>Column number of this covariance element value. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="covariance" type="double">
-		<annotation>
-			<documentation>Value of covariance matrix element. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/datums.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/datums.xsd
deleted file mode 100755
index f3e0e75..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/datums.xsd
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:datums:3.1.1"/>
-		<documentation>How to encode datum definitions. Builds on referenceSystems.xsd to encode the data needed to define datums, including the specific subtypes of datums. 
-		This schema encodes the Datum (CD_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. 
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ======================================================
-       includes and imports
-	====================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<!-- ======================================================
-       elements and types
-	====================================================== -->
-	<element name="_Datum" type="gml:AbstractDatumType" abstract="true" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractDatumBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for datum objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:datumName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="datumName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this datum is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="AbstractDatumType" abstract="true">
-		<annotation>
-			<documentation>A datum specifies the relationship of a coordinate system to the earth, thus creating a coordinate reference system. A datum uses a parameter or set of parameters that determine the location of the origin of the coordinate reference system. Each datum subtype can be associated with only specific types of coordinate systems. This abstract complexType shall not be used, extended, or restricted, in an Application Schema, to define a concrete subtype with a meaning equivale [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractDatumBaseType">
-				<sequence>
-					<element ref="gml:datumID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this datum. The first datumID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on this reference system, including source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:anchorPoint" minOccurs="0"/>
-					<element ref="gml:realizationEpoch" minOccurs="0"/>
-					<element ref="gml:validArea" minOccurs="0"/>
-					<element ref="gml:scope" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="datumID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of a datum. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="anchorPoint" type="gml:CodeType">
-		<annotation>
-			<documentation>Description, possibly including coordinates, of the point or points used to anchor the datum to the Earth. Also known as the "origin", especially for engineering and image datums. The codeSpace attribute can be used to reference a source of more detailed on this point or surface, or on a set of such descriptions. 
-- For a geodetic datum, this point is also known as the fundamental point, which is traditionally the point where the relationship between geoid and ellipsoid is defined. In some cases, the "fundamental point" may consist of a number of points. In those cases, the parameters defining the geoid/ellipsoid relationship have been averaged for these points, and the averages adopted as the datum definition.
-- For an engineering datum, the anchor point may be a physical point, or it may be a point with defined coordinates in another CRS. When appropriate, the coordinates of this anchor point can be referenced in another document, such as referencing a GML feature that references or includes a point position.
-- For an image datum, the anchor point is usually either the centre of the image or the corner of the image.
-- For a temporal datum, this attribute is not defined. Instead of the anchor point, a temporal datum carries a separate time origin of type DateTime. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="realizationEpoch" type="date">
-		<annotation>
-			<documentation>The time after which this datum definition is valid. This time may be precise (e.g. 1997.0 for IRTF97) or merely a year (e.g. 1983 for NAD83). In the latter case, the epoch usually refers to the year in which a major recalculation of the geodetic control network, underlying the datum, was executed or initiated. An old datum can remain valid after a new datum is defined. Alternatively, a datum may be superseded by a later datum, in which case the realization epoch for th [...]
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="datumRef" type="gml:DatumRefType"/>
-	<!-- =================================================== -->
-	<complexType name="DatumRefType">
-		<annotation>
-			<documentation>Association to a datum, either referencing or containing the definition of that datum. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Datum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="EngineeringDatum" type="gml:EngineeringDatumType" substitutionGroup="gml:_Datum"/>
-	<!-- =================================================== -->
-	<complexType name="EngineeringDatumType">
-		<annotation>
-			<documentation>An engineering datum defines the origin of an engineering coordinate reference system, and is used in a region around that origin. This origin can be fixed with respect to the earth (such as a defined point at a construction site), or be a defined point on a moving vehicle (such as on a ship or satellite). </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractDatumType"/>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="engineeringDatumRef" type="gml:EngineeringDatumRefType"/>
-	<!-- =================================================== -->
-	<complexType name="EngineeringDatumRefType">
-		<annotation>
-			<documentation>Association to an engineering datum, either referencing or containing the definition of that datum. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EngineeringDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ImageDatum" type="gml:ImageDatumType" substitutionGroup="gml:_Datum"/>
-	<!-- =================================================== -->
-	<complexType name="ImageDatumType">
-		<annotation>
-			<documentation>An image datum defines the origin of an image coordinate reference system, and is used in a local context only. For more information, see OGC Abstract Specification Topic 2. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:pixelInCell"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="pixelInCell" type="gml:PixelInCellType"/>
-	<!-- =================================================== -->
-	<complexType name="PixelInCellType">
-		<annotation>
-			<documentation>Specification of the way an image grid is associated with the image data attributes. </documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:CodeType">
-				<attribute name="codeSpace" type="anyURI" use="required">
-					<annotation>
-						<documentation>Reference to a source of information specifying the values and meanings of all the allowed string values for this PixelInCellType. </documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="imageDatumRef" type="gml:ImageDatumRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ImageDatumRefType">
-		<annotation>
-			<documentation>Association to an image datum, either referencing or containing the definition of that datum. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ImageDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="VerticalDatum" type="gml:VerticalDatumType" substitutionGroup="gml:_Datum"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalDatumType">
-		<annotation>
-			<documentation>A textual description and/or a set of parameters identifying a particular reference level surface used as a zero-height surface, including its position with respect to the Earth for any of the height types recognized by this standard. There are several types of Vertical Datums, and each may place constraints on the Coordinate Axis with which it is combined to create a Vertical CRS. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:verticalDatumType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="verticalDatumType" type="gml:VerticalDatumTypeType"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalDatumTypeType">
-		<annotation>
-			<documentation>Type of a vertical datum. </documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:CodeType">
-				<attribute name="codeSpace" type="anyURI" use="required">
-					<annotation>
-						<documentation>Reference to a source of information specifying the values and meanings of all the allowed string values for this VerticalDatumTypeType. </documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="verticalDatumRef" type="gml:VerticalDatumRefType"/>
-	<!-- =================================================== -->
-	<complexType name="VerticalDatumRefType">
-		<annotation>
-			<documentation>Association to a vertical datum, either referencing or containing the definition of that datum. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="TemporalDatum" type="gml:TemporalDatumType" substitutionGroup="gml:_Datum"/>
-	<!-- =================================================== -->
-	<complexType name="TemporalDatumBaseType" abstract="true">
-		<annotation>
-			<documentation>Partially defines the origin of a temporal coordinate reference system. This type restricts the AbstractDatumType to remove the "anchorPoint" and "realizationEpoch" elements. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:datumName"/>
-					<element ref="gml:datumID" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:validArea" minOccurs="0"/>
-					<element ref="gml:scope" minOccurs="0"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<complexType name="TemporalDatumType">
-		<annotation>
-			<documentation>Defines the origin of a temporal coordinate reference system. This type extends the TemporalDatumRestrictionType to add the "origin" element with the dateTime type. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:TemporalDatumBaseType">
-				<sequence>
-					<element ref="gml:origin"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="origin" type="dateTime">
-		<annotation>
-			<documentation>The date and time origin of this temporal datum. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="temporalDatumRef" type="gml:TemporalDatumRefType"/>
-	<!-- =================================================== -->
-	<complexType name="TemporalDatumRefType">
-		<annotation>
-			<documentation>Association to a temporal datum, either referencing or containing the definition of that datum. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="GeodeticDatum" type="gml:GeodeticDatumType" substitutionGroup="gml:_Datum"/>
-	<!-- =================================================== -->
-	<complexType name="GeodeticDatumType">
-		<annotation>
-			<documentation>A geodetic datum defines the precise location and orientation in 3-dimensional space of a defined ellipsoid (or sphere) that approximates the shape of the earth, or of a Cartesian coordinate system centered in this ellipsoid (or sphere). </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:usesPrimeMeridian"/>
-					<element ref="gml:usesEllipsoid"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="usesPrimeMeridian" type="gml:PrimeMeridianRefType">
-		<annotation>
-			<documentation>Association to the prime meridian used by this geodetic datum. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="usesEllipsoid" type="gml:EllipsoidRefType">
-		<annotation>
-			<documentation>Association to the ellipsoid used by this geodetic datum. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="geodeticDatumRef" type="gml:GeodeticDatumRefType"/>
-	<!-- =================================================== -->
-	<complexType name="GeodeticDatumRefType">
-		<annotation>
-			<documentation>Association to a geodetic datum, either referencing or containing the definition of that datum. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeodeticDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<element name="PrimeMeridian" type="gml:PrimeMeridianType" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="PrimeMeridianBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for prime meridian objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:meridianName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="meridianName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this prime meridian is identified. The meridianName most common value is Greenwich, and that value shall be used when the greenwichLongitude value is zero. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="PrimeMeridianType">
-		<annotation>
-			<documentation>A prime meridian defines the origin from which longitude values are determined.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:PrimeMeridianBaseType">
-				<sequence>
-					<element ref="gml:meridianID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this prime meridian. The first meridianID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this prime meridian, including source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:greenwichLongitude"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="meridianID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of a prime meridian. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="greenwichLongitude" type="gml:AngleChoiceType">
-		<annotation>
-			<documentation>Longitude of the prime meridian measured from the Greenwich meridian, positive eastward. The greenwichLongitude most common value is zero, and that value shall be used when the meridianName value is Greenwich. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="primeMeridianRef" type="gml:PrimeMeridianRefType"/>
-	<!-- =================================================== -->
-	<complexType name="PrimeMeridianRefType">
-		<annotation>
-			<documentation>Association to a prime meridian, either referencing or containing the definition of that meridian. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PrimeMeridian"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="Ellipsoid" type="gml:EllipsoidType" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="EllipsoidBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for ellipsoid objects, simplifying and restricting the DefinitionType as needed. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:ellipsoidName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ellipsoidName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this ellipsoid is identified. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="EllipsoidType">
-		<annotation>
-			<documentation>An ellipsoid is a geometric figure that can be used to describe the approximate shape of the earth. In mathematical terms, it is a surface formed by the rotation of an ellipse about its minor axis.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:EllipsoidBaseType">
-				<sequence>
-					<element ref="gml:ellipsoidID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alternative identifications of this ellipsoid. The first ellipsoidID, if any, is normally the primary identification code, and any others are aliases. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this ellipsoid, including source information. </documentation>
-						</annotation>
-					</element>
-					<element ref="gml:semiMajorAxis"/>
-					<element ref="gml:secondDefiningParameter"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="ellipsoidID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of an ellipsoid. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="semiMajorAxis" type="gml:MeasureType">
-		<annotation>
-			<documentation>Length of the semi-major axis of the ellipsoid, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a length, such as metres or feet. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="ellipsoidRef" type="gml:EllipsoidRefType"/>
-	<!-- =================================================== -->
-	<complexType name="EllipsoidRefType">
-		<annotation>
-			<documentation>Association to an ellipsoid, either referencing or containing the definition of that ellipsoid. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Ellipsoid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="secondDefiningParameter" type="gml:SecondDefiningParameterType"/>
-	<!-- =================================================== -->
-	<complexType name="SecondDefiningParameterType">
-		<annotation>
-			<documentation>Definition of the second parameter that defines the shape of an ellipsoid. An ellipsoid requires two defining parameters: semi-major axis and inverse flattening or semi-major axis and semi-minor axis. When the reference body is a sphere rather than an ellipsoid, only a single defining parameter is required, namely the radius of the sphere; in that case, the semi-major axis "degenerates" into the radius of the sphere.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:inverseFlattening"/>
-			<element ref="gml:semiMinorAxis"/>
-			<element ref="gml:isSphere"/>
-		</choice>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="inverseFlattening" type="gml:MeasureType">
-		<annotation>
-			<documentation>Inverse flattening value of the ellipsoid. Value is a scale factor (or ratio) that has no physical unit. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a scale factor, such as percent, permil, or parts-per-million. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="semiMinorAxis" type="gml:MeasureType">
-		<annotation>
-			<documentation>Length of the semi-minor axis of the ellipsoid. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a length, such as metres or feet. </documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="isSphere">
-		<annotation>
-			<documentation>The ellipsoid is degenerate and is actually a sphere. The sphere is completely defined by the semi-major axis, which is the radius of the sphere. </documentation>
-		</annotation>
-		<simpleType>
-			<restriction base="string">
-				<enumeration value="sphere"/>
-			</restriction>
-		</simpleType>
-	</element>
-	<!-- =================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/defaultStyle.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/defaultStyle.xsd
deleted file mode 100755
index a5ebeb7..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/defaultStyle.xsd
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:smil20="http://www.w3.org/2001/SMIL20/" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-defaultStyle:v3.1.0">defaultStyle.xsd</appinfo>
-		<documentation>
-			Default Style schema for GML 3.1.1
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="measures.xsd"/>
-	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="http://schemas.opengis.net/gml/3.1.1/smil/smil20.xsd"/>
-	<!-- ==============================================================
-      the Style property
-	============================================================== -->
-	<element name="defaultStyle" type="gml:DefaultStylePropertyType">
-		<annotation>
-			<documentation>Top-level property. Used in application schemas to "attach" the styling information to GML data. The link between the data and the style should be established through this property only.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="DefaultStylePropertyType">
-		<annotation>
-			<documentation>[complexType of] Top-level property. Used in application schemas to "attach" the styling information to GML data. The link between the data and the style should be established through this property only.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Style" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       the Style
-	============================================================== -->
-	<element name="_Style" type="gml:AbstractStyleType" abstract="true" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The value of the top-level property. It is an abstract element. Used as the head element of the substitution group for extensibility purposes.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractStyleType" abstract="true">
-		<annotation>
-			<documentation>[complexType of] The value of the top-level property. It is an abstract element. Used as the head element of the substitution group for extensibility purposes.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Style" type="gml:StyleType" substitutionGroup="gml:_Style">
-		<annotation>
-			<documentation>Predefined concrete value of the top-level property. Encapsulates all other styling information.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="StyleType">
-		<annotation>
-			<documentation>[complexType of] Predefined concrete value of the top-level property. Encapsulates all other styling information.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractStyleType">
-				<sequence>
-					<element ref="gml:featureStyle" maxOccurs="unbounded"/>
-					<element ref="gml:graphStyle" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-      Feature Style Property
-	============================================================== -->
-	<element name="featureStyle" type="gml:FeatureStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="FeatureStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:FeatureStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-      Feature Style
-	============================================================== -->
-	<element name="FeatureStyle" type="gml:FeatureStyleType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The style descriptor for features.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="FeatureStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for features.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element name="featureConstraint" type="string" minOccurs="0"/>
-					<element ref="gml:geometryStyle" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:topologyStyle" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:labelStyle" minOccurs="0"/>
-				</sequence>
-				<attribute name="featureType" type="string" use="optional"/>
-				<attribute name="baseType" type="string" use="optional"/>
-				<attribute name="queryGrammar" type="gml:QueryGrammarEnumeration"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="QueryGrammarEnumeration">
-		<annotation>
-			<documentation>Used to specify the grammar of the feature query mechanism.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="xpath"/>
-			<enumeration value="xquery"/>
-			<enumeration value="other"/>
-		</restriction>
-	</simpleType>
-	<!-- ==============================================================
-       Base style descriptor type (for geometry, topology, label, graph)
-	============================================================== -->
-	<complexType name="BaseStyleDescriptorType">
-		<annotation>
-			<documentation>Base complex type for geometry, topology, label and graph styles.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element name="spatialResolution" type="gml:ScaleType" minOccurs="0"/>
-					<element name="styleVariation" type="gml:StyleVariationType" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:animate" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:animateMotion" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:animateColor" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="smil20:set" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-       Geometry Style Property
-	============================================================== -->
-	<element name="geometryStyle" type="gml:GeometryStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GeometryStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:GeometryStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       Geometry Style
-	============================================================== -->
-	<element name="GeometryStyle" type="gml:GeometryStyleType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The style descriptor for geometries of a feature.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GeometryStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for geometries of a feature.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<choice>
-						<element ref="gml:symbol"/>
-						<element name="style" type="string">
-							<annotation>
-								<appinfo>deprecated</appinfo>
-								<documentation>Deprecated in GML version 3.1.0. Use symbol with inline content instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element ref="gml:labelStyle" minOccurs="0"/>
-				</sequence>
-				<attribute name="geometryProperty" type="string"/>
-				<attribute name="geometryType" type="string"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-       Topology Style Property
-	============================================================== -->
-	<element name="topologyStyle" type="gml:TopologyStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="TopologyStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:TopologyStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       Topology Style
-	============================================================== -->
-	<element name="TopologyStyle" type="gml:TopologyStyleType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The style descriptor for topologies of a feature. Describes individual topology elements styles.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="TopologyStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for topologies of a feature. Describes individual topology elements styles.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<choice>
-						<element ref="gml:symbol"/>
-						<element name="style" type="string">
-							<annotation>
-								<appinfo>deprecated</appinfo>
-								<documentation>Deprecated in GML version 3.1.0. Use symbol with inline content instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element ref="gml:labelStyle" minOccurs="0"/>
-				</sequence>
-				<attribute name="topologyProperty" type="string"/>
-				<attribute name="topologyType" type="string"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-       Label Style Property
-	============================================================== -->
-	<element name="labelStyle" type="gml:LabelStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="LabelStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:LabelStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-       Label Style
-	============================================================== -->
-	<element name="LabelStyle" type="gml:LabelStyleType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The style descriptor for labels of a feature, geometry or topology.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="LabelStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for labels of a feature, geometry or topology.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<element name="style" type="string"/>
-					<element name="label" type="gml:LabelType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-      Graph Style Property
-	============================================================== -->
-	<element name="graphStyle" type="gml:GraphStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GraphStylePropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<sequence>
-			<element ref="gml:GraphStyle" minOccurs="0"/>
-		</sequence>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ==============================================================
-      Graph Style
-	============================================================== -->
-	<element name="GraphStyle" type="gml:GraphStyleType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The style descriptor for a graph consisting of a number of features. Describes graph-specific style attributes.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GraphStyleType">
-		<annotation>
-			<documentation>[complexType of] The style descriptor for a graph consisting of a number of features. Describes graph-specific style attributes.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:BaseStyleDescriptorType">
-				<sequence>
-					<element name="planar" type="boolean" minOccurs="0"/>
-					<element name="directed" type="boolean" minOccurs="0"/>
-					<element name="grid" type="boolean" minOccurs="0"/>
-					<element name="minDistance" type="double" minOccurs="0"/>
-					<element name="minAngle" type="double" minOccurs="0"/>
-					<element name="graphType" type="gml:GraphTypeType" minOccurs="0"/>
-					<element name="drawingType" type="gml:DrawingTypeType" minOccurs="0"/>
-					<element name="lineType" type="gml:LineTypeType" minOccurs="0"/>
-					<element name="aestheticCriteria" type="gml:AesheticCriteriaType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ==============================================================
-      Common elements
-	============================================================== -->
-	<element name="symbol" type="gml:SymbolType">
-		<annotation>
-			<documentation>The symbol property. Extends the gml:AssociationType to allow for remote referencing of symbols.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="SymbolType">
-		<annotation>
-			<documentation>[complexType of] The symbol property. Allows for remote referencing of symbols.</documentation>
-		</annotation>
-		<sequence>
-			<any processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="symbolType" type="gml:SymbolTypeEnumeration" use="required"/>
-		<attribute ref="gml:transform" use="optional"/>
-		<attribute name="about" type="anyURI" use="optional"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="SymbolTypeEnumeration">
-		<annotation>
-			<documentation>Used to specify the type of the symbol used.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="svg"/>
-			<enumeration value="xpath"/>
-			<enumeration value="other"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<complexType name="LabelType" mixed="true">
-		<annotation>
-			<documentation>Label is mixed -- composed of text and XPath expressions used to extract the useful information from the feature.</documentation>
-		</annotation>
-		<sequence>
-			<element name="LabelExpression" type="string" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute ref="gml:transform" use="optional"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<attribute name="transform" type="string">
-		<annotation>
-			<documentation>Defines the geometric transformation of entities. There is no particular grammar defined for this value.</documentation>
-		</annotation>
-	</attribute>
-	<!-- =========================================================== -->
-	<complexType name="StyleVariationType">
-		<annotation>
-			<documentation>Used to vary individual graphic parameters and attributes of the style, symbol or text.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="styleProperty" type="string" use="required"/>
-				<attribute name="featurePropertyRange" type="string" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ==============================================================
-       Graph parameters types
-	============================================================== -->
-	<simpleType name="GraphTypeType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="TREE"/>
-			<enumeration value="BICONNECTED"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="DrawingTypeType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="POLYLINE"/>
-			<enumeration value="ORTHOGONAL"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="LineTypeType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="STRAIGHT"/>
-			<enumeration value="BENT"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="AesheticCriteriaType">
-		<annotation>
-			<documentation>Graph-specific styling property.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="MIN_CROSSINGS"/>
-			<enumeration value="MIN_AREA"/>
-			<enumeration value="MIN_BENDS"/>
-			<enumeration value="MAX_BENDS"/>
-			<enumeration value="UNIFORM_BENDS"/>
-			<enumeration value="MIN_SLOPES"/>
-			<enumeration value="MIN_EDGE_LENGTH"/>
-			<enumeration value="MAX_EDGE_LENGTH"/>
-			<enumeration value="UNIFORM_EDGE_LENGTH"/>
-			<enumeration value="MAX_ANGULAR_RESOLUTION"/>
-			<enumeration value="MIN_ASPECT_RATIO"/>
-			<enumeration value="MAX_SYMMETRIES"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dictionary.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dictionary.xsd
deleted file mode 100755
index 5d27037..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dictionary.xsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:dictionary:3.1.1"/>
-		<documentation>
-			Dictionary schema for GML 3.1.1 
-			Components to support the lists of definitions.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ========================================================
-       includes and imports
-	======================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="gmlBase.xsd"/>
-	<!-- ===================================================== -->
-	<!-- ===================================================== -->
-	<!-- === Dictionary and Definition components === -->
-	<!-- ===================================================== -->
-	<group name="StandardDefinitionProperties">
-		<annotation>
-			<documentation>This content model group makes it easier to construct types that 
-      derive from DefinitionType and its descendents "by restriction".  
-      A reference to the group saves having to enumerate the standard definition properties. 
-      See definition of StandardObjectProperties for more documentation</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-			<element ref="gml:description" minOccurs="0"/>
-			<element ref="gml:name" maxOccurs="unbounded"/>
-		</sequence>
-	</group>
-	<!-- ===================================================== -->
-	<element name="Definition" type="gml:DefinitionType" substitutionGroup="gml:_GML"/>
-	<!-- ===================================================== -->
-	<complexType name="DefinitionType">
-		<annotation>
-			<documentation>A definition, which can be included in or referenced by a dictionary. In this extended type, the inherited "description" optional element can hold the definition whenever only text is needed. The inherited "name" elements can provide one or more brief terms for which this is the definition. The inherited "metaDataProperty" elements can be used to reference or include more information about this definition.  
-The gml:id attribute is required - it must be possible to reference this definition using this handle.  </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:name" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ===================================================== -->
-	<element name="Dictionary" type="gml:DictionaryType" substitutionGroup="gml:Definition"/>
-	<element name="DefinitionCollection" type="gml:DictionaryType" substitutionGroup="gml:Definition"/>
-	<!-- ===================================================== -->
-	<complexType name="DictionaryType">
-		<annotation>
-			<documentation>A non-abstract bag that is specialized for use as a dictionary which contains a set of definitions. These definitions are referenced from other places, in the same and different XML documents. In this restricted type, the inherited optional "description" element can be used for a description of this dictionary. The inherited optional "name" element can be used for the name(s) of this dictionary. The inherited "metaDataProperty" elements can be used to reference or conta [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence minOccurs="0" maxOccurs="unbounded">
-					<choice>
-						<element ref="gml:dictionaryEntry">
-							<annotation>
-								<documentation>An entry in this dictionary. The content of an entry can itself be a lower level dictionary or definition collection. This element follows the standard GML property model, so the value may be provided directly or by reference. Note that if the value is provided by reference, this definition does not carry a handle (gml:id) in this context, so does not allow external references to this specific entry in this context. When used in this way the referenced definition w [...]
-							</annotation>
-						</element>
-						<element ref="gml:indirectEntry">
-							<annotation>
-								<documentation>An identified reference to a remote entry in this dictionary, to be used when this entry should be identified to allow external references to this specific entry. </documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===================================================== -->
-	<element name="dictionaryEntry" type="gml:DictionaryEntryType"/>
-	<element name="definitionMember" type="gml:DictionaryEntryType" substitutionGroup="gml:dictionaryEntry"/>
-	<!-- ===================================================== -->
-	<complexType name="DictionaryEntryType">
-		<annotation>
-			<documentation>An entry in a dictionary of definitions. An instance of this type contains or refers to a definition object.  
-
-The number of definitions contained in this dictionaryEntry is restricted to one, but a DefinitionCollection or Dictionary that contains multiple definitions can be substituted if needed. Specialized descendents of this dictionaryEntry might be restricted in an application schema to allow only including specified types of definitions as valid entries in a dictionary. </documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Definition">
-				<annotation>
-					<documentation>This element in a dictionary entry contains the actual definition. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>A non-identified reference to a remote entry in this dictionary, to be used when this entry need not be identified to allow external references to this specific entry. The remote entry referenced will usually be in a dictionary in the same XML document. This element will usually be used in dictionaries that are inside of another dictionary. </documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- ===================================================== -->
-	<element name="indirectEntry" type="gml:IndirectEntryType"/>
-	<!-- ===================================================== -->
-	<complexType name="IndirectEntryType">
-		<annotation>
-			<documentation>An entry in a dictionary of definitions that contains a GML object which references a remote definition object. This entry is expected to be convenient in allowing multiple elements in one XML document to contain short (abbreviated XPointer) references, which are resolved to an external definition provided in a Dictionary element in the same XML document. Specialized descendents of this dictionaryEntry might be restricted in an application schema to allow only including [...]
-		</annotation>
-		<sequence>
-			<element ref="gml:DefinitionProxy"/>
-		</sequence>
-	</complexType>
-	<!-- ===================================================== -->
-	<element name="DefinitionProxy" type="gml:DefinitionProxyType" substitutionGroup="gml:Definition"/>
-	<!-- ===================================================== -->
-	<complexType name="DefinitionProxyType">
-		<annotation>
-			<documentation>A proxy entry in a dictionary of definitions. An element of this type contains a reference to a remote definition object. This entry is expected to be convenient in allowing multiple elements in one XML document to contain short (abbreviated XPointer) references, which are resolved to an external definition provided in a Dictionary element in the same XML document. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:definitionRef">
-						<annotation>
-							<documentation>A reference to a remote entry in this dictionary, used when this dictionary entry is identified to allow external references to this specific entry. The remote entry referenced can be in a dictionary in the same or different XML document. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===================================================== -->
-	<element name="definitionRef" type="gml:ReferenceType"/>
-	<!-- =========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/direction.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/direction.xsd
deleted file mode 100755
index e336b3d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/direction.xsd
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified"
-        version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:direction:3.1.1">direction.xsd</appinfo>
-		<documentation>This schema defines "direction" element and type.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<!-- ============================================================== -->
-	<!--===================================================================  -->
-	<element name="direction" type="gml:DirectionPropertyType"/>
-	<!--===================================================================  -->
-	<complexType name="DirectionPropertyType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<choice>
-			<element ref="gml:DirectionVector"/>
-			<element ref="gml:CompassPoint"/>
-			<element name="DirectionKeyword" type="gml:CodeType"/>
-			<element name="DirectionString" type="gml:StringOrRefType"/>
-		</choice>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!--===================================================================  -->
-	<element name="DirectionVector" type="gml:DirectionVectorType"/>
-	<!--===================================================================  -->
-	<complexType name="DirectionVectorType">
-		<annotation>
-			<documentation>Direction expressed as a vector, either using components, or using angles.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:vector"/>
-			<sequence>
-				<element name="horizontalAngle" type="gml:AngleType"/>
-				<element name="verticalAngle" type="gml:AngleType"/>
-			</sequence>
-		</choice>
-	</complexType>
-	<!--===================================================================  -->
-	<element name="CompassPoint" type="gml:CompassPointEnumeration"/>
-	<!--===================================================================  -->
-	<simpleType name="CompassPointEnumeration">
-		<restriction base="string">
-			<enumeration value="N"/>
-			<enumeration value="NNE"/>
-			<enumeration value="NE"/>
-			<enumeration value="ENE"/>
-			<enumeration value="E"/>
-			<enumeration value="ESE"/>
-			<enumeration value="SE"/>
-			<enumeration value="SSE"/>
-			<enumeration value="S"/>
-			<enumeration value="SSW"/>
-			<enumeration value="SW"/>
-			<enumeration value="WSW"/>
-			<enumeration value="W"/>
-			<enumeration value="WNW"/>
-			<enumeration value="NW"/>
-			<enumeration value="NNW"/>
-		</restriction>
-	</simpleType>
-	<!--===================================================================  -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dynamicFeature.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dynamicFeature.xsd
deleted file mode 100755
index 8f9ed55..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/dynamicFeature.xsd
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:dynamicFeature:3.1.1"/>
-		<documentation xml:lang="en">Basic support for tracking moving objects and objects with changing state.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ================================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="direction.xsd"/>
-	<!-- ================================================================== -->
-	<element name="dataSource" type="gml:StringOrRefType"/>
-	<element name="status" type="gml:StringOrRefType"/>
-	<!-- ================================================================== -->
-	<element name="_TimeSlice" type="gml:AbstractTimeSliceType" abstract="true" substitutionGroup="gml:_GML"/>
-	<!-- ===================================== -->
-	<complexType name="AbstractTimeSliceType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">A timeslice encapsulates the time-varying properties of a dynamic feature--it 
-        must be extended to represent a timestamped projection of a feature. The dataSource 
-        property describes how the temporal data was acquired.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:validTime"/>
-					<element ref="gml:dataSource" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<element name="MovingObjectStatus" type="gml:MovingObjectStatusType" substitutionGroup="gml:_TimeSlice"/>
-	<!-- ===================================== -->
-	<complexType name="MovingObjectStatusType">
-		<annotation>
-			<documentation xml:lang="en">This type encapsulates various dynamic properties of moving objects        
-             (points, lines, regions). It is useful for dealing with features whose        
-             geometry or topology changes over time.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeSliceType">
-				<sequence>
-					<element ref="gml:location"/>
-					<element name="speed" type="gml:MeasureType" minOccurs="0"/>
-					<element name="bearing" type="gml:DirectionPropertyType" minOccurs="0"/>
-					<element name="acceleration" type="gml:MeasureType" minOccurs="0"/>
-					<element name="elevation" type="gml:MeasureType" minOccurs="0"/>
-					<element ref="gml:status" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<element name="history" type="gml:HistoryPropertyType"/>
-	<!-- ===================================== -->
-	<complexType name="HistoryPropertyType">
-		<annotation>
-			<documentation xml:lang="en">The history relationship associates a feature with a sequence of TimeSlice instances.</documentation>
-		</annotation>
-		<sequence maxOccurs="unbounded">
-			<element ref="gml:_TimeSlice"/>
-		</sequence>
-	</complexType>
-	<!-- ================================================================== -->
-	<element name="track" type="gml:TrackType" substitutionGroup="gml:history"/>
-	<!-- ===================================== -->
-	<complexType name="TrackType">
-		<annotation>
-			<documentation xml:lang="en">The track of a moving object is a sequence of specialized timeslices        that indicate the status of the object.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:HistoryPropertyType">
-				<sequence maxOccurs="unbounded">
-					<element ref="gml:MovingObjectStatus"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<group name="dynamicProperties">
-		<sequence>
-			<element ref="gml:validTime" minOccurs="0"/>
-			<element ref="gml:history" minOccurs="0"/>
-			<element ref="gml:dataSource" minOccurs="0"/>
-		</sequence>
-	</group>
-	<!-- ================================================================== -->
-	<complexType name="DynamicFeatureType">
-		<annotation>
-			<documentation>A dynamic feature may possess a history and/or a timestamp.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<group ref="gml:dynamicProperties"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===================================== -->
-	<complexType name="DynamicFeatureCollectionType">
-		<annotation>
-			<documentation>A dynamic feature collection may possess a history and/or a timestamp.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:FeatureCollectionType">
-				<group ref="gml:dynamicProperties"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/feature.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/feature.xsd
deleted file mode 100755
index 8a553f3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/feature.xsd
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:feature:v3.1.1"/>
-		<documentation>GML Feature schema.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ============================================================== -->
-	<!-- ==================        includes and imports  ======================= -->
-	<!-- ============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic2d.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<!-- ============================================================== -->
-	<element name="_Feature" type="gml:AbstractFeatureType" abstract="true" substitutionGroup="gml:_GML"/>
-	<!-- =========================================================== -->
-	<complexType name="AbstractFeatureType" abstract="true">
-		<annotation>
-			<documentation>An abstract feature provides a set of common properties, including id, metaDataProperty, name and description inherited from AbstractGMLType, plus boundedBy.    A concrete feature type must derive from this type and specify additional  properties in an application schema. A feature must possess an identifying attribute ('id' - 'fid' has been deprecated).</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:location" minOccurs="0">
-						<annotation>
-							<appinfo>deprecated</appinfo>
-							<documentation>deprecated in GML version 3.1</documentation>
-						</annotation>
-					</element>
-					<!-- additional properties must be specified in an application schema -->
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<!-- =========================================================== -->
-	<element name="boundedBy" type="gml:BoundingShapeType"/>
-	<!-- ====================================================================== -->
-	<complexType name="BoundingShapeType">
-		<annotation>
-			<documentation>Bounding shape.</documentation>
-		</annotation>
-		<sequence>
-			<choice>
-				<element ref="gml:Envelope"/>
-				<element ref="gml:Null"/>
-			</choice>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="EnvelopeWithTimePeriod" type="gml:EnvelopeWithTimePeriodType" substitutionGroup="gml:Envelope"/>
-	<!-- ====================================================================== -->
-	<complexType name="EnvelopeWithTimePeriodType">
-		<annotation>
-			<documentation>Envelope that includes also a temporal extent.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:EnvelopeType">
-				<sequence>
-					<element ref="gml:timePosition" minOccurs="2" maxOccurs="2"/>
-				</sequence>
-				<attribute name="frame" type="anyURI" use="optional" default="#ISO-8601"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ===== property for feature association ==== -->
-	<element name="featureMember" type="gml:FeaturePropertyType"/>
-	<element name="featureProperty" type="gml:FeaturePropertyType"/>
-	<!-- ============================================================== -->
-	<complexType name="FeaturePropertyType">
-		<annotation>
-			<documentation>Container for a feature - follow gml:AssociationType pattern.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Feature"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ============================================================== -->
-	<!-- ===== property for association of an array of features ===== -->
-	<element name="featureMembers" type="gml:FeatureArrayPropertyType"/>
-	<!-- =========================================================== -->
-	<complexType name="FeatureArrayPropertyType">
-		<annotation>
-			<documentation>Container for features - follow gml:ArrayAssociationType pattern.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Feature" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- ============================================================== -->
-	<!-- =========================================================== -->
-	<element name="_FeatureCollection" type="gml:AbstractFeatureCollectionType" abstract="true" substitutionGroup="gml:_Feature"/>
-	<!-- ===========================================================   -->
-	<complexType name="AbstractFeatureCollectionType" abstract="true">
-		<annotation>
-			<documentation>A feature collection contains zero or more features.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:featureMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:featureMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="FeatureCollection" type="gml:FeatureCollectionType" substitutionGroup="gml:_Feature"/>
-	<!-- =========================================================== -->
-	<complexType name="FeatureCollectionType">
-		<annotation>
-			<documentation>Concrete generic feature collection.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureCollectionType"/>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<!-- ============================================================== -->
-	<element name="LocationKeyWord" type="gml:CodeType"/>
-	<element name="LocationString" type="gml:StringOrRefType"/>
-	<!-- =========================================================== -->
-	<!-- ============= common aliases for geometry properties =============== -->
-	<element name="centerOf" type="gml:PointPropertyType"/>
-	<element name="position" type="gml:PointPropertyType"/>
-	<element name="edgeOf" type="gml:CurvePropertyType"/>
-	<element name="centerLineOf" type="gml:CurvePropertyType"/>
-	<element name="extentOf" type="gml:SurfacePropertyType"/>
-	<!-- =========================================================== -->
-	<!-- ================= deprecated components  =========================== -->
-	<complexType name="BoundedFeatureType" abstract="true">
-		<annotation>
-			<documentation>Makes boundedBy mandatory</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractFeatureType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy"/>
-					<element ref="gml:location" minOccurs="0">
-						<annotation>
-							<appinfo>deprecated</appinfo>
-							<documentation>deprecated in GML version 3.1</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="location" type="gml:LocationPropertyType">
-		<annotation>
-			<documentation>Deprecated in GML 3.1.0</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="LocationPropertyType">
-		<annotation>
-			<documentation>Convenience property for generalised location.  
-      A representative location for plotting or analysis.  
-      Often augmented by one or more additional geometry properties with more specific semantics.</documentation>
-			<documentation>Deprecated in GML 3.1.0</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:_Geometry"/>
-				<element ref="gml:LocationKeyWord"/>
-				<element ref="gml:LocationString"/>
-				<element ref="gml:Null"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ============================================================== -->
-	<element name="priorityLocation" type="gml:PriorityLocationPropertyType" substitutionGroup="gml:location">
-		<annotation>
-			<documentation>Deprecated in GML 3.1.0</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="PriorityLocationPropertyType">
-		<annotation>
-			<documentation>G-XML component</documentation>
-			<documentation>Deprecated in GML 3.1.0</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:LocationPropertyType">
-				<attribute name="priority" type="string" use="optional"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryAggregates.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryAggregates.xsd
deleted file mode 100755
index c83a39d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryAggregates.xsd
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified"
-        version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:geometryAggregates:3.1.1">geometryAggregates.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryPrimitives.xsd"/>
-	<!-- =========================================================== -->
-	<!-- aggregate geometry objects -->
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="_GeometricAggregate" type="gml:AbstractGeometricAggregateType" abstract="true" substitutionGroup="gml:_Geometry">
-		<annotation>
-			<documentation>The "_GeometricAggregate" element is the abstract head of the substituition group for all geometric aggremates.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractGeometricAggregateType" abstract="true">
-		<annotation>
-			<documentation>This is the abstract root type of the geometric aggregates.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiGeometry" type="gml:MultiGeometryType" substitutionGroup="gml:_GeometricAggregate"/>
-	<!-- ======================================================= -->
-	<complexType name="MultiGeometryType">
-		<annotation>
-			<documentation>A geometry collection must include one or more geometries, referenced through geometryMember elements.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<annotation>
-						<documentation>The members of the geometric aggregate can be specified either using the "standard" property or the array property style. It is also valid to use both the "standard" and the array property style in the same collection.
-NOTE: Array properties cannot reference remote geometry elements.</documentation>
-					</annotation>
-					<element ref="gml:geometryMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:geometryMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiGeometryProperty" type="gml:MultiGeometryPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:multiGeometryProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a geometric aggregate via the XLink-attributes or contains the "multi geometry" element. multiGeometryProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for _GeometricAggregate.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MultiGeometryPropertyType">
-		<annotation>
-			<documentation>A property that has a geometric aggregate as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_GeometricAggregate"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiPoint" type="gml:MultiPointType" substitutionGroup="gml:_GeometricAggregate"/>
-	<!-- ======================================================= -->
-	<complexType name="MultiPointType">
-		<annotation>
-			<documentation>A MultiPoint is defined by one or more Points, referenced through pointMember elements.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<annotation>
-						<documentation>The members of the geometric aggregate can be specified either using the "standard" property or the array property style. It is also valid to use both the "standard" and the array property style in the same collection.
-NOTE: Array properties cannot reference remote geometry elements.</documentation>
-					</annotation>
-					<element ref="gml:pointMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:pointMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiPointProperty" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:multiPointProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a point aggregate via the XLink-attributes or contains the "multi point" element. multiPointProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for MultiPoint.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MultiPointPropertyType">
-		<annotation>
-			<documentation>A property that has a collection of points as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiPoint"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiCurve" type="gml:MultiCurveType" substitutionGroup="gml:_GeometricAggregate"/>
-	<!-- ======================================================= -->
-	<complexType name="MultiCurveType">
-		<annotation>
-			<documentation>A MultiCurve is defined by one or more Curves, referenced through curveMember elements.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<annotation>
-						<documentation>The members of the geometric aggregate can be specified either using the "standard" property or the array property style. It is also valid to use both the "standard" and the array property style in the same collection.
-NOTE: Array properties cannot reference remote geometry elements.</documentation>
-					</annotation>
-					<element ref="gml:curveMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:curveMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiCurveProperty" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:multiCurveProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a curve aggregate via the XLink-attributes or contains the "multi curve" element. multiCurveProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for MultiCurve.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MultiCurvePropertyType">
-		<annotation>
-			<documentation>A property that has a collection of curves as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="MultiSurface" type="gml:MultiSurfaceType" substitutionGroup="gml:_GeometricAggregate"/>
-	<!-- ======================================================= -->
-	<complexType name="MultiSurfaceType">
-		<annotation>
-			<documentation>A MultiSurface is defined by one or more Surfaces, referenced through surfaceMember elements.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<annotation>
-						<documentation>The members of the geometric aggregate can be specified either using the "standard" property or the array property style. It is also valid to use both the "standard" and the array property style in the same collection.
-NOTE: Array properties cannot reference remote geometry elements.</documentation>
-					</annotation>
-					<element ref="gml:surfaceMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:surfaceMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiSurfaceProperty" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:multiSurfaceProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a surface aggregate via the XLink-attributes or contains the "multi surface" element. multiSurfaceProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for MultiSurface.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MultiSurfacePropertyType">
-		<annotation>
-			<documentation>A property that has a collection of surfaces as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- ============================================================ -->
-	<element name="MultiSolid" type="gml:MultiSolidType" substitutionGroup="gml:_GeometricAggregate"/>
-	<!-- ======================================================= -->
-	<complexType name="MultiSolidType">
-		<annotation>
-			<documentation>A MultiSolid is defined by one or more Solids, referenced through solidMember elements.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<annotation>
-						<documentation>The members of the geometric aggregate can be specified either using the "standard" property or the array property style. It is also valid to use both the "standard" and the array property style in the same collection.
-NOTE: Array properties cannot reference remote geometry elements.</documentation>
-					</annotation>
-					<element ref="gml:solidMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:solidMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="multiSolidProperty" type="gml:MultiSolidPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:multiSolidProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a solid aggregate via the XLink-attributes or contains the "multi solid" element. multiSolidProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for MultiSolid.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MultiSolidPropertyType">
-		<annotation>
-			<documentation>A property that has a collection of solids as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- 
-	
-	The following types and elements are deprecated and should not be used !
-	For backward compatibility with GML2 only
-	
-	-->
-	<!-- =========================================================== -->
-	<element name="MultiPolygon" type="gml:MultiPolygonType" substitutionGroup="gml:_GeometricAggregate">
-		<annotation>
-			<documentation>Deprecated with GML 3.0 and included for backwards compatibility with GML 2. Use the "MultiSurface" element instead.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="MultiLineString" type="gml:MultiLineStringType" substitutionGroup="gml:_GeometricAggregate">
-		<annotation>
-			<documentation>Deprecated with GML 3.0 and included for backwards compatibility with GML 2. Use the "MultiCurve" element instead.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MultiLineStringType">
-		<annotation>
-			<documentation>A MultiLineString is defined by one or more LineStrings, referenced through lineStringMember elements. Deprecated with GML version 3.0. Use MultiCurveType instead.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:lineStringMember" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="MultiLineStringPropertyType">
-		<annotation>
-			<documentation>This type is deprecated with GML 3 and shall not be used. It is included for backwards compatibility with GML 2. Use MultiCurvePropertyType instead.
-A property that has a collection of line strings as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiLineString"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="MultiPolygonType">
-		<annotation>
-			<documentation>A MultiPolygon is defined by one or more Polygons, referenced through polygonMember elements. Deprecated with GML version 3.0. Use MultiSurfaceType instead.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:polygonMember" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="MultiPolygonPropertyType">
-		<annotation>
-			<documentation>This type is deprecated with GML 3 and shall not be used. It is included for backwards compatibility with GML 2. Use MultiSurfacePropertyType instead.
-
-A property that has a collection of polygons as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiPolygon"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="geometryMember" type="gml:GeometryPropertyType">
-		<annotation>
-			<documentation>This property element either references a geometry element via the XLink-attributes or contains the geometry element.</documentation>
-		</annotation>
-	</element>
-	<element name="geometryMembers" type="gml:GeometryArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of geometry elements. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<element name="pointMember" type="gml:PointPropertyType">
-		<annotation>
-			<documentation>This property element either references a Point via the XLink-attributes or contains the Point element.</documentation>
-		</annotation>
-	</element>
-	<element name="pointMembers" type="gml:PointArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of points. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<element name="curveMembers" type="gml:CurveArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of curves. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<element name="surfaceMember" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element which is substitutable for "_Surface".</documentation>
-		</annotation>
-	</element>
-	<element name="surfaceMembers" type="gml:SurfaceArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<element name="solidMember" type="gml:SolidPropertyType">
-		<annotation>
-			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. A solid element is any element which is substitutable for "_Solid".</documentation>
-		</annotation>
-	</element>
-	<element name="solidMembers" type="gml:SolidArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of solids. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<!-- some named geometry properties - for backward compatibility with GML2 -->
-	<element name="multiCenterOf" type="gml:MultiPointPropertyType"/>
-	<element name="multiPosition" type="gml:MultiPointPropertyType"/>
-	<element name="multiCenterLineOf" type="gml:MultiCurvePropertyType"/>
-	<element name="multiEdgeOf" type="gml:MultiCurvePropertyType"/>
-	<element name="multiCoverage" type="gml:MultiSurfacePropertyType"/>
-	<element name="multiExtentOf" type="gml:MultiSurfacePropertyType"/>
-	<!-- 
-	
-	The following types and elements are deprecated and should not be used !
-	
-	-->
-	<element name="multiLocation" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-			<documentation>Deprecated with GML 3.0 and included only for backwards compatibility with GML 2.0. Use "curveMember" instead.
-This property element either references a line string via the XLink-attributes or contains the line string element.</documentation>
-		</annotation>
-	</element>
-	<element name="lineStringMember" type="gml:LineStringPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-			<documentation>Deprecated with GML 3.0 and included only for backwards compatibility with GML 2.0. Use "curveMember" instead.
-This property element either references a line string via the XLink-attributes or contains the line string element.</documentation>
-		</annotation>
-	</element>
-	<element name="polygonMember" type="gml:PolygonPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-			<documentation>Deprecated with GML 3.0 and included only for backwards compatibility with GML 2.0. Use "surfaceMember" instead.
-This property element either references a polygon via the XLink-attributes or contains the polygon element.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryBasic0d1d.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryBasic0d1d.xsd
deleted file mode 100755
index 9403e24..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryBasic0d1d.xsd
+++ /dev/null
@@ -1,603 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by David Burggraf (Galdos Systems Inc) -->
-<schema targetNamespace="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:sch="http://www.ascc.net/xml/schematron"
-        xmlns="http://www.w3.org/2001/XMLSchema">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:geometryBasic0d1d:v3.1.1">geometryBasic0d1d.xsd</appinfo>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:geometryBasic0d1d:v3.1.1">
-			<sch:title>Schematron validation</sch:title>
-			<sch:pattern name="Check SRS tags">
-				<sch:rule abstract="true" id="CRSLabels">
-					<sch:report test="not(@srsDimension) or @srsName">The presence of a dimension attribute implies the presence of the srsName attribute.</sch:report>
-					<sch:report test="not(@axisLabels) or @srsName">The presence of an axisLabels attribute implies the presence of the srsName attribute.</sch:report>
-					<sch:report test="not(@uomLabels) or @srsName">The presence of an uomLabels attribute implies the presence of the srsName attribute.</sch:report>
-					<sch:report test="(not(@uomLabels) and not(@axisLabels)) or (@uomLabels and @axisLabels)">The presence of an uomLabels attribute implies the presence of the axisLabels attribute and vice versa.</sch:report>
-				</sch:rule>
-			</sch:pattern>
-			<sch:pattern name="Check Dimension">
-				<sch:rule abstract="true" id="Count">
-					<sch:report test="not(@count) or @srsDimension">The presence of a count attribute implies the presence of the dimension attribute.</sch:report>
-				</sch:rule>
-			</sch:pattern>
-		</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="measures.xsd">
-		<annotation>
-			<documentation>This includes not only measures.xsd, but also units.xsd, gmlBase.xsd and basicTypes.xsd.</documentation>
-		</annotation>
-	</include>
-	<!-- ============================================================== -->
-	<!-- ===========  abstract supertype for geometry objects =================== -->
-	<!-- ============================================================== -->
-	<element name="_Geometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>The "_Geometry" element is the abstract head of the substituition group for all geometry elements of GML 3. This 
-			includes pre-defined and user-defined geometry elements. Any geometry element must be a direct or indirect extension/restriction 
-			of AbstractGeometryType and must be directly or indirectly in the substitution group of "_Geometry".</documentation>
-			<appinfo>
-				<sch:pattern name="Check SRS tags">
-					<sch:rule context="gml:_Geometry">
-						<sch:extends rule="CRSLabels"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="GeometryPropertyType">
-		<annotation>
-			<documentation>A geometric property can either be any geometry element encapsulated in an element of this type or an XLink reference 
-			to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Note that either 
-			the reference or the contained element must be given, but not both or none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Geometry"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference 
-				remote resources (including those elsewhere in the same document). A simple link element can be constructed by 
-				including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation 
-				of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create 
-				sophisticated links between resources; such links can be used to reference remote properties. A simple link element 
-				can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by 
-				including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- ============================================================== -->
-	<complexType name="GeometryArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of geometry elements. The elements are always contained in the array property, 
-			referencing geometry elements or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Geometry" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- ============================================================== -->
-	<complexType name="AbstractGeometryType" abstract="true">
-		<annotation>
-			<documentation>All geometry elements are derived directly or indirectly from this abstract supertype. A geometry element may 
-			have an identifying attribute ("gml:id"), a name (attribute "name") and a description (attribute "description"). It may be associated 
-			with a spatial reference system (attribute "srsName"). The following rules shall be adhered: - Every geometry type shall derive 
-			from this abstract type. - Every geometry element (i.e. an element of a geometry type) shall be directly or indirectly in the 
-			substitution group of _Geometry.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<attribute name="gid" type="string" use="optional">
-					<annotation>
-						<documentation>This attribute is included for backward compatibility with GML 2 and is deprecated with GML 3. 
-						This identifer is superceded by "gml:id" inherited from AbstractGMLType. The attribute "gid" should not be used 
-						anymore and may be deleted in future versions of GML without further notice.</documentation>
-					</annotation>
-				</attribute>
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<attributeGroup name="SRSReferenceGroup">
-		<annotation>
-			<documentation>Optional reference to the CRS used by this geometry, with optional additional information to simplify use when 
-			a more complete definition of the CRS is not needed.</documentation>
-		</annotation>
-		<attribute name="srsName" type="anyURI" use="optional">
-			<annotation>
-				<documentation>In general this reference points to a CRS instance of gml:CoordinateReferenceSystemType 
-				(see coordinateReferenceSystems.xsd). For well known references it is not required that the CRS description exists at the 
-				location the URI points to. If no srsName attribute is given, the CRS must be specified as part of the larger context this 
-				geometry element is part of, e.g. a geometric element like point, curve, etc. It is expected that this attribute will be specified 
-				at the direct position level only in rare cases.</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="srsDimension" type="positiveInteger" use="optional">
-			<annotation>
-				<documentation>The "srsDimension" is the length of coordinate sequence (the number of entries in the list). This dimension is 
-				specified by the coordinate reference system. When the srsName attribute is omitted, this attribute shall be omitted.</documentation>
-			</annotation>
-		</attribute>
-		<attributeGroup ref="gml:SRSInformationGroup"/>
-	</attributeGroup>
-	<!-- =================================================== -->
-	<attributeGroup name="SRSInformationGroup">
-		<annotation>
-			<documentation>Optional additional and redundant information for a CRS to simplify use when a more complete definition of the 
-			CRS is not needed. This information shall be the same as included in the more complete definition of the CRS, referenced by the 
-			srsName attribute. When the srsName attribute is included, either both or neither of the axisLabels and uomLabels attributes 
-			shall be included. When the srsName attribute is omitted, both of these attributes shall be omitted.</documentation>
-		</annotation>
-		<attribute name="axisLabels" type="gml:NCNameList" use="optional">
-			<annotation>
-				<documentation>Ordered list of labels for all the axes of this CRS. The gml:axisAbbrev value should be used for these axis 
-				labels, after spaces and forbiddden characters are removed. When the srsName attribute is included, this attribute is optional. 
-				When the srsName attribute is omitted, this attribute shall also be omitted.</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="uomLabels" type="gml:NCNameList" use="optional">
-			<annotation>
-				<documentation>Ordered list of unit of measure (uom) labels for all the axes of this CRS. The value of the string in the 
-				gml:catalogSymbol should be used for this uom labels, after spaces and forbiddden characters are removed. When the 
-				axisLabels attribute is included, this attribute shall also be included. When the axisLabels attribute is omitted, this attribute 
-				shall also be omitted.</documentation>
-			</annotation>
-		</attribute>
-	</attributeGroup>
-	<!-- ============================================================== -->
-	<element name="_GeometricPrimitive" type="gml:AbstractGeometricPrimitiveType" abstract="true" substitutionGroup="gml:_Geometry">
-		<annotation>
-			<documentation>The "_GeometricPrimitive" element is the abstract head of the substituition group for all (pre- and user-defined) 
-			geometric primitives.</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="AbstractGeometricPrimitiveType" abstract="true">
-		<annotation>
-			<documentation>This is the abstract root type of the geometric primitives. A geometric primitive is a geometric object that is not 
-			decomposed further into other primitives in the system. All primitives are oriented in the direction implied by the sequence of their 
-			coordinate tuples.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType"/>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<complexType name="GeometricPrimitivePropertyType">
-		<annotation>
-			<documentation>A property that has a geometric primitive as its value domain can either be an appropriate geometry element 
-			encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry 
-			elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither 
-			both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_GeometricPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote 
-				resources (including those elsewhere in the same document). A simple link element can be constructed by including a 
-				specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide 
-				Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between 
-				resources; such links can be used to reference remote properties. A simple link element can be used to implement pointer 
-				functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- primitive geometry objects (0-dimensional) -->
-	<!-- ============================================================== -->
-	<element name="Point" type="gml:PointType" substitutionGroup="gml:_GeometricPrimitive"/>
-	<!-- ============================================================== -->
-	<complexType name="PointType">
-		<annotation>
-			<documentation>A Point is defined by a single coordinate tuple.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the direct poisiton of a point. 1. The "pos" element is of type 
-							DirectPositionType.</documentation>
-						</annotation>
-						<element ref="gml:pos"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0 for coordinates with ordinate values that are numbers. Use "pos" 
-								instead. The "coordinates" element shall only be used for coordinates with ordinates that require a string 
-								representation, e.g. DMS representations.</documentation>
-							</annotation>
-						</element>
-						<element ref="gml:coord">
-							<annotation>
-								<documentation>Deprecated with GML version 3.0. Use "pos" instead. The "coord" element is included for 
-								backwards compatibility with GML 2.</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<element name="pointProperty" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:pointProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a point via the XLink-attributes or contains the point element. pointProperty 
-			is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that 
-			is substitutable for Point.</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<element name="pointRep" type="gml:PointPropertyType">
-		<annotation>
-			<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="PointPropertyType">
-		<annotation>
-			<documentation>A property that has a point as its value domain can either be an appropriate geometry element encapsulated in an 
-			element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located 
-			elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Point"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote 
-				resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific 
-				set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. 
-				XLink allows elements to be inserted into XML documents so as to create sophisticated links between resources; such links can be 
-				used to reference remote properties. A simple link element can be used to implement pointer functionality, and this functionality has 
-				been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- ============================================================== -->
-	<element name="pointArrayProperty" type="gml:PointArrayPropertyType"/>
-	<!-- =========================================================== -->
-	<complexType name="PointArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of points. The elements are always contained in the array property, referencing geometry 
-			elements or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:Point" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- primitive geometry objects (1-dimensional) -->
-	<!-- ============================================================== -->
-	<element name="_Curve" type="gml:AbstractCurveType" abstract="true" substitutionGroup="gml:_GeometricPrimitive">
-		<annotation>
-			<documentation>The "_Curve" element is the abstract head of the substituition group for all (continuous) curve elements.</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="AbstractCurveType" abstract="true">
-		<annotation>
-			<documentation>An abstraction of a curve to support the different levels of complexity. The curve can always be viewed as a geometric 
-			primitive, i.e. is continuous.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<element name="curveProperty" type="gml:CurvePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:curveProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a curve via the XLink-attributes or contains the curve element. curveProperty is the 
-			predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is 
-			substitutable for _Curve.</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="CurvePropertyType">
-		<annotation>
-			<documentation>A property that has a curve as its value domain can either be an appropriate geometry element encapsulated in an 
-			element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere 
-			in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Curve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote 
-				resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific 
-				set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. 
-				XLink allows elements to be inserted into XML documents so as to create sophisticated links between resources; such links can be used 
-				to reference remote properties. A simple link element can be used to implement pointer functionality, and this functionality has been built 
-				into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- ============================================================== -->
-	<element name="curveArrayProperty" type="gml:CurveArrayPropertyType"/>
-	<!-- =========================================================== -->
-	<complexType name="CurveArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of curves. The elements are always contained in the array property, referencing geometry elements 
-			or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Curve" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="LineString" type="gml:LineStringType" substitutionGroup="gml:_Curve"/>
-	<!-- =========================================================== -->
-	<complexType name="LineStringType">
-		<annotation>
-			<documentation>A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate 
-			tuples, with linear interpolation between them. It is backwards compatible with the LineString of GML 2, GM_LineString of ISO 19107 is 
-			implemented by LineStringSegment.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a line string. 1. A sequence of "pos" 
-							(DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part 
-							of this curve, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference 
-							another point defined outside of this curve (reuse of existing points). 2. The "posList" element allows for a compact way to 
-							specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong 
-							to this curve only. The number of direct positions in the list must be at least two.</documentation>
-						</annotation>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility 
-									with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-							<element ref="gml:coord">
-								<annotation>
-									<documentation>Deprecated with GML version 3.0. Use "pos" instead. The "coord" element is included for backwards 
-									compatibility with GML 2.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<!-- positions -->
-	<!-- =========================================================== -->
-	<element name="pos" type="gml:DirectPositionType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check SRS tags">
-					<sch:rule context="gml:pos">
-						<sch:extends rule="CRSLabels"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="DirectPositionType">
-		<annotation>
-			<documentation>DirectPosition instances hold the coordinates for a position within some coordinate reference system (CRS). Since 
-			DirectPositions, as data types, will often be included in larger objects (such as geometry elements) that have references to CRS, the 
-			"srsName" attribute will in general be missing, if this particular DirectPosition is included in a larger element with such a reference to a 
-			CRS. In this case, the CRS is implicitly assumed to take on the value of the containing object's CRS.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="posList" type="gml:DirectPositionListType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check SRS tags">
-					<sch:rule context="gml:posList">
-						<sch:extends rule="CRSLabels"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<appinfo>
-				<sch:pattern name="Check Dimension">
-					<sch:rule context="gml:posList">
-						<sch:extends rule="Count"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="DirectPositionListType">
-		<annotation>
-			<documentation>DirectPositionList instances hold the coordinates for a sequence of direct positions within the same coordinate 
-			reference system (CRS).</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-				<attribute name="count" type="positiveInteger" use="optional">
-					<annotation>
-						<documentation>"count" allows to specify the number of direct positions in the list. If the attribute count is present then 
-						the attribute srsDimension shall be present, too.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<element name="vector" type="gml:VectorType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check SRS tags">
-					<sch:rule context="gml:vector">
-						<sch:extends rule="CRSLabels"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ============================================================== -->
-	<complexType name="VectorType">
-		<annotation>
-			<documentation>Vector instances hold the compoents for a (usually spatial) vector within some coordinate reference system (CRS). 
-			Since Vectors will often be included in larger objects that have references to CRS, the "srsName" attribute may be missing. 
-			In this case, the CRS is implicitly assumed to take on the value of the containing object's CRS.
-
-			Note that this content model is the same as DirectPositionType, but is defined separately to reflect the distinct semantics, and to avoid validation problems. SJDC 2004-12-02</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<group name="geometricPositionGroup">
-		<annotation>
-			<documentation>A geometric position represented either by a DirectPosition or a Point.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:pos"/>
-			<element ref="gml:pointProperty"/>
-		</choice>
-	</group>
-	<!-- ============================================================== -->
-	<group name="geometricPositionListGroup">
-		<annotation>
-			<documentation>A list of geometric positions represented either by a DirectPosition or a Point.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:posList"/>
-			<group ref="gml:geometricPositionGroup" maxOccurs="unbounded"/>
-		</choice>
-	</group>
-	<!-- ============================================================== -->
-	<element name="coordinates" type="gml:CoordinatesType">
-		<annotation>
-			<documentation>Deprecated with GML version 3.1.0.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<!-- Envelope -->
-	<!-- =========================================================== -->
-	<element name="Envelope" type="gml:EnvelopeType"/>
-	<!-- =========================================================== -->
-	<complexType name="EnvelopeType">
-		<annotation>
-			<documentation>Envelope defines an extent using a pair of positions defining opposite corners in arbitrary dimensions. The first direct 
-			position is the "lower corner" (a coordinate position consisting of all the minimal ordinates for each dimension for all points within the envelope), 
-			the second one the "upper corner" (a coordinate position consisting of all the maximal ordinates for each dimension for all points within the 
-			envelope).</documentation>
-		</annotation>
-		<choice>
-			<sequence>
-				<element name="lowerCorner" type="gml:DirectPositionType"/>
-				<element name="upperCorner" type="gml:DirectPositionType"/>
-			</sequence>
-			<element ref="gml:coord" minOccurs="2" maxOccurs="2">
-				<annotation>
-					<appinfo>deprecated</appinfo>
-					<documentation>deprecated with GML version 3.0</documentation>
-				</annotation>
-			</element>
-			<element ref="gml:pos" minOccurs="2" maxOccurs="2">
-				<annotation>
-					<appinfo>deprecated</appinfo>
-					<documentation>Deprecated with GML version 3.1. Use the explicit properties "lowerCorner" and "upperCorner" instead.</documentation>
-				</annotation>
-			</element>
-			<element ref="gml:coordinates">
-				<annotation>
-					<documentation>Deprecated with GML version 3.1.0. Use the explicit properties "lowerCorner" and "upperCorner" instead.</documentation>
-				</annotation>
-			</element>
-		</choice>
-		<attributeGroup ref="gml:SRSReferenceGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<!--  	 	The following types and elements are deprecated and should not be used ! 	 	-->
-	<element name="coord" type="gml:CoordType">
-		<annotation>
-			<documentation>Deprecated with GML 3.0 and included for backwards compatibility with GML 2. Use the "pos" element instead.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordType">
-		<annotation>
-			<documentation>Represents a coordinate tuple in one, two, or three dimensions. Deprecated with GML 3.0 and replaced by 
-			DirectPositionType.</documentation>
-		</annotation>
-		<sequence>
-			<element name="X" type="decimal"/>
-			<element name="Y" type="decimal" minOccurs="0"/>
-			<element name="Z" type="decimal" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="lineStringProperty" type="gml:LineStringPropertyType">
-		<annotation>
-			<documentation>Deprecated with GML 3.0 and included only for backwards compatibility with GML 2.0. Use "curveProperty" instead. This 
-			property element either references a line string via the XLink-attributes or contains the line string element.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="LineStringPropertyType">
-		<annotation>
-			<documentation>This type is deprecated with GML 3 and shall not be used. It is included for backwards compatibility with GML 2. Use 
-			CurvePropertyType instead. A property that has a line string as its value domain can either be an appropriate geometry element encapsulated 
-			in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere 
-			in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:LineString"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources 
-				(including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. 
-				The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to 
-				be inserted into XML documents so as to create sophisticated links between resources; such links can be used to reference remote properties. 
-				A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by 
-				including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryBasic2d.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryBasic2d.xsd
deleted file mode 100755
index 05d58c0..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryBasic2d.xsd
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Clemens Portele (interactive instruments) -->
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-        version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:geometryBasic2d:3.1.1">geometryBasic2d.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<!-- =========================================================== -->
-	<!-- primitive geometry objects (2-dimensional) -->
-	<!-- =========================================================== -->
-	<element name="_Surface" type="gml:AbstractSurfaceType" abstract="true" substitutionGroup="gml:_GeometricPrimitive">
-		<annotation>
-			<documentation>The "_Surface" element is the abstract head of the substituition group for all (continuous) surface elements.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractSurfaceType">
-		<annotation>
-			<documentation>An abstraction of a surface to support the different levels of complexity. A surface is always a continuous region of a plane.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="surfaceProperty" type="gml:SurfacePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:surfaceProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. surfaceProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for _Surface.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="SurfacePropertyType">
-		<annotation>
-			<documentation>A property that has a surface as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Surface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="surfaceArrayProperty" type="gml:SurfaceArrayPropertyType"/>
-	<!-- =========================================================== -->
-	<complexType name="SurfaceArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of surfaces. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Surface" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Polygon" type="gml:PolygonType" substitutionGroup="gml:_Surface"/>
-	<!-- =========================================================== -->
-	<complexType name="PolygonType">
-		<annotation>
-			<documentation>A Polygon is a special surface that is defined by a single surface patch. The boundary of this patch is coplanar and the polygon uses planar interpolation in its interior. It is backwards compatible with the Polygon of GML 2, GM_Polygon of ISO 19107 is implemented by PolygonPatch.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:exterior" minOccurs="0"/>
-					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- rings (closed curves for surface boundaries) -->
-	<!-- =========================================================== -->
-	<element name="_Ring" type="gml:AbstractRingType" abstract="true" substitutionGroup="gml:_Geometry">
-		<annotation>
-			<documentation>The "_Ring" element is the abstract head of the substituition group for all closed boundaries of a surface patch.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractRingType" abstract="true">
-		<annotation>
-			<documentation>An abstraction of a ring to support surface boundaries of different complexity.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="exterior" type="gml:AbstractRingPropertyType">
-		<annotation>
-			<documentation>A boundary of a surface consists of a number of rings. In the normal 2D case, one of these rings is distinguished as being the exterior boundary. In a general manifold this is not always possible, in which case all boundaries shall be listed as interior boundaries, and the exterior will be empty.</documentation>
-		</annotation>
-	</element>
-	<element name="interior" type="gml:AbstractRingPropertyType">
-		<annotation>
-			<documentation>A boundary of a surface consists of a number of rings. The "interior" rings seperate the surface / surface patch from the area enclosed by the rings.</documentation>
-		</annotation>
-	</element>
-	<element name="outerBoundaryIs" type="gml:AbstractRingPropertyType" substitutionGroup="gml:exterior">
-		<annotation>
-			<documentation>Deprecated with GML 3.0, included only for backwards compatibility with GML 2. Use "exterior" instead.</documentation>
-		</annotation>
-	</element>
-	<element name="innerBoundaryIs" type="gml:AbstractRingPropertyType" substitutionGroup="gml:interior">
-		<annotation>
-			<documentation>Deprecated with GML 3.0, included only for backwards compatibility with GML 2. Use "interior" instead.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractRingPropertyType">
-		<annotation>
-			<documentation>Encapsulates a ring to represent the surface boundary property of a surface.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Ring"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="LinearRing" type="gml:LinearRingType" substitutionGroup="gml:_Ring"/>
-	<!-- =========================================================== -->
-	<complexType name="LinearRingType">
-		<annotation>
-			<documentation>A LinearRing is defined by four or more coordinate tuples, with linear interpolation between them; the first and last coordinates must be coincident.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractRingType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a linear ring.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this ring, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this ring (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this ring only. The number of direct positions in the list must be at least four.</documentation>
-						</annotation>
-						<choice minOccurs="4" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-						<element ref="gml:coord" minOccurs="4" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Deprecated with GML version 3.0 and included for backwards compatibility with GML 2. Use "pos" elements instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="LinearRingPropertyType">
-		<annotation>
-			<documentation>Encapsulates a ring to represent properties in features or geometry collections.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:LinearRing"/>
-		</choice>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- 
-	
-	The following types and elements are deprecated and should not be used !
-	
-	-->
-	<!-- =========================================================== -->
-	<element name="polygonProperty" type="gml:PolygonPropertyType">
-		<annotation>
-			<documentation>Deprecated with GML 3.0 and included only for backwards compatibility with GML 2.0. Use "surfaceProperty" instead.
-This property element either references a polygon via the XLink-attributes or contains the polygon element.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="PolygonPropertyType">
-		<annotation>
-			<documentation>This type is deprecated with GML 3 and shall not be used. It is included for backwards compatibility with GML 2. Use SurfacePropertyType instead.
-A property that has a polygon as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Polygon"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryComplexes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryComplexes.xsd
deleted file mode 100755
index 388d619..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryComplexes.xsd
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-        version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:geometryComplexes:v3.1.1">geometryComplexes.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<!-- =========================================================== -->
-	<element name="CompositeCurve" type="gml:CompositeCurveType" substitutionGroup="gml:_Curve"/>
-	<!-- =========================================================== -->
-	<complexType name="CompositeCurveType">
-		<annotation>
-			<documentation>A CompositeCurve is defined by a sequence of (orientable) curves such that the each curve in the sequence terminates at the start point of the subsequent curve in the list.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:curveMember" maxOccurs="unbounded">
-						<annotation>
-							<documentation>This element references or contains one curve in the composite curve. The curves are contiguous, the collection of curves is ordered.
-NOTE: This definition allows for a nested structure, i.e. a CompositeCurve may use, for example, another CompositeCurve as a curve member.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<complexType name="CompositeCurvePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:CompositeCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="CompositeSurface" type="gml:CompositeSurfaceType" substitutionGroup="gml:_Surface"/>
-	<!-- =========================================================== -->
-	<complexType name="CompositeSurfaceType">
-		<annotation>
-			<documentation>A CompositeSurface is defined by a set of orientable surfaces. A composite surface is geometry type with all the geometric properties of a (primitive) surface. Essentially, a composite surface is a collection of surfaces that join in pairs on common boundary curves and which, when considered as a whole, form a single surface.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:surfaceMember" maxOccurs="unbounded">
-						<annotation>
-							<documentation>This element references or contains one surface in the composite surface. The surfaces are contiguous.
-NOTE: This definition allows for a nested structure, i.e. a CompositeSurface may use, for example, another CompositeSurface as a member.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<complexType name="CompositeSurfacePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:CompositeSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="CompositeSolid" type="gml:CompositeSolidType" substitutionGroup="gml:_Solid"/>
-	<!-- =========================================================== -->
-	<complexType name="CompositeSolidType">
-		<annotation>
-			<documentation>A composite solid is a geometry type with all the geometric properties of a (primitive) solid. 
-				Essentially, a composite solid is a collection of solids that join in pairs on common boundary surfaces and which, when considered as a whole, form a single solid.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSolidType">
-				<sequence>
-					<element ref="gml:solidMember" maxOccurs="unbounded">
-						<annotation>
-							<appinfo>
-								<sch:pattern name="Check either href or content not both">
-									<sch:rule context="gml:solidMember">
-										<sch:extends rule="hrefOrContent"/>
-									</sch:rule>
-								</sch:pattern>
-							</appinfo>
-							<documentation>This element references or contains one solid in the composite solid. The solids are contiguous.
-NOTE: This definition allows for a nested structure, i.e. a CompositeSolid may use, for example, another CompositeSolid as a member.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<complexType name="CompositeSolidPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:CompositeSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- complex/composite geometry objects -->
-	<!-- =========================================================== -->
-	<element name="GeometricComplex" type="gml:GeometricComplexType" substitutionGroup="gml:_Geometry"/>
-	<!-- =========================================================== -->
-	<complexType name="GeometricComplexType">
-		<annotation>
-			<documentation>A geometric complex.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<sequence>
-					<element name="element" type="gml:GeometricPrimitivePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="GeometricComplexPropertyType">
-		<annotation>
-			<documentation>A property that has a geometric complex as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.
-NOTE: The allowed geometry elements contained in such a property (or referenced by it) have to be modelled by an XML Schema choice element since the composites inherit both from geometric complex *and* geometric primitive and are already part of the _GeometricPrimitive substitution group.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:GeometricComplex"/>
-				<element ref="gml:CompositeCurve"/>
-				<element ref="gml:CompositeSurface"/>
-				<element ref="gml:CompositeSolid"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryPrimitives.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryPrimitives.xsd
deleted file mode 100755
index 9bdce43..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/geometryPrimitives.xsd
+++ /dev/null
@@ -1,1610 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Clemens Portele (interactive instruments) -->
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified"
-        version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:geometryPrimitives:3.1.1">geometryPrimitives.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- =========================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic2d.xsd"/>
-	<!-- =========================================================== -->
-	<element name="Curve" type="gml:CurveType" substitutionGroup="gml:_Curve"/>
-	<!-- =========================================================== -->
-	<complexType name="CurveType">
-		<annotation>
-			<documentation>Curve is a 1-dimensional primitive. Curves are continuous, connected, and have a measurable length in terms of the coordinate system. 
-				A curve is composed of one or more curve segments. Each curve segment within a curve may be defined using a different interpolation method. The curve segments are connected to one another, with the end point of each segment except the last being the start point of the next segment in the segment list.
-				The orientation of the curve is positive.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:segments">
-						<annotation>
-							<documentation>This element encapsulates the segments of the curve.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="baseCurve" type="gml:CurvePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:baseCurve">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a curve via the XLink-attributes or contains the curve element. A curve element is any element which is substitutable for "_Curve".</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="OrientableCurve" type="gml:OrientableCurveType" substitutionGroup="gml:_Curve"/>
-	<!-- =========================================================== -->
-	<complexType name="OrientableCurveType">
-		<annotation>
-			<documentation>OrientableCurve consists of a curve and an orientation. If the orientation is "+", then the OrientableCurve is identical to the baseCurve. If the orientation is "-", then the OrientableCurve is related to another _Curve with a parameterization that reverses the sense of the curve traversal.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:baseCurve">
-						<annotation>
-							<documentation>References or contains the base curve (positive orientation).
-NOTE: This definition allows for a nested structure, i.e. an OrientableCurve may use another OrientableCurve as its base curve.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="orientation" type="gml:SignType" default="+">
-					<annotation>
-						<documentation>If the orientation is "+", then the OrientableCurve is identical to the baseCurve. If the orientation is "-", then the OrientableCurve is related to another _Curve with a parameterization that reverses the sense of the curve traversal. "+" is the default value.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- curve segments (1-dimensional) -->
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="_CurveSegment" type="gml:AbstractCurveSegmentType" abstract="true">
-		<annotation>
-			<documentation>The "_CurveSegment" element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractCurveSegmentType" abstract="true">
-		<annotation>
-			<documentation>Curve segment defines a homogeneous segment of a curve.</documentation>
-		</annotation>
-		<sequence/>
-		<attribute name="numDerivativesAtStart" type="integer" use="optional" default="0">
-			<annotation>
-				<documentation>The attribute "numDerivativesAtStart" specifies the type of continuity between this curve segment and its predecessor. If this is the first curve segment in the curve, one of these values, as appropriate, is ignored. The default value of "0" means simple continuity, which is a mandatory minimum level of continuity. This level is referred to as "C 0 " in mathematical texts. A value of 1 means that the function and its first derivative are continuous at the appropriate e [...]
-NOTE: Use of these values is only appropriate when the basic curve definition is an underdetermined system. For example, line string segments cannot support continuity above C 0 , since there is no spare control parameter to adjust the incoming angle at the end points of the segment. Spline functions on the other hand often have extra degrees of freedom on end segments that allow them to adjust the values of the derivatives to support C 1 or higher continuity.</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="numDerivativesAtEnd" type="integer" use="optional" default="0">
-			<annotation>
-				<documentation>The attribute "numDerivativesAtEnd" specifies the type of continuity between this curve segment and its successor. If this is the last curve segment in the curve, one of these values, as appropriate, is ignored. The default value of "0" means simple continuity, which is a mandatory minimum level of continuity. This level is referred to as "C 0 " in mathematical texts. A value of 1 means that the function and its first derivative are continuous at the appropriate end po [...]
-NOTE: Use of these values is only appropriate when the basic curve definition is an underdetermined system. For example, line string segments cannot support continuity above C 0 , since there is no spare control parameter to adjust the incoming angle at the end points of the segment. Spline functions on the other hand often have extra degrees of freedom on end segments that allow them to adjust the values of the derivatives to support C 1 or higher continuity.</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="numDerivativeInterior" type="integer" use="optional" default="0">
-			<annotation>
-				<documentation>The attribute "numDerivativesInterior" specifies the type of continuity that is guaranteed interior to the curve. The default value of "0" means simple continuity, which is a mandatory minimum level of continuity. This level is referred to as "C 0 " in mathematical texts. A value of 1 means that the function and its first derivative are continuous at the appropriate end point: "C 1 " continuity. A value of "n" for any integer means the function and its first n derivati [...]
-NOTE: Use of these values is only appropriate when the basic curve definition is an underdetermined system. For example, line string segments cannot support continuity above C 0 , since there is no spare control parameter to adjust the incoming angle at the end points of the segment. Spline functions on the other hand often have extra degrees of freedom on end segments that allow them to adjust the values of the derivatives to support C 1 or higher continuity.</documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="segments" type="gml:CurveSegmentArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="CurveSegmentArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of curve segments.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_CurveSegment" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="LineStringSegment" type="gml:LineStringSegmentType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- =========================================================== -->
-	<complexType name="LineStringSegmentType">
-		<annotation>
-			<documentation>A LineStringSegment is a curve segment that is defined by two or more coordinate tuples, with linear interpolation between them.
-				Note: LineStringSegment implements GM_LineString of ISO 19107.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only. The number of direct positions in the list must be at least two.</documentation>
-						</annotation>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="linear">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For a LineStringSegment the interpolation is fixed as "linear".</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="ArcString" type="gml:ArcStringType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- =========================================================== -->
-	<complexType name="ArcStringType">
-		<annotation>
-			<documentation>An ArcString is a curve segment that uses three-point circular arc interpolation.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only. The number of direct positions in the list must be at least three.</documentation>
-						</annotation>
-						<choice minOccurs="3" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc3Points">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For an ArcString the interpolation is fixed as "circularArc3Points".</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="numArc" type="integer" use="optional">
-					<annotation>
-						<documentation>The number of arcs in the arc string can be explicitly stated in this attribute. The number of control points in the arc string must be 2 * numArc + 1.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="Arc" type="gml:ArcType" substitutionGroup="gml:ArcString"/>
-	<!-- =========================================================== -->
-	<complexType name="ArcType">
-		<annotation>
-			<documentation>An Arc is an arc string with only one arc unit, i.e. three control points.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ArcStringType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only. The number of direct positions in the list must be three.</documentation>
-						</annotation>
-						<choice minOccurs="3" maxOccurs="3">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-				<attribute name="numArc" type="integer" use="optional" fixed="1">
-					<annotation>
-						<documentation>An arc is an arc string consiting of a single arc, the attribute is fixed to "1".</documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="Circle" type="gml:CircleType" substitutionGroup="gml:Arc"/>
-	<!-- =========================================================== -->
-	<complexType name="CircleType">
-		<annotation>
-			<documentation>A Circle is an arc whose ends coincide to form a simple closed loop. The "start" and "end" bearing are equal and shall be the bearing for the first controlPoint listed. The three control points must be distinct non-co-linear points for the Circle to be unambiguously defined. The arc is simply extended past the third control point until the first control point is encountered.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:ArcType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="ArcStringByBulge" type="gml:ArcStringByBulgeType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- =========================================================== -->
-	<complexType name="ArcStringByBulgeType">
-		<annotation>
-			<documentation>This variant of the arc computes the mid points of the arcs instead of storing the coordinates directly. The control point sequence consists of the start and end points of each arc plus the bulge.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only. The number of direct positions in the list must be at least two.</documentation>
-						</annotation>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="bulge" type="double" maxOccurs="unbounded">
-						<annotation>
-							<documentation>The bulge controls the offset of each arc's midpoint. The "bulge" is the real number multiplier for the normal that determines the offset direction of the midpoint of each arc. The length of the bulge sequence is exactly 1 less than the length of the control point array, since a bulge is needed for each pair of adjacent points in the control point array. The bulge is not given by a distance, since it is simply a multiplier for the normal.
-The midpoint of the resulting arc is given by: midPoint = ((startPoint + endPoint)/2.0) + bulge*normal</documentation>
-						</annotation>
-					</element>
-					<element name="normal" type="gml:VectorType" maxOccurs="unbounded">
-						<annotation>
-							<documentation>The attribute "normal" is a vector normal (perpendicular) to the chord of the arc, the line joining the first and last
-point of the arc. In a 2D coordinate system, there are only two possible directions for the normal, and it is often given as a signed real, indicating its length, with a positive sign indicating a left turn angle from the chord line, and a negative sign indicating a right turn from the chord. In 3D, the normal determines the plane of the arc, along with the start and endPoint of the arc.
-The normal is usually a unit vector, but this is not absolutely necessary. If the normal is a zero vector, the geometric object becomes equivalent to the straight line between the two end points. The length of the normal sequence is exactly the same as for the bulge sequence, 1 less than the control point sequence length.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc2PointWithBulge">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For an ArcStringByBulge the interpolation is fixed as "circularArc2PointWithBulge".</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="numArc" type="integer" use="optional">
-					<annotation>
-						<documentation>The number of arcs in the arc string can be explicitly stated in this attribute. The number of control points in the arc string must be numArc + 1.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="ArcByBulge" type="gml:ArcByBulgeType" substitutionGroup="gml:ArcStringByBulge"/>
-	<!-- =========================================================== -->
-	<complexType name="ArcByBulgeType">
-		<annotation>
-			<documentation>An ArcByBulge is an arc string with only one arc unit, i.e. two control points and one bulge.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ArcStringByBulgeType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only. The number of direct positions in the list must be two.</documentation>
-						</annotation>
-						<choice minOccurs="2" maxOccurs="2">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="bulge" type="double">
-						<annotation>
-							<documentation>The bulge controls the offset of each arc's midpoint. The "bulge" is the real number multiplier for the normal that determines the offset direction of the midpoint of each arc. The length of the bulge sequence is exactly 1 less than the length of the control point array, since a bulge is needed for each pair of adjacent points in the control point array. The bulge is not given by a distance, since it is simply a multiplier for the normal.
-The midpoint of the resulting arc is given by: midPoint = ((startPoint + endPoint)/2.0) + bulge*normal</documentation>
-						</annotation>
-					</element>
-					<element name="normal" type="gml:VectorType">
-						<annotation>
-							<documentation>The attribute "normal" is a vector normal (perpendicular) to the chord of the arc, the line joining the first and last
-point of the arc. In a 2D coordinate system, there are only two possible directions for the normal, and it is often given as a signed real, indicating its length, with a positive sign indicating a left turn angle from the chord line, and a negative sign indicating a right turn from the chord. In 3D, the normal determines the plane of the arc, along with the start and endPoint of the arc.
-The normal is usually a unit vector, but this is not absolutely necessary. If the normal is a zero vector, the geometric object becomes equivalent to the straight line between the two end points. The length of the normal sequence is exactly the same as for the bulge sequence, 1 less than the control point sequence length.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="numArc" type="integer" use="optional" fixed="1">
-					<annotation>
-						<documentation>An arc is an arc string consiting of a single arc, the attribute is fixed to "1".</documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="ArcByCenterPoint" type="gml:ArcByCenterPointType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- =========================================================== -->
-	<complexType name="ArcByCenterPointType">
-		<annotation>
-			<documentation>This variant of the arc requires that the points on the arc have to be computed instead of storing the coordinates directly. The control point is the center point of the arc plus the radius and the bearing at start and end. This represenation can be used only in 2D.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) element. The "pos" element contains a center point that is only part of this curve segment, a "pointProperty" element contains a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element can be used to specifiy the coordinates of the center point, too. The number of direct positions in the list must be one.</documentation>
-						</annotation>
-						<choice>
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="radius" type="gml:LengthType">
-						<annotation>
-							<documentation>The radius of the arc.</documentation>
-						</annotation>
-					</element>
-					<element name="startAngle" type="gml:AngleType" minOccurs="0">
-						<annotation>
-							<documentation>The bearing of the arc at the start.</documentation>
-						</annotation>
-					</element>
-					<element name="endAngle" type="gml:AngleType" minOccurs="0">
-						<annotation>
-							<documentation>The bearing of the arc at the end.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArcCenterPointWithRadius">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For an ArcByCenterPoint the interpolation is fixed as "circularArcCenterPointWithRadius".</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="numArc" type="integer" use="required" fixed="1">
-					<annotation>
-						<documentation>Since this type describes always a single arc, the attribute is fixed to "1".</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="CircleByCenterPoint" type="gml:CircleByCenterPointType" substitutionGroup="gml:ArcByCenterPoint"/>
-	<!-- =========================================================== -->
-	<complexType name="CircleByCenterPointType">
-		<annotation>
-			<documentation>A CircleByCenterPoint is an ArcByCenterPoint with identical start and end angle to form a full circle. Again, this represenation can be used only in 2D.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:ArcByCenterPointType"/>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================================ -->
-	<element name="OffsetCurve" type="gml:OffsetCurveType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- ================================================================================ -->
-	<complexType name="OffsetCurveType">
-		<annotation>
-			<documentation>An offset curve is a curve at a constant
-		 distance from the basis curve. They can be useful as a cheap
-		 and simple alternative to constructing curves that are offsets	
-		 by definition.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<element name="offsetBase" type="gml:CurvePropertyType">
-						<annotation>
-							<documentation>offsetBase is a reference to thecurve from which this
-							 curve is define	as an offset.</documentation>
-						</annotation>
-					</element>
-					<element name="distance" type="gml:LengthType">
-						<annotation>
-							<documentation>distance is the distance at which the
-							 offset curve is generated from the basis curve. In 2D systems, positive distances
-							 are to be to the left of the basis curve, and the negative distances are to be to the 
-							 right of the basis curve.</documentation>
-						</annotation>
-					</element>
-					<element name="refDirection" type="gml:VectorType" minOccurs="0">
-						<annotation>
-							<documentation>refDistance is used to define the vector
-       direction of the offset curve from the basis curve. It can
-       be omitted in the 2D case, where the distance can be 
-       positive or negative. In that case, distance defines left
-       side (positive distance) or right side (negative distance)
-       with respect to the tangent to the basis curve.
-
-       In 3D the basis curve shall have a well defined tangent 
-       direction for every point. The offset curve at any point 
-       in 3D, the basis curve shall have a well-defined tangent
-       direction for every point. The offset curve at any point
-       (parameter) on the basis curve c is in the direction
-       -   -   -         -               
-       s = v x t  where  v = c.refDirection()  
-       and
-       -
-       t = c.tangent()
-                                                    -
-       For the offset direction to be well-defined, v shall not
-       on any point of the curve be in the same, or opposite, 
-       direction as
-       - 
-       t.
-
-       The default value of the refDirection shall be the local
-       co-ordinate axis vector for elevation, which indicates up for
-       the curve in a geographic sense.
-
-       NOTE! If the refDirection is the positive tangent to the
-       local elevation axis ("points upward"), then the offset
-       vector points to the left of the curve when viewed from
-       above.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================== -->
-	<element name="AffinePlacement" type="gml:AffinePlacementType"/>
-	<!-- ====================================================== -->
-	<complexType name="AffinePlacementType">
-		<annotation>
-			<documentation>A placement takes a standard geometric
-   construction and places it in geographic space. It defines a
-   transformation from a constructive parameter space to the 
-   co-ordinate space of the co-ordinate reference system being used.  
-   Parameter spaces in formulae in this International Standard are 
-   given as (u, v) in 2D and(u, v, w) in 3D. Co-ordinate reference 
-   systems positions are given in formulae, in this International 
-   Standard, by either (x, y) in 2D, or (x, y, z) in 3D.
-
-   Affine placements are defined by linear transformations from 
-   parameter space to the target co-ordiante space. 2-dimensional 
-   Cartesian parameter space,(u,v) transforms into 3-dimensional co-
-   ordinate reference systems,(x,y,z) by using an affine 
-   transformation,(u,v)->(x,y,z) which is defined :
-
-	x	ux vx  	x0
-			 u	  
-	y =	uy vy   + y0
-			 v		
-	x	uz vz	z0
-	
-   Then, given this equation, the location element of the 
-   AffinePlacement is the direct position (x0, y0, z0), which is the
-   target position of the origin in (u, v). The two reference
-   directions (ux, uy, uz) and (vx, vy, vz) are the target     
-   directions of the unit vectors at the origin in (u, v).</documentation>
-		</annotation>
-		<sequence>
-			<element name="location" type="gml:DirectPositionType">
-				<annotation>
-					<documentation>The location property gives 
-     the target of the parameter space origin. This is the vector  
-    (x0, y0, z0) in the formulae above.</documentation>
-				</annotation>
-			</element>
-			<element name="refDirection" type="gml:VectorType" maxOccurs="unbounded">
-				<annotation>
-					<documentation>The attribute refDirection gives the    
-target directions for the co-ordinate basis vectors of the  
-parameter space. These are the columns of the matrix in the 
-formulae given above. The number of directions given shall be 
-inDimension. The dimension of the directions shall be 
-outDimension.</documentation>
-				</annotation>
-			</element>
-			<element name="inDimension" type="positiveInteger">
-				<annotation>
-					<documentation>Dimension of the constructive parameter 
-     space.</documentation>
-				</annotation>
-			</element>
-			<element name="outDimension" type="positiveInteger">
-				<annotation>
-					<documentation>Dimension of the co-ordinate space.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- = global element in "_CurveSegment" substitution group ========================== -->
-	<element name="Clothoid" type="gml:ClothoidType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- ======================================================================= -->
-	<complexType name="ClothoidType">
-		<annotation>
-			<documentation>A clothoid, or Cornu's spiral, is plane
-   curve whose curvature is a fixed function of its length.
-   In suitably chosen co-ordinates it is given by Fresnel's
-   integrals.
-
-    x(t) = 0-integral-t cos(AT*T/2)dT    
-    
-    y(t) = 0-integral-t sin(AT*T/2)dT
-   
-   This geometry is mainly used as a transition curve between
-   curves of type straight line to circular arc or circular arc
-   to circular arc. With this curve type it is possible to 
-   achieve a C2-continous transition between the above mentioned
-   curve types. One formula for the Clothoid is A*A = R*t where
-   A is constant, R is the varying radius of curvature along the
-   the curve and t is the length along and given in the Fresnel 
-   integrals.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<element name="refLocation">
-						<complexType>
-							<sequence>
-								<element ref="gml:AffinePlacement">
-									<annotation>
-										<documentation>The "refLocation" is an affine mapping 
-          that places  the curve defined by the Fresnel Integrals  
-          into the co-ordinate reference system of this object.</documentation>
-									</annotation>
-								</element>
-							</sequence>
-						</complexType>
-					</element>
-					<element name="scaleFactor" type="decimal">
-						<annotation>
-							<documentation>The element gives the value for the
-       constant in the Fresnel's integrals.</documentation>
-						</annotation>
-					</element>
-					<element name="startParameter" type="double">
-						<annotation>
-							<documentation>The startParameter is the arc length
-       distance from the inflection point that will be the start
-       point for this curve segment. This shall be lower limit
-       used in the Fresnel integral and is the value of the
-       constructive parameter of this curve segment at its start
-       point. The startParameter can either be positive or
-       negative. 
-       NOTE! If 0.0 (zero), lies between the startParameter and
-       the endParameter of the clothoid, then the curve goes
-       through the clothoid's inflection point, and the direction
-       of its radius of curvature, given by the second
-       derivative vector, changes sides with respect to the
-       tangent vector. The term length distance for the</documentation>
-						</annotation>
-					</element>
-					<element name="endParameter" type="double">
-						<annotation>
-							<documentation>The endParameter is the arc length
-       distance from the inflection point that will be the end
-       point for this curve segment. This shall be upper limit
-       used in the Fresnel integral and is the value of the
-       constructive parameter of this curve segment at its
-       start point. The startParameter can either be positive
-       or negative.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- = global element in "_CurveSegment" substitution group = -->
-	<element name="GeodesicString" type="gml:GeodesicStringType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- ======================================================== -->
-	<complexType name="GeodesicStringType">
-		<annotation>
-			<documentation>A GeodesicString consists of sequence of
-   geodesic segments. The type essentially combines a sequence of
-   Geodesic into a single object.
-   The GeodesicString is computed from two or more positions and an
-   interpolation using geodesics defined from the geoid (or 
-   ellipsoid) of the co-ordinate reference system being used.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<choice>
-					<element ref="gml:posList"/>
-					<group ref="gml:geometricPositionGroup" minOccurs="2" maxOccurs="unbounded"/>
-				</choice>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="geodesic">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the
-     curve interpolation mechanism used for this segment. This
-     mechanism uses the control points and control parameters to
-     determine the position of this curve segment. For an 
-     GeodesicString the interpolation is fixed as "geodesic".</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- = global element in "_CurveSegment" substitution group = -->
-	<element name="Geodesic" type="gml:GeodesicType" substitutionGroup="gml:GeodesicString"/>
-	<!-- ======================================================== -->
-	<complexType name="GeodesicType">
-		<annotation>
-			<documentation>A Geodesic consists of two distinct
-   positions joined by a geodesic curve. The control points of
-   a Geodesic shall lie on the geodesic between its start
-   point and end points. Between these two points, a geodesic
-   curve defined from ellipsoid or geoid model used by the
-   co-ordinate reference systems may be used to interpolate
-   other positions. Any other point in the controlPoint array
-   must fall on this geodesic.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:GeodesicStringType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="CubicSpline" type="gml:CubicSplineType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- =========================================================== -->
-	<complexType name="CubicSplineType">
-		<annotation>
-			<documentation>Cubic splines are similar to line strings in that they are a sequence of segments each with its own defining function. A cubic spline uses the control points and a set of derivative parameters to define a piecewise 3rd degree polynomial interpolation. Unlike line-strings, the parameterization by arc length is not necessarily still a polynomial. 
-				The function describing the curve must be C2, that is, have a continuous 1st and 2nd derivative at all points, and pass through the controlPoints in the order given. Between the control points, the curve segment is defined by a cubic polynomial. At each control point, the polynomial changes in such a manner that the 1st and 2nd derivative vectors are the same from either side. The control parameters record must contain vectorAtStart, and vectorAtEnd which are the unit tangent vectors [...]
-				Note: only the direction of the vectors is relevant, not their length.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only. The number of direct positions in the list must be at least three.</documentation>
-						</annotation>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="vectorAtStart" type="gml:VectorType">
-						<annotation>
-							<documentation>"vectorAtStart" is the unit tangent vector at the start point of the spline.</documentation>
-						</annotation>
-					</element>
-					<element name="vectorAtEnd" type="gml:VectorType">
-						<annotation>
-							<documentation>"vectorAtEnd" is the unit tangent vector at the end point of the spline.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="cubicSpline">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For a CubicSpline the interpolation is fixed as "cubicSpline".</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="degree" type="integer" fixed="3">
-					<annotation>
-						<documentation>The degree for a cubic spline is "3".</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="KnotType">
-		<annotation>
-			<documentation>A knot is a breakpoint on a piecewise spline curve.</documentation>
-		</annotation>
-		<sequence>
-			<element name="value" type="double">
-				<annotation>
-					<documentation>The property "value" is the value of the parameter at the knot of the spline. The sequence of knots shall be a non-decreasing sequence. That is, each knot's value in the sequence shall be equal to or greater than the previous knot's value. The use of equal consecutive knots is normally handled using the multiplicity.</documentation>
-				</annotation>
-			</element>
-			<element name="multiplicity" type="nonNegativeInteger">
-				<annotation>
-					<documentation>The property "multiplicity" is the multiplicity of this knot used in the definition of the spline (with the same weight).</documentation>
-				</annotation>
-			</element>
-			<element name="weight" type="double">
-				<annotation>
-					<documentation>The property "weight" is the value of the averaging weight used for this knot of the spline.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="KnotPropertyType">
-		<annotation>
-			<documentation>Encapsulates a knot to use it in a geometric type.</documentation>
-		</annotation>
-		<sequence>
-			<element name="Knot" type="gml:KnotType"/>
-		</sequence>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="BSpline" type="gml:BSplineType" substitutionGroup="gml:_CurveSegment"/>
-	<!-- =========================================================== -->
-	<complexType name="BSplineType">
-		<annotation>
-			<documentation>A B-Spline is a piecewise parametric polynomial or rational curve described in terms of control points and basis functions. Knots are breakpoints on the curve that connect its pieces. They are given as a non-decreasing sequence of real numbers. If the weights in the knots are equal then it is a polynomial spline. The degree is the algebraic degree of the basis functions.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only.</documentation>
-						</annotation>
-						<choice minOccurs="0" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="degree" type="nonNegativeInteger">
-						<annotation>
-							<documentation>The attribute "degree" shall be the degree of the polynomial used for interpolation in this spline.</documentation>
-						</annotation>
-					</element>
-					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="unbounded">
-						<annotation>
-							<documentation>The property "knot" shall be the sequence of distinct knots used to define the spline basis functions.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" default="polynomialSpline">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For a BSpline the interpolation can be either "polynomialSpline" or "rationalSpline", default is "polynomialSpline".</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="isPolynomial" type="boolean" use="optional">
-					<annotation>
-						<documentation>The attribute isPolynomial is set to true if this is a polynomial spline.</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="knotType" type="gml:KnotTypesType" use="optional">
-					<annotation>
-						<documentation>The attribute "knotType" gives the type of knot distribution used in defining this spline. This is for information only
-and is set according to the different construction-functions.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========== global element in "_CurveSegment" substitution group ================ -->
-	<element name="Bezier" type="gml:BezierType" substitutionGroup="gml:BSpline"/>
-	<!-- =========================================================== -->
-	<complexType name="BezierType">
-		<annotation>
-			<documentation>Bezier curves are polynomial splines that use Bezier or Bernstein polynomials for interpolation purposes. It is a special case of the B-Spline curve with two knots.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:BSplineType">
-				<sequence>
-					<choice>
-						<annotation>
-							<documentation>GML supports two different ways to specify the control points of a curve segment.
-1. A sequence of "pos" (DirectPositionType) or "pointProperty" (PointPropertyType) elements. "pos" elements are control points that are only part of this curve segment, "pointProperty" elements contain a point that may be referenced from other geometry elements or reference another point defined outside of this curve segment (reuse of existing points).
-2. The "posList" element allows for a compact way to specifiy the coordinates of the control points, if all control points are in the same coordinate reference systems and belong to this curve segment only.</documentation>
-						</annotation>
-						<choice minOccurs="0" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep">
-								<annotation>
-									<documentation>Deprecated with GML version 3.1.0. Use "pointProperty" instead. Included for backwards compatibility with GML 3.0.0.</documentation>
-								</annotation>
-							</element>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates">
-							<annotation>
-								<documentation>Deprecated with GML version 3.1.0. Use "posList" instead.</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="degree" type="nonNegativeInteger">
-						<annotation>
-							<documentation>The attribute "degree" shall be the degree of the polynomial used for interpolation in this spline.</documentation>
-						</annotation>
-					</element>
-					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="2">
-						<annotation>
-							<documentation>The property "knot" shall be the sequence of distinct knots used to define the spline basis functions.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="polynomialSpline">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the curve interpolation mechanism used for this segment. This mechanism
-uses the control points and control parameters to determine the position of this curve segment. For a Bezier the interpolation is fixed as "polynomialSpline".</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="isPolynomial" type="boolean" fixed="true">
-					<annotation>
-						<documentation>The attribute isPolynomial is set to true as this is a polynomial spline.</documentation>
-					</annotation>
-				</attribute>
-				<attribute name="knotType" type="gml:KnotTypesType" use="prohibited">
-					<annotation>
-						<documentation>The property "knotType" is not relevant for Bezier curve segments.</documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Surface" type="gml:SurfaceType" substitutionGroup="gml:_Surface"/>
-	<!-- =========================================================== -->
-	<complexType name="SurfaceType">
-		<annotation>
-			<documentation>A Surface is a 2-dimensional primitive and is composed of one or more surface patches. The surface patches are connected to one another.
-				The orientation of the surface is positive ("up"). The orientation of a surface chooses an "up" direction through the choice of the upward normal, which, if the surface is not a cycle, is the side of the surface from which the exterior boundary appears counterclockwise. Reversal of the surface orientation reverses the curve orientation of each boundary component, and interchanges the conceptual "up" and "down" direction of the surface. If the surface is the boundary of a solid, the " [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:patches">
-						<annotation>
-							<documentation>This element encapsulates the patches of the surface.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="baseSurface" type="gml:SurfacePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:baseSurface">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element which is substitutable for "_Surface".</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="OrientableSurface" type="gml:OrientableSurfaceType" substitutionGroup="gml:_Surface"/>
-	<!-- =========================================================== -->
-	<complexType name="OrientableSurfaceType">
-		<annotation>
-			<documentation>OrientableSurface consists of a surface and an orientation. If the orientation is "+", then the OrientableSurface is identical to the baseSurface. If the orientation is "-", then the OrientableSurface is a reference to a Surface with an up-normal that reverses the direction for this OrientableSurface, the sense of "the top of the surface".</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:baseSurface">
-						<annotation>
-							<documentation>References or contains the base surface (positive orientation).</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="orientation" type="gml:SignType" default="+">
-					<annotation>
-						<documentation>If the orientation is "+", then the OrientableSurface is identical to the baseSurface. If the orientation is "-", then the OrientableSurface is a reference to a Surface with an up-normal that reverses the direction for this OrientableSurface, the sense of "the top of the surface". "+" is the default value.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- surface patches (2-dimensional) -->
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="_SurfacePatch" type="gml:AbstractSurfacePatchType" abstract="true">
-		<annotation>
-			<documentation>The "_SurfacePatch" element is the abstract head of the substituition group for all surface pach elements describing a continuous portion of a surface.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractSurfacePatchType" abstract="true">
-		<annotation>
-			<documentation>A surface patch defines a homogenuous portion of a surface.</documentation>
-		</annotation>
-		<sequence/>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="patches" type="gml:SurfacePatchArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of surface patches. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="SurfacePatchArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of surface patches.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:_SurfacePatch"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="PolygonPatch" type="gml:PolygonPatchType" substitutionGroup="gml:_SurfacePatch"/>
-	<!-- =========================================================== -->
-	<complexType name="PolygonPatchType">
-		<annotation>
-			<documentation>A PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves are coplanar and the polygon uses planar interpolation in its interior. Implements GM_Polygon of ISO 19107.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior" minOccurs="0"/>
-					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the interpolation mechanism used for this surface patch. Currently only planar surface patches are defined in GML 3, the attribute is fixed to "planar", i.e. the interpolation method shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Triangle" type="gml:TriangleType" substitutionGroup="gml:_SurfacePatch"/>
-	<!-- =========================================================== -->
-	<complexType name="TriangleType">
-		<annotation>
-			<documentation>Represents a triangle as a surface with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring must be four.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior">
-						<annotation>
-							<documentation>Constraint: The Ring shall be a LinearRing and must form a triangle, the first and the last position must be co-incident.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the interpolation mechanism used for this surface patch. Currently only planar surface patches are defined in GML 3, the attribute is fixed to "planar", i.e. the interpolation method shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Rectangle" type="gml:RectangleType" substitutionGroup="gml:_SurfacePatch"/>
-	<!-- =========================================================== -->
-	<complexType name="RectangleType">
-		<annotation>
-			<documentation>Represents a rectangle as a surface with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring must be five.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior">
-						<annotation>
-							<documentation>Constraint: The Ring shall be a LinearRing and must form a rectangle; the first and the last position must be co-incident.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar">
-					<annotation>
-						<documentation>The attribute "interpolation" specifies the interpolation mechanism used for this surface patch. Currently only planar surface patches are defined in GML 3, the attribute is fixed to "planar", i.e. the interpolation method shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="curveMember" type="gml:CurvePropertyType">
-		<annotation>
-			<documentation>This property element either references a curve via the XLink-attributes or contains the curve element. A curve element is any element which is substitutable for "_Curve".</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="Ring" type="gml:RingType" substitutionGroup="gml:_Ring"/>
-	<!-- =========================================================== -->
-	<complexType name="RingType">
-		<annotation>
-			<documentation>A Ring is used to represent a single connected component of a surface boundary. It consists of a sequence of curves connected in a cycle (an object whose boundary is empty).
-A Ring is structurally similar to a composite curve in that the endPoint of each curve in the sequence is the startPoint of the next curve in the Sequence. Since the sequence is circular, there is no exception to this rule. Each ring, like all boundaries, is a cycle and each ring is simple.
-NOTE: Even though each Ring is simple, the boundary need not be simple. The easiest case of this is where one of the interior rings of a surface is tangent to its exterior ring.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractRingType">
-				<sequence>
-					<element ref="gml:curveMember" maxOccurs="unbounded">
-						<annotation>
-							<documentation>This element references or contains one curve in the composite curve. The curves are contiguous, the collection of curves is ordered.
-NOTE: This definition allows for a nested structure, i.e. a CompositeCurve may use, for example, another CompositeCurve as a curve member.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="RingPropertyType">
-		<annotation>
-			<documentation>Encapsulates a ring to represent properties in features or geometry collections.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:Ring"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<group name="PointGrid">
-		<annotation>
-			<documentation>Reference points which are organised
-   into sequences or grids(sequences of equal length sequences).</documentation>
-		</annotation>
-		<sequence>
-			<element name="row" maxOccurs="unbounded">
-				<complexType>
-					<sequence>
-						<group ref="gml:geometricPositionListGroup"/>
-					</sequence>
-				</complexType>
-			</element>
-		</sequence>
-	</group>
-	<!-- ====================================================== -->
-	<element name="_ParametricCurveSurface" type="gml:AbstractParametricCurveSurfaceType" abstract="true" substitutionGroup="gml:_SurfacePatch"/>
-	<!-- ====================================================== -->
-	<complexType name="AbstractParametricCurveSurfaceType">
-		<annotation>
-			<documentation>
-			</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType"/>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="_GriddedSurface" type="gml:AbstractGriddedSurfaceType" abstract="true" substitutionGroup="gml:_ParametricCurveSurface"/>
-	<!-- ======================================================== -->
-	<complexType name="AbstractGriddedSurfaceType">
-		<annotation>
-			<documentation>A gridded surface is a parametric curve
-   surface derived from a rectangular grid in the parameter
-   space. The rows from this grid are control points for
-   horizontal surface curves; the columns are control points
-   for vertical surface curves. The working assumption is that
-   for a pair of parametric co-ordinates (s, t) that the
-   horizontal curves for each integer offset are calculated
-   and evaluated at "s". The defines a sequence of control
-   points:
-   
-   cn(s) : s  1 .....columns 
-
-   From this sequence a vertical curve is calculated for "s",
-   and evaluated at "t". In most cases, the order of
-   calculation (horizontal-vertical vs. vertical-horizontal)
-   does not make a difference. Where it does, the horizontal-   
-   vertical order shall be the one used.
-
-   Logically, any pair of curve interpolation types can lead
-   to a subtype of GriddedSurface. The following clauses
-   define some most commonly encountered surfaces that can
-   be represented in this manner.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractParametricCurveSurfaceType">
-				<sequence>
-					<group ref="gml:PointGrid">
-						<annotation>
-							<documentation>This is the double indexed sequence
-       of control points, given in row major form. 
-       NOTE! There in no assumption made about the shape
-       of the grid. 
-       For example, the positions need not effect a "21/2D"
-       surface, consecutive points may be equal in any or all
-       of the ordinates. Further, the curves in either or both
-       directions may close.</documentation>
-						</annotation>
-					</group>
-					<element name="rows" type="integer" minOccurs="0">
-						<annotation>
-							<documentation>The attribute rows gives the number
-         of rows in the parameter grid.</documentation>
-						</annotation>
-					</element>
-					<element name="columns" type="integer" minOccurs="0">
-						<annotation>
-							<documentation>The attribute columns gives the number
-        of columns in the parameter grid.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="Cone" type="gml:ConeType" substitutionGroup="gml:_GriddedSurface"/>
-	<!-- ======================================================== -->
-	<complexType name="ConeType">
-		<annotation>
-			<documentation>A cone is a gridded surface given as a
-   family of conic sections whose control points vary linearly.
-   NOTE! A 5-point ellipse with all defining positions identical
-   is a point. Thus, a truncated elliptical cone can be given as a
-   2x5 set of control points
-   ((P1, P1, P1, P1, P1), (P2, P3, P4, P5, P6)). P1 is the apex 
-   of the cone. P2, P3,P4, P5 and P6 are any five distinct points
-   around the base ellipse of the cone. If the horizontal curves
-   are circles as opposed to ellipses, the a circular cone can
-   be constructed using ((P1, P1, P1),(P2, P3, P4)). The apex most     
-   not coinside with the other plane.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="Cylinder" type="gml:CylinderType" substitutionGroup="gml:_GriddedSurface"/>
-	<!-- ======================================================== -->
-	<complexType name="CylinderType">
-		<annotation>
-			<documentation>A cylinder is a gridded surface given as a
-   family of circles whose positions vary along a set of parallel
-   lines, keeping the cross sectional horizontal curves of a
-   constant shape.
-   NOTE! Given the same working assumptions as in the previous
-   note, a Cylinder can be given by two circles, giving us the
-   control points of the form ((P1, P2, P3),(P4, P5, P6)).</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="Sphere" type="gml:SphereType" substitutionGroup="gml:_GriddedSurface"/>
-	<!-- ======================================================== -->
-	<complexType name="SphereType">
-		<annotation>
-			<documentation>A sphere is a gridded surface given as a
-   family of circles whose positions vary linearly along the
-   axis of the sphere, and whise radius varies in proportions to
-   the cosine function of the central angle. The horizontal 
-   circles resemble lines of constant latitude, and the vertical
-   arcs resemble lines of constant longitude. 
-   NOTE! If the control points are sorted in terms of increasing
-   longitude, and increasing latitude, the upNormal of a sphere
-   is the outward normal.
-   EXAMPLE If we take a gridded set of latitudes and longitudes
-   in degrees,(u,v) such as
-
-	(-90,-180)  (-90,-90)  (-90,0)  (-90,  90) (-90, 180) 
-	(-45,-180)  (-45,-90)  (-45,0)  (-45,  90) (-45, 180) 
-	(  0,-180)  (  0,-90)  (  0,0)  (  0,  90) (  0, 180)
-	( 45,-180)  ( 45,-90)  ( 45,0)  ( 45, -90) ( 45, 180)
-	( 90,-180)  ( 90,-90)  ( 90,0)  ( 90, -90) ( 90, 180)
-   
-   And map these points to 3D using the usual equations (where R
-   is the radius of the required sphere).
-
-    z = R sin u
-    x = (R cos u)(sin v)
-    y = (R cos u)(cos v)
-
-   We have a sphere of Radius R, centred at (0,0), as a gridded
-   surface. Notice that the entire first row and the entire last
-   row of the control points map to a single point in each 3D
-   Euclidean space, North and South poles respectively, and that
-   each horizontal curve closes back on itself forming a 
-   geometric cycle. This gives us a metrically bounded (of finite
-   size), topologically unbounded (not having a boundary, a
-   cycle) surface.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="PolyhedralSurface" type="gml:PolyhedralSurfaceType" substitutionGroup="gml:Surface"/>
-	<!-- ======================================================== -->
-	<complexType name="PolyhedralSurfaceType">
-		<annotation>
-			<documentation>A polyhedral surface is a surface composed
-   of polygon surfaces connected along their common boundary 
-   curves. This differs from the surface type only in the
-   restriction on the types of surface patches acceptable.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:SurfaceType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:polygonPatches">
-						<annotation>
-							<documentation>This property encapsulates the patches of 
-      the polyhedral surface.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="polygonPatches" type="gml:PolygonPatchArrayPropertyType" substitutionGroup="gml:patches">
-		<annotation>
-			<documentation>This property element contains a list of
-   polygon patches. The order of the patches is significant and 
-   shall be preserved when processing the list.</documentation>
-		</annotation>
-	</element>
-	<!-- ======================================================== -->
-	<complexType name="PolygonPatchArrayPropertyType">
-		<annotation>
-			<documentation>This type defines a container for an array of 
-   polygon patches.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:SurfacePatchArrayPropertyType">
-				<sequence minOccurs="0" maxOccurs="unbounded">
-					<element ref="gml:PolygonPatch"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="trianglePatches" type="gml:TrianglePatchArrayPropertyType" substitutionGroup="gml:patches">
-		<annotation>
-			<documentation>This property element contains a list of
-   triangle patches. The order of the patches is significant and 
-   shall be preserved when processing the list.</documentation>
-		</annotation>
-	</element>
-	<!-- ======================================================== -->
-	<complexType name="TrianglePatchArrayPropertyType">
-		<annotation>
-			<documentation>This type defines a container for an array of 
-     triangle patches.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:SurfacePatchArrayPropertyType">
-				<sequence minOccurs="0" maxOccurs="unbounded">
-					<element ref="gml:Triangle"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="TriangulatedSurface" type="gml:TriangulatedSurfaceType" substitutionGroup="gml:Surface"/>
-	<!-- ======================================================== -->
-	<complexType name="TriangulatedSurfaceType">
-		<annotation>
-			<documentation>A triangulated surface is a polyhedral 
-   surface that is composed only of triangles. There is no
-   restriction on how the triangulation is derived.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:SurfaceType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:trianglePatches">
-						<annotation>
-							<documentation>This property encapsulates the patches of 
-      the triangulated surface.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ======================================================== -->
-	<element name="Tin" type="gml:TinType" substitutionGroup="gml:TriangulatedSurface"/>
-	<!-- ======================================================== -->
-	<complexType name="TinType">
-		<annotation>
-			<documentation>A tin is a triangulated surface that uses
-   the Delauny algorithm or a similar algorithm complemented with
-   consideration of breaklines, stoplines, and maximum length of 
-   triangle sides. These networks satisfy the Delauny's criterion
-   away from the modifications: Fore each triangle in the 
-   network, the circle passing through its vertices does not
-   contain, in its interior, the vertex of any other triangle.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:TriangulatedSurfaceType">
-				<sequence>
-					<element name="stopLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Stoplines are lines where the local
-       continuity or regularity of the surface is questionable.
-       In the area of these pathologies, triangles intersecting
-       a stopline shall be removed from the tin surface, leaving
-       holes in the surface. If coincidence occurs on surface
-       boundary triangles, the result shall be a change of the 
-       surface boundary. Stoplines contains all these
-       pathological segments as a set of line strings.</documentation>
-						</annotation>
-					</element>
-					<element name="breakLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Breaklines are lines of a critical
-       nature to the shape of the surface, representing local
-       ridges, or depressions (such as drainage lines) in the
-       surface. As such their constituent segments must be
-       included in the tin eve if doing so
-       violates the Delauny criterion. Break lines contains these
-       critical segments as a set of line strings.</documentation>
-						</annotation>
-					</element>
-					<element name="maxLength" type="gml:LengthType">
-						<annotation>
-							<documentation>Areas of the surface where data is not 
-       sufficiently dense to assure reasonable calculation shall be    
-       removed by adding a retention criterion for triangles based 
-       on the length of their sides. For many triangle sides  
-       exceeding maximum length, the adjacent triangles to that 
-       triangle side shall be removed from the surface.</documentation>
-						</annotation>
-					</element>
-					<element name="controlPoint">
-						<annotation>
-							<documentation>The corners of the triangles in the TIN 
-  are often referred to as pots. ControlPoint shall contain a 
-  set of the GM_Position used as posts for this TIN. Since each  
-  TIN contains triangles, there must be at least 3 posts. The 
-       order in which these points are given does not affect the 
-       surface that is represented. Application schemas may add 
-       information based on ordering of control points to facilitate 
-       the reconstruction of the TIN from the control points.</documentation>
-						</annotation>
-						<complexType>
-							<choice>
-								<element ref="gml:posList"/>
-								<group ref="gml:geometricPositionGroup" minOccurs="3" maxOccurs="unbounded"/>
-							</choice>
-						</complexType>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="LineStringSegmentArrayPropertyType">
-		<sequence>
-			<element ref="gml:LineStringSegment" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- primitive geometry objects (3-dimensional) -->
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="_Solid" type="gml:AbstractSolidType" abstract="true" substitutionGroup="gml:_GeometricPrimitive">
-		<annotation>
-			<documentation>The "_Solid" element is the abstract head of the substituition group for all (continuous) solid elements.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractSolidType">
-		<annotation>
-			<documentation>An abstraction of a solid to support the different levels of complexity. A solid is always contiguous.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="solidProperty" type="gml:SolidPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either href or content not both">
-					<sch:rule context="gml:solidProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. solidProperty is the predefined property which can be used by GML Application Schemas whenever a GML Feature has a property with a value that is substitutable for _Solid.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="SolidPropertyType">
-		<annotation>
-			<documentation>A property that has a solid as its value domain can either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element must be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Solid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup">
-			<annotation>
-				<documentation>This attribute group includes the XLink attributes (see xlinks.xsd). XLink is used in GML to reference remote resources (including those elsewhere in the same document). A simple link element can be constructed by including a specific set of XLink attributes. The XML Linking Language (XLink) is currently a Proposed Recommendation of the World Wide Web Consortium. XLink allows elements to be inserted into XML documents so as to create sophisticated links between resourc [...]
-A simple link element can be used to implement pointer functionality, and this functionality has been built into various GML 3 elements by including the gml:AssociationAttributeGroup.</documentation>
-			</annotation>
-		</attributeGroup>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="solidArrayProperty" type="gml:SolidArrayPropertyType"/>
-	<!-- =========================================================== -->
-	<complexType name="SolidArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of solids. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:_Solid"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Solid" type="gml:SolidType" substitutionGroup="gml:_Solid"/>
-	<!-- =========================================================== -->
-	<complexType name="SolidType">
-		<annotation>
-			<documentation>A solid is the basis for 3-dimensional geometry. The extent of a solid is defined by the boundary surfaces (shells). A shell is represented by a composite surface, where every  shell is used to represent a single connected component of the boundary of a solid. It consists of a composite surface (a list of orientable surfaces) connected in a topological cycle (an object whose boundary is empty). Unlike a Ring, a Shell's elements have no natural sort order. Like Rings, Sh [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractSolidType">
-				<sequence>
-					<element name="exterior" type="gml:SurfacePropertyType" minOccurs="0">
-						<annotation>
-							<appinfo>
-								<sch:pattern name="Check either href or content not both">
-									<sch:rule context="gml:exterior">
-										<sch:extends rule="hrefOrContent"/>
-									</sch:rule>
-								</sch:pattern>
-							</appinfo>
-							<documentation>Boundaries of solids are similar to surface boundaries. In normal 3-dimensional Euclidean space, one (composite) surface is distinguished as the exterior. In the more general case, this is not always possible.</documentation>
-						</annotation>
-					</element>
-					<element name="interior" type="gml:SurfacePropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<appinfo>
-								<sch:pattern name="Check either href or content not both">
-									<sch:rule context="gml:interior">
-										<sch:extends rule="hrefOrContent"/>
-									</sch:rule>
-								</sch:pattern>
-							</appinfo>
-							<documentation>Boundaries of solids are similar to surface boundaries.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- predefined simple types (enumerations, simple typed arrays) -->
-	<!-- =========================================================== -->
-	<simpleType name="CurveInterpolationType">
-		<annotation>
-			<documentation>CurveInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an
-application schema.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="linear"/>
-			<enumeration value="geodesic"/>
-			<enumeration value="circularArc3Points"/>
-			<enumeration value="circularArc2PointWithBulge"/>
-			<enumeration value="circularArcCenterPointWithRadius"/>
-			<enumeration value="elliptical"/>
-			<enumeration value="clothoid"/>
-			<enumeration value="conic"/>
-			<enumeration value="polynomialSpline"/>
-			<enumeration value="cubicSpline"/>
-			<enumeration value="rationalSpline"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="SurfaceInterpolationType">
-		<annotation>
-			<documentation>SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an
-application schema.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="none"/>
-			<enumeration value="planar"/>
-			<enumeration value="spherical"/>
-			<enumeration value="elliptical"/>
-			<enumeration value="conic"/>
-			<enumeration value="tin"/>
-			<enumeration value="parametricCurve"/>
-			<enumeration value="polynomialSpline"/>
-			<enumeration value="rationalSpline"/>
-			<enumeration value="triangulatedSpline"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<simpleType name="KnotTypesType">
-		<annotation>
-			<documentation>Defines allowed values for the knots` type. Uniform knots implies that all knots are of multiplicity 1 and they differ by a positive constant from the preceding knot. Knots are quasi-uniform iff they are of multiplicity (degree + 1) at the ends, of multiplicity 1 elsewhere, and they differ by a positive constant from the preceding knot.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="uniform"/>
-			<enumeration value="quasiUniform"/>
-			<enumeration value="piecewiseBezier"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/gml.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/gml.xsd
deleted file mode 100755
index dc97c00..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/gml.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns:gml="http://www.opengis.net/gml"
-        xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:gml:3.1.1">gml.xsd</appinfo>
-		<documentation>Top level GML schema
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<include schemaLocation="dynamicFeature.xsd"/>
-	<include schemaLocation="topology.xsd"/>
-	<include schemaLocation="coverage.xsd"/>
-	<include schemaLocation="coordinateReferenceSystems.xsd"/>
-	<include schemaLocation="observation.xsd"/>
-	<include schemaLocation="defaultStyle.xsd"/>
-	<include schemaLocation="temporalReferenceSystems.xsd"/>
-	<!-- ====================================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/gmlBase.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/gmlBase.xsd
deleted file mode 100755
index ae0713b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/gmlBase.xsd
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:gmlBase:3.1.1">
-			<sch:title>Schematron validation</sch:title>
-			<sch:ns prefix="gml" uri="http://www.opengis.net/gml"/>
-			<sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
-			<sch:pattern name="Check either href or content not both">
-				<sch:rule abstract="true" id="hrefOrContent">
-					<sch:report test="@xlink:href and (*|text())">Property element may not carry both a reference to an object and contain an object.</sch:report>
-					<sch:assert test="@xlink:href | (*|text())">Property element must either carry a reference to an object or contain an object.</sch:assert>
-				</sch:rule>
-			</sch:pattern>
-		</appinfo>
-		<documentation>GML base schema for GML 3
-			Components to support the GML encoding model.
-			The abstract Schematron rules can be used by any schema that includes gmlBase.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="basicTypes.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<!-- =========================================================== -->
-	<!-- ==================== Objects ================================ -->
-	<!-- =========================================================== -->
-	<!-- =========== Abstract "Object" is "anyType" ============= -->
-	<!-- ===== Global element at the head of the "Object" substitution group ======== -->
-	<element name="_Object" abstract="true">
-		<annotation>
-			<documentation>This abstract element is the head of a substitutionGroup hierararchy which may contain either simpleContent or complexContent elements.  It is used to assert the model position of "class" elements declared in other GML schemas.</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================= -->
-	<!-- =========== Abstract "GMLobject" supertype ========================= -->
-	<element name="_GML" type="gml:AbstractGMLType" abstract="true" substitutionGroup="gml:_Object">
-		<annotation>
-			<documentation>Global element which acts as the head of a substitution group that may include any element which is a GML feature, object, geometry or complex value</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<group name="StandardObjectProperties">
-		<annotation>
-			<documentation>This content model group makes it easier to construct types that 
-      derive from AbstractGMLType and its descendents "by restriction".  
-      A reference to the group saves having to enumerate the standard object properties.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-			<element ref="gml:description" minOccurs="0"/>
-			<element ref="gml:name" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Multiple names may be provided.  These will often be distinguished by being assigned by different authorities, as indicated by the value of the codeSpace attribute.  In an instance document there will usually only be one name per authority.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</group>
-	<!-- =========================================================== -->
-	<complexType name="AbstractGMLType" abstract="true">
-		<annotation>
-			<documentation>All complexContent GML elements are directly or indirectly derived from this abstract supertype 
-	to establish a hierarchy of GML types that may be distinguished from other XML types by their ancestry. 
-	Elements in this hierarchy may have an ID and are thus referenceable.</documentation>
-		</annotation>
-		<sequence>
-			<group ref="gml:StandardObjectProperties"/>
-		</sequence>
-		<attribute ref="gml:id" use="optional"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========== Concrete "Collection" supertype ========================= -->
-	<element name="Bag" type="gml:BagType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>Generic GML element to contain a heterogeneous collection of GML _Objects</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="BagType">
-		<annotation>
-			<documentation>A non-abstract generic collection type that can be used as a document element for a collection of any GML types - Geometries, Topologies, Features ...
-
-FeatureCollections may only contain Features.  GeometryCollections may only contain Geometrys.  Bags are less constrained  they must contain objects that are substitutable for gml:_Object.  This may mix several levels, including Features, Definitions, Dictionaries, Geometries etc.  
-
-The content model would ideally be 
-   member 0..*
-   members 0..1
-   member 0..*
-for maximum flexibility in building a collection from both homogeneous and distinct components: 
-included "member" elements each contain a single Object
-an included "members" element contains a set of Objects 
-
-However, this is non-deterministic, thus prohibited by XSD.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:member" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========== Concrete "Array" supertype ========================= -->
-	<element name="Array" type="gml:ArrayType" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation>Generic GML element to contain a homogeneous array of GML _Objects</documentation>
-		</annotation>
-	</element>
-	<!-- ======================================================================= -->
-	<complexType name="ArrayType">
-		<annotation>
-			<documentation>A non-abstract generic collection type that can be used as a document element for a homogeneous collection of any GML types - Geometries, Topologies, Features ...</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========== Abstract Metadata supertype ========================= -->
-	<element name="_MetaData" type="gml:AbstractMetaDataType" abstract="true" substitutionGroup="gml:_Object">
-		<annotation>
-			<documentation>Abstract element which acts as the head of a substitution group for packages of MetaData properties.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="AbstractMetaDataType" abstract="true" mixed="true">
-		<annotation>
-			<documentation>An abstract base type for complex metadata types.</documentation>
-		</annotation>
-		<attribute ref="gml:id" use="optional"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========== Container for Generic Metadata ========================= -->
-	<element name="GenericMetaData" type="gml:GenericMetaDataType" substitutionGroup="gml:_MetaData">
-		<annotation>
-			<documentation>Concrete element in the _MetaData substitution group, which permits any well-formed XML content.  Intended to act as a container for metadata defined in external schemas, for which it is not possible to add the concrete components to the GML _MetaData substitution group directly. Deprecated with GML version 3.1.0.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="GenericMetaDataType" mixed="true">
-		<annotation>
-			<documentation>Deprecated with GML version 3.1.0.</documentation>
-		</annotation>
-		<complexContent mixed="true">
-			<extension base="gml:AbstractMetaDataType">
-				<sequence>
-					<any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ================== Base Property Types ============================== -->
-	<!-- ================================================================== -->
-	<!-- ==== property types for unspecified association - by Value or by Reference ==== -->
-	<!-- ====== single Objects - by Value or by Reference ======== -->
-	<element name="_association" type="gml:AssociationType" abstract="true"/>
-	<!-- =========================================================== -->
-	<element name="_strictAssociation" type="gml:AssociationType" abstract="true">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:_strictAssociation">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>must carry a reference to an object or contain an object but not both</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="member" type="gml:AssociationType"/>
-	<!-- =========================================================== -->
-	<complexType name="AssociationType">
-		<annotation>
-			<documentation>A pattern or base for derived types used to specify complex types corresponding to an  unspecified UML association - either composition or aggregation.  Restricts the cardinality of Objects contained in the association to a maximum of one.  An instance of this type can contain an element representing an Object, or serve as a pointer to a remote Object.  
-
-Descendents of this type can be restricted in an application schema to 
-* allow only specified classes as valid participants in the aggregation
-* allow only association by reference (i.e. empty the content model) or by value (i.e. remove the xlinks).    
-
-When used for association by reference, the value of the gml:remoteSchema attribute can be used to locate a schema fragment that constrains the target instance.   
-
-In many cases it is desirable to impose the constraint prohibiting the occurence of both reference and value in the same instance, as that would be ambiguous.  This is accomplished by adding a directive in the annotation element of the element declaration.  This directive can be in the form of normative prose, or can use a Schematron pattern to automatically constrain co-occurrence - see the declaration for _strictAssociation below.   
-
-If co-occurence is not prohibited, then both a link and content may be present.  If this occurs in an instance, then the rule for interpretation is that the instance found by traversing the href provides the normative value of the property, and should be used when possible.  The value(s) included as content may be used if the remote instance cannot be resolved.  This may be considered to be a "cached" version of the value(s).</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_Object"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="_reference" type="gml:ReferenceType" abstract="true"/>
-	<!-- =========================================================== -->
-	<complexType name="ReferenceType">
-		<annotation>
-			<documentation>A pattern or base for derived types used to specify complex types corresponding to a UML aggregation association.  An instance of this type serves as a pointer to a remote Object.</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- ========= multiple objects  - by Value or by Reference ================== -->
-	<element name="members" type="gml:ArrayAssociationType"/>
-	<!-- =========================================================== -->
-	<complexType name="ArrayAssociationType">
-		<annotation>
-			<documentation>A base for derived types used to specify complex types containing an array of objects, by unspecified UML association - either composition or aggregation.  An instance of this type contains elements representing Objects.
-
-Ideally this type would be derived by extension of AssociationType.  
-However, this leads to a non-deterministic content model, since both the base and the extension have minOccurs="0", and is thus prohibited in XML Schema.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_Object" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========== Abstract "property" supertype ========================= -->
-	<element name="metaDataProperty" type="gml:MetaDataPropertyType">
-		<annotation>
-			<documentation>Contains or refers to a metadata package that contains metadata properties.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="MetaDataPropertyType">
-		<annotation>
-			<documentation>Base type for complex metadata property types.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<any processContents="lax"/>
-			<!-- <element ref="gml:_MetaData"/> -->
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attribute name="about" type="anyURI" use="optional"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- ==========================================================
-	global attribute, attribute group and element declarations 
-	============================================================  -->
-	<attribute name="id" type="ID">
-		<annotation>
-			<documentation>Database handle for the object.  It is of XML type ID, so is constrained to be unique in the XML document within which it occurs.  An external identifier for the object in the form of a URI may be constructed using standard XML and XPointer methods.  This is done by concatenating the URI for the document, a fragment separator, and the value of the id attribute.</documentation>
-		</annotation>
-	</attribute>
-	<!-- =========================================================== -->
-	<attribute name="remoteSchema" type="anyURI">
-		<annotation>
-			<documentation>Reference to an XML Schema fragment that specifies the content model of the propertys value. This is in conformance with the XML Schema Section 4.14 Referencing Schemas from Elsewhere.</documentation>
-		</annotation>
-	</attribute>
-	<!-- =========================================================== -->
-	<attributeGroup name="AssociationAttributeGroup">
-		<annotation>
-			<documentation>Attribute group used to enable property elements to refer to their value remotely. It contains the simple link components from xlinks.xsd, with all members optional, and the remoteSchema attribute, which is also optional.  These attributes can be attached to any element, thus allowing it to act as a pointer. The 'remoteSchema' attribute allows an element  that carries link attributes to indicate that the element is declared  in a remote schema rather than by the schema  [...]
-		</annotation>
-		<attributeGroup ref="xlink:simpleAttrs"/>
-		<attribute ref="gml:remoteSchema" use="optional"/>
-	</attributeGroup>
-	<!-- =========================================================== -->
-	<element name="name" type="gml:CodeType">
-		<annotation>
-			<documentation>Label for the object, normally a descriptive name. An object may have several names, typically assigned by different authorities.  The authority for a name is indicated by the value of its (optional) codeSpace attribute.  The name may or may not be unique, as determined by the rules of the organization responsible for the codeSpace.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="description" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>Contains a simple text description of the object, or refers to an external description.</documentation>
-		</annotation>
-	</element>
-	<!-- ===================================================== -->
-	<complexType name="StringOrRefType">
-		<annotation>
-			<documentation>This type is available wherever there is a need for a "text" type property. It is of string type, so the text can be included inline, but the value can also be referenced remotely via xlinks from the AssociationAttributeGroup. If the remote reference is present, then the value obtained by traversing the link should be used, and the string content of the element can be used for an annotation.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ===================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/grids.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/grids.xsd
deleted file mode 100755
index eabaad7..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/grids.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:grids:3.1.1">grids.xsd</appinfo>
-		<documentation xml:lang="en">Grid geometries
-    A subset of implicit geometries
-    Designed for use with GML Coverage schema, but maybe useful elsewhere as well.
-    
-    GML is an OGC Standard.
-    Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<!-- ==============================================================
-       global elements
-	============================================================== -->
-	<element name="_ImplicitGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:_Geometry"/>
-	<!-- =========================================================== -->
-	<element name="Grid" type="gml:GridType" substitutionGroup="gml:_ImplicitGeometry"/>
-	<!-- =========================================================== -->
-	<complexType name="GridType">
-		<annotation>
-			<documentation>An unrectified grid, which is a network composed of two or more sets of equally spaced parallel lines in which the members of each set intersect the members of the other sets at right angles.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<sequence>
-					<element name="limits" type="gml:GridLimitsType"/>
-					<element name="axisName" type="string" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="dimension" type="positiveInteger" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="GridLimitsType">
-		<sequence>
-			<element name="GridEnvelope" type="gml:GridEnvelopeType"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="GridEnvelopeType">
-		<annotation>
-			<documentation>Provides grid coordinate values for the diametrically opposed corners of an envelope that bounds a section of grid. The value of a single coordinate is the number of offsets from the origin of the grid in the direction of a specific axis.</documentation>
-		</annotation>
-		<sequence>
-			<element name="low" type="gml:integerList"/>
-			<element name="high" type="gml:integerList"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="RectifiedGrid" type="gml:RectifiedGridType" substitutionGroup="gml:_ImplicitGeometry">
-		<annotation>
-			<documentation>Should be substitutionGroup="gml:Grid" but changed in order to accomplish Xerces-J schema validation</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="RectifiedGridType">
-		<annotation>
-			<documentation>A rectified grid has an origin and vectors that define its post locations.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:GridType">
-				<sequence>
-					<element name="origin" type="gml:PointPropertyType"/>
-					<element name="offsetVector" type="gml:VectorType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/measures.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/measures.xsd
deleted file mode 100755
index 833313e..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/measures.xsd
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1.1.2" xml:lang="en" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-measures:3.1.1"/>
-		<documentation>Extends the units.xsd and basicTypes.xsd schemas with types for recording measures using specific types of units, especially the measures and units needed for coordinate reference systems and coordinate operations. The specific unit types encoded are length, angle, scale factor, time, area, volume, speed, and grid length. This schema allows angle values to be recorded as single numbers or in degree-minute-second format. 
-		Parts of this schema are based on Subclause 6.5.7 of ISO/CD 19103 Geographic information - Conceptual schema language, on Subclause A.5.2.2.3 of ISO/CD 19118 Geographic information - Encoding, and on Subclause 4.7 of OpenGIS Recommendation Paper OGC 02-007r4 Units of Measure Use and Definition Recommendations.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="units.xsd"/>
-	<!-- ==============================================================
-       elements and types
-	============================================================== -->
-	<!-- This schema uses the gml:MeasureType defined in basicTypes.xsd with the modified meaning:
-			<documentation>Value of a quantity, with its units. This element uses the XML Schema primitive data type "double" because it supports both decimal and scientific notation, and thus offers flexibility and precision. However, there is no requirement to store values using any particular format, and applications receiving elements of this type may choose to coerce the data to any other type as convenient. The XML attribute uom references the units or scale by which the amount should be mu [...]
-	<!-- =========================================================== -->
-	<element name="measure" type="gml:MeasureType"/>
-	<!-- =========================================================== -->
-	<complexType name="LengthType">
-		<annotation>
-			<documentation>Value of a length (or distance) quantity, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a length, such as metres or feet.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="ScaleType">
-		<annotation>
-			<documentation>Value of a scale factor (or ratio) that has no physical unit. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a scale factor, such as percent, permil, or parts-per-million.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="TimeType">
-		<annotation>
-			<documentation>Value of a time or temporal quantity, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a time value, such as seconds or weeks.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="GridLengthType">
-		<annotation>
-			<documentation>Value of a length (or distance) quantity in a grid, where the grid spacing does not have any associated physical units, or does not have a constant physical spacing. This grid length will often be used in a digital image grid, where the base units are likely to be pixel spacings. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for length along the axes of a grid, such as pixel spacings or grid spacings.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="AreaType">
-		<annotation>
-			<documentation>Value of a spatial area quantity, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for an area, such as square metres or square miles.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="VolumeType">
-		<annotation>
-			<documentation>Value of a spatial volume quantity, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a volume, such as cubic metres or cubic feet.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="SpeedType">
-		<annotation>
-			<documentation>Value of a speed, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a velocity, such as metres per second or miles per hour.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="AngleChoiceType">
-		<annotation>
-			<documentation>Value of an angle quantity provided in either degree-minute-second format or single value format.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:angle"/>
-			<element ref="gml:dmsAngle"/>
-		</choice>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="angle" type="gml:MeasureType"/>
-	<!-- =========================================================== -->
-	<complexType name="AngleType">
-		<annotation>
-			<documentation>Value of an angle quantity recorded as a single number, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for an angle, such as degrees or radians.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="dmsAngle" type="gml:DMSAngleType"/>
-	<!-- =========================================================== -->
-	<complexType name="DMSAngleType">
-		<annotation>
-			<documentation>Angle value provided in degree-minute-second or degree-minute format.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:degrees"/>
-			<choice minOccurs="0">
-				<element ref="gml:decimalMinutes"/>
-				<sequence>
-					<element ref="gml:minutes"/>
-					<element ref="gml:seconds" minOccurs="0"/>
-				</sequence>
-			</choice>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="degrees" type="gml:DegreesType"/>
-	<!-- =========================================================== -->
-	<complexType name="DegreesType">
-		<annotation>
-			<documentation>Integer number of degrees, plus the angle direction. This element can be used for geographic Latitude and Longitude. For Latitude, the XML attribute direction can take the values "N" or "S", meaning North or South of the equator. For Longitude, direction can take the values "E" or "W", meaning East or West of the prime meridian. This element can also be used for other angles. In that case, the direction can take the values "+" or "-" (of SignType), in the specified rota [...]
-		</annotation>
-		<simpleContent>
-			<extension base="gml:DegreeValueType">
-				<attribute name="direction">
-					<simpleType>
-						<union>
-							<simpleType>
-								<restriction base="string">
-									<enumeration value="N"/>
-									<enumeration value="E"/>
-									<enumeration value="S"/>
-									<enumeration value="W"/>
-								</restriction>
-							</simpleType>
-							<simpleType>
-								<restriction base="gml:SignType"/>
-							</simpleType>
-						</union>
-					</simpleType>
-				</attribute>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="DegreeValueType">
-		<annotation>
-			<documentation>Integer number of degrees in a degree-minute-second or degree-minute angular value, without indication of direction.</documentation>
-		</annotation>
-		<restriction base="nonNegativeInteger">
-			<maxInclusive value="359"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<element name="decimalMinutes" type="gml:DecimalMinutesType"/>
-	<!-- =========================================================== -->
-	<simpleType name="DecimalMinutesType">
-		<annotation>
-			<documentation>Decimal number of arc-minutes in a degree-minute angular value.</documentation>
-		</annotation>
-		<restriction base="decimal">
-			<minInclusive value="0.00"/>
-			<maxExclusive value="60.00"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<element name="minutes" type="gml:ArcMinutesType"/>
-	<!-- =========================================================== -->
-	<simpleType name="ArcMinutesType">
-		<annotation>
-			<documentation>Integer number of arc-minutes in a degree-minute-second angular value.</documentation>
-		</annotation>
-		<restriction base="nonNegativeInteger">
-			<maxInclusive value="59"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-	<element name="seconds" type="gml:ArcSecondsType"/>
-	<!-- =========================================================== -->
-	<simpleType name="ArcSecondsType">
-		<annotation>
-			<documentation>Number of arc-seconds in a degree-minute-second angular value.</documentation>
-		</annotation>
-		<restriction base="decimal">
-			<minInclusive value="0.00"/>
-			<maxExclusive value="60.00"/>
-		</restriction>
-	</simpleType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/observation.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/observation.xsd
deleted file mode 100755
index b90a8b3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/observation.xsd
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:observation:3.1.1">observation.xsd</appinfo>
-		<documentation>Observation schema for GML 3.1
-			
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- =================================================================== -->
-	<!-- === includes and imports ============================================ -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="direction.xsd"/>
-	<include schemaLocation="valueObjects.xsd"/>
-	<!-- =================================================================== -->
-	<!-- =================== properties =================================== -->
-	<element name="using" type="gml:FeaturePropertyType">
-		<annotation>
-			<documentation>This element contains or points to a description of a sensor, instrument or procedure used for the observation</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================================== -->
-	<element name="target" type="gml:TargetPropertyType">
-		<annotation>
-			<documentation>This element contains or points to the specimen, region or station which is the object of the observation</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================================== -->
-	<element name="subject" type="gml:TargetPropertyType" substitutionGroup="gml:target">
-		<annotation>
-			<documentation>Synonym for target - common word used for photographs</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================================== -->
-	<complexType name="TargetPropertyType">
-		<annotation>
-			<documentation>Container for an object representing the target or subject of an observation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:_Feature"/>
-				<element ref="gml:_Geometry"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================================== -->
-	<element name="resultOf" type="gml:AssociationType">
-		<annotation>
-			<documentation>The result of the observation: an image, external object, etc</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================================== -->
-	<!-- ===================== Features =========================== -->
-	<element name="Observation" type="gml:ObservationType" substitutionGroup="gml:_Feature"/>
-	<!-- =========================================================== -->
-	<complexType name="ObservationType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:validTime"/>
-					<element ref="gml:using" minOccurs="0"/>
-					<element ref="gml:target" minOccurs="0"/>
-					<element ref="gml:resultOf"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="DirectedObservation" type="gml:DirectedObservationType" substitutionGroup="gml:Observation"/>
-	<!-- =========================================================== -->
-	<complexType name="DirectedObservationType">
-		<complexContent>
-			<extension base="gml:ObservationType">
-				<sequence>
-					<element ref="gml:direction"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="DirectedObservationAtDistance" type="gml:DirectedObservationAtDistanceType" substitutionGroup="gml:DirectedObservation"/>
-	<!-- =========================================================== -->
-	<complexType name="DirectedObservationAtDistanceType">
-		<complexContent>
-			<extension base="gml:DirectedObservationType">
-				<sequence>
-					<element name="distance" type="gml:MeasureType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/referenceSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/referenceSystems.xsd
deleted file mode 100755
index 8bee91d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/referenceSystems.xsd
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:referenceSystems:3.1.1"/>
-		<documentation>How to encode reference system definitions. Builds on several other parts of GML 3 to encode the data needed to define reference systems.
-		This schema encodes the Reference System (RS_) package of the extended UML Model for OGC Abstract Specification Topic 2: Spatial Referencing by Coordinates. That UML model is adapted from ISO 19111 - Spatial referencing by coordinates, as described in Annex C of Topic 2. The SC_CRS class is also encoded here, to eliminate the (circular) references from coordinateOperations.xsd to coordinateReferenceSystems.xsd. The RS_SpatialReferenceSystemUsingGeographicIdentifier class is not encoded [...]
-		Caution: The CRS package in GML 3.1 and GML 3.1.1 is preliminary, and is expected to undergo some modifications that are not backward compatible during the development of GML 3.2 (ISO 19136). The GML 3.2 package will implement the model described in the revised version of ISO 19111.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ======================================================
-       includes and imports
-	====================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic2d.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<!-- ======================================================
-       elements and types
-	====================================================== -->
-	<element name="_ReferenceSystem" type="gml:AbstractReferenceSystemType" abstract="true" substitutionGroup="gml:Definition"/>
-	<!-- =================================================== -->
-	<complexType name="AbstractReferenceSystemBaseType" abstract="true">
-		<annotation>
-			<documentation>Basic encoding for reference system objects, simplifying and restricting the DefinitionType as needed.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:srsName"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="srsName" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this reference system is identified.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="AbstractReferenceSystemType" abstract="true">
-		<annotation>
-			<documentation>Description of a spatial and/or temporal reference system used by a dataset.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractReferenceSystemBaseType">
-				<sequence>
-					<element ref="gml:srsID" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Set of alterative identifications of this reference system. The first srsID, if any, is normally the primary identification code, and any others are aliases.</documentation>
-						</annotation>
-					</element>
-					<element ref="gml:remarks" minOccurs="0">
-						<annotation>
-							<documentation>Comments on or information about this reference system, including source information.</documentation>
-						</annotation>
-					</element>
-					<element ref="gml:validArea" minOccurs="0"/>
-					<element ref="gml:scope" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="srsID" type="gml:IdentifierType">
-		<annotation>
-			<documentation>An identification of a reference system.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="referenceSystemRef" type="gml:ReferenceSystemRefType"/>
-	<!-- =================================================== -->
-	<complexType name="ReferenceSystemRefType">
-		<annotation>
-			<documentation>Association to a reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_ReferenceSystem"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="_CRS" type="gml:AbstractReferenceSystemType" abstract="true" substitutionGroup="gml:_ReferenceSystem">
-		<annotation>
-			<documentation>Abstract coordinate reference system, usually defined by a coordinate system and a datum. This abstract complexType shall not be used, extended, or restricted, in an Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="crsRef" type="gml:CRSRefType"/>
-	<!-- =================================================== -->
-	<complexType name="CRSRefType">
-		<annotation>
-			<documentation>Association to a CRS abstract coordinate reference system, either referencing or containing the definition of that CRS.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_CRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =================================================== -->
-	<!-- =================================================== -->
-	<complexType name="IdentifierType">
-		<annotation>
-			<documentation>An identification of a CRS object. The first use of the IdentifierType for an object, if any, is normally the primary identification code, and any others are aliases.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:name">
-				<annotation>
-					<documentation>The code or name for this Identifier, often from a controlled list or pattern defined by a code space. The optional codeSpace attribute is normally included to identify or reference a code space within which one or more codes are defined. This code space is often defined by some authority organization, where one organization may define multiple code spaces. The range and format of each Code Space identifier is defined by that code space authority. Information about th [...]
-				</annotation>
-			</element>
-			<element ref="gml:version" minOccurs="0"/>
-			<element ref="gml:remarks" minOccurs="0">
-				<annotation>
-					<documentation>Remarks about this code or alias.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="version" type="string">
-		<annotation>
-			<documentation>Identifier of the version of the associated codeSpace or code, as specified by the codeSpace or code authority. This version is included only when the "code" or "codeSpace" uses versions. When appropriate, the version is identified by the effective date, coded using ISO 8601 date format.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="remarks" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>Information about this object or code. Contains text or refers to external text.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="scope" type="string">
-		<annotation>
-			<documentation>Description of domain of usage, or limitations of usage, for which this CRS object is valid.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="validArea" type="gml:ExtentType">
-		<annotation>
-			<documentation>Area or region in which this CRS object is valid.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<complexType name="ExtentType">
-		<annotation>
-			<documentation>Information about the spatial, vertical, and/or temporal extent of a reference system object. Constraints: At least one of the elements "description", "boundingBox", "boundingPolygon", "verticalExtent", and temporalExtent" must be included, but more that one can be included when appropriate. Furthermore, more than one "boundingBox", "boundingPolygon", "verticalExtent", and/or temporalExtent" element can be included, with more than one meaning the union of the individual [...]
-		</annotation>
-		<sequence>
-			<element ref="gml:description" minOccurs="0">
-				<annotation>
-					<documentation>Description of spatial and/or temporal extent of this object.</documentation>
-				</annotation>
-			</element>
-			<choice>
-				<annotation>
-					<documentation>Geographic domain of this reference system object.</documentation>
-				</annotation>
-				<element ref="gml:boundingBox" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Unordered list of bounding boxes (or envelopes) whose union describes the spatial domain of this object.</documentation>
-					</annotation>
-				</element>
-				<element ref="gml:boundingPolygon" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Unordered list of bounding polygons whose union describes the spatial domain of this object.</documentation>
-					</annotation>
-				</element>
-			</choice>
-			<element ref="gml:verticalExtent" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Unordered list of vertical intervals whose union describes the spatial domain of this object.</documentation>
-				</annotation>
-			</element>
-			<element ref="gml:temporalExtent" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Unordered list of time periods whose union describes the spatial domain of this object.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- =================================================== -->
-	<element name="boundingBox" type="gml:EnvelopeType">
-		<annotation>
-			<documentation>A bounding box (or envelope) defining the spatial domain of this object.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="boundingPolygon" type="gml:PolygonType">
-		<annotation>
-			<documentation>A bounding polygon defining the horizontal spatial domain of this object.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="verticalExtent" type="gml:EnvelopeType">
-		<annotation>
-			<documentation>An interval defining the vertical spatial domain of this object.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-	<element name="temporalExtent" type="gml:TimePeriodType">
-		<annotation>
-			<documentation>A time period defining the temporal domain of this object.</documentation>
-		</annotation>
-	</element>
-	<!-- =================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporal.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporal.xsd
deleted file mode 100755
index 96be3f7..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporal.xsd
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:temporal:3.1.1"/>
-		<documentation xml:lang="en">The temporal schema for GML 3.1 provides constructs for handling time-varying spatial data. 
-    This schema reflects a partial implementation of the model described in ISO 19108:2002.
-    
-    GML is an OGC Standard.
-    Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ================================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="gmlBase.xsd"/>
-	<!-- ================================================================== -->
-	<!-- ==== Time Object ===== -->
-	<!-- ================================================================== -->
-	<element name="_TimeObject" type="gml:AbstractTimeObjectType" abstract="true" substitutionGroup="gml:_GML">
-		<annotation>
-			<documentation xml:lang="en">This abstract element acts as the head of the substitution group for temporal primitives and complexes.</documentation>
-		</annotation>
-	</element>
-	<!-- ===================================== -->
-	<complexType name="AbstractTimeObjectType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">The abstract supertype for temporal objects.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType"/>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ==== Time Primitive ===== -->
-	<!-- ================================================================== -->
-	<element name="_TimePrimitive" type="gml:AbstractTimePrimitiveType" abstract="true" substitutionGroup="gml:_TimeObject">
-		<annotation>
-			<documentation xml:lang="en">This abstract element acts as the head of the substitution group for temporal primitives.</documentation>
-		</annotation>
-	</element>
-	<!-- ===================================== -->
-	<complexType name="AbstractTimePrimitiveType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">The abstract supertype for temporal primitives.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType">
-				<sequence>
-					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimePrimitivePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:_TimePrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="RelatedTimeType">
-		<complexContent>
-			<extension base="gml:TimePrimitivePropertyType">
-				<attribute name="relativePosition">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="Before"/>
-							<enumeration value="After"/>
-							<enumeration value="Begins"/>
-							<enumeration value="Ends"/>
-							<enumeration value="During"/>
-							<enumeration value="Equals"/>
-							<enumeration value="Contains"/>
-							<enumeration value="Overlaps"/>
-							<enumeration value="Meets"/>
-							<enumeration value="OverlappedBy"/>
-							<enumeration value="MetBy"/>
-							<enumeration value="BegunBy"/>
-							<enumeration value="EndedBy"/>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ==== Time Complex ===== -->
-	<!-- ================================================================== -->
-	<element name="_TimeComplex" type="gml:AbstractTimeComplexType" abstract="true" substitutionGroup="gml:_TimeObject">
-		<annotation>
-			<documentation xml:lang="en">This abstract element acts as the head of the substitution group for temporal complexes. 
-			Temporal complex is an aggregation of temporal primitives as its components, 
-			represents a temporal geometric complex and a temporal topology complex. 
-			N.B. Temporal geometric complex is not defined in this schema.</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<complexType name="AbstractTimeComplexType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">The abstract supertype for temporal complexes.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType"/>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ==== Time Geometric Primitive ===== -->
-	<!-- ================================================================== -->
-	<element name="_TimeGeometricPrimitive" type="gml:AbstractTimeGeometricPrimitiveType" abstract="true" substitutionGroup="gml:_TimePrimitive">
-		<annotation>
-			<documentation xml:lang="en">This abstract element acts as the head of the substitution group for temporal geometric primitives.</documentation>
-		</annotation>
-	</element>
-	<!-- ===================================== -->
-	<complexType name="AbstractTimeGeometricPrimitiveType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">The abstract supertype for temporal geometric primitives.
-       A temporal geometry must be associated with a temporal reference system via URI. 
-       The Gregorian calendar with UTC is the default reference system, following ISO 
-       8601. Other reference systems in common use include the GPS calendar and the 
-       Julian calendar.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimePrimitiveType">
-				<attribute name="frame" type="anyURI" use="optional" default="#ISO-8601"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeGeometricPrimitivePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:_TimeGeometricPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ==== Time Instant ===== -->
-	<!-- ================================================================== -->
-	<element name="TimeInstant" type="gml:TimeInstantType" substitutionGroup="gml:_TimeGeometricPrimitive"/>
-	<!-- ===================================== -->
-	<complexType name="TimeInstantType">
-		<annotation>
-			<documentation>Omit back-pointers begunBy, endedBy.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeGeometricPrimitiveType">
-				<sequence>
-					<element ref="gml:timePosition"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeInstantPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TimeInstant"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ==== Time Period ===== -->
-	<!-- ================================================================== -->
-	<element name="TimePeriod" type="gml:TimePeriodType" substitutionGroup="gml:_TimeGeometricPrimitive"/>
-	<!-- ===================================== -->
-	<complexType name="TimePeriodType">
-		<complexContent>
-			<extension base="gml:AbstractTimeGeometricPrimitiveType">
-				<sequence>
-					<choice>
-						<element name="beginPosition" type="gml:TimePositionType"/>
-						<element name="begin" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<choice>
-						<element name="endPosition" type="gml:TimePositionType"/>
-						<element name="end" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<group ref="gml:timeLength" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimePeriodPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TimePeriod"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ==== duration & interval ===== -->
-	<!-- ================================================================== -->
-	<group name="timeLength">
-		<annotation>
-			<documentation>This model group is provided as an alternative to the abstract susbstitutionGroup head _timeLength.
-		ISO 19136 comment 411</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:duration"/>
-			<element ref="gml:timeInterval"/>
-		</choice>
-	</group>
-	<!-- ================================================================== -->
-	<element name="duration" type="duration">
-		<annotation>
-			<documentation xml:lang="en">This element is an instance of the primitive xsd:duration simple type to 
-      enable use of the ISO 8601 syntax for temporal length (e.g. P5DT4H30M). 
-      It is a valid subtype of TimeDurationType according to section 3.14.6, 
-      rule 2.2.4 in XML Schema, Part 1.</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<element name="timeInterval" type="gml:TimeIntervalLengthType">
-		<annotation>
-			<documentation>This element is a valid subtype of TimeDurationType 
-			according to section 3.14.6, rule 2.2.4 in XML Schema, Part 1.</documentation>
-		</annotation>
-	</element>
-	<!-- ===================================== -->
-	<complexType name="TimeIntervalLengthType" final="#all">
-		<annotation>
-			<documentation xml:lang="en">This type extends the built-in xsd:decimal simple type to allow floating-point 
-      values for temporal length. According to  the ISO 11404 model you have to use 
-      positiveInteger together with appropriate values for radix and factor. The 
-      resolution of the time interval is to one radix ^(-factor) of the specified 
-      time unit (e.g. unit="second", radix="10", factor="3" specifies a resolution 
-      of milliseconds). It is a subtype of TimeDurationType.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="decimal">
-				<attribute name="unit" type="gml:TimeUnitType" use="required"/>
-				<attribute name="radix" type="positiveInteger" use="optional"/>
-				<attribute name="factor" type="integer" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<simpleType name="TimeUnitType">
-		<annotation>
-			<documentation xml:lang="en">Standard units for measuring time intervals (see ISO 31-1).</documentation>
-		</annotation>
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="year"/>
-					<enumeration value="day"/>
-					<enumeration value="hour"/>
-					<enumeration value="minute"/>
-					<enumeration value="second"/>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<!-- ================================================================== -->
-	<!-- ==== Time Position ===== -->
-	<!-- ================================================================== -->
-	<element name="timePosition" type="gml:TimePositionType">
-		<annotation>
-			<documentation>Direct representation of a temporal position</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<complexType name="TimePositionType" final="#all">
-		<annotation>
-			<documentation xml:lang="en">Direct representation of a temporal position. 
-      Indeterminate time values are also allowed, as described in ISO 19108. The indeterminatePosition 
-      attribute can be used alone or it can qualify a specific value for temporal position (e.g. before 
-      2002-12, after 1019624400). 
-      For time values that identify position within a calendar, the calendarEraName attribute provides 
-      the name of the calendar era to which the date is referenced (e.g. the Meiji era of the Japanese calendar).</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:TimePositionUnion">
-				<attribute name="frame" type="anyURI" use="optional" default="#ISO-8601"/>
-				<attribute name="calendarEraName" type="string" use="optional"/>
-				<attribute name="indeterminatePosition" type="gml:TimeIndeterminateValueType" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<simpleType name="TimePositionUnion">
-		<annotation>
-			<documentation xml:lang="en">The ISO 19108:2002 hierarchy of subtypes for temporal position are collapsed 
-      by defining a union of XML Schema simple types for indicating temporal position relative 
-      to a specific reference system. 
-      
-      Dates and dateTime may be indicated with varying degrees of precision.  
-      dateTime by itself does not allow right-truncation, except for fractions of seconds. 
-      When used with non-Gregorian calendars based on years, months, days, 
-      the same lexical representation should still be used, with leading zeros added if the 
-      year value would otherwise have fewer than four digits.  
-      
-      An ordinal position may be referenced via URI identifying the definition of an ordinal era.  
-      
-      A time coordinate value is indicated as a decimal (e.g. UNIX time, GPS calendar).</documentation>
-		</annotation>
-		<union memberTypes="gml:CalDate time dateTime anyURI decimal"/>
-	</simpleType>
-	<!-- ================================================================== -->
-	<simpleType name="CalDate">
-		<annotation>
-			<documentation xml:lang="en">Calendar dates may be indicated with varying degrees of precision, 
-      using year, year-month, date. 
-      When used with non-Gregorian calendars based on years, months, days, 
-      the same lexical representation should still be used, with leading zeros added if the 
-      year value would otherwise have fewer than four digits.  
-      time is used for a position that recurs daily (see clause 5.4.4.2 of ISO 19108:2002).</documentation>
-		</annotation>
-		<union memberTypes="date gYearMonth gYear"/>
-	</simpleType>
-	<!-- ================================================================== -->
-	<simpleType name="TimeIndeterminateValueType">
-		<annotation>
-			<documentation xml:lang="en">This enumerated data type specifies values for indeterminate positions.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="after"/>
-			<enumeration value="before"/>
-			<enumeration value="now"/>
-			<enumeration value="unknown"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================================== -->
-	<!-- ==== Convenience properties ==== -->
-	<!-- ================================================================== -->
-	<element name="validTime" type="gml:TimePrimitivePropertyType"/>
-	<!-- ===================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporalReferenceSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporalReferenceSystems.xsd
deleted file mode 100755
index d9a8f88..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporalReferenceSystems.xsd
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:temporalReferenceSystems:3.1.1"/>
-		<documentation xml:lang="en">The Temporal Reference Systems schema for GML 3.1 provides constructs for handling various styles of temporal reference system. 
-    This schema reflects a partial implementation of the model described in ISO 19108:2002.
-    
-    GML is an OGC Standard.
-    Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ================================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="temporalTopology.xsd"/>
-	<include schemaLocation="dictionary.xsd"/>
-	<!-- ================================================================== -->
-	<!-- == Time Reference System == -->
-	<!-- ================================================================== -->
-	<element name="_TimeReferenceSystem" type="gml:AbstractTimeReferenceSystemType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>Abstract element serves primarily as the head of a substitution group for temporal reference systems.</documentation>
-		</annotation>
-	</element>
-	<!-- ===================================== -->
-	<complexType name="AbstractTimeReferenceSystemType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">A value in the time domain is measured relative to a temporal reference system. Common 
-        types of reference systems include calendars, ordinal temporal reference systems, and 
-        temporal coordinate systems (time elapsed since some epoch, e.g. UNIX time).</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="domainOfValidity" type="string" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- == Time Coordinate System == -->
-	<!-- ================================================================== -->
-	<element name="TimeCoordinateSystem" type="gml:TimeCoordinateSystemType" substitutionGroup="gml:_TimeReferenceSystem"/>
-	<!-- ===================================== -->
-	<complexType name="TimeCoordinateSystemType">
-		<annotation>
-			<documentation xml:lang="en">A temporal coordinate system is based on a continuous interval scale defined in terms of a single time interval.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeReferenceSystemType">
-				<sequence>
-					<choice>
-						<element name="originPosition" type="gml:TimePositionType"/>
-						<element name="origin" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<element name="interval" type="gml:TimeIntervalLengthType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- == Time Ordinal System == -->
-	<!-- ================================================================== -->
-	<element name="TimeOrdinalReferenceSystem" type="gml:TimeOrdinalReferenceSystemType" substitutionGroup="gml:_TimeReferenceSystem"/>
-	<!-- ===================================== -->
-	<complexType name="TimeOrdinalReferenceSystemType">
-		<annotation>
-			<documentation xml:lang="en">In an ordinal reference system the order of events in time can be well 
-      established, but the magnitude of the intervals between them can not be 
-      accurately determined (e.g. a stratigraphic sequence).</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeReferenceSystemType">
-				<sequence>
-					<element name="component" type="gml:TimeOrdinalEraPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<element name="TimeOrdinalEra" type="gml:TimeOrdinalEraType"/>
-	<!-- ===================================== -->
-	<complexType name="TimeOrdinalEraType">
-		<annotation>
-			<documentation xml:lang="en">Ordinal temporal reference systems are often hierarchically structured 
-      such that an ordinal era at a given level of the hierarchy includes a 
-      sequence of shorter, coterminous ordinal eras. This captured using the member/group properties.  
-      
-      Note that in this schema, TIme Ordinal Era is patterned on TimeEdge, which is a variation from ISO 19108.  
-      This is in order to fulfill the requirements of ordinal reference systems based on eras delimited by 
-      named points or nodes, which are common in geology, archeology, etc.  
-      
-      This change is subject of a change proposal to ISO</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="start" type="gml:TimeNodePropertyType"/>
-					<element name="end" type="gml:TimeNodePropertyType"/>
-					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
-					<element name="member" type="gml:TimeOrdinalEraPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>An Era may be composed of several member Eras. The "member" element implements the association to the Era at the next level down the hierarchy.  "member" follows the standard GML property pattern whereby its (complex) value may be either described fully inline, or may be the target of a link carried on the member element and described fully elsewhere, either in the same document or from another service.</documentation>
-						</annotation>
-					</element>
-					<element name="group" type="gml:ReferenceType" minOccurs="0">
-						<annotation>
-							<documentation>In a particular Time System, an Era may be a member of a group.  The "group" element implements the back-pointer to the Era at the next level up in the hierarchy. 
-
-If the hierarchy is represented by describing the nested components fully in the their nested position inside "member" elements, then the parent can be easily inferred, so the group property is unnecessary.  
-
-However, if the hierarchy is represented by links carried on the "member" property elements, pointing to Eras described fully elsewhere, then it may be useful for a child (member) era to carry an explicit pointer back to its parent (group) Era.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeOrdinalEraPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TimeOrdinalEra"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- == Calendar == -->
-	<!-- ================================================================== -->
-	<element name="TimeCalendar" type="gml:TimeCalendarType" substitutionGroup="gml:_TimeReferenceSystem"/>
-	<!-- ===================================== -->
-	<complexType name="TimeCalendarType">
-		<annotation>
-			<documentation xml:lang="en">A calendar is a discrete temporal reference system 
-      that provides a basis for defining temporal position to a resolution of one day. 
-      A single calendar may reference more than one calendar era.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeReferenceSystemType">
-				<sequence>
-					<element name="referenceFrame" type="gml:TimeCalendarEraPropertyType" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Link to the CalendarEras that it uses as a reference for dating.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeCalendarPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCalendar"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<element name="TimeCalendarEra" type="gml:TimeCalendarEraType" substitutionGroup="gml:Definition"/>
-	<!-- ===================================== -->
-	<complexType name="TimeCalendarEraType">
-		<annotation>
-			<documentation xml:lang="en">In every calendar, years are numbered relative to the date of a 
-      reference event that defines a calendar era. 
-      In this implementation, we omit the back-pointer "datingSystem".</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="referenceEvent" type="gml:StringOrRefType">
-						<annotation>
-							<documentation>Name or description of a mythical or historic event which fixes the position of the base scale of the calendar era.</documentation>
-						</annotation>
-					</element>
-					<element name="referenceDate" type="date" default="0001-01-01" minOccurs="0">
-						<annotation>
-							<documentation>Date of the referenceEvent expressed as a date in the given calendar. 
-              In most calendars, this date is the origin (i.e., the first day) of the scale, but this is not always true.</documentation>
-						</annotation>
-					</element>
-					<element name="julianReference" type="decimal">
-						<annotation>
-							<documentation>Julian date that corresponds to the reference date.  
-              The Julian day numbering system is a temporal coordinate system that has an 
-              origin earlier than any known calendar, 
-              at noon on 1 January 4713 BC in the Julian proleptic calendar.  
-              The Julian day number is an integer value; 
-              the Julian date is a decimal value that allows greater resolution. 
-              Transforming calendar dates to and from Julian dates provides a 
-              relatively simple basis for transforming dates from one calendar to another.</documentation>
-						</annotation>
-					</element>
-					<element name="epochOfUse" type="gml:TimePeriodPropertyType">
-						<annotation>
-							<documentation>Period for which the calendar era was used as a basis for dating.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeCalendarEraPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCalendarEra"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- == Clock == -->
-	<!-- ================================================================== -->
-	<element name="TimeClock" type="gml:TimeClockType" substitutionGroup="gml:_TimeReferenceSystem"/>
-	<!-- ===================================== -->
-	<complexType name="TimeClockType" final="#all">
-		<annotation>
-			<documentation xml:lang="en">A clock provides a basis for defining temporal position within a day. 
-      A clock must be used with a calendar in order to provide a complete description of a temporal position 
-      within a specific day.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeReferenceSystemType">
-				<sequence>
-					<element name="referenceEvent" type="gml:StringOrRefType">
-						<annotation>
-							<documentation>Name or description of an event, such as solar noon or sunrise, 
-              which fixes the position of the base scale of the clock.</documentation>
-						</annotation>
-					</element>
-					<element name="referenceTime" type="time">
-						<annotation>
-							<documentation>time of day associated with the reference event expressed as 
-              a time of day in the given clock. The reference time is usually the origin of the clock scale.</documentation>
-						</annotation>
-					</element>
-					<element name="utcReference" type="time">
-						<annotation>
-							<documentation>24 hour local or UTC time that corresponds to the reference time.</documentation>
-						</annotation>
-					</element>
-					<element name="dateBasis" type="gml:TimeCalendarPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeClockPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TimeClock"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporalTopology.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporalTopology.xsd
deleted file mode 100755
index 8049faa..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/temporalTopology.xsd
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:temporalTopology:3.1.1"/>
-		<documentation xml:lang="en">The temporal topology schema for ISO19136 provides constructs for handling topological complexes and 
-		temporal feature relationships. 
-		Temporal geometric characteristics of features are represented as instants and periods. 
-		While, temporal context of features that does not relate to the position of time is described as connectivity relationships 
-		among instants and periods. These relationships are called temporal topology as they do not change in time, 
-		as long as the direction of time does not change. 
-		It is used effectively in the case of describing a family tree expressing evolution of species, an ecological cycle, 
-		a lineage of lands or buildings, or a history of separation and merger of administrative boundaries.
-		This schema reflects a partial yet consistent implementation of the model described in ISO 19108:2002.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ===================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<!-- ===================================== -->
-	<!-- ================================================================== -->
-	<!-- == TimeTopologyComplex == -->
-	<!-- ================================================================== -->
-	<element name="TimeTopologyComplex" type="gml:TimeTopologyComplexType" substitutionGroup="gml:_TimeComplex">
-		<annotation>
-			<documentation xml:lang="en">This element represents temporal topology complex. It shall be the connected acyclic directed graph composed of time nodes and time edges.</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<complexType name="TimeTopologyComplexType">
-		<annotation>
-			<documentation xml:lang="en">A temporal topology complex.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeComplexType">
-				<sequence>
-					<element name="primitive" type="gml:TimeTopologyPrimitivePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeTopologyComplexPropertyType">
-		<annotation>
-			<documentation>A time topology complex property can either be any time topology complex element
-			 encapsulated in an element of this type or an XLink reference to a remote time topology complex element 
-			 (where remote includes elements located elsewhere in the same document). 
-			 Note that either the reference or the contained element must be given, but not both or none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeTopologyComplex"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!--  == TimeTopologyPrimitive == -->
-	<!-- ================================================================== -->
-	<element name="_TimeTopologyPrimitive" type="gml:AbstractTimeTopologyPrimitiveType" abstract="true" substitutionGroup="gml:_TimePrimitive">
-		<annotation>
-			<documentation xml:lang="en">This abstract element acts as the head of the substitution group for temporal topology primitives.</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<complexType name="AbstractTimeTopologyPrimitiveType" abstract="true">
-		<annotation>
-			<documentation xml:lang="en">The element "complex" carries a reference to the complex containing this primitive.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimePrimitiveType">
-				<sequence>
-					<element name="complex" type="gml:ReferenceType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeTopologyPrimitivePropertyType">
-		<annotation>
-			<documentation>A time topology primitive property can either hold any time topology complex element
-			 eor carry an XLink reference to a remote time topology complex element 
-			 (where remote includes elements located elsewhere in the same document). 
-			 Note that either the reference or the contained element must be given, but not both or none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_TimeTopologyPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!--  ======= TimeNode ======= -->
-	<!-- ================================================================== -->
-	<element name="TimeNode" type="gml:TimeNodeType" substitutionGroup="gml:_TimeTopologyPrimitive">
-		<annotation>
-			<documentation xml:lang="en">"TimeNode" is a zero dimensional temporal topology primitive, 
-			expresses a position in topological time, and is a start and an end of time edge, which represents states of time.
-			Time node may be isolated. However, it cannot describe the ordering relationships with other primitives. 
-			An isolated node may not be an element of any temporal topology complex.</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<complexType name="TimeNodeType">
-		<annotation>
-			<documentation xml:lang="en">Type declaration of the element "TimeNode".</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeTopologyPrimitiveType">
-				<sequence>
-					<element name="previousEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="nextEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="position" type="gml:TimeInstantPropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeNodePropertyType">
-		<annotation>
-			<documentation>A time node property can either be any time node element encapsulated in an element of this type 
-			or an XLink reference to a remote time node element (where remote includes elements located elsewhere in the same document). 
-			Note that either the reference or the contained element must be given, but not both or none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeNode"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!--  ======= TimeEdge ======= -->
-	<!-- ================================================================== -->
-	<element name="TimeEdge" type="gml:TimeEdgeType" substitutionGroup="gml:_TimeTopologyPrimitive">
-		<annotation>
-			<documentation xml:lang="en">TimeEdge is one dimensional temporal topology primitive,
-			 expresses a state in topological time. It has an orientation from its start toward the end, 
-			 and its boundaries shall associate with two different time nodes.</documentation>
-		</annotation>
-	</element>
-	<!-- ================================================================== -->
-	<complexType name="TimeEdgeType">
-		<annotation>
-			<documentation xml:lang="en">Type declaration of the element "TimeEdge".</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeTopologyPrimitiveType">
-				<sequence>
-					<element name="start" type="gml:TimeNodePropertyType"/>
-					<element name="end" type="gml:TimeNodePropertyType"/>
-					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeEdgePropertyType">
-		<annotation>
-			<documentation>A time edge property can either be any time edge element encapsulated in an element of this type 
-			or an XLink reference to a remote time edge element (where remote includes elements located elsewhere in the same document). 
-			Note that either the reference or the contained element must be given, but not both or none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeEdge"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ===       Succession        === -->
-	<!-- ================================================================== -->
-	<simpleType name="SuccessionType">
-		<annotation>
-			<documentation>Feature succession is a semantic relationship derived from evaluation of observer, and 
-			Feature Substitution, Feature Division and Feature Fusion are defined as associations between 
-			previous features and next features in the temporal context. 
-			Successions shall be represented in either following two ways. 
-			* define a temporal topological complex element as a feature element 
-			* define an association same as temporal topological complex between features.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="substitution"/>
-			<enumeration value="division"/>
-			<enumeration value="fusion"/>
-			<enumeration value="initiation"/>
-		</restriction>
-	</simpleType>
-	<!-- ================================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/topology.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/topology.xsd
deleted file mode 100755
index 2f3caec..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/topology.xsd
+++ /dev/null
@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" elementFormDefault="qualified" version="3.1.1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/2001/XMLSchema">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:topology:3.1.1">topology.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryComplexes.xsd"/>
-	<!-- ==============================================================
-       abstract supertype for topology objects
-        =============================================================== -->
-	<!-- ========================================================== -->
-	<element name="_Topology" type="gml:AbstractTopologyType" abstract="true" substitutionGroup="gml:_GML"/>
-	<!-- ========================================================== -->
-	<complexType name="AbstractTopologyType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGMLType"/>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="_TopoPrimitive" type="gml:AbstractTopoPrimitiveType" abstract="true" substitutionGroup="gml:_Topology">
-		<annotation>
-			<documentation>Substitution group branch for Topo Primitives, used by TopoPrimitiveArrayAssociationType</documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<complexType name="AbstractTopoPrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTopologyType">
-				<sequence>
-					<element ref="gml:isolated" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:container" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="isolated" type="gml:IsolatedPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:isolated">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<complexType name="IsolatedPropertyType">
-		<choice minOccurs="0">
-			<element ref="gml:Node"/>
-			<element ref="gml:Edge"/>
-		</choice>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="container" type="gml:ContainerPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:containerProperty">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<complexType name="ContainerPropertyType">
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:Face"/>
-				<element ref="gml:TopoSolid"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- primitive topology objects -->
-	<!-- ========================================================== -->
-	<element name="Node" type="gml:NodeType" substitutionGroup="gml:_TopoPrimitive"/>
-	<!-- =========================================================== -->
-	<complexType name="NodeType">
-		<annotation>
-			<documentation>Its optional co-boundary is a set of connected directedEdges.  The orientation of one of these dirEdges is "+" if the Node is the "to" node of the Edge, and "-" if it is the "from" node.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopoPrimitiveType">
-				<sequence>
-					<element ref="gml:directedEdge" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:pointProperty" minOccurs="0"/>
-					<!-- <element name="geometry" type="gml:PointPropertyType" minOccurs="0"/> -->
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===== Property for topology association - by Value or by Reference ===== -->
-	<element name="directedNode" type="gml:DirectedNodePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:directedNode">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="DirectedNodePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Node"/>
-		</sequence>
-		<attribute name="orientation" type="gml:SignType" default="+"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- primitive topology objects (1-dimensional) -->
-	<!-- ========================================================== -->
-	<element name="Edge" type="gml:EdgeType" substitutionGroup="gml:_TopoPrimitive"/>
-	<!-- ========================================================== -->
-	<complexType name="EdgeType">
-		<annotation>
-			<documentation>There is precisely one positively directed and one negatively directed node in the boundary of every edge. The negatively and positively directed nodes correspond to the start and end nodes respectively. The optional coboundary of an edge is a circular sequence of directed faces which are incident on this edge in document order. Faces which use a particular boundary edge in its positive orientation appear with positive orientation on the coboundary of the same edge. In  [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopoPrimitiveType">
-				<sequence>
-					<element ref="gml:directedNode" minOccurs="2" maxOccurs="2"/>
-					<element ref="gml:directedFace" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:curveProperty" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===== Property for topology association - by Value or by Reference ===== -->
-	<element name="directedEdge" type="gml:DirectedEdgePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:directedEdge">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="DirectedEdgePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Edge"/>
-		</sequence>
-		<attribute name="orientation" type="gml:SignType" default="+"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- primitive topology objects (2-dimensional) -->
-	<!-- ========================================================== -->
-	<element name="Face" type="gml:FaceType" substitutionGroup="gml:_TopoPrimitive"/>
-	<!-- ========================================================== -->
-	<complexType name="FaceType">
-		<annotation>
-			<documentation>. The topological boundary of a face consists of a set of directed edges. Note that all edges associated with a Face, including dangling and interior edges, appear in the boundary.  Dangling and interior edges are each referenced by pairs of directedEdges with opposing orientations.  The optional coboundary of a face is a pair of directed solids which are bounded by this face. If present, there is precisely one positively directed and one negatively directed solid in th [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopoPrimitiveType">
-				<sequence>
-					<element ref="gml:directedEdge" maxOccurs="unbounded"/>
-					<element ref="gml:directedTopoSolid" minOccurs="0" maxOccurs="2"/>
-					<element ref="gml:surfaceProperty" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===== Property for topology association - by Value or by Reference ===== -->
-	<element name="directedFace" type="gml:DirectedFacePropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:directedFace">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="DirectedFacePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Face"/>
-		</sequence>
-		<attribute name="orientation" type="gml:SignType" default="+"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- primitive topology objects (3-dimensional) -->
-	<!-- ========================================================== -->
-	<element name="TopoSolid" type="gml:TopoSolidType" substitutionGroup="gml:_TopoPrimitive"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoSolidType">
-		<annotation>
-			<documentation>The topological boundary of a TopoSolid consists of a set of directed faces. Note that all faces associated with the TopoSolid, including dangling faces, appear in the boundary. The coboundary of a TopoSolid is empty and hence requires no representation.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopoPrimitiveType">
-				<sequence>
-					<element ref="gml:directedFace" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ===== Property for topology association - by Value or by Reference ===== -->
-	<element name="directedTopoSolid" type="gml:DirectedTopoSolidPropertyType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:directedTopoSolid">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ============================================================= -->
-	<complexType name="DirectedTopoSolidPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:TopoSolid"/>
-		</sequence>
-		<attribute name="orientation" type="gml:SignType" default="+"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="TopoPoint" type="gml:TopoPointType"/>
-	<!-- ========================================================== -->
-	<complexType name="TopoPointType">
-		<annotation>
-			<documentation>The intended use of TopoPoint is to appear within a point feature to express the structural and possibly geometric relationships of this point to other features via shared node definitions. Note the orientation assigned to the directedNode has no meaning in this context. It is preserved for symmetry with the types and elements which follow.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopologyType">
-				<sequence>
-					<element ref="gml:directedNode"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ============================================================= -->
-	<!-- ===== Property for topology association - by Value  ===== -->
-	<element name="topoPointProperty" type="gml:TopoPointPropertyType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoPointPropertyType">
-		<sequence>
-			<element ref="gml:TopoPoint"/>
-		</sequence>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ========================================================== -->
-	<element name="TopoCurve" type="gml:TopoCurveType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoCurveType">
-		<annotation>
-			<documentation>The end Node of each directedEdge of a TopoCurveType
-is the start Node of the next directedEdge of the TopoCurveType in document order.  The TopoCurve type and element represent a homogeneous topological expression, a list of directed edges, which if realised are isomorphic to a geometric curve primitive. The intended use of TopoCurve is to appear within a line feature instance to express the structural and geometric relationships of this line to other features via the shared edge definitions.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopologyType">
-				<sequence>
-					<element ref="gml:directedEdge" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ===== Property for topology association - by Value ===== -->
-	<element name="topoCurveProperty" type="gml:TopoCurvePropertyType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoCurvePropertyType">
-		<sequence>
-			<element ref="gml:TopoCurve"/>
-		</sequence>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ========================================================== -->
-	<element name="TopoSurface" type="gml:TopoSurfaceType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoSurfaceType">
-		<annotation>
-			<documentation>The TopoSurface type and element represent a homogeneous topological expression, a set of directed faces, which if realised are isomorphic to a geometric surface primitive. The intended use of TopoSurface is to appear within a surface feature instance to express the structural and possibly geometric relationships of this surface to other features via the shared face definitions.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopologyType">
-				<sequence>
-					<element ref="gml:directedFace" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ===== Property for topology association - by Value ===== -->
-	<element name="topoSurfaceProperty" type="gml:TopoSurfacePropertyType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoSurfacePropertyType">
-		<sequence>
-			<element ref="gml:TopoSurface"/>
-		</sequence>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="TopoVolume" type="gml:TopoVolumeType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoVolumeType">
-		<annotation>
-			<documentation>The TopoVolume type and element represent a homogeneous topological expression, a set of directed TopoSolids, which if realised are isomorphic to a geometric solid primitive. The intended use of TopoVolume is to appear within a 3D solid feature instance to express the structural and geometric relationships of this solid to other features via the shared TopoSolid definitions.  . Note the orientation assigned to the directedSolid has no meaning in three dimensions. It is  [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopologyType">
-				<sequence>
-					<element ref="gml:directedTopoSolid" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ===== Property for topology association - by Value  ===== -->
-	<element name="topoVolumeProperty" type="gml:TopoVolumePropertyType"/>
-	<!-- ============================================================= -->
-	<complexType name="TopoVolumePropertyType">
-		<sequence>
-			<element ref="gml:TopoVolume"/>
-		</sequence>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ========================================================== -->
-	<element name="TopoComplex" type="gml:TopoComplexType" substitutionGroup="gml:_Topology"/>
-	<!-- ========================================================== -->
-	<complexType name="TopoComplexType">
-		<annotation>
-			<documentation>This type represents a TP_Complex capable of holding topological primitives.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTopologyType">
-				<sequence>
-					<element ref="gml:maximalComplex"/>
-					<element ref="gml:superComplex" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:subComplex" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:topoPrimitiveMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:topoPrimitiveMembers" minOccurs="0"/>
-				</sequence>
-				<attribute name="isMaximal" type="boolean" default="false"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===== Property for topology association - by Value or Reference ===== -->
-	<element name="topoComplexProperty" type="gml:TopoComplexMemberType"/>
-	<!-- ========================================================== -->
-	<element name="subComplex" type="gml:TopoComplexMemberType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:subComplex">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="superComplex" type="gml:TopoComplexMemberType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:superComplex">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="maximalComplex" type="gml:TopoComplexMemberType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:subComplex">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>Need schamatron test here that isMaximal attribute value is true</documentation>
-		</annotation>
-	</element>
-	<!-- ============================================================= -->
-	<complexType name="TopoComplexMemberType">
-		<annotation>
-			<documentation>This Property can be used to embed a TopoComplex in a feature collection.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:TopoComplex" minOccurs="0"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ===== Property for topology association - by Value or Reference ===== -->
-	<element name="topoPrimitiveMember" type="gml:TopoPrimitiveMemberType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:topoPrimitiveMember">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ============================================================= -->
-	<complexType name="TopoPrimitiveMemberType">
-		<annotation>
-			<documentation>This type supports embedding topological primitives in a TopoComplex.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:_TopoPrimitive" minOccurs="0"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<!-- ===== Property for topology association - by Value ===== -->
-	<element name="topoPrimitiveMembers" type="gml:TopoPrimitiveArrayAssociationType">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="refAndContent co-occurence prohibited">
-					<sch:rule context="gml:topoPrimitiveMember">
-						<sch:extends rule="hrefOrContent"/>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<complexType name="TopoPrimitiveArrayAssociationType">
-		<annotation>
-			<documentation>This type supports embedding an array of topological primitives in a TopoComplex</documentation>
-		</annotation>
-		<!--		<complexContent>
-			<restriction base="gml:ArrayAssociationType">  -->
-		<sequence>
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element ref="gml:_TopoPrimitive"/>
-			</choice>
-		</sequence>
-		<!-- 			</restriction>
-		</complexContent> -->
-	</complexType>
-	<!-- ========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/units.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/units.xsd
deleted file mode 100755
index c676a7d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/units.xsd
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.1.1.2" xml:lang="en">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-units:3.1.1"/>
-		<documentation>Builds on gmlBase.xsd to encode units of measure (or uom), including definitions of units of measure and dictionaries of such definitions. GML 3.0 candidate schema, primary editor: Arliss Whiteside.			
-	Parts of this schema are based on Subclause 6.5.7 of ISO/CD 19103 Geographic information - Conceptual schema language, on Subclause A.5.2.2.3 of ISO/CD 19118 Geographic information - Encoding, and on most of OpenGIS Recommendation Paper OGC 02-007r4 Units of Measure Use and Definition Recommendations.
-		
-		GML is an OGC Standard.
-		Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-       includes and imports
-	============================================================== -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="dictionary.xsd"/>
-	<!-- ==============================================================
-       elements and types
-	============================================================== -->
-	<element name="unitOfMeasure" type="gml:UnitOfMeasureType"/>
-	<!-- =========================================================== -->
-	<complexType name="UnitOfMeasureType">
-		<annotation>
-			<documentation>Reference to a unit of measure definition that applies to all the numerical values described by the element containing this element. Notice that a complexType which needs to include the uom attribute can do so by extending this complexType. Alternately, this complexType can be used as a pattern for a new complexType.</documentation>
-		</annotation>
-		<sequence/>
-		<attribute name="uom" type="anyURI" use="required">
-			<annotation>
-				<documentation>Reference to a unit of measure definition, usually within the same XML document but possibly outside the XML document which contains this reference. For a reference within the same XML document, the "#" symbol should be used, followed by a text abbreviation of the unit name. However, the "#" symbol may be optional, and still may be interpreted as a reference.</documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="UnitDefinition" type="gml:UnitDefinitionType" substitutionGroup="gml:Definition"/>
-	<!-- =========================================================== -->
-	<complexType name="UnitDefinitionType">
-		<annotation>
-			<documentation>Definition of a unit of measure (or uom). The definition includes a quantityType property, which indicates the phenomenon to which the units apply, and a catalogSymbol, which gives the short symbol used for this unit. This element is used when the relationship of this unit to other units or units systems is unknown.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:quantityType"/>
-					<element ref="gml:catalogSymbol" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="BaseUnit" type="gml:BaseUnitType" substitutionGroup="gml:UnitDefinition"/>
-	<!-- =========================================================== -->
-	<complexType name="BaseUnitType">
-		<annotation>
-			<documentation>Definition of a unit of measure which is a base unit from the system of units.  A base unit cannot be derived by combination of other base units within this system.  Sometimes known as "fundamental unit".</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<element name="unitsSystem" type="gml:ReferenceType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="DerivedUnit" type="gml:DerivedUnitType" substitutionGroup="gml:UnitDefinition"/>
-	<!-- ============================================================ -->
-	<complexType name="DerivedUnitType">
-		<annotation>
-			<documentation>Definition of a unit of measure which is defined through algebraic combination of more primitive units, which are usually base units from a particular system of units. Derived units based directly on base units are usually preferred for quantities other than the base units or fundamental quantities within a system.  If a derived unit is not the preferred unit, the ConventionalUnit element should be used instead.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<element ref="gml:derivationUnitTerm" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="ConventionalUnit" type="gml:ConventionalUnitType" substitutionGroup="gml:UnitDefinition"/>
-	<!-- =========================================================== -->
-	<complexType name="ConventionalUnitType">
-		<annotation>
-			<documentation>Definition of a unit of measure which is related to a preferred unit for this quantity type through a conversion formula.  A method for deriving this unit by algebraic combination of more primitive units, may also be provided.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<choice>
-						<element ref="gml:conversionToPreferredUnit"/>
-						<element ref="gml:roughConversionToPreferredUnit"/>
-					</choice>
-					<element ref="gml:derivationUnitTerm" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="quantityType" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>Informal description of the phenomenon or type of quantity that is measured or observed. For example, "length", "angle", "time", "pressure", or "temperature". When the quantity is the result of an observation or measurement, this term is known as Observable Type or Measurand.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="catalogSymbol" type="gml:CodeType">
-		<annotation>
-			<documentation>For global understanding of a unit of measure, it is often possible to reference an item in a catalog of units, using a symbol in that catalog. The "codeSpace" attribute in "CodeType" identifies a namespace for the catalog symbol value, and might reference the catalog. The "string" value in "CodeType" contains the value of a symbol that is unique within this catalog namespace. This symbol often appears explicitly in the catalog, but it could be a combination of symbols  [...]
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="derivationUnitTerm" type="gml:DerivationUnitTermType"/>
-	<!-- =========================================================== -->
-	<complexType name="DerivationUnitTermType">
-		<annotation>
-			<documentation>Definition of one unit term for a derived unit of measure. This unit term references another unit of measure (uom) and provides an integer exponent applied to that unit in defining the compound unit. The exponent can be positive or negative, but not zero.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitOfMeasureType">
-				<attribute name="exponent" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="conversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>This element is included when this unit has an accurate conversion to the preferred unit for this quantity type.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="roughConversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>This element is included when the correct definition of this unit is unknown, but this unit has a rough or inaccurate conversion to the preferred unit for this quantity type.</documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>Relation of a unit to the preferred unit for this quantity type, specified by an arithmetic conversion (scaling and/or offset). A preferred unit is either a base unit or a derived unit selected for all units of one quantity type. The mandatory attribute "uom" shall reference the preferred unit that this conversion applies to. The conversion is specified by one of two alternative elements: "factor" or "formula".</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitOfMeasureType">
-				<choice>
-					<element name="factor" type="double">
-						<annotation>
-							<documentation>Specification of the scale factor by which a value using this unit of measure can be multiplied to obtain the corresponding value using the preferred unit of measure.</documentation>
-						</annotation>
-					</element>
-					<element name="formula" type="gml:FormulaType">
-						<annotation>
-							<documentation>Specification of the formula by which a value using this unit of measure can be converted to obtain the corresponding value using the preferred unit of measure.</documentation>
-						</annotation>
-					</element>
-				</choice>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="FormulaType">
-		<annotation>
-			<documentation>Paremeters of a simple formula by which a value using this unit of measure can be converted to the corresponding value using the preferred unit of measure. The formula element contains elements a, b, c and d, whose values use the XML Schema type "double". These values are used in the formula y = (a + bx) / (c + dx), where x is a value using this unit, and y is the corresponding value using the preferred unit. The elements a and d are optional, and if values are not prov [...]
-		</annotation>
-		<sequence>
-			<element name="a" type="double" minOccurs="0"/>
-			<element name="b" type="double"/>
-			<element name="c" type="double"/>
-			<element name="d" type="double" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/valueObjects.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/valueObjects.xsd
deleted file mode 100755
index 4ec0e72..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/base/valueObjects.xsd
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-        attributeFormDefault="unqualified" version="3.1.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:valueObjects:3.1.1">valueObjects.xsd</appinfo>
-		<documentation>GML conformant schema for Values in which the  
-		    * scalar Value types and lists have their values recorded in simpleContent elements 
-		    * complex Value types are built recursively
-		    
-		    GML is an OGC Standard.
-		    Copyright (c) 2001,2005,2010 Open Geospatial Consortium.
-		    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- geometry and temporal included so that _Geometry and _TimeObject can be added to Value choice group -->
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<!-- ====================================================================== -->
-	<group name="Value">
-		<annotation>
-			<documentation>Utility choice group which unifies generic Values defined in this schema document with 
-			Geometry and Temporal objects and the Measures described above, 
-			so that any of these may be used within aggregate Values.</documentation>
-		</annotation>
-		<choice>
-			<!-- <element ref="gml:_Value"/> -->
-			<group ref="gml:ValueObject"/>
-			<element ref="gml:_Object"/>
-			<!--			<element ref="gml:_Geometry"/>
-			<element ref="gml:_TimeObject"/> -->
-			<element ref="gml:Null"/>
-		</choice>
-	</group>
-	<!-- ====================================================================== -->
-	<group name="ValueObject">
-		<choice>
-			<group ref="gml:ScalarValue"/>
-			<group ref="gml:ScalarValueList"/>
-			<group ref="gml:ValueExtent"/>
-			<element ref="gml:CompositeValue"/>
-		</choice>
-	</group>
-	<!-- ======================================================================
-	<element name="_Value" abstract="true" substitutionGroup="gml:_Object">
-		<annotation>
-			<documentation>Abstract element which acts as the head of a substitution group which contains _ScalarValue, _ScalarValueList and CompositeValue and (transitively) the elements in their substitution groups.  This element may be used in an application schema as a variable, so that in an XML instance document any member of its substitution group may occur.</documentation>
-		</annotation>
-	</element> -->
-	<!-- ====================================================================== -->
-	<!-- ================== Scalar Values =========================
-	<element name="_ScalarValue" abstract="true" substitutionGroup="gml:_Value">
-		<annotation>
-			<documentation>Abstract element which acts as the head of a substitution group which contains Boolean, Category, Count and Quantity, and (transitively) the elements in their substitution groups.  This element may be used in an application schema as a variable, so that in an XML instance document any member of its substitution group may occur.</documentation>
-		</annotation>
-	</element> -->
-	<group name="ScalarValue">
-		<choice>
-			<element ref="gml:Boolean"/>
-			<element ref="gml:Category"/>
-			<element ref="gml:Quantity"/>
-			<element ref="gml:Count"/>
-		</choice>
-	</group>
-	<!-- ======================================================================
-	<element name="_ScalarValueList" abstract="true" substitutionGroup="gml:_Value">
-		<annotation>
-			<documentation>Abstract element which acts as the head of a substitution group which contains the compact encodings BooleanList, CategoryList, CountList and QuantityList, and (transitively) the elements in their substitution groups.  This element may be used in an application schema as a variable, so that in an XML instance document any member of its substitution group may occur.</documentation>
-		</annotation>
-	</element> -->
-	<group name="ScalarValueList">
-		<choice>
-			<element ref="gml:BooleanList"/>
-			<element ref="gml:CategoryList"/>
-			<element ref="gml:QuantityList"/>
-			<element ref="gml:CountList"/>
-		</choice>
-	</group>
-	<!-- ====================================================================== -->
-	<!-- ======================= Boolean ========================
-	<element name="Boolean" type="boolean" substitutionGroup="gml:_ScalarValue"> -->
-	<element name="Boolean" type="boolean">
-		<annotation>
-			<documentation>A value from two-valued logic, using the XML Schema boolean type.  An instance may take the values {true, false, 1, 0}.</documentation>
-		</annotation>
-	</element>
-	<!--
-	<element name="BooleanList" type="gml:booleanOrNullList" substitutionGroup="gml:_ScalarValueList"> -->
-	<element name="BooleanList" type="gml:booleanOrNullList">
-		<annotation>
-			<documentation>XML List based on XML Schema boolean type.  An element of this type contains a space-separated list of boolean values {0,1,true,false}</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- ======================= Category ==========================
-	<element name="Category" type="gml:CodeType" substitutionGroup="gml:_ScalarValue"> -->
-	<element name="Category" type="gml:CodeType">
-		<annotation>
-			<documentation>A term representing a classification.  It has an optional XML attribute codeSpace, whose value is a URI which identifies a dictionary, codelist or authority for the term.</documentation>
-		</annotation>
-	</element>
-	<!--
-	<element name="CategoryList" type="gml:CodeOrNullListType" substitutionGroup="gml:_ScalarValueList"> -->
-	<element name="CategoryList" type="gml:CodeOrNullListType">
-		<annotation>
-			<documentation>A space-separated list of terms or nulls.  A single XML attribute codeSpace may be provided, which authorises all the terms in the list.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- =========================== Quantity ============================
-	<element name="Quantity" type="gml:MeasureType" substitutionGroup="gml:_ScalarValue"> -->
-	<element name="Quantity" type="gml:MeasureType">
-		<annotation>
-			<documentation>A numeric value with a scale.  The content of the element is an amount using the XML Schema type double which permits decimal or scientific notation.  An XML attribute uom (unit of measure) is required, whose value is a URI which identifies the definition of the scale or units by which the numeric value must be multiplied.</documentation>
-		</annotation>
-	</element>
-	<!--
-	<element name="QuantityList" type="gml:MeasureOrNullListType" substitutionGroup="gml:_ScalarValueList"> -->
-	<element name="QuantityList" type="gml:MeasureOrNullListType">
-		<annotation>
-			<documentation>A space separated list of amounts or nulls.  The amounts use the XML Schema type double.  A single XML attribute uom (unit of measure) is required, whose value is a URI which identifies the definition of the scale or units by which all the amounts in the list must be multiplied.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- ========================== Count ==========================
-	<element name="Count" type="integer" substitutionGroup="gml:_ScalarValue"> -->
-	<element name="Count" type="integer">
-		<annotation>
-			<documentation>An integer representing a frequency of occurrence.</documentation>
-		</annotation>
-	</element>
-	<!--
-	<element name="CountList" type="gml:integerOrNullList" substitutionGroup="gml:_ScalarValueList"> -->
-	<element name="CountList" type="gml:integerOrNullList">
-		<annotation>
-			<documentation>A space-separated list of integers or nulls.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!--                    aggregate Value types                      -->
-	<!-- ====================================================================== -->
-	<!-- ===================== ValueCollection ========================== -->
-	<complexType name="CompositeValueType">
-		<annotation>
-			<documentation>Aggregate value built from other Values using the Composite pattern. It contains zero or an arbitrary number of valueComponent elements, and zero or one valueComponents elements.  It may be used for strongly coupled aggregates (vectors, tensors) or for arbitrary collections of values.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:valueComponent" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:valueComponents" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- <element name="CompositeValue" type="gml:CompositeValueType" substitutionGroup="gml:_Value"> -->
-	<element name="CompositeValue" type="gml:CompositeValueType">
-		<annotation>
-			<documentation>Aggregate value built using the Composite pattern.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- ========================= ValueArray ========================== -->
-	<complexType name="ValueArrayType">
-		<annotation>
-			<documentation>A Value Array is used for homogeneous arrays of primitive and aggregate values.  The member values may be scalars, composites, arrays or lists.  ValueArray has the same content model as CompositeValue, but the member values must be homogeneous.  The element declaration contains a Schematron constraint which expresses this restriction precisely.            Since the members are homogeneous, the referenceSystem (uom, codeSpace) may be specified on the ValueArray itself an [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:CompositeValueType">
-				<attributeGroup ref="gml:referenceSystem"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- -->
-	<element name="ValueArray" type="gml:ValueArrayType" substitutionGroup="gml:CompositeValue">
-		<annotation>
-			<appinfo>
-				<sch:pattern name="Check either codeSpace or uom not both">
-					<sch:rule context="gml:ValueArray">
-						<sch:report test="@codeSpace and @uom">ValueArray may not carry both a reference to a codeSpace and a uom</sch:report>
-					</sch:rule>
-				</sch:pattern>
-				<sch:pattern name="Check components are homogeneous">
-					<sch:rule context="gml:ValueArray">
-						<sch:assert test="count(gml:valueComponent/*) = count(gml:valueComponent/*[name() = name(../../gml:valueComponent[1]/*[1])])">All components of <sch:name/> must be of the same type</sch:assert>
-						<sch:assert test="count(gml:valueComponents/*) = count(gml:valueComponents/*[name() = name(../*[1])])">All components of <sch:name/> must be of the same type</sch:assert>
-					</sch:rule>
-				</sch:pattern>
-			</appinfo>
-			<documentation>A Value Array is used for homogeneous arrays of primitive and aggregate values.   _ScalarValueList is preferred for arrays of Scalar Values since this is more efficient.  Since "choice" is not available for attribute groups, an external constraint (e.g. Schematron) would be required to enforce the selection of only one of these through schema validation</documentation>
-		</annotation>
-	</element>
-	<!-- attribute group required for ValueArray -->
-	<attributeGroup name="referenceSystem">
-		<attribute name="codeSpace" type="anyURI" use="optional"/>
-		<attribute name="uom" type="anyURI" use="optional"/>
-	</attributeGroup>
-	<!-- ====================================================================== -->
-	<!-- ====================== Typed ValueExtents ============================ -->
-	<group name="ValueExtent">
-		<choice>
-			<element ref="gml:CategoryExtent"/>
-			<element ref="gml:QuantityExtent"/>
-			<element ref="gml:CountExtent"/>
-		</choice>
-	</group>
-	<!-- ======================================================================
-	<element name="QuantityExtent" type="gml:QuantityExtentType" substitutionGroup="gml:_Value"> -->
-	<element name="QuantityExtent" type="gml:QuantityExtentType">
-		<annotation>
-			<documentation>Utility element to store a 2-point range of numeric values. If one member is a null, then this is a single ended interval.</documentation>
-		</annotation>
-	</element>
-	<!-- -->
-	<complexType name="QuantityExtentType">
-		<annotation>
-			<documentation>Restriction of list type to store a 2-point range of numeric values. If one member is a null, then this is a single ended interval.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:MeasureOrNullListType">
-				<length value="2"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<!-- ======================================================================
-	<element name="CategoryExtent" type="gml:CategoryExtentType" substitutionGroup="gml:_Value"> -->
-	<element name="CategoryExtent" type="gml:CategoryExtentType">
-		<annotation>
-			<documentation>Utility element to store a 2-point range of ordinal values. If one member is a null, then this is a single ended interval.</documentation>
-		</annotation>
-	</element>
-	<!-- -->
-	<complexType name="CategoryExtentType">
-		<annotation>
-			<documentation>Restriction of list type to store a 2-point range of ordinal values. If one member is a null, then this is a single ended interval.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:CodeOrNullListType">
-				<length value="2"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<!-- ======================================================================
-	<element name="CountExtent" type="gml:CountExtentType" substitutionGroup="gml:_Value"> -->
-	<element name="CountExtent" type="gml:CountExtentType">
-		<annotation>
-			<documentation>Utility element to store a 2-point range of frequency values. If one member is a null, then this is a single ended interval.</documentation>
-		</annotation>
-	</element>
-	<!-- -->
-	<simpleType name="CountExtentType">
-		<annotation>
-			<documentation>Restriction of list type to store a 2-point range of frequency values. If one member is a null, then this is a single ended interval.</documentation>
-		</annotation>
-		<restriction base="gml:integerOrNullList">
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<!-- ====================================================================== -->
-	<!-- ===================== pieces needed for compositing ==================== -->
-	<element name="valueProperty" type="gml:ValuePropertyType">
-		<annotation>
-			<documentation>Element which refers to, or contains, a Value</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<element name="valueComponent" type="gml:ValuePropertyType">
-		<annotation>
-			<documentation>Element which refers to, or contains, a Value.  This version is used in CompositeValues.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<complexType name="ValuePropertyType">
-		<annotation>
-			<documentation>GML property which refers to, or contains, a Value</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<group ref="gml:Value"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<element name="valueComponents" type="gml:ValueArrayPropertyType">
-		<annotation>
-			<documentation>Element which refers to, or contains, a set of homogeneously typed Values.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<complexType name="ValueArrayPropertyType">
-		<annotation>
-			<documentation>GML property which refers to, or contains, a set of homogeneously typed Values.</documentation>
-		</annotation>
-		<sequence>
-			<group ref="gml:Value" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- ====================== utility typed valueProperty types ===================  -->
-	<complexType name="ScalarValuePropertyType">
-		<annotation>
-			<documentation>Property whose content is a scalar value.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ValuePropertyType">
-				<sequence minOccurs="0">
-					<!-- <element ref="gml:_ScalarValue"/> -->
-					<group ref="gml:ScalarValue"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="BooleanPropertyType">
-		<annotation>
-			<documentation>Property whose content is a Boolean value.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ValuePropertyType">
-				<sequence minOccurs="0">
-					<element ref="gml:Boolean"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="CategoryPropertyType">
-		<annotation>
-			<documentation>Property whose content is a Category.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ValuePropertyType">
-				<sequence minOccurs="0">
-					<element ref="gml:Category"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="QuantityPropertyType">
-		<annotation>
-			<documentation>Property whose content is a Quantity.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ValuePropertyType">
-				<sequence minOccurs="0">
-					<element ref="gml:Quantity"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="CountPropertyType">
-		<annotation>
-			<documentation>Property whose content is a Count.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:ValuePropertyType">
-				<sequence minOccurs="0">
-					<element ref="gml:Count"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ====================================================================== -->
-</schema>
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/smil/smil20-language.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/smil/smil20-language.xsd
deleted file mode 100755
index 6608c90..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/smil/smil20-language.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-=================== OpenGIS ============================  
-	This schema is here because there are errors in publicly available smil schemas at w3c site.
-	One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
- 	http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
- 	under:
-	E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
-	Others (at least one) are assumed after failed validation using Visual Studio .NET.
-	These smil schemas are reorganized to include in minimum number of files all and only definitions required by
-	defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
-	When w3c fixes the public schemas these will be discarded 
-	comment: Milan Trninic, Galdos Systems Inc., May 2002
-=================== OpenGIS ============================ 
--->
-<!--
-XML Schema for the SMIL 2.0 Language
-
-This is SMIL 2.0
-Copyright: 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/.
-
-Public URI: http://www.w3.org/2001/SMIL20/smil20-language.xsd
-Author: Aaron Michael Cohen (Intel)
-
-Revision: 2001/07/15
-
-Note: <any> wildcard element content is missing from most of the SMIL 2.0 elements because of a conflict 
-between substitutionGroups and wildcard content.
--->
-<schema targetNamespace="http://www.w3.org/2001/SMIL20/Language" xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language" xmlns:smil20="http://www.w3.org/2001/SMIL20/" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<!-- import the smil20 namespaces -->
-	<import namespace="http://www.w3.org/2001/SMIL20/" schemaLocation="smil20.xsd"/>
-	<element name="animate" type="smil20lang:animateType"/>
-	<complexType name="animateType">
-		<complexContent>
-			<extension base="smil20:animatePrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:animModeAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<attributeGroup name="CoreAttrs">
-		<attributeGroup ref="smil20:structureModuleAttrs"/>
-		<attributeGroup ref="smil20:alternateContentAttrs"/>
-	</attributeGroup>
-	<attributeGroup name="TimingAttrs">
-		<attributeGroup ref="smil20lang:BasicTimingAttrs"/>
-		<attributeGroup ref="smil20:syncBehaviorAttrs"/>
-		<attributeGroup ref="smil20:syncBehaviorDefaultAttrs"/>
-		<attributeGroup ref="smil20:restartTimingAttrs"/>
-		<attributeGroup ref="smil20:restartDefaultAttrs"/>
-		<attributeGroup ref="smil20:fillTimingAttrs"/>
-		<attributeGroup ref="smil20:fillDefaultAttrs"/>
-	</attributeGroup>
-	<attributeGroup name="BasicTimingAttrs">
-		<attributeGroup ref="smil20:beginEndTimingAttrs"/>
-		<attributeGroup ref="smil20:durTimingAttrs"/>
-		<attributeGroup ref="smil20:repeatTimingAttrs"/>
-		<attributeGroup ref="smil20:deprecatedRepeatTiming"/>
-		<attributeGroup ref="smil20:minMaxTimingAttrs"/>
-	</attributeGroup>
-	<element name="animateMotion" type="smil20lang:animateMotionType"/>
-	<complexType name="animateMotionType">
-		<complexContent>
-			<extension base="smil20:animateMotionPrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:animModeAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="animateColor" type="smil20lang:animateColorType"/>
-	<complexType name="animateColorType">
-		<complexContent>
-			<extension base="smil20:animateColorPrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:animModeAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="set" type="smil20lang:setType"/>
-	<complexType name="setType">
-		<complexContent>
-			<extension base="smil20:setPrototype">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<any namespace="##other" processContents="lax"/>
-				</choice>
-				<attributeGroup ref="smil20lang:CoreAttrs"/>
-				<attributeGroup ref="smil20lang:TimingAttrs"/>
-				<attributeGroup ref="smil20:animTargetAttrs"/>
-				<attributeGroup ref="smil20:skipContentAttrs"/>
-				<anyAttribute namespace="##any" processContents="strict"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/smil/smil20.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/smil/smil20.xsd
deleted file mode 100755
index 293f89a..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.1.1/smil/smil20.xsd
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-=================== OpenGIS ============================  
-	This schema is here because there are errors in publicly available smil schemas at w3c site.
-	One is acknowledged by w3c - it is typographical error described in SMIL errata document at:
- 	http://www.w3.org/2001/07/REC-SMIL20-20010731-errata
- 	under:
-	E30: Correction in the SMIL 2.0 utility Schema, section B.3.48 (revised 29 03 2002)
-	Others (at least one) are assumed after failed validation using Visual Studio .NET.
-	These smil schemas are reorganized to include in minimum number of files all and only definitions required by
-	defaultStyle.xsd. It was done to enable the validation of GML3.0 schemas.
-	When w3c fixes the public schemas these will be discarded 
-	comment: Milan Trninic, Galdos Systems Inc., May 2002
-	
-	comment#2: Milan Trninic, Galdos Systems Inc., Dec 2002
-	In order to validate with xerces, changed the "x:" prefix to "xml:" in the namespace declaration and reference to "lang" attribute
-=================== OpenGIS ============================ 
--->
-<!--
-XML Schema for the SMIL 2.0 modules
-
-This is SMIL 2.0
-Copyright: 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/.
-
-Public URI: http://www.w3.org/2001/SMIL20/smil20.xsd
-Author: Aaron Michael Cohen (Intel)
-Revision: 2001/07/31
--->
-<schema targetNamespace="http://www.w3.org/2001/SMIL20/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:smil20="http://www.w3.org/2001/SMIL20/" xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language" elementFormDefault="qualified">
-	<import namespace="http://www.w3.org/2001/SMIL20/Language" schemaLocation="smil20-language.xsd"/>
-	<!-- ============================================================= 
-	struct.xsd
-	============================================================== -->
-	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	<attributeGroup name="structureModuleAttrs">
-		<attribute name="id" type="ID" use="optional"/>
-		<attribute name="class" type="string" use="optional"/>
-		<attribute ref="xml:lang" use="optional"/>
-	</attributeGroup>
-	<!-- ============================================================= 
-	content.xsd
-	============================================================== -->
-	<attributeGroup name="skipContentAttrs">
-		<attribute name="skip-content" type="boolean" use="optional" default="true"/>
-	</attributeGroup>
-	<!-- ============================================================= 
-	media.xsd
-	============================================================== -->
-	<attributeGroup name="alternateContentAttrs">
-		<attribute name="alt" type="string" use="optional"/>
-		<attribute name="longdesc" type="anyURI" use="optional"/>
-	</attributeGroup>
-	<!-- ============================================================= 
-	utility.xsd
-	============================================================== -->
-	<simpleType name="nonNegativeDecimalType">
-		<restriction base="decimal">
-			<minInclusive value="0.0"/>
-		</restriction>
-	</simpleType>
-	<!-- ============================================================= 
-	animate.xsd
-	============================================================== -->
-	<element name="animate" type="smil20lang:animateType" substitutionGroup="smil20lang:animate"/>
-	<complexType name="animatePrototype">
-		<attributeGroup ref="smil20:animNamedTargetAttrs"/>
-		<attributeGroup ref="smil20:animAddAccumAttrs"/>
-		<attributeGroup ref="smil20:animValuesAttrs"/>
-	</complexType>
-	<attributeGroup name="animNamedTargetAttrs">
-		<attribute name="attributeName" type="string" use="required"/>
-		<attribute name="attributeType" use="optional" default="auto">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="XML"/>
-					<enumeration value="CSS"/>
-					<enumeration value="auto"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</attributeGroup>
-	<attributeGroup name="animAddAccumAttrs">
-		<attribute name="additive" use="optional" default="replace">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="replace"/>
-					<enumeration value="sum"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="accumulate" use="optional" default="none">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="none"/>
-					<enumeration value="sum"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</attributeGroup>
-	<attributeGroup name="animValuesAttrs">
-		<attributeGroup ref="smil20:animSetValuesAttrs"/>
-		<attribute name="from" type="string" use="optional"/>
-		<attribute name="by" type="string" use="optional"/>
-		<attribute name="values" type="string" use="optional"/>
-	</attributeGroup>
-	<attributeGroup name="animSetValuesAttrs">
-		<attribute name="to" type="string" use="optional"/>
-	</attributeGroup>
-	<attributeGroup name="animTargetAttrs">
-		<attribute name="targetElement" type="IDREF" use="optional"/>
-	</attributeGroup>
-	<attributeGroup name="animModeAttrs">
-		<attribute name="calcMode" use="optional" default="linear">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="discrete"/>
-					<enumeration value="linear"/>
-					<enumeration value="paced"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</attributeGroup>
-	<element name="animateMotion" type="smil20lang:animateMotionType" substitutionGroup="smil20lang:animateMotion"/>
-	<complexType name="animateMotionPrototype">
-		<attributeGroup ref="smil20:animAddAccumAttrs"/>
-		<attributeGroup ref="smil20:animValuesAttrs"/>
-		<attribute name="origin" type="string" use="optional"/>
-	</complexType>
-	<element name="animateColor" type="smil20lang:animateColorType" substitutionGroup="smil20lang:animateColor"/>
-	<complexType name="animateColorPrototype">
-		<attributeGroup ref="smil20:animNamedTargetAttrs"/>
-		<attributeGroup ref="smil20:animAddAccumAttrs"/>
-		<attributeGroup ref="smil20:animValuesAttrs"/>
-	</complexType>
-	<element name="set" type="smil20lang:setType" substitutionGroup="smil20lang:set"/>
-	<complexType name="setPrototype">
-		<attributeGroup ref="smil20:animNamedTargetAttrs"/>
-		<attributeGroup ref="smil20:animSetValuesAttrs"/>
-	</complexType>
-	<!-- ============================================================= 
-	timing.xsd
-	============================================================== -->
-	<attributeGroup name="syncBehaviorAttrs">
-		<attribute name="syncBehavior" type="smil20:syncBehaviorType" default="default"/>
-		<attribute name="syncTolerance" type="string" use="optional"/>
-	</attributeGroup>
-	<simpleType name="syncBehaviorType">
-		<restriction base="string">
-			<enumeration value="canSlip"/>
-			<enumeration value="locked"/>
-			<enumeration value="independent"/>
-			<enumeration value="default"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="syncBehaviorDefaultAttrs">
-		<attribute name="syncBehaviorDefault" type="smil20:syncBehaviorDefaultType" default="inherit"/>
-		<attribute name="syncToleranceDefault" type="string" default="inherit"/>
-	</attributeGroup>
-	<simpleType name="syncBehaviorDefaultType">
-		<restriction base="string">
-			<enumeration value="canSlip"/>
-			<enumeration value="locked"/>
-			<enumeration value="independent"/>
-			<enumeration value="inherit"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="restartTimingAttrs">
-		<attribute name="restart" type="smil20:restartTimingType" default="default"/>
-	</attributeGroup>
-	<simpleType name="restartTimingType">
-		<restriction base="string">
-			<enumeration value="never"/>
-			<enumeration value="always"/>
-			<enumeration value="whenNotActive"/>
-			<enumeration value="default"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="restartDefaultAttrs">
-		<attribute name="restartDefault" type="smil20:restartDefaultType" default="inherit"/>
-	</attributeGroup>
-	<simpleType name="restartDefaultType">
-		<restriction base="string">
-			<enumeration value="never"/>
-			<enumeration value="always"/>
-			<enumeration value="whenNotActive"/>
-			<enumeration value="inherit"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="fillTimingAttrs">
-		<attribute name="fill" type="smil20:fillTimingAttrsType" default="default"/>
-	</attributeGroup>
-	<simpleType name="fillTimingAttrsType">
-		<restriction base="string">
-			<enumeration value="remove"/>
-			<enumeration value="freeze"/>
-			<enumeration value="hold"/>
-			<enumeration value="auto"/>
-			<enumeration value="default"/>
-			<enumeration value="transition"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="fillDefaultAttrs">
-		<attribute name="fillDefault" type="smil20:fillDefaultType" default="inherit"/>
-	</attributeGroup>
-	<simpleType name="fillDefaultType">
-		<restriction base="string">
-			<enumeration value="remove"/>
-			<enumeration value="freeze"/>
-			<enumeration value="hold"/>
-			<enumeration value="auto"/>
-			<enumeration value="inherit"/>
-			<enumeration value="transition"/>
-		</restriction>
-	</simpleType>
-	<attributeGroup name="beginEndTimingAttrs">
-		<attribute name="begin" type="string"/>
-		<attribute name="end" type="string"/>
-	</attributeGroup>
-	<attributeGroup name="durTimingAttrs">
-		<attribute name="dur" type="string"/>
-	</attributeGroup>
-	<attributeGroup name="repeatTimingAttrs">
-		<attribute name="repeatDur" type="string"/>
-		<attribute name="repeatCount" type="smil20:nonNegativeDecimalType"/>
-	</attributeGroup>
-	<attributeGroup name="deprecatedRepeatTiming">
-		<attribute name="repeat" type="nonNegativeInteger"/>
-	</attributeGroup>
-	<attributeGroup name="minMaxTimingAttrs">
-		<attribute name="min" type="string"/>
-		<attribute name="max" type="string"/>
-	</attributeGroup>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/basicTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/basicTypes.xsd
deleted file mode 100755
index d6ffd5f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/basicTypes.xsd
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:basicTypes:3.2.1">basicTypes.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 8.2.
-W3C XML Schema provides a set of built-in "simple" types which define methods for representing values as literals without internal markup.  These are described in W3C XML Schema Part 2:2001.  Because GML is an XML encoding in which instances are described using XML Schema, these simple types shall be used as far as possible and practical for the representation of data types.  W3C XML Schema also provides methods for defining 
--	new simple types by restriction and combination of the built-in types, and 
--	complex types, with simple content, but which also have XML attributes.  
-In many places where a suitable built-in simple type is not available, simple content types derived using the XML Schema mechanisms are used for the representation of data types in GML.  
-A set of these simple content types that are required by several GML components are defined in the basicTypes schema, as well as some elements based on them. These are primarily based around components needed to record amounts, counts, flags and terms, together with support for exceptions or null values.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<simpleType name="NilReasonType">
-		<annotation>
-			<documentation>gml:NilReasonType defines a content model that allows recording of an explanation for a void value or other exception.
-gml:NilReasonType is a union of the following enumerated values:
--	inapplicable there is no value
--	missing the correct value is not readily available to the sender of this data. Furthermore, a correct value may not exist
--	template the value will be available later
--	unknown the correct value is not known to, and not computable by, the sender of this data. However, a correct value probably exists
--	withheld the value is not divulged
--	other:text other brief explanation, where text is a string of two or more characters with no included spaces
-and
--	anyURI which should refer to a resource which describes the reason for the exception
-A particular community may choose to assign more detailed semantics to the standard values provided. Alternatively, the URI method enables a specific or more complete explanation for the absence of a value to be provided elsewhere and indicated by-reference in an instance document.
-gml:NilReasonType is used as a member of a union in a number of simple content types where it is necessary to permit a value from the NilReasonType union as an alternative to the primary type.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration anyURI"/>
-	</simpleType>
-	<simpleType name="NilReasonEnumeration">
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="inapplicable"/>
-					<enumeration value="missing"/>
-					<enumeration value="template"/>
-					<enumeration value="unknown"/>
-					<enumeration value="withheld"/>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<simpleType name="SignType">
-		<annotation>
-			<documentation>gml:SignType is a convenience type with values "+" (plus) and "-" (minus).</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="-"/>
-			<enumeration value="+"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="booleanOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration boolean anyURI"/>
-	</simpleType>
-	<simpleType name="doubleOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration double anyURI"/>
-	</simpleType>
-	<simpleType name="integerOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration integer anyURI"/>
-	</simpleType>
-	<simpleType name="NameOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration Name anyURI"/>
-	</simpleType>
-	<simpleType name="stringOrNilReason">
-		<annotation>
-			<documentation>Extension to the respective XML Schema built-in simple type to allow a choice of either a value of the built-in simple type or a reason for a nil value.</documentation>
-		</annotation>
-		<union memberTypes="gml:NilReasonEnumeration string anyURI"/>
-	</simpleType>
-	<complexType name="CodeType">
-		<annotation>
-			<documentation>gml:CodeType is a generalized type to be used for a term, keyword or name.
-It adds a XML attribute codeSpace to a term, where the value of the codeSpace attribute (if present) shall indicate a dictionary, thesaurus, classification scheme, authority, or pattern for the term.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="codeSpace" type="anyURI"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:CodeWithAuthorityType requires that the codeSpace attribute is provided in an instance.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:CodeType">
-				<attribute name="codeSpace" type="anyURI" use="required"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<complexType name="MeasureType">
-		<annotation>
-			<documentation>gml:MeasureType supports recording an amount encoded as a value of XML Schema double, together with a units of measure indicated by an attribute uom, short for "units Of measure". The value of the uom attribute identifies a reference system for the amount, usually a ratio or interval scale.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="double">
-				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="UomIdentifier">
-		<annotation>
-			<documentation>The simple type gml:UomIdentifer defines the syntax and value space of the unit of measure identifier.</documentation>
-		</annotation>
-		<union memberTypes="gml:UomSymbol gml:UomURI"/>
-	</simpleType>
-	<simpleType name="UomSymbol">
-		<annotation>
-			<documentation>This type specifies a character string of length at least one, and restricted such that it must not contain any of the following characters: ":" (colon), " " (space), (newline), (carriage return), (tab). This allows values corresponding to familiar abbreviations, such as "kg", "m/s", etc. 
-It is recommended that the symbol be an identifier for a unit of measure as specified in the "Unified Code of Units of Measure" (UCUM) (http://aurora.regenstrief.org/UCUM). This provides a set of symbols and a grammar for constructing identifiers for units of measure that are unique, and may be easily entered with a keyboard supporting the limited character set known as 7-bit ASCII. ISO 2955 formerly provided a specification with this scope, but was withdrawn in 2001. UCUM largely follow [...]
-		</annotation>
-		<restriction base="string">
-			<pattern value="[^: \n\r\t]+"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="UomURI">
-		<annotation>
-			<documentation>This type specifies a URI, restricted such that it must start with one of the following sequences: "#", "./", "../", or a string of characters followed by a ":". These patterns ensure that the most common URI forms are supported, including absolute and relative URIs and URIs that are simple fragment identifiers, but prohibits certain forms of relative URI that could be mistaken for unit of measure symbol . 
-NOTE	It is possible to re-write such a relative URI to conform to the restriction (e.g. "./m/s").
-In an instance document, on elements of type gml:MeasureType the mandatory uom attribute shall carry a value corresponding to either 
--	a conventional unit of measure symbol,
--	a link to a definition of a unit of measure that does not have a conventional symbol, or when it is desired to indicate a precise or variant definition.</documentation>
-		</annotation>
-		<restriction base="anyURI">
-			<pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
-		</restriction>
-	</simpleType>
-	<complexType name="CoordinatesType">
-		<annotation>
-			<documentation>This type is deprecated for tuples with ordinate values that are numbers.
-CoordinatesType is a text string, intended to be used to record an array of tuples or coordinates. 
-While it is not possible to enforce the internal structure of the string through schema validation, some optional attributes have been provided in previous versions of GML to support a description of the internal structure. These attributes are deprecated. The attributes were intended to be used as follows:
-Decimal	symbol used for a decimal point (default="." a stop or period)
-cs        	symbol used to separate components within a tuple or coordinate string (default="," a comma)
-ts        	symbol used to separate tuples or coordinate strings (default=" " a space)
-Since it is based on the XML Schema string type, CoordinatesType may be used in the construction of tables of tuples or arrays of tuples, including ones that contain mixed text and numeric values.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="decimal" type="string" default="."/>
-				<attribute name="cs" type="string" default=","/>
-				<attribute name="ts" type="string" default="&#x20;"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="booleanList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="boolean"/>
-	</simpleType>
-	<simpleType name="doubleList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="double"/>
-	</simpleType>
-	<simpleType name="integerList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="integer"/>
-	</simpleType>
-	<simpleType name="NameList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="Name"/>
-	</simpleType>
-	<simpleType name="NCNameList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="NCName"/>
-	</simpleType>
-	<simpleType name="QNameList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="QName"/>
-	</simpleType>
-	<simpleType name="booleanOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:booleanOrNilReason"/>
-	</simpleType>
-	<simpleType name="NameOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:NameOrNilReason"/>
-	</simpleType>
-	<simpleType name="doubleOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:doubleOrNilReason"/>
-	</simpleType>
-	<simpleType name="integerOrNilReasonList">
-		<annotation>
-			<documentation>A type for a list of values of the respective simple type.</documentation>
-		</annotation>
-		<list itemType="gml:integerOrNilReason"/>
-	</simpleType>
-	<complexType name="CodeListType">
-		<annotation>
-			<documentation>gml:CodeListType provides for lists of terms. The values in an instance element shall all be valid according to the rules of the dictionary, classification scheme, or authority identified by the value of its codeSpace attribute.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:NameList">
-				<attribute name="codeSpace" type="anyURI"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="CodeOrNilReasonListType">
-		<annotation>
-			<documentation>gml:CodeOrNilReasonListType provides for lists of terms. The values in an instance element shall all be valid according to the rules of the dictionary, classification scheme, or authority identified by the value of its codeSpace attribute. An instance element may also include embedded values from NilReasonType. It is intended to be used in situations where a term or classification is expected, but the value may be absent for some reason.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:NameOrNilReasonList">
-				<attribute name="codeSpace" type="anyURI"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="MeasureListType">
-		<annotation>
-			<documentation>gml:MeasureListType provides for a list of quantities.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<complexType name="MeasureOrNilReasonListType">
-		<annotation>
-			<documentation>gml:MeasureOrNilReasonListType provides for a list of quantities. An instance element may also include embedded values from NilReasonType. It is intended to be used in situations where a value is expected, but the value may be absent for some reason.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleOrNilReasonList">
-				<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateOperations.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateOperations.xsd
deleted file mode 100755
index 5eaacaf..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateOperations.xsd
+++ /dev/null
@@ -1,525 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns="http://www.w3.org/2001/XMLSchema" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateOperations:3.2.1">coordinateOperations.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.6.
-The spatial or temporal coordinate operations schema components can be divided into five logical parts, which define elements and types for XML encoding of the definitions of:
--	Multiple abstract coordinate operations
--	Multiple concrete types of coordinate operations, including Transformations and Conversions
--	Abstract and concrete parameter values and groups
--	Operation methods
--	Abstract and concrete operation parameters and groups
-These schema component encodes the Coordinate Operation package of the UML Model for ISO 19111 Clause 11.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<include schemaLocation="measures.xsd"/>
-	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	<element name="AbstractCoordinateOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:AbstractCoordinateOperation is a mathematical operation on coordinates that transforms or converts coordinates to another coordinate reference system. Many but not all coordinate operations (from CRS A to CRS B) also uniquely define the inverse operation (from CRS B to CRS A). In some cases, the operation method algorithm for the inverse operation is the same as for the forward algorithm, but the signs of some operation parameter values shall be reversed. In other c [...]
-The optional coordinateOperationAccuracy property elements provide estimates of the impact of this coordinate operation on point position accuracy.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCoordinateOperationType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:operationVersion" minOccurs="0"/>
-					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:sourceCRS" minOccurs="0"/>
-					<element ref="gml:targetCRS" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="operationVersion" type="string">
-		<annotation>
-			<documentation>gml:operationVersion is the version of the coordinate transformation (i.e., instantiation due to the stochastic nature of the parameters). Mandatory when describing a transformation, and should not be supplied for a conversion.</documentation>
-		</annotation>
-	</element>
-	<element name="coordinateOperationAccuracy">
-		<annotation>
-			<documentation>gml:coordinateOperationAccuracy is an association role to a DQ_PositionalAccuracy object as encoded in ISO/TS 19139, either referencing or containing the definition of that positional accuracy. That object contains an estimate of the impact of this coordinate operation on point accuracy. That is, it gives position error estimates for the target coordinates of this coordinate operation, assuming no errors in the source coordinates.</documentation>
-		</annotation>
-		<complexType>
-			<sequence minOccurs="0">
-				<element ref="gmd:AbstractDQ_PositionalAccuracy"/>
-			</sequence>
-			<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</complexType>
-	</element>
-	<element name="sourceCRS" type="gml:CRSPropertyType">
-		<annotation>
-			<documentation>gml:sourceCRS is an association role to the source CRS (coordinate reference system) of this coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<element name="targetCRS" type="gml:CRSPropertyType">
-		<annotation>
-			<documentation>gml:targetCRS is an association role to the target CRS (coordinate reference system) of this coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateOperationPropertyType">
-		<annotation>
-			<documentation>gml:CoordinateOperationPropertyType is a property type for association roles to a coordinate operation, either referencing or containing the definition of that coordinate operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCoordinateOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractSingleOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:AbstractCoordinateOperation">
-		<annotation>
-			<documentation>gml:AbstractSingleOperation is a single (not concatenated) coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SingleOperationPropertyType">
-		<annotation>
-			<documentation>gml:SingleOperationPropertyType is a property type for association roles to a single operation, either referencing or containing the definition of that single operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSingleOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralConversion" type="gml:AbstractGeneralConversionType" abstract="true" substitutionGroup="gml:AbstractOperation">
-		<annotation>
-			<documentation>gm:AbstractGeneralConversion is an abstract operation on coordinates that does not include any change of datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters. The operationVersion, sourceCRS, and targetCRS elements are omitted in a coordinate conversion.
-This abstract complex type is expected to be extended for well-known operation methods with many Conversion instances, in GML Application Schemas that define operation-method-specialized element names and contents. This conversion uses an operation method, usually with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to  [...]
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralConversionType" abstract="true">
-		<complexContent>
-			<restriction base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="GeneralConversionPropertyType">
-		<annotation>
-			<documentation>gml:GeneralConversionPropertyType is a property type for association roles to a general conversion, either referencing or containing the definition of that conversion.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeneralConversion"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralTransformation" type="gml:AbstractGeneralTransformationType" abstract="true" substitutionGroup="gml:AbstractOperation">
-		<annotation>
-			<documentation>gml:AbstractGeneralTransformation is an abstract operation on coordinates that usually includes a change of Datum. The parameters of a coordinate transformation are empirically derived from data containing the coordinates of a series of points in both coordinate reference systems. This computational process is usually "over-determined", allowing derivation of error (or accuracy) estimates for the transformation. Also, the stochastic nature of the parameters may result i [...]
-This abstract complex type is expected to be extended for well-known operation methods with many Transformation instances, in Application Schemas that define operation-method-specialized value element names and contents. This transformation uses an operation method with associated parameter values. However, operation methods and parameter values are directly associated with concrete subtypes, not with this abstract type. All concrete types derived from this type shall extend this type to [...]
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralTransformationType" abstract="true">
-		<complexContent>
-			<restriction base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:operationVersion"/>
-					<element ref="gml:coordinateOperationAccuracy" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:sourceCRS"/>
-					<element ref="gml:targetCRS"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="GeneralTransformationPropertyType">
-		<annotation>
-			<documentation>gml:GeneralTransformationPropertyType is a property type for association roles to a general transformation, either referencing or containing the definition of that transformation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeneralTransformation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ConcatenatedOperation" type="gml:ConcatenatedOperationType" substitutionGroup="gml:AbstractCoordinateOperation"/>
-	<complexType name="ConcatenatedOperationType">
-		<annotation>
-			<documentation>gml:ConcatenatedOperation is an ordered sequence of two or more coordinate operations. This sequence of operations is constrained by the requirement that the source coordinate reference system of step (n+1) must be the same as the target coordinate reference system of step (n). The source coordinate reference system of the first step and the target coordinate reference system of the last step are the source and target coordinate reference system associated with the conc [...]
-The gml:coordOperation property elements are an ordered sequence of associations to the two or more operations used by this concatenated operation. The AggregationAttributeGroup should be used to specify that the coordOperation associations are ordered.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:coordOperation" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="coordOperation" type="gml:CoordinateOperationPropertyType">
-		<annotation>
-			<documentation>gml:coordOperation is an association role to a coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConcatenatedOperationPropertyType">
-		<annotation>
-			<documentation>gml:ConcatenatedOperationPropertyType is a property type for association roles to a concatenated operation, either referencing or containing the definition of that concatenated operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ConcatenatedOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="PassThroughOperation" type="gml:PassThroughOperationType" substitutionGroup="gml:AbstractSingleOperation">
-		<annotation>
-			<documentation>gml:PassThroughOperation is a pass-through operation specifies that a subset of a coordinate tuple is subject to a specific coordinate operation.
-The modifiedCoordinate property elements are an ordered sequence of positive integers defining the positions in a coordinate tuple of the coordinates affected by this pass-through operation. The AggregationAttributeGroup should be used to specify that the modifiedCoordinate elements are ordered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PassThroughOperationType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateOperationType">
-				<sequence>
-					<element ref="gml:modifiedCoordinate" maxOccurs="unbounded"/>
-					<element ref="gml:coordOperation"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="modifiedCoordinate" type="positiveInteger">
-		<annotation>
-			<documentation>gml:modifiedCoordinate is a positive integer defining a position in a coordinate tuple.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PassThroughOperationPropertyType">
-		<annotation>
-			<documentation>gml:PassThroughOperationPropertyType is a property type for association roles to a pass through operation, either referencing or containing the definition of that pass through operation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PassThroughOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="Conversion" type="gml:ConversionType" substitutionGroup="gml:AbstractGeneralConversion">
-		<annotation>
-			<documentation>gml:Conversion is a concrete operation on coordinates that does not include any change of Datum. The best-known example of a coordinate conversion is a map projection. The parameters describing coordinate conversions are defined rather than empirically derived. Note that some conversions have no parameters.
-This concrete complex type can be used without using a GML Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Conversion instance.
-The usesValue property elements are an unordered list of composition associations to the set of parameter values used by this conversion operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConversionType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralConversionType">
-				<sequence>
-					<element ref="gml:method"/>
-					<element ref="gml:parameterValue" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="method" type="gml:OperationMethodPropertyType">
-		<annotation>
-			<documentation>gml:method is an association role to the operation method used by a coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<element name="parameterValue" type="gml:AbstractGeneralParameterValuePropertyType">
-		<annotation>
-			<documentation>gml:parameterValue is a composition association to a parameter value or group of parameter values used by a coordinate operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConversionPropertyType">
-		<annotation>
-			<documentation>gml:ConversionPropertyType is a property type for association roles to a concrete general-purpose conversion, either referencing or containing the definition of that conversion.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Conversion"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="Transformation" type="gml:TransformationType" substitutionGroup="gml:AbstractGeneralTransformation">
-		<annotation>
-			<documentation>gml:Transformation is a concrete object element derived from gml:GeneralTransformation (13.6.2.13).
-This concrete object can be used for all operation methods, without using a GML Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one Transformation instance.
-The parameterValue elements are an unordered list of composition associations to the set of parameter values used by this conversion operation.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TransformationType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralTransformationType">
-				<sequence>
-					<element ref="gml:method"/>
-					<element ref="gml:parameterValue" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TransformationPropertyType">
-		<annotation>
-			<documentation>gml:TransformationPropertyType is a property type for association roles to a transformation, either referencing or containing the definition of that transformation.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Transformation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralParameterValue" type="gml:AbstractGeneralParameterValueType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:AbstractGeneralParameterValue is an abstract parameter value or group of parameter values.
-This abstract complexType is expected to be extended and restricted for well-known operation methods with many instances, in Application Schemas that define operation-method-specialized element names and contents. Specific parameter value elements are directly contained in concrete subtypes, not in this abstract type. All concrete types derived from this type shall extend this type to include one "...Value" element with an appropriate type, which should be one of the element types allowe [...]
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralParameterValueType" abstract="true">
-		<sequence/>
-	</complexType>
-	<complexType name="AbstractGeneralParameterValuePropertyType">
-		<annotation>
-			<documentation>gml:AbstractGeneralParameterValuePropertyType is a  property type for inline association roles to a parameter value or group of parameter values, always containing the values.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractGeneralParameterValue"/>
-		</sequence>
-	</complexType>
-	<element name="ParameterValue" type="gml:ParameterValueType" substitutionGroup="gml:AbstractGeneralParameterValue">
-		<annotation>
-			<documentation>gml:ParameterValue is a parameter value, an ordered sequence of values, or a reference to a file of parameter values. This concrete complex type may be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents, especially for methods with only one instance. This complex type may be used, extended, or restricted for well-known operation methods, especially for methods with many instances.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ParameterValueType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralParameterValueType">
-				<sequence>
-					<choice>
-						<element ref="gml:value"/>
-						<element ref="gml:dmsAngleValue"/>
-						<element ref="gml:stringValue"/>
-						<element ref="gml:integerValue"/>
-						<element ref="gml:booleanValue"/>
-						<element ref="gml:valueList"/>
-						<element ref="gml:integerValueList"/>
-						<element ref="gml:valueFile"/>
-					</choice>
-					<element ref="gml:operationParameter"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="value" type="gml:MeasureType">
-		<annotation>
-			<documentation>gml:value is a numeric value of an operation parameter, with its associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="stringValue" type="string">
-		<annotation>
-			<documentation>gml:stringValue is a character string value of an operation parameter. A string value does not have an associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="integerValue" type="positiveInteger">
-		<annotation>
-			<documentation>gml:integerValue is a positive integer value of an operation parameter, usually used for a count. An integer value does not have an associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="booleanValue" type="boolean">
-		<annotation>
-			<documentation>gml:booleanValue is a boolean value of an operation parameter. A Boolean value does not have an associated unit of measure.</documentation>
-		</annotation>
-	</element>
-	<element name="valueList" type="gml:MeasureListType">
-		<annotation>
-			<documentation>gml:valueList is an ordered sequence of two or more numeric values of an operation parameter list, where each value has the same associated unit of measure. An element of this type contains a space-separated sequence of double values.</documentation>
-		</annotation>
-	</element>
-	<element name="integerValueList" type="gml:integerList">
-		<annotation>
-			<documentation>gml:integerValueList is an ordered sequence of two or more integer values of an operation parameter list, usually used for counts. These integer values do not have an associated unit of measure. An element of this type contains a space-separated sequence of integer values.</documentation>
-		</annotation>
-	</element>
-	<element name="valueFile" type="anyURI">
-		<annotation>
-			<documentation>gml:valueFile is a reference to a file or a part of a file containing one or more parameter values, each numeric value with its associated unit of measure. When referencing a part of a file, that file shall contain multiple identified parts, such as an XML encoded document. Furthermore, the referenced file or part of a file may reference another part of the same or different files, as allowed in XML documents.</documentation>
-		</annotation>
-	</element>
-	<element name="operationParameter" type="gml:OperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:operationParameter is an association role to the operation parameter of which this is a value.</documentation>
-		</annotation>
-	</element>
-	<element name="ParameterValueGroup" type="gml:ParameterValueGroupType" substitutionGroup="gml:AbstractGeneralParameterValue">
-		<annotation>
-			<documentation>gml:ParameterValueGroup is a group of related parameter values. The same group can be repeated more than once in a Conversion, Transformation, or higher level ParameterValueGroup, if those instances contain different values of one or more parameterValues which suitably distinquish among those groups. This concrete complex type can be used for operation methods without using an Application Schema that defines operation-method-specialized element names and contents. This  [...]
-The parameterValue elements are an unordered set of composition association roles to the parameter values and groups of values included in this group.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ParameterValueGroupType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralParameterValueType">
-				<sequence>
-					<element ref="gml:parameterValue" minOccurs="2" maxOccurs="unbounded"/>
-					<element ref="gml:group"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="group" type="gml:OperationParameterGroupPropertyType">
-		<annotation>
-			<documentation>gml:group is an association role to the operation parameter group for which this element provides parameter values.</documentation>
-		</annotation>
-	</element>
-	<element name="OperationMethod" type="gml:OperationMethodType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:OperationMethod is a method (algorithm or procedure) used to perform a coordinate operation. Most operation methods use a number of operation parameters, although some coordinate conversions use none. Each coordinate operation using the method assigns values to these parameters.
-The parameter elements are an unordered list of associations to the set of operation parameters and parameter groups used by this operation method.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationMethodType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<choice>
-						<element ref="gml:formulaCitation"/>
-						<element ref="gml:formula"/>
-					</choice>
-					<element ref="gml:sourceDimensions" minOccurs="0"/>
-					<element ref="gml:targetDimensions" minOccurs="0"/>
-					<element ref="gml:parameter" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="formulaCitation">
-		<annotation>
-			<documentation>gml:formulaCitation provides a reference to a publication giving the formula(s) or procedure used by an coordinate operation method.</documentation>
-		</annotation>
-		<complexType>
-			<sequence minOccurs="0">
-				<element ref="gmd:CI_Citation"/>
-			</sequence>
-			<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</complexType>
-	</element>
-	<element name="formula" type="gml:CodeType">
-		<annotation>
-			<documentation>gml:formula Formula(s) or procedure used by an operation method. The use of the codespace attribite has been deprecated. The property value shall be a character string.</documentation>
-		</annotation>
-	</element>
-	<element name="sourceDimensions" type="positiveInteger">
-		<annotation>
-			<documentation>gml:sourceDimensions is the number of dimensions in the source CRS of this operation method.</documentation>
-		</annotation>
-	</element>
-	<element name="targetDimensions" type="positiveInteger">
-		<annotation>
-			<documentation>gml:targetDimensions is the number of dimensions in the target CRS of this operation method.</documentation>
-		</annotation>
-	</element>
-	<element name="parameter" type="gml:AbstractGeneralOperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:parameter is an association to an operation parameter or parameter group.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationMethodPropertyType">
-		<annotation>
-			<documentation>gml:OperationMethodPropertyType is a property type for association roles to a concrete general-purpose operation method, either referencing or containing the definition of that method.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationMethod"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralOperationParameter" type="gml:AbstractGeneralOperationParameterType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:GeneralOperationParameter is the abstract definition of a parameter or group of parameters used by an operation method.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralOperationParameterType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:minimumOccurs" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="minimumOccurs" type="nonNegativeInteger">
-		<annotation>
-			<documentation>gml:minimumOccurs is the minimum number of times that values for this parameter group or parameter are required. If this attribute is omitted, the minimum number shall be one.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralOperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:AbstractGeneralOperationParameterPropertyType is a property type for association roles to an operation parameter or group, either referencing or containing the definition of that parameter or group.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeneralOperationParameter"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="OperationParameter" type="gml:OperationParameterType" substitutionGroup="gml:AbstractGeneralOperationParameter">
-		<annotation>
-			<documentation>gml:OperationParameter is the definition of a parameter used by an operation method. Most parameter values are numeric, but other types of parameter values are possible. This complex type is expected to be used or extended for all operation methods, without defining operation-method-specialized element names.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationParameterType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralOperationParameterType">
-				<sequence/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="OperationParameterPropertyType">
-		<annotation>
-			<documentation>gml:OperationParameterPropertyType is a property type for association roles to an operation parameter, either referencing or containing the definition of that parameter.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationParameter"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="OperationParameterGroup" type="gml:OperationParameterGroupType" substitutionGroup="gml:AbstractGeneralOperationParameter">
-		<annotation>
-			<documentation>gml:OperationParameterGroup is the definition of a group of parameters used by an operation method. This complex type is expected to be used or extended for all applicable operation methods, without defining operation-method-specialized element names.
-The generalOperationParameter elements are an unordered list of associations to the set of operation parameters that are members of this group.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationParameterGroupType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralOperationParameterType">
-				<sequence>
-					<element ref="gml:maximumOccurs" minOccurs="0"/>
-					<element ref="gml:parameter" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="maximumOccurs" type="positiveInteger">
-		<annotation>
-			<documentation>gml:maximumOccurs is the maximum number of times that values for this parameter group may be included. If this attribute is omitted, the maximum number shall be one.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OperationParameterGroupPropertyType">
-		<annotation>
-			<documentation>gml:OperationParameterPropertyType is a property type for association roles to an operation parameter group, either referencing or containing the definition of that parameter group.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:OperationParameterGroup"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd
deleted file mode 100755
index 72a6ced..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateReferenceSystems.xsd
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateReferenceSystems:3.2.1">coordinateReferenceSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.3.
-The spatial-temporal coordinate reference systems schema components are divided into two logical parts. One part defines elements and types for XML encoding of abstract coordinate reference systems definitions. The larger part defines specialized constructs for XML encoding of definitions of the multiple concrete types of spatial-temporal coordinate reference systems.
-These schema components encode the Coordinate Reference System packages of the UML Models of ISO 19111 Clause 8 and ISO/DIS 19136 D.3.10, with the exception of the abstract "SC_CRS" class.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="coordinateSystems.xsd"/>
-	<include schemaLocation="datums.xsd"/>
-	<include schemaLocation="coordinateOperations.xsd"/>
-	<element name="AbstractSingleCRS" type="gml:AbstractCRSType" abstract="true" substitutionGroup="gml:AbstractCRS">
-		<annotation>
-			<documentation>gml:AbstractSingleCRS implements a coordinate reference system consisting of one coordinate system and one datum (as opposed to a Compound CRS).</documentation>
-		</annotation>
-	</element>
-	<complexType name="SingleCRSPropertyType">
-		<annotation>
-			<documentation>gml:SingleCRSPropertyType is a property type for association roles to a single coordinate reference system, either referencing or containing the definition of that coordinate reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSingleCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractGeneralDerivedCRS" type="gml:AbstractGeneralDerivedCRSType" abstract="true" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:AbstractGeneralDerivedCRS is a coordinate reference system that is defined by its coordinate conversion from another coordinate reference system. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeneralDerivedCRSType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:conversion"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="conversion" type="gml:GeneralConversionPropertyType">
-		<annotation>
-			<documentation>gml:conversion is an association role to the coordinate conversion used to define the derived CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="CompoundCRS" type="gml:CompoundCRSType" substitutionGroup="gml:AbstractCRS">
-		<annotation>
-			<documentation>gml:CompundCRS is a coordinate reference system describing the position of points through two or more independent coordinate reference systems. It is associated with a non-repeating sequence of two or more instances of SingleCRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompoundCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:componentReferenceSystem" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="componentReferenceSystem" type="gml:SingleCRSPropertyType">
-		<annotation>
-			<documentation>The gml:componentReferenceSystem elements are an ordered sequence of associations to all the component coordinate reference systems included in this compound coordinate reference system. The gml:AggregationAttributeGroup should be used to specify that the gml:componentReferenceSystem properties are ordered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompoundCRSPropertyType">
-		<annotation>
-			<documentation>gml:CompoundCRSPropertyType is a property type for association roles to a compound coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CompoundCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="GeodeticCRS" type="gml:GeodeticCRSType" substitutionGroup="gml:AbstractSingleCRS"/>
-	<complexType name="GeodeticCRSType">
-		<annotation>
-			<documentation>gml:GeodeticCRS is a coordinate reference system based on a geodetic datum.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:ellipsoidalCS"/>
-						<element ref="gml:cartesianCS"/>
-						<element ref="gml:sphericalCS"/>
-					</choice>
-					<element ref="gml:geodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ellipsoidalCS" type="gml:EllipsoidalCSPropertyType">
-		<annotation>
-			<documentation>gml:ellipsoidalCS is an association role to the ellipsoidal coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="cartesianCS" type="gml:CartesianCSPropertyType">
-		<annotation>
-			<documentation>gml:cartesianCS is an association role to the Cartesian coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="sphericalCS" type="gml:SphericalCSPropertyType">
-		<annotation>
-			<documentation>gml:sphericalCS is an association role to the spherical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="geodeticDatum" type="gml:GeodeticDatumPropertyType">
-		<annotation>
-			<documentation>gml:geodeticDatum is an association role to the geodetic datum used by this CRS.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodeticCRSPropertyType">
-		<annotation>
-			<documentation>gml:GeodeticCRSPropertyType is a property type for association roles to a geodetic coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeodeticCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="VerticalCRS" type="gml:VerticalCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:VerticalCRS is a 1D coordinate reference system used for recording heights or depths. Vertical CRSs make use of the direction of gravity to define the concept of height or depth, but the relationship with gravity may not be straightforward. By implication, ellipsoidal heights (h) cannot be captured in a vertical coordinate reference system. Ellipsoidal heights cannot exist independently, but only as an inseparable part of a 3D coordinate tuple defined in a geographi [...]
-		</annotation>
-	</element>
-	<complexType name="VerticalCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:verticalCS"/>
-					<element ref="gml:verticalDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="verticalCS" type="gml:VerticalCSPropertyType">
-		<annotation>
-			<documentation>gml:verticalCS is an association role to the vertical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="verticalDatum" type="gml:VerticalDatumPropertyType">
-		<annotation>
-			<documentation>gml:verticalDatum is an association role to the vertical datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalCRSPropertyType">
-		<annotation>
-			<documentation>gml:VerticalCRSPropertyType is a property type for association roles to a vertical coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ProjectedCRS" type="gml:ProjectedCRSType" substitutionGroup="gml:AbstractGeneralDerivedCRS">
-		<annotation>
-			<documentation>gml:ProjectedCRS is a 2D coordinate reference system used to approximate the shape of the earth on a planar surface, but in such a way that the distortion that is inherent to the approximation is carefully controlled and known. Distortion correction is commonly applied to calculated bearings and distances to produce values that are a close match to actual field values.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ProjectedCRSType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralDerivedCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:baseGeodeticCRS"/>
-						<element ref="gml:baseGeographicCRS"/>
-					</choice>
-					<element ref="gml:cartesianCS"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseGeodeticCRS" type="gml:GeodeticCRSPropertyType">
-		<annotation>
-			<documentation>gml:baseGeodeticCRS is an association role to the geodetic coordinate reference system used by this projected CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ProjectedCRSPropertyType">
-		<annotation>
-			<documentation>gml:ProjectedCRSPropertyType is a property type for association roles to a projected coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ProjectedCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="DerivedCRS" type="gml:DerivedCRSType" substitutionGroup="gml:AbstractGeneralDerivedCRS">
-		<annotation>
-			<documentation>gml:DerivedCRS is a single coordinate reference system that is defined by its coordinate conversion from another single coordinate reference system known as the base CRS. The base CRS can be a projected coordinate reference system, if this DerivedCRS is used for a georectified grid coverage as described in ISO 19123, Clause 8.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivedCRSType">
-		<complexContent>
-			<extension base="gml:AbstractGeneralDerivedCRSType">
-				<sequence>
-					<element ref="gml:baseCRS"/>
-					<element ref="gml:derivedCRSType"/>
-					<element ref="gml:coordinateSystem"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseCRS" type="gml:SingleCRSPropertyType">
-		<annotation>
-			<documentation>gml:baseCRS is an association role to the coordinate reference system used by this derived CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="derivedCRSType" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>The gml:derivedCRSType property describes the type of a derived coordinate reference system. The required codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<element name="coordinateSystem" type="gml:CoordinateSystemPropertyType">
-		<annotation>
-			<documentation>An association role to the coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivedCRSPropertyType">
-		<annotation>
-			<documentation>gml:DerivedCRSPropertyType is a property type for association roles to a non-projected derived coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:DerivedCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="EngineeringCRS" type="gml:EngineeringCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:EngineeringCRS is a contextually local coordinate reference system which can be divided into two broad categories:
--	earth-fixed systems applied to engineering activities on or near the surface of the earth;
--	CRSs on moving platforms such as road vehicles, vessels, aircraft, or spacecraft, see ISO 19111 8.3.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EngineeringCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:affineCS"/>
-						<element ref="gml:cartesianCS"/>
-						<element ref="gml:cylindricalCS"/>
-						<element ref="gml:linearCS"/>
-						<element ref="gml:polarCS"/>
-						<element ref="gml:sphericalCS"/>
-						<element ref="gml:userDefinedCS"/>
-						<element ref="gml:coordinateSystem">
-							<annotation>
-								<appinfo>deprecated</appinfo>
-							</annotation>
-						</element>
-					</choice>
-					<element ref="gml:engineeringDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="cylindricalCS" type="gml:CylindricalCSPropertyType">
-		<annotation>
-			<documentation>gml:cylindricalCS is an association role to the cylindrical coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="linearCS" type="gml:LinearCSPropertyType">
-		<annotation>
-			<documentation>gml:linearCS is an association role to the linear coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="polarCS" type="gml:PolarCSPropertyType">
-		<annotation>
-			<documentation>gml:polarCS is an association role to the polar coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="userDefinedCS" type="gml:UserDefinedCSPropertyType">
-		<annotation>
-			<documentation>gml:userDefinedCS is an association role to the user defined coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="engineeringDatum" type="gml:EngineeringDatumPropertyType">
-		<annotation>
-			<documentation>gml:engineeringDatum is an association role to the engineering datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EngineeringCRSPropertyType">
-		<annotation>
-			<documentation>gml:EngineeringCRSPropertyType is a property type for association roles to an engineering coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EngineeringCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ImageCRS" type="gml:ImageCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:ImageCRS is an engineering coordinate reference system applied to locations in images. Image coordinate reference systems are treated as a separate sub-type because the definition of the associated image datum contains two attributes not relevant to other engineering datums.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:cartesianCS"/>
-						<element ref="gml:affineCS"/>
-						<element ref="gml:usesObliqueCartesianCS"/>
-					</choice>
-					<element ref="gml:imageDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="affineCS" type="gml:AffineCSPropertyType">
-		<annotation>
-			<documentation>gml:affineCS is an association role to the affine coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="imageDatum" type="gml:ImageDatumPropertyType">
-		<annotation>
-			<documentation>gml:imageDatum is an association role to the image datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageCRSPropertyType">
-		<annotation>
-			<documentation>gml:ImageCRSPropertyType is a property type for association roles to an image coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ImageCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TemporalCRS" type="gml:TemporalCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<documentation>gml:TemporalCRS is a 1D coordinate reference system used for the recording of time.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalCRSType">
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:timeCS"/>
-						<element ref="gml:usesTemporalCS"/>
-					</choice>
-					<element ref="gml:temporalDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="timeCS" type="gml:TimeCSPropertyType">
-		<annotation>
-			<documentation>gml:timeCS is an association role to the time coordinate system used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<element name="temporalDatum" type="gml:TemporalDatumPropertyType">
-		<annotation>
-			<documentation>gml:temporalDatum is an association role to the temporal datum used by this CRS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalCRSPropertyType">
-		<annotation>
-			<documentation>gml:TemporalCRSPropertyType is a property type for association roles to a temporal coordinate reference system, either referencing or containing the definition of that reference system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateSystems.xsd
deleted file mode 100755
index 37627f2..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coordinateSystems.xsd
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en"  version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coordinateSystems:3.2.1">coordinateSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.4.
-The coordinate systems schema components can be divded into  three logical parts, which define elements and types for XML encoding of the definitions of:
--	Coordinate system axes
--	Abstract coordinate system
--	Multiple concrete types of spatial-temporal coordinate systems
-These schema components encode the Coordinate System packages of the UML Models of ISO 19111 Clause 9 and ISO/DIS 19136 D.3.10.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<element name="CoordinateSystemAxis" type="gml:CoordinateSystemAxisType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:CoordinateSystemAxis is a definition of a coordinate system axis.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateSystemAxisType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:axisAbbrev"/>
-					<element ref="gml:axisDirection"/>
-					<element ref="gml:minimumValue" minOccurs="0"/>
-					<element ref="gml:maximumValue" minOccurs="0"/>
-					<element ref="gml:rangeMeaning" minOccurs="0"/>
-				</sequence>
-				<attribute name="uom" type="gml:UomIdentifier" use="required">
-					<annotation>
-						<documentation>The uom attribute provides an identifier of the unit of measure used for this coordinate system axis. The value of this coordinate in a coordinate tuple shall be recorded using this unit of measure, whenever those coordinates use a coordinate reference system that uses a coordinate system that uses this axis.</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="axisAbbrev" type="gml:CodeType">
-		<annotation>
-			<documentation>gml:axisAbbrev is the abbreviation used for this coordinate system axis; this abbreviation is also used to identify the coordinates in the coordinate tuple. The codeSpace attribute may reference a source of more information on a set of standardized abbreviations, or on this abbreviation.</documentation>
-		</annotation>
-	</element>
-	<element name="axisDirection" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:axisDirection is the direction of this coordinate system axis (or in the case of Cartesian projected coordinates, the direction of this coordinate system axis at the origin).
-Within any set of coordinate system axes, only one of each pair of terms may be used. For earth-fixed CRSs, this direction is often approximate and intended to provide a human interpretable meaning to the axis. When a geodetic datum is used, the precise directions of the axes may therefore vary slightly from this approximate direction.
-The codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<element name="minimumValue" type="double">
-		<annotation>
-			<documentation>The gml:minimumValue and gml:maximumValue properties allow the specification of minimum and maximum value normally allowed for this axis, in the unit of measure for the axis. For a continuous angular axis such as longitude, the values wrap-around at this value. Also, values beyond this minimum/maximum can be used for specified purposes, such as in a bounding box. A value of minus infinity shall be allowed for the gml:minimumValue element, a value of plus infiniy for the [...]
-		</annotation>
-	</element>
-	<element name="maximumValue" type="double">
-		<annotation>
-			<documentation>The gml:minimumValue and gml:maximumValue properties allow the specification of minimum and maximum value normally allowed for this axis, in the unit of measure for the axis. For a continuous angular axis such as longitude, the values wrap-around at this value. Also, values beyond this minimum/maximum can be used for specified purposes, such as in a bounding box. A value of minus infinity shall be allowed for the gml:minimumValue element, a value of plus infiniy for the [...]
-		</annotation>
-	</element>
-	<element name="rangeMeaning" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:rangeMeaning describes the meaning of axis value range specified by gml:minimumValue and gml:maximumValue. This element shall be omitted when both gml:minimumValue and gml:maximumValue are omitted. This element should be included when gml:minimumValue and/or gml:maximumValue are included. If this element is omitted when the gml:minimumValue and/or gml:maximumValue are included, the meaning is unspecified. The codeSpace attribute shall reference a source of informati [...]
-		</annotation>
-	</element>
-	<complexType name="CoordinateSystemAxisPropertyType">
-		<annotation>
-			<documentation>gml:CoordinateSystemAxisPropertyType is a property type for association roles to a coordinate system axis, either referencing or containing the definition of that axis.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CoordinateSystemAxis"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AbstractCoordinateSystem" type="gml:AbstractCoordinateSystemType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:AbstractCoordinateSystem is a coordinate system (CS) is the non-repeating sequence of coordinate system axes that spans a given coordinate space. A CS is derived from a set of mathematical rules for specifying how coordinates in a given space are to be assigned to points. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded. This abstract complex type shall not be used, extended, or  [...]
-		</annotation>
-	</element>
-	<complexType name="AbstractCoordinateSystemType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:axis" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="axis" type="gml:CoordinateSystemAxisPropertyType">
-		<annotation>
-			<documentation>The gml:axis property is an association role (ordered sequence) to the coordinate system axes included in this coordinate system. The coordinate values in a coordinate tuple shall be recorded in the order in which the coordinate system axes associations are recorded, whenever those coordinates use a coordinate reference system that uses this coordinate system. The gml:AggregationAttributeGroup should be used to specify that the axis objects are ordered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoordinateSystemPropertyType">
-		<annotation>
-			<documentation>gml:CoordinateSystemPropertyType is a property type for association roles to a coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCoordinateSystem"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="EllipsoidalCS" type="gml:EllipsoidalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:EllipsoidalCS is a two- or three-dimensional coordinate system in which position is specified by geodetic latitude, geodetic longitude, and (in the three-dimensional case) ellipsoidal height. An EllipsoidalCS shall have two or three gml:axis property elements; the number of associations shall equal the dimension of the CS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EllipsoidalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="EllipsoidalCSPropertyType">
-		<annotation>
-			<documentation>gml:EllipsoidalCSPropertyType is a property type for association roles to an ellipsoidal coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EllipsoidalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="CartesianCS" type="gml:CartesianCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:CartesianCS is a 1-, 2-, or 3-dimensional coordinate system. In the 1-dimensional case, it contains a single straight coordinate axis. In the 2- and 3-dimensional cases gives the position of points relative to orthogonal straight axes. In the multi-dimensional case, all axes shall have the same length unit of measure. A CartesianCS shall have one, two, or three gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CartesianCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="CartesianCSPropertyType">
-		<annotation>
-			<documentation>gml:CartesianCSPropertyType is a property type for association roles to a Cartesian coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CartesianCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="VerticalCS" type="gml:VerticalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:VerticalCS is a one-dimensional coordinate system used to record the heights or depths of points. Such a coordinate system is usually dependent on the Earth's gravity field, perhaps loosely as when atmospheric pressure is the basis for the vertical coordinate system axis. A VerticalCS shall have one gml:axis property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="VerticalCSPropertyType">
-		<annotation>
-			<documentation>gml:VerticalCSPropertyType is a property type for association roles to a vertical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TimeCS" type="gml:TimeCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:TimeCS is a one-dimensional coordinate system containing a time axis, used to describe the temporal position of a point in the specified time units from a specified time origin. A TimeCS shall have one gml:axis property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeCSPropertyType">
-		<annotation>
-			<documentation>gml:TimeCSPropertyType is a property type for association roles to a time coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="LinearCS" type="gml:LinearCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:LinearCS is a one-dimensional coordinate system that consists of the points that lie on the single axis described. The associated coordinate is the distance – with or without offset – from the specified datum to the point along the axis. A LinearCS shall have one gml:axis property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LinearCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="LinearCSPropertyType">
-		<annotation>
-			<documentation>gml:LinearCSPropertyType is a property type for association roles to a linear coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:LinearCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="UserDefinedCS" type="gml:UserDefinedCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:UserDefinedCS is a two- or three-dimensional coordinate system that consists of any combination of coordinate axes not covered by any other coordinate system type. A UserDefinedCS shall have two or three gml:axis property elements; the number of property elements shall equal the dimension of the CS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="UserDefinedCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="UserDefinedCSPropertyType">
-		<annotation>
-			<documentation>gml:UserDefinedCSPropertyType is a property type for association roles to a user-defined coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:UserDefinedCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="SphericalCS" type="gml:SphericalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:SphericalCS is a three-dimensional coordinate system with one distance measured from the origin and two angular coordinates. A SphericalCS shall have three gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SphericalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="SphericalCSPropertyType">
-		<annotation>
-			<documentation>gml:SphericalCSPropertyType is property type for association roles to a spherical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:SphericalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="PolarCS" type="gml:PolarCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:PolarCS ia s two-dimensional coordinate system in which position is specified by the distance from the origin and the angle between the line from the origin to a point and a reference direction. A PolarCS shall have two gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PolarCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="PolarCSPropertyType">
-		<annotation>
-			<documentation>gml:PolarCSPropertyType is a property type for association roles to a polar coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PolarCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="CylindricalCS" type="gml:CylindricalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:CylindricalCS is a three-dimensional coordinate system consisting of a polar coordinate system extended by a straight coordinate axis perpendicular to the plane spanned by the polar coordinate system. A CylindricalCS shall have three gml:axis property elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CylindricalCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="CylindricalCSPropertyType">
-		<annotation>
-			<documentation>gml:CylindricalCSPropertyType is a property type for association roles to a cylindrical coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:CylindricalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="AffineCS" type="gml:AffineCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<documentation>gml:AffineCS is a two- or three-dimensional coordinate system with straight axes that are not necessarily orthogonal. An AffineCS shall have two or three gml:axis property elements; the number of property elements shall equal the dimension of the CS.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AffineCSType">
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="AffineCSPropertyType">
-		<annotation>
-			<documentation>gml:AffineCSPropertyType is a property type for association roles to an affine coordinate system, either referencing or containing the definition of that coordinate system.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AffineCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coverage.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coverage.xsd
deleted file mode 100755
index a1bbfa4..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/coverage.xsd
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:coverage:3.2.1">coverage.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 20.3.
-A coverage incorporates a mapping from a spatiotemporal domain to a range set, the latter providing the set in which the attribute values live.  The range set may be an arbitrary set including discrete lists, integer or floating point ranges, and multi-dimensional vector spaces.
-A coverage can be viewed as the graph of the coverage function f:A à B, that is as the set of ordered pairs {(x, f(x)) | where x is in A}. This view is especially applicable to the GML encoding of a coverage.  In the case of a discrete coverage, the domain set A is partitioned into a collection of subsets (typically a disjoint collection) A = UAi and the function f is constant on each Ai. For a spatial domain, the Ai are geometry elements, hence the coverage can be viewed as a collection [...]
-A coverage is implemented as a GML feature. We can thus speak of a "temperature distribution feature", or a "remotely sensed image feature", or a "soil distribution feature".
-As is the case for any GML object, a coverage object may also be the value of a property of a feature.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="valueObjects.xsd"/>
-	<include schemaLocation="grids.xsd"/>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<complexType name="AbstractCoverageType" abstract="true">
-		<annotation>
-			<documentation>The base type for coverages is gml:AbstractCoverageType. The basic elements of a coverage can be seen in this content model: the coverage contains gml:domainSet and gml:rangeSet properties. The gml:domainSet property describes the domain of the coverage and the gml:rangeSet property describes the range of the coverage.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:domainSet"/>
-					<element ref="gml:rangeSet"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractCoverage" type="gml:AbstractCoverageType" abstract="true" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>This element serves as the head of a substitution group which may contain any coverage whose type is derived from gml:AbstractCoverageType.  It may act as a variable in the definition of content models where it is required to permit any coverage to be valid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DiscreteCoverageType">
-		<complexContent>
-			<extension base="gml:AbstractCoverageType">
-				<sequence>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractDiscreteCoverage" type="gml:DiscreteCoverageType" abstract="true" substitutionGroup="gml:AbstractCoverage">
-		<annotation>
-			<documentation>A discrete coverage consists of a domain set, range set and optionally a coverage function. The domain set consists of either spatial or temporal geometry objects, finite in number. The range set is comprised of a finite number of attribute values each of which is associated to every direct position within any single spatiotemporal object in the domain. In other words, the range values are constant on each spatiotemporal object in the domain. This coverage function maps [...]
-This element serves as the head of a substitution group which may contain any discrete coverage whose type is derived from gml:DiscreteCoverageType.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractContinuousCoverageType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractCoverageType">
-				<sequence>
-					<element ref="gml:coverageFunction" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractContinuousCoverage" type="gml:AbstractContinuousCoverageType" abstract="true" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>A continuous coverage as defined in ISO 19123 is a coverage that can return different values for the same feature attribute at different direct positions within a single spatiotemporal object in its spatiotemporal domain. The base type for continuous coverages is AbstractContinuousCoverageType.
-The coverageFunction element describes the mapping function. 
-The abstract element gml:AbstractContinuousCoverage serves as the head of a substitution group which may contain any continuous coverage whose type is derived from gml:AbstractContinuousCoverageType.</documentation>
-		</annotation>
-	</element>
-	<element name="domainSet" type="gml:DomainSetType">
-		<annotation>
-			<documentation>The gml:domainSet property element describes the spatio-temporal region of interest, within which the coverage is defined. Its content model is given by gml:DomainSetType.
-The value of the domain is thus a choice between a gml:AbstractGeometry and a gml:AbstractTimeObject.  In the instance these abstract elements will normally be substituted by a geometry complex or temporal complex, to represent spatial coverages and time-series, respectively.  
-The presence of the gml:AssociationAttributeGroup means that domainSet follows the usual GML property model and may use the xlink:href attribute to point to the domain, as an alternative to describing the domain inline. Ownership semantics may be provided using the gml:OwnershipAttributeGroup.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="DomainSetType">
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:AbstractGeometry"/>
-				<element ref="gml:AbstractTimeObject"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="rangeSet" type="gml:RangeSetType">
-		<annotation>
-			<documentation>The gml:rangeSet property element contains the values of the coverage (sometimes called the attribute values).  Its content model is given by gml:RangeSetType.
-This content model supports a structural description of the range.  The semantic information describing the range set is embedded using a uniform method, as part of the explicit values, or as a template value accompanying the representation using gml:DataBlock and gml:File.
-The values from each component (or "band") in the range may be encoded within a gml:ValueArray element or a concrete member of the gml:AbstractScalarValueList substitution group . Use of these elements satisfies the value-type homogeneity requirement.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RangeSetType">
-		<choice>
-			<element ref="gml:ValueArray" maxOccurs="unbounded"/>
-			<element ref="gml:AbstractScalarValueList" maxOccurs="unbounded"/>
-			<element ref="gml:DataBlock"/>
-			<element ref="gml:File"/>
-		</choice>
-	</complexType>
-	<element name="DataBlock" type="gml:DataBlockType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:DataBlock describes the Range as a block of text encoded values similar to a Common Separated Value (CSV) representation.
-The range set parameterization is described by the property gml:rangeParameters.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DataBlockType">
-		<sequence>
-			<element ref="gml:rangeParameters"/>
-			<choice>
-				<element ref="gml:tupleList"/>
-				<element ref="gml:doubleOrNilReasonTupleList"/>
-			</choice>
-		</sequence>
-	</complexType>
-	<element name="rangeParameters" type="gml:AssociationRoleType"/>
-	<element name="tupleList" type="gml:CoordinatesType">
-		<annotation>
-			<documentation>gml:CoordinatesType consists of a list of coordinate tuples, with each coordinate tuple separated by the ts or tuple separator (whitespace), and each coordinate in the tuple by the cs or coordinate separator (comma).
-The gml:tupleList encoding is effectively "band-interleaved".</documentation>
-		</annotation>
-	</element>
-	<element name="doubleOrNilReasonTupleList" type="gml:doubleOrNilReasonList">
-		<annotation>
-			<documentation>gml:doubleOrNilReasonList consists of a list of gml:doubleOrNilReason values, each separated by a whitespace. The gml:doubleOrNilReason values are grouped into tuples where the dimension of each tuple in the list is equal to the number of range parameters.</documentation>
-		</annotation>
-	</element>
-	<element name="File" type="gml:FileType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>for efficiency reasons, GML also provides a means of encoding the range set in an arbitrary external encoding, such as a binary file.  This encoding may be "well-known" but this is not required. This mode uses the gml:File element.
-The values of the coverage (attribute values in the range set) are transmitted in a external file that is referenced from the XML structure described by gml:FileType.  The external file is referenced by the gml:fileReference property that is an anyURI (the gml:fileName property has been deprecated).  This means that the external file may be located remotely from the referencing GML instance. 
-The gml:compression property points to a definition of a compression algorithm through an anyURI.  This may be a retrievable, computable definition or simply a reference to an unambiguous name for the compression method.
-The gml:mimeType property points to a definition of the file mime type.
-The gml:fileStructure property is defined by a codelist. Note further that all values shall be enclosed in a single file. Multi-file structures for values are not supported in GML.
-The semantics of the range set is described as above using the gml:rangeParameters property.
-Note that if any compression algorithm is applied, the structure above applies only to the pre-compression or post-decompression structure of the file.
-Note that the fields within a record match the gml:valueComponents of the gml:CompositeValue in document order.</documentation>
-		</annotation>
-	</element>
-	<complexType name="FileType">
-		<sequence>
-			<element ref="gml:rangeParameters"/>
-			<choice>
-				<element name="fileName" type="anyURI">
-					<annotation>
-						<appinfo>deprecated</appinfo>
-					</annotation>
-				</element>
-				<element name="fileReference" type="anyURI"/>
-			</choice>
-			<element name="fileStructure" type="gml:CodeType"/>
-			<element name="mimeType" type="anyURI" minOccurs="0"/>
-			<element name="compression" type="anyURI" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<element name="coverageFunction" type="gml:CoverageFunctionType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>The gml:coverageFunction property describes the mapping function from the domain to the range of the coverage.
-The value of the CoverageFunction is one of gml:CoverageMappingRule and gml:GridFunction.
-If the gml:coverageFunction property is omitted for a gridded coverage (including rectified gridded coverages) the gml:startPoint is assumed to be the value of the gml:low property in the gml:Grid geometry, and the gml:sequenceRule is assumed to be linear and the gml:axisOrder property is assumed to be "+1 +2".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CoverageFunctionType">
-		<choice>
-			<element ref="gml:MappingRule"/>
-			<element ref="gml:CoverageMappingRule"/>
-			<element ref="gml:GridFunction"/>
-		</choice>
-	</complexType>
-	<element name="CoverageMappingRule" type="gml:MappingRuleType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:CoverageMappingRule provides a formal or informal description of the coverage function.
-The mapping rule may be defined as an in-line string (gml:ruleDefinition) or via a remote reference through xlink:href (gml:ruleReference).  
-If no rule name is specified, the default is 'Linear' with respect to members of the domain in document order.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MappingRuleType" final="#all">
-		<choice>
-			<element name="ruleDefinition" type="string"/>
-			<element name="ruleReference" type="gml:ReferenceType"/>
-		</choice>
-	</complexType>
-	<element name="GridFunction" type="gml:GridFunctionType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:GridFunction provides an explicit mapping rule for grid geometries, i.e. the domain shall be a geometry of type grid.  It describes the mapping of grid posts (discrete point grid coverage) or grid cells (discrete surface coverage) to the values in the range set.
-The gml:startPoint is the index position of a point in the grid that is mapped to the first point in the range set (this is also the index position of the first grid post).  If the gml:startPoint property is omitted the gml:startPoint is assumed to be equal to the value of gml:low in the gml:Grid geometry. Subsequent points in the mapping are determined by the value of the gml:sequenceRule.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GridFunctionType">
-		<sequence>
-			<element name="sequenceRule" type="gml:SequenceRuleType" minOccurs="0"/>
-			<element name="startPoint" type="gml:integerList" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<complexType name="SequenceRuleType">
-		<annotation>
-			<documentation>The gml:SequenceRuleType is derived from the gml:SequenceRuleEnumeration through the addition of an axisOrder attribute.  The gml:SequenceRuleEnumeration is an enumerated type. The rule names are defined in ISO 19123. If no rule name is specified the default is "Linear".</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:SequenceRuleEnumeration">
-				<attribute name="order" type="gml:IncrementOrder">
-					<annotation>
-						<appinfo>deprecated</appinfo>
-					</annotation>
-				</attribute>
-				<attribute name="axisOrder" type="gml:AxisDirectionList"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="SequenceRuleEnumeration">
-		<restriction base="string">
-			<enumeration value="Linear"/>
-			<enumeration value="Boustrophedonic"/>
-			<enumeration value="Cantor-diagonal"/>
-			<enumeration value="Spiral"/>
-			<enumeration value="Morton"/>
-			<enumeration value="Hilbert"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="AxisDirectionList">
-		<annotation>
-			<documentation>The different values in a gml:AxisDirectionList indicate the incrementation order to be used on all axes of the grid. Each axis shall be mentioned once and only once.</documentation>
-		</annotation>
-		<list itemType="gml:AxisDirection"/>
-	</simpleType>
-	<simpleType name="AxisDirection">
-		<annotation>
-			<documentation>The value of a gml:AxisDirection indicates the incrementation order to be used on an axis of the grid.</documentation>
-		</annotation>
-		<restriction base="string">
-			<pattern value="[\+\-][1-9][0-9]*"/>
-		</restriction>
-	</simpleType>
-	<element name="MultiPointCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiPointCoverage the domain set is a gml:MultiPoint, that is a collection of arbitrarily distributed geometric points.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiPoint.
-In a gml:MultiPointCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the points of the gml:MultiPoint are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the points of the gml:MultiPoint are mapped to the members of the composite value in document order.
--	For gml:File encodings the points of the gml:MultiPoint are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="MultiCurveCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiCurveCoverage the domain is partioned into a collection of curves comprising a gml:MultiCurve.  The coverage function then maps each curve in the collection to a value in the range set.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiCurve.
-In a gml:MultiCurveCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the curves of the gml:MultiCurve are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the curves of the gml:MultiCurve are mapped to the members of the composite value in document order.
--	For gml:File encodings the curves of the gml:MultiCurve are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="MultiSurfaceCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiSurfaceCoverage the domain is partioned into a collection of surfaces comprising a gml:MultiSurface.  The coverage function than maps each surface in the collection to a value in the range set.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiSurface.
-In a gml:MultiSurfaceCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the surfaces of the gml:MultiSurface are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the surfaces of the gml:MultiSurface are mapped to the members of the composite value in document order.
--	For gml:File encodings the surfaces of the gml:MultiSurface are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="MultiSolidCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>In a gml:MultiSolidCoverage the domain is partioned into a collection of solids comprising a gml:MultiSolid.  The coverage function than maps each solid in the collection to a value in the range set.
-The content model is identical with gml:DiscreteCoverageType, but that gml:domainSet shall have values gml:MultiSolid.
-In a gml:MultiSolidCoverage the mapping from the domain to the range is straightforward.
--	For gml:DataBlock encodings the solids of the gml:MultiSolid are mapped in document order to the tuples of the data block.
--	For gml:CompositeValue encodings the solids of the gml:MultiSolid are mapped to the members of the composite value in document order.
--	For gml:File encodings the solids of the gml:MultiSolid are mapped to the records of the file in sequential order.
-</documentation>
-		</annotation>
-	</element>
-	<element name="GridCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>A gml:GriddedCoverage is a discrete point coverage in which the domain set is a geometric grid of points.
-Note that this is the same as the gml:MultiPointCoverage except that we have a gml:Grid to describe the domain.
-The simple gridded coverage is not geometrically referenced and hence no geometric positions are assignable to the points in the grid. Such geometric positioning is introduced in the gml:RectifiedGridCoverage.</documentation>
-		</annotation>
-	</element>
-	<element name="RectifiedGridCoverage" type="gml:DiscreteCoverageType" substitutionGroup="gml:AbstractDiscreteCoverage">
-		<annotation>
-			<documentation>The gml:RectifiedGridCoverage is a discrete point coverage based on a rectified grid. It is similar to the grid coverage except that the points of the grid are geometrically referenced. The rectified grid coverage has a domain that is a gml:RectifiedGrid geometry.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/datums.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/datums.xsd
deleted file mode 100755
index a62b866..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/datums.xsd
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Clemens Portele (interactive instruments) -->
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:datums:3.2.1">datums.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.5
-The datums schema components can be divided into three logical parts, which define elements and types for XML encoding of the definitions of:
--	Abstract datum
--	Geodetic datums, including ellipsoid and prime meridian
--	Multiple other concrete types of spatial or temporal datums
-These schema components encode the Datum packages of the UML Models of ISO 19111 Clause 10 and ISO/DIS 19136 D.3.10.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="referenceSystems.xsd"/>
-	<include schemaLocation="measures.xsd"/>
-	<element name="AbstractDatum" type="gml:AbstractDatumType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:AbstractDatum specifies the relationship of a coordinate system to the earth, thus creating a coordinate reference system. A datum uses a parameter or set of parameters that determine the location of the origin of the coordinate reference system. Each datum subtype may be associated with only specific types of coordinate systems. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a  [...]
-		</annotation>
-	</element>
-	<complexType name="AbstractDatumType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-					<element ref="gml:anchorDefinition" minOccurs="0"/>
-					<element ref="gml:realizationEpoch" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="anchorDefinition" type="gml:CodeType">
-		<annotation>
-			<documentation>gml:anchorDefinition is a description, possibly including coordinates, of the definition used to anchor the datum to the Earth. Also known as the "origin", especially for engineering and image datums. The codeSpace attribute may be used to reference a source of more detailed on this point or surface, or on a set of such descriptions.
--	For a geodetic datum, this point is also known as the fundamental point, which is traditionally the point where the relationship between geoid and ellipsoid is defined. In some cases, the "fundamental point" may consist of a number of points. In those cases, the parameters defining the geoid/ellipsoid relationship have been averaged for these points, and the averages adopted as the datum definition.
--	For an engineering datum, the anchor definition may be a physical point, or it may be a point with defined coordinates in another CRS.may
--	For an image datum, the anchor definition is usually either the centre of the image or the corner of the image.
--	For a temporal datum, this attribute is not defined. Instead of the anchor definition, a temporal datum carries a separate time origin of type DateTime.</documentation>
-		</annotation>
-	</element>
-	<element name="realizationEpoch" type="date">
-		<annotation>
-			<documentation>gml:realizationEpoch is the time after which this datum definition is valid. See ISO 19111 Table 32 for details.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DatumPropertyType">
-		<annotation>
-			<documentation>gml:DatumPropertyType is a property type for association roles to a datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="GeodeticDatum" type="gml:GeodeticDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:GeodeticDatum is a geodetic datum defines the precise location and orientation in 3-dimensional space of a defined ellipsoid (or sphere), or of a Cartesian coordinate system centered in this ellipsoid (or sphere).</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodeticDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:primeMeridian"/>
-					<element ref="gml:ellipsoid"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="primeMeridian" type="gml:PrimeMeridianPropertyType">
-		<annotation>
-			<documentation>gml:primeMeridian is an association role to the prime meridian used by this geodetic datum.</documentation>
-		</annotation>
-	</element>
-	<element name="ellipsoid" type="gml:EllipsoidPropertyType">
-		<annotation>
-			<documentation>gml:ellipsoid is an association role to the ellipsoid used by this geodetic datum.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodeticDatumPropertyType">
-		<annotation>
-			<documentation>gml:GeodeticDatumPropertyType is a property type for association roles to a geodetic datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeodeticDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="Ellipsoid" type="gml:EllipsoidType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:Ellipsoid is a geometric figure that may be used to describe the approximate shape of the earth. In mathematical terms, it is a surface formed by the rotation of an ellipse about its minor axis.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EllipsoidType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:semiMajorAxis"/>
-					<element ref="gml:secondDefiningParameter"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="semiMajorAxis" type="gml:MeasureType">
-		<annotation>
-			<documentation>gml:semiMajorAxis specifies the length of the semi-major axis of the ellipsoid, with its units. Uses the MeasureType with the restriction that the unit of measure referenced by uom must be suitable for a length, such as metres or feet.</documentation>
-		</annotation>
-	</element>
-	<element name="secondDefiningParameter">
-		<annotation>
-			<documentation>gml:secondDefiningParameter is a property containing the definition of the second parameter that defines the shape of an ellipsoid. An ellipsoid requires two defining parameters: semi-major axis and inverse flattening or semi-major axis and semi-minor axis. When the reference body is a sphere rather than an ellipsoid, only a single defining parameter is required, namely the radius of the sphere; in that case, the semi-major axis "degenerates" into the radius of the sphere.
-The inverseFlattening element contains the inverse flattening value of the ellipsoid. This value is a scale factor (or ratio). It uses gml:LengthType with the restriction that the unit of measure referenced by the uom attribute must be suitable for a scale factor, such as percent, permil, or parts-per-million.
-The semiMinorAxis element contains the length of the semi-minor axis of the ellipsoid. When the isSphere element is included, the ellipsoid is degenerate and is actually a sphere. The sphere is completely defined by the semi-major axis, which is the radius of the sphere.</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="gml:SecondDefiningParameter"/>
-			</sequence>
-		</complexType>
-	</element>
-	<element name="SecondDefiningParameter">
-		<complexType>
-			<choice>
-				<element name="inverseFlattening" type="gml:MeasureType"/>
-				<element name="semiMinorAxis" type="gml:LengthType"/>
-				<element name="isSphere" type="boolean" default="true"/>
-			</choice>
-		</complexType>
-	</element>
-	<complexType name="EllipsoidPropertyType">
-		<annotation>
-			<documentation>gml:EllipsoidPropertyType is a property type for association roles to an ellipsoid, either referencing or containing the definition of that ellipsoid.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Ellipsoid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="PrimeMeridian" type="gml:PrimeMeridianType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:PrimeMeridian defines the origin from which longitude values are determined. The default value for the prime meridian gml:identifier value is "Greenwich".</documentation>
-		</annotation>
-	</element>
-	<complexType name="PrimeMeridianType">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:greenwichLongitude"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="greenwichLongitude" type="gml:AngleType">
-		<annotation>
-			<documentation>gml:greenwichLongitude is the longitude of the prime meridian measured from the Greenwich meridian, positive eastward. If the value of the prime meridian "name" is "Greenwich" then the value of greenwichLongitude shall be 0 degrees.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PrimeMeridianPropertyType">
-		<annotation>
-			<documentation>gml:PrimeMeridianPropertyType is a property type for association roles to a prime meridian, either referencing or containing the definition of that meridian.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:PrimeMeridian"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="EngineeringDatum" type="gml:EngineeringDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:EngineeringDatum defines the origin of an engineering coordinate reference system, and is used in a region around that origin. This origin may be fixed with respect to the earth (such as a defined point at a construction site), or be a defined point on a moving vehicle (such as on a ship or satellite).</documentation>
-		</annotation>
-	</element>
-	<complexType name="EngineeringDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="EngineeringDatumPropertyType">
-		<annotation>
-			<documentation>gml:EngineeringDatumPropertyType is a property type for association roles to an engineering datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:EngineeringDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="ImageDatum" type="gml:ImageDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:ImageDatum defines the origin of an image coordinate reference system, and is used in a local context only. For an image datum, the anchor definition is usually either the centre of the image or the corner of the image. For more information, see ISO 19111 B.3.5.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:pixelInCell"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="pixelInCell" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>gml:pixelInCell is a specification of the way an image grid is associated with the image data attributes. The required codeSpace attribute shall reference a source of information specifying the values and meanings of all the allowed string values for this property.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ImageDatumPropertyType">
-		<annotation>
-			<documentation>gml:ImageDatumPropertyType is a property type for association roles to an image datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ImageDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="VerticalDatum" type="gml:VerticalDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>gml:VerticalDatum is a textual description and/or a set of parameters identifying a particular reference level surface used as a zero-height surface, including its position with respect to the Earth for any of the height types recognized by this International Standard.</documentation>
-		</annotation>
-	</element>
-	<complexType name="VerticalDatumType">
-		<complexContent>
-			<extension base="gml:AbstractDatumType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="VerticalDatumPropertyType">
-		<annotation>
-			<documentation>gml:VerticalDatumPropertyType is property type for association roles to a vertical datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:VerticalDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TemporalDatum" type="gml:TemporalDatumType" substitutionGroup="gml:AbstractDatum">
-		<annotation>
-			<documentation>A gml:TemporalDatum defines the origin of a Temporal Reference System. This type omits the "anchorDefinition" and "realizationEpoch" elements and adds the "origin" element with the dateTime type.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalDatumType">
-		<complexContent>
-			<extension base="gml:TemporalDatumBaseType">
-				<sequence>
-					<element ref="gml:origin"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TemporalDatumBaseType" abstract="true">
-		<annotation>
-			<documentation>The TemporalDatumBaseType partially defines the origin of a temporal coordinate reference system. This type restricts the AbstractDatumType to remove the "anchorDefinition" and "realizationEpoch" elements.</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractDatumType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:remarks" minOccurs="0"/>
-					<element ref="gml:domainOfValidity" minOccurs="0"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="origin" type="dateTime">
-		<annotation>
-			<documentation>gml:origin is the date and time origin of this temporal datum.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TemporalDatumPropertyType">
-		<annotation>
-			<documentation>gml:TemporalDatumPropertyType is a property type for association roles to a temporal datum, either referencing or containing the definition of that datum.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalDatum"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/deprecatedTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/deprecatedTypes.xsd
deleted file mode 100755
index 7dbd79b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/deprecatedTypes.xsd
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:deprecatedTypes:3.2.1">deprecatedTypes.xsd</appinfo>
-		<documentation>All global schema components that are part of the GML schema, but were deprecated. See Annex I.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<element name="Null" type="gml:NilReasonType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="anchorPoint" type="gml:CodeType" substitutionGroup="gml:anchorDefinition">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="datumRef" type="gml:DatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesPrimeMeridian" type="gml:PrimeMeridianPropertyType" substitutionGroup="gml:primeMeridian">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesEllipsoid" type="gml:EllipsoidPropertyType" substitutionGroup="gml:ellipsoid">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="geodeticDatumRef" type="gml:GeodeticDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="ellipsoidRef" type="gml:EllipsoidPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="primeMeridianRef" type="gml:PrimeMeridianPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="engineeringDatumRef" type="gml:EngineeringDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="imageDatumRef" type="gml:ImageDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="verticalDatumRef" type="gml:VerticalDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="temporalDatumRef" type="gml:TemporalDatumPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="coordinateOperationRef" type="gml:CoordinateOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="singleOperationRef" type="gml:SingleOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="AbstractOperation" type="gml:AbstractCoordinateOperationType" abstract="true" substitutionGroup="gml:AbstractSingleOperation">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="OperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractOperation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="operationRef" type="gml:OperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="generalConversionRef" type="gml:GeneralConversionPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="generalTransformationRef" type="gml:GeneralTransformationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesSingleOperation" type="gml:CoordinateOperationPropertyType" substitutionGroup="gml:coordOperation">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="concatenatedOperationRef" type="gml:ConcatenatedOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesOperation" type="gml:CoordinateOperationPropertyType" substitutionGroup="gml:coordOperation">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="passThroughOperationRef" type="gml:PassThroughOperationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesMethod" type="gml:OperationMethodPropertyType" substitutionGroup="gml:method">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesValue" type="gml:AbstractGeneralParameterValuePropertyType" substitutionGroup="gml:parameterValue">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="conversionRef" type="gml:ConversionPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="transformationRef" type="gml:TransformationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="dmsAngleValue" type="gml:DMSAngleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="valueOfParameter" type="gml:OperationParameterPropertyType" substitutionGroup="gml:operationParameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="includesValue" type="gml:AbstractGeneralParameterValuePropertyType" substitutionGroup="gml:parameterValue">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="valuesOfGroup" type="gml:OperationParameterGroupPropertyType" substitutionGroup="gml:group">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="methodFormula" type="gml:CodeType" substitutionGroup="gml:formula">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:generalOperationParameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="operationMethodRef" type="gml:OperationMethodPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="abstractGeneralOperationParameterRef" type="gml:AbstractGeneralOperationParameterPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="operationParameterRef" type="gml:OperationParameterPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="includesParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:parameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="operationParameterGroupRef" type="gml:OperationParameterPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="referenceSystemRef" type="gml:CRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="crsRef" type="gml:CRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="coordinateSystemAxisRef" type="gml:CoordinateSystemAxisPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesAxis" type="gml:CoordinateSystemAxisPropertyType" substitutionGroup="gml:axis">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="coordinateSystemRef" type="gml:CoordinateSystemPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="ellipsoidalCSRef" type="gml:EllipsoidalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="cartesianCSRef" type="gml:CartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="verticalCSRef" type="gml:VerticalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="TemporalCS" type="gml:TemporalCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="TemporalCSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="TemporalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TemporalCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="temporalCSRef" type="gml:TemporalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="linearCSRef" type="gml:LinearCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="userDefinedCSRef" type="gml:UserDefinedCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="sphericalCSRef" type="gml:SphericalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="polarCSRef" type="gml:PolarCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="cylindricalCSRef" type="gml:CylindricalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="ObliqueCartesianCS" type="gml:ObliqueCartesianCSType" substitutionGroup="gml:AbstractCoordinateSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ObliqueCartesianCSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCoordinateSystemType"/>
-		</complexContent>
-	</complexType>
-	<complexType name="ObliqueCartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:ObliqueCartesianCS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="obliqueCartesianCSRef" type="gml:ObliqueCartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="singleCRSRef" type="gml:SingleCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="definedByConversion" type="gml:GeneralConversionPropertyType" substitutionGroup="gml:conversion">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="includesSingleCRS" type="gml:SingleCRSPropertyType" substitutionGroup="gml:componentReferenceSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="compoundCRSRef" type="gml:CompoundCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesEllipsoidalCS" type="gml:EllipsoidalCSPropertyType" substitutionGroup="gml:ellipsoidalCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesCartesianCS" type="gml:CartesianCSPropertyType" substitutionGroup="gml:cartesianCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesSphericalCS" type="gml:SphericalCSPropertyType" substitutionGroup="gml:sphericalCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesGeodeticDatum" type="gml:GeodeticDatumPropertyType" substitutionGroup="gml:geodeticDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesVerticalCS" type="gml:VerticalCSPropertyType" substitutionGroup="gml:verticalCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesVerticalDatum" type="gml:VerticalDatumPropertyType" substitutionGroup="gml:verticalDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="verticalCRSRef" type="gml:VerticalCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="baseGeographicCRS" type="gml:GeographicCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="projectedCRSRef" type="gml:ProjectedCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesCS" type="gml:CoordinateSystemPropertyType" substitutionGroup="gml:coordinateSystem">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="derivedCRSRef" type="gml:DerivedCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesEngineeringDatum" type="gml:EngineeringDatumPropertyType" substitutionGroup="gml:engineeringDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="engineeringCRSRef" type="gml:EngineeringCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesAffineCS" type="gml:AffineCSPropertyType" substitutionGroup="gml:affineCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesImageDatum" type="gml:ImageDatumPropertyType" substitutionGroup="gml:imageDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesObliqueCartesianCS" type="gml:ObliqueCartesianCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="imageCRSRef" type="gml:ImageCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesTimeCS" type="gml:TimeCSPropertyType" substitutionGroup="gml:timeCS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesTemporalCS" type="gml:TemporalCSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="usesTemporalDatum" type="gml:TemporalDatumPropertyType" substitutionGroup="gml:temporalDatum">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="temporalCRSRef" type="gml:TemporalCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="GeographicCRS" type="gml:GeographicCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GeographicCRSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<element ref="gml:usesEllipsoidalCS"/>
-					<element ref="gml:usesGeodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="GeographicCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeographicCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="geographicCRSRef" type="gml:GeographicCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="GeocentricCRS" type="gml:GeocentricCRSType" substitutionGroup="gml:AbstractSingleCRS">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GeocentricCRSType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractCRSType">
-				<sequence>
-					<choice>
-						<element ref="gml:usesCartesianCS"/>
-						<element ref="gml:usesSphericalCS"/>
-					</choice>
-					<element ref="gml:usesGeodeticDatum"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="GeocentricCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:GeocentricCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="geocentricCRSRef" type="gml:GeocentricCRSPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<attribute name="uom" type="anyURI">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</attribute>
-	<simpleType name="SuccessionType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="substitution"/>
-			<enumeration value="division"/>
-			<enumeration value="fusion"/>
-			<enumeration value="initiation"/>
-		</restriction>
-	</simpleType>
-	<element name="dmsAngle" type="gml:DMSAngleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="DMSAngleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:degrees"/>
-			<choice minOccurs="0">
-				<element ref="gml:decimalMinutes"/>
-				<sequence>
-					<element ref="gml:minutes"/>
-					<element ref="gml:seconds" minOccurs="0"/>
-				</sequence>
-			</choice>
-		</sequence>
-	</complexType>
-	<element name="degrees" type="gml:DegreesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="DegreesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:DegreeValueType">
-				<attribute name="direction">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="N"/>
-							<enumeration value="E"/>
-							<enumeration value="S"/>
-							<enumeration value="W"/>
-							<enumeration value="+"/>
-							<enumeration value="-"/>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="DegreeValueType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="nonNegativeInteger">
-			<maxInclusive value="359"/>
-		</restriction>
-	</simpleType>
-	<element name="decimalMinutes" type="gml:DecimalMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="DecimalMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="decimal">
-			<minInclusive value="0.00"/>
-			<maxExclusive value="60.00"/>
-		</restriction>
-	</simpleType>
-	<element name="minutes" type="gml:ArcMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="ArcMinutesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="nonNegativeInteger">
-			<maxInclusive value="59"/>
-		</restriction>
-	</simpleType>
-	<element name="seconds" type="gml:ArcSecondsType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="ArcSecondsType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="decimal">
-			<minInclusive value="0.00"/>
-			<maxExclusive value="60.00"/>
-		</restriction>
-	</simpleType>
-	<complexType name="AngleChoiceType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<choice>
-			<element ref="gml:angle"/>
-			<element ref="gml:dmsAngle"/>
-		</choice>
-	</complexType>
-	<attribute name="remoteSchema" type="anyURI">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</attribute>
-	<element name="member" type="gml:AssociationRoleType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ArrayAssociationType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractObject" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="members" type="gml:ArrayAssociationType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="metaDataProperty" type="gml:MetaDataPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="Bag" type="gml:BagType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="BagType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:member" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Array" type="gml:ArrayType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="ArrayType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:members" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="MetaDataPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractMetaData"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attribute name="about" type="anyURI"/>
-	</complexType>
-	<element name="AbstractMetaData" type="gml:AbstractMetaDataType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="AbstractMetaDataType" abstract="true" mixed="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence/>
-		<attribute ref="gml:id"/>
-	</complexType>
-	<element name="GenericMetaData" type="gml:GenericMetaDataType" substitutionGroup="gml:AbstractMetaData">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="GenericMetaDataType" mixed="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent mixed="true">
-			<extension base="gml:AbstractMetaDataType">
-				<sequence>
-					<any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="coordinates" type="gml:CoordinatesType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="pointRep" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="location" type="gml:LocationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="LocationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<choice>
-				<element ref="gml:AbstractGeometry"/>
-				<element ref="gml:LocationKeyWord"/>
-				<element ref="gml:LocationString"/>
-				<element ref="gml:Null"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="LocationString" type="gml:StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="LocationKeyWord" type="gml:CodeType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="priorityLocation" type="gml:PriorityLocationPropertyType" substitutionGroup="gml:location">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="PriorityLocationPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:LocationPropertyType">
-				<attribute name="priority" type="string"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="featureMember" type="gml:FeaturePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="featureProperty" type="gml:FeaturePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="FeatureArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractFeature"/>
-		</sequence>
-	</complexType>
-	<element name="featureMembers" type="gml:FeatureArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="BoundedFeatureType" abstract="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractFeatureType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy"/>
-					<element ref="gml:location" minOccurs="0"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="AbstractFeatureCollectionType" abstract="true">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:featureMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:featureMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractFeatureCollection" type="gml:AbstractFeatureCollectionType" abstract="true" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="FeatureCollection" type="gml:FeatureCollectionType" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="FeatureCollectionType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureCollectionType"/>
-		</complexContent>
-	</complexType>
-	<element name="track" type="gml:HistoryPropertyType" substitutionGroup="gml:history">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="DefinitionCollection" type="gml:DictionaryType" substitutionGroup="gml:Definition">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="definitionMember" type="gml:DictionaryEntryType" substitutionGroup="gml:dictionaryEntry">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="indirectEntry" type="gml:IndirectEntryType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="IndirectEntryType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<sequence>
-			<element ref="gml:DefinitionProxy"/>
-		</sequence>
-	</complexType>
-	<element name="DefinitionProxy" type="gml:DefinitionProxyType" substitutionGroup="gml:Definition">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="DefinitionProxyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:definitionRef"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="definitionRef" type="gml:ReferenceType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="MappingRule" type="gml:StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<simpleType name="IncrementOrder">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="+x+y"/>
-			<enumeration value="+y+x"/>
-			<enumeration value="+x-y"/>
-			<enumeration value="-x-y"/>
-		</restriction>
-	</simpleType>
-	<element name="centerOf" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="position" type="gml:PointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="extentOf" type="gml:SurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="edgeOf" type="gml:CurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="centerLineOf" type="gml:CurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiLocation" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCenterOf" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiPosition" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCenterLineOf" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiEdgeOf" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCoverage" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiExtentOf" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="polygonPatches" type="gml:SurfacePatchArrayPropertyType" substitutionGroup="gml:patches">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="trianglePatches" type="gml:SurfacePatchArrayPropertyType" substitutionGroup="gml:patches">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiPointDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCurveDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSurfaceDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSolidDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="gridDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="rectifiedGridDomain" type="gml:DomainSetType" substitutionGroup="gml:domainSet">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="generalOperationParameter" type="gml:AbstractGeneralOperationParameterPropertyType" substitutionGroup="gml:parameter">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="MovingObjectStatus" type="gml:MovingObjectStatusType" substitutionGroup="gml:AbstractTimeSlice">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<complexType name="MovingObjectStatusType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeSliceType">
-				<sequence>
-					<choice>
-						<element name="position" type="gml:GeometryPropertyType"/>
-						<element ref="gml:pos"/>
-						<element ref="gml:locationName"/>
-						<element ref="gml:locationReference"/>
-						<element ref="gml:location"/>
-					</choice>
-					<element name="speed" type="gml:MeasureType" minOccurs="0"/>
-					<element name="bearing" type="gml:DirectionPropertyType" minOccurs="0"/>
-					<element name="acceleration" type="gml:MeasureType" minOccurs="0"/>
-					<element name="elevation" type="gml:MeasureType" minOccurs="0"/>
-					<element ref="gml:status" minOccurs="0"/>
-					<element ref="gml:statusReference" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="status" type="gml:StringOrRefType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="statusReference" type="gml:ReferenceType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-  <element name="topoComplexProperty" type="gml:TopoComplexPropertyType">
-    <annotation>
-			<appinfo>deprecated</appinfo>
-    </annotation>
-  </element>
-	<element name="multiPointProperty" type="gml:MultiPointPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiCurveProperty" type="gml:MultiCurvePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSurfaceProperty" type="gml:MultiSurfacePropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiSolidProperty" type="gml:MultiSolidPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="multiGeometryProperty" type="gml:MultiGeometryPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="pointArrayProperty" type="gml:PointArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="curveArrayProperty" type="gml:CurveArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="surfaceArrayProperty" type="gml:SurfaceArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-	<element name="solidArrayProperty" type="gml:SolidArrayPropertyType">
-		<annotation>
-			<appinfo>deprecated</appinfo>
-		</annotation>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/dictionary.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/dictionary.xsd
deleted file mode 100755
index 8d6f94a..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/dictionary.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:opengis:specification:gml:schema-xsd:dictionary:v3.2.1">dictionary.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 16.
-Many applications require definitions of terms which are used within instance documents as the values of certain properties or as reference information to tie properties to standard information values in some way.  Units of measure and descriptions of measurable phenomena are two particular examples. 
-It will often be convenient to use definitions provided by external authorities. These may already be packaged for delivery in various ways, both online and offline. In order that they may be referred to from GML documents it is generally necessary that a URI be available for each definition. Where this is the case then it is usually preferable to refer to these directly. 
-Alternatively, it may be convenient or necessary to capture definitions in XML, either embedded within an instance document containing features or as a separate document. The definitions may be transcriptions from an external source, or may be new definitions for a local purpose. In order to support this case, some simple components are provided in GML in the form of 
--	a generic gml:Definition, which may serve as the basis for more specialized definitions
--	a generic gml:Dictionary, which allows a set of definitions or references to definitions to be collected 
-These components may be used directly, but also serve as the basis for more specialised definition elements in GML, in particular: coordinate operations, coordinate reference systems, datums, temporal reference systems, and units of measure.  
-Note that the GML definition and dictionary components implement a simple nested hierarchy of definitions with identifiers. The latter provide handles which may be used in the description of more complex relationships between terms. However, the GML dictionary components are not intended to provide direct support for complex taxonomies, ontologies or thesauri.  Specialised XML tools are available to satisfy the more sophisticated requirements.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="gmlBase.xsd"/>
-	<element name="Definition" type="gml:DefinitionType" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The basic gml:Definition element specifies a definition, which can be included in or referenced by a dictionary. 
-The content model for a generic definition is a derivation from gml:AbstractGMLType.  
-The gml:description property element shall hold the definition if this can be captured in a simple text string, or the gml:descriptionReference property element may carry a link to a description elsewhere.
-The gml:identifier element shall provide one identifier identifying this definition. The identifier shall be unique within the dictionaries using this definition. 
-The gml:name elements shall provide zero or more terms and synonyms for which this is the definition.
-The gml:remarks element shall be used to hold additional textual information that is not conceptually part of the definition but is useful in understanding the definition.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DefinitionBaseType">
-		<complexContent>
-			<restriction base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:description" minOccurs="0"/>
-					<element ref="gml:descriptionReference" minOccurs="0"/>
-					<element ref="gml:identifier"/>
-					<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute ref="gml:id" use="required"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<complexType name="DefinitionType">
-		<complexContent>
-			<extension base="gml:DefinitionBaseType">
-				<sequence>
-					<element ref="gml:remarks" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="remarks" type="string"/>
-	<element name="Dictionary" type="gml:DictionaryType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>Sets of definitions may be collected into dictionaries or collections.
-A gml:Dictionary is a non-abstract collection of definitions.
-The gml:Dictionary content model adds a list of gml:dictionaryEntry properties that contain or reference gml:Definition objects.  A database handle (gml:id attribute) is required, in order that this collection may be referred to. The standard gml:identifier, gml:description, gml:descriptionReference and gml:name properties are available to reference or contain more information about this dictionary. The gml:description and gml:descriptionReference property elements may be used for a desc [...]
-		</annotation>
-	</element>
-	<complexType name="DictionaryType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<choice minOccurs="0" maxOccurs="unbounded">
-					<element ref="gml:dictionaryEntry"/>
-					<element ref="gml:indirectEntry"/>
-				</choice>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="dictionaryEntry" type="gml:DictionaryEntryType">
-		<annotation>
-			<documentation>This property element contains or refers to the definitions which are members of a dictionary. 
-The content model follows the standard GML property pattern, so a gml:dictionaryEntry may either contain or refer to a single gml:Definition. Since gml:Dictionary is substitutable for gml:Definition, the content of an entry may itself be a lower level dictionary. 
-Note that if the value is provided by reference, this definition does not carry a handle (gml:id) in this context, so does not allow external references to this specific definition in this context.  When used in this way the referenced definition will usually be in a dictionary in the same XML document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DictionaryEntryType">
-		<complexContent>
-			<extension base="gml:AbstractMemberType">
-				<sequence minOccurs="0">
-					<element ref="gml:Definition"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/direction.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/direction.xsd
deleted file mode 100755
index 8b0f7f5..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/direction.xsd
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:direction:3.2.1">direction.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 18.
-The direction schema components provide the GML Application Schema developer with a standard property element to describe direction, and associated objects that may be used to express orientation, direction, heading, bearing or other directional aspects of geographic features.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<element name="direction" type="gml:DirectionPropertyType">
-		<annotation>
-			<documentation>The property gml:direction is intended as a pre-defined property expressing a direction to be assigned to features defined in a GML application schema.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DirectionPropertyType">
-		<choice minOccurs="0">
-			<element name="DirectionVector" type="gml:DirectionVectorType"/>
-			<element name="DirectionDescription" type="gml:DirectionDescriptionType"/>
-			<element name="CompassPoint" type="gml:CompassPointEnumeration"/>
-			<element name="DirectionKeyword" type="gml:CodeType"/>
-			<element name="DirectionString" type="gml:StringOrRefType"/>
-		</choice>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="DirectionVectorType">
-		<annotation>
-			<documentation>Direction vectors are specified by providing components of a vector.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:vector"/>
-			<sequence>
-				<annotation>
-					<appinfo>deprecated</appinfo>
-				</annotation>
-				<element name="horizontalAngle" type="gml:AngleType"/>
-				<element name="verticalAngle" type="gml:AngleType"/>
-			</sequence>
-		</choice>
-	</complexType>
-	<complexType name="DirectionDescriptionType">
-		<annotation>
-			<documentation>direction descriptions are specified by a compass point code, a keyword, a textual description or a reference to a description.
-A gml:compassPoint is specified by a simple enumeration.  	
-In addition, thre elements to contain text-based descriptions of direction are provided.  
-If the direction is specified using a term from a list, gml:keyword should be used, and the list indicated using the value of the codeSpace attribute. 
-if the direction is decribed in prose, gml:direction or gml:reference should be used, allowing the value to be included inline or by reference.</documentation>
-		</annotation>
-		<choice>
-			<element name="compassPoint" type="gml:CompassPointEnumeration"/>
-			<element name="keyword" type="gml:CodeType"/>
-			<element name="description" type="string"/>
-			<element name="reference" type="gml:ReferenceType"/>
-		</choice>
-	</complexType>
-	<simpleType name="CompassPointEnumeration">
-		<annotation>
-			<documentation>These directions are necessarily approximate, giving direction with a precision of 22.5°. It is thus generally unnecessary to specify the reference frame, though this may be detailed in the definition of a GML application language.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="N"/>
-			<enumeration value="NNE"/>
-			<enumeration value="NE"/>
-			<enumeration value="ENE"/>
-			<enumeration value="E"/>
-			<enumeration value="ESE"/>
-			<enumeration value="SE"/>
-			<enumeration value="SSE"/>
-			<enumeration value="S"/>
-			<enumeration value="SSW"/>
-			<enumeration value="SW"/>
-			<enumeration value="WSW"/>
-			<enumeration value="W"/>
-			<enumeration value="WNW"/>
-			<enumeration value="NW"/>
-			<enumeration value="NNW"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/dynamicFeature.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/dynamicFeature.xsd
deleted file mode 100755
index d755067..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/dynamicFeature.xsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:dynamicFeature:3.2.1">dynamicFeature.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.6.
-A number of types and relationships are defined to represent the time-varying properties of geographic features. 
-In a comprehensive treatment of spatiotemporal modeling, Langran (see Bibliography) distinguished three principal temporal entities: states, events, and evidence; the schema specified in the following Subclauses incorporates elements for each.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="direction.xsd"/>
-	<element name="dataSource" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>Evidence is represented by a simple gml:dataSource or gml:dataSourceReference property that indicates the source of the temporal data. The remote link attributes of the gml:dataSource element have been deprecated along with its current type.</documentation>
-		</annotation>
-	</element>
-	<element name="dataSourceReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>Evidence is represented by a simple gml:dataSource or gml:dataSourceReference property that indicates the source of the temporal data.</documentation>
-		</annotation>
-	</element>
-	<group name="dynamicProperties">
-		<annotation>
-			<documentation>A convenience group. This allows an application schema developer to include dynamic properties in a content model in a standard fashion.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:validTime" minOccurs="0"/>
-			<element ref="gml:history" minOccurs="0"/>
-			<element ref="gml:dataSource" minOccurs="0"/>
-			<element ref="gml:dataSourceReference" minOccurs="0"/>
-		</sequence>
-	</group>
-	<element name="DynamicFeature" type="gml:DynamicFeatureType" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>States are captured by time-stamped instances of a feature. The content model extends the standard gml:AbstractFeatureType with the gml:dynamicProperties model group.
-Each time-stamped instance represents a 'snapshot' of a feature. The dynamic feature classes will normally be extended to suit particular applications.  A dynamic feature bears either a time stamp or a history.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DynamicFeatureType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<group ref="gml:dynamicProperties"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="DynamicFeatureCollection" type="gml:DynamicFeatureCollectionType" substitutionGroup="gml:DynamicFeature">
-		<annotation>
-			<documentation>A gml:DynamicFeatureCollection is a feature collection that has a gml:validTime property (i.e. is a snapshot of the feature collection) or which has a gml:history property that contains one or more gml:AbstractTimeSlices each of which contain values of the time varying properties of the feature collection.  Note that the gml:DynamicFeatureCollection may be one of the following:
-1.	A feature collection which consists of static feature members (members do not change in time) but which has properties of the collection object as a whole that do change in time .  
-2.	A feature collection which consists of dynamic feature members (the members are gml:DynamicFeatures) but which also has properties of the collection as a whole that vary in time.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DynamicFeatureCollectionType">
-		<complexContent>
-			<extension base="gml:DynamicFeatureType">
-				<sequence>
-					<element ref="gml:dynamicMembers"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="dynamicMembers" type="gml:DynamicFeatureMemberType"/>
-	<complexType name="DynamicFeatureMemberType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureMemberType">
-				<sequence>
-					<element ref="gml:DynamicFeature" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimeSlice" type="gml:AbstractTimeSliceType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>To describe an event — an action that occurs at an instant or over an interval of time — GML provides the gml:AbtractTimeSlice element. A timeslice encapsulates the time-varying properties of a dynamic feature -- it shall be extended to represent a time stamped projection of a specific feature. The gml:dataSource property describes how the temporal data was acquired.
-A gml:AbstractTimeSlice instance is a GML object that encapsulates updates of the dynamic—or volatile—properties that reflect some change event; it thus includes only those feature properties that have actually changed due to some process.
-gml:AbstractTimeSlice basically provides a facility for attribute-level time stamping, in contrast to the object-level time stamping of dynamic feature instances. 
-The time slice can thus be viewed as event or process-oriented, whereas a snapshot is more state or structure-oriented. A timeslice has richer causality, whereas a snapshot merely portrays the status of the whole. 
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeSliceType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:validTime"/>
-					<element ref="gml:dataSource" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="history" type="gml:HistoryPropertyType">
-		<annotation>
-			<documentation>A generic sequence of events constitute a gml:history of an object.
-The gml:history element contains a set of elements in the substitution group headed by the abstract element gml:AbstractTimeSlice, representing the time-varying properties of interest. The history property of a dynamic feature associates a feature instance with a sequence of time slices (i.e. change events) that encapsulate the evolution of the feature.</documentation>
-		</annotation>
-	</element>
-	<complexType name="HistoryPropertyType">
-		<sequence>
-			<element ref="gml:AbstractTimeSlice" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/feature.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/feature.xsd
deleted file mode 100755
index 1892ef6..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/feature.xsd
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:feature:3.2.1">feature.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 9.
-A GML feature is a (representation of a) identifiable real-world object in a selected domain of discourse. The feature schema provides a framework for the creation of GML features and feature collections.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<complexType name="AbstractFeatureType" abstract="true">
-		<annotation>
-			<documentation>The basic feature model is given by the gml:AbstractFeatureType.
-The content model for gml:AbstractFeatureType adds two specific properties suitable for geographic features to the content model defined in gml:AbstractGMLType. 
-The value of the gml:boundedBy property describes an envelope that encloses the entire feature instance, and is primarily useful for supporting rapid searching for features that occur in a particular location. 
-The value of the gml:location property describes the extent, position or relative location of the feature.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:boundedBy" minOccurs="0"/>
-					<element ref="gml:location" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractFeature" type="gml:AbstractFeatureType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>This abstract element serves as the head of a substitution group which may contain any elements whose content model is derived from gml:AbstractFeatureType.  This may be used as a variable in the construction of content models.  
-gml:AbstractFeature may be thought of as "anything that is a GML feature" and may be used to define variables or templates in which the value of a GML property is "any feature". This occurs in particular in a GML feature collection where the feature member properties contain one or multiple copies of gml:AbstractFeature respectively.</documentation>
-		</annotation>
-	</element>
-	<complexType name="FeaturePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractFeature"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="boundedBy" type="gml:BoundingShapeType" nillable="true">
-		<annotation>
-			<documentation>This property describes the minimum bounding box or rectangle that encloses the entire feature.</documentation>
-		</annotation>
-	</element>
-	<complexType name="BoundingShapeType">
-		<sequence>
-			<choice>
-				<element ref="gml:Envelope"/>
-				<element ref="gml:Null"/>
-			</choice>
-		</sequence>
-		<attribute name="nilReason" type="gml:NilReasonType"/>
-	</complexType>
-	<element name="EnvelopeWithTimePeriod" type="gml:EnvelopeWithTimePeriodType" substitutionGroup="gml:Envelope">
-		<annotation>
-			<documentation>gml:EnvelopeWithTimePeriod is provided for envelopes that include a temporal extent. It adds two time position properties, gml:beginPosition and gml:endPosition, which describe the extent of a time-envelope.  
-Since gml:EnvelopeWithTimePeriod is assigned to the substitution group headed by gml:Envelope, it may be used whenever gml:Envelope is valid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="EnvelopeWithTimePeriodType">
-		<complexContent>
-			<extension base="gml:EnvelopeType">
-				<sequence>
-					<element name="beginPosition" type="gml:TimePositionType"/>
-					<element name="endPosition" type="gml:TimePositionType"/>
-				</sequence>
-				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="locationName" type="gml:CodeType">
-		<annotation>
-			<documentation>The gml:locationName property element is a convenience property where the text value describes the location of the feature. If the location names are selected from a controlled list, then the list shall be identified in the codeSpace attribute.</documentation>
-		</annotation>
-	</element>
-	<element name="locationReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>The gml:locationReference property element is a convenience property where the text value referenced by the xlink:href attribute describes the location of the feature.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractFeatureMemberType" abstract="true">
-		<annotation>
-			<documentation>To create a collection of GML features, a property type shall be derived by extension from gml:AbstractFeatureMemberType.
-By default, this abstract property type does not imply any ownership of the features in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of a feature in the collection. A collection shall not own a feature already owned by another object.</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryAggregates.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryAggregates.xsd
deleted file mode 100755
index 9ffbdc0..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryAggregates.xsd
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryAggregates:3.2.1">geometryAggregates.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 12.3.
-Geometric aggregates (i.e. instances of a subtype of gml:AbstractGeometricAggregateType) are arbitrary aggregations of geometry elements. They are not assumed to have any additional internal structure and are used to "collect" pieces of geometry of a specified type. Application schemas may use aggregates for features that use multiple geometric objects in their representations.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryPrimitives.xsd"/>
-	<complexType name="AbstractGeometricAggregateType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractGeometricAggregate" type="gml:AbstractGeometricAggregateType" abstract="true" substitutionGroup="gml:AbstractGeometry">
-		<annotation>
-			<documentation>gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiGeometryType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:geometryMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:geometryMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiGeometry" type="gml:MultiGeometryType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>gml:MultiGeometry is a collection of one or more GML geometry objects of arbitrary type. 
-The members of the geometric aggregate may be specified either using the "standard" property (gml:geometryMember) or the array property (gml:geometryMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="geometryMember" type="gml:GeometryPropertyType">
-		<annotation>
-			<documentation>This property element either references a geometry element via the XLink-attributes or contains the geometry element.</documentation>
-		</annotation>
-	</element>
-	<element name="geometryMembers" type="gml:GeometryArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of geometry elements. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiGeometryPropertyType">
-		<annotation>
-			<documentation>A property that has a geometric aggregate as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeometricAggregate"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiPointType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:pointMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:pointMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiPoint" type="gml:MultiPointType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiPoint consists of one or more gml:Points.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:pointMember) or the array property (gml:pointMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="pointMember" type="gml:PointPropertyType">
-		<annotation>
-			<documentation>This property element either references a Point via the XLink-attributes or contains the Point element.</documentation>
-		</annotation>
-	</element>
-	<element name="pointMembers" type="gml:PointArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of points. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiPointPropertyType">
-		<annotation>
-			<documentation>A property that has a collection of points as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiPoint"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiCurveType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:curveMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:curveMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiCurve" type="gml:MultiCurveType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiCurve is defined by one or more gml:AbstractCurves.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:curveMember) or the array property (gml:curveMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="curveMembers" type="gml:CurveArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of curves. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiCurvePropertyType">
-		<annotation>
-			<documentation>A property that has a collection of curves as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiSurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:surfaceMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:surfaceMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiSurface" type="gml:MultiSurfaceType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiSurface is defined by one or more gml:AbstractSurfaces.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:surfaceMember) or the array property (gml:surfaceMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="surfaceMembers" type="gml:SurfaceArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of surfaces. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiSurfacePropertyType">
-		<annotation>
-			<documentation>A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="MultiSolidType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricAggregateType">
-				<sequence>
-					<element ref="gml:solidMember" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:solidMembers" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="MultiSolid" type="gml:MultiSolidType" substitutionGroup="gml:AbstractGeometricAggregate">
-		<annotation>
-			<documentation>A gml:MultiSolid is defined by one or more gml:AbstractSolids.
-The members of the geometric aggregate may be specified either using the "standard" property (gml:solidMember) or the array property (gml:solidMembers). It is also valid to use both the "standard" and the array properties in the same collection.</documentation>
-		</annotation>
-	</element>
-	<element name="solidMember" type="gml:SolidPropertyType">
-		<annotation>
-			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. A solid element is any element, which is substitutable for gml:AbstractSolid.</documentation>
-		</annotation>
-	</element>
-	<element name="solidMembers" type="gml:SolidArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of solids. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<complexType name="MultiSolidPropertyType">
-		<annotation>
-			<documentation>A property that has a collection of solids as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:MultiSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryBasic0d1d.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryBasic0d1d.xsd
deleted file mode 100755
index 2ac83e3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryBasic0d1d.xsd
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryBasic0d1d:3.2.1">geometryBasic0d1d.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 10.
-Any geometry element that inherits the semantics of AbstractGeometryType may be viewed as a set of direct positions. 
-All of the classes derived from AbstractGeometryType inherit an optional association to a coordinate reference system. All direct positions shall directly or indirectly be associated with a coordinate reference system. When geometry elements are aggregated in another geometry element (such as a MultiGeometry or GeometricComplex), which already has a coordinate reference system specified, then these elements are assumed to be in that same coordinate reference system unless otherwise specified.
-The geometry model distinguishes geometric primitives, aggregates and complexes. 
-Geometric primitives, i.e. instances of a subtype of AbstractGeometricPrimitiveType, will be open, that is, they will not contain their boundary points; curves will not contain their end points, surfaces will not contain their boundary curves, and solids will not contain their bounding surfaces.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="measures.xsd"/>
-	<complexType name="AbstractGeometryType" abstract="true">
-		<annotation>
-			<documentation>All geometry elements are derived directly or indirectly from this abstract supertype. A geometry element may have an identifying attribute (gml:id), one or more names (elements identifier and name) and a description (elements description and descriptionReference) . It may be associated with a spatial reference system (attribute group gml:SRSReferenceGroup).
-The following rules shall be adhered to:
--	Every geometry type shall derive from this abstract type.
--	Every geometry element (i.e. an element of a geometry type) shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<attributeGroup name="SRSReferenceGroup">
-		<annotation>
-			<documentation>The attribute group SRSReferenceGroup is an optional reference to the CRS used by this geometry, with optional additional information to simplify the processing of the coordinates when a more complete definition of the CRS is not needed.
-In general the attribute srsName points to a CRS instance of gml:AbstractCoordinateReferenceSystem. For well-known references it is not required that the CRS description exists at the location the URI points to. 
-If no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of.</documentation>
-		</annotation>
-		<attribute name="srsName" type="anyURI"/>
-		<attribute name="srsDimension" type="positiveInteger"/>
-		<attributeGroup ref="gml:SRSInformationGroup"/>
-	</attributeGroup>
-	<attributeGroup name="SRSInformationGroup">
-		<annotation>
-			<documentation>The attributes uomLabels and axisLabels, defined in the SRSInformationGroup attribute group, are optional additional and redundant information for a CRS to simplify the processing of the coordinate values when a more complete definition of the CRS is not needed. This information shall be the same as included in the complete definition of the CRS, referenced by the srsName attribute. When the srsName attribute is included, either both or neither of the axisLabels and uom [...]
-The attribute axisLabels is an ordered list of labels for all the axes of this CRS. The gml:axisAbbrev value should be used for these axis labels, after spaces and forbidden characters are removed. When the srsName attribute is included, this attribute is optional. When the srsName attribute is omitted, this attribute shall also be omitted.
-The attribute uomLabels is an ordered list of unit of measure (uom) labels for all the axes of this CRS. The value of the string in the gml:catalogSymbol should be used for this uom labels, after spaces and forbidden characters are removed. When the axisLabels attribute is included, this attribute shall also be included. When the axisLabels attribute is omitted, this attribute shall also be omitted.</documentation>
-		</annotation>
-		<attribute name="axisLabels" type="gml:NCNameList"/>
-		<attribute name="uomLabels" type="gml:NCNameList"/>
-	</attributeGroup>
-	<element name="AbstractGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>The AbstractGeometry element is the abstract head of the substitution group for all geometry elements of GML. This includes pre-defined and user-defined geometry elements. Any geometry element shall be a direct or indirect extension/restriction of AbstractGeometryType and shall be directly or indirectly in the substitution group of AbstractGeometry.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeometryPropertyType">
-		<annotation>
-			<documentation>A geometric property may either be any geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same or another document). Note that either the reference or the contained element shall be given, but not both or none.
-If a feature has a property that takes a geometry element as its value, this is called a geometry property. A generic type for such a geometry property is GeometryPropertyType.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeometry"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="GeometryArrayPropertyType">
-		<annotation>
-			<documentation>If a feature has a property which takes an array of geometry elements as its value, this is called a geometry array property. A generic type for such a geometry property is GeometryArrayPropertyType. 
-The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractGeometry"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="DirectPositionType">
-		<annotation>
-			<documentation>Direct position instances hold the coordinates for a position within some coordinate reference system (CRS). Since direct positions, as data types, will often be included in larger objects (such as geometry elements) that have references to CRS, the srsName attribute will in general be missing, if this particular direct position is included in a larger element with such a reference to a CRS. In this case, the CRS is implicitly assumed to take on the value of the contain [...]
-if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="pos" type="gml:DirectPositionType"/>
-	<complexType name="DirectPositionListType">
-		<annotation>
-			<documentation>posList instances (and other instances with the content model specified by DirectPositionListType) hold the coordinates for a sequence of direct positions within the same coordinate reference system (CRS).
-if no srsName attribute is given, the CRS shall be specified as part of the larger context this geometry element is part of, typically a geometric object like a point, curve, etc. 
-The optional attribute count specifies the number of direct positions in the list. If the attribute count is present then the attribute srsDimension shall be present, too.
-The number of entries in the list is equal to the product of the dimensionality of the coordinate reference system (i.e. it is a derived value of the coordinate reference system definition) and the number of direct positions.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:doubleList">
-				<attributeGroup ref="gml:SRSReferenceGroup"/>
-				<attribute name="count" type="positiveInteger"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<element name="posList" type="gml:DirectPositionListType"/>
-	<group name="geometricPositionGroup">
-		<annotation>
-			<documentation>GML supports two different ways to specify a geometric position: either by a direct position (a data type) or a point (a geometric object).
-pos elements are positions that are "owned" by the geometric primitive encapsulating this geometric position.
-pointProperty elements contain a point that may be referenced from other geometry elements or reference another point defined elsewhere (reuse of existing points).</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:pos"/>
-			<element ref="gml:pointProperty"/>
-		</choice>
-	</group>
-	<group name="geometricPositionListGroup">
-		<annotation>
-			<documentation>GML supports two different ways to specify a list of geometric positions: either by a sequence of geometric positions (by reusing the group definition) or a sequence of direct positions (element posList). 
-The posList element allows for a compact way to specify the coordinates of the positions, if all positions are represented in the same coordinate reference system.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:posList"/>
-			<group ref="gml:geometricPositionGroup" maxOccurs="unbounded"/>
-		</choice>
-	</group>
-	<complexType name="VectorType">
-		<annotation>
-			<documentation>For some applications the components of the position may be adjusted to yield a unit vector.</documentation>
-		</annotation>
-		<simpleContent>
-			<restriction base="gml:DirectPositionType"/>
-		</simpleContent>
-	</complexType>
-	<element name="vector" type="gml:VectorType"/>
-	<complexType name="EnvelopeType">
-		<choice>
-			<sequence>
-				<element name="lowerCorner" type="gml:DirectPositionType"/>
-				<element name="upperCorner" type="gml:DirectPositionType"/>
-			</sequence>
-			<element ref="gml:pos" minOccurs="2" maxOccurs="2">
-				<annotation>
-					<appinfo>deprecated</appinfo>
-				</annotation>
-			</element>
-			<element ref="gml:coordinates"/>
-		</choice>
-		<attributeGroup ref="gml:SRSReferenceGroup"/>
-	</complexType>
-	<element name="Envelope" type="gml:EnvelopeType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>Envelope defines an extent using a pair of positions defining opposite corners in arbitrary dimensions. The first direct position is the "lower corner" (a coordinate position consisting of all the minimal ordinates for each dimension for all points within the envelope), the second one the "upper corner" (a coordinate position consisting of all the maximal ordinates for each dimension for all points within the envelope).
-The use of the properties "coordinates" and "pos" has been deprecated. The explicitly named properties "lowerCorner" and "upperCorner" shall be used instead.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGeometricPrimitiveType" abstract="true">
-		<annotation>
-			<documentation>gml:AbstractGeometricPrimitiveType is the abstract root type of the geometric primitives. A geometric primitive is a geometric object that is not decomposed further into other primitives in the system. All primitives are oriented in the direction implied by the sequence of their coordinate tuples.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometryType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractGeometricPrimitive" type="gml:AbstractGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractGeometry">
-		<annotation>
-			<documentation>The AbstractGeometricPrimitive element is the abstract head of the substitution group for all (pre- and user-defined) geometric primitives.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeometricPrimitivePropertyType">
-		<annotation>
-			<documentation>A property that has a geometric primitive as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractGeometricPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="PointType">
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType">
-				<sequence>
-					<choice>
-						<element ref="gml:pos"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Point" type="gml:PointType" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>A Point is defined by a single coordinate tuple. The direct position of a point is specified by the pos element which is of type DirectPositionType.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PointPropertyType">
-		<annotation>
-			<documentation>A property that has a point as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:Point"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="pointProperty" type="gml:PointPropertyType">
-		<annotation>
-			<documentation>This property element either references a point via the XLink-attributes or contains the point element. pointProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for Point.</documentation>
-		</annotation>
-	</element>
-	<complexType name="PointArrayPropertyType">
-		<annotation>
-			<documentation>gml:PointArrayPropertyType is a container for an array of points. The elements are always contained inline in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:Point"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="AbstractCurveType" abstract="true">
-		<annotation>
-			<documentation>gml:AbstractCurveType is an abstraction of a curve to support the different levels of complexity. The curve may always be viewed as a geometric primitive, i.e. is continuous.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractCurve" type="gml:AbstractCurveType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>The AbstractCurve element is the abstract head of the substitution group for all (continuous) curve elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CurvePropertyType">
-		<annotation>
-			<documentation>A property that has a curve as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="curveProperty" type="gml:CurvePropertyType">
-		<annotation>
-			<documentation>This property element either references a curve via the XLink-attributes or contains the curve element. curveProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractCurve.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CurveArrayPropertyType">
-		<annotation>
-			<documentation>A container for an array of curves. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="LineStringType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="LineString" type="gml:LineStringType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>A LineString is a special curve that consists of a single segment with linear interpolation. It is defined by two or more coordinate tuples, with linear interpolation between them. The number of direct positions in the list shall be at least two.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryBasic2d.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryBasic2d.xsd
deleted file mode 100755
index 5781df5..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryBasic2d.xsd
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryBasic2d:3.2.1">geometryBasic2d.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 10.
-			
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<complexType name="AbstractSurfaceType" abstract="true">
-		<annotation>
-			<documentation>gml:AbstractSurfaceType is an abstraction of a surface to support the different levels of complexity. A surface is always a continuous region of a plane.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractSurface" type="gml:AbstractSurfaceType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>The AbstractSurface element is the abstract head of the substitution group for all (continuous) surface elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SurfacePropertyType">
-		<annotation>
-			<documentation>A property that has a surface as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="surfaceProperty" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. surfaceProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSurface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SurfaceArrayPropertyType">
-		<annotation>
-			<documentation>gml:SurfaceArrayPropertyType is a container for an array of surfaces. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements via XLinks is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="PolygonType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:exterior" minOccurs="0"/>
-					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Polygon" type="gml:PolygonType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>A Polygon is a special surface that is defined by a single surface patch (see D.3.6). The boundary of this patch is coplanar and the polygon uses planar interpolation in its interior. 
-The elements exterior and interior describe the surface boundary of the polygon.</documentation>
-		</annotation>
-	</element>
-	<element name="exterior" type="gml:AbstractRingPropertyType">
-		<annotation>
-			<documentation>A boundary of a surface consists of a number of rings. In the normal 2D case, one of these rings is distinguished as being the exterior boundary. In a general manifold this is not always possible, in which case all boundaries shall be listed as interior boundaries, and the exterior will be empty.</documentation>
-		</annotation>
-	</element>
-	<element name="interior" type="gml:AbstractRingPropertyType">
-		<annotation>
-			<documentation>A boundary of a surface consists of a number of rings. The "interior" rings separate the surface / surface patch from the area enclosed by the rings.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractRingType" abstract="true">
-		<sequence/>
-	</complexType>
-	<element name="AbstractRing" type="gml:AbstractRingType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>An abstraction of a ring to support surface boundaries of different complexity.
-The AbstractRing element is the abstract head of the substituition group for all closed boundaries of a surface patch.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractRingPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:AbstractRingPropertyType encapsulates a ring to represent the surface boundary property of a surface.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:AbstractRing"/>
-		</sequence>
-	</complexType>
-	<complexType name="LinearRingType">
-		<complexContent>
-			<extension base="gml:AbstractRingType">
-				<sequence>
-					<choice>
-						<choice minOccurs="4" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="LinearRing" type="gml:LinearRingType" substitutionGroup="gml:AbstractRing">
-		<annotation>
-			<documentation>A LinearRing is defined by four or more coordinate tuples, with linear interpolation between them; the first and last coordinates shall be coincident. The number of direct positions in the list shall be at least four.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LinearRingPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:LinearRingPropertyType encapsulates a linear ring to represent a component of a surface boundary.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:LinearRing"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryComplexes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryComplexes.xsd
deleted file mode 100755
index de4f945..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryComplexes.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryComplexes:3.2.1">geometryComplexes.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 12.2.
-Geometric complexes (i.e. instances of gml:GeometricComplexType) are closed collections of geometric primitives, i.e. they will contain their boundaries. 
-A geometric complex (gml:GeometricComplex) is defined by ISO 19107:2003, 6.6.1 as "a set of primitive geometric objects (in a common coordinate system) whose interiors are disjoint. Further, if a primitive is in a geometric complex, then there exists a set of primitives in that complex whose point-wise union is the boundary of this first primitive."
-A geometric composite (gml:CompositeCurve, gml:CompositeSurface and gml:CompositeSolid) represents a geometric complex with an underlying core geometry that is isomorphic to a primitive, i.e. it can be viewed as a primitive and as a complex. See ISO 19107:2003, 6.1 and 6.6.3 for more details on the nature of composite geometries.
-Geometric complexes and composites are intended to be used in application schemas where the sharing of geometry is important.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryAggregates.xsd"/>
-	<complexType name="GeometricComplexType">
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<sequence>
-					<element name="element" type="gml:GeometricPrimitivePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="GeometricComplex" type="gml:GeometricComplexType" substitutionGroup="gml:AbstractGeometry"/>
-	<complexType name="GeometricComplexPropertyType">
-		<annotation>
-			<documentation>A property that has a geometric complex as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:GeometricComplex"/>
-				<element ref="gml:CompositeCurve"/>
-				<element ref="gml:CompositeSurface"/>
-				<element ref="gml:CompositeSolid"/>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="CompositeCurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:curveMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CompositeCurve" type="gml:CompositeCurveType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>A gml:CompositeCurve is represented by a sequence of (orientable) curves such that each curve in the sequence terminates at the start point of the subsequent curve in the list. 
-curveMember references or contains inline one curve in the composite curve. 
-The curves are contiguous, the collection of curves is ordered. Therefore, if provided, the aggregationType attribute shall have the value "sequence".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompositeSurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:surfaceMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CompositeSurface" type="gml:CompositeSurfaceType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>A gml:CompositeSurface is represented by a set of orientable surfaces. It is geometry type with all the geometric properties of a (primitive) surface. Essentially, a composite surface is a collection of surfaces that join in pairs on common boundary curves and which, when considered as a whole, form a single surface.
-surfaceMember references or contains inline one surface in the composite surface. 
-The surfaces are contiguous.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompositeSolidType">
-		<complexContent>
-			<extension base="gml:AbstractSolidType">
-				<sequence>
-					<element ref="gml:solidMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CompositeSolid" type="gml:CompositeSolidType" substitutionGroup="gml:AbstractSolid">
-		<annotation>
-			<documentation>gml:CompositeSolid implements ISO 19107 GM_CompositeSolid (see ISO 19107:2003, 6.6.7) as specified in D.2.3.6. 
-A gml:CompositeSolid is represented by a set of orientable surfaces. It is a geometry type with all the geometric properties of a (primitive) solid. Essentially, a composite solid is a collection of solids that join in pairs on common boundary surfaces and which, when considered as a whole, form a single solid. 
-solidMember references or contains one solid in the composite solid. The solids are contiguous.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryPrimitives.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryPrimitives.xsd
deleted file mode 100755
index 9cbd52c..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/geometryPrimitives.xsd
+++ /dev/null
@@ -1,846 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:geometryPrimitives:3.2.1">geometryPrimitives.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 11.
-Beside the "simple" geometric primitives specified in the previous Clause, this Clause specifies additional primitives to describe real world situations which require a more expressive geometry model.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic2d.xsd"/>
-	<complexType name="CurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:segments"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Curve" type="gml:CurveType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>A curve is a 1-dimensional primitive. Curves are continuous, connected, and have a measurable length in terms of the coordinate system. 
-A curve is composed of one or more curve segments. Each curve segment within a curve may be defined using a different interpolation method. The curve segments are connected to one another, with the end point of each segment except the last being the start point of the next segment in the segment list.
-The orientation of the curve is positive.
-The element segments encapsulates the segments of the curve.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OrientableCurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveType">
-				<sequence>
-					<element ref="gml:baseCurve"/>
-				</sequence>
-				<attribute name="orientation" type="gml:SignType" default="+"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseCurve" type="gml:CurvePropertyType">
-		<annotation>
-			<documentation>The property baseCurve references or contains the base curve, i.e. it either references the base curve via the XLink-attributes or contains the curve element. A curve element is any element which is substitutable for AbstractCurve. The base curve has positive orientation.</documentation>
-		</annotation>
-	</element>
-	<element name="OrientableCurve" type="gml:OrientableCurveType" substitutionGroup="gml:AbstractCurve">
-		<annotation>
-			<documentation>OrientableCurve consists of a curve and an orientation. If the orientation is "+", then the OrientableCurve is identical to the baseCurve. If the orientation is "-", then the OrientableCurve is related to another AbstractCurve with a parameterization that reverses the sense of the curve traversal.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCurveSegmentType" abstract="true">
-		<attribute name="numDerivativesAtStart" type="integer" default="0"/>
-		<attribute name="numDerivativesAtEnd" type="integer" default="0"/>
-		<attribute name="numDerivativeInterior" type="integer" default="0"/>
-	</complexType>
-	<element name="AbstractCurveSegment" type="gml:AbstractCurveSegmentType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>A curve segment defines a homogeneous segment of a curve.
-The attributes numDerivativesAtStart, numDerivativesAtEnd and numDerivativesInterior specify the type of continuity as specified in ISO 19107:2003, 6.4.9.3.
-The AbstractCurveSegment element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism.
-All curve segments shall have an attribute interpolation with type gml:CurveInterpolationType specifying the curve interpolation mechanism used for this segment. This mechanism uses the control points and control parameters to determine the position of this curve segment.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CurveSegmentArrayPropertyType">
-		<annotation>
-			<documentation>gml:CurveSegmentArrayPropertyType is a container for an array of curve segments.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractCurveSegment"/>
-		</sequence>
-	</complexType>
-	<element name="segments" type="gml:CurveSegmentArrayPropertyType">
-		<annotation>
-			<documentation>This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<simpleType name="CurveInterpolationType">
-		<annotation>
-			<documentation>gml:CurveInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="linear"/>
-			<enumeration value="geodesic"/>
-			<enumeration value="circularArc3Points"/>
-			<enumeration value="circularArc2PointWithBulge"/>
-			<enumeration value="circularArcCenterPointWithRadius"/>
-			<enumeration value="elliptical"/>
-			<enumeration value="clothoid"/>
-			<enumeration value="conic"/>
-			<enumeration value="polynomialSpline"/>
-			<enumeration value="cubicSpline"/>
-			<enumeration value="rationalSpline"/>
-		</restriction>
-	</simpleType>
-	<complexType name="LineStringSegmentType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="LineStringSegment" type="gml:LineStringSegmentType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A LineStringSegment is a curve segment that is defined by two or more control points including the start and end point, with linear interpolation between them.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcStringType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="3" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="numArc" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ArcString" type="gml:ArcStringType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>An ArcString is a curve segment that uses three-point circular arc interpolation ("circularArc3Points"). The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be 2 * numArc + 1.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcType">
-		<complexContent>
-			<restriction base="gml:ArcStringType">
-				<sequence>
-					<choice>
-						<choice minOccurs="3" maxOccurs="3">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-				</sequence>
-				<attribute name="numArc" type="integer" fixed="1"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="Arc" type="gml:ArcType" substitutionGroup="gml:ArcString">
-		<annotation>
-			<documentation>An Arc is an arc string with only one arc unit, i.e. three control points including the start and end point. As arc is an arc string consisting of a single arc, the attribute "numArc" is fixed to "1".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CircleType">
-		<complexContent>
-			<extension base="gml:ArcType"/>
-		</complexContent>
-	</complexType>
-	<element name="Circle" type="gml:CircleType" substitutionGroup="gml:Arc">
-		<annotation>
-			<documentation>A Circle is an arc whose ends coincide to form a simple closed loop. The three control points shall be distinct non-co-linear points for the circle to be unambiguously defined. The arc is simply extended past the third control point until the first control point is encountered.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcStringByBulgeType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="bulge" type="double" maxOccurs="unbounded"/>
-					<element name="normal" type="gml:VectorType" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArc2PointWithBulge"/>
-				<attribute name="numArc" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ArcStringByBulge" type="gml:ArcStringByBulgeType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>This variant of the arc computes the mid points of the arcs instead of storing the coordinates directly. The control point sequence consists of the start and end points of each arc plus the bulge (see ISO 19107:2003, 6.4.17.2). The normal is a vector normal (perpendicular) to the chord of the arc (see ISO 19107:2003, 6.4.17.4).
-The interpolation is fixed as "circularArc2PointWithBulge".
-The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be numArc + 1.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcByBulgeType">
-		<complexContent>
-			<restriction base="gml:ArcStringByBulgeType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="2">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="bulge" type="double"/>
-					<element name="normal" type="gml:VectorType"/>
-				</sequence>
-				<attribute name="numArc" type="integer" fixed="1"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="ArcByBulge" type="gml:ArcByBulgeType" substitutionGroup="gml:ArcStringByBulge">
-		<annotation>
-			<documentation>An ArcByBulge is an arc string with only one arc unit, i.e. two control points, one bulge and one normal vector.
-As arc is an arc string consisting of a single arc, the attribute "numArc" is fixed to "1".</documentation>
-		</annotation>
-	</element>
-	<complexType name="ArcByCenterPointType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice>
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="radius" type="gml:LengthType"/>
-					<element name="startAngle" type="gml:AngleType" minOccurs="0"/>
-					<element name="endAngle" type="gml:AngleType" minOccurs="0"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="circularArcCenterPointWithRadius"/>
-				<attribute name="numArc" type="integer" use="required" fixed="1"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ArcByCenterPoint" type="gml:ArcByCenterPointType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>This variant of the arc requires that the points on the arc shall be computed instead of storing the coordinates directly. The single control point is the center point of the arc plus the radius and the bearing at start and end. This representation can be used only in 2D.
-The element radius specifies the radius of the arc.
-The element startAngle specifies the bearing of the arc at the start.
-The element endAngle specifies the bearing of the arc at the end.
-The interpolation is fixed as "circularArcCenterPointWithRadius".
-Since this type describes always a single arc, the attribute "numArc" is fixed to "1".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CircleByCenterPointType">
-		<complexContent>
-			<restriction base="gml:ArcByCenterPointType">
-				<sequence>
-					<choice>
-						<choice>
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="radius" type="gml:LengthType"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="CircleByCenterPoint" type="gml:CircleByCenterPointType" substitutionGroup="gml:ArcByCenterPoint">
-		<annotation>
-			<documentation>A gml:CircleByCenterPoint is an gml:ArcByCenterPoint with identical start and end angle to form a full circle. Again, this representation can be used only in 2D.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CubicSplineType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="2" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="vectorAtStart" type="gml:VectorType"/>
-					<element name="vectorAtEnd" type="gml:VectorType"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="cubicSpline"/>
-				<attribute name="degree" type="integer" fixed="3"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="CubicSpline" type="gml:CubicSplineType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>The number of control points shall be at least three.
-vectorAtStart is the unit tangent vector at the start point of the spline. vectorAtEnd is the unit tangent vector at the end point of the spline. Only the direction of the vectors shall be used to determine the shape of the cubic spline, not their length.
-interpolation is fixed as "cubicSpline".
-degree shall be the degree of the polynomial used for the interpolation in this spline. Therefore the degree for a cubic spline is fixed to "3".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="BSplineType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<choice>
-						<choice minOccurs="0" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="degree" type="nonNegativeInteger"/>
-					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" default="polynomialSpline"/>
-				<attribute name="isPolynomial" type="boolean"/>
-				<attribute name="knotType" type="gml:KnotTypesType"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="BSpline" type="gml:BSplineType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A B-Spline is a piecewise parametric polynomial or rational curve described in terms of control points and basis functions as specified in ISO 19107:2003, 6.4.30. Therefore, interpolation may be either "polynomialSpline" or "rationalSpline" depending on the interpolation type; default is "polynomialSpline".
-degree shall be the degree of the polynomial used for interpolation in this spline.
-knot shall be the sequence of distinct knots used to define the spline basis functions (see ISO 19107:2003, 6.4.26.2).
-The attribute isPolynomial shall be set to "true" if this is a polynomial spline (see ISO 19107:2003, 6.4.30.5).
-The attribute knotType shall provide the type of knot distribution used in defining this spline (see ISO 19107:2003, 6.4.30.4).
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="KnotType">
-		<sequence>
-			<element name="value" type="double"/>
-			<element name="multiplicity" type="nonNegativeInteger"/>
-			<element name="weight" type="double"/>
-		</sequence>
-	</complexType>
-	<complexType name="KnotPropertyType">
-		<annotation>
-			<documentation>gml:KnotPropertyType encapsulates a knot to use it in a geometric type.</documentation>
-		</annotation>
-		<sequence>
-			<element name="Knot" type="gml:KnotType">
-				<annotation>
-					<documentation>A knot is a breakpoint on a piecewise spline curve.
-value is the value of the parameter at the knot of the spline (see ISO 19107:2003, 6.4.24.2).
-multiplicity is the multiplicity of this knot used in the definition of the spline (with the same weight).
-weight is the value of the averaging weight used for this knot of the spline.</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<simpleType name="KnotTypesType">
-		<annotation>
-			<documentation>This enumeration type specifies values for the knots' type (see ISO 19107:2003, 6.4.25).</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="uniform"/>
-			<enumeration value="quasiUniform"/>
-			<enumeration value="piecewiseBezier"/>
-		</restriction>
-	</simpleType>
-	<complexType name="BezierType">
-		<complexContent>
-			<restriction base="gml:BSplineType">
-				<sequence>
-					<choice>
-						<choice minOccurs="0" maxOccurs="unbounded">
-							<element ref="gml:pos"/>
-							<element ref="gml:pointProperty"/>
-							<element ref="gml:pointRep"/>
-						</choice>
-						<element ref="gml:posList"/>
-						<element ref="gml:coordinates"/>
-					</choice>
-					<element name="degree" type="nonNegativeInteger"/>
-					<element name="knot" type="gml:KnotPropertyType" minOccurs="2" maxOccurs="2"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="polynomialSpline"/>
-				<attribute name="isPolynomial" type="boolean" fixed="true"/>
-				<attribute name="knotType" type="gml:KnotTypesType" use="prohibited"/>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<element name="Bezier" type="gml:BezierType" substitutionGroup="gml:BSpline">
-		<annotation>
-			<documentation>Bezier curves are polynomial splines that use Bezier or Bernstein polynomials for interpolation purposes. It is a special case of the B-Spline curve with two knots.
-degree shall be the degree of the polynomial used for interpolation in this spline.
-knot shall be the sequence of distinct knots used to define the spline basis functions.
-interpolation is fixed as "polynomialSpline".
-isPolynomial is fixed as "true".
-knotType is not relevant for Bezier curve segments.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="OffsetCurveType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<element name="offsetBase" type="gml:CurvePropertyType"/>
-					<element name="distance" type="gml:LengthType"/>
-					<element name="refDirection" type="gml:VectorType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="OffsetCurve" type="gml:OffsetCurveType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>An offset curve is a curve at a constant distance from the basis curve. offsetBase is the base curve from which this curve is defined as an offset. distance and refDirection have the same meaning as specified in ISO 19107:2003, 6.4.23.
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AffinePlacementType">
-		<sequence>
-			<element name="location" type="gml:DirectPositionType"/>
-			<element name="refDirection" type="gml:VectorType" maxOccurs="unbounded"/>
-			<element name="inDimension" type="positiveInteger"/>
-			<element name="outDimension" type="positiveInteger"/>
-		</sequence>
-	</complexType>
-	<element name="AffinePlacement" type="gml:AffinePlacementType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>location, refDirection, inDimension and outDimension have the same meaning as specified in ISO 19107:2003, 6.4.21.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ClothoidType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<sequence>
-					<element name="refLocation">
-						<complexType>
-							<sequence>
-								<element ref="gml:AffinePlacement"/>
-							</sequence>
-						</complexType>
-					</element>
-					<element name="scaleFactor" type="decimal"/>
-					<element name="startParameter" type="double"/>
-					<element name="endParameter" type="double"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="clothoid"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Clothoid" type="gml:ClothoidType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A clothoid, or Cornu's spiral, is plane curve whose curvature is a fixed function of its length.
-refLocation, startParameter, endParameter and scaleFactor have the same meaning as specified in ISO 19107:2003, 6.4.22.
-interpolation is fixed as "clothoid".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodesicStringType">
-		<complexContent>
-			<extension base="gml:AbstractCurveSegmentType">
-				<choice>
-					<element ref="gml:posList"/>
-					<group ref="gml:geometricPositionGroup" minOccurs="2" maxOccurs="unbounded"/>
-				</choice>
-				<attribute name="interpolation" type="gml:CurveInterpolationType" fixed="geodesic"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="GeodesicString" type="gml:GeodesicStringType" substitutionGroup="gml:AbstractCurveSegment">
-		<annotation>
-			<documentation>A sequence of geodesic segments. 
-The number of control points shall be at least two.
-interpolation is fixed as "geodesic".
-The content model follows the general pattern for the encoding of curve segments.</documentation>
-		</annotation>
-	</element>
-	<complexType name="GeodesicType">
-		<complexContent>
-			<extension base="gml:GeodesicStringType"/>
-		</complexContent>
-	</complexType>
-	<element name="Geodesic" type="gml:GeodesicType" substitutionGroup="gml:GeodesicString"/>
-	<complexType name="SurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:patches"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Surface" type="gml:SurfaceType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>A Surface is a 2-dimensional primitive and is composed of one or more surface patches as specified in ISO 19107:2003, 6.3.17.1. The surface patches are connected to one another.
-patches encapsulates the patches of the surface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="OrientableSurfaceType">
-		<complexContent>
-			<extension base="gml:AbstractSurfaceType">
-				<sequence>
-					<element ref="gml:baseSurface"/>
-				</sequence>
-				<attribute name="orientation" type="gml:SignType" default="+"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="baseSurface" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>The property baseSurface references or contains the base surface. The property baseSurface either references the base surface via the XLink-attributes or contains the surface element. A surface element is any element which is substitutable for gml:AbstractSurface. The base surface has positive orientation.</documentation>
-		</annotation>
-	</element>
-	<element name="OrientableSurface" type="gml:OrientableSurfaceType" substitutionGroup="gml:AbstractSurface">
-		<annotation>
-			<documentation>OrientableSurface consists of a surface and an orientation. If the orientation is "+", then the OrientableSurface is identical to the baseSurface. If the orientation is "-", then the OrientableSurface is a reference to a gml:AbstractSurface with an up-normal that reverses the direction for this OrientableSurface, the sense of "the top of the surface".</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractSurfacePatchType" abstract="true"/>
-	<element name="AbstractSurfacePatch" type="gml:AbstractSurfacePatchType" abstract="true">
-		<annotation>
-			<documentation>A surface patch defines a homogenuous portion of a surface. 
-The AbstractSurfacePatch element is the abstract head of the substituition group for all surface patch elements describing a continuous portion of a surface.
-All surface patches shall have an attribute interpolation (declared in the types derived from gml:AbstractSurfacePatchType) specifying the interpolation mechanism used for the patch using gml:SurfaceInterpolationType.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SurfacePatchArrayPropertyType">
-		<annotation>
-			<documentation>gml:SurfacePatchArrayPropertyType is a container for a sequence of surface patches.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractSurfacePatch"/>
-		</sequence>
-	</complexType>
-	<element name="patches" type="gml:SurfacePatchArrayPropertyType">
-		<annotation>
-			<documentation>The patches property element contains the sequence of surface patches. The order of the elements is significant and shall be preserved when processing the array.</documentation>
-		</annotation>
-	</element>
-	<simpleType name="SurfaceInterpolationType">
-		<annotation>
-			<documentation>gml:SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="none"/>
-			<enumeration value="planar"/>
-			<enumeration value="spherical"/>
-			<enumeration value="elliptical"/>
-			<enumeration value="conic"/>
-			<enumeration value="tin"/>
-			<enumeration value="parametricCurve"/>
-			<enumeration value="polynomialSpline"/>
-			<enumeration value="rationalSpline"/>
-			<enumeration value="triangulatedSpline"/>
-		</restriction>
-	</simpleType>
-	<complexType name="PolygonPatchType">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior" minOccurs="0"/>
-					<element ref="gml:interior" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="PolygonPatch" type="gml:PolygonPatchType" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>A gml:PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves shall be coplanar and the polygon uses planar interpolation in its interior. 
-interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TriangleType">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Triangle" type="gml:TriangleType" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>gml:Triangle represents a triangle as a surface patch with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring shall be four.
-The ring (element exterior) shall be a gml:LinearRing and shall form a triangle, the first and the last position shall be coincident.
-interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RectangleType">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<sequence>
-					<element ref="gml:exterior"/>
-				</sequence>
-				<attribute name="interpolation" type="gml:SurfaceInterpolationType" fixed="planar"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Rectangle" type="gml:RectangleType" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>gml:Rectangle represents a rectangle as a surface patch with an outer boundary consisting of a linear ring. Note that this is a polygon (subtype) with no inner boundaries. The number of points in the linear ring shall be five.
-The ring (element exterior) shall be a gml:LinearRing and shall form a rectangle; the first and the last position shall be coincident.
-interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RingType">
-		<complexContent>
-			<extension base="gml:AbstractRingType">
-				<sequence>
-					<element ref="gml:curveMember" maxOccurs="unbounded"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Ring" type="gml:RingType" substitutionGroup="gml:AbstractRing">
-		<annotation>
-			<documentation>A ring is used to represent a single connected component of a surface boundary as specified in ISO 19107:2003, 6.3.6.
-Every gml:curveMember references or contains one curve, i.e. any element which is substitutable for gml:AbstractCurve. In the context of a ring, the curves describe the boundary of the surface. The sequence of curves shall be contiguous and connected in a cycle.
-If provided, the aggregationType attribute shall have the value "sequence".</documentation>
-		</annotation>
-	</element>
-	<element name="curveMember" type="gml:CurvePropertyType"/>
-	<complexType name="RingPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:RingPropertyType encapsulates a ring to represent a component of a surface boundary.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:Ring"/>
-		</sequence>
-	</complexType>
-	<group name="PointGrid">
-		<annotation>
-			<documentation>A gml:PointGrid group contains or references points or positions which are organised into sequences or grids. All rows shall have the same number of positions (columns).</documentation>
-		</annotation>
-		<sequence>
-			<element name="rows">
-				<complexType>
-					<sequence>
-						<element name="Row" maxOccurs="unbounded">
-							<complexType>
-								<group ref="gml:geometricPositionListGroup"/>
-							</complexType>
-						</element>
-					</sequence>
-				</complexType>
-			</element>
-		</sequence>
-	</group>
-	<complexType name="AbstractParametricCurveSurfaceType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractSurfacePatchType">
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractParametricCurveSurface" type="gml:AbstractParametricCurveSurfaceType" abstract="true" substitutionGroup="gml:AbstractSurfacePatch">
-		<annotation>
-			<documentation>The element provides a substitution group head for the surface patches based on parametric curves. All properties are specified in the derived subtypes. All derived subtypes shall conform to the constraints specified in ISO 19107:2003, 6.4.40.
-If provided, the aggregationType attribute shall have the value "set".</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGriddedSurfaceType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractParametricCurveSurfaceType">
-				<sequence>
-					<group ref="gml:PointGrid"/>
-				</sequence>
-				<attribute name="rows" type="integer"/>
-				<attribute name="columns" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractGriddedSurface" type="gml:AbstractGriddedSurfaceType" abstract="true" substitutionGroup="gml:AbstractParametricCurveSurface">
-		<annotation>
-			<documentation>if provided, rows gives the number of rows, columns the number of columns in the parameter grid. The parameter grid is represented by an instance of the gml:PointGrid group.
-The element provides a substitution group head for the surface patches based on a grid. All derived subtypes shall conform to the constraints specified in ISO 19107:2003, 6.4.41.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConeType">
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Cone" type="gml:ConeType" substitutionGroup="gml:AbstractGriddedSurface"/>
-	<complexType name="CylinderType">
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="linear"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Cylinder" type="gml:CylinderType" substitutionGroup="gml:AbstractGriddedSurface"/>
-	<complexType name="SphereType">
-		<complexContent>
-			<extension base="gml:AbstractGriddedSurfaceType">
-				<attribute name="horizontalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-				<attribute name="verticalCurveType" type="gml:CurveInterpolationType" fixed="circularArc3Points"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Sphere" type="gml:SphereType" substitutionGroup="gml:AbstractGriddedSurface"/>
-	<element name="PolyhedralSurface" type="gml:SurfaceType" substitutionGroup="gml:Surface">
-		<annotation>
-			<documentation>A polyhedral surface is a surface composed of polygon patches connected along their common boundary curves. This differs from the surface type only in the restriction on the types of surface patches acceptable.
-polygonPatches encapsulates the polygon patches of the polyhedral surface.</documentation>
-		</annotation>
-	</element>
-	<element name="TriangulatedSurface" type="gml:SurfaceType" substitutionGroup="gml:Surface">
-		<annotation>
-			<documentation>A triangulated surface is a polyhedral surface that is composed only of triangles. There is no restriction on how the triangulation is derived.
-trianglePatches encapsulates the triangles of the triangulated surface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TinType">
-		<complexContent>
-			<extension base="gml:SurfaceType">
-				<sequence>
-					<element name="stopLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="breakLines" type="gml:LineStringSegmentArrayPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="maxLength" type="gml:LengthType"/>
-					<element name="controlPoint">
-						<complexType>
-							<choice>
-								<element ref="gml:posList"/>
-								<group ref="gml:geometricPositionGroup" minOccurs="3" maxOccurs="unbounded"/>
-							</choice>
-						</complexType>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Tin" type="gml:TinType" substitutionGroup="gml:TriangulatedSurface">
-		<annotation>
-			<documentation>A tin is a triangulated surface that uses the Delauny algorithm or a similar algorithm complemented with consideration of stoplines (stopLines), breaklines (breakLines), and maximum length of triangle sides (maxLength). controlPoint shall contain a set of the positions (three or more) used as posts for this TIN (corners of the triangles in the TIN). See ISO 19107:2003, 6.4.39 for details.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LineStringSegmentArrayPropertyType">
-		<annotation>
-			<documentation>gml:LineStringSegmentArrayPropertyType provides a container for line strings.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:LineStringSegment"/>
-		</sequence>
-	</complexType>
-	<complexType name="AbstractSolidType">
-		<annotation>
-			<documentation>gml:AbstractSolidType is an abstraction of a solid to support the different levels of complexity. The solid may always be viewed as a geometric primitive, i.e. is contiguous.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractGeometricPrimitiveType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractSolid" type="gml:AbstractSolidType" abstract="true" substitutionGroup="gml:AbstractGeometricPrimitive">
-		<annotation>
-			<documentation>The AbstractSolid element is the abstract head of the substituition group for all (continuous) solid elements.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SolidPropertyType">
-		<annotation>
-			<documentation>A property that has a solid as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="solidProperty" type="gml:SolidPropertyType">
-		<annotation>
-			<documentation>This property element either references a solid via the XLink-attributes or contains the solid element. solidProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSolid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="SolidArrayPropertyType">
-		<annotation>
-			<documentation>gml:SolidArrayPropertyType is a container for an array of solids. The elements are always contained in the array property, referencing geometry elements or arrays of geometry elements is not supported.</documentation>
-		</annotation>
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<element ref="gml:AbstractSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="SolidType">
-		<complexContent>
-			<extension base="gml:AbstractSolidType">
-				<sequence>
-					<element name="exterior" type="gml:ShellPropertyType" minOccurs="0"/>
-					<element name="interior" type="gml:ShellPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="Solid" type="gml:SolidType" substitutionGroup="gml:AbstractSolid">
-		<annotation>
-			<documentation>A solid is the basis for 3-dimensional geometry. The extent of a solid is defined by the boundary surfaces as specified in ISO 19107:2003, 6.3.18. exterior specifies the outer boundary, interior the inner boundary of the solid.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ShellType">
-		<sequence>
-			<element ref="gml:surfaceMember" maxOccurs="unbounded"/>
-		</sequence>
-		<attributeGroup ref="gml:AggregationAttributeGroup"/>
-	</complexType>
-	<element name="Shell" type="gml:ShellType" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>A shell is used to represent a single connected component of a solid boundary as specified in ISO 19107:2003, 6.3.8.
-Every gml:surfaceMember references or contains one surface, i.e. any element which is substitutable for gml:AbstractSurface. In the context of a shell, the surfaces describe the boundary of the solid. 
-If provided, the aggregationType attribute shall have the value "set".
-</documentation>
-		</annotation>
-	</element>
-	<element name="surfaceMember" type="gml:SurfacePropertyType">
-		<annotation>
-			<documentation>This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ShellPropertyType">
-		<annotation>
-			<documentation>A property with the content model of gml:ShellPropertyType encapsulates a shell to represent a component of a solid boundary.</documentation>
-		</annotation>
-		<sequence>
-			<element ref="gml:Shell"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/gml.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/gml.xsd
deleted file mode 100755
index b319a19..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/gml.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gml:3.2.1">gml.xsd</appinfo>
-		<documentation>
-			GML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<include schemaLocation="dynamicFeature.xsd"/>
-	<include schemaLocation="topology.xsd"/>
-	<include schemaLocation="coverage.xsd"/>
-	<include schemaLocation="coordinateReferenceSystems.xsd"/>
-	<include schemaLocation="observation.xsd"/>
-	<include schemaLocation="temporalReferenceSystems.xsd"/>
-	<include schemaLocation="deprecatedTypes.xsd"/>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/gmlBase.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/gmlBase.xsd
deleted file mode 100755
index ec81080..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/gmlBase.xsd
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:gmlBase:3.2.1">gmlBase.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 7.2.
-The gmlBase schema components establish the GML model and syntax, in particular
--	a root XML type from which XML types for all GML objects should be derived,
--	a pattern and components for GML properties,
--	patterns for collections and arrays, and components for generic collections and arrays,
--	components for associating metadata with GML objects,
--	components for constructing definitions and dictionaries.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="basicTypes.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<element name="AbstractObject" abstract="true">
-		<annotation>
-			<documentation>This element has no type defined, and is therefore implicitly (according to the rules of W3C XML Schema) an XML Schema anyType. It is used as the head of an XML Schema substitution group which unifies complex content and certain simple content elements used for datatypes in GML, including the gml:AbstractGML substitution group.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractGML" type="gml:AbstractGMLType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>The abstract element gml:AbstractGML is "any GML object having identity".   It acts as the head of an XML Schema substitution group, which may include any element which is a GML feature, or other object, with identity.  This is used as a variable in content models in GML core and application schemas.  It is effectively an abstract superclass for all GML objects.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractGMLType" abstract="true">
-		<sequence>
-			<group ref="gml:StandardObjectProperties"/>
-		</sequence>
-		<attribute ref="gml:id" use="required"/>
-	</complexType>
-	<group name="StandardObjectProperties">
-		<sequence>
-			<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-			<element ref="gml:description" minOccurs="0"/>
-			<element ref="gml:descriptionReference" minOccurs="0"/>
-			<element ref="gml:identifier" minOccurs="0"/>
-			<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</group>
-	<attributeGroup name="AssociationAttributeGroup">
-		<annotation>
-			<documentation>XLink components are the standard method to support hypertext referencing in XML. An XML Schema attribute group, gml:AssociationAttributeGroup, is provided to support the use of Xlinks as the method for indicating the value of a property by reference in a uniform manner in GML.</documentation>
-		</annotation>
-		<attributeGroup ref="xlink:simpleAttrs"/>
-		<attribute name="nilReason" type="gml:NilReasonType"/>
-		<attribute ref="gml:remoteSchema">
-			<annotation>
-				<appinfo>deprecated</appinfo>
-			</annotation>
-		</attribute>
-	</attributeGroup>
-	<element name="abstractAssociationRole" type="gml:AssociationRoleType" abstract="true">
-		<annotation>
-			<documentation>Applying this pattern shall restrict the multiplicity of objects in a property element using this content model to exactly one. An instance of this type shall contain an element representing an object, or serve as a pointer to a remote object.
-Applying the pattern to define an application schema specific property type allows to restrict
--	the inline object to specified object types, 
--	the encoding to "by-reference only" (see 7.2.3.7),
--	the encoding to "inline only" (see 7.2.3.8).</documentation>
-		</annotation>
-	</element>
-	<complexType name="AssociationRoleType">
-		<sequence minOccurs="0">
-			<any namespace="##any"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<attributeGroup name="OwnershipAttributeGroup">
-		<annotation>
-			<documentation>Encoding a GML property inline vs. by-reference shall not imply anything about the "ownership" of the contained or referenced GML Object, i.e. the encoding style shall not imply any "deep-copy" or "deep-delete" semantics. To express ownership over the contained or referenced GML Object, the gml:OwnershipAttributeGroup attribute group may be added to object-valued property elements. If the attribute group is not part of the content model of such a property element, then  [...]
-When the value of the owns attribute is "true", the existence of inline or referenced object(s) depends upon the existence of the parent object.</documentation>
-		</annotation>
-		<attribute name="owns" type="boolean" default="false"/>
-	</attributeGroup>
-	<element name="abstractStrictAssociationRole" type="gml:AssociationRoleType" abstract="true">
-		<annotation>
-			<documentation>This element shows how an element 
-	declaration may include a Schematron constraint to limit the property to act 
-	in either inline or by-reference mode, but not both.</documentation>
-		</annotation>
-	</element>
-	<element name="abstractReference" type="gml:ReferenceType" abstract="true">
-		<annotation>
-			<documentation>gml:abstractReference may be used as the head of a subtitution group of more specific elements providing a value by-reference.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ReferenceType">
-		<annotation>
-			<documentation>gml:ReferenceType is intended to be used in application schemas directly, if a property element shall use a "by-reference only" encoding.</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="abstractInlineProperty" type="gml:InlinePropertyType" abstract="true">
-		<annotation>
-			<documentation>gml:abstractInlineProperty may be used as the head of a subtitution group of more specific elements providing a value inline.</documentation>
-		</annotation>
-	</element>
-	<complexType name="InlinePropertyType">
-		<sequence>
-			<any namespace="##any"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="reversePropertyName" type="string">
-		<annotation>
-			<documentation>If the value of an object property is another object and that object contains also a property for the association between the two objects, then this name of the reverse property may be encoded in a gml:reversePropertyName element in an appinfo annotation of the property element to document the constraint between the two properties. The value of the element shall contain the qualified name of the property element.</documentation>
-		</annotation>
-	</element>
-	<element name="description" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>The value of this property is a text description of the object. gml:description uses gml:StringOrRefType as its content model, so it may contain a simple text string content, or carry a reference to an external description. The use of gml:description to reference an external description has been deprecated and replaced by the gml:descriptionReference property.</documentation>
-		</annotation>
-	</element>
-	<element name="descriptionReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>The value of this property is a remote text description of the object. The xlink:href attribute of the gml:descriptionReference property references the external description.</documentation>
-		</annotation>
-	</element>
-	<element name="name" type="gml:CodeType">
-		<annotation>
-			<documentation>The gml:name property provides a label or identifier for the object, commonly a descriptive name. An object may have several names, typically assigned by different authorities. gml:name uses the gml:CodeType content model.  The authority for a name is indicated by the value of its (optional) codeSpace attribute.  The name may or may not be unique, as determined by the rules of the organization responsible for the codeSpace.  In common usage there will be one name per au [...]
-		</annotation>
-	</element>
-	<element name="identifier" type="gml:CodeWithAuthorityType">
-		<annotation>
-			<documentation>Often, a special identifier is assigned to an object by the maintaining authority with the intention that it is used in references to the object For such cases, the codeSpace shall be provided. That identifier is usually unique either globally or within an application domain. gml:identifier is a pre-defined property for such identifiers.</documentation>
-		</annotation>
-	</element>
-	<attribute name="id" type="ID">
-		<annotation>
-			<documentation>The attribute gml:id supports provision of a handle for the XML element representing a GML Object. Its use is mandatory for all GML objects. It is of XML type ID, so is constrained to be unique in the XML document within which it occurs.</documentation>
-		</annotation>
-	</attribute>
-	<complexType name="AbstractMemberType" abstract="true">
-		<annotation>
-			<documentation>To create a collection of GML Objects that are not all features, a property type shall be derived by extension from gml:AbstractMemberType.
-This abstract property type is intended to be used only in object types where software shall be able to identify that an instance of such an object type is to be interpreted as a collection of objects.
-By default, this abstract property type does not imply any ownership of the objects in the collection. The owns attribute of gml:OwnershipAttributeGroup may be used on a property element instance to assert ownership of an object in the collection. A collection shall not own an object already owned by another object.
-</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<attributeGroup name="AggregationAttributeGroup">
-		<annotation>
-			<documentation>A GML Object Collection is any GML Object with a property element in its content model whose content model is derived by extension from gml:AbstractMemberType.
-In addition, the complex type describing the content model of the GML Object Collection may also include a reference to the attribute group gml:AggregationAttributeGroup to provide additional information about the semantics of the object collection.  This information may be used by applications to group GML objects, and optionally to order and index them.
-The allowed values for the aggregationType attribute are defined by gml:AggregationType. See 8.4 of ISO/IEC 11404:1996 for the meaning of the values in the enumeration.</documentation>
-		</annotation>
-		<attribute name="aggregationType" type="gml:AggregationType"/>
-	</attributeGroup>
-	<simpleType name="AggregationType" final="#all">
-		<restriction base="string">
-			<enumeration value="set"/>
-			<enumeration value="bag"/>
-			<enumeration value="sequence"/>
-			<enumeration value="array"/>
-			<enumeration value="record"/>
-			<enumeration value="table"/>
-		</restriction>
-	</simpleType>
-	<complexType name="AbstractMetadataPropertyType" abstract="true">
-		<annotation>
-			<documentation>To associate metadata described by any XML Schema with a GML object, a property element shall be defined whose content model is derived by extension from gml:AbstractMetadataPropertyType. 
-The value of such a property shall be metadata. The content model of such a property type, i.e. the metadata application schema shall be specified by the GML Application Schema.
-By default, this abstract property type does not imply any ownership of the metadata. The owns attribute of gml:OwnershipAttributeGroup may be used on a metadata property element instance to assert ownership of the metadata. 
-If metadata following the conceptual model of ISO 19115 is to be encoded in a GML document, the corresponding Implementation Specification specified in ISO/TS 19139 shall be used to encode the metadata information.
-</documentation>
-		</annotation>
-		<sequence/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="targetElement" type="string"/>
-	<element name="associationName" type="string"/>
-	<element name="defaultCodeSpace" type="anyURI"/>
-	<element name="gmlProfileSchema" type="anyURI"/>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/grids.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/grids.xsd
deleted file mode 100755
index 7592e0e..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/grids.xsd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:grids:3.2.1">grids.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 20.2.
-An implicit description of geometry is one in which the items of the geometry do not explicitly appear in the encoding.  Instead, a compact notation records a set of parameters, and a set of objects may be generated using a rule with these parameters.  This Clause provides grid geometries that are used in the description of gridded coverages and other applications.
-In GML two grid structures are defined, namely gml:Grid and gml:RectifiedGrid.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<element name="Grid" type="gml:GridType" substitutionGroup="gml:AbstractImplicitGeometry">
-		<annotation>
-			<documentation>The gml:Grid implicitly defines an unrectified grid, which is a network composed of two or more sets of curves in which the members of each set intersect the members of the other sets in an algorithmic way.  The region of interest within the grid is given in terms of its gml:limits, being the grid coordinates of  diagonally opposed corners of a rectangular region.  gml:axisLabels is provided with a list of labels of the axes of the grid (gml:axisName has been deprecated [...]
-The gml:limits element contains a single gml:GridEnvelope. The gml:low and gml:high property elements of the envelope are each integerLists, which are coordinate tuples, the coordinates being measured as offsets from the origin of the grid along each axis, of the diagonally opposing corners of a "rectangular" region of interest.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractImplicitGeometry" type="gml:AbstractGeometryType" abstract="true" substitutionGroup="gml:AbstractGeometry"/>
-	<complexType name="GridType">
-		<complexContent>
-			<extension base="gml:AbstractGeometryType">
-				<sequence>
-					<element name="limits" type="gml:GridLimitsType"/>
-					<choice>
-						<element name="axisLabels" type="gml:NCNameList"/>
-						<element name="axisName" type="string" maxOccurs="unbounded"/>
-					</choice>
-				</sequence>
-				<attribute name="dimension" type="positiveInteger" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="GridLimitsType">
-		<sequence>
-			<element name="GridEnvelope" type="gml:GridEnvelopeType"/>
-		</sequence>
-	</complexType>
-	<complexType name="GridEnvelopeType">
-		<sequence>
-			<element name="low" type="gml:integerList"/>
-			<element name="high" type="gml:integerList"/>
-		</sequence>
-	</complexType>
-	<element name="RectifiedGrid" type="gml:RectifiedGridType" substitutionGroup="gml:Grid">
-		<annotation>
-			<documentation>A rectified grid is a grid for which there is an affine transformation between the grid coordinates and the coordinates of an external coordinate reference system. It is defined by specifying the position (in some geometric space) of the grid "origin" and of the vectors that specify the post locations.
-Note that the grid limits (post indexes) and axis name properties are inherited from gml:GridType and that gml:RectifiedGrid adds a gml:origin property (contains or references a gml:Point) and a set of gml:offsetVector properties.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RectifiedGridType">
-		<complexContent>
-			<extension base="gml:GridType">
-				<sequence>
-					<element name="origin" type="gml:PointPropertyType"/>
-					<element name="offsetVector" type="gml:VectorType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/measures.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/measures.xsd
deleted file mode 100755
index c3a91fb..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/measures.xsd
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" xml:lang="en" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:measures:3.2.1">measures.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 17.3.
-gml:MeasureType is defined in the basicTypes schema.  The measure types defined here correspond with a set of convenience measure types described in ISO/TS 19103.  The XML implementation is based on the XML Schema simple type "double" which supports both decimal and scientific notation, and includes an XML attribute "uom" which refers to the units of measure for the value.  Note that, there is no requirement to store values using any particular format, and applications receiving elements [...]
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="units.xsd"/>
-	<element name="measure" type="gml:MeasureType">
-		<annotation>
-			<documentation>The value of a physical quantity, together with its unit.</documentation>
-		</annotation>
-	</element>
-	<complexType name="LengthType">
-		<annotation>
-			<documentation>This is a prototypical definition for a specific measure type defined as a vacuous extension (i.e. aliases) of gml:MeasureType. In this case, the content model supports the description of a length (or distance) quantity, with its units. The unit of measure referenced by uom shall be suitable for a length, such as metres or feet.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="ScaleType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="TimeType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="GridLengthType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="AreaType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="VolumeType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="SpeedType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<complexType name="AngleType">
-		<simpleContent>
-			<extension base="gml:MeasureType"/>
-		</simpleContent>
-	</complexType>
-	<element name="angle" type="gml:AngleType">
-		<annotation>
-			<documentation>The gml:angle property element is used to record the value of an angle quantity as a single number, with its units.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/observation.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/observation.xsd
deleted file mode 100755
index 944c989..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/observation.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:observation:3.2.1">observation.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 19.
-A GML observation models the act of observing, often with a camera, a person or some form of instrument.  An observation feature describes the "metadata" associated with an information capture event, together with a value for the result of the observation.  This covers a broad range of cases, from a tourist photo (not the photo but the act of taking the photo), to images acquired by space borne sensors or the measurement of a temperature 5 meters below the surfaces of a lake.
-The basic structures introduced in this schema are intended to serve as the foundation for more comprehensive schemas for scientific, technical and engineering measurement schemas.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="feature.xsd"/>
-	<include schemaLocation="direction.xsd"/>
-	<include schemaLocation="valueObjects.xsd"/>
-	<element name="Observation" type="gml:ObservationType" substitutionGroup="gml:AbstractFeature">
-		<annotation>
-			<documentation>The content model is a straightforward extension of gml:AbstractFeatureType; it automatically has the gml:identifier, gml:description, gml:descriptionReference, gml:name, and gml:boundedBy properties. 
-The gml:validTime element describes the time of the observation. Note that this may be a time instant or a time period.
-The gml:using property contains or references a description of a sensor, instrument or procedure used for the observation.
-The gml:target property contains or references the specimen, region or station which is the object of the observation. This property is particularly useful for remote observations, such as photographs, where a generic location property might apply to the location of the camera or the location of the field of view, and thus may be ambiguous.  
-The gml:subject element is provided as a convenient synonym for gml:target. This is the term commonly used in phtotography.  
-The gml:resultOf property indicates the result of the observation.  The value may be inline, or a reference to a value elsewhere.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="ObservationType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element ref="gml:validTime"/>
-					<element ref="gml:using" minOccurs="0"/>
-					<element ref="gml:target" minOccurs="0"/>
-					<element ref="gml:resultOf"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="using" type="gml:ProcedurePropertyType"/>
-	<complexType name="ProcedurePropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractFeature"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="target" type="gml:TargetPropertyType"/>
-	<element name="subject" type="gml:TargetPropertyType" substitutionGroup="gml:target"/>
-	<complexType name="TargetPropertyType">
-		<choice minOccurs="0">
-			<element ref="gml:AbstractFeature"/>
-			<element ref="gml:AbstractGeometry"/>
-		</choice>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="resultOf" type="gml:ResultType"/>
-	<complexType name="ResultType">
-		<sequence minOccurs="0">
-			<any namespace="##any"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="DirectedObservation" type="gml:DirectedObservationType" substitutionGroup="gml:Observation">
-		<annotation>
-			<documentation>A gml:DirectedObservation is the same as an observation except that it adds an additional gml:direction property. This is the direction in which the observation was acquired. Clearly this applies only to certain types of observations such as visual observations by people, or observations obtained from terrestrial cameras.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DirectedObservationType">
-		<complexContent>
-			<extension base="gml:ObservationType">
-				<sequence>
-					<element ref="gml:direction"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="DirectedObservationAtDistance" type="gml:DirectedObservationAtDistanceType" substitutionGroup="gml:DirectedObservation">
-		<annotation>
-			<documentation>gml:DirectedObservationAtDistance adds an additional distance property. This is the distance from the observer to the subject of the observation. Clearly this applies only to certain types of observations such as visual observations by people, or observations obtained from terrestrial cameras.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DirectedObservationAtDistanceType">
-		<complexContent>
-			<extension base="gml:DirectedObservationType">
-				<sequence>
-					<element name="distance" type="gml:MeasureType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/referenceSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/referenceSystems.xsd
deleted file mode 100755
index fb7e897..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/referenceSystems.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:referenceSystems:3.2.1">referenceSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 13.2.
-The reference systems schema components have two logical parts, which define elements and types for XML encoding of the definitions of:
--	Identified Object, inherited by the ten types of GML objects used for coordinate reference systems and coordinate operations
--	High-level part of the definitions of coordinate reference systems
-This schema encodes the Identified Object and Reference System packages of the UML Model for ISO 19111.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="dictionary.xsd"/>
-	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	<complexType name="IdentifiedObjectType" abstract="true">
-		<annotation>
-			<documentation>gml:IdentifiedObjectType provides identification properties of a CRS-related object. In gml:DefinitionType, the gml:identifier element shall be the primary name by which this object is identified, encoding the "name" attribute in the UML model.
-Zero or more of the gml:name elements can be an unordered set of "identifiers", encoding the "identifier" attribute in the UML model. Each of these gml:name elements can reference elsewhere the object's defining information or be an identifier by which this object can be referenced.
-Zero or more other gml:name elements can be an unordered set of "alias" alternative names by which this CRS related object is identified, encoding the "alias" attributes in the UML model. An object may have several aliases, typically used in different contexts. The context for an alias is indicated by the value of its (optional) codeSpace attribute.
-Any needed version information shall be included in the codeSpace attribute of a gml:identifier and gml:name elements. In this use, the gml:remarks element in the gml:DefinitionType shall contain comments on or information about this object, including data source information.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractCRS" type="gml:AbstractCRSType" abstract="true" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>gml:AbstractCRS specifies a coordinate reference system which is usually single but may be compound. This abstract complex type shall not be used, extended, or restricted, in a GML Application Schema, to define a concrete subtype with a meaning equivalent to a concrete subtype specified in this document.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractCRSType" abstract="true">
-		<complexContent>
-			<extension base="gml:IdentifiedObjectType">
-				<sequence>
-					<element ref="gml:domainOfValidity" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:scope" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="domainOfValidity">
-		<annotation>
-			<documentation>The gml:domainOfValidity property implements an association role to an EX_Extent object as encoded in ISO/TS 19139, either referencing or containing the definition of that extent.</documentation>
-		</annotation>
-		<complexType>
-			<sequence minOccurs="0">
-				<element ref="gmd:EX_Extent"/>
-			</sequence>
-			<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</complexType>
-	</element>
-	<element name="scope" type="string">
-		<annotation>
-			<documentation>The gml:scope property provides a description of the usage, or limitations of usage, for which this CRS-related object is valid. If unknown, enter "not known".</documentation>
-		</annotation>
-	</element>
-	<complexType name="CRSPropertyType">
-		<annotation>
-			<documentation>gml:CRSPropertyType is a property type for association roles to a CRS abstract coordinate reference system, either referencing or containing the definition of that CRS.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractCRS"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporal.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporal.xsd
deleted file mode 100755
index 11c4ae3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporal.xsd
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporal:3.2.1">temporal.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.2.
-The GML temporal schemas include components for describing temporal geometry and topology, temporal reference systems, and the temporal characteristics of geographic data. The model underlying the representation constitutes a profile of the conceptual schema described in ISO 19108. The underlying spatiotemporal model strives to accommodate both feature-level and attribute-level time stamping; basic support for tracking moving objects is also included. 
-Time is measured on two types of scales: interval and ordinal.  An interval scale offers a basis for measuring duration, an ordinal scale provides information only about relative position in time.
-Two other ISO standards are relevant to describing temporal objects:  ISO 8601 describes encodings for time instants and time periods, as text strings with particular structure and punctuation; ISO 11404 provides a detailed description of time intervals as part of a general discussion of language independent datatypes.  
-The temporal schemas cover two interrelated topics and provide basic schema components for representing temporal instants and periods, temporal topology, and reference systems; more specialized schema components defines components used for dynamic features. Instances of temporal geometric types are used as values for the temporal properties of geographic features.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="gmlBase.xsd"/>
-	<element name="AbstractTimeObject" type="gml:AbstractTimeObjectType" abstract="true" substitutionGroup="gml:AbstractGML">
-		<annotation>
-			<documentation>gml:AbstractTimeObject acts as the head of a substitution group for all temporal primitives and complexes.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeObjectType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractGMLType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimePrimitive" type="gml:AbstractTimePrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimeObject">
-		<annotation>
-			<documentation>gml:AbstractTimePrimitive acts as the head of a substitution group for geometric and topological temporal primitives.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimePrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType">
-				<sequence>
-					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimePrimitivePropertyType">
-		<annotation>
-			<documentation>gml:TimePrimitivePropertyType provides a standard content model for associations between an arbitrary member of the substitution group whose head is gml:AbstractTimePrimitive and another object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractTimePrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="validTime" type="gml:TimePrimitivePropertyType">
-		<annotation>
-			<documentation>gml:validTime is a convenience property element.</documentation>
-		</annotation>
-	</element>
-	<complexType name="RelatedTimeType">
-		<annotation>
-			<documentation>gml:RelatedTimeType provides a content model for indicating the relative position of an arbitrary member of the substitution group whose head is gml:AbstractTimePrimitive. It extends the generic gml:TimePrimitivePropertyType with an XML attribute relativePosition, whose value is selected from the set of 13 temporal relationships identified by Allen (1983)</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:TimePrimitivePropertyType">
-				<attribute name="relativePosition">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="Before"/>
-							<enumeration value="After"/>
-							<enumeration value="Begins"/>
-							<enumeration value="Ends"/>
-							<enumeration value="During"/>
-							<enumeration value="Equals"/>
-							<enumeration value="Contains"/>
-							<enumeration value="Overlaps"/>
-							<enumeration value="Meets"/>
-							<enumeration value="OverlappedBy"/>
-							<enumeration value="MetBy"/>
-							<enumeration value="BegunBy"/>
-							<enumeration value="EndedBy"/>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimeComplex" type="gml:AbstractTimeComplexType" abstract="true" substitutionGroup="gml:AbstractTimeObject">
-		<annotation>
-			<documentation>gml:AbstractTimeComplex is an aggregation of temporal primitives and acts as the head of a substitution group for temporal complexes.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeComplexType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType"/>
-		</complexContent>
-	</complexType>
-	<element name="AbstractTimeGeometricPrimitive" type="gml:AbstractTimeGeometricPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive">
-		<annotation>
-			<documentation>gml:TimeGeometricPrimitive acts as the head of a substitution group for geometric temporal primitives.
-A temporal geometry shall be associated with a temporal reference system through the frame attribute that provides a URI reference that identifies a description of the reference system. Following ISO 19108, the Gregorian calendar with UTC is the default reference system, but others may also be used. The GPS calendar is an alternative reference systems in common use.
-The two geometric primitives in the temporal dimension are the instant and the period. GML components are defined to support these as follows.</documentation>
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeGeometricPrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimePrimitiveType">
-				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeInstant" type="gml:TimeInstantType" substitutionGroup="gml:AbstractTimeGeometricPrimitive">
-		<annotation>
-			<documentation>gml:TimeInstant acts as a zero-dimensional geometric primitive that represents an identifiable position in time.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeInstantType" final="#all">
-		<complexContent>
-			<extension base="gml:AbstractTimeGeometricPrimitiveType">
-				<sequence>
-					<element ref="gml:timePosition"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeInstantPropertyType">
-		<annotation>
-			<documentation>gml:TimeInstantPropertyType provides for associating a gml:TimeInstant with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeInstant"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimePeriod" type="gml:TimePeriodType" substitutionGroup="gml:AbstractTimeGeometricPrimitive">
-		<annotation>
-			<documentation>gml:TimePeriod acts as a one-dimensional geometric primitive that represents an identifiable extent in time.
-The location in of a gml:TimePeriod is described by the temporal positions of the instants at which it begins and ends. The length of the period is equal to the temporal distance between the two bounding temporal positions. 
-Both beginning and end may be described in terms of their direct position using gml:TimePositionType which is an XML Schema simple content type, or by reference to an indentifiable time instant using gml:TimeInstantPropertyType.
-Alternatively a limit of a gml:TimePeriod may use the conventional GML property model to make a reference to a time instant described elsewhere, or a limit may be indicated as a direct position.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimePeriodType">
-		<complexContent>
-			<extension base="gml:AbstractTimeGeometricPrimitiveType">
-				<sequence>
-					<choice>
-						<element name="beginPosition" type="gml:TimePositionType"/>
-						<element name="begin" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<choice>
-						<element name="endPosition" type="gml:TimePositionType"/>
-						<element name="end" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<group ref="gml:timeLength" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimePeriodPropertyType">
-		<annotation>
-			<documentation>gml:TimePeriodPropertyType provides for associating a gml:TimePeriod with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimePeriod"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<complexType name="TimePositionType" final="#all">
-		<annotation>
-			<documentation>The method for identifying a temporal position is specific to each temporal reference system.  gml:TimePositionType supports the description of temporal position according to the subtypes described in ISO 19108.
-Values based on calendars and clocks use lexical formats that are based on ISO 8601, as described in XML Schema Part 2:2001. A decimal value may be used with coordinate systems such as GPS time or UNIX time. A URI may be used to provide a reference to some era in an ordinal reference system . 
-In common with many of the components modelled as data types in the ISO 19100 series of International Standards, the corresponding GML component has simple content. However, the content model gml:TimePositionType is defined in several steps.
-Three XML attributes appear on gml:TimePositionType:
-A time value shall be associated with a temporal reference system through the frame attribute that provides a URI reference that identifies a description of the reference system. Following ISO 19108, the Gregorian calendar with UTC is the default reference system, but others may also be used. Components for describing temporal reference systems are described in 14.4, but it is not required that the reference system be described in this, as the reference may refer to anything that may be  [...]
-For time values using a calendar containing more than one era, the (optional) calendarEraName attribute provides the name of the calendar era.  
-Inexact temporal positions may be expressed using the optional indeterminatePosition attribute.  This takes a value from an enumeration.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="gml:TimePositionUnion">
-				<attribute name="frame" type="anyURI" default="#ISO-8601"/>
-				<attribute name="calendarEraName" type="string"/>
-				<attribute name="indeterminatePosition" type="gml:TimeIndeterminateValueType"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="TimeIndeterminateValueType">
-		<annotation>
-			<documentation>These values are interpreted as follows: 
--	"unknown" indicates that no specific value for temporal position is provided.
--	"now" indicates that the specified value shall be replaced with the current temporal position whenever the value is accessed.
--	"before" indicates that the actual temporal position is unknown, but it is known to be before the specified value.
--	"after" indicates that the actual temporal position is unknown, but it is known to be after the specified value.
-A value for indeterminatePosition may 
--	be used either alone, or 
--	qualify a specific value for temporal position.</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="after"/>
-			<enumeration value="before"/>
-			<enumeration value="now"/>
-			<enumeration value="unknown"/>
-		</restriction>
-	</simpleType>
-	<simpleType name="TimePositionUnion">
-		<annotation>
-			<documentation>The simple type gml:TimePositionUnion is a union of XML Schema simple types which instantiate the subtypes for temporal position described in ISO 19108.
- An ordinal era may be referenced via URI.  A decimal value may be used to indicate the distance from the scale origin .  time is used for a position that recurs daily (see ISO 19108:2002 5.4.4.2).
- Finally, calendar and clock forms that support the representation of time in systems based on years, months, days, hours, minutes and seconds, in a notation following ISO 8601, are assembled by gml:CalDate</documentation>
-		</annotation>
-		<union memberTypes="gml:CalDate time dateTime anyURI decimal"/>
-	</simpleType>
-	<simpleType name="CalDate">
-		<union memberTypes="date gYearMonth gYear"/>
-	</simpleType>
-	<element name="timePosition" type="gml:TimePositionType">
-		<annotation>
-			<documentation>This element is used directly as a property of gml:TimeInstant (see 15.2.2.3), and may also be used in application schemas.</documentation>
-		</annotation>
-	</element>
-	<group name="timeLength">
-		<annotation>
-			<documentation>The length of a time period.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:duration"/>
-			<element ref="gml:timeInterval"/>
-		</choice>
-	</group>
-	<element name="duration" type="duration">
-		<annotation>
-			<documentation>gml:duration conforms to the ISO 8601 syntax for temporal length as implemented by the XML Schema duration type.</documentation>
-		</annotation>
-	</element>
-	<element name="timeInterval" type="gml:TimeIntervalLengthType">
-		<annotation>
-			<documentation> gml:timeInterval conforms to ISO 11404 which is based on floating point values for temporal length.
-ISO 11404 syntax specifies the use of a positiveInteger together with appropriate values for radix and factor. The resolution of the time interval is to one radix ^(-factor) of the specified time unit.
-The value of the unit is either selected from the units for time intervals from ISO 31-1:1992, or is another suitable unit.  The encoding is defined for GML in gml:TimeUnitType. The second component of this union type provides a method for indicating time units other than the six standard units given in the enumeration.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeIntervalLengthType" final="#all">
-		<simpleContent>
-			<extension base="decimal">
-				<attribute name="unit" type="gml:TimeUnitType" use="required"/>
-				<attribute name="radix" type="positiveInteger"/>
-				<attribute name="factor" type="integer"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<simpleType name="TimeUnitType">
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="year"/>
-					<enumeration value="month"/>
-					<enumeration value="day"/>
-					<enumeration value="hour"/>
-					<enumeration value="minute"/>
-					<enumeration value="second"/>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporalReferenceSystems.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporalReferenceSystems.xsd
deleted file mode 100755
index 88f610b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporalReferenceSystems.xsd
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporalReferenceSystems:3.2.1">temporalReferenceSystems.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.5.
-A value in the time domain is measured relative to a temporal reference system. Common types of reference systems include calendars, ordinal temporal reference systems, and temporal coordinate systems (time elapsed since some epoch).  The primary temporal reference system for use with geographic information is the Gregorian Calendar and 24 hour local or Coordinated Universal Time (UTC), but special applications may entail the use of alternative reference systems.  The Julian day numberin [...]
-In GML seven concrete elements are used to describe temporal reference systems: gml:TimeReferenceSystem, gml:TimeCoordinateSystem, gml:TimeCalendar, gml:TimeCalendarEra, gml:TimeClock, gml:TimeOrdinalReferenceSystem, and gml:TimeOrdinalEra.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="temporalTopology.xsd"/>
-	<include schemaLocation="dictionary.xsd"/>
-	<element name="TimeReferenceSystem" type="gml:TimeReferenceSystemType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A reference system is characterized in terms of its domain of validity: the spatial and temporal extent over which it is applicable. The basic GML element for temporal reference systems is gml:TimeReferenceSystem.  Its content model extends gml:DefinitionType with one additional property, gml:domainOfValidity.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeReferenceSystemType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="domainOfValidity" type="string"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeCoordinateSystem" type="gml:TimeCoordinateSystemType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>A temporal coordinate system shall be based on a continuous interval scale defined in terms of a single time interval.
-The differences to ISO 19108 TM_CoordinateSystem are:
--	the origin is specified either using the property gml:originPosition whose value is a direct time position, or using the property gml:origin whose model is gml:TimeInstantPropertyType; this permits more flexibility in representation and also supports referring to a value fixed elsewhere;
--	the interval uses gml:TimeIntervalLengthType.
-</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCoordinateSystemType">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<choice>
-						<element name="originPosition" type="gml:TimePositionType"/>
-						<element name="origin" type="gml:TimeInstantPropertyType"/>
-					</choice>
-					<element name="interval" type="gml:TimeIntervalLengthType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeCalendar" type="gml:TimeCalendarType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>A calendar is a discrete temporal reference system that provides a basis for defining temporal position to a resolution of one day.
-gml:TimeCalendar adds one property to those inherited from gml:TimeReferenceSystem. A gml:referenceFrame provides a link to a gml:TimeCalendarEra that it uses. A  gml:TimeCalendar may reference more than one calendar era. 
-The referenceFrame element follows the standard GML property model, allowing the association to be instantiated either using an inline description using the gml:TimeCalendarEra element, or a link to a gml:TimeCalendarEra which is explicit elsewhere.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCalendarType">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<element name="referenceFrame" type="gml:TimeCalendarEraPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeCalendarEra" type="gml:TimeCalendarEraType">
-		<annotation>
-			<documentation>gml:TimeCalendarEra inherits basic properties from gml:DefinitionType and has the following additional properties:
--	gml:referenceEvent is the name or description of a mythical or historic event which fixes the position of the base scale of the calendar era.  This is given as text or using a link to description held elsewhere.
--	gml:referenceDate specifies the date of the referenceEvent expressed as a date in the given calendar.  In most calendars, this date is the origin (i.e., the first day) of the scale, but this is not always true.
--	gml:julianReference specifies the Julian date that corresponds to the reference date.  The Julian day number is an integer value; the Julian date is a decimal value that allows greater resolution.  Transforming calendar dates to and from Julian dates provides a relatively simple basis for transforming dates from one calendar to another.
--	gml:epochOfUse is the period for which the calendar era was used as a basis for dating.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeCalendarEraType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="referenceEvent" type="gml:StringOrRefType"/>
-					<element name="referenceDate" type="gml:CalDate"/>
-					<element name="julianReference" type="decimal"/>
-					<element name="epochOfUse" type="gml:TimePeriodPropertyType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeCalendarPropertyType">
-		<annotation>
-			<documentation>gml:TimeCalendarPropertyType provides for associating a gml:TimeCalendar with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCalendar"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="TimeCalendarEraPropertyType">
-		<annotation>
-			<documentation>gml:TimeCalendarEraPropertyType provides for associating a gml:TimeCalendarEra with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeCalendarEra"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TimeClock" type="gml:TimeClockType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>A clock provides a basis for defining temporal position within a day. A clock shall be used with a calendar in order to provide a complete description of a temporal position within a specific day.
-gml:TimeClock adds the following properties to those inherited from gml:TimeReferenceSystemType:
--	gml:referenceEvent is the name or description of an event, such as solar noon or sunrise, which fixes the position of the base scale of the clock.
--	gml:referenceTime specifies the time of day associated with the reference event expressed as a time of day in the given clock. The reference time is usually the origin of the clock scale. 
--	gml:utcReference specifies the 24 hour local or UTC time that corresponds to the reference time.
--	gml:dateBasis contains or references the calendars that use this clock.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeClockType" final="#all">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<element name="referenceEvent" type="gml:StringOrRefType"/>
-					<element name="referenceTime" type="time"/>
-					<element name="utcReference" type="time"/>
-					<element name="dateBasis" type="gml:TimeCalendarPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeClockPropertyType">
-		<annotation>
-			<documentation>gml:TimeClockPropertyType provides for associating a gml:TimeClock with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeClock"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<element name="TimeOrdinalReferenceSystem" type="gml:TimeOrdinalReferenceSystemType" substitutionGroup="gml:TimeReferenceSystem">
-		<annotation>
-			<documentation>In some applications of geographic information — such as geology and archaeology — relative position in time is known more precisely than absolute time or duration. The order of events in time can be well established, but the magnitude of the intervals between them cannot be accurately determined; in such cases, the use of an ordinal temporal reference system is appropriate. An ordinal temporal reference system is composed of a sequence of named coterminous eras, which  [...]
-An ordinal temporal reference system whose component eras are not further subdivided is effectively a temporal topological complex constrained to be a linear graph. An ordinal temporal reference system some or all of whose component eras are subdivided is effectively a temporal topological complex with the constraint that parallel branches may only be constructed in pairs where one is a single temporal ordinal era and the other is a sequence of temporal ordinal eras that are called "memb [...]
-The positions of the beginning and end of a given era may calibrate the relative time scale.
-gml:TimeOrdinalReferenceSystem adds one or more gml:component properties to the generic temporal reference system model.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeOrdinalReferenceSystemType">
-		<complexContent>
-			<extension base="gml:TimeReferenceSystemType">
-				<sequence>
-					<element name="component" type="gml:TimeOrdinalEraPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="TimeOrdinalEra" type="gml:TimeOrdinalEraType">
-		<annotation>
-			<documentation>Its content model follows the pattern of gml:TimeEdge, inheriting standard properties from gml:DefinitionType, and adding gml:start, gml:end and gml:extent properties, a set of gml:member properties which indicate ordered gml:TimeOrdinalEra elements, and a gml:group property which points to the parent era.
-The recursive inclusion of gml:TimeOrdinalEra elements allow the construction of an arbitrary depth hierarchical ordinal reference schema, such that an ordinal era at a given level of the hierarchy includes a sequence of shorter, coterminous ordinal eras.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeOrdinalEraType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element name="relatedTime" type="gml:RelatedTimeType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="start" type="gml:TimeNodePropertyType" minOccurs="0"/>
-					<element name="end" type="gml:TimeNodePropertyType" minOccurs="0"/>
-					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
-					<element name="member" type="gml:TimeOrdinalEraPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="group" type="gml:ReferenceType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeOrdinalEraPropertyType">
-		<annotation>
-			<documentation>gml:TimeOrdinalEraPropertyType provides for associating a gml:TimeOrdinalEra with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeOrdinalEra"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporalTopology.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporalTopology.xsd
deleted file mode 100755
index b38392c..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/temporalTopology.xsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:temporalTopology:3.2.1">temporalTopology.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 15.3.
-Temporal topology is described in terms of time complexes, nodes, and edges, and the connectivity between these. Temporal topology does not directly provide information about temporal position. It is used in the case of describing a lineage or a history (e.g. a family tree expressing evolution of species, an ecological cycle, a lineage of lands or buildings, or a history of separation and merger of administrative boundaries). The following Subclauses specifies the temporal topology as te [...]
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<element name="AbstractTimeTopologyPrimitive" type="gml:AbstractTimeTopologyPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTimePrimitive">
-		<annotation>
-			<documentation>gml:TimeTopologyPrimitive acts as the head of a substitution group for topological temporal primitives.
-Temporal topology primitives shall imply the ordering information between features or feature properties. The temporal connection of features can be examined if they have temporal topology primitives as values of their properties. Usually, an instantaneous feature associates with a time node, and a static feature associates with a time edge.  A feature with both modes associates with the temporal topology primitive: a supertype of time nodes and time edges.
-A topological primitive is always connected to one or more other topological primitives, and is, therefore, always a member of a topological complex. In a GML instance, this will often be indicated by the primitives being described by elements that are descendents of an element describing a complex. However, in order to support the case where a temporal topological primitive is described in another context, the optional complex property is provided, which carries a reference to the paren [...]
-		</annotation>
-	</element>
-	<complexType name="AbstractTimeTopologyPrimitiveType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimePrimitiveType">
-				<sequence>
-					<element name="complex" type="gml:ReferenceType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeTopologyPrimitivePropertyType">
-		<annotation>
-			<documentation>gml:TimeTopologyPrimitivePropertyType provides for associating a gml:AbstractTimeTopologyPrimitive with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:AbstractTimeTopologyPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimeTopologyComplex" type="gml:TimeTopologyComplexType" substitutionGroup="gml:AbstractTimeComplex">
-		<annotation>
-			<documentation>A temporal topology complex shall be the connected acyclic directed graph composed of temporal topological primitives, i.e. time nodes and time edges. Because a time edge may not exist without two time nodes on its boundaries, static features have time edges from a temporal topology complex as the values of their temporal properties, regardless of explicit declarations.
-A temporal topology complex expresses a linear or a non-linear graph. A temporal linear graph, composed of a sequence of time edges, provides a lineage described only by "substitution" of feature instances or feature element values. A time node as the start or the end of the graph connects with at least one time edge. A time node other than the start and the end shall connect to at least two time edges: one of starting from the node, and another ending at the node.
-A temporal topological complex is a set of connected temporal topological primitives. The member primtives are indicated, either by reference or by value, using the primitive property.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeTopologyComplexType" abstract="true">
-		<complexContent>
-			<extension base="gml:AbstractTimeComplexType">
-				<sequence>
-					<element name="primitive" type="gml:TimeTopologyPrimitivePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeTopologyComplexPropertyType">
-		<annotation>
-			<documentation>gml:TimeTopologyComplexPropertyType provides for associating a gml:TimeTopologyComplex with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeTopologyComplex"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimeNode" type="gml:TimeNodeType" substitutionGroup="gml:AbstractTimeTopologyPrimitive">
-		<annotation>
-			<documentation>A time node is a zero-dimensional topological primitive that represents an identifiable node in time (it is equivalent to a point in space). A node may act as the termination or initiation of any number of time edges. A time node may be realised as a geometry, its position, whose value is a time instant.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeNodeType">
-		<complexContent>
-			<extension base="gml:AbstractTimeTopologyPrimitiveType">
-				<sequence>
-					<element name="previousEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="nextEdge" type="gml:TimeEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="position" type="gml:TimeInstantPropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeNodePropertyType">
-		<annotation>
-			<documentation>gml:TimeNodePropertyType provides for associating a gml:TimeNode with an object</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeNode"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="TimeEdge" type="gml:TimeEdgeType" substitutionGroup="gml:AbstractTimeTopologyPrimitive">
-		<annotation>
-			<documentation>A time edge is a one-dimensional topological primitive. It is an open interval that starts and ends at a node. The edge may be realised as a geometry whose value is a time period.</documentation>
-		</annotation>
-	</element>
-	<complexType name="TimeEdgeType">
-		<complexContent>
-			<extension base="gml:AbstractTimeTopologyPrimitiveType">
-				<sequence>
-					<element name="start" type="gml:TimeNodePropertyType"/>
-					<element name="end" type="gml:TimeNodePropertyType"/>
-					<element name="extent" type="gml:TimePeriodPropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="TimeEdgePropertyType">
-		<annotation>
-			<documentation>gml:TimeEdgePropertyType provides for associating a gml:TimeEdge with an object.</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:TimeEdge"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/topology.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/topology.xsd
deleted file mode 100755
index c528e6c..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/topology.xsd
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:topology:3.2.1">topology.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 Clause 14.
-Topology is the branch of mathematics describing the properties of objects which are invariant under continuous deformation. For example, a circle is topologically equivalent to an ellipse because one can be transformed into the other by stretching. In geographic modelling, the foremost use of topology is in accelerating computational geometry. The constructs of topology allow characterisation of the spatial relationships between objects using simple combinatorial or algebraic algorithms [...]
-There are four instantiable classes of primitive topology objects, one for each dimension up to 3D. In addition, topological complexes are supported, too. 
-There is strong symmetry in the (topological boundary and coboundary) relationships between topology primitives of adjacent dimensions. Topology primitives are bounded by directed primitives of one lower dimension. The coboundary of each topology primitive is formed from directed topology primitives of one higher dimension.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-  <include schemaLocation="gml.xsd"/>
-  <include schemaLocation="geometryComplexes.xsd"/>
-  <complexType name="AbstractTopologyType" abstract="true">
-    <annotation>
-      <documentation>This abstract type supplies the root or base type for all topological elements including primitives and complexes. It inherits AbstractGMLType and hence can be identified using the gml:id attribute.</documentation>
-    </annotation>
-    <complexContent>
-      <extension base="gml:AbstractGMLType"/>
-    </complexContent>
-  </complexType>
-  <element name="AbstractTopology" type="gml:AbstractTopologyType" abstract="true" substitutionGroup="gml:AbstractGML"/>
-  <complexType name="AbstractTopoPrimitiveType" abstract="true">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType"/>
-    </complexContent>
-  </complexType>
-  <element name="AbstractTopoPrimitive" type="gml:AbstractTopoPrimitiveType" abstract="true" substitutionGroup="gml:AbstractTopology">
-    <annotation>
-      <documentation>gml:AbstractTopoPrimitive acts as the base type for all topological primitives. Topology primitives are the atomic (smallest possible) units of a topology complex. 
-Each topology primitive may contain references to other topology primitives of codimension 2 or more (gml:isolated). Conversely, nodes may have faces as containers and nodes and edges may have solids as containers (gml:container).</documentation>
-    </annotation>
-  </element>
-  <complexType name="NodeOrEdgePropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:Node"/>
-      <element ref="gml:Edge"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="NodePropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:Node"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="FaceOrTopoSolidPropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:Face"/>
-      <element ref="gml:TopoSolid"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoSolidPropertyType">
-    <choice minOccurs="0">
-      <element ref="gml:TopoSolid"/>
-    </choice>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="NodeType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="container" type="gml:FaceOrTopoSolidPropertyType" minOccurs="0"/>
-          <element ref="gml:directedEdge" minOccurs="0" maxOccurs="unbounded">
-            <annotation>
-              <documentation>In the case of planar topology, a gml:Node must have a clockwise sequence of gml:directedEdge properties, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR).</documentation>
-            </annotation>
-          </element>
-          <element ref="gml:pointProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="Node" type="gml:NodeType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:Node represents the 0-dimensional primitive.
-The optional coboundary of a node (gml:directedEdge) is a sequence of directed edges which are incident on this node. Edges emanating from this node appear in the node coboundary with a negative orientation. 
-If provided, the aggregationType attribute shall have the value "sequence".
-A node may optionally be realised by a 0-dimensional geometric primitive (gml:pointProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedNode" type="gml:DirectedNodePropertyType">
-    <annotation>
-      <documentation>A gml:directedNode property element describes the boundary of topology edges and is used in the support of topological point features via the gml:TopoPoint expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included node is used: start ("-") or end ("+") node.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedNodePropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:Node"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="EdgeType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="container" type="gml:TopoSolidPropertyType" minOccurs="0"/>
-          <element ref="gml:directedNode" minOccurs="2" maxOccurs="2"/>
-          <element ref="gml:directedFace" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:curveProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="Edge" type="gml:EdgeType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:Edge represents the 1-dimensional primitive.
-The topological boundary of an Edge (gml:directedNode) consists of a negatively directed start Node and a positively directed end Node.   
-The optional coboundary of an edge (gml:directedFace) is a circular sequence of directed faces which are incident on this edge in document order. In the 2D case, the orientation of the face on the left of the edge is "+"; the orientation of the face on the right on its right is "-". 
-If provided, the aggregationType attribute shall have the value "sequence".
-An edge may optionally be realised by a 1-dimensional geometric primitive (gml:curveProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedEdge" type="gml:DirectedEdgePropertyType">
-    <annotation>
-      <documentation>A gml:directedEdge property element describes the boundary of topology faces, the coBoundary of topology nodes and is used in the support of topological line features via the gml:TopoCurve expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included edge is used, i.e. forward or reverse.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedEdgePropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:Edge"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="FaceType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="isolated" type="gml:NodePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:directedEdge" maxOccurs="unbounded"/>
-          <element ref="gml:directedTopoSolid" minOccurs="0" maxOccurs="2"/>
-          <element ref="gml:surfaceProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-        <attribute name="universal" type="boolean" use="optional" default="false">
-          <annotation>
-            <documentation>If the topological representation exists an unbounded manifold (e.g. Euclidean plane), a gml:Face must indicate whether it is a universal face or not, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR). The optional universal attribute of type boolean is used to indicate this. NOTE The universal face is normally not part of any feature, and is used to represent the unbounded portion of the data set. Its in [...]
-          </annotation>
-        </attribute>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="Face" type="gml:FaceType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:Face represents the 2-dimensional topology primitive.
-The topological boundary of a face (gml:directedEdge) consists of a sequence of directed edges. If provided, the aggregationType attribute shall have the value "sequence".
-The optional coboundary of a face (gml:directedTopoSolid) is a pair of directed solids which are bounded by this face. A positively directed solid corresponds to a solid which lies in the direction of the negatively directed normal to the face in any geometric realisation. 
-A face may optionally be realised by a 2-dimensional geometric primitive (gml:surfaceProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedFace" type="gml:DirectedFacePropertyType">
-    <annotation>
-      <documentation>The gml:directedFace property element describes the boundary of topology solids, in the coBoundary of topology edges and is used in the support of surface features via the gml:TopoSurface expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included face is used i.e. inward or outward with respect to the surface normal in any geometric realisation.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedFacePropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:Face"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoSolidType">
-    <complexContent>
-      <extension base="gml:AbstractTopoPrimitiveType">
-        <sequence>
-          <element name="isolated" type="gml:NodeOrEdgePropertyType" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:directedFace" maxOccurs="unbounded"/>
-          <element ref="gml:solidProperty" minOccurs="0"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-        <attribute name="universal" type="boolean" use="optional" default="false">
-          <annotation>
-            <documentation>A gml:TopoSolid must indicate whether it is a universal topo-solid or not, to ensure a lossless topology representation as defined by Kuijpers, et. al. (see OGC 05-102 Topology IPR). The optional universal attribute of type boolean is used to indicate this and the default is fault. NOTE The universal topo-solid is normally not part of any feature, and is used to represent the unbounded portion of the data set. Its interior boundary (it has no exterior boundary) [...]
-          </annotation>
-        </attribute>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoSolid" type="gml:TopoSolidType" substitutionGroup="gml:AbstractTopoPrimitive">
-    <annotation>
-      <documentation>gml:TopoSolid represents the 3-dimensional topology primitive. 
-The topological boundary of a solid (gml:directedFace) consists of a set of directed faces.
-A solid may optionally be realised by a 3-dimensional geometric primitive (gml:solidProperty).</documentation>
-    </annotation>
-  </element>
-  <element name="directedTopoSolid" type="gml:DirectedTopoSolidPropertyType">
-    <annotation>
-      <documentation>The gml:directedSolid property element describes the coBoundary of topology faces and is used in the support of volume features via the gml:TopoVolume expression, see below. The orientation attribute of type gml:SignType expresses the sense in which the included solid appears in the face coboundary. In the context of a gml:TopoVolume the orientation attribute has no meaning.</documentation>
-    </annotation>
-  </element>
-  <complexType name="DirectedTopoSolidPropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:TopoSolid"/>
-    </sequence>
-    <attribute name="orientation" type="gml:SignType" default="+"/>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoPointType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedNode"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoPoint" type="gml:TopoPointType">
-    <annotation>
-      <documentation>The intended use of gml:TopoPoint is to appear within a point feature to express the structural and possibly geometric relationships of this feature to other features via shared node definitions.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoPointPropertyType">
-    <sequence>
-      <element ref="gml:TopoPoint"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoPointProperty" type="gml:TopoPointPropertyType">
-    <annotation>
-      <documentation>The gml:topoPointProperty property element may be used in features to express their relationship to the referenced topology node.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoCurveType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedEdge" maxOccurs="unbounded"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoCurve" type="gml:TopoCurveType">
-    <annotation>
-      <documentation>gml:TopoCurve represents a homogeneous topological expression, a sequence of directed edges, which if realised are isomorphic to a geometric curve primitive. The intended use of gml:TopoCurve is to appear within a line feature to express the structural and geometric relationships of this feature to other features via the shared edge definitions.
-If provided, the aggregationType attribute shall have the value "sequence".</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoCurvePropertyType">
-    <sequence>
-      <element ref="gml:TopoCurve"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoCurveProperty" type="gml:TopoCurvePropertyType">
-    <annotation>
-      <documentation>The gml:topoCurveProperty property element may be used in features to express their relationship to the referenced topology edges.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoSurfaceType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedFace" maxOccurs="unbounded"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoSurface" type="gml:TopoSurfaceType">
-    <annotation>
-      <documentation>gml:TopoSurface represents a homogeneous topological expression, a set of directed faces, which if realised are isomorphic to a geometric surface primitive. The intended use of gml:TopoSurface is to appear within a surface feature to express the structural and possibly geometric relationships of this surface feature to other features via the shared face definitions.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoSurfacePropertyType">
-    <sequence>
-      <element ref="gml:TopoSurface"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoSurfaceProperty" type="gml:TopoSurfacePropertyType">
-    <annotation>
-      <documentation>The gml:topoSurfaceProperty property element may be used in features to express their relationship to the referenced topology faces.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoVolumeType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:directedTopoSolid" maxOccurs="unbounded"/>
-        </sequence>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoVolume" type="gml:TopoVolumeType">
-    <annotation>
-      <documentation>gml:TopoVolume represents a homogeneous topological expression, a set of directed topologic solids, which if realised are isomorphic to a geometric solid primitive. The intended use of gml:TopoVolume is to appear within a solid feature to express the structural and geometric relationships of this solid feature to other features via the shared solid definitions.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoVolumePropertyType">
-    <sequence>
-      <element ref="gml:TopoVolume"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoVolumeProperty" type="gml:TopoVolumePropertyType">
-    <annotation>
-      <documentation>The gml:topoVolumeProperty element may be used in features to express their relationship to the referenced topology volume.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoComplexType">
-    <complexContent>
-      <extension base="gml:AbstractTopologyType">
-        <sequence>
-          <element ref="gml:maximalComplex"/>
-          <element ref="gml:superComplex" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:subComplex" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:topoPrimitiveMember" minOccurs="0" maxOccurs="unbounded"/>
-          <element ref="gml:topoPrimitiveMembers" minOccurs="0"/>
-        </sequence>
-        <attribute name="isMaximal" type="boolean" default="false"/>
-        <attributeGroup ref="gml:AggregationAttributeGroup"/>
-      </extension>
-    </complexContent>
-  </complexType>
-  <element name="TopoComplex" type="gml:TopoComplexType" substitutionGroup="gml:AbstractTopology">
-    <annotation>
-      <documentation>gml:TopoComplex is a collection of topological primitives.
-Each complex holds a reference to its maximal complex (gml:maximalComplex) and optionally to sub- or super-complexes (gml:subComplex, gml:superComplex). 
-A topology complex contains its primitive and sub-complex members.
-</documentation>
-    </annotation>
-  </element>
-  <element name="subComplex" type="gml:TopoComplexPropertyType">
-    <annotation>
-      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
-    </annotation>
-  </element>
-  <element name="superComplex" type="gml:TopoComplexPropertyType">
-    <annotation>
-      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
-    </annotation>
-  </element>
-  <element name="maximalComplex" type="gml:TopoComplexPropertyType">
-    <annotation>
-      <documentation>The property elements gml:subComplex, gml:superComplex and gml:maximalComplex provide an encoding for relationships between topology complexes as described for gml:TopoComplex above.</documentation>
-    </annotation>
-  </element>
-  <element name="topoPrimitiveMember" type="gml:TopoPrimitiveMemberType">
-    <annotation>
-      <documentation>The gml:topoPrimitiveMember property element encodes for the relationship between a topology complex and a single topology primitive.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoPrimitiveMemberType">
-    <sequence minOccurs="0">
-      <element ref="gml:AbstractTopoPrimitive"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <element name="topoPrimitiveMembers" type="gml:TopoPrimitiveArrayAssociationType">
-    <annotation>
-      <documentation>The gml:topoPrimitiveMembers property element encodes the relationship between a topology complex and an arbitrary number of topology primitives.</documentation>
-    </annotation>
-  </element>
-  <complexType name="TopoPrimitiveArrayAssociationType">
-    <sequence minOccurs="0" maxOccurs="unbounded">
-      <element ref="gml:AbstractTopoPrimitive"/>
-    </sequence>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
-  </complexType>
-  <complexType name="TopoComplexPropertyType">
-    <sequence minOccurs="0">
-      <element ref="gml:TopoComplex"/>
-    </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-  </complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/units.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/units.xsd
deleted file mode 100755
index 84eca23..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/units.xsd
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xml:lang="en" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:units:3.2.1">units.xsd</appinfo>
-		<documentation>See ISO/DIS 17.2.
-Several GML Schema components concern or require a reference scale or units of measure.  Units are required for quantities that may occur as values of properties of feature types, as the results of observations, in the range parameters of a coverage, and for measures used in Coordinate Reference System definitions. 
-The basic unit definition is an extension of the general gml:Definition element defined in 16.2.1.  Three specialized elements for unit definition are further derived from this. 
-This model is based on the SI system of units [ISO 1000], which distinguishes between Base Units and Derived Units.  
--	Base Units are the preferred units for a set of orthogonal fundamental quantities which define the particular system of units, which may not be derived by combination of other base units.  
--	Derived Units are the preferred units for other quantities in the system, which may be defined by algebraic combination of the base units.  
-In some application areas Conventional units are used, which may be converted to the preferred units using a scaling factor or a formula which defines a re-scaling and offset.  The set of preferred units for all physical quantity types in a particular system of units is composed of the union of its base units and derived units.  
-Unit definitions are substitutable for the gml:Definition element declared as part of the dictionary model.  A dictionary that contains only unit definitions and references to unit definitions is a units dictionary.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="dictionary.xsd"/>
-	<element name="unitOfMeasure" type="gml:UnitOfMeasureType">
-		<annotation>
-			<documentation>The element gml:unitOfMeasure is a property element to refer to a unit of measure. This is an empty element which carries a reference to a unit of measure definition.</documentation>
-		</annotation>
-	</element>
-	<complexType name="UnitOfMeasureType">
-		<sequence/>
-		<attribute name="uom" type="gml:UomIdentifier" use="required"/>
-	</complexType>
-	<element name="UnitDefinition" type="gml:UnitDefinitionType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>A gml:UnitDefinition is a general definition of a unit of measure. This generic element is used only for units for which no relationship with other units or units systems is known.
-The content model of gml:UnitDefinition adds three additional properties to gml:Definition, gml:quantityType, gml:quantityTypeReference and gml:catalogSymbol.  
-The gml:catalogSymbol property optionally gives the short symbol used for this unit. This element is usually used when the relationship of this unit to other units or units systems is unknown.</documentation>
-		</annotation>
-	</element>
-	<complexType name="UnitDefinitionType">
-		<complexContent>
-			<extension base="gml:DefinitionType">
-				<sequence>
-					<element ref="gml:quantityType" minOccurs="0"/>
-					<element ref="gml:quantityTypeReference" minOccurs="0"/>
-					<element ref="gml:catalogSymbol" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="quantityType" type="gml:StringOrRefType">
-		<annotation>
-			<documentation>The gml:quantityType property indicates the phenomenon to which the units apply. This element contains an informal description of the phenomenon or type of physical quantity that is measured or observed. When the physical quantity is the result of an observation or measurement, this term is known as observable type or measurand.
-The use of gml:quantityType for references to remote values is deprecated.</documentation>
-		</annotation>
-	</element>
-	<element name="quantityTypeReference" type="gml:ReferenceType">
-		<annotation>
-			<documentation>The gml:quantityTypeReference property indicates the phenomenon to which the units apply. The content is a reference to a remote value.</documentation>
-		</annotation>
-	</element>
-	<element name="catalogSymbol" type="gml:CodeType">
-		<annotation>
-			<documentation>The catalogSymbol is the preferred lexical symbol used for this unit of measure.
-The codeSpace attribute in gml:CodeType identifies a namespace for the catalog symbol value, and might reference the external catalog. The string value in gml:CodeType contains the value of a symbol that should be unique within this catalog namespace. This symbol often appears explicitly in the catalog, but it could be a combination of symbols using a specified algebra of units.</documentation>
-		</annotation>
-	</element>
-	<element name="BaseUnit" type="gml:BaseUnitType" substitutionGroup="gml:UnitDefinition">
-		<annotation>
-			<documentation>A base unit is a unit of measure that cannot be derived by combination of other base units within a particular system of units.  For example, in the SI system of units, the base units are metre, kilogram, second, Ampere, Kelvin, mole, and candela, for the physical quantity types length, mass, time interval, electric current, thermodynamic temperature, amount of substance and luminous intensity, respectively.
-gml:BaseUnit extends generic gml:UnitDefinition with the property gml:unitsSystem, which carries a reference to the units system to which this base unit is asserted to belong.  </documentation>
-		</annotation>
-	</element>
-	<complexType name="BaseUnitType">
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<element name="unitsSystem" type="gml:ReferenceType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="DerivedUnit" type="gml:DerivedUnitType" substitutionGroup="gml:UnitDefinition">
-		<annotation>
-			<documentation>Derived units are defined by combination of other units.  Derived units are used for quantities other than those corresponding to the base units, such as hertz (s-1) for frequency, Newton (kg.m/s2) for force.  Derived units based directly on base units are usually preferred for quantities other than the fundamental quantities within a system. If a derived unit is not the preferred unit, the gml:ConventionalUnit element should be used instead.
-The gml:DerivedUnit extends gml:UnitDefinition with the property gml:derivationUnitTerms.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivedUnitType">
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<element ref="gml:derivationUnitTerm" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="derivationUnitTerm" type="gml:DerivationUnitTermType">
-		<annotation>
-			<documentation>A set of gml:derivationUnitTerm elements describes a derived unit of measure.  Each element carries an integer exponent.  The terms are combined by raising each referenced unit to the power of its exponent and forming the product.
-This unit term references another unit of measure (uom) and provides an integer exponent applied to that unit in defining the compound unit. The exponent may be positive or negative, but not zero.</documentation>
-		</annotation>
-	</element>
-	<complexType name="DerivationUnitTermType">
-		<complexContent>
-			<extension base="gml:UnitOfMeasureType">
-				<attribute name="exponent" type="integer"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ConventionalUnit" type="gml:ConventionalUnitType" substitutionGroup="gml:UnitDefinition">
-		<annotation>
-			<documentation>Conventional units that are neither base units nor defined by direct combination of base units are used in many application domains.  For example electronVolt for energy, feet and nautical miles for length.  In most cases there is a known, usually linear, conversion to a preferred unit which is either a base unit or derived by direct combination of base units.
-The gml:ConventionalUnit extends gml:UnitDefinition with a property that describes a conversion to a preferred unit for this physical quantity.  When the conversion is exact, the element gml:conversionToPreferredUnit should be used, or when the conversion is not exact the element gml:roughConversionToPreferredUnit is available. Both of these elements have the same content model.  The gml:derivationUnitTerm property defined above is included to allow a user to optionally record how this u [...]
-		</annotation>
-	</element>
-	<complexType name="ConventionalUnitType">
-		<complexContent>
-			<extension base="gml:UnitDefinitionType">
-				<sequence>
-					<choice>
-						<element ref="gml:conversionToPreferredUnit"/>
-						<element ref="gml:roughConversionToPreferredUnit"/>
-					</choice>
-					<element ref="gml:derivationUnitTerm" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="conversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>The elements gml:conversionToPreferredUnit and gml:roughConversionToPreferredUnit represent parameters used to convert conventional units to preferred units for this physical quantity type.  A preferred unit is either a Base Unit or a Derived Unit that is selected for all values of one physical quantity type.</documentation>
-		</annotation>
-	</element>
-	<element name="roughConversionToPreferredUnit" type="gml:ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>The elements gml:conversionToPreferredUnit and gml:roughConversionToPreferredUnit represent parameters used to convert conventional units to preferred units for this physical quantity type.  A preferred unit is either a Base Unit or a Derived Unit that is selected for all values of one physical quantity type.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ConversionToPreferredUnitType">
-		<annotation>
-			<documentation>The inherited attribute uom references the preferred unit that this conversion applies to. The conversion of a unit to the preferred unit for this physical quantity type is specified by an arithmetic conversion (scaling and/or offset). The content model extends gml:UnitOfMeasureType, which has a mandatory attribute uom which identifies the preferred unit for the physical quantity type that this conversion applies to. The conversion is specified by a choice of 
--	gml:factor, which defines the scale factor, or
--	gml:formula, which defines a formula 
-by which a value using the conventional unit of measure can be converted to obtain the corresponding value using the preferred unit of measure.  
-The formula defines the parameters of a simple formula by which a value using the conventional unit of measure can be converted to the corresponding value using the preferred unit of measure. The formula element contains elements a, b, c and d, whose values use the XML Schema type double. These values are used in the formula y = (a + bx) / (c + dx), where x is a value using this unit, and y is the corresponding value using the base unit. The elements a and d are optional, and if values a [...]
-		</annotation>
-		<complexContent>
-			<extension base="gml:UnitOfMeasureType">
-				<choice>
-					<element name="factor" type="double"/>
-					<element name="formula" type="gml:FormulaType"/>
-				</choice>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="FormulaType">
-		<sequence>
-			<element name="a" type="double" minOccurs="0"/>
-			<element name="b" type="double"/>
-			<element name="c" type="double"/>
-			<element name="d" type="double" minOccurs="0"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/valueObjects.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/valueObjects.xsd
deleted file mode 100755
index 204bdfd..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/gml/3.2.1/valueObjects.xsd
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/gml/3.2" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="3.2.1.2">
-	<annotation>
-		<appinfo source="urn:x-ogc:specification:gml:schema-xsd:valueObjects:3.2.1">valueObjects.xsd</appinfo>
-		<documentation>See ISO/DIS 19136 17.5.
-The elements declared in this Clause build on other GML schema components, in particular gml:AbstractTimeObject, gml:AbstractGeometry, and the following types:  gml:MeasureType, gml:MeasureListType, gml:CodeType, gml:CodeOrNilReasonListType, gml:BooleanOrNilReasonListType, gml:IntegerOrNilReasonList.  
-Of particular interest are elements that are the heads of substitution groups, and one named choice group. These are the primary reasons for the value objects schema, since they may act as variables in the definition of content models, such as Observations, when it is desired to permit alternative value types to occur some of which may have complex content such as arrays, geometry and time objects, and where it is useful not to prescribe the actual value type in advance. The members of t [...]
-The value objects are defined in a hierarchy. The following relationships are defined:
--	Concrete elements gml:Quantity, gml:Category, gml:Count and gml:Boolean are substitutable for the abstract element gml:AbstractScalarValue.  
--	Concrete elements gml:QuantityList, gml:CategoryList, gml:CountList and gml:BooleanList are substitutable for the abstract element gml:AbstractScalarValueList.  
--	Concrete element gml:ValueArray is substitutable for the concrete element gml:CompositeValue.  
--	Abstract elements gml:AbstractScalarValue and gml:AbstractScalarValueList, and concrete elements gml:CompositeValue, gml:ValueExtent, gml:CategoryExtent, gml:CountExtent and gml:QuantityExtent are substitutable for abstract element gml:AbstractValue.  
--	Abstract elements gml:AbstractValue, gml:AbstractTimeObject and gml:AbstractGeometry are all in a choice group named gml:Value, which is used for compositing in gml:CompositeValue and gml:ValueExtent.  
--	Schemas which need values may use the abstract element gml:AbstractValue in a content model in order to permit any of the gml:AbstractScalarValues, gml:AbstractScalarValueLists, gml:CompositeValue or gml:ValueExtent to occur in an instance, or the named group gml:Value to also permit gml:AbstractTimeObjects, gml:AbstractGeometrys.
-
-GML is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="gml.xsd"/>
-	<include schemaLocation="geometryBasic0d1d.xsd"/>
-	<include schemaLocation="temporal.xsd"/>
-	<element name="Boolean" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<complexType>
-			<simpleContent>
-				<extension base="boolean">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="BooleanList" type="gml:booleanOrNilReasonList" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="Category" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<annotation>
-			<documentation>A gml:Category has an optional XML attribute codeSpace, whose value is a URI which identifies a dictionary, codelist or authority for the term.</documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="gml:CodeType">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="CategoryList" type="gml:CodeOrNilReasonListType" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="Count" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<complexType>
-			<simpleContent>
-				<extension base="integer">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="CountList" type="gml:integerOrNilReasonList" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="Quantity" substitutionGroup="gml:AbstractScalarValue" nillable="true">
-		<annotation>
-			<documentation>An XML attribute uom ("unit of measure") is required, whose value is a URI which identifies the definition of a ratio scale or units by which the numeric value shall be multiplied, or an interval or position scale on which the value occurs.</documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="gml:MeasureType">
-					<attribute name="nilReason" type="gml:NilReasonType"/>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<element name="QuantityList" type="gml:MeasureOrNilReasonListType" substitutionGroup="gml:AbstractScalarValueList"/>
-	<element name="AbstractValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractObject">
-		<annotation>
-			<documentation>gml:AbstractValue is an abstract element which acts as the head of a substitution group which contains gml:AbstractScalarValue, gml:AbstractScalarValueList, gml:CompositeValue and gml:ValueExtent, and (transitively) the elements in their substitution groups.
-These elements may be used in an application schema as variables, so that in an XML instance document any member of its substitution group may occur.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractScalarValue" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue">
-		<annotation>
-			<documentation>gml:AbstractScalarValue is an abstract element which acts as the head of a substitution group which contains gml:Boolean, gml:Category, gml:Count and gml:Quantity, and (transitively) the elements in their substitution groups.</documentation>
-		</annotation>
-	</element>
-	<element name="AbstractScalarValueList" type="anyType" abstract="true" substitutionGroup="gml:AbstractValue">
-		<annotation>
-			<documentation>gml:AbstractScalarValueList is an abstract element which acts as the head of a substitution group which contains gml:BooleanList, gml:CategoryList, gml:CountList and gml:QuantityList, and (transitively) the elements in their substitution groups.</documentation>
-		</annotation>
-	</element>
-	<group name="Value">
-		<annotation>
-			<documentation>This is a convenience choice group which unifies generic values defined in this Clause with spatial and temporal objects and the measures described above, so that any of these may be used within aggregate values.</documentation>
-		</annotation>
-		<choice>
-			<element ref="gml:AbstractValue"/>
-			<element ref="gml:AbstractGeometry"/>
-			<element ref="gml:AbstractTimeObject"/>
-			<element ref="gml:Null"/>
-		</choice>
-	</group>
-	<element name="valueProperty" type="gml:ValuePropertyType">
-		<annotation>
-			<documentation>Property that refers to, or contains, a Value. Convenience element for general use.</documentation>
-		</annotation>
-	</element>
-	<element name="valueComponent" type="gml:ValuePropertyType">
-		<annotation>
-			<documentation>Property that refers to, or contains, a Value.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ValuePropertyType">
-		<sequence minOccurs="0">
-			<group ref="gml:Value"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="valueComponents" type="gml:ValueArrayPropertyType">
-		<annotation>
-			<documentation>Property that contains Values.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ValueArrayPropertyType">
-		<sequence maxOccurs="unbounded">
-			<group ref="gml:Value"/>
-		</sequence>
-		<attributeGroup ref="gml:OwnershipAttributeGroup"/>
-	</complexType>
-	<element name="CompositeValue" type="gml:CompositeValueType" substitutionGroup="gml:AbstractValue">
-		<annotation>
-			<documentation>gml:CompositeValue is an aggregate value built from other values . It contains zero or an arbitrary number of gml:valueComponent elements, and zero or one gml:valueComponents property elements.  It may be used for strongly coupled aggregates (vectors, tensors) or for arbitrary collections of values.</documentation>
-		</annotation>
-	</element>
-	<complexType name="CompositeValueType">
-		<complexContent>
-			<extension base="gml:AbstractGMLType">
-				<sequence>
-					<element ref="gml:valueComponent" minOccurs="0" maxOccurs="unbounded"/>
-					<element ref="gml:valueComponents" minOccurs="0"/>
-				</sequence>
-				<attributeGroup ref="gml:AggregationAttributeGroup"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="ValueArray" type="gml:ValueArrayType" substitutionGroup="gml:CompositeValue">
-		<annotation>
-			<documentation>A Value Array is used for homogeneous arrays of primitive and aggregate values.  
-The member values may be scalars, composites, arrays or lists.
-ValueArray has the same content model as CompositeValue, but the member values shall be homogeneous.  The element declaration contains a Schematron constraint which expresses this restriction precisely.  Since the members are homogeneous, the gml:referenceSystem (uom, codeSpace) may be specified on the gml:ValueArray itself and inherited by all the members if desired.</documentation>
-		</annotation>
-	</element>
-	<complexType name="ValueArrayType">
-		<complexContent>
-			<extension base="gml:CompositeValueType">
-				<attributeGroup ref="gml:referenceSystem"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<attributeGroup name="referenceSystem">
-		<attribute name="codeSpace" type="anyURI"/>
-		<attribute name="uom" type="gml:UomIdentifier"/>
-	</attributeGroup>
-	<element name="CategoryExtent" type="gml:CategoryExtentType" substitutionGroup="gml:AbstractValue"/>
-	<complexType name="CategoryExtentType">
-		<simpleContent>
-			<restriction base="gml:CodeOrNilReasonListType">
-				<length value="2"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<element name="CountExtent" type="gml:CountExtentType" substitutionGroup="gml:AbstractValue"/>
-	<simpleType name="CountExtentType">
-		<restriction base="gml:integerOrNilReasonList">
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-	<element name="QuantityExtent" type="gml:QuantityExtentType" substitutionGroup="gml:AbstractValue"/>
-	<complexType name="QuantityExtentType">
-		<simpleContent>
-			<restriction base="gml:MeasureOrNilReasonListType">
-				<length value="2"/>
-			</restriction>
-		</simpleContent>
-	</complexType>
-	<complexType name="BooleanPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Boolean"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="CategoryPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Category"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="QuantityPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Quantity"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<complexType name="CountPropertyType">
-		<sequence minOccurs="0">
-			<element ref="gml:Count"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd
deleted file mode 100755
index f9c0600..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0" ?>
-<!-- *********************************************************************** -->
-<!--                                UNCLASSIFIED                             -->
-<!-- *********************************************************************** -->
-<!-- *************************** IC ISM XML Schema ************************* -->
-
-<!--
-     The IC ISM XML Schema is described in the IC Information Security
-     Marking (IC ISM) Data Element Dictionary and the IC ISM Implementation
-     Guide. It is one of the Intelligence Community (IC) Metadata Standards
-     for Information Assurance.
--->
-<!--    
-     IC ISM, Version 2.0, dated 30 April 2004
-
-     This file provides an XML-based schema for specification of metadata
-     for classification and controls markings.  The goal of the IC ISM XML
-     Schema is to provide a common set of XML attributes for implementing
-     security-based metadata throughout the IC. The IC ISM XML Schema
-     provides markup for the tokens that are used to format the CAPCO
-     markings.
-     
-     The IC ISM XML Schema may be incorporated into organizational 
-     XML-based schemas by (a) declaring the IC ISM v2.0 namespace and
-     (b) inserting an "import" statement:
-
-        <xsd:schema
-            xmlns="...my namespace name..."
-            targetNamespace="...my namespace name..."
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:ism="urn:us:gov:ic:ism:v2">
-        ...
-        <xsd:import 
-            namespace="urn:us:gov:ic:ism:v2"
-            schemaLocation="IC-ISM-v2.xsd" />
-		
-     IMPLEMENTATION NOTES:
-     
-     1. Refer to the Data Element Dictionary and Implementation Guide for an
-        explanation of the relationships of the IC ISM attributes and the 
-        associated controlled vocabularies.  The CAPCO Register and CAPCO
-        Implementation Manual provide business rules (that may be
-        classified) not provided in the DED or Implementation Guide.
-         
-     2. The IC ISM attributes are intended to support all CAPCO security
-        markings.  However, the attribute values are NOT intended to be
-        verbatim pieces of portionmarks and banners.  Instead, the values
-        should be interpreted by XSLT stylesheets or other formatting speci-
-        fications to produce the required portionmarks and banners.
-
-     3. The IC ISM schema is not a standalone construct; it should be
-        imported into a parent XML schema.
-     
-     4. The controlled vocabularies containing the required values for popu-
-        lating the attributes are defined in the Implementation Guide and
-        maintained as separate text files. The terms of the controlled
-        vocabularies are defined in the CAPCO Register.
-        
-     5. Attribute group "SecurityAttributesGroup" should be referenced
-        in the attribute definition list of any element that REQUIRES 
-        security metadata.
-     
-     6. Attribute group "SecurityAttributesOptionGroup" may be referenced
-        in the attribute definition list of any element for which
-        security metadata may be appropriate but is not required (such
-        as, an individual cell of a table).
--->
-
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  targetNamespace="urn:us:gov:ic:ism:v2"
-  xmlns="urn:us:gov:ic:ism:v2"
-  elementFormDefault="qualified"
-  xml:lang="en">
-  
-  <xsd:annotation>
-    <xsd:documentation>
-W3C XML Schema for the Intelligence Community Metadata Standard for
-Information Security Marking (IC-ISM), which is part of the IC
-standards for Information Assurance.
-    </xsd:documentation>
-  </xsd:annotation>
-  
-
-<!-- ************************************************************* -->
-<!-- TYPE DEFINITIONS ................................           . -->
-<!-- ************************************************************* -->
-
-  <xsd:simpleType name="ClassificationType">
-     <xsd:annotation>
-       <xsd:documentation>
-A simple type in which a name token is restricted to the US,
-non-US, and joint classification portionmark abbreviations from 
-the CAPCO Register.
-       </xsd:documentation>
-     </xsd:annotation>
-     <xsd:restriction base="xsd:NMTOKEN">
-        <xsd:enumeration value="U">
-           <xsd:annotation>
-              <xsd:documentation>
-US, non-US or joint UNCLASSIFIED.
-              </xsd:documentation>
-           </xsd:annotation>
-        </xsd:enumeration>
-        <xsd:enumeration value="C"/>
-        <xsd:enumeration value="S"/>
-        <xsd:enumeration value="TS"/>
-        <xsd:enumeration value="R"/>
-        <xsd:enumeration value="CTS"/>
-        <xsd:enumeration value="CTS-B"/>
-        <xsd:enumeration value="CTS-BALK"/>
-        <xsd:enumeration value="NU"/>
-        <xsd:enumeration value="NR"/>
-        <xsd:enumeration value="NC"/>
-        <xsd:enumeration value="NS"/>
-        <xsd:enumeration value="NS-S"/>
-        <xsd:enumeration value="NS-A"/>
-        <xsd:enumeration value="CTSA"/>
-        <xsd:enumeration value="NSAT"/>
-        <xsd:enumeration value="NCA"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- ************************************************************* -->
-<!-- ATTRIBUTE GROUP DEFINITIONS ................................. -->
-<!-- ************************************************************* -->
-
-  <xsd:attributeGroup name="SecurityAttributesGroup">
-
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-The group of Information Security Marking attributes in which
-the use of attributes 'classification' and 'ownerProducer' is
-required. This group is to be contrasted with group
-'SecurityAttributesOptionGroup' in which use of those attributes
-is optional.
-      </xsd:documentation>
-    </xsd:annotation>
-  
-    <xsd:attribute ref="classification" use="required"/>
-    <xsd:attribute ref="ownerProducer" use="required"/>
-    <xsd:attribute ref="SCIcontrols" use="optional"/>
-    <xsd:attribute ref="SARIdentifier" use="optional"/>
-    <xsd:attribute ref="disseminationControls" use="optional"/>
-    <xsd:attribute ref="FGIsourceOpen" use="optional"/>
-    <xsd:attribute ref="FGIsourceProtected" use="optional"/>
-    <xsd:attribute ref="releasableTo" use="optional"/>
-    <xsd:attribute ref="nonICmarkings" use="optional"/>
-    <xsd:attribute ref="classifiedBy" use="optional"/>
-    <xsd:attribute ref="classificationReason" use="optional"/>
-    <xsd:attribute ref="derivedFrom" use="optional"/>
-    <xsd:attribute ref="declassDate" use="optional"/>
-    <xsd:attribute ref="declassEvent" use="optional"/>
-    <xsd:attribute ref="declassException" use="optional"/>
-    <xsd:attribute ref="typeOfExemptedSource" use="optional"/>
-    <xsd:attribute ref="dateOfExemptedSource" use="optional"/>
-    <xsd:attribute ref="declassManualReview" use="optional"/>
-  
-  </xsd:attributeGroup>
-  
-  
-  <xsd:attributeGroup name="SecurityAttributesOptionGroup">
-
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-The group of Information Security Marking attributes in which
-the use of attributes 'classification' and 'ownerProducer'
-is optional. This group is to be contrasted with group
-'SecurityAttributesGroup' in which use of these attributes
-is required.
-      </xsd:documentation>
-    </xsd:annotation>
-  
-    <xsd:attribute ref="classification" use="optional"/>
-    <xsd:attribute ref="ownerProducer" use="optional"/>
-    <xsd:attribute ref="SCIcontrols" use="optional"/>
-    <xsd:attribute ref="SARIdentifier" use="optional"/>
-    <xsd:attribute ref="disseminationControls" use="optional"/>
-    <xsd:attribute ref="FGIsourceOpen" use="optional"/>
-    <xsd:attribute ref="FGIsourceProtected" use="optional"/>
-    <xsd:attribute ref="releasableTo" use="optional"/>
-    <xsd:attribute ref="nonICmarkings" use="optional"/>
-    <xsd:attribute ref="classifiedBy" use="optional"/>
-    <xsd:attribute ref="classificationReason" use="optional"/>
-    <xsd:attribute ref="derivedFrom" use="optional"/>
-    <xsd:attribute ref="declassDate" use="optional"/>
-    <xsd:attribute ref="declassEvent" use="optional"/>
-    <xsd:attribute ref="declassException" use="optional"/>
-    <xsd:attribute ref="typeOfExemptedSource" use="optional"/>
-    <xsd:attribute ref="dateOfExemptedSource" use="optional"/>
-    <xsd:attribute ref="declassManualReview" use="optional"/>
-  
-  </xsd:attributeGroup>
-    
-  
-<!-- ************************************************************* -->
-<!-- GLOBAL ATTRIBUTE DECLARATIONS ............................... -->
-<!-- ************************************************************* -->
-
-  <xsd:attribute name="classification" type="ClassificationType"/>
-  
-  
-  <xsd:attribute name="ownerProducer">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-ISO 3166-1 trigraph(s) of the owner or producer country(ies) and/or
-CAPCO-specified tetragraphs of international organizations.
-Either (a) a single trigraph or tetragraph or (b) a space-delimited
-list of trigraphs followed by tetragraphs. Trigraphs must be in
-alphabetical order and tetragraphs must be in alphabetical order.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-  
-  
-  <xsd:attribute name="SCIcontrols">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Authorized abbreviation(s) of SCI control system(s). Either
-(a) a single abbreviation or (b) a space-delimited list of
-abbreviations in the order prescribed in the CAPCO Register.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="SARIdentifier">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Authorized Special Access Required program digraph(s) or
-trigraph(s) preceded by "SAR-". Either (a) a single digraph or
-trigraph or (b) a space-delimited list of digraphs or trigraphs.
-Example: "SAR-ABC SAR-DEF ..."
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="disseminationControls">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Authorized dissemination control portion mark abbreviation(s).
-Either (a) a single abbreviation or (b) a space-delimited list
-of abbreviations in the order shown in the CAPCO Register.
-Exception: For the "REL" abbreviation, omit the country code
-trigraph(s) and instead place the trigraph(s) in the
-"releasableTo" attribute value.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="FGIsourceOpen">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Non-US classification portion marking for foreign government
-information in a document portion. Use this attribute to record
-a source country when the intent is to post the document to a
-shared space with the source identified.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="FGIsourceProtected">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Non-US classification portion marking for foreign government
-information in a document portion. Use this attribute to record
-a source country when the intent is to filter out the identity of
-the source prior to posting the document to a shared space.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="releasableTo">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-ISO 3166-1 trigraphic codes of countries to which the associated
-content can be released. Include "USA" in all instances. Use a space-
-delimited list with "USA" first, followed by the other trigraph(s)
-in alphabetical order.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="nonICmarkings">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Authorized non-IC portion marking abbreviation(s) from the CAPCO
-Register. Either (a) a single non-IC abbreviated marking or
-(b) a space-delimited list of abbreviations in the order shown
-in the CAPCO Register.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="classifiedBy">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-Use as specified by E.O. 12958.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="classificationReason">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-A text string containing one or more paragraph numbers, 1.4(a)
-through 1.4(h), taken from E.O. 12958, as amended. Enter the
-paragraph references as they should appear in a
-classification/declassification block.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="derivedFrom">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-A text string containing (a) the title and date of a specific source
-document, or (b) the title and date of an organization classification
-guide, or (c) the literal string "Multiple Sources".
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="declassDate">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-A specific date, in the format YYYY-MM-DD, at which the applicable
-information is automatically declassified.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:date"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="declassEvent">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-A textual description of an event that triggers declassification.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="declassException">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-One or more of the exceptions to 25-year declassification:
-specify "25X1-human", "25X1", "25X2", ..., "25X9". If more than
-one exception applies, use a space-delimited list. If "25X1-human"
-applies, it should be first in a list.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="typeOfExemptedSource">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-One or more tokens indicating that a source that is exempted from
-automatic declassification applies. Specify "OADR", "X1", "X2", ...,
-"X8". If more than one applies, use a space-delimited list.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:NMTOKENS"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="dateOfExemptedSource">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-A specific date, in the format YYYY-MM-DD. Used in conjunction with
-attribute "typeOfExemptedSource." If there are multiple exempted
-sources, specify the date of the exempted
-source that has the most recent date.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:date"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-
-  <xsd:attribute name="declassManualReview">
-    <xsd:annotation>
-      <xsd:documentation xml:lang="en">
-A true/false indication that manual review is required for
-declassification. Use this attribute to force the appearance of
-"//MR" in the header and footer marking titles. Use this attribute
-ONLY when it is necessary to override the business logic applied to
-classification and control markings in the document to determine
-whether manual review is required.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:boolean"/>
-    </xsd:simpleType>
-  </xsd:attribute>
-        
-</xsd:schema>
-
-<!-- ***************************************************************
-                             USAGE GUIDELINES
-     ***************************************************************
-     
-     1. Use "classification" and "ownerProducer" together to specify
-     the classification and type of classification.
-     
-        a. If "ownerProducer" equals "USA," the classification is
-        a US classification and is restricted to "U," "C," "S" and
-        "TS."
-        
-        b. If "ownerProducer" equals a trigraph other than "USA" or
-        equals a tetragraph, the classification is a non-US classi-
-        fication.
-        
-        c. If "ownerProducer" equals two or more trigraphs or tetra-
-        graphs, the classification is a joint classification. If "USA"
-        is one of the trigraphs, the classification values are 
-        restricted as shown in a, above. If "USA" is not listed, the
-        permissible classification values include "R" in addition to
-        those in a, above.
-        
-     2. Use "classifiedBy" and "classificationReason" for original
-     classifications. Use "derivedFrom" for derived classifications.
-     
-     3. Use one and only one of:
-     
-        "declassDate"
-        "declassEvent"
-        "declassException"
-        "typeOfExemptedSource"
-        
-     4. If "typeOfExemptedSource" is used, "dateOfExemptedSource" must
-     also be used.
-     
-     5. Use "declassManualReview" to force the appearance of "//MR" in
-     header and footer marking titles. Otherwise, the applicability of
-     manual review should be determined from the other markings in the
-     document.
-     
-     6. Attribute "FGIsourceProtected" is included for use by organiza-
-     tions that want to use IC ISM internally and track protected
-     sources within the origanization private spaces. It is not
-     anticipated that this attribute will be used in documents posted
-     to the shared spaces.
--->
-
-
-<!-- **************************************************************
-                            CHANGE HISTORY
-     **************************************************************
-*
-* VERSION: 1.0
-* DATE:    2002-07-05
-* BY:      IC MWG
-* PURPOSE: Released as a registered, production XML entity set.
-*
-* VERSION: 2.0
-* DATE:    2004-04-30
-* BY:      IC MWG
-* PURPOSE: Updated to support changes to the CAPCO Register and
-           Implementation Manual.
-* 
-*     - Added "ownerProducer" as a required attribute for entity
-*       "SecurityAttributes" and as an optional attribute for entity
-*       "SecurityAttributesOption."  Purpose is to provide a single method
-*       for specification of US, non-US, and joint classifications.
-*
-*     - Changed the enumerated list that is the declared value of attribute
-*       "classification" in order to accommodate non-US classifications.
-*     
-*     - Added optional attribute "SARIdentifier" as a separate container for
-*       DoD/DoE special-access-required nicknames, codewords, or trigraph/
-*       digraph to support elevation of SAR to the same level as SCI controls.
-*
-*     - Added optional attributes "classifiedBy" and "classificationReason"
-*       to support generation of EO 12958 classification/declassification
-*       blocks.
-*
-*     - Changed the declared value of "derivedFrom" to CDATA to allow the titles
-*       and dates of source documents or classification guides to be specified.
-*
-*     - Replaced the single attribute "declassification" with distinct attri-
-*       butes for date-determined and event-determined declassification and
-*       for the 25X declassification exceptions.
-*
-*     - Added attributes "typeOfExemptedSource" and "dateOfExemptedSource" for
-*       use in specifying that one or more sources was marked OADR, X1 through
-*       X8, or X-Foreign Relations.
-*
-*     - Added attribute "declassManualReview" for use in forcing "MR" to
-*       appear in header and footer banners (regardless of whether any
-*       caveats in the portions would necessitate manual review).
-*     
-*
-******************************** END CHANGE HISTORY ************************ -->
-
-<!-- *********************************************************************** -->
-<!--                               UNCLASSIFIED                              -->
-<!-- *********************************************************************** -->         
\ No newline at end of file
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/basicTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/basicTypes.xsd
deleted file mode 100755
index b3353ac..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/basicTypes.xsd
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gco="http://www.isotc211.org/2005/gco" targetNamespace="http://www.isotc211.org/2005/gco" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic COmmon (GCO) extensible markup language is a component of the XML Schema Implementation of Geographic
-Information Metadata documented in ISO/TS 19139:2007. GCO includes all the definitions of http://www.isotc211.org/2005/gco namespace. The root document of this namespace is the file gco.xsd. This basicTypes.xsd schema implements concepts from the "basic types" package of ISO/TS 19103.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<xs:include schemaLocation="gco.xsd"/>
-	<xs:include schemaLocation="gcoBase.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- =========================================================================== -->
-	<xs:complexType name="TypeName_Type">
-		<xs:annotation>
-			<xs:documentation>A TypeName is a LocalName that references either a recordType or object type in some form of schema. The stored value "aName" is the returned value for the "aName()" operation. This is the types name.  - For parsing from types (or objects) the parsible name normally uses a "." navigation separator, so that it is of the form  [class].[member].[memberOfMember]. ...)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aName" type="gco:CharacterString_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="TypeName" type="gco:TypeName_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="TypeName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:TypeName"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MemberName_Type">
-		<xs:annotation>
-			<xs:documentation>A MemberName is a LocalName that references either an attribute slot in a record or  recordType or an attribute, operation, or association role in an object instance or  type description in some form of schema. The stored value "aName" is the returned value for the "aName()" operation.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aName" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="attributeType" type="gco:TypeName_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MemberName" type="gco:MemberName_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MemberName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:MemberName"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="Multiplicity_Type">
-		<xs:annotation>
-			<xs:documentation>Use to represent the possible cardinality of a relation. Represented by a set of simple multiplicity ranges.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="range" type="gco:MultiplicityRange_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Multiplicity" type="gco:Multiplicity_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Multiplicity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Multiplicity"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MultiplicityRange_Type">
-		<xs:annotation>
-			<xs:documentation>A component of a multiplicity, consisting of an non-negative lower bound, and a potentially infinite upper bound.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="lower" type="gco:Integer_PropertyType"/>
-					<xs:element name="upper" type="gco:UnlimitedInteger_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MultiplicityRange" type="gco:MultiplicityRange_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MultiplicityRange_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:MultiplicityRange"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--================================================-->
-	<!-- ================== Measure ===================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Measure" type="gml:MeasureType"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Measure_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Measure"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Length" type="gml:LengthType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Length_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Length"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Angle" type="gml:AngleType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Angle_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Angle"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Scale" type="gml:ScaleType" substitutionGroup="gco:Measure"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Scale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Scale"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Distance" type="gml:LengthType" substitutionGroup="gco:Length"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Distance_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Distance"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CharacterString" type="xs:string"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CharacterString_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:CharacterString"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Boolean" type="xs:boolean"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Boolean_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Boolean"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractGenericName" type="gml:CodeType" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="GenericName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:AbstractGenericName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="LocalName" type="gml:CodeType" substitutionGroup="gco:AbstractGenericName"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LocalName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:LocalName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="ScopedName" type="gml:CodeType" substitutionGroup="gco:AbstractGenericName"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="ScopedName_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:ScopedName"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ============================= UOM ========================================= -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomAngle_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomLength_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomScale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnitOfMeasure_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomArea_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomVelocity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomTime_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!-- ........................................................................ -->
-	<xs:complexType name="UomVolume_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Date & DateTime ================================= -->
-	<!--=============================================-->
-	<xs:element name="DateTime" type="xs:dateTime"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DateTime_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:DateTime"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="Date_Type">
-		<xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="Date" type="gco:Date_Type" nillable="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Date_PropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="gco:Date"/>
-			<xs:element ref="gco:DateTime"/>
-		</xs:choice>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Number basic type =============================== -->
-	<!--=======================================================-->
-	<xs:complexType name="Number_PropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="gco:Real"/>
-			<xs:element ref="gco:Decimal"/>
-			<xs:element ref="gco:Integer"/>
-		</xs:choice>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Decimal" type="xs:decimal"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Decimal_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Decimal"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Real" type="xs:double"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Real_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Real"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Integer" type="xs:integer"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Integer_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Integer"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ============================= UnlimitedInteger ================================ -->
-	<!--NB: The encoding mechanism below is based on the use of XCPT (see the usage of xsi:nil in XML instance).-->
-	<!--================= Type ==================-->
-	<xs:complexType name="UnlimitedInteger_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:nonNegativeInteger">
-				<xs:attribute name="isInfinite" type="xs:boolean"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="UnlimitedInteger" type="gco:UnlimitedInteger_Type" nillable="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="UnlimitedInteger_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:UnlimitedInteger"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ========================= Record & RecordType ============================== -->
-	<!--================= Record ==================-->
-	<xs:element name="Record"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Record_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Record"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--================= RecordType ==================-->
-	<xs:complexType name="RecordType_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attributeGroup ref="xlink:simpleAttrs"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="RecordType" type="gco:RecordType_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RecordType_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:RecordType"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- =========================== Binary basic type ================================ -->
-	<!--NB: this type is not declared in 19103 but used in 19115. -->
-	<!--================= Type ==================-->
-	<xs:complexType name="Binary_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="src" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="Binary" type="gco:Binary_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Binary_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gco:Binary"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!--================================================-->
-	<!-- =============================================== -->
-	<!--================================================-->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/gco.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/gco.xsd
deleted file mode 100755
index 6090d49..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/gco.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" targetNamespace="http://www.isotc211.org/2005/gco" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic COmmon (GCO) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GCO includes all the definitions of http://www.isotc211.org/2005/gco namespace. The root document of this namespace is the file gco.xsd.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="basicTypes.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd
deleted file mode 100755
index 78b9767..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gco/gcoBase.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.isotc211.org/2005/gco" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic COmmon (GCO) extensible markup language is a component of the XML Schema Implementation of Geographic
-Information Metadata documented in ISO/TS 19139:2007. GCO includes all the definitions of http://www.isotc211.org/2005/gco namespace. The root document of this namespace is the file gco.xsd. This gcoBase.xsd schema provides:
-		1.  tools to handle specific objects like "code lists" and "record";
-		2. Some XML types representing that do not follow the general encoding rules.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	<xs:include schemaLocation="gco.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- =========================================================================== -->
-	<!-- ========================= IM_Object: abstract Root ============================= -->
-	<!--================= Type ===================-->
-	<xs:complexType name="AbstractObject_Type" abstract="true">
-		<xs:sequence/>
-		<xs:attributeGroup ref="gco:ObjectIdentification"/>
-	</xs:complexType>
-	<!--================= Element =================-->
-	<xs:element name="AbstractObject" type="gco:AbstractObject_Type" abstract="true"/>
-	<!-- ========================================================================== -->
-	<!-- ====================== Reference of a resource =============================== -->
-	<!--The following attributeGroup 'extends' the GML  gml:AssociationAttributeGroup-->
-	<xs:attributeGroup name="ObjectReference">
-		<xs:attributeGroup ref="xlink:simpleAttrs"/>
-		<xs:attribute name="uuidref" type="xs:string"/>
-	</xs:attributeGroup>
-	<!--================== NULL ====================-->
-	<xs:attribute name="nilReason" type="gml:NilReasonType"/>
-	<!--=============== PropertyType =================-->
-	<xs:complexType name="ObjectReference_PropertyType">
-		<xs:sequence/>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ====================== Identification of a resource ============================== -->
-	<xs:attributeGroup name="ObjectIdentification">
-		<xs:attribute name="id" type="xs:ID"/>
-		<xs:attribute name="uuid" type="xs:string"/>
-	</xs:attributeGroup>
-	<!-- ========================================================================== -->
-	<!-- ====================== The CodeList prototype ================================= -->
-	<!--It is used to refer to a specific codeListValue in a register-->
-	<!--================= Type ==================-->
-	<xs:complexType name="CodeListValue_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="codeList" type="xs:anyURI" use="required"/>
-				<xs:attribute name="codeListValue" type="xs:anyURI" use="required"/>
-				<xs:attribute name="codeSpace" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ========================================================================== -->
-	<!-- ========================== The isoType attribute ============================== -->
-	<xs:attribute name="isoType" type="xs:string"/>
-	<!--==============End================-->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/applicationSchema.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/applicationSchema.xsd
deleted file mode 100755
index f333a2b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/applicationSchema.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This applicationSchema.xsd schema implements the UML conceptual schema defined in A.2.12 of ISO 19115:2003. It contains the implementation of the class MD_Application [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_ApplicationSchemaInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the application schema used to build the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gmd:CI_Citation_PropertyType"/>
-					<xs:element name="schemaLanguage" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="constraintLanguage" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="schemaAscii" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="graphicsFile" type="gco:Binary_PropertyType" minOccurs="0"/>
-					<xs:element name="softwareDevelopmentFile" type="gco:Binary_PropertyType" minOccurs="0"/>
-					<xs:element name="softwareDevelopmentFileFormat" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ApplicationSchemaInformation" type="gmd:MD_ApplicationSchemaInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ApplicationSchemaInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ApplicationSchemaInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/citation.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/citation.xsd
deleted file mode 100755
index 6ec6677..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/citation.xsd
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This citation.xsd schema implements the UML conceptual schema defined in A.3.2 of ISO 19115:2003. It contains the implementation of the following classes: CI_Responsi [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="referenceSystem.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="CI_ResponsibleParty_Type">
-		<xs:annotation>
-			<xs:documentation>Identification of, and means of communication with, person(s) and organisations associated with the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="individualName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="organisationName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="positionName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="contactInfo" type="gmd:CI_Contact_PropertyType" minOccurs="0"/>
-					<xs:element name="role" type="gmd:CI_RoleCode_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_ResponsibleParty" type="gmd:CI_ResponsibleParty_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_ResponsibleParty_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_ResponsibleParty"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Citation_Type">
-		<xs:annotation>
-			<xs:documentation>Standardized resource reference</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="title" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="alternateTitle" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="date" type="gmd:CI_Date_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="edition" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="editionDate" type="gco:Date_PropertyType" minOccurs="0"/>
-					<xs:element name="identifier" type="gmd:MD_Identifier_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="citedResponsibleParty" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="presentationForm" type="gmd:CI_PresentationFormCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="series" type="gmd:CI_Series_PropertyType" minOccurs="0"/>
-					<xs:element name="otherCitationDetails" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="collectiveTitle" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="ISBN" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="ISSN" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Citation" type="gmd:CI_Citation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Citation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Citation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Address_Type">
-		<xs:annotation>
-			<xs:documentation>Location of the responsible individual or organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="deliveryPoint" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="city" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="administrativeArea" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="postalCode" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="country" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="electronicMailAddress" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Address" type="gmd:CI_Address_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Address_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Address"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_OnlineResource_Type">
-		<xs:annotation>
-			<xs:documentation>Information about online sources from which the dataset, specification, or community profile name and extended metadata elements can be obtained.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="linkage" type="gmd:URL_PropertyType"/>
-					<xs:element name="protocol" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="applicationProfile" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="name" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="description" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="function" type="gmd:CI_OnLineFunctionCode_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_OnlineResource" type="gmd:CI_OnlineResource_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_OnlineResource_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_OnlineResource"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Contact_Type">
-		<xs:annotation>
-			<xs:documentation>Information required enabling contact with the  responsible person and/or organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="phone" type="gmd:CI_Telephone_PropertyType" minOccurs="0"/>
-					<xs:element name="address" type="gmd:CI_Address_PropertyType" minOccurs="0"/>
-					<xs:element name="onlineResource" type="gmd:CI_OnlineResource_PropertyType" minOccurs="0"/>
-					<xs:element name="hoursOfService" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="contactInstructions" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Contact" type="gmd:CI_Contact_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Contact_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Contact"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Telephone_Type">
-		<xs:annotation>
-			<xs:documentation>Telephone numbers for contacting the responsible individual or organisation</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="voice" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="facsimile" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Telephone" type="gmd:CI_Telephone_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Telephone_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Telephone"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Date_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="date" type="gco:Date_PropertyType"/>
-					<xs:element name="dateType" type="gmd:CI_DateTypeCode_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Date" type="gmd:CI_Date_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Date_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Date"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="CI_Series_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="issueIdentification" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="page" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="CI_Series" type="gmd:CI_Series_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_Series_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_Series"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="URL" type="xs:anyURI"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="URL_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:URL"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_RoleCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_RoleCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_RoleCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_PresentationFormCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_PresentationFormCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_PresentationFormCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_OnLineFunctionCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_OnLineFunctionCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_OnLineFunctionCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="CI_DateTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="CI_DateTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:CI_DateTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/constraints.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/constraints.xsd
deleted file mode 100755
index 5986c09..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/constraints.xsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This constraints.xsd schema implements the UML conceptual schema defined in A.2.3 of ISO 19115:2003. It contains the implementation of the following classes: MD_Const [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_Constraints_Type">
-		<xs:annotation>
-			<xs:documentation>Restrictions on the access and use of a dataset or metadata</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="useLimitation" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Constraints" type="gmd:MD_Constraints_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Constraints_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Constraints"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_LegalConstraints_Type">
-		<xs:annotation>
-			<xs:documentation>Restrictions and legal prerequisites for accessing and using the dataset.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_Constraints_Type">
-				<xs:sequence>
-					<xs:element name="accessConstraints" type="gmd:MD_RestrictionCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="useConstraints" type="gmd:MD_RestrictionCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="otherConstraints" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_LegalConstraints" type="gmd:MD_LegalConstraints_Type" substitutionGroup="gmd:MD_Constraints"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_LegalConstraints_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_LegalConstraints"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_SecurityConstraints_Type">
-		<xs:annotation>
-			<xs:documentation>Handling restrictions imposed on the dataset because of national security, privacy, or other concerns</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_Constraints_Type">
-				<xs:sequence>
-					<xs:element name="classification" type="gmd:MD_ClassificationCode_PropertyType"/>
-					<xs:element name="userNote" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="classificationSystem" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="handlingDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_SecurityConstraints" type="gmd:MD_SecurityConstraints_Type" substitutionGroup="gmd:MD_Constraints"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_SecurityConstraints_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_SecurityConstraints"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ClassificationCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ClassificationCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ClassificationCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_RestrictionCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_RestrictionCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_RestrictionCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/content.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/content.xsd
deleted file mode 100755
index 0381452..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/content.xsd
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This content.xsd schema implements the UML conceptual schema defined in ISO 19115:2003, A.2.8. It contains the implementation of the following classes: MD_FeatureCata [...]
-MD_ImageDescription, MD_ContentInformation, MD_RangeDimension, MD_Band, MD_CoverageContentTypeCode, MD_ImagingConditionCode.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_FeatureCatalogueDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Information identifing the feature catalogue</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_ContentInformation_Type">
-				<xs:sequence>
-					<xs:element name="complianceCode" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="includedWithDataset" type="gco:Boolean_PropertyType"/>
-					<xs:element name="featureTypes" type="gco:GenericName_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="featureCatalogueCitation" type="gmd:CI_Citation_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_FeatureCatalogueDescription" type="gmd:MD_FeatureCatalogueDescription_Type" substitutionGroup="gmd:AbstractMD_ContentInformation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_FeatureCatalogueDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_FeatureCatalogueDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_CoverageDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the domain of the raster cell</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_ContentInformation_Type">
-				<xs:sequence>
-					<xs:element name="attributeDescription" type="gco:RecordType_PropertyType"/>
-					<xs:element name="contentType" type="gmd:MD_CoverageContentTypeCode_PropertyType"/>
-					<xs:element name="dimension" type="gmd:MD_RangeDimension_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CoverageDescription" type="gmd:MD_CoverageDescription_Type" substitutionGroup="gmd:AbstractMD_ContentInformation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CoverageDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CoverageDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ImageDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Information about an image's suitability for use</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_CoverageDescription_Type">
-				<xs:sequence>
-					<xs:element name="illuminationElevationAngle" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="illuminationAzimuthAngle" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="imagingCondition" type="gmd:MD_ImagingConditionCode_PropertyType" minOccurs="0"/>
-					<xs:element name="imageQualityCode" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="cloudCoverPercentage" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="processingLevelCode" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="compressionGenerationQuantity" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="triangulationIndicator" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="radiometricCalibrationDataAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="cameraCalibrationInformationAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="filmDistortionInformationAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-					<xs:element name="lensDistortionInformationAvailability" type="gco:Boolean_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ImageDescription" type="gmd:MD_ImageDescription_Type" substitutionGroup="gmd:MD_CoverageDescription"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ImageDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ImageDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractMD_ContentInformation_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMD_ContentInformation" type="gmd:AbstractMD_ContentInformation_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ContentInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractMD_ContentInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_RangeDimension_Type">
-		<xs:annotation>
-			<xs:documentation>Set of adjacent wavelengths in the electro-magnetic spectrum with a common characteristic, such as the visible band</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="sequenceIdentifier" type="gco:MemberName_PropertyType" minOccurs="0"/>
-					<xs:element name="descriptor" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_RangeDimension" type="gmd:MD_RangeDimension_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_RangeDimension_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_RangeDimension"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Band_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_RangeDimension_Type">
-				<xs:sequence>
-					<xs:element name="maxValue" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="minValue" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="units" type="gco:UomLength_PropertyType" minOccurs="0"/>
-					<xs:element name="peakResponse" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="bitsPerValue" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="toneGradation" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="scaleFactor" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="offset" type="gco:Real_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Band" type="gmd:MD_Band_Type" substitutionGroup="gmd:MD_RangeDimension"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Band_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Band"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CoverageContentTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CoverageContentTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CoverageContentTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ImagingConditionCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ImagingConditionCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ImagingConditionCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/dataQuality.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/dataQuality.xsd
deleted file mode 100755
index cb08ed5..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/dataQuality.xsd
+++ /dev/null
@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This dataQuality.xsd schema implements the UML conceptual schema defined in A.2.4 of ISO 19115:2003. It contains the implementation of the following classes: LI_Proce [...]
-DQ_ConformanceResult, DQ_QuantitativeResult, DQ_Result, DQ_TemporalValidity, DQ_AccuracyOfATimeMeasurement, DQ_QuantitativeAttributeAccuracy, DQ_NonQuantitativeAttributeAccuracy, DQ_ThematicClassificationCorrectness, DQ_RelativeInternalPositionalAccuracy, DQ_GriddedDataPositionalAccuracy, DQ_AbsoluteExternalPositionalAccuracy, DQ_TopologicalConsistency, DQ_FormatConsistency, DQ_DomainConsistency, DQ_ConceptualConsistency, DQ_CompletenessOmission, DQ_CompletenessCommission, DQ_TemporalAcc [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="identification.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="LI_ProcessStep_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="description" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="rationale" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="dateTime" type="gco:DateTime_PropertyType" minOccurs="0"/>
-					<xs:element name="processor" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="source" type="gmd:LI_Source_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LI_ProcessStep" type="gmd:LI_ProcessStep_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LI_ProcessStep_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LI_ProcessStep"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="LI_Source_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="description" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="scaleDenominator" type="gmd:MD_RepresentativeFraction_PropertyType" minOccurs="0"/>
-					<xs:element name="sourceReferenceSystem" type="gmd:MD_ReferenceSystem_PropertyType" minOccurs="0"/>
-					<xs:element name="sourceCitation" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="sourceExtent" type="gmd:EX_Extent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="sourceStep" type="gmd:LI_ProcessStep_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LI_Source" type="gmd:LI_Source_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LI_Source_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LI_Source"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="LI_Lineage_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="statement" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="processStep" type="gmd:LI_ProcessStep_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="source" type="gmd:LI_Source_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LI_Lineage" type="gmd:LI_Lineage_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LI_Lineage_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LI_Lineage"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_ConformanceResult_Type">
-		<xs:annotation>
-			<xs:documentation>quantitative_result from Quality Procedures -  - renamed to remove implied use limitiation.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Result_Type">
-				<xs:sequence>
-					<xs:element name="specification" type="gmd:CI_Citation_PropertyType"/>
-					<xs:element name="explanation" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="pass" type="gco:Boolean_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_ConformanceResult" type="gmd:DQ_ConformanceResult_Type" substitutionGroup="gmd:AbstractDQ_Result"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ConformanceResult_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_ConformanceResult"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_QuantitativeResult_Type">
-		<xs:annotation>
-			<xs:documentation>Quantitative_conformance_measure from Quality Procedures.  -  - Renamed to remove implied use limitation -  - OCL - -- result is type specified by valueDomain - result.tupleType = valueDomain</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Result_Type">
-				<xs:sequence>
-					<xs:element name="valueType" type="gco:RecordType_PropertyType" minOccurs="0"/>
-					<xs:element name="valueUnit" type="gco:UnitOfMeasure_PropertyType"/>
-					<xs:element name="errorStatistic" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="value" type="gco:Record_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_QuantitativeResult" type="gmd:DQ_QuantitativeResult_Type" substitutionGroup="gmd:AbstractDQ_Result"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_QuantitativeResult_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_QuantitativeResult"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_Result_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_Result" type="gmd:AbstractDQ_Result_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Result_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_Result"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_TemporalValidity_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_TemporalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_TemporalValidity" type="gmd:DQ_TemporalValidity_Type" substitutionGroup="gmd:AbstractDQ_TemporalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TemporalValidity_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_TemporalValidity"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_TemporalConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_TemporalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_TemporalConsistency" type="gmd:DQ_TemporalConsistency_Type" substitutionGroup="gmd:AbstractDQ_TemporalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TemporalConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_TemporalConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_AccuracyOfATimeMeasurement_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_TemporalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_AccuracyOfATimeMeasurement" type="gmd:DQ_AccuracyOfATimeMeasurement_Type" substitutionGroup="gmd:AbstractDQ_TemporalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_AccuracyOfATimeMeasurement_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_AccuracyOfATimeMeasurement"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_QuantitativeAttributeAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_ThematicAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_QuantitativeAttributeAccuracy" type="gmd:DQ_QuantitativeAttributeAccuracy_Type" substitutionGroup="gmd:AbstractDQ_ThematicAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_QuantitativeAttributeAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_QuantitativeAttributeAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_NonQuantitativeAttributeAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_ThematicAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_NonQuantitativeAttributeAccuracy" type="gmd:DQ_NonQuantitativeAttributeAccuracy_Type" substitutionGroup="gmd:AbstractDQ_ThematicAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_NonQuantitativeAttributeAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_NonQuantitativeAttributeAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_ThematicClassificationCorrectness_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_ThematicAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_ThematicClassificationCorrectness" type="gmd:DQ_ThematicClassificationCorrectness_Type" substitutionGroup="gmd:AbstractDQ_ThematicAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ThematicClassificationCorrectness_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_ThematicClassificationCorrectness"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_RelativeInternalPositionalAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_PositionalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_RelativeInternalPositionalAccuracy" type="gmd:DQ_RelativeInternalPositionalAccuracy_Type" substitutionGroup="gmd:AbstractDQ_PositionalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_RelativeInternalPositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_RelativeInternalPositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_GriddedDataPositionalAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_PositionalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_GriddedDataPositionalAccuracy" type="gmd:DQ_GriddedDataPositionalAccuracy_Type" substitutionGroup="gmd:AbstractDQ_PositionalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_GriddedDataPositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_GriddedDataPositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_AbsoluteExternalPositionalAccuracy_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_PositionalAccuracy_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_AbsoluteExternalPositionalAccuracy" type="gmd:DQ_AbsoluteExternalPositionalAccuracy_Type" substitutionGroup="gmd:AbstractDQ_PositionalAccuracy"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_AbsoluteExternalPositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_AbsoluteExternalPositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_TopologicalConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_TopologicalConsistency" type="gmd:DQ_TopologicalConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TopologicalConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_TopologicalConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_FormatConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_FormatConsistency" type="gmd:DQ_FormatConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_FormatConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_FormatConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_DomainConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_DomainConsistency" type="gmd:DQ_DomainConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_DomainConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_DomainConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_ConceptualConsistency_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_LogicalConsistency_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_ConceptualConsistency" type="gmd:DQ_ConceptualConsistency_Type" substitutionGroup="gmd:AbstractDQ_LogicalConsistency"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ConceptualConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_ConceptualConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_CompletenessOmission_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Completeness_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_CompletenessOmission" type="gmd:DQ_CompletenessOmission_Type" substitutionGroup="gmd:AbstractDQ_Completeness"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_CompletenessOmission_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_CompletenessOmission"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_CompletenessCommission_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Completeness_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_CompletenessCommission" type="gmd:DQ_CompletenessCommission_Type" substitutionGroup="gmd:AbstractDQ_Completeness"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_CompletenessCommission_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_CompletenessCommission"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_TemporalAccuracy_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_TemporalAccuracy" type="gmd:AbstractDQ_TemporalAccuracy_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_TemporalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_TemporalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_ThematicAccuracy_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_ThematicAccuracy" type="gmd:AbstractDQ_ThematicAccuracy_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_ThematicAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_ThematicAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_PositionalAccuracy_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_PositionalAccuracy" type="gmd:AbstractDQ_PositionalAccuracy_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_PositionalAccuracy_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_PositionalAccuracy"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_LogicalConsistency_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_LogicalConsistency" type="gmd:AbstractDQ_LogicalConsistency_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_LogicalConsistency_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_LogicalConsistency"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_Completeness_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDQ_Element_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_Completeness" type="gmd:AbstractDQ_Completeness_Type" abstract="true" substitutionGroup="gmd:AbstractDQ_Element"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Completeness_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_Completeness"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractDQ_Element_Type" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="nameOfMeasure" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="measureIdentification" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="measureDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="evaluationMethodType" type="gmd:DQ_EvaluationMethodTypeCode_PropertyType" minOccurs="0"/>
-					<xs:element name="evaluationMethodDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="evaluationProcedure" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="dateTime" type="gco:DateTime_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="result" type="gmd:DQ_Result_PropertyType" maxOccurs="2"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDQ_Element" type="gmd:AbstractDQ_Element_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Element_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDQ_Element"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_DataQuality_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="scope" type="gmd:DQ_Scope_PropertyType"/>
-					<xs:element name="report" type="gmd:DQ_Element_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="lineage" type="gmd:LI_Lineage_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_DataQuality" type="gmd:DQ_DataQuality_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_DataQuality_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_DataQuality"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DQ_Scope_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="level" type="gmd:MD_ScopeCode_PropertyType"/>
-					<xs:element name="extent" type="gmd:EX_Extent_PropertyType" minOccurs="0"/>
-					<xs:element name="levelDescription" type="gmd:MD_ScopeDescription_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_Scope" type="gmd:DQ_Scope_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_Scope_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_Scope"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="DQ_EvaluationMethodTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DQ_EvaluationMethodTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DQ_EvaluationMethodTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/distribution.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/distribution.xsd
deleted file mode 100755
index 435e235..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/distribution.xsd
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This distribution.xsd schema implements the UML conceptual schema defined in A.2.10 of ISO 19115:2003. It contains the implementation of the following classes: MD_Med [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_Medium_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the media on which the data can be distributed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gmd:MD_MediumNameCode_PropertyType" minOccurs="0"/>
-					<xs:element name="density" type="gco:Real_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="densityUnits" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="volumes" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="mediumFormat" type="gmd:MD_MediumFormatCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="mediumNote" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Medium" type="gmd:MD_Medium_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Medium_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Medium"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_DigitalTransferOptions_Type">
-		<xs:annotation>
-			<xs:documentation>Technical means and media by which a dataset is obtained from the distributor</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="unitsOfDistribution" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="transferSize" type="gco:Real_PropertyType" minOccurs="0"/>
-					<xs:element name="onLine" type="gmd:CI_OnlineResource_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="offLine" type="gmd:MD_Medium_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DigitalTransferOptions" type="gmd:MD_DigitalTransferOptions_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DigitalTransferOptions_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DigitalTransferOptions"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_StandardOrderProcess_Type">
-		<xs:annotation>
-			<xs:documentation>Common ways in which the dataset may be obtained or received, and related instructions and fee information</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fees" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="plannedAvailableDateTime" type="gco:DateTime_PropertyType" minOccurs="0"/>
-					<xs:element name="orderingInstructions" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="turnaround" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_StandardOrderProcess" type="gmd:MD_StandardOrderProcess_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_StandardOrderProcess_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_StandardOrderProcess"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Distributor_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the distributor</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="distributorContact" type="gmd:CI_ResponsibleParty_PropertyType"/>
-					<xs:element name="distributionOrderProcess" type="gmd:MD_StandardOrderProcess_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributorFormat" type="gmd:MD_Format_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributorTransferOptions" type="gmd:MD_DigitalTransferOptions_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Distributor" type="gmd:MD_Distributor_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Distributor_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Distributor"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Distribution_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the distributor of and options for obtaining the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="distributionFormat" type="gmd:MD_Format_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributor" type="gmd:MD_Distributor_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="transferOptions" type="gmd:MD_DigitalTransferOptions_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Distribution" type="gmd:MD_Distribution_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Distribution_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Distribution"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Format_Type">
-		<xs:annotation>
-			<xs:documentation>Description of the form of the data to be distributed</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="version" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="amendmentNumber" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="specification" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="fileDecompressionTechnique" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="formatDistributor" type="gmd:MD_Distributor_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Format" type="gmd:MD_Format_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Format_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Format"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DistributionUnits" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DistributionUnits_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DistributionUnits"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MediumFormatCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MediumFormatCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MediumFormatCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MediumNameCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MediumNameCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MediumNameCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/extent.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/extent.xsd
deleted file mode 100755
index 4ada781..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/extent.xsd
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gsr="http://www.isotc211.org/2005/gsr" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gss="http://www.isotc211.org/2005/gss" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This extent.xsd schema implements the UML conceptual schema defined in A.3.1 of ISO 19115:2003 and the associated corrigendum. It contains the implementation of the f [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gss" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gss/gss.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gts" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gts/gts.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gsr" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gsr/gsr.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="referenceSystem.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="EX_TemporalExtent_Type">
-		<xs:annotation>
-			<xs:documentation>Time period covered by the content of the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="extent" type="gts:TM_Primitive_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_TemporalExtent" type="gmd:EX_TemporalExtent_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_TemporalExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_TemporalExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_VerticalExtent_Type">
-		<xs:annotation>
-			<xs:documentation>Vertical domain of dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="minimumValue" type="gco:Real_PropertyType"/>
-					<xs:element name="maximumValue" type="gco:Real_PropertyType"/>
-					<xs:element name="verticalCRS" type="gsr:SC_CRS_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_VerticalExtent" type="gmd:EX_VerticalExtent_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_VerticalExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_VerticalExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_BoundingPolygon_Type">
-		<xs:annotation>
-			<xs:documentation>Boundary enclosing the dataset expressed as the closed set of (x,y) coordinates of the polygon (last point replicates first point)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractEX_GeographicExtent_Type">
-				<xs:sequence>
-					<xs:element name="polygon" type="gss:GM_Object_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_BoundingPolygon" type="gmd:EX_BoundingPolygon_Type" substitutionGroup="gmd:AbstractEX_GeographicExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_BoundingPolygon_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_BoundingPolygon"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_Extent_Type">
-		<xs:annotation>
-			<xs:documentation>Information about spatial, vertical, and temporal extent</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="description" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="geographicElement" type="gmd:EX_GeographicExtent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="temporalElement" type="gmd:EX_TemporalExtent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="verticalElement" type="gmd:EX_VerticalExtent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_Extent" type="gmd:EX_Extent_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_Extent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_Extent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractEX_GeographicExtent_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Geographic area of the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="extentTypeCode" type="gco:Boolean_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractEX_GeographicExtent" type="gmd:AbstractEX_GeographicExtent_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_GeographicExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractEX_GeographicExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_GeographicBoundingBox_Type">
-		<xs:annotation>
-			<xs:documentation>Geographic area of the entire dataset referenced to WGS 84</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractEX_GeographicExtent_Type">
-				<xs:sequence>
-					<xs:element name="westBoundLongitude" type="gco:Decimal_PropertyType"/>
-					<xs:element name="eastBoundLongitude" type="gco:Decimal_PropertyType"/>
-					<xs:element name="southBoundLatitude" type="gco:Decimal_PropertyType"/>
-					<xs:element name="northBoundLatitude" type="gco:Decimal_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_GeographicBoundingBox" type="gmd:EX_GeographicBoundingBox_Type" substitutionGroup="gmd:AbstractEX_GeographicExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_GeographicBoundingBox_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_GeographicBoundingBox"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_SpatialTemporalExtent_Type">
-		<xs:annotation>
-			<xs:documentation>Extent with respect to date and time</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:EX_TemporalExtent_Type">
-				<xs:sequence>
-					<xs:element name="spatialExtent" type="gmd:EX_GeographicExtent_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_SpatialTemporalExtent" type="gmd:EX_SpatialTemporalExtent_Type" substitutionGroup="gmd:EX_TemporalExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_SpatialTemporalExtent_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_SpatialTemporalExtent"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="EX_GeographicDescription_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractEX_GeographicExtent_Type">
-				<xs:sequence>
-					<xs:element name="geographicIdentifier" type="gmd:MD_Identifier_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="EX_GeographicDescription" type="gmd:EX_GeographicDescription_Type" substitutionGroup="gmd:AbstractEX_GeographicExtent"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="EX_GeographicDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:EX_GeographicDescription"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/freeText.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/freeText.xsd
deleted file mode 100755
index ff9ffa8..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/freeText.xsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This freeText.xsd schema implements cultural and linguistic adaptability extensions defined in 7.3 of ISO/TS 19139:2007. This extension essentially formalizes the fre [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="identification.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="PT_FreeText_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="textGroup" type="gmd:LocalisedCharacterString_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PT_FreeText" type="gmd:PT_FreeText_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PT_FreeText_PropertyType">
-		<xs:complexContent>
-			<xs:extension base="gco:CharacterString_PropertyType">
-				<xs:sequence minOccurs="0">
-					<xs:element ref="gmd:PT_FreeText"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="PT_Locale_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="languageCode" type="gmd:LanguageCode_PropertyType"/>
-					<xs:element name="country" type="gmd:Country_PropertyType" minOccurs="0"/>
-					<xs:element name="characterEncoding" type="gmd:MD_CharacterSetCode_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PT_Locale" type="gmd:PT_Locale_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PT_Locale_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:PT_Locale"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="LocalisedCharacterString_Type">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="id" type="xs:ID"/>
-				<xs:attribute name="locale" type="xs:anyURI"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="LocalisedCharacterString" type="gmd:LocalisedCharacterString_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LocalisedCharacterString_PropertyType">
-		<xs:complexContent>
-			<xs:extension base="gco:ObjectReference_PropertyType">
-				<xs:sequence minOccurs="0">
-					<xs:element ref="gmd:LocalisedCharacterString"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="PT_LocaleContainer_Type">
-		<xs:sequence>
-			<xs:element name="description" type="gco:CharacterString_PropertyType"/>
-			<xs:element name="locale" type="gmd:PT_Locale_PropertyType"/>
-			<xs:element name="date" type="gmd:CI_Date_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="responsibleParty" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="localisedString" type="gmd:LocalisedCharacterString_PropertyType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="PT_LocaleContainer" type="gmd:PT_LocaleContainer_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="PT_LocaleContainer_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:PT_LocaleContainer"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="LanguageCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="LanguageCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:LanguageCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="Country" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="Country_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:Country"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!--====EOF====-->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd
deleted file mode 100755
index 8037c8a..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gmd="http://www.isotc211.org/2005/gmd" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="metadataApplication.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/identification.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/identification.xsd
deleted file mode 100755
index 0e87995..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/identification.xsd
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This identification.xsd schema implements the UML conceptual schema defined in A.2.2 of ISO 19115:2003. It contains the implementation of the following classes: MD_Id [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="constraints.xsd"/>
-	<xs:include schemaLocation="distribution.xsd"/>
-	<xs:include schemaLocation="maintenance.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="AbstractMD_Identification_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Basic information about data</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="citation" type="gmd:CI_Citation_PropertyType"/>
-					<xs:element name="abstract" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="purpose" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="credit" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="status" type="gmd:MD_ProgressCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="pointOfContact" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceMaintenance" type="gmd:MD_MaintenanceInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="graphicOverview" type="gmd:MD_BrowseGraphic_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceFormat" type="gmd:MD_Format_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="descriptiveKeywords" type="gmd:MD_Keywords_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceSpecificUsage" type="gmd:MD_Usage_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="resourceConstraints" type="gmd:MD_Constraints_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="aggregationInfo" type="gmd:MD_AggregateInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMD_Identification" type="gmd:AbstractMD_Identification_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Identification_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractMD_Identification"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_BrowseGraphic_Type">
-		<xs:annotation>
-			<xs:documentation>Graphic that provides an illustration of the dataset (should include a legend for the graphic)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fileName" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="fileDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="fileType" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_BrowseGraphic" type="gmd:MD_BrowseGraphic_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_BrowseGraphic_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_BrowseGraphic"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_DataIdentification_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_Identification_Type">
-				<xs:sequence>
-					<xs:element name="spatialRepresentationType" type="gmd:MD_SpatialRepresentationTypeCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="spatialResolution" type="gmd:MD_Resolution_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="characterSet" type="gmd:MD_CharacterSetCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="topicCategory" type="gmd:MD_TopicCategoryCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="environmentDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="extent" type="gmd:EX_Extent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="supplementalInformation" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DataIdentification" type="gmd:MD_DataIdentification_Type" substitutionGroup="gmd:AbstractMD_Identification"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DataIdentification_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DataIdentification"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ServiceIdentification_Type">
-		<xs:annotation>
-			<xs:documentation>See 19119 for further info</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_Identification_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ServiceIdentification" type="gmd:MD_ServiceIdentification_Type" substitutionGroup="gmd:AbstractMD_Identification"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ServiceIdentification_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ServiceIdentification"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_RepresentativeFraction_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="denominator" type="gco:Integer_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_RepresentativeFraction" type="gmd:MD_RepresentativeFraction_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_RepresentativeFraction_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_RepresentativeFraction"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Usage_Type">
-		<xs:annotation>
-			<xs:documentation>Brief description of ways in which the dataset is currently used.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="specificUsage" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="usageDateTime" type="gco:DateTime_PropertyType" minOccurs="0"/>
-					<xs:element name="userDeterminedLimitations" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="userContactInfo" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Usage" type="gmd:MD_Usage_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Usage_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Usage"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Keywords_Type">
-		<xs:annotation>
-			<xs:documentation>Keywords, their type and reference source</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="keyword" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="type" type="gmd:MD_KeywordTypeCode_PropertyType" minOccurs="0"/>
-					<xs:element name="thesaurusName" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Keywords" type="gmd:MD_Keywords_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Keywords_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Keywords"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Association_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Association" type="gmd:DS_Association_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Association_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Association"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_AggregateInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Encapsulates the dataset aggregation information</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="aggregateDataSetName" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="aggregateDataSetIdentifier" type="gmd:MD_Identifier_PropertyType" minOccurs="0"/>
-					<xs:element name="associationType" type="gmd:DS_AssociationTypeCode_PropertyType"/>
-					<xs:element name="initiativeType" type="gmd:DS_InitiativeTypeCode_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_AggregateInformation" type="gmd:MD_AggregateInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_AggregateInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_AggregateInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Resolution_Type">
-		<xs:choice>
-			<xs:element name="equivalentScale" type="gmd:MD_RepresentativeFraction_PropertyType"/>
-			<xs:element name="distance" type="gco:Distance_PropertyType"/>
-		</xs:choice>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Resolution" type="gmd:MD_Resolution_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Resolution_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Resolution"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="MD_TopicCategoryCode_Type">
-		<xs:annotation>
-			<xs:documentation>High-level geospatial data thematic classification to assist in the grouping and search of available geospatial datasets</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="farming"/>
-			<xs:enumeration value="biota"/>
-			<xs:enumeration value="boundaries"/>
-			<xs:enumeration value="climatologyMeteorologyAtmosphere"/>
-			<xs:enumeration value="economy"/>
-			<xs:enumeration value="elevation"/>
-			<xs:enumeration value="environment"/>
-			<xs:enumeration value="geoscientificInformation"/>
-			<xs:enumeration value="health"/>
-			<xs:enumeration value="imageryBaseMapsEarthCover"/>
-			<xs:enumeration value="intelligenceMilitary"/>
-			<xs:enumeration value="inlandWaters"/>
-			<xs:enumeration value="location"/>
-			<xs:enumeration value="oceans"/>
-			<xs:enumeration value="planningCadastre"/>
-			<xs:enumeration value="society"/>
-			<xs:enumeration value="structure"/>
-			<xs:enumeration value="transportation"/>
-			<xs:enumeration value="utilitiesCommunication"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_TopicCategoryCode" type="gmd:MD_TopicCategoryCode_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_TopicCategoryCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_TopicCategoryCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CharacterSetCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CharacterSetCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CharacterSetCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_SpatialRepresentationTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_SpatialRepresentationTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_SpatialRepresentationTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ProgressCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ProgressCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ProgressCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_KeywordTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_KeywordTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_KeywordTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="DS_AssociationTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_AssociationTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_AssociationTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="DS_InitiativeTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_InitiativeTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_InitiativeTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/maintenance.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/maintenance.xsd
deleted file mode 100755
index 025fb48..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/maintenance.xsd
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This maintenance.xsd schema implements the UML conceptual schema defined in A.2.5 of ISO 19115:2003. It contains the implementation of the following classes: MD_Maint [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gts" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gts/gts.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_MaintenanceInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the scope and frequency of updating</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="maintenanceAndUpdateFrequency" type="gmd:MD_MaintenanceFrequencyCode_PropertyType"/>
-					<xs:element name="dateOfNextUpdate" type="gco:Date_PropertyType" minOccurs="0"/>
-					<xs:element name="userDefinedMaintenanceFrequency" type="gts:TM_PeriodDuration_PropertyType" minOccurs="0"/>
-					<xs:element name="updateScope" type="gmd:MD_ScopeCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="updateScopeDescription" type="gmd:MD_ScopeDescription_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="maintenanceNote" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="contact" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MaintenanceInformation" type="gmd:MD_MaintenanceInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MaintenanceInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MaintenanceInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ScopeDescription_Type">
-		<xs:annotation>
-			<xs:documentation>Description of the class of information covered by the information</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element name="attributes" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="features" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="featureInstances" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="attributeInstances" type="gco:ObjectReference_PropertyType" maxOccurs="unbounded"/>
-			<xs:element name="dataset" type="gco:CharacterString_PropertyType"/>
-			<xs:element name="other" type="gco:CharacterString_PropertyType"/>
-		</xs:choice>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ScopeDescription" type="gmd:MD_ScopeDescription_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ScopeDescription_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ScopeDescription"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MaintenanceFrequencyCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MaintenanceFrequencyCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MaintenanceFrequencyCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ScopeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ScopeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ScopeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataApplication.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataApplication.xsd
deleted file mode 100755
index dc889e1..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataApplication.xsd
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This metadataApplication.xsd schema implements the UML conceptual schema defined in A.2.12 of ISO 19115:2003. It contains the implementation of the class: MD_Applicat [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="metadataEntity.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="AbstractDS_Aggregate_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Identifiable collection of datasets</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="composedOf" type="gmd:DS_DataSet_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="seriesMetadata" type="gmd:MD_Metadata_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="subset" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="superset" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractDS_Aggregate" type="gmd:AbstractDS_Aggregate_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Aggregate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractDS_Aggregate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_DataSet_Type">
-		<xs:annotation>
-			<xs:documentation>Identifiable collection of data</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="has" type="gmd:MD_Metadata_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="partOf" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_DataSet" type="gmd:DS_DataSet_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_DataSet_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_DataSet"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_OtherAggregate_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_OtherAggregate" type="gmd:DS_OtherAggregate_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_OtherAggregate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_OtherAggregate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Series_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Series" type="gmd:DS_Series_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Series_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Series"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Initiative_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractDS_Aggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Initiative" type="gmd:DS_Initiative_Type" substitutionGroup="gmd:AbstractDS_Aggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Initiative_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Initiative"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Platform_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_Series_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Platform" type="gmd:DS_Platform_Type" substitutionGroup="gmd:DS_Series"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Platform_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Platform"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_Sensor_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_Series_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_Sensor" type="gmd:DS_Sensor_Type" substitutionGroup="gmd:DS_Series"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_Sensor_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_Sensor"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_ProductionSeries_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_Series_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_ProductionSeries" type="gmd:DS_ProductionSeries_Type" substitutionGroup="gmd:DS_Series"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_ProductionSeries_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_ProductionSeries"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="DS_StereoMate_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:DS_OtherAggregate_Type"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="DS_StereoMate" type="gmd:DS_StereoMate_Type" substitutionGroup="gmd:DS_OtherAggregate"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="DS_StereoMate_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:DS_StereoMate"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataEntity.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataEntity.xsd
deleted file mode 100755
index 18dee8f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataEntity.xsd
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This metadataEntity.xsd schema implements the UML conceptual schema defined in A.2.1 of ISO 19115:2003. It contains the implementation of the class MD_Metadata.</xs:d [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="spatialRepresentation.xsd"/>
-	<xs:include schemaLocation="metadataExtension.xsd"/>
-	<xs:include schemaLocation="content.xsd"/>
-	<xs:include schemaLocation="metadataApplication.xsd"/>
-	<xs:include schemaLocation="applicationSchema.xsd"/>
-	<xs:include schemaLocation="portrayalCatalogue.xsd"/>
-	<xs:include schemaLocation="dataQuality.xsd"/>
-	<xs:include schemaLocation="freeText.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_Metadata_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the metadata</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="fileIdentifier" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="language" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="characterSet" type="gmd:MD_CharacterSetCode_PropertyType" minOccurs="0"/>
-					<xs:element name="parentIdentifier" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="hierarchyLevel" type="gmd:MD_ScopeCode_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="hierarchyLevelName" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="contact" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="dateStamp" type="gco:Date_PropertyType"/>
-					<xs:element name="metadataStandardName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="metadataStandardVersion" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="dataSetURI" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="locale" type="gmd:PT_Locale_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="spatialRepresentationInfo" type="gmd:MD_SpatialRepresentation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="referenceSystemInfo" type="gmd:MD_ReferenceSystem_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="metadataExtensionInfo" type="gmd:MD_MetadataExtensionInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="identificationInfo" type="gmd:MD_Identification_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="contentInfo" type="gmd:MD_ContentInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="distributionInfo" type="gmd:MD_Distribution_PropertyType" minOccurs="0"/>
-					<xs:element name="dataQualityInfo" type="gmd:DQ_DataQuality_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="portrayalCatalogueInfo" type="gmd:MD_PortrayalCatalogueReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="metadataConstraints" type="gmd:MD_Constraints_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="applicationSchemaInfo" type="gmd:MD_ApplicationSchemaInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="metadataMaintenance" type="gmd:MD_MaintenanceInformation_PropertyType" minOccurs="0"/>
-					<xs:element name="series" type="gmd:DS_Aggregate_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="describes" type="gmd:DS_DataSet_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="propertyType" type="gco:ObjectReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="featureType" type="gco:ObjectReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="featureAttribute" type="gco:ObjectReference_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Metadata" type="gmd:MD_Metadata_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Metadata_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Metadata"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataExtension.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataExtension.xsd
deleted file mode 100755
index f861d78..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/metadataExtension.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This metadataExtension.xsd schema implements the UML conceptual schema defined in A.2.11 of ISO 19115:2003. It contains the implementation of the following classes: M [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_ExtendedElementInformation_Type">
-		<xs:annotation>
-			<xs:documentation>New metadata element, not found in ISO 19115, which is required to describe geographic data</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="shortName" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="domainCode" type="gco:Integer_PropertyType" minOccurs="0"/>
-					<xs:element name="definition" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="obligation" type="gmd:MD_ObligationCode_PropertyType" minOccurs="0"/>
-					<xs:element name="condition" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="dataType" type="gmd:MD_DatatypeCode_PropertyType"/>
-					<xs:element name="maximumOccurrence" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="domainValue" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="parentEntity" type="gco:CharacterString_PropertyType" maxOccurs="unbounded"/>
-					<xs:element name="rule" type="gco:CharacterString_PropertyType"/>
-					<xs:element name="rationale" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="source" type="gmd:CI_ResponsibleParty_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ExtendedElementInformation" type="gmd:MD_ExtendedElementInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ExtendedElementInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ExtendedElementInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_MetadataExtensionInformation_Type">
-		<xs:annotation>
-			<xs:documentation>Information describing metadata extensions.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="extensionOnLineResource" type="gmd:CI_OnlineResource_PropertyType" minOccurs="0"/>
-					<xs:element name="extendedElementInformation" type="gmd:MD_ExtendedElementInformation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_MetadataExtensionInformation" type="gmd:MD_MetadataExtensionInformation_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_MetadataExtensionInformation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_MetadataExtensionInformation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="MD_ObligationCode_Type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="mandatory"/>
-			<xs:enumeration value="optional"/>
-			<xs:enumeration value="conditional"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ObligationCode" type="gmd:MD_ObligationCode_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ObligationCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ObligationCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DatatypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DatatypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DatatypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/portrayalCatalogue.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/portrayalCatalogue.xsd
deleted file mode 100755
index b38b71d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/portrayalCatalogue.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This portrayalCatalogue.xsd schema implements the UML conceptual schema defined in A.2.9 of ISO 19115:2003. It contains the implementation of the class MD_PortrayalCa [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_PortrayalCatalogueReference_Type">
-		<xs:annotation>
-			<xs:documentation>Information identifing the portrayal catalogue used</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="portrayalCatalogueCitation" type="gmd:CI_Citation_PropertyType" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_PortrayalCatalogueReference" type="gmd:MD_PortrayalCatalogueReference_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_PortrayalCatalogueReference_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_PortrayalCatalogueReference"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/referenceSystem.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/referenceSystem.xsd
deleted file mode 100755
index 035da6d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/referenceSystem.xsd
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This referenceSystem.xsd schema implements the UML conceptual schema defined in A.2.7 of ISO 19115:2003 and ISO 19115:2003/Cor. 1:2006. It contains the implementation [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<xs:include schemaLocation="extent.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="RS_Identifier_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_Identifier_Type">
-				<xs:sequence>
-					<xs:element name="codeSpace" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="version" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="RS_Identifier" type="gmd:RS_Identifier_Type" substitutionGroup="gmd:MD_Identifier"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RS_Identifier_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:RS_Identifier"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_ReferenceSystem_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="referenceSystemIdentifier" type="gmd:RS_Identifier_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_ReferenceSystem" type="gmd:MD_ReferenceSystem_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_ReferenceSystem_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_ReferenceSystem"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Identifier_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="authority" type="gmd:CI_Citation_PropertyType" minOccurs="0"/>
-					<xs:element name="code" type="gco:CharacterString_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Identifier" type="gmd:MD_Identifier_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Identifier_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Identifier"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractRS_ReferenceSystem_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Description of the spatial and temporal reference systems used in the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="name" type="gmd:RS_Identifier_PropertyType"/>
-					<xs:element name="domainOfValidity" type="gmd:EX_Extent_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractRS_ReferenceSystem" type="gmd:AbstractRS_ReferenceSystem_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="RS_ReferenceSystem_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractRS_ReferenceSystem"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/spatialRepresentation.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/spatialRepresentation.xsd
deleted file mode 100755
index 74293c3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gmd/spatialRepresentation.xsd
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gss="http://www.isotc211.org/2005/gss" xmlns:gmd="http://www.isotc211.org/2005/gmd" targetNamespace="http://www.isotc211.org/2005/gmd" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic MetaData (GMD) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GMD includes all the definitions of http://www.isotc211.org/2005/gmd namespace. The root document of this namespace is the file gmd.xsd. This portrayalCatalogue.xsd schema implements the UML conceptual schema defined in A.2.6 of ISO 19115:2003. It contains the implementation of the following classes: M [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gss" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gss/gss.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gmd.xsd"/>
-	<xs:include schemaLocation="citation.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<xs:complexType name="MD_GridSpatialRepresentation_Type">
-		<xs:annotation>
-			<xs:documentation>Types and numbers of raster spatial objects in the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_SpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="numberOfDimensions" type="gco:Integer_PropertyType"/>
-					<xs:element name="axisDimensionProperties" type="gmd:MD_Dimension_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="cellGeometry" type="gmd:MD_CellGeometryCode_PropertyType"/>
-					<xs:element name="transformationParameterAvailability" type="gco:Boolean_PropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_GridSpatialRepresentation" type="gmd:MD_GridSpatialRepresentation_Type" substitutionGroup="gmd:AbstractMD_SpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_GridSpatialRepresentation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_GridSpatialRepresentation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_VectorSpatialRepresentation_Type">
-		<xs:annotation>
-			<xs:documentation>Information about the vector spatial objects in the dataset</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gmd:AbstractMD_SpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="topologyLevel" type="gmd:MD_TopologyLevelCode_PropertyType" minOccurs="0"/>
-					<xs:element name="geometricObjects" type="gmd:MD_GeometricObjects_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_VectorSpatialRepresentation" type="gmd:MD_VectorSpatialRepresentation_Type" substitutionGroup="gmd:AbstractMD_SpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_VectorSpatialRepresentation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_VectorSpatialRepresentation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="AbstractMD_SpatialRepresentation_Type" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Digital mechanism used to represent spatial information</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="AbstractMD_SpatialRepresentation" type="gmd:AbstractMD_SpatialRepresentation_Type" abstract="true"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_SpatialRepresentation_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:AbstractMD_SpatialRepresentation"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Georeferenceable_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_GridSpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="controlPointAvailability" type="gco:Boolean_PropertyType"/>
-					<xs:element name="orientationParameterAvailability" type="gco:Boolean_PropertyType"/>
-					<xs:element name="orientationParameterDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="georeferencedParameters" type="gco:Record_PropertyType"/>
-					<xs:element name="parameterCitation" type="gmd:CI_Citation_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Georeferenceable" type="gmd:MD_Georeferenceable_Type" substitutionGroup="gmd:MD_GridSpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Georeferenceable_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Georeferenceable"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Dimension_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="dimensionName" type="gmd:MD_DimensionNameTypeCode_PropertyType"/>
-					<xs:element name="dimensionSize" type="gco:Integer_PropertyType"/>
-					<xs:element name="resolution" type="gco:Measure_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Dimension" type="gmd:MD_Dimension_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Dimension_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Dimension"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_Georectified_Type">
-		<xs:complexContent>
-			<xs:extension base="gmd:MD_GridSpatialRepresentation_Type">
-				<xs:sequence>
-					<xs:element name="checkPointAvailability" type="gco:Boolean_PropertyType"/>
-					<xs:element name="checkPointDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="cornerPoints" type="gss:GM_Point_PropertyType" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element name="centerPoint" type="gss:GM_Point_PropertyType" minOccurs="0"/>
-					<xs:element name="pointInPixel" type="gmd:MD_PixelOrientationCode_PropertyType"/>
-					<xs:element name="transformationDimensionDescription" type="gco:CharacterString_PropertyType" minOccurs="0"/>
-					<xs:element name="transformationDimensionMapping" type="gco:CharacterString_PropertyType" minOccurs="0" maxOccurs="2"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_Georectified" type="gmd:MD_Georectified_Type" substitutionGroup="gmd:MD_GridSpatialRepresentation"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_Georectified_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_Georectified"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:complexType name="MD_GeometricObjects_Type">
-		<xs:complexContent>
-			<xs:extension base="gco:AbstractObject_Type">
-				<xs:sequence>
-					<xs:element name="geometricObjectType" type="gmd:MD_GeometricObjectTypeCode_PropertyType"/>
-					<xs:element name="geometricObjectCount" type="gco:Integer_PropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_GeometricObjects" type="gmd:MD_GeometricObjects_Type"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_GeometricObjects_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_GeometricObjects"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<xs:simpleType name="MD_PixelOrientationCode_Type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="center"/>
-			<xs:enumeration value="lowerLeft"/>
-			<xs:enumeration value="lowerRight"/>
-			<xs:enumeration value="upperRight"/>
-			<xs:enumeration value="upperLeft"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ........................................................................ -->
-	<xs:element name="MD_PixelOrientationCode" type="gmd:MD_PixelOrientationCode_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_PixelOrientationCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_PixelOrientationCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_TopologyLevelCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_TopologyLevelCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_TopologyLevelCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_GeometricObjectTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_GeometricObjectTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_GeometricObjectTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_CellGeometryCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_CellGeometryCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_CellGeometryCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="MD_DimensionNameTypeCode" type="gco:CodeListValue_Type" substitutionGroup="gco:CharacterString"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="MD_DimensionNameTypeCode_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gmd:MD_DimensionNameTypeCode"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gsr/gsr.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gsr/gsr.xsd
deleted file mode 100755
index a3aacf3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gsr/gsr.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gsr" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gsr="http://www.isotc211.org/2005/gsr" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic Spatial Referencing (GSR) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GSR includes all the definitions of http://www.isotc211.org/2005/gsr namespace. The root document of this namespace is the file gsr.xsd.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="spatialReferencing.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gsr/spatialReferencing.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gsr/spatialReferencing.xsd
deleted file mode 100755
index 32b8b42..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gsr/spatialReferencing.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gsr="http://www.isotc211.org/2005/gsr" targetNamespace="http://www.isotc211.org/2005/gsr" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic Spatial Referencing (GSR) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GSR includes all the definitions of http://www.isotc211.org/2005/gsr namespace. The root document of this namespace is the file gsr.xsd. This spatialReferencing.xsd schema contains the implementation of SC_CRS. The encoding of this class is mapped to an ISO 19136 XML type.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	<xs:include schemaLocation="gsr.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractCRS==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="SC_CRS_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractCRS"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gss/geometry.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gss/geometry.xsd
deleted file mode 100755
index 39d6f3b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gss/geometry.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gss="http://www.isotc211.org/2005/gss" targetNamespace="http://www.isotc211.org/2005/gss" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic Spatial Schema (GSS) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GSS includes all the definitions of http://www.isotc211.org/2005/gss namespace. The root document of this namespace is the file gss.xsd. This geometry.xsd schema contains the implementation of GM_Object and GM_Point. The encoding of these classes is mapped to ISO 19136 geometric types.</xs:docume [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gss.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:Point==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="GM_Point_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:Point"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractGeometry==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="GM_Object_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractGeometry"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gss/gss.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gss/gss.xsd
deleted file mode 100755
index 2594cfe..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gss/gss.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema targetNamespace="http://www.isotc211.org/2005/gss" elementFormDefault="qualified"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gss="http://www.isotc211.org/2005/gss" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic Spatial Schema (GSS) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GSS includes all the definitions of http://www.isotc211.org/2005/gss namespace. The root document of this namespace is the file gss.xsd.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="geometry.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gts/gts.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gts/gts.xsd
deleted file mode 100755
index a4184fd..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gts/gts.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gts="http://www.isotc211.org/2005/gts" targetNamespace="http://www.isotc211.org/2005/gts" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic Temporal Schema (GTS) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GTS includes all the definitions of http://www.isotc211.org/2005/gts namespace. The root document of this namespace is the file gts.xsd.</xs:documentation>
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:include schemaLocation="temporalObjects.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gts/temporalObjects.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gts/temporalObjects.xsd
deleted file mode 100755
index a770ec7..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/iso/19139/20070417/gts/temporalObjects.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gts="http://www.isotc211.org/2005/gts" targetNamespace="http://www.isotc211.org/2005/gts" elementFormDefault="qualified" version="2012-07-13">
-	<!-- ================================= Annotation ================================ -->
-	<xs:annotation>
-		<xs:documentation>Geographic Temporal Schema (GTS) extensible markup language is a component of the XML Schema Implementation of Geographic Information Metadata documented in ISO/TS 19139:2007. GTS includes all the definitions of http://www.isotc211.org/2005/gts namespace. The root document of this namespace is the file gts.xsd. The temporalObjects.xsd schema contains the XML implementation of TM_Object, TM_Primitive and TM_PeriodDuration from ISO 19108. The encoding of these classes i [...]
-	</xs:annotation>
-	<!-- ================================== Imports ================================== -->
-	<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gco/gco.xsd"/>
-	<xs:include schemaLocation="gts.xsd"/>
-	<!-- ########################################################################### -->
-	<!-- ########################################################################### -->
-	<!-- ================================== Classes ================================= -->
-	<!-- ........................................................................ -->
-	<!--==XCGE: gml:AbstractTimePrimitive==-->
-	<!-- ........................................................................ -->
-	<xs:complexType name="TM_Primitive_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:AbstractTimePrimitive"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gco:ObjectReference"/>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-	<!-- ........................................................................ -->
-	<xs:element name="TM_PeriodDuration" type="xs:duration"/>
-	<!-- ........................................................................ -->
-	<xs:complexType name="TM_PeriodDuration_PropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gts:TM_PeriodDuration"/>
-		</xs:sequence>
-		<xs:attribute ref="gco:nilReason"/>
-	</xs:complexType>
-	<!-- =========================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/om/1.0.0/observation.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/om/1.0.0/observation.xsd
deleted file mode 100755
index bb69963..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/om/1.0.0/observation.xsd
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:om="http://www.opengis.net/om/1.0"
-        xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" targetNamespace="http://www.opengis.net/om/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>observation.xsd
-
-An XML implementation of the OandM model from OGC 07-022
-
-Observations and Measurements is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<include schemaLocation="om.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<!-- can't use ISO Metadata schema with GML 3.1.1
-		<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	-->
-	<import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<import namespace="http://www.opengis.net/sensorML/1.0.1" schemaLocation="http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<!-- ===== Object types for Observations ====== -->
-	<!-- ====================================================================== -->
-	<complexType name="ObservationType">
-		<annotation>
-			<documentation>Base type for Observations. 
-            Observation is an act ("event"), whose result is an estimate of the value of a property of the feature of interest. 
-            The observed property may be any property associated with the type of the feature of interest.
-
-			    The following properties are inherited from AbstractFeatureType:
-				<!--	from AbstractGMLType
-				<element ref="gml:metaDataProperty" minOccurs="0" maxOccurs="unbounded"/>
-				<element ref="gml:description" minOccurs="0"/>
-				<element ref="gml:name" minOccurs="0" maxOccurs="unbounded"/> -->
-				<!--    from AbstractFeatureType
-				<element ref="gml:boundedBy" minOccurs="0"/> --></documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element name="metadata" type="om:AnyOrReferenceType" minOccurs="0">
-						<!--					<element name="observationMetadata" type="gmd:MD_Metadata_PropertyType" minOccurs="0"> -->
-						<annotation>
-							<documentation>Replace with reference to ISO Metadata entity when GML version 3.2.X has been formally adopted.</documentation>
-						</annotation>
-					</element>
-					<element name="samplingTime" type="swe:TimeObjectPropertyType">
-						<annotation>
-							<documentation>The samplingTime is the time that the result applies to the feature-of-interest. 
-					This is the time usually required for geospatial analysis of the result.</documentation>
-						</annotation>
-					</element>
-					<element name="resultTime" type="swe:TimeObjectPropertyType" minOccurs="0">
-						<annotation>
-							<documentation>The resultTime is the time when the procedure associated with the observation act was applied. 
-					For some observations this is identical to samplingTime, in which case the resultTime may be omitted. 
-					
-					Example: 	Where a measurement is made on a specimen in a laboratory, the samplingTime should record the time the specimen was retrieved from its host, while the resultTime should record the time the laboratory procedure was applied. 
-					Example: 	Where sensor observation results are post-processed, the resultTime is the post-processing time, while the samplingTime preserves the time of initial interaction with the world. 
-					Example: 	Simulations are often used to estimate the values for phenomena in the future or past. The samplingTime is the real-world time that the result applies to, while the resultTime is the time that the simulation process was executed.</documentation>
-						</annotation>
-					</element>
-					<element name="procedure" type="om:ProcessPropertyType">
-						<annotation>
-							<documentation>The procedure is the description of a process used to generate the result. 
-							It must be suitable for the observed property. 
-							NOTE: 	At this level we do not distinguish between sensor-observations, 
-							estimations made by an observer, or algorithms, simulations, computations and complex processing chains.</documentation>
-						</annotation>
-					</element>
-					<element name="resultQuality" type="om:AnyOrReferenceType" minOccurs="0">
-						<!--					<element name="resultQuality" type="gmd:DQ_Element_PropertyType" minOccurs="0"> -->
-						<annotation>
-							<documentation>Instance-specific quality assessment or measure. 
-							Allow multiple quality measures if required.			
-									
-					Replace with reference to ISO Metadata entity when GML version 3.2.X has been formally adopted.</documentation>
-						</annotation>
-					</element>
-					<element name="observedProperty" type="swe:PhenomenonPropertyType">
-						<annotation>
-							<documentation>Property-type or phenomenon for which the observation result provides an estimate of its value. 
-							for example "wavelength", "grass-species", "power", "intensity in the waveband x-y", etc. 
-							It must be a property associated with the type of the feature of interest. 
-							This feature-property that provides the (semantic) type of the observation. 
-							The description of the phenomenon may be quite specific and constrained. 
-
-							The description of the property-type may be presented using various alternative encodings. 
-							If shown inline, the swe:Phenomenon schema is required. 
-							If provided using another encoding (e.g. OWL or SWEET) then the description must be in a remote repository and xlink reference used.</documentation>
-						</annotation>
-					</element>
-					<element name="featureOfInterest" type="gml:FeaturePropertyType">
-						<annotation>
-							<documentation>The featureOfInterest is a feature of any type (ISO 19109, ISO 19101), which is a representation of the observation target, being the real-world object regarding which the observation is made. 
-							such as a specimen, station, tract, mountain, pixel, etc. 
-							The spatial properties (location) of this feature of interest are typically of most interest for spatial analysis of the observation result.</documentation>
-						</annotation>
-					</element>
-					<element name="parameter" type="swe:AnyDataPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>An Observation parameter is a general event-specific parameter. 
-							This will typically be used to record environmental parameters, or event-specific sampling parameters that are not tightly bound to either the feature-of-interest or the procedure. 
-							NOTE: 	Parameters that are tightly bound to the procedure should be recorded as part of the procedure description. For example, the SensorML model associates parameters with specific process elements or stages. 
-							NOTE: 	The semantics of the parameter must be provided as part of its value. 
-							
-							In some applications it is convenient to use a generic or standard procedure, or feature-of-interest, rather than define an event-specific process or feature. 
-							In this context, event-specific parameters are bound to the Observation act.</documentation>
-						</annotation>
-					</element>
-					<element name="result" type="anyType">
-						<annotation>
-							<documentation>The result contains the value generated by the procedure. 
-							The type of the observation result must be consistent with the observed property, and the scale or scope for the value must be consistent with the quantity or category type. 
-							Application profiles may choose to constrain the type of the result.</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ......................... -->
-	<element name="Observation" type="om:ObservationType" substitutionGroup="gml:_Feature">
-		<annotation>
-			<documentation>Observation is an act ("event"), whose result is an estimate of the value of a property of the feature of interest. 
-            The observed property may be any property associated with the type of the feature of interest.</documentation>
-		</annotation>
-	</element>
-	<!-- ...................... -->
-	<complexType name="ObservationPropertyType">
-		<sequence minOccurs="0">
-			<element ref="om:Observation"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ===== Observation Collection ======= -->
-	<!-- ====================================================================== -->
-	<complexType name="ObservationCollectionType">
-		<annotation>
-			<documentation>Collection of arbitrary observations</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element name="member" type="om:ObservationPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ...................... -->
-	<element name="ObservationCollection" type="om:ObservationCollectionType" substitutionGroup="gml:_Feature">
-		<annotation>
-			<documentation>Collection of arbitrary observations</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<complexType name="ProcessPropertyType">
-		<annotation>
-			<documentation>This property type allows the Observation/procedure property to  either 
-		* contain a SensorML Process, 
-		* contain a description of a process described using another model, wrapped inside a om:Process element
-		* point to a Process either elsewhere in the document or identified by a URI</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="sml:_Process">
-					<annotation>
-						<documentation>Top of  SensorML Process hierarchy</documentation>
-					</annotation>
-				</element>
-				<element name="Process">
-					<annotation>
-						<documentation>This element is xs:anyType so may contain a description of a process provided in any well-formed XML. 
-				If the process description is namespace qualified, then the namespace must be identified in the instance document.</documentation>
-					</annotation>
-				</element>
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<complexType name="AnyOrReferenceType">
-		<annotation>
-			<documentation>Placeholder type
-			Used in a few places where ISO 19139 metadata classes are used, which will become available with GML 3.2</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<any/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/om/1.0.0/om.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/om/1.0.0/om.xsd
deleted file mode 100755
index 9a2c879..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/om/1.0.0/om.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:om="http://www.opengis.net/om/1.0" targetNamespace="http://www.opengis.net/om/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>om.xsd
-
-The Observations and Measurements schema
-This document contains only the normative elements described in the OGC standard
-
-Observations and Measurements is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<include schemaLocation="./observation.xsd"/>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/ows19115subset.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/ows19115subset.xsd
deleted file mode 100755
index ae702db..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/ows19115subset.xsd
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns:xlink="http://www.w3.org/1999/xlink" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>ows19115subset.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the parts of ISO 19115 used by the common "ServiceIdentification" and "ServiceProvider" sections of the GetCapabilities operation response, known as the service metadata XML document. The parts encoded here are the MD_Keywords, CI_ResponsibleParty, and related classes. The UML package prefixes were omitted from XML names, and the XML element names were all capitalized, for consistency with other OWS Schemas. This document also provides a  [...]
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-    <include schemaLocation="owsAll.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<complexType name="LanguageStringType">
-		<annotation>
-			<documentation>Text string with the language of the string identified as recommended in the XML 1.0 W3C Recommendation, section 2.12. </documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute ref="xml:lang" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Title" type="ows:LanguageStringType">
-		<annotation>
-			<documentation>Title of this resource, normally used for display to a human. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="Abstract" type="ows:LanguageStringType">
-		<annotation>
-			<documentation>Brief narrative description of this resource, normally used for display to a human. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="Keywords" type="ows:KeywordsType"/>
-	<!-- =========================================================== -->
-	<complexType name="KeywordsType">
-		<annotation>
-			<documentation>Unordered list of one or more commonly used or formalised word(s) or phrase(s) used to describe the subject. When needed, the optional "type" can name the type of the associated list of keywords that shall all have the same type. Also when needed, the codeSpace attribute of that "type" can reference the type name authority and/or thesaurus.
-			If the xml:lang attribute is not included in a Keyword element, then no language is specified for that element unless specified by another means.  All Keyword elements in the same Keywords element that share the same xml:lang attribute value represent different keywords in that language. </documentation>
-			<documentation>For OWS use, the optional thesaurusName element was omitted as being complex information that could be referenced by the codeSpace attribute of the Type element. </documentation>
-		</annotation>
-		<sequence>
-			<element name="Keyword" type="ows:LanguageStringType" maxOccurs="unbounded"/>
-			<element name="Type" type="ows:CodeType" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="CodeType">
-		<annotation>
-			<documentation>Name or code with an (optional) authority. If the codeSpace attribute is present, its value shall reference a dictionary, thesaurus, or authority for the name or code, such as the organisation who assigned the value, or the dictionary from which it is taken. </documentation>
-			<documentation>Type copied from basicTypes.xsd of GML 3 with documentation edited, for possible use outside the ServiceIdentification section of a service metadata document. </documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<attribute name="codeSpace" type="anyURI" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="PointOfContact" type="ows:ResponsiblePartyType">
-		<annotation>
-			<documentation>Identification of, and means of communication with, person(s) responsible for the resource(s). </documentation>
-			<documentation>For OWS use in the ServiceProvider section of a service metadata document, the optional organizationName element was removed, since this type is always used with the ProviderName element which provides that information. The optional individualName element was made mandatory, since either the organizationName or individualName element is mandatory. The mandatory "role" element was changed to optional, since no clear use of this information is known in the ServiceProvider [...]
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="ResponsiblePartyType">
-		<annotation>
-			<documentation>Identification of, and means of communication with, person responsible for the server. At least one of IndividualName, OrganisationName, or PositionName shall be included. </documentation>
-		</annotation>
-		<sequence>
-			<element ref="ows:IndividualName" minOccurs="0"/>
-			<element ref="ows:OrganisationName" minOccurs="0"/>
-			<element ref="ows:PositionName" minOccurs="0"/>
-			<element ref="ows:ContactInfo" minOccurs="0"/>
-			<element ref="ows:Role"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<complexType name="ResponsiblePartySubsetType">
-		<annotation>
-			<documentation>Identification of, and means of communication with, person responsible for the server. </documentation>
-			<documentation>For OWS use in the ServiceProvider section of a service metadata document, the optional organizationName element was removed, since this type is always used with the ProviderName element which provides that information. The mandatory "role" element was changed to optional, since no clear use of this information is known in the ServiceProvider section. </documentation>
-		</annotation>
-		<sequence>
-			<element ref="ows:IndividualName" minOccurs="0"/>
-			<element ref="ows:PositionName" minOccurs="0"/>
-			<element ref="ows:ContactInfo" minOccurs="0"/>
-			<element ref="ows:Role" minOccurs="0"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="IndividualName" type="string">
-		<annotation>
-			<documentation>Name of the responsible person: surname, given name, title separated by a delimiter. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="OrganisationName" type="string">
-		<annotation>
-			<documentation>Name of the responsible organization. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="PositionName" type="string">
-		<annotation>
-			<documentation>Role or position of the responsible person. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="Role" type="ows:CodeType">
-		<annotation>
-			<documentation>Function performed by the responsible party. Possible values of this Role shall include the values and the meanings listed in Subclause B.5.5 of ISO 19115:2003. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="ContactInfo" type="ows:ContactType">
-		<annotation>
-			<documentation>Address of the responsible party. </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<complexType name="ContactType">
-		<annotation>
-			<documentation>Information required to enable contact with the responsible person and/or organization. </documentation>
-			<documentation>For OWS use in the service metadata document, the optional hoursOfService and contactInstructions elements were retained, as possibly being useful in the ServiceProvider section. </documentation>
-		</annotation>
-		<sequence>
-			<element name="Phone" type="ows:TelephoneType" minOccurs="0">
-				<annotation>
-					<documentation>Telephone numbers at which the organization or individual may be contacted. </documentation>
-				</annotation>
-			</element>
-			<element name="Address" type="ows:AddressType" minOccurs="0">
-				<annotation>
-					<documentation>Physical and email address at which the organization or individual may be contacted. </documentation>
-				</annotation>
-			</element>
-			<element name="OnlineResource" type="ows:OnlineResourceType" minOccurs="0">
-				<annotation>
-					<documentation>On-line information that can be used to contact the individual or organization. OWS specifics: The xlink:href attribute in the xlink:simpleAttrs attribute group shall be used to reference this resource. Whenever practical, the xlink:href attribute with type anyURI should be a URL from which more contact information can be electronically retrieved. The xlink:title attribute with type "string" can be used to name this set of information. The other attributes in the xlin [...]
-				</annotation>
-			</element>
-			<element name="HoursOfService" type="string" minOccurs="0">
-				<annotation>
-					<documentation>Time period (including time zone) when individuals can contact the organization or individual. </documentation>
-				</annotation>
-			</element>
-			<element name="ContactInstructions" type="string" minOccurs="0">
-				<annotation>
-					<documentation>Supplemental instructions on how or when to contact the individual or organization. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="OnlineResourceType">
-		<annotation>
-			<documentation>Reference to on-line resource from which data can be obtained. </documentation>
-			<documentation>For OWS use in the service metadata document, the CI_OnlineResource class was XML encoded as the attributeGroup "xlink:simpleAttrs", as used in GML. </documentation>
-		</annotation>
-		<attributeGroup ref="xlink:simpleAttrs"/>
-	</complexType>
-	<!-- ========================================================== -->
-	<complexType name="TelephoneType">
-		<annotation>
-			<documentation>Telephone numbers for contacting the responsible individual or organization. </documentation>
-		</annotation>
-		<sequence>
-			<element name="Voice" type="string" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Telephone number by which individuals can speak to the responsible organization or individual. </documentation>
-				</annotation>
-			</element>
-			<element name="Facsimile" type="string" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Telephone number of a facsimile machine for the responsible
-organization or individual. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="AddressType">
-		<annotation>
-			<documentation>Location of the responsible individual or organization. </documentation>
-		</annotation>
-		<sequence>
-			<element name="DeliveryPoint" type="string" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Address line for the location. </documentation>
-				</annotation>
-			</element>
-			<element name="City" type="string" minOccurs="0">
-				<annotation>
-					<documentation>City of the location. </documentation>
-				</annotation>
-			</element>
-			<element name="AdministrativeArea" type="string" minOccurs="0">
-				<annotation>
-					<documentation>State or province of the location. </documentation>
-				</annotation>
-			</element>
-			<element name="PostalCode" type="string" minOccurs="0">
-				<annotation>
-					<documentation>ZIP or other postal code. </documentation>
-				</annotation>
-			</element>
-			<element name="Country" type="string" minOccurs="0">
-				<annotation>
-					<documentation>Country of the physical address. </documentation>
-				</annotation>
-			</element>
-			<element name="ElectronicMailAddress" type="string" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Address of the electronic mailbox of the responsible organization or individual. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsAll.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsAll.xsd
deleted file mode 100755
index a2fbd77..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsAll.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsAll.xsd</appinfo>
-		<documentation>This XML Schema Document includes and imports, directly and indirectly, all the XML Schemas defined by the OWS Common Implemetation Specification.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsGetResourceByID.xsd"/>
-	<include schemaLocation="owsExceptionReport.xsd"/>
-	<include schemaLocation="owsDomainType.xsd"/>
-	<include schemaLocation="owsContents.xsd"/>
-	<include schemaLocation="owsInputOutputData.xsd"/>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsCommon.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsCommon.xsd
deleted file mode 100755
index dedc799..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsCommon.xsd
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns:xlink="http://www.w3.org/1999/xlink" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsCommon.xsd</appinfo>
-		<documentation>This XML Schema Document encodes various parameters and parameter types that can be used in OWS operation requests and responses.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-    <include schemaLocation="owsAll.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<simpleType name="MimeType">
-		<annotation>
-			<documentation>XML encoded identifier of a standard MIME type, possibly a parameterized MIME type. </documentation>
-		</annotation>
-		<restriction base="string">
-			<pattern value="(application|audio|image|text|video|message|multipart|model)/.+(;\s*.+=.+)*"/>
-		</restriction>
-	</simpleType>
-	<!-- ========================================================= -->
-	<simpleType name="VersionType">
-		<annotation>
-			<documentation>Specification version for OWS operation. The string value shall contain one x.y.z "version" value (e.g., "2.1.3"). A version number shall contain three non-negative integers separated by decimal points, in the form "x.y.z". The integers y and z shall not exceed 99. Each version shall be for the Implementation Specification (document) and the associated XML Schemas to which requested operations will conform. An Implementation Specification version normally specifies XML  [...]
-		</annotation>
-		<restriction base="string">
-			<pattern value="\d+\.\d?\d\.\d?\d"/>
-		</restriction>
-	</simpleType>
-	<!-- ========================================================== -->
-	<element name="Metadata" type="ows:MetadataType"/>
-	<!-- ========================================================== -->
-	<complexType name="MetadataType">
-		<annotation>
-			<documentation>This element either references or contains more metadata about the element that includes this element. To reference metadata stored remotely, at least the xlinks:href attribute in xlink:simpleAttrs shall be included. Either at least one of the attributes in xlink:simpleAttrs or a substitute for the AbstractMetaData element shall be included, but not both. An Implementation Specification can restrict the contents of this element to always be a reference or always contain [...]
-		</annotation>
-		<sequence>
-			<element ref="ows:AbstractMetaData" minOccurs="0"/>
-		</sequence>
-		<attributeGroup ref="xlink:simpleAttrs">
-			<annotation>
-				<documentation>Reference to metadata recorded elsewhere, either external to this XML document or within it. Whenever practical, the xlink:href attribute with type anyURI should include a URL from which this metadata can be electronically retrieved. </documentation>
-			</annotation>
-		</attributeGroup>
-		<attribute name="about" type="anyURI" use="optional">
-			<annotation>
-				<documentation>Optional reference to the aspect of the element which includes this "metadata" element that this metadata provides more information about. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="AbstractMetaData" abstract="true">
-		<annotation>
-			<documentation>Abstract element containing more metadata about the element that includes the containing "metadata" element. A specific server implementation, or an Implementation Specification, can define concrete elements in the AbstractMetaData substitution group. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<!-- ========================================================== -->
-	<element name="BoundingBox" type="ows:BoundingBoxType"/>
-	<!-- =========================================================== -->
-	<complexType name="BoundingBoxType">
-		<annotation>
-			<documentation>XML encoded minimum rectangular bounding box (or region) parameter, surrounding all the associated data. </documentation>
-			<documentation>This type is adapted from the EnvelopeType of GML 3.1, with modified contents and documentation for encoding a MINIMUM size box SURROUNDING all associated data. </documentation>
-		</annotation>
-		<sequence>
-			<element name="LowerCorner" type="ows:PositionType">
-				<annotation>
-					<documentation>Position of the bounding box corner at which the value of each coordinate normally is the algebraic minimum within this bounding box. In some cases, this position is normally displayed at the top, such as the top left for some image coordinates. For more information, see Subclauses 10.2.5 and C.13. </documentation>
-				</annotation>
-			</element>
-			<element name="UpperCorner" type="ows:PositionType">
-				<annotation>
-					<documentation>Position of the bounding box corner at which the value of each coordinate normally is the algebraic maximum within this bounding box. In some cases, this position is normally displayed at the bottom, such as the bottom right for some image coordinates. For more information, see Subclauses 10.2.5 and C.13. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="crs" type="anyURI" use="optional">
-			<annotation>
-				<documentation>Usually references the definition of a CRS, as specified in [OGC Topic 2]. Such a CRS definition can be XML encoded using the gml:CoordinateReferenceSystemType in [GML 3.1]. For well known references, it is not required that a CRS definition exist at the location the URI points to. If no anyURI value is included, the applicable CRS must be either:
-a)	Specified outside the bounding box, but inside a data structure that includes this bounding box, as specified for a specific OWS use of this bounding box type.
-b)	Fixed and specified in the Implementation Specification for a specific OWS use of the bounding box type. </documentation>
-			</annotation>
-		</attribute>
-		<attribute name="dimensions" type="positiveInteger" use="optional">
-			<annotation>
-				<documentation>The number of dimensions in this CRS (the length of a coordinate sequence in this use of the PositionType). This number is specified by the CRS definition, but can also be specified here. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="PositionType">
-		<annotation>
-			<documentation>Position instances hold the coordinates of a position in a coordinate reference system (CRS) referenced by the related "crs" attribute or elsewhere. For an angular coordinate axis that is physically continuous for multiple revolutions, but whose recorded values can be discontinuous, special conditions apply when the bounding box is continuous across the value discontinuity:
-a)  If the bounding box is continuous clear around this angular axis, then ordinate values of minus and plus infinity shall be used.
-b)  If the bounding box is continuous across the value discontinuity but is not continuous clear around this angular axis, then some non-normal value can be used if specified for a specific OWS use of the BoundingBoxType. For more information, see Subclauses 10.2.5 and C.13. </documentation>
-			<documentation>This type is adapted from DirectPositionType and doubleList of GML 3.1. The adaptations include omission of all the attributes, since the needed information is included in the BoundingBoxType. </documentation>
-		</annotation>
-		<list itemType="double"/>
-	</simpleType>
-	<!-- =========================================================== -->
-	<element name="WGS84BoundingBox" type="ows:WGS84BoundingBoxType" substitutionGroup="ows:BoundingBox"/>
-	<!-- =========================================================== -->
-	<complexType name="WGS84BoundingBoxType">
-		<annotation>
-			<documentation>XML encoded minimum rectangular bounding box (or region) parameter, surrounding all the associated data. This box is specialized for use with the 2D WGS 84 coordinate reference system with decimal values of longitude and latitude. </documentation>
-			<documentation>This type is adapted from the general BoundingBoxType, with modified contents and documentation for use with the 2D WGS 84 coordinate reference system. </documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="ows:BoundingBoxType">
-				<sequence>
-					<element name="LowerCorner" type="ows:PositionType2D">
-						<annotation>
-							<documentation>Position of the bounding box corner at which the values of longitude and latitude normally are the algebraic minimums within this bounding box. For more information, see Subclauses 10.4.5 and C.13. </documentation>
-						</annotation>
-					</element>
-					<element name="UpperCorner" type="ows:PositionType2D">
-						<annotation>
-							<documentation>Position of the bounding box corner at which the values of longitude and latitude normally are the algebraic minimums within this bounding box. For more information, see Subclauses 10.4.5 and C.13. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-				<attribute name="crs" type="anyURI" use="optional" fixed="urn:ogc:def:crs:OGC:2:84">
-					<annotation>
-						<documentation>This attribute can be included when considered useful. When included, this attribute shall reference the 2D WGS 84 coordinate reference system with longitude before latitude and decimal values of longitude and latitude. </documentation>
-					</annotation>
-				</attribute>
-				<attribute name="dimensions" type="positiveInteger" use="optional" fixed="2">
-					<annotation>
-						<documentation>The number of dimensions in this CRS (the length of a coordinate sequence in this use of the PositionType). This number is specified by the CRS definition, but can also be specified here. </documentation>
-					</annotation>
-				</attribute>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="PositionType2D">
-		<annotation>
-			<documentation>Two-dimensional position instances hold the longitude and latitude coordinates of a position in the 2D WGS 84 coordinate reference system. The longitude value shall be listed first, followed by the latitude value, both in decimal degrees. Latitude values shall range from -90 to +90 degrees, and longitude values shall normally range from -180 to +180 degrees. For the longitude axis, special conditions apply when the bounding box is continuous across the +/- 180 degrees m [...]
-a)  If the bounding box is continuous clear around the Earth, then longitude values of minus and plus infinity shall be used.
-b)  If the bounding box is continuous across the value discontinuity but is not continuous clear around the Earth, then some non-normal value can be used if specified for a specific OWS use of the WGS84BoundingBoxType. For more information, see Subclauses 10.4.5 and C.13. </documentation>
-		</annotation>
-		<restriction base="ows:PositionType">
-			<length value="2"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsContents.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsContents.xsd
deleted file mode 100755
index 5a1f47b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsContents.xsd
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1"
-xmlns:ows="http://www.opengis.net/ows/1.1"
-xmlns:xlink="http://www.w3.org/1999/xlink"
-xmlns="http://www.w3.org/2001/XMLSchema"
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsContents.xsd</appinfo>
-		<documentation>This XML Schema  Document encodes the typical Contents section of an OWS service metadata (Capabilities) document. This  Schema can be built upon to define the Contents section for a specific OWS. If the ContentsBaseType in this XML Schema cannot be restricted and extended to define the Contents section for a specific OWS, all other relevant parts defined in owsContents.xsd shall be used by the "ContentsType" in the wxsContents.xsd prepared for the specific OWS.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsDataIdentification.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<complexType name="ContentsBaseType">
-		<annotation>
-			<documentation>Contents of typical Contents section of an OWS service metadata (Capabilities) document. This type shall be extended and/or restricted if needed for specific OWS use to include the specific metadata needed. </documentation>
-		</annotation>
-		<sequence>
-			<element ref="ows:DatasetDescriptionSummary" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Unordered set of summary descriptions for the datasets available from this OWS server. This set shall be included unless another source is referenced and all this metadata is available from that source. </documentation>
-				</annotation>
-			</element>
-			<element ref="ows:OtherSource" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Unordered set of references to other sources of metadata describing the coverage offerings available from this server. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- ===========================================================-->
-	<element name="OtherSource" type="ows:MetadataType">
-		<annotation>
-			<documentation>Reference to a source of metadata describing  coverage offerings available from this server. This  parameter can reference a catalogue server from which dataset metadata is available. This ability is expected to be used by servers with thousands or millions of datasets, for which searching a catalogue is more feasible than fetching a long Capabilities XML document. When no DatasetDescriptionSummaries are included, and one or more catalogue servers are referenced, this s [...]
-		</annotation>
-	</element>
-	<!-- ===========================================================-->
-	<element name="DatasetDescriptionSummary" type="ows:DatasetDescriptionSummaryBaseType"/>
-	<!-- ===========================================================-->
-	<complexType name="DatasetDescriptionSummaryBaseType">
-		<annotation>
-			<documentation>Typical dataset metadata in typical Contents section of an OWS service metadata (Capabilities) document. This type shall be extended and/or restricted if needed for specific OWS use, to include the specific Dataset  description metadata needed. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:DescriptionType">
-				<sequence>
-					<element ref="ows:WGS84BoundingBox" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of zero or more minimum bounding rectangles surrounding coverage data, using the WGS 84 CRS with decimal degrees and longitude before latitude. If no WGS 84 bounding box is recorded for a coverage, any such bounding boxes recorded for a higher level in a hierarchy of datasets shall apply to this coverage. If WGS 84 bounding box(es) are recorded for a coverage, any such bounding boxes recorded for a higher level in a hierarchy of datasets shall be igno [...]
-						</annotation>
-					</element>
-					<element name="Identifier" type="ows:CodeType">
-						<annotation>
-							<documentation>Unambiguous identifier or name of this coverage, unique for this server. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:BoundingBox" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of zero or more minimum bounding rectangles surrounding coverage data, in AvailableCRSs.  Zero or more BoundingBoxes are  allowed in addition to one or more WGS84BoundingBoxes to allow more precise specification of the Dataset area in AvailableCRSs. These Bounding Boxes shall not use any CRS not listed as an AvailableCRS. However, an AvailableCRS can be listed without a corresponding Bounding Box. If no such bounding box is recorded for a coverage, an [...]
-						</annotation>
-					</element>
-					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Optional unordered list of additional metadata about this dataset. A list of optional metadata elements for this dataset description could be specified in the Implementation Specification for this service. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:DatasetDescriptionSummary" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Metadata describing zero or more unordered subsidiary datasets available from this server. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===========================================================-->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsDataIdentification.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsDataIdentification.xsd
deleted file mode 100755
index b28c4c3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsDataIdentification.xsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns:xlink="http://www.w3.org/1999/xlink" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsDataIdentification.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the parts of the MD_DataIdentification class of ISO 19115 (OGC Abstract Specification Topic 11) which are expected to be used for most datasets. This Schema also encodes the parts of this class that are expected to be useful for other metadata. Both may be used within the Contents section of OWS service metadata (Capabilities) documents.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsCommon.xsd"/>
-	<include schemaLocation="ows19115subset.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<complexType name="DescriptionType">
-		<annotation>
-			<documentation>Human-readable descriptive information for the object it is included within.
-This type shall be extended if needed for specific OWS use to include additional metadata for each type of information. This type shall not be restricted for a specific OWS to change the multiplicity (or optionality) of some elements.
-			If the xml:lang attribute is not included in a Title, Abstract or Keyword element, then no language is specified for that element unless specified by another means.  All Title, Abstract and Keyword elements in the same Description that share the same xml:lang attribute value represent the description of the parent object in that language. Multiple Title or Abstract elements shall not exist in the same Description with the same xml:lang attribute value unless otherwise specified. </doc [...]
-		</annotation>
-		<sequence>
-			<element ref="ows:Title" minOccurs="0" maxOccurs="unbounded"/>
-			<element ref="ows:Abstract" minOccurs="0" maxOccurs="unbounded"/>
-			<element ref="ows:Keywords" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- ========================================================= -->
-	<complexType name="BasicIdentificationType">
-		<annotation>
-			<documentation>Basic metadata identifying and describing a set of data. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:DescriptionType">
-				<sequence>
-					<element ref="ows:Identifier" minOccurs="0">
-						<annotation>
-							<documentation>Optional unique identifier or name of this dataset. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Optional unordered list of additional metadata about this data(set). A list of optional metadata elements for this data identification could be specified in the Implementation Specification for this service. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================= -->
-	<complexType name="IdentificationType">
-		<annotation>
-			<documentation>Extended metadata identifying and describing a set of data. This type shall be extended if needed for each specific OWS to include additional metadata for each type of dataset. If needed, this type should first be restricted for each specific OWS to change the multiplicity (or optionality) of some elements. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:BasicIdentificationType">
-				<sequence>
-					<element ref="ows:BoundingBox" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of zero or more bounding boxes whose union describes the extent of this dataset. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:OutputFormat" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of zero or more references to data formats supported for server outputs. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:AvailableCRS" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Unordered list of zero or more available coordinate reference systems. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ===========================================================-->
-	<element name="Identifier" type="ows:CodeType">
-		<annotation>
-			<documentation>Unique identifier or name of this dataset. </documentation>
-		</annotation>
-	</element>
-	<!-- ===========================================================-->
-	<element name="OutputFormat" type="ows:MimeType">
-		<annotation>
-			<documentation>Reference to a format in which this data can be encoded and transferred. More specific parameter names should be used by specific OWS specifications wherever applicable. More than one such parameter can be included for different purposes. </documentation>
-		</annotation>
-	</element>
-	<!-- ===========================================================-->
-	<element name="AvailableCRS" type="anyURI"/>
-	<element name="SupportedCRS" type="anyURI" substitutionGroup="ows:AvailableCRS">
-		<annotation>
-			<documentation>Coordinate reference system in which data from this data(set) or resource is available or supported. More specific parameter names should be used by specific OWS specifications wherever applicable. More than one such parameter can be included for different purposes. </documentation>
-		</annotation>
-	</element>
-	<!-- ==========================================================
-	The following elements could be added to the IdentificationType when useful for a 
-	specific OWS. In addition the PointOfContact element in ows19115subset.xsd could 
-	be added.
-	============================================================= -->
-	<element name="AccessConstraints" type="string">
-		<annotation>
-			<documentation>Access constraint applied to assure the protection of privacy or intellectual property, or any other restrictions on retrieving or using data from or otherwise using this server. The reserved value NONE (case insensitive) shall be used to mean no access constraints are imposed. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="Fees" type="string">
-		<annotation>
-			<documentation>Fees and terms for retrieving data from or otherwise using this server, including the monetary units as specified in ISO 4217. The reserved value NONE (case insensitive) shall be used to mean no fees or terms. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="Language" type="language">
-		<annotation>
-			<documentation>Identifier of a language used by the data(set) contents. This language identifier shall be as specified in IETF RFC 4646. When this element is omitted, the language used is not identified. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsDomainType.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsDomainType.xsd
deleted file mode 100755
index c3006f3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsDomainType.xsd
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns:xlink="http://www.w3.org/1999/xlink" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsDomainType.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the allowed values (or domain) of a quantity, often for an input or output parameter to an OWS. Such a parameter is sometimes called a variable, quantity, literal, or typed literal. Such a parameter can use one of many data types, including double, integer, boolean, string, or URI. The allowed values can also be encoded for a quantity that is not explicit or not transferred, but is constrained by a server implementation.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsCommon.xsd"></include>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"></import>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<complexType name="DomainType">
-		<annotation>
-			<documentation>Valid domain (or allowed set of values) of one quantity, with its name or identifier. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:UnNamedDomainType">
-				<attribute name="name" type="string" use="required">
-					<annotation>
-						<documentation>Name or identifier of this quantity. </documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<complexType name="UnNamedDomainType">
-		<annotation>
-			<documentation>Valid domain (or allowed set of values) of one quantity, with needed metadata but without a quantity name or identifier. </documentation>
-		</annotation>
-		<sequence>
-			<group ref="ows:PossibleValues"/>
-			<element ref="ows:DefaultValue" minOccurs="0">
-				<annotation>
-					<documentation>Optional default value for this quantity, which should be included when this quantity has a default value. </documentation>
-				</annotation>
-			</element>
-			<element ref="ows:Meaning" minOccurs="0">
-				<annotation>
-					<documentation>Meaning metadata should be referenced or included for each quantity. </documentation>
-				</annotation>
-			</element>
-			<element ref="ows:DataType" minOccurs="0">
-				<annotation>
-					<documentation>This data type metadata should be referenced or included for each quantity. </documentation>
-				</annotation>
-			</element>
-			<group ref="ows:ValuesUnit" minOccurs="0">
-				<annotation>
-					<documentation>Unit of measure, which should be included when this set of PossibleValues has units or a more complete reference system. </documentation>
-				</annotation>
-			</group>
-			<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Optional unordered list of other metadata about this quantity. A list of required and optional other metadata elements for this quantity should be specified in the Implementation Specification for this service. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- ========================================================== -->
-	<group name="PossibleValues">
-		<annotation>
-			<documentation>Specifies the possible values of this quantity. </documentation>
-		</annotation>
-			<choice>
-				<element ref="ows:AllowedValues"/>
-				<element ref="ows:AnyValue"/>
-				<element ref="ows:NoValues"/>
-				<element ref="ows:ValuesReference"/>
-			</choice>
-	</group>
-	<!-- ========================================================== -->
-	<element name="AnyValue">
-		<annotation>
-			<documentation>Specifies that any value is allowed for this parameter.</documentation>
-		</annotation>
-		<complexType></complexType>
-	</element>
-	<!-- ========================================================== -->
-	<element name="NoValues">
-		<annotation>
-			<documentation>Specifies that no values are allowed for this parameter or quantity.</documentation>
-		</annotation>
-		<complexType></complexType>
-	</element>
-	<!-- ========================================================== -->
-	<element name="ValuesReference">
-		<annotation>
-			<documentation>Reference to externally specified list of all the valid values and/or ranges of values for this quantity. (Informative: This element was simplified from the metaDataProperty element in GML 3.0.) </documentation>
-		</annotation>
-		<complexType>
-			<simpleContent>
-				<extension base="string">
-					<annotation>
-						<documentation>Human-readable name of the list of values provided by the referenced document. Can be empty string when this list has no name. </documentation>
-					</annotation>
-					<attribute ref="ows:reference" use="required">
-					</attribute>
-				</extension>
-			</simpleContent>
-		</complexType>
-	</element>
-	<!-- ========================================================== -->
-	<group name="ValuesUnit">
-		<annotation>
-			<documentation>Indicates that this quantity has units or a reference system, and identifies the unit or reference system used by the AllowedValues or ValuesReference. </documentation>
-		</annotation>
-			<choice>
-				<element ref="ows:UOM">
-					<annotation>
-						<documentation>Identifier of unit of measure of this set of values. Should be included then this set of values has units (and not a more complete reference system). </documentation>
-					</annotation>
-				</element>
-				<element ref="ows:ReferenceSystem">
-					<annotation>
-						<documentation>Identifier of reference system used by this set of values. Should be included then this set of values has a reference system (not just units). </documentation>
-					</annotation>
-				</element>
-			</choice>
-	</group>
-	<!-- ========================================================== -->
-	<!-- ========================================================== -->
-	<element name="AllowedValues">
-		<annotation>
-			<documentation>List of all the valid values and/or ranges of values for this quantity. For numeric quantities, signed values should be ordered from negative infinity to positive infinity. </documentation>
-		</annotation>
-		<complexType>
-			<choice maxOccurs="unbounded">
-				<element ref="ows:Value"/>
-				<element ref="ows:Range"/>
-			</choice>
-		</complexType>
-	</element>
-	<!-- ========================================================== -->
-	<element name="Value" type="ows:ValueType"></element>
-	<!-- ========================================================== -->
-	<complexType name="ValueType">
-		<annotation>
-			<documentation>A single value, encoded as a string. This type can be used for one value, for a spacing between allowed values, or for the default value of a parameter. </documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string"></extension>
-		</simpleContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="DefaultValue" type="ows:ValueType">
-		<annotation>
-			<documentation>The default value for a quantity for which multiple values are allowed. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="Range" type="ows:RangeType"></element>
-	<!-- ========================================================== -->
-	<complexType name="RangeType">
-		<annotation>
-			<documentation>A range of values of a numeric parameter. This range can be continuous or discrete, defined by a fixed spacing between adjacent valid values. If the MinimumValue or MaximumValue is not included, there is no value limit in that direction. Inclusion of the specified minimum and maximum values in the range shall be defined by the rangeClosure. </documentation>
-		</annotation>
-		<sequence>
-			<element ref="ows:MinimumValue" minOccurs="0"></element>
-			<element ref="ows:MaximumValue" minOccurs="0"></element>
-			<element ref="ows:Spacing" minOccurs="0">
-				<annotation>
-					<documentation>Shall be included when the allowed values are NOT continuous in this range. Shall not be included when the allowed values are continuous in this range. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute ref="ows:rangeClosure" use="optional">
-			<annotation>
-				<documentation>Shall be included unless the default value applies. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="MinimumValue" type="ows:ValueType">
-		<annotation>
-			<documentation>Minimum value of this numeric parameter. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="MaximumValue" type="ows:ValueType">
-		<annotation>
-			<documentation>Maximum value of this numeric parameter. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="Spacing" type="ows:ValueType">
-		<annotation>
-			<documentation>The regular distance or spacing between the allowed values in a range. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<attribute name="rangeClosure" default="closed">
-		<annotation>
-			<documentation>Specifies which of the minimum and maximum values are included in the range. Note that plus and minus infinity are considered closed bounds. </documentation>
-		</annotation>
-		<simpleType>
-			<restriction base="NMTOKENS">
-				<enumeration value="closed">
-					<annotation>
-						<documentation>The specified minimum and maximum values are included in this range. </documentation>
-					</annotation>
-				</enumeration>
-				<enumeration value="open">
-					<annotation>
-						<documentation>The specified minimum and maximum values are NOT included in this range. </documentation>
-					</annotation>
-				</enumeration>
-				<enumeration value="open-closed">
-					<annotation>
-						<documentation>The specified minimum value is NOT included in this range, and the specified maximum value IS included in this range. </documentation>
-					</annotation>
-				</enumeration>
-				<enumeration value="closed-open">
-					<annotation>
-						<documentation>The specified minimum value IS included in this range, and the specified maximum value is NOT included in this range. </documentation>
-					</annotation>
-				</enumeration>
-			</restriction>
-		</simpleType>
-	</attribute>
-	<!-- ========================================================== -->
-	<!-- ========================================================== -->
-	<complexType name="DomainMetadataType">
-		<annotation>
-			<documentation>References metadata about a quantity, and provides a name for this metadata. (Informative: This element was simplified from the metaDataProperty element in GML 3.0.) </documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="string">
-				<annotation>
-					<documentation>Human-readable name of the metadata described by associated referenced document. </documentation>
-				</annotation>
-				<attribute ref="ows:reference" use="optional"/>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ========================================================== -->
-	<attribute name="reference" type="anyURI">
-		<annotation>
-			<documentation>Reference to data or metadata recorded elsewhere, either external to this XML document or within it. Whenever practical, this attribute should be a URL from which this metadata can be electronically retrieved. Alternately, this attribute can reference a URN for well-known metadata. For example, such a URN could be a URN defined in the "ogc" URN namespace. </documentation>
-		</annotation>
-	</attribute>
-	<!-- ========================================================== -->
-	<element name="Meaning" type="ows:DomainMetadataType">
-		<annotation>
-			<documentation>Definition of the meaning or semantics of this set of values. This Meaning can provide more specific, complete, precise, machine accessible, and machine understandable semantics about this quantity, relative to other available semantic information. For example, other semantic information is often provided in "documentation" elements in XML Schemas or "description" elements in GML objects. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="DataType" type="ows:DomainMetadataType">
-		<annotation>
-			<documentation>Definition of the data type of this set of values. In this case, the xlink:href attribute can reference a URN for a well-known data type. For example, such a URN could be a data type identification URN defined in the "ogc" URN namespace. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="ReferenceSystem" type="ows:DomainMetadataType">
-		<annotation>
-			<documentation>Definition of the reference system used by this set of values, including the unit of measure whenever applicable (as is normal). In this case, the xlink:href attribute can reference a URN for a well-known reference system, such as for a coordinate reference system (CRS). For example, such a URN could be a CRS identification URN defined in the "ogc" URN namespace. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="UOM" type="ows:DomainMetadataType">
-		<annotation>
-			<documentation>Definition of the unit of measure of this set of values. In this case, the xlink:href attribute can reference a URN for a well-known unit of measure (uom). For example, such a URN could be a UOM identification URN defined in the "ogc" URN namespace. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd
deleted file mode 100755
index c6751f9..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsExceptionReport.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0 2011-02-07" xml:lang="en">
-	<annotation>
-		<appinfo>owsExceptionReport.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the Exception Report response to all OWS operations.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="ExceptionReport">
-		<annotation>
-			<documentation>Report message returned to the client that requested any OWS operation when the server detects an error while processing that operation request. </documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="ows:Exception" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Unordered list of one or more Exception elements that each describes an error. These Exception elements shall be interpreted by clients as being independent of one another (not hierarchical). </documentation>
-					</annotation>
-				</element>
-			</sequence>
-			<attribute name="version" use="required">
-				<annotation>
-					<documentation>Specification version for OWS operation. The string value shall contain one x.y.z "version" value (e.g., "2.1.3"). A version number shall contain three non-negative integers separated by decimal points, in the form "x.y.z". The integers y and z shall not exceed 99. Each version shall be for the Implementation Specification (document) and the associated XML Schemas to which requested operations will conform. An Implementation Specification version normally specifies XM [...]
-				</annotation>
-				<simpleType>
-					<restriction base="string">
-						<pattern value="\d+\.\d?\d\.\d?\d"/>
-					</restriction>
-				</simpleType>
-			</attribute>
-			<attribute ref="xml:lang" use="optional">
-				<annotation>
-					<documentation>Identifier of the language used by all included exception text values. These language identifiers shall be as specified in IETF RFC 4646. When this attribute is omitted, the language used is not identified. </documentation>
-				</annotation>
-			</attribute>
-		</complexType>
-	</element>
-	<!-- ======================================================= -->
-	<element name="Exception" type="ows:ExceptionType"/>
-	<!-- ======================================================= -->
-	<complexType name="ExceptionType">
-		<annotation>
-			<documentation>An Exception element describes one detected error that a server chooses to convey to the client. </documentation>
-		</annotation>
-		<sequence>
-			<element name="ExceptionText" type="string" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Ordered sequence of text strings that describe this specific exception or error. The contents of these strings are left open to definition by each server implementation. A server is strongly encouraged to include at least one ExceptionText value, to provide more information about the detected error than provided by the exceptionCode. When included, multiple ExceptionText values shall provide hierarchical information about one detected error, with the most significant  [...]
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="exceptionCode" type="string" use="required">
-			<annotation>
-				<documentation>A code representing the type of this exception, which shall be selected from a set of exceptionCode values specified for the specific service operation and server. </documentation>
-			</annotation>
-		</attribute>
-		<attribute name="locator" type="string" use="optional">
-			<annotation>
-				<documentation>When included, this locator shall indicate to the client where an exception was encountered in servicing the client's operation request. This locator should be included whenever meaningful information can be provided by the server. The contents of this locator will depend on the specific exceptionCode and OWS service, and shall be specified in the OWS Implementation Specification. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsGetCapabilities.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsGetCapabilities.xsd
deleted file mode 100755
index 4ab69a6..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsGetCapabilities.xsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsGetCapabilities.xsd</appinfo>
-		<documentation>This XML Schema Document defines the GetCapabilities operation request and response XML elements and types, which are common to all OWSs. This XML Schema shall be edited by each OWS, for example, to specify a specific value for the "service" attribute.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsServiceIdentification.xsd"/>
-	<include schemaLocation="owsServiceProvider.xsd"/>
-	<include schemaLocation="owsOperationsMetadata.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<complexType name="CapabilitiesBaseType">
-		<annotation>
-			<documentation>XML encoded GetCapabilities operation response. This document provides clients with service metadata about a specific service instance, usually including metadata about the tightly-coupled data served. If the server does not implement the updateSequence parameter, the server shall always return the complete Capabilities document, without the updateSequence parameter. When the server implements the updateSequence parameter and the GetCapabilities operation request includ [...]
-		</annotation>
-		<sequence>
-			<element ref="ows:ServiceIdentification" minOccurs="0"/>
-			<element ref="ows:ServiceProvider" minOccurs="0"/>
-			<element ref="ows:OperationsMetadata" minOccurs="0"/>
-		</sequence>
-		<attribute name="version" type="ows:VersionType" use="required"/>
-		<attribute name="updateSequence" type="ows:UpdateSequenceType" use="optional">
-			<annotation>
-				<documentation>Service metadata document version, having values that are "increased" whenever any change is made in service metadata document. Values are selected by each server, and are always opaque to clients. When not supported by server, server shall not return this attribute. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="GetCapabilities" type="ows:GetCapabilitiesType"/>
-	<!-- =========================================================== -->
-	<complexType name="GetCapabilitiesType">
-		<annotation>
-			<documentation>XML encoded GetCapabilities operation request. This operation allows clients to retrieve service metadata about a specific service instance. In this XML encoding, no "request" parameter is included, since the element name specifies the specific operation. This base type shall be extended by each specific OWS to include the additional required "service" attribute, with the correct value for that OWS. </documentation>
-		</annotation>
-		<sequence>
-			<element name="AcceptVersions" type="ows:AcceptVersionsType" minOccurs="0">
-				<annotation>
-					<documentation>When omitted, server shall return latest supported version. </documentation>
-				</annotation>
-			</element>
-			<element name="Sections" type="ows:SectionsType" minOccurs="0">
-				<annotation>
-					<documentation>When omitted or not supported by server, server shall return complete service metadata (Capabilities) document. </documentation>
-				</annotation>
-			</element>
-			<element name="AcceptFormats" type="ows:AcceptFormatsType" minOccurs="0">
-				<annotation>
-					<documentation>When omitted or not supported by server, server shall return service metadata document using the MIME type "text/xml". </documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="updateSequence" type="ows:UpdateSequenceType" use="optional">
-			<annotation>
-				<documentation>When omitted or not supported by server, server shall return latest complete service metadata document. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<simpleType name="ServiceType">
-		<annotation>
-			<documentation>Service type identifier, where the string value is the OWS type abbreviation, such as "WMS" or "WFS". </documentation>
-		</annotation>
-		<restriction base="string"/>
-	</simpleType>
-	<!-- ========================================================= -->
-	<complexType name="AcceptVersionsType">
-		<annotation>
-			<documentation>Prioritized sequence of one or more specification versions accepted by client, with preferred versions listed first. See Version negotiation subclause for more information. </documentation>
-		</annotation>
-		<sequence>
-			<element name="Version" type="ows:VersionType" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="SectionsType">
-		<annotation>
-			<documentation>Unordered list of zero or more names of requested sections in complete service metadata document. Each Section value shall contain an allowed section name as specified by each OWS specification. See Sections parameter subclause for more information.  </documentation>
-		</annotation>
-		<sequence>
-			<element name="Section" type="string" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-	<!-- =========================================================== -->
-	<simpleType name="UpdateSequenceType">
-		<annotation>
-			<documentation>Service metadata document version, having values that are "increased" whenever any change is made in service metadata document. Values are selected by each server, and are always opaque to clients. See updateSequence parameter use subclause for more information. </documentation>
-		</annotation>
-		<restriction base="string"/>
-	</simpleType>
-	<!-- =========================================================== -->
-	<complexType name="AcceptFormatsType">
-		<annotation>
-			<documentation>Prioritized sequence of zero or more GetCapabilities operation response formats desired by client, with preferred formats listed first. Each response format shall be identified by its MIME type. See AcceptFormats parameter use subclause for more information. </documentation>
-		</annotation>
-		<sequence>
-			<element name="OutputFormat" type="ows:MimeType" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-	</complexType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsGetResourceByID.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsGetResourceByID.xsd
deleted file mode 100755
index 553601a..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsGetResourceByID.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsGetResourceByID.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the GetResourceByID operation request message. This typical operation is specified as a base for profiling in specific OWS specifications. For information on the allowed changes and limitations in such profiling, see Subclause 9.4.1 of the OWS Common specification.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsDataIdentification.xsd"></include>
-	<include schemaLocation="owsGetCapabilities.xsd"></include>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="Resource">
-		<annotation>
-			<documentation>XML encoded GetResourceByID operation response. The complexType used by this element shall be specified by each specific OWS.  </documentation>
-		</annotation>
-	</element>
-	<!-- =========================================================== -->
-	<element name="GetResourceByID" type="ows:GetResourceByIdType"></element>
-	<!-- =========================================================== -->
-	<complexType name="GetResourceByIdType">
-		<annotation>
-			<documentation>Request to a service to perform the GetResourceByID operation. This operation allows a client to retrieve one or more identified resources, including datasets and resources that describe datasets or parameters. In this XML encoding, no "request" parameter is included, since the element name specifies the specific operation. </documentation>
-		</annotation>
-		<sequence>
-			<element name="ResourceID" type="anyURI" minOccurs="0" maxOccurs="unbounded">
-				<annotation>
-					<documentation>Unordered list of zero or more resource identifiers. These identifiers can be listed in the Contents section of the service metadata (Capabilities) document. For more information on this parameter, see Subclause 9.4.2.1 of the OWS Common specification. </documentation>
-				</annotation>
-			</element>
-			<element ref="ows:OutputFormat" minOccurs="0">
-				<annotation>
-					<documentation>Optional reference to the data format to be used for response to this operation request. This element shall be included when multiple output formats are available for the selected resource(s), and the client desires a format other than the specified default, if any. </documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="service" type="ows:ServiceType" use="required"></attribute>
-		<attribute name="version" type="ows:VersionType" use="required"></attribute>
-	</complexType>
-	<!-- =========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsInputOutputData.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsInputOutputData.xsd
deleted file mode 100755
index 7bdd52b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsInputOutputData.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsInputOutputData.xsd</appinfo>
-		<documentation>This XML Schema Document specifies types and elements for input and output of operation data, allowing including multiple data items with each data item either included or referenced. The contents of each type and element specified here can be restricted and/or extended for each use in a specific OWS specification.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsManifest.xsd"/>
-	<!-- ==========================================================
-		Types and elements
-	    ========================================================== -->
-	<element name="OperationResponse" type="ows:ManifestType">
-		<annotation>
-			<documentation>Response from an OWS operation, allowing including multiple output data items with each item either included or referenced. This OperationResponse element, or an element using the ManifestType with a more specific element name, shall be used whenever applicable for responses from OWS operations. </documentation>
-			<documentation>This element is specified for use where the ManifestType contents are needed for an operation response, but the Manifest element name is not fully applicable. This element or the ManifestType shall be used instead of using the ows:ReferenceType proposed in OGC 04-105. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="InputData" type="ows:ManifestType">
-		<annotation>
-			<documentation>Input data in a XML-encoded OWS operation request, allowing including multiple data items with each data item either included or referenced. This InputData element, or an element using the ManifestType with a more-specific element name (TBR), shall be used whenever applicable within XML-encoded OWS operation requests. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="ServiceReference" type="ows:ServiceReferenceType" substitutionGroup="ows:Reference"/>
-	<!-- ========================================================== -->
-	<complexType name="ServiceReferenceType">
-		<annotation>
-			<documentation>Complete reference to a remote resource that needs to be retrieved from an OWS using an XML-encoded operation request. This element shall be used, within an InputData or Manifest element that is used for input data, when that input data needs to be retrieved from another web service using a XML-encoded OWS operation request. This element shall not be used for local payload input data or for requesting the resource from a web server using HTTP Get. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:ReferenceType">
-				<choice>
-					<element name="RequestMessage" type="anyType">
-						<annotation>
-							<documentation>The XML-encoded operation request message to be sent to request this input data from another web server using HTTP Post. </documentation>
-						</annotation>
-					</element>
-					<element name="RequestMessageReference" type="anyURI">
-						<annotation>
-							<documentation>Reference to the XML-encoded operation request message to be sent to request this input data from another web server using HTTP Post. The referenced message shall be attached to the same message (using the cid scheme), or be accessible using a URL. </documentation>
-						</annotation>
-					</element>
-				</choice>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsManifest.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsManifest.xsd
deleted file mode 100755
index d450db1..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsManifest.xsd
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns:xlink="http://www.w3.org/1999/xlink" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsManifest.xsd</appinfo>
-		<documentation>This XML Schema Document specifies types and elements for document or resource references and for package manifests that contain multiple references. The contents of each type and element specified here can be restricted and/or extended for each use in a specific OWS specification.
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsDataIdentification.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<!-- ==========================================================
-		Types and elements
-	    ========================================================== -->
-	<element name="AbstractReferenceBase" type="ows:AbstractReferenceBaseType" abstract="true"/>
-	<!-- ========================================================== -->
-	<complexType name="AbstractReferenceBaseType">
-		<annotation>
-			<documentation> Base for a reference to a remote or local resource. </documentation>
-			<documentation>This type contains only a restricted and annotated set of the attributes from the xlink:simpleAttrs attributeGroup. </documentation>
-		</annotation>
-		<attribute name="type" type="string" fixed="simple" form="qualified"/>
-		<attribute ref="xlink:href" use="required">
-				<annotation>
-					<documentation>Reference to a remote resource or local payload. A remote resource is typically addressed by a URL. For a local payload (such as a multipart mime message), the xlink:href must start with the prefix cid:. </documentation>
-			</annotation>
-		</attribute>
-		<attribute ref="xlink:role" use="optional">
-			<annotation>
-				<documentation>Reference to a resource that describes the role of this reference. When no value is supplied, no particular role value is to be inferred. </documentation>
-			</annotation>
-		</attribute>
-		<attribute ref="xlink:arcrole" use="optional">
-			<annotation>
-				<documentation>Although allowed, this attribute is not expected to be useful in this application of xlink:simpleAttrs. </documentation>
-			</annotation>
-		</attribute>
-		<attribute ref="xlink:title" use="optional">
-			<annotation>
-				<documentation>Describes the meaning of the referenced resource in a human-readable fashion. </documentation>
-			</annotation>
-		</attribute>
-		<attribute ref="xlink:show" use="optional">
-			<annotation>
-				<documentation>Although allowed, this attribute is not expected to be useful in this application of xlink:simpleAttrs. </documentation>
-			</annotation>
-		</attribute>
-		<attribute ref="xlink:actuate" use="optional">
-			<annotation>
-				<documentation>Although allowed, this attribute is not expected to be useful in this application of xlink:simpleAttrs. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- ========================================================== -->
-	<element name="Reference" type="ows:ReferenceType" substitutionGroup="ows:AbstractReferenceBase"/>
-	<!-- ========================================================== -->
-	<complexType name="ReferenceType">
-		<annotation>
-			<documentation>Complete reference to a remote or local resource, allowing including metadata about that resource. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:AbstractReferenceBaseType">
-				<sequence>
-					<element ref="ows:Identifier" minOccurs="0">
-						<annotation>
-							<documentation>Optional unique identifier of the referenced resource. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:Abstract" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="Format" type="ows:MimeType" minOccurs="0">
-						<annotation>
-							<documentation>The format of the referenced resource. This element is omitted when the mime type is indicated in the http header of the reference. </documentation>
-						</annotation>
-					</element>
-					<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Optional unordered list of additional metadata about this resource. A list of optional metadata elements for this ReferenceType could be specified in the Implementation Specification for each use of this type in a specific OWS. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<!-- =========================================================== -->
-	<element name="ReferenceGroup" type="ows:ReferenceGroupType"/>
-	<!-- =========================================================== -->
-	<complexType name="ReferenceGroupType">
-		<annotation>
-			<documentation>Logical group of one or more references to remote and/or local resources, allowing including metadata about that group. A Group can be used instead of a Manifest that can only contain one group. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:BasicIdentificationType">
-				<sequence>
-					<element ref="ows:AbstractReferenceBase" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- =========================================================== -->
-	<element name="Manifest" type="ows:ManifestType"/>
-	<!-- =========================================================== -->
-	<complexType name="ManifestType">
-		<annotation>
-			<documentation>Unordered list of one or more groups of references to remote and/or local resources. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:BasicIdentificationType">
-				<sequence>
-					<element ref="ows:ReferenceGroup" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsOperationsMetadata.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsOperationsMetadata.xsd
deleted file mode 100755
index 4861a90..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsOperationsMetadata.xsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsOperationsMetadata.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the basic contents of the "OperationsMetadata" section of the GetCapabilities operation response, also known as the Capabilities XML document.
-			
-			OWS is an OGC Standard.
-			Copyright (c) 2006,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsCommon.xsd"/>
-	<include schemaLocation="ows19115subset.xsd"/>
-	<include schemaLocation="owsDomainType.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="OperationsMetadata">
-		<annotation>
-			<documentation>Metadata about the operations and related abilities specified by this service and implemented by this server, including the URLs for operation requests. The basic contents of this section shall be the same for all OWS types, but individual services can add elements and/or change the optionality of optional elements. </documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="ows:Operation" minOccurs="2" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Metadata for unordered list of all the (requests for) operations that this server interface implements. The list of required and optional operations implemented shall be specified in the Implementation Specification for this service. </documentation>
-					</annotation>
-				</element>
-				<element name="Parameter" type="ows:DomainType" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Optional unordered list of parameter valid domains that each apply to one or more operations which this server interface implements. The list of required and optional parameter domain limitations shall be specified in the Implementation Specification for this service. </documentation>
-					</annotation>
-				</element>
-				<element name="Constraint" type="ows:DomainType" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Optional unordered list of valid domain constraints on non-parameter quantities that each apply to this server. The list of required and optional constraints shall be specified in the Implementation Specification for this service. </documentation>
-					</annotation>
-				</element>
-				<element ref="ows:ExtendedCapabilities" minOccurs="0"/>
-			</sequence>
-		</complexType>
-	</element>
-	<!-- ========================================================== -->
-	<element name="ExtendedCapabilities" type="anyType">
-		<annotation>
-			<documentation>Individual software vendors and servers can use this element to provide metadata about any additional server abilities. </documentation>
-		</annotation>
-	</element>
-	<!-- ========================================================== -->
-	<element name="Operation">
-		<annotation>
-			<documentation>Metadata for one operation that this server implements. </documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element ref="ows:DCP" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Unordered list of Distributed Computing Platforms (DCPs) supported for this operation. At present, only the HTTP DCP is defined, so this element will appear only once. </documentation>
-					</annotation>
-				</element>
-				<element name="Parameter" type="ows:DomainType" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Optional unordered list of parameter domains that each apply to this operation which this server implements. If one of these Parameter elements has the same "name" attribute as a Parameter element in the OperationsMetadata element, this Parameter element shall override the other one for this operation. The list of required and optional parameter domain limitations for this operation shall be specified in the Implementation Specification for this service. </documentation>
-					</annotation>
-				</element>
-				<element name="Constraint" type="ows:DomainType" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Optional unordered list of valid domain constraints on non-parameter quantities that each apply to this operation. If one of these Constraint elements has the same "name" attribute as a Constraint element in the OperationsMetadata element, this Constraint element shall override the other one for this operation. The list of required and optional constraints for this operation shall be specified in the Implementation Specification for this service. </documentation>
-					</annotation>
-				</element>
-				<element ref="ows:Metadata" minOccurs="0" maxOccurs="unbounded">
-					<annotation>
-						<documentation>Optional unordered list of additional metadata about this operation and its' implementation. A list of required and optional metadata elements for this operation should be specified in the Implementation Specification for this service. (Informative: This metadata might specify the operation request parameters or provide the XML Schemas for the operation request.) </documentation>
-					</annotation>
-				</element>
-			</sequence>
-			<attribute name="name" type="string" use="required">
-				<annotation>
-					<documentation>Name or identifier of this operation (request) (for example, GetCapabilities). The list of required and optional operations implemented shall be specified in the Implementation Specification for this service. </documentation>
-				</annotation>
-			</attribute>
-		</complexType>
-	</element>
-	<!-- ========================================================== -->
-	<element name="DCP">
-		<annotation>
-			<documentation>Information for one distributed Computing Platform (DCP) supported for this operation. At present, only the HTTP DCP is defined, so this element only includes the HTTP element.
-</documentation>
-		</annotation>
-		<complexType>
-			<choice>
-				<element ref="ows:HTTP"/>
-			</choice>
-		</complexType>
-	</element>
-	<!-- ========================================================== -->
-	<element name="HTTP">
-		<annotation>
-			<documentation>Connect point URLs for the HTTP Distributed Computing Platform (DCP). Normally, only one Get and/or one Post is included in this element. More than one Get and/or Post is allowed to support including alternative URLs for uses such as load balancing or backup. </documentation>
-		</annotation>
-		<complexType>
-			<choice maxOccurs="unbounded">
-				<element name="Get" type="ows:RequestMethodType">
-					<annotation>
-						<documentation>Connect point URL prefix and any constraints for the HTTP "Get" request method for this operation request. </documentation>
-					</annotation>
-				</element>
-				<element name="Post" type="ows:RequestMethodType">
-					<annotation>
-						<documentation>Connect point URL and any constraints for the HTTP "Post" request method for this operation request. </documentation>
-					</annotation>
-				</element>
-			</choice>
-		</complexType>
-	</element>
-	<!-- ========================================================== -->
-	<complexType name="RequestMethodType">
-		<annotation>
-			<documentation>Connect point URL and any constraints for this HTTP request method for this operation request. In the OnlineResourceType, the xlink:href attribute in the xlink:simpleAttrs attribute group shall be used to contain this URL. The other attributes in the xlink:simpleAttrs attribute group should not be used. </documentation>
-		</annotation>
-		<complexContent>
-			<extension base="ows:OnlineResourceType">
-				<sequence>
-					<element name="Constraint" type="ows:DomainType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Optional unordered list of valid domain constraints on non-parameter quantities that each apply to this request method for this operation. If one of these Constraint elements has the same "name" attribute as a Constraint element in the OperationsMetadata or Operation element, this Constraint element shall override the other one for this operation. The list of required and optional constraints for this request method for this operation shall be specified in the Imple [...]
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ========================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsServiceIdentification.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsServiceIdentification.xsd
deleted file mode 100755
index c15fcfa..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsServiceIdentification.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsServiceIdentification.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the common "ServiceIdentification" section of the GetCapabilities operation response, known as the Capabilities XML document. This section encodes the SV_ServiceIdentification class of ISO 19119 (OGC Abstract Specification Topic 12). 
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="owsDataIdentification.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="ServiceIdentification">
-		<annotation>
-			<documentation>General metadata for this specific server. This XML Schema of this section shall be the same for all OWS. </documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="ows:DescriptionType">
-					<sequence>
-						<element name="ServiceType" type="ows:CodeType">
-							<annotation>
-								<documentation>A service type name from a registry of services. For example, the values of the codeSpace URI and name and code string may be "OGC" and "catalogue." This type name is normally used for machine-to-machine communication. </documentation>
-							</annotation>
-						</element>
-						<element name="ServiceTypeVersion" type="ows:VersionType" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Unordered list of one or more versions of this service type implemented by this server. This information is not adequate for version negotiation, and shall not be used for that purpose. </documentation>
-							</annotation>
-						</element>
-						<element name="Profile" type="anyURI" minOccurs="0" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Unordered list of identifiers of Application Profiles that are implemented by this server. This element should be included for each specified application profile implemented by this server. The identifier value should be specified by each Application Profile. If this element is omitted, no meaning is implied. </documentation>
-							</annotation>
-						</element>
-						<element ref="ows:Fees" minOccurs="0">
-							<annotation>
-								<documentation>If this element is omitted, no meaning is implied. </documentation>
-							</annotation>
-						</element>
-						<element ref="ows:AccessConstraints" minOccurs="0" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Unordered list of access constraints applied to assure the protection of privacy or intellectual property, and any other restrictions on retrieving or using data from or otherwise using this server. The reserved value NONE (case insensitive) shall be used to mean no access constraints are imposed. When this element is omitted, no meaning is implied. </documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsServiceProvider.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsServiceProvider.xsd
deleted file mode 100755
index bce3e64..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/ows/1.1.0/owsServiceProvider.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/ows/1.1" 
-xmlns:ows="http://www.opengis.net/ows/1.1" 
-xmlns:xlink="http://www.w3.org/1999/xlink" 
-xmlns="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" version="1.1.0.3" xml:lang="en">
-	<annotation>
-		<appinfo>owsServiceProvider.xsd</appinfo>
-		<documentation>This XML Schema Document encodes the common "ServiceProvider" section of the GetCapabilities operation response, known as the Capabilities XML document. This section encodes the SV_ServiceProvider class of ISO 19119 (OGC Abstract Specification Topic 12). 
-		
-		OWS is an OGC Standard.
-		Copyright (c) 2006,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="owsAll.xsd"/>
-	<include schemaLocation="ows19115subset.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="ServiceProvider">
-		<annotation>
-			<documentation>Metadata about the organization that provides this specific service instance or server. </documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element name="ProviderName" type="string">
-					<annotation>
-						<documentation>A unique identifier for the service provider organization. </documentation>
-					</annotation>
-				</element>
-				<element name="ProviderSite" type="ows:OnlineResourceType" minOccurs="0">
-					<annotation>
-						<documentation>Reference to the most relevant web site of the service provider. </documentation>
-					</annotation>
-				</element>
-				<element name="ServiceContact" type="ows:ResponsiblePartySubsetType">
-					<annotation>
-						<documentation>Information for contacting the service provider. The OnlineResource element within this ServiceContact element should not be used to reference a web site of the service provider. </documentation>
-					</annotation>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/LUTgeodesy.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/LUTgeodesy.xsd
deleted file mode 100755
index 785e326..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/LUTgeodesy.xsd
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sa="http://www.opengis.net/sampling/1.0" targetNamespace="http://www.opengis.net/sampling/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="pre-release">
-	<!-- ==================================================================        -->
-	<annotation>
-		<documentation>
-LUTgeodesy.xsd
-
-Codelists used in geodesy and surveying
-
-2003-07-15
-
-Copyright (c) 2004 CSIRO - see https://www.seegrid.csiro.au/twiki/bin/view/Xmml/LegalNotices#Software_Notice
-</documentation>
-	</annotation>
-	<!-- ==================================================================        -->
-	<simpleType name="projections">
-		<annotation>
-			<documentation>Projected coordinate reference systems (equivalent code from EPSG Geodetic reference systems database v6.3)</documentation>
-		</annotation>
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="MGA48">
-						<annotation>
-							<documentation>Map grid of Australia zone 48 - EPSG projected CRS code 28348</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA49">
-						<annotation>
-							<documentation>Map grid of Australia zone 49 - EPSG projected CRS code 28349</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA50">
-						<annotation>
-							<documentation>Map grid of Australia zone 50 - EPSG projected CRS code 28350</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA51">
-						<annotation>
-							<documentation>Map grid of Australia zone 51 - EPSG projected CRS code 28351</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA52">
-						<annotation>
-							<documentation>Map grid of Australia zone 52 - EPSG projected CRS code 28352</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA53">
-						<annotation>
-							<documentation>Map grid of Australia zone 53 - EPSG projected CRS code 28353</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA54">
-						<annotation>
-							<documentation>Map grid of Australia zone 54 - EPSG projected CRS code 28354</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA55">
-						<annotation>
-							<documentation>Map grid of Australia zone 55 - EPSG projected CRS code 28355</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA56">
-						<annotation>
-							<documentation>Map grid of Australia zone 56 - EPSG projected CRS code 28356</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA57">
-						<annotation>
-							<documentation>Map grid of Australia zone 57 - EPSG projected CRS code 28357</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MGA58">
-						<annotation>
-							<documentation>Map grid of Australia zone 58 - EPSG projected CRS code 28358</documentation>
-						</annotation>
-					</enumeration>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<!-- ================================================================== -->
-	<simpleType name="gDatums">
-		<annotation>
-			<documentation>Geodetic datums (equivalent code from EPSG Geodetic reference systems database v6.3)</documentation>
-		</annotation>
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="AGD66">
-						<annotation>
-							<documentation>Australian geodetic datum 1966 - lon-lat/DD - no epsg code</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="WGS84(DMSH)">
-						<annotation>
-							<documentation>World Geodetic System 1984 - lon-lat/DMSH - as in epsg:4326 but with axis order switched</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="WGS84">
-						<annotation>
-							<documentation>World Geodetic System 19845 - lon-lat/DD - as in epsg:6326640 but with axis order switched</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="AGD84">
-						<annotation>
-							<documentation>Australian geodetic datum 1984 - lon-lat/DD - as in epsg:62036405 but with axis order switched</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="GDA94">
-						<annotation>
-							<documentation>Geodetic datum of Australia 1994 - lon-lat/DD - as in epsg:62836405 but with axis order switched</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="GDA94(3D)">
-						<annotation>
-							<documentation>Geodetic datum of Australia 1994 - lon-lat-h/DDm - as in epsg:62836413 but with 2D axis order switched</documentation>
-						</annotation>
-					</enumeration>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<!-- ================================================================== -->
-	<simpleType name="vDatums">
-		<annotation>
-			<documentation>Height datums (equivalent code from EPSG Geodetic reference systems database v6.3)</documentation>
-		</annotation>
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="AHD">
-						<annotation>
-							<documentation>Australian height datum - epsg:5711</documentation>
-						</annotation>
-					</enumeration>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<!-- ================================================================== -->
-	<simpleType name="elevationMethodType">
-		<annotation>
-			<documentation>Codes used in the Geoscience Australia corporate database http://www.ga.gov.au/oracle/#online</documentation>
-		</annotation>
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="MAP">
-						<annotation>
-							<documentation>Height is picked off a topographic map</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="PGE">
-						<annotation>
-							<documentation>Height computed from pressure gauge readings</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MIB">
-						<annotation>
-							<documentation>Micro-barometer recording technique</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="DRB">
-						<annotation>
-							<documentation>Digitally recording barometer technique</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="PHG">
-						<annotation>
-							<documentation>Heights determined by photogrammetry</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="ALT">
-						<annotation>
-							<documentation>Heights measured by aircraft altimeter</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="SAT">
-						<annotation>
-							<documentation>Height derived from satellite measurements</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="SON">
-						<annotation>
-							<documentation>Water depths derived from sonar recording</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="GPH">
-						<annotation>
-							<documentation>Hand held GPS height value (not very reliable)</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="GPS">
-						<annotation>
-							<documentation>Heights derived from post processed or real time dual frequency GPS recording</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="SUR">
-						<annotation>
-							<documentation>Heights determined by optical surveying methods or taken at surveyed points</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="FOS">
-						<annotation>
-							<documentation>First order geodetic height determination</documentation>
-						</annotation>
-					</enumeration>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<!-- ================================================================== -->
-	<simpleType name="positionMethodType">
-		<annotation>
-			<documentation>Alternative codes for the Geoscience Australia corporate database http://www.ga.gov.au/oracle/#online</documentation>
-		</annotation>
-		<restriction base="string">
-			<enumeration value="Unknown">
-				<annotation>
-					<documentation>0 Unknown</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="GPS">
-				<annotation>
-					<documentation>1 GPS</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="GPS2">
-				<annotation>
-					<documentation>2 GPS</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="GPS3">
-				<annotation>
-					<documentation>3 GPS</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="GPS4">
-				<annotation>
-					<documentation>4 GPS</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Astronomical">
-				<annotation>
-					<documentation>5 Astronomical observation</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Surveyed from ground control">
-				<annotation>
-					<documentation>6 Surveyed from ground control</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Published report">
-				<annotation>
-					<documentation>7 Published report</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Unpublished report">
-				<annotation>
-					<documentation>8 Unpublished report</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Non-standard topographic map">
-				<annotation>
-					<documentation>10 Non-standard topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="25k topo map">
-				<annotation>
-					<documentation>11 - 1:25 000 topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="50k topo map">
-				<annotation>
-					<documentation>12 - 1:50 000 topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="100k topo map">
-				<annotation>
-					<documentation>13 - 1:100 000 topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="250k topo map">
-				<annotation>
-					<documentation>14 - 1:250 000 topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="500k topo map">
-				<annotation>
-					<documentation>15 - 1:500 000 topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="1M topo map">
-				<annotation>
-					<documentation>16 - 1:1 000 000 topographic map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Non-standard geological map">
-				<annotation>
-					<documentation>20 Non-standard geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="25k geological map">
-				<annotation>
-					<documentation>21 - 1:25 000 geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="50k geological map">
-				<annotation>
-					<documentation>22 - 1:50 000 geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="100k geological map">
-				<annotation>
-					<documentation>23 - 1:100 000 geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="250k geological map">
-				<annotation>
-					<documentation>24 - 1:250 000 geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="500k geological map">
-				<annotation>
-					<documentation>25 - 1:500 000 geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="1M geological map">
-				<annotation>
-					<documentation>26 - 1:1 000 000 geological map</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Differential GPS - Survey quality">
-				<annotation>
-					<documentation>30 Differential GPS - Survey quality</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Differential GPS">
-				<annotation>
-					<documentation>31 Differential GPS</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Averaged GPS">
-				<annotation>
-					<documentation>35 Averaged GPS</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Orthophoto">
-				<annotation>
-					<documentation>40 Orthophoto image</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="25k orthophoto">
-				<annotation>
-					<documentation>41 Orthophoto image 1:25 000 scale</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="Company supplied location - method unkown">
-				<annotation>
-					<documentation>50 Company supplied location - method unkown</documentation>
-				</annotation>
-			</enumeration>
-			<enumeration value="State/NT supplied location - method unkown">
-				<annotation>
-					<documentation>51 State/NT supplied location - method unkown</documentation>
-				</annotation>
-			</enumeration>
-		</restriction>
-	</simpleType>
-	<!-- ==================================================================   -->
-	<simpleType name="detailedElevationMethodType">
-		<annotation>
-			<documentation>Codes used in the Geoscience Australia gravity database http://www.ga.gov.au/oracle/#online</documentation>
-		</annotation>
-		<union>
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="PGE">
-						<annotation>
-							<documentation>Height computed from pressure gauge readings</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="MIB">
-						<annotation>
-							<documentation>Micro-barometer recording technique</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="DRB">
-						<annotation>
-							<documentation>Digitally recording barometer technique</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="RUL">
-						<annotation>
-							<documentation>Height above ground surface measured by ruler</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="ALT">
-						<annotation>
-							<documentation>Heights measured by aircraft altimeter</documentation>
-						</annotation>
-					</enumeration>
-					<enumeration value="EST">
-						<annotation>
-							<documentation>Height difference estimated from equipment type</documentation>
-						</annotation>
-					</enumeration>
-				</restriction>
-			</simpleType>
-			<simpleType>
-				<restriction base="string">
-					<pattern value="other:\w{2,}"/>
-				</restriction>
-			</simpleType>
-		</union>
-	</simpleType>
-	<!-- ================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/sampling.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/sampling.xsd
deleted file mode 100755
index 8b2cf98..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/sampling.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-xmlns:sa="http://www.opengis.net/sampling/1.0" 
-targetNamespace="http://www.opengis.net/sampling/1.0" 
-elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>sampling.xsd
-
-The complete sampling schema
-
-Sampling is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<include schemaLocation="./samplingManifold.xsd"/>
-	<include schemaLocation="./specimen.xsd"/>
-	<include schemaLocation="./samplingBase.xsd"/>
-	<include schemaLocation="./surveyProcedure.xsd"/> 
-	<include schemaLocation="./LUTgeodesy.xsd"/> 
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/samplingBase.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/samplingBase.xsd
deleted file mode 100755
index 3dc674d..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/samplingBase.xsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:gml="http://www.opengis.net/gml" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:om="http://www.opengis.net/om/1.0" xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:sa="http://www.opengis.net/sampling/1.0" targetNamespace="http://www.opengis.net/sampling/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>samplingBase.xsd
-
-Sampling features are feature types that are used primarily for making observations: 
-Abstract SamplingFeature, and collections are described in this schema document
-
-SamplingPoint, SamplingCurve, SamplingSurface and SamplingSolid are described in samplingManifold.xsd
-Specimen and LocatedSpecimen are described in specimen.xsd
-
-Sampling is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<!-- GMD schema does not work with GML 3.1.1
-		<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	-->
-	<!--
-	<import namespace="http://www.opengis.net/cv/0.2" schemaLocation="http://schemas.opengis.net/cv/0.2.0/cv.xsd"/>
-	-->
-	<import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<import namespace="http://www.opengis.net/om/1.0" schemaLocation="http://schemas.opengis.net/om/1.0.0/om.xsd"/>
-	<include schemaLocation="./sampling.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<!-- ===== Feature types in Site hierarchy ====== -->
-	<!-- ====================================================================== -->
-	<complexType name="SamplingFeatureType">
-		<annotation>
-			<documentation>A "SamplingFeature" is a feature used primarily for taking observations.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element name="sampledFeature" type="gml:FeaturePropertyType" maxOccurs="unbounded">
-						<annotation>
-							<documentation>A SamplingFeature must be associated with one or more other features through an association role sampledFeature. 
-							This association records the intention of the sample design. 
-							The target of this association will usually be a domain feature.</documentation>
-						</annotation>
-					</element>
-					<element name="relatedObservation" type="om:ObservationPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>A SamplingFeature is distinguished from typical domain feature types in that it has a set of [0..*] navigable associations with Observations, given the rolename relatedObservation. 
-					This complements the association role “featureOfInterest” which is constrained to point back from the Observation to the Sampling-Feature. 
-					The usual requirement of an Observation feature-of-interest is that its type has a property matching the observed-property on the Observation. 
-					In the case of Sampling-features, the topology of the model and navigability of the relatedObservation role means that this requirement is satisfied automatically: 
-					a property of the sampling-feature is implied by the observedProperty of a related observation. 
-					This effectively provides an unlimited set of “soft-typed” properties on a Sampling Feature.</documentation>
-						</annotation>
-					</element>
-					<element name="relatedSamplingFeature" type="sa:SamplingFeatureRelationPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Sampling features are frequently related to each other, as parts of complexes, networks, through sub-sampling, etc. 
-							This is supported by the relatedSamplingFeature association with a SamplingFeatureRelation association class, which carries a source, target and role.</documentation>
-						</annotation>
-					</element>
-					<element name="surveyDetails" type="sa:SurveyProcedurePropertyType" minOccurs="0">
-						<annotation>
-							<documentation>A common requirement for sampling features is an indication of the SurveyProcedure 
-							that provides the surveyDetails related to determination of its location and shape. </documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingFeature" abstract="true" type="sa:SamplingFeatureType" substitutionGroup="gml:_Feature"/>
-	<!-- .................. -->
-	<complexType name="SamplingFeaturePropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SamplingFeature"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType name="SamplingFeatureRelationType">
-		<annotation>
-			<documentation>A "SamplingFeatureRelation" is used to describe relationships between sampling features, including part-whole, siblings, etc.</documentation>
-		</annotation>
-		<sequence>
-			<element name="role" type="gml:CodeType"/>
-			<element name="target" type="sa:SamplingFeaturePropertyType"/>
-		</sequence>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingFeatureRelation" type="sa:SamplingFeatureRelationType"/>
-	<!-- .................. -->
-	<complexType name="SamplingFeatureRelationPropertyType">
-		<sequence>
-			<element ref="sa:SamplingFeatureRelation"/>
-		</sequence>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<!-- Collection -->
-	<!-- ====================================================================== -->
-	<complexType name="SamplingFeatureCollectionType">
-		<annotation>
-			<documentation>A Sampling Feature Collection is a simple collection of sampling features. 
-			The relationship of members to the collection is equivalent to a part-whole relation. 
-			A collection is a sampling feature so must still carry the sampledFeature association to indicate intention.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SamplingFeatureType">
-				<sequence>
-					<element name="member" type="sa:SamplingFeaturePropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingFeatureCollection" type="sa:SamplingFeatureCollectionType" substitutionGroup="sa:SamplingFeature"/>
-	<!-- .................. -->
-	<complexType name="SamplingFeatureCollectionPropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SamplingFeatureCollection"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/samplingManifold.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/samplingManifold.xsd
deleted file mode 100755
index e82c0bc..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/samplingManifold.xsd
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:gml="http://www.opengis.net/gml" 
-        xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sa="http://www.opengis.net/sampling/1.0"
-        targetNamespace="http://www.opengis.net/sampling/1.0" elementFormDefault="qualified"
-        attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>samplingManifold.xsd
-
-SamplingFeatures are feature types that are used primarily for making observations: 
-SamplingFeature,  and collections are described in samplingBase.xsd
-
-SamplingPoint (0-D)
-SamplingCurve (1-D)
-SamplingSurface (2-D)
-SamplingSolid (3-D) are described in this schema document
-
-In many cases the properties of interest vary within the site, so may be represented as a coverage associated with the SamplingFeature. 
-
-Sampling is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<include schemaLocation="./sampling.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<!-- 0-D sampling regimes -->
-	<!-- ====================================================================== -->
-	<complexType name="SamplingPointType">
-		<annotation>
-			<documentation>A "SamplingPoint" is an identified position (0-D geospatial feature). 
-		It may be revisited for various purposes, in particular to retrieve multiple specimens or make repeated or complementary observations. 
-		The position property of the SamplingPoint provides the value of the position property of observations an specimens associated with the SamplingPoint. 
-		By using the SamplingPoint feature, this position information and any metadata associated with it may be encoded in one place, i.e. normalised, and then re-used _by reference_ on other feature instances associated with it.
-		SamplingPoints are often known as Stations</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SamplingFeatureType">
-				<sequence>
-					<element name="position" type="gml:PointPropertyType"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingPoint" type="sa:SamplingPointType" substitutionGroup="sa:SamplingFeature"/>
-	<!-- .................. -->
-	<complexType name="SamplingPointPropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SamplingPoint"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- Extensive sampling regimes -->
-	<!-- ====================================================================== -->
-	<complexType name="SpatiallyExtensiveSamplingFeatureType">
-		<annotation>
-			<documentation>SpatiallyExtensiveSamplingFeature is the root class for sampling manifolds that are extensive in 1- 2- or 3-D.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SamplingFeatureType"/>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SpatiallyExtensiveSamplingFeature" abstract="true" type="sa:SpatiallyExtensiveSamplingFeatureType" substitutionGroup="sa:SamplingFeature"/>
-	<!-- .................. -->
-	<complexType name="SpatiallyExtensiveSamplingFeaturePropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SpatiallyExtensiveSamplingFeature"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- 1-D sites and sampling regimes -->
-	<!-- ====================================================================== -->
-	<complexType name="SamplingCurveType">
-		<annotation>
-			<documentation>A "SamplingCurve" is an identified 1-D spatial feature. 
-		It may be revisited for various purposes, in particular to retrieve multiple specimens or make repeated or complementary observations.
-		Specialized names for SamplingCurve include Sounding, ObservationWell, FlightLine, Transect.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SpatiallyExtensiveSamplingFeatureType">
-				<sequence>
-					<element name="shape" type="gml:CurvePropertyType"/>
-					<element name="length" type="gml:MeasureType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingCurve" type="sa:SamplingCurveType" substitutionGroup="sa:SpatiallyExtensiveSamplingFeature">
-		<annotation>
-			<documentation>A "SamplingCurve" is an identified 1-D spatial feature. 
-		It may be revisited for various purposes, in particular to retrieve multiple specimens or make repeated or complementary observations.
-		Specialized names for SamplingCurve include Profile, ObservationWell, FlightLine, Transect.</documentation>
-		</annotation>
-	</element>
-	<!-- .................. -->
-	<complexType name="SamplingCurvePropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SamplingCurve"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- 2-D sites and sampling regimes -->
-	<!-- ====================================================================== -->
-	<complexType name="SamplingSurfaceType">
-		<annotation>
-			<documentation>A "SamplingSurface" is an identified 2-D spatial feature. 
-		It may be used for various purposes, in particular for observations of cross sections through features.
-		Specialized names for SamplingSurface include CrossSection, Section, Flitch, Swath, Scene, MapHorizon.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SpatiallyExtensiveSamplingFeatureType">
-				<sequence>
-					<element name="shape" type="gml:SurfacePropertyType"/>
-					<element name="area" type="gml:MeasureType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingSurface" type="sa:SamplingSurfaceType" substitutionGroup="sa:SpatiallyExtensiveSamplingFeature">
-		<annotation>
-			<documentation>A "SamplingSurface" is an identified 2-D spatial feature. 
-		It may be used for various purposes, in particular for observations of cross sections through features.
-		Specialized names for SamplingSurface include CrossSection, Section, Flitch, Swath, Scene, MapHorizon.</documentation>
-		</annotation>
-	</element>
-	<!-- .................. -->
-	<complexType name="SamplingSurfacePropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SamplingSurface"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- 3-D sites and sampling regimes -->
-	<!-- ====================================================================== -->
-	<complexType name="SamplingSolidType">
-		<annotation>
-			<documentation>A "SamplingSolid" is an identified 3-D spatial feature used in sampling.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SpatiallyExtensiveSamplingFeatureType">
-				<sequence>
-					<element name="shape" type="gml:SolidPropertyType"/>
-					<element name="volume" type="gml:MeasureType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="SamplingSolid" type="sa:SamplingSolidType" substitutionGroup="sa:SpatiallyExtensiveSamplingFeature">
-		<annotation>
-			<documentation>A "SamplingSolid" is an identified 3-D spatial feature used in sampling.</documentation>
-		</annotation>
-	</element>
-	<!-- .................. -->
-	<complexType name="SamplingSolidPropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SamplingSolid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/specimen.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/specimen.xsd
deleted file mode 100755
index 9718826..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/specimen.xsd
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:gml="http://www.opengis.net/gml" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:sa="http://www.opengis.net/sampling/1.0"
-        targetNamespace="http://www.opengis.net/sampling/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>specimen.xsd
-
-SamplingFeatures are feature types that are used primarily for making observations: 
-SamplingFeature,  and collections are described in samplingBase.xsd
-
-Specimen and LocatedSpecimen are described in this schema document
-
-Sampling is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<!-- GMD cannot be used with GML 3.1.1
-		<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	-->
-	<include schemaLocation="./sampling.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<complexType name="SpecimenType">
-		<annotation>
-			<documentation>An object on which measurements may be made, often ex-situ.
-									
-			Note that if this specimen is a "processed" version of another (e.g. by grinding, sieving, etc) then 
-			the predecessor (if known) may be recorded as a relatedSamplingFeature</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SamplingFeatureType">
-				<sequence>
-					<element name="materialClass" type="gml:CodeType">
-						<annotation>
-							<documentation>Material type, usually taken from a controlled vocabulary
-					Specialised domains may choose to fix the vocabulary to be used
-					Its value may be relatively generic (rock, pulp) or may reflect a detailed classification (calcrete, adamellite, biotite-schist). 
-			In the latter case it is wise to use the codeSpace attribute to provide a link to the classification scheme/vocabulary used. 
-</documentation>
-						</annotation>
-					</element>
-					<element name="currentLocation" type="sa:LocationPropertyType" minOccurs="0">
-						<annotation>
-							<documentation>Storage location of specimen if it still exists. If destroyed in analysis, then either omit or use xlink:href to point to a suitable URN, e.g. urn:cgi:def:nil:destroyed</documentation>
-						</annotation>
-					</element>
-					<element name="size" minOccurs="0">
-						<annotation>
-							<documentation>The size of the specimen: mass, length, volume, etc</documentation>
-						</annotation>
-						<complexType>
-							<annotation>
-								<documentation>Xlink attributes added to enable rich annotation, e.g. size-type</documentation>
-							</annotation>
-							<simpleContent>
-								<extension base="gml:MeasureType">
-									<attributeGroup ref="gml:AssociationAttributeGroup"/>
-								</extension>
-							</simpleContent>
-						</complexType>
-					</element>
-					<element name="samplingMethod" type="gml:ReferenceType" minOccurs="0">
-						<annotation>
-							<documentation>Method used when retrieving specimen from host sampledFeature</documentation>
-						</annotation>
-					</element>
-					<element name="samplingTime" type="gml:TimePrimitivePropertyType">
-						<annotation>
-							<documentation>Time and date when the specimen was initially retrieved</documentation>
-						</annotation>
-					</element>
-					<element name="processingDetails" type="gml:ReferenceType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>One or more procedures may have been applied to a specimen.  
-            May contain collection, sampling and preparation procedures</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="Specimen" type="sa:SpecimenType" substitutionGroup="sa:SamplingFeature"/>
-	<!-- .................. -->
-	<complexType name="SpecimenPropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:Specimen"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType name="LocatedSpecimenType">
-		<annotation>
-			<documentation/>
-		</annotation>
-		<complexContent>
-			<extension base="sa:SpecimenType">
-				<sequence>
-					<element name="samplingLocation" type="gml:GeometryPropertyType">
-						<annotation>
-							<documentation>Sampling location may be provided directly if not available through its association with either the sampledFeature or a relatedSamplingFeature</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- .................. -->
-	<element name="LocatedSpecimen" type="sa:LocatedSpecimenType" substitutionGroup="sa:Specimen"/>
-	<!-- .................. -->
-	<complexType name="LocatedSpecimenPropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:LocatedSpecimen"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType name="LocationPropertyType">
-		<sequence minOccurs="0">
-			<choice>
-				<element ref="gml:_Geometry"/>
-				<element name="EX_GeographicDescription" type="sa:AnyOrReferenceType"/>
-				<!--
-				<element ref="gmd:EX_GeographicDescription"/>
-				-->
-			</choice>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-		<attribute name="unionSemantics">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="geometryLocation"/>
-					<enumeration value="nameLocation"/>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/surveyProcedure.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/surveyProcedure.xsd
deleted file mode 100755
index 1eafbd6..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sampling/1.0.0/surveyProcedure.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:sa="http://www.opengis.net/sampling/1.0" xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:gml="http://www.opengis.net/gml" xmlns:gmd="http://www.isotc211.org/2005/gmd"
-        xmlns:om="http://www.opengis.net/om/1.0" targetNamespace="http://www.opengis.net/sampling/1.0"
-        elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.3">
-	<annotation>
-		<documentation>surveyProcedure.xsd
-
-Components to describe procedures used in sampling.
-
-Sampling is an OGC Standard.
-Copyright (c) 2007,2010 Open Geospatial Consortium.
-To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<!-- GMD cannot be used with GML 3.1.1
-		<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
-	-->
-	<import namespace="http://www.opengis.net/om/1.0" schemaLocation="http://schemas.opengis.net/om/1.0.0/om.xsd"/>
-	<include schemaLocation="./sampling.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<complexType name="SurveyProcedureType">
-		<annotation>
-			<documentation>Specialized procedure related to surveying positions and locations.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element name="operator" type="sa:AnyOrReferenceType" minOccurs="0"/>
-					<!-- Replace with
-					<element name="operator" type="gmd:CI_ResponsibleParty_PropertyType" minOccurs="0"/>
-					when upgrading to GML 3.2
-					-->
-					<element name="elevationDatum" type="gml:ReferenceType" minOccurs="0"/>
-					<!-- Replace with
-					<element name="elevationDatum" type="gml:VerticalDatumPropertyType" minOccurs="0"/>
-					when upgrading to GML 3.2
-					-->
-					<element name="elevationMethod" type="om:ProcessPropertyType" minOccurs="0"/>
-					<element name="elevationAccuracy" type="gml:MeasureType" minOccurs="0"/>
-					<element name="geodeticDatum" type="gml:ReferenceType" minOccurs="0"/>
-					<!-- Replace with
-					<element name="geodeticDatum" type="gml:GeodeticDatumPropertyType" minOccurs="0"/>
-					when upgrading to GML 3.2
-					-->
-					<element name="positionMethod" type="om:ProcessPropertyType"/>
-					<element name="positionAccuracy" type="gml:MeasureType" minOccurs="0"/>
-					<element name="projection" type="gml:ReferenceType" minOccurs="0"/>
-					<!-- Replace with
-					<element name="projection" type="gml:SingleCRSPropertyType" minOccurs="0"/>
-					when upgrading to GML 3.2
-					-->
-					<element name="surveyTime" type="gml:TimePrimitivePropertyType" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ...................... -->
-	<element name="SurveyProcedure" type="sa:SurveyProcedureType" substitutionGroup="gml:_Feature">
-		<annotation>
-			<documentation>Specialized procedure related to surveying positions and locations.</documentation>
-		</annotation>
-	</element>
-	<!-- ...................... -->
-	<complexType name="SurveyProcedurePropertyType">
-		<sequence minOccurs="0">
-			<element ref="sa:SurveyProcedure"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-		<!-- ====================================================================== -->
-	<complexType name="AnyOrReferenceType">
-		<annotation>
-			<documentation>Placeholder type</documentation>
-		</annotation>
-		<sequence minOccurs="0">
-			<any/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/base.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/base.xsd
deleted file mode 100755
index 85a0a3c..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/base.xsd
+++ /dev/null
@@ -1,483 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/sensorML/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:gml="http://www.opengis.net/gml" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" xmlns:ism="urn:us:gov:ic:ism:v2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<!--  -->
-	<xs:annotation>
-		<xs:documentation>Base class definitions for core SensorML
-			
-			SensorML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<!-- import GML 3.1.1 -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<!-- import SWE Common Data Types 1.0.1 -->
-	<xs:import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<!-- import US Intelligence Community schema for security speciifications-->
-	<xs:import namespace="urn:us:gov:ic:ism:v2" schemaLocation="http://schemas.opengis.net/ic/2.0/IC-ISM-v2.xsd"/>
-	<xs:include schemaLocation="./sensorML.xsd"/>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractSMLType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Main Abstract SensorML Object</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:restriction base="gml:AbstractFeatureType">
-				<xs:sequence>
-					<xs:sequence>
-						<xs:sequence>
-							<xs:element ref="gml:description" minOccurs="0"/>
-							<xs:element ref="gml:name" minOccurs="0">
-								<xs:annotation>
-									<xs:documentation>The gml:name property should be used only as a label in SensorML, and thus is limited to one occurence. Multiple robust and well defined identifiers can be provided in the identification section.
-                           </xs:documentation>
-								</xs:annotation>
-							</xs:element>
-							<xs:element ref="gml:boundedBy" minOccurs="0">
-								<xs:annotation>
-									<xs:documentation>Specifies the possible extent of the component location</xs:documentation>
-								</xs:annotation>
-							</xs:element>
-						</xs:sequence>
-					</xs:sequence>
-				</xs:sequence>
-			</xs:restriction>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:group name="constraints">
-		<xs:sequence>
-			<xs:element ref="sml:validTime" minOccurs="0"/>
-			<xs:element ref="sml:securityConstraint" minOccurs="0"/>
-			<xs:element ref="sml:legalConstraint" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:element name="securityConstraint">
-		<xs:annotation>
-			<xs:documentation>Means of providing security constraints of description</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="sml:Security"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Security">
-		<xs:annotation>
-			<xs:documentation>based on IC:ISM definition</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:attributeGroup ref="ism:SecurityAttributesOptionGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="validTime">
-		<xs:annotation>
-			<xs:documentation>Means of providing time validity constraint of description</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice>
-				<xs:element ref="gml:TimeInstant"/>
-				<xs:element ref="gml:TimePeriod"/>
-			</xs:choice>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="legalConstraint">
-		<xs:annotation>
-			<xs:documentation>Means of providing legal constraints of description</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element ref="sml:Rights"/>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Rights">
-		<xs:annotation>
-			<xs:documentation>based on IC:DDMS definition</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="sml:documentation"/>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-			<xs:attribute name="privacyAct" type="xs:boolean" use="optional"/>
-			<xs:attribute name="intellectualPropertyRights" type="xs:boolean" use="optional"/>
-			<xs:attribute name="copyRights" type="xs:boolean" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:group name="generalInfo">
-		<xs:sequence>
-			<xs:element ref="sml:keywords" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="sml:identification" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="sml:classification" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:element name="keywords">
-		<xs:annotation>
-			<xs:documentation>Means of providing a list of keywords (with a codeSpace) for quick discovery</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="KeywordList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="keyword" type="xs:token" maxOccurs="unbounded"/>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID"/>
-						<xs:attribute name="codeSpace" type="xs:anyURI"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="identification">
-		<xs:annotation>
-			<xs:documentation>Means of providing various identity and alias values, with types such as "longName", "abbreviation", "modelNumber", "serialNumber", whose terms can be defined in a dictionary</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="IdentifierList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="identifier" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element ref="sml:Term"/>
-									</xs:sequence>
-									<xs:attribute name="name" type="xs:token" use="optional"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="classification">
-		<xs:annotation>
-			<xs:documentation>Means of specifying classification values with types such as "sensorType", "intendedApplication", etc., whose terms can be defined in a dictionary</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="ClassifierList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="classifier" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element ref="sml:Term"/>
-									</xs:sequence>
-									<xs:attribute name="name" type="xs:token" use="optional"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Term">
-		<xs:annotation>
-			<xs:documentation>A well defined token used to specify identifier and classifier values (single spaces allowed)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="codeSpace" type="swe:CodeSpacePropertyType" minOccurs="0"/>
-				<xs:element name="value" type="xs:token"/>
-			</xs:sequence>
-			<xs:attribute name="definition" type="xs:anyURI">
-				<xs:annotation>
-					<xs:documentation>Points to the term definition using a URI. Term definitions are things like uid, shortName, sensorType, application, etc...</xs:documentation>
-				</xs:annotation>
-			</xs:attribute>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:group name="references">
-		<xs:sequence>
-			<xs:element ref="sml:contact" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="sml:documentation" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:element name="contact">
-		<xs:annotation>
-			<xs:documentation>Relevant contacts for that object</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice minOccurs="0">
-				<xs:group ref="sml:ContactGroup"/>
-				<xs:element ref="sml:ContactList"/>
-			</xs:choice>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="ContactList">
-		<xs:annotation>
-			<xs:documentation>Allows to group several contacts together in a list that can be referenced as a whole</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="gml:description" minOccurs="0"/>
-				<xs:element name="member" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:group ref="sml:ContactGroup"/>
-						<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:group name="ContactGroup">
-		<xs:choice>
-			<xs:element ref="sml:Person"/>
-			<xs:element ref="sml:ResponsibleParty"/>
-		</xs:choice>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:element name="Person">
-		<xs:annotation>
-			<xs:documentation>based on IC:DMMS</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="surname" type="xs:token"/>
-				<xs:element name="name" type="xs:token"/>
-				<xs:element name="userID" type="xs:token"/>
-				<xs:element name="affiliation" type="xs:token"/>
-				<xs:element name="phoneNumber" type="xs:token"/>
-				<xs:element name="email" type="xs:token"/>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="ResponsibleParty">
-		<xs:annotation>
-			<xs:documentation>based on ISO 19115</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="individualName" type="xs:string" minOccurs="0"/>
-				<xs:element name="organizationName" type="xs:string" minOccurs="0"/>
-				<xs:element name="positionName" type="xs:string" minOccurs="0"/>
-				<xs:element ref="sml:contactInfo" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="contactInfo">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="phone" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="voice" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-							<xs:element name="facsimile" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="address" minOccurs="0">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="deliveryPoint" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-							<xs:element name="city" type="xs:string" minOccurs="0"/>
-							<xs:element name="administrativeArea" type="xs:string" minOccurs="0"/>
-							<xs:element name="postalCode" type="xs:string" minOccurs="0"/>
-							<xs:element name="country" type="xs:string" minOccurs="0"/>
-							<xs:element name="electronicMailAddress" type="xs:string" minOccurs="0"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element ref="sml:onlineResource" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="hoursOfService" type="xs:string" minOccurs="0"/>
-				<xs:element name="contactInstructions" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="onlineResource">
-		<xs:complexType>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="documentation">
-		<xs:annotation>
-			<xs:documentation>Relevant documentation for that object</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice minOccurs="0">
-				<xs:element ref="sml:Document"/>
-				<xs:element ref="sml:DocumentList"/>
-			</xs:choice>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Document">
-		<xs:annotation>
-			<xs:documentation>Document record with date/time, version, author, etc. pointing to an online resource related to the enclosing object</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="gml:description"/>
-				<xs:element name="date" type="swe:timeIso8601" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Date of creation</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element ref="sml:contact" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Person who is responsible for the document</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="format" type="xs:token" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Specifies the fornat of the file pointed to by onlineResource</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element ref="sml:onlineResource" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>Points to the actual document corresponding to that version</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-			<xs:attribute name="version" type="xs:token" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="DocumentList">
-		<xs:annotation>
-			<xs:documentation>List of documents related to the enclosing object</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="gml:description" minOccurs="0"/>
-				<xs:element name="member" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element ref="sml:Document"/>
-						</xs:sequence>
-						<xs:attribute name="name" type="xs:token" use="required"/>
-						<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:group name="history">
-		<xs:sequence>
-			<xs:element ref="sml:history" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:element name="history">
-		<xs:annotation>
-			<xs:documentation>History of the object described (Recalibration, adjustments, etc...)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element ref="sml:EventList"/>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="EventList">
-		<xs:annotation>
-			<xs:documentation>List of events related to the enclosing object</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="member" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element ref="sml:Event"/>
-						</xs:sequence>
-						<xs:attribute name="name" type="xs:token" use="required"/>
-						<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Event">
-		<xs:annotation>
-			<xs:documentation>Event record (change to the object) including a date/time, description, identification and additional references and metadata</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="date" type="swe:timeIso8601" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Date/Time of event</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element ref="gml:description" minOccurs="0"/>
-				<xs:group ref="sml:generalInfo" minOccurs="0"/>
-				<xs:group ref="sml:references" minOccurs="0"/>
-				<xs:element name="property" type="swe:DataComponentPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute ref="gml:id"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:group name="properties">
-		<xs:sequence>
-			<xs:element ref="sml:characteristics" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="sml:capabilities" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:element name="capabilities">
-		<xs:annotation>
-			<xs:documentation>Capability list for quick discovery</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element ref="swe:AbstractDataRecord"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:token" use="optional"/>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="characteristics">
-		<xs:annotation>
-			<xs:documentation>Characteristic list for quick discovery</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element ref="swe:AbstractDataRecord"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:token" use="optional"/>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/method.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/method.xsd
deleted file mode 100755
index 6840f0f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/method.xsd
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/sensorML/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Defines Process Method
-			
-			SensorML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<xs:include schemaLocation="./sensorML.xsd"/>
-	<xs:include schemaLocation="./base.xsd"/>
-	<xs:include schemaLocation="./process.xsd"/>
-	<!-- ================================================= -->
-	<xs:element name="ProcessMethod" type="sml:ProcessMethodType">
-		<xs:annotation>
-			<xs:documentation>Method describing a process (Can also be a dictionary entry)</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="ProcessMethodType">
-		<xs:annotation>
-			<xs:documentation>Complex Type for process methods definition</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:AbstractGMLType">
-				<xs:sequence>
-					<xs:group ref="sml:metadataGroup" minOccurs="0"/>
-					<xs:element name="rules">
-						<xs:annotation>
-							<xs:documentation>Text and/or language defining rules for process profile (e.g. inputs, outputs, parameters, and metadata)</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="RulesDefinition">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element ref="gml:description" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>Textual description of the i/o structure</xs:documentation>
-												</xs:annotation>
-											</xs:element>
-											<xs:element ref="sml:ruleLanguage" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="algorithm" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Textual and/or MathML description of the algorithm</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="AlgorithmDefinition">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element ref="gml:description" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>Textual description of the algorithm</xs:documentation>
-												</xs:annotation>
-											</xs:element>
-											<xs:element name="mathML" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>Includes or reference a MathML doc specifying the maths of the algorithm</xs:documentation>
-												</xs:annotation>
-												<xs:complexType>
-													<xs:sequence minOccurs="0">
-														<xs:any namespace="##any" processContents="lax"/>
-													</xs:sequence>
-													<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="implementation" minOccurs="0" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Points to the reference implementation of this process in the specified programming language (can be a SensorML process chain)</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:choice minOccurs="0">
-								<xs:element ref="sml:ProcessChain"/>
-								<xs:element name="ImplementationCode">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element ref="gml:description" minOccurs="0">
-												<xs:annotation>
-													<xs:documentation>Textual description of the algorithm</xs:documentation>
-												</xs:annotation>
-											</xs:element>
-											<xs:group ref="sml:metadataGroup" minOccurs="0"/>
-											<xs:element name="sourceRef" minOccurs="0">
-												<xs:complexType>
-													<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-												</xs:complexType>
-											</xs:element>
-											<xs:element name="binaryRef" minOccurs="0">
-												<xs:complexType>
-													<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-										<xs:attribute name="language" type="xs:token" use="required"/>
-										<xs:attribute name="framework" type="xs:token" use="optional"/>
-										<xs:attribute name="version" type="xs:token" use="optional"/>
-									</xs:complexType>
-								</xs:element>
-							</xs:choice>
-							<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="method" type="sml:methodPropertyType">
-		<xs:annotation>
-			<xs:documentation>process method</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="methodPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="sml:ProcessMethod"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="ruleLanguage" type="sml:ruleLanguageType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>substitutionGroup for languages that define rules</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="ruleLanguageType">
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<xs:element name="schematron" substitutionGroup="sml:ruleLanguage">
-		<xs:annotation>
-			<xs:documentation>Includes or references a schematron doc for enforcing process constraints</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="sml:ruleLanguageType">
-					<xs:sequence minOccurs="0">
-						<xs:any namespace="http://www.ascc.net/xml/schematron" processContents="lax"/>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="relaxNG" substitutionGroup="sml:ruleLanguage">
-		<xs:annotation>
-			<xs:documentation>Includes or references a relaxNG doc for enforcing process constraints</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="sml:ruleLanguageType">
-					<xs:sequence minOccurs="0">
-						<xs:any namespace="http://relaxng.org/ns/structure/1.0" processContents="lax"/>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/process.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/process.xsd
deleted file mode 100755
index b5fca95..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/process.xsd
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/sensorML/1.0.1" xmlns:gml="http://www.opengis.net/gml" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Defines Basic Process Elements and Types for SensorML
-			
-			SensorML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<xs:include schemaLocation="./sensorML.xsd"/>
-	<xs:include schemaLocation="./method.xsd"/>
-	<!-- ================================================= -->
-	<xs:element name="_Process" type="sml:AbstractProcessType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>base substitution group for all processes</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractProcessType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractSMLType">
-				<xs:sequence>
-					<xs:group ref="sml:metadataGroup" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:group name="metadataGroup">
-		<xs:annotation>
-			<xs:documentation>Group containing all metadata information</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:group ref="sml:generalInfo" minOccurs="0"/>
-			<xs:group ref="sml:constraints" minOccurs="0"/>
-			<xs:group ref="sml:properties" minOccurs="0"/>
-			<xs:group ref="sml:references" minOccurs="0"/>
-			<xs:group ref="sml:history" minOccurs="0"/>
-		</xs:sequence>
-	</xs:group>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractRestrictedProcessType" abstract="true">
-		<xs:complexContent>
-			<xs:restriction base="sml:AbstractProcessType">
-				<xs:sequence>
-					<xs:sequence>
-						<xs:element ref="gml:description" minOccurs="0"/>
-						<xs:element ref="gml:name" minOccurs="0"/>
-					</xs:sequence>
-					<xs:group ref="sml:metadataGroup" minOccurs="0"/>
-				</xs:sequence>
-			</xs:restriction>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractPureProcessType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Complex Type for all soft-typed processes</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractRestrictedProcessType">
-				<xs:sequence>
-					<xs:element ref="sml:inputs" minOccurs="0"/>
-					<xs:element ref="sml:outputs" minOccurs="0"/>
-					<xs:element ref="sml:parameters" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="inputs">
-		<xs:annotation>
-			<xs:documentation>list of input signals</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="InputList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="input" type="sml:IoComponentPropertyType" maxOccurs="unbounded"/>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="outputs">
-		<xs:annotation>
-			<xs:documentation>list of output signals</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="OutputList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="output" type="sml:IoComponentPropertyType" maxOccurs="unbounded"/>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="parameters">
-		<xs:annotation>
-			<xs:documentation>list of parameters</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="ParameterList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="parameter" type="swe:DataComponentPropertyType" maxOccurs="unbounded"/>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="ProcessModel" type="sml:ProcessModelType" substitutionGroup="sml:_Process">
-		<xs:annotation>
-			<xs:documentation>Simple atomic process defined using a ProcessMethod</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="ProcessModelType">
-		<xs:annotation>
-			<xs:documentation>Complex Type for atomic processes</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractPureProcessType">
-				<xs:sequence>
-					<xs:element ref="sml:method"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="ProcessChain" type="sml:ProcessChainType" substitutionGroup="sml:_Process">
-		<xs:annotation>
-			<xs:documentation>Process formed by chaining sub-processes</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="ProcessChainType">
-		<xs:annotation>
-			<xs:documentation>Complex Type for process chains</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractPureProcessType">
-				<xs:sequence>
-					<xs:element ref="sml:components"/>
-					<xs:element ref="sml:connections"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="components">
-		<xs:annotation>
-			<xs:documentation>Collection of subprocesses that can be chained using connections</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="ComponentList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="component" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence minOccurs="0">
-										<xs:element ref="sml:_Process"/>
-									</xs:sequence>
-									<xs:attribute name="name" type="xs:token" use="required"/>
-									<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="DataSource" type="sml:DataSourceType" substitutionGroup="sml:_Process">
-		<xs:annotation>
-			<xs:documentation>Process with no inputs representing a source of data (Tables, Observations...) for other processes to connect to.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="DataSourceType">
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractProcessType">
-				<xs:sequence>
-					<xs:choice>
-						<xs:sequence>
-							<xs:element name="dataDefinition">
-								<xs:complexType>
-									<xs:choice minOccurs="0">
-										<xs:element ref="swe:DataBlockDefinition"/>
-										<xs:element ref="swe:DataStreamDefinition"/>
-									</xs:choice>
-									<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-								</xs:complexType>
-							</xs:element>
-							<xs:element name="values">
-								<xs:complexType>
-									<xs:complexContent>
-										<xs:extension base="xs:anyType"/>
-									</xs:complexContent>
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-						<xs:element name="observationReference">
-							<xs:complexType>
-								<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:choice>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="connections">
-		<xs:annotation>
-			<xs:documentation>provides links between processes or between data sources and processes</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="ConnectionList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element ref="sml:connection" maxOccurs="unbounded"/>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="connection">
-		<xs:annotation>
-			<xs:documentation>Specify a connection between two elements</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice>
-				<xs:element ref="sml:Link"/>
-				<xs:element ref="sml:ArrayLink"/>
-			</xs:choice>
-			<xs:attribute name="name" type="xs:token" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Link">
-		<xs:annotation>
-			<xs:documentation>Link object used to make connections between processes</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="source">
-					<xs:complexType>
-						<xs:attribute name="ref" type="sml:linkRef" use="required"/>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="destination">
-					<xs:complexType>
-						<xs:attribute name="ref" type="sml:linkRef" use="required"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="type" type="xs:anyURI" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:simpleType name="linkRef">
-		<xs:restriction base="xs:token"/>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:element name="ArrayLink">
-		<xs:annotation>
-			<xs:documentation>Special Link to handle accessing array elements sequentially</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:choice>
-					<xs:sequence>
-						<xs:element name="sourceArray">
-							<xs:complexType>
-								<xs:attribute name="ref" type="sml:linkRef"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="destinationIndex" minOccurs="0" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:attribute name="ref" type="sml:linkRef"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-					<xs:sequence>
-						<xs:element name="destinationArray">
-							<xs:complexType>
-								<xs:attribute name="ref" type="sml:linkRef"/>
-							</xs:complexType>
-						</xs:element>
-						<xs:element name="sourceIndex" minOccurs="0">
-							<xs:complexType>
-								<xs:attribute name="ref" type="sml:linkRef"/>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-				</xs:choice>
-				<xs:element ref="sml:connection" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- 
-		NOTE: we intend to support switch between process using special ProcessModels rather than a special Link
-		      because it provides more flexibility (though it is more verbose)
-	-->
-	<!-- =================================================================== -->
-	<!-- Complex Types used for deriving hard-typed processes by restriction -->
-	<!-- =================================================================== -->
-	<xs:complexType name="AbstractDerivableProcessType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractProcessType">
-				<xs:sequence>
-					<xs:element name="inputs" type="sml:inputsPropertyType" minOccurs="0"/>
-					<xs:element name="outputs" type="sml:outputsPropertyType" minOccurs="0"/>
-					<xs:element name="parameters" type="sml:parametersPropertyType" minOccurs="0"/>
-					<xs:choice minOccurs="0">
-						<xs:element ref="sml:method"/>
-						<xs:sequence>
-							<xs:element name="components" type="sml:componentsPropertyType"/>
-							<xs:element name="dataSources" type="sml:dataSourcesPropertyType" minOccurs="0"/>
-							<xs:element name="connections" type="sml:connectionsPropertyType"/>
-						</xs:sequence>
-					</xs:choice>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractListType">
-		<xs:complexContent>
-			<xs:extension base="xs:anyType">
-				<xs:attribute name="id" type="xs:ID" use="optional"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="inputsPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="InputList" type="sml:AbstractListType"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="outputsPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="OutputList" type="sml:AbstractListType"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="parametersPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="ParameterList" type="sml:AbstractListType"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="componentsPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="ProcessList" type="sml:AbstractListType"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="dataSourcesPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="DataSourceList" type="sml:AbstractListType"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="connectionsPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element name="ConnectionList" type="sml:AbstractListType"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="IoComponentPropertyType">
-		<xs:choice minOccurs="0">
-			<xs:group ref="swe:AnyData"/>
-			<xs:element ref="swe:ObservableProperty"/>
-		</xs:choice>
-		<xs:attribute name="name" type="xs:token" use="required"/>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/sensorML.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/sensorML.xsd
deleted file mode 100755
index 3370676..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/sensorML.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/sensorML/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>SensorML document root definition
-			
-			SensorML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<xs:include schemaLocation="./system.xsd"/>
-	<!-- ================================================= -->
-	<xs:element name="SensorML">
-		<xs:annotation>
-			<xs:documentation>SensorML document root</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:group ref="sml:metadataGroup"/>
-				<xs:element name="member" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:choice>
-							<xs:element ref="sml:_Process"/>
-							<xs:element ref="sml:DocumentList"/>
-							<xs:element ref="sml:ContactList"/>
-						</xs:choice>
-						<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="version" type="xs:token" use="required" fixed="1.0.1"/>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/system.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/system.xsd
deleted file mode 100755
index 7811316..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sensorML/1.0.1/system.xsd
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/sensorML/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Component and System objects for core SensorML
-			
-			SensorML is an OGC Standard.
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<xs:include schemaLocation="./sensorML.xsd"/>
-	<xs:include schemaLocation="./process.xsd"/>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractDerivableComponentType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Complex Type to allow creation of component profiles by extension</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractProcessType">
-				<xs:sequence>
-					<xs:element ref="sml:spatialReferenceFrame" minOccurs="0"/>
-					<xs:element ref="sml:temporalReferenceFrame" minOccurs="0"/>
-					<xs:choice minOccurs="0">
-						<xs:element ref="sml:location"/>
-						<xs:element ref="sml:position"/>
-					</xs:choice>
-					<xs:element ref="sml:timePosition" minOccurs="0"/>
-					<xs:element ref="sml:interfaces" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractComponentType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Complex Type for all generic components (soft typed inputs/outputs/parameters)</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractDerivableComponentType">
-				<xs:sequence>
-					<xs:element ref="sml:inputs" minOccurs="0"/>
-					<xs:element ref="sml:outputs" minOccurs="0"/>
-					<xs:element ref="sml:parameters" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="spatialReferenceFrame">
-		<xs:annotation>
-			<xs:documentation>Textual definition of a spatial frame axes (origin, orientation). Spatial frames can be related to one another by specifying relative positions.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="gml:EngineeringCRS"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="temporalReferenceFrame">
-		<xs:annotation>
-			<xs:documentation>Textual definition of a temporal frame (time origin). Temporal frames can be related to one another by specifying relative times.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="gml:TemporalCRS"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="location">
-		<xs:annotation>
-			<xs:documentation>Uses a gml:Point for a fixed location or a (time dependant) curve for time variable location</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice minOccurs="0">
-				<xs:element ref="gml:Point"/>
-				<xs:element ref="gml:_Curve"/>
-			</xs:choice>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="position">
-		<xs:annotation>
-			<xs:documentation>Full position (location + orientation) given by a swe:Position or a Process (if variable)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice minOccurs="0">
-				<xs:element ref="sml:_Process"/>
-				<xs:element ref="swe:Position"/>
-				<xs:element ref="swe:Vector"/>
-			</xs:choice>
-			<xs:attribute name="name" type="xs:token" use="required"/>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="timePosition">
-		<xs:annotation>
-			<xs:documentation>Provide the ability to relate  a local time frame to a reference time frame</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice minOccurs="0">
-				<xs:element ref="swe:Time"/>
-				<xs:element ref="sml:_Process"/>
-			</xs:choice>
-			<xs:attribute name="name" type="xs:token" use="required"/>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Component" type="sml:ComponentType" substitutionGroup="sml:_Process">
-		<xs:annotation>
-			<xs:documentation>Atomic SensorML Component</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="ComponentType">
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractComponentType">
-				<xs:sequence>
-					<xs:element ref="sml:method" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="System" type="sml:SystemType" substitutionGroup="sml:_Process">
-		<xs:annotation>
-			<xs:documentation>System is a composite component containing sub-components.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<xs:complexType name="SystemType">
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractComponentType">
-				<xs:sequence>
-					<xs:element ref="sml:components" minOccurs="0"/>
-					<xs:element ref="sml:positions" minOccurs="0"/>
-					<xs:element ref="sml:connections" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="positions">
-		<xs:annotation>
-			<xs:documentation>Relative positions of the System components</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="PositionList">
-					<xs:complexType>
-						<xs:choice>
-							<xs:element ref="sml:position" maxOccurs="unbounded"/>
-							<xs:element ref="sml:timePosition"/>
-						</xs:choice>
-						<xs:attribute name="id" type="xs:ID" use="optional"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="interfaces">
-		<xs:annotation>
-			<xs:documentation>List of interfaces useable to access System inputs and outputs</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element name="InterfaceList">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element ref="sml:interface" maxOccurs="unbounded"/>
-						</xs:sequence>
-						<xs:attribute name="id" type="xs:ID" use="optional"/>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="interface">
-		<xs:complexType>
-			<xs:sequence minOccurs="0">
-				<xs:element ref="sml:InterfaceDefinition"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:token" use="required"/>
-			<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="InterfaceDefinition">
-		<xs:annotation>
-			<xs:documentation>Interface definition based on the OSI model. (http://en.wikipedia.org/wiki/OSI_model)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="serviceLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 8 (not in OSI). Type of web service used to access the data. (Ex: SOS, WCS, WFS)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="applicationLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 7 of the OSI model. Provides a means for the user to access information on the network through an application. (Ex: HTTP, SMTP, FTP, XMPP, Telnet, NTP, RTP, NFS)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="presentationLayer" type="sml:PresentationLayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 6 of the OSI model. Transforms the data to provide a standard interface for the Application layer. (Ex: SSL, TLS, ASCII, MIDI, MPEG, SWECommon)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="sessionLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 5 of the OSI model. Controls the dialogues (sessions) between computers by establishing, managing and terminating connections between the local and remote application. (Ex: NetBios, TCP session establishment)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="transportLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 4 of the OSI model. Provides transparent transfer of data between end users and can control reliability of a given link. (Ex: TCP, UDP, SPX)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="networkLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 3 of the OSI model. Provides functional and procedural means of transfering data from source to destination via one or more networks while insuring QoS. (Ex: IP, ICMP, ARP, IPSec, IPX)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="dataLinkLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 2 of the OSI model. Provides functional and procedural means of transfering data between network entities and detecting/correcting errors. (Ex: Ethernet, 802.11, Token ring, ATM, Fibre Channel)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="physicalLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 1 of the OSI model. Provides all electrical and physical characteristics of the connection including pin layouts, voltages, cables specifcations, etc... (Ex: RS232, 100BASE-T, DSL, 802.11g)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="mechanicalLayer" type="sml:LayerPropertyType" minOccurs="0">
-					<xs:annotation>
-						<xs:documentation>Layer 0 (not is OSI). Type of connector used. (Ex: DB9, DB25, RJ45, RJ11, MINIDIN-8, USB-A, USB-B)</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="id" type="xs:ID" use="optional"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:complexType name="LayerPropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="swe:AbstractDataRecord"/>
-			<xs:element ref="swe:Category"/>
-		</xs:choice>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="PresentationLayerPropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="swe:AbstractDataRecord"/>
-			<xs:element ref="swe:Category"/>
-			<xs:element ref="swe:DataBlockDefinition"/>
-			<xs:element ref="swe:DataStreamDefinition"/>
-		</xs:choice>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="ComponentArray" type="sml:ComponentArrayType" substitutionGroup="sml:_Process">
-		<xs:annotation>
-			<xs:documentation>Special Type of system used to describe large arrays of almost identical components. An indexing mechanism can be used to vary certain parameters according to one or more indices value</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:complexType name="ComponentArrayType">
-		<xs:complexContent>
-			<xs:extension base="sml:AbstractDerivableComponentType">
-				<xs:sequence>
-					<xs:element ref="sml:inputs" minOccurs="0"/>
-					<xs:element ref="sml:outputs" minOccurs="0"/>
-					<xs:element name="parameters">
-						<xs:complexType>
-							<xs:complexContent>
-								<xs:restriction base="sml:parametersPropertyType">
-									<xs:sequence minOccurs="0">
-										<xs:element name="ParameterList">
-											<xs:complexType>
-												<xs:complexContent>
-													<xs:restriction base="sml:AbstractListType">
-														<xs:sequence>
-															<xs:element name="index" maxOccurs="unbounded">
-																<xs:complexType>
-																	<xs:sequence>
-																		<xs:element ref="swe:Count"/>
-																	</xs:sequence>
-																	<xs:attribute name="name" type="xs:token"/>
-																</xs:complexType>
-															</xs:element>
-															<xs:element name="parameter" type="swe:DataComponentPropertyType" maxOccurs="unbounded"/>
-														</xs:sequence>
-													</xs:restriction>
-												</xs:complexContent>
-											</xs:complexType>
-										</xs:element>
-									</xs:sequence>
-								</xs:restriction>
-							</xs:complexContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element ref="sml:components" minOccurs="0"/>
-					<xs:element ref="sml:positions" minOccurs="0"/>
-					<xs:element ref="sml:connections" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/ogc4sos.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/ogc4sos.xsd
deleted file mode 100755
index 7727b83..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/ogc4sos.xsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" targetNamespace="http://www.opengis.net/ogc" elementFormDefault="qualified" version="1.0.0.2">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-  <xs:annotation>
-    <xs:documentation>ogc4sos.xsd
-    Utility schema which simply includes the OGC schema documents required for the OGC SOS schemas
-    
-    SOS is an OGC Standard.
-    Copyright (c) 2006,2010 Open Geospatial Consortium.
-    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-    </xs:documentation>
-  </xs:annotation>
-  <!-- ==============================================================
-       includes and imports
-       ============================================================== -->
-  <xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-  <xs:include schemaLocation="http://schemas.opengis.net/filter/1.1.0/filter.xsd"/>
-  <!-- =================================================================== -->
-  <!-- TEMPORAL OPERATORS                                                  -->
-  <!-- =================================================================== -->
-  <xs:element name="temporalOps" type="ogc:TemporalOpsType" abstract="true"/>
-  <xs:complexType name="TemporalOpsType" abstract="true"/>
-  <xs:element name="TM_After" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Before" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Begins" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_BegunBy" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Contains" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_During" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_EndedBy" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Ends" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Equals" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Meets" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_MetBy" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_Overalps" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:element name="TM_OverlappedBy" type="ogc:BinaryTemporalOpType" substitutionGroup="ogc:temporalOps"/>
-  <xs:complexType name="BinaryTemporalOpType">
-    <xs:complexContent>
-      <xs:extension base="ogc:TemporalOpsType">
-        <xs:sequence>
-          <xs:element ref="ogc:PropertyName" minOccurs="1"/>
-          <xs:choice>
-            <xs:element ref="ogc:PropertyName"/>
-            <xs:element ref="gml:_TimeObject"/>
-          </xs:choice>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Temporal_CapabilitiesType">
-    <xs:sequence>
-      <xs:element name="TemporalOperands" type="ogc:TemporalOperandsType"/>
-      <xs:element name="TemporalOperators" type="ogc:TemporalOperatorsType"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="TemporalOperandsType">
-    <xs:sequence>
-      <xs:element name="TemporalOperand" type="ogc:TemporalOperandType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:simpleType name="TemporalOperandType">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="gml:validTime"/>
-      <xs:enumeration value="gml:TimeInstant"/>
-      <xs:enumeration value="gml:TimePeriod"/>
-      <xs:enumeration value="gml:timePosition"/>
-      <xs:enumeration value="gml:timeInterval"/>
-      <xs:enumeration value="gml:duration"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="TemporalOperatorsType">
-    <xs:sequence>
-      <xs:element name="TemporalOperator" type="ogc:TemporalOperatorType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="TemporalOperatorType">
-    <xs:sequence>
-      <xs:element name="TemporalOperands" type="ogc:TemporalOperandsType" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute name="name" type="ogc:TemporalOperatorNameType"/>
-  </xs:complexType>
-  <xs:simpleType name="TemporalOperatorNameType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="TM_After"/>
-      <xs:enumeration value="TM_Before"/>
-      <xs:enumeration value="TM_Begins"/>
-      <xs:enumeration value="TM_BegunBy"/>
-      <xs:enumeration value="TM_Contains"/>
-      <xs:enumeration value="TM_During"/>
-      <xs:enumeration value="TM_Equals"/>
-      <xs:enumeration value="TM_Overlaps"/>
-      <xs:enumeration value="TM_Meets"/>
-      <xs:enumeration value="TM_OverlappedBy"/>
-      <xs:enumeration value="TM_MetBy"/>
-      <xs:enumeration value="TM_EndedBy"/>
-      <xs:enumeration value="TM_Ends"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <!-- ========================================== -->
-  <xs:element name="Spatial_Capabilities" type="ogc:Spatial_CapabilitiesType"/>
-  <xs:element name="Scalar_Capabilities" type="ogc:Scalar_CapabilitiesType"/>
-  <xs:element name="Id_Capabilities" type="ogc:Id_CapabilitiesType"/>
-  <xs:element name="Temporal_Capabilities" type="ogc:Temporal_CapabilitiesType"/>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosAll.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosAll.xsd
deleted file mode 100755
index 91bc8e9..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosAll.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" targetNamespace="http://www.opengis.net/sos/1.0" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-  <annotation>
-    <documentation>
-      <description>
-        This XML Schema includes and imports, directly and indirectly, 
-        all the XML Schemas defined by the OGC Sensor Observation Service (SOS).
-        
-        SOS is an OGC Standard.
-        Copyright (c) 2006,2010 Open Geospatial Consortium.
-        To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-      </description>
-    </documentation>
-  </annotation>
-  <!-- ==============================================================
-		includes and imports
-	============================================================== -->
-  <include schemaLocation="sosCommon.xsd"/>
-  <include schemaLocation="sosGetCapabilities.xsd"/>
-  <include schemaLocation="sosDescribeFeatureType.xsd"/>
-  <include schemaLocation="sosDescribeSensor.xsd"/>
-  <include schemaLocation="sosDescribeObservationType.xsd"/>
-  <include schemaLocation="sosDescribeResultModel.xsd"/>
-  <include schemaLocation="sosGetObservation.xsd"/>
-  <include schemaLocation="sosGetResult.xsd"/>
-  <include schemaLocation="sosGetFeatureOfInterest.xsd"/>
-  <include schemaLocation="sosGetFeatureOfInterestTime.xsd"/>
-  <include schemaLocation="sosInsert.xsd"/>
-  <include schemaLocation="sosRegisterSensor.xsd"/>
-  <include schemaLocation="sosGetObservationById.xsd"/>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosCommon.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosCommon.xsd
deleted file mode 100755
index 602d3ec..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosCommon.xsd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema encodes the elements and types that are shared by muliple SOS operations./
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="sosAll.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<complexType name="RequestBaseType">
-		<annotation>
-			<documentation>XML encoded SOS operation request base, for all operations except Get Capabilities. In this XML encoding, no "request" parameter is included, since the element name specifies the specific operation. </documentation>
-		</annotation>
-		<attribute name="service" type="string" use="required" fixed="SOS">
-			<annotation>
-				<documentation>Service type identifier. </documentation>
-			</annotation>
-		</attribute>
-		<attribute name="version" type="string" use="required" fixed="1.0.0">
-			<annotation>
-				<documentation>Specification version for SOS version and operation.</documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<simpleType name="responseModeType">
-		<restriction base="string">
-			<enumeration value="inline"/>
-			<enumeration value="attached"/>
-			<enumeration value="out-of-band"/>
-			<enumeration value="resultTemplate"/>
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosContents.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosContents.xsd
deleted file mode 100755
index 3b11808..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosContents.xsd
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema encodes the Contents section of the SOS GetCapabilities operation response.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-	<import namespace="http://www.opengis.net/swe/1.0.1" schemaLocation="http://schemas.opengis.net/sweCommon/1.0.1/swe.xsd"/>
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="Contents">
-		<annotation>
-			<documentation>Contents section of SOS service metadata (or Capabilites) XML document. For the SOS, these contents are data and functions that the SOS server provides.</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element name="ObservationOfferingList">
-					<complexType>
-						<sequence>
-							<element name="ObservationOffering" type="sos:ObservationOfferingType" maxOccurs="unbounded"/>
-						</sequence>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-	<!-- ============================ -->
-	<complexType name="ObservationOfferingBaseType" abstract="true">
-		<annotation>
-			<documentation>Makes boundedBy mandatory</documentation>
-		</annotation>
-		<complexContent>
-			<restriction base="gml:AbstractFeatureType">
-				<sequence>
-					<group ref="gml:StandardObjectProperties"/>
-					<element ref="gml:boundedBy"/>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-	<!-- ============================-->
-	<complexType name="ObservationOfferingType">
-		<complexContent>
-			<extension base="sos:ObservationOfferingBaseType">
-				<sequence>
-					<element name="intendedApplication" type="token" minOccurs="0" maxOccurs="unbounded"/>
-					<element name="time" type="swe:TimeGeometricPrimitivePropertyType"/>
-					<element name="procedure" type="gml:ReferenceType" maxOccurs="unbounded"/>
-					<element name="observedProperty" type="swe:PhenomenonPropertyType" maxOccurs="unbounded"/>
-					<element name="featureOfInterest" type="gml:ReferenceType" maxOccurs="unbounded"/>
-					<element name="responseFormat" type="ows:MimeType" maxOccurs="unbounded"/>
-					<element name="resultModel" type="QName" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>
-							Indicates the qualified name of the observation element that will be returned from a call to GetObservation for this offering.  
-							This element must be in the om:AbstractObservation substitution group and is typically the om:Observation or a specialized extension.
-							</documentation>
-						</annotation>
-					</element>
-					<element name="responseMode" type="sos:responseModeType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>This element allows the client to request the form of the response.  The value of resultTemplate is used to retrieve an observation template 
-							that will later be used in calls to GetResult.  The other options allow results to appear inline in a resultTag (inline), external to the observation element (out-of-band)
-							or as a MIME attachment (attached)</documentation>
-						</annotation>
-					</element>
-					<!-- intendedApplication and slotID can be supported by a more generic identifier/classifier section-->
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="srsName" type="gml:CodeType" substitutionGroup="ows:AbstractMetaData"/>
-	<element name="supportedSensorDescription" type="QName" substitutionGroup="ows:AbstractMetaData">
-		<annotation>
-			<documentation>The QName of the root of a sensor desription that is supported by this service.  Examples are "sml:_Process" and "tml:system"</documentation>
-		</annotation>
-	</element>
-	<element name="supportedSRS" type="gml:CodeType" substitutionGroup="gml:name">
-		<annotation>
-			<documentation>The name by which this reference system is identified.</documentation>
-		</annotation>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeFeatureType.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeFeatureType.xsd
deleted file mode 100755
index ba450af..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeFeatureType.xsd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the DescribeFeatureType request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-	request
-	============================================================== -->
-	<element name="DescribeFeatureType">
-		<annotation>
-			<documentation>Request to a SOS to perform the DescribeFeatureType operation. This operation is designed to request detailed information concerning the observation's target</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="FeatureId" type="anyURI">
-							<annotation>
-								<documentation>Identifier of the feature for which detailed information is requested. These identifiers are usually listed in the Contents section of the service metadata (Capabilities) document. </documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ==============================================================
-		response
-	============================================================== -->
-	<!--the response is a XML schema-->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeObservationType.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeObservationType.xsd
deleted file mode 100755
index 8f2ee8f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeObservationType.xsd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the DescribeObservationType request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-	request
-	============================================================== -->
-	<element name="DescribeObservationType">
-		<annotation>
-			<documentation>Request to a SOS to perform the DescribeObservationTypeoperation. This operation is designed to request detailed information concerning hard typed observation schemas</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="observedProperty" type="anyURI">
-							<annotation>
-								<documentation>The phenomenon for which the observationType (OM application schema) is requested.</documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ==============================================================
-		response
-	============================================================== -->
-	<!--The response will be an XML schema defining the OM applicatoin schemas-->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeResultModel.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeResultModel.xsd
deleted file mode 100755
index 9e1adb1..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeResultModel.xsd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the DescribeResultModel request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-	request
-	============================================================== -->
-	<element name="DescribeResultModel">
-		<annotation>
-			<documentation>Request to a SOS to perform the DescribeResultModel operation. 
-			This operation is designed to request detailed information concerning the format of the observation's result</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="ResultName" type="QName">
-							<annotation>
-								<documentation>Identifier of the type of the result, for which detailed information is requested.</documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ==============================================================
-		response
-	============================================================== -->
-	<!--the response is an XML schema-->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeSensor.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeSensor.xsd
deleted file mode 100755
index 5bbda7f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosDescribeSensor.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the DescribeSensor request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="DescribeSensor">
-		<annotation>
-			<documentation>Request to a SOS to perform the DescribeSensor operation. This operation is designed to request detailed sensor metadata.	</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="procedure" type="anyURI">
-							<annotation>
-								<documentation>Identifier of the sensor, for which detailed metadata is requested.</documentation>
-							</annotation>
-						</element>
-					</sequence>
-					<attribute name="outputFormat" type="ows:MimeType" use="required">
-						<annotation>
-							<documentation>Identifier of the output format to be used for the requested data. The outputFormats supported by a SOS server are listed in the operations metadata section of the service metadata (capabilities XML). If this attribute is omitted, the outputFormat should be tex/xml;subtype="sensorML/1.0.0". If the requested outputFormat is not supported by the SOS server, an exception message shall be returned.
-				</documentation>
-						</annotation>
-					</attribute>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ==============================================================
-		response
-	============================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd
deleted file mode 100755
index 291df65..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema encodes the SOS GetCapabilities operation request and response.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosContents.xsd"/>
-	<import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-	<import namespace="http://www.opengis.net/ogc" schemaLocation="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-	<!-- ==============================================================
-		elements and types
-	============================================================== -->
-	<element name="GetCapabilities">
-		<annotation>
-			<documentation>Request to a SOS to perform the GetCapabilities operation. This operation allows a client to retrieve service metadata (capabilities XML) providing metadata for the specific SOS server. In this XML encoding, no "request" parameter is included, since the element name specifies the specific operation. </documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="ows:GetCapabilitiesType">
-					<sequence/>
-					<attribute name="service" type="ows:ServiceType" use="required" fixed="SOS"/>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- =========================================================== -->
-	<element name="Capabilities">
-		<annotation>
-			<documentation>XML encoded SOS GetCapabilities operation response. This document provides clients with service metadata about a specific service instance, including metadata about the tightly-coupled data served. If the server does not implement the updateSequence parameter, the server shall always return the complete Capabilities document, without the updateSequence parameter. When the server implements the updateSequence parameter and the GetCapabilities operation request included t [...]
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="ows:CapabilitiesBaseType">
-					<sequence>
-						<element ref="sos:Filter_Capabilities" minOccurs="0"/>
-						<element ref="sos:Contents" minOccurs="0"/>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- added by Mike Botts and Johannes Echterhoff to support temporal filter in SOS Capabailities 2007-10-18 -->
-	<!-- temporary fix until temporal ops supported in filter -->
-	<element name="Filter_Capabilities">
-		<complexType>
-			<sequence>
-				<element ref="ogc:Spatial_Capabilities"/>
-				<element ref="ogc:Temporal_Capabilities"/>
-				<element ref="ogc:Scalar_Capabilities"/>
-				<element ref="ogc:Id_Capabilities"/>
-			</sequence>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterest.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterest.xsd
deleted file mode 100755
index 13941dc..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterest.xsd
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the GetFeatureOfInterest request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ogc" schemaLocation="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="GetFeatureOfInterest">
-		<annotation>
-			<documentation>Request to a SOS to perform the GetFeatureOfInterest operation. This operation is designed to request target feaure instances</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<choice>
-							<element name="FeatureOfInterestId" type="anyURI" maxOccurs="unbounded">
-								<annotation>
-									<documentation>Identifier of the feature of interest, for which detailed information is requested. These identifiers are usually listed in the Contents section of the service metadata (Capabilities) document. </documentation>
-								</annotation>
-							</element>
-							<element name="location">
-								<annotation>
-									<documentation>Uses modified version of filter.xsd</documentation>
-								</annotation>
-								<complexType>
-									<sequence>
-										<element ref="ogc:spatialOps"/>
-									</sequence>
-								</complexType>
-							</element>
-						</choice>
-						<element name="eventTime" minOccurs="0" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Uses modified version of filter.xsd 
-								
-								Allows a client to request targets from a specific instant, multiple instances or periods of time in the past, present and future. 
-								This is useful for dynamic sensors for which the properties of the target are time-dependent. 
-								Multiple time paramters may be indicated so that the client may request details of the observation target at multiple times. 
-								The supported range is listed in the contents section of the service metadata.</documentation>
-							</annotation>
-							<complexType>
-								<sequence>
-									<element ref="ogc:temporalOps"/>
-								</sequence>
-							</complexType>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ====================================================
-	response
-	=======================================================-->
-	<!-- The response is an GML feature, the schema of the feature instance can be retrieved using the DescribeFeatureType request.-->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterestTime.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterestTime.xsd
deleted file mode 100755
index 21c1978..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetFeatureOfInterestTime.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the GetFeatureOfInterestTime request and response XML elements and types.
-				
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ogc" schemaLocation="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="GetFeatureOfInterestTime">
-		<annotation>
-			<documentation>Request to a SOS to perform the GetTargetTime operation. 
-			This operation is designed to request the time that specified target feature instances or target locations are available</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="FeatureOfInterestId" type="anyURI">
-							<annotation>
-								<documentation>Identifier of the feature of interest, for which detailed information is requested. These identifiers are usually listed in the Contents section of the service metadata (Capabilities) document. </documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ====================================================
-	response
-	=======================================================-->
-	<!-- The response is an GML time primitive.-->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd
deleted file mode 100755
index e792276..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:om="http://www.opengis.net/om/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<dc:description>
-				This XML Schema defines the GetObservation request XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</dc:description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-	<import namespace="http://www.opengis.net/ogc" schemaLocation="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="GetObservation">
-		<annotation>
-			<documentation>Request to a SOS to perform the GetObservation operation. This operation is designed to request sensor data from live sensors as well as sensor data archives.</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence minOccurs="0">
-						<element name="offering" type="anyURI">
-							<annotation>
-								<documentation>ID of an offering advertised in the capabilities.
-									All following parameters are depending on the selected offering.
-								</documentation>
-							</annotation>
-						</element>
-						<element name="eventTime" minOccurs="0" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Allows a client to request observations from a specific instant, multiple instances or periods of time in the past, present and future. The supported range is listed in the selected offering capabilities.
-								</documentation>
-							</annotation>
-							<complexType>
-								<sequence>
-									<element ref="ogc:temporalOps"/>
-								</sequence>
-							</complexType>
-						</element>
-						<element name="procedure" type="anyURI" minOccurs="0" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Index of a particular sensor if offering procedure is a Sensor Array. Allows client to request data from one or more sensors in the array. The size of the array should be specified in the selected offering capabilities. This is to support scenarios with sensor grids (we don't want to have one offering for each sensor in that case). Note that sensorML can describe Sensor Arrays too. 										</documentation>
-							</annotation>
-						</element>
-						<element name="observedProperty" type="anyURI" maxOccurs="unbounded">
-							<annotation>
-								<documentation>ID of a phenomenon advertised in capabilities document.
-									All possible phenomena are listed in the selected offering capabilities.
-								</documentation>
-							</annotation>
-						</element>
-						<element name="featureOfInterest" minOccurs="0">
-							<annotation>
-								<documentation>Specifies target feature for which observations are requested. Mostly a hepler for in-situ sensors, since geo-location has to be done on the server side. The supported area should be listed in the selected offering capabilities.
-								</documentation>
-							</annotation>
-							<complexType>
-								<choice>
-									<element ref="ogc:spatialOps"/>
-									<element name="ObjectID" type="anyURI" maxOccurs="unbounded">
-										<annotation>
-											<documentation>Unordered list of zero or more object identifiers. These identifiers are usually listed in the Contents section of the service metadata (Capabilities) document. If no ObjectID value is included, and if only one category of objects is allowed for this operation, the server shall return all objects of that category. NOTE: Although retention of this ability is allowed by a specific OWS that uses this operation, such retention is discouraged due to possible problems [...]
-										</annotation>
-									</element>
-								</choice>
-							</complexType>
-						</element>
-						<element name="result" minOccurs="0">
-							<annotation>
-								<documentation>Only report observations where the result matches this expression.
-								</documentation>
-							</annotation>
-							<complexType>
-								<sequence>
-									<element ref="ogc:comparisonOps"/>
-								</sequence>
-							</complexType>
-						</element>
-						<element name="responseFormat" type="ows:MimeType">
-							<annotation>
-								<documentation>ID of the output format to be used for the requested data. The supported output formats are listed in the selected offering capabilities.
-								</documentation>
-							</annotation>
-						</element>
-						<element name="resultModel" type="QName" minOccurs="0">
-							<annotation>
-								<documentation>Identifier of the result model to be used for the requested data. The resultModel values supported by a SOS server are listed in the contents section of the service metadata, identified as QName values.  If the requested resultModel is not supported by the SOS server, an exception message shall be returned.
-							</documentation>
-							</annotation>
-						</element>
-						<element name="responseMode" type="sos:responseModeType" minOccurs="0">
-							<annotation>
-								<documentation>This element allows the client to request the form of the response.  The value of resultTemplate is used to retrieve an observation template 
-							that will later be used in calls to GetResult.  The other options allow results to appear inline in a resultTag (inline), external to the observation element (out-of-band)
-							or as a MIME attachment (attached)</documentation>
-							</annotation>
-						</element>
-					</sequence>
-					<attribute name="srsName" type="anyURI" use="optional"/>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetObservationById.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetObservationById.xsd
deleted file mode 100755
index faec131..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetObservationById.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the GetObservation request XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-	<import namespace="http://www.opengis.net/ogc" schemaLocation="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="GetObservationById">
-		<annotation>
-			<documentation>Request to a SOS to perform the GetObservation operation using an Observation ID.</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="ObservationId" type="anyURI">
-							<annotation>
-								<documentation>ID of the observation to obtain.  This could have been obtained by the client via a URL in a feed, alert, or some other notification
-								</documentation>
-							</annotation>
-						</element>
-						<element name="responseFormat" type="ows:MimeType" minOccurs="0">
-							<annotation>
-								<documentation>ID of the output format to be used for the requested data. The supported output formats are listed in the selected offering capabilities.
-								</documentation>
-							</annotation>
-						</element>
-						<element name="resultModel" type="QName" minOccurs="0"/>
-						<element name="responseMode" type="sos:responseModeType" minOccurs="0">
-							<annotation>
-								<documentation>This element allows the client to request the form of the response.  The value of resultTemplate is used to retrieve an observation template 
-							that will later be used in calls to GetResult.  The other options allow results to appear inline in a resultTag (inline), external to the observation element (out-of-band)
-							or as a MIME attachment (attached)</documentation>
-							</annotation>
-						</element>
-					</sequence>
-					<attribute name="srsName" type="anyURI" use="optional"/>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetResult.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetResult.xsd
deleted file mode 100755
index de2bd52..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosGetResult.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the GetResult request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ogc" schemaLocation="http://schemas.opengis.net/sos/1.0.0/ogc4sos.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="GetResult">
-		<annotation>
-			<documentation>request to a SOS to perform a GetResult operation. this operation is designed to request sensor data from live sensors. Instead of retriveing the observations as a full OM document, you will get an simple value and a link to the reference system</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="ObservationTemplateId" type="anyURI">
-							<annotation>
-								<documentation>The gml:id of an previous GetObservation request response indicating observations from a certain sensor for a certain target.
-								</documentation>
-							</annotation>
-						</element>
-						<element name="eventTime" minOccurs="0" maxOccurs="unbounded">
-							<annotation>
-								<documentation>Allows a client to request observations from a specific instant, multiple instances or periods of time in the past, present and future. The supported range is listed in the selected offering capabilities.
-								</documentation>
-							</annotation>
-							<complexType>
-								<sequence>
-									<element ref="ogc:temporalOps"/>
-								</sequence>
-							</complexType>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ==============================================================
-		response
-	============================================================== -->
-	<element name="GetResultResponse">
-		<annotation>
-			<documentation>the response of a GetResult operation</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element name="result">
-					<annotation>
-						<documentation>RS attribute points to the description of the reference system of the result. The description will contain all information necessary to understand what is provided within the result response. The most simple case would be a single value.</documentation>
-					</annotation>
-					<complexType>
-						<simpleContent>
-							<extension base="string">
-								<attribute name="RS" type="anyURI" use="required"/>
-							</extension>
-						</simpleContent>
-					</complexType>
-				</element>
-			</sequence>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosInsert.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosInsert.xsd
deleted file mode 100755
index ad8792e..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosInsert.xsd
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Johannes Echterhoff (Westfälische Wilhelms-Universität Münster) -->
-<schema targetNamespace="http://www.opengis.net/sos/1.0" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:om="http://www.opengis.net/om/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-	<annotation>
-		<documentation>
-			<description>
-				This XML Schema defines the insert request and response XML elements and types.
-				
-				SOS is an OGC Standard.
-				Copyright (c) 2006,2010 Open Geospatial Consortium.
-				To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-			</description>
-		</documentation>
-	</annotation>
-	<!-- ==============================================================
-		includes and imports
-	============================================================== -->
-	<import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-	<import namespace="http://www.opengis.net/om/1.0" schemaLocation="http://schemas.opengis.net/om/1.0.0/om.xsd"/>
-	<include schemaLocation="sosAll.xsd"/>
-	<include schemaLocation="sosCommon.xsd"/>
-	<!-- ==============================================================
-		request
-	============================================================== -->
-	<element name="InsertObservation">
-		<annotation>
-			<documentation>Request to a SOS to perform the Insert operation. This operation is designed to insert new observations. The request is constraint by the following parameters: ID obtained by the registerSensor operation (identifying the sensor and the observyationType, and the observation encoded as OM</documentation>
-		</annotation>
-		<complexType>
-			<complexContent>
-				<extension base="sos:RequestBaseType">
-					<sequence>
-						<element name="AssignedSensorId" type="anyURI">
-							<annotation>
-								<documentation>The id obtained by the registerSensor operation.</documentation>
-							</annotation>
-						</element>
-						<element ref="om:Observation">
-							<annotation>
-								<documentation>The observation to be inserted to the SOS.</documentation>
-							</annotation>
-						</element>
-					</sequence>
-				</extension>
-			</complexContent>
-		</complexType>
-	</element>
-	<!-- ====================================================
-	response
-	=======================================================-->
-	<element name="InsertObservationResponse">
-		<annotation>
-			<documentation>returns the Id of the Observation assigend by the SOS</documentation>
-		</annotation>
-		<complexType>
-			<sequence>
-				<element name="AssignedObservationId" type="anyURI"/>
-			</sequence>
-		</complexType>
-	</element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosRegisterSensor.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosRegisterSensor.xsd
deleted file mode 100755
index cfc1fca..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sos/1.0.0/sosRegisterSensor.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:om="http://www.opengis.net/om/1.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.opengis.net/sos/1.0" elementFormDefault="qualified" version="1.0.0.2" xml:lang="en">
-  <!-- This version of sos/1.0.0 was previously versioned as '1.0.1' . -->
-  <annotation>
-    <documentation>
-      <description>
-        This XML Schema defines the registerSenor request and response XML elements and types.
-        
-        SOS is an OGC Standard.
-        Copyright (c) 2006,2010 Open Geospatial Consortium.
-        To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-      </description>
-    </documentation>
-  </annotation>
-  <!-- ==============================================================
-		includes and imports
-	============================================================== -->
-  <import namespace="http://www.opengis.net/ows/1.1" schemaLocation="http://schemas.opengis.net/ows/1.1.0/owsAll.xsd"/>
-  <import namespace="http://www.opengis.net/om/1.0" schemaLocation="http://schemas.opengis.net/om/1.0.0/om.xsd"/>
-  <include schemaLocation="sosAll.xsd"/>
-  <include schemaLocation="sosCommon.xsd"/>
-  <!-- ==============================================================
-		request
-	============================================================== -->
-  <element name="RegisterSensor">
-    <annotation>
-      <documentation>Request to a SOS to perform the registerSensor operation. This operation is designed to register new sensors at the SOS.</documentation>
-    </annotation>
-    <complexType>
-      <complexContent>
-        <extension base="sos:RequestBaseType">
-          <sequence>
-            <element name="SensorDescription">
-              <complexType>
-                <sequence>
-                  <any namespace="##other" processContents="lax"/>
-                </sequence>
-              </complexType>
-            </element>
-            <element ref="sos:ObservationTemplate"/>
-          </sequence>
-        </extension>
-      </complexContent>
-    </complexType>
-  </element>
-  <element name="ObservationTemplate">
-    <annotation>
-      <documentation>A template of the observations that will be inserted into the SOS.</documentation>
-    </annotation>
-    <complexType>
-      <sequence>
-        <element ref="om:Observation"/>
-      </sequence>
-    </complexType>
-  </element>
-  <!-- ====================================================
-	response
-	=======================================================-->
-  <element name="RegisterSensorResponse">
-    <annotation>
-      <documentation>returns the Id that is used in the insert operation to link the sensor to an Observation</documentation>
-    </annotation>
-    <complexType>
-      <sequence>
-        <element name="AssignedSensorId" type="anyURI"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/aggregateTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/aggregateTypes.xsd
deleted file mode 100755
index cc0a7a1..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/aggregateTypes.xsd
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>SWE Common schema for aggregate data types
-			
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<xs:include schemaLocation="./simpleTypes.xsd"/>
-	<xs:include schemaLocation="./encoding.xsd"/>
-	<!-- ================================================= -->
-	<!--         Composite/Aggregate Components - Records and arrays            -->
-	<!-- ================================================= -->
-	<xs:element name="AbstractDataRecord" type="swe:AbstractDataRecordType" abstract="true"/>
-	<!-- ........ -->
-	<xs:complexType name="AbstractDataRecordType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataComponentType"/>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="DataRecord" type="swe:DataRecordType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>Implementation of ISO-11404 Record datatype. This allows grouping of data components which can themselves be Records, Arrays or Simple Types</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="DataRecordType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataRecordType">
-				<xs:sequence>
-					<xs:element name="field" type="swe:DataComponentPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="DataRecordPropertyType">
-		<xs:annotation>
-			<xs:documentation>DataRecord is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:DataRecord"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="SimpleDataRecord" type="swe:SimpleDataRecordType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>Implementation of ISO-11404 Record datatype that takes only simple scalars (i.e. no data aggregates)</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="SimpleDataRecordType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataRecordType">
-				<xs:sequence>
-					<xs:element name="field" type="swe:AnyScalarPropertyType" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="SimpleDataRecordPropertyType">
-		<xs:annotation>
-			<xs:documentation>SimpleDataRecord is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:SimpleDataRecord"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="AbstractDataArray" type="swe:AbstractDataArrayType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Implemetation of ISO-11404 Array datatype. This defines an array of identical data components with a elementCount. Values are given as a block and can be encoded in different ways</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="AbstractDataArrayType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataComponentType">
-				<xs:sequence>
-					<xs:element name="elementCount">
-						<xs:annotation>
-							<xs:documentation>Specifies the size of the array (i.e. the number of elements of the defined type it contains)</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:sequence minOccurs="0">
-								<xs:element ref="swe:Count">
-									<!-- Should this really be swe:Count rather than xs:integer??? -->
-								</xs:element>
-								<!-- maxOccurs="unbounded" to support multiple dimensions? -->
-							</xs:sequence>
-							<xs:attribute name="ref" type="xs:IDREF">
-								<xs:annotation>
-									<xs:documentation>If present, the array size is variable and should be obtained from the referenced component.
-			                    The referenced component must occur before the array values in a data stream to allow parsing.</xs:documentation>
-								</xs:annotation>
-							</xs:attribute>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="DataArray" type="swe:DataArrayType" substitutionGroup="swe:AbstractDataArray">
-		<xs:annotation>
-			<xs:documentation>Implemetation of ISO-11404 Array datatype. This defines an array of identical data components with a elementCount. Values are given as a block and can be encoded in different ways</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="DataArrayType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataArrayType">
-				<xs:sequence>
-					<xs:element name="elementType" type="swe:DataComponentPropertyType"/>
-					<xs:group ref="swe:EncodedValuesGroup" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="DataArrayPropertyType">
-		<xs:annotation>
-			<xs:documentation>DataArray is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:DataArray"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="DataValuePropertyType">
-		<xs:annotation>
-			<xs:documentation>Use to point or include data values inline</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="xs:anyType">
-				<xs:attribute name="recordCount" type="xs:positiveInteger"/>
-				<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!--         Conditionals            -->
-	<!-- ================================================= -->
-	<xs:element name="ConditionalData" type="swe:ConditionalDataType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>List of Conditional Values for a property</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="ConditionalDataType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataRecordType">
-				<xs:sequence>
-					<xs:element name="case" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element ref="swe:ConditionalValue" minOccurs="0"/>
-							</xs:sequence>
-							<xs:attribute name="name" type="xs:token" use="required"/>
-							<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractConditionalType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataRecordType">
-				<xs:sequence>
-					<xs:element name="condition" maxOccurs="unbounded">
-						<xs:annotation>
-							<xs:documentation>Specifies one or more conditions for which the given value is valid</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:group ref="swe:AnyData" minOccurs="0"/>
-							<xs:attribute name="name" type="xs:token" use="required"/>
-							<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="ConditionalValue" type="swe:ConditionalValueType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>Qualifies data (scalar or not) with one or more conditions</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="ConditionalValueType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractConditionalType">
-				<xs:sequence>
-					<xs:element name="data">
-						<xs:complexType>
-							<xs:group ref="swe:AnyData" minOccurs="0"/>
-							<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!--               Data Component Groups               -->
-	<!-- ================================================= -->
-	<xs:group name="AnyData">
-		<xs:choice>
-			<xs:group ref="swe:AnyScalar"/>
-			<xs:group ref="swe:AnyRange"/>
-			<xs:element ref="swe:AbstractDataRecord"/>
-			<xs:element ref="swe:AbstractDataArray"/>
-		</xs:choice>
-	</xs:group>
-	<!-- ........ -->
-	<xs:complexType name="DataComponentPropertyType">
-		<xs:annotation>
-			<xs:documentation>Complex Type for all properties taking the AnyData Group with a "name" key</xs:documentation>
-		</xs:annotation>
-		<xs:group ref="swe:AnyData" minOccurs="0"/>
-		<xs:attribute name="name" type="xs:token" use="required"/>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="AnyDataPropertyType">
-		<xs:annotation>
-			<xs:documentation>Complex Type for all properties taking the AnyData Group</xs:documentation>
-		</xs:annotation>
-		<xs:group ref="swe:AnyData" minOccurs="0"/>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:group name="EncodedValuesGroup">
-		<xs:sequence>
-			<xs:element name="encoding" type="swe:BlockEncodingPropertyType">
-				<xs:annotation>
-					<xs:documentation>Specifies an encoding for the data structure defined by the enclosing element</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="values" type="swe:DataValuePropertyType" minOccurs="0">
-				<xs:annotation>
-					<xs:documentation>Carries the block of values encoded as specified by the encoding element</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:group>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/basicTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/basicTypes.xsd
deleted file mode 100755
index 2645253..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/basicTypes.xsd
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>basicTypes.xsd
-	Some basic types (simpleContent) required in various places in OWS Sensor Web application schemas
-	
-	Copyright (c) 2007,2010 Open Geospatial Consortium.
-	To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ====================================================================== -->
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<!-- ====================================================================== -->
-	<!-- === Units of Measure === -->
-	<!-- ====================================================================== -->
-	<xs:simpleType name="UomSymbol">
-		<xs:annotation>
-			<xs:documentation>Local copy of GML 3.2 uom symbol definition
-			Included for forward compatibility. 
-			Note: in future of this specification based on GML 3.2, these will be removed in favour of the GML 3.2 implementation</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[^: \n\r\t]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:simpleType name="UomURI">
-		<xs:annotation>
-			<xs:documentation>Local copy of GML 3.2 uom URI definition</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:anyURI">
-			<xs:pattern value="([a-zA-Z][a-zA-Z0-9\-\+\.]*:|\.\./|\./|#).*"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:simpleType name="UomIdentifier">
-		<xs:annotation>
-			<xs:documentation>Local copy of GML 3.2 uom identifier definition</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="swe:UomSymbol swe:UomURI"/>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:complexType name="UomPropertyType">
-		<xs:annotation>
-			<xs:documentation>Property type that indicates unit-of-measure, either by (i) inline definition; (ii)  reference; (iii)  UCUM code</xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element ref="gml:UnitDefinition">
-				<xs:annotation>
-					<xs:documentation>Defines a unit inline</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="code" type="swe:UomSymbol">
-			<xs:annotation>
-				<xs:documentation>Specifies a unit by using a UCUM expression (prefered)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup">
-			<xs:annotation>
-				<xs:documentation>Specifies a unit by referencing a dictionary entry (to be used only for units not defined in UCUM)</xs:documentation>
-			</xs:annotation>
-		</xs:attributeGroup>
-	</xs:complexType>
-	<!-- ====================================================================== -->
-	<!-- === Code space/vocabulary === -->
-	<!-- ====================================================================== -->
-   <xs:complexType name="CodeSpacePropertyType">
-      <xs:annotation>
-         <xs:documentation>Property type that indicates the codespace</xs:documentation>
-      </xs:annotation>
-      <xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-   </xs:complexType>
-	<!-- ====================================================================== -->
-	<!-- === Time position === -->
-	<!-- overlaps with GML TimePositionType -->
-	<!-- ====================================================================== -->
-	<xs:simpleType name="timeIso8601">
-		<xs:annotation>
-			<xs:documentation>Choice of time position encodings, not including numeric representation. 
-	      A minor variation on gml:TimePositionUnion - carrying "indeterminate value" as content instead of an attribute.</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="xs:date xs:time xs:dateTime gml:TimeIndeterminateValueType"/>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:simpleType name="timePositionType">
-		<xs:annotation>
-			<xs:documentation>Choice of time position encodings, including numeric representation but no frame. 
-	A minor variation on gml:TimePositionUnion - carrying "indeterminate value" as content instead of an attribute. </xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="swe:timeIso8601 xs:double"/>
-	</xs:simpleType>
-	<!-- ====================================================================== -->
-	<!-- === Scoped Name === -->
-	<!-- equivalent to GML 3.2 CodeWithAuthorityType -->
-	<!-- ====================================================================== -->
-	<xs:complexType name="ScopedNameType">
-		<xs:annotation>
-			<xs:documentation>Explicit implementation of ISO 19103 ScopedName. 
-			Extension of string which also carries a codeSpace attribute.
-			Note: in future versions of this specification based on GML 3.2, this will be removed in favour of gml:CodeWithAuthorityType. </xs:documentation>
-		</xs:annotation>
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="codeSpace" type="xs:anyURI" use="required"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- ====================================================================== -->
-	<!-- === Lists === -->
-	<!-- ================================================= -->
-	<xs:simpleType name="decimalList">
-		<xs:annotation>
-			<xs:documentation>Simple list of double-precision numbers. 
-	Note: xs:double supports either decimal or scientific notation</xs:documentation>
-		</xs:annotation>
-		<xs:list itemType="xs:double"/>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:simpleType name="decimalPair">
-		<xs:annotation>
-			<xs:documentation>Pair of double-precision numbers. 
-	Note: xs:double supports either decimal or scientific notation</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="swe:decimalList">
-			<xs:length value="2"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:simpleType name="countList">
-		<xs:annotation>
-			<xs:documentation>Simple list of integers. </xs:documentation>
-		</xs:annotation>
-		<xs:list itemType="xs:integer"/>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:simpleType name="countPair">
-		<xs:annotation>
-			<xs:documentation>Pair of integers. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="swe:countList">
-			<xs:length value="2"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:simpleType name="tokenList">
-		<xs:annotation>
-			<xs:documentation>Simple list of tokens. 
-			Note: xs:token is a string with no embedded white-space allowed</xs:documentation>
-		</xs:annotation>
-		<xs:list itemType="xs:token"/>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:simpleType name="timeList">
-		<xs:annotation>
-			<xs:documentation>Simple list of time positions. </xs:documentation>
-		</xs:annotation>
-		<xs:list itemType="swe:timePositionType"/>
-	</xs:simpleType>
-	<!-- ............ -->
-	<xs:simpleType name="timePair">
-		<xs:annotation>
-			<xs:documentation>Pair of time positions. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="swe:timeList">
-			<xs:length value="2"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ====================================================================== -->
-	<!-- === Generic Interval === -->
-	<!-- ====================================================================== -->
-	<xs:complexType name="IntervalType">
-		<xs:annotation>
-			<xs:documentation>A generic interval. The type of the two limits will normally be the same.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="lowerBound">
-				<xs:annotation>
-					<xs:documentation>Implicit xs:anyType</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="upperBound">
-				<xs:annotation>
-					<xs:documentation>Implicit xs:anyType</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ................ -->
-	<xs:element name="Interval" type="swe:IntervalType">
-		<xs:annotation>
-			<xs:documentation>A generic interval. The type of the two limits will normally be the same.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ................ -->
-	<xs:complexType name="IntervalPropertyType">
-		<xs:annotation>
-			<xs:documentation>Inline property type for generic intervals</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Interval"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ====================================================================== -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/curveTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/curveTypes.xsd
deleted file mode 100755
index 2fd9e62..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/curveTypes.xsd
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Schema for defining different types of curves based on aggregate data types
-			
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<xs:include schemaLocation="./aggregateTypes.xsd"/>
-	<!-- ================================================= -->
-	<!--                  Curve Components                 -->
-	<!-- ================================================= -->
-	<xs:element name="Curve" type="swe:CurveType" substitutionGroup="swe:AbstractDataArray">
-		<xs:annotation>
-			<xs:documentation>Curve describing variations of a parameter vs. another quantity</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="CurveType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataArrayType">
-				<xs:sequence>
-					<xs:element name="elementType" type="swe:SimpleDataRecordPropertyType"/>
-					<xs:group ref="swe:EncodedValuesGroup" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="CurvePropertyType">
-		<xs:annotation>
-			<xs:documentation>Curve is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Curve"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="NormalizedCurve" type="swe:NormalizedCurveType" substitutionGroup="swe:AbstractDataRecord"/>
-	<xs:complexType name="NormalizedCurveType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataRecordType">
-				<xs:sequence>
-					<xs:element name="inputGain" type="swe:QuantityPropertyType" minOccurs="0"/>
-					<xs:element name="inputBias" type="swe:QuantityPropertyType" minOccurs="0"/>
-					<xs:element name="outputGain" type="swe:QuantityPropertyType" minOccurs="0"/>
-					<xs:element name="outputBias" type="swe:QuantityPropertyType" minOccurs="0"/>
-					<xs:element name="interpolationMethod" type="swe:CategoryPropertyType" minOccurs="0"/>
-					<xs:element name="extrapolationMethod" type="swe:CategoryPropertyType" minOccurs="0"/>
-					<xs:element name="function" type="swe:CurvePropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!--               Data Component Groups               -->
-	<!-- ================================================= -->
-	<xs:group name="Curves">
-		<xs:choice>
-			<xs:element ref="swe:Curve"/>
-			<xs:element ref="swe:NormalizedCurve"/>
-		</xs:choice>
-	</xs:group>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/data.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/data.xsd
deleted file mode 100755
index 6cea4c1..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/data.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:swe="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Schema allowing definition of structure and encoding of sensor data. Multiplexed streams can also be described
-		   
-		   Copyright (c) 2007,2010 Open Geospatial Consortium.
-		   To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-   <!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<xs:include schemaLocation="./aggregateTypes.xsd"/>
-   <!-- ================================================= -->
-   <xs:element name="DataBlockDefinition" type="swe:DataBlockDefinitionType"/>
-	<!-- ........ -->
-   <xs:complexType name="DataBlockDefinitionType">
-		<xs:sequence>
-		   <xs:element name="components" type="swe:DataComponentPropertyType"/>
-		   <xs:element name="encoding" type="swe:BlockEncodingPropertyType"/>
-		</xs:sequence>
-		<xs:attribute name="id" type="xs:ID" use="optional"/>
-   </xs:complexType>
-	<!-- ........ -->
-   <xs:complexType name="DataBlockDefinitionPropertyType">
-      <xs:sequence minOccurs="0">
-         <xs:element ref="swe:DataBlockDefinition"/>
-      </xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-   </xs:complexType>
-   <!-- ================================================= -->
-   <xs:element name="DataStreamDefinition" type="swe:DataStreamDefinitionType"/>
-	<!-- ........ -->
-   <xs:complexType name="DataStreamDefinitionType">
-      <xs:sequence>
-         <xs:element name="streamComponent" type="swe:DataBlockDefinitionPropertyType" maxOccurs="unbounded"/>
-         <xs:element name="streamEncoding" type="swe:MultiplexedStreamFormatPropertyType"/>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID" use="optional"/>
-   </xs:complexType>
-	<!-- ........ -->
-   <xs:complexType name="DataStreamDefinitionPropertyType">
-      <xs:sequence minOccurs="0">
-         <xs:element ref="swe:DataStreamDefinition"/>
-      </xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-   </xs:complexType> 
-   <!-- ================================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/encoding.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/encoding.xsd
deleted file mode 100755
index 31d4a0a..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/encoding.xsd
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:swe="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Defines basic ResponseType definition and commonly used sensor characteristics
-			
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<!-- ================================================= -->
-	<xs:complexType name="BlockEncodingPropertyType">
-		<xs:choice minOccurs="0">
-			<xs:element ref="swe:StandardFormat"/>
-			<xs:element ref="swe:BinaryBlock"/>
-			<xs:element ref="swe:TextBlock"/>
-			<xs:element ref="swe:XMLBlock"/>
-		</xs:choice>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractEncodingType">
-		<xs:attribute name="id" type="xs:ID"/>
-		<!-- why bother with the supertype? Not used to form a substitution group. -->
-		<!--->Remember - attributes are Optional by default -->
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ================================================= -->
-	<xs:element name="StandardFormat">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractEncodingType">
-					<xs:attribute name="mimeType" type="xs:token" use="required"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<!-- ================================================= -->
-	<xs:element name="TextBlock">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractEncodingType">
-					<xs:attribute name="tokenSeparator" type="swe:textSeparator" use="required"/>
-					<xs:attribute name="blockSeparator" type="swe:textSeparator" use="required"/>
-					<xs:attribute name="decimalSeparator" type="swe:decimalSeparator" use="required"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:simpleType name="textSeparator">
-		<xs:annotation>
-			<xs:documentation>Max three characters to use as token or block separator</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="3"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:simpleType name="decimalSeparator">
-		<xs:annotation>
-			<xs:documentation>One character to use as a decimal separator</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:length value="1"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<!-- ================================================= -->
-	<xs:element name="BinaryBlock">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractEncodingType">
-					<xs:sequence>
-						<xs:element name="member" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:choice>
-									<xs:element name="Component">
-										<xs:complexType>
-											<xs:attribute name="ref" type="xs:token" use="required"/>
-											<xs:attribute name="dataType" type="xs:anyURI" use="optional"/>
-											<xs:attribute name="significantBits" type="xs:positiveInteger" use="optional"/>
-											<xs:attribute name="bitLength" type="xs:positiveInteger" use="optional"/>
-											<xs:attribute name="paddingBits-before" type="xs:nonNegativeInteger" use="optional" default="0"/>
-											<xs:attribute name="paddingBits-after" type="xs:nonNegativeInteger" use="optional" default="0"/>
-											<xs:attribute name="encryption" type="xs:anyURI" use="optional"/>
-										</xs:complexType>
-									</xs:element>
-									<xs:element name="Block">
-										<xs:complexType>
-											<xs:attribute name="ref" type="xs:token" use="required"/>
-											<xs:attribute name="byteLength" type="xs:positiveInteger" use="optional"/>
-											<xs:attribute name="paddingBytes-before" type="xs:nonNegativeInteger" use="optional" default="0"/>
-											<xs:attribute name="paddingBytes-after" type="xs:nonNegativeInteger" use="optional" default="0"/>
-											<xs:attribute name="encryption" type="xs:anyURI" use="optional"/>
-											<xs:attribute name="compression" type="xs:anyURI" use="optional"/>
-										</xs:complexType>
-									</xs:element>
-								</xs:choice>
-							</xs:complexType>
-						</xs:element>
-					</xs:sequence>
-					<xs:attribute name="byteLength" type="xs:positiveInteger" use="optional"/>
-					<xs:attribute name="byteEncoding" type="swe:byteEncoding" use="required"/>
-					<xs:attribute name="byteOrder" type="swe:byteOrder" use="required"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:simpleType name="byteEncoding">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="base64"/>
-			<xs:enumeration value="raw"/>
-			<xs:enumeration value="hex"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:simpleType name="byteOrder">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="bigEndian"/>
-			<xs:enumeration value="littleEndian"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- ================================================= -->
-	<xs:element name="MultiplexedStreamFormat" type="swe:MultiplexedStreamFormatType">
-		<xs:annotation>
-			<xs:documentation>Allows specification of the stream/packaging format used (ex: RTP, ASF, AAF, TML...)</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="MultiplexedStreamFormatType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractEncodingType">
-				<xs:attribute name="type" type="xs:anyURI" use="required"/>
-				<xs:attribute name="version" type="xs:string" use="required"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="MultiplexedStreamFormatPropertyType">
-		<xs:sequence>
-			<xs:element ref="swe:MultiplexedStreamFormat" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ================================================= -->
-	<xs:element name="XMLBlock" type="swe:XMLBlockType">
-		<xs:annotation>
-			<xs:documentation>Carries the designator for an element implementing an XML-encoded data-type</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="XMLBlockType">
-		<xs:annotation>
-			<xs:documentation>Carries the designator for an element implementing an XML-encoded data-type</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractEncodingType">
-				<xs:attribute name="xmlElement" type="xs:QName">
-					<xs:annotation>
-						<xs:documentation>May be any XML Schema defined global element. 
-		typically this will be swe:Array, swe:Record, cv:CV_DiscreteCoverage, etc</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/phenomenon.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/phenomenon.xsd
deleted file mode 100755
index 2126692..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/phenomenon.xsd
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<annotation>
-		<documentation>phenomenon.xsd
-			
-	A GML conformant schema 
-	for definitions of phenomena, per Annex C of OM specification
-	
-	Copyright (c) 2007,2010 Open Geospatial Consortium.
-	To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<include schemaLocation="./swe.xsd"/>
-	<include schemaLocation="./aggregateTypes.xsd"/>
-	<!-- ====================================================================== -->
-	<complexType name="PhenomenonType">
-		<annotation>
-			<documentation>Basic Phenomenon definition, and head of substitution group of specialized phenomenon defs. 
-			gml:description may be used for a more extensive description of the semantics, with a link to a definitive version (if available).  
-			gml:name should be used for the name or label.
-			
-			Note: In GML 3.2 the gml:identifier element should be used for the identifier assigned by or preferred by the data provider. 
-			This identifier will typically be in the form of a URN, for example following the OGC URN scheme
-			e.g. urn:x-ogc:def:phenomenon:OGC:Age
-			</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:DefinitionType"/>
-		</complexContent>
-	</complexType>
-	<!-- .......... -->
-	<element name="Phenomenon" type="swe:PhenomenonType" substitutionGroup="gml:Definition">
-		<annotation>
-			<documentation>Basic Phenomenon definition, and head of substitution group of specialized phenomenon defs. </documentation>
-		</annotation>
-	</element>
-	<!-- .......... -->
-	<complexType name="PhenomenonPropertyType">
-		<sequence minOccurs="0">
-			<element ref="swe:Phenomenon"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ====================================================================== -->
-	<complexType name="ConstrainedPhenomenonType">
-		<annotation>
-			<documentation>A scalar Phenomenon is defined by adding constraints to an existing property.</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="swe:PhenomenonType">
-				<sequence>
-					<element name="base" type="swe:PhenomenonPropertyType">
-						<annotation>
-							<documentation>Property that forms the basis for generating a set of more refined Phenomena; e.g. Chemical Composition, Radiance</documentation>
-						</annotation>
-					</element>
-					<element name="otherConstraint" type="string" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Constraints that cannot be expressed as values of an orthogonal/helper phenomenon</documentation>
-						</annotation>
-					</element>
-					<element name="singleConstraint" type="swe:AnyDataPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Constraint expressed as a value or range of an orthogonal/helper phenomenon</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ........................................ -->
-	<element name="ConstrainedPhenomenon" type="swe:ConstrainedPhenomenonType" substitutionGroup="swe:Phenomenon">
-		<annotation>
-			<documentation>Description of a scalar Phenomenon defined by adding constraints to a property previously defined elsewhere.</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-	<complexType name="CompoundPhenomenonType" abstract="true">
-		<annotation>
-			<documentation>Description of a set of Phenomena.  
-	  CompoundPhenomenon is the abstract head of a substitution group of specialized compound phenomena</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="swe:PhenomenonType">
-				<attribute name="dimension" type="positiveInteger" use="required">
-					<annotation>
-						<documentation>The number of components in the tuple</documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ........................................ -->
-	<element name="CompoundPhenomenon" type="swe:CompoundPhenomenonType" abstract="true" substitutionGroup="swe:Phenomenon">
-		<annotation>
-			<documentation>Description of a set of Phenomena.  
-	  CompoundPhenomenon is the abstract head of a substitution group of specialized compound phenomena</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<complexType name="CompositePhenomenonType">
-		<annotation>
-			<documentation>A Phenomenon defined as a set of explicitly enumerated components which may or may not be related to one another</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="swe:CompoundPhenomenonType">
-				<sequence>
-					<element name="base" type="swe:PhenomenonPropertyType" minOccurs="0">
-						<annotation>
-							<documentation>Optional phenomenon that forms the basis for generating more specialized composite Phenomenon by adding more components</documentation>
-						</annotation>
-					</element>
-					<element name="component" type="swe:PhenomenonPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ........................................ -->
-	<element name="CompositePhenomenon" type="swe:CompositePhenomenonType" substitutionGroup="swe:CompoundPhenomenon">
-		<annotation>
-			<documentation>A Phenomenon defined as a set of explicitly enumerated components which may or may not be related to one another</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<complexType name="PhenomenonSeriesType">
-		<annotation>
-			<documentation>A phenomenon defined as a base property convolved with a set of constraints
-      The set of constraints may be either
-      * an explicit set of soft-typed measures, intervals and categories
-      * one or more lists of soft-typed measures, intervals and categories
-      * one or more sequences of soft-typed measures and intervals</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="swe:CompoundPhenomenonType">
-				<sequence>
-					<element name="base" type="swe:PhenomenonPropertyType">
-						<annotation>
-							<documentation>Phenomenon that forms the basis for generating a set of more refined Phenomena; e.g. Chemical Composition, Radiance</documentation>
-						</annotation>
-					</element>
-					<element name="constraintList" type="swe:DataArrayPropertyType" maxOccurs="unbounded">
-						<annotation>
-							<documentation>A set of values of some secondary property that constraints the basePhenomenon to generate a Phenomenon set.  
-							If more than one set of constraints are possible, then these are applied simultaneously to generate</documentation>
-						</annotation>
-					</element>
-					<element name="otherConstraint" type="string" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Other constraints are described in text</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ........................................ -->
-	<element name="PhenomenonSeries" type="swe:PhenomenonSeriesType" substitutionGroup="swe:CompoundPhenomenon">
-		<annotation>
-			<documentation>A phenomenon defined as a base property convolved with a set of constraints
-      The set of constraints may be either
-      * an explicit set of soft-typed measures, intervals and categories
-      * one or more lists of soft-typed measures, intervals and categories
-      * one or more sequences of soft-typed measures and intervals</documentation>
-		</annotation>
-	</element>
-	<!-- ====================================================================== -->
-	<!-- ====================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/positionTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/positionTypes.xsd
deleted file mode 100755
index 037236b..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/positionTypes.xsd
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:gml="http://www.opengis.net/gml" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>Schema for defining position data (location, orientation, etc...) based on aggregate data types
-			
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<xs:include schemaLocation="./aggregateTypes.xsd"/>
-	<!-- ================================================= -->
-	<xs:element name="Position" type="swe:PositionType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>Position is given as a group of Vectors/Matrices, each of which can specify location, orientation, velocity, angularVelocity, acceleration or angularAcceleration or a combination of those in a composite state Vector. Each Vector can have a separate frame of reference or inherit the frame from the parent Position object.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="PositionType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractVectorType">
-				<xs:sequence>
-					<xs:element name="time" type="swe:TimePropertyType" minOccurs="0"/>
-					<xs:element name="location" type="swe:VectorPropertyType" minOccurs="0"/>
-					<xs:element name="orientation" type="swe:VectorOrSquareMatrixPropertyType" minOccurs="0"/>
-					<xs:element name="velocity" type="swe:VectorPropertyType" minOccurs="0"/>
-					<xs:element name="angularVelocity" type="swe:VectorOrSquareMatrixPropertyType" minOccurs="0"/>
-					<xs:element name="acceleration" type="swe:VectorPropertyType" minOccurs="0"/>
-					<xs:element name="angularAcceleration" type="swe:VectorOrSquareMatrixPropertyType" minOccurs="0"/>
-					<xs:element name="state" type="swe:VectorOrSquareMatrixPropertyType" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractMatrixType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataArrayType">
-				<xs:attribute name="referenceFrame" type="xs:anyURI" use="optional">
-					<xs:annotation>
-						<xs:documentation>Points to a spatial reference frame definition. Coordinates of the vector will be expressed in this reference frame</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="localFrame" type="xs:anyURI" use="optional">
-					<xs:annotation>
-						<xs:documentation>Specifies the spatial frame which location and/or orientation is given by the enclosing vector</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="SquareMatrix" type="swe:SquareMatrixType" substitutionGroup="swe:AbstractDataArray">
-		<xs:annotation>
-			<xs:documentation>This is a square matrix (so the size is the square of one dimension) which is a DataArray of Quantities. 		It has a referenceFrame in which the matrix components are described</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="SquareMatrixType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractMatrixType">
-				<xs:sequence>
-					<xs:element name="elementType" type="swe:QuantityPropertyType"/>
-					<xs:group ref="swe:EncodedValuesGroup" minOccurs="0"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="VectorOrSquareMatrixPropertyType">
-		<xs:annotation>
-			<xs:documentation>Vector/SquareMatrix is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element ref="swe:Vector"/>
-			<xs:element ref="swe:SquareMatrix"/>
-		</xs:choice>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- Areas and Envelopes -->
-	<!-- ================================================= -->
-	<xs:element name="GeoLocationArea" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>Area used to define bounding boxes</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractVectorType">
-					<xs:sequence>
-						<xs:element name="member" type="swe:EnvelopePropertyType" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>Is this an aggregate geometry?</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-					<xs:attribute name="name" type="xs:token"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:element name="Envelope" type="swe:EnvelopeType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>Envelope described using two vectors specifying lower and upper corner points.
-           This is typically use to define rectangular bounding boxes in any coordinate system.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="EnvelopeType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractVectorType">
-				<xs:sequence>
-					<xs:element name="time" type="swe:TimeRangePropertyType" minOccurs="0">
-						<xs:annotation>
-							<xs:documentation>Optionally provides time range during which this bounding envelope applies</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="lowerCorner" type="swe:VectorPropertyType"/>
-					<xs:element name="upperCorner" type="swe:VectorPropertyType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="EnvelopePropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="swe:Envelope"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!--         Composite/Aggregate Components - Vectors and Matrices            -->
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractVectorType" abstract="true">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractDataRecordType">
-				<xs:attribute name="referenceFrame" type="xs:anyURI" use="optional">
-					<xs:annotation>
-						<xs:documentation>Points to a spatial reference frame definition. Coordinates of the vector will be expressed in this reference frame</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="localFrame" type="xs:anyURI" use="optional">
-					<xs:annotation>
-						<xs:documentation>Specifies the spatial frame which location and/or orientation is given by the enclosing vector</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="Vector" type="swe:VectorType" substitutionGroup="swe:AbstractDataRecord">
-		<xs:annotation>
-			<xs:documentation>A Vector is a special type of DataRecord that takes a list of numerical scalars called coordinates. The Vector has a referenceFrame in which the coordinates are expressed</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-	<!-- ............... -->
-	<xs:complexType name="VectorType">
-		<xs:complexContent>
-			<xs:extension base="swe:AbstractVectorType">
-				<xs:sequence>
-					<xs:element name="coordinate" maxOccurs="unbounded">
-						<xs:complexType>
-							<xs:group ref="swe:AnyNumerical" minOccurs="0"/>
-							<xs:attribute name="name" type="xs:token" use="required"/>
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:complexType name="VectorPropertyType">
-		<xs:annotation>
-			<xs:documentation>Vector is a data-type so usually appears "by value" rather than by reference. However, by reference is still useful when objects, for instance, share a location.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence minOccurs="0">
-			<xs:element ref="swe:Vector"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ================================================= -->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/simpleTypes.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/simpleTypes.xsd
deleted file mode 100755
index e462af3..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/simpleTypes.xsd
+++ /dev/null
@@ -1,659 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>SWE common schema for simple data types (i.e. without children)		
-
-		These have mostly been implemented using the "composition" pattern, rather than using inheritance/type-derivation. 
-Note: In general, content model definition using composition is more easily accomplished using groups and attribute groups.
-			* global/named type definitions are not needed unless type derivation is required. 
-			* type derivation is not needed unless substitution groups are to be supported. 
-			* parent types that are too generalized will require derivation by restriction further down, so should be avoided.
-
-		Copyright (c) 2007,2010 Open Geospatial Consortium.
-		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!-- ================================================= -->
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
-	<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<xs:include schemaLocation="./swe.xsd"/>
-	<xs:include schemaLocation="./basicTypes.xsd"/>
-	<!-- ================================================= -->
-	<!-- === Root class model === -->
-	<!-- ================================================= -->
-	<xs:complexType name="AbstractDataComponentType" abstract="true">
-		<xs:annotation>
-			<xs:documentation>Base type for all data components. 
-			This is implemented as an XML Schema complexType because it includes both element and attribute content.</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="gml:AbstractGMLType">
-				<xs:attribute name="fixed" type="xs:boolean" use="optional" default="false">
-					<xs:annotation>
-						<xs:documentation>Specifies if the value of a component stays fixed in time or is variable. Default is variable</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="definition" type="xs:anyURI" use="optional">
-					<xs:annotation>
-						<xs:documentation>Points to semantics information defining the precise nature of the component</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!--                 Simple Components                 -->
-	<!-- ================================================= -->
-	<xs:attributeGroup name="SimpleComponentAttributeGroup">
-		<xs:annotation>
-			<xs:documentation>Basic attributes required for all simple data components (i.e. without children)</xs:documentation>
-		</xs:annotation>
-		<xs:attribute name="referenceFrame" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>A reference frame anchors a value to a datum or interval scale</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="axisID" type="xs:token" use="optional">
-			<xs:annotation>
-				<xs:documentation>Specifies the reference axis using the gml:axisID. The reference frame URI is inherited from parent Vector</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<!-- ================================================= -->
-	<!-- ======== Booleans ============= -->
-	<!-- ================================================= -->
-	<xs:element name="Boolean">
-		<xs:annotation>
-			<xs:documentation>Scalar component used to express truth: True or False, 0 or 1</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="xs:boolean" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:SimpleComponentAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="BooleanPropertyType">
-		<xs:annotation>
-			<xs:documentation>Boolean is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Boolean"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ======== Quantities ============= -->
-	<!-- ================================================= -->
-	<xs:element name="Quantity">
-		<xs:annotation>
-			<xs:documentation>Decimal number with optional unit and constraints</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="uom" type="swe:UomPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Unit of measure</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="constraint" type="swe:AllowedValuesPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as a range or enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="xs:double" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:SimpleComponentAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="QuantityPropertyType">
-		<xs:annotation>
-			<xs:documentation>Quantity is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Quantity"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="QuantityRange">
-		<xs:annotation>
-			<xs:documentation>Decimal pair for specifying a quantity range with constraints</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="uom" type="swe:UomPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Unit of measure</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="constraint" type="swe:AllowedValuesPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as a range or enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="swe:decimalPair" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<!-- *** Maybe cleaner to implement as a pair of value elements? *** -->
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:SimpleComponentAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="QuantityRangePropertyType">
-		<xs:annotation>
-			<xs:documentation>QuantityRange is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:QuantityRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="Count">
-		<xs:annotation>
-			<xs:documentation>Integer number used for a counting value</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="constraint" type="swe:AllowedValuesPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as a range or enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="xs:integer" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<!--
-						<xs:element name="uom" type="swe:UomPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Unit of measure</xs:documentation>
-							</xs:annotation> 
-						If there is a UOM then it is a scaled Quantity, not a Count. 
-						</xs:element>
-						-->
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:SimpleComponentAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="CountPropertyType">
-		<xs:annotation>
-			<xs:documentation>Count is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Count"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="CountRange">
-		<xs:annotation>
-			<xs:documentation>Integer pair used for specifying a count range</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="constraint" type="swe:AllowedValuesPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as a range or enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="swe:countPair" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-							<!-- *** Maybe cleaner to implement as a pair of value elements? *** -->
-						</xs:element>
-						<!--
-						<xs:element name="uom" type="swe:UomPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Unit of measure</xs:documentation>
-							</xs:annotation> 
-						If there is a UOM then it is a scaled Quantity, not a Count. 
-						</xs:element>
-						-->
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:SimpleComponentAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="CountRangePropertyType">
-		<xs:annotation>
-			<xs:documentation>CountRange is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:CountRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ======== Categories ============= -->
-	<!-- ================================================= -->
-	<xs:element name="Category">
-		<xs:annotation>
-			<xs:documentation>A simple token identifying a term or category (single spaces allowed); definition attribute should provide dictionary entry useful for interpretation of the value</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="codeSpace" type="swe:CodeSpacePropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Provides link to dictionary or rule set to which the value belongs</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="constraint" type="swe:AllowedTokensPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as an enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="xs:token" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:SimpleComponentAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="CategoryPropertyType">
-		<xs:annotation>
-			<xs:documentation>Category is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Category"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ========== Time Components ======== -->
-	<!-- ================================================= -->
-	<xs:attributeGroup name="TRSAttributeGroup">
-		<xs:attribute name="referenceTime" type="swe:timeIso8601" use="optional">
-			<xs:annotation>
-				<xs:documentation>Specifies the origin of the temporal reference frame as an ISO8601 date (used to specify time after an epoch)</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="referenceFrame" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>Points to a temporal reference frame definition. Time value will be expressed relative to this frame</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-		<xs:attribute name="localFrame" type="xs:anyURI" use="optional">
-			<xs:annotation>
-				<xs:documentation>Specifies the temporal frame which origin is given by this time component</xs:documentation>
-			</xs:annotation>
-		</xs:attribute>
-	</xs:attributeGroup>
-	<!-- ================================================= -->
-	<xs:element name="Time">
-		<xs:annotation>
-			<xs:documentation>Either ISO 8601 (e.g. 2004-04-18T12:03:04.6Z) or time relative to a time origin</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="uom" type="swe:UomPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Unit of measure</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="constraint" type="swe:AllowedTimesPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as a range or enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="swe:timePositionType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:TRSAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="TimePropertyType">
-		<xs:annotation>
-			<xs:documentation>Time is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Time"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:element name="TimeRange">
-		<xs:annotation>
-			<xs:documentation>Time value pair for specifying a time range (can be a decimal or ISO 8601)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="uom" type="swe:UomPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Unit of measure</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="constraint" type="swe:AllowedTimesPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The constraint property defines the permitted values, as a range or enumerated list</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="quality" type="swe:QualityPropertyType" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>The quality property provides an indication of the reliability of estimates of the asociated value</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="value" type="swe:timePair" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-							<!-- *** Maybe cleaner to implement as a pair of value elements? *** -->
-						</xs:element>
-					</xs:sequence>
-					<xs:attributeGroup ref="swe:TRSAttributeGroup"/>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="TimeRangePropertyType">
-		<xs:annotation>
-			<xs:documentation>TimeRange is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:TimeRange"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ======== Text Object  ============= -->
-	<!-- ================================================= -->
-	<xs:element name="Text">
-		<xs:annotation>
-			<xs:documentation>Free textual component</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType">
-					<xs:sequence>
-						<xs:element name="value" type="xs:string" minOccurs="0">
-							<xs:annotation>
-								<xs:documentation>Value is optional, to enable structure to act in a schema for values provided using other encodings</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ........ -->
-	<xs:complexType name="TextPropertyType">
-		<xs:annotation>
-			<xs:documentation>Text is a data-type so usually appears "by value" rather than by reference.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element ref="swe:Text"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<!-- ======== ObservableProperty ============= -->
-	<!-- ================================================= -->
-	<xs:element name="ObservableProperty">
-		<xs:annotation>
-			<xs:documentation>ObservableProperty should be used to identify (through reference only) stimuli or measurable property types. The consequence is that it does not have a uom because it has not been measured yet.  This is used to define sensor/detector/actuator inputs and outputs, for instance.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="swe:AbstractDataComponentType"/>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<!-- ============ Constraints and Qualifiers ================ -->
-	<!-- ================================================= -->
-	<xs:complexType name="QualityPropertyType">
-		<xs:annotation>
-			<xs:documentation>Allows for a simple quality assessment of the values carried by this component.
-	      This value can be numerical or categorical thus allowing for things like accuracy, precision, tolerance, confidence level, etc...
-	      
-	      The  meaning of the quality measure is indicated by the definition attribute of the chosen sub-component.
-	      
-	      The use of the 'ref'attribute indicate that the value of accuracy is included itself in the data inside the referred component. 
-	      
-	      This soft-typed Data Quality description may be replaced by ISO 19115/19139 DQ_DataQuality elements in later versions</xs:documentation>
-		</xs:annotation>
-		<xs:choice minOccurs="0">
-			<xs:element ref="swe:Quantity"/>
-			<xs:element ref="swe:QuantityRange"/>
-			<xs:element ref="swe:Category"/>
-			<xs:element ref="swe:Text"/>
-		</xs:choice>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:complexType name="AllowedValuesPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="swe:AllowedValues"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:element name="AllowedValues">
-		<xs:annotation>
-			<xs:documentation>List of allowed values (There is an implicit AND between all members)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice>
-				<xs:choice>
-					<xs:element name="min" type="xs:double">
-						<xs:annotation>
-							<xs:documentation>Specifies minimum allowed value for an open interval (no max)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="max" type="xs:double">
-						<xs:annotation>
-							<xs:documentation>Specifies maximum allowed value for an open interval (no min)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:choice>
-				<xs:choice maxOccurs="unbounded">
-					<xs:element name="interval" type="swe:decimalPair">
-						<xs:annotation>
-							<xs:documentation>Range of allowed values (closed interval) for this component</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="valueList" type="swe:decimalList">
-						<xs:annotation>
-							<xs:documentation>List of allowed values for this component</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:choice>
-			</xs:choice>
-			<xs:attribute name="id" type="xs:ID"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:complexType name="AllowedTokensPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="swe:AllowedTokens"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:element name="AllowedTokens">
-		<xs:annotation>
-			<xs:documentation>Enumeration of allowed values</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="valueList" type="swe:tokenList" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>List of allowed token values for this component</xs:documentation>
-					</xs:annotation>
-					<!-- why tokens? Better to allow strings. In which case either the members must be tagged, or whitespace escaped -->
-					<!-- the Category component is limited to the use of tokens to simplify comparisons (remove possible confusions due to
-					     insertion of \n or double spaces). Free Strings are only used in the Text component -->
-				</xs:element>
-			</xs:sequence>
-			<xs:attribute name="id" type="xs:ID"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<xs:complexType name="AllowedTimesPropertyType">
-		<xs:sequence minOccurs="0">
-			<xs:element ref="swe:AllowedTimes"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ........ -->
-	<xs:element name="AllowedTimes">
-		<xs:annotation>
-			<xs:documentation>List of allowed time values (There is an implicit AND between all members)</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:choice>
-				<xs:choice>
-					<xs:element name="min" type="swe:timePositionType">
-						<xs:annotation>
-							<xs:documentation>Specifies minimum allowed time value for an open interval (no max)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="max" type="swe:timePositionType">
-						<xs:annotation>
-							<xs:documentation>Specifies maximum allowed time value for an open interval (no min)</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:choice>
-				<xs:choice maxOccurs="unbounded">
-					<xs:element name="interval" type="swe:timePair">
-						<xs:annotation>
-							<xs:documentation>Range of allowed time values (closed interval) for this component</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-					<xs:element name="valueList" type="swe:timeList">
-						<xs:annotation>
-							<xs:documentation>List of allowed time values for this component</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:choice>
-			</xs:choice>
-			<xs:attribute name="id" type="xs:ID"/>
-		</xs:complexType>
-	</xs:element>
-	<!-- ================================================= -->
-	<!--               Data Component Groups               -->
-	<!-- ================================================= -->
-	<xs:group name="AnyScalar">
-		<xs:annotation>
-			<xs:documentation>Re-usable group providing a choice of scalar data types</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:group ref="swe:AnyNumerical"/>
-			<xs:element ref="swe:Boolean"/>
-			<xs:element ref="swe:Category"/>
-			<xs:element ref="swe:Text"/>
-		</xs:choice>
-	</xs:group>
-	<!-- ........ -->
-	<xs:complexType name="AnyScalarPropertyType">
-		<xs:annotation>
-			<xs:documentation>Complex Type for all properties taking the AnyScalar Group</xs:documentation>
-		</xs:annotation>
-		<xs:group ref="swe:AnyScalar" minOccurs="0"/>
-		<xs:attribute name="name" type="xs:token" use="required"/>
-		<xs:attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</xs:complexType>
-	<!-- ================================================= -->
-	<xs:group name="AnyNumerical">
-		<xs:annotation>
-			<xs:documentation>Re-usable group providing a choice of numeric data types</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element ref="swe:Count"/>
-			<xs:element ref="swe:Quantity"/>
-			<xs:element ref="swe:Time"/>
-		</xs:choice>
-	</xs:group>
-	<!-- ........ -->
-	<xs:group name="AnyRange">
-		<xs:annotation>
-			<xs:documentation>Re-usable group providing a choice of range data types</xs:documentation>
-		</xs:annotation>
-		<xs:choice>
-			<xs:element ref="swe:QuantityRange"/>
-			<xs:element ref="swe:CountRange"/>
-			<xs:element ref="swe:TimeRange"/>
-		</xs:choice>
-	</xs:group>
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/swe.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/swe.xsd
deleted file mode 100755
index ca00a78..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/swe.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.opengis.net/swe/1.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<xs:annotation>
-		<xs:documentation>swe document root definition
-			
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</xs:documentation>
-	</xs:annotation>
-	<!--========================-->
-	<!--   <xs:include schemaLocation="./basicTypes.xsd"/>  included by simpleTypes.xsd -->
-	<!--   <xs:include schemaLocation="./simpleTypes.xsd"/> included by aggregateTypes.xsd -->
-	<!--   <xs:include schemaLocation="./aggregateTypes.xsd"/> included by positionTypes, curveTypes and data -->
-	<xs:include schemaLocation="./positionTypes.xsd"/>
-	<xs:include schemaLocation="./curveTypes.xsd"/>
-	<xs:include schemaLocation="./data.xsd"/>
-	<xs:include schemaLocation="./temporalAggregates.xsd"/>
-	<xs:include schemaLocation="./phenomenon.xsd"/>
-	<xs:include schemaLocation="./xmlData.xsd"/>
-	<!--========================-->
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/temporalAggregates.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/temporalAggregates.xsd
deleted file mode 100755
index 093df59..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/temporalAggregates.xsd
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1" targetNamespace="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.1.2">
-	<annotation>
-		<documentation>temporalAggregates.xsd
-			
-	time geometric complex, time aggregates and time grids
-	
-	Copyright (c) 2007,2010 Open Geospatial Consortium.
-	To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ====================================================================== -->
-	<!-- bring in other schemas -->
-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
-	<include schemaLocation="./swe.xsd"/>
-	<!-- ================================================================== -->
-	<!-- =========================================================== -->
-	<!-- ============================================================== -->
-	<simpleType name="TimeValueList">
-	<annotation><documentation>Compact list of time instants, following gml:posList pattern. </documentation></annotation>
-		<list itemType="gml:TimePositionUnion"/>
-	</simpleType>
-	<!-- ====================================================================== -->
-	<complexType name="TimePositionListType">
-		<annotation>
-			<documentation>TimePositionList instances hold a sequence of time positions within the same frame.</documentation>
-		</annotation>
-		<simpleContent>
-			<extension base="swe:TimeValueList">
-				<attribute name="frame" type="anyURI" use="optional" default="#ISO-8601"/>
-				<attribute name="calendarEraName" type="string" use="optional"/>
-				<attribute name="indeterminatePosition" type="gml:TimeIndeterminateValueType" use="optional"/>
-				<attribute name="count" type="positiveInteger" use="optional">
-					<annotation>
-						<documentation>"count" allows to specify the number of direct positions in the list. </documentation>
-					</annotation>
-				</attribute>
-			</extension>
-		</simpleContent>
-	</complexType>
-	<!-- ============================================================== -->
-	<!-- ===== Missing property types ====== -->
-	<!-- ================================================================== -->
-	<complexType name="TimeGeometricPrimitivePropertyType">
-	<annotation><documentation>Property type not provided by GML</documentation></annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_TimeGeometricPrimitive"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<!-- ===== Time geometric complexes ====== -->
-	<!-- ================================================================== -->
-	<complexType name="TimeGeometricComplexType">
-	<annotation><documentation>Explicit implementation of ISO 19108 TM_GeometricComplex - a self-consistent set of TimeInstants and TimePeriods</documentation></annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeComplexType">
-					<sequence>
-							<element name="primitive" type="swe:TimeGeometricPrimitivePropertyType" maxOccurs="unbounded">
-								<annotation>
-									<documentation>Reference to an identified time primitive</documentation>
-								</annotation>
-							</element>
-					</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ......................... -->
-	<element name="TimeGeometricComplex" type="swe:TimeGeometricComplexType" substitutionGroup="gml:_TimeComplex">
-	<annotation><documentation>Explicit implementation of ISO 19108 TM_GeometricComplex - a self-consistent set of TimeInstants and TimePeriods</documentation></annotation>
-	</element>
-	<!-- ......................... -->
-	<complexType name="TimeGeometricComplexPropertyType">
-		<sequence minOccurs="0">
-			<element ref="swe:TimeGeometricComplex"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ===================================== -->
-	<!-- ===== Time aggregates ====== -->
-	<!-- ================================================================== -->
-	<!-- ===== Explicit time aggregates ====== -->
-	<!-- ================================================================== -->
-	<complexType name="TimeObjectPropertyType">
-	<annotation><documentation>Property type not provided by GML</documentation></annotation>
-		<sequence minOccurs="0">
-			<element ref="gml:_TimeObject"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeAggregateType">
-		<annotation>
-			<documentation>an arbitrary set of TimeObjects, often TimeInstants and TimePeriods</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeObjectType">
-				<sequence>
-					<element name="member" type="swe:TimeObjectPropertyType" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ......................... -->
-	<element name="TimeAggregate" type="swe:TimeAggregateType" substitutionGroup="gml:_TimeObject">
-		<annotation>
-			<documentation>an arbitrary set of TimeObjects, often TimeInstants and TimePeriods</documentation>
-		</annotation>
-	</element>
-	<!-- ......................... -->
-	<complexType name="TimeAggregatePropertyType">
-		<sequence minOccurs="0">
-			<element ref="swe:TimeAggregate"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ===================================== -->
-	<!-- ===== Implicit time aggregates ====== -->
-	<!-- ================================================================== -->
-	<complexType name="TimeGridType">
-		<annotation>
-			<documentation>A set of uniformly spaced time instants described using an implicit notation.
-      Follow pattern of (ISO 19123) spatial grids: 
-  these have (dimension,axisName,extent(,origin,offsetVector))
-  For temporal case, dimension is fixed (1), axisName is fixed ("time")</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="gml:AbstractTimeComplexType">
-				<sequence>
-					<element name="extent" type="swe:TimeGridEnvelopePropertyType"/>
-					<choice>
-						<element name="originPos" type="gml:TimePositionType">
-							<annotation>
-								<documentation>Simple-content time position</documentation>
-							</annotation>
-						</element>
-						<element name="origin" type="gml:TimeInstantPropertyType">
-							<annotation>
-								<documentation>Reference to an identified time instant</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<choice>
-						<element name="offsetDuration" type="duration">
-							<annotation>
-								<documentation>XML Schema built-in simple type for duration: e.g. 
-                P1Y (1 year) 
-                P1M (1 month) 
-                P1DT12H (1 day 12 hours) 
-                PT5M (5 minutes) 
-                PT0.007S (7 milliseconds)</documentation>
-							</annotation>
-						</element>
-						<element name="offsetInterval" type="gml:TimeIntervalLengthType">
-							<annotation>
-								<documentation>representation of the ISO 11404 model of a time interval length: e.g. 
-                value=1, unit="year"  
-                value=1, unit="other:month" (or see next)
-                value=1, unit="year" radix="12" factor="1" (1/12 year)
-                value=1.5, unit="day"  
-                value=36, unit="hour" 
-                value=5, unit="minute"  
-                value=7, unit="second" radix="10" factor="3" (7 milliseconds)</documentation>
-							</annotation>
-						</element>
-					</choice>
-					<element name="duration" type="duration" minOccurs="0"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ......................... -->
-	<element name="TimeGrid" type="swe:TimeGridType" abstract="true" substitutionGroup="gml:_TimeComplex">
-		<annotation>
-			<documentation>A set of uniformly spaced time instants described using an implicit notation
-			      Follow pattern of (ISO 19123) spatial grids: 
-  these have (dimension,axisName,extent(,origin,offsetVector))
-  For temporal case, dimension is fixed (1), axisName is fixed ("time")</documentation>
-		</annotation>
-	</element>
-	<!-- ......................... -->
-	<complexType name="TimeGridPropertyType">
-		<sequence minOccurs="0">
-			<element ref="swe:TimeInstantGrid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- =========================================================== -->
-	<complexType name="TimeGridEnvelopePropertyType">
-		<sequence>
-			<element name="TimeGridEnvelope">
-				<annotation>
-					<documentation>Grid extent specified in grid coordinates - i.e. 2 integers</documentation>
-				</annotation>
-				<complexType>
-					<sequence>
-						<element name="low" type="integer"/>
-						<element name="high" type="integer"/>
-					</sequence>
-				</complexType>
-			</element>
-		</sequence>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeInstantGridType">
-		<annotation>
-			<documentation>Extend time instant grid with window size property</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="swe:TimeGridType">
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ......................... -->
-	<element name="TimeInstantGrid" type="swe:TimeInstantGridType" substitutionGroup="swe:TimeGrid">
-		<annotation>
-			<documentation>A set of uniformly spaced time instants described using an implicit notation</documentation>
-		</annotation>
-	</element>
-	<!-- ......................... -->
-	<complexType name="TimeInstantGridPropertyType">
-		<sequence minOccurs="0">
-			<element ref="swe:TimeInstantGrid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-	<complexType name="TimeIntervalGridType">
-		<annotation>
-			<documentation>Extend time instant grid with window size property</documentation>
-		</annotation>
-		<complexContent>
-			<extension base="swe:TimeGridType">
-				<sequence>
-					<choice>
-						<element name="windowDuration" type="duration">
-							<annotation>
-								<documentation>XML Schema built-in simple type for duration</documentation>
-							</annotation>
-						</element>
-						<element name="windowInterval" type="gml:TimeIntervalLengthType">
-							<annotation>
-								<documentation>representation of the ISO 11404 model of a time interval length</documentation>
-							</annotation>
-						</element>
-					</choice>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<!-- ......................... -->
-	<element name="TimeIntervalGrid" type="swe:TimeIntervalGridType" substitutionGroup="swe:TimeGrid">
-		<annotation>
-			<documentation>A set of uniformly spaced time intervals described using an implicit notation</documentation>
-		</annotation>
-	</element>
-	<!-- ......................... -->
-	<complexType name="TimeIntervalGridPropertyType">
-		<sequence minOccurs="0">
-			<element ref="swe:TimeIntervalGrid"/>
-		</sequence>
-		<attributeGroup ref="gml:AssociationAttributeGroup"/>
-	</complexType>
-	<!-- ================================================================== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/xmlData.xsd b/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/xmlData.xsd
deleted file mode 100755
index 940126f..0000000
--- a/interface/nbproject/private/retriever/schemas.opengis.net/sweCommon/1.0.1/xmlData.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:swe="http://www.opengis.net/swe/1.0.1"
-        targetNamespace="http://www.opengis.net/swe/1.0.1" elementFormDefault="qualified" attributeFormDefault="unqualified"
-        version="1.0.1.2">
-	<annotation>
-		<documentation>A basic schema for XML-tagged data aggregates (Records and Arrays), using terminology consistent with ISO 11404. 
-			
-			Copyright (c) 2007,2010 Open Geospatial Consortium.
-			To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
-		</documentation>
-	</annotation>
-	<!-- ============== -->
-	<include schemaLocation="./swe.xsd"/>
-	<!-- ============== -->
-	<element name="Item">
-		<annotation>
-			<documentation>An Item is an item of data of any type</documentation>
-		</annotation>
-	</element>
-	<!-- ......  ...... -->
-	<complexType name="ItemPropertyType">
-		<sequence>
-			<element ref="swe:Item"/>
-		</sequence>
-	</complexType>
-	<!-- ============== -->
-	<!-- ============== -->
-	<complexType name="RecordType">
-		<annotation>
-			<documentation>A record is a list of fields</documentation>
-		</annotation>
-		<sequence>
-			<element name="field" type="swe:ItemPropertyType" maxOccurs="unbounded">
-				<annotation>
-					<documentation>A Record/field contains an item of data</documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="RS" type="anyURI" use="optional">
-			<annotation>
-				<documentation>Optional pointer to record-type schema</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="fieldCount" type="positiveInteger" use="optional">
-			<annotation>
-				<documentation>Optional count of the number of fields in the record. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- ......  ...... -->
-	<element name="Record" type="swe:RecordType">
-		<annotation>
-			<documentation>A record is a list of fields</documentation>
-		</annotation>
-	</element>
-	<!-- ......  ...... -->
-	<complexType name="RecordPropertyType">
-		<sequence>
-			<element ref="swe:Record"/>
-		</sequence>
-	</complexType>
-	<!-- ============== -->
-	<!-- ============== -->
-	<complexType name="ArrayType">
-		<annotation>
-			<documentation>An array is an indexed set of records of homogeneous type</documentation>
-		</annotation>
-		<sequence>
-			<element name="element" type="swe:XMLDataPropertyType" maxOccurs="unbounded">
-				<annotation>
-					<documentation>An Array/element contains an Item or a Record or an Array</documentation>
-				</annotation>
-			</element>
-		</sequence>
-		<attribute name="RS" type="anyURI" use="optional">
-			<annotation>
-				<documentation>Optional pointer to the record-type schema. This should be used when the elements of the array are Records</documentation>
-			</annotation>
-		</attribute>
-		<attribute name="elementCount" type="positiveInteger" use="optional">
-			<annotation>
-				<documentation>Optional count of the number of elements in the array. </documentation>
-			</annotation>
-		</attribute>
-	</complexType>
-	<!-- ......  ...... -->
-	<element name="Array" type="swe:ArrayType">
-		<annotation>
-			<documentation>An array is an indexed set of records of homogeneous type</documentation>
-		</annotation>
-	</element>
-	<!-- ......  ...... -->
-	<complexType name="ArrayPropertyType">
-		<sequence>
-			<element ref="swe:Array"/>
-		</sequence>
-	</complexType>
-	<!-- ============== -->
-	<complexType name="XMLDataPropertyType">
-		<annotation>
-			<documentation>Choice of Item or Record or Array - used in composing Arrays</documentation>
-		</annotation>
-		<group ref="swe:XMLData"/>
-	</complexType>
-	<!-- ============== -->
-	<group name="XMLData">
-		<annotation>
-			<documentation>Convenience group that bundles all the soft-typed XML-encoded aggregates into a choice group</documentation>
-		</annotation>
-		<choice>
-			<element ref="swe:Item"/>
-			<element ref="swe:Record"/>
-			<element ref="swe:Array"/>
-		</choice>
-	</group>
-	<!-- ============== -->
-</schema>
diff --git a/interface/nbproject/private/retriever/www.w3.org/1999/xlink b/interface/nbproject/private/retriever/www.w3.org/1999/xlink
deleted file mode 100755
index 58881fc..0000000
--- a/interface/nbproject/private/retriever/www.w3.org/1999/xlink
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html lang="en">
-<head>
-  <title>XLink namespace</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <link rel="stylesheet" type="text/css"
-        href="http://www.w3.org/StyleSheets/TR/base.css">
-</head>
-<body>
-<div class="head">
-<p><a href="http://www.w3.org/"><img class="head"
-src="http://www.w3.org/Icons/WWW/w3c_home.gif" alt="W3C"></a></p>
-</div>
-<p>
-This is an XML namespace defined in the 
-<a href="http://www.w3.org/TR/xlink/">XML Linking Language (XLink) specification</a>.
-</p>
-<p>
-For more information about XML, please refer to <a
-href="http://www.w3.org/TR/REC-xml">The Extensible Markup Language
-(XML) 1.0 specification</a>. For more information about XML
-namespaces, please refer to the
-<a href="http://www.w3.org/TR/REC-xml-names">Namespaces in XML
-specification</a>.
-
-<hr>
-<address>
-  <a href="/Help/Webmaster">Webmaster</a><BR>
-  Last modified: $Date: 2000/06/22 15:15:22 $
-</address>
-</body>
-</html>
diff --git a/interface/nbproject/private/retriever/www.w3.org/1999/xlink.xsd b/interface/nbproject/private/retriever/www.w3.org/1999/xlink.xsd
deleted file mode 100755
index bc7f31e..0000000
--- a/interface/nbproject/private/retriever/www.w3.org/1999/xlink.xsd
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink">
- 
- <xs:annotation>
-  <xs:documentation>This schema document provides attribute declarations and
-attribute group, complex type and simple type definitions which can be used in
-the construction of user schemas to define the structure of particular linking
-constructs, e.g.
-<![CDATA[
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xl="http://www.w3.org/1999/xlink">
-
- <xs:import namespace="http://www.w3.org/1999/xlink"
-            location="http://www.w3.org/1999/xlink.xsd">
-
- <xs:element name="mySimple">
-  <xs:complexType>
-   ...
-   <xs:attributeGroup ref="xl:simpleAttrs"/>
-   ...
-  </xs:complexType>
- </xs:element>
- ...
-</xs:schema>]]></xs:documentation>
- </xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
- <xs:attribute name="type" type="xlink:typeType"/>
-
- <xs:simpleType name="typeType">
-  <xs:restriction base="xs:token">
-   <xs:enumeration value="simple"/>
-   <xs:enumeration value="extended"/>
-   <xs:enumeration value="title"/>
-   <xs:enumeration value="resource"/>
-   <xs:enumeration value="locator"/>
-   <xs:enumeration value="arc"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:attribute name="href" type="xlink:hrefType"/>
-
- <xs:simpleType name="hrefType">
-  <xs:restriction base="xs:anyURI"/>
- </xs:simpleType>
-
- <xs:attribute name="role" type="xlink:roleType"/>
-
- <xs:simpleType name="roleType">
-  <xs:restriction base="xs:anyURI">
-   <xs:minLength value="1"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:attribute name="arcrole" type="xlink:arcroleType"/>
-
- <xs:simpleType name="arcroleType">
-  <xs:restriction base="xs:anyURI">
-   <xs:minLength value="1"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:attribute name="title" type="xlink:titleAttrType"/>
-
- <xs:simpleType name="titleAttrType">
-  <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <xs:attribute name="show" type="xlink:showType"/>
-
- <xs:simpleType name="showType">
-  <xs:restriction base="xs:token">
-   <xs:enumeration value="new"/>
-   <xs:enumeration value="replace"/>
-   <xs:enumeration value="embed"/>
-   <xs:enumeration value="other"/>
-   <xs:enumeration value="none"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:attribute name="actuate" type="xlink:actuateType"/>
-
- <xs:simpleType name="actuateType">
-  <xs:restriction base="xs:token">
-   <xs:enumeration value="onLoad"/>
-   <xs:enumeration value="onRequest"/>
-   <xs:enumeration value="other"/>
-   <xs:enumeration value="none"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:attribute name="label" type="xlink:labelType"/>
-
- <xs:simpleType name="labelType">
-  <xs:restriction base="xs:NCName"/>
- </xs:simpleType>
-
- <xs:attribute name="from" type="xlink:fromType"/>
-
- <xs:simpleType name="fromType">
-  <xs:restriction base="xs:NCName"/>
- </xs:simpleType>
-
- <xs:attribute name="to" type="xlink:toType"/>
-
- <xs:simpleType name="toType">
-  <xs:restriction base="xs:NCName"/>
- </xs:simpleType>
-
- <xs:attributeGroup name="simpleAttrs">
-  <xs:attribute ref="xlink:type" fixed="simple"/>
-  <xs:attribute ref="xlink:href"/>
-  <xs:attribute ref="xlink:role"/>
-  <xs:attribute ref="xlink:arcrole"/>
-  <xs:attribute ref="xlink:title"/>
-  <xs:attribute ref="xlink:show"/>
-  <xs:attribute ref="xlink:actuate"/>
- </xs:attributeGroup>
-
- <xs:group name="simpleModel">
-  <xs:sequence>
-   <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
- </xs:group>
-
- <xs:complexType mixed="true" name="simple">
-  <xs:annotation>
-   <xs:documentation>
-    Intended for use as the type of user-declared elements to make them
-    simple links.
-   </xs:documentation>
-  </xs:annotation>
-  <xs:group ref="xlink:simpleModel"/>
-  <xs:attributeGroup ref="xlink:simpleAttrs"/>
- </xs:complexType>
-
- <xs:attributeGroup name="extendedAttrs">
-  <xs:attribute ref="xlink:type" fixed="extended" use="required"/>
-  <xs:attribute ref="xlink:role"/>
-  <xs:attribute ref="xlink:title"/>
- </xs:attributeGroup>
-
- <xs:group name="extendedModel">
-   <xs:choice>
-    <xs:element ref="xlink:title"/>
-    <xs:element ref="xlink:resource"/>
-    <xs:element ref="xlink:locator"/>
-    <xs:element ref="xlink:arc"/>
-  </xs:choice>
- </xs:group>
-
- <xs:complexType name="extended">
-  <xs:annotation>
-   <xs:documentation>
-    Intended for use as the type of user-declared elements to make them
-    extended links.
-    Note that the elements referenced in the content model are all abstract.
-    The intention is that by simply declaring elements with these as their
-    substitutionGroup, all the right things will happen.
-   </xs:documentation>
-  </xs:annotation>
-  <xs:group ref="xlink:extendedModel" minOccurs="0" maxOccurs="unbounded"/>
-  <xs:attributeGroup ref="xlink:extendedAttrs"/>
- </xs:complexType>
-
- <xs:element name="title" type="xlink:titleEltType" abstract="true"/>
-
- <xs:attributeGroup name="titleAttrs">
-  <xs:attribute ref="xlink:type" fixed="title" use="required"/>
-  <xs:attribute ref="xml:lang">
-   <xs:annotation>
-    <xs:documentation>
-     xml:lang is not required, but provides much of the
-     motivation for title elements in addition to attributes, and so
-     is provided here for convenience.
-    </xs:documentation>
-   </xs:annotation>
-  </xs:attribute>
- </xs:attributeGroup>
-
- <xs:group name="titleModel">
-  <xs:sequence>
-   <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
- </xs:group>
-
- <xs:complexType mixed="true" name="titleEltType">
-  <xs:group ref="xlink:titleModel"/>
-  <xs:attributeGroup ref="xlink:titleAttrs"/>
- </xs:complexType>
-
- <xs:element name="resource" type="xlink:resourceType" abstract="true"/>
-
- <xs:attributeGroup name="resourceAttrs">
-  <xs:attribute ref="xlink:type" fixed="resource" use="required"/>
-  <xs:attribute ref="xlink:role"/>
-  <xs:attribute ref="xlink:title"/>
-  <xs:attribute ref="xlink:label"/>
- </xs:attributeGroup>
-
- <xs:group name="resourceModel">
-  <xs:sequence>
-   <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
- </xs:group>
-
- <xs:complexType mixed="true" name="resourceType">
-  <xs:group ref="xlink:resourceModel"/>
-  <xs:attributeGroup ref="xlink:resourceAttrs"/>
- </xs:complexType>
-
- <xs:element name="locator" type="xlink:locatorType" abstract="true"/>
-
- <xs:attributeGroup name="locatorAttrs">
-  <xs:attribute ref="xlink:type" fixed="locator" use="required"/>
-  <xs:attribute ref="xlink:href" use="required"/>
-  <xs:attribute ref="xlink:role"/>
-  <xs:attribute ref="xlink:title"/>
-  <xs:attribute ref="xlink:label">
-   <xs:annotation>
-    <xs:documentation>
-     label is not required, but locators have no particular
-     XLink function if they are not labeled.
-    </xs:documentation>
-   </xs:annotation>
-  </xs:attribute>
- </xs:attributeGroup>
-
- <xs:group name="locatorModel">
-  <xs:sequence>
-   <xs:element ref="xlink:title" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
- </xs:group>
-
- <xs:complexType name="locatorType">
-  <xs:group ref="xlink:locatorModel"/>
-  <xs:attributeGroup ref="xlink:locatorAttrs"/>
- </xs:complexType>
-
- <xs:element name="arc" type="xlink:arcType" abstract="true"/>
-
- <xs:attributeGroup name="arcAttrs">
-  <xs:attribute ref="xlink:type" fixed="arc" use="required"/>
-  <xs:attribute ref="xlink:arcrole"/>
-  <xs:attribute ref="xlink:title"/>
-  <xs:attribute ref="xlink:show"/>
-  <xs:attribute ref="xlink:actuate"/>
-  <xs:attribute ref="xlink:from"/>
-  <xs:attribute ref="xlink:to">
-   <xs:annotation>
-    <xs:documentation>
-     from and to have default behavior when values are missing
-    </xs:documentation>
-   </xs:annotation>
-  </xs:attribute>
- </xs:attributeGroup>
-
- <xs:group name="arcModel">
-  <xs:sequence>
-   <xs:element ref="xlink:title" minOccurs="0" maxOccurs="unbounded"/>
-  </xs:sequence>
- </xs:group>
-
- <xs:complexType name="arcType">
-  <xs:group ref="xlink:arcModel"/>
-  <xs:attributeGroup ref="xlink:arcAttrs"/>
- </xs:complexType>
-
-</xs:schema>
diff --git a/interface/nbproject/private/retriever/www.w3.org/2001/xml.xsd b/interface/nbproject/private/retriever/www.w3.org/2001/xml.xsd
deleted file mode 100755
index aea7d0d..0000000
--- a/interface/nbproject/private/retriever/www.w3.org/2001/xml.xsd
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version='1.0'?>
-<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns   ="http://www.w3.org/1999/xhtml"
-  xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   <div>
-    <h1>About the XML namespace</h1>
-
-    <div class="bodytext">
-     <p>
-      This schema document describes the XML namespace, in a form
-      suitable for import by other schema documents.
-     </p>
-     <p>
-      See <a href="http://www.w3.org/XML/1998/namespace.html">
-      http://www.w3.org/XML/1998/namespace.html</a> and
-      <a href="http://www.w3.org/TR/REC-xml">
-      http://www.w3.org/TR/REC-xml</a> for information 
-      about this namespace.
-     </p>
-     <p>
-      Note that local names in this namespace are intended to be
-      defined only by the World Wide Web Consortium or its subgroups.
-      The names currently defined in this namespace are listed below.
-      They should not be used with conflicting semantics by any Working
-      Group, specification, or document instance.
-     </p>
-     <p>   
-      See further below in this document for more information about <a
-      href="#usage">how to refer to this schema document from your own
-      XSD schema documents</a> and about <a href="#nsversioning">the
-      namespace-versioning policy governing this schema document</a>.
-     </p>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>lang (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose value
-       is a language code for the natural language of the content of
-       any element; its value is inherited.  This name is reserved
-       by virtue of its definition in the XML specification.</p>
-     
-    </div>
-    <div>
-     <h4>Notes</h4>
-     <p>
-      Attempting to install the relevant ISO 2- and 3-letter
-      codes as the enumerated possible values is probably never
-      going to be a realistic possibility.  
-     </p>
-     <p>
-      See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-       http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-      and the IANA language subtag registry at
-      <a href="http://www.iana.org/assignments/language-subtag-registry">
-       http://www.iana.org/assignments/language-subtag-registry</a>
-      for further information.
-     </p>
-     <p>
-      The union allows for the 'un-declaration' of xml:lang with
-      the empty string.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:union memberTypes="xs:language">
-    <xs:simpleType>    
-     <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:union>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>space (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose
-       value is a keyword indicating what whitespace processing
-       discipline is intended for the content of the element; its
-       value is inherited.  This name is reserved by virtue of its
-       definition in the XML specification.</p>
-     
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
- 
- <xs:attribute name="base" type="xs:anyURI"> <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>base (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose value
-       provides a URI to be used as the base for interpreting any
-       relative URIs in the scope of the element on which it
-       appears; its value is inherited.  This name is reserved
-       by virtue of its definition in the XML Base specification.</p>
-     
-     <p>
-      See <a
-      href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
-      for information about this attribute.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
- </xs:attribute>
- 
- <xs:attribute name="id" type="xs:ID">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>id (as an attribute name)</h3> 
-      <p>
-       denotes an attribute whose value
-       should be interpreted as if declared to be of type ID.
-       This name is reserved by virtue of its definition in the
-       xml:id specification.</p>
-     
-     <p>
-      See <a
-      href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a>
-      for information about this attribute.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
-  <xs:attribute ref="xml:id"/>
- </xs:attributeGroup>
-
- <xs:annotation>
-  <xs:documentation>
-   <div>
-   
-    <h3>Father (in any context at all)</h3> 
-
-    <div class="bodytext">
-     <p>
-      denotes Jon Bosak, the chair of 
-      the original XML Working Group.  This name is reserved by 
-      the following decision of the W3C XML Plenary and 
-      XML Coordination groups:
-     </p>
-     <blockquote>
-       <p>
-	In appreciation for his vision, leadership and
-	dedication the W3C XML Plenary on this 10th day of
-	February, 2000, reserves for Jon Bosak in perpetuity
-	the XML name "xml:Father".
-       </p>
-     </blockquote>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>
-   <div xml:id="usage" id="usage">
-    <h2><a name="usage">About this schema document</a></h2>
-
-    <div class="bodytext">
-     <p>
-      This schema defines attributes and an attribute group suitable
-      for use by schemas wishing to allow <code>xml:base</code>,
-      <code>xml:lang</code>, <code>xml:space</code> or
-      <code>xml:id</code> attributes on elements they define.
-     </p>
-     <p>
-      To enable this, such a schema must import this schema for
-      the XML namespace, e.g. as follows:
-     </p>
-     <pre>
-          <schema . . .>
-           . . .
-           <import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-     </pre>
-     <p>
-      or
-     </p>
-     <pre>
-           <import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
-     </pre>
-     <p>
-      Subsequently, qualified reference to any of the attributes or the
-      group defined below will have the desired effect, e.g.
-     </p>
-     <pre>
-          <type . . .>
-           . . .
-           <attributeGroup ref="xml:specialAttrs"/>
-     </pre>
-     <p>
-      will define a type which will schema-validate an instance element
-      with any of those attributes.
-     </p>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>
-   <div id="nsversioning" xml:id="nsversioning">
-    <h2><a name="nsversioning">Versioning policy for this schema document</a></h2>
-    <div class="bodytext">
-     <p>
-      In keeping with the XML Schema WG's standard versioning
-      policy, this schema document will persist at
-      <a href="http://www.w3.org/2009/01/xml.xsd">
-       http://www.w3.org/2009/01/xml.xsd</a>.
-     </p>
-     <p>
-      At the date of issue it can also be found at
-      <a href="http://www.w3.org/2001/xml.xsd">
-       http://www.w3.org/2001/xml.xsd</a>.
-     </p>
-     <p>
-      The schema document at that URI may however change in the future,
-      in order to remain compatible with the latest version of XML
-      Schema itself, or with the XML namespace itself.  In other words,
-      if the XML Schema or XML namespaces change, the version of this
-      document at <a href="http://www.w3.org/2001/xml.xsd">
-       http://www.w3.org/2001/xml.xsd 
-      </a> 
-      will change accordingly; the version at 
-      <a href="http://www.w3.org/2009/01/xml.xsd">
-       http://www.w3.org/2009/01/xml.xsd 
-      </a> 
-      will not change.
-     </p>
-     <p>
-      Previous dated (and unchanging) versions of this schema 
-      document are at:
-     </p>
-     <ul>
-      <li><a href="http://www.w3.org/2009/01/xml.xsd">
-	http://www.w3.org/2009/01/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2007/08/xml.xsd">
-	http://www.w3.org/2007/08/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2004/10/xml.xsd">
-	http://www.w3.org/2004/10/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2001/03/xml.xsd">
-	http://www.w3.org/2001/03/xml.xsd</a></li>
-     </ul>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
-</xs:schema>
-
diff --git a/interface/nbproject/project.properties b/interface/nbproject/project.properties
deleted file mode 100755
index 94429c9..0000000
--- a/interface/nbproject/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_53
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=true
-web.root=.
diff --git a/interface/nbproject/project.xml b/interface/nbproject/project.xml
deleted file mode 100755
index 0d11ad0..0000000
--- a/interface/nbproject/project.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>istSOS 2</name>
-        </data>
-    </configuration>
-</project>
diff --git a/interface/servicestatus.html b/interface/servicestatus.html
deleted file mode 100755
index 1637c2f..0000000
--- a/interface/servicestatus.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <div>TODO write content</div>
-    </body>
-</html>
diff --git a/interface/test/chart/app/config/data.json b/interface/test/chart/app/config/data.json
deleted file mode 100755
index e7897f4..0000000
--- a/interface/test/chart/app/config/data.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "success": true,
-    "total": 3,
-    "data": [
-    {
-        "isodate": "2012-01-01T00:00:00+01",
-        "value": 2
-    },
-    {
-        "isodate": "2012-01-01T01:00:00+01",
-        "value": 1
-    },
-    {
-        "isodate": "2012-01-01T02:00:00+01",
-        "value": 3
-    }
-    ]
-}
\ No newline at end of file
diff --git a/interface/test/chart/app/store/testColumnStore.js b/interface/test/chart/app/store/testColumnStore.js
deleted file mode 100755
index 3e44128..0000000
--- a/interface/test/chart/app/store/testColumnStore.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * File: app/store/testColumnStore.js
- * Date: Tue Mar 20 2012 10:10:02 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.2.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('MyApp.store.testColumnStore', {
-    extend: 'Ext.data.Store',
-
-    constructor: function(cfg) {
-        var me = this;
-        cfg = cfg || {};
-        me.callParent([Ext.apply({
-            storeId: 'testcolumnstore',
-            proxy: {
-                type: 'ajax',
-                url: 'app/config/data.json',
-                reader: {
-                    type: 'json'
-                }
-            },
-            fields: [
-                {
-                    name: 'isodate',
-                    type: 'string'
-                },
-                {
-                    name: 'value',
-                    type: 'float'
-                }
-            ]
-        }, cfg)]);
-    }
-});
\ No newline at end of file
diff --git a/interface/test/chart/app/view/testColumn.js b/interface/test/chart/app/view/testColumn.js
deleted file mode 100755
index bd84db3..0000000
--- a/interface/test/chart/app/view/testColumn.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * File: app/view/testColumn.js
- * Date: Tue Mar 20 2012 09:46:26 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.2.
- * http://www.sencha.com/products/designer/
- *
- * This file will be generated the first time you export.
- *
- * You should implement event handling and custom methods in this
- * class.
- */
-
-Ext.define('MyApp.view.testColumn', {
-    extend: 'MyApp.view.ui.testColumn',
-
-    initComponent: function() {
-        
-        Ext.create('MyApp.store.testColumnStore');
-        
-        var me = this;
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/test/chart/app/view/ui/testColumn.js b/interface/test/chart/app/view/ui/testColumn.js
deleted file mode 100755
index 4bec695..0000000
--- a/interface/test/chart/app/view/ui/testColumn.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * File: app/view/ui/testColumn.js
- * Date: Tue Mar 20 2012 10:10:02 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.2.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.define('MyApp.view.ui.testColumn', {
-    extend: 'Ext.panel.Panel',
-
-    height: 538,
-    width: 702,
-    layout: {
-        type: 'fit'
-    },
-    title: 'My Panel',
-
-    initComponent: function() {
-        var me = this;
-
-        Ext.applyIf(me, {
-            items: [
-                {
-                    xtype: 'chart',
-                    height: 250,
-                    width: 400,
-                    animate: true,
-                    insetPadding: 20,
-                    store: 'testcolumnstore',
-                    axes: [
-                        {
-                            type: 'Category',
-                            fields: [
-                                'isodate'
-                            ],
-                            position: 'bottom',
-                            title: 'Time'
-                        },
-                        {
-                            type: 'Numeric',
-                            fields: [
-                                'value'
-                            ],
-                            position: 'left',
-                            title: 'Temperature'
-                        }
-                    ],
-                    series: [
-                        {
-                            type: 'column',
-                            label: {
-                                display: 'insideEnd',
-                                field: 'y',
-                                color: '#333',
-                                'text-anchor': 'middle'
-                            },
-                            xField: 'x',
-                            yField: [
-                                'y'
-                            ]
-                        }
-                    ]
-                }
-            ]
-        });
-
-        me.callParent(arguments);
-    }
-});
\ No newline at end of file
diff --git a/interface/test/chart/charts.xds b/interface/test/chart/charts.xds
deleted file mode 100755
index 7b472c1..0000000
--- a/interface/test/chart/charts.xds
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-    "name": "charts.xds",
-    "settings": {
-        "urlPrefix": "http://localhost/",
-        "directAPI": "",
-        "spacesToIndent": 4,
-        "codeGenFormat": "Class",
-        "exportPath": ".",
-        "extPath": "http://extjs.cachefly.net/ext-4.0.2a/",
-        "lineEnding": "LF",
-        "instantiateStore": true,
-        "exportXDSFiles": true,
-        "genTimestamps": true,
-        "appName": "MyApp"
-    },
-    "xdsVersion": "1.2.2",
-    "components": [
-        {
-            "id": "ExtBox1-ext-gen1666",
-            "type": "panel",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "height": 538,
-                "width": 702,
-                "layout": "fit",
-                "title": "My Panel",
-                "designer|userClassName": "testColumn"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen6049",
-                    "type": "chart",
-                    "reference": {
-                        "name": "items",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "height": 250,
-                        "width": 400,
-                        "animate": "true",
-                        "insetPadding": 20,
-                        "store": "testcolumnstore",
-                        "designer|userClassName": "MyChart"
-                    },
-                    "iconCls": "icon-column-chart",
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen6054",
-                            "type": "categoryaxis",
-                            "reference": {
-                                "name": "axes",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "fields": "['isodate']",
-                                "position": "bottom",
-                                "title": "Time",
-                                "designer|userClassName": "MyCategoryAxis"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen6057",
-                            "type": "numericaxis",
-                            "reference": {
-                                "name": "axes",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "fields": "['value']",
-                                "position": "left",
-                                "title": "Temperature",
-                                "designer|userClassName": "MyNumericAxis"
-                            }
-                        },
-                        {
-                            "id": "ExtBox1-ext-gen6060",
-                            "type": "columnseries",
-                            "reference": {
-                                "name": "series",
-                                "type": "array"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "label": "{'display':'insideEnd','field':'y','color':'#333','text-anchor':'middle'}",
-                                "xField": "x",
-                                "yField": "['y']",
-                                "designer|userClassName": "MyColumnSeries"
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    ],
-    "stores": [
-        {
-            "id": "ExtBox1-ext-gen2046",
-            "type": "jsonstore",
-            "reference": {
-                "name": "items",
-                "type": "array"
-            },
-            "codeClass": null,
-            "userConfig": {
-                "storeId": "testcolumnstore",
-                "designer|userClassName": "testColumnStore"
-            },
-            "cn": [
-                {
-                    "id": "ExtBox1-ext-gen2050",
-                    "type": "ajaxproxy",
-                    "reference": {
-                        "name": "proxy",
-                        "type": "object"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "url": "app/config/data.json",
-                        "designer|userClassName": "Ajax Proxy"
-                    },
-                    "cn": [
-                        {
-                            "id": "ExtBox1-ext-gen2056",
-                            "type": "jsonreader",
-                            "reference": {
-                                "name": "reader",
-                                "type": "object"
-                            },
-                            "codeClass": null,
-                            "userConfig": {
-                                "designer|userClassName": "Json Reader"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "ExtBox1-ext-gen2353",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "isodate",
-                        "type": "string",
-                        "designer|userClassName": "MyField"
-                    }
-                },
-                {
-                    "id": "ExtBox1-ext-gen2360",
-                    "type": "datafield",
-                    "reference": {
-                        "name": "fields",
-                        "type": "array"
-                    },
-                    "codeClass": null,
-                    "userConfig": {
-                        "name": "value",
-                        "type": "float",
-                        "designer|userClassName": "MyField1"
-                    }
-                }
-            ]
-        }
-    ],
-    "framework": "ext40"
-}
\ No newline at end of file
diff --git a/interface/test/chart/column-cathegory.html b/interface/test/chart/column-cathegory.html
deleted file mode 100755
index 3f5c232..0000000
--- a/interface/test/chart/column-cathegory.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Auto Generated with Ext Designer -->
-<!-- Modifications to this file will be overwritten. -->
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>dev - charts</title>
-        <link rel="stylesheet" type="text/css" href="http://docs.sencha.com/ext-js/4-0/extjs-build/resources/css/ext-all.css"/>
-        <script type="text/javascript" src="http://docs.sencha.com/ext-js/4-0/extjs-build/ext-all-debug.js"></script>
-        <script type="text/javascript">
-            
-            function ISO8601FromDate(isodate) {
-                function pad(n){return n<10 ? '0'+n : n}
-                var offset = isodate.getTimezoneOffset()/-60;
-                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
-                return isodate.getFullYear()+'-'
-                    + pad(isodate.getMonth()+1)+'-'
-                    + pad(isodate.getDate())+'T'
-                    + pad(isodate.getHours())+':'
-                    + pad(isodate.getMinutes())+':'
-                    + pad(isodate.getSeconds())+'.'
-                    + isodate.getMilliseconds() + tz;
-            }
-
-                
-            Ext.Loader.setConfig({
-                enabled: true
-            });
-            
-            Ext.require('Ext.chart.*');
-            Ext.require(['Ext.Window', 'Ext.layout.container.Fit', 'Ext.fx.target.Sprite']);
-            
-            Ext.onReady(function () {
-                
-                Ext.define('sosstore', {
-                    extend: 'Ext.data.JsonStore',
-
-                    constructor: function(cfg) {
-                        var me = this;
-                        cfg = cfg || {};
-                        me.callParent([Ext.apply({
-                                storeId: 'testcolumnstore',
-                                proxy: {
-                                    type: 'ajax',
-                                    url: 'app/config/data.json',
-                                    reader: {
-                                        type: 'json'
-                                    }
-                                },
-                                fields: [
-                                    {
-                                        name: 'isodate',
-                                        dateFormat: 'c',
-                                        type: 'date'
-                                    },
-                                    {
-                                        name: 'value',
-                                        type: 'float'
-                                    }
-                                ]
-                            }, cfg)]);
-                    }
-                });
-                
-                var sosStore = Ext.create('sosstore',{
-                    "data": [
-                        {
-                            "isodate": "2012-01-01T00:00:00.000000+0100",
-                            "value": 2
-                        },
-                        {
-                            "isodate": "2012-01-01T01:00:00.000000+0100",
-                            "value": 1
-                        },
-                        {
-                            "isodate": "2012-01-01T02:00:00.000000+0100",
-                            "value": 3
-                        },
-                        {
-                            "isodate": "2012-01-01T03:00:00.000000+0100",
-                            "value": 4
-                        },
-                        {
-                            "isodate": "2012-01-01T04:00:00.000000+0100",
-                            "value": 5.2
-                        },
-                        {
-                            "isodate": "2012-01-01T05:00:00.000000+0100",
-                            "value": 3.5453
-                        },
-                        {
-                            "isodate": "2012-01-01T06:00:00.000000+0100",
-                            "value": 3.4
-                        },
-                        {
-                            "isodate": "2012-01-01T07:00:00.000000+0100",
-                            "value": 3.1243
-                        },
-                        {
-                            "isodate": "2012-01-01T08:00:00.000000+0100",
-                            "value": 6.4
-                        },
-                        {
-                            "isodate": "2012-01-01T09:00:00.000000+0100",
-                            "value": 3.4
-                        },
-                        {
-                            "isodate": "2012-01-01T10:00:00.000000+0100",
-                            "value": 5.4
-                        },
-                        {
-                            "isodate": "2012-01-01T11:00:00.000000+0100",
-                            "value": 2.6
-                        },
-                        {
-                            "isodate": "2012-01-01T12:00:00.000000+0100",
-                            "value": 5.2
-                        },
-                        {
-                            "isodate": "2012-01-01T13:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T14:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T15:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T16:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T17:00:00.000000+0100",
-                            "value": 5.2
-                        },
-                        {
-                            "isodate": "2012-01-01T18:00:00.000000+0100",
-                            "value": 3.5453
-                        },
-                        {
-                            "isodate": "2012-01-01T19:00:00.000000+0100",
-                            "value": 3.4
-                        },
-                        {
-                            "isodate": "2012-01-01T20:00:00.000000+0100",
-                            "value": 3.1243
-                        },
-                        {
-                            "isodate": "2012-01-01T21:00:00.000000+0100",
-                            "value": 6.4
-                        },
-                        {
-                            "isodate": "2012-01-01T22:00:00.000000+0100",
-                            "value": 1.4
-                        }
-                    ]
-                });
-                
-                
-                var winSos = Ext.create('Ext.Window', {
-                    width: 800,
-                    height: 600,
-                    minHeight: 400,
-                    minWidth: 550,
-                    hidden: false,
-                    maximizable: true,
-                    title: 'Column Chart',
-                    layout: 'fit',
-                    tbar: [{
-                            text: 'Reload Data',
-                            handler: function() {
-                                sosStore.reloadData();
-                            }
-                        }],
-                    items: {
-                        id: 'chartCmpSOS',
-                        xtype: 'chart',
-                        style: 'background: WHITE',
-                        animate: true,
-                        shadow: true,
-                        store: sosStore,
-                        axes: [{
-                                type: 'Numeric',
-                                position: 'left',
-                                fields: ['value'],
-                                label: {
-                                    renderer: Ext.util.Format.numberRenderer('0.0')
-                                },
-                                title: 'Value',
-                                grid: true,
-                                minimum: 0
-                            }, 
-                            {
-                                type: 'Category',
-                                position: 'bottom',
-                                fields: ['isodate'],
-                                title: 'Datetime',
-                                dateFormat: 'c',
-                                label: {
-                                    renderer: function(v) {
-                                        return ISO8601FromDate(v);
-                                        //return Ext.String.ellipsis(v, 15, false);
-                                    },
-                                    font: '12px Arial',
-                                    rotate: {
-                                        degrees: -90
-                                    }
-                                }
-                            }],
-                        series: [{
-                                type: 'column',
-                                axis: 'left',
-                                highlight: true,
-                                label: {
-                                    display: 'middle',
-                                    'text-anchor': 'middle',
-                                    field: 'value',
-                                    renderer: Ext.util.Format.numberRenderer('0.0'),
-                                    color: '#333'
-                                },
-                                xField: 'isodate',
-                                yField: ['value'],
-                                listeners: {
-                                    'itemmouseup': function(item) {
-                                        console.dir(item);
-                                        /*
-                                        var series = Ext.getCmp('chartCmpSOS').series.get(0),
-                                        index = Ext.Array.indexOf(series.items, item),
-                                        selectionModel = gridPanel.getSelectionModel();
-                     
-                                        selectedStoreItem = item.storeItem;
-                                        selectionModel.select(index);*/
-                                    }
-                                }
-                            }]
-                    }
-                });
-                winSos.show();
-                
-                
-                
-                
-                /*var store1 = Ext.create('Ext.data.JsonStore', {
-                    fields: ['name', 'data1', 'data2', 'data3', 'data4', 'data5', 'data6', 'data7', 'data9', 'data9'],
-                    data: generateData()
-                });
-                
-                var win = Ext.create('Ext.Window', {
-                    width: 800,
-                    height: 600,
-                    minHeight: 400,
-                    minWidth: 550,
-                    hidden: false,
-                    maximizable: true,
-                    title: 'DEV-TEST Column Chart',
-                    //renderTo: Ext.getBody(),
-                    layout: 'fit',
-                    tbar: [{
-                            text: 'Reload Data',
-                            handler: function() {
-                                store1.loadData(generateData());
-                            }
-                        }],
-                    items: {
-                        id: 'chartCmp',
-                        xtype: 'chart',
-                        style: 'background:#fff',
-                        animate: true,
-                        shadow: true,
-                        store: store1,
-                        axes: [{
-                                type: 'Numeric',
-                                position: 'left',
-                                fields: ['data1'],
-                                label: {
-                                    renderer: Ext.util.Format.numberRenderer('0,0')
-                                },
-                                title: 'Number of Hits',
-                                grid: true,
-                                minimum: 0
-                            }, 
-                            {
-                                type: 'Category',
-                                position: 'bottom',
-                                fields: ['name'],
-                                title: 'Month of the Year'
-                            }],
-                        series: [{
-                                type: 'column',
-                                axis: 'left',
-                                highlight: true,
-                                tips: {
-                                    trackMouse: true,
-                                    width: 140,
-                                    height: 28,
-                                    renderer: function(storeItem, item) {
-                                        this.setTitle(storeItem.get('name') + ': ' + storeItem.get('data1') + ' $');
-                                    }
-                                },
-                                label: {
-                                    display: 'insideEnd',
-                                    'text-anchor': 'middle',
-                                    field: 'data1',
-                                    renderer: Ext.util.Format.numberRenderer('0'),
-                                    orientation: 'vertical',
-                                    color: '#333'
-                                },
-                                xField: 'name',
-                                yField: 'data1'
-                            }]
-                    }
-                });
-                win.show();*/
-                
-                
-            });
-        </script>
-    </head>
-    <body id="docbody">
-        ciao
-    </body>
-</html>
diff --git a/interface/test/chart/column-time.html b/interface/test/chart/column-time.html
deleted file mode 100755
index d830205..0000000
--- a/interface/test/chart/column-time.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Auto Generated with Ext Designer -->
-<!-- Modifications to this file will be overwritten. -->
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>dev - charts</title>
-        <link rel="stylesheet" type="text/css" href="http://docs.sencha.com/ext-js/4-0/extjs-build/resources/css/ext-all.css"/>
-        <script type="text/javascript" src="http://docs.sencha.com/ext-js/4-0/extjs-build/ext-all-debug.js"></script>
-        <script type="text/javascript">
-            
-                
-            function generateData(n, floor){
-                var data = [],
-                p = (Math.random() *  11) + 1,
-                i;
-            
-                floor = (!floor && floor !== 0)? 20 : floor;
-        
-                for (i = 0; i < (n || 12); i++) {
-                    data.push({
-                        name: Ext.Date.monthNames[i % 12],
-                        data1: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data2: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data3: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data4: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data5: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data6: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data7: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data8: Math.floor(Math.max((Math.random() * 100), floor)),
-                        data9: Math.floor(Math.max((Math.random() * 100), floor))
-                    });
-                }
-                return data;
-            };
-                
-            Ext.Loader.setConfig({
-                enabled: true
-            });
-            
-            Ext.require('Ext.chart.*');
-            Ext.require(['Ext.Window', 'Ext.layout.container.Fit', 'Ext.fx.target.Sprite']);
-            
-            Ext.onReady(function () {
-                
-                Ext.define('sosstore', {
-                    extend: 'Ext.data.JsonStore',
-
-                    constructor: function(cfg) {
-                        var me = this;
-                        cfg = cfg || {};
-                        me.callParent([Ext.apply({
-                                storeId: 'testcolumnstore',
-                                proxy: {
-                                    type: 'ajax',
-                                    url: 'app/config/data.json',
-                                    reader: {
-                                        type: 'json'
-                                    }
-                                },
-                                fields: [
-                                    {
-                                        name: 'isodate',
-                                        dateFormat: 'c',
-                                        type: 'date'
-                                    },
-                                    {
-                                        name: 'value',
-                                        type: 'float'
-                                    }
-                                ]
-                            }, cfg)]);
-                    }
-                });
-                
-                var sosStore = Ext.create('sosstore',{
-                    "data": [
-                        {
-                            "isodate": "2012-01-01T00:00:00.000000+0100",
-                            "value": 2
-                        },
-                        {
-                            "isodate": "2012-01-01T01:00:00.000000+0100",
-                            "value": 1
-                        },
-                        {
-                            "isodate": "2012-01-01T02:00:00.000000+0100",
-                            "value": 3
-                        },
-                        {
-                            "isodate": "2012-01-01T03:00:00.000000+0100",
-                            "value": 4
-                        },
-                        {
-                            "isodate": "2012-01-01T04:00:00.000000+0100",
-                            "value": 5.2
-                        },
-                        {
-                            "isodate": "2012-01-01T05:00:00.000000+0100",
-                            "value": 3.5453
-                        },
-                        {
-                            "isodate": "2012-01-01T06:00:00.000000+0100",
-                            "value": 3.4
-                        },
-                        {
-                            "isodate": "2012-01-01T07:00:00.000000+0100",
-                            "value": 3.1243
-                        },
-                        {
-                            "isodate": "2012-01-01T08:00:00.000000+0100",
-                            "value": 6.4
-                        },
-                        {
-                            "isodate": "2012-01-01T09:00:00.000000+0100",
-                            "value": 3.4
-                        },
-                        {
-                            "isodate": "2012-01-01T10:00:00.000000+0100",
-                            "value": 5.4
-                        },
-                        {
-                            "isodate": "2012-01-01T11:00:00.000000+0100",
-                            "value": 2.6
-                        },
-                        {
-                            "isodate": "2012-01-01T12:00:00.000000+0100",
-                            "value": 5.2
-                        },
-                        {
-                            "isodate": "2012-01-01T13:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T14:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T15:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T16:00:00.000000+0100",
-                            "value": 0
-                        },
-                        {
-                            "isodate": "2012-01-01T17:00:00.000000+0100",
-                            "value": 5.2
-                        },
-                        {
-                            "isodate": "2012-01-01T18:00:00.000000+0100",
-                            "value": 3.5453
-                        },
-                        {
-                            "isodate": "2012-01-01T19:00:00.000000+0100",
-                            "value": 3.4
-                        },
-                        {
-                            "isodate": "2012-01-01T20:00:00.000000+0100",
-                            "value": 3.1243
-                        },
-                        {
-                            "isodate": "2012-01-01T21:00:00.000000+0100",
-                            "value": 6.4
-                        },
-                        {
-                            "isodate": "2012-01-01T22:00:00.000000+0100",
-                            "value": 1.4
-                        }
-                    ]
-                });
-                
-                
-                var winSos = Ext.create('Ext.Window', {
-                    width: 800,
-                    height: 600,
-                    minHeight: 400,
-                    minWidth: 550,
-                    hidden: false,
-                    maximizable: true,
-                    title: 'Column Chart',
-                    layout: 'fit',
-                    tbar: [{
-                            text: 'Reload Data',
-                            handler: function() {
-                                sosStore.reloadData();
-                            }
-                        }],
-                    items: {
-                        id: 'chartCmpSOS',
-                        xtype: 'chart',
-                        style: 'background: WHITE',
-                        animate: true,
-                        shadow: true,
-                        store: sosStore,
-                        axes: [{
-                                type: 'Numeric',
-                                position: 'left',
-                                fields: ['value'],
-                                label: {
-                                    renderer: Ext.util.Format.numberRenderer('0.0')
-                                },
-                                title: 'Value',
-                                grid: true,
-                                minimum: 0
-                            }, 
-                            {
-                                type: 'Time',
-                                position: 'bottom',
-                                step: [Ext.Date.HOUR, 1],
-                                fields: 'isodate',
-                                title: 'Datetime',
-                                dateFormat: 'c',
-                                label: {
-                                    renderer: function(v) {
-                                        return Ext.String.ellipsis(v, 15, false);
-                                    },
-                                    font: '9px Arial',
-                                    rotate: {
-                                        degrees: 270
-                                    }
-                                }
-                            }],
-                        series: [{
-                                type: 'column',
-                                axis: 'left',
-                                highlight: true,
-                                label: {
-                                    display: 'middle',
-                                    'text-anchor': 'middle',
-                                    field: 'value',
-                                    renderer: Ext.util.Format.numberRenderer('0.0'),
-                                    //orientation: 'vertical',
-                                    color: '#333'
-                                },
-                                xField: 'isodate',
-                                yField: ['value']
-                            }]
-                    }
-                });
-                winSos.show();
-                
-                
-                
-                
-                /*var store1 = Ext.create('Ext.data.JsonStore', {
-                    fields: ['name', 'data1', 'data2', 'data3', 'data4', 'data5', 'data6', 'data7', 'data9', 'data9'],
-                    data: generateData()
-                });
-                
-                var win = Ext.create('Ext.Window', {
-                    width: 800,
-                    height: 600,
-                    minHeight: 400,
-                    minWidth: 550,
-                    hidden: false,
-                    maximizable: true,
-                    title: 'DEV-TEST Column Chart',
-                    //renderTo: Ext.getBody(),
-                    layout: 'fit',
-                    tbar: [{
-                            text: 'Reload Data',
-                            handler: function() {
-                                store1.loadData(generateData());
-                            }
-                        }],
-                    items: {
-                        id: 'chartCmp',
-                        xtype: 'chart',
-                        style: 'background:#fff',
-                        animate: true,
-                        shadow: true,
-                        store: store1,
-                        axes: [{
-                                type: 'Numeric',
-                                position: 'left',
-                                fields: ['data1'],
-                                label: {
-                                    renderer: Ext.util.Format.numberRenderer('0,0')
-                                },
-                                title: 'Number of Hits',
-                                grid: true,
-                                minimum: 0
-                            }, 
-                            {
-                                type: 'Category',
-                                position: 'bottom',
-                                fields: ['name'],
-                                title: 'Month of the Year'
-                            }],
-                        series: [{
-                                type: 'column',
-                                axis: 'left',
-                                highlight: true,
-                                tips: {
-                                    trackMouse: true,
-                                    width: 140,
-                                    height: 28,
-                                    renderer: function(storeItem, item) {
-                                        this.setTitle(storeItem.get('name') + ': ' + storeItem.get('data1') + ' $');
-                                    }
-                                },
-                                label: {
-                                    display: 'insideEnd',
-                                    'text-anchor': 'middle',
-                                    field: 'data1',
-                                    renderer: Ext.util.Format.numberRenderer('0'),
-                                    orientation: 'vertical',
-                                    color: '#333'
-                                },
-                                xField: 'name',
-                                yField: 'data1'
-                            }]
-                    }
-                });
-                win.show();*/
-                
-                
-            });
-        </script>
-    </head>
-    <body id="docbody">
-        ciao
-    </body>
-</html>
\ No newline at end of file
diff --git a/interface/test/chart/designer.html b/interface/test/chart/designer.html
deleted file mode 100755
index 3e49eec..0000000
--- a/interface/test/chart/designer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Auto Generated with Ext Designer -->
-<!-- Modifications to this file will be overwritten. -->
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>charts.xds</title>
-    <link rel="stylesheet" type="text/css" href="http://extjs.cachefly.net/ext-4.0.2a/resources/css/ext-all.css"/>
-    <script type="text/javascript" src="http://extjs.cachefly.net/ext-4.0.2a/ext-all-debug.js"></script>
-    <script type="text/javascript" src="designer.js"></script>
-</head>
-<body></body>
-</html>
\ No newline at end of file
diff --git a/interface/test/chart/designer.js b/interface/test/chart/designer.js
deleted file mode 100755
index d207939..0000000
--- a/interface/test/chart/designer.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * File: designer.js
- * Date: Tue Mar 20 2012 10:10:02 GMT+0100 (CET)
- *
- * This file was generated by Ext Designer version 1.2.2.
- * http://www.sencha.com/products/designer/
- *
- * This file will be auto-generated each and everytime you export.
- *
- * Do NOT hand edit this file.
- */
-
-Ext.Loader.setConfig({
-    enabled: true
-});
-
-Ext.application({
-    name: 'MyApp',
-
-    stores: [
-        'testColumnStore'
-    ],
-
-    launch: function() {
-        Ext.QuickTips.init();
-
-        var cmp1 = Ext.create('MyApp.view.testColumn', {
-            renderTo: Ext.getBody()
-        });
-        cmp1.show();
-    }
-});
diff --git a/interface/test/chart/designer_includeOrder.txt b/interface/test/chart/designer_includeOrder.txt
deleted file mode 100755
index ae2c140..0000000
--- a/interface/test/chart/designer_includeOrder.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="text/javascript" src="app/view/ui/testColumn.js"></script>
-<script type="text/javascript" src="app/view/testColumn.js"></script>
-<script type="text/javascript" src="app/store/testColumnStore.js"></script>
diff --git a/interface/test_ObservationEditor.html b/interface/test_ObservationEditor.html
deleted file mode 100755
index bf64d88..0000000
--- a/interface/test_ObservationEditor.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>extDesigner</title>
-        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-        <link href='http://fonts.googleapis.com/css?family=Patrick+Hand' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Nova+Square' rel='stylesheet' type='text/css'>
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-
-        <script type="text/javascript" src="app/store/Offerings.js"></script>
-        <script type="text/javascript" src="app/store/Procedures.js"></script>
-        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
-        <script type="text/javascript" src="app/store/Observations.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/ObservationEditorColumn.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditorColumn.js"></script>
-        <script type="text/javascript" src="app/view/ui/ObservationEditor.js"></script>
-        <script type="text/javascript" src="app/view/ObservationEditor.js"></script>
-
-        <script type="text/javascript">
-            
-            function ISO8601FromDate(isodate) {
-                function pad(n){return n<10 ? '0'+n : n}
-                var offset = isodate.getTimezoneOffset()/-60;
-                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
-                return isodate.getFullYear()+'-'
-                    + pad(isodate.getMonth()+1)+'-'
-                    + pad(isodate.getDate())+'T'
-                    + pad(isodate.getHours())+':'
-                    + pad(isodate.getMinutes())+':'
-                    + pad(isodate.getSeconds())+'.'
-                    + isodate.getMilliseconds() + tz;
-            }
-
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-
-            Ext.application({
-                name: 'istsos',
-
-                stores: [
-                    'Offerings',
-                    'Procedures',
-                    'ObservedProperties'
-                ],
-
-                launch: function() {
-                    Ext.QuickTips.init();
-
-                    var cmp9 = Ext.create('istsos.view.ObservationEditor', {
-                        renderTo: Ext.getBody(),
-                        width: 900,
-                        height: 600
-                    });
-                    cmp9.show();
-                }
-            });
-            
-        </script>
-    </head>
-    <body></body>
-</html>
diff --git a/interface/test_csv.html b/interface/test_csv.html
deleted file mode 100755
index 233d3dd..0000000
--- a/interface/test_csv.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Auto Generated with Ext Designer -->
-<!-- Modifications to this file will be overwritten. -->
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>istsos.xds</title>
-        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-        <script type="text/javascript" src="app/Procedure.js"></script>
-        <script type="text/javascript" src="app/xdate.js"></script>
-        <script type="text/javascript" src="app/engine/wa.js"></script>
-        <script type="text/javascript">
-        
-            Ext.Loader.setConfig({
-                enabled: true
-            });
-
-            Ext.application({
-                name: 'istsos',
-                launch: function() {
-                    Ext.QuickTips.init();
-                    var cmp = Ext.create('istsos.view.TestCsv', {
-                        renderTo: Ext.getBody()
-                    });
-                    cmp.show();
-                    
-                }
-            });
-
-        </script>
-    </head>
-    <body></body>
-</html>
\ No newline at end of file
diff --git a/interface/test_observedPropertiesEditor.html b/interface/test_observedPropertiesEditor.html
deleted file mode 100755
index 86660a5..0000000
--- a/interface/test_observedPropertiesEditor.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>extDesigner</title>
-        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-        <!--
-        <link href='http://fonts.googleapis.com/css?family=Exo' rel='stylesheet' type='text/css'>
-        -->
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-        <!--<script type="text/javascript" src="/dygraphs/dygraph-combined.js"></script>-->
-        <script type="text/javascript" src="/dygraphs/dygraph-dev.js"></script>
-
-        <script src="codemirror/lib/codemirror.js"></script>
-        <link rel="stylesheet" href="codemirror/lib/codemirror.css">
-        <script src="codemirror/mode/javascript/javascript.js"></script>
-        <script type="text/javascript" src="ext/codemirror.js"></script>
-
-        <script type="text/javascript">
-            function pad(n){return n<10 ? '0'+n : n}
-            
-            function ISO8601FromDate(isodate) {
-                alert("ISO8601FromDate is deprecated!!");
-                var offset = isodate.getTimezoneOffset()/-60;
-                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
-                return isodate.getFullYear()+'-'
-                    + pad(isodate.getMonth()+1)+'-'
-                    + pad(isodate.getDate())+'T'
-                    + pad(isodate.getHours())+':'
-                    + pad(isodate.getMinutes())+':'
-                    + pad(isodate.getSeconds())+'.'
-                    + isodate.getMilliseconds() + tz;
-            }
-            String.prototype.capitalize = function(){
-                return this.toLowerCase().replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
-            };
-            Ext.override(Ext.layout.Layout, {
-                renderItem: function(item, target, position) {
-                    if (item && !item.rendered && item.isFieldLabelable && item.fieldLabel && item.allowBlank == false) {
-                        item.fieldLabel = '<span title="This is a mandatory parameter">' + item.fieldLabel + '<span style="color:red">*</span></span>';
-                    }
-                    this.callOverridden(arguments);
-                }
-            });
-            Function.prototype.defer =
-                function(n,o) {
-                // Get arguments as array
-                var a = [];
-                for(var i=2; i<arguments.length; i++)
-                    a.push(arguments[i]);
-                var that = this;
-                window.setTimeout(function(){return that.apply(o,a);},n);
-            };
-            
-            Ext.override(Ext.form.FieldSet, {
-                setExpanded: function(expanded) {
-                    var me = this,
-                    checkboxCmp = me.checkboxCmp,
-                    toggleCmp = me.toggleCmp,
-                    event;
-
-                    expanded = !!expanded;
-        
-                    if (checkboxCmp) {
-                        checkboxCmp.setValue(expanded);
-                    }
-        
-                    if (toggleCmp) {
-                        toggleCmp.setType(expanded ? 'up' : 'down');
-                    }
-        
-                    if (expanded) {
-                        event = "expand";
-                        me.removeCls(me.baseCls + '-collapsed');
-                    } else {
-                        event = "collapse";
-                        me.addCls(me.baseCls + '-collapsed');
-                    }
-                    me.collapsed = !expanded;
-                    if (expanded) {
-                        // ensure subitems will get rendered and layed out when expanding
-                        me.getComponentLayout().childrenChanged = true;
-                    }
-                    me.doComponentLayout();
-                    me.fireEvent(event, me);
-                    return me;
-                }
-            });
-            /* 
-            This reusable script is copyrighted.
-            Copyright (c) 2004,2005,2006 Claude Ostyn
-            This script is free for use with attribution
-            under the Creative Commons Attribution-ShareAlike 2.5 License.
-            To view a copy of this license, visit
-            http://creativecommons.org/licenses/by-sa/2.5/
-            or send a letter to
-            Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-
-            For any other use, contact Claude Ostyn via tools at Ostyn.com.
-
-            USE AT YOUR OWN RISK!
-            THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-            EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-            OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-            NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR OR COPYRIGHT HOLDER
-            BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-            ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-            CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-            SOFTWARE.
-             */
-
-            function centisecsToISODuration(n, bPrecise)
-            {
-                // Note: SCORM and IEEE 1484.11.1 require centisec precision
-                // Parameters:
-                // n = number of centiseconds
-                // bPrecise = optional parameter; if true, duration will
-                // be expressed without using year and/or month fields.
-                // If bPrecise is not true, and the duration is long,
-                // months are calculated by approximation based on average number
-                // of days over 4 years (365*4+1), not counting the extra days
-                // for leap years. If a reference date was available,
-                // the calculation could be more precise, but becomes complex,
-                // since the exact result depends on where the reference date
-                // falls within the period (e.g. beginning, end or ???)
-                // 1 year ~ (365*4+1)/4*60*60*24*100 = 3155760000 centiseconds
-                // 1 month ~ (365*4+1)/48*60*60*24*100 = 262980000 centiseconds
-                // 1 day = 8640000 centiseconds
-                // 1 hour = 360000 centiseconds
-                // 1 minute = 6000 centiseconds
-                var str = "P";
-                var nCs=n;
-                var nY=0, nM=0, nD=0, nH=0, nMin=0, nS=0;
-                n = Math.max(n,0); // there is no such thing as a negative duration
-                var nCs = n;
-                // Next set of operations uses whole seconds
-                with (Math)
-                {
-                    nCs = round(nCs);
-                    if (bPrecise == true)
-                    {
-                        nD = floor(nCs / 8640000);
-                    }
-                    else
-                    {
-                        nY = floor(nCs / 3155760000);
-                        nCs -= nY * 3155760000;
-                        nM = floor(nCs / 262980000);
-                        nCs -= nM * 262980000;
-                        nD = floor(nCs / 8640000);
-                    }
-                    nCs -= nD * 8640000;
-                    nH = floor(nCs / 360000);
-                    nCs -= nH * 360000;
-                    var nMin = floor(nCs /6000);
-                    nCs -= nMin * 6000
-                }
-                // Now we can construct string
-                if (nY > 0) str += nY + "Y";
-                if (nM > 0) str += nM + "M";
-                if (nD > 0) str += nD + "D";
-                if ((nH > 0) || (nMin > 0) || (nCs > 0))
-                {
-                    str += "T";
-                    if (nH > 0) str += nH + "H";
-                    if (nMin > 0) str += nMin + "M";
-                    if (nCs > 0) str += (nCs / 100) + "S";
-                }
-                if (str == "P") str = "PT0H0M0S";
-                // technically PT0S should do but SCORM test suite assumes longer form.
-                return str;
-            }
-        </script>
-
-        <script type="text/javascript" src="app/store/DataQualityStore.js"></script>
-        <script type="text/javascript" src="app/store/Offerings.js"></script>
-        <script type="text/javascript" src="app/store/Procedures.js"></script>
-        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
-
-        <script type="text/javascript" src="app/store/Services.js"></script>
-        <script type="text/javascript" src="app/store/gridProceduresList.js"></script>
-        <script type="text/javascript" src="app/view/ui/obsPropEditor.js"></script>
-        <script type="text/javascript" src="app/store/gridOfferings.js"></script>
-
-
-        <script type="text/javascript" src="app/Procedure.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/CheckColumn.js"></script>
-        <script type="text/javascript" src="app/view/CheckColumn.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/Calc.js"></script>
-        <script type="text/javascript" src="app/view/Calc.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/Chart.js"></script>
-        <script type="text/javascript" src="app/view/Chart.js"></script>
-
-
-        <script type="text/javascript">
-            
-            Ext.ns("wa");
-            wa.isodef = "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601";
-            
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-
-            Ext.application({
-                name: 'istsos',
-                launch: function() {
-                    
-                    Ext.QuickTips.init();
-                    
-                    var cmp9 = Ext.create('Ext.Viewport', {
-                        layout: {
-                            type: 'fit'
-                        },
-                        items: {
-                            xtype: 'panel',
-                            layout: {
-                                type: 'border'
-                            },
-                            title: 'TEST PAGE: CHART',
-                            items: [
-                                {
-                                    xtype: 'panel',
-                                    layout: {
-                                        type: 'fit'
-                                    },
-                                    region: 'north'
-                                },
-                                Ext.create('istsos.view.Chart',{
-                                    region: 'center',
-                                    id: 'chartpanel'
-                                })
-                            ]
-                        }
-                    });
-                    
-                    cmp9.show();
-                }
-            });
-          
-        </script>
-    </head>
-    <body>
-        <!--<div class="softLink" onclick="execute();">
-            execute
-        </div>
-        <div id="here" style="width: 100%"></div>-->
-    </body>
-</html>
diff --git a/interface/test_procedure.html b/interface/test_procedure.html
deleted file mode 100755
index 7912970..0000000
--- a/interface/test_procedure.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>extDesigner</title>
-        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-        <link href='http://fonts.googleapis.com/css?family=Patrick+Hand' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Nova+Square' rel='stylesheet' type='text/css'>
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-
-        <script type="text/javascript">
-            function ISO8601FromDate(isodate) {
-                function pad(n){return n<10 ? '0'+n : n}
-                var offset = isodate.getTimezoneOffset()/-60;
-                var tz = ((offset > 0) ? "+"+pad(offset) : pad(offset))
-                return isodate.getFullYear()+'-'
-                    + pad(isodate.getMonth()+1)+'-'
-                    + pad(isodate.getDate())+'T'
-                    + pad(isodate.getHours())+':'
-                    + pad(isodate.getMinutes())+':'
-                    + pad(isodate.getSeconds())+'.'
-                    + isodate.getMilliseconds() + tz;
-            }
-            String.prototype.capitalize = function(){
-                return this.toLowerCase().replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
-            };
-            Ext.override(Ext.layout.Layout, {
-                renderItem: function(item, target, position) {
-                    if (item && !item.rendered && item.isFieldLabelable && item.fieldLabel && item.allowBlank == false) {
-                        item.fieldLabel = '<span title="This is a mandatory parameter">' + item.fieldLabel + '<span style="color:red">*</span></span>';
-                    }
-                    this.callOverridden(arguments);
-                }
-            });
-            /*Ext.override(Ext.form.field.Picker, {
-                alignPicker: Ext.Function.createSequence(Ext.form.field.Picker.prototype.alignPicker, function() {
-                    var picker = this.getPicker();
-                    picker.setHeight(picker.store && picker.store.getCount() ? null : 0);
-                })
-            });
-            
-            Ext.override(Ext.form.field.Picker, {
-                alignPicker: function() {
-                    var me = this,
-                    picker = me.getPicker();
-                    if (me.isExpanded) {
-                        if (me.matchFieldWidth) {
-                            // Auto the height (it will be constrained by min and max width) unless there are no records to display.
-                            picker.setWidth(me.bodyEl.getWidth());
-                        } else { // MODIFIED - this else block added 
-                            picker.setSize(
-                            me.listConfig ? me.listConfig.width || null : null,
-                            ( picker.store && picker.store.getCount() ) ? null : 0
-                        );
-                        }
-                        if (picker.isFloating()) {
-                            me.doAlign();
-                        }
-                        picker.setHeight(picker.store && picker.store.getCount() ? null : 0);
-                    }
-                }
-            });*/
-        </script>
-
-        <script type="text/javascript" src="app/store/Fake.js"></script>
-        <script type="text/javascript" src="app/store/cmbIdentification.js"></script>
-        <script type="text/javascript" src="app/store/cmbSystemType.js"></script>
-        <script type="text/javascript" src="app/store/cmbSml.js"></script>
-        <script type="text/javascript" src="app/store/cmbName.js"></script>
-        <script type="text/javascript" src="app/store/cmbDocumentFormat.js"></script>
-        <script type="text/javascript" src="app/store/gridDocumentation.js"></script>
-        <script type="text/javascript" src="app/store/gridOutputs.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/procedure.js"></script>
-        <script type="text/javascript" src="app/view/procedure.js"></script>
-
-        <script type="text/javascript">
-            
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-
-            Ext.application({
-                name: 'istsos',
-                stores: [
-                    'Fake'
-                ],
-                launch: function() {
-                    Ext.QuickTips.init();
-
-                    var cmp9 = Ext.create('istsos.view.procedure', {
-                        renderTo: Ext.getBody(),
-                        id: 'procedureid',
-                        width: 1100,
-                        height: 900,
-                        dockedItems: [
-                            {
-                                xtype: 'toolbar',
-                                dock: 'top',
-                                items: [
-                                    {
-                                        xtype: 'button',
-                                        text: 'SUBMIT',
-                                        id: 'configsubmit',
-                                        handler: function(){
-                                            Ext.getCmp('procedureid').executePost();
-                                        }
-                                    },
-                                    {
-                                        xtype: 'button',
-                                        text: 'TEST',
-                                        handler: function(){
-                                            Ext.getCmp('procedureid').getContacts();
-                                        }
-                                    }
-                                ]
-                            }
-                        ]
-                    });
-                    cmp9.show();
-                }
-            });
-            
-        </script>
-    </head>
-    <body></body>
-</html>
diff --git a/interface/test_requests.html b/interface/test_requests.html
deleted file mode 100755
index d81b099..0000000
--- a/interface/test_requests.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE html>
-<html>
-    <head>
-        <title></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <table style="width: 100%; height: 100%">
-            <tbody>
-                <tr>
-                    <td>
-                        
-                    </td>
-                    <td>
-                        <iframe id=""/>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>
diff --git a/interface/test_virtualprocedureeditor.html b/interface/test_virtualprocedureeditor.html
deleted file mode 100755
index 7e7a7b0..0000000
--- a/interface/test_virtualprocedureeditor.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>extDesigner</title>
-        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-        <link href='http://fonts.googleapis.com/css?family=Patrick+Hand' rel='stylesheet' type='text/css'>
-        <link href='http://fonts.googleapis.com/css?family=Nova+Square' rel='stylesheet' type='text/css'>
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-        
-        
-        <script src="codemirror/lib/codemirror.js"></script>
-        <link rel="stylesheet" href="codemirror/lib/codemirror.css">
-        <script src="codemirror/mode/python/python.js"></script>
-        <script type="text/javascript" src="ext/codemirror.js"></script>
-        
-        
-        <script type="text/javascript" src="app/store/RatingCurve.js"></script>
-        <script type="text/javascript" src="app/store/vplist.js"></script>
-
-        <script type="text/javascript" src="app/view/ui/VirtualProcedureEditor.js"></script>
-        <script type="text/javascript" src="app/view/VirtualProcedureEditor.js"></script>
-
-        <script type="text/javascript">
-            
-            Ext.ns("wa");
-            wa.isodef = "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601";
-            wa.url = "../wa";
-
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-
-            Ext.application({
-                name: 'istsos',
-                launch: function() {
-                    Ext.QuickTips.init();
-                    
-                    Ext.create('Ext.container.Viewport', {
-                        layout: 'fit',
-                        items: Ext.create('istsos.view.VirtualProcedureEditor',{
-                            istService: 'demo'
-                        }),
-                        padding: 35
-                    });
-                    
-                }
-            });
-            
-        </script>
-    </head>
-    <body></body>
-</html>
diff --git a/interface/viewer.html b/interface/viewer.html
deleted file mode 100755
index fce859c..0000000
--- a/interface/viewer.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>istSOS - Data viewer</title>
-        <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.css"/>
-        <!--[if gte IE 9]>
-            <style type="text/css">
-                .gradient {
-                filter: none;
-                }
-            </style>
-        <![endif]-->
-        <link rel="stylesheet" type="text/css" href="css/main.css"/>
-
-        <link href='http://fonts.googleapis.com/css?family=Electrolize' rel='stylesheet' type='text/css'>
-
-        <script type="text/javascript" src="ext/ext-all-debug.js"></script>
-
-        <script type="text/javascript" src="dygraphs/dygraph-combined.js"></script>
-
-        <script type="text/javascript" src="app/store/Offerings.js"></script>
-        <script type="text/javascript" src="app/store/gridProceduresList.js"></script>
-        <script type="text/javascript" src="app/store/Services.js"></script>
-        
-        <script type="text/javascript" src="app/store/ObservedProperties.js"></script>
-        
-        <script type="text/javascript" src="app/view/ui/ProcedureChooser.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureChooser.js"></script>
-        
-        <script type="text/javascript" src="app/view/ui/ProcedureChart.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureChart.js"></script>
-        
-        <script type="text/javascript" src="app/view/ui/ProcedureGrid.js"></script>
-        <script type="text/javascript" src="app/view/ProcedureGrid.js"></script>
-        
-        
-        <script type="text/javascript" src="app/view/ui/Viewer.js"></script>
-        <script type="text/javascript" src="app/view/Viewer.js"></script>
-
-        <script type="text/javascript" src="app/Procedure.js"></script>
-
-
-
-        <style type="text/css">
-
-            .x-btn-default-toolbar-small .x-btn-inner {
-                color: white !important;
-            }
-            .x-btn-arrow {
-                background-image: url('ext/resources/themes/images/default/button/arrow.gif');
-                display: block;
-            }
-        </style> 
-
-        <script type="text/javascript">
-            
-            function pad(n){return n<10 ? '0'+n : n}
-            
-            Ext.ns("wa");
-            wa.url = "../wa";
-
-            Ext.Loader.setConfig({
-                enabled: false
-            });
-            
-            Ext.application({
-                
-                name: 'istsos',
-
-                launch: function() {
-                    
-                    Ext.QuickTips.init();
-                    
-                    Ext.Ajax.on("requestexception",function(conn, response, options, eOpts ){
-                        try{
-                            var json = Ext.decode(response.responseText);
-                            if(!json.success && !Ext.isEmpty(json.message)){
-                                Ext.Msg.alert(response.statusText, json.message);
-                            }
-                        }catch(e){
-                            console.error(response);
-                        }
-                    });
-                    
-                    Ext.Ajax.on("requestcomplete",function(conn, response, options, eOpts ){
-                        try{
-                            var json = Ext.decode(response.responseText);
-                            if(!json.success && !Ext.isEmpty(json.message)){
-                                Ext.Msg.alert("Server message",json.message + "<br/><br/>" + 
-                                    "<small>Status response: " + response.statusText + "</small><br/>" + 
-                                    "<small>Resource: " + json.resource + "</small><br/>" + 
-                                    "<small>Method: " + json.method + "</small><br/>" + 
-                                    "<small>Path " + json.path + "</small>");
-                                console.error(json.message);
-                            }else if (json.success && !Ext.isEmpty(json.message)){
-                                console.log(json.message);
-                            }
-                        }catch(e){
-                            console.error(response);
-                        }
-                    });
-                    
-                    Ext.create('istsos.view.Viewer', {
-                        renderTo: Ext.getBody()
-                    }).show();
-                    
-                }
-            });
-        </script>
-    </head>
-    <body></body>
-</html>
diff --git a/istsoslib/__init__.py b/istsoslib/__init__.py
index b203b48..82d9748 100755
--- a/istsoslib/__init__.py
+++ b/istsoslib/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "renderers", "responders", "filters", "sosDatabase", "sosException","sos_version" ]
diff --git a/istsoslib/__init__.pyc b/istsoslib/__init__.pyc
index 53d5a60..98020d4 100644
Binary files a/istsoslib/__init__.pyc and b/istsoslib/__init__.pyc differ
diff --git a/istsoslib/filters/DS_filter.py b/istsoslib/filters/DS_filter.py
index f88a296..727a8d1 100755
--- a/istsoslib/filters/DS_filter.py
+++ b/istsoslib/filters/DS_filter.py
@@ -1,98 +1,103 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib.filters import filter as f
-from istsoslib import sosException
-
-class sosDSfilter(f.sosFilter):
-    "filter object for a DescribeSensor request"
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
-        #**************************
-        if method == "GET":
-            self.outputFormat = None
-            self.procedure = None
-            #-------OUTPUTFORMAT----
-            if requestObject.has_key("outputformat"):
-                if requestObject["outputformat"] in sosConfig.parameters["DS_outputFormats"]:
-                    self.outputFormat = requestObject["outputformat"]
-                else:
-                    err_txt = "Supported \"outputFormat\" values are: " + ",".join(sosConfig.parameters["DS_outputFormats"])
-                    raise sosException.SOSException("InvalidParameterValue","outputFormat",err_txt)
-            else:
-                #self.outputFormat = sosConfig.parameters["DS_outputFormats"][0]
-                raise sosException.SOSException("MissingParameterValue","outputFormat","Parameter \"outputFormat\" is mandatory")
-            #---------PROCEDURES----
-            if requestObject.has_key("procedure"):
-                """
-                self.procedure = requestObject["procedure"]
-                """
-                prc = requestObject["procedure"].split(":")
-                self.procedure = prc[-1]
-                if len(prc)>1:
-                    prc[-1]=""
-                    if ":".join(prc)==sosConfig.urn["procedure"]:
-                        pass
-                    else:
-                        err_txt = "Supported \"procedure\" urn is: " + sosConfig.urn["procedure"]
-                        err_txt += "\n passed: " + ":".join(prc) 
-                        raise sosException.SOSException("InvalidParameterValue","procedure",err_txt)
-            else:
-                raise sosException.SOSException("MissingParameterValue","procedure","Parameter \"procedure\" is mandatory with multiplicity 1")
-        #**************************            
-        if method == "POST":            
-            from xml.dom import minidom
-            self.outputFormat = None
-            self.procedure = None
-            #-------OUTPUTFORMAT--
-            if "outputFormat" in requestObject.attributes.keys():
-                self.outputFormat = str(requestObject.getAttribute("outputFormat"))
-                if self.outputFormat not in sosConfig.parameters["DS_outputFormats"]:
-                    err_txt = "Allowed \"outputFormat\" values are: " + ",".join(sosConfig.parameters["DS_outputFormats"])
-                    raise sosException.SOSException("InvalidParameterValue","outputFormat",err_txt)
-            else:
-                err_txt = "Parameter \"outputFormat\" is mandatory"
-                raise sosException.SOSException("MissingParameterValue","outputFormat","Parameter \"outputFormat\" is mandatory")
-            #-------PROCEDURES---
-            procs=requestObject.getElementsByTagName('procedure')
-            if len(procs) > 0:
-                if len(procs) < 2:
-                    #raise sosException.SOSException(1,"" + str(procs[0].nodeType) + "," + str(procs[0].TEXT_NODE))
-                    val = procs[0].firstChild
-                    if val.nodeType == val.TEXT_NODE:
-                        """
-                        self.procedure = str(val.data)
-                        """
-                        prc = str(val.data).split(":")
-                        if len(prc)>1:
-                            if prc[0:-1] == filter(None,sosConfig.urn["procedure"].split(":")):
-                                pass
-                            else:
-                                err_txt = "Supported \"procedure\" urn is: " + sosConfig.urn["procedure"]
-                                raise sosException.SOSException("InvalidParameterValue","procedure",err_txt)
-                        self.procedure = prc[-1] 
-                    else:
-                        err_txt = "XML parsing error (get value: procedure)"
-                        raise sosException.SOSException("MissingParameterValue","procedure","Parameter \"procedure\" is mandatory with multiplicity 1",err_txt)
-                else:
-                    err_txt = "Allowed only ONE parameter \"procedure\""
-                    raise sosException.SOSException("IvalidParameterValue","procedure",err_txt)
-            else:
-                err_txt = "Parameter \"procedure\" is mandatory"
-                raise sosException.SOSException("MissingParameterValue","procedure","Parameter \"procedure\" is mandatory with multiplicity 1")
-                
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib.filters import filter as f
+from istsoslib import sosException
+
+
+class sosDSfilter(f.sosFilter):
+    "filter object for a DescribeSensor request"
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
+        #**************************
+        if method == "GET":
+            self.outputFormat = None
+            self.procedure = None
+            #-------OUTPUTFORMAT----
+            if requestObject.has_key("outputformat"):
+                if requestObject["outputformat"] in sosConfig.parameters["DS_outputFormats"]:
+                    self.outputFormat = requestObject["outputformat"]
+                else:
+                    err_txt = "Supported \"outputFormat\" values are: " + ",".join(sosConfig.parameters["DS_outputFormats"])
+                    raise sosException.SOSException("InvalidParameterValue","outputFormat",err_txt)
+            else:
+                #self.outputFormat = sosConfig.parameters["DS_outputFormats"][0]
+                raise sosException.SOSException("MissingParameterValue","outputFormat","Parameter \"outputFormat\" is mandatory")
+            #---------PROCEDURES----
+            if requestObject.has_key("procedure"):
+                """
+                self.procedure = requestObject["procedure"]
+                """
+                prc = requestObject["procedure"].split(":")
+                self.procedure = prc[-1]
+                if len(prc)>1:
+                    prc[-1]=""
+                    if ":".join(prc)==sosConfig.urn["procedure"]:
+                        pass
+                    else:
+                        err_txt = "Supported \"procedure\" urn is: " + sosConfig.urn["procedure"]
+                        err_txt += "\n passed: " + ":".join(prc)
+                        raise sosException.SOSException("InvalidParameterValue","procedure",err_txt)
+            else:
+                raise sosException.SOSException("MissingParameterValue","procedure","Parameter \"procedure\" is mandatory with multiplicity 1")
+        #**************************
+        if method == "POST":
+            from xml.dom import minidom
+            self.outputFormat = None
+            self.procedure = None
+            #-------OUTPUTFORMAT--
+            if "outputFormat" in requestObject.attributes.keys():
+                self.outputFormat = str(requestObject.getAttribute("outputFormat"))
+                if self.outputFormat not in sosConfig.parameters["DS_outputFormats"]:
+                    err_txt = "Allowed \"outputFormat\" values are: " + ",".join(sosConfig.parameters["DS_outputFormats"])
+                    raise sosException.SOSException("InvalidParameterValue","outputFormat",err_txt)
+            else:
+                err_txt = "Parameter \"outputFormat\" is mandatory"
+                raise sosException.SOSException("MissingParameterValue","outputFormat","Parameter \"outputFormat\" is mandatory")
+            #-------PROCEDURES---
+            procs=requestObject.getElementsByTagName('procedure')
+            if len(procs) > 0:
+                if len(procs) < 2:
+                    #raise sosException.SOSException(1,"" + str(procs[0].nodeType) + "," + str(procs[0].TEXT_NODE))
+                    val = procs[0].firstChild
+                    if val.nodeType == val.TEXT_NODE:
+                        """
+                        self.procedure = str(val.data)
+                        """
+                        prc = str(val.data).split(":")
+                        if len(prc)>1:
+                            if prc[0:-1] == filter(None,sosConfig.urn["procedure"].split(":")):
+                                pass
+                            else:
+                                err_txt = "Supported \"procedure\" urn is: " + sosConfig.urn["procedure"]
+                                raise sosException.SOSException("InvalidParameterValue","procedure",err_txt)
+                        self.procedure = prc[-1]
+                    else:
+                        err_txt = "XML parsing error (get value: procedure)"
+                        raise sosException.SOSException("MissingParameterValue","procedure","Parameter \"procedure\" is mandatory with multiplicity 1",err_txt)
+                else:
+                    err_txt = "Allowed only ONE parameter \"procedure\""
+                    raise sosException.SOSException("IvalidParameterValue","procedure",err_txt)
+            else:
+                err_txt = "Parameter \"procedure\" is mandatory"
+                raise sosException.SOSException("MissingParameterValue","procedure","Parameter \"procedure\" is mandatory with multiplicity 1")
+
diff --git a/istsoslib/filters/DS_filter.pyc b/istsoslib/filters/DS_filter.pyc
index 8a08ff8..1633d63 100644
Binary files a/istsoslib/filters/DS_filter.pyc and b/istsoslib/filters/DS_filter.pyc differ
diff --git a/istsoslib/filters/GC_filter.py b/istsoslib/filters/GC_filter.py
index 3c065b0..075f29c 100755
--- a/istsoslib/filters/GC_filter.py
+++ b/istsoslib/filters/GC_filter.py
@@ -1,57 +1,61 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License. 
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib.filters import filter as f
-from istsoslib import sosException
-
-class sosGCfilter(f.sosFilter):
-    "filter object for a GetCapabalities request"
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
-        #**************************
-        if method == "GET":
-            #-------SECTIONS-------------           
-            if requestObject.has_key("section"):
-                self.sections = requestObject["section"].lower().split( "," )
-                for s in self.sections:
-                    if s not in sosConfig.parameters["GC_Section"]:
-                        err_txt = "Allowed parameter \"section\" values are: " + ",".join(sosConfig.parameters["GC_Section"])
-                        raise sosException.SOSException("InvalidParameterValue","sections",err_txt)
-            else:
-                self.sections=["all"]
-        #**************************
-        if method == "POST":           
-            if requestObject.nodeType == requestObject.ELEMENT_NODE:
-                #-------SECTIONS-------------
-                self.sections=[]
-                sects=requestObject.getElementsByTagName('section')
-                if len(sects) > 0:
-                    for sect in sects:
-                        for val in sect.childNodes:
-                            if val.nodeType == val.TEXT_NODE and str(val.data).lower() in sosConfig.parameters["GC_Section"]:
-                                self.sections.append(str(val.data).lower())
-                            else:
-                                err_txt = "Allowed parameter \"section\" values are: " + ",".join(sosConfig.parameters["GC_Section"])
-                                raise sosException.SOSException("InvalidParameterValue","sections",err_txt)
-                else:
-                    self.sections = ["all"]
-            
-
-    
-
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib.filters import filter as f
+from istsoslib import sosException
+
+class sosGCfilter(f.sosFilter):
+    "filter object for a GetCapabalities request"
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
+        #**************************
+        if method == "GET":
+            #-------SECTIONS-------------           
+            if requestObject.has_key("section"):
+                self.sections = requestObject["section"].lower().split( "," )
+                for s in self.sections:
+                    if s not in sosConfig.parameters["GC_Section"]:
+                        err_txt = "Allowed parameter \"section\" values are: " + ",".join(sosConfig.parameters["GC_Section"])
+                        raise sosException.SOSException("InvalidParameterValue","sections",err_txt)
+            else:
+                self.sections=["all"]
+        #**************************
+        if method == "POST":           
+            if requestObject.nodeType == requestObject.ELEMENT_NODE:
+                #-------SECTIONS-------------
+                self.sections=[]
+                sects=requestObject.getElementsByTagName('section')
+                if len(sects) > 0:
+                    for sect in sects:
+                        for val in sect.childNodes:
+                            if val.nodeType == val.TEXT_NODE and str(val.data).lower() in sosConfig.parameters["GC_Section"]:
+                                self.sections.append(str(val.data).lower())
+                            else:
+                                err_txt = "Allowed parameter \"section\" values are: " + ",".join(sosConfig.parameters["GC_Section"])
+                                raise sosException.SOSException("InvalidParameterValue","sections",err_txt)
+                else:
+                    self.sections = ["all"]
+            
+
+    
+
+
diff --git a/istsoslib/filters/GC_filter.pyc b/istsoslib/filters/GC_filter.pyc
index 78d4d0f..eb0f9d3 100644
Binary files a/istsoslib/filters/GC_filter.pyc and b/istsoslib/filters/GC_filter.pyc differ
diff --git a/istsoslib/filters/GF_filter.py b/istsoslib/filters/GF_filter.py
index 92365c2..1e4ba31 100755
--- a/istsoslib/filters/GF_filter.py
+++ b/istsoslib/filters/GF_filter.py
@@ -1,101 +1,105 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib.filters import filter as f
-from istsoslib import sosException
-
-def getElemTxt(node):
-    if node.hasChildNodes():
-        val = node.firstChild
-        if val.nodeType == val.TEXT_NODE:
-            return str(val.data)
-        else:
-            err_txt = "get node text value: \"%s\" is not of type TEXT" %(node.nodeName)
-            raise Exception(err_txt)
-    else:
-            err_txt = "get node text value: \"%s\" has no child node" %(node.nodeName)
-            raise Exception(err_txt)
-        
-def getElemAtt(node,att):
-    if att in node.attributes.keys():
-        return str(node.getAttribute(att))
-    else:
-        err_txt = "get node attribute value: \"%s\"has no \"%s\" attribute" %(node.nodeName,att)
-        raise Exception(err_txt)
-    
-def get_name_from_urn(stringa,urnName,sosConfig):
-    a = stringa.split(":")
-    name = a[-1]
-    urn = sosConfig.urn[urnName].split(":")
-    if len(a)>1:
-        for index in range(len(urn)-1):
-            if urn[index]==a[index]:
-                pass
-            else:
-                raise Exception(1,"Urn \"%s\" is not valid: %s."%(a,urn))
-    return name 
-
-class sosGFfilter(f.sosFilter):
-    "filter object for a GetFeatureOfInterest request"
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
-        #**************************
-        if method == "GET":
-            #---FeatureOfInterest
-            if not requestObject.has_key("featureofinterestid"):
-                raise sosException.SOSException("MissingParameterValue","FeatureOfInterestId","Parameter \"FeatureOfInterestId\" is required with multiplicity 1")
-            else:
-                self.featureOfInterest = get_name_from_urn(requestObject["featureofinterestid"],"feature",sosConfig) #one-many ID
-            #---srsName
-            if requestObject.has_key("srsName"):
-                self.srsName = get_name_from_urn(requestObject["srsName"],"refsystem",sosConfig)
-                if not self.srsName in sosConfig.parameters["GO_srs"]:
-                    raise sosException.SOSException("OptionNotSupported","srsName","Supported \"srsName\" valueas are: " + ",".join(sosConfig.parameters["GO_srs"]))
-            else:
-                self.srsName = sosConfig.parameters["GO_srs"][0]
-        if method == "POST":
-            #---FeatureOfInterest
-            fets = requestObject.getElementsByTagName('FeatureOfInterestId')
-            if len(fets)==1:
-                try:
-                    self.featureOfInterest = get_name_from_urn(getElemAtt(fets[0],"xlink:href"),"feature",sosConfig)
-                except:
-                    try:
-                        self.featureOfInterest = get_name_from_urn(getElemTxt(fets[0]),"feature",sosConfig)
-                    except:
-                        err_txt = "XML parsing error (get value: FeatureOfInterestId)"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                err_txt = "parameter \"FeatureOfInterestId\" is mandatory with multiplicity 1"
-                if len(fets)==0:
-                    raise sosException.SOSException("MissingParameterValue","FeatureOfInterestId",err_txt)
-                else:
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-
-            #---srsName
-            srss = requestObject.getElementsByTagName('srsName')
-            if len(srss) ==1:
-                self.srsName = get_name_from_urn(getElemTxt(srss[0]),"refsystem",sosConfig)
-                if not self.srsName in sosConfig.parameters["GO_srs"]:
-                    raise sosException.SOSException("OptionNotSupported","srsName","Supported \"srsName\" valueas are: " + ",".join(sosConfig.parameters["GO_srs"]))
-            elif len(srss) == 0:
-                self.srsName = sosConfig.parameters["GO_srs"][0]
-            else:
-                err_txt = "parameter \"srsName\" is optional with multiplicity 1"
-                raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib.filters import filter as f
+from istsoslib import sosException
+
+def getElemTxt(node):
+    if node.hasChildNodes():
+        val = node.firstChild
+        if val.nodeType == val.TEXT_NODE:
+            return str(val.data)
+        else:
+            err_txt = "get node text value: \"%s\" is not of type TEXT" %(node.nodeName)
+            raise Exception(err_txt)
+    else:
+            err_txt = "get node text value: \"%s\" has no child node" %(node.nodeName)
+            raise Exception(err_txt)
+        
+def getElemAtt(node,att):
+    if att in node.attributes.keys():
+        return str(node.getAttribute(att))
+    else:
+        err_txt = "get node attribute value: \"%s\"has no \"%s\" attribute" %(node.nodeName,att)
+        raise Exception(err_txt)
+    
+def get_name_from_urn(stringa,urnName,sosConfig):
+    a = stringa.split(":")
+    name = a[-1]
+    urn = sosConfig.urn[urnName].split(":")
+    if len(a)>1:
+        for index in range(len(urn)-1):
+            if urn[index]==a[index]:
+                pass
+            else:
+                raise Exception(1,"Urn \"%s\" is not valid: %s."%(a,urn))
+    return name 
+
+class sosGFfilter(f.sosFilter):
+    "filter object for a GetFeatureOfInterest request"
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
+        #**************************
+        if method == "GET":
+            #---FeatureOfInterest
+            if not requestObject.has_key("featureofinterestid"):
+                raise sosException.SOSException("MissingParameterValue","FeatureOfInterestId","Parameter \"FeatureOfInterestId\" is required with multiplicity 1")
+            else:
+                self.featureOfInterest = get_name_from_urn(requestObject["featureofinterestid"],"feature",sosConfig) #one-many ID
+            #---srsName
+            if requestObject.has_key("srsname"):
+                self.srsName = get_name_from_urn(requestObject["srsname"],"refsystem",sosConfig)
+                if not self.srsName in sosConfig.parameters["GO_srs"]:
+                    raise sosException.SOSException("OptionNotSupported","srsName","Supported \"srsName\" valueas are: " + ",".join(sosConfig.parameters["GO_srs"]))
+            else:
+                self.srsName = sosConfig.parameters["GO_srs"][0]
+        if method == "POST":
+            #---FeatureOfInterest
+            fets = requestObject.getElementsByTagName('FeatureOfInterestId')
+            if len(fets)==1:
+                try:
+                    self.featureOfInterest = get_name_from_urn(getElemAtt(fets[0],"xlink:href"),"feature",sosConfig)
+                except:
+                    try:
+                        self.featureOfInterest = get_name_from_urn(getElemTxt(fets[0]),"feature",sosConfig)
+                    except:
+                        err_txt = "XML parsing error (get value: FeatureOfInterestId)"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                err_txt = "parameter \"FeatureOfInterestId\" is mandatory with multiplicity 1"
+                if len(fets)==0:
+                    raise sosException.SOSException("MissingParameterValue","FeatureOfInterestId",err_txt)
+                else:
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+
+            #---srsName
+            srss = requestObject.getElementsByTagName('srsName')
+            if len(srss) ==1:
+                self.srsName = get_name_from_urn(getElemTxt(srss[0]),"refsystem",sosConfig)
+                if not self.srsName in sosConfig.parameters["GO_srs"]:
+                    raise sosException.SOSException("OptionNotSupported","srsName","Supported \"srsName\" valueas are: " + ",".join(sosConfig.parameters["GO_srs"]))
+            elif len(srss) == 0:
+                self.srsName = sosConfig.parameters["GO_srs"][0]
+            else:
+                err_txt = "parameter \"srsName\" is optional with multiplicity 1"
+                raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            
diff --git a/istsoslib/filters/GF_filter.pyc b/istsoslib/filters/GF_filter.pyc
new file mode 100644
index 0000000..feb8bf2
Binary files /dev/null and b/istsoslib/filters/GF_filter.pyc differ
diff --git a/istsoslib/filters/GO_filter.py b/istsoslib/filters/GO_filter.py
index 884a62d..55d9532 100755
--- a/istsoslib/filters/GO_filter.py
+++ b/istsoslib/filters/GO_filter.py
@@ -1,564 +1,568 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib.filters import filter as f
-from istsoslib import sosException, sosUtils
-from lib import isodate as iso
-
-def get_name_from_urn(stringa,urnName,sosConfig):
-    a = stringa.split(":")
-    name = a[-1]
-    urn = sosConfig.urn[urnName].split(":")
-    if len(a)>1:
-        for index in range(len(urn)-1):
-            if urn[index]==a[index]:
-                pass
-            else:
-                raise Exception("Urn \"%s\" is not valid: %s."%(a,urn))
-    return name
-
-
-'''
-ATTRIBUTES:
-
-offering (string)
-qualityIndex (boolean)
-observedProperty (array of string)
-srsName (string)
-eventTime (array of string)
-procedure (array of string)
-featureOfInterest (array of string)
-
-'''
-class sosGOfilter(f.sosFilter):
-    "filter object for a GetObservations request"
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
-        # @TODO Declare attribute first!
-        # self.offering = None
-        # etc..
-
-        #**************************
-        if method == "GET":
-            #---------- THE OFFERING
-            if requestObject.has_key("offering"):
-                try:
-                    self.offering = get_name_from_urn(requestObject["offering"],"offering",sosConfig)
-                except Exception as e:
-                    raise sosException.SOSException("InvalidParameterValue","offering","%s" % e)
-            else:
-                raise sosException.SOSException("MissingParameterValue","offering","Parameter \"offering\" is mandatory with multiplicity 1")
-                
-            #---------- THE OBSERVED PROPERTY
-            if requestObject.has_key("observedproperty"):
-                self.observedProperty = []
-                oprs = requestObject["observedproperty"].split(",")
-                for opr in oprs:
-                    # get_name_from_urn limit the ability to ask for an observedProperty with LIKE:
-                    # eg: ask "water" to get all the water related data, "water:discharge", "water:temperature" ...
-                    #oprName = get_name_from_urn(opr,"property")
-                    oprName = opr
-                    self.observedProperty.append(oprName) # one-many ID 
-            else:
-                raise sosException.SOSException("MissingParameterValue","observedProperty","Parameter \"observedProperty\" is mandatory with multiplicity N")
-                
-            #---------- RESPONSE FORMAT
-            if requestObject.has_key("responseformat"):
-                if not requestObject["responseformat"] in sosConfig.parameters["GO_responseFormat"]:   
-                    raise sosException.SOSException("InvalidParameterValue","responseFormat","Parameter \"responseFormat\" sent with invalid value : use one of %s" % "; ".join(sosConfig.parameters["GO_responseFormat"]))
-                else:
-                    self.responseFormat = requestObject["responseformat"]
-            else:
-                raise sosException.SOSException("MissingParameterValue","responseFormat","Parameter \"responseFormat\" is mandatory with multiplicity 1") #one
-                
-            #OPTIONAL request parameters
-            #---------- SRS FILTER                
-            if requestObject.has_key("srsname"):
-                try:
-                    self.srsName = get_name_from_urn(requestObject["srsname"],"refsystem",sosConfig)
-                except Exception as e:
-                    raise sosException.SOSException("InvalidParameterValue","srsname","%s" % e)
-            
-                if not self.srsName in sosConfig.parameters["GO_srs"]:
-                    raise sosException.SOSException("InvalidParameterValue","srsName","srsName \"%s\" not supported, use one of: %s" %(self.srsName,",".join(sosConfig.parameters["GO_srs"])))
-            else:
-                self.srsName = sosConfig.parameters["GO_srs"][0]
-
-            #---------- TIME FILTER                
-            if requestObject.has_key('eventtime'):
-                self.eventTime = []
-                for i in requestObject["eventtime"].replace(" ","+").split(","):
-                    if len(i.split("/")) < 3:
-                        self.eventTime.append(i.split("/"))
-                    else:
-                        raise sosException.SOSException("InvalidParameterValue","eventTime","Parameter \"eventTime\" bad formatted")
-                
-                # Checking if some event limitation is reached
-                #if sosConfig["maxGoPeriod"]:
-                tp=[]
-                for t in self.eventTime:
-                    if len(t) == 2:
-                        tp.append(iso.parse_datetime(t[0]))
-                        tp.append(iso.parse_datetime(t[1]))
-                    if len(t)==1:
-                        tp.append(iso.parse_datetime(t[0]))
-                if int(sosConfig.maxGoPeriod) > 0:
-                    from datetime import timedelta
-                    d = timedelta(hours=int(sosConfig.maxGoPeriod))
-                    userPeriod = max(tp)-min(tp)
-                    if d < userPeriod:
-                        raise sosException.SOSException("InvalidParameterValue","eventTime","You are requesting data for a period of [%s hours], but you are not permitted to ask for a period longer than: %s hours" % (userPeriod,d))
-                
-            else:
-                self.eventTime = None
-            
-            #---------- PROCEDURES FILTER
-            if requestObject.has_key("procedure"):
-                self.procedure = []
-                prcs = requestObject["procedure"].split(",")
-                for prc in prcs:
-                    try:
-                        prcName = get_name_from_urn(prc,"procedure",sosConfig)
-                    except Exception as e:
-                        raise sosException.SOSException("InvalidParameterValue","procedure","%s" % e)
-            
-                    self.procedure.append(prcName)
-            else:
-                self.procedure = None
-            
-            #---------- FEATURES OF INTEREST FILTER
-            self.featureOfInterest = None
-            self.featureOfInterestSpatial = None
-            if requestObject.has_key("featureofinterest"):
-                foi = requestObject["featureofinterest"]
-                if foi.find("<ogc:")>=0 and foi.find("<gml:")>=0:
-                    #raise sosException.SOSException(3,"FOI SPATIAL: %s" %(foi))
-                    self.featureOfInterestSpatial = sosUtils.ogcSpatCons2PostgisSql(foi,'geom_foi',sosConfig.istsosepsg)
-                else:
-                    try:
-                        self.featureOfInterest = get_name_from_urn(foi,"feature",sosConfig)
-                    except Exception as e:
-                        raise sosException.SOSException("InvalidParameterValue","featureofinterest","%s" % e)
-            
-                #fois = requestObject["featureOfInterest"].split(",")
-                #for foi in fois:
-                #    foiName = get_name_from_urn(foi,"feature")
-                #    self.featureOfInterest.append(foiName)
-            
-            #---------- FILTERS FOR QUERY NOT SUPPORTED YET            
-            if requestObject.has_key("result"):
-                #raise sosException.SOSException(3,"Parameter \"result\" not yet supported")
-                self.result = sosUtils.ogcCompCons2PostgisSql(requestObject["result"])
-            else:
-                self.result = None #zero-one optional
-            
-            #---------- RESULT MODEL
-            if requestObject.has_key("resultmodel"):
-                if requestObject["resultmodel"] in sosConfig.parameters["GO_resultModel"]:
-                    self.resultModel = requestObject["resultmodel"]                    
-                else:
-                    raise sosException.SOSException("InvalidParameterValue","resultModel","Parameter \"resultModel\" sent with invalid value: supported values are: %s" %",".join(sosConfig.parameters["GO_resultModel"]))                    
-            else:
-                self.resultModel = sosConfig.parameters["GO_resultModel"][0]
-            
-            #---------- RESPONSE MODE
-            if requestObject.has_key("responsemode"):
-                if requestObject["responsemode"] in sosConfig.parameters["GO_responseMode"]:
-                    self.responseMode = requestObject["responsemode"]
-                else:
-                    raise sosException.SOSException("InvalidParameterValue","responseMode","Parameter \"responseMode\" sent with invalid value, supported values are: %s" %(",".join(sosConfig.parameters["GO_responseMode"])))
-                    
-            else:
-                self.responseMode = sosConfig.parameters["GO_responseMode"][0]
-
-            ###########################
-            # NON STANDARD PARAMETERS #
-            ###########################
-            #---------- AGGREGATE INTERVAL
-            # In ISO 8601 duration format
-            if requestObject.has_key("aggregateinterval"):
-                # Check on the eventTime parameter: it must be only one interval: 2010-01-01T00:00:00+00/2011-01-01T00:00:01+00
-                exeMsg = "Using aggregate functions, the event time must exist with an interval composed by a begin and an end date (ISO8601)"
-                if self.eventTime == None or len(self.eventTime)!=1 or len(self.eventTime[0])!=2:
-                    raise sosException.SOSException("InvalidParameterValue","aggregateInterval",exeMsg)
-                self.aggregate_interval = requestObject["aggregateinterval"]
-                try:
-                    iso.parse_duration(self.aggregate_interval)
-                except Exception as ex:
-                    raise sosException.SOSException("InvalidParameterValue","aggregateInterval","Parameter \"aggregate_interval\" sent with invalid format (check ISO8601 duration spec): %s" % ex)
-            else:
-                self.aggregate_interval = None
-
-            #---------- AGGREGATE FUNCTION
-            # sum,avg,max,min
-            if requestObject.has_key("aggregatefunction"):
-                if self.aggregate_interval==None:
-                    raise sosException.SOSException("InvalidParameterValue","aggregateFunction","Using aggregate functions parameters \"aggregateInterval\" and \"aggregateFunction\" are both mandatory")
-                self.aggregate_function = requestObject["aggregatefunction"]
-                if not (self.aggregate_function.upper() in ["AVG","COUNT","MAX","MIN","SUM"]):
-                    raise sosException.SOSException("InvalidParameterValue","aggregateFunction","Available aggregation functions: avg, count, max, min, sum.")
-            else:
-                self.aggregate_function = None
-                
-            #---------- AGGREGATE NODATA
-            if requestObject.has_key("aggregatenodata"):
-                if self.aggregate_interval==None or self.aggregate_function==None:
-                    raise sosException.SOSException("InvalidParameterValue","aggregateNodata","Using aggregateNodata parameter requires both \"aggregateInterval\" and \"aggregateFunction\"")
-                self.aggregate_nodata = requestObject["aggregatenodata"]
-            else:
-                self.aggregate_nodata = sosConfig.aggregate_nodata
-                
-            #---------- AGGREGATE NODATA QUALITY INDEX
-            if requestObject.has_key("aggregatenodataqi"):
-                if self.aggregate_interval==None or self.aggregate_function==None:
-                    raise sosException.SOSException("InvalidParameterValue","aggregateNodataQi","Using aggregateNodataQi parameter requires both \"aggregateInterval\" and \"aggregateFunction\"")
-                self.aggregate_nodata_qi = requestObject["aggregatenodataqi"]
-            else:
-                self.aggregate_nodata_qi = sosConfig.aggregate_nodata_qi
-                
-            #------------ QUALITY INDEX
-            self.qualityIndex=False
-            if requestObject.has_key("qualityindex"):
-                if requestObject["qualityindex"].upper() == "TRUE":
-                    self.qualityIndex = True
-                elif requestObject["qualityindex"].upper() == "FALSE":
-                    self.qualityIndex = False
-                else:
-                    raise sosException.SOSException("InvalidParameterValue","qualityIndex","qualityIndex can only be True or False!")
-                #    self.qualityIndex = sosUtils.CQLvalueFilter2PostgisSql("id_qi_fk",requestObject["qualityIndex"])
-
-                
-                
-        #**********************
-        if method == "POST":
-            from xml.dom import minidom
-            #---------- THE OFFERING
-            offs = requestObject.getElementsByTagName('offering')
-            if len(offs) == 1:
-                val = offs[0].firstChild
-                if val.nodeType == val.TEXT_NODE:
-                    try:
-                        self.offering = get_name_from_urn(str(val.data),"offering",sosConfig)
-                    except Exception as e:
-                        raise sosException.SOSException("InvalidParameterValue","offering","%s" % e)
-                else:
-                    err_txt = "XML parsing error (get value: offering)"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                err_txt = "Parameter \"offering\" is mandatory with multiplicity 1"
-                raise sosException.SOSException("MissingParameterValue","offering",err_txt)
-            
-            
-            #---------- THE OBSERVED PROPERTY
-            obsProps = requestObject.getElementsByTagName('observedProperty')
-            self.observedProperty = []
-            if len(obsProps) > 0:
-                for obsProp in obsProps:
-                    val = obsProp.firstChild
-                    if val.nodeType == val.TEXT_NODE:                    
-                        # get_name_from_urn limit the ability to ask for an observedProperty with LIKE:
-                        # eg: ask "water" to get all the water related data, "water:discharge", "water:temperature" ...
-                        #self.observedProperty.append(get_name_from_urn(str(val.data),"property"))
-                        self.observedProperty.append(str(val.data))
-                    else:
-                        err_txt = "XML parsing error (get value: observedProperty)"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                err_txt = "Parameter \"observedProperty\" is mandatory with multiplicity N"
-                raise sosException.SOSException("MissingParameterValue","observedProperty",err_txt)
-            
-            #---------- RESPONSE FORMAT
-            respF = requestObject.getElementsByTagName('responseFormat')
-            if len(respF) == 1:
-                val = respF[0].firstChild
-                if val.nodeType == val.TEXT_NODE:
-                    self.responseFormat = str(val.data)
-                    if self.responseFormat not in sosConfig.parameters["GO_responseFormat"]:   
-                        raise sosException.SOSException("InvalidParameterValue","responseFormat","Parameter \"responseFormat\" sent with invalid value: use one of %s" % "; ".join(sosConfig.parameters["GO_responseFormat"]))
-                else:
-                    err_txt = "XML parsing error (get value: responseFormat)"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                err_txt = "Parameter \"responseFormat\" is mandatory with multiplicity 1"
-                raise sosException.SOSException("MissingParameterValue","responseFormat",err_txt)
-            
-            #OPTIONAL request parameters
-            #---------- SRS OF RETURNED GML FEATURES
-            srs = requestObject.getAttributeNode('srsName')
-            if srs:
-                self.srsName = srs.nodeValue
-                if not self.srsName in sosConfig.parameters["GO_srs"]:
-                    raise sosException.SOSException("InvalidParameterValue","srsName","srsName \"%s\" not supported, use one of: %s" %(self.srsName,",".join(sosConfig.parameters["GO_srs"])))
-            else:
-                self.srsName = sosConfig.parameters["GO_srs"][0]
-            """
-            srss = requestObject.getElementsByTagName('srsName')
-            if len(srss) > 0:
-                if len(srss) < 2:
-                    val = srss[0].firstChild
-                    if val.nodeType == val.TEXT_NODE:
-                        self.srsName = get_name_from_urn(str(val.data),"refsystem",sosConfig)
-                    else:
-                        err_txt = "XML parsing error (get value: srsName)"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                else:
-                    err_txt = "Allowed only ONE parameter \"srsName\""
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                self.srsName = sosConfig.parameters["GO_srs"][0]
-            """
-            #---------- TIME FILTER  
-            evtms = requestObject.getElementsByTagName('eventTime')
-            self.eventTime = []
-            if len(evtms) > 0:
-                for evtm in evtms:
-                    tps = evtm.getElementsByTagName('gml:TimePeriod')
-                    for tp in tps:
-                        begin = tp.getElementsByTagName('gml:beginPosition')
-                        end = tp.getElementsByTagName('gml:endPosition')
-                        if len(begin)==1 and len(end)==1:
-                            Bval = begin[0].firstChild
-                            Eval = end[0].firstChild
-                            #raise sosException.SOSException(1,end[0].toprettyxml())
-                            if Bval.nodeType == Bval.TEXT_NODE and Eval.nodeType == Eval.TEXT_NODE:
-                                self.eventTime.append([str(Bval.data).replace(" ","+"),str(Eval.data).replace(" ","+")])
-                                #raise sosException.SOSException(1,str(self.eventTime))
-                            else:
-                                err_txt = "XML parsing error (get value: TimePeriod)"
-                                raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                            
-                    tis = evtm.getElementsByTagName('gml:TimeInstant')
-                    for ti in tis:
-                        instant = ti.getElementsByTagName('gml:timePosition')
-                        if len(instant)>0 and len(instant)<2:
-                            Ival = instant[0].firstChild
-                            if Ival.nodeType == Ival.TEXT_NODE:
-                                self.eventTime.append([str(Ival.data).replace(" ","+")])
-                            else:
-                                err_txt = "XML parsing error (get value: Timeinstant)"
-                                raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                self.eventTime = None
-                
-            #---------- PROCEDURES FILTER
-            procs = requestObject.getElementsByTagName('procedure')
-            if len(procs) > 0:
-                self.procedure=[]
-                for proc in procs:
-                    if "xlink:href" in proc.attributes.keys():
-                        self.procedure.append(str(proc.getAttribute("xlink:href")))
-                    elif proc.hasChildNodes():
-                        val = proc.firstChild
-                        if val.nodeType == val.TEXT_NODE:
-                            try:
-                                self.procedure.append(get_name_from_urn(str(val.data),"procedure",sosConfig))
-                            except Exception as e:
-                                raise sosException.SOSException("InvalidParameterValue","procedure","%s" % e)
-                    else:
-                        err_txt = "XML parsing error (get value: procedure)"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                self.procedure = None
-            
-            #---------- FEATURES OF INTEREST FILTER
-            fets = requestObject.getElementsByTagName('featureOfInterest')
-            self.featureOfInterest = None
-            self.featureOfInterestSpatial = None
-            # get sub-elements of FOI
-            if fets:
-                elements = [e for e in fets[0].childNodes if e.nodeType == e.ELEMENT_NODE]
-#            else:
-#               import sys
-#               print >> sys.stderr, "\n\nELE: %s" % len(elements)                    
-#                err_txt = "Parameter \"featureOfInterest\" is mandatory"
-#                raise sosException.SOSException("MissingParameterValue","featureOfInterest",err_txt)            
-            
-                if len(elements)==0:
-                    err_txt = "ObjectID or ogc:spatialOps elements in parameter \"featureOfInterest\" are mandatory"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                # only one sub element                    
-                elif len(elements)==1 and elements[0].tagName!="ObjectID" :
-                    self.featureOfInterestSpatial = sosUtils.ogcSpatCons2PostgisSql(elements[0],'geom_foi',sosConfig.istsosepsg)            
-                else:
-                    tempfois=[]
-                    for e in elements:
-                        if not e.tagName=="ObjectID":
-                            err_txt = "Allowed only ObjectID or ogc:spatialOps elements in parameter \"featureOfInterest\""
-                            raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                        try:
-                            val = e.firstChild
-                            import sys
-                            print >> sys.stderr, "\n\nVAL: %s\n\n" % (val.data) 
-                            if val.nodeType == val.TEXT_NODE:
-                                try:
-                                    tempfois.append( get_name_from_urn(str(val.data),"feature",sosConfig) )
-                                except Exception as e:
-                                     raise sosException.SOSException("InvalidParameterValue","featureOfInterest","%s" % e)
-                        except Exception as e:
-                            raise e
-                        
-                    self.featureOfInterest = ",".join(tempfois)
-                
-            
-            #---------- FILTERS FOR QUERY NOT SUPPORTED YET            
-            ress = requestObject.getElementsByTagName('result')
-            if len(ress)>0:
-                raise sosException.SOSException("NoApplicableCode",None,"Parameter \"result\" not yet supported")
-            else:
-                self.result = None #zero-one optional
-            
-            #---------- RESULT MODEL
-            mods = requestObject.getElementsByTagName('resultModel')
-            if len(mods)>0:
-                if len(mods)<2:
-                    val = mods[0].firstChild
-                    if val.nodeType == val.TEXT_NODE:
-                        self.resultModel = str(val.data)
-                        if self.resultModel not in sosConfig.parameters["GO_resultModel"]:
-                            raise sosException.SOSException("InvalidParameterValue","resultModel","Parameter \"resultModel\" sent with invalid value")
-                    else:
-                        err_txt = "XML parsing error (get value: resultModel)"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                else:
-                    err_txt = "Allowed only ONE parameter \"resultModel\""
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                self.resultModel = None
-            
-            #---------- RESPONSE MODE
-            rsmods = requestObject.getElementsByTagName('responseMode')
-            if len(rsmods)>0:
-                if len(rsmods)<2:
-                    val = rsmods[0].firstChild
-                    if val.nodeType == val.TEXT_NODE:
-                        self.responseMode = str(val.data)
-                        if self.responseMode not in sosConfig.parameters["GO_responseMode"]:
-                            raise sosException.SOSException("InvalidParameterValue","responseMode","Parameter \"responseMode\" sent with invalid value")
-                    else:
-                        err_txt = "XML parsing error (get value: responseMode)"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                else:
-                    err_txt = "Allowed only ONE parameter \"responseMode\""
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            else:
-                self.responseMode = sosConfig.parameters["GO_responseMode"][0]
-        
-
-            #-------------- AGGREGATE INTERVAL & FUNCTION
-            self.aggregate_interval = None
-            self.aggregate_function = None
-            self.aggregate_nodata = None
-            self.aggregate_nodata_qi = None
-            
-            aggint = requestObject.getElementsByTagName('aggregateInterval')
-            aggfun = requestObject.getElementsByTagName('aggregateFunction')
-            aggnodata = requestObject.getElementsByTagName('aggregateNodata')
-            
-            if len(aggint)==1 and len(aggfun)==1:
-                #-----------------------
-                # -- aggregate_interval
-                #-----------------------
-                # Check on the eventTime parameter: it must be only one interval: 2010-01-01T00:00:00+00/2011-01-01T00:00:01+00
-                exeMsg = "Using aggregate functions, the event time must exist with an interval composed by a begin and an end date (ISO8601)"
-                if self.eventTime == None or len(self.eventTime)!=1 or len(self.eventTime[0])!=2:
-                    raise sosException.SOSException("NoApplicableCode",None,exeMsg)
-                val = aggint[0].firstChild
-                if val.nodeType == val.TEXT_NODE:
-                    self.aggregate_interval = str(val.data)
-                    try:
-                        iso.parse_duration(self.aggregate_interval)
-                    except Exception as ex:
-                        raise sosException.SOSException("InvalidParameterValue","aggregateInterval","Parameter \"aggregate_interval\" sent with invalid format (check ISO8601 duration spec): %s" % ex)
-                else:
-                    err_txt = "cannot get ISO8601 duration value in \"aggregateInterval\""
-                    raise sosException.SOSException("InvalidParameterValue","aggregateInterval",err_txt)
-                #-----------------------
-                # -- aggregate_function
-                #-----------------------
-                val = aggfun[0].firstChild
-                if val.nodeType == val.TEXT_NODE:
-                    self.aggregate_function = str(val.data)
-                    if not (self.aggregate_function.upper() in ["AVG","COUNT","MAX","MIN","SUM"]):
-                        raise sosException.SOSException("InvalidParameterValue","aggregateFunction","Available aggregation functions: avg, count, max, min, sum.")
-                
-                
-                #-----------------------------------
-                # -- aggregate_no_data default value
-                #-----------------------------------
-                if len(aggnodata)==1:
-                    val = aggnodata[0].firstChild
-                    self.aggregate_nodata = str(val.data)
-                else:
-                    self.aggregate_nodata = sosConfig.aggregate_nodata
-
-           #================================
-           #MISSING AGGREGATE QUALITY INDEX
-           #================================         
-                    
-            elif len(aggint)==0 and len(aggfun)==0:
-                pass
-            else:
-                err_txt = "\"aggregateInterval\" and \"aggregate_function\" are both required with multiplicity 1"
-                raise sosException.SOSException("NoApplicableCode",None,err_txt)
-
-            #------------ QUALITY INDEX
-            self.qualityIndex=False
-            qidx = requestObject.getElementsByTagName('qualityIndex')
-            if len(qidx)>0:
-                if len(qidx)<2:
-                    val = qidx[0].firstChild
-                    if val.nodeType == val.TEXT_NODE:
-                        self.qualityIndex = str(val.data)
-                        if self.qualityIndex.upper() == "TRUE":
-                            self.qualityIndex=True
-                        elif self.qualityIndex.upper() == "FALSE":
-                            pass
-                        else:
-                            raise sosException.SOSException("InvalidParameterValue","qualityIndex","qualityIndex can only be \'True\' or \'False\'")
-            elif len(qidx)==0:
-                pass
-            else:
-                err_txt = "\"qualityIndex\" is allowed with multiplicity 1 only"
-                raise sosException.SOSException("NoApplicableCode",None,err_txt)
-
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-            
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib.filters import filter as f
+from istsoslib import sosException, sosUtils
+from lib import isodate as iso
+
+def get_name_from_urn(stringa,urnName,sosConfig):
+    a = stringa.split(":")
+    name = a[-1]
+    urn = sosConfig.urn[urnName].split(":")
+    if len(a)>1:
+        for index in range(len(urn)-1):
+            if urn[index]==a[index]:
+                pass
+            else:
+                raise Exception("Urn \"%s\" is not valid: %s."%(a,urn))
+    return name
+
+
+'''
+ATTRIBUTES:
+
+offering (string)
+qualityIndex (boolean)
+observedProperty (array of string)
+srsName (string)
+eventTime (array of string)
+procedure (array of string)
+featureOfInterest (array of string)
+
+'''
+class sosGOfilter(f.sosFilter):
+    "filter object for a GetObservations request"
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
+        # @TODO Declare attribute first!
+        # self.offering = None
+        # etc..
+
+        #**************************
+        if method == "GET":
+            #---------- THE OFFERING
+            if requestObject.has_key("offering"):
+                try:
+                    self.offering = get_name_from_urn(requestObject["offering"],"offering",sosConfig)
+                except Exception as e:
+                    raise sosException.SOSException("InvalidParameterValue","offering","%s" % e)
+            else:
+                raise sosException.SOSException("MissingParameterValue","offering","Parameter \"offering\" is mandatory with multiplicity 1")
+                
+            #---------- THE OBSERVED PROPERTY
+            if requestObject.has_key("observedproperty"):
+                self.observedProperty = []
+                oprs = requestObject["observedproperty"].split(",")
+                for opr in oprs:
+                    # get_name_from_urn limit the ability to ask for an observedProperty with LIKE:
+                    # eg: ask "water" to get all the water related data, "water:discharge", "water:temperature" ...
+                    #oprName = get_name_from_urn(opr,"property")
+                    oprName = opr
+                    self.observedProperty.append(oprName) # one-many ID 
+            else:
+                raise sosException.SOSException("MissingParameterValue","observedProperty","Parameter \"observedProperty\" is mandatory with multiplicity N")
+                
+            #---------- RESPONSE FORMAT
+            if requestObject.has_key("responseformat"):
+                if not requestObject["responseformat"] in sosConfig.parameters["GO_responseFormat"]:   
+                    raise sosException.SOSException("InvalidParameterValue","responseFormat","Parameter \"responseFormat\" sent with invalid value : use one of %s" % "; ".join(sosConfig.parameters["GO_responseFormat"]))
+                else:
+                    self.responseFormat = requestObject["responseformat"]
+            else:
+                raise sosException.SOSException("MissingParameterValue","responseFormat","Parameter \"responseFormat\" is mandatory with multiplicity 1") #one
+                
+            #OPTIONAL request parameters
+            #---------- SRS FILTER                
+            if requestObject.has_key("srsname"):
+                try:
+                    self.srsName = get_name_from_urn(requestObject["srsname"],"refsystem",sosConfig)
+                except Exception as e:
+                    raise sosException.SOSException("InvalidParameterValue","srsname","%s" % e)
+            
+                if not self.srsName in sosConfig.parameters["GO_srs"]:
+                    raise sosException.SOSException("InvalidParameterValue","srsName","srsName \"%s\" not supported, use one of: %s" %(self.srsName,",".join(sosConfig.parameters["GO_srs"])))
+            else:
+                self.srsName = sosConfig.parameters["GO_srs"][0]
+
+            #---------- TIME FILTER                
+            if requestObject.has_key('eventtime'):
+                self.eventTime = []
+                for i in requestObject["eventtime"].replace(" ","+").split(","):
+                    if len(i.split("/")) < 3:
+                        self.eventTime.append(i.split("/"))
+                    else:
+                        raise sosException.SOSException("InvalidParameterValue","eventTime","Parameter \"eventTime\" bad formatted")
+                
+                # Checking if some event limitation is reached
+                #if sosConfig["maxGoPeriod"]:
+                tp=[]
+                for t in self.eventTime:
+                    if len(t) == 2:
+                        tp.append(iso.parse_datetime(t[0]))
+                        tp.append(iso.parse_datetime(t[1]))
+                    if len(t)==1:
+                        tp.append(iso.parse_datetime(t[0]))
+                if int(sosConfig.maxGoPeriod) > 0:
+                    from datetime import timedelta
+                    d = timedelta(hours=int(sosConfig.maxGoPeriod))
+                    userPeriod = max(tp)-min(tp)
+                    if d < userPeriod:
+                        raise sosException.SOSException("InvalidParameterValue","eventTime","You are requesting data for a period of [%s hours], but you are not permitted to ask for a period longer than: %s hours" % (userPeriod,d))
+                
+            else:
+                self.eventTime = None
+            
+            #---------- PROCEDURES FILTER
+            if requestObject.has_key("procedure"):
+                self.procedure = []
+                prcs = requestObject["procedure"].split(",")
+                for prc in prcs:
+                    try:
+                        prcName = get_name_from_urn(prc,"procedure",sosConfig)
+                    except Exception as e:
+                        raise sosException.SOSException("InvalidParameterValue","procedure","%s" % e)
+            
+                    self.procedure.append(prcName)
+            else:
+                self.procedure = None
+            
+            #---------- FEATURES OF INTEREST FILTER
+            self.featureOfInterest = None
+            self.featureOfInterestSpatial = None
+            if requestObject.has_key("featureofinterest"):
+                foi = requestObject["featureofinterest"]
+                if foi.find("<ogc:")>=0 and foi.find("<gml:")>=0:
+                    #raise sosException.SOSException(3,"FOI SPATIAL: %s" %(foi))
+                    self.featureOfInterestSpatial = sosUtils.ogcSpatCons2PostgisSql(foi,'geom_foi',sosConfig.istsosepsg)
+                else:
+                    try:
+                        self.featureOfInterest = get_name_from_urn(foi,"feature",sosConfig)
+                    except Exception as e:
+                        raise sosException.SOSException("InvalidParameterValue","featureofinterest","%s" % e)
+            
+                #fois = requestObject["featureOfInterest"].split(",")
+                #for foi in fois:
+                #    foiName = get_name_from_urn(foi,"feature")
+                #    self.featureOfInterest.append(foiName)
+            
+            #---------- FILTERS FOR QUERY NOT SUPPORTED YET            
+            if requestObject.has_key("result"):
+                #raise sosException.SOSException(3,"Parameter \"result\" not yet supported")
+                self.result = sosUtils.ogcCompCons2PostgisSql(requestObject["result"])
+            else:
+                self.result = None #zero-one optional
+            
+            #---------- RESULT MODEL
+            if requestObject.has_key("resultmodel"):
+                if requestObject["resultmodel"] in sosConfig.parameters["GO_resultModel"]:
+                    self.resultModel = requestObject["resultmodel"]                    
+                else:
+                    raise sosException.SOSException("InvalidParameterValue","resultModel","Parameter \"resultModel\" sent with invalid value: supported values are: %s" %",".join(sosConfig.parameters["GO_resultModel"]))                    
+            else:
+                self.resultModel = sosConfig.parameters["GO_resultModel"][0]
+            
+            #---------- RESPONSE MODE
+            if requestObject.has_key("responsemode"):
+                if requestObject["responsemode"] in sosConfig.parameters["GO_responseMode"]:
+                    self.responseMode = requestObject["responsemode"]
+                else:
+                    raise sosException.SOSException("InvalidParameterValue","responseMode","Parameter \"responseMode\" sent with invalid value, supported values are: %s" %(",".join(sosConfig.parameters["GO_responseMode"])))
+                    
+            else:
+                self.responseMode = sosConfig.parameters["GO_responseMode"][0]
+
+            ###########################
+            # NON STANDARD PARAMETERS #
+            ###########################
+            #---------- AGGREGATE INTERVAL
+            # In ISO 8601 duration format
+            if requestObject.has_key("aggregateinterval"):
+                # Check on the eventTime parameter: it must be only one interval: 2010-01-01T00:00:00+00/2011-01-01T00:00:01+00
+                exeMsg = "Using aggregate functions, the event time must exist with an interval composed by a begin and an end date (ISO8601)"
+                if self.eventTime == None or len(self.eventTime)!=1 or len(self.eventTime[0])!=2:
+                    raise sosException.SOSException("InvalidParameterValue","aggregateInterval",exeMsg)
+                self.aggregate_interval = requestObject["aggregateinterval"]
+                try:
+                    iso.parse_duration(self.aggregate_interval)
+                except Exception as ex:
+                    raise sosException.SOSException("InvalidParameterValue","aggregateInterval","Parameter \"aggregate_interval\" sent with invalid format (check ISO8601 duration spec): %s" % ex)
+            else:
+                self.aggregate_interval = None
+
+            #---------- AGGREGATE FUNCTION
+            # sum,avg,max,min
+            if requestObject.has_key("aggregatefunction"):
+                if self.aggregate_interval==None:
+                    raise sosException.SOSException("InvalidParameterValue","aggregateFunction","Using aggregate functions parameters \"aggregateInterval\" and \"aggregateFunction\" are both mandatory")
+                self.aggregate_function = requestObject["aggregatefunction"]
+                if not (self.aggregate_function.upper() in ["AVG","COUNT","MAX","MIN","SUM"]):
+                    raise sosException.SOSException("InvalidParameterValue","aggregateFunction","Available aggregation functions: avg, count, max, min, sum.")
+            else:
+                self.aggregate_function = None
+                
+            #---------- AGGREGATE NODATA
+            if requestObject.has_key("aggregatenodata"):
+                if self.aggregate_interval==None or self.aggregate_function==None:
+                    raise sosException.SOSException("InvalidParameterValue","aggregateNodata","Using aggregateNodata parameter requires both \"aggregateInterval\" and \"aggregateFunction\"")
+                self.aggregate_nodata = requestObject["aggregatenodata"]
+            else:
+                self.aggregate_nodata = sosConfig.aggregate_nodata
+                
+            #---------- AGGREGATE NODATA QUALITY INDEX
+            if requestObject.has_key("aggregatenodataqi"):
+                if self.aggregate_interval==None or self.aggregate_function==None:
+                    raise sosException.SOSException("InvalidParameterValue","aggregateNodataQi","Using aggregateNodataQi parameter requires both \"aggregateInterval\" and \"aggregateFunction\"")
+                self.aggregate_nodata_qi = requestObject["aggregatenodataqi"]
+            else:
+                self.aggregate_nodata_qi = sosConfig.aggregate_nodata_qi
+                
+            #------------ QUALITY INDEX
+            self.qualityIndex=False
+            if requestObject.has_key("qualityindex"):
+                if requestObject["qualityindex"].upper() == "TRUE":
+                    self.qualityIndex = True
+                elif requestObject["qualityindex"].upper() == "FALSE":
+                    self.qualityIndex = False
+                else:
+                    raise sosException.SOSException("InvalidParameterValue","qualityIndex","qualityIndex can only be True or False!")
+                #    self.qualityIndex = sosUtils.CQLvalueFilter2PostgisSql("id_qi_fk",requestObject["qualityIndex"])
+
+                
+                
+        #**********************
+        if method == "POST":
+            from xml.dom import minidom
+            #---------- THE OFFERING
+            offs = requestObject.getElementsByTagName('offering')
+            if len(offs) == 1:
+                val = offs[0].firstChild
+                if val.nodeType == val.TEXT_NODE:
+                    try:
+                        self.offering = get_name_from_urn(str(val.data),"offering",sosConfig)
+                    except Exception as e:
+                        raise sosException.SOSException("InvalidParameterValue","offering","%s" % e)
+                else:
+                    err_txt = "XML parsing error (get value: offering)"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                err_txt = "Parameter \"offering\" is mandatory with multiplicity 1"
+                raise sosException.SOSException("MissingParameterValue","offering",err_txt)
+            
+            
+            #---------- THE OBSERVED PROPERTY
+            obsProps = requestObject.getElementsByTagName('observedProperty')
+            self.observedProperty = []
+            if len(obsProps) > 0:
+                for obsProp in obsProps:
+                    val = obsProp.firstChild
+                    if val.nodeType == val.TEXT_NODE:                    
+                        # get_name_from_urn limit the ability to ask for an observedProperty with LIKE:
+                        # eg: ask "water" to get all the water related data, "water:discharge", "water:temperature" ...
+                        #self.observedProperty.append(get_name_from_urn(str(val.data),"property"))
+                        self.observedProperty.append(str(val.data))
+                    else:
+                        err_txt = "XML parsing error (get value: observedProperty)"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                err_txt = "Parameter \"observedProperty\" is mandatory with multiplicity N"
+                raise sosException.SOSException("MissingParameterValue","observedProperty",err_txt)
+            
+            #---------- RESPONSE FORMAT
+            respF = requestObject.getElementsByTagName('responseFormat')
+            if len(respF) == 1:
+                val = respF[0].firstChild
+                if val.nodeType == val.TEXT_NODE:
+                    self.responseFormat = str(val.data)
+                    if self.responseFormat not in sosConfig.parameters["GO_responseFormat"]:   
+                        raise sosException.SOSException("InvalidParameterValue","responseFormat","Parameter \"responseFormat\" sent with invalid value: use one of %s" % "; ".join(sosConfig.parameters["GO_responseFormat"]))
+                else:
+                    err_txt = "XML parsing error (get value: responseFormat)"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                err_txt = "Parameter \"responseFormat\" is mandatory with multiplicity 1"
+                raise sosException.SOSException("MissingParameterValue","responseFormat",err_txt)
+            
+            #OPTIONAL request parameters
+            #---------- SRS OF RETURNED GML FEATURES
+            srs = requestObject.getAttributeNode('srsName')
+            if srs:
+                self.srsName = srs.nodeValue
+                if not self.srsName in sosConfig.parameters["GO_srs"]:
+                    raise sosException.SOSException("InvalidParameterValue","srsName","srsName \"%s\" not supported, use one of: %s" %(self.srsName,",".join(sosConfig.parameters["GO_srs"])))
+            else:
+                self.srsName = sosConfig.parameters["GO_srs"][0]
+            """
+            srss = requestObject.getElementsByTagName('srsName')
+            if len(srss) > 0:
+                if len(srss) < 2:
+                    val = srss[0].firstChild
+                    if val.nodeType == val.TEXT_NODE:
+                        self.srsName = get_name_from_urn(str(val.data),"refsystem",sosConfig)
+                    else:
+                        err_txt = "XML parsing error (get value: srsName)"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                else:
+                    err_txt = "Allowed only ONE parameter \"srsName\""
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                self.srsName = sosConfig.parameters["GO_srs"][0]
+            """
+            #---------- TIME FILTER  
+            evtms = requestObject.getElementsByTagName('eventTime')
+            self.eventTime = []
+            if len(evtms) > 0:
+                for evtm in evtms:
+                    tps = evtm.getElementsByTagName('gml:TimePeriod')
+                    for tp in tps:
+                        begin = tp.getElementsByTagName('gml:beginPosition')
+                        end = tp.getElementsByTagName('gml:endPosition')
+                        if len(begin)==1 and len(end)==1:
+                            Bval = begin[0].firstChild
+                            Eval = end[0].firstChild
+                            #raise sosException.SOSException(1,end[0].toprettyxml())
+                            if Bval.nodeType == Bval.TEXT_NODE and Eval.nodeType == Eval.TEXT_NODE:
+                                self.eventTime.append([str(Bval.data).replace(" ","+"),str(Eval.data).replace(" ","+")])
+                                #raise sosException.SOSException(1,str(self.eventTime))
+                            else:
+                                err_txt = "XML parsing error (get value: TimePeriod)"
+                                raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                            
+                    tis = evtm.getElementsByTagName('gml:TimeInstant')
+                    for ti in tis:
+                        instant = ti.getElementsByTagName('gml:timePosition')
+                        if len(instant)>0 and len(instant)<2:
+                            Ival = instant[0].firstChild
+                            if Ival.nodeType == Ival.TEXT_NODE:
+                                self.eventTime.append([str(Ival.data).replace(" ","+")])
+                            else:
+                                err_txt = "XML parsing error (get value: Timeinstant)"
+                                raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                self.eventTime = None
+                
+            #---------- PROCEDURES FILTER
+            procs = requestObject.getElementsByTagName('procedure')
+            if len(procs) > 0:
+                self.procedure=[]
+                for proc in procs:
+                    if "xlink:href" in proc.attributes.keys():
+                        self.procedure.append(str(proc.getAttribute("xlink:href")))
+                    elif proc.hasChildNodes():
+                        val = proc.firstChild
+                        if val.nodeType == val.TEXT_NODE:
+                            try:
+                                self.procedure.append(get_name_from_urn(str(val.data),"procedure",sosConfig))
+                            except Exception as e:
+                                raise sosException.SOSException("InvalidParameterValue","procedure","%s" % e)
+                    else:
+                        err_txt = "XML parsing error (get value: procedure)"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                self.procedure = None
+            
+            #---------- FEATURES OF INTEREST FILTER
+            fets = requestObject.getElementsByTagName('featureOfInterest')
+            self.featureOfInterest = None
+            self.featureOfInterestSpatial = None
+            # get sub-elements of FOI
+            if fets:
+                elements = [e for e in fets[0].childNodes if e.nodeType == e.ELEMENT_NODE]
+#            else:
+#               import sys
+#               print >> sys.stderr, "\n\nELE: %s" % len(elements)                    
+#                err_txt = "Parameter \"featureOfInterest\" is mandatory"
+#                raise sosException.SOSException("MissingParameterValue","featureOfInterest",err_txt)            
+            
+                if len(elements)==0:
+                    err_txt = "ObjectID or ogc:spatialOps elements in parameter \"featureOfInterest\" are mandatory"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                # only one sub element                    
+                elif len(elements)==1 and elements[0].tagName!="ObjectID" :
+                    self.featureOfInterestSpatial = sosUtils.ogcSpatCons2PostgisSql(elements[0],'geom_foi',sosConfig.istsosepsg)            
+                else:
+                    tempfois=[]
+                    for e in elements:
+                        if not e.tagName=="ObjectID":
+                            err_txt = "Allowed only ObjectID or ogc:spatialOps elements in parameter \"featureOfInterest\""
+                            raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                        try:
+                            val = e.firstChild
+                            import sys
+                            print >> sys.stderr, "\n\nVAL: %s\n\n" % (val.data) 
+                            if val.nodeType == val.TEXT_NODE:
+                                try:
+                                    tempfois.append( get_name_from_urn(str(val.data),"feature",sosConfig) )
+                                except Exception as e:
+                                     raise sosException.SOSException("InvalidParameterValue","featureOfInterest","%s" % e)
+                        except Exception as e:
+                            raise e
+                        
+                    self.featureOfInterest = ",".join(tempfois)
+                
+            
+            #---------- FILTERS FOR QUERY NOT SUPPORTED YET            
+            ress = requestObject.getElementsByTagName('result')
+            if len(ress)>0:
+                raise sosException.SOSException("NoApplicableCode",None,"Parameter \"result\" not yet supported")
+            else:
+                self.result = None #zero-one optional
+            
+            #---------- RESULT MODEL
+            mods = requestObject.getElementsByTagName('resultModel')
+            if len(mods)>0:
+                if len(mods)<2:
+                    val = mods[0].firstChild
+                    if val.nodeType == val.TEXT_NODE:
+                        self.resultModel = str(val.data)
+                        if self.resultModel not in sosConfig.parameters["GO_resultModel"]:
+                            raise sosException.SOSException("InvalidParameterValue","resultModel","Parameter \"resultModel\" sent with invalid value")
+                    else:
+                        err_txt = "XML parsing error (get value: resultModel)"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                else:
+                    err_txt = "Allowed only ONE parameter \"resultModel\""
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                self.resultModel = None
+            
+            #---------- RESPONSE MODE
+            rsmods = requestObject.getElementsByTagName('responseMode')
+            if len(rsmods)>0:
+                if len(rsmods)<2:
+                    val = rsmods[0].firstChild
+                    if val.nodeType == val.TEXT_NODE:
+                        self.responseMode = str(val.data)
+                        if self.responseMode not in sosConfig.parameters["GO_responseMode"]:
+                            raise sosException.SOSException("InvalidParameterValue","responseMode","Parameter \"responseMode\" sent with invalid value")
+                    else:
+                        err_txt = "XML parsing error (get value: responseMode)"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                else:
+                    err_txt = "Allowed only ONE parameter \"responseMode\""
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            else:
+                self.responseMode = sosConfig.parameters["GO_responseMode"][0]
+        
+
+            #-------------- AGGREGATE INTERVAL & FUNCTION
+            self.aggregate_interval = None
+            self.aggregate_function = None
+            self.aggregate_nodata = None
+            self.aggregate_nodata_qi = None
+            
+            aggint = requestObject.getElementsByTagName('aggregateInterval')
+            aggfun = requestObject.getElementsByTagName('aggregateFunction')
+            aggnodata = requestObject.getElementsByTagName('aggregateNodata')
+            
+            if len(aggint)==1 and len(aggfun)==1:
+                #-----------------------
+                # -- aggregate_interval
+                #-----------------------
+                # Check on the eventTime parameter: it must be only one interval: 2010-01-01T00:00:00+00/2011-01-01T00:00:01+00
+                exeMsg = "Using aggregate functions, the event time must exist with an interval composed by a begin and an end date (ISO8601)"
+                if self.eventTime == None or len(self.eventTime)!=1 or len(self.eventTime[0])!=2:
+                    raise sosException.SOSException("NoApplicableCode",None,exeMsg)
+                val = aggint[0].firstChild
+                if val.nodeType == val.TEXT_NODE:
+                    self.aggregate_interval = str(val.data)
+                    try:
+                        iso.parse_duration(self.aggregate_interval)
+                    except Exception as ex:
+                        raise sosException.SOSException("InvalidParameterValue","aggregateInterval","Parameter \"aggregate_interval\" sent with invalid format (check ISO8601 duration spec): %s" % ex)
+                else:
+                    err_txt = "cannot get ISO8601 duration value in \"aggregateInterval\""
+                    raise sosException.SOSException("InvalidParameterValue","aggregateInterval",err_txt)
+                #-----------------------
+                # -- aggregate_function
+                #-----------------------
+                val = aggfun[0].firstChild
+                if val.nodeType == val.TEXT_NODE:
+                    self.aggregate_function = str(val.data)
+                    if not (self.aggregate_function.upper() in ["AVG","COUNT","MAX","MIN","SUM"]):
+                        raise sosException.SOSException("InvalidParameterValue","aggregateFunction","Available aggregation functions: avg, count, max, min, sum.")
+                
+                
+                #-----------------------------------
+                # -- aggregate_no_data default value
+                #-----------------------------------
+                if len(aggnodata)==1:
+                    val = aggnodata[0].firstChild
+                    self.aggregate_nodata = str(val.data)
+                else:
+                    self.aggregate_nodata = sosConfig.aggregate_nodata
+
+           #================================
+           #MISSING AGGREGATE QUALITY INDEX
+           #================================         
+                    
+            elif len(aggint)==0 and len(aggfun)==0:
+                pass
+            else:
+                err_txt = "\"aggregateInterval\" and \"aggregate_function\" are both required with multiplicity 1"
+                raise sosException.SOSException("NoApplicableCode",None,err_txt)
+
+            #------------ QUALITY INDEX
+            self.qualityIndex=False
+            qidx = requestObject.getElementsByTagName('qualityIndex')
+            if len(qidx)>0:
+                if len(qidx)<2:
+                    val = qidx[0].firstChild
+                    if val.nodeType == val.TEXT_NODE:
+                        self.qualityIndex = str(val.data)
+                        if self.qualityIndex.upper() == "TRUE":
+                            self.qualityIndex=True
+                        elif self.qualityIndex.upper() == "FALSE":
+                            pass
+                        else:
+                            raise sosException.SOSException("InvalidParameterValue","qualityIndex","qualityIndex can only be \'True\' or \'False\'")
+            elif len(qidx)==0:
+                pass
+            else:
+                err_txt = "\"qualityIndex\" is allowed with multiplicity 1 only"
+                raise sosException.SOSException("NoApplicableCode",None,err_txt)
+
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+
diff --git a/istsoslib/filters/GO_filter.pyc b/istsoslib/filters/GO_filter.pyc
index 46ca828..8fe0bba 100644
Binary files a/istsoslib/filters/GO_filter.pyc and b/istsoslib/filters/GO_filter.pyc differ
diff --git a/istsoslib/filters/IO_filter.py b/istsoslib/filters/IO_filter.py
index c2aa9cd..662f8da 100755
--- a/istsoslib/filters/IO_filter.py
+++ b/istsoslib/filters/IO_filter.py
@@ -1,274 +1,293 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib.filters import filter as f
-from istsoslib import sosException
-from lib.etree import et
-
-def parse_and_get_ns(file):
-    events = "start", "start-ns"
-    root = None
-    ns = {}
-    for event, elem in et.iterparse(file, events):
-        if event == "start-ns":
-            if elem[0] in ns and ns[elem[0]] != elem[1]:
-                # NOTE: It is perfectly valid to have the same prefix refer
-                #   to different URI namespaces in different parts of the
-                #   document. This exception serves as a reminder that this
-                #   solution is not robust.  Use at your own peril.
-                raise KeyError("Duplicate prefix with different URI found.")
-            ns[elem[0]] = "%s" % elem[1]
-        elif event == "start":
-            if root is None:
-                root = elem 
-    return et.ElementTree(root), ns
-
-class sosIOfilter(f.sosFilter):
-    "filter object for a InsertObservation request"
-    #self.sensorId
-    #self.samplingTime
-    #self.procedure
-    #self.observedProperty
-    #self.featureOfInterest
-    #self.data {def:string {"uom":string,"vals":[]}
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
-        #**************************
-        if method == "GET":
-            raise sosException.SOSException("NoApplicableCode",None,"insertObservation request support only POST method!")
-        
-        if method == "POST":
-            from StringIO import StringIO
-            
-            tree, ns = parse_and_get_ns(StringIO(requestObject))
-            
-            #---assignedSensorId
-            #----------------------
-            AssignedSensorId = tree.find("{%s}AssignedSensorId" % ns['sos'] )
-            if AssignedSensorId == None:
-                raise sosException.SOSException("MissingParameterValue","AssignedSensorId","sos:AssignedSensorId parameter is mandatory with multiplicity 1")
-            else:
-                self.assignedSensorId = AssignedSensorId.text.split(":")[-1]
-            
-            #---forceInsert
-            ForceInsert = tree.find("{%s}ForceInsert" % ns['sos'] )
-            if not ForceInsert==None:
-                if ForceInsert.text == 'true' or ForceInsert.text == "":
-                    self.forceInsert = True 
-                elif ForceInsert.text == 'false':
-                    self.forceInsert = False
-                else:
-                    err_txt = "parameter \"ForceInsert\" can only be: 'true' or 'false'"
-                    raise sosException.SOSException("InvalidParameterValue","ForceInsert",err_txt)
-            else:
-                self.forceInsert = False
-                
-            #---om:observation
-            Observation = tree.find("{%s}Observation" % ns['om'] )
-            if Observation == None:
-                raise sosException.SOSException("MissingParameterValue","Observation","om:Observation tag is mandatory with multiplicity 1")
-            
-            #-------procedure
-            procedure = Observation.find("{%s}procedure" % ns['om'] )
-            if procedure == None:
-                raise sosException.SOSException("NoApplicableCode",None,"om:procedure tag is mandatory with multiplicity 1")
-            self.procedure = procedure.attrib[ "{%s}href" % ns['xlink'] ].split(":")[-1]
-
-            #-------ObservedProperties
-            self.oprName=[]
-            observedProperty = Observation.find("{%s}observedProperty" % ns['om'] )
-            if observedProperty == None:
-                raise sosException.SOSException("NoApplicableCode",None,"om:observedProperty tag is mandatory with multiplicity 1")
-            
-            
-            CompositPhenomenon = observedProperty.find("{%s}CompositePhenomenon" % ns['swe'] )
-            import traceback, sys
-            
-            if not CompositPhenomenon == None:
-                components = CompositPhenomenon.findall("{%s}component" % ns['swe'] )
-                for co in components:
-                    try:
-                        self.oprName.append(co.attrib[ "{%s}href" % ns['xlink'] ] )
-                    except:
-                        try:
-                            name = co.find("{%s}name" % ns['gml'] )
-                            self.oprName.append(name.text)
-                        except:
-                            raise sosException.SOSException("NoApplicableCode",None,"om:observedProperty Name is missing: 'xlink:href' or 'gml:name' required")
-            else:
-                try:
-                    self.oprName.append(observedProperty.attrib[ "{%s}href" % ns['xlink'] ])
-                except:
-                    try:
-                        name = co.find( "{%s}name" % ns['gml'] )
-                        self.oprName.append(name.text)
-                    except:
-                        raise sosException.SOSException("NoApplicableCode",None,"om:observedProperty Name is missing: 'xlink:href' or 'gml:name' required")
-                    
-            #-----samplingTime
-            samplingTime = Observation.find("{%s}samplingTime" % ns['om'] )
-            if samplingTime==None:
-                err_txt = "om:samplingTime is mandatory in multiplicity 1"
-                raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            
-            TimePeriod = samplingTime.find("{%s}TimePeriod" % ns['gml'] )
-            if not TimePeriod == None:
-                bp = TimePeriod.find("{%s}beginPosition" % ns['gml'] )
-                ep = TimePeriod.find("{%s}endPosition" % ns['gml'] )
-                if bp==None or ep==None:
-                    err_txt = "gml:TimePeriod is mandatory in multiplicity 1"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                self.samplingTime = bp.text + "/" + ep.text
-
-            else:
-                TimeInstant = samplingTime.find("{%s}TimeInstant" % ns['gml'] )
-                if not TimeInstant==None:
-                    tpos = TimeInstant.find("{%s}timePosition" % ns['gml'] )
-                    self.samplingTime = tpos.text
-                else:
-                    err_txt = "one of gml:TimePeriod or gml:TimeInstant is mandatory in multiplicity 1"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-            
-            #------featureOfInterest
-            featureOfInterest = Observation.find("{%s}featureOfInterest" % ns['om'] )
-            if featureOfInterest == None:
-                raise sosException.SOSException("NoApplicableCode",None,"om:featureOfInterest tag is mandatory with multiplicity 1")
-            try:
-                self.foiName = featureOfInterest.attrib[ "{%s}href" % ns['xlink'] ].split(":")[-1]
-            except:
-                try:
-                    gml_name = featureOfInterest.find("{%s}name" % ns['gml'] ).split(":")[-1]
-                    self.foiName = gml_name.text
-                except:
-                    raise sosException.SOSException("NoApplicableCode",None,"om:featureOfInterest name is missing: 'xlink:href' or 'gml:name' is required")
-            
-            #--result
-            if Observation.find("{%s}result" % ns['om'] ) == None:
-                raise sosException.SOSException("NoApplicableCode",None,"om:result tag is required")
-            
-            SimpleDataRecord = Observation.find("{%s}result/{%s}SimpleDataRecord" %(ns['om'],ns['swe']) )
-            DataArray = Observation.find("{%s}result/{%s}DataArray" %(ns['om'],ns['swe']) )
-            
-            ##########################################################################################################
-            #-----result---
-            #return self.data where self.data is a dictionary of "definition" containing dictionary of "uom" and "vals"
-            """ e.g.:
-            self.data = {   
-                        "urn:ist:parameter:time:iso8601": 
-                            {
-                            "uom":"sec", 
-                            "vals":["2009-07-31T12:00:00+02:00","2009-07-31T12:10:00+02:00","2009-07-31T12:20:00+02:00"]
-                            },
-                        "urn:ist:def:phenomenon:rainfall": 
-                            {
-                            "uom":"mm", 
-                            "vals":[0.1,0.2,0.3,0.4]
-                            }
-                        }
-            """
-            ##########################################################################################################
-            
-            self.parameters = []
-            self.uoms = []
-            self.data = {}
-            
-            #case SimpleDataRecord 
-            if not SimpleDataRecord==None and DataArray==None:
-                fields = SimpleDataRecord.findall("{%s}field" % ns['swe'] )
-                for field in fields:
-                    defin = None
-                    uom = None
-                    vals = []
-                    fieldName = field.attrib["name"]
-                    if not field.find("{%s}Time" % ns['swe']) == None:
-                        tf = field.find("{%s}Time" % ns['swe'])
-                        defin = tf.attrib["definition"]
-                        vals.append( tf.find("{%s}value" % ns['swe']).text )
-                    elif not field.find("{%s}Quantity" % ns['swe']) == None:
-                        qf = field.find("{%s}Quantity" % ns['swe'])
-                        defin = qf.attrib["definition"]
-                        uom = qf.find("{%s}uom" % ns['swe']).attrib["code"]
-                        vals.append( qf.find("{%s}value" % ns['swe']).text )
-                    else:
-                        err_txt = "swe:Time or swe:Quantity is mandatory in multiplicity 1"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                    self.data[defin]={"uom":uom,"vals":vals}
-            
-            #Case DataArray
-            elif SimpleDataRecord==None and not DataArray==None:
-                DataRecord = DataArray.find("{%s}elementType/{%s}DataRecord" % (ns['swe'],ns['swe']))
-                fields = DataRecord.findall("{%s}field" % ns['swe'] )
-                urnlist=[]
-                for id, field in enumerate(fields):
-                    defin = None
-                    uom = None
-                    vals = []
-                    #fieldName = field.attrib["name"]
-                    if not field.find("{%s}Time" % ns['swe']) == None:
-                        swet = field.find("{%s}Time" % ns['swe'])
-                        defin = swet.attrib["definition"]
-                        urnlist.append(swet.attrib["definition"])
-                    elif not field.find("{%s}Quantity" % ns['swe']) == None:
-                        sweq = field.find("{%s}Quantity" % ns['swe'])
-                        defin = sweq.attrib["definition"]
-                        urnlist.append( sweq.attrib["definition"])
-                        if not sweq.find("{%s}uom" % ns['swe']) == None:
-                           uom = sweq.find("{%s}uom" % ns['swe']).attrib["code"]
-                    else:
-                        err_txt = "swe:Time or swe:Quantity is mandatory in multiplicity 1"
-                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                    self.data[defin]={"uom":uom,"vals":vals}
-                #encoding
-                encodingTxtBlock = Observation.find("{%s}result/{%s}DataArray/{%s}encoding/{%s}TextBlock" 
-                                            %(ns['om'],ns['swe'],ns['swe'],ns['swe']) )
-                if encodingTxtBlock == None:
-                    err_txt = "swe:encoding is mandatory in multiplicity 1"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                tokenSeparator = encodingTxtBlock.attrib["tokenSeparator"]
-                blockSeparator = encodingTxtBlock.attrib["blockSeparator"]
-                #decimalSeparator = encodingTxtBlock.attrib["decimalSeparator"]
-                #values
-                values = Observation.find("{%s}result/{%s}DataArray/{%s}values" %(ns['om'],ns['swe'],ns['swe']) )
-                if values == None:
-                    err_txt = "swe:values is mandatory in multiplicity 1"
-                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
-                
-                if values.text:
-                    valsplit=[i.split(tokenSeparator) for i in values.text.split(blockSeparator)]
-                    for index,c in enumerate(urnlist):
-                        col = []
-                        for l in valsplit:
-                            col.append(l[index])
-                        self.data[c]["vals"] = col
-                
-            
-            #case simple om:result
-            elif SimpleDataRecord==None and DataArray==None:
-                self.data[sosConfig.urn["time"]] = {"uom":None,"vals":[self.samplingTime]}
-                result = Observation.find("{%s}result" %(ns['om']) )
-                uom = result.attrib["uom"]
-                vals = result.text
-                self.data[sosConfig.urn["phenomena"]+self.oprName]={"uom":uom,"vals":vals}
-                
-            #error
-            else:
-                err_txt = "om:SimpleDataRecord in multiplicity N or om:DataArray in multiplicity 1 is mandatory"
-                raise sosException.SOSException("NoApplicableCode",None,err_txt) 
-             
-        
-                        
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib.filters import filter as f
+from istsoslib import sosException
+from lib.etree import et
+
+def parse_and_get_ns(file):
+    events = "start", "start-ns"
+    root = None
+    ns = {}
+    for event, elem in et.iterparse(file, events):
+        if event == "start-ns":
+            if elem[0] in ns and ns[elem[0]] != elem[1]:
+                # NOTE: It is perfectly valid to have the same prefix refer
+                #   to different URI namespaces in different parts of the
+                #   document. This exception serves as a reminder that this
+                #   solution is not robust.  Use at your own peril.
+                raise KeyError("Duplicate prefix with different URI found.")
+            ns[elem[0]] = "%s" % elem[1]
+        elif event == "start":
+            if root is None:
+                root = elem 
+    return et.ElementTree(root), ns
+
+class sosIOfilter(f.sosFilter):
+    "filter object for a InsertObservation request"
+    #self.sensorId
+    #self.samplingTime
+    #self.procedure
+    #self.observedProperty
+    #self.featureOfInterest
+    #self.data {def:string {"uom":string,"vals":[]}
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
+        #**************************
+        if method == "GET":
+            raise sosException.SOSException("NoApplicableCode",None,"insertObservation request support only POST method!")
+        
+        if method == "POST":
+            from StringIO import StringIO
+            
+            tree, ns = parse_and_get_ns(StringIO(requestObject))
+            
+            # Workaround for rare xml parsing bug in etree
+            ns = {
+                'gml': 'http://www.opengis.net/gml',
+                'swe': 'http://www.opengis.net/swe',
+                'om': 'http://www.opengis.net/om/1.0',
+                'sos': 'http://www.opengis.net/sos/1.0',
+                'xlink': 'http://www.w3.org/1999/xlink',
+                'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+                
+            }
+            
+            if not 'swe' in ns:
+                ns['swe'] = 'http://www.opengis.net/swe/1.0.1'
+            
+            #---assignedSensorId
+            #----------------------
+            AssignedSensorId = tree.find("{%s}AssignedSensorId" % ns['sos'] )
+            if AssignedSensorId == None:
+                raise sosException.SOSException("MissingParameterValue","AssignedSensorId","sos:AssignedSensorId parameter is mandatory with multiplicity 1")
+            else:
+                self.assignedSensorId = AssignedSensorId.text.split(":")[-1]
+            
+            #---forceInsert
+            ForceInsert = tree.find("{%s}ForceInsert" % ns['sos'] )
+            if not ForceInsert==None:
+                if ForceInsert.text == 'true' or ForceInsert.text == "":
+                    self.forceInsert = True 
+                elif ForceInsert.text == 'false':
+                    self.forceInsert = False
+                else:
+                    err_txt = "parameter \"ForceInsert\" can only be: 'true' or 'false'"
+                    raise sosException.SOSException("InvalidParameterValue","ForceInsert",err_txt)
+            else:
+                self.forceInsert = False
+                
+            #---om:observation
+            Observation = tree.find("{%s}Observation" % ns['om'] )
+            if Observation == None:
+                raise sosException.SOSException("MissingParameterValue","Observation","om:Observation tag is mandatory with multiplicity 1")
+            
+            #-------procedure
+            procedure = Observation.find("{%s}procedure" % ns['om'] )
+            if procedure == None:
+                raise sosException.SOSException("NoApplicableCode",None,"om:procedure tag is mandatory with multiplicity 1")
+            self.procedure = procedure.attrib[ "{%s}href" % ns['xlink'] ].split(":")[-1]
+
+            #-------ObservedProperties
+            self.oprName=[]
+            observedProperty = Observation.find("{%s}observedProperty" % ns['om'] )
+            if observedProperty == None:
+                raise sosException.SOSException("NoApplicableCode",None,"om:observedProperty tag is mandatory with multiplicity 1")
+            
+            
+            CompositPhenomenon = observedProperty.find("{%s}CompositePhenomenon" % ns['swe'] )
+            import traceback, sys
+            
+            if not CompositPhenomenon == None:
+                components = CompositPhenomenon.findall("{%s}component" % ns['swe'] )
+                for co in components:
+                    try:
+                        self.oprName.append(co.attrib[ "{%s}href" % ns['xlink'] ] )
+                    except:
+                        try:
+                            name = co.find("{%s}name" % ns['gml'] )
+                            self.oprName.append(name.text)
+                        except:
+                            raise sosException.SOSException("NoApplicableCode",None,"om:observedProperty Name is missing: 'xlink:href' or 'gml:name' required")
+            else:
+                try:
+                    self.oprName.append(observedProperty.attrib[ "{%s}href" % ns['xlink'] ])
+                except:
+                    try:
+                        name = co.find( "{%s}name" % ns['gml'] )
+                        self.oprName.append(name.text)
+                    except:
+                        print >> sys.stderr, "XML: %s" % requestObject
+                        raise sosException.SOSException("NoApplicableCode",None,"om:observedProperty Name is missing: 'xlink:href' or 'gml:name' required")
+                    
+            #-----samplingTime
+            samplingTime = Observation.find("{%s}samplingTime" % ns['om'] )
+            if samplingTime==None:
+                err_txt = "om:samplingTime is mandatory in multiplicity 1"
+                raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            
+            TimePeriod = samplingTime.find("{%s}TimePeriod" % ns['gml'] )
+            if not TimePeriod == None:
+                bp = TimePeriod.find("{%s}beginPosition" % ns['gml'] )
+                ep = TimePeriod.find("{%s}endPosition" % ns['gml'] )
+                if bp==None or ep==None:
+                    err_txt = "gml:TimePeriod is mandatory in multiplicity 1"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                self.samplingTime = bp.text + "/" + ep.text
+
+            else:
+                TimeInstant = samplingTime.find("{%s}TimeInstant" % ns['gml'] )
+                if not TimeInstant==None:
+                    tpos = TimeInstant.find("{%s}timePosition" % ns['gml'] )
+                    self.samplingTime = tpos.text
+                else:
+                    err_txt = "one of gml:TimePeriod or gml:TimeInstant is mandatory in multiplicity 1"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+            
+            #------featureOfInterest
+            featureOfInterest = Observation.find("{%s}featureOfInterest" % ns['om'] )
+            if featureOfInterest == None:
+                raise sosException.SOSException("NoApplicableCode",None,"om:featureOfInterest tag is mandatory with multiplicity 1")
+            try:
+                self.foiName = featureOfInterest.attrib[ "{%s}href" % ns['xlink'] ].split(":")[-1]
+            except:
+                try:
+                    gml_name = featureOfInterest.find("{%s}name" % ns['gml'] ).split(":")[-1]
+                    self.foiName = gml_name.text
+                except:
+                    raise sosException.SOSException("NoApplicableCode",None,"om:featureOfInterest name is missing: 'xlink:href' or 'gml:name' is required")
+            
+            #--result
+            if Observation.find("{%s}result" % ns['om'] ) == None:
+                raise sosException.SOSException("NoApplicableCode",None,"om:result tag is required")
+            
+            SimpleDataRecord = Observation.find("{%s}result/{%s}SimpleDataRecord" %(ns['om'],ns['swe']) )
+            DataArray = Observation.find("{%s}result/{%s}DataArray" %(ns['om'],ns['swe']) )
+            
+            ##########################################################################################################
+            #-----result---
+            #return self.data where self.data is a dictionary of "definition" containing dictionary of "uom" and "vals"
+            """ e.g.:
+            self.data = {   
+                        "urn:ist:parameter:time:iso8601": 
+                            {
+                            "uom":"sec", 
+                            "vals":["2009-07-31T12:00:00+02:00","2009-07-31T12:10:00+02:00","2009-07-31T12:20:00+02:00"]
+                            },
+                        "urn:ist:def:phenomenon:rainfall": 
+                            {
+                            "uom":"mm", 
+                            "vals":[0.1,0.2,0.3,0.4]
+                            }
+                        }
+            """
+            ##########################################################################################################
+            
+            self.parameters = []
+            self.uoms = []
+            self.data = {}
+            
+            #case SimpleDataRecord 
+            if not SimpleDataRecord==None and DataArray==None:
+                fields = SimpleDataRecord.findall("{%s}field" % ns['swe'] )
+                for field in fields:
+                    defin = None
+                    uom = None
+                    vals = []
+                    fieldName = field.attrib["name"]
+                    if not field.find("{%s}Time" % ns['swe']) == None:
+                        tf = field.find("{%s}Time" % ns['swe'])
+                        defin = tf.attrib["definition"]
+                        vals.append( tf.find("{%s}value" % ns['swe']).text )
+                    elif not field.find("{%s}Quantity" % ns['swe']) == None:
+                        qf = field.find("{%s}Quantity" % ns['swe'])
+                        defin = qf.attrib["definition"]
+                        uom = qf.find("{%s}uom" % ns['swe']).attrib["code"]
+                        vals.append( qf.find("{%s}value" % ns['swe']).text )
+                    else:
+                        err_txt = "swe:Time or swe:Quantity is mandatory in multiplicity 1"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                    self.data[defin]={"uom":uom,"vals":vals}
+            
+            #Case DataArray
+            elif SimpleDataRecord==None and not DataArray==None:
+                DataRecord = DataArray.find("{%s}elementType/{%s}DataRecord" % (ns['swe'],ns['swe']))
+                fields = DataRecord.findall("{%s}field" % ns['swe'] )
+                urnlist=[]
+                for id, field in enumerate(fields):
+                    defin = None
+                    uom = None
+                    vals = []
+                    #fieldName = field.attrib["name"]
+                    if not field.find("{%s}Time" % ns['swe']) == None:
+                        swet = field.find("{%s}Time" % ns['swe'])
+                        defin = swet.attrib["definition"]
+                        urnlist.append(swet.attrib["definition"])
+                    elif not field.find("{%s}Quantity" % ns['swe']) == None:
+                        sweq = field.find("{%s}Quantity" % ns['swe'])
+                        defin = sweq.attrib["definition"]
+                        urnlist.append( sweq.attrib["definition"])
+                        if not sweq.find("{%s}uom" % ns['swe']) == None:
+                           uom = sweq.find("{%s}uom" % ns['swe']).attrib["code"]
+                    else:
+                        err_txt = "swe:Time or swe:Quantity is mandatory in multiplicity 1"
+                        raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                    self.data[defin]={"uom":uom,"vals":vals}
+                #encoding
+                encodingTxtBlock = Observation.find("{%s}result/{%s}DataArray/{%s}encoding/{%s}TextBlock" 
+                                            %(ns['om'],ns['swe'],ns['swe'],ns['swe']) )
+                if encodingTxtBlock == None:
+                    err_txt = "swe:encoding is mandatory in multiplicity 1"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                tokenSeparator = encodingTxtBlock.attrib["tokenSeparator"]
+                blockSeparator = encodingTxtBlock.attrib["blockSeparator"]
+                #decimalSeparator = encodingTxtBlock.attrib["decimalSeparator"]
+                #values
+                values = Observation.find("{%s}result/{%s}DataArray/{%s}values" %(ns['om'],ns['swe'],ns['swe']) )
+                if values == None:
+                    err_txt = "swe:values is mandatory in multiplicity 1"
+                    raise sosException.SOSException("NoApplicableCode",None,err_txt)
+                
+                if values.text:
+                    valsplit=[i.split(tokenSeparator) for i in values.text.split(blockSeparator)]
+                    for index,c in enumerate(urnlist):
+                        col = []
+                        for l in valsplit:
+                            col.append(l[index])
+                        self.data[c]["vals"] = col
+                
+            
+            #case simple om:result
+            elif SimpleDataRecord==None and DataArray==None:
+                self.data[sosConfig.urn["time"]] = {"uom":None,"vals":[self.samplingTime]}
+                result = Observation.find("{%s}result" %(ns['om']) )
+                uom = result.attrib["uom"]
+                vals = result.text
+                self.data[sosConfig.urn["phenomena"]+self.oprName]={"uom":uom,"vals":vals}
+                
+            #error
+            else:
+                err_txt = "om:SimpleDataRecord in multiplicity N or om:DataArray in multiplicity 1 is mandatory"
+                raise sosException.SOSException("NoApplicableCode",None,err_txt) 
+             
+        
+                        
diff --git a/istsoslib/filters/IO_filter.pyc b/istsoslib/filters/IO_filter.pyc
index 77be4bf..88a038d 100644
Binary files a/istsoslib/filters/IO_filter.pyc and b/istsoslib/filters/IO_filter.pyc differ
diff --git a/istsoslib/filters/RS_filter.py b/istsoslib/filters/RS_filter.py
index db24b83..2fca5e1 100755
--- a/istsoslib/filters/RS_filter.py
+++ b/istsoslib/filters/RS_filter.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from istsoslib.filters import filter as f
 from istsoslib import sosException
 from lib.isodate import parse_duration
 from lib.etree import et
 import json
 
+import sys
+
 def parse_and_get_ns(file):
     events = "start", "start-ns"
     root = None
@@ -39,6 +46,31 @@ def parse_and_get_ns(file):
                 root = elem 
     return et.ElementTree(root), ns
     
+convertToSec = {
+    'min': lambda x: x * 60,
+    'h': lambda x: x * 3600,
+    'd': lambda x: x * 24 * 3600,
+    's': lambda x: x,
+    'ms': lambda x: x/1000,
+    'us': lambda x: x/1000000
+}    
+#def convertToSec(uom, value):
+#
+#        if uom == 'min':
+#            return (value * 60)
+#        elif uom == 'h':
+#            return (value * 3600)
+#        elif uom == 'd':
+#            return (value * 24 * 3600)
+#        elif uom == 's':
+#            return value
+#        elif uom == 'ms':
+#            return (value / 1000)
+#        elif uom == 'us':
+#            return (value / 1000000)
+#        else:
+#            raise sosException.SOSException("Unknown uom","sml:capabilities","Unknown unit of measure")      
+    
 class sosRSfilter(f.sosFilter): 
     "filter object for a registerSensor request"
     """
@@ -82,7 +114,41 @@ class sosRSfilter(f.sosFilter):
             else:
                 self.proc_desc = 'NULL'
             
-            #---System type
+            # Add capabilities time to db
+            # Convert all to seconds            
+                        
+            #---Capabilities
+            capabilities = tree.findall("{%s}SensorDescription/{%s}member/{%s}System/{%s}capabilities/{%s}DataRecord/{%s}field"
+                                            % (ns['sos'],ns['sml'],ns['sml'],ns['sml'],ns['swe'],ns['swe']))
+            #print >> sys.stderr, "capabilities: ",capabilities
+            
+            self.time_sam_val = "0"
+            self.time_acq_val = "0"
+            
+            for cap in capabilities:
+                
+                if cap.attrib.has_key('name') and cap.attrib['name']=='Sampling time resolution':
+                    # parse Sampling time resolution
+                    tmpSam = int(cap.find("{%s}Quantity/{%s}value"% (ns['swe'],ns['swe'])).text)
+                    uom = cap.find("{%s}Quantity/{%s}uom"% (ns['swe'],ns['swe']))
+                    if uom.attrib.has_key('code'):
+                        uomSam = uom.attrib['code']
+                        self.time_sam_val = convertToSec[uomSam](tmpSam) #convertToSec(uomSam,tmpSam)
+                    else:
+                        raise sosException.SOSException("MissingParameterValue","SensorDescription","sml:capabilities, missing uom for Sampling time resolution")
+                elif cap.attrib.has_key('name') and cap.attrib['name']=='Acquisition time resolution':
+                    # parse Acquisition time resolution
+                    tmpAcq =  int(cap.find("{%s}Quantity/{%s}value"% (ns['swe'],ns['swe'])).text)
+                    uom = cap.find("{%s}Quantity/{%s}uom"% (ns['swe'],ns['swe']))
+                    if uom.attrib.has_key('code'):
+                        uomAcq = uom.attrib['code']
+                        self.time_acq_val = convertToSec[uomAcq](tmpAcq) #convertToSec(uomAcq,tmpAcq)
+                    else:
+                        raise sosException.SOSException("MissingParameterValue","SensorDescription","sml:capabilities, missing uom for Sampling time resolution")
+          
+            print >> sys.stderr, self.time_sam_val             
+           
+           #---System type
             # From istSOS 2.0 the system type became mandatory (insitu-fixed-point, insitu-mobile-point, ...)
             self.systemType = None
             classifiers = tree.findall("{%s}SensorDescription/{%s}member/{%s}System/{%s}classification/{%s}ClassifierList/{%s}classifier" 
@@ -182,26 +248,28 @@ class sosRSfilter(f.sosFilter):
             """
 
             #-------samplingTime
-            samplingTime = Observation.find("{%s}samplingTime" % ns['om'] )
-            if samplingTime == None:
-                raise sosException.SOSException("NoApplicableCode",None,"om:samplingTime tag is mandatory with multiplicity 1")
-            else:
-                duration = samplingTime.find("{%s}TimePeriod/{%s}TimeLength/{%s}duration" 
-                                            %(ns['gml'],ns['gml'],ns['gml'], ) ) 
-                                            
-                if not duration==None:
-                    
-                    strdur = str( parse_duration( duration.text.strip() ) ).split(",")
-                    if len(strdur)>1:
-                        self.time_res_val = strdur[0].split(" ")[0]
-                        self.time_res_unit = strdur[0].split(" ")[1]
-                    elif len(strdur)==1:
-                        time = strdur[0].split(":")
-                        self.time_res_val = parse_duration( duration.text.strip() ).seconds
-                        self.time_res_unit = "sec"
-                else:
-                    self.time_res_unit = "unknown"
-                    self.time_res_val = "NULL"
+#==============================================================================
+#             samplingTime = Observation.find("{%s}samplingTime" % ns['om'] )
+#             if samplingTime == None:
+#                 raise sosException.SOSException("NoApplicableCode",None,"om:samplingTime tag is mandatory with multiplicity 1")
+#             else:
+#                 duration = samplingTime.find("{%s}TimePeriod/{%s}TimeLength/{%s}duration" 
+#                                             %(ns['gml'],ns['gml'],ns['gml'], ) ) 
+#                                             
+#                 if not duration==None:
+#                     
+#                     strdur = str( parse_duration( duration.text.strip() ) ).split(",")
+#                     if len(strdur)>1:
+#                         self.time_res_val = strdur[0].split(" ")[0]
+#                         self.time_res_unit = strdur[0].split(" ")[1]
+#                     elif len(strdur)==1:
+#                         time = strdur[0].split(":")
+#                         self.time_res_val = parse_duration( duration.text.strip() ).seconds
+#                         self.time_res_unit = "sec"
+#                 else:
+#                     self.time_res_unit = "unknown"
+#                     self.time_res_val = "NULL"
+#==============================================================================
                 
             
             #------featureOfInterest
@@ -421,7 +489,7 @@ class sosRSfilter(f.sosFilter):
             raise sosException.SOSException(1,err_txt)
             #####################################################################
             """
-            
+             
             
             
             
@@ -435,4 +503,3 @@ class sosRSfilter(f.sosFilter):
 
 
 
-
diff --git a/istsoslib/filters/RS_filter.pyc b/istsoslib/filters/RS_filter.pyc
index 76c1eb3..523c8da 100644
Binary files a/istsoslib/filters/RS_filter.pyc and b/istsoslib/filters/RS_filter.pyc differ
diff --git a/istsoslib/filters/USD_filter.py b/istsoslib/filters/USD_filter.py
index 16c538f..361c703 100755
--- a/istsoslib/filters/USD_filter.py
+++ b/istsoslib/filters/USD_filter.py
@@ -1,87 +1,91 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib.filters import filter as f
-from istsoslib import sosException
-
-def getElemTxt(node):
-    if node.hasChildNodes():
-        val = node.firstChild
-        if val.nodeType == val.TEXT_NODE:
-            return str(val.data)
-        else:
-            err_txt = "get node text value: \"%s\" is not of type TEXT" %(node.nodeName)
-            raise Exception(,err_txt)
-    else:
-            err_txt = "get node text value: \"%s\" has no child node" %(node.nodeName)
-            raise Exception(err_txt)
-        
-def getElemAtt(node,att):
-    if att in node.attributes.keys():
-        return str(node.getAttribute(att))
-    else:
-        None
-        #err_txt = "get node attribute value: \"%s\"has no \"%s\" attribute" %(node.nodeName,att)
-        #raise sosException.SOSException(1,err_txt)
-
-def get_name_from_urn(stringa,urnName,sosConfig):
-    a = stringa.split(":")
-    name = a[-1]
-    urn = sosConfig.urn[urnName].split(":")
-    if len(a)>1:
-        for index in range(len(urn)-1):
-            if urn[index]==a[index]:
-                pass
-            else:
-                raise Exception("Urn \"%s\" is not valid: %s."%(a,urn))
-    return name 
-
-class sosUSDfilter(f.sosFilter): 
-    "filter object for an updateSensorDescription request"
-    """
-    self.assignedSensorId = None
-    self.xmlSensorDescription = None
-    """
-
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
-        #**************************
-        if method == "GET":
-            raise sosException.SOSException("NoApplicableCode",None,"registerSensor request support only POST method!")
-            
-        if method == "POST":
-            
-            #---assignedSensorId
-            asid = requestObject.getElementsByTagName('AssignedSensorId')
-            if len(asid)==1:
-                    self.assignedSensorId = getElemTxt(asid[0])
-            else:
-                raise sosException.SOSException("MissingParameterValue","AssignedSensorId","AssignedSensorId parameter is mandatory with multiplicity 1")
-            
-            #---SensorDescription            
-            sd = requestObject.getElementsByTagName('SensorDescription')
-            if len(sd)==1:
-                self.xmlSensorDescription = sd[0]
-            else:
-                raise sosException.SOSException("MissingParameterValue","SensorDescription","SensorDescription parameter is mandatory with multiplicity 1")
-                
-                
-                
-                
-                
-                
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib.filters import filter as f
+from istsoslib import sosException
+
+def getElemTxt(node):
+    if node.hasChildNodes():
+        val = node.firstChild
+        if val.nodeType == val.TEXT_NODE:
+            return str(val.data)
+        else:
+            err_txt = "get node text value: \"%s\" is not of type TEXT" %(node.nodeName)
+            raise Exception(,err_txt)
+    else:
+            err_txt = "get node text value: \"%s\" has no child node" %(node.nodeName)
+            raise Exception(err_txt)
+        
+def getElemAtt(node,att):
+    if att in node.attributes.keys():
+        return str(node.getAttribute(att))
+    else:
+        None
+        #err_txt = "get node attribute value: \"%s\"has no \"%s\" attribute" %(node.nodeName,att)
+        #raise sosException.SOSException(1,err_txt)
+
+def get_name_from_urn(stringa,urnName,sosConfig):
+    a = stringa.split(":")
+    name = a[-1]
+    urn = sosConfig.urn[urnName].split(":")
+    if len(a)>1:
+        for index in range(len(urn)-1):
+            if urn[index]==a[index]:
+                pass
+            else:
+                raise Exception("Urn \"%s\" is not valid: %s."%(a,urn))
+    return name 
+
+class sosUSDfilter(f.sosFilter): 
+    "filter object for an updateSensorDescription request"
+    """
+    self.assignedSensorId = None
+    self.xmlSensorDescription = None
+    """
+
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        f.sosFilter.__init__(self,sosRequest,method,requestObject,sosConfig)
+        #**************************
+        if method == "GET":
+            raise sosException.SOSException("NoApplicableCode",None,"registerSensor request support only POST method!")
+            
+        if method == "POST":
+            
+            #---assignedSensorId
+            asid = requestObject.getElementsByTagName('AssignedSensorId')
+            if len(asid)==1:
+                    self.assignedSensorId = getElemTxt(asid[0])
+            else:
+                raise sosException.SOSException("MissingParameterValue","AssignedSensorId","AssignedSensorId parameter is mandatory with multiplicity 1")
+            
+            #---SensorDescription            
+            sd = requestObject.getElementsByTagName('SensorDescription')
+            if len(sd)==1:
+                self.xmlSensorDescription = sd[0]
+            else:
+                raise sosException.SOSException("MissingParameterValue","SensorDescription","SensorDescription parameter is mandatory with multiplicity 1")
+                
+                
+                
+                
+                
+                
diff --git a/istsoslib/filters/__init__.py b/istsoslib/filters/__init__.py
index 654553b..f24b841 100755
--- a/istsoslib/filters/__init__.py
+++ b/istsoslib/filters/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = ["filter", "factory_filters", "GC_filter", "GF_filter", "GO_filter", "DS_filter", "IO_filter", "RS_filter", "USD_filter"]
diff --git a/istsoslib/filters/__init__.pyc b/istsoslib/filters/__init__.pyc
index 9ef32bd..9372cb5 100644
Binary files a/istsoslib/filters/__init__.pyc and b/istsoslib/filters/__init__.pyc differ
diff --git a/istsoslib/filters/factory_filters.py b/istsoslib/filters/factory_filters.py
index 99acb77..591711d 100755
--- a/istsoslib/filters/factory_filters.py
+++ b/istsoslib/filters/factory_filters.py
@@ -1,98 +1,103 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from istsoslib import sosException
-import cgi
-from urlparse import parse_qs
-import sys
-
-def sosFactoryFilter(environ,sosConfig):
-    content_type = environ.get('CONTENT_TYPE', '')
-    
-    #---- set method, requestObject and sosRequest ----
-    method = str(environ['REQUEST_METHOD']).upper()
-    
-    if method=="GET":
-        # Returns a dictionary containing lists as values.
-        rect = parse_qs(environ['QUERY_STRING'])
-        requestObject = {}
-        for key in rect.keys():
-            requestObject[key.lower()] = rect[key][0]
-
-        if requestObject.has_key("request"):
-            sosRequest = requestObject["request"].lower()
-        else:
-            raise sosException.SOSException("MissingParameterValue","request","Parameter \"request\" is mandatory") 
-
-    elif method=="POST":
-        # the environment variable CONTENT_LENGTH may be empty or missing
-        try:
-            request_body_size = int(environ.get('CONTENT_LENGTH', 0))
-        except (ValueError):
-            request_body_size = 0
-
-        # get the request
-        from xml.dom import minidom
-        
-        content = environ['wsgi.input'].read(request_body_size)
-        if content_type.startswith("application/x-www-form-urlencoded"):
-            form = cgi.parse_qs(content)
-            if form.has_key("request"):
-                xmldoc = minidom.parseString(form["request"][0])
-            else:
-                raise sosException.SOSException("MissingParameterValue","request","Parameter \"request\" is mandatory")
-
-        else:
-            try:
-                xmldoc = minidom.parseString(content)
-            except:
-                raise sosException.SOSException("MissingParameterValue",None,"Unable to parse the request body: validation issue")
-            
-        requestObject = xmldoc.firstChild
-        sosRequest = requestObject.localName.lower()
-            
-    else:
-        err_txt = "Allowed \"http request\" are GET and POST: %s" %(method=="GET")
-        raise sosException.SOSException("InvalidRequest",None,err_txt)
-        
-    #--- if request is allowed instantiate the rigth filter ---
-    if sosRequest in sosConfig.parameters["requests"]:
-        if sosRequest == "getcapabilities":
-            from istsoslib.filters import GC_filter
-            return GC_filter.sosGCfilter(sosRequest,method,requestObject,sosConfig)
-        elif sosRequest == "describesensor":
-            from istsoslib.filters import DS_filter
-            return DS_filter.sosDSfilter(sosRequest,method,requestObject,sosConfig)
-        elif sosRequest == "getobservation":
-            from istsoslib.filters import GO_filter
-            return GO_filter.sosGOfilter(sosRequest,method,requestObject,sosConfig)
-        elif sosRequest == "getfeatureofinterest":
-            from istsoslib.filters import GF_filter
-            return GF_filter.sosGFfilter(sosRequest,method,requestObject,sosConfig)
-        elif sosRequest == "insertobservation":
-            from istsoslib.filters import IO_filter
-            return IO_filter.sosIOfilter(sosRequest,method,content,sosConfig)
-        elif sosRequest == "registersensor":
-            from istsoslib.filters import RS_filter
-            return RS_filter.sosRSfilter(sosRequest,method,content,sosConfig)
-        elif sosRequest == "updateSensorDescription":
-            from istsoslib.filters import USD_filter
-            return USD_filter.sosUSDfilter(sosRequest,method,requestObject,sosConfig)
-    else:
-        raise sosException.SOSException("InvalidParameterValue","request","\"request\": %s not supported" %(sosRequest))
-    
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib import sosException
+import cgi
+from urlparse import parse_qs
+import sys
+
+def sosFactoryFilter(environ,sosConfig):
+    content_type = environ.get('CONTENT_TYPE', '')
+    
+    #---- set method, requestObject and sosRequest ----
+    method = str(environ['REQUEST_METHOD']).upper()
+    
+    if method=="GET":
+        # Returns a dictionary containing lists as values.
+        rect = parse_qs(environ['QUERY_STRING'])
+        requestObject = {}
+        for key in rect.keys():
+            requestObject[key.lower()] = rect[key][0]
+
+        if requestObject.has_key("request"):
+            sosRequest = requestObject["request"].lower()
+        else:
+            raise sosException.SOSException("MissingParameterValue","request","Parameter \"request\" is mandatory") 
+
+    elif method=="POST":
+        # the environment variable CONTENT_LENGTH may be empty or missing
+        try:
+            request_body_size = int(environ.get('CONTENT_LENGTH', 0))
+        except (ValueError):
+            request_body_size = 0
+
+        # get the request
+        from xml.dom import minidom
+        
+        content = environ['wsgi.input'].read(request_body_size)
+        if content_type.startswith("application/x-www-form-urlencoded"):
+            form = cgi.parse_qs(content)
+            if form.has_key("request"):
+                xmldoc = minidom.parseString(form["request"][0])
+            else:
+                raise sosException.SOSException("MissingParameterValue","request","Parameter \"request\" is mandatory")
+
+        else:
+            try:
+                xmldoc = minidom.parseString(content)
+            except:
+                raise sosException.SOSException("MissingParameterValue",None,"Unable to parse the request body: validation issue")
+            
+        requestObject = xmldoc.firstChild
+        sosRequest = requestObject.localName.lower()
+            
+    else:
+        err_txt = "Allowed \"http request\" are GET and POST: %s" %(method=="GET")
+        raise sosException.SOSException("InvalidRequest",None,err_txt)
+        
+    #--- if request is allowed instantiate the rigth filter ---
+    if sosRequest in sosConfig.parameters["requests"]:
+        if sosRequest == "getcapabilities":
+            from istsoslib.filters import GC_filter
+            return GC_filter.sosGCfilter(sosRequest,method,requestObject,sosConfig)
+        elif sosRequest == "describesensor":
+            from istsoslib.filters import DS_filter
+            return DS_filter.sosDSfilter(sosRequest,method,requestObject,sosConfig)
+        elif sosRequest == "getobservation":
+            from istsoslib.filters import GO_filter
+            return GO_filter.sosGOfilter(sosRequest,method,requestObject,sosConfig)
+        elif sosRequest == "getfeatureofinterest":
+            from istsoslib.filters import GF_filter
+            return GF_filter.sosGFfilter(sosRequest,method,requestObject,sosConfig)
+        elif sosRequest == "insertobservation":
+            from istsoslib.filters import IO_filter
+            return IO_filter.sosIOfilter(sosRequest,method,content,sosConfig)
+        elif sosRequest == "registersensor":
+            from istsoslib.filters import RS_filter
+            return RS_filter.sosRSfilter(sosRequest,method,content,sosConfig)
+        elif sosRequest == "updateSensorDescription":
+            from istsoslib.filters import USD_filter
+            return USD_filter.sosUSDfilter(sosRequest,method,requestObject,sosConfig)
+    else:
+        raise sosException.SOSException("InvalidParameterValue","request","\"request\": %s not supported" %(sosRequest))
+    
+
diff --git a/istsoslib/filters/factory_filters.pyc b/istsoslib/filters/factory_filters.pyc
index 928592d..873a186 100644
Binary files a/istsoslib/filters/factory_filters.pyc and b/istsoslib/filters/factory_filters.pyc differ
diff --git a/istsoslib/filters/filter.py b/istsoslib/filters/filter.py
index 2a78f99..3bb4ef9 100755
--- a/istsoslib/filters/filter.py
+++ b/istsoslib/filters/filter.py
@@ -1,98 +1,102 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib import sosException
-
-class sosFilter():
-    "SOS request filters, set request, service and version"
-    #self.request = None
-    #self.service = None
-    #self.version = None
-    def __init__(self,sosRequest,method,requestObject,sosConfig):
-        #--------REQUEST-----------
-        self.request = sosRequest
-        self.sosConfig = sosConfig
-        #*****************
-        if method == "GET":
-            #--------SERVICE------------
-            if requestObject.has_key("service"):
-                self.service = requestObject["service"]
-                if self.service not in sosConfig.parameters["service"]:
-                    raise sosException.SOSException("InvalidParameterValue","service","\"service\": %s not supported" %(self.service))
-            else:
-                raise sosException.SOSException("MissingParameterValue","service","\"service\" parameter is mandatory")
-            #---------VERSION NEGOTIATION -----------
-            if self.request=="getcapabilities":
-                if requestObject.has_key("acceptversions"):
-                    AcceptVersions = requestObject["acceptversions"].split(",")
-                    AcceptVersions.sort()
-                    self.version = None
-                    for version in AcceptVersions:
-                        if version in sosConfig.parameters["version"]:
-                            self.version=version
-                            break
-                    if not self.version:
-                        raise sosException.SOSException("VersionNegotiationFailed",None,"Any of the accepted versions are supported by this server")
-                else:
-                    self.version = sosConfig.parameters["version"][0]
-            else:
-                #---------VERSION-----------
-                if requestObject.has_key("version"):
-                    self.version = requestObject["version"]
-                    if self.version not in sosConfig.parameters["version"]:
-                        raise sosException.SOSException("InvalidParameterValue","version","\"version\": %s not supported" %(self.version))
-                else:
-                    raise sosException.SOSException("MissingParameterValue","version","\"version\" parameter is mandatory")
-        #********************
-        if method == "POST":
-            if not type(requestObject)==type("pp"):                            
-                #--------SERVICE------------
-                if "service" in requestObject.attributes.keys():
-                    self.service = str(requestObject.getAttribute("service"))
-                    if self.service not in sosConfig.parameters["service"]:
-                        raise sosException.SOSException("InvalidParameterValue","service","\"service\": %s not supported" %(self.service))
-                else:
-                    raise sosException.SOSException("MissingParameterValue","service","\"service\" parameter is mandatory")
-                #---------VERSION NEGOTIATION -----------                        
-                if self.request=="getcapabilities":
-                    AcceptVersions = requestObject.getElementsByTagName('AcceptVersions')
-                    if len(AcceptVersions)>1:
-                        raise sosException.SOSException("InvalidParameterValue","AcceptVersions","AcceptVersions multiplicity is 1" %(self.version))
-                    elif len(AcceptVersions)==1:
-                        VersionsObj = requestObject.getElementsByTagName('Version')
-                        versions = [ str(val.firstChild.data) for val in VersionsObj]
-                        versions.sort()
-                        self.version = None
-                        for version in versions:
-                            if version in sosConfig.parameters["version"]:
-                                self.version=version
-                                break
-                        if not self.version:
-                            raise sosException.SOSException("VersionNegotiationFailed",None,"Any of the accepted versions are supported by this server")
-                    else:
-                        self.version = sosConfig.parameters["version"][0]
-                else:
-                    #---------VERSION-----------
-                    if "version" in requestObject.attributes.keys():
-                        self.version = str(requestObject.getAttribute("version"))
-                        if self.version not in sosConfig.parameters["version"]:
-                            raise sosException.SOSException("InvalidParameterValue","version","\"version\": %s not supported" %(self.version))
-                    else:
-                        self.version = sosConfig.parameters["version"][0]
-
-            
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib import sosException
+
+class sosFilter():
+    "SOS request filters, set request, service and version"
+    #self.request = None
+    #self.service = None
+    #self.version = None
+    def __init__(self,sosRequest,method,requestObject,sosConfig):
+        #--------REQUEST-----------
+        self.request = sosRequest
+        self.sosConfig = sosConfig
+        #*****************
+        if method == "GET":
+            #--------SERVICE------------
+            if requestObject.has_key("service"):
+                self.service = requestObject["service"]
+                if self.service not in sosConfig.parameters["service"]:
+                    raise sosException.SOSException("InvalidParameterValue","service","\"service\": %s not supported" %(self.service))
+            else:
+                raise sosException.SOSException("MissingParameterValue","service","\"service\" parameter is mandatory")
+            #---------VERSION NEGOTIATION -----------
+            if self.request=="getcapabilities":
+                if requestObject.has_key("acceptversions"):
+                    AcceptVersions = requestObject["acceptversions"].split(",")
+                    AcceptVersions.sort()
+                    self.version = None
+                    for version in AcceptVersions:
+                        if version in sosConfig.parameters["version"]:
+                            self.version=version
+                            break
+                    if not self.version:
+                        raise sosException.SOSException("VersionNegotiationFailed",None,"Any of the accepted versions are supported by this server")
+                else:
+                    self.version = sosConfig.parameters["version"][0]
+            else:
+                #---------VERSION-----------
+                if requestObject.has_key("version"):
+                    self.version = requestObject["version"]
+                    if self.version not in sosConfig.parameters["version"]:
+                        raise sosException.SOSException("InvalidParameterValue","version","\"version\": %s not supported" %(self.version))
+                else:
+                    raise sosException.SOSException("MissingParameterValue","version","\"version\" parameter is mandatory")
+        #********************
+        if method == "POST":
+            if not type(requestObject)==type("pp"):                            
+                #--------SERVICE------------
+                if "service" in requestObject.attributes.keys():
+                    self.service = str(requestObject.getAttribute("service"))
+                    if self.service not in sosConfig.parameters["service"]:
+                        raise sosException.SOSException("InvalidParameterValue","service","\"service\": %s not supported" %(self.service))
+                else:
+                    raise sosException.SOSException("MissingParameterValue","service","\"service\" parameter is mandatory")
+                #---------VERSION NEGOTIATION -----------                        
+                if self.request=="getcapabilities":
+                    AcceptVersions = requestObject.getElementsByTagName('AcceptVersions')
+                    if len(AcceptVersions)>1:
+                        raise sosException.SOSException("InvalidParameterValue","AcceptVersions","AcceptVersions multiplicity is 1" %(self.version))
+                    elif len(AcceptVersions)==1:
+                        VersionsObj = requestObject.getElementsByTagName('Version')
+                        versions = [ str(val.firstChild.data) for val in VersionsObj]
+                        versions.sort()
+                        self.version = None
+                        for version in versions:
+                            if version in sosConfig.parameters["version"]:
+                                self.version=version
+                                break
+                        if not self.version:
+                            raise sosException.SOSException("VersionNegotiationFailed",None,"Any of the accepted versions are supported by this server")
+                    else:
+                        self.version = sosConfig.parameters["version"][0]
+                else:
+                    #---------VERSION-----------
+                    if "version" in requestObject.attributes.keys():
+                        self.version = str(requestObject.getAttribute("version"))
+                        if self.version not in sosConfig.parameters["version"]:
+                            raise sosException.SOSException("InvalidParameterValue","version","\"version\": %s not supported" %(self.version))
+                    else:
+                        self.version = sosConfig.parameters["version"][0]
+
+            
diff --git a/istsoslib/filters/filter.pyc b/istsoslib/filters/filter.pyc
index d38ebe4..8d5c856 100644
Binary files a/istsoslib/filters/filter.pyc and b/istsoslib/filters/filter.pyc differ
diff --git a/istsoslib/renderers/DSresponseRender.py b/istsoslib/renderers/DSresponseRender.py
index 0ce20b8..cd05913 100755
--- a/istsoslib/renderers/DSresponseRender.py
+++ b/istsoslib/renderers/DSresponseRender.py
@@ -1,255 +1,260 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from istsoslib import sosException
-import sys   
-from lib.etree import et
-import json
-
-reurl = r'(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?'
-
-def parse_and_get_ns(filename):
-    events = "start", "start-ns"
-
-    root = None
-    ns = {}
-    f = open(filename)
-    for event, elem in et.iterparse(f, events):
-        if event == "start-ns":
-            if elem[0] in ns and ns[elem[0]] != elem[1]:
-                # NOTE: It is perfectly valid to have the same prefix refer
-                #   to different URI namespaces in different parts of the
-                #   document. This exception serves as a reminder that this
-                #   solution is not robust.  Use at your own peril.
-                raise KeyError("Duplicate prefix with different URI found.")
-            ns[elem[0]] = "%s" % elem[1]
-        elif event == "start":
-            if root is None:
-                root = elem 
-    f.close()
-    return et.ElementTree(root), ns
-
-     
-def render(DS,sosConfig):
-    # Returning content of the SensorML
-    
-    try:
-        #---parse xml
-        tree, ns = parse_and_get_ns(DS.smlFile)
-    except Exception as ex:
-        raise Exception("sensorML description for procedure '%s' not found or corrupted! [%s]"%(DS.smlFile,ex))    
-    
-    #---map namespaces---
-    try:
-        register_namespace = et.register_namespace
-        for key in ns:
-            register_namespace(key,ns[key])
-    except AttributeError:
-        try:
-            et._namespace_map.update(ns)
-            for key in ns:
-                et._namespace_map[ns[key]] = key
-        except AttributeError:
-            try:
-                from xml.etree.ElementTree import _namespace_map
-            except ImportError:
-                try:
-                    from elementtree.ElementTree import _namespace_map
-                except ImportError:
-                    print >> sys.stderr, ("Failed to import ElementTree from any known place")
-            for key in ns:
-                _namespace_map[ns[key]] = key
-        
-    mns = {
-            'xsi': "http://www.w3.org/2001/XMLSchema-instance" ,
-            'sml': "http://www.opengis.net/sensorML/1.0.1", 
-            'swe': "http://www.opengis.net/swe/1.0.1", 
-            'xlink': "http://www.w3.org/1999/xlink", 
-            'gml': 'http://www.opengis.net/gml'            
-        }
-    
-    for n in mns.keys():
-        try:
-            ns[n]
-        except:
-            ns[n] = mns[n]
-    
-    
-    #--- CREEATE FIELDS ACCORDING TO DATABASE OBSERVED_PROPERTIES 
-    datarecord = tree.find("{%s}member/{%s}System/{%s}outputs/{%s}OutputList/{%s}output/{%s}DataRecord"
-                        %(ns['sml'],ns['sml'],ns['sml'],ns['sml'],ns['sml'],ns['swe']) )
-    
-    
-    datarecord.clear()
-    datarecord.attrib["definition"] = "%stimeSeries" % (sosConfig.urn['dataType'])
-    fieldT = et.SubElement(datarecord,"{%s}field" % ns["swe"])
-    fieldT.attrib["name"] = "Time"
-    time = et.SubElement(fieldT,"{%s}Time" % ns["swe"])
-    time.attrib["definition"] = sosConfig.urn["time"]
-    
-    # Adding constraint for current allowed times
-    if (not DS.stime == None) and (not DS.etime == None):
-        constraint =  et.SubElement(time, "{%s}constraint" % ns['swe'])
-        allowedTimes =  et.SubElement(constraint, "{%s}AllowedTimes" % ns['swe'])
-        interval = et.SubElement(allowedTimes, "{%s}interval" % ns['swe'])
-        interval.text = "%s %s" %(DS.stime.strftime("%Y-%m-%dT%H:%M:%S.%fZ"), DS.etime.strftime("%Y-%m-%dT%H:%M:%S.%fZ"))
-    
-    if DS.procedureType=="insitu-mobile-point": # Adding 3d coordinates observation
-        
-        cord = et.SubElement(datarecord,"{%s}field" % ns["swe"])
-        cord.attrib["name"] = "x"
-        quantity = et.SubElement(cord,"{%s}Quantity" % ns["swe"])
-        quantity.attrib["definition"] = sosConfig.urn["refsystem"] + sosConfig.istsosepsg + ":x-position"
-        
-        cord = et.SubElement(datarecord,"{%s}field" % ns["swe"])
-        cord.attrib["name"] = "y"
-        quantity = et.SubElement(cord,"{%s}Quantity" % ns["swe"])
-        quantity.attrib["definition"] = sosConfig.urn["refsystem"] + sosConfig.istsosepsg + ":y-position"
-        
-        cord = et.SubElement(datarecord,"{%s}field" % ns["swe"])
-        cord.attrib["name"] = "z"
-        quantity = et.SubElement(cord,"{%s}Quantity" % ns["swe"])
-        quantity.attrib["definition"] = sosConfig.urn["refsystem"] + sosConfig.istsosepsg + ":z-position"
-        
-        
-    for index,field in enumerate(DS.observedProperties):
-        
-        fieldQ = et.SubElement(datarecord,"{%s}field" % ns["swe"])
-        fieldQ.attrib["name"] = field["name_opr"]
-        quantity = et.SubElement(fieldQ,"{%s}Quantity" % ns["swe"])
-        quantity.attrib["definition"] = field["def_opr"]
-        
-        if not (field["name_uom"]=="" or field["name_uom"]==None or field["name_uom"]=="NULL"):
-            uom = et.SubElement(quantity,"{%s}uom" % ns["swe"])
-            uom.attrib["code"] = field["name_uom"]
-        """
-        if not (field["desc_opr"]=="" or field["desc_opr"]==None or field["desc_opr"]=="NULL"):
-            description = et.SubElement(quantity,"{%s}description" % ns["swe"])
-            description.text = field["desc_opr"]
-        """
-        
-        """
-        # Handling constraint
-        Permitted conigurations:
-            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","min":"10"}
-            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","max":"10"}
-            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","interval":["-10","10"]}
-            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","valueList":["1","2","3","4","5","6"]}
-        """
-        if not (field["constr_pro"]=="" or field["constr_pro"]==None):
-            try:
-                constraintObj = json.loads(field["constr_pro"])
-                
-                constraint = et.SubElement(quantity,"{%s}constraint" % ns["swe"])
-                
-                # Role attribute is not mandatory
-                if "role" in constraintObj and constraintObj["role"]!="" and constraintObj["role"]!=None:
-                    constraint.attrib[ "{%s}role" % ns['xlink'] ]= constraintObj["role"]
-                    
-                AllowedValues = et.SubElement(constraint, "{%s}AllowedValues" % ns['swe'])
-                
-                # Factory on constraint min/max/interval/valuelist
-                if "interval" in constraintObj:
-                    interval = et.SubElement(AllowedValues, "{%s}interval" % ns['swe'])
-                    interval.text = " ".join([ str(a) for a in constraintObj["interval"] ])
-                    #interval.text = " ".join(constraintObj["interval"])
-                    
-                elif "valueList" in constraintObj:#.has_key("valueList"):
-                    valueList = et.SubElement(AllowedValues, "{%s}valueList" % ns['swe'])
-                    valueList.text = ", ".join([ str(a) for a in constraintObj["valueList"] ])
-                    #valueList.text = " ".join(constraintObj["valueList"])
-                    
-                elif "min" in constraintObj:#.has_key("min"):
-                    amin = et.SubElement(AllowedValues, "{%s}min" % ns['swe'])
-                    amin.text = str(constraintObj["min"])
-                    
-                elif "max" in constraintObj:#.has_key("max"):
-                    amax = et.SubElement(AllowedValues, "{%s}max" % ns['swe'])
-                    amax.text = str(constraintObj["max"])
-                
-            except Exception:
-                raise Exception("Constraint definition invalid in the database for %s" % field["def_opr"])
-    
-    #verify that gml_id does not contain blanks 
-    #(workaround to be corrected in future name sensor registration)
-#    ------------------------------------------
-#    NCName stands for "non-colonized name". 
-#    NCName can be defined as an XML Schema regular expression [\i-[:]][\c-[:]]*
-#    
-#    So in plain English it would mean "any initial character, but not :". 
-#    The whole regular expression reads as "One initial XML name character, 
-#    but not a colon, followed by zero or more XML name characters, but not a colon."
-#    
-#    The practical restrictions of NCName are that it cannot contain several symbol characters
-#    ------------------------------------------
-    
-    not_allowed_NCName = [' ', '!','"', '#', '$', '%', '&', '\'', 
-                          '(', ')', '*', '+', ',', '/', ':', ';', 
-                          '<', '=', '>', '?', '@', '[', '\\', ']', 
-                          '^', '`', '{', '|', '}', '~']
-                          
-    location = tree.find("{%s}member/{%s}System/{%s}location"
-                        %(ns['sml'],ns['sml'],ns['sml']) )
-    for feature in location:
-        for ch in not_allowed_NCName:
-            if ch in feature.attrib['{%s}id' %ns['gml']]:
-                feature.attrib['{%s}id' %ns['gml']] = feature.attrib['{%s}id' %ns['gml']].replace(ch,"_")
-
-    # The unique identifier in the response document matches the procedure specified in the request
-    system = tree.find("{%s}member/{%s}System" %(ns['sml'],ns['sml']))
-    identification = tree.find("{%s}member/{%s}System/{%s}identification" %(ns['sml'],ns['sml'],ns['sml']))
-    
-    if not identification:
-        identification = et.Element("{%s}identification" % ns["sml"])
-        identifierList = et.SubElement(identification,"{%s}IdentifierList" % ns["sml"])
-        identifier = et.SubElement(identifierList,"{%s}identifier" % ns["sml"])
-        term = et.SubElement(identifier,"{%s}Term" % ns["sml"])
-        term.attrib['definition'] = "urn:ogc:def:identifier:OGC:uniqueID"
-        value = et.SubElement(term,"{%s}value" % ns["sml"])
-        value.text = sosConfig.urn["procedure"]+system.attrib['{%s}id' %ns['gml']]
-        system.insert(1,identification)
-    else:
-        identifierList = identification.find("{%s}IdentifierList" % ns["sml"])
-        if not identifierList:
-            identifierList = et.SubElement(identification,"{%s}IdentifierList" % ns["sml"])
-            identifier = et.SubElement(identifierList,"{%s}identifier" % ns["sml"])
-            term = et.SubElement(identifier,"{%s}Term" % ns["sml"])
-            term.attrib['definition'] = "urn:ogc:def:identifier:OGC:uniqueID"
-            value = et.SubElement(term,"{%s}value" % ns["sml"])
-            value.text = sosConfig.urn["procedure"]+system.attrib['{%s}id' %ns['gml']]
-#            system.insert(1,identification)
-        else:
-            identifiers = identifierList.findall("{%s}identifier" % ns["sml"])
-            unique = False
-            for identifier in identifiers:
-                if identifier.find("{%s}Term" % ns["sml"]).attrib['definition'] == "urn:ogc:def:identifier:OGC:uniqueID":
-                    unique = True
-                    break
-            if not unique:
-                identifier = et.SubElement(identifierList,"{%s}identifier" % ns["sml"])
-                term = et.SubElement(identifier,"{%s}Term" % ns["sml"])
-                term.attrib['definition'] = "urn:ogc:def:identifier:OGC:uniqueID"
-                value = et.SubElement(term,"{%s}value" % ns["sml"])
-                value.text = sosConfig.urn["procedure"]+system.attrib['{%s}id' %ns['gml']]
-#                system.insert(1,identification)
-    
-            
-    
-    
-    root = tree.getroot()
-    root.attrib["xmlns"]="http://www.opengis.net/sensorML/1.0.1"
-    return """<?xml version="1.0" encoding="UTF-8"?>\n%s""" % et.tostring(root)
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib import sosException
+import sys   
+from lib.etree import et
+import json
+
+reurl = r'(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?'
+
+def parse_and_get_ns(filename):
+    events = "start", "start-ns"
+
+    root = None
+    ns = {}
+    f = open(filename)
+    for event, elem in et.iterparse(f, events):
+        if event == "start-ns":
+            if elem[0] in ns and ns[elem[0]] != elem[1]:
+                # NOTE: It is perfectly valid to have the same prefix refer
+                #   to different URI namespaces in different parts of the
+                #   document. This exception serves as a reminder that this
+                #   solution is not robust.  Use at your own peril.
+                raise KeyError("Duplicate prefix with different URI found.")
+            ns[elem[0]] = "%s" % elem[1]
+        elif event == "start":
+            if root is None:
+                root = elem 
+    f.close()
+    return et.ElementTree(root), ns
+
+     
+def render(DS,sosConfig):
+    # Returning content of the SensorML
+    
+    try:
+        #---parse xml
+        tree, ns = parse_and_get_ns(DS.smlFile)
+    except Exception as ex:
+        raise Exception("sensorML description for procedure '%s' not found or corrupted! [%s]"%(DS.smlFile,ex))    
+    
+    #---map namespaces---
+    try:
+        register_namespace = et.register_namespace
+        for key in ns:
+            register_namespace(key,ns[key])
+    except AttributeError:
+        try:
+            et._namespace_map.update(ns)
+            for key in ns:
+                et._namespace_map[ns[key]] = key
+        except AttributeError:
+            try:
+                from xml.etree.ElementTree import _namespace_map
+            except ImportError:
+                try:
+                    from elementtree.ElementTree import _namespace_map
+                except ImportError:
+                    print >> sys.stderr, ("Failed to import ElementTree from any known place")
+            for key in ns:
+                _namespace_map[ns[key]] = key
+        
+    mns = {
+            'xsi': "http://www.w3.org/2001/XMLSchema-instance" ,
+            'sml': "http://www.opengis.net/sensorML/1.0.1", 
+            'swe': "http://www.opengis.net/swe/1.0.1", 
+            'xlink': "http://www.w3.org/1999/xlink", 
+            'gml': 'http://www.opengis.net/gml'            
+        }
+    
+    for n in mns.keys():
+        try:
+            ns[n]
+        except:
+            ns[n] = mns[n]
+    
+    
+    #--- CREEATE FIELDS ACCORDING TO DATABASE OBSERVED_PROPERTIES 
+    datarecord = tree.find("{%s}member/{%s}System/{%s}outputs/{%s}OutputList/{%s}output/{%s}DataRecord"
+                        %(ns['sml'],ns['sml'],ns['sml'],ns['sml'],ns['sml'],ns['swe']) )
+    
+    
+    datarecord.clear()
+    datarecord.attrib["definition"] = "%stimeSeries" % (sosConfig.urn['dataType'])
+    fieldT = et.SubElement(datarecord,"{%s}field" % ns["swe"])
+    fieldT.attrib["name"] = "Time"
+    time = et.SubElement(fieldT,"{%s}Time" % ns["swe"])
+    time.attrib["definition"] = sosConfig.urn["time"]
+    
+    # Adding constraint for current allowed times
+    if (not DS.stime == None) and (not DS.etime == None):
+        constraint =  et.SubElement(time, "{%s}constraint" % ns['swe'])
+        allowedTimes =  et.SubElement(constraint, "{%s}AllowedTimes" % ns['swe'])
+        interval = et.SubElement(allowedTimes, "{%s}interval" % ns['swe'])
+        interval.text = "%s %s" %(DS.stime.strftime("%Y-%m-%dT%H:%M:%S.%fZ"), DS.etime.strftime("%Y-%m-%dT%H:%M:%S.%fZ"))
+    
+    if DS.procedureType=="insitu-mobile-point": # Adding 3d coordinates observation
+        
+        cord = et.SubElement(datarecord,"{%s}field" % ns["swe"])
+        cord.attrib["name"] = "x"
+        quantity = et.SubElement(cord,"{%s}Quantity" % ns["swe"])
+        quantity.attrib["definition"] = sosConfig.urn["refsystem"] + sosConfig.istsosepsg + ":x-position"
+        
+        cord = et.SubElement(datarecord,"{%s}field" % ns["swe"])
+        cord.attrib["name"] = "y"
+        quantity = et.SubElement(cord,"{%s}Quantity" % ns["swe"])
+        quantity.attrib["definition"] = sosConfig.urn["refsystem"] + sosConfig.istsosepsg + ":y-position"
+        
+        cord = et.SubElement(datarecord,"{%s}field" % ns["swe"])
+        cord.attrib["name"] = "z"
+        quantity = et.SubElement(cord,"{%s}Quantity" % ns["swe"])
+        quantity.attrib["definition"] = sosConfig.urn["refsystem"] + sosConfig.istsosepsg + ":z-position"
+        
+        
+    for index,field in enumerate(DS.observedProperties):
+        
+        fieldQ = et.SubElement(datarecord,"{%s}field" % ns["swe"])
+        fieldQ.attrib["name"] = field["name_opr"]
+        quantity = et.SubElement(fieldQ,"{%s}Quantity" % ns["swe"])
+        quantity.attrib["definition"] = field["def_opr"]
+        
+        if not (field["name_uom"]=="" or field["name_uom"]==None or field["name_uom"]=="NULL"):
+            uom = et.SubElement(quantity,"{%s}uom" % ns["swe"])
+            uom.attrib["code"] = field["name_uom"]
+        """
+        if not (field["desc_opr"]=="" or field["desc_opr"]==None or field["desc_opr"]=="NULL"):
+            description = et.SubElement(quantity,"{%s}description" % ns["swe"])
+            description.text = field["desc_opr"]
+        """
+        
+        """
+        # Handling constraint
+        Permitted conigurations:
+            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","min":"10"}
+            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","max":"10"}
+            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","interval":["-10","10"]}
+            {"role":"urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable","valueList":["1","2","3","4","5","6"]}
+        """
+        if not (field["constr_pro"]=="" or field["constr_pro"]==None):
+            try:
+                constraintObj = json.loads(field["constr_pro"])
+                
+                constraint = et.SubElement(quantity,"{%s}constraint" % ns["swe"])
+                
+                # Role attribute is not mandatory
+                if "role" in constraintObj and constraintObj["role"]!="" and constraintObj["role"]!=None:
+                    constraint.attrib[ "{%s}role" % ns['xlink'] ]= constraintObj["role"]
+                    
+                AllowedValues = et.SubElement(constraint, "{%s}AllowedValues" % ns['swe'])
+                
+                # Factory on constraint min/max/interval/valuelist
+                if "interval" in constraintObj:
+                    interval = et.SubElement(AllowedValues, "{%s}interval" % ns['swe'])
+                    interval.text = " ".join([ str(a) for a in constraintObj["interval"] ])
+                    #interval.text = " ".join(constraintObj["interval"])
+                    
+                elif "valueList" in constraintObj:#.has_key("valueList"):
+                    valueList = et.SubElement(AllowedValues, "{%s}valueList" % ns['swe'])
+                    valueList.text = ", ".join([ str(a) for a in constraintObj["valueList"] ])
+                    #valueList.text = " ".join(constraintObj["valueList"])
+                    
+                elif "min" in constraintObj:#.has_key("min"):
+                    amin = et.SubElement(AllowedValues, "{%s}min" % ns['swe'])
+                    amin.text = str(constraintObj["min"])
+                    
+                elif "max" in constraintObj:#.has_key("max"):
+                    amax = et.SubElement(AllowedValues, "{%s}max" % ns['swe'])
+                    amax.text = str(constraintObj["max"])
+                
+            except Exception:
+                raise Exception("Constraint definition invalid in the database for %s" % field["def_opr"])
+    
+    #verify that gml_id does not contain blanks 
+    #(workaround to be corrected in future name sensor registration)
+#    ------------------------------------------
+#    NCName stands for "non-colonized name". 
+#    NCName can be defined as an XML Schema regular expression [\i-[:]][\c-[:]]*
+#    
+#    So in plain English it would mean "any initial character, but not :". 
+#    The whole regular expression reads as "One initial XML name character, 
+#    but not a colon, followed by zero or more XML name characters, but not a colon."
+#    
+#    The practical restrictions of NCName are that it cannot contain several symbol characters
+#    ------------------------------------------
+    
+    not_allowed_NCName = [' ', '!','"', '#', '$', '%', '&', '\'', 
+                          '(', ')', '*', '+', ',', '/', ':', ';', 
+                          '<', '=', '>', '?', '@', '[', '\\', ']', 
+                          '^', '`', '{', '|', '}', '~']
+                          
+    location = tree.find("{%s}member/{%s}System/{%s}location"
+                        %(ns['sml'],ns['sml'],ns['sml']) )
+    for feature in location:
+        for ch in not_allowed_NCName:
+            if ch in feature.attrib['{%s}id' %ns['gml']]:
+                feature.attrib['{%s}id' %ns['gml']] = feature.attrib['{%s}id' %ns['gml']].replace(ch,"_")
+
+    # The unique identifier in the response document matches the procedure specified in the request
+    system = tree.find("{%s}member/{%s}System" %(ns['sml'],ns['sml']))
+    identification = tree.find("{%s}member/{%s}System/{%s}identification" %(ns['sml'],ns['sml'],ns['sml']))
+    
+    if not identification:
+        identification = et.Element("{%s}identification" % ns["sml"])
+        identifierList = et.SubElement(identification,"{%s}IdentifierList" % ns["sml"])
+        identifier = et.SubElement(identifierList,"{%s}identifier" % ns["sml"])
+        term = et.SubElement(identifier,"{%s}Term" % ns["sml"])
+        term.attrib['definition'] = "urn:ogc:def:identifier:OGC:uniqueID"
+        value = et.SubElement(term,"{%s}value" % ns["sml"])
+        value.text = sosConfig.urn["procedure"]+system.attrib['{%s}id' %ns['gml']]
+        system.insert(1,identification)
+    else:
+        identifierList = identification.find("{%s}IdentifierList" % ns["sml"])
+        if not identifierList:
+            identifierList = et.SubElement(identification,"{%s}IdentifierList" % ns["sml"])
+            identifier = et.SubElement(identifierList,"{%s}identifier" % ns["sml"])
+            term = et.SubElement(identifier,"{%s}Term" % ns["sml"])
+            term.attrib['definition'] = "urn:ogc:def:identifier:OGC:uniqueID"
+            value = et.SubElement(term,"{%s}value" % ns["sml"])
+            value.text = sosConfig.urn["procedure"]+system.attrib['{%s}id' %ns['gml']]
+#            system.insert(1,identification)
+        else:
+            identifiers = identifierList.findall("{%s}identifier" % ns["sml"])
+            unique = False
+            for identifier in identifiers:
+                if identifier.find("{%s}Term" % ns["sml"]).attrib['definition'] == "urn:ogc:def:identifier:OGC:uniqueID":
+                    unique = True
+                    break
+            if not unique:
+                identifier = et.SubElement(identifierList,"{%s}identifier" % ns["sml"])
+                term = et.SubElement(identifier,"{%s}Term" % ns["sml"])
+                term.attrib['definition'] = "urn:ogc:def:identifier:OGC:uniqueID"
+                value = et.SubElement(term,"{%s}value" % ns["sml"])
+                value.text = sosConfig.urn["procedure"]+system.attrib['{%s}id' %ns['gml']]
+#                system.insert(1,identification)
+    
+            
+    
+    
+    root = tree.getroot()
+    root.attrib["xmlns"]="http://www.opengis.net/sensorML/1.0.1"
+    return """<?xml version="1.0" encoding="UTF-8"?>\n%s""" % et.tostring(root)
diff --git a/istsoslib/renderers/DSresponseRender.pyc b/istsoslib/renderers/DSresponseRender.pyc
index 24b58bd..a93409c 100644
Binary files a/istsoslib/renderers/DSresponseRender.pyc and b/istsoslib/renderers/DSresponseRender.pyc differ
diff --git a/istsoslib/renderers/GCresponseRender.py b/istsoslib/renderers/GCresponseRender.py
index 48e2030..5694ffa 100755
--- a/istsoslib/renderers/GCresponseRender.py
+++ b/istsoslib/renderers/GCresponseRender.py
@@ -1,182 +1,187 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from lib import isodate as iso
-
-def render(GC,sosConfig):
-    r = '''<?xml version="1.0" encoding="UTF-8"?>
-    <Capabilities
-      xmlns:gml="http://www.opengis.net/gml"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:swe="http://www.opengis.net/swe/1.0.1"
-      xmlns:om="http://www.opengis.net/om/1.0"
-      xmlns="http://www.opengis.net/sos/1.0"
-      xmlns:sos="http://www.opengis.net/sos/1.0"
-      xmlns:ows="http://www.opengis.net/ows/1.1"
-      xmlns:ogc="http://www.opengis.net/ogc"
-      xmlns:tml="http://www.opengis.net/tml"
-      xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd"
-      version="1.0.0">'''
-    
-    if not GC.ServiceIdentifier==[]:
-        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <!-- Service Identification -->\n"
-        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <ows:ServiceIdentification>\n"
-        r += "    <ows:Title>" + GC.ServiceIdentifier.title  + "</ows:Title>\n"
-        r += "    <ows:Abstract>" + GC.ServiceIdentifier.abstract +"</ows:Abstract>\n"
-        r += "    <ows:Keywords>\n"
-        for k in GC.ServiceIdentifier.keywords:
-            r += "      <ows:Keyword>"+ k +"</ows:Keyword>\n"
-        r += "    </ows:Keywords>\n"
-        r += "    <ows:ServiceType codeSpace=\"" + GC.ServiceIdentifier.serviceTypeCode + "\">"
-        r +=  GC.ServiceIdentifier.serviceTypeValue + "</ows:ServiceType>\n"
-        r += "    <ows:ServiceTypeVersion>" + GC.ServiceIdentifier.serviceTypeVersion + "</ows:ServiceTypeVersion>\n"
-        r += "    <ows:Fees>" + GC.ServiceIdentifier.fees + "</ows:Fees>\n"
-        r += "    <ows:AccessConstraints>" + GC.ServiceIdentifier.accessconstrains + "</ows:AccessConstraints>\n"
-        r += "  </ows:ServiceIdentification>\n"
-
-    if not GC.ServiceProvider==[]:
-        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <!-- Provider Description -->\n"
-        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <ows:ServiceProvider>\n"
-        r += "    <ows:ProviderName>" + GC.ServiceProvider.providerName + "</ows:ProviderName>\n"
-        r += "    <ows:ProviderSite xlink:href=\"" + GC.ServiceProvider.providerSite + "\"/>\n"
-        r += "    <ows:ServiceContact>\n"
-        r += "      <ows:IndividualName>" + GC.ServiceProvider.individualName + "</ows:IndividualName>\n"
-        r += "      <ows:PositionName>" + GC.ServiceProvider.positionName + "</ows:PositionName>\n"
-        r += "      <ows:ContactInfo>\n"
-        r += "        <ows:Phone>\n"
-        r += "          <ows:Voice>" + GC.ServiceProvider.contactVoice + "</ows:Voice>\n"
-        r += "          <ows:Facsimile>" + GC.ServiceProvider.contactFax + "</ows:Facsimile>\n"
-        r += "        </ows:Phone>\n"
-        r += "        <ows:Address>\n"
-        r += "          <ows:DeliveryPoint>" + GC.ServiceProvider.contactDelivery + "</ows:DeliveryPoint>\n"
-        r += "          <ows:City>" + GC.ServiceProvider.contactCity + "</ows:City>\n"
-        r += "          <ows:AdministrativeArea>" + GC.ServiceProvider.contactArea + "</ows:AdministrativeArea>\n"
-        r += "          <ows:PostalCode>" + GC.ServiceProvider.contactPostCode + "</ows:PostalCode>\n"
-        r += "          <ows:Country>" + GC.ServiceProvider.contactCountry + "</ows:Country>\n"
-        r += "          <ows:ElectronicMailAddress>" + GC.ServiceProvider.contactMail + "</ows:ElectronicMailAddress>\n"        
-        r += "        </ows:Address>\n"
-        r += "      </ows:ContactInfo>\n"
-        r += "    </ows:ServiceContact>\n"
-        r += "  </ows:ServiceProvider>\n"
-
-    if GC.OperationsMetadata:
-        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <!-- operations Metadata Section -->\n"
-        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <ows:OperationsMetadata>\n"
-        for o in GC.OperationsMetadata.OP:
-            r += "    <ows:Operation name=\"" + o.name + "\">\n"
-            r += "      <ows:DCP>\n"
-            r += "        <ows:HTTP>\n"
-            if o.get:
-                r += "          <ows:Get xlink:href=\"" + o.get + "\"/>\n"
-            if o.post:
-                r += "          <ows:Post xlink:href=\"" + o.post + "\"/>\n"
-            r += "        </ows:HTTP>\n"
-            r += "      </ows:DCP>\n"
-            for p in o.parameters:
-                # r += "    <ows:Parameter name=\"" + p.name + "\" use=\"" + p.use + "\">\n"
-                r += "    <ows:Parameter name=\"" + p.name + "\">\n"
-                r += "      <ows:AllowedValues>\n"
-                if len(p.allowedValues)>0:
-                    for a in p.allowedValues:
-                        r += "        <ows:Value>" + str(a) + "</ows:Value>\n"
-                if len(p.range)>0:
-                    r += "        <ows:Range>\n"
-                    r += "          <ows:MinimumValue>"  
-                    if str(type(p.range[0]))== "<type 'datetime.datetime'>":
-                        r += iso.datetime_isoformat(p.range[0])
-                    else:
-                        r += str(p.range[0])
-                    r += "</ows:MinimumValue>\n"
-                    r += "          <ows:MaximumValue>"
-                    if str(type(p.range[1]))== "<type 'datetime.datetime'>":
-                        r += iso.datetime_isoformat(p.range[1])
-                    else:
-                        r += str(p.range[1])
-                    r += "</ows:MaximumValue>\n"
-                    r += "        </ows:Range>\n"
-                r += "      </ows:AllowedValues>\n"
-                r += "    </ows:Parameter>\n"
-            r += "    </ows:Operation>\n"
-        r += "  </ows:OperationsMetadata>\n"
-        
-    if not GC.ObservationOfferingList==[]:
-        r += "  <!--~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <!-- Contents Section -->\n"
-        r += "  <!--~~~~~~~~~~~~~~~~~~-->\n"
-        r += "  <Contents>\n"
-        r += "    <ObservationOfferingList>\n"
-        for ofl in GC.ObservationOfferingList.offerings:
-            r += "      <ObservationOffering gml:id=\"" + str(ofl.id) + "\">\n"
-            r += "        <gml:description>" + ofl.desc + "</gml:description>\n"
-            r += "        <gml:name>" + ofl.name + "</gml:name>\n"
-
-            if ofl.boundedBy:
-                r += "        <gml:boundedBy>\n"
-                r += "          <gml:Envelope>\n"
-                r += "            " + str(ofl.boundedBy) + "\n"
-                r += "          </gml:Envelope>\n"
-                r += "        </gml:boundedBy>\n"
-
-            
-            if ofl.beginPosition and ofl.endPosition :
-                r += "        <time>\n"
-                r += "          <gml:TimePeriod>\n"
-                r += "            <gml:beginPosition>" + iso.datetime_isoformat(ofl.beginPosition) + "</gml:beginPosition>\n"
-                r += "            <gml:endPosition>" + iso.datetime_isoformat(ofl.endPosition) + "</gml:endPosition>\n"
-                r += "          </gml:TimePeriod>\n"
-                r += "        </time>\n"
-            else:
-                r += "        <sos:time />\n"
-                
-            for pr in ofl.procedures:
-                r += "        <sos:procedure xlink:href=\"" + sosConfig.urn["procedure"] + pr + "\" />\n"
-            
-            for op in ofl.obsProp:
-                r += "        <sos:observedProperty xlink:href=\"" + op + "\" />\n"
-            
-            for fo in ofl.fois:
-                r += "        <sos:featureOfInterest xlink:href=\"" + fo + "\" />\n"
-            
-            
-            for ef in GC.ObservationOfferingList.responseFormat:
-                r += "        <sos:responseFormat>" + ef + "</sos:responseFormat>\n"
-                
-            for rmd in GC.ObservationOfferingList.resultModel:
-                r += "        <sos:resultModel>" + rmd + "</sos:resultModel>\n"
-                
-            for rm in GC.ObservationOfferingList.responseMode:
-                r += "        <sos:responseMode>" + rm + "</sos:responseMode>\n"
-
-            r += "        </ObservationOffering>\n"
-        
-        r += "      </ObservationOfferingList>\n"
-        r += "      </Contents>\n"
-    r += "    </Capabilities>"
-    return r
-    
-
-
-
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from lib import isodate as iso
+
+def render(GC,sosConfig):
+    r = '''<?xml version="1.0" encoding="UTF-8"?>
+    <Capabilities
+      xmlns:gml="http://www.opengis.net/gml"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xmlns:swe="http://www.opengis.net/swe/1.0.1"
+      xmlns:om="http://www.opengis.net/om/1.0"
+      xmlns="http://www.opengis.net/sos/1.0"
+      xmlns:sos="http://www.opengis.net/sos/1.0"
+      xmlns:ows="http://www.opengis.net/ows/1.1"
+      xmlns:ogc="http://www.opengis.net/ogc"
+      xmlns:tml="http://www.opengis.net/tml"
+      xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd"
+      version="1.0.0">'''
+    
+    if not GC.ServiceIdentifier==[]:
+        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <!-- Service Identification -->\n"
+        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <ows:ServiceIdentification>\n"
+        r += "    <ows:Title>" + GC.ServiceIdentifier.title  + "</ows:Title>\n"
+        r += "    <ows:Abstract>" + GC.ServiceIdentifier.abstract +"</ows:Abstract>\n"
+        r += "    <ows:Keywords>\n"
+        for k in GC.ServiceIdentifier.keywords:
+            r += "      <ows:Keyword>"+ k +"</ows:Keyword>\n"
+        r += "    </ows:Keywords>\n"
+        r += "    <ows:ServiceType codeSpace=\"" + GC.ServiceIdentifier.serviceTypeCode + "\">"
+        r +=  GC.ServiceIdentifier.serviceTypeValue + "</ows:ServiceType>\n"
+        r += "    <ows:ServiceTypeVersion>" + GC.ServiceIdentifier.serviceTypeVersion + "</ows:ServiceTypeVersion>\n"
+        r += "    <ows:Fees>" + GC.ServiceIdentifier.fees + "</ows:Fees>\n"
+        r += "    <ows:AccessConstraints>" + GC.ServiceIdentifier.accessconstrains + "</ows:AccessConstraints>\n"
+        r += "  </ows:ServiceIdentification>\n"
+
+    if not GC.ServiceProvider==[]:
+        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <!-- Provider Description -->\n"
+        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <ows:ServiceProvider>\n"
+        r += "    <ows:ProviderName>" + GC.ServiceProvider.providerName + "</ows:ProviderName>\n"
+        r += "    <ows:ProviderSite xlink:href=\"" + GC.ServiceProvider.providerSite + "\"/>\n"
+        r += "    <ows:ServiceContact>\n"
+        r += "      <ows:IndividualName>" + GC.ServiceProvider.individualName + "</ows:IndividualName>\n"
+        r += "      <ows:PositionName>" + GC.ServiceProvider.positionName + "</ows:PositionName>\n"
+        r += "      <ows:ContactInfo>\n"
+        r += "        <ows:Phone>\n"
+        r += "          <ows:Voice>" + GC.ServiceProvider.contactVoice + "</ows:Voice>\n"
+        r += "          <ows:Facsimile>" + GC.ServiceProvider.contactFax + "</ows:Facsimile>\n"
+        r += "        </ows:Phone>\n"
+        r += "        <ows:Address>\n"
+        r += "          <ows:DeliveryPoint>" + GC.ServiceProvider.contactDelivery + "</ows:DeliveryPoint>\n"
+        r += "          <ows:City>" + GC.ServiceProvider.contactCity + "</ows:City>\n"
+        r += "          <ows:AdministrativeArea>" + GC.ServiceProvider.contactArea + "</ows:AdministrativeArea>\n"
+        r += "          <ows:PostalCode>" + GC.ServiceProvider.contactPostCode + "</ows:PostalCode>\n"
+        r += "          <ows:Country>" + GC.ServiceProvider.contactCountry + "</ows:Country>\n"
+        r += "          <ows:ElectronicMailAddress>" + GC.ServiceProvider.contactMail + "</ows:ElectronicMailAddress>\n"        
+        r += "        </ows:Address>\n"
+        r += "      </ows:ContactInfo>\n"
+        r += "    </ows:ServiceContact>\n"
+        r += "  </ows:ServiceProvider>\n"
+
+    if GC.OperationsMetadata:
+        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <!-- operations Metadata Section -->\n"
+        r += "  <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <ows:OperationsMetadata>\n"
+        for o in GC.OperationsMetadata.OP:
+            r += "    <ows:Operation name=\"" + o.name + "\">\n"
+            r += "      <ows:DCP>\n"
+            r += "        <ows:HTTP>\n"
+            if o.get:
+                r += "          <ows:Get xlink:href=\"" + o.get + "\"/>\n"
+            if o.post:
+                r += "          <ows:Post xlink:href=\"" + o.post + "\"/>\n"
+            r += "        </ows:HTTP>\n"
+            r += "      </ows:DCP>\n"
+            for p in o.parameters:
+                # r += "    <ows:Parameter name=\"" + p.name + "\" use=\"" + p.use + "\">\n"
+                r += "    <ows:Parameter name=\"" + p.name + "\">\n"
+                r += "      <ows:AllowedValues>\n"
+                if len(p.allowedValues)>0:
+                    for a in p.allowedValues:
+                        r += "        <ows:Value>" + str(a) + "</ows:Value>\n"
+                if len(p.range)>0:
+                    r += "        <ows:Range>\n"
+                    r += "          <ows:MinimumValue>"  
+                    if str(type(p.range[0]))== "<type 'datetime.datetime'>":
+                        r += iso.datetime_isoformat(p.range[0])
+                    else:
+                        r += str(p.range[0])
+                    r += "</ows:MinimumValue>\n"
+                    r += "          <ows:MaximumValue>"
+                    if str(type(p.range[1]))== "<type 'datetime.datetime'>":
+                        r += iso.datetime_isoformat(p.range[1])
+                    else:
+                        r += str(p.range[1])
+                    r += "</ows:MaximumValue>\n"
+                    r += "        </ows:Range>\n"
+                r += "      </ows:AllowedValues>\n"
+                r += "    </ows:Parameter>\n"
+            r += "    </ows:Operation>\n"
+        r += "  </ows:OperationsMetadata>\n"
+        
+    if not GC.ObservationOfferingList==[]:
+        r += "  <!--~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <!-- Contents Section -->\n"
+        r += "  <!--~~~~~~~~~~~~~~~~~~-->\n"
+        r += "  <Contents>\n"
+        r += "    <ObservationOfferingList>\n"
+        for ofl in GC.ObservationOfferingList.offerings:
+            r += "      <ObservationOffering gml:id=\"" + str(ofl.id) + "\">\n"
+            r += "        <gml:description>" + ofl.desc + "</gml:description>\n"
+            r += "        <gml:name>" + ofl.name + "</gml:name>\n"
+
+            if ofl.boundedBy:
+                r += "        <gml:boundedBy>\n"
+                r += "          <gml:Envelope>\n"
+                r += "            " + str(ofl.boundedBy) + "\n"
+                r += "          </gml:Envelope>\n"
+                r += "        </gml:boundedBy>\n"
+
+            
+            if ofl.beginPosition and ofl.endPosition :
+                r += "        <time>\n"
+                r += "          <gml:TimePeriod>\n"
+                r += "            <gml:beginPosition>" + iso.datetime_isoformat(ofl.beginPosition) + "</gml:beginPosition>\n"
+                r += "            <gml:endPosition>" + iso.datetime_isoformat(ofl.endPosition) + "</gml:endPosition>\n"
+                r += "          </gml:TimePeriod>\n"
+                r += "        </time>\n"
+            else:
+                r += "        <sos:time />\n"
+                
+            for pr in ofl.procedures:
+                r += "        <sos:procedure xlink:href=\"" + sosConfig.urn["procedure"] + pr + "\" />\n"
+            
+            for op in ofl.obsProp:
+                r += "        <sos:observedProperty xlink:href=\"" + op + "\" />\n"
+            
+            for fo in ofl.fois:
+                r += "        <sos:featureOfInterest xlink:href=\"" + fo + "\" />\n"
+            
+            
+            for ef in GC.ObservationOfferingList.responseFormat:
+                r += "        <sos:responseFormat>" + ef + "</sos:responseFormat>\n"
+                
+            for rmd in GC.ObservationOfferingList.resultModel:
+                r += "        <sos:resultModel>" + rmd + "</sos:resultModel>\n"
+                
+            for rm in GC.ObservationOfferingList.responseMode:
+                r += "        <sos:responseMode>" + rm + "</sos:responseMode>\n"
+
+            r += "        </ObservationOffering>\n"
+        
+        r += "      </ObservationOfferingList>\n"
+        r += "      </Contents>\n"
+    r += "    </Capabilities>"
+    return r
+    
+
+
+
+
diff --git a/istsoslib/renderers/GCresponseRender.pyc b/istsoslib/renderers/GCresponseRender.pyc
deleted file mode 100644
index 8545c75..0000000
Binary files a/istsoslib/renderers/GCresponseRender.pyc and /dev/null differ
diff --git a/istsoslib/renderers/GFresponseRender.py b/istsoslib/renderers/GFresponseRender.py
index f563f08..66085d5 100755
--- a/istsoslib/renderers/GFresponseRender.py
+++ b/istsoslib/renderers/GFresponseRender.py
@@ -1,103 +1,108 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from lib import isodate as iso
-#import sosConfig
-
-def render(GF,sosConfig):
-    r = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    if GF.type.lower()=="station" or GF.type.lower()=="point":
-        r += "<sa:SamplingPoint \n"
-    elif GF.type=="surface":
-        r += "<sa:SamplingSurface \n"
-    r += "gml:id=\"" + GF.name + "\" \n"
-    r += "xmlns:sa=\"http://www.opengis.net/sampling/1.0\" \n"
-    r += "xmlns:swe=\"http://www.opengis.net/swe/1.0.1\" \n"
-    r += "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" 
-    r += "xmlns:xlink=\"http://www.w3.org/1999/xlink\" \n" 
-    r += "xmlns:gml=\"http://www.opengis.net/gml\" \n"
-    r += "xmlns:om=\"http://www.opengis.net/om/1.0\" \n"
-    r += "xsi:schemaLocation=\"http://www.opengis.net/sampling/1.0 http://schemas.opengis.net/sampling/1.0.0/sampling.xsd\">\n"
-
-    r += "  <gml:description>" + GF.desc + "</gml:description>\n"
-    r += "  <gml:name>" + GF.name + "</gml:name> \n"
-    r += "  <sa:sampledFeature/>\n"
-    
-    for i in range(len(GF.procedures)):
-        r += "  <sa:relatedObservation>\n"
-        r += "    <om:Observation>\n"
-        
-        # Sampling time
-        for a in range(len(GF.samplingTime[i])):
-            if len(GF.samplingTime[i][a])==2: 
-                r += "    <om:samplingTime>\n"
-                r += "      <gml:TimePeriod>\n"
-                r += "        <gml:beginPosition>" + iso.datetime_isoformat(GF.samplingTime[i][a][0]) + "</gml:beginPosition>\n"
-                r += "        <gml:endPosition>" + iso.datetime_isoformat(GF.samplingTime[i][a][1]) + "</gml:endPosition>\n"
-                r += "        <gml:duration>"  + iso.duration_isoformat(GF.samplingTime[i][a][1]-GF.samplingTime[i][a][0]) + "</gml:duration>\n"
-                '''
-                r += "        <gml:TimeLength>\n"
-                r += "          <gml:duration>"  + iso.duration_isoformat(a[1]-a[0]) + "</gml:duration>\n"
-                r += "          <gml:timeInterval unit=\"" + str(ob.timeResUnit) + "\">" + str(ob.timeResVal) + "</gml:timeInterval>\n"            
-                r += "        </gml:TimeLength>\n"
-                '''
-                r += "      </gml:TimePeriod>\n"
-                r += "    </om:samplingTime>\n"
-                
-        # Procedure
-        r += "      <om:procedure xlink:href=\"" + GF.procedures[i] + "\"/>\n"
-        
-        # ObservationProperty
-        r += "      <om:observedProperty>\n"
-        if GF.obsType[i] == "insitu-fixed-point":
-            ii=1
-        elif GF.obsType[i] == "insitu-mobile-point":
-            ii=4
-        r += "      <swe:CompositePhenomenon gml:id=\"comp_" + str(GF.idPrc[i]) + "\" dimension=\"" + str(len(GF.properties[i])+ii) + "\">\n"
-        r += "      <gml:name/>\n"
-        r += "        <swe:component xlink:href=\"" + sosConfig.urn["parameter"] + "time:iso8601" + " \" />\n" 
-        #if ob.procedureType == "insitu-fixed-point":
-            
-        if GF.obsType[i]=="insitu-mobile-point":          
-            r += "        <swe:component xlink:href=\"" + sosConfig.urn["refsystem"] + ":x-position\" />\n"
-            r += "        <swe:component xlink:href=\"" + sosConfig.urn["refsystem"] + ":y-position\" />\n"
-            r += "        <swe:component xlink:href=\"" + sosConfig.urn["refsystem"] + ":z-position\" />\n"
-        
-        for c in range(len(GF.properties[i])):
-            r += "        <swe:component xlink:href=\"" + sosConfig.urn["parameter"] + GF.properties[i][c] + "\"/>\n"
-            
-        r += "      </swe:CompositePhenomenon>\n"
-        r += "      </om:observedProperty>\n"
-        
-        #FEATURE OF INTEREST
-        r += "    <om:featureOfInterest xlink:href=\"" + sosConfig.urn["feature"] + GF.type + ":" + GF.name + "\"/>\n"
-            
-        #RESULT EMPTY (?)
-        r += "      <om:result/>\n"
-        
-        r += "    </om:Observation>\n"
-        r += "  </sa:relatedObservation>\n"
-    
-    r += "  <sa:position> \n"
-    r += "    " + GF.geom + "\n"
-    r += "  </sa:position>\n"
-    if GF.type.lower()=="station" or GF.type.lower()=="point":
-        r += "</sa:SamplingPoint> \n"
-    elif GF.type=="surface":
-        r += "</sa:SamplingSurface> \n"
-    
-    return r
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from lib import isodate as iso
+#import sosConfig
+
+def render(GF,sosConfig):
+    r = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+    if GF.type.lower()=="station" or GF.type.lower()=="point":
+        r += "<sa:SamplingPoint \n"
+    elif GF.type=="surface":
+        r += "<sa:SamplingSurface \n"
+    r += "gml:id=\"" + GF.name + "\" \n"
+    r += "xmlns:sa=\"http://www.opengis.net/sampling/1.0\" \n"
+    r += "xmlns:swe=\"http://www.opengis.net/swe/1.0.1\" \n"
+    r += "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" 
+    r += "xmlns:xlink=\"http://www.w3.org/1999/xlink\" \n" 
+    r += "xmlns:gml=\"http://www.opengis.net/gml\" \n"
+    r += "xmlns:om=\"http://www.opengis.net/om/1.0\" \n"
+    r += "xsi:schemaLocation=\"http://www.opengis.net/sampling/1.0 http://schemas.opengis.net/sampling/1.0.0/sampling.xsd\">\n"
+
+    r += "  <gml:description>" + GF.desc + "</gml:description>\n"
+    r += "  <gml:name>" + GF.name + "</gml:name> \n"
+    r += "  <sa:sampledFeature/>\n"
+    
+    for i in range(len(GF.procedures)):
+        r += "  <sa:relatedObservation>\n"
+        r += "    <om:Observation>\n"
+        
+        # Sampling time
+        for a in range(len(GF.samplingTime[i])):
+            if len(GF.samplingTime[i][a])==2: 
+                r += "    <om:samplingTime>\n"
+                r += "      <gml:TimePeriod>\n"
+                r += "        <gml:beginPosition>" + iso.datetime_isoformat(GF.samplingTime[i][a][0]) + "</gml:beginPosition>\n"
+                r += "        <gml:endPosition>" + iso.datetime_isoformat(GF.samplingTime[i][a][1]) + "</gml:endPosition>\n"
+                r += "        <gml:duration>"  + iso.duration_isoformat(GF.samplingTime[i][a][1]-GF.samplingTime[i][a][0]) + "</gml:duration>\n"
+                '''
+                r += "        <gml:TimeLength>\n"
+                r += "          <gml:duration>"  + iso.duration_isoformat(a[1]-a[0]) + "</gml:duration>\n"
+                r += "          <gml:timeInterval unit=\"" + str(ob.timeResUnit) + "\">" + str(ob.timeResVal) + "</gml:timeInterval>\n"            
+                r += "        </gml:TimeLength>\n"
+                '''
+                r += "      </gml:TimePeriod>\n"
+                r += "    </om:samplingTime>\n"
+                
+        # Procedure
+        r += "      <om:procedure xlink:href=\"" + GF.procedures[i] + "\"/>\n"
+        
+        # ObservationProperty
+        r += "      <om:observedProperty>\n"
+        if GF.obsType[i] == "insitu-fixed-point":
+            ii=1
+        elif GF.obsType[i] == "insitu-mobile-point":
+            ii=4
+        r += "      <swe:CompositePhenomenon gml:id=\"comp_" + str(GF.idPrc[i]) + "\" dimension=\"" + str(len(GF.properties[i])+ii) + "\">\n"
+        r += "      <gml:name/>\n"
+        r += "        <swe:component xlink:href=\"" + sosConfig.urn["parameter"] + "time:iso8601" + " \" />\n" 
+        #if ob.procedureType == "insitu-fixed-point":
+            
+        if GF.obsType[i]=="insitu-mobile-point":          
+            r += "        <swe:component xlink:href=\"" + sosConfig.urn["refsystem"] + ":x-position\" />\n"
+            r += "        <swe:component xlink:href=\"" + sosConfig.urn["refsystem"] + ":y-position\" />\n"
+            r += "        <swe:component xlink:href=\"" + sosConfig.urn["refsystem"] + ":z-position\" />\n"
+        
+        for c in range(len(GF.properties[i])):
+            r += "        <swe:component xlink:href=\"" + sosConfig.urn["parameter"] + GF.properties[i][c] + "\"/>\n"
+            
+        r += "      </swe:CompositePhenomenon>\n"
+        r += "      </om:observedProperty>\n"
+        
+        #FEATURE OF INTEREST
+        r += "    <om:featureOfInterest xlink:href=\"" + sosConfig.urn["feature"] + GF.type + ":" + GF.name + "\"/>\n"
+            
+        #RESULT EMPTY (?)
+        r += "      <om:result/>\n"
+        
+        r += "    </om:Observation>\n"
+        r += "  </sa:relatedObservation>\n"
+    
+    r += "  <sa:position> \n"
+    r += "    " + GF.geom + "\n"
+    r += "  </sa:position>\n"
+    if GF.type.lower()=="station" or GF.type.lower()=="point":
+        r += "</sa:SamplingPoint> \n"
+    elif GF.type=="surface":
+        r += "</sa:SamplingSurface> \n"
+    
+    return r
diff --git a/istsoslib/renderers/GFresponseRender.pyc b/istsoslib/renderers/GFresponseRender.pyc
new file mode 100644
index 0000000..b91413a
Binary files /dev/null and b/istsoslib/renderers/GFresponseRender.pyc differ
diff --git a/istsoslib/renderers/GOresponseRender.py b/istsoslib/renderers/GOresponseRender.py
index 9fda219..0b4b154 100755
--- a/istsoslib/renderers/GOresponseRender.py
+++ b/istsoslib/renderers/GOresponseRender.py
@@ -1,350 +1,355 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from lib import isodate as iso
-from istsoslib import sosException
-
-def render(GO,sosConfig):
-    if GO.filter.responseFormat in ['text/xml;subtype="om/1.0"',"text/xml"]:
-        return XMLformat(GO)
-    elif GO.filter.responseFormat=="text/plain":
-        return CSVformat(GO)
-#    elif GO.filter.responseFormat=="image/png":
-#        return CHARTformat(GO)
-    elif GO.filter.responseFormat in ["application/json","text/x-json"]:
-        return JSONformat(GO)
-    else:
-        raise Exception("not supported format: %s, try one of %s" % (GO.filter.responseFormat,"; ".join(sosConfig.parameters["GO_responseFormat"])))
-
-def XMLformat(GO):
-    r = """<om:ObservationCollection xmlns:sos="http://www.opengis.net/sos/1.0"
-  xmlns:om="http://www.opengis.net/om/1.0" xmlns:swe="http://www.opengis.net/swe/1.0.1"
-  xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/om/1.0  http://schemas.opengis.net/om/1.0.0/om.xsd">
-"""
-    r += "<gml:description>" + GO.offInfo.desc + "</gml:description>\n"    
-    r += "<gml:name>" + GO.offInfo.name + "</gml:name>\n"    
-    
-    if len(GO.obs)==0:
-        raise sosException.SOSException("NoApplicableCode",None,"No matching observation was found according the request parameters!")
-                
-        r += "<om:member/>\n"
-    for ob in GO.obs:
-        
-        #OBSERVATION OBJ
-        r += "<om:member>\n"
-        r += "  <om:Observation>\n"
-        r += "    <gml:name>" + ob.name + "</gml:name>\n"
-        
-        #PERIODO DI CAMPIONAMENTO DEI DATI ESTRATTI      
-        if ob.samplingTime != None:
-            r += "    <om:samplingTime>\n"
-            r += "      <gml:TimePeriod>\n"
-#            r += "        <gml:beginPosition>" + ob.samplingTime[0].astimezone(GO.reqTZ).strftime("%Y-%m-%dT%H:%M:%S.%f%z") + "</gml:beginPosition>\n"
-            
-            r += "        <gml:beginPosition>" + ob.samplingTime[0].astimezone(GO.reqTZ).isoformat() + "</gml:beginPosition>\n"
-            
-            if ob.samplingTime[1]:
-                r += "        <gml:endPosition>" + ob.samplingTime[1].astimezone(GO.reqTZ).isoformat() + "</gml:endPosition>\n"
-            else:
-                r += "        <gml:endPosition>" + ob.samplingTime[0].astimezone(GO.reqTZ).isoformat() + "</gml:endPosition>\n"
-                
-            if ob.samplingTime[1]:
-                r += "        <gml:duration>"  + iso.duration_isoformat(ob.samplingTime[1]-ob.samplingTime[0]) + "</gml:duration>\n"
-            r += "      </gml:TimePeriod>\n"
-            r += "    </om:samplingTime>\n"
-        else:
-            r += "    <om:samplingTime/>\n"
-        
-        #PROCEDURE
-        r += "    <om:procedure xlink:href=\"" + ob.procedure + "\"/>\n"                
-        
-        #PROPRIETA OSSERVATA
-        if ob.procedureType == "insitu-fixed-point":
-            ii=1
-        elif ob.procedureType == "insitu-mobile-point":
-            ii=4
-        elif ob.procedureType == "virtual":
-            ii=1
-        
-        #OBSERVED PROPERTIES
-        r += "    <om:observedProperty>\n"
-        r += "      <swe:CompositePhenomenon gml:id=\"comp_" + str(ob.id_prc) + "\" dimension=\"" + str(len(ob.opr_urn)+ii) + "\">\n"
-        r += "        <gml:name>timeSeriesOfObservations</gml:name>\n"
-        r += "        <swe:component xlink:href=\"" + ob.timedef + "\"/>\n"
-        
-        if ob.procedureType=="insitu-mobile-point":
-            r += "        <swe:component xlink:href=\"" + GO.refsys + ":x-position\"/>\n"
-            r += "        <swe:component xlink:href=\"" + GO.refsys + ":y-position\"/>\n"
-            r += "        <swe:component xlink:href=\"" + GO.refsys + ":z-position\"/>\n"
-
-        for urn in ob.opr_urn:    
-            r += "        <swe:component xlink:href=\"" + urn + "\"/>\n"
-        r += "      </swe:CompositePhenomenon>\n"
-        r += "    </om:observedProperty>\n"      
-    
-        #FEATURE OF INTEREST
-        r += "    <om:featureOfInterest xlink:href=\"" + ob.foi_urn + "\">\n"
-        r += "      <gml:FeatureCollection>\n"
-        r += "        <gml:location>\n"
-        r += "          " + ob.foiGml + "\n"
-        r += "        </gml:location>\n"
-        r += "      </gml:FeatureCollection>\n"
-        r += "    </om:featureOfInterest>"
-    
-        #SERIE TEMPORALE
-        r += "    <om:result>\n"
-        
-        #ii = 1
-        #if ob.procedureType=="insitu-mobile-point":
-        #    ii = 4
-        
-        #DESCRIZIONE DEI DATI ESTRATTI: VARIA A SECONDA DEL TIPO DI PROCEDURA
-        
-        #-- CASO GENERALE
-        r += "      <swe:DataArray>\n"
-        r += "        <swe:elementCount>\n"
-        r += "          <swe:Count>\n"
-        r += "            <swe:value>" + str(len(ob.observedProperty)+ii) + "</swe:value>\n"
-        r += "          </swe:Count>\n"
-        r += "        </swe:elementCount>\n"
-        r += "        <swe:elementType name=\"SimpleDataArray\">\n"
-        r += "          <swe:DataRecord>\n"
-        r += "            <swe:field name=\"Time\">\n"
-        r += "              <swe:Time definition=\"" + ob.timedef + "\"/>\n"
-        r += "            </swe:field>\n"
-        
-        if ob.procedureType=="insitu-mobile-point":
-            r += "            <swe:field name=\"x-position\">\n"
-            r += "              <swe:Quantity definition=\"" + GO.refsys + ":x-position\"/>\n"
-            r += "            </swe:field>\n"
-            r += "            <swe:field name=\"y-position\">\n"
-            r += "              <swe:Quantity definition=\"" + GO.refsys + ":y-position\"/>\n"
-            r += "            </swe:field>\n"
-            r += "            <swe:field name=\"z-position\">\n"
-            r += "              <swe:Quantity definition=\"" + GO.refsys + ":z-position\"/>\n"
-            r += "            </swe:field>\n"
-            if ob.qualityIndex:
-                r += "            <swe:field name=\"position-qualityIndex\">\n"
-                r += "              <swe:Quantity definition=\"" + GO.refsys + ":position:qualityIndex\"/>\n"
-                r += "            </swe:field>\n"
-        
-        for idx in range(len(ob.observedProperty)):
-            if ob.aggregate_function:
-                if ob.observedProperty[idx].split(":")[-1] == "qualityIndex":
-                    r += "            <swe:field name=\"%s\">\n" % (ob.observedPropertyName[idx])
-                    r += "              <swe:Quantity definition=\"%s\">\n" % (ob.observedProperty[idx])
-                else:
-                    r += "            <swe:field name=\"%s:%s\">\n" % (ob.observedPropertyName[idx],ob.aggregate_function)
-                    r += "              <swe:Quantity definition=\"%s:%s\">\n" % (ob.observedProperty[idx],ob.aggregate_function)
-                if ob.aggregate_function.upper()=="COUNT":
-                    r += "                <swe:uom code=\"None\"/>\n"
-                else:
-                    r += "                <swe:uom code=\"" + ob.uom[idx] + "\"/>\n"
-            else:
-                r += "            <swe:field name=\"%s\">\n" % (ob.observedPropertyName[idx])
-                r += "              <swe:Quantity definition=\"" + ob.observedProperty[idx] + "\">\n"
-                r += "                <swe:uom code=\"" + ob.uom[idx] + "\"/>\n"
-            r += "              </swe:Quantity>\n"
-            r += "            </swe:field>\n"
-            
-        r += "          </swe:DataRecord>\n"
-        r += "        </swe:elementType>\n"
-        r += "        <swe:encoding>\n"
-        r += "          <swe:TextBlock tokenSeparator=\",\" blockSeparator=\"@\" decimalSeparator=\".\"/>\n"
-        r += "        </swe:encoding>\n"
-        if len(ob.data)>0:
-            r += "        <swe:values>"
-            data=[]
-            for row in range(len(ob.data)):
-                str_data=[ob.data[row][0].isoformat()]
-                for i in range(1,len(ob.data[0])):
-                    str_data.append(str(ob.data[row][i]))
-                data.append(",".join(str_data))
-            r += "@".join(data)
-            r += "</swe:values>\n"
-        else:
-            r += "        <swe:values/>"
-        r += "      </swe:DataArray>\n"
-        r += "    </om:result>\n"
-        r += "  </om:Observation>\n"
-        r += "</om:member>\n"
-    r += "</om:ObservationCollection>" 
-    return r
-
-def JSONformat(GO):
-    import json
-    oc = {
-        "ObservationCollection": {
-            "description": GO.offInfo.desc,
-            "name": GO.offInfo.name,            
-            "member": []
-        }
-    }
-    for iob, ob in enumerate(GO.obs):
-        member = {
-            "name": ob.name,
-            "samplingTime": {},
-            "procedure": ob.procedure
-        }
-        if ob.samplingTime != None:
-            member["samplingTime"]["beginPosition"] = ob.samplingTime[0].astimezone(GO.reqTZ).isoformat()
-            if ob.samplingTime[1]:
-                member["samplingTime"]["endPosition"] = ob.samplingTime[1].astimezone(GO.reqTZ).isoformat()
-                member["samplingTime"]["duration"] = iso.duration_isoformat(ob.samplingTime[1]-ob.samplingTime[0])
-                
-            else:
-                member["samplingTime"]["endPosition"] = ob.samplingTime[0].astimezone(GO.reqTZ).isoformat()
-        if ob.procedureType == "insitu-fixed-point":
-            ii=1
-        elif ob.procedureType == "insitu-mobile-point":
-            ii=4
-        elif ob.procedureType == "virtual":
-            ii=1
-            
-        member['observedProperty'] = {
-            "CompositePhenomenon": {
-                "id": "comp_%s" % str(ob.id_prc),
-                "dimension": str(len(ob.opr_urn)+ii),
-                "name": "timeSeriesOfObservations"
-            }
-        }
-        
-        member['observedProperty']["component"] = [ob.timedef]
-        
-        if ii==4:
-            member['observedProperty']["component"] += [
-                ("%s:x-position" % GO.refsys), 
-                ("%s:y-position" % GO.refsys), 
-                ("%s:z-position" % GO.refsys)
-            ]
-            
-        member['observedProperty']["component"] += ob.opr_urn
-        
-        member['featureOfInterest'] = {
-            "name": ob.foi_urn,
-            "geom": ob.foiGml.replace("\"","'")
-        }
-        
-        member['result'] = {
-            "DataArray": {
-                "elementCount": str(len(ob.observedProperty)+ii),
-                "field": [
-                    {
-                        "name": "Time",
-                        "definition": ob.timedef
-                    }
-                ]
-            }
-        }
-        if ii==4:
-            member['result']['DataArray']['field'] += [
-                {
-                    "name": "x-position",
-                    "definition": "%s:x-position" % GO.refsys
-                },
-                {
-                    "name": "y-position",
-                    "definition": "%s:y-position" % GO.refsys
-                },
-                {
-                    "name": "z-position",
-                    "definition": "%s:z-position" % GO.refsys
-                }
-            ]
-        for idx in range(len(ob.observedProperty)):
-            member['result']['DataArray']['field'] += [
-                {
-                    "name": ob.observedPropertyName[idx],
-                    "definition": ob.observedProperty[idx],
-                    "uom": ob.uom[idx]  
-                }
-            ]
-        
-        member['result']['DataArray']['values'] = []
-        for row in range(len(ob.data)):
-            data = [ob.data[row][0].isoformat()]
-            for i in range(1,len(ob.data[0])):
-                data.append(str(ob.data[row][i]))
-            member['result']['DataArray']['values'].append(data)
-            
-        # append member to collection
-        oc["ObservationCollection"]["member"].append(member)
-
-    
-    
-    return json.dumps(oc)
-    #return json.dumps(wut.encodeobject(oc))
-
-def CSVformat(GO):
-    #create unique columns name
-    columns = ["time","procedure"]
-    columns_name = [None,"urn:ogc:def:procedure"]
-    
-    
-    for iob, ob in enumerate(GO.obs):
-        if columns_name[0]==None:
-            columns_name[0] = ob.timedef
-        if ob.procedureType == "insitu-mobile-point":
-            columns += ["x-position","y-position","z-position"]
-            columns_name += ["%s:x-position" % GO.refsys,"%s:y-position" % GO.refsys,"%s:z-position" % GO.refsys]
-        for idx,opr in enumerate(ob.observedProperty):
-            if not opr in columns:
-                columns += [opr]
-                columns_name += ["%s" %(opr)]
-    
-    #create rows
-    rows = []
-    for iob, ob in enumerate(GO.obs):
-        #create look-up-table for given observation member
-        #associates opr index with row index
-        lut = { 0 : 0}
-        i=0
-        if ob.procedureType == "insitu-mobile-point":
-            lut[1] = columns.index("x-position")
-            lut[2] = columns.index("y-position")
-            lut[3] = columns.index("z-position")
-            i=3
-        for opr in ob.observedProperty:
-            i += 1
-            try:
-                lut[i] = columns.index(opr)
-            except:
-                raise Exception("%s - %s" %(lut,columns))
-        #raise Exception( "%s - %s" %(lut,columns))
-        #create row
-        
-        
-        #append row
-        for vals in ob.data:
-            row = [""] * len(columns)
-            row[0] = vals[0].isoformat()
-            row[1] = ob.procedure.split(":")[-1]
-            for i in range(1,len(vals)):
-                row[lut[i]] = str(vals[i])
-            rows.append(row)
-                
-    #write results as CSV    
-    r  = ",".join(columns_name) + "\n"
-    for c in rows:
-        r += ",".join(c) + "\n"
-    
-    return r
-
-
-    
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from lib import isodate as iso
+from istsoslib import sosException
+
+def render(GO,sosConfig):
+    if GO.filter.responseFormat in ['text/xml;subtype="om/1.0.0"',"text/xml"]:
+        return XMLformat(GO)
+    elif GO.filter.responseFormat=="text/plain":
+        return CSVformat(GO)
+#    elif GO.filter.responseFormat=="image/png":
+#        return CHARTformat(GO)
+    elif GO.filter.responseFormat in ["application/json","text/x-json"]:
+        return JSONformat(GO)
+    else:
+        raise Exception("not supported format: %s, try one of %s" % (GO.filter.responseFormat,"; ".join(sosConfig.parameters["GO_responseFormat"])))
+
+def XMLformat(GO):
+    r = """<om:ObservationCollection xmlns:sos="http://www.opengis.net/sos/1.0"
+  xmlns:om="http://www.opengis.net/om/1.0" xmlns:swe="http://www.opengis.net/swe/1.0.1"
+  xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/om/1.0  http://schemas.opengis.net/om/1.0.0/om.xsd">
+"""
+    r += "<gml:description>" + GO.offInfo.desc + "</gml:description>\n"    
+    r += "<gml:name>" + GO.offInfo.name + "</gml:name>\n"    
+    
+    if len(GO.obs)==0:
+        raise sosException.SOSException("NoApplicableCode",None,"No matching observation was found according the request parameters!")
+                
+        r += "<om:member/>\n"
+    for ob in GO.obs:
+        
+        #OBSERVATION OBJ
+        r += "<om:member>\n"
+        r += "  <om:Observation>\n"
+        r += "    <gml:name>" + ob.name + "</gml:name>\n"
+        
+        #PERIODO DI CAMPIONAMENTO DEI DATI ESTRATTI      
+        if ob.samplingTime != None:
+            r += "    <om:samplingTime>\n"
+            r += "      <gml:TimePeriod>\n"
+#            r += "        <gml:beginPosition>" + ob.samplingTime[0].astimezone(GO.reqTZ).strftime("%Y-%m-%dT%H:%M:%S.%f%z") + "</gml:beginPosition>\n"
+            
+            r += "        <gml:beginPosition>" + ob.samplingTime[0].astimezone(GO.reqTZ).isoformat() + "</gml:beginPosition>\n"
+            
+            if ob.samplingTime[1]:
+                r += "        <gml:endPosition>" + ob.samplingTime[1].astimezone(GO.reqTZ).isoformat() + "</gml:endPosition>\n"
+            else:
+                r += "        <gml:endPosition>" + ob.samplingTime[0].astimezone(GO.reqTZ).isoformat() + "</gml:endPosition>\n"
+                
+            if ob.samplingTime[1]:
+                r += "        <gml:duration>"  + iso.duration_isoformat(ob.samplingTime[1]-ob.samplingTime[0]) + "</gml:duration>\n"
+            r += "      </gml:TimePeriod>\n"
+            r += "    </om:samplingTime>\n"
+        else:
+            r += "    <om:samplingTime/>\n"
+        
+        #PROCEDURE
+        r += "    <om:procedure xlink:href=\"" + ob.procedure + "\"/>\n"                
+        
+        #PROPRIETA OSSERVATA
+        if ob.procedureType == "insitu-fixed-point":
+            ii=1
+        elif ob.procedureType == "insitu-mobile-point":
+            ii=4
+        elif ob.procedureType == "virtual":
+            ii=1
+        
+        #OBSERVED PROPERTIES
+        r += "    <om:observedProperty>\n"
+        r += "      <swe:CompositePhenomenon gml:id=\"comp_" + str(ob.id_prc) + "\" dimension=\"" + str(len(ob.opr_urn)+ii) + "\">\n"
+        r += "        <gml:name>timeSeriesOfObservations</gml:name>\n"
+        r += "        <swe:component xlink:href=\"" + ob.timedef + "\"/>\n"
+        
+        if ob.procedureType=="insitu-mobile-point":
+            r += "        <swe:component xlink:href=\"" + GO.refsys + ":x-position\"/>\n"
+            r += "        <swe:component xlink:href=\"" + GO.refsys + ":y-position\"/>\n"
+            r += "        <swe:component xlink:href=\"" + GO.refsys + ":z-position\"/>\n"
+
+        for urn in ob.opr_urn:    
+            r += "        <swe:component xlink:href=\"" + urn + "\"/>\n"
+        r += "      </swe:CompositePhenomenon>\n"
+        r += "    </om:observedProperty>\n"      
+    
+        #FEATURE OF INTEREST
+        r += "    <om:featureOfInterest xlink:href=\"" + ob.foi_urn + "\">\n"
+        r += "      <gml:FeatureCollection>\n"
+        r += "        <gml:location>\n"
+        r += "          " + ob.foiGml + "\n"
+        r += "        </gml:location>\n"
+        r += "      </gml:FeatureCollection>\n"
+        r += "    </om:featureOfInterest>"
+    
+        #SERIE TEMPORALE
+        r += "    <om:result>\n"
+        
+        #ii = 1
+        #if ob.procedureType=="insitu-mobile-point":
+        #    ii = 4
+        
+        #DESCRIZIONE DEI DATI ESTRATTI: VARIA A SECONDA DEL TIPO DI PROCEDURA
+        
+        #-- CASO GENERALE
+        r += "      <swe:DataArray>\n"
+        r += "        <swe:elementCount>\n"
+        r += "          <swe:Count>\n"
+        r += "            <swe:value>" + str(len(ob.observedProperty)+ii) + "</swe:value>\n"
+        r += "          </swe:Count>\n"
+        r += "        </swe:elementCount>\n"
+        r += "        <swe:elementType name=\"SimpleDataArray\">\n"
+        r += "          <swe:DataRecord>\n"
+        r += "            <swe:field name=\"Time\">\n"
+        r += "              <swe:Time definition=\"" + ob.timedef + "\"/>\n"
+        r += "            </swe:field>\n"
+        
+        if ob.procedureType=="insitu-mobile-point":
+            r += "            <swe:field name=\"x-position\">\n"
+            r += "              <swe:Quantity definition=\"" + GO.refsys + ":x-position\"/>\n"
+            r += "            </swe:field>\n"
+            r += "            <swe:field name=\"y-position\">\n"
+            r += "              <swe:Quantity definition=\"" + GO.refsys + ":y-position\"/>\n"
+            r += "            </swe:field>\n"
+            r += "            <swe:field name=\"z-position\">\n"
+            r += "              <swe:Quantity definition=\"" + GO.refsys + ":z-position\"/>\n"
+            r += "            </swe:field>\n"
+            if ob.qualityIndex:
+                r += "            <swe:field name=\"position-qualityIndex\">\n"
+                r += "              <swe:Quantity definition=\"" + GO.refsys + ":position:qualityIndex\"/>\n"
+                r += "            </swe:field>\n"
+        
+        for idx in range(len(ob.observedProperty)):
+            if ob.aggregate_function:
+                if ob.observedProperty[idx].split(":")[-1] == "qualityIndex":
+                    r += "            <swe:field name=\"%s\">\n" % (ob.observedPropertyName[idx])
+                    r += "              <swe:Quantity definition=\"%s\">\n" % (ob.observedProperty[idx])
+                else:
+                    r += "            <swe:field name=\"%s:%s\">\n" % (ob.observedPropertyName[idx],ob.aggregate_function)
+                    r += "              <swe:Quantity definition=\"%s:%s\">\n" % (ob.observedProperty[idx],ob.aggregate_function)
+                if ob.aggregate_function.upper()=="COUNT":
+                    r += "                <swe:uom code=\"None\"/>\n"
+                else:
+                    r += "                <swe:uom code=\"" + ob.uom[idx] + "\"/>\n"
+            else:
+                r += "            <swe:field name=\"%s\">\n" % (ob.observedPropertyName[idx])
+                r += "              <swe:Quantity definition=\"" + ob.observedProperty[idx] + "\">\n"
+                r += "                <swe:uom code=\"" + ob.uom[idx] + "\"/>\n"
+            r += "              </swe:Quantity>\n"
+            r += "            </swe:field>\n"
+            
+        r += "          </swe:DataRecord>\n"
+        r += "        </swe:elementType>\n"
+        r += "        <swe:encoding>\n"
+        r += "          <swe:TextBlock tokenSeparator=\",\" blockSeparator=\"@\" decimalSeparator=\".\"/>\n"
+        r += "        </swe:encoding>\n"
+        if len(ob.data)>0:
+            r += "        <swe:values>"
+            data=[]
+            for row in range(len(ob.data)):
+                str_data=[ob.data[row][0].isoformat()]
+                for i in range(1,len(ob.data[0])):
+                    str_data.append(str(ob.data[row][i]))
+                data.append(",".join(str_data))
+            r += "@".join(data)
+            r += "</swe:values>\n"
+        else:
+            r += "        <swe:values/>"
+        r += "      </swe:DataArray>\n"
+        r += "    </om:result>\n"
+        r += "  </om:Observation>\n"
+        r += "</om:member>\n"
+    r += "</om:ObservationCollection>" 
+    return r
+
+def JSONformat(GO):
+    import json
+    oc = {
+        "ObservationCollection": {
+            "description": GO.offInfo.desc,
+            "name": GO.offInfo.name,            
+            "member": []
+        }
+    }
+    for iob, ob in enumerate(GO.obs):
+        member = {
+            "name": ob.name,
+            "samplingTime": {},
+            "procedure": ob.procedure
+        }
+        if ob.samplingTime != None:
+            member["samplingTime"]["beginPosition"] = ob.samplingTime[0].astimezone(GO.reqTZ).isoformat()
+            if ob.samplingTime[1]:
+                member["samplingTime"]["endPosition"] = ob.samplingTime[1].astimezone(GO.reqTZ).isoformat()
+                member["samplingTime"]["duration"] = iso.duration_isoformat(ob.samplingTime[1]-ob.samplingTime[0])
+                
+            else:
+                member["samplingTime"]["endPosition"] = ob.samplingTime[0].astimezone(GO.reqTZ).isoformat()
+        if ob.procedureType == "insitu-fixed-point":
+            ii=1
+        elif ob.procedureType == "insitu-mobile-point":
+            ii=4
+        elif ob.procedureType == "virtual":
+            ii=1
+            
+        member['observedProperty'] = {
+            "CompositePhenomenon": {
+                "id": "comp_%s" % str(ob.id_prc),
+                "dimension": str(len(ob.opr_urn)+ii),
+                "name": "timeSeriesOfObservations"
+            }
+        }
+        
+        member['observedProperty']["component"] = [ob.timedef]
+        
+        if ii==4:
+            member['observedProperty']["component"] += [
+                ("%s:x-position" % GO.refsys), 
+                ("%s:y-position" % GO.refsys), 
+                ("%s:z-position" % GO.refsys)
+            ]
+            
+        member['observedProperty']["component"] += ob.opr_urn
+        
+        member['featureOfInterest'] = {
+            "name": ob.foi_urn,
+            "geom": ob.foiGml.replace("\"","'")
+        }
+        
+        member['result'] = {
+            "DataArray": {
+                "elementCount": str(len(ob.observedProperty)+ii),
+                "field": [
+                    {
+                        "name": "Time",
+                        "definition": ob.timedef
+                    }
+                ]
+            }
+        }
+        if ii==4:
+            member['result']['DataArray']['field'] += [
+                {
+                    "name": "x-position",
+                    "definition": "%s:x-position" % GO.refsys
+                },
+                {
+                    "name": "y-position",
+                    "definition": "%s:y-position" % GO.refsys
+                },
+                {
+                    "name": "z-position",
+                    "definition": "%s:z-position" % GO.refsys
+                }
+            ]
+        for idx in range(len(ob.observedProperty)):
+            member['result']['DataArray']['field'] += [
+                {
+                    "name": ob.observedPropertyName[idx],
+                    "definition": ob.observedProperty[idx],
+                    "uom": ob.uom[idx]  
+                }
+            ]
+        
+        member['result']['DataArray']['values'] = []
+        for row in range(len(ob.data)):
+            data = [ob.data[row][0].isoformat()]
+            for i in range(1,len(ob.data[0])):
+                data.append(str(ob.data[row][i]))
+            member['result']['DataArray']['values'].append(data)
+            
+        # append member to collection
+        oc["ObservationCollection"]["member"].append(member)
+
+    
+    
+    return json.dumps(oc)
+    #return json.dumps(wut.encodeobject(oc))
+
+def CSVformat(GO):
+    #create unique columns name
+    columns = ["time","procedure"]
+    columns_name = [None,"urn:ogc:def:procedure"]
+    
+    
+    for iob, ob in enumerate(GO.obs):
+        if columns_name[0]==None:
+            columns_name[0] = ob.timedef
+        if ob.procedureType == "insitu-mobile-point":
+            columns += ["x-position","y-position","z-position"]
+            columns_name += ["%s:x-position" % GO.refsys,"%s:y-position" % GO.refsys,"%s:z-position" % GO.refsys]
+        for idx,opr in enumerate(ob.observedProperty):
+            if not opr in columns:
+                columns += [opr]
+                columns_name += ["%s" %(opr)]
+    
+    #create rows
+    rows = []
+    for iob, ob in enumerate(GO.obs):
+        #create look-up-table for given observation member
+        #associates opr index with row index
+        lut = { 0 : 0}
+        i=0
+        if ob.procedureType == "insitu-mobile-point":
+            lut[1] = columns.index("x-position")
+            lut[2] = columns.index("y-position")
+            lut[3] = columns.index("z-position")
+            i=3
+        for opr in ob.observedProperty:
+            i += 1
+            try:
+                lut[i] = columns.index(opr)
+            except:
+                raise Exception("%s - %s" %(lut,columns))
+        #raise Exception( "%s - %s" %(lut,columns))
+        #create row
+        
+        
+        #append row
+        for vals in ob.data:
+            row = [""] * len(columns)
+            row[0] = vals[0].isoformat()
+            row[1] = ob.procedure.split(":")[-1]
+            for i in range(1,len(vals)):
+                row[lut[i]] = str(vals[i])
+            rows.append(row)
+                
+    #write results as CSV    
+    r  = ",".join(columns_name) + "\n"
+    for c in rows:
+        r += ",".join(c) + "\n"
+    
+    return r
+
+
+    
diff --git a/istsoslib/renderers/GOresponseRender.pyc b/istsoslib/renderers/GOresponseRender.pyc
index 44abb27..4205318 100644
Binary files a/istsoslib/renderers/GOresponseRender.pyc and b/istsoslib/renderers/GOresponseRender.pyc differ
diff --git a/istsoslib/renderers/IOresponseRender.py b/istsoslib/renderers/IOresponseRender.py
index 5a94076..11ccf30 100755
--- a/istsoslib/renderers/IOresponseRender.py
+++ b/istsoslib/renderers/IOresponseRender.py
@@ -1,28 +1,33 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-def render(IO,sosConfig):
-    r =  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-    r += "  <sos:InsertObservationResponse xmlns:sos=\"http://www.opengis.net/sos/1.0\">"
-    if IO.assignedId == "":
-        r += "    <sos:AssignedObservationId/>"
-    else:
-        r += "    <sos:AssignedObservationId>" + str(IO.assignedId) + "</sos:AssignedObservationId>"
-    r += "  </sos:InsertObservationResponse>"
-    
-    return r
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+def render(IO,sosConfig):
+    r =  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+    r += "  <sos:InsertObservationResponse xmlns:sos=\"http://www.opengis.net/sos/1.0\">"
+    if IO.assignedId == "":
+        r += "    <sos:AssignedObservationId/>"
+    else:
+        r += "    <sos:AssignedObservationId>" + str(IO.assignedId) + "</sos:AssignedObservationId>"
+    r += "  </sos:InsertObservationResponse>"
+    
+    return r
+
diff --git a/istsoslib/renderers/IOresponseRender.pyc b/istsoslib/renderers/IOresponseRender.pyc
index c6cecb4..ef16d87 100644
Binary files a/istsoslib/renderers/IOresponseRender.pyc and b/istsoslib/renderers/IOresponseRender.pyc differ
diff --git a/istsoslib/renderers/RSresponseRender.py b/istsoslib/renderers/RSresponseRender.py
index c2e59cb..c930bb0 100755
--- a/istsoslib/renderers/RSresponseRender.py
+++ b/istsoslib/renderers/RSresponseRender.py
@@ -1,30 +1,35 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-from lib import isodate as iso
-
-def render(RS,sosConfig):
-    r = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    r += "<sos:RegisterSensorResponse\n"
-    r += "     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
-    r += "     xsi:schemaLocation=\"http://schemas.opengis.net/sos/1.0.0/sosAll.xsd\"\n"
-    r += "     xmlns:sos=\"http://www.opengis.net/sos/1.0\">\n"
-    r += "<AssignedSensorId>"
-    r += "%s" %(RS.assignedSensorId)
-    r += "</AssignedSensorId>\n"
-    r += "</sos:RegisterSensorResponse>"
-    return r
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from lib import isodate as iso
+
+def render(RS,sosConfig):
+    r = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+    r += "<sos:RegisterSensorResponse\n"
+    r += "     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+    r += "     xsi:schemaLocation=\"http://schemas.opengis.net/sos/1.0.0/sosAll.xsd\"\n"
+    r += "     xmlns:sos=\"http://www.opengis.net/sos/1.0\">\n"
+    r += "<AssignedSensorId>"
+    r += "%s" %(RS.assignedSensorId)
+    r += "</AssignedSensorId>\n"
+    r += "</sos:RegisterSensorResponse>"
+    return r
diff --git a/istsoslib/renderers/RSresponseRender.pyc b/istsoslib/renderers/RSresponseRender.pyc
index de7af60..ab500cb 100644
Binary files a/istsoslib/renderers/RSresponseRender.pyc and b/istsoslib/renderers/RSresponseRender.pyc differ
diff --git a/istsoslib/renderers/USDresponseRender.py b/istsoslib/renderers/USDresponseRender.py
index 3a71991..bfe9f90 100755
--- a/istsoslib/renderers/USDresponseRender.py
+++ b/istsoslib/renderers/USDresponseRender.py
@@ -1,25 +1,30 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-def render(USD,sosConfig):
-    r =  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-    r += "  <sos:updateSensorDescriptionResponse xmlns:sos=\"http://www.opengis.net/sos/1.0\">"
-    r += "    <sos:UpdatedProcedure>" + str(USD.procedure) + "</sos:UpdatedProcedure>"
-    r += "  </sos:updateSensorDescription>"
-    
-    return r
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+def render(USD,sosConfig):
+    r =  "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+    r += "  <sos:updateSensorDescriptionResponse xmlns:sos=\"http://www.opengis.net/sos/1.0\">"
+    r += "    <sos:UpdatedProcedure>" + str(USD.procedure) + "</sos:UpdatedProcedure>"
+    r += "  </sos:updateSensorDescription>"
+    
+    return r
+
diff --git a/istsoslib/renderers/USDresponseRender.pyc b/istsoslib/renderers/USDresponseRender.pyc
new file mode 100644
index 0000000..ac36ca1
Binary files /dev/null and b/istsoslib/renderers/USDresponseRender.pyc differ
diff --git a/istsoslib/renderers/__init__.py b/istsoslib/renderers/__init__.py
index 5fc6bc6..0d0e558 100755
--- a/istsoslib/renderers/__init__.py
+++ b/istsoslib/renderers/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = ["GCresponseRender","DSresponseRender","GOresponseRendered", "GFresponseRender", "IOresponseRender", "RSresponseRender", "USDresponseRender", "factory_render", "VirtualProcess" ]
diff --git a/istsoslib/renderers/__init__.pyc b/istsoslib/renderers/__init__.pyc
index edd57e4..59e063c 100644
Binary files a/istsoslib/renderers/__init__.pyc and b/istsoslib/renderers/__init__.pyc differ
diff --git a/istsoslib/renderers/factory_render.py b/istsoslib/renderers/factory_render.py
index c38cc5d..390277d 100755
--- a/istsoslib/renderers/factory_render.py
+++ b/istsoslib/renderers/factory_render.py
@@ -1,59 +1,63 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import sosConfig
-from istsoslib import sosException
-
-def sosFactoryRender(response,sosConfig):
-    
-    res_type = str(response.__class__.__name__)
-    
-    if res_type == "GetCapabilitiesResponse":
-        from istsoslib.renderers import GCresponseRender
-        return GCresponseRender.render(response,sosConfig)
-    
-    elif res_type == "DescribeSensorResponse":
-        from istsoslib.renderers import DSresponseRender
-        return DSresponseRender.render(response,sosConfig)
-    
-    elif res_type == "observations":
-        from istsoslib.renderers import GOresponseRender
-        return GOresponseRender.render(response,sosConfig)
-    
-    elif res_type == "foi":
-        from istsoslib.renderers import GFresponseRender
-        return GFresponseRender.render(response,sosConfig)
-    
-    elif res_type == "InsertObservationResponse":
-        from istsoslib.renderers import IOresponseRender
-        return IOresponseRender.render(response,sosConfig)
-    
-    elif res_type == "RegisterSensorResponse":
-        from istsoslib.renderers import RSresponseRender
-        return RSresponseRender.render(response,sosConfig)
-    
-    elif res_type == "UpdateSensorDescriptionResponse":
-        from istsoslib.renderers import USDresponseRender
-        return USDresponseRender.render(response,sosConfig)
-   
-    else:
-        raise sosException.SOSException("InvalidRequest","request","\"request\": %s not supported" %(str(response.__class__.__name__)))
-        
-
-
-    
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib import sosException
+
+def sosFactoryRender(response,sosConfig):
+    
+    res_type = str(response.__class__.__name__)
+    
+    if res_type == "GetCapabilitiesResponse":
+        from istsoslib.renderers import GCresponseRender
+        return GCresponseRender.render(response,sosConfig)
+    
+    elif res_type == "DescribeSensorResponse":
+        from istsoslib.renderers import DSresponseRender
+        return DSresponseRender.render(response,sosConfig)
+    
+    elif res_type == "observations":
+        from istsoslib.renderers import GOresponseRender
+        return GOresponseRender.render(response,sosConfig)
+    
+    elif res_type == "foi":
+        from istsoslib.renderers import GFresponseRender
+        return GFresponseRender.render(response,sosConfig)
+    
+    elif res_type == "InsertObservationResponse":
+        from istsoslib.renderers import IOresponseRender
+        return IOresponseRender.render(response,sosConfig)
+    
+    elif res_type == "RegisterSensorResponse":
+        from istsoslib.renderers import RSresponseRender
+        return RSresponseRender.render(response,sosConfig)
+    
+    elif res_type == "UpdateSensorDescriptionResponse":
+        from istsoslib.renderers import USDresponseRender
+        return USDresponseRender.render(response,sosConfig)
+   
+    else:
+        raise sosException.SOSException("InvalidRequest","request","\"request\": %s not supported" %(str(response.__class__.__name__)))
+        
+
+
+    
+
diff --git a/istsoslib/renderers/factory_render.pyc b/istsoslib/renderers/factory_render.pyc
index 1dc26cf..569c5a7 100644
Binary files a/istsoslib/renderers/factory_render.pyc and b/istsoslib/renderers/factory_render.pyc differ
diff --git a/istsoslib/responders/DSresponse.py b/istsoslib/responders/DSresponse.py
index 507fd51..93bb3c3 100755
--- a/istsoslib/responders/DSresponse.py
+++ b/istsoslib/responders/DSresponse.py
@@ -1,119 +1,123 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-import string
-import os
-import os.path
-import sys
-
-from istsoslib import sosException
-
-
-class DescribeSensorResponse:
-    def __init__(self, filter, pgdb):
-        
-        pgdb.setTimeTZ("UTC")
-    
-        self.smlFile = ""
-        sql = "SELECT id_prc, stime_prc, etime_prc, name_oty from %s.procedures, %s.obs_type" %(filter.sosConfig.schema,filter.sosConfig.schema)
-        sql += " WHERE id_oty=id_oty_fk AND name_prc = %s" 
-        params = (str(filter.procedure),)
-        try:
-            res=pgdb.select(sql,params)
-        except:
-            raise Exception("Error! sql: %s." %(pgdb.mogrify(sql,params)) )
-        
-        # raise error if the procedure is not found in db
-        if res==None:
-            raise sosException.SOSException("InvalidParameterValue","procedure","Procedure '%s' not exist or can't be found.")
-        
-        
-        # look for observation end time
-        try:
-            self.procedureType = res[0]['name_oty']
-        except:
-            self.procedureType = None
-            
-        
-        if self.procedureType == 'virtual':
-            vpFolder = os.path.join(filter.sosConfig.virtual_processes_folder,filter.procedure)
-            try:
-                sys.path.append(vpFolder)
-            except:
-                raise Exception("Error in loading virtual procedure path")
-                
-            # check if python file exist
-            if os.path.isfile("%s/%s.py" % (vpFolder,filter.procedure)):
-                
-                #import procedure process
-                exec "import %s as vproc" %(filter.procedure)
-                
-                # Initialization of virtual procedure will load the source data
-                vp = vproc.istvp()
-                vp._configure(filter,pgdb)
-                
-                self.stime, self.etime = vp.getSampligTime()
-                
-            else:
-                self.stime = None
-                self.etime = None
-        
-        else:
-            # look for observation start time
-            try:
-                self.stime = res[0]['stime_prc']
-            except:
-                self.stime = None
-                #raise sosException.SOSException(1,"Procedure '%s' has no valid stime."%(filter.procedure))
-            
-            # look for observation end time
-            try:
-                self.etime = res[0]['etime_prc']
-            except:
-                self.etime = None
-            
-        
-        # check if folder containing SensorML exists
-        if not os.path.isdir(filter.sosConfig.sensorMLpath):
-            raise Exception("istsos configuration error, cannot find sensorMLpath!")
-        
-        # clean up the procedure name to produce a valid file name
-        filename = filter.procedure
-        valid_chars = "-_.() %s%s" % (string.ascii_letters, string.digits)
-        for c in filename:
-            if not c in valid_chars:
-                raise Exception("procedure name '%s' is not a valid: use only letters or digits!"%(filter.procedure))
-        filename += '.xml'
-        
-        self.smlFile = os.path.join(filter.sosConfig.sensorMLpath, filename)
-        # check if file exist                
-        if not os.path.isfile(self.smlFile):
-            raise Exception("SensorML file for procedure '%s' not found!"%(filter.procedure))
-        
-        sqlProc  = "SELECT def_opr, name_opr, desc_opr, constr_pro, name_uom"
-        sqlProc += " FROM %s.observed_properties opr, %s.proc_obs po," %(filter.sosConfig.schema,filter.sosConfig.schema)
-        sqlProc += " %s.procedures pr, %s.uoms um" %(filter.sosConfig.schema,filter.sosConfig.schema)
-        sqlProc += " WHERE opr.id_opr=po.id_opr_fk AND pr.id_prc=po.id_prc_fk AND um.id_uom = po.id_uom_fk"
-        sqlProc += " AND name_prc = %s" 
-        params = (str(filter.procedure),)
-        try:
-            self.observedProperties=pgdb.select(sqlProc,params)
-        except Exception as exe:
-            raise Exception("Error! sql: %s." % pgdb.mogrify(sqlProc,params))
-        
-        
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import string
+import os
+import os.path
+import sys
+
+from istsoslib import sosException
+
+
+class DescribeSensorResponse:
+    def __init__(self, filter, pgdb):
+        
+        pgdb.setTimeTZ("UTC")
+    
+        self.smlFile = ""
+        sql = "SELECT id_prc, stime_prc, etime_prc, name_oty from %s.procedures, %s.obs_type" %(filter.sosConfig.schema,filter.sosConfig.schema)
+        sql += " WHERE id_oty=id_oty_fk AND name_prc = %s" 
+        params = (str(filter.procedure),)
+        try:
+            res=pgdb.select(sql,params)
+        except:
+            raise Exception("Error! sql: %s." %(pgdb.mogrify(sql,params)) )
+        
+        # raise error if the procedure is not found in db
+        if res==None:
+            raise sosException.SOSException("InvalidParameterValue","procedure","Procedure '%s' not exist or can't be found.")
+        
+        
+        # look for observation end time
+        try:
+            self.procedureType = res[0]['name_oty']
+        except:
+            self.procedureType = None
+            
+        
+        if self.procedureType == 'virtual':
+            vpFolder = os.path.join(filter.sosConfig.virtual_processes_folder,filter.procedure)
+            try:
+                sys.path.append(vpFolder)
+            except:
+                raise Exception("Error in loading virtual procedure path")
+                
+            # check if python file exist
+            if os.path.isfile("%s/%s.py" % (vpFolder,filter.procedure)):
+                
+                #import procedure process
+                exec "import %s as vproc" %(filter.procedure)
+                
+                # Initialization of virtual procedure will load the source data
+                vp = vproc.istvp()
+                vp._configure(filter,pgdb)
+                
+                self.stime, self.etime = vp.getSampligTime()
+                
+            else:
+                self.stime = None
+                self.etime = None
+        
+        else:
+            # look for observation start time
+            try:
+                self.stime = res[0]['stime_prc']
+            except:
+                self.stime = None
+                #raise sosException.SOSException(1,"Procedure '%s' has no valid stime."%(filter.procedure))
+            
+            # look for observation end time
+            try:
+                self.etime = res[0]['etime_prc']
+            except:
+                self.etime = None
+            
+        
+        # check if folder containing SensorML exists
+        if not os.path.isdir(filter.sosConfig.sensorMLpath):
+            raise Exception("istsos configuration error, cannot find sensorMLpath!")
+        
+        # clean up the procedure name to produce a valid file name
+        filename = filter.procedure
+        valid_chars = "-_.() %s%s" % (string.ascii_letters, string.digits)
+        for c in filename:
+            if not c in valid_chars:
+                raise Exception("procedure name '%s' is not a valid: use only letters or digits!"%(filter.procedure))
+        filename += '.xml'
+        
+        self.smlFile = os.path.join(filter.sosConfig.sensorMLpath, filename)
+        # check if file exist                
+        if not os.path.isfile(self.smlFile):
+            raise Exception("SensorML file for procedure '%s' not found!"%(filter.procedure))
+        
+        sqlProc  = "SELECT def_opr, name_opr, desc_opr, constr_pro, name_uom"
+        sqlProc += " FROM %s.observed_properties opr, %s.proc_obs po," %(filter.sosConfig.schema,filter.sosConfig.schema)
+        sqlProc += " %s.procedures pr, %s.uoms um" %(filter.sosConfig.schema,filter.sosConfig.schema)
+        sqlProc += " WHERE opr.id_opr=po.id_opr_fk AND pr.id_prc=po.id_prc_fk AND um.id_uom = po.id_uom_fk"
+        sqlProc += " AND name_prc = %s" 
+        params = (str(filter.procedure),)
+        try:
+            self.observedProperties=pgdb.select(sqlProc,params)
+        except Exception as exe:
+            raise Exception("Error! sql: %s." % pgdb.mogrify(sqlProc,params))
+        
+        
diff --git a/istsoslib/responders/DSresponse.pyc b/istsoslib/responders/DSresponse.pyc
index 4530aac..adcdf5d 100644
Binary files a/istsoslib/responders/DSresponse.pyc and b/istsoslib/responders/DSresponse.pyc differ
diff --git a/istsoslib/responders/GCresponse.py b/istsoslib/responders/GCresponse.py
index 8fc513b..8128d8f 100755
--- a/istsoslib/responders/GCresponse.py
+++ b/istsoslib/responders/GCresponse.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
+#
+# ===============================================================================
 import psycopg2 # @TODO the right library
 import psycopg2.extras
 
@@ -342,12 +346,14 @@ class GetCapabilitiesResponse():
     def __init__(self,fil,pgdb):
         if "all" in fil.sections:
             self.ServiceIdentifier = ServiceIdentification(fil.sosConfig)
+            self.ServiceIdentifier.serviceTypeVersion = fil.version
             self.ServiceProvider = ServiceProvider(fil.sosConfig)
             self.OperationsMetadata = OperationsMetadata(pgdb,fil.sosConfig)
             self.ObservationOfferingList = ObservationOfferingList(pgdb,fil.sosConfig)
         else:
             if "serviceidentification" in fil.sections:
                 self.ServiceIdentifier = ServiceIdentification(fil.sosConfig)
+                self.ServiceIdentifier.serviceTypeVersion = fil.version
             else:
                 self.ServiceIdentifier = []
             if "serviceprovider" in fil.sections:
diff --git a/istsoslib/responders/GCresponse.pyc b/istsoslib/responders/GCresponse.pyc
index ffcff78..dd0ea3d 100644
Binary files a/istsoslib/responders/GCresponse.pyc and b/istsoslib/responders/GCresponse.pyc differ
diff --git a/istsoslib/responders/GFresponse.py b/istsoslib/responders/GFresponse.py
index 6b0b52d..5dab961 100755
--- a/istsoslib/responders/GFresponse.py
+++ b/istsoslib/responders/GFresponse.py
@@ -1,107 +1,111 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-import psycopg2 # @TODO the right library
-import psycopg2.extras
-import os
-import sys
-
-#import sosConfig
-from istsoslib import sosDatabase
-#from SOS.config import mimetype
-from istsoslib import sosException
-#from mx import DateTime
-import mx.DateTime.ISO
-           
-class foi:
-    def __init__(self,filter,pgdb):
-        #sys.stderr.write("*****************************************************************")
-        self.name=filter.featureOfInterest
-        self.type=""
-        self.desc=""
-        self.procedures=[]
-        self.idPrc=[]
-        self.obsType=[]
-        self.samplingTime=[]
-        self.properties=[]
-        self.geom=""
-        
-        #select foi
-        sql  = "SELECT id_foi, name_foi, desc_foi, ST_AsGml(ST_Transform(geom_foi,%s)) as geom, name_fty" #%(filter.srsName)
-        sql += " FROM %s.foi, %s.feature_type" %(filter.sosConfig.schema,filter.sosConfig.schema)
-        sql += " WHERE id_fty_fk=id_fty AND name_foi=%s" #%(filter.featureOfInterest)
-        params = (filter.srsName,str(filter.featureOfInterest))
-        try:
-            foi = pgdb.select(sql,params)[0]
-        except:
-            raise sosException.SOSException("InvalidParameterValue","FeatureOfInterestId","FeatureOfInterestId: Feature of Interest '%s' not found."%(filter.featureOfInterest))
-        
-        self.name=foi["name_foi"]
-        self.desc=foi["desc_foi"]
-        self.type=foi["name_fty"]
-        self.geom=foi["geom"]
-        
-        #select procedures
-        sql  = "SELECT id_prc, name_prc, name_oty "
-        sql += "FROM %s.procedures, %s.foi, %s.obs_type " %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        sql += "WHERE id_foi_fk=id_foi AND id_oty=id_oty_fk AND name_foi=%s " #%(filter.featureOfInterest)
-        sql += "ORDER BY name_prc " 
-        params = (str(filter.featureOfInterest),)
-        try:
-            prc = pgdb.select(sql,params)
-        except:
-            raise Exception("GFresponse, SQL: %s"%(pgdb.mogrify(sql,params)))        
-        
-        for p in prc:
-            self.procedures.append(p["name_prc"])
-            self.obsType.append(p["name_oty"])
-            self.idPrc.append(p["id_prc"])
-            # select obesrved properties of aa given procedure
-            sql = "SELECT name_opr "
-            sql += " FROM %s.procedures, %s.proc_obs, %s.observed_properties" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-            sql += " WHERE id_prc=id_prc_fk AND id_opr=id_opr_fk AND name_prc=%s" #%(p["name_prc"])
-            sql += " ORDER BY name_opr" 
-            params = (p["name_prc"],)
-            try:
-                obs = pgdb.select(sql,params)
-            except:
-                raise Exception("GFresponse, SQL: %s"%(pgdb.mogrify(sql,params)))    
-            obsArr = []
-            for o in obs:
-                obsArr.append(o['name_opr'])       
-            self.properties.append(obsArr)
-            
-            sql = "SELECT MIN(time_eti) as firstet, MAX(time_eti) as lastet FROM %s.event_time " %(filter.sosConfig.schema)
-            sql += "WHERE id_prc_fk = %s GROUP BY id_prc_fk" #% (p["id_prc"])
-            params = (p["id_prc"],)
-            try:
-                samplTime = pgdb.select(sql,params)
-            except:
-                raise Exception("GFresponse, SQL: %s"%(pgdb.mogrify(sql,params)))    
-            samplTimeArr = []
-            for st in samplTime:
-                samplTimeArr.append([st['firstet'],st['lastet']])
-            self.samplingTime.append(samplTimeArr)
-            
-        
-        
-        
-        
-        
-        
-        
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import psycopg2 # @TODO the right library
+import psycopg2.extras
+import os
+import sys
+
+#import sosConfig
+from istsoslib import sosDatabase
+#from SOS.config import mimetype
+from istsoslib import sosException
+#from mx import DateTime
+import mx.DateTime.ISO
+           
+class foi:
+    def __init__(self,filter,pgdb):
+        #sys.stderr.write("*****************************************************************")
+        self.name=filter.featureOfInterest
+        self.type=""
+        self.desc=""
+        self.procedures=[]
+        self.idPrc=[]
+        self.obsType=[]
+        self.samplingTime=[]
+        self.properties=[]
+        self.geom=""
+        
+        #select foi
+        sql  = "SELECT id_foi, name_foi, desc_foi, ST_AsGml(ST_Transform(geom_foi,%s)) as geom, name_fty" #%(filter.srsName)
+        sql += " FROM %s.foi, %s.feature_type" %(filter.sosConfig.schema,filter.sosConfig.schema)
+        sql += " WHERE id_fty_fk=id_fty AND name_foi=%s" #%(filter.featureOfInterest)
+        params = (filter.srsName,str(filter.featureOfInterest))
+        try:
+            foi = pgdb.select(sql,params)[0]
+        except:
+            raise sosException.SOSException("InvalidParameterValue","FeatureOfInterestId","FeatureOfInterestId: Feature of Interest '%s' not found."%(filter.featureOfInterest))
+        
+        self.name=foi["name_foi"]
+        self.desc=foi["desc_foi"]
+        self.type=foi["name_fty"]
+        self.geom=foi["geom"]
+        
+        #select procedures
+        sql  = "SELECT id_prc, name_prc, name_oty "
+        sql += "FROM %s.procedures, %s.foi, %s.obs_type " %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        sql += "WHERE id_foi_fk=id_foi AND id_oty=id_oty_fk AND name_foi=%s " #%(filter.featureOfInterest)
+        sql += "ORDER BY name_prc " 
+        params = (str(filter.featureOfInterest),)
+        try:
+            prc = pgdb.select(sql,params)
+        except:
+            raise Exception("GFresponse, SQL: %s"%(pgdb.mogrify(sql,params)))        
+        
+        for p in prc:
+            self.procedures.append(p["name_prc"])
+            self.obsType.append(p["name_oty"])
+            self.idPrc.append(p["id_prc"])
+            # select obesrved properties of aa given procedure
+            sql = "SELECT name_opr "
+            sql += " FROM %s.procedures, %s.proc_obs, %s.observed_properties" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+            sql += " WHERE id_prc=id_prc_fk AND id_opr=id_opr_fk AND name_prc=%s" #%(p["name_prc"])
+            sql += " ORDER BY name_opr" 
+            params = (p["name_prc"],)
+            try:
+                obs = pgdb.select(sql,params)
+            except:
+                raise Exception("GFresponse, SQL: %s"%(pgdb.mogrify(sql,params)))    
+            obsArr = []
+            for o in obs:
+                obsArr.append(o['name_opr'])       
+            self.properties.append(obsArr)
+            
+            sql = "SELECT MIN(time_eti) as firstet, MAX(time_eti) as lastet FROM %s.event_time " %(filter.sosConfig.schema)
+            sql += "WHERE id_prc_fk = %s GROUP BY id_prc_fk" #% (p["id_prc"])
+            params = (p["id_prc"],)
+            try:
+                samplTime = pgdb.select(sql,params)
+            except:
+                raise Exception("GFresponse, SQL: %s"%(pgdb.mogrify(sql,params)))    
+            samplTimeArr = []
+            for st in samplTime:
+                samplTimeArr.append([st['firstet'],st['lastet']])
+            self.samplingTime.append(samplTimeArr)
+            
+        
+        
+        
+        
+        
+        
+        
diff --git a/istsoslib/responders/GFresponse.pyc b/istsoslib/responders/GFresponse.pyc
new file mode 100644
index 0000000..7471717
Binary files /dev/null and b/istsoslib/responders/GFresponse.pyc differ
diff --git a/istsoslib/responders/GOresponse.py b/istsoslib/responders/GOresponse.py
index b0311ab..b0ca729 100755
--- a/istsoslib/responders/GOresponse.py
+++ b/istsoslib/responders/GOresponse.py
@@ -1,1067 +1,1075 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#import psycopg2 # @TODO the right library
-#import psycopg2.extras
-import os, sys
-
-#import sosConfig
-#from istsoslib import sosDatabase
-from istsoslib import sosException
-#import mx.DateTime.ISO
-from datetime import timedelta
-import copy
-#from datetime import datetime
-from lib import isodate as iso
-from lib import pytz
-
-class VirtualProcess():
-    
-    procedures = {}
-    samplingTime = (None,None)
-    
-    def _configure(self, filterRequest, pgdb):
-        self.filter = copy.deepcopy(filterRequest)
-        self.pgdb = pgdb
-        
-    def addProcedure(self, name, observedProperty):
-        """
-        name: String
-        observedProperty: String or Array of String
-        """
-        self.procedures[name] = observedProperty
-        
-    def execute(self):
-        "This method must be overridden to implement data gathering for this virtual procedure"
-        raise Exception("function execute must be overridden")
-    
-    def calculateObservations(self, observation):
-        self.observation = observation
-        self.observation.samplingTime = self.getSampligTime()
-        self.observation.data = self.execute()
-        if self.filter.aggregate_interval != None:
-            self.applyFunction()
-    
-    def getSampligTime(self):
-        self.setSampligTime()
-        return self.samplingTime
-        
-    def setSampligTime(self):
-        """
-        This method can be overridden to set the virtual procedure sampling time
-        *************************************************************************
-        By default This method calculate the sampling time of a virtual procedure 
-        giving the procedure name from witch the data are derived 
-        as single string or array of strings.
-        
-        If derivation procedures are more than one it will return the minimum 
-        begin position and the maximum end position among all the procedures 
-        name given.
-        
-        It supports also SamplingTime calculation from cascading Virtual Procedures.
-        """
-                
-        if len(self.procedures)==0:
-            self.samplingTime = (None,None)
-        else:
-            
-            # Identify if procedures are virtual
-            
-            tmp = self.procedures.keys()
-            procedures = []
-            
-            # Handle cascading virtual procedures
-            for p in tmp:
-                
-                sql = """
-                    SELECT name_oty 
-                    FROM %s.obs_type, %s.procedures 
-                    WHERE id_oty=id_oty_fk""" % ((self.filter.sosConfig.schema,)*2)
-                sql += " AND name_prc = %s"
-                
-                result = self.pgdb.select(sql, (p,))
-                    
-                if len(result)==0:
-                    raise sosException.SOSException("InvalidParameterValue","procedure","Virtual Procedure Error: procedure %s not found in the database" % (p))
-                
-                result = result[0]
-                
-                if result[0] == 'virtual':
-                    vpFolder = os.path.join(self.filter.sosConfig.virtual_processes_folder,p)
-                    try:
-                        if vpFolder not in sys.path:
-                            sys.path.append(vpFolder)
-                    except Exception as e:
-                        raise Exception("error in loading virtual procedure path (%s):\n%s" % (vpFolder,e))
-                        
-                    # check if python file exist
-                    if os.path.isfile("%s/%s.py" % (vpFolder,p)):
-                        exec "import %s as vproc" %(p)
-                        vp = vproc.istvp()
-                        if len(vp.procedures)>0:
-                            tmp.extend(vp.procedures.keys())
-                        
-                else:
-                    procedures.append(p)
-            
-            # removing duplicates
-            procedures = list(set(procedures))
-                
-            if len(procedures)>1: 
-                sql = """ 
-                    SELECT min(stime_prc), max(etime_prc)
-                    FROM %s.procedures 
-                    WHERE (stime_prc IS NOT NULL
-                    AND etime_prc IS NOT NULL)
-                    AND (
-                """ % self.filter.sosConfig.schema
-                sql += " OR ".join(["name_prc=%s"] * len(procedures))
-                sql += ") GROUP BY stime_prc, etime_prc"
-                param = tuple(procedures)
-            else:
-                sql = """ 
-                    SELECT stime_prc, etime_prc
-                    FROM %s.procedures 
-                    WHERE (stime_prc IS NOT NULL
-                    AND etime_prc IS NOT NULL)
-                """ % self.filter.sosConfig.schema
-                sql += "AND name_prc=%s"
-                param = (procedures[0],)
-                
-            try:
-                result = self.pgdb.select(sql, param)
-                if len(result)==0:
-                    raise Exception("Virtual Procedure Error: procedure %s not found in the database" % (", ".join(param)) )
-                result = result[0]
-            except Exception as e:
-                raise Exception("Database error: %s - %s" % (sql, e))    
-                
-            self.samplingTime = (result[0],result[1])
-        
-    def getData(self, procedure=None, disableAggregation=False):
-        """
-        procedure: String
-        """
-        
-        # Validating:
-        # If procedure is None, it is supposed that only one procedure has been added
-        if procedure is None:
-            if len(self.procedures)==0:
-                raise Exception("Virtual Procedure Error: no procedures added")    
-            procedure = self.procedures.keys()[0]
-            
-        elif procedure not in self.procedures.keys():
-            raise Exception("Virtual Procedure Error: procedure %s has not been added to this virtual procedure" % procedure)    
-        
-        virtualFilter = copy.deepcopy(self.filter)
-        virtualFilter.procedure = [procedure]
-        virtualFilter.observedProperty = self.procedures[procedure]
-        
-        sql = """
-            SELECT DISTINCT id_prc, name_prc, name_oty, 
-                stime_prc, etime_prc, time_res_prc, name_tru 
-            FROM 
-                %s.procedures, 
-                %s.proc_obs p, 
-                %s.observed_properties, 
-                %s.uoms, 
-                %s.time_res_unit, 
-                %s.obs_type """ % ((self.filter.sosConfig.schema,)*6 )
-        sql += """
-                WHERE id_prc = p.id_prc_fk 
-                AND id_opr_fk = id_opr 
-                AND id_uom = id_uom_fk 
-                AND id_tru = id_tru_fk 
-                AND id_oty = id_oty_fk
-                AND name_prc=%s"""
-        
-        try:
-            result = self.pgdb.select(sql, (procedure,))
-            if len(result)==0:
-                raise Exception("Virtual Procedure Error: procedure %s not found in the database" % procedure)
-            result = result[0]
-        except Exception as e:
-            raise Exception("Database error: %s - %s" % (sql, e))    
-        
-        obs = Observation()
-        
-        obs.baseInfo(self.pgdb, result, virtualFilter.sosConfig)
-        obs.setData(self.pgdb, result, virtualFilter)
-        
-        return obs.data
-    
-    def applyFunction(self):
-        try:
-            # Create array container
-            begin = iso.parse_datetime(self.filter.eventTime[0][0])
-            end = iso.parse_datetime(self.filter.eventTime[0][1])
-            duration = iso.parse_duration(self.filter.aggregate_interval)
-            result = {}
-            dt = begin
-            fields = len(self.observation.observedProperty)# + 1 # +1 timestamp field not mentioned in the observedProperty array
-            
-            while dt < end:
-                dt2 = dt + duration
-                result[dt2]=[]
-                for c in range(fields):
-                    result[dt2].append([])
-                
-                d = 0
-                data = copy.copy(self.observation.data)
-                while len(data) > 0:
-                    tmp = data.pop(d)
-                    if dt < tmp[0] and tmp[0] <= dt2:
-                        self.observation.data.pop(d)
-                        for c in range(fields):
-                            result[dt2][c].append(float(tmp[c+1]))
-                    elif dt > tmp[0]:
-                        self.observation.data.pop(d)
-                    elif dt2 < tmp[0]:
-                        break
-                        
-                dt = dt2
-                
-            data = []
-            
-            for r in sorted(result):
-                record = [r]
-                for v in range(len(result[r])):
-                    if self.observation.observedProperty[v].split(":")[-1]=="qualityIndex":
-                        if len(result[r][v])==0:
-                            record.append(self.filter.aggregate_nodata_qi)
-                        else:
-                            record.append(int(min(result[r][v])))
-                    else:
-                        val = None
-                        if len(result[r][v])==0:
-                            val = self.filter.aggregate_nodata
-                        elif self.filter.aggregate_function.upper() == 'SUM':
-                            val = sum(result[r][v])
-                        elif self.filter.aggregate_function.upper() == 'MAX':
-                            val = max(result[r][v])
-                        elif self.filter.aggregate_function.upper() == 'MIN':
-                            val = min(result[r][v])
-                        elif self.filter.aggregate_function.upper() == 'AVG':
-                            val = round(sum(result[r][v])/len(result[r][v]),4)
-                        elif self.filter.aggregate_function.upper() == 'COUNT':
-                            val = len(result[r][v])
-                        record.append(val)
-                data.append(record)
-                    
-            self.observation.data = data
-            
-        except Exception as e:
-            raise Exception("Error while applying aggregate function on virtual procedures: %s" % (e))
-        
-
-class VirtualProcessHQ(VirtualProcess):
-    
-    def setDischargeCurves(self):
-        "method for setting h-q tranformation tables/curves"       
-        #set requested period
-        #================================================
-        hqFile = os.path.join(
-                        self.filter.sosConfig.virtual_processes_folder,
-                        self.filter.procedure[0],
-                        self.filter.procedure[0]+".rcv"
-				)
-        tp=[]
-        if self.filter.eventTime == None:
-            tp = [None,None]
-        else:
-            for t in self.filter.eventTime:
-                if len(t) == 2:
-                    if t[0].find('+')==-1:
-                        t[0] += "+00:00"
-                    if t[1].find('+')==-1:
-                        t[1] += "+00:00"    
-                    tp.append(iso.parse_datetime(t[0]))
-                    tp.append(iso.parse_datetime(t[1]))
-                if len(t)==1:
-                    if t[0].find('+')==-1:
-                        t[0] += "+00:00"
-                    tp.append(iso.parse_datetime(t[0]))
-        period = (min(tp),max(tp))
-        #get required parameters
-        #==================================================
-        try:        
-            hq_fh = open(hqFile,'r')
-        except Exception as e:
-            raise Exception("Unable to open hq rating curve file at: %s" % hqFile)
-        lines = hq_fh.readlines()
-        #read header
-        hqs = {'from':[],'to':[],'low':[],'up': [],'A':[],'B':[],'C':[],'K':[]}
-        head = lines[0].strip().split("|")
-        try:
-            fromt = head.index('from')  #from time
-            tot = head.index('to')      #to time
-            low = head.index('low_val') #if value is bigger than
-            up = head.index('up_val')   #and is lower than
-            A = head.index('A')         #use this A
-            B = head.index('B')         #use this B
-            C = head.index('C')         #use this C
-            K = head.index('K')         #use this K
-        except Exception as e:
-            raise Exception("setDischargeCurves: FILE %s ,%s error in header.\n %s" %(hqFile,head,e))
-        
-        #get equations
-        if not period[0] == None:
-            for l in range(1,len(lines)):
-                line = lines[l].split("|")
-                if iso.parse_datetime(line[1]) > period[0] or iso.parse_datetime(line[0]) <= period[1]:
-                    hqs['from'].append(iso.parse_datetime(line[fromt]))
-                    hqs['to'].append(iso.parse_datetime(line[tot]))
-                    hqs['low'].append(float(line[low]))
-                    hqs['up'].append(float(line[up]))
-                    hqs['A'].append(float(line[A]))
-                    hqs['B'].append(float(line[B]))
-                    hqs['C'].append(float(line[C]))
-                    hqs['K'].append(float(line[K]))
-        else:
-            for l in [-1,-2]:
-                try:
-                    line = lines[l].split("|")
-                    hqs['from'].append(iso.parse_datetime(line[fromt]))
-                    hqs['to'].append(iso.parse_datetime(line[tot]))
-                    hqs['low'].append(float(line[low]))
-                    hqs['up'].append(float(line[up]))
-                    hqs['A'].append(float(line[A]))
-                    hqs['B'].append(float(line[B]))
-                    hqs['C'].append(float(line[C]))
-                    hqs['K'].append(float(line[K]))
-                except:
-                    pass
-        #raise sosException.SOSException(3,"%s" %(hqs))
-        self.hqCurves = hqs
-        
-    def execute(self):
-        
-        self.setDischargeCurves()
-        data = self.getData()
-        
-        if self.filter.qualityIndex == True:
-            data_out=[]
-            for rec in data:
-                if (float(rec[1])) < -999.0:
-                    data_out.append([ rec[0], -999.9, 110 ])
-                else:
-                    for o in range(len(self.hqCurves['from'])):
-                        if (self.hqCurves['from'][o] < rec[0] <= self.hqCurves['to'][o]) and (self.hqCurves['low'][o] <= float(rec[1]) < self.hqCurves['up'][o]):
-                            if (float(rec[1])-self.hqCurves['B'][o]) >=0:
-                                data_out.append([ rec[0], "%.3f" %(self.hqCurves['K'][o] + self.hqCurves['A'][o]*((float(rec[1])-self.hqCurves['B'][o])**self.hqCurves['C'][o])), rec[2] ])
-                            else:
-                                #data not evaluable
-                                data_out.append([ rec[0], -999.9, 120 ])
-                            break
-                        if o == ( len(self.hqCurves['from']) -1):
-                            #data non in curves definition
-                            data_out.append([ rec[0], -999.9, 120 ])       
-        else:
-            data_out=[]
-            for rec in data:
-                for o in range(len(self.hqCurves['from'])):
-                    if (self.hqCurves['from'][o] < rec[0] <= self.hqCurves['to'][o]) and (self.hqCurves['low'][o] <= float(rec[1]) < self.hqCurves['up'][o]):
-                        if (float(rec[1])-self.hqCurves['B'][o]) >=0:
-                            data_out.append([ rec[0], "%.3f" %(self.hqCurves['K'][o] + self.hqCurves['A'][o]*((float(rec[1])-self.hqCurves['B'][o])**self.hqCurves['C'][o])) ])
-                        else:
-                            data_out.append([ rec[0],-999.9 ])
-                        break
-                    if o == (len(self.hqCurves['from'])-1):
-                        data_out.append([ rec[0], -999.9 ])
-                        
-        return data_out  
-        
-        
-#--this while is not
-#import TEST as Vproc        
-#----------------------------------
-
-def BuildobservedPropertyList(pgdb,offering,sosConfig):
-    list=[]
-    sql = "SELECT distinct(def_opr) as nopr FROM %s.procedures, %s.proc_obs p," %(sosConfig.schema,sosConfig.schema)
-    sql += " %s.observed_properties, %s.off_proc o, %s.offerings" %(sosConfig.schema,sosConfig.schema,sosConfig.schema)
-    sql += " WHERE id_opr_fk=id_opr AND p.id_prc_fk=id_prc AND o.id_prc_fk=id_prc AND id_off=id_off_fk"
-    sql += " AND name_off='%s' ORDER BY nopr" %(offering)
-    rows=pgdb.select(sql)
-    for row in rows:
-        list.append(row["nopr"])
-    return list
-
-def BuildfeatureOfInterestList(pgdb,offering,sosConfig):
-    list=[]
-    sql = "SELECT distinct(name_foi) as nfoi FROM %s.foi, %s.procedures " %(sosConfig.schema,sosConfig.schema)
-    sql += " , %s.off_proc, %s.offerings" %(sosConfig.schema,sosConfig.schema)
-    sql += " WHERE id_foi=id_foi_fk AND id_prc_fk=id_prc"
-    sql += " AND id_off=id_off_fk AND name_off='%s' ORDER BY nfoi"  %(offering)
-  
-    try:
-        rows=pgdb.select(sql)
-    except:
-        raise Exception("sql: %s" %(sql))
-    for row in rows:
-        list.append(row["nfoi"])
-    return list
-    
-def BuildProcedureList(pgdb,offering,sosConfig):
-    list=[]
-    sql = "SELECT name_prc FROM %s.procedures, %s.off_proc, %s.offerings"  %(sosConfig.schema,sosConfig.schema,sosConfig.schema)
-    sql += " WHERE id_prc=id_prc_fk AND id_off=id_off_fk AND name_off='%s'" %(offering)
-    sql += " ORDER BY name_prc"
-    rows=pgdb.select(sql)
-    for row in rows:
-        list.append(row["name_prc"])    
-    return list
-
-def BuildOfferingList(pgdb,sosConfig):
-    list=[]
-    sql = "SELECT distinct(name_off) FROM %s.offerings" %(sosConfig.schema,)
-    rows=pgdb.select(sql)
-    for row in rows:
-        list.append(row["name_off"])
-    return list
-
-'''
-def buildQuery(parameters):
-    """Documentation"""
-
-'''
-
-                
-'''
-filter.eventTime
-filter.aggregate_function
-filter.aggregate_interval
-filter.aggregate_nodata
-filter.aggregate_nodata_qi
-'''
-
-def applyFunction(ob, filter):
-    import copy
-    try:
-        # Create array container
-        begin = iso.parse_datetime(filter.eventTime[0][0])
-        end = iso.parse_datetime(filter.eventTime[0][1])
-        duration = iso.parse_duration(filter.aggregate_interval)
-        result = {}        
-        dt = begin
-        fields = len(ob.observedProperty)# + 1 # +1 timestamp field not mentioned in the observedProperty array
-        
-        while dt < end:
-            dt2 = dt + duration
-            result[dt2]=[]
-            for c in range(fields):
-                result[dt2].append([])
-            
-            d = 0
-            data = copy.copy(ob.data)
-            while len(data) > 0:
-                tmp = data.pop(d)
-                if dt < tmp[0] and tmp[0] <= dt2:
-                    ob.data.pop(d)
-                    for c in range(fields):
-                        result[dt2][c].append(float(tmp[c+1]))
-                elif dt > tmp[0]:
-                    ob.data.pop(d)
-                elif dt2 < tmp[0]:
-                    break
-                    
-            dt = dt2
-            
-        data = []
-        
-        for r in sorted(result):
-            record = [r]
-            for v in range(len(result[r])):
-                if ob.observedProperty[v].split(":")[-1]=="qualityIndex":
-                    if len(result[r][v])==0:
-                        record.append(filter.aggregate_nodata_qi)
-                    else:
-                        record.append(int(min(result[r][v])))
-                else:
-                    val = None
-                    if len(result[r][v])==0:
-                        val = filter.aggregate_nodata
-                    elif filter.aggregate_function.upper() == 'SUM':
-                        val = sum(result[r][v])
-                    elif filter.aggregate_function.upper() == 'MAX':
-                        val = max(result[r][v])
-                    elif filter.aggregate_function.upper() == 'MIN':
-                        val = min(result[r][v])
-                    elif filter.aggregate_function.upper() == 'AVG':
-                        val = round(sum(result[r][v])/len(result[r][v]),4)
-                    elif filter.aggregate_function.upper() == 'COUNT':
-                        val = len(result[r][v])
-                    record.append(val)
-            data.append(record)
-                
-        ob.data = data
-        
-    except Exception as e:
-        raise Exception("Error while applying aggregate function on virtual procedures: %s" % (e))
-    
-
-class offInfo:
-    def __init__(self,off_name,pgdb,sosConfig):
-        sql = "SELECT name_off, desc_off FROM %s.offerings WHERE name_off='%s'" %(sosConfig.schema,off_name)
-        try:
-            off = pgdb.select(sql)[0]
-            self.name=off["name_off"]
-            self.desc=off["desc_off"]
-        except:
-            raise sosException.SOSException("InvalidParameterValue","offering","Parameter \"offering\" sent with invalid value: %s"%(off_name))
-
-
-# @todo instantation with Builder pattern will be less confusing, observation class must be just a data container
-class Observation:
-
-    def __init__(self):
-        self.procedure=None
-        self.name = None
-        self.id_prc=None
-        self.procedureType=None
-        self.samplingTime=None
-        #self.reqTZ = None
-        self.refsys = None
-        self.timeResUnit=None
-        self.timeResVal=None
-        self.observedProperty=None
-        self.opr_urn=None
-        self.uom=None
-        self.featureOfInterest=None
-        self.foi_urn=None
-        self.foiGml = None
-        self.dataType=None
-        self.timedef = None
-        self.qualitydef = None
-        self.data=[]
-        
-    def baseInfo(self, pgdb, o, sosConfig):
-        #set base information of registered procedure
-        #=============================================
-        
-        k = o.keys()
-        if not ("id_prc" in k and "name_prc" in k and  "name_oty" in k and "stime_prc" in k and "etime_prc" in k and "time_res_prc" in k and "name_tru" in k ):
-            raise Exception("Error, baseInfo argument: %s"%(o))
-        
-        #SET PROCEDURE NAME AND ID
-        #===========================
-        self.id_prc=o["id_prc"]
-        self.name = o["name_prc"]
-        #self.procedure = sosConfig.urn["procedure"] + ":" + o["name_prc"]
-        self.procedure = sosConfig.urn["procedure"] + o["name_prc"]
-        
-        #SET PROCEDURE TYPE
-        #========================= --> ADD OTHER TYPES (IN CONFIG??)
-        if o["name_oty"].lower() in ["insitu-fixed-point","insitu-mobile-point","virtual"]:
-            self.procedureType=o["name_oty"]
-            #TO BE IMPLEMENTED FOR MORE OPTIONS
-        else:
-            raise Exception("error in procedure type setting")
-        
-        #SET TIME: RESOLUTION VALUE AND UNIT
-        #===================================
-        self.timeResVal = o["time_res_prc"]
-        self.timeResUnit = o["name_tru"]
-        
-        #SET SAMPLING TIME
-        #===================================
-        if o["stime_prc"]!=None and o["etime_prc"]!=None:
-            self.samplingTime=[o["stime_prc"],o["etime_prc"]]
-        else:
-            self.samplingTime = None
-        
-        self.dataType = sosConfig.urn["dataType"] + "timeSeries"
-        self.timedef = sosConfig.urn["parameter"] + "time:iso8601"
-        self.qualitydef = None
-        
-        
-    def setData(self,pgdb,o,filter):
-        """get data according to request filters"""
-        # @todo mettere da qualche altra parte
-	        
-        #SET FOI OF PROCEDURE
-        #=========================================
-        sqlFoi  = "SELECT name_fty, name_foi, ST_AsGml(ST_Transform(geom_foi,%s)) as gml" %(filter.srsName)
-        sqlFoi += " FROM %s.procedures, %s.foi, %s.feature_type" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        sqlFoi += " WHERE id_foi_fk=id_foi AND id_fty_fk=id_fty AND id_prc=%s" %(o["id_prc"])
-        try:
-            resFoi = pgdb.select(sqlFoi)
-        except:
-            raise Exception("SQL: %s"%(sqlFoi))
-        
-        self.featureOfInterest = resFoi[0]["name_foi"]
-        self.foi_urn = filter.sosConfig.urn["feature"] + resFoi[0]["name_fty"] + ":" + resFoi[0]["name_foi"]
-        if resFoi[0]["gml"].find("srsName")<0:
-            srs = filter.srsName or filter.sosConfig.istsosepsg
-            self.foiGml = resFoi[0]["gml"][:resFoi[0]["gml"].find(">")] + " srsName=\"EPSG:%s\"" % srs + resFoi[0]["gml"][resFoi[0]["gml"].find(">"):]
-        else:
-            self.foiGml = resFoi[0]["gml"]
-        
-        #SET INFORMATION ABOUT OBSERVED_PROPERTIES
-        #=========================================       
-        sqlObsPro = "SELECT id_pro, id_opr, name_opr, def_opr, name_uom FROM %s.observed_properties, %s.proc_obs, %s.uoms" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        sqlObsPro += " WHERE id_opr_fk=id_opr AND id_uom_fk=id_uom AND id_prc_fk=%s" %(o["id_prc"])
-        sqlObsPro += " AND ("
-        #sqlObsPro += " OR ".join(["def_opr='" + str(i) + "'" for i in filter.observedProperty])
-        sqlObsPro += " OR ".join(["def_opr SIMILAR TO '%(:|)" + str(i) + "(:|)%'" for i in filter.observedProperty])
-        sqlObsPro += " ) ORDER BY def_opr ASC"
-        try:
-            obspr_res = pgdb.select(sqlObsPro)
-        except:
-            raise Exception("SQL: %s"%(sqlObsPro))
-            
-        self.observedProperty = []
-        self.observedPropertyName = []
-        self.opr_urn = []
-        self.uom = []
-        self.qualityIndex = filter.qualityIndex
-        
-        for row in obspr_res:
-            self.observedProperty += [str(row["def_opr"])]
-            self.observedPropertyName +=[str(row["name_opr"])]
-            self.opr_urn += [str(row["def_opr"])]
-            try:
-                #self.uom += [str(row["name_uom"]).encode('utf-8')]
-                self.uom += [row["name_uom"]]
-            except:
-                self.uom += ["n/a"]
-            if self.qualityIndex==True:
-                self.observedProperty += [str(row["def_opr"])+":qualityIndex"]
-                self.observedPropertyName += [str(row["name_opr"])+":qualityIndex"]
-                self.opr_urn += [str(row["def_opr"] +":qualityIndex")]
-                self.uom += ["-"]
-        
-        #SET DATA
-        #=========================================getSampligTime
-        #CASE "insitu-fixed-point" or "insitu-mobile-point"
-        #-----------------------------------------
-        if self.procedureType in ["insitu-fixed-point","insitu-mobile-point"]:
-            sqlSel = "SELECT et.time_eti as t," 
-            joinar=[]
-            cols=[]
-
-            aggrCols=[]
-            aggrNotNull=[]
-
-            valeFieldName = []
-            for idx, obspr_row in enumerate(obspr_res):
-                if self.qualityIndex==True:
-                    cols.append("C%s.val_msr as c%s_v, C%s.id_qi_fk as c%s_qi" %(idx,idx,idx,idx))
-                    valeFieldName.append("c%s_v" %(idx))
-                    valeFieldName.append("c%s_qi" %(idx))
-                else:
-                    cols.append("C%s.val_msr as c%s_v" %(idx,idx))
-                    valeFieldName.append("c%s_v" %(idx))
-
-                # If Aggregatation funtion is set
-                #---------------------------------
-                if filter.aggregate_interval != None:
-                    # This can be usefull with string values
-                    '''aggrCols.append("CASE WHEN %s(dt.c%s_v) is NULL THEN '%s' ELSE '' || %s(dt.c%s_v) END as c%s_v\n" % ( 
-                        filter.aggregate_function, idx, filter.aggregate_nodata, filter.aggregate_function, idx, idx)
-                    )'''
-                    # This accept only numeric results
-                    aggrCols.append("COALESCE(%s(dt.c%s_v),'%s') as c%s_v\n" %(filter.aggregate_function,idx,filter.aggregate_nodata,idx))
-                    if self.qualityIndex==True:
-                        #raise sosException.SOSException(3,"QI: %s"%(self.qualityIndex))
-                        aggrCols.append("COALESCE(MIN(dt.c%s_qi),%s) as c%s_qi\n" %( idx, filter.aggregate_nodata_qi, idx ))
-                    aggrNotNull.append(" c%s_v > -900 " %(idx))
-                
-                # Set SQL JOINS
-                #---------------
-                join_txt  = " left join (\n"
-                join_txt += " SELECT distinct A%s.id_msr, A%s.val_msr, A%s.id_eti_fk\n" %(idx,idx,idx)
-
-                if self.qualityIndex==True:
-                    join_txt += ",A%s.id_qi_fk\n" %(idx)
-                join_txt += "   FROM %s.measures A%s, %s.event_time B%s\n" %(filter.sosConfig.schema,idx,filter.sosConfig.schema,idx)
-                join_txt += " WHERE A%s.id_eti_fk = B%s.id_eti\n" %(idx,idx)
-                join_txt += " AND A%s.id_pro_fk=%s\n" %(idx,obspr_row["id_pro"])
-                join_txt += " AND B%s.id_prc_fk=%s\n" %(idx,o["id_prc"])
-                
-                # if qualityIndex has filter
-                #------------------------------
-                #if filter.qualityIndex and filter.qualityIndex.__class__.__name__=='str':
-                #    join_txt += " AND %s\n" %(filter.qualityIndex)
-
-                # ATTETION: HERE -999 VALUES ARE EXCLUDED WHEN ASKING AN AGGREAGATE FUNCTION
-                if filter.aggregate_interval != None:
-                    join_txt += " AND A%s.val_msr > -900 " % idx
-                
-                # If eventTime is set add to JOIN part
-                #--------------------------------------
-                if filter.eventTime:
-                    join_txt += " AND ("
-                    etf=[]
-                    for ft in filter.eventTime:
-                        if len(ft)==2:
-                            etf.append("B%s.time_eti > timestamptz '%s' AND B%s.time_eti <= timestamptz '%s' \n" %(idx,ft[0],idx,ft[1]))
-                        elif len(ft)==1:
-                            etf.append("B%s.time_eti = timestamptz '%s' \n" %(idx,ft[0]))
-                        else:
-                            raise Exception("error in time filter")
-                    join_txt += " OR ".join(etf)
-                    join_txt +=  ")\n"
-                else:
-                    join_txt += " AND B%s.time_eti = (SELECT max(time_eti) FROM %s.event_time WHERE id_prc_fk=%s) \n" %(idx,filter.sosConfig.schema,o["id_prc"])
-                
-                # close SQL JOINS
-                #-----------------
-                join_txt += " ) as C%s\n" %(idx)
-                join_txt += " on C%s.id_eti_fk = et.id_eti" %(idx)
-                joinar.append(join_txt)
-            
-            
-            #If MOBILE PROCEDURE
-            #--------------------
-            if self.procedureType=="insitu-mobile-point":
-                join_txt  = " left join (\n"
-                join_txt += " SELECT distinct Ax.id_pos, X(ST_Transform(Ax.geom_pos,%s)) as x,Y(ST_Transform(Ax.geom_pos,%s)) as y,Z(ST_Transform(Ax.geom_pos,%s)) as z, Ax.id_eti_fk\n" %(filter.srsName,filter.srsName,filter.srsName)
-                if self.qualityIndex==True:
-                    join_txt += ", Ax.id_qi_fk as posqi\n"
-                join_txt += "   FROM %s.positions Ax, %s.event_time Bx\n" %(filter.sosConfig.schema,filter.sosConfig.schema)
-                join_txt += " WHERE Ax.id_eti_fk = Bx.id_eti"
-                join_txt += " AND Bx.id_prc_fk=%s" %(o["id_prc"])
-                
-                if filter.eventTime:
-                    join_txt += " AND ("
-                    etf=[]
-                    for ft in filter.eventTime:
-                        if len(ft)==2:
-                            etf.append("Bx.time_eti > timestamptz '%s' AND Bx.time_eti <= timestamptz '%s' " %(ft[0],ft[1]))
-                        elif len(ft)==1:
-                            etf.append("Bx.time_eti = timestamptz '%s' " %(ft[0]))                       
-                        else:
-                            raise Exception("error in time filter")
-                    join_txt += " OR ".join(etf)
-                    join_txt +=  ")\n"
-                else:
-                    join_txt += " AND Bx.time_eti = (SELECT max(time_eti) FROM %s.event_time WHERE id_prc_fk=%s) " %(filter.sosConfig.schema,o["id_prc"])
-                
-                join_txt += " ) as Cx on Cx.id_eti_fk = et.id_eti\n"
-                sqlSel += " Cx.x as x, Cx.y as y, Cx.z as z, "
-                if self.qualityIndex==True:
-                    sqlSel += "Cx.posqi, "
-                joinar.append(join_txt)
-            
-            
-            # Set FROM CLAUSE
-            #-----------------    
-            sqlSel += ", ".join(cols)
-            sqlSel += " FROM %s.event_time et\n" %(filter.sosConfig.schema)
-
-            #====================            
-            # Set WHERE CLAUSES
-            #====================
-            sqlData = " ".join(joinar)
-            sqlData += " WHERE et.id_prc_fk=%s\n" %(o["id_prc"]) 
-
-            # Set FILTER ON RESULT (OGC:COMPARISON) -
-            #----------------------------------------
-            if filter.result:
-                for ind, ov in enumerate(self.observedProperty):
-                    if ov.find(filter.result[0])>0:
-                        sqlData += " AND C%s.val_msr %s" %(ind,filter.result[1])
-                #sqlData += " AND C%s.val_msr %s" %(self.observedProperty.index(filter.result[0]),filter.result[1])
-                
-            # Set FILTER ON EVENT-TIME -
-            #---------------------------
-            if filter.eventTime:
-                sqlData += " AND ("
-                etf=[]
-                for ft in filter.eventTime:
-                    if len(ft)==2:
-                        etf.append("et.time_eti > timestamptz '%s' AND et.time_eti <= timestamptz '%s' " %(ft[0],ft[1]))
-                    elif len(ft)==1:
-                        etf.append("et.time_eti = timestamptz '%s' " %(ft[0]))                        
-                    else:
-                        raise Exception("error in time filter")
-                sqlData += " OR ".join(etf)
-                sqlData +=  ")"
-            else:
-                sqlData += " AND et.time_eti = (SELECT max(time_eti) FROM %s.event_time WHERE id_prc_fk=%s) " %(filter.sosConfig.schema,o["id_prc"])
-
-            sqlData += " ORDER by et.time_eti"
-
-            sql = sqlSel+sqlData
-            
-            #
-            if filter.aggregate_interval != None:
-                self.aggregate_function = filter.aggregate_function.upper()
-                '''
-                for i in range(0,len(self.observedProperty)):
-                    self.observedProperty[i] = "%s:%s" % (self.observedProperty[i], filter.aggregate_function)
-
-                for ob in self.observedProperty:
-                    ob = "%s:%s" % (ob, filter.aggregate_function)'''
-                
-                # Interval preparation
-                # Converting ISO 8601 duration
-                isoInt = iso.parse_duration(filter.aggregate_interval)
-                sqlInt = ""
-
-                if isinstance(isoInt, timedelta):
-                
-                    if isoInt.days>0:
-                        sqlInt += "%s days " % isoInt.days
-                    if isoInt.seconds>0:
-                        sqlInt += "%s seconds " % isoInt.seconds
-                        
-                elif isinstance(isoInt, iso.Duration): 
-                    if isoInt.years>0:
-                        sqlInt += "%s years " % isoInt.years
-                    if isoInt.months>0:
-                        isoInt.months = int(isoInt.months)
-                        sqlInt += "%s months " % isoInt.months
-                    if isoInt.days>0:
-                        sqlInt += "%s days " % isoInt.days
-                    if isoInt.seconds>0:
-                        sqlInt += "%s seconds " % isoInt.seconds
-
-                
-                # @todo improve this part
-                # calculate how many step are included in the asked interval.
-                hopBefore = 1
-                hop = 0
-                tmpStart = iso.parse_datetime(filter.eventTime[0][0])
-                tmpEnd = self.samplingTime[1]
-                
-                while (tmpStart+isoInt)<=tmpEnd and (tmpStart+isoInt)<=iso.parse_datetime(filter.eventTime[0][1]):
-                    
-                    if   tmpStart <  self.samplingTime[0]:
-                        hopBefore+=1
-                        hop+=1
-
-                    elif (tmpStart >= self.samplingTime[0]) and ((tmpStart+isoInt)<=self.samplingTime[1]):
-                        hop+=1
-                        
-                    tmpStart=tmpStart+isoInt
-
-                aggregationSQL = "SELECT ts.sint  as t, %s\n"
-                aggregationSQL += "FROM\n"
-                aggregationSQL += "    (\n" # Generating time series here
-                aggregationSQL += "        select\n"
-                aggregationSQL += "        (('%s'::TIMESTAMP WITH TIME ZONE)  \n"
-                aggregationSQL += "            + s.a * '%s'::interval)::TIMESTAMP WITH TIME ZONE as sint\n"
-                aggregationSQL += "        from generate_series(%s, %s) as s(a)\n"
-                aggregationSQL += "    ) as ts LEFT JOIN ( \n\n"
-                aggregationSQL += "    %s \n\n"
-                aggregationSQL += "    ) as dt\n"
-                aggregationSQL += "    ON (\n"
-                aggregationSQL += "        dt.t > (ts.sint-'%s'::interval)\n"
-                aggregationSQL += "        AND\n"
-                aggregationSQL += "        dt.t <= (ts.sint) \n"
-                aggregationSQL += "    )\n"
-                aggregationSQL += "    GROUP BY ts.sint\n"
-                aggregationSQL += "    ORDER BY ts.sint"
-                sql = aggregationSQL % (", ".join(aggrCols), filter.eventTime[0][0], sqlInt, hopBefore, hop, sql, sqlInt)
-                
-            else:
-                self.aggregate_function = None
-                
-            #--------- debug execute query --------
-            #raise sosException.SOSException(3,sql)
-            #--------------------------------------
-            
-            try:
-                data_res = pgdb.select(sql)
-            except:
-                raise Exception("SQL: %s"%(sql))
-            
-
-            #------------------------------------            
-            #--------- APPEND DATA IN ARRAY -----
-            #------------------------------------            
-            #append data
-            for line in data_res:
-                if self.procedureType=="insitu-fixed-point":
-                    data_array = [line["t"]]
-                elif self.procedureType=="insitu-mobile-point":
-                    if self.qualityIndex==True:
-                        data_array = [line["t"],line["x"],line["y"],line["z"],line["posqi"]]
-                    else:
-                        data_array = [line["t"],line["x"],line["y"],line["z"]]
-                data_array.extend([line[field] for field in valeFieldName])
-                self.data.append(data_array)
-            
-        #-----------------------------------------                
-        #CASE "virtual"
-        #-----------------------------------------       
-        elif self.procedureType in ["virtual"]:
-            
-            
-            self.aggregate_function = filter.aggregate_function
-            self.aggregate_interval = filter.aggregate_interval
-            self.aggregate_nodata = filter.aggregate_nodata
-            self.aggregate_nodata_qi = filter.aggregate_nodata_qi
-                        
-            vpFolder = os.path.join(os.path.join(filter.sosConfig.virtual_processes_folder,self.name))
-            
-            if not os.path.isfile("%s/%s.py" % (vpFolder,self.name)):
-                raise Exception("Virtual procedure folder does not contain any Virtual Procedure code for %s" % self.name)
-                
-            #----- VIRTUAL PROCESS LOADING -----
-            try:
-                sys.path.append(vpFolder)
-            except:
-                raise Exception("error in loading virtual procedure path")
-            #import procedure process
-            exec "import %s as vproc" %(self.name)
-            
-            # Initialization of virtual procedure will load the source data
-            vp = vproc.istvp()
-            vp._configure(filter, pgdb)
-            # Calculate virtual procedure data
-            vp.calculateObservations(self)
-                
-                
-class observations:
-    def __init__(self,filter,pgdb):
-        self.offInfo = offInfo(filter.offering,pgdb,filter.sosConfig)
-        self.refsys = filter.sosConfig.urn["refsystem"] + filter.srsName
-        self.filter = filter
-        
-        #CHECK FILTER VALIDITY
-        #=========================================
-        """        
-        off_list = BuildOfferingList(pgdb,filter.sosConfig)
-        if not filter.offering in off_list:
-            raise sosException.SOSException("InvalidParameterValue","offering","Parameter \"offering\" sent with invalid value: %s -  available options for offering are %s" %(filter.offering,off_list))
-        """    
-        if filter.procedure:
-            pl = BuildProcedureList(pgdb,filter.offering,filter.sosConfig)
-            for p in filter.procedure:
-                if not p in pl:
-                    raise sosException.SOSException("InvalidParameterValue","procedure","Parameter \"procedure\" sent with invalid value: %s -  available options for offering \"%s\": %s"%(p,filter.offering,pl))
-        
-        if filter.featureOfInterest:
-            fl = BuildfeatureOfInterestList(pgdb,filter.offering,filter.sosConfig)
-            if not filter.featureOfInterest in fl:
-                raise sosException.SOSException("InvalidParameterValue","featureOfInterest","Parameter \"featureOfInterest\" sent with invalid value: %s - available options: %s"%(filter.featureOfInterest,fl))
-        
-        if filter.observedProperty:
-            opl = BuildobservedPropertyList(pgdb, filter.offering,filter.sosConfig)
-            opr_sel = "SELECT def_opr FROM %s.observed_properties WHERE " %(filter.sosConfig.schema,)
-            opr_sel_w = []
-            for op in filter.observedProperty:
-                opr_sel_w += ["def_opr SIMILAR TO '%%(:|)%s(:|)%%'" %(op)]
-            opr_sel = opr_sel + " OR ".join(opr_sel_w)
-            try:
-                opr_filtered = pgdb.select(opr_sel)
-            except:
-                raise Exception("SQL: %s"%(opr_sel))
-            if not len(opr_filtered)>0:
-                raise sosException.SOSException("InvalidParameterValue","observedProperty","Parameter \"observedProperty\" sent with invalid value: %s - available options: %s"%(filter.observedProperty,opl))
-        
-        #SET TIME PERIOD
-        #=========================================
-        tp=[]
-        if filter.eventTime == None:
-            tp = [None,None]
-        else:
-            for t in filter.eventTime:
-                if len(t) == 2:
-                    tp.append(iso.parse_datetime(t[0]))
-                    tp.append(iso.parse_datetime(t[1]))
-                if len(t)==1:
-                    tp.append(iso.parse_datetime(t[0]))
-                #else: rise error ???
-        self.period = [min(tp),max(tp)]
-        
-        self.obs=[]
-        
-        # SET REQUEST TIMEZONE
-        #===================================
-        if filter.eventTime:
-            if iso.parse_datetime(filter.eventTime[0][0]).tzinfo:
-                self.reqTZ = iso.parse_datetime(filter.eventTime[0][0]).tzinfo
-                pgdb.setTimeTZ(iso.parse_datetime(filter.eventTime[0][0]))
-            else:
-                self.reqTZ = pytz.utc
-                pgdb.setTimeTZ("UTC")
-        else:
-            self.reqTZ = pytz.utc
-            pgdb.setTimeTZ("UTC")
-            
-        
-        
-        #BUILD PROCEDURES LIST
-        #=========================================
-        #---select part of query
-        sqlSel = "SELECT DISTINCT"
-        sqlSel += " id_prc, name_prc, name_oty, stime_prc, etime_prc, time_res_prc, name_tru"
-        #---from part of query
-        sqlFrom = "FROM %s.procedures, %s.proc_obs p, %s.observed_properties, %s.uoms, %s.time_res_unit," %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        sqlFrom += " %s.off_proc o, %s.offerings, %s.obs_type" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        if filter.featureOfInterest or filter.featureOfInterestSpatial:
-            sqlFrom += " ,%s.foi, %s.feature_type" %(filter.sosConfig.schema,filter.sosConfig.schema)
-        
-        sqlWhere = "WHERE id_prc=p.id_prc_fk AND id_opr_fk=id_opr AND o.id_prc_fk=id_prc AND id_off_fk=id_off AND id_uom=id_uom_fk AND id_tru=id_tru_fk AND id_oty=id_oty_fk"
-        sqlWhere += " AND name_off='%s'" %(filter.offering) 
-        
-        #---where condition based on featureOfInterest
-        if filter.featureOfInterest:
-            #sqlWhere += " AND id_foi=id_foi_fk AND id_fty=id_fty_fk AND (name_foi='%s')" %(filter.featureOfInterest)
-            sqlWhere += " AND id_foi=id_foi_fk AND id_fty=id_fty_fk AND (name_foi IN (%s))" %(",".join( [ "'"+f+"'" for f in filter.featureOfInterest.split(",")]))
-        if filter.featureOfInterestSpatial:
-            sqlWhere += " AND id_foi_fk=id_foi AND %s" %(filter.featureOfInterestSpatial)
-        
-        #---where condition based on procedures
-        if filter.procedure:
-            sqlWhere += " AND ("
-            procWhere = []
-            for proc in filter.procedure:
-                procWhere.append("name_prc='%s'" %(proc))
-            sqlWhere += " OR ".join(procWhere)
-            sqlWhere += ")"
-        
-        #---where condition based on observed properties
-        sqlWhere += " AND ("
-        obsprWhere = []
-        for obs in opr_filtered:
-            obsprWhere.append("def_opr='%s'" %(obs["def_opr"])) 
-        sqlWhere += " OR ".join(obsprWhere)
-        sqlWhere += ")"
-        
-        try:
-            res = pgdb.select(sqlSel + " " + sqlFrom + " " + sqlWhere)
-        except:
-            raise Exception("SQL: %s"%(sqlSel + " " + sqlFrom + " " + sqlWhere))
-        
-        #FOR EACH PROCEDURE
-        #=========================================
-        for o in res:
-            #id_prc, name_prc, name_oty, stime_prc, etime_prc, time_res_prc, name_tru
-            
-            #CRETE OBSERVATION OBJECT
-            #=================================================
-            ob = Observation()
-            
-            #BUILD BASE INFOS FOR EACH PROCEDURE (Pi)
-            #=================================================
-            ob.baseInfo(pgdb,o,filter.sosConfig)
-            
-            #GET DATA FROM PROCEDURE ACCORDING TO THE FILTERS
-            #=================================================
-            ob.setData(pgdb,o,filter)
-            
-            #ADD OBSERVATIONS
-            #=================================================
-            self.obs.append(ob)
-            
-            
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import os, sys
+
+#import sosConfig
+#from istsoslib import sosDatabase
+from istsoslib import sosException
+#import mx.DateTime.ISO
+from datetime import timedelta
+import copy
+#from datetime import datetime
+from lib import isodate as iso
+from lib import pytz
+
+class VirtualProcess():
+    
+    procedures = {}
+    samplingTime = (None,None)
+    
+    def _configure(self, filterRequest, pgdb):
+        self.filter = copy.deepcopy(filterRequest)
+        self.pgdb = pgdb
+        
+    def addProcedure(self, name, observedProperty):
+        """
+        name: String
+        observedProperty: String or Array of String
+        """
+        self.procedures[name] = observedProperty
+        
+    def execute(self):
+        "This method must be overridden to implement data gathering for this virtual procedure"
+        raise Exception("function execute must be overridden")
+    
+    def calculateObservations(self, observation):
+        self.observation = observation
+        self.observation.samplingTime = self.getSampligTime()
+        self.observation.data = self.execute()
+        if self.filter.aggregate_interval != None:
+            self.applyFunction()
+    
+    def getSampligTime(self):
+        self.setSampligTime()
+        return self.samplingTime
+        
+    def setSampligTime(self):
+        """
+        This method can be overridden to set the virtual procedure sampling time
+        *************************************************************************
+        By default This method calculate the sampling time of a virtual procedure 
+        giving the procedure name from witch the data are derived 
+        as single string or array of strings.
+        
+        If derivation procedures are more than one it will return the minimum 
+        begin position and the maximum end position among all the procedures 
+        name given.
+        
+        It supports also SamplingTime calculation from cascading Virtual Procedures.
+        """
+                
+        if len(self.procedures)==0:
+            self.samplingTime = (None,None)
+        else:
+            
+            # Identify if procedures are virtual
+            
+            tmp = self.procedures.keys()
+            procedures = []
+            
+            # Handle cascading virtual procedures
+            for p in tmp:
+                
+                sql = """
+                    SELECT name_oty 
+                    FROM %s.obs_type, %s.procedures 
+                    WHERE id_oty=id_oty_fk""" % ((self.filter.sosConfig.schema,)*2)
+                sql += " AND name_prc = %s"
+                
+                result = self.pgdb.select(sql, (p,))
+                    
+                if len(result)==0:
+                    raise sosException.SOSException("InvalidParameterValue","procedure","Virtual Procedure Error: procedure %s not found in the database" % (p))
+                
+                result = result[0]
+                
+                if result[0] == 'virtual':
+                    vpFolder = os.path.join(self.filter.sosConfig.virtual_processes_folder,p)
+                    try:
+                        if vpFolder not in sys.path:
+                            sys.path.append(vpFolder)
+                    except Exception as e:
+                        raise Exception("error in loading virtual procedure path (%s):\n%s" % (vpFolder,e))
+                        
+                    # check if python file exist
+                    if os.path.isfile("%s/%s.py" % (vpFolder,p)):
+                        exec "import %s as vproc" %(p)
+                        vp = vproc.istvp()
+                        if len(vp.procedures)>0:
+                            tmp.extend(vp.procedures.keys())
+                        
+                else:
+                    procedures.append(p)
+            
+            # removing duplicates
+            procedures = list(set(procedures))
+                
+            if len(procedures)>1: 
+                sql = """ 
+                    SELECT min(stime_prc), max(etime_prc)
+                    FROM %s.procedures 
+                    WHERE (stime_prc IS NOT NULL
+                    AND etime_prc IS NOT NULL)
+                    AND (
+                """ % self.filter.sosConfig.schema
+                sql += " OR ".join(["name_prc=%s"] * len(procedures))
+                sql += ") GROUP BY stime_prc, etime_prc"
+                param = tuple(procedures)
+            else:
+                sql = """ 
+                    SELECT stime_prc, etime_prc
+                    FROM %s.procedures 
+                    WHERE (stime_prc IS NOT NULL
+                    AND etime_prc IS NOT NULL)
+                """ % self.filter.sosConfig.schema
+                sql += "AND name_prc=%s"
+                param = (procedures[0],)
+                
+            try:
+                result = self.pgdb.select(sql, param)
+                if len(result)==0:
+                    raise Exception("Virtual Procedure Error: procedure %s not found in the database" % (", ".join(param)) )
+                result = result[0]
+            except Exception as e:
+                raise Exception("Database error: %s - %s" % (sql, e))    
+                
+            self.samplingTime = (result[0],result[1])
+        
+    def getData(self, procedure=None, disableAggregation=False):
+        """
+        procedure: String
+        """
+        
+        # Validating:
+        # If procedure is None, it is supposed that only one procedure has been added
+        if procedure is None:
+            if len(self.procedures)==0:
+                raise Exception("Virtual Procedure Error: no procedures added")    
+            procedure = self.procedures.keys()[0]
+            
+        elif procedure not in self.procedures.keys():
+            raise Exception("Virtual Procedure Error: procedure %s has not been added to this virtual procedure" % procedure)    
+        
+        virtualFilter = copy.deepcopy(self.filter)
+        virtualFilter.procedure = [procedure]
+        virtualFilter.observedProperty = self.procedures[procedure]
+        
+        sql = """
+            SELECT DISTINCT id_prc, name_prc, name_oty, 
+                stime_prc, etime_prc, time_res_prc
+            FROM 
+                %s.procedures, 
+                %s.proc_obs p, 
+                %s.observed_properties, 
+                %s.uoms, 
+                %s.obs_type """ % ((self.filter.sosConfig.schema,)*5 )
+        sql += """
+                WHERE id_prc = p.id_prc_fk 
+                AND id_opr_fk = id_opr 
+                AND id_uom = id_uom_fk 
+                AND id_oty = id_oty_fk
+                AND name_prc=%s"""
+        
+        try:
+            result = self.pgdb.select(sql, (procedure,))
+            if len(result)==0:
+                raise Exception("Virtual Procedure Error: procedure %s not found in the database" % procedure)
+            result = result[0]
+        except Exception as e:
+            raise Exception("Database error: %s - %s" % (sql, e))    
+        
+        obs = Observation()
+        
+        obs.baseInfo(self.pgdb, result, virtualFilter.sosConfig)
+        obs.setData(self.pgdb, result, virtualFilter)
+        
+        return obs.data
+    
+    def applyFunction(self):
+        try:
+            # Create array container
+            begin = iso.parse_datetime(self.filter.eventTime[0][0])
+            end = iso.parse_datetime(self.filter.eventTime[0][1])
+            duration = iso.parse_duration(self.filter.aggregate_interval)
+            result = {}
+            dt = begin
+            fields = len(self.observation.observedProperty)# + 1 # +1 timestamp field not mentioned in the observedProperty array
+            
+            while dt < end:
+                dt2 = dt + duration
+                result[dt2]=[]
+                for c in range(fields):
+                    result[dt2].append([])
+                
+                d = 0
+                data = copy.copy(self.observation.data)
+                while len(data) > 0:
+                    tmp = data.pop(d)
+                    if dt < tmp[0] and tmp[0] <= dt2:
+                        self.observation.data.pop(d)
+                        for c in range(fields):
+                            result[dt2][c].append(float(tmp[c+1]))
+                    elif dt > tmp[0]:
+                        self.observation.data.pop(d)
+                    elif dt2 < tmp[0]:
+                        break
+                        
+                dt = dt2
+                
+            data = []
+            
+            for r in sorted(result):
+                record = [r]
+                for v in range(len(result[r])):
+                    if self.observation.observedProperty[v].split(":")[-1]=="qualityIndex":
+                        if len(result[r][v])==0:
+                            record.append(self.filter.aggregate_nodata_qi)
+                        else:
+                            record.append(int(min(result[r][v])))
+                    else:
+                        val = None
+                        if len(result[r][v])==0:
+                            val = self.filter.aggregate_nodata
+                        elif self.filter.aggregate_function.upper() == 'SUM':
+                            val = sum(result[r][v])
+                        elif self.filter.aggregate_function.upper() == 'MAX':
+                            val = max(result[r][v])
+                        elif self.filter.aggregate_function.upper() == 'MIN':
+                            val = min(result[r][v])
+                        elif self.filter.aggregate_function.upper() == 'AVG':
+                            val = round(sum(result[r][v])/len(result[r][v]),4)
+                        elif self.filter.aggregate_function.upper() == 'COUNT':
+                            val = len(result[r][v])
+                        record.append(val)
+                data.append(record)
+                    
+            self.observation.data = data
+            
+        except Exception as e:
+            raise Exception("Error while applying aggregate function on virtual procedures: %s" % (e))
+        
+
+class VirtualProcessHQ(VirtualProcess):
+    
+    def setDischargeCurves(self):
+        "method for setting h-q tranformation tables/curves"       
+        #set requested period
+        #================================================
+        hqFile = os.path.join(
+                        self.filter.sosConfig.virtual_processes_folder,
+                        self.filter.procedure[0],
+                        self.filter.procedure[0]+".rcv"
+                )
+        tp=[]
+        if self.filter.eventTime == None:
+            tp = [None,None]
+        else:
+            for t in self.filter.eventTime:
+                if len(t) == 2:
+                    if t[0].find('+')==-1:
+                        t[0] += "+00:00"
+                    if t[1].find('+')==-1:
+                        t[1] += "+00:00"    
+                    tp.append(iso.parse_datetime(t[0]))
+                    tp.append(iso.parse_datetime(t[1]))
+                if len(t)==1:
+                    if t[0].find('+')==-1:
+                        t[0] += "+00:00"
+                    tp.append(iso.parse_datetime(t[0]))
+        period = (min(tp),max(tp))
+        #get required parameters
+        #==================================================
+        try:        
+            hq_fh = open(hqFile,'r')
+        except Exception as e:
+            raise Exception("Unable to open hq rating curve file at: %s" % hqFile)
+        lines = hq_fh.readlines()
+        #read header
+        hqs = {'from':[],'to':[],'low':[],'up': [],'A':[],'B':[],'C':[],'K':[]}
+        head = lines[0].strip().split("|")
+        try:
+            fromt = head.index('from')  #from time
+            tot = head.index('to')      #to time
+            low = head.index('low_val') #if value is bigger than
+            up = head.index('up_val')   #and is lower than
+            A = head.index('A')         #use this A
+            B = head.index('B')         #use this B
+            C = head.index('C')         #use this C
+            K = head.index('K')         #use this K
+        except Exception as e:
+            raise Exception("setDischargeCurves: FILE %s ,%s error in header.\n %s" %(hqFile,head,e))
+        
+        #get equations
+        if not period[0] == None:
+            for l in range(1,len(lines)):
+                line = lines[l].split("|")
+                if iso.parse_datetime(line[1]) > period[0] or iso.parse_datetime(line[0]) <= period[1]:
+                    hqs['from'].append(iso.parse_datetime(line[fromt]))
+                    hqs['to'].append(iso.parse_datetime(line[tot]))
+                    hqs['low'].append(float(line[low]))
+                    hqs['up'].append(float(line[up]))
+                    hqs['A'].append(float(line[A]))
+                    hqs['B'].append(float(line[B]))
+                    hqs['C'].append(float(line[C]))
+                    hqs['K'].append(float(line[K]))
+        else:
+            for l in [-1,-2]:
+                try:
+                    line = lines[l].split("|")
+                    hqs['from'].append(iso.parse_datetime(line[fromt]))
+                    hqs['to'].append(iso.parse_datetime(line[tot]))
+                    hqs['low'].append(float(line[low]))
+                    hqs['up'].append(float(line[up]))
+                    hqs['A'].append(float(line[A]))
+                    hqs['B'].append(float(line[B]))
+                    hqs['C'].append(float(line[C]))
+                    hqs['K'].append(float(line[K]))
+                except:
+                    pass
+        #raise sosException.SOSException(3,"%s" %(hqs))
+        self.hqCurves = hqs
+        
+    def execute(self):
+        
+        self.setDischargeCurves()
+        data = self.getData()
+        
+        if self.filter.qualityIndex == True:
+            data_out=[]
+            for rec in data:
+                if rec[1] is None or (float(rec[1])) < -999.0:
+                    data_out.append([ rec[0], -999.9, 110 ])
+                else:
+                    for o in range(len(self.hqCurves['from'])):
+                        if (self.hqCurves['from'][o] < rec[0] <= self.hqCurves['to'][o]) and (self.hqCurves['low'][o] <= float(rec[1]) < self.hqCurves['up'][o]):
+                            if (float(rec[1])-self.hqCurves['B'][o]) >=0:
+                                data_out.append([ rec[0], "%.3f" %(self.hqCurves['K'][o] + self.hqCurves['A'][o]*((float(rec[1])-self.hqCurves['B'][o])**self.hqCurves['C'][o])), rec[2] ])
+                            else:
+                                #data not evaluable
+                                data_out.append([ rec[0], -999.9, 120 ])
+                            break
+                        if o == ( len(self.hqCurves['from']) -1):
+                            #data non in curves definition
+                            data_out.append([ rec[0], -999.9, 120 ])       
+        else:
+            data_out=[]
+            for rec in data:
+                for o in range(len(self.hqCurves['from'])):
+                    if (self.hqCurves['from'][o] < rec[0] <= self.hqCurves['to'][o]) and (self.hqCurves['low'][o] <= float(rec[1]) < self.hqCurves['up'][o]):
+                        if (float(rec[1])-self.hqCurves['B'][o]) >=0:
+                            data_out.append([ rec[0], "%.3f" %(self.hqCurves['K'][o] + self.hqCurves['A'][o]*((float(rec[1])-self.hqCurves['B'][o])**self.hqCurves['C'][o])) ])
+                        else:
+                            data_out.append([ rec[0],-999.9 ])
+                        break
+                    if o == (len(self.hqCurves['from'])-1):
+                        data_out.append([ rec[0], -999.9 ])
+                        
+        return data_out  
+        
+        
+#--this while is not
+#import TEST as Vproc        
+#----------------------------------
+
+def BuildobservedPropertyList(pgdb,offering,sosConfig):
+    list=[]
+    sql = "SELECT distinct(def_opr) as nopr FROM %s.procedures, %s.proc_obs p," %(sosConfig.schema,sosConfig.schema)
+    sql += " %s.observed_properties, %s.off_proc o, %s.offerings" %(sosConfig.schema,sosConfig.schema,sosConfig.schema)
+    sql += " WHERE id_opr_fk=id_opr AND p.id_prc_fk=id_prc AND o.id_prc_fk=id_prc AND id_off=id_off_fk"
+    sql += " AND name_off='%s' ORDER BY nopr" %(offering)
+    rows=pgdb.select(sql)
+    for row in rows:
+        list.append(row["nopr"])
+    return list
+
+def BuildfeatureOfInterestList(pgdb,offering,sosConfig):
+    list=[]
+    sql = "SELECT distinct(name_foi) as nfoi FROM %s.foi, %s.procedures " %(sosConfig.schema,sosConfig.schema)
+    sql += " , %s.off_proc, %s.offerings" %(sosConfig.schema,sosConfig.schema)
+    sql += " WHERE id_foi=id_foi_fk AND id_prc_fk=id_prc"
+    sql += " AND id_off=id_off_fk AND name_off='%s' ORDER BY nfoi"  %(offering)
+  
+    try:
+        rows=pgdb.select(sql)
+    except:
+        raise Exception("sql: %s" %(sql))
+    for row in rows:
+        list.append(row["nfoi"])
+    return list
+    
+def BuildProcedureList(pgdb,offering,sosConfig):
+    list=[]
+    sql = "SELECT name_prc FROM %s.procedures, %s.off_proc, %s.offerings"  %(sosConfig.schema,sosConfig.schema,sosConfig.schema)
+    sql += " WHERE id_prc=id_prc_fk AND id_off=id_off_fk AND name_off='%s'" %(offering)
+    sql += " ORDER BY name_prc"
+    rows=pgdb.select(sql)
+    for row in rows:
+        list.append(row["name_prc"])    
+    return list
+
+def BuildOfferingList(pgdb,sosConfig):
+    list=[]
+    sql = "SELECT distinct(name_off) FROM %s.offerings" %(sosConfig.schema,)
+    rows=pgdb.select(sql)
+    for row in rows:
+        list.append(row["name_off"])
+    return list
+
+'''
+def buildQuery(parameters):
+    """Documentation"""
+
+'''
+
+                
+'''
+filter.eventTime
+filter.aggregate_function
+filter.aggregate_interval
+filter.aggregate_nodata
+filter.aggregate_nodata_qi
+'''
+
+def applyFunction(ob, filter):
+    import copy
+    try:
+        # Create array container
+        begin = iso.parse_datetime(filter.eventTime[0][0])
+        end = iso.parse_datetime(filter.eventTime[0][1])
+        duration = iso.parse_duration(filter.aggregate_interval)
+        result = {}        
+        dt = begin
+        fields = len(ob.observedProperty)# + 1 # +1 timestamp field not mentioned in the observedProperty array
+        
+        while dt < end:
+            dt2 = dt + duration
+            result[dt2]=[]
+            for c in range(fields):
+                result[dt2].append([])
+            
+            d = 0
+            data = copy.copy(ob.data)
+            while len(data) > 0:
+                tmp = data.pop(d)
+                if dt < tmp[0] and tmp[0] <= dt2:
+                    ob.data.pop(d)
+                    for c in range(fields):
+                        result[dt2][c].append(float(tmp[c+1]))
+                elif dt > tmp[0]:
+                    ob.data.pop(d)
+                elif dt2 < tmp[0]:
+                    break
+                    
+            dt = dt2
+            
+        data = []
+        
+        for r in sorted(result):
+            record = [r]
+            for v in range(len(result[r])):
+                if ob.observedProperty[v].split(":")[-1]=="qualityIndex":
+                    if len(result[r][v])==0:
+                        record.append(filter.aggregate_nodata_qi)
+                    else:
+                        record.append(int(min(result[r][v])))
+                else:
+                    val = None
+                    if len(result[r][v])==0:
+                        val = filter.aggregate_nodata
+                    elif filter.aggregate_function.upper() == 'SUM':
+                        val = sum(result[r][v])
+                    elif filter.aggregate_function.upper() == 'MAX':
+                        val = max(result[r][v])
+                    elif filter.aggregate_function.upper() == 'MIN':
+                        val = min(result[r][v])
+                    elif filter.aggregate_function.upper() == 'AVG':
+                        val = round(sum(result[r][v])/len(result[r][v]),4)
+                    elif filter.aggregate_function.upper() == 'COUNT':
+                        val = len(result[r][v])
+                    record.append(val)
+            data.append(record)
+                
+        ob.data = data
+        
+    except Exception as e:
+        raise Exception("Error while applying aggregate function on virtual procedures: %s" % (e))
+    
+
+class offInfo:
+    def __init__(self,off_name,pgdb,sosConfig):
+        sql = "SELECT name_off, desc_off FROM %s.offerings WHERE name_off='%s'" %(sosConfig.schema,off_name)
+        try:
+            off = pgdb.select(sql)[0]
+            self.name=off["name_off"]
+            self.desc=off["desc_off"]
+        except:
+            raise sosException.SOSException("InvalidParameterValue","offering","Parameter \"offering\" sent with invalid value: %s"%(off_name))
+
+
+# @todo instantation with Builder pattern will be less confusing, observation class must be just a data container
+class Observation:
+
+    def __init__(self):
+        self.procedure=None
+        self.name = None
+        self.id_prc=None
+        self.procedureType=None
+        self.samplingTime=None
+        #self.reqTZ = None
+        self.refsys = None
+        self.timeResUnit=None
+        self.timeResVal=None
+        self.observedProperty=None
+        self.opr_urn=None
+        self.uom=None
+        self.featureOfInterest=None
+        self.foi_urn=None
+        self.foiGml = None
+        self.dataType=None
+        self.timedef = None
+        self.qualitydef = None
+        self.data=[]
+        
+    def baseInfo(self, pgdb, o, sosConfig):
+        #set base information of registered procedure
+        #=============================================
+        
+        k = o.keys()
+        if not ("id_prc" in k and "name_prc" in k and  "name_oty" in k and "stime_prc" in k and "etime_prc" in k and "time_res_prc" in k  ):
+            raise Exception("Error, baseInfo argument: %s"%(o))
+        
+        #SET PROCEDURE NAME AND ID
+        #===========================
+        self.id_prc=o["id_prc"]
+        self.name = o["name_prc"]
+        #self.procedure = sosConfig.urn["procedure"] + ":" + o["name_prc"]
+        self.procedure = sosConfig.urn["procedure"] + o["name_prc"]
+        
+        #SET PROCEDURE TYPE
+        #========================= --> ADD OTHER TYPES (IN CONFIG??)
+        if o["name_oty"].lower() in ["insitu-fixed-point","insitu-mobile-point","virtual"]:
+            self.procedureType=o["name_oty"]
+            #TO BE IMPLEMENTED FOR MORE OPTIONS
+        else:
+            raise Exception("error in procedure type setting")
+        
+        #SET TIME: RESOLUTION VALUE AND UNIT
+        #===================================
+        self.timeResVal = o["time_res_prc"]
+# Rimoved with tru table 
+        #self.timeResUnit = o["name_tru"]
+        
+        #SET SAMPLING TIME
+        #===================================
+        if o["stime_prc"]!=None and o["etime_prc"]!=None:
+            self.samplingTime=[o["stime_prc"],o["etime_prc"]]
+        else:
+            self.samplingTime = None
+        
+        self.dataType = sosConfig.urn["dataType"] + "timeSeries"
+        self.timedef = sosConfig.urn["parameter"] + "time:iso8601"
+        self.qualitydef = None
+        
+        
+    def setData(self,pgdb,o,filter):
+        """get data according to request filters"""
+        # @todo mettere da qualche altra parte
+            
+        #SET FOI OF PROCEDURE
+        #=========================================
+        sqlFoi  = "SELECT name_fty, name_foi, ST_AsGml(ST_Transform(geom_foi,%s)) as gml, st_x(geom_foi) as x, st_y(geom_foi) as y " %(filter.srsName)
+        sqlFoi += " FROM %s.procedures, %s.foi, %s.feature_type" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        sqlFoi += " WHERE id_foi_fk=id_foi AND id_fty_fk=id_fty AND id_prc=%s" %(o["id_prc"])
+        try:
+            resFoi = pgdb.select(sqlFoi)
+        except:
+            raise Exception("SQL: %s"%(sqlFoi))
+        
+        self.featureOfInterest = resFoi[0]["name_foi"]
+        self.foi_urn = filter.sosConfig.urn["feature"] + resFoi[0]["name_fty"] + ":" + resFoi[0]["name_foi"]
+        srs = filter.srsName or filter.sosConfig.istsosepsg
+        if resFoi[0]["gml"].find("srsName")<0:
+            self.foiGml = resFoi[0]["gml"][:resFoi[0]["gml"].find(">")] + " srsName=\"EPSG:%s\"" % srs + resFoi[0]["gml"][resFoi[0]["gml"].find(">"):]
+        else:
+            self.foiGml = resFoi[0]["gml"]
+        
+        self.srs = srs
+        self.x = resFoi[0]["x"]
+        self.y = resFoi[0]["y"]
+        
+        #SET INFORMATION ABOUT OBSERVED_PROPERTIES
+        #=========================================       
+        sqlObsPro = "SELECT id_pro, id_opr, name_opr, def_opr, name_uom FROM %s.observed_properties, %s.proc_obs, %s.uoms" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        sqlObsPro += " WHERE id_opr_fk=id_opr AND id_uom_fk=id_uom AND id_prc_fk=%s" %(o["id_prc"])
+        sqlObsPro += " AND ("
+        #sqlObsPro += " OR ".join(["def_opr='" + str(i) + "'" for i in filter.observedProperty])
+        sqlObsPro += " OR ".join(["def_opr SIMILAR TO '%(:|)" + str(i) + "(:|)%'" for i in filter.observedProperty])
+        sqlObsPro += " ) ORDER BY def_opr ASC"
+        try:
+            obspr_res = pgdb.select(sqlObsPro)
+        except:
+            raise Exception("SQL: %s"%(sqlObsPro))
+            
+        self.observedProperty = []
+        self.observedPropertyName = []
+        self.opr_urn = []
+        self.uom = []
+        self.qualityIndex = filter.qualityIndex
+        
+        for row in obspr_res:
+            self.observedProperty += [str(row["def_opr"])]
+            self.observedPropertyName +=[str(row["name_opr"])]
+            self.opr_urn += [str(row["def_opr"])]
+            try:
+                #self.uom += [str(row["name_uom"]).encode('utf-8')]
+                self.uom += [row["name_uom"]]
+            except:
+                self.uom += ["n/a"]
+            if self.qualityIndex==True:
+                self.observedProperty += [str(row["def_opr"])+":qualityIndex"]
+                self.observedPropertyName += [str(row["name_opr"])+":qualityIndex"]
+                self.opr_urn += [str(row["def_opr"] +":qualityIndex")]
+                self.uom += ["-"]
+        
+        #SET DATA
+        #=========================================getSampligTime
+        #CASE "insitu-fixed-point" or "insitu-mobile-point"
+        #-----------------------------------------
+        if self.procedureType in ["insitu-fixed-point","insitu-mobile-point"]:
+            sqlSel = "SELECT et.time_eti as t," 
+            joinar=[]
+            cols=[]
+
+            aggrCols=[]
+            aggrNotNull=[]
+
+            valeFieldName = []
+            for idx, obspr_row in enumerate(obspr_res):
+                if self.qualityIndex==True:
+                    #cols.append("C%s.val_msr as c%s_v, C%s.id_qi_fk as c%s_qi" %(idx,idx,idx,idx))
+                    cols.append("C%s.val_msr as c%s_v, COALESCE(C%s.id_qi_fk,%s) as c%s_qi" %(idx,idx,idx,filter.aggregate_nodata_qi,idx))
+                    valeFieldName.append("c%s_v" %(idx))
+                    valeFieldName.append("c%s_qi" %(idx))
+                else:
+                    cols.append("C%s.val_msr as c%s_v" %(idx,idx))
+                    valeFieldName.append("c%s_v" %(idx))
+
+                # If Aggregatation funtion is set
+                #---------------------------------
+                if filter.aggregate_interval != None:
+                    # This can be usefull with string values
+                    '''aggrCols.append("CASE WHEN %s(dt.c%s_v) is NULL THEN '%s' ELSE '' || %s(dt.c%s_v) END as c%s_v\n" % ( 
+                        filter.aggregate_function, idx, filter.aggregate_nodata, filter.aggregate_function, idx, idx)
+                    )'''
+                    # This accept only numeric results
+                    aggrCols.append("COALESCE(%s(dt.c%s_v),'%s') as c%s_v\n" %(filter.aggregate_function,idx,filter.aggregate_nodata,idx))
+                    if self.qualityIndex==True:
+                        #raise sosException.SOSException(3,"QI: %s"%(self.qualityIndex))
+                        aggrCols.append("COALESCE(MIN(dt.c%s_qi),%s) as c%s_qi\n" %( idx, filter.aggregate_nodata_qi, idx ))
+                    aggrNotNull.append(" c%s_v > -900 " %(idx))
+                
+                # Set SQL JOINS
+                #---------------
+                join_txt  = " left join (\n"
+                join_txt += " SELECT distinct A%s.id_msr, A%s.val_msr, A%s.id_eti_fk\n" %(idx,idx,idx)
+
+                if self.qualityIndex==True:
+                    join_txt += ",A%s.id_qi_fk\n" %(idx)
+                join_txt += "   FROM %s.measures A%s, %s.event_time B%s\n" %(filter.sosConfig.schema,idx,filter.sosConfig.schema,idx)
+                join_txt += " WHERE A%s.id_eti_fk = B%s.id_eti\n" %(idx,idx)
+                join_txt += " AND A%s.id_pro_fk=%s\n" %(idx,obspr_row["id_pro"])
+                join_txt += " AND B%s.id_prc_fk=%s\n" %(idx,o["id_prc"])
+                
+                # if qualityIndex has filter
+                #------------------------------
+                #if filter.qualityIndex and filter.qualityIndex.__class__.__name__=='str':
+                #    join_txt += " AND %s\n" %(filter.qualityIndex)
+
+                # ATTENTION: HERE -999 VALUES ARE EXCLUDED WHEN ASKING AN AGGREAGATE FUNCTION
+                if filter.aggregate_interval != None: # >> Should be removed because measures data is not inserted if there is a nodata value
+                    join_txt += " AND A%s.val_msr > -900 " % idx
+                
+                # If eventTime is set add to JOIN part
+                #--------------------------------------
+                if filter.eventTime:
+                    join_txt += " AND ("
+                    etf=[]
+                    for ft in filter.eventTime:
+                        if len(ft)==2:
+                            etf.append("B%s.time_eti > timestamptz '%s' AND B%s.time_eti <= timestamptz '%s' \n" %(idx,ft[0],idx,ft[1]))
+                        elif len(ft)==1:
+                            etf.append("B%s.time_eti = timestamptz '%s' \n" %(idx,ft[0]))
+                        else:
+                            raise Exception("error in time filter")
+                    join_txt += " OR ".join(etf)
+                    join_txt +=  ")\n"
+                else:
+                    join_txt += " AND B%s.time_eti = (SELECT max(time_eti) FROM %s.event_time WHERE id_prc_fk=%s) \n" %(idx,filter.sosConfig.schema,o["id_prc"])
+                
+                # close SQL JOINS
+                #-----------------
+                join_txt += " ) as C%s\n" %(idx)
+                join_txt += " on C%s.id_eti_fk = et.id_eti" %(idx)
+                joinar.append(join_txt)
+            
+            
+            #If MOBILE PROCEDURE
+            #--------------------
+            if self.procedureType=="insitu-mobile-point":
+                join_txt  = " left join (\n"
+                join_txt += " SELECT distinct Ax.id_pos, X(ST_Transform(Ax.geom_pos,%s)) as x,Y(ST_Transform(Ax.geom_pos,%s)) as y,Z(ST_Transform(Ax.geom_pos,%s)) as z, Ax.id_eti_fk\n" %(filter.srsName,filter.srsName,filter.srsName)
+                if self.qualityIndex==True:
+                    join_txt += ", Ax.id_qi_fk as posqi\n"
+                join_txt += "   FROM %s.positions Ax, %s.event_time Bx\n" %(filter.sosConfig.schema,filter.sosConfig.schema)
+                join_txt += " WHERE Ax.id_eti_fk = Bx.id_eti"
+                join_txt += " AND Bx.id_prc_fk=%s" %(o["id_prc"])
+                
+                if filter.eventTime:
+                    join_txt += " AND ("
+                    etf=[]
+                    for ft in filter.eventTime:
+                        if len(ft)==2:
+                            etf.append("Bx.time_eti > timestamptz '%s' AND Bx.time_eti <= timestamptz '%s' " %(ft[0],ft[1]))
+                        elif len(ft)==1:
+                            etf.append("Bx.time_eti = timestamptz '%s' " %(ft[0]))                       
+                        else:
+                            raise Exception("error in time filter")
+                    join_txt += " OR ".join(etf)
+                    join_txt +=  ")\n"
+                else:
+                    join_txt += " AND Bx.time_eti = (SELECT max(time_eti) FROM %s.event_time WHERE id_prc_fk=%s) " %(filter.sosConfig.schema,o["id_prc"])
+                
+                join_txt += " ) as Cx on Cx.id_eti_fk = et.id_eti\n"
+                sqlSel += " Cx.x as x, Cx.y as y, Cx.z as z, "
+                if self.qualityIndex==True:
+                    #sqlSel += "COALESCE(Cx.posqi,%s) as posqi, " % filter.aggregate_nodata_qi
+                    sqlSel += "Cx.posqi, "
+                joinar.append(join_txt)
+            
+            
+            # Set FROM CLAUSE
+            #-----------------    
+            sqlSel += ", ".join(cols)
+            sqlSel += " FROM %s.event_time et\n" %(filter.sosConfig.schema)
+
+            #====================            
+            # Set WHERE CLAUSES
+            #====================
+            sqlData = " ".join(joinar)
+            sqlData += " WHERE et.id_prc_fk=%s\n" %(o["id_prc"]) 
+
+            # Set FILTER ON RESULT (OGC:COMPARISON) -
+            #----------------------------------------
+            if filter.result:
+                for ind, ov in enumerate(self.observedProperty):
+                    if ov.find(filter.result[0])>0:
+                        sqlData += " AND C%s.val_msr %s" %(ind,filter.result[1])
+                #sqlData += " AND C%s.val_msr %s" %(self.observedProperty.index(filter.result[0]),filter.result[1])
+                
+            # Set FILTER ON EVENT-TIME -
+            #---------------------------
+            if filter.eventTime:
+                sqlData += " AND ("
+                etf=[]
+                for ft in filter.eventTime:
+                    if len(ft)==2:
+                        etf.append("et.time_eti > timestamptz '%s' AND et.time_eti <= timestamptz '%s' " %(ft[0],ft[1]))
+                    elif len(ft)==1:
+                        etf.append("et.time_eti = timestamptz '%s' " %(ft[0]))                        
+                    else:
+                        raise Exception("error in time filter")
+                sqlData += " OR ".join(etf)
+                sqlData +=  ")"
+            else:
+                sqlData += " AND et.time_eti = (SELECT max(time_eti) FROM %s.event_time WHERE id_prc_fk=%s) " %(filter.sosConfig.schema,o["id_prc"])
+
+            sqlData += " ORDER by et.time_eti"
+
+            sql = sqlSel+sqlData
+            
+            #
+            if filter.aggregate_interval != None:
+                self.aggregate_function = filter.aggregate_function.upper()
+                '''
+                for i in range(0,len(self.observedProperty)):
+                    self.observedProperty[i] = "%s:%s" % (self.observedProperty[i], filter.aggregate_function)
+
+                for ob in self.observedProperty:
+                    ob = "%s:%s" % (ob, filter.aggregate_function)'''
+                
+                # Interval preparation
+                # Converting ISO 8601 duration
+                isoInt = iso.parse_duration(filter.aggregate_interval)
+                sqlInt = ""
+
+                if isinstance(isoInt, timedelta):
+                
+                    if isoInt.days>0:
+                        sqlInt += "%s days " % isoInt.days
+                    if isoInt.seconds>0:
+                        sqlInt += "%s seconds " % isoInt.seconds
+                        
+                elif isinstance(isoInt, iso.Duration): 
+                    if isoInt.years>0:
+                        sqlInt += "%s years " % isoInt.years
+                    if isoInt.months>0:
+                        isoInt.months = int(isoInt.months)
+                        sqlInt += "%s months " % isoInt.months
+                    if isoInt.days>0:
+                        sqlInt += "%s days " % isoInt.days
+                    if isoInt.seconds>0:
+                        sqlInt += "%s seconds " % isoInt.seconds
+
+                
+                # @todo improve this part
+                # calculate how many step are included in the asked interval.
+                hopBefore = 1
+                hop = 0
+                tmpStart = iso.parse_datetime(filter.eventTime[0][0])
+                tmpEnd = self.samplingTime[1]
+                
+                while (tmpStart+isoInt)<=tmpEnd and (tmpStart+isoInt)<=iso.parse_datetime(filter.eventTime[0][1]):
+                    
+                    if   tmpStart <  self.samplingTime[0]:
+                        hopBefore+=1
+                        hop+=1
+
+                    elif (tmpStart >= self.samplingTime[0]) and ((tmpStart+isoInt)<=self.samplingTime[1]):
+                        hop+=1
+                        
+                    tmpStart=tmpStart+isoInt
+
+                aggregationSQL = "SELECT ts.sint  as t, %s\n"
+                aggregationSQL += "FROM\n"
+                aggregationSQL += "    (\n" # Generating time series here
+                aggregationSQL += "        select\n"
+                aggregationSQL += "        (('%s'::TIMESTAMP WITH TIME ZONE)  \n"
+                aggregationSQL += "            + s.a * '%s'::interval)::TIMESTAMP WITH TIME ZONE as sint\n"
+                aggregationSQL += "        from generate_series(%s, %s) as s(a)\n"
+                aggregationSQL += "    ) as ts LEFT JOIN ( \n\n"
+                aggregationSQL += "    %s \n\n"
+                aggregationSQL += "    ) as dt\n"
+                aggregationSQL += "    ON (\n"
+                aggregationSQL += "        dt.t > (ts.sint-'%s'::interval)\n"
+                aggregationSQL += "        AND\n"
+                aggregationSQL += "        dt.t <= (ts.sint) \n"
+                aggregationSQL += "    )\n"
+                aggregationSQL += "    GROUP BY ts.sint\n"
+                aggregationSQL += "    ORDER BY ts.sint"
+                sql = aggregationSQL % (", ".join(aggrCols), filter.eventTime[0][0], sqlInt, hopBefore, hop, sql, sqlInt)
+                
+            else:
+                self.aggregate_function = None
+                
+            #print sql.replace('\n','')
+            
+            try:
+                data_res = pgdb.select(sql)
+            except:
+                raise Exception("SQL: %s"%(sql))
+            
+
+            #------------------------------------            
+            #--------- APPEND DATA IN ARRAY -----
+            #------------------------------------            
+            #append data
+            for line in data_res:
+                if self.procedureType=="insitu-fixed-point":
+                    data_array = [line["t"]]
+                elif self.procedureType=="insitu-mobile-point":
+                    if self.qualityIndex==True:
+                        data_array = [line["t"],line["x"],line["y"],line["z"],line["posqi"]]
+                    else:
+                        data_array = [line["t"],line["x"],line["y"],line["z"]]
+                data_array.extend([line[field] for field in valeFieldName])
+                self.data.append(data_array)
+            
+        #-----------------------------------------                
+        #CASE "virtual"
+        #-----------------------------------------       
+        elif self.procedureType in ["virtual"]:
+            
+            
+            self.aggregate_function = filter.aggregate_function
+            self.aggregate_interval = filter.aggregate_interval
+            self.aggregate_nodata = filter.aggregate_nodata
+            self.aggregate_nodata_qi = filter.aggregate_nodata_qi
+                        
+            vpFolder = os.path.join(os.path.join(filter.sosConfig.virtual_processes_folder,self.name))
+            
+            if not os.path.isfile("%s/%s.py" % (vpFolder,self.name)):
+                raise Exception("Virtual procedure folder does not contain any Virtual Procedure code for %s" % self.name)
+                
+            #----- VIRTUAL PROCESS LOADING -----
+            try:
+                sys.path.append(vpFolder)
+            except:
+                raise Exception("error in loading virtual procedure path")
+            #import procedure process
+            exec "import %s as vproc" %(self.name)
+            
+            # Initialization of virtual procedure will load the source data
+            vp = vproc.istvp()
+            vp._configure(filter, pgdb)
+            # Calculate virtual procedure data
+            vp.calculateObservations(self)
+                
+                
+class observations:
+    def __init__(self,filter,pgdb):
+        self.offInfo = offInfo(filter.offering,pgdb,filter.sosConfig)
+        self.refsys = filter.sosConfig.urn["refsystem"] + filter.srsName
+        self.filter = filter
+        
+        #CHECK FILTER VALIDITY
+        #=========================================
+        """        
+        off_list = BuildOfferingList(pgdb,filter.sosConfig)
+        if not filter.offering in off_list:
+            raise sosException.SOSException("InvalidParameterValue","offering","Parameter \"offering\" sent with invalid value: %s -  available options for offering are %s" %(filter.offering,off_list))
+        """    
+        if filter.procedure:
+            pl = BuildProcedureList(pgdb,filter.offering,filter.sosConfig)
+            for p in filter.procedure:
+                if not p in pl:
+                    raise sosException.SOSException("InvalidParameterValue","procedure","Parameter \"procedure\" sent with invalid value: %s -  available options for offering \"%s\": %s"%(p,filter.offering,pl))
+        
+        if filter.featureOfInterest:
+            fl = BuildfeatureOfInterestList(pgdb,filter.offering,filter.sosConfig)
+            if not filter.featureOfInterest in fl:
+                raise sosException.SOSException("InvalidParameterValue","featureOfInterest","Parameter \"featureOfInterest\" sent with invalid value: %s - available options: %s"%(filter.featureOfInterest,fl))
+        
+        if filter.observedProperty:
+            opl = BuildobservedPropertyList(pgdb, filter.offering,filter.sosConfig)
+            opr_sel = "SELECT def_opr FROM %s.observed_properties WHERE " %(filter.sosConfig.schema,)
+            opr_sel_w = []
+            for op in filter.observedProperty:
+                opr_sel_w += ["def_opr SIMILAR TO '%%(:|)%s(:|)%%'" %(op)]
+            opr_sel = opr_sel + " OR ".join(opr_sel_w)
+            try:
+                opr_filtered = pgdb.select(opr_sel)
+            except:
+                raise Exception("SQL: %s"%(opr_sel))
+            if not len(opr_filtered)>0:
+                raise sosException.SOSException("InvalidParameterValue","observedProperty","Parameter \"observedProperty\" sent with invalid value: %s - available options: %s"%(filter.observedProperty,opl))
+        
+        #SET TIME PERIOD
+        #=========================================
+        tp=[]
+        if filter.eventTime == None:
+            tp = [None,None]
+        else:
+            for t in filter.eventTime:
+                if len(t) == 2:
+                    tp.append(iso.parse_datetime(t[0]))
+                    tp.append(iso.parse_datetime(t[1]))
+                if len(t)==1:
+                    tp.append(iso.parse_datetime(t[0]))
+                #else: rise error ???
+        self.period = [min(tp),max(tp)]
+        
+        self.obs=[]
+        
+        # SET REQUEST TIMEZONE
+        #===================================
+        if filter.eventTime:
+            if iso.parse_datetime(filter.eventTime[0][0]).tzinfo:
+                self.reqTZ = iso.parse_datetime(filter.eventTime[0][0]).tzinfo
+                pgdb.setTimeTZ(iso.parse_datetime(filter.eventTime[0][0]))
+            else:
+                self.reqTZ = pytz.utc
+                pgdb.setTimeTZ("UTC")
+        else:
+            self.reqTZ = pytz.utc
+            pgdb.setTimeTZ("UTC")
+            
+        
+        
+        #BUILD PROCEDURES LIST
+        #=========================================
+        #---select part of query
+        sqlSel = "SELECT DISTINCT"
+        sqlSel += " id_prc, name_prc, name_oty, stime_prc, etime_prc, time_res_prc"
+        #---from part of query
+#################################
+# Rimosso codice di time_res_unit
+#################################
+        sqlFrom = "FROM %s.procedures, %s.proc_obs p, %s.observed_properties, %s.uoms," %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        sqlFrom += " %s.off_proc o, %s.offerings, %s.obs_type" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        if filter.featureOfInterest or filter.featureOfInterestSpatial:
+            sqlFrom += " ,%s.foi, %s.feature_type" %(filter.sosConfig.schema,filter.sosConfig.schema)
+        
+        sqlWhere = "WHERE id_prc=p.id_prc_fk AND id_opr_fk=id_opr AND o.id_prc_fk=id_prc AND id_off_fk=id_off AND id_uom=id_uom_fk AND id_oty=id_oty_fk"
+        sqlWhere += " AND name_off='%s'" %(filter.offering) 
+        
+        #---where condition based on featureOfInterest
+        if filter.featureOfInterest:
+            #sqlWhere += " AND id_foi=id_foi_fk AND id_fty=id_fty_fk AND (name_foi='%s')" %(filter.featureOfInterest)
+            sqlWhere += " AND id_foi=id_foi_fk AND id_fty=id_fty_fk AND (name_foi IN (%s))" %(",".join( [ "'"+f+"'" for f in filter.featureOfInterest.split(",")]))
+        if filter.featureOfInterestSpatial:
+            sqlWhere += " AND id_foi_fk=id_foi AND %s" %(filter.featureOfInterestSpatial)
+        
+        #---where condition based on procedures
+        if filter.procedure:
+            sqlWhere += " AND ("
+            procWhere = []
+            for proc in filter.procedure:
+                procWhere.append("name_prc='%s'" %(proc))
+            sqlWhere += " OR ".join(procWhere)
+            sqlWhere += ")"
+        
+        #---where condition based on observed properties
+        sqlWhere += " AND ("
+        obsprWhere = []
+        for obs in opr_filtered:
+            obsprWhere.append("def_opr='%s'" %(obs["def_opr"])) 
+        sqlWhere += " OR ".join(obsprWhere)
+        sqlWhere += ")"
+        
+        try:
+            res = pgdb.select(sqlSel + " " + sqlFrom + " " + sqlWhere)
+        except:
+            raise Exception("SQL: %s"%(sqlSel + " " + sqlFrom + " " + sqlWhere))
+        
+        #FOR EACH PROCEDURE
+        #=========================================
+        for o in res:
+            #id_prc, name_prc, name_oty, stime_prc, etime_prc, time_res_prc, name_tru
+            
+            #CRETE OBSERVATION OBJECT
+            #=================================================
+            ob = Observation()
+            
+            #BUILD BASE INFOS FOR EACH PROCEDURE (Pi)
+            #=================================================
+            ob.baseInfo(pgdb,o,filter.sosConfig)
+            
+            #GET DATA FROM PROCEDURE ACCORDING TO THE FILTERS
+            #=================================================
+            ob.setData(pgdb,o,filter)
+            
+            #ADD OBSERVATIONS
+            #=================================================
+            self.obs.append(ob)
+            
+            
diff --git a/istsoslib/responders/GOresponse.pyc b/istsoslib/responders/GOresponse.pyc
index f252114..ff570b6 100644
Binary files a/istsoslib/responders/GOresponse.pyc and b/istsoslib/responders/GOresponse.pyc differ
diff --git a/istsoslib/responders/IOresponse.py b/istsoslib/responders/IOresponse.py
index 66cd1e2..8241d18 100755
--- a/istsoslib/responders/IOresponse.py
+++ b/istsoslib/responders/IOresponse.py
@@ -1,424 +1,429 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#import psycopg2 # @TODO the right library
-#import psycopg2.extras
-#import os
-import sys, pprint #for debug only
-
-#import sosConfig
-#from istsoslib import sosDatabase
-from istsoslib import sosException
-#import mx.DateTime.ISO
-from lib import isodate as iso
-
-from datetime import datetime
-
-import json
-
-now = datetime.now()
-
-class InsertObservationResponse:
-    #self.assignedObservationId
-    def __init__(self,filter,pgdb):
-                
-        #--get procedure information
-        #============================================
-        sql  = "SELECT id_prc, name_prc, name_oty, name_foi, stime_prc, etime_prc from %s.procedures,%s.obs_type,%s.foi" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        sql += " WHERE id_oty=id_oty_fk AND id_foi=id_foi_fk AND assignedid_prc=%s"
-        params = (filter.assignedSensorId,)
-        try:
-            prc = pgdb.select(sql,params)[0]
-        except:
-            raise sosException.SOSException("InvalidParameterValue","assignedSensorId","assignedSensorId '%s' is not valid!" %(filter.assignedSensorId))
-                
-        #--check requested procedure name exists
-        #=============================================
-        if not prc["name_prc"]==filter.procedure:
-            raise sosException.SOSException("NoApplicableCode",None,"procedure '%s' not associated with provided assignedSensorId!" %(filter.procedure))
-        
-        #--check requested  foi name exists
-        #=============================================
-        if not filter.foiName == prc["name_foi"]:
-            raise sosException.SOSException("NoApplicableCode",None,"featureOfInterest '%s' not associated with provided assignedSensorId" %(filter.foiName))
-        
-        #--check provided samplingTime and upadate 
-        #  begin/end time procedure if necessary  
-        # (samplingTime=period or istant of provided 
-        #  observations defined by samplingTime filter)
-        #=============================================
-        if filter.samplingTime:
-            stime = filter.samplingTime.split("/")
-            #
-            if len(stime)==2: # is a TimePeriod
-                start = iso.parse_datetime(stime[0])
-                end  = iso.parse_datetime(stime[1])
-            elif len(stime)==1: # is a TimeInstant
-                start = end = iso.parse_datetime(stime[0])
-            else:
-                raise Exception(" filter samplingTime error! given '%s'" %(filter.samplingTime))
-
-            if start>end:
-                raise Exception(" endPosition (%s) must be after beginPosition (%s)" %(end,start))
-            
-            #-- check samplingTime
-            #==========================================
-            # verify procedure begin/end exist
-            #-----------------------------------
-            if not (prc["stime_prc"].__class__.__name__ == "NoneType" and prc["etime_prc"].__class__.__name__ == "NoneType"):
-                
-                # check eventTime interval and update begin/end position when force flas is active
-                #----------------------------------------------------------------------------------
-                if filter.forceInsert:
-                    #-- verify interval limits
-                    '''if not (end>=prc["stime_prc"] and start<=prc["etime_prc"]):
-                        raise sosException.SOSException(3,"observation eventTime (%s-%s) must overlap procedure samplingTime (%s-%s)" %(start,end,prc["stime_prc"],prc["etime_prc"]))
-                    else:'''
-                    #-- update begin time of procedure
-                    if start<prc["stime_prc"]:
-                        sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
-                        sql += " SET stime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s" 
-                        params = (stime[0],prc["id_prc"])
-                        try:
-                            a = pgdb.executeInTransaction(sql,params)
-                            com=True
-                        except:
-                            raise Exception("SQL: %s" %(pgdb.mogrify(sql,params)))
-                    
-                    #-- update end time of procedure
-                    if end>prc["etime_prc"]:
-                        sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
-                        sql += " SET etime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s" 
-                        params = (stime[1],prc["id_prc"])
-                        try:
-                            b = pgdb.executeInTransaction(sql,params)
-                            com=True   
-                        except Exception as err:
-                            raise Exception("SQL: %s - %s" %(pgdb.mogrify(sql,params), err.pgerror))
-
-                # check eventTime interval and update begin/end position when force flag is off
-                #----------------------------------------------------------------------------------                            
-                else:
-                    sql  = "SELECT max(time_eti) as max_time_eti from %s.event_time" %(filter.sosConfig.schema)
-                    sql += " WHERE id_prc_fk = %s group by id_prc_fk" 
-                    params = (prc["id_prc"],)
-                    try:
-                        lastMsr = pgdb.select(sql,params)[0]["max_time_eti"]
-                    except:
-                        lastMsr = None
-                    
-                    if lastMsr!=None:
-                        #-- verify begin observation is minor/equal then end time procedure and later then last observation
-                        if not (end>=prc["etime_prc"] and start<=prc["etime_prc"] and start>=lastMsr):
-                            raise Exception("begin observation (%s) must be between last observation (%s) and end procedure (%s); end observation (%s) must be after end procedure (%s)" %(start,lastMsr,prc["etime_prc"],end,prc["etime_prc"]))
-                    else:
-                        #-- verify begin observation is minor/equal then end time procedure and later then first observation
-                        if not (end>=prc["etime_prc"] and start<=prc["etime_prc"] and start>=prc["stime_prc"]) :
-                            raise Exception("begin observation (%s) must be between start procedure (%s) and end procedure (%s); end observation (%s) must be after end procedure (%s)" %(start,prc["stime_prc"],prc["etime_prc"],end,prc["etime_prc"]))
-                        
-                    #-- update end time of procedure
-                    sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
-                    sql += " SET etime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s" 
-                    params = (str(stime[1]),int(prc["id_prc"]))
-                    try:
-                        b = pgdb.executeInTransaction(sql,params)
-                        com=True
-                    except Exception as err:
-                        raise Exception("SQL: %s - %s" %(pgdb.mogrify(sql,params), err.pgerror))
-            
-            else:
-                sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
-                sql += " SET stime_prc=%s::TIMESTAMPTZ, etime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s" 
-                params = (str(stime[0]),str(stime[1]),int(prc["id_prc"]))
-                try:
-                    b = pgdb.executeInTransaction(sql,params)
-                    com=True
-                except:
-                    raise Exception("SQL: %s" %(pgdb.mogrify(sql,params)))
-            
-        #  check data definition and uom (compare registered 
-        #  observed properties with provided observations)
-        #==================================================
-        # get values for provided data: UOM, NAME, URN, ID
-        #--------------------------------------------------
-        sql  = "SELECT id_pro, id_opr, def_opr, name_uom, constr_opr, constr_pro FROM %s.observed_properties, %s.proc_obs, %s.uoms" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
-        sql += " WHERE id_uom_fk=id_uom AND id_opr_fk=id_opr AND id_prc_fk=%s" 
-        params = (prc["id_prc"],)
-        try:
-            opr = pgdb.select(sql,params)
-        except Exception as err:
-            raise Exception("SQL2: %s -%s" %(pgdb.mogrify(sql,params), err.pgerror))
-            
-        #---- get list of available ObservedProperty, unit of measure, property id for this procedure -----
-        oprNames=[]
-        oprUoms=[]
-        oprIds=[] #to be removed ????
-        proIds=[]
-        obsPropConstr=[]
-        procConstr=[]
-        
-        
-        # Building a matrix
-        '''
-        oprNames=       ["urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature" , ...]
-        oprUoms=        ["mm" , ...]
-        oprIds=         [id_opr , ...]
-        proIds=         [id_pro , ...]
-        obsPropConstr=  [{"interval": ["-40", "50"], "role": "urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:acceptable"} , ...]
-        procConstr=     [{"max": "100", "role": "urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable"} , ...]
-        '''
-        
-        for row in opr:
-            
-            oprNames.append(row["def_opr"])
-            oprUoms.append(row["name_uom"])
-            oprIds.append(row["id_opr"])
-            proIds.append(row["id_pro"])
-            
-            if not row["constr_opr"] in [None,'']:
-                obsPropConstr.append(json.loads(row["constr_opr"]))
-            else:
-                obsPropConstr.append(None)
-                
-            if not row["constr_pro"] in [None,'']:
-                procConstr.append(json.loads(row["constr_pro"]))
-            else:
-                procConstr.append(None)
-                
-        #---- get ordered list of observed properties in data----
-        dataKeys = [ key for key in filter.data.keys() ] 
-        
-        #----- get ordered list of unit of measures provided with data-------
-        dataUoms = []
-        for key in filter.data.keys():
-            if "uom" in filter.data[key].keys():
-                dataUoms.append(filter.data[key]["uom"])
-            else:
-                dataUoms.append('None')
-                
-        #------------------------------------------------------------------  
-        # verify that all the properties observed by this procedure
-        # are provided with the correct data definition and uom  
-        #------------------------------------------------------------------   
-        for i,opr in enumerate(oprNames):
-            try: 
-                k = dataKeys.index(opr)
-            except:
-                raise sosException.SOSException("NoApplicableCode",None,"parameter '%s' not observed by RegisteredSensor %s - %s" %(opr,oprNames,dataKeys))
-            #if not str(dataUoms[k])==str(oprUoms[i]):
-            if not dataUoms[k]==oprUoms[i]:
-                raise sosException.SOSException("NoApplicableCode",None,"parameter '%s' not observed with provided unit of measure" %(opr))
-        
-        #---------------------------------------------------------------    
-        # verify if time and coordinates are passed as data parameters
-        # and create the parameters list and parameters ID
-        #--------------------------------------------------------------  
-        xobs=None
-        yobs=None
-        zobs=None
-        tpar=None
-        pars=[] # Observed parameters
-        parsId=[]
-        parsConsObs=[]
-        parsConsPro=[]
-        
-        # urn of different parameters
-        for i, dn in enumerate(dataKeys):
-            if dn.split(":")[-1] in filter.sosConfig.parGeom["x"]:
-                xobs = dataKeys[i]
-            elif dn.split(":")[-1] in filter.sosConfig.parGeom["y"]:
-                yobs = dataKeys[i]
-            elif dn.split(":")[-1] in filter.sosConfig.parGeom["z"]:
-                zobs = dataKeys[i]
-            elif dn.find("iso8601")>=0:
-                tpar = dataKeys[i]
-            else:
-                if dn.split(":")[-1] != "qualityIndex":
-                    pars.append(dn)
-                    try:
-                        parsId.append(proIds[oprNames.index(dn)])
-                        parsConsObs.append(obsPropConstr[oprNames.index(dn)])
-                        parsConsPro.append(procConstr[oprNames.index(dn)])
-                    except:
-                        raise Exception("parameter %s not observed by this sensor %s - %s" %(dn,pars,oprNames))
-                        
-        #----------------------------------------------------------------------------------
-        # set default quality index if not provided
-        #----------------------------------------------------------------------------------
-        for par in pars:
-            try:
-                dataKeys.index(par+":qualityIndex")
-            except:
-                filter.data[par+":qualityIndex"]={"vals":[filter.sosConfig.default_qi]*len(filter.data[par]["vals"])}
-                    
-        #---------------------------------------------------------------        
-        # verify that mobile sensors provide coordinates as X,Y,Z
-        #---------------------------------------------------------------
-        if (xobs==False and yobs==False and zobs==False) and prc["name_oty"] == "insitu-mobile-point":
-            raise Exception("Mobile sensors require x,y,z parameters")
-        
-        #---------------------------------------------------------------
-        # verify that time parameter is provided
-        #---------------------------------------------------------------
-        if not tpar:
-            raise Exception("parameter 'time:iso8601' is required for InsertObservation")
-        
-        #---------------------------------------------------------------
-        # verify that eventime are in provided samplingTime
-        #---------------------------------------------------------------
-        
-        if (len(filter.data[tpar]["vals"])>0 and 
-                not iso.parse_datetime(max(filter.data[tpar]["vals"]))<= end and 
-                iso.parse_datetime(min(filter.data[tpar]["vals"]))>= start):
-            raise Exception("provided data are not included in provided <samplingTime> period")
-        
-        #======================        
-        #-- insert observation
-        #======================
-        # delete existing observations if force flag is active
-        #------------------------------------------------------
-        if filter.forceInsert:
-            sql  = "DELETE FROM %s.event_time" %(filter.sosConfig.schema)
-            sql += " WHERE id_prc_fk=%s AND time_eti>=%s::TIMESTAMPTZ AND time_eti<=%s::TIMESTAMPTZ" 
-            params = (prc["id_prc"],stime[0],stime[1])
-            try:
-                b = pgdb.executeInTransaction(sql,params)
-                com=True
-            except:
-                raise Exception("SQL: %s" %(pgdb.mogrify(sql,params)))
-        
-        #----------------------------------------
-        # CASE I: observations list is void
-        #----------------------------------------
-        if len(filter.data[tpar]["vals"])==0:
-            self.assignedId = ""
-            ids_eti = []
-        #----------------------------------------
-        # CASE I: observations list contains data
-        #----------------------------------------
-        elif len(filter.data[tpar]["vals"])>0:
-            #--------------------
-            # insert event times
-            #--------------------   
-            ids_eti = []         
-            params = []
-            sql  = "INSERT INTO %s.event_time (id_prc_fk,time_eti)" %(filter.sosConfig.schema)
-            sql += " VALUES (%s,%s::TIMESTAMPTZ) RETURNING id_eti" 
-            for val in filter.data[tpar]["vals"]:
-                try:
-                    ids_eti.append(pgdb.executeInTransaction(sql,(prc["id_prc"],val))[0]['id_eti'])
-                    com=True
-                except Exception as e:
-                    raise e
-            
-            for i, par in enumerate(pars):
-                params = []
-                ids_msr = []
-                sql = "INSERT INTO %s.measures (id_pro_fk, id_eti_fk,id_qi_fk,val_msr) VALUES" %(filter.sosConfig.schema)
-                sql += " (%s,%s,%s,%s) RETURNING id_msr"
-                #hasvalues = False
-                for ii,id_et in enumerate(ids_eti):
-                    
-                    if not filter.data[par]["vals"][ii] in ['NULL',u'NULL',None,-999,"-999",u"-999",filter.sosConfig.aggregate_nodata]:
-                        
-                        pqi = int(filter.data[par+":qualityIndex"]["vals"][ii])
-                        
-                        # Constraint quality is done only if the quality index is equal to the default qi (RAW DATA)
-                        if int(filter.sosConfig.default_qi) == pqi:
-                            
-                            # quality check level I (gross error)
-                            #------------------------------------
-                            if filter.sosConfig.correct_qi != None and parsConsObs[i] != None:
-                                
-                                if 'max' in parsConsObs[i]:
-                                    if float(filter.data[par]["vals"][ii]) <= float(parsConsObs[i]['max']):
-                                        pqi = int(filter.sosConfig.correct_qi)
-                                elif 'min' in parsConsObs[i]:
-                                    if float(filter.data[par]["vals"][ii]) >= float(parsConsObs[i]['min']):
-                                        pqi = int(filter.sosConfig.correct_qi)
-                                elif 'interval' in parsConsObs[i]:
-                                    if float(parsConsObs[i]['interval'][0]) <= float(filter.data[par]["vals"][ii]) <= float(parsConsObs[i]['interval'][1]):
-                                        pqi = int(filter.sosConfig.correct_qi)
-                                elif 'valueList' in parsConsObs[i]:
-                                    if float(filter.data[par]["vals"][ii]) in [float(p) for p in parsConsObs[i]['valueList']]:
-                                        pqi = int(filter.sosConfig.correct_qi)
-                                    
-                            # quality check level II (statistical range)
-                            #-------------------------------------------
-                            if filter.sosConfig.stat_qi != None and parsConsPro[i] != None:
-                                
-                                if 'max' in parsConsPro[i]:
-                                    if float(filter.data[par]["vals"][ii]) <= float(parsConsPro[i]['max']):
-                                        pqi = int(filter.sosConfig.stat_qi)
-                                elif 'min' in parsConsPro[i]:
-                                    if float(filter.data[par]["vals"][ii]) >= float(parsConsPro[i]['min']):
-                                        pqi = int(filter.sosConfig.stat_qi)
-                                elif 'interval' in parsConsPro[i]:
-                                    if float(parsConsPro[i]['interval'][0]) <= float(filter.data[par]["vals"][ii]) <= float(parsConsPro[i]['interval'][1]):
-                                        pqi = int(filter.sosConfig.stat_qi)
-                                elif 'valueList' in parsConsPro[i]:
-                                    if float(filter.data[par]["vals"][ii]) in [float(p) for p in parsConsPro[i]['valueList']]:
-                                        pqi = int(filter.sosConfig.stat_qi)
-                           
-                        params = (int(parsId[i]),int(id_et),pqi,float(filter.data[par]["vals"][ii]))
-                        try:
-                            nid_msr = pgdb.executeInTransaction(sql,params)
-                            ids_msr.append(str(nid_msr[0]['id_msr']))
-                        except Exception as e:
-                            com=False
-                            raise e
-                            raise Exception("L: %s - %s - %s - %s") %(int(parsId[i]),int(id_et),pqi,float(filter.data[par]["vals"][ii]))
-            
-            #-------------------------------------
-            #--insert position values if required 
-            #-------------------------------------
-            if prc["name_oty"] == "insitu-mobile-point":
-                xparspl = xobs.split(":")
-                epsg = xparspl[xparspl.index("EPSG")+1]
-                params = []
-                sql = "INSERT INTO %s.positions (id_qi_fk, id_eti_fk,geom_pos) VALUES" %(filter.sosConfig.schema)
-                sql += "(%s,%s,ST_Transform(ST_SetSRID(ST_MakePoint(%s, %s, %s), %s), %s))"
-                
-                for i,id_et in enumerate(ids_eti):
-                    params = (filter.sosConfig.default_qi,id_et,filter.data[xobs]["vals"][i],filter.data[yobs]["vals"][i],filter.data[zobs]["vals"][i],epsg,filter.sosConfig.istsosepsg)
-                    try:
-                        ids_pos = pgdb.executeInTransaction(sql,params)
-                        com=True
-                    except Exception as a:
-                        com=False
-                        raise Exception("%s\nSQL: %s" %(a,pgdb.mogrify(sql,params)))
-            
-            # register assigned IDs of measures
-            self.assignedId = "@".join([str(p) for p in ids_eti])
-            # commit executed operations                
-        
-        #Register the transactional operation in Log table 
-        if filter.sosConfig.transactional_log in ['True','true',1]:
-            sqlLog  = "INSERT INTO %s.tran_log" %(filter.sosConfig.schema)
-            sqlLog  += " (operation_trl,procedure_trl,begin_trl,end_trl,count,stime_prc,etime_prc)"
-            sqlLog  += " VALUES ('InsertObservation', %s, %s::TIMESTAMPTZ, %s::TIMESTAMPTZ, %s, %s::TIMESTAMPTZ , %s::TIMESTAMPTZ)" 
-            params = (str(filter.procedure),start,end,len(ids_eti),prc["stime_prc"],prc["etime_prc"])
-            try:
-                pgdb.executeInTransaction(sqlLog,params)
-                com=True
-            except:
-                raise Exception("SQL: %s" %(pgdb.mogrify(sqlLog,params)))
-        
-        if com==True:
-            pgdb.commitTransaction()
-            
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import sys, pprint #for debug only
+
+#import sosConfig
+#from istsoslib import sosDatabase
+from istsoslib import sosException
+#import mx.DateTime.ISO
+from lib import isodate as iso
+
+from datetime import datetime
+
+import json
+
+now = datetime.now()
+
+class InsertObservationResponse:
+    #self.assignedObservationId
+    def __init__(self,filter,pgdb):
+
+        #--get procedure information
+        #============================================
+        sql  = "SELECT id_prc, name_prc, name_oty, name_foi, stime_prc, etime_prc from %s.procedures,%s.obs_type,%s.foi" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        sql += " WHERE id_oty=id_oty_fk AND id_foi=id_foi_fk AND assignedid_prc=%s"
+        params = (filter.assignedSensorId,)
+        try:
+            prc = pgdb.select(sql,params)[0]
+        except:
+            raise sosException.SOSException("InvalidParameterValue","assignedSensorId","assignedSensorId '%s' is not valid!" %(filter.assignedSensorId))
+
+        #--check requested procedure name exists
+        #=============================================
+        if not prc["name_prc"]==filter.procedure:
+            raise sosException.SOSException("NoApplicableCode",None,"procedure '%s' not associated with provided assignedSensorId!" %(filter.procedure))
+
+        #--check requested  foi name exists
+        #=============================================
+        if not filter.foiName == prc["name_foi"]:
+            raise sosException.SOSException("NoApplicableCode",None,"featureOfInterest '%s' not associated with provided assignedSensorId" %(filter.foiName))
+
+        #--check provided samplingTime and upadate
+        #  begin/end time procedure if necessary
+        # (samplingTime=period or istant of provided
+        #  observations defined by samplingTime filter)
+        #=============================================
+        if filter.samplingTime:
+            stime = filter.samplingTime.split("/")
+            #
+            if len(stime)==2: # is a TimePeriod
+                start = iso.parse_datetime(stime[0])
+                end  = iso.parse_datetime(stime[1])
+            elif len(stime)==1: # is a TimeInstant
+                start = end = iso.parse_datetime(stime[0])
+            else:
+                raise Exception(" filter samplingTime error! given '%s'" %(filter.samplingTime))
+
+            if start>end:
+                raise Exception(" endPosition (%s) must be after beginPosition (%s)" %(end,start))
+
+            #-- check samplingTime
+            #==========================================
+            # verify procedure begin/end exist
+            #-----------------------------------
+            if not (prc["stime_prc"].__class__.__name__ == "NoneType" and prc["etime_prc"].__class__.__name__ == "NoneType"):
+
+                # check eventTime interval and update begin/end position when force flas is active
+                #----------------------------------------------------------------------------------
+                if filter.forceInsert:
+                    #-- verify interval limits
+                    '''if not (end>=prc["stime_prc"] and start<=prc["etime_prc"]):
+                        raise sosException.SOSException(3,"observation eventTime (%s-%s) must overlap procedure samplingTime (%s-%s)" %(start,end,prc["stime_prc"],prc["etime_prc"]))
+                    else:'''
+                    #-- update begin time of procedure
+                    if start<prc["stime_prc"]:
+                        sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
+                        sql += " SET stime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s"
+                        params = (stime[0],prc["id_prc"])
+                        try:
+                            a = pgdb.executeInTransaction(sql,params)
+                            com=True
+                        except:
+                            raise Exception("SQL: %s" %(pgdb.mogrify(sql,params)))
+
+                    #-- update end time of procedure
+                    if end>prc["etime_prc"]:
+                        sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
+                        sql += " SET etime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s"
+                        params = (stime[1],prc["id_prc"])
+                        try:
+                            b = pgdb.executeInTransaction(sql,params)
+                            com=True
+                        except Exception as err:
+                            raise Exception("SQL: %s - %s" %(pgdb.mogrify(sql,params), err.pgerror))
+
+                # check eventTime interval and update begin/end position when force flag is off
+                #----------------------------------------------------------------------------------
+                else:
+                    sql  = "SELECT max(time_eti) as max_time_eti from %s.event_time" %(filter.sosConfig.schema)
+                    sql += " WHERE id_prc_fk = %s group by id_prc_fk"
+                    params = (prc["id_prc"],)
+                    try:
+                        lastMsr = pgdb.select(sql,params)[0]["max_time_eti"]
+                    except:
+                        lastMsr = None
+
+                    if lastMsr!=None:
+                        #-- verify begin observation is minor/equal then end time procedure and later then last observation
+                        if not (end>=prc["etime_prc"] and start<=prc["etime_prc"] and start>=lastMsr):
+                            raise Exception("begin observation (%s) must be between last observation (%s) and end procedure (%s); end observation (%s) must be after end procedure (%s)" %(start,lastMsr,prc["etime_prc"],end,prc["etime_prc"]))
+                    else:
+                        #-- verify begin observation is minor/equal then end time procedure and later then first observation
+                        if not (end>=prc["etime_prc"] and start<=prc["etime_prc"] and start>=prc["stime_prc"]) :
+                            raise Exception("begin observation (%s) must be between start procedure (%s) and end procedure (%s); end observation (%s) must be after end procedure (%s)" %(start,prc["stime_prc"],prc["etime_prc"],end,prc["etime_prc"]))
+
+                    #-- update end time of procedure
+                    sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
+                    sql += " SET etime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s"
+                    params = (str(stime[1]),int(prc["id_prc"]))
+                    try:
+                        b = pgdb.executeInTransaction(sql,params)
+                        com=True
+                    except Exception as err:
+                        raise Exception("SQL: %s - %s" %(pgdb.mogrify(sql,params), err.pgerror))
+
+            else:
+                sql  = "UPDATE %s.procedures" %(filter.sosConfig.schema)
+                sql += " SET stime_prc=%s::TIMESTAMPTZ, etime_prc=%s::TIMESTAMPTZ WHERE id_prc=%s"
+                params = (str(stime[0]),str(stime[1]),int(prc["id_prc"]))
+                try:
+                    b = pgdb.executeInTransaction(sql,params)
+                    com=True
+                except:
+                    raise Exception("SQL: %s" %(pgdb.mogrify(sql,params)))
+
+        #  check data definition and uom (compare registered
+        #  observed properties with provided observations)
+        #==================================================
+        # get values for provided data: UOM, NAME, URN, ID
+        #--------------------------------------------------
+        sql  = "SELECT id_pro, id_opr, def_opr, name_uom, constr_opr, constr_pro FROM %s.observed_properties, %s.proc_obs, %s.uoms" %(filter.sosConfig.schema,filter.sosConfig.schema,filter.sosConfig.schema)
+        sql += " WHERE id_uom_fk=id_uom AND id_opr_fk=id_opr AND id_prc_fk=%s"
+        params = (prc["id_prc"],)
+        try:
+            opr = pgdb.select(sql,params)
+        except Exception as err:
+            raise Exception("SQL2: %s -%s" %(pgdb.mogrify(sql,params), err.pgerror))
+
+        #---- get list of available ObservedProperty, unit of measure, property id for this procedure -----
+        oprNames=[]
+        oprUoms=[]
+        oprIds=[] #to be removed ????
+        proIds=[]
+        obsPropConstr=[]
+        procConstr=[]
+
+
+        # Building a matrix
+        '''
+        oprNames=       ["urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature" , ...]
+        oprUoms=        ["mm" , ...]
+        oprIds=         [id_opr , ...]
+        proIds=         [id_pro , ...]
+        obsPropConstr=  [{"interval": ["-40", "50"], "role": "urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:acceptable"} , ...]
+        procConstr=     [{"max": "100", "role": "urn:ogc:def:classifiers:x-istsos:1.0:qualityIndex:check:reasonable"} , ...]
+        '''
+
+        for row in opr:
+
+            oprNames.append(row["def_opr"])
+            oprUoms.append(row["name_uom"])
+            oprIds.append(row["id_opr"])
+            proIds.append(row["id_pro"])
+
+            if not row["constr_opr"] in [None,'']:
+                obsPropConstr.append(json.loads(row["constr_opr"]))
+            else:
+                obsPropConstr.append(None)
+
+            if not row["constr_pro"] in [None,'']:
+                procConstr.append(json.loads(row["constr_pro"]))
+            else:
+                procConstr.append(None)
+
+        #---- get ordered list of observed properties in data----
+        dataKeys = [ key for key in filter.data.keys() ]
+
+        #----- get ordered list of unit of measures provided with data-------
+        dataUoms = []
+        for key in filter.data.keys():
+            if "uom" in filter.data[key].keys():
+                dataUoms.append(filter.data[key]["uom"])
+            else:
+                dataUoms.append('None')
+
+        #------------------------------------------------------------------
+        # verify that all the properties observed by this procedure
+        # are provided with the correct data definition and uom
+        #------------------------------------------------------------------
+        for i,opr in enumerate(oprNames):
+            try:
+                k = dataKeys.index(opr)
+            except:
+                raise sosException.SOSException("NoApplicableCode",None,"parameter '%s' not observed by RegisteredSensor %s - %s" %(opr,oprNames,dataKeys))
+            #if not str(dataUoms[k])==str(oprUoms[i]):
+            if not dataUoms[k]==oprUoms[i]:
+                raise sosException.SOSException("NoApplicableCode",None,"parameter '%s' not observed with provided unit of measure" %(opr))
+
+        #---------------------------------------------------------------
+        # verify if time and coordinates are passed as data parameters
+        # and create the parameters list and parameters ID
+        #--------------------------------------------------------------
+        xobs=None
+        yobs=None
+        zobs=None
+        tpar=None
+        pars=[] # Observed parameters
+        parsId=[]
+        parsConsObs=[]
+        parsConsPro=[]
+
+        # urn of different parameters
+        for i, dn in enumerate(dataKeys):
+            if dn.split(":")[-1] in filter.sosConfig.parGeom["x"]:
+                xobs = dataKeys[i]
+            elif dn.split(":")[-1] in filter.sosConfig.parGeom["y"]:
+                yobs = dataKeys[i]
+            elif dn.split(":")[-1] in filter.sosConfig.parGeom["z"]:
+                zobs = dataKeys[i]
+            elif dn.find("iso8601")>=0:
+                tpar = dataKeys[i]
+            else:
+                if dn.split(":")[-1] != "qualityIndex":
+                    pars.append(dn)
+                    try:
+                        parsId.append(proIds[oprNames.index(dn)])
+                        parsConsObs.append(obsPropConstr[oprNames.index(dn)])
+                        parsConsPro.append(procConstr[oprNames.index(dn)])
+                    except:
+                        raise Exception("parameter %s not observed by this sensor %s - %s" %(dn,pars,oprNames))
+
+        #----------------------------------------------------------------------------------
+        # set default quality index if not provided
+        #----------------------------------------------------------------------------------
+        for par in pars:
+            try:
+                dataKeys.index(par+":qualityIndex")
+            except:
+                filter.data[par+":qualityIndex"]={"vals":[filter.sosConfig.default_qi]*len(filter.data[par]["vals"])}
+
+        #---------------------------------------------------------------
+        # verify that mobile sensors provide coordinates as X,Y,Z
+        #---------------------------------------------------------------
+        if (xobs==False and yobs==False and zobs==False) and prc["name_oty"] == "insitu-mobile-point":
+            raise Exception("Mobile sensors require x,y,z parameters")
+
+        #---------------------------------------------------------------
+        # verify that time parameter is provided
+        #---------------------------------------------------------------
+        if not tpar:
+            raise Exception("parameter 'time:iso8601' is required for InsertObservation")
+
+        #---------------------------------------------------------------
+        # verify that eventime are in provided samplingTime
+        #---------------------------------------------------------------
+        if len(filter.data[tpar]["vals"])>0:
+            maxDate = iso.parse_datetime(max(filter.data[tpar]["vals"]))
+            minDate = iso.parse_datetime(min(filter.data[tpar]["vals"]))
+            if not maxDate <= end and minDate >= start:
+                raise Exception("provided data (min: %s, max:%s) are not included in provided <samplingTime> period (%s / %s) for procedure %s" % 
+                    (minDate.isoformat(), maxDate.isoformat(), start.isoformat(), end.isoformat(), prc["name_prc"]))
+
+        #======================
+        #-- insert observation
+        #======================
+        # delete existing observations if force flag is active
+        #------------------------------------------------------
+        if filter.forceInsert:
+            sql  = "DELETE FROM %s.event_time" %(filter.sosConfig.schema)
+            sql += " WHERE id_prc_fk=%s AND time_eti>=%s::TIMESTAMPTZ AND time_eti<=%s::TIMESTAMPTZ"
+            params = (prc["id_prc"],stime[0],stime[1])
+            try:
+                b = pgdb.executeInTransaction(sql,params)
+                com=True
+            except:
+                raise Exception("SQL: %s" %(pgdb.mogrify(sql,params)))
+
+        #----------------------------------------
+        # CASE I: observations list is void
+        #----------------------------------------
+        if len(filter.data[tpar]["vals"])==0:
+            self.assignedId = ""
+            ids_eti = []
+        #----------------------------------------
+        # CASE I: observations list contains data
+        #----------------------------------------
+        elif len(filter.data[tpar]["vals"])>0:
+            #--------------------
+            # insert event times
+            #--------------------
+            ids_eti = []
+            params = []
+            sql  = "INSERT INTO %s.event_time (id_prc_fk,time_eti)" %(filter.sosConfig.schema)
+            sql += " VALUES (%s,%s::TIMESTAMPTZ) RETURNING id_eti"
+            for val in filter.data[tpar]["vals"]:
+                try:
+                    ids_eti.append(pgdb.executeInTransaction(sql,(prc["id_prc"],val))[0]['id_eti'])
+                    com = True
+                except Exception as e:
+                    raise Exception("Error inserting event times for %s: %s" % (prc["name_prc"], str(e)) )
+
+            for i, par in enumerate(pars):
+                params = []
+                ids_msr = []
+                sql = "INSERT INTO %s.measures (id_pro_fk, id_eti_fk,id_qi_fk,val_msr) VALUES" % (filter.sosConfig.schema)
+                sql += " (%s,%s,%s,%s) RETURNING id_msr"
+
+                #hasvalues = False
+                for ii,id_et in enumerate(ids_eti):
+
+
+                    if not filter.data[par]["vals"][ii] in ['NULL',u'NULL',None,-999,"-999",u"-999",filter.sosConfig.aggregate_nodata]:
+                    #TODO: add a else statement to add the aggregate_nodata value OR delete the event time
+                    #if not filter.data[par]["vals"][ii] in ['NULL',u'NULL',None]:
+                        pqi = int(filter.data[par+":qualityIndex"]["vals"][ii])
+
+                        # Constraint quality is done only if the quality index is equal to the default qi (RAW DATA)
+                        if int(filter.sosConfig.default_qi) == pqi:
+
+                            # quality check level I (gross error)
+                            #------------------------------------
+                            if filter.sosConfig.correct_qi != None and parsConsObs[i] != None:
+
+                                if 'max' in parsConsObs[i]:
+                                    if float(filter.data[par]["vals"][ii]) <= float(parsConsObs[i]['max']):
+                                        pqi = int(filter.sosConfig.correct_qi)
+                                elif 'min' in parsConsObs[i]:
+                                    if float(filter.data[par]["vals"][ii]) >= float(parsConsObs[i]['min']):
+                                        pqi = int(filter.sosConfig.correct_qi)
+                                elif 'interval' in parsConsObs[i]:
+                                    if float(parsConsObs[i]['interval'][0]) <= float(filter.data[par]["vals"][ii]) <= float(parsConsObs[i]['interval'][1]):
+                                        pqi = int(filter.sosConfig.correct_qi)
+                                elif 'valueList' in parsConsObs[i]:
+                                    if float(filter.data[par]["vals"][ii]) in [float(p) for p in parsConsObs[i]['valueList']]:
+                                        pqi = int(filter.sosConfig.correct_qi)
+
+                            # quality check level II (statistical range)
+                            #-------------------------------------------
+                            if filter.sosConfig.stat_qi != None and parsConsPro[i] != None:
+
+                                if 'max' in parsConsPro[i]:
+                                    if float(filter.data[par]["vals"][ii]) <= float(parsConsPro[i]['max']):
+                                        pqi = int(filter.sosConfig.stat_qi)
+                                elif 'min' in parsConsPro[i]:
+                                    if float(filter.data[par]["vals"][ii]) >= float(parsConsPro[i]['min']):
+                                        pqi = int(filter.sosConfig.stat_qi)
+                                elif 'interval' in parsConsPro[i]:
+                                    if float(parsConsPro[i]['interval'][0]) <= float(filter.data[par]["vals"][ii]) <= float(parsConsPro[i]['interval'][1]):
+                                        pqi = int(filter.sosConfig.stat_qi)
+                                elif 'valueList' in parsConsPro[i]:
+                                    if float(filter.data[par]["vals"][ii]) in [float(p) for p in parsConsPro[i]['valueList']]:
+                                        pqi = int(filter.sosConfig.stat_qi)
+
+                        params = (int(parsId[i]),int(id_et),pqi,float(filter.data[par]["vals"][ii]))
+                        try:
+                            nid_msr = pgdb.executeInTransaction(sql,params)
+                            ids_msr.append(str(nid_msr[0]['id_msr']))
+                        except Exception as e:
+                            com=False
+                            raise e
+                            raise Exception("L: %s - %s - %s - %s") %(int(parsId[i]),int(id_et),pqi,float(filter.data[par]["vals"][ii]))
+
+            #-------------------------------------
+            #--insert position values if required
+            #-------------------------------------
+            if prc["name_oty"] == "insitu-mobile-point":
+                xparspl = xobs.split(":")
+                epsg = xparspl[xparspl.index("EPSG")+1]
+                params = []
+                sql = "INSERT INTO %s.positions (id_qi_fk, id_eti_fk,geom_pos) VALUES" %(filter.sosConfig.schema)
+                sql += "(%s,%s,ST_Transform(ST_SetSRID(ST_MakePoint(%s, %s, %s), %s), %s))"
+
+                for i,id_et in enumerate(ids_eti):
+                    params = (filter.sosConfig.default_qi,id_et,filter.data[xobs]["vals"][i],filter.data[yobs]["vals"][i],filter.data[zobs]["vals"][i],epsg,filter.sosConfig.istsosepsg)
+                    try:
+                        ids_pos = pgdb.executeInTransaction(sql,params)
+                        com=True
+                    except Exception as a:
+                        com=False
+                        raise Exception("%s\nSQL: %s" %(a,pgdb.mogrify(sql,params)))
+
+            # register assigned IDs of measures
+            self.assignedId = "@".join([str(p) for p in ids_eti])
+            # commit executed operations
+
+        #Register the transactional operation in Log table
+        if filter.sosConfig.transactional_log in ['True','true',1]:
+            sqlLog  = "INSERT INTO %s.tran_log" %(filter.sosConfig.schema)
+            sqlLog  += " (operation_trl,procedure_trl,begin_trl,end_trl,count,stime_prc,etime_prc)"
+            sqlLog  += " VALUES ('InsertObservation', %s, %s::TIMESTAMPTZ, %s::TIMESTAMPTZ, %s, %s::TIMESTAMPTZ , %s::TIMESTAMPTZ)"
+            params = (str(filter.procedure),start,end,len(ids_eti),prc["stime_prc"],prc["etime_prc"])
+            try:
+                pgdb.executeInTransaction(sqlLog,params)
+                com=True
+            except:
+                raise Exception("SQL: %s" %(pgdb.mogrify(sqlLog,params)))
+
+        if com==True:
+            pgdb.commitTransaction()
+
diff --git a/istsoslib/responders/IOresponse.pyc b/istsoslib/responders/IOresponse.pyc
index 3b931c0..b229a9c 100644
Binary files a/istsoslib/responders/IOresponse.pyc and b/istsoslib/responders/IOresponse.pyc differ
diff --git a/istsoslib/responders/RSresponse.py b/istsoslib/responders/RSresponse.py
index ba5c2d2..1771325 100755
--- a/istsoslib/responders/RSresponse.py
+++ b/istsoslib/responders/RSresponse.py
@@ -1,386 +1,393 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#import psycopg2 # @TODO the right library
-#import psycopg2.extras
-import sys, os
-
-from istsoslib import sosException
-from lib.etree import et
-
-class RegisterSensorResponse:
-    #Register sensor object
-    #self.assignedObservationId
-    def __init__(self,filter,pgdb):
-        
-        #-----------------------------
-        # transaction: insert procedure in DB
-        #-----------------------------
-        
-        #--check if proc_name exist
-        prc_name=None
-        sqlId  = "SELECT name_prc FROM %s.procedures" %(filter.sosConfig.schema)
-        sqlId += " WHERE name_prc=%s" 
-        params = (str(filter.procedure),)
-        try:
-            prc_name = pgdb.select(sqlId,params)
-        except:
-            raise Exception("SQL: %s"%(pgdb.mogrify(sqlId,params)))
-        if prc_name:
-            raise Exception("Procedure '%s' already exist, consider to change the name" %(prc_name))
-        
-        #--get id_foi or create it if it does not exist yet
-        sqlId  = "SELECT id_foi FROM %s.foi" %(filter.sosConfig.schema)
-        sqlId += " WHERE name_foi=%s" 
-        params=(str(filter.foiName),)
-        try:
-            id_foi= pgdb.select(sqlId,params)[0]["id_foi"]
-        except:
-            sqlId  = "SELECT id_fty FROM %s.feature_type" %(filter.sosConfig.schema)
-            sqlId += " WHERE name_fty=%s" 
-            params = (str(filter.foiType),)
-            try:
-                id_fty= pgdb.select(sqlId,params)[0]["id_fty"]
-            except:
-                sqlIns  = "INSERT INTO %s.feature_type (name_fty)" %(filter.sosConfig.schema)
-                sqlIns += " VALUES (%s) RETURNING id_fty" 
-                params = (str(filter.foiType),)
-                try:
-                    id_fty= pgdb.executeInTransaction(sqlIns,params)[0]["id_fty"]
-                except:
-                    raise Exception("SQL: %s"%(sqlIns))
-            
-            sqlIns  = "INSERT INTO %s.foi (name_foi,desc_foi,geom_foi,id_fty_fk)" %(filter.sosConfig.schema)
-            sqlIns += " VALUES (%s,%s,st_transform(ST_GeomFromGML(%s),%s),%s) RETURNING id_foi"   
-            params = (str(filter.foiName),str(filter.foiDesc),str(filter.foiGML.strip()),int(filter.sosConfig.istsosepsg),int(id_fty))
-            try:
-                id_foi = pgdb.executeInTransaction(sqlIns,params)[0]["id_foi"]
-                com=True
-            except:
-                raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-        
-        #--get id_tru or create it if it does not exist yet
-        sqlId  = "SELECT id_tru FROM %s.time_res_unit" %(filter.sosConfig.schema)
-        sqlId += " WHERE name_tru=%s" 
-        params = (filter.time_res_unit,)
-        try:
-            id_tru = pgdb.select(sqlId,params)[0]["id_tru"]
-        except:
-            sqlIns  = "INSERT INTO %s.time_res_unit (name_tru)" %(filter.sosConfig.schema)
-            sqlIns += " VALUES (%s) RETURNING id_tru" 
-            params = (str(filter.time_res_unit),)
-            try:
-                id_tru = pgdb.executeInTransaction(sqlIns,params)[0]["id_tru"]
-                com=True
-            except:
-                raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-        
-        #--get a list of observed properties id (id_opr) and check if  
-        # the fileds of the <Result> data record description
-        # are found in the components listed in the <observedProperty>
-        # or create them if they do not exist yet
-        opr_ids=[]
-        for index, par in enumerate(filter.parameters):
-            #--insitu-fixed-point (this is the default if no system type defined in XML request)
-            if filter.systemType=='insitu-fixed-point' or filter.systemType == None or filter.systemType =="virtual":
-                oty = 'virtual' if filter.systemType =="virtual" else 'insitu-fixed-point'
-                if not par.split(":")[-1]=="iso8601":
-                    if par in filter.oprDef:
-                        i = filter.oprDef.index(par)
-                        oprDef = par
-                        oprName = filter.names[i]
-                        #oprDesc = filter.oprDesc[i]
-                    else:
-                        raise Exception("Field %s not found in Components %s"%(par,filter.oprDef))
-                    sqlId  = "SELECT id_opr FROM %s.observed_properties" %(filter.sosConfig.schema)
-                    sqlId += " WHERE def_opr=%s"
-                    params = (str(oprDef),)
-                    try:
-                        id_opr = pgdb.select(sqlId,params)[0]["id_opr"]
-                        opr_ids.append(id_opr)
-                    except:
-                        sqlIns  = "INSERT INTO %s.observed_properties (name_opr,def_opr)" %(filter.sosConfig.schema)
-                        sqlIns += " VALUES (%s,%s) RETURNING id_opr"
-                        params = (str(oprName),str(oprDef))
-                        #sqlIns  = "INSERT INTO %s.observed_properties (name_opr,desc_opr,def_opr)" %(filter.sosConfig.schema)
-                        #sqlIns += " VALUES (%s,%s,%s) RETURNING id_opr" 
-                        #params = (str(oprName),str(oprDesc),str(oprDef))
-                        try:
-                            id_opr = pgdb.executeInTransaction(sqlIns,params)[0]["id_opr"]
-                            com=True
-                            opr_ids.append(id_opr)
-                        except:
-                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-            #--virtual
-            
-            #--insitu-mobile-point
-            elif filter.systemType=='insitu-mobile-point':
-                oty = 'insitu-mobile-point'
-                if not (par.split(":")[-1] in filter.sosConfig.parGeom["x"] or par.split(":")[-1] in filter.sosConfig.parGeom["y"] 
-                   or par.split(":")[-1] in filter.sosConfig.parGeom["z"] or par.split(":")[-1]=="iso8601"):
-                    if par in filter.oprDef:
-                        i = filter.oprDef.index(par)
-                        oprDef = par
-                        oprName = filter.names[i]
-                        #oprDesc = filter.oprDesc[i]
-                    else:
-                        raise Exception("Field %s not found in Components %s"%(par,filter.oprDef))
-                    sqlId  = "SELECT id_opr FROM %s.observed_properties" %(filter.sosConfig.schema)
-                    sqlId += " WHERE def_opr=%s"
-                    params = (str(oprDef),)
-                    try:
-                        id_opr = pgdb.select(sqlId,params)[0]["id_opr"]
-                        opr_ids.append(id_opr)
-                    except:
-                        sqlIns  = "INSERT INTO %s.observed_properties (name_opr,def_opr)" %(filter.sosConfig.schema)
-                        sqlIns += " VALUES (%s,%s) RETURNING id_opr"
-                        params = (str(oprName),str(oprDef))
-                        try:
-                            id_opr = pgdb.executeInTransaction(sqlIns,params)[0]["id_opr"]
-                            com=True
-                            opr_ids.append(id_opr)
-                        except:
-                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-            else:
-                raise Exception("Error: observation type not supported")      
-             
-        #-- get id_oty or create it if it does not exist yet
-        sqlId  = "SELECT id_oty FROM %s.obs_type" %(filter.sosConfig.schema)
-        sqlId += " WHERE name_oty=%s" 
-        params = (str(oty),)
-        try:
-            id_oty = pgdb.select(sqlId,params)[0]["id_oty"]
-        except:
-            sqlIns  = "INSERT INTO %s.obs_type (name_oty,desc_oty)" %(filter.sosConfig.schema)
-            sqlIns += " VALUES (%s,%s) RETURNING id_oty"
-            params = (str(oty),None)
-            try:
-                id_oty = pgdb.executeInTransaction(sqlIns,params)[0]["id_oty"]
-                com=True
-            except:
-                raise Exception("SQL: %s"%(sqlIns))
-        
-        #--get id_uom or create it if it does not exist yet
-        uom_ids=[]
-        #for uom in filter.uoms:
-        for i, uom in enumerate(filter.uoms):
-            par = filter.parameters[i]
-            if oty=='insitu-fixed-point' or oty=='virtual':
-                if not par.split(":")[-1]=="iso8601": 
-                    sqlId  = "SELECT id_uom FROM %s.uoms" %(filter.sosConfig.schema)
-                    sqlId += " WHERE name_uom=%s" 
-                    params = (uom,)
-                    try:
-                        id_uom = pgdb.select(sqlId,params)[0]["id_uom"]
-                        uom_ids.append(id_uom)
-                    except:
-                        sqlIns  = "INSERT INTO %s.uoms (name_uom,desc_uom)" %(filter.sosConfig.schema)
-                        sqlIns += " VALUES (%s,%s) RETURNING id_uom" 
-                        params = (uom,None)
-                        try:
-                            id_uom = pgdb.executeInTransaction(sqlIns,params)[0]["id_uom"]
-                            com=True
-                            uom_ids.append(id_uom)
-                        except:
-                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-            elif oty == 'insitu-mobile-point':
-                if not (par.split(":")[-1] in filter.sosConfig.parGeom["x"] or par.split(":")[-1] in filter.sosConfig.parGeom["y"] 
-                   or par.split(":")[-1] in filter.sosConfig.parGeom["z"] or par.split(":")[-1]=="iso8601") :
-                    sqlId  = "SELECT id_uom FROM %s.uoms" %(filter.sosConfig.schema)
-                    sqlId += " WHERE name_uom=%s" 
-                    params = (uom,)
-                    try:
-                        id_uom = pgdb.select(sqlId,params)[0]["id_uom"]
-                        uom_ids.append(id_uom)
-                    except:
-                        sqlIns  = "INSERT INTO %s.uoms (name_uom,desc_uom)" %(filter.sosConfig.schema)
-                        sqlIns += " VALUES (%s,%s) RETURNING id_uom" 
-                        params = (uom,None)
-                        try:
-                            id_uom = pgdb.executeInTransaction(sqlIns,params)[0]["id_uom"]
-                            com=True
-                            uom_ids.append(id_uom)
-                        except:
-                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-                
-            else:
-                raise Exception("Error: observation type not supported")
-        
-        #--get temporary id_off or create it if it does not exist yet
-        sqlId  = "SELECT id_off FROM %s.offerings WHERE" %(filter.sosConfig.schema)
-        sqlId += " name_off='temporary'"
-        try:
-            id_off = pgdb.select(sqlId)[0]["id_off"]
-        except:
-            sqlIns ="INSERT INTO %s.offerings (name_off,desc_off) VALUES" %(filter.sosConfig.schema)
-            sqlIns += " ('temporary','temporary offering to hold self-registered procedures/sensors waiting for service adimistration acceptance') RETURNING id_off"
-            try:
-                id_off = pgdb.executeInTransaction(sqlIns)[0]["id_off"]
-                com=True
-            except:
-                raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns)))
-           
-        #--insert procedure
-        sqlIns  = "INSERT INTO %s.procedures (id_foi_fk, id_oty_fk, id_tru_fk, " %(filter.sosConfig.schema)
-        sqlIns  += "name_prc, desc_prc, "
-        sqlIns  += "stime_prc, etime_prc, "
-        sqlIns  += "time_res_prc, assignedid_prc)" 
-
-        #sqlIns += " VALUES (%s, %s, %s, '%s', NULL, now()::timestamptz, now()::timestamptz, %s,(select(md5(current_timestamp::text)))) RETURNING id_prc, assignedid_prc" %(id_foi,id_oty,id_tru,filter.procedure,filter.time_res_val)
-        sqlIns += " VALUES (%s, %s, %s, "
-        sqlIns += "%s, %s, "
-        params = [id_foi,id_oty,id_tru,str(filter.procedure), str(filter.proc_desc)]
-        if not filter.beginPosition=='NULL':
-            sqlIns += "%s::TIMESTAMPTZ , %s::TIMESTAMPTZ, "  
-            params.extend([str(filter.beginPosition),str(filter.beginPosition)])
-        else:
-            sqlIns += "%s , %s, "
-            params.extend([None,None])
-        sqlIns += " %s, (select(md5(current_timestamp::text))))" 
-        params.append(filter.time_res_val)
-        sqlIns += " RETURNING id_prc, assignedid_prc" 
-        params = tuple([None if x=='NULL' else x for x in params])
-        try:
-            ret_prc = pgdb.executeInTransaction(sqlIns,params)[0]
-            com=True
-        except:
-            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
-        
-        #--link proc_obs
-        sqlIns  = "INSERT INTO %s.proc_obs (id_prc_fk, id_uom_fk, id_opr_fk, constr_pro) VALUES " % (
-            filter.sosConfig.schema
-        )
-        
-        params=[]
-        
-        print >> sys.stderr, "opr_ids: %s" % opr_ids
-        print >> sys.stderr, "ret_prc: %s" % ret_prc
-        print >> sys.stderr, "uom_ids: %s" % uom_ids
-        print >> sys.stderr, "opr_ids: %s" % opr_ids
-        print >> sys.stderr, "filter.constr: %s" % filter.constr
-        for i in range(len(opr_ids)):
-            params.append((
-                ret_prc["id_prc"],
-                uom_ids[i],
-                opr_ids[i],
-                filter.constr[i]
-            ))
-        sqlIns += ",".join(["%s"]*len(params))
-        sqlIns += " RETURNING id_pro"
-        try:
-            res = pgdb.executeInTransaction(sqlIns,params)
-            com=True
-        except:
-            raise Exception("SQL: %s" %(pgdb.mogrify(sqlIns,params)))
-        
-        #--link off_prc
-        sqlIns  = "INSERT INTO %s.off_proc (id_off_fk, id_prc_fk)" %(filter.sosConfig.schema)
-        sqlIns  += " VALUES (%s,%s) RETURNING id_off_prc" 
-        params = (id_off, ret_prc["id_prc"])
-        try:
-            res = pgdb.executeInTransaction(sqlIns,params)
-            com=True
-        except:
-            raise Exception("SQL: %s" %(pgdb.mogrify(sqlIns,params)))
-        
-        self.assignedSensorId = filter.sosConfig.urn["sensor"]+ret_prc["assignedid_prc"]
-        
-        #----------------------------------------
-        # create SensorML for inserted procedure
-        #----------------------------------------
-        
-        f = open(os.path.join(filter.sosConfig.sensorMLpath,filter.procedure + ".xml"), 'w')
-        
-        ns = {
-            'xsi': "http://www.w3.org/2001/XMLSchema-instance" ,
-            'sml': "http://www.opengis.net/sensorML/1.0.1", 
-            'swe': "http://www.opengis.net/swe/1.0.1", 
-            'xlink': "http://www.w3.org/1999/xlink", 
-            'gml': 'http://www.opengis.net/gml'            
-        }
-        
-        #---map namespaces---
-        try:
-            register_namespace = et.register_namespace
-            for key in ns:
-                register_namespace(key,ns[key])
-        except AttributeError:
-            try:
-                et._namespace_map.update(ns)
-                for key in ns:
-                    et._namespace_map[ns[key]] = key
-            except AttributeError:
-                try:
-                    from xml.etree.ElementTree import _namespace_map
-                except ImportError:
-                    try:
-                        from elementtree.ElementTree import _namespace_map
-                    except ImportError:
-                        print >> sys.stderr, ("Failed to import ElementTree from any known place")
-                for key in ns:
-                    _namespace_map[ns[key]] = key
-        
-        tree = et.ElementTree(filter.xmlSensorDescription)
-        tree.write(f, encoding="UTF-8")
-        
-        #-----------------------------------------------------------
-        # create virtual procedure folder if system type is virtual
-        #-----------------------------------------------------------
-        if oty == "virtual":
-            procedureFolder = os.path.join(filter.sosConfig.virtual_processes_folder, filter.procedure)
-            if not os.path.exists(procedureFolder):
-                os.makedirs(procedureFolder)
-        
-        
-        """
-        xml_pre = ""<SensorML xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:swe="http://www.opengis.net/swe/1.0.1"
-            xmlns:gml="http://www.opengis.net/gml"
-            xmlns:xlink="http://www.w3.org/1999/xlink"
-            xmlns:dlm="http://www.ist.supsi.ch/dataloggerMD/1.0"
-            xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
-            version="1.0.1">
-            <member xlink:arcrole="urn:ogc:def:process:OGC:detector">""
- 
-        #xml_ascii = filter.xmlSensorDescription.toxml().encode('ascii','ignore')
-        
-        xml_ascii = filter.xmlSensorDescription
-        
-        xml_post = "  </member>\n</SensorML>"
-        """
-        
-        #Register the transactional operation in Log table 
-        if filter.sosConfig.transactional_log in ['True','true',1]:
-            sqlLog  = "INSERT INTO %s.tran_log (operation_trl,procedure_trl)" %(filter.sosConfig.schema)
-            sqlLog  += " VALUES ('RegisterSensor',%s)" 
-            params = (str(filter.procedure),)
-            try:
-                pgdb.executeInTransaction(sqlLog,params)
-                com=True
-            except:
-                raise Exception("SQL: %s" %(pgdb.mogrify(sqlLog,params)))
-        
-        if com==True:
-            pgdb.commitTransaction()
-            
-        #f.write(xml_pre + xml_ascii + xml_post)
-        f.close()
-        
-        
-        
-        
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import sys, os
+
+from istsoslib import sosException
+from lib.etree import et
+
+class RegisterSensorResponse:
+    #Register sensor object
+    #self.assignedObservationId
+    def __init__(self,filter,pgdb):
+
+        #-----------------------------
+        # transaction: insert procedure in DB
+        #-----------------------------
+
+        #--check if proc_name exist
+        prc_name=None
+        sqlId  = "SELECT name_prc FROM %s.procedures" %(filter.sosConfig.schema)
+        sqlId += " WHERE name_prc=%s"
+        params = (str(filter.procedure),)
+        try:
+            prc_name = pgdb.select(sqlId,params)
+        except:
+            raise Exception("SQL: %s"%(pgdb.mogrify(sqlId,params)))
+        if prc_name:
+            raise Exception("Procedure '%s' already exist, consider to change the name" %(prc_name))
+
+        #--get id_foi or create it if it does not exist yet
+        sqlId  = "SELECT id_foi FROM %s.foi" %(filter.sosConfig.schema)
+        sqlId += " WHERE name_foi=%s"
+        params=(str(filter.foiName),)
+        try:
+            id_foi= pgdb.select(sqlId,params)[0]["id_foi"]
+        except:
+            sqlId  = "SELECT id_fty FROM %s.feature_type" %(filter.sosConfig.schema)
+            sqlId += " WHERE name_fty=%s"
+            params = (str(filter.foiType),)
+            try:
+                id_fty= pgdb.select(sqlId,params)[0]["id_fty"]
+            except:
+                sqlIns  = "INSERT INTO %s.feature_type (name_fty)" %(filter.sosConfig.schema)
+                sqlIns += " VALUES (%s) RETURNING id_fty"
+                params = (str(filter.foiType),)
+                try:
+                    id_fty= pgdb.executeInTransaction(sqlIns,params)[0]["id_fty"]
+                except:
+                    raise Exception("SQL: %s"%(sqlIns))
+
+            sqlIns  = "INSERT INTO %s.foi (name_foi,desc_foi,geom_foi,id_fty_fk)" %(filter.sosConfig.schema)
+            sqlIns += " VALUES (%s,%s,st_transform(ST_GeomFromGML(%s),%s),%s) RETURNING id_foi"
+            params = (str(filter.foiName),str(filter.foiDesc),str(filter.foiGML.strip()),int(filter.sosConfig.istsosepsg),int(id_fty))
+            try:
+                id_foi = pgdb.executeInTransaction(sqlIns,params)[0]["id_foi"]
+                com=True
+            except:
+                raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+
+#==============================================================================
+#         #--get id_tru or create it if it does not exist yet
+#         sqlId  = "SELECT id_tru FROM %s.time_res_unit" %(filter.sosConfig.schema)
+#         sqlId += " WHERE name_tru=%s"
+#         params = (filter.time_res_unit,)
+#         try:
+#             id_tru = pgdb.select(sqlId,params)[0]["id_tru"]
+#         except:
+#             sqlIns  = "INSERT INTO %s.time_res_unit (name_tru)" %(filter.sosConfig.schema)
+#             sqlIns += " VALUES (%s) RETURNING id_tru"
+#             params = (str(filter.time_res_unit),)
+#             try:
+#                 id_tru = pgdb.executeInTransaction(sqlIns,params)[0]["id_tru"]
+#                 com=True
+#             except:
+#                 raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+#==============================================================================
+
+        #--get a list of observed properties id (id_opr) and check if
+        # the fileds of the <Result> data record description
+        # are found in the components listed in the <observedProperty>
+        # or create them if they do not exist yet
+        opr_ids=[]
+        for index, par in enumerate(filter.parameters):
+            #--insitu-fixed-point (this is the default if no system type defined in XML request)
+            if filter.systemType=='insitu-fixed-point' or filter.systemType == None or filter.systemType =="virtual":
+                oty = 'virtual' if filter.systemType =="virtual" else 'insitu-fixed-point'
+                if not par.split(":")[-1]=="iso8601":
+                    if par in filter.oprDef:
+                        i = filter.oprDef.index(par)
+                        oprDef = par
+                        oprName = filter.names[i]
+                        #oprDesc = filter.oprDesc[i]
+                    else:
+                        raise Exception("Field %s not found in Components %s"%(par,filter.oprDef))
+                    sqlId  = "SELECT id_opr FROM %s.observed_properties" %(filter.sosConfig.schema)
+                    sqlId += " WHERE def_opr=%s"
+                    params = (str(oprDef),)
+                    try:
+                        id_opr = pgdb.select(sqlId,params)[0]["id_opr"]
+                        opr_ids.append(id_opr)
+                    except:
+                        sqlIns  = "INSERT INTO %s.observed_properties (name_opr,def_opr)" %(filter.sosConfig.schema)
+                        sqlIns += " VALUES (%s,%s) RETURNING id_opr"
+                        params = (str(oprName),str(oprDef))
+                        #sqlIns  = "INSERT INTO %s.observed_properties (name_opr,desc_opr,def_opr)" %(filter.sosConfig.schema)
+                        #sqlIns += " VALUES (%s,%s,%s) RETURNING id_opr"
+                        #params = (str(oprName),str(oprDesc),str(oprDef))
+                        try:
+                            id_opr = pgdb.executeInTransaction(sqlIns,params)[0]["id_opr"]
+                            com=True
+                            opr_ids.append(id_opr)
+                        except:
+                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+            #--virtual
+
+            #--insitu-mobile-point
+            elif filter.systemType=='insitu-mobile-point':
+                oty = 'insitu-mobile-point'
+                if not (par.split(":")[-1] in filter.sosConfig.parGeom["x"] or par.split(":")[-1] in filter.sosConfig.parGeom["y"]
+                   or par.split(":")[-1] in filter.sosConfig.parGeom["z"] or par.split(":")[-1]=="iso8601"):
+                    if par in filter.oprDef:
+                        i = filter.oprDef.index(par)
+                        oprDef = par
+                        oprName = filter.names[i]
+                        #oprDesc = filter.oprDesc[i]
+                    else:
+                        raise Exception("Field %s not found in Components %s"%(par,filter.oprDef))
+                    sqlId  = "SELECT id_opr FROM %s.observed_properties" %(filter.sosConfig.schema)
+                    sqlId += " WHERE def_opr=%s"
+                    params = (str(oprDef),)
+                    try:
+                        id_opr = pgdb.select(sqlId,params)[0]["id_opr"]
+                        opr_ids.append(id_opr)
+                    except:
+                        sqlIns  = "INSERT INTO %s.observed_properties (name_opr,def_opr)" %(filter.sosConfig.schema)
+                        sqlIns += " VALUES (%s,%s) RETURNING id_opr"
+                        params = (str(oprName),str(oprDef))
+                        try:
+                            id_opr = pgdb.executeInTransaction(sqlIns,params)[0]["id_opr"]
+                            com=True
+                            opr_ids.append(id_opr)
+                        except:
+                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+            else:
+                raise Exception("Error: observation type not supported")
+
+        #-- get id_oty or create it if it does not exist yet
+        sqlId  = "SELECT id_oty FROM %s.obs_type" %(filter.sosConfig.schema)
+        sqlId += " WHERE name_oty=%s"
+        params = (str(oty),)
+        try:
+            id_oty = pgdb.select(sqlId,params)[0]["id_oty"]
+        except:
+            sqlIns  = "INSERT INTO %s.obs_type (name_oty,desc_oty)" %(filter.sosConfig.schema)
+            sqlIns += " VALUES (%s,%s) RETURNING id_oty"
+            params = (str(oty),None)
+            try:
+                id_oty = pgdb.executeInTransaction(sqlIns,params)[0]["id_oty"]
+                com=True
+            except:
+                raise Exception("SQL: %s"%(sqlIns))
+
+        #--get id_uom or create it if it does not exist yet
+        uom_ids=[]
+        #for uom in filter.uoms:
+        for i, uom in enumerate(filter.uoms):
+            par = filter.parameters[i]
+            if oty=='insitu-fixed-point' or oty=='virtual':
+                if not par.split(":")[-1]=="iso8601":
+                    sqlId  = "SELECT id_uom FROM %s.uoms" %(filter.sosConfig.schema)
+                    sqlId += " WHERE name_uom=%s"
+                    params = (uom,)
+                    try:
+                        id_uom = pgdb.select(sqlId,params)[0]["id_uom"]
+                        uom_ids.append(id_uom)
+                    except:
+                        sqlIns  = "INSERT INTO %s.uoms (name_uom,desc_uom)" %(filter.sosConfig.schema)
+                        sqlIns += " VALUES (%s,%s) RETURNING id_uom"
+                        params = (uom,None)
+                        try:
+                            id_uom = pgdb.executeInTransaction(sqlIns,params)[0]["id_uom"]
+                            com=True
+                            uom_ids.append(id_uom)
+                        except:
+                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+            elif oty == 'insitu-mobile-point':
+                if not (par.split(":")[-1] in filter.sosConfig.parGeom["x"] or par.split(":")[-1] in filter.sosConfig.parGeom["y"]
+                   or par.split(":")[-1] in filter.sosConfig.parGeom["z"] or par.split(":")[-1]=="iso8601") :
+                    sqlId  = "SELECT id_uom FROM %s.uoms" %(filter.sosConfig.schema)
+                    sqlId += " WHERE name_uom=%s"
+                    params = (uom,)
+                    try:
+                        id_uom = pgdb.select(sqlId,params)[0]["id_uom"]
+                        uom_ids.append(id_uom)
+                    except:
+                        sqlIns  = "INSERT INTO %s.uoms (name_uom,desc_uom)" %(filter.sosConfig.schema)
+                        sqlIns += " VALUES (%s,%s) RETURNING id_uom"
+                        params = (uom,None)
+                        try:
+                            id_uom = pgdb.executeInTransaction(sqlIns,params)[0]["id_uom"]
+                            com=True
+                            uom_ids.append(id_uom)
+                        except:
+                            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+
+            else:
+                raise Exception("Error: observation type not supported")
+
+        #--get temporary id_off or create it if it does not exist yet
+        sqlId  = "SELECT id_off FROM %s.offerings WHERE" %(filter.sosConfig.schema)
+        sqlId += " name_off='temporary'"
+        try:
+            id_off = pgdb.select(sqlId)[0]["id_off"]
+        except:
+            sqlIns ="INSERT INTO %s.offerings (name_off,desc_off) VALUES" %(filter.sosConfig.schema)
+            sqlIns += " ('temporary','temporary offering to hold self-registered procedures/sensors waiting for service adimistration acceptance') RETURNING id_off"
+            try:
+                id_off = pgdb.executeInTransaction(sqlIns)[0]["id_off"]
+                com=True
+            except:
+                raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns)))
+
+        #--insert procedure
+        sqlIns  = "INSERT INTO %s.procedures (id_foi_fk, id_oty_fk, " %(filter.sosConfig.schema)
+        sqlIns  += "name_prc, desc_prc, "
+        sqlIns  += "stime_prc, etime_prc, "
+        sqlIns  += "time_res_prc, time_acq_prc, assignedid_prc)"
+
+        #sqlIns += " VALUES (%s, %s, %s, '%s', NULL, now()::timestamptz, now()::timestamptz, %s,(select(md5(current_timestamp::text)))) RETURNING id_prc, assignedid_prc" %(id_foi,id_oty,id_tru,filter.procedure,filter.time_res_val)
+        sqlIns += " VALUES (%s, %s, %s, "
+        sqlIns += "%s, "
+        params = [id_foi,id_oty,str(filter.procedure), str(filter.proc_desc)]
+        if not filter.beginPosition=='NULL':
+            sqlIns += "%s::TIMESTAMPTZ , %s::TIMESTAMPTZ, "
+            params.extend([str(filter.beginPosition),str(filter.beginPosition)])
+        else:
+            sqlIns += "%s , %s, "
+            params.extend([None,None])
+        sqlIns += " %s, %s, (select(md5(current_timestamp::text))))"
+        params.append(filter.time_sam_val)
+        params.append(filter.time_acq_val)
+        sqlIns += " RETURNING id_prc, assignedid_prc"
+        params = tuple([None if x=='NULL' else x for x in params])
+        try:
+            ret_prc = pgdb.executeInTransaction(sqlIns,params)[0]
+            com=True
+        except:
+            raise Exception("SQL: %s"%(pgdb.mogrify(sqlIns,params)))
+
+        #--link proc_obs
+        sqlIns  = "INSERT INTO %s.proc_obs (id_prc_fk, id_uom_fk, id_opr_fk, constr_pro) VALUES " % (
+            filter.sosConfig.schema
+        )
+
+        params=[]
+
+        #print >> sys.stderr, "opr_ids: %s" % opr_ids
+        #print >> sys.stderr, "ret_prc: %s" % ret_prc
+        #print >> sys.stderr, "uom_ids: %s" % uom_ids
+        #print >> sys.stderr, "opr_ids: %s" % opr_ids
+        #print >> sys.stderr, "filter.constr: %s" % filter.constr
+
+        for i in range(len(opr_ids)):
+            params.append((
+                ret_prc["id_prc"],
+                uom_ids[i],
+                opr_ids[i],
+                filter.constr[i]
+            ))
+        sqlIns += ",".join(["%s"]*len(params))
+        sqlIns += " RETURNING id_pro"
+        try:
+            res = pgdb.executeInTransaction(sqlIns,params)
+            com=True
+        except:
+            raise Exception("SQL: %s" %(pgdb.mogrify(sqlIns,params)))
+
+        #--link off_prc
+        sqlIns  = "INSERT INTO %s.off_proc (id_off_fk, id_prc_fk)" %(filter.sosConfig.schema)
+        sqlIns  += " VALUES (%s,%s) RETURNING id_off_prc"
+        params = (id_off, ret_prc["id_prc"])
+        try:
+            res = pgdb.executeInTransaction(sqlIns,params)
+            com=True
+        except:
+            raise Exception("SQL: %s" %(pgdb.mogrify(sqlIns,params)))
+
+        self.assignedSensorId = filter.sosConfig.urn["sensor"]+ret_prc["assignedid_prc"]
+
+        #----------------------------------------
+        # create SensorML for inserted procedure
+        #----------------------------------------
+
+        f = open(os.path.join(filter.sosConfig.sensorMLpath,filter.procedure + ".xml"), 'w')
+
+        ns = {
+            'xsi': "http://www.w3.org/2001/XMLSchema-instance" ,
+            'sml': "http://www.opengis.net/sensorML/1.0.1",
+            'swe': "http://www.opengis.net/swe/1.0.1",
+            'xlink': "http://www.w3.org/1999/xlink",
+            'gml': 'http://www.opengis.net/gml'
+        }
+
+        #---map namespaces---
+        try:
+            register_namespace = et.register_namespace
+            for key in ns:
+                register_namespace(key,ns[key])
+        except AttributeError:
+            try:
+                et._namespace_map.update(ns)
+                for key in ns:
+                    et._namespace_map[ns[key]] = key
+            except AttributeError:
+                try:
+                    from xml.etree.ElementTree import _namespace_map
+                except ImportError:
+                    try:
+                        from elementtree.ElementTree import _namespace_map
+                    except ImportError:
+                        print >> sys.stderr, ("Failed to import ElementTree from any known place")
+                for key in ns:
+                    _namespace_map[ns[key]] = key
+
+        tree = et.ElementTree(filter.xmlSensorDescription)
+        tree.write(f, encoding="UTF-8")
+
+        #-----------------------------------------------------------
+        # create virtual procedure folder if system type is virtual
+        #-----------------------------------------------------------
+        if oty == "virtual":
+            procedureFolder = os.path.join(filter.sosConfig.virtual_processes_folder, filter.procedure)
+            if not os.path.exists(procedureFolder):
+                os.makedirs(procedureFolder)
+
+
+        """
+        xml_pre = ""<SensorML xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:swe="http://www.opengis.net/swe/1.0.1"
+            xmlns:gml="http://www.opengis.net/gml"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+            xmlns:dlm="http://www.ist.supsi.ch/dataloggerMD/1.0"
+            xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
+            version="1.0.1">
+            <member xlink:arcrole="urn:ogc:def:process:OGC:detector">""
+
+        #xml_ascii = filter.xmlSensorDescription.toxml().encode('ascii','ignore')
+
+        xml_ascii = filter.xmlSensorDescription
+
+        xml_post = "  </member>\n</SensorML>"
+        """
+
+        #Register the transactional operation in Log table
+        if filter.sosConfig.transactional_log in ['True','true',1]:
+            sqlLog  = "INSERT INTO %s.tran_log (operation_trl,procedure_trl)" %(filter.sosConfig.schema)
+            sqlLog  += " VALUES ('RegisterSensor',%s)"
+            params = (str(filter.procedure),)
+            try:
+                pgdb.executeInTransaction(sqlLog,params)
+                com=True
+            except:
+                raise Exception("SQL: %s" %(pgdb.mogrify(sqlLog,params)))
+
+        if com==True:
+            pgdb.commitTransaction()
+
+        #f.write(xml_pre + xml_ascii + xml_post)
+        f.close()
+
+
+
+
diff --git a/istsoslib/responders/RSresponse.pyc b/istsoslib/responders/RSresponse.pyc
index a6b6680..8133f10 100644
Binary files a/istsoslib/responders/RSresponse.pyc and b/istsoslib/responders/RSresponse.pyc differ
diff --git a/istsoslib/responders/USDresponse.py b/istsoslib/responders/USDresponse.py
index 5b4ca02..acd8637 100755
--- a/istsoslib/responders/USDresponse.py
+++ b/istsoslib/responders/USDresponse.py
@@ -1,81 +1,85 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-import psycopg2 # @TODO the right library
-import psycopg2.extras
-import os
-
-#import sosConfig
-from istsoslib import sosDatabase
-from istsoslib import sosException
-#import mx.DateTime.ISO
-from lib import isodate as iso
-
-def get_name_from_urn(stringa,urnName,sosConfig):
-    a = stringa.split(":")
-    name = a[-1]
-    urn = sosConfig.urn[urnName].split(":")
-    if len(a)>1 and not name=="iso8601":
-        for index in range(len(urn)-1):
-            if urn[index]==a[index]:
-                pass
-            else:
-                raise Exception("Urn \"%s\" is not valid: %s."%(a,urn))
-    return name
-
-class UpdateSensorDescriptionResponse:
-    #self.assignedObservationId
-    def __init__(self,filter,pgdb):
-        
-        #check assigned sensor id
-        sql  = "SELECT id_prc, name_prc FROM %s.procedures WHERE assignedid_prc='%s'" %(filter.sosConfig.schema,get_name_from_urn(filter.assignedSensorId,"sensor",filter.sosConfig))
-        try:
-            prc = pgdb.select(sql)[0]
-        except:
-            raise sosException.SOSException("InvalidParameterValue","assignedSensorId","assignedSensorId: '%s' is not valid!" %(filter.assignedSensorId))
-    
-        #----------------------------------------
-        # create SensorML for inserted procedure
-        #----------------------------------------
-        
-        f = open(filter.sosConfig.sensorMLpath + filter.procedure + ".xml", 'w')
-        
-        xml_pre = """<SensorML xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns:swe="http://www.opengis.net/swe/1.0.1"
-          xmlns:gml="http://www.opengis.net/gml"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
-          version="1.0.1">
-  <member xlink:arcrole="urn:ogc:def:process:OGC:detector">"""
- 
-        xml_ascii = filter.xmlSensorDescription.toxml().encode('ascii','ignore')
-        
-        xml_post = "  </member>\n</SensorML>"
-        
-        f.write(xml_pre + xml_ascii + xml_post)
-        f.close()
-        
-        self.procedure = prc["name_prc"]
-        
-    
-    
-    
-    
-    
-    
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import psycopg2 # @TODO the right library
+import psycopg2.extras
+import os
+
+#import sosConfig
+from istsoslib import sosDatabase
+from istsoslib import sosException
+#import mx.DateTime.ISO
+from lib import isodate as iso
+
+def get_name_from_urn(stringa,urnName,sosConfig):
+    a = stringa.split(":")
+    name = a[-1]
+    urn = sosConfig.urn[urnName].split(":")
+    if len(a)>1 and not name=="iso8601":
+        for index in range(len(urn)-1):
+            if urn[index]==a[index]:
+                pass
+            else:
+                raise Exception("Urn \"%s\" is not valid: %s."%(a,urn))
+    return name
+
+class UpdateSensorDescriptionResponse:
+    #self.assignedObservationId
+    def __init__(self,filter,pgdb):
+        
+        #check assigned sensor id
+        sql  = "SELECT id_prc, name_prc FROM %s.procedures WHERE assignedid_prc='%s'" %(filter.sosConfig.schema,get_name_from_urn(filter.assignedSensorId,"sensor",filter.sosConfig))
+        try:
+            prc = pgdb.select(sql)[0]
+        except:
+            raise sosException.SOSException("InvalidParameterValue","assignedSensorId","assignedSensorId: '%s' is not valid!" %(filter.assignedSensorId))
+    
+        #----------------------------------------
+        # create SensorML for inserted procedure
+        #----------------------------------------
+        
+        f = open(filter.sosConfig.sensorMLpath + filter.procedure + ".xml", 'w')
+        
+        xml_pre = """<SensorML xmlns:sml="http://www.opengis.net/sensorML/1.0.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns:swe="http://www.opengis.net/swe/1.0.1"
+          xmlns:gml="http://www.opengis.net/gml"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
+          version="1.0.1">
+  <member xlink:arcrole="urn:ogc:def:process:OGC:detector">"""
+ 
+        xml_ascii = filter.xmlSensorDescription.toxml().encode('ascii','ignore')
+        
+        xml_post = "  </member>\n</SensorML>"
+        
+        f.write(xml_pre + xml_ascii + xml_post)
+        f.close()
+        
+        self.procedure = prc["name_prc"]
+        
+    
+    
+    
+    
+    
+    
diff --git a/istsoslib/responders/USDresponse.pyc b/istsoslib/responders/USDresponse.pyc
new file mode 100644
index 0000000..1fa3765
Binary files /dev/null and b/istsoslib/responders/USDresponse.pyc differ
diff --git a/istsoslib/responders/__init__.py b/istsoslib/responders/__init__.py
index 5e93bf6..f7dad4c 100755
--- a/istsoslib/responders/__init__.py
+++ b/istsoslib/responders/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = ["GCresponse","DSresponse","GOresponse", "GFresponse", "IOresponse", "RSresponse", "USDresponse", "factory_response"]
diff --git a/istsoslib/responders/__init__.pyc b/istsoslib/responders/__init__.pyc
index 7af4076..9b7946d 100644
Binary files a/istsoslib/responders/__init__.pyc and b/istsoslib/responders/__init__.pyc differ
diff --git a/istsoslib/responders/factory_response.py b/istsoslib/responders/factory_response.py
index 9427452..2732dc0 100755
--- a/istsoslib/responders/factory_response.py
+++ b/istsoslib/responders/factory_response.py
@@ -1,57 +1,60 @@
-# -*- coding: utf-8 -*-
-# istsos Istituto Scienze della Terra Sensor Observation Service
-# Copyright (C) 2010 Massimiliano Cannata
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-#import sosConfig
-from istsoslib import sosException
-
-def sosFactoryResponse(sosFilter,pgdb):
-    
-    if sosFilter.request == "getcapabilities":
-        from istsoslib.responders import GCresponse
-        return GCresponse.GetCapabilitiesResponse(sosFilter,pgdb)
-    
-    elif sosFilter.request == "describesensor":
-        from istsoslib.responders import DSresponse
-        return DSresponse.DescribeSensorResponse(sosFilter,pgdb)
-    
-    elif sosFilter.request == "getobservation":
-        from istsoslib.responders import GOresponse
-        return GOresponse.observations(sosFilter,pgdb)
-    
-    elif sosFilter.request == "getfeatureofinterest":
-        from istsoslib.responders import GFresponse
-        return GFresponse.foi(sosFilter,pgdb)
-    
-    elif sosFilter.request == "insertobservation":
-        from istsoslib.responders import IOresponse
-        return IOresponse.InsertObservationResponse(sosFilter,pgdb)
-    
-    elif sosFilter.request == "registersensor":
-        from istsoslib.responders import RSresponse
-        return RSresponse.RegisterSensorResponse(sosFilter,pgdb)
-    
-    elif sosFilter.request == "updatesensordescription":
-        from istsoslib.responders import USDresponse
-        return USDresponse.UpdateSensorDescription(sosFilter,pgdb)
-   
-    else:
-        raise sosException.SOSException("InvalidRequest","request","\"request\": %s not supported" %(self.request))
-
-
-    
-
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from istsoslib import sosException
+
+def sosFactoryResponse(sosFilter,pgdb):
+    
+    if sosFilter.request == "getcapabilities":
+        from istsoslib.responders import GCresponse
+        return GCresponse.GetCapabilitiesResponse(sosFilter,pgdb)
+    
+    elif sosFilter.request == "describesensor":
+        from istsoslib.responders import DSresponse
+        return DSresponse.DescribeSensorResponse(sosFilter,pgdb)
+    
+    elif sosFilter.request == "getobservation":
+        from istsoslib.responders import GOresponse
+        return GOresponse.observations(sosFilter,pgdb)
+    
+    elif sosFilter.request == "getfeatureofinterest":
+        from istsoslib.responders import GFresponse
+        return GFresponse.foi(sosFilter,pgdb)
+    
+    elif sosFilter.request == "insertobservation":
+        from istsoslib.responders import IOresponse
+        return IOresponse.InsertObservationResponse(sosFilter,pgdb)
+    
+    elif sosFilter.request == "registersensor":
+        from istsoslib.responders import RSresponse
+        return RSresponse.RegisterSensorResponse(sosFilter,pgdb)
+    
+    elif sosFilter.request == "updatesensordescription":
+        from istsoslib.responders import USDresponse
+        return USDresponse.UpdateSensorDescription(sosFilter,pgdb)
+   
+    else:
+        raise sosException.SOSException("InvalidRequest","request","\"request\": %s not supported" %(self.request))
+
+
+    
+
diff --git a/istsoslib/responders/factory_response.pyc b/istsoslib/responders/factory_response.pyc
index b023fe4..3c30b7a 100644
Binary files a/istsoslib/responders/factory_response.pyc and b/istsoslib/responders/factory_response.pyc differ
diff --git a/istsoslib/sosDatabase.py b/istsoslib/sosDatabase.py
old mode 100755
new mode 100644
index 4478a87..b0c1646
--- a/istsoslib/sosDatabase.py
+++ b/istsoslib/sosDatabase.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,17 +18,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import psycopg2 # @TODO the right library
 import psycopg2.extras
 import psycopg2.extensions
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
 
-#import pprint
-#pp = pprint.PrettyPrinter(indent=4)
-    
-
 class Database:
     """Connect to a database"""
     user = None
diff --git a/istsoslib/sosDatabase.pyc b/istsoslib/sosDatabase.pyc
index 1f9e590..bcdb37d 100644
Binary files a/istsoslib/sosDatabase.pyc and b/istsoslib/sosDatabase.pyc differ
diff --git a/istsoslib/sosException.py b/istsoslib/sosException.py
index dba7471..6c4e724 100755
--- a/istsoslib/sosException.py
+++ b/istsoslib/sosException.py
@@ -1,6 +1,25 @@
 # -*- coding: utf-8 -*-
-
-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 import xml.sax.saxutils as sax
 
 class SOSException(ValueError):
diff --git a/istsoslib/sosException.pyc b/istsoslib/sosException.pyc
index 1954163..feaf49c 100644
Binary files a/istsoslib/sosException.pyc and b/istsoslib/sosException.pyc differ
diff --git a/istsoslib/sosUtils.py b/istsoslib/sosUtils.py
index 5c692a3..209cdda 100755
--- a/istsoslib/sosUtils.py
+++ b/istsoslib/sosUtils.py
@@ -1,5 +1,25 @@
 # -*- coding: utf-8 -*-
-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 from xml.dom import minidom
 from istsoslib import sosException
 
@@ -60,9 +80,9 @@ def ogcSpatCons2PostgisSql(ogcSpatialOperator,geomField,epsgField):
             raise sosException.SOSException("NoApplicableCode",None,"Error: srsName '%s' must be numeric!" %(epsg))
         GMLgeom = str(geometry.toxml()).replace("epsg:","EPSG:")
         if epsgField == epsg or epsg == None:
-            sql = "%s(%s,ST_GeomFromGML('%s'),%s))" %(ogcSupportedSpatialOperators[ogcOperator],geomField,GMLgeom,epsgField)
+            sql = "%s(%s,_ST_GeomFromGML('%s'),%s))" %(ogcSupportedSpatialOperators[ogcOperator],geomField,GMLgeom,epsgField)
         else:
-            sql = "%s(%s,ST_Transform(ST_Transform(ST_GeomFromGML('%s'),%s),%s))" %(ogcSupportedSpatialOperators[ogcOperator],geomField,GMLgeom,epsg,epsgField)
+            sql = "%s(%s,ST_Transform(ST_Transform(_ST_GeomFromGML('%s'),%s),%s))" %(ogcSupportedSpatialOperators[ogcOperator],geomField,GMLgeom,epsg,epsgField)
         return sql
     
     elif ogcOperator == 'ogc:BBOX':
@@ -98,9 +118,9 @@ def ogcSpatCons2PostgisSql(ogcSpatialOperator,geomField,epsgField):
             raise sosException.SOSException("NoApplicableCode",None,"Error: srsName '%s' must be numeric!" %(epsg))
         GMLgeom = str(geometry.toxml()).replace("epsg:","EPSG:")
         if epsgField == epsg or epsg == None:
-            sql = "ST_DWithin(%s,ST_GeomFromGML('%s'),%s)" %(geomField,GMLgeom,distance)
+            sql = "ST_DWithin(%s,_ST_GeomFromGML('%s'),%s)" %(geomField,GMLgeom,distance)
         else:
-            sql = "ST_DWithin(%s,ST_Transform(ST_GeomFromGML('%s'),%s),%s)" %(geomField,GMLgeom,epsgField,distance)
+            sql = "ST_DWithin(%s,ST_Transform(_ST_GeomFromGML('%s'),%s),%s)" %(geomField,GMLgeom,epsgField,distance)
         return sql
     
     elif ogcOperator in ogcUnsupportedSpatialOperators:
diff --git a/istsoslib/sosUtils.pyc b/istsoslib/sosUtils.pyc
index 12ad705..5b4fd75 100644
Binary files a/istsoslib/sosUtils.pyc and b/istsoslib/sosUtils.pyc differ
diff --git a/istsoslib/sos_version.py b/istsoslib/sos_version.py
index 5f56ddf..20abedd 100755
--- a/istsoslib/sos_version.py
+++ b/istsoslib/sos_version.py
@@ -1,2 +1,23 @@
 # -*- coding: utf-8 -*-
-version = "2.1.1"
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+version = "2.2.0"
diff --git a/istsoslib/sos_version.pyc b/istsoslib/sos_version.pyc
new file mode 100644
index 0000000..6f9ae3f
Binary files /dev/null and b/istsoslib/sos_version.pyc differ
diff --git a/lib/__init__.py b/lib/__init__.py
index 58e61f5..0ef8e2c 100755
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -1 +1,18 @@
-__all__ = [ "requests","argparse","pytz","isodate","etree","apscheduler"]
+#  -*- coding: utf-8 -*-
+# istsos WebAdmin - Istituto Scienze della Terra
+# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+__all__ = [ "requests","argparse","pytz","isodate","etree","apscheduler","twitter"]
diff --git a/lib/__init__.pyc b/lib/__init__.pyc
index 556bca0..8e5513e 100644
Binary files a/lib/__init__.pyc and b/lib/__init__.pyc differ
diff --git a/lib/apscheduler.tar.gz b/lib/apscheduler.tar.gz
new file mode 100755
index 0000000..b5943fe
Binary files /dev/null and b/lib/apscheduler.tar.gz differ
diff --git a/lib/apscheduler/__init__.py b/lib/apscheduler/__init__.py
index d93e1b3..71cc53d 100755
--- a/lib/apscheduler/__init__.py
+++ b/lib/apscheduler/__init__.py
@@ -1,3 +1,3 @@
-version_info = (2, 1, 1)
+version_info = (2, 1, 2)
 version = '.'.join(str(n) for n in version_info[:3])
 release = '.'.join(str(n) for n in version_info)
diff --git a/lib/apscheduler/__init__.pyc b/lib/apscheduler/__init__.pyc
new file mode 100755
index 0000000..cc5abdf
Binary files /dev/null and b/lib/apscheduler/__init__.pyc differ
diff --git a/lib/apscheduler/events.pyc b/lib/apscheduler/events.pyc
new file mode 100755
index 0000000..1309a6a
Binary files /dev/null and b/lib/apscheduler/events.pyc differ
diff --git a/lib/apscheduler/job.pyc b/lib/apscheduler/job.pyc
new file mode 100755
index 0000000..917aec4
Binary files /dev/null and b/lib/apscheduler/job.pyc differ
diff --git a/lib/apscheduler/jobstores/__init__.pyc b/lib/apscheduler/jobstores/__init__.pyc
new file mode 100755
index 0000000..9d0d61c
Binary files /dev/null and b/lib/apscheduler/jobstores/__init__.pyc differ
diff --git a/lib/apscheduler/jobstores/base.pyc b/lib/apscheduler/jobstores/base.pyc
new file mode 100755
index 0000000..47995e8
Binary files /dev/null and b/lib/apscheduler/jobstores/base.pyc differ
diff --git a/lib/apscheduler/jobstores/ram_store.pyc b/lib/apscheduler/jobstores/ram_store.pyc
new file mode 100755
index 0000000..fdef20c
Binary files /dev/null and b/lib/apscheduler/jobstores/ram_store.pyc differ
diff --git a/lib/apscheduler/jobstores/shelve_store.py b/lib/apscheduler/jobstores/shelve_store.py
index 172d066..e40ad4c 100755
--- a/lib/apscheduler/jobstores/shelve_store.py
+++ b/lib/apscheduler/jobstores/shelve_store.py
@@ -21,7 +21,10 @@ class ShelveJobStore(JobStore):
         self.jobs = []
         self.path = path
         self.pickle_protocol = pickle_protocol
-        self.store = shelve.open(path, 'c', self.pickle_protocol)
+        self._open_store()
+
+    def _open_store(self):
+        self.store = shelve.open(self.path, 'c', self.pickle_protocol)
 
     def _generate_id(self):
         id = None
@@ -33,7 +36,8 @@ class ShelveJobStore(JobStore):
     def add_job(self, job):
         job.id = self._generate_id()
         self.store[job.id] = job.__getstate__()
-        self.store.sync()
+        self.store.close()
+        self._open_store()
         self.jobs.append(job)
 
     def update_job(self, job):
@@ -41,11 +45,13 @@ class ShelveJobStore(JobStore):
         job_dict['next_run_time'] = job.next_run_time
         job_dict['runs'] = job.runs
         self.store[job.id] = job_dict
-        self.store.sync()
+        self.store.close()
+        self._open_store()
 
     def remove_job(self, job):
         del self.store[job.id]
-        self.store.sync()
+        self.store.close()
+        self._open_store()
         self.jobs.remove(job)
 
     def load_jobs(self):
diff --git a/lib/apscheduler/scheduler.py b/lib/apscheduler/scheduler.py
index 8cc9434..818604f 100755
--- a/lib/apscheduler/scheduler.py
+++ b/lib/apscheduler/scheduler.py
@@ -586,7 +586,10 @@ class Scheduler(object):
                 wait_seconds = time_difference(next_wakeup_time, now)
                 logger.debug('Next wakeup is due at %s (in %f seconds)',
                              next_wakeup_time, wait_seconds)
-                self._wakeup.wait(wait_seconds)
+                try:
+                    self._wakeup.wait(wait_seconds)
+                except IOError:  # Catch errno 514 on some Linux kernels
+                    pass
                 self._wakeup.clear()
             elif self.standalone:
                 logger.debug('No jobs left; shutting down scheduler')
@@ -594,7 +597,10 @@ class Scheduler(object):
                 break
             else:
                 logger.debug('No jobs; waiting until a job is added')
-                self._wakeup.wait()
+                try:
+                    self._wakeup.wait()
+                except IOError:  # Catch errno 514 on some Linux kernels
+                    pass
                 self._wakeup.clear()
 
         logger.info('Scheduler has been shut down')
diff --git a/lib/apscheduler/scheduler.pyc b/lib/apscheduler/scheduler.pyc
new file mode 100755
index 0000000..64bc4bd
Binary files /dev/null and b/lib/apscheduler/scheduler.pyc differ
diff --git a/lib/apscheduler/threadpool.pyc b/lib/apscheduler/threadpool.pyc
new file mode 100755
index 0000000..7305bd0
Binary files /dev/null and b/lib/apscheduler/threadpool.pyc differ
diff --git a/lib/apscheduler/triggers/__init__.pyc b/lib/apscheduler/triggers/__init__.pyc
new file mode 100755
index 0000000..916fc98
Binary files /dev/null and b/lib/apscheduler/triggers/__init__.pyc differ
diff --git a/lib/apscheduler/triggers/cron/__init__.pyc b/lib/apscheduler/triggers/cron/__init__.pyc
new file mode 100755
index 0000000..4688247
Binary files /dev/null and b/lib/apscheduler/triggers/cron/__init__.pyc differ
diff --git a/lib/apscheduler/triggers/cron/expressions.pyc b/lib/apscheduler/triggers/cron/expressions.pyc
new file mode 100755
index 0000000..4622bc9
Binary files /dev/null and b/lib/apscheduler/triggers/cron/expressions.pyc differ
diff --git a/lib/apscheduler/triggers/cron/fields.pyc b/lib/apscheduler/triggers/cron/fields.pyc
new file mode 100755
index 0000000..9dd2a37
Binary files /dev/null and b/lib/apscheduler/triggers/cron/fields.pyc differ
diff --git a/lib/apscheduler/triggers/interval.pyc b/lib/apscheduler/triggers/interval.pyc
new file mode 100755
index 0000000..3a370e1
Binary files /dev/null and b/lib/apscheduler/triggers/interval.pyc differ
diff --git a/lib/apscheduler/triggers/simple.pyc b/lib/apscheduler/triggers/simple.pyc
new file mode 100755
index 0000000..d867b09
Binary files /dev/null and b/lib/apscheduler/triggers/simple.pyc differ
diff --git a/lib/apscheduler/util.pyc b/lib/apscheduler/util.pyc
new file mode 100755
index 0000000..1e61bd2
Binary files /dev/null and b/lib/apscheduler/util.pyc differ
diff --git a/lib/argparse.pyc b/lib/argparse.pyc
index 00dfd12..c603c7e 100644
Binary files a/lib/argparse.pyc and b/lib/argparse.pyc differ
diff --git a/lib/etree.py b/lib/etree.py
old mode 100755
new mode 100644
index bc3930c..35a7de7
--- a/lib/etree.py
+++ b/lib/etree.py
@@ -1,4 +1,19 @@
-# -*- coding: utf-8 -*-
+#  -*- coding: utf-8 -*-
+# istsos WebAdmin - Istituto Scienze della Terra
+# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 try:
   from lxml import et
@@ -25,4 +40,4 @@ except ImportError:
           lib = "ElementTree"
         except ImportError:
           print >> sys.stderr, ("Failed to import ElementTree from any known place")
-          
\ No newline at end of file
+          
diff --git a/lib/etree.pyc b/lib/etree.pyc
index a41bb3d..527926e 100644
Binary files a/lib/etree.pyc and b/lib/etree.pyc differ
diff --git a/lib/isodate/__init__.py b/lib/isodate/__init__.py
index 7eccd3f..378a0c3 100755
--- a/lib/isodate/__init__.py
+++ b/lib/isodate/__init__.py
@@ -14,11 +14,11 @@
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -28,12 +28,12 @@
 Import all essential functions and constants to re-export them here for easy
 access.
 
-This module contains also various pre-defined ISO 8601 format strings. 
+This module contains also various pre-defined ISO 8601 format strings.
 '''
 from lib.isodate.isodates import parse_date, date_isoformat
 from lib.isodate.isotime import parse_time, time_isoformat
 from lib.isodate.isodatetime import parse_datetime, datetime_isoformat
-from lib.isodate.isoduration import parse_duration, duration_isoformat, Duration
+from lib.isodate.isoduration import parse_duration, duration_isoformat
 from lib.isodate.isoerror import ISO8601Error
 from lib.isodate.isotzinfo import parse_tzinfo, tz_isoformat
 from lib.isodate.tzinfo import UTC, FixedOffset, LOCAL
@@ -53,3 +53,18 @@ from lib.isodate.isostrf import DT_BAS_ORD_COMPLETE, DT_EXT_ORD_COMPLETE
 from lib.isodate.isostrf import DT_BAS_WEEK_COMPLETE, DT_EXT_WEEK_COMPLETE
 from lib.isodate.isostrf import D_DEFAULT, D_WEEK, D_ALT_EXT, D_ALT_BAS
 from lib.isodate.isostrf import D_ALT_BAS_ORD, D_ALT_EXT_ORD
+
+__all__ = (parse_date, date_isoformat, parse_time, time_isoformat,
+           parse_datetime, datetime_isoformat, parse_duration,
+           duration_isoformat, ISO8601Error, parse_tzinfo,
+           tz_isoformat, UTC, FixedOffset, LOCAL, Duration,
+           strftime, DATE_BAS_COMPLETE, DATE_BAS_ORD_COMPLETE,
+           DATE_BAS_WEEK, DATE_BAS_WEEK_COMPLETE, DATE_CENTURY,
+           DATE_EXT_COMPLETE, DATE_EXT_ORD_COMPLETE, DATE_EXT_WEEK,
+           DATE_EXT_WEEK_COMPLETE, DATE_MONTH, DATE_YEAR,
+           TIME_BAS_COMPLETE, TIME_BAS_MINUTE, TIME_EXT_COMPLETE,
+           TIME_EXT_MINUTE, TIME_HOUR, TZ_BAS, TZ_EXT, TZ_HOUR,
+           DT_BAS_COMPLETE, DT_EXT_COMPLETE, DT_BAS_ORD_COMPLETE,
+           DT_EXT_ORD_COMPLETE, DT_BAS_WEEK_COMPLETE,
+           DT_EXT_WEEK_COMPLETE, D_DEFAULT, D_WEEK, D_ALT_EXT,
+           D_ALT_BAS, D_ALT_BAS_ORD, D_ALT_EXT_ORD)
diff --git a/lib/isodate/__init__.pyc b/lib/isodate/__init__.pyc
index 859702e..32663f0 100644
Binary files a/lib/isodate/__init__.pyc and b/lib/isodate/__init__.pyc differ
diff --git a/lib/isodate/duration.py b/lib/isodate/duration.py
index b8ec98b..b44faa8 100755
--- a/lib/isodate/duration.py
+++ b/lib/isodate/duration.py
@@ -31,13 +31,22 @@ The class Duration allows to define durations in years and months and can be
 used as limited replacement for timedelta objects.
 '''
 from datetime import date, datetime, timedelta
+from decimal import Decimal, ROUND_FLOOR
 
 
 def fquotmod(val, low, high):
     '''
     A divmod function with boundaries.
+
     '''
-    div, mod = divmod(val - low, high - low)
+    # assumes that all the maths is done with Decimals.
+    # divmod for Decimal uses truncate instead of floor as builtin
+    # divmod, so we have to do it manually here.
+    a, b = val - low, high - low
+    div = (a / b).to_integral(ROUND_FLOOR)
+    mod = a - div * b
+    # if we were not usig Decimal, it would look like this.
+    # div, mod = divmod(val - low, high - low)
     mod += low
     return int(div), mod
 
@@ -83,11 +92,21 @@ class Duration(object):
         '''
         Initialise this Duration instance with the given parameters.
         '''
+        if not isinstance(months, Decimal):
+            months = Decimal(str(months))
+        if not isinstance(years, Decimal):
+            years = Decimal(str(years))
         self.months = months
         self.years = years
         self.tdelta = timedelta(days, seconds, microseconds, milliseconds,
                                 minutes, hours, weeks)
 
+    def __getstate__(self):
+        return self.__dict__
+
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+
     def __getattr__(self, name):
         '''
         Provide direct access to attributes of included timedelta instance.
@@ -111,9 +130,9 @@ class Duration(object):
         Return a string suitable for repr(x) calls.
         '''
         return "%s.%s(%d, %d, %d, years=%d, months=%d)" % (
-                self.__class__.__module__, self.__class__.__name__,
-                self.tdelta.days, self.tdelta.seconds,
-                self.tdelta.microseconds, self.years, self.months)
+            self.__class__.__module__, self.__class__.__name__,
+            self.tdelta.days, self.tdelta.seconds,
+            self.tdelta.microseconds, self.years, self.months)
 
     def __neg__(self):
         """
@@ -140,6 +159,10 @@ class Duration(object):
             newduration.tdelta = self.tdelta + other.tdelta
             return newduration
         if isinstance(other, (date, datetime)):
+            if (not(float(self.years).is_integer()
+                    and float(self.months).is_integer())):
+                raise ValueError('fractional years or months not supported'
+                                 ' for date calculations')
             newmonth = other.month + self.months
             carry, newmonth = fquotmod(newmonth, 1, 13)
             newyear = other.year + self.years + carry
@@ -162,9 +185,13 @@ class Duration(object):
             newduration.tdelta = self.tdelta + other
             return newduration
         if isinstance(other, (date, datetime)):
-            newmonth = int(other.month + self.months)
+            if (not(float(self.years).is_integer()
+                    and float(self.months).is_integer())):
+                raise ValueError('fractional years or months not supported'
+                                 ' for date calculations')
+            newmonth = other.month + self.months
             carry, newmonth = fquotmod(newmonth, 1, 13)
-            newyear = int(other.year + self.years + carry)
+            newyear = other.year + self.years + carry
             maxdays = max_days_in_month(newyear, newmonth)
             if other.day > maxdays:
                 newday = maxdays
@@ -197,8 +224,12 @@ class Duration(object):
         It is possible to subtract Duration objecs from date, datetime and
         timedelta objects.
         '''
-        #print '__rsub__:', self, other
+        # print '__rsub__:', self, other
         if isinstance(other, (date, datetime)):
+            if (not(float(self.years).is_integer()
+                    and float(self.months).is_integer())):
+                raise ValueError('fractional years or months not supported'
+                                 ' for date calculations')
             newmonth = other.month - self.months
             carry, newmonth = fquotmod(newmonth, 1, 13)
             newyear = other.year - self.years + carry
@@ -221,13 +252,14 @@ class Duration(object):
         If the years, month part and the timedelta part are both equal, then
         the two Durations are considered equal.
         '''
-        if (isinstance(other, timedelta) and
-            self.years == 0 and self.months == 0):
+        if ((isinstance(other, timedelta) and
+             self.years == 0 and self.months == 0)):
             return self.tdelta == other
         if not isinstance(other, Duration):
             return NotImplemented
-        if ((self.years * 12 + self.months) ==
-            (other.years * 12 + other.months) and self.tdelta == other.tdelta):
+        if (((self.years * 12 + self.months) ==
+             (other.years * 12 + other.months)
+             and self.tdelta == other.tdelta)):
             return True
         return False
 
@@ -236,16 +268,19 @@ class Duration(object):
         If the years, month part or the timedelta part is not equal, then
         the two Durations are considered not equal.
         '''
-        if isinstance(other, timedelta) and self.years == 0 and self.months == 0:
+        if ((isinstance(other, timedelta)
+             and self.years == 0
+             and self.months == 0)):
             return self.tdelta != other
         if not isinstance(other, Duration):
             return NotImplemented
-        if ((self.years * 12 + self.months) !=
-            (other.years * 12 + other.months) or self.tdelta != other.tdelta):
+        if (((self.years * 12 + self.months) !=
+             (other.years * 12 + other.months)
+             or self.tdelta != other.tdelta)):
             return True
         return False
 
-    def todatetime(self, start=None, end=None):
+    def totimedelta(self, start=None, end=None):
         '''
         Convert this duration into a timedelta object.
 
diff --git a/lib/isodate/duration.pyc b/lib/isodate/duration.pyc
index dd8ef1a..e37794c 100644
Binary files a/lib/isodate/duration.pyc and b/lib/isodate/duration.pyc differ
diff --git a/lib/isodate/isodates.py b/lib/isodate/isodates.py
index ca55489..fc36cd7 100755
--- a/lib/isodate/isodates.py
+++ b/lib/isodate/isodates.py
@@ -14,11 +14,11 @@
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -42,18 +42,19 @@ DATE_REGEX_CACHE = {}
 # A dictionary to cache pre-compiled regular expressions.
 # A set of regular expressions is identified, by number of year digits allowed
 # and whether a plus/minus sign is required or not. (This option is changeable
-# only for 4 digit years).  
+# only for 4 digit years).
+
 
 def build_date_regexps(yeardigits=4, expanded=False):
     '''
     Compile set of regular expressions to parse ISO dates. The expressions will
     be created only if they are not already in REGEX_CACHE.
-    
+
     It is necessary to fix the number of year digits, else it is not possible
     to automatically distinguish between various ISO date formats.
-    
+
     ISO 8601 allows more than 4 digit years, on prior agreement, but then a +/-
-    sign is required (expanded format). To support +/- sign for 4 digit years, 
+    sign is required (expanded format). To support +/- sign for 4 digit years,
     the expanded parameter needs to be set to True.
     '''
     if yeardigits != 4:
@@ -73,7 +74,7 @@ def build_date_regexps(yeardigits=4, expanded=False):
                                       % (sign, yeardigits)))
         #    YYYYMMDD or +- YYYYYYMMDD... basic date format
         cache_entry.append(re.compile(r"(?P<sign>[+-]){%d}(?P<year>[0-9]{%d})"
-                                      r"(?P<month>[0-9]{2})(?P<day>[0-9]{2})" 
+                                      r"(?P<month>[0-9]{2})(?P<day>[0-9]{2})"
                                       % (sign, yeardigits)))
         # 2. complete week dates:
         #    YYYY-Www-D or +-YYYYYY-Www-D ... extended week date
@@ -98,7 +99,7 @@ def build_date_regexps(yeardigits=4, expanded=False):
         cache_entry.append(re.compile(r"(?P<sign>[+-]){%d}(?P<year>[0-9]{%d})"
                                       r"-W(?P<week>[0-9]{2})"
                                       % (sign, yeardigits)))
-        #    YYYYWww or +-YYYYYYWww ... basic reduced accuracy week date 
+        #    YYYYWww or +-YYYYYYWww ... basic reduced accuracy week date
         cache_entry.append(re.compile(r"(?P<sign>[+-]){%d}(?P<year>[0-9]{%d})W"
                                       r"(?P<week>[0-9]{2})"
                                       % (sign, yeardigits)))
@@ -120,18 +121,19 @@ def build_date_regexps(yeardigits=4, expanded=False):
         DATE_REGEX_CACHE[(yeardigits, expanded)] = cache_entry
     return DATE_REGEX_CACHE[(yeardigits, expanded)]
 
+
 def parse_date(datestring, yeardigits=4, expanded=False):
     '''
     Parse an ISO 8601 date string into a datetime.date object.
-    
+
     As the datetime.date implementation is limited to dates starting from
     0001-01-01, negative dates (BC) and year 0 can not be parsed by this
     method.
-    
+
     For incomplete dates, this method chooses the first day for it. For
-    instance if only a century is given, this method returns the 1st of 
+    instance if only a century is given, this method returns the 1st of
     January in year 1 of this century.
-    
+
     supported formats: (expanded formats are shown with 6 digits for year)
       YYYYMMDD    +-YYYYYYMMDD      basic complete date
       YYYY-MM-DD  +-YYYYYY-MM-DD    extended complete date
@@ -149,10 +151,10 @@ def parse_date(datestring, yeardigits=4, expanded=False):
     @param yeardigits: how many digits are used to represent a year
     @param expanded: if True then +/- signs are allowed. This parameter
                      is forced to True, if yeardigits != 4
-                     
+
     @return: a datetime.date instance represented by datestring
     @raise ISO8601Error: if this function can not parse the datestring
-    @raise ValueError: if datestring can not be represented by datetime.date 
+    @raise ValueError: if datestring can not be represented by datetime.date
     '''
     if yeardigits != 4:
         expanded = True
@@ -163,10 +165,10 @@ def parse_date(datestring, yeardigits=4, expanded=False):
             groups = match.groupdict()
             # sign, century, year, month, week, day,
             # FIXME: negative dates not possible with python standard types
-            sign = (groups['sign'] == '-' and -1) or 1 
+            sign = (groups['sign'] == '-' and -1) or 1
             if 'century' in groups:
                 return date(sign * (int(groups['century']) * 100 + 1), 1, 1)
-            if not 'month' in groups: # weekdate or ordinal date
+            if 'month' not in groups:  # weekdate or ordinal date
                 ret = date(sign * int(groups['year']), 1, 1)
                 if 'week' in groups:
                     isotuple = ret.isocalendar()
@@ -175,10 +177,10 @@ def parse_date(datestring, yeardigits=4, expanded=False):
                     else:
                         days = 1
                     # if first week in year, do weeks-1
-                    return ret + timedelta(weeks=int(groups['week']) - 
-                                            (((isotuple[1] == 1) and 1) or 0),
-                                           days = -isotuple[2] + days)
-                elif 'day' in groups: # ordinal date
+                    return ret + timedelta(weeks=int(groups['week']) -
+                                           (((isotuple[1] == 1) and 1) or 0),
+                                           days=-isotuple[2] + days)
+                elif 'day' in groups:  # ordinal date
                     return ret + timedelta(days=int(groups['day'])-1)
                 else:  # year date
                     return ret
@@ -187,15 +189,16 @@ def parse_date(datestring, yeardigits=4, expanded=False):
                 day = 1
             else:
                 day = int(groups['day'])
-            return date(sign * int(groups['year']), 
+            return date(sign * int(groups['year']),
                         int(groups['month']) or 1, day)
     raise ISO8601Error('Unrecognised ISO 8601 date format: %r' % datestring)
 
+
 def date_isoformat(tdate, format=DATE_EXT_COMPLETE, yeardigits=4):
     '''
-    Format date strings. 
-    
-    This method is just a wrapper around lib.isodate.isostrf.strftime and uses
+    Format date strings.
+
+    This method is just a wrapper around isodate.isostrf.strftime and uses
     Date-Extended-Complete as default format.
     '''
     return strftime(tdate, format, yeardigits)
diff --git a/lib/isodate/isodates.pyc b/lib/isodate/isodates.pyc
index 99f88f7..a6b74ce 100644
Binary files a/lib/isodate/isodates.pyc and b/lib/isodate/isodates.pyc differ
diff --git a/lib/isodate/isodatetime.py b/lib/isodate/isodatetime.py
index ad7115a..a0213fe 100755
--- a/lib/isodate/isodatetime.py
+++ b/lib/isodate/isodatetime.py
@@ -14,11 +14,11 @@
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -35,27 +35,34 @@ from datetime import datetime
 from lib.isodate.isostrf import strftime
 from lib.isodate.isostrf import DATE_EXT_COMPLETE, TIME_EXT_COMPLETE, TZ_EXT
 from lib.isodate.isodates import parse_date
+from lib.isodate.isoerror import ISO8601Error
 from lib.isodate.isotime import parse_time
 
+
 def parse_datetime(datetimestring):
     '''
     Parses ISO 8601 date-times into datetime.datetime objects.
-    
+
     This function uses parse_date and parse_time to do the job, so it allows
     more combinations of date and time representations, than the actual
     ISO 8601:2004 standard allows.
     '''
-    datestring, timestring = datetimestring.split('T')
+    try:
+        datestring, timestring = datetimestring.split('T')
+    except ValueError:
+        raise ISO8601Error("ISO 8601 time designator 'T' missing. Unable to"
+                           " parse datetime string %r" % datetimestring)
     tmpdate = parse_date(datestring)
     tmptime = parse_time(timestring)
     return datetime.combine(tmpdate, tmptime)
 
-def datetime_isoformat(tdt, format=DATE_EXT_COMPLETE + 'T' + 
-                                   TIME_EXT_COMPLETE + TZ_EXT):
+
+def datetime_isoformat(tdt, format=DATE_EXT_COMPLETE + 'T' +
+                       TIME_EXT_COMPLETE + TZ_EXT):
     '''
-    Format datetime strings. 
-    
-    This method is just a wrapper around lib.isodate.isostrf.strftime and uses
+    Format datetime strings.
+
+    This method is just a wrapper around isodate.isostrf.strftime and uses
     Extended-Complete as default format.
     '''
     return strftime(tdt, format)
diff --git a/lib/isodate/isodatetime.pyc b/lib/isodate/isodatetime.pyc
index 12099ea..518687b 100644
Binary files a/lib/isodate/isodatetime.pyc and b/lib/isodate/isodatetime.pyc differ
diff --git a/lib/isodate/isoduration.py b/lib/isodate/isoduration.py
index f56b627..a1f33f6 100755
--- a/lib/isodate/isoduration.py
+++ b/lib/isodate/isoduration.py
@@ -31,6 +31,7 @@ It also provides a wrapper to strftime. This wrapper makes it easier to
 format timedelta or Duration instances as ISO conforming strings.
 '''
 from datetime import timedelta
+from decimal import Decimal
 import re
 
 from lib.isodate.duration import Duration
@@ -38,14 +39,15 @@ from lib.isodate.isoerror import ISO8601Error
 from lib.isodate.isodatetime import parse_datetime
 from lib.isodate.isostrf import strftime, D_DEFAULT
 
-ISO8601_PERIOD_REGEX = re.compile(r"^(?P<sign>[+-])?"
-                r"P(?P<years>[0-9]+([,.][0-9]+)?Y)?"
-                r"(?P<months>[0-9]+([,.][0-9]+)?M)?"
-                r"(?P<weeks>[0-9]+([,.][0-9]+)?W)?"
-                r"(?P<days>[0-9]+([,.][0-9]+)?D)?"
-                r"((?P<separator>T)(?P<hours>[0-9]+([,.][0-9]+)?H)?"
-                r"(?P<minutes>[0-9]+([,.][0-9]+)?M)?"
-                r"(?P<seconds>[0-9]+([,.][0-9]+)?S)?)?$")
+ISO8601_PERIOD_REGEX = re.compile(
+    r"^(?P<sign>[+-])?"
+    r"P(?P<years>[0-9]+([,.][0-9]+)?Y)?"
+    r"(?P<months>[0-9]+([,.][0-9]+)?M)?"
+    r"(?P<weeks>[0-9]+([,.][0-9]+)?W)?"
+    r"(?P<days>[0-9]+([,.][0-9]+)?D)?"
+    r"((?P<separator>T)(?P<hours>[0-9]+([,.][0-9]+)?H)?"
+    r"(?P<minutes>[0-9]+([,.][0-9]+)?M)?"
+    r"(?P<seconds>[0-9]+([,.][0-9]+)?S)?)?$")
 # regular expression to parse ISO duartion strings.
 
 
@@ -102,8 +104,13 @@ def parse_duration(datestring):
         if key not in ('separator', 'sign'):
             if val is None:
                 groups[key] = "0n"
-            #print groups[key]
-            groups[key] = float(groups[key][:-1].replace(',', '.'))
+            # print groups[key]
+            if key in ('years', 'months'):
+                groups[key] = Decimal(groups[key][:-1].replace(',', '.'))
+            else:
+                # these values are passed into a timedelta object,
+                # which works with floats.
+                groups[key] = float(groups[key][:-1].replace(',', '.'))
     if groups["years"] == 0 and groups["months"] == 0:
         ret = timedelta(days=groups["days"], hours=groups["hours"],
                         minutes=groups["minutes"], seconds=groups["seconds"],
@@ -124,15 +131,16 @@ def duration_isoformat(tduration, format=D_DEFAULT):
     '''
     Format duration strings.
 
-    This method is just a wrapper around lib.isodate.isostrf.strftime and uses
+    This method is just a wrapper around isodate.isostrf.strftime and uses
     P%P (D_DEFAULT) as default format.
     '''
     # TODO: implement better decision for negative Durations.
     #       should be done in Duration class in consistent way with timedelta.
-    if ((isinstance(tduration, Duration) and (tduration.years < 0 or
-                                             tduration.months < 0 or
-                                             tduration.tdelta < timedelta(0)))
-        or (isinstance(tduration, timedelta) and (tduration < timedelta(0)))):
+    if (((isinstance(tduration, Duration)
+          and (tduration.years < 0 or tduration.months < 0
+               or tduration.tdelta < timedelta(0)))
+         or (isinstance(tduration, timedelta)
+             and (tduration < timedelta(0))))):
         ret = '-'
     else:
         ret = ''
diff --git a/lib/isodate/isoduration.pyc b/lib/isodate/isoduration.pyc
index 08caa5d..5c18252 100644
Binary files a/lib/isodate/isoduration.pyc and b/lib/isodate/isoduration.pyc differ
diff --git a/lib/isodate/isoerror.py b/lib/isodate/isoerror.py
index b690bfe..e7b211b 100755
--- a/lib/isodate/isoerror.py
+++ b/lib/isodate/isoerror.py
@@ -14,11 +14,11 @@
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -28,5 +28,6 @@
 This module defines all exception classes in the whole package.
 '''
 
-class ISO8601Error(Exception):
+
+class ISO8601Error(ValueError):
     '''Raised when the given ISO string can not be parsed.'''
diff --git a/lib/isodate/isoerror.pyc b/lib/isodate/isoerror.pyc
index 33c7691..3ef906b 100644
Binary files a/lib/isodate/isoerror.pyc and b/lib/isodate/isoerror.pyc differ
diff --git a/lib/isodate/isostrf.py b/lib/isodate/isostrf.py
index 7bf0fe6..f598200 100755
--- a/lib/isodate/isostrf.py
+++ b/lib/isodate/isostrf.py
@@ -69,10 +69,10 @@ DT_EXT_COMPLETE = DATE_EXT_COMPLETE + 'T' + TIME_EXT_COMPLETE + TZ_EXT
 DT_BAS_COMPLETE = DATE_BAS_COMPLETE + 'T' + TIME_BAS_COMPLETE + TZ_BAS
 DT_EXT_ORD_COMPLETE = DATE_EXT_ORD_COMPLETE + 'T' + TIME_EXT_COMPLETE + TZ_EXT
 DT_BAS_ORD_COMPLETE = DATE_BAS_ORD_COMPLETE + 'T' + TIME_BAS_COMPLETE + TZ_BAS
-DT_EXT_WEEK_COMPLETE = DATE_EXT_WEEK_COMPLETE + 'T' + TIME_EXT_COMPLETE +\
-                       TZ_EXT
-DT_BAS_WEEK_COMPLETE = DATE_BAS_WEEK_COMPLETE + 'T' + TIME_BAS_COMPLETE +\
-                       TZ_BAS
+DT_EXT_WEEK_COMPLETE = (DATE_EXT_WEEK_COMPLETE + 'T' +
+                        TIME_EXT_COMPLETE + TZ_EXT)
+DT_BAS_WEEK_COMPLETE = (DATE_BAS_WEEK_COMPLETE + 'T' +
+                        TIME_BAS_COMPLETE + TZ_BAS)
 
 # Duration formts
 D_DEFAULT = 'P%P'
@@ -83,37 +83,39 @@ D_ALT_EXT_ORD = 'P' + DATE_EXT_ORD_COMPLETE + 'T' + TIME_EXT_COMPLETE
 D_ALT_BAS_ORD = 'P' + DATE_BAS_ORD_COMPLETE + 'T' + TIME_BAS_COMPLETE
 
 STRF_DT_MAP = {'%d': lambda tdt, yds: '%02d' % tdt.day,
-               '%f': lambda tdt, yds: '%d' % tdt.microsecond,
+               '%f': lambda tdt, yds: '%06d' % tdt.microsecond,
                '%H': lambda tdt, yds: '%02d' % tdt.hour,
                '%j': lambda tdt, yds: '%03d' % (tdt.toordinal() -
-                                            date(tdt.year, 1, 1).toordinal() +
-                                            1),
+                                                date(tdt.year,
+                                                     1, 1).toordinal() +
+                                                1),
                '%m': lambda tdt, yds: '%02d' % tdt.month,
                '%M': lambda tdt, yds: '%02d' % tdt.minute,
                '%S': lambda tdt, yds: '%02d' % tdt.second,
                '%w': lambda tdt, yds: '%1d' % tdt.isoweekday(),
                '%W': lambda tdt, yds: '%02d' % tdt.isocalendar()[1],
-               '%Y': lambda tdt, yds: (((yds != 4) and '+') or '') +\
-                                   (('%%0%dd' % yds) % tdt.year),
-               '%C': lambda tdt, yds: (((yds != 4) and '+') or '') +\
-                                   (('%%0%dd' % (yds - 2)) % (tdt.year / 100)),
+               '%Y': lambda tdt, yds: (((yds != 4) and '+') or '') +
+                                      (('%%0%dd' % yds) % tdt.year),
+               '%C': lambda tdt, yds: (((yds != 4) and '+') or '') +
+                                      (('%%0%dd' % (yds - 2)) %
+                                       (tdt.year / 100)),
                '%h': lambda tdt, yds: tz_isoformat(tdt, '%h'),
                '%Z': lambda tdt, yds: tz_isoformat(tdt, '%Z'),
                '%z': lambda tdt, yds: tz_isoformat(tdt, '%z'),
                '%%': lambda tdt, yds: '%'}
 
 STRF_D_MAP = {'%d': lambda tdt, yds: '%02d' % tdt.days,
-              '%f': lambda tdt, yds: '%d' % tdt.microseconds,
+              '%f': lambda tdt, yds: '%06d' % tdt.microseconds,
               '%H': lambda tdt, yds: '%02d' % (tdt.seconds / 60 / 60),
               '%m': lambda tdt, yds: '%02d' % tdt.months,
               '%M': lambda tdt, yds: '%02d' % ((tdt.seconds / 60) % 60),
               '%S': lambda tdt, yds: '%02d' % (tdt.seconds % 60),
               '%W': lambda tdt, yds: '%02d' % (abs(tdt.days / 7)),
-              '%Y': lambda tdt, yds: (((yds != 4) and '+') or '') +\
-                                   (('%%0%dd' % yds) % tdt.years),
-              '%C': lambda tdt, yds: (((yds != 4) and '+') or '') +\
-                                   (('%%0%dd' % (yds - 2)) %
-                                    (tdt.years / 100)),
+              '%Y': lambda tdt, yds: (((yds != 4) and '+') or '') +
+                                     (('%%0%dd' % yds) % tdt.years),
+              '%C': lambda tdt, yds: (((yds != 4) and '+') or '') +
+                                     (('%%0%dd' % (yds - 2)) %
+                                      (tdt.years / 100)),
               '%%': lambda tdt, yds: '%'}
 
 
@@ -183,24 +185,28 @@ def _strfdt(tdt, format, yeardigits=4):
 
 
 def strftime(tdt, format, yeardigits=4):
-    '''
-    Directive    Meaning    Notes
+    '''Directive    Meaning    Notes
     %d    Day of the month as a decimal number [01,31].
-    %f    Microsecond as a decimal number [0,999999], zero-padded on the left (1)
+    %f    Microsecond as a decimal number [0,999999], zero-padded
+          on the left (1)
     %H    Hour (24-hour clock) as a decimal number [00,23].
     %j    Day of the year as a decimal number [001,366].
     %m    Month as a decimal number [01,12].
     %M    Minute as a decimal number [00,59].
     %S    Second as a decimal number [00,61].    (3)
     %w    Weekday as a decimal number [0(Monday),6].
-    %W    Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0.    (4)
+    %W    Week number of the year (Monday as the first day of the week)
+          as a decimal number [00,53]. All days in a new year preceding the
+          first Monday are considered to be in week 0.  (4)
     %Y    Year with century as a decimal number. [0000,9999]
     %C    Century as a decimal number. [00,99]
-    %z    UTC offset in the form +HHMM or -HHMM (empty string if the the object is naive).    (5)
+    %z    UTC offset in the form +HHMM or -HHMM (empty string if the
+          object is naive).    (5)
     %Z    Time zone name (empty string if the object is naive).
     %P    ISO8601 duration format.
     %p    ISO8601 duration format in weeks.
     %%    A literal '%' character.
+
     '''
     if isinstance(tdt, (timedelta, Duration)):
         return _strfduration(tdt, format, yeardigits)
diff --git a/lib/isodate/isostrf.pyc b/lib/isodate/isostrf.pyc
index c21968e..8bea013 100644
Binary files a/lib/isodate/isostrf.pyc and b/lib/isodate/isostrf.pyc differ
diff --git a/lib/isodate/isotime.py b/lib/isodate/isotime.py
index 46510d9..2358a8a 100755
--- a/lib/isodate/isotime.py
+++ b/lib/isodate/isotime.py
@@ -123,18 +123,20 @@ def parse_time(timestring):
                                   int(groups['tzhour'] or 0),
                                   int(groups['tzmin'] or 0))
             if 'second' in groups:
-                second = Decimal(groups['second'])
+                # round to microseconds if fractional seconds are more precise
+                second = Decimal(groups['second']).quantize(Decimal('.000001'))
                 microsecond = (second - int(second)) * long(1e6)
                 # int(...) ... no rounding
                 # to_integral() ... rounding
                 return time(int(groups['hour']), int(groups['minute']),
-                            int(second), microsecond.to_integral(), tzinfo)
+                            int(second), int(microsecond.to_integral()),
+                            tzinfo)
             if 'minute' in groups:
                 minute = Decimal(groups['minute'])
                 second = (minute - int(minute)) * 60
                 microsecond = (second - int(second)) * long(1e6)
                 return time(int(groups['hour']), int(minute), int(second),
-                            microsecond.to_integral(), tzinfo)
+                            int(microsecond.to_integral()), tzinfo)
             else:
                 microsecond, second, minute = 0, 0, 0
             hour = Decimal(groups['hour'])
@@ -142,7 +144,7 @@ def parse_time(timestring):
             second = (minute - int(minute)) * 60
             microsecond = (second - int(second)) * long(1e6)
             return time(int(hour), int(minute), int(second),
-                        microsecond.to_integral(), tzinfo)
+                        int(microsecond.to_integral()), tzinfo)
     raise ISO8601Error('Unrecognised ISO 8601 time format: %r' % timestring)
 
 
@@ -150,7 +152,7 @@ def time_isoformat(ttime, format=TIME_EXT_COMPLETE + TZ_EXT):
     '''
     Format time strings.
 
-    This method is just a wrapper around lib.isodate.isostrf.strftime and uses
+    This method is just a wrapper around isodate.isostrf.strftime and uses
     Time-Extended-Complete with extended time zone as default format.
     '''
     return strftime(ttime, format)
diff --git a/lib/isodate/isotime.pyc b/lib/isodate/isotime.pyc
index bf9cb84..b6b2db8 100644
Binary files a/lib/isodate/isotime.pyc and b/lib/isodate/isotime.pyc differ
diff --git a/lib/isodate/isotzinfo.py b/lib/isodate/isotzinfo.py
index 4a46ca1..99e6b30 100755
--- a/lib/isodate/isotzinfo.py
+++ b/lib/isodate/isotzinfo.py
@@ -14,11 +14,11 @@
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -27,7 +27,7 @@
 '''
 This module provides an ISO 8601:2004 time zone info parser.
 
-It offers a function to parse the time zone offset as specified by ISO 8601. 
+It offers a function to parse the time zone offset as specified by ISO 8601.
 '''
 import re
 
@@ -39,10 +39,11 @@ TZ_REGEX = r"(?P<tzname>(Z|(?P<tzsign>[+-])"\
 
 TZ_RE = re.compile(TZ_REGEX)
 
+
 def build_tzinfo(tzname, tzsign='+', tzhour=0, tzmin=0):
     '''
     create a tzinfo instance according to given parameters.
-    
+
     tzname:
       'Z'       ... return UTC
       '' | None ... return None
@@ -55,10 +56,11 @@ def build_tzinfo(tzname, tzsign='+', tzhour=0, tzmin=0):
     tzsign = ((tzsign == '-') and -1) or 1
     return FixedOffset(tzsign * tzhour, tzsign * tzmin, tzname)
 
+
 def parse_tzinfo(tzstring):
     '''
     Parses ISO 8601 time zone designators to tzinfo objecs.
-    
+
     A time zone designator can be in the following format:
               no designator indicates local time zone
       Z       UTC
@@ -69,19 +71,20 @@ def parse_tzinfo(tzstring):
     match = TZ_RE.match(tzstring)
     if match:
         groups = match.groupdict()
-        return build_tzinfo(groups['tzname'], groups['tzsign'], 
-                            int(groups['tzhour'] or 0), 
+        return build_tzinfo(groups['tzname'], groups['tzsign'],
+                            int(groups['tzhour'] or 0),
                             int(groups['tzmin'] or 0))
     raise ISO8601Error('%s not a valid time zone info' % tzstring)
 
+
 def tz_isoformat(dt, format='%Z'):
     '''
-    return time zone offset ISO 8601 formatted. 
+    return time zone offset ISO 8601 formatted.
     The various ISO formats can be chosen with the format parameter.
-    
+
     if tzinfo is None returns ''
     if tzinfo is UTC returns 'Z'
-    else the offset is rendered to the given format. 
+    else the offset is rendered to the given format.
     format:
         %h ... +-HH
         %z ... +-HHMM
@@ -106,4 +109,4 @@ def tz_isoformat(dt, format='%Z'):
         return '%s%02d%02d' % (sign, hours, minutes)
     elif format == '%h':
         return '%s%02d' % (sign, hours)
-    raise AttributeError('unknown format string "%s"' % format)
+    raise ValueError('unknown format string "%s"' % format)
diff --git a/lib/isodate/isotzinfo.pyc b/lib/isodate/isotzinfo.pyc
index f6a5ffd..8a6a7d0 100644
Binary files a/lib/isodate/isotzinfo.pyc and b/lib/isodate/isotzinfo.pyc differ
diff --git a/lib/isodate/tests/__init__.py b/lib/isodate/tests/__init__.py
new file mode 100644
index 0000000..09dba2e
--- /dev/null
+++ b/lib/isodate/tests/__init__.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright 2009, Gerhard Weis
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#  * Neither the name of the authors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT
+##############################################################################
+'''
+Collect all test suites into one TestSuite instance.
+'''
+
+import unittest
+from isodate.tests import (test_date, test_time, test_datetime, test_duration,
+                           test_strf, test_pickle)
+
+
+def test_suite():
+    '''
+    Return a new TestSuite instance consisting of all available TestSuites.
+    '''
+    return unittest.TestSuite([
+        test_date.test_suite(),
+        test_time.test_suite(),
+        test_datetime.test_suite(),
+        test_duration.test_suite(),
+        test_strf.test_suite(),
+        test_pickle.test_suite(),
+        ])
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tests/test_date.py b/lib/isodate/tests/test_date.py
new file mode 100644
index 0000000..fdc1043
--- /dev/null
+++ b/lib/isodate/tests/test_date.py
@@ -0,0 +1,129 @@
+##############################################################################
+# Copyright 2009, Gerhard Weis
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#  * Neither the name of the authors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT
+##############################################################################
+'''
+Test cases for the isodate module.
+'''
+import unittest
+from datetime import date
+from isodate import parse_date, ISO8601Error, date_isoformat
+from isodate import DATE_CENTURY, DATE_YEAR, DATE_MONTH
+from isodate import DATE_EXT_COMPLETE, DATE_BAS_COMPLETE
+from isodate import DATE_BAS_ORD_COMPLETE, DATE_EXT_ORD_COMPLETE
+from isodate import DATE_BAS_WEEK, DATE_BAS_WEEK_COMPLETE
+from isodate import DATE_EXT_WEEK, DATE_EXT_WEEK_COMPLETE
+
+# the following list contains tuples of ISO date strings and the expected
+# result from the parse_date method. A result of None means an ISO8601Error
+# is expected. The test cases are grouped into dates with 4 digit years
+# and 6 digit years.
+TEST_CASES = {4: [('19', date(1901, 1, 1), DATE_CENTURY),
+                  ('1985', date(1985, 1, 1), DATE_YEAR),
+                  ('1985-04', date(1985, 4, 1), DATE_MONTH),
+                  ('1985-04-12', date(1985, 4, 12), DATE_EXT_COMPLETE),
+                  ('19850412', date(1985, 4, 12), DATE_BAS_COMPLETE),
+                  ('1985102', date(1985, 4, 12), DATE_BAS_ORD_COMPLETE),
+                  ('1985-102', date(1985, 4, 12), DATE_EXT_ORD_COMPLETE),
+                  ('1985W155', date(1985, 4, 12), DATE_BAS_WEEK_COMPLETE),
+                  ('1985-W15-5', date(1985, 4, 12), DATE_EXT_WEEK_COMPLETE),
+                  ('1985W15', date(1985, 4, 8), DATE_BAS_WEEK),
+                  ('1985-W15', date(1985, 4, 8), DATE_EXT_WEEK),
+                  ('1989-W15', date(1989, 4, 10), DATE_EXT_WEEK),
+                  ('1989-W15-5', date(1989, 4, 14), DATE_EXT_WEEK_COMPLETE),
+                  ('1-W1-1', None, DATE_BAS_WEEK_COMPLETE)],
+              6: [('+0019', date(1901, 1, 1), DATE_CENTURY),
+                  ('+001985', date(1985, 1, 1), DATE_YEAR),
+                  ('+001985-04', date(1985, 4, 1), DATE_MONTH),
+                  ('+001985-04-12', date(1985, 4, 12), DATE_EXT_COMPLETE),
+                  ('+0019850412', date(1985, 4, 12), DATE_BAS_COMPLETE),
+                  ('+001985102', date(1985, 4, 12), DATE_BAS_ORD_COMPLETE),
+                  ('+001985-102', date(1985, 4, 12), DATE_EXT_ORD_COMPLETE),
+                  ('+001985W155', date(1985, 4, 12), DATE_BAS_WEEK_COMPLETE),
+                  ('+001985-W15-5', date(1985, 4, 12), DATE_EXT_WEEK_COMPLETE),
+                  ('+001985W15', date(1985, 4, 8), DATE_BAS_WEEK),
+                  ('+001985-W15', date(1985, 4, 8), DATE_EXT_WEEK)]}
+
+
+def create_testcase(yeardigits, datestring, expectation, format):
+    '''
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    TEST_CASES list, so that a failed test won't stop other tests.
+    '''
+
+    class TestDate(unittest.TestCase):
+        '''
+        A test case template to parse an ISO date string into a date
+        object.
+        '''
+
+        def test_parse(self):
+            '''
+            Parse an ISO date string and compare it to the expected value.
+            '''
+            if expectation is None:
+                self.assertRaises(ISO8601Error, parse_date, datestring,
+                                  yeardigits)
+            else:
+                result = parse_date(datestring, yeardigits)
+                self.assertEqual(result, expectation)
+
+        def test_format(self):
+            '''
+            Take date object and create ISO string from it.
+            This is the reverse test to test_parse.
+            '''
+            if expectation is None:
+                self.assertRaises(AttributeError,
+                                  date_isoformat, expectation, format,
+                                  yeardigits)
+            else:
+                self.assertEqual(date_isoformat(expectation, format,
+                                                yeardigits),
+                                 datestring)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestDate)
+
+
+def test_suite():
+    '''
+    Construct a TestSuite instance for all test cases.
+    '''
+    suite = unittest.TestSuite()
+    for yeardigits, tests in TEST_CASES.items():
+        for datestring, expectation, format in tests:
+            suite.addTest(create_testcase(yeardigits, datestring,
+                                          expectation, format))
+    return suite
+
+
+# load_tests Protocol
+def load_tests(loader, tests, pattern):
+    return test_suite()
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tests/test_datetime.py b/lib/isodate/tests/test_datetime.py
new file mode 100644
index 0000000..ddad5da
--- /dev/null
+++ b/lib/isodate/tests/test_datetime.py
@@ -0,0 +1,146 @@
+##############################################################################
+# Copyright 2009, Gerhard Weis
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#  * Neither the name of the authors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT
+##############################################################################
+'''
+Test cases for the isodatetime module.
+'''
+import unittest
+from datetime import datetime
+
+from isodate import parse_datetime, UTC, FixedOffset, datetime_isoformat
+from isodate import ISO8601Error
+from isodate import DATE_BAS_COMPLETE, TIME_BAS_MINUTE, TIME_BAS_COMPLETE
+from isodate import DATE_EXT_COMPLETE, TIME_EXT_MINUTE, TIME_EXT_COMPLETE
+from isodate import TZ_BAS, TZ_EXT, TZ_HOUR
+from isodate import DATE_BAS_ORD_COMPLETE, DATE_EXT_ORD_COMPLETE
+from isodate import DATE_BAS_WEEK_COMPLETE, DATE_EXT_WEEK_COMPLETE
+
+# the following list contains tuples of ISO datetime strings and the expected
+# result from the parse_datetime method. A result of None means an ISO8601Error
+# is expected.
+TEST_CASES = [('19850412T1015', datetime(1985, 4, 12, 10, 15),
+               DATE_BAS_COMPLETE + 'T' + TIME_BAS_MINUTE,
+               '19850412T1015'),
+              ('1985-04-12T10:15', datetime(1985, 4, 12, 10, 15),
+               DATE_EXT_COMPLETE + 'T' + TIME_EXT_MINUTE,
+               '1985-04-12T10:15'),
+              ('1985102T1015Z', datetime(1985, 4, 12, 10, 15, tzinfo=UTC),
+               DATE_BAS_ORD_COMPLETE + 'T' + TIME_BAS_MINUTE + TZ_BAS,
+               '1985102T1015Z'),
+              ('1985-102T10:15Z', datetime(1985, 4, 12, 10, 15, tzinfo=UTC),
+               DATE_EXT_ORD_COMPLETE + 'T' + TIME_EXT_MINUTE + TZ_EXT,
+               '1985-102T10:15Z'),
+              ('1985W155T1015+0400', datetime(1985, 4, 12, 10, 15,
+                                              tzinfo=FixedOffset(4, 0,
+                                                                 '+0400')),
+               DATE_BAS_WEEK_COMPLETE + 'T' + TIME_BAS_MINUTE + TZ_BAS,
+               '1985W155T1015+0400'),
+              ('1985-W15-5T10:15+04', datetime(1985, 4, 12, 10, 15,
+                                               tzinfo=FixedOffset(4, 0,
+                                                                  '+0400'),),
+               DATE_EXT_WEEK_COMPLETE + 'T' + TIME_EXT_MINUTE + TZ_HOUR,
+               '1985-W15-5T10:15+04'),
+              ('20110410T101225.123000Z',
+               datetime(2011, 4, 10, 10, 12, 25, 123000, tzinfo=UTC),
+               DATE_BAS_COMPLETE + 'T' + TIME_BAS_COMPLETE + ".%f" + TZ_BAS,
+               '20110410T101225.123000Z'),
+              ('2012-10-12T08:29:46.069178Z',
+               datetime(2012, 10, 12, 8, 29, 46, 69178, tzinfo=UTC),
+               DATE_EXT_COMPLETE + 'T' + TIME_EXT_COMPLETE + '.%f' + TZ_BAS,
+               '2012-10-12T08:29:46.069178Z'),
+              ('2012-10-12T08:29:46.691780Z',
+               datetime(2012, 10, 12, 8, 29, 46, 691780, tzinfo=UTC),
+               DATE_EXT_COMPLETE + 'T' + TIME_EXT_COMPLETE + '.%f' + TZ_BAS,
+               '2012-10-12T08:29:46.691780Z'),
+              ('2012-10-30T08:55:22.1234567Z',
+               datetime(2012, 10, 30, 8, 55, 22, 123457, tzinfo=UTC),
+               DATE_EXT_COMPLETE + 'T' + TIME_EXT_COMPLETE + '.%f' + TZ_BAS,
+               '2012-10-30T08:55:22.123457Z'),
+              ('2012-10-30T08:55:22.1234561Z',
+               datetime(2012, 10, 30, 8, 55, 22, 123456, tzinfo=UTC),
+               DATE_EXT_COMPLETE + 'T' + TIME_EXT_COMPLETE + '.%f' + TZ_BAS,
+               '2012-10-30T08:55:22.123456Z'),
+              ('2014-08-18 14:55:22.123456Z', None,
+               DATE_EXT_COMPLETE + 'T' + TIME_EXT_COMPLETE + '.%f' + TZ_BAS,
+               '2014-08-18T14:55:22.123456Z'),
+              ]
+
+
+def create_testcase(datetimestring, expectation, format, output):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    class TestDateTime(unittest.TestCase):
+        '''
+        A test case template to parse an ISO datetime string into a
+        datetime object.
+        '''
+
+        def test_parse(self):
+            '''
+            Parse an ISO datetime string and compare it to the expected value.
+            '''
+            if expectation is None:
+                self.assertRaises(ISO8601Error, parse_datetime, datetimestring)
+            else:
+                self.assertEqual(parse_datetime(datetimestring), expectation)
+
+        def test_format(self):
+            '''
+            Take datetime object and create ISO string from it.
+            This is the reverse test to test_parse.
+            '''
+            if expectation is None:
+                self.assertRaises(AttributeError,
+                                  datetime_isoformat, expectation, format)
+            else:
+                self.assertEqual(datetime_isoformat(expectation, format),
+                                 output)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestDateTime)
+
+
+def test_suite():
+    '''
+    Construct a TestSuite instance for all test cases.
+    '''
+    suite = unittest.TestSuite()
+    for datetimestring, expectation, format, output in TEST_CASES:
+        suite.addTest(create_testcase(datetimestring, expectation,
+                                      format, output))
+    return suite
+
+
+# load_tests Protocol
+def load_tests(loader, tests, pattern):
+    return test_suite()
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tests/test_duration.py b/lib/isodate/tests/test_duration.py
new file mode 100644
index 0000000..6cf6b65
--- /dev/null
+++ b/lib/isodate/tests/test_duration.py
@@ -0,0 +1,525 @@
+##############################################################################
+# Copyright 2009, Gerhard Weis
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#  * Neither the name of the authors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT
+##############################################################################
+'''
+Test cases for the isoduration module.
+'''
+import unittest
+import operator
+from datetime import timedelta, date, datetime
+
+from isodate import Duration, parse_duration, ISO8601Error
+from isodate import D_DEFAULT, D_WEEK, D_ALT_EXT, duration_isoformat
+
+# the following list contains tuples of ISO duration strings and the expected
+# result from the parse_duration method. A result of None means an ISO8601Error
+# is expected.
+PARSE_TEST_CASES = {'P18Y9M4DT11H9M8S': (Duration(4, 8, 0, 0, 9, 11, 0, 9, 18),
+                                         D_DEFAULT, None),
+                    'P2W': (timedelta(weeks=2), D_WEEK, None),
+                    'P3Y6M4DT12H30M5S': (Duration(4, 5, 0, 0, 30, 12, 0, 6, 3),
+                                         D_DEFAULT, None),
+                    'P23DT23H': (timedelta(hours=23, days=23),
+                                 D_DEFAULT, None),
+                    'P4Y': (Duration(years=4), D_DEFAULT, None),
+                    'P1M': (Duration(months=1), D_DEFAULT, None),
+                    'PT1M': (timedelta(minutes=1), D_DEFAULT, None),
+                    'P0.5Y': (Duration(years=0.5), D_DEFAULT, None),
+                    'PT36H': (timedelta(hours=36), D_DEFAULT, 'P1DT12H'),
+                    'P1DT12H': (timedelta(days=1, hours=12), D_DEFAULT, None),
+                    '+P11D': (timedelta(days=11), D_DEFAULT, 'P11D'),
+                    '-P2W': (timedelta(weeks=-2), D_WEEK, None),
+                    '-P2.2W': (timedelta(weeks=-2.2), D_DEFAULT,
+                               '-P15DT9H36M'),
+                    'P1DT2H3M4S': (timedelta(days=1, hours=2, minutes=3,
+                                             seconds=4), D_DEFAULT, None),
+                    'P1DT2H3M': (timedelta(days=1, hours=2, minutes=3),
+                                 D_DEFAULT, None),
+                    'P1DT2H': (timedelta(days=1, hours=2), D_DEFAULT, None),
+                    'PT2H': (timedelta(hours=2), D_DEFAULT, None),
+                    'PT2.3H': (timedelta(hours=2.3), D_DEFAULT, 'PT2H18M'),
+                    'PT2H3M4S': (timedelta(hours=2, minutes=3, seconds=4),
+                                 D_DEFAULT, None),
+                    'PT3M4S': (timedelta(minutes=3, seconds=4), D_DEFAULT,
+                               None),
+                    'PT22S': (timedelta(seconds=22), D_DEFAULT, None),
+                    'PT22.22S': (timedelta(seconds=22.22), 'PT%S.%fS',
+                                 'PT22.220000S'),
+                    '-P2Y': (Duration(years=-2), D_DEFAULT, None),
+                    '-P3Y6M4DT12H30M5S': (Duration(-4, -5, 0, 0, -30, -12, 0,
+                                                   -6, -3), D_DEFAULT, None),
+                    '-P1DT2H3M4S': (timedelta(days=-1, hours=-2, minutes=-3,
+                                              seconds=-4), D_DEFAULT, None),
+                    # alternative format
+                    'P0018-09-04T11:09:08': (Duration(4, 8, 0, 0, 9, 11, 0, 9,
+                                                      18), D_ALT_EXT, None),
+                    # 'PT000022.22': timedelta(seconds=22.22),
+                    }
+
+#                       d1                    d2           '+', '-', '>'
+# A list of test cases to test addition and subtraction between datetime and
+# Duration objects.
+# each tuple contains 2 duration strings, and a result string for addition and
+# one for subtraction. The last value says, if the first duration is greater
+# than the second.
+MATH_TEST_CASES = (('P5Y7M1DT9H45M16.72S', 'PT27M24.68S',
+                    'P5Y7M1DT10H12M41.4S', 'P5Y7M1DT9H17M52.04S', None),
+                   ('PT28M12.73S', 'PT56M29.92S',
+                    'PT1H24M42.65S', '-PT28M17.19S', False),
+                   ('P3Y7M23DT5H25M0.33S', 'PT1H1.95S',
+                    'P3Y7M23DT6H25M2.28S', 'P3Y7M23DT4H24M58.38S', None),
+                   ('PT1H1.95S', 'P3Y7M23DT5H25M0.33S',
+                    'P3Y7M23DT6H25M2.28S', '-P3Y7M23DT4H24M58.38S', None),
+                   ('P1332DT55M0.33S', 'PT1H1.95S',
+                    'P1332DT1H55M2.28S', 'P1331DT23H54M58.38S', True),
+                   ('PT1H1.95S', 'P1332DT55M0.33S',
+                    'P1332DT1H55M2.28S', '-P1331DT23H54M58.38S', False))
+
+
+# A list of test cases to test addition and subtraction of date/datetime
+# and Duration objects. They are tested against the results of an
+# equal long timedelta duration.
+DATE_TEST_CASES = ((date(2008, 2, 29),
+                    timedelta(days=10, hours=12, minutes=20),
+                    Duration(days=10, hours=12, minutes=20)),
+                   (date(2008, 1, 31),
+                    timedelta(days=10, hours=12, minutes=20),
+                    Duration(days=10, hours=12, minutes=20)),
+                   (datetime(2008, 2, 29),
+                    timedelta(days=10, hours=12, minutes=20),
+                    Duration(days=10, hours=12, minutes=20)),
+                   (datetime(2008, 1, 31),
+                    timedelta(days=10, hours=12, minutes=20),
+                    Duration(days=10, hours=12, minutes=20)),
+                   (datetime(2008, 4, 21),
+                    timedelta(days=10, hours=12, minutes=20),
+                    Duration(days=10, hours=12, minutes=20)),
+                   (datetime(2008, 5, 5),
+                    timedelta(days=10, hours=12, minutes=20),
+                    Duration(days=10, hours=12, minutes=20)),
+                   (datetime(2000, 1, 1),
+                    timedelta(hours=-33),
+                    Duration(hours=-33)),
+                   (datetime(2008, 5, 5),
+                    Duration(years=1, months=1, days=10, hours=12,
+                             minutes=20),
+                    Duration(months=13, days=10, hours=12, minutes=20)),
+                   (datetime(2000, 3, 30),
+                    Duration(years=1, months=1, days=10, hours=12,
+                             minutes=20),
+                    Duration(months=13, days=10, hours=12, minutes=20)),
+                   )
+
+# A list of test cases of additon of date/datetime and Duration. The results
+# are compared against a given expected result.
+DATE_CALC_TEST_CASES = (
+    (date(2000, 2, 1),
+     Duration(years=1, months=1),
+     date(2001, 3, 1)),
+    (date(2000, 2, 29),
+     Duration(years=1, months=1),
+     date(2001, 3, 29)),
+    (date(2000, 2, 29),
+     Duration(years=1),
+     date(2001, 2, 28)),
+    (date(1996, 2, 29),
+     Duration(years=4),
+     date(2000, 2, 29)),
+    (date(2096, 2, 29),
+     Duration(years=4),
+     date(2100, 2, 28)),
+    (date(2000, 2, 1),
+     Duration(years=-1, months=-1),
+     date(1999, 1, 1)),
+    (date(2000, 2, 29),
+     Duration(years=-1, months=-1),
+     date(1999, 1, 29)),
+    (date(2000, 2, 1),
+     Duration(years=1, months=1, days=1),
+     date(2001, 3, 2)),
+    (date(2000, 2, 29),
+     Duration(years=1, months=1, days=1),
+     date(2001, 3, 30)),
+    (date(2000, 2, 29),
+     Duration(years=1, days=1),
+     date(2001, 3, 1)),
+    (date(1996, 2, 29),
+     Duration(years=4, days=1),
+     date(2000, 3, 1)),
+    (date(2096, 2, 29),
+     Duration(years=4, days=1),
+     date(2100, 3, 1)),
+    (date(2000, 2, 1),
+     Duration(years=-1, months=-1, days=-1),
+     date(1998, 12, 31)),
+    (date(2000, 2, 29),
+     Duration(years=-1, months=-1, days=-1),
+     date(1999, 1, 28)),
+    (date(2001, 4, 1),
+     Duration(years=-1, months=-1, days=-1),
+     date(2000, 2, 29)),
+    (date(2000, 4, 1),
+     Duration(years=-1, months=-1, days=-1),
+     date(1999, 2, 28)),
+    (Duration(years=1, months=2),
+     Duration(years=0, months=0, days=1),
+     Duration(years=1, months=2, days=1)),
+    (Duration(years=-1, months=-1, days=-1),
+     date(2000, 4, 1),
+     date(1999, 2, 28)),
+    (Duration(years=1, months=1, weeks=5),
+     date(2000, 1, 30),
+     date(2001, 4, 4)),
+    (parse_duration("P1Y1M5W"),
+     date(2000, 1, 30),
+     date(2001, 4, 4)),
+    (parse_duration("P0.5Y"),
+     date(2000, 1, 30),
+     None),
+    (Duration(years=1, months=1, hours=3),
+     datetime(2000, 1, 30, 12, 15, 00),
+     datetime(2001, 2, 28, 15, 15, 00)),
+    (parse_duration("P1Y1MT3H"),
+     datetime(2000, 1, 30, 12, 15, 00),
+     datetime(2001, 2, 28, 15, 15, 00)),
+    (Duration(years=1, months=2),
+     timedelta(days=1),
+     Duration(years=1, months=2, days=1)),
+    (timedelta(days=1),
+     Duration(years=1, months=2),
+     Duration(years=1, months=2, days=1)),
+    (datetime(2008, 1, 1, 0, 2),
+     Duration(months=1),
+     datetime(2008, 2, 1, 0, 2)),
+    (datetime.strptime("200802", "%Y%M"),
+     parse_duration("P1M"),
+     datetime(2008, 2, 1, 0, 2)),
+    (datetime(2008, 2, 1),
+     Duration(months=1),
+     datetime(2008, 3, 1)),
+    (datetime.strptime("200802", "%Y%m"),
+     parse_duration("P1M"),
+     datetime(2008, 3, 1)),
+    # (date(2000, 1, 1),
+    #  Duration(years=1.5),
+    #  date(2001, 6, 1)),
+    # (date(2000, 1, 1),
+    #  Duration(years=1, months=1.5),
+    #  date(2001, 2, 14)),
+    )
+
+
+class DurationTest(unittest.TestCase):
+    '''
+    This class tests various other aspects of the isoduration module,
+    which are not covered with the test cases listed above.
+    '''
+
+    def test_associative(self):
+        '''
+        Adding 2 durations to a date is not associative.
+        '''
+        days1 = Duration(days=1)
+        months1 = Duration(months=1)
+        start = date(2000, 3, 30)
+        res1 = start + days1 + months1
+        res2 = start + months1 + days1
+        self.assertNotEqual(res1, res2)
+
+    def test_typeerror(self):
+        '''
+        Test if TypError is raised with certain parameters.
+        '''
+        self.assertRaises(TypeError, parse_duration, date(2000, 1, 1))
+        self.assertRaises(TypeError, operator.sub, Duration(years=1),
+                          date(2000, 1, 1))
+        self.assertRaises(TypeError, operator.sub, 'raise exc',
+                          Duration(years=1))
+        self.assertRaises(TypeError, operator.add,
+                          Duration(years=1, months=1, weeks=5),
+                          'raise exception')
+        self.assertRaises(TypeError, operator.add, 'raise exception',
+                          Duration(years=1, months=1, weeks=5))
+
+    def test_parseerror(self):
+        '''
+        Test for unparseable duration string.
+        '''
+        self.assertRaises(ISO8601Error, parse_duration, 'T10:10:10')
+
+    def test_repr(self):
+        '''
+        Test __repr__ and __str__ for Duration obqects.
+        '''
+        dur = Duration(10, 10, years=10, months=10)
+        self.assertEqual('10 years, 10 months, 10 days, 0:00:10', str(dur))
+        self.assertEqual('isodate.duration.Duration(10, 10, 0,'
+                         ' years=10, months=10)', repr(dur))
+
+    def test_neg(self):
+        '''
+        Test __neg__ for Duration objects.
+        '''
+        self.assertEqual(-Duration(0), Duration(0))
+        self.assertEqual(-Duration(years=1, months=1),
+                         Duration(years=-1, months=-1))
+        self.assertEqual(-Duration(years=1, months=1), Duration(months=-13))
+        self.assertNotEqual(-Duration(years=1), timedelta(days=-365))
+        self.assertNotEqual(-timedelta(days=365), Duration(years=-1))
+        # FIXME: this test fails in python 3... it seems like python3
+        #        treats a == b the same b == a
+        # self.assertNotEqual(-timedelta(days=10), -Duration(days=10))
+
+    def test_format(self):
+        '''
+        Test various other strftime combinations.
+        '''
+        self.assertEqual(duration_isoformat(Duration(0)), 'P0D')
+        self.assertEqual(duration_isoformat(-Duration(0)), 'P0D')
+        self.assertEqual(duration_isoformat(Duration(seconds=10)), 'PT10S')
+        self.assertEqual(duration_isoformat(Duration(years=-1, months=-1)),
+                         '-P1Y1M')
+        self.assertEqual(duration_isoformat(-Duration(years=1, months=1)),
+                         '-P1Y1M')
+        self.assertEqual(duration_isoformat(-Duration(years=-1, months=-1)),
+                         'P1Y1M')
+        self.assertEqual(duration_isoformat(-Duration(years=-1, months=-1)),
+                         'P1Y1M')
+        dur = Duration(years=3, months=7, days=23, hours=5, minutes=25,
+                       milliseconds=330)
+        self.assertEqual(duration_isoformat(dur), 'P3Y7M23DT5H25M0.33S')
+        self.assertEqual(duration_isoformat(-dur), '-P3Y7M23DT5H25M0.33S')
+
+    def test_equal(self):
+        '''
+        Test __eq__ and __ne__ methods.
+        '''
+        self.assertEqual(Duration(years=1, months=1),
+                         Duration(years=1, months=1))
+        self.assertEqual(Duration(years=1, months=1), Duration(months=13))
+        self.assertNotEqual(Duration(years=1, months=2),
+                            Duration(years=1, months=1))
+        self.assertNotEqual(Duration(years=1, months=1), Duration(months=14))
+        self.assertNotEqual(Duration(years=1), timedelta(days=365))
+        self.assertFalse(Duration(years=1, months=1) !=
+                         Duration(years=1, months=1))
+        self.assertFalse(Duration(years=1, months=1) != Duration(months=13))
+        self.assertTrue(Duration(years=1, months=2) !=
+                        Duration(years=1, months=1))
+        self.assertTrue(Duration(years=1, months=1) != Duration(months=14))
+        self.assertTrue(Duration(years=1) != timedelta(days=365))
+        self.assertEqual(Duration(days=1), timedelta(days=1))
+        # FIXME: this test fails in python 3... it seems like python3
+        #        treats a != b the same b != a
+        # self.assertNotEqual(timedelta(days=1), Duration(days=1))
+
+    def test_totimedelta(self):
+        '''
+        Test conversion form Duration to timedelta.
+        '''
+        dur = Duration(years=1, months=2, days=10)
+        self.assertEqual(dur.totimedelta(datetime(1998, 2, 25)),
+                         timedelta(434))
+        # leap year has one day more in february
+        self.assertEqual(dur.totimedelta(datetime(2000, 2, 25)),
+                         timedelta(435))
+        dur = Duration(months=2)
+        # march is longer than february, but april is shorter than
+        # march (cause only one day difference compared to 2)
+        self.assertEqual(dur.totimedelta(datetime(2000, 2, 25)), timedelta(60))
+        self.assertEqual(dur.totimedelta(datetime(2001, 2, 25)), timedelta(59))
+        self.assertEqual(dur.totimedelta(datetime(2001, 3, 25)), timedelta(61))
+
+
+def create_parsetestcase(durationstring, expectation, format, altstr):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    PARSE_TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    class TestParseDuration(unittest.TestCase):
+        '''
+        A test case template to parse an ISO duration string into a
+        timedelta or Duration object.
+        '''
+
+        def test_parse(self):
+            '''
+            Parse an ISO duration string and compare it to the expected value.
+            '''
+            result = parse_duration(durationstring)
+            self.assertEqual(result, expectation)
+
+        def test_format(self):
+            '''
+            Take duration/timedelta object and create ISO string from it.
+            This is the reverse test to test_parse.
+            '''
+            if altstr:
+                self.assertEqual(duration_isoformat(expectation, format),
+                                 altstr)
+            else:
+                # if durationstring == '-P2W':
+                #     import pdb; pdb.set_trace()
+                self.assertEqual(duration_isoformat(expectation, format),
+                                 durationstring)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestParseDuration)
+
+
+def create_mathtestcase(dur1, dur2, resadd, ressub, resge):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    MATH_TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    dur1 = parse_duration(dur1)
+    dur2 = parse_duration(dur2)
+    resadd = parse_duration(resadd)
+    ressub = parse_duration(ressub)
+
+    class TestMathDuration(unittest.TestCase):
+        '''
+        A test case template test addition, subtraction and >
+        operators for Duration objects.
+        '''
+
+        def test_add(self):
+            '''
+            Test operator + (__add__, __radd__)
+            '''
+            self.assertEqual(dur1 + dur2, resadd)
+
+        def test_sub(self):
+            '''
+            Test operator - (__sub__, __rsub__)
+            '''
+            self.assertEqual(dur1 - dur2, ressub)
+
+        def test_ge(self):
+            '''
+            Test operator > and <
+            '''
+            def dogetest():
+                ''' Test greater than.'''
+                return dur1 > dur2
+
+            def doletest():
+                ''' Test less than.'''
+                return dur1 < dur2
+            if resge is None:
+                self.assertRaises(TypeError, dogetest)
+                self.assertRaises(TypeError, doletest)
+            else:
+                self.assertEqual(dogetest(), resge)
+                self.assertEqual(doletest(), not resge)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestMathDuration)
+
+
+def create_datetestcase(start, tdelta, duration):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    DATE_TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    class TestDateCalc(unittest.TestCase):
+        '''
+        A test case template test addition, subtraction
+        operators for Duration objects.
+        '''
+
+        def test_add(self):
+            '''
+            Test operator +.
+            '''
+            self.assertEqual(start + tdelta, start + duration)
+
+        def test_sub(self):
+            '''
+            Test operator -.
+            '''
+            self.assertEqual(start - tdelta, start - duration)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestDateCalc)
+
+
+def create_datecalctestcase(start, duration, expectation):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    DATE_CALC_TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    class TestDateCalc(unittest.TestCase):
+        '''
+        A test case template test addition operators for Duration objects.
+        '''
+
+        def test_calc(self):
+            '''
+            Test operator +.
+            '''
+            if expectation is None:
+                self.assertRaises(ValueError, operator.add, start, duration)
+            else:
+                self.assertEqual(start + duration, expectation)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestDateCalc)
+
+
+def test_suite():
+    '''
+    Return a test suite containing all test defined above.
+    '''
+    suite = unittest.TestSuite()
+    for durationstring, (expectation, format,
+                         altstr) in PARSE_TEST_CASES.items():
+        suite.addTest(create_parsetestcase(durationstring, expectation,
+                                           format, altstr))
+    for testdata in MATH_TEST_CASES:
+        suite.addTest(create_mathtestcase(*testdata))
+    for testdata in DATE_TEST_CASES:
+        suite.addTest(create_datetestcase(*testdata))
+    for testdata in DATE_CALC_TEST_CASES:
+        suite.addTest(create_datecalctestcase(*testdata))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(DurationTest))
+    return suite
+
+
+# load_tests Protocol
+def load_tests(loader, tests, pattern):
+    return test_suite()
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tests/test_pickle.py b/lib/isodate/tests/test_pickle.py
new file mode 100644
index 0000000..b52f8cb
--- /dev/null
+++ b/lib/isodate/tests/test_pickle.py
@@ -0,0 +1,54 @@
+import unittest
+import cPickle as pickle
+import isodate
+
+
+class TestPickle(unittest.TestCase):
+    '''
+    A test case template to parse an ISO datetime string into a
+    datetime object.
+    '''
+
+    def test_pickle_datetime(self):
+        '''
+        Parse an ISO datetime string and compare it to the expected value.
+        '''
+        dti = isodate.parse_datetime('2012-10-26T09:33+00:00')
+        for proto in range(0, pickle.HIGHEST_PROTOCOL + 1):
+            pikl = pickle.dumps(dti, proto)
+            self.assertEqual(dti, pickle.loads(pikl),
+                             "pickle proto %d failed" % proto)
+
+    def test_pickle_duration(self):
+        '''
+        Pickle / unpickle duration objects.
+        '''
+        from isodate.duration import Duration
+        dur = Duration()
+        failed = []
+        for proto in range(0, pickle.HIGHEST_PROTOCOL + 1):
+            try:
+                pikl = pickle.dumps(dur, proto)
+                if dur != pickle.loads(pikl):
+                    raise Exception("not equal")
+            except Exception, e:
+                failed.append("pickle proto %d failed (%s)" % (proto, repr(e)))
+        self.assertEqual(len(failed), 0, "pickle protos failed: %s" %
+                         str(failed))
+
+
+def test_suite():
+    '''
+    Construct a TestSuite instance for all test cases.
+    '''
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestPickle))
+    return suite
+
+
+# load_tests Protocol
+def load_tests(loader, tests, pattern):
+    return test_suite()
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tests/test_strf.py b/lib/isodate/tests/test_strf.py
new file mode 100644
index 0000000..37a135b
--- /dev/null
+++ b/lib/isodate/tests/test_strf.py
@@ -0,0 +1,135 @@
+##############################################################################
+# Copyright 2009, Gerhard Weis
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#  * Neither the name of the authors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT
+##############################################################################
+'''
+Test cases for the isodate module.
+'''
+import unittest
+import time
+from datetime import datetime, timedelta
+from isodate import strftime
+from isodate import LOCAL
+from isodate import DT_EXT_COMPLETE
+from isodate import tzinfo
+
+
+TEST_CASES = ((datetime(2012, 12, 25, 13, 30, 0, 0, LOCAL), DT_EXT_COMPLETE,
+               "2012-12-25T13:30:00+10:00"),
+              # DST ON
+              (datetime(1999, 12, 25, 13, 30, 0, 0, LOCAL), DT_EXT_COMPLETE,
+               "1999-12-25T13:30:00+11:00"),
+              # microseconds
+              (datetime(2012, 10, 12, 8, 29, 46, 69178),
+               "%Y-%m-%dT%H:%M:%S.%f",
+               "2012-10-12T08:29:46.069178"),
+              (datetime(2012, 10, 12, 8, 29, 46, 691780),
+               "%Y-%m-%dT%H:%M:%S.%f",
+               "2012-10-12T08:29:46.691780"),
+              )
+
+
+def create_testcase(dt, format, expectation):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    class TestDate(unittest.TestCase):
+        '''
+        A test case template to test ISO date formatting.
+        '''
+
+        # local time zone mock function
+        def localtime_mock(self, secs):
+            """
+            mock time.localtime so that it always returns a time_struct with
+            tm_idst=1
+            """
+            tt = self.ORIG['localtime'](secs)
+            # befor 2000 everything is dst, after 2000 no dst.
+            if tt.tm_year < 2000:
+                dst = 1
+            else:
+                dst = 0
+            tt = (tt.tm_year, tt.tm_mon, tt.tm_mday,
+                  tt.tm_hour, tt.tm_min, tt.tm_sec,
+                  tt.tm_wday, tt.tm_yday, dst)
+            return time.struct_time(tt)
+
+        def setUp(self):
+            self.ORIG = {}
+            self.ORIG['STDOFFSET'] = tzinfo.STDOFFSET
+            self.ORIG['DSTOFFSET'] = tzinfo.DSTOFFSET
+            self.ORIG['DSTDIFF'] = tzinfo.DSTDIFF
+            self.ORIG['localtime'] = time.localtime
+            # ovveride all saved values with fixtures.
+            # calculate LOCAL TZ offset, so that this test runs in
+            # every time zone
+            tzinfo.STDOFFSET = timedelta(seconds=36000)  # assume LOC = +10:00
+            tzinfo.DSTOFFSET = timedelta(seconds=39600)  # assume DST = +11:00
+            tzinfo.DSTDIFF = tzinfo.DSTOFFSET - tzinfo.STDOFFSET
+            time.localtime = self.localtime_mock
+
+        def tearDown(self):
+            # restore test fixtures
+            tzinfo.STDOFFSET = self.ORIG['STDOFFSET']
+            tzinfo.DSTOFFSET = self.ORIG['DSTOFFSET']
+            tzinfo.DSTDIFF = self.ORIG['DSTDIFF']
+            time.localtime = self.ORIG['localtime']
+
+        def test_format(self):
+            '''
+            Take date object and create ISO string from it.
+            This is the reverse test to test_parse.
+            '''
+            if expectation is None:
+                self.assertRaises(AttributeError,
+                                  strftime(dt, format))
+            else:
+                self.assertEqual(strftime(dt, format),
+                                 expectation)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestDate)
+
+
+def test_suite():
+    '''
+    Construct a TestSuite instance for all test cases.
+    '''
+    suite = unittest.TestSuite()
+    for dt, format, expectation in TEST_CASES:
+        suite.addTest(create_testcase(dt, format, expectation))
+    return suite
+
+
+# load_tests Protocol
+def load_tests(loader, tests, pattern):
+    return test_suite()
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tests/test_time.py b/lib/isodate/tests/test_time.py
new file mode 100644
index 0000000..cc5ec08
--- /dev/null
+++ b/lib/isodate/tests/test_time.py
@@ -0,0 +1,143 @@
+##############################################################################
+# Copyright 2009, Gerhard Weis
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#  * Neither the name of the authors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT
+##############################################################################
+'''
+Test cases for the isotime module.
+'''
+import unittest
+from datetime import time
+
+from isodate import parse_time, UTC, FixedOffset, ISO8601Error, time_isoformat
+from isodate import TIME_BAS_COMPLETE, TIME_BAS_MINUTE
+from isodate import TIME_EXT_COMPLETE, TIME_EXT_MINUTE
+from isodate import TIME_HOUR
+from isodate import TZ_BAS, TZ_EXT, TZ_HOUR
+
+# the following list contains tuples of ISO time strings and the expected
+# result from the parse_time method. A result of None means an ISO8601Error
+# is expected.
+TEST_CASES = [('232050', time(23, 20, 50), TIME_BAS_COMPLETE + TZ_BAS),
+              ('23:20:50', time(23, 20, 50), TIME_EXT_COMPLETE + TZ_EXT),
+              ('2320', time(23, 20), TIME_BAS_MINUTE),
+              ('23:20', time(23, 20), TIME_EXT_MINUTE),
+              ('23', time(23), TIME_HOUR),
+              ('232050,5', time(23, 20, 50, 500000), None),
+              ('23:20:50.5', time(23, 20, 50, 500000), None),
+              # test precision
+              ('15:33:42.123456', time(15, 33, 42, 123456), None),
+              ('15:33:42.1234564', time(15, 33, 42, 123456), None),
+              ('15:33:42.1234557', time(15, 33, 42, 123456), None),
+              ('2320,8', time(23, 20, 48), None),
+              ('23:20,8', time(23, 20, 48), None),
+              ('23,3', time(23, 18), None),
+              ('232030Z', time(23, 20, 30, tzinfo=UTC),
+               TIME_BAS_COMPLETE + TZ_BAS),
+              ('2320Z', time(23, 20, tzinfo=UTC), TIME_BAS_MINUTE + TZ_BAS),
+              ('23Z', time(23, tzinfo=UTC), TIME_HOUR + TZ_BAS),
+              ('23:20:30Z', time(23, 20, 30, tzinfo=UTC),
+               TIME_EXT_COMPLETE + TZ_EXT),
+              ('23:20Z', time(23, 20, tzinfo=UTC), TIME_EXT_MINUTE + TZ_EXT),
+              ('152746+0100', time(15, 27, 46,
+               tzinfo=FixedOffset(1, 0, '+0100')), TIME_BAS_COMPLETE + TZ_BAS),
+              ('152746-0500', time(15, 27, 46,
+                                   tzinfo=FixedOffset(-5, 0, '-0500')),
+               TIME_BAS_COMPLETE + TZ_BAS),
+              ('152746+01', time(15, 27, 46,
+                                 tzinfo=FixedOffset(1, 0, '+01:00')),
+               TIME_BAS_COMPLETE + TZ_HOUR),
+              ('152746-05', time(15, 27, 46,
+                                 tzinfo=FixedOffset(-5, -0, '-05:00')),
+               TIME_BAS_COMPLETE + TZ_HOUR),
+              ('15:27:46+01:00', time(15, 27, 46,
+                                      tzinfo=FixedOffset(1, 0, '+01:00')),
+               TIME_EXT_COMPLETE + TZ_EXT),
+              ('15:27:46-05:00', time(15, 27, 46,
+                                      tzinfo=FixedOffset(-5, -0, '-05:00')),
+               TIME_EXT_COMPLETE + TZ_EXT),
+              ('15:27:46+01', time(15, 27, 46,
+                                   tzinfo=FixedOffset(1, 0, '+01:00')),
+               TIME_EXT_COMPLETE + TZ_HOUR),
+              ('15:27:46-05', time(15, 27, 46,
+                                   tzinfo=FixedOffset(-5, -0, '-05:00')),
+               TIME_EXT_COMPLETE + TZ_HOUR),
+              ('1:17:30', None, TIME_EXT_COMPLETE)]
+
+
+def create_testcase(timestring, expectation, format):
+    """
+    Create a TestCase class for a specific test.
+
+    This allows having a separate TestCase for each test tuple from the
+    TEST_CASES list, so that a failed test won't stop other tests.
+    """
+
+    class TestTime(unittest.TestCase):
+        '''
+        A test case template to parse an ISO time string into a time
+        object.
+        '''
+
+        def test_parse(self):
+            '''
+            Parse an ISO time string and compare it to the expected value.
+            '''
+            if expectation is None:
+                self.assertRaises(ISO8601Error, parse_time, timestring)
+            else:
+                result = parse_time(timestring)
+                self.assertEqual(result, expectation)
+
+        def test_format(self):
+            '''
+            Take time object and create ISO string from it.
+            This is the reverse test to test_parse.
+            '''
+            if expectation is None:
+                self.assertRaises(AttributeError,
+                                  time_isoformat, expectation, format)
+            elif format is not None:
+                self.assertEqual(time_isoformat(expectation, format),
+                                 timestring)
+
+    return unittest.TestLoader().loadTestsFromTestCase(TestTime)
+
+
+def test_suite():
+    '''
+    Construct a TestSuite instance for all test cases.
+    '''
+    suite = unittest.TestSuite()
+    for timestring, expectation, format in TEST_CASES:
+        suite.addTest(create_testcase(timestring, expectation, format))
+    return suite
+
+
+# load_tests Protocol
+def load_tests(loader, tests, pattern):
+    return test_suite()
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/isodate/tzinfo.py b/lib/isodate/tzinfo.py
index ed6720f..b41f058 100755
--- a/lib/isodate/tzinfo.py
+++ b/lib/isodate/tzinfo.py
@@ -1,5 +1,5 @@
 '''
-This module provides some datetime.tzinfo implementations. 
+This module provides some datetime.tzinfo implementations.
 
 All those classes are taken from the Python documentation.
 '''
@@ -7,14 +7,15 @@ from datetime import timedelta, tzinfo
 import time
 
 ZERO = timedelta(0)
-# constant for zero time offset.    
+# constant for zero time offset.
+
 
 class Utc(tzinfo):
     '''UTC
-    
+
     Universal time coordinated time zone.
     '''
-    
+
     def utcoffset(self, dt):
         '''
         Return offset from UTC in minutes east of UTC, which is ZERO for UTC.
@@ -23,32 +24,35 @@ class Utc(tzinfo):
 
     def tzname(self, dt):
         '''
-        Return the time zone name corresponding to the datetime object dt, as a string.
+        Return the time zone name corresponding to the datetime object dt,
+        as a string.
         '''
         return "UTC"
 
     def dst(self, dt):
         '''
-        Return the daylight saving time (DST) adjustment, in minutes east of UTC.
+        Return the daylight saving time (DST) adjustment, in minutes east
+        of UTC.
         '''
         return ZERO
 
 UTC = Utc()
 # the default instance for UTC.
 
+
 class FixedOffset(tzinfo):
     '''
     A class building tzinfo objects for fixed-offset time zones.
-    
-    Note that FixedOffset(0, "UTC") is a different way to build a
-    UTC tzinfo object.
+
+    Note that FixedOffset(0, 0, "UTC") or FixedOffset() is a different way to
+    build a UTC tzinfo object.
     '''
-    
-    def __init__(self, offset_hours, offset_minutes, name):
+
+    def __init__(self, offset_hours=0, offset_minutes=0, name="UTC"):
         '''
         Initialise an instance with time offset and name.
         The time offset should be positive for time zones east of UTC
-        and negate for time zones west of UTC. 
+        and negate for time zones west of UTC.
         '''
         self.__offset = timedelta(hours=offset_hours, minutes=offset_minutes)
         self.__name = name
@@ -68,11 +72,11 @@ class FixedOffset(tzinfo):
 
     def dst(self, dt):
         '''
-        Return the daylight saving time (DST) adjustment, in minutes east of 
+        Return the daylight saving time (DST) adjustment, in minutes east of
         UTC.
         '''
         return ZERO
-    
+
     def __repr__(self):
         '''
         Return nicely formatted repr string.
@@ -80,18 +84,19 @@ class FixedOffset(tzinfo):
         return "<FixedOffset %r>" % self.__name
 
 
-STDOFFSET = timedelta(seconds = -time.timezone)
+STDOFFSET = timedelta(seconds=-time.timezone)
 # locale time zone offset
 
 # calculate local daylight saving offset if any.
 if time.daylight:
-    DSTOFFSET = timedelta(seconds = -time.altzone)
+    DSTOFFSET = timedelta(seconds=-time.altzone)
 else:
     DSTOFFSET = STDOFFSET
 
 DSTDIFF = DSTOFFSET - STDOFFSET
 # difference between local time zone and local DST time zone
 
+
 class LocalTimezone(tzinfo):
     """
     A class capturing the platform's idea of local time.
diff --git a/lib/isodate/tzinfo.pyc b/lib/isodate/tzinfo.pyc
index a0691cf..2fc0507 100644
Binary files a/lib/isodate/tzinfo.pyc and b/lib/isodate/tzinfo.pyc differ
diff --git a/lib/preparelibs.sh b/lib/preparelibs.sh
old mode 100755
new mode 100644
index 2a677d3..43931e5
--- a/lib/preparelibs.sh
+++ b/lib/preparelibs.sh
@@ -1,2 +1,21 @@
+#  -*- coding: utf-8 -*-
+# istsos WebAdmin - Istituto Scienze della Terra
+# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 # APSScheduler - Correcting imports in python files
 find lib/apscheduler/ -name '*.py' -print0 | xargs -0 -n 1 sed -i -e 's/from apscheduler/from lib.apscheduler/g'
+find lib/pytz/ -name '*.py' -print0 | xargs -0 -n 1 sed -i -e 's/from pytz/from lib.pytz/g'
+find lib/pytz/ -name '*.py' -print0 | xargs -0 -n 1 sed -i -e 's/import pytz/import lib.pytz/g'
diff --git a/lib/pytz-old/__init__.py b/lib/pytz-old/__init__.py
new file mode 100755
index 0000000..265ba14
--- /dev/null
+++ b/lib/pytz-old/__init__.py
@@ -0,0 +1,1513 @@
+'''
+datetime.tzinfo timezone definitions generated from the
+Olson timezone database:
+
+    ftp://elsie.nci.nih.gov/pub/tz*.tar.gz
+
+See the datetime section of the Python Library Reference for information
+on how to use these modules.
+'''
+
+# The Olson database is updated several times a year.
+OLSON_VERSION = '2014j'
+VERSION = '2014.10'  # Switching to pip compatible version numbering.
+__version__ = VERSION
+
+OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
+
+__all__ = [
+    'timezone', 'utc', 'country_timezones', 'country_names',
+    'AmbiguousTimeError', 'InvalidTimeError',
+    'NonExistentTimeError', 'UnknownTimeZoneError',
+    'all_timezones', 'all_timezones_set',
+    'common_timezones', 'common_timezones_set',
+    ]
+
+import sys, datetime, os.path, gettext
+
+try:
+    from pkg_resources import resource_stream
+except ImportError:
+    resource_stream = None
+
+from lib.pytz.exceptions import AmbiguousTimeError
+from lib.pytz.exceptions import InvalidTimeError
+from lib.pytz.exceptions import NonExistentTimeError
+from lib.pytz.exceptions import UnknownTimeZoneError
+from lib.pytz.lazy import LazyDict, LazyList, LazySet
+from lib.pytz.tzinfo import unpickler
+from lib.pytz.tzfile import build_tzinfo, _byte_string
+
+
+try:
+    unicode
+
+except NameError: # Python 3.x
+
+    # Python 3.x doesn't have unicode(), making writing code
+    # for Python 2.3 and Python 3.x a pain.
+    unicode = str
+
+    def ascii(s):
+        r"""
+        >>> ascii('Hello')
+        'Hello'
+        >>> ascii('\N{TRADE MARK SIGN}') #doctest: +IGNORE_EXCEPTION_DETAIL
+        Traceback (most recent call last):
+            ...
+        UnicodeEncodeError: ...
+        """
+        s.encode('US-ASCII') # Raise an exception if not ASCII
+        return s # But return the original string - not a byte string.
+
+else: # Python 2.x
+
+    def ascii(s):
+        r"""
+        >>> ascii('Hello')
+        'Hello'
+        >>> ascii(u'Hello')
+        'Hello'
+        >>> ascii(u'\N{TRADE MARK SIGN}') #doctest: +IGNORE_EXCEPTION_DETAIL
+        Traceback (most recent call last):
+            ...
+        UnicodeEncodeError: ...
+        """
+        return s.encode('US-ASCII')
+
+
+def open_resource(name):
+    """Open a resource from the zoneinfo subdir for reading.
+
+    Uses the pkg_resources module if available and no standard file
+    found at the calculated location.
+    """
+    name_parts = name.lstrip('/').split('/')
+    for part in name_parts:
+        if part == os.path.pardir or os.path.sep in part:
+            raise ValueError('Bad path segment: %r' % part)
+    filename = os.path.join(os.path.dirname(__file__),
+                            'zoneinfo', *name_parts)
+    if not os.path.exists(filename) and resource_stream is not None:
+        # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+        # unless absolutely necessary to help when a broken version of
+        # pkg_resources is installed.
+        return resource_stream(__name__, 'zoneinfo/' + name)
+    return open(filename, 'rb')
+
+
+def resource_exists(name):
+    """Return true if the given resource exists"""
+    try:
+        open_resource(name).close()
+        return True
+    except IOError:
+        return False
+
+
+# Enable this when we get some translations?
+# We want an i18n API that is useful to programs using Python's gettext
+# module, as well as the Zope3 i18n package. Perhaps we should just provide
+# the POT file and translations, and leave it up to callers to make use
+# of them.
+# 
+# t = gettext.translation(
+#         'pytz', os.path.join(os.path.dirname(__file__), 'locales'),
+#         fallback=True
+#         )
+# def _(timezone_name):
+#     """Translate a timezone name using the current locale, returning Unicode"""
+#     return t.ugettext(timezone_name)
+
+
+_tzinfo_cache = {}
+
+def timezone(zone):
+    r''' Return a datetime.tzinfo implementation for the given timezone 
+
+    >>> from datetime import datetime, timedelta
+    >>> utc = timezone('UTC')
+    >>> eastern = timezone('US/Eastern')
+    >>> eastern.zone
+    'US/Eastern'
+    >>> timezone(unicode('US/Eastern')) is eastern
+    True
+    >>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
+    >>> loc_dt = utc_dt.astimezone(eastern)
+    >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+    >>> loc_dt.strftime(fmt)
+    '2002-10-27 01:00:00 EST (-0500)'
+    >>> (loc_dt - timedelta(minutes=10)).strftime(fmt)
+    '2002-10-27 00:50:00 EST (-0500)'
+    >>> eastern.normalize(loc_dt - timedelta(minutes=10)).strftime(fmt)
+    '2002-10-27 01:50:00 EDT (-0400)'
+    >>> (loc_dt + timedelta(minutes=10)).strftime(fmt)
+    '2002-10-27 01:10:00 EST (-0500)'
+
+    Raises UnknownTimeZoneError if passed an unknown zone.
+
+    >>> try:
+    ...     timezone('Asia/Shangri-La')
+    ... except UnknownTimeZoneError:
+    ...     print('Unknown')
+    Unknown
+
+    >>> try:
+    ...     timezone(unicode('\N{TRADE MARK SIGN}'))
+    ... except UnknownTimeZoneError:
+    ...     print('Unknown')
+    Unknown
+
+    '''
+    if zone.upper() == 'UTC':
+        return utc
+
+    try:
+        zone = ascii(zone)
+    except UnicodeEncodeError:
+        # All valid timezones are ASCII
+        raise UnknownTimeZoneError(zone)
+
+    zone = _unmunge_zone(zone)
+    if zone not in _tzinfo_cache:
+        if zone in all_timezones_set:
+            fp = open_resource(zone)
+            try:
+                _tzinfo_cache[zone] = build_tzinfo(zone, fp)
+            finally:
+                fp.close()
+        else:
+            raise UnknownTimeZoneError(zone)
+
+    return _tzinfo_cache[zone]
+
+
+def _unmunge_zone(zone):
+    """Undo the time zone name munging done by older versions of pytz."""
+    return zone.replace('_plus_', '+').replace('_minus_', '-')
+
+
+ZERO = datetime.timedelta(0)
+HOUR = datetime.timedelta(hours=1)
+
+
+class UTC(datetime.tzinfo):
+    """UTC
+
+    Optimized UTC implementation. It unpickles using the single module global
+    instance defined beneath this class declaration.
+    """
+    zone = "UTC"
+
+    _utcoffset = ZERO
+    _dst = ZERO
+    _tzname = zone
+
+    def fromutc(self, dt):
+        if dt.tzinfo is None:
+            return self.localize(dt)
+        return super(utc.__class__, self).fromutc(dt)
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+
+    def __reduce__(self):
+        return _UTC, ()
+
+    def localize(self, dt, is_dst=False):
+        '''Convert naive time to local time'''
+        if dt.tzinfo is not None:
+            raise ValueError('Not naive datetime (tzinfo is already set)')
+        return dt.replace(tzinfo=self)
+
+    def normalize(self, dt, is_dst=False):
+        '''Correct the timezone information on the given datetime'''
+        if dt.tzinfo is self:
+            return dt
+        if dt.tzinfo is None:
+            raise ValueError('Naive time - no tzinfo set')
+        return dt.astimezone(self)
+
+    def __repr__(self):
+        return "<UTC>"
+
+    def __str__(self):
+        return "UTC"
+
+
+UTC = utc = UTC() # UTC is a singleton
+
+
+def _UTC():
+    """Factory function for utc unpickling.
+
+    Makes sure that unpickling a utc instance always returns the same 
+    module global.
+
+    These examples belong in the UTC class above, but it is obscured; or in
+    the README.txt, but we are not depending on Python 2.4 so integrating
+    the README.txt examples with the unit tests is not trivial.
+
+    >>> import datetime, pickle
+    >>> dt = datetime.datetime(2005, 3, 1, 14, 13, 21, tzinfo=utc)
+    >>> naive = dt.replace(tzinfo=None)
+    >>> p = pickle.dumps(dt, 1)
+    >>> naive_p = pickle.dumps(naive, 1)
+    >>> len(p) - len(naive_p)
+    17
+    >>> new = pickle.loads(p)
+    >>> new == dt
+    True
+    >>> new is dt
+    False
+    >>> new.tzinfo is dt.tzinfo
+    True
+    >>> utc is UTC is timezone('UTC')
+    True
+    >>> utc is timezone('GMT')
+    False
+    """
+    return utc
+_UTC.__safe_for_unpickling__ = True
+
+
+def _p(*args):
+    """Factory function for unpickling pytz tzinfo instances.
+
+    Just a wrapper around tzinfo.unpickler to save a few bytes in each pickle
+    by shortening the path.
+    """
+    return unpickler(*args)
+_p.__safe_for_unpickling__ = True
+
+
+
+class _CountryTimezoneDict(LazyDict):
+    """Map ISO 3166 country code to a list of timezone names commonly used
+    in that country.
+
+    iso3166_code is the two letter code used to identify the country.
+
+    >>> def print_list(list_of_strings):
+    ...     'We use a helper so doctests work under Python 2.3 -> 3.x'
+    ...     for s in list_of_strings:
+    ...         print(s)
+
+    >>> print_list(country_timezones['nz'])
+    Pacific/Auckland
+    Pacific/Chatham
+    >>> print_list(country_timezones['ch'])
+    Europe/Zurich
+    >>> print_list(country_timezones['CH'])
+    Europe/Zurich
+    >>> print_list(country_timezones[unicode('ch')])
+    Europe/Zurich
+    >>> print_list(country_timezones['XXX'])
+    Traceback (most recent call last):
+    ...
+    KeyError: 'XXX'
+
+    Previously, this information was exposed as a function rather than a
+    dictionary. This is still supported::
+
+    >>> print_list(country_timezones('nz'))
+    Pacific/Auckland
+    Pacific/Chatham
+    """
+    def __call__(self, iso3166_code):
+        """Backwards compatibility."""
+        return self[iso3166_code]
+
+    def _fill(self):
+        data = {}
+        zone_tab = open_resource('zone.tab')
+        try:
+            for line in zone_tab:
+                line = line.decode('US-ASCII')
+                if line.startswith('#'):
+                    continue
+                code, coordinates, zone = line.split(None, 4)[:3]
+                if zone not in all_timezones_set:
+                    continue
+                try:
+                    data[code].append(zone)
+                except KeyError:
+                    data[code] = [zone]
+            self.data = data
+        finally:
+            zone_tab.close()
+
+country_timezones = _CountryTimezoneDict()
+
+
+class _CountryNameDict(LazyDict):
+    '''Dictionary proving ISO3166 code -> English name.
+
+    >>> print(country_names['au'])
+    Australia
+    '''
+    def _fill(self):
+        data = {}
+        zone_tab = open_resource('iso3166.tab')
+        try:
+            for line in zone_tab.readlines():
+                line = line.decode('US-ASCII')
+                if line.startswith('#'):
+                    continue
+                code, name = line.split(None, 1)
+                data[code] = name.strip()
+            self.data = data
+        finally:
+            zone_tab.close()
+
+country_names = _CountryNameDict()
+
+
+# Time-zone info based solely on fixed offsets
+
+class _FixedOffset(datetime.tzinfo):
+
+    zone = None # to match the standard pytz API
+
+    def __init__(self, minutes):
+        if abs(minutes) >= 1440:
+            raise ValueError("absolute offset is too large", minutes)
+        self._minutes = minutes
+        self._offset = datetime.timedelta(minutes=minutes)
+
+    def utcoffset(self, dt):
+        return self._offset
+
+    def __reduce__(self):
+        return FixedOffset, (self._minutes, )
+
+    def dst(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return None
+
+    def __repr__(self):
+        return 'pytz.FixedOffset(%d)' % self._minutes
+
+    def localize(self, dt, is_dst=False):
+        '''Convert naive time to local time'''
+        if dt.tzinfo is not None:
+            raise ValueError('Not naive datetime (tzinfo is already set)')
+        return dt.replace(tzinfo=self)
+
+    def normalize(self, dt, is_dst=False):
+        '''Correct the timezone information on the given datetime'''
+        if dt.tzinfo is None:
+            raise ValueError('Naive time - no tzinfo set')
+        return dt.replace(tzinfo=self)
+
+
+def FixedOffset(offset, _tzinfos = {}):
+    """return a fixed-offset timezone based off a number of minutes.
+
+        >>> one = FixedOffset(-330)
+        >>> one
+        pytz.FixedOffset(-330)
+        >>> one.utcoffset(datetime.datetime.now())
+        datetime.timedelta(-1, 66600)
+        >>> one.dst(datetime.datetime.now())
+        datetime.timedelta(0)
+
+        >>> two = FixedOffset(1380)
+        >>> two
+        pytz.FixedOffset(1380)
+        >>> two.utcoffset(datetime.datetime.now())
+        datetime.timedelta(0, 82800)
+        >>> two.dst(datetime.datetime.now())
+        datetime.timedelta(0)
+
+    The datetime.timedelta must be between the range of -1 and 1 day,
+    non-inclusive.
+
+        >>> FixedOffset(1440)
+        Traceback (most recent call last):
+        ...
+        ValueError: ('absolute offset is too large', 1440)
+
+        >>> FixedOffset(-1440)
+        Traceback (most recent call last):
+        ...
+        ValueError: ('absolute offset is too large', -1440)
+
+    An offset of 0 is special-cased to return UTC.
+
+        >>> FixedOffset(0) is UTC
+        True
+
+    There should always be only one instance of a FixedOffset per timedelta.
+    This should be true for multiple creation calls.
+
+        >>> FixedOffset(-330) is one
+        True
+        >>> FixedOffset(1380) is two
+        True
+
+    It should also be true for pickling.
+
+        >>> import pickle
+        >>> pickle.loads(pickle.dumps(one)) is one
+        True
+        >>> pickle.loads(pickle.dumps(two)) is two
+        True
+    """
+    if offset == 0:
+        return UTC
+
+    info = _tzinfos.get(offset)
+    if info is None:
+        # We haven't seen this one before. we need to save it.
+
+        # Use setdefault to avoid a race condition and make sure we have
+        # only one
+        info = _tzinfos.setdefault(offset, _FixedOffset(offset))
+
+    return info
+
+FixedOffset.__safe_for_unpickling__ = True
+
+
+def _test():
+    import doctest, os, sys
+    sys.path.insert(0, os.pardir)
+    import pytz
+    return doctest.testmod(pytz)
+
+if __name__ == '__main__':
+    _test()
+
+all_timezones = \
+['Africa/Abidjan',
+ 'Africa/Accra',
+ 'Africa/Addis_Ababa',
+ 'Africa/Algiers',
+ 'Africa/Asmara',
+ 'Africa/Asmera',
+ 'Africa/Bamako',
+ 'Africa/Bangui',
+ 'Africa/Banjul',
+ 'Africa/Bissau',
+ 'Africa/Blantyre',
+ 'Africa/Brazzaville',
+ 'Africa/Bujumbura',
+ 'Africa/Cairo',
+ 'Africa/Casablanca',
+ 'Africa/Ceuta',
+ 'Africa/Conakry',
+ 'Africa/Dakar',
+ 'Africa/Dar_es_Salaam',
+ 'Africa/Djibouti',
+ 'Africa/Douala',
+ 'Africa/El_Aaiun',
+ 'Africa/Freetown',
+ 'Africa/Gaborone',
+ 'Africa/Harare',
+ 'Africa/Johannesburg',
+ 'Africa/Juba',
+ 'Africa/Kampala',
+ 'Africa/Khartoum',
+ 'Africa/Kigali',
+ 'Africa/Kinshasa',
+ 'Africa/Lagos',
+ 'Africa/Libreville',
+ 'Africa/Lome',
+ 'Africa/Luanda',
+ 'Africa/Lubumbashi',
+ 'Africa/Lusaka',
+ 'Africa/Malabo',
+ 'Africa/Maputo',
+ 'Africa/Maseru',
+ 'Africa/Mbabane',
+ 'Africa/Mogadishu',
+ 'Africa/Monrovia',
+ 'Africa/Nairobi',
+ 'Africa/Ndjamena',
+ 'Africa/Niamey',
+ 'Africa/Nouakchott',
+ 'Africa/Ouagadougou',
+ 'Africa/Porto-Novo',
+ 'Africa/Sao_Tome',
+ 'Africa/Timbuktu',
+ 'Africa/Tripoli',
+ 'Africa/Tunis',
+ 'Africa/Windhoek',
+ 'America/Adak',
+ 'America/Anchorage',
+ 'America/Anguilla',
+ 'America/Antigua',
+ 'America/Araguaina',
+ 'America/Argentina/Buenos_Aires',
+ 'America/Argentina/Catamarca',
+ 'America/Argentina/ComodRivadavia',
+ 'America/Argentina/Cordoba',
+ 'America/Argentina/Jujuy',
+ 'America/Argentina/La_Rioja',
+ 'America/Argentina/Mendoza',
+ 'America/Argentina/Rio_Gallegos',
+ 'America/Argentina/Salta',
+ 'America/Argentina/San_Juan',
+ 'America/Argentina/San_Luis',
+ 'America/Argentina/Tucuman',
+ 'America/Argentina/Ushuaia',
+ 'America/Aruba',
+ 'America/Asuncion',
+ 'America/Atikokan',
+ 'America/Atka',
+ 'America/Bahia',
+ 'America/Bahia_Banderas',
+ 'America/Barbados',
+ 'America/Belem',
+ 'America/Belize',
+ 'America/Blanc-Sablon',
+ 'America/Boa_Vista',
+ 'America/Bogota',
+ 'America/Boise',
+ 'America/Buenos_Aires',
+ 'America/Cambridge_Bay',
+ 'America/Campo_Grande',
+ 'America/Cancun',
+ 'America/Caracas',
+ 'America/Catamarca',
+ 'America/Cayenne',
+ 'America/Cayman',
+ 'America/Chicago',
+ 'America/Chihuahua',
+ 'America/Coral_Harbour',
+ 'America/Cordoba',
+ 'America/Costa_Rica',
+ 'America/Creston',
+ 'America/Cuiaba',
+ 'America/Curacao',
+ 'America/Danmarkshavn',
+ 'America/Dawson',
+ 'America/Dawson_Creek',
+ 'America/Denver',
+ 'America/Detroit',
+ 'America/Dominica',
+ 'America/Edmonton',
+ 'America/Eirunepe',
+ 'America/El_Salvador',
+ 'America/Ensenada',
+ 'America/Fort_Wayne',
+ 'America/Fortaleza',
+ 'America/Glace_Bay',
+ 'America/Godthab',
+ 'America/Goose_Bay',
+ 'America/Grand_Turk',
+ 'America/Grenada',
+ 'America/Guadeloupe',
+ 'America/Guatemala',
+ 'America/Guayaquil',
+ 'America/Guyana',
+ 'America/Halifax',
+ 'America/Havana',
+ 'America/Hermosillo',
+ 'America/Indiana/Indianapolis',
+ 'America/Indiana/Knox',
+ 'America/Indiana/Marengo',
+ 'America/Indiana/Petersburg',
+ 'America/Indiana/Tell_City',
+ 'America/Indiana/Vevay',
+ 'America/Indiana/Vincennes',
+ 'America/Indiana/Winamac',
+ 'America/Indianapolis',
+ 'America/Inuvik',
+ 'America/Iqaluit',
+ 'America/Jamaica',
+ 'America/Jujuy',
+ 'America/Juneau',
+ 'America/Kentucky/Louisville',
+ 'America/Kentucky/Monticello',
+ 'America/Knox_IN',
+ 'America/Kralendijk',
+ 'America/La_Paz',
+ 'America/Lima',
+ 'America/Los_Angeles',
+ 'America/Louisville',
+ 'America/Lower_Princes',
+ 'America/Maceio',
+ 'America/Managua',
+ 'America/Manaus',
+ 'America/Marigot',
+ 'America/Martinique',
+ 'America/Matamoros',
+ 'America/Mazatlan',
+ 'America/Mendoza',
+ 'America/Menominee',
+ 'America/Merida',
+ 'America/Metlakatla',
+ 'America/Mexico_City',
+ 'America/Miquelon',
+ 'America/Moncton',
+ 'America/Monterrey',
+ 'America/Montevideo',
+ 'America/Montreal',
+ 'America/Montserrat',
+ 'America/Nassau',
+ 'America/New_York',
+ 'America/Nipigon',
+ 'America/Nome',
+ 'America/Noronha',
+ 'America/North_Dakota/Beulah',
+ 'America/North_Dakota/Center',
+ 'America/North_Dakota/New_Salem',
+ 'America/Ojinaga',
+ 'America/Panama',
+ 'America/Pangnirtung',
+ 'America/Paramaribo',
+ 'America/Phoenix',
+ 'America/Port-au-Prince',
+ 'America/Port_of_Spain',
+ 'America/Porto_Acre',
+ 'America/Porto_Velho',
+ 'America/Puerto_Rico',
+ 'America/Rainy_River',
+ 'America/Rankin_Inlet',
+ 'America/Recife',
+ 'America/Regina',
+ 'America/Resolute',
+ 'America/Rio_Branco',
+ 'America/Rosario',
+ 'America/Santa_Isabel',
+ 'America/Santarem',
+ 'America/Santiago',
+ 'America/Santo_Domingo',
+ 'America/Sao_Paulo',
+ 'America/Scoresbysund',
+ 'America/Shiprock',
+ 'America/Sitka',
+ 'America/St_Barthelemy',
+ 'America/St_Johns',
+ 'America/St_Kitts',
+ 'America/St_Lucia',
+ 'America/St_Thomas',
+ 'America/St_Vincent',
+ 'America/Swift_Current',
+ 'America/Tegucigalpa',
+ 'America/Thule',
+ 'America/Thunder_Bay',
+ 'America/Tijuana',
+ 'America/Toronto',
+ 'America/Tortola',
+ 'America/Vancouver',
+ 'America/Virgin',
+ 'America/Whitehorse',
+ 'America/Winnipeg',
+ 'America/Yakutat',
+ 'America/Yellowknife',
+ 'Antarctica/Casey',
+ 'Antarctica/Davis',
+ 'Antarctica/DumontDUrville',
+ 'Antarctica/Macquarie',
+ 'Antarctica/Mawson',
+ 'Antarctica/McMurdo',
+ 'Antarctica/Palmer',
+ 'Antarctica/Rothera',
+ 'Antarctica/South_Pole',
+ 'Antarctica/Syowa',
+ 'Antarctica/Troll',
+ 'Antarctica/Vostok',
+ 'Arctic/Longyearbyen',
+ 'Asia/Aden',
+ 'Asia/Almaty',
+ 'Asia/Amman',
+ 'Asia/Anadyr',
+ 'Asia/Aqtau',
+ 'Asia/Aqtobe',
+ 'Asia/Ashgabat',
+ 'Asia/Ashkhabad',
+ 'Asia/Baghdad',
+ 'Asia/Bahrain',
+ 'Asia/Baku',
+ 'Asia/Bangkok',
+ 'Asia/Beirut',
+ 'Asia/Bishkek',
+ 'Asia/Brunei',
+ 'Asia/Calcutta',
+ 'Asia/Chita',
+ 'Asia/Choibalsan',
+ 'Asia/Chongqing',
+ 'Asia/Chungking',
+ 'Asia/Colombo',
+ 'Asia/Dacca',
+ 'Asia/Damascus',
+ 'Asia/Dhaka',
+ 'Asia/Dili',
+ 'Asia/Dubai',
+ 'Asia/Dushanbe',
+ 'Asia/Gaza',
+ 'Asia/Harbin',
+ 'Asia/Hebron',
+ 'Asia/Ho_Chi_Minh',
+ 'Asia/Hong_Kong',
+ 'Asia/Hovd',
+ 'Asia/Irkutsk',
+ 'Asia/Istanbul',
+ 'Asia/Jakarta',
+ 'Asia/Jayapura',
+ 'Asia/Jerusalem',
+ 'Asia/Kabul',
+ 'Asia/Kamchatka',
+ 'Asia/Karachi',
+ 'Asia/Kashgar',
+ 'Asia/Kathmandu',
+ 'Asia/Katmandu',
+ 'Asia/Khandyga',
+ 'Asia/Kolkata',
+ 'Asia/Krasnoyarsk',
+ 'Asia/Kuala_Lumpur',
+ 'Asia/Kuching',
+ 'Asia/Kuwait',
+ 'Asia/Macao',
+ 'Asia/Macau',
+ 'Asia/Magadan',
+ 'Asia/Makassar',
+ 'Asia/Manila',
+ 'Asia/Muscat',
+ 'Asia/Nicosia',
+ 'Asia/Novokuznetsk',
+ 'Asia/Novosibirsk',
+ 'Asia/Omsk',
+ 'Asia/Oral',
+ 'Asia/Phnom_Penh',
+ 'Asia/Pontianak',
+ 'Asia/Pyongyang',
+ 'Asia/Qatar',
+ 'Asia/Qyzylorda',
+ 'Asia/Rangoon',
+ 'Asia/Riyadh',
+ 'Asia/Saigon',
+ 'Asia/Sakhalin',
+ 'Asia/Samarkand',
+ 'Asia/Seoul',
+ 'Asia/Shanghai',
+ 'Asia/Singapore',
+ 'Asia/Srednekolymsk',
+ 'Asia/Taipei',
+ 'Asia/Tashkent',
+ 'Asia/Tbilisi',
+ 'Asia/Tehran',
+ 'Asia/Tel_Aviv',
+ 'Asia/Thimbu',
+ 'Asia/Thimphu',
+ 'Asia/Tokyo',
+ 'Asia/Ujung_Pandang',
+ 'Asia/Ulaanbaatar',
+ 'Asia/Ulan_Bator',
+ 'Asia/Urumqi',
+ 'Asia/Ust-Nera',
+ 'Asia/Vientiane',
+ 'Asia/Vladivostok',
+ 'Asia/Yakutsk',
+ 'Asia/Yekaterinburg',
+ 'Asia/Yerevan',
+ 'Atlantic/Azores',
+ 'Atlantic/Bermuda',
+ 'Atlantic/Canary',
+ 'Atlantic/Cape_Verde',
+ 'Atlantic/Faeroe',
+ 'Atlantic/Faroe',
+ 'Atlantic/Jan_Mayen',
+ 'Atlantic/Madeira',
+ 'Atlantic/Reykjavik',
+ 'Atlantic/South_Georgia',
+ 'Atlantic/St_Helena',
+ 'Atlantic/Stanley',
+ 'Australia/ACT',
+ 'Australia/Adelaide',
+ 'Australia/Brisbane',
+ 'Australia/Broken_Hill',
+ 'Australia/Canberra',
+ 'Australia/Currie',
+ 'Australia/Darwin',
+ 'Australia/Eucla',
+ 'Australia/Hobart',
+ 'Australia/LHI',
+ 'Australia/Lindeman',
+ 'Australia/Lord_Howe',
+ 'Australia/Melbourne',
+ 'Australia/NSW',
+ 'Australia/North',
+ 'Australia/Perth',
+ 'Australia/Queensland',
+ 'Australia/South',
+ 'Australia/Sydney',
+ 'Australia/Tasmania',
+ 'Australia/Victoria',
+ 'Australia/West',
+ 'Australia/Yancowinna',
+ 'Brazil/Acre',
+ 'Brazil/DeNoronha',
+ 'Brazil/East',
+ 'Brazil/West',
+ 'CET',
+ 'CST6CDT',
+ 'Canada/Atlantic',
+ 'Canada/Central',
+ 'Canada/East-Saskatchewan',
+ 'Canada/Eastern',
+ 'Canada/Mountain',
+ 'Canada/Newfoundland',
+ 'Canada/Pacific',
+ 'Canada/Saskatchewan',
+ 'Canada/Yukon',
+ 'Chile/Continental',
+ 'Chile/EasterIsland',
+ 'Cuba',
+ 'EET',
+ 'EST',
+ 'EST5EDT',
+ 'Egypt',
+ 'Eire',
+ 'Etc/GMT',
+ 'Etc/GMT+0',
+ 'Etc/GMT+1',
+ 'Etc/GMT+10',
+ 'Etc/GMT+11',
+ 'Etc/GMT+12',
+ 'Etc/GMT+2',
+ 'Etc/GMT+3',
+ 'Etc/GMT+4',
+ 'Etc/GMT+5',
+ 'Etc/GMT+6',
+ 'Etc/GMT+7',
+ 'Etc/GMT+8',
+ 'Etc/GMT+9',
+ 'Etc/GMT-0',
+ 'Etc/GMT-1',
+ 'Etc/GMT-10',
+ 'Etc/GMT-11',
+ 'Etc/GMT-12',
+ 'Etc/GMT-13',
+ 'Etc/GMT-14',
+ 'Etc/GMT-2',
+ 'Etc/GMT-3',
+ 'Etc/GMT-4',
+ 'Etc/GMT-5',
+ 'Etc/GMT-6',
+ 'Etc/GMT-7',
+ 'Etc/GMT-8',
+ 'Etc/GMT-9',
+ 'Etc/GMT0',
+ 'Etc/Greenwich',
+ 'Etc/UCT',
+ 'Etc/UTC',
+ 'Etc/Universal',
+ 'Etc/Zulu',
+ 'Europe/Amsterdam',
+ 'Europe/Andorra',
+ 'Europe/Athens',
+ 'Europe/Belfast',
+ 'Europe/Belgrade',
+ 'Europe/Berlin',
+ 'Europe/Bratislava',
+ 'Europe/Brussels',
+ 'Europe/Bucharest',
+ 'Europe/Budapest',
+ 'Europe/Busingen',
+ 'Europe/Chisinau',
+ 'Europe/Copenhagen',
+ 'Europe/Dublin',
+ 'Europe/Gibraltar',
+ 'Europe/Guernsey',
+ 'Europe/Helsinki',
+ 'Europe/Isle_of_Man',
+ 'Europe/Istanbul',
+ 'Europe/Jersey',
+ 'Europe/Kaliningrad',
+ 'Europe/Kiev',
+ 'Europe/Lisbon',
+ 'Europe/Ljubljana',
+ 'Europe/London',
+ 'Europe/Luxembourg',
+ 'Europe/Madrid',
+ 'Europe/Malta',
+ 'Europe/Mariehamn',
+ 'Europe/Minsk',
+ 'Europe/Monaco',
+ 'Europe/Moscow',
+ 'Europe/Nicosia',
+ 'Europe/Oslo',
+ 'Europe/Paris',
+ 'Europe/Podgorica',
+ 'Europe/Prague',
+ 'Europe/Riga',
+ 'Europe/Rome',
+ 'Europe/Samara',
+ 'Europe/San_Marino',
+ 'Europe/Sarajevo',
+ 'Europe/Simferopol',
+ 'Europe/Skopje',
+ 'Europe/Sofia',
+ 'Europe/Stockholm',
+ 'Europe/Tallinn',
+ 'Europe/Tirane',
+ 'Europe/Tiraspol',
+ 'Europe/Uzhgorod',
+ 'Europe/Vaduz',
+ 'Europe/Vatican',
+ 'Europe/Vienna',
+ 'Europe/Vilnius',
+ 'Europe/Volgograd',
+ 'Europe/Warsaw',
+ 'Europe/Zagreb',
+ 'Europe/Zaporozhye',
+ 'Europe/Zurich',
+ 'GB',
+ 'GB-Eire',
+ 'GMT',
+ 'GMT+0',
+ 'GMT-0',
+ 'GMT0',
+ 'Greenwich',
+ 'HST',
+ 'Hongkong',
+ 'Iceland',
+ 'Indian/Antananarivo',
+ 'Indian/Chagos',
+ 'Indian/Christmas',
+ 'Indian/Cocos',
+ 'Indian/Comoro',
+ 'Indian/Kerguelen',
+ 'Indian/Mahe',
+ 'Indian/Maldives',
+ 'Indian/Mauritius',
+ 'Indian/Mayotte',
+ 'Indian/Reunion',
+ 'Iran',
+ 'Israel',
+ 'Jamaica',
+ 'Japan',
+ 'Kwajalein',
+ 'Libya',
+ 'MET',
+ 'MST',
+ 'MST7MDT',
+ 'Mexico/BajaNorte',
+ 'Mexico/BajaSur',
+ 'Mexico/General',
+ 'NZ',
+ 'NZ-CHAT',
+ 'Navajo',
+ 'PRC',
+ 'PST8PDT',
+ 'Pacific/Apia',
+ 'Pacific/Auckland',
+ 'Pacific/Bougainville',
+ 'Pacific/Chatham',
+ 'Pacific/Chuuk',
+ 'Pacific/Easter',
+ 'Pacific/Efate',
+ 'Pacific/Enderbury',
+ 'Pacific/Fakaofo',
+ 'Pacific/Fiji',
+ 'Pacific/Funafuti',
+ 'Pacific/Galapagos',
+ 'Pacific/Gambier',
+ 'Pacific/Guadalcanal',
+ 'Pacific/Guam',
+ 'Pacific/Honolulu',
+ 'Pacific/Johnston',
+ 'Pacific/Kiritimati',
+ 'Pacific/Kosrae',
+ 'Pacific/Kwajalein',
+ 'Pacific/Majuro',
+ 'Pacific/Marquesas',
+ 'Pacific/Midway',
+ 'Pacific/Nauru',
+ 'Pacific/Niue',
+ 'Pacific/Norfolk',
+ 'Pacific/Noumea',
+ 'Pacific/Pago_Pago',
+ 'Pacific/Palau',
+ 'Pacific/Pitcairn',
+ 'Pacific/Pohnpei',
+ 'Pacific/Ponape',
+ 'Pacific/Port_Moresby',
+ 'Pacific/Rarotonga',
+ 'Pacific/Saipan',
+ 'Pacific/Samoa',
+ 'Pacific/Tahiti',
+ 'Pacific/Tarawa',
+ 'Pacific/Tongatapu',
+ 'Pacific/Truk',
+ 'Pacific/Wake',
+ 'Pacific/Wallis',
+ 'Pacific/Yap',
+ 'Poland',
+ 'Portugal',
+ 'ROC',
+ 'ROK',
+ 'Singapore',
+ 'Turkey',
+ 'UCT',
+ 'US/Alaska',
+ 'US/Aleutian',
+ 'US/Arizona',
+ 'US/Central',
+ 'US/East-Indiana',
+ 'US/Eastern',
+ 'US/Hawaii',
+ 'US/Indiana-Starke',
+ 'US/Michigan',
+ 'US/Mountain',
+ 'US/Pacific',
+ 'US/Pacific-New',
+ 'US/Samoa',
+ 'UTC',
+ 'Universal',
+ 'W-SU',
+ 'WET',
+ 'Zulu']
+all_timezones = LazyList(
+        tz for tz in all_timezones if resource_exists(tz))
+        
+all_timezones_set = LazySet(all_timezones)
+common_timezones = \
+['Africa/Abidjan',
+ 'Africa/Accra',
+ 'Africa/Addis_Ababa',
+ 'Africa/Algiers',
+ 'Africa/Asmara',
+ 'Africa/Bamako',
+ 'Africa/Bangui',
+ 'Africa/Banjul',
+ 'Africa/Bissau',
+ 'Africa/Blantyre',
+ 'Africa/Brazzaville',
+ 'Africa/Bujumbura',
+ 'Africa/Cairo',
+ 'Africa/Casablanca',
+ 'Africa/Ceuta',
+ 'Africa/Conakry',
+ 'Africa/Dakar',
+ 'Africa/Dar_es_Salaam',
+ 'Africa/Djibouti',
+ 'Africa/Douala',
+ 'Africa/El_Aaiun',
+ 'Africa/Freetown',
+ 'Africa/Gaborone',
+ 'Africa/Harare',
+ 'Africa/Johannesburg',
+ 'Africa/Juba',
+ 'Africa/Kampala',
+ 'Africa/Khartoum',
+ 'Africa/Kigali',
+ 'Africa/Kinshasa',
+ 'Africa/Lagos',
+ 'Africa/Libreville',
+ 'Africa/Lome',
+ 'Africa/Luanda',
+ 'Africa/Lubumbashi',
+ 'Africa/Lusaka',
+ 'Africa/Malabo',
+ 'Africa/Maputo',
+ 'Africa/Maseru',
+ 'Africa/Mbabane',
+ 'Africa/Mogadishu',
+ 'Africa/Monrovia',
+ 'Africa/Nairobi',
+ 'Africa/Ndjamena',
+ 'Africa/Niamey',
+ 'Africa/Nouakchott',
+ 'Africa/Ouagadougou',
+ 'Africa/Porto-Novo',
+ 'Africa/Sao_Tome',
+ 'Africa/Tripoli',
+ 'Africa/Tunis',
+ 'Africa/Windhoek',
+ 'America/Adak',
+ 'America/Anchorage',
+ 'America/Anguilla',
+ 'America/Antigua',
+ 'America/Araguaina',
+ 'America/Argentina/Buenos_Aires',
+ 'America/Argentina/Catamarca',
+ 'America/Argentina/Cordoba',
+ 'America/Argentina/Jujuy',
+ 'America/Argentina/La_Rioja',
+ 'America/Argentina/Mendoza',
+ 'America/Argentina/Rio_Gallegos',
+ 'America/Argentina/Salta',
+ 'America/Argentina/San_Juan',
+ 'America/Argentina/San_Luis',
+ 'America/Argentina/Tucuman',
+ 'America/Argentina/Ushuaia',
+ 'America/Aruba',
+ 'America/Asuncion',
+ 'America/Atikokan',
+ 'America/Bahia',
+ 'America/Bahia_Banderas',
+ 'America/Barbados',
+ 'America/Belem',
+ 'America/Belize',
+ 'America/Blanc-Sablon',
+ 'America/Boa_Vista',
+ 'America/Bogota',
+ 'America/Boise',
+ 'America/Cambridge_Bay',
+ 'America/Campo_Grande',
+ 'America/Cancun',
+ 'America/Caracas',
+ 'America/Cayenne',
+ 'America/Cayman',
+ 'America/Chicago',
+ 'America/Chihuahua',
+ 'America/Costa_Rica',
+ 'America/Creston',
+ 'America/Cuiaba',
+ 'America/Curacao',
+ 'America/Danmarkshavn',
+ 'America/Dawson',
+ 'America/Dawson_Creek',
+ 'America/Denver',
+ 'America/Detroit',
+ 'America/Dominica',
+ 'America/Edmonton',
+ 'America/Eirunepe',
+ 'America/El_Salvador',
+ 'America/Fortaleza',
+ 'America/Glace_Bay',
+ 'America/Godthab',
+ 'America/Goose_Bay',
+ 'America/Grand_Turk',
+ 'America/Grenada',
+ 'America/Guadeloupe',
+ 'America/Guatemala',
+ 'America/Guayaquil',
+ 'America/Guyana',
+ 'America/Halifax',
+ 'America/Havana',
+ 'America/Hermosillo',
+ 'America/Indiana/Indianapolis',
+ 'America/Indiana/Knox',
+ 'America/Indiana/Marengo',
+ 'America/Indiana/Petersburg',
+ 'America/Indiana/Tell_City',
+ 'America/Indiana/Vevay',
+ 'America/Indiana/Vincennes',
+ 'America/Indiana/Winamac',
+ 'America/Inuvik',
+ 'America/Iqaluit',
+ 'America/Jamaica',
+ 'America/Juneau',
+ 'America/Kentucky/Louisville',
+ 'America/Kentucky/Monticello',
+ 'America/Kralendijk',
+ 'America/La_Paz',
+ 'America/Lima',
+ 'America/Los_Angeles',
+ 'America/Lower_Princes',
+ 'America/Maceio',
+ 'America/Managua',
+ 'America/Manaus',
+ 'America/Marigot',
+ 'America/Martinique',
+ 'America/Matamoros',
+ 'America/Mazatlan',
+ 'America/Menominee',
+ 'America/Merida',
+ 'America/Metlakatla',
+ 'America/Mexico_City',
+ 'America/Miquelon',
+ 'America/Moncton',
+ 'America/Monterrey',
+ 'America/Montevideo',
+ 'America/Montreal',
+ 'America/Montserrat',
+ 'America/Nassau',
+ 'America/New_York',
+ 'America/Nipigon',
+ 'America/Nome',
+ 'America/Noronha',
+ 'America/North_Dakota/Beulah',
+ 'America/North_Dakota/Center',
+ 'America/North_Dakota/New_Salem',
+ 'America/Ojinaga',
+ 'America/Panama',
+ 'America/Pangnirtung',
+ 'America/Paramaribo',
+ 'America/Phoenix',
+ 'America/Port-au-Prince',
+ 'America/Port_of_Spain',
+ 'America/Porto_Velho',
+ 'America/Puerto_Rico',
+ 'America/Rainy_River',
+ 'America/Rankin_Inlet',
+ 'America/Recife',
+ 'America/Regina',
+ 'America/Resolute',
+ 'America/Rio_Branco',
+ 'America/Santa_Isabel',
+ 'America/Santarem',
+ 'America/Santiago',
+ 'America/Santo_Domingo',
+ 'America/Sao_Paulo',
+ 'America/Scoresbysund',
+ 'America/Sitka',
+ 'America/St_Barthelemy',
+ 'America/St_Johns',
+ 'America/St_Kitts',
+ 'America/St_Lucia',
+ 'America/St_Thomas',
+ 'America/St_Vincent',
+ 'America/Swift_Current',
+ 'America/Tegucigalpa',
+ 'America/Thule',
+ 'America/Thunder_Bay',
+ 'America/Tijuana',
+ 'America/Toronto',
+ 'America/Tortola',
+ 'America/Vancouver',
+ 'America/Whitehorse',
+ 'America/Winnipeg',
+ 'America/Yakutat',
+ 'America/Yellowknife',
+ 'Antarctica/Casey',
+ 'Antarctica/Davis',
+ 'Antarctica/DumontDUrville',
+ 'Antarctica/Macquarie',
+ 'Antarctica/Mawson',
+ 'Antarctica/McMurdo',
+ 'Antarctica/Palmer',
+ 'Antarctica/Rothera',
+ 'Antarctica/Syowa',
+ 'Antarctica/Troll',
+ 'Antarctica/Vostok',
+ 'Arctic/Longyearbyen',
+ 'Asia/Aden',
+ 'Asia/Almaty',
+ 'Asia/Amman',
+ 'Asia/Anadyr',
+ 'Asia/Aqtau',
+ 'Asia/Aqtobe',
+ 'Asia/Ashgabat',
+ 'Asia/Baghdad',
+ 'Asia/Bahrain',
+ 'Asia/Baku',
+ 'Asia/Bangkok',
+ 'Asia/Beirut',
+ 'Asia/Bishkek',
+ 'Asia/Brunei',
+ 'Asia/Chita',
+ 'Asia/Choibalsan',
+ 'Asia/Colombo',
+ 'Asia/Damascus',
+ 'Asia/Dhaka',
+ 'Asia/Dili',
+ 'Asia/Dubai',
+ 'Asia/Dushanbe',
+ 'Asia/Gaza',
+ 'Asia/Hebron',
+ 'Asia/Ho_Chi_Minh',
+ 'Asia/Hong_Kong',
+ 'Asia/Hovd',
+ 'Asia/Irkutsk',
+ 'Asia/Jakarta',
+ 'Asia/Jayapura',
+ 'Asia/Jerusalem',
+ 'Asia/Kabul',
+ 'Asia/Kamchatka',
+ 'Asia/Karachi',
+ 'Asia/Kathmandu',
+ 'Asia/Khandyga',
+ 'Asia/Kolkata',
+ 'Asia/Krasnoyarsk',
+ 'Asia/Kuala_Lumpur',
+ 'Asia/Kuching',
+ 'Asia/Kuwait',
+ 'Asia/Macau',
+ 'Asia/Magadan',
+ 'Asia/Makassar',
+ 'Asia/Manila',
+ 'Asia/Muscat',
+ 'Asia/Nicosia',
+ 'Asia/Novokuznetsk',
+ 'Asia/Novosibirsk',
+ 'Asia/Omsk',
+ 'Asia/Oral',
+ 'Asia/Phnom_Penh',
+ 'Asia/Pontianak',
+ 'Asia/Pyongyang',
+ 'Asia/Qatar',
+ 'Asia/Qyzylorda',
+ 'Asia/Rangoon',
+ 'Asia/Riyadh',
+ 'Asia/Sakhalin',
+ 'Asia/Samarkand',
+ 'Asia/Seoul',
+ 'Asia/Shanghai',
+ 'Asia/Singapore',
+ 'Asia/Srednekolymsk',
+ 'Asia/Taipei',
+ 'Asia/Tashkent',
+ 'Asia/Tbilisi',
+ 'Asia/Tehran',
+ 'Asia/Thimphu',
+ 'Asia/Tokyo',
+ 'Asia/Ulaanbaatar',
+ 'Asia/Urumqi',
+ 'Asia/Ust-Nera',
+ 'Asia/Vientiane',
+ 'Asia/Vladivostok',
+ 'Asia/Yakutsk',
+ 'Asia/Yekaterinburg',
+ 'Asia/Yerevan',
+ 'Atlantic/Azores',
+ 'Atlantic/Bermuda',
+ 'Atlantic/Canary',
+ 'Atlantic/Cape_Verde',
+ 'Atlantic/Faroe',
+ 'Atlantic/Madeira',
+ 'Atlantic/Reykjavik',
+ 'Atlantic/South_Georgia',
+ 'Atlantic/St_Helena',
+ 'Atlantic/Stanley',
+ 'Australia/Adelaide',
+ 'Australia/Brisbane',
+ 'Australia/Broken_Hill',
+ 'Australia/Currie',
+ 'Australia/Darwin',
+ 'Australia/Eucla',
+ 'Australia/Hobart',
+ 'Australia/Lindeman',
+ 'Australia/Lord_Howe',
+ 'Australia/Melbourne',
+ 'Australia/Perth',
+ 'Australia/Sydney',
+ 'Canada/Atlantic',
+ 'Canada/Central',
+ 'Canada/Eastern',
+ 'Canada/Mountain',
+ 'Canada/Newfoundland',
+ 'Canada/Pacific',
+ 'Europe/Amsterdam',
+ 'Europe/Andorra',
+ 'Europe/Athens',
+ 'Europe/Belgrade',
+ 'Europe/Berlin',
+ 'Europe/Bratislava',
+ 'Europe/Brussels',
+ 'Europe/Bucharest',
+ 'Europe/Budapest',
+ 'Europe/Busingen',
+ 'Europe/Chisinau',
+ 'Europe/Copenhagen',
+ 'Europe/Dublin',
+ 'Europe/Gibraltar',
+ 'Europe/Guernsey',
+ 'Europe/Helsinki',
+ 'Europe/Isle_of_Man',
+ 'Europe/Istanbul',
+ 'Europe/Jersey',
+ 'Europe/Kaliningrad',
+ 'Europe/Kiev',
+ 'Europe/Lisbon',
+ 'Europe/Ljubljana',
+ 'Europe/London',
+ 'Europe/Luxembourg',
+ 'Europe/Madrid',
+ 'Europe/Malta',
+ 'Europe/Mariehamn',
+ 'Europe/Minsk',
+ 'Europe/Monaco',
+ 'Europe/Moscow',
+ 'Europe/Oslo',
+ 'Europe/Paris',
+ 'Europe/Podgorica',
+ 'Europe/Prague',
+ 'Europe/Riga',
+ 'Europe/Rome',
+ 'Europe/Samara',
+ 'Europe/San_Marino',
+ 'Europe/Sarajevo',
+ 'Europe/Simferopol',
+ 'Europe/Skopje',
+ 'Europe/Sofia',
+ 'Europe/Stockholm',
+ 'Europe/Tallinn',
+ 'Europe/Tirane',
+ 'Europe/Uzhgorod',
+ 'Europe/Vaduz',
+ 'Europe/Vatican',
+ 'Europe/Vienna',
+ 'Europe/Vilnius',
+ 'Europe/Volgograd',
+ 'Europe/Warsaw',
+ 'Europe/Zagreb',
+ 'Europe/Zaporozhye',
+ 'Europe/Zurich',
+ 'GMT',
+ 'Indian/Antananarivo',
+ 'Indian/Chagos',
+ 'Indian/Christmas',
+ 'Indian/Cocos',
+ 'Indian/Comoro',
+ 'Indian/Kerguelen',
+ 'Indian/Mahe',
+ 'Indian/Maldives',
+ 'Indian/Mauritius',
+ 'Indian/Mayotte',
+ 'Indian/Reunion',
+ 'Pacific/Apia',
+ 'Pacific/Auckland',
+ 'Pacific/Bougainville',
+ 'Pacific/Chatham',
+ 'Pacific/Chuuk',
+ 'Pacific/Easter',
+ 'Pacific/Efate',
+ 'Pacific/Enderbury',
+ 'Pacific/Fakaofo',
+ 'Pacific/Fiji',
+ 'Pacific/Funafuti',
+ 'Pacific/Galapagos',
+ 'Pacific/Gambier',
+ 'Pacific/Guadalcanal',
+ 'Pacific/Guam',
+ 'Pacific/Honolulu',
+ 'Pacific/Johnston',
+ 'Pacific/Kiritimati',
+ 'Pacific/Kosrae',
+ 'Pacific/Kwajalein',
+ 'Pacific/Majuro',
+ 'Pacific/Marquesas',
+ 'Pacific/Midway',
+ 'Pacific/Nauru',
+ 'Pacific/Niue',
+ 'Pacific/Norfolk',
+ 'Pacific/Noumea',
+ 'Pacific/Pago_Pago',
+ 'Pacific/Palau',
+ 'Pacific/Pitcairn',
+ 'Pacific/Pohnpei',
+ 'Pacific/Port_Moresby',
+ 'Pacific/Rarotonga',
+ 'Pacific/Saipan',
+ 'Pacific/Tahiti',
+ 'Pacific/Tarawa',
+ 'Pacific/Tongatapu',
+ 'Pacific/Wake',
+ 'Pacific/Wallis',
+ 'US/Alaska',
+ 'US/Arizona',
+ 'US/Central',
+ 'US/Eastern',
+ 'US/Hawaii',
+ 'US/Mountain',
+ 'US/Pacific',
+ 'UTC']
+common_timezones = LazyList(
+            tz for tz in common_timezones if tz in all_timezones)
+        
+common_timezones_set = LazySet(common_timezones)
diff --git a/lib/pytz-old/__init__.pyc b/lib/pytz-old/__init__.pyc
new file mode 100755
index 0000000..041c1b8
Binary files /dev/null and b/lib/pytz-old/__init__.pyc differ
diff --git a/lib/pytz-old/exceptions.py b/lib/pytz-old/exceptions.py
new file mode 100644
index 0000000..0376108
--- /dev/null
+++ b/lib/pytz-old/exceptions.py
@@ -0,0 +1,48 @@
+'''
+Custom exceptions raised by pytz.
+'''
+
+__all__ = [
+    'UnknownTimeZoneError', 'InvalidTimeError', 'AmbiguousTimeError',
+    'NonExistentTimeError',
+    ]
+
+
+class UnknownTimeZoneError(KeyError):
+    '''Exception raised when pytz is passed an unknown timezone.
+
+    >>> isinstance(UnknownTimeZoneError(), LookupError)
+    True
+
+    This class is actually a subclass of KeyError to provide backwards
+    compatibility with code relying on the undocumented behavior of earlier
+    pytz releases.
+
+    >>> isinstance(UnknownTimeZoneError(), KeyError)
+    True
+    '''
+    pass
+
+
+class InvalidTimeError(Exception):
+    '''Base class for invalid time exceptions.'''
+
+
+class AmbiguousTimeError(InvalidTimeError):
+    '''Exception raised when attempting to create an ambiguous wallclock time.
+
+    At the end of a DST transition period, a particular wallclock time will
+    occur twice (once before the clocks are set back, once after). Both
+    possibilities may be correct, unless further information is supplied.
+
+    See DstTzInfo.normalize() for more info
+    '''
+
+
+class NonExistentTimeError(InvalidTimeError):
+    '''Exception raised when attempting to create a wallclock time that
+    cannot exist.
+
+    At the start of a DST transition period, the wallclock time jumps forward.
+    The instants jumped over never occur.
+    '''
diff --git a/lib/pytz-old/lazy.py b/lib/pytz-old/lazy.py
new file mode 100644
index 0000000..f7fc597
--- /dev/null
+++ b/lib/pytz-old/lazy.py
@@ -0,0 +1,168 @@
+from threading import RLock
+try:
+    from UserDict import DictMixin
+except ImportError:
+    from collections import Mapping as DictMixin
+
+
+# With lazy loading, we might end up with multiple threads triggering
+# it at the same time. We need a lock.
+_fill_lock = RLock()
+
+
+class LazyDict(DictMixin):
+    """Dictionary populated on first use."""
+    data = None
+    def __getitem__(self, key):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return self.data[key.upper()]
+
+    def __contains__(self, key):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return key in self.data
+
+    def __iter__(self):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return iter(self.data)
+
+    def __len__(self):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return len(self.data)
+
+    def keys(self):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return self.data.keys()
+
+
+class LazyList(list):
+    """List populated on first use."""
+
+    _props = [
+        '__str__', '__repr__', '__unicode__',
+        '__hash__', '__sizeof__', '__cmp__',
+        '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__',
+        'append', 'count', 'index', 'extend', 'insert', 'pop', 'remove',
+        'reverse', 'sort', '__add__', '__radd__', '__iadd__', '__mul__',
+        '__rmul__', '__imul__', '__contains__', '__len__', '__nonzero__',
+        '__getitem__', '__setitem__', '__delitem__', '__iter__',
+        '__reversed__', '__getslice__', '__setslice__', '__delslice__']
+
+    def __new__(cls, fill_iter=None):
+
+        if fill_iter is None:
+            return list()
+
+        # We need a new class as we will be dynamically messing with its
+        # methods.
+        class LazyList(list):
+            pass
+
+        fill_iter = [fill_iter]
+
+        def lazy(name):
+            def _lazy(self, *args, **kw):
+                _fill_lock.acquire()
+                try:
+                    if len(fill_iter) > 0:
+                        list.extend(self, fill_iter.pop())
+                        for method_name in cls._props:
+                            delattr(LazyList, method_name)
+                finally:
+                    _fill_lock.release()
+                return getattr(list, name)(self, *args, **kw)
+            return _lazy
+
+        for name in cls._props:
+            setattr(LazyList, name, lazy(name))
+
+        new_list = LazyList()
+        return new_list
+
+# Not all versions of Python declare the same magic methods.
+# Filter out properties that don't exist in this version of Python
+# from the list.
+LazyList._props = [prop for prop in LazyList._props if hasattr(list, prop)]
+
+
+class LazySet(set):
+    """Set populated on first use."""
+
+    _props = (
+        '__str__', '__repr__', '__unicode__',
+        '__hash__', '__sizeof__', '__cmp__',
+        '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__',
+        '__contains__', '__len__', '__nonzero__',
+        '__getitem__', '__setitem__', '__delitem__', '__iter__',
+        '__sub__', '__and__', '__xor__', '__or__',
+        '__rsub__', '__rand__', '__rxor__', '__ror__',
+        '__isub__', '__iand__', '__ixor__', '__ior__',
+        'add', 'clear', 'copy', 'difference', 'difference_update',
+        'discard', 'intersection', 'intersection_update', 'isdisjoint',
+        'issubset', 'issuperset', 'pop', 'remove',
+        'symmetric_difference', 'symmetric_difference_update',
+        'union', 'update')
+
+    def __new__(cls, fill_iter=None):
+
+        if fill_iter is None:
+            return set()
+
+        class LazySet(set):
+            pass
+
+        fill_iter = [fill_iter]
+
+        def lazy(name):
+            def _lazy(self, *args, **kw):
+                _fill_lock.acquire()
+                try:
+                    if len(fill_iter) > 0:
+                        for i in fill_iter.pop():
+                            set.add(self, i)
+                        for method_name in cls._props:
+                            delattr(LazySet, method_name)
+                finally:
+                    _fill_lock.release()
+                return getattr(set, name)(self, *args, **kw)
+            return _lazy
+
+        for name in cls._props:
+            setattr(LazySet, name, lazy(name))
+
+        new_set = LazySet()
+        return new_set
+
+# Not all versions of Python declare the same magic methods.
+# Filter out properties that don't exist in this version of Python
+# from the list.
+LazySet._props = [prop for prop in LazySet._props if hasattr(set, prop)]
diff --git a/lib/pytz/locales/pytz.pot b/lib/pytz-old/locales/pytz.pot
similarity index 100%
rename from lib/pytz/locales/pytz.pot
rename to lib/pytz-old/locales/pytz.pot
diff --git a/lib/pytz/reference.py b/lib/pytz-old/reference.py
old mode 100755
new mode 100644
similarity index 100%
copy from lib/pytz/reference.py
copy to lib/pytz-old/reference.py
diff --git a/lib/pytz/tests/__init__.py b/lib/pytz-old/tests/__init__.py
similarity index 100%
rename from lib/pytz/tests/__init__.py
rename to lib/pytz-old/tests/__init__.py
diff --git a/lib/pytz-old/tests/test_docs.py b/lib/pytz-old/tests/test_docs.py
new file mode 100755
index 0000000..fb49ec1
--- /dev/null
+++ b/lib/pytz-old/tests/test_docs.py
@@ -0,0 +1,34 @@
+# -*- coding: ascii -*-
+
+from doctest import DocFileSuite
+import unittest, os.path, sys
+
+THIS_DIR = os.path.dirname(__file__)
+
+README = os.path.join(THIS_DIR, os.pardir, os.pardir, 'README.txt')
+
+
+class DocumentationTestCase(unittest.TestCase):
+    def test_readme_encoding(self):
+        '''Confirm the README.txt is pure ASCII.'''
+        f = open(README, 'rb')
+        try:
+            f.read().decode('US-ASCII')
+        finally:
+            f.close()
+
+
+def test_suite():
+    "For the Z3 test runner"
+    return unittest.TestSuite((
+        DocumentationTestCase('test_readme_encoding'),
+        DocFileSuite(os.path.join(os.pardir, os.pardir, 'README.txt'))))
+
+
+if __name__ == '__main__':
+    sys.path.insert(0, os.path.abspath(os.path.join(
+        THIS_DIR, os.pardir, os.pardir
+        )))
+    unittest.main(defaultTest='test_suite')
+
+
diff --git a/lib/pytz-old/tests/test_lazy.py b/lib/pytz-old/tests/test_lazy.py
new file mode 100644
index 0000000..3a4afa6
--- /dev/null
+++ b/lib/pytz-old/tests/test_lazy.py
@@ -0,0 +1,313 @@
+from operator import *
+import os.path
+import sys
+import unittest
+import warnings
+
+
+if __name__ == '__main__':
+    # Only munge path if invoked as a script. Testrunners should have setup
+    # the paths already
+    sys.path.insert(0, os.path.abspath(os.path.join(os.pardir, os.pardir)))
+
+
+from pytz.lazy import LazyList, LazySet
+
+
+class LazyListTestCase(unittest.TestCase):
+    initial_data = [3,2,1]
+
+    def setUp(self):
+        self.base = [3, 2, 1]
+        self.lesser = [2, 1, 0]
+        self.greater = [4, 3, 2]
+
+        self.lazy = LazyList(iter(list(self.base)))
+
+    def test_unary_ops(self):
+        unary_ops = [str, repr, len, bool, not_]
+        try:
+            unary_ops.append(unicode)
+        except NameError:
+            pass  # unicode no longer exists in Python 3.
+
+        for op in unary_ops:
+            self.assertEqual(
+                op(self.lazy),
+                op(self.base), str(op))
+
+    def test_binary_ops(self):
+        binary_ops = [eq, ge, gt, le, lt, ne, add, concat]
+        try:
+            binary_ops.append(cmp)
+        except NameError:
+            pass  # cmp no longer exists in Python 3.
+
+        for op in binary_ops:
+            self.assertEqual(
+                op(self.lazy, self.lazy),
+                op(self.base, self.base), str(op))
+            for other in [self.base, self.lesser, self.greater]:
+                self.assertEqual(
+                    op(self.lazy, other),
+                    op(self.base, other), '%s %s' % (op, other))
+                self.assertEqual(
+                    op(other, self.lazy),
+                    op(other, self.base), '%s %s' % (op, other))
+
+        # Multiplication
+        self.assertEqual(self.lazy * 3, self.base * 3)
+        self.assertEqual(3 * self.lazy, 3 * self.base)
+
+        # Contains
+        self.assertTrue(2 in self.lazy)
+        self.assertFalse(42 in self.lazy)
+
+    def test_iadd(self):
+        self.lazy += [1]
+        self.base += [1]
+        self.assertEqual(self.lazy, self.base)
+
+    def test_bool(self):
+        self.assertTrue(bool(self.lazy))
+        self.assertFalse(bool(LazyList()))
+        self.assertFalse(bool(LazyList(iter([]))))
+
+    def test_hash(self):
+        self.assertRaises(TypeError, hash, self.lazy)
+
+    def test_isinstance(self):
+        self.assertTrue(isinstance(self.lazy, list))
+        self.assertFalse(isinstance(self.lazy, tuple))
+
+    def test_callable(self):
+        try:
+            callable
+        except NameError:
+            return  # No longer exists with Python 3.
+        self.assertFalse(callable(self.lazy))
+
+    def test_append(self):
+        self.base.append('extra')
+        self.lazy.append('extra')
+        self.assertEqual(self.lazy, self.base)
+
+    def test_count(self):
+        self.assertEqual(self.lazy.count(2), 1)
+
+    def test_index(self):
+        self.assertEqual(self.lazy.index(2), 1)
+
+    def test_extend(self):
+        self.base.extend([6, 7])
+        self.lazy.extend([6, 7])
+        self.assertEqual(self.lazy, self.base)
+
+    def test_insert(self):
+        self.base.insert(0, 'ping')
+        self.lazy.insert(0, 'ping')
+        self.assertEqual(self.lazy, self.base)
+
+    def test_pop(self):
+        self.assertEqual(self.lazy.pop(), self.base.pop())
+        self.assertEqual(self.lazy, self.base)
+
+    def test_remove(self):
+        self.base.remove(2)
+        self.lazy.remove(2)
+        self.assertEqual(self.lazy, self.base)
+
+    def test_reverse(self):
+        self.base.reverse()
+        self.lazy.reverse()
+        self.assertEqual(self.lazy, self.base)
+
+    def test_reversed(self):
+        self.assertEqual(list(reversed(self.lazy)), list(reversed(self.base)))
+
+    def test_sort(self):
+        self.base.sort()
+        self.assertNotEqual(self.lazy, self.base, 'Test data already sorted')
+        self.lazy.sort()
+        self.assertEqual(self.lazy, self.base)
+
+    def test_sorted(self):
+        self.assertEqual(sorted(self.lazy), sorted(self.base))
+
+    def test_getitem(self):
+        for idx in range(-len(self.base), len(self.base)):
+            self.assertEqual(self.lazy[idx], self.base[idx])
+
+    def test_setitem(self):
+        for idx in range(-len(self.base), len(self.base)):
+            self.base[idx] = idx + 1000
+            self.assertNotEqual(self.lazy, self.base)
+            self.lazy[idx] = idx + 1000
+            self.assertEqual(self.lazy, self.base)
+
+    def test_delitem(self):
+        del self.base[0]
+        self.assertNotEqual(self.lazy, self.base)
+        del self.lazy[0]
+        self.assertEqual(self.lazy, self.base)
+
+        del self.base[-2]
+        self.assertNotEqual(self.lazy, self.base)
+        del self.lazy[-2]
+        self.assertEqual(self.lazy, self.base)
+
+    def test_iter(self):
+        self.assertEqual(list(iter(self.lazy)), list(iter(self.base)))
+
+    def test_getslice(self):
+        for i in range(-len(self.base), len(self.base)):
+            for j in range(-len(self.base), len(self.base)):
+                for step in [-1, 1]:
+                    self.assertEqual(self.lazy[i:j:step], self.base[i:j:step])
+
+    def test_setslice(self):
+        for i in range(-len(self.base), len(self.base)):
+            for j in range(-len(self.base), len(self.base)):
+                for step in [-1, 1]:
+                    replacement = range(0, len(self.base[i:j:step]))
+                    self.base[i:j:step] = replacement
+                    self.lazy[i:j:step] = replacement
+                    self.assertEqual(self.lazy, self.base)
+
+    def test_delslice(self):
+        del self.base[0:1]
+        del self.lazy[0:1]
+        self.assertEqual(self.lazy, self.base)
+
+        del self.base[-1:1:-1]
+        del self.lazy[-1:1:-1]
+        self.assertEqual(self.lazy, self.base)
+
+
+class LazySetTestCase(unittest.TestCase):
+    initial_data = set([3,2,1])
+
+    def setUp(self):
+        self.base = set([3, 2, 1])
+        self.lazy = LazySet(iter(set(self.base)))
+
+    def test_unary_ops(self):
+        # These ops just need to work.
+        unary_ops = [str, repr]
+        try:
+            unary_ops.append(unicode)
+        except NameError:
+            pass  # unicode no longer exists in Python 3.
+
+        for op in unary_ops:
+            op(self.lazy)  # These ops just need to work.
+
+        # These ops should return identical values as a real set.
+        unary_ops = [len, bool, not_]
+
+        for op in unary_ops:
+            self.assertEqual(
+                op(self.lazy),
+                op(self.base), '%s(lazy) == %r' % (op, op(self.lazy)))
+
+    def test_binary_ops(self):
+        binary_ops = [eq, ge, gt, le, lt, ne, sub, and_, or_, xor]
+        try:
+            binary_ops.append(cmp)
+        except NameError:
+            pass  # cmp no longer exists in Python 3.
+
+        for op in binary_ops:
+            self.assertEqual(
+                op(self.lazy, self.lazy),
+                op(self.base, self.base), str(op))
+            self.assertEqual(
+                op(self.lazy, self.base),
+                op(self.base, self.base), str(op))
+            self.assertEqual(
+                op(self.base, self.lazy),
+                op(self.base, self.base), str(op))
+
+        # Contains
+        self.assertTrue(2 in self.lazy)
+        self.assertFalse(42 in self.lazy)
+
+    def test_iops(self):
+        try:
+            iops = [isub, iand, ior, ixor]
+        except NameError:
+            return  # Don't exist in older Python versions.
+        for op in iops:
+            # Mutating operators, so make fresh copies.
+            lazy = LazySet(self.base)
+            base = self.base.copy()
+            op(lazy, set([1]))
+            op(base, set([1]))
+            self.assertEqual(lazy, base, str(op))
+
+    def test_bool(self):
+        self.assertTrue(bool(self.lazy))
+        self.assertFalse(bool(LazySet()))
+        self.assertFalse(bool(LazySet(iter([]))))
+
+    def test_hash(self):
+        self.assertRaises(TypeError, hash, self.lazy)
+
+    def test_isinstance(self):
+        self.assertTrue(isinstance(self.lazy, set))
+
+    def test_callable(self):
+        try:
+            callable
+        except NameError:
+            return  # No longer exists with Python 3.
+        self.assertFalse(callable(self.lazy))
+
+    def test_add(self):
+        self.base.add('extra')
+        self.lazy.add('extra')
+        self.assertEqual(self.lazy, self.base)
+
+    def test_copy(self):
+        self.assertEqual(self.lazy.copy(), self.base)
+
+    def test_method_ops(self):
+        ops = [
+            'difference', 'intersection', 'isdisjoint',
+            'issubset', 'issuperset', 'symmetric_difference', 'union',
+            'difference_update', 'intersection_update',
+            'symmetric_difference_update', 'update']
+        for op in ops:
+            if not hasattr(set, op):
+                continue  # Not in this version of Python.
+            # Make a copy, as some of the ops are mutating.
+            lazy = LazySet(set(self.base))
+            base = set(self.base)
+            self.assertEqual(
+                getattr(self.lazy, op)(set([1])),
+                getattr(self.base, op)(set([1])), op)
+            self.assertEqual(self.lazy, self.base, op)
+
+    def test_discard(self):
+        self.base.discard(1)
+        self.assertNotEqual(self.lazy, self.base)
+        self.lazy.discard(1)
+        self.assertEqual(self.lazy, self.base)
+
+    def test_pop(self):
+        self.assertEqual(self.lazy.pop(), self.base.pop())
+        self.assertEqual(self.lazy, self.base)
+
+    def test_remove(self):
+        self.base.remove(2)
+        self.lazy.remove(2)
+        self.assertEqual(self.lazy, self.base)
+
+    def test_clear(self):
+        self.lazy.clear()
+        self.assertEqual(self.lazy, set())
+
+
+if __name__ == '__main__':
+    warnings.simplefilter("error") # Warnings should be fatal in tests.
+    unittest.main()
diff --git a/lib/pytz-old/tests/test_tzinfo.py b/lib/pytz-old/tests/test_tzinfo.py
new file mode 100755
index 0000000..922bcb1
--- /dev/null
+++ b/lib/pytz-old/tests/test_tzinfo.py
@@ -0,0 +1,837 @@
+# -*- coding: ascii -*-
+
+import sys, os, os.path
+import unittest, doctest
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+from datetime import datetime, time, timedelta, tzinfo
+import warnings
+
+if __name__ == '__main__':
+    # Only munge path if invoked as a script. Testrunners should have setup
+    # the paths already
+    sys.path.insert(0, os.path.abspath(os.path.join(os.pardir, os.pardir)))
+
+import pytz
+from pytz import reference
+from pytz.tzfile import _byte_string
+from pytz.tzinfo import DstTzInfo, StaticTzInfo
+
+# I test for expected version to ensure the correct version of pytz is
+# actually being tested.
+EXPECTED_VERSION='2014.10'
+EXPECTED_OLSON_VERSION='2014j'
+
+fmt = '%Y-%m-%d %H:%M:%S %Z%z'
+
+NOTIME = timedelta(0)
+
+# GMT is a tzinfo.StaticTzInfo--the class we primarily want to test--while
+# UTC is reference implementation.  They both have the same timezone meaning.
+UTC = pytz.timezone('UTC')
+GMT = pytz.timezone('GMT')
+assert isinstance(GMT, StaticTzInfo), 'GMT is no longer a StaticTzInfo'
+
+def prettydt(dt):
+    """datetime as a string using a known format.
+
+    We don't use strftime as it doesn't handle years earlier than 1900
+    per http://bugs.python.org/issue1777412
+    """
+    if dt.utcoffset() >= timedelta(0):
+        offset = '+%s' % (dt.utcoffset(),)
+    else:
+        offset = '-%s' % (-1 * dt.utcoffset(),)
+    return '%04d-%02d-%02d %02d:%02d:%02d %s %s' % (
+        dt.year, dt.month, dt.day,
+        dt.hour, dt.minute, dt.second,
+        dt.tzname(), offset)
+
+
+try:
+    unicode
+except NameError:
+    # Python 3.x doesn't have unicode(), making writing code
+    # for Python 2.3 and Python 3.x a pain.
+    unicode = str
+
+
+class BasicTest(unittest.TestCase):
+
+    def testVersion(self):
+        # Ensuring the correct version of pytz has been loaded
+        self.assertEqual(EXPECTED_VERSION, pytz.__version__,
+                'Incorrect pytz version loaded. Import path is stuffed '
+                'or this test needs updating. (Wanted %s, got %s)'
+                % (EXPECTED_VERSION, pytz.__version__))
+
+        self.assertEqual(EXPECTED_OLSON_VERSION, pytz.OLSON_VERSION,
+                'Incorrect pytz version loaded. Import path is stuffed '
+                'or this test needs updating. (Wanted %s, got %s)'
+                % (EXPECTED_OLSON_VERSION, pytz.OLSON_VERSION))
+
+    def testGMT(self):
+        now = datetime.now(tz=GMT)
+        self.assertTrue(now.utcoffset() == NOTIME)
+        self.assertTrue(now.dst() == NOTIME)
+        self.assertTrue(now.timetuple() == now.utctimetuple())
+        self.assertTrue(now==now.replace(tzinfo=UTC))
+
+    def testReferenceUTC(self):
+        now = datetime.now(tz=UTC)
+        self.assertTrue(now.utcoffset() == NOTIME)
+        self.assertTrue(now.dst() == NOTIME)
+        self.assertTrue(now.timetuple() == now.utctimetuple())
+
+    def testUnknownOffsets(self):
+        # This tzinfo behavior is required to make
+        # datetime.time.{utcoffset, dst, tzname} work as documented.
+
+        dst_tz = pytz.timezone('US/Eastern')
+
+        # This information is not known when we don't have a date,
+        # so return None per API.
+        self.assertTrue(dst_tz.utcoffset(None) is None)
+        self.assertTrue(dst_tz.dst(None) is None)
+        # We don't know the abbreviation, but this is still a valid
+        # tzname per the Python documentation.
+        self.assertEqual(dst_tz.tzname(None), 'US/Eastern')
+
+    def clearCache(self):
+        pytz._tzinfo_cache.clear()
+
+    def testUnicodeTimezone(self):
+        # We need to ensure that cold lookups work for both Unicode
+        # and traditional strings, and that the desired singleton is
+        # returned.
+        self.clearCache()
+        eastern = pytz.timezone(unicode('US/Eastern'))
+        self.assertTrue(eastern is pytz.timezone('US/Eastern'))
+
+        self.clearCache()
+        eastern = pytz.timezone('US/Eastern')
+        self.assertTrue(eastern is pytz.timezone(unicode('US/Eastern')))
+
+
+class PicklingTest(unittest.TestCase):
+
+    def _roundtrip_tzinfo(self, tz):
+        p = pickle.dumps(tz)
+        unpickled_tz = pickle.loads(p)
+        self.assertTrue(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
+
+    def _roundtrip_datetime(self, dt):
+        # Ensure that the tzinfo attached to a datetime instance
+        # is identical to the one returned. This is important for
+        # DST timezones, as some state is stored in the tzinfo.
+        tz = dt.tzinfo
+        p = pickle.dumps(dt)
+        unpickled_dt = pickle.loads(p)
+        unpickled_tz = unpickled_dt.tzinfo
+        self.assertTrue(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
+
+    def testDst(self):
+        tz = pytz.timezone('Europe/Amsterdam')
+        dt = datetime(2004, 2, 1, 0, 0, 0)
+
+        for localized_tz in tz._tzinfos.values():
+            self._roundtrip_tzinfo(localized_tz)
+            self._roundtrip_datetime(dt.replace(tzinfo=localized_tz))
+
+    def testRoundtrip(self):
+        dt = datetime(2004, 2, 1, 0, 0, 0)
+        for zone in pytz.all_timezones:
+            tz = pytz.timezone(zone)
+            self._roundtrip_tzinfo(tz)
+
+    def testDatabaseFixes(self):
+        # Hack the pickle to make it refer to a timezone abbreviation
+        # that does not match anything. The unpickler should be able
+        # to repair this case
+        tz = pytz.timezone('Australia/Melbourne')
+        p = pickle.dumps(tz)
+        tzname = tz._tzname
+        hacked_p = p.replace(_byte_string(tzname),
+                             _byte_string('?'*len(tzname)))
+        self.assertNotEqual(p, hacked_p)
+        unpickled_tz = pickle.loads(hacked_p)
+        self.assertTrue(tz is unpickled_tz)
+
+        # Simulate a database correction. In this case, the incorrect
+        # data will continue to be used.
+        p = pickle.dumps(tz)
+        new_utcoffset = tz._utcoffset.seconds + 42
+
+        # Python 3 introduced a new pickle protocol where numbers are stored in
+        # hexadecimal representation. Here we extract the pickle
+        # representation of the number for the current Python version.
+        old_pickle_pattern = pickle.dumps(tz._utcoffset.seconds)[3:-1]
+        new_pickle_pattern = pickle.dumps(new_utcoffset)[3:-1]
+        hacked_p = p.replace(old_pickle_pattern, new_pickle_pattern)
+
+        self.assertNotEqual(p, hacked_p)
+        unpickled_tz = pickle.loads(hacked_p)
+        self.assertEqual(unpickled_tz._utcoffset.seconds, new_utcoffset)
+        self.assertTrue(tz is not unpickled_tz)
+
+    def testOldPickles(self):
+        # Ensure that applications serializing pytz instances as pickles
+        # have no troubles upgrading to a new pytz release. These pickles
+        # where created with pytz2006j
+        east1 = pickle.loads(_byte_string(
+            "cpytz\n_p\np1\n(S'US/Eastern'\np2\nI-18000\n"
+            "I0\nS'EST'\np3\ntRp4\n."
+            ))
+        east2 = pytz.timezone('US/Eastern').localize(
+            datetime(2006, 1, 1)).tzinfo
+        self.assertTrue(east1 is east2)
+
+        # Confirm changes in name munging between 2006j and 2007c cause
+        # no problems.
+        pap1 = pickle.loads(_byte_string(
+            "cpytz\n_p\np1\n(S'America/Port_minus_au_minus_Prince'"
+            "\np2\nI-17340\nI0\nS'PPMT'\np3\ntRp4\n."))
+        pap2 = pytz.timezone('America/Port-au-Prince').localize(
+            datetime(1910, 1, 1)).tzinfo
+        self.assertTrue(pap1 is pap2)
+
+        gmt1 = pickle.loads(_byte_string(
+            "cpytz\n_p\np1\n(S'Etc/GMT_plus_10'\np2\ntRp3\n."))
+        gmt2 = pytz.timezone('Etc/GMT+10')
+        self.assertTrue(gmt1 is gmt2)
+
+
+class USEasternDSTStartTestCase(unittest.TestCase):
+    tzinfo = pytz.timezone('US/Eastern')
+
+    # 24 hours before DST changeover
+    transition_time = datetime(2002, 4, 7, 7, 0, 0, tzinfo=UTC)
+
+    # Increase for 'flexible' DST transitions due to 1 minute granularity
+    # of Python's datetime library
+    instant = timedelta(seconds=1)
+
+    # before transition
+    before = {
+        'tzname': 'EST',
+        'utcoffset': timedelta(hours = -5),
+        'dst': timedelta(hours = 0),
+        }
+
+    # after transition
+    after = {
+        'tzname': 'EDT',
+        'utcoffset': timedelta(hours = -4),
+        'dst': timedelta(hours = 1),
+        }
+
+    def _test_tzname(self, utc_dt, wanted):
+        tzname = wanted['tzname']
+        dt = utc_dt.astimezone(self.tzinfo)
+        self.assertEqual(dt.tzname(), tzname,
+            'Expected %s as tzname for %s. Got %s' % (
+                tzname, str(utc_dt), dt.tzname()
+                )
+            )
+
+    def _test_utcoffset(self, utc_dt, wanted):
+        utcoffset = wanted['utcoffset']
+        dt = utc_dt.astimezone(self.tzinfo)
+        self.assertEqual(
+                dt.utcoffset(), wanted['utcoffset'],
+                'Expected %s as utcoffset for %s. Got %s' % (
+                    utcoffset, utc_dt, dt.utcoffset()
+                    )
+                )
+
+    def _test_dst(self, utc_dt, wanted):
+        dst = wanted['dst']
+        dt = utc_dt.astimezone(self.tzinfo)
+        self.assertEqual(dt.dst(),dst,
+            'Expected %s as dst for %s. Got %s' % (
+                dst, utc_dt, dt.dst()
+                )
+            )
+
+    def test_arithmetic(self):
+        utc_dt = self.transition_time
+
+        for days in range(-420, 720, 20):
+            delta = timedelta(days=days)
+
+            # Make sure we can get back where we started
+            dt = utc_dt.astimezone(self.tzinfo)
+            dt2 = dt + delta
+            dt2 = dt2 - delta
+            self.assertEqual(dt, dt2)
+
+            # Make sure arithmetic crossing DST boundaries ends
+            # up in the correct timezone after normalization
+            utc_plus_delta = (utc_dt + delta).astimezone(self.tzinfo)
+            local_plus_delta = self.tzinfo.normalize(dt + delta)
+            self.assertEqual(
+                    prettydt(utc_plus_delta),
+                    prettydt(local_plus_delta),
+                    'Incorrect result for delta==%d days.  Wanted %r. Got %r'%(
+                        days,
+                        prettydt(utc_plus_delta),
+                        prettydt(local_plus_delta),
+                        )
+                    )
+
+    def _test_all(self, utc_dt, wanted):
+        self._test_utcoffset(utc_dt, wanted)
+        self._test_tzname(utc_dt, wanted)
+        self._test_dst(utc_dt, wanted)
+
+    def testDayBefore(self):
+        self._test_all(
+                self.transition_time - timedelta(days=1), self.before
+                )
+
+    def testTwoHoursBefore(self):
+        self._test_all(
+                self.transition_time - timedelta(hours=2), self.before
+                )
+
+    def testHourBefore(self):
+        self._test_all(
+                self.transition_time - timedelta(hours=1), self.before
+                )
+
+    def testInstantBefore(self):
+        self._test_all(
+                self.transition_time - self.instant, self.before
+                )
+
+    def testTransition(self):
+        self._test_all(
+                self.transition_time, self.after
+                )
+
+    def testInstantAfter(self):
+        self._test_all(
+                self.transition_time + self.instant, self.after
+                )
+
+    def testHourAfter(self):
+        self._test_all(
+                self.transition_time + timedelta(hours=1), self.after
+                )
+
+    def testTwoHoursAfter(self):
+        self._test_all(
+                self.transition_time + timedelta(hours=1), self.after
+                )
+
+    def testDayAfter(self):
+        self._test_all(
+                self.transition_time + timedelta(days=1), self.after
+                )
+
+
+class USEasternDSTEndTestCase(USEasternDSTStartTestCase):
+    tzinfo = pytz.timezone('US/Eastern')
+    transition_time = datetime(2002, 10, 27, 6, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'EDT',
+        'utcoffset': timedelta(hours = -4),
+        'dst': timedelta(hours = 1),
+        }
+    after = {
+        'tzname': 'EST',
+        'utcoffset': timedelta(hours = -5),
+        'dst': timedelta(hours = 0),
+        }
+
+
+class USEasternEPTStartTestCase(USEasternDSTStartTestCase):
+    transition_time = datetime(1945, 8, 14, 23, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'EWT',
+        'utcoffset': timedelta(hours = -4),
+        'dst': timedelta(hours = 1),
+        }
+    after = {
+        'tzname': 'EPT',
+        'utcoffset': timedelta(hours = -4),
+        'dst': timedelta(hours = 1),
+        }
+
+
+class USEasternEPTEndTestCase(USEasternDSTStartTestCase):
+    transition_time = datetime(1945, 9, 30, 6, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'EPT',
+        'utcoffset': timedelta(hours = -4),
+        'dst': timedelta(hours = 1),
+        }
+    after = {
+        'tzname': 'EST',
+        'utcoffset': timedelta(hours = -5),
+        'dst': timedelta(hours = 0),
+        }
+
+
+class WarsawWMTEndTestCase(USEasternDSTStartTestCase):
+    # In 1915, Warsaw changed from Warsaw to Central European time.
+    # This involved the clocks being set backwards, causing a end-of-DST
+    # like situation without DST being involved.
+    tzinfo = pytz.timezone('Europe/Warsaw')
+    transition_time = datetime(1915, 8, 4, 22, 36, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'WMT',
+        'utcoffset': timedelta(hours=1, minutes=24),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'CET',
+        'utcoffset': timedelta(hours=1),
+        'dst': timedelta(0),
+        }
+
+
+class VilniusWMTEndTestCase(USEasternDSTStartTestCase):
+    # At the end of 1916, Vilnius changed timezones putting its clock
+    # forward by 11 minutes 35 seconds. Neither timezone was in DST mode.
+    tzinfo = pytz.timezone('Europe/Vilnius')
+    instant = timedelta(seconds=31)
+    transition_time = datetime(1916, 12, 31, 22, 36, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'WMT',
+        'utcoffset': timedelta(hours=1, minutes=24),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'KMT',
+        'utcoffset': timedelta(hours=1, minutes=36), # Really 1:35:36
+        'dst': timedelta(0),
+        }
+
+
+class VilniusCESTStartTestCase(USEasternDSTStartTestCase):
+    # In 1941, Vilnius changed from MSG to CEST, switching to summer
+    # time while simultaneously reducing its UTC offset by two hours,
+    # causing the clocks to go backwards for this summer time
+    # switchover.
+    tzinfo = pytz.timezone('Europe/Vilnius')
+    transition_time = datetime(1941, 6, 23, 21, 00, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'MSK',
+        'utcoffset': timedelta(hours=3),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'CEST',
+        'utcoffset': timedelta(hours=2),
+        'dst': timedelta(hours=1),
+        }
+
+
+class LondonHistoryStartTestCase(USEasternDSTStartTestCase):
+    # The first known timezone transition in London was in 1847 when
+    # clocks where synchronized to GMT. However, we currently only
+    # understand v1 format tzfile(5) files which does handle years
+    # this far in the past, so our earliest known transition is in
+    # 1916.
+    tzinfo = pytz.timezone('Europe/London')
+    # transition_time = datetime(1847, 12, 1, 1, 15, 00, tzinfo=UTC)
+    # before = {
+    #     'tzname': 'LMT',
+    #     'utcoffset': timedelta(minutes=-75),
+    #     'dst': timedelta(0),
+    #     }
+    # after = {
+    #     'tzname': 'GMT',
+    #     'utcoffset': timedelta(0),
+    #     'dst': timedelta(0),
+    #     }
+    transition_time = datetime(1916, 5, 21, 2, 00, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'GMT',
+        'utcoffset': timedelta(0),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'BST',
+        'utcoffset': timedelta(hours=1),
+        'dst': timedelta(hours=1),
+        }
+
+
+class LondonHistoryEndTestCase(USEasternDSTStartTestCase):
+    # Timezone switchovers are projected into the future, even
+    # though no official statements exist or could be believed even
+    # if they did exist. We currently only check the last known
+    # transition in 2037, as we are still using v1 format tzfile(5)
+    # files.
+    tzinfo = pytz.timezone('Europe/London')
+    # transition_time = datetime(2499, 10, 25, 1, 0, 0, tzinfo=UTC)
+    transition_time = datetime(2037, 10, 25, 1, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'BST',
+        'utcoffset': timedelta(hours=1),
+        'dst': timedelta(hours=1),
+        }
+    after = {
+        'tzname': 'GMT',
+        'utcoffset': timedelta(0),
+        'dst': timedelta(0),
+        }
+
+
+class NoumeaHistoryStartTestCase(USEasternDSTStartTestCase):
+    # Noumea adopted a whole hour offset in 1912. Previously
+    # it was 11 hours, 5 minutes and 48 seconds off UTC. However,
+    # due to limitations of the Python datetime library, we need
+    # to round that to 11 hours 6 minutes.
+    tzinfo = pytz.timezone('Pacific/Noumea')
+    transition_time = datetime(1912, 1, 12, 12, 54, 12, tzinfo=UTC)
+    before = {
+        'tzname': 'LMT',
+        'utcoffset': timedelta(hours=11, minutes=6),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'NCT',
+        'utcoffset': timedelta(hours=11),
+        'dst': timedelta(0),
+        }
+
+
+class NoumeaDSTEndTestCase(USEasternDSTStartTestCase):
+    # Noumea dropped DST in 1997.
+    tzinfo = pytz.timezone('Pacific/Noumea')
+    transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'NCST',
+        'utcoffset': timedelta(hours=12),
+        'dst': timedelta(hours=1),
+        }
+    after = {
+        'tzname': 'NCT',
+        'utcoffset': timedelta(hours=11),
+        'dst': timedelta(0),
+        }
+
+
+class NoumeaNoMoreDSTTestCase(NoumeaDSTEndTestCase):
+    # Noumea dropped DST in 1997. Here we test that it stops occuring.
+    transition_time = (
+        NoumeaDSTEndTestCase.transition_time + timedelta(days=365*10))
+    before = NoumeaDSTEndTestCase.after
+    after = NoumeaDSTEndTestCase.after
+
+
+class TahitiTestCase(USEasternDSTStartTestCase):
+    # Tahiti has had a single transition in its history.
+    tzinfo = pytz.timezone('Pacific/Tahiti')
+    transition_time = datetime(1912, 10, 1, 9, 58, 16, tzinfo=UTC)
+    before = {
+        'tzname': 'LMT',
+        'utcoffset': timedelta(hours=-9, minutes=-58),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'TAHT',
+        'utcoffset': timedelta(hours=-10),
+        'dst': timedelta(0),
+        }
+
+
+class SamoaInternationalDateLineChange(USEasternDSTStartTestCase):
+    # At the end of 2011, Samoa will switch from being east of the
+    # international dateline to the west. There will be no Dec 30th
+    # 2011 and it will switch from UTC-10 to UTC+14.
+    tzinfo = pytz.timezone('Pacific/Apia')
+    transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'SDT',
+        'utcoffset': timedelta(hours=-10),
+        'dst': timedelta(hours=1),
+        }
+    after = {
+        'tzname': 'WSDT',
+        'utcoffset': timedelta(hours=14),
+        'dst': timedelta(hours=1),
+        }
+
+
+class ReferenceUSEasternDSTStartTestCase(USEasternDSTStartTestCase):
+    tzinfo = reference.Eastern
+    def test_arithmetic(self):
+        # Reference implementation cannot handle this
+        pass
+
+
+class ReferenceUSEasternDSTEndTestCase(USEasternDSTEndTestCase):
+    tzinfo = reference.Eastern
+
+    def testHourBefore(self):
+        # Python's datetime library has a bug, where the hour before
+        # a daylight saving transition is one hour out. For example,
+        # at the end of US/Eastern daylight saving time, 01:00 EST
+        # occurs twice (once at 05:00 UTC and once at 06:00 UTC),
+        # whereas the first should actually be 01:00 EDT.
+        # Note that this bug is by design - by accepting this ambiguity
+        # for one hour one hour per year, an is_dst flag on datetime.time
+        # became unnecessary.
+        self._test_all(
+                self.transition_time - timedelta(hours=1), self.after
+                )
+
+    def testInstantBefore(self):
+        self._test_all(
+                self.transition_time - timedelta(seconds=1), self.after
+                )
+
+    def test_arithmetic(self):
+        # Reference implementation cannot handle this
+        pass
+
+
+class LocalTestCase(unittest.TestCase):
+    def testLocalize(self):
+        loc_tz = pytz.timezone('Europe/Amsterdam')
+
+        loc_time = loc_tz.localize(datetime(1930, 5, 10, 0, 0, 0))
+        # Actually +00:19:32, but Python datetime rounds this
+        self.assertEqual(loc_time.strftime('%Z%z'), 'AMT+0020')
+
+        loc_time = loc_tz.localize(datetime(1930, 5, 20, 0, 0, 0))
+        # Actually +00:19:32, but Python datetime rounds this
+        self.assertEqual(loc_time.strftime('%Z%z'), 'NST+0120')
+
+        loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'NET+0020')
+
+        loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
+
+        loc_time = loc_tz.localize(datetime(2004, 2, 1, 0, 0, 0))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CET+0100')
+
+        loc_time = loc_tz.localize(datetime(2004, 4, 1, 0, 0, 0))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
+
+        tz = pytz.timezone('Europe/Amsterdam')
+        loc_time = loc_tz.localize(datetime(1943, 3, 29, 1, 59, 59))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CET+0100')
+
+
+        # Switch to US
+        loc_tz = pytz.timezone('US/Eastern')
+
+        # End of DST ambiguity check
+        loc_time = loc_tz.localize(datetime(1918, 10, 27, 1, 59, 59), is_dst=1)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EDT-0400')
+
+        loc_time = loc_tz.localize(datetime(1918, 10, 27, 1, 59, 59), is_dst=0)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+
+        self.assertRaises(pytz.AmbiguousTimeError,
+            loc_tz.localize, datetime(1918, 10, 27, 1, 59, 59), is_dst=None
+            )
+
+        # Start of DST non-existent times
+        loc_time = loc_tz.localize(datetime(1918, 3, 31, 2, 0, 0), is_dst=0)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+
+        loc_time = loc_tz.localize(datetime(1918, 3, 31, 2, 0, 0), is_dst=1)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EDT-0400')
+
+        self.assertRaises(pytz.NonExistentTimeError,
+            loc_tz.localize, datetime(1918, 3, 31, 2, 0, 0), is_dst=None
+            )
+
+        # Weird changes - war time and peace time both is_dst==True
+
+        loc_time = loc_tz.localize(datetime(1942, 2, 9, 3, 0, 0))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EWT-0400')
+
+        loc_time = loc_tz.localize(datetime(1945, 8, 14, 19, 0, 0))
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EPT-0400')
+
+        loc_time = loc_tz.localize(datetime(1945, 9, 30, 1, 0, 0), is_dst=1)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EPT-0400')
+
+        loc_time = loc_tz.localize(datetime(1945, 9, 30, 1, 0, 0), is_dst=0)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+
+        # Weird changes - ambiguous time (end-of-DST like) but is_dst==False
+        for zonename, ambiguous_naive, expected in [
+                ('Europe/Warsaw', datetime(1915, 8, 4, 23, 59, 59),
+                 ['1915-08-04 23:59:59 WMT+0124',
+                  '1915-08-04 23:59:59 CET+0100']),
+                ('Europe/Moscow', datetime(2014, 10, 26, 1, 30),
+                 ['2014-10-26 01:30:00 MSK+0400',
+                  '2014-10-26 01:30:00 MSK+0300'])]:
+            loc_tz = pytz.timezone(zonename)
+            self.assertRaises(pytz.AmbiguousTimeError,
+                loc_tz.localize, ambiguous_naive, is_dst=None
+                )
+            # Also test non-boolean is_dst in the weird case
+            for dst in [True, timedelta(1), False, timedelta(0)]:
+                loc_time = loc_tz.localize(ambiguous_naive, is_dst=dst)
+                self.assertEqual(loc_time.strftime(fmt), expected[not dst])
+
+    def testNormalize(self):
+        tz = pytz.timezone('US/Eastern')
+        dt = datetime(2004, 4, 4, 7, 0, 0, tzinfo=UTC).astimezone(tz)
+        dt2 = dt - timedelta(minutes=10)
+        self.assertEqual(
+                dt2.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
+                '2004-04-04 02:50:00 EDT-0400'
+                )
+
+        dt2 = tz.normalize(dt2)
+        self.assertEqual(
+                dt2.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
+                '2004-04-04 01:50:00 EST-0500'
+                )
+
+    def testPartialMinuteOffsets(self):
+        # utcoffset in Amsterdam was not a whole minute until 1937
+        # However, we fudge this by rounding them, as the Python
+        # datetime library
+        tz = pytz.timezone('Europe/Amsterdam')
+        utc_dt = datetime(1914, 1, 1, 13, 40, 28, tzinfo=UTC) # correct
+        utc_dt = utc_dt.replace(second=0) # But we need to fudge it
+        loc_dt = utc_dt.astimezone(tz)
+        self.assertEqual(
+                loc_dt.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
+                '1914-01-01 14:00:00 AMT+0020'
+                )
+
+        # And get back...
+        utc_dt = loc_dt.astimezone(UTC)
+        self.assertEqual(
+                utc_dt.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
+                '1914-01-01 13:40:00 UTC+0000'
+                )
+
+    def no_testCreateLocaltime(self):
+        # It would be nice if this worked, but it doesn't.
+        tz = pytz.timezone('Europe/Amsterdam')
+        dt = datetime(2004, 10, 31, 2, 0, 0, tzinfo=tz)
+        self.assertEqual(
+                dt.strftime(fmt),
+                '2004-10-31 02:00:00 CET+0100'
+                )
+
+
+class CommonTimezonesTestCase(unittest.TestCase):
+    def test_bratislava(self):
+        # Bratislava is the default timezone for Slovakia, but our
+        # heuristics where not adding it to common_timezones. Ideally,
+        # common_timezones should be populated from zone.tab at runtime,
+        # but I'm hesitant to pay the startup cost as loading the list
+        # on demand whilst remaining backwards compatible seems
+        # difficult.
+        self.assertTrue('Europe/Bratislava' in pytz.common_timezones)
+        self.assertTrue('Europe/Bratislava' in pytz.common_timezones_set)
+
+    def test_us_eastern(self):
+        self.assertTrue('US/Eastern' in pytz.common_timezones)
+        self.assertTrue('US/Eastern' in pytz.common_timezones_set)
+
+    def test_belfast(self):
+        # Belfast uses London time.
+        self.assertTrue('Europe/Belfast' in pytz.all_timezones_set)
+        self.assertFalse('Europe/Belfast' in pytz.common_timezones)
+        self.assertFalse('Europe/Belfast' in pytz.common_timezones_set)
+
+
+class BaseTzInfoTestCase:
+    '''Ensure UTC, StaticTzInfo and DstTzInfo work consistently.
+
+    These tests are run for each type of tzinfo.
+    '''
+    tz = None  # override
+    tz_class = None  # override
+
+    def test_expectedclass(self):
+        self.assertTrue(isinstance(self.tz, self.tz_class))
+
+    def test_fromutc(self):
+        # naive datetime.
+        dt1 = datetime(2011, 10, 31)
+
+        # localized datetime, same timezone.
+        dt2 = self.tz.localize(dt1)
+
+        # Both should give the same results. Note that the standard
+        # Python tzinfo.fromutc() only supports the second.
+        for dt in [dt1, dt2]:
+            loc_dt = self.tz.fromutc(dt)
+            loc_dt2 = pytz.utc.localize(dt1).astimezone(self.tz)
+            self.assertEqual(loc_dt, loc_dt2)
+
+        # localized datetime, different timezone.
+        new_tz = pytz.timezone('Europe/Paris')
+        self.assertTrue(self.tz is not new_tz)
+        dt3 = new_tz.localize(dt1)
+        self.assertRaises(ValueError, self.tz.fromutc, dt3)
+
+    def test_normalize(self):
+        other_tz = pytz.timezone('Europe/Paris')
+        self.assertTrue(self.tz is not other_tz)
+
+        dt = datetime(2012, 3, 26, 12, 0)
+        other_dt = other_tz.localize(dt)
+
+        local_dt = self.tz.normalize(other_dt)
+
+        self.assertTrue(local_dt.tzinfo is not other_dt.tzinfo)
+        self.assertNotEqual(
+            local_dt.replace(tzinfo=None), other_dt.replace(tzinfo=None))
+
+    def test_astimezone(self):
+        other_tz = pytz.timezone('Europe/Paris')
+        self.assertTrue(self.tz is not other_tz)
+
+        dt = datetime(2012, 3, 26, 12, 0)
+        other_dt = other_tz.localize(dt)
+
+        local_dt = other_dt.astimezone(self.tz)
+
+        self.assertTrue(local_dt.tzinfo is not other_dt.tzinfo)
+        self.assertNotEqual(
+            local_dt.replace(tzinfo=None), other_dt.replace(tzinfo=None))
+
+
+class OptimizedUTCTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    tz = pytz.utc
+    tz_class = tz.__class__
+
+
+class LegacyUTCTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    # Deprecated timezone, but useful for comparison tests.
+    tz = pytz.timezone('Etc/UTC')
+    tz_class = StaticTzInfo
+
+
+class StaticTzInfoTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    tz = pytz.timezone('GMT')
+    tz_class = StaticTzInfo
+
+
+class DstTzInfoTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    tz = pytz.timezone('Australia/Melbourne')
+    tz_class = DstTzInfo
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(doctest.DocTestSuite('pytz'))
+    suite.addTest(doctest.DocTestSuite('pytz.tzinfo'))
+    import test_tzinfo
+    suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_tzinfo))
+    return suite
+
+
+if __name__ == '__main__':
+    warnings.simplefilter("error") # Warnings should be fatal in tests.
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/pytz-old/tzfile.py b/lib/pytz-old/tzfile.py
new file mode 100644
index 0000000..cb1ed04
--- /dev/null
+++ b/lib/pytz-old/tzfile.py
@@ -0,0 +1,137 @@
+#!/usr/bin/env python
+'''
+$Id: tzfile.py,v 1.8 2004/06/03 00:15:24 zenzen Exp $
+'''
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+from datetime import datetime, timedelta
+from struct import unpack, calcsize
+
+from lib.pytz.tzinfo import StaticTzInfo, DstTzInfo, memorized_ttinfo
+from lib.pytz.tzinfo import memorized_datetime, memorized_timedelta
+
+def _byte_string(s):
+    """Cast a string or byte string to an ASCII byte string."""
+    return s.encode('US-ASCII')
+
+_NULL = _byte_string('\0')
+
+def _std_string(s):
+    """Cast a string or byte string to an ASCII string."""
+    return str(s.decode('US-ASCII'))
+
+def build_tzinfo(zone, fp):
+    head_fmt = '>4s c 15x 6l'
+    head_size = calcsize(head_fmt)
+    (magic, format, ttisgmtcnt, ttisstdcnt,leapcnt, timecnt,
+        typecnt, charcnt) =  unpack(head_fmt, fp.read(head_size))
+
+    # Make sure it is a tzfile(5) file
+    assert magic == _byte_string('TZif'), 'Got magic %s' % repr(magic)
+
+    # Read out the transition times, localtime indices and ttinfo structures.
+    data_fmt = '>%(timecnt)dl %(timecnt)dB %(ttinfo)s %(charcnt)ds' % dict(
+        timecnt=timecnt, ttinfo='lBB'*typecnt, charcnt=charcnt)
+    data_size = calcsize(data_fmt)
+    data = unpack(data_fmt, fp.read(data_size))
+
+    # make sure we unpacked the right number of values
+    assert len(data) == 2 * timecnt + 3 * typecnt + 1
+    transitions = [memorized_datetime(trans)
+                   for trans in data[:timecnt]]
+    lindexes = list(data[timecnt:2 * timecnt])
+    ttinfo_raw = data[2 * timecnt:-1]
+    tznames_raw = data[-1]
+    del data
+
+    # Process ttinfo into separate structs
+    ttinfo = []
+    tznames = {}
+    i = 0
+    while i < len(ttinfo_raw):
+        # have we looked up this timezone name yet?
+        tzname_offset = ttinfo_raw[i+2]
+        if tzname_offset not in tznames:
+            nul = tznames_raw.find(_NULL, tzname_offset)
+            if nul < 0:
+                nul = len(tznames_raw)
+            tznames[tzname_offset] = _std_string(
+                tznames_raw[tzname_offset:nul])
+        ttinfo.append((ttinfo_raw[i],
+                       bool(ttinfo_raw[i+1]),
+                       tznames[tzname_offset]))
+        i += 3
+
+    # Now build the timezone object
+    if len(transitions) == 0:
+        ttinfo[0][0], ttinfo[0][2]
+        cls = type(zone, (StaticTzInfo,), dict(
+            zone=zone,
+            _utcoffset=memorized_timedelta(ttinfo[0][0]),
+            _tzname=ttinfo[0][2]))
+    else:
+        # Early dates use the first standard time ttinfo
+        i = 0
+        while ttinfo[i][1]:
+            i += 1
+        if ttinfo[i] == ttinfo[lindexes[0]]:
+            transitions[0] = datetime.min
+        else:
+            transitions.insert(0, datetime.min)
+            lindexes.insert(0, i)
+
+        # calculate transition info
+        transition_info = []
+        for i in range(len(transitions)):
+            inf = ttinfo[lindexes[i]]
+            utcoffset = inf[0]
+            if not inf[1]:
+                dst = 0
+            else:
+                for j in range(i-1, -1, -1):
+                    prev_inf = ttinfo[lindexes[j]]
+                    if not prev_inf[1]:
+                        break
+                dst = inf[0] - prev_inf[0] # dst offset
+
+                # Bad dst? Look further. DST > 24 hours happens when
+                # a timzone has moved across the international dateline.
+                if dst <= 0 or dst > 3600*3:
+                    for j in range(i+1, len(transitions)):
+                        stdinf = ttinfo[lindexes[j]]
+                        if not stdinf[1]:
+                            dst = inf[0] - stdinf[0]
+                            if dst > 0:
+                                break # Found a useful std time.
+
+            tzname = inf[2]
+
+            # Round utcoffset and dst to the nearest minute or the
+            # datetime library will complain. Conversions to these timezones
+            # might be up to plus or minus 30 seconds out, but it is
+            # the best we can do.
+            utcoffset = int((utcoffset + 30) // 60) * 60
+            dst = int((dst + 30) // 60) * 60
+            transition_info.append(memorized_ttinfo(utcoffset, dst, tzname))
+
+        cls = type(zone, (DstTzInfo,), dict(
+            zone=zone,
+            _utc_transition_times=transitions,
+            _transition_info=transition_info))
+
+    return cls()
+
+if __name__ == '__main__':
+    import os.path
+    from pprint import pprint
+    base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
+    tz = build_tzinfo('Australia/Melbourne',
+                      open(os.path.join(base,'Australia','Melbourne'), 'rb'))
+    tz = build_tzinfo('US/Eastern',
+                      open(os.path.join(base,'US','Eastern'), 'rb'))
+    pprint(tz._utc_transition_times)
+    #print tz.asPython(4)
+    #print tz.transitions_mapping
diff --git a/lib/pytz-old/tzinfo.py b/lib/pytz-old/tzinfo.py
new file mode 100755
index 0000000..1a1bb6e
--- /dev/null
+++ b/lib/pytz-old/tzinfo.py
@@ -0,0 +1,564 @@
+'''Base classes and helpers for building zone specific tzinfo classes'''
+
+from datetime import datetime, timedelta, tzinfo
+from bisect import bisect_right
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+import lib.pytz
+from lib.pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
+
+__all__ = []
+
+_timedelta_cache = {}
+def memorized_timedelta(seconds):
+    '''Create only one instance of each distinct timedelta'''
+    try:
+        return _timedelta_cache[seconds]
+    except KeyError:
+        delta = timedelta(seconds=seconds)
+        _timedelta_cache[seconds] = delta
+        return delta
+
+_epoch = datetime.utcfromtimestamp(0)
+_datetime_cache = {0: _epoch}
+def memorized_datetime(seconds):
+    '''Create only one instance of each distinct datetime'''
+    try:
+        return _datetime_cache[seconds]
+    except KeyError:
+        # NB. We can't just do datetime.utcfromtimestamp(seconds) as this
+        # fails with negative values under Windows (Bug #90096)
+        dt = _epoch + timedelta(seconds=seconds)
+        _datetime_cache[seconds] = dt
+        return dt
+
+_ttinfo_cache = {}
+def memorized_ttinfo(*args):
+    '''Create only one instance of each distinct tuple'''
+    try:
+        return _ttinfo_cache[args]
+    except KeyError:
+        ttinfo = (
+                memorized_timedelta(args[0]),
+                memorized_timedelta(args[1]),
+                args[2]
+                )
+        _ttinfo_cache[args] = ttinfo
+        return ttinfo
+
+_notime = memorized_timedelta(0)
+
+def _to_seconds(td):
+    '''Convert a timedelta to seconds'''
+    return td.seconds + td.days * 24 * 60 * 60
+
+
+class BaseTzInfo(tzinfo):
+    # Overridden in subclass
+    _utcoffset = None
+    _tzname = None
+    zone = None
+
+    def __str__(self):
+        return self.zone
+
+
+class StaticTzInfo(BaseTzInfo):
+    '''A timezone that has a constant offset from UTC
+
+    These timezones are rare, as most locations have changed their
+    offset at some point in their history
+    '''
+    def fromutc(self, dt):
+        '''See datetime.tzinfo.fromutc'''
+        if dt.tzinfo is not None and dt.tzinfo is not self:
+            raise ValueError('fromutc: dt.tzinfo is not self')
+        return (dt + self._utcoffset).replace(tzinfo=self)
+
+    def utcoffset(self, dt, is_dst=None):
+        '''See datetime.tzinfo.utcoffset
+
+        is_dst is ignored for StaticTzInfo, and exists only to
+        retain compatibility with DstTzInfo.
+        '''
+        return self._utcoffset
+
+    def dst(self, dt, is_dst=None):
+        '''See datetime.tzinfo.dst
+
+        is_dst is ignored for StaticTzInfo, and exists only to
+        retain compatibility with DstTzInfo.
+        '''
+        return _notime
+
+    def tzname(self, dt, is_dst=None):
+        '''See datetime.tzinfo.tzname
+
+        is_dst is ignored for StaticTzInfo, and exists only to
+        retain compatibility with DstTzInfo.
+        '''
+        return self._tzname
+
+    def localize(self, dt, is_dst=False):
+        '''Convert naive time to local time'''
+        if dt.tzinfo is not None:
+            raise ValueError('Not naive datetime (tzinfo is already set)')
+        return dt.replace(tzinfo=self)
+
+    def normalize(self, dt, is_dst=False):
+        '''Correct the timezone information on the given datetime.
+
+        This is normally a no-op, as StaticTzInfo timezones never have
+        ambiguous cases to correct:
+
+        >>> from pytz import timezone
+        >>> gmt = timezone('GMT')
+        >>> isinstance(gmt, StaticTzInfo)
+        True
+        >>> dt = datetime(2011, 5, 8, 1, 2, 3, tzinfo=gmt)
+        >>> gmt.normalize(dt) is dt
+        True
+
+        The supported method of converting between timezones is to use
+        datetime.astimezone(). Currently normalize() also works:
+
+        >>> la = timezone('America/Los_Angeles')
+        >>> dt = la.localize(datetime(2011, 5, 7, 1, 2, 3))
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> gmt.normalize(dt).strftime(fmt)
+        '2011-05-07 08:02:03 GMT (+0000)'
+        '''
+        if dt.tzinfo is self:
+            return dt
+        if dt.tzinfo is None:
+            raise ValueError('Naive time - no tzinfo set')
+        return dt.astimezone(self)
+
+    def __repr__(self):
+        return '<StaticTzInfo %r>' % (self.zone,)
+
+    def __reduce__(self):
+        # Special pickle to zone remains a singleton and to cope with
+        # database changes.
+        return pytz._p, (self.zone,)
+
+
+class DstTzInfo(BaseTzInfo):
+    '''A timezone that has a variable offset from UTC
+
+    The offset might change if daylight saving time comes into effect,
+    or at a point in history when the region decides to change their
+    timezone definition.
+    '''
+    # Overridden in subclass
+    _utc_transition_times = None # Sorted list of DST transition times in UTC
+    _transition_info = None # [(utcoffset, dstoffset, tzname)] corresponding
+                            # to _utc_transition_times entries
+    zone = None
+
+    # Set in __init__
+    _tzinfos = None
+    _dst = None # DST offset
+
+    def __init__(self, _inf=None, _tzinfos=None):
+        if _inf:
+            self._tzinfos = _tzinfos
+            self._utcoffset, self._dst, self._tzname = _inf
+        else:
+            _tzinfos = {}
+            self._tzinfos = _tzinfos
+            self._utcoffset, self._dst, self._tzname = self._transition_info[0]
+            _tzinfos[self._transition_info[0]] = self
+            for inf in self._transition_info[1:]:
+                if inf not in _tzinfos:
+                    _tzinfos[inf] = self.__class__(inf, _tzinfos)
+
+    def fromutc(self, dt):
+        '''See datetime.tzinfo.fromutc'''
+        if (dt.tzinfo is not None
+            and getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
+            raise ValueError('fromutc: dt.tzinfo is not self')
+        dt = dt.replace(tzinfo=None)
+        idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)
+        inf = self._transition_info[idx]
+        return (dt + inf[0]).replace(tzinfo=self._tzinfos[inf])
+
+    def normalize(self, dt):
+        '''Correct the timezone information on the given datetime
+
+        If date arithmetic crosses DST boundaries, the tzinfo
+        is not magically adjusted. This method normalizes the
+        tzinfo to the correct one.
+
+        To test, first we need to do some setup
+
+        >>> from pytz import timezone
+        >>> utc = timezone('UTC')
+        >>> eastern = timezone('US/Eastern')
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+
+        We next create a datetime right on an end-of-DST transition point,
+        the instant when the wallclocks are wound back one hour.
+
+        >>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
+        >>> loc_dt = utc_dt.astimezone(eastern)
+        >>> loc_dt.strftime(fmt)
+        '2002-10-27 01:00:00 EST (-0500)'
+
+        Now, if we subtract a few minutes from it, note that the timezone
+        information has not changed.
+
+        >>> before = loc_dt - timedelta(minutes=10)
+        >>> before.strftime(fmt)
+        '2002-10-27 00:50:00 EST (-0500)'
+
+        But we can fix that by calling the normalize method
+
+        >>> before = eastern.normalize(before)
+        >>> before.strftime(fmt)
+        '2002-10-27 01:50:00 EDT (-0400)'
+
+        The supported method of converting between timezones is to use
+        datetime.astimezone(). Currently, normalize() also works:
+
+        >>> th = timezone('Asia/Bangkok')
+        >>> am = timezone('Europe/Amsterdam')
+        >>> dt = th.localize(datetime(2011, 5, 7, 1, 2, 3))
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> am.normalize(dt).strftime(fmt)
+        '2011-05-06 20:02:03 CEST (+0200)'
+        '''
+        if dt.tzinfo is None:
+            raise ValueError('Naive time - no tzinfo set')
+
+        # Convert dt in localtime to UTC
+        offset = dt.tzinfo._utcoffset
+        dt = dt.replace(tzinfo=None)
+        dt = dt - offset
+        # convert it back, and return it
+        return self.fromutc(dt)
+
+    def localize(self, dt, is_dst=False):
+        '''Convert naive time to local time.
+
+        This method should be used to construct localtimes, rather
+        than passing a tzinfo argument to a datetime constructor.
+
+        is_dst is used to determine the correct timezone in the ambigous
+        period at the end of daylight saving time.
+
+        >>> from pytz import timezone
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> amdam = timezone('Europe/Amsterdam')
+        >>> dt  = datetime(2004, 10, 31, 2, 0, 0)
+        >>> loc_dt1 = amdam.localize(dt, is_dst=True)
+        >>> loc_dt2 = amdam.localize(dt, is_dst=False)
+        >>> loc_dt1.strftime(fmt)
+        '2004-10-31 02:00:00 CEST (+0200)'
+        >>> loc_dt2.strftime(fmt)
+        '2004-10-31 02:00:00 CET (+0100)'
+        >>> str(loc_dt2 - loc_dt1)
+        '1:00:00'
+
+        Use is_dst=None to raise an AmbiguousTimeError for ambiguous
+        times at the end of daylight saving time
+
+        >>> try:
+        ...     loc_dt1 = amdam.localize(dt, is_dst=None)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+
+        is_dst defaults to False
+
+        >>> amdam.localize(dt) == amdam.localize(dt, False)
+        True
+
+        is_dst is also used to determine the correct timezone in the
+        wallclock times jumped over at the start of daylight saving time.
+
+        >>> pacific = timezone('US/Pacific')
+        >>> dt = datetime(2008, 3, 9, 2, 0, 0)
+        >>> ploc_dt1 = pacific.localize(dt, is_dst=True)
+        >>> ploc_dt2 = pacific.localize(dt, is_dst=False)
+        >>> ploc_dt1.strftime(fmt)
+        '2008-03-09 02:00:00 PDT (-0700)'
+        >>> ploc_dt2.strftime(fmt)
+        '2008-03-09 02:00:00 PST (-0800)'
+        >>> str(ploc_dt2 - ploc_dt1)
+        '1:00:00'
+
+        Use is_dst=None to raise a NonExistentTimeError for these skipped
+        times.
+
+        >>> try:
+        ...     loc_dt1 = pacific.localize(dt, is_dst=None)
+        ... except NonExistentTimeError:
+        ...     print('Non-existent')
+        Non-existent
+        '''
+        if dt.tzinfo is not None:
+            raise ValueError('Not naive datetime (tzinfo is already set)')
+
+        # Find the two best possibilities.
+        possible_loc_dt = set()
+        for delta in [timedelta(days=-1), timedelta(days=1)]:
+            loc_dt = dt + delta
+            idx = max(0, bisect_right(
+                self._utc_transition_times, loc_dt) - 1)
+            inf = self._transition_info[idx]
+            tzinfo = self._tzinfos[inf]
+            loc_dt = tzinfo.normalize(dt.replace(tzinfo=tzinfo))
+            if loc_dt.replace(tzinfo=None) == dt:
+                possible_loc_dt.add(loc_dt)
+
+        if len(possible_loc_dt) == 1:
+            return possible_loc_dt.pop()
+
+        # If there are no possibly correct timezones, we are attempting
+        # to convert a time that never happened - the time period jumped
+        # during the start-of-DST transition period.
+        if len(possible_loc_dt) == 0:
+            # If we refuse to guess, raise an exception.
+            if is_dst is None:
+                raise NonExistentTimeError(dt)
+
+            # If we are forcing the pre-DST side of the DST transition, we
+            # obtain the correct timezone by winding the clock forward a few
+            # hours.
+            elif is_dst:
+                return self.localize(
+                    dt + timedelta(hours=6), is_dst=True) - timedelta(hours=6)
+
+            # If we are forcing the post-DST side of the DST transition, we
+            # obtain the correct timezone by winding the clock back.
+            else:
+                return self.localize(
+                    dt - timedelta(hours=6), is_dst=False) + timedelta(hours=6)
+
+
+        # If we get this far, we have multiple possible timezones - this
+        # is an ambiguous case occuring during the end-of-DST transition.
+
+        # If told to be strict, raise an exception since we have an
+        # ambiguous case
+        if is_dst is None:
+            raise AmbiguousTimeError(dt)
+
+        # Filter out the possiblilities that don't match the requested
+        # is_dst
+        filtered_possible_loc_dt = [
+            p for p in possible_loc_dt
+                if bool(p.tzinfo._dst) == is_dst
+            ]
+
+        # Hopefully we only have one possibility left. Return it.
+        if len(filtered_possible_loc_dt) == 1:
+            return filtered_possible_loc_dt[0]
+
+        if len(filtered_possible_loc_dt) == 0:
+            filtered_possible_loc_dt = list(possible_loc_dt)
+
+        # If we get this far, we have in a wierd timezone transition
+        # where the clocks have been wound back but is_dst is the same
+        # in both (eg. Europe/Warsaw 1915 when they switched to CET).
+        # At this point, we just have to guess unless we allow more
+        # hints to be passed in (such as the UTC offset or abbreviation),
+        # but that is just getting silly.
+        #
+        # Choose the earliest (by UTC) applicable timezone if is_dst=True
+        # Choose the latest (by UTC) applicable timezone if is_dst=False
+        # i.e., behave like end-of-DST transition
+        dates = {} # utc -> local
+        for local_dt in filtered_possible_loc_dt:
+            utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
+            assert utc_time not in dates
+            dates[utc_time] = local_dt
+        return dates[[min, max][not is_dst](dates)]
+
+    def utcoffset(self, dt, is_dst=None):
+        '''See datetime.tzinfo.utcoffset
+
+        The is_dst parameter may be used to remove ambiguity during DST
+        transitions.
+
+        >>> from pytz import timezone
+        >>> tz = timezone('America/St_Johns')
+        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
+
+        >>> tz.utcoffset(ambiguous, is_dst=False)
+        datetime.timedelta(-1, 73800)
+
+        >>> tz.utcoffset(ambiguous, is_dst=True)
+        datetime.timedelta(-1, 77400)
+
+        >>> try:
+        ...     tz.utcoffset(ambiguous)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+
+        '''
+        if dt is None:
+            return None
+        elif dt.tzinfo is not self:
+            dt = self.localize(dt, is_dst)
+            return dt.tzinfo._utcoffset
+        else:
+            return self._utcoffset
+
+    def dst(self, dt, is_dst=None):
+        '''See datetime.tzinfo.dst
+
+        The is_dst parameter may be used to remove ambiguity during DST
+        transitions.
+
+        >>> from pytz import timezone
+        >>> tz = timezone('America/St_Johns')
+
+        >>> normal = datetime(2009, 9, 1)
+
+        >>> tz.dst(normal)
+        datetime.timedelta(0, 3600)
+        >>> tz.dst(normal, is_dst=False)
+        datetime.timedelta(0, 3600)
+        >>> tz.dst(normal, is_dst=True)
+        datetime.timedelta(0, 3600)
+
+        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
+
+        >>> tz.dst(ambiguous, is_dst=False)
+        datetime.timedelta(0)
+        >>> tz.dst(ambiguous, is_dst=True)
+        datetime.timedelta(0, 3600)
+        >>> try:
+        ...     tz.dst(ambiguous)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+
+        '''
+        if dt is None:
+            return None
+        elif dt.tzinfo is not self:
+            dt = self.localize(dt, is_dst)
+            return dt.tzinfo._dst
+        else:
+            return self._dst
+
+    def tzname(self, dt, is_dst=None):
+        '''See datetime.tzinfo.tzname
+
+        The is_dst parameter may be used to remove ambiguity during DST
+        transitions.
+
+        >>> from pytz import timezone
+        >>> tz = timezone('America/St_Johns')
+
+        >>> normal = datetime(2009, 9, 1)
+
+        >>> tz.tzname(normal)
+        'NDT'
+        >>> tz.tzname(normal, is_dst=False)
+        'NDT'
+        >>> tz.tzname(normal, is_dst=True)
+        'NDT'
+
+        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
+
+        >>> tz.tzname(ambiguous, is_dst=False)
+        'NST'
+        >>> tz.tzname(ambiguous, is_dst=True)
+        'NDT'
+        >>> try:
+        ...     tz.tzname(ambiguous)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+        '''
+        if dt is None:
+            return self.zone
+        elif dt.tzinfo is not self:
+            dt = self.localize(dt, is_dst)
+            return dt.tzinfo._tzname
+        else:
+            return self._tzname
+
+    def __repr__(self):
+        if self._dst:
+            dst = 'DST'
+        else:
+            dst = 'STD'
+        if self._utcoffset > _notime:
+            return '<DstTzInfo %r %s+%s %s>' % (
+                    self.zone, self._tzname, self._utcoffset, dst
+                )
+        else:
+            return '<DstTzInfo %r %s%s %s>' % (
+                    self.zone, self._tzname, self._utcoffset, dst
+                )
+
+    def __reduce__(self):
+        # Special pickle to zone remains a singleton and to cope with
+        # database changes.
+        return pytz._p, (
+                self.zone,
+                _to_seconds(self._utcoffset),
+                _to_seconds(self._dst),
+                self._tzname
+                )
+
+
+
+def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
+    """Factory function for unpickling pytz tzinfo instances.
+
+    This is shared for both StaticTzInfo and DstTzInfo instances, because
+    database changes could cause a zones implementation to switch between
+    these two base classes and we can't break pickles on a pytz version
+    upgrade.
+    """
+    # Raises a KeyError if zone no longer exists, which should never happen
+    # and would be a bug.
+    tz = pytz.timezone(zone)
+
+    # A StaticTzInfo - just return it
+    if utcoffset is None:
+        return tz
+
+    # This pickle was created from a DstTzInfo. We need to
+    # determine which of the list of tzinfo instances for this zone
+    # to use in order to restore the state of any datetime instances using
+    # it correctly.
+    utcoffset = memorized_timedelta(utcoffset)
+    dstoffset = memorized_timedelta(dstoffset)
+    try:
+        return tz._tzinfos[(utcoffset, dstoffset, tzname)]
+    except KeyError:
+        # The particular state requested in this timezone no longer exists.
+        # This indicates a corrupt pickle, or the timezone database has been
+        # corrected violently enough to make this particular
+        # (utcoffset,dstoffset) no longer exist in the zone, or the
+        # abbreviation has been changed.
+        pass
+
+    # See if we can find an entry differing only by tzname. Abbreviations
+    # get changed from the initial guess by the database maintainers to
+    # match reality when this information is discovered.
+    for localized_tz in tz._tzinfos.values():
+        if (localized_tz._utcoffset == utcoffset
+                and localized_tz._dst == dstoffset):
+            return localized_tz
+
+    # This (utcoffset, dstoffset) information has been removed from the
+    # zone. Add it back. This might occur when the database maintainers have
+    # corrected incorrect information. datetime instances using this
+    # incorrect information will continue to do so, exactly as they were
+    # before being pickled. This is purely an overly paranoid safety net - I
+    # doubt this will ever been needed in real life.
+    inf = (utcoffset, dstoffset, tzname)
+    tz._tzinfos[inf] = tz.__class__(inf, tz._tzinfos)
+    return tz._tzinfos[inf]
diff --git a/lib/pytz-old/tzinfo.pyc b/lib/pytz-old/tzinfo.pyc
new file mode 100755
index 0000000..e99933b
Binary files /dev/null and b/lib/pytz-old/tzinfo.pyc differ
diff --git a/lib/pytz/zone.tab b/lib/pytz-old/zone.tab
similarity index 100%
rename from lib/pytz/zone.tab
rename to lib/pytz-old/zone.tab
diff --git a/lib/pytz-old/zoneinfo/Africa/Abidjan b/lib/pytz-old/zoneinfo/Africa/Abidjan
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Abidjan differ
diff --git a/lib/pytz/zoneinfo/Africa/Abidjan.py b/lib/pytz-old/zoneinfo/Africa/Abidjan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Abidjan.py
rename to lib/pytz-old/zoneinfo/Africa/Abidjan.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Accra b/lib/pytz-old/zoneinfo/Africa/Accra
new file mode 100644
index 0000000..6ff8fb6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Accra differ
diff --git a/lib/pytz/zoneinfo/Africa/Accra.py b/lib/pytz-old/zoneinfo/Africa/Accra.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Accra.py
rename to lib/pytz-old/zoneinfo/Africa/Accra.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Addis_Ababa b/lib/pytz-old/zoneinfo/Africa/Addis_Ababa
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Addis_Ababa differ
diff --git a/lib/pytz/zoneinfo/Africa/Addis_Ababa.py b/lib/pytz-old/zoneinfo/Africa/Addis_Ababa.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Addis_Ababa.py
rename to lib/pytz-old/zoneinfo/Africa/Addis_Ababa.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Algiers b/lib/pytz-old/zoneinfo/Africa/Algiers
new file mode 100644
index 0000000..2a25f3a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Algiers differ
diff --git a/lib/pytz/zoneinfo/Africa/Algiers.py b/lib/pytz-old/zoneinfo/Africa/Algiers.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Algiers.py
rename to lib/pytz-old/zoneinfo/Africa/Algiers.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Asmara b/lib/pytz-old/zoneinfo/Africa/Asmara
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Asmara differ
diff --git a/lib/pytz-old/zoneinfo/Africa/Asmera b/lib/pytz-old/zoneinfo/Africa/Asmera
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Asmera differ
diff --git a/lib/pytz/zoneinfo/Africa/Asmera.py b/lib/pytz-old/zoneinfo/Africa/Asmera.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Asmera.py
rename to lib/pytz-old/zoneinfo/Africa/Asmera.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Bamako b/lib/pytz-old/zoneinfo/Africa/Bamako
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Bamako differ
diff --git a/lib/pytz/zoneinfo/Africa/Bamako.py b/lib/pytz-old/zoneinfo/Africa/Bamako.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Bamako.py
rename to lib/pytz-old/zoneinfo/Africa/Bamako.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Bangui b/lib/pytz-old/zoneinfo/Africa/Bangui
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Bangui differ
diff --git a/lib/pytz/zoneinfo/Africa/Bangui.py b/lib/pytz-old/zoneinfo/Africa/Bangui.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Bangui.py
rename to lib/pytz-old/zoneinfo/Africa/Bangui.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Banjul b/lib/pytz-old/zoneinfo/Africa/Banjul
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Banjul differ
diff --git a/lib/pytz/zoneinfo/Africa/Banjul.py b/lib/pytz-old/zoneinfo/Africa/Banjul.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Banjul.py
rename to lib/pytz-old/zoneinfo/Africa/Banjul.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Bissau b/lib/pytz-old/zoneinfo/Africa/Bissau
new file mode 100644
index 0000000..0696667
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Bissau differ
diff --git a/lib/pytz/zoneinfo/Africa/Bissau.py b/lib/pytz-old/zoneinfo/Africa/Bissau.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Bissau.py
rename to lib/pytz-old/zoneinfo/Africa/Bissau.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Blantyre b/lib/pytz-old/zoneinfo/Africa/Blantyre
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Blantyre differ
diff --git a/lib/pytz/zoneinfo/Africa/Blantyre.py b/lib/pytz-old/zoneinfo/Africa/Blantyre.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Blantyre.py
rename to lib/pytz-old/zoneinfo/Africa/Blantyre.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Brazzaville b/lib/pytz-old/zoneinfo/Africa/Brazzaville
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Brazzaville differ
diff --git a/lib/pytz/zoneinfo/Africa/Brazzaville.py b/lib/pytz-old/zoneinfo/Africa/Brazzaville.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Brazzaville.py
rename to lib/pytz-old/zoneinfo/Africa/Brazzaville.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Bujumbura b/lib/pytz-old/zoneinfo/Africa/Bujumbura
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Bujumbura differ
diff --git a/lib/pytz/zoneinfo/Africa/Bujumbura.py b/lib/pytz-old/zoneinfo/Africa/Bujumbura.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Bujumbura.py
rename to lib/pytz-old/zoneinfo/Africa/Bujumbura.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Cairo b/lib/pytz-old/zoneinfo/Africa/Cairo
new file mode 100644
index 0000000..0eeed11
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Cairo differ
diff --git a/lib/pytz/zoneinfo/Africa/Cairo.py b/lib/pytz-old/zoneinfo/Africa/Cairo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Cairo.py
rename to lib/pytz-old/zoneinfo/Africa/Cairo.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Casablanca b/lib/pytz-old/zoneinfo/Africa/Casablanca
new file mode 100644
index 0000000..c001c37
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Casablanca differ
diff --git a/lib/pytz/zoneinfo/Africa/Casablanca.py b/lib/pytz-old/zoneinfo/Africa/Casablanca.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Casablanca.py
rename to lib/pytz-old/zoneinfo/Africa/Casablanca.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Ceuta b/lib/pytz-old/zoneinfo/Africa/Ceuta
new file mode 100644
index 0000000..6227e2b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Ceuta differ
diff --git a/lib/pytz/zoneinfo/Africa/Ceuta.py b/lib/pytz-old/zoneinfo/Africa/Ceuta.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Ceuta.py
rename to lib/pytz-old/zoneinfo/Africa/Ceuta.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Conakry b/lib/pytz-old/zoneinfo/Africa/Conakry
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Conakry differ
diff --git a/lib/pytz/zoneinfo/Africa/Conakry.py b/lib/pytz-old/zoneinfo/Africa/Conakry.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Conakry.py
rename to lib/pytz-old/zoneinfo/Africa/Conakry.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Dakar b/lib/pytz-old/zoneinfo/Africa/Dakar
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Dakar differ
diff --git a/lib/pytz/zoneinfo/Africa/Dakar.py b/lib/pytz-old/zoneinfo/Africa/Dakar.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Dakar.py
rename to lib/pytz-old/zoneinfo/Africa/Dakar.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Dar_es_Salaam b/lib/pytz-old/zoneinfo/Africa/Dar_es_Salaam
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Dar_es_Salaam differ
diff --git a/lib/pytz/zoneinfo/Africa/Dar_es_Salaam.py b/lib/pytz-old/zoneinfo/Africa/Dar_es_Salaam.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Dar_es_Salaam.py
rename to lib/pytz-old/zoneinfo/Africa/Dar_es_Salaam.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Djibouti b/lib/pytz-old/zoneinfo/Africa/Djibouti
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Djibouti differ
diff --git a/lib/pytz/zoneinfo/Africa/Djibouti.py b/lib/pytz-old/zoneinfo/Africa/Djibouti.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Djibouti.py
rename to lib/pytz-old/zoneinfo/Africa/Djibouti.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Douala b/lib/pytz-old/zoneinfo/Africa/Douala
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Douala differ
diff --git a/lib/pytz/zoneinfo/Africa/Douala.py b/lib/pytz-old/zoneinfo/Africa/Douala.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Douala.py
rename to lib/pytz-old/zoneinfo/Africa/Douala.py
diff --git a/lib/pytz-old/zoneinfo/Africa/El_Aaiun b/lib/pytz-old/zoneinfo/Africa/El_Aaiun
new file mode 100644
index 0000000..805d39e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/El_Aaiun differ
diff --git a/lib/pytz/zoneinfo/Africa/El_Aaiun.py b/lib/pytz-old/zoneinfo/Africa/El_Aaiun.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/El_Aaiun.py
rename to lib/pytz-old/zoneinfo/Africa/El_Aaiun.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Freetown b/lib/pytz-old/zoneinfo/Africa/Freetown
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Freetown differ
diff --git a/lib/pytz/zoneinfo/Africa/Freetown.py b/lib/pytz-old/zoneinfo/Africa/Freetown.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Freetown.py
rename to lib/pytz-old/zoneinfo/Africa/Freetown.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Gaborone b/lib/pytz-old/zoneinfo/Africa/Gaborone
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Gaborone differ
diff --git a/lib/pytz/zoneinfo/Africa/Gaborone.py b/lib/pytz-old/zoneinfo/Africa/Gaborone.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Gaborone.py
rename to lib/pytz-old/zoneinfo/Africa/Gaborone.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Harare b/lib/pytz-old/zoneinfo/Africa/Harare
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Harare differ
diff --git a/lib/pytz/zoneinfo/Africa/Harare.py b/lib/pytz-old/zoneinfo/Africa/Harare.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Harare.py
rename to lib/pytz-old/zoneinfo/Africa/Harare.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Johannesburg b/lib/pytz-old/zoneinfo/Africa/Johannesburg
new file mode 100644
index 0000000..ddf3652
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Johannesburg differ
diff --git a/lib/pytz/zoneinfo/Africa/Johannesburg.py b/lib/pytz-old/zoneinfo/Africa/Johannesburg.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Johannesburg.py
rename to lib/pytz-old/zoneinfo/Africa/Johannesburg.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Juba b/lib/pytz-old/zoneinfo/Africa/Juba
new file mode 100644
index 0000000..3629188
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Juba differ
diff --git a/lib/pytz-old/zoneinfo/Africa/Kampala b/lib/pytz-old/zoneinfo/Africa/Kampala
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Kampala differ
diff --git a/lib/pytz/zoneinfo/Africa/Kampala.py b/lib/pytz-old/zoneinfo/Africa/Kampala.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Kampala.py
rename to lib/pytz-old/zoneinfo/Africa/Kampala.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Khartoum b/lib/pytz-old/zoneinfo/Africa/Khartoum
new file mode 100644
index 0000000..3629188
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Khartoum differ
diff --git a/lib/pytz/zoneinfo/Africa/Khartoum.py b/lib/pytz-old/zoneinfo/Africa/Khartoum.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Khartoum.py
rename to lib/pytz-old/zoneinfo/Africa/Khartoum.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Kigali b/lib/pytz-old/zoneinfo/Africa/Kigali
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Kigali differ
diff --git a/lib/pytz/zoneinfo/Africa/Kigali.py b/lib/pytz-old/zoneinfo/Africa/Kigali.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Kigali.py
rename to lib/pytz-old/zoneinfo/Africa/Kigali.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Kinshasa b/lib/pytz-old/zoneinfo/Africa/Kinshasa
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Kinshasa differ
diff --git a/lib/pytz/zoneinfo/Africa/Kinshasa.py b/lib/pytz-old/zoneinfo/Africa/Kinshasa.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Kinshasa.py
rename to lib/pytz-old/zoneinfo/Africa/Kinshasa.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Lagos b/lib/pytz-old/zoneinfo/Africa/Lagos
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Lagos differ
diff --git a/lib/pytz/zoneinfo/Africa/Lagos.py b/lib/pytz-old/zoneinfo/Africa/Lagos.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Lagos.py
rename to lib/pytz-old/zoneinfo/Africa/Lagos.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Libreville b/lib/pytz-old/zoneinfo/Africa/Libreville
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Libreville differ
diff --git a/lib/pytz/zoneinfo/Africa/Libreville.py b/lib/pytz-old/zoneinfo/Africa/Libreville.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Libreville.py
rename to lib/pytz-old/zoneinfo/Africa/Libreville.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Lome b/lib/pytz-old/zoneinfo/Africa/Lome
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Lome differ
diff --git a/lib/pytz/zoneinfo/Africa/Lome.py b/lib/pytz-old/zoneinfo/Africa/Lome.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Lome.py
rename to lib/pytz-old/zoneinfo/Africa/Lome.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Luanda b/lib/pytz-old/zoneinfo/Africa/Luanda
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Luanda differ
diff --git a/lib/pytz/zoneinfo/Africa/Luanda.py b/lib/pytz-old/zoneinfo/Africa/Luanda.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Luanda.py
rename to lib/pytz-old/zoneinfo/Africa/Luanda.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Lubumbashi b/lib/pytz-old/zoneinfo/Africa/Lubumbashi
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Lubumbashi differ
diff --git a/lib/pytz/zoneinfo/Africa/Lubumbashi.py b/lib/pytz-old/zoneinfo/Africa/Lubumbashi.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Lubumbashi.py
rename to lib/pytz-old/zoneinfo/Africa/Lubumbashi.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Lusaka b/lib/pytz-old/zoneinfo/Africa/Lusaka
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Lusaka differ
diff --git a/lib/pytz/zoneinfo/Africa/Lusaka.py b/lib/pytz-old/zoneinfo/Africa/Lusaka.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Lusaka.py
rename to lib/pytz-old/zoneinfo/Africa/Lusaka.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Malabo b/lib/pytz-old/zoneinfo/Africa/Malabo
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Malabo differ
diff --git a/lib/pytz/zoneinfo/Africa/Malabo.py b/lib/pytz-old/zoneinfo/Africa/Malabo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Malabo.py
rename to lib/pytz-old/zoneinfo/Africa/Malabo.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Maputo b/lib/pytz-old/zoneinfo/Africa/Maputo
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Maputo differ
diff --git a/lib/pytz/zoneinfo/Africa/Maputo.py b/lib/pytz-old/zoneinfo/Africa/Maputo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Maputo.py
rename to lib/pytz-old/zoneinfo/Africa/Maputo.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Maseru b/lib/pytz-old/zoneinfo/Africa/Maseru
new file mode 100644
index 0000000..ddf3652
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Maseru differ
diff --git a/lib/pytz/zoneinfo/Africa/Maseru.py b/lib/pytz-old/zoneinfo/Africa/Maseru.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Maseru.py
rename to lib/pytz-old/zoneinfo/Africa/Maseru.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Mbabane b/lib/pytz-old/zoneinfo/Africa/Mbabane
new file mode 100644
index 0000000..ddf3652
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Mbabane differ
diff --git a/lib/pytz/zoneinfo/Africa/Mbabane.py b/lib/pytz-old/zoneinfo/Africa/Mbabane.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Mbabane.py
rename to lib/pytz-old/zoneinfo/Africa/Mbabane.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Mogadishu b/lib/pytz-old/zoneinfo/Africa/Mogadishu
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Mogadishu differ
diff --git a/lib/pytz/zoneinfo/Africa/Mogadishu.py b/lib/pytz-old/zoneinfo/Africa/Mogadishu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Mogadishu.py
rename to lib/pytz-old/zoneinfo/Africa/Mogadishu.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Monrovia b/lib/pytz-old/zoneinfo/Africa/Monrovia
new file mode 100644
index 0000000..0f2294e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Monrovia differ
diff --git a/lib/pytz/zoneinfo/Africa/Monrovia.py b/lib/pytz-old/zoneinfo/Africa/Monrovia.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Monrovia.py
rename to lib/pytz-old/zoneinfo/Africa/Monrovia.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Nairobi b/lib/pytz-old/zoneinfo/Africa/Nairobi
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Nairobi differ
diff --git a/lib/pytz/zoneinfo/Africa/Nairobi.py b/lib/pytz-old/zoneinfo/Africa/Nairobi.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Nairobi.py
rename to lib/pytz-old/zoneinfo/Africa/Nairobi.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Ndjamena b/lib/pytz-old/zoneinfo/Africa/Ndjamena
new file mode 100644
index 0000000..bbfe19d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Ndjamena differ
diff --git a/lib/pytz/zoneinfo/Africa/Ndjamena.py b/lib/pytz-old/zoneinfo/Africa/Ndjamena.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Ndjamena.py
rename to lib/pytz-old/zoneinfo/Africa/Ndjamena.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Niamey b/lib/pytz-old/zoneinfo/Africa/Niamey
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Niamey differ
diff --git a/lib/pytz/zoneinfo/Africa/Niamey.py b/lib/pytz-old/zoneinfo/Africa/Niamey.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Niamey.py
rename to lib/pytz-old/zoneinfo/Africa/Niamey.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Nouakchott b/lib/pytz-old/zoneinfo/Africa/Nouakchott
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Nouakchott differ
diff --git a/lib/pytz/zoneinfo/Africa/Nouakchott.py b/lib/pytz-old/zoneinfo/Africa/Nouakchott.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Nouakchott.py
rename to lib/pytz-old/zoneinfo/Africa/Nouakchott.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Ouagadougou b/lib/pytz-old/zoneinfo/Africa/Ouagadougou
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Ouagadougou differ
diff --git a/lib/pytz/zoneinfo/Africa/Ouagadougou.py b/lib/pytz-old/zoneinfo/Africa/Ouagadougou.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Ouagadougou.py
rename to lib/pytz-old/zoneinfo/Africa/Ouagadougou.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Porto-Novo b/lib/pytz-old/zoneinfo/Africa/Porto-Novo
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Porto-Novo differ
diff --git a/lib/pytz/zoneinfo/Africa/Porto_minus_Novo.py b/lib/pytz-old/zoneinfo/Africa/Porto_minus_Novo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Porto_minus_Novo.py
rename to lib/pytz-old/zoneinfo/Africa/Porto_minus_Novo.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Sao_Tome b/lib/pytz-old/zoneinfo/Africa/Sao_Tome
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Sao_Tome differ
diff --git a/lib/pytz/zoneinfo/Africa/Sao_Tome.py b/lib/pytz-old/zoneinfo/Africa/Sao_Tome.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Sao_Tome.py
rename to lib/pytz-old/zoneinfo/Africa/Sao_Tome.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Timbuktu b/lib/pytz-old/zoneinfo/Africa/Timbuktu
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Timbuktu differ
diff --git a/lib/pytz/zoneinfo/Africa/Timbuktu.py b/lib/pytz-old/zoneinfo/Africa/Timbuktu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Timbuktu.py
rename to lib/pytz-old/zoneinfo/Africa/Timbuktu.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Tripoli b/lib/pytz-old/zoneinfo/Africa/Tripoli
new file mode 100644
index 0000000..b32e220
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Tripoli differ
diff --git a/lib/pytz/zoneinfo/Africa/Tripoli.py b/lib/pytz-old/zoneinfo/Africa/Tripoli.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Tripoli.py
rename to lib/pytz-old/zoneinfo/Africa/Tripoli.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Tunis b/lib/pytz-old/zoneinfo/Africa/Tunis
new file mode 100644
index 0000000..4bd3885
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Tunis differ
diff --git a/lib/pytz/zoneinfo/Africa/Tunis.py b/lib/pytz-old/zoneinfo/Africa/Tunis.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Tunis.py
rename to lib/pytz-old/zoneinfo/Africa/Tunis.py
diff --git a/lib/pytz-old/zoneinfo/Africa/Windhoek b/lib/pytz-old/zoneinfo/Africa/Windhoek
new file mode 100644
index 0000000..33bdfdf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Africa/Windhoek differ
diff --git a/lib/pytz/zoneinfo/Africa/Windhoek.py b/lib/pytz-old/zoneinfo/Africa/Windhoek.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/Windhoek.py
rename to lib/pytz-old/zoneinfo/Africa/Windhoek.py
diff --git a/lib/pytz/zoneinfo/Africa/__init__.py b/lib/pytz-old/zoneinfo/Africa/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Africa/__init__.py
rename to lib/pytz-old/zoneinfo/Africa/__init__.py
diff --git a/lib/pytz-old/zoneinfo/America/Adak b/lib/pytz-old/zoneinfo/America/Adak
new file mode 100644
index 0000000..b0a5dd6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Adak differ
diff --git a/lib/pytz/zoneinfo/America/Adak.py b/lib/pytz-old/zoneinfo/America/Adak.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Adak.py
rename to lib/pytz-old/zoneinfo/America/Adak.py
diff --git a/lib/pytz-old/zoneinfo/America/Anchorage b/lib/pytz-old/zoneinfo/America/Anchorage
new file mode 100644
index 0000000..a4627ca
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Anchorage differ
diff --git a/lib/pytz/zoneinfo/America/Anchorage.py b/lib/pytz-old/zoneinfo/America/Anchorage.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Anchorage.py
rename to lib/pytz-old/zoneinfo/America/Anchorage.py
diff --git a/lib/pytz-old/zoneinfo/America/Anguilla b/lib/pytz-old/zoneinfo/America/Anguilla
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Anguilla differ
diff --git a/lib/pytz/zoneinfo/America/Anguilla.py b/lib/pytz-old/zoneinfo/America/Anguilla.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Anguilla.py
rename to lib/pytz-old/zoneinfo/America/Anguilla.py
diff --git a/lib/pytz-old/zoneinfo/America/Antigua b/lib/pytz-old/zoneinfo/America/Antigua
new file mode 100644
index 0000000..66ab147
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Antigua differ
diff --git a/lib/pytz/zoneinfo/America/Antigua.py b/lib/pytz-old/zoneinfo/America/Antigua.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Antigua.py
rename to lib/pytz-old/zoneinfo/America/Antigua.py
diff --git a/lib/pytz-old/zoneinfo/America/Araguaina b/lib/pytz-old/zoneinfo/America/Araguaina
new file mode 100644
index 0000000..507ea46
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Araguaina differ
diff --git a/lib/pytz/zoneinfo/America/Araguaina.py b/lib/pytz-old/zoneinfo/America/Araguaina.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Araguaina.py
rename to lib/pytz-old/zoneinfo/America/Araguaina.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Buenos_Aires b/lib/pytz-old/zoneinfo/America/Argentina/Buenos_Aires
new file mode 100644
index 0000000..a1fae8c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Buenos_Aires differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires.py b/lib/pytz-old/zoneinfo/America/Argentina/Buenos_Aires.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Buenos_Aires.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Buenos_Aires.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Catamarca b/lib/pytz-old/zoneinfo/America/Argentina/Catamarca
new file mode 100644
index 0000000..7cbc9f4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Catamarca differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Catamarca.py b/lib/pytz-old/zoneinfo/America/Argentina/Catamarca.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Catamarca.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Catamarca.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/ComodRivadavia b/lib/pytz-old/zoneinfo/America/Argentina/ComodRivadavia
new file mode 100644
index 0000000..7cbc9f4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/ComodRivadavia differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia.py b/lib/pytz-old/zoneinfo/America/Argentina/ComodRivadavia.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/ComodRivadavia.py
rename to lib/pytz-old/zoneinfo/America/Argentina/ComodRivadavia.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Cordoba b/lib/pytz-old/zoneinfo/America/Argentina/Cordoba
new file mode 100644
index 0000000..cd97a24
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Cordoba differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Cordoba.py b/lib/pytz-old/zoneinfo/America/Argentina/Cordoba.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Cordoba.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Cordoba.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Jujuy b/lib/pytz-old/zoneinfo/America/Argentina/Jujuy
new file mode 100644
index 0000000..7be3eeb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Jujuy differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Jujuy.py b/lib/pytz-old/zoneinfo/America/Argentina/Jujuy.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Jujuy.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Jujuy.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/La_Rioja b/lib/pytz-old/zoneinfo/America/Argentina/La_Rioja
new file mode 100644
index 0000000..1296ed4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/La_Rioja differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/La_Rioja.py b/lib/pytz-old/zoneinfo/America/Argentina/La_Rioja.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/La_Rioja.py
rename to lib/pytz-old/zoneinfo/America/Argentina/La_Rioja.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Mendoza b/lib/pytz-old/zoneinfo/America/Argentina/Mendoza
new file mode 100644
index 0000000..f9eb526
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Mendoza differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Mendoza.py b/lib/pytz-old/zoneinfo/America/Argentina/Mendoza.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Mendoza.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Mendoza.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Rio_Gallegos b/lib/pytz-old/zoneinfo/America/Argentina/Rio_Gallegos
new file mode 100644
index 0000000..8fd203d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Rio_Gallegos differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos.py b/lib/pytz-old/zoneinfo/America/Argentina/Rio_Gallegos.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Rio_Gallegos.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Salta b/lib/pytz-old/zoneinfo/America/Argentina/Salta
new file mode 100644
index 0000000..5778059
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Salta differ
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/San_Juan b/lib/pytz-old/zoneinfo/America/Argentina/San_Juan
new file mode 100644
index 0000000..8670279
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/San_Juan differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/San_Juan.py b/lib/pytz-old/zoneinfo/America/Argentina/San_Juan.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/San_Juan.py
rename to lib/pytz-old/zoneinfo/America/Argentina/San_Juan.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/San_Luis b/lib/pytz-old/zoneinfo/America/Argentina/San_Luis
new file mode 100644
index 0000000..51eb1d8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/San_Luis differ
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Tucuman b/lib/pytz-old/zoneinfo/America/Argentina/Tucuman
new file mode 100644
index 0000000..694093e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Tucuman differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Tucuman.py b/lib/pytz-old/zoneinfo/America/Argentina/Tucuman.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Tucuman.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Tucuman.py
diff --git a/lib/pytz-old/zoneinfo/America/Argentina/Ushuaia b/lib/pytz-old/zoneinfo/America/Argentina/Ushuaia
new file mode 100644
index 0000000..dc42621
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Argentina/Ushuaia differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Ushuaia.py b/lib/pytz-old/zoneinfo/America/Argentina/Ushuaia.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/Ushuaia.py
rename to lib/pytz-old/zoneinfo/America/Argentina/Ushuaia.py
diff --git a/lib/pytz/zoneinfo/America/Argentina/__init__.py b/lib/pytz-old/zoneinfo/America/Argentina/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Argentina/__init__.py
rename to lib/pytz-old/zoneinfo/America/Argentina/__init__.py
diff --git a/lib/pytz-old/zoneinfo/America/Aruba b/lib/pytz-old/zoneinfo/America/Aruba
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Aruba differ
diff --git a/lib/pytz/zoneinfo/America/Aruba.py b/lib/pytz-old/zoneinfo/America/Aruba.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Aruba.py
rename to lib/pytz-old/zoneinfo/America/Aruba.py
diff --git a/lib/pytz-old/zoneinfo/America/Asuncion b/lib/pytz-old/zoneinfo/America/Asuncion
new file mode 100644
index 0000000..79541fd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Asuncion differ
diff --git a/lib/pytz/zoneinfo/America/Asuncion.py b/lib/pytz-old/zoneinfo/America/Asuncion.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Asuncion.py
rename to lib/pytz-old/zoneinfo/America/Asuncion.py
diff --git a/lib/pytz-old/zoneinfo/America/Atikokan b/lib/pytz-old/zoneinfo/America/Atikokan
new file mode 100644
index 0000000..5708b55
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Atikokan differ
diff --git a/lib/pytz/zoneinfo/America/Atikokan.py b/lib/pytz-old/zoneinfo/America/Atikokan.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Atikokan.py
rename to lib/pytz-old/zoneinfo/America/Atikokan.py
diff --git a/lib/pytz-old/zoneinfo/America/Atka b/lib/pytz-old/zoneinfo/America/Atka
new file mode 100644
index 0000000..b0a5dd6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Atka differ
diff --git a/lib/pytz/zoneinfo/America/Atka.py b/lib/pytz-old/zoneinfo/America/Atka.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Atka.py
rename to lib/pytz-old/zoneinfo/America/Atka.py
diff --git a/lib/pytz-old/zoneinfo/America/Bahia b/lib/pytz-old/zoneinfo/America/Bahia
new file mode 100644
index 0000000..3b59958
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Bahia differ
diff --git a/lib/pytz/zoneinfo/America/Bahia.py b/lib/pytz-old/zoneinfo/America/Bahia.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Bahia.py
rename to lib/pytz-old/zoneinfo/America/Bahia.py
diff --git a/lib/pytz-old/zoneinfo/America/Bahia_Banderas b/lib/pytz-old/zoneinfo/America/Bahia_Banderas
new file mode 100644
index 0000000..21e2b71
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Bahia_Banderas differ
diff --git a/lib/pytz-old/zoneinfo/America/Barbados b/lib/pytz-old/zoneinfo/America/Barbados
new file mode 100644
index 0000000..6339936
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Barbados differ
diff --git a/lib/pytz/zoneinfo/America/Barbados.py b/lib/pytz-old/zoneinfo/America/Barbados.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Barbados.py
rename to lib/pytz-old/zoneinfo/America/Barbados.py
diff --git a/lib/pytz-old/zoneinfo/America/Belem b/lib/pytz-old/zoneinfo/America/Belem
new file mode 100644
index 0000000..d85c0f7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Belem differ
diff --git a/lib/pytz/zoneinfo/America/Belem.py b/lib/pytz-old/zoneinfo/America/Belem.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Belem.py
rename to lib/pytz-old/zoneinfo/America/Belem.py
diff --git a/lib/pytz-old/zoneinfo/America/Belize b/lib/pytz-old/zoneinfo/America/Belize
new file mode 100644
index 0000000..eada52e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Belize differ
diff --git a/lib/pytz/zoneinfo/America/Belize.py b/lib/pytz-old/zoneinfo/America/Belize.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Belize.py
rename to lib/pytz-old/zoneinfo/America/Belize.py
diff --git a/lib/pytz-old/zoneinfo/America/Blanc-Sablon b/lib/pytz-old/zoneinfo/America/Blanc-Sablon
new file mode 100644
index 0000000..abcde7d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Blanc-Sablon differ
diff --git a/lib/pytz/zoneinfo/America/Blanc_minus_Sablon.py b/lib/pytz-old/zoneinfo/America/Blanc_minus_Sablon.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Blanc_minus_Sablon.py
rename to lib/pytz-old/zoneinfo/America/Blanc_minus_Sablon.py
diff --git a/lib/pytz-old/zoneinfo/America/Boa_Vista b/lib/pytz-old/zoneinfo/America/Boa_Vista
new file mode 100644
index 0000000..2466a25
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Boa_Vista differ
diff --git a/lib/pytz/zoneinfo/America/Boa_Vista.py b/lib/pytz-old/zoneinfo/America/Boa_Vista.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Boa_Vista.py
rename to lib/pytz-old/zoneinfo/America/Boa_Vista.py
diff --git a/lib/pytz-old/zoneinfo/America/Bogota b/lib/pytz-old/zoneinfo/America/Bogota
new file mode 100644
index 0000000..7a5a445
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Bogota differ
diff --git a/lib/pytz/zoneinfo/America/Bogota.py b/lib/pytz-old/zoneinfo/America/Bogota.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Bogota.py
rename to lib/pytz-old/zoneinfo/America/Bogota.py
diff --git a/lib/pytz-old/zoneinfo/America/Boise b/lib/pytz-old/zoneinfo/America/Boise
new file mode 100644
index 0000000..ada6d64
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Boise differ
diff --git a/lib/pytz/zoneinfo/America/Boise.py b/lib/pytz-old/zoneinfo/America/Boise.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Boise.py
rename to lib/pytz-old/zoneinfo/America/Boise.py
diff --git a/lib/pytz-old/zoneinfo/America/Buenos_Aires b/lib/pytz-old/zoneinfo/America/Buenos_Aires
new file mode 100644
index 0000000..a1fae8c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Buenos_Aires differ
diff --git a/lib/pytz/zoneinfo/America/Buenos_Aires.py b/lib/pytz-old/zoneinfo/America/Buenos_Aires.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Buenos_Aires.py
rename to lib/pytz-old/zoneinfo/America/Buenos_Aires.py
diff --git a/lib/pytz-old/zoneinfo/America/Cambridge_Bay b/lib/pytz-old/zoneinfo/America/Cambridge_Bay
new file mode 100644
index 0000000..58e21ba
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Cambridge_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Cambridge_Bay.py b/lib/pytz-old/zoneinfo/America/Cambridge_Bay.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Cambridge_Bay.py
rename to lib/pytz-old/zoneinfo/America/Cambridge_Bay.py
diff --git a/lib/pytz-old/zoneinfo/America/Campo_Grande b/lib/pytz-old/zoneinfo/America/Campo_Grande
new file mode 100644
index 0000000..d810ae5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Campo_Grande differ
diff --git a/lib/pytz/zoneinfo/America/Campo_Grande.py b/lib/pytz-old/zoneinfo/America/Campo_Grande.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Campo_Grande.py
rename to lib/pytz-old/zoneinfo/America/Campo_Grande.py
diff --git a/lib/pytz-old/zoneinfo/America/Cancun b/lib/pytz-old/zoneinfo/America/Cancun
new file mode 100644
index 0000000..a99eedd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Cancun differ
diff --git a/lib/pytz/zoneinfo/America/Cancun.py b/lib/pytz-old/zoneinfo/America/Cancun.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Cancun.py
rename to lib/pytz-old/zoneinfo/America/Cancun.py
diff --git a/lib/pytz-old/zoneinfo/America/Caracas b/lib/pytz-old/zoneinfo/America/Caracas
new file mode 100644
index 0000000..15b9a52
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Caracas differ
diff --git a/lib/pytz/zoneinfo/America/Caracas.py b/lib/pytz-old/zoneinfo/America/Caracas.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Caracas.py
rename to lib/pytz-old/zoneinfo/America/Caracas.py
diff --git a/lib/pytz-old/zoneinfo/America/Catamarca b/lib/pytz-old/zoneinfo/America/Catamarca
new file mode 100644
index 0000000..7cbc9f4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Catamarca differ
diff --git a/lib/pytz/zoneinfo/America/Catamarca.py b/lib/pytz-old/zoneinfo/America/Catamarca.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Catamarca.py
rename to lib/pytz-old/zoneinfo/America/Catamarca.py
diff --git a/lib/pytz-old/zoneinfo/America/Cayenne b/lib/pytz-old/zoneinfo/America/Cayenne
new file mode 100644
index 0000000..bffe9b0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Cayenne differ
diff --git a/lib/pytz/zoneinfo/America/Cayenne.py b/lib/pytz-old/zoneinfo/America/Cayenne.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Cayenne.py
rename to lib/pytz-old/zoneinfo/America/Cayenne.py
diff --git a/lib/pytz-old/zoneinfo/America/Cayman b/lib/pytz-old/zoneinfo/America/Cayman
new file mode 100644
index 0000000..0eb14b7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Cayman differ
diff --git a/lib/pytz/zoneinfo/America/Cayman.py b/lib/pytz-old/zoneinfo/America/Cayman.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Cayman.py
rename to lib/pytz-old/zoneinfo/America/Cayman.py
diff --git a/lib/pytz-old/zoneinfo/America/Chicago b/lib/pytz-old/zoneinfo/America/Chicago
new file mode 100644
index 0000000..3dd8f0f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Chicago differ
diff --git a/lib/pytz/zoneinfo/America/Chicago.py b/lib/pytz-old/zoneinfo/America/Chicago.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Chicago.py
rename to lib/pytz-old/zoneinfo/America/Chicago.py
diff --git a/lib/pytz-old/zoneinfo/America/Chihuahua b/lib/pytz-old/zoneinfo/America/Chihuahua
new file mode 100644
index 0000000..e3adbdb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Chihuahua differ
diff --git a/lib/pytz/zoneinfo/America/Chihuahua.py b/lib/pytz-old/zoneinfo/America/Chihuahua.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Chihuahua.py
rename to lib/pytz-old/zoneinfo/America/Chihuahua.py
diff --git a/lib/pytz-old/zoneinfo/America/Coral_Harbour b/lib/pytz-old/zoneinfo/America/Coral_Harbour
new file mode 100644
index 0000000..5708b55
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Coral_Harbour differ
diff --git a/lib/pytz/zoneinfo/America/Coral_Harbour.py b/lib/pytz-old/zoneinfo/America/Coral_Harbour.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Coral_Harbour.py
rename to lib/pytz-old/zoneinfo/America/Coral_Harbour.py
diff --git a/lib/pytz-old/zoneinfo/America/Cordoba b/lib/pytz-old/zoneinfo/America/Cordoba
new file mode 100644
index 0000000..cd97a24
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Cordoba differ
diff --git a/lib/pytz/zoneinfo/America/Cordoba.py b/lib/pytz-old/zoneinfo/America/Cordoba.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Cordoba.py
rename to lib/pytz-old/zoneinfo/America/Cordoba.py
diff --git a/lib/pytz-old/zoneinfo/America/Costa_Rica b/lib/pytz-old/zoneinfo/America/Costa_Rica
new file mode 100644
index 0000000..c247133
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Costa_Rica differ
diff --git a/lib/pytz/zoneinfo/America/Costa_Rica.py b/lib/pytz-old/zoneinfo/America/Costa_Rica.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Costa_Rica.py
rename to lib/pytz-old/zoneinfo/America/Costa_Rica.py
diff --git a/lib/pytz-old/zoneinfo/America/Creston b/lib/pytz-old/zoneinfo/America/Creston
new file mode 100644
index 0000000..798f627
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Creston differ
diff --git a/lib/pytz-old/zoneinfo/America/Cuiaba b/lib/pytz-old/zoneinfo/America/Cuiaba
new file mode 100644
index 0000000..e3aec8c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Cuiaba differ
diff --git a/lib/pytz/zoneinfo/America/Cuiaba.py b/lib/pytz-old/zoneinfo/America/Cuiaba.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Cuiaba.py
rename to lib/pytz-old/zoneinfo/America/Cuiaba.py
diff --git a/lib/pytz-old/zoneinfo/America/Curacao b/lib/pytz-old/zoneinfo/America/Curacao
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Curacao differ
diff --git a/lib/pytz/zoneinfo/America/Curacao.py b/lib/pytz-old/zoneinfo/America/Curacao.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Curacao.py
rename to lib/pytz-old/zoneinfo/America/Curacao.py
diff --git a/lib/pytz-old/zoneinfo/America/Danmarkshavn b/lib/pytz-old/zoneinfo/America/Danmarkshavn
new file mode 100644
index 0000000..a8b58ad
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Danmarkshavn differ
diff --git a/lib/pytz/zoneinfo/America/Danmarkshavn.py b/lib/pytz-old/zoneinfo/America/Danmarkshavn.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Danmarkshavn.py
rename to lib/pytz-old/zoneinfo/America/Danmarkshavn.py
diff --git a/lib/pytz-old/zoneinfo/America/Dawson b/lib/pytz-old/zoneinfo/America/Dawson
new file mode 100644
index 0000000..61c9688
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Dawson differ
diff --git a/lib/pytz/zoneinfo/America/Dawson.py b/lib/pytz-old/zoneinfo/America/Dawson.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Dawson.py
rename to lib/pytz-old/zoneinfo/America/Dawson.py
diff --git a/lib/pytz-old/zoneinfo/America/Dawson_Creek b/lib/pytz-old/zoneinfo/America/Dawson_Creek
new file mode 100644
index 0000000..78f9076
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Dawson_Creek differ
diff --git a/lib/pytz/zoneinfo/America/Dawson_Creek.py b/lib/pytz-old/zoneinfo/America/Dawson_Creek.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Dawson_Creek.py
rename to lib/pytz-old/zoneinfo/America/Dawson_Creek.py
diff --git a/lib/pytz-old/zoneinfo/America/Denver b/lib/pytz-old/zoneinfo/America/Denver
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Denver differ
diff --git a/lib/pytz/zoneinfo/America/Denver.py b/lib/pytz-old/zoneinfo/America/Denver.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Denver.py
rename to lib/pytz-old/zoneinfo/America/Denver.py
diff --git a/lib/pytz-old/zoneinfo/America/Detroit b/lib/pytz-old/zoneinfo/America/Detroit
new file mode 100644
index 0000000..a123b33
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Detroit differ
diff --git a/lib/pytz/zoneinfo/America/Detroit.py b/lib/pytz-old/zoneinfo/America/Detroit.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Detroit.py
rename to lib/pytz-old/zoneinfo/America/Detroit.py
diff --git a/lib/pytz-old/zoneinfo/America/Dominica b/lib/pytz-old/zoneinfo/America/Dominica
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Dominica differ
diff --git a/lib/pytz/zoneinfo/America/Dominica.py b/lib/pytz-old/zoneinfo/America/Dominica.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Dominica.py
rename to lib/pytz-old/zoneinfo/America/Dominica.py
diff --git a/lib/pytz-old/zoneinfo/America/Edmonton b/lib/pytz-old/zoneinfo/America/Edmonton
new file mode 100644
index 0000000..d02fbcd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Edmonton differ
diff --git a/lib/pytz/zoneinfo/America/Edmonton.py b/lib/pytz-old/zoneinfo/America/Edmonton.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Edmonton.py
rename to lib/pytz-old/zoneinfo/America/Edmonton.py
diff --git a/lib/pytz-old/zoneinfo/America/Eirunepe b/lib/pytz-old/zoneinfo/America/Eirunepe
new file mode 100644
index 0000000..3359731
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Eirunepe differ
diff --git a/lib/pytz/zoneinfo/America/Eirunepe.py b/lib/pytz-old/zoneinfo/America/Eirunepe.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Eirunepe.py
rename to lib/pytz-old/zoneinfo/America/Eirunepe.py
diff --git a/lib/pytz-old/zoneinfo/America/El_Salvador b/lib/pytz-old/zoneinfo/America/El_Salvador
new file mode 100644
index 0000000..9b8bc7a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/El_Salvador differ
diff --git a/lib/pytz/zoneinfo/America/El_Salvador.py b/lib/pytz-old/zoneinfo/America/El_Salvador.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/El_Salvador.py
rename to lib/pytz-old/zoneinfo/America/El_Salvador.py
diff --git a/lib/pytz-old/zoneinfo/America/Ensenada b/lib/pytz-old/zoneinfo/America/Ensenada
new file mode 100644
index 0000000..1387475
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Ensenada differ
diff --git a/lib/pytz/zoneinfo/America/Ensenada.py b/lib/pytz-old/zoneinfo/America/Ensenada.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Ensenada.py
rename to lib/pytz-old/zoneinfo/America/Ensenada.py
diff --git a/lib/pytz-old/zoneinfo/America/Fort_Wayne b/lib/pytz-old/zoneinfo/America/Fort_Wayne
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Fort_Wayne differ
diff --git a/lib/pytz/zoneinfo/America/Fort_Wayne.py b/lib/pytz-old/zoneinfo/America/Fort_Wayne.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Fort_Wayne.py
rename to lib/pytz-old/zoneinfo/America/Fort_Wayne.py
diff --git a/lib/pytz-old/zoneinfo/America/Fortaleza b/lib/pytz-old/zoneinfo/America/Fortaleza
new file mode 100644
index 0000000..c0bcf4d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Fortaleza differ
diff --git a/lib/pytz/zoneinfo/America/Fortaleza.py b/lib/pytz-old/zoneinfo/America/Fortaleza.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Fortaleza.py
rename to lib/pytz-old/zoneinfo/America/Fortaleza.py
diff --git a/lib/pytz-old/zoneinfo/America/Glace_Bay b/lib/pytz-old/zoneinfo/America/Glace_Bay
new file mode 100644
index 0000000..f58522b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Glace_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Glace_Bay.py b/lib/pytz-old/zoneinfo/America/Glace_Bay.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Glace_Bay.py
rename to lib/pytz-old/zoneinfo/America/Glace_Bay.py
diff --git a/lib/pytz-old/zoneinfo/America/Godthab b/lib/pytz-old/zoneinfo/America/Godthab
new file mode 100644
index 0000000..111d9a8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Godthab differ
diff --git a/lib/pytz/zoneinfo/America/Godthab.py b/lib/pytz-old/zoneinfo/America/Godthab.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Godthab.py
rename to lib/pytz-old/zoneinfo/America/Godthab.py
diff --git a/lib/pytz-old/zoneinfo/America/Goose_Bay b/lib/pytz-old/zoneinfo/America/Goose_Bay
new file mode 100644
index 0000000..b4b945e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Goose_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Goose_Bay.py b/lib/pytz-old/zoneinfo/America/Goose_Bay.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Goose_Bay.py
rename to lib/pytz-old/zoneinfo/America/Goose_Bay.py
diff --git a/lib/pytz-old/zoneinfo/America/Grand_Turk b/lib/pytz-old/zoneinfo/America/Grand_Turk
new file mode 100644
index 0000000..331aeac
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Grand_Turk differ
diff --git a/lib/pytz/zoneinfo/America/Grand_Turk.py b/lib/pytz-old/zoneinfo/America/Grand_Turk.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Grand_Turk.py
rename to lib/pytz-old/zoneinfo/America/Grand_Turk.py
diff --git a/lib/pytz-old/zoneinfo/America/Grenada b/lib/pytz-old/zoneinfo/America/Grenada
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Grenada differ
diff --git a/lib/pytz/zoneinfo/America/Grenada.py b/lib/pytz-old/zoneinfo/America/Grenada.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Grenada.py
rename to lib/pytz-old/zoneinfo/America/Grenada.py
diff --git a/lib/pytz-old/zoneinfo/America/Guadeloupe b/lib/pytz-old/zoneinfo/America/Guadeloupe
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Guadeloupe differ
diff --git a/lib/pytz/zoneinfo/America/Guadeloupe.py b/lib/pytz-old/zoneinfo/America/Guadeloupe.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Guadeloupe.py
rename to lib/pytz-old/zoneinfo/America/Guadeloupe.py
diff --git a/lib/pytz-old/zoneinfo/America/Guatemala b/lib/pytz-old/zoneinfo/America/Guatemala
new file mode 100644
index 0000000..abf943b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Guatemala differ
diff --git a/lib/pytz/zoneinfo/America/Guatemala.py b/lib/pytz-old/zoneinfo/America/Guatemala.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Guatemala.py
rename to lib/pytz-old/zoneinfo/America/Guatemala.py
diff --git a/lib/pytz-old/zoneinfo/America/Guayaquil b/lib/pytz-old/zoneinfo/America/Guayaquil
new file mode 100644
index 0000000..0828904
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Guayaquil differ
diff --git a/lib/pytz/zoneinfo/America/Guayaquil.py b/lib/pytz-old/zoneinfo/America/Guayaquil.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Guayaquil.py
rename to lib/pytz-old/zoneinfo/America/Guayaquil.py
diff --git a/lib/pytz-old/zoneinfo/America/Guyana b/lib/pytz-old/zoneinfo/America/Guyana
new file mode 100644
index 0000000..036dbe0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Guyana differ
diff --git a/lib/pytz/zoneinfo/America/Guyana.py b/lib/pytz-old/zoneinfo/America/Guyana.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Guyana.py
rename to lib/pytz-old/zoneinfo/America/Guyana.py
diff --git a/lib/pytz-old/zoneinfo/America/Halifax b/lib/pytz-old/zoneinfo/America/Halifax
new file mode 100644
index 0000000..f86ece4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Halifax differ
diff --git a/lib/pytz/zoneinfo/America/Halifax.py b/lib/pytz-old/zoneinfo/America/Halifax.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Halifax.py
rename to lib/pytz-old/zoneinfo/America/Halifax.py
diff --git a/lib/pytz-old/zoneinfo/America/Havana b/lib/pytz-old/zoneinfo/America/Havana
new file mode 100644
index 0000000..1a58fcd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Havana differ
diff --git a/lib/pytz/zoneinfo/America/Havana.py b/lib/pytz-old/zoneinfo/America/Havana.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Havana.py
rename to lib/pytz-old/zoneinfo/America/Havana.py
diff --git a/lib/pytz-old/zoneinfo/America/Hermosillo b/lib/pytz-old/zoneinfo/America/Hermosillo
new file mode 100644
index 0000000..ec435c2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Hermosillo differ
diff --git a/lib/pytz/zoneinfo/America/Hermosillo.py b/lib/pytz-old/zoneinfo/America/Hermosillo.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Hermosillo.py
rename to lib/pytz-old/zoneinfo/America/Hermosillo.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Indianapolis b/lib/pytz-old/zoneinfo/America/Indiana/Indianapolis
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Indianapolis differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Indianapolis.py b/lib/pytz-old/zoneinfo/America/Indiana/Indianapolis.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/Indianapolis.py
rename to lib/pytz-old/zoneinfo/America/Indiana/Indianapolis.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Knox b/lib/pytz-old/zoneinfo/America/Indiana/Knox
new file mode 100644
index 0000000..cc785da
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Knox differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Knox.py b/lib/pytz-old/zoneinfo/America/Indiana/Knox.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/Knox.py
rename to lib/pytz-old/zoneinfo/America/Indiana/Knox.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Marengo b/lib/pytz-old/zoneinfo/America/Indiana/Marengo
new file mode 100644
index 0000000..a23d7b7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Marengo differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Marengo.py b/lib/pytz-old/zoneinfo/America/Indiana/Marengo.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/Marengo.py
rename to lib/pytz-old/zoneinfo/America/Indiana/Marengo.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Petersburg b/lib/pytz-old/zoneinfo/America/Indiana/Petersburg
new file mode 100644
index 0000000..f16cb30
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Petersburg differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Petersburg.py b/lib/pytz-old/zoneinfo/America/Indiana/Petersburg.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/Petersburg.py
rename to lib/pytz-old/zoneinfo/America/Indiana/Petersburg.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Tell_City b/lib/pytz-old/zoneinfo/America/Indiana/Tell_City
new file mode 100644
index 0000000..0250bf9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Tell_City differ
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Vevay b/lib/pytz-old/zoneinfo/America/Indiana/Vevay
new file mode 100644
index 0000000..e934de6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Vevay differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Vevay.py b/lib/pytz-old/zoneinfo/America/Indiana/Vevay.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/Vevay.py
rename to lib/pytz-old/zoneinfo/America/Indiana/Vevay.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Vincennes b/lib/pytz-old/zoneinfo/America/Indiana/Vincennes
new file mode 100644
index 0000000..adbdbee
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Vincennes differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Vincennes.py b/lib/pytz-old/zoneinfo/America/Indiana/Vincennes.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/Vincennes.py
rename to lib/pytz-old/zoneinfo/America/Indiana/Vincennes.py
diff --git a/lib/pytz-old/zoneinfo/America/Indiana/Winamac b/lib/pytz-old/zoneinfo/America/Indiana/Winamac
new file mode 100644
index 0000000..b34f7b2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indiana/Winamac differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/__init__.py b/lib/pytz-old/zoneinfo/America/Indiana/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indiana/__init__.py
rename to lib/pytz-old/zoneinfo/America/Indiana/__init__.py
diff --git a/lib/pytz-old/zoneinfo/America/Indianapolis b/lib/pytz-old/zoneinfo/America/Indianapolis
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Indianapolis differ
diff --git a/lib/pytz/zoneinfo/America/Indianapolis.py b/lib/pytz-old/zoneinfo/America/Indianapolis.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Indianapolis.py
rename to lib/pytz-old/zoneinfo/America/Indianapolis.py
diff --git a/lib/pytz-old/zoneinfo/America/Inuvik b/lib/pytz-old/zoneinfo/America/Inuvik
new file mode 100644
index 0000000..077fad4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Inuvik differ
diff --git a/lib/pytz/zoneinfo/America/Inuvik.py b/lib/pytz-old/zoneinfo/America/Inuvik.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Inuvik.py
rename to lib/pytz-old/zoneinfo/America/Inuvik.py
diff --git a/lib/pytz-old/zoneinfo/America/Iqaluit b/lib/pytz-old/zoneinfo/America/Iqaluit
new file mode 100644
index 0000000..e67b71f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Iqaluit differ
diff --git a/lib/pytz/zoneinfo/America/Iqaluit.py b/lib/pytz-old/zoneinfo/America/Iqaluit.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Iqaluit.py
rename to lib/pytz-old/zoneinfo/America/Iqaluit.py
diff --git a/lib/pytz-old/zoneinfo/America/Jamaica b/lib/pytz-old/zoneinfo/America/Jamaica
new file mode 100644
index 0000000..006689b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Jamaica differ
diff --git a/lib/pytz/zoneinfo/America/Jamaica.py b/lib/pytz-old/zoneinfo/America/Jamaica.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Jamaica.py
rename to lib/pytz-old/zoneinfo/America/Jamaica.py
diff --git a/lib/pytz-old/zoneinfo/America/Jujuy b/lib/pytz-old/zoneinfo/America/Jujuy
new file mode 100644
index 0000000..7be3eeb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Jujuy differ
diff --git a/lib/pytz/zoneinfo/America/Jujuy.py b/lib/pytz-old/zoneinfo/America/Jujuy.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Jujuy.py
rename to lib/pytz-old/zoneinfo/America/Jujuy.py
diff --git a/lib/pytz-old/zoneinfo/America/Juneau b/lib/pytz-old/zoneinfo/America/Juneau
new file mode 100644
index 0000000..ade50a8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Juneau differ
diff --git a/lib/pytz/zoneinfo/America/Juneau.py b/lib/pytz-old/zoneinfo/America/Juneau.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Juneau.py
rename to lib/pytz-old/zoneinfo/America/Juneau.py
diff --git a/lib/pytz-old/zoneinfo/America/Kentucky/Louisville b/lib/pytz-old/zoneinfo/America/Kentucky/Louisville
new file mode 100644
index 0000000..fdf2e88
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Kentucky/Louisville differ
diff --git a/lib/pytz/zoneinfo/America/Kentucky/Louisville.py b/lib/pytz-old/zoneinfo/America/Kentucky/Louisville.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Kentucky/Louisville.py
rename to lib/pytz-old/zoneinfo/America/Kentucky/Louisville.py
diff --git a/lib/pytz-old/zoneinfo/America/Kentucky/Monticello b/lib/pytz-old/zoneinfo/America/Kentucky/Monticello
new file mode 100644
index 0000000..60991aa
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Kentucky/Monticello differ
diff --git a/lib/pytz/zoneinfo/America/Kentucky/Monticello.py b/lib/pytz-old/zoneinfo/America/Kentucky/Monticello.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Kentucky/Monticello.py
rename to lib/pytz-old/zoneinfo/America/Kentucky/Monticello.py
diff --git a/lib/pytz/zoneinfo/America/Kentucky/__init__.py b/lib/pytz-old/zoneinfo/America/Kentucky/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Kentucky/__init__.py
rename to lib/pytz-old/zoneinfo/America/Kentucky/__init__.py
diff --git a/lib/pytz-old/zoneinfo/America/Knox_IN b/lib/pytz-old/zoneinfo/America/Knox_IN
new file mode 100644
index 0000000..cc785da
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Knox_IN differ
diff --git a/lib/pytz/zoneinfo/America/Knox_IN.py b/lib/pytz-old/zoneinfo/America/Knox_IN.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Knox_IN.py
rename to lib/pytz-old/zoneinfo/America/Knox_IN.py
diff --git a/lib/pytz-old/zoneinfo/America/Kralendijk b/lib/pytz-old/zoneinfo/America/Kralendijk
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Kralendijk differ
diff --git a/lib/pytz-old/zoneinfo/America/La_Paz b/lib/pytz-old/zoneinfo/America/La_Paz
new file mode 100644
index 0000000..cedf0b3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/La_Paz differ
diff --git a/lib/pytz/zoneinfo/America/La_Paz.py b/lib/pytz-old/zoneinfo/America/La_Paz.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/La_Paz.py
rename to lib/pytz-old/zoneinfo/America/La_Paz.py
diff --git a/lib/pytz-old/zoneinfo/America/Lima b/lib/pytz-old/zoneinfo/America/Lima
new file mode 100644
index 0000000..789fa5c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Lima differ
diff --git a/lib/pytz/zoneinfo/America/Lima.py b/lib/pytz-old/zoneinfo/America/Lima.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Lima.py
rename to lib/pytz-old/zoneinfo/America/Lima.py
diff --git a/lib/pytz-old/zoneinfo/America/Los_Angeles b/lib/pytz-old/zoneinfo/America/Los_Angeles
new file mode 100644
index 0000000..1fa9149
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Los_Angeles differ
diff --git a/lib/pytz/zoneinfo/America/Los_Angeles.py b/lib/pytz-old/zoneinfo/America/Los_Angeles.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Los_Angeles.py
rename to lib/pytz-old/zoneinfo/America/Los_Angeles.py
diff --git a/lib/pytz-old/zoneinfo/America/Louisville b/lib/pytz-old/zoneinfo/America/Louisville
new file mode 100644
index 0000000..fdf2e88
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Louisville differ
diff --git a/lib/pytz/zoneinfo/America/Louisville.py b/lib/pytz-old/zoneinfo/America/Louisville.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Louisville.py
rename to lib/pytz-old/zoneinfo/America/Louisville.py
diff --git a/lib/pytz-old/zoneinfo/America/Lower_Princes b/lib/pytz-old/zoneinfo/America/Lower_Princes
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Lower_Princes differ
diff --git a/lib/pytz-old/zoneinfo/America/Maceio b/lib/pytz-old/zoneinfo/America/Maceio
new file mode 100644
index 0000000..de74990
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Maceio differ
diff --git a/lib/pytz/zoneinfo/America/Maceio.py b/lib/pytz-old/zoneinfo/America/Maceio.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Maceio.py
rename to lib/pytz-old/zoneinfo/America/Maceio.py
diff --git a/lib/pytz-old/zoneinfo/America/Managua b/lib/pytz-old/zoneinfo/America/Managua
new file mode 100644
index 0000000..c543ffd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Managua differ
diff --git a/lib/pytz/zoneinfo/America/Managua.py b/lib/pytz-old/zoneinfo/America/Managua.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Managua.py
rename to lib/pytz-old/zoneinfo/America/Managua.py
diff --git a/lib/pytz-old/zoneinfo/America/Manaus b/lib/pytz-old/zoneinfo/America/Manaus
new file mode 100644
index 0000000..e0222f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Manaus differ
diff --git a/lib/pytz/zoneinfo/America/Manaus.py b/lib/pytz-old/zoneinfo/America/Manaus.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Manaus.py
rename to lib/pytz-old/zoneinfo/America/Manaus.py
diff --git a/lib/pytz-old/zoneinfo/America/Marigot b/lib/pytz-old/zoneinfo/America/Marigot
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Marigot differ
diff --git a/lib/pytz-old/zoneinfo/America/Martinique b/lib/pytz-old/zoneinfo/America/Martinique
new file mode 100644
index 0000000..f9e2399
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Martinique differ
diff --git a/lib/pytz/zoneinfo/America/Martinique.py b/lib/pytz-old/zoneinfo/America/Martinique.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Martinique.py
rename to lib/pytz-old/zoneinfo/America/Martinique.py
diff --git a/lib/pytz-old/zoneinfo/America/Matamoros b/lib/pytz-old/zoneinfo/America/Matamoros
new file mode 100644
index 0000000..5671d25
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Matamoros differ
diff --git a/lib/pytz-old/zoneinfo/America/Mazatlan b/lib/pytz-old/zoneinfo/America/Mazatlan
new file mode 100644
index 0000000..afa94c2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Mazatlan differ
diff --git a/lib/pytz/zoneinfo/America/Mazatlan.py b/lib/pytz-old/zoneinfo/America/Mazatlan.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Mazatlan.py
rename to lib/pytz-old/zoneinfo/America/Mazatlan.py
diff --git a/lib/pytz-old/zoneinfo/America/Mendoza b/lib/pytz-old/zoneinfo/America/Mendoza
new file mode 100644
index 0000000..f9eb526
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Mendoza differ
diff --git a/lib/pytz/zoneinfo/America/Mendoza.py b/lib/pytz-old/zoneinfo/America/Mendoza.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Mendoza.py
rename to lib/pytz-old/zoneinfo/America/Mendoza.py
diff --git a/lib/pytz-old/zoneinfo/America/Menominee b/lib/pytz-old/zoneinfo/America/Menominee
new file mode 100644
index 0000000..55d6e32
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Menominee differ
diff --git a/lib/pytz/zoneinfo/America/Menominee.py b/lib/pytz-old/zoneinfo/America/Menominee.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Menominee.py
rename to lib/pytz-old/zoneinfo/America/Menominee.py
diff --git a/lib/pytz-old/zoneinfo/America/Merida b/lib/pytz-old/zoneinfo/America/Merida
new file mode 100644
index 0000000..ecc1856
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Merida differ
diff --git a/lib/pytz/zoneinfo/America/Merida.py b/lib/pytz-old/zoneinfo/America/Merida.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Merida.py
rename to lib/pytz-old/zoneinfo/America/Merida.py
diff --git a/lib/pytz-old/zoneinfo/America/Metlakatla b/lib/pytz-old/zoneinfo/America/Metlakatla
new file mode 100644
index 0000000..e66cc34
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Metlakatla differ
diff --git a/lib/pytz-old/zoneinfo/America/Mexico_City b/lib/pytz-old/zoneinfo/America/Mexico_City
new file mode 100644
index 0000000..f11e3d2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Mexico_City differ
diff --git a/lib/pytz/zoneinfo/America/Mexico_City.py b/lib/pytz-old/zoneinfo/America/Mexico_City.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Mexico_City.py
rename to lib/pytz-old/zoneinfo/America/Mexico_City.py
diff --git a/lib/pytz-old/zoneinfo/America/Miquelon b/lib/pytz-old/zoneinfo/America/Miquelon
new file mode 100644
index 0000000..36f6696
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Miquelon differ
diff --git a/lib/pytz/zoneinfo/America/Miquelon.py b/lib/pytz-old/zoneinfo/America/Miquelon.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Miquelon.py
rename to lib/pytz-old/zoneinfo/America/Miquelon.py
diff --git a/lib/pytz-old/zoneinfo/America/Moncton b/lib/pytz-old/zoneinfo/America/Moncton
new file mode 100644
index 0000000..51cb1ba
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Moncton differ
diff --git a/lib/pytz/zoneinfo/America/Moncton.py b/lib/pytz-old/zoneinfo/America/Moncton.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Moncton.py
rename to lib/pytz-old/zoneinfo/America/Moncton.py
diff --git a/lib/pytz-old/zoneinfo/America/Monterrey b/lib/pytz-old/zoneinfo/America/Monterrey
new file mode 100644
index 0000000..dcac92b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Monterrey differ
diff --git a/lib/pytz/zoneinfo/America/Monterrey.py b/lib/pytz-old/zoneinfo/America/Monterrey.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Monterrey.py
rename to lib/pytz-old/zoneinfo/America/Monterrey.py
diff --git a/lib/pytz-old/zoneinfo/America/Montevideo b/lib/pytz-old/zoneinfo/America/Montevideo
new file mode 100644
index 0000000..ab3d680
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Montevideo differ
diff --git a/lib/pytz/zoneinfo/America/Montevideo.py b/lib/pytz-old/zoneinfo/America/Montevideo.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Montevideo.py
rename to lib/pytz-old/zoneinfo/America/Montevideo.py
diff --git a/lib/pytz-old/zoneinfo/America/Montreal b/lib/pytz-old/zoneinfo/America/Montreal
new file mode 100644
index 0000000..89b9f49
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Montreal differ
diff --git a/lib/pytz/zoneinfo/America/Montreal.py b/lib/pytz-old/zoneinfo/America/Montreal.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Montreal.py
rename to lib/pytz-old/zoneinfo/America/Montreal.py
diff --git a/lib/pytz-old/zoneinfo/America/Montserrat b/lib/pytz-old/zoneinfo/America/Montserrat
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Montserrat differ
diff --git a/lib/pytz/zoneinfo/America/Montserrat.py b/lib/pytz-old/zoneinfo/America/Montserrat.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Montserrat.py
rename to lib/pytz-old/zoneinfo/America/Montserrat.py
diff --git a/lib/pytz-old/zoneinfo/America/Nassau b/lib/pytz-old/zoneinfo/America/Nassau
new file mode 100644
index 0000000..e5d0289
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Nassau differ
diff --git a/lib/pytz/zoneinfo/America/Nassau.py b/lib/pytz-old/zoneinfo/America/Nassau.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Nassau.py
rename to lib/pytz-old/zoneinfo/America/Nassau.py
diff --git a/lib/pytz-old/zoneinfo/America/New_York b/lib/pytz-old/zoneinfo/America/New_York
new file mode 100644
index 0000000..7553fee
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/New_York differ
diff --git a/lib/pytz/zoneinfo/America/New_York.py b/lib/pytz-old/zoneinfo/America/New_York.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/New_York.py
rename to lib/pytz-old/zoneinfo/America/New_York.py
diff --git a/lib/pytz-old/zoneinfo/America/Nipigon b/lib/pytz-old/zoneinfo/America/Nipigon
new file mode 100644
index 0000000..f8a0292
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Nipigon differ
diff --git a/lib/pytz/zoneinfo/America/Nipigon.py b/lib/pytz-old/zoneinfo/America/Nipigon.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Nipigon.py
rename to lib/pytz-old/zoneinfo/America/Nipigon.py
diff --git a/lib/pytz-old/zoneinfo/America/Nome b/lib/pytz-old/zoneinfo/America/Nome
new file mode 100644
index 0000000..d370ab1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Nome differ
diff --git a/lib/pytz/zoneinfo/America/Nome.py b/lib/pytz-old/zoneinfo/America/Nome.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Nome.py
rename to lib/pytz-old/zoneinfo/America/Nome.py
diff --git a/lib/pytz-old/zoneinfo/America/Noronha b/lib/pytz-old/zoneinfo/America/Noronha
new file mode 100644
index 0000000..774b14e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Noronha differ
diff --git a/lib/pytz/zoneinfo/America/Noronha.py b/lib/pytz-old/zoneinfo/America/Noronha.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Noronha.py
rename to lib/pytz-old/zoneinfo/America/Noronha.py
diff --git a/lib/pytz-old/zoneinfo/America/North_Dakota/Beulah b/lib/pytz-old/zoneinfo/America/North_Dakota/Beulah
new file mode 100644
index 0000000..8174c88
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/North_Dakota/Beulah differ
diff --git a/lib/pytz-old/zoneinfo/America/North_Dakota/Center b/lib/pytz-old/zoneinfo/America/North_Dakota/Center
new file mode 100644
index 0000000..8035b24
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/North_Dakota/Center differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/Center.py b/lib/pytz-old/zoneinfo/America/North_Dakota/Center.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/North_Dakota/Center.py
rename to lib/pytz-old/zoneinfo/America/North_Dakota/Center.py
diff --git a/lib/pytz-old/zoneinfo/America/North_Dakota/New_Salem b/lib/pytz-old/zoneinfo/America/North_Dakota/New_Salem
new file mode 100644
index 0000000..5b630ee
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/North_Dakota/New_Salem differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/New_Salem.py b/lib/pytz-old/zoneinfo/America/North_Dakota/New_Salem.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/North_Dakota/New_Salem.py
rename to lib/pytz-old/zoneinfo/America/North_Dakota/New_Salem.py
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/__init__.py b/lib/pytz-old/zoneinfo/America/North_Dakota/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/North_Dakota/__init__.py
rename to lib/pytz-old/zoneinfo/America/North_Dakota/__init__.py
diff --git a/lib/pytz-old/zoneinfo/America/Ojinaga b/lib/pytz-old/zoneinfo/America/Ojinaga
new file mode 100644
index 0000000..190c5c8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Ojinaga differ
diff --git a/lib/pytz-old/zoneinfo/America/Panama b/lib/pytz-old/zoneinfo/America/Panama
new file mode 100644
index 0000000..5c1c063
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Panama differ
diff --git a/lib/pytz/zoneinfo/America/Panama.py b/lib/pytz-old/zoneinfo/America/Panama.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Panama.py
rename to lib/pytz-old/zoneinfo/America/Panama.py
diff --git a/lib/pytz-old/zoneinfo/America/Pangnirtung b/lib/pytz-old/zoneinfo/America/Pangnirtung
new file mode 100644
index 0000000..994da43
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Pangnirtung differ
diff --git a/lib/pytz/zoneinfo/America/Pangnirtung.py b/lib/pytz-old/zoneinfo/America/Pangnirtung.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Pangnirtung.py
rename to lib/pytz-old/zoneinfo/America/Pangnirtung.py
diff --git a/lib/pytz-old/zoneinfo/America/Paramaribo b/lib/pytz-old/zoneinfo/America/Paramaribo
new file mode 100644
index 0000000..2f05b23
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Paramaribo differ
diff --git a/lib/pytz/zoneinfo/America/Paramaribo.py b/lib/pytz-old/zoneinfo/America/Paramaribo.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Paramaribo.py
rename to lib/pytz-old/zoneinfo/America/Paramaribo.py
diff --git a/lib/pytz-old/zoneinfo/America/Phoenix b/lib/pytz-old/zoneinfo/America/Phoenix
new file mode 100644
index 0000000..adf2823
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Phoenix differ
diff --git a/lib/pytz/zoneinfo/America/Phoenix.py b/lib/pytz-old/zoneinfo/America/Phoenix.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Phoenix.py
rename to lib/pytz-old/zoneinfo/America/Phoenix.py
diff --git a/lib/pytz-old/zoneinfo/America/Port-au-Prince b/lib/pytz-old/zoneinfo/America/Port-au-Prince
new file mode 100644
index 0000000..dd8895c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Port-au-Prince differ
diff --git a/lib/pytz/zoneinfo/America/Port_minus_au_minus_Prince.py b/lib/pytz-old/zoneinfo/America/Port_minus_au_minus_Prince.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Port_minus_au_minus_Prince.py
rename to lib/pytz-old/zoneinfo/America/Port_minus_au_minus_Prince.py
diff --git a/lib/pytz-old/zoneinfo/America/Port_of_Spain b/lib/pytz-old/zoneinfo/America/Port_of_Spain
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Port_of_Spain differ
diff --git a/lib/pytz/zoneinfo/America/Port_of_Spain.py b/lib/pytz-old/zoneinfo/America/Port_of_Spain.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Port_of_Spain.py
rename to lib/pytz-old/zoneinfo/America/Port_of_Spain.py
diff --git a/lib/pytz-old/zoneinfo/America/Porto_Acre b/lib/pytz-old/zoneinfo/America/Porto_Acre
new file mode 100644
index 0000000..788d0e9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Porto_Acre differ
diff --git a/lib/pytz/zoneinfo/America/Porto_Acre.py b/lib/pytz-old/zoneinfo/America/Porto_Acre.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Porto_Acre.py
rename to lib/pytz-old/zoneinfo/America/Porto_Acre.py
diff --git a/lib/pytz-old/zoneinfo/America/Porto_Velho b/lib/pytz-old/zoneinfo/America/Porto_Velho
new file mode 100644
index 0000000..aa8cf31
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Porto_Velho differ
diff --git a/lib/pytz/zoneinfo/America/Porto_Velho.py b/lib/pytz-old/zoneinfo/America/Porto_Velho.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Porto_Velho.py
rename to lib/pytz-old/zoneinfo/America/Porto_Velho.py
diff --git a/lib/pytz-old/zoneinfo/America/Puerto_Rico b/lib/pytz-old/zoneinfo/America/Puerto_Rico
new file mode 100644
index 0000000..d4525a6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Puerto_Rico differ
diff --git a/lib/pytz/zoneinfo/America/Puerto_Rico.py b/lib/pytz-old/zoneinfo/America/Puerto_Rico.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Puerto_Rico.py
rename to lib/pytz-old/zoneinfo/America/Puerto_Rico.py
diff --git a/lib/pytz-old/zoneinfo/America/Rainy_River b/lib/pytz-old/zoneinfo/America/Rainy_River
new file mode 100644
index 0000000..70dcd2d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Rainy_River differ
diff --git a/lib/pytz/zoneinfo/America/Rainy_River.py b/lib/pytz-old/zoneinfo/America/Rainy_River.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Rainy_River.py
rename to lib/pytz-old/zoneinfo/America/Rainy_River.py
diff --git a/lib/pytz-old/zoneinfo/America/Rankin_Inlet b/lib/pytz-old/zoneinfo/America/Rankin_Inlet
new file mode 100644
index 0000000..cc15d83
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Rankin_Inlet differ
diff --git a/lib/pytz/zoneinfo/America/Rankin_Inlet.py b/lib/pytz-old/zoneinfo/America/Rankin_Inlet.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Rankin_Inlet.py
rename to lib/pytz-old/zoneinfo/America/Rankin_Inlet.py
diff --git a/lib/pytz-old/zoneinfo/America/Recife b/lib/pytz-old/zoneinfo/America/Recife
new file mode 100644
index 0000000..f0ad7b9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Recife differ
diff --git a/lib/pytz/zoneinfo/America/Recife.py b/lib/pytz-old/zoneinfo/America/Recife.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Recife.py
rename to lib/pytz-old/zoneinfo/America/Recife.py
diff --git a/lib/pytz-old/zoneinfo/America/Regina b/lib/pytz-old/zoneinfo/America/Regina
new file mode 100644
index 0000000..5fe8d6b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Regina differ
diff --git a/lib/pytz/zoneinfo/America/Regina.py b/lib/pytz-old/zoneinfo/America/Regina.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Regina.py
rename to lib/pytz-old/zoneinfo/America/Regina.py
diff --git a/lib/pytz-old/zoneinfo/America/Resolute b/lib/pytz-old/zoneinfo/America/Resolute
new file mode 100644
index 0000000..5307941
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Resolute differ
diff --git a/lib/pytz-old/zoneinfo/America/Rio_Branco b/lib/pytz-old/zoneinfo/America/Rio_Branco
new file mode 100644
index 0000000..788d0e9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Rio_Branco differ
diff --git a/lib/pytz/zoneinfo/America/Rio_Branco.py b/lib/pytz-old/zoneinfo/America/Rio_Branco.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Rio_Branco.py
rename to lib/pytz-old/zoneinfo/America/Rio_Branco.py
diff --git a/lib/pytz-old/zoneinfo/America/Rosario b/lib/pytz-old/zoneinfo/America/Rosario
new file mode 100644
index 0000000..cd97a24
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Rosario differ
diff --git a/lib/pytz/zoneinfo/America/Rosario.py b/lib/pytz-old/zoneinfo/America/Rosario.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Rosario.py
rename to lib/pytz-old/zoneinfo/America/Rosario.py
diff --git a/lib/pytz-old/zoneinfo/America/Santa_Isabel b/lib/pytz-old/zoneinfo/America/Santa_Isabel
new file mode 100644
index 0000000..e1c4d16
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Santa_Isabel differ
diff --git a/lib/pytz-old/zoneinfo/America/Santarem b/lib/pytz-old/zoneinfo/America/Santarem
new file mode 100644
index 0000000..bb469d3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Santarem differ
diff --git a/lib/pytz-old/zoneinfo/America/Santiago b/lib/pytz-old/zoneinfo/America/Santiago
new file mode 100644
index 0000000..92cf559
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Santiago differ
diff --git a/lib/pytz/zoneinfo/America/Santiago.py b/lib/pytz-old/zoneinfo/America/Santiago.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Santiago.py
rename to lib/pytz-old/zoneinfo/America/Santiago.py
diff --git a/lib/pytz-old/zoneinfo/America/Santo_Domingo b/lib/pytz-old/zoneinfo/America/Santo_Domingo
new file mode 100644
index 0000000..77eab31
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Santo_Domingo differ
diff --git a/lib/pytz/zoneinfo/America/Santo_Domingo.py b/lib/pytz-old/zoneinfo/America/Santo_Domingo.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Santo_Domingo.py
rename to lib/pytz-old/zoneinfo/America/Santo_Domingo.py
diff --git a/lib/pytz-old/zoneinfo/America/Sao_Paulo b/lib/pytz-old/zoneinfo/America/Sao_Paulo
new file mode 100644
index 0000000..552ce7c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Sao_Paulo differ
diff --git a/lib/pytz/zoneinfo/America/Sao_Paulo.py b/lib/pytz-old/zoneinfo/America/Sao_Paulo.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Sao_Paulo.py
rename to lib/pytz-old/zoneinfo/America/Sao_Paulo.py
diff --git a/lib/pytz-old/zoneinfo/America/Scoresbysund b/lib/pytz-old/zoneinfo/America/Scoresbysund
new file mode 100644
index 0000000..85676ca
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Scoresbysund differ
diff --git a/lib/pytz/zoneinfo/America/Scoresbysund.py b/lib/pytz-old/zoneinfo/America/Scoresbysund.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Scoresbysund.py
rename to lib/pytz-old/zoneinfo/America/Scoresbysund.py
diff --git a/lib/pytz-old/zoneinfo/America/Shiprock b/lib/pytz-old/zoneinfo/America/Shiprock
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Shiprock differ
diff --git a/lib/pytz/zoneinfo/America/Shiprock.py b/lib/pytz-old/zoneinfo/America/Shiprock.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Shiprock.py
rename to lib/pytz-old/zoneinfo/America/Shiprock.py
diff --git a/lib/pytz-old/zoneinfo/America/Sitka b/lib/pytz-old/zoneinfo/America/Sitka
new file mode 100644
index 0000000..48fc6af
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Sitka differ
diff --git a/lib/pytz-old/zoneinfo/America/St_Barthelemy b/lib/pytz-old/zoneinfo/America/St_Barthelemy
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/St_Barthelemy differ
diff --git a/lib/pytz-old/zoneinfo/America/St_Johns b/lib/pytz-old/zoneinfo/America/St_Johns
new file mode 100644
index 0000000..a1d1485
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/St_Johns differ
diff --git a/lib/pytz/zoneinfo/America/St_Johns.py b/lib/pytz-old/zoneinfo/America/St_Johns.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/St_Johns.py
rename to lib/pytz-old/zoneinfo/America/St_Johns.py
diff --git a/lib/pytz-old/zoneinfo/America/St_Kitts b/lib/pytz-old/zoneinfo/America/St_Kitts
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/St_Kitts differ
diff --git a/lib/pytz/zoneinfo/America/St_Kitts.py b/lib/pytz-old/zoneinfo/America/St_Kitts.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/St_Kitts.py
rename to lib/pytz-old/zoneinfo/America/St_Kitts.py
diff --git a/lib/pytz-old/zoneinfo/America/St_Lucia b/lib/pytz-old/zoneinfo/America/St_Lucia
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/St_Lucia differ
diff --git a/lib/pytz/zoneinfo/America/St_Lucia.py b/lib/pytz-old/zoneinfo/America/St_Lucia.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/St_Lucia.py
rename to lib/pytz-old/zoneinfo/America/St_Lucia.py
diff --git a/lib/pytz-old/zoneinfo/America/St_Thomas b/lib/pytz-old/zoneinfo/America/St_Thomas
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/St_Thomas differ
diff --git a/lib/pytz/zoneinfo/America/St_Thomas.py b/lib/pytz-old/zoneinfo/America/St_Thomas.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/St_Thomas.py
rename to lib/pytz-old/zoneinfo/America/St_Thomas.py
diff --git a/lib/pytz-old/zoneinfo/America/St_Vincent b/lib/pytz-old/zoneinfo/America/St_Vincent
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/St_Vincent differ
diff --git a/lib/pytz/zoneinfo/America/St_Vincent.py b/lib/pytz-old/zoneinfo/America/St_Vincent.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/St_Vincent.py
rename to lib/pytz-old/zoneinfo/America/St_Vincent.py
diff --git a/lib/pytz-old/zoneinfo/America/Swift_Current b/lib/pytz-old/zoneinfo/America/Swift_Current
new file mode 100644
index 0000000..4db1300
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Swift_Current differ
diff --git a/lib/pytz/zoneinfo/America/Swift_Current.py b/lib/pytz-old/zoneinfo/America/Swift_Current.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Swift_Current.py
rename to lib/pytz-old/zoneinfo/America/Swift_Current.py
diff --git a/lib/pytz-old/zoneinfo/America/Tegucigalpa b/lib/pytz-old/zoneinfo/America/Tegucigalpa
new file mode 100644
index 0000000..7aea8f9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Tegucigalpa differ
diff --git a/lib/pytz/zoneinfo/America/Tegucigalpa.py b/lib/pytz-old/zoneinfo/America/Tegucigalpa.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Tegucigalpa.py
rename to lib/pytz-old/zoneinfo/America/Tegucigalpa.py
diff --git a/lib/pytz-old/zoneinfo/America/Thule b/lib/pytz-old/zoneinfo/America/Thule
new file mode 100644
index 0000000..deefcc8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Thule differ
diff --git a/lib/pytz/zoneinfo/America/Thule.py b/lib/pytz-old/zoneinfo/America/Thule.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Thule.py
rename to lib/pytz-old/zoneinfo/America/Thule.py
diff --git a/lib/pytz-old/zoneinfo/America/Thunder_Bay b/lib/pytz-old/zoneinfo/America/Thunder_Bay
new file mode 100644
index 0000000..aa1d486
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Thunder_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Thunder_Bay.py b/lib/pytz-old/zoneinfo/America/Thunder_Bay.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Thunder_Bay.py
rename to lib/pytz-old/zoneinfo/America/Thunder_Bay.py
diff --git a/lib/pytz-old/zoneinfo/America/Tijuana b/lib/pytz-old/zoneinfo/America/Tijuana
new file mode 100644
index 0000000..1387475
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Tijuana differ
diff --git a/lib/pytz/zoneinfo/America/Tijuana.py b/lib/pytz-old/zoneinfo/America/Tijuana.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Tijuana.py
rename to lib/pytz-old/zoneinfo/America/Tijuana.py
diff --git a/lib/pytz-old/zoneinfo/America/Toronto b/lib/pytz-old/zoneinfo/America/Toronto
new file mode 100644
index 0000000..7b4682a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Toronto differ
diff --git a/lib/pytz/zoneinfo/America/Toronto.py b/lib/pytz-old/zoneinfo/America/Toronto.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Toronto.py
rename to lib/pytz-old/zoneinfo/America/Toronto.py
diff --git a/lib/pytz-old/zoneinfo/America/Tortola b/lib/pytz-old/zoneinfo/America/Tortola
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Tortola differ
diff --git a/lib/pytz/zoneinfo/America/Tortola.py b/lib/pytz-old/zoneinfo/America/Tortola.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Tortola.py
rename to lib/pytz-old/zoneinfo/America/Tortola.py
diff --git a/lib/pytz-old/zoneinfo/America/Vancouver b/lib/pytz-old/zoneinfo/America/Vancouver
new file mode 100644
index 0000000..9b5d924
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Vancouver differ
diff --git a/lib/pytz/zoneinfo/America/Vancouver.py b/lib/pytz-old/zoneinfo/America/Vancouver.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Vancouver.py
rename to lib/pytz-old/zoneinfo/America/Vancouver.py
diff --git a/lib/pytz-old/zoneinfo/America/Virgin b/lib/pytz-old/zoneinfo/America/Virgin
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Virgin differ
diff --git a/lib/pytz/zoneinfo/America/Virgin.py b/lib/pytz-old/zoneinfo/America/Virgin.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Virgin.py
rename to lib/pytz-old/zoneinfo/America/Virgin.py
diff --git a/lib/pytz-old/zoneinfo/America/Whitehorse b/lib/pytz-old/zoneinfo/America/Whitehorse
new file mode 100644
index 0000000..8604c5c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Whitehorse differ
diff --git a/lib/pytz/zoneinfo/America/Whitehorse.py b/lib/pytz-old/zoneinfo/America/Whitehorse.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Whitehorse.py
rename to lib/pytz-old/zoneinfo/America/Whitehorse.py
diff --git a/lib/pytz-old/zoneinfo/America/Winnipeg b/lib/pytz-old/zoneinfo/America/Winnipeg
new file mode 100644
index 0000000..2ffe3d8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Winnipeg differ
diff --git a/lib/pytz/zoneinfo/America/Winnipeg.py b/lib/pytz-old/zoneinfo/America/Winnipeg.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Winnipeg.py
rename to lib/pytz-old/zoneinfo/America/Winnipeg.py
diff --git a/lib/pytz-old/zoneinfo/America/Yakutat b/lib/pytz-old/zoneinfo/America/Yakutat
new file mode 100644
index 0000000..f3d7399
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Yakutat differ
diff --git a/lib/pytz/zoneinfo/America/Yakutat.py b/lib/pytz-old/zoneinfo/America/Yakutat.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Yakutat.py
rename to lib/pytz-old/zoneinfo/America/Yakutat.py
diff --git a/lib/pytz-old/zoneinfo/America/Yellowknife b/lib/pytz-old/zoneinfo/America/Yellowknife
new file mode 100644
index 0000000..21cba6e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/America/Yellowknife differ
diff --git a/lib/pytz/zoneinfo/America/Yellowknife.py b/lib/pytz-old/zoneinfo/America/Yellowknife.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/Yellowknife.py
rename to lib/pytz-old/zoneinfo/America/Yellowknife.py
diff --git a/lib/pytz/zoneinfo/America/__init__.py b/lib/pytz-old/zoneinfo/America/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/America/__init__.py
rename to lib/pytz-old/zoneinfo/America/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Casey b/lib/pytz-old/zoneinfo/Antarctica/Casey
new file mode 100644
index 0000000..c2a9905
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Casey differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Casey.py b/lib/pytz-old/zoneinfo/Antarctica/Casey.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Casey.py
rename to lib/pytz-old/zoneinfo/Antarctica/Casey.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Davis b/lib/pytz-old/zoneinfo/Antarctica/Davis
new file mode 100644
index 0000000..7321c67
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Davis differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Davis.py b/lib/pytz-old/zoneinfo/Antarctica/Davis.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Davis.py
rename to lib/pytz-old/zoneinfo/Antarctica/Davis.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/DumontDUrville b/lib/pytz-old/zoneinfo/Antarctica/DumontDUrville
new file mode 100644
index 0000000..c406b8d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/DumontDUrville differ
diff --git a/lib/pytz/zoneinfo/Antarctica/DumontDUrville.py b/lib/pytz-old/zoneinfo/Antarctica/DumontDUrville.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/DumontDUrville.py
rename to lib/pytz-old/zoneinfo/Antarctica/DumontDUrville.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Macquarie b/lib/pytz-old/zoneinfo/Antarctica/Macquarie
new file mode 100644
index 0000000..fc7b96f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Macquarie differ
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Mawson b/lib/pytz-old/zoneinfo/Antarctica/Mawson
new file mode 100644
index 0000000..6c5b0fa
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Mawson differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Mawson.py b/lib/pytz-old/zoneinfo/Antarctica/Mawson.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Mawson.py
rename to lib/pytz-old/zoneinfo/Antarctica/Mawson.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/McMurdo b/lib/pytz-old/zoneinfo/Antarctica/McMurdo
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/McMurdo differ
diff --git a/lib/pytz/zoneinfo/Antarctica/McMurdo.py b/lib/pytz-old/zoneinfo/Antarctica/McMurdo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/McMurdo.py
rename to lib/pytz-old/zoneinfo/Antarctica/McMurdo.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Palmer b/lib/pytz-old/zoneinfo/Antarctica/Palmer
new file mode 100644
index 0000000..9e9cdd0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Palmer differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Palmer.py b/lib/pytz-old/zoneinfo/Antarctica/Palmer.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Palmer.py
rename to lib/pytz-old/zoneinfo/Antarctica/Palmer.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Rothera b/lib/pytz-old/zoneinfo/Antarctica/Rothera
new file mode 100644
index 0000000..28f82ba
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Rothera differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Rothera.py b/lib/pytz-old/zoneinfo/Antarctica/Rothera.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Rothera.py
rename to lib/pytz-old/zoneinfo/Antarctica/Rothera.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/South_Pole b/lib/pytz-old/zoneinfo/Antarctica/South_Pole
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/South_Pole differ
diff --git a/lib/pytz/zoneinfo/Antarctica/South_Pole.py b/lib/pytz-old/zoneinfo/Antarctica/South_Pole.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/South_Pole.py
rename to lib/pytz-old/zoneinfo/Antarctica/South_Pole.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Syowa b/lib/pytz-old/zoneinfo/Antarctica/Syowa
new file mode 100644
index 0000000..b837b07
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Syowa differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Syowa.py b/lib/pytz-old/zoneinfo/Antarctica/Syowa.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Syowa.py
rename to lib/pytz-old/zoneinfo/Antarctica/Syowa.py
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Troll b/lib/pytz-old/zoneinfo/Antarctica/Troll
new file mode 100644
index 0000000..d973a12
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Troll differ
diff --git a/lib/pytz-old/zoneinfo/Antarctica/Vostok b/lib/pytz-old/zoneinfo/Antarctica/Vostok
new file mode 100644
index 0000000..cbec909
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Antarctica/Vostok differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Vostok.py b/lib/pytz-old/zoneinfo/Antarctica/Vostok.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/Vostok.py
rename to lib/pytz-old/zoneinfo/Antarctica/Vostok.py
diff --git a/lib/pytz/zoneinfo/Antarctica/__init__.py b/lib/pytz-old/zoneinfo/Antarctica/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Antarctica/__init__.py
rename to lib/pytz-old/zoneinfo/Antarctica/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Arctic/Longyearbyen b/lib/pytz-old/zoneinfo/Arctic/Longyearbyen
new file mode 100644
index 0000000..239c017
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Arctic/Longyearbyen differ
diff --git a/lib/pytz/zoneinfo/Arctic/Longyearbyen.py b/lib/pytz-old/zoneinfo/Arctic/Longyearbyen.py
similarity index 100%
rename from lib/pytz/zoneinfo/Arctic/Longyearbyen.py
rename to lib/pytz-old/zoneinfo/Arctic/Longyearbyen.py
diff --git a/lib/pytz/zoneinfo/Arctic/__init__.py b/lib/pytz-old/zoneinfo/Arctic/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Arctic/__init__.py
rename to lib/pytz-old/zoneinfo/Arctic/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Aden b/lib/pytz-old/zoneinfo/Asia/Aden
new file mode 100644
index 0000000..505e1d2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Aden differ
diff --git a/lib/pytz/zoneinfo/Asia/Aden.py b/lib/pytz-old/zoneinfo/Asia/Aden.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Aden.py
rename to lib/pytz-old/zoneinfo/Asia/Aden.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Almaty b/lib/pytz-old/zoneinfo/Asia/Almaty
new file mode 100644
index 0000000..75a007d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Almaty differ
diff --git a/lib/pytz/zoneinfo/Asia/Almaty.py b/lib/pytz-old/zoneinfo/Asia/Almaty.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Almaty.py
rename to lib/pytz-old/zoneinfo/Asia/Almaty.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Amman b/lib/pytz-old/zoneinfo/Asia/Amman
new file mode 100644
index 0000000..c3f0994
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Amman differ
diff --git a/lib/pytz/zoneinfo/Asia/Amman.py b/lib/pytz-old/zoneinfo/Asia/Amman.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Amman.py
rename to lib/pytz-old/zoneinfo/Asia/Amman.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Anadyr b/lib/pytz-old/zoneinfo/Asia/Anadyr
new file mode 100644
index 0000000..766594b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Anadyr differ
diff --git a/lib/pytz/zoneinfo/Asia/Anadyr.py b/lib/pytz-old/zoneinfo/Asia/Anadyr.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Anadyr.py
rename to lib/pytz-old/zoneinfo/Asia/Anadyr.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Aqtau b/lib/pytz-old/zoneinfo/Asia/Aqtau
new file mode 100644
index 0000000..811ed2f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Aqtau differ
diff --git a/lib/pytz/zoneinfo/Asia/Aqtau.py b/lib/pytz-old/zoneinfo/Asia/Aqtau.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Aqtau.py
rename to lib/pytz-old/zoneinfo/Asia/Aqtau.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Aqtobe b/lib/pytz-old/zoneinfo/Asia/Aqtobe
new file mode 100644
index 0000000..ff3b96b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Aqtobe differ
diff --git a/lib/pytz/zoneinfo/Asia/Aqtobe.py b/lib/pytz-old/zoneinfo/Asia/Aqtobe.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Aqtobe.py
rename to lib/pytz-old/zoneinfo/Asia/Aqtobe.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Ashgabat b/lib/pytz-old/zoneinfo/Asia/Ashgabat
new file mode 100644
index 0000000..f79fe04
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ashgabat differ
diff --git a/lib/pytz/zoneinfo/Asia/Ashgabat.py b/lib/pytz-old/zoneinfo/Asia/Ashgabat.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Ashgabat.py
rename to lib/pytz-old/zoneinfo/Asia/Ashgabat.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Ashkhabad b/lib/pytz-old/zoneinfo/Asia/Ashkhabad
new file mode 100644
index 0000000..f79fe04
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ashkhabad differ
diff --git a/lib/pytz/zoneinfo/Asia/Ashkhabad.py b/lib/pytz-old/zoneinfo/Asia/Ashkhabad.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Ashkhabad.py
rename to lib/pytz-old/zoneinfo/Asia/Ashkhabad.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Baghdad b/lib/pytz-old/zoneinfo/Asia/Baghdad
new file mode 100644
index 0000000..f0a96ec
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Baghdad differ
diff --git a/lib/pytz/zoneinfo/Asia/Baghdad.py b/lib/pytz-old/zoneinfo/Asia/Baghdad.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Baghdad.py
rename to lib/pytz-old/zoneinfo/Asia/Baghdad.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Bahrain b/lib/pytz-old/zoneinfo/Asia/Bahrain
new file mode 100644
index 0000000..cda04a1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Bahrain differ
diff --git a/lib/pytz/zoneinfo/Asia/Bahrain.py b/lib/pytz-old/zoneinfo/Asia/Bahrain.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Bahrain.py
rename to lib/pytz-old/zoneinfo/Asia/Bahrain.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Baku b/lib/pytz-old/zoneinfo/Asia/Baku
new file mode 100644
index 0000000..f78e764
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Baku differ
diff --git a/lib/pytz/zoneinfo/Asia/Baku.py b/lib/pytz-old/zoneinfo/Asia/Baku.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Baku.py
rename to lib/pytz-old/zoneinfo/Asia/Baku.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Bangkok b/lib/pytz-old/zoneinfo/Asia/Bangkok
new file mode 100644
index 0000000..e8e7627
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Bangkok differ
diff --git a/lib/pytz/zoneinfo/Asia/Bangkok.py b/lib/pytz-old/zoneinfo/Asia/Bangkok.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Bangkok.py
rename to lib/pytz-old/zoneinfo/Asia/Bangkok.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Beirut b/lib/pytz-old/zoneinfo/Asia/Beirut
new file mode 100644
index 0000000..72f0896
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Beirut differ
diff --git a/lib/pytz/zoneinfo/Asia/Beirut.py b/lib/pytz-old/zoneinfo/Asia/Beirut.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Beirut.py
rename to lib/pytz-old/zoneinfo/Asia/Beirut.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Bishkek b/lib/pytz-old/zoneinfo/Asia/Bishkek
new file mode 100644
index 0000000..eee8278
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Bishkek differ
diff --git a/lib/pytz/zoneinfo/Asia/Bishkek.py b/lib/pytz-old/zoneinfo/Asia/Bishkek.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Bishkek.py
rename to lib/pytz-old/zoneinfo/Asia/Bishkek.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Brunei b/lib/pytz-old/zoneinfo/Asia/Brunei
new file mode 100644
index 0000000..1ac3115
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Brunei differ
diff --git a/lib/pytz/zoneinfo/Asia/Brunei.py b/lib/pytz-old/zoneinfo/Asia/Brunei.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Brunei.py
rename to lib/pytz-old/zoneinfo/Asia/Brunei.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Calcutta b/lib/pytz-old/zoneinfo/Asia/Calcutta
new file mode 100644
index 0000000..3c0d5ab
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Calcutta differ
diff --git a/lib/pytz/zoneinfo/Asia/Calcutta.py b/lib/pytz-old/zoneinfo/Asia/Calcutta.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Calcutta.py
rename to lib/pytz-old/zoneinfo/Asia/Calcutta.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Chita b/lib/pytz-old/zoneinfo/Asia/Chita
new file mode 100644
index 0000000..c090654
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Chita differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Choibalsan b/lib/pytz-old/zoneinfo/Asia/Choibalsan
new file mode 100644
index 0000000..f099092
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Choibalsan differ
diff --git a/lib/pytz/zoneinfo/Asia/Choibalsan.py b/lib/pytz-old/zoneinfo/Asia/Choibalsan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Choibalsan.py
rename to lib/pytz-old/zoneinfo/Asia/Choibalsan.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Chongqing b/lib/pytz-old/zoneinfo/Asia/Chongqing
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Chongqing differ
diff --git a/lib/pytz/zoneinfo/Asia/Chongqing.py b/lib/pytz-old/zoneinfo/Asia/Chongqing.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Chongqing.py
rename to lib/pytz-old/zoneinfo/Asia/Chongqing.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Chungking b/lib/pytz-old/zoneinfo/Asia/Chungking
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Chungking differ
diff --git a/lib/pytz/zoneinfo/Asia/Chungking.py b/lib/pytz-old/zoneinfo/Asia/Chungking.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Chungking.py
rename to lib/pytz-old/zoneinfo/Asia/Chungking.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Colombo b/lib/pytz-old/zoneinfo/Asia/Colombo
new file mode 100644
index 0000000..d10439a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Colombo differ
diff --git a/lib/pytz/zoneinfo/Asia/Colombo.py b/lib/pytz-old/zoneinfo/Asia/Colombo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Colombo.py
rename to lib/pytz-old/zoneinfo/Asia/Colombo.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Dacca b/lib/pytz-old/zoneinfo/Asia/Dacca
new file mode 100644
index 0000000..b6b326b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Dacca differ
diff --git a/lib/pytz/zoneinfo/Asia/Dacca.py b/lib/pytz-old/zoneinfo/Asia/Dacca.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Dacca.py
rename to lib/pytz-old/zoneinfo/Asia/Dacca.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Damascus b/lib/pytz-old/zoneinfo/Asia/Damascus
new file mode 100644
index 0000000..ac45764
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Damascus differ
diff --git a/lib/pytz/zoneinfo/Asia/Damascus.py b/lib/pytz-old/zoneinfo/Asia/Damascus.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Damascus.py
rename to lib/pytz-old/zoneinfo/Asia/Damascus.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Dhaka b/lib/pytz-old/zoneinfo/Asia/Dhaka
new file mode 100644
index 0000000..b6b326b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Dhaka differ
diff --git a/lib/pytz/zoneinfo/Asia/Dhaka.py b/lib/pytz-old/zoneinfo/Asia/Dhaka.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Dhaka.py
rename to lib/pytz-old/zoneinfo/Asia/Dhaka.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Dili b/lib/pytz-old/zoneinfo/Asia/Dili
new file mode 100644
index 0000000..8124fb7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Dili differ
diff --git a/lib/pytz/zoneinfo/Asia/Dili.py b/lib/pytz-old/zoneinfo/Asia/Dili.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Dili.py
rename to lib/pytz-old/zoneinfo/Asia/Dili.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Dubai b/lib/pytz-old/zoneinfo/Asia/Dubai
new file mode 100644
index 0000000..415e443
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Dubai differ
diff --git a/lib/pytz/zoneinfo/Asia/Dubai.py b/lib/pytz-old/zoneinfo/Asia/Dubai.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Dubai.py
rename to lib/pytz-old/zoneinfo/Asia/Dubai.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Dushanbe b/lib/pytz-old/zoneinfo/Asia/Dushanbe
new file mode 100644
index 0000000..3b1e978
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Dushanbe differ
diff --git a/lib/pytz/zoneinfo/Asia/Dushanbe.py b/lib/pytz-old/zoneinfo/Asia/Dushanbe.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Dushanbe.py
rename to lib/pytz-old/zoneinfo/Asia/Dushanbe.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Gaza b/lib/pytz-old/zoneinfo/Asia/Gaza
new file mode 100644
index 0000000..bd683e8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Gaza differ
diff --git a/lib/pytz/zoneinfo/Asia/Gaza.py b/lib/pytz-old/zoneinfo/Asia/Gaza.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Gaza.py
rename to lib/pytz-old/zoneinfo/Asia/Gaza.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Harbin b/lib/pytz-old/zoneinfo/Asia/Harbin
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Harbin differ
diff --git a/lib/pytz/zoneinfo/Asia/Harbin.py b/lib/pytz-old/zoneinfo/Asia/Harbin.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Harbin.py
rename to lib/pytz-old/zoneinfo/Asia/Harbin.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Hebron b/lib/pytz-old/zoneinfo/Asia/Hebron
new file mode 100644
index 0000000..0bc7674
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Hebron differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Ho_Chi_Minh b/lib/pytz-old/zoneinfo/Asia/Ho_Chi_Minh
new file mode 100644
index 0000000..c142265
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ho_Chi_Minh differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Hong_Kong b/lib/pytz-old/zoneinfo/Asia/Hong_Kong
new file mode 100644
index 0000000..dc9058e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Hong_Kong differ
diff --git a/lib/pytz/zoneinfo/Asia/Hong_Kong.py b/lib/pytz-old/zoneinfo/Asia/Hong_Kong.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Hong_Kong.py
rename to lib/pytz-old/zoneinfo/Asia/Hong_Kong.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Hovd b/lib/pytz-old/zoneinfo/Asia/Hovd
new file mode 100644
index 0000000..71c3cad
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Hovd differ
diff --git a/lib/pytz/zoneinfo/Asia/Hovd.py b/lib/pytz-old/zoneinfo/Asia/Hovd.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Hovd.py
rename to lib/pytz-old/zoneinfo/Asia/Hovd.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Irkutsk b/lib/pytz-old/zoneinfo/Asia/Irkutsk
new file mode 100644
index 0000000..1e94a47
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Irkutsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Irkutsk.py b/lib/pytz-old/zoneinfo/Asia/Irkutsk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Irkutsk.py
rename to lib/pytz-old/zoneinfo/Asia/Irkutsk.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Istanbul b/lib/pytz-old/zoneinfo/Asia/Istanbul
new file mode 100644
index 0000000..d89aa3a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Istanbul differ
diff --git a/lib/pytz/zoneinfo/Asia/Istanbul.py b/lib/pytz-old/zoneinfo/Asia/Istanbul.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Istanbul.py
rename to lib/pytz-old/zoneinfo/Asia/Istanbul.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Jakarta b/lib/pytz-old/zoneinfo/Asia/Jakarta
new file mode 100644
index 0000000..3130bff
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Jakarta differ
diff --git a/lib/pytz/zoneinfo/Asia/Jakarta.py b/lib/pytz-old/zoneinfo/Asia/Jakarta.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Jakarta.py
rename to lib/pytz-old/zoneinfo/Asia/Jakarta.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Jayapura b/lib/pytz-old/zoneinfo/Asia/Jayapura
new file mode 100644
index 0000000..a9d1217
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Jayapura differ
diff --git a/lib/pytz/zoneinfo/Asia/Jayapura.py b/lib/pytz-old/zoneinfo/Asia/Jayapura.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Jayapura.py
rename to lib/pytz-old/zoneinfo/Asia/Jayapura.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Jerusalem b/lib/pytz-old/zoneinfo/Asia/Jerusalem
new file mode 100644
index 0000000..df51199
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Jerusalem differ
diff --git a/lib/pytz/zoneinfo/Asia/Jerusalem.py b/lib/pytz-old/zoneinfo/Asia/Jerusalem.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Jerusalem.py
rename to lib/pytz-old/zoneinfo/Asia/Jerusalem.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kabul b/lib/pytz-old/zoneinfo/Asia/Kabul
new file mode 100644
index 0000000..266cc7e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kabul differ
diff --git a/lib/pytz/zoneinfo/Asia/Kabul.py b/lib/pytz-old/zoneinfo/Asia/Kabul.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Kabul.py
rename to lib/pytz-old/zoneinfo/Asia/Kabul.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kamchatka b/lib/pytz-old/zoneinfo/Asia/Kamchatka
new file mode 100644
index 0000000..a0541cf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kamchatka differ
diff --git a/lib/pytz/zoneinfo/Asia/Kamchatka.py b/lib/pytz-old/zoneinfo/Asia/Kamchatka.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Kamchatka.py
rename to lib/pytz-old/zoneinfo/Asia/Kamchatka.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Karachi b/lib/pytz-old/zoneinfo/Asia/Karachi
new file mode 100644
index 0000000..6a6de1b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Karachi differ
diff --git a/lib/pytz/zoneinfo/Asia/Karachi.py b/lib/pytz-old/zoneinfo/Asia/Karachi.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Karachi.py
rename to lib/pytz-old/zoneinfo/Asia/Karachi.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kashgar b/lib/pytz-old/zoneinfo/Asia/Kashgar
new file mode 100644
index 0000000..964a5c2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kashgar differ
diff --git a/lib/pytz/zoneinfo/Asia/Kashgar.py b/lib/pytz-old/zoneinfo/Asia/Kashgar.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Kashgar.py
rename to lib/pytz-old/zoneinfo/Asia/Kashgar.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kathmandu b/lib/pytz-old/zoneinfo/Asia/Kathmandu
new file mode 100644
index 0000000..2824709
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kathmandu differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Katmandu b/lib/pytz-old/zoneinfo/Asia/Katmandu
new file mode 100644
index 0000000..2824709
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Katmandu differ
diff --git a/lib/pytz/zoneinfo/Asia/Katmandu.py b/lib/pytz-old/zoneinfo/Asia/Katmandu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Katmandu.py
rename to lib/pytz-old/zoneinfo/Asia/Katmandu.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Khandyga b/lib/pytz-old/zoneinfo/Asia/Khandyga
new file mode 100644
index 0000000..26becb3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Khandyga differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Kolkata b/lib/pytz-old/zoneinfo/Asia/Kolkata
new file mode 100644
index 0000000..3c0d5ab
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kolkata differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Krasnoyarsk b/lib/pytz-old/zoneinfo/Asia/Krasnoyarsk
new file mode 100644
index 0000000..3107809
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Krasnoyarsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Krasnoyarsk.py b/lib/pytz-old/zoneinfo/Asia/Krasnoyarsk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Krasnoyarsk.py
rename to lib/pytz-old/zoneinfo/Asia/Krasnoyarsk.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kuala_Lumpur b/lib/pytz-old/zoneinfo/Asia/Kuala_Lumpur
new file mode 100644
index 0000000..35b987d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kuala_Lumpur differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuala_Lumpur.py b/lib/pytz-old/zoneinfo/Asia/Kuala_Lumpur.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Kuala_Lumpur.py
rename to lib/pytz-old/zoneinfo/Asia/Kuala_Lumpur.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kuching b/lib/pytz-old/zoneinfo/Asia/Kuching
new file mode 100644
index 0000000..4f891db
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kuching differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuching.py b/lib/pytz-old/zoneinfo/Asia/Kuching.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Kuching.py
rename to lib/pytz-old/zoneinfo/Asia/Kuching.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Kuwait b/lib/pytz-old/zoneinfo/Asia/Kuwait
new file mode 100644
index 0000000..5623811
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Kuwait differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuwait.py b/lib/pytz-old/zoneinfo/Asia/Kuwait.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Kuwait.py
rename to lib/pytz-old/zoneinfo/Asia/Kuwait.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Macao b/lib/pytz-old/zoneinfo/Asia/Macao
new file mode 100644
index 0000000..b8f9c36
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Macao differ
diff --git a/lib/pytz/zoneinfo/Asia/Macao.py b/lib/pytz-old/zoneinfo/Asia/Macao.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Macao.py
rename to lib/pytz-old/zoneinfo/Asia/Macao.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Macau b/lib/pytz-old/zoneinfo/Asia/Macau
new file mode 100644
index 0000000..b8f9c36
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Macau differ
diff --git a/lib/pytz/zoneinfo/Asia/Macau.py b/lib/pytz-old/zoneinfo/Asia/Macau.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Macau.py
rename to lib/pytz-old/zoneinfo/Asia/Macau.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Magadan b/lib/pytz-old/zoneinfo/Asia/Magadan
new file mode 100644
index 0000000..e09c4dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Magadan differ
diff --git a/lib/pytz/zoneinfo/Asia/Magadan.py b/lib/pytz-old/zoneinfo/Asia/Magadan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Magadan.py
rename to lib/pytz-old/zoneinfo/Asia/Magadan.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Makassar b/lib/pytz-old/zoneinfo/Asia/Makassar
new file mode 100644
index 0000000..0d68923
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Makassar differ
diff --git a/lib/pytz/zoneinfo/Asia/Makassar.py b/lib/pytz-old/zoneinfo/Asia/Makassar.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Makassar.py
rename to lib/pytz-old/zoneinfo/Asia/Makassar.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Manila b/lib/pytz-old/zoneinfo/Asia/Manila
new file mode 100644
index 0000000..ac0f3a6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Manila differ
diff --git a/lib/pytz/zoneinfo/Asia/Manila.py b/lib/pytz-old/zoneinfo/Asia/Manila.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Manila.py
rename to lib/pytz-old/zoneinfo/Asia/Manila.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Muscat b/lib/pytz-old/zoneinfo/Asia/Muscat
new file mode 100644
index 0000000..53a2219
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Muscat differ
diff --git a/lib/pytz/zoneinfo/Asia/Muscat.py b/lib/pytz-old/zoneinfo/Asia/Muscat.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Muscat.py
rename to lib/pytz-old/zoneinfo/Asia/Muscat.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Nicosia b/lib/pytz-old/zoneinfo/Asia/Nicosia
new file mode 100644
index 0000000..3e663b2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Nicosia differ
diff --git a/lib/pytz/zoneinfo/Asia/Nicosia.py b/lib/pytz-old/zoneinfo/Asia/Nicosia.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Nicosia.py
rename to lib/pytz-old/zoneinfo/Asia/Nicosia.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Novokuznetsk b/lib/pytz-old/zoneinfo/Asia/Novokuznetsk
new file mode 100644
index 0000000..1176866
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Novokuznetsk differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Novosibirsk b/lib/pytz-old/zoneinfo/Asia/Novosibirsk
new file mode 100644
index 0000000..ed6d7dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Novosibirsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Novosibirsk.py b/lib/pytz-old/zoneinfo/Asia/Novosibirsk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Novosibirsk.py
rename to lib/pytz-old/zoneinfo/Asia/Novosibirsk.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Omsk b/lib/pytz-old/zoneinfo/Asia/Omsk
new file mode 100644
index 0000000..760c391
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Omsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Omsk.py b/lib/pytz-old/zoneinfo/Asia/Omsk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Omsk.py
rename to lib/pytz-old/zoneinfo/Asia/Omsk.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Oral b/lib/pytz-old/zoneinfo/Asia/Oral
new file mode 100644
index 0000000..1467caf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Oral differ
diff --git a/lib/pytz/zoneinfo/Asia/Oral.py b/lib/pytz-old/zoneinfo/Asia/Oral.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Oral.py
rename to lib/pytz-old/zoneinfo/Asia/Oral.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Phnom_Penh b/lib/pytz-old/zoneinfo/Asia/Phnom_Penh
new file mode 100644
index 0000000..e8e7627
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Phnom_Penh differ
diff --git a/lib/pytz/zoneinfo/Asia/Phnom_Penh.py b/lib/pytz-old/zoneinfo/Asia/Phnom_Penh.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Phnom_Penh.py
rename to lib/pytz-old/zoneinfo/Asia/Phnom_Penh.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Pontianak b/lib/pytz-old/zoneinfo/Asia/Pontianak
new file mode 100644
index 0000000..dcd7014
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Pontianak differ
diff --git a/lib/pytz/zoneinfo/Asia/Pontianak.py b/lib/pytz-old/zoneinfo/Asia/Pontianak.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Pontianak.py
rename to lib/pytz-old/zoneinfo/Asia/Pontianak.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Pyongyang b/lib/pytz-old/zoneinfo/Asia/Pyongyang
new file mode 100644
index 0000000..b04bf74
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Pyongyang differ
diff --git a/lib/pytz/zoneinfo/Asia/Pyongyang.py b/lib/pytz-old/zoneinfo/Asia/Pyongyang.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Pyongyang.py
rename to lib/pytz-old/zoneinfo/Asia/Pyongyang.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Qatar b/lib/pytz-old/zoneinfo/Asia/Qatar
new file mode 100644
index 0000000..3e20373
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Qatar differ
diff --git a/lib/pytz/zoneinfo/Asia/Qatar.py b/lib/pytz-old/zoneinfo/Asia/Qatar.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Qatar.py
rename to lib/pytz-old/zoneinfo/Asia/Qatar.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Qyzylorda b/lib/pytz-old/zoneinfo/Asia/Qyzylorda
new file mode 100644
index 0000000..ce53516
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Qyzylorda differ
diff --git a/lib/pytz/zoneinfo/Asia/Qyzylorda.py b/lib/pytz-old/zoneinfo/Asia/Qyzylorda.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Qyzylorda.py
rename to lib/pytz-old/zoneinfo/Asia/Qyzylorda.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Rangoon b/lib/pytz-old/zoneinfo/Asia/Rangoon
new file mode 100644
index 0000000..934ca7e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Rangoon differ
diff --git a/lib/pytz/zoneinfo/Asia/Rangoon.py b/lib/pytz-old/zoneinfo/Asia/Rangoon.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Rangoon.py
rename to lib/pytz-old/zoneinfo/Asia/Rangoon.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Riyadh b/lib/pytz-old/zoneinfo/Asia/Riyadh
new file mode 100644
index 0000000..c35e42a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Riyadh differ
diff --git a/lib/pytz/zoneinfo/Asia/Riyadh.py b/lib/pytz-old/zoneinfo/Asia/Riyadh.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Riyadh.py
rename to lib/pytz-old/zoneinfo/Asia/Riyadh.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Saigon b/lib/pytz-old/zoneinfo/Asia/Saigon
new file mode 100644
index 0000000..c142265
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Saigon differ
diff --git a/lib/pytz/zoneinfo/Asia/Saigon.py b/lib/pytz-old/zoneinfo/Asia/Saigon.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Saigon.py
rename to lib/pytz-old/zoneinfo/Asia/Saigon.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Sakhalin b/lib/pytz-old/zoneinfo/Asia/Sakhalin
new file mode 100644
index 0000000..ec62afc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Sakhalin differ
diff --git a/lib/pytz/zoneinfo/Asia/Sakhalin.py b/lib/pytz-old/zoneinfo/Asia/Sakhalin.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Sakhalin.py
rename to lib/pytz-old/zoneinfo/Asia/Sakhalin.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Samarkand b/lib/pytz-old/zoneinfo/Asia/Samarkand
new file mode 100644
index 0000000..65fb5b0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Samarkand differ
diff --git a/lib/pytz/zoneinfo/Asia/Samarkand.py b/lib/pytz-old/zoneinfo/Asia/Samarkand.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Samarkand.py
rename to lib/pytz-old/zoneinfo/Asia/Samarkand.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Seoul b/lib/pytz-old/zoneinfo/Asia/Seoul
new file mode 100644
index 0000000..fd91d5b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Seoul differ
diff --git a/lib/pytz/zoneinfo/Asia/Seoul.py b/lib/pytz-old/zoneinfo/Asia/Seoul.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Seoul.py
rename to lib/pytz-old/zoneinfo/Asia/Seoul.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Shanghai b/lib/pytz-old/zoneinfo/Asia/Shanghai
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Shanghai differ
diff --git a/lib/pytz/zoneinfo/Asia/Shanghai.py b/lib/pytz-old/zoneinfo/Asia/Shanghai.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Shanghai.py
rename to lib/pytz-old/zoneinfo/Asia/Shanghai.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Singapore b/lib/pytz-old/zoneinfo/Asia/Singapore
new file mode 100644
index 0000000..9dd49cb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Singapore differ
diff --git a/lib/pytz/zoneinfo/Asia/Singapore.py b/lib/pytz-old/zoneinfo/Asia/Singapore.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Singapore.py
rename to lib/pytz-old/zoneinfo/Asia/Singapore.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Srednekolymsk b/lib/pytz-old/zoneinfo/Asia/Srednekolymsk
new file mode 100644
index 0000000..0929f66
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Srednekolymsk differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Taipei b/lib/pytz-old/zoneinfo/Asia/Taipei
new file mode 100644
index 0000000..4810a0b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Taipei differ
diff --git a/lib/pytz/zoneinfo/Asia/Taipei.py b/lib/pytz-old/zoneinfo/Asia/Taipei.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Taipei.py
rename to lib/pytz-old/zoneinfo/Asia/Taipei.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Tashkent b/lib/pytz-old/zoneinfo/Asia/Tashkent
new file mode 100644
index 0000000..1f59faa
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Tashkent differ
diff --git a/lib/pytz/zoneinfo/Asia/Tashkent.py b/lib/pytz-old/zoneinfo/Asia/Tashkent.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Tashkent.py
rename to lib/pytz-old/zoneinfo/Asia/Tashkent.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Tbilisi b/lib/pytz-old/zoneinfo/Asia/Tbilisi
new file mode 100644
index 0000000..0d7081e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Tbilisi differ
diff --git a/lib/pytz/zoneinfo/Asia/Tbilisi.py b/lib/pytz-old/zoneinfo/Asia/Tbilisi.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Tbilisi.py
rename to lib/pytz-old/zoneinfo/Asia/Tbilisi.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Tehran b/lib/pytz-old/zoneinfo/Asia/Tehran
new file mode 100644
index 0000000..8710781
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Tehran differ
diff --git a/lib/pytz/zoneinfo/Asia/Tehran.py b/lib/pytz-old/zoneinfo/Asia/Tehran.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Tehran.py
rename to lib/pytz-old/zoneinfo/Asia/Tehran.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Tel_Aviv b/lib/pytz-old/zoneinfo/Asia/Tel_Aviv
new file mode 100644
index 0000000..df51199
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Tel_Aviv differ
diff --git a/lib/pytz/zoneinfo/Asia/Tel_Aviv.py b/lib/pytz-old/zoneinfo/Asia/Tel_Aviv.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Tel_Aviv.py
rename to lib/pytz-old/zoneinfo/Asia/Tel_Aviv.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Thimbu b/lib/pytz-old/zoneinfo/Asia/Thimbu
new file mode 100644
index 0000000..0bd94cb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Thimbu differ
diff --git a/lib/pytz/zoneinfo/Asia/Thimbu.py b/lib/pytz-old/zoneinfo/Asia/Thimbu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Thimbu.py
rename to lib/pytz-old/zoneinfo/Asia/Thimbu.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Thimphu b/lib/pytz-old/zoneinfo/Asia/Thimphu
new file mode 100644
index 0000000..0bd94cb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Thimphu differ
diff --git a/lib/pytz/zoneinfo/Asia/Thimphu.py b/lib/pytz-old/zoneinfo/Asia/Thimphu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Thimphu.py
rename to lib/pytz-old/zoneinfo/Asia/Thimphu.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Tokyo b/lib/pytz-old/zoneinfo/Asia/Tokyo
new file mode 100644
index 0000000..0244140
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Tokyo differ
diff --git a/lib/pytz/zoneinfo/Asia/Tokyo.py b/lib/pytz-old/zoneinfo/Asia/Tokyo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Tokyo.py
rename to lib/pytz-old/zoneinfo/Asia/Tokyo.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Ujung_Pandang b/lib/pytz-old/zoneinfo/Asia/Ujung_Pandang
new file mode 100644
index 0000000..0d68923
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ujung_Pandang differ
diff --git a/lib/pytz/zoneinfo/Asia/Ujung_Pandang.py b/lib/pytz-old/zoneinfo/Asia/Ujung_Pandang.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Ujung_Pandang.py
rename to lib/pytz-old/zoneinfo/Asia/Ujung_Pandang.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Ulaanbaatar b/lib/pytz-old/zoneinfo/Asia/Ulaanbaatar
new file mode 100644
index 0000000..61505e9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ulaanbaatar differ
diff --git a/lib/pytz/zoneinfo/Asia/Ulaanbaatar.py b/lib/pytz-old/zoneinfo/Asia/Ulaanbaatar.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Ulaanbaatar.py
rename to lib/pytz-old/zoneinfo/Asia/Ulaanbaatar.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Ulan_Bator b/lib/pytz-old/zoneinfo/Asia/Ulan_Bator
new file mode 100644
index 0000000..61505e9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ulan_Bator differ
diff --git a/lib/pytz/zoneinfo/Asia/Ulan_Bator.py b/lib/pytz-old/zoneinfo/Asia/Ulan_Bator.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Ulan_Bator.py
rename to lib/pytz-old/zoneinfo/Asia/Ulan_Bator.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Urumqi b/lib/pytz-old/zoneinfo/Asia/Urumqi
new file mode 100644
index 0000000..964a5c2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Urumqi differ
diff --git a/lib/pytz/zoneinfo/Asia/Urumqi.py b/lib/pytz-old/zoneinfo/Asia/Urumqi.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Urumqi.py
rename to lib/pytz-old/zoneinfo/Asia/Urumqi.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Ust-Nera b/lib/pytz-old/zoneinfo/Asia/Ust-Nera
new file mode 100644
index 0000000..0efacd6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Ust-Nera differ
diff --git a/lib/pytz-old/zoneinfo/Asia/Vientiane b/lib/pytz-old/zoneinfo/Asia/Vientiane
new file mode 100644
index 0000000..e8e7627
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Vientiane differ
diff --git a/lib/pytz/zoneinfo/Asia/Vientiane.py b/lib/pytz-old/zoneinfo/Asia/Vientiane.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Vientiane.py
rename to lib/pytz-old/zoneinfo/Asia/Vientiane.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Vladivostok b/lib/pytz-old/zoneinfo/Asia/Vladivostok
new file mode 100644
index 0000000..156c8e6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Vladivostok differ
diff --git a/lib/pytz/zoneinfo/Asia/Vladivostok.py b/lib/pytz-old/zoneinfo/Asia/Vladivostok.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Vladivostok.py
rename to lib/pytz-old/zoneinfo/Asia/Vladivostok.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Yakutsk b/lib/pytz-old/zoneinfo/Asia/Yakutsk
new file mode 100644
index 0000000..58ff25e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Yakutsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Yakutsk.py b/lib/pytz-old/zoneinfo/Asia/Yakutsk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Yakutsk.py
rename to lib/pytz-old/zoneinfo/Asia/Yakutsk.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Yekaterinburg b/lib/pytz-old/zoneinfo/Asia/Yekaterinburg
new file mode 100644
index 0000000..a1baafa
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Yekaterinburg differ
diff --git a/lib/pytz/zoneinfo/Asia/Yekaterinburg.py b/lib/pytz-old/zoneinfo/Asia/Yekaterinburg.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Yekaterinburg.py
rename to lib/pytz-old/zoneinfo/Asia/Yekaterinburg.py
diff --git a/lib/pytz-old/zoneinfo/Asia/Yerevan b/lib/pytz-old/zoneinfo/Asia/Yerevan
new file mode 100644
index 0000000..fa62c24
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Asia/Yerevan differ
diff --git a/lib/pytz/zoneinfo/Asia/Yerevan.py b/lib/pytz-old/zoneinfo/Asia/Yerevan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/Yerevan.py
rename to lib/pytz-old/zoneinfo/Asia/Yerevan.py
diff --git a/lib/pytz/zoneinfo/Asia/__init__.py b/lib/pytz-old/zoneinfo/Asia/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Asia/__init__.py
rename to lib/pytz-old/zoneinfo/Asia/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Azores b/lib/pytz-old/zoneinfo/Atlantic/Azores
new file mode 100644
index 0000000..1f53253
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Azores differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Azores.py b/lib/pytz-old/zoneinfo/Atlantic/Azores.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Azores.py
rename to lib/pytz-old/zoneinfo/Atlantic/Azores.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Bermuda b/lib/pytz-old/zoneinfo/Atlantic/Bermuda
new file mode 100644
index 0000000..548d979
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Bermuda differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Bermuda.py b/lib/pytz-old/zoneinfo/Atlantic/Bermuda.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Bermuda.py
rename to lib/pytz-old/zoneinfo/Atlantic/Bermuda.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Canary b/lib/pytz-old/zoneinfo/Atlantic/Canary
new file mode 100644
index 0000000..007dcf4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Canary differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Canary.py b/lib/pytz-old/zoneinfo/Atlantic/Canary.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Canary.py
rename to lib/pytz-old/zoneinfo/Atlantic/Canary.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Cape_Verde b/lib/pytz-old/zoneinfo/Atlantic/Cape_Verde
new file mode 100644
index 0000000..18b676c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Cape_Verde differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Cape_Verde.py b/lib/pytz-old/zoneinfo/Atlantic/Cape_Verde.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Cape_Verde.py
rename to lib/pytz-old/zoneinfo/Atlantic/Cape_Verde.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Faeroe b/lib/pytz-old/zoneinfo/Atlantic/Faeroe
new file mode 100644
index 0000000..c486518
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Faeroe differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Faeroe.py b/lib/pytz-old/zoneinfo/Atlantic/Faeroe.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Faeroe.py
rename to lib/pytz-old/zoneinfo/Atlantic/Faeroe.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Faroe b/lib/pytz-old/zoneinfo/Atlantic/Faroe
new file mode 100644
index 0000000..c486518
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Faroe differ
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Jan_Mayen b/lib/pytz-old/zoneinfo/Atlantic/Jan_Mayen
new file mode 100644
index 0000000..239c017
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Jan_Mayen differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Jan_Mayen.py b/lib/pytz-old/zoneinfo/Atlantic/Jan_Mayen.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Jan_Mayen.py
rename to lib/pytz-old/zoneinfo/Atlantic/Jan_Mayen.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Madeira b/lib/pytz-old/zoneinfo/Atlantic/Madeira
new file mode 100644
index 0000000..3687fd6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Madeira differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Madeira.py b/lib/pytz-old/zoneinfo/Atlantic/Madeira.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Madeira.py
rename to lib/pytz-old/zoneinfo/Atlantic/Madeira.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Reykjavik b/lib/pytz-old/zoneinfo/Atlantic/Reykjavik
new file mode 100644
index 0000000..35ba7a1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Reykjavik differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Reykjavik.py b/lib/pytz-old/zoneinfo/Atlantic/Reykjavik.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Reykjavik.py
rename to lib/pytz-old/zoneinfo/Atlantic/Reykjavik.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/South_Georgia b/lib/pytz-old/zoneinfo/Atlantic/South_Georgia
new file mode 100644
index 0000000..b1191c9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/South_Georgia differ
diff --git a/lib/pytz/zoneinfo/Atlantic/South_Georgia.py b/lib/pytz-old/zoneinfo/Atlantic/South_Georgia.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/South_Georgia.py
rename to lib/pytz-old/zoneinfo/Atlantic/South_Georgia.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/St_Helena b/lib/pytz-old/zoneinfo/Atlantic/St_Helena
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/St_Helena differ
diff --git a/lib/pytz/zoneinfo/Atlantic/St_Helena.py b/lib/pytz-old/zoneinfo/Atlantic/St_Helena.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/St_Helena.py
rename to lib/pytz-old/zoneinfo/Atlantic/St_Helena.py
diff --git a/lib/pytz-old/zoneinfo/Atlantic/Stanley b/lib/pytz-old/zoneinfo/Atlantic/Stanley
new file mode 100644
index 0000000..aec7a5d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Atlantic/Stanley differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Stanley.py b/lib/pytz-old/zoneinfo/Atlantic/Stanley.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/Stanley.py
rename to lib/pytz-old/zoneinfo/Atlantic/Stanley.py
diff --git a/lib/pytz/zoneinfo/Atlantic/__init__.py b/lib/pytz-old/zoneinfo/Atlantic/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Atlantic/__init__.py
rename to lib/pytz-old/zoneinfo/Atlantic/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Australia/ACT b/lib/pytz-old/zoneinfo/Australia/ACT
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/ACT differ
diff --git a/lib/pytz/zoneinfo/Australia/ACT.py b/lib/pytz-old/zoneinfo/Australia/ACT.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/ACT.py
rename to lib/pytz-old/zoneinfo/Australia/ACT.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Adelaide b/lib/pytz-old/zoneinfo/Australia/Adelaide
new file mode 100644
index 0000000..4f331a8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Adelaide differ
diff --git a/lib/pytz/zoneinfo/Australia/Adelaide.py b/lib/pytz-old/zoneinfo/Australia/Adelaide.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Adelaide.py
rename to lib/pytz-old/zoneinfo/Australia/Adelaide.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Brisbane b/lib/pytz-old/zoneinfo/Australia/Brisbane
new file mode 100644
index 0000000..a327d83
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Brisbane differ
diff --git a/lib/pytz/zoneinfo/Australia/Brisbane.py b/lib/pytz-old/zoneinfo/Australia/Brisbane.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Brisbane.py
rename to lib/pytz-old/zoneinfo/Australia/Brisbane.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Broken_Hill b/lib/pytz-old/zoneinfo/Australia/Broken_Hill
new file mode 100644
index 0000000..768b167
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Broken_Hill differ
diff --git a/lib/pytz/zoneinfo/Australia/Broken_Hill.py b/lib/pytz-old/zoneinfo/Australia/Broken_Hill.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Broken_Hill.py
rename to lib/pytz-old/zoneinfo/Australia/Broken_Hill.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Canberra b/lib/pytz-old/zoneinfo/Australia/Canberra
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Canberra differ
diff --git a/lib/pytz/zoneinfo/Australia/Canberra.py b/lib/pytz-old/zoneinfo/Australia/Canberra.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Canberra.py
rename to lib/pytz-old/zoneinfo/Australia/Canberra.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Currie b/lib/pytz-old/zoneinfo/Australia/Currie
new file mode 100644
index 0000000..a3f6f29
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Currie differ
diff --git a/lib/pytz/zoneinfo/Australia/Currie.py b/lib/pytz-old/zoneinfo/Australia/Currie.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Currie.py
rename to lib/pytz-old/zoneinfo/Australia/Currie.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Darwin b/lib/pytz-old/zoneinfo/Australia/Darwin
new file mode 100644
index 0000000..c6ae9a7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Darwin differ
diff --git a/lib/pytz/zoneinfo/Australia/Darwin.py b/lib/pytz-old/zoneinfo/Australia/Darwin.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Darwin.py
rename to lib/pytz-old/zoneinfo/Australia/Darwin.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Eucla b/lib/pytz-old/zoneinfo/Australia/Eucla
new file mode 100644
index 0000000..baba07a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Eucla differ
diff --git a/lib/pytz-old/zoneinfo/Australia/Hobart b/lib/pytz-old/zoneinfo/Australia/Hobart
new file mode 100644
index 0000000..07784ce
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Hobart differ
diff --git a/lib/pytz/zoneinfo/Australia/Hobart.py b/lib/pytz-old/zoneinfo/Australia/Hobart.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Hobart.py
rename to lib/pytz-old/zoneinfo/Australia/Hobart.py
diff --git a/lib/pytz-old/zoneinfo/Australia/LHI b/lib/pytz-old/zoneinfo/Australia/LHI
new file mode 100644
index 0000000..a653e51
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/LHI differ
diff --git a/lib/pytz/zoneinfo/Australia/LHI.py b/lib/pytz-old/zoneinfo/Australia/LHI.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/LHI.py
rename to lib/pytz-old/zoneinfo/Australia/LHI.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Lindeman b/lib/pytz-old/zoneinfo/Australia/Lindeman
new file mode 100644
index 0000000..71ca143
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Lindeman differ
diff --git a/lib/pytz/zoneinfo/Australia/Lindeman.py b/lib/pytz-old/zoneinfo/Australia/Lindeman.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Lindeman.py
rename to lib/pytz-old/zoneinfo/Australia/Lindeman.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Lord_Howe b/lib/pytz-old/zoneinfo/Australia/Lord_Howe
new file mode 100644
index 0000000..a653e51
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Lord_Howe differ
diff --git a/lib/pytz/zoneinfo/Australia/Lord_Howe.py b/lib/pytz-old/zoneinfo/Australia/Lord_Howe.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Lord_Howe.py
rename to lib/pytz-old/zoneinfo/Australia/Lord_Howe.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Melbourne b/lib/pytz-old/zoneinfo/Australia/Melbourne
new file mode 100644
index 0000000..ec8dfe0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Melbourne differ
diff --git a/lib/pytz/zoneinfo/Australia/Melbourne.py b/lib/pytz-old/zoneinfo/Australia/Melbourne.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Melbourne.py
rename to lib/pytz-old/zoneinfo/Australia/Melbourne.py
diff --git a/lib/pytz-old/zoneinfo/Australia/NSW b/lib/pytz-old/zoneinfo/Australia/NSW
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/NSW differ
diff --git a/lib/pytz/zoneinfo/Australia/NSW.py b/lib/pytz-old/zoneinfo/Australia/NSW.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/NSW.py
rename to lib/pytz-old/zoneinfo/Australia/NSW.py
diff --git a/lib/pytz-old/zoneinfo/Australia/North b/lib/pytz-old/zoneinfo/Australia/North
new file mode 100644
index 0000000..c6ae9a7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/North differ
diff --git a/lib/pytz/zoneinfo/Australia/North.py b/lib/pytz-old/zoneinfo/Australia/North.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/North.py
rename to lib/pytz-old/zoneinfo/Australia/North.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Perth b/lib/pytz-old/zoneinfo/Australia/Perth
new file mode 100644
index 0000000..85c26d5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Perth differ
diff --git a/lib/pytz/zoneinfo/Australia/Perth.py b/lib/pytz-old/zoneinfo/Australia/Perth.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Perth.py
rename to lib/pytz-old/zoneinfo/Australia/Perth.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Queensland b/lib/pytz-old/zoneinfo/Australia/Queensland
new file mode 100644
index 0000000..a327d83
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Queensland differ
diff --git a/lib/pytz/zoneinfo/Australia/Queensland.py b/lib/pytz-old/zoneinfo/Australia/Queensland.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Queensland.py
rename to lib/pytz-old/zoneinfo/Australia/Queensland.py
diff --git a/lib/pytz-old/zoneinfo/Australia/South b/lib/pytz-old/zoneinfo/Australia/South
new file mode 100644
index 0000000..4f331a8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/South differ
diff --git a/lib/pytz/zoneinfo/Australia/South.py b/lib/pytz-old/zoneinfo/Australia/South.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/South.py
rename to lib/pytz-old/zoneinfo/Australia/South.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Sydney b/lib/pytz-old/zoneinfo/Australia/Sydney
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Sydney differ
diff --git a/lib/pytz/zoneinfo/Australia/Sydney.py b/lib/pytz-old/zoneinfo/Australia/Sydney.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Sydney.py
rename to lib/pytz-old/zoneinfo/Australia/Sydney.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Tasmania b/lib/pytz-old/zoneinfo/Australia/Tasmania
new file mode 100644
index 0000000..07784ce
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Tasmania differ
diff --git a/lib/pytz/zoneinfo/Australia/Tasmania.py b/lib/pytz-old/zoneinfo/Australia/Tasmania.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Tasmania.py
rename to lib/pytz-old/zoneinfo/Australia/Tasmania.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Victoria b/lib/pytz-old/zoneinfo/Australia/Victoria
new file mode 100644
index 0000000..ec8dfe0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Victoria differ
diff --git a/lib/pytz/zoneinfo/Australia/Victoria.py b/lib/pytz-old/zoneinfo/Australia/Victoria.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Victoria.py
rename to lib/pytz-old/zoneinfo/Australia/Victoria.py
diff --git a/lib/pytz-old/zoneinfo/Australia/West b/lib/pytz-old/zoneinfo/Australia/West
new file mode 100644
index 0000000..85c26d5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/West differ
diff --git a/lib/pytz/zoneinfo/Australia/West.py b/lib/pytz-old/zoneinfo/Australia/West.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/West.py
rename to lib/pytz-old/zoneinfo/Australia/West.py
diff --git a/lib/pytz-old/zoneinfo/Australia/Yancowinna b/lib/pytz-old/zoneinfo/Australia/Yancowinna
new file mode 100644
index 0000000..768b167
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Australia/Yancowinna differ
diff --git a/lib/pytz/zoneinfo/Australia/Yancowinna.py b/lib/pytz-old/zoneinfo/Australia/Yancowinna.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/Yancowinna.py
rename to lib/pytz-old/zoneinfo/Australia/Yancowinna.py
diff --git a/lib/pytz/zoneinfo/Australia/__init__.py b/lib/pytz-old/zoneinfo/Australia/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Australia/__init__.py
rename to lib/pytz-old/zoneinfo/Australia/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Brazil/Acre b/lib/pytz-old/zoneinfo/Brazil/Acre
new file mode 100644
index 0000000..788d0e9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Brazil/Acre differ
diff --git a/lib/pytz/zoneinfo/Brazil/Acre.py b/lib/pytz-old/zoneinfo/Brazil/Acre.py
similarity index 100%
rename from lib/pytz/zoneinfo/Brazil/Acre.py
rename to lib/pytz-old/zoneinfo/Brazil/Acre.py
diff --git a/lib/pytz-old/zoneinfo/Brazil/DeNoronha b/lib/pytz-old/zoneinfo/Brazil/DeNoronha
new file mode 100644
index 0000000..774b14e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Brazil/DeNoronha differ
diff --git a/lib/pytz/zoneinfo/Brazil/DeNoronha.py b/lib/pytz-old/zoneinfo/Brazil/DeNoronha.py
similarity index 100%
rename from lib/pytz/zoneinfo/Brazil/DeNoronha.py
rename to lib/pytz-old/zoneinfo/Brazil/DeNoronha.py
diff --git a/lib/pytz-old/zoneinfo/Brazil/East b/lib/pytz-old/zoneinfo/Brazil/East
new file mode 100644
index 0000000..552ce7c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Brazil/East differ
diff --git a/lib/pytz/zoneinfo/Brazil/East.py b/lib/pytz-old/zoneinfo/Brazil/East.py
similarity index 100%
rename from lib/pytz/zoneinfo/Brazil/East.py
rename to lib/pytz-old/zoneinfo/Brazil/East.py
diff --git a/lib/pytz-old/zoneinfo/Brazil/West b/lib/pytz-old/zoneinfo/Brazil/West
new file mode 100644
index 0000000..e0222f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Brazil/West differ
diff --git a/lib/pytz/zoneinfo/Brazil/West.py b/lib/pytz-old/zoneinfo/Brazil/West.py
similarity index 100%
rename from lib/pytz/zoneinfo/Brazil/West.py
rename to lib/pytz-old/zoneinfo/Brazil/West.py
diff --git a/lib/pytz/zoneinfo/Brazil/__init__.py b/lib/pytz-old/zoneinfo/Brazil/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Brazil/__init__.py
rename to lib/pytz-old/zoneinfo/Brazil/__init__.py
diff --git a/lib/pytz-old/zoneinfo/CET b/lib/pytz-old/zoneinfo/CET
new file mode 100644
index 0000000..4c4f8ef
Binary files /dev/null and b/lib/pytz-old/zoneinfo/CET differ
diff --git a/lib/pytz/zoneinfo/CET.py b/lib/pytz-old/zoneinfo/CET.py
similarity index 100%
rename from lib/pytz/zoneinfo/CET.py
rename to lib/pytz-old/zoneinfo/CET.py
diff --git a/lib/pytz-old/zoneinfo/CST6CDT b/lib/pytz-old/zoneinfo/CST6CDT
new file mode 100644
index 0000000..5c8a1d9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/CST6CDT differ
diff --git a/lib/pytz/zoneinfo/CST6CDT.py b/lib/pytz-old/zoneinfo/CST6CDT.py
similarity index 100%
rename from lib/pytz/zoneinfo/CST6CDT.py
rename to lib/pytz-old/zoneinfo/CST6CDT.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Atlantic b/lib/pytz-old/zoneinfo/Canada/Atlantic
new file mode 100644
index 0000000..f86ece4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Atlantic differ
diff --git a/lib/pytz/zoneinfo/Canada/Atlantic.py b/lib/pytz-old/zoneinfo/Canada/Atlantic.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Atlantic.py
rename to lib/pytz-old/zoneinfo/Canada/Atlantic.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Central b/lib/pytz-old/zoneinfo/Canada/Central
new file mode 100644
index 0000000..2ffe3d8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Central differ
diff --git a/lib/pytz/zoneinfo/Canada/Central.py b/lib/pytz-old/zoneinfo/Canada/Central.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Central.py
rename to lib/pytz-old/zoneinfo/Canada/Central.py
diff --git a/lib/pytz-old/zoneinfo/Canada/East-Saskatchewan b/lib/pytz-old/zoneinfo/Canada/East-Saskatchewan
new file mode 100644
index 0000000..5fe8d6b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/East-Saskatchewan differ
diff --git a/lib/pytz/zoneinfo/Canada/East_minus_Saskatchewan.py b/lib/pytz-old/zoneinfo/Canada/East_minus_Saskatchewan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/East_minus_Saskatchewan.py
rename to lib/pytz-old/zoneinfo/Canada/East_minus_Saskatchewan.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Eastern b/lib/pytz-old/zoneinfo/Canada/Eastern
new file mode 100644
index 0000000..7b4682a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Eastern differ
diff --git a/lib/pytz/zoneinfo/Canada/Eastern.py b/lib/pytz-old/zoneinfo/Canada/Eastern.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Eastern.py
rename to lib/pytz-old/zoneinfo/Canada/Eastern.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Mountain b/lib/pytz-old/zoneinfo/Canada/Mountain
new file mode 100644
index 0000000..d02fbcd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Mountain differ
diff --git a/lib/pytz/zoneinfo/Canada/Mountain.py b/lib/pytz-old/zoneinfo/Canada/Mountain.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Mountain.py
rename to lib/pytz-old/zoneinfo/Canada/Mountain.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Newfoundland b/lib/pytz-old/zoneinfo/Canada/Newfoundland
new file mode 100644
index 0000000..a1d1485
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Newfoundland differ
diff --git a/lib/pytz/zoneinfo/Canada/Newfoundland.py b/lib/pytz-old/zoneinfo/Canada/Newfoundland.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Newfoundland.py
rename to lib/pytz-old/zoneinfo/Canada/Newfoundland.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Pacific b/lib/pytz-old/zoneinfo/Canada/Pacific
new file mode 100644
index 0000000..9b5d924
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Pacific differ
diff --git a/lib/pytz/zoneinfo/Canada/Pacific.py b/lib/pytz-old/zoneinfo/Canada/Pacific.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Pacific.py
rename to lib/pytz-old/zoneinfo/Canada/Pacific.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Saskatchewan b/lib/pytz-old/zoneinfo/Canada/Saskatchewan
new file mode 100644
index 0000000..5fe8d6b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Saskatchewan differ
diff --git a/lib/pytz/zoneinfo/Canada/Saskatchewan.py b/lib/pytz-old/zoneinfo/Canada/Saskatchewan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Saskatchewan.py
rename to lib/pytz-old/zoneinfo/Canada/Saskatchewan.py
diff --git a/lib/pytz-old/zoneinfo/Canada/Yukon b/lib/pytz-old/zoneinfo/Canada/Yukon
new file mode 100644
index 0000000..8604c5c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Canada/Yukon differ
diff --git a/lib/pytz/zoneinfo/Canada/Yukon.py b/lib/pytz-old/zoneinfo/Canada/Yukon.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/Yukon.py
rename to lib/pytz-old/zoneinfo/Canada/Yukon.py
diff --git a/lib/pytz/zoneinfo/Canada/__init__.py b/lib/pytz-old/zoneinfo/Canada/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Canada/__init__.py
rename to lib/pytz-old/zoneinfo/Canada/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Chile/Continental b/lib/pytz-old/zoneinfo/Chile/Continental
new file mode 100644
index 0000000..92cf559
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Chile/Continental differ
diff --git a/lib/pytz/zoneinfo/Chile/Continental.py b/lib/pytz-old/zoneinfo/Chile/Continental.py
similarity index 100%
rename from lib/pytz/zoneinfo/Chile/Continental.py
rename to lib/pytz-old/zoneinfo/Chile/Continental.py
diff --git a/lib/pytz-old/zoneinfo/Chile/EasterIsland b/lib/pytz-old/zoneinfo/Chile/EasterIsland
new file mode 100644
index 0000000..8c8a6c7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Chile/EasterIsland differ
diff --git a/lib/pytz/zoneinfo/Chile/EasterIsland.py b/lib/pytz-old/zoneinfo/Chile/EasterIsland.py
similarity index 100%
rename from lib/pytz/zoneinfo/Chile/EasterIsland.py
rename to lib/pytz-old/zoneinfo/Chile/EasterIsland.py
diff --git a/lib/pytz/zoneinfo/Chile/__init__.py b/lib/pytz-old/zoneinfo/Chile/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Chile/__init__.py
rename to lib/pytz-old/zoneinfo/Chile/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Cuba b/lib/pytz-old/zoneinfo/Cuba
new file mode 100644
index 0000000..1a58fcd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Cuba differ
diff --git a/lib/pytz/zoneinfo/Cuba.py b/lib/pytz-old/zoneinfo/Cuba.py
similarity index 100%
rename from lib/pytz/zoneinfo/Cuba.py
rename to lib/pytz-old/zoneinfo/Cuba.py
diff --git a/lib/pytz-old/zoneinfo/EET b/lib/pytz-old/zoneinfo/EET
new file mode 100644
index 0000000..beb273a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/EET differ
diff --git a/lib/pytz/zoneinfo/EET.py b/lib/pytz-old/zoneinfo/EET.py
similarity index 100%
rename from lib/pytz/zoneinfo/EET.py
rename to lib/pytz-old/zoneinfo/EET.py
diff --git a/lib/pytz-old/zoneinfo/EST b/lib/pytz-old/zoneinfo/EST
new file mode 100644
index 0000000..ae34663
Binary files /dev/null and b/lib/pytz-old/zoneinfo/EST differ
diff --git a/lib/pytz/zoneinfo/EST.py b/lib/pytz-old/zoneinfo/EST.py
similarity index 100%
rename from lib/pytz/zoneinfo/EST.py
rename to lib/pytz-old/zoneinfo/EST.py
diff --git a/lib/pytz-old/zoneinfo/EST5EDT b/lib/pytz-old/zoneinfo/EST5EDT
new file mode 100644
index 0000000..54541fc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/EST5EDT differ
diff --git a/lib/pytz/zoneinfo/EST5EDT.py b/lib/pytz-old/zoneinfo/EST5EDT.py
similarity index 100%
rename from lib/pytz/zoneinfo/EST5EDT.py
rename to lib/pytz-old/zoneinfo/EST5EDT.py
diff --git a/lib/pytz-old/zoneinfo/Egypt b/lib/pytz-old/zoneinfo/Egypt
new file mode 100644
index 0000000..0eeed11
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Egypt differ
diff --git a/lib/pytz/zoneinfo/Egypt.py b/lib/pytz-old/zoneinfo/Egypt.py
similarity index 100%
rename from lib/pytz/zoneinfo/Egypt.py
rename to lib/pytz-old/zoneinfo/Egypt.py
diff --git a/lib/pytz-old/zoneinfo/Eire b/lib/pytz-old/zoneinfo/Eire
new file mode 100644
index 0000000..a7cffbb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Eire differ
diff --git a/lib/pytz/zoneinfo/Eire.py b/lib/pytz-old/zoneinfo/Eire.py
similarity index 100%
rename from lib/pytz/zoneinfo/Eire.py
rename to lib/pytz-old/zoneinfo/Eire.py
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT b/lib/pytz-old/zoneinfo/Etc/GMT
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+0 b/lib/pytz-old/zoneinfo/Etc/GMT+0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+0 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+1 b/lib/pytz-old/zoneinfo/Etc/GMT+1
new file mode 100644
index 0000000..2f40cc7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+1 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+10 b/lib/pytz-old/zoneinfo/Etc/GMT+10
new file mode 100644
index 0000000..2087965
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+10 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+11 b/lib/pytz-old/zoneinfo/Etc/GMT+11
new file mode 100644
index 0000000..af4a6b3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+11 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+12 b/lib/pytz-old/zoneinfo/Etc/GMT+12
new file mode 100644
index 0000000..f095534
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+12 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+2 b/lib/pytz-old/zoneinfo/Etc/GMT+2
new file mode 100644
index 0000000..85a1fc1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+2 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+3 b/lib/pytz-old/zoneinfo/Etc/GMT+3
new file mode 100644
index 0000000..a24f587
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+3 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+4 b/lib/pytz-old/zoneinfo/Etc/GMT+4
new file mode 100644
index 0000000..ab74517
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+4 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+5 b/lib/pytz-old/zoneinfo/Etc/GMT+5
new file mode 100644
index 0000000..01f1d77
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+5 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+6 b/lib/pytz-old/zoneinfo/Etc/GMT+6
new file mode 100644
index 0000000..3ced48b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+6 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+7 b/lib/pytz-old/zoneinfo/Etc/GMT+7
new file mode 100644
index 0000000..5f58127
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+7 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+8 b/lib/pytz-old/zoneinfo/Etc/GMT+8
new file mode 100644
index 0000000..be23d96
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+8 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT+9 b/lib/pytz-old/zoneinfo/Etc/GMT+9
new file mode 100644
index 0000000..d00c50c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT+9 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-0 b/lib/pytz-old/zoneinfo/Etc/GMT-0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-0 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-1 b/lib/pytz-old/zoneinfo/Etc/GMT-1
new file mode 100644
index 0000000..088a76e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-1 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-10 b/lib/pytz-old/zoneinfo/Etc/GMT-10
new file mode 100644
index 0000000..a4da44f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-10 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-11 b/lib/pytz-old/zoneinfo/Etc/GMT-11
new file mode 100644
index 0000000..e0112a9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-11 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-12 b/lib/pytz-old/zoneinfo/Etc/GMT-12
new file mode 100644
index 0000000..c1e08b7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-12 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-13 b/lib/pytz-old/zoneinfo/Etc/GMT-13
new file mode 100644
index 0000000..1ab0519
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-13 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-14 b/lib/pytz-old/zoneinfo/Etc/GMT-14
new file mode 100644
index 0000000..afaf3fa
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-14 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-2 b/lib/pytz-old/zoneinfo/Etc/GMT-2
new file mode 100644
index 0000000..6289cad
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-2 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-3 b/lib/pytz-old/zoneinfo/Etc/GMT-3
new file mode 100644
index 0000000..27434cd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-3 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-4 b/lib/pytz-old/zoneinfo/Etc/GMT-4
new file mode 100644
index 0000000..2fc6966
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-4 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-5 b/lib/pytz-old/zoneinfo/Etc/GMT-5
new file mode 100644
index 0000000..8508e72
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-5 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-6 b/lib/pytz-old/zoneinfo/Etc/GMT-6
new file mode 100644
index 0000000..5b9678e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-6 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-7 b/lib/pytz-old/zoneinfo/Etc/GMT-7
new file mode 100644
index 0000000..ccf4c39
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-7 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-8 b/lib/pytz-old/zoneinfo/Etc/GMT-8
new file mode 100644
index 0000000..db4cfa6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-8 differ
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT-9 b/lib/pytz-old/zoneinfo/Etc/GMT-9
new file mode 100644
index 0000000..56ea117
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT-9 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT.py b/lib/pytz-old/zoneinfo/Etc/GMT.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT.py
rename to lib/pytz-old/zoneinfo/Etc/GMT.py
diff --git a/lib/pytz-old/zoneinfo/Etc/GMT0 b/lib/pytz-old/zoneinfo/Etc/GMT0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/GMT0 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT0.py b/lib/pytz-old/zoneinfo/Etc/GMT0.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT0.py
rename to lib/pytz-old/zoneinfo/Etc/GMT0.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_0.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_0.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_0.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_0.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_1.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_1.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_1.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_1.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_10.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_10.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_10.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_10.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_11.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_11.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_11.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_11.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_12.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_12.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_12.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_12.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_13.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_13.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_13.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_13.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_14.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_14.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_14.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_14.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_2.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_2.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_2.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_2.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_3.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_3.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_3.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_3.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_4.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_4.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_4.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_4.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_5.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_5.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_5.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_5.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_6.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_6.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_6.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_6.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_7.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_7.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_7.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_7.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_8.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_8.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_8.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_8.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_minus_9.py b/lib/pytz-old/zoneinfo/Etc/GMT_minus_9.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_minus_9.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_minus_9.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_0.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_0.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_0.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_0.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_1.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_1.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_1.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_1.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_10.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_10.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_10.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_10.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_11.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_11.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_11.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_11.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_12.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_12.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_12.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_12.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_2.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_2.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_2.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_2.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_3.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_3.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_3.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_3.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_4.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_4.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_4.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_4.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_5.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_5.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_5.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_5.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_6.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_6.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_6.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_6.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_7.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_7.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_7.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_7.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_8.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_8.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_8.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_8.py
diff --git a/lib/pytz/zoneinfo/Etc/GMT_plus_9.py b/lib/pytz-old/zoneinfo/Etc/GMT_plus_9.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/GMT_plus_9.py
rename to lib/pytz-old/zoneinfo/Etc/GMT_plus_9.py
diff --git a/lib/pytz-old/zoneinfo/Etc/Greenwich b/lib/pytz-old/zoneinfo/Etc/Greenwich
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/Greenwich differ
diff --git a/lib/pytz/zoneinfo/Etc/Greenwich.py b/lib/pytz-old/zoneinfo/Etc/Greenwich.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/Greenwich.py
rename to lib/pytz-old/zoneinfo/Etc/Greenwich.py
diff --git a/lib/pytz-old/zoneinfo/Etc/UCT b/lib/pytz-old/zoneinfo/Etc/UCT
new file mode 100644
index 0000000..40147b9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/UCT differ
diff --git a/lib/pytz/zoneinfo/Etc/UCT.py b/lib/pytz-old/zoneinfo/Etc/UCT.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/UCT.py
rename to lib/pytz-old/zoneinfo/Etc/UCT.py
diff --git a/lib/pytz-old/zoneinfo/Etc/UTC b/lib/pytz-old/zoneinfo/Etc/UTC
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/UTC differ
diff --git a/lib/pytz/zoneinfo/Etc/UTC.py b/lib/pytz-old/zoneinfo/Etc/UTC.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/UTC.py
rename to lib/pytz-old/zoneinfo/Etc/UTC.py
diff --git a/lib/pytz-old/zoneinfo/Etc/Universal b/lib/pytz-old/zoneinfo/Etc/Universal
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/Universal differ
diff --git a/lib/pytz/zoneinfo/Etc/Universal.py b/lib/pytz-old/zoneinfo/Etc/Universal.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/Universal.py
rename to lib/pytz-old/zoneinfo/Etc/Universal.py
diff --git a/lib/pytz-old/zoneinfo/Etc/Zulu b/lib/pytz-old/zoneinfo/Etc/Zulu
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Etc/Zulu differ
diff --git a/lib/pytz/zoneinfo/Etc/Zulu.py b/lib/pytz-old/zoneinfo/Etc/Zulu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/Zulu.py
rename to lib/pytz-old/zoneinfo/Etc/Zulu.py
diff --git a/lib/pytz/zoneinfo/Etc/__init__.py b/lib/pytz-old/zoneinfo/Etc/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Etc/__init__.py
rename to lib/pytz-old/zoneinfo/Etc/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Amsterdam b/lib/pytz-old/zoneinfo/Europe/Amsterdam
new file mode 100644
index 0000000..f74769d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Amsterdam differ
diff --git a/lib/pytz/zoneinfo/Europe/Amsterdam.py b/lib/pytz-old/zoneinfo/Europe/Amsterdam.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Amsterdam.py
rename to lib/pytz-old/zoneinfo/Europe/Amsterdam.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Andorra b/lib/pytz-old/zoneinfo/Europe/Andorra
new file mode 100644
index 0000000..b06de7a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Andorra differ
diff --git a/lib/pytz/zoneinfo/Europe/Andorra.py b/lib/pytz-old/zoneinfo/Europe/Andorra.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Andorra.py
rename to lib/pytz-old/zoneinfo/Europe/Andorra.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Athens b/lib/pytz-old/zoneinfo/Europe/Athens
new file mode 100644
index 0000000..0001602
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Athens differ
diff --git a/lib/pytz/zoneinfo/Europe/Athens.py b/lib/pytz-old/zoneinfo/Europe/Athens.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Athens.py
rename to lib/pytz-old/zoneinfo/Europe/Athens.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Belfast b/lib/pytz-old/zoneinfo/Europe/Belfast
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Belfast differ
diff --git a/lib/pytz/zoneinfo/Europe/Belfast.py b/lib/pytz-old/zoneinfo/Europe/Belfast.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Belfast.py
rename to lib/pytz-old/zoneinfo/Europe/Belfast.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Belgrade b/lib/pytz-old/zoneinfo/Europe/Belgrade
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Belgrade differ
diff --git a/lib/pytz/zoneinfo/Europe/Belgrade.py b/lib/pytz-old/zoneinfo/Europe/Belgrade.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Belgrade.py
rename to lib/pytz-old/zoneinfo/Europe/Belgrade.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Berlin b/lib/pytz-old/zoneinfo/Europe/Berlin
new file mode 100644
index 0000000..b4f2a2a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Berlin differ
diff --git a/lib/pytz/zoneinfo/Europe/Berlin.py b/lib/pytz-old/zoneinfo/Europe/Berlin.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Berlin.py
rename to lib/pytz-old/zoneinfo/Europe/Berlin.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Bratislava b/lib/pytz-old/zoneinfo/Europe/Bratislava
new file mode 100644
index 0000000..4eabe5c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Bratislava differ
diff --git a/lib/pytz/zoneinfo/Europe/Bratislava.py b/lib/pytz-old/zoneinfo/Europe/Bratislava.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Bratislava.py
rename to lib/pytz-old/zoneinfo/Europe/Bratislava.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Brussels b/lib/pytz-old/zoneinfo/Europe/Brussels
new file mode 100644
index 0000000..d8f19a6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Brussels differ
diff --git a/lib/pytz/zoneinfo/Europe/Brussels.py b/lib/pytz-old/zoneinfo/Europe/Brussels.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Brussels.py
rename to lib/pytz-old/zoneinfo/Europe/Brussels.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Bucharest b/lib/pytz-old/zoneinfo/Europe/Bucharest
new file mode 100644
index 0000000..e0eac4c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Bucharest differ
diff --git a/lib/pytz/zoneinfo/Europe/Bucharest.py b/lib/pytz-old/zoneinfo/Europe/Bucharest.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Bucharest.py
rename to lib/pytz-old/zoneinfo/Europe/Bucharest.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Budapest b/lib/pytz-old/zoneinfo/Europe/Budapest
new file mode 100644
index 0000000..3ddf6a5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Budapest differ
diff --git a/lib/pytz/zoneinfo/Europe/Budapest.py b/lib/pytz-old/zoneinfo/Europe/Budapest.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Budapest.py
rename to lib/pytz-old/zoneinfo/Europe/Budapest.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Busingen b/lib/pytz-old/zoneinfo/Europe/Busingen
new file mode 100644
index 0000000..9c2b600
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Busingen differ
diff --git a/lib/pytz-old/zoneinfo/Europe/Chisinau b/lib/pytz-old/zoneinfo/Europe/Chisinau
new file mode 100644
index 0000000..7998b2d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Chisinau differ
diff --git a/lib/pytz/zoneinfo/Europe/Chisinau.py b/lib/pytz-old/zoneinfo/Europe/Chisinau.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Chisinau.py
rename to lib/pytz-old/zoneinfo/Europe/Chisinau.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Copenhagen b/lib/pytz-old/zoneinfo/Europe/Copenhagen
new file mode 100644
index 0000000..be87cf1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Copenhagen differ
diff --git a/lib/pytz/zoneinfo/Europe/Copenhagen.py b/lib/pytz-old/zoneinfo/Europe/Copenhagen.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Copenhagen.py
rename to lib/pytz-old/zoneinfo/Europe/Copenhagen.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Dublin b/lib/pytz-old/zoneinfo/Europe/Dublin
new file mode 100644
index 0000000..a7cffbb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Dublin differ
diff --git a/lib/pytz/zoneinfo/Europe/Dublin.py b/lib/pytz-old/zoneinfo/Europe/Dublin.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Dublin.py
rename to lib/pytz-old/zoneinfo/Europe/Dublin.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Gibraltar b/lib/pytz-old/zoneinfo/Europe/Gibraltar
new file mode 100644
index 0000000..a7105fa
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Gibraltar differ
diff --git a/lib/pytz/zoneinfo/Europe/Gibraltar.py b/lib/pytz-old/zoneinfo/Europe/Gibraltar.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Gibraltar.py
rename to lib/pytz-old/zoneinfo/Europe/Gibraltar.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Guernsey b/lib/pytz-old/zoneinfo/Europe/Guernsey
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Guernsey differ
diff --git a/lib/pytz/zoneinfo/Europe/Guernsey.py b/lib/pytz-old/zoneinfo/Europe/Guernsey.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Guernsey.py
rename to lib/pytz-old/zoneinfo/Europe/Guernsey.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Helsinki b/lib/pytz-old/zoneinfo/Europe/Helsinki
new file mode 100644
index 0000000..29b3c81
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Helsinki differ
diff --git a/lib/pytz/zoneinfo/Europe/Helsinki.py b/lib/pytz-old/zoneinfo/Europe/Helsinki.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Helsinki.py
rename to lib/pytz-old/zoneinfo/Europe/Helsinki.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Isle_of_Man b/lib/pytz-old/zoneinfo/Europe/Isle_of_Man
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Isle_of_Man differ
diff --git a/lib/pytz/zoneinfo/Europe/Isle_of_Man.py b/lib/pytz-old/zoneinfo/Europe/Isle_of_Man.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Isle_of_Man.py
rename to lib/pytz-old/zoneinfo/Europe/Isle_of_Man.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Istanbul b/lib/pytz-old/zoneinfo/Europe/Istanbul
new file mode 100644
index 0000000..d89aa3a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Istanbul differ
diff --git a/lib/pytz/zoneinfo/Europe/Istanbul.py b/lib/pytz-old/zoneinfo/Europe/Istanbul.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Istanbul.py
rename to lib/pytz-old/zoneinfo/Europe/Istanbul.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Jersey b/lib/pytz-old/zoneinfo/Europe/Jersey
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Jersey differ
diff --git a/lib/pytz/zoneinfo/Europe/Jersey.py b/lib/pytz-old/zoneinfo/Europe/Jersey.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Jersey.py
rename to lib/pytz-old/zoneinfo/Europe/Jersey.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Kaliningrad b/lib/pytz-old/zoneinfo/Europe/Kaliningrad
new file mode 100644
index 0000000..4805fe4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Kaliningrad differ
diff --git a/lib/pytz/zoneinfo/Europe/Kaliningrad.py b/lib/pytz-old/zoneinfo/Europe/Kaliningrad.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Kaliningrad.py
rename to lib/pytz-old/zoneinfo/Europe/Kaliningrad.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Kiev b/lib/pytz-old/zoneinfo/Europe/Kiev
new file mode 100644
index 0000000..b3e20a7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Kiev differ
diff --git a/lib/pytz/zoneinfo/Europe/Kiev.py b/lib/pytz-old/zoneinfo/Europe/Kiev.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Kiev.py
rename to lib/pytz-old/zoneinfo/Europe/Kiev.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Lisbon b/lib/pytz-old/zoneinfo/Europe/Lisbon
new file mode 100644
index 0000000..b9aff3a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Lisbon differ
diff --git a/lib/pytz/zoneinfo/Europe/Lisbon.py b/lib/pytz-old/zoneinfo/Europe/Lisbon.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Lisbon.py
rename to lib/pytz-old/zoneinfo/Europe/Lisbon.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Ljubljana b/lib/pytz-old/zoneinfo/Europe/Ljubljana
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Ljubljana differ
diff --git a/lib/pytz/zoneinfo/Europe/Ljubljana.py b/lib/pytz-old/zoneinfo/Europe/Ljubljana.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Ljubljana.py
rename to lib/pytz-old/zoneinfo/Europe/Ljubljana.py
diff --git a/lib/pytz-old/zoneinfo/Europe/London b/lib/pytz-old/zoneinfo/Europe/London
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/London differ
diff --git a/lib/pytz/zoneinfo/Europe/London.py b/lib/pytz-old/zoneinfo/Europe/London.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/London.py
rename to lib/pytz-old/zoneinfo/Europe/London.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Luxembourg b/lib/pytz-old/zoneinfo/Europe/Luxembourg
new file mode 100644
index 0000000..6fae86c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Luxembourg differ
diff --git a/lib/pytz/zoneinfo/Europe/Luxembourg.py b/lib/pytz-old/zoneinfo/Europe/Luxembourg.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Luxembourg.py
rename to lib/pytz-old/zoneinfo/Europe/Luxembourg.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Madrid b/lib/pytz-old/zoneinfo/Europe/Madrid
new file mode 100644
index 0000000..af47432
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Madrid differ
diff --git a/lib/pytz/zoneinfo/Europe/Madrid.py b/lib/pytz-old/zoneinfo/Europe/Madrid.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Madrid.py
rename to lib/pytz-old/zoneinfo/Europe/Madrid.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Malta b/lib/pytz-old/zoneinfo/Europe/Malta
new file mode 100644
index 0000000..d251938
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Malta differ
diff --git a/lib/pytz/zoneinfo/Europe/Malta.py b/lib/pytz-old/zoneinfo/Europe/Malta.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Malta.py
rename to lib/pytz-old/zoneinfo/Europe/Malta.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Mariehamn b/lib/pytz-old/zoneinfo/Europe/Mariehamn
new file mode 100644
index 0000000..29b3c81
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Mariehamn differ
diff --git a/lib/pytz/zoneinfo/Europe/Mariehamn.py b/lib/pytz-old/zoneinfo/Europe/Mariehamn.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Mariehamn.py
rename to lib/pytz-old/zoneinfo/Europe/Mariehamn.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Minsk b/lib/pytz-old/zoneinfo/Europe/Minsk
new file mode 100644
index 0000000..28ef30a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Minsk differ
diff --git a/lib/pytz/zoneinfo/Europe/Minsk.py b/lib/pytz-old/zoneinfo/Europe/Minsk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Minsk.py
rename to lib/pytz-old/zoneinfo/Europe/Minsk.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Monaco b/lib/pytz-old/zoneinfo/Europe/Monaco
new file mode 100644
index 0000000..0b40f1e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Monaco differ
diff --git a/lib/pytz/zoneinfo/Europe/Monaco.py b/lib/pytz-old/zoneinfo/Europe/Monaco.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Monaco.py
rename to lib/pytz-old/zoneinfo/Europe/Monaco.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Moscow b/lib/pytz-old/zoneinfo/Europe/Moscow
new file mode 100644
index 0000000..bdbbaeb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Moscow differ
diff --git a/lib/pytz/zoneinfo/Europe/Moscow.py b/lib/pytz-old/zoneinfo/Europe/Moscow.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Moscow.py
rename to lib/pytz-old/zoneinfo/Europe/Moscow.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Nicosia b/lib/pytz-old/zoneinfo/Europe/Nicosia
new file mode 100644
index 0000000..3e663b2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Nicosia differ
diff --git a/lib/pytz/zoneinfo/Europe/Nicosia.py b/lib/pytz-old/zoneinfo/Europe/Nicosia.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Nicosia.py
rename to lib/pytz-old/zoneinfo/Europe/Nicosia.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Oslo b/lib/pytz-old/zoneinfo/Europe/Oslo
new file mode 100644
index 0000000..239c017
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Oslo differ
diff --git a/lib/pytz/zoneinfo/Europe/Oslo.py b/lib/pytz-old/zoneinfo/Europe/Oslo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Oslo.py
rename to lib/pytz-old/zoneinfo/Europe/Oslo.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Paris b/lib/pytz-old/zoneinfo/Europe/Paris
new file mode 100644
index 0000000..cf6e2e2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Paris differ
diff --git a/lib/pytz/zoneinfo/Europe/Paris.py b/lib/pytz-old/zoneinfo/Europe/Paris.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Paris.py
rename to lib/pytz-old/zoneinfo/Europe/Paris.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Podgorica b/lib/pytz-old/zoneinfo/Europe/Podgorica
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Podgorica differ
diff --git a/lib/pytz/zoneinfo/Europe/Podgorica.py b/lib/pytz-old/zoneinfo/Europe/Podgorica.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Podgorica.py
rename to lib/pytz-old/zoneinfo/Europe/Podgorica.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Prague b/lib/pytz-old/zoneinfo/Europe/Prague
new file mode 100644
index 0000000..4eabe5c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Prague differ
diff --git a/lib/pytz/zoneinfo/Europe/Prague.py b/lib/pytz-old/zoneinfo/Europe/Prague.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Prague.py
rename to lib/pytz-old/zoneinfo/Europe/Prague.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Riga b/lib/pytz-old/zoneinfo/Europe/Riga
new file mode 100644
index 0000000..b729ee8
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Riga differ
diff --git a/lib/pytz/zoneinfo/Europe/Riga.py b/lib/pytz-old/zoneinfo/Europe/Riga.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Riga.py
rename to lib/pytz-old/zoneinfo/Europe/Riga.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Rome b/lib/pytz-old/zoneinfo/Europe/Rome
new file mode 100644
index 0000000..5cc3040
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Rome differ
diff --git a/lib/pytz/zoneinfo/Europe/Rome.py b/lib/pytz-old/zoneinfo/Europe/Rome.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Rome.py
rename to lib/pytz-old/zoneinfo/Europe/Rome.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Samara b/lib/pytz-old/zoneinfo/Europe/Samara
new file mode 100644
index 0000000..79759f5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Samara differ
diff --git a/lib/pytz/zoneinfo/Europe/Samara.py b/lib/pytz-old/zoneinfo/Europe/Samara.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Samara.py
rename to lib/pytz-old/zoneinfo/Europe/Samara.py
diff --git a/lib/pytz-old/zoneinfo/Europe/San_Marino b/lib/pytz-old/zoneinfo/Europe/San_Marino
new file mode 100644
index 0000000..5cc3040
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/San_Marino differ
diff --git a/lib/pytz/zoneinfo/Europe/San_Marino.py b/lib/pytz-old/zoneinfo/Europe/San_Marino.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/San_Marino.py
rename to lib/pytz-old/zoneinfo/Europe/San_Marino.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Sarajevo b/lib/pytz-old/zoneinfo/Europe/Sarajevo
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Sarajevo differ
diff --git a/lib/pytz/zoneinfo/Europe/Sarajevo.py b/lib/pytz-old/zoneinfo/Europe/Sarajevo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Sarajevo.py
rename to lib/pytz-old/zoneinfo/Europe/Sarajevo.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Simferopol b/lib/pytz-old/zoneinfo/Europe/Simferopol
new file mode 100644
index 0000000..ebe9017
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Simferopol differ
diff --git a/lib/pytz/zoneinfo/Europe/Simferopol.py b/lib/pytz-old/zoneinfo/Europe/Simferopol.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Simferopol.py
rename to lib/pytz-old/zoneinfo/Europe/Simferopol.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Skopje b/lib/pytz-old/zoneinfo/Europe/Skopje
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Skopje differ
diff --git a/lib/pytz/zoneinfo/Europe/Skopje.py b/lib/pytz-old/zoneinfo/Europe/Skopje.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Skopje.py
rename to lib/pytz-old/zoneinfo/Europe/Skopje.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Sofia b/lib/pytz-old/zoneinfo/Europe/Sofia
new file mode 100644
index 0000000..763e074
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Sofia differ
diff --git a/lib/pytz/zoneinfo/Europe/Sofia.py b/lib/pytz-old/zoneinfo/Europe/Sofia.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Sofia.py
rename to lib/pytz-old/zoneinfo/Europe/Sofia.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Stockholm b/lib/pytz-old/zoneinfo/Europe/Stockholm
new file mode 100644
index 0000000..43c7f2e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Stockholm differ
diff --git a/lib/pytz/zoneinfo/Europe/Stockholm.py b/lib/pytz-old/zoneinfo/Europe/Stockholm.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Stockholm.py
rename to lib/pytz-old/zoneinfo/Europe/Stockholm.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Tallinn b/lib/pytz-old/zoneinfo/Europe/Tallinn
new file mode 100644
index 0000000..8a4f124
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Tallinn differ
diff --git a/lib/pytz/zoneinfo/Europe/Tallinn.py b/lib/pytz-old/zoneinfo/Europe/Tallinn.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Tallinn.py
rename to lib/pytz-old/zoneinfo/Europe/Tallinn.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Tirane b/lib/pytz-old/zoneinfo/Europe/Tirane
new file mode 100644
index 0000000..52c16a4
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Tirane differ
diff --git a/lib/pytz/zoneinfo/Europe/Tirane.py b/lib/pytz-old/zoneinfo/Europe/Tirane.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Tirane.py
rename to lib/pytz-old/zoneinfo/Europe/Tirane.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Tiraspol b/lib/pytz-old/zoneinfo/Europe/Tiraspol
new file mode 100644
index 0000000..7998b2d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Tiraspol differ
diff --git a/lib/pytz/zoneinfo/Europe/Tiraspol.py b/lib/pytz-old/zoneinfo/Europe/Tiraspol.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Tiraspol.py
rename to lib/pytz-old/zoneinfo/Europe/Tiraspol.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Uzhgorod b/lib/pytz-old/zoneinfo/Europe/Uzhgorod
new file mode 100644
index 0000000..8ddba90
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Uzhgorod differ
diff --git a/lib/pytz/zoneinfo/Europe/Uzhgorod.py b/lib/pytz-old/zoneinfo/Europe/Uzhgorod.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Uzhgorod.py
rename to lib/pytz-old/zoneinfo/Europe/Uzhgorod.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Vaduz b/lib/pytz-old/zoneinfo/Europe/Vaduz
new file mode 100644
index 0000000..9c2b600
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Vaduz differ
diff --git a/lib/pytz/zoneinfo/Europe/Vaduz.py b/lib/pytz-old/zoneinfo/Europe/Vaduz.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Vaduz.py
rename to lib/pytz-old/zoneinfo/Europe/Vaduz.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Vatican b/lib/pytz-old/zoneinfo/Europe/Vatican
new file mode 100644
index 0000000..5cc3040
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Vatican differ
diff --git a/lib/pytz/zoneinfo/Europe/Vatican.py b/lib/pytz-old/zoneinfo/Europe/Vatican.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Vatican.py
rename to lib/pytz-old/zoneinfo/Europe/Vatican.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Vienna b/lib/pytz-old/zoneinfo/Europe/Vienna
new file mode 100644
index 0000000..9c0fac5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Vienna differ
diff --git a/lib/pytz/zoneinfo/Europe/Vienna.py b/lib/pytz-old/zoneinfo/Europe/Vienna.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Vienna.py
rename to lib/pytz-old/zoneinfo/Europe/Vienna.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Vilnius b/lib/pytz-old/zoneinfo/Europe/Vilnius
new file mode 100644
index 0000000..3b11880
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Vilnius differ
diff --git a/lib/pytz/zoneinfo/Europe/Vilnius.py b/lib/pytz-old/zoneinfo/Europe/Vilnius.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Vilnius.py
rename to lib/pytz-old/zoneinfo/Europe/Vilnius.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Volgograd b/lib/pytz-old/zoneinfo/Europe/Volgograd
new file mode 100644
index 0000000..c62c32a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Volgograd differ
diff --git a/lib/pytz/zoneinfo/Europe/Volgograd.py b/lib/pytz-old/zoneinfo/Europe/Volgograd.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Volgograd.py
rename to lib/pytz-old/zoneinfo/Europe/Volgograd.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Warsaw b/lib/pytz-old/zoneinfo/Europe/Warsaw
new file mode 100644
index 0000000..5cbba41
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Warsaw differ
diff --git a/lib/pytz/zoneinfo/Europe/Warsaw.py b/lib/pytz-old/zoneinfo/Europe/Warsaw.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Warsaw.py
rename to lib/pytz-old/zoneinfo/Europe/Warsaw.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Zagreb b/lib/pytz-old/zoneinfo/Europe/Zagreb
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Zagreb differ
diff --git a/lib/pytz/zoneinfo/Europe/Zagreb.py b/lib/pytz-old/zoneinfo/Europe/Zagreb.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Zagreb.py
rename to lib/pytz-old/zoneinfo/Europe/Zagreb.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Zaporozhye b/lib/pytz-old/zoneinfo/Europe/Zaporozhye
new file mode 100644
index 0000000..49b568e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Zaporozhye differ
diff --git a/lib/pytz/zoneinfo/Europe/Zaporozhye.py b/lib/pytz-old/zoneinfo/Europe/Zaporozhye.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Zaporozhye.py
rename to lib/pytz-old/zoneinfo/Europe/Zaporozhye.py
diff --git a/lib/pytz-old/zoneinfo/Europe/Zurich b/lib/pytz-old/zoneinfo/Europe/Zurich
new file mode 100644
index 0000000..9c2b600
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Europe/Zurich differ
diff --git a/lib/pytz/zoneinfo/Europe/Zurich.py b/lib/pytz-old/zoneinfo/Europe/Zurich.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/Zurich.py
rename to lib/pytz-old/zoneinfo/Europe/Zurich.py
diff --git a/lib/pytz/zoneinfo/Europe/__init__.py b/lib/pytz-old/zoneinfo/Europe/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Europe/__init__.py
rename to lib/pytz-old/zoneinfo/Europe/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Factory b/lib/pytz-old/zoneinfo/Factory
new file mode 100644
index 0000000..6e6c452
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Factory differ
diff --git a/lib/pytz-old/zoneinfo/GB b/lib/pytz-old/zoneinfo/GB
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/GB differ
diff --git a/lib/pytz-old/zoneinfo/GB-Eire b/lib/pytz-old/zoneinfo/GB-Eire
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz-old/zoneinfo/GB-Eire differ
diff --git a/lib/pytz/zoneinfo/GB.py b/lib/pytz-old/zoneinfo/GB.py
similarity index 100%
rename from lib/pytz/zoneinfo/GB.py
rename to lib/pytz-old/zoneinfo/GB.py
diff --git a/lib/pytz/zoneinfo/GB_minus_Eire.py b/lib/pytz-old/zoneinfo/GB_minus_Eire.py
similarity index 100%
rename from lib/pytz/zoneinfo/GB_minus_Eire.py
rename to lib/pytz-old/zoneinfo/GB_minus_Eire.py
diff --git a/lib/pytz-old/zoneinfo/GMT b/lib/pytz-old/zoneinfo/GMT
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/GMT differ
diff --git a/lib/pytz-old/zoneinfo/GMT+0 b/lib/pytz-old/zoneinfo/GMT+0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/GMT+0 differ
diff --git a/lib/pytz-old/zoneinfo/GMT-0 b/lib/pytz-old/zoneinfo/GMT-0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/GMT-0 differ
diff --git a/lib/pytz/zoneinfo/GMT.py b/lib/pytz-old/zoneinfo/GMT.py
similarity index 100%
rename from lib/pytz/zoneinfo/GMT.py
rename to lib/pytz-old/zoneinfo/GMT.py
diff --git a/lib/pytz-old/zoneinfo/GMT0 b/lib/pytz-old/zoneinfo/GMT0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/GMT0 differ
diff --git a/lib/pytz/zoneinfo/GMT0.py b/lib/pytz-old/zoneinfo/GMT0.py
similarity index 100%
rename from lib/pytz/zoneinfo/GMT0.py
rename to lib/pytz-old/zoneinfo/GMT0.py
diff --git a/lib/pytz/zoneinfo/GMT_minus_0.py b/lib/pytz-old/zoneinfo/GMT_minus_0.py
similarity index 100%
rename from lib/pytz/zoneinfo/GMT_minus_0.py
rename to lib/pytz-old/zoneinfo/GMT_minus_0.py
diff --git a/lib/pytz/zoneinfo/GMT_plus_0.py b/lib/pytz-old/zoneinfo/GMT_plus_0.py
similarity index 100%
rename from lib/pytz/zoneinfo/GMT_plus_0.py
rename to lib/pytz-old/zoneinfo/GMT_plus_0.py
diff --git a/lib/pytz-old/zoneinfo/Greenwich b/lib/pytz-old/zoneinfo/Greenwich
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Greenwich differ
diff --git a/lib/pytz/zoneinfo/Greenwich.py b/lib/pytz-old/zoneinfo/Greenwich.py
similarity index 100%
rename from lib/pytz/zoneinfo/Greenwich.py
rename to lib/pytz-old/zoneinfo/Greenwich.py
diff --git a/lib/pytz-old/zoneinfo/HST b/lib/pytz-old/zoneinfo/HST
new file mode 100644
index 0000000..03e4db0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/HST differ
diff --git a/lib/pytz/zoneinfo/HST.py b/lib/pytz-old/zoneinfo/HST.py
similarity index 100%
rename from lib/pytz/zoneinfo/HST.py
rename to lib/pytz-old/zoneinfo/HST.py
diff --git a/lib/pytz-old/zoneinfo/Hongkong b/lib/pytz-old/zoneinfo/Hongkong
new file mode 100644
index 0000000..dc9058e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Hongkong differ
diff --git a/lib/pytz/zoneinfo/Hongkong.py b/lib/pytz-old/zoneinfo/Hongkong.py
similarity index 100%
rename from lib/pytz/zoneinfo/Hongkong.py
rename to lib/pytz-old/zoneinfo/Hongkong.py
diff --git a/lib/pytz-old/zoneinfo/Iceland b/lib/pytz-old/zoneinfo/Iceland
new file mode 100644
index 0000000..35ba7a1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Iceland differ
diff --git a/lib/pytz/zoneinfo/Iceland.py b/lib/pytz-old/zoneinfo/Iceland.py
similarity index 100%
rename from lib/pytz/zoneinfo/Iceland.py
rename to lib/pytz-old/zoneinfo/Iceland.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Antananarivo b/lib/pytz-old/zoneinfo/Indian/Antananarivo
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Antananarivo differ
diff --git a/lib/pytz/zoneinfo/Indian/Antananarivo.py b/lib/pytz-old/zoneinfo/Indian/Antananarivo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Antananarivo.py
rename to lib/pytz-old/zoneinfo/Indian/Antananarivo.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Chagos b/lib/pytz-old/zoneinfo/Indian/Chagos
new file mode 100644
index 0000000..a616bdf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Chagos differ
diff --git a/lib/pytz/zoneinfo/Indian/Chagos.py b/lib/pytz-old/zoneinfo/Indian/Chagos.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Chagos.py
rename to lib/pytz-old/zoneinfo/Indian/Chagos.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Christmas b/lib/pytz-old/zoneinfo/Indian/Christmas
new file mode 100644
index 0000000..ebcd262
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Christmas differ
diff --git a/lib/pytz/zoneinfo/Indian/Christmas.py b/lib/pytz-old/zoneinfo/Indian/Christmas.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Christmas.py
rename to lib/pytz-old/zoneinfo/Indian/Christmas.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Cocos b/lib/pytz-old/zoneinfo/Indian/Cocos
new file mode 100644
index 0000000..cd603f2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Cocos differ
diff --git a/lib/pytz/zoneinfo/Indian/Cocos.py b/lib/pytz-old/zoneinfo/Indian/Cocos.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Cocos.py
rename to lib/pytz-old/zoneinfo/Indian/Cocos.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Comoro b/lib/pytz-old/zoneinfo/Indian/Comoro
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Comoro differ
diff --git a/lib/pytz/zoneinfo/Indian/Comoro.py b/lib/pytz-old/zoneinfo/Indian/Comoro.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Comoro.py
rename to lib/pytz-old/zoneinfo/Indian/Comoro.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Kerguelen b/lib/pytz-old/zoneinfo/Indian/Kerguelen
new file mode 100644
index 0000000..462851e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Kerguelen differ
diff --git a/lib/pytz/zoneinfo/Indian/Kerguelen.py b/lib/pytz-old/zoneinfo/Indian/Kerguelen.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Kerguelen.py
rename to lib/pytz-old/zoneinfo/Indian/Kerguelen.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Mahe b/lib/pytz-old/zoneinfo/Indian/Mahe
new file mode 100644
index 0000000..5f42819
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Mahe differ
diff --git a/lib/pytz/zoneinfo/Indian/Mahe.py b/lib/pytz-old/zoneinfo/Indian/Mahe.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Mahe.py
rename to lib/pytz-old/zoneinfo/Indian/Mahe.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Maldives b/lib/pytz-old/zoneinfo/Indian/Maldives
new file mode 100644
index 0000000..cec224f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Maldives differ
diff --git a/lib/pytz/zoneinfo/Indian/Maldives.py b/lib/pytz-old/zoneinfo/Indian/Maldives.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Maldives.py
rename to lib/pytz-old/zoneinfo/Indian/Maldives.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Mauritius b/lib/pytz-old/zoneinfo/Indian/Mauritius
new file mode 100644
index 0000000..66ecc8f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Mauritius differ
diff --git a/lib/pytz/zoneinfo/Indian/Mauritius.py b/lib/pytz-old/zoneinfo/Indian/Mauritius.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Mauritius.py
rename to lib/pytz-old/zoneinfo/Indian/Mauritius.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Mayotte b/lib/pytz-old/zoneinfo/Indian/Mayotte
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Mayotte differ
diff --git a/lib/pytz/zoneinfo/Indian/Mayotte.py b/lib/pytz-old/zoneinfo/Indian/Mayotte.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Mayotte.py
rename to lib/pytz-old/zoneinfo/Indian/Mayotte.py
diff --git a/lib/pytz-old/zoneinfo/Indian/Reunion b/lib/pytz-old/zoneinfo/Indian/Reunion
new file mode 100644
index 0000000..c4d0da9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Indian/Reunion differ
diff --git a/lib/pytz/zoneinfo/Indian/Reunion.py b/lib/pytz-old/zoneinfo/Indian/Reunion.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/Reunion.py
rename to lib/pytz-old/zoneinfo/Indian/Reunion.py
diff --git a/lib/pytz/zoneinfo/Indian/__init__.py b/lib/pytz-old/zoneinfo/Indian/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Indian/__init__.py
rename to lib/pytz-old/zoneinfo/Indian/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Iran b/lib/pytz-old/zoneinfo/Iran
new file mode 100644
index 0000000..8710781
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Iran differ
diff --git a/lib/pytz/zoneinfo/Iran.py b/lib/pytz-old/zoneinfo/Iran.py
similarity index 100%
rename from lib/pytz/zoneinfo/Iran.py
rename to lib/pytz-old/zoneinfo/Iran.py
diff --git a/lib/pytz-old/zoneinfo/Israel b/lib/pytz-old/zoneinfo/Israel
new file mode 100644
index 0000000..df51199
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Israel differ
diff --git a/lib/pytz/zoneinfo/Israel.py b/lib/pytz-old/zoneinfo/Israel.py
similarity index 100%
rename from lib/pytz/zoneinfo/Israel.py
rename to lib/pytz-old/zoneinfo/Israel.py
diff --git a/lib/pytz-old/zoneinfo/Jamaica b/lib/pytz-old/zoneinfo/Jamaica
new file mode 100644
index 0000000..006689b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Jamaica differ
diff --git a/lib/pytz/zoneinfo/Jamaica.py b/lib/pytz-old/zoneinfo/Jamaica.py
similarity index 100%
rename from lib/pytz/zoneinfo/Jamaica.py
rename to lib/pytz-old/zoneinfo/Jamaica.py
diff --git a/lib/pytz-old/zoneinfo/Japan b/lib/pytz-old/zoneinfo/Japan
new file mode 100644
index 0000000..0244140
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Japan differ
diff --git a/lib/pytz/zoneinfo/Japan.py b/lib/pytz-old/zoneinfo/Japan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Japan.py
rename to lib/pytz-old/zoneinfo/Japan.py
diff --git a/lib/pytz-old/zoneinfo/Kwajalein b/lib/pytz-old/zoneinfo/Kwajalein
new file mode 100644
index 0000000..094c3cf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Kwajalein differ
diff --git a/lib/pytz/zoneinfo/Kwajalein.py b/lib/pytz-old/zoneinfo/Kwajalein.py
similarity index 100%
rename from lib/pytz/zoneinfo/Kwajalein.py
rename to lib/pytz-old/zoneinfo/Kwajalein.py
diff --git a/lib/pytz-old/zoneinfo/Libya b/lib/pytz-old/zoneinfo/Libya
new file mode 100644
index 0000000..b32e220
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Libya differ
diff --git a/lib/pytz/zoneinfo/Libya.py b/lib/pytz-old/zoneinfo/Libya.py
similarity index 100%
rename from lib/pytz/zoneinfo/Libya.py
rename to lib/pytz-old/zoneinfo/Libya.py
diff --git a/lib/pytz-old/zoneinfo/MET b/lib/pytz-old/zoneinfo/MET
new file mode 100644
index 0000000..71963d5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/MET differ
diff --git a/lib/pytz/zoneinfo/MET.py b/lib/pytz-old/zoneinfo/MET.py
similarity index 100%
rename from lib/pytz/zoneinfo/MET.py
rename to lib/pytz-old/zoneinfo/MET.py
diff --git a/lib/pytz-old/zoneinfo/MST b/lib/pytz-old/zoneinfo/MST
new file mode 100644
index 0000000..a1bee7c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/MST differ
diff --git a/lib/pytz/zoneinfo/MST.py b/lib/pytz-old/zoneinfo/MST.py
similarity index 100%
rename from lib/pytz/zoneinfo/MST.py
rename to lib/pytz-old/zoneinfo/MST.py
diff --git a/lib/pytz-old/zoneinfo/MST7MDT b/lib/pytz-old/zoneinfo/MST7MDT
new file mode 100644
index 0000000..726a7e5
Binary files /dev/null and b/lib/pytz-old/zoneinfo/MST7MDT differ
diff --git a/lib/pytz/zoneinfo/MST7MDT.py b/lib/pytz-old/zoneinfo/MST7MDT.py
similarity index 100%
rename from lib/pytz/zoneinfo/MST7MDT.py
rename to lib/pytz-old/zoneinfo/MST7MDT.py
diff --git a/lib/pytz-old/zoneinfo/Mexico/BajaNorte b/lib/pytz-old/zoneinfo/Mexico/BajaNorte
new file mode 100644
index 0000000..1387475
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Mexico/BajaNorte differ
diff --git a/lib/pytz/zoneinfo/Mexico/BajaNorte.py b/lib/pytz-old/zoneinfo/Mexico/BajaNorte.py
similarity index 100%
rename from lib/pytz/zoneinfo/Mexico/BajaNorte.py
rename to lib/pytz-old/zoneinfo/Mexico/BajaNorte.py
diff --git a/lib/pytz-old/zoneinfo/Mexico/BajaSur b/lib/pytz-old/zoneinfo/Mexico/BajaSur
new file mode 100644
index 0000000..afa94c2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Mexico/BajaSur differ
diff --git a/lib/pytz/zoneinfo/Mexico/BajaSur.py b/lib/pytz-old/zoneinfo/Mexico/BajaSur.py
similarity index 100%
rename from lib/pytz/zoneinfo/Mexico/BajaSur.py
rename to lib/pytz-old/zoneinfo/Mexico/BajaSur.py
diff --git a/lib/pytz-old/zoneinfo/Mexico/General b/lib/pytz-old/zoneinfo/Mexico/General
new file mode 100644
index 0000000..f11e3d2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Mexico/General differ
diff --git a/lib/pytz/zoneinfo/Mexico/General.py b/lib/pytz-old/zoneinfo/Mexico/General.py
similarity index 100%
rename from lib/pytz/zoneinfo/Mexico/General.py
rename to lib/pytz-old/zoneinfo/Mexico/General.py
diff --git a/lib/pytz/zoneinfo/Mexico/__init__.py b/lib/pytz-old/zoneinfo/Mexico/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Mexico/__init__.py
rename to lib/pytz-old/zoneinfo/Mexico/__init__.py
diff --git a/lib/pytz-old/zoneinfo/NZ b/lib/pytz-old/zoneinfo/NZ
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/NZ differ
diff --git a/lib/pytz-old/zoneinfo/NZ-CHAT b/lib/pytz-old/zoneinfo/NZ-CHAT
new file mode 100644
index 0000000..59bc4ed
Binary files /dev/null and b/lib/pytz-old/zoneinfo/NZ-CHAT differ
diff --git a/lib/pytz/zoneinfo/NZ.py b/lib/pytz-old/zoneinfo/NZ.py
similarity index 100%
rename from lib/pytz/zoneinfo/NZ.py
rename to lib/pytz-old/zoneinfo/NZ.py
diff --git a/lib/pytz/zoneinfo/NZ_minus_CHAT.py b/lib/pytz-old/zoneinfo/NZ_minus_CHAT.py
similarity index 100%
rename from lib/pytz/zoneinfo/NZ_minus_CHAT.py
rename to lib/pytz-old/zoneinfo/NZ_minus_CHAT.py
diff --git a/lib/pytz-old/zoneinfo/Navajo b/lib/pytz-old/zoneinfo/Navajo
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Navajo differ
diff --git a/lib/pytz/zoneinfo/Navajo.py b/lib/pytz-old/zoneinfo/Navajo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Navajo.py
rename to lib/pytz-old/zoneinfo/Navajo.py
diff --git a/lib/pytz-old/zoneinfo/PRC b/lib/pytz-old/zoneinfo/PRC
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/PRC differ
diff --git a/lib/pytz/zoneinfo/PRC.py b/lib/pytz-old/zoneinfo/PRC.py
similarity index 100%
rename from lib/pytz/zoneinfo/PRC.py
rename to lib/pytz-old/zoneinfo/PRC.py
diff --git a/lib/pytz-old/zoneinfo/PST8PDT b/lib/pytz-old/zoneinfo/PST8PDT
new file mode 100644
index 0000000..6242ac0
Binary files /dev/null and b/lib/pytz-old/zoneinfo/PST8PDT differ
diff --git a/lib/pytz/zoneinfo/PST8PDT.py b/lib/pytz-old/zoneinfo/PST8PDT.py
similarity index 100%
rename from lib/pytz/zoneinfo/PST8PDT.py
rename to lib/pytz-old/zoneinfo/PST8PDT.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Apia b/lib/pytz-old/zoneinfo/Pacific/Apia
new file mode 100644
index 0000000..cc5d2cd
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Apia differ
diff --git a/lib/pytz/zoneinfo/Pacific/Apia.py b/lib/pytz-old/zoneinfo/Pacific/Apia.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Apia.py
rename to lib/pytz-old/zoneinfo/Pacific/Apia.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Auckland b/lib/pytz-old/zoneinfo/Pacific/Auckland
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Auckland differ
diff --git a/lib/pytz/zoneinfo/Pacific/Auckland.py b/lib/pytz-old/zoneinfo/Pacific/Auckland.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Auckland.py
rename to lib/pytz-old/zoneinfo/Pacific/Auckland.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Bougainville b/lib/pytz-old/zoneinfo/Pacific/Bougainville
new file mode 100644
index 0000000..219c78c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Bougainville differ
diff --git a/lib/pytz-old/zoneinfo/Pacific/Chatham b/lib/pytz-old/zoneinfo/Pacific/Chatham
new file mode 100644
index 0000000..59bc4ed
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Chatham differ
diff --git a/lib/pytz/zoneinfo/Pacific/Chatham.py b/lib/pytz-old/zoneinfo/Pacific/Chatham.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Chatham.py
rename to lib/pytz-old/zoneinfo/Pacific/Chatham.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Chuuk b/lib/pytz-old/zoneinfo/Pacific/Chuuk
new file mode 100644
index 0000000..28356bb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Chuuk differ
diff --git a/lib/pytz-old/zoneinfo/Pacific/Easter b/lib/pytz-old/zoneinfo/Pacific/Easter
new file mode 100644
index 0000000..8c8a6c7
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Easter differ
diff --git a/lib/pytz/zoneinfo/Pacific/Easter.py b/lib/pytz-old/zoneinfo/Pacific/Easter.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Easter.py
rename to lib/pytz-old/zoneinfo/Pacific/Easter.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Efate b/lib/pytz-old/zoneinfo/Pacific/Efate
new file mode 100644
index 0000000..1d99519
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Efate differ
diff --git a/lib/pytz/zoneinfo/Pacific/Efate.py b/lib/pytz-old/zoneinfo/Pacific/Efate.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Efate.py
rename to lib/pytz-old/zoneinfo/Pacific/Efate.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Enderbury b/lib/pytz-old/zoneinfo/Pacific/Enderbury
new file mode 100644
index 0000000..4861052
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Enderbury differ
diff --git a/lib/pytz/zoneinfo/Pacific/Enderbury.py b/lib/pytz-old/zoneinfo/Pacific/Enderbury.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Enderbury.py
rename to lib/pytz-old/zoneinfo/Pacific/Enderbury.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Fakaofo b/lib/pytz-old/zoneinfo/Pacific/Fakaofo
new file mode 100644
index 0000000..e02e18e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Fakaofo differ
diff --git a/lib/pytz/zoneinfo/Pacific/Fakaofo.py b/lib/pytz-old/zoneinfo/Pacific/Fakaofo.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Fakaofo.py
rename to lib/pytz-old/zoneinfo/Pacific/Fakaofo.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Fiji b/lib/pytz-old/zoneinfo/Pacific/Fiji
new file mode 100644
index 0000000..b75f194
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Fiji differ
diff --git a/lib/pytz/zoneinfo/Pacific/Fiji.py b/lib/pytz-old/zoneinfo/Pacific/Fiji.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Fiji.py
rename to lib/pytz-old/zoneinfo/Pacific/Fiji.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Funafuti b/lib/pytz-old/zoneinfo/Pacific/Funafuti
new file mode 100644
index 0000000..576dea3
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Funafuti differ
diff --git a/lib/pytz/zoneinfo/Pacific/Funafuti.py b/lib/pytz-old/zoneinfo/Pacific/Funafuti.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Funafuti.py
rename to lib/pytz-old/zoneinfo/Pacific/Funafuti.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Galapagos b/lib/pytz-old/zoneinfo/Pacific/Galapagos
new file mode 100644
index 0000000..c9a7371
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Galapagos differ
diff --git a/lib/pytz/zoneinfo/Pacific/Galapagos.py b/lib/pytz-old/zoneinfo/Pacific/Galapagos.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Galapagos.py
rename to lib/pytz-old/zoneinfo/Pacific/Galapagos.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Gambier b/lib/pytz-old/zoneinfo/Pacific/Gambier
new file mode 100644
index 0000000..4ab6c20
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Gambier differ
diff --git a/lib/pytz/zoneinfo/Pacific/Gambier.py b/lib/pytz-old/zoneinfo/Pacific/Gambier.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Gambier.py
rename to lib/pytz-old/zoneinfo/Pacific/Gambier.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Guadalcanal b/lib/pytz-old/zoneinfo/Pacific/Guadalcanal
new file mode 100644
index 0000000..b183d1e
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Guadalcanal differ
diff --git a/lib/pytz/zoneinfo/Pacific/Guadalcanal.py b/lib/pytz-old/zoneinfo/Pacific/Guadalcanal.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Guadalcanal.py
rename to lib/pytz-old/zoneinfo/Pacific/Guadalcanal.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Guam b/lib/pytz-old/zoneinfo/Pacific/Guam
new file mode 100644
index 0000000..4286e6b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Guam differ
diff --git a/lib/pytz/zoneinfo/Pacific/Guam.py b/lib/pytz-old/zoneinfo/Pacific/Guam.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Guam.py
rename to lib/pytz-old/zoneinfo/Pacific/Guam.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Honolulu b/lib/pytz-old/zoneinfo/Pacific/Honolulu
new file mode 100644
index 0000000..bd85577
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Honolulu differ
diff --git a/lib/pytz/zoneinfo/Pacific/Honolulu.py b/lib/pytz-old/zoneinfo/Pacific/Honolulu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Honolulu.py
rename to lib/pytz-old/zoneinfo/Pacific/Honolulu.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Johnston b/lib/pytz-old/zoneinfo/Pacific/Johnston
new file mode 100644
index 0000000..bd85577
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Johnston differ
diff --git a/lib/pytz/zoneinfo/Pacific/Johnston.py b/lib/pytz-old/zoneinfo/Pacific/Johnston.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Johnston.py
rename to lib/pytz-old/zoneinfo/Pacific/Johnston.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Kiritimati b/lib/pytz-old/zoneinfo/Pacific/Kiritimati
new file mode 100644
index 0000000..c2eafbc
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Kiritimati differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kiritimati.py b/lib/pytz-old/zoneinfo/Pacific/Kiritimati.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Kiritimati.py
rename to lib/pytz-old/zoneinfo/Pacific/Kiritimati.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Kosrae b/lib/pytz-old/zoneinfo/Pacific/Kosrae
new file mode 100644
index 0000000..66c4d65
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Kosrae differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kosrae.py b/lib/pytz-old/zoneinfo/Pacific/Kosrae.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Kosrae.py
rename to lib/pytz-old/zoneinfo/Pacific/Kosrae.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Kwajalein b/lib/pytz-old/zoneinfo/Pacific/Kwajalein
new file mode 100644
index 0000000..094c3cf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Kwajalein differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kwajalein.py b/lib/pytz-old/zoneinfo/Pacific/Kwajalein.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Kwajalein.py
rename to lib/pytz-old/zoneinfo/Pacific/Kwajalein.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Majuro b/lib/pytz-old/zoneinfo/Pacific/Majuro
new file mode 100644
index 0000000..d53b7c2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Majuro differ
diff --git a/lib/pytz/zoneinfo/Pacific/Majuro.py b/lib/pytz-old/zoneinfo/Pacific/Majuro.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Majuro.py
rename to lib/pytz-old/zoneinfo/Pacific/Majuro.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Marquesas b/lib/pytz-old/zoneinfo/Pacific/Marquesas
new file mode 100644
index 0000000..c717c12
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Marquesas differ
diff --git a/lib/pytz/zoneinfo/Pacific/Marquesas.py b/lib/pytz-old/zoneinfo/Pacific/Marquesas.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Marquesas.py
rename to lib/pytz-old/zoneinfo/Pacific/Marquesas.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Midway b/lib/pytz-old/zoneinfo/Pacific/Midway
new file mode 100644
index 0000000..f2a2f63
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Midway differ
diff --git a/lib/pytz/zoneinfo/Pacific/Midway.py b/lib/pytz-old/zoneinfo/Pacific/Midway.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Midway.py
rename to lib/pytz-old/zoneinfo/Pacific/Midway.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Nauru b/lib/pytz-old/zoneinfo/Pacific/Nauru
new file mode 100644
index 0000000..896ffee
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Nauru differ
diff --git a/lib/pytz/zoneinfo/Pacific/Nauru.py b/lib/pytz-old/zoneinfo/Pacific/Nauru.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Nauru.py
rename to lib/pytz-old/zoneinfo/Pacific/Nauru.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Niue b/lib/pytz-old/zoneinfo/Pacific/Niue
new file mode 100644
index 0000000..d772edf
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Niue differ
diff --git a/lib/pytz/zoneinfo/Pacific/Niue.py b/lib/pytz-old/zoneinfo/Pacific/Niue.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Niue.py
rename to lib/pytz-old/zoneinfo/Pacific/Niue.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Norfolk b/lib/pytz-old/zoneinfo/Pacific/Norfolk
new file mode 100644
index 0000000..3a286be
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Norfolk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Norfolk.py b/lib/pytz-old/zoneinfo/Pacific/Norfolk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Norfolk.py
rename to lib/pytz-old/zoneinfo/Pacific/Norfolk.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Noumea b/lib/pytz-old/zoneinfo/Pacific/Noumea
new file mode 100644
index 0000000..fcc44e6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Noumea differ
diff --git a/lib/pytz/zoneinfo/Pacific/Noumea.py b/lib/pytz-old/zoneinfo/Pacific/Noumea.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Noumea.py
rename to lib/pytz-old/zoneinfo/Pacific/Noumea.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Pago_Pago b/lib/pytz-old/zoneinfo/Pacific/Pago_Pago
new file mode 100644
index 0000000..1d7649f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Pago_Pago differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pago_Pago.py b/lib/pytz-old/zoneinfo/Pacific/Pago_Pago.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Pago_Pago.py
rename to lib/pytz-old/zoneinfo/Pacific/Pago_Pago.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Palau b/lib/pytz-old/zoneinfo/Pacific/Palau
new file mode 100644
index 0000000..28992d2
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Palau differ
diff --git a/lib/pytz/zoneinfo/Pacific/Palau.py b/lib/pytz-old/zoneinfo/Pacific/Palau.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Palau.py
rename to lib/pytz-old/zoneinfo/Pacific/Palau.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Pitcairn b/lib/pytz-old/zoneinfo/Pacific/Pitcairn
new file mode 100644
index 0000000..d62c648
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Pitcairn differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pitcairn.py b/lib/pytz-old/zoneinfo/Pacific/Pitcairn.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Pitcairn.py
rename to lib/pytz-old/zoneinfo/Pacific/Pitcairn.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Pohnpei b/lib/pytz-old/zoneinfo/Pacific/Pohnpei
new file mode 100644
index 0000000..59bd764
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Pohnpei differ
diff --git a/lib/pytz-old/zoneinfo/Pacific/Ponape b/lib/pytz-old/zoneinfo/Pacific/Ponape
new file mode 100644
index 0000000..59bd764
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Ponape differ
diff --git a/lib/pytz/zoneinfo/Pacific/Ponape.py b/lib/pytz-old/zoneinfo/Pacific/Ponape.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Ponape.py
rename to lib/pytz-old/zoneinfo/Pacific/Ponape.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Port_Moresby b/lib/pytz-old/zoneinfo/Pacific/Port_Moresby
new file mode 100644
index 0000000..dffa457
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Port_Moresby differ
diff --git a/lib/pytz/zoneinfo/Pacific/Port_Moresby.py b/lib/pytz-old/zoneinfo/Pacific/Port_Moresby.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Port_Moresby.py
rename to lib/pytz-old/zoneinfo/Pacific/Port_Moresby.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Rarotonga b/lib/pytz-old/zoneinfo/Pacific/Rarotonga
new file mode 100644
index 0000000..2a25490
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Rarotonga differ
diff --git a/lib/pytz/zoneinfo/Pacific/Rarotonga.py b/lib/pytz-old/zoneinfo/Pacific/Rarotonga.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Rarotonga.py
rename to lib/pytz-old/zoneinfo/Pacific/Rarotonga.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Saipan b/lib/pytz-old/zoneinfo/Pacific/Saipan
new file mode 100644
index 0000000..c54473c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Saipan differ
diff --git a/lib/pytz/zoneinfo/Pacific/Saipan.py b/lib/pytz-old/zoneinfo/Pacific/Saipan.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Saipan.py
rename to lib/pytz-old/zoneinfo/Pacific/Saipan.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Samoa b/lib/pytz-old/zoneinfo/Pacific/Samoa
new file mode 100644
index 0000000..1d7649f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Samoa differ
diff --git a/lib/pytz/zoneinfo/Pacific/Samoa.py b/lib/pytz-old/zoneinfo/Pacific/Samoa.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Samoa.py
rename to lib/pytz-old/zoneinfo/Pacific/Samoa.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Tahiti b/lib/pytz-old/zoneinfo/Pacific/Tahiti
new file mode 100644
index 0000000..bfc9a7c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Tahiti differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tahiti.py b/lib/pytz-old/zoneinfo/Pacific/Tahiti.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Tahiti.py
rename to lib/pytz-old/zoneinfo/Pacific/Tahiti.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Tarawa b/lib/pytz-old/zoneinfo/Pacific/Tarawa
new file mode 100644
index 0000000..1e8189c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Tarawa differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tarawa.py b/lib/pytz-old/zoneinfo/Pacific/Tarawa.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Tarawa.py
rename to lib/pytz-old/zoneinfo/Pacific/Tarawa.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Tongatapu b/lib/pytz-old/zoneinfo/Pacific/Tongatapu
new file mode 100644
index 0000000..71d899b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Tongatapu differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tongatapu.py b/lib/pytz-old/zoneinfo/Pacific/Tongatapu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Tongatapu.py
rename to lib/pytz-old/zoneinfo/Pacific/Tongatapu.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Truk b/lib/pytz-old/zoneinfo/Pacific/Truk
new file mode 100644
index 0000000..28356bb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Truk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Truk.py b/lib/pytz-old/zoneinfo/Pacific/Truk.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Truk.py
rename to lib/pytz-old/zoneinfo/Pacific/Truk.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Wake b/lib/pytz-old/zoneinfo/Pacific/Wake
new file mode 100644
index 0000000..9e2a37c
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Wake differ
diff --git a/lib/pytz/zoneinfo/Pacific/Wake.py b/lib/pytz-old/zoneinfo/Pacific/Wake.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Wake.py
rename to lib/pytz-old/zoneinfo/Pacific/Wake.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Wallis b/lib/pytz-old/zoneinfo/Pacific/Wallis
new file mode 100644
index 0000000..b894471
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Wallis differ
diff --git a/lib/pytz/zoneinfo/Pacific/Wallis.py b/lib/pytz-old/zoneinfo/Pacific/Wallis.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Wallis.py
rename to lib/pytz-old/zoneinfo/Pacific/Wallis.py
diff --git a/lib/pytz-old/zoneinfo/Pacific/Yap b/lib/pytz-old/zoneinfo/Pacific/Yap
new file mode 100644
index 0000000..28356bb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Pacific/Yap differ
diff --git a/lib/pytz/zoneinfo/Pacific/Yap.py b/lib/pytz-old/zoneinfo/Pacific/Yap.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/Yap.py
rename to lib/pytz-old/zoneinfo/Pacific/Yap.py
diff --git a/lib/pytz/zoneinfo/Pacific/__init__.py b/lib/pytz-old/zoneinfo/Pacific/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/Pacific/__init__.py
rename to lib/pytz-old/zoneinfo/Pacific/__init__.py
diff --git a/lib/pytz-old/zoneinfo/Poland b/lib/pytz-old/zoneinfo/Poland
new file mode 100644
index 0000000..5cbba41
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Poland differ
diff --git a/lib/pytz/zoneinfo/Poland.py b/lib/pytz-old/zoneinfo/Poland.py
similarity index 100%
rename from lib/pytz/zoneinfo/Poland.py
rename to lib/pytz-old/zoneinfo/Poland.py
diff --git a/lib/pytz-old/zoneinfo/Portugal b/lib/pytz-old/zoneinfo/Portugal
new file mode 100644
index 0000000..b9aff3a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Portugal differ
diff --git a/lib/pytz/zoneinfo/Portugal.py b/lib/pytz-old/zoneinfo/Portugal.py
similarity index 100%
rename from lib/pytz/zoneinfo/Portugal.py
rename to lib/pytz-old/zoneinfo/Portugal.py
diff --git a/lib/pytz-old/zoneinfo/ROC b/lib/pytz-old/zoneinfo/ROC
new file mode 100644
index 0000000..4810a0b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/ROC differ
diff --git a/lib/pytz/zoneinfo/ROC.py b/lib/pytz-old/zoneinfo/ROC.py
similarity index 100%
rename from lib/pytz/zoneinfo/ROC.py
rename to lib/pytz-old/zoneinfo/ROC.py
diff --git a/lib/pytz-old/zoneinfo/ROK b/lib/pytz-old/zoneinfo/ROK
new file mode 100644
index 0000000..fd91d5b
Binary files /dev/null and b/lib/pytz-old/zoneinfo/ROK differ
diff --git a/lib/pytz/zoneinfo/ROK.py b/lib/pytz-old/zoneinfo/ROK.py
similarity index 100%
rename from lib/pytz/zoneinfo/ROK.py
rename to lib/pytz-old/zoneinfo/ROK.py
diff --git a/lib/pytz-old/zoneinfo/Singapore b/lib/pytz-old/zoneinfo/Singapore
new file mode 100644
index 0000000..9dd49cb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Singapore differ
diff --git a/lib/pytz/zoneinfo/Singapore.py b/lib/pytz-old/zoneinfo/Singapore.py
similarity index 100%
rename from lib/pytz/zoneinfo/Singapore.py
rename to lib/pytz-old/zoneinfo/Singapore.py
diff --git a/lib/pytz-old/zoneinfo/Turkey b/lib/pytz-old/zoneinfo/Turkey
new file mode 100644
index 0000000..d89aa3a
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Turkey differ
diff --git a/lib/pytz/zoneinfo/Turkey.py b/lib/pytz-old/zoneinfo/Turkey.py
similarity index 100%
rename from lib/pytz/zoneinfo/Turkey.py
rename to lib/pytz-old/zoneinfo/Turkey.py
diff --git a/lib/pytz-old/zoneinfo/UCT b/lib/pytz-old/zoneinfo/UCT
new file mode 100644
index 0000000..40147b9
Binary files /dev/null and b/lib/pytz-old/zoneinfo/UCT differ
diff --git a/lib/pytz/zoneinfo/UCT.py b/lib/pytz-old/zoneinfo/UCT.py
similarity index 100%
rename from lib/pytz/zoneinfo/UCT.py
rename to lib/pytz-old/zoneinfo/UCT.py
diff --git a/lib/pytz-old/zoneinfo/US/Alaska b/lib/pytz-old/zoneinfo/US/Alaska
new file mode 100644
index 0000000..a4627ca
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Alaska differ
diff --git a/lib/pytz/zoneinfo/US/Alaska.py b/lib/pytz-old/zoneinfo/US/Alaska.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Alaska.py
rename to lib/pytz-old/zoneinfo/US/Alaska.py
diff --git a/lib/pytz-old/zoneinfo/US/Aleutian b/lib/pytz-old/zoneinfo/US/Aleutian
new file mode 100644
index 0000000..b0a5dd6
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Aleutian differ
diff --git a/lib/pytz/zoneinfo/US/Aleutian.py b/lib/pytz-old/zoneinfo/US/Aleutian.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Aleutian.py
rename to lib/pytz-old/zoneinfo/US/Aleutian.py
diff --git a/lib/pytz-old/zoneinfo/US/Arizona b/lib/pytz-old/zoneinfo/US/Arizona
new file mode 100644
index 0000000..adf2823
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Arizona differ
diff --git a/lib/pytz/zoneinfo/US/Arizona.py b/lib/pytz-old/zoneinfo/US/Arizona.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Arizona.py
rename to lib/pytz-old/zoneinfo/US/Arizona.py
diff --git a/lib/pytz-old/zoneinfo/US/Central b/lib/pytz-old/zoneinfo/US/Central
new file mode 100644
index 0000000..3dd8f0f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Central differ
diff --git a/lib/pytz/zoneinfo/US/Central.py b/lib/pytz-old/zoneinfo/US/Central.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Central.py
rename to lib/pytz-old/zoneinfo/US/Central.py
diff --git a/lib/pytz-old/zoneinfo/US/East-Indiana b/lib/pytz-old/zoneinfo/US/East-Indiana
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/East-Indiana differ
diff --git a/lib/pytz/zoneinfo/US/East_minus_Indiana.py b/lib/pytz-old/zoneinfo/US/East_minus_Indiana.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/East_minus_Indiana.py
rename to lib/pytz-old/zoneinfo/US/East_minus_Indiana.py
diff --git a/lib/pytz-old/zoneinfo/US/Eastern b/lib/pytz-old/zoneinfo/US/Eastern
new file mode 100644
index 0000000..7553fee
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Eastern differ
diff --git a/lib/pytz/zoneinfo/US/Eastern.py b/lib/pytz-old/zoneinfo/US/Eastern.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Eastern.py
rename to lib/pytz-old/zoneinfo/US/Eastern.py
diff --git a/lib/pytz-old/zoneinfo/US/Hawaii b/lib/pytz-old/zoneinfo/US/Hawaii
new file mode 100644
index 0000000..bd85577
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Hawaii differ
diff --git a/lib/pytz/zoneinfo/US/Hawaii.py b/lib/pytz-old/zoneinfo/US/Hawaii.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Hawaii.py
rename to lib/pytz-old/zoneinfo/US/Hawaii.py
diff --git a/lib/pytz-old/zoneinfo/US/Indiana-Starke b/lib/pytz-old/zoneinfo/US/Indiana-Starke
new file mode 100644
index 0000000..cc785da
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Indiana-Starke differ
diff --git a/lib/pytz/zoneinfo/US/Indiana_minus_Starke.py b/lib/pytz-old/zoneinfo/US/Indiana_minus_Starke.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Indiana_minus_Starke.py
rename to lib/pytz-old/zoneinfo/US/Indiana_minus_Starke.py
diff --git a/lib/pytz-old/zoneinfo/US/Michigan b/lib/pytz-old/zoneinfo/US/Michigan
new file mode 100644
index 0000000..a123b33
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Michigan differ
diff --git a/lib/pytz/zoneinfo/US/Michigan.py b/lib/pytz-old/zoneinfo/US/Michigan.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Michigan.py
rename to lib/pytz-old/zoneinfo/US/Michigan.py
diff --git a/lib/pytz-old/zoneinfo/US/Mountain b/lib/pytz-old/zoneinfo/US/Mountain
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Mountain differ
diff --git a/lib/pytz/zoneinfo/US/Mountain.py b/lib/pytz-old/zoneinfo/US/Mountain.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Mountain.py
rename to lib/pytz-old/zoneinfo/US/Mountain.py
diff --git a/lib/pytz-old/zoneinfo/US/Pacific b/lib/pytz-old/zoneinfo/US/Pacific
new file mode 100644
index 0000000..1fa9149
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Pacific differ
diff --git a/lib/pytz-old/zoneinfo/US/Pacific-New b/lib/pytz-old/zoneinfo/US/Pacific-New
new file mode 100644
index 0000000..1fa9149
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Pacific-New differ
diff --git a/lib/pytz/zoneinfo/US/Pacific.py b/lib/pytz-old/zoneinfo/US/Pacific.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Pacific.py
rename to lib/pytz-old/zoneinfo/US/Pacific.py
diff --git a/lib/pytz/zoneinfo/US/Pacific_minus_New.py b/lib/pytz-old/zoneinfo/US/Pacific_minus_New.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Pacific_minus_New.py
rename to lib/pytz-old/zoneinfo/US/Pacific_minus_New.py
diff --git a/lib/pytz-old/zoneinfo/US/Samoa b/lib/pytz-old/zoneinfo/US/Samoa
new file mode 100644
index 0000000..1d7649f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/US/Samoa differ
diff --git a/lib/pytz/zoneinfo/US/Samoa.py b/lib/pytz-old/zoneinfo/US/Samoa.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/Samoa.py
rename to lib/pytz-old/zoneinfo/US/Samoa.py
diff --git a/lib/pytz/zoneinfo/US/__init__.py b/lib/pytz-old/zoneinfo/US/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/US/__init__.py
rename to lib/pytz-old/zoneinfo/US/__init__.py
diff --git a/lib/pytz-old/zoneinfo/UTC b/lib/pytz-old/zoneinfo/UTC
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/UTC differ
diff --git a/lib/pytz/zoneinfo/UTC.py b/lib/pytz-old/zoneinfo/UTC.py
similarity index 100%
rename from lib/pytz/zoneinfo/UTC.py
rename to lib/pytz-old/zoneinfo/UTC.py
diff --git a/lib/pytz-old/zoneinfo/Universal b/lib/pytz-old/zoneinfo/Universal
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Universal differ
diff --git a/lib/pytz/zoneinfo/Universal.py b/lib/pytz-old/zoneinfo/Universal.py
similarity index 100%
rename from lib/pytz/zoneinfo/Universal.py
rename to lib/pytz-old/zoneinfo/Universal.py
diff --git a/lib/pytz-old/zoneinfo/W-SU b/lib/pytz-old/zoneinfo/W-SU
new file mode 100644
index 0000000..bdbbaeb
Binary files /dev/null and b/lib/pytz-old/zoneinfo/W-SU differ
diff --git a/lib/pytz-old/zoneinfo/WET b/lib/pytz-old/zoneinfo/WET
new file mode 100644
index 0000000..444a193
Binary files /dev/null and b/lib/pytz-old/zoneinfo/WET differ
diff --git a/lib/pytz/zoneinfo/WET.py b/lib/pytz-old/zoneinfo/WET.py
similarity index 100%
rename from lib/pytz/zoneinfo/WET.py
rename to lib/pytz-old/zoneinfo/WET.py
diff --git a/lib/pytz/zoneinfo/W_minus_SU.py b/lib/pytz-old/zoneinfo/W_minus_SU.py
similarity index 100%
rename from lib/pytz/zoneinfo/W_minus_SU.py
rename to lib/pytz-old/zoneinfo/W_minus_SU.py
diff --git a/lib/pytz-old/zoneinfo/Zulu b/lib/pytz-old/zoneinfo/Zulu
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz-old/zoneinfo/Zulu differ
diff --git a/lib/pytz/zoneinfo/Zulu.py b/lib/pytz-old/zoneinfo/Zulu.py
similarity index 100%
rename from lib/pytz/zoneinfo/Zulu.py
rename to lib/pytz-old/zoneinfo/Zulu.py
diff --git a/lib/pytz/zoneinfo/__init__.py b/lib/pytz-old/zoneinfo/__init__.py
similarity index 100%
rename from lib/pytz/zoneinfo/__init__.py
rename to lib/pytz-old/zoneinfo/__init__.py
diff --git a/lib/pytz-old/zoneinfo/iso3166.tab b/lib/pytz-old/zoneinfo/iso3166.tab
new file mode 100644
index 0000000..0b0b842
--- /dev/null
+++ b/lib/pytz-old/zoneinfo/iso3166.tab
@@ -0,0 +1,275 @@
+# ISO 3166 alpha-2 country codes
+#
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+#
+# From Paul Eggert (2014-07-18):
+# This file contains a table of two-letter country codes.  Columns are
+# separated by a single tab.  Lines beginning with '#' are comments.
+# Although all text currently uses ASCII encoding, this is planned to
+# change to UTF-8 soon.  The columns of the table are as follows:
+#
+# 1.  ISO 3166-1 alpha-2 country code, current as of
+#     ISO 3166-1 Newsletter VI-16 (2013-07-11).  See: Updates on ISO 3166
+#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+# 2.  The usual English name for the coded region,
+#     chosen so that alphabetic sorting of subsets produces helpful lists.
+#     This is not the same as the English name in the ISO 3166 tables.
+#
+# The table is sorted by country code.
+#
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
+#
+#country-
+#code	name of country, territory, area, or subdivision
+AD	Andorra
+AE	United Arab Emirates
+AF	Afghanistan
+AG	Antigua & Barbuda
+AI	Anguilla
+AL	Albania
+AM	Armenia
+AO	Angola
+AQ	Antarctica
+AR	Argentina
+AS	Samoa (American)
+AT	Austria
+AU	Australia
+AW	Aruba
+AX	Aaland Islands
+AZ	Azerbaijan
+BA	Bosnia & Herzegovina
+BB	Barbados
+BD	Bangladesh
+BE	Belgium
+BF	Burkina Faso
+BG	Bulgaria
+BH	Bahrain
+BI	Burundi
+BJ	Benin
+BL	St Barthelemy
+BM	Bermuda
+BN	Brunei
+BO	Bolivia
+BQ	Caribbean Netherlands
+BR	Brazil
+BS	Bahamas
+BT	Bhutan
+BV	Bouvet Island
+BW	Botswana
+BY	Belarus
+BZ	Belize
+CA	Canada
+CC	Cocos (Keeling) Islands
+CD	Congo (Dem. Rep.)
+CF	Central African Rep.
+CG	Congo (Rep.)
+CH	Switzerland
+CI	Cote d'Ivoire
+CK	Cook Islands
+CL	Chile
+CM	Cameroon
+CN	China
+CO	Colombia
+CR	Costa Rica
+CU	Cuba
+CV	Cape Verde
+CW	Curacao
+CX	Christmas Island
+CY	Cyprus
+CZ	Czech Republic
+DE	Germany
+DJ	Djibouti
+DK	Denmark
+DM	Dominica
+DO	Dominican Republic
+DZ	Algeria
+EC	Ecuador
+EE	Estonia
+EG	Egypt
+EH	Western Sahara
+ER	Eritrea
+ES	Spain
+ET	Ethiopia
+FI	Finland
+FJ	Fiji
+FK	Falkland Islands
+FM	Micronesia
+FO	Faroe Islands
+FR	France
+GA	Gabon
+GB	Britain (UK)
+GD	Grenada
+GE	Georgia
+GF	French Guiana
+GG	Guernsey
+GH	Ghana
+GI	Gibraltar
+GL	Greenland
+GM	Gambia
+GN	Guinea
+GP	Guadeloupe
+GQ	Equatorial Guinea
+GR	Greece
+GS	South Georgia & the South Sandwich Islands
+GT	Guatemala
+GU	Guam
+GW	Guinea-Bissau
+GY	Guyana
+HK	Hong Kong
+HM	Heard Island & McDonald Islands
+HN	Honduras
+HR	Croatia
+HT	Haiti
+HU	Hungary
+ID	Indonesia
+IE	Ireland
+IL	Israel
+IM	Isle of Man
+IN	India
+IO	British Indian Ocean Territory
+IQ	Iraq
+IR	Iran
+IS	Iceland
+IT	Italy
+JE	Jersey
+JM	Jamaica
+JO	Jordan
+JP	Japan
+KE	Kenya
+KG	Kyrgyzstan
+KH	Cambodia
+KI	Kiribati
+KM	Comoros
+KN	St Kitts & Nevis
+KP	Korea (North)
+KR	Korea (South)
+KW	Kuwait
+KY	Cayman Islands
+KZ	Kazakhstan
+LA	Laos
+LB	Lebanon
+LC	St Lucia
+LI	Liechtenstein
+LK	Sri Lanka
+LR	Liberia
+LS	Lesotho
+LT	Lithuania
+LU	Luxembourg
+LV	Latvia
+LY	Libya
+MA	Morocco
+MC	Monaco
+MD	Moldova
+ME	Montenegro
+MF	St Martin (French part)
+MG	Madagascar
+MH	Marshall Islands
+MK	Macedonia
+ML	Mali
+MM	Myanmar (Burma)
+MN	Mongolia
+MO	Macau
+MP	Northern Mariana Islands
+MQ	Martinique
+MR	Mauritania
+MS	Montserrat
+MT	Malta
+MU	Mauritius
+MV	Maldives
+MW	Malawi
+MX	Mexico
+MY	Malaysia
+MZ	Mozambique
+NA	Namibia
+NC	New Caledonia
+NE	Niger
+NF	Norfolk Island
+NG	Nigeria
+NI	Nicaragua
+NL	Netherlands
+NO	Norway
+NP	Nepal
+NR	Nauru
+NU	Niue
+NZ	New Zealand
+OM	Oman
+PA	Panama
+PE	Peru
+PF	French Polynesia
+PG	Papua New Guinea
+PH	Philippines
+PK	Pakistan
+PL	Poland
+PM	St Pierre & Miquelon
+PN	Pitcairn
+PR	Puerto Rico
+PS	Palestine
+PT	Portugal
+PW	Palau
+PY	Paraguay
+QA	Qatar
+RE	Reunion
+RO	Romania
+RS	Serbia
+RU	Russia
+RW	Rwanda
+SA	Saudi Arabia
+SB	Solomon Islands
+SC	Seychelles
+SD	Sudan
+SE	Sweden
+SG	Singapore
+SH	St Helena
+SI	Slovenia
+SJ	Svalbard & Jan Mayen
+SK	Slovakia
+SL	Sierra Leone
+SM	San Marino
+SN	Senegal
+SO	Somalia
+SR	Suriname
+SS	South Sudan
+ST	Sao Tome & Principe
+SV	El Salvador
+SX	St Maarten (Dutch part)
+SY	Syria
+SZ	Swaziland
+TC	Turks & Caicos Is
+TD	Chad
+TF	French Southern & Antarctic Lands
+TG	Togo
+TH	Thailand
+TJ	Tajikistan
+TK	Tokelau
+TL	East Timor
+TM	Turkmenistan
+TN	Tunisia
+TO	Tonga
+TR	Turkey
+TT	Trinidad & Tobago
+TV	Tuvalu
+TW	Taiwan
+TZ	Tanzania
+UA	Ukraine
+UG	Uganda
+UM	US minor outlying islands
+US	United States
+UY	Uruguay
+UZ	Uzbekistan
+VA	Vatican City
+VC	St Vincent
+VE	Venezuela
+VG	Virgin Islands (UK)
+VI	Virgin Islands (US)
+VN	Vietnam
+VU	Vanuatu
+WF	Wallis & Futuna
+WS	Samoa (western)
+YE	Yemen
+YT	Mayotte
+ZA	South Africa
+ZM	Zambia
+ZW	Zimbabwe
diff --git a/lib/pytz-old/zoneinfo/localtime b/lib/pytz-old/zoneinfo/localtime
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz-old/zoneinfo/localtime differ
diff --git a/lib/pytz-old/zoneinfo/posixrules b/lib/pytz-old/zoneinfo/posixrules
new file mode 100644
index 0000000..7553fee
Binary files /dev/null and b/lib/pytz-old/zoneinfo/posixrules differ
diff --git a/lib/pytz/zoneinfo/posixrules.py b/lib/pytz-old/zoneinfo/posixrules.py
similarity index 100%
rename from lib/pytz/zoneinfo/posixrules.py
rename to lib/pytz-old/zoneinfo/posixrules.py
diff --git a/lib/pytz-old/zoneinfo/zone.tab b/lib/pytz-old/zoneinfo/zone.tab
new file mode 100644
index 0000000..a7373f1
--- /dev/null
+++ b/lib/pytz-old/zoneinfo/zone.tab
@@ -0,0 +1,440 @@
+# tz zone descriptions (deprecated version)
+#
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+#
+# From Paul Eggert (2014-07-31):
+# This file is intended as a backward-compatibility aid for older programs.
+# New programs should use zone1970.tab.  This file is like zone1970.tab (see
+# zone1970.tab's comments), but with the following additional restrictions:
+#
+# 1.  This file contains only ASCII characters.
+# 2.  The first data column contains exactly one country code.
+#
+# Because of (2), each row stands for an area that is the intersection
+# of a region identified by a country code and of a zone where civil
+# clocks have agreed since 1970; this is a narrower definition than
+# that of zone1970.tab.
+#
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
+#
+#country-
+#code	coordinates	TZ			comments
+AD	+4230+00131	Europe/Andorra
+AE	+2518+05518	Asia/Dubai
+AF	+3431+06912	Asia/Kabul
+AG	+1703-06148	America/Antigua
+AI	+1812-06304	America/Anguilla
+AL	+4120+01950	Europe/Tirane
+AM	+4011+04430	Asia/Yerevan
+AO	-0848+01314	Africa/Luanda
+AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
+AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
+AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
+AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
+AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
+AS	-1416-17042	Pacific/Pago_Pago
+AT	+4813+01620	Europe/Vienna
+AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-3749+14458	Australia/Melbourne	Victoria
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3455+13835	Australia/Adelaide	South Australia
+AU	-1228+13050	Australia/Darwin	Northern Territory
+AU	-3157+11551	Australia/Perth	Western Australia - most locations
+AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
+AW	+1230-06958	America/Aruba
+AX	+6006+01957	Europe/Mariehamn
+AZ	+4023+04951	Asia/Baku
+BA	+4352+01825	Europe/Sarajevo
+BB	+1306-05937	America/Barbados
+BD	+2343+09025	Asia/Dhaka
+BE	+5050+00420	Europe/Brussels
+BF	+1222-00131	Africa/Ouagadougou
+BG	+4241+02319	Europe/Sofia
+BH	+2623+05035	Asia/Bahrain
+BI	-0323+02922	Africa/Bujumbura
+BJ	+0629+00237	Africa/Porto-Novo
+BL	+1753-06251	America/St_Barthelemy
+BM	+3217-06446	Atlantic/Bermuda
+BN	+0456+11455	Asia/Brunei
+BO	-1630-06809	America/La_Paz
+BQ	+120903-0681636	America/Kralendijk
+BR	-0351-03225	America/Noronha	Atlantic islands
+BR	-0127-04829	America/Belem	Amapa, E Para
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0803-03454	America/Recife	Pernambuco
+BR	-0712-04812	America/Araguaina	Tocantins
+BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+BR	-1259-03831	America/Bahia	Bahia
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+BR	-1535-05605	America/Cuiaba	Mato Grosso
+BR	-0226-05452	America/Santarem	W Para
+BR	-0846-06354	America/Porto_Velho	Rondonia
+BR	+0249-06040	America/Boa_Vista	Roraima
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0958-06748	America/Rio_Branco	Acre
+BS	+2505-07721	America/Nassau
+BT	+2728+08939	Asia/Thimphu
+BW	-2439+02555	Africa/Gaborone
+BY	+5354+02734	Europe/Minsk
+BZ	+1730-08812	America/Belize
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CC	-1210+09655	Indian/Cocos
+CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
+CF	+0422+01835	Africa/Bangui
+CG	-0416+01517	Africa/Brazzaville
+CH	+4723+00832	Europe/Zurich
+CI	+0519-00402	Africa/Abidjan
+CK	-2114-15946	Pacific/Rarotonga
+CL	-3327-07040	America/Santiago	most locations
+CL	-2709-10926	Pacific/Easter	Easter Island
+CM	+0403+00942	Africa/Douala
+CN	+3114+12128	Asia/Shanghai	Beijing Time
+CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+CO	+0436-07405	America/Bogota
+CR	+0956-08405	America/Costa_Rica
+CU	+2308-08222	America/Havana
+CV	+1455-02331	Atlantic/Cape_Verde
+CW	+1211-06900	America/Curacao
+CX	-1025+10543	Indian/Christmas
+CY	+3510+03322	Asia/Nicosia
+CZ	+5005+01426	Europe/Prague
+DE	+5230+01322	Europe/Berlin	most locations
+DE	+4742+00841	Europe/Busingen	Busingen
+DJ	+1136+04309	Africa/Djibouti
+DK	+5540+01235	Europe/Copenhagen
+DM	+1518-06124	America/Dominica
+DO	+1828-06954	America/Santo_Domingo
+DZ	+3647+00303	Africa/Algiers
+EC	-0210-07950	America/Guayaquil	mainland
+EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+EE	+5925+02445	Europe/Tallinn
+EG	+3003+03115	Africa/Cairo
+EH	+2709-01312	Africa/El_Aaiun
+ER	+1520+03853	Africa/Asmara
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+2806-01524	Atlantic/Canary	Canary Islands
+ET	+0902+03842	Africa/Addis_Ababa
+FI	+6010+02458	Europe/Helsinki
+FJ	-1808+17825	Pacific/Fiji
+FK	-5142-05751	Atlantic/Stanley
+FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
+FM	+0519+16259	Pacific/Kosrae	Kosrae
+FO	+6201-00646	Atlantic/Faroe
+FR	+4852+00220	Europe/Paris
+GA	+0023+00927	Africa/Libreville
+GB	+513030-0000731	Europe/London
+GD	+1203-06145	America/Grenada
+GE	+4143+04449	Asia/Tbilisi
+GF	+0456-05220	America/Cayenne
+GG	+4927-00232	Europe/Guernsey
+GH	+0533-00013	Africa/Accra
+GI	+3608-00521	Europe/Gibraltar
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
+GM	+1328-01639	Africa/Banjul
+GN	+0931-01343	Africa/Conakry
+GP	+1614-06132	America/Guadeloupe
+GQ	+0345+00847	Africa/Malabo
+GR	+3758+02343	Europe/Athens
+GS	-5416-03632	Atlantic/South_Georgia
+GT	+1438-09031	America/Guatemala
+GU	+1328+14445	Pacific/Guam
+GW	+1151-01535	Africa/Bissau
+GY	+0648-05810	America/Guyana
+HK	+2217+11409	Asia/Hong_Kong
+HN	+1406-08713	America/Tegucigalpa
+HR	+4548+01558	Europe/Zagreb
+HT	+1832-07220	America/Port-au-Prince
+HU	+4730+01905	Europe/Budapest
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
+IE	+5320-00615	Europe/Dublin
+IL	+314650+0351326	Asia/Jerusalem
+IM	+5409-00428	Europe/Isle_of_Man
+IN	+2232+08822	Asia/Kolkata
+IO	-0720+07225	Indian/Chagos
+IQ	+3321+04425	Asia/Baghdad
+IR	+3540+05126	Asia/Tehran
+IS	+6409-02151	Atlantic/Reykjavik
+IT	+4154+01229	Europe/Rome
+JE	+4912-00207	Europe/Jersey
+JM	+175805-0764736	America/Jamaica
+JO	+3157+03556	Asia/Amman
+JP	+353916+1394441	Asia/Tokyo
+KE	-0117+03649	Africa/Nairobi
+KG	+4254+07436	Asia/Bishkek
+KH	+1133+10455	Asia/Phnom_Penh
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+KI	+0152-15720	Pacific/Kiritimati	Line Islands
+KM	-1141+04316	Indian/Comoro
+KN	+1718-06243	America/St_Kitts
+KP	+3901+12545	Asia/Pyongyang
+KR	+3733+12658	Asia/Seoul
+KW	+2920+04759	Asia/Kuwait
+KY	+1918-08123	America/Cayman
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+5113+05121	Asia/Oral	West Kazakhstan
+LA	+1758+10236	Asia/Vientiane
+LB	+3353+03530	Asia/Beirut
+LC	+1401-06100	America/St_Lucia
+LI	+4709+00931	Europe/Vaduz
+LK	+0656+07951	Asia/Colombo
+LR	+0618-01047	Africa/Monrovia
+LS	-2928+02730	Africa/Maseru
+LT	+5441+02519	Europe/Vilnius
+LU	+4936+00609	Europe/Luxembourg
+LV	+5657+02406	Europe/Riga
+LY	+3254+01311	Africa/Tripoli
+MA	+3339-00735	Africa/Casablanca
+MC	+4342+00723	Europe/Monaco
+MD	+4700+02850	Europe/Chisinau
+ME	+4226+01916	Europe/Podgorica
+MF	+1804-06305	America/Marigot
+MG	-1855+04731	Indian/Antananarivo
+MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+MK	+4159+02126	Europe/Skopje
+ML	+1239-00800	Africa/Bamako
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+MO	+2214+11335	Asia/Macau
+MP	+1512+14545	Pacific/Saipan
+MQ	+1436-06105	America/Martinique
+MR	+1806-01557	Africa/Nouakchott
+MS	+1643-06213	America/Montserrat
+MT	+3554+01431	Europe/Malta
+MU	-2010+05730	Indian/Mauritius
+MV	+0410+07330	Indian/Maldives
+MW	-1547+03500	Africa/Blantyre
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MZ	-2558+03235	Africa/Maputo
+NA	-2234+01706	Africa/Windhoek
+NC	-2216+16627	Pacific/Noumea
+NE	+1331+00207	Africa/Niamey
+NF	-2903+16758	Pacific/Norfolk
+NG	+0627+00324	Africa/Lagos
+NI	+1209-08617	America/Managua
+NL	+5222+00454	Europe/Amsterdam
+NO	+5955+01045	Europe/Oslo
+NP	+2743+08519	Asia/Kathmandu
+NR	-0031+16655	Pacific/Nauru
+NU	-1901-16955	Pacific/Niue
+NZ	-3652+17446	Pacific/Auckland	most locations
+NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+OM	+2336+05835	Asia/Muscat
+PA	+0858-07932	America/Panama
+PE	-1203-07703	America/Lima
+PF	-1732-14934	Pacific/Tahiti	Society Islands
+PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG	-0930+14710	Pacific/Port_Moresby	most locations
+PG	-0613+15534	Pacific/Bougainville	Bougainville
+PH	+1435+12100	Asia/Manila
+PK	+2452+06703	Asia/Karachi
+PL	+5215+02100	Europe/Warsaw
+PM	+4703-05620	America/Miquelon
+PN	-2504-13005	Pacific/Pitcairn
+PR	+182806-0660622	America/Puerto_Rico
+PS	+3130+03428	Asia/Gaza	Gaza Strip
+PS	+313200+0350542	Asia/Hebron	West Bank
+PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+PT	+3744-02540	Atlantic/Azores	Azores
+PW	+0720+13429	Pacific/Palau
+PY	-2516-05740	America/Asuncion
+QA	+2517+05132	Asia/Qatar
+RE	-2052+05528	Indian/Reunion
+RO	+4426+02606	Europe/Bucharest
+RS	+4450+02030	Europe/Belgrade
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+RW	-0157+03004	Africa/Kigali
+SA	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Indian/Mahe
+SD	+1536+03232	Africa/Khartoum
+SE	+5920+01803	Europe/Stockholm
+SG	+0117+10351	Asia/Singapore
+SH	-1555-00542	Atlantic/St_Helena
+SI	+4603+01431	Europe/Ljubljana
+SJ	+7800+01600	Arctic/Longyearbyen
+SK	+4809+01707	Europe/Bratislava
+SL	+0830-01315	Africa/Freetown
+SM	+4355+01228	Europe/San_Marino
+SN	+1440-01726	Africa/Dakar
+SO	+0204+04522	Africa/Mogadishu
+SR	+0550-05510	America/Paramaribo
+SS	+0451+03136	Africa/Juba
+ST	+0020+00644	Africa/Sao_Tome
+SV	+1342-08912	America/El_Salvador
+SX	+180305-0630250	America/Lower_Princes
+SY	+3330+03618	Asia/Damascus
+SZ	-2618+03106	Africa/Mbabane
+TC	+2128-07108	America/Grand_Turk
+TD	+1207+01503	Africa/Ndjamena
+TF	-492110+0701303	Indian/Kerguelen
+TG	+0608+00113	Africa/Lome
+TH	+1345+10031	Asia/Bangkok
+TJ	+3835+06848	Asia/Dushanbe
+TK	-0922-17114	Pacific/Fakaofo
+TL	-0833+12535	Asia/Dili
+TM	+3757+05823	Asia/Ashgabat
+TN	+3648+01011	Africa/Tunis
+TO	-2110-17510	Pacific/Tongatapu
+TR	+4101+02858	Europe/Istanbul
+TT	+1039-06131	America/Port_of_Spain
+TV	-0831+17913	Pacific/Funafuti
+TW	+2503+12130	Asia/Taipei
+TZ	-0648+03917	Africa/Dar_es_Salaam
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UG	+0019+03225	Africa/Kampala
+UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+UM	+2813-17722	Pacific/Midway	Midway Islands
+UM	+1917+16637	Pacific/Wake	Wake Island
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
+US	+211825-1575130	Pacific/Honolulu	Hawaii
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+VA	+415408+0122711	Europe/Vatican
+VC	+1309-06114	America/St_Vincent
+VE	+1030-06656	America/Caracas
+VG	+1827-06437	America/Tortola
+VI	+1821-06456	America/St_Thomas
+VN	+1045+10640	Asia/Ho_Chi_Minh
+VU	-1740+16825	Pacific/Efate
+WF	-1318-17610	Pacific/Wallis
+WS	-1350-17144	Pacific/Apia
+YE	+1245+04512	Asia/Aden
+YT	-1247+04514	Indian/Mayotte
+ZA	-2615+02800	Africa/Johannesburg
+ZM	-1525+02817	Africa/Lusaka
+ZW	-1750+03103	Africa/Harare
diff --git a/lib/pytz-old/zoneinfo/zone1970.tab b/lib/pytz-old/zoneinfo/zone1970.tab
new file mode 100644
index 0000000..e971bc7
--- /dev/null
+++ b/lib/pytz-old/zoneinfo/zone1970.tab
@@ -0,0 +1,371 @@
+# tz zone descriptions
+#
+# This file is in the public domain.
+#
+# From Paul Eggert (2014-07-31):
+# This file contains a table where each row stands for a zone where
+# civil time stamps have agreed since 1970.  Columns are separated by
+# a single tab.  Lines beginning with '#' are comments.  All text uses
+# UTF-8 encoding.  The columns of the table are as follows:
+#
+# 1.  The countries that overlap the zone, as a comma-separated list
+#     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
+# 2.  Latitude and longitude of the zone's principal location
+#     in ISO 6709 sign-degrees-minutes-seconds format,
+#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
+#     first latitude (+ is north), then longitude (+ is east).
+# 3.  Zone name used in value of TZ environment variable.
+#     Please see the 'Theory' file for how zone names are chosen.
+#     If multiple zones overlap a country, each has a row in the
+#     table, with each column 1 containing the country code.
+# 4.  Comments; present if and only if a country has multiple zones.
+#
+# If a zone covers multiple countries, the most-populous city is used,
+# and that country is listed first in column 1; any other countries
+# are listed alphabetically by country code.  The table is sorted
+# first by country code, then (if possible) by an order within the
+# country that (1) makes some geographical sense, and (2) puts the
+# most populous zones first, where that does not contradict (1).
+#
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
+#
+#country-
+#codes	coordinates	TZ	comments
+AD	+4230+00131	Europe/Andorra
+AE,OM	+2518+05518	Asia/Dubai
+AF	+3431+06912	Asia/Kabul
+AL	+4120+01950	Europe/Tirane
+AM	+4011+04430	Asia/Yerevan
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adélie Land
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
+AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
+AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
+AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
+AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
+AS,UM	-1416-17042	Pacific/Pago_Pago	Samoa, Midway
+AT	+4813+01620	Europe/Vienna
+AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-3749+14458	Australia/Melbourne	Victoria
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3455+13835	Australia/Adelaide	South Australia
+AU	-1228+13050	Australia/Darwin	Northern Territory
+AU	-3157+11551	Australia/Perth	Western Australia - most locations
+AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
+AZ	+4023+04951	Asia/Baku
+BB	+1306-05937	America/Barbados
+BD	+2343+09025	Asia/Dhaka
+BE	+5050+00420	Europe/Brussels
+BG	+4241+02319	Europe/Sofia
+BM	+3217-06446	Atlantic/Bermuda
+BN	+0456+11455	Asia/Brunei
+BO	-1630-06809	America/La_Paz
+BR	-0351-03225	America/Noronha	Atlantic islands
+BR	-0127-04829	America/Belem	Amapá, E Pará
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0803-03454	America/Recife	Pernambuco
+BR	-0712-04812	America/Araguaina	Tocantins
+BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+BR	-1259-03831	America/Bahia	Bahia
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+BR	-1535-05605	America/Cuiaba	Mato Grosso
+BR	-0226-05452	America/Santarem	W Pará
+BR	-0846-06354	America/Porto_Velho	Rondônia
+BR	+0249-06040	America/Boa_Vista	Roraima
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0958-06748	America/Rio_Branco	Acre
+BS	+2505-07721	America/Nassau
+BT	+2728+08939	Asia/Thimphu
+BY	+5354+02734	Europe/Minsk
+BZ	+1730-08812	America/Belize
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CC	-1210+09655	Indian/Cocos
+CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+CK	-2114-15946	Pacific/Rarotonga
+CL	-3327-07040	America/Santiago	most locations
+CL	-2709-10926	Pacific/Easter	Easter Island
+CN	+3114+12128	Asia/Shanghai	Beijing Time
+CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+CO	+0436-07405	America/Bogota
+CR	+0956-08405	America/Costa_Rica
+CU	+2308-08222	America/Havana
+CV	+1455-02331	Atlantic/Cape_Verde
+CW,AW,BQ,SX	+1211-06900	America/Curacao
+CX	-1025+10543	Indian/Christmas
+CY	+3510+03322	Asia/Nicosia
+CZ,SK	+5005+01426	Europe/Prague
+DE	+5230+01322	Europe/Berlin	Berlin time
+DK	+5540+01235	Europe/Copenhagen
+DO	+1828-06954	America/Santo_Domingo
+DZ	+3647+00303	Africa/Algiers
+EC	-0210-07950	America/Guayaquil	mainland
+EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+EE	+5925+02445	Europe/Tallinn
+EG	+3003+03115	Africa/Cairo
+EH	+2709-01312	Africa/El_Aaiun
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+2806-01524	Atlantic/Canary	Canary Islands
+FI,AX	+6010+02458	Europe/Helsinki
+FJ	-1808+17825	Pacific/Fiji
+FK	-5142-05751	Atlantic/Stanley
+FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
+FM	+0519+16259	Pacific/Kosrae	Kosrae
+FO	+6201-00646	Atlantic/Faroe
+FR	+4852+00220	Europe/Paris
+GB,GG,IM,JE	+513030-0000731	Europe/London
+GE	+4143+04449	Asia/Tbilisi
+GF	+0456-05220	America/Cayenne
+GH	+0533-00013	Africa/Accra
+GI	+3608-00521	Europe/Gibraltar
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
+GR	+3758+02343	Europe/Athens
+GS	-5416-03632	Atlantic/South_Georgia
+GT	+1438-09031	America/Guatemala
+GU,MP	+1328+14445	Pacific/Guam
+GW	+1151-01535	Africa/Bissau
+GY	+0648-05810	America/Guyana
+HK	+2217+11409	Asia/Hong_Kong
+HN	+1406-08713	America/Tegucigalpa
+HT	+1832-07220	America/Port-au-Prince
+HU	+4730+01905	Europe/Budapest
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
+IE	+5320-00615	Europe/Dublin
+IL	+314650+0351326	Asia/Jerusalem
+IN	+2232+08822	Asia/Kolkata
+IO	-0720+07225	Indian/Chagos
+IQ	+3321+04425	Asia/Baghdad
+IR	+3540+05126	Asia/Tehran
+IS	+6409-02151	Atlantic/Reykjavik
+IT,SM,VA	+4154+01229	Europe/Rome
+JM	+175805-0764736	America/Jamaica
+JO	+3157+03556	Asia/Amman
+JP	+353916+1394441	Asia/Tokyo
+KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
+KG	+4254+07436	Asia/Bishkek
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+KI	+0152-15720	Pacific/Kiritimati	Line Islands
+KP	+3901+12545	Asia/Pyongyang
+KR	+3733+12658	Asia/Seoul
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+5113+05121	Asia/Oral	West Kazakhstan
+LB	+3353+03530	Asia/Beirut
+LK	+0656+07951	Asia/Colombo
+LR	+0618-01047	Africa/Monrovia
+LT	+5441+02519	Europe/Vilnius
+LU	+4936+00609	Europe/Luxembourg
+LV	+5657+02406	Europe/Riga
+LY	+3254+01311	Africa/Tripoli
+MA	+3339-00735	Africa/Casablanca
+MC	+4342+00723	Europe/Monaco
+MD	+4700+02850	Europe/Chisinau
+MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+MO	+2214+11335	Asia/Macau
+MQ	+1436-06105	America/Martinique
+MT	+3554+01431	Europe/Malta
+MU	-2010+05730	Indian/Mauritius
+MV	+0410+07330	Indian/Maldives
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
+NA	-2234+01706	Africa/Windhoek
+NC	-2216+16627	Pacific/Noumea
+NF	-2903+16758	Pacific/Norfolk
+NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
+NI	+1209-08617	America/Managua
+NL	+5222+00454	Europe/Amsterdam
+NO,SJ	+5955+01045	Europe/Oslo
+NP	+2743+08519	Asia/Kathmandu
+NR	-0031+16655	Pacific/Nauru
+NU	-1901-16955	Pacific/Niue
+NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
+NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+PA,KY	+0858-07932	America/Panama
+PE	-1203-07703	America/Lima
+PF	-1732-14934	Pacific/Tahiti	Society Islands
+PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG	-0930+14710	Pacific/Port_Moresby	most locations
+PG	-0613+15534	Pacific/Bougainville	Bougainville
+PH	+1435+12100	Asia/Manila
+PK	+2452+06703	Asia/Karachi
+PL	+5215+02100	Europe/Warsaw
+PM	+4703-05620	America/Miquelon
+PN	-2504-13005	Pacific/Pitcairn
+PR	+182806-0660622	America/Puerto_Rico
+PS	+3130+03428	Asia/Gaza	Gaza Strip
+PS	+313200+0350542	Asia/Hebron	West Bank
+PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+PT	+3744-02540	Atlantic/Azores	Azores
+PW	+0720+13429	Pacific/Palau
+PY	-2516-05740	America/Asuncion
+QA,BH	+2517+05132	Asia/Qatar
+RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
+RO	+4426+02606	Europe/Bucharest
+RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+SA,KW,YE	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Indian/Mahe
+SD,SS	+1536+03232	Africa/Khartoum
+SE	+5920+01803	Europe/Stockholm
+SG	+0117+10351	Asia/Singapore
+SR	+0550-05510	America/Paramaribo
+SV	+1342-08912	America/El_Salvador
+SY	+3330+03618	Asia/Damascus
+TC	+2128-07108	America/Grand_Turk
+TD	+1207+01503	Africa/Ndjamena
+TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+TH,KH,LA,VN	+1345+10031	Asia/Bangkok	most of Indochina
+TJ	+3835+06848	Asia/Dushanbe
+TK	-0922-17114	Pacific/Fakaofo
+TL	-0833+12535	Asia/Dili
+TM	+3757+05823	Asia/Ashgabat
+TN	+3648+01011	Africa/Tunis
+TO	-2110-17510	Pacific/Tongatapu
+TR	+4101+02858	Europe/Istanbul
+TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+TV	-0831+17913	Pacific/Funafuti
+TW	+2503+12130	Asia/Taipei
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UM	+1917+16637	Pacific/Wake	Wake Island
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
+US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+VE	+1030-06656	America/Caracas
+VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
+VU	-1740+16825	Pacific/Efate
+WF	-1318-17610	Pacific/Wallis
+WS	-1350-17144	Pacific/Apia
+ZA,LS,SZ	-2615+02800	Africa/Johannesburg
diff --git a/lib/pytz/__init__.py b/lib/pytz/__init__.py
old mode 100755
new mode 100644
index f4ff913..265ba14
--- a/lib/pytz/__init__.py
+++ b/lib/pytz/__init__.py
@@ -8,21 +8,102 @@ See the datetime section of the Python Library Reference for information
 on how to use these modules.
 '''
 
-# The Olson database has historically been updated about 4 times a year
-OLSON_VERSION = '2006p'
-VERSION = OLSON_VERSION
-#VERSION = OLSON_VERSION + '.2'
-__version__ = OLSON_VERSION
+# The Olson database is updated several times a year.
+OLSON_VERSION = '2014j'
+VERSION = '2014.10'  # Switching to pip compatible version numbering.
+__version__ = VERSION
 
 OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
 
 __all__ = [
-    'timezone', 'all_timezones', 'common_timezones', 'utc',
-    'AmbiguousTimeError', 'country_timezones', '_',
+    'timezone', 'utc', 'country_timezones', 'country_names',
+    'AmbiguousTimeError', 'InvalidTimeError',
+    'NonExistentTimeError', 'UnknownTimeZoneError',
+    'all_timezones', 'all_timezones_set',
+    'common_timezones', 'common_timezones_set',
     ]
 
 import sys, datetime, os.path, gettext
-from tzinfo import AmbiguousTimeError, unpickler
+
+try:
+    from pkg_resources import resource_stream
+except ImportError:
+    resource_stream = None
+
+from lib.pytz.exceptions import AmbiguousTimeError
+from lib.pytz.exceptions import InvalidTimeError
+from lib.pytz.exceptions import NonExistentTimeError
+from lib.pytz.exceptions import UnknownTimeZoneError
+from lib.pytz.lazy import LazyDict, LazyList, LazySet
+from lib.pytz.tzinfo import unpickler
+from lib.pytz.tzfile import build_tzinfo, _byte_string
+
+
+try:
+    unicode
+
+except NameError: # Python 3.x
+
+    # Python 3.x doesn't have unicode(), making writing code
+    # for Python 2.3 and Python 3.x a pain.
+    unicode = str
+
+    def ascii(s):
+        r"""
+        >>> ascii('Hello')
+        'Hello'
+        >>> ascii('\N{TRADE MARK SIGN}') #doctest: +IGNORE_EXCEPTION_DETAIL
+        Traceback (most recent call last):
+            ...
+        UnicodeEncodeError: ...
+        """
+        s.encode('US-ASCII') # Raise an exception if not ASCII
+        return s # But return the original string - not a byte string.
+
+else: # Python 2.x
+
+    def ascii(s):
+        r"""
+        >>> ascii('Hello')
+        'Hello'
+        >>> ascii(u'Hello')
+        'Hello'
+        >>> ascii(u'\N{TRADE MARK SIGN}') #doctest: +IGNORE_EXCEPTION_DETAIL
+        Traceback (most recent call last):
+            ...
+        UnicodeEncodeError: ...
+        """
+        return s.encode('US-ASCII')
+
+
+def open_resource(name):
+    """Open a resource from the zoneinfo subdir for reading.
+
+    Uses the pkg_resources module if available and no standard file
+    found at the calculated location.
+    """
+    name_parts = name.lstrip('/').split('/')
+    for part in name_parts:
+        if part == os.path.pardir or os.path.sep in part:
+            raise ValueError('Bad path segment: %r' % part)
+    filename = os.path.join(os.path.dirname(__file__),
+                            'zoneinfo', *name_parts)
+    if not os.path.exists(filename) and resource_stream is not None:
+        # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+        # unless absolutely necessary to help when a broken version of
+        # pkg_resources is installed.
+        return resource_stream(__name__, 'zoneinfo/' + name)
+    return open(filename, 'rb')
+
+
+def resource_exists(name):
+    """Return true if the given resource exists"""
+    try:
+        open_resource(name).close()
+        return True
+    except IOError:
+        return False
+
 
 # Enable this when we get some translations?
 # We want an i18n API that is useful to programs using Python's gettext
@@ -38,14 +119,19 @@ from tzinfo import AmbiguousTimeError, unpickler
 #     """Translate a timezone name using the current locale, returning Unicode"""
 #     return t.ugettext(timezone_name)
 
+
+_tzinfo_cache = {}
+
 def timezone(zone):
-    ''' Return a datetime.tzinfo implementation for the given timezone 
-    
+    r''' Return a datetime.tzinfo implementation for the given timezone 
+
     >>> from datetime import datetime, timedelta
     >>> utc = timezone('UTC')
     >>> eastern = timezone('US/Eastern')
     >>> eastern.zone
     'US/Eastern'
+    >>> timezone(unicode('US/Eastern')) is eastern
+    True
     >>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
     >>> loc_dt = utc_dt.astimezone(eastern)
     >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
@@ -57,32 +143,48 @@ def timezone(zone):
     '2002-10-27 01:50:00 EDT (-0400)'
     >>> (loc_dt + timedelta(minutes=10)).strftime(fmt)
     '2002-10-27 01:10:00 EST (-0500)'
+
+    Raises UnknownTimeZoneError if passed an unknown zone.
+
+    >>> try:
+    ...     timezone('Asia/Shangri-La')
+    ... except UnknownTimeZoneError:
+    ...     print('Unknown')
+    Unknown
+
+    >>> try:
+    ...     timezone(unicode('\N{TRADE MARK SIGN}'))
+    ... except UnknownTimeZoneError:
+    ...     print('Unknown')
+    Unknown
+
     '''
-    zone = _munge_zone(zone)
     if zone.upper() == 'UTC':
         return utc
-    zone_bits = ['zoneinfo'] + zone.split('/')
 
-    # Load zone's module
-    module_name = '.'.join(zone_bits)
     try:
-        module = __import__(module_name, globals(), locals())
-    except ImportError:
-        raise KeyError, zone
-    rv = module
-    for bit in zone_bits[1:]:
-        rv = getattr(rv, bit)
+        zone = ascii(zone)
+    except UnicodeEncodeError:
+        # All valid timezones are ASCII
+        raise UnknownTimeZoneError(zone)
+
+    zone = _unmunge_zone(zone)
+    if zone not in _tzinfo_cache:
+        if zone in all_timezones_set:
+            fp = open_resource(zone)
+            try:
+                _tzinfo_cache[zone] = build_tzinfo(zone, fp)
+            finally:
+                fp.close()
+        else:
+            raise UnknownTimeZoneError(zone)
 
-    # Return instance from that module
-    rv = getattr(rv, zone_bits[-1])
-    assert type(rv) != type(sys)
-    return rv
+    return _tzinfo_cache[zone]
 
 
-def _munge_zone(zone):
-    ''' Convert a zone into a string suitable for use as a Python identifier 
-    '''
-    return zone.replace('+', '_plus_').replace('-', '_minus_')
+def _unmunge_zone(zone):
+    """Undo the time zone name munging done by older versions of pytz."""
+    return zone.replace('_plus_', '+').replace('_minus_', '-')
 
 
 ZERO = datetime.timedelta(0)
@@ -91,16 +193,21 @@ HOUR = datetime.timedelta(hours=1)
 
 class UTC(datetime.tzinfo):
     """UTC
-    
-    Identical to the reference UTC implementation given in Python docs except
-    that it unpickles using the single module global instance defined beneath
-    this class declaration.
 
-    Also contains extra attributes and methods to match other pytz tzinfo
-    instances.
+    Optimized UTC implementation. It unpickles using the single module global
+    instance defined beneath this class declaration.
     """
     zone = "UTC"
 
+    _utcoffset = ZERO
+    _dst = ZERO
+    _tzname = zone
+
+    def fromutc(self, dt):
+        if dt.tzinfo is None:
+            return self.localize(dt)
+        return super(utc.__class__, self).fromutc(dt)
+
     def utcoffset(self, dt):
         return ZERO
 
@@ -109,21 +216,23 @@ class UTC(datetime.tzinfo):
 
     def dst(self, dt):
         return ZERO
-    
+
     def __reduce__(self):
         return _UTC, ()
 
     def localize(self, dt, is_dst=False):
         '''Convert naive time to local time'''
         if dt.tzinfo is not None:
-            raise ValueError, 'Not naive datetime (tzinfo is already set)'
+            raise ValueError('Not naive datetime (tzinfo is already set)')
         return dt.replace(tzinfo=self)
 
     def normalize(self, dt, is_dst=False):
         '''Correct the timezone information on the given datetime'''
+        if dt.tzinfo is self:
+            return dt
         if dt.tzinfo is None:
-            raise ValueError, 'Naive time - no tzinfo set'
-        return dt.replace(tzinfo=self)
+            raise ValueError('Naive time - no tzinfo set')
+        return dt.astimezone(self)
 
     def __repr__(self):
         return "<UTC>"
@@ -137,21 +246,21 @@ UTC = utc = UTC() # UTC is a singleton
 
 def _UTC():
     """Factory function for utc unpickling.
-    
+
     Makes sure that unpickling a utc instance always returns the same 
     module global.
-    
+
     These examples belong in the UTC class above, but it is obscured; or in
     the README.txt, but we are not depending on Python 2.4 so integrating
     the README.txt examples with the unit tests is not trivial.
-    
+
     >>> import datetime, pickle
     >>> dt = datetime.datetime(2005, 3, 1, 14, 13, 21, tzinfo=utc)
     >>> naive = dt.replace(tzinfo=None)
     >>> p = pickle.dumps(dt, 1)
     >>> naive_p = pickle.dumps(naive, 1)
-    >>> len(p), len(naive_p), len(p) - len(naive_p)
-    (60, 43, 17)
+    >>> len(p) - len(naive_p)
+    17
     >>> new = pickle.loads(p)
     >>> new == dt
     True
@@ -177,38 +286,88 @@ def _p(*args):
     return unpickler(*args)
 _p.__safe_for_unpickling__ = True
 
-_country_timezones_cache = {}
 
-def country_timezones(iso3166_code):
-    """Return a list of timezones used in a particular country.
+
+class _CountryTimezoneDict(LazyDict):
+    """Map ISO 3166 country code to a list of timezone names commonly used
+    in that country.
 
     iso3166_code is the two letter code used to identify the country.
 
-    >>> country_timezones('ch')
-    ['Europe/Zurich']
-    >>> country_timezones('CH')
-    ['Europe/Zurich']
-    >>> country_timezones('XXX')
+    >>> def print_list(list_of_strings):
+    ...     'We use a helper so doctests work under Python 2.3 -> 3.x'
+    ...     for s in list_of_strings:
+    ...         print(s)
+
+    >>> print_list(country_timezones['nz'])
+    Pacific/Auckland
+    Pacific/Chatham
+    >>> print_list(country_timezones['ch'])
+    Europe/Zurich
+    >>> print_list(country_timezones['CH'])
+    Europe/Zurich
+    >>> print_list(country_timezones[unicode('ch')])
+    Europe/Zurich
+    >>> print_list(country_timezones['XXX'])
     Traceback (most recent call last):
     ...
     KeyError: 'XXX'
+
+    Previously, this information was exposed as a function rather than a
+    dictionary. This is still supported::
+
+    >>> print_list(country_timezones('nz'))
+    Pacific/Auckland
+    Pacific/Chatham
     """
-    iso3166_code = iso3166_code.upper()
-    if not _country_timezones_cache:
+    def __call__(self, iso3166_code):
+        """Backwards compatibility."""
+        return self[iso3166_code]
+
+    def _fill(self):
+        data = {}
+        zone_tab = open_resource('zone.tab')
         try:
-            from pkg_resources import resource_stream
-            zone_tab = resource_stream(__name__, 'zone.tab')
-        except ImportError:
-            zone_tab = open(os.path.join(os.path.dirname(__file__), 'zone.tab'))
-        for line in zone_tab:
-            if line.startswith('#'):
-                continue
-            code, coordinates, zone = line.split(None, 4)[:3]
-            try:
-                _country_timezones_cache[code].append(zone)
-            except KeyError:
-                _country_timezones_cache[code] = [zone]
-    return _country_timezones_cache[iso3166_code]
+            for line in zone_tab:
+                line = line.decode('US-ASCII')
+                if line.startswith('#'):
+                    continue
+                code, coordinates, zone = line.split(None, 4)[:3]
+                if zone not in all_timezones_set:
+                    continue
+                try:
+                    data[code].append(zone)
+                except KeyError:
+                    data[code] = [zone]
+            self.data = data
+        finally:
+            zone_tab.close()
+
+country_timezones = _CountryTimezoneDict()
+
+
+class _CountryNameDict(LazyDict):
+    '''Dictionary proving ISO3166 code -> English name.
+
+    >>> print(country_names['au'])
+    Australia
+    '''
+    def _fill(self):
+        data = {}
+        zone_tab = open_resource('iso3166.tab')
+        try:
+            for line in zone_tab.readlines():
+                line = line.decode('US-ASCII')
+                if line.startswith('#'):
+                    continue
+                code, name = line.split(None, 1)
+                data[code] = name.strip()
+            self.data = data
+        finally:
+            zone_tab.close()
+
+country_names = _CountryNameDict()
+
 
 # Time-zone info based solely on fixed offsets
 
@@ -229,8 +388,8 @@ class _FixedOffset(datetime.tzinfo):
         return FixedOffset, (self._minutes, )
 
     def dst(self, dt):
-        return None
-    
+        return ZERO
+
     def tzname(self, dt):
         return None
 
@@ -240,30 +399,35 @@ class _FixedOffset(datetime.tzinfo):
     def localize(self, dt, is_dst=False):
         '''Convert naive time to local time'''
         if dt.tzinfo is not None:
-            raise ValueError, 'Not naive datetime (tzinfo is already set)'
+            raise ValueError('Not naive datetime (tzinfo is already set)')
         return dt.replace(tzinfo=self)
 
     def normalize(self, dt, is_dst=False):
         '''Correct the timezone information on the given datetime'''
         if dt.tzinfo is None:
-            raise ValueError, 'Naive time - no tzinfo set'
+            raise ValueError('Naive time - no tzinfo set')
         return dt.replace(tzinfo=self)
 
+
 def FixedOffset(offset, _tzinfos = {}):
     """return a fixed-offset timezone based off a number of minutes.
-    
+
         >>> one = FixedOffset(-330)
         >>> one
         pytz.FixedOffset(-330)
         >>> one.utcoffset(datetime.datetime.now())
         datetime.timedelta(-1, 66600)
+        >>> one.dst(datetime.datetime.now())
+        datetime.timedelta(0)
 
         >>> two = FixedOffset(1380)
         >>> two
         pytz.FixedOffset(1380)
         >>> two.utcoffset(datetime.datetime.now())
         datetime.timedelta(0, 82800)
-    
+        >>> two.dst(datetime.datetime.now())
+        datetime.timedelta(0)
+
     The datetime.timedelta must be between the range of -1 and 1 day,
     non-inclusive.
 
@@ -284,7 +448,7 @@ def FixedOffset(offset, _tzinfos = {}):
 
     There should always be only one instance of a FixedOffset per timedelta.
     This should be true for multiple creation calls.
-    
+
         >>> FixedOffset(-330) is one
         True
         >>> FixedOffset(1380) is two
@@ -297,9 +461,7 @@ def FixedOffset(offset, _tzinfos = {}):
         True
         >>> pickle.loads(pickle.dumps(two)) is two
         True
-
     """
-
     if offset == 0:
         return UTC
 
@@ -315,6 +477,7 @@ def FixedOffset(offset, _tzinfos = {}):
 
 FixedOffset.__safe_for_unpickling__ = True
 
+
 def _test():
     import doctest, os, sys
     sys.path.insert(0, os.pardir)
@@ -324,11 +487,12 @@ def _test():
 if __name__ == '__main__':
     _test()
 
-common_timezones = \
+all_timezones = \
 ['Africa/Abidjan',
  'Africa/Accra',
  'Africa/Addis_Ababa',
  'Africa/Algiers',
+ 'Africa/Asmara',
  'Africa/Asmera',
  'Africa/Bamako',
  'Africa/Bangui',
@@ -350,6 +514,7 @@ common_timezones = \
  'Africa/Gaborone',
  'Africa/Harare',
  'Africa/Johannesburg',
+ 'Africa/Juba',
  'Africa/Kampala',
  'Africa/Khartoum',
  'Africa/Kigali',
@@ -382,11 +547,25 @@ common_timezones = \
  'America/Anguilla',
  'America/Antigua',
  'America/Araguaina',
+ 'America/Argentina/Buenos_Aires',
+ 'America/Argentina/Catamarca',
+ 'America/Argentina/ComodRivadavia',
+ 'America/Argentina/Cordoba',
+ 'America/Argentina/Jujuy',
+ 'America/Argentina/La_Rioja',
+ 'America/Argentina/Mendoza',
+ 'America/Argentina/Rio_Gallegos',
+ 'America/Argentina/Salta',
+ 'America/Argentina/San_Juan',
+ 'America/Argentina/San_Luis',
+ 'America/Argentina/Tucuman',
+ 'America/Argentina/Ushuaia',
  'America/Aruba',
  'America/Asuncion',
  'America/Atikokan',
  'America/Atka',
  'America/Bahia',
+ 'America/Bahia_Banderas',
  'America/Barbados',
  'America/Belem',
  'America/Belize',
@@ -407,6 +586,7 @@ common_timezones = \
  'America/Coral_Harbour',
  'America/Cordoba',
  'America/Costa_Rica',
+ 'America/Creston',
  'America/Cuiaba',
  'America/Curacao',
  'America/Danmarkshavn',
@@ -433,25 +613,40 @@ common_timezones = \
  'America/Halifax',
  'America/Havana',
  'America/Hermosillo',
+ 'America/Indiana/Indianapolis',
+ 'America/Indiana/Knox',
+ 'America/Indiana/Marengo',
+ 'America/Indiana/Petersburg',
+ 'America/Indiana/Tell_City',
+ 'America/Indiana/Vevay',
+ 'America/Indiana/Vincennes',
+ 'America/Indiana/Winamac',
  'America/Indianapolis',
  'America/Inuvik',
  'America/Iqaluit',
  'America/Jamaica',
  'America/Jujuy',
  'America/Juneau',
+ 'America/Kentucky/Louisville',
+ 'America/Kentucky/Monticello',
  'America/Knox_IN',
+ 'America/Kralendijk',
  'America/La_Paz',
  'America/Lima',
  'America/Los_Angeles',
  'America/Louisville',
+ 'America/Lower_Princes',
  'America/Maceio',
  'America/Managua',
  'America/Manaus',
+ 'America/Marigot',
  'America/Martinique',
+ 'America/Matamoros',
  'America/Mazatlan',
  'America/Mendoza',
  'America/Menominee',
  'America/Merida',
+ 'America/Metlakatla',
  'America/Mexico_City',
  'America/Miquelon',
  'America/Moncton',
@@ -464,6 +659,10 @@ common_timezones = \
  'America/Nipigon',
  'America/Nome',
  'America/Noronha',
+ 'America/North_Dakota/Beulah',
+ 'America/North_Dakota/Center',
+ 'America/North_Dakota/New_Salem',
+ 'America/Ojinaga',
  'America/Panama',
  'America/Pangnirtung',
  'America/Paramaribo',
@@ -477,13 +676,18 @@ common_timezones = \
  'America/Rankin_Inlet',
  'America/Recife',
  'America/Regina',
+ 'America/Resolute',
  'America/Rio_Branco',
  'America/Rosario',
+ 'America/Santa_Isabel',
+ 'America/Santarem',
  'America/Santiago',
  'America/Santo_Domingo',
  'America/Sao_Paulo',
  'America/Scoresbysund',
  'America/Shiprock',
+ 'America/Sitka',
+ 'America/St_Barthelemy',
  'America/St_Johns',
  'America/St_Kitts',
  'America/St_Lucia',
@@ -505,12 +709,14 @@ common_timezones = \
  'Antarctica/Casey',
  'Antarctica/Davis',
  'Antarctica/DumontDUrville',
+ 'Antarctica/Macquarie',
  'Antarctica/Mawson',
  'Antarctica/McMurdo',
  'Antarctica/Palmer',
  'Antarctica/Rothera',
  'Antarctica/South_Pole',
  'Antarctica/Syowa',
+ 'Antarctica/Troll',
  'Antarctica/Vostok',
  'Arctic/Longyearbyen',
  'Asia/Aden',
@@ -529,6 +735,7 @@ common_timezones = \
  'Asia/Bishkek',
  'Asia/Brunei',
  'Asia/Calcutta',
+ 'Asia/Chita',
  'Asia/Choibalsan',
  'Asia/Chongqing',
  'Asia/Chungking',
@@ -541,6 +748,8 @@ common_timezones = \
  'Asia/Dushanbe',
  'Asia/Gaza',
  'Asia/Harbin',
+ 'Asia/Hebron',
+ 'Asia/Ho_Chi_Minh',
  'Asia/Hong_Kong',
  'Asia/Hovd',
  'Asia/Irkutsk',
@@ -552,7 +761,10 @@ common_timezones = \
  'Asia/Kamchatka',
  'Asia/Karachi',
  'Asia/Kashgar',
+ 'Asia/Kathmandu',
  'Asia/Katmandu',
+ 'Asia/Khandyga',
+ 'Asia/Kolkata',
  'Asia/Krasnoyarsk',
  'Asia/Kuala_Lumpur',
  'Asia/Kuching',
@@ -564,6 +776,7 @@ common_timezones = \
  'Asia/Manila',
  'Asia/Muscat',
  'Asia/Nicosia',
+ 'Asia/Novokuznetsk',
  'Asia/Novosibirsk',
  'Asia/Omsk',
  'Asia/Oral',
@@ -580,6 +793,7 @@ common_timezones = \
  'Asia/Seoul',
  'Asia/Shanghai',
  'Asia/Singapore',
+ 'Asia/Srednekolymsk',
  'Asia/Taipei',
  'Asia/Tashkent',
  'Asia/Tbilisi',
@@ -592,6 +806,7 @@ common_timezones = \
  'Asia/Ulaanbaatar',
  'Asia/Ulan_Bator',
  'Asia/Urumqi',
+ 'Asia/Ust-Nera',
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
@@ -602,6 +817,7 @@ common_timezones = \
  'Atlantic/Canary',
  'Atlantic/Cape_Verde',
  'Atlantic/Faeroe',
+ 'Atlantic/Faroe',
  'Atlantic/Jan_Mayen',
  'Atlantic/Madeira',
  'Atlantic/Reykjavik',
@@ -615,6 +831,7 @@ common_timezones = \
  'Australia/Canberra',
  'Australia/Currie',
  'Australia/Darwin',
+ 'Australia/Eucla',
  'Australia/Hobart',
  'Australia/LHI',
  'Australia/Lindeman',
@@ -634,6 +851,8 @@ common_timezones = \
  'Brazil/DeNoronha',
  'Brazil/East',
  'Brazil/West',
+ 'CET',
+ 'CST6CDT',
  'Canada/Atlantic',
  'Canada/Central',
  'Canada/East-Saskatchewan',
@@ -645,6 +864,47 @@ common_timezones = \
  'Canada/Yukon',
  'Chile/Continental',
  'Chile/EasterIsland',
+ 'Cuba',
+ 'EET',
+ 'EST',
+ 'EST5EDT',
+ 'Egypt',
+ 'Eire',
+ 'Etc/GMT',
+ 'Etc/GMT+0',
+ 'Etc/GMT+1',
+ 'Etc/GMT+10',
+ 'Etc/GMT+11',
+ 'Etc/GMT+12',
+ 'Etc/GMT+2',
+ 'Etc/GMT+3',
+ 'Etc/GMT+4',
+ 'Etc/GMT+5',
+ 'Etc/GMT+6',
+ 'Etc/GMT+7',
+ 'Etc/GMT+8',
+ 'Etc/GMT+9',
+ 'Etc/GMT-0',
+ 'Etc/GMT-1',
+ 'Etc/GMT-10',
+ 'Etc/GMT-11',
+ 'Etc/GMT-12',
+ 'Etc/GMT-13',
+ 'Etc/GMT-14',
+ 'Etc/GMT-2',
+ 'Etc/GMT-3',
+ 'Etc/GMT-4',
+ 'Etc/GMT-5',
+ 'Etc/GMT-6',
+ 'Etc/GMT-7',
+ 'Etc/GMT-8',
+ 'Etc/GMT-9',
+ 'Etc/GMT0',
+ 'Etc/Greenwich',
+ 'Etc/UCT',
+ 'Etc/UTC',
+ 'Etc/Universal',
+ 'Etc/Zulu',
  'Europe/Amsterdam',
  'Europe/Andorra',
  'Europe/Athens',
@@ -655,6 +915,7 @@ common_timezones = \
  'Europe/Brussels',
  'Europe/Bucharest',
  'Europe/Budapest',
+ 'Europe/Busingen',
  'Europe/Chisinau',
  'Europe/Copenhagen',
  'Europe/Dublin',
@@ -703,7 +964,16 @@ common_timezones = \
  'Europe/Zagreb',
  'Europe/Zaporozhye',
  'Europe/Zurich',
+ 'GB',
+ 'GB-Eire',
  'GMT',
+ 'GMT+0',
+ 'GMT-0',
+ 'GMT0',
+ 'Greenwich',
+ 'HST',
+ 'Hongkong',
+ 'Iceland',
  'Indian/Antananarivo',
  'Indian/Chagos',
  'Indian/Christmas',
@@ -715,12 +985,28 @@ common_timezones = \
  'Indian/Mauritius',
  'Indian/Mayotte',
  'Indian/Reunion',
+ 'Iran',
+ 'Israel',
+ 'Jamaica',
+ 'Japan',
+ 'Kwajalein',
+ 'Libya',
+ 'MET',
+ 'MST',
+ 'MST7MDT',
  'Mexico/BajaNorte',
  'Mexico/BajaSur',
  'Mexico/General',
+ 'NZ',
+ 'NZ-CHAT',
+ 'Navajo',
+ 'PRC',
+ 'PST8PDT',
  'Pacific/Apia',
  'Pacific/Auckland',
+ 'Pacific/Bougainville',
  'Pacific/Chatham',
+ 'Pacific/Chuuk',
  'Pacific/Easter',
  'Pacific/Efate',
  'Pacific/Enderbury',
@@ -746,6 +1032,7 @@ common_timezones = \
  'Pacific/Pago_Pago',
  'Pacific/Palau',
  'Pacific/Pitcairn',
+ 'Pacific/Pohnpei',
  'Pacific/Ponape',
  'Pacific/Port_Moresby',
  'Pacific/Rarotonga',
@@ -758,6 +1045,13 @@ common_timezones = \
  'Pacific/Wake',
  'Pacific/Wallis',
  'Pacific/Yap',
+ 'Poland',
+ 'Portugal',
+ 'ROC',
+ 'ROK',
+ 'Singapore',
+ 'Turkey',
+ 'UCT',
  'US/Alaska',
  'US/Aleutian',
  'US/Arizona',
@@ -771,14 +1065,21 @@ common_timezones = \
  'US/Pacific',
  'US/Pacific-New',
  'US/Samoa',
- 'UTC']
-
-all_timezones = \
+ 'UTC',
+ 'Universal',
+ 'W-SU',
+ 'WET',
+ 'Zulu']
+all_timezones = LazyList(
+        tz for tz in all_timezones if resource_exists(tz))
+        
+all_timezones_set = LazySet(all_timezones)
+common_timezones = \
 ['Africa/Abidjan',
  'Africa/Accra',
  'Africa/Addis_Ababa',
  'Africa/Algiers',
- 'Africa/Asmera',
+ 'Africa/Asmara',
  'Africa/Bamako',
  'Africa/Bangui',
  'Africa/Banjul',
@@ -799,6 +1100,7 @@ all_timezones = \
  'Africa/Gaborone',
  'Africa/Harare',
  'Africa/Johannesburg',
+ 'Africa/Juba',
  'Africa/Kampala',
  'Africa/Khartoum',
  'Africa/Kigali',
@@ -822,7 +1124,6 @@ all_timezones = \
  'Africa/Ouagadougou',
  'Africa/Porto-Novo',
  'Africa/Sao_Tome',
- 'Africa/Timbuktu',
  'Africa/Tripoli',
  'Africa/Tunis',
  'Africa/Windhoek',
@@ -833,20 +1134,21 @@ all_timezones = \
  'America/Araguaina',
  'America/Argentina/Buenos_Aires',
  'America/Argentina/Catamarca',
- 'America/Argentina/ComodRivadavia',
  'America/Argentina/Cordoba',
  'America/Argentina/Jujuy',
  'America/Argentina/La_Rioja',
  'America/Argentina/Mendoza',
  'America/Argentina/Rio_Gallegos',
+ 'America/Argentina/Salta',
  'America/Argentina/San_Juan',
+ 'America/Argentina/San_Luis',
  'America/Argentina/Tucuman',
  'America/Argentina/Ushuaia',
  'America/Aruba',
  'America/Asuncion',
  'America/Atikokan',
- 'America/Atka',
  'America/Bahia',
+ 'America/Bahia_Banderas',
  'America/Barbados',
  'America/Belem',
  'America/Belize',
@@ -854,19 +1156,16 @@ all_timezones = \
  'America/Boa_Vista',
  'America/Bogota',
  'America/Boise',
- 'America/Buenos_Aires',
  'America/Cambridge_Bay',
  'America/Campo_Grande',
  'America/Cancun',
  'America/Caracas',
- 'America/Catamarca',
  'America/Cayenne',
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
- 'America/Coral_Harbour',
- 'America/Cordoba',
  'America/Costa_Rica',
+ 'America/Creston',
  'America/Cuiaba',
  'America/Curacao',
  'America/Danmarkshavn',
@@ -878,8 +1177,6 @@ all_timezones = \
  'America/Edmonton',
  'America/Eirunepe',
  'America/El_Salvador',
- 'America/Ensenada',
- 'America/Fort_Wayne',
  'America/Fortaleza',
  'America/Glace_Bay',
  'America/Godthab',
@@ -897,29 +1194,31 @@ all_timezones = \
  'America/Indiana/Knox',
  'America/Indiana/Marengo',
  'America/Indiana/Petersburg',
+ 'America/Indiana/Tell_City',
  'America/Indiana/Vevay',
  'America/Indiana/Vincennes',
- 'America/Indianapolis',
+ 'America/Indiana/Winamac',
  'America/Inuvik',
  'America/Iqaluit',
  'America/Jamaica',
- 'America/Jujuy',
  'America/Juneau',
  'America/Kentucky/Louisville',
  'America/Kentucky/Monticello',
- 'America/Knox_IN',
+ 'America/Kralendijk',
  'America/La_Paz',
  'America/Lima',
  'America/Los_Angeles',
- 'America/Louisville',
+ 'America/Lower_Princes',
  'America/Maceio',
  'America/Managua',
  'America/Manaus',
+ 'America/Marigot',
  'America/Martinique',
+ 'America/Matamoros',
  'America/Mazatlan',
- 'America/Mendoza',
  'America/Menominee',
  'America/Merida',
+ 'America/Metlakatla',
  'America/Mexico_City',
  'America/Miquelon',
  'America/Moncton',
@@ -932,28 +1231,32 @@ all_timezones = \
  'America/Nipigon',
  'America/Nome',
  'America/Noronha',
+ 'America/North_Dakota/Beulah',
  'America/North_Dakota/Center',
  'America/North_Dakota/New_Salem',
+ 'America/Ojinaga',
  'America/Panama',
  'America/Pangnirtung',
  'America/Paramaribo',
  'America/Phoenix',
  'America/Port-au-Prince',
  'America/Port_of_Spain',
- 'America/Porto_Acre',
  'America/Porto_Velho',
  'America/Puerto_Rico',
  'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
  'America/Regina',
+ 'America/Resolute',
  'America/Rio_Branco',
- 'America/Rosario',
+ 'America/Santa_Isabel',
+ 'America/Santarem',
  'America/Santiago',
  'America/Santo_Domingo',
  'America/Sao_Paulo',
  'America/Scoresbysund',
- 'America/Shiprock',
+ 'America/Sitka',
+ 'America/St_Barthelemy',
  'America/St_Johns',
  'America/St_Kitts',
  'America/St_Lucia',
@@ -967,7 +1270,6 @@ all_timezones = \
  'America/Toronto',
  'America/Tortola',
  'America/Vancouver',
- 'America/Virgin',
  'America/Whitehorse',
  'America/Winnipeg',
  'America/Yakutat',
@@ -975,12 +1277,13 @@ all_timezones = \
  'Antarctica/Casey',
  'Antarctica/Davis',
  'Antarctica/DumontDUrville',
+ 'Antarctica/Macquarie',
  'Antarctica/Mawson',
  'Antarctica/McMurdo',
  'Antarctica/Palmer',
  'Antarctica/Rothera',
- 'Antarctica/South_Pole',
  'Antarctica/Syowa',
+ 'Antarctica/Troll',
  'Antarctica/Vostok',
  'Arctic/Longyearbyen',
  'Asia/Aden',
@@ -990,7 +1293,6 @@ all_timezones = \
  'Asia/Aqtau',
  'Asia/Aqtobe',
  'Asia/Ashgabat',
- 'Asia/Ashkhabad',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
@@ -998,42 +1300,40 @@ all_timezones = \
  'Asia/Beirut',
  'Asia/Bishkek',
  'Asia/Brunei',
- 'Asia/Calcutta',
+ 'Asia/Chita',
  'Asia/Choibalsan',
- 'Asia/Chongqing',
- 'Asia/Chungking',
  'Asia/Colombo',
- 'Asia/Dacca',
  'Asia/Damascus',
  'Asia/Dhaka',
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
  'Asia/Gaza',
- 'Asia/Harbin',
+ 'Asia/Hebron',
+ 'Asia/Ho_Chi_Minh',
  'Asia/Hong_Kong',
  'Asia/Hovd',
  'Asia/Irkutsk',
- 'Asia/Istanbul',
  'Asia/Jakarta',
  'Asia/Jayapura',
  'Asia/Jerusalem',
  'Asia/Kabul',
  'Asia/Kamchatka',
  'Asia/Karachi',
- 'Asia/Kashgar',
- 'Asia/Katmandu',
+ 'Asia/Kathmandu',
+ 'Asia/Khandyga',
+ 'Asia/Kolkata',
  'Asia/Krasnoyarsk',
  'Asia/Kuala_Lumpur',
  'Asia/Kuching',
  'Asia/Kuwait',
- 'Asia/Macao',
  'Asia/Macau',
  'Asia/Magadan',
  'Asia/Makassar',
  'Asia/Manila',
  'Asia/Muscat',
  'Asia/Nicosia',
+ 'Asia/Novokuznetsk',
  'Asia/Novosibirsk',
  'Asia/Omsk',
  'Asia/Oral',
@@ -1044,24 +1344,21 @@ all_timezones = \
  'Asia/Qyzylorda',
  'Asia/Rangoon',
  'Asia/Riyadh',
- 'Asia/Saigon',
  'Asia/Sakhalin',
  'Asia/Samarkand',
  'Asia/Seoul',
  'Asia/Shanghai',
  'Asia/Singapore',
+ 'Asia/Srednekolymsk',
  'Asia/Taipei',
  'Asia/Tashkent',
  'Asia/Tbilisi',
  'Asia/Tehran',
- 'Asia/Tel_Aviv',
- 'Asia/Thimbu',
  'Asia/Thimphu',
  'Asia/Tokyo',
- 'Asia/Ujung_Pandang',
  'Asia/Ulaanbaatar',
- 'Asia/Ulan_Bator',
  'Asia/Urumqi',
+ 'Asia/Ust-Nera',
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
@@ -1071,103 +1368,40 @@ all_timezones = \
  'Atlantic/Bermuda',
  'Atlantic/Canary',
  'Atlantic/Cape_Verde',
- 'Atlantic/Faeroe',
- 'Atlantic/Jan_Mayen',
+ 'Atlantic/Faroe',
  'Atlantic/Madeira',
  'Atlantic/Reykjavik',
  'Atlantic/South_Georgia',
  'Atlantic/St_Helena',
  'Atlantic/Stanley',
- 'Australia/ACT',
  'Australia/Adelaide',
  'Australia/Brisbane',
  'Australia/Broken_Hill',
- 'Australia/Canberra',
  'Australia/Currie',
  'Australia/Darwin',
+ 'Australia/Eucla',
  'Australia/Hobart',
- 'Australia/LHI',
  'Australia/Lindeman',
  'Australia/Lord_Howe',
  'Australia/Melbourne',
- 'Australia/NSW',
- 'Australia/North',
  'Australia/Perth',
- 'Australia/Queensland',
- 'Australia/South',
  'Australia/Sydney',
- 'Australia/Tasmania',
- 'Australia/Victoria',
- 'Australia/West',
- 'Australia/Yancowinna',
- 'Brazil/Acre',
- 'Brazil/DeNoronha',
- 'Brazil/East',
- 'Brazil/West',
- 'CET',
- 'CST6CDT',
  'Canada/Atlantic',
  'Canada/Central',
- 'Canada/East-Saskatchewan',
  'Canada/Eastern',
  'Canada/Mountain',
  'Canada/Newfoundland',
  'Canada/Pacific',
- 'Canada/Saskatchewan',
- 'Canada/Yukon',
- 'Chile/Continental',
- 'Chile/EasterIsland',
- 'Cuba',
- 'EET',
- 'EST',
- 'EST5EDT',
- 'Egypt',
- 'Eire',
- 'Etc/GMT',
- 'Etc/GMT+0',
- 'Etc/GMT+1',
- 'Etc/GMT+10',
- 'Etc/GMT+11',
- 'Etc/GMT+12',
- 'Etc/GMT+2',
- 'Etc/GMT+3',
- 'Etc/GMT+4',
- 'Etc/GMT+5',
- 'Etc/GMT+6',
- 'Etc/GMT+7',
- 'Etc/GMT+8',
- 'Etc/GMT+9',
- 'Etc/GMT-0',
- 'Etc/GMT-1',
- 'Etc/GMT-10',
- 'Etc/GMT-11',
- 'Etc/GMT-12',
- 'Etc/GMT-13',
- 'Etc/GMT-14',
- 'Etc/GMT-2',
- 'Etc/GMT-3',
- 'Etc/GMT-4',
- 'Etc/GMT-5',
- 'Etc/GMT-6',
- 'Etc/GMT-7',
- 'Etc/GMT-8',
- 'Etc/GMT-9',
- 'Etc/GMT0',
- 'Etc/Greenwich',
- 'Etc/UCT',
- 'Etc/UTC',
- 'Etc/Universal',
- 'Etc/Zulu',
  'Europe/Amsterdam',
  'Europe/Andorra',
  'Europe/Athens',
- 'Europe/Belfast',
  'Europe/Belgrade',
  'Europe/Berlin',
  'Europe/Bratislava',
  'Europe/Brussels',
  'Europe/Bucharest',
  'Europe/Budapest',
+ 'Europe/Busingen',
  'Europe/Chisinau',
  'Europe/Copenhagen',
  'Europe/Dublin',
@@ -1189,7 +1423,6 @@ all_timezones = \
  'Europe/Minsk',
  'Europe/Monaco',
  'Europe/Moscow',
- 'Europe/Nicosia',
  'Europe/Oslo',
  'Europe/Paris',
  'Europe/Podgorica',
@@ -1205,7 +1438,6 @@ all_timezones = \
  'Europe/Stockholm',
  'Europe/Tallinn',
  'Europe/Tirane',
- 'Europe/Tiraspol',
  'Europe/Uzhgorod',
  'Europe/Vaduz',
  'Europe/Vatican',
@@ -1216,16 +1448,7 @@ all_timezones = \
  'Europe/Zagreb',
  'Europe/Zaporozhye',
  'Europe/Zurich',
- 'GB',
- 'GB-Eire',
  'GMT',
- 'GMT+0',
- 'GMT-0',
- 'GMT0',
- 'Greenwich',
- 'HST',
- 'Hongkong',
- 'Iceland',
  'Indian/Antananarivo',
  'Indian/Chagos',
  'Indian/Christmas',
@@ -1237,26 +1460,11 @@ all_timezones = \
  'Indian/Mauritius',
  'Indian/Mayotte',
  'Indian/Reunion',
- 'Iran',
- 'Israel',
- 'Jamaica',
- 'Japan',
- 'Kwajalein',
- 'Libya',
- 'MET',
- 'MST',
- 'MST7MDT',
- 'Mexico/BajaNorte',
- 'Mexico/BajaSur',
- 'Mexico/General',
- 'NZ',
- 'NZ-CHAT',
- 'Navajo',
- 'PRC',
- 'PST8PDT',
  'Pacific/Apia',
  'Pacific/Auckland',
+ 'Pacific/Bougainville',
  'Pacific/Chatham',
+ 'Pacific/Chuuk',
  'Pacific/Easter',
  'Pacific/Efate',
  'Pacific/Enderbury',
@@ -1282,41 +1490,24 @@ all_timezones = \
  'Pacific/Pago_Pago',
  'Pacific/Palau',
  'Pacific/Pitcairn',
- 'Pacific/Ponape',
+ 'Pacific/Pohnpei',
  'Pacific/Port_Moresby',
  'Pacific/Rarotonga',
  'Pacific/Saipan',
- 'Pacific/Samoa',
  'Pacific/Tahiti',
  'Pacific/Tarawa',
  'Pacific/Tongatapu',
- 'Pacific/Truk',
  'Pacific/Wake',
  'Pacific/Wallis',
- 'Pacific/Yap',
- 'Poland',
- 'Portugal',
- 'ROC',
- 'ROK',
- 'Singapore',
- 'Turkey',
- 'UCT',
  'US/Alaska',
- 'US/Aleutian',
  'US/Arizona',
  'US/Central',
- 'US/East-Indiana',
  'US/Eastern',
  'US/Hawaii',
- 'US/Indiana-Starke',
- 'US/Michigan',
  'US/Mountain',
  'US/Pacific',
- 'US/Pacific-New',
- 'US/Samoa',
- 'UTC',
- 'Universal',
- 'W-SU',
- 'WET',
- 'Zulu',
- 'posixrules']
+ 'UTC']
+common_timezones = LazyList(
+            tz for tz in common_timezones if tz in all_timezones)
+        
+common_timezones_set = LazySet(common_timezones)
diff --git a/lib/pytz/__init__.pyc b/lib/pytz/__init__.pyc
index a3f5b76..37af288 100644
Binary files a/lib/pytz/__init__.pyc and b/lib/pytz/__init__.pyc differ
diff --git a/lib/pytz/exceptions.py b/lib/pytz/exceptions.py
new file mode 100644
index 0000000..0376108
--- /dev/null
+++ b/lib/pytz/exceptions.py
@@ -0,0 +1,48 @@
+'''
+Custom exceptions raised by pytz.
+'''
+
+__all__ = [
+    'UnknownTimeZoneError', 'InvalidTimeError', 'AmbiguousTimeError',
+    'NonExistentTimeError',
+    ]
+
+
+class UnknownTimeZoneError(KeyError):
+    '''Exception raised when pytz is passed an unknown timezone.
+
+    >>> isinstance(UnknownTimeZoneError(), LookupError)
+    True
+
+    This class is actually a subclass of KeyError to provide backwards
+    compatibility with code relying on the undocumented behavior of earlier
+    pytz releases.
+
+    >>> isinstance(UnknownTimeZoneError(), KeyError)
+    True
+    '''
+    pass
+
+
+class InvalidTimeError(Exception):
+    '''Base class for invalid time exceptions.'''
+
+
+class AmbiguousTimeError(InvalidTimeError):
+    '''Exception raised when attempting to create an ambiguous wallclock time.
+
+    At the end of a DST transition period, a particular wallclock time will
+    occur twice (once before the clocks are set back, once after). Both
+    possibilities may be correct, unless further information is supplied.
+
+    See DstTzInfo.normalize() for more info
+    '''
+
+
+class NonExistentTimeError(InvalidTimeError):
+    '''Exception raised when attempting to create a wallclock time that
+    cannot exist.
+
+    At the start of a DST transition period, the wallclock time jumps forward.
+    The instants jumped over never occur.
+    '''
diff --git a/lib/pytz/exceptions.pyc b/lib/pytz/exceptions.pyc
new file mode 100644
index 0000000..62105af
Binary files /dev/null and b/lib/pytz/exceptions.pyc differ
diff --git a/lib/pytz/lazy.py b/lib/pytz/lazy.py
new file mode 100644
index 0000000..f7fc597
--- /dev/null
+++ b/lib/pytz/lazy.py
@@ -0,0 +1,168 @@
+from threading import RLock
+try:
+    from UserDict import DictMixin
+except ImportError:
+    from collections import Mapping as DictMixin
+
+
+# With lazy loading, we might end up with multiple threads triggering
+# it at the same time. We need a lock.
+_fill_lock = RLock()
+
+
+class LazyDict(DictMixin):
+    """Dictionary populated on first use."""
+    data = None
+    def __getitem__(self, key):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return self.data[key.upper()]
+
+    def __contains__(self, key):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return key in self.data
+
+    def __iter__(self):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return iter(self.data)
+
+    def __len__(self):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return len(self.data)
+
+    def keys(self):
+        if self.data is None:
+            _fill_lock.acquire()
+            try:
+                if self.data is None:
+                    self._fill()
+            finally:
+                _fill_lock.release()
+        return self.data.keys()
+
+
+class LazyList(list):
+    """List populated on first use."""
+
+    _props = [
+        '__str__', '__repr__', '__unicode__',
+        '__hash__', '__sizeof__', '__cmp__',
+        '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__',
+        'append', 'count', 'index', 'extend', 'insert', 'pop', 'remove',
+        'reverse', 'sort', '__add__', '__radd__', '__iadd__', '__mul__',
+        '__rmul__', '__imul__', '__contains__', '__len__', '__nonzero__',
+        '__getitem__', '__setitem__', '__delitem__', '__iter__',
+        '__reversed__', '__getslice__', '__setslice__', '__delslice__']
+
+    def __new__(cls, fill_iter=None):
+
+        if fill_iter is None:
+            return list()
+
+        # We need a new class as we will be dynamically messing with its
+        # methods.
+        class LazyList(list):
+            pass
+
+        fill_iter = [fill_iter]
+
+        def lazy(name):
+            def _lazy(self, *args, **kw):
+                _fill_lock.acquire()
+                try:
+                    if len(fill_iter) > 0:
+                        list.extend(self, fill_iter.pop())
+                        for method_name in cls._props:
+                            delattr(LazyList, method_name)
+                finally:
+                    _fill_lock.release()
+                return getattr(list, name)(self, *args, **kw)
+            return _lazy
+
+        for name in cls._props:
+            setattr(LazyList, name, lazy(name))
+
+        new_list = LazyList()
+        return new_list
+
+# Not all versions of Python declare the same magic methods.
+# Filter out properties that don't exist in this version of Python
+# from the list.
+LazyList._props = [prop for prop in LazyList._props if hasattr(list, prop)]
+
+
+class LazySet(set):
+    """Set populated on first use."""
+
+    _props = (
+        '__str__', '__repr__', '__unicode__',
+        '__hash__', '__sizeof__', '__cmp__',
+        '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__',
+        '__contains__', '__len__', '__nonzero__',
+        '__getitem__', '__setitem__', '__delitem__', '__iter__',
+        '__sub__', '__and__', '__xor__', '__or__',
+        '__rsub__', '__rand__', '__rxor__', '__ror__',
+        '__isub__', '__iand__', '__ixor__', '__ior__',
+        'add', 'clear', 'copy', 'difference', 'difference_update',
+        'discard', 'intersection', 'intersection_update', 'isdisjoint',
+        'issubset', 'issuperset', 'pop', 'remove',
+        'symmetric_difference', 'symmetric_difference_update',
+        'union', 'update')
+
+    def __new__(cls, fill_iter=None):
+
+        if fill_iter is None:
+            return set()
+
+        class LazySet(set):
+            pass
+
+        fill_iter = [fill_iter]
+
+        def lazy(name):
+            def _lazy(self, *args, **kw):
+                _fill_lock.acquire()
+                try:
+                    if len(fill_iter) > 0:
+                        for i in fill_iter.pop():
+                            set.add(self, i)
+                        for method_name in cls._props:
+                            delattr(LazySet, method_name)
+                finally:
+                    _fill_lock.release()
+                return getattr(set, name)(self, *args, **kw)
+            return _lazy
+
+        for name in cls._props:
+            setattr(LazySet, name, lazy(name))
+
+        new_set = LazySet()
+        return new_set
+
+# Not all versions of Python declare the same magic methods.
+# Filter out properties that don't exist in this version of Python
+# from the list.
+LazySet._props = [prop for prop in LazySet._props if hasattr(set, prop)]
diff --git a/lib/pytz/lazy.pyc b/lib/pytz/lazy.pyc
new file mode 100644
index 0000000..d4c05a4
Binary files /dev/null and b/lib/pytz/lazy.pyc differ
diff --git a/lib/pytz/reference.py b/lib/pytz/reference.py
old mode 100755
new mode 100644
diff --git a/lib/pytz/tests/test_docs.py b/lib/pytz/tests/test_docs.py
old mode 100755
new mode 100644
index c37be3e..fb49ec1
--- a/lib/pytz/tests/test_docs.py
+++ b/lib/pytz/tests/test_docs.py
@@ -1,35 +1,34 @@
 # -*- coding: ascii -*-
 
-import unittest, os, os.path, sys
-from doctest import DocTestSuite
-
-# We test the documentation this way instead of using DocFileSuite so
-# we can run the tests under Python 2.3
-def test_README():
-    pass
-
-this_dir = os.path.dirname(__file__)
-locs = [
-    os.path.join(this_dir, os.pardir, 'README.txt'),
-    os.path.join(this_dir, os.pardir, os.pardir, 'README.txt'),
-    ]
-for loc in locs:
-    if os.path.exists(loc):
-        test_README.__doc__ = open(loc).read()
-        break
-if test_README.__doc__ is None:
-    raise RuntimeError('README.txt not found')
-
-README = DocTestSuite()
+from doctest import DocFileSuite
+import unittest, os.path, sys
+
+THIS_DIR = os.path.dirname(__file__)
+
+README = os.path.join(THIS_DIR, os.pardir, os.pardir, 'README.txt')
+
+
+class DocumentationTestCase(unittest.TestCase):
+    def test_readme_encoding(self):
+        '''Confirm the README.txt is pure ASCII.'''
+        f = open(README, 'rb')
+        try:
+            f.read().decode('US-ASCII')
+        finally:
+            f.close()
+
 
 def test_suite():
     "For the Z3 test runner"
-    return README
+    return unittest.TestSuite((
+        DocumentationTestCase('test_readme_encoding'),
+        DocFileSuite(os.path.join(os.pardir, os.pardir, 'README.txt'))))
+
 
 if __name__ == '__main__':
     sys.path.insert(0, os.path.abspath(os.path.join(
-        this_dir, os.pardir, os.pardir
+        THIS_DIR, os.pardir, os.pardir
         )))
-    unittest.main(defaultTest='README')
+    unittest.main(defaultTest='test_suite')
 
 
diff --git a/lib/pytz/tests/test_lazy.py b/lib/pytz/tests/test_lazy.py
new file mode 100644
index 0000000..3a4afa6
--- /dev/null
+++ b/lib/pytz/tests/test_lazy.py
@@ -0,0 +1,313 @@
+from operator import *
+import os.path
+import sys
+import unittest
+import warnings
+
+
+if __name__ == '__main__':
+    # Only munge path if invoked as a script. Testrunners should have setup
+    # the paths already
+    sys.path.insert(0, os.path.abspath(os.path.join(os.pardir, os.pardir)))
+
+
+from pytz.lazy import LazyList, LazySet
+
+
+class LazyListTestCase(unittest.TestCase):
+    initial_data = [3,2,1]
+
+    def setUp(self):
+        self.base = [3, 2, 1]
+        self.lesser = [2, 1, 0]
+        self.greater = [4, 3, 2]
+
+        self.lazy = LazyList(iter(list(self.base)))
+
+    def test_unary_ops(self):
+        unary_ops = [str, repr, len, bool, not_]
+        try:
+            unary_ops.append(unicode)
+        except NameError:
+            pass  # unicode no longer exists in Python 3.
+
+        for op in unary_ops:
+            self.assertEqual(
+                op(self.lazy),
+                op(self.base), str(op))
+
+    def test_binary_ops(self):
+        binary_ops = [eq, ge, gt, le, lt, ne, add, concat]
+        try:
+            binary_ops.append(cmp)
+        except NameError:
+            pass  # cmp no longer exists in Python 3.
+
+        for op in binary_ops:
+            self.assertEqual(
+                op(self.lazy, self.lazy),
+                op(self.base, self.base), str(op))
+            for other in [self.base, self.lesser, self.greater]:
+                self.assertEqual(
+                    op(self.lazy, other),
+                    op(self.base, other), '%s %s' % (op, other))
+                self.assertEqual(
+                    op(other, self.lazy),
+                    op(other, self.base), '%s %s' % (op, other))
+
+        # Multiplication
+        self.assertEqual(self.lazy * 3, self.base * 3)
+        self.assertEqual(3 * self.lazy, 3 * self.base)
+
+        # Contains
+        self.assertTrue(2 in self.lazy)
+        self.assertFalse(42 in self.lazy)
+
+    def test_iadd(self):
+        self.lazy += [1]
+        self.base += [1]
+        self.assertEqual(self.lazy, self.base)
+
+    def test_bool(self):
+        self.assertTrue(bool(self.lazy))
+        self.assertFalse(bool(LazyList()))
+        self.assertFalse(bool(LazyList(iter([]))))
+
+    def test_hash(self):
+        self.assertRaises(TypeError, hash, self.lazy)
+
+    def test_isinstance(self):
+        self.assertTrue(isinstance(self.lazy, list))
+        self.assertFalse(isinstance(self.lazy, tuple))
+
+    def test_callable(self):
+        try:
+            callable
+        except NameError:
+            return  # No longer exists with Python 3.
+        self.assertFalse(callable(self.lazy))
+
+    def test_append(self):
+        self.base.append('extra')
+        self.lazy.append('extra')
+        self.assertEqual(self.lazy, self.base)
+
+    def test_count(self):
+        self.assertEqual(self.lazy.count(2), 1)
+
+    def test_index(self):
+        self.assertEqual(self.lazy.index(2), 1)
+
+    def test_extend(self):
+        self.base.extend([6, 7])
+        self.lazy.extend([6, 7])
+        self.assertEqual(self.lazy, self.base)
+
+    def test_insert(self):
+        self.base.insert(0, 'ping')
+        self.lazy.insert(0, 'ping')
+        self.assertEqual(self.lazy, self.base)
+
+    def test_pop(self):
+        self.assertEqual(self.lazy.pop(), self.base.pop())
+        self.assertEqual(self.lazy, self.base)
+
+    def test_remove(self):
+        self.base.remove(2)
+        self.lazy.remove(2)
+        self.assertEqual(self.lazy, self.base)
+
+    def test_reverse(self):
+        self.base.reverse()
+        self.lazy.reverse()
+        self.assertEqual(self.lazy, self.base)
+
+    def test_reversed(self):
+        self.assertEqual(list(reversed(self.lazy)), list(reversed(self.base)))
+
+    def test_sort(self):
+        self.base.sort()
+        self.assertNotEqual(self.lazy, self.base, 'Test data already sorted')
+        self.lazy.sort()
+        self.assertEqual(self.lazy, self.base)
+
+    def test_sorted(self):
+        self.assertEqual(sorted(self.lazy), sorted(self.base))
+
+    def test_getitem(self):
+        for idx in range(-len(self.base), len(self.base)):
+            self.assertEqual(self.lazy[idx], self.base[idx])
+
+    def test_setitem(self):
+        for idx in range(-len(self.base), len(self.base)):
+            self.base[idx] = idx + 1000
+            self.assertNotEqual(self.lazy, self.base)
+            self.lazy[idx] = idx + 1000
+            self.assertEqual(self.lazy, self.base)
+
+    def test_delitem(self):
+        del self.base[0]
+        self.assertNotEqual(self.lazy, self.base)
+        del self.lazy[0]
+        self.assertEqual(self.lazy, self.base)
+
+        del self.base[-2]
+        self.assertNotEqual(self.lazy, self.base)
+        del self.lazy[-2]
+        self.assertEqual(self.lazy, self.base)
+
+    def test_iter(self):
+        self.assertEqual(list(iter(self.lazy)), list(iter(self.base)))
+
+    def test_getslice(self):
+        for i in range(-len(self.base), len(self.base)):
+            for j in range(-len(self.base), len(self.base)):
+                for step in [-1, 1]:
+                    self.assertEqual(self.lazy[i:j:step], self.base[i:j:step])
+
+    def test_setslice(self):
+        for i in range(-len(self.base), len(self.base)):
+            for j in range(-len(self.base), len(self.base)):
+                for step in [-1, 1]:
+                    replacement = range(0, len(self.base[i:j:step]))
+                    self.base[i:j:step] = replacement
+                    self.lazy[i:j:step] = replacement
+                    self.assertEqual(self.lazy, self.base)
+
+    def test_delslice(self):
+        del self.base[0:1]
+        del self.lazy[0:1]
+        self.assertEqual(self.lazy, self.base)
+
+        del self.base[-1:1:-1]
+        del self.lazy[-1:1:-1]
+        self.assertEqual(self.lazy, self.base)
+
+
+class LazySetTestCase(unittest.TestCase):
+    initial_data = set([3,2,1])
+
+    def setUp(self):
+        self.base = set([3, 2, 1])
+        self.lazy = LazySet(iter(set(self.base)))
+
+    def test_unary_ops(self):
+        # These ops just need to work.
+        unary_ops = [str, repr]
+        try:
+            unary_ops.append(unicode)
+        except NameError:
+            pass  # unicode no longer exists in Python 3.
+
+        for op in unary_ops:
+            op(self.lazy)  # These ops just need to work.
+
+        # These ops should return identical values as a real set.
+        unary_ops = [len, bool, not_]
+
+        for op in unary_ops:
+            self.assertEqual(
+                op(self.lazy),
+                op(self.base), '%s(lazy) == %r' % (op, op(self.lazy)))
+
+    def test_binary_ops(self):
+        binary_ops = [eq, ge, gt, le, lt, ne, sub, and_, or_, xor]
+        try:
+            binary_ops.append(cmp)
+        except NameError:
+            pass  # cmp no longer exists in Python 3.
+
+        for op in binary_ops:
+            self.assertEqual(
+                op(self.lazy, self.lazy),
+                op(self.base, self.base), str(op))
+            self.assertEqual(
+                op(self.lazy, self.base),
+                op(self.base, self.base), str(op))
+            self.assertEqual(
+                op(self.base, self.lazy),
+                op(self.base, self.base), str(op))
+
+        # Contains
+        self.assertTrue(2 in self.lazy)
+        self.assertFalse(42 in self.lazy)
+
+    def test_iops(self):
+        try:
+            iops = [isub, iand, ior, ixor]
+        except NameError:
+            return  # Don't exist in older Python versions.
+        for op in iops:
+            # Mutating operators, so make fresh copies.
+            lazy = LazySet(self.base)
+            base = self.base.copy()
+            op(lazy, set([1]))
+            op(base, set([1]))
+            self.assertEqual(lazy, base, str(op))
+
+    def test_bool(self):
+        self.assertTrue(bool(self.lazy))
+        self.assertFalse(bool(LazySet()))
+        self.assertFalse(bool(LazySet(iter([]))))
+
+    def test_hash(self):
+        self.assertRaises(TypeError, hash, self.lazy)
+
+    def test_isinstance(self):
+        self.assertTrue(isinstance(self.lazy, set))
+
+    def test_callable(self):
+        try:
+            callable
+        except NameError:
+            return  # No longer exists with Python 3.
+        self.assertFalse(callable(self.lazy))
+
+    def test_add(self):
+        self.base.add('extra')
+        self.lazy.add('extra')
+        self.assertEqual(self.lazy, self.base)
+
+    def test_copy(self):
+        self.assertEqual(self.lazy.copy(), self.base)
+
+    def test_method_ops(self):
+        ops = [
+            'difference', 'intersection', 'isdisjoint',
+            'issubset', 'issuperset', 'symmetric_difference', 'union',
+            'difference_update', 'intersection_update',
+            'symmetric_difference_update', 'update']
+        for op in ops:
+            if not hasattr(set, op):
+                continue  # Not in this version of Python.
+            # Make a copy, as some of the ops are mutating.
+            lazy = LazySet(set(self.base))
+            base = set(self.base)
+            self.assertEqual(
+                getattr(self.lazy, op)(set([1])),
+                getattr(self.base, op)(set([1])), op)
+            self.assertEqual(self.lazy, self.base, op)
+
+    def test_discard(self):
+        self.base.discard(1)
+        self.assertNotEqual(self.lazy, self.base)
+        self.lazy.discard(1)
+        self.assertEqual(self.lazy, self.base)
+
+    def test_pop(self):
+        self.assertEqual(self.lazy.pop(), self.base.pop())
+        self.assertEqual(self.lazy, self.base)
+
+    def test_remove(self):
+        self.base.remove(2)
+        self.lazy.remove(2)
+        self.assertEqual(self.lazy, self.base)
+
+    def test_clear(self):
+        self.lazy.clear()
+        self.assertEqual(self.lazy, set())
+
+
+if __name__ == '__main__':
+    warnings.simplefilter("error") # Warnings should be fatal in tests.
+    unittest.main()
diff --git a/lib/pytz/tests/test_tzinfo.py b/lib/pytz/tests/test_tzinfo.py
old mode 100755
new mode 100644
index 9afebf4..922bcb1
--- a/lib/pytz/tests/test_tzinfo.py
+++ b/lib/pytz/tests/test_tzinfo.py
@@ -2,8 +2,12 @@
 
 import sys, os, os.path
 import unittest, doctest
-import cPickle as pickle
-from datetime import datetime, tzinfo, timedelta
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+from datetime import datetime, time, timedelta, tzinfo
+import warnings
 
 if __name__ == '__main__':
     # Only munge path if invoked as a script. Testrunners should have setup
@@ -12,8 +16,13 @@ if __name__ == '__main__':
 
 import pytz
 from pytz import reference
+from pytz.tzfile import _byte_string
+from pytz.tzinfo import DstTzInfo, StaticTzInfo
 
-EXPECTED_VERSION='2006p'
+# I test for expected version to ensure the correct version of pytz is
+# actually being tested.
+EXPECTED_VERSION='2014.10'
+EXPECTED_OLSON_VERSION='2014j'
 
 fmt = '%Y-%m-%d %H:%M:%S %Z%z'
 
@@ -23,29 +32,87 @@ NOTIME = timedelta(0)
 # UTC is reference implementation.  They both have the same timezone meaning.
 UTC = pytz.timezone('UTC')
 GMT = pytz.timezone('GMT')
+assert isinstance(GMT, StaticTzInfo), 'GMT is no longer a StaticTzInfo'
+
+def prettydt(dt):
+    """datetime as a string using a known format.
+
+    We don't use strftime as it doesn't handle years earlier than 1900
+    per http://bugs.python.org/issue1777412
+    """
+    if dt.utcoffset() >= timedelta(0):
+        offset = '+%s' % (dt.utcoffset(),)
+    else:
+        offset = '-%s' % (-1 * dt.utcoffset(),)
+    return '%04d-%02d-%02d %02d:%02d:%02d %s %s' % (
+        dt.year, dt.month, dt.day,
+        dt.hour, dt.minute, dt.second,
+        dt.tzname(), offset)
+
+
+try:
+    unicode
+except NameError:
+    # Python 3.x doesn't have unicode(), making writing code
+    # for Python 2.3 and Python 3.x a pain.
+    unicode = str
+
 
 class BasicTest(unittest.TestCase):
 
     def testVersion(self):
         # Ensuring the correct version of pytz has been loaded
-        self.failUnlessEqual(EXPECTED_VERSION, pytz.__version__,
+        self.assertEqual(EXPECTED_VERSION, pytz.__version__,
                 'Incorrect pytz version loaded. Import path is stuffed '
                 'or this test needs updating. (Wanted %s, got %s)'
-                % (EXPECTED_VERSION, pytz.__version__)
-                )
+                % (EXPECTED_VERSION, pytz.__version__))
+
+        self.assertEqual(EXPECTED_OLSON_VERSION, pytz.OLSON_VERSION,
+                'Incorrect pytz version loaded. Import path is stuffed '
+                'or this test needs updating. (Wanted %s, got %s)'
+                % (EXPECTED_OLSON_VERSION, pytz.OLSON_VERSION))
 
     def testGMT(self):
         now = datetime.now(tz=GMT)
-        self.failUnless(now.utcoffset() == NOTIME)
-        self.failUnless(now.dst() == NOTIME)
-        self.failUnless(now.timetuple() == now.utctimetuple())
-        self.failUnless(now==now.replace(tzinfo=UTC))
+        self.assertTrue(now.utcoffset() == NOTIME)
+        self.assertTrue(now.dst() == NOTIME)
+        self.assertTrue(now.timetuple() == now.utctimetuple())
+        self.assertTrue(now==now.replace(tzinfo=UTC))
 
     def testReferenceUTC(self):
         now = datetime.now(tz=UTC)
-        self.failUnless(now.utcoffset() == NOTIME)
-        self.failUnless(now.dst() == NOTIME)
-        self.failUnless(now.timetuple() == now.utctimetuple())
+        self.assertTrue(now.utcoffset() == NOTIME)
+        self.assertTrue(now.dst() == NOTIME)
+        self.assertTrue(now.timetuple() == now.utctimetuple())
+
+    def testUnknownOffsets(self):
+        # This tzinfo behavior is required to make
+        # datetime.time.{utcoffset, dst, tzname} work as documented.
+
+        dst_tz = pytz.timezone('US/Eastern')
+
+        # This information is not known when we don't have a date,
+        # so return None per API.
+        self.assertTrue(dst_tz.utcoffset(None) is None)
+        self.assertTrue(dst_tz.dst(None) is None)
+        # We don't know the abbreviation, but this is still a valid
+        # tzname per the Python documentation.
+        self.assertEqual(dst_tz.tzname(None), 'US/Eastern')
+
+    def clearCache(self):
+        pytz._tzinfo_cache.clear()
+
+    def testUnicodeTimezone(self):
+        # We need to ensure that cold lookups work for both Unicode
+        # and traditional strings, and that the desired singleton is
+        # returned.
+        self.clearCache()
+        eastern = pytz.timezone(unicode('US/Eastern'))
+        self.assertTrue(eastern is pytz.timezone('US/Eastern'))
+
+        self.clearCache()
+        eastern = pytz.timezone('US/Eastern')
+        self.assertTrue(eastern is pytz.timezone(unicode('US/Eastern')))
 
 
 class PicklingTest(unittest.TestCase):
@@ -53,7 +120,7 @@ class PicklingTest(unittest.TestCase):
     def _roundtrip_tzinfo(self, tz):
         p = pickle.dumps(tz)
         unpickled_tz = pickle.loads(p)
-        self.failUnless(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
+        self.assertTrue(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
 
     def _roundtrip_datetime(self, dt):
         # Ensure that the tzinfo attached to a datetime instance
@@ -63,7 +130,7 @@ class PicklingTest(unittest.TestCase):
         p = pickle.dumps(dt)
         unpickled_dt = pickle.loads(p)
         unpickled_tz = unpickled_dt.tzinfo
-        self.failUnless(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
+        self.assertTrue(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
 
     def testDst(self):
         tz = pytz.timezone('Europe/Amsterdam')
@@ -86,20 +153,54 @@ class PicklingTest(unittest.TestCase):
         tz = pytz.timezone('Australia/Melbourne')
         p = pickle.dumps(tz)
         tzname = tz._tzname
-        hacked_p = p.replace(tzname, '???')
-        self.failIfEqual(p, hacked_p)
+        hacked_p = p.replace(_byte_string(tzname),
+                             _byte_string('?'*len(tzname)))
+        self.assertNotEqual(p, hacked_p)
         unpickled_tz = pickle.loads(hacked_p)
-        self.failUnless(tz is unpickled_tz)
+        self.assertTrue(tz is unpickled_tz)
 
         # Simulate a database correction. In this case, the incorrect
         # data will continue to be used.
         p = pickle.dumps(tz)
         new_utcoffset = tz._utcoffset.seconds + 42
-        hacked_p = p.replace(str(tz._utcoffset.seconds), str(new_utcoffset))
-        self.failIfEqual(p, hacked_p)
+
+        # Python 3 introduced a new pickle protocol where numbers are stored in
+        # hexadecimal representation. Here we extract the pickle
+        # representation of the number for the current Python version.
+        old_pickle_pattern = pickle.dumps(tz._utcoffset.seconds)[3:-1]
+        new_pickle_pattern = pickle.dumps(new_utcoffset)[3:-1]
+        hacked_p = p.replace(old_pickle_pattern, new_pickle_pattern)
+
+        self.assertNotEqual(p, hacked_p)
         unpickled_tz = pickle.loads(hacked_p)
-        self.failUnlessEqual(unpickled_tz._utcoffset.seconds, new_utcoffset)
-        self.failUnless(tz is not unpickled_tz)
+        self.assertEqual(unpickled_tz._utcoffset.seconds, new_utcoffset)
+        self.assertTrue(tz is not unpickled_tz)
+
+    def testOldPickles(self):
+        # Ensure that applications serializing pytz instances as pickles
+        # have no troubles upgrading to a new pytz release. These pickles
+        # where created with pytz2006j
+        east1 = pickle.loads(_byte_string(
+            "cpytz\n_p\np1\n(S'US/Eastern'\np2\nI-18000\n"
+            "I0\nS'EST'\np3\ntRp4\n."
+            ))
+        east2 = pytz.timezone('US/Eastern').localize(
+            datetime(2006, 1, 1)).tzinfo
+        self.assertTrue(east1 is east2)
+
+        # Confirm changes in name munging between 2006j and 2007c cause
+        # no problems.
+        pap1 = pickle.loads(_byte_string(
+            "cpytz\n_p\np1\n(S'America/Port_minus_au_minus_Prince'"
+            "\np2\nI-17340\nI0\nS'PPMT'\np3\ntRp4\n."))
+        pap2 = pytz.timezone('America/Port-au-Prince').localize(
+            datetime(1910, 1, 1)).tzinfo
+        self.assertTrue(pap1 is pap2)
+
+        gmt1 = pickle.loads(_byte_string(
+            "cpytz\n_p\np1\n(S'Etc/GMT_plus_10'\np2\ntRp3\n."))
+        gmt2 = pytz.timezone('Etc/GMT+10')
+        self.assertTrue(gmt1 is gmt2)
 
 
 class USEasternDSTStartTestCase(unittest.TestCase):
@@ -129,7 +230,7 @@ class USEasternDSTStartTestCase(unittest.TestCase):
     def _test_tzname(self, utc_dt, wanted):
         tzname = wanted['tzname']
         dt = utc_dt.astimezone(self.tzinfo)
-        self.failUnlessEqual(dt.tzname(), tzname,
+        self.assertEqual(dt.tzname(), tzname,
             'Expected %s as tzname for %s. Got %s' % (
                 tzname, str(utc_dt), dt.tzname()
                 )
@@ -138,7 +239,7 @@ class USEasternDSTStartTestCase(unittest.TestCase):
     def _test_utcoffset(self, utc_dt, wanted):
         utcoffset = wanted['utcoffset']
         dt = utc_dt.astimezone(self.tzinfo)
-        self.failUnlessEqual(
+        self.assertEqual(
                 dt.utcoffset(), wanted['utcoffset'],
                 'Expected %s as utcoffset for %s. Got %s' % (
                     utcoffset, utc_dt, dt.utcoffset()
@@ -148,7 +249,7 @@ class USEasternDSTStartTestCase(unittest.TestCase):
     def _test_dst(self, utc_dt, wanted):
         dst = wanted['dst']
         dt = utc_dt.astimezone(self.tzinfo)
-        self.failUnlessEqual(dt.dst(),dst,
+        self.assertEqual(dt.dst(),dst,
             'Expected %s as dst for %s. Got %s' % (
                 dst, utc_dt, dt.dst()
                 )
@@ -164,17 +265,19 @@ class USEasternDSTStartTestCase(unittest.TestCase):
             dt = utc_dt.astimezone(self.tzinfo)
             dt2 = dt + delta
             dt2 = dt2 - delta
-            self.failUnlessEqual(dt, dt2)
+            self.assertEqual(dt, dt2)
 
             # Make sure arithmetic crossing DST boundaries ends
             # up in the correct timezone after normalization
-            self.failUnlessEqual(
-                    (utc_dt + delta).astimezone(self.tzinfo).strftime(fmt),
-                    self.tzinfo.normalize(dt + delta).strftime(fmt),
+            utc_plus_delta = (utc_dt + delta).astimezone(self.tzinfo)
+            local_plus_delta = self.tzinfo.normalize(dt + delta)
+            self.assertEqual(
+                    prettydt(utc_plus_delta),
+                    prettydt(local_plus_delta),
                     'Incorrect result for delta==%d days.  Wanted %r. Got %r'%(
                         days,
-                        (utc_dt + delta).astimezone(self.tzinfo).strftime(fmt),
-                        self.tzinfo.normalize(dt + delta).strftime(fmt),
+                        prettydt(utc_plus_delta),
+                        prettydt(local_plus_delta),
                         )
                     )
 
@@ -308,6 +411,154 @@ class VilniusWMTEndTestCase(USEasternDSTStartTestCase):
         }
 
 
+class VilniusCESTStartTestCase(USEasternDSTStartTestCase):
+    # In 1941, Vilnius changed from MSG to CEST, switching to summer
+    # time while simultaneously reducing its UTC offset by two hours,
+    # causing the clocks to go backwards for this summer time
+    # switchover.
+    tzinfo = pytz.timezone('Europe/Vilnius')
+    transition_time = datetime(1941, 6, 23, 21, 00, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'MSK',
+        'utcoffset': timedelta(hours=3),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'CEST',
+        'utcoffset': timedelta(hours=2),
+        'dst': timedelta(hours=1),
+        }
+
+
+class LondonHistoryStartTestCase(USEasternDSTStartTestCase):
+    # The first known timezone transition in London was in 1847 when
+    # clocks where synchronized to GMT. However, we currently only
+    # understand v1 format tzfile(5) files which does handle years
+    # this far in the past, so our earliest known transition is in
+    # 1916.
+    tzinfo = pytz.timezone('Europe/London')
+    # transition_time = datetime(1847, 12, 1, 1, 15, 00, tzinfo=UTC)
+    # before = {
+    #     'tzname': 'LMT',
+    #     'utcoffset': timedelta(minutes=-75),
+    #     'dst': timedelta(0),
+    #     }
+    # after = {
+    #     'tzname': 'GMT',
+    #     'utcoffset': timedelta(0),
+    #     'dst': timedelta(0),
+    #     }
+    transition_time = datetime(1916, 5, 21, 2, 00, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'GMT',
+        'utcoffset': timedelta(0),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'BST',
+        'utcoffset': timedelta(hours=1),
+        'dst': timedelta(hours=1),
+        }
+
+
+class LondonHistoryEndTestCase(USEasternDSTStartTestCase):
+    # Timezone switchovers are projected into the future, even
+    # though no official statements exist or could be believed even
+    # if they did exist. We currently only check the last known
+    # transition in 2037, as we are still using v1 format tzfile(5)
+    # files.
+    tzinfo = pytz.timezone('Europe/London')
+    # transition_time = datetime(2499, 10, 25, 1, 0, 0, tzinfo=UTC)
+    transition_time = datetime(2037, 10, 25, 1, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'BST',
+        'utcoffset': timedelta(hours=1),
+        'dst': timedelta(hours=1),
+        }
+    after = {
+        'tzname': 'GMT',
+        'utcoffset': timedelta(0),
+        'dst': timedelta(0),
+        }
+
+
+class NoumeaHistoryStartTestCase(USEasternDSTStartTestCase):
+    # Noumea adopted a whole hour offset in 1912. Previously
+    # it was 11 hours, 5 minutes and 48 seconds off UTC. However,
+    # due to limitations of the Python datetime library, we need
+    # to round that to 11 hours 6 minutes.
+    tzinfo = pytz.timezone('Pacific/Noumea')
+    transition_time = datetime(1912, 1, 12, 12, 54, 12, tzinfo=UTC)
+    before = {
+        'tzname': 'LMT',
+        'utcoffset': timedelta(hours=11, minutes=6),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'NCT',
+        'utcoffset': timedelta(hours=11),
+        'dst': timedelta(0),
+        }
+
+
+class NoumeaDSTEndTestCase(USEasternDSTStartTestCase):
+    # Noumea dropped DST in 1997.
+    tzinfo = pytz.timezone('Pacific/Noumea')
+    transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC)
+    before = {
+        'tzname': 'NCST',
+        'utcoffset': timedelta(hours=12),
+        'dst': timedelta(hours=1),
+        }
+    after = {
+        'tzname': 'NCT',
+        'utcoffset': timedelta(hours=11),
+        'dst': timedelta(0),
+        }
+
+
+class NoumeaNoMoreDSTTestCase(NoumeaDSTEndTestCase):
+    # Noumea dropped DST in 1997. Here we test that it stops occuring.
+    transition_time = (
+        NoumeaDSTEndTestCase.transition_time + timedelta(days=365*10))
+    before = NoumeaDSTEndTestCase.after
+    after = NoumeaDSTEndTestCase.after
+
+
+class TahitiTestCase(USEasternDSTStartTestCase):
+    # Tahiti has had a single transition in its history.
+    tzinfo = pytz.timezone('Pacific/Tahiti')
+    transition_time = datetime(1912, 10, 1, 9, 58, 16, tzinfo=UTC)
+    before = {
+        'tzname': 'LMT',
+        'utcoffset': timedelta(hours=-9, minutes=-58),
+        'dst': timedelta(0),
+        }
+    after = {
+        'tzname': 'TAHT',
+        'utcoffset': timedelta(hours=-10),
+        'dst': timedelta(0),
+        }
+
+
+class SamoaInternationalDateLineChange(USEasternDSTStartTestCase):
+    # At the end of 2011, Samoa will switch from being east of the
+    # international dateline to the west. There will be no Dec 30th
+    # 2011 and it will switch from UTC-10 to UTC+14.
+    tzinfo = pytz.timezone('Pacific/Apia')
+    transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC)
+    before = {
+        'tzname': 'SDT',
+        'utcoffset': timedelta(hours=-10),
+        'dst': timedelta(hours=1),
+        }
+    after = {
+        'tzname': 'WSDT',
+        'utcoffset': timedelta(hours=14),
+        'dst': timedelta(hours=1),
+        }
+
+
 class ReferenceUSEasternDSTStartTestCase(USEasternDSTStartTestCase):
     tzinfo = reference.Eastern
     def test_arithmetic(self):
@@ -320,8 +571,8 @@ class ReferenceUSEasternDSTEndTestCase(USEasternDSTEndTestCase):
 
     def testHourBefore(self):
         # Python's datetime library has a bug, where the hour before
-        # a daylight savings transition is one hour out. For example,
-        # at the end of US/Eastern daylight savings time, 01:00 EST
+        # a daylight saving transition is one hour out. For example,
+        # at the end of US/Eastern daylight saving time, 01:00 EST
         # occurs twice (once at 05:00 UTC and once at 06:00 UTC),
         # whereas the first should actually be 01:00 EDT.
         # Note that this bug is by design - by accepting this ambiguity
@@ -347,27 +598,27 @@ class LocalTestCase(unittest.TestCase):
 
         loc_time = loc_tz.localize(datetime(1930, 5, 10, 0, 0, 0))
         # Actually +00:19:32, but Python datetime rounds this
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'AMT+0020')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'AMT+0020')
 
         loc_time = loc_tz.localize(datetime(1930, 5, 20, 0, 0, 0))
         # Actually +00:19:32, but Python datetime rounds this
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'NST+0120')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'NST+0120')
 
         loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'NET+0020')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'NET+0020')
 
         loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
 
         loc_time = loc_tz.localize(datetime(2004, 2, 1, 0, 0, 0))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'CET+0100')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CET+0100')
 
         loc_time = loc_tz.localize(datetime(2004, 4, 1, 0, 0, 0))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
 
         tz = pytz.timezone('Europe/Amsterdam')
         loc_time = loc_tz.localize(datetime(1943, 3, 29, 1, 59, 59))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'CET+0100')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'CET+0100')
 
 
         # Switch to US
@@ -375,40 +626,68 @@ class LocalTestCase(unittest.TestCase):
 
         # End of DST ambiguity check
         loc_time = loc_tz.localize(datetime(1918, 10, 27, 1, 59, 59), is_dst=1)
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'EDT-0400')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EDT-0400')
 
         loc_time = loc_tz.localize(datetime(1918, 10, 27, 1, 59, 59), is_dst=0)
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500')
 
-        self.failUnlessRaises(pytz.AmbiguousTimeError,
-                loc_tz.localize, datetime(1918, 10, 27, 1, 59, 59), is_dst=None
-                )
+        self.assertRaises(pytz.AmbiguousTimeError,
+            loc_tz.localize, datetime(1918, 10, 27, 1, 59, 59), is_dst=None
+            )
+
+        # Start of DST non-existent times
+        loc_time = loc_tz.localize(datetime(1918, 3, 31, 2, 0, 0), is_dst=0)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+
+        loc_time = loc_tz.localize(datetime(1918, 3, 31, 2, 0, 0), is_dst=1)
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EDT-0400')
+
+        self.assertRaises(pytz.NonExistentTimeError,
+            loc_tz.localize, datetime(1918, 3, 31, 2, 0, 0), is_dst=None
+            )
 
         # Weird changes - war time and peace time both is_dst==True
 
         loc_time = loc_tz.localize(datetime(1942, 2, 9, 3, 0, 0))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'EWT-0400')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EWT-0400')
 
         loc_time = loc_tz.localize(datetime(1945, 8, 14, 19, 0, 0))
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'EPT-0400')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EPT-0400')
 
         loc_time = loc_tz.localize(datetime(1945, 9, 30, 1, 0, 0), is_dst=1)
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'EPT-0400')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EPT-0400')
 
         loc_time = loc_tz.localize(datetime(1945, 9, 30, 1, 0, 0), is_dst=0)
-        self.failUnlessEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+        self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500')
+
+        # Weird changes - ambiguous time (end-of-DST like) but is_dst==False
+        for zonename, ambiguous_naive, expected in [
+                ('Europe/Warsaw', datetime(1915, 8, 4, 23, 59, 59),
+                 ['1915-08-04 23:59:59 WMT+0124',
+                  '1915-08-04 23:59:59 CET+0100']),
+                ('Europe/Moscow', datetime(2014, 10, 26, 1, 30),
+                 ['2014-10-26 01:30:00 MSK+0400',
+                  '2014-10-26 01:30:00 MSK+0300'])]:
+            loc_tz = pytz.timezone(zonename)
+            self.assertRaises(pytz.AmbiguousTimeError,
+                loc_tz.localize, ambiguous_naive, is_dst=None
+                )
+            # Also test non-boolean is_dst in the weird case
+            for dst in [True, timedelta(1), False, timedelta(0)]:
+                loc_time = loc_tz.localize(ambiguous_naive, is_dst=dst)
+                self.assertEqual(loc_time.strftime(fmt), expected[not dst])
 
     def testNormalize(self):
         tz = pytz.timezone('US/Eastern')
         dt = datetime(2004, 4, 4, 7, 0, 0, tzinfo=UTC).astimezone(tz)
         dt2 = dt - timedelta(minutes=10)
-        self.failUnlessEqual(
+        self.assertEqual(
                 dt2.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
                 '2004-04-04 02:50:00 EDT-0400'
                 )
 
         dt2 = tz.normalize(dt2)
-        self.failUnlessEqual(
+        self.assertEqual(
                 dt2.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
                 '2004-04-04 01:50:00 EST-0500'
                 )
@@ -416,19 +695,19 @@ class LocalTestCase(unittest.TestCase):
     def testPartialMinuteOffsets(self):
         # utcoffset in Amsterdam was not a whole minute until 1937
         # However, we fudge this by rounding them, as the Python
-        # datetime library 
+        # datetime library
         tz = pytz.timezone('Europe/Amsterdam')
         utc_dt = datetime(1914, 1, 1, 13, 40, 28, tzinfo=UTC) # correct
         utc_dt = utc_dt.replace(second=0) # But we need to fudge it
         loc_dt = utc_dt.astimezone(tz)
-        self.failUnlessEqual(
+        self.assertEqual(
                 loc_dt.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
                 '1914-01-01 14:00:00 AMT+0020'
                 )
 
         # And get back...
         utc_dt = loc_dt.astimezone(UTC)
-        self.failUnlessEqual(
+        self.assertEqual(
                 utc_dt.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
                 '1914-01-01 13:40:00 UTC+0000'
                 )
@@ -437,11 +716,113 @@ class LocalTestCase(unittest.TestCase):
         # It would be nice if this worked, but it doesn't.
         tz = pytz.timezone('Europe/Amsterdam')
         dt = datetime(2004, 10, 31, 2, 0, 0, tzinfo=tz)
-        self.failUnlessEqual(
+        self.assertEqual(
                 dt.strftime(fmt),
                 '2004-10-31 02:00:00 CET+0100'
                 )
 
+
+class CommonTimezonesTestCase(unittest.TestCase):
+    def test_bratislava(self):
+        # Bratislava is the default timezone for Slovakia, but our
+        # heuristics where not adding it to common_timezones. Ideally,
+        # common_timezones should be populated from zone.tab at runtime,
+        # but I'm hesitant to pay the startup cost as loading the list
+        # on demand whilst remaining backwards compatible seems
+        # difficult.
+        self.assertTrue('Europe/Bratislava' in pytz.common_timezones)
+        self.assertTrue('Europe/Bratislava' in pytz.common_timezones_set)
+
+    def test_us_eastern(self):
+        self.assertTrue('US/Eastern' in pytz.common_timezones)
+        self.assertTrue('US/Eastern' in pytz.common_timezones_set)
+
+    def test_belfast(self):
+        # Belfast uses London time.
+        self.assertTrue('Europe/Belfast' in pytz.all_timezones_set)
+        self.assertFalse('Europe/Belfast' in pytz.common_timezones)
+        self.assertFalse('Europe/Belfast' in pytz.common_timezones_set)
+
+
+class BaseTzInfoTestCase:
+    '''Ensure UTC, StaticTzInfo and DstTzInfo work consistently.
+
+    These tests are run for each type of tzinfo.
+    '''
+    tz = None  # override
+    tz_class = None  # override
+
+    def test_expectedclass(self):
+        self.assertTrue(isinstance(self.tz, self.tz_class))
+
+    def test_fromutc(self):
+        # naive datetime.
+        dt1 = datetime(2011, 10, 31)
+
+        # localized datetime, same timezone.
+        dt2 = self.tz.localize(dt1)
+
+        # Both should give the same results. Note that the standard
+        # Python tzinfo.fromutc() only supports the second.
+        for dt in [dt1, dt2]:
+            loc_dt = self.tz.fromutc(dt)
+            loc_dt2 = pytz.utc.localize(dt1).astimezone(self.tz)
+            self.assertEqual(loc_dt, loc_dt2)
+
+        # localized datetime, different timezone.
+        new_tz = pytz.timezone('Europe/Paris')
+        self.assertTrue(self.tz is not new_tz)
+        dt3 = new_tz.localize(dt1)
+        self.assertRaises(ValueError, self.tz.fromutc, dt3)
+
+    def test_normalize(self):
+        other_tz = pytz.timezone('Europe/Paris')
+        self.assertTrue(self.tz is not other_tz)
+
+        dt = datetime(2012, 3, 26, 12, 0)
+        other_dt = other_tz.localize(dt)
+
+        local_dt = self.tz.normalize(other_dt)
+
+        self.assertTrue(local_dt.tzinfo is not other_dt.tzinfo)
+        self.assertNotEqual(
+            local_dt.replace(tzinfo=None), other_dt.replace(tzinfo=None))
+
+    def test_astimezone(self):
+        other_tz = pytz.timezone('Europe/Paris')
+        self.assertTrue(self.tz is not other_tz)
+
+        dt = datetime(2012, 3, 26, 12, 0)
+        other_dt = other_tz.localize(dt)
+
+        local_dt = other_dt.astimezone(self.tz)
+
+        self.assertTrue(local_dt.tzinfo is not other_dt.tzinfo)
+        self.assertNotEqual(
+            local_dt.replace(tzinfo=None), other_dt.replace(tzinfo=None))
+
+
+class OptimizedUTCTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    tz = pytz.utc
+    tz_class = tz.__class__
+
+
+class LegacyUTCTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    # Deprecated timezone, but useful for comparison tests.
+    tz = pytz.timezone('Etc/UTC')
+    tz_class = StaticTzInfo
+
+
+class StaticTzInfoTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    tz = pytz.timezone('GMT')
+    tz_class = StaticTzInfo
+
+
+class DstTzInfoTestCase(unittest.TestCase, BaseTzInfoTestCase):
+    tz = pytz.timezone('Australia/Melbourne')
+    tz_class = DstTzInfo
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(doctest.DocTestSuite('pytz'))
@@ -450,8 +831,7 @@ def test_suite():
     suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_tzinfo))
     return suite
 
-DEFAULT = test_suite()
 
 if __name__ == '__main__':
-    unittest.main(defaultTest='DEFAULT')
-
+    warnings.simplefilter("error") # Warnings should be fatal in tests.
+    unittest.main(defaultTest='test_suite')
diff --git a/lib/pytz/tzfile.py b/lib/pytz/tzfile.py
new file mode 100644
index 0000000..cb1ed04
--- /dev/null
+++ b/lib/pytz/tzfile.py
@@ -0,0 +1,137 @@
+#!/usr/bin/env python
+'''
+$Id: tzfile.py,v 1.8 2004/06/03 00:15:24 zenzen Exp $
+'''
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+from datetime import datetime, timedelta
+from struct import unpack, calcsize
+
+from lib.pytz.tzinfo import StaticTzInfo, DstTzInfo, memorized_ttinfo
+from lib.pytz.tzinfo import memorized_datetime, memorized_timedelta
+
+def _byte_string(s):
+    """Cast a string or byte string to an ASCII byte string."""
+    return s.encode('US-ASCII')
+
+_NULL = _byte_string('\0')
+
+def _std_string(s):
+    """Cast a string or byte string to an ASCII string."""
+    return str(s.decode('US-ASCII'))
+
+def build_tzinfo(zone, fp):
+    head_fmt = '>4s c 15x 6l'
+    head_size = calcsize(head_fmt)
+    (magic, format, ttisgmtcnt, ttisstdcnt,leapcnt, timecnt,
+        typecnt, charcnt) =  unpack(head_fmt, fp.read(head_size))
+
+    # Make sure it is a tzfile(5) file
+    assert magic == _byte_string('TZif'), 'Got magic %s' % repr(magic)
+
+    # Read out the transition times, localtime indices and ttinfo structures.
+    data_fmt = '>%(timecnt)dl %(timecnt)dB %(ttinfo)s %(charcnt)ds' % dict(
+        timecnt=timecnt, ttinfo='lBB'*typecnt, charcnt=charcnt)
+    data_size = calcsize(data_fmt)
+    data = unpack(data_fmt, fp.read(data_size))
+
+    # make sure we unpacked the right number of values
+    assert len(data) == 2 * timecnt + 3 * typecnt + 1
+    transitions = [memorized_datetime(trans)
+                   for trans in data[:timecnt]]
+    lindexes = list(data[timecnt:2 * timecnt])
+    ttinfo_raw = data[2 * timecnt:-1]
+    tznames_raw = data[-1]
+    del data
+
+    # Process ttinfo into separate structs
+    ttinfo = []
+    tznames = {}
+    i = 0
+    while i < len(ttinfo_raw):
+        # have we looked up this timezone name yet?
+        tzname_offset = ttinfo_raw[i+2]
+        if tzname_offset not in tznames:
+            nul = tznames_raw.find(_NULL, tzname_offset)
+            if nul < 0:
+                nul = len(tznames_raw)
+            tznames[tzname_offset] = _std_string(
+                tznames_raw[tzname_offset:nul])
+        ttinfo.append((ttinfo_raw[i],
+                       bool(ttinfo_raw[i+1]),
+                       tznames[tzname_offset]))
+        i += 3
+
+    # Now build the timezone object
+    if len(transitions) == 0:
+        ttinfo[0][0], ttinfo[0][2]
+        cls = type(zone, (StaticTzInfo,), dict(
+            zone=zone,
+            _utcoffset=memorized_timedelta(ttinfo[0][0]),
+            _tzname=ttinfo[0][2]))
+    else:
+        # Early dates use the first standard time ttinfo
+        i = 0
+        while ttinfo[i][1]:
+            i += 1
+        if ttinfo[i] == ttinfo[lindexes[0]]:
+            transitions[0] = datetime.min
+        else:
+            transitions.insert(0, datetime.min)
+            lindexes.insert(0, i)
+
+        # calculate transition info
+        transition_info = []
+        for i in range(len(transitions)):
+            inf = ttinfo[lindexes[i]]
+            utcoffset = inf[0]
+            if not inf[1]:
+                dst = 0
+            else:
+                for j in range(i-1, -1, -1):
+                    prev_inf = ttinfo[lindexes[j]]
+                    if not prev_inf[1]:
+                        break
+                dst = inf[0] - prev_inf[0] # dst offset
+
+                # Bad dst? Look further. DST > 24 hours happens when
+                # a timzone has moved across the international dateline.
+                if dst <= 0 or dst > 3600*3:
+                    for j in range(i+1, len(transitions)):
+                        stdinf = ttinfo[lindexes[j]]
+                        if not stdinf[1]:
+                            dst = inf[0] - stdinf[0]
+                            if dst > 0:
+                                break # Found a useful std time.
+
+            tzname = inf[2]
+
+            # Round utcoffset and dst to the nearest minute or the
+            # datetime library will complain. Conversions to these timezones
+            # might be up to plus or minus 30 seconds out, but it is
+            # the best we can do.
+            utcoffset = int((utcoffset + 30) // 60) * 60
+            dst = int((dst + 30) // 60) * 60
+            transition_info.append(memorized_ttinfo(utcoffset, dst, tzname))
+
+        cls = type(zone, (DstTzInfo,), dict(
+            zone=zone,
+            _utc_transition_times=transitions,
+            _transition_info=transition_info))
+
+    return cls()
+
+if __name__ == '__main__':
+    import os.path
+    from pprint import pprint
+    base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
+    tz = build_tzinfo('Australia/Melbourne',
+                      open(os.path.join(base,'Australia','Melbourne'), 'rb'))
+    tz = build_tzinfo('US/Eastern',
+                      open(os.path.join(base,'US','Eastern'), 'rb'))
+    pprint(tz._utc_transition_times)
+    #print tz.asPython(4)
+    #print tz.transitions_mapping
diff --git a/lib/pytz/tzfile.pyc b/lib/pytz/tzfile.pyc
new file mode 100644
index 0000000..db4eb83
Binary files /dev/null and b/lib/pytz/tzfile.pyc differ
diff --git a/lib/pytz/tzinfo.py b/lib/pytz/tzinfo.py
old mode 100755
new mode 100644
index 8344258..1a1bb6e
--- a/lib/pytz/tzinfo.py
+++ b/lib/pytz/tzinfo.py
@@ -2,9 +2,13 @@
 
 from datetime import datetime, timedelta, tzinfo
 from bisect import bisect_right
-from sets import Set
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 import lib.pytz
+from lib.pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
 
 __all__ = []
 
@@ -18,14 +22,17 @@ def memorized_timedelta(seconds):
         _timedelta_cache[seconds] = delta
         return delta
 
-_datetime_cache = {}
-def memorized_datetime(*args):
+_epoch = datetime.utcfromtimestamp(0)
+_datetime_cache = {0: _epoch}
+def memorized_datetime(seconds):
     '''Create only one instance of each distinct datetime'''
     try:
-        return _datetime_cache[args]
+        return _datetime_cache[seconds]
     except KeyError:
-        dt = datetime(*args)
-        _datetime_cache[args] = dt
+        # NB. We can't just do datetime.utcfromtimestamp(seconds) as this
+        # fails with negative values under Windows (Bug #90096)
+        dt = _epoch + timedelta(seconds=seconds)
+        _datetime_cache[seconds] = dt
         return dt
 
 _ttinfo_cache = {}
@@ -62,53 +69,89 @@ class BaseTzInfo(tzinfo):
 class StaticTzInfo(BaseTzInfo):
     '''A timezone that has a constant offset from UTC
 
-    These timezones are rare, as most regions have changed their
-    offset from UTC at some point in their history
+    These timezones are rare, as most locations have changed their
+    offset at some point in their history
     '''
     def fromutc(self, dt):
         '''See datetime.tzinfo.fromutc'''
+        if dt.tzinfo is not None and dt.tzinfo is not self:
+            raise ValueError('fromutc: dt.tzinfo is not self')
         return (dt + self._utcoffset).replace(tzinfo=self)
-    
-    def utcoffset(self,dt):
-        '''See datetime.tzinfo.utcoffset'''
+
+    def utcoffset(self, dt, is_dst=None):
+        '''See datetime.tzinfo.utcoffset
+
+        is_dst is ignored for StaticTzInfo, and exists only to
+        retain compatibility with DstTzInfo.
+        '''
         return self._utcoffset
 
-    def dst(self,dt):
-        '''See datetime.tzinfo.dst'''
+    def dst(self, dt, is_dst=None):
+        '''See datetime.tzinfo.dst
+
+        is_dst is ignored for StaticTzInfo, and exists only to
+        retain compatibility with DstTzInfo.
+        '''
         return _notime
 
-    def tzname(self,dt):
-        '''See datetime.tzinfo.tzname'''
+    def tzname(self, dt, is_dst=None):
+        '''See datetime.tzinfo.tzname
+
+        is_dst is ignored for StaticTzInfo, and exists only to
+        retain compatibility with DstTzInfo.
+        '''
         return self._tzname
 
     def localize(self, dt, is_dst=False):
         '''Convert naive time to local time'''
         if dt.tzinfo is not None:
-            raise ValueError, 'Not naive datetime (tzinfo is already set)'
+            raise ValueError('Not naive datetime (tzinfo is already set)')
         return dt.replace(tzinfo=self)
 
     def normalize(self, dt, is_dst=False):
-        '''Correct the timezone information on the given datetime'''
+        '''Correct the timezone information on the given datetime.
+
+        This is normally a no-op, as StaticTzInfo timezones never have
+        ambiguous cases to correct:
+
+        >>> from pytz import timezone
+        >>> gmt = timezone('GMT')
+        >>> isinstance(gmt, StaticTzInfo)
+        True
+        >>> dt = datetime(2011, 5, 8, 1, 2, 3, tzinfo=gmt)
+        >>> gmt.normalize(dt) is dt
+        True
+
+        The supported method of converting between timezones is to use
+        datetime.astimezone(). Currently normalize() also works:
+
+        >>> la = timezone('America/Los_Angeles')
+        >>> dt = la.localize(datetime(2011, 5, 7, 1, 2, 3))
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> gmt.normalize(dt).strftime(fmt)
+        '2011-05-07 08:02:03 GMT (+0000)'
+        '''
+        if dt.tzinfo is self:
+            return dt
         if dt.tzinfo is None:
-            raise ValueError, 'Naive time - no tzinfo set'
-        return dt.replace(tzinfo=self)
+            raise ValueError('Naive time - no tzinfo set')
+        return dt.astimezone(self)
 
     def __repr__(self):
         return '<StaticTzInfo %r>' % (self.zone,)
 
     def __reduce__(self):
         # Special pickle to zone remains a singleton and to cope with
-        # database changes. 
+        # database changes.
         return pytz._p, (self.zone,)
 
 
 class DstTzInfo(BaseTzInfo):
     '''A timezone that has a variable offset from UTC
-   
-    The offset might change if daylight savings time comes into effect,
-    or at a point in history when the region decides to change their 
-    timezone definition. 
 
+    The offset might change if daylight saving time comes into effect,
+    or at a point in history when the region decides to change their
+    timezone definition.
     '''
     # Overridden in subclass
     _utc_transition_times = None # Sorted list of DST transition times in UTC
@@ -130,11 +173,14 @@ class DstTzInfo(BaseTzInfo):
             self._utcoffset, self._dst, self._tzname = self._transition_info[0]
             _tzinfos[self._transition_info[0]] = self
             for inf in self._transition_info[1:]:
-                if not _tzinfos.has_key(inf):
+                if inf not in _tzinfos:
                     _tzinfos[inf] = self.__class__(inf, _tzinfos)
 
     def fromutc(self, dt):
         '''See datetime.tzinfo.fromutc'''
+        if (dt.tzinfo is not None
+            and getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
+            raise ValueError('fromutc: dt.tzinfo is not self')
         dt = dt.replace(tzinfo=None)
         idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)
         inf = self._transition_info[idx]
@@ -175,9 +221,18 @@ class DstTzInfo(BaseTzInfo):
         >>> before.strftime(fmt)
         '2002-10-27 01:50:00 EDT (-0400)'
 
+        The supported method of converting between timezones is to use
+        datetime.astimezone(). Currently, normalize() also works:
+
+        >>> th = timezone('Asia/Bangkok')
+        >>> am = timezone('Europe/Amsterdam')
+        >>> dt = th.localize(datetime(2011, 5, 7, 1, 2, 3))
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> am.normalize(dt).strftime(fmt)
+        '2011-05-06 20:02:03 CEST (+0200)'
         '''
         if dt.tzinfo is None:
-            raise ValueError, 'Naive time - no tzinfo set'
+            raise ValueError('Naive time - no tzinfo set')
 
         # Convert dt in localtime to UTC
         offset = dt.tzinfo._utcoffset
@@ -188,13 +243,13 @@ class DstTzInfo(BaseTzInfo):
 
     def localize(self, dt, is_dst=False):
         '''Convert naive time to local time.
-        
+
         This method should be used to construct localtimes, rather
         than passing a tzinfo argument to a datetime constructor.
 
         is_dst is used to determine the correct timezone in the ambigous
-        period at the end of daylight savings time.
-        
+        period at the end of daylight saving time.
+
         >>> from pytz import timezone
         >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
         >>> amdam = timezone('Europe/Amsterdam')
@@ -209,34 +264,53 @@ class DstTzInfo(BaseTzInfo):
         '1:00:00'
 
         Use is_dst=None to raise an AmbiguousTimeError for ambiguous
-        times at the end of daylight savings
+        times at the end of daylight saving time
 
         >>> try:
         ...     loc_dt1 = amdam.localize(dt, is_dst=None)
         ... except AmbiguousTimeError:
-        ...     print 'Oops'
-        Oops
-
-        >>> loc_dt1 = amdam.localize(dt, is_dst=None)
-        Traceback (most recent call last):
-            [...]
-        AmbiguousTimeError: 2004-10-31 02:00:00
+        ...     print('Ambiguous')
+        Ambiguous
 
         is_dst defaults to False
-        
+
         >>> amdam.localize(dt) == amdam.localize(dt, False)
         True
 
+        is_dst is also used to determine the correct timezone in the
+        wallclock times jumped over at the start of daylight saving time.
+
+        >>> pacific = timezone('US/Pacific')
+        >>> dt = datetime(2008, 3, 9, 2, 0, 0)
+        >>> ploc_dt1 = pacific.localize(dt, is_dst=True)
+        >>> ploc_dt2 = pacific.localize(dt, is_dst=False)
+        >>> ploc_dt1.strftime(fmt)
+        '2008-03-09 02:00:00 PDT (-0700)'
+        >>> ploc_dt2.strftime(fmt)
+        '2008-03-09 02:00:00 PST (-0800)'
+        >>> str(ploc_dt2 - ploc_dt1)
+        '1:00:00'
+
+        Use is_dst=None to raise a NonExistentTimeError for these skipped
+        times.
+
+        >>> try:
+        ...     loc_dt1 = pacific.localize(dt, is_dst=None)
+        ... except NonExistentTimeError:
+        ...     print('Non-existent')
+        Non-existent
         '''
         if dt.tzinfo is not None:
-            raise ValueError, 'Not naive datetime (tzinfo is already set)'
-
-        # Find the possibly correct timezones. We probably just have one,
-        # but we might end up with two if we are in the end-of-DST
-        # transition period. Or possibly more in some particularly confused
-        # location...
-        possible_loc_dt = Set()
-        for tzinfo in self._tzinfos.values():
+            raise ValueError('Not naive datetime (tzinfo is already set)')
+
+        # Find the two best possibilities.
+        possible_loc_dt = set()
+        for delta in [timedelta(days=-1), timedelta(days=1)]:
+            loc_dt = dt + delta
+            idx = max(0, bisect_right(
+                self._utc_transition_times, loc_dt) - 1)
+            inf = self._transition_info[idx]
+            tzinfo = self._tzinfos[inf]
             loc_dt = tzinfo.normalize(dt.replace(tzinfo=tzinfo))
             if loc_dt.replace(tzinfo=None) == dt:
                 possible_loc_dt.add(loc_dt)
@@ -244,6 +318,31 @@ class DstTzInfo(BaseTzInfo):
         if len(possible_loc_dt) == 1:
             return possible_loc_dt.pop()
 
+        # If there are no possibly correct timezones, we are attempting
+        # to convert a time that never happened - the time period jumped
+        # during the start-of-DST transition period.
+        if len(possible_loc_dt) == 0:
+            # If we refuse to guess, raise an exception.
+            if is_dst is None:
+                raise NonExistentTimeError(dt)
+
+            # If we are forcing the pre-DST side of the DST transition, we
+            # obtain the correct timezone by winding the clock forward a few
+            # hours.
+            elif is_dst:
+                return self.localize(
+                    dt + timedelta(hours=6), is_dst=True) - timedelta(hours=6)
+
+            # If we are forcing the post-DST side of the DST transition, we
+            # obtain the correct timezone by winding the clock back.
+            else:
+                return self.localize(
+                    dt - timedelta(hours=6), is_dst=False) + timedelta(hours=6)
+
+
+        # If we get this far, we have multiple possible timezones - this
+        # is an ambiguous case occuring during the end-of-DST transition.
+
         # If told to be strict, raise an exception since we have an
         # ambiguous case
         if is_dst is None:
@@ -270,26 +369,123 @@ class DstTzInfo(BaseTzInfo):
         # hints to be passed in (such as the UTC offset or abbreviation),
         # but that is just getting silly.
         #
-        # Choose the earliest (by UTC) applicable timezone.
-        def mycmp(a,b):
-            return cmp(
-                    a.replace(tzinfo=None) - a.tzinfo._utcoffset,
-                    b.replace(tzinfo=None) - b.tzinfo._utcoffset,
-                    )
-        filtered_possible_loc_dt.sort(mycmp)
-        return filtered_possible_loc_dt[0]
-        
-    def utcoffset(self, dt):
-        '''See datetime.tzinfo.utcoffset'''
-        return self._utcoffset
+        # Choose the earliest (by UTC) applicable timezone if is_dst=True
+        # Choose the latest (by UTC) applicable timezone if is_dst=False
+        # i.e., behave like end-of-DST transition
+        dates = {} # utc -> local
+        for local_dt in filtered_possible_loc_dt:
+            utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
+            assert utc_time not in dates
+            dates[utc_time] = local_dt
+        return dates[[min, max][not is_dst](dates)]
+
+    def utcoffset(self, dt, is_dst=None):
+        '''See datetime.tzinfo.utcoffset
+
+        The is_dst parameter may be used to remove ambiguity during DST
+        transitions.
+
+        >>> from pytz import timezone
+        >>> tz = timezone('America/St_Johns')
+        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-    def dst(self, dt):
-        '''See datetime.tzinfo.dst'''
-        return self._dst
+        >>> tz.utcoffset(ambiguous, is_dst=False)
+        datetime.timedelta(-1, 73800)
 
-    def tzname(self, dt):
-        '''See datetime.tzinfo.tzname'''
-        return self._tzname
+        >>> tz.utcoffset(ambiguous, is_dst=True)
+        datetime.timedelta(-1, 77400)
+
+        >>> try:
+        ...     tz.utcoffset(ambiguous)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+
+        '''
+        if dt is None:
+            return None
+        elif dt.tzinfo is not self:
+            dt = self.localize(dt, is_dst)
+            return dt.tzinfo._utcoffset
+        else:
+            return self._utcoffset
+
+    def dst(self, dt, is_dst=None):
+        '''See datetime.tzinfo.dst
+
+        The is_dst parameter may be used to remove ambiguity during DST
+        transitions.
+
+        >>> from pytz import timezone
+        >>> tz = timezone('America/St_Johns')
+
+        >>> normal = datetime(2009, 9, 1)
+
+        >>> tz.dst(normal)
+        datetime.timedelta(0, 3600)
+        >>> tz.dst(normal, is_dst=False)
+        datetime.timedelta(0, 3600)
+        >>> tz.dst(normal, is_dst=True)
+        datetime.timedelta(0, 3600)
+
+        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
+
+        >>> tz.dst(ambiguous, is_dst=False)
+        datetime.timedelta(0)
+        >>> tz.dst(ambiguous, is_dst=True)
+        datetime.timedelta(0, 3600)
+        >>> try:
+        ...     tz.dst(ambiguous)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+
+        '''
+        if dt is None:
+            return None
+        elif dt.tzinfo is not self:
+            dt = self.localize(dt, is_dst)
+            return dt.tzinfo._dst
+        else:
+            return self._dst
+
+    def tzname(self, dt, is_dst=None):
+        '''See datetime.tzinfo.tzname
+
+        The is_dst parameter may be used to remove ambiguity during DST
+        transitions.
+
+        >>> from pytz import timezone
+        >>> tz = timezone('America/St_Johns')
+
+        >>> normal = datetime(2009, 9, 1)
+
+        >>> tz.tzname(normal)
+        'NDT'
+        >>> tz.tzname(normal, is_dst=False)
+        'NDT'
+        >>> tz.tzname(normal, is_dst=True)
+        'NDT'
+
+        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
+
+        >>> tz.tzname(ambiguous, is_dst=False)
+        'NST'
+        >>> tz.tzname(ambiguous, is_dst=True)
+        'NDT'
+        >>> try:
+        ...     tz.tzname(ambiguous)
+        ... except AmbiguousTimeError:
+        ...     print('Ambiguous')
+        Ambiguous
+        '''
+        if dt is None:
+            return self.zone
+        elif dt.tzinfo is not self:
+            dt = self.localize(dt, is_dst)
+            return dt.tzinfo._tzname
+        else:
+            return self._tzname
 
     def __repr__(self):
         if self._dst:
@@ -316,20 +512,10 @@ class DstTzInfo(BaseTzInfo):
                 )
 
 
-class AmbiguousTimeError(Exception):
-    '''Exception raised when attempting to create an ambiguous wallclock time.
-
-    At the end of a DST transition period, a particular wallclock time will
-    occur twice (once before the clocks are set back, once after). Both
-    possibilities may be correct, unless further information is supplied.
-
-    See DstTzInfo.normalize() for more info
-    '''
-       
 
 def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     """Factory function for unpickling pytz tzinfo instances.
-    
+
     This is shared for both StaticTzInfo and DstTzInfo instances, because
     database changes could cause a zones implementation to switch between
     these two base classes and we can't break pickles on a pytz version
@@ -376,4 +562,3 @@ def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     inf = (utcoffset, dstoffset, tzname)
     tz._tzinfos[inf] = tz.__class__(inf, tz._tzinfos)
     return tz._tzinfos[inf]
-
diff --git a/lib/pytz/tzinfo.pyc b/lib/pytz/tzinfo.pyc
index deb24c1..499073a 100644
Binary files a/lib/pytz/tzinfo.pyc and b/lib/pytz/tzinfo.pyc differ
diff --git a/lib/pytz/zoneinfo/Africa/Abidjan b/lib/pytz/zoneinfo/Africa/Abidjan
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Abidjan differ
diff --git a/lib/pytz/zoneinfo/Africa/Accra b/lib/pytz/zoneinfo/Africa/Accra
new file mode 100644
index 0000000..6ff8fb6
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Accra differ
diff --git a/lib/pytz/zoneinfo/Africa/Addis_Ababa b/lib/pytz/zoneinfo/Africa/Addis_Ababa
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Addis_Ababa differ
diff --git a/lib/pytz/zoneinfo/Africa/Algiers b/lib/pytz/zoneinfo/Africa/Algiers
new file mode 100644
index 0000000..2a25f3a
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Algiers differ
diff --git a/lib/pytz/zoneinfo/Africa/Asmara b/lib/pytz/zoneinfo/Africa/Asmara
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Asmara differ
diff --git a/lib/pytz/zoneinfo/Africa/Asmera b/lib/pytz/zoneinfo/Africa/Asmera
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Asmera differ
diff --git a/lib/pytz/zoneinfo/Africa/Bamako b/lib/pytz/zoneinfo/Africa/Bamako
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Bamako differ
diff --git a/lib/pytz/zoneinfo/Africa/Bangui b/lib/pytz/zoneinfo/Africa/Bangui
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Bangui differ
diff --git a/lib/pytz/zoneinfo/Africa/Banjul b/lib/pytz/zoneinfo/Africa/Banjul
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Banjul differ
diff --git a/lib/pytz/zoneinfo/Africa/Bissau b/lib/pytz/zoneinfo/Africa/Bissau
new file mode 100644
index 0000000..0696667
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Bissau differ
diff --git a/lib/pytz/zoneinfo/Africa/Blantyre b/lib/pytz/zoneinfo/Africa/Blantyre
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Blantyre differ
diff --git a/lib/pytz/zoneinfo/Africa/Brazzaville b/lib/pytz/zoneinfo/Africa/Brazzaville
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Brazzaville differ
diff --git a/lib/pytz/zoneinfo/Africa/Bujumbura b/lib/pytz/zoneinfo/Africa/Bujumbura
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Bujumbura differ
diff --git a/lib/pytz/zoneinfo/Africa/Cairo b/lib/pytz/zoneinfo/Africa/Cairo
new file mode 100644
index 0000000..0eeed11
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Cairo differ
diff --git a/lib/pytz/zoneinfo/Africa/Casablanca b/lib/pytz/zoneinfo/Africa/Casablanca
new file mode 100644
index 0000000..c001c37
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Casablanca differ
diff --git a/lib/pytz/zoneinfo/Africa/Ceuta b/lib/pytz/zoneinfo/Africa/Ceuta
new file mode 100644
index 0000000..6227e2b
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Ceuta differ
diff --git a/lib/pytz/zoneinfo/Africa/Conakry b/lib/pytz/zoneinfo/Africa/Conakry
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Conakry differ
diff --git a/lib/pytz/zoneinfo/Africa/Dakar b/lib/pytz/zoneinfo/Africa/Dakar
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Dakar differ
diff --git a/lib/pytz/zoneinfo/Africa/Dar_es_Salaam b/lib/pytz/zoneinfo/Africa/Dar_es_Salaam
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Dar_es_Salaam differ
diff --git a/lib/pytz/zoneinfo/Africa/Djibouti b/lib/pytz/zoneinfo/Africa/Djibouti
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Djibouti differ
diff --git a/lib/pytz/zoneinfo/Africa/Douala b/lib/pytz/zoneinfo/Africa/Douala
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Douala differ
diff --git a/lib/pytz/zoneinfo/Africa/El_Aaiun b/lib/pytz/zoneinfo/Africa/El_Aaiun
new file mode 100644
index 0000000..805d39e
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/El_Aaiun differ
diff --git a/lib/pytz/zoneinfo/Africa/Freetown b/lib/pytz/zoneinfo/Africa/Freetown
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Freetown differ
diff --git a/lib/pytz/zoneinfo/Africa/Gaborone b/lib/pytz/zoneinfo/Africa/Gaborone
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Gaborone differ
diff --git a/lib/pytz/zoneinfo/Africa/Harare b/lib/pytz/zoneinfo/Africa/Harare
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Harare differ
diff --git a/lib/pytz/zoneinfo/Africa/Johannesburg b/lib/pytz/zoneinfo/Africa/Johannesburg
new file mode 100644
index 0000000..ddf3652
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Johannesburg differ
diff --git a/lib/pytz/zoneinfo/Africa/Juba b/lib/pytz/zoneinfo/Africa/Juba
new file mode 100644
index 0000000..3629188
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Juba differ
diff --git a/lib/pytz/zoneinfo/Africa/Kampala b/lib/pytz/zoneinfo/Africa/Kampala
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Kampala differ
diff --git a/lib/pytz/zoneinfo/Africa/Khartoum b/lib/pytz/zoneinfo/Africa/Khartoum
new file mode 100644
index 0000000..3629188
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Khartoum differ
diff --git a/lib/pytz/zoneinfo/Africa/Kigali b/lib/pytz/zoneinfo/Africa/Kigali
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Kigali differ
diff --git a/lib/pytz/zoneinfo/Africa/Kinshasa b/lib/pytz/zoneinfo/Africa/Kinshasa
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Kinshasa differ
diff --git a/lib/pytz/zoneinfo/Africa/Lagos b/lib/pytz/zoneinfo/Africa/Lagos
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Lagos differ
diff --git a/lib/pytz/zoneinfo/Africa/Libreville b/lib/pytz/zoneinfo/Africa/Libreville
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Libreville differ
diff --git a/lib/pytz/zoneinfo/Africa/Lome b/lib/pytz/zoneinfo/Africa/Lome
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Lome differ
diff --git a/lib/pytz/zoneinfo/Africa/Luanda b/lib/pytz/zoneinfo/Africa/Luanda
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Luanda differ
diff --git a/lib/pytz/zoneinfo/Africa/Lubumbashi b/lib/pytz/zoneinfo/Africa/Lubumbashi
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Lubumbashi differ
diff --git a/lib/pytz/zoneinfo/Africa/Lusaka b/lib/pytz/zoneinfo/Africa/Lusaka
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Lusaka differ
diff --git a/lib/pytz/zoneinfo/Africa/Malabo b/lib/pytz/zoneinfo/Africa/Malabo
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Malabo differ
diff --git a/lib/pytz/zoneinfo/Africa/Maputo b/lib/pytz/zoneinfo/Africa/Maputo
new file mode 100644
index 0000000..5b871db
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Maputo differ
diff --git a/lib/pytz/zoneinfo/Africa/Maseru b/lib/pytz/zoneinfo/Africa/Maseru
new file mode 100644
index 0000000..ddf3652
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Maseru differ
diff --git a/lib/pytz/zoneinfo/Africa/Mbabane b/lib/pytz/zoneinfo/Africa/Mbabane
new file mode 100644
index 0000000..ddf3652
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Mbabane differ
diff --git a/lib/pytz/zoneinfo/Africa/Mogadishu b/lib/pytz/zoneinfo/Africa/Mogadishu
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Mogadishu differ
diff --git a/lib/pytz/zoneinfo/Africa/Monrovia b/lib/pytz/zoneinfo/Africa/Monrovia
new file mode 100644
index 0000000..0f2294e
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Monrovia differ
diff --git a/lib/pytz/zoneinfo/Africa/Nairobi b/lib/pytz/zoneinfo/Africa/Nairobi
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Nairobi differ
diff --git a/lib/pytz/zoneinfo/Africa/Ndjamena b/lib/pytz/zoneinfo/Africa/Ndjamena
new file mode 100644
index 0000000..bbfe19d
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Ndjamena differ
diff --git a/lib/pytz/zoneinfo/Africa/Niamey b/lib/pytz/zoneinfo/Africa/Niamey
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Niamey differ
diff --git a/lib/pytz/zoneinfo/Africa/Nouakchott b/lib/pytz/zoneinfo/Africa/Nouakchott
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Nouakchott differ
diff --git a/lib/pytz/zoneinfo/Africa/Ouagadougou b/lib/pytz/zoneinfo/Africa/Ouagadougou
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Ouagadougou differ
diff --git a/lib/pytz/zoneinfo/Africa/Porto-Novo b/lib/pytz/zoneinfo/Africa/Porto-Novo
new file mode 100644
index 0000000..b1c97cc
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Porto-Novo differ
diff --git a/lib/pytz/zoneinfo/Africa/Sao_Tome b/lib/pytz/zoneinfo/Africa/Sao_Tome
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Sao_Tome differ
diff --git a/lib/pytz/zoneinfo/Africa/Timbuktu b/lib/pytz/zoneinfo/Africa/Timbuktu
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Timbuktu differ
diff --git a/lib/pytz/zoneinfo/Africa/Tripoli b/lib/pytz/zoneinfo/Africa/Tripoli
new file mode 100644
index 0000000..b32e220
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Tripoli differ
diff --git a/lib/pytz/zoneinfo/Africa/Tunis b/lib/pytz/zoneinfo/Africa/Tunis
new file mode 100644
index 0000000..4bd3885
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Tunis differ
diff --git a/lib/pytz/zoneinfo/Africa/Windhoek b/lib/pytz/zoneinfo/Africa/Windhoek
new file mode 100644
index 0000000..33bdfdf
Binary files /dev/null and b/lib/pytz/zoneinfo/Africa/Windhoek differ
diff --git a/lib/pytz/zoneinfo/America/Adak b/lib/pytz/zoneinfo/America/Adak
new file mode 100644
index 0000000..b0a5dd6
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Adak differ
diff --git a/lib/pytz/zoneinfo/America/Anchorage b/lib/pytz/zoneinfo/America/Anchorage
new file mode 100644
index 0000000..a4627ca
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Anchorage differ
diff --git a/lib/pytz/zoneinfo/America/Anguilla b/lib/pytz/zoneinfo/America/Anguilla
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Anguilla differ
diff --git a/lib/pytz/zoneinfo/America/Antigua b/lib/pytz/zoneinfo/America/Antigua
new file mode 100644
index 0000000..66ab147
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Antigua differ
diff --git a/lib/pytz/zoneinfo/America/Araguaina b/lib/pytz/zoneinfo/America/Araguaina
new file mode 100644
index 0000000..507ea46
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Araguaina differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires b/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires
new file mode 100644
index 0000000..a1fae8c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Catamarca b/lib/pytz/zoneinfo/America/Argentina/Catamarca
new file mode 100644
index 0000000..7cbc9f4
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Catamarca differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia b/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia
new file mode 100644
index 0000000..7cbc9f4
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Cordoba b/lib/pytz/zoneinfo/America/Argentina/Cordoba
new file mode 100644
index 0000000..cd97a24
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Cordoba differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Jujuy b/lib/pytz/zoneinfo/America/Argentina/Jujuy
new file mode 100644
index 0000000..7be3eeb
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Jujuy differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/La_Rioja b/lib/pytz/zoneinfo/America/Argentina/La_Rioja
new file mode 100644
index 0000000..1296ed4
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/La_Rioja differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Mendoza b/lib/pytz/zoneinfo/America/Argentina/Mendoza
new file mode 100644
index 0000000..f9eb526
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Mendoza differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos b/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos
new file mode 100644
index 0000000..8fd203d
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Salta b/lib/pytz/zoneinfo/America/Argentina/Salta
new file mode 100644
index 0000000..5778059
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Salta differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/San_Juan b/lib/pytz/zoneinfo/America/Argentina/San_Juan
new file mode 100644
index 0000000..8670279
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/San_Juan differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/San_Luis b/lib/pytz/zoneinfo/America/Argentina/San_Luis
new file mode 100644
index 0000000..51eb1d8
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/San_Luis differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Tucuman b/lib/pytz/zoneinfo/America/Argentina/Tucuman
new file mode 100644
index 0000000..694093e
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Tucuman differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Ushuaia b/lib/pytz/zoneinfo/America/Argentina/Ushuaia
new file mode 100644
index 0000000..dc42621
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Argentina/Ushuaia differ
diff --git a/lib/pytz/zoneinfo/America/Aruba b/lib/pytz/zoneinfo/America/Aruba
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Aruba differ
diff --git a/lib/pytz/zoneinfo/America/Asuncion b/lib/pytz/zoneinfo/America/Asuncion
new file mode 100644
index 0000000..79541fd
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Asuncion differ
diff --git a/lib/pytz/zoneinfo/America/Atikokan b/lib/pytz/zoneinfo/America/Atikokan
new file mode 100644
index 0000000..5708b55
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Atikokan differ
diff --git a/lib/pytz/zoneinfo/America/Atka b/lib/pytz/zoneinfo/America/Atka
new file mode 100644
index 0000000..b0a5dd6
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Atka differ
diff --git a/lib/pytz/zoneinfo/America/Bahia b/lib/pytz/zoneinfo/America/Bahia
new file mode 100644
index 0000000..3b59958
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Bahia differ
diff --git a/lib/pytz/zoneinfo/America/Bahia_Banderas b/lib/pytz/zoneinfo/America/Bahia_Banderas
new file mode 100644
index 0000000..21e2b71
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Bahia_Banderas differ
diff --git a/lib/pytz/zoneinfo/America/Barbados b/lib/pytz/zoneinfo/America/Barbados
new file mode 100644
index 0000000..6339936
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Barbados differ
diff --git a/lib/pytz/zoneinfo/America/Belem b/lib/pytz/zoneinfo/America/Belem
new file mode 100644
index 0000000..d85c0f7
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Belem differ
diff --git a/lib/pytz/zoneinfo/America/Belize b/lib/pytz/zoneinfo/America/Belize
new file mode 100644
index 0000000..eada52e
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Belize differ
diff --git a/lib/pytz/zoneinfo/America/Blanc-Sablon b/lib/pytz/zoneinfo/America/Blanc-Sablon
new file mode 100644
index 0000000..abcde7d
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Blanc-Sablon differ
diff --git a/lib/pytz/zoneinfo/America/Boa_Vista b/lib/pytz/zoneinfo/America/Boa_Vista
new file mode 100644
index 0000000..2466a25
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Boa_Vista differ
diff --git a/lib/pytz/zoneinfo/America/Bogota b/lib/pytz/zoneinfo/America/Bogota
new file mode 100644
index 0000000..7a5a445
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Bogota differ
diff --git a/lib/pytz/zoneinfo/America/Boise b/lib/pytz/zoneinfo/America/Boise
new file mode 100644
index 0000000..ada6d64
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Boise differ
diff --git a/lib/pytz/zoneinfo/America/Buenos_Aires b/lib/pytz/zoneinfo/America/Buenos_Aires
new file mode 100644
index 0000000..a1fae8c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Buenos_Aires differ
diff --git a/lib/pytz/zoneinfo/America/Cambridge_Bay b/lib/pytz/zoneinfo/America/Cambridge_Bay
new file mode 100644
index 0000000..58e21ba
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Cambridge_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Campo_Grande b/lib/pytz/zoneinfo/America/Campo_Grande
new file mode 100644
index 0000000..d810ae5
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Campo_Grande differ
diff --git a/lib/pytz/zoneinfo/America/Cancun b/lib/pytz/zoneinfo/America/Cancun
new file mode 100644
index 0000000..a99eedd
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Cancun differ
diff --git a/lib/pytz/zoneinfo/America/Caracas b/lib/pytz/zoneinfo/America/Caracas
new file mode 100644
index 0000000..15b9a52
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Caracas differ
diff --git a/lib/pytz/zoneinfo/America/Catamarca b/lib/pytz/zoneinfo/America/Catamarca
new file mode 100644
index 0000000..7cbc9f4
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Catamarca differ
diff --git a/lib/pytz/zoneinfo/America/Cayenne b/lib/pytz/zoneinfo/America/Cayenne
new file mode 100644
index 0000000..bffe9b0
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Cayenne differ
diff --git a/lib/pytz/zoneinfo/America/Cayman b/lib/pytz/zoneinfo/America/Cayman
new file mode 100644
index 0000000..0eb14b7
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Cayman differ
diff --git a/lib/pytz/zoneinfo/America/Chicago b/lib/pytz/zoneinfo/America/Chicago
new file mode 100644
index 0000000..3dd8f0f
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Chicago differ
diff --git a/lib/pytz/zoneinfo/America/Chihuahua b/lib/pytz/zoneinfo/America/Chihuahua
new file mode 100644
index 0000000..e3adbdb
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Chihuahua differ
diff --git a/lib/pytz/zoneinfo/America/Coral_Harbour b/lib/pytz/zoneinfo/America/Coral_Harbour
new file mode 100644
index 0000000..5708b55
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Coral_Harbour differ
diff --git a/lib/pytz/zoneinfo/America/Cordoba b/lib/pytz/zoneinfo/America/Cordoba
new file mode 100644
index 0000000..cd97a24
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Cordoba differ
diff --git a/lib/pytz/zoneinfo/America/Costa_Rica b/lib/pytz/zoneinfo/America/Costa_Rica
new file mode 100644
index 0000000..c247133
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Costa_Rica differ
diff --git a/lib/pytz/zoneinfo/America/Creston b/lib/pytz/zoneinfo/America/Creston
new file mode 100644
index 0000000..798f627
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Creston differ
diff --git a/lib/pytz/zoneinfo/America/Cuiaba b/lib/pytz/zoneinfo/America/Cuiaba
new file mode 100644
index 0000000..e3aec8c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Cuiaba differ
diff --git a/lib/pytz/zoneinfo/America/Curacao b/lib/pytz/zoneinfo/America/Curacao
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Curacao differ
diff --git a/lib/pytz/zoneinfo/America/Danmarkshavn b/lib/pytz/zoneinfo/America/Danmarkshavn
new file mode 100644
index 0000000..a8b58ad
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Danmarkshavn differ
diff --git a/lib/pytz/zoneinfo/America/Dawson b/lib/pytz/zoneinfo/America/Dawson
new file mode 100644
index 0000000..61c9688
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Dawson differ
diff --git a/lib/pytz/zoneinfo/America/Dawson_Creek b/lib/pytz/zoneinfo/America/Dawson_Creek
new file mode 100644
index 0000000..78f9076
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Dawson_Creek differ
diff --git a/lib/pytz/zoneinfo/America/Denver b/lib/pytz/zoneinfo/America/Denver
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Denver differ
diff --git a/lib/pytz/zoneinfo/America/Detroit b/lib/pytz/zoneinfo/America/Detroit
new file mode 100644
index 0000000..a123b33
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Detroit differ
diff --git a/lib/pytz/zoneinfo/America/Dominica b/lib/pytz/zoneinfo/America/Dominica
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Dominica differ
diff --git a/lib/pytz/zoneinfo/America/Edmonton b/lib/pytz/zoneinfo/America/Edmonton
new file mode 100644
index 0000000..d02fbcd
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Edmonton differ
diff --git a/lib/pytz/zoneinfo/America/Eirunepe b/lib/pytz/zoneinfo/America/Eirunepe
new file mode 100644
index 0000000..3359731
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Eirunepe differ
diff --git a/lib/pytz/zoneinfo/America/El_Salvador b/lib/pytz/zoneinfo/America/El_Salvador
new file mode 100644
index 0000000..9b8bc7a
Binary files /dev/null and b/lib/pytz/zoneinfo/America/El_Salvador differ
diff --git a/lib/pytz/zoneinfo/America/Ensenada b/lib/pytz/zoneinfo/America/Ensenada
new file mode 100644
index 0000000..1387475
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Ensenada differ
diff --git a/lib/pytz/zoneinfo/America/Fort_Wayne b/lib/pytz/zoneinfo/America/Fort_Wayne
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Fort_Wayne differ
diff --git a/lib/pytz/zoneinfo/America/Fortaleza b/lib/pytz/zoneinfo/America/Fortaleza
new file mode 100644
index 0000000..c0bcf4d
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Fortaleza differ
diff --git a/lib/pytz/zoneinfo/America/Glace_Bay b/lib/pytz/zoneinfo/America/Glace_Bay
new file mode 100644
index 0000000..f58522b
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Glace_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Godthab b/lib/pytz/zoneinfo/America/Godthab
new file mode 100644
index 0000000..111d9a8
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Godthab differ
diff --git a/lib/pytz/zoneinfo/America/Goose_Bay b/lib/pytz/zoneinfo/America/Goose_Bay
new file mode 100644
index 0000000..b4b945e
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Goose_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Grand_Turk b/lib/pytz/zoneinfo/America/Grand_Turk
new file mode 100644
index 0000000..331aeac
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Grand_Turk differ
diff --git a/lib/pytz/zoneinfo/America/Grenada b/lib/pytz/zoneinfo/America/Grenada
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Grenada differ
diff --git a/lib/pytz/zoneinfo/America/Guadeloupe b/lib/pytz/zoneinfo/America/Guadeloupe
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Guadeloupe differ
diff --git a/lib/pytz/zoneinfo/America/Guatemala b/lib/pytz/zoneinfo/America/Guatemala
new file mode 100644
index 0000000..abf943b
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Guatemala differ
diff --git a/lib/pytz/zoneinfo/America/Guayaquil b/lib/pytz/zoneinfo/America/Guayaquil
new file mode 100644
index 0000000..0828904
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Guayaquil differ
diff --git a/lib/pytz/zoneinfo/America/Guyana b/lib/pytz/zoneinfo/America/Guyana
new file mode 100644
index 0000000..036dbe0
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Guyana differ
diff --git a/lib/pytz/zoneinfo/America/Halifax b/lib/pytz/zoneinfo/America/Halifax
new file mode 100644
index 0000000..f86ece4
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Halifax differ
diff --git a/lib/pytz/zoneinfo/America/Havana b/lib/pytz/zoneinfo/America/Havana
new file mode 100644
index 0000000..1a58fcd
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Havana differ
diff --git a/lib/pytz/zoneinfo/America/Hermosillo b/lib/pytz/zoneinfo/America/Hermosillo
new file mode 100644
index 0000000..ec435c2
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Hermosillo differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Indianapolis b/lib/pytz/zoneinfo/America/Indiana/Indianapolis
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Indianapolis differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Knox b/lib/pytz/zoneinfo/America/Indiana/Knox
new file mode 100644
index 0000000..cc785da
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Knox differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Marengo b/lib/pytz/zoneinfo/America/Indiana/Marengo
new file mode 100644
index 0000000..a23d7b7
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Marengo differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Petersburg b/lib/pytz/zoneinfo/America/Indiana/Petersburg
new file mode 100644
index 0000000..f16cb30
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Petersburg differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Tell_City b/lib/pytz/zoneinfo/America/Indiana/Tell_City
new file mode 100644
index 0000000..0250bf9
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Tell_City differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Vevay b/lib/pytz/zoneinfo/America/Indiana/Vevay
new file mode 100644
index 0000000..e934de6
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Vevay differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Vincennes b/lib/pytz/zoneinfo/America/Indiana/Vincennes
new file mode 100644
index 0000000..adbdbee
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Vincennes differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Winamac b/lib/pytz/zoneinfo/America/Indiana/Winamac
new file mode 100644
index 0000000..b34f7b2
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indiana/Winamac differ
diff --git a/lib/pytz/zoneinfo/America/Indianapolis b/lib/pytz/zoneinfo/America/Indianapolis
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Indianapolis differ
diff --git a/lib/pytz/zoneinfo/America/Inuvik b/lib/pytz/zoneinfo/America/Inuvik
new file mode 100644
index 0000000..077fad4
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Inuvik differ
diff --git a/lib/pytz/zoneinfo/America/Iqaluit b/lib/pytz/zoneinfo/America/Iqaluit
new file mode 100644
index 0000000..e67b71f
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Iqaluit differ
diff --git a/lib/pytz/zoneinfo/America/Jamaica b/lib/pytz/zoneinfo/America/Jamaica
new file mode 100644
index 0000000..006689b
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Jamaica differ
diff --git a/lib/pytz/zoneinfo/America/Jujuy b/lib/pytz/zoneinfo/America/Jujuy
new file mode 100644
index 0000000..7be3eeb
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Jujuy differ
diff --git a/lib/pytz/zoneinfo/America/Juneau b/lib/pytz/zoneinfo/America/Juneau
new file mode 100644
index 0000000..ade50a8
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Juneau differ
diff --git a/lib/pytz/zoneinfo/America/Kentucky/Louisville b/lib/pytz/zoneinfo/America/Kentucky/Louisville
new file mode 100644
index 0000000..fdf2e88
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Kentucky/Louisville differ
diff --git a/lib/pytz/zoneinfo/America/Kentucky/Monticello b/lib/pytz/zoneinfo/America/Kentucky/Monticello
new file mode 100644
index 0000000..60991aa
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Kentucky/Monticello differ
diff --git a/lib/pytz/zoneinfo/America/Knox_IN b/lib/pytz/zoneinfo/America/Knox_IN
new file mode 100644
index 0000000..cc785da
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Knox_IN differ
diff --git a/lib/pytz/zoneinfo/America/Kralendijk b/lib/pytz/zoneinfo/America/Kralendijk
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Kralendijk differ
diff --git a/lib/pytz/zoneinfo/America/La_Paz b/lib/pytz/zoneinfo/America/La_Paz
new file mode 100644
index 0000000..cedf0b3
Binary files /dev/null and b/lib/pytz/zoneinfo/America/La_Paz differ
diff --git a/lib/pytz/zoneinfo/America/Lima b/lib/pytz/zoneinfo/America/Lima
new file mode 100644
index 0000000..789fa5c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Lima differ
diff --git a/lib/pytz/zoneinfo/America/Los_Angeles b/lib/pytz/zoneinfo/America/Los_Angeles
new file mode 100644
index 0000000..1fa9149
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Los_Angeles differ
diff --git a/lib/pytz/zoneinfo/America/Louisville b/lib/pytz/zoneinfo/America/Louisville
new file mode 100644
index 0000000..fdf2e88
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Louisville differ
diff --git a/lib/pytz/zoneinfo/America/Lower_Princes b/lib/pytz/zoneinfo/America/Lower_Princes
new file mode 100644
index 0000000..05e77ab
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Lower_Princes differ
diff --git a/lib/pytz/zoneinfo/America/Maceio b/lib/pytz/zoneinfo/America/Maceio
new file mode 100644
index 0000000..de74990
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Maceio differ
diff --git a/lib/pytz/zoneinfo/America/Managua b/lib/pytz/zoneinfo/America/Managua
new file mode 100644
index 0000000..c543ffd
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Managua differ
diff --git a/lib/pytz/zoneinfo/America/Manaus b/lib/pytz/zoneinfo/America/Manaus
new file mode 100644
index 0000000..e0222f1
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Manaus differ
diff --git a/lib/pytz/zoneinfo/America/Marigot b/lib/pytz/zoneinfo/America/Marigot
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Marigot differ
diff --git a/lib/pytz/zoneinfo/America/Martinique b/lib/pytz/zoneinfo/America/Martinique
new file mode 100644
index 0000000..f9e2399
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Martinique differ
diff --git a/lib/pytz/zoneinfo/America/Matamoros b/lib/pytz/zoneinfo/America/Matamoros
new file mode 100644
index 0000000..5671d25
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Matamoros differ
diff --git a/lib/pytz/zoneinfo/America/Mazatlan b/lib/pytz/zoneinfo/America/Mazatlan
new file mode 100644
index 0000000..afa94c2
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Mazatlan differ
diff --git a/lib/pytz/zoneinfo/America/Mendoza b/lib/pytz/zoneinfo/America/Mendoza
new file mode 100644
index 0000000..f9eb526
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Mendoza differ
diff --git a/lib/pytz/zoneinfo/America/Menominee b/lib/pytz/zoneinfo/America/Menominee
new file mode 100644
index 0000000..55d6e32
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Menominee differ
diff --git a/lib/pytz/zoneinfo/America/Merida b/lib/pytz/zoneinfo/America/Merida
new file mode 100644
index 0000000..ecc1856
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Merida differ
diff --git a/lib/pytz/zoneinfo/America/Metlakatla b/lib/pytz/zoneinfo/America/Metlakatla
new file mode 100644
index 0000000..e66cc34
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Metlakatla differ
diff --git a/lib/pytz/zoneinfo/America/Mexico_City b/lib/pytz/zoneinfo/America/Mexico_City
new file mode 100644
index 0000000..f11e3d2
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Mexico_City differ
diff --git a/lib/pytz/zoneinfo/America/Miquelon b/lib/pytz/zoneinfo/America/Miquelon
new file mode 100644
index 0000000..36f6696
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Miquelon differ
diff --git a/lib/pytz/zoneinfo/America/Moncton b/lib/pytz/zoneinfo/America/Moncton
new file mode 100644
index 0000000..51cb1ba
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Moncton differ
diff --git a/lib/pytz/zoneinfo/America/Monterrey b/lib/pytz/zoneinfo/America/Monterrey
new file mode 100644
index 0000000..dcac92b
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Monterrey differ
diff --git a/lib/pytz/zoneinfo/America/Montevideo b/lib/pytz/zoneinfo/America/Montevideo
new file mode 100644
index 0000000..ab3d680
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Montevideo differ
diff --git a/lib/pytz/zoneinfo/America/Montreal b/lib/pytz/zoneinfo/America/Montreal
new file mode 100644
index 0000000..89b9f49
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Montreal differ
diff --git a/lib/pytz/zoneinfo/America/Montserrat b/lib/pytz/zoneinfo/America/Montserrat
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Montserrat differ
diff --git a/lib/pytz/zoneinfo/America/Nassau b/lib/pytz/zoneinfo/America/Nassau
new file mode 100644
index 0000000..e5d0289
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Nassau differ
diff --git a/lib/pytz/zoneinfo/America/New_York b/lib/pytz/zoneinfo/America/New_York
new file mode 100644
index 0000000..7553fee
Binary files /dev/null and b/lib/pytz/zoneinfo/America/New_York differ
diff --git a/lib/pytz/zoneinfo/America/Nipigon b/lib/pytz/zoneinfo/America/Nipigon
new file mode 100644
index 0000000..f8a0292
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Nipigon differ
diff --git a/lib/pytz/zoneinfo/America/Nome b/lib/pytz/zoneinfo/America/Nome
new file mode 100644
index 0000000..d370ab1
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Nome differ
diff --git a/lib/pytz/zoneinfo/America/Noronha b/lib/pytz/zoneinfo/America/Noronha
new file mode 100644
index 0000000..774b14e
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Noronha differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/Beulah b/lib/pytz/zoneinfo/America/North_Dakota/Beulah
new file mode 100644
index 0000000..8174c88
Binary files /dev/null and b/lib/pytz/zoneinfo/America/North_Dakota/Beulah differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/Center b/lib/pytz/zoneinfo/America/North_Dakota/Center
new file mode 100644
index 0000000..8035b24
Binary files /dev/null and b/lib/pytz/zoneinfo/America/North_Dakota/Center differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/New_Salem b/lib/pytz/zoneinfo/America/North_Dakota/New_Salem
new file mode 100644
index 0000000..5b630ee
Binary files /dev/null and b/lib/pytz/zoneinfo/America/North_Dakota/New_Salem differ
diff --git a/lib/pytz/zoneinfo/America/Ojinaga b/lib/pytz/zoneinfo/America/Ojinaga
new file mode 100644
index 0000000..190c5c8
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Ojinaga differ
diff --git a/lib/pytz/zoneinfo/America/Panama b/lib/pytz/zoneinfo/America/Panama
new file mode 100644
index 0000000..5c1c063
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Panama differ
diff --git a/lib/pytz/zoneinfo/America/Pangnirtung b/lib/pytz/zoneinfo/America/Pangnirtung
new file mode 100644
index 0000000..994da43
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Pangnirtung differ
diff --git a/lib/pytz/zoneinfo/America/Paramaribo b/lib/pytz/zoneinfo/America/Paramaribo
new file mode 100644
index 0000000..2f05b23
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Paramaribo differ
diff --git a/lib/pytz/zoneinfo/America/Phoenix b/lib/pytz/zoneinfo/America/Phoenix
new file mode 100644
index 0000000..adf2823
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Phoenix differ
diff --git a/lib/pytz/zoneinfo/America/Port-au-Prince b/lib/pytz/zoneinfo/America/Port-au-Prince
new file mode 100644
index 0000000..dd8895c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Port-au-Prince differ
diff --git a/lib/pytz/zoneinfo/America/Port_of_Spain b/lib/pytz/zoneinfo/America/Port_of_Spain
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Port_of_Spain differ
diff --git a/lib/pytz/zoneinfo/America/Porto_Acre b/lib/pytz/zoneinfo/America/Porto_Acre
new file mode 100644
index 0000000..788d0e9
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Porto_Acre differ
diff --git a/lib/pytz/zoneinfo/America/Porto_Velho b/lib/pytz/zoneinfo/America/Porto_Velho
new file mode 100644
index 0000000..aa8cf31
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Porto_Velho differ
diff --git a/lib/pytz/zoneinfo/America/Puerto_Rico b/lib/pytz/zoneinfo/America/Puerto_Rico
new file mode 100644
index 0000000..d4525a6
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Puerto_Rico differ
diff --git a/lib/pytz/zoneinfo/America/Rainy_River b/lib/pytz/zoneinfo/America/Rainy_River
new file mode 100644
index 0000000..70dcd2d
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Rainy_River differ
diff --git a/lib/pytz/zoneinfo/America/Rankin_Inlet b/lib/pytz/zoneinfo/America/Rankin_Inlet
new file mode 100644
index 0000000..cc15d83
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Rankin_Inlet differ
diff --git a/lib/pytz/zoneinfo/America/Recife b/lib/pytz/zoneinfo/America/Recife
new file mode 100644
index 0000000..f0ad7b9
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Recife differ
diff --git a/lib/pytz/zoneinfo/America/Regina b/lib/pytz/zoneinfo/America/Regina
new file mode 100644
index 0000000..5fe8d6b
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Regina differ
diff --git a/lib/pytz/zoneinfo/America/Resolute b/lib/pytz/zoneinfo/America/Resolute
new file mode 100644
index 0000000..5307941
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Resolute differ
diff --git a/lib/pytz/zoneinfo/America/Rio_Branco b/lib/pytz/zoneinfo/America/Rio_Branco
new file mode 100644
index 0000000..788d0e9
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Rio_Branco differ
diff --git a/lib/pytz/zoneinfo/America/Rosario b/lib/pytz/zoneinfo/America/Rosario
new file mode 100644
index 0000000..cd97a24
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Rosario differ
diff --git a/lib/pytz/zoneinfo/America/Santa_Isabel b/lib/pytz/zoneinfo/America/Santa_Isabel
new file mode 100644
index 0000000..e1c4d16
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Santa_Isabel differ
diff --git a/lib/pytz/zoneinfo/America/Santarem b/lib/pytz/zoneinfo/America/Santarem
new file mode 100644
index 0000000..bb469d3
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Santarem differ
diff --git a/lib/pytz/zoneinfo/America/Santiago b/lib/pytz/zoneinfo/America/Santiago
new file mode 100644
index 0000000..92cf559
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Santiago differ
diff --git a/lib/pytz/zoneinfo/America/Santo_Domingo b/lib/pytz/zoneinfo/America/Santo_Domingo
new file mode 100644
index 0000000..77eab31
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Santo_Domingo differ
diff --git a/lib/pytz/zoneinfo/America/Sao_Paulo b/lib/pytz/zoneinfo/America/Sao_Paulo
new file mode 100644
index 0000000..552ce7c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Sao_Paulo differ
diff --git a/lib/pytz/zoneinfo/America/Scoresbysund b/lib/pytz/zoneinfo/America/Scoresbysund
new file mode 100644
index 0000000..85676ca
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Scoresbysund differ
diff --git a/lib/pytz/zoneinfo/America/Shiprock b/lib/pytz/zoneinfo/America/Shiprock
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Shiprock differ
diff --git a/lib/pytz/zoneinfo/America/Sitka b/lib/pytz/zoneinfo/America/Sitka
new file mode 100644
index 0000000..48fc6af
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Sitka differ
diff --git a/lib/pytz/zoneinfo/America/St_Barthelemy b/lib/pytz/zoneinfo/America/St_Barthelemy
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/St_Barthelemy differ
diff --git a/lib/pytz/zoneinfo/America/St_Johns b/lib/pytz/zoneinfo/America/St_Johns
new file mode 100644
index 0000000..a1d1485
Binary files /dev/null and b/lib/pytz/zoneinfo/America/St_Johns differ
diff --git a/lib/pytz/zoneinfo/America/St_Kitts b/lib/pytz/zoneinfo/America/St_Kitts
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/St_Kitts differ
diff --git a/lib/pytz/zoneinfo/America/St_Lucia b/lib/pytz/zoneinfo/America/St_Lucia
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/St_Lucia differ
diff --git a/lib/pytz/zoneinfo/America/St_Thomas b/lib/pytz/zoneinfo/America/St_Thomas
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/St_Thomas differ
diff --git a/lib/pytz/zoneinfo/America/St_Vincent b/lib/pytz/zoneinfo/America/St_Vincent
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/St_Vincent differ
diff --git a/lib/pytz/zoneinfo/America/Swift_Current b/lib/pytz/zoneinfo/America/Swift_Current
new file mode 100644
index 0000000..4db1300
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Swift_Current differ
diff --git a/lib/pytz/zoneinfo/America/Tegucigalpa b/lib/pytz/zoneinfo/America/Tegucigalpa
new file mode 100644
index 0000000..7aea8f9
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Tegucigalpa differ
diff --git a/lib/pytz/zoneinfo/America/Thule b/lib/pytz/zoneinfo/America/Thule
new file mode 100644
index 0000000..deefcc8
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Thule differ
diff --git a/lib/pytz/zoneinfo/America/Thunder_Bay b/lib/pytz/zoneinfo/America/Thunder_Bay
new file mode 100644
index 0000000..aa1d486
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Thunder_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Tijuana b/lib/pytz/zoneinfo/America/Tijuana
new file mode 100644
index 0000000..1387475
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Tijuana differ
diff --git a/lib/pytz/zoneinfo/America/Toronto b/lib/pytz/zoneinfo/America/Toronto
new file mode 100644
index 0000000..7b4682a
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Toronto differ
diff --git a/lib/pytz/zoneinfo/America/Tortola b/lib/pytz/zoneinfo/America/Tortola
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Tortola differ
diff --git a/lib/pytz/zoneinfo/America/Vancouver b/lib/pytz/zoneinfo/America/Vancouver
new file mode 100644
index 0000000..9b5d924
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Vancouver differ
diff --git a/lib/pytz/zoneinfo/America/Virgin b/lib/pytz/zoneinfo/America/Virgin
new file mode 100644
index 0000000..447efbe
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Virgin differ
diff --git a/lib/pytz/zoneinfo/America/Whitehorse b/lib/pytz/zoneinfo/America/Whitehorse
new file mode 100644
index 0000000..8604c5c
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Whitehorse differ
diff --git a/lib/pytz/zoneinfo/America/Winnipeg b/lib/pytz/zoneinfo/America/Winnipeg
new file mode 100644
index 0000000..2ffe3d8
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Winnipeg differ
diff --git a/lib/pytz/zoneinfo/America/Yakutat b/lib/pytz/zoneinfo/America/Yakutat
new file mode 100644
index 0000000..f3d7399
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Yakutat differ
diff --git a/lib/pytz/zoneinfo/America/Yellowknife b/lib/pytz/zoneinfo/America/Yellowknife
new file mode 100644
index 0000000..21cba6e
Binary files /dev/null and b/lib/pytz/zoneinfo/America/Yellowknife differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Casey b/lib/pytz/zoneinfo/Antarctica/Casey
new file mode 100644
index 0000000..c2a9905
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Casey differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Davis b/lib/pytz/zoneinfo/Antarctica/Davis
new file mode 100644
index 0000000..7321c67
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Davis differ
diff --git a/lib/pytz/zoneinfo/Antarctica/DumontDUrville b/lib/pytz/zoneinfo/Antarctica/DumontDUrville
new file mode 100644
index 0000000..c406b8d
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/DumontDUrville differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Macquarie b/lib/pytz/zoneinfo/Antarctica/Macquarie
new file mode 100644
index 0000000..fc7b96f
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Macquarie differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Mawson b/lib/pytz/zoneinfo/Antarctica/Mawson
new file mode 100644
index 0000000..6c5b0fa
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Mawson differ
diff --git a/lib/pytz/zoneinfo/Antarctica/McMurdo b/lib/pytz/zoneinfo/Antarctica/McMurdo
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/McMurdo differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Palmer b/lib/pytz/zoneinfo/Antarctica/Palmer
new file mode 100644
index 0000000..9e9cdd0
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Palmer differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Rothera b/lib/pytz/zoneinfo/Antarctica/Rothera
new file mode 100644
index 0000000..28f82ba
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Rothera differ
diff --git a/lib/pytz/zoneinfo/Antarctica/South_Pole b/lib/pytz/zoneinfo/Antarctica/South_Pole
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/South_Pole differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Syowa b/lib/pytz/zoneinfo/Antarctica/Syowa
new file mode 100644
index 0000000..b837b07
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Syowa differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Troll b/lib/pytz/zoneinfo/Antarctica/Troll
new file mode 100644
index 0000000..d973a12
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Troll differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Vostok b/lib/pytz/zoneinfo/Antarctica/Vostok
new file mode 100644
index 0000000..cbec909
Binary files /dev/null and b/lib/pytz/zoneinfo/Antarctica/Vostok differ
diff --git a/lib/pytz/zoneinfo/Arctic/Longyearbyen b/lib/pytz/zoneinfo/Arctic/Longyearbyen
new file mode 100644
index 0000000..239c017
Binary files /dev/null and b/lib/pytz/zoneinfo/Arctic/Longyearbyen differ
diff --git a/lib/pytz/zoneinfo/Asia/Aden b/lib/pytz/zoneinfo/Asia/Aden
new file mode 100644
index 0000000..505e1d2
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Aden differ
diff --git a/lib/pytz/zoneinfo/Asia/Almaty b/lib/pytz/zoneinfo/Asia/Almaty
new file mode 100644
index 0000000..75a007d
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Almaty differ
diff --git a/lib/pytz/zoneinfo/Asia/Amman b/lib/pytz/zoneinfo/Asia/Amman
new file mode 100644
index 0000000..c3f0994
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Amman differ
diff --git a/lib/pytz/zoneinfo/Asia/Anadyr b/lib/pytz/zoneinfo/Asia/Anadyr
new file mode 100644
index 0000000..766594b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Anadyr differ
diff --git a/lib/pytz/zoneinfo/Asia/Aqtau b/lib/pytz/zoneinfo/Asia/Aqtau
new file mode 100644
index 0000000..811ed2f
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Aqtau differ
diff --git a/lib/pytz/zoneinfo/Asia/Aqtobe b/lib/pytz/zoneinfo/Asia/Aqtobe
new file mode 100644
index 0000000..ff3b96b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Aqtobe differ
diff --git a/lib/pytz/zoneinfo/Asia/Ashgabat b/lib/pytz/zoneinfo/Asia/Ashgabat
new file mode 100644
index 0000000..f79fe04
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ashgabat differ
diff --git a/lib/pytz/zoneinfo/Asia/Ashkhabad b/lib/pytz/zoneinfo/Asia/Ashkhabad
new file mode 100644
index 0000000..f79fe04
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ashkhabad differ
diff --git a/lib/pytz/zoneinfo/Asia/Baghdad b/lib/pytz/zoneinfo/Asia/Baghdad
new file mode 100644
index 0000000..f0a96ec
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Baghdad differ
diff --git a/lib/pytz/zoneinfo/Asia/Bahrain b/lib/pytz/zoneinfo/Asia/Bahrain
new file mode 100644
index 0000000..cda04a1
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Bahrain differ
diff --git a/lib/pytz/zoneinfo/Asia/Baku b/lib/pytz/zoneinfo/Asia/Baku
new file mode 100644
index 0000000..f78e764
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Baku differ
diff --git a/lib/pytz/zoneinfo/Asia/Bangkok b/lib/pytz/zoneinfo/Asia/Bangkok
new file mode 100644
index 0000000..e8e7627
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Bangkok differ
diff --git a/lib/pytz/zoneinfo/Asia/Beirut b/lib/pytz/zoneinfo/Asia/Beirut
new file mode 100644
index 0000000..72f0896
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Beirut differ
diff --git a/lib/pytz/zoneinfo/Asia/Bishkek b/lib/pytz/zoneinfo/Asia/Bishkek
new file mode 100644
index 0000000..eee8278
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Bishkek differ
diff --git a/lib/pytz/zoneinfo/Asia/Brunei b/lib/pytz/zoneinfo/Asia/Brunei
new file mode 100644
index 0000000..1ac3115
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Brunei differ
diff --git a/lib/pytz/zoneinfo/Asia/Calcutta b/lib/pytz/zoneinfo/Asia/Calcutta
new file mode 100644
index 0000000..3c0d5ab
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Calcutta differ
diff --git a/lib/pytz/zoneinfo/Asia/Chita b/lib/pytz/zoneinfo/Asia/Chita
new file mode 100644
index 0000000..c090654
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Chita differ
diff --git a/lib/pytz/zoneinfo/Asia/Choibalsan b/lib/pytz/zoneinfo/Asia/Choibalsan
new file mode 100644
index 0000000..f099092
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Choibalsan differ
diff --git a/lib/pytz/zoneinfo/Asia/Chongqing b/lib/pytz/zoneinfo/Asia/Chongqing
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Chongqing differ
diff --git a/lib/pytz/zoneinfo/Asia/Chungking b/lib/pytz/zoneinfo/Asia/Chungking
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Chungking differ
diff --git a/lib/pytz/zoneinfo/Asia/Colombo b/lib/pytz/zoneinfo/Asia/Colombo
new file mode 100644
index 0000000..d10439a
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Colombo differ
diff --git a/lib/pytz/zoneinfo/Asia/Dacca b/lib/pytz/zoneinfo/Asia/Dacca
new file mode 100644
index 0000000..b6b326b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Dacca differ
diff --git a/lib/pytz/zoneinfo/Asia/Damascus b/lib/pytz/zoneinfo/Asia/Damascus
new file mode 100644
index 0000000..ac45764
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Damascus differ
diff --git a/lib/pytz/zoneinfo/Asia/Dhaka b/lib/pytz/zoneinfo/Asia/Dhaka
new file mode 100644
index 0000000..b6b326b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Dhaka differ
diff --git a/lib/pytz/zoneinfo/Asia/Dili b/lib/pytz/zoneinfo/Asia/Dili
new file mode 100644
index 0000000..8124fb7
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Dili differ
diff --git a/lib/pytz/zoneinfo/Asia/Dubai b/lib/pytz/zoneinfo/Asia/Dubai
new file mode 100644
index 0000000..415e443
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Dubai differ
diff --git a/lib/pytz/zoneinfo/Asia/Dushanbe b/lib/pytz/zoneinfo/Asia/Dushanbe
new file mode 100644
index 0000000..3b1e978
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Dushanbe differ
diff --git a/lib/pytz/zoneinfo/Asia/Gaza b/lib/pytz/zoneinfo/Asia/Gaza
new file mode 100644
index 0000000..bd683e8
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Gaza differ
diff --git a/lib/pytz/zoneinfo/Asia/Harbin b/lib/pytz/zoneinfo/Asia/Harbin
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Harbin differ
diff --git a/lib/pytz/zoneinfo/Asia/Hebron b/lib/pytz/zoneinfo/Asia/Hebron
new file mode 100644
index 0000000..0bc7674
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Hebron differ
diff --git a/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh b/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh
new file mode 100644
index 0000000..c142265
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh differ
diff --git a/lib/pytz/zoneinfo/Asia/Hong_Kong b/lib/pytz/zoneinfo/Asia/Hong_Kong
new file mode 100644
index 0000000..dc9058e
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Hong_Kong differ
diff --git a/lib/pytz/zoneinfo/Asia/Hovd b/lib/pytz/zoneinfo/Asia/Hovd
new file mode 100644
index 0000000..71c3cad
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Hovd differ
diff --git a/lib/pytz/zoneinfo/Asia/Irkutsk b/lib/pytz/zoneinfo/Asia/Irkutsk
new file mode 100644
index 0000000..1e94a47
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Irkutsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Istanbul b/lib/pytz/zoneinfo/Asia/Istanbul
new file mode 100644
index 0000000..d89aa3a
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Istanbul differ
diff --git a/lib/pytz/zoneinfo/Asia/Jakarta b/lib/pytz/zoneinfo/Asia/Jakarta
new file mode 100644
index 0000000..3130bff
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Jakarta differ
diff --git a/lib/pytz/zoneinfo/Asia/Jayapura b/lib/pytz/zoneinfo/Asia/Jayapura
new file mode 100644
index 0000000..a9d1217
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Jayapura differ
diff --git a/lib/pytz/zoneinfo/Asia/Jerusalem b/lib/pytz/zoneinfo/Asia/Jerusalem
new file mode 100644
index 0000000..df51199
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Jerusalem differ
diff --git a/lib/pytz/zoneinfo/Asia/Kabul b/lib/pytz/zoneinfo/Asia/Kabul
new file mode 100644
index 0000000..266cc7e
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kabul differ
diff --git a/lib/pytz/zoneinfo/Asia/Kamchatka b/lib/pytz/zoneinfo/Asia/Kamchatka
new file mode 100644
index 0000000..a0541cf
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kamchatka differ
diff --git a/lib/pytz/zoneinfo/Asia/Karachi b/lib/pytz/zoneinfo/Asia/Karachi
new file mode 100644
index 0000000..6a6de1b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Karachi differ
diff --git a/lib/pytz/zoneinfo/Asia/Kashgar b/lib/pytz/zoneinfo/Asia/Kashgar
new file mode 100644
index 0000000..964a5c2
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kashgar differ
diff --git a/lib/pytz/zoneinfo/Asia/Kathmandu b/lib/pytz/zoneinfo/Asia/Kathmandu
new file mode 100644
index 0000000..2824709
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kathmandu differ
diff --git a/lib/pytz/zoneinfo/Asia/Katmandu b/lib/pytz/zoneinfo/Asia/Katmandu
new file mode 100644
index 0000000..2824709
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Katmandu differ
diff --git a/lib/pytz/zoneinfo/Asia/Khandyga b/lib/pytz/zoneinfo/Asia/Khandyga
new file mode 100644
index 0000000..26becb3
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Khandyga differ
diff --git a/lib/pytz/zoneinfo/Asia/Kolkata b/lib/pytz/zoneinfo/Asia/Kolkata
new file mode 100644
index 0000000..3c0d5ab
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kolkata differ
diff --git a/lib/pytz/zoneinfo/Asia/Krasnoyarsk b/lib/pytz/zoneinfo/Asia/Krasnoyarsk
new file mode 100644
index 0000000..3107809
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Krasnoyarsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuala_Lumpur b/lib/pytz/zoneinfo/Asia/Kuala_Lumpur
new file mode 100644
index 0000000..35b987d
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kuala_Lumpur differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuching b/lib/pytz/zoneinfo/Asia/Kuching
new file mode 100644
index 0000000..4f891db
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kuching differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuwait b/lib/pytz/zoneinfo/Asia/Kuwait
new file mode 100644
index 0000000..5623811
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Kuwait differ
diff --git a/lib/pytz/zoneinfo/Asia/Macao b/lib/pytz/zoneinfo/Asia/Macao
new file mode 100644
index 0000000..b8f9c36
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Macao differ
diff --git a/lib/pytz/zoneinfo/Asia/Macau b/lib/pytz/zoneinfo/Asia/Macau
new file mode 100644
index 0000000..b8f9c36
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Macau differ
diff --git a/lib/pytz/zoneinfo/Asia/Magadan b/lib/pytz/zoneinfo/Asia/Magadan
new file mode 100644
index 0000000..e09c4dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Magadan differ
diff --git a/lib/pytz/zoneinfo/Asia/Makassar b/lib/pytz/zoneinfo/Asia/Makassar
new file mode 100644
index 0000000..0d68923
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Makassar differ
diff --git a/lib/pytz/zoneinfo/Asia/Manila b/lib/pytz/zoneinfo/Asia/Manila
new file mode 100644
index 0000000..ac0f3a6
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Manila differ
diff --git a/lib/pytz/zoneinfo/Asia/Muscat b/lib/pytz/zoneinfo/Asia/Muscat
new file mode 100644
index 0000000..53a2219
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Muscat differ
diff --git a/lib/pytz/zoneinfo/Asia/Nicosia b/lib/pytz/zoneinfo/Asia/Nicosia
new file mode 100644
index 0000000..3e663b2
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Nicosia differ
diff --git a/lib/pytz/zoneinfo/Asia/Novokuznetsk b/lib/pytz/zoneinfo/Asia/Novokuznetsk
new file mode 100644
index 0000000..1176866
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Novokuznetsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Novosibirsk b/lib/pytz/zoneinfo/Asia/Novosibirsk
new file mode 100644
index 0000000..ed6d7dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Novosibirsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Omsk b/lib/pytz/zoneinfo/Asia/Omsk
new file mode 100644
index 0000000..760c391
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Omsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Oral b/lib/pytz/zoneinfo/Asia/Oral
new file mode 100644
index 0000000..1467caf
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Oral differ
diff --git a/lib/pytz/zoneinfo/Asia/Phnom_Penh b/lib/pytz/zoneinfo/Asia/Phnom_Penh
new file mode 100644
index 0000000..e8e7627
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Phnom_Penh differ
diff --git a/lib/pytz/zoneinfo/Asia/Pontianak b/lib/pytz/zoneinfo/Asia/Pontianak
new file mode 100644
index 0000000..dcd7014
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Pontianak differ
diff --git a/lib/pytz/zoneinfo/Asia/Pyongyang b/lib/pytz/zoneinfo/Asia/Pyongyang
new file mode 100644
index 0000000..b04bf74
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Pyongyang differ
diff --git a/lib/pytz/zoneinfo/Asia/Qatar b/lib/pytz/zoneinfo/Asia/Qatar
new file mode 100644
index 0000000..3e20373
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Qatar differ
diff --git a/lib/pytz/zoneinfo/Asia/Qyzylorda b/lib/pytz/zoneinfo/Asia/Qyzylorda
new file mode 100644
index 0000000..ce53516
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Qyzylorda differ
diff --git a/lib/pytz/zoneinfo/Asia/Rangoon b/lib/pytz/zoneinfo/Asia/Rangoon
new file mode 100644
index 0000000..934ca7e
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Rangoon differ
diff --git a/lib/pytz/zoneinfo/Asia/Riyadh b/lib/pytz/zoneinfo/Asia/Riyadh
new file mode 100644
index 0000000..c35e42a
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Riyadh differ
diff --git a/lib/pytz/zoneinfo/Asia/Saigon b/lib/pytz/zoneinfo/Asia/Saigon
new file mode 100644
index 0000000..c142265
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Saigon differ
diff --git a/lib/pytz/zoneinfo/Asia/Sakhalin b/lib/pytz/zoneinfo/Asia/Sakhalin
new file mode 100644
index 0000000..ec62afc
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Sakhalin differ
diff --git a/lib/pytz/zoneinfo/Asia/Samarkand b/lib/pytz/zoneinfo/Asia/Samarkand
new file mode 100644
index 0000000..65fb5b0
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Samarkand differ
diff --git a/lib/pytz/zoneinfo/Asia/Seoul b/lib/pytz/zoneinfo/Asia/Seoul
new file mode 100644
index 0000000..fd91d5b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Seoul differ
diff --git a/lib/pytz/zoneinfo/Asia/Shanghai b/lib/pytz/zoneinfo/Asia/Shanghai
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Shanghai differ
diff --git a/lib/pytz/zoneinfo/Asia/Singapore b/lib/pytz/zoneinfo/Asia/Singapore
new file mode 100644
index 0000000..9dd49cb
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Singapore differ
diff --git a/lib/pytz/zoneinfo/Asia/Srednekolymsk b/lib/pytz/zoneinfo/Asia/Srednekolymsk
new file mode 100644
index 0000000..0929f66
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Srednekolymsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Taipei b/lib/pytz/zoneinfo/Asia/Taipei
new file mode 100644
index 0000000..4810a0b
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Taipei differ
diff --git a/lib/pytz/zoneinfo/Asia/Tashkent b/lib/pytz/zoneinfo/Asia/Tashkent
new file mode 100644
index 0000000..1f59faa
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Tashkent differ
diff --git a/lib/pytz/zoneinfo/Asia/Tbilisi b/lib/pytz/zoneinfo/Asia/Tbilisi
new file mode 100644
index 0000000..0d7081e
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Tbilisi differ
diff --git a/lib/pytz/zoneinfo/Asia/Tehran b/lib/pytz/zoneinfo/Asia/Tehran
new file mode 100644
index 0000000..8710781
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Tehran differ
diff --git a/lib/pytz/zoneinfo/Asia/Tel_Aviv b/lib/pytz/zoneinfo/Asia/Tel_Aviv
new file mode 100644
index 0000000..df51199
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Tel_Aviv differ
diff --git a/lib/pytz/zoneinfo/Asia/Thimbu b/lib/pytz/zoneinfo/Asia/Thimbu
new file mode 100644
index 0000000..0bd94cb
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Thimbu differ
diff --git a/lib/pytz/zoneinfo/Asia/Thimphu b/lib/pytz/zoneinfo/Asia/Thimphu
new file mode 100644
index 0000000..0bd94cb
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Thimphu differ
diff --git a/lib/pytz/zoneinfo/Asia/Tokyo b/lib/pytz/zoneinfo/Asia/Tokyo
new file mode 100644
index 0000000..0244140
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Tokyo differ
diff --git a/lib/pytz/zoneinfo/Asia/Ujung_Pandang b/lib/pytz/zoneinfo/Asia/Ujung_Pandang
new file mode 100644
index 0000000..0d68923
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ujung_Pandang differ
diff --git a/lib/pytz/zoneinfo/Asia/Ulaanbaatar b/lib/pytz/zoneinfo/Asia/Ulaanbaatar
new file mode 100644
index 0000000..61505e9
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ulaanbaatar differ
diff --git a/lib/pytz/zoneinfo/Asia/Ulan_Bator b/lib/pytz/zoneinfo/Asia/Ulan_Bator
new file mode 100644
index 0000000..61505e9
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ulan_Bator differ
diff --git a/lib/pytz/zoneinfo/Asia/Urumqi b/lib/pytz/zoneinfo/Asia/Urumqi
new file mode 100644
index 0000000..964a5c2
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Urumqi differ
diff --git a/lib/pytz/zoneinfo/Asia/Ust-Nera b/lib/pytz/zoneinfo/Asia/Ust-Nera
new file mode 100644
index 0000000..0efacd6
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Ust-Nera differ
diff --git a/lib/pytz/zoneinfo/Asia/Vientiane b/lib/pytz/zoneinfo/Asia/Vientiane
new file mode 100644
index 0000000..e8e7627
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Vientiane differ
diff --git a/lib/pytz/zoneinfo/Asia/Vladivostok b/lib/pytz/zoneinfo/Asia/Vladivostok
new file mode 100644
index 0000000..156c8e6
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Vladivostok differ
diff --git a/lib/pytz/zoneinfo/Asia/Yakutsk b/lib/pytz/zoneinfo/Asia/Yakutsk
new file mode 100644
index 0000000..58ff25e
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Yakutsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Yekaterinburg b/lib/pytz/zoneinfo/Asia/Yekaterinburg
new file mode 100644
index 0000000..a1baafa
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Yekaterinburg differ
diff --git a/lib/pytz/zoneinfo/Asia/Yerevan b/lib/pytz/zoneinfo/Asia/Yerevan
new file mode 100644
index 0000000..fa62c24
Binary files /dev/null and b/lib/pytz/zoneinfo/Asia/Yerevan differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Azores b/lib/pytz/zoneinfo/Atlantic/Azores
new file mode 100644
index 0000000..1f53253
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Azores differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Bermuda b/lib/pytz/zoneinfo/Atlantic/Bermuda
new file mode 100644
index 0000000..548d979
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Bermuda differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Canary b/lib/pytz/zoneinfo/Atlantic/Canary
new file mode 100644
index 0000000..007dcf4
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Canary differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Cape_Verde b/lib/pytz/zoneinfo/Atlantic/Cape_Verde
new file mode 100644
index 0000000..18b676c
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Cape_Verde differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Faeroe b/lib/pytz/zoneinfo/Atlantic/Faeroe
new file mode 100644
index 0000000..c486518
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Faeroe differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Faroe b/lib/pytz/zoneinfo/Atlantic/Faroe
new file mode 100644
index 0000000..c486518
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Faroe differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Jan_Mayen b/lib/pytz/zoneinfo/Atlantic/Jan_Mayen
new file mode 100644
index 0000000..239c017
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Jan_Mayen differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Madeira b/lib/pytz/zoneinfo/Atlantic/Madeira
new file mode 100644
index 0000000..3687fd6
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Madeira differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Reykjavik b/lib/pytz/zoneinfo/Atlantic/Reykjavik
new file mode 100644
index 0000000..35ba7a1
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Reykjavik differ
diff --git a/lib/pytz/zoneinfo/Atlantic/South_Georgia b/lib/pytz/zoneinfo/Atlantic/South_Georgia
new file mode 100644
index 0000000..b1191c9
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/South_Georgia differ
diff --git a/lib/pytz/zoneinfo/Atlantic/St_Helena b/lib/pytz/zoneinfo/Atlantic/St_Helena
new file mode 100644
index 0000000..6fd1af3
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/St_Helena differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Stanley b/lib/pytz/zoneinfo/Atlantic/Stanley
new file mode 100644
index 0000000..aec7a5d
Binary files /dev/null and b/lib/pytz/zoneinfo/Atlantic/Stanley differ
diff --git a/lib/pytz/zoneinfo/Australia/ACT b/lib/pytz/zoneinfo/Australia/ACT
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/ACT differ
diff --git a/lib/pytz/zoneinfo/Australia/Adelaide b/lib/pytz/zoneinfo/Australia/Adelaide
new file mode 100644
index 0000000..4f331a8
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Adelaide differ
diff --git a/lib/pytz/zoneinfo/Australia/Brisbane b/lib/pytz/zoneinfo/Australia/Brisbane
new file mode 100644
index 0000000..a327d83
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Brisbane differ
diff --git a/lib/pytz/zoneinfo/Australia/Broken_Hill b/lib/pytz/zoneinfo/Australia/Broken_Hill
new file mode 100644
index 0000000..768b167
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Broken_Hill differ
diff --git a/lib/pytz/zoneinfo/Australia/Canberra b/lib/pytz/zoneinfo/Australia/Canberra
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Canberra differ
diff --git a/lib/pytz/zoneinfo/Australia/Currie b/lib/pytz/zoneinfo/Australia/Currie
new file mode 100644
index 0000000..a3f6f29
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Currie differ
diff --git a/lib/pytz/zoneinfo/Australia/Darwin b/lib/pytz/zoneinfo/Australia/Darwin
new file mode 100644
index 0000000..c6ae9a7
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Darwin differ
diff --git a/lib/pytz/zoneinfo/Australia/Eucla b/lib/pytz/zoneinfo/Australia/Eucla
new file mode 100644
index 0000000..baba07a
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Eucla differ
diff --git a/lib/pytz/zoneinfo/Australia/Hobart b/lib/pytz/zoneinfo/Australia/Hobart
new file mode 100644
index 0000000..07784ce
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Hobart differ
diff --git a/lib/pytz/zoneinfo/Australia/LHI b/lib/pytz/zoneinfo/Australia/LHI
new file mode 100644
index 0000000..a653e51
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/LHI differ
diff --git a/lib/pytz/zoneinfo/Australia/Lindeman b/lib/pytz/zoneinfo/Australia/Lindeman
new file mode 100644
index 0000000..71ca143
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Lindeman differ
diff --git a/lib/pytz/zoneinfo/Australia/Lord_Howe b/lib/pytz/zoneinfo/Australia/Lord_Howe
new file mode 100644
index 0000000..a653e51
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Lord_Howe differ
diff --git a/lib/pytz/zoneinfo/Australia/Melbourne b/lib/pytz/zoneinfo/Australia/Melbourne
new file mode 100644
index 0000000..ec8dfe0
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Melbourne differ
diff --git a/lib/pytz/zoneinfo/Australia/NSW b/lib/pytz/zoneinfo/Australia/NSW
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/NSW differ
diff --git a/lib/pytz/zoneinfo/Australia/North b/lib/pytz/zoneinfo/Australia/North
new file mode 100644
index 0000000..c6ae9a7
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/North differ
diff --git a/lib/pytz/zoneinfo/Australia/Perth b/lib/pytz/zoneinfo/Australia/Perth
new file mode 100644
index 0000000..85c26d5
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Perth differ
diff --git a/lib/pytz/zoneinfo/Australia/Queensland b/lib/pytz/zoneinfo/Australia/Queensland
new file mode 100644
index 0000000..a327d83
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Queensland differ
diff --git a/lib/pytz/zoneinfo/Australia/South b/lib/pytz/zoneinfo/Australia/South
new file mode 100644
index 0000000..4f331a8
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/South differ
diff --git a/lib/pytz/zoneinfo/Australia/Sydney b/lib/pytz/zoneinfo/Australia/Sydney
new file mode 100644
index 0000000..aaed12c
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Sydney differ
diff --git a/lib/pytz/zoneinfo/Australia/Tasmania b/lib/pytz/zoneinfo/Australia/Tasmania
new file mode 100644
index 0000000..07784ce
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Tasmania differ
diff --git a/lib/pytz/zoneinfo/Australia/Victoria b/lib/pytz/zoneinfo/Australia/Victoria
new file mode 100644
index 0000000..ec8dfe0
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Victoria differ
diff --git a/lib/pytz/zoneinfo/Australia/West b/lib/pytz/zoneinfo/Australia/West
new file mode 100644
index 0000000..85c26d5
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/West differ
diff --git a/lib/pytz/zoneinfo/Australia/Yancowinna b/lib/pytz/zoneinfo/Australia/Yancowinna
new file mode 100644
index 0000000..768b167
Binary files /dev/null and b/lib/pytz/zoneinfo/Australia/Yancowinna differ
diff --git a/lib/pytz/zoneinfo/Brazil/Acre b/lib/pytz/zoneinfo/Brazil/Acre
new file mode 100644
index 0000000..788d0e9
Binary files /dev/null and b/lib/pytz/zoneinfo/Brazil/Acre differ
diff --git a/lib/pytz/zoneinfo/Brazil/DeNoronha b/lib/pytz/zoneinfo/Brazil/DeNoronha
new file mode 100644
index 0000000..774b14e
Binary files /dev/null and b/lib/pytz/zoneinfo/Brazil/DeNoronha differ
diff --git a/lib/pytz/zoneinfo/Brazil/East b/lib/pytz/zoneinfo/Brazil/East
new file mode 100644
index 0000000..552ce7c
Binary files /dev/null and b/lib/pytz/zoneinfo/Brazil/East differ
diff --git a/lib/pytz/zoneinfo/Brazil/West b/lib/pytz/zoneinfo/Brazil/West
new file mode 100644
index 0000000..e0222f1
Binary files /dev/null and b/lib/pytz/zoneinfo/Brazil/West differ
diff --git a/lib/pytz/zoneinfo/CET b/lib/pytz/zoneinfo/CET
new file mode 100644
index 0000000..4c4f8ef
Binary files /dev/null and b/lib/pytz/zoneinfo/CET differ
diff --git a/lib/pytz/zoneinfo/CST6CDT b/lib/pytz/zoneinfo/CST6CDT
new file mode 100644
index 0000000..5c8a1d9
Binary files /dev/null and b/lib/pytz/zoneinfo/CST6CDT differ
diff --git a/lib/pytz/zoneinfo/Canada/Atlantic b/lib/pytz/zoneinfo/Canada/Atlantic
new file mode 100644
index 0000000..f86ece4
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Atlantic differ
diff --git a/lib/pytz/zoneinfo/Canada/Central b/lib/pytz/zoneinfo/Canada/Central
new file mode 100644
index 0000000..2ffe3d8
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Central differ
diff --git a/lib/pytz/zoneinfo/Canada/East-Saskatchewan b/lib/pytz/zoneinfo/Canada/East-Saskatchewan
new file mode 100644
index 0000000..5fe8d6b
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/East-Saskatchewan differ
diff --git a/lib/pytz/zoneinfo/Canada/Eastern b/lib/pytz/zoneinfo/Canada/Eastern
new file mode 100644
index 0000000..7b4682a
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Eastern differ
diff --git a/lib/pytz/zoneinfo/Canada/Mountain b/lib/pytz/zoneinfo/Canada/Mountain
new file mode 100644
index 0000000..d02fbcd
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Mountain differ
diff --git a/lib/pytz/zoneinfo/Canada/Newfoundland b/lib/pytz/zoneinfo/Canada/Newfoundland
new file mode 100644
index 0000000..a1d1485
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Newfoundland differ
diff --git a/lib/pytz/zoneinfo/Canada/Pacific b/lib/pytz/zoneinfo/Canada/Pacific
new file mode 100644
index 0000000..9b5d924
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Pacific differ
diff --git a/lib/pytz/zoneinfo/Canada/Saskatchewan b/lib/pytz/zoneinfo/Canada/Saskatchewan
new file mode 100644
index 0000000..5fe8d6b
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Saskatchewan differ
diff --git a/lib/pytz/zoneinfo/Canada/Yukon b/lib/pytz/zoneinfo/Canada/Yukon
new file mode 100644
index 0000000..8604c5c
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/Yukon differ
diff --git a/lib/pytz/zoneinfo/Chile/Continental b/lib/pytz/zoneinfo/Chile/Continental
new file mode 100644
index 0000000..92cf559
Binary files /dev/null and b/lib/pytz/zoneinfo/Chile/Continental differ
diff --git a/lib/pytz/zoneinfo/Chile/EasterIsland b/lib/pytz/zoneinfo/Chile/EasterIsland
new file mode 100644
index 0000000..8c8a6c7
Binary files /dev/null and b/lib/pytz/zoneinfo/Chile/EasterIsland differ
diff --git a/lib/pytz/zoneinfo/Cuba b/lib/pytz/zoneinfo/Cuba
new file mode 100644
index 0000000..1a58fcd
Binary files /dev/null and b/lib/pytz/zoneinfo/Cuba differ
diff --git a/lib/pytz/zoneinfo/EET b/lib/pytz/zoneinfo/EET
new file mode 100644
index 0000000..beb273a
Binary files /dev/null and b/lib/pytz/zoneinfo/EET differ
diff --git a/lib/pytz/zoneinfo/EST b/lib/pytz/zoneinfo/EST
new file mode 100644
index 0000000..ae34663
Binary files /dev/null and b/lib/pytz/zoneinfo/EST differ
diff --git a/lib/pytz/zoneinfo/EST5EDT b/lib/pytz/zoneinfo/EST5EDT
new file mode 100644
index 0000000..54541fc
Binary files /dev/null and b/lib/pytz/zoneinfo/EST5EDT differ
diff --git a/lib/pytz/zoneinfo/Egypt b/lib/pytz/zoneinfo/Egypt
new file mode 100644
index 0000000..0eeed11
Binary files /dev/null and b/lib/pytz/zoneinfo/Egypt differ
diff --git a/lib/pytz/zoneinfo/Eire b/lib/pytz/zoneinfo/Eire
new file mode 100644
index 0000000..a7cffbb
Binary files /dev/null and b/lib/pytz/zoneinfo/Eire differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT b/lib/pytz/zoneinfo/Etc/GMT
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+0 b/lib/pytz/zoneinfo/Etc/GMT+0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+0 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+1 b/lib/pytz/zoneinfo/Etc/GMT+1
new file mode 100644
index 0000000..2f40cc7
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+1 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+10 b/lib/pytz/zoneinfo/Etc/GMT+10
new file mode 100644
index 0000000..2087965
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+10 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+11 b/lib/pytz/zoneinfo/Etc/GMT+11
new file mode 100644
index 0000000..af4a6b3
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+11 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+12 b/lib/pytz/zoneinfo/Etc/GMT+12
new file mode 100644
index 0000000..f095534
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+12 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+2 b/lib/pytz/zoneinfo/Etc/GMT+2
new file mode 100644
index 0000000..85a1fc1
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+2 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+3 b/lib/pytz/zoneinfo/Etc/GMT+3
new file mode 100644
index 0000000..a24f587
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+3 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+4 b/lib/pytz/zoneinfo/Etc/GMT+4
new file mode 100644
index 0000000..ab74517
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+4 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+5 b/lib/pytz/zoneinfo/Etc/GMT+5
new file mode 100644
index 0000000..01f1d77
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+5 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+6 b/lib/pytz/zoneinfo/Etc/GMT+6
new file mode 100644
index 0000000..3ced48b
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+6 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+7 b/lib/pytz/zoneinfo/Etc/GMT+7
new file mode 100644
index 0000000..5f58127
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+7 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+8 b/lib/pytz/zoneinfo/Etc/GMT+8
new file mode 100644
index 0000000..be23d96
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+8 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+9 b/lib/pytz/zoneinfo/Etc/GMT+9
new file mode 100644
index 0000000..d00c50c
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT+9 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-0 b/lib/pytz/zoneinfo/Etc/GMT-0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-0 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-1 b/lib/pytz/zoneinfo/Etc/GMT-1
new file mode 100644
index 0000000..088a76e
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-1 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-10 b/lib/pytz/zoneinfo/Etc/GMT-10
new file mode 100644
index 0000000..a4da44f
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-10 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-11 b/lib/pytz/zoneinfo/Etc/GMT-11
new file mode 100644
index 0000000..e0112a9
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-11 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-12 b/lib/pytz/zoneinfo/Etc/GMT-12
new file mode 100644
index 0000000..c1e08b7
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-12 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-13 b/lib/pytz/zoneinfo/Etc/GMT-13
new file mode 100644
index 0000000..1ab0519
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-13 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-14 b/lib/pytz/zoneinfo/Etc/GMT-14
new file mode 100644
index 0000000..afaf3fa
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-14 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-2 b/lib/pytz/zoneinfo/Etc/GMT-2
new file mode 100644
index 0000000..6289cad
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-2 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-3 b/lib/pytz/zoneinfo/Etc/GMT-3
new file mode 100644
index 0000000..27434cd
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-3 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-4 b/lib/pytz/zoneinfo/Etc/GMT-4
new file mode 100644
index 0000000..2fc6966
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-4 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-5 b/lib/pytz/zoneinfo/Etc/GMT-5
new file mode 100644
index 0000000..8508e72
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-5 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-6 b/lib/pytz/zoneinfo/Etc/GMT-6
new file mode 100644
index 0000000..5b9678e
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-6 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-7 b/lib/pytz/zoneinfo/Etc/GMT-7
new file mode 100644
index 0000000..ccf4c39
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-7 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-8 b/lib/pytz/zoneinfo/Etc/GMT-8
new file mode 100644
index 0000000..db4cfa6
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-8 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-9 b/lib/pytz/zoneinfo/Etc/GMT-9
new file mode 100644
index 0000000..56ea117
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT-9 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT0 b/lib/pytz/zoneinfo/Etc/GMT0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/GMT0 differ
diff --git a/lib/pytz/zoneinfo/Etc/Greenwich b/lib/pytz/zoneinfo/Etc/Greenwich
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/Greenwich differ
diff --git a/lib/pytz/zoneinfo/Etc/UCT b/lib/pytz/zoneinfo/Etc/UCT
new file mode 100644
index 0000000..40147b9
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/UCT differ
diff --git a/lib/pytz/zoneinfo/Etc/UTC b/lib/pytz/zoneinfo/Etc/UTC
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/UTC differ
diff --git a/lib/pytz/zoneinfo/Etc/Universal b/lib/pytz/zoneinfo/Etc/Universal
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/Universal differ
diff --git a/lib/pytz/zoneinfo/Etc/Zulu b/lib/pytz/zoneinfo/Etc/Zulu
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz/zoneinfo/Etc/Zulu differ
diff --git a/lib/pytz/zoneinfo/Europe/Amsterdam b/lib/pytz/zoneinfo/Europe/Amsterdam
new file mode 100644
index 0000000..f74769d
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Amsterdam differ
diff --git a/lib/pytz/zoneinfo/Europe/Andorra b/lib/pytz/zoneinfo/Europe/Andorra
new file mode 100644
index 0000000..b06de7a
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Andorra differ
diff --git a/lib/pytz/zoneinfo/Europe/Athens b/lib/pytz/zoneinfo/Europe/Athens
new file mode 100644
index 0000000..0001602
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Athens differ
diff --git a/lib/pytz/zoneinfo/Europe/Belfast b/lib/pytz/zoneinfo/Europe/Belfast
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Belfast differ
diff --git a/lib/pytz/zoneinfo/Europe/Belgrade b/lib/pytz/zoneinfo/Europe/Belgrade
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Belgrade differ
diff --git a/lib/pytz/zoneinfo/Europe/Berlin b/lib/pytz/zoneinfo/Europe/Berlin
new file mode 100644
index 0000000..b4f2a2a
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Berlin differ
diff --git a/lib/pytz/zoneinfo/Europe/Bratislava b/lib/pytz/zoneinfo/Europe/Bratislava
new file mode 100644
index 0000000..4eabe5c
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Bratislava differ
diff --git a/lib/pytz/zoneinfo/Europe/Brussels b/lib/pytz/zoneinfo/Europe/Brussels
new file mode 100644
index 0000000..d8f19a6
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Brussels differ
diff --git a/lib/pytz/zoneinfo/Europe/Bucharest b/lib/pytz/zoneinfo/Europe/Bucharest
new file mode 100644
index 0000000..e0eac4c
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Bucharest differ
diff --git a/lib/pytz/zoneinfo/Europe/Budapest b/lib/pytz/zoneinfo/Europe/Budapest
new file mode 100644
index 0000000..3ddf6a5
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Budapest differ
diff --git a/lib/pytz/zoneinfo/Europe/Busingen b/lib/pytz/zoneinfo/Europe/Busingen
new file mode 100644
index 0000000..9c2b600
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Busingen differ
diff --git a/lib/pytz/zoneinfo/Europe/Chisinau b/lib/pytz/zoneinfo/Europe/Chisinau
new file mode 100644
index 0000000..7998b2d
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Chisinau differ
diff --git a/lib/pytz/zoneinfo/Europe/Copenhagen b/lib/pytz/zoneinfo/Europe/Copenhagen
new file mode 100644
index 0000000..be87cf1
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Copenhagen differ
diff --git a/lib/pytz/zoneinfo/Europe/Dublin b/lib/pytz/zoneinfo/Europe/Dublin
new file mode 100644
index 0000000..a7cffbb
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Dublin differ
diff --git a/lib/pytz/zoneinfo/Europe/Gibraltar b/lib/pytz/zoneinfo/Europe/Gibraltar
new file mode 100644
index 0000000..a7105fa
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Gibraltar differ
diff --git a/lib/pytz/zoneinfo/Europe/Guernsey b/lib/pytz/zoneinfo/Europe/Guernsey
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Guernsey differ
diff --git a/lib/pytz/zoneinfo/Europe/Helsinki b/lib/pytz/zoneinfo/Europe/Helsinki
new file mode 100644
index 0000000..29b3c81
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Helsinki differ
diff --git a/lib/pytz/zoneinfo/Europe/Isle_of_Man b/lib/pytz/zoneinfo/Europe/Isle_of_Man
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Isle_of_Man differ
diff --git a/lib/pytz/zoneinfo/Europe/Istanbul b/lib/pytz/zoneinfo/Europe/Istanbul
new file mode 100644
index 0000000..d89aa3a
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Istanbul differ
diff --git a/lib/pytz/zoneinfo/Europe/Jersey b/lib/pytz/zoneinfo/Europe/Jersey
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Jersey differ
diff --git a/lib/pytz/zoneinfo/Europe/Kaliningrad b/lib/pytz/zoneinfo/Europe/Kaliningrad
new file mode 100644
index 0000000..4805fe4
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Kaliningrad differ
diff --git a/lib/pytz/zoneinfo/Europe/Kiev b/lib/pytz/zoneinfo/Europe/Kiev
new file mode 100644
index 0000000..b3e20a7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Kiev differ
diff --git a/lib/pytz/zoneinfo/Europe/Lisbon b/lib/pytz/zoneinfo/Europe/Lisbon
new file mode 100644
index 0000000..b9aff3a
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Lisbon differ
diff --git a/lib/pytz/zoneinfo/Europe/Ljubljana b/lib/pytz/zoneinfo/Europe/Ljubljana
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Ljubljana differ
diff --git a/lib/pytz/zoneinfo/Europe/London b/lib/pytz/zoneinfo/Europe/London
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/London differ
diff --git a/lib/pytz/zoneinfo/Europe/Luxembourg b/lib/pytz/zoneinfo/Europe/Luxembourg
new file mode 100644
index 0000000..6fae86c
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Luxembourg differ
diff --git a/lib/pytz/zoneinfo/Europe/Madrid b/lib/pytz/zoneinfo/Europe/Madrid
new file mode 100644
index 0000000..af47432
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Madrid differ
diff --git a/lib/pytz/zoneinfo/Europe/Malta b/lib/pytz/zoneinfo/Europe/Malta
new file mode 100644
index 0000000..d251938
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Malta differ
diff --git a/lib/pytz/zoneinfo/Europe/Mariehamn b/lib/pytz/zoneinfo/Europe/Mariehamn
new file mode 100644
index 0000000..29b3c81
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Mariehamn differ
diff --git a/lib/pytz/zoneinfo/Europe/Minsk b/lib/pytz/zoneinfo/Europe/Minsk
new file mode 100644
index 0000000..28ef30a
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Minsk differ
diff --git a/lib/pytz/zoneinfo/Europe/Monaco b/lib/pytz/zoneinfo/Europe/Monaco
new file mode 100644
index 0000000..0b40f1e
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Monaco differ
diff --git a/lib/pytz/zoneinfo/Europe/Moscow b/lib/pytz/zoneinfo/Europe/Moscow
new file mode 100644
index 0000000..bdbbaeb
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Moscow differ
diff --git a/lib/pytz/zoneinfo/Europe/Nicosia b/lib/pytz/zoneinfo/Europe/Nicosia
new file mode 100644
index 0000000..3e663b2
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Nicosia differ
diff --git a/lib/pytz/zoneinfo/Europe/Oslo b/lib/pytz/zoneinfo/Europe/Oslo
new file mode 100644
index 0000000..239c017
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Oslo differ
diff --git a/lib/pytz/zoneinfo/Europe/Paris b/lib/pytz/zoneinfo/Europe/Paris
new file mode 100644
index 0000000..cf6e2e2
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Paris differ
diff --git a/lib/pytz/zoneinfo/Europe/Podgorica b/lib/pytz/zoneinfo/Europe/Podgorica
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Podgorica differ
diff --git a/lib/pytz/zoneinfo/Europe/Prague b/lib/pytz/zoneinfo/Europe/Prague
new file mode 100644
index 0000000..4eabe5c
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Prague differ
diff --git a/lib/pytz/zoneinfo/Europe/Riga b/lib/pytz/zoneinfo/Europe/Riga
new file mode 100644
index 0000000..b729ee8
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Riga differ
diff --git a/lib/pytz/zoneinfo/Europe/Rome b/lib/pytz/zoneinfo/Europe/Rome
new file mode 100644
index 0000000..5cc3040
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Rome differ
diff --git a/lib/pytz/zoneinfo/Europe/Samara b/lib/pytz/zoneinfo/Europe/Samara
new file mode 100644
index 0000000..79759f5
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Samara differ
diff --git a/lib/pytz/zoneinfo/Europe/San_Marino b/lib/pytz/zoneinfo/Europe/San_Marino
new file mode 100644
index 0000000..5cc3040
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/San_Marino differ
diff --git a/lib/pytz/zoneinfo/Europe/Sarajevo b/lib/pytz/zoneinfo/Europe/Sarajevo
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Sarajevo differ
diff --git a/lib/pytz/zoneinfo/Europe/Simferopol b/lib/pytz/zoneinfo/Europe/Simferopol
new file mode 100644
index 0000000..ebe9017
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Simferopol differ
diff --git a/lib/pytz/zoneinfo/Europe/Skopje b/lib/pytz/zoneinfo/Europe/Skopje
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Skopje differ
diff --git a/lib/pytz/zoneinfo/Europe/Sofia b/lib/pytz/zoneinfo/Europe/Sofia
new file mode 100644
index 0000000..763e074
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Sofia differ
diff --git a/lib/pytz/zoneinfo/Europe/Stockholm b/lib/pytz/zoneinfo/Europe/Stockholm
new file mode 100644
index 0000000..43c7f2e
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Stockholm differ
diff --git a/lib/pytz/zoneinfo/Europe/Tallinn b/lib/pytz/zoneinfo/Europe/Tallinn
new file mode 100644
index 0000000..8a4f124
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Tallinn differ
diff --git a/lib/pytz/zoneinfo/Europe/Tirane b/lib/pytz/zoneinfo/Europe/Tirane
new file mode 100644
index 0000000..52c16a4
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Tirane differ
diff --git a/lib/pytz/zoneinfo/Europe/Tiraspol b/lib/pytz/zoneinfo/Europe/Tiraspol
new file mode 100644
index 0000000..7998b2d
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Tiraspol differ
diff --git a/lib/pytz/zoneinfo/Europe/Uzhgorod b/lib/pytz/zoneinfo/Europe/Uzhgorod
new file mode 100644
index 0000000..8ddba90
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Uzhgorod differ
diff --git a/lib/pytz/zoneinfo/Europe/Vaduz b/lib/pytz/zoneinfo/Europe/Vaduz
new file mode 100644
index 0000000..9c2b600
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Vaduz differ
diff --git a/lib/pytz/zoneinfo/Europe/Vatican b/lib/pytz/zoneinfo/Europe/Vatican
new file mode 100644
index 0000000..5cc3040
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Vatican differ
diff --git a/lib/pytz/zoneinfo/Europe/Vienna b/lib/pytz/zoneinfo/Europe/Vienna
new file mode 100644
index 0000000..9c0fac5
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Vienna differ
diff --git a/lib/pytz/zoneinfo/Europe/Vilnius b/lib/pytz/zoneinfo/Europe/Vilnius
new file mode 100644
index 0000000..3b11880
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Vilnius differ
diff --git a/lib/pytz/zoneinfo/Europe/Volgograd b/lib/pytz/zoneinfo/Europe/Volgograd
new file mode 100644
index 0000000..c62c32a
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Volgograd differ
diff --git a/lib/pytz/zoneinfo/Europe/Warsaw b/lib/pytz/zoneinfo/Europe/Warsaw
new file mode 100644
index 0000000..5cbba41
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Warsaw differ
diff --git a/lib/pytz/zoneinfo/Europe/Zagreb b/lib/pytz/zoneinfo/Europe/Zagreb
new file mode 100644
index 0000000..79c25d7
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Zagreb differ
diff --git a/lib/pytz/zoneinfo/Europe/Zaporozhye b/lib/pytz/zoneinfo/Europe/Zaporozhye
new file mode 100644
index 0000000..49b568e
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Zaporozhye differ
diff --git a/lib/pytz/zoneinfo/Europe/Zurich b/lib/pytz/zoneinfo/Europe/Zurich
new file mode 100644
index 0000000..9c2b600
Binary files /dev/null and b/lib/pytz/zoneinfo/Europe/Zurich differ
diff --git a/lib/pytz/zoneinfo/Factory b/lib/pytz/zoneinfo/Factory
new file mode 100644
index 0000000..6e6c452
Binary files /dev/null and b/lib/pytz/zoneinfo/Factory differ
diff --git a/lib/pytz/zoneinfo/GB b/lib/pytz/zoneinfo/GB
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/GB differ
diff --git a/lib/pytz/zoneinfo/GB-Eire b/lib/pytz/zoneinfo/GB-Eire
new file mode 100644
index 0000000..4527515
Binary files /dev/null and b/lib/pytz/zoneinfo/GB-Eire differ
diff --git a/lib/pytz/zoneinfo/GMT b/lib/pytz/zoneinfo/GMT
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/GMT differ
diff --git a/lib/pytz/zoneinfo/GMT+0 b/lib/pytz/zoneinfo/GMT+0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/GMT+0 differ
diff --git a/lib/pytz/zoneinfo/GMT-0 b/lib/pytz/zoneinfo/GMT-0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/GMT-0 differ
diff --git a/lib/pytz/zoneinfo/GMT0 b/lib/pytz/zoneinfo/GMT0
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/GMT0 differ
diff --git a/lib/pytz/zoneinfo/Greenwich b/lib/pytz/zoneinfo/Greenwich
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/Greenwich differ
diff --git a/lib/pytz/zoneinfo/HST b/lib/pytz/zoneinfo/HST
new file mode 100644
index 0000000..03e4db0
Binary files /dev/null and b/lib/pytz/zoneinfo/HST differ
diff --git a/lib/pytz/zoneinfo/Hongkong b/lib/pytz/zoneinfo/Hongkong
new file mode 100644
index 0000000..dc9058e
Binary files /dev/null and b/lib/pytz/zoneinfo/Hongkong differ
diff --git a/lib/pytz/zoneinfo/Iceland b/lib/pytz/zoneinfo/Iceland
new file mode 100644
index 0000000..35ba7a1
Binary files /dev/null and b/lib/pytz/zoneinfo/Iceland differ
diff --git a/lib/pytz/zoneinfo/Indian/Antananarivo b/lib/pytz/zoneinfo/Indian/Antananarivo
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Antananarivo differ
diff --git a/lib/pytz/zoneinfo/Indian/Chagos b/lib/pytz/zoneinfo/Indian/Chagos
new file mode 100644
index 0000000..a616bdf
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Chagos differ
diff --git a/lib/pytz/zoneinfo/Indian/Christmas b/lib/pytz/zoneinfo/Indian/Christmas
new file mode 100644
index 0000000..ebcd262
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Christmas differ
diff --git a/lib/pytz/zoneinfo/Indian/Cocos b/lib/pytz/zoneinfo/Indian/Cocos
new file mode 100644
index 0000000..cd603f2
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Cocos differ
diff --git a/lib/pytz/zoneinfo/Indian/Comoro b/lib/pytz/zoneinfo/Indian/Comoro
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Comoro differ
diff --git a/lib/pytz/zoneinfo/Indian/Kerguelen b/lib/pytz/zoneinfo/Indian/Kerguelen
new file mode 100644
index 0000000..462851e
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Kerguelen differ
diff --git a/lib/pytz/zoneinfo/Indian/Mahe b/lib/pytz/zoneinfo/Indian/Mahe
new file mode 100644
index 0000000..5f42819
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Mahe differ
diff --git a/lib/pytz/zoneinfo/Indian/Maldives b/lib/pytz/zoneinfo/Indian/Maldives
new file mode 100644
index 0000000..cec224f
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Maldives differ
diff --git a/lib/pytz/zoneinfo/Indian/Mauritius b/lib/pytz/zoneinfo/Indian/Mauritius
new file mode 100644
index 0000000..66ecc8f
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Mauritius differ
diff --git a/lib/pytz/zoneinfo/Indian/Mayotte b/lib/pytz/zoneinfo/Indian/Mayotte
new file mode 100644
index 0000000..750d3dc
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Mayotte differ
diff --git a/lib/pytz/zoneinfo/Indian/Reunion b/lib/pytz/zoneinfo/Indian/Reunion
new file mode 100644
index 0000000..c4d0da9
Binary files /dev/null and b/lib/pytz/zoneinfo/Indian/Reunion differ
diff --git a/lib/pytz/zoneinfo/Iran b/lib/pytz/zoneinfo/Iran
new file mode 100644
index 0000000..8710781
Binary files /dev/null and b/lib/pytz/zoneinfo/Iran differ
diff --git a/lib/pytz/zoneinfo/Israel b/lib/pytz/zoneinfo/Israel
new file mode 100644
index 0000000..df51199
Binary files /dev/null and b/lib/pytz/zoneinfo/Israel differ
diff --git a/lib/pytz/zoneinfo/Jamaica b/lib/pytz/zoneinfo/Jamaica
new file mode 100644
index 0000000..006689b
Binary files /dev/null and b/lib/pytz/zoneinfo/Jamaica differ
diff --git a/lib/pytz/zoneinfo/Japan b/lib/pytz/zoneinfo/Japan
new file mode 100644
index 0000000..0244140
Binary files /dev/null and b/lib/pytz/zoneinfo/Japan differ
diff --git a/lib/pytz/zoneinfo/Kwajalein b/lib/pytz/zoneinfo/Kwajalein
new file mode 100644
index 0000000..094c3cf
Binary files /dev/null and b/lib/pytz/zoneinfo/Kwajalein differ
diff --git a/lib/pytz/zoneinfo/Libya b/lib/pytz/zoneinfo/Libya
new file mode 100644
index 0000000..b32e220
Binary files /dev/null and b/lib/pytz/zoneinfo/Libya differ
diff --git a/lib/pytz/zoneinfo/MET b/lib/pytz/zoneinfo/MET
new file mode 100644
index 0000000..71963d5
Binary files /dev/null and b/lib/pytz/zoneinfo/MET differ
diff --git a/lib/pytz/zoneinfo/MST b/lib/pytz/zoneinfo/MST
new file mode 100644
index 0000000..a1bee7c
Binary files /dev/null and b/lib/pytz/zoneinfo/MST differ
diff --git a/lib/pytz/zoneinfo/MST7MDT b/lib/pytz/zoneinfo/MST7MDT
new file mode 100644
index 0000000..726a7e5
Binary files /dev/null and b/lib/pytz/zoneinfo/MST7MDT differ
diff --git a/lib/pytz/zoneinfo/Mexico/BajaNorte b/lib/pytz/zoneinfo/Mexico/BajaNorte
new file mode 100644
index 0000000..1387475
Binary files /dev/null and b/lib/pytz/zoneinfo/Mexico/BajaNorte differ
diff --git a/lib/pytz/zoneinfo/Mexico/BajaSur b/lib/pytz/zoneinfo/Mexico/BajaSur
new file mode 100644
index 0000000..afa94c2
Binary files /dev/null and b/lib/pytz/zoneinfo/Mexico/BajaSur differ
diff --git a/lib/pytz/zoneinfo/Mexico/General b/lib/pytz/zoneinfo/Mexico/General
new file mode 100644
index 0000000..f11e3d2
Binary files /dev/null and b/lib/pytz/zoneinfo/Mexico/General differ
diff --git a/lib/pytz/zoneinfo/NZ b/lib/pytz/zoneinfo/NZ
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz/zoneinfo/NZ differ
diff --git a/lib/pytz/zoneinfo/NZ-CHAT b/lib/pytz/zoneinfo/NZ-CHAT
new file mode 100644
index 0000000..59bc4ed
Binary files /dev/null and b/lib/pytz/zoneinfo/NZ-CHAT differ
diff --git a/lib/pytz/zoneinfo/Navajo b/lib/pytz/zoneinfo/Navajo
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz/zoneinfo/Navajo differ
diff --git a/lib/pytz/zoneinfo/PRC b/lib/pytz/zoneinfo/PRC
new file mode 100644
index 0000000..dbd132f
Binary files /dev/null and b/lib/pytz/zoneinfo/PRC differ
diff --git a/lib/pytz/zoneinfo/PST8PDT b/lib/pytz/zoneinfo/PST8PDT
new file mode 100644
index 0000000..6242ac0
Binary files /dev/null and b/lib/pytz/zoneinfo/PST8PDT differ
diff --git a/lib/pytz/zoneinfo/Pacific/Apia b/lib/pytz/zoneinfo/Pacific/Apia
new file mode 100644
index 0000000..cc5d2cd
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Apia differ
diff --git a/lib/pytz/zoneinfo/Pacific/Auckland b/lib/pytz/zoneinfo/Pacific/Auckland
new file mode 100644
index 0000000..a5f5b6d
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Auckland differ
diff --git a/lib/pytz/zoneinfo/Pacific/Bougainville b/lib/pytz/zoneinfo/Pacific/Bougainville
new file mode 100644
index 0000000..219c78c
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Bougainville differ
diff --git a/lib/pytz/zoneinfo/Pacific/Chatham b/lib/pytz/zoneinfo/Pacific/Chatham
new file mode 100644
index 0000000..59bc4ed
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Chatham differ
diff --git a/lib/pytz/zoneinfo/Pacific/Chuuk b/lib/pytz/zoneinfo/Pacific/Chuuk
new file mode 100644
index 0000000..28356bb
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Chuuk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Easter b/lib/pytz/zoneinfo/Pacific/Easter
new file mode 100644
index 0000000..8c8a6c7
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Easter differ
diff --git a/lib/pytz/zoneinfo/Pacific/Efate b/lib/pytz/zoneinfo/Pacific/Efate
new file mode 100644
index 0000000..1d99519
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Efate differ
diff --git a/lib/pytz/zoneinfo/Pacific/Enderbury b/lib/pytz/zoneinfo/Pacific/Enderbury
new file mode 100644
index 0000000..4861052
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Enderbury differ
diff --git a/lib/pytz/zoneinfo/Pacific/Fakaofo b/lib/pytz/zoneinfo/Pacific/Fakaofo
new file mode 100644
index 0000000..e02e18e
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Fakaofo differ
diff --git a/lib/pytz/zoneinfo/Pacific/Fiji b/lib/pytz/zoneinfo/Pacific/Fiji
new file mode 100644
index 0000000..b75f194
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Fiji differ
diff --git a/lib/pytz/zoneinfo/Pacific/Funafuti b/lib/pytz/zoneinfo/Pacific/Funafuti
new file mode 100644
index 0000000..576dea3
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Funafuti differ
diff --git a/lib/pytz/zoneinfo/Pacific/Galapagos b/lib/pytz/zoneinfo/Pacific/Galapagos
new file mode 100644
index 0000000..c9a7371
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Galapagos differ
diff --git a/lib/pytz/zoneinfo/Pacific/Gambier b/lib/pytz/zoneinfo/Pacific/Gambier
new file mode 100644
index 0000000..4ab6c20
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Gambier differ
diff --git a/lib/pytz/zoneinfo/Pacific/Guadalcanal b/lib/pytz/zoneinfo/Pacific/Guadalcanal
new file mode 100644
index 0000000..b183d1e
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Guadalcanal differ
diff --git a/lib/pytz/zoneinfo/Pacific/Guam b/lib/pytz/zoneinfo/Pacific/Guam
new file mode 100644
index 0000000..4286e6b
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Guam differ
diff --git a/lib/pytz/zoneinfo/Pacific/Honolulu b/lib/pytz/zoneinfo/Pacific/Honolulu
new file mode 100644
index 0000000..bd85577
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Honolulu differ
diff --git a/lib/pytz/zoneinfo/Pacific/Johnston b/lib/pytz/zoneinfo/Pacific/Johnston
new file mode 100644
index 0000000..bd85577
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Johnston differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kiritimati b/lib/pytz/zoneinfo/Pacific/Kiritimati
new file mode 100644
index 0000000..c2eafbc
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Kiritimati differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kosrae b/lib/pytz/zoneinfo/Pacific/Kosrae
new file mode 100644
index 0000000..66c4d65
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Kosrae differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kwajalein b/lib/pytz/zoneinfo/Pacific/Kwajalein
new file mode 100644
index 0000000..094c3cf
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Kwajalein differ
diff --git a/lib/pytz/zoneinfo/Pacific/Majuro b/lib/pytz/zoneinfo/Pacific/Majuro
new file mode 100644
index 0000000..d53b7c2
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Majuro differ
diff --git a/lib/pytz/zoneinfo/Pacific/Marquesas b/lib/pytz/zoneinfo/Pacific/Marquesas
new file mode 100644
index 0000000..c717c12
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Marquesas differ
diff --git a/lib/pytz/zoneinfo/Pacific/Midway b/lib/pytz/zoneinfo/Pacific/Midway
new file mode 100644
index 0000000..f2a2f63
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Midway differ
diff --git a/lib/pytz/zoneinfo/Pacific/Nauru b/lib/pytz/zoneinfo/Pacific/Nauru
new file mode 100644
index 0000000..896ffee
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Nauru differ
diff --git a/lib/pytz/zoneinfo/Pacific/Niue b/lib/pytz/zoneinfo/Pacific/Niue
new file mode 100644
index 0000000..d772edf
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Niue differ
diff --git a/lib/pytz/zoneinfo/Pacific/Norfolk b/lib/pytz/zoneinfo/Pacific/Norfolk
new file mode 100644
index 0000000..3a286be
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Norfolk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Noumea b/lib/pytz/zoneinfo/Pacific/Noumea
new file mode 100644
index 0000000..fcc44e6
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Noumea differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pago_Pago b/lib/pytz/zoneinfo/Pacific/Pago_Pago
new file mode 100644
index 0000000..1d7649f
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Pago_Pago differ
diff --git a/lib/pytz/zoneinfo/Pacific/Palau b/lib/pytz/zoneinfo/Pacific/Palau
new file mode 100644
index 0000000..28992d2
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Palau differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pitcairn b/lib/pytz/zoneinfo/Pacific/Pitcairn
new file mode 100644
index 0000000..d62c648
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Pitcairn differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pohnpei b/lib/pytz/zoneinfo/Pacific/Pohnpei
new file mode 100644
index 0000000..59bd764
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Pohnpei differ
diff --git a/lib/pytz/zoneinfo/Pacific/Ponape b/lib/pytz/zoneinfo/Pacific/Ponape
new file mode 100644
index 0000000..59bd764
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Ponape differ
diff --git a/lib/pytz/zoneinfo/Pacific/Port_Moresby b/lib/pytz/zoneinfo/Pacific/Port_Moresby
new file mode 100644
index 0000000..dffa457
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Port_Moresby differ
diff --git a/lib/pytz/zoneinfo/Pacific/Rarotonga b/lib/pytz/zoneinfo/Pacific/Rarotonga
new file mode 100644
index 0000000..2a25490
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Rarotonga differ
diff --git a/lib/pytz/zoneinfo/Pacific/Saipan b/lib/pytz/zoneinfo/Pacific/Saipan
new file mode 100644
index 0000000..c54473c
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Saipan differ
diff --git a/lib/pytz/zoneinfo/Pacific/Samoa b/lib/pytz/zoneinfo/Pacific/Samoa
new file mode 100644
index 0000000..1d7649f
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Samoa differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tahiti b/lib/pytz/zoneinfo/Pacific/Tahiti
new file mode 100644
index 0000000..bfc9a7c
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Tahiti differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tarawa b/lib/pytz/zoneinfo/Pacific/Tarawa
new file mode 100644
index 0000000..1e8189c
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Tarawa differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tongatapu b/lib/pytz/zoneinfo/Pacific/Tongatapu
new file mode 100644
index 0000000..71d899b
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Tongatapu differ
diff --git a/lib/pytz/zoneinfo/Pacific/Truk b/lib/pytz/zoneinfo/Pacific/Truk
new file mode 100644
index 0000000..28356bb
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Truk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Wake b/lib/pytz/zoneinfo/Pacific/Wake
new file mode 100644
index 0000000..9e2a37c
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Wake differ
diff --git a/lib/pytz/zoneinfo/Pacific/Wallis b/lib/pytz/zoneinfo/Pacific/Wallis
new file mode 100644
index 0000000..b894471
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Wallis differ
diff --git a/lib/pytz/zoneinfo/Pacific/Yap b/lib/pytz/zoneinfo/Pacific/Yap
new file mode 100644
index 0000000..28356bb
Binary files /dev/null and b/lib/pytz/zoneinfo/Pacific/Yap differ
diff --git a/lib/pytz/zoneinfo/Poland b/lib/pytz/zoneinfo/Poland
new file mode 100644
index 0000000..5cbba41
Binary files /dev/null and b/lib/pytz/zoneinfo/Poland differ
diff --git a/lib/pytz/zoneinfo/Portugal b/lib/pytz/zoneinfo/Portugal
new file mode 100644
index 0000000..b9aff3a
Binary files /dev/null and b/lib/pytz/zoneinfo/Portugal differ
diff --git a/lib/pytz/zoneinfo/ROC b/lib/pytz/zoneinfo/ROC
new file mode 100644
index 0000000..4810a0b
Binary files /dev/null and b/lib/pytz/zoneinfo/ROC differ
diff --git a/lib/pytz/zoneinfo/ROK b/lib/pytz/zoneinfo/ROK
new file mode 100644
index 0000000..fd91d5b
Binary files /dev/null and b/lib/pytz/zoneinfo/ROK differ
diff --git a/lib/pytz/zoneinfo/Singapore b/lib/pytz/zoneinfo/Singapore
new file mode 100644
index 0000000..9dd49cb
Binary files /dev/null and b/lib/pytz/zoneinfo/Singapore differ
diff --git a/lib/pytz/zoneinfo/Turkey b/lib/pytz/zoneinfo/Turkey
new file mode 100644
index 0000000..d89aa3a
Binary files /dev/null and b/lib/pytz/zoneinfo/Turkey differ
diff --git a/lib/pytz/zoneinfo/UCT b/lib/pytz/zoneinfo/UCT
new file mode 100644
index 0000000..40147b9
Binary files /dev/null and b/lib/pytz/zoneinfo/UCT differ
diff --git a/lib/pytz/zoneinfo/US/Alaska b/lib/pytz/zoneinfo/US/Alaska
new file mode 100644
index 0000000..a4627ca
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Alaska differ
diff --git a/lib/pytz/zoneinfo/US/Aleutian b/lib/pytz/zoneinfo/US/Aleutian
new file mode 100644
index 0000000..b0a5dd6
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Aleutian differ
diff --git a/lib/pytz/zoneinfo/US/Arizona b/lib/pytz/zoneinfo/US/Arizona
new file mode 100644
index 0000000..adf2823
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Arizona differ
diff --git a/lib/pytz/zoneinfo/US/Central b/lib/pytz/zoneinfo/US/Central
new file mode 100644
index 0000000..3dd8f0f
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Central differ
diff --git a/lib/pytz/zoneinfo/US/East-Indiana b/lib/pytz/zoneinfo/US/East-Indiana
new file mode 100644
index 0000000..4a92c06
Binary files /dev/null and b/lib/pytz/zoneinfo/US/East-Indiana differ
diff --git a/lib/pytz/zoneinfo/US/Eastern b/lib/pytz/zoneinfo/US/Eastern
new file mode 100644
index 0000000..7553fee
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Eastern differ
diff --git a/lib/pytz/zoneinfo/US/Hawaii b/lib/pytz/zoneinfo/US/Hawaii
new file mode 100644
index 0000000..bd85577
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Hawaii differ
diff --git a/lib/pytz/zoneinfo/US/Indiana-Starke b/lib/pytz/zoneinfo/US/Indiana-Starke
new file mode 100644
index 0000000..cc785da
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Indiana-Starke differ
diff --git a/lib/pytz/zoneinfo/US/Michigan b/lib/pytz/zoneinfo/US/Michigan
new file mode 100644
index 0000000..a123b33
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Michigan differ
diff --git a/lib/pytz/zoneinfo/US/Mountain b/lib/pytz/zoneinfo/US/Mountain
new file mode 100644
index 0000000..7fc6691
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Mountain differ
diff --git a/lib/pytz/zoneinfo/US/Pacific b/lib/pytz/zoneinfo/US/Pacific
new file mode 100644
index 0000000..1fa9149
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Pacific differ
diff --git a/lib/pytz/zoneinfo/US/Pacific-New b/lib/pytz/zoneinfo/US/Pacific-New
new file mode 100644
index 0000000..1fa9149
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Pacific-New differ
diff --git a/lib/pytz/zoneinfo/US/Samoa b/lib/pytz/zoneinfo/US/Samoa
new file mode 100644
index 0000000..1d7649f
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Samoa differ
diff --git a/lib/pytz/zoneinfo/UTC b/lib/pytz/zoneinfo/UTC
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz/zoneinfo/UTC differ
diff --git a/lib/pytz/zoneinfo/Universal b/lib/pytz/zoneinfo/Universal
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz/zoneinfo/Universal differ
diff --git a/lib/pytz/zoneinfo/W-SU b/lib/pytz/zoneinfo/W-SU
new file mode 100644
index 0000000..bdbbaeb
Binary files /dev/null and b/lib/pytz/zoneinfo/W-SU differ
diff --git a/lib/pytz/zoneinfo/WET b/lib/pytz/zoneinfo/WET
new file mode 100644
index 0000000..444a193
Binary files /dev/null and b/lib/pytz/zoneinfo/WET differ
diff --git a/lib/pytz/zoneinfo/Zulu b/lib/pytz/zoneinfo/Zulu
new file mode 100644
index 0000000..c3b97f1
Binary files /dev/null and b/lib/pytz/zoneinfo/Zulu differ
diff --git a/lib/pytz/zoneinfo/iso3166.tab b/lib/pytz/zoneinfo/iso3166.tab
new file mode 100644
index 0000000..0b0b842
--- /dev/null
+++ b/lib/pytz/zoneinfo/iso3166.tab
@@ -0,0 +1,275 @@
+# ISO 3166 alpha-2 country codes
+#
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+#
+# From Paul Eggert (2014-07-18):
+# This file contains a table of two-letter country codes.  Columns are
+# separated by a single tab.  Lines beginning with '#' are comments.
+# Although all text currently uses ASCII encoding, this is planned to
+# change to UTF-8 soon.  The columns of the table are as follows:
+#
+# 1.  ISO 3166-1 alpha-2 country code, current as of
+#     ISO 3166-1 Newsletter VI-16 (2013-07-11).  See: Updates on ISO 3166
+#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+# 2.  The usual English name for the coded region,
+#     chosen so that alphabetic sorting of subsets produces helpful lists.
+#     This is not the same as the English name in the ISO 3166 tables.
+#
+# The table is sorted by country code.
+#
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
+#
+#country-
+#code	name of country, territory, area, or subdivision
+AD	Andorra
+AE	United Arab Emirates
+AF	Afghanistan
+AG	Antigua & Barbuda
+AI	Anguilla
+AL	Albania
+AM	Armenia
+AO	Angola
+AQ	Antarctica
+AR	Argentina
+AS	Samoa (American)
+AT	Austria
+AU	Australia
+AW	Aruba
+AX	Aaland Islands
+AZ	Azerbaijan
+BA	Bosnia & Herzegovina
+BB	Barbados
+BD	Bangladesh
+BE	Belgium
+BF	Burkina Faso
+BG	Bulgaria
+BH	Bahrain
+BI	Burundi
+BJ	Benin
+BL	St Barthelemy
+BM	Bermuda
+BN	Brunei
+BO	Bolivia
+BQ	Caribbean Netherlands
+BR	Brazil
+BS	Bahamas
+BT	Bhutan
+BV	Bouvet Island
+BW	Botswana
+BY	Belarus
+BZ	Belize
+CA	Canada
+CC	Cocos (Keeling) Islands
+CD	Congo (Dem. Rep.)
+CF	Central African Rep.
+CG	Congo (Rep.)
+CH	Switzerland
+CI	Cote d'Ivoire
+CK	Cook Islands
+CL	Chile
+CM	Cameroon
+CN	China
+CO	Colombia
+CR	Costa Rica
+CU	Cuba
+CV	Cape Verde
+CW	Curacao
+CX	Christmas Island
+CY	Cyprus
+CZ	Czech Republic
+DE	Germany
+DJ	Djibouti
+DK	Denmark
+DM	Dominica
+DO	Dominican Republic
+DZ	Algeria
+EC	Ecuador
+EE	Estonia
+EG	Egypt
+EH	Western Sahara
+ER	Eritrea
+ES	Spain
+ET	Ethiopia
+FI	Finland
+FJ	Fiji
+FK	Falkland Islands
+FM	Micronesia
+FO	Faroe Islands
+FR	France
+GA	Gabon
+GB	Britain (UK)
+GD	Grenada
+GE	Georgia
+GF	French Guiana
+GG	Guernsey
+GH	Ghana
+GI	Gibraltar
+GL	Greenland
+GM	Gambia
+GN	Guinea
+GP	Guadeloupe
+GQ	Equatorial Guinea
+GR	Greece
+GS	South Georgia & the South Sandwich Islands
+GT	Guatemala
+GU	Guam
+GW	Guinea-Bissau
+GY	Guyana
+HK	Hong Kong
+HM	Heard Island & McDonald Islands
+HN	Honduras
+HR	Croatia
+HT	Haiti
+HU	Hungary
+ID	Indonesia
+IE	Ireland
+IL	Israel
+IM	Isle of Man
+IN	India
+IO	British Indian Ocean Territory
+IQ	Iraq
+IR	Iran
+IS	Iceland
+IT	Italy
+JE	Jersey
+JM	Jamaica
+JO	Jordan
+JP	Japan
+KE	Kenya
+KG	Kyrgyzstan
+KH	Cambodia
+KI	Kiribati
+KM	Comoros
+KN	St Kitts & Nevis
+KP	Korea (North)
+KR	Korea (South)
+KW	Kuwait
+KY	Cayman Islands
+KZ	Kazakhstan
+LA	Laos
+LB	Lebanon
+LC	St Lucia
+LI	Liechtenstein
+LK	Sri Lanka
+LR	Liberia
+LS	Lesotho
+LT	Lithuania
+LU	Luxembourg
+LV	Latvia
+LY	Libya
+MA	Morocco
+MC	Monaco
+MD	Moldova
+ME	Montenegro
+MF	St Martin (French part)
+MG	Madagascar
+MH	Marshall Islands
+MK	Macedonia
+ML	Mali
+MM	Myanmar (Burma)
+MN	Mongolia
+MO	Macau
+MP	Northern Mariana Islands
+MQ	Martinique
+MR	Mauritania
+MS	Montserrat
+MT	Malta
+MU	Mauritius
+MV	Maldives
+MW	Malawi
+MX	Mexico
+MY	Malaysia
+MZ	Mozambique
+NA	Namibia
+NC	New Caledonia
+NE	Niger
+NF	Norfolk Island
+NG	Nigeria
+NI	Nicaragua
+NL	Netherlands
+NO	Norway
+NP	Nepal
+NR	Nauru
+NU	Niue
+NZ	New Zealand
+OM	Oman
+PA	Panama
+PE	Peru
+PF	French Polynesia
+PG	Papua New Guinea
+PH	Philippines
+PK	Pakistan
+PL	Poland
+PM	St Pierre & Miquelon
+PN	Pitcairn
+PR	Puerto Rico
+PS	Palestine
+PT	Portugal
+PW	Palau
+PY	Paraguay
+QA	Qatar
+RE	Reunion
+RO	Romania
+RS	Serbia
+RU	Russia
+RW	Rwanda
+SA	Saudi Arabia
+SB	Solomon Islands
+SC	Seychelles
+SD	Sudan
+SE	Sweden
+SG	Singapore
+SH	St Helena
+SI	Slovenia
+SJ	Svalbard & Jan Mayen
+SK	Slovakia
+SL	Sierra Leone
+SM	San Marino
+SN	Senegal
+SO	Somalia
+SR	Suriname
+SS	South Sudan
+ST	Sao Tome & Principe
+SV	El Salvador
+SX	St Maarten (Dutch part)
+SY	Syria
+SZ	Swaziland
+TC	Turks & Caicos Is
+TD	Chad
+TF	French Southern & Antarctic Lands
+TG	Togo
+TH	Thailand
+TJ	Tajikistan
+TK	Tokelau
+TL	East Timor
+TM	Turkmenistan
+TN	Tunisia
+TO	Tonga
+TR	Turkey
+TT	Trinidad & Tobago
+TV	Tuvalu
+TW	Taiwan
+TZ	Tanzania
+UA	Ukraine
+UG	Uganda
+UM	US minor outlying islands
+US	United States
+UY	Uruguay
+UZ	Uzbekistan
+VA	Vatican City
+VC	St Vincent
+VE	Venezuela
+VG	Virgin Islands (UK)
+VI	Virgin Islands (US)
+VN	Vietnam
+VU	Vanuatu
+WF	Wallis & Futuna
+WS	Samoa (western)
+YE	Yemen
+YT	Mayotte
+ZA	South Africa
+ZM	Zambia
+ZW	Zimbabwe
diff --git a/lib/pytz/zoneinfo/localtime b/lib/pytz/zoneinfo/localtime
new file mode 100644
index 0000000..c05e45f
Binary files /dev/null and b/lib/pytz/zoneinfo/localtime differ
diff --git a/lib/pytz/zoneinfo/posixrules b/lib/pytz/zoneinfo/posixrules
new file mode 100644
index 0000000..7553fee
Binary files /dev/null and b/lib/pytz/zoneinfo/posixrules differ
diff --git a/lib/pytz/zoneinfo/zone.tab b/lib/pytz/zoneinfo/zone.tab
new file mode 100644
index 0000000..a7373f1
--- /dev/null
+++ b/lib/pytz/zoneinfo/zone.tab
@@ -0,0 +1,440 @@
+# tz zone descriptions (deprecated version)
+#
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+#
+# From Paul Eggert (2014-07-31):
+# This file is intended as a backward-compatibility aid for older programs.
+# New programs should use zone1970.tab.  This file is like zone1970.tab (see
+# zone1970.tab's comments), but with the following additional restrictions:
+#
+# 1.  This file contains only ASCII characters.
+# 2.  The first data column contains exactly one country code.
+#
+# Because of (2), each row stands for an area that is the intersection
+# of a region identified by a country code and of a zone where civil
+# clocks have agreed since 1970; this is a narrower definition than
+# that of zone1970.tab.
+#
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
+#
+#country-
+#code	coordinates	TZ			comments
+AD	+4230+00131	Europe/Andorra
+AE	+2518+05518	Asia/Dubai
+AF	+3431+06912	Asia/Kabul
+AG	+1703-06148	America/Antigua
+AI	+1812-06304	America/Anguilla
+AL	+4120+01950	Europe/Tirane
+AM	+4011+04430	Asia/Yerevan
+AO	-0848+01314	Africa/Luanda
+AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
+AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
+AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
+AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
+AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
+AS	-1416-17042	Pacific/Pago_Pago
+AT	+4813+01620	Europe/Vienna
+AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-3749+14458	Australia/Melbourne	Victoria
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3455+13835	Australia/Adelaide	South Australia
+AU	-1228+13050	Australia/Darwin	Northern Territory
+AU	-3157+11551	Australia/Perth	Western Australia - most locations
+AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
+AW	+1230-06958	America/Aruba
+AX	+6006+01957	Europe/Mariehamn
+AZ	+4023+04951	Asia/Baku
+BA	+4352+01825	Europe/Sarajevo
+BB	+1306-05937	America/Barbados
+BD	+2343+09025	Asia/Dhaka
+BE	+5050+00420	Europe/Brussels
+BF	+1222-00131	Africa/Ouagadougou
+BG	+4241+02319	Europe/Sofia
+BH	+2623+05035	Asia/Bahrain
+BI	-0323+02922	Africa/Bujumbura
+BJ	+0629+00237	Africa/Porto-Novo
+BL	+1753-06251	America/St_Barthelemy
+BM	+3217-06446	Atlantic/Bermuda
+BN	+0456+11455	Asia/Brunei
+BO	-1630-06809	America/La_Paz
+BQ	+120903-0681636	America/Kralendijk
+BR	-0351-03225	America/Noronha	Atlantic islands
+BR	-0127-04829	America/Belem	Amapa, E Para
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0803-03454	America/Recife	Pernambuco
+BR	-0712-04812	America/Araguaina	Tocantins
+BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+BR	-1259-03831	America/Bahia	Bahia
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+BR	-1535-05605	America/Cuiaba	Mato Grosso
+BR	-0226-05452	America/Santarem	W Para
+BR	-0846-06354	America/Porto_Velho	Rondonia
+BR	+0249-06040	America/Boa_Vista	Roraima
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0958-06748	America/Rio_Branco	Acre
+BS	+2505-07721	America/Nassau
+BT	+2728+08939	Asia/Thimphu
+BW	-2439+02555	Africa/Gaborone
+BY	+5354+02734	Europe/Minsk
+BZ	+1730-08812	America/Belize
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CC	-1210+09655	Indian/Cocos
+CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
+CF	+0422+01835	Africa/Bangui
+CG	-0416+01517	Africa/Brazzaville
+CH	+4723+00832	Europe/Zurich
+CI	+0519-00402	Africa/Abidjan
+CK	-2114-15946	Pacific/Rarotonga
+CL	-3327-07040	America/Santiago	most locations
+CL	-2709-10926	Pacific/Easter	Easter Island
+CM	+0403+00942	Africa/Douala
+CN	+3114+12128	Asia/Shanghai	Beijing Time
+CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+CO	+0436-07405	America/Bogota
+CR	+0956-08405	America/Costa_Rica
+CU	+2308-08222	America/Havana
+CV	+1455-02331	Atlantic/Cape_Verde
+CW	+1211-06900	America/Curacao
+CX	-1025+10543	Indian/Christmas
+CY	+3510+03322	Asia/Nicosia
+CZ	+5005+01426	Europe/Prague
+DE	+5230+01322	Europe/Berlin	most locations
+DE	+4742+00841	Europe/Busingen	Busingen
+DJ	+1136+04309	Africa/Djibouti
+DK	+5540+01235	Europe/Copenhagen
+DM	+1518-06124	America/Dominica
+DO	+1828-06954	America/Santo_Domingo
+DZ	+3647+00303	Africa/Algiers
+EC	-0210-07950	America/Guayaquil	mainland
+EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+EE	+5925+02445	Europe/Tallinn
+EG	+3003+03115	Africa/Cairo
+EH	+2709-01312	Africa/El_Aaiun
+ER	+1520+03853	Africa/Asmara
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+2806-01524	Atlantic/Canary	Canary Islands
+ET	+0902+03842	Africa/Addis_Ababa
+FI	+6010+02458	Europe/Helsinki
+FJ	-1808+17825	Pacific/Fiji
+FK	-5142-05751	Atlantic/Stanley
+FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
+FM	+0519+16259	Pacific/Kosrae	Kosrae
+FO	+6201-00646	Atlantic/Faroe
+FR	+4852+00220	Europe/Paris
+GA	+0023+00927	Africa/Libreville
+GB	+513030-0000731	Europe/London
+GD	+1203-06145	America/Grenada
+GE	+4143+04449	Asia/Tbilisi
+GF	+0456-05220	America/Cayenne
+GG	+4927-00232	Europe/Guernsey
+GH	+0533-00013	Africa/Accra
+GI	+3608-00521	Europe/Gibraltar
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
+GM	+1328-01639	Africa/Banjul
+GN	+0931-01343	Africa/Conakry
+GP	+1614-06132	America/Guadeloupe
+GQ	+0345+00847	Africa/Malabo
+GR	+3758+02343	Europe/Athens
+GS	-5416-03632	Atlantic/South_Georgia
+GT	+1438-09031	America/Guatemala
+GU	+1328+14445	Pacific/Guam
+GW	+1151-01535	Africa/Bissau
+GY	+0648-05810	America/Guyana
+HK	+2217+11409	Asia/Hong_Kong
+HN	+1406-08713	America/Tegucigalpa
+HR	+4548+01558	Europe/Zagreb
+HT	+1832-07220	America/Port-au-Prince
+HU	+4730+01905	Europe/Budapest
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
+IE	+5320-00615	Europe/Dublin
+IL	+314650+0351326	Asia/Jerusalem
+IM	+5409-00428	Europe/Isle_of_Man
+IN	+2232+08822	Asia/Kolkata
+IO	-0720+07225	Indian/Chagos
+IQ	+3321+04425	Asia/Baghdad
+IR	+3540+05126	Asia/Tehran
+IS	+6409-02151	Atlantic/Reykjavik
+IT	+4154+01229	Europe/Rome
+JE	+4912-00207	Europe/Jersey
+JM	+175805-0764736	America/Jamaica
+JO	+3157+03556	Asia/Amman
+JP	+353916+1394441	Asia/Tokyo
+KE	-0117+03649	Africa/Nairobi
+KG	+4254+07436	Asia/Bishkek
+KH	+1133+10455	Asia/Phnom_Penh
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+KI	+0152-15720	Pacific/Kiritimati	Line Islands
+KM	-1141+04316	Indian/Comoro
+KN	+1718-06243	America/St_Kitts
+KP	+3901+12545	Asia/Pyongyang
+KR	+3733+12658	Asia/Seoul
+KW	+2920+04759	Asia/Kuwait
+KY	+1918-08123	America/Cayman
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+5113+05121	Asia/Oral	West Kazakhstan
+LA	+1758+10236	Asia/Vientiane
+LB	+3353+03530	Asia/Beirut
+LC	+1401-06100	America/St_Lucia
+LI	+4709+00931	Europe/Vaduz
+LK	+0656+07951	Asia/Colombo
+LR	+0618-01047	Africa/Monrovia
+LS	-2928+02730	Africa/Maseru
+LT	+5441+02519	Europe/Vilnius
+LU	+4936+00609	Europe/Luxembourg
+LV	+5657+02406	Europe/Riga
+LY	+3254+01311	Africa/Tripoli
+MA	+3339-00735	Africa/Casablanca
+MC	+4342+00723	Europe/Monaco
+MD	+4700+02850	Europe/Chisinau
+ME	+4226+01916	Europe/Podgorica
+MF	+1804-06305	America/Marigot
+MG	-1855+04731	Indian/Antananarivo
+MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+MK	+4159+02126	Europe/Skopje
+ML	+1239-00800	Africa/Bamako
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+MO	+2214+11335	Asia/Macau
+MP	+1512+14545	Pacific/Saipan
+MQ	+1436-06105	America/Martinique
+MR	+1806-01557	Africa/Nouakchott
+MS	+1643-06213	America/Montserrat
+MT	+3554+01431	Europe/Malta
+MU	-2010+05730	Indian/Mauritius
+MV	+0410+07330	Indian/Maldives
+MW	-1547+03500	Africa/Blantyre
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MZ	-2558+03235	Africa/Maputo
+NA	-2234+01706	Africa/Windhoek
+NC	-2216+16627	Pacific/Noumea
+NE	+1331+00207	Africa/Niamey
+NF	-2903+16758	Pacific/Norfolk
+NG	+0627+00324	Africa/Lagos
+NI	+1209-08617	America/Managua
+NL	+5222+00454	Europe/Amsterdam
+NO	+5955+01045	Europe/Oslo
+NP	+2743+08519	Asia/Kathmandu
+NR	-0031+16655	Pacific/Nauru
+NU	-1901-16955	Pacific/Niue
+NZ	-3652+17446	Pacific/Auckland	most locations
+NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+OM	+2336+05835	Asia/Muscat
+PA	+0858-07932	America/Panama
+PE	-1203-07703	America/Lima
+PF	-1732-14934	Pacific/Tahiti	Society Islands
+PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG	-0930+14710	Pacific/Port_Moresby	most locations
+PG	-0613+15534	Pacific/Bougainville	Bougainville
+PH	+1435+12100	Asia/Manila
+PK	+2452+06703	Asia/Karachi
+PL	+5215+02100	Europe/Warsaw
+PM	+4703-05620	America/Miquelon
+PN	-2504-13005	Pacific/Pitcairn
+PR	+182806-0660622	America/Puerto_Rico
+PS	+3130+03428	Asia/Gaza	Gaza Strip
+PS	+313200+0350542	Asia/Hebron	West Bank
+PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+PT	+3744-02540	Atlantic/Azores	Azores
+PW	+0720+13429	Pacific/Palau
+PY	-2516-05740	America/Asuncion
+QA	+2517+05132	Asia/Qatar
+RE	-2052+05528	Indian/Reunion
+RO	+4426+02606	Europe/Bucharest
+RS	+4450+02030	Europe/Belgrade
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+RW	-0157+03004	Africa/Kigali
+SA	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Indian/Mahe
+SD	+1536+03232	Africa/Khartoum
+SE	+5920+01803	Europe/Stockholm
+SG	+0117+10351	Asia/Singapore
+SH	-1555-00542	Atlantic/St_Helena
+SI	+4603+01431	Europe/Ljubljana
+SJ	+7800+01600	Arctic/Longyearbyen
+SK	+4809+01707	Europe/Bratislava
+SL	+0830-01315	Africa/Freetown
+SM	+4355+01228	Europe/San_Marino
+SN	+1440-01726	Africa/Dakar
+SO	+0204+04522	Africa/Mogadishu
+SR	+0550-05510	America/Paramaribo
+SS	+0451+03136	Africa/Juba
+ST	+0020+00644	Africa/Sao_Tome
+SV	+1342-08912	America/El_Salvador
+SX	+180305-0630250	America/Lower_Princes
+SY	+3330+03618	Asia/Damascus
+SZ	-2618+03106	Africa/Mbabane
+TC	+2128-07108	America/Grand_Turk
+TD	+1207+01503	Africa/Ndjamena
+TF	-492110+0701303	Indian/Kerguelen
+TG	+0608+00113	Africa/Lome
+TH	+1345+10031	Asia/Bangkok
+TJ	+3835+06848	Asia/Dushanbe
+TK	-0922-17114	Pacific/Fakaofo
+TL	-0833+12535	Asia/Dili
+TM	+3757+05823	Asia/Ashgabat
+TN	+3648+01011	Africa/Tunis
+TO	-2110-17510	Pacific/Tongatapu
+TR	+4101+02858	Europe/Istanbul
+TT	+1039-06131	America/Port_of_Spain
+TV	-0831+17913	Pacific/Funafuti
+TW	+2503+12130	Asia/Taipei
+TZ	-0648+03917	Africa/Dar_es_Salaam
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UG	+0019+03225	Africa/Kampala
+UM	+1645-16931	Pacific/Johnston	Johnston Atoll
+UM	+2813-17722	Pacific/Midway	Midway Islands
+UM	+1917+16637	Pacific/Wake	Wake Island
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
+US	+211825-1575130	Pacific/Honolulu	Hawaii
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+VA	+415408+0122711	Europe/Vatican
+VC	+1309-06114	America/St_Vincent
+VE	+1030-06656	America/Caracas
+VG	+1827-06437	America/Tortola
+VI	+1821-06456	America/St_Thomas
+VN	+1045+10640	Asia/Ho_Chi_Minh
+VU	-1740+16825	Pacific/Efate
+WF	-1318-17610	Pacific/Wallis
+WS	-1350-17144	Pacific/Apia
+YE	+1245+04512	Asia/Aden
+YT	-1247+04514	Indian/Mayotte
+ZA	-2615+02800	Africa/Johannesburg
+ZM	-1525+02817	Africa/Lusaka
+ZW	-1750+03103	Africa/Harare
diff --git a/lib/pytz/zoneinfo/zone1970.tab b/lib/pytz/zoneinfo/zone1970.tab
new file mode 100644
index 0000000..e971bc7
--- /dev/null
+++ b/lib/pytz/zoneinfo/zone1970.tab
@@ -0,0 +1,371 @@
+# tz zone descriptions
+#
+# This file is in the public domain.
+#
+# From Paul Eggert (2014-07-31):
+# This file contains a table where each row stands for a zone where
+# civil time stamps have agreed since 1970.  Columns are separated by
+# a single tab.  Lines beginning with '#' are comments.  All text uses
+# UTF-8 encoding.  The columns of the table are as follows:
+#
+# 1.  The countries that overlap the zone, as a comma-separated list
+#     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
+# 2.  Latitude and longitude of the zone's principal location
+#     in ISO 6709 sign-degrees-minutes-seconds format,
+#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
+#     first latitude (+ is north), then longitude (+ is east).
+# 3.  Zone name used in value of TZ environment variable.
+#     Please see the 'Theory' file for how zone names are chosen.
+#     If multiple zones overlap a country, each has a row in the
+#     table, with each column 1 containing the country code.
+# 4.  Comments; present if and only if a country has multiple zones.
+#
+# If a zone covers multiple countries, the most-populous city is used,
+# and that country is listed first in column 1; any other countries
+# are listed alphabetically by country code.  The table is sorted
+# first by country code, then (if possible) by an order within the
+# country that (1) makes some geographical sense, and (2) puts the
+# most populous zones first, where that does not contradict (1).
+#
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
+#
+#country-
+#codes	coordinates	TZ	comments
+AD	+4230+00131	Europe/Andorra
+AE,OM	+2518+05518	Asia/Dubai
+AF	+3431+06912	Asia/Kabul
+AL	+4120+01950	Europe/Tirane
+AM	+4011+04430	Asia/Yerevan
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adélie Land
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
+AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
+AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
+AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
+AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
+AS,UM	-1416-17042	Pacific/Pago_Pago	Samoa, Midway
+AT	+4813+01620	Europe/Vienna
+AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-3749+14458	Australia/Melbourne	Victoria
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3455+13835	Australia/Adelaide	South Australia
+AU	-1228+13050	Australia/Darwin	Northern Territory
+AU	-3157+11551	Australia/Perth	Western Australia - most locations
+AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
+AZ	+4023+04951	Asia/Baku
+BB	+1306-05937	America/Barbados
+BD	+2343+09025	Asia/Dhaka
+BE	+5050+00420	Europe/Brussels
+BG	+4241+02319	Europe/Sofia
+BM	+3217-06446	Atlantic/Bermuda
+BN	+0456+11455	Asia/Brunei
+BO	-1630-06809	America/La_Paz
+BR	-0351-03225	America/Noronha	Atlantic islands
+BR	-0127-04829	America/Belem	Amapá, E Pará
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0803-03454	America/Recife	Pernambuco
+BR	-0712-04812	America/Araguaina	Tocantins
+BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+BR	-1259-03831	America/Bahia	Bahia
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+BR	-1535-05605	America/Cuiaba	Mato Grosso
+BR	-0226-05452	America/Santarem	W Pará
+BR	-0846-06354	America/Porto_Velho	Rondônia
+BR	+0249-06040	America/Boa_Vista	Roraima
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0958-06748	America/Rio_Branco	Acre
+BS	+2505-07721	America/Nassau
+BT	+2728+08939	Asia/Thimphu
+BY	+5354+02734	Europe/Minsk
+BZ	+1730-08812	America/Belize
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CC	-1210+09655	Indian/Cocos
+CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+CK	-2114-15946	Pacific/Rarotonga
+CL	-3327-07040	America/Santiago	most locations
+CL	-2709-10926	Pacific/Easter	Easter Island
+CN	+3114+12128	Asia/Shanghai	Beijing Time
+CN	+4348+08735	Asia/Urumqi	Xinjiang Time
+CO	+0436-07405	America/Bogota
+CR	+0956-08405	America/Costa_Rica
+CU	+2308-08222	America/Havana
+CV	+1455-02331	Atlantic/Cape_Verde
+CW,AW,BQ,SX	+1211-06900	America/Curacao
+CX	-1025+10543	Indian/Christmas
+CY	+3510+03322	Asia/Nicosia
+CZ,SK	+5005+01426	Europe/Prague
+DE	+5230+01322	Europe/Berlin	Berlin time
+DK	+5540+01235	Europe/Copenhagen
+DO	+1828-06954	America/Santo_Domingo
+DZ	+3647+00303	Africa/Algiers
+EC	-0210-07950	America/Guayaquil	mainland
+EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
+EE	+5925+02445	Europe/Tallinn
+EG	+3003+03115	Africa/Cairo
+EH	+2709-01312	Africa/El_Aaiun
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+2806-01524	Atlantic/Canary	Canary Islands
+FI,AX	+6010+02458	Europe/Helsinki
+FJ	-1808+17825	Pacific/Fiji
+FK	-5142-05751	Atlantic/Stanley
+FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
+FM	+0519+16259	Pacific/Kosrae	Kosrae
+FO	+6201-00646	Atlantic/Faroe
+FR	+4852+00220	Europe/Paris
+GB,GG,IM,JE	+513030-0000731	Europe/London
+GE	+4143+04449	Asia/Tbilisi
+GF	+0456-05220	America/Cayenne
+GH	+0533-00013	Africa/Accra
+GI	+3608-00521	Europe/Gibraltar
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
+GR	+3758+02343	Europe/Athens
+GS	-5416-03632	Atlantic/South_Georgia
+GT	+1438-09031	America/Guatemala
+GU,MP	+1328+14445	Pacific/Guam
+GW	+1151-01535	Africa/Bissau
+GY	+0648-05810	America/Guyana
+HK	+2217+11409	Asia/Hong_Kong
+HN	+1406-08713	America/Tegucigalpa
+HT	+1832-07220	America/Port-au-Prince
+HU	+4730+01905	Europe/Budapest
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
+IE	+5320-00615	Europe/Dublin
+IL	+314650+0351326	Asia/Jerusalem
+IN	+2232+08822	Asia/Kolkata
+IO	-0720+07225	Indian/Chagos
+IQ	+3321+04425	Asia/Baghdad
+IR	+3540+05126	Asia/Tehran
+IS	+6409-02151	Atlantic/Reykjavik
+IT,SM,VA	+4154+01229	Europe/Rome
+JM	+175805-0764736	America/Jamaica
+JO	+3157+03556	Asia/Amman
+JP	+353916+1394441	Asia/Tokyo
+KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
+KG	+4254+07436	Asia/Bishkek
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+KI	+0152-15720	Pacific/Kiritimati	Line Islands
+KP	+3901+12545	Asia/Pyongyang
+KR	+3733+12658	Asia/Seoul
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+5113+05121	Asia/Oral	West Kazakhstan
+LB	+3353+03530	Asia/Beirut
+LK	+0656+07951	Asia/Colombo
+LR	+0618-01047	Africa/Monrovia
+LT	+5441+02519	Europe/Vilnius
+LU	+4936+00609	Europe/Luxembourg
+LV	+5657+02406	Europe/Riga
+LY	+3254+01311	Africa/Tripoli
+MA	+3339-00735	Africa/Casablanca
+MC	+4342+00723	Europe/Monaco
+MD	+4700+02850	Europe/Chisinau
+MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+MO	+2214+11335	Asia/Macau
+MQ	+1436-06105	America/Martinique
+MT	+3554+01431	Europe/Malta
+MU	-2010+05730	Indian/Mauritius
+MV	+0410+07330	Indian/Maldives
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
+NA	-2234+01706	Africa/Windhoek
+NC	-2216+16627	Pacific/Noumea
+NF	-2903+16758	Pacific/Norfolk
+NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
+NI	+1209-08617	America/Managua
+NL	+5222+00454	Europe/Amsterdam
+NO,SJ	+5955+01045	Europe/Oslo
+NP	+2743+08519	Asia/Kathmandu
+NR	-0031+16655	Pacific/Nauru
+NU	-1901-16955	Pacific/Niue
+NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
+NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+PA,KY	+0858-07932	America/Panama
+PE	-1203-07703	America/Lima
+PF	-1732-14934	Pacific/Tahiti	Society Islands
+PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG	-0930+14710	Pacific/Port_Moresby	most locations
+PG	-0613+15534	Pacific/Bougainville	Bougainville
+PH	+1435+12100	Asia/Manila
+PK	+2452+06703	Asia/Karachi
+PL	+5215+02100	Europe/Warsaw
+PM	+4703-05620	America/Miquelon
+PN	-2504-13005	Pacific/Pitcairn
+PR	+182806-0660622	America/Puerto_Rico
+PS	+3130+03428	Asia/Gaza	Gaza Strip
+PS	+313200+0350542	Asia/Hebron	West Bank
+PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+PT	+3744-02540	Atlantic/Azores	Azores
+PW	+0720+13429	Pacific/Palau
+PY	-2516-05740	America/Asuncion
+QA,BH	+2517+05132	Asia/Qatar
+RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
+RO	+4426+02606	Europe/Bucharest
+RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+SA,KW,YE	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Indian/Mahe
+SD,SS	+1536+03232	Africa/Khartoum
+SE	+5920+01803	Europe/Stockholm
+SG	+0117+10351	Asia/Singapore
+SR	+0550-05510	America/Paramaribo
+SV	+1342-08912	America/El_Salvador
+SY	+3330+03618	Asia/Damascus
+TC	+2128-07108	America/Grand_Turk
+TD	+1207+01503	Africa/Ndjamena
+TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+TH,KH,LA,VN	+1345+10031	Asia/Bangkok	most of Indochina
+TJ	+3835+06848	Asia/Dushanbe
+TK	-0922-17114	Pacific/Fakaofo
+TL	-0833+12535	Asia/Dili
+TM	+3757+05823	Asia/Ashgabat
+TN	+3648+01011	Africa/Tunis
+TO	-2110-17510	Pacific/Tongatapu
+TR	+4101+02858	Europe/Istanbul
+TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+TV	-0831+17913	Pacific/Funafuti
+TW	+2503+12130	Asia/Taipei
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UM	+1917+16637	Pacific/Wake	Wake Island
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
+US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+VE	+1030-06656	America/Caracas
+VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
+VU	-1740+16825	Pacific/Efate
+WF	-1318-17610	Pacific/Wallis
+WS	-1350-17144	Pacific/Apia
+ZA,LS,SZ	-2615+02800	Africa/Johannesburg
diff --git a/lib/requests/__init__.py b/lib/requests/__init__.py
old mode 100755
new mode 100644
index 2e33412..0ec3566
--- a/lib/requests/__init__.py
+++ b/lib/requests/__init__.py
@@ -13,7 +13,7 @@ Requests is an HTTP library, written in Python, for human beings. Basic GET
 usage:
 
    >>> import requests
-   >>> r = requests.get('http://python.org')
+   >>> r = requests.get('https://www.python.org')
    >>> r.status_code
    200
    >>> 'Python is a programming language' in r.content
@@ -22,8 +22,8 @@ usage:
 ... or POST:
 
    >>> payload = dict(key1='value1', key2='value2')
-   >>> r = requests.post("http://httpbin.org/post", data=payload)
-   >>> print r.text
+   >>> r = requests.post('http://httpbin.org/post', data=payload)
+   >>> print(r.text)
    {
      ...
      "form": {
@@ -36,21 +36,27 @@ usage:
 The other HTTP methods are supported - see `requests.api`. Full documentation
 is at <http://python-requests.org>.
 
-:copyright: (c) 2012 by Kenneth Reitz.
-:license: ISC, see LICENSE for more details.
+:copyright: (c) 2015 by Kenneth Reitz.
+:license: Apache 2.0, see LICENSE for more details.
 
 """
 
 __title__ = 'requests'
-__version__ = '0.14.1'
-__build__ = 0x001401
+__version__ = '2.5.1'
+__build__ = 0x020501
 __author__ = 'Kenneth Reitz'
-__license__ = 'ISC'
-__copyright__ = 'Copyright 2012 Kenneth Reitz'
+__license__ = 'Apache 2.0'
+__copyright__ = 'Copyright 2015 Kenneth Reitz'
 
+# Attempt to enable urllib3's SNI support, if possible
+try:
+    from .packages.urllib3.contrib import pyopenssl
+    pyopenssl.inject_into_urllib3()
+except ImportError:
+    pass
 
 from . import utils
-from .models import Request, Response
+from .models import Request, Response, PreparedRequest
 from .api import request, get, head, post, patch, put, delete, options
 from .sessions import session, Session
 from .status_codes import codes
@@ -58,3 +64,14 @@ from .exceptions import (
     RequestException, Timeout, URLRequired,
     TooManyRedirects, HTTPError, ConnectionError
 )
+
+# Set default logging handler to avoid "No handler found" warnings.
+import logging
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
+
+logging.getLogger(__name__).addHandler(NullHandler())
diff --git a/lib/requests/__init__.pyc b/lib/requests/__init__.pyc
index 3869393..50f08e5 100644
Binary files a/lib/requests/__init__.pyc and b/lib/requests/__init__.pyc differ
diff --git a/lib/requests/_oauth.py b/lib/requests/_oauth.py
deleted file mode 100755
index 055154d..0000000
--- a/lib/requests/_oauth.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests._oauth
-~~~~~~~~~~~~~~~
-
-This module contains the path hack necessary for oauthlib to be vendored into
-requests while allowing upstream changes.
-"""
-
-import os
-import sys
-
-try:
-    from oauthlib.oauth1 import rfc5849
-    from oauthlib.common import extract_params
-    from oauthlib.oauth1.rfc5849 import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER)
-except ImportError:
-    from .packages import oauthlib
-    sys.modules['oauthlib'] = oauthlib
-    from oauthlib.oauth1 import rfc5849
-    from oauthlib.common import extract_params
-    from oauthlib.oauth1.rfc5849 import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER)
diff --git a/lib/requests/_oauth.pyc b/lib/requests/_oauth.pyc
deleted file mode 100644
index 0b9643e..0000000
Binary files a/lib/requests/_oauth.pyc and /dev/null differ
diff --git a/lib/requests/adapters.py b/lib/requests/adapters.py
new file mode 100644
index 0000000..c892853
--- /dev/null
+++ b/lib/requests/adapters.py
@@ -0,0 +1,437 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.adapters
+~~~~~~~~~~~~~~~~~
+
+This module contains the transport adapters that Requests uses to define
+and maintain connections.
+"""
+
+import socket
+
+from .models import Response
+from .packages.urllib3 import Retry
+from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
+from .packages.urllib3.response import HTTPResponse
+from .packages.urllib3.util import Timeout as TimeoutSauce
+from .compat import urlparse, basestring
+from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
+                    prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
+from .structures import CaseInsensitiveDict
+from .packages.urllib3.exceptions import ConnectTimeoutError
+from .packages.urllib3.exceptions import HTTPError as _HTTPError
+from .packages.urllib3.exceptions import MaxRetryError
+from .packages.urllib3.exceptions import ProxyError as _ProxyError
+from .packages.urllib3.exceptions import ProtocolError
+from .packages.urllib3.exceptions import ReadTimeoutError
+from .packages.urllib3.exceptions import SSLError as _SSLError
+from .packages.urllib3.exceptions import ResponseError
+from .cookies import extract_cookies_to_jar
+from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
+                         ProxyError, RetryError)
+from .auth import _basic_auth_str
+
+DEFAULT_POOLBLOCK = False
+DEFAULT_POOLSIZE = 10
+DEFAULT_RETRIES = 0
+
+
+class BaseAdapter(object):
+    """The Base Transport Adapter"""
+
+    def __init__(self):
+        super(BaseAdapter, self).__init__()
+
+    def send(self):
+        raise NotImplementedError
+
+    def close(self):
+        raise NotImplementedError
+
+
+class HTTPAdapter(BaseAdapter):
+    """The built-in HTTP Adapter for urllib3.
+
+    Provides a general-case interface for Requests sessions to contact HTTP and
+    HTTPS urls by implementing the Transport Adapter interface. This class will
+    usually be created by the :class:`Session <Session>` class under the
+    covers.
+
+    :param pool_connections: The number of urllib3 connection pools to cache.
+    :param pool_maxsize: The maximum number of connections to save in the pool.
+    :param int max_retries: The maximum number of retries each connection
+        should attempt. Note, this applies only to failed DNS lookups, socket
+        connections and connection timeouts, never to requests where data has
+        made it to the server. By default, Requests does not retry failed
+        connections. If you need granular control over the conditions under
+        which we retry a request, import urllib3's ``Retry`` class and pass
+        that instead.
+    :param pool_block: Whether the connection pool should block for connections.
+
+    Usage::
+
+      >>> import requests
+      >>> s = requests.Session()
+      >>> a = requests.adapters.HTTPAdapter(max_retries=3)
+      >>> s.mount('http://', a)
+    """
+    __attrs__ = ['max_retries', 'config', '_pool_connections', '_pool_maxsize',
+                 '_pool_block']
+
+    def __init__(self, pool_connections=DEFAULT_POOLSIZE,
+                 pool_maxsize=DEFAULT_POOLSIZE, max_retries=DEFAULT_RETRIES,
+                 pool_block=DEFAULT_POOLBLOCK):
+        if max_retries == DEFAULT_RETRIES:
+            self.max_retries = Retry(0, read=False)
+        else:
+            self.max_retries = Retry.from_int(max_retries)
+        self.config = {}
+        self.proxy_manager = {}
+
+        super(HTTPAdapter, self).__init__()
+
+        self._pool_connections = pool_connections
+        self._pool_maxsize = pool_maxsize
+        self._pool_block = pool_block
+
+        self.init_poolmanager(pool_connections, pool_maxsize, block=pool_block)
+
+    def __getstate__(self):
+        return dict((attr, getattr(self, attr, None)) for attr in
+                    self.__attrs__)
+
+    def __setstate__(self, state):
+        # Can't handle by adding 'proxy_manager' to self.__attrs__ because
+        # because self.poolmanager uses a lambda function, which isn't pickleable.
+        self.proxy_manager = {}
+        self.config = {}
+
+        for attr, value in state.items():
+            setattr(self, attr, value)
+
+        self.init_poolmanager(self._pool_connections, self._pool_maxsize,
+                              block=self._pool_block)
+
+    def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs):
+        """Initializes a urllib3 PoolManager.
+
+        This method should not be called from user code, and is only
+        exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param connections: The number of urllib3 connection pools to cache.
+        :param maxsize: The maximum number of connections to save in the pool.
+        :param block: Block when no free connections are available.
+        :param pool_kwargs: Extra keyword arguments used to initialize the Pool Manager.
+        """
+        # save these values for pickling
+        self._pool_connections = connections
+        self._pool_maxsize = maxsize
+        self._pool_block = block
+
+        self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize,
+                                       block=block, strict=True, **pool_kwargs)
+
+    def proxy_manager_for(self, proxy, **proxy_kwargs):
+        """Return urllib3 ProxyManager for the given proxy.
+
+        This method should not be called from user code, and is only
+        exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param proxy: The proxy to return a urllib3 ProxyManager for.
+        :param proxy_kwargs: Extra keyword arguments used to configure the Proxy Manager.
+        :returns: ProxyManager
+        """
+        if not proxy in self.proxy_manager:
+            proxy_headers = self.proxy_headers(proxy)
+            self.proxy_manager[proxy] = proxy_from_url(
+                proxy,
+                proxy_headers=proxy_headers,
+                num_pools=self._pool_connections,
+                maxsize=self._pool_maxsize,
+                block=self._pool_block,
+                **proxy_kwargs)
+
+        return self.proxy_manager[proxy]
+
+    def cert_verify(self, conn, url, verify, cert):
+        """Verify a SSL certificate. This method should not be called from user
+        code, and is only exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param conn: The urllib3 connection object associated with the cert.
+        :param url: The requested URL.
+        :param verify: Whether we should actually verify the certificate.
+        :param cert: The SSL certificate to verify.
+        """
+        if url.lower().startswith('https') and verify:
+
+            cert_loc = None
+
+            # Allow self-specified cert location.
+            if verify is not True:
+                cert_loc = verify
+
+            if not cert_loc:
+                cert_loc = DEFAULT_CA_BUNDLE_PATH
+
+            if not cert_loc:
+                raise Exception("Could not find a suitable SSL CA certificate bundle.")
+
+            conn.cert_reqs = 'CERT_REQUIRED'
+            conn.ca_certs = cert_loc
+        else:
+            conn.cert_reqs = 'CERT_NONE'
+            conn.ca_certs = None
+
+        if cert:
+            if not isinstance(cert, basestring):
+                conn.cert_file = cert[0]
+                conn.key_file = cert[1]
+            else:
+                conn.cert_file = cert
+
+    def build_response(self, req, resp):
+        """Builds a :class:`Response <requests.Response>` object from a urllib3
+        response. This should not be called from user code, and is only exposed
+        for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`
+
+        :param req: The :class:`PreparedRequest <PreparedRequest>` used to generate the response.
+        :param resp: The urllib3 response object.
+        """
+        response = Response()
+
+        # Fallback to None if there's no status_code, for whatever reason.
+        response.status_code = getattr(resp, 'status', None)
+
+        # Make headers case-insensitive.
+        response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
+
+        # Set encoding.
+        response.encoding = get_encoding_from_headers(response.headers)
+        response.raw = resp
+        response.reason = response.raw.reason
+
+        if isinstance(req.url, bytes):
+            response.url = req.url.decode('utf-8')
+        else:
+            response.url = req.url
+
+        # Add new cookies from the server.
+        extract_cookies_to_jar(response.cookies, req, resp)
+
+        # Give the Response some context.
+        response.request = req
+        response.connection = self
+
+        return response
+
+    def get_connection(self, url, proxies=None):
+        """Returns a urllib3 connection for the given URL. This should not be
+        called from user code, and is only exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param url: The URL to connect to.
+        :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
+        """
+        proxies = proxies or {}
+        proxy = proxies.get(urlparse(url.lower()).scheme)
+
+        if proxy:
+            proxy = prepend_scheme_if_needed(proxy, 'http')
+            proxy_manager = self.proxy_manager_for(proxy)
+            conn = proxy_manager.connection_from_url(url)
+        else:
+            # Only scheme should be lower case
+            parsed = urlparse(url)
+            url = parsed.geturl()
+            conn = self.poolmanager.connection_from_url(url)
+
+        return conn
+
+    def close(self):
+        """Disposes of any internal state.
+
+        Currently, this just closes the PoolManager, which closes pooled
+        connections.
+        """
+        self.poolmanager.clear()
+
+    def request_url(self, request, proxies):
+        """Obtain the url to use when making the final request.
+
+        If the message is being sent through a HTTP proxy, the full URL has to
+        be used. Otherwise, we should only use the path portion of the URL.
+
+        This should not be called from user code, and is only exposed for use
+        when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
+        :param proxies: A dictionary of schemes to proxy URLs.
+        """
+        proxies = proxies or {}
+        scheme = urlparse(request.url).scheme
+        proxy = proxies.get(scheme)
+
+        if proxy and scheme != 'https':
+            url = urldefragauth(request.url)
+        else:
+            url = request.path_url
+
+        return url
+
+    def add_headers(self, request, **kwargs):
+        """Add any headers needed by the connection. As of v2.0 this does
+        nothing by default, but is left for overriding by users that subclass
+        the :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        This should not be called from user code, and is only exposed for use
+        when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param request: The :class:`PreparedRequest <PreparedRequest>` to add headers to.
+        :param kwargs: The keyword arguments from the call to send().
+        """
+        pass
+
+    def proxy_headers(self, proxy):
+        """Returns a dictionary of the headers to add to any request sent
+        through a proxy. This works with urllib3 magic to ensure that they are
+        correctly sent to the proxy, rather than in a tunnelled request if
+        CONNECT is being used.
+
+        This should not be called from user code, and is only exposed for use
+        when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param proxies: The url of the proxy being used for this request.
+        :param kwargs: Optional additional keyword arguments.
+        """
+        headers = {}
+        username, password = get_auth_from_url(proxy)
+
+        if username and password:
+            headers['Proxy-Authorization'] = _basic_auth_str(username,
+                                                             password)
+
+        return headers
+
+    def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None):
+        """Sends PreparedRequest object. Returns Response object.
+
+        :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
+        :param stream: (optional) Whether to stream the request content.
+        :param timeout: (optional) How long to wait for the server to send
+            data before giving up, as a float, or a (`connect timeout, read
+            timeout <user/advanced.html#timeouts>`_) tuple.
+        :type timeout: float or tuple
+        :param verify: (optional) Whether to verify SSL certificates.
+        :param cert: (optional) Any user-provided SSL certificate to be trusted.
+        :param proxies: (optional) The proxies dictionary to apply to the request.
+        """
+
+        conn = self.get_connection(request.url, proxies)
+
+        self.cert_verify(conn, request.url, verify, cert)
+        url = self.request_url(request, proxies)
+        self.add_headers(request)
+
+        chunked = not (request.body is None or 'Content-Length' in request.headers)
+
+        if isinstance(timeout, tuple):
+            try:
+                connect, read = timeout
+                timeout = TimeoutSauce(connect=connect, read=read)
+            except ValueError as e:
+                # this may raise a string formatting error.
+                err = ("Invalid timeout {0}. Pass a (connect, read) "
+                       "timeout tuple, or a single float to set "
+                       "both timeouts to the same value".format(timeout))
+                raise ValueError(err)
+        else:
+            timeout = TimeoutSauce(connect=timeout, read=timeout)
+
+        try:
+            if not chunked:
+                resp = conn.urlopen(
+                    method=request.method,
+                    url=url,
+                    body=request.body,
+                    headers=request.headers,
+                    redirect=False,
+                    assert_same_host=False,
+                    preload_content=False,
+                    decode_content=False,
+                    retries=self.max_retries,
+                    timeout=timeout
+                )
+
+            # Send the request.
+            else:
+                if hasattr(conn, 'proxy_pool'):
+                    conn = conn.proxy_pool
+
+                low_conn = conn._get_conn(timeout=timeout)
+
+                try:
+                    low_conn.putrequest(request.method,
+                                        url,
+                                        skip_accept_encoding=True)
+
+                    for header, value in request.headers.items():
+                        low_conn.putheader(header, value)
+
+                    low_conn.endheaders()
+
+                    for i in request.body:
+                        low_conn.send(hex(len(i))[2:].encode('utf-8'))
+                        low_conn.send(b'\r\n')
+                        low_conn.send(i)
+                        low_conn.send(b'\r\n')
+                    low_conn.send(b'0\r\n\r\n')
+
+                    r = low_conn.getresponse()
+                    resp = HTTPResponse.from_httplib(
+                        r,
+                        pool=conn,
+                        connection=low_conn,
+                        preload_content=False,
+                        decode_content=False
+                    )
+                except:
+                    # If we hit any problems here, clean up the connection.
+                    # Then, reraise so that we can handle the actual exception.
+                    low_conn.close()
+                    raise
+                else:
+                    # All is well, return the connection to the pool.
+                    conn._put_conn(low_conn)
+
+        except (ProtocolError, socket.error) as err:
+            raise ConnectionError(err, request=request)
+
+        except MaxRetryError as e:
+            if isinstance(e.reason, ConnectTimeoutError):
+                raise ConnectTimeout(e, request=request)
+
+            if isinstance(e.reason, ResponseError):
+                raise RetryError(e, request=request)
+
+            raise ConnectionError(e, request=request)
+
+        except _ProxyError as e:
+            raise ProxyError(e)
+
+        except (_SSLError, _HTTPError) as e:
+            if isinstance(e, _SSLError):
+                raise SSLError(e, request=request)
+            elif isinstance(e, ReadTimeoutError):
+                raise ReadTimeout(e, request=request)
+            else:
+                raise
+
+        return self.build_response(request, resp)
diff --git a/lib/requests/adapters.pyc b/lib/requests/adapters.pyc
new file mode 100644
index 0000000..b50a1f4
Binary files /dev/null and b/lib/requests/adapters.pyc differ
diff --git a/lib/requests/api.py b/lib/requests/api.py
old mode 100755
new mode 100644
index ded7935..1469b05
--- a/lib/requests/api.py
+++ b/lib/requests/api.py
@@ -7,15 +7,13 @@ requests.api
 This module implements the Requests API.
 
 :copyright: (c) 2012 by Kenneth Reitz.
-:license: ISC, see LICENSE for more details.
+:license: Apache2, see LICENSE for more details.
 
 """
 
 from . import sessions
-from .safe_mode import catch_exceptions_if_in_safe_mode
 
 
- at catch_exceptions_if_in_safe_mode
 def request(method, url, **kwargs):
     """Constructs and sends a :class:`Request <Request>`.
     Returns :class:`Response <Response>` object.
@@ -23,35 +21,37 @@ def request(method, url, **kwargs):
     :param method: method for the new :class:`Request` object.
     :param url: URL for the new :class:`Request` object.
     :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
-    :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param json: (optional) json data to send in the body of the :class:`Request`.
     :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
     :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
-    :param files: (optional) Dictionary of 'name': file-like-objects (or {'name': ('filename', fileobj)}) for multipart encoding upload.
+    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': ('filename', fileobj)}``) for multipart encoding upload.
     :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
-    :param timeout: (optional) Float describing the timeout of the request.
+    :param timeout: (optional) How long to wait for the server to send data
+        before giving up, as a float, or a (`connect timeout, read timeout
+        <user/advanced.html#timeouts>`_) tuple.
+    :type timeout: float or tuple
     :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
+    :type allow_redirects: bool
     :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
-    :param return_response: (optional) If False, an un-sent Request object will returned.
-    :param session: (optional) A :class:`Session` object to be used for the request.
-    :param config: (optional) A configuration dictionary. See ``request.defaults`` for allowed keys and their default values.
     :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
-    :param prefetch: (optional) if ``True``, the response content will be immediately downloaded.
+    :param stream: (optional) if ``False``, the response content will be immediately downloaded.
     :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
-    """
 
-    # if this session was passed in, leave it open (and retain pooled connections);
-    # if we're making it just for this call, then close it when we're done.
-    adhoc_session = False
-    session = kwargs.pop('session', None)
-    if session is None:
-        session = sessions.session()
-        adhoc_session = True
+    Usage::
+
+      >>> import requests
+      >>> req = requests.request('GET', 'http://httpbin.org/get')
+      <Response [200]>
+    """
 
-    try:
-        return session.request(method=method, url=url, **kwargs)
-    finally:
-        if adhoc_session:
-            session.close()
+    session = sessions.Session()
+    response = session.request(method=method, url=url, **kwargs)
+    # By explicitly closing the session, we avoid leaving sockets open which
+    # can trigger a ResourceWarning in some cases, and look like a memory leak
+    # in others.
+    session.close()
+    return response
 
 
 def get(url, **kwargs):
@@ -87,22 +87,23 @@ def head(url, **kwargs):
     return request('head', url, **kwargs)
 
 
-def post(url, data=None, **kwargs):
+def post(url, data=None, json=None, **kwargs):
     """Sends a POST request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param json: (optional) json data to send in the body of the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
     """
 
-    return request('post', url, data=data, **kwargs)
+    return request('post', url, data=data, json=json, **kwargs)
 
 
 def put(url, data=None, **kwargs):
     """Sends a PUT request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
     """
 
@@ -113,7 +114,7 @@ def patch(url, data=None, **kwargs):
     """Sends a PATCH request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
     """
 
diff --git a/lib/requests/api.pyc b/lib/requests/api.pyc
index e1f009b..d74c3e5 100644
Binary files a/lib/requests/api.pyc and b/lib/requests/api.pyc differ
diff --git a/lib/requests/auth.py b/lib/requests/auth.py
old mode 100755
new mode 100644
index 65568f5..b950181
--- a/lib/requests/auth.py
+++ b/lib/requests/auth.py
@@ -11,26 +11,13 @@ import os
 import re
 import time
 import hashlib
-import logging
 
 from base64 import b64encode
 
 from .compat import urlparse, str
-from .utils import parse_dict_header
-
-try:
-    from ._oauth import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER, extract_params)
-
-except (ImportError, SyntaxError):
-    SIGNATURE_HMAC = None
-    SIGNATURE_TYPE_AUTH_HEADER = None
-
-try:
-    import kerberos as k
-except ImportError as exc:
-    k = None
-
-log = logging.getLogger(__name__)
+from .cookies import extract_cookies_to_jar
+from .utils import parse_dict_header, to_native_string
+from .status_codes import codes
 
 CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
 CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
@@ -39,7 +26,11 @@ CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
 def _basic_auth_str(username, password):
     """Returns a Basic Auth string."""
 
-    return 'Basic ' + b64encode(('%s:%s' % (username, password)).encode('latin1')).strip().decode('latin1')
+    authstr = 'Basic ' + to_native_string(
+        b64encode(('%s:%s' % (username, password)).encode('latin1')).strip()
+    )
+
+    return authstr
 
 
 class AuthBase(object):
@@ -49,82 +40,6 @@ class AuthBase(object):
         raise NotImplementedError('Auth hooks must be callable.')
 
 
-class OAuth1(AuthBase):
-    """Signs the request using OAuth 1 (RFC5849)"""
-    def __init__(self, client_key,
-            client_secret=None,
-            resource_owner_key=None,
-            resource_owner_secret=None,
-            callback_uri=None,
-            signature_method=SIGNATURE_HMAC,
-            signature_type=SIGNATURE_TYPE_AUTH_HEADER,
-            rsa_key=None, verifier=None):
-
-        try:
-            signature_type = signature_type.upper()
-        except AttributeError:
-            pass
-
-        self.client = Client(client_key, client_secret, resource_owner_key,
-            resource_owner_secret, callback_uri, signature_method,
-            signature_type, rsa_key, verifier)
-
-    def __call__(self, r):
-        """Add OAuth parameters to the request.
-
-        Parameters may be included from the body if the content-type is
-        urlencoded, if no content type is set an educated guess is made.
-        """
-        # split(";") because Content-Type may be "multipart/form-data; boundary=xxxxx"
-        contenttype = r.headers.get('Content-Type', '').split(";")[0].lower()
-        # extract_params will not give params unless the body is a properly
-        # formatted string, a dictionary or a list of 2-tuples.
-        decoded_body = extract_params(r.data)
-
-        # extract_params can only check the present r.data and does not know
-        # of r.files, thus an extra check is performed. We know that
-        # if files are present the request will not have
-        # Content-type: x-www-form-urlencoded. We guess it will have
-        # a mimetype of multipart/form-data and if this is not the case
-        # we assume the correct header will be set later.
-        _oauth_signed = True
-        if r.files and contenttype == CONTENT_TYPE_MULTI_PART:
-            # Omit body data in the signing and since it will always
-            # be empty (cant add paras to body if multipart) and we wish
-            # to preserve body.
-            r.url, r.headers, _ = self.client.sign(
-                unicode(r.full_url), unicode(r.method), None, r.headers)
-        elif decoded_body is not None and contenttype in (CONTENT_TYPE_FORM_URLENCODED, ''):
-            # Normal signing
-            if not contenttype:
-                r.headers['Content-Type'] = CONTENT_TYPE_FORM_URLENCODED
-            r.url, r.headers, r.data = self.client.sign(
-                unicode(r.full_url), unicode(r.method), r.data, r.headers)
-        else:
-            _oauth_signed = False
-        if _oauth_signed:
-            # Both flows add params to the URL by using r.full_url,
-            # so this prevents adding it again later
-            r.params = {}
-
-            # Having the authorization header, key or value, in unicode will
-            # result in UnicodeDecodeErrors when the request is concatenated
-            # by httplib. This can easily be seen when attaching files.
-            # Note that simply encoding the value is not enough since Python
-            # saves the type of first key set. Thus we remove and re-add.
-            # >>> d = {u'a':u'foo'}
-            # >>> d['a'] = 'foo'
-            # >>> d
-            # { u'a' : 'foo' }
-            u_header = unicode('Authorization')
-            if u_header in r.headers:
-                auth_header = r.headers[u_header].encode('utf-8')
-                del r.headers[u_header]
-                r.headers['Authorization'] = auth_header
-
-        return r
-
-
 class HTTPBasicAuth(AuthBase):
     """Attaches HTTP Basic Authentication to the given Request object."""
     def __init__(self, username, password):
@@ -137,7 +52,7 @@ class HTTPBasicAuth(AuthBase):
 
 
 class HTTPProxyAuth(HTTPBasicAuth):
-    """Attaches HTTP Proxy Authenetication to a given Request object."""
+    """Attaches HTTP Proxy Authentication to a given Request object."""
     def __call__(self, r):
         r.headers['Proxy-Authorization'] = _basic_auth_str(self.username, self.password)
         return r
@@ -151,30 +66,35 @@ class HTTPDigestAuth(AuthBase):
         self.last_nonce = ''
         self.nonce_count = 0
         self.chal = {}
+        self.pos = None
+        self.num_401_calls = 1
 
     def build_digest_header(self, method, url):
 
         realm = self.chal['realm']
         nonce = self.chal['nonce']
         qop = self.chal.get('qop')
-        algorithm = self.chal.get('algorithm', 'MD5')
-        opaque = self.chal.get('opaque', None)
+        algorithm = self.chal.get('algorithm')
+        opaque = self.chal.get('opaque')
 
-        algorithm = algorithm.upper()
+        if algorithm is None:
+            _algorithm = 'MD5'
+        else:
+            _algorithm = algorithm.upper()
         # lambdas assume digest modules are imported at the top level
-        if algorithm == 'MD5':
+        if _algorithm == 'MD5' or _algorithm == 'MD5-SESS':
             def md5_utf8(x):
                 if isinstance(x, str):
                     x = x.encode('utf-8')
                 return hashlib.md5(x).hexdigest()
             hash_utf8 = md5_utf8
-        elif algorithm == 'SHA':
+        elif _algorithm == 'SHA':
             def sha_utf8(x):
                 if isinstance(x, str):
                     x = x.encode('utf-8')
                 return hashlib.sha1(x).hexdigest()
             hash_utf8 = sha_utf8
-        # XXX MD5-sess
+
         KD = lambda s, d: hash_utf8("%s:%s" % (s, d))
 
         if hash_utf8 is None:
@@ -190,23 +110,28 @@ class HTTPDigestAuth(AuthBase):
         A1 = '%s:%s:%s' % (self.username, realm, self.password)
         A2 = '%s:%s' % (method, path)
 
-        if qop == 'auth':
-            if nonce == self.last_nonce:
-                self.nonce_count += 1
-            else:
-                self.nonce_count = 1
-
-            ncvalue = '%08x' % self.nonce_count
-            s = str(self.nonce_count).encode('utf-8')
-            s += nonce.encode('utf-8')
-            s += time.ctime().encode('utf-8')
-            s += os.urandom(8)
-
-            cnonce = (hashlib.sha1(s).hexdigest()[:16])
-            noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, hash_utf8(A2))
-            respdig = KD(hash_utf8(A1), noncebit)
-        elif qop is None:
-            respdig = KD(hash_utf8(A1), "%s:%s" % (nonce, hash_utf8(A2)))
+        HA1 = hash_utf8(A1)
+        HA2 = hash_utf8(A2)
+
+        if nonce == self.last_nonce:
+            self.nonce_count += 1
+        else:
+            self.nonce_count = 1
+        ncvalue = '%08x' % self.nonce_count
+        s = str(self.nonce_count).encode('utf-8')
+        s += nonce.encode('utf-8')
+        s += time.ctime().encode('utf-8')
+        s += os.urandom(8)
+
+        cnonce = (hashlib.sha1(s).hexdigest()[:16])
+        noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, HA2)
+        if _algorithm == 'MD5-SESS':
+            HA1 = hash_utf8('%s:%s:%s' % (HA1, nonce, cnonce))
+
+        if qop is None:
+            respdig = KD(HA1, "%s:%s" % (nonce, HA2))
+        elif qop == 'auth' or 'auth' in qop.split(','):
+            respdig = KD(HA1, noncebit)
         else:
             # XXX handle auth-int.
             return None
@@ -215,168 +140,70 @@ class HTTPDigestAuth(AuthBase):
 
         # XXX should the partial digests be encoded too?
         base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
-           'response="%s"' % (self.username, realm, nonce, path, respdig)
+               'response="%s"' % (self.username, realm, nonce, path, respdig)
         if opaque:
             base += ', opaque="%s"' % opaque
+        if algorithm:
+            base += ', algorithm="%s"' % algorithm
         if entdig:
             base += ', digest="%s"' % entdig
-            base += ', algorithm="%s"' % algorithm
         if qop:
-            base += ', qop=auth, nc=%s, cnonce="%s"' % (ncvalue, cnonce)
+            base += ', qop="auth", nc=%s, cnonce="%s"' % (ncvalue, cnonce)
 
         return 'Digest %s' % (base)
 
-    def handle_401(self, r):
-        """Takes the given response and tries digest-auth, if needed."""
+    def handle_redirect(self, r, **kwargs):
+        """Reset num_401_calls counter on redirects."""
+        if r.is_redirect:
+            self.num_401_calls = 1
 
-        num_401_calls = r.request.hooks['response'].count(self.handle_401)
+    def handle_401(self, r, **kwargs):
+        """Takes the given response and tries digest-auth, if needed."""
 
+        if self.pos is not None:
+            # Rewind the file position indicator of the body to where
+            # it was to resend the request.
+            r.request.body.seek(self.pos)
+        num_401_calls = getattr(self, 'num_401_calls', 1)
         s_auth = r.headers.get('www-authenticate', '')
 
         if 'digest' in s_auth.lower() and num_401_calls < 2:
 
-            self.chal = parse_dict_header(s_auth.replace('Digest ', ''))
+            self.num_401_calls += 1
+            pat = re.compile(r'digest ', flags=re.IGNORECASE)
+            self.chal = parse_dict_header(pat.sub('', s_auth, count=1))
 
             # Consume content and release the original connection
             # to allow our new request to reuse the same one.
             r.content
             r.raw.release_conn()
+            prep = r.request.copy()
+            extract_cookies_to_jar(prep._cookies, r.request, r.raw)
+            prep.prepare_cookies(prep._cookies)
 
-            r.request.headers['Authorization'] = self.build_digest_header(r.request.method, r.request.url)
-            r.request.send(anyway=True)
-            _r = r.request.response
+            prep.headers['Authorization'] = self.build_digest_header(
+                prep.method, prep.url)
+            _r = r.connection.send(prep, **kwargs)
             _r.history.append(r)
+            _r.request = prep
 
             return _r
 
+        self.num_401_calls = 1
         return r
 
     def __call__(self, r):
         # If we have a saved nonce, skip the 401
         if self.last_nonce:
             r.headers['Authorization'] = self.build_digest_header(r.method, r.url)
+        try:
+            self.pos = r.body.tell()
+        except AttributeError:
+            # In the case of HTTPDigestAuth being reused and the body of
+            # the previous request was a file-like object, pos has the
+            # file position of the previous body. Ensure it's set to
+            # None.
+            self.pos = None
         r.register_hook('response', self.handle_401)
-        return r
-
-
-def _negotiate_value(r):
-    """Extracts the gssapi authentication token from the appropriate header"""
-
-    authreq = r.headers.get('www-authenticate', None)
-
-    if authreq:
-        rx = re.compile('(?:.*,)*\s*Negotiate\s*([^,]*),?', re.I)
-        mo = rx.search(authreq)
-        if mo:
-            return mo.group(1)
-
-    return None
-
-
-class HTTPKerberosAuth(AuthBase):
-    """Attaches HTTP GSSAPI/Kerberos Authentication to the given Request object."""
-    def __init__(self, require_mutual_auth=True):
-        if k is None:
-            raise Exception("Kerberos libraries unavailable")
-        self.context = None
-        self.require_mutual_auth = require_mutual_auth
-
-    def generate_request_header(self, r):
-        """Generates the gssapi authentication token with kerberos"""
-
-        host = urlparse(r.url).netloc
-        tail, _, head = host.rpartition(':')
-        domain = tail if tail else head
-
-        result, self.context = k.authGSSClientInit("HTTP@%s" % domain)
-
-        if result < 1:
-            raise Exception("authGSSClientInit failed")
-
-        result = k.authGSSClientStep(self.context, _negotiate_value(r))
-
-        if result < 0:
-            raise Exception("authGSSClientStep failed")
-
-        response = k.authGSSClientResponse(self.context)
-
-        return "Negotiate %s" % response
-
-    def authenticate_user(self, r):
-        """Handles user authentication with gssapi/kerberos"""
-
-        auth_header = self.generate_request_header(r)
-        log.debug("authenticate_user(): Authorization header: %s" % auth_header)
-        r.request.headers['Authorization'] = auth_header
-        r.request.send(anyway=True)
-        _r = r.request.response
-        _r.history.append(r)
-        log.debug("authenticate_user(): returning %s" % _r)
-        return _r
-
-    def handle_401(self, r):
-        """Handles 401's, attempts to use gssapi/kerberos authentication"""
-
-        log.debug("handle_401(): Handling: 401")
-        if _negotiate_value(r) is not None:
-            _r = self.authenticate_user(r)
-            log.debug("handle_401(): returning %s" % _r)
-            return _r
-        else:
-            log.debug("handle_401(): Kerberos is not supported")
-            log.debug("handle_401(): returning %s" % r)
-            return r
-
-    def handle_other(self, r):
-        """Handles all responses with the exception of 401s.
-
-        This is necessary so that we can authenticate responses if requested"""
-
-        log.debug("handle_other(): Handling: %d" % r.status_code)
-        self.deregister(r)
-        if self.require_mutual_auth:
-            if _negotiate_value(r) is not None:
-                log.debug("handle_other(): Authenticating the server")
-                _r = self.authenticate_server(r)
-                log.debug("handle_other(): returning %s" % _r)
-                return _r
-            else:
-                log.error("handle_other(): Mutual authentication failed")
-                raise Exception("Mutual authentication failed")
-        else:
-            log.debug("handle_other(): returning %s" % r)
-            return r
-
-    def authenticate_server(self, r):
-        """Uses GSSAPI to authenticate the server"""
-
-        log.debug("authenticate_server(): Authenticate header: %s" % _negotiate_value(r))
-        result = k.authGSSClientStep(self.context, _negotiate_value(r))
-        if  result < 1:
-            raise Exception("authGSSClientStep failed")
-        _r = r.request.response
-        log.debug("authenticate_server(): returning %s" % _r)
-        return _r
-
-    def handle_response(self, r):
-        """Takes the given response and tries kerberos-auth, as needed."""
-
-        if r.status_code == 401:
-            _r = self.handle_401(r)
-            log.debug("handle_response returning %s" % _r)
-            return _r
-        else:
-            _r = self.handle_other(r)
-            log.debug("handle_response returning %s" % _r)
-            return _r
-
-        log.debug("handle_response returning %s" % r)
-        return r
-
-    def deregister(self, r):
-        """Deregisters the response handler"""
-        r.request.deregister_hook('response', self.handle_response)
-
-    def __call__(self, r):
-        r.register_hook('response', self.handle_response)
+        r.register_hook('response', self.handle_redirect)
         return r
diff --git a/lib/requests/auth.pyc b/lib/requests/auth.pyc
index a34bbe9..debb837 100644
Binary files a/lib/requests/auth.pyc and b/lib/requests/auth.pyc differ
diff --git a/lib/requests/cacert.pem b/lib/requests/cacert.pem
old mode 100755
new mode 100644
index 7da8447..729fe15
--- a/lib/requests/cacert.pem
+++ b/lib/requests/cacert.pem
@@ -1,3338 +1,5026 @@
-##
-## ca-bundle.crt -- Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Wed Jan 18 00:04:16 2012
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1994-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.81 $ $Date: 2012/01/17 22:02:37 $
-
-GTE CyberTrust Global Root
-==========================
------BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
-Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
-A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
-MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
-Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
-IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
-sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
-HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
-AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
-M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
-NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
------END CERTIFICATE-----
-
-Thawte Server CA
-================
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
-AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
-b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
-BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
-c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
-A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
-/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
-1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
-GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
-GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
-
-Thawte Premium Server CA
-========================
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
-AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
-ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
-AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
-cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
-aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
-Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
-qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
-SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
-8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
-UCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
-
-Equifax Secure CA
-=================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 1
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
-MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
-NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
-o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
-kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
-RbyhkwS7hp86W0N6w4pl
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 3
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
-MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
-VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
-xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
-up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
-mPnHfxsb1gYgAlihw6ID
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
-TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
-WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
-Tqj/ZA1k
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
-FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
-lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
-1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
-Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
------END CERTIFICATE-----
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Issuer: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Subject: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Label: "GTE CyberTrust Global Root"
+# Serial: 421
+# MD5 Fingerprint: ca:3d:d3:68:f1:03:5c:d0:32:fa:b8:2b:59:e8:5a:db
+# SHA1 Fingerprint: 97:81:79:50:d8:1c:96:70:cc:34:d8:09:cf:79:44:31:36:7e:f4:74
+# SHA256 Fingerprint: a5:31:25:18:8d:21:10:aa:96:4b:02:c7:b7:c6:da:32:03:17:08:94:e5:fb:71:ff:fb:66:67:d5:e6:81:0a:36
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Server CA"
+# Serial: 1
+# MD5 Fingerprint: c5:70:c4:a2:ed:53:78:0c:c8:10:53:81:64:cb:d0:1d
+# SHA1 Fingerprint: 23:e5:94:94:51:95:f2:41:48:03:b4:d5:64:d2:a3:a3:f5:d8:8b:8c
+# SHA256 Fingerprint: b4:41:0b:73:e2:e6:ea:ca:47:fb:c4:2f:8f:a4:01:8a:f4:38:1d:c5:4c:fa:a8:44:50:46:1e:ed:09:45:4d:e9
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Premium Server CA"
+# Serial: 1
+# MD5 Fingerprint: 06:9f:69:79:16:66:90:02:1b:8c:8c:a2:c3:07:6f:3a
+# SHA1 Fingerprint: 62:7f:8d:78:27:65:63:99:d2:7d:7f:90:44:c9:fe:b3:f3:3e:fa:9a
+# SHA256 Fingerprint: ab:70:36:36:5c:71:54:aa:29:c2:c2:9f:5d:41:91:16:3b:16:2a:22:25:01:13:57:d5:6d:07:ff:a7:bc:1f:72
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Equifax OU=Equifax Secure Certificate Authority
+# Subject: O=Equifax OU=Equifax Secure Certificate Authority
+# Label: "Equifax Secure CA"
+# Serial: 903804111
+# MD5 Fingerprint: 67:cb:9d:c0:13:24:8a:82:9b:b2:17:1e:d1:1b:ec:d4
+# SHA1 Fingerprint: d2:32:09:ad:23:d3:14:23:21:74:e4:0d:7f:9d:62:13:97:86:63:3a
+# SHA256 Fingerprint: 08:29:7a:40:47:db:a2:36:80:c7:31:db:6e:31:76:53:ca:78:48:e1:be:bd:3a:0b:01:79:a7:07:f9:2c:f1:78
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 149843929435818692848040365716851702463
+# MD5 Fingerprint: 10:fc:63:5d:f6:26:3e:0d:f3:25:be:5f:79:cd:67:67
+# SHA1 Fingerprint: 74:2c:31:92:e6:07:e4:24:eb:45:49:54:2b:e1:bb:c5:3e:61:74:e2
+# SHA256 Fingerprint: e7:68:56:34:ef:ac:f6:9a:ce:93:9a:6b:25:5b:7b:4f:ab:ef:42:93:5b:50:a2:65:ac:b5:cb:60:27:e4:4e:70
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Label: "Verisign Class 3 Public Primary Certification Authority - G2"
+# Serial: 167285380242319648451154478808036881606
+# MD5 Fingerprint: a2:33:9b:4c:74:78:73:d4:6c:e7:c1:f3:8d:cb:5c:e9
+# SHA1 Fingerprint: 85:37:1c:a6:e5:50:14:3d:ce:28:03:47:1b:de:3a:09:e8:f8:77:0f
+# SHA256 Fingerprint: 83:ce:3c:12:29:68:8a:59:3d:48:5f:81:97:3c:0f:91:95:43:1e:da:37:cc:5e:36:43:0e:79:c7:a8:88:63:8b
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Label: "GlobalSign Root CA"
+# Serial: 4835703278459707669005204
+# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
+# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
+# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Label: "GlobalSign Root CA - R2"
+# Serial: 4835703278459682885658125
+# MD5 Fingerprint: 94:14:77:7e:3e:5e:fd:8f:30:bd:41:b0:cf:e7:d0:30
+# SHA1 Fingerprint: 75:e0:ab:b6:13:85:12:27:1c:04:f8:5f:dd:de:38:e4:b7:24:2e:fe
+# SHA256 Fingerprint: ca:42:dd:41:74:5f:d0:b8:1e:b9:02:36:2c:f9:d8:bf:71:9d:a1:bd:1b:1e:fc:94:6f:5b:4c:99:f4:2c:1b:9e
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
 TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
 -----END CERTIFICATE-----
 
-ValiCert Class 1 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
-MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
-GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
-DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
-lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
-icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
-Orf1LXLI
------END CERTIFICATE-----
-
-ValiCert Class 2 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
-CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
-ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
-SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
-UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
-W9ViH0Pd
------END CERTIFICATE-----
-
-RSA Root Certificate 1
-======================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
-3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
-BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
-3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
-V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
-on+jjBXu
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Verisign Class 4 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
-tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
-8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
-Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
-Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
-mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
-RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
-UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
-Entrust.net Secure Server CA
-============================
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
-cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
-ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
-A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
-eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
-dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
-aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
-gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
-ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
-CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
-dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
-NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
-HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
-BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
-Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
-n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
-AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
-gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
-AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
-oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
-o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
-2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
-OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-Equifax Secure Global eBusiness CA
-==================================
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
-bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
-b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
-PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
-qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
-hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
-BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
-MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
-I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
-NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 1
-=============================
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
-LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
-ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
-IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
-1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
-IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
-MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
-Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
-AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
-lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
-KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 2
-=============================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
-ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
-MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
-DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
-2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
-BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
-JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
-uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
-jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
-78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
-V+GRMOrN
------END CERTIFICATE-----
-
-AddTrust Low-Value Services Root
-================================
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
-cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
-CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
-ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
-54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
-oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
-Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
-GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
-HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
-RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
-HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
-ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
-iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
-mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
-ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-AddTrust Public Services Root
-=============================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
-cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
-BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
-dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
-nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
-d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
-Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
-HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
-A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
-A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
-JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
-+YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
-Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
-EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
-
-AddTrust Qualified Certificates Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
-cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
-CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
-IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
-64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
-KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
-L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
-wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
-MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
-BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
-azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
-GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
-RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
-iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-RSA Security 2048 v3
-====================
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
-MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
-Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
-WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
-KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
-+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
-MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
-FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
-v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
-0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
-VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
-nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
-pKnXwiJPZ9d37CAFYd4=
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Global CA 2
-====================
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
-MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
-NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
-LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
-Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
-HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
-K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
-srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
-ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
-OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
-x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
-H4z1Ir+rzoPz4iIprn2DQKi6bA==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-America Online Root Certification Authority 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
-v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
-DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
-sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
-8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
-o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
-GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
-VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
-3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
-Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Label: "ValiCert Class 1 VA"
+# Serial: 1
+# MD5 Fingerprint: 65:58:ab:15:ad:57:6c:1e:a8:a7:b5:69:ac:bf:ff:eb
+# SHA1 Fingerprint: e5:df:74:3c:b6:01:c4:9b:98:43:dc:ab:8c:e8:6a:81:10:9f:e4:8e
+# SHA256 Fingerprint: f4:c1:49:55:1a:30:13:a3:5b:c7:bf:fe:17:a7:f3:44:9b:c1:ab:5b:5a:0a:e7:4b:06:c2:3b:90:00:4c:01:04
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Label: "ValiCert Class 2 VA"
+# Serial: 1
+# MD5 Fingerprint: a9:23:75:9b:ba:49:36:6e:31:c2:db:f2:e7:66:ba:87
+# SHA1 Fingerprint: 31:7a:2a:d0:7f:2b:33:5e:f5:a1:c3:4e:4b:57:e8:b7:d8:f1:fc:a6
+# SHA256 Fingerprint: 58:d0:17:27:9c:d4:dc:63:ab:dd:b1:96:a6:c9:90:6c:30:c4:e0:87:83:ea:e8:c1:60:99:54:d6:93:55:59:6b
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Label: "RSA Root Certificate 1"
+# Serial: 1
+# MD5 Fingerprint: a2:6f:53:b7:ee:40:db:4a:68:e7:fa:18:d9:10:4b:72
+# SHA1 Fingerprint: 69:bd:8c:f4:9c:d3:00:fb:59:2e:17:93:ca:55:6a:f3:ec:aa:35:fb
+# SHA256 Fingerprint: bc:23:f9:8a:31:3c:b9:2d:e3:bb:fc:3a:5a:9f:44:61:ac:39:49:4c:4a:e1:5a:9e:9d:f1:31:e9:9b:73:01:9a
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 3 Public Primary Certification Authority - G3"
+# Serial: 206684696279472310254277870180966723415
+# MD5 Fingerprint: cd:68:b6:a7:c7:c4:ce:75:e0:1d:4f:57:44:61:92:09
+# SHA1 Fingerprint: 13:2d:0d:45:53:4b:69:97:cd:b2:d5:c3:39:e2:55:76:60:9b:5c:c6
+# SHA256 Fingerprint: eb:04:cf:5e:b1:f3:9a:fa:76:2f:2b:b1:20:f2:96:cb:a5:20:c1:b9:7d:b1:58:95:65:b8:1c:b9:a1:7b:72:44
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 4 Public Primary Certification Authority - G3"
+# Serial: 314531972711909413743075096039378935511
+# MD5 Fingerprint: db:c8:f2:27:2e:b1:ea:6a:29:23:5d:fe:56:3e:33:df
+# SHA1 Fingerprint: c8:ec:8c:87:92:69:cb:4b:ab:39:e9:8d:7e:57:67:f3:14:95:73:9d
+# SHA256 Fingerprint: e3:89:36:0d:0f:db:ae:b3:d2:50:58:4b:47:30:31:4e:22:2f:39:c1:56:a0:20:14:4e:8d:96:05:61:79:15:06
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Secure Server CA"
+# Serial: 927650371
+# MD5 Fingerprint: df:f2:80:73:cc:f1:e6:61:73:fc:f5:42:e9:c5:7c:ee
+# SHA1 Fingerprint: 99:a6:9b:e6:1a:fe:88:6b:4d:2b:82:00:7c:b8:54:fc:31:7e:15:39
+# SHA256 Fingerprint: 62:f2:40:27:8c:56:4c:4d:d8:bf:7d:9d:4f:6f:36:6e:a8:94:d2:2f:5f:34:d9:89:a9:83:ac:ec:2f:ff:ed:50
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Premium 2048 Secure Server CA"
+# Serial: 946069240
+# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
+# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
+# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Label: "Baltimore CyberTrust Root"
+# Serial: 33554617
+# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
+# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
+# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure Global eBusiness CA"
+# Serial: 1
+# MD5 Fingerprint: 8f:5d:77:06:27:c4:98:3c:5b:93:78:e7:d7:7d:9b:cc
+# SHA1 Fingerprint: 7e:78:4a:10:1c:82:65:cc:2d:e1:f1:6d:47:b4:40:ca:d9:0a:19:45
+# SHA256 Fingerprint: 5f:0b:62:ea:b5:e3:53:ea:65:21:65:16:58:fb:b6:53:59:f4:43:28:0a:4a:fb:d1:04:d7:7d:10:f9:f0:4c:07
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure eBusiness CA 1"
+# Serial: 4
+# MD5 Fingerprint: 64:9c:ef:2e:44:fc:c6:8f:52:07:d0:51:73:8f:cb:3d
+# SHA1 Fingerprint: da:40:18:8b:91:89:a3:ed:ee:ae:da:97:fe:2f:9d:f5:b7:d1:8a:41
+# SHA256 Fingerprint: cf:56:ff:46:a4:a1:86:10:9d:d9:65:84:b5:ee:b5:8a:51:0c:42:75:b0:e5:f9:4f:40:bb:ae:86:5e:19:f6:73
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Low-Value Services Root"
+# Serial: 1
+# MD5 Fingerprint: 1e:42:95:02:33:92:6b:b9:5f:c0:7f:da:d6:b2:4b:fc
+# SHA1 Fingerprint: cc:ab:0e:a0:4c:23:01:d6:69:7b:dd:37:9f:cd:12:eb:24:e3:94:9d
+# SHA256 Fingerprint: 8c:72:09:27:9a:c0:4e:27:5e:16:d0:7f:d3:b7:75:e8:01:54:b5:96:80:46:e3:1f:52:dd:25:76:63:24:e9:a7
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Subject: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Label: "AddTrust External Root"
+# Serial: 1
+# MD5 Fingerprint: 1d:35:54:04:85:78:b0:3f:42:42:4d:bf:20:73:0a:3f
+# SHA1 Fingerprint: 02:fa:f3:e2:91:43:54:68:60:78:57:69:4d:f5:e4:5b:68:85:18:68
+# SHA256 Fingerprint: 68:7f:a4:51:38:22:78:ff:f0:c8:b1:1f:8d:43:d5:76:67:1c:6e:b2:bc:ea:b4:13:fb:83:d9:65:d0:6d:2f:f2
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Public Services Root"
+# Serial: 1
+# MD5 Fingerprint: c1:62:3e:23:c5:82:73:9c:03:59:4b:2b:e9:77:49:7f
+# SHA1 Fingerprint: 2a:b6:28:48:5e:78:fb:f3:ad:9e:79:10:dd:6b:df:99:72:2c:96:e5
+# SHA256 Fingerprint: 07:91:ca:07:49:b2:07:82:aa:d3:c7:d7:bd:0c:df:c9:48:58:35:84:3e:b2:d7:99:60:09:ce:43:ab:6c:69:27
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
+BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Qualified Certificates Root"
+# Serial: 1
+# MD5 Fingerprint: 27:ec:39:47:cd:da:5a:af:e2:9a:01:65:21:a9:4c:bb
+# SHA1 Fingerprint: 4d:23:78:ec:91:95:39:b5:00:7f:75:8f:03:3b:21:1e:c5:4d:8b:cf
+# SHA256 Fingerprint: 80:95:21:08:05:db:4b:bc:35:5e:44:28:d8:fd:6e:c2:cd:e3:ab:5f:b9:7a:99:42:98:8e:b8:f4:dc:d0:60:16
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Label: "Entrust Root Certification Authority"
+# Serial: 1164660820
+# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
+# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
+# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+# Issuer: O=RSA Security Inc OU=RSA Security 2048 V3
+# Subject: O=RSA Security Inc OU=RSA Security 2048 V3
+# Label: "RSA Security 2048 v3"
+# Serial: 13297492616345471454730593562152402946
+# MD5 Fingerprint: 77:0d:19:b1:21:fd:00:42:9c:3e:0c:a5:dd:0b:02:8e
+# SHA1 Fingerprint: 25:01:90:19:cf:fb:d9:99:1c:b7:68:25:74:8d:94:5f:30:93:95:42
+# SHA256 Fingerprint: af:8b:67:62:a1:e5:28:22:81:61:a9:5d:5c:55:9e:e2:66:27:8f:75:d7:9e:83:01:89:a5:03:50:6a:bd:6b:4c
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
+7CAFYd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Label: "GeoTrust Global CA"
+# Serial: 144470
+# MD5 Fingerprint: f7:75:ab:29:fb:51:4e:b7:77:5e:ff:05:3c:99:8e:f5
+# SHA1 Fingerprint: de:28:f4:a4:ff:e5:b9:2f:a3:c5:03:d1:a3:49:a7:f9:96:2a:82:12
+# SHA256 Fingerprint: ff:85:6a:2d:25:1d:cd:88:d3:66:56:f4:50:12:67:98:cf:ab:aa:de:40:79:9c:72:2d:e4:d2:b5:db:36:a7:3a
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Global CA 2"
+# Serial: 1
+# MD5 Fingerprint: 0e:40:a7:6c:de:03:5d:8f:d1:0f:e4:d1:8d:f9:6c:a9
+# SHA1 Fingerprint: a9:e9:78:08:14:37:58:88:f2:05:19:b0:6d:2b:0d:2b:60:16:90:7d
+# SHA256 Fingerprint: ca:2d:82:a0:86:77:07:2f:8a:b6:76:4f:f0:35:67:6c:fe:3e:5e:32:5e:01:21:72:df:3f:92:09:6d:b7:9b:85
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA"
+# Serial: 1
+# MD5 Fingerprint: 92:65:58:8b:a2:1a:31:72:73:68:5c:b4:a5:7a:07:48
+# SHA1 Fingerprint: e6:21:f3:35:43:79:05:9a:4b:68:30:9d:8a:2f:74:22:15:87:ec:79
+# SHA256 Fingerprint: a0:45:9b:9f:63:b2:25:59:f5:fa:5d:4c:6d:b3:f9:f7:2f:f1:93:42:03:35:78:f0:73:bf:1d:1b:46:cb:b9:12
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA 2"
+# Serial: 1
+# MD5 Fingerprint: 34:fc:b8:d0:36:db:9e:14:b3:c2:f2:db:8f:e4:94:c7
+# SHA1 Fingerprint: 37:9a:19:7b:41:85:45:35:0c:a6:03:69:f3:3c:2e:af:47:4f:20:79
+# SHA256 Fingerprint: a0:23:4f:3b:c8:52:7c:a5:62:8e:ec:81:ad:5d:69:89:5d:a5:68:0d:c9:1d:1c:b8:47:7f:33:f8:78:b9:5b:0b
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Label: "America Online Root Certification Authority 1"
+# Serial: 1
+# MD5 Fingerprint: 14:f1:08:ad:9d:fa:64:e2:89:e7:1c:cf:a8:ad:7d:5e
+# SHA1 Fingerprint: 39:21:c1:15:c1:5d:0e:ca:5c:cb:5b:c4:f0:7d:21:d8:05:0b:56:6a
+# SHA256 Fingerprint: 77:40:73:12:c6:3a:15:3d:5b:c0:0b:4e:51:75:9c:df:da:c2:37:dc:2a:33:b6:79:46:e9:8e:9b:fa:68:0a:e3
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
+hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
+1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
+OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
+2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
+O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
+AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
+Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
+LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
+oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
+MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
 sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
 -----END CERTIFICATE-----
 
-America Online Root Certification Authority 2
-=============================================
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
-fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
-f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
-qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
-RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
-gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
-6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
-FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
-Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
-B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
-aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
-T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
-+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
-JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
-zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
-ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
-1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
-GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
-Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
-cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
------END CERTIFICATE-----
-
-Visa eCommerce Root
-===================
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
-EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
-QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
-WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
-VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
-F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
-RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
-TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
-/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
-GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
-MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
-CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
-YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
-zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
-YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+# Issuer: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Label: "America Online Root Certification Authority 2"
+# Serial: 1
+# MD5 Fingerprint: d6:ed:3c:ca:e2:66:0f:af:10:43:0d:77:9b:04:09:bf
+# SHA1 Fingerprint: 85:b5:ff:67:9b:0c:79:96:1f:c8:6e:44:22:00:46:13:db:17:92:84
+# SHA256 Fingerprint: 7d:3b:46:5a:60:14:e5:26:c0:af:fc:ee:21:27:d2:31:17:27:ad:81:1c:26:84:2d:00:6a:f3:73:06:cc:80:bd
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
+206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
+KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
+JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
+BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
+Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
+PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
+Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
+Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
+o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
+YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
+FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
+xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
+LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
+obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
+CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
+IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
+DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
+AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
+Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
+AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
+Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
+RY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Subject: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Label: "Visa eCommerce Root"
+# Serial: 25952180776285836048024890241505565794
+# MD5 Fingerprint: fc:11:b8:d8:08:93:30:00:6d:23:f9:7e:eb:52:1e:02
+# SHA1 Fingerprint: 70:17:9b:86:8c:00:a4:fa:60:91:52:22:3f:9f:3e:32:bd:e0:05:62
+# SHA256 Fingerprint: 69:fa:c9:bd:55:fb:0a:c7:8d:53:bb:ee:5c:f1:d5:97:98:9f:d0:aa:ab:20:a2:51:51:bd:f1:73:3e:e7:d1:22
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
 398znM/jra6O1I7mT1GvFpLgXPYHDw==
 -----END CERTIFICATE-----
 
-Certum Root CA
-==============
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
-ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
-Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
-by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
-wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
-kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
-89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
-Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
-NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
-GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
-GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
-0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
-qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-Comodo Secure Services root
-===========================
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
-MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
-Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
-BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
-9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
-rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
-oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
-p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
-FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
-YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
-aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
-4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
-DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
-pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
-RR3B7Hzs/Sk=
------END CERTIFICATE-----
-
-Comodo Trusted Services root
-============================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
-MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
-bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
-IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
-3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
-/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
-juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
-ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
-DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
-ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
-cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
-uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
-BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
-R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
-9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+# Issuer: CN=Certum CA O=Unizeto Sp. z o.o.
+# Subject: CN=Certum CA O=Unizeto Sp. z o.o.
+# Label: "Certum Root CA"
+# Serial: 65568
+# MD5 Fingerprint: 2c:8f:9f:66:1d:18:90:b1:47:26:9d:8e:86:82:8c:a9
+# SHA1 Fingerprint: 62:52:dc:40:f7:11:43:a2:2f:de:9e:f7:34:8e:06:42:51:b1:81:18
+# SHA256 Fingerprint: d8:e0:fe:bc:1d:b2:e3:8d:00:94:0f:37:d2:7d:41:34:4d:99:3e:73:4b:99:d5:65:6d:97:78:d4:d8:14:36:24
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
+# Subject: CN=AAA Certificate Services O=Comodo CA Limited
+# Label: "Comodo AAA Services root"
+# Serial: 1
+# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
+# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
+# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Certificate Services O=Comodo CA Limited
+# Subject: CN=Secure Certificate Services O=Comodo CA Limited
+# Label: "Comodo Secure Services root"
+# Serial: 1
+# MD5 Fingerprint: d3:d9:bd:ae:9f:ac:67:24:b3:c8:1b:52:e1:b9:a9:bd
+# SHA1 Fingerprint: 4a:65:d5:f4:1d:ef:39:b8:b8:90:4a:4a:d3:64:81:33:cf:c7:a1:d1
+# SHA256 Fingerprint: bd:81:ce:3b:4f:65:91:d1:1a:67:b5:fc:7a:47:fd:ef:25:52:1b:f9:aa:4e:18:b9:e3:df:2e:34:a7:80:3b:e8
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Trusted Certificate Services O=Comodo CA Limited
+# Subject: CN=Trusted Certificate Services O=Comodo CA Limited
+# Label: "Comodo Trusted Services root"
+# Serial: 1
+# MD5 Fingerprint: 91:1b:3f:6e:cd:9e:ab:ee:07:fe:1f:71:d2:b3:61:27
+# SHA1 Fingerprint: e1:9f:e3:0e:8b:84:60:9e:80:9b:17:0d:72:a8:c5:ba:6e:14:09:bd
+# SHA256 Fingerprint: 3f:06:e5:56:81:d4:96:f5:be:16:9e:b5:38:9f:9f:2b:8f:f6:1e:17:08:df:68:81:72:48:49:cd:5d:27:cb:69
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Subject: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Label: "QuoVadis Root CA"
+# Serial: 985026699
+# MD5 Fingerprint: 27:de:36:fe:72:b7:00:03:00:9d:f4:f0:1e:6c:04:24
+# SHA1 Fingerprint: de:3f:40:bd:50:93:d3:9b:6c:60:f6:da:bc:07:62:01:00:89:76:c9
+# SHA256 Fingerprint: a4:5e:de:3b:bb:f0:9c:8a:e1:5c:72:ef:c0:72:68:d6:93:a2:1c:99:6f:d5:1e:67:ca:07:94:60:fd:6d:88:73
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 2"
+# Serial: 1289
+# MD5 Fingerprint: 5e:39:7b:dd:f8:ba:ec:82:e9:ac:62:ba:0c:54:00:2b
+# SHA1 Fingerprint: ca:3a:fb:cf:12:40:36:4b:44:b2:16:20:88:80:48:39:19:93:7c:f7
+# SHA256 Fingerprint: 85:a0:dd:7d:d7:20:ad:b7:ff:05:f8:3d:54:2b:20:9d:c7:ff:45:28:f7:d6:77:b1:83:89:fe:a5:e5:c4:9e:86
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 3"
+# Serial: 1478
+# MD5 Fingerprint: 31:85:3c:62:94:97:63:b9:aa:fd:89:4e:af:6f:e0:cf
+# SHA1 Fingerprint: 1f:49:14:f7:d8:74:95:1d:dd:ae:02:c0:be:fd:3a:2d:82:75:51:85
+# SHA256 Fingerprint: 18:f1:fc:7f:20:5d:f8:ad:dd:eb:7f:e0:07:dd:57:e3:af:37:5a:9c:4d:8d:73:54:6b:f4:f1:fe:d1:e1:8d:35
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1
+# Subject: O=SECOM Trust.net OU=Security Communication RootCA1
+# Label: "Security Communication Root CA"
+# Serial: 0
+# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a
+# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7
+# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Sonera Class2 CA O=Sonera
+# Subject: CN=Sonera Class2 CA O=Sonera
+# Label: "Sonera Class 2 Root CA"
+# Serial: 29
+# MD5 Fingerprint: a3:ec:75:0f:2e:88:df:fa:48:01:4e:0b:5c:48:6f:fb
+# SHA1 Fingerprint: 37:f7:6d:e6:07:7c:90:c5:b1:3e:93:1a:b7:41:10:b4:f2:e4:9a:27
+# SHA256 Fingerprint: 79:08:b4:03:14:c1:38:10:0b:51:8d:07:35:80:7f:fb:fc:f8:51:8a:00:95:33:71:05:ba:38:6b:15:3d:d9:27
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA"
+# Serial: 10000010
+# MD5 Fingerprint: 60:84:7c:5a:ce:db:0c:d4:cb:a7:e9:fe:02:c6:a9:c0
+# SHA1 Fingerprint: 10:1d:fa:3f:d5:0b:cb:bb:9b:b5:60:0c:19:55:a4:1a:f4:73:3a:04
+# SHA256 Fingerprint: d4:1d:82:9e:8c:16:59:82:2a:f9:3f:ce:62:bf:fc:de:26:4f:c8:4e:8b:95:0c:5f:f2:75:d0:52:35:46:95:a3
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
 iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
 -----END CERTIFICATE-----
 
-UTN DATACorp SGC Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
-BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
-MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
-HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
-dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
-raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
-wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
-9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
-33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
-DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
-BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
-LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
-I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
-EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
-DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
-UTN USERFirst Hardware Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
-BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
-OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
-eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
-ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
-wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
-tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
-i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
-Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
-gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
-lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
-UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
-BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
-XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
-lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
-iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
-nfhmqA==
------END CERTIFICATE-----
-
-Camerfirma Chambers of Commerce Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
-NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
-cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
-MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
-AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
-xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
-NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
-DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
-d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
-EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
-cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
-AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
-bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
-VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
-fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
-L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
-UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
-ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
-erfutGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
-
-Camerfirma Global Chambersign Root
-==================================
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
-NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
-YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
-MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
-ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
-1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
-by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
-6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
-8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
-BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
-aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
-Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
-aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
-ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
-PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
-gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
-PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
-IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
-t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
-
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
-NetLock Business (Class B) Root
-===============================
------BEGIN CERTIFICATE-----
-MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
-VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
-VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
-bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
-VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
-o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
-1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
-HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
-RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
-dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
-ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
-c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
-YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
-c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
-Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
-bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
-IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
-YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
-cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
-43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
-stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
------END CERTIFICATE-----
-
-NetLock Express (Class C) Root
-==============================
------BEGIN CERTIFICATE-----
-MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
-KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
-BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
-ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
-W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
-euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
-DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
-RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
-YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
-IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
-aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
-ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
-ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
-dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
-emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
-IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
-UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
-YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
-xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
-gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
-YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
-AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
-Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
-U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
-LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
-cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
-dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
-AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
-3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
-vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
-fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
-fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
-EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
-1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
-lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
-g14=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-Firmaprofesional Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT
-GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp
-Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA
-ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL
-MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT
-OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2
-ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V
-j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH
-lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf
-3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8
-NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww
-KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG
-AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD
-ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
-u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf
-wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
-7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG
-VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
------END CERTIFICATE-----
-
-Wells Fargo Root CA
-===================
------BEGIN CERTIFICATE-----
-MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
-bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
-MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
-x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
-E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
-OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
-sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
-YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
-BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
-ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
-m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
-OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
-x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
-tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
------END CERTIFICATE-----
-
-Swisscom Root CA 1
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
-MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
-MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
-NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
-AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
-b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
-7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
-cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
-WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
-haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
-MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
-MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
-jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
-MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
-VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
-vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
-OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
-1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
-nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
-x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
-NY6E0F/6MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
+# Issuer: O=TDC Internet OU=TDC Internet Root CA
+# Subject: O=TDC Internet OU=TDC Internet Root CA
+# Label: "TDC Internet Root CA"
+# Serial: 986490188
+# MD5 Fingerprint: 91:f4:03:55:20:a1:f8:63:2c:62:de:ac:fb:61:1c:8e
+# SHA1 Fingerprint: 21:fc:bd:8e:7f:6c:af:05:1b:d1:b3:43:ec:a8:e7:61:47:f2:0f:8a
+# SHA256 Fingerprint: 48:98:c6:88:8c:0c:ff:b0:d3:e3:1a:ca:8a:37:d4:e3:51:5f:f7:46:d0:26:35:d8:66:46:cf:a0:a3:18:5a:e7
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
+SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
+Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
+BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
+cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
+vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
+Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
+0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
+4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
+eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
+R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
+A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
+dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
+Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
+WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
+HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
+KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
+Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
+wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
+9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
+jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
+aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN DATACorp SGC Root CA"
+# Serial: 91374294542884689855167577680241077609
+# MD5 Fingerprint: b3:a5:3e:77:21:6d:ac:4a:c0:c9:fb:d5:41:3d:ca:06
+# SHA1 Fingerprint: 58:11:9f:0e:12:82:87:ea:50:fd:d9:87:45:6f:4f:78:dc:fa:d6:d4
+# SHA256 Fingerprint: 85:fb:2f:91:dd:12:27:5a:01:45:b6:36:53:4f:84:02:4a:d6:8b:69:b8:ee:88:68:4f:f7:11:37:58:05:b3:48
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
+mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN USERFirst Hardware Root CA"
+# Serial: 91374294542884704022267039221184531197
+# MD5 Fingerprint: 4c:56:41:e5:0d:bb:2b:e8:ca:a3:ed:18:08:ad:43:39
+# SHA1 Fingerprint: 04:83:ed:33:99:ac:36:08:05:87:22:ed:bc:5e:46:00:e3:be:f9:d7
+# SHA256 Fingerprint: 6e:a5:47:41:d0:04:66:7e:ed:1b:48:16:63:4a:a3:a7:9e:6e:4b:96:95:0f:82:79:da:fc:8d:9b:d8:81:21:37
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Chambers of Commerce Root"
+# Serial: 0
+# MD5 Fingerprint: b0:01:ee:14:d9:af:29:18:94:76:8e:f1:69:33:2a:84
+# SHA1 Fingerprint: 6e:3a:55:a4:19:0c:19:5c:93:84:3c:c0:db:72:2e:31:30:61:f0:b1
+# SHA256 Fingerprint: 0c:25:8a:12:a5:67:4a:ef:25:f2:8b:a7:dc:fa:ec:ee:a3:48:e5:41:e6:f5:cc:4e:e6:3b:71:b3:61:60:6a:c3
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Global Chambersign Root"
+# Serial: 0
+# MD5 Fingerprint: c5:e6:7b:bf:06:d0:4f:43:ed:c4:7a:65:8a:fb:6b:19
+# SHA1 Fingerprint: 33:9b:6b:14:50:24:9b:55:7a:01:87:72:84:d9:e0:2f:c3:d2:d8:e9
+# SHA256 Fingerprint: ef:3c:b4:17:fc:8e:bf:6f:97:87:6c:9e:4e:ce:39:de:1e:a5:fe:64:91:41:d1:02:8b:7d:11:c0:b2:29:8c:ed
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Notary (Class A) Root"
+# Serial: 259
+# MD5 Fingerprint: 86:38:6d:5e:49:63:6c:85:5c:db:6d:dc:94:b7:d0:f7
+# SHA1 Fingerprint: ac:ed:5f:65:53:fd:25:ce:01:5f:1f:7a:48:3b:6a:74:9f:61:78:c6
+# SHA256 Fingerprint: 7f:12:cd:5f:7e:5e:29:0e:c7:d8:51:79:d5:b7:2c:20:a5:be:75:08:ff:db:5b:f8:1a:b9:68:4a:7f:c9:f6:67
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Business (Class B) Root"
+# Serial: 105
+# MD5 Fingerprint: 39:16:aa:b9:6a:41:e1:14:69:df:9e:6c:3b:72:dc:b6
+# SHA1 Fingerprint: 87:9f:4b:ee:05:df:98:58:3b:e3:60:d6:33:e7:0d:3f:fe:98:71:af
+# SHA256 Fingerprint: 39:df:7b:68:2b:7b:93:8f:84:71:54:81:cc:de:8d:60:d8:f2:2e:c5:98:87:7d:0a:aa:c1:2b:59:18:2b:03:12
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Express (Class C) Root"
+# Serial: 104
+# MD5 Fingerprint: 4f:eb:f1:f0:70:c2:80:63:5d:58:9f:da:12:3c:a9:c4
+# SHA1 Fingerprint: e3:92:51:2f:0a:cf:f5:05:df:f6:de:06:7f:75:37:e1:65:ea:57:4b
+# SHA256 Fingerprint: 0b:5e:ed:4e:84:64:03:cf:55:e0:65:84:84:40:ed:2a:82:75:8b:f5:b9:aa:1f:25:3d:46:13:cf:a0:80:ff:3f
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Label: "XRamp Global CA Root"
+# Serial: 107108908803651509692980124233745014957
+# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
+# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
+# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Label: "Go Daddy Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
+# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
+# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+
+# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Label: "Starfield Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
+# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
+# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: 22:4d:8f:8a:fc:f7:35:c2:bb:57:34:90:7b:8b:22:16
+# SHA1 Fingerprint: 3e:2b:f7:f2:03:1b:96:f3:8c:e6:c4:d8:a8:5d:3e:2d:58:47:6a:0f
+# SHA256 Fingerprint: c7:66:a9:be:f2:d4:07:1c:86:3a:31:aa:49:20:e8:13:b2:d1:98:60:8c:b7:b7:cf:e2:11:43:b8:36:df:09:ea
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
+
+# Issuer: O=Government Root Certification Authority
+# Subject: O=Government Root Certification Authority
+# Label: "Taiwan GRCA"
+# Serial: 42023070807708724159991140556527066870
+# MD5 Fingerprint: 37:85:44:53:32:45:1f:20:f0:f3:95:e1:25:c4:43:4e
+# SHA1 Fingerprint: f4:8b:11:bf:de:ab:be:94:54:20:71:e6:41:de:6b:be:88:2b:40:b9
+# SHA256 Fingerprint: 76:00:29:5e:ef:e8:5b:9e:1f:d6:24:db:76:06:2a:aa:ae:59:81:8a:54:d2:77:4c:d4:c0:b2:c0:11:31:e1:b3
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
+pYYsfPQS
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Firmaprofesional Root CA"
+# Serial: 1
+# MD5 Fingerprint: 11:92:79:40:3c:b1:83:40:e5:ab:66:4a:67:92:80:df
+# SHA1 Fingerprint: a9:62:8f:4b:98:a9:1b:48:35:ba:d2:c1:46:32:86:bb:66:64:6a:8c
+# SHA256 Fingerprint: c1:cf:0b:52:09:64:35:e3:f1:b7:1d:aa:ec:45:5a:23:11:c8:40:4f:55:83:a9:e2:13:c6:9d:85:7d:94:33:05
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
+Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
+rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
+hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
+BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
+iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
+AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
+bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
+MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
+VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
+hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
+ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
+QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
+quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 1"
+# Serial: 122348795730808398873664200247279986742
+# MD5 Fingerprint: f8:38:7c:77:88:df:2c:16:68:2e:c2:e2:52:4b:b8:f9
+# SHA1 Fingerprint: 5f:3a:fc:0a:8b:64:f6:86:67:34:74:df:7e:a9:a2:fe:f9:fa:7a:51
+# SHA256 Fingerprint: 21:db:20:12:36:60:bb:2e:d4:18:20:5d:a1:1e:e7:a8:5a:65:e2:bc:6e:55:b5:af:7e:78:99:c8:a2:66:d9:2e
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
+MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Assured ID Root CA"
+# Serial: 17154717934120587862167794914071425081
+# MD5 Fingerprint: 87:ce:0b:7b:2a:0e:49:00:e1:58:71:9b:37:a8:93:72
+# SHA1 Fingerprint: 05:63:b8:63:0d:62:d7:5a:bb:c8:ab:1e:4b:df:b5:a8:99:b2:4d:43
+# SHA256 Fingerprint: 3e:90:99:b5:01:5e:8f:48:6c:00:bc:ea:9d:11:1e:e7:21:fa:ba:35:5a:89:bc:f1:df:69:56:1e:3d:c6:32:5c
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
 +o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
 -----END CERTIFICATE-----
 
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Global Root CA"
+# Serial: 10944719598952040374951832963794454346
+# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e
+# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36
+# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
 CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
 -----END CERTIFICATE-----
 
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+# Issuer: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert High Assurance EV Root CA"
+# Serial: 3553400076410547919724730734378100087
+# MD5 Fingerprint: d4:74:de:57:5c:39:b2:d3:9c:85:83:c5:c0:65:49:8a
+# SHA1 Fingerprint: 5f:b7:ee:06:33:e2:59:db:ad:0c:4c:9a:e6:d3:8f:1a:61:c7:dc:25
+# SHA256 Fingerprint: 74:31:e5:f4:c3:c1:ce:46:90:77:4f:0b:61:e0:54:40:88:3b:a9:a0:1e:d0:0b:a6:ab:d7:80:6e:d3:b1:18:cf
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
+
+# Issuer: CN=Class 2 Primary CA O=Certplus
+# Subject: CN=Class 2 Primary CA O=Certplus
+# Label: "Certplus Class 2 Primary CA"
+# Serial: 177770208045934040241468760488327595043
+# MD5 Fingerprint: 88:2c:8c:52:b8:a2:3c:f3:f7:bb:03:ea:ae:ac:42:0b
+# SHA1 Fingerprint: 74:20:74:41:72:9c:dd:92:ec:79:31:d8:23:10:8d:c2:81:92:e2:bb
+# SHA256 Fingerprint: 0f:99:3c:8a:ef:97:ba:af:56:87:14:0e:d5:9a:d1:82:1b:b4:af:ac:f0:aa:9a:58:b5:d5:7a:33:8a:3a:fb:cb
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
 l7+ijrRU
 -----END CERTIFICATE-----
 
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-DST ACES CA X6
-==============
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
-MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
-MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
-CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
-DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
-pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
-GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
-MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
-Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
-dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
-CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
-5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
-Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
-vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
-oKfN5XozNmr6mis=
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
-MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
-dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
-LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
-x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
-QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
-5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
-AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
-Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
-hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
-9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
-UrbnBEI=
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+# Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Subject: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Label: "DST Root CA X3"
+# Serial: 91299735575339953335919266965803778155
+# MD5 Fingerprint: 41:03:52:dc:0f:f7:50:1b:16:f0:02:8e:ba:6f:45:c5
+# SHA1 Fingerprint: da:c9:02:4f:54:d8:f6:df:94:93:5f:b1:73:26:38:ca:6a:d7:7c:13
+# SHA256 Fingerprint: 06:87:26:03:31:a7:24:03:d9:09:f1:05:e6:9b:cf:0d:32:e1:bd:24:93:ff:c6:d9:20:6d:11:bc:d6:77:07:39
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Subject: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Label: "DST ACES CA X6"
+# Serial: 17771143917277623872238992636097467865
+# MD5 Fingerprint: 21:d8:4c:82:2b:99:09:33:a2:eb:14:24:8d:8e:5f:e8
+# SHA1 Fingerprint: 40:54:da:6f:1c:3f:40:74:ac:ed:0f:ec:cd:db:79:d1:53:fb:90:1d
+# SHA256 Fingerprint: 76:7c:95:5a:76:41:2c:89:af:68:8e:90:a1:c7:0f:55:6c:fd:6b:60:25:db:ea:10:41:6d:7e:b6:83:1f:8c:40
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Label: "TURKTRUST Certificate Services Provider Root 1"
+# Serial: 1
+# MD5 Fingerprint: f1:6a:22:18:c9:cd:df:ce:82:1d:1d:b7:78:5c:a9:a5
+# SHA1 Fingerprint: 79:98:a3:08:e1:4d:65:85:e6:c2:1e:15:3a:71:9f:ba:5a:d3:4a:d9
+# SHA256 Fingerprint: 44:04:e3:3b:5e:14:0d:cf:99:80:51:fd:fc:80:28:c7:c8:16:15:c5:ee:73:7b:11:1b:58:82:33:a9:b5:35:a0
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
+RGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Label: "TURKTRUST Certificate Services Provider Root 2"
+# Serial: 1
+# MD5 Fingerprint: 37:a5:6e:d4:b1:25:84:97:b7:fd:56:15:7a:f9:a2:00
+# SHA1 Fingerprint: b4:35:d4:e1:11:9d:1c:66:90:a7:49:eb:b3:94:bd:63:7b:a7:82:b7
+# SHA256 Fingerprint: c4:70:cf:54:7e:23:02:b9:77:fb:29:dd:71:a8:9a:7b:6c:1f:60:77:7b:03:29:f5:60:17:f3:28:bf:4f:6b:e6
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Label: "SwissSign Gold CA - G2"
+# Serial: 13492815561806991280
+# MD5 Fingerprint: 24:77:d9:a8:91:d1:3b:fa:88:2d:c2:ff:f8:cd:33:93
+# SHA1 Fingerprint: d8:c5:38:8a:b7:30:1b:1b:6e:d4:7a:e6:45:25:3a:6f:9f:1a:27:61
+# SHA256 Fingerprint: 62:dd:0b:e9:b9:f5:0a:16:3e:a0:f8:e7:5c:05:3b:1e:ca:57:ea:55:c8:68:8f:64:7c:68:81:f2:c8:35:7b:95
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Label: "SwissSign Silver CA - G2"
+# Serial: 5700383053117599563
+# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
+# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
+# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Subject: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Label: "GeoTrust Primary Certification Authority"
+# Serial: 32798226551256963324313806436981982369
+# MD5 Fingerprint: 02:26:c3:01:5e:08:30:37:43:a9:d0:7d:cf:37:e6:bf
+# SHA1 Fingerprint: 32:3c:11:8e:1b:f7:b8:b6:52:54:e2:e2:10:0d:d6:02:90:37:f0:96
+# SHA256 Fingerprint: 37:d5:10:06:c5:12:ea:ab:62:64:21:f1:ec:8c:92:01:3f:c5:f8:2a:e9:8e:e5:33:eb:46:19:b8:de:b4:d0:6c
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA"
+# Serial: 69529181992039203566298953787712940909
+# MD5 Fingerprint: 8c:ca:dc:0b:22:ce:f5:be:72:ac:41:1a:11:a8:d8:12
+# SHA1 Fingerprint: 91:c6:d6:ee:3e:8a:c8:63:84:e5:48:c2:99:29:5c:75:6c:81:7b:81
+# SHA256 Fingerprint: 8d:72:2f:81:a9:c1:13:c0:79:1d:f1:36:a2:96:6d:b2:6c:95:0a:97:1d:b4:6b:41:99:f4:ea:54:b7:8b:fb:9f
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G5"
+# Serial: 33037644167568058970164719475676101450
+# MD5 Fingerprint: cb:17:e4:31:67:3e:e2:09:fe:45:57:93:f3:0a:fa:1c
+# SHA1 Fingerprint: 4e:b6:d5:78:49:9b:1c:cf:5f:58:1e:ad:56:be:3d:9b:67:44:a5:e5
+# SHA256 Fingerprint: 9a:cf:ab:7e:43:c8:d8:80:d0:6b:26:2a:94:de:ee:e4:b4:65:99:89:c3:d0:ca:f1:9b:af:64:05:e4:1a:b7:df
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureTrust CA O=SecureTrust Corporation
+# Subject: CN=SecureTrust CA O=SecureTrust Corporation
+# Label: "SecureTrust CA"
+# Serial: 17199774589125277788362757014266862032
+# MD5 Fingerprint: dc:32:c3:a7:6d:25:57:c7:68:09:9d:ea:2d:a9:a2:d1
+# SHA1 Fingerprint: 87:82:c6:c3:04:35:3b:cf:d2:96:92:d2:59:3e:7d:44:d9:34:ff:11
+# SHA256 Fingerprint: f1:c1:b5:0a:e5:a2:0d:d8:03:0e:c9:f6:bc:24:82:3d:d3:67:b5:25:57:59:b4:e7:1b:61:fc:e9:f7:37:5d:73
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
 3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
 -----END CERTIFICATE-----
 
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+# Issuer: CN=Secure Global CA O=SecureTrust Corporation
+# Subject: CN=Secure Global CA O=SecureTrust Corporation
+# Label: "Secure Global CA"
+# Serial: 9751836167731051554232119481456978597
+# MD5 Fingerprint: cf:f4:27:0d:d4:ed:dc:65:16:49:6d:3d:da:bf:6e:de
+# SHA1 Fingerprint: 3a:44:73:5a:e5:81:90:1f:24:86:61:46:1e:3b:9c:c4:5f:f5:3a:1b
+# SHA256 Fingerprint: 42:00:f5:04:3a:c8:59:0e:bb:52:7d:20:9e:d1:50:30:29:fb:cb:d4:1c:a1:b5:06:ec:27:f1:5a:de:7d:ac:69
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
 f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
 -----END CERTIFICATE-----
 
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-WellsSecure Public Root Certificate Authority
-=============================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
-F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
-NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
-bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
-VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
-iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
-i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
-bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
-K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
-AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
-cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
-lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
-i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
-GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
-K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
-bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
-qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
-E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
-tylv2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-IGC/A
-=====
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
-VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
-Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
-MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
-EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
-STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
-TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
-So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
-HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
-frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
-tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
-egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
-iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
-q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
-MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
-lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
-0mBWWg==
------END CERTIFICATE-----
-
-Security Communication EV RootCA1
-=================================
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
-BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
-Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
-/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
-WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
-ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
-bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
-9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
-iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
-Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
-mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
-T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
-BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
-EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
-MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
-dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
-GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
-d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
-oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
-QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
-PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
-MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
-IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
-VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
-LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
-dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
-4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
-AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
-egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
-Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
-PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
-c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
-cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
-IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
-WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
-MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
-Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
-HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
-nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
-aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
-yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
-S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+# Issuer: CN=COMODO Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO Certification Authority O=COMODO CA Limited
+# Label: "COMODO Certification Authority"
+# Serial: 104350513648249232941998508985834464573
+# MD5 Fingerprint: 5c:48:dc:f7:42:72:ec:56:94:6d:1c:cc:71:35:80:75
+# SHA1 Fingerprint: 66:31:bf:9e:f7:4f:9e:b6:c9:d5:a6:0c:ba:6a:be:d1:f7:bd:ef:7b
+# SHA256 Fingerprint: 0c:2c:d6:3d:f7:80:6f:a3:99:ed:e8:09:11:6b:57:5b:f8:79:89:f0:65:18:f9:80:8c:86:05:03:17:8b:af:66
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
+ZQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Subject: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Label: "Network Solutions Certificate Authority"
+# Serial: 116697915152937497490437556386812487904
+# MD5 Fingerprint: d3:f3:a6:16:c0:fa:6b:1d:59:b1:2d:96:4d:0e:11:2e
+# SHA1 Fingerprint: 74:f8:a3:c3:ef:e7:b3:90:06:4b:83:90:3c:21:64:60:20:e5:df:ce
+# SHA256 Fingerprint: 15:f0:ba:00:a3:ac:7a:f3:ac:88:4c:07:2b:10:11:a0:77:bd:77:c0:97:f4:01:64:b2:f8:59:8a:bd:83:86:0c
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+# Issuer: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Subject: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Label: "WellsSecure Public Root Certificate Authority"
+# Serial: 1
+# MD5 Fingerprint: 15:ac:a5:c2:92:2d:79:bc:e8:7f:cb:67:ed:02:cf:36
+# SHA1 Fingerprint: e7:b4:f6:9d:61:ec:90:69:db:7e:90:a7:40:1a:3c:f4:7d:4f:e8:ee
+# SHA256 Fingerprint: a7:12:72:ae:aa:a3:cf:e8:72:7f:7f:b3:9f:0f:b3:d1:e5:42:6e:90:60:b0:6e:e6:f1:3e:9a:3c:58:33:cd:43
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
+2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Label: "COMODO ECC Certification Authority"
+# Serial: 41578283867086692638256921589707938090
+# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23
+# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11
+# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Subject: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Label: "IGC/A"
+# Serial: 245102874772
+# MD5 Fingerprint: 0c:7f:dd:6a:f4:2a:b9:c8:9b:bd:20:7e:a9:db:5c:37
+# SHA1 Fingerprint: 60:d6:89:74:b5:c2:65:9e:8a:0f:c1:88:7c:88:d2:46:69:1b:18:2c
+# SHA256 Fingerprint: b9:be:a7:86:0a:96:2e:a3:61:1d:ab:97:ab:6d:a3:e2:1c:10:68:b9:7d:55:57:5e:d0:e1:12:79:c1:1c:89:32
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
+0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Label: "Security Communication EV RootCA1"
+# Serial: 0
+# MD5 Fingerprint: 22:2d:a6:01:ea:7c:0a:f7:f0:6c:56:43:3f:77:76:d3
+# SHA1 Fingerprint: fe:b8:c4:32:dc:f9:76:9a:ce:ae:3d:d8:90:8f:fd:28:86:65:64:7d
+# SHA256 Fingerprint: a2:2d:ba:68:1e:97:37:6e:2d:39:7d:72:8a:ae:3a:9b:62:96:b9:fd:ba:60:bc:2e:11:f6:47:f2:c6:75:fb:37
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
+MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
+IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
+bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
+RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
+zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
+bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
+MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
+VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
+OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
+tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
+q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
+EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
+VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Subject: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Label: "OISTE WISeKey Global Root GA CA"
+# Serial: 86718877871133159090080555911823548314
+# MD5 Fingerprint: bc:6c:51:33:a7:e9:d3:66:63:54:15:72:1b:21:92:93
+# SHA1 Fingerprint: 59:22:a1:e1:5a:ea:16:35:21:f8:98:39:6a:46:46:b0:44:1b:0f:a9
+# SHA256 Fingerprint: 41:c9:23:86:6a:b4:ca:d6:b7:ad:57:80:81:58:2e:02:07:97:a6:cb:df:4f:ff:78:ce:83:96:b3:89:37:d7:f5
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Subject: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Label: "Microsec e-Szigno Root CA"
+# Serial: 272122594155480254301341951808045322001
+# MD5 Fingerprint: f0:96:b6:2f:c5:10:d5:67:8e:83:25:32:e8:5e:2e:e5
+# SHA1 Fingerprint: 23:88:c9:d3:71:cc:9e:96:3d:ff:7d:3c:a7:ce:fc:d6:25:ec:19:0d
+# SHA256 Fingerprint: 32:7a:3d:76:1a:ba:de:a0:34:eb:99:84:06:27:5c:b1:a4:77:6e:fd:ae:2f:df:6d:01:68:ea:1c:4f:55:67:d0
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
+cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
+b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
+ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
+NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
+TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
+Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
+uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
+vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
+Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
+62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
+AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
+LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
+BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
+AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
+MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
+ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
+AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
+ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
+AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
+AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
+bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
+Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
+PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
+Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
+EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
+w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
+cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
+HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
+VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
+BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
+b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
+8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
+ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
+7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
+hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
+MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certigna O=Dhimyotis
+# Subject: CN=Certigna O=Dhimyotis
+# Label: "Certigna"
+# Serial: 18364802974209362175
+# MD5 Fingerprint: ab:57:a6:5b:7d:42:82:19:b5:d8:58:26:28:5e:fd:ff
+# SHA1 Fingerprint: b1:2e:13:63:45:86:a4:6f:1a:b2:60:68:37:58:2d:c4:ac:fd:94:97
+# SHA256 Fingerprint: e3:b6:a2:db:2e:d7:ce:48:84:2f:7a:c5:32:41:c7:b7:1d:54:14:4b:fb:40:c1:1f:3f:1d:0b:42:f5:ee:a1:2d
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
+DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
+BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
+QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
+gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
+zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
+130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
+JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
+ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
+AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
+9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
+bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
+fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
+HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
+t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
-======================================
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
-AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
-LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
-HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
-U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
-IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
-yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
-2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
-4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
-2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
-8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
-HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
-Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
-5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
-czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
-ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
-BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
-cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
-AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
-EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
-/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
-MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
-3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
-eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
-/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
-RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
-Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 3 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
-MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
-yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
-6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
-uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
-2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
-O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
-yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
-IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
-092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
-5A==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+# Issuer: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Subject: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Label: "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
+# Serial: 38908203973182606954752843738508300
+# MD5 Fingerprint: 93:2a:3e:f6:fd:23:69:0d:71:20:d4:2b:47:99:2b:a6
+# SHA1 Fingerprint: cb:a1:c5:f8:b0:e3:5e:b8:b9:45:12:d3:f9:34:a2:e9:06:10:d3:36
+# SHA256 Fingerprint: a6:c5:1e:0d:a5:ca:0a:93:09:d2:e4:c0:e4:0c:2a:f9:10:7a:ae:82:03:85:7f:e1:98:e3:e7:69:e3:43:08:5c
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
+CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
+ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
+QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
+NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
+ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
+QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
+qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
+fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
+Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
+Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
+54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
+MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
+ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
+YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
+A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
+rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
+pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
+lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
+YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
+7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
+YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
+xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
+unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
+Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
+ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
+gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
+jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
+W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
+RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
+MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
+BYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Subject: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Label: "TC TrustCenter Class 2 CA II"
+# Serial: 941389028203453866782103406992443
+# MD5 Fingerprint: ce:78:33:5c:59:78:01:6e:18:ea:b9:36:a0:b9:2e:23
+# SHA1 Fingerprint: ae:50:83:ed:7c:f4:5c:bc:8f:61:c6:21:fe:68:5d:79:42:21:15:6e
+# SHA256 Fingerprint: e6:b8:f8:76:64:85:f8:07:ae:7f:8d:ac:16:70:46:1f:07:c0:a1:3e:ef:3a:1f:f7:17:53:8d:7a:ba:d3:91:b4
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
+tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
+uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
+XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
+8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
+5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
+kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
+GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
+ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
+au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
+hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
+dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Subject: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Label: "TC TrustCenter Class 3 CA II"
+# Serial: 1506523511417715638772220530020799
+# MD5 Fingerprint: 56:5f:aa:80:61:12:17:f6:67:21:e6:2b:6d:61:56:8e
+# SHA1 Fingerprint: 80:25:ef:f4:6e:70:c8:d4:72:24:65:84:fe:40:3b:8a:8d:6a:db:f5
+# SHA256 Fingerprint: 8d:a0:84:fc:f9:9c:e0:77:22:f8:9b:32:05:93:98:06:fa:5c:b8:11:e1:c8:13:f6:a1:08:c7:d3:36:b3:40:8e
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
+Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
+Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
+1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
+ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
+Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
+XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
+irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
+TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
+g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
+95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
+S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Subject: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Label: "TC TrustCenter Universal CA I"
+# Serial: 601024842042189035295619584734726
+# MD5 Fingerprint: 45:e1:a5:72:c5:a9:36:64:40:9e:f5:e4:58:84:67:8c
+# SHA1 Fingerprint: 6b:2f:34:ad:89:58:be:62:fd:b0:6b:5c:ce:bb:9d:d9:4f:4e:39:f3
+# SHA256 Fingerprint: eb:f3:c0:2a:87:89:b1:fb:7d:51:19:95:d6:63:b7:29:06:d9:13:ce:0d:5e:10:56:8a:8a:77:e2:58:61:67:e7
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
+BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
+c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
+MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
+R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
+VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
+JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
+fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
+jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
+wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
+fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
+VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
+CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
+7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
+8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
+ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
+2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+# Issuer: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Subject: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Label: "Deutsche Telekom Root CA 2"
+# Serial: 38
+# MD5 Fingerprint: 74:01:4a:91:b1:08:c4:58:ce:47:cd:f0:dd:11:53:08
+# SHA1 Fingerprint: 85:a4:08:c0:9c:19:3e:5d:51:58:7d:cd:d6:13:30:fd:8c:de:37:bf
+# SHA256 Fingerprint: b6:19:1a:50:d0:c3:97:7f:7d:a9:9b:cd:aa:c8:6a:22:7d:ae:b9:67:9e:c7:0b:a3:b0:c9:d9:22:71:c1:70:d3
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
 Cm26OWMohpLzGITY+9HPBVZkVw==
 -----END CERTIFICATE-----
 
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+# Issuer: CN=ComSign Secured CA O=ComSign
+# Subject: CN=ComSign Secured CA O=ComSign
+# Label: "ComSign Secured CA"
+# Serial: 264725503855295744117309814499492384489
+# MD5 Fingerprint: 40:01:25:06:8d:21:43:6a:0e:43:00:9c:e7:43:f3:d5
+# SHA1 Fingerprint: f9:cd:0e:2c:da:76:24:c1:8f:bd:f0:f0:ab:b6:45:b8:f7:fe:d5:7a
+# SHA256 Fingerprint: 50:79:41:c7:44:60:a0:b4:70:86:22:0d:4e:99:32:57:2a:b5:d1:b5:bb:cb:89:80:ab:1c:b1:76:51:a8:44:d2
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
+PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
+MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
+GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
+MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
+HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
+gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
+v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
+Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
+9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
+6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
+MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
+Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
+ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
+hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
+iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
+dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
+kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
+hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
 OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
 -----END CERTIFICATE-----
 
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+# Issuer: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Subject: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Label: "Cybertrust Global Root"
+# Serial: 4835703278459682877484360
+# MD5 Fingerprint: 72:e4:4a:87:e3:69:40:80:77:ea:bc:e3:f4:ff:f0:e1
+# SHA1 Fingerprint: 5f:43:e5:b1:bf:f8:78:8c:ac:1c:c7:ca:4a:9a:c6:22:2b:cc:34:c6
+# SHA256 Fingerprint: 96:0a:df:00:63:e9:63:56:75:0c:29:65:dd:0a:08:67:da:0b:9c:bd:6e:77:71:4a:ea:fb:23:49:ab:39:3d:a3
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
 WL1WMRJOEcgh4LMRkWXbtKaIOM5V
 -----END CERTIFICATE-----
 
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
-=============================================================================================================================
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
-DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
-aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
-b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
-BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
-S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
-MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
-IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
-n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
-IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
-dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
-cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
-Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
-xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
-6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
-BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
-N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
-y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
-LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
-dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
-Buypass Class 2 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
-MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
-cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
-0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
-0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
-uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
-1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
-7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
-fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
-wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
-
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
-EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
-==========================================================================
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
-QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
-Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
-IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
-X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
-gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
-eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
-TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
-Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
-uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
-qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
-ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
-Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
-Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
-FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
-zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
-XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
-bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
-RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
-1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
-2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
-Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
-AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-CNNIC ROOT
-==========
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
-ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
-OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
-o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
-VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
-VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
-czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
-y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
-wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
-lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
-Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
-O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
-BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
-G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
-mxE=
------END CERTIFICATE-----
-
-ApplicationCA - Japanese Government
-===================================
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
-SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
-MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
-cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
-fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
-wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
-jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
-nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
-WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
-BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
-vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
-o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
-/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
-io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
-dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Label: "ePKI Root Certification Authority"
+# Serial: 28956088682735189655030529057352760477
+# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
+# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
+# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Subject: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Label: "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3"
+# Serial: 17
+# MD5 Fingerprint: ed:41:f5:8c:50:c5:2b:9c:73:e6:ee:6c:eb:c2:a8:26
+# SHA1 Fingerprint: 1b:4b:39:61:26:27:6b:64:91:a2:68:6d:d7:02:43:21:2d:1f:1d:96
+# SHA256 Fingerprint: e4:c7:34:30:d7:a5:b5:09:25:df:43:37:0a:0d:21:6e:9a:79:b9:d6:db:83:73:a0:c6:9e:b1:cc:31:c7:c5:2a
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 2 CA 1"
+# Serial: 1
+# MD5 Fingerprint: b8:08:9a:f0:03:cc:1b:0d:c8:6c:0b:76:a1:75:64:23
+# SHA1 Fingerprint: a0:a1:ab:90:c9:fc:84:7b:3b:12:61:e8:97:7d:5f:d3:22:61:d3:cc
+# SHA256 Fingerprint: 0f:4e:9c:dd:26:4b:02:55:50:d1:70:80:63:40:21:4f:e9:44:34:c9:b0:2f:69:7e:c7:10:fc:5f:ea:fb:5e:38
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 3 CA 1"
+# Serial: 2
+# MD5 Fingerprint: df:3c:73:59:81:e7:39:50:81:04:4c:34:a2:cb:b3:7b
+# SHA1 Fingerprint: 61:57:3a:11:df:0e:d8:7e:d5:92:65:22:ea:d0:56:d7:44:b3:23:71
+# SHA256 Fingerprint: b7:b1:2b:17:1f:82:1d:aa:99:0c:d0:fe:50:87:b1:28:44:8b:a8:e5:18:4f:84:c5:1e:02:b5:c8:fb:96:2b:24
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
+isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
+NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
+hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
+Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
+EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
+mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
+e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
+dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+# Issuer: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Subject: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Label: "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1"
+# Serial: 5525761995591021570
+# MD5 Fingerprint: 2c:20:26:9d:cb:1a:4a:00:85:b5:b7:5a:ae:c2:01:37
+# SHA1 Fingerprint: 8c:96:ba:eb:dd:2b:07:07:48:ee:30:32:66:a0:f3:98:6e:7c:ae:58
+# SHA256 Fingerprint: 35:ae:5b:dd:d8:f7:ae:63:5c:ff:ba:56:82:a8:f0:0b:95:f4:84:62:c7:10:8e:e9:a0:e5:29:2b:07:4a:af:b2
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
+BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
+ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
+MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
+SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
+a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
+4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
+tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
+tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
+dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
+c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
+TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
++kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
+Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
+OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
+fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
+l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
+FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
+8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
+6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
+TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
+wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
+Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
+xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
+DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
+Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
+hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
+7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+# Issuer: O=certSIGN OU=certSIGN ROOT CA
+# Subject: O=certSIGN OU=certSIGN ROOT CA
+# Label: "certSIGN ROOT CA"
+# Serial: 35210227249154
+# MD5 Fingerprint: 18:98:c0:d6:e9:3a:fc:f9:b0:f5:0c:f7:4b:01:44:17
+# SHA1 Fingerprint: fa:b7:ee:36:97:26:62:fb:2d:b0:2a:f6:bf:03:fd:e8:7c:4b:2f:9b
+# SHA256 Fingerprint: ea:a9:62:c4:fa:4a:6b:af:eb:e4:15:19:6d:35:1c:cd:88:8d:4f:53:f3:fa:8a:e6:d7:c4:66:a9:4e:60:42:bb
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+# Issuer: CN=CNNIC ROOT O=CNNIC
+# Subject: CN=CNNIC ROOT O=CNNIC
+# Label: "CNNIC ROOT"
+# Serial: 1228079105
+# MD5 Fingerprint: 21:bc:82:ab:49:c4:13:3b:4b:b2:2b:5c:6b:90:9c:19
+# SHA1 Fingerprint: 8b:af:4c:9b:1d:f0:2a:92:f7:da:12:8e:b9:1b:ac:f4:98:60:4b:6f
+# SHA256 Fingerprint: e2:83:93:77:3d:a8:45:a6:79:f2:08:0c:c7:fb:44:a3:b7:a1:c3:79:2c:b7:eb:77:29:fd:cb:6a:8d:99:ae:a7
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
+
+# Issuer: O=Japanese Government OU=ApplicationCA
+# Subject: O=Japanese Government OU=ApplicationCA
+# Label: "ApplicationCA - Japanese Government"
+# Serial: 49
+# MD5 Fingerprint: 7e:23:4e:5b:a7:a5:b4:25:e9:00:07:74:11:62:ae:d6
+# SHA1 Fingerprint: 7f:8a:b0:cf:d0:51:87:6a:66:f3:36:0f:47:c8:8d:8c:d3:35:fc:74
+# SHA256 Fingerprint: 2d:47:43:7d:e1:79:51:21:5a:12:f3:c5:8e:51:c7:29:a5:80:26:ef:1f:cc:0a:5f:b3:d9:dc:01:2f:60:0d:19
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
 rosot4LKGAfmt1t06SAZf7IbiVQ=
 -----END CERTIFICATE-----
 
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-============================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
-Juur-SK
-=======
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
-c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
-DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
-SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
-aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
-TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
-+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
-UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
-Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
-MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
-HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
-AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
-cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
-AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
-cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
-A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
-ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
-abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
-IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
-Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
-yyqcjg==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-ACEDICOM Root
-=============
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
-T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
-MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
-A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
-WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
-YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
-MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
-m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
-HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
-xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
-3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
-2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
-TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
-4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
-9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
-aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
-eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
-zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
-ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
-KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
-nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
-I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
-MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
-tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
-CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
-bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
-D/xwzoiQ
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
-===================================================
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
-ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
-MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
-cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
-aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
-8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
-jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
-JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
-9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
-SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
-F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
-D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
-Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+# Issuer: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G3"
+# Serial: 28809105769928564313984085209975885599
+# MD5 Fingerprint: b5:e8:34:36:c9:10:44:58:48:70:6d:2e:83:d4:b8:05
+# SHA1 Fingerprint: 03:9e:ed:b8:0b:e7:a0:3c:69:53:89:3b:20:d2:d9:32:3a:4c:2a:fd
+# SHA256 Fingerprint: b4:78:b8:12:25:0d:f8:78:63:5c:2a:a7:ec:7d:15:5e:aa:62:5e:e8:29:16:e2:cd:29:43:61:88:6c:d1:fb:d4
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G2"
+# Serial: 71758320672825410020661621085256472406
+# MD5 Fingerprint: 74:9d:ea:60:24:c4:fd:22:53:3e:cc:3a:72:d9:29:4f
+# SHA1 Fingerprint: aa:db:bc:22:23:8f:c4:01:a1:27:bb:38:dd:f4:1d:db:08:9e:f0:12
+# SHA256 Fingerprint: a4:31:0d:50:af:18:a6:44:71:90:37:2a:86:af:af:8b:95:1f:fb:43:1d:83:7f:1e:56:88:b4:59:71:ed:15:57
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G3"
+# Serial: 127614157056681299805556476275995414779
+# MD5 Fingerprint: fb:1b:5d:43:8a:94:cd:44:c6:76:f2:43:4b:47:e7:31
+# SHA1 Fingerprint: f1:8b:53:8d:1b:e9:03:b6:a6:f0:56:43:5b:17:15:89:ca:f3:6b:f2
+# SHA256 Fingerprint: 4b:03:f4:58:07:ad:70:f2:1b:fc:2c:ae:71:c9:fd:e4:60:4c:06:4c:f5:ff:b6:86:ba:e5:db:aa:d7:fd:d3:4c
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G2"
+# Serial: 80682863203381065782177908751794619243
+# MD5 Fingerprint: 01:5e:d8:6b:bd:6f:3d:8e:a1:31:f8:12:e0:98:73:6a
+# SHA1 Fingerprint: 8d:17:84:d5:37:f3:03:7d:ec:70:fe:57:8b:51:9a:99:e6:10:d7:b0
+# SHA256 Fingerprint: 5e:db:7a:c4:3b:82:a0:6a:87:61:e8:d7:be:49:79:eb:f2:61:1f:7d:d7:9b:f9:1c:1c:6b:56:6a:21:9e:d7:66
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Universal Root Certification Authority"
+# Serial: 85209574734084581917763752644031726877
+# MD5 Fingerprint: 8e:ad:b5:01:aa:4d:81:e4:8c:1d:d1:e1:14:00:95:19
+# SHA1 Fingerprint: 36:79:ca:35:66:87:72:30:4d:30:a5:fb:87:3b:0f:a7:7b:b7:0d:54
+# SHA256 Fingerprint: 23:99:56:11:27:a5:71:25:de:8c:ef:ea:61:0d:df:2f:a0:78:b5:c8:06:7f:4e:82:82:90:bf:b8:60:e8:4b:3c
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G4"
+# Serial: 63143484348153506665311985501458640051
+# MD5 Fingerprint: 3a:52:e1:e7:fd:6f:3a:e3:6f:f3:6f:99:1b:f9:22:41
+# SHA1 Fingerprint: 22:d5:d8:df:8f:02:31:d1:8d:f7:9d:b7:cf:8a:2d:64:c9:3f:6c:3a
+# SHA256 Fingerprint: 69:dd:d7:ea:90:bb:57:c9:3e:13:5d:c8:5e:a6:fc:d5:48:0b:60:32:39:bd:c4:54:fc:75:8b:2a:26:cf:7f:79
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Subject: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Label: "NetLock Arany (Class Gold) Főtanúsítvány"
+# Serial: 80544274841616
+# MD5 Fingerprint: c5:a1:b7:ff:73:dd:d6:d7:34:32:18:df:fc:3c:ad:88
+# SHA1 Fingerprint: 06:08:3f:59:3f:15:a1:04:a0:69:a4:6b:a9:03:d0:06:b7:97:09:91
+# SHA256 Fingerprint: 6c:61:da:c3:a2:de:f0:31:50:6b:e0:36:d2:a6:fe:40:19:94:fb:d1:3d:f9:c8:d4:66:59:92:74:c4:46:ec:98
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA - G2"
+# Serial: 10000012
+# MD5 Fingerprint: 7c:a5:0f:f8:5b:9a:7d:6d:30:ae:54:5a:e3:42:a2:8a
+# SHA1 Fingerprint: 59:af:82:79:91:86:c7:b4:75:07:cb:cf:03:57:46:eb:04:dd:b7:16
+# SHA256 Fingerprint: 66:8c:83:94:7d:a6:3b:72:4b:ec:e1:74:3c:31:a0:e6:ae:d0:db:8e:c5:b3:1b:e3:77:bb:78:4f:91:b6:71:6f
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig O=Disig a.s.
+# Subject: CN=CA Disig O=Disig a.s.
+# Label: "CA Disig"
+# Serial: 1
+# MD5 Fingerprint: 3f:45:96:39:e2:50:87:f7:bb:fe:98:0c:3c:20:98:e6
+# SHA1 Fingerprint: 2a:c8:d5:8b:57:ce:bf:2f:49:af:f2:fc:76:8f:51:14:62:90:7a:41
+# SHA256 Fingerprint: 92:bf:51:19:ab:ec:ca:d0:b1:33:2d:c4:e1:d0:5f:ba:75:b5:67:90:44:ee:0c:a2:6e:93:1f:74:4f:2f:33:cf
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Subject: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Label: "Juur-SK"
+# Serial: 999181308
+# MD5 Fingerprint: aa:8e:5d:d9:f8:db:0a:58:b7:8d:26:87:6c:82:35:55
+# SHA1 Fingerprint: 40:9d:4b:d9:17:b5:5c:27:b6:9b:64:cb:98:22:44:0d:cd:09:b8:89
+# SHA256 Fingerprint: ec:c3:e9:c3:40:75:03:be:e0:91:aa:95:2f:41:34:8f:f8:8b:aa:86:3b:22:64:be:fa:c8:07:90:15:74:e9:39
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Label: "Hongkong Post Root CA 1"
+# Serial: 1000
+# MD5 Fingerprint: a8:0d:6f:39:78:b9:43:6d:77:42:6d:98:5a:cc:23:ca
+# SHA1 Fingerprint: d6:da:a8:20:8d:09:d2:15:4d:24:b5:2f:cb:34:6e:b2:58:b2:8a:58
+# SHA256 Fingerprint: f9:e6:7d:33:6c:51:00:2a:c0:54:c6:32:02:2d:66:dd:a2:e7:e3:ff:f1:0a:d0:61:ed:31:d8:bb:b4:10:cf:b2
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Label: "SecureSign RootCA11"
+# Serial: 1
+# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
+# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
+# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Subject: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Label: "ACEDICOM Root"
+# Serial: 7029493972724711941
+# MD5 Fingerprint: 42:81:a0:e2:1c:e3:55:10:de:55:89:42:65:96:22:e6
+# SHA1 Fingerprint: e0:b4:32:2e:b2:f6:a5:68:b6:54:53:84:48:18:4a:50:36:87:43:84
+# SHA256 Fingerprint: 03:95:0f:b4:9a:53:1f:3e:19:91:94:23:98:df:a9:e0:ea:32:d7:ba:1c:dd:9b:c8:5d:b5:7e:d9:40:0b:43:4a
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 80507572722862485515306429940691309246
+# MD5 Fingerprint: ef:5a:f1:33:ef:f1:cd:bb:51:02:ee:12:14:4b:96:c4
+# SHA1 Fingerprint: a1:db:63:93:91:6f:17:e4:18:55:09:40:04:15:c7:02:40:b0:ae:6b
+# SHA256 Fingerprint: a4:b6:b3:99:6f:c2:f3:06:b3:fd:86:81:bd:63:41:3d:8c:50:09:cc:4f:a3:29:c2:cc:f0:e2:fa:1b:14:03:05
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Label: "Microsec e-Szigno Root CA 2009"
+# Serial: 14014712776195784473
+# MD5 Fingerprint: f8:49:f4:03:bc:44:2d:83:be:48:69:7d:29:64:fc:b1
+# SHA1 Fingerprint: 89:df:74:fe:5c:f4:0f:4a:80:f9:e3:37:7d:54:da:91:e1:01:31:8e
+# SHA256 Fingerprint: 3c:5f:81:fe:a5:fa:b8:2c:64:bf:a2:ea:ec:af:cd:e8:e0:77:fc:86:20:a7:ca:e5:37:16:3d:f3:6e:db:f3:78
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+# Issuer: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Subject: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Label: "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi"
+# Serial: 91184789765598910059173000485363494069
+# MD5 Fingerprint: 3d:41:29:cb:1e:aa:11:74:cd:5d:b0:62:af:b0:43:5b
+# SHA1 Fingerprint: dd:e1:d2:a9:01:80:2e:1d:87:5e:84:b3:80:7e:4b:b1:fd:99:41:34
+# SHA256 Fingerprint: e6:09:07:84:65:a4:19:78:0c:b6:ac:4c:1c:0b:fb:46:53:d9:d9:cc:6e:b3:94:6e:b7:f3:d6:99:97:ba:d5:98
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
+Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
+a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
+MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
+R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
+MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
+L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
+5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
+90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
+c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
+VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
+qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
+/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
+/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
+KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
 fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
 -----END CERTIFICATE-----
 
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA III
-===============================
------BEGIN CERTIFICATE-----
-MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
-Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
-QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
-KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
-QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
-juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
-CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
-M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
-A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
-g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
-KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
-BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
-CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
-woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Label: "GlobalSign Root CA - R3"
+# Serial: 4835703278459759426209954
+# MD5 Fingerprint: c5:df:b8:49:ca:05:13:55:ee:2d:ba:1a:c3:3e:b0:28
+# SHA1 Fingerprint: d6:9b:56:11:48:f0:1c:77:c5:45:78:c1:09:26:df:5b:85:69:76:ad
+# SHA256 Fingerprint: cb:b5:22:d7:b7:f1:27:ad:6a:01:13:86:5b:df:1c:d4:10:2e:7d:07:59:af:63:5a:7c:f4:72:0d:c9:63:c5:3b
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
+# Serial: 6047274297262753887
+# MD5 Fingerprint: 73:3a:74:7a:ec:bb:a3:96:a6:c2:e4:e2:c8:9b:c0:c3
+# SHA1 Fingerprint: ae:c5:fb:3f:c8:e1:bf:c4:e5:4f:03:07:5a:9a:e8:00:b7:f7:b6:fa
+# SHA256 Fingerprint: 04:04:80:28:bf:1f:28:64:d4:8f:9a:d4:d8:32:94:36:6a:82:88:56:55:3f:3b:14:30:3f:90:14:7f:5d:40:ef
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+# Issuer: CN=Izenpe.com O=IZENPE S.A.
+# Subject: CN=Izenpe.com O=IZENPE S.A.
+# Label: "Izenpe.com"
+# Serial: 917563065490389241595536686991402621
+# MD5 Fingerprint: a6:b0:cd:85:80:da:5c:50:34:a3:39:90:2f:55:67:73
+# SHA1 Fingerprint: 2f:78:3d:25:52:18:a7:4a:65:39:71:b5:2c:a2:9c:45:15:6f:e9:19
+# SHA256 Fingerprint: 25:30:cc:8e:98:32:15:02:ba:d9:6f:9b:1f:ba:1b:09:9e:2d:29:9e:0f:45:48:bb:91:4f:36:3b:c0:d4:53:1f
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
+MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
+ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
+VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
+b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
+scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
+xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
+LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
+uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
+yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
+rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
+BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
+hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
+QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
+HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
+Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
+QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
+BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
+A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
+laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
+awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
+JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
+LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
+VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
+LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
+UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
+QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
+QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Label: "Chambers of Commerce Root - 2008"
+# Serial: 11806822484801597146
+# MD5 Fingerprint: 5e:80:9e:84:5a:0e:65:0b:17:02:f3:55:18:2a:3e:d7
+# SHA1 Fingerprint: 78:6a:74:ac:76:ab:14:7f:9c:6a:30:50:ba:9e:a8:7e:fe:9a:ce:3c
+# SHA256 Fingerprint: 06:3e:4a:fa:c4:91:df:d3:32:f3:08:9b:85:42:e9:46:17:d8:93:d7:fe:94:4e:10:a7:93:7e:e2:9d:96:93:c0
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Label: "Global Chambersign Root - 2008"
+# Serial: 14541511773111788494
+# MD5 Fingerprint: 9e:80:ff:78:01:0c:2e:c1:36:bd:fe:96:90:6e:08:f3
+# SHA1 Fingerprint: 4a:bd:ee:ec:95:0d:35:9c:89:ae:c7:52:a1:2c:5b:29:f6:d6:aa:0c
+# SHA256 Fingerprint: 13:63:35:43:93:34:a7:69:80:16:a0:d3:24:de:72:28:4e:07:9d:7b:52:20:bb:8f:bd:74:78:16:ee:be:ba:ca
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
 09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
 -----END CERTIFICATE-----
 
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Label: "Go Daddy Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01
+# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b
+# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: d6:39:81:c6:52:7e:96:69:fc:fc:ca:66:ed:05:f2:96
+# SHA1 Fingerprint: b5:1c:06:7c:ee:2b:0c:3d:f8:55:ab:2d:92:f4:fe:39:d4:e7:0f:0e
+# SHA256 Fingerprint: 2c:e1:cb:0b:f9:d2:f9:e1:02:99:3f:be:21:51:52:c3:b2:dd:0c:ab:de:1c:68:e5:31:9b:83:91:54:db:b7:f5
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Services Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 17:35:74:af:7b:61:1c:eb:f4:f9:3c:e2:ee:40:f9:a2
+# SHA1 Fingerprint: 92:5a:8f:8d:2c:6d:04:e0:66:5f:59:6a:ff:22:d8:63:e8:25:6f:3f
+# SHA256 Fingerprint: 56:8d:69:05:a2:c8:87:08:a4:b3:02:51:90:ed:cf:ed:b1:97:4a:60:6a:13:c6:e5:29:0f:cb:2a:e6:3e:da:b5
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
+# Subject: CN=AffirmTrust Commercial O=AffirmTrust
+# Label: "AffirmTrust Commercial"
+# Serial: 8608355977964138876
+# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
+# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
+# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Networking O=AffirmTrust
+# Subject: CN=AffirmTrust Networking O=AffirmTrust
+# Label: "AffirmTrust Networking"
+# Serial: 8957382827206547757
+# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
+# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
+# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium O=AffirmTrust
+# Subject: CN=AffirmTrust Premium O=AffirmTrust
+# Label: "AffirmTrust Premium"
+# Serial: 7893706540734352110
+# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
+# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
+# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Label: "AffirmTrust Premium ECC"
+# Serial: 8401224907861490260
+# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
+# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
+# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Label: "Certum Trusted Network CA"
+# Serial: 279744
+# MD5 Fingerprint: d5:e9:81:40:c5:18:69:fc:46:2c:89:75:62:0f:aa:78
+# SHA1 Fingerprint: 07:e0:32:e0:20:b7:2c:3f:19:2f:06:28:a2:59:3a:19:a7:0f:06:9e
+# SHA256 Fingerprint: 5c:58:46:8d:55:f5:8e:49:7e:74:39:82:d2:b5:00:10:b6:d1:65:37:4a:cf:83:a7:d4:a3:2d:b7:68:c4:40:8e
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
 03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
 -----END CERTIFICATE-----
 
-Certinomis - Autorité Racine
-=============================
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
-LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
-A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
-JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
-wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
-Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
-2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
-jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
-c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
-lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
-xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
-530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
-4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
-WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
-R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
-nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
-CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
-JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
-qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
-WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
-wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
-vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
-Root CA Generalitat Valenciana
-==============================
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
-ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
-IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
-WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
-CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
-F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
-ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
-D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
-JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
-AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
-dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
-ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
-AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
-YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
-AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
-AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
-YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
-AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
-OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
-dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
-BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
-b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
-TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
-Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
-NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
-iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
-+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
-
-A-Trust-nQual-03
-================
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
-Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
-dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
-RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
-ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
-c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
-zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
-yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
-SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
-iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
-cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
-eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
-ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
-sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
-JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
-ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+# Issuer: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Subject: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Label: "Certinomis - Autorité Racine"
+# Serial: 1
+# MD5 Fingerprint: 7f:30:78:8c:03:e3:ca:c9:0a:e2:c9:ea:1e:aa:55:1a
+# SHA1 Fingerprint: 2e:14:da:ec:28:f0:fa:1e:8e:38:9a:4e:ab:eb:26:c0:0a:d3:83:c3
+# SHA256 Fingerprint: fc:bf:e2:88:62:06:f7:2b:27:59:3c:8b:07:02:97:e1:2d:76:9e:d1:0e:d7:93:07:05:a8:09:8e:ff:c1:4d:17
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
+BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
+Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
+cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
+aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
+F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
+8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
+rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
+/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
+7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
+28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
+lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
+nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
+0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
+5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
+WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
+jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
+ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
+OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
+619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
+2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
+o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
+nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
+5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
+pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
+dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
+BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+# Issuer: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Subject: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Label: "Root CA Generalitat Valenciana"
+# Serial: 994436456
+# MD5 Fingerprint: 2c:8c:17:5e:b1:54:ab:93:17:b5:36:5a:db:d1:c6:f2
+# SHA1 Fingerprint: a0:73:e5:c5:bd:43:61:0d:86:4c:21:13:0a:85:58:57:cc:9c:ea:46
+# SHA256 Fingerprint: 8c:4e:df:d0:43:48:f3:22:96:9e:7e:29:a4:cd:4d:ca:00:46:55:06:1c:16:e1:b0:76:42:2e:f3:42:ad:63:0e
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
+UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
+R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
+MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
+JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
+WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
+SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
+u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
+A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
+Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
+MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
+aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
+IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
+cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
+YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
+bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
+bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
+aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
+ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
+YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
+ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
+LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
+Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
+eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
+CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
+A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
+Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
+lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
+b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
+9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
+ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
+IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+# Issuer: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Subject: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Label: "A-Trust-nQual-03"
+# Serial: 93214
+# MD5 Fingerprint: 49:63:ae:27:f4:d5:95:3d:d8:db:24:86:b8:9c:07:53
+# SHA1 Fingerprint: d3:c0:63:f2:19:ed:07:3e:34:ad:5d:75:0b:32:76:29:ff:d5:9a:f2
+# SHA256 Fingerprint: 79:3c:bf:45:59:b9:fd:e3:8a:b2:2d:f1:68:69:f6:98:81:ae:14:c4:b0:13:9a:c7:88:a7:8a:1a:fc:ca:02:fb
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
+VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
+bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
+dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
+MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
+dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
+ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
+EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
+lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
+znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
+2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
+k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
+2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
+VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
+KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
+FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
+DNuxUCAKGkq6ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Root Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: aa:08:8f:f6:f9:7b:b7:f2:b1:a7:1e:9b:ea:ea:bd:79
+# SHA1 Fingerprint: cf:9e:87:6d:d3:eb:fc:42:26:97:a3:b5:a3:7a:a0:76:a9:06:23:48
+# SHA256 Fingerprint: bf:d8:8f:e1:10:1c:41:ae:3e:80:1b:f8:be:56:35:0e:e9:ba:d1:a6:b9:bd:51:5e:dc:5c:6d:5b:87:11:ac:44
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
+MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
+V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
+WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
+LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
+AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
+K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
+RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
+rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
+3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
+hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
+MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
+XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
+lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
+aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
+YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Label: "Security Communication RootCA2"
+# Serial: 0
+# MD5 Fingerprint: 6c:39:7d:a4:0e:55:59:b2:3f:d6:41:b1:12:50:de:43
+# SHA1 Fingerprint: 5f:3b:8c:f2:f8:10:b3:7d:78:b4:ce:ec:19:19:c3:73:34:b9:c7:74
+# SHA256 Fingerprint: 51:3b:2c:ec:b8:10:d4:cd:e5:dd:85:39:1a:df:c6:c2:dd:60:d8:7b:b7:36:d2:b5:21:48:4a:a4:7a:0e:be:f6
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Label: "Hellenic Academic and Research Institutions RootCA 2011"
+# Serial: 0
+# MD5 Fingerprint: 73:9f:4c:4b:73:5b:79:e9:fa:ba:1c:ef:6e:cb:d5:c9
+# SHA1 Fingerprint: fe:45:65:9b:79:03:5b:98:a1:61:b5:51:2e:ac:da:58:09:48:22:4d
+# SHA256 Fingerprint: bc:10:4f:15:a4:8b:e7:09:dc:a5:42:a7:e1:d4:b9:df:6f:05:45:27:e8:02:ea:a9:2d:59:54:44:25:8a:fe:71
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
+RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
+dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
+YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
+NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
+EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
+cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
+dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
+fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
+bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
+75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
+FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
+HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
+5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
+b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
+A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
+6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
+dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
+Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
+l7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+# Issuer: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Subject: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Label: "Actalis Authentication Root CA"
+# Serial: 6271844772424770508
+# MD5 Fingerprint: 69:c1:0d:4f:07:a3:1b:c3:fe:56:3d:04:bc:11:f6:a6
+# SHA1 Fingerprint: f3:73:b3:87:06:5a:28:84:8a:f2:f3:4a:ce:19:2b:dd:c7:8e:9c:ac
+# SHA256 Fingerprint: 55:92:60:84:ec:96:3a:64:b9:6e:2a:be:01:ce:0b:a8:6a:64:fb:fe:bc:c7:aa:b5:af:c1:55:b3:7f:d7:60:66
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Trustis Limited OU=Trustis FPS Root CA
+# Subject: O=Trustis Limited OU=Trustis FPS Root CA
+# Label: "Trustis FPS Root CA"
+# Serial: 36053640375399034304724988975563710553
+# MD5 Fingerprint: 30:c9:e7:1e:6b:e6:14:eb:65:b2:16:69:20:31:67:4d
+# SHA1 Fingerprint: 3b:c0:38:0b:33:c3:f6:a6:0c:86:15:22:93:d9:df:f5:4b:81:c0:04
+# SHA256 Fingerprint: c1:b4:82:99:ab:a5:20:8f:e9:63:0a:ce:55:ca:68:a0:3e:da:5a:51:9c:88:02:a0:d3:a6:73:be:8f:8e:55:7d
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
+ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
+MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
+MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
+iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
+vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
+0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
+OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
+BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
+FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
+GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
+zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
+1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
+f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
+jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
+ZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 45
+# MD5 Fingerprint: c9:3b:0d:84:41:fc:a4:76:79:23:08:57:de:10:19:16
+# SHA1 Fingerprint: a3:f1:33:3f:e2:42:bf:cf:c5:d1:4e:8f:39:42:98:40:68:10:d1:a0
+# SHA256 Fingerprint: e1:78:90:ee:09:a3:fb:f4:f4:8b:9c:41:4a:17:d6:37:b7:a5:06:47:e9:bc:75:23:22:72:7f:cc:17:42:a9:11
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Subject: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Label: "StartCom Certification Authority G2"
+# Serial: 59
+# MD5 Fingerprint: 78:4b:fb:9e:64:82:0a:d3:b8:4c:62:f3:64:f2:90:64
+# SHA1 Fingerprint: 31:f1:fd:68:22:63:20:ee:c6:3b:3f:9d:ea:4a:3e:53:7c:7c:39:17
+# SHA256 Fingerprint: c7:ba:65:67:de:93:a7:98:ae:1f:aa:79:1e:71:2d:37:8f:ae:1f:93:c4:39:7f:ea:44:1b:b7:cb:e6:fd:59:95
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
+OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
+A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
+JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
+vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
+D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
+Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
+RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
+HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
+nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
+0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
+UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
+Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
+TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
+BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
+UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
+6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
+9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
+HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
+wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
+XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
+IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
+hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
+so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 2 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 46:a7:d2:fe:45:fb:64:5a:a8:59:90:9b:78:44:9b:29
+# SHA1 Fingerprint: 49:0a:75:74:de:87:0a:47:fe:58:ee:f6:c7:6b:eb:c6:0b:12:40:99
+# SHA256 Fingerprint: 9a:11:40:25:19:7c:5b:b9:5d:94:e6:3d:55:cd:43:79:08:47:b6:46:b2:3c:df:11:ad:a4:a0:0e:ff:15:fb:48
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 3 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 3d:3b:18:9e:2c:64:5a:e8:d5:88:ce:0e:f9:37:c2:ec
+# SHA1 Fingerprint: da:fa:f7:fa:66:84:ec:06:8f:14:50:bd:c7:c2:81:a5:bc:a9:64:57
+# SHA256 Fingerprint: ed:f7:eb:bc:a2:7a:2a:38:4d:38:7b:7d:40:10:c6:66:e2:ed:b4:84:3e:4c:29:b4:ae:1d:5b:93:32:e6:b2:4d
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Subject: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Label: "T-TeleSec GlobalRoot Class 3"
+# Serial: 1
+# MD5 Fingerprint: ca:fb:40:a8:4e:39:92:8a:1d:fe:8e:2f:c4:27:ea:ef
+# SHA1 Fingerprint: 55:a6:72:3e:cb:f2:ec:cd:c3:23:74:70:19:9d:2a:be:11:e3:81:d1
+# SHA256 Fingerprint: fd:73:da:d3:1c:64:4f:f1:b4:3b:ef:0c:cd:da:96:71:0b:9c:d9:87:5e:ca:7e:31:70:7a:f3:e9:6d:52:2b:bd
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Subject: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Label: "EE Certification Centre Root CA"
+# Serial: 112324828676200291871926431888494945866
+# MD5 Fingerprint: 43:5e:88:d4:7d:1a:4a:7e:fd:84:2e:52:eb:01:d4:6f
+# SHA1 Fingerprint: c9:a8:b9:e7:55:80:5e:58:e3:53:77:a7:25:eb:af:c3:7b:27:cc:d7
+# SHA256 Fingerprint: 3e:84:ba:43:42:90:85:16:e7:75:73:c0:99:2f:09:79:ca:08:4e:46:85:68:1f:f1:95:cc:ba:8a:22:9b:8a:76
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
+czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
+CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
+MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
+ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
+b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
+euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
+bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
+WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
+MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
+1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
+zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
+BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
+v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
+E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
+iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
+GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Label: "TURKTRUST Certificate Services Provider Root 2007"
+# Serial: 1
+# MD5 Fingerprint: 2b:70:20:56:86:82:a0:18:c8:07:53:12:28:70:21:72
+# SHA1 Fingerprint: f1:7f:6f:b6:31:dc:99:e3:a3:c8:7f:fe:1c:f1:81:10:88:d9:60:33
+# SHA256 Fingerprint: 97:8c:d9:66:f2:fa:a0:7b:a7:aa:95:00:d9:c0:2e:9d:77:f2:cd:ad:a6:ad:6b:a7:4a:f4:b9:1c:66:59:3c:50
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
+OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
+b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
+VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
+sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
+ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
+KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
+HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
+IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
+733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
+Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
+AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
+mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
+XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
+qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 2009"
+# Serial: 623603
+# MD5 Fingerprint: cd:e0:25:69:8d:47:ac:9c:89:35:90:f7:fd:51:3d:2f
+# SHA1 Fingerprint: 58:e8:ab:b0:36:15:33:fb:80:f7:9b:1b:6d:29:d3:ff:8d:5f:00:f0
+# SHA256 Fingerprint: 49:e7:a4:42:ac:f0:ea:62:87:05:00:54:b5:25:64:b6:50:e4:f4:9e:42:e3:48:d6:aa:38:e0:39:e9:57:b1:c1
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 EV 2009"
+# Serial: 623604
+# MD5 Fingerprint: aa:c6:43:2c:5e:2d:cd:c4:34:c0:50:4f:11:02:4f:b6
+# SHA1 Fingerprint: 96:c9:1b:0b:95:b4:10:98:42:fa:d0:d8:22:79:fe:60:fa:b9:16:83
+# SHA256 Fingerprint: ee:c5:49:6b:98:8c:e9:86:25:b9:34:09:2e:ec:29:08:be:d0:b0:f3:16:c2:d4:73:0c:84:ea:f1:f3:d3:48:81
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Raiz del Estado Venezolano O=Sistema Nacional de Certificacion Electronica OU=Superintendencia de Servicios de Certificacion Electronica
+# Subject: CN=PSCProcert O=Sistema Nacional de Certificacion Electronica OU=Proveedor de Certificados PROCERT
+# Label: "PSCProcert"
+# Serial: 11
+# MD5 Fingerprint: e6:24:e9:12:01:ae:0c:de:8e:85:c4:ce:a3:12:dd:ec
+# SHA1 Fingerprint: 70:c1:8d:74:b4:28:81:0a:e4:fd:a5:75:d7:01:9f:99:b0:3d:50:74
+# SHA256 Fingerprint: 3c:fc:3c:14:d1:f6:84:ff:17:e3:8c:43:ca:44:0c:00:b9:67:ec:93:3e:8b:fe:06:4c:a1:d7:2c:90:f2:ad:b0
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
+MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
+b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
+KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
+A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
+aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
+7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
+BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
+ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
+JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
+PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
+0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
+6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
+v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
+K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
+bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
+MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
+MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
+gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
+b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
+bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
+cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
+ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
+ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
+hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
+AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
+MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
+RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
+UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
+cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
+AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
+AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
+1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
+3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
+Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
+HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
+pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
+sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
+qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
+mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
+opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
+YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+# Issuer: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Subject: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Label: "China Internet Network Information Center EV Certificates Root"
+# Serial: 1218379777
+# MD5 Fingerprint: 55:5d:63:00:97:bd:6a:97:f5:67:ab:4b:fb:6e:63:15
+# SHA1 Fingerprint: 4f:99:aa:93:fb:2b:d1:37:26:a1:99:4a:ce:7f:f0:05:f2:93:5d:1e
+# SHA256 Fingerprint: 1c:01:c6:f4:db:b2:fe:fc:22:55:8b:2b:ca:32:56:3f:49:84:4a:cf:c3:2b:7b:e4:b0:ff:59:9f:9e:8c:7a:f7
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
+Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
+aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
+Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
+SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
+aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
+ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
+7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
+DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
+zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
+hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
+4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
+gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
+NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
+j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
+52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
+echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
+zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
+wy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 2"
+# Serial: 40698052477090394928831521023204026294
+# MD5 Fingerprint: 5b:04:69:ec:a5:83:94:63:18:a7:86:d0:e4:f2:6e:19
+# SHA1 Fingerprint: 77:47:4f:c6:30:e4:0f:4c:47:64:3f:84:ba:b8:c6:95:4a:8a:41:ec
+# SHA256 Fingerprint: f0:9b:12:2c:71:14:f4:a0:9b:d4:ea:4f:4a:99:d5:58:b4:6e:4c:25:cd:81:14:0d:29:c0:56:13:91:4c:38:41
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
+jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
+0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
+2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
+ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
+y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
+tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
+6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
+uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
+acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
+k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
+VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
+b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
+fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
+/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
+REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
+srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
+aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
+woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
+Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
+t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
+8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
+9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
+wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root EV CA 2"
+# Serial: 322973295377129385374608406479535262296
+# MD5 Fingerprint: 7b:30:34:9f:dd:0a:4b:6b:35:ca:31:51:28:5d:ae:ec
+# SHA1 Fingerprint: e7:a1:90:29:d3:d5:52:dc:0d:0f:c6:92:d3:ea:88:0d:15:2e:1a:6b
+# SHA256 Fingerprint: d9:5f:ea:3c:a4:ee:dc:e7:4c:d7:6e:75:fc:6d:1f:f6:2c:44:1f:0f:a8:bc:77:f0:34:b1:9e:5d:b2:58:01:5d
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
+ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
+dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
+IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
+VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
+dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
+MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
+UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
+1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
+oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
+HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
+5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
+idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
+OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
+NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
+46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
+UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
+7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
+A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
+bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
+XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
+PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
+Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
+WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
+Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
+7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
+nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
+vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
+WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
+fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
+I+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R1 O=Disig a.s.
+# Subject: CN=CA Disig Root R1 O=Disig a.s.
+# Label: "CA Disig Root R1"
+# Serial: 14052245610670616104
+# MD5 Fingerprint: be:ec:11:93:9a:f5:69:21:bc:d7:c1:c0:67:89:cc:2a
+# SHA1 Fingerprint: 8e:1c:74:f8:a6:20:b9:e5:8a:f4:61:fa:ec:2b:47:56:51:1a:52:c6
+# SHA256 Fingerprint: f9:6f:23:f4:c3:e7:9c:07:7a:46:98:8d:5a:f5:90:06:76:a0:f0:39:cb:64:5d:d1:75:49:b2:16:c8:24:40:ce
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
+MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
+D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
+OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
+fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
+IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
+oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
+/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
+rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
+3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
+7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
+yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
+qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
+hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
+SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
+HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
+emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
+AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
+7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
+DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
+F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
+a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
+Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R2 O=Disig a.s.
+# Subject: CN=CA Disig Root R2 O=Disig a.s.
+# Label: "CA Disig Root R2"
+# Serial: 10572350602393338211
+# MD5 Fingerprint: 26:01:fb:d8:27:a7:17:9a:45:54:38:1a:43:01:3b:03
+# SHA1 Fingerprint: b5:61:eb:ea:a4:de:e4:25:4b:69:1a:98:a5:57:47:c2:34:c7:d9:71
+# SHA256 Fingerprint: e2:3d:4a:03:6d:7b:70:e9:f5:95:b1:42:20:79:d2:b9:1e:df:bb:1f:b6:51:a0:63:3e:aa:8a:9d:c5:f8:07:03
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
+MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
+NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
+PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
+x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
+QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
+yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
+QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
+H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
+QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
+i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
+nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
+rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
+hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
+GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
+lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
+TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
+nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
+gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
+G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
+zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
+L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
+# Subject: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
+# Label: "ACCVRAIZ1"
+# Serial: 6828503384748696800
+# MD5 Fingerprint: d0:a0:5a:ee:05:b6:09:94:21:a1:7d:f1:b2:29:82:02
+# SHA1 Fingerprint: 93:05:7a:88:15:c6:4f:ce:88:2f:fa:91:16:52:28:78:bc:53:64:17
+# SHA256 Fingerprint: 9a:6e:c0:12:e1:a7:da:9d:be:34:19:4d:47:8a:d7:c0:db:18:22:fb:07:1d:f1:29:81:49:6e:d1:04:38:41:13
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
+AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
+CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
+BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
+VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
+qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
+HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
+G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
+lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
+IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
+0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
+k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
+4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
+m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
+cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
+uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
+KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
+ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
+AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
+VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
+CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
+cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
+QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
+7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
+cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
+QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
+czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
+aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
+aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
+DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
+BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
+D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
+JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
+AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
+vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
+tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
+7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
+h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
+d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
+pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Global Root CA"
+# Serial: 3262
+# MD5 Fingerprint: f9:03:7e:cf:e6:9e:3c:73:7a:2a:90:07:69:ff:2b:96
+# SHA1 Fingerprint: 9c:bb:48:53:f6:a4:f6:d3:52:a4:e8:32:52:55:60:13:f5:ad:af:65
+# SHA256 Fingerprint: 59:76:90:07:f7:68:5d:0f:cd:50:87:2f:9f:95:d5:75:5a:5b:2b:45:7d:81:f3:69:2b:61:0a:98:67:2f:0e:1b
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
+EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
+VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
+NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
+B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
+10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
+0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
+MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
+zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
+46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
+yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
+laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
+oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
+BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
+qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
+4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
+1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
+H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
+RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
+15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
+6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
+nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
+wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
+aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
+KwbQBM0=
 -----END CERTIFICATE-----
diff --git a/lib/requests/certs.py b/lib/requests/certs.py
old mode 100755
new mode 100644
index 42df2f8..07e6475
--- a/lib/requests/certs.py
+++ b/lib/requests/certs.py
@@ -2,26 +2,24 @@
 # -*- coding: utf-8 -*-
 
 """
-ceritfi.py
-~~~~~~~~~~
+certs.py
+~~~~~~~~
 
-This module returns the installation location of cacert.pem.
+This module returns the preferred default CA certificate bundle.
+
+If you are packaging Requests, e.g., for a Linux distribution or a managed
+environment, you can change the definition of where() to return a separately
+packaged CA bundle.
 """
+import os.path
 
-import os
 try:
-    import certifi
+    from certifi import where
 except ImportError:
-    certifi = None
-
-
-def where():
-
-    if certifi:
-        return certifi.where()
-    else:
-        f = os.path.split(__file__)[0]
-        return os.path.join(f, 'cacert.pem')
+    def where():
+        """Return the preferred certificate bundle."""
+        # vendored bundle inside Requests
+        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
 
 if __name__ == '__main__':
     print(where())
diff --git a/lib/requests/certs.pyc b/lib/requests/certs.pyc
index 127f37d..822714f 100644
Binary files a/lib/requests/certs.pyc and b/lib/requests/certs.pyc differ
diff --git a/lib/requests/compat.py b/lib/requests/compat.py
old mode 100755
new mode 100644
index aa62406..c07726e
--- a/lib/requests/compat.py
+++ b/lib/requests/compat.py
@@ -4,6 +4,7 @@
 pythoncompat
 """
 
+from .packages import chardet
 
 import sys
 
@@ -74,25 +75,22 @@ is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
 
 try:
     import simplejson as json
-except ImportError:
+except (ImportError, SyntaxError):
+    # simplejson does not support Python 3.2, it throws a SyntaxError
+    # because of u'...' Unicode literals.
     import json
 
 # ---------
 # Specifics
 # ---------
 
-
 if is_py2:
-    from urllib import quote, unquote, quote_plus, unquote_plus, urlencode
+    from urllib import quote, unquote, quote_plus, unquote_plus, urlencode, getproxies, proxy_bypass
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
     from urllib2 import parse_http_list
     import cookielib
     from Cookie import Morsel
     from StringIO import StringIO
-    try:
-        import cchardet as chardet
-    except ImportError:
-        from .packages import chardet
     from .packages.urllib3.packages.ordered_dict import OrderedDict
 
     builtin_str = str
@@ -102,14 +100,12 @@ if is_py2:
     numeric_types = (int, long, float)
 
 
-
 elif is_py3:
     from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
-    from urllib.request import parse_http_list
+    from urllib.request import parse_http_list, getproxies, proxy_bypass
     from http import cookiejar as cookielib
     from http.cookies import Morsel
     from io import StringIO
-    from .packages import chardet2 as chardet
     from collections import OrderedDict
 
     builtin_str = str
diff --git a/lib/requests/compat.pyc b/lib/requests/compat.pyc
index 91a1d18..b2ef7b9 100644
Binary files a/lib/requests/compat.pyc and b/lib/requests/compat.pyc differ
diff --git a/lib/requests/cookies.py b/lib/requests/cookies.py
old mode 100755
new mode 100644
index c3c2deb..6969fe5
--- a/lib/requests/cookies.py
+++ b/lib/requests/cookies.py
@@ -6,8 +6,9 @@ Compatibility code to be able to use `cookielib.CookieJar` with requests.
 requests.utils imports from here, so be careful with imports.
 """
 
+import time
 import collections
-from .compat import cookielib, urlparse, Morsel
+from .compat import cookielib, urlparse, urlunparse, Morsel
 
 try:
     import threading
@@ -32,26 +33,33 @@ class MockRequest(object):
     def __init__(self, request):
         self._r = request
         self._new_headers = {}
+        self.type = urlparse(self._r.url).scheme
 
     def get_type(self):
-        return urlparse(self._r.full_url).scheme
+        return self.type
 
     def get_host(self):
-        return urlparse(self._r.full_url).netloc
+        return urlparse(self._r.url).netloc
 
     def get_origin_req_host(self):
-        if self._r.response.history:
-            r = self._r.response.history[0]
-            return urlparse(r.url).netloc
-        else:
-            return self.get_host()
+        return self.get_host()
 
     def get_full_url(self):
-        return self._r.full_url
+        # Only return the response's URL if the user hadn't set the Host
+        # header
+        if not self._r.headers.get('Host'):
+            return self._r.url
+        # If they did set it, retrieve it and reconstruct the expected domain
+        host = self._r.headers['Host']
+        parsed = urlparse(self._r.url)
+        # Reconstruct the URL as we expect it
+        return urlunparse([
+            parsed.scheme, host, parsed.path, parsed.params, parsed.query,
+            parsed.fragment
+        ])
 
     def is_unverifiable(self):
-        # unverifiable == redirected
-        return bool(self._r.response.history)
+        return True
 
     def has_header(self, name):
         return name in self._r.headers or name in self._new_headers
@@ -73,6 +81,14 @@ class MockRequest(object):
     def unverifiable(self):
         return self.is_unverifiable()
 
+    @property
+    def origin_req_host(self):
+        return self.get_origin_req_host()
+
+    @property
+    def host(self):
+        return self.get_host()
+
 
 class MockResponse(object):
     """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
@@ -102,6 +118,9 @@ def extract_cookies_to_jar(jar, request, response):
     :param request: our own requests.Request object
     :param response: urllib3.HTTPResponse object
     """
+    if not (hasattr(response, '_original_response') and
+            response._original_response):
+        return
     # the _original_response field is the wrapped httplib.HTTPResponse object,
     req = MockRequest(request)
     # pull out the HTTPMessage with the headers and put it in the mock:
@@ -138,26 +157,28 @@ class CookieConflictError(RuntimeError):
 
 
 class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
-    """Compatibility class; is a cookielib.CookieJar, but exposes a dict interface.
+    """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+    interface.
 
     This is the CookieJar we create by default for requests and sessions that
     don't specify one, since some clients may expect response.cookies and
     session.cookies to support dict operations.
 
-    Don't use the dict interface internally; it's just for compatibility with
-    with external client code. All `requests` code should work out of the box
-    with externally provided instances of CookieJar, e.g., LWPCookieJar and
-    FileCookieJar.
-
-    Caution: dictionary operations that are normally O(1) may be O(n).
+    Requests does not use the dict interface internally; it's just for
+    compatibility with external client code. All requests code should work
+    out of the box with externally provided instances of ``CookieJar``, e.g.
+    ``LWPCookieJar`` and ``FileCookieJar``.
 
     Unlike a regular CookieJar, this class is pickleable.
-    """
 
+    .. warning:: dictionary operations that are normally O(1) may be O(n).
+    """
     def get(self, name, default=None, domain=None, path=None):
         """Dict-like get() that also supports optional domain and path args in
         order to resolve naming collisions from using one cookie jar over
-        multiple domains. Caution: operation is O(n), not O(1)."""
+        multiple domains.
+
+        .. warning:: operation is O(n), not O(1)."""
         try:
             return self._find_no_duplicates(name, domain, path)
         except KeyError:
@@ -179,30 +200,40 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         self.set_cookie(c)
         return c
 
+    def iterkeys(self):
+        """Dict-like iterkeys() that returns an iterator of names of cookies
+        from the jar. See itervalues() and iteritems()."""
+        for cookie in iter(self):
+            yield cookie.name
+
     def keys(self):
-        """Dict-like keys() that returns a list of names of cookies from the jar.
-        See values() and items()."""
-        keys = []
+        """Dict-like keys() that returns a list of names of cookies from the
+        jar. See values() and items()."""
+        return list(self.iterkeys())
+
+    def itervalues(self):
+        """Dict-like itervalues() that returns an iterator of values of cookies
+        from the jar. See iterkeys() and iteritems()."""
         for cookie in iter(self):
-            keys.append(cookie.name)
-        return keys
+            yield cookie.value
 
     def values(self):
-        """Dict-like values() that returns a list of values of cookies from the jar.
-        See keys() and items()."""
-        values = []
+        """Dict-like values() that returns a list of values of cookies from the
+        jar. See keys() and items()."""
+        return list(self.itervalues())
+
+    def iteritems(self):
+        """Dict-like iteritems() that returns an iterator of name-value tuples
+        from the jar. See iterkeys() and itervalues()."""
         for cookie in iter(self):
-            values.append(cookie.value)
-        return values
+            yield cookie.name, cookie.value
 
     def items(self):
-        """Dict-like items() that returns a list of name-value tuples from the jar.
-        See keys() and values(). Allows client-code to call "dict(RequestsCookieJar)
-        and get a vanilla python dict of key value pairs."""
-        items = []
-        for cookie in iter(self):
-            items.append((cookie.name, cookie.value))
-        return items
+        """Dict-like items() that returns a list of name-value tuples from the
+        jar. See keys() and values(). Allows client-code to call
+        ``dict(RequestsCookieJar)`` and get a vanilla python dict of key value
+        pairs."""
+        return list(self.iteritems())
 
     def list_domains(self):
         """Utility method to list all the domains in the jar."""
@@ -231,8 +262,9 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         return False  # there is only one domain in jar
 
     def get_dict(self, domain=None, path=None):
-        """Takes as an argument an optional domain and path and returns a plain old
-        Python dict of name-value pairs of cookies that meet the requirements."""
+        """Takes as an argument an optional domain and path and returns a plain
+        old Python dict of name-value pairs of cookies that meet the
+        requirements."""
         dictionary = {}
         for cookie in iter(self):
             if (domain is None or cookie.domain == domain) and (path is None
@@ -241,26 +273,45 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         return dictionary
 
     def __getitem__(self, name):
-        """Dict-like __getitem__() for compatibility with client code. Throws exception
-        if there are more than one cookie with name. In that case, use the more
-        explicit get() method instead. Caution: operation is O(n), not O(1)."""
+        """Dict-like __getitem__() for compatibility with client code. Throws
+        exception if there are more than one cookie with name. In that case,
+        use the more explicit get() method instead.
+
+        .. warning:: operation is O(n), not O(1)."""
+
         return self._find_no_duplicates(name)
 
     def __setitem__(self, name, value):
-        """Dict-like __setitem__ for compatibility with client code. Throws exception
-        if there is already a cookie of that name in the jar. In that case, use the more
-        explicit set() method instead."""
+        """Dict-like __setitem__ for compatibility with client code. Throws
+        exception if there is already a cookie of that name in the jar. In that
+        case, use the more explicit set() method instead."""
+
         self.set(name, value)
 
     def __delitem__(self, name):
-        """Deletes a cookie given a name. Wraps cookielib.CookieJar's remove_cookie_by_name()."""
+        """Deletes a cookie given a name. Wraps ``cookielib.CookieJar``'s
+        ``remove_cookie_by_name()``."""
         remove_cookie_by_name(self, name)
 
+    def set_cookie(self, cookie, *args, **kwargs):
+        if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
+            cookie.value = cookie.value.replace('\\"', '')
+        return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
+
+    def update(self, other):
+        """Updates this jar with cookies from another CookieJar or dict-like"""
+        if isinstance(other, cookielib.CookieJar):
+            for cookie in other:
+                self.set_cookie(cookie)
+        else:
+            super(RequestsCookieJar, self).update(other)
+
     def _find(self, name, domain=None, path=None):
-        """Requests uses this method internally to get cookie values. Takes as args name
-        and optional domain and path. Returns a cookie.value. If there are conflicting cookies,
-        _find arbitrarily chooses one. See _find_no_duplicates if you want an exception thrown
-        if there are conflicting cookies."""
+        """Requests uses this method internally to get cookie values. Takes as
+        args name and optional domain and path. Returns a cookie.value. If
+        there are conflicting cookies, _find arbitrarily chooses one. See
+        _find_no_duplicates if you want an exception thrown if there are
+        conflicting cookies."""
         for cookie in iter(self):
             if cookie.name == name:
                 if domain is None or cookie.domain == domain:
@@ -270,10 +321,11 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
         raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
 
     def _find_no_duplicates(self, name, domain=None, path=None):
-        """__get_item__ and get call _find_no_duplicates -- never used in Requests internally.
-        Takes as args name and optional domain and path. Returns a cookie.value.
-        Throws KeyError if cookie is not found and CookieConflictError if there are
-        multiple cookies that match name and optionally domain and path."""
+        """Both ``__get_item__`` and ``get`` call this function: it's never
+        used elsewhere in Requests. Takes as args name and optional domain and
+        path. Returns a cookie.value. Throws KeyError if cookie is not found
+        and CookieConflictError if there are multiple cookies that match name
+        and optionally domain and path."""
         toReturn = None
         for cookie in iter(self):
             if cookie.name == name:
@@ -301,8 +353,10 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
             self._cookies_lock = threading.RLock()
 
     def copy(self):
-        """This is not implemented. Calling this will throw an exception."""
-        raise NotImplementedError
+        """Return a copy of this RequestsCookieJar."""
+        new_cj = RequestsCookieJar()
+        new_cj.update(self)
+        return new_cj
 
 
 def create_cookie(name, value, **kwargs):
@@ -342,36 +396,68 @@ def create_cookie(name, value, **kwargs):
 
 def morsel_to_cookie(morsel):
     """Convert a Morsel object into a Cookie containing the one k/v pair."""
-    c = create_cookie(
-        name=morsel.key,
-        value=morsel.value,
-        version=morsel['version'] or 0,
-        port=None,
-        port_specified=False,
-        domain=morsel['domain'],
-        domain_specified=bool(morsel['domain']),
-        domain_initial_dot=morsel['domain'].startswith('.'),
-        path=morsel['path'],
-        path_specified=bool(morsel['path']),
-        secure=bool(morsel['secure']),
-        expires=morsel['max-age'] or morsel['expires'],
-        discard=False,
+
+    expires = None
+    if morsel['max-age']:
+        expires = time.time() + morsel['max-age']
+    elif morsel['expires']:
+        time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
+        expires = time.mktime(
+            time.strptime(morsel['expires'], time_template)) - time.timezone
+    return create_cookie(
         comment=morsel['comment'],
         comment_url=bool(morsel['comment']),
+        discard=False,
+        domain=morsel['domain'],
+        expires=expires,
+        name=morsel.key,
+        path=morsel['path'],
+        port=None,
         rest={'HttpOnly': morsel['httponly']},
-        rfc2109=False,)
-    return c
+        rfc2109=False,
+        secure=bool(morsel['secure']),
+        value=morsel.value,
+        version=morsel['version'] or 0,
+    )
 
 
-def cookiejar_from_dict(cookie_dict, cookiejar=None):
+def cookiejar_from_dict(cookie_dict, cookiejar=None, overwrite=True):
     """Returns a CookieJar from a key/value dictionary.
 
     :param cookie_dict: Dict of key/values to insert into CookieJar.
+    :param cookiejar: (optional) A cookiejar to add the cookies to.
+    :param overwrite: (optional) If False, will not replace cookies
+        already in the jar with new ones.
     """
     if cookiejar is None:
         cookiejar = RequestsCookieJar()
 
     if cookie_dict is not None:
+        names_from_jar = [cookie.name for cookie in cookiejar]
         for name in cookie_dict:
-            cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
+            if overwrite or (name not in names_from_jar):
+                cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
+
+    return cookiejar
+
+
+def merge_cookies(cookiejar, cookies):
+    """Add cookies to cookiejar and returns a merged CookieJar.
+
+    :param cookiejar: CookieJar object to add the cookies to.
+    :param cookies: Dictionary or CookieJar object to be added.
+    """
+    if not isinstance(cookiejar, cookielib.CookieJar):
+        raise ValueError('You can only merge into CookieJar')
+
+    if isinstance(cookies, dict):
+        cookiejar = cookiejar_from_dict(
+            cookies, cookiejar=cookiejar, overwrite=False)
+    elif isinstance(cookies, cookielib.CookieJar):
+        try:
+            cookiejar.update(cookies)
+        except AttributeError:
+            for cookie_in_jar in cookies:
+                cookiejar.set_cookie(cookie_in_jar)
+
     return cookiejar
diff --git a/lib/requests/cookies.pyc b/lib/requests/cookies.pyc
index 1f5459d..285fa0f 100644
Binary files a/lib/requests/cookies.pyc and b/lib/requests/cookies.pyc differ
diff --git a/lib/requests/defaults.py b/lib/requests/defaults.py
deleted file mode 100755
index 91d038b..0000000
--- a/lib/requests/defaults.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.defaults
-~~~~~~~~~~~~~~~~~
-
-This module provides the Requests configuration defaults.
-
-Configurations:
-
-:base_headers: Default HTTP headers.
-:verbose: Stream to write request logging to.
-:max_redirects: Maximum number of redirects allowed within a request.s
-:keep_alive: Reuse HTTP Connections?
-:max_retries: The number of times a request should be retried in the event of a connection failure.
-:danger_mode: If true, Requests will raise errors immediately.
-:safe_mode: If true, Requests will catch all errors.
-:strict_mode: If true, Requests will do its best to follow RFCs (e.g. POST redirects).
-:pool_maxsize: The maximium size of an HTTP connection pool.
-:pool_connections: The number of active HTTP connection pools to use.
-:encode_uri: If true, URIs will automatically be percent-encoded.
-:trust_env: If true, the surrouding environment will be trusted (environ, netrc).
-:store_cookies: If false, the received cookies as part of the HTTP response would be ignored.
-
-"""
-
-SCHEMAS = ['http', 'https']
-
-from .utils import default_user_agent
-
-defaults = dict()
-
-defaults['base_headers'] = {
-    'User-Agent': default_user_agent(),
-    'Accept-Encoding': ', '.join(('gzip', 'deflate', 'compress')),
-    'Accept': '*/*'
-}
-
-defaults['verbose'] = None
-defaults['max_redirects'] = 30
-defaults['pool_connections'] = 10
-defaults['pool_maxsize'] = 10
-defaults['max_retries'] = 0
-defaults['danger_mode'] = False
-defaults['safe_mode'] = False
-defaults['strict_mode'] = False
-defaults['keep_alive'] = True
-defaults['encode_uri'] = True
-defaults['trust_env'] = True
-defaults['store_cookies'] = True
diff --git a/lib/requests/defaults.pyc b/lib/requests/defaults.pyc
deleted file mode 100644
index 09d94b6..0000000
Binary files a/lib/requests/defaults.pyc and /dev/null differ
diff --git a/lib/requests/exceptions.py b/lib/requests/exceptions.py
old mode 100755
new mode 100644
index 6759af5..89135a8
--- a/lib/requests/exceptions.py
+++ b/lib/requests/exceptions.py
@@ -7,28 +7,60 @@ requests.exceptions
 This module contains the set of Requests' exceptions.
 
 """
+from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
 
 
-class RequestException(RuntimeError):
+class RequestException(IOError):
     """There was an ambiguous exception that occurred while handling your
     request."""
 
+    def __init__(self, *args, **kwargs):
+        """
+        Initialize RequestException with `request` and `response` objects.
+        """
+        response = kwargs.pop('response', None)
+        self.response = response
+        self.request = kwargs.pop('request', None)
+        if (response is not None and not self.request and
+                hasattr(response, 'request')):
+            self.request = self.response.request
+        super(RequestException, self).__init__(*args, **kwargs)
+
 
 class HTTPError(RequestException):
     """An HTTP error occurred."""
-    response = None
 
 
 class ConnectionError(RequestException):
     """A Connection error occurred."""
 
 
+class ProxyError(ConnectionError):
+    """A proxy error occurred."""
+
+
 class SSLError(ConnectionError):
     """An SSL error occurred."""
 
 
 class Timeout(RequestException):
-    """The request timed out."""
+    """The request timed out.
+
+    Catching this error will catch both
+    :exc:`~requests.exceptions.ConnectTimeout` and
+    :exc:`~requests.exceptions.ReadTimeout` errors.
+    """
+
+
+class ConnectTimeout(ConnectionError, Timeout):
+    """The request timed out while trying to connect to the remote server.
+
+    Requests that produced this error are safe to retry.
+    """
+
+
+class ReadTimeout(Timeout):
+    """The server did not send any data in the allotted amount of time."""
 
 
 class URLRequired(RequestException):
@@ -49,3 +81,19 @@ class InvalidSchema(RequestException, ValueError):
 
 class InvalidURL(RequestException, ValueError):
     """ The URL provided was somehow invalid. """
+
+
+class ChunkedEncodingError(RequestException):
+    """The server declared chunked encoding but sent an invalid chunk."""
+
+
+class ContentDecodingError(RequestException, BaseHTTPError):
+    """Failed to decode response content"""
+
+
+class StreamConsumedError(RequestException, TypeError):
+    """The content for this response was already consumed"""
+
+
+class RetryError(RequestException):
+    """Custom retries logic failed"""
diff --git a/lib/requests/exceptions.pyc b/lib/requests/exceptions.pyc
index 3758992..32dcd85 100644
Binary files a/lib/requests/exceptions.pyc and b/lib/requests/exceptions.pyc differ
diff --git a/lib/requests/hooks.py b/lib/requests/hooks.py
old mode 100755
new mode 100644
index 9a35fb1..5dfaf6b
--- a/lib/requests/hooks.py
+++ b/lib/requests/hooks.py
@@ -8,28 +8,25 @@ This module provides the capabilities for the Requests hooks system.
 
 Available hooks:
 
-``args``:
-    A dictionary of the arguments being sent to Request().
-
-``pre_request``:
-    The Request object, directly after being created.
-
-``pre_send``:
-    The Request object, directly before being sent.
-
-``post_request``:
-    The Request object, directly after being sent.
-
 ``response``:
     The response generated from a Request.
 
 """
 
 
-HOOKS = ('args', 'pre_request', 'pre_send', 'post_request', 'response')
+HOOKS = ['response']
+
+
+def default_hooks():
+    hooks = {}
+    for event in HOOKS:
+        hooks[event] = []
+    return hooks
+
+# TODO: response is the only one
 
 
-def dispatch_hook(key, hooks, hook_data):
+def dispatch_hook(key, hooks, hook_data, **kwargs):
     """Dispatches a hook dictionary on a given piece of data."""
 
     hooks = hooks or dict()
@@ -41,7 +38,7 @@ def dispatch_hook(key, hooks, hook_data):
             hooks = [hooks]
 
         for hook in hooks:
-            _hook_data = hook(hook_data)
+            _hook_data = hook(hook_data, **kwargs)
             if _hook_data is not None:
                 hook_data = _hook_data
 
diff --git a/lib/requests/hooks.pyc b/lib/requests/hooks.pyc
index a5c8777..0ef559e 100644
Binary files a/lib/requests/hooks.pyc and b/lib/requests/hooks.pyc differ
diff --git a/lib/requests/models.py b/lib/requests/models.py
old mode 100755
new mode 100644
index f3d7d76..b728c84
--- a/lib/requests/models.py
+++ b/lib/requests/models.py
@@ -7,323 +7,76 @@ requests.models
 This module contains the primary objects that power Requests.
 """
 
-import os
-import socket
-from datetime import datetime
-from io import BytesIO
+import collections
+import datetime
 
-from .hooks import dispatch_hook, HOOKS
+from io import BytesIO, UnsupportedOperation
+from .hooks import default_hooks
 from .structures import CaseInsensitiveDict
-from .status_codes import codes
 
-from .auth import HTTPBasicAuth, HTTPProxyAuth
-from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
-from .packages.urllib3.exceptions import TimeoutError
-from .packages.urllib3.exceptions import SSLError as _SSLError
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
-from .packages.urllib3 import connectionpool, poolmanager
+from .auth import HTTPBasicAuth
+from .cookies import cookiejar_from_dict, get_cookie_header
+from .packages.urllib3.fields import RequestField
 from .packages.urllib3.filepost import encode_multipart_formdata
-from .defaults import SCHEMAS
+from .packages.urllib3.util import parse_url
+from .packages.urllib3.exceptions import (
+    DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
 from .exceptions import (
-    ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
-    URLRequired, SSLError, MissingSchema, InvalidSchema, InvalidURL)
+    HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
+    ContentDecodingError, ConnectionError, StreamConsumedError)
 from .utils import (
-    get_encoding_from_headers, stream_untransfer, guess_filename, requote_uri,
-    stream_decode_response_unicode, get_netrc_auth, get_environ_proxies,
-    to_key_val_list, DEFAULT_CA_BUNDLE_PATH, parse_header_links, iter_slices,
-    guess_json_utf)
+    guess_filename, get_auth_from_url, requote_uri,
+    stream_decode_response_unicode, to_key_val_list, parse_header_links,
+    iter_slices, guess_json_utf, super_len, to_native_string)
 from .compat import (
-    cookielib, urlparse, urlunparse, urljoin, urlsplit, urlencode, str, bytes,
-    StringIO, is_py2, chardet, json, builtin_str, urldefrag)
+    cookielib, urlunparse, urlsplit, urlencode, str, bytes, StringIO,
+    is_py2, chardet, json, builtin_str, basestring)
+from .status_codes import codes
 
-REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)
+#: The set of HTTP status codes that indicate an automatically
+#: processable redirect.
+REDIRECT_STATI = (
+    codes.moved,              # 301
+    codes.found,              # 302
+    codes.other,              # 303
+    codes.temporary_redirect, # 307
+    codes.permanent_redirect, # 308
+)
+DEFAULT_REDIRECT_LIMIT = 30
 CONTENT_CHUNK_SIZE = 10 * 1024
+ITER_CHUNK_SIZE = 512
 
+json_dumps = json.dumps
 
-class Request(object):
-    """The :class:`Request <Request>` object. It carries out all functionality
-    of Requests. Recommended interface is with the Requests functions.
-    """
-
-    def __init__(self,
-        url=None,
-        headers=dict(),
-        files=None,
-        method=None,
-        data=dict(),
-        params=dict(),
-        auth=None,
-        cookies=None,
-        timeout=None,
-        redirect=False,
-        allow_redirects=False,
-        proxies=None,
-        hooks=None,
-        config=None,
-        prefetch=True,
-        _poolmanager=None,
-        verify=None,
-        session=None,
-        cert=None):
-
-        #: Dictionary of configurations for this request.
-        self.config = dict(config or [])
-
-        #: Float describes the timeout of the request.
-        #  (Use socket.setdefaulttimeout() as fallback)
-        self.timeout = timeout
-
-        #: Request URL.
-        #: Accept objects that have string representations.
-        try:
-            self.url = unicode(url)
-        except NameError:
-            # We're on Python 3.
-            self.url = str(url)
-        except UnicodeDecodeError:
-            self.url = url
-
-        #: Dictionary of HTTP Headers to attach to the :class:`Request <Request>`.
-        self.headers = dict(headers or [])
-
-        #: Dictionary of files to multipart upload (``{filename: content}``).
-        self.files = None
-
-        #: HTTP Method to use.
-        self.method = method
-
-        #: Dictionary, bytes or file stream of request body data to attach to the
-        #: :class:`Request <Request>`.
-        self.data = None
-
-        #: Dictionary or byte of querystring data to attach to the
-        #: :class:`Request <Request>`. The dictionary values can be lists for representing
-        #: multivalued query parameters.
-        self.params = None
-
-        #: True if :class:`Request <Request>` is part of a redirect chain (disables history
-        #: and HTTPError storage).
-        self.redirect = redirect
-
-        #: Set to True if full redirects are allowed (e.g. re-POST-ing of data at new ``Location``)
-        self.allow_redirects = allow_redirects
-
-        # Dictionary mapping protocol to the URL of the proxy (e.g. {'http': 'foo.bar:3128'})
-        self.proxies = dict(proxies or [])
-
-        for proxy_type, uri_ref in list(self.proxies.items()):
-            if not uri_ref:
-                del self.proxies[proxy_type]
-
-        # If no proxies are given, allow configuration by environment variables
-        # HTTP_PROXY and HTTPS_PROXY.
-        if not self.proxies and self.config.get('trust_env'):
-            self.proxies = get_environ_proxies()
-
-        self.data = data
-        self.params = params
-        self.files = files
-
-        #: :class:`Response <Response>` instance, containing
-        #: content and metadata of HTTP Response, once :attr:`sent <send>`.
-        self.response = Response()
-
-        #: Authentication tuple or object to attach to :class:`Request <Request>`.
-        self.auth = auth
-
-        #: CookieJar to attach to :class:`Request <Request>`.
-        if isinstance(cookies, cookielib.CookieJar):
-            self.cookies = cookies
-        else:
-            self.cookies = cookiejar_from_dict(cookies)
-
-        #: True if Request has been sent.
-        self.sent = False
-
-        #: Event-handling hooks.
-        self.hooks = {}
-
-        for event in HOOKS:
-            self.hooks[event] = []
-
-        hooks = hooks or {}
-
-        for (k, v) in list(hooks.items()):
-            self.register_hook(event=k, hook=v)
-
-        #: Session.
-        self.session = session
-
-        #: SSL Verification.
-        self.verify = verify
-
-        #: SSL Certificate
-        self.cert = cert
-
-        #: Prefetch response content
-        self.prefetch = prefetch
-
-        if headers:
-            headers = CaseInsensitiveDict(self.headers)
-        else:
-            headers = CaseInsensitiveDict()
-
-        # Add configured base headers.
-        for (k, v) in list(self.config.get('base_headers', {}).items()):
-            if k not in headers:
-                headers[k] = v
-
-        self.headers = headers
-        self._poolmanager = _poolmanager
-
-    def __repr__(self):
-        return '<Request [%s]>' % (self.method)
-
-    def _build_response(self, resp):
-        """Build internal :class:`Response <Response>` object
-        from given response.
-        """
-
-        def build(resp):
-
-            response = Response()
-
-            # Pass settings over.
-            response.config = self.config
-
-            if resp:
-
-                # Fallback to None if there's no status_code, for whatever reason.
-                response.status_code = getattr(resp, 'status', None)
-
-                # Make headers case-insensitive.
-                response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
-
-                # Set encoding.
-                response.encoding = get_encoding_from_headers(response.headers)
-
-                # Add new cookies from the server. Don't if configured not to
-                if self.config.get('store_cookies'):
-                    extract_cookies_to_jar(self.cookies, self, resp)
-
-                # Save cookies in Response.
-                response.cookies = self.cookies
-
-                # Save cookies in Session.
-                for cookie in self.cookies:
-                    self.session.cookies.set_cookie(cookie)
-
-                # No exceptions were harmed in the making of this request.
-                response.error = getattr(resp, 'error', None)
 
-            # Save original response for later.
-            response.raw = resp
-            if isinstance(self.full_url, bytes):
-                response.url = self.full_url.decode('utf-8')
-            else:
-                response.url = self.full_url
-
-            return response
-
-        history = []
-
-        r = build(resp)
-
-        if r.status_code in REDIRECT_STATI and not self.redirect:
-
-            while (('location' in r.headers) and
-                   ((r.status_code is codes.see_other) or (self.allow_redirects))):
-
-                r.content  # Consume socket so it can be released
-
-                if not len(history) < self.config.get('max_redirects'):
-                    raise TooManyRedirects()
-
-                # Release the connection back into the pool.
-                r.raw.release_conn()
-
-                history.append(r)
-
-                url = r.headers['location']
-                data = self.data
-                files = self.files
-
-                # Handle redirection without scheme (see: RFC 1808 Section 4)
-                if url.startswith('//'):
-                    parsed_rurl = urlparse(r.url)
-                    url = '%s:%s' % (parsed_rurl.scheme, url)
-
-                # Facilitate non-RFC2616-compliant 'location' headers
-                # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')
-                if not urlparse(url).netloc:
-                    url = urljoin(r.url,
-                                  # Compliant with RFC3986, we percent
-                                  # encode the url.
-                                  requote_uri(url))
+class RequestEncodingMixin(object):
+    @property
+    def path_url(self):
+        """Build the path URL to use."""
 
-                # http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.4
-                if r.status_code is codes.see_other:
-                    method = 'GET'
-                    data = None
-                    files = None
-                else:
-                    method = self.method
+        url = []
 
-                # Do what the browsers do if strict_mode is off...
-                if (not self.config.get('strict_mode')):
+        p = urlsplit(self.url)
 
-                    if r.status_code in (codes.moved, codes.found) and self.method == 'POST':
-                        method = 'GET'
-                        data = None
-                        files = None
+        path = p.path
+        if not path:
+            path = '/'
 
-                    if (r.status_code == 303) and self.method != 'HEAD':
-                        method = 'GET'
-                        data = None
-                        files = None
+        url.append(path)
 
-                # Remove the cookie headers that were sent.
-                headers = self.headers
-                try:
-                    del headers['Cookie']
-                except KeyError:
-                    pass
+        query = p.query
+        if query:
+            url.append('?')
+            url.append(query)
 
-                request = Request(
-                    url=url,
-                    headers=headers,
-                    files=files,
-                    method=method,
-                    params=self.session.params,
-                    auth=self.auth,
-                    cookies=self.cookies,
-                    redirect=True,
-                    data=data,
-                    config=self.config,
-                    timeout=self.timeout,
-                    _poolmanager=self._poolmanager,
-                    proxies=self.proxies,
-                    verify=self.verify,
-                    session=self.session,
-                    cert=self.cert,
-                    prefetch=self.prefetch,
-                )
-
-                request.send()
-                r = request.response
-
-            r.history = history
-
-        self.response = r
-        self.response.request = self
+        return ''.join(url)
 
     @staticmethod
     def _encode_params(data):
         """Encode parameters in a piece of data.
 
         Will successfully encode parameters when passed as a dict or a list of
-        2-tuples. Order is retained if data is a list of 2-tuples but abritrary
+        2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
         if parameters are supplied as a dict.
         """
 
@@ -334,7 +87,9 @@ class Request(object):
         elif hasattr(data, '__iter__'):
             result = []
             for k, vs in to_key_val_list(data):
-                for v in isinstance(vs, list) and vs or [vs]:
+                if isinstance(vs, basestring) or not hasattr(vs, '__iter__'):
+                    vs = [vs]
+                for v in vs:
                     if v is not None:
                         result.append(
                             (k.encode('utf-8') if isinstance(k, str) else k,
@@ -343,32 +98,48 @@ class Request(object):
         else:
             return data
 
-    def _encode_files(self, files):
+    @staticmethod
+    def _encode_files(files, data):
         """Build the body for a multipart/form-data request.
 
         Will successfully encode files when passed as a dict or a list of
-        2-tuples. Order is retained if data is a list of 2-tuples but abritrary
+        2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
         if parameters are supplied as a dict.
 
         """
-        if (not files) or isinstance(self.data, str):
-            return None
+        if (not files):
+            raise ValueError("Files must be provided.")
+        elif isinstance(data, basestring):
+            raise ValueError("Data must not be a string.")
 
         new_fields = []
-        fields = to_key_val_list(self.data)
-        files = to_key_val_list(files)
+        fields = to_key_val_list(data or {})
+        files = to_key_val_list(files or {})
 
         for field, val in fields:
-            if isinstance(val, list):
-                for v in val:
-                    new_fields.append((field, builtin_str(v)))
-            else:
-                new_fields.append((field, builtin_str(val)))
+            if isinstance(val, basestring) or not hasattr(val, '__iter__'):
+                val = [val]
+            for v in val:
+                if v is not None:
+                    # Don't call str() on bytestrings: in Py3 it all goes wrong.
+                    if not isinstance(v, bytes):
+                        v = str(v)
+
+                    new_fields.append(
+                        (field.decode('utf-8') if isinstance(field, bytes) else field,
+                         v.encode('utf-8') if isinstance(v, str) else v))
 
         for (k, v) in files:
             # support for explicit filename
+            ft = None
+            fh = None
             if isinstance(v, (tuple, list)):
-                fn, fp = v
+                if len(v) == 2:
+                    fn, fp = v
+                elif len(v) == 3:
+                    fn, fp, ft = v
+                else:
+                    fn, fp, ft, fh = v
             else:
                 fn = guess_filename(v) or k
                 fp = v
@@ -376,35 +147,236 @@ class Request(object):
                 fp = StringIO(fp)
             if isinstance(fp, bytes):
                 fp = BytesIO(fp)
-            new_fields.append((k, (fn, fp.read())))
+
+            rf = RequestField(name=k, data=fp.read(),
+                              filename=fn, headers=fh)
+            rf.make_multipart(content_type=ft)
+            new_fields.append(rf)
 
         body, content_type = encode_multipart_formdata(new_fields)
 
         return body, content_type
 
-    @property
-    def full_url(self):
-        """Build the actual URL to use."""
 
-        if not self.url:
-            raise URLRequired()
+class RequestHooksMixin(object):
+    def register_hook(self, event, hook):
+        """Properly register a hook."""
+
+        if event not in self.hooks:
+            raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+
+        if isinstance(hook, collections.Callable):
+            self.hooks[event].append(hook)
+        elif hasattr(hook, '__iter__'):
+            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
+
+    def deregister_hook(self, event, hook):
+        """Deregister a previously registered hook.
+        Returns True if the hook existed, False if not.
+        """
+
+        try:
+            self.hooks[event].remove(hook)
+            return True
+        except ValueError:
+            return False
+
+
+class Request(RequestHooksMixin):
+    """A user-created :class:`Request <Request>` object.
 
-        url = self.url
+    Used to prepare a :class:`PreparedRequest <PreparedRequest>`, which is sent to the server.
+
+    :param method: HTTP method to use.
+    :param url: URL to send.
+    :param headers: dictionary of headers to send.
+    :param files: dictionary of {filename: fileobject} files to multipart upload.
+    :param data: the body to attach to the request. If a dictionary is provided, form-encoding will take place.
+    :param json: json for the body to attach to the request (if data is not specified).
+    :param params: dictionary of URL parameters to append to the URL.
+    :param auth: Auth handler or (user, pass) tuple.
+    :param cookies: dictionary or CookieJar of cookies to attach to this request.
+    :param hooks: dictionary of callback hooks, for internal usage.
+
+    Usage::
+
+      >>> import requests
+      >>> req = requests.Request('GET', 'http://httpbin.org/get')
+      >>> req.prepare()
+      <PreparedRequest [GET]>
+
+    """
+    def __init__(self,
+        method=None,
+        url=None,
+        headers=None,
+        files=None,
+        data=None,
+        params=None,
+        auth=None,
+        cookies=None,
+        hooks=None,
+        json=None):
+
+        # Default empty dicts for dict params.
+        data = [] if data is None else data
+        files = [] if files is None else files
+        headers = {} if headers is None else headers
+        params = {} if params is None else params
+        hooks = {} if hooks is None else hooks
+
+        self.hooks = default_hooks()
+        for (k, v) in list(hooks.items()):
+            self.register_hook(event=k, hook=v)
+
+        self.method = method
+        self.url = url
+        self.headers = headers
+        self.files = files
+        self.data = data
+        self.json = json
+        self.params = params
+        self.auth = auth
+        self.cookies = cookies
+
+    def __repr__(self):
+        return '<Request [%s]>' % (self.method)
+
+    def prepare(self):
+        """Constructs a :class:`PreparedRequest <PreparedRequest>` for transmission and returns it."""
+        p = PreparedRequest()
+        p.prepare(
+            method=self.method,
+            url=self.url,
+            headers=self.headers,
+            files=self.files,
+            data=self.data,
+            json=self.json,
+            params=self.params,
+            auth=self.auth,
+            cookies=self.cookies,
+            hooks=self.hooks,
+        )
+        return p
+
+
+class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
+    """The fully mutable :class:`PreparedRequest <PreparedRequest>` object,
+    containing the exact bytes that will be sent to the server.
+
+    Generated from either a :class:`Request <Request>` object or manually.
+
+    Usage::
+
+      >>> import requests
+      >>> req = requests.Request('GET', 'http://httpbin.org/get')
+      >>> r = req.prepare()
+      <PreparedRequest [GET]>
+
+      >>> s = requests.Session()
+      >>> s.send(r)
+      <Response [200]>
+
+    """
+
+    def __init__(self):
+        #: HTTP verb to send to the server.
+        self.method = None
+        #: HTTP URL to send the request to.
+        self.url = None
+        #: dictionary of HTTP headers.
+        self.headers = None
+        # The `CookieJar` used to create the Cookie header will be stored here
+        # after prepare_cookies is called
+        self._cookies = None
+        #: request body to send to the server.
+        self.body = None
+        #: dictionary of callback hooks, for internal usage.
+        self.hooks = default_hooks()
+
+    def prepare(self, method=None, url=None, headers=None, files=None,
+                data=None, params=None, auth=None, cookies=None, hooks=None,
+                json=None):
+        """Prepares the entire request with the given parameters."""
+
+        self.prepare_method(method)
+        self.prepare_url(url, params)
+        self.prepare_headers(headers)
+        self.prepare_cookies(cookies)
+        self.prepare_body(data, files, json)
+        self.prepare_auth(auth, url)
+        # Note that prepare_auth must be last to enable authentication schemes
+        # such as OAuth to work on a fully prepared request.
+
+        # This MUST go after prepare_auth. Authenticators could add a hook
+        self.prepare_hooks(hooks)
+
+    def __repr__(self):
+        return '<PreparedRequest [%s]>' % (self.method)
+
+    def copy(self):
+        p = PreparedRequest()
+        p.method = self.method
+        p.url = self.url
+        p.headers = self.headers.copy() if self.headers is not None else None
+        p._cookies = self._cookies.copy() if self._cookies is not None else None
+        p.body = self.body
+        p.hooks = self.hooks
+        return p
+
+    def prepare_method(self, method):
+        """Prepares the given HTTP method."""
+        self.method = method
+        if self.method is not None:
+            self.method = self.method.upper()
+
+    def prepare_url(self, url, params):
+        """Prepares the given HTTP URL."""
+        #: Accept objects that have string representations.
+        #: We're unable to blindy call unicode/str functions
+        #: as this will include the bytestring indicator (b'')
+        #: on python 3.x.
+        #: https://github.com/kennethreitz/requests/pull/2238
+        if isinstance(url, bytes):
+            url = url.decode('utf8')
+        else:
+            url = unicode(url) if is_py2 else str(url)
+
+        # Don't do any URL preparation for non-HTTP schemes like `mailto`,
+        # `data` etc to work around exceptions from `url_parse`, which
+        # handles RFC 3986 only.
+        if ':' in url and not url.lower().startswith('http'):
+            self.url = url
+            return
 
         # Support for unicode domain names and paths.
-        scheme, netloc, path, params, query, fragment = urlparse(url)
+        try:
+            scheme, auth, host, port, path, query, fragment = parse_url(url)
+        except LocationParseError as e:
+            raise InvalidURL(*e.args)
 
         if not scheme:
-            raise MissingSchema("Invalid URL %r: No schema supplied" % url)
+            raise MissingSchema("Invalid URL {0!r}: No schema supplied. "
+                                "Perhaps you meant http://{0}?".format(url))
 
-        if not scheme in SCHEMAS:
-            raise InvalidSchema("Invalid scheme %r" % scheme)
+        if not host:
+            raise InvalidURL("Invalid URL %r: No host supplied" % url)
 
+        # Only want to apply IDNA to the hostname
         try:
-            netloc = netloc.encode('idna').decode('utf-8')
+            host = host.encode('idna').decode('utf-8')
         except UnicodeError:
             raise InvalidURL('URL has an invalid label.')
 
+        # Carefully reconstruct the network location
+        netloc = auth or ''
+        if netloc:
+            netloc += '@'
+        netloc += host
+        if port:
+            netloc += ':' + str(port)
+
+        # Bare domains aren't valid URLs.
         if not path:
             path = '/'
 
@@ -415,271 +387,161 @@ class Request(object):
                 netloc = netloc.encode('utf-8')
             if isinstance(path, str):
                 path = path.encode('utf-8')
-            if isinstance(params, str):
-                params = params.encode('utf-8')
             if isinstance(query, str):
                 query = query.encode('utf-8')
             if isinstance(fragment, str):
                 fragment = fragment.encode('utf-8')
 
-        enc_params = self._encode_params(self.params)
+        enc_params = self._encode_params(params)
         if enc_params:
             if query:
                 query = '%s&%s' % (query, enc_params)
             else:
                 query = enc_params
 
-        url = (urlunparse([scheme, netloc, path, params, query, fragment]))
-
-        if self.config.get('encode_uri', True):
-            url = requote_uri(url)
-
-        return url
-
-    @property
-    def path_url(self):
-        """Build the path URL to use."""
-
-        url = []
-
-        p = urlsplit(self.full_url)
-
-        # Proxies use full URLs.
-        if p.scheme in self.proxies:
-            url_base, frag = urldefrag(self.full_url)
-            return url_base
-
-
-        path = p.path
-        if not path:
-            path = '/'
-
-        url.append(path)
-
-        query = p.query
-        if query:
-            url.append('?')
-            url.append(query)
-
-        return ''.join(url)
-
-    def register_hook(self, event, hook):
-        """Properly register a hook."""
-        if callable(hook):
-            self.hooks[event].append(hook)
-        elif hasattr(hook, '__iter__'):
-            self.hooks[event].extend(h for h in hook if callable(h))
-
-    def deregister_hook(self, event, hook):
-        """Deregister a previously registered hook.
-        Returns True if the hook existed, False if not.
-        """
-
-        try:
-            self.hooks[event].remove(hook)
-            return True
-        except ValueError:
-            return False
-
-    def send(self, anyway=False, prefetch=None):
-        """Sends the request. Returns True if successful, False if not.
-        If there was an HTTPError during transmission,
-        self.response.status_code will contain the HTTPError code.
-
-        Once a request is successfully sent, `sent` will equal True.
-
-        :param anyway: If True, request will be sent, even if it has
-        already been sent.
-
-        :param prefetch: If not None, will override the request's own setting
-        for prefetch.
-        """
-
-        # Build the URL
-        url = self.full_url
-
-        # Pre-request hook.
-        r = dispatch_hook('pre_request', self.hooks, self)
-        self.__dict__.update(r.__dict__)
-
-        # Logging
-        if self.config.get('verbose'):
-            self.config.get('verbose').write('%s   %s   %s\n' % (
-                datetime.now().isoformat(), self.method, url
-            ))
+        url = requote_uri(urlunparse([scheme, netloc, path, None, query, fragment]))
+        self.url = url
 
-        # Use .netrc auth if none was provided.
-        if not self.auth and self.config.get('trust_env'):
-            self.auth = get_netrc_auth(url)
+    def prepare_headers(self, headers):
+        """Prepares the given HTTP headers."""
 
-        if self.auth:
-            if isinstance(self.auth, tuple) and len(self.auth) == 2:
-                # special-case basic HTTP auth
-                self.auth = HTTPBasicAuth(*self.auth)
+        if headers:
+            self.headers = CaseInsensitiveDict((to_native_string(name), value) for name, value in headers.items())
+        else:
+            self.headers = CaseInsensitiveDict()
 
-            # Allow auth to make its changes.
-            r = self.auth(self)
+    def prepare_body(self, data, files, json=None):
+        """Prepares the given HTTP body data."""
 
-            # Update self to reflect the auth changes.
-            self.__dict__.update(r.__dict__)
+        # Check if file, fo, generator, iterator.
+        # If not, run through normal process.
 
         # Nottin' on you.
         body = None
         content_type = None
+        length = None
 
-        # Multi-part file uploads.
-        if self.files:
-            (body, content_type) = self._encode_files(self.files)
-        else:
-            if self.data:
-
-                body = self._encode_params(self.data)
-                if isinstance(self.data, str) or isinstance(self.data, builtin_str) or hasattr(self.data, 'read'):
-                    content_type = None
-                else:
-                    content_type = 'application/x-www-form-urlencoded'
-
-        # Add content-type if it wasn't explicitly provided.
-        if (content_type) and (not 'content-type' in self.headers):
-            self.headers['Content-Type'] = content_type
-
-        _p = urlparse(url)
-        no_proxy = filter(lambda x: x.strip(), self.proxies.get('no', '').split(','))
-        proxy = self.proxies.get(_p.scheme)
-
-        if proxy and not any(map(_p.hostname.endswith, no_proxy)):
-            conn = poolmanager.proxy_from_url(proxy)
-            _proxy = urlparse(proxy)
-            if '@' in _proxy.netloc:
-                auth, url = _proxy.netloc.split('@', 1)
-                self.proxy_auth = HTTPProxyAuth(*auth.split(':', 1))
-                r = self.proxy_auth(self)
-                self.__dict__.update(r.__dict__)
-        else:
-            # Check to see if keep_alive is allowed.
-            try:
-                if self.config.get('keep_alive'):
-                    conn = self._poolmanager.connection_from_url(url)
-                else:
-                    conn = connectionpool.connection_from_url(url)
-                    self.headers['Connection'] = 'close'
-            except LocationParseError as e:
-                raise InvalidURL(e)
-
-        if url.startswith('https') and self.verify:
-
-            cert_loc = None
-
-            # Allow self-specified cert location.
-            if self.verify is not True:
-                cert_loc = self.verify
+        if json is not None:
+            content_type = 'application/json'
+            body = json_dumps(json)
 
-            # Look for configuration.
-            if not cert_loc and self.config.get('trust_env'):
-                cert_loc = os.environ.get('REQUESTS_CA_BUNDLE')
+        is_stream = all([
+            hasattr(data, '__iter__'),
+            not isinstance(data, (basestring, list, tuple, dict))
+        ])
 
-            # Curl compatibility.
-            if not cert_loc and self.config.get('trust_env'):
-                cert_loc = os.environ.get('CURL_CA_BUNDLE')
+        try:
+            length = super_len(data)
+        except (TypeError, AttributeError, UnsupportedOperation):
+            length = None
 
-            if not cert_loc:
-                cert_loc = DEFAULT_CA_BUNDLE_PATH
+        if is_stream:
+            body = data
 
-            if not cert_loc:
-                raise Exception("Could not find a suitable SSL CA certificate bundle.")
+            if files:
+                raise NotImplementedError('Streamed bodies and files are mutually exclusive.')
 
-            conn.cert_reqs = 'CERT_REQUIRED'
-            conn.ca_certs = cert_loc
+            if length is not None:
+                self.headers['Content-Length'] = builtin_str(length)
+            else:
+                self.headers['Transfer-Encoding'] = 'chunked'
         else:
-            conn.cert_reqs = 'CERT_NONE'
-            conn.ca_certs = None
-
-        if self.cert:
-            if len(self.cert) == 2:
-                conn.cert_file = self.cert[0]
-                conn.key_file = self.cert[1]
+            # Multi-part file uploads.
+            if files:
+                (body, content_type) = self._encode_files(files, data)
             else:
-                conn.cert_file = self.cert
-
-        if not self.sent or anyway:
+                if data and json is None:
+                    body = self._encode_params(data)
+                    if isinstance(data, basestring) or hasattr(data, 'read'):
+                        content_type = None
+                    else:
+                        content_type = 'application/x-www-form-urlencoded'
+
+            self.prepare_content_length(body)
+
+            # Add content-type if it wasn't explicitly provided.
+            if content_type and ('content-type' not in self.headers):
+                self.headers['Content-Type'] = content_type
+
+        self.body = body
+
+    def prepare_content_length(self, body):
+        if hasattr(body, 'seek') and hasattr(body, 'tell'):
+            body.seek(0, 2)
+            self.headers['Content-Length'] = builtin_str(body.tell())
+            body.seek(0, 0)
+        elif body is not None:
+            l = super_len(body)
+            if l:
+                self.headers['Content-Length'] = builtin_str(l)
+        elif (self.method not in ('GET', 'HEAD')) and (self.headers.get('Content-Length') is None):
+            self.headers['Content-Length'] = '0'
+
+    def prepare_auth(self, auth, url=''):
+        """Prepares the given HTTP auth data."""
+
+        # If no Auth is explicitly provided, extract it from the URL first.
+        if auth is None:
+            url_auth = get_auth_from_url(self.url)
+            auth = url_auth if any(url_auth) else None
+
+        if auth:
+            if isinstance(auth, tuple) and len(auth) == 2:
+                # special-case basic HTTP auth
+                auth = HTTPBasicAuth(*auth)
 
-            # Skip if 'cookie' header is explicitly set.
-            if 'cookie' not in self.headers:
-                cookie_header = get_cookie_header(self.cookies, self)
-                if cookie_header is not None:
-                    self.headers['Cookie'] = cookie_header
+            # Allow auth to make its changes.
+            r = auth(self)
 
-            # Pre-send hook.
-            r = dispatch_hook('pre_send', self.hooks, self)
+            # Update self to reflect the auth changes.
             self.__dict__.update(r.__dict__)
 
-            # catch urllib3 exceptions and throw Requests exceptions
-            try:
-                # Send the request.
-                r = conn.urlopen(
-                    method=self.method,
-                    url=self.path_url,
-                    body=body,
-                    headers=self.headers,
-                    redirect=False,
-                    assert_same_host=False,
-                    preload_content=False,
-                    decode_content=False,
-                    retries=self.config.get('max_retries', 0),
-                    timeout=self.timeout,
-                )
-                self.sent = True
-
-            except socket.error as sockerr:
-                raise ConnectionError(sockerr)
-
-            except MaxRetryError as e:
-                raise ConnectionError(e)
-
-            except (_SSLError, _HTTPError) as e:
-                if isinstance(e, _SSLError):
-                    raise SSLError(e)
-                elif isinstance(e, TimeoutError):
-                    raise Timeout(e)
-                else:
-                    raise Timeout('Request timed out.')
+            # Recompute Content-Length
+            self.prepare_content_length(self.body)
 
-            # build_response can throw TooManyRedirects
-            self._build_response(r)
+    def prepare_cookies(self, cookies):
+        """Prepares the given HTTP cookie data."""
 
-            # Response manipulation hook.
-            self.response = dispatch_hook('response', self.hooks, self.response)
-
-            # Post-request hook.
-            r = dispatch_hook('post_request', self.hooks, self)
-            self.__dict__.update(r.__dict__)
-
-            # If prefetch is True, mark content as consumed.
-            if prefetch is None:
-                prefetch = self.prefetch
-            if prefetch:
-                # Save the response.
-                self.response.content
+        if isinstance(cookies, cookielib.CookieJar):
+            self._cookies = cookies
+        else:
+            self._cookies = cookiejar_from_dict(cookies)
 
-            if self.config.get('danger_mode'):
-                self.response.raise_for_status()
+        cookie_header = get_cookie_header(self._cookies, self)
+        if cookie_header is not None:
+            self.headers['Cookie'] = cookie_header
 
-            return self.sent
+    def prepare_hooks(self, hooks):
+        """Prepares the given hooks."""
+        for event in hooks:
+            self.register_hook(event, hooks[event])
 
 
 class Response(object):
-    """The core :class:`Response <Response>` object. All
-    :class:`Request <Request>` objects contain a
-    :class:`response <Response>` attribute, which is an instance
-    of this class.
+    """The :class:`Response <Response>` object, which contains a
+    server's response to an HTTP request.
     """
 
+    __attrs__ = [
+        '_content',
+        'status_code',
+        'headers',
+        'url',
+        'history',
+        'encoding',
+        'reason',
+        'cookies',
+        'elapsed',
+        'request',
+    ]
+
     def __init__(self):
+        super(Response, self).__init__()
 
         self._content = False
         self._content_consumed = False
 
-        #: Integer Code of responded HTTP Status.
+        #: Integer Code of responded HTTP Status, e.g. 404 or 200.
         self.status_code = None
 
         #: Case-insensitive Dictionary of Response Headers.
@@ -688,14 +550,13 @@ class Response(object):
         self.headers = CaseInsensitiveDict()
 
         #: File-like object representation of response (for advanced usage).
+        #: Use of ``raw`` requires that ``stream=True`` be set on the request.
+        # This requirement does not apply for use internally to Requests.
         self.raw = None
 
         #: Final URL location of Response.
         self.url = None
 
-        #: Resulting :class:`HTTPError` of request, if one occurred.
-        self.error = None
-
         #: Encoding to decode with when accessing r.text.
         self.encoding = None
 
@@ -704,14 +565,38 @@ class Response(object):
         #: up here. The list is sorted from the oldest to the most recent request.
         self.history = []
 
-        #: The :class:`Request <Request>` that created the Response.
-        self.request = None
+        #: Textual reason of responded HTTP Status, e.g. "Not Found" or "OK".
+        self.reason = None
 
         #: A CookieJar of Cookies the server sent back.
-        self.cookies = None
+        self.cookies = cookiejar_from_dict({})
 
-        #: Dictionary of configurations for this request.
-        self.config = {}
+        #: The amount of time elapsed between sending the request
+        #: and the arrival of the response (as a timedelta)
+        self.elapsed = datetime.timedelta(0)
+
+        #: The :class:`PreparedRequest <PreparedRequest>` object to which this
+        #: is a response.
+        self.request = None
+
+    def __getstate__(self):
+        # Consume everything; accessing the content attribute makes
+        # sure the content has been fully read.
+        if not self._content_consumed:
+            self.content
+
+        return dict(
+            (attr, getattr(self, attr, None))
+            for attr in self.__attrs__
+        )
+
+    def __setstate__(self, state):
+        for name, value in state.items():
+            setattr(self, name, value)
+
+        # pickled objects do not have .raw
+        setattr(self, '_content_consumed', True)
+        setattr(self, 'raw', None)
 
     def __repr__(self):
         return '<Response [%s]>' % (self.status_code)
@@ -724,54 +609,98 @@ class Response(object):
         """Returns true if :attr:`status_code` is 'OK'."""
         return self.ok
 
+    def __iter__(self):
+        """Allows you to use a response as an iterator."""
+        return self.iter_content(128)
+
     @property
     def ok(self):
         try:
             self.raise_for_status()
-        except RequestException:
+        except HTTPError:
             return False
         return True
 
-    def iter_content(self, chunk_size=1, decode_unicode=False):
-        """Iterates over the response data.  This avoids reading the content
-        at once into memory for large responses.  The chunk size is the number
-        of bytes it should read into memory.  This is not necessarily the
-        length of each item returned as decoding can take place.
+    @property
+    def is_redirect(self):
+        """True if this Response is a well-formed HTTP redirect that could have
+        been processed automatically (by :meth:`Session.resolve_redirects`).
         """
-        if self._content_consumed:
-            # simulate reading small chunks of the content
-            return iter_slices(self._content, chunk_size)
+        return ('location' in self.headers and self.status_code in REDIRECT_STATI)
 
+    @property
+    def is_permanent_redirect(self):
+        """True if this Response one of the permanant versions of redirect"""
+        return ('location' in self.headers and self.status_code in (codes.moved_permanently, codes.permanent_redirect))
+
+    @property
+    def apparent_encoding(self):
+        """The apparent encoding, provided by the chardet library"""
+        return chardet.detect(self.content)['encoding']
+
+    def iter_content(self, chunk_size=1, decode_unicode=False):
+        """Iterates over the response data.  When stream=True is set on the
+        request, this avoids reading the content at once into memory for
+        large responses.  The chunk size is the number of bytes it should
+        read into memory.  This is not necessarily the length of each item
+        returned as decoding can take place.
+
+        If decode_unicode is True, content will be decoded using the best
+        available encoding based on the response.
+        """
         def generate():
-            while 1:
-                chunk = self.raw.read(chunk_size)
-                if not chunk:
-                    break
-                yield chunk
+            try:
+                # Special case for urllib3.
+                try:
+                    for chunk in self.raw.stream(chunk_size, decode_content=True):
+                        yield chunk
+                except ProtocolError as e:
+                    raise ChunkedEncodingError(e)
+                except DecodeError as e:
+                    raise ContentDecodingError(e)
+                except ReadTimeoutError as e:
+                    raise ConnectionError(e)
+            except AttributeError:
+                # Standard file-like object.
+                while True:
+                    chunk = self.raw.read(chunk_size)
+                    if not chunk:
+                        break
+                    yield chunk
+
             self._content_consumed = True
 
-        gen = stream_untransfer(generate(), self)
+        if self._content_consumed and isinstance(self._content, bool):
+            raise StreamConsumedError()
+        # simulate reading small chunks of the content
+        reused_chunks = iter_slices(self._content, chunk_size)
+
+        stream_chunks = generate()
+
+        chunks = reused_chunks if self._content_consumed else stream_chunks
 
         if decode_unicode:
-            gen = stream_decode_response_unicode(gen, self)
+            chunks = stream_decode_response_unicode(chunks, self)
 
-        return gen
+        return chunks
 
-    def iter_lines(self, chunk_size=10 * 1024, decode_unicode=None):
-        """Iterates over the response data, one line at a time.  This
-        avoids reading the content at once into memory for large
-        responses.
+    def iter_lines(self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=None, delimiter=None):
+        """Iterates over the response data, one line at a time.  When
+        stream=True is set on the request, this avoids reading the
+        content at once into memory for large responses.
         """
 
         pending = None
 
-        for chunk in self.iter_content(
-            chunk_size=chunk_size,
-            decode_unicode=decode_unicode):
+        for chunk in self.iter_content(chunk_size=chunk_size, decode_unicode=decode_unicode):
 
             if pending is not None:
                 chunk = pending + chunk
-            lines = chunk.splitlines()
+
+            if delimiter:
+                lines = chunk.split(delimiter)
+            else:
+                lines = chunk.splitlines()
 
             if lines and lines[-1] and chunk and lines[-1][-1] == chunk[-1]:
                 pending = lines.pop()
@@ -795,7 +724,7 @@ class Response(object):
                     raise RuntimeError(
                         'The content for this response was already consumed')
 
-                if self.status_code is 0:
+                if self.status_code == 0:
                     self._content = None
                 else:
                     self._content = bytes().join(self.iter_content(CONTENT_CHUNK_SIZE)) or bytes()
@@ -812,8 +741,13 @@ class Response(object):
     def text(self):
         """Content of the response, in unicode.
 
-        if Response.encoding is None and chardet module is available, encoding
-        will be guessed.
+        If Response.encoding is None, encoding will be guessed using
+        ``chardet``.
+
+        The encoding of the response content is determined based solely on HTTP
+        headers, following RFC 2616 to the letter. If you can take advantage of
+        non-HTTP knowledge to make a better guess at the encoding, you should
+        set ``r.encoding`` appropriately before accessing this property.
         """
 
         # Try charset from content-type
@@ -825,8 +759,7 @@ class Response(object):
 
         # Fallback to auto-detected encoding.
         if self.encoding is None:
-            if chardet is not None:
-                encoding = chardet.detect(self.content)['encoding']
+            encoding = self.apparent_encoding
 
         # Decode unicode from given encoding.
         try:
@@ -842,9 +775,11 @@ class Response(object):
 
         return content
 
-    @property
-    def json(self):
-        """Returns the json-encoded content of a response, if any."""
+    def json(self, **kwargs):
+        """Returns the json-encoded content of a response, if any.
+
+        :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
+        """
 
         if not self.encoding and len(self.content) > 3:
             # No encoding set. JSON RFC 4627 section 3 states we should expect
@@ -854,19 +789,20 @@ class Response(object):
             encoding = guess_json_utf(self.content)
             if encoding is not None:
                 try:
-                    return json.loads(self.content.decode(encoding))
-                except (ValueError, UnicodeDecodeError):
+                    return json.loads(self.content.decode(encoding), **kwargs)
+                except UnicodeDecodeError:
+                    # Wrong UTF codec detected; usually because it's not UTF-8
+                    # but some other 8-bit codec.  This is an RFC violation,
+                    # and the server didn't bother to tell us what codec *was*
+                    # used.
                     pass
-        try:
-            return json.loads(self.text or self.content)
-        except ValueError:
-            return None
+        return json.loads(self.text, **kwargs)
 
     @property
     def links(self):
         """Returns the parsed header links of the response, if any."""
 
-        header = self.headers['link']
+        header = self.headers.get('link')
 
         # l = MultiDict()
         l = {}
@@ -880,28 +816,24 @@ class Response(object):
 
         return l
 
-    @property
-    def reason(self):
-        """The HTTP Reason for the response."""
-        return self.raw.reason
-
-    def raise_for_status(self, allow_redirects=True):
-        """Raises stored :class:`HTTPError` or :class:`URLError`, if one occurred."""
-
-        if self.error:
-            raise self.error
+    def raise_for_status(self):
+        """Raises stored :class:`HTTPError`, if one occurred."""
 
         http_error_msg = ''
-        if 300 <= self.status_code < 400 and not allow_redirects:
-            http_error_msg = '%s Redirection: %s' % (self.status_code, self.reason)
 
-        elif 400 <= self.status_code < 500:
+        if 400 <= self.status_code < 500:
             http_error_msg = '%s Client Error: %s' % (self.status_code, self.reason)
 
         elif 500 <= self.status_code < 600:
             http_error_msg = '%s Server Error: %s' % (self.status_code, self.reason)
 
         if http_error_msg:
-            http_error = HTTPError(http_error_msg)
-            http_error.response = self
-            raise http_error
+            raise HTTPError(http_error_msg, response=self)
+
+    def close(self):
+        """Releases the connection back to the pool. Once this method has been
+        called the underlying ``raw`` object must not be accessed again.
+
+        *Note: Should not normally need to be called explicitly.*
+        """
+        return self.raw.release_conn()
diff --git a/lib/requests/models.pyc b/lib/requests/models.pyc
index c995f81..873c2a4 100644
Binary files a/lib/requests/models.pyc and b/lib/requests/models.pyc differ
diff --git a/lib/requests/packages/README.rst b/lib/requests/packages/README.rst
new file mode 100644
index 0000000..c42f376
--- /dev/null
+++ b/lib/requests/packages/README.rst
@@ -0,0 +1,8 @@
+If you are planning to submit a pull request to requests with any changes in 
+this library do not go any further. These are independent libraries which we 
+vendor into requests. Any changes necessary to these libraries must be made in 
+them and submitted as separate pull requests to those libraries.
+
+urllib3 pull requests go here: https://github.com/shazow/urllib3
+
+chardet pull requests go here: https://github.com/chardet/chardet
diff --git a/lib/requests/packages/__init__.py b/lib/requests/packages/__init__.py
old mode 100755
new mode 100644
index d62c4b7..ec6a9e0
--- a/lib/requests/packages/__init__.py
+++ b/lib/requests/packages/__init__.py
@@ -1,3 +1,95 @@
+"""
+Copyright (c) Donald Stufft, pip, and individual contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
 from __future__ import absolute_import
 
-from . import urllib3
+import sys
+
+
+class VendorAlias(object):
+
+    def __init__(self):
+        self._vendor_name = __name__
+        self._vendor_pkg = self._vendor_name + "."
+
+    def find_module(self, fullname, path=None):
+        if fullname.startswith(self._vendor_pkg):
+            return self
+
+    def load_module(self, name):
+        # Ensure that this only works for the vendored name
+        if not name.startswith(self._vendor_pkg):
+            raise ImportError(
+                "Cannot import %s, must be a subpackage of '%s'." % (
+                    name, self._vendor_name,
+                )
+            )
+
+        # Check to see if we already have this item in sys.modules, if we do
+        # then simply return that.
+        if name in sys.modules:
+            return sys.modules[name]
+
+        # Check to see if we can import the vendor name
+        try:
+            # We do this dance here because we want to try and import this
+            # module without hitting a recursion error because of a bunch of
+            # VendorAlias instances on sys.meta_path
+            real_meta_path = sys.meta_path[:]
+            try:
+                sys.meta_path = [
+                    m for m in sys.meta_path
+                    if not isinstance(m, VendorAlias)
+                ]
+                __import__(name)
+                module = sys.modules[name]
+            finally:
+                # Re-add any additions to sys.meta_path that were made while
+                # during the import we just did, otherwise things like
+                # requests.packages.urllib3.poolmanager will fail.
+                for m in sys.meta_path:
+                    if m not in real_meta_path:
+                        real_meta_path.append(m)
+
+                # Restore sys.meta_path with any new items.
+                sys.meta_path = real_meta_path
+        except ImportError:
+            # We can't import the vendor name, so we'll try to import the
+            # "real" name.
+            real_name = name[len(self._vendor_pkg):]
+            try:
+                __import__(real_name)
+                module = sys.modules[real_name]
+            except ImportError:
+                raise ImportError("No module named '%s'" % (name,))
+
+        # If we've gotten here we've found the module we're looking for, either
+        # as part of our vendored package, or as the real name, so we'll add
+        # it to sys.modules as the vendored name so that we don't have to do
+        # the lookup again.
+        sys.modules[name] = module
+
+        # Finally, return the loaded module
+        return module
+
+
+sys.meta_path.append(VendorAlias())
diff --git a/lib/requests/packages/__init__.pyc b/lib/requests/packages/__init__.pyc
index cdf4f24..1194d48 100644
Binary files a/lib/requests/packages/__init__.pyc and b/lib/requests/packages/__init__.pyc differ
diff --git a/lib/requests/packages/chardet/__init__.py b/lib/requests/packages/chardet/__init__.py
old mode 100755
new mode 100644
index b1872fe..82c2a48
--- a/lib/requests/packages/chardet/__init__.py
+++ b/lib/requests/packages/chardet/__init__.py
@@ -3,22 +3,28 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-__version__ = "1.0.1"
+__version__ = "2.3.0"
+from sys import version_info
+
 
 def detect(aBuf):
-    import universaldetector
+    if ((version_info < (3, 0) and isinstance(aBuf, unicode)) or
+            (version_info >= (3, 0) and not isinstance(aBuf, bytes))):
+        raise ValueError('Expected a bytes object, not a unicode object')
+
+    from . import universaldetector
     u = universaldetector.UniversalDetector()
     u.reset()
     u.feed(aBuf)
diff --git a/lib/requests/packages/chardet/__init__.pyc b/lib/requests/packages/chardet/__init__.pyc
index c0192a8..8431e65 100644
Binary files a/lib/requests/packages/chardet/__init__.pyc and b/lib/requests/packages/chardet/__init__.pyc differ
diff --git a/lib/requests/packages/chardet/big5freq.py b/lib/requests/packages/chardet/big5freq.py
old mode 100755
new mode 100644
index c1b0f3c..65bffc0
--- a/lib/requests/packages/chardet/big5freq.py
+++ b/lib/requests/packages/chardet/big5freq.py
@@ -1,11 +1,11 @@
 ######################## BEGIN LICENSE BLOCK ########################
 # The Original Code is Mozilla Communicator client code.
-# 
+#
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Mark Pilgrim - port to Python
 #
@@ -13,12 +13,12 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -26,18 +26,18 @@
 ######################### END LICENSE BLOCK #########################
 
 # Big5 frequency table
-# by Taiwan's Mandarin Promotion Council 
+# by Taiwan's Mandarin Promotion Council
 # <http://www.edu.tw:81/mandr/>
-# 
+#
 # 128  --> 0.42261
 # 256  --> 0.57851
 # 512  --> 0.74851
 # 1024 --> 0.89384
 # 2048 --> 0.97583
-# 
+#
 # Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
 # Random Distribution Ration = 512/(5401-512)=0.105
-# 
+#
 # Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
 
 BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
@@ -45,7 +45,7 @@ BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
 #Char to FreqOrder table
 BIG5_TABLE_SIZE = 5376
 
-Big5CharToFreqOrder = ( \
+Big5CharToFreqOrder = (
    1,1801,1506, 255,1431, 198,   9,  82,   6,5008, 177, 202,3681,1256,2821, 110, #   16
 3814,  33,3274, 261,  76,  44,2114,  16,2946,2187,1176, 659,3971,  26,3451,2653, #   32
 1198,3972,3350,4202, 410,2215, 302, 590, 361,1964,   8, 204,  58,4510,5009,1932, #   48
@@ -921,3 +921,5 @@ Big5CharToFreqOrder = ( \
 13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951, #13952
 13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967, #13968
 13968,13969,13970,13971,13972) #13973
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/big5prober.py b/lib/requests/packages/chardet/big5prober.py
old mode 100755
new mode 100644
index e6b52aa..becce81
--- a/lib/requests/packages/chardet/big5prober.py
+++ b/lib/requests/packages/chardet/big5prober.py
@@ -1,11 +1,11 @@
 ######################## BEGIN LICENSE BLOCK ########################
 # The Original Code is Mozilla Communicator client code.
-# 
+#
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Mark Pilgrim - port to Python
 #
@@ -13,22 +13,23 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from mbcharsetprober import MultiByteCharSetProber
-from codingstatemachine import CodingStateMachine
-from chardistribution import Big5DistributionAnalysis
-from mbcssm import Big5SMModel
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import Big5DistributionAnalysis
+from .mbcssm import Big5SMModel
+
 
 class Big5Prober(MultiByteCharSetProber):
     def __init__(self):
diff --git a/lib/requests/packages/chardet/chardetect.py b/lib/requests/packages/chardet/chardetect.py
new file mode 100755
index 0000000..ffe892f
--- /dev/null
+++ b/lib/requests/packages/chardet/chardetect.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+"""
+Script which takes one or more file paths and reports on their detected
+encodings
+
+Example::
+
+    % chardetect somefile someotherfile
+    somefile: windows-1252 with confidence 0.5
+    someotherfile: ascii with confidence 1.0
+
+If no paths are provided, it takes its input from stdin.
+
+"""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import argparse
+import sys
+from io import open
+
+from chardet import __version__
+from chardet.universaldetector import UniversalDetector
+
+
+def description_of(lines, name='stdin'):
+    """
+    Return a string describing the probable encoding of a file or
+    list of strings.
+
+    :param lines: The lines to get the encoding of.
+    :type lines: Iterable of bytes
+    :param name: Name of file or collection of lines
+    :type name: str
+    """
+    u = UniversalDetector()
+    for line in lines:
+        u.feed(line)
+    u.close()
+    result = u.result
+    if result['encoding']:
+        return '{0}: {1} with confidence {2}'.format(name, result['encoding'],
+                                                     result['confidence'])
+    else:
+        return '{0}: no result'.format(name)
+
+
+def main(argv=None):
+    '''
+    Handles command line arguments and gets things started.
+
+    :param argv: List of arguments, as if specified on the command-line.
+                 If None, ``sys.argv[1:]`` is used instead.
+    :type argv: list of str
+    '''
+    # Get command line arguments
+    parser = argparse.ArgumentParser(
+        description="Takes one or more file paths and reports their detected \
+                     encodings",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        conflict_handler='resolve')
+    parser.add_argument('input',
+                        help='File whose encoding we would like to determine.',
+                        type=argparse.FileType('rb'), nargs='*',
+                        default=[sys.stdin])
+    parser.add_argument('--version', action='version',
+                        version='%(prog)s {0}'.format(__version__))
+    args = parser.parse_args(argv)
+
+    for f in args.input:
+        if f.isatty():
+            print("You are running chardetect interactively. Press " +
+                  "CTRL-D twice at the start of a blank line to signal the " +
+                  "end of your input. If you want help, run chardetect " +
+                  "--help\n", file=sys.stderr)
+        print(description_of(f, f.name))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/lib/requests/packages/chardet/chardistribution.py b/lib/requests/packages/chardet/chardistribution.py
old mode 100755
new mode 100644
index b893341..4e64a00
--- a/lib/requests/packages/chardet/chardistribution.py
+++ b/lib/requests/packages/chardet/chardistribution.py
@@ -1,11 +1,11 @@
 ######################## BEGIN LICENSE BLOCK ########################
 # The Original Code is Mozilla Communicator client code.
-# 
+#
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Mark Pilgrim - port to Python
 #
@@ -13,47 +13,63 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-from euctwfreq import EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE, EUCTW_TYPICAL_DISTRIBUTION_RATIO
-from euckrfreq import EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE, EUCKR_TYPICAL_DISTRIBUTION_RATIO
-from gb2312freq import GB2312CharToFreqOrder, GB2312_TABLE_SIZE, GB2312_TYPICAL_DISTRIBUTION_RATIO
-from big5freq import Big5CharToFreqOrder, BIG5_TABLE_SIZE, BIG5_TYPICAL_DISTRIBUTION_RATIO
-from jisfreq import JISCharToFreqOrder, JIS_TABLE_SIZE, JIS_TYPICAL_DISTRIBUTION_RATIO
+from .euctwfreq import (EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE,
+                        EUCTW_TYPICAL_DISTRIBUTION_RATIO)
+from .euckrfreq import (EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE,
+                        EUCKR_TYPICAL_DISTRIBUTION_RATIO)
+from .gb2312freq import (GB2312CharToFreqOrder, GB2312_TABLE_SIZE,
+                         GB2312_TYPICAL_DISTRIBUTION_RATIO)
+from .big5freq import (Big5CharToFreqOrder, BIG5_TABLE_SIZE,
+                       BIG5_TYPICAL_DISTRIBUTION_RATIO)
+from .jisfreq import (JISCharToFreqOrder, JIS_TABLE_SIZE,
+                      JIS_TYPICAL_DISTRIBUTION_RATIO)
+from .compat import wrap_ord
 
 ENOUGH_DATA_THRESHOLD = 1024
 SURE_YES = 0.99
 SURE_NO = 0.01
+MINIMUM_DATA_THRESHOLD = 3
+
 
 class CharDistributionAnalysis:
     def __init__(self):
-        self._mCharToFreqOrder = None # Mapping table to get frequency order from char order (get from GetOrder())
-        self._mTableSize = None # Size of above table
-        self._mTypicalDistributionRatio = None # This is a constant value which varies from language to language, used in calculating confidence.  See http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html for further detail.
+        # Mapping table to get frequency order from char order (get from
+        # GetOrder())
+        self._mCharToFreqOrder = None
+        self._mTableSize = None  # Size of above table
+        # This is a constant value which varies from language to language,
+        # used in calculating confidence.  See
+        # http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html
+        # for further detail.
+        self._mTypicalDistributionRatio = None
         self.reset()
-        
+
     def reset(self):
         """reset analyser, clear any state"""
-        self._mDone = constants.False # If this flag is set to constants.True, detection is done and conclusion has been made
-        self._mTotalChars = 0 # Total characters encountered
-        self._mFreqChars = 0 # The number of characters whose frequency order is less than 512
-
-    def feed(self, aStr, aCharLen):
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
+        self._mTotalChars = 0  # Total characters encountered
+        # The number of characters whose frequency order is less than 512
+        self._mFreqChars = 0
+
+    def feed(self, aBuf, aCharLen):
         """feed a character with known length"""
         if aCharLen == 2:
             # we only care about 2-bytes character in our distribution analysis
-            order = self.get_order(aStr)
+            order = self.get_order(aBuf)
         else:
             order = -1
         if order >= 0:
@@ -65,12 +81,14 @@ class CharDistributionAnalysis:
 
     def get_confidence(self):
         """return confidence based on existing data"""
-        # if we didn't receive any character in our consideration range, return negative answer
-        if self._mTotalChars <= 0:
+        # if we didn't receive any character in our consideration range,
+        # return negative answer
+        if self._mTotalChars <= 0 or self._mFreqChars <= MINIMUM_DATA_THRESHOLD:
             return SURE_NO
 
         if self._mTotalChars != self._mFreqChars:
-            r = self._mFreqChars / ((self._mTotalChars - self._mFreqChars) * self._mTypicalDistributionRatio)
+            r = (self._mFreqChars / ((self._mTotalChars - self._mFreqChars)
+                 * self._mTypicalDistributionRatio))
             if r < SURE_YES:
                 return r
 
@@ -78,16 +96,18 @@ class CharDistributionAnalysis:
         return SURE_YES
 
     def got_enough_data(self):
-        # It is not necessary to receive all data to draw conclusion. For charset detection,
-        # certain amount of data is enough
+        # It is not necessary to receive all data to draw conclusion.
+        # For charset detection, certain amount of data is enough
         return self._mTotalChars > ENOUGH_DATA_THRESHOLD
 
-    def get_order(self, aStr):
-        # We do not handle characters based on the original encoding string, but 
-        # convert this encoding string to a number, here called order.
-        # This allows multiple encodings of a language to share one frequency table.
+    def get_order(self, aBuf):
+        # We do not handle characters based on the original encoding string,
+        # but convert this encoding string to a number, here called order.
+        # This allows multiple encodings of a language to share one frequency
+        # table.
         return -1
-    
+
+
 class EUCTWDistributionAnalysis(CharDistributionAnalysis):
     def __init__(self):
         CharDistributionAnalysis.__init__(self)
@@ -95,16 +115,18 @@ class EUCTWDistributionAnalysis(CharDistributionAnalysis):
         self._mTableSize = EUCTW_TABLE_SIZE
         self._mTypicalDistributionRatio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
 
-    def get_order(self, aStr):
-        # for euc-TW encoding, we are interested 
+    def get_order(self, aBuf):
+        # for euc-TW encoding, we are interested
         #   first  byte range: 0xc4 -- 0xfe
         #   second byte range: 0xa1 -- 0xfe
         # no validation needed here. State machine has done that
-        if aStr[0] >= '\xC4':
-            return 94 * (ord(aStr[0]) - 0xC4) + ord(aStr[1]) - 0xA1
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xC4:
+            return 94 * (first_char - 0xC4) + wrap_ord(aBuf[1]) - 0xA1
         else:
             return -1
 
+
 class EUCKRDistributionAnalysis(CharDistributionAnalysis):
     def __init__(self):
         CharDistributionAnalysis.__init__(self)
@@ -112,15 +134,17 @@ class EUCKRDistributionAnalysis(CharDistributionAnalysis):
         self._mTableSize = EUCKR_TABLE_SIZE
         self._mTypicalDistributionRatio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
 
-    def get_order(self, aStr):
-        # for euc-KR encoding, we are interested 
+    def get_order(self, aBuf):
+        # for euc-KR encoding, we are interested
         #   first  byte range: 0xb0 -- 0xfe
         #   second byte range: 0xa1 -- 0xfe
         # no validation needed here. State machine has done that
-        if aStr[0] >= '\xB0':
-            return 94 * (ord(aStr[0]) - 0xB0) + ord(aStr[1]) - 0xA1
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xB0:
+            return 94 * (first_char - 0xB0) + wrap_ord(aBuf[1]) - 0xA1
         else:
-            return -1;
+            return -1
+
 
 class GB2312DistributionAnalysis(CharDistributionAnalysis):
     def __init__(self):
@@ -129,15 +153,17 @@ class GB2312DistributionAnalysis(CharDistributionAnalysis):
         self._mTableSize = GB2312_TABLE_SIZE
         self._mTypicalDistributionRatio = GB2312_TYPICAL_DISTRIBUTION_RATIO
 
-    def get_order(self, aStr):
-        # for GB2312 encoding, we are interested 
+    def get_order(self, aBuf):
+        # for GB2312 encoding, we are interested
         #  first  byte range: 0xb0 -- 0xfe
         #  second byte range: 0xa1 -- 0xfe
         # no validation needed here. State machine has done that
-        if (aStr[0] >= '\xB0') and (aStr[1] >= '\xA1'):
-            return 94 * (ord(aStr[0]) - 0xB0) + ord(aStr[1]) - 0xA1
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0xB0) and (second_char >= 0xA1):
+            return 94 * (first_char - 0xB0) + second_char - 0xA1
         else:
-            return -1;
+            return -1
+
 
 class Big5DistributionAnalysis(CharDistributionAnalysis):
     def __init__(self):
@@ -146,19 +172,21 @@ class Big5DistributionAnalysis(CharDistributionAnalysis):
         self._mTableSize = BIG5_TABLE_SIZE
         self._mTypicalDistributionRatio = BIG5_TYPICAL_DISTRIBUTION_RATIO
 
-    def get_order(self, aStr):
-        # for big5 encoding, we are interested 
+    def get_order(self, aBuf):
+        # for big5 encoding, we are interested
         #   first  byte range: 0xa4 -- 0xfe
         #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
         # no validation needed here. State machine has done that
-        if aStr[0] >= '\xA4':
-            if aStr[1] >= '\xA1':
-                return 157 * (ord(aStr[0]) - 0xA4) + ord(aStr[1]) - 0xA1 + 63
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if first_char >= 0xA4:
+            if second_char >= 0xA1:
+                return 157 * (first_char - 0xA4) + second_char - 0xA1 + 63
             else:
-                return 157 * (ord(aStr[0]) - 0xA4) + ord(aStr[1]) - 0x40
+                return 157 * (first_char - 0xA4) + second_char - 0x40
         else:
             return -1
 
+
 class SJISDistributionAnalysis(CharDistributionAnalysis):
     def __init__(self):
         CharDistributionAnalysis.__init__(self)
@@ -166,22 +194,24 @@ class SJISDistributionAnalysis(CharDistributionAnalysis):
         self._mTableSize = JIS_TABLE_SIZE
         self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
 
-    def get_order(self, aStr):
-        # for sjis encoding, we are interested 
+    def get_order(self, aBuf):
+        # for sjis encoding, we are interested
         #   first  byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
         #   second byte range: 0x40 -- 0x7e,  0x81 -- oxfe
         # no validation needed here. State machine has done that
-        if (aStr[0] >= '\x81') and (aStr[0] <= '\x9F'):
-            order = 188 * (ord(aStr[0]) - 0x81)
-        elif (aStr[0] >= '\xE0') and (aStr[0] <= '\xEF'):
-            order = 188 * (ord(aStr[0]) - 0xE0 + 31)
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0x81) and (first_char <= 0x9F):
+            order = 188 * (first_char - 0x81)
+        elif (first_char >= 0xE0) and (first_char <= 0xEF):
+            order = 188 * (first_char - 0xE0 + 31)
         else:
-            return -1;
-        order = order + ord(aStr[1]) - 0x40
-        if aStr[1] > '\x7F':
-            order =- 1
+            return -1
+        order = order + second_char - 0x40
+        if second_char > 0x7F:
+            order = -1
         return order
 
+
 class EUCJPDistributionAnalysis(CharDistributionAnalysis):
     def __init__(self):
         CharDistributionAnalysis.__init__(self)
@@ -189,12 +219,13 @@ class EUCJPDistributionAnalysis(CharDistributionAnalysis):
         self._mTableSize = JIS_TABLE_SIZE
         self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
 
-    def get_order(self, aStr):
-        # for euc-JP encoding, we are interested 
+    def get_order(self, aBuf):
+        # for euc-JP encoding, we are interested
         #   first  byte range: 0xa0 -- 0xfe
         #   second byte range: 0xa1 -- 0xfe
         # no validation needed here. State machine has done that
-        if aStr[0] >= '\xA0':
-            return 94 * (ord(aStr[0]) - 0xA1) + ord(aStr[1]) - 0xa1
+        char = wrap_ord(aBuf[0])
+        if char >= 0xA0:
+            return 94 * (char - 0xA1) + wrap_ord(aBuf[1]) - 0xa1
         else:
             return -1
diff --git a/lib/requests/packages/chardet/charsetgroupprober.py b/lib/requests/packages/chardet/charsetgroupprober.py
old mode 100755
new mode 100644
index 5188069..85e7a1c
--- a/lib/requests/packages/chardet/charsetgroupprober.py
+++ b/lib/requests/packages/chardet/charsetgroupprober.py
@@ -25,8 +25,10 @@
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from charsetprober import CharSetProber
+from . import constants
+import sys
+from .charsetprober import CharSetProber
+
 
 class CharSetGroupProber(CharSetProber):
     def __init__(self):
@@ -34,35 +36,39 @@ class CharSetGroupProber(CharSetProber):
         self._mActiveNum = 0
         self._mProbers = []
         self._mBestGuessProber = None
-        
+
     def reset(self):
         CharSetProber.reset(self)
         self._mActiveNum = 0
         for prober in self._mProbers:
             if prober:
                 prober.reset()
-                prober.active = constants.True
+                prober.active = True
                 self._mActiveNum += 1
         self._mBestGuessProber = None
 
     def get_charset_name(self):
         if not self._mBestGuessProber:
             self.get_confidence()
-            if not self._mBestGuessProber: return None
+            if not self._mBestGuessProber:
+                return None
 #                self._mBestGuessProber = self._mProbers[0]
         return self._mBestGuessProber.get_charset_name()
 
     def feed(self, aBuf):
         for prober in self._mProbers:
-            if not prober: continue
-            if not prober.active: continue
+            if not prober:
+                continue
+            if not prober.active:
+                continue
             st = prober.feed(aBuf)
-            if not st: continue
+            if not st:
+                continue
             if st == constants.eFoundIt:
                 self._mBestGuessProber = prober
                 return self.get_state()
             elif st == constants.eNotMe:
-                prober.active = constants.False
+                prober.active = False
                 self._mActiveNum -= 1
                 if self._mActiveNum <= 0:
                     self._mState = constants.eNotMe
@@ -78,18 +84,22 @@ class CharSetGroupProber(CharSetProber):
         bestConf = 0.0
         self._mBestGuessProber = None
         for prober in self._mProbers:
-            if not prober: continue
+            if not prober:
+                continue
             if not prober.active:
                 if constants._debug:
-                    sys.stderr.write(prober.get_charset_name() + ' not active\n')
+                    sys.stderr.write(prober.get_charset_name()
+                                     + ' not active\n')
                 continue
             cf = prober.get_confidence()
             if constants._debug:
-                sys.stderr.write('%s confidence = %s\n' % (prober.get_charset_name(), cf))
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(), cf))
             if bestConf < cf:
                 bestConf = cf
                 self._mBestGuessProber = prober
-        if not self._mBestGuessProber: return 0.0
+        if not self._mBestGuessProber:
+            return 0.0
         return bestConf
 #        else:
 #            self._mBestGuessProber = self._mProbers[0]
diff --git a/lib/requests/packages/chardet/charsetprober.py b/lib/requests/packages/chardet/charsetprober.py
old mode 100755
new mode 100644
index 3ac1683..9758171
--- a/lib/requests/packages/chardet/charsetprober.py
+++ b/lib/requests/packages/chardet/charsetprober.py
@@ -1,11 +1,11 @@
 ######################## BEGIN LICENSE BLOCK ########################
 # The Original Code is Mozilla Universal charset detector code.
-# 
+#
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Mark Pilgrim - port to Python
 #   Shy Shalom - original C code
@@ -14,27 +14,29 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, re
+from . import constants
+import re
+
 
 class CharSetProber:
     def __init__(self):
         pass
-        
+
     def reset(self):
         self._mState = constants.eDetecting
-    
+
     def get_charset_name(self):
         return None
 
@@ -48,13 +50,13 @@ class CharSetProber:
         return 0.0
 
     def filter_high_bit_only(self, aBuf):
-        aBuf = re.sub(r'([\x00-\x7F])+', ' ', aBuf)
+        aBuf = re.sub(b'([\x00-\x7F])+', b' ', aBuf)
         return aBuf
-    
+
     def filter_without_english_letters(self, aBuf):
-        aBuf = re.sub(r'([A-Za-z])+', ' ', aBuf)
+        aBuf = re.sub(b'([A-Za-z])+', b' ', aBuf)
         return aBuf
-        
+
     def filter_with_english_letters(self, aBuf):
         # TODO
         return aBuf
diff --git a/lib/requests/packages/chardet/codingstatemachine.py b/lib/requests/packages/chardet/codingstatemachine.py
old mode 100755
new mode 100644
index 452d3b0..8dd8c91
--- a/lib/requests/packages/chardet/codingstatemachine.py
+++ b/lib/requests/packages/chardet/codingstatemachine.py
@@ -13,19 +13,21 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from constants import eStart, eError, eItsMe
+from .constants import eStart
+from .compat import wrap_ord
+
 
 class CodingStateMachine:
     def __init__(self, sm):
@@ -40,12 +42,15 @@ class CodingStateMachine:
     def next_state(self, c):
         # for each byte we get its class
         # if it is first byte, we also get byte length
-        byteCls = self._mModel['classTable'][ord(c)]
+        # PY3K: aBuf is a byte stream, so c is an int, not a byte
+        byteCls = self._mModel['classTable'][wrap_ord(c)]
         if self._mCurrentState == eStart:
             self._mCurrentBytePos = 0
             self._mCurrentCharLen = self._mModel['charLenTable'][byteCls]
         # from byte's class and stateTable, we get its next state
-        self._mCurrentState = self._mModel['stateTable'][self._mCurrentState * self._mModel['classFactor'] + byteCls]
+        curr_state = (self._mCurrentState * self._mModel['classFactor']
+                      + byteCls)
+        self._mCurrentState = self._mModel['stateTable'][curr_state]
         self._mCurrentBytePos += 1
         return self._mCurrentState
 
diff --git a/lib/requests/packages/chardet/compat.py b/lib/requests/packages/chardet/compat.py
new file mode 100644
index 0000000..d9e30ad
--- /dev/null
+++ b/lib/requests/packages/chardet/compat.py
@@ -0,0 +1,34 @@
+######################## BEGIN LICENSE BLOCK ########################
+# Contributor(s):
+#   Ian Cordasco - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+
+
+if sys.version_info < (3, 0):
+    base_str = (str, unicode)
+else:
+    base_str = (bytes, str)
+
+
+def wrap_ord(a):
+    if sys.version_info < (3, 0) and isinstance(a, base_str):
+        return ord(a)
+    else:
+        return a
diff --git a/lib/requests/packages/chardet/constants.py b/lib/requests/packages/chardet/constants.py
old mode 100755
new mode 100644
index e94e226..e4d148b
--- a/lib/requests/packages/chardet/constants.py
+++ b/lib/requests/packages/chardet/constants.py
@@ -37,11 +37,3 @@ eError = 1
 eItsMe = 2
 
 SHORTCUT_THRESHOLD = 0.95
-
-import __builtin__
-if not hasattr(__builtin__, 'False'):
-    False = 0
-    True = 1
-else:
-    False = __builtin__.False
-    True = __builtin__.True
diff --git a/lib/requests/packages/chardet/cp949prober.py b/lib/requests/packages/chardet/cp949prober.py
new file mode 100644
index 0000000..ff4272f
--- /dev/null
+++ b/lib/requests/packages/chardet/cp949prober.py
@@ -0,0 +1,44 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCKRDistributionAnalysis
+from .mbcssm import CP949SMModel
+
+
+class CP949Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(CP949SMModel)
+        # NOTE: CP949 is a superset of EUC-KR, so the distribution should be
+        #       not different.
+        self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "CP949"
diff --git a/lib/requests/packages/chardet/escprober.py b/lib/requests/packages/chardet/escprober.py
old mode 100755
new mode 100644
index 572ed7b..80a844f
--- a/lib/requests/packages/chardet/escprober.py
+++ b/lib/requests/packages/chardet/escprober.py
@@ -13,39 +13,43 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from escsm import HZSMModel, ISO2022CNSMModel, ISO2022JPSMModel, ISO2022KRSMModel
-from charsetprober import CharSetProber
-from codingstatemachine import CodingStateMachine
+from . import constants
+from .escsm import (HZSMModel, ISO2022CNSMModel, ISO2022JPSMModel,
+                    ISO2022KRSMModel)
+from .charsetprober import CharSetProber
+from .codingstatemachine import CodingStateMachine
+from .compat import wrap_ord
+
 
 class EscCharSetProber(CharSetProber):
     def __init__(self):
         CharSetProber.__init__(self)
-        self._mCodingSM = [ \
+        self._mCodingSM = [
             CodingStateMachine(HZSMModel),
             CodingStateMachine(ISO2022CNSMModel),
             CodingStateMachine(ISO2022JPSMModel),
             CodingStateMachine(ISO2022KRSMModel)
-            ]
+        ]
         self.reset()
 
     def reset(self):
         CharSetProber.reset(self)
         for codingSM in self._mCodingSM:
-            if not codingSM: continue
-            codingSM.active = constants.True
+            if not codingSM:
+                continue
+            codingSM.active = True
             codingSM.reset()
         self._mActiveSM = len(self._mCodingSM)
         self._mDetectedCharset = None
@@ -61,19 +65,22 @@ class EscCharSetProber(CharSetProber):
 
     def feed(self, aBuf):
         for c in aBuf:
+            # PY3K: aBuf is a byte array, so c is an int, not a byte
             for codingSM in self._mCodingSM:
-                if not codingSM: continue
-                if not codingSM.active: continue
-                codingState = codingSM.next_state(c)
+                if not codingSM:
+                    continue
+                if not codingSM.active:
+                    continue
+                codingState = codingSM.next_state(wrap_ord(c))
                 if codingState == constants.eError:
-                    codingSM.active = constants.False
+                    codingSM.active = False
                     self._mActiveSM -= 1
                     if self._mActiveSM <= 0:
                         self._mState = constants.eNotMe
                         return self.get_state()
                 elif codingState == constants.eItsMe:
                     self._mState = constants.eFoundIt
-                    self._mDetectedCharset = codingSM.get_coding_state_machine()
+                    self._mDetectedCharset = codingSM.get_coding_state_machine()  # nopep8
                     return self.get_state()
-                
+
         return self.get_state()
diff --git a/lib/requests/packages/chardet/escsm.py b/lib/requests/packages/chardet/escsm.py
old mode 100755
new mode 100644
index 9fa2295..bd302b4
--- a/lib/requests/packages/chardet/escsm.py
+++ b/lib/requests/packages/chardet/escsm.py
@@ -13,62 +13,62 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from constants import eStart, eError, eItsMe
-
-HZ_cls = ( \
-1,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,0,0,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,0,0,0,0,  # 20 - 27 
-0,0,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-0,0,0,0,0,0,0,0,  # 40 - 47 
-0,0,0,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,4,0,5,2,0,  # 78 - 7f 
-1,1,1,1,1,1,1,1,  # 80 - 87 
-1,1,1,1,1,1,1,1,  # 88 - 8f 
-1,1,1,1,1,1,1,1,  # 90 - 97 
-1,1,1,1,1,1,1,1,  # 98 - 9f 
-1,1,1,1,1,1,1,1,  # a0 - a7 
-1,1,1,1,1,1,1,1,  # a8 - af 
-1,1,1,1,1,1,1,1,  # b0 - b7 
-1,1,1,1,1,1,1,1,  # b8 - bf 
-1,1,1,1,1,1,1,1,  # c0 - c7 
-1,1,1,1,1,1,1,1,  # c8 - cf 
-1,1,1,1,1,1,1,1,  # d0 - d7 
-1,1,1,1,1,1,1,1,  # d8 - df 
-1,1,1,1,1,1,1,1,  # e0 - e7 
-1,1,1,1,1,1,1,1,  # e8 - ef 
-1,1,1,1,1,1,1,1,  # f0 - f7 
-1,1,1,1,1,1,1,1,  # f8 - ff 
+from .constants import eStart, eError, eItsMe
+
+HZ_cls = (
+1,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,0,0,0,0,  # 20 - 27
+0,0,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,0,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,4,0,5,2,0,  # 78 - 7f
+1,1,1,1,1,1,1,1,  # 80 - 87
+1,1,1,1,1,1,1,1,  # 88 - 8f
+1,1,1,1,1,1,1,1,  # 90 - 97
+1,1,1,1,1,1,1,1,  # 98 - 9f
+1,1,1,1,1,1,1,1,  # a0 - a7
+1,1,1,1,1,1,1,1,  # a8 - af
+1,1,1,1,1,1,1,1,  # b0 - b7
+1,1,1,1,1,1,1,1,  # b8 - bf
+1,1,1,1,1,1,1,1,  # c0 - c7
+1,1,1,1,1,1,1,1,  # c8 - cf
+1,1,1,1,1,1,1,1,  # d0 - d7
+1,1,1,1,1,1,1,1,  # d8 - df
+1,1,1,1,1,1,1,1,  # e0 - e7
+1,1,1,1,1,1,1,1,  # e8 - ef
+1,1,1,1,1,1,1,1,  # f0 - f7
+1,1,1,1,1,1,1,1,  # f8 - ff
 )
 
-HZ_st = ( \
-eStart,eError,     3,eStart,eStart,eStart,eError,eError,# 00-07 
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f 
-eItsMe,eItsMe,eError,eError,eStart,eStart,     4,eError,# 10-17 
-     5,eError,     6,eError,     5,     5,     4,eError,# 18-1f 
-     4,eError,     4,     4,     4,eError,     4,eError,# 20-27 
-     4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart,# 28-2f 
+HZ_st = (
+eStart,eError,     3,eStart,eStart,eStart,eError,eError,# 00-07
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
+eItsMe,eItsMe,eError,eError,eStart,eStart,     4,eError,# 10-17
+     5,eError,     6,eError,     5,     5,     4,eError,# 18-1f
+     4,eError,     4,     4,     4,eError,     4,eError,# 20-27
+     4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart,# 28-2f
 )
 
 HZCharLenTable = (0, 0, 0, 0, 0, 0)
@@ -79,50 +79,50 @@ HZSMModel = {'classTable': HZ_cls,
              'charLenTable': HZCharLenTable,
              'name': "HZ-GB-2312"}
 
-ISO2022CN_cls = ( \
-2,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,0,0,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,0,0,0,0,  # 20 - 27 
-0,3,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-0,0,0,4,0,0,0,0,  # 40 - 47 
-0,0,0,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,0,0,0,0,0,  # 78 - 7f 
-2,2,2,2,2,2,2,2,  # 80 - 87 
-2,2,2,2,2,2,2,2,  # 88 - 8f 
-2,2,2,2,2,2,2,2,  # 90 - 97 
-2,2,2,2,2,2,2,2,  # 98 - 9f 
-2,2,2,2,2,2,2,2,  # a0 - a7 
-2,2,2,2,2,2,2,2,  # a8 - af 
-2,2,2,2,2,2,2,2,  # b0 - b7 
-2,2,2,2,2,2,2,2,  # b8 - bf 
-2,2,2,2,2,2,2,2,  # c0 - c7 
-2,2,2,2,2,2,2,2,  # c8 - cf 
-2,2,2,2,2,2,2,2,  # d0 - d7 
-2,2,2,2,2,2,2,2,  # d8 - df 
-2,2,2,2,2,2,2,2,  # e0 - e7 
-2,2,2,2,2,2,2,2,  # e8 - ef 
-2,2,2,2,2,2,2,2,  # f0 - f7 
-2,2,2,2,2,2,2,2,  # f8 - ff 
+ISO2022CN_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,0,0,0,0,  # 20 - 27
+0,3,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,4,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
 )
 
-ISO2022CN_st = ( \
-eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07 
-eStart,eError,eError,eError,eError,eError,eError,eError,# 08-0f 
-eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17 
-eItsMe,eItsMe,eItsMe,eError,eError,eError,     4,eError,# 18-1f 
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 20-27 
-     5,     6,eError,eError,eError,eError,eError,eError,# 28-2f 
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 30-37 
-eError,eError,eError,eError,eError,eItsMe,eError,eStart,# 38-3f 
+ISO2022CN_st = (
+eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
+eStart,eError,eError,eError,eError,eError,eError,eError,# 08-0f
+eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
+eItsMe,eItsMe,eItsMe,eError,eError,eError,     4,eError,# 18-1f
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 20-27
+     5,     6,eError,eError,eError,eError,eError,eError,# 28-2f
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 30-37
+eError,eError,eError,eError,eError,eItsMe,eError,eStart,# 38-3f
 )
 
 ISO2022CNCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -133,51 +133,51 @@ ISO2022CNSMModel = {'classTable': ISO2022CN_cls,
                     'charLenTable': ISO2022CNCharLenTable,
                     'name': "ISO-2022-CN"}
 
-ISO2022JP_cls = ( \
-2,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,2,2,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,7,0,0,0,  # 20 - 27 
-3,0,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-6,0,4,0,8,0,0,0,  # 40 - 47 
-0,9,5,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,0,0,0,0,0,  # 78 - 7f 
-2,2,2,2,2,2,2,2,  # 80 - 87 
-2,2,2,2,2,2,2,2,  # 88 - 8f 
-2,2,2,2,2,2,2,2,  # 90 - 97 
-2,2,2,2,2,2,2,2,  # 98 - 9f 
-2,2,2,2,2,2,2,2,  # a0 - a7 
-2,2,2,2,2,2,2,2,  # a8 - af 
-2,2,2,2,2,2,2,2,  # b0 - b7 
-2,2,2,2,2,2,2,2,  # b8 - bf 
-2,2,2,2,2,2,2,2,  # c0 - c7 
-2,2,2,2,2,2,2,2,  # c8 - cf 
-2,2,2,2,2,2,2,2,  # d0 - d7 
-2,2,2,2,2,2,2,2,  # d8 - df 
-2,2,2,2,2,2,2,2,  # e0 - e7 
-2,2,2,2,2,2,2,2,  # e8 - ef 
-2,2,2,2,2,2,2,2,  # f0 - f7 
-2,2,2,2,2,2,2,2,  # f8 - ff 
+ISO2022JP_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,2,2,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,7,0,0,0,  # 20 - 27
+3,0,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+6,0,4,0,8,0,0,0,  # 40 - 47
+0,9,5,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
 )
 
-ISO2022JP_st = ( \
-eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07 
-eStart,eStart,eError,eError,eError,eError,eError,eError,# 08-0f 
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17 
-eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,# 18-1f 
-eError,     5,eError,eError,eError,     4,eError,eError,# 20-27 
-eError,eError,eError,     6,eItsMe,eError,eItsMe,eError,# 28-2f 
-eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,# 30-37 
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 38-3f 
-eError,eError,eError,eError,eItsMe,eError,eStart,eStart,# 40-47 
+ISO2022JP_st = (
+eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
+eStart,eStart,eError,eError,eError,eError,eError,eError,# 08-0f
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
+eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,# 18-1f
+eError,     5,eError,eError,eError,     4,eError,eError,# 20-27
+eError,eError,eError,     6,eItsMe,eError,eItsMe,eError,# 28-2f
+eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,# 30-37
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 38-3f
+eError,eError,eError,eError,eItsMe,eError,eStart,eStart,# 40-47
 )
 
 ISO2022JPCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
@@ -188,47 +188,47 @@ ISO2022JPSMModel = {'classTable': ISO2022JP_cls,
                     'charLenTable': ISO2022JPCharLenTable,
                     'name': "ISO-2022-JP"}
 
-ISO2022KR_cls = ( \
-2,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,0,0,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,3,0,0,0,  # 20 - 27 
-0,4,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-0,0,0,5,0,0,0,0,  # 40 - 47 
-0,0,0,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,0,0,0,0,0,  # 78 - 7f 
-2,2,2,2,2,2,2,2,  # 80 - 87 
-2,2,2,2,2,2,2,2,  # 88 - 8f 
-2,2,2,2,2,2,2,2,  # 90 - 97 
-2,2,2,2,2,2,2,2,  # 98 - 9f 
-2,2,2,2,2,2,2,2,  # a0 - a7 
-2,2,2,2,2,2,2,2,  # a8 - af 
-2,2,2,2,2,2,2,2,  # b0 - b7 
-2,2,2,2,2,2,2,2,  # b8 - bf 
-2,2,2,2,2,2,2,2,  # c0 - c7 
-2,2,2,2,2,2,2,2,  # c8 - cf 
-2,2,2,2,2,2,2,2,  # d0 - d7 
-2,2,2,2,2,2,2,2,  # d8 - df 
-2,2,2,2,2,2,2,2,  # e0 - e7 
-2,2,2,2,2,2,2,2,  # e8 - ef 
-2,2,2,2,2,2,2,2,  # f0 - f7 
-2,2,2,2,2,2,2,2,  # f8 - ff 
+ISO2022KR_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,3,0,0,0,  # 20 - 27
+0,4,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,5,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
 )
 
-ISO2022KR_st = ( \
-eStart,     3,eError,eStart,eStart,eStart,eError,eError,# 00-07 
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f 
-eItsMe,eItsMe,eError,eError,eError,     4,eError,eError,# 10-17 
-eError,eError,eError,eError,     5,eError,eError,eError,# 18-1f 
-eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart,# 20-27 
+ISO2022KR_st = (
+eStart,     3,eError,eStart,eStart,eStart,eError,eError,# 00-07
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
+eItsMe,eItsMe,eError,eError,eError,     4,eError,eError,# 10-17
+eError,eError,eError,eError,     5,eError,eError,eError,# 18-1f
+eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart,# 20-27
 )
 
 ISO2022KRCharLenTable = (0, 0, 0, 0, 0, 0)
@@ -238,3 +238,5 @@ ISO2022KRSMModel = {'classTable': ISO2022KR_cls,
                     'stateTable': ISO2022KR_st,
                     'charLenTable': ISO2022KRCharLenTable,
                     'name': "ISO-2022-KR"}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/eucjpprober.py b/lib/requests/packages/chardet/eucjpprober.py
old mode 100755
new mode 100644
index 46a8b38..8e64fdc
--- a/lib/requests/packages/chardet/eucjpprober.py
+++ b/lib/requests/packages/chardet/eucjpprober.py
@@ -13,25 +13,26 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from constants import eStart, eError, eItsMe
-from mbcharsetprober import MultiByteCharSetProber
-from codingstatemachine import CodingStateMachine
-from chardistribution import EUCJPDistributionAnalysis
-from jpcntx import EUCJPContextAnalysis
-from mbcssm import EUCJPSMModel
+import sys
+from . import constants
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCJPDistributionAnalysis
+from .jpcntx import EUCJPContextAnalysis
+from .mbcssm import EUCJPSMModel
+
 
 class EUCJPProber(MultiByteCharSetProber):
     def __init__(self):
@@ -44,37 +45,41 @@ class EUCJPProber(MultiByteCharSetProber):
     def reset(self):
         MultiByteCharSetProber.reset(self)
         self._mContextAnalyzer.reset()
-        
+
     def get_charset_name(self):
         return "EUC-JP"
 
     def feed(self, aBuf):
         aLen = len(aBuf)
         for i in range(0, aLen):
+            # PY3K: aBuf is a byte array, so aBuf[i] is an int, not a byte
             codingState = self._mCodingSM.next_state(aBuf[i])
-            if codingState == eError:
+            if codingState == constants.eError:
                 if constants._debug:
-                    sys.stderr.write(self.get_charset_name() + ' prober hit error at byte ' + str(i) + '\n')
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
                 self._mState = constants.eNotMe
                 break
-            elif codingState == eItsMe:
+            elif codingState == constants.eItsMe:
                 self._mState = constants.eFoundIt
                 break
-            elif codingState == eStart:
+            elif codingState == constants.eStart:
                 charLen = self._mCodingSM.get_current_charlen()
                 if i == 0:
                     self._mLastChar[1] = aBuf[0]
                     self._mContextAnalyzer.feed(self._mLastChar, charLen)
                     self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
                 else:
-                    self._mContextAnalyzer.feed(aBuf[i-1:i+1], charLen)
-                    self._mDistributionAnalyzer.feed(aBuf[i-1:i+1], charLen)
-                    
+                    self._mContextAnalyzer.feed(aBuf[i - 1:i + 1], charLen)
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
         self._mLastChar[0] = aBuf[aLen - 1]
-        
+
         if self.get_state() == constants.eDetecting:
-            if self._mContextAnalyzer.got_enough_data() and \
-                   (self.get_confidence() > constants.SHORTCUT_THRESHOLD):
+            if (self._mContextAnalyzer.got_enough_data() and
+               (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
                 self._mState = constants.eFoundIt
 
         return self.get_state()
diff --git a/lib/requests/packages/chardet/euckrfreq.py b/lib/requests/packages/chardet/euckrfreq.py
old mode 100755
new mode 100644
index 1463fa1..a179e4c
--- a/lib/requests/packages/chardet/euckrfreq.py
+++ b/lib/requests/packages/chardet/euckrfreq.py
@@ -592,3 +592,5 @@ EUCKRCharToFreqOrder = ( \
 8704,8705,8706,8707,8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,
 8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,
 8736,8737,8738,8739,8740,8741)
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/euckrprober.py b/lib/requests/packages/chardet/euckrprober.py
old mode 100755
new mode 100644
index bd697eb..5982a46
--- a/lib/requests/packages/chardet/euckrprober.py
+++ b/lib/requests/packages/chardet/euckrprober.py
@@ -13,22 +13,23 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from mbcharsetprober import MultiByteCharSetProber
-from codingstatemachine import CodingStateMachine
-from chardistribution import EUCKRDistributionAnalysis
-from mbcssm import EUCKRSMModel
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCKRDistributionAnalysis
+from .mbcssm import EUCKRSMModel
+
 
 class EUCKRProber(MultiByteCharSetProber):
     def __init__(self):
diff --git a/lib/requests/packages/chardet/euctwfreq.py b/lib/requests/packages/chardet/euctwfreq.py
old mode 100755
new mode 100644
index c057209..576e750
--- a/lib/requests/packages/chardet/euctwfreq.py
+++ b/lib/requests/packages/chardet/euctwfreq.py
@@ -13,12 +13,12 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -26,8 +26,8 @@
 ######################### END LICENSE BLOCK #########################
 
 # EUCTW frequency table
-# Converted from big5 work 
-# by Taiwan's Mandarin Promotion Council 
+# Converted from big5 work
+# by Taiwan's Mandarin Promotion Council
 # <http:#www.edu.tw:81/mandr/>
 
 # 128  --> 0.42261
@@ -38,15 +38,15 @@
 #
 # Idea Distribution Ratio = 0.74851/(1-0.74851) =2.98
 # Random Distribution Ration = 512/(5401-512)=0.105
-# 
+#
 # Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
 
 EUCTW_TYPICAL_DISTRIBUTION_RATIO = 0.75
 
-# Char to FreqOrder table , 
+# Char to FreqOrder table ,
 EUCTW_TABLE_SIZE = 8102
 
-EUCTWCharToFreqOrder = ( \
+EUCTWCharToFreqOrder = (
    1,1800,1506, 255,1431, 198,   9,  82,   6,7310, 177, 202,3615,1256,2808, 110, # 2742
 3735,  33,3241, 261,  76,  44,2113,  16,2931,2184,1176, 659,3868,  26,3404,2643, # 2758
 1198,3869,3313,4060, 410,2211, 302, 590, 361,1963,   8, 204,  58,4296,7311,1931, # 2774
@@ -424,3 +424,5 @@ EUCTWCharToFreqOrder = ( \
 8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,8708,8709, # 8710
 8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725, # 8726
 8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,8738,8739,8740,8741) # 8742
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/euctwprober.py b/lib/requests/packages/chardet/euctwprober.py
old mode 100755
new mode 100644
index b073f13..fe652fe
--- a/lib/requests/packages/chardet/euctwprober.py
+++ b/lib/requests/packages/chardet/euctwprober.py
@@ -25,10 +25,10 @@
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from mbcharsetprober import MultiByteCharSetProber
-from codingstatemachine import CodingStateMachine
-from chardistribution import EUCTWDistributionAnalysis
-from mbcssm import EUCTWSMModel
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCTWDistributionAnalysis
+from .mbcssm import EUCTWSMModel
 
 class EUCTWProber(MultiByteCharSetProber):
     def __init__(self):
diff --git a/lib/requests/packages/chardet/gb2312freq.py b/lib/requests/packages/chardet/gb2312freq.py
old mode 100755
new mode 100644
index 7a4d5a1..1238f51
--- a/lib/requests/packages/chardet/gb2312freq.py
+++ b/lib/requests/packages/chardet/gb2312freq.py
@@ -13,12 +13,12 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -36,14 +36,14 @@
 #
 # Ideal Distribution Ratio = 0.79135/(1-0.79135) = 3.79
 # Random Distribution Ration = 512 / (3755 - 512) = 0.157
-# 
+#
 # Typical Distribution Ratio about 25% of Ideal one, still much higher that RDR
 
 GB2312_TYPICAL_DISTRIBUTION_RATIO = 0.9
 
 GB2312_TABLE_SIZE = 3760
 
-GB2312CharToFreqOrder = ( \
+GB2312CharToFreqOrder = (
 1671, 749,1443,2364,3924,3807,2330,3921,1704,3463,2691,1511,1515, 572,3191,2205,
 2361, 224,2558, 479,1711, 963,3162, 440,4060,1905,2966,2947,3580,2647,3961,3842,
 2204, 869,4207, 970,2678,5626,2944,2956,1479,4048, 514,3595, 588,1346,2820,3409,
@@ -469,3 +469,4 @@ GB2312CharToFreqOrder = ( \
 5867,5507,6273,4206,6274,4789,6098,6764,3619,3646,3833,3804,2394,3788,4936,3978,
 4866,4899,6099,6100,5559,6478,6765,3599,5868,6101,5869,5870,6275,6766,4527,6767)
 
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/gb2312prober.py b/lib/requests/packages/chardet/gb2312prober.py
old mode 100755
new mode 100644
index 91eb392..0325a2d
--- a/lib/requests/packages/chardet/gb2312prober.py
+++ b/lib/requests/packages/chardet/gb2312prober.py
@@ -25,10 +25,10 @@
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from mbcharsetprober import MultiByteCharSetProber
-from codingstatemachine import CodingStateMachine
-from chardistribution import GB2312DistributionAnalysis
-from mbcssm import GB2312SMModel
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import GB2312DistributionAnalysis
+from .mbcssm import GB2312SMModel
 
 class GB2312Prober(MultiByteCharSetProber):
     def __init__(self):
diff --git a/lib/requests/packages/chardet/hebrewprober.py b/lib/requests/packages/chardet/hebrewprober.py
old mode 100755
new mode 100644
index a2b1eaa..ba225c5
--- a/lib/requests/packages/chardet/hebrewprober.py
+++ b/lib/requests/packages/chardet/hebrewprober.py
@@ -13,20 +13,21 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from charsetprober import CharSetProber
-import constants
+from .charsetprober import CharSetProber
+from .constants import eNotMe, eDetecting
+from .compat import wrap_ord
 
 # This prober doesn't actually recognize a language or a charset.
 # It is a helper prober for the use of the Hebrew model probers
@@ -35,40 +36,40 @@ import constants
 #
 # Four main charsets exist in Hebrew:
 # "ISO-8859-8" - Visual Hebrew
-# "windows-1255" - Logical Hebrew 
+# "windows-1255" - Logical Hebrew
 # "ISO-8859-8-I" - Logical Hebrew
 # "x-mac-hebrew" - ?? Logical Hebrew ??
 #
 # Both "ISO" charsets use a completely identical set of code points, whereas
-# "windows-1255" and "x-mac-hebrew" are two different proper supersets of 
+# "windows-1255" and "x-mac-hebrew" are two different proper supersets of
 # these code points. windows-1255 defines additional characters in the range
-# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific 
+# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific
 # diacritics and additional 'Yiddish' ligature letters in the range 0xc0-0xd6.
-# x-mac-hebrew defines similar additional code points but with a different 
+# x-mac-hebrew defines similar additional code points but with a different
 # mapping.
 #
-# As far as an average Hebrew text with no diacritics is concerned, all four 
-# charsets are identical with respect to code points. Meaning that for the 
-# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters 
+# As far as an average Hebrew text with no diacritics is concerned, all four
+# charsets are identical with respect to code points. Meaning that for the
+# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters
 # (including final letters).
 #
 # The dominant difference between these charsets is their directionality.
 # "Visual" directionality means that the text is ordered as if the renderer is
-# not aware of a BIDI rendering algorithm. The renderer sees the text and 
-# draws it from left to right. The text itself when ordered naturally is read 
+# not aware of a BIDI rendering algorithm. The renderer sees the text and
+# draws it from left to right. The text itself when ordered naturally is read
 # backwards. A buffer of Visual Hebrew generally looks like so:
 # "[last word of first line spelled backwards] [whole line ordered backwards
-# and spelled backwards] [first word of first line spelled backwards] 
+# and spelled backwards] [first word of first line spelled backwards]
 # [end of line] [last word of second line] ... etc' "
 # adding punctuation marks, numbers and English text to visual text is
 # naturally also "visual" and from left to right.
-# 
+#
 # "Logical" directionality means the text is ordered "naturally" according to
-# the order it is read. It is the responsibility of the renderer to display 
-# the text from right to left. A BIDI algorithm is used to place general 
+# the order it is read. It is the responsibility of the renderer to display
+# the text from right to left. A BIDI algorithm is used to place general
 # punctuation marks, numbers and English text in the text.
 #
-# Texts in x-mac-hebrew are almost impossible to find on the Internet. From 
+# Texts in x-mac-hebrew are almost impossible to find on the Internet. From
 # what little evidence I could find, it seems that its general directionality
 # is Logical.
 #
@@ -76,17 +77,17 @@ import constants
 # charsets:
 # Visual Hebrew - "ISO-8859-8" - backwards text - Words and sentences are
 #    backwards while line order is natural. For charset recognition purposes
-#    the line order is unimportant (In fact, for this implementation, even 
+#    the line order is unimportant (In fact, for this implementation, even
 #    word order is unimportant).
 # Logical Hebrew - "windows-1255" - normal, naturally ordered text.
 #
-# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be 
+# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be
 #    specifically identified.
 # "x-mac-hebrew" is also identified as windows-1255. A text in x-mac-hebrew
 #    that contain special punctuation marks or diacritics is displayed with
 #    some unconverted characters showing as question marks. This problem might
 #    be corrected using another model prober for x-mac-hebrew. Due to the fact
-#    that x-mac-hebrew texts are so rare, writing another model prober isn't 
+#    that x-mac-hebrew texts are so rare, writing another model prober isn't
 #    worth the effort and performance hit.
 #
 #### The Prober ####
@@ -126,28 +127,31 @@ import constants
 # charset identified, either "windows-1255" or "ISO-8859-8".
 
 # windows-1255 / ISO-8859-8 code points of interest
-FINAL_KAF = '\xea'
-NORMAL_KAF = '\xeb'
-FINAL_MEM = '\xed'
-NORMAL_MEM = '\xee'
-FINAL_NUN = '\xef'
-NORMAL_NUN = '\xf0'
-FINAL_PE = '\xf3'
-NORMAL_PE = '\xf4'
-FINAL_TSADI = '\xf5'
-NORMAL_TSADI = '\xf6'
+FINAL_KAF = 0xea
+NORMAL_KAF = 0xeb
+FINAL_MEM = 0xed
+NORMAL_MEM = 0xee
+FINAL_NUN = 0xef
+NORMAL_NUN = 0xf0
+FINAL_PE = 0xf3
+NORMAL_PE = 0xf4
+FINAL_TSADI = 0xf5
+NORMAL_TSADI = 0xf6
 
 # Minimum Visual vs Logical final letter score difference.
-# If the difference is below this, don't rely solely on the final letter score distance.
+# If the difference is below this, don't rely solely on the final letter score
+# distance.
 MIN_FINAL_CHAR_DISTANCE = 5
 
 # Minimum Visual vs Logical model score difference.
-# If the difference is below this, don't rely at all on the model score distance.
+# If the difference is below this, don't rely at all on the model score
+# distance.
 MIN_MODEL_DISTANCE = 0.01
 
 VISUAL_HEBREW_NAME = "ISO-8859-8"
 LOGICAL_HEBREW_NAME = "windows-1255"
 
+
 class HebrewProber(CharSetProber):
     def __init__(self):
         CharSetProber.__init__(self)
@@ -159,84 +163,91 @@ class HebrewProber(CharSetProber):
         self._mFinalCharLogicalScore = 0
         self._mFinalCharVisualScore = 0
         # The two last characters seen in the previous buffer,
-        # mPrev and mBeforePrev are initialized to space in order to simulate a word 
-        # delimiter at the beginning of the data
+        # mPrev and mBeforePrev are initialized to space in order to simulate
+        # a word delimiter at the beginning of the data
         self._mPrev = ' '
         self._mBeforePrev = ' '
         # These probers are owned by the group prober.
-        
+
     def set_model_probers(self, logicalProber, visualProber):
         self._mLogicalProber = logicalProber
         self._mVisualProber = visualProber
 
     def is_final(self, c):
-        return c in [FINAL_KAF, FINAL_MEM, FINAL_NUN, FINAL_PE, FINAL_TSADI]
+        return wrap_ord(c) in [FINAL_KAF, FINAL_MEM, FINAL_NUN, FINAL_PE,
+                               FINAL_TSADI]
 
     def is_non_final(self, c):
-        # The normal Tsadi is not a good Non-Final letter due to words like 
-        # 'lechotet' (to chat) containing an apostrophe after the tsadi. This 
-        # apostrophe is converted to a space in FilterWithoutEnglishLetters causing 
-        # the Non-Final tsadi to appear at an end of a word even though this is not 
-        # the case in the original text.
-        # The letters Pe and Kaf rarely display a related behavior of not being a 
-        # good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak' for 
-        # example legally end with a Non-Final Pe or Kaf. However, the benefit of 
-        # these letters as Non-Final letters outweighs the damage since these words 
-        # are quite rare.
-        return c in [NORMAL_KAF, NORMAL_MEM, NORMAL_NUN, NORMAL_PE]
-    
+        # The normal Tsadi is not a good Non-Final letter due to words like
+        # 'lechotet' (to chat) containing an apostrophe after the tsadi. This
+        # apostrophe is converted to a space in FilterWithoutEnglishLetters
+        # causing the Non-Final tsadi to appear at an end of a word even
+        # though this is not the case in the original text.
+        # The letters Pe and Kaf rarely display a related behavior of not being
+        # a good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak'
+        # for example legally end with a Non-Final Pe or Kaf. However, the
+        # benefit of these letters as Non-Final letters outweighs the damage
+        # since these words are quite rare.
+        return wrap_ord(c) in [NORMAL_KAF, NORMAL_MEM, NORMAL_NUN, NORMAL_PE]
+
     def feed(self, aBuf):
         # Final letter analysis for logical-visual decision.
-        # Look for evidence that the received buffer is either logical Hebrew or 
-        # visual Hebrew.
+        # Look for evidence that the received buffer is either logical Hebrew
+        # or visual Hebrew.
         # The following cases are checked:
-        # 1) A word longer than 1 letter, ending with a final letter. This is an 
-        #    indication that the text is laid out "naturally" since the final letter 
-        #    really appears at the end. +1 for logical score.
-        # 2) A word longer than 1 letter, ending with a Non-Final letter. In normal
-        #    Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi, should not end with
-        #    the Non-Final form of that letter. Exceptions to this rule are mentioned
-        #    above in isNonFinal(). This is an indication that the text is laid out
-        #    backwards. +1 for visual score
-        # 3) A word longer than 1 letter, starting with a final letter. Final letters 
-        #    should not appear at the beginning of a word. This is an indication that 
-        #    the text is laid out backwards. +1 for visual score.
-        # 
-        # The visual score and logical score are accumulated throughout the text and 
-        # are finally checked against each other in GetCharSetName().
-        # No checking for final letters in the middle of words is done since that case
-        # is not an indication for either Logical or Visual text.
-        # 
-        # We automatically filter out all 7-bit characters (replace them with spaces)
-        # so the word boundary detection works properly. [MAP]
+        # 1) A word longer than 1 letter, ending with a final letter. This is
+        #    an indication that the text is laid out "naturally" since the
+        #    final letter really appears at the end. +1 for logical score.
+        # 2) A word longer than 1 letter, ending with a Non-Final letter. In
+        #    normal Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi,
+        #    should not end with the Non-Final form of that letter. Exceptions
+        #    to this rule are mentioned above in isNonFinal(). This is an
+        #    indication that the text is laid out backwards. +1 for visual
+        #    score
+        # 3) A word longer than 1 letter, starting with a final letter. Final
+        #    letters should not appear at the beginning of a word. This is an
+        #    indication that the text is laid out backwards. +1 for visual
+        #    score.
+        #
+        # The visual score and logical score are accumulated throughout the
+        # text and are finally checked against each other in GetCharSetName().
+        # No checking for final letters in the middle of words is done since
+        # that case is not an indication for either Logical or Visual text.
+        #
+        # We automatically filter out all 7-bit characters (replace them with
+        # spaces) so the word boundary detection works properly. [MAP]
 
-        if self.get_state() == constants.eNotMe:
+        if self.get_state() == eNotMe:
             # Both model probers say it's not them. No reason to continue.
-            return constants.eNotMe
+            return eNotMe
 
         aBuf = self.filter_high_bit_only(aBuf)
-        
+
         for cur in aBuf:
             if cur == ' ':
                 # We stand on a space - a word just ended
                 if self._mBeforePrev != ' ':
-                    # next-to-last char was not a space so self._mPrev is not a 1 letter word
+                    # next-to-last char was not a space so self._mPrev is not a
+                    # 1 letter word
                     if self.is_final(self._mPrev):
                         # case (1) [-2:not space][-1:final letter][cur:space]
                         self._mFinalCharLogicalScore += 1
                     elif self.is_non_final(self._mPrev):
-                        # case (2) [-2:not space][-1:Non-Final letter][cur:space]
+                        # case (2) [-2:not space][-1:Non-Final letter][
+                        #  cur:space]
                         self._mFinalCharVisualScore += 1
             else:
                 # Not standing on a space
-                if (self._mBeforePrev == ' ') and (self.is_final(self._mPrev)) and (cur != ' '):
+                if ((self._mBeforePrev == ' ') and
+                        (self.is_final(self._mPrev)) and (cur != ' ')):
                     # case (3) [-2:space][-1:final letter][cur:not space]
                     self._mFinalCharVisualScore += 1
             self._mBeforePrev = self._mPrev
             self._mPrev = cur
 
-        # Forever detecting, till the end or until both model probers return eNotMe (handled above)
-        return constants.eDetecting
+        # Forever detecting, till the end or until both model probers return
+        # eNotMe (handled above)
+        return eDetecting
 
     def get_charset_name(self):
         # Make the decision: is it Logical or Visual?
@@ -248,22 +259,25 @@ class HebrewProber(CharSetProber):
             return VISUAL_HEBREW_NAME
 
         # It's not dominant enough, try to rely on the model scores instead.
-        modelsub = self._mLogicalProber.get_confidence() - self._mVisualProber.get_confidence()
+        modelsub = (self._mLogicalProber.get_confidence()
+                    - self._mVisualProber.get_confidence())
         if modelsub > MIN_MODEL_DISTANCE:
             return LOGICAL_HEBREW_NAME
         if modelsub < -MIN_MODEL_DISTANCE:
             return VISUAL_HEBREW_NAME
 
-        # Still no good, back to final letter distance, maybe it'll save the day.
+        # Still no good, back to final letter distance, maybe it'll save the
+        # day.
         if finalsub < 0.0:
             return VISUAL_HEBREW_NAME
 
-        # (finalsub > 0 - Logical) or (don't know what to do) default to Logical.
+        # (finalsub > 0 - Logical) or (don't know what to do) default to
+        # Logical.
         return LOGICAL_HEBREW_NAME
 
     def get_state(self):
         # Remain active as long as any of the model probers are active.
-        if (self._mLogicalProber.get_state() == constants.eNotMe) and \
-           (self._mVisualProber.get_state() == constants.eNotMe):
-            return constants.eNotMe
-        return constants.eDetecting
+        if (self._mLogicalProber.get_state() == eNotMe) and \
+           (self._mVisualProber.get_state() == eNotMe):
+            return eNotMe
+        return eDetecting
diff --git a/lib/requests/packages/chardet/jisfreq.py b/lib/requests/packages/chardet/jisfreq.py
old mode 100755
new mode 100644
index 5fe4a5c..064345b
--- a/lib/requests/packages/chardet/jisfreq.py
+++ b/lib/requests/packages/chardet/jisfreq.py
@@ -13,12 +13,12 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -28,7 +28,7 @@
 # Sampling from about 20M text materials include literature and computer technology
 #
 # Japanese frequency table, applied to both S-JIS and EUC-JP
-# They are sorted in order. 
+# They are sorted in order.
 
 # 128  --> 0.77094
 # 256  --> 0.85710
@@ -38,15 +38,15 @@
 #
 # Ideal Distribution Ratio = 0.92635 / (1-0.92635) = 12.58
 # Random Distribution Ration = 512 / (2965+62+83+86-512) = 0.191
-# 
-# Typical Distribution Ratio, 25% of IDR 
+#
+# Typical Distribution Ratio, 25% of IDR
 
 JIS_TYPICAL_DISTRIBUTION_RATIO = 3.0
 
-# Char to FreqOrder table , 
+# Char to FreqOrder table ,
 JIS_TABLE_SIZE = 4368
 
-JISCharToFreqOrder = ( \
+JISCharToFreqOrder = (
   40,   1,   6, 182, 152, 180, 295,2127, 285, 381,3295,4304,3068,4606,3165,3510, #   16
 3511,1822,2785,4607,1193,2226,5070,4608, 171,2996,1247,  18, 179,5071, 856,1661, #   32
 1262,5072, 619, 127,3431,3512,3230,1899,1700, 232, 228,1294,1298, 284, 283,2041, #   48
@@ -565,3 +565,5 @@ JISCharToFreqOrder = ( \
 8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239, # 8240
 8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255, # 8256
 8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271) # 8272
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/jpcntx.py b/lib/requests/packages/chardet/jpcntx.py
old mode 100755
new mode 100644
index 93db4a9..59aeb6a
--- a/lib/requests/packages/chardet/jpcntx.py
+++ b/lib/requests/packages/chardet/jpcntx.py
@@ -13,19 +13,19 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
+from .compat import wrap_ord
 
 NUM_OF_CATEGORY = 6
 DONT_KNOW = -1
@@ -34,7 +34,7 @@ MAX_REL_THRESHOLD = 1000
 MINIMUM_DATA_THRESHOLD = 4
 
 # This is hiragana 2-char sequence table, the number in each cell represents its frequency category
-jp2CharContext = ( \
+jp2CharContext = (
 (0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1),
 (2,4,0,4,0,3,0,4,0,3,4,4,4,2,4,3,3,4,3,2,3,3,4,2,3,3,3,2,4,1,4,3,3,1,5,4,3,4,3,4,3,5,3,0,3,5,4,2,0,3,1,0,3,3,0,3,3,0,1,1,0,4,3,0,3,3,0,4,0,2,0,3,5,5,5,5,4,0,4,1,0,3,4),
 (0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2),
@@ -123,26 +123,33 @@ jp2CharContext = ( \
 class JapaneseContextAnalysis:
     def __init__(self):
         self.reset()
-        
+
     def reset(self):
-        self._mTotalRel = 0 # total sequence received
-        self._mRelSample = [0] * NUM_OF_CATEGORY # category counters, each interger counts sequence in its category
-        self._mNeedToSkipCharNum = 0 # if last byte in current buffer is not the last byte of a character, we need to know how many bytes to skip in next buffer
-        self._mLastCharOrder = -1 # The order of previous char
-        self._mDone = constants.False # If this flag is set to constants.True, detection is done and conclusion has been made
+        self._mTotalRel = 0  # total sequence received
+        # category counters, each interger counts sequence in its category
+        self._mRelSample = [0] * NUM_OF_CATEGORY
+        # if last byte in current buffer is not the last byte of a character,
+        # we need to know how many bytes to skip in next buffer
+        self._mNeedToSkipCharNum = 0
+        self._mLastCharOrder = -1  # The order of previous char
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
 
     def feed(self, aBuf, aLen):
-        if self._mDone: return
-        
+        if self._mDone:
+            return
+
         # The buffer we got is byte oriented, and a character may span in more than one
-        # buffers. In case the last one or two byte in last buffer is not complete, we 
-        # record how many byte needed to complete that character and skip these bytes here.
-        # We can choose to record those bytes as well and analyse the character once it 
-        # is complete, but since a character will not make much difference, by simply skipping
+        # buffers. In case the last one or two byte in last buffer is not
+        # complete, we record how many byte needed to complete that character
+        # and skip these bytes here.  We can choose to record those bytes as
+        # well and analyse the character once it is complete, but since a
+        # character will not make much difference, by simply skipping
         # this character will simply our logic and improve performance.
         i = self._mNeedToSkipCharNum
         while i < aLen:
-            order, charLen = self.get_order(aBuf[i:i+2])
+            order, charLen = self.get_order(aBuf[i:i + 2])
             i += charLen
             if i > aLen:
                 self._mNeedToSkipCharNum = i - aLen
@@ -151,14 +158,14 @@ class JapaneseContextAnalysis:
                 if (order != -1) and (self._mLastCharOrder != -1):
                     self._mTotalRel += 1
                     if self._mTotalRel > MAX_REL_THRESHOLD:
-                        self._mDone = constants.True
+                        self._mDone = True
                         break
                     self._mRelSample[jp2CharContext[self._mLastCharOrder][order]] += 1
                 self._mLastCharOrder = order
 
     def got_enough_data(self):
         return self._mTotalRel > ENOUGH_REL_THRESHOLD
-    
+
     def get_confidence(self):
         # This is just one way to calculate confidence. It works well for me.
         if self._mTotalRel > MINIMUM_DATA_THRESHOLD:
@@ -166,45 +173,55 @@ class JapaneseContextAnalysis:
         else:
             return DONT_KNOW
 
-    def get_order(self, aStr):
+    def get_order(self, aBuf):
         return -1, 1
-        
+
 class SJISContextAnalysis(JapaneseContextAnalysis):
-    def get_order(self, aStr):
-        if not aStr: return -1, 1
+    def __init__(self):
+        self.charset_name = "SHIFT_JIS"
+
+    def get_charset_name(self):
+        return self.charset_name
+
+    def get_order(self, aBuf):
+        if not aBuf:
+            return -1, 1
         # find out current char's byte length
-        if ((aStr[0] >= '\x81') and (aStr[0] <= '\x9F')) or \
-           ((aStr[0] >= '\xE0') and (aStr[0] <= '\xFC')):
+        first_char = wrap_ord(aBuf[0])
+        if ((0x81 <= first_char <= 0x9F) or (0xE0 <= first_char <= 0xFC)):
             charLen = 2
+            if (first_char == 0x87) or (0xFA <= first_char <= 0xFC):
+                self.charset_name = "CP932"
         else:
             charLen = 1
 
         # return its order if it is hiragana
-        if len(aStr) > 1:
-            if (aStr[0] == '\202') and \
-               (aStr[1] >= '\x9F') and \
-               (aStr[1] <= '\xF1'):
-                return ord(aStr[1]) - 0x9F, charLen
+        if len(aBuf) > 1:
+            second_char = wrap_ord(aBuf[1])
+            if (first_char == 202) and (0x9F <= second_char <= 0xF1):
+                return second_char - 0x9F, charLen
 
         return -1, charLen
 
 class EUCJPContextAnalysis(JapaneseContextAnalysis):
-    def get_order(self, aStr):
-        if not aStr: return -1, 1
+    def get_order(self, aBuf):
+        if not aBuf:
+            return -1, 1
         # find out current char's byte length
-        if (aStr[0] == '\x8E') or \
-           ((aStr[0] >= '\xA1') and (aStr[0] <= '\xFE')):
+        first_char = wrap_ord(aBuf[0])
+        if (first_char == 0x8E) or (0xA1 <= first_char <= 0xFE):
             charLen = 2
-        elif aStr[0] == '\x8F':
+        elif first_char == 0x8F:
             charLen = 3
         else:
             charLen = 1
 
         # return its order if it is hiragana
-        if len(aStr) > 1:
-            if (aStr[0] == '\xA4') and \
-               (aStr[1] >= '\xA1') and \
-               (aStr[1] <= '\xF3'):
-                return ord(aStr[1]) - 0xA1, charLen
+        if len(aBuf) > 1:
+            second_char = wrap_ord(aBuf[1])
+            if (first_char == 0xA4) and (0xA1 <= second_char <= 0xF3):
+                return second_char - 0xA1, charLen
 
         return -1, charLen
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langbulgarianmodel.py b/lib/requests/packages/chardet/langbulgarianmodel.py
old mode 100755
new mode 100644
index bf5641e..e5788fc
--- a/lib/requests/packages/chardet/langbulgarianmodel.py
+++ b/lib/requests/packages/chardet/langbulgarianmodel.py
@@ -13,30 +13,28 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-
 # 255: Control characters that usually does not exist in any text
 # 254: Carriage/Return
 # 253: symbol (punctuation) that does not belong to word
 # 252: 0 - 9
 
 # Character Mapping Table:
-# this table is modified base on win1251BulgarianCharToOrderMap, so 
+# this table is modified base on win1251BulgarianCharToOrderMap, so
 # only number <64 is sure valid
 
-Latin5_BulgarianCharToOrderMap = ( \
+Latin5_BulgarianCharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -55,7 +53,7 @@ Latin5_BulgarianCharToOrderMap = ( \
  62,242,243,244, 58,245, 98,246,247,248,249,250,251, 91,252,253,  # f0
 )
 
-win1251BulgarianCharToOrderMap = ( \
+win1251BulgarianCharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -74,13 +72,13 @@ win1251BulgarianCharToOrderMap = ( \
   7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,253, 42, 16,  # f0
 )
 
-# Model Table: 
+# Model Table:
 # total sequences: 100%
 # first 512 sequences: 96.9392%
 # first 1024 sequences:3.0618%
 # rest  sequences:     0.2992%
-# negative sequences:  0.0020% 
-BulgarianLangModel = ( \
+# negative sequences:  0.0020%
+BulgarianLangModel = (
 0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,3,3,3,3,3,
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,2,2,1,2,2,
 3,1,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,0,1,
@@ -211,18 +209,21 @@ BulgarianLangModel = ( \
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 )
 
-Latin5BulgarianModel = { \
+Latin5BulgarianModel = {
   'charToOrderMap': Latin5_BulgarianCharToOrderMap,
   'precedenceMatrix': BulgarianLangModel,
   'mTypicalPositiveRatio': 0.969392,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "ISO-8859-5"
 }
 
-Win1251BulgarianModel = { \
+Win1251BulgarianModel = {
   'charToOrderMap': win1251BulgarianCharToOrderMap,
   'precedenceMatrix': BulgarianLangModel,
   'mTypicalPositiveRatio': 0.969392,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "windows-1251"
 }
+
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langcyrillicmodel.py b/lib/requests/packages/chardet/langcyrillicmodel.py
old mode 100755
new mode 100644
index e604cc7..a86f54b
--- a/lib/requests/packages/chardet/langcyrillicmodel.py
+++ b/lib/requests/packages/chardet/langcyrillicmodel.py
@@ -13,23 +13,21 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-
 # KOI8-R language model
 # Character Mapping Table:
-KOI8R_CharToOrderMap = ( \
+KOI8R_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -48,7 +46,7 @@ KOI8R_CharToOrderMap = ( \
  35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70,  # f0
 )
 
-win1251_CharToOrderMap = ( \
+win1251_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -67,7 +65,7 @@ win1251_CharToOrderMap = ( \
   9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
 )
 
-latin5_CharToOrderMap = ( \
+latin5_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -86,7 +84,7 @@ latin5_CharToOrderMap = ( \
 239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
 )
 
-macCyrillic_CharToOrderMap = ( \
+macCyrillic_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -105,7 +103,7 @@ macCyrillic_CharToOrderMap = ( \
   9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27,255,
 )
 
-IBM855_CharToOrderMap = ( \
+IBM855_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -124,7 +122,7 @@ IBM855_CharToOrderMap = ( \
 250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50,251,252,255,
 )
 
-IBM866_CharToOrderMap = ( \
+IBM866_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -143,13 +141,13 @@ IBM866_CharToOrderMap = ( \
 239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
 )
 
-# Model Table: 
+# Model Table:
 # total sequences: 100%
 # first 512 sequences: 97.6601%
 # first 1024 sequences: 2.3389%
 # rest  sequences:      0.1237%
-# negative sequences:   0.0009% 
-RussianLangModel = ( \
+# negative sequences:   0.0009%
+RussianLangModel = (
 0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,1,3,3,3,2,3,2,3,3,
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,2,2,2,2,2,0,0,2,
 3,3,3,2,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,2,3,2,0,
@@ -280,50 +278,52 @@ RussianLangModel = ( \
 0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
 )
 
-Koi8rModel = { \
+Koi8rModel = {
   'charToOrderMap': KOI8R_CharToOrderMap,
   'precedenceMatrix': RussianLangModel,
   'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "KOI8-R"
 }
 
-Win1251CyrillicModel = { \
+Win1251CyrillicModel = {
   'charToOrderMap': win1251_CharToOrderMap,
   'precedenceMatrix': RussianLangModel,
   'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "windows-1251"
 }
 
-Latin5CyrillicModel = { \
+Latin5CyrillicModel = {
   'charToOrderMap': latin5_CharToOrderMap,
   'precedenceMatrix': RussianLangModel,
   'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "ISO-8859-5"
 }
 
-MacCyrillicModel = { \
+MacCyrillicModel = {
   'charToOrderMap': macCyrillic_CharToOrderMap,
   'precedenceMatrix': RussianLangModel,
   'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "MacCyrillic"
 };
 
-Ibm866Model = { \
+Ibm866Model = {
   'charToOrderMap': IBM866_CharToOrderMap,
   'precedenceMatrix': RussianLangModel,
   'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "IBM866"
 }
 
-Ibm855Model = { \
+Ibm855Model = {
   'charToOrderMap': IBM855_CharToOrderMap,
   'precedenceMatrix': RussianLangModel,
   'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "IBM855"
 }
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langgreekmodel.py b/lib/requests/packages/chardet/langgreekmodel.py
old mode 100755
new mode 100644
index ec6d49e..ddb5837
--- a/lib/requests/packages/chardet/langgreekmodel.py
+++ b/lib/requests/packages/chardet/langgreekmodel.py
@@ -13,27 +13,25 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-
 # 255: Control characters that usually does not exist in any text
 # 254: Carriage/Return
 # 253: symbol (punctuation) that does not belong to word
 # 252: 0 - 9
 
 # Character Mapping Table:
-Latin7_CharToOrderMap = ( \
+Latin7_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -52,7 +50,7 @@ Latin7_CharToOrderMap = ( \
   9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
 )
 
-win1253_CharToOrderMap = ( \
+win1253_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -71,13 +69,13 @@ win1253_CharToOrderMap = ( \
   9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
 )
 
-# Model Table: 
+# Model Table:
 # total sequences: 100%
 # first 512 sequences: 98.2851%
 # first 1024 sequences:1.7001%
 # rest  sequences:     0.0359%
-# negative sequences:  0.0148% 
-GreekLangModel = ( \
+# negative sequences:  0.0148%
+GreekLangModel = (
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,3,2,2,3,3,3,3,3,3,3,3,1,3,3,3,0,2,2,3,3,0,3,0,3,2,0,3,3,3,0,
@@ -208,18 +206,20 @@ GreekLangModel = ( \
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 )
 
-Latin7GreekModel = { \
+Latin7GreekModel = {
   'charToOrderMap': Latin7_CharToOrderMap,
   'precedenceMatrix': GreekLangModel,
   'mTypicalPositiveRatio': 0.982851,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "ISO-8859-7"
 }
 
-Win1253GreekModel = { \
+Win1253GreekModel = {
   'charToOrderMap': win1253_CharToOrderMap,
   'precedenceMatrix': GreekLangModel,
   'mTypicalPositiveRatio': 0.982851,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "windows-1253"
 }
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langhebrewmodel.py b/lib/requests/packages/chardet/langhebrewmodel.py
old mode 100755
new mode 100644
index a8bcc65..75f2bc7
--- a/lib/requests/packages/chardet/langhebrewmodel.py
+++ b/lib/requests/packages/chardet/langhebrewmodel.py
@@ -15,20 +15,18 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-
 # 255: Control characters that usually does not exist in any text
 # 254: Carriage/Return
 # 253: symbol (punctuation) that does not belong to word
@@ -36,7 +34,7 @@ import constants
 
 # Windows-1255 language model
 # Character Mapping Table:
-win1255_CharToOrderMap = ( \
+win1255_CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -55,13 +53,13 @@ win1255_CharToOrderMap = ( \
  12, 19, 13, 26, 18, 27, 21, 17,  7, 10,  5,251,252,128, 96,253,
 )
 
-# Model Table: 
+# Model Table:
 # total sequences: 100%
 # first 512 sequences: 98.4004%
 # first 1024 sequences: 1.5981%
 # rest  sequences:      0.087%
-# negative sequences:   0.0015% 
-HebrewLangModel = ( \
+# negative sequences:   0.0015%
+HebrewLangModel = (
 0,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,3,2,1,2,0,1,0,0,
 3,0,3,1,0,0,1,3,2,0,1,1,2,0,2,2,2,1,1,1,1,2,1,1,1,2,0,0,2,2,0,1,
 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,
@@ -192,10 +190,12 @@ HebrewLangModel = ( \
 0,0,0,0,0,0,0,0,0,0,1,2,1,0,0,0,0,0,1,1,1,1,1,0,1,0,0,0,1,1,0,0,
 )
 
-Win1255HebrewModel = { \
+Win1255HebrewModel = {
   'charToOrderMap': win1255_CharToOrderMap,
   'precedenceMatrix': HebrewLangModel,
   'mTypicalPositiveRatio': 0.984004,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "windows-1255"
 }
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langhungarianmodel.py b/lib/requests/packages/chardet/langhungarianmodel.py
old mode 100755
new mode 100644
index d635f03..49d2f0f
--- a/lib/requests/packages/chardet/langhungarianmodel.py
+++ b/lib/requests/packages/chardet/langhungarianmodel.py
@@ -13,27 +13,25 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-
 # 255: Control characters that usually does not exist in any text
 # 254: Carriage/Return
 # 253: symbol (punctuation) that does not belong to word
 # 252: 0 - 9
 
 # Character Mapping Table:
-Latin2_HungarianCharToOrderMap = ( \
+Latin2_HungarianCharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -52,7 +50,7 @@ Latin2_HungarianCharToOrderMap = ( \
 245,246,247, 25, 73, 42, 24,248,249,250, 31, 56, 29,251,252,253,
 )
 
-win1250HungarianCharToOrderMap = ( \
+win1250HungarianCharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -71,13 +69,13 @@ win1250HungarianCharToOrderMap = ( \
 245,246,247, 25, 74, 42, 24,248,249,250, 31, 56, 29,251,252,253,
 )
 
-# Model Table: 
+# Model Table:
 # total sequences: 100%
 # first 512 sequences: 94.7368%
 # first 1024 sequences:5.2623%
 # rest  sequences:     0.8894%
-# negative sequences:  0.0009% 
-HungarianLangModel = ( \
+# negative sequences:  0.0009%
+HungarianLangModel = (
 0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
 3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,2,3,3,1,1,2,2,2,2,2,1,2,
 3,2,2,3,3,3,3,3,2,3,3,3,3,3,3,1,2,3,3,3,3,2,3,3,1,1,3,3,0,1,1,1,
@@ -208,18 +206,20 @@ HungarianLangModel = ( \
 0,1,1,1,1,1,1,0,1,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
 )
 
-Latin2HungarianModel = { \
+Latin2HungarianModel = {
   'charToOrderMap': Latin2_HungarianCharToOrderMap,
   'precedenceMatrix': HungarianLangModel,
   'mTypicalPositiveRatio': 0.947368,
-  'keepEnglishLetter': constants.True,
+  'keepEnglishLetter': True,
   'charsetName': "ISO-8859-2"
 }
 
-Win1250HungarianModel = { \
+Win1250HungarianModel = {
   'charToOrderMap': win1250HungarianCharToOrderMap,
   'precedenceMatrix': HungarianLangModel,
   'mTypicalPositiveRatio': 0.947368,
-  'keepEnglishLetter': constants.True,
+  'keepEnglishLetter': True,
   'charsetName': "windows-1250"
 }
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langthaimodel.py b/lib/requests/packages/chardet/langthaimodel.py
old mode 100755
new mode 100644
index 96ec054..0508b1b
--- a/lib/requests/packages/chardet/langthaimodel.py
+++ b/lib/requests/packages/chardet/langthaimodel.py
@@ -13,29 +13,27 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants
-
 # 255: Control characters that usually does not exist in any text
 # 254: Carriage/Return
 # 253: symbol (punctuation) that does not belong to word
 # 252: 0 - 9
 
-# The following result for thai was collected from a limited sample (1M). 
+# The following result for thai was collected from a limited sample (1M).
 
 # Character Mapping Table:
-TIS620CharToOrderMap = ( \
+TIS620CharToOrderMap = (
 255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
 253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
@@ -54,13 +52,13 @@ TIS620CharToOrderMap = ( \
  68, 56, 59, 65, 69, 60, 70, 80, 71, 87,248,249,250,251,252,253,
 )
 
-# Model Table: 
+# Model Table:
 # total sequences: 100%
 # first 512 sequences: 92.6386%
 # first 1024 sequences:7.3177%
 # rest  sequences:     1.0230%
-# negative sequences:  0.0436% 
-ThaiLangModel = ( \
+# negative sequences:  0.0436%
+ThaiLangModel = (
 0,1,3,3,3,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,0,0,3,3,3,0,3,3,3,3,
 0,3,3,0,0,0,1,3,0,3,3,2,3,3,0,1,2,3,3,3,3,0,2,0,2,0,0,3,2,1,2,2,
 3,0,3,3,2,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,0,3,2,3,0,2,2,2,3,
@@ -191,10 +189,12 @@ ThaiLangModel = ( \
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 )
 
-TIS620ThaiModel = { \
+TIS620ThaiModel = {
   'charToOrderMap': TIS620CharToOrderMap,
   'precedenceMatrix': ThaiLangModel,
   'mTypicalPositiveRatio': 0.926386,
-  'keepEnglishLetter': constants.False,
+  'keepEnglishLetter': False,
   'charsetName': "TIS-620"
 }
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/latin1prober.py b/lib/requests/packages/chardet/latin1prober.py
old mode 100755
new mode 100644
index b46129b..eef3573
--- a/lib/requests/packages/chardet/latin1prober.py
+++ b/lib/requests/packages/chardet/latin1prober.py
@@ -14,85 +14,86 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from charsetprober import CharSetProber
-import constants
-import operator
+from .charsetprober import CharSetProber
+from .constants import eNotMe
+from .compat import wrap_ord
 
 FREQ_CAT_NUM = 4
 
-UDF = 0 # undefined
-OTH = 1 # other
-ASC = 2 # ascii capital letter
-ASS = 3 # ascii small letter
-ACV = 4 # accent capital vowel
-ACO = 5 # accent capital other
-ASV = 6 # accent small vowel
-ASO = 7 # accent small other
-CLASS_NUM = 8 # total classes
+UDF = 0  # undefined
+OTH = 1  # other
+ASC = 2  # ascii capital letter
+ASS = 3  # ascii small letter
+ACV = 4  # accent capital vowel
+ACO = 5  # accent capital other
+ASV = 6  # accent small vowel
+ASO = 7  # accent small other
+CLASS_NUM = 8  # total classes
 
-Latin1_CharToClass = ( \
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 00 - 07
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 08 - 0F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 10 - 17
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 18 - 1F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 20 - 27
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 28 - 2F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 30 - 37
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 38 - 3F
-  OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 40 - 47
-  ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 48 - 4F
-  ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 50 - 57
-  ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,   # 58 - 5F
-  OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 60 - 67
-  ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 68 - 6F
-  ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 70 - 77
-  ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,   # 78 - 7F
-  OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH,   # 80 - 87
-  OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF,   # 88 - 8F
-  UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 90 - 97
-  OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO,   # 98 - 9F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A0 - A7
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A8 - AF
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B0 - B7
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B8 - BF
-  ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO,   # C0 - C7
-  ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,   # C8 - CF
-  ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH,   # D0 - D7
-  ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO,   # D8 - DF
-  ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO,   # E0 - E7
-  ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,   # E8 - EF
-  ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH,   # F0 - F7
-  ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF
+Latin1_CharToClass = (
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 00 - 07
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 08 - 0F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 10 - 17
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 18 - 1F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 20 - 27
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 28 - 2F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 30 - 37
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 38 - 3F
+    OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 40 - 47
+    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 48 - 4F
+    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 50 - 57
+    ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,   # 58 - 5F
+    OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 60 - 67
+    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 68 - 6F
+    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 70 - 77
+    ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,   # 78 - 7F
+    OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH,   # 80 - 87
+    OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF,   # 88 - 8F
+    UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 90 - 97
+    OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO,   # 98 - 9F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A0 - A7
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A8 - AF
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B0 - B7
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B8 - BF
+    ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO,   # C0 - C7
+    ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,   # C8 - CF
+    ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH,   # D0 - D7
+    ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO,   # D8 - DF
+    ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO,   # E0 - E7
+    ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,   # E8 - EF
+    ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH,   # F0 - F7
+    ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF
 )
 
-# 0 : illegal 
-# 1 : very unlikely 
-# 2 : normal 
+# 0 : illegal
+# 1 : very unlikely
+# 2 : normal
 # 3 : very likely
-Latin1ClassModel = ( \
-# UDF OTH ASC ASS ACV ACO ASV ASO
-   0,  0,  0,  0,  0,  0,  0,  0,  # UDF
-   0,  3,  3,  3,  3,  3,  3,  3,  # OTH
-   0,  3,  3,  3,  3,  3,  3,  3,  # ASC
-   0,  3,  3,  3,  1,  1,  3,  3,  # ASS
-   0,  3,  3,  3,  1,  2,  1,  2,  # ACV
-   0,  3,  3,  3,  3,  3,  3,  3,  # ACO
-   0,  3,  1,  3,  1,  1,  1,  3,  # ASV
-   0,  3,  1,  3,  1,  1,  3,  3,  # ASO
+Latin1ClassModel = (
+    # UDF OTH ASC ASS ACV ACO ASV ASO
+    0,  0,  0,  0,  0,  0,  0,  0,  # UDF
+    0,  3,  3,  3,  3,  3,  3,  3,  # OTH
+    0,  3,  3,  3,  3,  3,  3,  3,  # ASC
+    0,  3,  3,  3,  1,  1,  3,  3,  # ASS
+    0,  3,  3,  3,  1,  2,  1,  2,  # ACV
+    0,  3,  3,  3,  3,  3,  3,  3,  # ACO
+    0,  3,  1,  3,  1,  1,  1,  3,  # ASV
+    0,  3,  1,  3,  1,  1,  3,  3,  # ASO
 )
 
+
 class Latin1Prober(CharSetProber):
     def __init__(self):
         CharSetProber.__init__(self)
@@ -109,10 +110,11 @@ class Latin1Prober(CharSetProber):
     def feed(self, aBuf):
         aBuf = self.filter_with_english_letters(aBuf)
         for c in aBuf:
-            charClass = Latin1_CharToClass[ord(c)]
-            freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM) + charClass]
+            charClass = Latin1_CharToClass[wrap_ord(c)]
+            freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM)
+                                    + charClass]
             if freq == 0:
-                self._mState = constants.eNotMe
+                self._mState = eNotMe
                 break
             self._mFreqCounter[freq] += 1
             self._mLastCharClass = charClass
@@ -120,17 +122,18 @@ class Latin1Prober(CharSetProber):
         return self.get_state()
 
     def get_confidence(self):
-        if self.get_state() == constants.eNotMe:
+        if self.get_state() == eNotMe:
             return 0.01
-  
-        total = reduce(operator.add, self._mFreqCounter)
+
+        total = sum(self._mFreqCounter)
         if total < 0.01:
             confidence = 0.0
         else:
-            confidence = (self._mFreqCounter[3] / total) - (self._mFreqCounter[1] * 20.0 / total)
+            confidence = ((self._mFreqCounter[3] - self._mFreqCounter[1] * 20.0)
+                          / total)
         if confidence < 0.0:
             confidence = 0.0
-        # lower the confidence of latin1 so that other more accurate detector 
-        # can take priority.
-        confidence = confidence * 0.5
+        # lower the confidence of latin1 so that other more accurate
+        # detector can take priority.
+        confidence = confidence * 0.73
         return confidence
diff --git a/lib/requests/packages/chardet/mbcharsetprober.py b/lib/requests/packages/chardet/mbcharsetprober.py
old mode 100755
new mode 100644
index a813144..bb42f2f
--- a/lib/requests/packages/chardet/mbcharsetprober.py
+++ b/lib/requests/packages/chardet/mbcharsetprober.py
@@ -15,28 +15,29 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from constants import eStart, eError, eItsMe
-from charsetprober import CharSetProber
+import sys
+from . import constants
+from .charsetprober import CharSetProber
+
 
 class MultiByteCharSetProber(CharSetProber):
     def __init__(self):
         CharSetProber.__init__(self)
         self._mDistributionAnalyzer = None
         self._mCodingSM = None
-        self._mLastChar = ['\x00', '\x00']
+        self._mLastChar = [0, 0]
 
     def reset(self):
         CharSetProber.reset(self)
@@ -44,7 +45,7 @@ class MultiByteCharSetProber(CharSetProber):
             self._mCodingSM.reset()
         if self._mDistributionAnalyzer:
             self._mDistributionAnalyzer.reset()
-        self._mLastChar = ['\x00', '\x00']
+        self._mLastChar = [0, 0]
 
     def get_charset_name(self):
         pass
@@ -53,27 +54,30 @@ class MultiByteCharSetProber(CharSetProber):
         aLen = len(aBuf)
         for i in range(0, aLen):
             codingState = self._mCodingSM.next_state(aBuf[i])
-            if codingState == eError:
+            if codingState == constants.eError:
                 if constants._debug:
-                    sys.stderr.write(self.get_charset_name() + ' prober hit error at byte ' + str(i) + '\n')
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
                 self._mState = constants.eNotMe
                 break
-            elif codingState == eItsMe:
+            elif codingState == constants.eItsMe:
                 self._mState = constants.eFoundIt
                 break
-            elif codingState == eStart:
+            elif codingState == constants.eStart:
                 charLen = self._mCodingSM.get_current_charlen()
                 if i == 0:
                     self._mLastChar[1] = aBuf[0]
                     self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
                 else:
-                    self._mDistributionAnalyzer.feed(aBuf[i-1:i+1], charLen)
-                    
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
         self._mLastChar[0] = aBuf[aLen - 1]
-        
+
         if self.get_state() == constants.eDetecting:
-            if self._mDistributionAnalyzer.got_enough_data() and \
-               (self.get_confidence() > constants.SHORTCUT_THRESHOLD):
+            if (self._mDistributionAnalyzer.got_enough_data() and
+                    (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
                 self._mState = constants.eFoundIt
 
         return self.get_state()
diff --git a/lib/requests/packages/chardet/mbcsgroupprober.py b/lib/requests/packages/chardet/mbcsgroupprober.py
old mode 100755
new mode 100644
index 941cc3e..03c9dcf
--- a/lib/requests/packages/chardet/mbcsgroupprober.py
+++ b/lib/requests/packages/chardet/mbcsgroupprober.py
@@ -15,36 +15,40 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from charsetgroupprober import CharSetGroupProber
-from utf8prober import UTF8Prober
-from sjisprober import SJISProber
-from eucjpprober import EUCJPProber
-from gb2312prober import GB2312Prober
-from euckrprober import EUCKRProber
-from big5prober import Big5Prober
-from euctwprober import EUCTWProber
+from .charsetgroupprober import CharSetGroupProber
+from .utf8prober import UTF8Prober
+from .sjisprober import SJISProber
+from .eucjpprober import EUCJPProber
+from .gb2312prober import GB2312Prober
+from .euckrprober import EUCKRProber
+from .cp949prober import CP949Prober
+from .big5prober import Big5Prober
+from .euctwprober import EUCTWProber
+
 
 class MBCSGroupProber(CharSetGroupProber):
     def __init__(self):
         CharSetGroupProber.__init__(self)
-        self._mProbers = [ \
+        self._mProbers = [
             UTF8Prober(),
             SJISProber(),
             EUCJPProber(),
             GB2312Prober(),
             EUCKRProber(),
+            CP949Prober(),
             Big5Prober(),
-            EUCTWProber()]
+            EUCTWProber()
+        ]
         self.reset()
diff --git a/lib/requests/packages/chardet/mbcssm.py b/lib/requests/packages/chardet/mbcssm.py
old mode 100755
new mode 100644
index e46c1ff..efe678c
--- a/lib/requests/packages/chardet/mbcssm.py
+++ b/lib/requests/packages/chardet/mbcssm.py
@@ -13,60 +13,62 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from constants import eStart, eError, eItsMe
+from .constants import eStart, eError, eItsMe
 
-# BIG5 
+# BIG5
 
-BIG5_cls = ( \
+BIG5_cls = (
     1,1,1,1,1,1,1,1,  # 00 - 07    #allow 0x00 as legal value
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,1,  # 78 - 7f 
-    4,4,4,4,4,4,4,4,  # 80 - 87 
-    4,4,4,4,4,4,4,4,  # 88 - 8f 
-    4,4,4,4,4,4,4,4,  # 90 - 97 
-    4,4,4,4,4,4,4,4,  # 98 - 9f 
-    4,3,3,3,3,3,3,3,  # a0 - a7 
-    3,3,3,3,3,3,3,3,  # a8 - af 
-    3,3,3,3,3,3,3,3,  # b0 - b7 
-    3,3,3,3,3,3,3,3,  # b8 - bf 
-    3,3,3,3,3,3,3,3,  # c0 - c7 
-    3,3,3,3,3,3,3,3,  # c8 - cf 
-    3,3,3,3,3,3,3,3,  # d0 - d7 
-    3,3,3,3,3,3,3,3,  # d8 - df 
-    3,3,3,3,3,3,3,3,  # e0 - e7 
-    3,3,3,3,3,3,3,3,  # e8 - ef 
-    3,3,3,3,3,3,3,3,  # f0 - f7 
-    3,3,3,3,3,3,3,0)  # f8 - ff 
-
-BIG5_st = ( \
-    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07 
-    eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,#08-0f 
-    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart)#10-17 
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,1,  # 78 - 7f
+    4,4,4,4,4,4,4,4,  # 80 - 87
+    4,4,4,4,4,4,4,4,  # 88 - 8f
+    4,4,4,4,4,4,4,4,  # 90 - 97
+    4,4,4,4,4,4,4,4,  # 98 - 9f
+    4,3,3,3,3,3,3,3,  # a0 - a7
+    3,3,3,3,3,3,3,3,  # a8 - af
+    3,3,3,3,3,3,3,3,  # b0 - b7
+    3,3,3,3,3,3,3,3,  # b8 - bf
+    3,3,3,3,3,3,3,3,  # c0 - c7
+    3,3,3,3,3,3,3,3,  # c8 - cf
+    3,3,3,3,3,3,3,3,  # d0 - d7
+    3,3,3,3,3,3,3,3,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,3,3,3,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,3,3,0  # f8 - ff
+)
+
+BIG5_st = (
+    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07
+    eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,#08-0f
+    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart#10-17
+)
 
 Big5CharLenTable = (0, 1, 1, 2, 0)
 
@@ -76,48 +78,90 @@ Big5SMModel = {'classTable': BIG5_cls,
                'charLenTable': Big5CharLenTable,
                'name': 'Big5'}
 
+# CP949
+
+CP949_cls  = (
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,  # 00 - 0f
+    1,1,1,1,1,1,1,1, 1,1,1,0,1,1,1,1,  # 10 - 1f
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,  # 20 - 2f
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,  # 30 - 3f
+    1,4,4,4,4,4,4,4, 4,4,4,4,4,4,4,4,  # 40 - 4f
+    4,4,5,5,5,5,5,5, 5,5,5,1,1,1,1,1,  # 50 - 5f
+    1,5,5,5,5,5,5,5, 5,5,5,5,5,5,5,5,  # 60 - 6f
+    5,5,5,5,5,5,5,5, 5,5,5,1,1,1,1,1,  # 70 - 7f
+    0,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6,  # 80 - 8f
+    6,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6,  # 90 - 9f
+    6,7,7,7,7,7,7,7, 7,7,7,7,7,8,8,8,  # a0 - af
+    7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,  # b0 - bf
+    7,7,7,7,7,7,9,2, 2,3,2,2,2,2,2,2,  # c0 - cf
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,  # d0 - df
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,  # e0 - ef
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,0,  # f0 - ff
+)
+
+CP949_st = (
+#cls=    0      1      2      3      4      5      6      7      8      9  # previous state =
+    eError,eStart,     3,eError,eStart,eStart,     4,     5,eError,     6, # eStart
+    eError,eError,eError,eError,eError,eError,eError,eError,eError,eError, # eError
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe, # eItsMe
+    eError,eError,eStart,eStart,eError,eError,eError,eStart,eStart,eStart, # 3
+    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 4
+    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 5
+    eError,eStart,eStart,eStart,eStart,eError,eError,eStart,eStart,eStart, # 6
+)
+
+CP949CharLenTable = (0, 1, 2, 0, 1, 1, 2, 2, 0, 2)
+
+CP949SMModel = {'classTable': CP949_cls,
+                'classFactor': 10,
+                'stateTable': CP949_st,
+                'charLenTable': CP949CharLenTable,
+                'name': 'CP949'}
+
 # EUC-JP
 
-EUCJP_cls = ( \
-    4,4,4,4,4,4,4,4,  # 00 - 07 
-    4,4,4,4,4,4,5,5,  # 08 - 0f 
-    4,4,4,4,4,4,4,4,  # 10 - 17 
-    4,4,4,5,4,4,4,4,  # 18 - 1f 
-    4,4,4,4,4,4,4,4,  # 20 - 27 
-    4,4,4,4,4,4,4,4,  # 28 - 2f 
-    4,4,4,4,4,4,4,4,  # 30 - 37 
-    4,4,4,4,4,4,4,4,  # 38 - 3f 
-    4,4,4,4,4,4,4,4,  # 40 - 47 
-    4,4,4,4,4,4,4,4,  # 48 - 4f 
-    4,4,4,4,4,4,4,4,  # 50 - 57 
-    4,4,4,4,4,4,4,4,  # 58 - 5f 
-    4,4,4,4,4,4,4,4,  # 60 - 67 
-    4,4,4,4,4,4,4,4,  # 68 - 6f 
-    4,4,4,4,4,4,4,4,  # 70 - 77 
-    4,4,4,4,4,4,4,4,  # 78 - 7f 
-    5,5,5,5,5,5,5,5,  # 80 - 87 
-    5,5,5,5,5,5,1,3,  # 88 - 8f 
-    5,5,5,5,5,5,5,5,  # 90 - 97 
-    5,5,5,5,5,5,5,5,  # 98 - 9f 
-    5,2,2,2,2,2,2,2,  # a0 - a7 
-    2,2,2,2,2,2,2,2,  # a8 - af 
-    2,2,2,2,2,2,2,2,  # b0 - b7 
-    2,2,2,2,2,2,2,2,  # b8 - bf 
-    2,2,2,2,2,2,2,2,  # c0 - c7 
-    2,2,2,2,2,2,2,2,  # c8 - cf 
-    2,2,2,2,2,2,2,2,  # d0 - d7 
-    2,2,2,2,2,2,2,2,  # d8 - df 
-    0,0,0,0,0,0,0,0,  # e0 - e7 
-    0,0,0,0,0,0,0,0,  # e8 - ef 
-    0,0,0,0,0,0,0,0,  # f0 - f7 
-    0,0,0,0,0,0,0,5)  # f8 - ff 
-
-EUCJP_st = ( \
-          3,     4,     3,     5,eStart,eError,eError,eError,#00-07 
-     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-     eItsMe,eItsMe,eStart,eError,eStart,eError,eError,eError,#10-17 
-     eError,eError,eStart,eError,eError,eError,     3,eError,#18-1f 
-          3,eError,eError,eError,eStart,eStart,eStart,eStart)#20-27 
+EUCJP_cls = (
+    4,4,4,4,4,4,4,4,  # 00 - 07
+    4,4,4,4,4,4,5,5,  # 08 - 0f
+    4,4,4,4,4,4,4,4,  # 10 - 17
+    4,4,4,5,4,4,4,4,  # 18 - 1f
+    4,4,4,4,4,4,4,4,  # 20 - 27
+    4,4,4,4,4,4,4,4,  # 28 - 2f
+    4,4,4,4,4,4,4,4,  # 30 - 37
+    4,4,4,4,4,4,4,4,  # 38 - 3f
+    4,4,4,4,4,4,4,4,  # 40 - 47
+    4,4,4,4,4,4,4,4,  # 48 - 4f
+    4,4,4,4,4,4,4,4,  # 50 - 57
+    4,4,4,4,4,4,4,4,  # 58 - 5f
+    4,4,4,4,4,4,4,4,  # 60 - 67
+    4,4,4,4,4,4,4,4,  # 68 - 6f
+    4,4,4,4,4,4,4,4,  # 70 - 77
+    4,4,4,4,4,4,4,4,  # 78 - 7f
+    5,5,5,5,5,5,5,5,  # 80 - 87
+    5,5,5,5,5,5,1,3,  # 88 - 8f
+    5,5,5,5,5,5,5,5,  # 90 - 97
+    5,5,5,5,5,5,5,5,  # 98 - 9f
+    5,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,2,2,2,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,2,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,0,5  # f8 - ff
+)
+
+EUCJP_st = (
+          3,     4,     3,     5,eStart,eError,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,eStart,eError,eStart,eError,eError,eError,#10-17
+     eError,eError,eStart,eError,eError,eError,     3,eError,#18-1f
+          3,eError,eError,eError,eStart,eStart,eStart,eStart#20-27
+)
 
 EUCJPCharLenTable = (2, 2, 2, 3, 1, 0)
 
@@ -129,43 +173,45 @@ EUCJPSMModel = {'classTable': EUCJP_cls,
 
 # EUC-KR
 
-EUCKR_cls  = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07 
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    1,1,1,1,1,1,1,1,  # 40 - 47 
-    1,1,1,1,1,1,1,1,  # 48 - 4f 
-    1,1,1,1,1,1,1,1,  # 50 - 57 
-    1,1,1,1,1,1,1,1,  # 58 - 5f 
-    1,1,1,1,1,1,1,1,  # 60 - 67 
-    1,1,1,1,1,1,1,1,  # 68 - 6f 
-    1,1,1,1,1,1,1,1,  # 70 - 77 
-    1,1,1,1,1,1,1,1,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,0,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,2,2,2,2,2,2,2,  # a0 - a7 
-    2,2,2,2,2,3,3,3,  # a8 - af 
-    2,2,2,2,2,2,2,2,  # b0 - b7 
-    2,2,2,2,2,2,2,2,  # b8 - bf 
-    2,2,2,2,2,2,2,2,  # c0 - c7 
-    2,3,2,2,2,2,2,2,  # c8 - cf 
-    2,2,2,2,2,2,2,2,  # d0 - d7 
-    2,2,2,2,2,2,2,2,  # d8 - df 
-    2,2,2,2,2,2,2,2,  # e0 - e7 
-    2,2,2,2,2,2,2,2,  # e8 - ef 
-    2,2,2,2,2,2,2,2,  # f0 - f7 
-    2,2,2,2,2,2,2,0)  # f8 - ff 
+EUCKR_cls  = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    1,1,1,1,1,1,1,1,  # 40 - 47
+    1,1,1,1,1,1,1,1,  # 48 - 4f
+    1,1,1,1,1,1,1,1,  # 50 - 57
+    1,1,1,1,1,1,1,1,  # 58 - 5f
+    1,1,1,1,1,1,1,1,  # 60 - 67
+    1,1,1,1,1,1,1,1,  # 68 - 6f
+    1,1,1,1,1,1,1,1,  # 70 - 77
+    1,1,1,1,1,1,1,1,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,3,3,3,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,3,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    2,2,2,2,2,2,2,2,  # e0 - e7
+    2,2,2,2,2,2,2,2,  # e8 - ef
+    2,2,2,2,2,2,2,2,  # f0 - f7
+    2,2,2,2,2,2,2,0   # f8 - ff
+)
 
 EUCKR_st = (
-    eError,eStart,     3,eError,eError,eError,eError,eError,#00-07 
-    eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,eStart)#08-0f 
+    eError,eStart,     3,eError,eError,eError,eError,eError,#00-07
+    eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,eStart #08-0f
+)
 
 EUCKRCharLenTable = (0, 1, 2, 0)
 
@@ -177,47 +223,49 @@ EUCKRSMModel = {'classTable': EUCKR_cls,
 
 # EUC-TW
 
-EUCTW_cls = ( \
-    2,2,2,2,2,2,2,2,  # 00 - 07 
-    2,2,2,2,2,2,0,0,  # 08 - 0f 
-    2,2,2,2,2,2,2,2,  # 10 - 17 
-    2,2,2,0,2,2,2,2,  # 18 - 1f 
-    2,2,2,2,2,2,2,2,  # 20 - 27 
-    2,2,2,2,2,2,2,2,  # 28 - 2f 
-    2,2,2,2,2,2,2,2,  # 30 - 37 
-    2,2,2,2,2,2,2,2,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,2,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,6,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,3,4,4,4,4,4,4,  # a0 - a7 
-    5,5,1,1,1,1,1,1,  # a8 - af 
-    1,1,1,1,1,1,1,1,  # b0 - b7 
-    1,1,1,1,1,1,1,1,  # b8 - bf 
-    1,1,3,1,3,3,3,3,  # c0 - c7 
-    3,3,3,3,3,3,3,3,  # c8 - cf 
-    3,3,3,3,3,3,3,3,  # d0 - d7 
-    3,3,3,3,3,3,3,3,  # d8 - df 
-    3,3,3,3,3,3,3,3,  # e0 - e7 
-    3,3,3,3,3,3,3,3,  # e8 - ef 
-    3,3,3,3,3,3,3,3,  # f0 - f7 
-    3,3,3,3,3,3,3,0)  # f8 - ff 
-
-EUCTW_st = ( \
-    eError,eError,eStart,     3,     3,     3,     4,eError,#00-07 
-    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eStart,eError,#10-17 
-    eStart,eStart,eStart,eError,eError,eError,eError,eError,#18-1f 
-         5,eError,eError,eError,eStart,eError,eStart,eStart,#20-27 
-    eStart,eError,eStart,eStart,eStart,eStart,eStart,eStart)#28-2f 
+EUCTW_cls = (
+    2,2,2,2,2,2,2,2,  # 00 - 07
+    2,2,2,2,2,2,0,0,  # 08 - 0f
+    2,2,2,2,2,2,2,2,  # 10 - 17
+    2,2,2,0,2,2,2,2,  # 18 - 1f
+    2,2,2,2,2,2,2,2,  # 20 - 27
+    2,2,2,2,2,2,2,2,  # 28 - 2f
+    2,2,2,2,2,2,2,2,  # 30 - 37
+    2,2,2,2,2,2,2,2,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,2,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,6,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,3,4,4,4,4,4,4,  # a0 - a7
+    5,5,1,1,1,1,1,1,  # a8 - af
+    1,1,1,1,1,1,1,1,  # b0 - b7
+    1,1,1,1,1,1,1,1,  # b8 - bf
+    1,1,3,1,3,3,3,3,  # c0 - c7
+    3,3,3,3,3,3,3,3,  # c8 - cf
+    3,3,3,3,3,3,3,3,  # d0 - d7
+    3,3,3,3,3,3,3,3,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,3,3,3,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,3,3,0   # f8 - ff
+)
+
+EUCTW_st = (
+    eError,eError,eStart,     3,     3,     3,     4,eError,#00-07
+    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eStart,eError,#10-17
+    eStart,eStart,eStart,eError,eError,eError,eError,eError,#18-1f
+         5,eError,eError,eError,eStart,eError,eStart,eStart,#20-27
+    eStart,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
+)
 
 EUCTWCharLenTable = (0, 0, 1, 2, 2, 2, 3)
 
@@ -229,53 +277,55 @@ EUCTWSMModel = {'classTable': EUCTW_cls,
 
 # GB2312
 
-GB2312_cls = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07 
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    3,3,3,3,3,3,3,3,  # 30 - 37 
-    3,3,1,1,1,1,1,1,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,4,  # 78 - 7f 
-    5,6,6,6,6,6,6,6,  # 80 - 87 
-    6,6,6,6,6,6,6,6,  # 88 - 8f 
-    6,6,6,6,6,6,6,6,  # 90 - 97 
-    6,6,6,6,6,6,6,6,  # 98 - 9f 
-    6,6,6,6,6,6,6,6,  # a0 - a7 
-    6,6,6,6,6,6,6,6,  # a8 - af 
-    6,6,6,6,6,6,6,6,  # b0 - b7 
-    6,6,6,6,6,6,6,6,  # b8 - bf 
-    6,6,6,6,6,6,6,6,  # c0 - c7 
-    6,6,6,6,6,6,6,6,  # c8 - cf 
-    6,6,6,6,6,6,6,6,  # d0 - d7 
-    6,6,6,6,6,6,6,6,  # d8 - df 
-    6,6,6,6,6,6,6,6,  # e0 - e7 
-    6,6,6,6,6,6,6,6,  # e8 - ef 
-    6,6,6,6,6,6,6,6,  # f0 - f7 
-    6,6,6,6,6,6,6,0)  # f8 - ff 
-
-GB2312_st = ( \
-    eError,eStart,eStart,eStart,eStart,eStart,     3,eError,#00-07 
-    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,#10-17 
-         4,eError,eStart,eStart,eError,eError,eError,eError,#18-1f 
-    eError,eError,     5,eError,eError,eError,eItsMe,eError,#20-27 
-    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart)#28-2f 
-
-# To be accurate, the length of class 6 can be either 2 or 4. 
-# But it is not necessary to discriminate between the two since 
-# it is used for frequency analysis only, and we are validing 
-# each code range there as well. So it is safe to set it to be 
-# 2 here. 
+GB2312_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    3,3,3,3,3,3,3,3,  # 30 - 37
+    3,3,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,4,  # 78 - 7f
+    5,6,6,6,6,6,6,6,  # 80 - 87
+    6,6,6,6,6,6,6,6,  # 88 - 8f
+    6,6,6,6,6,6,6,6,  # 90 - 97
+    6,6,6,6,6,6,6,6,  # 98 - 9f
+    6,6,6,6,6,6,6,6,  # a0 - a7
+    6,6,6,6,6,6,6,6,  # a8 - af
+    6,6,6,6,6,6,6,6,  # b0 - b7
+    6,6,6,6,6,6,6,6,  # b8 - bf
+    6,6,6,6,6,6,6,6,  # c0 - c7
+    6,6,6,6,6,6,6,6,  # c8 - cf
+    6,6,6,6,6,6,6,6,  # d0 - d7
+    6,6,6,6,6,6,6,6,  # d8 - df
+    6,6,6,6,6,6,6,6,  # e0 - e7
+    6,6,6,6,6,6,6,6,  # e8 - ef
+    6,6,6,6,6,6,6,6,  # f0 - f7
+    6,6,6,6,6,6,6,0   # f8 - ff
+)
+
+GB2312_st = (
+    eError,eStart,eStart,eStart,eStart,eStart,     3,eError,#00-07
+    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,#10-17
+         4,eError,eStart,eStart,eError,eError,eError,eError,#18-1f
+    eError,eError,     5,eError,eError,eError,eItsMe,eError,#20-27
+    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
+)
+
+# To be accurate, the length of class 6 can be either 2 or 4.
+# But it is not necessary to discriminate between the two since
+# it is used for frequency analysis only, and we are validing
+# each code range there as well. So it is safe to set it to be
+# 2 here.
 GB2312CharLenTable = (0, 1, 1, 1, 1, 1, 2)
 
 GB2312SMModel = {'classTable': GB2312_cls,
@@ -286,46 +336,48 @@ GB2312SMModel = {'classTable': GB2312_cls,
 
 # Shift_JIS
 
-SJIS_cls = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07 
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,1,  # 78 - 7f 
-    3,3,3,3,3,3,3,3,  # 80 - 87 
-    3,3,3,3,3,3,3,3,  # 88 - 8f 
-    3,3,3,3,3,3,3,3,  # 90 - 97 
-    3,3,3,3,3,3,3,3,  # 98 - 9f 
-    #0xa0 is illegal in sjis encoding, but some pages does 
+SJIS_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,1,  # 78 - 7f
+    3,3,3,3,3,2,2,3,  # 80 - 87
+    3,3,3,3,3,3,3,3,  # 88 - 8f
+    3,3,3,3,3,3,3,3,  # 90 - 97
+    3,3,3,3,3,3,3,3,  # 98 - 9f
+    #0xa0 is illegal in sjis encoding, but some pages does
     #contain such byte. We need to be more error forgiven.
-    2,2,2,2,2,2,2,2,  # a0 - a7     
-    2,2,2,2,2,2,2,2,  # a8 - af 
-    2,2,2,2,2,2,2,2,  # b0 - b7 
-    2,2,2,2,2,2,2,2,  # b8 - bf 
-    2,2,2,2,2,2,2,2,  # c0 - c7 
-    2,2,2,2,2,2,2,2,  # c8 - cf 
-    2,2,2,2,2,2,2,2,  # d0 - d7 
-    2,2,2,2,2,2,2,2,  # d8 - df 
-    3,3,3,3,3,3,3,3,  # e0 - e7 
-    3,3,3,3,3,4,4,4,  # e8 - ef 
-    4,4,4,4,4,4,4,4,  # f0 - f7 
-    4,4,4,4,4,0,0,0)  # f8 - ff 
-
-SJIS_st = ( \
-    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07 
-    eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-    eItsMe,eItsMe,eError,eError,eStart,eStart,eStart,eStart)#10-17 
+    2,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,2,2,2,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,2,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,4,4,4,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,0,0,0)  # f8 - ff
+
+
+SJIS_st = (
+    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07
+    eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eError,eError,eStart,eStart,eStart,eStart #10-17
+)
 
 SJISCharLenTable = (0, 1, 1, 2, 0, 0)
 
@@ -337,48 +389,50 @@ SJISSMModel = {'classTable': SJIS_cls,
 
 # UCS2-BE
 
-UCS2BE_cls = ( \
-    0,0,0,0,0,0,0,0,  # 00 - 07 
-    0,0,1,0,0,2,0,0,  # 08 - 0f 
-    0,0,0,0,0,0,0,0,  # 10 - 17 
-    0,0,0,3,0,0,0,0,  # 18 - 1f 
-    0,0,0,0,0,0,0,0,  # 20 - 27 
-    0,3,3,3,3,3,0,0,  # 28 - 2f 
-    0,0,0,0,0,0,0,0,  # 30 - 37 
-    0,0,0,0,0,0,0,0,  # 38 - 3f 
-    0,0,0,0,0,0,0,0,  # 40 - 47 
-    0,0,0,0,0,0,0,0,  # 48 - 4f 
-    0,0,0,0,0,0,0,0,  # 50 - 57 
-    0,0,0,0,0,0,0,0,  # 58 - 5f 
-    0,0,0,0,0,0,0,0,  # 60 - 67 
-    0,0,0,0,0,0,0,0,  # 68 - 6f 
-    0,0,0,0,0,0,0,0,  # 70 - 77 
-    0,0,0,0,0,0,0,0,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,0,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,0,0,0,0,0,0,0,  # a0 - a7 
-    0,0,0,0,0,0,0,0,  # a8 - af 
-    0,0,0,0,0,0,0,0,  # b0 - b7 
-    0,0,0,0,0,0,0,0,  # b8 - bf 
-    0,0,0,0,0,0,0,0,  # c0 - c7 
-    0,0,0,0,0,0,0,0,  # c8 - cf 
-    0,0,0,0,0,0,0,0,  # d0 - d7 
-    0,0,0,0,0,0,0,0,  # d8 - df 
-    0,0,0,0,0,0,0,0,  # e0 - e7 
-    0,0,0,0,0,0,0,0,  # e8 - ef 
-    0,0,0,0,0,0,0,0,  # f0 - f7 
-    0,0,0,0,0,0,4,5)  # f8 - ff 
-
-UCS2BE_st  = ( \
-          5,     7,     7,eError,     4,     3,eError,eError,#00-07 
-     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-     eItsMe,eItsMe,     6,     6,     6,     6,eError,eError,#10-17 
-          6,     6,     6,     6,     6,eItsMe,     6,     6,#18-1f 
-          6,     6,     6,     6,     5,     7,     7,eError,#20-27 
-          5,     8,     6,     6,eError,     6,     6,     6,#28-2f 
-          6,     6,     6,     6,eError,eError,eStart,eStart)#30-37 
+UCS2BE_cls = (
+    0,0,0,0,0,0,0,0,  # 00 - 07
+    0,0,1,0,0,2,0,0,  # 08 - 0f
+    0,0,0,0,0,0,0,0,  # 10 - 17
+    0,0,0,3,0,0,0,0,  # 18 - 1f
+    0,0,0,0,0,0,0,0,  # 20 - 27
+    0,3,3,3,3,3,0,0,  # 28 - 2f
+    0,0,0,0,0,0,0,0,  # 30 - 37
+    0,0,0,0,0,0,0,0,  # 38 - 3f
+    0,0,0,0,0,0,0,0,  # 40 - 47
+    0,0,0,0,0,0,0,0,  # 48 - 4f
+    0,0,0,0,0,0,0,0,  # 50 - 57
+    0,0,0,0,0,0,0,0,  # 58 - 5f
+    0,0,0,0,0,0,0,0,  # 60 - 67
+    0,0,0,0,0,0,0,0,  # 68 - 6f
+    0,0,0,0,0,0,0,0,  # 70 - 77
+    0,0,0,0,0,0,0,0,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,0,0,0,0,0,0,0,  # a0 - a7
+    0,0,0,0,0,0,0,0,  # a8 - af
+    0,0,0,0,0,0,0,0,  # b0 - b7
+    0,0,0,0,0,0,0,0,  # b8 - bf
+    0,0,0,0,0,0,0,0,  # c0 - c7
+    0,0,0,0,0,0,0,0,  # c8 - cf
+    0,0,0,0,0,0,0,0,  # d0 - d7
+    0,0,0,0,0,0,0,0,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,4,5   # f8 - ff
+)
+
+UCS2BE_st  = (
+          5,     7,     7,eError,     4,     3,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,     6,     6,     6,     6,eError,eError,#10-17
+          6,     6,     6,     6,     6,eItsMe,     6,     6,#18-1f
+          6,     6,     6,     6,     5,     7,     7,eError,#20-27
+          5,     8,     6,     6,eError,     6,     6,     6,#28-2f
+          6,     6,     6,     6,eError,eError,eStart,eStart #30-37
+)
 
 UCS2BECharLenTable = (2, 2, 2, 0, 2, 2)
 
@@ -390,48 +444,50 @@ UCS2BESMModel = {'classTable': UCS2BE_cls,
 
 # UCS2-LE
 
-UCS2LE_cls = ( \
-    0,0,0,0,0,0,0,0,  # 00 - 07 
-    0,0,1,0,0,2,0,0,  # 08 - 0f 
-    0,0,0,0,0,0,0,0,  # 10 - 17 
-    0,0,0,3,0,0,0,0,  # 18 - 1f 
-    0,0,0,0,0,0,0,0,  # 20 - 27 
-    0,3,3,3,3,3,0,0,  # 28 - 2f 
-    0,0,0,0,0,0,0,0,  # 30 - 37 
-    0,0,0,0,0,0,0,0,  # 38 - 3f 
-    0,0,0,0,0,0,0,0,  # 40 - 47 
-    0,0,0,0,0,0,0,0,  # 48 - 4f 
-    0,0,0,0,0,0,0,0,  # 50 - 57 
-    0,0,0,0,0,0,0,0,  # 58 - 5f 
-    0,0,0,0,0,0,0,0,  # 60 - 67 
-    0,0,0,0,0,0,0,0,  # 68 - 6f 
-    0,0,0,0,0,0,0,0,  # 70 - 77 
-    0,0,0,0,0,0,0,0,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,0,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,0,0,0,0,0,0,0,  # a0 - a7 
-    0,0,0,0,0,0,0,0,  # a8 - af 
-    0,0,0,0,0,0,0,0,  # b0 - b7 
-    0,0,0,0,0,0,0,0,  # b8 - bf 
-    0,0,0,0,0,0,0,0,  # c0 - c7 
-    0,0,0,0,0,0,0,0,  # c8 - cf 
-    0,0,0,0,0,0,0,0,  # d0 - d7 
-    0,0,0,0,0,0,0,0,  # d8 - df 
-    0,0,0,0,0,0,0,0,  # e0 - e7 
-    0,0,0,0,0,0,0,0,  # e8 - ef 
-    0,0,0,0,0,0,0,0,  # f0 - f7 
-    0,0,0,0,0,0,4,5)  # f8 - ff 
-
-UCS2LE_st = ( \
-          6,     6,     7,     6,     4,     3,eError,eError,#00-07 
-     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-     eItsMe,eItsMe,     5,     5,     5,eError,eItsMe,eError,#10-17 
-          5,     5,     5,eError,     5,eError,     6,     6,#18-1f 
-          7,     6,     8,     8,     5,     5,     5,eError,#20-27 
-          5,     5,     5,eError,eError,eError,     5,     5,#28-2f 
-          5,     5,     5,eError,     5,eError,eStart,eStart)#30-37 
+UCS2LE_cls = (
+    0,0,0,0,0,0,0,0,  # 00 - 07
+    0,0,1,0,0,2,0,0,  # 08 - 0f
+    0,0,0,0,0,0,0,0,  # 10 - 17
+    0,0,0,3,0,0,0,0,  # 18 - 1f
+    0,0,0,0,0,0,0,0,  # 20 - 27
+    0,3,3,3,3,3,0,0,  # 28 - 2f
+    0,0,0,0,0,0,0,0,  # 30 - 37
+    0,0,0,0,0,0,0,0,  # 38 - 3f
+    0,0,0,0,0,0,0,0,  # 40 - 47
+    0,0,0,0,0,0,0,0,  # 48 - 4f
+    0,0,0,0,0,0,0,0,  # 50 - 57
+    0,0,0,0,0,0,0,0,  # 58 - 5f
+    0,0,0,0,0,0,0,0,  # 60 - 67
+    0,0,0,0,0,0,0,0,  # 68 - 6f
+    0,0,0,0,0,0,0,0,  # 70 - 77
+    0,0,0,0,0,0,0,0,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,0,0,0,0,0,0,0,  # a0 - a7
+    0,0,0,0,0,0,0,0,  # a8 - af
+    0,0,0,0,0,0,0,0,  # b0 - b7
+    0,0,0,0,0,0,0,0,  # b8 - bf
+    0,0,0,0,0,0,0,0,  # c0 - c7
+    0,0,0,0,0,0,0,0,  # c8 - cf
+    0,0,0,0,0,0,0,0,  # d0 - d7
+    0,0,0,0,0,0,0,0,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,4,5   # f8 - ff
+)
+
+UCS2LE_st = (
+          6,     6,     7,     6,     4,     3,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,     5,     5,     5,eError,eItsMe,eError,#10-17
+          5,     5,     5,eError,     5,eError,     6,     6,#18-1f
+          7,     6,     8,     8,     5,     5,     5,eError,#20-27
+          5,     5,     5,eError,eError,eError,     5,     5,#28-2f
+          5,     5,     5,eError,     5,eError,eStart,eStart #30-37
+)
 
 UCS2LECharLenTable = (2, 2, 2, 2, 2, 2)
 
@@ -443,67 +499,69 @@ UCS2LESMModel = {'classTable': UCS2LE_cls,
 
 # UTF-8
 
-UTF8_cls = ( \
+UTF8_cls = (
     1,1,1,1,1,1,1,1,  # 00 - 07  #allow 0x00 as a legal value
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    1,1,1,1,1,1,1,1,  # 40 - 47 
-    1,1,1,1,1,1,1,1,  # 48 - 4f 
-    1,1,1,1,1,1,1,1,  # 50 - 57 
-    1,1,1,1,1,1,1,1,  # 58 - 5f 
-    1,1,1,1,1,1,1,1,  # 60 - 67 
-    1,1,1,1,1,1,1,1,  # 68 - 6f 
-    1,1,1,1,1,1,1,1,  # 70 - 77 
-    1,1,1,1,1,1,1,1,  # 78 - 7f 
-    2,2,2,2,3,3,3,3,  # 80 - 87 
-    4,4,4,4,4,4,4,4,  # 88 - 8f 
-    4,4,4,4,4,4,4,4,  # 90 - 97 
-    4,4,4,4,4,4,4,4,  # 98 - 9f 
-    5,5,5,5,5,5,5,5,  # a0 - a7 
-    5,5,5,5,5,5,5,5,  # a8 - af 
-    5,5,5,5,5,5,5,5,  # b0 - b7 
-    5,5,5,5,5,5,5,5,  # b8 - bf 
-    0,0,6,6,6,6,6,6,  # c0 - c7 
-    6,6,6,6,6,6,6,6,  # c8 - cf 
-    6,6,6,6,6,6,6,6,  # d0 - d7 
-    6,6,6,6,6,6,6,6,  # d8 - df 
-    7,8,8,8,8,8,8,8,  # e0 - e7 
-    8,8,8,8,8,9,8,8,  # e8 - ef 
-    10,11,11,11,11,11,11,11,  # f0 - f7 
-    12,13,13,13,14,15,0,0)   # f8 - ff 
-
-UTF8_st = ( \
-    eError,eStart,eError,eError,eError,eError,     12,   10,#00-07 
-         9,     11,     8,     7,     6,     5,     4,    3,#08-0f 
-    eError,eError,eError,eError,eError,eError,eError,eError,#10-17 
-    eError,eError,eError,eError,eError,eError,eError,eError,#18-1f 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#20-27 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#28-2f 
-    eError,eError,     5,     5,     5,     5,eError,eError,#30-37 
-    eError,eError,eError,eError,eError,eError,eError,eError,#38-3f 
-    eError,eError,eError,     5,     5,     5,eError,eError,#40-47 
-    eError,eError,eError,eError,eError,eError,eError,eError,#48-4f 
-    eError,eError,     7,     7,     7,     7,eError,eError,#50-57 
-    eError,eError,eError,eError,eError,eError,eError,eError,#58-5f 
-    eError,eError,eError,eError,     7,     7,eError,eError,#60-67 
-    eError,eError,eError,eError,eError,eError,eError,eError,#68-6f 
-    eError,eError,     9,     9,     9,     9,eError,eError,#70-77 
-    eError,eError,eError,eError,eError,eError,eError,eError,#78-7f 
-    eError,eError,eError,eError,eError,     9,eError,eError,#80-87 
-    eError,eError,eError,eError,eError,eError,eError,eError,#88-8f 
-    eError,eError,    12,    12,    12,    12,eError,eError,#90-97 
-    eError,eError,eError,eError,eError,eError,eError,eError,#98-9f 
-    eError,eError,eError,eError,eError,    12,eError,eError,#a0-a7 
-    eError,eError,eError,eError,eError,eError,eError,eError,#a8-af 
-    eError,eError,    12,    12,    12,eError,eError,eError,#b0-b7 
-    eError,eError,eError,eError,eError,eError,eError,eError,#b8-bf 
-    eError,eError,eStart,eStart,eStart,eStart,eError,eError,#c0-c7 
-    eError,eError,eError,eError,eError,eError,eError,eError)#c8-cf 
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    1,1,1,1,1,1,1,1,  # 40 - 47
+    1,1,1,1,1,1,1,1,  # 48 - 4f
+    1,1,1,1,1,1,1,1,  # 50 - 57
+    1,1,1,1,1,1,1,1,  # 58 - 5f
+    1,1,1,1,1,1,1,1,  # 60 - 67
+    1,1,1,1,1,1,1,1,  # 68 - 6f
+    1,1,1,1,1,1,1,1,  # 70 - 77
+    1,1,1,1,1,1,1,1,  # 78 - 7f
+    2,2,2,2,3,3,3,3,  # 80 - 87
+    4,4,4,4,4,4,4,4,  # 88 - 8f
+    4,4,4,4,4,4,4,4,  # 90 - 97
+    4,4,4,4,4,4,4,4,  # 98 - 9f
+    5,5,5,5,5,5,5,5,  # a0 - a7
+    5,5,5,5,5,5,5,5,  # a8 - af
+    5,5,5,5,5,5,5,5,  # b0 - b7
+    5,5,5,5,5,5,5,5,  # b8 - bf
+    0,0,6,6,6,6,6,6,  # c0 - c7
+    6,6,6,6,6,6,6,6,  # c8 - cf
+    6,6,6,6,6,6,6,6,  # d0 - d7
+    6,6,6,6,6,6,6,6,  # d8 - df
+    7,8,8,8,8,8,8,8,  # e0 - e7
+    8,8,8,8,8,9,8,8,  # e8 - ef
+    10,11,11,11,11,11,11,11,  # f0 - f7
+    12,13,13,13,14,15,0,0    # f8 - ff
+)
+
+UTF8_st = (
+    eError,eStart,eError,eError,eError,eError,     12,   10,#00-07
+         9,     11,     8,     7,     6,     5,     4,    3,#08-0f
+    eError,eError,eError,eError,eError,eError,eError,eError,#10-17
+    eError,eError,eError,eError,eError,eError,eError,eError,#18-1f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#20-27
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#28-2f
+    eError,eError,     5,     5,     5,     5,eError,eError,#30-37
+    eError,eError,eError,eError,eError,eError,eError,eError,#38-3f
+    eError,eError,eError,     5,     5,     5,eError,eError,#40-47
+    eError,eError,eError,eError,eError,eError,eError,eError,#48-4f
+    eError,eError,     7,     7,     7,     7,eError,eError,#50-57
+    eError,eError,eError,eError,eError,eError,eError,eError,#58-5f
+    eError,eError,eError,eError,     7,     7,eError,eError,#60-67
+    eError,eError,eError,eError,eError,eError,eError,eError,#68-6f
+    eError,eError,     9,     9,     9,     9,eError,eError,#70-77
+    eError,eError,eError,eError,eError,eError,eError,eError,#78-7f
+    eError,eError,eError,eError,eError,     9,eError,eError,#80-87
+    eError,eError,eError,eError,eError,eError,eError,eError,#88-8f
+    eError,eError,    12,    12,    12,    12,eError,eError,#90-97
+    eError,eError,eError,eError,eError,eError,eError,eError,#98-9f
+    eError,eError,eError,eError,eError,    12,eError,eError,#a0-a7
+    eError,eError,eError,eError,eError,eError,eError,eError,#a8-af
+    eError,eError,    12,    12,    12,eError,eError,eError,#b0-b7
+    eError,eError,eError,eError,eError,eError,eError,eError,#b8-bf
+    eError,eError,eStart,eStart,eStart,eStart,eError,eError,#c0-c7
+    eError,eError,eError,eError,eError,eError,eError,eError #c8-cf
+)
 
 UTF8CharLenTable = (0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6)
 
diff --git a/lib/requests/packages/chardet/sbcharsetprober.py b/lib/requests/packages/chardet/sbcharsetprober.py
old mode 100755
new mode 100644
index da07116..37291bd
--- a/lib/requests/packages/chardet/sbcharsetprober.py
+++ b/lib/requests/packages/chardet/sbcharsetprober.py
@@ -14,20 +14,22 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from charsetprober import CharSetProber
+import sys
+from . import constants
+from .charsetprober import CharSetProber
+from .compat import wrap_ord
 
 SAMPLE_SIZE = 64
 SB_ENOUGH_REL_THRESHOLD = 1024
@@ -37,22 +39,27 @@ SYMBOL_CAT_ORDER = 250
 NUMBER_OF_SEQ_CAT = 4
 POSITIVE_CAT = NUMBER_OF_SEQ_CAT - 1
 #NEGATIVE_CAT = 0
- 
+
+
 class SingleByteCharSetProber(CharSetProber):
-    def __init__(self, model, reversed=constants.False, nameProber=None):
+    def __init__(self, model, reversed=False, nameProber=None):
         CharSetProber.__init__(self)
         self._mModel = model
-        self._mReversed = reversed # TRUE if we need to reverse every pair in the model lookup
-        self._mNameProber = nameProber # Optional auxiliary prober for name decision
+        # TRUE if we need to reverse every pair in the model lookup
+        self._mReversed = reversed
+        # Optional auxiliary prober for name decision
+        self._mNameProber = nameProber
         self.reset()
 
     def reset(self):
         CharSetProber.reset(self)
-        self._mLastOrder = 255 # char order of last character
+        # char order of last character
+        self._mLastOrder = 255
         self._mSeqCounters = [0] * NUMBER_OF_SEQ_CAT
         self._mTotalSeqs = 0
         self._mTotalChar = 0
-        self._mFreqChar = 0 # characters that fall in our sampling range
+        # characters that fall in our sampling range
+        self._mFreqChar = 0
 
     def get_charset_name(self):
         if self._mNameProber:
@@ -67,7 +74,7 @@ class SingleByteCharSetProber(CharSetProber):
         if not aLen:
             return self.get_state()
         for c in aBuf:
-            order = self._mModel['charToOrderMap'][ord(c)]
+            order = self._mModel['charToOrderMap'][wrap_ord(c)]
             if order < SYMBOL_CAT_ORDER:
                 self._mTotalChar += 1
             if order < SAMPLE_SIZE:
@@ -75,9 +82,12 @@ class SingleByteCharSetProber(CharSetProber):
                 if self._mLastOrder < SAMPLE_SIZE:
                     self._mTotalSeqs += 1
                     if not self._mReversed:
-                        self._mSeqCounters[self._mModel['precedenceMatrix'][(self._mLastOrder * SAMPLE_SIZE) + order]] += 1
-                    else: # reverse the order of the letters in the lookup
-                        self._mSeqCounters[self._mModel['precedenceMatrix'][(order * SAMPLE_SIZE) + self._mLastOrder]] += 1
+                        i = (self._mLastOrder * SAMPLE_SIZE) + order
+                        model = self._mModel['precedenceMatrix'][i]
+                    else:  # reverse the order of the letters in the lookup
+                        i = (order * SAMPLE_SIZE) + self._mLastOrder
+                        model = self._mModel['precedenceMatrix'][i]
+                    self._mSeqCounters[model] += 1
             self._mLastOrder = order
 
         if self.get_state() == constants.eDetecting:
@@ -85,11 +95,16 @@ class SingleByteCharSetProber(CharSetProber):
                 cf = self.get_confidence()
                 if cf > POSITIVE_SHORTCUT_THRESHOLD:
                     if constants._debug:
-                        sys.stderr.write('%s confidence = %s, we have a winner\n' % (self._mModel['charsetName'], cf))
+                        sys.stderr.write('%s confidence = %s, we have a'
+                                         'winner\n' %
+                                         (self._mModel['charsetName'], cf))
                     self._mState = constants.eFoundIt
                 elif cf < NEGATIVE_SHORTCUT_THRESHOLD:
                     if constants._debug:
-                        sys.stderr.write('%s confidence = %s, below negative shortcut threshhold %s\n' % (self._mModel['charsetName'], cf, NEGATIVE_SHORTCUT_THRESHOLD))
+                        sys.stderr.write('%s confidence = %s, below negative'
+                                         'shortcut threshhold %s\n' %
+                                         (self._mModel['charsetName'], cf,
+                                          NEGATIVE_SHORTCUT_THRESHOLD))
                     self._mState = constants.eNotMe
 
         return self.get_state()
@@ -97,9 +112,8 @@ class SingleByteCharSetProber(CharSetProber):
     def get_confidence(self):
         r = 0.01
         if self._mTotalSeqs > 0:
-#            print self._mSeqCounters[POSITIVE_CAT], self._mTotalSeqs, self._mModel['mTypicalPositiveRatio']
-            r = (1.0 * self._mSeqCounters[POSITIVE_CAT]) / self._mTotalSeqs / self._mModel['mTypicalPositiveRatio']
-#            print r, self._mFreqChar, self._mTotalChar
+            r = ((1.0 * self._mSeqCounters[POSITIVE_CAT]) / self._mTotalSeqs
+                 / self._mModel['mTypicalPositiveRatio'])
             r = r * self._mFreqChar / self._mTotalChar
             if r >= 1.0:
                 r = 0.99
diff --git a/lib/requests/packages/chardet/sbcsgroupprober.py b/lib/requests/packages/chardet/sbcsgroupprober.py
old mode 100755
new mode 100644
index d19160c..1b6196c
--- a/lib/requests/packages/chardet/sbcsgroupprober.py
+++ b/lib/requests/packages/chardet/sbcsgroupprober.py
@@ -14,33 +14,35 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from charsetgroupprober import CharSetGroupProber
-from sbcharsetprober import SingleByteCharSetProber
-from langcyrillicmodel import Win1251CyrillicModel, Koi8rModel, Latin5CyrillicModel, MacCyrillicModel, Ibm866Model, Ibm855Model
-from langgreekmodel import Latin7GreekModel, Win1253GreekModel
-from langbulgarianmodel import Latin5BulgarianModel, Win1251BulgarianModel
-from langhungarianmodel import Latin2HungarianModel, Win1250HungarianModel
-from langthaimodel import TIS620ThaiModel
-from langhebrewmodel import Win1255HebrewModel
-from hebrewprober import HebrewProber
+from .charsetgroupprober import CharSetGroupProber
+from .sbcharsetprober import SingleByteCharSetProber
+from .langcyrillicmodel import (Win1251CyrillicModel, Koi8rModel,
+                                Latin5CyrillicModel, MacCyrillicModel,
+                                Ibm866Model, Ibm855Model)
+from .langgreekmodel import Latin7GreekModel, Win1253GreekModel
+from .langbulgarianmodel import Latin5BulgarianModel, Win1251BulgarianModel
+from .langhungarianmodel import Latin2HungarianModel, Win1250HungarianModel
+from .langthaimodel import TIS620ThaiModel
+from .langhebrewmodel import Win1255HebrewModel
+from .hebrewprober import HebrewProber
+
 
 class SBCSGroupProber(CharSetGroupProber):
     def __init__(self):
         CharSetGroupProber.__init__(self)
-        self._mProbers = [ \
+        self._mProbers = [
             SingleByteCharSetProber(Win1251CyrillicModel),
             SingleByteCharSetProber(Koi8rModel),
             SingleByteCharSetProber(Latin5CyrillicModel),
@@ -54,11 +56,14 @@ class SBCSGroupProber(CharSetGroupProber):
             SingleByteCharSetProber(Latin2HungarianModel),
             SingleByteCharSetProber(Win1250HungarianModel),
             SingleByteCharSetProber(TIS620ThaiModel),
-            ]
+        ]
         hebrewProber = HebrewProber()
-        logicalHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, constants.False, hebrewProber)
-        visualHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, constants.True, hebrewProber)
+        logicalHebrewProber = SingleByteCharSetProber(Win1255HebrewModel,
+                                                      False, hebrewProber)
+        visualHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, True,
+                                                     hebrewProber)
         hebrewProber.set_model_probers(logicalHebrewProber, visualHebrewProber)
-        self._mProbers.extend([hebrewProber, logicalHebrewProber, visualHebrewProber])
+        self._mProbers.extend([hebrewProber, logicalHebrewProber,
+                               visualHebrewProber])
 
         self.reset()
diff --git a/lib/requests/packages/chardet/sjisprober.py b/lib/requests/packages/chardet/sjisprober.py
old mode 100755
new mode 100644
index fea2690..cd0e9e7
--- a/lib/requests/packages/chardet/sjisprober.py
+++ b/lib/requests/packages/chardet/sjisprober.py
@@ -13,25 +13,26 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-from mbcharsetprober import MultiByteCharSetProber
-from codingstatemachine import CodingStateMachine
-from chardistribution import SJISDistributionAnalysis
-from jpcntx import SJISContextAnalysis
-from mbcssm import SJISSMModel
-import constants, sys
-from constants import eStart, eError, eItsMe
+import sys
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import SJISDistributionAnalysis
+from .jpcntx import SJISContextAnalysis
+from .mbcssm import SJISSMModel
+from . import constants
+
 
 class SJISProber(MultiByteCharSetProber):
     def __init__(self):
@@ -44,37 +45,42 @@ class SJISProber(MultiByteCharSetProber):
     def reset(self):
         MultiByteCharSetProber.reset(self)
         self._mContextAnalyzer.reset()
-        
+
     def get_charset_name(self):
-        return "SHIFT_JIS"
+        return self._mContextAnalyzer.get_charset_name()
 
     def feed(self, aBuf):
         aLen = len(aBuf)
         for i in range(0, aLen):
             codingState = self._mCodingSM.next_state(aBuf[i])
-            if codingState == eError:
+            if codingState == constants.eError:
                 if constants._debug:
-                    sys.stderr.write(self.get_charset_name() + ' prober hit error at byte ' + str(i) + '\n')
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
                 self._mState = constants.eNotMe
                 break
-            elif codingState == eItsMe:
+            elif codingState == constants.eItsMe:
                 self._mState = constants.eFoundIt
                 break
-            elif codingState == eStart:
+            elif codingState == constants.eStart:
                 charLen = self._mCodingSM.get_current_charlen()
                 if i == 0:
                     self._mLastChar[1] = aBuf[0]
-                    self._mContextAnalyzer.feed(self._mLastChar[2 - charLen :], charLen)
+                    self._mContextAnalyzer.feed(self._mLastChar[2 - charLen:],
+                                                charLen)
                     self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
                 else:
-                    self._mContextAnalyzer.feed(aBuf[i + 1 - charLen : i + 3 - charLen], charLen)
-                    self._mDistributionAnalyzer.feed(aBuf[i - 1 : i + 1], charLen)
-                    
+                    self._mContextAnalyzer.feed(aBuf[i + 1 - charLen:i + 3
+                                                     - charLen], charLen)
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
         self._mLastChar[0] = aBuf[aLen - 1]
-        
+
         if self.get_state() == constants.eDetecting:
-            if self._mContextAnalyzer.got_enough_data() and \
-                   (self.get_confidence() > constants.SHORTCUT_THRESHOLD):
+            if (self._mContextAnalyzer.got_enough_data() and
+               (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
                 self._mState = constants.eFoundIt
 
         return self.get_state()
diff --git a/lib/requests/packages/chardet/universaldetector.py b/lib/requests/packages/chardet/universaldetector.py
old mode 100755
new mode 100644
index 809df22..476522b
--- a/lib/requests/packages/chardet/universaldetector.py
+++ b/lib/requests/packages/chardet/universaldetector.py
@@ -14,23 +14,25 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from latin1prober import Latin1Prober # windows-1252
-from mbcsgroupprober import MBCSGroupProber # multi-byte character sets
-from sbcsgroupprober import SBCSGroupProber # single-byte character sets
-from escprober import EscCharSetProber # ISO-2122, etc.
+from . import constants
+import sys
+import codecs
+from .latin1prober import Latin1Prober  # windows-1252
+from .mbcsgroupprober import MBCSGroupProber  # multi-byte character sets
+from .sbcsgroupprober import SBCSGroupProber  # single-byte character sets
+from .escprober import EscCharSetProber  # ISO-2122, etc.
 import re
 
 MINIMUM_THRESHOLD = 0.20
@@ -38,68 +40,78 @@ ePureAscii = 0
 eEscAscii = 1
 eHighbyte = 2
 
+
 class UniversalDetector:
     def __init__(self):
-        self._highBitDetector = re.compile(r'[\x80-\xFF]')
-        self._escDetector = re.compile(r'(\033|~{)')
+        self._highBitDetector = re.compile(b'[\x80-\xFF]')
+        self._escDetector = re.compile(b'(\033|~{)')
         self._mEscCharSetProber = None
         self._mCharSetProbers = []
         self.reset()
 
     def reset(self):
         self.result = {'encoding': None, 'confidence': 0.0}
-        self.done = constants.False
-        self._mStart = constants.True
-        self._mGotData = constants.False
+        self.done = False
+        self._mStart = True
+        self._mGotData = False
         self._mInputState = ePureAscii
-        self._mLastChar = ''
+        self._mLastChar = b''
         if self._mEscCharSetProber:
             self._mEscCharSetProber.reset()
         for prober in self._mCharSetProbers:
             prober.reset()
 
     def feed(self, aBuf):
-        if self.done: return
+        if self.done:
+            return
 
         aLen = len(aBuf)
-        if not aLen: return
-        
+        if not aLen:
+            return
+
         if not self._mGotData:
             # If the data starts with BOM, we know it is UTF
-            if aBuf[:3] == '\xEF\xBB\xBF':
+            if aBuf[:3] == codecs.BOM_UTF8:
                 # EF BB BF  UTF-8 with BOM
-                self.result = {'encoding': "UTF-8", 'confidence': 1.0}
-            elif aBuf[:4] == '\xFF\xFE\x00\x00':
+                self.result = {'encoding': "UTF-8-SIG", 'confidence': 1.0}
+            elif aBuf[:4] == codecs.BOM_UTF32_LE:
                 # FF FE 00 00  UTF-32, little-endian BOM
                 self.result = {'encoding': "UTF-32LE", 'confidence': 1.0}
-            elif aBuf[:4] == '\x00\x00\xFE\xFF': 
+            elif aBuf[:4] == codecs.BOM_UTF32_BE:
                 # 00 00 FE FF  UTF-32, big-endian BOM
                 self.result = {'encoding': "UTF-32BE", 'confidence': 1.0}
-            elif aBuf[:4] == '\xFE\xFF\x00\x00':
+            elif aBuf[:4] == b'\xFE\xFF\x00\x00':
                 # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
-                self.result = {'encoding': "X-ISO-10646-UCS-4-3412", 'confidence': 1.0}
-            elif aBuf[:4] == '\x00\x00\xFF\xFE':
+                self.result = {
+                    'encoding': "X-ISO-10646-UCS-4-3412",
+                    'confidence': 1.0
+                }
+            elif aBuf[:4] == b'\x00\x00\xFF\xFE':
                 # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
-                self.result = {'encoding': "X-ISO-10646-UCS-4-2143", 'confidence': 1.0}
-            elif aBuf[:2] == '\xFF\xFE':
+                self.result = {
+                    'encoding': "X-ISO-10646-UCS-4-2143",
+                    'confidence': 1.0
+                }
+            elif aBuf[:2] == codecs.BOM_LE:
                 # FF FE  UTF-16, little endian BOM
                 self.result = {'encoding': "UTF-16LE", 'confidence': 1.0}
-            elif aBuf[:2] == '\xFE\xFF':
+            elif aBuf[:2] == codecs.BOM_BE:
                 # FE FF  UTF-16, big endian BOM
                 self.result = {'encoding': "UTF-16BE", 'confidence': 1.0}
 
-        self._mGotData = constants.True
+        self._mGotData = True
         if self.result['encoding'] and (self.result['confidence'] > 0.0):
-            self.done = constants.True
+            self.done = True
             return
 
         if self._mInputState == ePureAscii:
             if self._highBitDetector.search(aBuf):
                 self._mInputState = eHighbyte
-            elif (self._mInputState == ePureAscii) and self._escDetector.search(self._mLastChar + aBuf):
+            elif ((self._mInputState == ePureAscii) and
+                    self._escDetector.search(self._mLastChar + aBuf)):
                 self._mInputState = eEscAscii
 
-        self._mLastChar = aBuf[-1]
+        self._mLastChar = aBuf[-1:]
 
         if self._mInputState == eEscAscii:
             if not self._mEscCharSetProber:
@@ -107,25 +119,27 @@ class UniversalDetector:
             if self._mEscCharSetProber.feed(aBuf) == constants.eFoundIt:
                 self.result = {'encoding': self._mEscCharSetProber.get_charset_name(),
                                'confidence': self._mEscCharSetProber.get_confidence()}
-                self.done = constants.True
+                self.done = True
         elif self._mInputState == eHighbyte:
             if not self._mCharSetProbers:
-                self._mCharSetProbers = [MBCSGroupProber(), SBCSGroupProber(), Latin1Prober()]
+                self._mCharSetProbers = [MBCSGroupProber(), SBCSGroupProber(),
+                                         Latin1Prober()]
             for prober in self._mCharSetProbers:
                 if prober.feed(aBuf) == constants.eFoundIt:
                     self.result = {'encoding': prober.get_charset_name(),
                                    'confidence': prober.get_confidence()}
-                    self.done = constants.True
+                    self.done = True
                     break
 
     def close(self):
-        if self.done: return
+        if self.done:
+            return
         if not self._mGotData:
             if constants._debug:
                 sys.stderr.write('no data received!\n')
             return
-        self.done = constants.True
-        
+        self.done = True
+
         if self._mInputState == ePureAscii:
             self.result = {'encoding': 'ascii', 'confidence': 1.0}
             return self.result
@@ -135,7 +149,8 @@ class UniversalDetector:
             maxProberConfidence = 0.0
             maxProber = None
             for prober in self._mCharSetProbers:
-                if not prober: continue
+                if not prober:
+                    continue
                 proberConfidence = prober.get_confidence()
                 if proberConfidence > maxProberConfidence:
                     maxProberConfidence = proberConfidence
@@ -148,7 +163,8 @@ class UniversalDetector:
         if constants._debug:
             sys.stderr.write('no probers hit minimum threshhold\n')
             for prober in self._mCharSetProbers[0].mProbers:
-                if not prober: continue
-                sys.stderr.write('%s confidence = %s\n' % \
-                                 (prober.get_charset_name(), \
+                if not prober:
+                    continue
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(),
                                   prober.get_confidence()))
diff --git a/lib/requests/packages/chardet/utf8prober.py b/lib/requests/packages/chardet/utf8prober.py
old mode 100755
new mode 100644
index c1792bb..1c0bb5d
--- a/lib/requests/packages/chardet/utf8prober.py
+++ b/lib/requests/packages/chardet/utf8prober.py
@@ -13,26 +13,26 @@
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
-# 
+#
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
 
-import constants, sys
-from constants import eStart, eError, eItsMe
-from charsetprober import CharSetProber
-from codingstatemachine import CodingStateMachine
-from mbcssm import UTF8SMModel
+from . import constants
+from .charsetprober import CharSetProber
+from .codingstatemachine import CodingStateMachine
+from .mbcssm import UTF8SMModel
 
 ONE_CHAR_PROB = 0.5
 
+
 class UTF8Prober(CharSetProber):
     def __init__(self):
         CharSetProber.__init__(self)
@@ -50,13 +50,13 @@ class UTF8Prober(CharSetProber):
     def feed(self, aBuf):
         for c in aBuf:
             codingState = self._mCodingSM.next_state(c)
-            if codingState == eError:
+            if codingState == constants.eError:
                 self._mState = constants.eNotMe
                 break
-            elif codingState == eItsMe:
+            elif codingState == constants.eItsMe:
                 self._mState = constants.eFoundIt
                 break
-            elif codingState == eStart:
+            elif codingState == constants.eStart:
                 if self._mCodingSM.get_current_charlen() >= 2:
                     self._mNumOfMBChar += 1
 
diff --git a/lib/requests/packages/chardet2/__init__.py b/lib/requests/packages/chardet2/__init__.py
deleted file mode 100755
index 96e9ef8..0000000
--- a/lib/requests/packages/chardet2/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-__version__ = "2.0.1"
-
-def detect(aBuf):
-    from . import universaldetector
-    u = universaldetector.UniversalDetector()
-    u.reset()
-    u.feed(aBuf)
-    u.close()
-    return u.result
diff --git a/lib/requests/packages/chardet2/big5freq.py b/lib/requests/packages/chardet2/big5freq.py
deleted file mode 100755
index c1b0f3c..0000000
--- a/lib/requests/packages/chardet2/big5freq.py
+++ /dev/null
@@ -1,923 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-# 
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-# 
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# Big5 frequency table
-# by Taiwan's Mandarin Promotion Council 
-# <http://www.edu.tw:81/mandr/>
-# 
-# 128  --> 0.42261
-# 256  --> 0.57851
-# 512  --> 0.74851
-# 1024 --> 0.89384
-# 2048 --> 0.97583
-# 
-# Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
-# Random Distribution Ration = 512/(5401-512)=0.105
-# 
-# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
-
-BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
-
-#Char to FreqOrder table
-BIG5_TABLE_SIZE = 5376
-
-Big5CharToFreqOrder = ( \
-   1,1801,1506, 255,1431, 198,   9,  82,   6,5008, 177, 202,3681,1256,2821, 110, #   16
-3814,  33,3274, 261,  76,  44,2114,  16,2946,2187,1176, 659,3971,  26,3451,2653, #   32
-1198,3972,3350,4202, 410,2215, 302, 590, 361,1964,   8, 204,  58,4510,5009,1932, #   48
-  63,5010,5011, 317,1614,  75, 222, 159,4203,2417,1480,5012,3555,3091, 224,2822, #   64
-3682,   3,  10,3973,1471,  29,2787,1135,2866,1940, 873, 130,3275,1123, 312,5013, #   80
-4511,2052, 507, 252, 682,5014, 142,1915, 124, 206,2947,  34,3556,3204,  64, 604, #   96
-5015,2501,1977,1978, 155,1991, 645, 641,1606,5016,3452, 337,  72, 406,5017,  80, #  112
- 630, 238,3205,1509, 263, 939,1092,2654, 756,1440,1094,3453, 449,  69,2987, 591, #  128
- 179,2096, 471, 115,2035,1844,  60,  50,2988, 134, 806,1869, 734,2036,3454, 180, #  144
- 995,1607, 156, 537,2907, 688,5018, 319,1305, 779,2145, 514,2379, 298,4512, 359, #  160
-2502,  90,2716,1338, 663,  11, 906,1099,2553,  20,2441, 182, 532,1716,5019, 732, #  176
-1376,4204,1311,1420,3206,  25,2317,1056, 113, 399, 382,1950, 242,3455,2474, 529, #  192
-3276, 475,1447,3683,5020, 117,  21, 656, 810,1297,2300,2334,3557,5021, 126,4205, #  208
- 706, 456, 150, 613,4513,  71,1118,2037,4206, 145,3092,  85, 835, 486,2115,1246, #  224
-1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,5022,2128,2359, 347,3815, 221, #  240
-3558,3135,5023,1956,1153,4207,  83, 296,1199,3093, 192, 624,  93,5024, 822,1898, #  256
-2823,3136, 795,2065, 991,1554,1542,1592,  27,  43,2867, 859, 139,1456, 860,4514, #  272
- 437, 712,3974, 164,2397,3137, 695, 211,3037,2097, 195,3975,1608,3559,3560,3684, #  288
-3976, 234, 811,2989,2098,3977,2233,1441,3561,1615,2380, 668,2077,1638, 305, 228, #  304
-1664,4515, 467, 415,5025, 262,2099,1593, 239, 108, 300, 200,1033, 512,1247,2078, #  320
-5026,5027,2176,3207,3685,2682, 593, 845,1062,3277,  88,1723,2038,3978,1951, 212, #  336
- 266, 152, 149, 468,1899,4208,4516,  77, 187,5028,3038,  37,   5,2990,5029,3979, #  352
-5030,5031,  39,2524,4517,2908,3208,2079,  55, 148,  74,4518, 545, 483,1474,1029, #  368
-1665, 217,1870,1531,3138,1104,2655,4209,  24, 172,3562, 900,3980,3563,3564,4519, #  384
-  32,1408,2824,1312, 329, 487,2360,2251,2717, 784,2683,   4,3039,3351,1427,1789, #  400
- 188, 109, 499,5032,3686,1717,1790, 888,1217,3040,4520,5033,3565,5034,3352,1520, #  416
-3687,3981, 196,1034, 775,5035,5036, 929,1816, 249, 439,  38,5037,1063,5038, 794, #  432
-3982,1435,2301,  46, 178,3278,2066,5039,2381,5040, 214,1709,4521, 804,  35, 707, #  448
- 324,3688,1601,2554, 140, 459,4210,5041,5042,1365, 839, 272, 978,2262,2580,3456, #  464
-2129,1363,3689,1423, 697, 100,3094,  48,  70,1231, 495,3139,2196,5043,1294,5044, #  480
-2080, 462, 586,1042,3279, 853, 256, 988, 185,2382,3457,1698, 434,1084,5045,3458, #  496
- 314,2625,2788,4522,2335,2336, 569,2285, 637,1817,2525, 757,1162,1879,1616,3459, #  512
- 287,1577,2116, 768,4523,1671,2868,3566,2526,1321,3816, 909,2418,5046,4211, 933, #  528
-3817,4212,2053,2361,1222,4524, 765,2419,1322, 786,4525,5047,1920,1462,1677,2909, #  544
-1699,5048,4526,1424,2442,3140,3690,2600,3353,1775,1941,3460,3983,4213, 309,1369, #  560
-1130,2825, 364,2234,1653,1299,3984,3567,3985,3986,2656, 525,1085,3041, 902,2001, #  576
-1475, 964,4527, 421,1845,1415,1057,2286, 940,1364,3141, 376,4528,4529,1381,   7, #  592
-2527, 983,2383, 336,1710,2684,1846, 321,3461, 559,1131,3042,2752,1809,1132,1313, #  608
- 265,1481,1858,5049, 352,1203,2826,3280, 167,1089, 420,2827, 776, 792,1724,3568, #  624
-4214,2443,3281,5050,4215,5051, 446, 229, 333,2753, 901,3818,1200,1557,4530,2657, #  640
-1921, 395,2754,2685,3819,4216,1836, 125, 916,3209,2626,4531,5052,5053,3820,5054, #  656
-5055,5056,4532,3142,3691,1133,2555,1757,3462,1510,2318,1409,3569,5057,2146, 438, #  672
-2601,2910,2384,3354,1068, 958,3043, 461, 311,2869,2686,4217,1916,3210,4218,1979, #  688
- 383, 750,2755,2627,4219, 274, 539, 385,1278,1442,5058,1154,1965, 384, 561, 210, #  704
-  98,1295,2556,3570,5059,1711,2420,1482,3463,3987,2911,1257, 129,5060,3821, 642, #  720
- 523,2789,2790,2658,5061, 141,2235,1333,  68, 176, 441, 876, 907,4220, 603,2602, #  736
- 710, 171,3464, 404, 549,  18,3143,2398,1410,3692,1666,5062,3571,4533,2912,4534, #  752
-5063,2991, 368,5064, 146, 366,  99, 871,3693,1543, 748, 807,1586,1185,  22,2263, #  768
- 379,3822,3211,5065,3212, 505,1942,2628,1992,1382,2319,5066, 380,2362, 218, 702, #  784
-1818,1248,3465,3044,3572,3355,3282,5067,2992,3694, 930,3283,3823,5068,  59,5069, #  800
- 585, 601,4221, 497,3466,1112,1314,4535,1802,5070,1223,1472,2177,5071, 749,1837, #  816
- 690,1900,3824,1773,3988,1476, 429,1043,1791,2236,2117, 917,4222, 447,1086,1629, #  832
-5072, 556,5073,5074,2021,1654, 844,1090, 105, 550, 966,1758,2828,1008,1783, 686, #  848
-1095,5075,2287, 793,1602,5076,3573,2603,4536,4223,2948,2302,4537,3825, 980,2503, #  864
- 544, 353, 527,4538, 908,2687,2913,5077, 381,2629,1943,1348,5078,1341,1252, 560, #  880
-3095,5079,3467,2870,5080,2054, 973, 886,2081, 143,4539,5081,5082, 157,3989, 496, #  896
-4224,  57, 840, 540,2039,4540,4541,3468,2118,1445, 970,2264,1748,1966,2082,4225, #  912
-3144,1234,1776,3284,2829,3695, 773,1206,2130,1066,2040,1326,3990,1738,1725,4226, #  928
- 279,3145,  51,1544,2604, 423,1578,2131,2067, 173,4542,1880,5083,5084,1583, 264, #  944
- 610,3696,4543,2444, 280, 154,5085,5086,5087,1739, 338,1282,3096, 693,2871,1411, #  960
-1074,3826,2445,5088,4544,5089,5090,1240, 952,2399,5091,2914,1538,2688, 685,1483, #  976
-4227,2475,1436, 953,4228,2055,4545, 671,2400,  79,4229,2446,3285, 608, 567,2689, #  992
-3469,4230,4231,1691, 393,1261,1792,2401,5092,4546,5093,5094,5095,5096,1383,1672, # 1008
-3827,3213,1464, 522,1119, 661,1150, 216, 675,4547,3991,1432,3574, 609,4548,2690, # 1024
-2402,5097,5098,5099,4232,3045,   0,5100,2476, 315, 231,2447, 301,3356,4549,2385, # 1040
-5101, 233,4233,3697,1819,4550,4551,5102,  96,1777,1315,2083,5103, 257,5104,1810, # 1056
-3698,2718,1139,1820,4234,2022,1124,2164,2791,1778,2659,5105,3097, 363,1655,3214, # 1072
-5106,2993,5107,5108,5109,3992,1567,3993, 718, 103,3215, 849,1443, 341,3357,2949, # 1088
-1484,5110,1712, 127,  67, 339,4235,2403, 679,1412, 821,5111,5112, 834, 738, 351, # 1104
-2994,2147, 846, 235,1497,1881, 418,1993,3828,2719, 186,1100,2148,2756,3575,1545, # 1120
-1355,2950,2872,1377, 583,3994,4236,2581,2995,5113,1298,3699,1078,2557,3700,2363, # 1136
-  78,3829,3830, 267,1289,2100,2002,1594,4237, 348, 369,1274,2197,2178,1838,4552, # 1152
-1821,2830,3701,2757,2288,2003,4553,2951,2758, 144,3358, 882,4554,3995,2759,3470, # 1168
-4555,2915,5114,4238,1726, 320,5115,3996,3046, 788,2996,5116,2831,1774,1327,2873, # 1184
-3997,2832,5117,1306,4556,2004,1700,3831,3576,2364,2660, 787,2023, 506, 824,3702, # 1200
- 534, 323,4557,1044,3359,2024,1901, 946,3471,5118,1779,1500,1678,5119,1882,4558, # 1216
- 165, 243,4559,3703,2528, 123, 683,4239, 764,4560,  36,3998,1793, 589,2916, 816, # 1232
- 626,1667,3047,2237,1639,1555,1622,3832,3999,5120,4000,2874,1370,1228,1933, 891, # 1248
-2084,2917, 304,4240,5121, 292,2997,2720,3577, 691,2101,4241,1115,4561, 118, 662, # 1264
-5122, 611,1156, 854,2386,1316,2875,   2, 386, 515,2918,5123,5124,3286, 868,2238, # 1280
-1486, 855,2661, 785,2216,3048,5125,1040,3216,3578,5126,3146, 448,5127,1525,5128, # 1296
-2165,4562,5129,3833,5130,4242,2833,3579,3147, 503, 818,4001,3148,1568, 814, 676, # 1312
-1444, 306,1749,5131,3834,1416,1030, 197,1428, 805,2834,1501,4563,5132,5133,5134, # 1328
-1994,5135,4564,5136,5137,2198,  13,2792,3704,2998,3149,1229,1917,5138,3835,2132, # 1344
-5139,4243,4565,2404,3580,5140,2217,1511,1727,1120,5141,5142, 646,3836,2448, 307, # 1360
-5143,5144,1595,3217,5145,5146,5147,3705,1113,1356,4002,1465,2529,2530,5148, 519, # 1376
-5149, 128,2133,  92,2289,1980,5150,4003,1512, 342,3150,2199,5151,2793,2218,1981, # 1392
-3360,4244, 290,1656,1317, 789, 827,2365,5152,3837,4566, 562, 581,4004,5153, 401, # 1408
-4567,2252,  94,4568,5154,1399,2794,5155,1463,2025,4569,3218,1944,5156, 828,1105, # 1424
-4245,1262,1394,5157,4246, 605,4570,5158,1784,2876,5159,2835, 819,2102, 578,2200, # 1440
-2952,5160,1502, 436,3287,4247,3288,2836,4005,2919,3472,3473,5161,2721,2320,5162, # 1456
-5163,2337,2068,  23,4571, 193, 826,3838,2103, 699,1630,4248,3098, 390,1794,1064, # 1472
-3581,5164,1579,3099,3100,1400,5165,4249,1839,1640,2877,5166,4572,4573, 137,4250, # 1488
- 598,3101,1967, 780, 104, 974,2953,5167, 278, 899, 253, 402, 572, 504, 493,1339, # 1504
-5168,4006,1275,4574,2582,2558,5169,3706,3049,3102,2253, 565,1334,2722, 863,  41, # 1520
-5170,5171,4575,5172,1657,2338,  19, 463,2760,4251, 606,5173,2999,3289,1087,2085, # 1536
-1323,2662,3000,5174,1631,1623,1750,4252,2691,5175,2878, 791,2723,2663,2339, 232, # 1552
-2421,5176,3001,1498,5177,2664,2630, 755,1366,3707,3290,3151,2026,1609, 119,1918, # 1568
-3474, 862,1026,4253,5178,4007,3839,4576,4008,4577,2265,1952,2477,5179,1125, 817, # 1584
-4254,4255,4009,1513,1766,2041,1487,4256,3050,3291,2837,3840,3152,5180,5181,1507, # 1600
-5182,2692, 733,  40,1632,1106,2879, 345,4257, 841,2531, 230,4578,3002,1847,3292, # 1616
-3475,5183,1263, 986,3476,5184, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562, # 1632
-4010,4011,2954, 967,2761,2665,1349, 592,2134,1692,3361,3003,1995,4258,1679,4012, # 1648
-1902,2188,5185, 739,3708,2724,1296,1290,5186,4259,2201,2202,1922,1563,2605,2559, # 1664
-1871,2762,3004,5187, 435,5188, 343,1108, 596,  17,1751,4579,2239,3477,3709,5189, # 1680
-4580, 294,3582,2955,1693, 477, 979, 281,2042,3583, 643,2043,3710,2631,2795,2266, # 1696
-1031,2340,2135,2303,3584,4581, 367,1249,2560,5190,3585,5191,4582,1283,3362,2005, # 1712
- 240,1762,3363,4583,4584, 836,1069,3153, 474,5192,2149,2532, 268,3586,5193,3219, # 1728
-1521,1284,5194,1658,1546,4260,5195,3587,3588,5196,4261,3364,2693,1685,4262, 961, # 1744
-1673,2632, 190,2006,2203,3841,4585,4586,5197, 570,2504,3711,1490,5198,4587,2633, # 1760
-3293,1957,4588, 584,1514, 396,1045,1945,5199,4589,1968,2449,5200,5201,4590,4013, # 1776
- 619,5202,3154,3294, 215,2007,2796,2561,3220,4591,3221,4592, 763,4263,3842,4593, # 1792
-5203,5204,1958,1767,2956,3365,3712,1174, 452,1477,4594,3366,3155,5205,2838,1253, # 1808
-2387,2189,1091,2290,4264, 492,5206, 638,1169,1825,2136,1752,4014, 648, 926,1021, # 1824
-1324,4595, 520,4596, 997, 847,1007, 892,4597,3843,2267,1872,3713,2405,1785,4598, # 1840
-1953,2957,3103,3222,1728,4265,2044,3714,4599,2008,1701,3156,1551,  30,2268,4266, # 1856
-5207,2027,4600,3589,5208, 501,5209,4267, 594,3478,2166,1822,3590,3479,3591,3223, # 1872
- 829,2839,4268,5210,1680,3157,1225,4269,5211,3295,4601,4270,3158,2341,5212,4602, # 1888
-4271,5213,4015,4016,5214,1848,2388,2606,3367,5215,4603, 374,4017, 652,4272,4273, # 1904
- 375,1140, 798,5216,5217,5218,2366,4604,2269, 546,1659, 138,3051,2450,4605,5219, # 1920
-2254, 612,1849, 910, 796,3844,1740,1371, 825,3845,3846,5220,2920,2562,5221, 692, # 1936
- 444,3052,2634, 801,4606,4274,5222,1491, 244,1053,3053,4275,4276, 340,5223,4018, # 1952
-1041,3005, 293,1168,  87,1357,5224,1539, 959,5225,2240, 721, 694,4277,3847, 219, # 1968
-1478, 644,1417,3368,2666,1413,1401,1335,1389,4019,5226,5227,3006,2367,3159,1826, # 1984
- 730,1515, 184,2840,  66,4607,5228,1660,2958, 246,3369, 378,1457, 226,3480, 975, # 2000
-4020,2959,1264,3592, 674, 696,5229, 163,5230,1141,2422,2167, 713,3593,3370,4608, # 2016
-4021,5231,5232,1186,  15,5233,1079,1070,5234,1522,3224,3594, 276,1050,2725, 758, # 2032
-1126, 653,2960,3296,5235,2342, 889,3595,4022,3104,3007, 903,1250,4609,4023,3481, # 2048
-3596,1342,1681,1718, 766,3297, 286,  89,2961,3715,5236,1713,5237,2607,3371,3008, # 2064
-5238,2962,2219,3225,2880,5239,4610,2505,2533, 181, 387,1075,4024, 731,2190,3372, # 2080
-5240,3298, 310, 313,3482,2304, 770,4278,  54,3054, 189,4611,3105,3848,4025,5241, # 2096
-1230,1617,1850, 355,3597,4279,4612,3373, 111,4280,3716,1350,3160,3483,3055,4281, # 2112
-2150,3299,3598,5242,2797,4026,4027,3009, 722,2009,5243,1071, 247,1207,2343,2478, # 2128
-1378,4613,2010, 864,1437,1214,4614, 373,3849,1142,2220, 667,4615, 442,2763,2563, # 2144
-3850,4028,1969,4282,3300,1840, 837, 170,1107, 934,1336,1883,5244,5245,2119,4283, # 2160
-2841, 743,1569,5246,4616,4284, 582,2389,1418,3484,5247,1803,5248, 357,1395,1729, # 2176
-3717,3301,2423,1564,2241,5249,3106,3851,1633,4617,1114,2086,4285,1532,5250, 482, # 2192
-2451,4618,5251,5252,1492, 833,1466,5253,2726,3599,1641,2842,5254,1526,1272,3718, # 2208
-4286,1686,1795, 416,2564,1903,1954,1804,5255,3852,2798,3853,1159,2321,5256,2881, # 2224
-4619,1610,1584,3056,2424,2764, 443,3302,1163,3161,5257,5258,4029,5259,4287,2506, # 2240
-3057,4620,4030,3162,2104,1647,3600,2011,1873,4288,5260,4289, 431,3485,5261, 250, # 2256
-  97,  81,4290,5262,1648,1851,1558, 160, 848,5263, 866, 740,1694,5264,2204,2843, # 2272
-3226,4291,4621,3719,1687, 950,2479, 426, 469,3227,3720,3721,4031,5265,5266,1188, # 2288
- 424,1996, 861,3601,4292,3854,2205,2694, 168,1235,3602,4293,5267,2087,1674,4622, # 2304
-3374,3303, 220,2565,1009,5268,3855, 670,3010, 332,1208, 717,5269,5270,3603,2452, # 2320
-4032,3375,5271, 513,5272,1209,2882,3376,3163,4623,1080,5273,5274,5275,5276,2534, # 2336
-3722,3604, 815,1587,4033,4034,5277,3605,3486,3856,1254,4624,1328,3058,1390,4035, # 2352
-1741,4036,3857,4037,5278, 236,3858,2453,3304,5279,5280,3723,3859,1273,3860,4625, # 2368
-5281, 308,5282,4626, 245,4627,1852,2480,1307,2583, 430, 715,2137,2454,5283, 270, # 2384
- 199,2883,4038,5284,3606,2727,1753, 761,1754, 725,1661,1841,4628,3487,3724,5285, # 2400
-5286, 587,  14,3305, 227,2608, 326, 480,2270, 943,2765,3607, 291, 650,1884,5287, # 2416
-1702,1226, 102,1547,  62,3488, 904,4629,3489,1164,4294,5288,5289,1224,1548,2766, # 2432
- 391, 498,1493,5290,1386,1419,5291,2056,1177,4630, 813, 880,1081,2368, 566,1145, # 2448
-4631,2291,1001,1035,2566,2609,2242, 394,1286,5292,5293,2069,5294,  86,1494,1730, # 2464
-4039, 491,1588, 745, 897,2963, 843,3377,4040,2767,2884,3306,1768, 998,2221,2070, # 2480
- 397,1827,1195,1970,3725,3011,3378, 284,5295,3861,2507,2138,2120,1904,5296,4041, # 2496
-2151,4042,4295,1036,3490,1905, 114,2567,4296, 209,1527,5297,5298,2964,2844,2635, # 2512
-2390,2728,3164, 812,2568,5299,3307,5300,1559, 737,1885,3726,1210, 885,  28,2695, # 2528
-3608,3862,5301,4297,1004,1780,4632,5302, 346,1982,2222,2696,4633,3863,1742, 797, # 2544
-1642,4043,1934,1072,1384,2152, 896,4044,3308,3727,3228,2885,3609,5303,2569,1959, # 2560
-4634,2455,1786,5304,5305,5306,4045,4298,1005,1308,3728,4299,2729,4635,4636,1528, # 2576
-2610, 161,1178,4300,1983, 987,4637,1101,4301, 631,4046,1157,3229,2425,1343,1241, # 2592
-1016,2243,2570, 372, 877,2344,2508,1160, 555,1935, 911,4047,5307, 466,1170, 169, # 2608
-1051,2921,2697,3729,2481,3012,1182,2012,2571,1251,2636,5308, 992,2345,3491,1540, # 2624
-2730,1201,2071,2406,1997,2482,5309,4638, 528,1923,2191,1503,1874,1570,2369,3379, # 2640
-3309,5310, 557,1073,5311,1828,3492,2088,2271,3165,3059,3107, 767,3108,2799,4639, # 2656
-1006,4302,4640,2346,1267,2179,3730,3230, 778,4048,3231,2731,1597,2667,5312,4641, # 2672
-5313,3493,5314,5315,5316,3310,2698,1433,3311, 131,  95,1504,4049, 723,4303,3166, # 2688
-1842,3610,2768,2192,4050,2028,2105,3731,5317,3013,4051,1218,5318,3380,3232,4052, # 2704
-4304,2584, 248,1634,3864, 912,5319,2845,3732,3060,3865, 654,  53,5320,3014,5321, # 2720
-1688,4642, 777,3494,1032,4053,1425,5322, 191, 820,2121,2846, 971,4643, 931,3233, # 2736
- 135, 664, 783,3866,1998, 772,2922,1936,4054,3867,4644,2923,3234, 282,2732, 640, # 2752
-1372,3495,1127, 922, 325,3381,5323,5324, 711,2045,5325,5326,4055,2223,2800,1937, # 2768
-4056,3382,2224,2255,3868,2305,5327,4645,3869,1258,3312,4057,3235,2139,2965,4058, # 2784
-4059,5328,2225, 258,3236,4646, 101,1227,5329,3313,1755,5330,1391,3314,5331,2924, # 2800
-2057, 893,5332,5333,5334,1402,4305,2347,5335,5336,3237,3611,5337,5338, 878,1325, # 2816
-1781,2801,4647, 259,1385,2585, 744,1183,2272,4648,5339,4060,2509,5340, 684,1024, # 2832
-4306,5341, 472,3612,3496,1165,3315,4061,4062, 322,2153, 881, 455,1695,1152,1340, # 2848
- 660, 554,2154,4649,1058,4650,4307, 830,1065,3383,4063,4651,1924,5342,1703,1919, # 2864
-5343, 932,2273, 122,5344,4652, 947, 677,5345,3870,2637, 297,1906,1925,2274,4653, # 2880
-2322,3316,5346,5347,4308,5348,4309,  84,4310, 112, 989,5349, 547,1059,4064, 701, # 2896
-3613,1019,5350,4311,5351,3497, 942, 639, 457,2306,2456, 993,2966, 407, 851, 494, # 2912
-4654,3384, 927,5352,1237,5353,2426,3385, 573,4312, 680, 921,2925,1279,1875, 285, # 2928
- 790,1448,1984, 719,2168,5354,5355,4655,4065,4066,1649,5356,1541, 563,5357,1077, # 2944
-5358,3386,3061,3498, 511,3015,4067,4068,3733,4069,1268,2572,3387,3238,4656,4657, # 2960
-5359, 535,1048,1276,1189,2926,2029,3167,1438,1373,2847,2967,1134,2013,5360,4313, # 2976
-1238,2586,3109,1259,5361, 700,5362,2968,3168,3734,4314,5363,4315,1146,1876,1907, # 2992
-4658,2611,4070, 781,2427, 132,1589, 203, 147, 273,2802,2407, 898,1787,2155,4071, # 3008
-4072,5364,3871,2803,5365,5366,4659,4660,5367,3239,5368,1635,3872, 965,5369,1805, # 3024
-2699,1516,3614,1121,1082,1329,3317,4073,1449,3873,  65,1128,2848,2927,2769,1590, # 3040
-3874,5370,5371,  12,2668,  45, 976,2587,3169,4661, 517,2535,1013,1037,3240,5372, # 3056
-3875,2849,5373,3876,5374,3499,5375,2612, 614,1999,2323,3877,3110,2733,2638,5376, # 3072
-2588,4316, 599,1269,5377,1811,3735,5378,2700,3111, 759,1060, 489,1806,3388,3318, # 3088
-1358,5379,5380,2391,1387,1215,2639,2256, 490,5381,5382,4317,1759,2392,2348,5383, # 3104
-4662,3878,1908,4074,2640,1807,3241,4663,3500,3319,2770,2349, 874,5384,5385,3501, # 3120
-3736,1859,  91,2928,3737,3062,3879,4664,5386,3170,4075,2669,5387,3502,1202,1403, # 3136
-3880,2969,2536,1517,2510,4665,3503,2511,5388,4666,5389,2701,1886,1495,1731,4076, # 3152
-2370,4667,5390,2030,5391,5392,4077,2702,1216, 237,2589,4318,2324,4078,3881,4668, # 3168
-4669,2703,3615,3504, 445,4670,5393,5394,5395,5396,2771,  61,4079,3738,1823,4080, # 3184
-5397, 687,2046, 935, 925, 405,2670, 703,1096,1860,2734,4671,4081,1877,1367,2704, # 3200
-3389, 918,2106,1782,2483, 334,3320,1611,1093,4672, 564,3171,3505,3739,3390, 945, # 3216
-2641,2058,4673,5398,1926, 872,4319,5399,3506,2705,3112, 349,4320,3740,4082,4674, # 3232
-3882,4321,3741,2156,4083,4675,4676,4322,4677,2408,2047, 782,4084, 400, 251,4323, # 3248
-1624,5400,5401, 277,3742, 299,1265, 476,1191,3883,2122,4324,4325,1109, 205,5402, # 3264
-2590,1000,2157,3616,1861,5403,5404,5405,4678,5406,4679,2573, 107,2484,2158,4085, # 3280
-3507,3172,5407,1533, 541,1301, 158, 753,4326,2886,3617,5408,1696, 370,1088,4327, # 3296
-4680,3618, 579, 327, 440, 162,2244, 269,1938,1374,3508, 968,3063,  56,1396,3113, # 3312
-2107,3321,3391,5409,1927,2159,4681,3016,5410,3619,5411,5412,3743,4682,2485,5413, # 3328
-2804,5414,1650,4683,5415,2613,5416,5417,4086,2671,3392,1149,3393,4087,3884,4088, # 3344
-5418,1076,  49,5419, 951,3242,3322,3323, 450,2850, 920,5420,1812,2805,2371,4328, # 3360
-1909,1138,2372,3885,3509,5421,3243,4684,1910,1147,1518,2428,4685,3886,5422,4686, # 3376
-2393,2614, 260,1796,3244,5423,5424,3887,3324, 708,5425,3620,1704,5426,3621,1351, # 3392
-1618,3394,3017,1887, 944,4329,3395,4330,3064,3396,4331,5427,3744, 422, 413,1714, # 3408
-3325, 500,2059,2350,4332,2486,5428,1344,1911, 954,5429,1668,5430,5431,4089,2409, # 3424
-4333,3622,3888,4334,5432,2307,1318,2512,3114, 133,3115,2887,4687, 629,  31,2851, # 3440
-2706,3889,4688, 850, 949,4689,4090,2970,1732,2089,4335,1496,1853,5433,4091, 620, # 3456
-3245, 981,1242,3745,3397,1619,3746,1643,3326,2140,2457,1971,1719,3510,2169,5434, # 3472
-3246,5435,5436,3398,1829,5437,1277,4690,1565,2048,5438,1636,3623,3116,5439, 869, # 3488
-2852, 655,3890,3891,3117,4092,3018,3892,1310,3624,4691,5440,5441,5442,1733, 558, # 3504
-4692,3747, 335,1549,3065,1756,4336,3748,1946,3511,1830,1291,1192, 470,2735,2108, # 3520
-2806, 913,1054,4093,5443,1027,5444,3066,4094,4693, 982,2672,3399,3173,3512,3247, # 3536
-3248,1947,2807,5445, 571,4694,5446,1831,5447,3625,2591,1523,2429,5448,2090, 984, # 3552
-4695,3749,1960,5449,3750, 852, 923,2808,3513,3751, 969,1519, 999,2049,2325,1705, # 3568
-5450,3118, 615,1662, 151, 597,4095,2410,2326,1049, 275,4696,3752,4337, 568,3753, # 3584
-3626,2487,4338,3754,5451,2430,2275, 409,3249,5452,1566,2888,3514,1002, 769,2853, # 3600
- 194,2091,3174,3755,2226,3327,4339, 628,1505,5453,5454,1763,2180,3019,4096, 521, # 3616
-1161,2592,1788,2206,2411,4697,4097,1625,4340,4341, 412,  42,3119, 464,5455,2642, # 3632
-4698,3400,1760,1571,2889,3515,2537,1219,2207,3893,2643,2141,2373,4699,4700,3328, # 3648
-1651,3401,3627,5456,5457,3628,2488,3516,5458,3756,5459,5460,2276,2092, 460,5461, # 3664
-4701,5462,3020, 962, 588,3629, 289,3250,2644,1116,  52,5463,3067,1797,5464,5465, # 3680
-5466,1467,5467,1598,1143,3757,4342,1985,1734,1067,4702,1280,3402, 465,4703,1572, # 3696
- 510,5468,1928,2245,1813,1644,3630,5469,4704,3758,5470,5471,2673,1573,1534,5472, # 3712
-5473, 536,1808,1761,3517,3894,3175,2645,5474,5475,5476,4705,3518,2929,1912,2809, # 3728
-5477,3329,1122, 377,3251,5478, 360,5479,5480,4343,1529, 551,5481,2060,3759,1769, # 3744
-2431,5482,2930,4344,3330,3120,2327,2109,2031,4706,1404, 136,1468,1479, 672,1171, # 3760
-3252,2308, 271,3176,5483,2772,5484,2050, 678,2736, 865,1948,4707,5485,2014,4098, # 3776
-2971,5486,2737,2227,1397,3068,3760,4708,4709,1735,2931,3403,3631,5487,3895, 509, # 3792
-2854,2458,2890,3896,5488,5489,3177,3178,4710,4345,2538,4711,2309,1166,1010, 552, # 3808
- 681,1888,5490,5491,2972,2973,4099,1287,1596,1862,3179, 358, 453, 736, 175, 478, # 3824
-1117, 905,1167,1097,5492,1854,1530,5493,1706,5494,2181,3519,2292,3761,3520,3632, # 3840
-4346,2093,4347,5495,3404,1193,2489,4348,1458,2193,2208,1863,1889,1421,3331,2932, # 3856
-3069,2182,3521, 595,2123,5496,4100,5497,5498,4349,1707,2646, 223,3762,1359, 751, # 3872
-3121, 183,3522,5499,2810,3021, 419,2374, 633, 704,3897,2394, 241,5500,5501,5502, # 3888
- 838,3022,3763,2277,2773,2459,3898,1939,2051,4101,1309,3122,2246,1181,5503,1136, # 3904
-2209,3899,2375,1446,4350,2310,4712,5504,5505,4351,1055,2615, 484,3764,5506,4102, # 3920
- 625,4352,2278,3405,1499,4353,4103,5507,4104,4354,3253,2279,2280,3523,5508,5509, # 3936
-2774, 808,2616,3765,3406,4105,4355,3123,2539, 526,3407,3900,4356, 955,5510,1620, # 3952
-4357,2647,2432,5511,1429,3766,1669,1832, 994, 928,5512,3633,1260,5513,5514,5515, # 3968
-1949,2293, 741,2933,1626,4358,2738,2460, 867,1184, 362,3408,1392,5516,5517,4106, # 3984
-4359,1770,1736,3254,2934,4713,4714,1929,2707,1459,1158,5518,3070,3409,2891,1292, # 4000
-1930,2513,2855,3767,1986,1187,2072,2015,2617,4360,5519,2574,2514,2170,3768,2490, # 4016
-3332,5520,3769,4715,5521,5522, 666,1003,3023,1022,3634,4361,5523,4716,1814,2257, # 4032
- 574,3901,1603, 295,1535, 705,3902,4362, 283, 858, 417,5524,5525,3255,4717,4718, # 4048
-3071,1220,1890,1046,2281,2461,4107,1393,1599, 689,2575, 388,4363,5526,2491, 802, # 4064
-5527,2811,3903,2061,1405,2258,5528,4719,3904,2110,1052,1345,3256,1585,5529, 809, # 4080
-5530,5531,5532, 575,2739,3524, 956,1552,1469,1144,2328,5533,2329,1560,2462,3635, # 4096
-3257,4108, 616,2210,4364,3180,2183,2294,5534,1833,5535,3525,4720,5536,1319,3770, # 4112
-3771,1211,3636,1023,3258,1293,2812,5537,5538,5539,3905, 607,2311,3906, 762,2892, # 4128
-1439,4365,1360,4721,1485,3072,5540,4722,1038,4366,1450,2062,2648,4367,1379,4723, # 4144
-2593,5541,5542,4368,1352,1414,2330,2935,1172,5543,5544,3907,3908,4724,1798,1451, # 4160
-5545,5546,5547,5548,2936,4109,4110,2492,2351, 411,4111,4112,3637,3333,3124,4725, # 4176
-1561,2674,1452,4113,1375,5549,5550,  47,2974, 316,5551,1406,1591,2937,3181,5552, # 4192
-1025,2142,3125,3182, 354,2740, 884,2228,4369,2412, 508,3772, 726,3638, 996,2433, # 4208
-3639, 729,5553, 392,2194,1453,4114,4726,3773,5554,5555,2463,3640,2618,1675,2813, # 4224
- 919,2352,2975,2353,1270,4727,4115,  73,5556,5557, 647,5558,3259,2856,2259,1550, # 4240
-1346,3024,5559,1332, 883,3526,5560,5561,5562,5563,3334,2775,5564,1212, 831,1347, # 4256
-4370,4728,2331,3909,1864,3073, 720,3910,4729,4730,3911,5565,4371,5566,5567,4731, # 4272
-5568,5569,1799,4732,3774,2619,4733,3641,1645,2376,4734,5570,2938, 669,2211,2675, # 4288
-2434,5571,2893,5572,5573,1028,3260,5574,4372,2413,5575,2260,1353,5576,5577,4735, # 4304
-3183, 518,5578,4116,5579,4373,1961,5580,2143,4374,5581,5582,3025,2354,2355,3912, # 4320
- 516,1834,1454,4117,2708,4375,4736,2229,2620,1972,1129,3642,5583,2776,5584,2976, # 4336
-1422, 577,1470,3026,1524,3410,5585,5586, 432,4376,3074,3527,5587,2594,1455,2515, # 4352
-2230,1973,1175,5588,1020,2741,4118,3528,4737,5589,2742,5590,1743,1361,3075,3529, # 4368
-2649,4119,4377,4738,2295, 895, 924,4378,2171, 331,2247,3076, 166,1627,3077,1098, # 4384
-5591,1232,2894,2231,3411,4739, 657, 403,1196,2377, 542,3775,3412,1600,4379,3530, # 4400
-5592,4740,2777,3261, 576, 530,1362,4741,4742,2540,2676,3776,4120,5593, 842,3913, # 4416
-5594,2814,2032,1014,4121, 213,2709,3413, 665, 621,4380,5595,3777,2939,2435,5596, # 4432
-2436,3335,3643,3414,4743,4381,2541,4382,4744,3644,1682,4383,3531,1380,5597, 724, # 4448
-2282, 600,1670,5598,1337,1233,4745,3126,2248,5599,1621,4746,5600, 651,4384,5601, # 4464
-1612,4385,2621,5602,2857,5603,2743,2312,3078,5604, 716,2464,3079, 174,1255,2710, # 4480
-4122,3645, 548,1320,1398, 728,4123,1574,5605,1891,1197,3080,4124,5606,3081,3082, # 4496
-3778,3646,3779, 747,5607, 635,4386,4747,5608,5609,5610,4387,5611,5612,4748,5613, # 4512
-3415,4749,2437, 451,5614,3780,2542,2073,4388,2744,4389,4125,5615,1764,4750,5616, # 4528
-4390, 350,4751,2283,2395,2493,5617,4391,4126,2249,1434,4127, 488,4752, 458,4392, # 4544
-4128,3781, 771,1330,2396,3914,2576,3184,2160,2414,1553,2677,3185,4393,5618,2494, # 4560
-2895,2622,1720,2711,4394,3416,4753,5619,2543,4395,5620,3262,4396,2778,5621,2016, # 4576
-2745,5622,1155,1017,3782,3915,5623,3336,2313, 201,1865,4397,1430,5624,4129,5625, # 4592
-5626,5627,5628,5629,4398,1604,5630, 414,1866, 371,2595,4754,4755,3532,2017,3127, # 4608
-4756,1708, 960,4399, 887, 389,2172,1536,1663,1721,5631,2232,4130,2356,2940,1580, # 4624
-5632,5633,1744,4757,2544,4758,4759,5634,4760,5635,2074,5636,4761,3647,3417,2896, # 4640
-4400,5637,4401,2650,3418,2815, 673,2712,2465, 709,3533,4131,3648,4402,5638,1148, # 4656
- 502, 634,5639,5640,1204,4762,3649,1575,4763,2623,3783,5641,3784,3128, 948,3263, # 4672
- 121,1745,3916,1110,5642,4403,3083,2516,3027,4132,3785,1151,1771,3917,1488,4133, # 4688
-1987,5643,2438,3534,5644,5645,2094,5646,4404,3918,1213,1407,2816, 531,2746,2545, # 4704
-3264,1011,1537,4764,2779,4405,3129,1061,5647,3786,3787,1867,2897,5648,2018, 120, # 4720
-4406,4407,2063,3650,3265,2314,3919,2678,3419,1955,4765,4134,5649,3535,1047,2713, # 4736
-1266,5650,1368,4766,2858, 649,3420,3920,2546,2747,1102,2859,2679,5651,5652,2000, # 4752
-5653,1111,3651,2977,5654,2495,3921,3652,2817,1855,3421,3788,5655,5656,3422,2415, # 4768
-2898,3337,3266,3653,5657,2577,5658,3654,2818,4135,1460, 856,5659,3655,5660,2899, # 4784
-2978,5661,2900,3922,5662,4408, 632,2517, 875,3923,1697,3924,2296,5663,5664,4767, # 4800
-3028,1239, 580,4768,4409,5665, 914, 936,2075,1190,4136,1039,2124,5666,5667,5668, # 4816
-5669,3423,1473,5670,1354,4410,3925,4769,2173,3084,4137, 915,3338,4411,4412,3339, # 4832
-1605,1835,5671,2748, 398,3656,4413,3926,4138, 328,1913,2860,4139,3927,1331,4414, # 4848
-3029, 937,4415,5672,3657,4140,4141,3424,2161,4770,3425, 524, 742, 538,3085,1012, # 4864
-5673,5674,3928,2466,5675, 658,1103, 225,3929,5676,5677,4771,5678,4772,5679,3267, # 4880
-1243,5680,4142, 963,2250,4773,5681,2714,3658,3186,5682,5683,2596,2332,5684,4774, # 4896
-5685,5686,5687,3536, 957,3426,2547,2033,1931,2941,2467, 870,2019,3659,1746,2780, # 4912
-2781,2439,2468,5688,3930,5689,3789,3130,3790,3537,3427,3791,5690,1179,3086,5691, # 4928
-3187,2378,4416,3792,2548,3188,3131,2749,4143,5692,3428,1556,2549,2297, 977,2901, # 4944
-2034,4144,1205,3429,5693,1765,3430,3189,2125,1271, 714,1689,4775,3538,5694,2333, # 4960
-3931, 533,4417,3660,2184, 617,5695,2469,3340,3539,2315,5696,5697,3190,5698,5699, # 4976
-3932,1988, 618, 427,2651,3540,3431,5700,5701,1244,1690,5702,2819,4418,4776,5703, # 4992
-3541,4777,5704,2284,1576, 473,3661,4419,3432, 972,5705,3662,5706,3087,5707,5708, # 5008
-4778,4779,5709,3793,4145,4146,5710, 153,4780, 356,5711,1892,2902,4420,2144, 408, # 5024
- 803,2357,5712,3933,5713,4421,1646,2578,2518,4781,4782,3934,5714,3935,4422,5715, # 5040
-2416,3433, 752,5716,5717,1962,3341,2979,5718, 746,3030,2470,4783,4423,3794, 698, # 5056
-4784,1893,4424,3663,2550,4785,3664,3936,5719,3191,3434,5720,1824,1302,4147,2715, # 5072
-3937,1974,4425,5721,4426,3192, 823,1303,1288,1236,2861,3542,4148,3435, 774,3938, # 5088
-5722,1581,4786,1304,2862,3939,4787,5723,2440,2162,1083,3268,4427,4149,4428, 344, # 5104
-1173, 288,2316, 454,1683,5724,5725,1461,4788,4150,2597,5726,5727,4789, 985, 894, # 5120
-5728,3436,3193,5729,1914,2942,3795,1989,5730,2111,1975,5731,4151,5732,2579,1194, # 5136
- 425,5733,4790,3194,1245,3796,4429,5734,5735,2863,5736, 636,4791,1856,3940, 760, # 5152
-1800,5737,4430,2212,1508,4792,4152,1894,1684,2298,5738,5739,4793,4431,4432,2213, # 5168
- 479,5740,5741, 832,5742,4153,2496,5743,2980,2497,3797, 990,3132, 627,1815,2652, # 5184
-4433,1582,4434,2126,2112,3543,4794,5744, 799,4435,3195,5745,4795,2113,1737,3031, # 5200
-1018, 543, 754,4436,3342,1676,4796,4797,4154,4798,1489,5746,3544,5747,2624,2903, # 5216
-4155,5748,5749,2981,5750,5751,5752,5753,3196,4799,4800,2185,1722,5754,3269,3270, # 5232
-1843,3665,1715, 481, 365,1976,1857,5755,5756,1963,2498,4801,5757,2127,3666,3271, # 5248
- 433,1895,2064,2076,5758, 602,2750,5759,5760,5761,5762,5763,3032,1628,3437,5764, # 5264
-3197,4802,4156,2904,4803,2519,5765,2551,2782,5766,5767,5768,3343,4804,2905,5769, # 5280
-4805,5770,2864,4806,4807,1221,2982,4157,2520,5771,5772,5773,1868,1990,5774,5775, # 5296
-5776,1896,5777,5778,4808,1897,4158, 318,5779,2095,4159,4437,5780,5781, 485,5782, # 5312
- 938,3941, 553,2680, 116,5783,3942,3667,5784,3545,2681,2783,3438,3344,2820,5785, # 5328
-3668,2943,4160,1747,2944,2983,5786,5787, 207,5788,4809,5789,4810,2521,5790,3033, # 5344
- 890,3669,3943,5791,1878,3798,3439,5792,2186,2358,3440,1652,5793,5794,5795, 941, # 5360
-2299, 208,3546,4161,2020, 330,4438,3944,2906,2499,3799,4439,4811,5796,5797,5798, # 5376  #last 512
-#Everything below is of no interest for detection purpose
-2522,1613,4812,5799,3345,3945,2523,5800,4162,5801,1637,4163,2471,4813,3946,5802, # 5392
-2500,3034,3800,5803,5804,2195,4814,5805,2163,5806,5807,5808,5809,5810,5811,5812, # 5408
-5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828, # 5424
-5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844, # 5440
-5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860, # 5456
-5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,5875,5876, # 5472
-5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,5890,5891,5892, # 5488
-5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,5906,5907,5908, # 5504
-5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,5921,5922,5923,5924, # 5520
-5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5938,5939,5940, # 5536
-5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952,5953,5954,5955,5956, # 5552
-5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,5969,5970,5971,5972, # 5568
-5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984,5985,5986,5987,5988, # 5584
-5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004, # 5600
-6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020, # 5616
-6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036, # 5632
-6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052, # 5648
-6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068, # 5664
-6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084, # 5680
-6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100, # 5696
-6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116, # 5712
-6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,6132, # 5728
-6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,6145,6146,6147,6148, # 5744
-6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,6164, # 5760
-6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,6180, # 5776
-6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,6194,6195,6196, # 5792
-6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,6211,6212, # 5808
-6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,3670,6224,6225,6226,6227, # 5824
-6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,6242,6243, # 5840
-6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259, # 5856
-6260,6261,6262,6263,6264,6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275, # 5872
-6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,4815,6286,6287,6288,6289,6290, # 5888
-6291,6292,4816,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305, # 5904
-6306,6307,6308,6309,6310,6311,4817,4818,6312,6313,6314,6315,6316,6317,6318,4819, # 5920
-6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334, # 5936
-6335,6336,6337,4820,6338,6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349, # 5952
-6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365, # 5968
-6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381, # 5984
-6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397, # 6000
-6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,3441,6411,6412, # 6016
-6413,6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,4440,6426,6427, # 6032
-6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443, # 6048
-6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,4821,6455,6456,6457,6458, # 6064
-6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474, # 6080
-6475,6476,6477,3947,3948,6478,6479,6480,6481,3272,4441,6482,6483,6484,6485,4442, # 6096
-6486,6487,6488,6489,6490,6491,6492,6493,6494,6495,6496,4822,6497,6498,6499,6500, # 6112
-6501,6502,6503,6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516, # 6128
-6517,6518,6519,6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532, # 6144
-6533,6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548, # 6160
-6549,6550,6551,6552,6553,6554,6555,6556,2784,6557,4823,6558,6559,6560,6561,6562, # 6176
-6563,6564,6565,6566,6567,6568,6569,3949,6570,6571,6572,4824,6573,6574,6575,6576, # 6192
-6577,6578,6579,6580,6581,6582,6583,4825,6584,6585,6586,3950,2785,6587,6588,6589, # 6208
-6590,6591,6592,6593,6594,6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605, # 6224
-6606,6607,6608,6609,6610,6611,6612,4826,6613,6614,6615,4827,6616,6617,6618,6619, # 6240
-6620,6621,6622,6623,6624,6625,4164,6626,6627,6628,6629,6630,6631,6632,6633,6634, # 6256
-3547,6635,4828,6636,6637,6638,6639,6640,6641,6642,3951,2984,6643,6644,6645,6646, # 6272
-6647,6648,6649,4165,6650,4829,6651,6652,4830,6653,6654,6655,6656,6657,6658,6659, # 6288
-6660,6661,6662,4831,6663,6664,6665,6666,6667,6668,6669,6670,6671,4166,6672,4832, # 6304
-3952,6673,6674,6675,6676,4833,6677,6678,6679,4167,6680,6681,6682,3198,6683,6684, # 6320
-6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,4834,6698,6699, # 6336
-6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715, # 6352
-6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731, # 6368
-6732,6733,6734,4443,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,6745,4444, # 6384
-6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761, # 6400
-6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777, # 6416
-6778,6779,6780,6781,4168,6782,6783,3442,6784,6785,6786,6787,6788,6789,6790,6791, # 6432
-4169,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806, # 6448
-6807,6808,6809,6810,6811,4835,6812,6813,6814,4445,6815,6816,4446,6817,6818,6819, # 6464
-6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,6835, # 6480
-3548,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,4836,6847,6848,6849, # 6496
-6850,6851,6852,6853,6854,3953,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864, # 6512
-6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,3199,6878,6879, # 6528
-6880,6881,6882,4447,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894, # 6544
-6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,4170,6905,6906,6907,6908,6909, # 6560
-6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,6925, # 6576
-6926,6927,4837,6928,6929,6930,6931,6932,6933,6934,6935,6936,3346,6937,6938,4838, # 6592
-6939,6940,6941,4448,6942,6943,6944,6945,6946,4449,6947,6948,6949,6950,6951,6952, # 6608
-6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968, # 6624
-6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984, # 6640
-6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,3671,6995,6996,6997,6998,4839, # 6656
-6999,7000,7001,7002,3549,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013, # 6672
-7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029, # 6688
-7030,4840,7031,7032,7033,7034,7035,7036,7037,7038,4841,7039,7040,7041,7042,7043, # 6704
-7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059, # 6720
-7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,2985,7071,7072,7073,7074, # 6736
-7075,7076,7077,7078,7079,7080,4842,7081,7082,7083,7084,7085,7086,7087,7088,7089, # 6752
-7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105, # 6768
-7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,4450,7119,7120, # 6784
-7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136, # 6800
-7137,7138,7139,7140,7141,7142,7143,4843,7144,7145,7146,7147,7148,7149,7150,7151, # 6816
-7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167, # 6832
-7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183, # 6848
-7184,7185,7186,7187,7188,4171,4172,7189,7190,7191,7192,7193,7194,7195,7196,7197, # 6864
-7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213, # 6880
-7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229, # 6896
-7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245, # 6912
-7246,7247,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261, # 6928
-7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277, # 6944
-7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293, # 6960
-7294,7295,7296,4844,7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308, # 6976
-7309,7310,7311,7312,7313,7314,7315,7316,4451,7317,7318,7319,7320,7321,7322,7323, # 6992
-7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339, # 7008
-7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,4173,7354, # 7024
-7355,4845,7356,7357,7358,7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369, # 7040
-7370,7371,7372,7373,7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385, # 7056
-7386,7387,7388,4846,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400, # 7072
-7401,7402,7403,7404,7405,3672,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415, # 7088
-7416,7417,7418,7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431, # 7104
-7432,7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447, # 7120
-7448,7449,7450,7451,7452,7453,4452,7454,3200,7455,7456,7457,7458,7459,7460,7461, # 7136
-7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,4847,7475,7476, # 7152
-7477,3133,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491, # 7168
-7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,3347,7503,7504,7505,7506, # 7184
-7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,4848, # 7200
-7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537, # 7216
-7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,3801,4849,7550,7551, # 7232
-7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567, # 7248
-7568,7569,3035,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582, # 7264
-7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598, # 7280
-7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614, # 7296
-7615,7616,4850,7617,7618,3802,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628, # 7312
-7629,7630,7631,7632,4851,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643, # 7328
-7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659, # 7344
-7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,4453,7671,7672,7673,7674, # 7360
-7675,7676,7677,7678,7679,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690, # 7376
-7691,7692,7693,7694,7695,7696,7697,3443,7698,7699,7700,7701,7702,4454,7703,7704, # 7392
-7705,7706,7707,7708,7709,7710,7711,7712,7713,2472,7714,7715,7716,7717,7718,7719, # 7408
-7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,3954,7732,7733,7734, # 7424
-7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750, # 7440
-3134,7751,7752,4852,7753,7754,7755,4853,7756,7757,7758,7759,7760,4174,7761,7762, # 7456
-7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778, # 7472
-7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794, # 7488
-7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,4854,7806,7807,7808,7809, # 7504
-7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825, # 7520
-4855,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7536
-7841,7842,7843,7844,7845,7846,7847,3955,7848,7849,7850,7851,7852,7853,7854,7855, # 7552
-7856,7857,7858,7859,7860,3444,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870, # 7568
-7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886, # 7584
-7887,7888,7889,7890,7891,4175,7892,7893,7894,7895,7896,4856,4857,7897,7898,7899, # 7600
-7900,2598,7901,7902,7903,7904,7905,7906,7907,7908,4455,7909,7910,7911,7912,7913, # 7616
-7914,3201,7915,7916,7917,7918,7919,7920,7921,4858,7922,7923,7924,7925,7926,7927, # 7632
-7928,7929,7930,7931,7932,7933,7934,7935,7936,7937,7938,7939,7940,7941,7942,7943, # 7648
-7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7958,7959, # 7664
-7960,7961,7962,7963,7964,7965,7966,7967,7968,7969,7970,7971,7972,7973,7974,7975, # 7680
-7976,7977,7978,7979,7980,7981,4859,7982,7983,7984,7985,7986,7987,7988,7989,7990, # 7696
-7991,7992,7993,7994,7995,7996,4860,7997,7998,7999,8000,8001,8002,8003,8004,8005, # 7712
-8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,4176,8017,8018,8019,8020, # 7728
-8021,8022,8023,4861,8024,8025,8026,8027,8028,8029,8030,8031,8032,8033,8034,8035, # 7744
-8036,4862,4456,8037,8038,8039,8040,4863,8041,8042,8043,8044,8045,8046,8047,8048, # 7760
-8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,8064, # 7776
-8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080, # 7792
-8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096, # 7808
-8097,8098,8099,4864,4177,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110, # 7824
-8111,8112,8113,8114,8115,8116,8117,8118,8119,8120,4178,8121,8122,8123,8124,8125, # 7840
-8126,8127,8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141, # 7856
-8142,8143,8144,8145,4865,4866,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155, # 7872
-8156,8157,8158,8159,8160,8161,8162,8163,8164,8165,4179,8166,8167,8168,8169,8170, # 7888
-8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181,4457,8182,8183,8184,8185, # 7904
-8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201, # 7920
-8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213,8214,8215,8216,8217, # 7936
-8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229,8230,8231,8232,8233, # 7952
-8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245,8246,8247,8248,8249, # 7968
-8250,8251,8252,8253,8254,8255,8256,3445,8257,8258,8259,8260,8261,8262,4458,8263, # 7984
-8264,8265,8266,8267,8268,8269,8270,8271,8272,4459,8273,8274,8275,8276,3550,8277, # 8000
-8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,4460,8290,8291,8292, # 8016
-8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,4867, # 8032
-8308,8309,8310,8311,8312,3551,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322, # 8048
-8323,8324,8325,8326,4868,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337, # 8064
-8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353, # 8080
-8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,4869,4461,8364,8365,8366,8367, # 8096
-8368,8369,8370,4870,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382, # 8112
-8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398, # 8128
-8399,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,4871,8411,8412,8413, # 8144
-8414,8415,8416,8417,8418,8419,8420,8421,8422,4462,8423,8424,8425,8426,8427,8428, # 8160
-8429,8430,8431,8432,8433,2986,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443, # 8176
-8444,8445,8446,8447,8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459, # 8192
-8460,8461,8462,8463,8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475, # 8208
-8476,8477,8478,4180,8479,8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490, # 8224
-8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506, # 8240
-8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522, # 8256
-8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538, # 8272
-8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554, # 8288
-8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,4872,8565,8566,8567,8568,8569, # 8304
-8570,8571,8572,8573,4873,8574,8575,8576,8577,8578,8579,8580,8581,8582,8583,8584, # 8320
-8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,8600, # 8336
-8601,8602,8603,8604,8605,3803,8606,8607,8608,8609,8610,8611,8612,8613,4874,3804, # 8352
-8614,8615,8616,8617,8618,8619,8620,8621,3956,8622,8623,8624,8625,8626,8627,8628, # 8368
-8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,2865,8639,8640,8641,8642,8643, # 8384
-8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,4463,8657,8658, # 8400
-8659,4875,4876,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672, # 8416
-8673,8674,8675,8676,8677,8678,8679,8680,8681,4464,8682,8683,8684,8685,8686,8687, # 8432
-8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703, # 8448
-8704,8705,8706,8707,8708,8709,2261,8710,8711,8712,8713,8714,8715,8716,8717,8718, # 8464
-8719,8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,4181, # 8480
-8734,8735,8736,8737,8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749, # 8496
-8750,8751,8752,8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,4877,8764, # 8512
-8765,8766,8767,8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,8780, # 8528
-8781,8782,8783,8784,8785,8786,8787,8788,4878,8789,4879,8790,8791,8792,4880,8793, # 8544
-8794,8795,8796,8797,8798,8799,8800,8801,4881,8802,8803,8804,8805,8806,8807,8808, # 8560
-8809,8810,8811,8812,8813,8814,8815,3957,8816,8817,8818,8819,8820,8821,8822,8823, # 8576
-8824,8825,8826,8827,8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839, # 8592
-8840,8841,8842,8843,8844,8845,8846,8847,4882,8848,8849,8850,8851,8852,8853,8854, # 8608
-8855,8856,8857,8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,8870, # 8624
-8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,3202,8885, # 8640
-8886,8887,8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,8900,8901, # 8656
-8902,8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,8915,8916,8917, # 8672
-8918,8919,8920,8921,8922,8923,8924,4465,8925,8926,8927,8928,8929,8930,8931,8932, # 8688
-4883,8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,2214,8944,8945,8946, # 8704
-8947,8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,8960,8961,8962, # 8720
-8963,8964,8965,4884,8966,8967,8968,8969,8970,8971,8972,8973,8974,8975,8976,8977, # 8736
-8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,4885, # 8752
-8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008, # 8768
-9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,9020,9021,4182,9022,9023, # 8784
-9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,9038,9039, # 8800
-9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,9053,9054,9055, # 8816
-9056,9057,9058,9059,9060,9061,9062,9063,4886,9064,9065,9066,9067,9068,9069,4887, # 8832
-9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,9083,9084,9085, # 8848
-9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9101, # 8864
-9102,9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,9113,9114,9115,9116,9117, # 8880
-9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,9128,9129,9130,9131,9132,9133, # 8896
-9134,9135,9136,9137,9138,9139,9140,9141,3958,9142,9143,9144,9145,9146,9147,9148, # 8912
-9149,9150,9151,4888,9152,9153,9154,9155,9156,9157,9158,9159,9160,9161,9162,9163, # 8928
-9164,9165,9166,9167,9168,9169,9170,9171,9172,9173,9174,9175,4889,9176,9177,9178, # 8944
-9179,9180,9181,9182,9183,9184,9185,9186,9187,9188,9189,9190,9191,9192,9193,9194, # 8960
-9195,9196,9197,9198,9199,9200,9201,9202,9203,4890,9204,9205,9206,9207,9208,9209, # 8976
-9210,9211,9212,9213,9214,9215,9216,9217,9218,9219,9220,9221,9222,4466,9223,9224, # 8992
-9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240, # 9008
-9241,9242,9243,9244,9245,4891,9246,9247,9248,9249,9250,9251,9252,9253,9254,9255, # 9024
-9256,9257,4892,9258,9259,9260,9261,4893,4894,9262,9263,9264,9265,9266,9267,9268, # 9040
-9269,9270,9271,9272,9273,4467,9274,9275,9276,9277,9278,9279,9280,9281,9282,9283, # 9056
-9284,9285,3673,9286,9287,9288,9289,9290,9291,9292,9293,9294,9295,9296,9297,9298, # 9072
-9299,9300,9301,9302,9303,9304,9305,9306,9307,9308,9309,9310,9311,9312,9313,9314, # 9088
-9315,9316,9317,9318,9319,9320,9321,9322,4895,9323,9324,9325,9326,9327,9328,9329, # 9104
-9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345, # 9120
-9346,9347,4468,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360, # 9136
-9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,4896,9374,4469, # 9152
-9375,9376,9377,9378,9379,4897,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389, # 9168
-9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405, # 9184
-9406,4470,9407,2751,9408,9409,3674,3552,9410,9411,9412,9413,9414,9415,9416,9417, # 9200
-9418,9419,9420,9421,4898,9422,9423,9424,9425,9426,9427,9428,9429,3959,9430,9431, # 9216
-9432,9433,9434,9435,9436,4471,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446, # 9232
-9447,9448,9449,9450,3348,9451,9452,9453,9454,9455,9456,9457,9458,9459,9460,9461, # 9248
-9462,9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,4899,9473,9474,9475,9476, # 9264
-9477,4900,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,3349,9489,9490, # 9280
-9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506, # 9296
-9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,4901,9521, # 9312
-9522,9523,9524,9525,9526,4902,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536, # 9328
-9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,9548,9549,9550,9551,9552, # 9344
-9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568, # 9360
-9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584, # 9376
-3805,9585,9586,9587,9588,9589,9590,9591,9592,9593,9594,9595,9596,9597,9598,9599, # 9392
-9600,9601,9602,4903,9603,9604,9605,9606,9607,4904,9608,9609,9610,9611,9612,9613, # 9408
-9614,4905,9615,9616,9617,9618,9619,9620,9621,9622,9623,9624,9625,9626,9627,9628, # 9424
-9629,9630,9631,9632,4906,9633,9634,9635,9636,9637,9638,9639,9640,9641,9642,9643, # 9440
-4907,9644,9645,9646,9647,9648,9649,9650,9651,9652,9653,9654,9655,9656,9657,9658, # 9456
-9659,9660,9661,9662,9663,9664,9665,9666,9667,9668,9669,9670,9671,9672,4183,9673, # 9472
-9674,9675,9676,9677,4908,9678,9679,9680,9681,4909,9682,9683,9684,9685,9686,9687, # 9488
-9688,9689,9690,4910,9691,9692,9693,3675,9694,9695,9696,2945,9697,9698,9699,9700, # 9504
-9701,9702,9703,9704,9705,4911,9706,9707,9708,9709,9710,9711,9712,9713,9714,9715, # 9520
-9716,9717,9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,9728,9729,9730,9731, # 9536
-9732,9733,9734,9735,4912,9736,9737,9738,9739,9740,4913,9741,9742,9743,9744,9745, # 9552
-9746,9747,9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,9758,4914,9759,9760, # 9568
-9761,9762,9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,9773,9774,9775,9776, # 9584
-9777,9778,9779,9780,9781,9782,4915,9783,9784,9785,9786,9787,9788,9789,9790,9791, # 9600
-9792,9793,4916,9794,9795,9796,9797,9798,9799,9800,9801,9802,9803,9804,9805,9806, # 9616
-9807,9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,9818,9819,9820,9821,9822, # 9632
-9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,9833,9834,9835,9836,9837,9838, # 9648
-9839,9840,9841,9842,9843,9844,9845,9846,9847,9848,9849,9850,9851,9852,9853,9854, # 9664
-9855,9856,9857,9858,9859,9860,9861,9862,9863,9864,9865,9866,9867,9868,4917,9869, # 9680
-9870,9871,9872,9873,9874,9875,9876,9877,9878,9879,9880,9881,9882,9883,9884,9885, # 9696
-9886,9887,9888,9889,9890,9891,9892,4472,9893,9894,9895,9896,9897,3806,9898,9899, # 9712
-9900,9901,9902,9903,9904,9905,9906,9907,9908,9909,9910,9911,9912,9913,9914,4918, # 9728
-9915,9916,9917,4919,9918,9919,9920,9921,4184,9922,9923,9924,9925,9926,9927,9928, # 9744
-9929,9930,9931,9932,9933,9934,9935,9936,9937,9938,9939,9940,9941,9942,9943,9944, # 9760
-9945,9946,4920,9947,9948,9949,9950,9951,9952,9953,9954,9955,4185,9956,9957,9958, # 9776
-9959,9960,9961,9962,9963,9964,9965,4921,9966,9967,9968,4473,9969,9970,9971,9972, # 9792
-9973,9974,9975,9976,9977,4474,9978,9979,9980,9981,9982,9983,9984,9985,9986,9987, # 9808
-9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,10000,10001,10002,10003, # 9824
-10004,10005,10006,10007,10008,10009,10010,10011,10012,10013,10014,10015,10016,10017,10018,10019, # 9840
-10020,10021,4922,10022,4923,10023,10024,10025,10026,10027,10028,10029,10030,10031,10032,10033, # 9856
-10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,10044,10045,10046,10047,10048,4924, # 9872
-10049,10050,10051,10052,10053,10054,10055,10056,10057,10058,10059,10060,10061,10062,10063,10064, # 9888
-10065,10066,10067,10068,10069,10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,10080, # 9904
-10081,10082,10083,10084,10085,10086,10087,4475,10088,10089,10090,10091,10092,10093,10094,10095, # 9920
-10096,10097,4476,10098,10099,10100,10101,10102,10103,10104,10105,10106,10107,10108,10109,10110, # 9936
-10111,2174,10112,10113,10114,10115,10116,10117,10118,10119,10120,10121,10122,10123,10124,10125, # 9952
-10126,10127,10128,10129,10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,10140,3807, # 9968
-4186,4925,10141,10142,10143,10144,10145,10146,10147,4477,4187,10148,10149,10150,10151,10152, # 9984
-10153,4188,10154,10155,10156,10157,10158,10159,10160,10161,4926,10162,10163,10164,10165,10166, #10000
-10167,10168,10169,10170,10171,10172,10173,10174,10175,10176,10177,10178,10179,10180,10181,10182, #10016
-10183,10184,10185,10186,10187,10188,10189,10190,10191,10192,3203,10193,10194,10195,10196,10197, #10032
-10198,10199,10200,4478,10201,10202,10203,10204,4479,10205,10206,10207,10208,10209,10210,10211, #10048
-10212,10213,10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,10224,10225,10226,10227, #10064
-10228,10229,10230,10231,10232,10233,10234,4927,10235,10236,10237,10238,10239,10240,10241,10242, #10080
-10243,10244,10245,10246,10247,10248,10249,10250,10251,10252,10253,10254,10255,10256,10257,10258, #10096
-10259,10260,10261,10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,10272,10273,4480, #10112
-4928,4929,10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,10284,10285,10286,10287, #10128
-10288,10289,10290,10291,10292,10293,10294,10295,10296,10297,10298,10299,10300,10301,10302,10303, #10144
-10304,10305,10306,10307,10308,10309,10310,10311,10312,10313,10314,10315,10316,10317,10318,10319, #10160
-10320,10321,10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,10332,10333,10334,4930, #10176
-10335,10336,10337,10338,10339,10340,10341,10342,4931,10343,10344,10345,10346,10347,10348,10349, #10192
-10350,10351,10352,10353,10354,10355,3088,10356,2786,10357,10358,10359,10360,4189,10361,10362, #10208
-10363,10364,10365,10366,10367,10368,10369,10370,10371,10372,10373,10374,10375,4932,10376,10377, #10224
-10378,10379,10380,10381,10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,10392,4933, #10240
-10393,10394,10395,4934,10396,10397,10398,10399,10400,10401,10402,10403,10404,10405,10406,10407, #10256
-10408,10409,10410,10411,10412,3446,10413,10414,10415,10416,10417,10418,10419,10420,10421,10422, #10272
-10423,4935,10424,10425,10426,10427,10428,10429,10430,4936,10431,10432,10433,10434,10435,10436, #10288
-10437,10438,10439,10440,10441,10442,10443,4937,10444,10445,10446,10447,4481,10448,10449,10450, #10304
-10451,10452,10453,10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,10464,10465,10466, #10320
-10467,10468,10469,10470,10471,10472,10473,10474,10475,10476,10477,10478,10479,10480,10481,10482, #10336
-10483,10484,10485,10486,10487,10488,10489,10490,10491,10492,10493,10494,10495,10496,10497,10498, #10352
-10499,10500,10501,10502,10503,10504,10505,4938,10506,10507,10508,10509,10510,2552,10511,10512, #10368
-10513,10514,10515,10516,3447,10517,10518,10519,10520,10521,10522,10523,10524,10525,10526,10527, #10384
-10528,10529,10530,10531,10532,10533,10534,10535,10536,10537,10538,10539,10540,10541,10542,10543, #10400
-4482,10544,4939,10545,10546,10547,10548,10549,10550,10551,10552,10553,10554,10555,10556,10557, #10416
-10558,10559,10560,10561,10562,10563,10564,10565,10566,10567,3676,4483,10568,10569,10570,10571, #10432
-10572,3448,10573,10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,10584,10585,10586, #10448
-10587,10588,10589,10590,10591,10592,10593,10594,10595,10596,10597,10598,10599,10600,10601,10602, #10464
-10603,10604,10605,10606,10607,10608,10609,10610,10611,10612,10613,10614,10615,10616,10617,10618, #10480
-10619,10620,10621,10622,10623,10624,10625,10626,10627,4484,10628,10629,10630,10631,10632,4940, #10496
-10633,10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,10644,10645,10646,10647,10648, #10512
-10649,10650,10651,10652,10653,10654,10655,10656,4941,10657,10658,10659,2599,10660,10661,10662, #10528
-10663,10664,10665,10666,3089,10667,10668,10669,10670,10671,10672,10673,10674,10675,10676,10677, #10544
-10678,10679,10680,4942,10681,10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,10692, #10560
-10693,10694,10695,10696,10697,4485,10698,10699,10700,10701,10702,10703,10704,4943,10705,3677, #10576
-10706,10707,10708,10709,10710,10711,10712,4944,10713,10714,10715,10716,10717,10718,10719,10720, #10592
-10721,10722,10723,10724,10725,10726,10727,10728,4945,10729,10730,10731,10732,10733,10734,10735, #10608
-10736,10737,10738,10739,10740,10741,10742,10743,10744,10745,10746,10747,10748,10749,10750,10751, #10624
-10752,10753,10754,10755,10756,10757,10758,10759,10760,10761,4946,10762,10763,10764,10765,10766, #10640
-10767,4947,4948,10768,10769,10770,10771,10772,10773,10774,10775,10776,10777,10778,10779,10780, #10656
-10781,10782,10783,10784,10785,10786,10787,10788,10789,10790,10791,10792,10793,10794,10795,10796, #10672
-10797,10798,10799,10800,10801,10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,10812, #10688
-10813,10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,10824,10825,10826,10827,10828, #10704
-10829,10830,10831,10832,10833,10834,10835,10836,10837,10838,10839,10840,10841,10842,10843,10844, #10720
-10845,10846,10847,10848,10849,10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,10860, #10736
-10861,10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,10872,10873,10874,10875,10876, #10752
-10877,10878,4486,10879,10880,10881,10882,10883,10884,10885,4949,10886,10887,10888,10889,10890, #10768
-10891,10892,10893,10894,10895,10896,10897,10898,10899,10900,10901,10902,10903,10904,10905,10906, #10784
-10907,10908,10909,10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,4487,10920,10921, #10800
-10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,10932,4950,10933,10934,10935,10936, #10816
-10937,10938,10939,10940,10941,10942,10943,10944,10945,10946,10947,10948,10949,4488,10950,10951, #10832
-10952,10953,10954,10955,10956,10957,10958,10959,4190,10960,10961,10962,10963,10964,10965,10966, #10848
-10967,10968,10969,10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,10980,10981,10982, #10864
-10983,10984,10985,10986,10987,10988,10989,10990,10991,10992,10993,10994,10995,10996,10997,10998, #10880
-10999,11000,11001,11002,11003,11004,11005,11006,3960,11007,11008,11009,11010,11011,11012,11013, #10896
-11014,11015,11016,11017,11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,11028,11029, #10912
-11030,11031,11032,4951,11033,11034,11035,11036,11037,11038,11039,11040,11041,11042,11043,11044, #10928
-11045,11046,11047,4489,11048,11049,11050,11051,4952,11052,11053,11054,11055,11056,11057,11058, #10944
-4953,11059,11060,11061,11062,11063,11064,11065,11066,11067,11068,11069,11070,11071,4954,11072, #10960
-11073,11074,11075,11076,11077,11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,11088, #10976
-11089,11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,11100,11101,11102,11103,11104, #10992
-11105,11106,11107,11108,11109,11110,11111,11112,11113,11114,11115,3808,11116,11117,11118,11119, #11008
-11120,11121,11122,11123,11124,11125,11126,11127,11128,11129,11130,11131,11132,11133,11134,4955, #11024
-11135,11136,11137,11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,11148,11149,11150, #11040
-11151,11152,11153,11154,11155,11156,11157,11158,11159,11160,11161,4956,11162,11163,11164,11165, #11056
-11166,11167,11168,11169,11170,11171,11172,11173,11174,11175,11176,11177,11178,11179,11180,4957, #11072
-11181,11182,11183,11184,11185,11186,4958,11187,11188,11189,11190,11191,11192,11193,11194,11195, #11088
-11196,11197,11198,11199,11200,3678,11201,11202,11203,11204,11205,11206,4191,11207,11208,11209, #11104
-11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225, #11120
-11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241, #11136
-11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,4959,11252,11253,11254,11255,11256, #11152
-11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272, #11168
-11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288, #11184
-11289,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304, #11200
-11305,11306,11307,11308,11309,11310,11311,11312,11313,11314,3679,11315,11316,11317,11318,4490, #11216
-11319,11320,11321,11322,11323,11324,11325,11326,11327,11328,11329,11330,11331,11332,11333,11334, #11232
-11335,11336,11337,11338,11339,11340,11341,11342,11343,11344,11345,11346,11347,4960,11348,11349, #11248
-11350,11351,11352,11353,11354,11355,11356,11357,11358,11359,11360,11361,11362,11363,11364,11365, #11264
-11366,11367,11368,11369,11370,11371,11372,11373,11374,11375,11376,11377,3961,4961,11378,11379, #11280
-11380,11381,11382,11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11393,11394,11395, #11296
-11396,11397,4192,11398,11399,11400,11401,11402,11403,11404,11405,11406,11407,11408,11409,11410, #11312
-11411,4962,11412,11413,11414,11415,11416,11417,11418,11419,11420,11421,11422,11423,11424,11425, #11328
-11426,11427,11428,11429,11430,11431,11432,11433,11434,11435,11436,11437,11438,11439,11440,11441, #11344
-11442,11443,11444,11445,11446,11447,11448,11449,11450,11451,11452,11453,11454,11455,11456,11457, #11360
-11458,11459,11460,11461,11462,11463,11464,11465,11466,11467,11468,11469,4963,11470,11471,4491, #11376
-11472,11473,11474,11475,4964,11476,11477,11478,11479,11480,11481,11482,11483,11484,11485,11486, #11392
-11487,11488,11489,11490,11491,11492,4965,11493,11494,11495,11496,11497,11498,11499,11500,11501, #11408
-11502,11503,11504,11505,11506,11507,11508,11509,11510,11511,11512,11513,11514,11515,11516,11517, #11424
-11518,11519,11520,11521,11522,11523,11524,11525,11526,11527,11528,11529,3962,11530,11531,11532, #11440
-11533,11534,11535,11536,11537,11538,11539,11540,11541,11542,11543,11544,11545,11546,11547,11548, #11456
-11549,11550,11551,11552,11553,11554,11555,11556,11557,11558,11559,11560,11561,11562,11563,11564, #11472
-4193,4194,11565,11566,11567,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578, #11488
-11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,4966,4195,11592, #11504
-11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,3090,11605,11606,11607, #11520
-11608,11609,11610,4967,11611,11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622, #11536
-11623,11624,11625,11626,11627,11628,11629,11630,11631,11632,11633,11634,11635,11636,11637,11638, #11552
-11639,11640,11641,11642,11643,11644,11645,11646,11647,11648,11649,11650,11651,11652,11653,11654, #11568
-11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670, #11584
-11671,11672,11673,11674,4968,11675,11676,11677,11678,11679,11680,11681,11682,11683,11684,11685, #11600
-11686,11687,11688,11689,11690,11691,11692,11693,3809,11694,11695,11696,11697,11698,11699,11700, #11616
-11701,11702,11703,11704,11705,11706,11707,11708,11709,11710,11711,11712,11713,11714,11715,11716, #11632
-11717,11718,3553,11719,11720,11721,11722,11723,11724,11725,11726,11727,11728,11729,11730,4969, #11648
-11731,11732,11733,11734,11735,11736,11737,11738,11739,11740,4492,11741,11742,11743,11744,11745, #11664
-11746,11747,11748,11749,11750,11751,11752,4970,11753,11754,11755,11756,11757,11758,11759,11760, #11680
-11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776, #11696
-11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11788,11789,11790,4971,11791, #11712
-11792,11793,11794,11795,11796,11797,4972,11798,11799,11800,11801,11802,11803,11804,11805,11806, #11728
-11807,11808,11809,11810,4973,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821, #11744
-11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,3680,3810,11835, #11760
-11836,4974,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850, #11776
-11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11864,11865,11866, #11792
-11867,11868,11869,11870,11871,11872,11873,11874,11875,11876,11877,11878,11879,11880,11881,11882, #11808
-11883,11884,4493,11885,11886,11887,11888,11889,11890,11891,11892,11893,11894,11895,11896,11897, #11824
-11898,11899,11900,11901,11902,11903,11904,11905,11906,11907,11908,11909,11910,11911,11912,11913, #11840
-11914,11915,4975,11916,11917,11918,11919,11920,11921,11922,11923,11924,11925,11926,11927,11928, #11856
-11929,11930,11931,11932,11933,11934,11935,11936,11937,11938,11939,11940,11941,11942,11943,11944, #11872
-11945,11946,11947,11948,11949,4976,11950,11951,11952,11953,11954,11955,11956,11957,11958,11959, #11888
-11960,11961,11962,11963,11964,11965,11966,11967,11968,11969,11970,11971,11972,11973,11974,11975, #11904
-11976,11977,11978,11979,11980,11981,11982,11983,11984,11985,11986,11987,4196,11988,11989,11990, #11920
-11991,11992,4977,11993,11994,11995,11996,11997,11998,11999,12000,12001,12002,12003,12004,12005, #11936
-12006,12007,12008,12009,12010,12011,12012,12013,12014,12015,12016,12017,12018,12019,12020,12021, #11952
-12022,12023,12024,12025,12026,12027,12028,12029,12030,12031,12032,12033,12034,12035,12036,12037, #11968
-12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053, #11984
-12054,12055,12056,12057,12058,12059,12060,12061,4978,12062,12063,12064,12065,12066,12067,12068, #12000
-12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084, #12016
-12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100, #12032
-12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116, #12048
-12117,12118,12119,12120,12121,12122,12123,4979,12124,12125,12126,12127,12128,4197,12129,12130, #12064
-12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146, #12080
-12147,12148,12149,12150,12151,12152,12153,12154,4980,12155,12156,12157,12158,12159,12160,4494, #12096
-12161,12162,12163,12164,3811,12165,12166,12167,12168,12169,4495,12170,12171,4496,12172,12173, #12112
-12174,12175,12176,3812,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188, #12128
-12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204, #12144
-12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220, #12160
-12221,4981,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235, #12176
-4982,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,4983,12246,12247,12248,12249, #12192
-4984,12250,12251,12252,12253,12254,12255,12256,12257,12258,12259,12260,12261,12262,12263,12264, #12208
-4985,12265,4497,12266,12267,12268,12269,12270,12271,12272,12273,12274,12275,12276,12277,12278, #12224
-12279,12280,12281,12282,12283,12284,12285,12286,12287,4986,12288,12289,12290,12291,12292,12293, #12240
-12294,12295,12296,2473,12297,12298,12299,12300,12301,12302,12303,12304,12305,12306,12307,12308, #12256
-12309,12310,12311,12312,12313,12314,12315,12316,12317,12318,12319,3963,12320,12321,12322,12323, #12272
-12324,12325,12326,12327,12328,12329,12330,12331,12332,4987,12333,12334,12335,12336,12337,12338, #12288
-12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354, #12304
-12355,12356,12357,12358,12359,3964,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369, #12320
-12370,3965,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384, #12336
-12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400, #12352
-12401,12402,12403,12404,12405,12406,12407,12408,4988,12409,12410,12411,12412,12413,12414,12415, #12368
-12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431, #12384
-12432,12433,12434,12435,12436,12437,12438,3554,12439,12440,12441,12442,12443,12444,12445,12446, #12400
-12447,12448,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462, #12416
-12463,12464,4989,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477, #12432
-12478,12479,12480,4990,12481,12482,12483,12484,12485,12486,12487,12488,12489,4498,12490,12491, #12448
-12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507, #12464
-12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523, #12480
-12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,12539, #12496
-12540,12541,12542,12543,12544,12545,12546,12547,12548,12549,12550,12551,4991,12552,12553,12554, #12512
-12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570, #12528
-12571,12572,12573,12574,12575,12576,12577,12578,3036,12579,12580,12581,12582,12583,3966,12584, #12544
-12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12596,12597,12598,12599,12600, #12560
-12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616, #12576
-12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632, #12592
-12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,4499,12647, #12608
-12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663, #12624
-12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679, #12640
-12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695, #12656
-12696,12697,12698,4992,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710, #12672
-12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726, #12688
-12727,12728,12729,12730,12731,12732,12733,12734,12735,12736,12737,12738,12739,12740,12741,12742, #12704
-12743,12744,12745,12746,12747,12748,12749,12750,12751,12752,12753,12754,12755,12756,12757,12758, #12720
-12759,12760,12761,12762,12763,12764,12765,12766,12767,12768,12769,12770,12771,12772,12773,12774, #12736
-12775,12776,12777,12778,4993,2175,12779,12780,12781,12782,12783,12784,12785,12786,4500,12787, #12752
-12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,12800,12801,12802,12803, #12768
-12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819, #12784
-12820,12821,12822,12823,12824,12825,12826,4198,3967,12827,12828,12829,12830,12831,12832,12833, #12800
-12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849, #12816
-12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,4199,12862,12863,12864, #12832
-12865,12866,12867,12868,12869,12870,12871,12872,12873,12874,12875,12876,12877,12878,12879,12880, #12848
-12881,12882,12883,12884,12885,12886,12887,4501,12888,12889,12890,12891,12892,12893,12894,12895, #12864
-12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911, #12880
-12912,4994,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926, #12896
-12927,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942, #12912
-12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,1772,12957, #12928
-12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973, #12944
-12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989, #12960
-12990,12991,12992,12993,12994,12995,12996,12997,4502,12998,4503,12999,13000,13001,13002,13003, #12976
-4504,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018, #12992
-13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,3449,13030,13031,13032,13033, #13008
-13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049, #13024
-13050,13051,13052,13053,13054,13055,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065, #13040
-13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081, #13056
-13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097, #13072
-13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113, #13088
-13114,13115,13116,13117,13118,3968,13119,4995,13120,13121,13122,13123,13124,13125,13126,13127, #13104
-4505,13128,13129,13130,13131,13132,13133,13134,4996,4506,13135,13136,13137,13138,13139,4997, #13120
-13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155, #13136
-13156,13157,13158,13159,4998,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170, #13152
-13171,13172,13173,13174,13175,13176,4999,13177,13178,13179,13180,13181,13182,13183,13184,13185, #13168
-13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201, #13184
-13202,13203,13204,13205,13206,5000,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216, #13200
-13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,4200,5001,13228,13229,13230, #13216
-13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,3969,13241,13242,13243,13244,3970, #13232
-13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260, #13248
-13261,13262,13263,13264,13265,13266,13267,13268,3450,13269,13270,13271,13272,13273,13274,13275, #13264
-13276,5002,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290, #13280
-13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,3813,13303,13304,13305, #13296
-13306,13307,13308,13309,13310,13311,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321, #13312
-13322,13323,13324,13325,13326,13327,13328,4507,13329,13330,13331,13332,13333,13334,13335,13336, #13328
-13337,13338,13339,13340,13341,5003,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351, #13344
-13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,13367, #13360
-5004,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,13382, #13376
-13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398, #13392
-13399,13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414, #13408
-13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,13430, #13424
-13431,13432,4508,13433,13434,13435,4201,13436,13437,13438,13439,13440,13441,13442,13443,13444, #13440
-13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,5005,13458,13459, #13456
-13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,4509,13471,13472,13473,13474, #13472
-13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,13490, #13488
-13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506, #13504
-13507,13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522, #13520
-13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,13538, #13536
-13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554, #13552
-13555,13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570, #13568
-13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,13586, #13584
-13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602, #13600
-13603,13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618, #13616
-13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,13634, #13632
-13635,13636,13637,13638,13639,13640,13641,13642,5006,13643,13644,13645,13646,13647,13648,13649, #13648
-13650,13651,5007,13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,13664, #13664
-13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680, #13680
-13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,13694,13695,13696, #13696
-13697,13698,13699,13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,13712, #13712
-13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728, #13728
-13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,13742,13743,13744, #13744
-13745,13746,13747,13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,13760, #13760
-13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,3273,13775, #13776
-13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,13790,13791, #13792
-13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807, #13808
-13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,13823, #13824
-13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,13838,13839, #13840
-13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855, #13856
-13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,13871, #13872
-13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,13886,13887, #13888
-13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903, #13904
-13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,13919, #13920
-13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,13934,13935, #13936
-13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951, #13952
-13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967, #13968
-13968,13969,13970,13971,13972) #13973
diff --git a/lib/requests/packages/chardet2/big5prober.py b/lib/requests/packages/chardet2/big5prober.py
deleted file mode 100755
index d5b317d..0000000
--- a/lib/requests/packages/chardet2/big5prober.py
+++ /dev/null
@@ -1,41 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-# 
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-# 
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import Big5DistributionAnalysis
-from .mbcssm import Big5SMModel
-
-class Big5Prober(MultiByteCharSetProber):
-    def __init__(self):
-        MultiByteCharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(Big5SMModel)
-        self._mDistributionAnalyzer = Big5DistributionAnalysis()
-        self.reset()
-
-    def get_charset_name(self):
-        return "Big5"
diff --git a/lib/requests/packages/chardet2/chardistribution.py b/lib/requests/packages/chardet2/chardistribution.py
deleted file mode 100755
index 2c63061..0000000
--- a/lib/requests/packages/chardet2/chardistribution.py
+++ /dev/null
@@ -1,200 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-# 
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-# 
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-from .euctwfreq import EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE, EUCTW_TYPICAL_DISTRIBUTION_RATIO
-from .euckrfreq import EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE, EUCKR_TYPICAL_DISTRIBUTION_RATIO
-from .gb2312freq import GB2312CharToFreqOrder, GB2312_TABLE_SIZE, GB2312_TYPICAL_DISTRIBUTION_RATIO
-from .big5freq import Big5CharToFreqOrder, BIG5_TABLE_SIZE, BIG5_TYPICAL_DISTRIBUTION_RATIO
-from .jisfreq import JISCharToFreqOrder, JIS_TABLE_SIZE, JIS_TYPICAL_DISTRIBUTION_RATIO
-
-ENOUGH_DATA_THRESHOLD = 1024
-SURE_YES = 0.99
-SURE_NO = 0.01
-
-class CharDistributionAnalysis:
-    def __init__(self):
-        self._mCharToFreqOrder = None # Mapping table to get frequency order from char order (get from GetOrder())
-        self._mTableSize = None # Size of above table
-        self._mTypicalDistributionRatio = None # This is a constant value which varies from language to language, used in calculating confidence.  See http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html for further detail.
-        self.reset()
-        
-    def reset(self):
-        """reset analyser, clear any state"""
-        self._mDone = False # If this flag is set to True, detection is done and conclusion has been made
-        self._mTotalChars = 0 # Total characters encountered
-        self._mFreqChars = 0 # The number of characters whose frequency order is less than 512
-
-    def feed(self, aBuf, aCharLen):
-        """feed a character with known length"""
-        if aCharLen == 2:
-            # we only care about 2-bytes character in our distribution analysis
-            order = self.get_order(aBuf)
-        else:
-            order = -1
-        if order >= 0:
-            self._mTotalChars += 1
-            # order is valid
-            if order < self._mTableSize:
-                if 512 > self._mCharToFreqOrder[order]:
-                    self._mFreqChars += 1
-
-    def get_confidence(self):
-        """return confidence based on existing data"""
-        # if we didn't receive any character in our consideration range, return negative answer
-        if self._mTotalChars <= 0:
-            return SURE_NO
-
-        if self._mTotalChars != self._mFreqChars:
-            r = self._mFreqChars / ((self._mTotalChars - self._mFreqChars) * self._mTypicalDistributionRatio)
-            if r < SURE_YES:
-                return r
-
-        # normalize confidence (we don't want to be 100% sure)
-        return SURE_YES
-
-    def got_enough_data(self):
-        # It is not necessary to receive all data to draw conclusion. For charset detection,
-        # certain amount of data is enough
-        return self._mTotalChars > ENOUGH_DATA_THRESHOLD
-
-    def get_order(self, aBuf):
-        # We do not handle characters based on the original encoding string, but 
-        # convert this encoding string to a number, here called order.
-        # This allows multiple encodings of a language to share one frequency table.
-        return -1
-    
-class EUCTWDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self):
-        CharDistributionAnalysis.__init__(self)
-        self._mCharToFreqOrder = EUCTWCharToFreqOrder
-        self._mTableSize = EUCTW_TABLE_SIZE
-        self._mTypicalDistributionRatio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, aBuf):
-        # for euc-TW encoding, we are interested 
-        #   first  byte range: 0xc4 -- 0xfe
-        #   second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        if aBuf[0] >= 0xC4:
-            return 94 * (aBuf[0] - 0xC4) + aBuf[1] - 0xA1
-        else:
-            return -1
-
-class EUCKRDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self):
-        CharDistributionAnalysis.__init__(self)
-        self._mCharToFreqOrder = EUCKRCharToFreqOrder
-        self._mTableSize = EUCKR_TABLE_SIZE
-        self._mTypicalDistributionRatio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, aBuf):
-        # for euc-KR encoding, we are interested 
-        #   first  byte range: 0xb0 -- 0xfe
-        #   second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        if aBuf[0] >= 0xB0:
-            return 94 * (aBuf[0] - 0xB0) + aBuf[1] - 0xA1
-        else:
-            return -1;
-
-class GB2312DistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self):
-        CharDistributionAnalysis.__init__(self)
-        self._mCharToFreqOrder = GB2312CharToFreqOrder
-        self._mTableSize = GB2312_TABLE_SIZE
-        self._mTypicalDistributionRatio = GB2312_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, aBuf):
-        # for GB2312 encoding, we are interested 
-        #  first  byte range: 0xb0 -- 0xfe
-        #  second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        if (aBuf[0] >= 0xB0) and (aBuf[1] >= 0xA1):
-            return 94 * (aBuf[0] - 0xB0) + aBuf[1] - 0xA1
-        else:
-            return -1;
-
-class Big5DistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self):
-        CharDistributionAnalysis.__init__(self)
-        self._mCharToFreqOrder = Big5CharToFreqOrder
-        self._mTableSize = BIG5_TABLE_SIZE
-        self._mTypicalDistributionRatio = BIG5_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, aBuf):
-        # for big5 encoding, we are interested 
-        #   first  byte range: 0xa4 -- 0xfe
-        #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        if aBuf[0] >= 0xA4:
-            if aBuf[1] >= 0xA1:
-                return 157 * (aBuf[0] - 0xA4) + aBuf[1] - 0xA1 + 63
-            else:
-                return 157 * (aBuf[0] - 0xA4) + aBuf[1] - 0x40
-        else:
-            return -1
-
-class SJISDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self):
-        CharDistributionAnalysis.__init__(self)
-        self._mCharToFreqOrder = JISCharToFreqOrder
-        self._mTableSize = JIS_TABLE_SIZE
-        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, aBuf):
-        # for sjis encoding, we are interested 
-        #   first  byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
-        #   second byte range: 0x40 -- 0x7e,  0x81 -- oxfe
-        # no validation needed here. State machine has done that
-        if (aBuf[0] >= 0x81) and (aBuf[0] <= 0x9F):
-            order = 188 * (aBuf[0] - 0x81)
-        elif (aBuf[0] >= 0xE0) and (aBuf[0] <= 0xEF):
-            order = 188 * (aBuf[0] - 0xE0 + 31)
-        else:
-            return -1;
-        order = order + aBuf[1] - 0x40
-        if aBuf[1] > 0x7F:
-            order =- 1
-        return order
-
-class EUCJPDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self):
-        CharDistributionAnalysis.__init__(self)
-        self._mCharToFreqOrder = JISCharToFreqOrder
-        self._mTableSize = JIS_TABLE_SIZE
-        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, aBuf):
-        # for euc-JP encoding, we are interested 
-        #   first  byte range: 0xa0 -- 0xfe
-        #   second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        if aBuf[0] >= 0xA0:
-            return 94 * (aBuf[0] - 0xA1) + aBuf[1] - 0xa1
-        else:
-            return -1
diff --git a/lib/requests/packages/chardet2/charsetgroupprober.py b/lib/requests/packages/chardet2/charsetgroupprober.py
deleted file mode 100755
index 4376772..0000000
--- a/lib/requests/packages/chardet2/charsetgroupprober.py
+++ /dev/null
@@ -1,97 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-# 
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-# 
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .charsetprober import CharSetProber
-
-class CharSetGroupProber(CharSetProber):
-    def __init__(self):
-        CharSetProber.__init__(self)
-        self._mActiveNum = 0
-        self._mProbers = []
-        self._mBestGuessProber = None
-        
-    def reset(self):
-        CharSetProber.reset(self)
-        self._mActiveNum = 0
-        for prober in self._mProbers:
-            if prober:
-                prober.reset()
-                prober.active = True
-                self._mActiveNum += 1
-        self._mBestGuessProber = None
-
-    def get_charset_name(self):
-        if not self._mBestGuessProber:
-            self.get_confidence()
-            if not self._mBestGuessProber: return None
-#                self._mBestGuessProber = self._mProbers[0]
-        return self._mBestGuessProber.get_charset_name()
-
-    def feed(self, aBuf):
-        for prober in self._mProbers:
-            if not prober: continue
-            if not prober.active: continue
-            st = prober.feed(aBuf)
-            if not st: continue
-            if st == constants.eFoundIt:
-                self._mBestGuessProber = prober
-                return self.get_state()
-            elif st == constants.eNotMe:
-                prober.active = False
-                self._mActiveNum -= 1
-                if self._mActiveNum <= 0:
-                    self._mState = constants.eNotMe
-                    return self.get_state()
-        return self.get_state()
-
-    def get_confidence(self):
-        st = self.get_state()
-        if st == constants.eFoundIt:
-            return 0.99
-        elif st == constants.eNotMe:
-            return 0.01
-        bestConf = 0.0
-        self._mBestGuessProber = None
-        for prober in self._mProbers:
-            if not prober: continue
-            if not prober.active:
-                if constants._debug:
-                    sys.stderr.write(prober.get_charset_name() + ' not active\n')
-                continue
-            cf = prober.get_confidence()
-            if constants._debug:
-                sys.stderr.write('%s confidence = %s\n' % (prober.get_charset_name(), cf))
-            if bestConf < cf:
-                bestConf = cf
-                self._mBestGuessProber = prober
-        if not self._mBestGuessProber: return 0.0
-        return bestConf
-#        else:
-#            self._mBestGuessProber = self._mProbers[0]
-#            return self._mBestGuessProber.get_confidence()
diff --git a/lib/requests/packages/chardet2/charsetprober.py b/lib/requests/packages/chardet2/charsetprober.py
deleted file mode 100755
index 450c95e..0000000
--- a/lib/requests/packages/chardet2/charsetprober.py
+++ /dev/null
@@ -1,61 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-# 
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-# 
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import re
-
-class CharSetProber:
-    def __init__(self):
-        pass
-        
-    def reset(self):
-        self._mState = constants.eDetecting
-    
-    def get_charset_name(self):
-        return None
-
-    def feed(self, aBuf):
-        pass
-
-    def get_state(self):
-        return self._mState
-
-    def get_confidence(self):
-        return 0.0
-
-    def filter_high_bit_only(self, aBuf):
-        aBuf = re.sub(b'([\x00-\x7F])+', b' ', aBuf)
-        return aBuf
-    
-    def filter_without_english_letters(self, aBuf):
-        aBuf = re.sub(b'([A-Za-z])+', b' ', aBuf)
-        return aBuf
-        
-    def filter_with_english_letters(self, aBuf):
-        # TODO
-        return aBuf
diff --git a/lib/requests/packages/chardet2/codingstatemachine.py b/lib/requests/packages/chardet2/codingstatemachine.py
deleted file mode 100755
index 66d766f..0000000
--- a/lib/requests/packages/chardet2/codingstatemachine.py
+++ /dev/null
@@ -1,57 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .constants import eStart, eError, eItsMe
-
-class CodingStateMachine:
-    def __init__(self, sm):
-        self._mModel = sm
-        self._mCurrentBytePos = 0
-        self._mCurrentCharLen = 0
-        self.reset()
-
-    def reset(self):
-        self._mCurrentState = eStart
-
-    def next_state(self, c):
-        # for each byte we get its class
-        # if it is first byte, we also get byte length
-        # PY3K: aBuf is a byte stream, so c is an int, not a byte
-        byteCls = self._mModel['classTable'][c]
-        if self._mCurrentState == eStart:
-            self._mCurrentBytePos = 0
-            self._mCurrentCharLen = self._mModel['charLenTable'][byteCls]
-        # from byte's class and stateTable, we get its next state
-        self._mCurrentState = self._mModel['stateTable'][self._mCurrentState * self._mModel['classFactor'] + byteCls]
-        self._mCurrentBytePos += 1
-        return self._mCurrentState
-
-    def get_current_charlen(self):
-        return self._mCurrentCharLen
-
-    def get_coding_state_machine(self):
-        return self._mModel['name']
diff --git a/lib/requests/packages/chardet2/constants.py b/lib/requests/packages/chardet2/constants.py
deleted file mode 100755
index a3d27de..0000000
--- a/lib/requests/packages/chardet2/constants.py
+++ /dev/null
@@ -1,39 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-_debug = 0
-
-eDetecting = 0
-eFoundIt = 1
-eNotMe = 2
-
-eStart = 0
-eError = 1
-eItsMe = 2
-
-SHORTCUT_THRESHOLD = 0.95
diff --git a/lib/requests/packages/chardet2/escprober.py b/lib/requests/packages/chardet2/escprober.py
deleted file mode 100755
index cfc833b..0000000
--- a/lib/requests/packages/chardet2/escprober.py
+++ /dev/null
@@ -1,81 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .escsm import HZSMModel, ISO2022CNSMModel, ISO2022JPSMModel, ISO2022KRSMModel
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-
-class EscCharSetProber(CharSetProber):
-    def __init__(self):
-        CharSetProber.__init__(self)
-        self._mCodingSM = [ \
-            CodingStateMachine(HZSMModel),
-            CodingStateMachine(ISO2022CNSMModel),
-            CodingStateMachine(ISO2022JPSMModel),
-            CodingStateMachine(ISO2022KRSMModel)
-            ]
-        self.reset()
-
-    def reset(self):
-        CharSetProber.reset(self)
-        for codingSM in self._mCodingSM:
-            if not codingSM: continue
-            codingSM.active = True
-            codingSM.reset()
-        self._mActiveSM = len(self._mCodingSM)
-        self._mDetectedCharset = None
-
-    def get_charset_name(self):
-        return self._mDetectedCharset
-
-    def get_confidence(self):
-        if self._mDetectedCharset:
-            return 0.99
-        else:
-            return 0.00
-
-    def feed(self, aBuf):
-        for c in aBuf:
-            # PY3K: aBuf is a byte array, so c is an int, not a byte
-            for codingSM in self._mCodingSM:
-                if not codingSM: continue
-                if not codingSM.active: continue
-                codingState = codingSM.next_state(c)
-                if codingState == constants.eError:
-                    codingSM.active = False
-                    self._mActiveSM -= 1
-                    if self._mActiveSM <= 0:
-                        self._mState = constants.eNotMe
-                        return self.get_state()
-                elif codingState == constants.eItsMe:
-                    self._mState = constants.eFoundIt
-                    self._mDetectedCharset = codingSM.get_coding_state_machine()
-                    return self.get_state()
-                
-        return self.get_state()
diff --git a/lib/requests/packages/chardet2/escsm.py b/lib/requests/packages/chardet2/escsm.py
deleted file mode 100755
index 689d9bb..0000000
--- a/lib/requests/packages/chardet2/escsm.py
+++ /dev/null
@@ -1,240 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .constants import eStart, eError, eItsMe
-
-HZ_cls = ( \
-1,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,0,0,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,0,0,0,0,  # 20 - 27 
-0,0,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-0,0,0,0,0,0,0,0,  # 40 - 47 
-0,0,0,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,4,0,5,2,0,  # 78 - 7f 
-1,1,1,1,1,1,1,1,  # 80 - 87 
-1,1,1,1,1,1,1,1,  # 88 - 8f 
-1,1,1,1,1,1,1,1,  # 90 - 97 
-1,1,1,1,1,1,1,1,  # 98 - 9f 
-1,1,1,1,1,1,1,1,  # a0 - a7 
-1,1,1,1,1,1,1,1,  # a8 - af 
-1,1,1,1,1,1,1,1,  # b0 - b7 
-1,1,1,1,1,1,1,1,  # b8 - bf 
-1,1,1,1,1,1,1,1,  # c0 - c7 
-1,1,1,1,1,1,1,1,  # c8 - cf 
-1,1,1,1,1,1,1,1,  # d0 - d7 
-1,1,1,1,1,1,1,1,  # d8 - df 
-1,1,1,1,1,1,1,1,  # e0 - e7 
-1,1,1,1,1,1,1,1,  # e8 - ef 
-1,1,1,1,1,1,1,1,  # f0 - f7 
-1,1,1,1,1,1,1,1,  # f8 - ff 
-)
-
-HZ_st = ( \
-eStart,eError,     3,eStart,eStart,eStart,eError,eError,# 00-07 
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f 
-eItsMe,eItsMe,eError,eError,eStart,eStart,     4,eError,# 10-17 
-     5,eError,     6,eError,     5,     5,     4,eError,# 18-1f 
-     4,eError,     4,     4,     4,eError,     4,eError,# 20-27 
-     4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart,# 28-2f 
-)
-
-HZCharLenTable = (0, 0, 0, 0, 0, 0)
-
-HZSMModel = {'classTable': HZ_cls,
-             'classFactor': 6,
-             'stateTable': HZ_st,
-             'charLenTable': HZCharLenTable,
-             'name': "HZ-GB-2312"}
-
-ISO2022CN_cls = ( \
-2,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,0,0,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,0,0,0,0,  # 20 - 27 
-0,3,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-0,0,0,4,0,0,0,0,  # 40 - 47 
-0,0,0,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,0,0,0,0,0,  # 78 - 7f 
-2,2,2,2,2,2,2,2,  # 80 - 87 
-2,2,2,2,2,2,2,2,  # 88 - 8f 
-2,2,2,2,2,2,2,2,  # 90 - 97 
-2,2,2,2,2,2,2,2,  # 98 - 9f 
-2,2,2,2,2,2,2,2,  # a0 - a7 
-2,2,2,2,2,2,2,2,  # a8 - af 
-2,2,2,2,2,2,2,2,  # b0 - b7 
-2,2,2,2,2,2,2,2,  # b8 - bf 
-2,2,2,2,2,2,2,2,  # c0 - c7 
-2,2,2,2,2,2,2,2,  # c8 - cf 
-2,2,2,2,2,2,2,2,  # d0 - d7 
-2,2,2,2,2,2,2,2,  # d8 - df 
-2,2,2,2,2,2,2,2,  # e0 - e7 
-2,2,2,2,2,2,2,2,  # e8 - ef 
-2,2,2,2,2,2,2,2,  # f0 - f7 
-2,2,2,2,2,2,2,2,  # f8 - ff 
-)
-
-ISO2022CN_st = ( \
-eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07 
-eStart,eError,eError,eError,eError,eError,eError,eError,# 08-0f 
-eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17 
-eItsMe,eItsMe,eItsMe,eError,eError,eError,     4,eError,# 18-1f 
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 20-27 
-     5,     6,eError,eError,eError,eError,eError,eError,# 28-2f 
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 30-37 
-eError,eError,eError,eError,eError,eItsMe,eError,eStart,# 38-3f 
-)
-
-ISO2022CNCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0)
-
-ISO2022CNSMModel = {'classTable': ISO2022CN_cls,
-                    'classFactor': 9,
-                    'stateTable': ISO2022CN_st,
-                    'charLenTable': ISO2022CNCharLenTable,
-                    'name': "ISO-2022-CN"}
-
-ISO2022JP_cls = ( \
-2,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,2,2,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,7,0,0,0,  # 20 - 27 
-3,0,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-6,0,4,0,8,0,0,0,  # 40 - 47 
-0,9,5,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,0,0,0,0,0,  # 78 - 7f 
-2,2,2,2,2,2,2,2,  # 80 - 87 
-2,2,2,2,2,2,2,2,  # 88 - 8f 
-2,2,2,2,2,2,2,2,  # 90 - 97 
-2,2,2,2,2,2,2,2,  # 98 - 9f 
-2,2,2,2,2,2,2,2,  # a0 - a7 
-2,2,2,2,2,2,2,2,  # a8 - af 
-2,2,2,2,2,2,2,2,  # b0 - b7 
-2,2,2,2,2,2,2,2,  # b8 - bf 
-2,2,2,2,2,2,2,2,  # c0 - c7 
-2,2,2,2,2,2,2,2,  # c8 - cf 
-2,2,2,2,2,2,2,2,  # d0 - d7 
-2,2,2,2,2,2,2,2,  # d8 - df 
-2,2,2,2,2,2,2,2,  # e0 - e7 
-2,2,2,2,2,2,2,2,  # e8 - ef 
-2,2,2,2,2,2,2,2,  # f0 - f7 
-2,2,2,2,2,2,2,2,  # f8 - ff 
-)
-
-ISO2022JP_st = ( \
-eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07 
-eStart,eStart,eError,eError,eError,eError,eError,eError,# 08-0f 
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17 
-eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,# 18-1f 
-eError,     5,eError,eError,eError,     4,eError,eError,# 20-27 
-eError,eError,eError,     6,eItsMe,eError,eItsMe,eError,# 28-2f 
-eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,# 30-37 
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 38-3f 
-eError,eError,eError,eError,eItsMe,eError,eStart,eStart,# 40-47 
-)
-
-ISO2022JPCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-
-ISO2022JPSMModel = {'classTable': ISO2022JP_cls,
-                    'classFactor': 10,
-                    'stateTable': ISO2022JP_st,
-                    'charLenTable': ISO2022JPCharLenTable,
-                    'name': "ISO-2022-JP"}
-
-ISO2022KR_cls = ( \
-2,0,0,0,0,0,0,0,  # 00 - 07 
-0,0,0,0,0,0,0,0,  # 08 - 0f 
-0,0,0,0,0,0,0,0,  # 10 - 17 
-0,0,0,1,0,0,0,0,  # 18 - 1f 
-0,0,0,0,3,0,0,0,  # 20 - 27 
-0,4,0,0,0,0,0,0,  # 28 - 2f 
-0,0,0,0,0,0,0,0,  # 30 - 37 
-0,0,0,0,0,0,0,0,  # 38 - 3f 
-0,0,0,5,0,0,0,0,  # 40 - 47 
-0,0,0,0,0,0,0,0,  # 48 - 4f 
-0,0,0,0,0,0,0,0,  # 50 - 57 
-0,0,0,0,0,0,0,0,  # 58 - 5f 
-0,0,0,0,0,0,0,0,  # 60 - 67 
-0,0,0,0,0,0,0,0,  # 68 - 6f 
-0,0,0,0,0,0,0,0,  # 70 - 77 
-0,0,0,0,0,0,0,0,  # 78 - 7f 
-2,2,2,2,2,2,2,2,  # 80 - 87 
-2,2,2,2,2,2,2,2,  # 88 - 8f 
-2,2,2,2,2,2,2,2,  # 90 - 97 
-2,2,2,2,2,2,2,2,  # 98 - 9f 
-2,2,2,2,2,2,2,2,  # a0 - a7 
-2,2,2,2,2,2,2,2,  # a8 - af 
-2,2,2,2,2,2,2,2,  # b0 - b7 
-2,2,2,2,2,2,2,2,  # b8 - bf 
-2,2,2,2,2,2,2,2,  # c0 - c7 
-2,2,2,2,2,2,2,2,  # c8 - cf 
-2,2,2,2,2,2,2,2,  # d0 - d7 
-2,2,2,2,2,2,2,2,  # d8 - df 
-2,2,2,2,2,2,2,2,  # e0 - e7 
-2,2,2,2,2,2,2,2,  # e8 - ef 
-2,2,2,2,2,2,2,2,  # f0 - f7 
-2,2,2,2,2,2,2,2,  # f8 - ff 
-)
-
-ISO2022KR_st = ( \
-eStart,     3,eError,eStart,eStart,eStart,eError,eError,# 00-07 
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f 
-eItsMe,eItsMe,eError,eError,eError,     4,eError,eError,# 10-17 
-eError,eError,eError,eError,     5,eError,eError,eError,# 18-1f 
-eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart,# 20-27 
-)
-
-ISO2022KRCharLenTable = (0, 0, 0, 0, 0, 0)
-
-ISO2022KRSMModel = {'classTable': ISO2022KR_cls,
-                    'classFactor': 6,
-                    'stateTable': ISO2022KR_st,
-                    'charLenTable': ISO2022KRCharLenTable,
-                    'name': "ISO-2022-KR"}
diff --git a/lib/requests/packages/chardet2/eucjpprober.py b/lib/requests/packages/chardet2/eucjpprober.py
deleted file mode 100755
index d7739f2..0000000
--- a/lib/requests/packages/chardet2/eucjpprober.py
+++ /dev/null
@@ -1,87 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .constants import eStart, eError, eItsMe
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCJPDistributionAnalysis
-from .jpcntx import EUCJPContextAnalysis
-from .mbcssm import EUCJPSMModel
-
-class EUCJPProber(MultiByteCharSetProber):
-    def __init__(self):
-        MultiByteCharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(EUCJPSMModel)
-        self._mDistributionAnalyzer = EUCJPDistributionAnalysis()
-        self._mContextAnalyzer = EUCJPContextAnalysis()
-        self.reset()
-
-    def reset(self):
-        MultiByteCharSetProber.reset(self)
-        self._mContextAnalyzer.reset()
-        
-    def get_charset_name(self):
-        return "EUC-JP"
-
-    def feed(self, aBuf):
-        aLen = len(aBuf)
-        for i in range(0, aLen):
-            # PY3K: aBuf is a byte array, so aBuf[i] is an int, not a byte
-            codingState = self._mCodingSM.next_state(aBuf[i])
-            if codingState == eError:
-                if constants._debug:
-                    sys.stderr.write(self.get_charset_name() + ' prober hit error at byte ' + str(i) + '\n')
-                self._mState = constants.eNotMe
-                break
-            elif codingState == eItsMe:
-                self._mState = constants.eFoundIt
-                break
-            elif codingState == eStart:
-                charLen = self._mCodingSM.get_current_charlen()
-                if i == 0:
-                    self._mLastChar[1] = aBuf[0]
-                    self._mContextAnalyzer.feed(self._mLastChar, charLen)
-                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
-                else:
-                    self._mContextAnalyzer.feed(aBuf[i-1:i+1], charLen)
-                    self._mDistributionAnalyzer.feed(aBuf[i-1:i+1], charLen)
-                    
-        self._mLastChar[0] = aBuf[aLen - 1]
-        
-        if self.get_state() == constants.eDetecting:
-            if self._mContextAnalyzer.got_enough_data() and \
-                   (self.get_confidence() > constants.SHORTCUT_THRESHOLD):
-                self._mState = constants.eFoundIt
-
-        return self.get_state()
-
-    def get_confidence(self):
-        contxtCf = self._mContextAnalyzer.get_confidence()
-        distribCf = self._mDistributionAnalyzer.get_confidence()
-        return max(contxtCf, distribCf)
diff --git a/lib/requests/packages/chardet2/euckrfreq.py b/lib/requests/packages/chardet2/euckrfreq.py
deleted file mode 100755
index 1463fa1..0000000
--- a/lib/requests/packages/chardet2/euckrfreq.py
+++ /dev/null
@@ -1,594 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# Sampling from about 20M text materials include literature and computer technology
-
-# 128  --> 0.79
-# 256  --> 0.92
-# 512  --> 0.986
-# 1024 --> 0.99944
-# 2048 --> 0.99999
-#
-# Idea Distribution Ratio = 0.98653 / (1-0.98653) = 73.24
-# Random Distribution Ration = 512 / (2350-512) = 0.279.
-# 
-# Typical Distribution Ratio  
-
-EUCKR_TYPICAL_DISTRIBUTION_RATIO = 6.0
-
-EUCKR_TABLE_SIZE = 2352
-
-# Char to FreqOrder table , 
-EUCKRCharToFreqOrder = ( \
-  13, 130, 120,1396, 481,1719,1720, 328, 609, 212,1721, 707, 400, 299,1722,  87,
-1397,1723, 104, 536,1117,1203,1724,1267, 685,1268, 508,1725,1726,1727,1728,1398,
-1399,1729,1730,1731, 141, 621, 326,1057, 368,1732, 267, 488,  20,1733,1269,1734,
- 945,1400,1735,  47, 904,1270,1736,1737, 773, 248,1738, 409, 313, 786, 429,1739,
- 116, 987, 813,1401, 683,  75,1204, 145,1740,1741,1742,1743,  16, 847, 667, 622,
- 708,1744,1745,1746, 966, 787, 304, 129,1747,  60, 820, 123, 676,1748,1749,1750,
-1751, 617,1752, 626,1753,1754,1755,1756, 653,1757,1758,1759,1760,1761,1762, 856,
- 344,1763,1764,1765,1766,  89, 401, 418, 806, 905, 848,1767,1768,1769, 946,1205,
- 709,1770,1118,1771, 241,1772,1773,1774,1271,1775, 569,1776, 999,1777,1778,1779,
-1780, 337, 751,1058,  28, 628, 254,1781, 177, 906, 270, 349, 891,1079,1782,  19,
-1783, 379,1784, 315,1785, 629, 754,1402, 559,1786, 636, 203,1206,1787, 710, 567,
-1788, 935, 814,1789,1790,1207, 766, 528,1791,1792,1208,1793,1794,1795,1796,1797,
-1403,1798,1799, 533,1059,1404,1405,1156,1406, 936, 884,1080,1800, 351,1801,1802,
-1803,1804,1805, 801,1806,1807,1808,1119,1809,1157, 714, 474,1407,1810, 298, 899,
- 885,1811,1120, 802,1158,1812, 892,1813,1814,1408, 659,1815,1816,1121,1817,1818,
-1819,1820,1821,1822, 319,1823, 594, 545,1824, 815, 937,1209,1825,1826, 573,1409,
-1022,1827,1210,1828,1829,1830,1831,1832,1833, 556, 722, 807,1122,1060,1834, 697,
-1835, 900, 557, 715,1836,1410, 540,1411, 752,1159, 294, 597,1211, 976, 803, 770,
-1412,1837,1838,  39, 794,1413, 358,1839, 371, 925,1840, 453, 661, 788, 531, 723,
- 544,1023,1081, 869,  91,1841, 392, 430, 790, 602,1414, 677,1082, 457,1415,1416,
-1842,1843, 475, 327,1024,1417, 795, 121,1844, 733, 403,1418,1845,1846,1847, 300,
- 119, 711,1212, 627,1848,1272, 207,1849,1850, 796,1213, 382,1851, 519,1852,1083,
- 893,1853,1854,1855, 367, 809, 487, 671,1856, 663,1857,1858, 956, 471, 306, 857,
-1859,1860,1160,1084,1861,1862,1863,1864,1865,1061,1866,1867,1868,1869,1870,1871,
- 282,  96, 574,1872, 502,1085,1873,1214,1874, 907,1875,1876, 827, 977,1419,1420,
-1421, 268,1877,1422,1878,1879,1880, 308,1881,   2, 537,1882,1883,1215,1884,1885,
- 127, 791,1886,1273,1423,1887,  34, 336, 404, 643,1888, 571, 654, 894, 840,1889,
-   0, 886,1274, 122, 575, 260, 908, 938,1890,1275, 410, 316,1891,1892, 100,1893,
-1894,1123,  48,1161,1124,1025,1895, 633, 901,1276,1896,1897, 115, 816,1898, 317,
-1899, 694,1900, 909, 734,1424, 572, 866,1425, 691,  85, 524,1010, 543, 394, 841,
-1901,1902,1903,1026,1904,1905,1906,1907,1908,1909,  30, 451, 651, 988, 310,1910,
-1911,1426, 810,1216,  93,1912,1913,1277,1217,1914, 858, 759,  45,  58, 181, 610,
- 269,1915,1916, 131,1062, 551, 443,1000, 821,1427, 957, 895,1086,1917,1918, 375,
-1919, 359,1920, 687,1921, 822,1922, 293,1923,1924,  40, 662, 118, 692,  29, 939,
- 887, 640, 482, 174,1925,  69,1162, 728,1428, 910,1926,1278,1218,1279, 386, 870,
- 217, 854,1163, 823,1927,1928,1929,1930, 834,1931,  78,1932, 859,1933,1063,1934,
-1935,1936,1937, 438,1164, 208, 595,1938,1939,1940,1941,1219,1125,1942, 280, 888,
-1429,1430,1220,1431,1943,1944,1945,1946,1947,1280, 150, 510,1432,1948,1949,1950,
-1951,1952,1953,1954,1011,1087,1955,1433,1043,1956, 881,1957, 614, 958,1064,1065,
-1221,1958, 638,1001, 860, 967, 896,1434, 989, 492, 553,1281,1165,1959,1282,1002,
-1283,1222,1960,1961,1962,1963,  36, 383, 228, 753, 247, 454,1964, 876, 678,1965,
-1966,1284, 126, 464, 490, 835, 136, 672, 529, 940,1088,1435, 473,1967,1968, 467,
-  50, 390, 227, 587, 279, 378, 598, 792, 968, 240, 151, 160, 849, 882,1126,1285,
- 639,1044, 133, 140, 288, 360, 811, 563,1027, 561, 142, 523,1969,1970,1971,   7,
- 103, 296, 439, 407, 506, 634, 990,1972,1973,1974,1975, 645,1976,1977,1978,1979,
-1980,1981, 236,1982,1436,1983,1984,1089, 192, 828, 618, 518,1166, 333,1127,1985,
- 818,1223,1986,1987,1988,1989,1990,1991,1992,1993, 342,1128,1286, 746, 842,1994,
-1995, 560, 223,1287,  98,   8, 189, 650, 978,1288,1996,1437,1997,  17, 345, 250,
- 423, 277, 234, 512, 226,  97, 289,  42, 167,1998, 201,1999,2000, 843, 836, 824,
- 532, 338, 783,1090, 182, 576, 436,1438,1439, 527, 500,2001, 947, 889,2002,2003,
-2004,2005, 262, 600, 314, 447,2006, 547,2007, 693, 738,1129,2008,  71,1440, 745,
- 619, 688,2009, 829,2010,2011, 147,2012,  33, 948,2013,2014,  74, 224,2015,  61,
- 191, 918, 399, 637,2016,1028,1130, 257, 902,2017,2018,2019,2020,2021,2022,2023,
-2024,2025,2026, 837,2027,2028,2029,2030, 179, 874, 591,  52, 724, 246,2031,2032,
-2033,2034,1167, 969,2035,1289, 630, 605, 911,1091,1168,2036,2037,2038,1441, 912,
-2039, 623,2040,2041, 253,1169,1290,2042,1442, 146, 620, 611, 577, 433,2043,1224,
- 719,1170, 959, 440, 437, 534,  84, 388, 480,1131, 159, 220, 198, 679,2044,1012,
- 819,1066,1443, 113,1225, 194, 318,1003,1029,2045,2046,2047,2048,1067,2049,2050,
-2051,2052,2053,  59, 913, 112,2054, 632,2055, 455, 144, 739,1291,2056, 273, 681,
- 499,2057, 448,2058,2059, 760,2060,2061, 970, 384, 169, 245,1132,2062,2063, 414,
-1444,2064,2065,  41, 235,2066, 157, 252, 877, 568, 919, 789, 580,2067, 725,2068,
-2069,1292,2070,2071,1445,2072,1446,2073,2074,  55, 588,  66,1447, 271,1092,2075,
-1226,2076, 960,1013, 372,2077,2078,2079,2080,2081,1293,2082,2083,2084,2085, 850,
-2086,2087,2088,2089,2090, 186,2091,1068, 180,2092,2093,2094, 109,1227, 522, 606,
-2095, 867,1448,1093, 991,1171, 926, 353,1133,2096, 581,2097,2098,2099,1294,1449,
-1450,2100, 596,1172,1014,1228,2101,1451,1295,1173,1229,2102,2103,1296,1134,1452,
- 949,1135,2104,2105,1094,1453,1454,1455,2106,1095,2107,2108,2109,2110,2111,2112,
-2113,2114,2115,2116,2117, 804,2118,2119,1230,1231, 805,1456, 405,1136,2120,2121,
-2122,2123,2124, 720, 701,1297, 992,1457, 927,1004,2125,2126,2127,2128,2129,2130,
-  22, 417,2131, 303,2132, 385,2133, 971, 520, 513,2134,1174,  73,1096, 231, 274,
- 962,1458, 673,2135,1459,2136, 152,1137,2137,2138,2139,2140,1005,1138,1460,1139,
-2141,2142,2143,2144,  11, 374, 844,2145, 154,1232,  46,1461,2146, 838, 830, 721,
-1233, 106,2147,  90, 428, 462, 578, 566,1175, 352,2148,2149, 538,1234, 124,1298,
-2150,1462, 761, 565,2151, 686,2152, 649,2153,  72, 173,2154, 460, 415,2155,1463,
-2156,1235, 305,2157,2158,2159,2160,2161,2162, 579,2163,2164,2165,2166,2167, 747,
-2168,2169,2170,2171,1464, 669,2172,2173,2174,2175,2176,1465,2177,  23, 530, 285,
-2178, 335, 729,2179, 397,2180,2181,2182,1030,2183,2184, 698,2185,2186, 325,2187,
-2188, 369,2189, 799,1097,1015, 348,2190,1069, 680,2191, 851,1466,2192,2193,  10,
-2194, 613, 424,2195, 979, 108, 449, 589,  27, 172,  81,1031,  80, 774, 281, 350,
-1032, 525, 301, 582,1176,2196, 674,1045,2197,2198,1467, 730, 762,2199,2200,2201,
-2202,1468,2203, 993,2204,2205, 266,1070, 963,1140,2206,2207,2208, 664,1098, 972,
-2209,2210,2211,1177,1469,1470, 871,2212,2213,2214,2215,2216,1471,2217,2218,2219,
-2220,2221,2222,2223,2224,2225,2226,2227,1472,1236,2228,2229,2230,2231,2232,2233,
-2234,2235,1299,2236,2237, 200,2238, 477, 373,2239,2240, 731, 825, 777,2241,2242,
-2243, 521, 486, 548,2244,2245,2246,1473,1300,  53, 549, 137, 875,  76, 158,2247,
-1301,1474, 469, 396,1016, 278, 712,2248, 321, 442, 503, 767, 744, 941,1237,1178,
-1475,2249,  82, 178,1141,1179, 973,2250,1302,2251, 297,2252,2253, 570,2254,2255,
-2256,  18, 450, 206,2257, 290, 292,1142,2258, 511, 162,  99, 346, 164, 735,2259,
-1476,1477,   4, 554, 343, 798,1099,2260,1100,2261,  43, 171,1303, 139, 215,2262,
-2263, 717, 775,2264,1033, 322, 216,2265, 831,2266, 149,2267,1304,2268,2269, 702,
-1238, 135, 845, 347, 309,2270, 484,2271, 878, 655, 238,1006,1478,2272,  67,2273,
- 295,2274,2275, 461,2276, 478, 942, 412,2277,1034,2278,2279,2280, 265,2281, 541,
-2282,2283,2284,2285,2286,  70, 852,1071,2287,2288,2289,2290,  21,  56, 509, 117,
- 432,2291,2292, 331, 980, 552,1101, 148, 284, 105, 393,1180,1239, 755,2293, 187,
-2294,1046,1479,2295, 340,2296,  63,1047, 230,2297,2298,1305, 763,1306, 101, 800,
- 808, 494,2299,2300,2301, 903,2302,  37,1072,  14,   5,2303,  79, 675,2304, 312,
-2305,2306,2307,2308,2309,1480,   6,1307,2310,2311,2312,   1, 470,  35,  24, 229,
-2313, 695, 210,  86, 778,  15, 784, 592, 779,  32,  77, 855, 964,2314, 259,2315,
- 501, 380,2316,2317,  83, 981, 153, 689,1308,1481,1482,1483,2318,2319, 716,1484,
-2320,2321,2322,2323,2324,2325,1485,2326,2327, 128,  57,  68, 261,1048, 211, 170,
-1240,  31,2328,  51, 435, 742,2329,2330,2331, 635,2332, 264, 456,2333,2334,2335,
- 425,2336,1486, 143, 507, 263, 943,2337, 363, 920,1487, 256,1488,1102, 243, 601,
-1489,2338,2339,2340,2341,2342,2343,2344, 861,2345,2346,2347,2348,2349,2350, 395,
-2351,1490,1491,  62, 535, 166, 225,2352,2353, 668, 419,1241, 138, 604, 928,2354,
-1181,2355,1492,1493,2356,2357,2358,1143,2359, 696,2360, 387, 307,1309, 682, 476,
-2361,2362, 332,  12, 222, 156,2363, 232,2364, 641, 276, 656, 517,1494,1495,1035,
- 416, 736,1496,2365,1017, 586,2366,2367,2368,1497,2369, 242,2370,2371,2372,1498,
-2373, 965, 713,2374,2375,2376,2377, 740, 982,1499, 944,1500,1007,2378,2379,1310,
-1501,2380,2381,2382, 785, 329,2383,2384,1502,2385,2386,2387, 932,2388,1503,2389,
-2390,2391,2392,1242,2393,2394,2395,2396,2397, 994, 950,2398,2399,2400,2401,1504,
-1311,2402,2403,2404,2405,1049, 749,2406,2407, 853, 718,1144,1312,2408,1182,1505,
-2409,2410, 255, 516, 479, 564, 550, 214,1506,1507,1313, 413, 239, 444, 339,1145,
-1036,1508,1509,1314,1037,1510,1315,2411,1511,2412,2413,2414, 176, 703, 497, 624,
- 593, 921, 302,2415, 341, 165,1103,1512,2416,1513,2417,2418,2419, 376,2420, 700,
-2421,2422,2423, 258, 768,1316,2424,1183,2425, 995, 608,2426,2427,2428,2429, 221,
-2430,2431,2432,2433,2434,2435,2436,2437, 195, 323, 726, 188, 897, 983,1317, 377,
- 644,1050, 879,2438, 452,2439,2440,2441,2442,2443,2444, 914,2445,2446,2447,2448,
- 915, 489,2449,1514,1184,2450,2451, 515,  64, 427, 495,2452, 583,2453, 483, 485,
-1038, 562, 213,1515, 748, 666,2454,2455,2456,2457, 334,2458, 780, 996,1008, 705,
-1243,2459,2460,2461,2462,2463, 114,2464, 493,1146, 366, 163,1516, 961,1104,2465,
- 291,2466,1318,1105,2467,1517, 365,2468, 355, 951,1244,2469,1319,2470, 631,2471,
-2472, 218,1320, 364, 320, 756,1518,1519,1321,1520,1322,2473,2474,2475,2476, 997,
-2477,2478,2479,2480, 665,1185,2481, 916,1521,2482,2483,2484, 584, 684,2485,2486,
- 797,2487,1051,1186,2488,2489,2490,1522,2491,2492, 370,2493,1039,1187,  65,2494,
- 434, 205, 463,1188,2495, 125, 812, 391, 402, 826, 699, 286, 398, 155, 781, 771,
- 585,2496, 590, 505,1073,2497, 599, 244, 219, 917,1018, 952, 646,1523,2498,1323,
-2499,2500,  49, 984, 354, 741,2501, 625,2502,1324,2503,1019, 190, 357, 757, 491,
-  95, 782, 868,2504,2505,2506,2507,2508,2509, 134,1524,1074, 422,1525, 898,2510,
- 161,2511,2512,2513,2514, 769,2515,1526,2516,2517, 411,1325,2518, 472,1527,2519,
-2520,2521,2522,2523,2524, 985,2525,2526,2527,2528,2529,2530, 764,2531,1245,2532,
-2533,  25, 204, 311,2534, 496,2535,1052,2536,2537,2538,2539,2540,2541,2542, 199,
- 704, 504, 468, 758, 657,1528, 196,  44, 839,1246, 272, 750,2543, 765, 862,2544,
-2545,1326,2546, 132, 615, 933,2547, 732,2548,2549,2550,1189,1529,2551, 283,1247,
-1053, 607, 929,2552,2553,2554, 930, 183, 872, 616,1040,1147,2555,1148,1020, 441,
- 249,1075,2556,2557,2558, 466, 743,2559,2560,2561,  92, 514, 426, 420, 526,2562,
-2563,2564,2565,2566,2567,2568, 185,2569,2570,2571,2572, 776,1530, 658,2573, 362,
-2574, 361, 922,1076, 793,2575,2576,2577,2578,2579,2580,1531, 251,2581,2582,2583,
-2584,1532,  54, 612, 237,1327,2585,2586, 275, 408, 647, 111,2587,1533,1106, 465,
-   3, 458,   9,  38,2588, 107, 110, 890, 209,  26, 737, 498,2589,1534,2590, 431,
- 202,  88,1535, 356, 287,1107, 660,1149,2591, 381,1536, 986,1150, 445,1248,1151,
- 974,2592,2593, 846,2594, 446, 953, 184,1249,1250, 727,2595, 923, 193, 883,2596,
-2597,2598, 102, 324, 539, 817,2599, 421,1041,2600, 832,2601,  94, 175, 197, 406,
-2602, 459,2603,2604,2605,2606,2607, 330, 555,2608,2609,2610, 706,1108, 389,2611,
-2612,2613,2614, 233,2615, 833, 558, 931, 954,1251,2616,2617,1537, 546,2618,2619,
-1009,2620,2621,2622,1538, 690,1328,2623, 955,2624,1539,2625,2626, 772,2627,2628,
-2629,2630,2631, 924, 648, 863, 603,2632,2633, 934,1540, 864, 865,2634, 642,1042,
- 670,1190,2635,2636,2637,2638, 168,2639, 652, 873, 542,1054,1541,2640,2641,2642,  # 512, 256
-#Everything below is of no interest for detection purpose
-2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2657,2658,
-2659,2660,2661,2662,2663,2664,2665,2666,2667,2668,2669,2670,2671,2672,2673,2674,
-2675,2676,2677,2678,2679,2680,2681,2682,2683,2684,2685,2686,2687,2688,2689,2690,
-2691,2692,2693,2694,2695,2696,2697,2698,2699,1542, 880,2700,2701,2702,2703,2704,
-2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,
-2721,2722,2723,2724,2725,1543,2726,2727,2728,2729,2730,2731,2732,1544,2733,2734,
-2735,2736,2737,2738,2739,2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,
-2751,2752,2753,2754,1545,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,
-2766,1546,2767,1547,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,
-2780,2781,2782,2783,2784,2785,2786,1548,2787,2788,2789,1109,2790,2791,2792,2793,
-2794,2795,2796,2797,2798,2799,2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,
-2810,2811,2812,1329,2813,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,
-2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,
-2841,2842,2843,2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,
-1549,2857,2858,2859,2860,1550,2861,2862,1551,2863,2864,2865,2866,2867,2868,2869,
-2870,2871,2872,2873,2874,1110,1330,2875,2876,2877,2878,2879,2880,2881,2882,2883,
-2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,2898,2899,
-2900,2901,2902,2903,2904,2905,2906,2907,2908,2909,2910,2911,2912,2913,2914,2915,
-2916,2917,2918,2919,2920,2921,2922,2923,2924,2925,2926,2927,2928,2929,2930,1331,
-2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2941,2942,2943,1552,2944,2945,
-2946,2947,2948,2949,2950,2951,2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,
-2962,2963,2964,1252,2965,2966,2967,2968,2969,2970,2971,2972,2973,2974,2975,2976,
-2977,2978,2979,2980,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,
-2993,2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,
-3009,3010,3011,3012,1553,3013,3014,3015,3016,3017,1554,3018,1332,3019,3020,3021,
-3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,
-3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,1555,3051,3052,
-3053,1556,1557,3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,
-3067,1558,3068,3069,3070,3071,3072,3073,3074,3075,3076,1559,3077,3078,3079,3080,
-3081,3082,3083,1253,3084,3085,3086,3087,3088,3089,3090,3091,3092,3093,3094,3095,
-3096,3097,3098,3099,3100,3101,3102,3103,3104,3105,3106,3107,3108,1152,3109,3110,
-3111,3112,3113,1560,3114,3115,3116,3117,1111,3118,3119,3120,3121,3122,3123,3124,
-3125,3126,3127,3128,3129,3130,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,
-3141,3142,3143,3144,3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,
-3157,3158,3159,3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,
-3173,3174,3175,3176,1333,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,
-3188,3189,1561,3190,3191,1334,3192,3193,3194,3195,3196,3197,3198,3199,3200,3201,
-3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3215,3216,3217,
-3218,3219,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,
-3234,1562,3235,3236,3237,3238,3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,
-3249,3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,
-3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,1563,3278,3279,
-3280,3281,3282,3283,3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,3294,3295,
-3296,3297,3298,3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,3309,3310,3311,
-3312,3313,3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,3324,3325,3326,3327,
-3328,3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,3339,3340,3341,3342,3343,
-3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,3354,3355,3356,3357,3358,3359,
-3360,3361,3362,3363,3364,1335,3365,3366,3367,3368,3369,3370,3371,3372,3373,3374,
-3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,3385,3386,3387,1336,3388,3389,
-3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,3404,3405,
-3406,3407,3408,3409,3410,3411,3412,3413,3414,1337,3415,3416,3417,3418,3419,1338,
-3420,3421,3422,1564,1565,3423,3424,3425,3426,3427,3428,3429,3430,3431,1254,3432,
-3433,3434,1339,3435,3436,3437,3438,3439,1566,3440,3441,3442,3443,3444,3445,3446,
-3447,3448,3449,3450,3451,3452,3453,3454,1255,3455,3456,3457,3458,3459,1567,1191,
-3460,1568,1569,3461,3462,3463,1570,3464,3465,3466,3467,3468,1571,3469,3470,3471,
-3472,3473,1572,3474,3475,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,
-1340,3487,3488,3489,3490,3491,3492,1021,3493,3494,3495,3496,3497,3498,1573,3499,
-1341,3500,3501,3502,3503,3504,3505,3506,3507,3508,3509,3510,3511,1342,3512,3513,
-3514,3515,3516,1574,1343,3517,3518,3519,1575,3520,1576,3521,3522,3523,3524,3525,
-3526,3527,3528,3529,3530,3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,
-3542,3543,3544,3545,3546,3547,3548,3549,3550,3551,3552,3553,3554,3555,3556,3557,
-3558,3559,3560,3561,3562,3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,
-3574,3575,3576,3577,3578,3579,3580,1577,3581,3582,1578,3583,3584,3585,3586,3587,
-3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,
-3604,1579,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,
-3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,1580,3630,3631,1581,3632,
-3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3643,3644,3645,3646,3647,3648,
-3649,3650,3651,3652,3653,3654,3655,3656,1582,3657,3658,3659,3660,3661,3662,3663,
-3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,
-3680,3681,3682,3683,3684,3685,3686,3687,3688,3689,3690,3691,3692,3693,3694,3695,
-3696,3697,3698,3699,3700,1192,3701,3702,3703,3704,1256,3705,3706,3707,3708,1583,
-1257,3709,3710,3711,3712,3713,3714,3715,3716,1584,3717,3718,3719,3720,3721,3722,
-3723,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,
-3739,3740,3741,3742,3743,3744,3745,1344,3746,3747,3748,3749,3750,3751,3752,3753,
-3754,3755,3756,1585,3757,3758,3759,3760,3761,3762,3763,3764,3765,3766,1586,3767,
-3768,3769,3770,3771,3772,3773,3774,3775,3776,3777,3778,1345,3779,3780,3781,3782,
-3783,3784,3785,3786,3787,3788,3789,3790,3791,3792,3793,3794,3795,1346,1587,3796,
-3797,1588,3798,3799,3800,3801,3802,3803,3804,3805,3806,1347,3807,3808,3809,3810,
-3811,1589,3812,3813,3814,3815,3816,3817,3818,3819,3820,3821,1590,3822,3823,1591,
-1348,3824,3825,3826,3827,3828,3829,3830,1592,3831,3832,1593,3833,3834,3835,3836,
-3837,3838,3839,3840,3841,3842,3843,3844,1349,3845,3846,3847,3848,3849,3850,3851,
-3852,3853,3854,3855,3856,3857,3858,1594,3859,3860,3861,3862,3863,3864,3865,3866,
-3867,3868,3869,1595,3870,3871,3872,3873,1596,3874,3875,3876,3877,3878,3879,3880,
-3881,3882,3883,3884,3885,3886,1597,3887,3888,3889,3890,3891,3892,3893,3894,3895,
-1598,3896,3897,3898,1599,1600,3899,1350,3900,1351,3901,3902,1352,3903,3904,3905,
-3906,3907,3908,3909,3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,
-3922,3923,3924,1258,3925,3926,3927,3928,3929,3930,3931,1193,3932,1601,3933,3934,
-3935,3936,3937,3938,3939,3940,3941,3942,3943,1602,3944,3945,3946,3947,3948,1603,
-3949,3950,3951,3952,3953,3954,3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,
-3965,1604,3966,3967,3968,3969,3970,3971,3972,3973,3974,3975,3976,3977,1353,3978,
-3979,3980,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,1354,3992,3993,
-3994,3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,
-4010,4011,4012,4013,4014,4015,4016,4017,4018,4019,4020,4021,4022,4023,1355,4024,
-4025,4026,4027,4028,4029,4030,4031,4032,4033,4034,4035,4036,4037,4038,4039,4040,
-1605,4041,4042,4043,4044,4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,4055,
-4056,4057,4058,4059,4060,1606,4061,4062,4063,4064,1607,4065,4066,4067,4068,4069,
-4070,4071,4072,4073,4074,4075,4076,1194,4077,4078,1608,4079,4080,4081,4082,4083,
-4084,4085,4086,4087,1609,4088,4089,4090,4091,4092,4093,4094,4095,4096,4097,4098,
-4099,4100,4101,4102,4103,4104,4105,4106,4107,4108,1259,4109,4110,4111,4112,4113,
-4114,4115,4116,4117,4118,4119,4120,4121,4122,4123,4124,1195,4125,4126,4127,1610,
-4128,4129,4130,4131,4132,4133,4134,4135,4136,4137,1356,4138,4139,4140,4141,4142,
-4143,4144,1611,4145,4146,4147,4148,4149,4150,4151,4152,4153,4154,4155,4156,4157,
-4158,4159,4160,4161,4162,4163,4164,4165,4166,4167,4168,4169,4170,4171,4172,4173,
-4174,4175,4176,4177,4178,4179,4180,4181,4182,4183,4184,4185,4186,4187,4188,4189,
-4190,4191,4192,4193,4194,4195,4196,4197,4198,4199,4200,4201,4202,4203,4204,4205,
-4206,4207,4208,4209,4210,4211,4212,4213,4214,4215,4216,4217,4218,4219,1612,4220,
-4221,4222,4223,4224,4225,4226,4227,1357,4228,1613,4229,4230,4231,4232,4233,4234,
-4235,4236,4237,4238,4239,4240,4241,4242,4243,1614,4244,4245,4246,4247,4248,4249,
-4250,4251,4252,4253,4254,4255,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,
-4266,4267,4268,4269,4270,1196,1358,4271,4272,4273,4274,4275,4276,4277,4278,4279,
-4280,4281,4282,4283,4284,4285,4286,4287,1615,4288,4289,4290,4291,4292,4293,4294,
-4295,4296,4297,4298,4299,4300,4301,4302,4303,4304,4305,4306,4307,4308,4309,4310,
-4311,4312,4313,4314,4315,4316,4317,4318,4319,4320,4321,4322,4323,4324,4325,4326,
-4327,4328,4329,4330,4331,4332,4333,4334,1616,4335,4336,4337,4338,4339,4340,4341,
-4342,4343,4344,4345,4346,4347,4348,4349,4350,4351,4352,4353,4354,4355,4356,4357,
-4358,4359,4360,1617,4361,4362,4363,4364,4365,1618,4366,4367,4368,4369,4370,4371,
-4372,4373,4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,
-4388,4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,
-4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,1619,4417,4418,
-4419,4420,4421,4422,4423,4424,4425,1112,4426,4427,4428,4429,4430,1620,4431,4432,
-4433,4434,4435,4436,4437,4438,4439,4440,4441,4442,1260,1261,4443,4444,4445,4446,
-4447,4448,4449,4450,4451,4452,4453,4454,4455,1359,4456,4457,4458,4459,4460,4461,
-4462,4463,4464,4465,1621,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,
-4477,4478,4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,1055,4490,4491,
-4492,4493,4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,
-4508,4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,1622,4519,4520,4521,1623,
-4522,4523,4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,1360,4536,
-4537,4538,4539,4540,4541,4542,4543, 975,4544,4545,4546,4547,4548,4549,4550,4551,
-4552,4553,4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,
-4568,4569,4570,4571,1624,4572,4573,4574,4575,4576,1625,4577,4578,4579,4580,4581,
-4582,4583,4584,1626,4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,1627,
-4596,4597,4598,4599,4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,
-4612,4613,4614,4615,1628,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,
-4627,4628,4629,4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,
-4643,4644,4645,4646,4647,4648,4649,1361,4650,4651,4652,4653,4654,4655,4656,4657,
-4658,4659,4660,4661,1362,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,
-4673,4674,4675,4676,4677,4678,4679,4680,4681,4682,1629,4683,4684,4685,4686,4687,
-1630,4688,4689,4690,4691,1153,4692,4693,4694,1113,4695,4696,4697,4698,4699,4700,
-4701,4702,4703,4704,4705,4706,4707,4708,4709,4710,4711,1197,4712,4713,4714,4715,
-4716,4717,4718,4719,4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,
-4732,4733,4734,4735,1631,4736,1632,4737,4738,4739,4740,4741,4742,4743,4744,1633,
-4745,4746,4747,4748,4749,1262,4750,4751,4752,4753,4754,1363,4755,4756,4757,4758,
-4759,4760,4761,4762,4763,4764,4765,4766,4767,4768,1634,4769,4770,4771,4772,4773,
-4774,4775,4776,4777,4778,1635,4779,4780,4781,4782,4783,4784,4785,4786,4787,4788,
-4789,1636,4790,4791,4792,4793,4794,4795,4796,4797,4798,4799,4800,4801,4802,4803,
-4804,4805,4806,1637,4807,4808,4809,1638,4810,4811,4812,4813,4814,4815,4816,4817,
-4818,1639,4819,4820,4821,4822,4823,4824,4825,4826,4827,4828,4829,4830,4831,4832,
-4833,1077,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,4844,4845,4846,4847,
-4848,4849,4850,4851,4852,4853,4854,4855,4856,4857,4858,4859,4860,4861,4862,4863,
-4864,4865,4866,4867,4868,4869,4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,
-4880,4881,4882,4883,1640,4884,4885,1641,4886,4887,4888,4889,4890,4891,4892,4893,
-4894,4895,4896,4897,4898,4899,4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,
-4910,4911,1642,4912,4913,4914,1364,4915,4916,4917,4918,4919,4920,4921,4922,4923,
-4924,4925,4926,4927,4928,4929,4930,4931,1643,4932,4933,4934,4935,4936,4937,4938,
-4939,4940,4941,4942,4943,4944,4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,
-4955,4956,4957,4958,4959,4960,4961,4962,4963,4964,4965,4966,4967,4968,4969,4970,
-4971,4972,4973,4974,4975,4976,4977,4978,4979,4980,1644,4981,4982,4983,4984,1645,
-4985,4986,1646,4987,4988,4989,4990,4991,4992,4993,4994,4995,4996,4997,4998,4999,
-5000,5001,5002,5003,5004,5005,1647,5006,1648,5007,5008,5009,5010,5011,5012,1078,
-5013,5014,5015,5016,5017,5018,5019,5020,5021,5022,5023,5024,5025,5026,5027,5028,
-1365,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,1649,5040,5041,5042,
-5043,5044,5045,1366,5046,5047,5048,5049,5050,5051,5052,5053,5054,5055,1650,5056,
-5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,5070,5071,5072,
-5073,5074,5075,5076,5077,1651,5078,5079,5080,5081,5082,5083,5084,5085,5086,5087,
-5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,
-5104,5105,5106,5107,5108,5109,5110,1652,5111,5112,5113,5114,5115,5116,5117,5118,
-1367,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,1653,5130,5131,5132,
-5133,5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,
-5149,1368,5150,1654,5151,1369,5152,5153,5154,5155,5156,5157,5158,5159,5160,5161,
-5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5176,5177,
-5178,1370,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,
-5193,5194,5195,5196,5197,5198,1655,5199,5200,5201,5202,1656,5203,5204,5205,5206,
-1371,5207,1372,5208,5209,5210,5211,1373,5212,5213,1374,5214,5215,5216,5217,5218,
-5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,
-5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,5245,5246,5247,1657,5248,5249,
-5250,5251,1658,1263,5252,5253,5254,5255,5256,1375,5257,5258,5259,5260,5261,5262,
-5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,
-5279,5280,5281,5282,5283,1659,5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,
-5294,5295,5296,5297,5298,5299,5300,1660,5301,5302,5303,5304,5305,5306,5307,5308,
-5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,1376,5322,5323,
-5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,1198,5334,5335,5336,5337,5338,
-5339,5340,5341,5342,5343,1661,5344,5345,5346,5347,5348,5349,5350,5351,5352,5353,
-5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,5365,5366,5367,5368,5369,
-5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,5380,5381,5382,5383,5384,5385,
-5386,5387,5388,5389,5390,5391,5392,5393,5394,5395,5396,5397,5398,1264,5399,5400,
-5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,5411,5412,1662,5413,5414,5415,
-5416,1663,5417,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,5429,5430,
-5431,5432,5433,5434,5435,5436,5437,5438,1664,5439,5440,5441,5442,5443,5444,5445,
-5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456,5457,5458,5459,5460,5461,
-5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472,5473,5474,5475,5476,5477,
-5478,1154,5479,5480,5481,5482,5483,5484,5485,1665,5486,5487,5488,5489,5490,5491,
-5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504,5505,5506,5507,
-5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520,5521,5522,5523,
-5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,
-5540,5541,5542,5543,5544,5545,5546,5547,5548,1377,5549,5550,5551,5552,5553,5554,
-5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,
-1114,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,
-5586,5587,5588,5589,5590,5591,5592,1378,5593,5594,5595,5596,5597,5598,5599,5600,
-5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,1379,5615,
-5616,5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,
-5632,5633,5634,1380,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,
-5647,5648,5649,1381,1056,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,
-1666,5661,5662,5663,5664,5665,5666,5667,5668,1667,5669,1668,5670,5671,5672,5673,
-5674,5675,5676,5677,5678,1155,5679,5680,5681,5682,5683,5684,5685,5686,5687,5688,
-5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,1669,5699,5700,5701,5702,5703,
-5704,5705,1670,5706,5707,5708,5709,5710,1671,5711,5712,5713,5714,1382,5715,5716,
-5717,5718,5719,5720,5721,5722,5723,5724,5725,1672,5726,5727,1673,1674,5728,5729,
-5730,5731,5732,5733,5734,5735,5736,1675,5737,5738,5739,5740,5741,5742,5743,5744,
-1676,5745,5746,5747,5748,5749,5750,5751,1383,5752,5753,5754,5755,5756,5757,5758,
-5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,1677,5769,5770,5771,5772,5773,
-1678,5774,5775,5776, 998,5777,5778,5779,5780,5781,5782,5783,5784,5785,1384,5786,
-5787,5788,5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,5799,5800,1679,5801,
-5802,5803,1115,1116,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,5815,
-5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,5830,5831,
-5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,5845,5846,5847,
-5848,5849,5850,5851,5852,5853,5854,5855,1680,5856,5857,5858,5859,5860,5861,5862,
-5863,5864,1681,5865,5866,5867,1682,5868,5869,5870,5871,5872,5873,5874,5875,5876,
-5877,5878,5879,1683,5880,1684,5881,5882,5883,5884,1685,5885,5886,5887,5888,5889,
-5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,
-5906,5907,1686,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,
-5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,1687,
-5936,5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,
-5952,1688,1689,5953,1199,5954,5955,5956,5957,5958,5959,5960,5961,1690,5962,5963,
-5964,5965,5966,5967,5968,5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,
-5980,5981,1385,5982,1386,5983,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,
-5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
-6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,
-6026,6027,1265,6028,6029,1691,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,
-6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,6055,
-6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,6069,6070,6071,
-6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,1692,6085,6086,
-6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100,6101,6102,
-6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116,6117,6118,
-6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,1693,6132,6133,
-6134,6135,6136,1694,6137,6138,6139,6140,6141,1695,6142,6143,6144,6145,6146,6147,
-6148,6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,
-6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,
-6180,6181,6182,6183,6184,6185,1696,6186,6187,6188,6189,6190,6191,6192,6193,6194,
-6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,
-6211,6212,6213,6214,6215,6216,6217,6218,6219,1697,6220,6221,6222,6223,6224,6225,
-6226,6227,6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,
-6242,6243,6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,1698,6254,6255,6256,
-6257,6258,6259,6260,6261,6262,6263,1200,6264,6265,6266,6267,6268,6269,6270,6271,  #1024
-6272,6273,6274,6275,6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,6286,6287,
-6288,6289,6290,6291,6292,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,1699,
-6303,6304,1700,6305,6306,6307,6308,6309,6310,6311,6312,6313,6314,6315,6316,6317,
-6318,6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,
-6334,6335,6336,6337,6338,6339,1701,6340,6341,6342,6343,6344,1387,6345,6346,6347,
-6348,6349,6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,
-6364,6365,6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,
-6380,6381,6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,
-6396,6397,6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,
-6412,6413,1702,6414,6415,6416,6417,6418,6419,6420,6421,6422,1703,6423,6424,6425,
-6426,6427,6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,1704,6439,6440,
-6441,6442,6443,6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,6455,6456,
-6457,6458,6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,
-6473,6474,6475,6476,6477,6478,6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,
-6489,6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,1266,
-6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,
-6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,6534,6535,
-6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,6550,6551,
-1705,1706,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,6565,
-6566,6567,6568,6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,6579,6580,6581,
-6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,6595,6596,6597,
-6598,6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,6609,6610,6611,6612,6613,
-6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,6624,6625,6626,6627,6628,6629,
-6630,6631,6632,6633,6634,6635,6636,6637,1388,6638,6639,6640,6641,6642,6643,6644,
-1707,6645,6646,6647,6648,6649,6650,6651,6652,6653,6654,6655,6656,6657,6658,6659,
-6660,6661,6662,6663,1708,6664,6665,6666,6667,6668,6669,6670,6671,6672,6673,6674,
-1201,6675,6676,6677,6678,6679,6680,6681,6682,6683,6684,6685,6686,6687,6688,6689,
-6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,6700,6701,6702,6703,6704,6705,
-6706,6707,6708,6709,6710,6711,6712,6713,6714,6715,6716,6717,6718,6719,6720,6721,
-6722,6723,6724,6725,1389,6726,6727,6728,6729,6730,6731,6732,6733,6734,6735,6736,
-1390,1709,6737,6738,6739,6740,6741,6742,1710,6743,6744,6745,6746,1391,6747,6748,
-6749,6750,6751,6752,6753,6754,6755,6756,6757,1392,6758,6759,6760,6761,6762,6763,
-6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777,6778,6779,
-6780,1202,6781,6782,6783,6784,6785,6786,6787,6788,6789,6790,6791,6792,6793,6794,
-6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806,6807,6808,6809,1711,
-6810,6811,6812,6813,6814,6815,6816,6817,6818,6819,6820,6821,6822,6823,6824,6825,
-6826,6827,6828,6829,6830,6831,6832,6833,6834,6835,6836,1393,6837,6838,6839,6840,
-6841,6842,6843,6844,6845,6846,6847,6848,6849,6850,6851,6852,6853,6854,6855,6856,
-6857,6858,6859,6860,6861,6862,6863,6864,6865,6866,6867,6868,6869,6870,6871,6872,
-6873,6874,6875,6876,6877,6878,6879,6880,6881,6882,6883,6884,6885,6886,6887,6888,
-6889,6890,6891,6892,6893,6894,6895,6896,6897,6898,6899,6900,6901,6902,1712,6903,
-6904,6905,6906,6907,6908,6909,6910,1713,6911,6912,6913,6914,6915,6916,6917,6918,
-6919,6920,6921,6922,6923,6924,6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,
-6935,6936,6937,6938,6939,6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,
-6951,6952,6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,
-6967,6968,6969,6970,6971,6972,6973,6974,1714,6975,6976,6977,6978,6979,6980,6981,
-6982,6983,6984,6985,6986,6987,6988,1394,6989,6990,6991,6992,6993,6994,6995,6996,
-6997,6998,6999,7000,1715,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,
-7012,7013,7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,
-7028,1716,7029,7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,
-7043,7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,
-7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,
-7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,7089,7090,
-7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105,7106,
-7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,7120,7121,7122,
-7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136,7137,7138,
-7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7154,
-7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167,7168,7169,7170,
-7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183,7184,7185,7186,
-7187,7188,7189,7190,7191,7192,7193,7194,7195,7196,7197,7198,7199,7200,7201,7202,
-7203,7204,7205,7206,7207,1395,7208,7209,7210,7211,7212,7213,1717,7214,7215,7216,
-7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229,7230,7231,7232,
-7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245,7246,7247,7248,
-7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261,7262,7263,7264,
-7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,
-7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293,7294,7295,7296,
-7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308,7309,7310,7311,7312,
-7313,1718,7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,
-7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,
-7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7355,7356,7357,7358,7359,
-7360,7361,7362,7363,7364,7365,7366,7367,7368,7369,7370,7371,7372,7373,7374,7375,
-7376,7377,7378,7379,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,
-7392,7393,7394,7395,7396,7397,7398,7399,7400,7401,7402,7403,7404,7405,7406,7407,
-7408,7409,7410,7411,7412,7413,7414,7415,7416,7417,7418,7419,7420,7421,7422,7423,
-7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,7434,7435,7436,7437,7438,7439,
-7440,7441,7442,7443,7444,7445,7446,7447,7448,7449,7450,7451,7452,7453,7454,7455,
-7456,7457,7458,7459,7460,7461,7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,
-7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,
-7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,
-7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,
-7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,
-7536,7537,7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,7550,7551,
-7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,
-7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,7583,
-7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,
-7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,
-7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,
-7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,
-7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,
-7664,7665,7666,7667,7668,7669,7670,7671,7672,7673,7674,7675,7676,7677,7678,7679,
-7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,
-7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,
-7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,
-7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,
-7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,
-7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,
-7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,
-7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,
-7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,
-7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,
-7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,
-7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,
-7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,
-7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,
-7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,
-7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935,
-7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,
-7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967,
-7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,
-7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,
-8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,
-8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031,
-8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,
-8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,
-8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,
-8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,
-8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,
-8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127,
-8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,
-8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,
-8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,
-8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,
-8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,
-8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,
-8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,
-8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,
-8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,
-8272,8273,8274,8275,8276,8277,8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,
-8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,
-8304,8305,8306,8307,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,
-8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,
-8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,
-8352,8353,8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,
-8368,8369,8370,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,
-8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,
-8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,
-8416,8417,8418,8419,8420,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,
-8432,8433,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,
-8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,
-8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,
-8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,
-8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,
-8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,
-8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,
-8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,
-8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,
-8576,8577,8578,8579,8580,8581,8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,
-8592,8593,8594,8595,8596,8597,8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,
-8608,8609,8610,8611,8612,8613,8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,
-8624,8625,8626,8627,8628,8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,
-8640,8641,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,
-8656,8657,8658,8659,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,
-8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,
-8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,
-8704,8705,8706,8707,8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,
-8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,
-8736,8737,8738,8739,8740,8741)
diff --git a/lib/requests/packages/chardet2/euckrprober.py b/lib/requests/packages/chardet2/euckrprober.py
deleted file mode 100755
index 2b9ba77..0000000
--- a/lib/requests/packages/chardet2/euckrprober.py
+++ /dev/null
@@ -1,41 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCKRDistributionAnalysis
-from .mbcssm import EUCKRSMModel
-
-class EUCKRProber(MultiByteCharSetProber):
-    def __init__(self):
-        MultiByteCharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(EUCKRSMModel)
-        self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
-        self.reset()
-
-    def get_charset_name(self):
-        return "EUC-KR"
diff --git a/lib/requests/packages/chardet2/euctwfreq.py b/lib/requests/packages/chardet2/euctwfreq.py
deleted file mode 100755
index c057209..0000000
--- a/lib/requests/packages/chardet2/euctwfreq.py
+++ /dev/null
@@ -1,426 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# EUCTW frequency table
-# Converted from big5 work 
-# by Taiwan's Mandarin Promotion Council 
-# <http:#www.edu.tw:81/mandr/>
-
-# 128  --> 0.42261
-# 256  --> 0.57851
-# 512  --> 0.74851
-# 1024 --> 0.89384
-# 2048 --> 0.97583
-#
-# Idea Distribution Ratio = 0.74851/(1-0.74851) =2.98
-# Random Distribution Ration = 512/(5401-512)=0.105
-# 
-# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
-
-EUCTW_TYPICAL_DISTRIBUTION_RATIO = 0.75
-
-# Char to FreqOrder table , 
-EUCTW_TABLE_SIZE = 8102
-
-EUCTWCharToFreqOrder = ( \
-   1,1800,1506, 255,1431, 198,   9,  82,   6,7310, 177, 202,3615,1256,2808, 110, # 2742
-3735,  33,3241, 261,  76,  44,2113,  16,2931,2184,1176, 659,3868,  26,3404,2643, # 2758
-1198,3869,3313,4060, 410,2211, 302, 590, 361,1963,   8, 204,  58,4296,7311,1931, # 2774
-  63,7312,7313, 317,1614,  75, 222, 159,4061,2412,1480,7314,3500,3068, 224,2809, # 2790
-3616,   3,  10,3870,1471,  29,2774,1135,2852,1939, 873, 130,3242,1123, 312,7315, # 2806
-4297,2051, 507, 252, 682,7316, 142,1914, 124, 206,2932,  34,3501,3173,  64, 604, # 2822
-7317,2494,1976,1977, 155,1990, 645, 641,1606,7318,3405, 337,  72, 406,7319,  80, # 2838
- 630, 238,3174,1509, 263, 939,1092,2644, 756,1440,1094,3406, 449,  69,2969, 591, # 2854
- 179,2095, 471, 115,2034,1843,  60,  50,2970, 134, 806,1868, 734,2035,3407, 180, # 2870
- 995,1607, 156, 537,2893, 688,7320, 319,1305, 779,2144, 514,2374, 298,4298, 359, # 2886
-2495,  90,2707,1338, 663,  11, 906,1099,2545,  20,2436, 182, 532,1716,7321, 732, # 2902
-1376,4062,1311,1420,3175,  25,2312,1056, 113, 399, 382,1949, 242,3408,2467, 529, # 2918
-3243, 475,1447,3617,7322, 117,  21, 656, 810,1297,2295,2329,3502,7323, 126,4063, # 2934
- 706, 456, 150, 613,4299,  71,1118,2036,4064, 145,3069,  85, 835, 486,2114,1246, # 2950
-1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,7324,2127,2354, 347,3736, 221, # 2966
-3503,3110,7325,1955,1153,4065,  83, 296,1199,3070, 192, 624,  93,7326, 822,1897, # 2982
-2810,3111, 795,2064, 991,1554,1542,1592,  27,  43,2853, 859, 139,1456, 860,4300, # 2998
- 437, 712,3871, 164,2392,3112, 695, 211,3017,2096, 195,3872,1608,3504,3505,3618, # 3014
-3873, 234, 811,2971,2097,3874,2229,1441,3506,1615,2375, 668,2076,1638, 305, 228, # 3030
-1664,4301, 467, 415,7327, 262,2098,1593, 239, 108, 300, 200,1033, 512,1247,2077, # 3046
-7328,7329,2173,3176,3619,2673, 593, 845,1062,3244,  88,1723,2037,3875,1950, 212, # 3062
- 266, 152, 149, 468,1898,4066,4302,  77, 187,7330,3018,  37,   5,2972,7331,3876, # 3078
-7332,7333,  39,2517,4303,2894,3177,2078,  55, 148,  74,4304, 545, 483,1474,1029, # 3094
-1665, 217,1869,1531,3113,1104,2645,4067,  24, 172,3507, 900,3877,3508,3509,4305, # 3110
-  32,1408,2811,1312, 329, 487,2355,2247,2708, 784,2674,   4,3019,3314,1427,1788, # 3126
- 188, 109, 499,7334,3620,1717,1789, 888,1217,3020,4306,7335,3510,7336,3315,1520, # 3142
-3621,3878, 196,1034, 775,7337,7338, 929,1815, 249, 439,  38,7339,1063,7340, 794, # 3158
-3879,1435,2296,  46, 178,3245,2065,7341,2376,7342, 214,1709,4307, 804,  35, 707, # 3174
- 324,3622,1601,2546, 140, 459,4068,7343,7344,1365, 839, 272, 978,2257,2572,3409, # 3190
-2128,1363,3623,1423, 697, 100,3071,  48,  70,1231, 495,3114,2193,7345,1294,7346, # 3206
-2079, 462, 586,1042,3246, 853, 256, 988, 185,2377,3410,1698, 434,1084,7347,3411, # 3222
- 314,2615,2775,4308,2330,2331, 569,2280, 637,1816,2518, 757,1162,1878,1616,3412, # 3238
- 287,1577,2115, 768,4309,1671,2854,3511,2519,1321,3737, 909,2413,7348,4069, 933, # 3254
-3738,7349,2052,2356,1222,4310, 765,2414,1322, 786,4311,7350,1919,1462,1677,2895, # 3270
-1699,7351,4312,1424,2437,3115,3624,2590,3316,1774,1940,3413,3880,4070, 309,1369, # 3286
-1130,2812, 364,2230,1653,1299,3881,3512,3882,3883,2646, 525,1085,3021, 902,2000, # 3302
-1475, 964,4313, 421,1844,1415,1057,2281, 940,1364,3116, 376,4314,4315,1381,   7, # 3318
-2520, 983,2378, 336,1710,2675,1845, 321,3414, 559,1131,3022,2742,1808,1132,1313, # 3334
- 265,1481,1857,7352, 352,1203,2813,3247, 167,1089, 420,2814, 776, 792,1724,3513, # 3350
-4071,2438,3248,7353,4072,7354, 446, 229, 333,2743, 901,3739,1200,1557,4316,2647, # 3366
-1920, 395,2744,2676,3740,4073,1835, 125, 916,3178,2616,4317,7355,7356,3741,7357, # 3382
-7358,7359,4318,3117,3625,1133,2547,1757,3415,1510,2313,1409,3514,7360,2145, 438, # 3398
-2591,2896,2379,3317,1068, 958,3023, 461, 311,2855,2677,4074,1915,3179,4075,1978, # 3414
- 383, 750,2745,2617,4076, 274, 539, 385,1278,1442,7361,1154,1964, 384, 561, 210, # 3430
-  98,1295,2548,3515,7362,1711,2415,1482,3416,3884,2897,1257, 129,7363,3742, 642, # 3446
- 523,2776,2777,2648,7364, 141,2231,1333,  68, 176, 441, 876, 907,4077, 603,2592, # 3462
- 710, 171,3417, 404, 549,  18,3118,2393,1410,3626,1666,7365,3516,4319,2898,4320, # 3478
-7366,2973, 368,7367, 146, 366,  99, 871,3627,1543, 748, 807,1586,1185,  22,2258, # 3494
- 379,3743,3180,7368,3181, 505,1941,2618,1991,1382,2314,7369, 380,2357, 218, 702, # 3510
-1817,1248,3418,3024,3517,3318,3249,7370,2974,3628, 930,3250,3744,7371,  59,7372, # 3526
- 585, 601,4078, 497,3419,1112,1314,4321,1801,7373,1223,1472,2174,7374, 749,1836, # 3542
- 690,1899,3745,1772,3885,1476, 429,1043,1790,2232,2116, 917,4079, 447,1086,1629, # 3558
-7375, 556,7376,7377,2020,1654, 844,1090, 105, 550, 966,1758,2815,1008,1782, 686, # 3574
-1095,7378,2282, 793,1602,7379,3518,2593,4322,4080,2933,2297,4323,3746, 980,2496, # 3590
- 544, 353, 527,4324, 908,2678,2899,7380, 381,2619,1942,1348,7381,1341,1252, 560, # 3606
-3072,7382,3420,2856,7383,2053, 973, 886,2080, 143,4325,7384,7385, 157,3886, 496, # 3622
-4081,  57, 840, 540,2038,4326,4327,3421,2117,1445, 970,2259,1748,1965,2081,4082, # 3638
-3119,1234,1775,3251,2816,3629, 773,1206,2129,1066,2039,1326,3887,1738,1725,4083, # 3654
- 279,3120,  51,1544,2594, 423,1578,2130,2066, 173,4328,1879,7386,7387,1583, 264, # 3670
- 610,3630,4329,2439, 280, 154,7388,7389,7390,1739, 338,1282,3073, 693,2857,1411, # 3686
-1074,3747,2440,7391,4330,7392,7393,1240, 952,2394,7394,2900,1538,2679, 685,1483, # 3702
-4084,2468,1436, 953,4085,2054,4331, 671,2395,  79,4086,2441,3252, 608, 567,2680, # 3718
-3422,4087,4088,1691, 393,1261,1791,2396,7395,4332,7396,7397,7398,7399,1383,1672, # 3734
-3748,3182,1464, 522,1119, 661,1150, 216, 675,4333,3888,1432,3519, 609,4334,2681, # 3750
-2397,7400,7401,7402,4089,3025,   0,7403,2469, 315, 231,2442, 301,3319,4335,2380, # 3766
-7404, 233,4090,3631,1818,4336,4337,7405,  96,1776,1315,2082,7406, 257,7407,1809, # 3782
-3632,2709,1139,1819,4091,2021,1124,2163,2778,1777,2649,7408,3074, 363,1655,3183, # 3798
-7409,2975,7410,7411,7412,3889,1567,3890, 718, 103,3184, 849,1443, 341,3320,2934, # 3814
-1484,7413,1712, 127,  67, 339,4092,2398, 679,1412, 821,7414,7415, 834, 738, 351, # 3830
-2976,2146, 846, 235,1497,1880, 418,1992,3749,2710, 186,1100,2147,2746,3520,1545, # 3846
-1355,2935,2858,1377, 583,3891,4093,2573,2977,7416,1298,3633,1078,2549,3634,2358, # 3862
-  78,3750,3751, 267,1289,2099,2001,1594,4094, 348, 369,1274,2194,2175,1837,4338, # 3878
-1820,2817,3635,2747,2283,2002,4339,2936,2748, 144,3321, 882,4340,3892,2749,3423, # 3894
-4341,2901,7417,4095,1726, 320,7418,3893,3026, 788,2978,7419,2818,1773,1327,2859, # 3910
-3894,2819,7420,1306,4342,2003,1700,3752,3521,2359,2650, 787,2022, 506, 824,3636, # 3926
- 534, 323,4343,1044,3322,2023,1900, 946,3424,7421,1778,1500,1678,7422,1881,4344, # 3942
- 165, 243,4345,3637,2521, 123, 683,4096, 764,4346,  36,3895,1792, 589,2902, 816, # 3958
- 626,1667,3027,2233,1639,1555,1622,3753,3896,7423,3897,2860,1370,1228,1932, 891, # 3974
-2083,2903, 304,4097,7424, 292,2979,2711,3522, 691,2100,4098,1115,4347, 118, 662, # 3990
-7425, 611,1156, 854,2381,1316,2861,   2, 386, 515,2904,7426,7427,3253, 868,2234, # 4006
-1486, 855,2651, 785,2212,3028,7428,1040,3185,3523,7429,3121, 448,7430,1525,7431, # 4022
-2164,4348,7432,3754,7433,4099,2820,3524,3122, 503, 818,3898,3123,1568, 814, 676, # 4038
-1444, 306,1749,7434,3755,1416,1030, 197,1428, 805,2821,1501,4349,7435,7436,7437, # 4054
-1993,7438,4350,7439,7440,2195,  13,2779,3638,2980,3124,1229,1916,7441,3756,2131, # 4070
-7442,4100,4351,2399,3525,7443,2213,1511,1727,1120,7444,7445, 646,3757,2443, 307, # 4086
-7446,7447,1595,3186,7448,7449,7450,3639,1113,1356,3899,1465,2522,2523,7451, 519, # 4102
-7452, 128,2132,  92,2284,1979,7453,3900,1512, 342,3125,2196,7454,2780,2214,1980, # 4118
-3323,7455, 290,1656,1317, 789, 827,2360,7456,3758,4352, 562, 581,3901,7457, 401, # 4134
-4353,2248,  94,4354,1399,2781,7458,1463,2024,4355,3187,1943,7459, 828,1105,4101, # 4150
-1262,1394,7460,4102, 605,4356,7461,1783,2862,7462,2822, 819,2101, 578,2197,2937, # 4166
-7463,1502, 436,3254,4103,3255,2823,3902,2905,3425,3426,7464,2712,2315,7465,7466, # 4182
-2332,2067,  23,4357, 193, 826,3759,2102, 699,1630,4104,3075, 390,1793,1064,3526, # 4198
-7467,1579,3076,3077,1400,7468,4105,1838,1640,2863,7469,4358,4359, 137,4106, 598, # 4214
-3078,1966, 780, 104, 974,2938,7470, 278, 899, 253, 402, 572, 504, 493,1339,7471, # 4230
-3903,1275,4360,2574,2550,7472,3640,3029,3079,2249, 565,1334,2713, 863,  41,7473, # 4246
-7474,4361,7475,1657,2333,  19, 463,2750,4107, 606,7476,2981,3256,1087,2084,1323, # 4262
-2652,2982,7477,1631,1623,1750,4108,2682,7478,2864, 791,2714,2653,2334, 232,2416, # 4278
-7479,2983,1498,7480,2654,2620, 755,1366,3641,3257,3126,2025,1609, 119,1917,3427, # 4294
- 862,1026,4109,7481,3904,3760,4362,3905,4363,2260,1951,2470,7482,1125, 817,4110, # 4310
-4111,3906,1513,1766,2040,1487,4112,3030,3258,2824,3761,3127,7483,7484,1507,7485, # 4326
-2683, 733,  40,1632,1106,2865, 345,4113, 841,2524, 230,4364,2984,1846,3259,3428, # 4342
-7486,1263, 986,3429,7487, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562,3907, # 4358
-3908,2939, 967,2751,2655,1349, 592,2133,1692,3324,2985,1994,4114,1679,3909,1901, # 4374
-2185,7488, 739,3642,2715,1296,1290,7489,4115,2198,2199,1921,1563,2595,2551,1870, # 4390
-2752,2986,7490, 435,7491, 343,1108, 596,  17,1751,4365,2235,3430,3643,7492,4366, # 4406
- 294,3527,2940,1693, 477, 979, 281,2041,3528, 643,2042,3644,2621,2782,2261,1031, # 4422
-2335,2134,2298,3529,4367, 367,1249,2552,7493,3530,7494,4368,1283,3325,2004, 240, # 4438
-1762,3326,4369,4370, 836,1069,3128, 474,7495,2148,2525, 268,3531,7496,3188,1521, # 4454
-1284,7497,1658,1546,4116,7498,3532,3533,7499,4117,3327,2684,1685,4118, 961,1673, # 4470
-2622, 190,2005,2200,3762,4371,4372,7500, 570,2497,3645,1490,7501,4373,2623,3260, # 4486
-1956,4374, 584,1514, 396,1045,1944,7502,4375,1967,2444,7503,7504,4376,3910, 619, # 4502
-7505,3129,3261, 215,2006,2783,2553,3189,4377,3190,4378, 763,4119,3763,4379,7506, # 4518
-7507,1957,1767,2941,3328,3646,1174, 452,1477,4380,3329,3130,7508,2825,1253,2382, # 4534
-2186,1091,2285,4120, 492,7509, 638,1169,1824,2135,1752,3911, 648, 926,1021,1324, # 4550
-4381, 520,4382, 997, 847,1007, 892,4383,3764,2262,1871,3647,7510,2400,1784,4384, # 4566
-1952,2942,3080,3191,1728,4121,2043,3648,4385,2007,1701,3131,1551,  30,2263,4122, # 4582
-7511,2026,4386,3534,7512, 501,7513,4123, 594,3431,2165,1821,3535,3432,3536,3192, # 4598
- 829,2826,4124,7514,1680,3132,1225,4125,7515,3262,4387,4126,3133,2336,7516,4388, # 4614
-4127,7517,3912,3913,7518,1847,2383,2596,3330,7519,4389, 374,3914, 652,4128,4129, # 4630
- 375,1140, 798,7520,7521,7522,2361,4390,2264, 546,1659, 138,3031,2445,4391,7523, # 4646
-2250, 612,1848, 910, 796,3765,1740,1371, 825,3766,3767,7524,2906,2554,7525, 692, # 4662
- 444,3032,2624, 801,4392,4130,7526,1491, 244,1053,3033,4131,4132, 340,7527,3915, # 4678
-1041,2987, 293,1168,  87,1357,7528,1539, 959,7529,2236, 721, 694,4133,3768, 219, # 4694
-1478, 644,1417,3331,2656,1413,1401,1335,1389,3916,7530,7531,2988,2362,3134,1825, # 4710
- 730,1515, 184,2827,  66,4393,7532,1660,2943, 246,3332, 378,1457, 226,3433, 975, # 4726
-3917,2944,1264,3537, 674, 696,7533, 163,7534,1141,2417,2166, 713,3538,3333,4394, # 4742
-3918,7535,7536,1186,  15,7537,1079,1070,7538,1522,3193,3539, 276,1050,2716, 758, # 4758
-1126, 653,2945,3263,7539,2337, 889,3540,3919,3081,2989, 903,1250,4395,3920,3434, # 4774
-3541,1342,1681,1718, 766,3264, 286,  89,2946,3649,7540,1713,7541,2597,3334,2990, # 4790
-7542,2947,2215,3194,2866,7543,4396,2498,2526, 181, 387,1075,3921, 731,2187,3335, # 4806
-7544,3265, 310, 313,3435,2299, 770,4134,  54,3034, 189,4397,3082,3769,3922,7545, # 4822
-1230,1617,1849, 355,3542,4135,4398,3336, 111,4136,3650,1350,3135,3436,3035,4137, # 4838
-2149,3266,3543,7546,2784,3923,3924,2991, 722,2008,7547,1071, 247,1207,2338,2471, # 4854
-1378,4399,2009, 864,1437,1214,4400, 373,3770,1142,2216, 667,4401, 442,2753,2555, # 4870
-3771,3925,1968,4138,3267,1839, 837, 170,1107, 934,1336,1882,7548,7549,2118,4139, # 4886
-2828, 743,1569,7550,4402,4140, 582,2384,1418,3437,7551,1802,7552, 357,1395,1729, # 4902
-3651,3268,2418,1564,2237,7553,3083,3772,1633,4403,1114,2085,4141,1532,7554, 482, # 4918
-2446,4404,7555,7556,1492, 833,1466,7557,2717,3544,1641,2829,7558,1526,1272,3652, # 4934
-4142,1686,1794, 416,2556,1902,1953,1803,7559,3773,2785,3774,1159,2316,7560,2867, # 4950
-4405,1610,1584,3036,2419,2754, 443,3269,1163,3136,7561,7562,3926,7563,4143,2499, # 4966
-3037,4406,3927,3137,2103,1647,3545,2010,1872,4144,7564,4145, 431,3438,7565, 250, # 4982
-  97,  81,4146,7566,1648,1850,1558, 160, 848,7567, 866, 740,1694,7568,2201,2830, # 4998
-3195,4147,4407,3653,1687, 950,2472, 426, 469,3196,3654,3655,3928,7569,7570,1188, # 5014
- 424,1995, 861,3546,4148,3775,2202,2685, 168,1235,3547,4149,7571,2086,1674,4408, # 5030
-3337,3270, 220,2557,1009,7572,3776, 670,2992, 332,1208, 717,7573,7574,3548,2447, # 5046
-3929,3338,7575, 513,7576,1209,2868,3339,3138,4409,1080,7577,7578,7579,7580,2527, # 5062
-3656,3549, 815,1587,3930,3931,7581,3550,3439,3777,1254,4410,1328,3038,1390,3932, # 5078
-1741,3933,3778,3934,7582, 236,3779,2448,3271,7583,7584,3657,3780,1273,3781,4411, # 5094
-7585, 308,7586,4412, 245,4413,1851,2473,1307,2575, 430, 715,2136,2449,7587, 270, # 5110
- 199,2869,3935,7588,3551,2718,1753, 761,1754, 725,1661,1840,4414,3440,3658,7589, # 5126
-7590, 587,  14,3272, 227,2598, 326, 480,2265, 943,2755,3552, 291, 650,1883,7591, # 5142
-1702,1226, 102,1547,  62,3441, 904,4415,3442,1164,4150,7592,7593,1224,1548,2756, # 5158
- 391, 498,1493,7594,1386,1419,7595,2055,1177,4416, 813, 880,1081,2363, 566,1145, # 5174
-4417,2286,1001,1035,2558,2599,2238, 394,1286,7596,7597,2068,7598,  86,1494,1730, # 5190
-3936, 491,1588, 745, 897,2948, 843,3340,3937,2757,2870,3273,1768, 998,2217,2069, # 5206
- 397,1826,1195,1969,3659,2993,3341, 284,7599,3782,2500,2137,2119,1903,7600,3938, # 5222
-2150,3939,4151,1036,3443,1904, 114,2559,4152, 209,1527,7601,7602,2949,2831,2625, # 5238
-2385,2719,3139, 812,2560,7603,3274,7604,1559, 737,1884,3660,1210, 885,  28,2686, # 5254
-3553,3783,7605,4153,1004,1779,4418,7606, 346,1981,2218,2687,4419,3784,1742, 797, # 5270
-1642,3940,1933,1072,1384,2151, 896,3941,3275,3661,3197,2871,3554,7607,2561,1958, # 5286
-4420,2450,1785,7608,7609,7610,3942,4154,1005,1308,3662,4155,2720,4421,4422,1528, # 5302
-2600, 161,1178,4156,1982, 987,4423,1101,4157, 631,3943,1157,3198,2420,1343,1241, # 5318
-1016,2239,2562, 372, 877,2339,2501,1160, 555,1934, 911,3944,7611, 466,1170, 169, # 5334
-1051,2907,2688,3663,2474,2994,1182,2011,2563,1251,2626,7612, 992,2340,3444,1540, # 5350
-2721,1201,2070,2401,1996,2475,7613,4424, 528,1922,2188,1503,1873,1570,2364,3342, # 5366
-3276,7614, 557,1073,7615,1827,3445,2087,2266,3140,3039,3084, 767,3085,2786,4425, # 5382
-1006,4158,4426,2341,1267,2176,3664,3199, 778,3945,3200,2722,1597,2657,7616,4427, # 5398
-7617,3446,7618,7619,7620,3277,2689,1433,3278, 131,  95,1504,3946, 723,4159,3141, # 5414
-1841,3555,2758,2189,3947,2027,2104,3665,7621,2995,3948,1218,7622,3343,3201,3949, # 5430
-4160,2576, 248,1634,3785, 912,7623,2832,3666,3040,3786, 654,  53,7624,2996,7625, # 5446
-1688,4428, 777,3447,1032,3950,1425,7626, 191, 820,2120,2833, 971,4429, 931,3202, # 5462
- 135, 664, 783,3787,1997, 772,2908,1935,3951,3788,4430,2909,3203, 282,2723, 640, # 5478
-1372,3448,1127, 922, 325,3344,7627,7628, 711,2044,7629,7630,3952,2219,2787,1936, # 5494
-3953,3345,2220,2251,3789,2300,7631,4431,3790,1258,3279,3954,3204,2138,2950,3955, # 5510
-3956,7632,2221, 258,3205,4432, 101,1227,7633,3280,1755,7634,1391,3281,7635,2910, # 5526
-2056, 893,7636,7637,7638,1402,4161,2342,7639,7640,3206,3556,7641,7642, 878,1325, # 5542
-1780,2788,4433, 259,1385,2577, 744,1183,2267,4434,7643,3957,2502,7644, 684,1024, # 5558
-4162,7645, 472,3557,3449,1165,3282,3958,3959, 322,2152, 881, 455,1695,1152,1340, # 5574
- 660, 554,2153,4435,1058,4436,4163, 830,1065,3346,3960,4437,1923,7646,1703,1918, # 5590
-7647, 932,2268, 122,7648,4438, 947, 677,7649,3791,2627, 297,1905,1924,2269,4439, # 5606
-2317,3283,7650,7651,4164,7652,4165,  84,4166, 112, 989,7653, 547,1059,3961, 701, # 5622
-3558,1019,7654,4167,7655,3450, 942, 639, 457,2301,2451, 993,2951, 407, 851, 494, # 5638
-4440,3347, 927,7656,1237,7657,2421,3348, 573,4168, 680, 921,2911,1279,1874, 285, # 5654
- 790,1448,1983, 719,2167,7658,7659,4441,3962,3963,1649,7660,1541, 563,7661,1077, # 5670
-7662,3349,3041,3451, 511,2997,3964,3965,3667,3966,1268,2564,3350,3207,4442,4443, # 5686
-7663, 535,1048,1276,1189,2912,2028,3142,1438,1373,2834,2952,1134,2012,7664,4169, # 5702
-1238,2578,3086,1259,7665, 700,7666,2953,3143,3668,4170,7667,4171,1146,1875,1906, # 5718
-4444,2601,3967, 781,2422, 132,1589, 203, 147, 273,2789,2402, 898,1786,2154,3968, # 5734
-3969,7668,3792,2790,7669,7670,4445,4446,7671,3208,7672,1635,3793, 965,7673,1804, # 5750
-2690,1516,3559,1121,1082,1329,3284,3970,1449,3794,  65,1128,2835,2913,2759,1590, # 5766
-3795,7674,7675,  12,2658,  45, 976,2579,3144,4447, 517,2528,1013,1037,3209,7676, # 5782
-3796,2836,7677,3797,7678,3452,7679,2602, 614,1998,2318,3798,3087,2724,2628,7680, # 5798
-2580,4172, 599,1269,7681,1810,3669,7682,2691,3088, 759,1060, 489,1805,3351,3285, # 5814
-1358,7683,7684,2386,1387,1215,2629,2252, 490,7685,7686,4173,1759,2387,2343,7687, # 5830
-4448,3799,1907,3971,2630,1806,3210,4449,3453,3286,2760,2344, 874,7688,7689,3454, # 5846
-3670,1858,  91,2914,3671,3042,3800,4450,7690,3145,3972,2659,7691,3455,1202,1403, # 5862
-3801,2954,2529,1517,2503,4451,3456,2504,7692,4452,7693,2692,1885,1495,1731,3973, # 5878
-2365,4453,7694,2029,7695,7696,3974,2693,1216, 237,2581,4174,2319,3975,3802,4454, # 5894
-4455,2694,3560,3457, 445,4456,7697,7698,7699,7700,2761,  61,3976,3672,1822,3977, # 5910
-7701, 687,2045, 935, 925, 405,2660, 703,1096,1859,2725,4457,3978,1876,1367,2695, # 5926
-3352, 918,2105,1781,2476, 334,3287,1611,1093,4458, 564,3146,3458,3673,3353, 945, # 5942
-2631,2057,4459,7702,1925, 872,4175,7703,3459,2696,3089, 349,4176,3674,3979,4460, # 5958
-3803,4177,3675,2155,3980,4461,4462,4178,4463,2403,2046, 782,3981, 400, 251,4179, # 5974
-1624,7704,7705, 277,3676, 299,1265, 476,1191,3804,2121,4180,4181,1109, 205,7706, # 5990
-2582,1000,2156,3561,1860,7707,7708,7709,4464,7710,4465,2565, 107,2477,2157,3982, # 6006
-3460,3147,7711,1533, 541,1301, 158, 753,4182,2872,3562,7712,1696, 370,1088,4183, # 6022
-4466,3563, 579, 327, 440, 162,2240, 269,1937,1374,3461, 968,3043,  56,1396,3090, # 6038
-2106,3288,3354,7713,1926,2158,4467,2998,7714,3564,7715,7716,3677,4468,2478,7717, # 6054
-2791,7718,1650,4469,7719,2603,7720,7721,3983,2661,3355,1149,3356,3984,3805,3985, # 6070
-7722,1076,  49,7723, 951,3211,3289,3290, 450,2837, 920,7724,1811,2792,2366,4184, # 6086
-1908,1138,2367,3806,3462,7725,3212,4470,1909,1147,1518,2423,4471,3807,7726,4472, # 6102
-2388,2604, 260,1795,3213,7727,7728,3808,3291, 708,7729,3565,1704,7730,3566,1351, # 6118
-1618,3357,2999,1886, 944,4185,3358,4186,3044,3359,4187,7731,3678, 422, 413,1714, # 6134
-3292, 500,2058,2345,4188,2479,7732,1344,1910, 954,7733,1668,7734,7735,3986,2404, # 6150
-4189,3567,3809,4190,7736,2302,1318,2505,3091, 133,3092,2873,4473, 629,  31,2838, # 6166
-2697,3810,4474, 850, 949,4475,3987,2955,1732,2088,4191,1496,1852,7737,3988, 620, # 6182
-3214, 981,1242,3679,3360,1619,3680,1643,3293,2139,2452,1970,1719,3463,2168,7738, # 6198
-3215,7739,7740,3361,1828,7741,1277,4476,1565,2047,7742,1636,3568,3093,7743, 869, # 6214
-2839, 655,3811,3812,3094,3989,3000,3813,1310,3569,4477,7744,7745,7746,1733, 558, # 6230
-4478,3681, 335,1549,3045,1756,4192,3682,1945,3464,1829,1291,1192, 470,2726,2107, # 6246
-2793, 913,1054,3990,7747,1027,7748,3046,3991,4479, 982,2662,3362,3148,3465,3216, # 6262
-3217,1946,2794,7749, 571,4480,7750,1830,7751,3570,2583,1523,2424,7752,2089, 984, # 6278
-4481,3683,1959,7753,3684, 852, 923,2795,3466,3685, 969,1519, 999,2048,2320,1705, # 6294
-7754,3095, 615,1662, 151, 597,3992,2405,2321,1049, 275,4482,3686,4193, 568,3687, # 6310
-3571,2480,4194,3688,7755,2425,2270, 409,3218,7756,1566,2874,3467,1002, 769,2840, # 6326
- 194,2090,3149,3689,2222,3294,4195, 628,1505,7757,7758,1763,2177,3001,3993, 521, # 6342
-1161,2584,1787,2203,2406,4483,3994,1625,4196,4197, 412,  42,3096, 464,7759,2632, # 6358
-4484,3363,1760,1571,2875,3468,2530,1219,2204,3814,2633,2140,2368,4485,4486,3295, # 6374
-1651,3364,3572,7760,7761,3573,2481,3469,7762,3690,7763,7764,2271,2091, 460,7765, # 6390
-4487,7766,3002, 962, 588,3574, 289,3219,2634,1116,  52,7767,3047,1796,7768,7769, # 6406
-7770,1467,7771,1598,1143,3691,4198,1984,1734,1067,4488,1280,3365, 465,4489,1572, # 6422
- 510,7772,1927,2241,1812,1644,3575,7773,4490,3692,7774,7775,2663,1573,1534,7776, # 6438
-7777,4199, 536,1807,1761,3470,3815,3150,2635,7778,7779,7780,4491,3471,2915,1911, # 6454
-2796,7781,3296,1122, 377,3220,7782, 360,7783,7784,4200,1529, 551,7785,2059,3693, # 6470
-1769,2426,7786,2916,4201,3297,3097,2322,2108,2030,4492,1404, 136,1468,1479, 672, # 6486
-1171,3221,2303, 271,3151,7787,2762,7788,2049, 678,2727, 865,1947,4493,7789,2013, # 6502
-3995,2956,7790,2728,2223,1397,3048,3694,4494,4495,1735,2917,3366,3576,7791,3816, # 6518
- 509,2841,2453,2876,3817,7792,7793,3152,3153,4496,4202,2531,4497,2304,1166,1010, # 6534
- 552, 681,1887,7794,7795,2957,2958,3996,1287,1596,1861,3154, 358, 453, 736, 175, # 6550
- 478,1117, 905,1167,1097,7796,1853,1530,7797,1706,7798,2178,3472,2287,3695,3473, # 6566
-3577,4203,2092,4204,7799,3367,1193,2482,4205,1458,2190,2205,1862,1888,1421,3298, # 6582
-2918,3049,2179,3474, 595,2122,7800,3997,7801,7802,4206,1707,2636, 223,3696,1359, # 6598
- 751,3098, 183,3475,7803,2797,3003, 419,2369, 633, 704,3818,2389, 241,7804,7805, # 6614
-7806, 838,3004,3697,2272,2763,2454,3819,1938,2050,3998,1309,3099,2242,1181,7807, # 6630
-1136,2206,3820,2370,1446,4207,2305,4498,7808,7809,4208,1055,2605, 484,3698,7810, # 6646
-3999, 625,4209,2273,3368,1499,4210,4000,7811,4001,4211,3222,2274,2275,3476,7812, # 6662
-7813,2764, 808,2606,3699,3369,4002,4212,3100,2532, 526,3370,3821,4213, 955,7814, # 6678
-1620,4214,2637,2427,7815,1429,3700,1669,1831, 994, 928,7816,3578,1260,7817,7818, # 6694
-7819,1948,2288, 741,2919,1626,4215,2729,2455, 867,1184, 362,3371,1392,7820,7821, # 6710
-4003,4216,1770,1736,3223,2920,4499,4500,1928,2698,1459,1158,7822,3050,3372,2877, # 6726
-1292,1929,2506,2842,3701,1985,1187,2071,2014,2607,4217,7823,2566,2507,2169,3702, # 6742
-2483,3299,7824,3703,4501,7825,7826, 666,1003,3005,1022,3579,4218,7827,4502,1813, # 6758
-2253, 574,3822,1603, 295,1535, 705,3823,4219, 283, 858, 417,7828,7829,3224,4503, # 6774
-4504,3051,1220,1889,1046,2276,2456,4004,1393,1599, 689,2567, 388,4220,7830,2484, # 6790
- 802,7831,2798,3824,2060,1405,2254,7832,4505,3825,2109,1052,1345,3225,1585,7833, # 6806
- 809,7834,7835,7836, 575,2730,3477, 956,1552,1469,1144,2323,7837,2324,1560,2457, # 6822
-3580,3226,4005, 616,2207,3155,2180,2289,7838,1832,7839,3478,4506,7840,1319,3704, # 6838
-3705,1211,3581,1023,3227,1293,2799,7841,7842,7843,3826, 607,2306,3827, 762,2878, # 6854
-1439,4221,1360,7844,1485,3052,7845,4507,1038,4222,1450,2061,2638,4223,1379,4508, # 6870
-2585,7846,7847,4224,1352,1414,2325,2921,1172,7848,7849,3828,3829,7850,1797,1451, # 6886
-7851,7852,7853,7854,2922,4006,4007,2485,2346, 411,4008,4009,3582,3300,3101,4509, # 6902
-1561,2664,1452,4010,1375,7855,7856,  47,2959, 316,7857,1406,1591,2923,3156,7858, # 6918
-1025,2141,3102,3157, 354,2731, 884,2224,4225,2407, 508,3706, 726,3583, 996,2428, # 6934
-3584, 729,7859, 392,2191,1453,4011,4510,3707,7860,7861,2458,3585,2608,1675,2800, # 6950
- 919,2347,2960,2348,1270,4511,4012,  73,7862,7863, 647,7864,3228,2843,2255,1550, # 6966
-1346,3006,7865,1332, 883,3479,7866,7867,7868,7869,3301,2765,7870,1212, 831,1347, # 6982
-4226,4512,2326,3830,1863,3053, 720,3831,4513,4514,3832,7871,4227,7872,7873,4515, # 6998
-7874,7875,1798,4516,3708,2609,4517,3586,1645,2371,7876,7877,2924, 669,2208,2665, # 7014
-2429,7878,2879,7879,7880,1028,3229,7881,4228,2408,7882,2256,1353,7883,7884,4518, # 7030
-3158, 518,7885,4013,7886,4229,1960,7887,2142,4230,7888,7889,3007,2349,2350,3833, # 7046
- 516,1833,1454,4014,2699,4231,4519,2225,2610,1971,1129,3587,7890,2766,7891,2961, # 7062
-1422, 577,1470,3008,1524,3373,7892,7893, 432,4232,3054,3480,7894,2586,1455,2508, # 7078
-2226,1972,1175,7895,1020,2732,4015,3481,4520,7896,2733,7897,1743,1361,3055,3482, # 7094
-2639,4016,4233,4521,2290, 895, 924,4234,2170, 331,2243,3056, 166,1627,3057,1098, # 7110
-7898,1232,2880,2227,3374,4522, 657, 403,1196,2372, 542,3709,3375,1600,4235,3483, # 7126
-7899,4523,2767,3230, 576, 530,1362,7900,4524,2533,2666,3710,4017,7901, 842,3834, # 7142
-7902,2801,2031,1014,4018, 213,2700,3376, 665, 621,4236,7903,3711,2925,2430,7904, # 7158
-2431,3302,3588,3377,7905,4237,2534,4238,4525,3589,1682,4239,3484,1380,7906, 724, # 7174
-2277, 600,1670,7907,1337,1233,4526,3103,2244,7908,1621,4527,7909, 651,4240,7910, # 7190
-1612,4241,2611,7911,2844,7912,2734,2307,3058,7913, 716,2459,3059, 174,1255,2701, # 7206
-4019,3590, 548,1320,1398, 728,4020,1574,7914,1890,1197,3060,4021,7915,3061,3062, # 7222
-3712,3591,3713, 747,7916, 635,4242,4528,7917,7918,7919,4243,7920,7921,4529,7922, # 7238
-3378,4530,2432, 451,7923,3714,2535,2072,4244,2735,4245,4022,7924,1764,4531,7925, # 7254
-4246, 350,7926,2278,2390,2486,7927,4247,4023,2245,1434,4024, 488,4532, 458,4248, # 7270
-4025,3715, 771,1330,2391,3835,2568,3159,2159,2409,1553,2667,3160,4249,7928,2487, # 7286
-2881,2612,1720,2702,4250,3379,4533,7929,2536,4251,7930,3231,4252,2768,7931,2015, # 7302
-2736,7932,1155,1017,3716,3836,7933,3303,2308, 201,1864,4253,1430,7934,4026,7935, # 7318
-7936,7937,7938,7939,4254,1604,7940, 414,1865, 371,2587,4534,4535,3485,2016,3104, # 7334
-4536,1708, 960,4255, 887, 389,2171,1536,1663,1721,7941,2228,4027,2351,2926,1580, # 7350
-7942,7943,7944,1744,7945,2537,4537,4538,7946,4539,7947,2073,7948,7949,3592,3380, # 7366
-2882,4256,7950,4257,2640,3381,2802, 673,2703,2460, 709,3486,4028,3593,4258,7951, # 7382
-1148, 502, 634,7952,7953,1204,4540,3594,1575,4541,2613,3717,7954,3718,3105, 948, # 7398
-3232, 121,1745,3837,1110,7955,4259,3063,2509,3009,4029,3719,1151,1771,3838,1488, # 7414
-4030,1986,7956,2433,3487,7957,7958,2093,7959,4260,3839,1213,1407,2803, 531,2737, # 7430
-2538,3233,1011,1537,7960,2769,4261,3106,1061,7961,3720,3721,1866,2883,7962,2017, # 7446
- 120,4262,4263,2062,3595,3234,2309,3840,2668,3382,1954,4542,7963,7964,3488,1047, # 7462
-2704,1266,7965,1368,4543,2845, 649,3383,3841,2539,2738,1102,2846,2669,7966,7967, # 7478
-1999,7968,1111,3596,2962,7969,2488,3842,3597,2804,1854,3384,3722,7970,7971,3385, # 7494
-2410,2884,3304,3235,3598,7972,2569,7973,3599,2805,4031,1460, 856,7974,3600,7975, # 7510
-2885,2963,7976,2886,3843,7977,4264, 632,2510, 875,3844,1697,3845,2291,7978,7979, # 7526
-4544,3010,1239, 580,4545,4265,7980, 914, 936,2074,1190,4032,1039,2123,7981,7982, # 7542
-7983,3386,1473,7984,1354,4266,3846,7985,2172,3064,4033, 915,3305,4267,4268,3306, # 7558
-1605,1834,7986,2739, 398,3601,4269,3847,4034, 328,1912,2847,4035,3848,1331,4270, # 7574
-3011, 937,4271,7987,3602,4036,4037,3387,2160,4546,3388, 524, 742, 538,3065,1012, # 7590
-7988,7989,3849,2461,7990, 658,1103, 225,3850,7991,7992,4547,7993,4548,7994,3236, # 7606
-1243,7995,4038, 963,2246,4549,7996,2705,3603,3161,7997,7998,2588,2327,7999,4550, # 7622
-8000,8001,8002,3489,3307, 957,3389,2540,2032,1930,2927,2462, 870,2018,3604,1746, # 7638
-2770,2771,2434,2463,8003,3851,8004,3723,3107,3724,3490,3390,3725,8005,1179,3066, # 7654
-8006,3162,2373,4272,3726,2541,3163,3108,2740,4039,8007,3391,1556,2542,2292, 977, # 7670
-2887,2033,4040,1205,3392,8008,1765,3393,3164,2124,1271,1689, 714,4551,3491,8009, # 7686
-2328,3852, 533,4273,3605,2181, 617,8010,2464,3308,3492,2310,8011,8012,3165,8013, # 7702
-8014,3853,1987, 618, 427,2641,3493,3394,8015,8016,1244,1690,8017,2806,4274,4552, # 7718
-8018,3494,8019,8020,2279,1576, 473,3606,4275,3395, 972,8021,3607,8022,3067,8023, # 7734
-8024,4553,4554,8025,3727,4041,4042,8026, 153,4555, 356,8027,1891,2888,4276,2143, # 7750
- 408, 803,2352,8028,3854,8029,4277,1646,2570,2511,4556,4557,3855,8030,3856,4278, # 7766
-8031,2411,3396, 752,8032,8033,1961,2964,8034, 746,3012,2465,8035,4279,3728, 698, # 7782
-4558,1892,4280,3608,2543,4559,3609,3857,8036,3166,3397,8037,1823,1302,4043,2706, # 7798
-3858,1973,4281,8038,4282,3167, 823,1303,1288,1236,2848,3495,4044,3398, 774,3859, # 7814
-8039,1581,4560,1304,2849,3860,4561,8040,2435,2161,1083,3237,4283,4045,4284, 344, # 7830
-1173, 288,2311, 454,1683,8041,8042,1461,4562,4046,2589,8043,8044,4563, 985, 894, # 7846
-8045,3399,3168,8046,1913,2928,3729,1988,8047,2110,1974,8048,4047,8049,2571,1194, # 7862
- 425,8050,4564,3169,1245,3730,4285,8051,8052,2850,8053, 636,4565,1855,3861, 760, # 7878
-1799,8054,4286,2209,1508,4566,4048,1893,1684,2293,8055,8056,8057,4287,4288,2210, # 7894
- 479,8058,8059, 832,8060,4049,2489,8061,2965,2490,3731, 990,3109, 627,1814,2642, # 7910
-4289,1582,4290,2125,2111,3496,4567,8062, 799,4291,3170,8063,4568,2112,1737,3013, # 7926
-1018, 543, 754,4292,3309,1676,4569,4570,4050,8064,1489,8065,3497,8066,2614,2889, # 7942
-4051,8067,8068,2966,8069,8070,8071,8072,3171,4571,4572,2182,1722,8073,3238,3239, # 7958
-1842,3610,1715, 481, 365,1975,1856,8074,8075,1962,2491,4573,8076,2126,3611,3240, # 7974
- 433,1894,2063,2075,8077, 602,2741,8078,8079,8080,8081,8082,3014,1628,3400,8083, # 7990
-3172,4574,4052,2890,4575,2512,8084,2544,2772,8085,8086,8087,3310,4576,2891,8088, # 8006
-4577,8089,2851,4578,4579,1221,2967,4053,2513,8090,8091,8092,1867,1989,8093,8094, # 8022
-8095,1895,8096,8097,4580,1896,4054, 318,8098,2094,4055,4293,8099,8100, 485,8101, # 8038
- 938,3862, 553,2670, 116,8102,3863,3612,8103,3498,2671,2773,3401,3311,2807,8104, # 8054
-3613,2929,4056,1747,2930,2968,8105,8106, 207,8107,8108,2672,4581,2514,8109,3015, # 8070
- 890,3614,3864,8110,1877,3732,3402,8111,2183,2353,3403,1652,8112,8113,8114, 941, # 8086
-2294, 208,3499,4057,2019, 330,4294,3865,2892,2492,3733,4295,8115,8116,8117,8118, # 8102
-#Everything below is of no interest for detection purpose
-2515,1613,4582,8119,3312,3866,2516,8120,4058,8121,1637,4059,2466,4583,3867,8122, # 8118
-2493,3016,3734,8123,8124,2192,8125,8126,2162,8127,8128,8129,8130,8131,8132,8133, # 8134
-8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8148,8149, # 8150
-8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,8160,8161,8162,8163,8164,8165, # 8166
-8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181, # 8182
-8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197, # 8198
-8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213, # 8214
-8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229, # 8230
-8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245, # 8246
-8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,8256,8257,8258,8259,8260,8261, # 8262
-8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,8272,8273,8274,8275,8276,8277, # 8278
-8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,8290,8291,8292,8293, # 8294
-8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,8308,8309, # 8310
-8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325, # 8326
-8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337,8338,8339,8340,8341, # 8342
-8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353,8354,8355,8356,8357, # 8358
-8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,8368,8369,8370,8371,8372,8373, # 8374
-8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,8384,8385,8386,8387,8388,8389, # 8390
-8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,8400,8401,8402,8403,8404,8405, # 8406
-8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,8416,8417,8418,8419,8420,8421, # 8422
-8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,8433,8434,8435,8436,8437, # 8438
-8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,8448,8449,8450,8451,8452,8453, # 8454
-8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8468,8469, # 8470
-8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,8480,8481,8482,8483,8484,8485, # 8486
-8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501, # 8502
-8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517, # 8518
-8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533, # 8534
-8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549, # 8550
-8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565, # 8566
-8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8576,8577,8578,8579,8580,8581, # 8582
-8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597, # 8598
-8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,8608,8609,8610,8611,8612,8613, # 8614
-8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,8624,8625,8626,8627,8628,8629, # 8630
-8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,8640,8641,8642,8643,8644,8645, # 8646
-8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,8657,8658,8659,8660,8661, # 8662
-8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672,8673,8674,8675,8676,8677, # 8678
-8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,8688,8689,8690,8691,8692,8693, # 8694
-8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,8708,8709, # 8710
-8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725, # 8726
-8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,8738,8739,8740,8741) # 8742
diff --git a/lib/requests/packages/chardet2/euctwprober.py b/lib/requests/packages/chardet2/euctwprober.py
deleted file mode 100755
index e601adf..0000000
--- a/lib/requests/packages/chardet2/euctwprober.py
+++ /dev/null
@@ -1,41 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCTWDistributionAnalysis
-from .mbcssm import EUCTWSMModel
-
-class EUCTWProber(MultiByteCharSetProber):
-    def __init__(self):
-        MultiByteCharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(EUCTWSMModel)
-        self._mDistributionAnalyzer = EUCTWDistributionAnalysis()
-        self.reset()
-
-    def get_charset_name(self):
-        return "EUC-TW"
diff --git a/lib/requests/packages/chardet2/gb2312freq.py b/lib/requests/packages/chardet2/gb2312freq.py
deleted file mode 100755
index 7a4d5a1..0000000
--- a/lib/requests/packages/chardet2/gb2312freq.py
+++ /dev/null
@@ -1,471 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# GB2312 most frequently used character table
-#
-# Char to FreqOrder table , from hz6763
-
-# 512  --> 0.79  -- 0.79
-# 1024 --> 0.92  -- 0.13
-# 2048 --> 0.98  -- 0.06
-# 6768 --> 1.00  -- 0.02
-#
-# Ideal Distribution Ratio = 0.79135/(1-0.79135) = 3.79
-# Random Distribution Ration = 512 / (3755 - 512) = 0.157
-# 
-# Typical Distribution Ratio about 25% of Ideal one, still much higher that RDR
-
-GB2312_TYPICAL_DISTRIBUTION_RATIO = 0.9
-
-GB2312_TABLE_SIZE = 3760
-
-GB2312CharToFreqOrder = ( \
-1671, 749,1443,2364,3924,3807,2330,3921,1704,3463,2691,1511,1515, 572,3191,2205,
-2361, 224,2558, 479,1711, 963,3162, 440,4060,1905,2966,2947,3580,2647,3961,3842,
-2204, 869,4207, 970,2678,5626,2944,2956,1479,4048, 514,3595, 588,1346,2820,3409,
- 249,4088,1746,1873,2047,1774, 581,1813, 358,1174,3590,1014,1561,4844,2245, 670,
-1636,3112, 889,1286, 953, 556,2327,3060,1290,3141, 613, 185,3477,1367, 850,3820,
-1715,2428,2642,2303,2732,3041,2562,2648,3566,3946,1349, 388,3098,2091,1360,3585,
- 152,1687,1539, 738,1559,  59,1232,2925,2267,1388,1249,1741,1679,2960, 151,1566,
-1125,1352,4271, 924,4296, 385,3166,4459, 310,1245,2850,  70,3285,2729,3534,3575,
-2398,3298,3466,1960,2265, 217,3647, 864,1909,2084,4401,2773,1010,3269,5152, 853,
-3051,3121,1244,4251,1895, 364,1499,1540,2313,1180,3655,2268, 562, 715,2417,3061,
- 544, 336,3768,2380,1752,4075, 950, 280,2425,4382, 183,2759,3272, 333,4297,2155,
-1688,2356,1444,1039,4540, 736,1177,3349,2443,2368,2144,2225, 565, 196,1482,3406,
- 927,1335,4147, 692, 878,1311,1653,3911,3622,1378,4200,1840,2969,3149,2126,1816,
-2534,1546,2393,2760, 737,2494,  13, 447, 245,2747,  38,2765,2129,2589,1079, 606,
- 360, 471,3755,2890, 404, 848, 699,1785,1236, 370,2221,1023,3746,2074,2026,2023,
-2388,1581,2119, 812,1141,3091,2536,1519, 804,2053, 406,1596,1090, 784, 548,4414,
-1806,2264,2936,1100, 343,4114,5096, 622,3358, 743,3668,1510,1626,5020,3567,2513,
-3195,4115,5627,2489,2991,  24,2065,2697,1087,2719,  48,1634, 315,  68, 985,2052,
- 198,2239,1347,1107,1439, 597,2366,2172, 871,3307, 919,2487,2790,1867, 236,2570,
-1413,3794, 906,3365,3381,1701,1982,1818,1524,2924,1205, 616,2586,2072,2004, 575,
- 253,3099,  32,1365,1182, 197,1714,2454,1201, 554,3388,3224,2748, 756,2587, 250,
-2567,1507,1517,3529,1922,2761,2337,3416,1961,1677,2452,2238,3153, 615, 911,1506,
-1474,2495,1265,1906,2749,3756,3280,2161, 898,2714,1759,3450,2243,2444, 563,  26,
-3286,2266,3769,3344,2707,3677, 611,1402, 531,1028,2871,4548,1375, 261,2948, 835,
-1190,4134, 353, 840,2684,1900,3082,1435,2109,1207,1674, 329,1872,2781,4055,2686,
-2104, 608,3318,2423,2957,2768,1108,3739,3512,3271,3985,2203,1771,3520,1418,2054,
-1681,1153, 225,1627,2929, 162,2050,2511,3687,1954, 124,1859,2431,1684,3032,2894,
- 585,4805,3969,2869,2704,2088,2032,2095,3656,2635,4362,2209, 256, 518,2042,2105,
-3777,3657, 643,2298,1148,1779, 190, 989,3544, 414,  11,2135,2063,2979,1471, 403,
-3678, 126, 770,1563, 671,2499,3216,2877, 600,1179, 307,2805,4937,1268,1297,2694,
- 252,4032,1448,1494,1331,1394, 127,2256, 222,1647,1035,1481,3056,1915,1048, 873,
-3651, 210,  33,1608,2516, 200,1520, 415, 102,   0,3389,1287, 817,  91,3299,2940,
- 836,1814, 549,2197,1396,1669,2987,3582,2297,2848,4528,1070, 687,  20,1819, 121,
-1552,1364,1461,1968,2617,3540,2824,2083, 177, 948,4938,2291, 110,4549,2066, 648,
-3359,1755,2110,2114,4642,4845,1693,3937,3308,1257,1869,2123, 208,1804,3159,2992,
-2531,2549,3361,2418,1350,2347,2800,2568,1291,2036,2680,  72, 842,1990, 212,1233,
-1154,1586,  75,2027,3410,4900,1823,1337,2710,2676, 728,2810,1522,3026,4995, 157,
- 755,1050,4022, 710, 785,1936,2194,2085,1406,2777,2400, 150,1250,4049,1206, 807,
-1910, 534, 529,3309,1721,1660, 274,  39,2827, 661,2670,1578, 925,3248,3815,1094,
-4278,4901,4252,  41,1150,3747,2572,2227,4501,3658,4902,3813,3357,3617,2884,2258,
- 887, 538,4187,3199,1294,2439,3042,2329,2343,2497,1255, 107, 543,1527, 521,3478,
-3568, 194,5062,  15, 961,3870,1241,1192,2664,  66,5215,3260,2111,1295,1127,2152,
-3805,4135, 901,1164,1976, 398,1278, 530,1460, 748, 904,1054,1966,1426,  53,2909,
- 509, 523,2279,1534, 536,1019, 239,1685, 460,2353, 673,1065,2401,3600,4298,2272,
-1272,2363, 284,1753,3679,4064,1695,  81, 815,2677,2757,2731,1386, 859, 500,4221,
-2190,2566, 757,1006,2519,2068,1166,1455, 337,2654,3203,1863,1682,1914,3025,1252,
-1409,1366, 847, 714,2834,2038,3209, 964,2970,1901, 885,2553,1078,1756,3049, 301,
-1572,3326, 688,2130,1996,2429,1805,1648,2930,3421,2750,3652,3088, 262,1158,1254,
- 389,1641,1812, 526,1719, 923,2073,1073,1902, 468, 489,4625,1140, 857,2375,3070,
-3319,2863, 380, 116,1328,2693,1161,2244, 273,1212,1884,2769,3011,1775,1142, 461,
-3066,1200,2147,2212, 790, 702,2695,4222,1601,1058, 434,2338,5153,3640,  67,2360,
-4099,2502, 618,3472,1329, 416,1132, 830,2782,1807,2653,3211,3510,1662, 192,2124,
- 296,3979,1739,1611,3684,  23, 118, 324, 446,1239,1225, 293,2520,3814,3795,2535,
-3116,  17,1074, 467,2692,2201, 387,2922,  45,1326,3055,1645,3659,2817, 958, 243,
-1903,2320,1339,2825,1784,3289, 356, 576, 865,2315,2381,3377,3916,1088,3122,1713,
-1655, 935, 628,4689,1034,1327, 441, 800, 720, 894,1979,2183,1528,5289,2702,1071,
-4046,3572,2399,1571,3281,  79, 761,1103, 327, 134, 758,1899,1371,1615, 879, 442,
- 215,2605,2579, 173,2048,2485,1057,2975,3317,1097,2253,3801,4263,1403,1650,2946,
- 814,4968,3487,1548,2644,1567,1285,   2, 295,2636,  97, 946,3576, 832, 141,4257,
-3273, 760,3821,3521,3156,2607, 949,1024,1733,1516,1803,1920,2125,2283,2665,3180,
-1501,2064,3560,2171,1592, 803,3518,1416, 732,3897,4258,1363,1362,2458, 119,1427,
- 602,1525,2608,1605,1639,3175, 694,3064,  10, 465,  76,2000,4846,4208, 444,3781,
-1619,3353,2206,1273,3796, 740,2483, 320,1723,2377,3660,2619,1359,1137,1762,1724,
-2345,2842,1850,1862, 912, 821,1866, 612,2625,1735,2573,3369,1093, 844,  89, 937,
- 930,1424,3564,2413,2972,1004,3046,3019,2011, 711,3171,1452,4178, 428, 801,1943,
- 432, 445,2811, 206,4136,1472, 730, 349,  73, 397,2802,2547, 998,1637,1167, 789,
- 396,3217, 154,1218, 716,1120,1780,2819,4826,1931,3334,3762,2139,1215,2627, 552,
-3664,3628,3232,1405,2383,3111,1356,2652,3577,3320,3101,1703, 640,1045,1370,1246,
-4996, 371,1575,2436,1621,2210, 984,4033,1734,2638,  16,4529, 663,2755,3255,1451,
-3917,2257,1253,1955,2234,1263,2951, 214,1229, 617, 485, 359,1831,1969, 473,2310,
- 750,2058, 165,  80,2864,2419, 361,4344,2416,2479,1134, 796,3726,1266,2943, 860,
-2715, 938, 390,2734,1313,1384, 248, 202, 877,1064,2854, 522,3907, 279,1602, 297,
-2357, 395,3740, 137,2075, 944,4089,2584,1267,3802,  62,1533,2285, 178, 176, 780,
-2440, 201,3707, 590, 478,1560,4354,2117,1075,  30,  74,4643,4004,1635,1441,2745,
- 776,2596, 238,1077,1692,1912,2844, 605, 499,1742,3947, 241,3053, 980,1749, 936,
-2640,4511,2582, 515,1543,2162,5322,2892,2993, 890,2148,1924, 665,1827,3581,1032,
- 968,3163, 339,1044,1896, 270, 583,1791,1720,4367,1194,3488,3669,  43,2523,1657,
- 163,2167, 290,1209,1622,3378, 550, 634,2508,2510, 695,2634,2384,2512,1476,1414,
- 220,1469,2341,2138,2852,3183,2900,4939,2865,3502,1211,3680, 854,3227,1299,2976,
-3172, 186,2998,1459, 443,1067,3251,1495, 321,1932,3054, 909, 753,1410,1828, 436,
-2441,1119,1587,3164,2186,1258, 227, 231,1425,1890,3200,3942, 247, 959, 725,5254,
-2741, 577,2158,2079, 929, 120, 174, 838,2813, 591,1115, 417,2024,  40,3240,1536,
-1037, 291,4151,2354, 632,1298,2406,2500,3535,1825,1846,3451, 205,1171, 345,4238,
-  18,1163, 811, 685,2208,1217, 425,1312,1508,1175,4308,2552,1033, 587,1381,3059,
-2984,3482, 340,1316,4023,3972, 792,3176, 519, 777,4690, 918, 933,4130,2981,3741,
-  90,3360,2911,2200,5184,4550, 609,3079,2030, 272,3379,2736, 363,3881,1130,1447,
- 286, 779, 357,1169,3350,3137,1630,1220,2687,2391, 747,1277,3688,2618,2682,2601,
-1156,3196,5290,4034,3102,1689,3596,3128, 874, 219,2783, 798, 508,1843,2461, 269,
-1658,1776,1392,1913,2983,3287,2866,2159,2372, 829,4076,  46,4253,2873,1889,1894,
- 915,1834,1631,2181,2318, 298, 664,2818,3555,2735, 954,3228,3117, 527,3511,2173,
- 681,2712,3033,2247,2346,3467,1652, 155,2164,3382, 113,1994, 450, 899, 494, 994,
-1237,2958,1875,2336,1926,3727, 545,1577,1550, 633,3473, 204,1305,3072,2410,1956,
-2471, 707,2134, 841,2195,2196,2663,3843,1026,4940, 990,3252,4997, 368,1092, 437,
-3212,3258,1933,1829, 675,2977,2893, 412, 943,3723,4644,3294,3283,2230,2373,5154,
-2389,2241,2661,2323,1404,2524, 593, 787, 677,3008,1275,2059, 438,2709,2609,2240,
-2269,2246,1446,  36,1568,1373,3892,1574,2301,1456,3962, 693,2276,5216,2035,1143,
-2720,1919,1797,1811,2763,4137,2597,1830,1699,1488,1198,2090, 424,1694, 312,3634,
-3390,4179,3335,2252,1214, 561,1059,3243,2295,2561, 975,5155,2321,2751,3772, 472,
-1537,3282,3398,1047,2077,2348,2878,1323,3340,3076, 690,2906,  51, 369, 170,3541,
-1060,2187,2688,3670,2541,1083,1683, 928,3918, 459, 109,4427, 599,3744,4286, 143,
-2101,2730,2490,  82,1588,3036,2121, 281,1860, 477,4035,1238,2812,3020,2716,3312,
-1530,2188,2055,1317, 843, 636,1808,1173,3495, 649, 181,1002, 147,3641,1159,2414,
-3750,2289,2795, 813,3123,2610,1136,4368,   5,3391,4541,2174, 420, 429,1728, 754,
-1228,2115,2219, 347,2223,2733, 735,1518,3003,2355,3134,1764,3948,3329,1888,2424,
-1001,1234,1972,3321,3363,1672,1021,1450,1584, 226, 765, 655,2526,3404,3244,2302,
-3665, 731, 594,2184, 319,1576, 621, 658,2656,4299,2099,3864,1279,2071,2598,2739,
- 795,3086,3699,3908,1707,2352,2402,1382,3136,2475,1465,4847,3496,3865,1085,3004,
-2591,1084, 213,2287,1963,3565,2250, 822, 793,4574,3187,1772,1789,3050, 595,1484,
-1959,2770,1080,2650, 456, 422,2996, 940,3322,4328,4345,3092,2742, 965,2784, 739,
-4124, 952,1358,2498,2949,2565, 332,2698,2378, 660,2260,2473,4194,3856,2919, 535,
-1260,2651,1208,1428,1300,1949,1303,2942, 433,2455,2450,1251,1946, 614,1269, 641,
-1306,1810,2737,3078,2912, 564,2365,1419,1415,1497,4460,2367,2185,1379,3005,1307,
-3218,2175,1897,3063, 682,1157,4040,4005,1712,1160,1941,1399, 394, 402,2952,1573,
-1151,2986,2404, 862, 299,2033,1489,3006, 346, 171,2886,3401,1726,2932, 168,2533,
-  47,2507,1030,3735,1145,3370,1395,1318,1579,3609,4560,2857,4116,1457,2529,1965,
- 504,1036,2690,2988,2405, 745,5871, 849,2397,2056,3081, 863,2359,3857,2096,  99,
-1397,1769,2300,4428,1643,3455,1978,1757,3718,1440,  35,4879,3742,1296,4228,2280,
- 160,5063,1599,2013, 166, 520,3479,1646,3345,3012, 490,1937,1545,1264,2182,2505,
-1096,1188,1369,1436,2421,1667,2792,2460,1270,2122, 727,3167,2143, 806,1706,1012,
-1800,3037, 960,2218,1882, 805, 139,2456,1139,1521, 851,1052,3093,3089, 342,2039,
- 744,5097,1468,1502,1585,2087, 223, 939, 326,2140,2577, 892,2481,1623,4077, 982,
-3708, 135,2131,  87,2503,3114,2326,1106, 876,1616, 547,2997,2831,2093,3441,4530,
-4314,   9,3256,4229,4148, 659,1462,1986,1710,2046,2913,2231,4090,4880,5255,3392,
-3274,1368,3689,4645,1477, 705,3384,3635,1068,1529,2941,1458,3782,1509, 100,1656,
-2548, 718,2339, 408,1590,2780,3548,1838,4117,3719,1345,3530, 717,3442,2778,3220,
-2898,1892,4590,3614,3371,2043,1998,1224,3483, 891, 635, 584,2559,3355, 733,1766,
-1729,1172,3789,1891,2307, 781,2982,2271,1957,1580,5773,2633,2005,4195,3097,1535,
-3213,1189,1934,5693,3262, 586,3118,1324,1598, 517,1564,2217,1868,1893,4445,3728,
-2703,3139,1526,1787,1992,3882,2875,1549,1199,1056,2224,1904,2711,5098,4287, 338,
-1993,3129,3489,2689,1809,2815,1997, 957,1855,3898,2550,3275,3057,1105,1319, 627,
-1505,1911,1883,3526, 698,3629,3456,1833,1431, 746,  77,1261,2017,2296,1977,1885,
- 125,1334,1600, 525,1798,1109,2222,1470,1945, 559,2236,1186,3443,2476,1929,1411,
-2411,3135,1777,3372,2621,1841,1613,3229, 668,1430,1839,2643,2916, 195,1989,2671,
-2358,1387, 629,3205,2293,5256,4439, 123,1310, 888,1879,4300,3021,3605,1003,1162,
-3192,2910,2010, 140,2395,2859,  55,1082,2012,2901, 662, 419,2081,1438, 680,2774,
-4654,3912,1620,1731,1625,5035,4065,2328, 512,1344, 802,5443,2163,2311,2537, 524,
-3399,  98,1155,2103,1918,2606,3925,2816,1393,2465,1504,3773,2177,3963,1478,4346,
- 180,1113,4655,3461,2028,1698, 833,2696,1235,1322,1594,4408,3623,3013,3225,2040,
-3022, 541,2881, 607,3632,2029,1665,1219, 639,1385,1686,1099,2803,3231,1938,3188,
-2858, 427, 676,2772,1168,2025, 454,3253,2486,3556, 230,1950, 580, 791,1991,1280,
-1086,1974,2034, 630, 257,3338,2788,4903,1017,  86,4790, 966,2789,1995,1696,1131,
- 259,3095,4188,1308, 179,1463,5257, 289,4107,1248,  42,3413,1725,2288, 896,1947,
- 774,4474,4254, 604,3430,4264, 392,2514,2588, 452, 237,1408,3018, 988,4531,1970,
-3034,3310, 540,2370,1562,1288,2990, 502,4765,1147,   4,1853,2708, 207, 294,2814,
-4078,2902,2509, 684,  34,3105,3532,2551, 644, 709,2801,2344, 573,1727,3573,3557,
-2021,1081,3100,4315,2100,3681, 199,2263,1837,2385, 146,3484,1195,2776,3949, 997,
-1939,3973,1008,1091,1202,1962,1847,1149,4209,5444,1076, 493, 117,5400,2521, 972,
-1490,2934,1796,4542,2374,1512,2933,2657, 413,2888,1135,2762,2314,2156,1355,2369,
- 766,2007,2527,2170,3124,2491,2593,2632,4757,2437, 234,3125,3591,1898,1750,1376,
-1942,3468,3138, 570,2127,2145,3276,4131, 962, 132,1445,4196,  19, 941,3624,3480,
-3366,1973,1374,4461,3431,2629, 283,2415,2275, 808,2887,3620,2112,2563,1353,3610,
- 955,1089,3103,1053,  96,  88,4097, 823,3808,1583, 399, 292,4091,3313, 421,1128,
- 642,4006, 903,2539,1877,2082, 596,  29,4066,1790, 722,2157, 130, 995,1569, 769,
-1485, 464, 513,2213, 288,1923,1101,2453,4316, 133, 486,2445,  50, 625, 487,2207,
-  57, 423, 481,2962, 159,3729,1558, 491, 303, 482, 501, 240,2837, 112,3648,2392,
-1783, 362,   8,3433,3422, 610,2793,3277,1390,1284,1654,  21,3823, 734, 367, 623,
- 193, 287, 374,1009,1483, 816, 476, 313,2255,2340,1262,2150,2899,1146,2581, 782,
-2116,1659,2018,1880, 255,3586,3314,1110,2867,2137,2564, 986,2767,5185,2006, 650,
- 158, 926, 762, 881,3157,2717,2362,3587, 306,3690,3245,1542,3077,2427,1691,2478,
-2118,2985,3490,2438, 539,2305, 983, 129,1754, 355,4201,2386, 827,2923, 104,1773,
-2838,2771, 411,2905,3919, 376, 767, 122,1114, 828,2422,1817,3506, 266,3460,1007,
-1609,4998, 945,2612,4429,2274, 726,1247,1964,2914,2199,2070,4002,4108, 657,3323,
-1422, 579, 455,2764,4737,1222,2895,1670, 824,1223,1487,2525, 558, 861,3080, 598,
-2659,2515,1967, 752,2583,2376,2214,4180, 977, 704,2464,4999,2622,4109,1210,2961,
- 819,1541, 142,2284,  44, 418, 457,1126,3730,4347,4626,1644,1876,3671,1864, 302,
-1063,5694, 624, 723,1984,3745,1314,1676,2488,1610,1449,3558,3569,2166,2098, 409,
-1011,2325,3704,2306, 818,1732,1383,1824,1844,3757, 999,2705,3497,1216,1423,2683,
-2426,2954,2501,2726,2229,1475,2554,5064,1971,1794,1666,2014,1343, 783, 724, 191,
-2434,1354,2220,5065,1763,2752,2472,4152, 131, 175,2885,3434,  92,1466,4920,2616,
-3871,3872,3866, 128,1551,1632, 669,1854,3682,4691,4125,1230, 188,2973,3290,1302,
-1213, 560,3266, 917, 763,3909,3249,1760, 868,1958, 764,1782,2097, 145,2277,3774,
-4462,  64,1491,3062, 971,2132,3606,2442, 221,1226,1617, 218, 323,1185,3207,3147,
- 571, 619,1473,1005,1744,2281, 449,1887,2396,3685, 275, 375,3816,1743,3844,3731,
- 845,1983,2350,4210,1377, 773, 967,3499,3052,3743,2725,4007,1697,1022,3943,1464,
-3264,2855,2722,1952,1029,2839,2467,  84,4383,2215, 820,1391,2015,2448,3672, 377,
-1948,2168, 797,2545,3536,2578,2645,  94,2874,1678, 405,1259,3071, 771, 546,1315,
- 470,1243,3083, 895,2468, 981, 969,2037, 846,4181, 653,1276,2928,  14,2594, 557,
-3007,2474, 156, 902,1338,1740,2574, 537,2518, 973,2282,2216,2433,1928, 138,2903,
-1293,2631,1612, 646,3457, 839,2935, 111, 496,2191,2847, 589,3186, 149,3994,2060,
-4031,2641,4067,3145,1870,  37,3597,2136,1025,2051,3009,3383,3549,1121,1016,3261,
-1301, 251,2446,2599,2153, 872,3246, 637, 334,3705, 831, 884, 921,3065,3140,4092,
-2198,1944, 246,2964, 108,2045,1152,1921,2308,1031, 203,3173,4170,1907,3890, 810,
-1401,2003,1690, 506, 647,1242,2828,1761,1649,3208,2249,1589,3709,2931,5156,1708,
- 498, 666,2613, 834,3817,1231, 184,2851,1124, 883,3197,2261,3710,1765,1553,2658,
-1178,2639,2351,  93,1193, 942,2538,2141,4402, 235,1821, 870,1591,2192,1709,1871,
-3341,1618,4126,2595,2334, 603, 651,  69, 701, 268,2662,3411,2555,1380,1606, 503,
- 448, 254,2371,2646, 574,1187,2309,1770, 322,2235,1292,1801, 305, 566,1133, 229,
-2067,2057, 706, 167, 483,2002,2672,3295,1820,3561,3067, 316, 378,2746,3452,1112,
- 136,1981, 507,1651,2917,1117, 285,4591, 182,2580,3522,1304, 335,3303,1835,2504,
-1795,1792,2248, 674,1018,2106,2449,1857,2292,2845, 976,3047,1781,2600,2727,1389,
-1281,  52,3152, 153, 265,3950, 672,3485,3951,4463, 430,1183, 365, 278,2169,  27,
-1407,1336,2304, 209,1340,1730,2202,1852,2403,2883, 979,1737,1062, 631,2829,2542,
-3876,2592, 825,2086,2226,3048,3625, 352,1417,3724, 542, 991, 431,1351,3938,1861,
-2294, 826,1361,2927,3142,3503,1738, 463,2462,2723, 582,1916,1595,2808, 400,3845,
-3891,2868,3621,2254,  58,2492,1123, 910,2160,2614,1372,1603,1196,1072,3385,1700,
-3267,1980, 696, 480,2430, 920, 799,1570,2920,1951,2041,4047,2540,1321,4223,2469,
-3562,2228,1271,2602, 401,2833,3351,2575,5157, 907,2312,1256, 410, 263,3507,1582,
- 996, 678,1849,2316,1480, 908,3545,2237, 703,2322, 667,1826,2849,1531,2604,2999,
-2407,3146,2151,2630,1786,3711, 469,3542, 497,3899,2409, 858, 837,4446,3393,1274,
- 786, 620,1845,2001,3311, 484, 308,3367,1204,1815,3691,2332,1532,2557,1842,2020,
-2724,1927,2333,4440, 567,  22,1673,2728,4475,1987,1858,1144,1597, 101,1832,3601,
-  12, 974,3783,4391, 951,1412,   1,3720, 453,4608,4041, 528,1041,1027,3230,2628,
-1129, 875,1051,3291,1203,2262,1069,2860,2799,2149,2615,3278, 144,1758,3040,  31,
- 475,1680, 366,2685,3184, 311,1642,4008,2466,5036,1593,1493,2809, 216,1420,1668,
- 233, 304,2128,3284, 232,1429,1768,1040,2008,3407,2740,2967,2543, 242,2133, 778,
-1565,2022,2620, 505,2189,2756,1098,2273, 372,1614, 708, 553,2846,2094,2278, 169,
-3626,2835,4161, 228,2674,3165, 809,1454,1309, 466,1705,1095, 900,3423, 880,2667,
-3751,5258,2317,3109,2571,4317,2766,1503,1342, 866,4447,1118,  63,2076, 314,1881,
-1348,1061, 172, 978,3515,1747, 532, 511,3970,   6, 601, 905,2699,3300,1751, 276,
-1467,3725,2668,  65,4239,2544,2779,2556,1604, 578,2451,1802, 992,2331,2624,1320,
-3446, 713,1513,1013, 103,2786,2447,1661, 886,1702, 916, 654,3574,2031,1556, 751,
-2178,2821,2179,1498,1538,2176, 271, 914,2251,2080,1325, 638,1953,2937,3877,2432,
-2754,  95,3265,1716, 260,1227,4083, 775, 106,1357,3254, 426,1607, 555,2480, 772,
-1985, 244,2546, 474, 495,1046,2611,1851,2061,  71,2089,1675,2590, 742,3758,2843,
-3222,1433, 267,2180,2576,2826,2233,2092,3913,2435, 956,1745,3075, 856,2113,1116,
- 451,   3,1988,2896,1398, 993,2463,1878,2049,1341,2718,2721,2870,2108, 712,2904,
-4363,2753,2324, 277,2872,2349,2649, 384, 987, 435, 691,3000, 922, 164,3939, 652,
-1500,1184,4153,2482,3373,2165,4848,2335,3775,3508,3154,2806,2830,1554,2102,1664,
-2530,1434,2408, 893,1547,2623,3447,2832,2242,2532,3169,2856,3223,2078,  49,3770,
-3469, 462, 318, 656,2259,3250,3069, 679,1629,2758, 344,1138,1104,3120,1836,1283,
-3115,2154,1437,4448, 934, 759,1999, 794,2862,1038, 533,2560,1722,2342, 855,2626,
-1197,1663,4476,3127,  85,4240,2528,  25,1111,1181,3673, 407,3470,4561,2679,2713,
- 768,1925,2841,3986,1544,1165, 932, 373,1240,2146,1930,2673, 721,4766, 354,4333,
- 391,2963, 187,  61,3364,1442,1102, 330,1940,1767, 341,3809,4118, 393,2496,2062,
-2211, 105, 331, 300, 439, 913,1332, 626, 379,3304,1557, 328, 689,3952, 309,1555,
- 931, 317,2517,3027, 325, 569, 686,2107,3084,  60,1042,1333,2794, 264,3177,4014,
-1628, 258,3712,   7,4464,1176,1043,1778, 683, 114,1975,  78,1492, 383,1886, 510,
- 386, 645,5291,2891,2069,3305,4138,3867,2939,2603,2493,1935,1066,1848,3588,1015,
-1282,1289,4609, 697,1453,3044,2666,3611,1856,2412,  54, 719,1330, 568,3778,2459,
-1748, 788, 492, 551,1191,1000, 488,3394,3763, 282,1799, 348,2016,1523,3155,2390,
-1049, 382,2019,1788,1170, 729,2968,3523, 897,3926,2785,2938,3292, 350,2319,3238,
-1718,1717,2655,3453,3143,4465, 161,2889,2980,2009,1421,  56,1908,1640,2387,2232,
-1917,1874,2477,4921, 148,  83,3438, 592,4245,2882,1822,1055, 741, 115,1496,1624,
- 381,1638,4592,1020, 516,3214, 458, 947,4575,1432, 211,1514,2926,1865,2142, 189,
- 852,1221,1400,1486, 882,2299,4036, 351,  28,1122, 700,6479,6480,6481,6482,6483,  # last 512
-#Everything below is of no interest for detection purpose
-5508,6484,3900,3414,3974,4441,4024,3537,4037,5628,5099,3633,6485,3148,6486,3636,
-5509,3257,5510,5973,5445,5872,4941,4403,3174,4627,5873,6276,2286,4230,5446,5874,
-5122,6102,6103,4162,5447,5123,5323,4849,6277,3980,3851,5066,4246,5774,5067,6278,
-3001,2807,5695,3346,5775,5974,5158,5448,6487,5975,5976,5776,3598,6279,5696,4806,
-4211,4154,6280,6488,6489,6490,6281,4212,5037,3374,4171,6491,4562,4807,4722,4827,
-5977,6104,4532,4079,5159,5324,5160,4404,3858,5359,5875,3975,4288,4610,3486,4512,
-5325,3893,5360,6282,6283,5560,2522,4231,5978,5186,5449,2569,3878,6284,5401,3578,
-4415,6285,4656,5124,5979,2506,4247,4449,3219,3417,4334,4969,4329,6492,4576,4828,
-4172,4416,4829,5402,6286,3927,3852,5361,4369,4830,4477,4867,5876,4173,6493,6105,
-4657,6287,6106,5877,5450,6494,4155,4868,5451,3700,5629,4384,6288,6289,5878,3189,
-4881,6107,6290,6495,4513,6496,4692,4515,4723,5100,3356,6497,6291,3810,4080,5561,
-3570,4430,5980,6498,4355,5697,6499,4724,6108,6109,3764,4050,5038,5879,4093,3226,
-6292,5068,5217,4693,3342,5630,3504,4831,4377,4466,4309,5698,4431,5777,6293,5778,
-4272,3706,6110,5326,3752,4676,5327,4273,5403,4767,5631,6500,5699,5880,3475,5039,
-6294,5562,5125,4348,4301,4482,4068,5126,4593,5700,3380,3462,5981,5563,3824,5404,
-4970,5511,3825,4738,6295,6501,5452,4516,6111,5881,5564,6502,6296,5982,6503,4213,
-4163,3454,6504,6112,4009,4450,6113,4658,6297,6114,3035,6505,6115,3995,4904,4739,
-4563,4942,4110,5040,3661,3928,5362,3674,6506,5292,3612,4791,5565,4149,5983,5328,
-5259,5021,4725,4577,4564,4517,4364,6298,5405,4578,5260,4594,4156,4157,5453,3592,
-3491,6507,5127,5512,4709,4922,5984,5701,4726,4289,6508,4015,6116,5128,4628,3424,
-4241,5779,6299,4905,6509,6510,5454,5702,5780,6300,4365,4923,3971,6511,5161,3270,
-3158,5985,4100, 867,5129,5703,6117,5363,3695,3301,5513,4467,6118,6512,5455,4232,
-4242,4629,6513,3959,4478,6514,5514,5329,5986,4850,5162,5566,3846,4694,6119,5456,
-4869,5781,3779,6301,5704,5987,5515,4710,6302,5882,6120,4392,5364,5705,6515,6121,
-6516,6517,3736,5988,5457,5989,4695,2457,5883,4551,5782,6303,6304,6305,5130,4971,
-6122,5163,6123,4870,3263,5365,3150,4871,6518,6306,5783,5069,5706,3513,3498,4409,
-5330,5632,5366,5458,5459,3991,5990,4502,3324,5991,5784,3696,4518,5633,4119,6519,
-4630,5634,4417,5707,4832,5992,3418,6124,5993,5567,4768,5218,6520,4595,3458,5367,
-6125,5635,6126,4202,6521,4740,4924,6307,3981,4069,4385,6308,3883,2675,4051,3834,
-4302,4483,5568,5994,4972,4101,5368,6309,5164,5884,3922,6127,6522,6523,5261,5460,
-5187,4164,5219,3538,5516,4111,3524,5995,6310,6311,5369,3181,3386,2484,5188,3464,
-5569,3627,5708,6524,5406,5165,4677,4492,6312,4872,4851,5885,4468,5996,6313,5709,
-5710,6128,2470,5886,6314,5293,4882,5785,3325,5461,5101,6129,5711,5786,6525,4906,
-6526,6527,4418,5887,5712,4808,2907,3701,5713,5888,6528,3765,5636,5331,6529,6530,
-3593,5889,3637,4943,3692,5714,5787,4925,6315,6130,5462,4405,6131,6132,6316,5262,
-6531,6532,5715,3859,5716,5070,4696,5102,3929,5788,3987,4792,5997,6533,6534,3920,
-4809,5000,5998,6535,2974,5370,6317,5189,5263,5717,3826,6536,3953,5001,4883,3190,
-5463,5890,4973,5999,4741,6133,6134,3607,5570,6000,4711,3362,3630,4552,5041,6318,
-6001,2950,2953,5637,4646,5371,4944,6002,2044,4120,3429,6319,6537,5103,4833,6538,
-6539,4884,4647,3884,6003,6004,4758,3835,5220,5789,4565,5407,6540,6135,5294,4697,
-4852,6320,6321,3206,4907,6541,6322,4945,6542,6136,6543,6323,6005,4631,3519,6544,
-5891,6545,5464,3784,5221,6546,5571,4659,6547,6324,6137,5190,6548,3853,6549,4016,
-4834,3954,6138,5332,3827,4017,3210,3546,4469,5408,5718,3505,4648,5790,5131,5638,
-5791,5465,4727,4318,6325,6326,5792,4553,4010,4698,3439,4974,3638,4335,3085,6006,
-5104,5042,5166,5892,5572,6327,4356,4519,5222,5573,5333,5793,5043,6550,5639,5071,
-4503,6328,6139,6551,6140,3914,3901,5372,6007,5640,4728,4793,3976,3836,4885,6552,
-4127,6553,4451,4102,5002,6554,3686,5105,6555,5191,5072,5295,4611,5794,5296,6556,
-5893,5264,5894,4975,5466,5265,4699,4976,4370,4056,3492,5044,4886,6557,5795,4432,
-4769,4357,5467,3940,4660,4290,6141,4484,4770,4661,3992,6329,4025,4662,5022,4632,
-4835,4070,5297,4663,4596,5574,5132,5409,5895,6142,4504,5192,4664,5796,5896,3885,
-5575,5797,5023,4810,5798,3732,5223,4712,5298,4084,5334,5468,6143,4052,4053,4336,
-4977,4794,6558,5335,4908,5576,5224,4233,5024,4128,5469,5225,4873,6008,5045,4729,
-4742,4633,3675,4597,6559,5897,5133,5577,5003,5641,5719,6330,6560,3017,2382,3854,
-4406,4811,6331,4393,3964,4946,6561,2420,3722,6562,4926,4378,3247,1736,4442,6332,
-5134,6333,5226,3996,2918,5470,4319,4003,4598,4743,4744,4485,3785,3902,5167,5004,
-5373,4394,5898,6144,4874,1793,3997,6334,4085,4214,5106,5642,4909,5799,6009,4419,
-4189,3330,5899,4165,4420,5299,5720,5227,3347,6145,4081,6335,2876,3930,6146,3293,
-3786,3910,3998,5900,5300,5578,2840,6563,5901,5579,6147,3531,5374,6564,6565,5580,
-4759,5375,6566,6148,3559,5643,6336,6010,5517,6337,6338,5721,5902,3873,6011,6339,
-6567,5518,3868,3649,5722,6568,4771,4947,6569,6149,4812,6570,2853,5471,6340,6341,
-5644,4795,6342,6012,5723,6343,5724,6013,4349,6344,3160,6150,5193,4599,4514,4493,
-5168,4320,6345,4927,3666,4745,5169,5903,5005,4928,6346,5725,6014,4730,4203,5046,
-4948,3395,5170,6015,4150,6016,5726,5519,6347,5047,3550,6151,6348,4197,4310,5904,
-6571,5581,2965,6152,4978,3960,4291,5135,6572,5301,5727,4129,4026,5905,4853,5728,
-5472,6153,6349,4533,2700,4505,5336,4678,3583,5073,2994,4486,3043,4554,5520,6350,
-6017,5800,4487,6351,3931,4103,5376,6352,4011,4321,4311,4190,5136,6018,3988,3233,
-4350,5906,5645,4198,6573,5107,3432,4191,3435,5582,6574,4139,5410,6353,5411,3944,
-5583,5074,3198,6575,6354,4358,6576,5302,4600,5584,5194,5412,6577,6578,5585,5413,
-5303,4248,5414,3879,4433,6579,4479,5025,4854,5415,6355,4760,4772,3683,2978,4700,
-3797,4452,3965,3932,3721,4910,5801,6580,5195,3551,5907,3221,3471,3029,6019,3999,
-5908,5909,5266,5267,3444,3023,3828,3170,4796,5646,4979,4259,6356,5647,5337,3694,
-6357,5648,5338,4520,4322,5802,3031,3759,4071,6020,5586,4836,4386,5048,6581,3571,
-4679,4174,4949,6154,4813,3787,3402,3822,3958,3215,3552,5268,4387,3933,4950,4359,
-6021,5910,5075,3579,6358,4234,4566,5521,6359,3613,5049,6022,5911,3375,3702,3178,
-4911,5339,4521,6582,6583,4395,3087,3811,5377,6023,6360,6155,4027,5171,5649,4421,
-4249,2804,6584,2270,6585,4000,4235,3045,6156,5137,5729,4140,4312,3886,6361,4330,
-6157,4215,6158,3500,3676,4929,4331,3713,4930,5912,4265,3776,3368,5587,4470,4855,
-3038,4980,3631,6159,6160,4132,4680,6161,6362,3923,4379,5588,4255,6586,4121,6587,
-6363,4649,6364,3288,4773,4774,6162,6024,6365,3543,6588,4274,3107,3737,5050,5803,
-4797,4522,5589,5051,5730,3714,4887,5378,4001,4523,6163,5026,5522,4701,4175,2791,
-3760,6589,5473,4224,4133,3847,4814,4815,4775,3259,5416,6590,2738,6164,6025,5304,
-3733,5076,5650,4816,5590,6591,6165,6592,3934,5269,6593,3396,5340,6594,5804,3445,
-3602,4042,4488,5731,5732,3525,5591,4601,5196,6166,6026,5172,3642,4612,3202,4506,
-4798,6366,3818,5108,4303,5138,5139,4776,3332,4304,2915,3415,4434,5077,5109,4856,
-2879,5305,4817,6595,5913,3104,3144,3903,4634,5341,3133,5110,5651,5805,6167,4057,
-5592,2945,4371,5593,6596,3474,4182,6367,6597,6168,4507,4279,6598,2822,6599,4777,
-4713,5594,3829,6169,3887,5417,6170,3653,5474,6368,4216,2971,5228,3790,4579,6369,
-5733,6600,6601,4951,4746,4555,6602,5418,5475,6027,3400,4665,5806,6171,4799,6028,
-5052,6172,3343,4800,4747,5006,6370,4556,4217,5476,4396,5229,5379,5477,3839,5914,
-5652,5807,4714,3068,4635,5808,6173,5342,4192,5078,5419,5523,5734,6174,4557,6175,
-4602,6371,6176,6603,5809,6372,5735,4260,3869,5111,5230,6029,5112,6177,3126,4681,
-5524,5915,2706,3563,4748,3130,6178,4018,5525,6604,6605,5478,4012,4837,6606,4534,
-4193,5810,4857,3615,5479,6030,4082,3697,3539,4086,5270,3662,4508,4931,5916,4912,
-5811,5027,3888,6607,4397,3527,3302,3798,2775,2921,2637,3966,4122,4388,4028,4054,
-1633,4858,5079,3024,5007,3982,3412,5736,6608,3426,3236,5595,3030,6179,3427,3336,
-3279,3110,6373,3874,3039,5080,5917,5140,4489,3119,6374,5812,3405,4494,6031,4666,
-4141,6180,4166,6032,5813,4981,6609,5081,4422,4982,4112,3915,5653,3296,3983,6375,
-4266,4410,5654,6610,6181,3436,5082,6611,5380,6033,3819,5596,4535,5231,5306,5113,
-6612,4952,5918,4275,3113,6613,6376,6182,6183,5814,3073,4731,4838,5008,3831,6614,
-4888,3090,3848,4280,5526,5232,3014,5655,5009,5737,5420,5527,6615,5815,5343,5173,
-5381,4818,6616,3151,4953,6617,5738,2796,3204,4360,2989,4281,5739,5174,5421,5197,
-3132,5141,3849,5142,5528,5083,3799,3904,4839,5480,2880,4495,3448,6377,6184,5271,
-5919,3771,3193,6034,6035,5920,5010,6036,5597,6037,6378,6038,3106,5422,6618,5423,
-5424,4142,6619,4889,5084,4890,4313,5740,6620,3437,5175,5307,5816,4199,5198,5529,
-5817,5199,5656,4913,5028,5344,3850,6185,2955,5272,5011,5818,4567,4580,5029,5921,
-3616,5233,6621,6622,6186,4176,6039,6379,6380,3352,5200,5273,2908,5598,5234,3837,
-5308,6623,6624,5819,4496,4323,5309,5201,6625,6626,4983,3194,3838,4167,5530,5922,
-5274,6381,6382,3860,3861,5599,3333,4292,4509,6383,3553,5481,5820,5531,4778,6187,
-3955,3956,4324,4389,4218,3945,4325,3397,2681,5923,4779,5085,4019,5482,4891,5382,
-5383,6040,4682,3425,5275,4094,6627,5310,3015,5483,5657,4398,5924,3168,4819,6628,
-5925,6629,5532,4932,4613,6041,6630,4636,6384,4780,4204,5658,4423,5821,3989,4683,
-5822,6385,4954,6631,5345,6188,5425,5012,5384,3894,6386,4490,4104,6632,5741,5053,
-6633,5823,5926,5659,5660,5927,6634,5235,5742,5824,4840,4933,4820,6387,4859,5928,
-4955,6388,4143,3584,5825,5346,5013,6635,5661,6389,5014,5484,5743,4337,5176,5662,
-6390,2836,6391,3268,6392,6636,6042,5236,6637,4158,6638,5744,5663,4471,5347,3663,
-4123,5143,4293,3895,6639,6640,5311,5929,5826,3800,6189,6393,6190,5664,5348,3554,
-3594,4749,4603,6641,5385,4801,6043,5827,4183,6642,5312,5426,4761,6394,5665,6191,
-4715,2669,6643,6644,5533,3185,5427,5086,5930,5931,5386,6192,6044,6645,4781,4013,
-5745,4282,4435,5534,4390,4267,6045,5746,4984,6046,2743,6193,3501,4087,5485,5932,
-5428,4184,4095,5747,4061,5054,3058,3862,5933,5600,6646,5144,3618,6395,3131,5055,
-5313,6396,4650,4956,3855,6194,3896,5202,4985,4029,4225,6195,6647,5828,5486,5829,
-3589,3002,6648,6397,4782,5276,6649,6196,6650,4105,3803,4043,5237,5830,6398,4096,
-3643,6399,3528,6651,4453,3315,4637,6652,3984,6197,5535,3182,3339,6653,3096,2660,
-6400,6654,3449,5934,4250,4236,6047,6401,5831,6655,5487,3753,4062,5832,6198,6199,
-6656,3766,6657,3403,4667,6048,6658,4338,2897,5833,3880,2797,3780,4326,6659,5748,
-5015,6660,5387,4351,5601,4411,6661,3654,4424,5935,4339,4072,5277,4568,5536,6402,
-6662,5238,6663,5349,5203,6200,5204,6201,5145,4536,5016,5056,4762,5834,4399,4957,
-6202,6403,5666,5749,6664,4340,6665,5936,5177,5667,6666,6667,3459,4668,6404,6668,
-6669,4543,6203,6670,4276,6405,4480,5537,6671,4614,5205,5668,6672,3348,2193,4763,
-6406,6204,5937,5602,4177,5669,3419,6673,4020,6205,4443,4569,5388,3715,3639,6407,
-6049,4058,6206,6674,5938,4544,6050,4185,4294,4841,4651,4615,5488,6207,6408,6051,
-5178,3241,3509,5835,6208,4958,5836,4341,5489,5278,6209,2823,5538,5350,5206,5429,
-6675,4638,4875,4073,3516,4684,4914,4860,5939,5603,5389,6052,5057,3237,5490,3791,
-6676,6409,6677,4821,4915,4106,5351,5058,4243,5539,4244,5604,4842,4916,5239,3028,
-3716,5837,5114,5605,5390,5940,5430,6210,4332,6678,5540,4732,3667,3840,6053,4305,
-3408,5670,5541,6410,2744,5240,5750,6679,3234,5606,6680,5607,5671,3608,4283,4159,
-4400,5352,4783,6681,6411,6682,4491,4802,6211,6412,5941,6413,6414,5542,5751,6683,
-4669,3734,5942,6684,6415,5943,5059,3328,4670,4144,4268,6685,6686,6687,6688,4372,
-3603,6689,5944,5491,4373,3440,6416,5543,4784,4822,5608,3792,4616,5838,5672,3514,
-5391,6417,4892,6690,4639,6691,6054,5673,5839,6055,6692,6056,5392,6212,4038,5544,
-5674,4497,6057,6693,5840,4284,5675,4021,4545,5609,6418,4454,6419,6213,4113,4472,
-5314,3738,5087,5279,4074,5610,4959,4063,3179,4750,6058,6420,6214,3476,4498,4716,
-5431,4960,4685,6215,5241,6694,6421,6216,6695,5841,5945,6422,3748,5946,5179,3905,
-5752,5545,5947,4374,6217,4455,6423,4412,6218,4803,5353,6696,3832,5280,6219,4327,
-4702,6220,6221,6059,4652,5432,6424,3749,4751,6425,5753,4986,5393,4917,5948,5030,
-5754,4861,4733,6426,4703,6697,6222,4671,5949,4546,4961,5180,6223,5031,3316,5281,
-6698,4862,4295,4934,5207,3644,6427,5842,5950,6428,6429,4570,5843,5282,6430,6224,
-5088,3239,6060,6699,5844,5755,6061,6431,2701,5546,6432,5115,5676,4039,3993,3327,
-4752,4425,5315,6433,3941,6434,5677,4617,4604,3074,4581,6225,5433,6435,6226,6062,
-4823,5756,5116,6227,3717,5678,4717,5845,6436,5679,5846,6063,5847,6064,3977,3354,
-6437,3863,5117,6228,5547,5394,4499,4524,6229,4605,6230,4306,4500,6700,5951,6065,
-3693,5952,5089,4366,4918,6701,6231,5548,6232,6702,6438,4704,5434,6703,6704,5953,
-4168,6705,5680,3420,6706,5242,4407,6066,3812,5757,5090,5954,4672,4525,3481,5681,
-4618,5395,5354,5316,5955,6439,4962,6707,4526,6440,3465,4673,6067,6441,5682,6708,
-5435,5492,5758,5683,4619,4571,4674,4804,4893,4686,5493,4753,6233,6068,4269,6442,
-6234,5032,4705,5146,5243,5208,5848,6235,6443,4963,5033,4640,4226,6236,5849,3387,
-6444,6445,4436,4437,5850,4843,5494,4785,4894,6709,4361,6710,5091,5956,3331,6237,
-4987,5549,6069,6711,4342,3517,4473,5317,6070,6712,6071,4706,6446,5017,5355,6713,
-6714,4988,5436,6447,4734,5759,6715,4735,4547,4456,4754,6448,5851,6449,6450,3547,
-5852,5318,6451,6452,5092,4205,6716,6238,4620,4219,5611,6239,6072,4481,5760,5957,
-5958,4059,6240,6453,4227,4537,6241,5761,4030,4186,5244,5209,3761,4457,4876,3337,
-5495,5181,6242,5959,5319,5612,5684,5853,3493,5854,6073,4169,5613,5147,4895,6074,
-5210,6717,5182,6718,3830,6243,2798,3841,6075,6244,5855,5614,3604,4606,5496,5685,
-5118,5356,6719,6454,5960,5357,5961,6720,4145,3935,4621,5119,5962,4261,6721,6455,
-4786,5963,4375,4582,6245,6246,6247,6076,5437,4877,5856,3376,4380,6248,4160,6722,
-5148,6456,5211,6457,6723,4718,6458,6724,6249,5358,4044,3297,6459,6250,5857,5615,
-5497,5245,6460,5498,6725,6251,6252,5550,3793,5499,2959,5396,6461,6462,4572,5093,
-5500,5964,3806,4146,6463,4426,5762,5858,6077,6253,4755,3967,4220,5965,6254,4989,
-5501,6464,4352,6726,6078,4764,2290,5246,3906,5438,5283,3767,4964,2861,5763,5094,
-6255,6256,4622,5616,5859,5860,4707,6727,4285,4708,4824,5617,6257,5551,4787,5212,
-4965,4935,4687,6465,6728,6466,5686,6079,3494,4413,2995,5247,5966,5618,6729,5967,
-5764,5765,5687,5502,6730,6731,6080,5397,6467,4990,6258,6732,4538,5060,5619,6733,
-4719,5688,5439,5018,5149,5284,5503,6734,6081,4607,6259,5120,3645,5861,4583,6260,
-4584,4675,5620,4098,5440,6261,4863,2379,3306,4585,5552,5689,4586,5285,6735,4864,
-6736,5286,6082,6737,4623,3010,4788,4381,4558,5621,4587,4896,3698,3161,5248,4353,
-4045,6262,3754,5183,4588,6738,6263,6739,6740,5622,3936,6741,6468,6742,6264,5095,
-6469,4991,5968,6743,4992,6744,6083,4897,6745,4256,5766,4307,3108,3968,4444,5287,
-3889,4343,6084,4510,6085,4559,6086,4898,5969,6746,5623,5061,4919,5249,5250,5504,
-5441,6265,5320,4878,3242,5862,5251,3428,6087,6747,4237,5624,5442,6266,5553,4539,
-6748,2585,3533,5398,4262,6088,5150,4736,4438,6089,6267,5505,4966,6749,6268,6750,
-6269,5288,5554,3650,6090,6091,4624,6092,5690,6751,5863,4270,5691,4277,5555,5864,
-6752,5692,4720,4865,6470,5151,4688,4825,6753,3094,6754,6471,3235,4653,6755,5213,
-5399,6756,3201,4589,5865,4967,6472,5866,6473,5019,3016,6757,5321,4756,3957,4573,
-6093,4993,5767,4721,6474,6758,5625,6759,4458,6475,6270,6760,5556,4994,5214,5252,
-6271,3875,5768,6094,5034,5506,4376,5769,6761,2120,6476,5253,5770,6762,5771,5970,
-3990,5971,5557,5558,5772,6477,6095,2787,4641,5972,5121,6096,6097,6272,6763,3703,
-5867,5507,6273,4206,6274,4789,6098,6764,3619,3646,3833,3804,2394,3788,4936,3978,
-4866,4899,6099,6100,5559,6478,6765,3599,5868,6101,5869,5870,6275,6766,4527,6767)
-
diff --git a/lib/requests/packages/chardet2/gb2312prober.py b/lib/requests/packages/chardet2/gb2312prober.py
deleted file mode 100755
index 643fe25..0000000
--- a/lib/requests/packages/chardet2/gb2312prober.py
+++ /dev/null
@@ -1,41 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import GB2312DistributionAnalysis
-from .mbcssm import GB2312SMModel
-
-class GB2312Prober(MultiByteCharSetProber):
-    def __init__(self):
-        MultiByteCharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(GB2312SMModel)
-        self._mDistributionAnalyzer = GB2312DistributionAnalysis()
-        self.reset()
-
-    def get_charset_name(self):
-        return "GB2312"
diff --git a/lib/requests/packages/chardet2/hebrewprober.py b/lib/requests/packages/chardet2/hebrewprober.py
deleted file mode 100755
index 42bf98d..0000000
--- a/lib/requests/packages/chardet2/hebrewprober.py
+++ /dev/null
@@ -1,269 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-#          Shy Shalom
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetprober import CharSetProber
-from . import constants
-
-# This prober doesn't actually recognize a language or a charset.
-# It is a helper prober for the use of the Hebrew model probers
-
-### General ideas of the Hebrew charset recognition ###
-#
-# Four main charsets exist in Hebrew:
-# "ISO-8859-8" - Visual Hebrew
-# "windows-1255" - Logical Hebrew 
-# "ISO-8859-8-I" - Logical Hebrew
-# "x-mac-hebrew" - ?? Logical Hebrew ??
-#
-# Both "ISO" charsets use a completely identical set of code points, whereas
-# "windows-1255" and "x-mac-hebrew" are two different proper supersets of 
-# these code points. windows-1255 defines additional characters in the range
-# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific 
-# diacritics and additional 'Yiddish' ligature letters in the range 0xc0-0xd6.
-# x-mac-hebrew defines similar additional code points but with a different 
-# mapping.
-#
-# As far as an average Hebrew text with no diacritics is concerned, all four 
-# charsets are identical with respect to code points. Meaning that for the 
-# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters 
-# (including final letters).
-#
-# The dominant difference between these charsets is their directionality.
-# "Visual" directionality means that the text is ordered as if the renderer is
-# not aware of a BIDI rendering algorithm. The renderer sees the text and 
-# draws it from left to right. The text itself when ordered naturally is read 
-# backwards. A buffer of Visual Hebrew generally looks like so:
-# "[last word of first line spelled backwards] [whole line ordered backwards
-# and spelled backwards] [first word of first line spelled backwards] 
-# [end of line] [last word of second line] ... etc' "
-# adding punctuation marks, numbers and English text to visual text is
-# naturally also "visual" and from left to right.
-# 
-# "Logical" directionality means the text is ordered "naturally" according to
-# the order it is read. It is the responsibility of the renderer to display 
-# the text from right to left. A BIDI algorithm is used to place general 
-# punctuation marks, numbers and English text in the text.
-#
-# Texts in x-mac-hebrew are almost impossible to find on the Internet. From 
-# what little evidence I could find, it seems that its general directionality
-# is Logical.
-#
-# To sum up all of the above, the Hebrew probing mechanism knows about two
-# charsets:
-# Visual Hebrew - "ISO-8859-8" - backwards text - Words and sentences are
-#    backwards while line order is natural. For charset recognition purposes
-#    the line order is unimportant (In fact, for this implementation, even 
-#    word order is unimportant).
-# Logical Hebrew - "windows-1255" - normal, naturally ordered text.
-#
-# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be 
-#    specifically identified.
-# "x-mac-hebrew" is also identified as windows-1255. A text in x-mac-hebrew
-#    that contain special punctuation marks or diacritics is displayed with
-#    some unconverted characters showing as question marks. This problem might
-#    be corrected using another model prober for x-mac-hebrew. Due to the fact
-#    that x-mac-hebrew texts are so rare, writing another model prober isn't 
-#    worth the effort and performance hit.
-#
-#### The Prober ####
-#
-# The prober is divided between two SBCharSetProbers and a HebrewProber,
-# all of which are managed, created, fed data, inquired and deleted by the
-# SBCSGroupProber. The two SBCharSetProbers identify that the text is in
-# fact some kind of Hebrew, Logical or Visual. The final decision about which
-# one is it is made by the HebrewProber by combining final-letter scores
-# with the scores of the two SBCharSetProbers to produce a final answer.
-#
-# The SBCSGroupProber is responsible for stripping the original text of HTML
-# tags, English characters, numbers, low-ASCII punctuation characters, spaces
-# and new lines. It reduces any sequence of such characters to a single space.
-# The buffer fed to each prober in the SBCS group prober is pure text in
-# high-ASCII.
-# The two SBCharSetProbers (model probers) share the same language model:
-# Win1255Model.
-# The first SBCharSetProber uses the model normally as any other
-# SBCharSetProber does, to recognize windows-1255, upon which this model was
-# built. The second SBCharSetProber is told to make the pair-of-letter
-# lookup in the language model backwards. This in practice exactly simulates
-# a visual Hebrew model using the windows-1255 logical Hebrew model.
-#
-# The HebrewProber is not using any language model. All it does is look for
-# final-letter evidence suggesting the text is either logical Hebrew or visual
-# Hebrew. Disjointed from the model probers, the results of the HebrewProber
-# alone are meaningless. HebrewProber always returns 0.00 as confidence
-# since it never identifies a charset by itself. Instead, the pointer to the
-# HebrewProber is passed to the model probers as a helper "Name Prober".
-# When the Group prober receives a positive identification from any prober,
-# it asks for the name of the charset identified. If the prober queried is a
-# Hebrew model prober, the model prober forwards the call to the
-# HebrewProber to make the final decision. In the HebrewProber, the
-# decision is made according to the final-letters scores maintained and Both
-# model probers scores. The answer is returned in the form of the name of the
-# charset identified, either "windows-1255" or "ISO-8859-8".
-
-# windows-1255 / ISO-8859-8 code points of interest
-FINAL_KAF = '\xea'
-NORMAL_KAF = '\xeb'
-FINAL_MEM = '\xed'
-NORMAL_MEM = '\xee'
-FINAL_NUN = '\xef'
-NORMAL_NUN = '\xf0'
-FINAL_PE = '\xf3'
-NORMAL_PE = '\xf4'
-FINAL_TSADI = '\xf5'
-NORMAL_TSADI = '\xf6'
-
-# Minimum Visual vs Logical final letter score difference.
-# If the difference is below this, don't rely solely on the final letter score distance.
-MIN_FINAL_CHAR_DISTANCE = 5
-
-# Minimum Visual vs Logical model score difference.
-# If the difference is below this, don't rely at all on the model score distance.
-MIN_MODEL_DISTANCE = 0.01
-
-VISUAL_HEBREW_NAME = "ISO-8859-8"
-LOGICAL_HEBREW_NAME = "windows-1255"
-
-class HebrewProber(CharSetProber):
-    def __init__(self):
-        CharSetProber.__init__(self)
-        self._mLogicalProber = None
-        self._mVisualProber = None
-        self.reset()
-
-    def reset(self):
-        self._mFinalCharLogicalScore = 0
-        self._mFinalCharVisualScore = 0
-        # The two last characters seen in the previous buffer,
-        # mPrev and mBeforePrev are initialized to space in order to simulate a word 
-        # delimiter at the beginning of the data
-        self._mPrev = ' '
-        self._mBeforePrev = ' '
-        # These probers are owned by the group prober.
-        
-    def set_model_probers(self, logicalProber, visualProber):
-        self._mLogicalProber = logicalProber
-        self._mVisualProber = visualProber
-
-    def is_final(self, c):
-        return c in [FINAL_KAF, FINAL_MEM, FINAL_NUN, FINAL_PE, FINAL_TSADI]
-
-    def is_non_final(self, c):
-        # The normal Tsadi is not a good Non-Final letter due to words like 
-        # 'lechotet' (to chat) containing an apostrophe after the tsadi. This 
-        # apostrophe is converted to a space in FilterWithoutEnglishLetters causing 
-        # the Non-Final tsadi to appear at an end of a word even though this is not 
-        # the case in the original text.
-        # The letters Pe and Kaf rarely display a related behavior of not being a 
-        # good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak' for 
-        # example legally end with a Non-Final Pe or Kaf. However, the benefit of 
-        # these letters as Non-Final letters outweighs the damage since these words 
-        # are quite rare.
-        return c in [NORMAL_KAF, NORMAL_MEM, NORMAL_NUN, NORMAL_PE]
-    
-    def feed(self, aBuf):
-        # Final letter analysis for logical-visual decision.
-        # Look for evidence that the received buffer is either logical Hebrew or 
-        # visual Hebrew.
-        # The following cases are checked:
-        # 1) A word longer than 1 letter, ending with a final letter. This is an 
-        #    indication that the text is laid out "naturally" since the final letter 
-        #    really appears at the end. +1 for logical score.
-        # 2) A word longer than 1 letter, ending with a Non-Final letter. In normal
-        #    Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi, should not end with
-        #    the Non-Final form of that letter. Exceptions to this rule are mentioned
-        #    above in isNonFinal(). This is an indication that the text is laid out
-        #    backwards. +1 for visual score
-        # 3) A word longer than 1 letter, starting with a final letter. Final letters 
-        #    should not appear at the beginning of a word. This is an indication that 
-        #    the text is laid out backwards. +1 for visual score.
-        # 
-        # The visual score and logical score are accumulated throughout the text and 
-        # are finally checked against each other in GetCharSetName().
-        # No checking for final letters in the middle of words is done since that case
-        # is not an indication for either Logical or Visual text.
-        # 
-        # We automatically filter out all 7-bit characters (replace them with spaces)
-        # so the word boundary detection works properly. [MAP]
-
-        if self.get_state() == constants.eNotMe:
-            # Both model probers say it's not them. No reason to continue.
-            return constants.eNotMe
-
-        aBuf = self.filter_high_bit_only(aBuf)
-        
-        for cur in aBuf:
-            if cur == ' ':
-                # We stand on a space - a word just ended
-                if self._mBeforePrev != ' ':
-                    # next-to-last char was not a space so self._mPrev is not a 1 letter word
-                    if self.is_final(self._mPrev):
-                        # case (1) [-2:not space][-1:final letter][cur:space]
-                        self._mFinalCharLogicalScore += 1
-                    elif self.is_non_final(self._mPrev):
-                        # case (2) [-2:not space][-1:Non-Final letter][cur:space]
-                        self._mFinalCharVisualScore += 1
-            else:
-                # Not standing on a space
-                if (self._mBeforePrev == ' ') and (self.is_final(self._mPrev)) and (cur != ' '):
-                    # case (3) [-2:space][-1:final letter][cur:not space]
-                    self._mFinalCharVisualScore += 1
-            self._mBeforePrev = self._mPrev
-            self._mPrev = cur
-
-        # Forever detecting, till the end or until both model probers return eNotMe (handled above)
-        return constants.eDetecting
-
-    def get_charset_name(self):
-        # Make the decision: is it Logical or Visual?
-        # If the final letter score distance is dominant enough, rely on it.
-        finalsub = self._mFinalCharLogicalScore - self._mFinalCharVisualScore
-        if finalsub >= MIN_FINAL_CHAR_DISTANCE:
-            return LOGICAL_HEBREW_NAME
-        if finalsub <= -MIN_FINAL_CHAR_DISTANCE:
-            return VISUAL_HEBREW_NAME
-
-        # It's not dominant enough, try to rely on the model scores instead.
-        modelsub = self._mLogicalProber.get_confidence() - self._mVisualProber.get_confidence()
-        if modelsub > MIN_MODEL_DISTANCE:
-            return LOGICAL_HEBREW_NAME
-        if modelsub < -MIN_MODEL_DISTANCE:
-            return VISUAL_HEBREW_NAME
-
-        # Still no good, back to final letter distance, maybe it'll save the day.
-        if finalsub < 0.0:
-            return VISUAL_HEBREW_NAME
-
-        # (finalsub > 0 - Logical) or (don't know what to do) default to Logical.
-        return LOGICAL_HEBREW_NAME
-
-    def get_state(self):
-        # Remain active as long as any of the model probers are active.
-        if (self._mLogicalProber.get_state() == constants.eNotMe) and \
-           (self._mVisualProber.get_state() == constants.eNotMe):
-            return constants.eNotMe
-        return constants.eDetecting
diff --git a/lib/requests/packages/chardet2/jisfreq.py b/lib/requests/packages/chardet2/jisfreq.py
deleted file mode 100755
index 5fe4a5c..0000000
--- a/lib/requests/packages/chardet2/jisfreq.py
+++ /dev/null
@@ -1,567 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# Sampling from about 20M text materials include literature and computer technology
-#
-# Japanese frequency table, applied to both S-JIS and EUC-JP
-# They are sorted in order. 
-
-# 128  --> 0.77094
-# 256  --> 0.85710
-# 512  --> 0.92635
-# 1024 --> 0.97130
-# 2048 --> 0.99431
-#
-# Ideal Distribution Ratio = 0.92635 / (1-0.92635) = 12.58
-# Random Distribution Ration = 512 / (2965+62+83+86-512) = 0.191
-# 
-# Typical Distribution Ratio, 25% of IDR 
-
-JIS_TYPICAL_DISTRIBUTION_RATIO = 3.0
-
-# Char to FreqOrder table , 
-JIS_TABLE_SIZE = 4368
-
-JISCharToFreqOrder = ( \
-  40,   1,   6, 182, 152, 180, 295,2127, 285, 381,3295,4304,3068,4606,3165,3510, #   16
-3511,1822,2785,4607,1193,2226,5070,4608, 171,2996,1247,  18, 179,5071, 856,1661, #   32
-1262,5072, 619, 127,3431,3512,3230,1899,1700, 232, 228,1294,1298, 284, 283,2041, #   48
-2042,1061,1062,  48,  49,  44,  45, 433, 434,1040,1041, 996, 787,2997,1255,4305, #   64
-2108,4609,1684,1648,5073,5074,5075,5076,5077,5078,3687,5079,4610,5080,3927,3928, #   80
-5081,3296,3432, 290,2285,1471,2187,5082,2580,2825,1303,2140,1739,1445,2691,3375, #   96
-1691,3297,4306,4307,4611, 452,3376,1182,2713,3688,3069,4308,5083,5084,5085,5086, #  112
-5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102, #  128
-5103,5104,5105,5106,5107,5108,5109,5110,5111,5112,4097,5113,5114,5115,5116,5117, #  144
-5118,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,5130,5131,5132,5133, #  160
-5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149, #  176
-5150,5151,5152,4612,5153,5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164, #  192
-5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,1472, 598, 618, 820,1205, #  208
-1309,1412,1858,1307,1692,5176,5177,5178,5179,5180,5181,5182,1142,1452,1234,1172, #  224
-1875,2043,2149,1793,1382,2973, 925,2404,1067,1241, 960,1377,2935,1491, 919,1217, #  240
-1865,2030,1406,1499,2749,4098,5183,5184,5185,5186,5187,5188,2561,4099,3117,1804, #  256
-2049,3689,4309,3513,1663,5189,3166,3118,3298,1587,1561,3433,5190,3119,1625,2998, #  272
-3299,4613,1766,3690,2786,4614,5191,5192,5193,5194,2161,  26,3377,   2,3929,  20, #  288
-3691,  47,4100,  50,  17,  16,  35, 268,  27, 243,  42, 155,  24, 154,  29, 184, #  304
-   4,  91,  14,  92,  53, 396,  33, 289,   9,  37,  64, 620,  21,  39, 321,   5, #  320
-  12,  11,  52,  13,   3, 208, 138,   0,   7,  60, 526, 141, 151,1069, 181, 275, #  336
-1591,  83, 132,1475, 126, 331, 829,  15,  69, 160,  59,  22, 157,  55,1079, 312, #  352
- 109,  38,  23,  25,  10,  19,  79,5195,  61, 382,1124,   8,  30,5196,5197,5198, #  368
-5199,5200,5201,5202,5203,5204,5205,5206,  89,  62,  74,  34,2416, 112, 139, 196, #  384
- 271, 149,  84, 607, 131, 765,  46,  88, 153, 683,  76, 874, 101, 258,  57,  80, #  400
-  32, 364, 121,1508, 169,1547,  68, 235, 145,2999,  41, 360,3027,  70,  63,  31, #  416
-  43, 259, 262,1383,  99, 533, 194,  66,  93, 846, 217, 192,  56, 106,  58, 565, #  432
- 280, 272, 311, 256, 146,  82, 308,  71, 100, 128, 214, 655, 110, 261, 104,1140, #  448
-  54,  51,  36,  87,  67,3070, 185,2618,2936,2020,  28,1066,2390,2059,5207,5208, #  464
-5209,5210,5211,5212,5213,5214,5215,5216,4615,5217,5218,5219,5220,5221,5222,5223, #  480
-5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,5235,5236,3514,5237,5238, #  496
-5239,5240,5241,5242,5243,5244,2297,2031,4616,4310,3692,5245,3071,5246,3598,5247, #  512
-4617,3231,3515,5248,4101,4311,4618,3808,4312,4102,5249,4103,4104,3599,5250,5251, #  528
-5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,5264,5265,5266,5267, #  544
-5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,5279,5280,5281,5282,5283, #  560
-5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299, #  576
-5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315, #  592
-5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331, #  608
-5332,5333,5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347, #  624
-5348,5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363, #  640
-5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379, #  656
-5380,5381, 363, 642,2787,2878,2788,2789,2316,3232,2317,3434,2011, 165,1942,3930, #  672
-3931,3932,3933,5382,4619,5383,4620,5384,5385,5386,5387,5388,5389,5390,5391,5392, #  688
-5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408, #  704
-5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424, #  720
-5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440, #  736
-5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456, #  752
-5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472, #  768
-5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488, #  784
-5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504, #  800
-5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520, #  816
-5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536, #  832
-5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,5549,5550,5551,5552, #  848
-5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568, #  864
-5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584, #  880
-5585,5586,5587,5588,5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600, #  896
-5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616, #  912
-5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632, #  928
-5633,5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648, #  944
-5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664, #  960
-5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680, #  976
-5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696, #  992
-5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712, # 1008
-5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728, # 1024
-5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5741,5742,5743,5744, # 1040
-5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,5759,5760, # 1056
-5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,5774,5775,5776, # 1072
-5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5787,5788,5789,5790,5791,5792, # 1088
-5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,5804,5805,5806,5807,5808, # 1104
-5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824, # 1120
-5825,5826,5827,5828,5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840, # 1136
-5841,5842,5843,5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856, # 1152
-5857,5858,5859,5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872, # 1168
-5873,5874,5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888, # 1184
-5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904, # 1200
-5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920, # 1216
-5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936, # 1232
-5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952, # 1248
-5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968, # 1264
-5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984, # 1280
-5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000, # 1296
-6001,6002,6003,6004,6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016, # 1312
-6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032, # 1328
-6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048, # 1344
-6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064, # 1360
-6065,6066,6067,6068,6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080, # 1376
-6081,6082,6083,6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096, # 1392
-6097,6098,6099,6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112, # 1408
-6113,6114,2044,2060,4621, 997,1235, 473,1186,4622, 920,3378,6115,6116, 379,1108, # 1424
-4313,2657,2735,3934,6117,3809, 636,3233, 573,1026,3693,3435,2974,3300,2298,4105, # 1440
- 854,2937,2463, 393,2581,2417, 539, 752,1280,2750,2480, 140,1161, 440, 708,1569, # 1456
- 665,2497,1746,1291,1523,3000, 164,1603, 847,1331, 537,1997, 486, 508,1693,2418, # 1472
-1970,2227, 878,1220, 299,1030, 969, 652,2751, 624,1137,3301,2619,  65,3302,2045, # 1488
-1761,1859,3120,1930,3694,3516, 663,1767, 852, 835,3695, 269, 767,2826,2339,1305, # 1504
- 896,1150, 770,1616,6118, 506,1502,2075,1012,2519, 775,2520,2975,2340,2938,4314, # 1520
-3028,2086,1224,1943,2286,6119,3072,4315,2240,1273,1987,3935,1557, 175, 597, 985, # 1536
-3517,2419,2521,1416,3029, 585, 938,1931,1007,1052,1932,1685,6120,3379,4316,4623, # 1552
- 804, 599,3121,1333,2128,2539,1159,1554,2032,3810, 687,2033,2904, 952, 675,1467, # 1568
-3436,6121,2241,1096,1786,2440,1543,1924, 980,1813,2228, 781,2692,1879, 728,1918, # 1584
-3696,4624, 548,1950,4625,1809,1088,1356,3303,2522,1944, 502, 972, 373, 513,2827, # 1600
- 586,2377,2391,1003,1976,1631,6122,2464,1084, 648,1776,4626,2141, 324, 962,2012, # 1616
-2177,2076,1384, 742,2178,1448,1173,1810, 222, 102, 301, 445, 125,2420, 662,2498, # 1632
- 277, 200,1476,1165,1068, 224,2562,1378,1446, 450,1880, 659, 791, 582,4627,2939, # 1648
-3936,1516,1274, 555,2099,3697,1020,1389,1526,3380,1762,1723,1787,2229, 412,2114, # 1664
-1900,2392,3518, 512,2597, 427,1925,2341,3122,1653,1686,2465,2499, 697, 330, 273, # 1680
- 380,2162, 951, 832, 780, 991,1301,3073, 965,2270,3519, 668,2523,2636,1286, 535, # 1696
-1407, 518, 671, 957,2658,2378, 267, 611,2197,3030,6123, 248,2299, 967,1799,2356, # 1712
- 850,1418,3437,1876,1256,1480,2828,1718,6124,6125,1755,1664,2405,6126,4628,2879, # 1728
-2829, 499,2179, 676,4629, 557,2329,2214,2090, 325,3234, 464, 811,3001, 992,2342, # 1744
-2481,1232,1469, 303,2242, 466,1070,2163, 603,1777,2091,4630,2752,4631,2714, 322, # 1760
-2659,1964,1768, 481,2188,1463,2330,2857,3600,2092,3031,2421,4632,2318,2070,1849, # 1776
-2598,4633,1302,2254,1668,1701,2422,3811,2905,3032,3123,2046,4106,1763,1694,4634, # 1792
-1604, 943,1724,1454, 917, 868,2215,1169,2940, 552,1145,1800,1228,1823,1955, 316, # 1808
-1080,2510, 361,1807,2830,4107,2660,3381,1346,1423,1134,4108,6127, 541,1263,1229, # 1824
-1148,2540, 545, 465,1833,2880,3438,1901,3074,2482, 816,3937, 713,1788,2500, 122, # 1840
-1575, 195,1451,2501,1111,6128, 859, 374,1225,2243,2483,4317, 390,1033,3439,3075, # 1856
-2524,1687, 266, 793,1440,2599, 946, 779, 802, 507, 897,1081, 528,2189,1292, 711, # 1872
-1866,1725,1167,1640, 753, 398,2661,1053, 246, 348,4318, 137,1024,3440,1600,2077, # 1888
-2129, 825,4319, 698, 238, 521, 187,2300,1157,2423,1641,1605,1464,1610,1097,2541, # 1904
-1260,1436, 759,2255,1814,2150, 705,3235, 409,2563,3304, 561,3033,2005,2564, 726, # 1920
-1956,2343,3698,4109, 949,3812,3813,3520,1669, 653,1379,2525, 881,2198, 632,2256, # 1936
-1027, 778,1074, 733,1957, 514,1481,2466, 554,2180, 702,3938,1606,1017,1398,6129, # 1952
-1380,3521, 921, 993,1313, 594, 449,1489,1617,1166, 768,1426,1360, 495,1794,3601, # 1968
-1177,3602,1170,4320,2344, 476, 425,3167,4635,3168,1424, 401,2662,1171,3382,1998, # 1984
-1089,4110, 477,3169, 474,6130,1909, 596,2831,1842, 494, 693,1051,1028,1207,3076, # 2000
- 606,2115, 727,2790,1473,1115, 743,3522, 630, 805,1532,4321,2021, 366,1057, 838, # 2016
- 684,1114,2142,4322,2050,1492,1892,1808,2271,3814,2424,1971,1447,1373,3305,1090, # 2032
-1536,3939,3523,3306,1455,2199, 336, 369,2331,1035, 584,2393, 902, 718,2600,6131, # 2048
-2753, 463,2151,1149,1611,2467, 715,1308,3124,1268, 343,1413,3236,1517,1347,2663, # 2064
-2093,3940,2022,1131,1553,2100,2941,1427,3441,2942,1323,2484,6132,1980, 872,2368, # 2080
-2441,2943, 320,2369,2116,1082, 679,1933,3941,2791,3815, 625,1143,2023, 422,2200, # 2096
-3816,6133, 730,1695, 356,2257,1626,2301,2858,2637,1627,1778, 937, 883,2906,2693, # 2112
-3002,1769,1086, 400,1063,1325,3307,2792,4111,3077, 456,2345,1046, 747,6134,1524, # 2128
- 884,1094,3383,1474,2164,1059, 974,1688,2181,2258,1047, 345,1665,1187, 358, 875, # 2144
-3170, 305, 660,3524,2190,1334,1135,3171,1540,1649,2542,1527, 927, 968,2793, 885, # 2160
-1972,1850, 482, 500,2638,1218,1109,1085,2543,1654,2034, 876,  78,2287,1482,1277, # 2176
- 861,1675,1083,1779, 724,2754, 454, 397,1132,1612,2332, 893, 672,1237, 257,2259, # 2192
-2370, 135,3384, 337,2244, 547, 352, 340, 709,2485,1400, 788,1138,2511, 540, 772, # 2208
-1682,2260,2272,2544,2013,1843,1902,4636,1999,1562,2288,4637,2201,1403,1533, 407, # 2224
- 576,3308,1254,2071, 978,3385, 170, 136,1201,3125,2664,3172,2394, 213, 912, 873, # 2240
-3603,1713,2202, 699,3604,3699, 813,3442, 493, 531,1054, 468,2907,1483, 304, 281, # 2256
-4112,1726,1252,2094, 339,2319,2130,2639, 756,1563,2944, 748, 571,2976,1588,2425, # 2272
-2715,1851,1460,2426,1528,1392,1973,3237, 288,3309, 685,3386, 296, 892,2716,2216, # 2288
-1570,2245, 722,1747,2217, 905,3238,1103,6135,1893,1441,1965, 251,1805,2371,3700, # 2304
-2601,1919,1078,  75,2182,1509,1592,1270,2640,4638,2152,6136,3310,3817, 524, 706, # 2320
-1075, 292,3818,1756,2602, 317,  98,3173,3605,3525,1844,2218,3819,2502, 814, 567, # 2336
- 385,2908,1534,6137, 534,1642,3239, 797,6138,1670,1529, 953,4323, 188,1071, 538, # 2352
- 178, 729,3240,2109,1226,1374,2000,2357,2977, 731,2468,1116,2014,2051,6139,1261, # 2368
-1593, 803,2859,2736,3443, 556, 682, 823,1541,6140,1369,2289,1706,2794, 845, 462, # 2384
-2603,2665,1361, 387, 162,2358,1740, 739,1770,1720,1304,1401,3241,1049, 627,1571, # 2400
-2427,3526,1877,3942,1852,1500, 431,1910,1503, 677, 297,2795, 286,1433,1038,1198, # 2416
-2290,1133,1596,4113,4639,2469,1510,1484,3943,6141,2442, 108, 712,4640,2372, 866, # 2432
-3701,2755,3242,1348, 834,1945,1408,3527,2395,3243,1811, 824, 994,1179,2110,1548, # 2448
-1453, 790,3003, 690,4324,4325,2832,2909,3820,1860,3821, 225,1748, 310, 346,1780, # 2464
-2470, 821,1993,2717,2796, 828, 877,3528,2860,2471,1702,2165,2910,2486,1789, 453, # 2480
- 359,2291,1676,  73,1164,1461,1127,3311, 421, 604, 314,1037, 589, 116,2487, 737, # 2496
- 837,1180, 111, 244, 735,6142,2261,1861,1362, 986, 523, 418, 581,2666,3822, 103, # 2512
- 855, 503,1414,1867,2488,1091, 657,1597, 979, 605,1316,4641,1021,2443,2078,2001, # 2528
-1209,  96, 587,2166,1032, 260,1072,2153, 173,  94, 226,3244, 819,2006,4642,4114, # 2544
-2203, 231,1744, 782,  97,2667, 786,3387, 887, 391, 442,2219,4326,1425,6143,2694, # 2560
- 633,1544,1202, 483,2015, 592,2052,1958,2472,1655, 419, 129,4327,3444,3312,1714, # 2576
-1257,3078,4328,1518,1098, 865,1310,1019,1885,1512,1734, 469,2444, 148, 773, 436, # 2592
-1815,1868,1128,1055,4329,1245,2756,3445,2154,1934,1039,4643, 579,1238, 932,2320, # 2608
- 353, 205, 801, 115,2428, 944,2321,1881, 399,2565,1211, 678, 766,3944, 335,2101, # 2624
-1459,1781,1402,3945,2737,2131,1010, 844, 981,1326,1013, 550,1816,1545,2620,1335, # 2640
-1008, 371,2881, 936,1419,1613,3529,1456,1395,2273,1834,2604,1317,2738,2503, 416, # 2656
-1643,4330, 806,1126, 229, 591,3946,1314,1981,1576,1837,1666, 347,1790, 977,3313, # 2672
- 764,2861,1853, 688,2429,1920,1462,  77, 595, 415,2002,3034, 798,1192,4115,6144, # 2688
-2978,4331,3035,2695,2582,2072,2566, 430,2430,1727, 842,1396,3947,3702, 613, 377, # 2704
- 278, 236,1417,3388,3314,3174, 757,1869, 107,3530,6145,1194, 623,2262, 207,1253, # 2720
-2167,3446,3948, 492,1117,1935, 536,1838,2757,1246,4332, 696,2095,2406,1393,1572, # 2736
-3175,1782, 583, 190, 253,1390,2230, 830,3126,3389, 934,3245,1703,1749,2979,1870, # 2752
-2545,1656,2204, 869,2346,4116,3176,1817, 496,1764,4644, 942,1504, 404,1903,1122, # 2768
-1580,3606,2945,1022, 515, 372,1735, 955,2431,3036,6146,2797,1110,2302,2798, 617, # 2784
-6147, 441, 762,1771,3447,3607,3608,1904, 840,3037,  86, 939,1385, 572,1370,2445, # 2800
-1336, 114,3703, 898, 294, 203,3315, 703,1583,2274, 429, 961,4333,1854,1951,3390, # 2816
-2373,3704,4334,1318,1381, 966,1911,2322,1006,1155, 309, 989, 458,2718,1795,1372, # 2832
-1203, 252,1689,1363,3177, 517,1936, 168,1490, 562, 193,3823,1042,4117,1835, 551, # 2848
- 470,4645, 395, 489,3448,1871,1465,2583,2641, 417,1493, 279,1295, 511,1236,1119, # 2864
-  72,1231,1982,1812,3004, 871,1564, 984,3449,1667,2696,2096,4646,2347,2833,1673, # 2880
-3609, 695,3246,2668, 807,1183,4647, 890, 388,2333,1801,1457,2911,1765,1477,1031, # 2896
-3316,3317,1278,3391,2799,2292,2526, 163,3450,4335,2669,1404,1802,6148,2323,2407, # 2912
-1584,1728,1494,1824,1269, 298, 909,3318,1034,1632, 375, 776,1683,2061, 291, 210, # 2928
-1123, 809,1249,1002,2642,3038, 206,1011,2132, 144, 975, 882,1565, 342, 667, 754, # 2944
-1442,2143,1299,2303,2062, 447, 626,2205,1221,2739,2912,1144,1214,2206,2584, 760, # 2960
-1715, 614, 950,1281,2670,2621, 810, 577,1287,2546,4648, 242,2168, 250,2643, 691, # 2976
- 123,2644, 647, 313,1029, 689,1357,2946,1650, 216, 771,1339,1306, 808,2063, 549, # 2992
- 913,1371,2913,2914,6149,1466,1092,1174,1196,1311,2605,2396,1783,1796,3079, 406, # 3008
-2671,2117,3949,4649, 487,1825,2220,6150,2915, 448,2348,1073,6151,2397,1707, 130, # 3024
- 900,1598, 329, 176,1959,2527,1620,6152,2275,4336,3319,1983,2191,3705,3610,2155, # 3040
-3706,1912,1513,1614,6153,1988, 646, 392,2304,1589,3320,3039,1826,1239,1352,1340, # 3056
-2916, 505,2567,1709,1437,2408,2547, 906,6154,2672, 384,1458,1594,1100,1329, 710, # 3072
- 423,3531,2064,2231,2622,1989,2673,1087,1882, 333, 841,3005,1296,2882,2379, 580, # 3088
-1937,1827,1293,2585, 601, 574, 249,1772,4118,2079,1120, 645, 901,1176,1690, 795, # 3104
-2207, 478,1434, 516,1190,1530, 761,2080, 930,1264, 355, 435,1552, 644,1791, 987, # 3120
- 220,1364,1163,1121,1538, 306,2169,1327,1222, 546,2645, 218, 241, 610,1704,3321, # 3136
-1984,1839,1966,2528, 451,6155,2586,3707,2568, 907,3178, 254,2947, 186,1845,4650, # 3152
- 745, 432,1757, 428,1633, 888,2246,2221,2489,3611,2118,1258,1265, 956,3127,1784, # 3168
-4337,2490, 319, 510, 119, 457,3612, 274,2035,2007,4651,1409,3128, 970,2758, 590, # 3184
-2800, 661,2247,4652,2008,3950,1420,1549,3080,3322,3951,1651,1375,2111, 485,2491, # 3200
-1429,1156,6156,2548,2183,1495, 831,1840,2529,2446, 501,1657, 307,1894,3247,1341, # 3216
- 666, 899,2156,1539,2549,1559, 886, 349,2208,3081,2305,1736,3824,2170,2759,1014, # 3232
-1913,1386, 542,1397,2948, 490, 368, 716, 362, 159, 282,2569,1129,1658,1288,1750, # 3248
-2674, 276, 649,2016, 751,1496, 658,1818,1284,1862,2209,2087,2512,3451, 622,2834, # 3264
- 376, 117,1060,2053,1208,1721,1101,1443, 247,1250,3179,1792,3952,2760,2398,3953, # 3280
-6157,2144,3708, 446,2432,1151,2570,3452,2447,2761,2835,1210,2448,3082, 424,2222, # 3296
-1251,2449,2119,2836, 504,1581,4338, 602, 817, 857,3825,2349,2306, 357,3826,1470, # 3312
-1883,2883, 255, 958, 929,2917,3248, 302,4653,1050,1271,1751,2307,1952,1430,2697, # 3328
-2719,2359, 354,3180, 777, 158,2036,4339,1659,4340,4654,2308,2949,2248,1146,2232, # 3344
-3532,2720,1696,2623,3827,6158,3129,1550,2698,1485,1297,1428, 637, 931,2721,2145, # 3360
- 914,2550,2587,  81,2450, 612, 827,2646,1242,4655,1118,2884, 472,1855,3181,3533, # 3376
-3534, 569,1353,2699,1244,1758,2588,4119,2009,2762,2171,3709,1312,1531,6159,1152, # 3392
-1938, 134,1830, 471,3710,2276,1112,1535,3323,3453,3535, 982,1337,2950, 488, 826, # 3408
- 674,1058,1628,4120,2017, 522,2399, 211, 568,1367,3454, 350, 293,1872,1139,3249, # 3424
-1399,1946,3006,1300,2360,3324, 588, 736,6160,2606, 744, 669,3536,3828,6161,1358, # 3440
- 199, 723, 848, 933, 851,1939,1505,1514,1338,1618,1831,4656,1634,3613, 443,2740, # 3456
-3829, 717,1947, 491,1914,6162,2551,1542,4121,1025,6163,1099,1223, 198,3040,2722, # 3472
- 370, 410,1905,2589, 998,1248,3182,2380, 519,1449,4122,1710, 947, 928,1153,4341, # 3488
-2277, 344,2624,1511, 615, 105, 161,1212,1076,1960,3130,2054,1926,1175,1906,2473, # 3504
- 414,1873,2801,6164,2309, 315,1319,3325, 318,2018,2146,2157, 963, 631, 223,4342, # 3520
-4343,2675, 479,3711,1197,2625,3712,2676,2361,6165,4344,4123,6166,2451,3183,1886, # 3536
-2184,1674,1330,1711,1635,1506, 799, 219,3250,3083,3954,1677,3713,3326,2081,3614, # 3552
-1652,2073,4657,1147,3041,1752, 643,1961, 147,1974,3955,6167,1716,2037, 918,3007, # 3568
-1994, 120,1537, 118, 609,3184,4345, 740,3455,1219, 332,1615,3830,6168,1621,2980, # 3584
-1582, 783, 212, 553,2350,3714,1349,2433,2082,4124, 889,6169,2310,1275,1410, 973, # 3600
- 166,1320,3456,1797,1215,3185,2885,1846,2590,2763,4658, 629, 822,3008, 763, 940, # 3616
-1990,2862, 439,2409,1566,1240,1622, 926,1282,1907,2764, 654,2210,1607, 327,1130, # 3632
-3956,1678,1623,6170,2434,2192, 686, 608,3831,3715, 903,3957,3042,6171,2741,1522, # 3648
-1915,1105,1555,2552,1359, 323,3251,4346,3457, 738,1354,2553,2311,2334,1828,2003, # 3664
-3832,1753,2351,1227,6172,1887,4125,1478,6173,2410,1874,1712,1847, 520,1204,2607, # 3680
- 264,4659, 836,2677,2102, 600,4660,3833,2278,3084,6174,4347,3615,1342, 640, 532, # 3696
- 543,2608,1888,2400,2591,1009,4348,1497, 341,1737,3616,2723,1394, 529,3252,1321, # 3712
- 983,4661,1515,2120, 971,2592, 924, 287,1662,3186,4349,2700,4350,1519, 908,1948, # 3728
-2452, 156, 796,1629,1486,2223,2055, 694,4126,1259,1036,3392,1213,2249,2742,1889, # 3744
-1230,3958,1015, 910, 408, 559,3617,4662, 746, 725, 935,4663,3959,3009,1289, 563, # 3760
- 867,4664,3960,1567,2981,2038,2626, 988,2263,2381,4351, 143,2374, 704,1895,6175, # 3776
-1188,3716,2088, 673,3085,2362,4352, 484,1608,1921,2765,2918, 215, 904,3618,3537, # 3792
- 894, 509, 976,3043,2701,3961,4353,2837,2982, 498,6176,6177,1102,3538,1332,3393, # 3808
-1487,1636,1637, 233, 245,3962, 383, 650, 995,3044, 460,1520,1206,2352, 749,3327, # 3824
- 530, 700, 389,1438,1560,1773,3963,2264, 719,2951,2724,3834, 870,1832,1644,1000, # 3840
- 839,2474,3717, 197,1630,3394, 365,2886,3964,1285,2133, 734, 922, 818,1106, 732, # 3856
- 480,2083,1774,3458, 923,2279,1350, 221,3086,  85,2233,2234,3835,1585,3010,2147, # 3872
-1387,1705,2382,1619,2475, 133, 239,2802,1991,1016,2084,2383, 411,2838,1113, 651, # 3888
-1985,1160,3328, 990,1863,3087,1048,1276,2647, 265,2627,1599,3253,2056, 150, 638, # 3904
-2019, 656, 853, 326,1479, 680,1439,4354,1001,1759, 413,3459,3395,2492,1431, 459, # 3920
-4355,1125,3329,2265,1953,1450,2065,2863, 849, 351,2678,3131,3254,3255,1104,1577, # 3936
- 227,1351,1645,2453,2193,1421,2887, 812,2121, 634,  95,2435, 201,2312,4665,1646, # 3952
-1671,2743,1601,2554,2702,2648,2280,1315,1366,2089,3132,1573,3718,3965,1729,1189, # 3968
- 328,2679,1077,1940,1136, 558,1283, 964,1195, 621,2074,1199,1743,3460,3619,1896, # 3984
-1916,1890,3836,2952,1154,2112,1064, 862, 378,3011,2066,2113,2803,1568,2839,6178, # 4000
-3088,2919,1941,1660,2004,1992,2194, 142, 707,1590,1708,1624,1922,1023,1836,1233, # 4016
-1004,2313, 789, 741,3620,6179,1609,2411,1200,4127,3719,3720,4666,2057,3721, 593, # 4032
-2840, 367,2920,1878,6180,3461,1521, 628,1168, 692,2211,2649, 300, 720,2067,2571, # 4048
-2953,3396, 959,2504,3966,3539,3462,1977, 701,6181, 954,1043, 800, 681, 183,3722, # 4064
-1803,1730,3540,4128,2103, 815,2314, 174, 467, 230,2454,1093,2134, 755,3541,3397, # 4080
-1141,1162,6182,1738,2039, 270,3256,2513,1005,1647,2185,3837, 858,1679,1897,1719, # 4096
-2954,2324,1806, 402, 670, 167,4129,1498,2158,2104, 750,6183, 915, 189,1680,1551, # 4112
- 455,4356,1501,2455, 405,1095,2955, 338,1586,1266,1819, 570, 641,1324, 237,1556, # 4128
-2650,1388,3723,6184,1368,2384,1343,1978,3089,2436, 879,3724, 792,1191, 758,3012, # 4144
-1411,2135,1322,4357, 240,4667,1848,3725,1574,6185, 420,3045,1546,1391, 714,4358, # 4160
-1967, 941,1864, 863, 664, 426, 560,1731,2680,1785,2864,1949,2363, 403,3330,1415, # 4176
-1279,2136,1697,2335, 204, 721,2097,3838,  90,6186,2085,2505, 191,3967, 124,2148, # 4192
-1376,1798,1178,1107,1898,1405, 860,4359,1243,1272,2375,2983,1558,2456,1638, 113, # 4208
-3621, 578,1923,2609, 880, 386,4130, 784,2186,2266,1422,2956,2172,1722, 497, 263, # 4224
-2514,1267,2412,2610, 177,2703,3542, 774,1927,1344, 616,1432,1595,1018, 172,4360, # 4240
-2325, 911,4361, 438,1468,3622, 794,3968,2024,2173,1681,1829,2957, 945, 895,3090, # 4256
- 575,2212,2476, 475,2401,2681, 785,2744,1745,2293,2555,1975,3133,2865, 394,4668, # 4272
-3839, 635,4131, 639, 202,1507,2195,2766,1345,1435,2572,3726,1908,1184,1181,2457, # 4288
-3727,3134,4362, 843,2611, 437, 916,4669, 234, 769,1884,3046,3047,3623, 833,6187, # 4304
-1639,2250,2402,1355,1185,2010,2047, 999, 525,1732,1290,1488,2612, 948,1578,3728, # 4320
-2413,2477,1216,2725,2159, 334,3840,1328,3624,2921,1525,4132, 564,1056, 891,4363, # 4336
-1444,1698,2385,2251,3729,1365,2281,2235,1717,6188, 864,3841,2515, 444, 527,2767, # 4352
-2922,3625, 544, 461,6189, 566, 209,2437,3398,2098,1065,2068,3331,3626,3257,2137, # 4368  #last 512
-#Everything below is of no interest for detection purpose
-2138,2122,3730,2888,1995,1820,1044,6190,6191,6192,6193,6194,6195,6196,6197,6198, # 4384
-6199,6200,6201,6202,6203,6204,6205,4670,6206,6207,6208,6209,6210,6211,6212,6213, # 4400
-6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,6224,6225,6226,6227,6228,6229, # 4416
-6230,6231,6232,6233,6234,6235,6236,6237,3187,6238,6239,3969,6240,6241,6242,6243, # 4432
-6244,4671,6245,6246,4672,6247,6248,4133,6249,6250,4364,6251,2923,2556,2613,4673, # 4448
-4365,3970,6252,6253,6254,6255,4674,6256,6257,6258,2768,2353,4366,4675,4676,3188, # 4464
-4367,3463,6259,4134,4677,4678,6260,2267,6261,3842,3332,4368,3543,6262,6263,6264, # 4480
-3013,1954,1928,4135,4679,6265,6266,2478,3091,6267,4680,4369,6268,6269,1699,6270, # 4496
-3544,4136,4681,6271,4137,6272,4370,2804,6273,6274,2593,3971,3972,4682,6275,2236, # 4512
-4683,6276,6277,4684,6278,6279,4138,3973,4685,6280,6281,3258,6282,6283,6284,6285, # 4528
-3974,4686,2841,3975,6286,6287,3545,6288,6289,4139,4687,4140,6290,4141,6291,4142, # 4544
-6292,6293,3333,6294,6295,6296,4371,6297,3399,6298,6299,4372,3976,6300,6301,6302, # 4560
-4373,6303,6304,3843,3731,6305,4688,4374,6306,6307,3259,2294,6308,3732,2530,4143, # 4576
-6309,4689,6310,6311,6312,3048,6313,6314,4690,3733,2237,6315,6316,2282,3334,6317, # 4592
-6318,3844,6319,6320,4691,6321,3400,4692,6322,4693,6323,3049,6324,4375,6325,3977, # 4608
-6326,6327,6328,3546,6329,4694,3335,6330,4695,4696,6331,6332,6333,6334,4376,3978, # 4624
-6335,4697,3979,4144,6336,3980,4698,6337,6338,6339,6340,6341,4699,4700,4701,6342, # 4640
-6343,4702,6344,6345,4703,6346,6347,4704,6348,4705,4706,3135,6349,4707,6350,4708, # 4656
-6351,4377,6352,4709,3734,4145,6353,2506,4710,3189,6354,3050,4711,3981,6355,3547, # 4672
-3014,4146,4378,3735,2651,3845,3260,3136,2224,1986,6356,3401,6357,4712,2594,3627, # 4688
-3137,2573,3736,3982,4713,3628,4714,4715,2682,3629,4716,6358,3630,4379,3631,6359, # 4704
-6360,6361,3983,6362,6363,6364,6365,4147,3846,4717,6366,6367,3737,2842,6368,4718, # 4720
-2628,6369,3261,6370,2386,6371,6372,3738,3984,4719,3464,4720,3402,6373,2924,3336, # 4736
-4148,2866,6374,2805,3262,4380,2704,2069,2531,3138,2806,2984,6375,2769,6376,4721, # 4752
-4722,3403,6377,6378,3548,6379,6380,2705,3092,1979,4149,2629,3337,2889,6381,3338, # 4768
-4150,2557,3339,4381,6382,3190,3263,3739,6383,4151,4723,4152,2558,2574,3404,3191, # 4784
-6384,6385,4153,6386,4724,4382,6387,6388,4383,6389,6390,4154,6391,4725,3985,6392, # 4800
-3847,4155,6393,6394,6395,6396,6397,3465,6398,4384,6399,6400,6401,6402,6403,6404, # 4816
-4156,6405,6406,6407,6408,2123,6409,6410,2326,3192,4726,6411,6412,6413,6414,4385, # 4832
-4157,6415,6416,4158,6417,3093,3848,6418,3986,6419,6420,3849,6421,6422,6423,4159, # 4848
-6424,6425,4160,6426,3740,6427,6428,6429,6430,3987,6431,4727,6432,2238,6433,6434, # 4864
-4386,3988,6435,6436,3632,6437,6438,2843,6439,6440,6441,6442,3633,6443,2958,6444, # 4880
-6445,3466,6446,2364,4387,3850,6447,4388,2959,3340,6448,3851,6449,4728,6450,6451, # 4896
-3264,4729,6452,3193,6453,4389,4390,2706,3341,4730,6454,3139,6455,3194,6456,3051, # 4912
-2124,3852,1602,4391,4161,3853,1158,3854,4162,3989,4392,3990,4731,4732,4393,2040, # 4928
-4163,4394,3265,6457,2807,3467,3855,6458,6459,6460,3991,3468,4733,4734,6461,3140, # 4944
-2960,6462,4735,6463,6464,6465,6466,4736,4737,4738,4739,6467,6468,4164,2403,3856, # 4960
-6469,6470,2770,2844,6471,4740,6472,6473,6474,6475,6476,6477,6478,3195,6479,4741, # 4976
-4395,6480,2867,6481,4742,2808,6482,2493,4165,6483,6484,6485,6486,2295,4743,6487, # 4992
-6488,6489,3634,6490,6491,6492,6493,6494,6495,6496,2985,4744,6497,6498,4745,6499, # 5008
-6500,2925,3141,4166,6501,6502,4746,6503,6504,4747,6505,6506,6507,2890,6508,6509, # 5024
-6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,3469,4167,6520,6521,6522,4748, # 5040
-4396,3741,4397,4749,4398,3342,2125,4750,6523,4751,4752,4753,3052,6524,2961,4168, # 5056
-6525,4754,6526,4755,4399,2926,4169,6527,3857,6528,4400,4170,6529,4171,6530,6531, # 5072
-2595,6532,6533,6534,6535,3635,6536,6537,6538,6539,6540,6541,6542,4756,6543,6544, # 5088
-6545,6546,6547,6548,4401,6549,6550,6551,6552,4402,3405,4757,4403,6553,6554,6555, # 5104
-4172,3742,6556,6557,6558,3992,3636,6559,6560,3053,2726,6561,3549,4173,3054,4404, # 5120
-6562,6563,3993,4405,3266,3550,2809,4406,6564,6565,6566,4758,4759,6567,3743,6568, # 5136
-4760,3744,4761,3470,6569,6570,6571,4407,6572,3745,4174,6573,4175,2810,4176,3196, # 5152
-4762,6574,4177,6575,6576,2494,2891,3551,6577,6578,3471,6579,4408,6580,3015,3197, # 5168
-6581,3343,2532,3994,3858,6582,3094,3406,4409,6583,2892,4178,4763,4410,3016,4411, # 5184
-6584,3995,3142,3017,2683,6585,4179,6586,6587,4764,4412,6588,6589,4413,6590,2986, # 5200
-6591,2962,3552,6592,2963,3472,6593,6594,4180,4765,6595,6596,2225,3267,4414,6597, # 5216
-3407,3637,4766,6598,6599,3198,6600,4415,6601,3859,3199,6602,3473,4767,2811,4416, # 5232
-1856,3268,3200,2575,3996,3997,3201,4417,6603,3095,2927,6604,3143,6605,2268,6606, # 5248
-3998,3860,3096,2771,6607,6608,3638,2495,4768,6609,3861,6610,3269,2745,4769,4181, # 5264
-3553,6611,2845,3270,6612,6613,6614,3862,6615,6616,4770,4771,6617,3474,3999,4418, # 5280
-4419,6618,3639,3344,6619,4772,4182,6620,2126,6621,6622,6623,4420,4773,6624,3018, # 5296
-6625,4774,3554,6626,4183,2025,3746,6627,4184,2707,6628,4421,4422,3097,1775,4185, # 5312
-3555,6629,6630,2868,6631,6632,4423,6633,6634,4424,2414,2533,2928,6635,4186,2387, # 5328
-6636,4775,6637,4187,6638,1891,4425,3202,3203,6639,6640,4776,6641,3345,6642,6643, # 5344
-3640,6644,3475,3346,3641,4000,6645,3144,6646,3098,2812,4188,3642,3204,6647,3863, # 5360
-3476,6648,3864,6649,4426,4001,6650,6651,6652,2576,6653,4189,4777,6654,6655,6656, # 5376
-2846,6657,3477,3205,4002,6658,4003,6659,3347,2252,6660,6661,6662,4778,6663,6664, # 5392
-6665,6666,6667,6668,6669,4779,4780,2048,6670,3478,3099,6671,3556,3747,4004,6672, # 5408
-6673,6674,3145,4005,3748,6675,6676,6677,6678,6679,3408,6680,6681,6682,6683,3206, # 5424
-3207,6684,6685,4781,4427,6686,4782,4783,4784,6687,6688,6689,4190,6690,6691,3479, # 5440
-6692,2746,6693,4428,6694,6695,6696,6697,6698,6699,4785,6700,6701,3208,2727,6702, # 5456
-3146,6703,6704,3409,2196,6705,4429,6706,6707,6708,2534,1996,6709,6710,6711,2747, # 5472
-6712,6713,6714,4786,3643,6715,4430,4431,6716,3557,6717,4432,4433,6718,6719,6720, # 5488
-6721,3749,6722,4006,4787,6723,6724,3644,4788,4434,6725,6726,4789,2772,6727,6728, # 5504
-6729,6730,6731,2708,3865,2813,4435,6732,6733,4790,4791,3480,6734,6735,6736,6737, # 5520
-4436,3348,6738,3410,4007,6739,6740,4008,6741,6742,4792,3411,4191,6743,6744,6745, # 5536
-6746,6747,3866,6748,3750,6749,6750,6751,6752,6753,6754,6755,3867,6756,4009,6757, # 5552
-4793,4794,6758,2814,2987,6759,6760,6761,4437,6762,6763,6764,6765,3645,6766,6767, # 5568
-3481,4192,6768,3751,6769,6770,2174,6771,3868,3752,6772,6773,6774,4193,4795,4438, # 5584
-3558,4796,4439,6775,4797,6776,6777,4798,6778,4799,3559,4800,6779,6780,6781,3482, # 5600
-6782,2893,6783,6784,4194,4801,4010,6785,6786,4440,6787,4011,6788,6789,6790,6791, # 5616
-6792,6793,4802,6794,6795,6796,4012,6797,6798,6799,6800,3349,4803,3483,6801,4804, # 5632
-4195,6802,4013,6803,6804,4196,6805,4014,4015,6806,2847,3271,2848,6807,3484,6808, # 5648
-6809,6810,4441,6811,4442,4197,4443,3272,4805,6812,3412,4016,1579,6813,6814,4017, # 5664
-6815,3869,6816,2964,6817,4806,6818,6819,4018,3646,6820,6821,4807,4019,4020,6822, # 5680
-6823,3560,6824,6825,4021,4444,6826,4198,6827,6828,4445,6829,6830,4199,4808,6831, # 5696
-6832,6833,3870,3019,2458,6834,3753,3413,3350,6835,4809,3871,4810,3561,4446,6836, # 5712
-6837,4447,4811,4812,6838,2459,4448,6839,4449,6840,6841,4022,3872,6842,4813,4814, # 5728
-6843,6844,4815,4200,4201,4202,6845,4023,6846,6847,4450,3562,3873,6848,6849,4816, # 5744
-4817,6850,4451,4818,2139,6851,3563,6852,6853,3351,6854,6855,3352,4024,2709,3414, # 5760
-4203,4452,6856,4204,6857,6858,3874,3875,6859,6860,4819,6861,6862,6863,6864,4453, # 5776
-3647,6865,6866,4820,6867,6868,6869,6870,4454,6871,2869,6872,6873,4821,6874,3754, # 5792
-6875,4822,4205,6876,6877,6878,3648,4206,4455,6879,4823,6880,4824,3876,6881,3055, # 5808
-4207,6882,3415,6883,6884,6885,4208,4209,6886,4210,3353,6887,3354,3564,3209,3485, # 5824
-2652,6888,2728,6889,3210,3755,6890,4025,4456,6891,4825,6892,6893,6894,6895,4211, # 5840
-6896,6897,6898,4826,6899,6900,4212,6901,4827,6902,2773,3565,6903,4828,6904,6905, # 5856
-6906,6907,3649,3650,6908,2849,3566,6909,3567,3100,6910,6911,6912,6913,6914,6915, # 5872
-4026,6916,3355,4829,3056,4457,3756,6917,3651,6918,4213,3652,2870,6919,4458,6920, # 5888
-2438,6921,6922,3757,2774,4830,6923,3356,4831,4832,6924,4833,4459,3653,2507,6925, # 5904
-4834,2535,6926,6927,3273,4027,3147,6928,3568,6929,6930,6931,4460,6932,3877,4461, # 5920
-2729,3654,6933,6934,6935,6936,2175,4835,2630,4214,4028,4462,4836,4215,6937,3148, # 5936
-4216,4463,4837,4838,4217,6938,6939,2850,4839,6940,4464,6941,6942,6943,4840,6944, # 5952
-4218,3274,4465,6945,6946,2710,6947,4841,4466,6948,6949,2894,6950,6951,4842,6952, # 5968
-4219,3057,2871,6953,6954,6955,6956,4467,6957,2711,6958,6959,6960,3275,3101,4843, # 5984
-6961,3357,3569,6962,4844,6963,6964,4468,4845,3570,6965,3102,4846,3758,6966,4847, # 6000
-3878,4848,4849,4029,6967,2929,3879,4850,4851,6968,6969,1733,6970,4220,6971,6972, # 6016
-6973,6974,6975,6976,4852,6977,6978,6979,6980,6981,6982,3759,6983,6984,6985,3486, # 6032
-3487,6986,3488,3416,6987,6988,6989,6990,6991,6992,6993,6994,6995,6996,6997,4853, # 6048
-6998,6999,4030,7000,7001,3211,7002,7003,4221,7004,7005,3571,4031,7006,3572,7007, # 6064
-2614,4854,2577,7008,7009,2965,3655,3656,4855,2775,3489,3880,4222,4856,3881,4032, # 6080
-3882,3657,2730,3490,4857,7010,3149,7011,4469,4858,2496,3491,4859,2283,7012,7013, # 6096
-7014,2365,4860,4470,7015,7016,3760,7017,7018,4223,1917,7019,7020,7021,4471,7022, # 6112
-2776,4472,7023,7024,7025,7026,4033,7027,3573,4224,4861,4034,4862,7028,7029,1929, # 6128
-3883,4035,7030,4473,3058,7031,2536,3761,3884,7032,4036,7033,2966,2895,1968,4474, # 6144
-3276,4225,3417,3492,4226,2105,7034,7035,1754,2596,3762,4227,4863,4475,3763,4864, # 6160
-3764,2615,2777,3103,3765,3658,3418,4865,2296,3766,2815,7036,7037,7038,3574,2872, # 6176
-3277,4476,7039,4037,4477,7040,7041,4038,7042,7043,7044,7045,7046,7047,2537,7048, # 6192
-7049,7050,7051,7052,7053,7054,4478,7055,7056,3767,3659,4228,3575,7057,7058,4229, # 6208
-7059,7060,7061,3660,7062,3212,7063,3885,4039,2460,7064,7065,7066,7067,7068,7069, # 6224
-7070,7071,7072,7073,7074,4866,3768,4867,7075,7076,7077,7078,4868,3358,3278,2653, # 6240
-7079,7080,4479,3886,7081,7082,4869,7083,7084,7085,7086,7087,7088,2538,7089,7090, # 6256
-7091,4040,3150,3769,4870,4041,2896,3359,4230,2930,7092,3279,7093,2967,4480,3213, # 6272
-4481,3661,7094,7095,7096,7097,7098,7099,7100,7101,7102,2461,3770,7103,7104,4231, # 6288
-3151,7105,7106,7107,4042,3662,7108,7109,4871,3663,4872,4043,3059,7110,7111,7112, # 6304
-3493,2988,7113,4873,7114,7115,7116,3771,4874,7117,7118,4232,4875,7119,3576,2336, # 6320
-4876,7120,4233,3419,4044,4877,4878,4482,4483,4879,4484,4234,7121,3772,4880,1045, # 6336
-3280,3664,4881,4882,7122,7123,7124,7125,4883,7126,2778,7127,4485,4486,7128,4884, # 6352
-3214,3887,7129,7130,3215,7131,4885,4045,7132,7133,4046,7134,7135,7136,7137,7138, # 6368
-7139,7140,7141,7142,7143,4235,7144,4886,7145,7146,7147,4887,7148,7149,7150,4487, # 6384
-4047,4488,7151,7152,4888,4048,2989,3888,7153,3665,7154,4049,7155,7156,7157,7158, # 6400
-7159,7160,2931,4889,4890,4489,7161,2631,3889,4236,2779,7162,7163,4891,7164,3060, # 6416
-7165,1672,4892,7166,4893,4237,3281,4894,7167,7168,3666,7169,3494,7170,7171,4050, # 6432
-7172,7173,3104,3360,3420,4490,4051,2684,4052,7174,4053,7175,7176,7177,2253,4054, # 6448
-7178,7179,4895,7180,3152,3890,3153,4491,3216,7181,7182,7183,2968,4238,4492,4055, # 6464
-7184,2990,7185,2479,7186,7187,4493,7188,7189,7190,7191,7192,4896,7193,4897,2969, # 6480
-4494,4898,7194,3495,7195,7196,4899,4495,7197,3105,2731,7198,4900,7199,7200,7201, # 6496
-4056,7202,3361,7203,7204,4496,4901,4902,7205,4497,7206,7207,2315,4903,7208,4904, # 6512
-7209,4905,2851,7210,7211,3577,7212,3578,4906,7213,4057,3667,4907,7214,4058,2354, # 6528
-3891,2376,3217,3773,7215,7216,7217,7218,7219,4498,7220,4908,3282,2685,7221,3496, # 6544
-4909,2632,3154,4910,7222,2337,7223,4911,7224,7225,7226,4912,4913,3283,4239,4499, # 6560
-7227,2816,7228,7229,7230,7231,7232,7233,7234,4914,4500,4501,7235,7236,7237,2686, # 6576
-7238,4915,7239,2897,4502,7240,4503,7241,2516,7242,4504,3362,3218,7243,7244,7245, # 6592
-4916,7246,7247,4505,3363,7248,7249,7250,7251,3774,4506,7252,7253,4917,7254,7255, # 6608
-3284,2991,4918,4919,3219,3892,4920,3106,3497,4921,7256,7257,7258,4922,7259,4923, # 6624
-3364,4507,4508,4059,7260,4240,3498,7261,7262,4924,7263,2992,3893,4060,3220,7264, # 6640
-7265,7266,7267,7268,7269,4509,3775,7270,2817,7271,4061,4925,4510,3776,7272,4241, # 6656
-4511,3285,7273,7274,3499,7275,7276,7277,4062,4512,4926,7278,3107,3894,7279,7280, # 6672
-4927,7281,4513,7282,7283,3668,7284,7285,4242,4514,4243,7286,2058,4515,4928,4929, # 6688
-4516,7287,3286,4244,7288,4517,7289,7290,7291,3669,7292,7293,4930,4931,4932,2355, # 6704
-4933,7294,2633,4518,7295,4245,7296,7297,4519,7298,7299,4520,4521,4934,7300,4246, # 6720
-4522,7301,7302,7303,3579,7304,4247,4935,7305,4936,7306,7307,7308,7309,3777,7310, # 6736
-4523,7311,7312,7313,4248,3580,7314,4524,3778,4249,7315,3581,7316,3287,7317,3221, # 6752
-7318,4937,7319,7320,7321,7322,7323,7324,4938,4939,7325,4525,7326,7327,7328,4063, # 6768
-7329,7330,4940,7331,7332,4941,7333,4526,7334,3500,2780,1741,4942,2026,1742,7335, # 6784
-7336,3582,4527,2388,7337,7338,7339,4528,7340,4250,4943,7341,7342,7343,4944,7344, # 6800
-7345,7346,3020,7347,4945,7348,7349,7350,7351,3895,7352,3896,4064,3897,7353,7354, # 6816
-7355,4251,7356,7357,3898,7358,3779,7359,3780,3288,7360,7361,4529,7362,4946,4530, # 6832
-2027,7363,3899,4531,4947,3222,3583,7364,4948,7365,7366,7367,7368,4949,3501,4950, # 6848
-3781,4951,4532,7369,2517,4952,4252,4953,3155,7370,4954,4955,4253,2518,4533,7371, # 6864
-7372,2712,4254,7373,7374,7375,3670,4956,3671,7376,2389,3502,4065,7377,2338,7378, # 6880
-7379,7380,7381,3061,7382,4957,7383,7384,7385,7386,4958,4534,7387,7388,2993,7389, # 6896
-3062,7390,4959,7391,7392,7393,4960,3108,4961,7394,4535,7395,4962,3421,4536,7396, # 6912
-4963,7397,4964,1857,7398,4965,7399,7400,2176,3584,4966,7401,7402,3422,4537,3900, # 6928
-3585,7403,3782,7404,2852,7405,7406,7407,4538,3783,2654,3423,4967,4539,7408,3784, # 6944
-3586,2853,4540,4541,7409,3901,7410,3902,7411,7412,3785,3109,2327,3903,7413,7414, # 6960
-2970,4066,2932,7415,7416,7417,3904,3672,3424,7418,4542,4543,4544,7419,4968,7420, # 6976
-7421,4255,7422,7423,7424,7425,7426,4067,7427,3673,3365,4545,7428,3110,2559,3674, # 6992
-7429,7430,3156,7431,7432,3503,7433,3425,4546,7434,3063,2873,7435,3223,4969,4547, # 7008
-4548,2898,4256,4068,7436,4069,3587,3786,2933,3787,4257,4970,4971,3788,7437,4972, # 7024
-3064,7438,4549,7439,7440,7441,7442,7443,4973,3905,7444,2874,7445,7446,7447,7448, # 7040
-3021,7449,4550,3906,3588,4974,7450,7451,3789,3675,7452,2578,7453,4070,7454,7455, # 7056
-7456,4258,3676,7457,4975,7458,4976,4259,3790,3504,2634,4977,3677,4551,4260,7459, # 7072
-7460,7461,7462,3907,4261,4978,7463,7464,7465,7466,4979,4980,7467,7468,2213,4262, # 7088
-7469,7470,7471,3678,4981,7472,2439,7473,4263,3224,3289,7474,3908,2415,4982,7475, # 7104
-4264,7476,4983,2655,7477,7478,2732,4552,2854,2875,7479,7480,4265,7481,4553,4984, # 7120
-7482,7483,4266,7484,3679,3366,3680,2818,2781,2782,3367,3589,4554,3065,7485,4071, # 7136
-2899,7486,7487,3157,2462,4072,4555,4073,4985,4986,3111,4267,2687,3368,4556,4074, # 7152
-3791,4268,7488,3909,2783,7489,2656,1962,3158,4557,4987,1963,3159,3160,7490,3112, # 7168
-4988,4989,3022,4990,4991,3792,2855,7491,7492,2971,4558,7493,7494,4992,7495,7496, # 7184
-7497,7498,4993,7499,3426,4559,4994,7500,3681,4560,4269,4270,3910,7501,4075,4995, # 7200
-4271,7502,7503,4076,7504,4996,7505,3225,4997,4272,4077,2819,3023,7506,7507,2733, # 7216
-4561,7508,4562,7509,3369,3793,7510,3590,2508,7511,7512,4273,3113,2994,2616,7513, # 7232
-7514,7515,7516,7517,7518,2820,3911,4078,2748,7519,7520,4563,4998,7521,7522,7523, # 7248
-7524,4999,4274,7525,4564,3682,2239,4079,4565,7526,7527,7528,7529,5000,7530,7531, # 7264
-5001,4275,3794,7532,7533,7534,3066,5002,4566,3161,7535,7536,4080,7537,3162,7538, # 7280
-7539,4567,7540,7541,7542,7543,7544,7545,5003,7546,4568,7547,7548,7549,7550,7551, # 7296
-7552,7553,7554,7555,7556,5004,7557,7558,7559,5005,7560,3795,7561,4569,7562,7563, # 7312
-7564,2821,3796,4276,4277,4081,7565,2876,7566,5006,7567,7568,2900,7569,3797,3912, # 7328
-7570,7571,7572,4278,7573,7574,7575,5007,7576,7577,5008,7578,7579,4279,2934,7580, # 7344
-7581,5009,7582,4570,7583,4280,7584,7585,7586,4571,4572,3913,7587,4573,3505,7588, # 7360
-5010,7589,7590,7591,7592,3798,4574,7593,7594,5011,7595,4281,7596,7597,7598,4282, # 7376
-5012,7599,7600,5013,3163,7601,5014,7602,3914,7603,7604,2734,4575,4576,4577,7605, # 7392
-7606,7607,7608,7609,3506,5015,4578,7610,4082,7611,2822,2901,2579,3683,3024,4579, # 7408
-3507,7612,4580,7613,3226,3799,5016,7614,7615,7616,7617,7618,7619,7620,2995,3290, # 7424
-7621,4083,7622,5017,7623,7624,7625,7626,7627,4581,3915,7628,3291,7629,5018,7630, # 7440
-7631,7632,7633,4084,7634,7635,3427,3800,7636,7637,4582,7638,5019,4583,5020,7639, # 7456
-3916,7640,3801,5021,4584,4283,7641,7642,3428,3591,2269,7643,2617,7644,4585,3592, # 7472
-7645,4586,2902,7646,7647,3227,5022,7648,4587,7649,4284,7650,7651,7652,4588,2284, # 7488
-7653,5023,7654,7655,7656,4589,5024,3802,7657,7658,5025,3508,4590,7659,7660,7661, # 7504
-1969,5026,7662,7663,3684,1821,2688,7664,2028,2509,4285,7665,2823,1841,7666,2689, # 7520
-3114,7667,3917,4085,2160,5027,5028,2972,7668,5029,7669,7670,7671,3593,4086,7672, # 7536
-4591,4087,5030,3803,7673,7674,7675,7676,7677,7678,7679,4286,2366,4592,4593,3067, # 7552
-2328,7680,7681,4594,3594,3918,2029,4287,7682,5031,3919,3370,4288,4595,2856,7683, # 7568
-3509,7684,7685,5032,5033,7686,7687,3804,2784,7688,7689,7690,7691,3371,7692,7693, # 7584
-2877,5034,7694,7695,3920,4289,4088,7696,7697,7698,5035,7699,5036,4290,5037,5038, # 7600
-5039,7700,7701,7702,5040,5041,3228,7703,1760,7704,5042,3229,4596,2106,4089,7705, # 7616
-4597,2824,5043,2107,3372,7706,4291,4090,5044,7707,4091,7708,5045,3025,3805,4598, # 7632
-4292,4293,4294,3373,7709,4599,7710,5046,7711,7712,5047,5048,3806,7713,7714,7715, # 7648
-5049,7716,7717,7718,7719,4600,5050,7720,7721,7722,5051,7723,4295,3429,7724,7725, # 7664
-7726,7727,3921,7728,3292,5052,4092,7729,7730,7731,7732,7733,7734,7735,5053,5054, # 7680
-7736,7737,7738,7739,3922,3685,7740,7741,7742,7743,2635,5055,7744,5056,4601,7745, # 7696
-7746,2560,7747,7748,7749,7750,3923,7751,7752,7753,7754,7755,4296,2903,7756,7757, # 7712
-7758,7759,7760,3924,7761,5057,4297,7762,7763,5058,4298,7764,4093,7765,7766,5059, # 7728
-3925,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,3595,7777,4299,5060,4094, # 7744
-7778,3293,5061,7779,7780,4300,7781,7782,4602,7783,3596,7784,7785,3430,2367,7786, # 7760
-3164,5062,5063,4301,7787,7788,4095,5064,5065,7789,3374,3115,7790,7791,7792,7793, # 7776
-7794,7795,7796,3597,4603,7797,7798,3686,3116,3807,5066,7799,7800,5067,7801,7802, # 7792
-4604,4302,5068,4303,4096,7803,7804,3294,7805,7806,5069,4605,2690,7807,3026,7808, # 7808
-7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824, # 7824
-7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7840
-7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856, # 7856
-7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872, # 7872
-7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888, # 7888
-7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904, # 7904
-7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920, # 7920
-7921,7922,7923,7924,3926,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935, # 7936
-7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951, # 7952
-7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967, # 7968
-7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983, # 7984
-7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999, # 8000
-8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015, # 8016
-8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031, # 8032
-8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047, # 8048
-8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063, # 8064
-8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079, # 8080
-8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095, # 8096
-8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111, # 8112
-8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127, # 8128
-8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143, # 8144
-8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159, # 8160
-8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175, # 8176
-8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191, # 8192
-8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207, # 8208
-8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223, # 8224
-8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239, # 8240
-8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255, # 8256
-8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271) # 8272
diff --git a/lib/requests/packages/chardet2/jpcntx.py b/lib/requests/packages/chardet2/jpcntx.py
deleted file mode 100755
index 3abfe7b..0000000
--- a/lib/requests/packages/chardet2/jpcntx.py
+++ /dev/null
@@ -1,210 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-NUM_OF_CATEGORY = 6
-DONT_KNOW = -1
-ENOUGH_REL_THRESHOLD = 100
-MAX_REL_THRESHOLD = 1000
-MINIMUM_DATA_THRESHOLD = 4
-
-# This is hiragana 2-char sequence table, the number in each cell represents its frequency category
-jp2CharContext = ( \
-(0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1),
-(2,4,0,4,0,3,0,4,0,3,4,4,4,2,4,3,3,4,3,2,3,3,4,2,3,3,3,2,4,1,4,3,3,1,5,4,3,4,3,4,3,5,3,0,3,5,4,2,0,3,1,0,3,3,0,3,3,0,1,1,0,4,3,0,3,3,0,4,0,2,0,3,5,5,5,5,4,0,4,1,0,3,4),
-(0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2),
-(0,4,0,5,0,5,0,4,0,4,5,4,4,3,5,3,5,1,5,3,4,3,4,4,3,4,3,3,4,3,5,4,4,3,5,5,3,5,5,5,3,5,5,3,4,5,5,3,1,3,2,0,3,4,0,4,2,0,4,2,1,5,3,2,3,5,0,4,0,2,0,5,4,4,5,4,5,0,4,0,0,4,4),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,3,0,4,0,3,0,3,0,4,5,4,3,3,3,3,4,3,5,4,4,3,5,4,4,3,4,3,4,4,4,4,5,3,4,4,3,4,5,5,4,5,5,1,4,5,4,3,0,3,3,1,3,3,0,4,4,0,3,3,1,5,3,3,3,5,0,4,0,3,0,4,4,3,4,3,3,0,4,1,1,3,4),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,4,0,3,0,3,0,4,0,3,4,4,3,2,2,1,2,1,3,1,3,3,3,3,3,4,3,1,3,3,5,3,3,0,4,3,0,5,4,3,3,5,4,4,3,4,4,5,0,1,2,0,1,2,0,2,2,0,1,0,0,5,2,2,1,4,0,3,0,1,0,4,4,3,5,4,3,0,2,1,0,4,3),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,3,0,5,0,4,0,2,1,4,4,2,4,1,4,2,4,2,4,3,3,3,4,3,3,3,3,1,4,2,3,3,3,1,4,4,1,1,1,4,3,3,2,0,2,4,3,2,0,3,3,0,3,1,1,0,0,0,3,3,0,4,2,2,3,4,0,4,0,3,0,4,4,5,3,4,4,0,3,0,0,1,4),
-(1,4,0,4,0,4,0,4,0,3,5,4,4,3,4,3,5,4,3,3,4,3,5,4,4,4,4,3,4,2,4,3,3,1,5,4,3,2,4,5,4,5,5,4,4,5,4,4,0,3,2,2,3,3,0,4,3,1,3,2,1,4,3,3,4,5,0,3,0,2,0,4,5,5,4,5,4,0,4,0,0,5,4),
-(0,5,0,5,0,4,0,3,0,4,4,3,4,3,3,3,4,0,4,4,4,3,4,3,4,3,3,1,4,2,4,3,4,0,5,4,1,4,5,4,4,5,3,2,4,3,4,3,2,4,1,3,3,3,2,3,2,0,4,3,3,4,3,3,3,4,0,4,0,3,0,4,5,4,4,4,3,0,4,1,0,1,3),
-(0,3,1,4,0,3,0,2,0,3,4,4,3,1,4,2,3,3,4,3,4,3,4,3,4,4,3,2,3,1,5,4,4,1,4,4,3,5,4,4,3,5,5,4,3,4,4,3,1,2,3,1,2,2,0,3,2,0,3,1,0,5,3,3,3,4,3,3,3,3,4,4,4,4,5,4,2,0,3,3,2,4,3),
-(0,2,0,3,0,1,0,1,0,0,3,2,0,0,2,0,1,0,2,1,3,3,3,1,2,3,1,0,1,0,4,2,1,1,3,3,0,4,3,3,1,4,3,3,0,3,3,2,0,0,0,0,1,0,0,2,0,0,0,0,0,4,1,0,2,3,2,2,2,1,3,3,3,4,4,3,2,0,3,1,0,3,3),
-(0,4,0,4,0,3,0,3,0,4,4,4,3,3,3,3,3,3,4,3,4,2,4,3,4,3,3,2,4,3,4,5,4,1,4,5,3,5,4,5,3,5,4,0,3,5,5,3,1,3,3,2,2,3,0,3,4,1,3,3,2,4,3,3,3,4,0,4,0,3,0,4,5,4,4,5,3,0,4,1,0,3,4),
-(0,2,0,3,0,3,0,0,0,2,2,2,1,0,1,0,0,0,3,0,3,0,3,0,1,3,1,0,3,1,3,3,3,1,3,3,3,0,1,3,1,3,4,0,0,3,1,1,0,3,2,0,0,0,0,1,3,0,1,0,0,3,3,2,0,3,0,0,0,0,0,3,4,3,4,3,3,0,3,0,0,2,3),
-(2,3,0,3,0,2,0,1,0,3,3,4,3,1,3,1,1,1,3,1,4,3,4,3,3,3,0,0,3,1,5,4,3,1,4,3,2,5,5,4,4,4,4,3,3,4,4,4,0,2,1,1,3,2,0,1,2,0,0,1,0,4,1,3,3,3,0,3,0,1,0,4,4,4,5,5,3,0,2,0,0,4,4),
-(0,2,0,1,0,3,1,3,0,2,3,3,3,0,3,1,0,0,3,0,3,2,3,1,3,2,1,1,0,0,4,2,1,0,2,3,1,4,3,2,0,4,4,3,1,3,1,3,0,1,0,0,1,0,0,0,1,0,0,0,0,4,1,1,1,2,0,3,0,0,0,3,4,2,4,3,2,0,1,0,0,3,3),
-(0,1,0,4,0,5,0,4,0,2,4,4,2,3,3,2,3,3,5,3,3,3,4,3,4,2,3,0,4,3,3,3,4,1,4,3,2,1,5,5,3,4,5,1,3,5,4,2,0,3,3,0,1,3,0,4,2,0,1,3,1,4,3,3,3,3,0,3,0,1,0,3,4,4,4,5,5,0,3,0,1,4,5),
-(0,2,0,3,0,3,0,0,0,2,3,1,3,0,4,0,1,1,3,0,3,4,3,2,3,1,0,3,3,2,3,1,3,0,2,3,0,2,1,4,1,2,2,0,0,3,3,0,0,2,0,0,0,1,0,0,0,0,2,2,0,3,2,1,3,3,0,2,0,2,0,0,3,3,1,2,4,0,3,0,2,2,3),
-(2,4,0,5,0,4,0,4,0,2,4,4,4,3,4,3,3,3,1,2,4,3,4,3,4,4,5,0,3,3,3,3,2,0,4,3,1,4,3,4,1,4,4,3,3,4,4,3,1,2,3,0,4,2,0,4,1,0,3,3,0,4,3,3,3,4,0,4,0,2,0,3,5,3,4,5,2,0,3,0,0,4,5),
-(0,3,0,4,0,1,0,1,0,1,3,2,2,1,3,0,3,0,2,0,2,0,3,0,2,0,0,0,1,0,1,1,0,0,3,1,0,0,0,4,0,3,1,0,2,1,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,4,2,2,3,1,0,3,0,0,0,1,4,4,4,3,0,0,4,0,0,1,4),
-(1,4,1,5,0,3,0,3,0,4,5,4,4,3,5,3,3,4,4,3,4,1,3,3,3,3,2,1,4,1,5,4,3,1,4,4,3,5,4,4,3,5,4,3,3,4,4,4,0,3,3,1,2,3,0,3,1,0,3,3,0,5,4,4,4,4,4,4,3,3,5,4,4,3,3,5,4,0,3,2,0,4,4),
-(0,2,0,3,0,1,0,0,0,1,3,3,3,2,4,1,3,0,3,1,3,0,2,2,1,1,0,0,2,0,4,3,1,0,4,3,0,4,4,4,1,4,3,1,1,3,3,1,0,2,0,0,1,3,0,0,0,0,2,0,0,4,3,2,4,3,5,4,3,3,3,4,3,3,4,3,3,0,2,1,0,3,3),
-(0,2,0,4,0,3,0,2,0,2,5,5,3,4,4,4,4,1,4,3,3,0,4,3,4,3,1,3,3,2,4,3,0,3,4,3,0,3,4,4,2,4,4,0,4,5,3,3,2,2,1,1,1,2,0,1,5,0,3,3,2,4,3,3,3,4,0,3,0,2,0,4,4,3,5,5,0,0,3,0,2,3,3),
-(0,3,0,4,0,3,0,1,0,3,4,3,3,1,3,3,3,0,3,1,3,0,4,3,3,1,1,0,3,0,3,3,0,0,4,4,0,1,5,4,3,3,5,0,3,3,4,3,0,2,0,1,1,1,0,1,3,0,1,2,1,3,3,2,3,3,0,3,0,1,0,1,3,3,4,4,1,0,1,2,2,1,3),
-(0,1,0,4,0,4,0,3,0,1,3,3,3,2,3,1,1,0,3,0,3,3,4,3,2,4,2,0,1,0,4,3,2,0,4,3,0,5,3,3,2,4,4,4,3,3,3,4,0,1,3,0,0,1,0,0,1,0,0,0,0,4,2,3,3,3,0,3,0,0,0,4,4,4,5,3,2,0,3,3,0,3,5),
-(0,2,0,3,0,0,0,3,0,1,3,0,2,0,0,0,1,0,3,1,1,3,3,0,0,3,0,0,3,0,2,3,1,0,3,1,0,3,3,2,0,4,2,2,0,2,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,2,1,2,0,1,0,1,0,0,0,1,3,1,2,0,0,0,1,0,0,1,4),
-(0,3,0,3,0,5,0,1,0,2,4,3,1,3,3,2,1,1,5,2,1,0,5,1,2,0,0,0,3,3,2,2,3,2,4,3,0,0,3,3,1,3,3,0,2,5,3,4,0,3,3,0,1,2,0,2,2,0,3,2,0,2,2,3,3,3,0,2,0,1,0,3,4,4,2,5,4,0,3,0,0,3,5),
-(0,3,0,3,0,3,0,1,0,3,3,3,3,0,3,0,2,0,2,1,1,0,2,0,1,0,0,0,2,1,0,0,1,0,3,2,0,0,3,3,1,2,3,1,0,3,3,0,0,1,0,0,0,0,0,2,0,0,0,0,0,2,3,1,2,3,0,3,0,1,0,3,2,1,0,4,3,0,1,1,0,3,3),
-(0,4,0,5,0,3,0,3,0,4,5,5,4,3,5,3,4,3,5,3,3,2,5,3,4,4,4,3,4,3,4,5,5,3,4,4,3,4,4,5,4,4,4,3,4,5,5,4,2,3,4,2,3,4,0,3,3,1,4,3,2,4,3,3,5,5,0,3,0,3,0,5,5,5,5,4,4,0,4,0,1,4,4),
-(0,4,0,4,0,3,0,3,0,3,5,4,4,2,3,2,5,1,3,2,5,1,4,2,3,2,3,3,4,3,3,3,3,2,5,4,1,3,3,5,3,4,4,0,4,4,3,1,1,3,1,0,2,3,0,2,3,0,3,0,0,4,3,1,3,4,0,3,0,2,0,4,4,4,3,4,5,0,4,0,0,3,4),
-(0,3,0,3,0,3,1,2,0,3,4,4,3,3,3,0,2,2,4,3,3,1,3,3,3,1,1,0,3,1,4,3,2,3,4,4,2,4,4,4,3,4,4,3,2,4,4,3,1,3,3,1,3,3,0,4,1,0,2,2,1,4,3,2,3,3,5,4,3,3,5,4,4,3,3,0,4,0,3,2,2,4,4),
-(0,2,0,1,0,0,0,0,0,1,2,1,3,0,0,0,0,0,2,0,1,2,1,0,0,1,0,0,0,0,3,0,0,1,0,1,1,3,1,0,0,0,1,1,0,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,1,2,2,0,3,4,0,0,0,1,1,0,0,1,0,0,0,0,0,1,1),
-(0,1,0,0,0,1,0,0,0,0,4,0,4,1,4,0,3,0,4,0,3,0,4,0,3,0,3,0,4,1,5,1,4,0,0,3,0,5,0,5,2,0,1,0,0,0,2,1,4,0,1,3,0,0,3,0,0,3,1,1,4,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0),
-(1,4,0,5,0,3,0,2,0,3,5,4,4,3,4,3,5,3,4,3,3,0,4,3,3,3,3,3,3,2,4,4,3,1,3,4,4,5,4,4,3,4,4,1,3,5,4,3,3,3,1,2,2,3,3,1,3,1,3,3,3,5,3,3,4,5,0,3,0,3,0,3,4,3,4,4,3,0,3,0,2,4,3),
-(0,1,0,4,0,0,0,0,0,1,4,0,4,1,4,2,4,0,3,0,1,0,1,0,0,0,0,0,2,0,3,1,1,1,0,3,0,0,0,1,2,1,0,0,1,1,1,1,0,1,0,0,0,1,0,0,3,0,0,0,0,3,2,0,2,2,0,1,0,0,0,2,3,2,3,3,0,0,0,0,2,1,0),
-(0,5,1,5,0,3,0,3,0,5,4,4,5,1,5,3,3,0,4,3,4,3,5,3,4,3,3,2,4,3,4,3,3,0,3,3,1,4,4,3,4,4,4,3,4,5,5,3,2,3,1,1,3,3,1,3,1,1,3,3,2,4,5,3,3,5,0,4,0,3,0,4,4,3,5,3,3,0,3,4,0,4,3),
-(0,5,0,5,0,3,0,2,0,4,4,3,5,2,4,3,3,3,4,4,4,3,5,3,5,3,3,1,4,0,4,3,3,0,3,3,0,4,4,4,4,5,4,3,3,5,5,3,2,3,1,2,3,2,0,1,0,0,3,2,2,4,4,3,1,5,0,4,0,3,0,4,3,1,3,2,1,0,3,3,0,3,3),
-(0,4,0,5,0,5,0,4,0,4,5,5,5,3,4,3,3,2,5,4,4,3,5,3,5,3,4,0,4,3,4,4,3,2,4,4,3,4,5,4,4,5,5,0,3,5,5,4,1,3,3,2,3,3,1,3,1,0,4,3,1,4,4,3,4,5,0,4,0,2,0,4,3,4,4,3,3,0,4,0,0,5,5),
-(0,4,0,4,0,5,0,1,1,3,3,4,4,3,4,1,3,0,5,1,3,0,3,1,3,1,1,0,3,0,3,3,4,0,4,3,0,4,4,4,3,4,4,0,3,5,4,1,0,3,0,0,2,3,0,3,1,0,3,1,0,3,2,1,3,5,0,3,0,1,0,3,2,3,3,4,4,0,2,2,0,4,4),
-(2,4,0,5,0,4,0,3,0,4,5,5,4,3,5,3,5,3,5,3,5,2,5,3,4,3,3,4,3,4,5,3,2,1,5,4,3,2,3,4,5,3,4,1,2,5,4,3,0,3,3,0,3,2,0,2,3,0,4,1,0,3,4,3,3,5,0,3,0,1,0,4,5,5,5,4,3,0,4,2,0,3,5),
-(0,5,0,4,0,4,0,2,0,5,4,3,4,3,4,3,3,3,4,3,4,2,5,3,5,3,4,1,4,3,4,4,4,0,3,5,0,4,4,4,4,5,3,1,3,4,5,3,3,3,3,3,3,3,0,2,2,0,3,3,2,4,3,3,3,5,3,4,1,3,3,5,3,2,0,0,0,0,4,3,1,3,3),
-(0,1,0,3,0,3,0,1,0,1,3,3,3,2,3,3,3,0,3,0,0,0,3,1,3,0,0,0,2,2,2,3,0,0,3,2,0,1,2,4,1,3,3,0,0,3,3,3,0,1,0,0,2,1,0,0,3,0,3,1,0,3,0,0,1,3,0,2,0,1,0,3,3,1,3,3,0,0,1,1,0,3,3),
-(0,2,0,3,0,2,1,4,0,2,2,3,1,1,3,1,1,0,2,0,3,1,2,3,1,3,0,0,1,0,4,3,2,3,3,3,1,4,2,3,3,3,3,1,0,3,1,4,0,1,1,0,1,2,0,1,1,0,1,1,0,3,1,3,2,2,0,1,0,0,0,2,3,3,3,1,0,0,0,0,0,2,3),
-(0,5,0,4,0,5,0,2,0,4,5,5,3,3,4,3,3,1,5,4,4,2,4,4,4,3,4,2,4,3,5,5,4,3,3,4,3,3,5,5,4,5,5,1,3,4,5,3,1,4,3,1,3,3,0,3,3,1,4,3,1,4,5,3,3,5,0,4,0,3,0,5,3,3,1,4,3,0,4,0,1,5,3),
-(0,5,0,5,0,4,0,2,0,4,4,3,4,3,3,3,3,3,5,4,4,4,4,4,4,5,3,3,5,2,4,4,4,3,4,4,3,3,4,4,5,5,3,3,4,3,4,3,3,4,3,3,3,3,1,2,2,1,4,3,3,5,4,4,3,4,0,4,0,3,0,4,4,4,4,4,1,0,4,2,0,2,4),
-(0,4,0,4,0,3,0,1,0,3,5,2,3,0,3,0,2,1,4,2,3,3,4,1,4,3,3,2,4,1,3,3,3,0,3,3,0,0,3,3,3,5,3,3,3,3,3,2,0,2,0,0,2,0,0,2,0,0,1,0,0,3,1,2,2,3,0,3,0,2,0,4,4,3,3,4,1,0,3,0,0,2,4),
-(0,0,0,4,0,0,0,0,0,0,1,0,1,0,2,0,0,0,0,0,1,0,2,0,1,0,0,0,0,0,3,1,3,0,3,2,0,0,0,1,0,3,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,0,2,0,0,0,0,0,0,2),
-(0,2,1,3,0,2,0,2,0,3,3,3,3,1,3,1,3,3,3,3,3,3,4,2,2,1,2,1,4,0,4,3,1,3,3,3,2,4,3,5,4,3,3,3,3,3,3,3,0,1,3,0,2,0,0,1,0,0,1,0,0,4,2,0,2,3,0,3,3,0,3,3,4,2,3,1,4,0,1,2,0,2,3),
-(0,3,0,3,0,1,0,3,0,2,3,3,3,0,3,1,2,0,3,3,2,3,3,2,3,2,3,1,3,0,4,3,2,0,3,3,1,4,3,3,2,3,4,3,1,3,3,1,1,0,1,1,0,1,0,1,0,1,0,0,0,4,1,1,0,3,0,3,1,0,2,3,3,3,3,3,1,0,0,2,0,3,3),
-(0,0,0,0,0,0,0,0,0,0,3,0,2,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,3,0,3,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,2,0,2,3,0,0,0,0,0,0,0,0,3),
-(0,2,0,3,1,3,0,3,0,2,3,3,3,1,3,1,3,1,3,1,3,3,3,1,3,0,2,3,1,1,4,3,3,2,3,3,1,2,2,4,1,3,3,0,1,4,2,3,0,1,3,0,3,0,0,1,3,0,2,0,0,3,3,2,1,3,0,3,0,2,0,3,4,4,4,3,1,0,3,0,0,3,3),
-(0,2,0,1,0,2,0,0,0,1,3,2,2,1,3,0,1,1,3,0,3,2,3,1,2,0,2,0,1,1,3,3,3,0,3,3,1,1,2,3,2,3,3,1,2,3,2,0,0,1,0,0,0,0,0,0,3,0,1,0,0,2,1,2,1,3,0,3,0,0,0,3,4,4,4,3,2,0,2,0,0,2,4),
-(0,0,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,3,1,0,0,0,0,0,0,0,3),
-(0,3,0,3,0,2,0,3,0,3,3,3,2,3,2,2,2,0,3,1,3,3,3,2,3,3,0,0,3,0,3,2,2,0,2,3,1,4,3,4,3,3,2,3,1,5,4,4,0,3,1,2,1,3,0,3,1,1,2,0,2,3,1,3,1,3,0,3,0,1,0,3,3,4,4,2,1,0,2,1,0,2,4),
-(0,1,0,3,0,1,0,2,0,1,4,2,5,1,4,0,2,0,2,1,3,1,4,0,2,1,0,0,2,1,4,1,1,0,3,3,0,5,1,3,2,3,3,1,0,3,2,3,0,1,0,0,0,0,0,0,1,0,0,0,0,4,0,1,0,3,0,2,0,1,0,3,3,3,4,3,3,0,0,0,0,2,3),
-(0,0,0,1,0,0,0,0,0,0,2,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,0,1,0,0,0,0,0,3),
-(0,1,0,3,0,4,0,3,0,2,4,3,1,0,3,2,2,1,3,1,2,2,3,1,1,1,2,1,3,0,1,2,0,1,3,2,1,3,0,5,5,1,0,0,1,3,2,1,0,3,0,0,1,0,0,0,0,0,3,4,0,1,1,1,3,2,0,2,0,1,0,2,3,3,1,2,3,0,1,0,1,0,4),
-(0,0,0,1,0,3,0,3,0,2,2,1,0,0,4,0,3,0,3,1,3,0,3,0,3,0,1,0,3,0,3,1,3,0,3,3,0,0,1,2,1,1,1,0,1,2,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,2,2,1,2,0,0,2,0,0,0,0,2,3,3,3,3,0,0,0,0,1,4),
-(0,0,0,3,0,3,0,0,0,0,3,1,1,0,3,0,1,0,2,0,1,0,0,0,0,0,0,0,1,0,3,0,2,0,2,3,0,0,2,2,3,1,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,2,3),
-(2,4,0,5,0,5,0,4,0,3,4,3,3,3,4,3,3,3,4,3,4,4,5,4,5,5,5,2,3,0,5,5,4,1,5,4,3,1,5,4,3,4,4,3,3,4,3,3,0,3,2,0,2,3,0,3,0,0,3,3,0,5,3,2,3,3,0,3,0,3,0,3,4,5,4,5,3,0,4,3,0,3,4),
-(0,3,0,3,0,3,0,3,0,3,3,4,3,2,3,2,3,0,4,3,3,3,3,3,3,3,3,0,3,2,4,3,3,1,3,4,3,4,4,4,3,4,4,3,2,4,4,1,0,2,0,0,1,1,0,2,0,0,3,1,0,5,3,2,1,3,0,3,0,1,2,4,3,2,4,3,3,0,3,2,0,4,4),
-(0,3,0,3,0,1,0,0,0,1,4,3,3,2,3,1,3,1,4,2,3,2,4,2,3,4,3,0,2,2,3,3,3,0,3,3,3,0,3,4,1,3,3,0,3,4,3,3,0,1,1,0,1,0,0,0,4,0,3,0,0,3,1,2,1,3,0,4,0,1,0,4,3,3,4,3,3,0,2,0,0,3,3),
-(0,3,0,4,0,1,0,3,0,3,4,3,3,0,3,3,3,1,3,1,3,3,4,3,3,3,0,0,3,1,5,3,3,1,3,3,2,5,4,3,3,4,5,3,2,5,3,4,0,1,0,0,0,0,0,2,0,0,1,1,0,4,2,2,1,3,0,3,0,2,0,4,4,3,5,3,2,0,1,1,0,3,4),
-(0,5,0,4,0,5,0,2,0,4,4,3,3,2,3,3,3,1,4,3,4,1,5,3,4,3,4,0,4,2,4,3,4,1,5,4,0,4,4,4,4,5,4,1,3,5,4,2,1,4,1,1,3,2,0,3,1,0,3,2,1,4,3,3,3,4,0,4,0,3,0,4,4,4,3,3,3,0,4,2,0,3,4),
-(1,4,0,4,0,3,0,1,0,3,3,3,1,1,3,3,2,2,3,3,1,0,3,2,2,1,2,0,3,1,2,1,2,0,3,2,0,2,2,3,3,4,3,0,3,3,1,2,0,1,1,3,1,2,0,0,3,0,1,1,0,3,2,2,3,3,0,3,0,0,0,2,3,3,4,3,3,0,1,0,0,1,4),
-(0,4,0,4,0,4,0,0,0,3,4,4,3,1,4,2,3,2,3,3,3,1,4,3,4,0,3,0,4,2,3,3,2,2,5,4,2,1,3,4,3,4,3,1,3,3,4,2,0,2,1,0,3,3,0,0,2,0,3,1,0,4,4,3,4,3,0,4,0,1,0,2,4,4,4,4,4,0,3,2,0,3,3),
-(0,0,0,1,0,4,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,3,2,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,2),
-(0,2,0,3,0,4,0,4,0,1,3,3,3,0,4,0,2,1,2,1,1,1,2,0,3,1,1,0,1,0,3,1,0,0,3,3,2,0,1,1,0,0,0,0,0,1,0,2,0,2,2,0,3,1,0,0,1,0,1,1,0,1,2,0,3,0,0,0,0,1,0,0,3,3,4,3,1,0,1,0,3,0,2),
-(0,0,0,3,0,5,0,0,0,0,1,0,2,0,3,1,0,1,3,0,0,0,2,0,0,0,1,0,0,0,1,1,0,0,4,0,0,0,2,3,0,1,4,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,0,0,0,0,0,0,0,2,0,0,3,0,0,0,0,0,3),
-(0,2,0,5,0,5,0,1,0,2,4,3,3,2,5,1,3,2,3,3,3,0,4,1,2,0,3,0,4,0,2,2,1,1,5,3,0,0,1,4,2,3,2,0,3,3,3,2,0,2,4,1,1,2,0,1,1,0,3,1,0,1,3,1,2,3,0,2,0,0,0,1,3,5,4,4,4,0,3,0,0,1,3),
-(0,4,0,5,0,4,0,4,0,4,5,4,3,3,4,3,3,3,4,3,4,4,5,3,4,5,4,2,4,2,3,4,3,1,4,4,1,3,5,4,4,5,5,4,4,5,5,5,2,3,3,1,4,3,1,3,3,0,3,3,1,4,3,4,4,4,0,3,0,4,0,3,3,4,4,5,0,0,4,3,0,4,5),
-(0,4,0,4,0,3,0,3,0,3,4,4,4,3,3,2,4,3,4,3,4,3,5,3,4,3,2,1,4,2,4,4,3,1,3,4,2,4,5,5,3,4,5,4,1,5,4,3,0,3,2,2,3,2,1,3,1,0,3,3,3,5,3,3,3,5,4,4,2,3,3,4,3,3,3,2,1,0,3,2,1,4,3),
-(0,4,0,5,0,4,0,3,0,3,5,5,3,2,4,3,4,0,5,4,4,1,4,4,4,3,3,3,4,3,5,5,2,3,3,4,1,2,5,5,3,5,5,2,3,5,5,4,0,3,2,0,3,3,1,1,5,1,4,1,0,4,3,2,3,5,0,4,0,3,0,5,4,3,4,3,0,0,4,1,0,4,4),
-(1,3,0,4,0,2,0,2,0,2,5,5,3,3,3,3,3,0,4,2,3,4,4,4,3,4,0,0,3,4,5,4,3,3,3,3,2,5,5,4,5,5,5,4,3,5,5,5,1,3,1,0,1,0,0,3,2,0,4,2,0,5,2,3,2,4,1,3,0,3,0,4,5,4,5,4,3,0,4,2,0,5,4),
-(0,3,0,4,0,5,0,3,0,3,4,4,3,2,3,2,3,3,3,3,3,2,4,3,3,2,2,0,3,3,3,3,3,1,3,3,3,0,4,4,3,4,4,1,1,4,4,2,0,3,1,0,1,1,0,4,1,0,2,3,1,3,3,1,3,4,0,3,0,1,0,3,1,3,0,0,1,0,2,0,0,4,4),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,3,0,3,0,2,0,3,0,1,5,4,3,3,3,1,4,2,1,2,3,4,4,2,4,4,5,0,3,1,4,3,4,0,4,3,3,3,2,3,2,5,3,4,3,2,2,3,0,0,3,0,2,1,0,1,2,0,0,0,0,2,1,1,3,1,0,2,0,4,0,3,4,4,4,5,2,0,2,0,0,1,3),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,1,0,0,1,1,0,0,0,4,2,1,1,0,1,0,3,2,0,0,3,1,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1,0,0,0,2,0,0,0,1,4,0,4,2,1,0,0,0,0,0,1),
-(0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,1,0,1,0,0,0,0,3,1,0,0,0,2,0,2,1,0,0,1,2,1,0,1,1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1,3,1,0,0,0,0,0,1,0,0,2,1,0,0,0,0,0,0,0,0,2),
-(0,4,0,4,0,4,0,3,0,4,4,3,4,2,4,3,2,0,4,4,4,3,5,3,5,3,3,2,4,2,4,3,4,3,1,4,0,2,3,4,4,4,3,3,3,4,4,4,3,4,1,3,4,3,2,1,2,1,3,3,3,4,4,3,3,5,0,4,0,3,0,4,3,3,3,2,1,0,3,0,0,3,3),
-(0,4,0,3,0,3,0,3,0,3,5,5,3,3,3,3,4,3,4,3,3,3,4,4,4,3,3,3,3,4,3,5,3,3,1,3,2,4,5,5,5,5,4,3,4,5,5,3,2,2,3,3,3,3,2,3,3,1,2,3,2,4,3,3,3,4,0,4,0,2,0,4,3,2,2,1,2,0,3,0,0,4,1),
-)
-
-class JapaneseContextAnalysis:
-    def __init__(self):
-        self.reset()
-        
-    def reset(self):
-        self._mTotalRel = 0 # total sequence received
-        self._mRelSample = [0] * NUM_OF_CATEGORY # category counters, each interger counts sequence in its category
-        self._mNeedToSkipCharNum = 0 # if last byte in current buffer is not the last byte of a character, we need to know how many bytes to skip in next buffer
-        self._mLastCharOrder = -1 # The order of previous char
-        self._mDone = False # If this flag is set to True, detection is done and conclusion has been made
-
-    def feed(self, aBuf, aLen):
-        if self._mDone: return
-        
-        # The buffer we got is byte oriented, and a character may span in more than one
-        # buffers. In case the last one or two byte in last buffer is not complete, we 
-        # record how many byte needed to complete that character and skip these bytes here.
-        # We can choose to record those bytes as well and analyse the character once it 
-        # is complete, but since a character will not make much difference, by simply skipping
-        # this character will simply our logic and improve performance.
-        i = self._mNeedToSkipCharNum
-        while i < aLen:
-            order, charLen = self.get_order(aBuf[i:i+2])
-            i += charLen
-            if i > aLen:
-                self._mNeedToSkipCharNum = i - aLen
-                self._mLastCharOrder = -1
-            else:
-                if (order != -1) and (self._mLastCharOrder != -1):
-                    self._mTotalRel += 1
-                    if self._mTotalRel > MAX_REL_THRESHOLD:
-                        self._mDone = True
-                        break
-                    self._mRelSample[jp2CharContext[self._mLastCharOrder][order]] += 1
-                self._mLastCharOrder = order
-
-    def got_enough_data(self):
-        return self._mTotalRel > ENOUGH_REL_THRESHOLD
-    
-    def get_confidence(self):
-        # This is just one way to calculate confidence. It works well for me.
-        if self._mTotalRel > MINIMUM_DATA_THRESHOLD:
-            return (self._mTotalRel - self._mRelSample[0]) / self._mTotalRel
-        else:
-            return DONT_KNOW
-
-    def get_order(self, aBuf):
-        return -1, 1
-        
-class SJISContextAnalysis(JapaneseContextAnalysis):
-    def get_order(self, aBuf):
-        if not aBuf: return -1, 1
-        # find out current char's byte length
-        if ((aBuf[0] >= 0x81) and (aBuf[0] <= 0x9F)) or \
-           ((aBuf[0] >= 0xE0) and (aBuf[0] <= 0xFC)):
-            charLen = 2
-        else:
-            charLen = 1
-
-        # return its order if it is hiragana
-        if len(aBuf) > 1:
-            if (aBuf[0] == 202) and \
-               (aBuf[1] >= 0x9F) and \
-               (aBuf[1] <= 0xF1):
-                return aBuf[1] - 0x9F, charLen
-
-        return -1, charLen
-
-class EUCJPContextAnalysis(JapaneseContextAnalysis):
-    def get_order(self, aBuf):
-        if not aBuf: return -1, 1
-        # find out current char's byte length
-        if (aBuf[0] == 0x8E) or \
-           ((aBuf[0] >= 0xA1) and (aBuf[0] <= 0xFE)):
-            charLen = 2
-        elif aBuf[0] == 0x8F:
-            charLen = 3
-        else:
-            charLen = 1
-
-        # return its order if it is hiragana
-        if len(aBuf) > 1:
-            if (aBuf[0] == 0xA4) and \
-               (aBuf[1] >= 0xA1) and \
-               (aBuf[1] <= 0xF3):
-                return aBuf[1] - 0xA1, charLen
-
-        return -1, charLen
diff --git a/lib/requests/packages/chardet2/langbulgarianmodel.py b/lib/requests/packages/chardet2/langbulgarianmodel.py
deleted file mode 100755
index c6c3c95..0000000
--- a/lib/requests/packages/chardet2/langbulgarianmodel.py
+++ /dev/null
@@ -1,228 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Character Mapping Table:
-# this table is modified base on win1251BulgarianCharToOrderMap, so 
-# only number <64 is sure valid
-
-Latin5_BulgarianCharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82,  # 40
-110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253,  # 50
-253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71,  # 60
-116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253,  # 70
-194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,  # 80
-210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,  # 90
- 81,226,227,228,229,230,105,231,232,233,234,235,236, 45,237,238,  # a0
- 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30,  # b0
- 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,239, 67,240, 60, 56,  # c0
-  1, 18,  9, 20, 11,  3, 23, 15,  2, 26, 12, 10, 14,  6,  4, 13,  # d0
-  7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,241, 42, 16,  # e0
- 62,242,243,244, 58,245, 98,246,247,248,249,250,251, 91,252,253,  # f0
-)
-
-win1251BulgarianCharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82,  # 40
-110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253,  # 50
-253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71,  # 60
-116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253,  # 70
-206,207,208,209,210,211,212,213,120,214,215,216,217,218,219,220,  # 80
-221, 78, 64, 83,121, 98,117,105,222,223,224,225,226,227,228,229,  # 90
- 88,230,231,232,233,122, 89,106,234,235,236,237,238, 45,239,240,  # a0
- 73, 80,118,114,241,242,243,244,245, 62, 58,246,247,248,249,250,  # b0
- 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30,  # c0
- 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,251, 67,252, 60, 56,  # d0
-  1, 18,  9, 20, 11,  3, 23, 15,  2, 26, 12, 10, 14,  6,  4, 13,  # e0
-  7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,253, 42, 16,  # f0
-)
-
-# Model Table: 
-# total sequences: 100%
-# first 512 sequences: 96.9392%
-# first 1024 sequences:3.0618%
-# rest  sequences:     0.2992%
-# negative sequences:  0.0020% 
-BulgarianLangModel = ( \
-0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,3,3,3,3,3,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,2,2,1,2,2,
-3,1,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,0,1,
-0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,3,3,0,3,1,0,
-0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,2,3,2,2,1,3,3,3,3,2,2,2,1,1,2,0,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,2,3,2,2,3,3,1,1,2,3,3,2,3,3,3,3,2,1,2,0,2,0,3,0,0,
-0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,1,3,3,3,3,3,2,3,2,3,3,3,3,3,2,3,3,1,3,0,3,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,1,3,3,2,3,3,3,1,3,3,2,3,2,2,2,0,0,2,0,2,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,3,3,1,2,2,3,2,1,1,2,0,2,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,2,3,3,1,2,3,2,2,2,3,3,3,3,3,2,2,3,1,2,0,2,1,2,0,0,
-0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,1,3,3,3,3,3,2,3,3,3,2,3,3,2,3,2,2,2,3,1,2,0,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,3,3,1,1,1,2,2,1,3,1,3,2,2,3,0,0,1,0,1,0,1,0,0,
-0,0,0,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,2,2,3,2,2,3,1,2,1,1,1,2,3,1,3,1,2,2,0,1,1,1,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,1,3,2,2,3,3,1,2,3,1,1,3,3,3,3,1,2,2,1,1,1,0,2,0,2,0,1,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,2,2,3,3,3,2,2,1,1,2,0,2,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,0,1,2,1,3,3,2,3,3,3,3,3,2,3,2,1,0,3,1,2,1,2,1,2,3,2,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,2,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,1,3,3,2,3,3,2,2,2,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,0,3,3,3,3,3,2,1,1,2,1,3,3,0,3,1,1,1,1,3,2,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,1,1,3,1,3,3,2,3,2,2,2,3,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,2,3,3,2,2,3,2,1,1,1,1,1,3,1,3,1,1,0,0,0,1,0,0,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,2,3,2,0,3,2,0,3,0,2,0,0,2,1,3,1,0,0,1,0,0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,2,1,1,1,1,2,1,1,2,1,1,1,2,2,1,2,1,1,1,0,1,1,0,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,2,1,3,1,1,2,1,3,2,1,1,0,1,2,3,2,1,1,1,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,2,2,1,0,1,0,0,1,0,0,0,2,1,0,3,0,0,1,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,2,3,2,3,3,1,3,2,1,1,1,2,1,1,2,1,3,0,1,0,0,0,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,2,2,3,3,2,3,2,2,2,3,1,2,2,1,1,2,1,1,2,2,0,1,1,0,1,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,1,3,1,0,2,2,1,3,2,1,0,0,2,0,2,0,1,0,0,0,0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,1,2,0,2,3,1,2,3,2,0,1,3,1,2,1,1,1,0,0,1,0,0,2,2,2,3,
-2,2,2,2,1,2,1,1,2,2,1,1,2,0,1,1,1,0,0,1,1,0,0,1,1,0,0,0,1,1,0,1,
-3,3,3,3,3,2,1,2,2,1,2,0,2,0,1,0,1,2,1,2,1,1,0,0,0,1,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,2,3,3,1,1,3,1,0,3,2,1,0,0,0,1,2,0,2,0,1,0,0,0,1,0,1,2,1,2,2,
-1,1,1,1,1,1,1,2,2,2,1,1,1,1,1,1,1,0,1,2,1,1,1,0,0,0,0,0,1,1,0,0,
-3,1,0,1,0,2,3,2,2,2,3,2,2,2,2,2,1,0,2,1,2,1,1,1,0,1,2,1,2,2,2,1,
-1,1,2,2,2,2,1,2,1,1,0,1,2,1,2,2,2,1,1,1,0,1,1,1,1,2,0,1,0,0,0,0,
-2,3,2,3,3,0,0,2,1,0,2,1,0,0,0,0,2,3,0,2,0,0,0,0,0,1,0,0,2,0,1,2,
-2,1,2,1,2,2,1,1,1,2,1,1,1,0,1,2,2,1,1,1,1,1,0,1,1,1,0,0,1,2,0,0,
-3,3,2,2,3,0,2,3,1,1,2,0,0,0,1,0,0,2,0,2,0,0,0,1,0,1,0,1,2,0,2,2,
-1,1,1,1,2,1,0,1,2,2,2,1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,1,0,0,
-2,3,2,3,3,0,0,3,0,1,1,0,1,0,0,0,2,2,1,2,0,0,0,0,0,0,0,0,2,0,1,2,
-2,2,1,1,1,1,1,2,2,2,1,0,2,0,1,0,1,0,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
-3,3,3,3,2,2,2,2,2,0,2,1,1,1,1,2,1,2,1,1,0,2,0,1,0,1,0,0,2,0,1,2,
-1,1,1,1,1,1,1,2,2,1,1,0,2,0,1,0,2,0,0,1,1,1,0,0,2,0,0,0,1,1,0,0,
-2,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,0,0,0,1,2,0,1,2,
-2,2,2,1,1,2,1,1,2,2,2,1,2,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,1,1,0,0,
-2,3,3,3,3,0,2,2,0,2,1,0,0,0,1,1,1,2,0,2,0,0,0,3,0,0,0,0,2,0,2,2,
-1,1,1,2,1,2,1,1,2,2,2,1,2,0,1,1,1,0,1,1,1,1,0,2,1,0,0,0,1,1,0,0,
-2,3,3,3,3,0,2,1,0,0,2,0,0,0,0,0,1,2,0,2,0,0,0,0,0,0,0,0,2,0,1,2,
-1,1,1,2,1,1,1,1,2,2,2,0,1,0,1,1,1,0,0,1,1,1,0,0,1,0,0,0,0,1,0,0,
-3,3,2,2,3,0,1,0,1,0,0,0,0,0,0,0,1,1,0,3,0,0,0,0,0,0,0,0,1,0,2,2,
-1,1,1,1,1,2,1,1,2,2,1,2,2,1,0,1,1,1,1,1,0,1,0,0,1,0,0,0,1,1,0,0,
-3,1,0,1,0,2,2,2,2,3,2,1,1,1,2,3,0,0,1,0,2,1,1,0,1,1,1,1,2,1,1,1,
-1,2,2,1,2,1,2,2,1,1,0,1,2,1,2,2,1,1,1,0,0,1,1,1,2,1,0,1,0,0,0,0,
-2,1,0,1,0,3,1,2,2,2,2,1,2,2,1,1,1,0,2,1,2,2,1,1,2,1,1,0,2,1,1,1,
-1,2,2,2,2,2,2,2,1,2,0,1,1,0,2,1,1,1,1,1,0,0,1,1,1,1,0,1,0,0,0,0,
-2,1,1,1,1,2,2,2,2,1,2,2,2,1,2,2,1,1,2,1,2,3,2,2,1,1,1,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,3,2,0,1,2,0,1,2,1,1,0,1,0,1,2,1,2,0,0,0,1,1,0,0,0,1,0,0,2,
-1,1,0,0,1,1,0,1,1,1,1,0,2,0,1,1,1,0,0,1,1,0,0,0,0,1,0,0,0,1,0,0,
-2,0,0,0,0,1,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,2,1,1,1,
-1,2,2,2,2,1,1,2,1,2,1,1,1,0,2,1,2,1,1,1,0,2,1,1,1,1,0,1,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
-1,1,0,1,0,1,1,1,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,3,2,0,0,0,0,1,0,0,0,0,0,0,1,1,0,2,0,0,0,0,0,0,0,0,1,0,1,2,
-1,1,1,1,1,1,0,0,2,2,2,2,2,0,1,1,0,1,1,1,1,1,0,0,1,0,0,0,1,1,0,1,
-2,3,1,2,1,0,1,1,0,2,2,2,0,0,1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,2,
-1,1,1,1,2,1,1,1,1,1,1,1,1,0,1,1,0,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
-2,2,2,2,2,0,0,2,0,0,2,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,0,2,2,
-1,1,1,1,1,0,0,1,2,1,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,0,2,0,1,1,0,0,0,1,0,0,2,0,2,0,0,0,0,0,0,0,0,0,0,1,1,
-0,0,0,1,1,1,1,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,3,2,0,0,1,0,0,1,0,0,0,0,0,0,1,0,2,0,0,0,1,0,0,0,0,0,0,0,2,
-1,1,0,0,1,0,0,0,1,1,0,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,1,2,2,2,1,2,1,2,2,1,1,2,1,1,1,0,1,1,1,1,2,0,1,0,1,1,1,1,0,1,1,
-1,1,2,1,1,1,1,1,1,0,0,1,2,1,1,1,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,
-1,0,0,1,3,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,1,0,0,1,0,2,0,0,0,0,0,1,1,1,0,1,0,0,0,0,0,0,0,0,2,0,0,1,
-0,2,0,1,0,0,1,1,2,0,1,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,1,1,0,2,1,0,1,1,1,0,0,1,0,2,0,1,0,0,0,0,0,0,0,0,0,1,
-0,1,0,0,1,0,0,0,1,1,0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,2,0,0,1,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
-0,1,0,1,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,0,1,0,0,1,2,1,1,1,1,1,1,2,2,1,0,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,
-1,1,2,1,1,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,1,2,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
-0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-0,1,1,0,1,1,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
-1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,2,0,0,2,0,1,0,0,1,0,0,1,
-1,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
-1,1,1,1,1,1,1,2,0,0,0,0,0,0,2,1,0,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,1,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-)
-
-Latin5BulgarianModel = { \
-  'charToOrderMap': Latin5_BulgarianCharToOrderMap,
-  'precedenceMatrix': BulgarianLangModel,
-  'mTypicalPositiveRatio': 0.969392,
-  'keepEnglishLetter': False,
-  'charsetName': "ISO-8859-5"
-}
-
-Win1251BulgarianModel = { \
-  'charToOrderMap': win1251BulgarianCharToOrderMap,
-  'precedenceMatrix': BulgarianLangModel,
-  'mTypicalPositiveRatio': 0.969392,
-  'keepEnglishLetter': False,
-  'charsetName': "windows-1251"
-}
diff --git a/lib/requests/packages/chardet2/langcyrillicmodel.py b/lib/requests/packages/chardet2/langcyrillicmodel.py
deleted file mode 100755
index ab051f2..0000000
--- a/lib/requests/packages/chardet2/langcyrillicmodel.py
+++ /dev/null
@@ -1,329 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-# KOI8-R language model
-# Character Mapping Table:
-KOI8R_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,  # 80
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,  # 90
-223,224,225, 68,226,227,228,229,230,231,232,233,234,235,236,237,  # a0
-238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,  # b0
- 27,  3, 21, 28, 13,  2, 39, 19, 26,  4, 23, 11,  8, 12,  5,  1,  # c0
- 15, 16,  9,  7,  6, 14, 24, 10, 17, 18, 20, 25, 30, 29, 22, 54,  # d0
- 59, 37, 44, 58, 41, 48, 53, 46, 55, 42, 60, 36, 49, 38, 31, 34,  # e0
- 35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70,  # f0
-)
-
-win1251_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
-239,240,241,242,243,244,245,246, 68,247,248,249,250,251,252,253,
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
-  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
-  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
-)
-
-latin5_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
-  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
-  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
-239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
-)
-
-macCyrillic_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
-239,240,241,242,243,244,245,246,247,248,249,250,251,252, 68, 16,
-  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
-  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27,255,
-)
-
-IBM855_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
-191,192,193,194, 68,195,196,197,198,199,200,201,202,203,204,205,
-206,207,208,209,210,211,212,213,214,215,216,217, 27, 59, 54, 70,
-  3, 37, 21, 44, 28, 58, 13, 41,  2, 48, 39, 53, 19, 46,218,219,
-220,221,222,223,224, 26, 55,  4, 42,225,226,227,228, 23, 60,229,
-230,231,232,233,234,235, 11, 36,236,237,238,239,240,241,242,243,
-  8, 49, 12, 38,  5, 31,  1, 34, 15,244,245,246,247, 35, 16,248,
- 43,  9, 45,  7, 32,  6, 40, 14, 52, 24, 56, 10, 33, 17, 61,249,
-250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50,251,252,255,
-)
-
-IBM866_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
-  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
-  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
-239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
-)
-
-# Model Table: 
-# total sequences: 100%
-# first 512 sequences: 97.6601%
-# first 1024 sequences: 2.3389%
-# rest  sequences:      0.1237%
-# negative sequences:   0.0009% 
-RussianLangModel = ( \
-0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,1,3,3,3,2,3,2,3,3,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,2,2,2,2,2,0,0,2,
-3,3,3,2,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,2,3,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,2,2,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,2,3,3,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
-0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
-0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,2,2,2,3,1,3,3,1,3,3,3,3,2,2,3,0,2,2,2,3,3,2,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,3,3,3,2,2,3,2,3,3,3,2,1,2,2,0,1,2,2,2,2,2,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,3,0,2,2,3,3,2,1,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,1,2,3,2,2,3,2,3,3,3,3,2,2,3,0,3,2,2,3,1,1,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,3,3,3,3,2,2,2,0,3,3,3,2,2,2,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,2,3,2,2,0,1,3,2,1,2,2,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,2,1,1,3,0,1,1,1,1,2,1,1,0,2,2,2,1,2,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,2,2,2,2,1,3,2,3,2,3,2,1,2,2,0,1,1,2,1,2,1,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,2,3,3,3,2,2,2,2,0,2,2,2,2,3,1,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,2,3,2,2,3,3,3,3,3,3,3,3,3,1,3,2,0,0,3,3,3,3,2,3,3,3,3,2,3,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,3,2,2,3,3,0,2,1,0,3,2,3,2,3,0,0,1,2,0,0,1,0,1,2,1,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,3,0,2,3,3,3,3,2,3,3,3,3,1,2,2,0,0,2,3,2,2,2,3,2,3,2,2,3,0,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,0,2,3,2,3,0,1,2,3,3,2,0,2,3,0,0,2,3,2,2,0,1,3,1,3,2,2,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,3,0,2,3,3,3,3,3,3,3,3,2,1,3,2,0,0,2,2,3,3,3,2,3,3,0,2,2,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,2,3,3,2,2,2,3,3,0,0,1,1,1,1,1,2,0,0,1,1,1,1,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,2,3,3,3,3,3,3,3,0,3,2,3,3,2,3,2,0,2,1,0,1,1,0,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,3,2,2,2,2,3,1,3,2,3,1,1,2,1,0,2,2,2,2,1,3,1,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-2,2,3,3,3,3,3,1,2,2,1,3,1,0,3,0,0,3,0,0,0,1,1,0,1,2,1,0,0,0,0,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,2,1,1,3,3,3,2,2,1,2,2,3,1,1,2,0,0,2,2,1,3,0,0,2,1,1,2,1,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,3,3,3,1,2,2,2,1,2,1,3,3,1,1,2,1,2,1,2,2,0,2,0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,3,2,1,3,2,2,3,2,0,3,2,0,3,0,1,0,1,1,0,0,1,1,1,1,0,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,2,3,3,3,2,2,2,3,3,1,2,1,2,1,0,1,0,1,1,0,1,0,0,2,1,1,1,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-3,1,1,2,1,2,3,3,2,2,1,2,2,3,0,2,1,0,0,2,2,3,2,1,2,2,2,2,2,3,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,1,1,0,1,1,2,2,1,1,3,0,0,1,3,1,1,1,0,0,0,1,0,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,3,3,3,2,0,0,0,2,1,0,1,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,1,0,0,2,3,2,2,2,1,2,2,2,1,2,1,0,0,1,1,1,0,2,0,1,1,1,0,0,1,1,
-1,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,0,0,0,0,1,0,0,0,0,3,0,1,2,1,0,0,0,0,0,0,0,1,1,0,0,1,1,
-1,0,1,0,1,2,0,0,1,1,2,1,0,1,1,1,1,0,1,1,1,1,0,1,0,0,1,0,0,1,1,0,
-2,2,3,2,2,2,3,1,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,0,1,0,1,1,1,0,2,1,
-1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,0,1,1,0,
-3,3,3,2,2,2,2,3,2,2,1,1,2,2,2,2,1,1,3,1,2,1,2,0,0,1,1,0,1,0,2,1,
-1,1,1,1,1,2,1,0,1,1,1,1,0,1,0,0,1,1,0,0,1,0,1,0,0,1,0,0,0,1,1,0,
-2,0,0,1,0,3,2,2,2,2,1,2,1,2,1,2,0,0,0,2,1,2,2,1,1,2,2,0,1,1,0,2,
-1,1,1,1,1,0,1,1,1,2,1,1,1,2,1,0,1,2,1,1,1,1,0,1,1,1,0,0,1,0,0,1,
-1,3,2,2,2,1,1,1,2,3,0,0,0,0,2,0,2,2,1,0,0,0,0,0,0,1,0,0,0,0,1,1,
-1,0,1,1,0,1,0,1,1,0,1,1,0,2,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
-2,3,2,3,2,1,2,2,2,2,1,0,0,0,2,0,0,1,1,0,0,0,0,0,0,0,1,1,0,0,2,1,
-1,1,2,1,0,2,0,0,1,0,1,0,0,1,0,0,1,1,0,1,1,0,0,0,0,0,1,0,0,0,0,0,
-3,0,0,1,0,2,2,2,3,2,2,2,2,2,2,2,0,0,0,2,1,2,1,1,1,2,2,0,0,0,1,2,
-1,1,1,1,1,0,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,1,
-2,3,2,3,3,2,0,1,1,1,0,0,1,0,2,0,1,1,3,1,0,0,0,0,0,0,0,1,0,0,2,1,
-1,1,1,1,1,1,1,0,1,0,1,1,1,1,0,1,1,1,0,0,1,1,0,1,0,0,0,0,0,0,1,0,
-2,3,3,3,3,1,2,2,2,2,0,1,1,0,2,1,1,1,2,1,0,1,1,0,0,1,0,1,0,0,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,2,0,0,1,1,2,2,1,0,0,2,0,1,1,3,0,0,1,0,0,0,0,0,1,0,1,2,1,
-1,1,2,0,1,1,1,0,1,0,1,1,0,1,0,1,1,1,1,0,1,0,0,0,0,0,0,1,0,1,1,0,
-1,3,2,3,2,1,0,0,2,2,2,0,1,0,2,0,1,1,1,0,1,0,0,0,3,0,1,1,0,0,2,1,
-1,1,1,0,1,1,0,0,0,0,1,1,0,1,0,0,2,1,1,0,1,0,0,0,1,0,1,0,0,1,1,0,
-3,1,2,1,1,2,2,2,2,2,2,1,2,2,1,1,0,0,0,2,2,2,0,0,0,1,2,1,0,1,0,1,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,2,1,1,1,0,1,0,1,1,0,1,1,1,0,0,1,
-3,0,0,0,0,2,0,1,1,1,1,1,1,1,0,1,0,0,0,1,1,1,0,1,0,1,1,0,0,1,0,1,
-1,1,0,0,1,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,1,
-1,3,3,2,2,0,0,0,2,2,0,0,0,1,2,0,1,1,2,0,0,0,0,0,0,0,0,1,0,0,2,1,
-0,1,1,0,0,1,1,0,0,0,1,1,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
-2,3,2,3,2,0,0,0,0,1,1,0,0,0,2,0,2,0,2,0,0,0,0,0,1,0,0,1,0,0,1,1,
-1,1,2,0,1,2,1,0,1,1,2,1,1,1,1,1,2,1,1,0,1,0,0,1,1,1,1,1,0,1,1,0,
-1,3,2,2,2,1,0,0,2,2,1,0,1,2,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,1,1,
-0,0,1,1,0,1,1,0,0,1,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,0,2,3,1,2,2,2,2,2,2,1,1,0,0,0,1,0,1,0,2,1,1,1,0,0,0,0,1,
-1,1,0,1,1,0,1,1,1,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-2,0,2,0,0,1,0,3,2,1,2,1,2,2,0,1,0,0,0,2,1,0,0,2,1,1,1,1,0,2,0,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,0,0,0,1,1,1,1,0,1,0,0,1,
-1,2,2,2,2,1,0,0,1,0,0,0,0,0,2,0,1,1,1,1,0,0,0,0,1,0,1,2,0,0,2,0,
-1,0,1,1,1,2,1,0,1,0,1,1,0,0,1,0,1,1,1,0,1,0,0,0,1,0,0,1,0,1,1,0,
-2,1,2,2,2,0,3,0,1,1,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-0,0,0,1,1,1,0,0,1,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,
-1,2,2,3,2,2,0,0,1,1,2,0,1,2,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,
-0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
-2,2,1,1,2,1,2,2,2,2,2,1,2,2,0,1,0,0,0,1,2,2,2,1,2,1,1,1,1,1,2,1,
-1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,0,1,
-1,2,2,2,2,0,1,0,2,2,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
-0,0,1,0,0,1,0,0,0,0,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,0,0,2,2,2,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
-0,1,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,0,0,0,1,0,0,1,1,2,0,0,0,0,1,0,1,0,0,1,0,0,2,0,0,0,1,
-0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,1,1,2,0,2,1,1,1,1,0,2,2,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,1,
-0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-1,0,2,1,2,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,
-0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
-1,0,0,0,0,2,0,1,2,1,0,1,1,1,0,1,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,1,
-0,0,0,0,0,1,0,0,1,1,0,0,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,
-2,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,1,0,1,0,1,0,0,1,1,1,1,0,0,0,1,0,0,0,0,1,0,0,0,1,0,1,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,0,1,1,0,1,0,1,0,0,0,0,1,1,0,1,1,0,0,0,0,0,1,0,1,1,0,1,0,0,0,
-0,1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-)
-
-Koi8rModel = { \
-  'charToOrderMap': KOI8R_CharToOrderMap,
-  'precedenceMatrix': RussianLangModel,
-  'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': False,
-  'charsetName': "KOI8-R"
-}
-
-Win1251CyrillicModel = { \
-  'charToOrderMap': win1251_CharToOrderMap,
-  'precedenceMatrix': RussianLangModel,
-  'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': False,
-  'charsetName': "windows-1251"
-}
-
-Latin5CyrillicModel = { \
-  'charToOrderMap': latin5_CharToOrderMap,
-  'precedenceMatrix': RussianLangModel,
-  'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': False,
-  'charsetName': "ISO-8859-5"
-}
-
-MacCyrillicModel = { \
-  'charToOrderMap': macCyrillic_CharToOrderMap,
-  'precedenceMatrix': RussianLangModel,
-  'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': False,
-  'charsetName': "MacCyrillic"
-};
-
-Ibm866Model = { \
-  'charToOrderMap': IBM866_CharToOrderMap,
-  'precedenceMatrix': RussianLangModel,
-  'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': False,
-  'charsetName': "IBM866"
-}
-
-Ibm855Model = { \
-  'charToOrderMap': IBM855_CharToOrderMap,
-  'precedenceMatrix': RussianLangModel,
-  'mTypicalPositiveRatio': 0.976601,
-  'keepEnglishLetter': False,
-  'charsetName': "IBM855"
-}
diff --git a/lib/requests/packages/chardet2/langgreekmodel.py b/lib/requests/packages/chardet2/langgreekmodel.py
deleted file mode 100755
index 496df03..0000000
--- a/lib/requests/packages/chardet2/langgreekmodel.py
+++ /dev/null
@@ -1,225 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Character Mapping Table:
-Latin7_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85,  # 40
- 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253,  # 50
-253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55,  # 60
- 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253,  # 70
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 80
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 90
-253,233, 90,253,253,253,253,253,253,253,253,253,253, 74,253,253,  # a0
-253,253,253,253,247,248, 61, 36, 46, 71, 73,253, 54,253,108,123,  # b0
-110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39,  # c0
- 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15,  # d0
-124,  1, 29, 20, 21,  3, 32, 13, 25,  5, 11, 16, 10,  6, 30,  4,  # e0
-  9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
-)
-
-win1253_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85,  # 40
- 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253,  # 50
-253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55,  # 60
- 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253,  # 70
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 80
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 90
-253,233, 61,253,253,253,253,253,253,253,253,253,253, 74,253,253,  # a0
-253,253,253,253,247,253,253, 36, 46, 71, 73,253, 54,253,108,123,  # b0
-110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39,  # c0
- 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15,  # d0
-124,  1, 29, 20, 21,  3, 32, 13, 25,  5, 11, 16, 10,  6, 30,  4,  # e0
-  9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
-)
-
-# Model Table: 
-# total sequences: 100%
-# first 512 sequences: 98.2851%
-# first 1024 sequences:1.7001%
-# rest  sequences:     0.0359%
-# negative sequences:  0.0148% 
-GreekLangModel = ( \
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,2,2,3,3,3,3,3,3,3,3,1,3,3,3,0,2,2,3,3,0,3,0,3,2,0,3,3,3,0,
-3,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,0,3,3,0,3,2,3,3,0,3,2,3,3,3,0,0,3,0,3,0,3,3,2,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
-0,2,3,2,2,3,3,3,3,3,3,3,3,0,3,3,3,3,0,2,3,3,0,3,3,3,3,2,3,3,3,0,
-2,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,2,1,3,3,3,3,2,3,3,2,3,3,2,0,
-0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,2,3,3,0,
-2,0,1,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,3,0,0,0,0,3,3,0,3,1,3,3,3,0,3,3,0,3,3,3,3,0,0,0,0,
-2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,0,3,0,3,3,3,3,3,0,3,2,2,2,3,0,2,3,3,3,3,3,2,3,3,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,3,2,2,2,3,3,3,3,0,3,1,3,3,3,3,2,3,3,3,3,3,3,3,2,2,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,0,3,0,0,0,3,3,2,3,3,3,3,3,0,0,3,2,3,0,2,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,3,0,0,3,3,0,2,3,0,3,0,3,3,3,0,0,3,0,3,0,2,2,3,3,0,0,
-0,0,1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,0,3,2,3,3,3,3,0,3,3,3,3,3,0,3,3,2,3,2,3,3,2,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,2,3,2,3,3,3,3,3,3,0,2,3,2,3,2,2,2,3,2,3,3,2,3,0,2,2,2,3,0,
-2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,0,3,3,3,2,3,3,0,0,3,0,3,0,0,0,3,2,0,3,0,3,0,0,2,0,2,0,
-0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,0,0,0,3,3,0,3,3,3,0,0,1,2,3,0,
-3,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,0,0,3,2,2,3,3,0,3,3,3,3,3,2,1,3,0,3,2,3,3,2,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,3,0,2,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,3,0,3,2,3,0,0,3,3,3,0,
-3,0,0,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,0,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,2,0,3,2,3,0,0,3,2,3,0,
-2,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,1,2,2,3,3,3,3,3,3,0,2,3,0,3,0,0,0,3,3,0,3,0,2,0,0,2,3,1,0,
-2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,3,0,3,0,3,3,2,3,0,3,3,3,3,3,3,0,3,3,3,0,2,3,0,0,3,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,0,0,3,0,0,0,3,3,0,3,0,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,0,3,3,3,3,3,3,0,0,3,0,2,0,0,0,3,3,0,3,0,3,0,0,2,0,2,0,
-0,0,0,0,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,3,0,3,0,2,0,3,2,0,3,2,3,2,3,0,0,3,2,3,2,3,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,2,3,3,3,3,3,0,0,0,3,0,2,1,0,0,3,2,2,2,0,3,0,0,2,2,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,2,0,3,0,3,0,3,3,0,2,1,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,3,3,3,0,3,3,3,3,3,3,0,2,3,0,3,0,0,0,2,1,0,2,2,3,0,0,2,2,2,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,2,3,3,3,2,3,0,0,1,3,0,2,0,0,0,0,3,0,1,0,2,0,0,1,1,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,1,0,3,0,0,0,3,2,0,3,2,3,3,3,0,0,3,0,3,2,2,2,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,0,0,3,0,0,0,0,2,0,2,3,3,2,2,2,2,3,0,2,0,2,2,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,2,0,0,0,0,0,0,2,3,0,2,0,2,3,2,0,0,3,0,3,0,3,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,3,2,3,3,2,2,3,0,2,0,3,0,0,0,2,0,0,0,0,1,2,0,2,0,2,0,
-0,2,0,2,0,2,2,0,0,1,0,2,2,2,0,2,2,2,0,2,2,2,0,0,2,0,0,1,0,0,0,0,
-0,2,0,3,3,2,0,0,0,0,0,0,1,3,0,2,0,2,2,2,0,0,2,0,3,0,0,2,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,2,3,2,0,2,2,0,2,0,2,2,0,2,0,2,2,2,0,0,0,0,0,0,2,3,0,0,0,2,
-0,1,2,0,0,0,0,2,2,0,0,0,2,1,0,2,2,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,
-0,0,2,1,0,2,3,2,2,3,2,3,2,0,0,3,3,3,0,0,3,2,0,0,0,1,1,0,2,0,2,2,
-0,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2,2,2,0,0,2,0,0,0,2,0,1,0,0,0,0,
-0,3,0,3,3,2,2,0,3,0,0,0,2,2,0,2,2,2,1,2,0,0,1,2,2,0,0,3,0,0,0,2,
-0,1,2,0,0,0,1,2,0,0,0,0,0,0,0,2,2,0,1,0,0,2,0,0,0,2,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,3,3,2,2,0,0,0,2,0,2,3,3,0,2,0,0,0,0,0,0,2,2,2,0,2,2,0,2,0,2,
-0,2,2,0,0,2,2,2,2,1,0,0,2,2,0,2,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,
-0,2,0,3,2,3,0,0,0,3,0,0,2,2,0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,0,2,
-0,0,2,2,0,0,2,2,2,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2,0,0,3,2,0,2,2,2,2,2,0,0,0,2,0,0,0,0,2,0,1,0,0,2,0,1,0,0,0,
-0,2,2,2,0,2,2,0,1,2,0,2,2,2,0,2,2,2,2,1,2,2,0,0,2,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,2,0,2,0,2,2,0,0,0,0,1,2,1,0,0,2,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,3,2,3,0,0,2,0,0,0,2,2,0,2,0,0,0,1,0,0,2,0,2,0,2,2,0,0,0,0,
-0,0,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,
-0,2,2,3,2,2,0,0,0,0,0,0,1,3,0,2,0,2,2,0,0,0,1,0,2,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,0,2,0,3,2,0,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-0,0,2,0,0,0,0,1,1,0,0,2,1,2,0,2,2,0,1,0,0,1,0,0,0,2,0,0,0,0,0,0,
-0,3,0,2,2,2,0,0,2,0,0,0,2,0,0,0,2,3,0,2,0,0,0,0,0,0,2,2,0,0,0,2,
-0,1,2,0,0,0,1,2,2,1,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,1,2,0,2,2,0,2,0,0,2,0,0,0,0,1,2,1,0,2,1,0,0,0,0,0,0,0,0,0,0,
-0,0,2,0,0,0,3,1,2,2,0,2,0,0,0,0,2,0,0,0,2,0,0,3,0,0,0,0,2,2,2,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,1,0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,2,
-0,2,2,0,0,2,2,2,2,2,0,1,2,0,0,0,2,2,0,1,0,2,0,0,2,2,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,0,0,0,0,2,0,2,0,0,0,0,2,
-0,1,2,0,0,0,0,2,2,1,0,1,0,1,0,2,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
-0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,0,0,0,1,0,0,0,0,0,0,2,
-0,2,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,
-0,2,2,2,2,0,0,0,3,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,1,
-0,0,2,0,0,0,0,1,2,0,0,0,0,0,0,2,2,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
-0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,
-0,0,1,0,0,0,0,2,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,3,0,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,2,
-0,0,2,0,0,0,0,2,2,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,0,2,2,1,0,0,0,0,0,0,2,0,0,2,0,2,2,2,0,0,0,0,0,0,2,0,0,0,0,2,
-0,0,2,0,0,2,0,2,2,0,0,0,0,2,0,2,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,
-0,0,3,0,0,0,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,
-0,2,2,2,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
-0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,2,0,0,0,2,0,0,0,0,0,1,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,2,0,0,0,
-0,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,2,0,2,0,0,0,
-0,0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-)
-
-Latin7GreekModel = { \
-  'charToOrderMap': Latin7_CharToOrderMap,
-  'precedenceMatrix': GreekLangModel,
-  'mTypicalPositiveRatio': 0.982851,
-  'keepEnglishLetter': False,
-  'charsetName': "ISO-8859-7"
-}
-
-Win1253GreekModel = { \
-  'charToOrderMap': win1253_CharToOrderMap,
-  'precedenceMatrix': GreekLangModel,
-  'mTypicalPositiveRatio': 0.982851,
-  'keepEnglishLetter': False,
-  'charsetName': "windows-1253"
-}
diff --git a/lib/requests/packages/chardet2/langhebrewmodel.py b/lib/requests/packages/chardet2/langhebrewmodel.py
deleted file mode 100755
index de5415e..0000000
--- a/lib/requests/packages/chardet2/langhebrewmodel.py
+++ /dev/null
@@ -1,201 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-#          Simon Montagu
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#   Shoshannah Forbes - original C code (?)
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Windows-1255 language model
-# Character Mapping Table:
-win1255_CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 69, 91, 79, 80, 92, 89, 97, 90, 68,111,112, 82, 73, 95, 85,  # 40
- 78,121, 86, 71, 67,102,107, 84,114,103,115,253,253,253,253,253,  # 50
-253, 50, 74, 60, 61, 42, 76, 70, 64, 53,105, 93, 56, 65, 54, 49,  # 60
- 66,110, 51, 43, 44, 63, 81, 77, 98, 75,108,253,253,253,253,253,  # 70
-124,202,203,204,205, 40, 58,206,207,208,209,210,211,212,213,214,
-215, 83, 52, 47, 46, 72, 32, 94,216,113,217,109,218,219,220,221,
- 34,116,222,118,100,223,224,117,119,104,125,225,226, 87, 99,227,
-106,122,123,228, 55,229,230,101,231,232,120,233, 48, 39, 57,234,
- 30, 59, 41, 88, 33, 37, 36, 31, 29, 35,235, 62, 28,236,126,237,
-238, 38, 45,239,240,241,242,243,127,244,245,246,247,248,249,250,
-  9,  8, 20, 16,  3,  2, 24, 14, 22,  1, 25, 15,  4, 11,  6, 23,
- 12, 19, 13, 26, 18, 27, 21, 17,  7, 10,  5,251,252,128, 96,253,
-)
-
-# Model Table: 
-# total sequences: 100%
-# first 512 sequences: 98.4004%
-# first 1024 sequences: 1.5981%
-# rest  sequences:      0.087%
-# negative sequences:   0.0015% 
-HebrewLangModel = ( \
-0,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,3,2,1,2,0,1,0,0,
-3,0,3,1,0,0,1,3,2,0,1,1,2,0,2,2,2,1,1,1,1,2,1,1,1,2,0,0,2,2,0,1,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,
-1,2,1,2,1,2,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,
-1,2,1,3,1,1,0,0,2,0,0,0,1,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,1,2,2,1,3,
-1,2,1,1,2,2,0,0,2,2,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,1,0,1,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,2,2,2,3,2,
-1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,3,2,2,3,2,2,2,1,2,2,2,2,
-1,2,1,1,2,2,0,1,2,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,0,2,2,2,2,2,
-0,2,0,2,2,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,0,2,2,2,
-0,2,1,2,2,2,0,0,2,1,0,0,0,0,1,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,2,1,2,3,2,2,2,
-1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,2,0,2,
-0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,2,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,2,2,3,2,1,2,1,1,1,
-0,1,1,1,1,1,3,0,1,0,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,0,1,0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,
-0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,2,1,2,3,3,2,3,3,3,3,2,3,2,1,2,0,2,1,2,
-0,2,0,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,1,2,2,3,3,2,3,2,3,2,2,3,1,2,2,0,2,2,2,
-0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,2,2,3,3,3,3,1,3,2,2,2,
-0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,2,3,2,2,2,1,2,2,0,2,2,2,2,
-0,2,0,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,1,3,2,3,3,2,3,3,2,2,1,2,2,2,2,2,2,
-0,2,1,2,1,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,2,3,3,2,3,3,3,3,2,3,2,3,3,3,3,3,2,2,2,2,2,2,2,1,
-0,2,0,1,2,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,2,1,2,3,3,3,3,3,3,3,2,3,2,3,2,1,2,3,0,2,1,2,2,
-0,2,1,1,2,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,2,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,3,2,1,3,1,2,2,2,1,2,3,3,1,2,1,2,2,2,2,
-0,1,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,0,2,3,3,3,1,3,3,3,1,2,2,2,2,1,1,2,2,2,2,2,2,
-0,2,0,1,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,3,3,2,2,3,3,3,2,1,2,3,2,3,2,2,2,2,1,2,1,1,1,2,2,
-0,2,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,1,0,0,0,0,0,
-1,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,2,3,3,2,3,1,2,2,2,2,3,2,3,1,1,2,2,1,2,2,1,1,0,2,2,2,2,
-0,1,0,1,2,2,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,0,0,1,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,0,
-0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,1,0,1,0,1,1,0,1,1,0,0,0,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-3,2,2,1,2,2,2,2,2,2,2,1,2,2,1,2,2,1,1,1,1,1,1,1,1,2,1,1,0,3,3,3,
-0,3,0,2,2,2,2,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,1,2,2,2,1,1,1,2,0,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,
-0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,1,0,2,1,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-0,3,1,1,2,2,2,2,2,1,2,2,2,1,1,2,2,2,2,2,2,2,1,2,2,1,0,1,1,1,1,0,
-0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,1,1,1,1,2,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
-0,0,2,0,0,0,0,0,0,0,0,1,1,0,0,0,0,1,1,0,0,1,1,0,0,0,0,0,0,1,0,0,
-2,1,1,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,1,2,1,2,1,1,1,1,0,0,0,0,
-0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,1,2,2,2,2,2,2,2,2,2,2,1,2,1,2,1,1,2,1,1,1,2,1,2,1,2,0,1,0,1,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,1,2,2,2,1,2,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,2,1,2,1,1,0,1,0,1,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,
-0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,1,1,1,1,1,1,0,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,1,1,1,0,1,0,0,0,1,1,0,1,1,0,0,0,0,0,1,1,0,0,
-0,1,1,1,2,1,2,2,2,0,2,0,2,0,1,1,2,1,1,1,1,2,1,0,1,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,1,0,0,0,0,0,1,0,1,2,2,0,1,0,0,1,1,2,2,1,2,0,2,0,0,0,1,2,0,1,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,2,1,2,0,2,0,0,1,1,1,1,1,1,0,1,0,0,0,1,0,0,1,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,1,2,2,0,0,1,0,0,0,1,0,0,1,
-1,1,2,1,0,1,1,1,0,1,0,1,1,1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,2,1,
-0,2,0,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,0,0,1,0,1,1,1,1,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,1,0,0,0,1,1,0,1,
-2,0,1,0,1,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,1,0,1,0,0,1,1,2,1,1,2,0,1,0,0,0,1,1,0,1,
-1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,0,0,2,1,1,2,0,2,0,0,0,1,1,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,2,2,1,2,1,1,0,1,0,0,0,1,1,0,1,
-2,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,1,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,2,1,1,1,0,2,1,1,0,0,0,2,1,0,1,
-1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,0,2,1,1,0,1,0,0,0,1,1,0,1,
-2,2,1,1,1,0,1,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,0,1,2,1,0,2,0,0,0,1,1,0,1,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,
-0,1,0,0,2,0,2,1,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,1,0,1,0,0,1,0,0,0,1,0,0,1,
-1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,0,0,0,0,0,1,0,1,1,0,0,1,0,0,2,1,1,1,1,1,0,1,0,0,0,0,1,0,1,
-0,1,1,1,2,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,2,1,0,0,0,0,0,1,1,1,1,1,0,1,0,0,0,1,1,0,0,
-)
-
-Win1255HebrewModel = { \
-  'charToOrderMap': win1255_CharToOrderMap,
-  'precedenceMatrix': HebrewLangModel,
-  'mTypicalPositiveRatio': 0.984004,
-  'keepEnglishLetter': False,
-  'charsetName': "windows-1255"
-}
diff --git a/lib/requests/packages/chardet2/langhungarianmodel.py b/lib/requests/packages/chardet2/langhungarianmodel.py
deleted file mode 100755
index a81f5c4..0000000
--- a/lib/requests/packages/chardet2/langhungarianmodel.py
+++ /dev/null
@@ -1,225 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Character Mapping Table:
-Latin2_HungarianCharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
- 46, 71, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
-253,  2, 18, 26, 17,  1, 27, 12, 20,  9, 22,  7,  6, 13,  4,  8,
- 23, 67, 10,  5,  3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
-159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,
-175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,
-191,192,193,194,195,196,197, 75,198,199,200,201,202,203,204,205,
- 79,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
-221, 51, 81,222, 78,223,224,225,226, 44,227,228,229, 61,230,231,
-232,233,234, 58,235, 66, 59,236,237,238, 60, 69, 63,239,240,241,
- 82, 14, 74,242, 70, 80,243, 72,244, 15, 83, 77, 84, 30, 76, 85,
-245,246,247, 25, 73, 42, 24,248,249,250, 31, 56, 29,251,252,253,
-)
-
-win1250HungarianCharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
- 46, 72, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
-253,  2, 18, 26, 17,  1, 27, 12, 20,  9, 22,  7,  6, 13,  4,  8,
- 23, 67, 10,  5,  3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
-161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,
-177,178,179,180, 78,181, 69,182,183,184,185,186,187,188,189,190,
-191,192,193,194,195,196,197, 76,198,199,200,201,202,203,204,205,
- 81,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
-221, 51, 83,222, 80,223,224,225,226, 44,227,228,229, 61,230,231,
-232,233,234, 58,235, 66, 59,236,237,238, 60, 70, 63,239,240,241,
- 84, 14, 75,242, 71, 82,243, 73,244, 15, 85, 79, 86, 30, 77, 87,
-245,246,247, 25, 74, 42, 24,248,249,250, 31, 56, 29,251,252,253,
-)
-
-# Model Table: 
-# total sequences: 100%
-# first 512 sequences: 94.7368%
-# first 1024 sequences:5.2623%
-# rest  sequences:     0.8894%
-# negative sequences:  0.0009% 
-HungarianLangModel = ( \
-0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,2,3,3,1,1,2,2,2,2,2,1,2,
-3,2,2,3,3,3,3,3,2,3,3,3,3,3,3,1,2,3,3,3,3,2,3,3,1,1,3,3,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
-3,2,1,3,3,3,3,3,2,3,3,3,3,3,1,1,2,3,3,3,3,3,3,3,1,1,3,2,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,1,1,2,3,3,3,1,3,3,3,3,3,1,3,3,2,2,0,3,2,3,
-0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,3,3,2,3,3,2,2,3,2,3,2,0,3,2,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,3,3,3,3,2,3,3,3,1,2,3,2,2,3,1,2,3,3,2,2,0,3,3,3,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,3,2,3,3,3,3,2,3,3,3,3,0,2,3,2,
-0,0,0,1,1,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,1,1,1,3,3,2,1,3,2,2,3,2,1,3,2,2,1,0,3,3,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,2,2,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,3,2,2,3,1,1,3,2,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,1,3,3,3,3,3,2,2,1,3,3,3,0,1,1,2,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,2,0,3,2,3,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,1,3,2,2,2,3,1,1,3,3,1,1,0,3,3,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,2,3,3,3,3,3,1,2,3,2,2,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,2,2,2,3,1,3,3,2,2,1,3,3,3,1,1,3,1,2,3,2,3,2,2,2,1,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
-3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,2,2,3,2,1,0,3,2,0,1,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,1,0,3,3,3,3,0,2,3,0,0,2,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,2,3,3,2,2,2,2,3,3,0,1,2,3,2,3,2,2,3,2,1,2,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
-3,3,3,3,3,3,1,2,3,3,3,2,1,2,3,3,2,2,2,3,2,3,3,1,3,3,1,1,0,2,3,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,1,2,2,2,2,3,3,3,1,1,1,3,3,1,1,3,1,1,3,2,1,2,3,1,1,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,2,1,2,1,1,3,3,1,1,1,1,3,3,1,1,2,2,1,2,1,1,2,2,1,1,0,2,2,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,1,1,2,1,1,3,3,1,0,1,1,3,3,2,0,1,1,2,3,1,0,2,2,1,0,0,1,3,2,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,2,1,3,3,3,3,3,1,2,3,2,3,3,2,1,1,3,2,3,2,1,2,2,0,1,2,1,0,0,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,2,2,2,2,3,1,2,2,1,1,3,3,0,3,2,1,2,3,2,1,3,3,1,1,0,2,1,3,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,2,2,2,3,2,3,3,3,2,1,1,3,3,1,1,1,2,2,3,2,3,2,2,2,1,0,2,2,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-1,0,0,3,3,3,3,3,0,0,3,3,2,3,0,0,0,2,3,3,1,0,1,2,0,0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,2,3,3,3,3,3,1,2,3,3,2,2,1,1,0,3,3,2,2,1,2,2,1,0,2,2,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,2,2,1,3,1,2,3,3,2,2,1,1,2,2,1,1,1,1,3,2,1,1,1,1,2,1,0,1,2,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-2,3,3,1,1,1,1,1,3,3,3,0,1,1,3,3,1,1,1,1,1,2,2,0,3,1,1,2,0,2,1,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,1,0,1,2,1,2,2,0,1,2,3,1,2,0,0,0,2,1,1,1,1,1,2,0,0,1,1,0,0,0,0,
-1,2,1,2,2,2,1,2,1,2,0,2,0,2,2,1,1,2,1,1,2,1,1,1,0,1,0,0,0,1,1,0,
-1,1,1,2,3,2,3,3,0,1,2,2,3,1,0,1,0,2,1,2,2,0,1,1,0,0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,3,3,2,2,1,0,0,3,2,3,2,0,0,0,1,1,3,0,0,1,1,0,0,2,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,2,2,3,3,1,0,1,3,2,3,1,1,1,0,1,1,1,1,1,3,1,0,0,2,2,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,1,2,2,2,1,0,1,2,3,3,2,0,0,0,2,1,1,1,2,1,1,1,0,1,1,1,0,0,0,
-1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,2,1,1,1,1,1,1,0,1,1,1,0,0,1,1,
-3,2,2,1,0,0,1,1,2,2,0,3,0,1,2,1,1,0,0,1,1,1,0,1,1,1,1,0,2,1,1,1,
-2,2,1,1,1,2,1,2,1,1,1,1,1,1,1,2,1,1,1,2,3,1,1,1,1,1,1,1,1,1,0,1,
-2,3,3,0,1,0,0,0,3,3,1,0,0,1,2,2,1,0,0,0,0,2,0,0,1,1,1,0,2,1,1,1,
-2,1,1,1,1,1,1,2,1,1,0,1,1,0,1,1,1,0,1,2,1,1,0,1,1,1,1,1,1,1,0,1,
-2,3,3,0,1,0,0,0,2,2,0,0,0,0,1,2,2,0,0,0,0,1,0,0,1,1,0,0,2,0,1,0,
-2,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
-3,2,2,0,1,0,1,0,2,3,2,0,0,1,2,2,1,0,0,1,1,1,0,0,2,1,0,1,2,2,1,1,
-2,1,1,1,1,1,1,2,1,1,1,1,1,1,0,2,1,0,1,1,0,1,1,1,0,1,1,2,1,1,0,1,
-2,2,2,0,0,1,0,0,2,2,1,1,0,0,2,1,1,0,0,0,1,2,0,0,2,1,0,0,2,1,1,1,
-2,1,1,1,1,2,1,2,1,1,1,2,2,1,1,2,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,
-1,2,3,0,0,0,1,0,3,2,1,0,0,1,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,2,1,
-1,1,0,0,0,1,0,1,1,1,1,1,2,0,0,1,0,0,0,2,0,0,1,1,1,1,1,1,1,1,0,1,
-3,0,0,2,1,2,2,1,0,0,2,1,2,2,0,0,0,2,1,1,1,0,1,1,0,0,1,1,2,0,0,0,
-1,2,1,2,2,1,1,2,1,2,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,0,0,1,
-1,3,2,0,0,0,1,0,2,2,2,0,0,0,2,2,1,0,0,0,0,3,1,1,1,1,0,0,2,1,1,1,
-2,1,0,1,1,1,0,1,1,1,1,1,1,1,0,2,1,0,0,1,0,1,1,0,1,1,1,1,1,1,0,1,
-2,3,2,0,0,0,1,0,2,2,0,0,0,0,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,1,0,
-2,1,1,1,1,2,1,2,1,2,0,1,1,1,0,2,1,1,1,2,1,1,1,1,0,1,1,1,1,1,0,1,
-3,1,1,2,2,2,3,2,1,1,2,2,1,1,0,1,0,2,2,1,1,1,1,1,0,0,1,1,0,1,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,0,0,0,0,0,2,2,0,0,0,0,2,2,1,0,0,0,1,1,0,0,1,2,0,0,2,1,1,1,
-2,2,1,1,1,2,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,1,1,0,1,2,1,1,1,0,1,
-1,0,0,1,2,3,2,1,0,0,2,0,1,1,0,0,0,1,1,1,1,0,1,1,0,0,1,0,0,0,0,0,
-1,2,1,2,1,2,1,1,1,2,0,2,1,1,1,0,1,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
-2,3,2,0,0,0,0,0,1,1,2,1,0,0,1,1,1,0,0,0,0,2,0,0,1,1,0,0,2,1,1,1,
-2,1,1,1,1,1,1,2,1,0,1,1,1,1,0,2,1,1,1,1,1,1,0,1,0,1,1,1,1,1,0,1,
-1,2,2,0,1,1,1,0,2,2,2,0,0,0,3,2,1,0,0,0,1,1,0,0,1,1,0,1,1,1,0,0,
-1,1,0,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,0,0,1,1,1,0,1,0,1,
-2,1,0,2,1,1,2,2,1,1,2,1,1,1,0,0,0,1,1,0,1,1,1,1,0,0,1,1,1,0,0,0,
-1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,1,0,
-1,2,3,0,0,0,1,0,2,2,0,0,0,0,2,2,0,0,0,0,0,1,0,0,1,0,0,0,2,0,1,0,
-2,1,1,1,1,1,0,2,0,0,0,1,2,1,1,1,1,0,1,2,0,1,0,1,0,1,1,1,0,1,0,1,
-2,2,2,0,0,0,1,0,2,1,2,0,0,0,1,1,2,0,0,0,0,1,0,0,1,1,0,0,2,1,0,1,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
-1,2,2,0,0,0,1,0,2,2,2,0,0,0,1,1,0,0,0,0,0,1,1,0,2,0,0,1,1,1,0,1,
-1,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,0,0,1,1,0,1,0,1,1,1,1,1,0,0,0,1,
-1,0,0,1,0,1,2,1,0,0,1,1,1,2,0,0,0,1,1,0,1,0,1,1,0,0,1,0,0,0,0,0,
-0,2,1,2,1,1,1,1,1,2,0,2,0,1,1,0,1,2,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
-2,1,1,0,1,2,0,0,1,1,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,0,0,0,2,1,0,1,
-2,2,1,1,1,1,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,0,1,0,1,1,1,1,1,0,1,
-1,2,2,0,0,0,0,0,1,1,0,0,0,0,2,1,0,0,0,0,0,2,0,0,2,2,0,0,2,0,0,1,
-2,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,0,0,0,1,1,1,1,0,0,1,1,1,1,0,0,1,
-1,1,2,0,0,3,1,0,2,1,1,1,0,0,1,1,1,0,0,0,1,1,0,0,0,1,0,0,1,0,1,0,
-1,2,1,0,1,1,1,2,1,1,0,1,1,1,1,1,0,0,0,1,1,1,1,1,0,1,0,0,0,1,0,0,
-2,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,2,0,0,0,
-2,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,1,0,1,
-2,1,1,1,2,1,1,1,0,1,1,2,1,0,0,0,0,1,1,1,1,0,1,0,0,0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,0,1,1,1,1,1,0,0,1,1,2,1,0,0,0,1,1,0,0,0,1,1,0,0,1,0,1,0,0,0,
-1,2,1,1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
-2,0,0,0,1,1,1,1,0,0,1,1,0,0,0,0,0,1,1,1,2,0,0,1,0,0,1,0,1,0,0,0,
-0,1,1,1,1,1,1,1,1,2,0,1,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,1,1,0,0,2,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,
-0,1,1,1,1,1,1,0,1,1,0,1,0,1,1,0,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,0,1,1,0,1,0,1,0,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,0,0,0,1,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,1,1,0,1,0,0,1,1,0,1,0,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
-2,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,0,1,0,0,1,0,1,0,1,1,1,0,0,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,1,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,0,1,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
-)
-
-Latin2HungarianModel = { \
-  'charToOrderMap': Latin2_HungarianCharToOrderMap,
-  'precedenceMatrix': HungarianLangModel,
-  'mTypicalPositiveRatio': 0.947368,
-  'keepEnglishLetter': True,
-  'charsetName': "ISO-8859-2"
-}
-
-Win1250HungarianModel = { \
-  'charToOrderMap': win1250HungarianCharToOrderMap,
-  'precedenceMatrix': HungarianLangModel,
-  'mTypicalPositiveRatio': 0.947368,
-  'keepEnglishLetter': True,
-  'charsetName': "windows-1250"
-}
diff --git a/lib/requests/packages/chardet2/langthaimodel.py b/lib/requests/packages/chardet2/langthaimodel.py
deleted file mode 100755
index eba92d0..0000000
--- a/lib/requests/packages/chardet2/langthaimodel.py
+++ /dev/null
@@ -1,200 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# The following result for thai was collected from a limited sample (1M). 
-
-# Character Mapping Table:
-TIS620CharToOrderMap = ( \
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
-253,182,106,107,100,183,184,185,101, 94,186,187,108,109,110,111,  # 40
-188,189,190, 89, 95,112,113,191,192,193,194,253,253,253,253,253,  # 50
-253, 64, 72, 73,114, 74,115,116,102, 81,201,117, 90,103, 78, 82,  # 60
- 96,202, 91, 79, 84,104,105, 97, 98, 92,203,253,253,253,253,253,  # 70
-209,210,211,212,213, 88,214,215,216,217,218,219,220,118,221,222,
-223,224, 99, 85, 83,225,226,227,228,229,230,231,232,233,234,235,
-236,  5, 30,237, 24,238, 75,  8, 26, 52, 34, 51,119, 47, 58, 57,
- 49, 53, 55, 43, 20, 19, 44, 14, 48,  3, 17, 25, 39, 62, 31, 54,
- 45,  9, 16,  2, 61, 15,239, 12, 42, 46, 18, 21, 76,  4, 66, 63,
- 22, 10,  1, 36, 23, 13, 40, 27, 32, 35, 86,240,241,242,243,244,
- 11, 28, 41, 29, 33,245, 50, 37,  6,  7, 67, 77, 38, 93,246,247,
- 68, 56, 59, 65, 69, 60, 70, 80, 71, 87,248,249,250,251,252,253,
-)
-
-# Model Table: 
-# total sequences: 100%
-# first 512 sequences: 92.6386%
-# first 1024 sequences:7.3177%
-# rest  sequences:     1.0230%
-# negative sequences:  0.0436% 
-ThaiLangModel = ( \
-0,1,3,3,3,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,0,0,3,3,3,0,3,3,3,3,
-0,3,3,0,0,0,1,3,0,3,3,2,3,3,0,1,2,3,3,3,3,0,2,0,2,0,0,3,2,1,2,2,
-3,0,3,3,2,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,0,3,2,3,0,2,2,2,3,
-0,2,3,0,0,0,0,1,0,1,2,3,1,1,3,2,2,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,
-3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,3,3,2,3,2,3,3,2,2,2,
-3,1,2,3,0,3,3,2,2,1,2,3,3,1,2,0,1,3,0,1,0,0,1,0,0,0,0,0,0,0,1,1,
-3,3,2,2,3,3,3,3,1,2,3,3,3,3,3,2,2,2,2,3,3,2,2,3,3,2,2,3,2,3,2,2,
-3,3,1,2,3,1,2,2,3,3,1,0,2,1,0,0,3,1,2,1,0,0,1,0,0,0,0,0,0,1,0,1,
-3,3,3,3,3,3,2,2,3,3,3,3,2,3,2,2,3,3,2,2,3,2,2,2,2,1,1,3,1,2,1,1,
-3,2,1,0,2,1,0,1,0,1,1,0,1,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,
-3,3,3,2,3,2,3,3,2,2,3,2,3,3,2,3,1,1,2,3,2,2,2,3,2,2,2,2,2,1,2,1,
-2,2,1,1,3,3,2,1,0,1,2,2,0,1,3,0,0,0,1,1,0,0,0,0,0,2,3,0,0,2,1,1,
-3,3,2,3,3,2,0,0,3,3,0,3,3,0,2,2,3,1,2,2,1,1,1,0,2,2,2,0,2,2,1,1,
-0,2,1,0,2,0,0,2,0,1,0,0,1,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,2,3,3,2,0,0,3,3,0,2,3,0,2,1,2,2,2,2,1,2,0,0,2,2,2,0,2,2,1,1,
-0,2,1,0,2,0,0,2,0,1,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,
-3,3,2,3,2,3,2,0,2,2,1,3,2,1,3,2,1,2,3,2,2,3,0,2,3,2,2,1,2,2,2,2,
-1,2,2,0,0,0,0,2,0,1,2,0,1,1,1,0,1,0,3,1,1,0,0,0,0,0,0,0,0,0,1,0,
-3,3,2,3,3,2,3,2,2,2,3,2,2,3,2,2,1,2,3,2,2,3,1,3,2,2,2,3,2,2,2,3,
-3,2,1,3,0,1,1,1,0,2,1,1,1,1,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,2,0,0,
-1,0,0,3,0,3,3,3,3,3,0,0,3,0,2,2,3,3,3,3,3,0,0,0,1,1,3,0,0,0,0,2,
-0,0,1,0,0,0,0,0,0,0,2,3,0,0,0,3,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
-2,0,3,3,3,3,0,0,2,3,0,0,3,0,3,3,2,3,3,3,3,3,0,0,3,3,3,0,0,0,3,3,
-0,0,3,0,0,0,0,2,0,0,2,1,1,3,0,0,1,0,0,2,3,0,1,0,0,0,0,0,0,0,1,0,
-3,3,3,3,2,3,3,3,3,3,3,3,1,2,1,3,3,2,2,1,2,2,2,3,1,1,2,0,2,1,2,1,
-2,2,1,0,0,0,1,1,0,1,0,1,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,
-3,0,2,1,2,3,3,3,0,2,0,2,2,0,2,1,3,2,2,1,2,1,0,0,2,2,1,0,2,1,2,2,
-0,1,1,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,1,3,3,1,1,3,0,2,3,1,1,3,2,1,1,2,0,2,2,3,2,1,1,1,1,1,2,
-3,0,0,1,3,1,2,1,2,0,3,0,0,0,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-3,3,1,1,3,2,3,3,3,1,3,2,1,3,2,1,3,2,2,2,2,1,3,3,1,2,1,3,1,2,3,0,
-2,1,1,3,2,2,2,1,2,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-3,3,2,3,2,3,3,2,3,2,3,2,3,3,2,1,0,3,2,2,2,1,2,2,2,1,2,2,1,2,1,1,
-2,2,2,3,0,1,3,1,1,1,1,0,1,1,0,2,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,3,2,2,1,1,3,2,3,2,3,2,0,3,2,2,1,2,0,2,2,2,1,2,2,2,2,1,
-3,2,1,2,2,1,0,2,0,1,0,0,1,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,2,3,1,2,3,3,2,2,3,0,1,1,2,0,3,3,2,2,3,0,1,1,3,0,0,0,0,
-3,1,0,3,3,0,2,0,2,1,0,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,2,3,2,3,3,0,1,3,1,1,2,1,2,1,1,3,1,1,0,2,3,1,1,1,1,1,1,1,1,
-3,1,1,2,2,2,2,1,1,1,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,2,2,1,1,2,1,3,3,2,3,2,2,3,2,2,3,1,2,2,1,2,0,3,2,1,2,2,2,2,2,1,
-3,2,1,2,2,2,1,1,1,1,0,0,1,1,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,1,3,3,0,2,1,0,3,2,0,0,3,1,0,1,1,0,1,0,0,0,0,0,1,
-1,0,0,1,0,3,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,2,2,2,3,0,0,1,3,0,3,2,0,3,2,2,3,3,3,3,3,1,0,2,2,2,0,2,2,1,2,
-0,2,3,0,0,0,0,1,0,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,0,2,3,1,3,3,2,3,3,0,3,3,0,3,2,2,3,2,3,3,3,0,0,2,2,3,0,1,1,1,3,
-0,0,3,0,0,0,2,2,0,1,3,0,1,2,2,2,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,
-3,2,3,3,2,0,3,3,2,2,3,1,3,2,1,3,2,0,1,2,2,0,2,3,2,1,0,3,0,0,0,0,
-3,0,0,2,3,1,3,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,3,2,2,2,1,2,0,1,3,1,1,3,1,3,0,0,2,1,1,1,1,2,1,1,1,0,2,1,0,1,
-1,2,0,0,0,3,1,1,0,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,0,3,1,0,0,0,1,0,
-3,3,3,3,2,2,2,2,2,1,3,1,1,1,2,0,1,1,2,1,2,1,3,2,0,0,3,1,1,1,1,1,
-3,1,0,2,3,0,0,0,3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2,3,0,3,3,0,2,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2,3,1,3,0,0,1,2,0,0,2,0,3,3,2,3,3,3,2,3,0,0,2,2,2,0,0,0,2,2,
-0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-0,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,1,2,3,1,3,3,0,0,1,0,3,0,0,0,0,0,
-0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,1,2,3,1,2,3,1,0,3,0,2,2,1,0,2,1,1,2,0,1,0,0,1,1,1,1,0,1,0,0,
-1,0,0,0,0,1,1,0,3,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,1,0,1,1,1,3,1,2,2,2,2,2,2,1,1,1,1,0,3,1,0,1,3,1,1,1,1,
-1,1,0,2,0,1,3,1,1,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,1,
-3,0,2,2,1,3,3,2,3,3,0,1,1,0,2,2,1,2,1,3,3,1,0,0,3,2,0,0,0,0,2,1,
-0,1,0,0,0,0,1,2,0,1,1,3,1,1,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,0,3,0,0,1,0,0,0,3,0,0,3,0,3,1,0,1,1,1,3,2,0,0,0,3,0,0,0,0,2,0,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,1,3,2,1,3,3,1,2,2,0,1,2,1,0,1,2,0,0,0,0,0,3,0,0,0,3,0,0,0,0,
-3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,1,2,0,3,3,3,2,2,0,1,1,0,1,3,0,0,0,2,2,0,0,0,0,3,1,0,1,0,0,0,
-0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,2,3,1,2,0,0,2,1,0,3,1,0,1,2,0,1,1,1,1,3,0,0,3,1,1,0,2,2,1,1,
-0,2,0,0,0,0,0,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,3,1,2,0,0,2,2,0,1,2,0,1,0,1,3,1,2,1,0,0,0,2,0,3,0,0,0,1,0,
-0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,1,1,2,2,0,0,0,2,0,2,1,0,1,1,0,1,1,1,2,1,0,0,1,1,1,0,2,1,1,1,
-0,1,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,1,
-0,0,0,2,0,1,3,1,1,1,1,0,0,0,0,3,2,0,1,0,0,0,1,2,0,0,0,1,0,0,0,0,
-0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,2,3,2,2,0,0,0,1,0,0,0,0,2,3,2,1,2,2,3,0,0,0,2,3,1,0,0,0,1,1,
-0,0,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,
-3,3,2,2,0,1,0,0,0,0,2,0,2,0,1,0,0,0,1,1,0,0,0,2,1,0,1,0,1,1,0,0,
-0,1,0,2,0,0,1,0,3,0,1,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,1,0,0,1,0,0,0,0,0,1,1,2,0,0,0,0,1,0,0,1,3,1,0,0,0,0,1,1,0,0,
-0,1,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,
-3,3,1,1,1,1,2,3,0,0,2,1,1,1,1,1,0,2,1,1,0,0,0,2,1,0,1,2,1,1,0,1,
-2,1,0,3,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,3,1,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,
-0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,2,0,0,0,0,0,0,1,2,1,0,1,1,0,2,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,2,0,0,0,1,3,0,1,0,0,0,2,0,0,0,0,0,0,0,1,2,0,0,0,0,0,
-3,3,0,0,1,1,2,0,0,1,2,1,0,1,1,1,0,1,1,0,0,2,1,1,0,1,0,0,1,1,1,0,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,1,0,0,0,0,1,0,0,0,0,3,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,0,0,1,1,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,0,1,2,0,1,2,0,0,1,1,0,2,0,1,0,0,1,0,0,0,0,1,0,0,0,2,0,0,0,0,
-1,0,0,1,0,1,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,0,0,0,0,0,0,0,1,1,0,1,1,0,2,1,3,0,0,0,0,1,1,0,0,0,0,0,0,0,3,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,1,0,1,0,0,2,0,0,2,0,0,1,1,2,0,0,1,1,0,0,0,1,0,0,0,1,1,0,0,0,
-1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,3,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,
-1,0,0,0,0,0,0,0,0,1,0,0,0,0,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,1,0,0,2,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-)
-
-TIS620ThaiModel = { \
-  'charToOrderMap': TIS620CharToOrderMap,
-  'precedenceMatrix': ThaiLangModel,
-  'mTypicalPositiveRatio': 0.926386,
-  'keepEnglishLetter': False,
-  'charsetName': "TIS-620"
-}
diff --git a/lib/requests/packages/chardet2/latin1prober.py b/lib/requests/packages/chardet2/latin1prober.py
deleted file mode 100755
index 6ecc022..0000000
--- a/lib/requests/packages/chardet2/latin1prober.py
+++ /dev/null
@@ -1,135 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetprober import CharSetProber
-from . import constants
-
-FREQ_CAT_NUM = 4
-
-UDF = 0 # undefined
-OTH = 1 # other
-ASC = 2 # ascii capital letter
-ASS = 3 # ascii small letter
-ACV = 4 # accent capital vowel
-ACO = 5 # accent capital other
-ASV = 6 # accent small vowel
-ASO = 7 # accent small other
-CLASS_NUM = 8 # total classes
-
-Latin1_CharToClass = ( \
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 00 - 07
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 08 - 0F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 10 - 17
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 18 - 1F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 20 - 27
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 28 - 2F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 30 - 37
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 38 - 3F
-  OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 40 - 47
-  ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 48 - 4F
-  ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 50 - 57
-  ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,   # 58 - 5F
-  OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 60 - 67
-  ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 68 - 6F
-  ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 70 - 77
-  ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,   # 78 - 7F
-  OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH,   # 80 - 87
-  OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF,   # 88 - 8F
-  UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 90 - 97
-  OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO,   # 98 - 9F
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A0 - A7
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A8 - AF
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B0 - B7
-  OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B8 - BF
-  ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO,   # C0 - C7
-  ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,   # C8 - CF
-  ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH,   # D0 - D7
-  ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO,   # D8 - DF
-  ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO,   # E0 - E7
-  ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,   # E8 - EF
-  ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH,   # F0 - F7
-  ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF
-)
-
-# 0 : illegal 
-# 1 : very unlikely 
-# 2 : normal 
-# 3 : very likely
-Latin1ClassModel = ( \
-# UDF OTH ASC ASS ACV ACO ASV ASO
-   0,  0,  0,  0,  0,  0,  0,  0,  # UDF
-   0,  3,  3,  3,  3,  3,  3,  3,  # OTH
-   0,  3,  3,  3,  3,  3,  3,  3,  # ASC
-   0,  3,  3,  3,  1,  1,  3,  3,  # ASS
-   0,  3,  3,  3,  1,  2,  1,  2,  # ACV
-   0,  3,  3,  3,  3,  3,  3,  3,  # ACO
-   0,  3,  1,  3,  1,  1,  1,  3,  # ASV
-   0,  3,  1,  3,  1,  1,  3,  3,  # ASO
-)
-
-class Latin1Prober(CharSetProber):
-    def __init__(self):
-        CharSetProber.__init__(self)
-        self.reset()
-
-    def reset(self):
-        self._mLastCharClass = OTH
-        self._mFreqCounter = [0] * FREQ_CAT_NUM
-        CharSetProber.reset(self)
-
-    def get_charset_name(self):
-        return "windows-1252"
-
-    def feed(self, aBuf):
-        aBuf = self.filter_with_english_letters(aBuf)
-        for c in aBuf:
-            charClass = Latin1_CharToClass[c]
-            freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM) + charClass]
-            if freq == 0:
-                self._mState = constants.eNotMe
-                break
-            self._mFreqCounter[freq] += 1
-            self._mLastCharClass = charClass
-
-        return self.get_state()
-
-    def get_confidence(self):
-        if self.get_state() == constants.eNotMe:
-            return 0.01
-  
-        total = sum(self._mFreqCounter)
-        if total < 0.01:
-            confidence = 0.0
-        else:
-            confidence = (self._mFreqCounter[3] / total) - (self._mFreqCounter[1] * 20.0 / total)
-        if confidence < 0.0:
-            confidence = 0.0
-        # lower the confidence of latin1 so that other more accurate detector 
-        # can take priority.
-        confidence = confidence * 0.5
-        return confidence
diff --git a/lib/requests/packages/chardet2/mbcharsetprober.py b/lib/requests/packages/chardet2/mbcharsetprober.py
deleted file mode 100755
index ab9abcb..0000000
--- a/lib/requests/packages/chardet2/mbcharsetprober.py
+++ /dev/null
@@ -1,83 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#   Proofpoint, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .constants import eStart, eError, eItsMe
-from .charsetprober import CharSetProber
-
-class MultiByteCharSetProber(CharSetProber):
-    def __init__(self):
-        CharSetProber.__init__(self)
-        self._mDistributionAnalyzer = None
-        self._mCodingSM = None
-        self._mLastChar = [0, 0]
-
-    def reset(self):
-        CharSetProber.reset(self)
-        if self._mCodingSM:
-            self._mCodingSM.reset()
-        if self._mDistributionAnalyzer:
-            self._mDistributionAnalyzer.reset()
-        self._mLastChar = [0, 0]
-
-    def get_charset_name(self):
-        pass
-
-    def feed(self, aBuf):
-        aLen = len(aBuf)
-        for i in range(0, aLen):
-            codingState = self._mCodingSM.next_state(aBuf[i])
-            if codingState == eError:
-                if constants._debug:
-                    sys.stderr.write(self.get_charset_name() + ' prober hit error at byte ' + str(i) + '\n')
-                self._mState = constants.eNotMe
-                break
-            elif codingState == eItsMe:
-                self._mState = constants.eFoundIt
-                break
-            elif codingState == eStart:
-                charLen = self._mCodingSM.get_current_charlen()
-                if i == 0:
-                    self._mLastChar[1] = aBuf[0]
-                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
-                else:
-                    self._mDistributionAnalyzer.feed(aBuf[i-1:i+1], charLen)
-                    
-        self._mLastChar[0] = aBuf[aLen - 1]
-        
-        if self.get_state() == constants.eDetecting:
-            if self._mDistributionAnalyzer.got_enough_data() and \
-               (self.get_confidence() > constants.SHORTCUT_THRESHOLD):
-                self._mState = constants.eFoundIt
-
-        return self.get_state()
-
-    def get_confidence(self):
-        return self._mDistributionAnalyzer.get_confidence()
diff --git a/lib/requests/packages/chardet2/mbcsgroupprober.py b/lib/requests/packages/chardet2/mbcsgroupprober.py
deleted file mode 100755
index 6c6b048..0000000
--- a/lib/requests/packages/chardet2/mbcsgroupprober.py
+++ /dev/null
@@ -1,50 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#   Proofpoint, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetgroupprober import CharSetGroupProber
-from .utf8prober import UTF8Prober
-from .sjisprober import SJISProber
-from .eucjpprober import EUCJPProber
-from .gb2312prober import GB2312Prober
-from .euckrprober import EUCKRProber
-from .big5prober import Big5Prober
-from .euctwprober import EUCTWProber
-
-class MBCSGroupProber(CharSetGroupProber):
-    def __init__(self):
-        CharSetGroupProber.__init__(self)
-        self._mProbers = [ \
-            UTF8Prober(),
-            SJISProber(),
-            EUCJPProber(),
-            GB2312Prober(),
-            EUCKRProber(),
-            Big5Prober(),
-            EUCTWProber()]
-        self.reset()
diff --git a/lib/requests/packages/chardet2/mbcssm.py b/lib/requests/packages/chardet2/mbcssm.py
deleted file mode 100755
index 4f2922d..0000000
--- a/lib/requests/packages/chardet2/mbcssm.py
+++ /dev/null
@@ -1,514 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .constants import eStart, eError, eItsMe
-
-# BIG5 
-
-BIG5_cls = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07    #allow 0x00 as legal value
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,1,  # 78 - 7f 
-    4,4,4,4,4,4,4,4,  # 80 - 87 
-    4,4,4,4,4,4,4,4,  # 88 - 8f 
-    4,4,4,4,4,4,4,4,  # 90 - 97 
-    4,4,4,4,4,4,4,4,  # 98 - 9f 
-    4,3,3,3,3,3,3,3,  # a0 - a7 
-    3,3,3,3,3,3,3,3,  # a8 - af 
-    3,3,3,3,3,3,3,3,  # b0 - b7 
-    3,3,3,3,3,3,3,3,  # b8 - bf 
-    3,3,3,3,3,3,3,3,  # c0 - c7 
-    3,3,3,3,3,3,3,3,  # c8 - cf 
-    3,3,3,3,3,3,3,3,  # d0 - d7 
-    3,3,3,3,3,3,3,3,  # d8 - df 
-    3,3,3,3,3,3,3,3,  # e0 - e7 
-    3,3,3,3,3,3,3,3,  # e8 - ef 
-    3,3,3,3,3,3,3,3,  # f0 - f7 
-    3,3,3,3,3,3,3,0)  # f8 - ff 
-
-BIG5_st = ( \
-    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07 
-    eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,#08-0f 
-    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart)#10-17 
-
-Big5CharLenTable = (0, 1, 1, 2, 0)
-
-Big5SMModel = {'classTable': BIG5_cls,
-               'classFactor': 5,
-               'stateTable': BIG5_st,
-               'charLenTable': Big5CharLenTable,
-               'name': 'Big5'}
-
-# EUC-JP
-
-EUCJP_cls = ( \
-    4,4,4,4,4,4,4,4,  # 00 - 07 
-    4,4,4,4,4,4,5,5,  # 08 - 0f 
-    4,4,4,4,4,4,4,4,  # 10 - 17 
-    4,4,4,5,4,4,4,4,  # 18 - 1f 
-    4,4,4,4,4,4,4,4,  # 20 - 27 
-    4,4,4,4,4,4,4,4,  # 28 - 2f 
-    4,4,4,4,4,4,4,4,  # 30 - 37 
-    4,4,4,4,4,4,4,4,  # 38 - 3f 
-    4,4,4,4,4,4,4,4,  # 40 - 47 
-    4,4,4,4,4,4,4,4,  # 48 - 4f 
-    4,4,4,4,4,4,4,4,  # 50 - 57 
-    4,4,4,4,4,4,4,4,  # 58 - 5f 
-    4,4,4,4,4,4,4,4,  # 60 - 67 
-    4,4,4,4,4,4,4,4,  # 68 - 6f 
-    4,4,4,4,4,4,4,4,  # 70 - 77 
-    4,4,4,4,4,4,4,4,  # 78 - 7f 
-    5,5,5,5,5,5,5,5,  # 80 - 87 
-    5,5,5,5,5,5,1,3,  # 88 - 8f 
-    5,5,5,5,5,5,5,5,  # 90 - 97 
-    5,5,5,5,5,5,5,5,  # 98 - 9f 
-    5,2,2,2,2,2,2,2,  # a0 - a7 
-    2,2,2,2,2,2,2,2,  # a8 - af 
-    2,2,2,2,2,2,2,2,  # b0 - b7 
-    2,2,2,2,2,2,2,2,  # b8 - bf 
-    2,2,2,2,2,2,2,2,  # c0 - c7 
-    2,2,2,2,2,2,2,2,  # c8 - cf 
-    2,2,2,2,2,2,2,2,  # d0 - d7 
-    2,2,2,2,2,2,2,2,  # d8 - df 
-    0,0,0,0,0,0,0,0,  # e0 - e7 
-    0,0,0,0,0,0,0,0,  # e8 - ef 
-    0,0,0,0,0,0,0,0,  # f0 - f7 
-    0,0,0,0,0,0,0,5)  # f8 - ff 
-
-EUCJP_st = ( \
-          3,     4,     3,     5,eStart,eError,eError,eError,#00-07 
-     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-     eItsMe,eItsMe,eStart,eError,eStart,eError,eError,eError,#10-17 
-     eError,eError,eStart,eError,eError,eError,     3,eError,#18-1f 
-          3,eError,eError,eError,eStart,eStart,eStart,eStart)#20-27 
-
-EUCJPCharLenTable = (2, 2, 2, 3, 1, 0)
-
-EUCJPSMModel = {'classTable': EUCJP_cls,
-                'classFactor': 6,
-                'stateTable': EUCJP_st,
-                'charLenTable': EUCJPCharLenTable,
-                'name': 'EUC-JP'}
-
-# EUC-KR
-
-EUCKR_cls  = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07 
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    1,1,1,1,1,1,1,1,  # 40 - 47 
-    1,1,1,1,1,1,1,1,  # 48 - 4f 
-    1,1,1,1,1,1,1,1,  # 50 - 57 
-    1,1,1,1,1,1,1,1,  # 58 - 5f 
-    1,1,1,1,1,1,1,1,  # 60 - 67 
-    1,1,1,1,1,1,1,1,  # 68 - 6f 
-    1,1,1,1,1,1,1,1,  # 70 - 77 
-    1,1,1,1,1,1,1,1,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,0,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,2,2,2,2,2,2,2,  # a0 - a7 
-    2,2,2,2,2,3,3,3,  # a8 - af 
-    2,2,2,2,2,2,2,2,  # b0 - b7 
-    2,2,2,2,2,2,2,2,  # b8 - bf 
-    2,2,2,2,2,2,2,2,  # c0 - c7 
-    2,3,2,2,2,2,2,2,  # c8 - cf 
-    2,2,2,2,2,2,2,2,  # d0 - d7 
-    2,2,2,2,2,2,2,2,  # d8 - df 
-    2,2,2,2,2,2,2,2,  # e0 - e7 
-    2,2,2,2,2,2,2,2,  # e8 - ef 
-    2,2,2,2,2,2,2,2,  # f0 - f7 
-    2,2,2,2,2,2,2,0)  # f8 - ff 
-
-EUCKR_st = (
-    eError,eStart,     3,eError,eError,eError,eError,eError,#00-07 
-    eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,eStart)#08-0f 
-
-EUCKRCharLenTable = (0, 1, 2, 0)
-
-EUCKRSMModel = {'classTable': EUCKR_cls,
-                'classFactor': 4,
-                'stateTable': EUCKR_st,
-                'charLenTable': EUCKRCharLenTable,
-                'name': 'EUC-KR'}
-
-# EUC-TW
-
-EUCTW_cls = ( \
-    2,2,2,2,2,2,2,2,  # 00 - 07 
-    2,2,2,2,2,2,0,0,  # 08 - 0f 
-    2,2,2,2,2,2,2,2,  # 10 - 17 
-    2,2,2,0,2,2,2,2,  # 18 - 1f 
-    2,2,2,2,2,2,2,2,  # 20 - 27 
-    2,2,2,2,2,2,2,2,  # 28 - 2f 
-    2,2,2,2,2,2,2,2,  # 30 - 37 
-    2,2,2,2,2,2,2,2,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,2,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,6,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,3,4,4,4,4,4,4,  # a0 - a7 
-    5,5,1,1,1,1,1,1,  # a8 - af 
-    1,1,1,1,1,1,1,1,  # b0 - b7 
-    1,1,1,1,1,1,1,1,  # b8 - bf 
-    1,1,3,1,3,3,3,3,  # c0 - c7 
-    3,3,3,3,3,3,3,3,  # c8 - cf 
-    3,3,3,3,3,3,3,3,  # d0 - d7 
-    3,3,3,3,3,3,3,3,  # d8 - df 
-    3,3,3,3,3,3,3,3,  # e0 - e7 
-    3,3,3,3,3,3,3,3,  # e8 - ef 
-    3,3,3,3,3,3,3,3,  # f0 - f7 
-    3,3,3,3,3,3,3,0)  # f8 - ff 
-
-EUCTW_st = ( \
-    eError,eError,eStart,     3,     3,     3,     4,eError,#00-07 
-    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eStart,eError,#10-17 
-    eStart,eStart,eStart,eError,eError,eError,eError,eError,#18-1f 
-         5,eError,eError,eError,eStart,eError,eStart,eStart,#20-27 
-    eStart,eError,eStart,eStart,eStart,eStart,eStart,eStart)#28-2f 
-
-EUCTWCharLenTable = (0, 0, 1, 2, 2, 2, 3)
-
-EUCTWSMModel = {'classTable': EUCTW_cls,
-                'classFactor': 7,
-                'stateTable': EUCTW_st,
-                'charLenTable': EUCTWCharLenTable,
-                'name': 'x-euc-tw'}
-
-# GB2312
-
-GB2312_cls = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07 
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    3,3,3,3,3,3,3,3,  # 30 - 37 
-    3,3,1,1,1,1,1,1,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,4,  # 78 - 7f 
-    5,6,6,6,6,6,6,6,  # 80 - 87 
-    6,6,6,6,6,6,6,6,  # 88 - 8f 
-    6,6,6,6,6,6,6,6,  # 90 - 97 
-    6,6,6,6,6,6,6,6,  # 98 - 9f 
-    6,6,6,6,6,6,6,6,  # a0 - a7 
-    6,6,6,6,6,6,6,6,  # a8 - af 
-    6,6,6,6,6,6,6,6,  # b0 - b7 
-    6,6,6,6,6,6,6,6,  # b8 - bf 
-    6,6,6,6,6,6,6,6,  # c0 - c7 
-    6,6,6,6,6,6,6,6,  # c8 - cf 
-    6,6,6,6,6,6,6,6,  # d0 - d7 
-    6,6,6,6,6,6,6,6,  # d8 - df 
-    6,6,6,6,6,6,6,6,  # e0 - e7 
-    6,6,6,6,6,6,6,6,  # e8 - ef 
-    6,6,6,6,6,6,6,6,  # f0 - f7 
-    6,6,6,6,6,6,6,0)  # f8 - ff 
-
-GB2312_st = ( \
-    eError,eStart,eStart,eStart,eStart,eStart,     3,eError,#00-07 
-    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,#10-17 
-         4,eError,eStart,eStart,eError,eError,eError,eError,#18-1f 
-    eError,eError,     5,eError,eError,eError,eItsMe,eError,#20-27 
-    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart)#28-2f 
-
-# To be accurate, the length of class 6 can be either 2 or 4. 
-# But it is not necessary to discriminate between the two since 
-# it is used for frequency analysis only, and we are validing 
-# each code range there as well. So it is safe to set it to be 
-# 2 here. 
-GB2312CharLenTable = (0, 1, 1, 1, 1, 1, 2)
-
-GB2312SMModel = {'classTable': GB2312_cls,
-                  'classFactor': 7,
-                  'stateTable': GB2312_st,
-                  'charLenTable': GB2312CharLenTable,
-                  'name': 'GB2312'}
-
-# Shift_JIS
-
-SJIS_cls = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07 
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    2,2,2,2,2,2,2,2,  # 40 - 47 
-    2,2,2,2,2,2,2,2,  # 48 - 4f 
-    2,2,2,2,2,2,2,2,  # 50 - 57 
-    2,2,2,2,2,2,2,2,  # 58 - 5f 
-    2,2,2,2,2,2,2,2,  # 60 - 67 
-    2,2,2,2,2,2,2,2,  # 68 - 6f 
-    2,2,2,2,2,2,2,2,  # 70 - 77 
-    2,2,2,2,2,2,2,1,  # 78 - 7f 
-    3,3,3,3,3,3,3,3,  # 80 - 87 
-    3,3,3,3,3,3,3,3,  # 88 - 8f 
-    3,3,3,3,3,3,3,3,  # 90 - 97 
-    3,3,3,3,3,3,3,3,  # 98 - 9f 
-    #0xa0 is illegal in sjis encoding, but some pages does 
-    #contain such byte. We need to be more error forgiven.
-    2,2,2,2,2,2,2,2,  # a0 - a7     
-    2,2,2,2,2,2,2,2,  # a8 - af 
-    2,2,2,2,2,2,2,2,  # b0 - b7 
-    2,2,2,2,2,2,2,2,  # b8 - bf 
-    2,2,2,2,2,2,2,2,  # c0 - c7 
-    2,2,2,2,2,2,2,2,  # c8 - cf 
-    2,2,2,2,2,2,2,2,  # d0 - d7 
-    2,2,2,2,2,2,2,2,  # d8 - df 
-    3,3,3,3,3,3,3,3,  # e0 - e7 
-    3,3,3,3,3,4,4,4,  # e8 - ef 
-    4,4,4,4,4,4,4,4,  # f0 - f7 
-    4,4,4,4,4,0,0,0)  # f8 - ff 
-
-SJIS_st = ( \
-    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07 
-    eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-    eItsMe,eItsMe,eError,eError,eStart,eStart,eStart,eStart)#10-17 
-
-SJISCharLenTable = (0, 1, 1, 2, 0, 0)
-
-SJISSMModel = {'classTable': SJIS_cls,
-               'classFactor': 6,
-               'stateTable': SJIS_st,
-               'charLenTable': SJISCharLenTable,
-               'name': 'Shift_JIS'}
-
-# UCS2-BE
-
-UCS2BE_cls = ( \
-    0,0,0,0,0,0,0,0,  # 00 - 07 
-    0,0,1,0,0,2,0,0,  # 08 - 0f 
-    0,0,0,0,0,0,0,0,  # 10 - 17 
-    0,0,0,3,0,0,0,0,  # 18 - 1f 
-    0,0,0,0,0,0,0,0,  # 20 - 27 
-    0,3,3,3,3,3,0,0,  # 28 - 2f 
-    0,0,0,0,0,0,0,0,  # 30 - 37 
-    0,0,0,0,0,0,0,0,  # 38 - 3f 
-    0,0,0,0,0,0,0,0,  # 40 - 47 
-    0,0,0,0,0,0,0,0,  # 48 - 4f 
-    0,0,0,0,0,0,0,0,  # 50 - 57 
-    0,0,0,0,0,0,0,0,  # 58 - 5f 
-    0,0,0,0,0,0,0,0,  # 60 - 67 
-    0,0,0,0,0,0,0,0,  # 68 - 6f 
-    0,0,0,0,0,0,0,0,  # 70 - 77 
-    0,0,0,0,0,0,0,0,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,0,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,0,0,0,0,0,0,0,  # a0 - a7 
-    0,0,0,0,0,0,0,0,  # a8 - af 
-    0,0,0,0,0,0,0,0,  # b0 - b7 
-    0,0,0,0,0,0,0,0,  # b8 - bf 
-    0,0,0,0,0,0,0,0,  # c0 - c7 
-    0,0,0,0,0,0,0,0,  # c8 - cf 
-    0,0,0,0,0,0,0,0,  # d0 - d7 
-    0,0,0,0,0,0,0,0,  # d8 - df 
-    0,0,0,0,0,0,0,0,  # e0 - e7 
-    0,0,0,0,0,0,0,0,  # e8 - ef 
-    0,0,0,0,0,0,0,0,  # f0 - f7 
-    0,0,0,0,0,0,4,5)  # f8 - ff 
-
-UCS2BE_st  = ( \
-          5,     7,     7,eError,     4,     3,eError,eError,#00-07 
-     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-     eItsMe,eItsMe,     6,     6,     6,     6,eError,eError,#10-17 
-          6,     6,     6,     6,     6,eItsMe,     6,     6,#18-1f 
-          6,     6,     6,     6,     5,     7,     7,eError,#20-27 
-          5,     8,     6,     6,eError,     6,     6,     6,#28-2f 
-          6,     6,     6,     6,eError,eError,eStart,eStart)#30-37 
-
-UCS2BECharLenTable = (2, 2, 2, 0, 2, 2)
-
-UCS2BESMModel = {'classTable': UCS2BE_cls,
-                 'classFactor': 6,
-                 'stateTable': UCS2BE_st,
-                 'charLenTable': UCS2BECharLenTable,
-                 'name': 'UTF-16BE'}
-
-# UCS2-LE
-
-UCS2LE_cls = ( \
-    0,0,0,0,0,0,0,0,  # 00 - 07 
-    0,0,1,0,0,2,0,0,  # 08 - 0f 
-    0,0,0,0,0,0,0,0,  # 10 - 17 
-    0,0,0,3,0,0,0,0,  # 18 - 1f 
-    0,0,0,0,0,0,0,0,  # 20 - 27 
-    0,3,3,3,3,3,0,0,  # 28 - 2f 
-    0,0,0,0,0,0,0,0,  # 30 - 37 
-    0,0,0,0,0,0,0,0,  # 38 - 3f 
-    0,0,0,0,0,0,0,0,  # 40 - 47 
-    0,0,0,0,0,0,0,0,  # 48 - 4f 
-    0,0,0,0,0,0,0,0,  # 50 - 57 
-    0,0,0,0,0,0,0,0,  # 58 - 5f 
-    0,0,0,0,0,0,0,0,  # 60 - 67 
-    0,0,0,0,0,0,0,0,  # 68 - 6f 
-    0,0,0,0,0,0,0,0,  # 70 - 77 
-    0,0,0,0,0,0,0,0,  # 78 - 7f 
-    0,0,0,0,0,0,0,0,  # 80 - 87 
-    0,0,0,0,0,0,0,0,  # 88 - 8f 
-    0,0,0,0,0,0,0,0,  # 90 - 97 
-    0,0,0,0,0,0,0,0,  # 98 - 9f 
-    0,0,0,0,0,0,0,0,  # a0 - a7 
-    0,0,0,0,0,0,0,0,  # a8 - af 
-    0,0,0,0,0,0,0,0,  # b0 - b7 
-    0,0,0,0,0,0,0,0,  # b8 - bf 
-    0,0,0,0,0,0,0,0,  # c0 - c7 
-    0,0,0,0,0,0,0,0,  # c8 - cf 
-    0,0,0,0,0,0,0,0,  # d0 - d7 
-    0,0,0,0,0,0,0,0,  # d8 - df 
-    0,0,0,0,0,0,0,0,  # e0 - e7 
-    0,0,0,0,0,0,0,0,  # e8 - ef 
-    0,0,0,0,0,0,0,0,  # f0 - f7 
-    0,0,0,0,0,0,4,5)  # f8 - ff 
-
-UCS2LE_st = ( \
-          6,     6,     7,     6,     4,     3,eError,eError,#00-07 
-     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f 
-     eItsMe,eItsMe,     5,     5,     5,eError,eItsMe,eError,#10-17 
-          5,     5,     5,eError,     5,eError,     6,     6,#18-1f 
-          7,     6,     8,     8,     5,     5,     5,eError,#20-27 
-          5,     5,     5,eError,eError,eError,     5,     5,#28-2f 
-          5,     5,     5,eError,     5,eError,eStart,eStart)#30-37 
-
-UCS2LECharLenTable = (2, 2, 2, 2, 2, 2)
-
-UCS2LESMModel = {'classTable': UCS2LE_cls,
-                 'classFactor': 6,
-                 'stateTable': UCS2LE_st,
-                 'charLenTable': UCS2LECharLenTable,
-                 'name': 'UTF-16LE'}
-
-# UTF-8
-
-UTF8_cls = ( \
-    1,1,1,1,1,1,1,1,  # 00 - 07  #allow 0x00 as a legal value
-    1,1,1,1,1,1,0,0,  # 08 - 0f 
-    1,1,1,1,1,1,1,1,  # 10 - 17 
-    1,1,1,0,1,1,1,1,  # 18 - 1f 
-    1,1,1,1,1,1,1,1,  # 20 - 27 
-    1,1,1,1,1,1,1,1,  # 28 - 2f 
-    1,1,1,1,1,1,1,1,  # 30 - 37 
-    1,1,1,1,1,1,1,1,  # 38 - 3f 
-    1,1,1,1,1,1,1,1,  # 40 - 47 
-    1,1,1,1,1,1,1,1,  # 48 - 4f 
-    1,1,1,1,1,1,1,1,  # 50 - 57 
-    1,1,1,1,1,1,1,1,  # 58 - 5f 
-    1,1,1,1,1,1,1,1,  # 60 - 67 
-    1,1,1,1,1,1,1,1,  # 68 - 6f 
-    1,1,1,1,1,1,1,1,  # 70 - 77 
-    1,1,1,1,1,1,1,1,  # 78 - 7f 
-    2,2,2,2,3,3,3,3,  # 80 - 87 
-    4,4,4,4,4,4,4,4,  # 88 - 8f 
-    4,4,4,4,4,4,4,4,  # 90 - 97 
-    4,4,4,4,4,4,4,4,  # 98 - 9f 
-    5,5,5,5,5,5,5,5,  # a0 - a7 
-    5,5,5,5,5,5,5,5,  # a8 - af 
-    5,5,5,5,5,5,5,5,  # b0 - b7 
-    5,5,5,5,5,5,5,5,  # b8 - bf 
-    0,0,6,6,6,6,6,6,  # c0 - c7 
-    6,6,6,6,6,6,6,6,  # c8 - cf 
-    6,6,6,6,6,6,6,6,  # d0 - d7 
-    6,6,6,6,6,6,6,6,  # d8 - df 
-    7,8,8,8,8,8,8,8,  # e0 - e7 
-    8,8,8,8,8,9,8,8,  # e8 - ef 
-    10,11,11,11,11,11,11,11,  # f0 - f7 
-    12,13,13,13,14,15,0,0)   # f8 - ff 
-
-UTF8_st = ( \
-    eError,eStart,eError,eError,eError,eError,     12,   10,#00-07 
-         9,     11,     8,     7,     6,     5,     4,    3,#08-0f 
-    eError,eError,eError,eError,eError,eError,eError,eError,#10-17 
-    eError,eError,eError,eError,eError,eError,eError,eError,#18-1f 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#20-27 
-    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#28-2f 
-    eError,eError,     5,     5,     5,     5,eError,eError,#30-37 
-    eError,eError,eError,eError,eError,eError,eError,eError,#38-3f 
-    eError,eError,eError,     5,     5,     5,eError,eError,#40-47 
-    eError,eError,eError,eError,eError,eError,eError,eError,#48-4f 
-    eError,eError,     7,     7,     7,     7,eError,eError,#50-57 
-    eError,eError,eError,eError,eError,eError,eError,eError,#58-5f 
-    eError,eError,eError,eError,     7,     7,eError,eError,#60-67 
-    eError,eError,eError,eError,eError,eError,eError,eError,#68-6f 
-    eError,eError,     9,     9,     9,     9,eError,eError,#70-77 
-    eError,eError,eError,eError,eError,eError,eError,eError,#78-7f 
-    eError,eError,eError,eError,eError,     9,eError,eError,#80-87 
-    eError,eError,eError,eError,eError,eError,eError,eError,#88-8f 
-    eError,eError,    12,    12,    12,    12,eError,eError,#90-97 
-    eError,eError,eError,eError,eError,eError,eError,eError,#98-9f 
-    eError,eError,eError,eError,eError,    12,eError,eError,#a0-a7 
-    eError,eError,eError,eError,eError,eError,eError,eError,#a8-af 
-    eError,eError,    12,    12,    12,eError,eError,eError,#b0-b7 
-    eError,eError,eError,eError,eError,eError,eError,eError,#b8-bf 
-    eError,eError,eStart,eStart,eStart,eStart,eError,eError,#c0-c7 
-    eError,eError,eError,eError,eError,eError,eError,eError)#c8-cf 
-
-UTF8CharLenTable = (0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6)
-
-UTF8SMModel = {'classTable': UTF8_cls,
-               'classFactor': 16,
-               'stateTable': UTF8_st,
-               'charLenTable': UTF8CharLenTable,
-               'name': 'UTF-8'}
diff --git a/lib/requests/packages/chardet2/sbcharsetprober.py b/lib/requests/packages/chardet2/sbcharsetprober.py
deleted file mode 100755
index 1866090..0000000
--- a/lib/requests/packages/chardet2/sbcharsetprober.py
+++ /dev/null
@@ -1,107 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .charsetprober import CharSetProber
-
-SAMPLE_SIZE = 64
-SB_ENOUGH_REL_THRESHOLD = 1024
-POSITIVE_SHORTCUT_THRESHOLD = 0.95
-NEGATIVE_SHORTCUT_THRESHOLD = 0.05
-SYMBOL_CAT_ORDER = 250
-NUMBER_OF_SEQ_CAT = 4
-POSITIVE_CAT = NUMBER_OF_SEQ_CAT - 1
-#NEGATIVE_CAT = 0
- 
-class SingleByteCharSetProber(CharSetProber):
-    def __init__(self, model, reversed=False, nameProber=None):
-        CharSetProber.__init__(self)
-        self._mModel = model
-        self._mReversed = reversed # TRUE if we need to reverse every pair in the model lookup
-        self._mNameProber = nameProber # Optional auxiliary prober for name decision
-        self.reset()
-
-    def reset(self):
-        CharSetProber.reset(self)
-        self._mLastOrder = 255 # char order of last character
-        self._mSeqCounters = [0] * NUMBER_OF_SEQ_CAT
-        self._mTotalSeqs = 0
-        self._mTotalChar = 0
-        self._mFreqChar = 0 # characters that fall in our sampling range
-
-    def get_charset_name(self):
-        if self._mNameProber:
-            return self._mNameProber.get_charset_name()
-        else:
-            return self._mModel['charsetName']
-
-    def feed(self, aBuf):
-        if not self._mModel['keepEnglishLetter']:
-            aBuf = self.filter_without_english_letters(aBuf)
-        aLen = len(aBuf)
-        if not aLen:
-            return self.get_state()
-        for c in aBuf:
-            order = self._mModel['charToOrderMap'][c]
-            if order < SYMBOL_CAT_ORDER:
-                self._mTotalChar += 1
-            if order < SAMPLE_SIZE:
-                self._mFreqChar += 1
-                if self._mLastOrder < SAMPLE_SIZE:
-                    self._mTotalSeqs += 1
-                    if not self._mReversed:
-                        self._mSeqCounters[self._mModel['precedenceMatrix'][(self._mLastOrder * SAMPLE_SIZE) + order]] += 1
-                    else: # reverse the order of the letters in the lookup
-                        self._mSeqCounters[self._mModel['precedenceMatrix'][(order * SAMPLE_SIZE) + self._mLastOrder]] += 1
-            self._mLastOrder = order
-
-        if self.get_state() == constants.eDetecting:
-            if self._mTotalSeqs > SB_ENOUGH_REL_THRESHOLD:
-                cf = self.get_confidence()
-                if cf > POSITIVE_SHORTCUT_THRESHOLD:
-                    if constants._debug:
-                        sys.stderr.write('%s confidence = %s, we have a winner\n' % (self._mModel['charsetName'], cf))
-                    self._mState = constants.eFoundIt
-                elif cf < NEGATIVE_SHORTCUT_THRESHOLD:
-                    if constants._debug:
-                        sys.stderr.write('%s confidence = %s, below negative shortcut threshhold %s\n' % (self._mModel['charsetName'], cf, NEGATIVE_SHORTCUT_THRESHOLD))
-                    self._mState = constants.eNotMe
-
-        return self.get_state()
-
-    def get_confidence(self):
-        r = 0.01
-        if self._mTotalSeqs > 0:
-#            print self._mSeqCounters[POSITIVE_CAT], self._mTotalSeqs, self._mModel['mTypicalPositiveRatio']
-            r = (1.0 * self._mSeqCounters[POSITIVE_CAT]) / self._mTotalSeqs / self._mModel['mTypicalPositiveRatio']
-#            print r, self._mFreqChar, self._mTotalChar
-            r = r * self._mFreqChar / self._mTotalChar
-            if r >= 1.0:
-                r = 0.99
-        return r
diff --git a/lib/requests/packages/chardet2/sbcsgroupprober.py b/lib/requests/packages/chardet2/sbcsgroupprober.py
deleted file mode 100755
index 139334a..0000000
--- a/lib/requests/packages/chardet2/sbcsgroupprober.py
+++ /dev/null
@@ -1,65 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .charsetgroupprober import CharSetGroupProber
-from .sbcharsetprober import SingleByteCharSetProber
-from .langcyrillicmodel import Win1251CyrillicModel, Koi8rModel, Latin5CyrillicModel, MacCyrillicModel, Ibm866Model, Ibm855Model
-from .langgreekmodel import Latin7GreekModel, Win1253GreekModel
-from .langbulgarianmodel import Latin5BulgarianModel, Win1251BulgarianModel
-from .langhungarianmodel import Latin2HungarianModel, Win1250HungarianModel
-from .langthaimodel import TIS620ThaiModel
-from .langhebrewmodel import Win1255HebrewModel
-from .hebrewprober import HebrewProber
-
-class SBCSGroupProber(CharSetGroupProber):
-    def __init__(self):
-        CharSetGroupProber.__init__(self)
-        self._mProbers = [ \
-            SingleByteCharSetProber(Win1251CyrillicModel),
-            SingleByteCharSetProber(Koi8rModel),
-            SingleByteCharSetProber(Latin5CyrillicModel),
-            SingleByteCharSetProber(MacCyrillicModel),
-            SingleByteCharSetProber(Ibm866Model),
-            SingleByteCharSetProber(Ibm855Model),
-            SingleByteCharSetProber(Latin7GreekModel),
-            SingleByteCharSetProber(Win1253GreekModel),
-            SingleByteCharSetProber(Latin5BulgarianModel),
-            SingleByteCharSetProber(Win1251BulgarianModel),
-            SingleByteCharSetProber(Latin2HungarianModel),
-            SingleByteCharSetProber(Win1250HungarianModel),
-            SingleByteCharSetProber(TIS620ThaiModel),
-            ]
-        hebrewProber = HebrewProber()
-        logicalHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, False, hebrewProber)
-        visualHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, True, hebrewProber)
-        hebrewProber.set_model_probers(logicalHebrewProber, visualHebrewProber)
-        self._mProbers.extend([hebrewProber, logicalHebrewProber, visualHebrewProber])
-
-        self.reset()
diff --git a/lib/requests/packages/chardet2/sjisprober.py b/lib/requests/packages/chardet2/sjisprober.py
deleted file mode 100755
index 349e9c4..0000000
--- a/lib/requests/packages/chardet2/sjisprober.py
+++ /dev/null
@@ -1,86 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import SJISDistributionAnalysis
-from .jpcntx import SJISContextAnalysis
-from .mbcssm import SJISSMModel
-from . import constants
-import sys
-from .constants import eStart, eError, eItsMe
-
-class SJISProber(MultiByteCharSetProber):
-    def __init__(self):
-        MultiByteCharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(SJISSMModel)
-        self._mDistributionAnalyzer = SJISDistributionAnalysis()
-        self._mContextAnalyzer = SJISContextAnalysis()
-        self.reset()
-
-    def reset(self):
-        MultiByteCharSetProber.reset(self)
-        self._mContextAnalyzer.reset()
-        
-    def get_charset_name(self):
-        return "SHIFT_JIS"
-
-    def feed(self, aBuf):
-        aLen = len(aBuf)
-        for i in range(0, aLen):
-            codingState = self._mCodingSM.next_state(aBuf[i])
-            if codingState == eError:
-                if constants._debug:
-                    sys.stderr.write(self.get_charset_name() + ' prober hit error at byte ' + str(i) + '\n')
-                self._mState = constants.eNotMe
-                break
-            elif codingState == eItsMe:
-                self._mState = constants.eFoundIt
-                break
-            elif codingState == eStart:
-                charLen = self._mCodingSM.get_current_charlen()
-                if i == 0:
-                    self._mLastChar[1] = aBuf[0]
-                    self._mContextAnalyzer.feed(self._mLastChar[2 - charLen :], charLen)
-                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
-                else:
-                    self._mContextAnalyzer.feed(aBuf[i + 1 - charLen : i + 3 - charLen], charLen)
-                    self._mDistributionAnalyzer.feed(aBuf[i - 1 : i + 1], charLen)
-                    
-        self._mLastChar[0] = aBuf[aLen - 1]
-        
-        if self.get_state() == constants.eDetecting:
-            if self._mContextAnalyzer.got_enough_data() and \
-                   (self.get_confidence() > constants.SHORTCUT_THRESHOLD):
-                self._mState = constants.eFoundIt
-
-        return self.get_state()
-
-    def get_confidence(self):
-        contxtCf = self._mContextAnalyzer.get_confidence()
-        distribCf = self._mDistributionAnalyzer.get_confidence()
-        return max(contxtCf, distribCf)
diff --git a/lib/requests/packages/chardet2/test.py b/lib/requests/packages/chardet2/test.py
deleted file mode 100755
index f3a3929..0000000
--- a/lib/requests/packages/chardet2/test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import print_function
-import sys, glob
-sys.path.insert(0, '..')
-from chardet.universaldetector import UniversalDetector
-
-count = 0
-u = UniversalDetector()
-for f in glob.glob(sys.argv[1]):
-    print(f.ljust(60), end=' ')
-    u.reset()
-    for line in open(f, 'rb'):
-        u.feed(line)
-        if u.done: break
-    u.close()
-    result = u.result
-    if result['encoding']:
-        print(result['encoding'], 'with confidence', result['confidence'])
-    else:
-        print('******** no result')
-    count += 1
-print(count, 'tests')
diff --git a/lib/requests/packages/chardet2/universaldetector.py b/lib/requests/packages/chardet2/universaldetector.py
deleted file mode 100755
index 0820d59..0000000
--- a/lib/requests/packages/chardet2/universaldetector.py
+++ /dev/null
@@ -1,155 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .latin1prober import Latin1Prober # windows-1252
-from .mbcsgroupprober import MBCSGroupProber # multi-byte character sets
-from .sbcsgroupprober import SBCSGroupProber # single-byte character sets
-from .escprober import EscCharSetProber # ISO-2122, etc.
-import re
-
-MINIMUM_THRESHOLD = 0.20
-ePureAscii = 0
-eEscAscii = 1
-eHighbyte = 2
-
-class UniversalDetector:
-    def __init__(self):
-        self._highBitDetector = re.compile(b'[\x80-\xFF]')
-        self._escDetector = re.compile(b'(\033|~{)')
-        self._mEscCharSetProber = None
-        self._mCharSetProbers = []
-        self.reset()
-
-    def reset(self):
-        self.result = {'encoding': None, 'confidence': 0.0}
-        self.done = False
-        self._mStart = True
-        self._mGotData = False
-        self._mInputState = ePureAscii
-        self._mLastChar = b''
-        if self._mEscCharSetProber:
-            self._mEscCharSetProber.reset()
-        for prober in self._mCharSetProbers:
-            prober.reset()
-
-    def feed(self, aBuf):
-        if self.done: return
-
-        aLen = len(aBuf)
-        if not aLen: return
-        
-        if not self._mGotData:
-            # If the data starts with BOM, we know it is UTF
-            if aBuf[:3] == '\xEF\xBB\xBF':
-                # EF BB BF  UTF-8 with BOM
-                self.result = {'encoding': "UTF-8", 'confidence': 1.0}
-            elif aBuf[:4] == '\xFF\xFE\x00\x00':
-                # FF FE 00 00  UTF-32, little-endian BOM
-                self.result = {'encoding': "UTF-32LE", 'confidence': 1.0}
-            elif aBuf[:4] == '\x00\x00\xFE\xFF': 
-                # 00 00 FE FF  UTF-32, big-endian BOM
-                self.result = {'encoding': "UTF-32BE", 'confidence': 1.0}
-            elif aBuf[:4] == '\xFE\xFF\x00\x00':
-                # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
-                self.result = {'encoding': "X-ISO-10646-UCS-4-3412", 'confidence': 1.0}
-            elif aBuf[:4] == '\x00\x00\xFF\xFE':
-                # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
-                self.result = {'encoding': "X-ISO-10646-UCS-4-2143", 'confidence': 1.0}
-            elif aBuf[:2] == '\xFF\xFE':
-                # FF FE  UTF-16, little endian BOM
-                self.result = {'encoding': "UTF-16LE", 'confidence': 1.0}
-            elif aBuf[:2] == '\xFE\xFF':
-                # FE FF  UTF-16, big endian BOM
-                self.result = {'encoding': "UTF-16BE", 'confidence': 1.0}
-
-        self._mGotData = True
-        if self.result['encoding'] and (self.result['confidence'] > 0.0):
-            self.done = True
-            return
-
-        if self._mInputState == ePureAscii:
-            if self._highBitDetector.search(aBuf):
-                self._mInputState = eHighbyte
-            elif (self._mInputState == ePureAscii) and self._escDetector.search(self._mLastChar + aBuf):
-                self._mInputState = eEscAscii
-
-        self._mLastChar = aBuf[-1:]
-
-        if self._mInputState == eEscAscii:
-            if not self._mEscCharSetProber:
-                self._mEscCharSetProber = EscCharSetProber()
-            if self._mEscCharSetProber.feed(aBuf) == constants.eFoundIt:
-                self.result = {'encoding': self._mEscCharSetProber.get_charset_name(),
-                               'confidence': self._mEscCharSetProber.get_confidence()}
-                self.done = True
-        elif self._mInputState == eHighbyte:
-            if not self._mCharSetProbers:
-                self._mCharSetProbers = [MBCSGroupProber(), SBCSGroupProber(), Latin1Prober()]
-            for prober in self._mCharSetProbers:
-                if prober.feed(aBuf) == constants.eFoundIt:
-                    self.result = {'encoding': prober.get_charset_name(),
-                                   'confidence': prober.get_confidence()}
-                    self.done = True
-                    break
-
-    def close(self):
-        if self.done: return
-        if not self._mGotData:
-            if constants._debug:
-                sys.stderr.write('no data received!\n')
-            return
-        self.done = True
-        
-        if self._mInputState == ePureAscii:
-            self.result = {'encoding': 'ascii', 'confidence': 1.0}
-            return self.result
-
-        if self._mInputState == eHighbyte:
-            proberConfidence = None
-            maxProberConfidence = 0.0
-            maxProber = None
-            for prober in self._mCharSetProbers:
-                if not prober: continue
-                proberConfidence = prober.get_confidence()
-                if proberConfidence > maxProberConfidence:
-                    maxProberConfidence = proberConfidence
-                    maxProber = prober
-            if maxProber and (maxProberConfidence > MINIMUM_THRESHOLD):
-                self.result = {'encoding': maxProber.get_charset_name(),
-                               'confidence': maxProber.get_confidence()}
-                return self.result
-
-        if constants._debug:
-            sys.stderr.write('no probers hit minimum threshhold\n')
-            for prober in self._mCharSetProbers[0].mProbers:
-                if not prober: continue
-                sys.stderr.write('%s confidence = %s\n' % \
-                                 (prober.get_charset_name(), \
-                                  prober.get_confidence()))
diff --git a/lib/requests/packages/chardet2/utf8prober.py b/lib/requests/packages/chardet2/utf8prober.py
deleted file mode 100755
index 12db07c..0000000
--- a/lib/requests/packages/chardet2/utf8prober.py
+++ /dev/null
@@ -1,77 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .constants import eStart, eError, eItsMe
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-from .mbcssm import UTF8SMModel
-
-ONE_CHAR_PROB = 0.5
-
-class UTF8Prober(CharSetProber):
-    def __init__(self):
-        CharSetProber.__init__(self)
-        self._mCodingSM = CodingStateMachine(UTF8SMModel)
-        self.reset()
-
-    def reset(self):
-        CharSetProber.reset(self)
-        self._mCodingSM.reset()
-        self._mNumOfMBChar = 0
-
-    def get_charset_name(self):
-        return "utf-8"
-
-    def feed(self, aBuf):
-        for c in aBuf:
-            codingState = self._mCodingSM.next_state(c)
-            if codingState == eError:
-                self._mState = constants.eNotMe
-                break
-            elif codingState == eItsMe:
-                self._mState = constants.eFoundIt
-                break
-            elif codingState == eStart:
-                if self._mCodingSM.get_current_charlen() >= 2:
-                    self._mNumOfMBChar += 1
-
-        if self.get_state() == constants.eDetecting:
-            if self.get_confidence() > constants.SHORTCUT_THRESHOLD:
-                self._mState = constants.eFoundIt
-
-        return self.get_state()
-
-    def get_confidence(self):
-        unlike = 0.99
-        if self._mNumOfMBChar < 6:
-            for i in range(0, self._mNumOfMBChar):
-                unlike = unlike * ONE_CHAR_PROB
-            return 1.0 - unlike
-        else:
-            return unlike
diff --git a/lib/requests/packages/oauthlib/__init__.py b/lib/requests/packages/oauthlib/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/lib/requests/packages/oauthlib/common.py b/lib/requests/packages/oauthlib/common.py
deleted file mode 100755
index 70fb6a0..0000000
--- a/lib/requests/packages/oauthlib/common.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-"""
-oauthlib.common
-~~~~~~~~~~~~~~
-
-This module provides data structures and utilities common
-to all implementations of OAuth.
-"""
-
-import random
-import re
-import string
-import time
-import urllib
-import urlparse
-
-UNICODE_ASCII_CHARACTER_SET = (string.ascii_letters.decode('ascii') +
-    string.digits.decode('ascii'))
-
-always_safe = (u'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-               u'abcdefghijklmnopqrstuvwxyz'
-               u'0123456789' u'_.-')
-
-
-def quote(s, safe=u'/'):
-    encoded = s.encode("utf-8")
-    quoted = urllib.quote(encoded, safe)
-    return quoted.decode("utf-8")
-
-
-def unquote(s):
-    encoded = s.encode("utf-8")
-    unquoted = urllib.unquote(encoded)
-    return unquoted.decode("utf-8")
-
-
-def urlencode(params):
-    utf8_params = encode_params_utf8(params)
-    urlencoded = urllib.urlencode(utf8_params)
-    return urlencoded.decode("utf-8")
-
-
-def encode_params_utf8(params):
-    """Ensures that all parameters in a list of 2-element tuples are encoded to
-    bytestrings using UTF-8
-    """
-    encoded = []
-    for k, v in params:
-        encoded.append((
-            k.encode('utf-8') if isinstance(k, unicode) else k,
-            v.encode('utf-8') if isinstance(v, unicode) else v))
-    return encoded
-
-
-def decode_params_utf8(params):
-    """Ensures that all parameters in a list of 2-element tuples are decoded to
-    unicode using UTF-8.
-    """
-    decoded = []
-    for k, v in params:
-        decoded.append((
-            k.decode('utf-8') if isinstance(k, str) else k,
-            v.decode('utf-8') if isinstance(v, str) else v))
-    return decoded
-
-
-urlencoded = set(always_safe) | set(u'=&;%+~')
-
-
-def urldecode(query):
-    """Decode a query string in x-www-form-urlencoded format into a sequence
-    of two-element tuples.
-
-    Unlike urlparse.parse_qsl(..., strict_parsing=True) urldecode will enforce
-    correct formatting of the query string by validation. If validation fails
-    a ValueError will be raised. urllib.parse_qsl will only raise errors if
-    any of name-value pairs omits the equals sign.
-    """
-    # Check if query contains invalid characters
-    if query and not set(query) <= urlencoded:
-        raise ValueError('Invalid characters in query string.')
-
-    # Check for correctly hex encoded values using a regular expression
-    # All encoded values begin with % followed by two hex characters
-    # correct = %00, %A0, %0A, %FF
-    # invalid = %G0, %5H, %PO
-    invalid_hex = u'%[^0-9A-Fa-f]|%[0-9A-Fa-f][^0-9A-Fa-f]'
-    if len(re.findall(invalid_hex, query)):
-        raise ValueError('Invalid hex encoding in query string.')
-
-    query = query.decode('utf-8') if isinstance(query, str) else query
-    # We want to allow queries such as "c2" whereas urlparse.parse_qsl
-    # with the strict_parsing flag will not.
-    params = urlparse.parse_qsl(query, keep_blank_values=True)
-
-    # unicode all the things
-    return decode_params_utf8(params)
-
-
-def extract_params(raw):
-    """Extract parameters and return them as a list of 2-tuples.
-
-    Will successfully extract parameters from urlencoded query strings,
-    dicts, or lists of 2-tuples. Empty strings/dicts/lists will return an
-    empty list of parameters. Any other input will result in a return
-    value of None.
-    """
-    if isinstance(raw, basestring):
-        try:
-            params = urldecode(raw)
-        except ValueError:
-            params = None
-    elif hasattr(raw, '__iter__'):
-        try:
-            dict(raw)
-        except ValueError:
-            params = None
-        except TypeError:
-            params = None
-        else:
-            params = list(raw.items() if isinstance(raw, dict) else raw)
-            params = decode_params_utf8(params)
-    else:
-        params = None
-
-    return params
-
-
-def generate_nonce():
-    """Generate pseudorandom nonce that is unlikely to repeat.
-
-    Per `section 3.3`_ of the OAuth 1 RFC 5849 spec.
-    Per `section 3.2.1`_ of the MAC Access Authentication spec.
-
-    A random 64-bit number is appended to the epoch timestamp for both
-    randomness and to decrease the likelihood of collisions.
-
-    .. _`section 3.2.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-3.2.1
-    .. _`section 3.3`: http://tools.ietf.org/html/rfc5849#section-3.3
-    """
-    return unicode(unicode(random.getrandbits(64)) + generate_timestamp())
-
-
-def generate_timestamp():
-    """Get seconds since epoch (UTC).
-
-    Per `section 3.3`_ of the OAuth 1 RFC 5849 spec.
-    Per `section 3.2.1`_ of the MAC Access Authentication spec.
-
-    .. _`section 3.2.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-3.2.1
-    .. _`section 3.3`: http://tools.ietf.org/html/rfc5849#section-3.3
-    """
-    return unicode(int(time.time()))
-
-
-def generate_token(length=30, chars=UNICODE_ASCII_CHARACTER_SET):
-    """Generates a non-guessable OAuth token
-
-    OAuth (1 and 2) does not specify the format of tokens except that they
-    should be strings of random characters. Tokens should not be guessable
-    and entropy when generating the random characters is important. Which is
-    why SystemRandom is used instead of the default random.choice method.
-    """
-    rand = random.SystemRandom()
-    return u''.join(rand.choice(chars) for x in range(length))
-
-
-def add_params_to_qs(query, params):
-    """Extend a query with a list of two-tuples."""
-    queryparams = urlparse.parse_qsl(query, keep_blank_values=True)
-    queryparams.extend(params)
-    return urlencode(queryparams)
-
-
-def add_params_to_uri(uri, params):
-    """Add a list of two-tuples to the uri query components."""
-    sch, net, path, par, query, fra = urlparse.urlparse(uri)
-    query = add_params_to_qs(query, params)
-    return urlparse.urlunparse((sch, net, path, par, query, fra))
-
-def safe_string_equals(a, b):
-    """ Near-constant time string comparison. 
-
-    Used in order to avoid timing attacks on sensitive information such
-    as secret keys during request verification (`rootLabs`_).
-
-    .. _`rootLabs`: http://rdist.root.org/2010/01/07/timing-independent-array-comparison/
-    
-    """
-    if len(a) != len(b):
-        return False
-
-    result = 0
-    for x, y in zip(a, b):
-        result |= ord(x) ^ ord(y)
-    return result == 0
-
-class Request(object):
-    """A malleable representation of a signable HTTP request.
-
-    Body argument may contain any data, but parameters will only be decoded if
-    they are one of:
-
-    * urlencoded query string
-    * dict
-    * list of 2-tuples
-
-    Anything else will be treated as raw body data to be passed through
-    unmolested.
-    """
-
-    def __init__(self, uri, http_method=u'GET', body=None, headers=None):
-        self.uri = uri
-        self.http_method = http_method
-        self.headers = headers or {}
-        self.body = body
-        self.decoded_body = extract_params(body)
-        self.oauth_params = []
-
-    @property
-    def uri_query(self):
-        return urlparse.urlparse(self.uri).query
-
-    @property
-    def uri_query_params(self):
-        return urlparse.parse_qsl(self.uri_query, keep_blank_values=True,
-                                  strict_parsing=True)
diff --git a/lib/requests/packages/oauthlib/oauth1/__init__.py b/lib/requests/packages/oauthlib/oauth1/__init__.py
deleted file mode 100755
index ef692b5..0000000
--- a/lib/requests/packages/oauthlib/oauth1/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-"""
-oauthlib.oauth1
-~~~~~~~~~~~~~~
-
-This module is a wrapper for the most recent implementation of OAuth 1.0 Client
-and Server classes.
-"""
-
-from .rfc5849 import Client, Server
-
diff --git a/lib/requests/packages/oauthlib/oauth1/rfc5849/__init__.py b/lib/requests/packages/oauthlib/oauth1/rfc5849/__init__.py
deleted file mode 100755
index da3988d..0000000
--- a/lib/requests/packages/oauthlib/oauth1/rfc5849/__init__.py
+++ /dev/null
@@ -1,889 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-"""
-oauthlib.oauth1.rfc5849
-~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for signing and checking OAuth 1.0 RFC 5849 requests.
-"""
-
-import logging
-import time
-import urlparse
-
-from oauthlib.common import Request, urlencode, generate_nonce
-from oauthlib.common import generate_timestamp
-from . import parameters, signature, utils
-
-logger = logging.getLogger(__name__)
-
-SIGNATURE_HMAC = u"HMAC-SHA1"
-SIGNATURE_RSA = u"RSA-SHA1"
-SIGNATURE_PLAINTEXT = u"PLAINTEXT"
-SIGNATURE_METHODS = (SIGNATURE_HMAC, SIGNATURE_RSA, SIGNATURE_PLAINTEXT)
-
-SIGNATURE_TYPE_AUTH_HEADER = u'AUTH_HEADER'
-SIGNATURE_TYPE_QUERY = u'QUERY'
-SIGNATURE_TYPE_BODY = u'BODY'
-
-CONTENT_TYPE_FORM_URLENCODED = u'application/x-www-form-urlencoded'
-
-
-class Client(object):
-    """A client used to sign OAuth 1.0 RFC 5849 requests"""
-    def __init__(self, client_key,
-            client_secret=None,
-            resource_owner_key=None,
-            resource_owner_secret=None,
-            callback_uri=None,
-            signature_method=SIGNATURE_HMAC,
-            signature_type=SIGNATURE_TYPE_AUTH_HEADER,
-            rsa_key=None, verifier=None):
-        self.client_key = client_key
-        self.client_secret = client_secret
-        self.resource_owner_key = resource_owner_key
-        self.resource_owner_secret = resource_owner_secret
-        self.signature_method = signature_method
-        self.signature_type = signature_type
-        self.callback_uri = callback_uri
-        self.rsa_key = rsa_key
-        self.verifier = verifier
-
-        if self.signature_method == SIGNATURE_RSA and self.rsa_key is None:
-            raise ValueError('rsa_key is required when using RSA signature method.')
-
-    def get_oauth_signature(self, request):
-        """Get an OAuth signature to be used in signing a request
-        """
-        if self.signature_method == SIGNATURE_PLAINTEXT:
-            # fast-path
-            return signature.sign_plaintext(self.client_secret,
-                self.resource_owner_secret)
-
-        uri, headers, body = self._render(request)
-
-        collected_params = signature.collect_parameters(
-            uri_query=urlparse.urlparse(uri).query,
-            body=body,
-            headers=headers)
-        logger.debug("Collected params: {0}".format(collected_params))
-
-        normalized_params = signature.normalize_parameters(collected_params)
-        normalized_uri = signature.normalize_base_string_uri(request.uri)
-        logger.debug("Normalized params: {0}".format(normalized_params))
-        logger.debug("Normalized URI: {0}".format(normalized_uri))
-
-        base_string = signature.construct_base_string(request.http_method,
-            normalized_uri, normalized_params)
-
-        logger.debug("Base signing string: {0}".format(base_string))
-
-        if self.signature_method == SIGNATURE_HMAC:
-            sig = signature.sign_hmac_sha1(base_string, self.client_secret,
-                self.resource_owner_secret)
-        elif self.signature_method == SIGNATURE_RSA:
-            sig = signature.sign_rsa_sha1(base_string, self.rsa_key)
-        else:
-            sig = signature.sign_plaintext(self.client_secret,
-                self.resource_owner_secret)
-
-        logger.debug("Signature: {0}".format(sig))
-        return sig
-
-    def get_oauth_params(self):
-        """Get the basic OAuth parameters to be used in generating a signature.
-        """
-        params = [
-            (u'oauth_nonce', generate_nonce()),
-            (u'oauth_timestamp', generate_timestamp()),
-            (u'oauth_version', u'1.0'),
-            (u'oauth_signature_method', self.signature_method),
-            (u'oauth_consumer_key', self.client_key),
-        ]
-        if self.resource_owner_key:
-            params.append((u'oauth_token', self.resource_owner_key))
-        if self.callback_uri:
-            params.append((u'oauth_callback', self.callback_uri))
-        if self.verifier:
-            params.append((u'oauth_verifier', self.verifier))
-
-        return params
-
-    def _render(self, request, formencode=False):
-        """Render a signed request according to signature type
-
-        Returns a 3-tuple containing the request URI, headers, and body.
-
-        If the formencode argument is True and the body contains parameters, it
-        is escaped and returned as a valid formencoded string.
-        """
-        # TODO what if there are body params on a header-type auth?
-        # TODO what if there are query params on a body-type auth?
-
-        uri, headers, body = request.uri, request.headers, request.body
-
-        # TODO: right now these prepare_* methods are very narrow in scope--they
-        # only affect their little thing. In some cases (for example, with
-        # header auth) it might be advantageous to allow these methods to touch
-        # other parts of the request, like the headers—so the prepare_headers
-        # method could also set the Content-Type header to x-www-form-urlencoded
-        # like the spec requires. This would be a fundamental change though, and
-        # I'm not sure how I feel about it.
-        if self.signature_type == SIGNATURE_TYPE_AUTH_HEADER:
-            headers = parameters.prepare_headers(request.oauth_params, request.headers)
-        elif self.signature_type == SIGNATURE_TYPE_BODY and request.decoded_body is not None:
-            body = parameters.prepare_form_encoded_body(request.oauth_params, request.decoded_body)
-            if formencode:
-                body = urlencode(body)
-            headers['Content-Type'] = u'application/x-www-form-urlencoded'
-        elif self.signature_type == SIGNATURE_TYPE_QUERY:
-            uri = parameters.prepare_request_uri_query(request.oauth_params, request.uri)
-        else:
-            raise ValueError('Unknown signature type specified.')
-
-        return uri, headers, body
-
-    def sign(self, uri, http_method=u'GET', body=None, headers=None):
-        """Sign a request
-
-        Signs an HTTP request with the specified parts.
-
-        Returns a 3-tuple of the signed request's URI, headers, and body.
-        Note that http_method is not returned as it is unaffected by the OAuth
-        signing process.
-
-        The body argument may be a dict, a list of 2-tuples, or a formencoded
-        string. The Content-Type header must be 'application/x-www-form-urlencoded'
-        if it is present.
-
-        If the body argument is not one of the above, it will be returned
-        verbatim as it is unaffected by the OAuth signing process. Attempting to
-        sign a request with non-formencoded data using the OAuth body signature
-        type is invalid and will raise an exception.
-
-        If the body does contain parameters, it will be returned as a properly-
-        formatted formencoded string.
-
-        All string data MUST be unicode. This includes strings inside body
-        dicts, for example.
-        """
-        # normalize request data
-        request = Request(uri, http_method, body, headers)
-
-        # sanity check
-        content_type = request.headers.get('Content-Type', None)
-        multipart = content_type and content_type.startswith('multipart/')
-        should_have_params = content_type == CONTENT_TYPE_FORM_URLENCODED
-        has_params = request.decoded_body is not None
-        # 3.4.1.3.1.  Parameter Sources
-        # [Parameters are collected from the HTTP request entity-body, but only
-        # if [...]:
-        #    *  The entity-body is single-part.
-        if multipart and has_params:
-            raise ValueError("Headers indicate a multipart body but body contains parameters.")
-        #    *  The entity-body follows the encoding requirements of the
-        #       "application/x-www-form-urlencoded" content-type as defined by
-        #       [W3C.REC-html40-19980424].
-        elif should_have_params and not has_params:
-            raise ValueError("Headers indicate a formencoded body but body was not decodable.")
-        #    *  The HTTP request entity-header includes the "Content-Type"
-        #       header field set to "application/x-www-form-urlencoded".
-        elif not should_have_params and has_params:
-            raise ValueError("Body contains parameters but Content-Type header was not set.")
-
-        # 3.5.2.  Form-Encoded Body
-        # Protocol parameters can be transmitted in the HTTP request entity-
-        # body, but only if the following REQUIRED conditions are met:
-        # o  The entity-body is single-part.
-        # o  The entity-body follows the encoding requirements of the
-        #    "application/x-www-form-urlencoded" content-type as defined by
-        #    [W3C.REC-html40-19980424].
-        # o  The HTTP request entity-header includes the "Content-Type" header
-        #    field set to "application/x-www-form-urlencoded".
-        elif self.signature_type == SIGNATURE_TYPE_BODY and not (
-                should_have_params and has_params and not multipart):
-            raise ValueError('Body signatures may only be used with form-urlencoded content')
-
-        # generate the basic OAuth parameters
-        request.oauth_params = self.get_oauth_params()
-
-        # generate the signature
-        request.oauth_params.append((u'oauth_signature', self.get_oauth_signature(request)))
-
-        # render the signed request and return it
-        return self._render(request, formencode=True)
-
-
-class Server(object):
-    """A server base class used to verify OAuth 1.0 RFC 5849 requests
-
-    OAuth providers should inherit from Server and implement the methods
-    and properties outlined below. Further details are provided in the
-    documentation for each method and property.
-
-    Methods used to check the format of input parameters. Common tests include
-    length, character set, membership, range or pattern. These tests are
-    referred to as `whitelisting or blacklisting`_. Whitelisting is better
-    but blacklisting can be usefull to spot malicious activity.
-    The following have methods a default implementation:
-
-    - check_client_key
-    - check_request_token
-    - check_access_token
-    - check_nonce
-    - check_verifier
-    - check_realm
-
-    The methods above default to whitelist input parameters, checking that they
-    are alphanumerical and between a minimum and maximum length. Rather than
-    overloading the methods a few properties can be used to configure these
-    methods.
-
-    @ safe_characters -> (character set)
-    @ client_key_length -> (min, max)
-    @ request_token_length -> (min, max)
-    @ access_token_length -> (min, max)
-    @ nonce_length -> (min, max)
-    @ verifier_length -> (min, max)
-    @ realms -> [list, of, realms]
-
-    Methods used to validate input parameters. These checks usually hit either
-    persistent or temporary storage such as databases or the filesystem. See
-    each methods documentation for detailed usage.
-    The following methods must be implemented:
-
-    - validate_client
-    - validate_request_token
-    - validate_access_token
-    - validate_nonce_and_timestamp
-    - validate_redirect_uri
-    - validate_requested_realm
-    - validate_realm
-    - validate_verifier
-
-    Method used to retrieve sensitive information from storage.
-    The following methods must be implemented:
-
-    - get_client_secret
-    - get_request_token_secret
-    - get_access_token_secret
-    - get_rsa_key
-
-    To prevent timing attacks it is necessary to not exit early even if the
-    client key or resource owner key is invalid. Instead dummy values should
-    be used during the remaining verification process. It is very important
-    that the dummy client and token are valid input parameters to the methods
-    get_client_secret, get_rsa_key and get_(access/request)_token_secret and
-    that the running time of those methods when given a dummy value remain
-    equivalent to the running time when given a valid client/resource owner.
-    The following properties must be implemented:
-
-    @ dummy_client
-    @ dummy_request_token
-    @ dummy_access_token
-
-    .. _`whitelisting or blacklisting`: http://www.schneier.com/blog/archives/2011/01/whitelisting_vs.html
-    """
-
-    def __init__(self):
-        pass
-
-    @property
-    def allowed_signature_methods(self):
-        return SIGNATURE_METHODS
-
-    @property
-    def safe_characters(self):
-        return set(utils.UNICODE_ASCII_CHARACTER_SET)
-
-    @property
-    def client_key_length(self):
-        return 20, 30
-
-    @property
-    def request_token_length(self):
-        return 20, 30
-
-    @property
-    def access_token_length(self):
-        return 20, 30
-
-    @property
-    def timestamp_lifetime(self):
-        return 600
-
-    @property
-    def nonce_length(self):
-        return 20, 30
-
-    @property
-    def verifier_length(self):
-        return 20, 30
-
-    @property
-    def realms(self):
-        return []
-
-    @property
-    def enforce_ssl(self):
-        return True
-
-    def check_client_key(self, client_key):
-        """Check that the client key only contains safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.client_key_length
-        return (set(client_key) <= self.safe_characters and
-                lower <= len(client_key) <= upper)
-
-    def check_request_token(self, request_token):
-        """Checks that the request token contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.request_token_length
-        return (set(request_token) <= self.safe_characters and
-                lower <= len(request_token) <= upper)
-
-    def check_access_token(self, request_token):
-        """Checks that the token contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.access_token_length
-        return (set(request_token) <= self.safe_characters and
-                lower <= len(request_token) <= upper)
-
-    def check_nonce(self, nonce):
-        """Checks that the nonce only contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.nonce_length
-        return (set(nonce) <= self.safe_characters and
-                lower <= len(nonce) <= upper)
-
-    def check_verifier(self, verifier):
-        """Checks that the verifier contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.verifier_length
-        return (set(verifier) <= self.safe_characters and
-                lower <= len(verifier) <= upper)
-
-    def check_realm(self, realm):
-        """Check that the realm is one of a set allowed realms.
-        """
-        return realm in self.realms
-
-    def get_client_secret(self, client_key):
-        """Retrieves the client secret associated with the client key.
-
-        This method must allow the use of a dummy client_key value.
-        Fetching the secret using the dummy key must take the same amount of
-        time as fetching a secret for a valid client.
-
-        Note that the returned key must be in plaintext.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    @property
-    def dummy_client(self):
-        """Dummy client used when an invalid client key is supplied.
-
-        The dummy client should be associated with either a client secret,
-        a rsa key or both depending on which signature methods are supported.
-        Providers should make sure that
-
-        get_client_secret(dummy_client)
-        get_rsa_key(dummy_client)
-
-        return a valid secret or key for the dummy client.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def get_request_token_secret(self, client_key, request_token):
-        """Retrieves the shared secret associated with the request token.
-
-        This method must allow the use of a dummy values and the running time
-        must be roughly equivalent to that of the running time of valid values.
-
-        Note that the returned key must be in plaintext.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def get_access_token_secret(self, client_key, access_token):
-        """Retrieves the shared secret associated with the access token.
-
-        This method must allow the use of a dummy values and the running time
-        must be roughly equivalent to that of the running time of valid values.
-
-        Note that the returned key must be in plaintext.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    @property
-    def dummy_request_token(self):
-        """Dummy request token used when an invalid token was supplied.
-
-        The dummy request token should be associated with a request token
-        secret such that get_request_token_secret(.., dummy_request_token)
-        returns a valid secret.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    @property
-    def dummy_access_token(self):
-        """Dummy access token used when an invalid token was supplied.
-
-        The dummy access token should be associated with an access token
-        secret such that get_access_token_secret(.., dummy_access_token)
-        returns a valid secret.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def get_rsa_key(self, client_key):
-        """Retrieves a previously stored client provided RSA key.
-
-        This method must allow the use of a dummy client_key value. Fetching
-        the rsa key using the dummy key must take the same aount of time
-        as fetching a key for a valid client.
-
-        Note that the key must be returned in plaintext.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def get_signature_type_and_params(self, request):
-        """Extracts parameters from query, headers and body. Signature type
-        is set to the source in which parameters were found.
-        """
-        header_params = signature.collect_parameters(headers=request.headers,
-                exclude_oauth_signature=False)
-        body_params = signature.collect_parameters(body=request.body,
-                exclude_oauth_signature=False)
-        query_params = signature.collect_parameters(uri_query=request.uri_query,
-                exclude_oauth_signature=False)
-
-        params = []
-        params.extend(header_params)
-        params.extend(body_params)
-        params.extend(query_params)
-        signature_types_with_oauth_params = filter(lambda s: s[2], (
-            (SIGNATURE_TYPE_AUTH_HEADER, params,
-                utils.filter_oauth_params(header_params)),
-            (SIGNATURE_TYPE_BODY, params,
-                utils.filter_oauth_params(body_params)),
-            (SIGNATURE_TYPE_QUERY, params,
-                utils.filter_oauth_params(query_params))
-        ))
-
-        if len(signature_types_with_oauth_params) > 1:
-            raise ValueError('oauth_ params must come from only 1 signature type but were found in %s' % ', '.join(
-                [s[0] for s in signature_types_with_oauth_params]))
-        try:
-            signature_type, params, oauth_params = signature_types_with_oauth_params[0]
-        except IndexError:
-            raise ValueError('oauth_ params are missing. Could not determine signature type.')
-
-        return signature_type, params, oauth_params
-
-    def validate_client_key(self, client_key):
-        """Validates that supplied client key is a registered and valid client.
-
-        Note that if the dummy client is supplied it should validate in same
-        or nearly the same amount of time as a valid one.
-
-        Bad:
-
-            if client_key == self.dummy_client:
-                return False
-            else:
-                return storage.has_client(client_key)
-
-        Good:
-
-            return storage.has_client(client_key) and client_key != self.dummy_client
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def validate_request_token(self, client_key, request_token):
-        """Validates that supplied request token is registered and valid.
-
-        Note that if the dummy request_token is supplied it should validate in
-        the same nearly the same amount of time as a valid one.
-
-        Bad:
-
-            if request_token == self.dummy_request_token:
-                return False
-            else:
-                return storage.has_request_token(request_token)
-
-        Good:
-
-            return (storage.has_request_token(request_token) and
-                    request_token != self.dummy_request_token)
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def validate_access_token(self, client_key, access_token):
-        """Validates that supplied access token is registered and valid.
-
-        Note that if the dummy access token is supplied it should validate in
-        the same or nearly the same amount of time as a valid one.
-
-        Bad:
-
-            if access_token == self.dummy_access_token:
-                return False
-            else:
-                return storage.has_access_token(access_token)
-
-        Good:
-
-            return (storage.has_access_token(access_token) and
-                    access_token != self.dummy_access_token)
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def validate_timestamp_and_nonce(self, client_key, timestamp, nonce,
-        request_token=None, access_token=None):
-        """Validates that the nonce has not been used before.
-
-        Per `Section 3.3`_ of the spec.
-
-        "A nonce is a random string, uniquely generated by the client to allow
-        the server to verify that a request has never been made before and
-        helps prevent replay attacks when requests are made over a non-secure
-        channel.  The nonce value MUST be unique across all requests with the
-        same timestamp, client credentials, and token combinations."
-
-        .. _`Section 3.3`: http://tools.ietf.org/html/rfc5849#section-3.3
-
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def validate_redirect_uri(self, client_key, redirect_uri):
-        """Validates the client supplied redirection URI.
-
-        It is highly recommended that OAuth providers require their clients
-        to register all redirection URIs prior to using them in requests and
-        register them as absolute URIs. See `CWE-601`_ for more information
-        about open redirection attacks.
-
-        By requiring registration of all redirection URIs it should be
-        straightforward for the provider to verify whether the supplied
-        redirect_uri is valid or not.
-
-        .. _`CWE-601`: http://cwe.mitre.org/top25/index.html#CWE-601
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-
-    def validate_requested_realm(self, client_key, realm):
-        """Validates that the client may request access to the realm.
-
-        This method is invoked when obtaining a request token and should
-        tie a realm to the request token and after user authorization
-        this realm restriction should transfer to the access token.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def validate_realm(self, client_key, access_token, uri=None,
-            required_realm=None):
-        """Validates access to the request realm.
-
-        How providers choose to use the realm parameter is outside the OAuth
-        specification but it is commonly used to restrict access to a subset
-        of protected resources such as "photos".
-
-        required_realm is a convenience parameter which can be used to provide
-        a per view method pre-defined list of allowed realms.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def validate_verifier(self, client_key, request_token, verifier):
-        """Validates a verification code.
-
-        OAuth providers issue a verification code to clients after the
-        resource owner authorizes access. This code is used by the client to
-        obtain token credentials and the provider must verify that the
-        verifier is valid and associated with the client as well as the
-        resource owner.
-        """
-        raise NotImplementedError("Subclasses must implement this function.")
-
-    def verify_request(self, uri, http_method=u'GET', body=None,
-            headers=None, require_resource_owner=True, require_verifier=False,
-            require_realm=False, required_realm=None):
-        """Verifies a request ensuring that the following is true:
-
-        Per `section 3.2`_ of the spec.
-
-        - all mandated OAuth parameters are supplied
-        - parameters are only supplied in one source which may be the URI
-          query, the Authorization header or the body
-        - all parameters are checked and validated, see comments and the
-          methods and properties of this class for further details.
-        - the supplied signature is verified against a recalculated one
-
-        A ValueError will be raised if any parameter is missing,
-        supplied twice or invalid. A HTTP 400 Response should be returned
-        upon catching an exception.
-
-        A HTTP 401 Response should be returned if verify_request returns False.
-
-        `Timing attacks`_ are prevented through the use of dummy credentials to
-        create near constant time verification even if an invalid credential
-        is used. Early exit on invalid credentials would enable attackers
-        to perform `enumeration attacks`_. Near constant time string comparison
-        is used to prevent secret key guessing. Note that timing attacks can
-        only be prevented through near constant time execution, not by adding
-        a random delay which would only require more samples to be gathered.
-
-        .. _`section 3.2`: http://tools.ietf.org/html/rfc5849#section-3.2
-        .. _`Timing attacks`: http://rdist.root.org/2010/07/19/exploiting-remote-timing-attacks/
-        .. _`enumeration attacks`: http://www.sans.edu/research/security-laboratory/article/attacks-browsing
-        """
-        # Only include body data from x-www-form-urlencoded requests
-        headers = headers or {}
-        if (u"Content-Type" in headers and
-                headers[u"Content-Type"] == CONTENT_TYPE_FORM_URLENCODED):
-            request = Request(uri, http_method, body, headers)
-        else:
-            request = Request(uri, http_method, u'', headers)
-
-        if self.enforce_ssl and not request.uri.lower().startswith("https://"):
-            raise ValueError("Insecure transport, only HTTPS is allowed.")
-
-        signature_type, params, oauth_params = self.get_signature_type_and_params(request)
-
-        # The server SHOULD return a 400 (Bad Request) status code when
-        # receiving a request with duplicated protocol parameters.
-        if len(dict(oauth_params)) != len(oauth_params):
-            raise ValueError("Duplicate OAuth entries.")
-
-        oauth_params = dict(oauth_params)
-        request_signature = oauth_params.get(u'oauth_signature')
-        client_key = oauth_params.get(u'oauth_consumer_key')
-        resource_owner_key = oauth_params.get(u'oauth_token')
-        nonce = oauth_params.get(u'oauth_nonce')
-        timestamp = oauth_params.get(u'oauth_timestamp')
-        callback_uri = oauth_params.get(u'oauth_callback')
-        verifier = oauth_params.get(u'oauth_verifier')
-        signature_method = oauth_params.get(u'oauth_signature_method')
-        realm = dict(params).get(u'realm')
-
-        # The server SHOULD return a 400 (Bad Request) status code when
-        # receiving a request with missing parameters.
-        if not all((request_signature, client_key, nonce,
-                    timestamp, signature_method)):
-            raise ValueError("Missing OAuth parameters.")
-
-        # OAuth does not mandate a particular signature method, as each
-        # implementation can have its own unique requirements.  Servers are
-        # free to implement and document their own custom methods.
-        # Recommending any particular method is beyond the scope of this
-        # specification.  Implementers should review the Security
-        # Considerations section (`Section 4`_) before deciding on which
-        # method to support.
-        # .. _`Section 4`: http://tools.ietf.org/html/rfc5849#section-4
-        if not signature_method in self.allowed_signature_methods:
-            raise ValueError("Invalid signature method.")
-
-        # Servers receiving an authenticated request MUST validate it by:
-        #   If the "oauth_version" parameter is present, ensuring its value is
-        #   "1.0".
-        if u'oauth_version' in oauth_params and oauth_params[u'oauth_version'] != u'1.0':
-            raise ValueError("Invalid OAuth version.")
-
-        # The timestamp value MUST be a positive integer. Unless otherwise
-        # specified by the server's documentation, the timestamp is expressed
-        # in the number of seconds since January 1, 1970 00:00:00 GMT.
-        if len(timestamp) != 10:
-            raise ValueError("Invalid timestamp size")
-        try:
-            ts = int(timestamp)
-
-        except ValueError:
-            raise ValueError("Timestamp must be an integer")
-
-        else:
-            # To avoid the need to retain an infinite number of nonce values for
-            # future checks, servers MAY choose to restrict the time period after
-            # which a request with an old timestamp is rejected.
-            if time.time() - ts > self.timestamp_lifetime:
-                raise ValueError("Request too old, over 10 minutes.")
-
-        # Provider specific validation of parameters, used to enforce
-        # restrictions such as character set and length.
-        if not self.check_client_key(client_key):
-            raise ValueError("Invalid client key.")
-
-        if not resource_owner_key and require_resource_owner:
-            raise ValueError("Missing resource owner.")
-
-        if (require_resource_owner and not require_verifier and
-            not self.check_access_token(resource_owner_key)):
-            raise ValueError("Invalid resource owner key.")
-
-        if (require_resource_owner and require_verifier and
-            not self.check_request_token(resource_owner_key)):
-            raise ValueError("Invalid resource owner key.")
-
-        if not self.check_nonce(nonce):
-            raise ValueError("Invalid nonce.")
-
-        if realm and not self.check_realm(realm):
-            raise ValueError("Invalid realm. Allowed are %s" % self.realms)
-
-        if not verifier and require_verifier:
-            raise ValueError("Missing verifier.")
-
-        if require_verifier and not self.check_verifier(verifier):
-            raise ValueError("Invalid verifier.")
-
-        # Servers receiving an authenticated request MUST validate it by:
-        #   If using the "HMAC-SHA1" or "RSA-SHA1" signature methods, ensuring
-        #   that the combination of nonce/timestamp/token (if present)
-        #   received from the client has not been used before in a previous
-        #   request (the server MAY reject requests with stale timestamps as
-        #   described in `Section 3.3`_).
-        # .._`Section 3.3`: http://tools.ietf.org/html/rfc5849#section-3.3
-        #
-        # We check this before validating client and resource owner for
-        # increased security and performance, both gained by doing less work.
-        if require_verifier:
-            token = {"request_token": resource_owner_key}
-        else:
-            token = {"access_token": resource_owner_key}
-        if not self.validate_timestamp_and_nonce(client_key, timestamp,
-                nonce, **token):
-                return False
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid client credentials.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy client is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable client enumeration
-        valid_client = self.validate_client_key(client_key)
-        if not valid_client:
-            client_key = self.dummy_client
-
-        # Ensure a valid redirection uri is used
-        valid_redirect = self.validate_redirect_uri(client_key, callback_uri)
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid or expired token.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy token is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable resource owner enumeration
-        if resource_owner_key:
-            if require_verifier:
-                valid_resource_owner = self.validate_request_token(
-                    client_key, resource_owner_key)
-            else:
-                valid_resource_owner = self.validate_access_token(
-                    client_key, resource_owner_key)
-            if not valid_resource_owner:
-                resource_owner_key = self.dummy_resource_owner
-        else:
-            valid_resource_owner = True
-
-        # Note that `realm`_ is only used in authorization headers and how
-        # it should be interepreted is not included in the OAuth spec.
-        # However they could be seen as a scope or realm to which the
-        # client has access and as such every client should be checked
-        # to ensure it is authorized access to that scope or realm.
-        # .. _`realm`: http://tools.ietf.org/html/rfc2617#section-1.2
-        #
-        # Note that early exit would enable client realm access enumeration.
-        #
-        # The require_realm indicates this is the first step in the OAuth
-        # workflow where a client requests access to a specific realm.
-        #
-        # Clients obtaining an access token will not supply a realm and it will
-        # not be checked. Instead the previously requested realm should be
-        # transferred from the request token to the access token.
-        #
-        # Access to protected resources will always validate the realm but note
-        # that the realm is now tied to the access token and not provided by
-        # the client.
-        if require_realm and not resource_owner_key:
-            valid_realm = self.validate_requested_realm(client_key, realm)
-        elif require_verifier:
-            valid_realm = True
-        else:
-            valid_realm = self.validate_realm(client_key, resource_owner_key,
-                    uri=request.uri, required_realm=required_realm)
-
-        # The server MUST verify (Section 3.2) the validity of the request,
-        # ensure that the resource owner has authorized the provisioning of
-        # token credentials to the client, and ensure that the temporary
-        # credentials have not expired or been used before.  The server MUST
-        # also verify the verification code received from the client.
-        # .. _`Section 3.2`: http://tools.ietf.org/html/rfc5849#section-3.2
-        #
-        # Note that early exit would enable resource owner authorization
-        # verifier enumertion.
-        if verifier:
-            valid_verifier = self.validate_verifier(client_key,
-                resource_owner_key, verifier)
-        else:
-            valid_verifier = True
-
-        # Parameters to Client depend on signature method which may vary
-        # for each request. Note that HMAC-SHA1 and PLAINTEXT share parameters
-
-        request.params = filter(lambda x: x[0] != "oauth_signature", params)
-        request.signature = request_signature
-
-        # ---- RSA Signature verification ----
-        if signature_method == SIGNATURE_RSA:
-            # The server verifies the signature per `[RFC3447] section 8.2.2`_
-            # .. _`[RFC3447] section 8.2.2`: http://tools.ietf.org/html/rfc3447#section-8.2.1
-            rsa_key = self.get_rsa_key(client_key)
-            valid_signature = signature.verify_rsa_sha1(request, rsa_key)
-
-        # ---- HMAC or Plaintext Signature verification ----
-        else:
-            # Servers receiving an authenticated request MUST validate it by:
-            #   Recalculating the request signature independently as described in
-            #   `Section 3.4`_ and comparing it to the value received from the
-            #   client via the "oauth_signature" parameter.
-            # .. _`Section 3.4`: http://tools.ietf.org/html/rfc5849#section-3.4
-            client_secret = self.get_client_secret(client_key)
-            if require_verifier:
-                resource_owner_secret = self.get_request_token_secret(
-                    client_key, resource_owner_key)
-            else:
-                resource_owner_secret = self.get_access_token_secret(
-                    client_key, resource_owner_key)
-
-            if signature_method == SIGNATURE_HMAC:
-                valid_signature = signature.verify_hmac_sha1(request,
-                    client_secret, resource_owner_secret)
-            else:
-                valid_signature = signature.verify_plaintext(request,
-                    client_secret, resource_owner_secret)
-
-        # We delay checking validity until the very end, using dummy values for
-        # calculations and fetching secrets/keys to ensure the flow of every
-        # request remains almost identical regardless of whether valid values
-        # have been supplied. This ensures near constant time execution and
-        # prevents malicious users from guessing sensitive information
-        v = all((valid_client, valid_resource_owner, valid_realm,
-                    valid_redirect, valid_verifier, valid_signature))
-        logger = logging.getLogger("oauthlib")
-        if not v:
-            logger.info("[Failure] OAuthLib request verification failed.")
-            logger.info("Valid client:\t%s" % valid_client)
-            logger.info("Valid token:\t%s\t(Required: %s" % (valid_resource_owner, require_resource_owner))
-            logger.info("Valid realm:\t%s\t(Required: %s)" % (valid_realm, require_realm))
-            logger.info("Valid callback:\t%s" % valid_redirect)
-            logger.info("Valid verifier:\t%s\t(Required: %s)" % (valid_verifier, require_verifier))
-            logger.info("Valid signature:\t%s" % valid_signature)
-        return v
diff --git a/lib/requests/packages/oauthlib/oauth1/rfc5849/parameters.py b/lib/requests/packages/oauthlib/oauth1/rfc5849/parameters.py
deleted file mode 100755
index dee23a4..0000000
--- a/lib/requests/packages/oauthlib/oauth1/rfc5849/parameters.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-"""
-oauthlib.parameters
-~~~~~~~~~~~~~~~~~~~
-
-This module contains methods related to `section 3.5`_ of the OAuth 1.0a spec.
-
-.. _`section 3.5`: http://tools.ietf.org/html/rfc5849#section-3.5
-"""
-
-from urlparse import urlparse, urlunparse
-from . import utils
-from oauthlib.common import extract_params, urlencode
-
-
-# TODO: do we need filter_params now that oauth_params are handled by Request?
-#       We can easily pass in just oauth protocol params.
- at utils.filter_params
-def prepare_headers(oauth_params, headers=None, realm=None):
-    """**Prepare the Authorization header.**
-    Per `section 3.5.1`_ of the spec.
-
-    Protocol parameters can be transmitted using the HTTP "Authorization"
-    header field as defined by `RFC2617`_ with the auth-scheme name set to
-    "OAuth" (case insensitive).
-
-    For example::
-
-        Authorization: OAuth realm="Example",
-            oauth_consumer_key="0685bd9184jfhq22",
-            oauth_token="ad180jjd733klru7",
-            oauth_signature_method="HMAC-SHA1",
-            oauth_signature="wOJIO9A2W5mFwDgiDvZbTSMK%2FPY%3D",
-            oauth_timestamp="137131200",
-            oauth_nonce="4572616e48616d6d65724c61686176",
-            oauth_version="1.0"
-
-
-    .. _`section 3.5.1`: http://tools.ietf.org/html/rfc5849#section-3.5.1
-    .. _`RFC2617`: http://tools.ietf.org/html/rfc2617
-    """
-    headers = headers or {}
-
-    # Protocol parameters SHALL be included in the "Authorization" header
-    # field as follows:
-    authorization_header_parameters_parts = []
-    for oauth_parameter_name, value in oauth_params:
-        # 1.  Parameter names and values are encoded per Parameter Encoding
-        #     (`Section 3.6`_)
-        #
-        # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-        escaped_name = utils.escape(oauth_parameter_name)
-        escaped_value = utils.escape(value)
-
-        # 2.  Each parameter's name is immediately followed by an "=" character
-        #     (ASCII code 61), a """ character (ASCII code 34), the parameter
-        #     value (MAY be empty), and another """ character (ASCII code 34).
-        part = u'{0}="{1}"'.format(escaped_name, escaped_value)
-
-        authorization_header_parameters_parts.append(part)
-
-    # 3.  Parameters are separated by a "," character (ASCII code 44) and
-    #     OPTIONAL linear whitespace per `RFC2617`_.
-    #
-    # .. _`RFC2617`: http://tools.ietf.org/html/rfc2617
-    authorization_header_parameters = ', '.join(
-        authorization_header_parameters_parts)
-
-    # 4.  The OPTIONAL "realm" parameter MAY be added and interpreted per
-    #     `RFC2617 section 1.2`_.
-    #
-    # .. _`RFC2617 section 1.2`: http://tools.ietf.org/html/rfc2617#section-1.2
-    if realm:
-        # NOTE: realm should *not* be escaped
-        authorization_header_parameters = (u'realm="%s", ' % realm +
-            authorization_header_parameters)
-
-    # the auth-scheme name set to "OAuth" (case insensitive).
-    authorization_header = u'OAuth %s' % authorization_header_parameters
-
-    # contribute the Authorization header to the given headers
-    full_headers = {}
-    full_headers.update(headers)
-    full_headers[u'Authorization'] = authorization_header
-    return full_headers
-
-
-def _append_params(oauth_params, params):
-    """Append OAuth params to an existing set of parameters.
-
-    Both params and oauth_params is must be lists of 2-tuples.
-
-    Per `section 3.5.2`_ and `3.5.3`_ of the spec.
-
-    .. _`section 3.5.2`: http://tools.ietf.org/html/rfc5849#section-3.5.2
-    .. _`3.5.3`: http://tools.ietf.org/html/rfc5849#section-3.5.3
-
-    """
-    merged = list(params)
-    merged.extend(oauth_params)
-    # The request URI / entity-body MAY include other request-specific
-    # parameters, in which case, the protocol parameters SHOULD be appended
-    # following the request-specific parameters, properly separated by an "&"
-    # character (ASCII code 38)
-    merged.sort(key=lambda i: i[0].startswith('oauth_'))
-    return merged
-
-
-def prepare_form_encoded_body(oauth_params, body):
-    """Prepare the Form-Encoded Body.
-
-    Per `section 3.5.2`_ of the spec.
-
-    .. _`section 3.5.2`: http://tools.ietf.org/html/rfc5849#section-3.5.2
-
-    """
-    # append OAuth params to the existing body
-    return _append_params(oauth_params, body)
-
-
-def prepare_request_uri_query(oauth_params, uri):
-    """Prepare the Request URI Query.
-
-    Per `section 3.5.3`_ of the spec.
-
-    .. _`section 3.5.3`: http://tools.ietf.org/html/rfc5849#section-3.5.3
-
-    """
-    # append OAuth params to the existing set of query components
-    sch, net, path, par, query, fra = urlparse(uri)
-    query = urlencode(_append_params(oauth_params, extract_params(query) or []))
-    return urlunparse((sch, net, path, par, query, fra))
diff --git a/lib/requests/packages/oauthlib/oauth1/rfc5849/signature.py b/lib/requests/packages/oauthlib/oauth1/rfc5849/signature.py
deleted file mode 100755
index dbd43aa..0000000
--- a/lib/requests/packages/oauthlib/oauth1/rfc5849/signature.py
+++ /dev/null
@@ -1,551 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-"""
-oauthlib.oauth1.rfc5849.signature
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module represents a direct implementation of `section 3.4`_ of the spec.
-
-Terminology:
- * Client: software interfacing with an OAuth API
- * Server: the API provider
- * Resource Owner: the user who is granting authorization to the client
-
-Steps for signing a request:
-
-1. Collect parameters from the uri query, auth header, & body
-2. Normalize those parameters
-3. Normalize the uri
-4. Pass the normalized uri, normalized parameters, and http method to
-   construct the base string
-5. Pass the base string and any keys needed to a signing function
-
-.. _`section 3.4`: http://tools.ietf.org/html/rfc5849#section-3.4
-"""
-import binascii
-import hashlib
-import hmac
-import urlparse
-from . import utils
-from oauthlib.common import extract_params, safe_string_equals
-
-
-def construct_base_string(http_method, base_string_uri,
-        normalized_encoded_request_parameters):
-    """**String Construction**
-    Per `section 3.4.1.1`_ of the spec.
-
-    For example, the HTTP request::
-
-        POST /request?b5=%3D%253D&a3=a&c%40=&a2=r%20b HTTP/1.1
-        Host: example.com
-        Content-Type: application/x-www-form-urlencoded
-        Authorization: OAuth realm="Example",
-            oauth_consumer_key="9djdj82h48djs9d2",
-            oauth_token="kkk9d7dh3k39sjv7",
-            oauth_signature_method="HMAC-SHA1",
-            oauth_timestamp="137131201",
-            oauth_nonce="7d8f3e4a",
-            oauth_signature="bYT5CMsGcbgUdFHObYMEfcx6bsw%3D"
-
-        c2&a3=2+q
-
-    is represented by the following signature base string (line breaks
-    are for display purposes only)::
-
-        POST&http%3A%2F%2Fexample.com%2Frequest&a2%3Dr%2520b%26a3%3D2%2520q
-        %26a3%3Da%26b5%3D%253D%25253D%26c%2540%3D%26c2%3D%26oauth_consumer_
-        key%3D9djdj82h48djs9d2%26oauth_nonce%3D7d8f3e4a%26oauth_signature_m
-        ethod%3DHMAC-SHA1%26oauth_timestamp%3D137131201%26oauth_token%3Dkkk
-        9d7dh3k39sjv7
-
-    .. _`section 3.4.1.1`: http://tools.ietf.org/html/rfc5849#section-3.4.1.1
-    """
-
-    # The signature base string is constructed by concatenating together,
-    # in order, the following HTTP request elements:
-
-    # 1.  The HTTP request method in uppercase.  For example: "HEAD",
-    #     "GET", "POST", etc.  If the request uses a custom HTTP method, it
-    #     MUST be encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-    base_string = utils.escape(http_method.upper())
-
-    # 2.  An "&" character (ASCII code 38).
-    base_string += u'&'
-
-    # 3.  The base string URI from `Section 3.4.1.2`_, after being encoded
-    #     (`Section 3.6`_).
-    #
-    # .. _`Section 3.4.1.2`: http://tools.ietf.org/html/rfc5849#section-3.4.1.2
-    # .. _`Section 3.4.6`: http://tools.ietf.org/html/rfc5849#section-3.4.6
-    base_string += utils.escape(base_string_uri)
-
-    # 4.  An "&" character (ASCII code 38).
-    base_string += u'&'
-
-    # 5.  The request parameters as normalized in `Section 3.4.1.3.2`_, after
-    #     being encoded (`Section 3.6`).
-    #
-    # .. _`Section 3.4.1.3.2`: http://tools.ietf.org/html/rfc5849#section-3.4.1.3.2
-    # .. _`Section 3.4.6`: http://tools.ietf.org/html/rfc5849#section-3.4.6
-    base_string += utils.escape(normalized_encoded_request_parameters)
-
-    return base_string
-
-
-def normalize_base_string_uri(uri):
-    """**Base String URI**
-    Per `section 3.4.1.2`_ of the spec.
-
-    For example, the HTTP request::
-
-        GET /r%20v/X?id=123 HTTP/1.1
-        Host: EXAMPLE.COM:80
-
-    is represented by the base string URI: "http://example.com/r%20v/X".
-
-    In another example, the HTTPS request::
-
-        GET /?q=1 HTTP/1.1
-        Host: www.example.net:8080
-
-    is represented by the base string URI: "https://www.example.net:8080/".
-
-    .. _`section 3.4.1.2`: http://tools.ietf.org/html/rfc5849#section-3.4.1.2
-    """
-    if not isinstance(uri, unicode):
-        raise ValueError('uri must be a unicode object.')
-
-    # FIXME: urlparse does not support unicode
-    scheme, netloc, path, params, query, fragment = urlparse.urlparse(uri)
-
-    # The scheme, authority, and path of the request resource URI `RFC3986`
-    # are included by constructing an "http" or "https" URI representing
-    # the request resource (without the query or fragment) as follows:
-    #
-    # .. _`RFC2616`: http://tools.ietf.org/html/rfc3986
-
-    # 1.  The scheme and host MUST be in lowercase.
-    scheme = scheme.lower()
-    netloc = netloc.lower()
-
-    # 2.  The host and port values MUST match the content of the HTTP
-    #     request "Host" header field.
-    # TODO: enforce this constraint
-
-    # 3.  The port MUST be included if it is not the default port for the
-    #     scheme, and MUST be excluded if it is the default.  Specifically,
-    #     the port MUST be excluded when making an HTTP request `RFC2616`_
-    #     to port 80 or when making an HTTPS request `RFC2818`_ to port 443.
-    #     All other non-default port numbers MUST be included.
-    #
-    # .. _`RFC2616`: http://tools.ietf.org/html/rfc2616
-    # .. _`RFC2818`: http://tools.ietf.org/html/rfc2818
-    default_ports = (
-        (u'http', u'80'),
-        (u'https', u'443'),
-    )
-    if u':' in netloc:
-        host, port = netloc.split(u':', 1)
-        if (scheme, port) in default_ports:
-            netloc = host
-
-    return urlparse.urlunparse((scheme, netloc, path, u'', u'', u''))
-
-
-# ** Request Parameters **
-#
-#    Per `section 3.4.1.3`_ of the spec.
-#
-#    In order to guarantee a consistent and reproducible representation of
-#    the request parameters, the parameters are collected and decoded to
-#    their original decoded form.  They are then sorted and encoded in a
-#    particular manner that is often different from their original
-#    encoding scheme, and concatenated into a single string.
-#
-#    .. _`section 3.4.1.3`: http://tools.ietf.org/html/rfc5849#section-3.4.1.3
-
-def collect_parameters(uri_query='', body=[], headers=None,
-        exclude_oauth_signature=True):
-    """**Parameter Sources**
-
-    Parameters starting with `oauth_` will be unescaped.
-
-    Body parameters must be supplied as a dict, a list of 2-tuples, or a
-    formencoded query string.
-
-    Headers must be supplied as a dict.
-
-    Per `section 3.4.1.3.1`_ of the spec.
-
-    For example, the HTTP request::
-
-        POST /request?b5=%3D%253D&a3=a&c%40=&a2=r%20b HTTP/1.1
-        Host: example.com
-        Content-Type: application/x-www-form-urlencoded
-        Authorization: OAuth realm="Example",
-            oauth_consumer_key="9djdj82h48djs9d2",
-            oauth_token="kkk9d7dh3k39sjv7",
-            oauth_signature_method="HMAC-SHA1",
-            oauth_timestamp="137131201",
-            oauth_nonce="7d8f3e4a",
-            oauth_signature="djosJKDKJSD8743243%2Fjdk33klY%3D"
-
-        c2&a3=2+q
-
-    contains the following (fully decoded) parameters used in the
-    signature base sting::
-
-        +------------------------+------------------+
-        |          Name          |       Value      |
-        +------------------------+------------------+
-        |           b5           |       =%3D       |
-        |           a3           |         a        |
-        |           c@           |                  |
-        |           a2           |        r b       |
-        |   oauth_consumer_key   | 9djdj82h48djs9d2 |
-        |       oauth_token      | kkk9d7dh3k39sjv7 |
-        | oauth_signature_method |     HMAC-SHA1    |
-        |     oauth_timestamp    |     137131201    |
-        |       oauth_nonce      |     7d8f3e4a     |
-        |           c2           |                  |
-        |           a3           |        2 q       |
-        +------------------------+------------------+
-
-    Note that the value of "b5" is "=%3D" and not "==".  Both "c@" and
-    "c2" have empty values.  While the encoding rules specified in this
-    specification for the purpose of constructing the signature base
-    string exclude the use of a "+" character (ASCII code 43) to
-    represent an encoded space character (ASCII code 32), this practice
-    is widely used in "application/x-www-form-urlencoded" encoded values,
-    and MUST be properly decoded, as demonstrated by one of the "a3"
-    parameter instances (the "a3" parameter is used twice in this
-    request).
-
-    .. _`section 3.4.1.3.1`: http://tools.ietf.org/html/rfc5849#section-3.4.1.3.1
-    """
-    headers = headers or {}
-    params = []
-
-    # The parameters from the following sources are collected into a single
-    # list of name/value pairs:
-
-    # *  The query component of the HTTP request URI as defined by
-    #    `RFC3986, Section 3.4`_.  The query component is parsed into a list
-    #    of name/value pairs by treating it as an
-    #    "application/x-www-form-urlencoded" string, separating the names
-    #    and values and decoding them as defined by
-    #    `W3C.REC-html40-19980424`_, Section 17.13.4.
-    #
-    # .. _`RFC3986, Section 3.4`: http://tools.ietf.org/html/rfc3986#section-3.4
-    # .. _`W3C.REC-html40-19980424`: http://tools.ietf.org/html/rfc5849#ref-W3C.REC-html40-19980424
-    if uri_query:
-        params.extend(urlparse.parse_qsl(uri_query, keep_blank_values=True))
-
-    # *  The OAuth HTTP "Authorization" header field (`Section 3.5.1`_) if
-    #    present.  The header's content is parsed into a list of name/value
-    #    pairs excluding the "realm" parameter if present.  The parameter
-    #    values are decoded as defined by `Section 3.5.1`_.
-    #
-    # .. _`Section 3.5.1`: http://tools.ietf.org/html/rfc5849#section-3.5.1
-    if headers:
-        headers_lower = dict((k.lower(), v) for k, v in headers.items())
-        authorization_header = headers_lower.get(u'authorization')
-        if authorization_header is not None:
-            params.extend([i for i in utils.parse_authorization_header(
-                authorization_header) if i[0] != u'realm'])
-
-    # *  The HTTP request entity-body, but only if all of the following
-    #    conditions are met:
-    #     *  The entity-body is single-part.
-    #
-    #     *  The entity-body follows the encoding requirements of the
-    #        "application/x-www-form-urlencoded" content-type as defined by
-    #        `W3C.REC-html40-19980424`_.
-
-    #     *  The HTTP request entity-header includes the "Content-Type"
-    #        header field set to "application/x-www-form-urlencoded".
-    #
-    # .._`W3C.REC-html40-19980424`: http://tools.ietf.org/html/rfc5849#ref-W3C.REC-html40-19980424
-
-    # TODO: enforce header param inclusion conditions
-    bodyparams = extract_params(body) or []
-    params.extend(bodyparams)
-
-    # ensure all oauth params are unescaped
-    unescaped_params = []
-    for k, v in params:
-        if k.startswith(u'oauth_'):
-            v = utils.unescape(v)
-        unescaped_params.append((k, v))
-
-    # The "oauth_signature" parameter MUST be excluded from the signature
-    # base string if present.
-    if exclude_oauth_signature:
-        unescaped_params = filter(lambda i: i[0] != u'oauth_signature',
-            unescaped_params)
-
-    return unescaped_params
-
-
-def normalize_parameters(params):
-    """**Parameters Normalization**
-    Per `section 3.4.1.3.2`_ of the spec.
-
-    For example, the list of parameters from the previous section would
-    be normalized as follows:
-
-    Encoded::
-
-    +------------------------+------------------+
-    |          Name          |       Value      |
-    +------------------------+------------------+
-    |           b5           |     %3D%253D     |
-    |           a3           |         a        |
-    |          c%40          |                  |
-    |           a2           |       r%20b      |
-    |   oauth_consumer_key   | 9djdj82h48djs9d2 |
-    |       oauth_token      | kkk9d7dh3k39sjv7 |
-    | oauth_signature_method |     HMAC-SHA1    |
-    |     oauth_timestamp    |     137131201    |
-    |       oauth_nonce      |     7d8f3e4a     |
-    |           c2           |                  |
-    |           a3           |       2%20q      |
-    +------------------------+------------------+
-
-    Sorted::
-
-    +------------------------+------------------+
-    |          Name          |       Value      |
-    +------------------------+------------------+
-    |           a2           |       r%20b      |
-    |           a3           |       2%20q      |
-    |           a3           |         a        |
-    |           b5           |     %3D%253D     |
-    |          c%40          |                  |
-    |           c2           |                  |
-    |   oauth_consumer_key   | 9djdj82h48djs9d2 |
-    |       oauth_nonce      |     7d8f3e4a     |
-    | oauth_signature_method |     HMAC-SHA1    |
-    |     oauth_timestamp    |     137131201    |
-    |       oauth_token      | kkk9d7dh3k39sjv7 |
-    +------------------------+------------------+
-
-    Concatenated Pairs::
-
-    +-------------------------------------+
-    |              Name=Value             |
-    +-------------------------------------+
-    |               a2=r%20b              |
-    |               a3=2%20q              |
-    |                 a3=a                |
-    |             b5=%3D%253D             |
-    |                c%40=                |
-    |                 c2=                 |
-    | oauth_consumer_key=9djdj82h48djs9d2 |
-    |         oauth_nonce=7d8f3e4a        |
-    |   oauth_signature_method=HMAC-SHA1  |
-    |      oauth_timestamp=137131201      |
-    |     oauth_token=kkk9d7dh3k39sjv7    |
-    +-------------------------------------+
-
-    and concatenated together into a single string (line breaks are for
-    display purposes only)::
-
-        a2=r%20b&a3=2%20q&a3=a&b5=%3D%253D&c%40=&c2=&oauth_consumer_key=9dj
-        dj82h48djs9d2&oauth_nonce=7d8f3e4a&oauth_signature_method=HMAC-SHA1
-        &oauth_timestamp=137131201&oauth_token=kkk9d7dh3k39sjv7
-
-    .. _`section 3.4.1.3.2`: http://tools.ietf.org/html/rfc5849#section-3.4.1.3.2
-    """
-
-    # The parameters collected in `Section 3.4.1.3`_ are normalized into a
-    # single string as follows:
-    #
-    # .. _`Section 3.4.1.3`: http://tools.ietf.org/html/rfc5849#section-3.4.1.3
-
-    # 1.  First, the name and value of each parameter are encoded
-    #     (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-    key_values = [(utils.escape(k), utils.escape(v)) for k, v in params]
-
-    # 2.  The parameters are sorted by name, using ascending byte value
-    #     ordering.  If two or more parameters share the same name, they
-    #     are sorted by their value.
-    key_values.sort()
-
-    # 3.  The name of each parameter is concatenated to its corresponding
-    #     value using an "=" character (ASCII code 61) as a separator, even
-    #     if the value is empty.
-    parameter_parts = [u'{0}={1}'.format(k, v) for k, v in key_values]
-
-    # 4.  The sorted name/value pairs are concatenated together into a
-    #     single string by using an "&" character (ASCII code 38) as
-    #     separator.
-    return u'&'.join(parameter_parts)
-
-
-def sign_hmac_sha1(base_string, client_secret, resource_owner_secret):
-    """**HMAC-SHA1**
-
-    The "HMAC-SHA1" signature method uses the HMAC-SHA1 signature
-    algorithm as defined in `RFC2104`_::
-
-        digest = HMAC-SHA1 (key, text)
-
-    Per `section 3.4.2`_ of the spec.
-
-    .. _`RFC2104`: http://tools.ietf.org/html/rfc2104
-    .. _`section 3.4.2`: http://tools.ietf.org/html/rfc5849#section-3.4.2
-    """
-
-    # The HMAC-SHA1 function variables are used in following way:
-
-    # text is set to the value of the signature base string from
-    # `Section 3.4.1.1`_.
-    #
-    # .. _`Section 3.4.1.1`: http://tools.ietf.org/html/rfc5849#section-3.4.1.1
-    text = base_string
-
-    # key is set to the concatenated values of:
-    # 1.  The client shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-    key = utils.escape(client_secret or u'')
-
-    # 2.  An "&" character (ASCII code 38), which MUST be included
-    #     even when either secret is empty.
-    key += u'&'
-
-    # 3.  The token shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-    key += utils.escape(resource_owner_secret or u'')
-
-    # FIXME: HMAC does not support unicode!
-    key_utf8 = key.encode('utf-8')
-    text_utf8 = text.encode('utf-8')
-    signature = hmac.new(key_utf8, text_utf8, hashlib.sha1)
-
-    # digest  is used to set the value of the "oauth_signature" protocol
-    #         parameter, after the result octet string is base64-encoded
-    #         per `RFC2045, Section 6.8`.
-    #
-    # .. _`RFC2045, Section 6.8`: http://tools.ietf.org/html/rfc2045#section-6.8
-    return binascii.b2a_base64(signature.digest())[:-1].decode('utf-8')
-
-
-def sign_rsa_sha1(base_string, rsa_private_key):
-    """**RSA-SHA1**
-
-    Per `section 3.4.3`_ of the spec.
-
-    The "RSA-SHA1" signature method uses the RSASSA-PKCS1-v1_5 signature
-    algorithm as defined in `RFC3447, Section 8.2`_ (also known as
-    PKCS#1), using SHA-1 as the hash function for EMSA-PKCS1-v1_5.  To
-    use this method, the client MUST have established client credentials
-    with the server that included its RSA public key (in a manner that is
-    beyond the scope of this specification).
-
-    NOTE: this method requires the python-rsa library.
-
-    .. _`section 3.4.3`: http://tools.ietf.org/html/rfc5849#section-3.4.3
-    .. _`RFC3447, Section 8.2`: http://tools.ietf.org/html/rfc3447#section-8.2
-
-    """
-    # TODO: finish RSA documentation
-    from Crypto.PublicKey import RSA
-    from Crypto.Signature import PKCS1_v1_5
-    from Crypto.Hash import SHA
-    key = RSA.importKey(rsa_private_key)
-    h = SHA.new(base_string)
-    p = PKCS1_v1_5.new(key)
-    return binascii.b2a_base64(p.sign(h))[:-1].decode('utf-8')
-
-
-def sign_plaintext(client_secret, resource_owner_secret):
-    """Sign a request using plaintext.
-
-    Per `section 3.4.4`_ of the spec.
-
-    The "PLAINTEXT" method does not employ a signature algorithm.  It
-    MUST be used with a transport-layer mechanism such as TLS or SSL (or
-    sent over a secure channel with equivalent protections).  It does not
-    utilize the signature base string or the "oauth_timestamp" and
-    "oauth_nonce" parameters.
-
-    .. _`section 3.4.4`: http://tools.ietf.org/html/rfc5849#section-3.4.4
-
-    """
-
-    # The "oauth_signature" protocol parameter is set to the concatenated
-    # value of:
-
-    # 1.  The client shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-    signature = utils.escape(client_secret or u'')
-
-    # 2.  An "&" character (ASCII code 38), which MUST be included even
-    #     when either secret is empty.
-    signature += u'&'
-
-    # 3.  The token shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-    signature += utils.escape(resource_owner_secret or u'')
-
-    return signature
-
-
-def verify_hmac_sha1(request, client_secret=None, 
-    resource_owner_secret=None):
-    """Verify a HMAC-SHA1 signature.
-
-    Per `section 3.4`_ of the spec.
-
-    .. _`section 3.4`: http://tools.ietf.org/html/rfc5849#section-3.4
-    """
-    norm_params = normalize_parameters(request.params)
-    uri = normalize_base_string_uri(request.uri)
-    base_string = construct_base_string(request.http_method, uri, norm_params)
-    signature = sign_hmac_sha1(base_string, client_secret,
-        resource_owner_secret)
-    return safe_string_equals(signature, request.signature)
-
-
-def verify_rsa_sha1(request, rsa_public_key):
-    """Verify a RSASSA-PKCS #1 v1.5 base64 encoded signature.
-
-    Per `section 3.4.3`_ of the spec.
-
-    Note this method requires the PyCrypto library.
-
-    .. _`section 3.4.3`: http://tools.ietf.org/html/rfc5849#section-3.4.3
-
-    """
-    from Crypto.PublicKey import RSA
-    from Crypto.Signature import PKCS1_v1_5
-    from Crypto.Hash import SHA
-    key = RSA.importKey(rsa_public_key)
-    norm_params = normalize_parameters(request.params)
-    uri = normalize_base_string_uri(request.uri)
-    message = construct_base_string(request.http_method, uri, norm_params)
-    h = SHA.new(message)
-    p = PKCS1_v1_5.new(key)
-    sig = binascii.a2b_base64(request.signature)
-    return p.verify(h, sig)
-
-
-def verify_plaintext(request, client_secret=None, resource_owner_secret=None):
-    """Verify a PLAINTEXT signature.
-
-    Per `section 3.4`_ of the spec.
-
-    .. _`section 3.4`: http://tools.ietf.org/html/rfc5849#section-3.4
-    """
-    signature = sign_plaintext(client_secret, resource_owner_secret)
-    return safe_string_equals(signature, request.signature)
diff --git a/lib/requests/packages/oauthlib/oauth1/rfc5849/utils.py b/lib/requests/packages/oauthlib/oauth1/rfc5849/utils.py
deleted file mode 100755
index 8fb0e77..0000000
--- a/lib/requests/packages/oauthlib/oauth1/rfc5849/utils.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-oauthlib.utils
-~~~~~~~~~~~~~~
-
-This module contains utility methods used by various parts of the OAuth
-spec.
-"""
-
-import string
-import urllib2
-
-from oauthlib.common import quote, unquote
-
-UNICODE_ASCII_CHARACTER_SET = (string.ascii_letters.decode('ascii') +
-    string.digits.decode('ascii'))
-
-
-def filter_params(target):
-    """Decorator which filters params to remove non-oauth_* parameters
-
-    Assumes the decorated method takes a params dict or list of tuples as its
-    first argument.
-    """
-    def wrapper(params, *args, **kwargs):
-        params = filter_oauth_params(params)
-        return target(params, *args, **kwargs)
-
-    wrapper.__doc__ = target.__doc__
-    return wrapper
-
-
-def filter_oauth_params(params):
-    """Removes all non oauth parameters from a dict or a list of params."""
-    is_oauth = lambda kv: kv[0].startswith(u"oauth_")
-    if isinstance(params, dict):
-        return filter(is_oauth, params.items())
-    else:
-        return filter(is_oauth, params)
-
-
-def escape(u):
-    """Escape a unicode string in an OAuth-compatible fashion.
-
-    Per `section 3.6`_ of the spec.
-
-    .. _`section 3.6`: http://tools.ietf.org/html/rfc5849#section-3.6
-
-    """
-    if not isinstance(u, unicode):
-        raise ValueError('Only unicode objects are escapable.')
-    # Letters, digits, and the characters '_.-' are already treated as safe
-    # by urllib.quote(). We need to add '~' to fully support rfc5849.
-    return quote(u, safe='~')
-
-
-def unescape(u):
-    if not isinstance(u, unicode):
-        raise ValueError('Only unicode objects are unescapable.')
-    return unquote(u)
-
-
-def urlencode(query):
-    """Encode a sequence of two-element tuples or dictionary into a URL query string.
-
-    Operates using an OAuth-safe escape() method, in contrast to urllib.urlencode.
-    """
-    # Convert dictionaries to list of tuples
-    if isinstance(query, dict):
-        query = query.items()
-    return u"&".join([u'='.join([escape(k), escape(v)]) for k, v in query])
-
-
-def parse_keqv_list(l):
-    """A unicode-safe version of urllib2.parse_keqv_list"""
-    encoded_list = [u.encode('utf-8') for u in l]
-    encoded_parsed = urllib2.parse_keqv_list(encoded_list)
-    return dict((k.decode('utf-8'),
-        v.decode('utf-8')) for k, v in encoded_parsed.items())
-
-
-def parse_http_list(u):
-    """A unicode-safe version of urllib2.parse_http_list"""
-    encoded_str = u.encode('utf-8')
-    encoded_list = urllib2.parse_http_list(encoded_str)
-    return [s.decode('utf-8') for s in encoded_list]
-
-
-def parse_authorization_header(authorization_header):
-    """Parse an OAuth authorization header into a list of 2-tuples"""
-    auth_scheme = u'OAuth '
-    if authorization_header.startswith(auth_scheme):
-        authorization_header = authorization_header.replace(auth_scheme, u'', 1)
-    items = parse_http_list(authorization_header)
-    try:
-        return parse_keqv_list(items).items()
-    except ValueError:
-        raise ValueError('Malformed authorization header')
diff --git a/lib/requests/packages/oauthlib/oauth2/__init__.py b/lib/requests/packages/oauthlib/oauth2/__init__.py
deleted file mode 100755
index 0e8933c..0000000
--- a/lib/requests/packages/oauthlib/oauth2/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-"""
-oauthlib.oauth2
-~~~~~~~~~~~~~~
-
-This module is a wrapper for the most recent implementation of OAuth 2.0 Client
-and Server classes.
-"""
-
-from .draft25 import Client, Server
-
diff --git a/lib/requests/packages/oauthlib/oauth2/draft25/__init__.py b/lib/requests/packages/oauthlib/oauth2/draft25/__init__.py
deleted file mode 100755
index 7c90573..0000000
--- a/lib/requests/packages/oauthlib/oauth2/draft25/__init__.py
+++ /dev/null
@@ -1,497 +0,0 @@
-"""
-oauthlib.oauth2.draft_25
-~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for signing and checking OAuth 2.0 draft 25 requests.
-"""
-from tokens import prepare_bearer_uri, prepare_bearer_headers
-from tokens import prepare_bearer_body, prepare_mac_header
-from parameters import prepare_grant_uri, prepare_token_request
-from parameters import parse_authorization_code_response
-from parameters import parse_implicit_response, parse_token_response
-
-
-AUTH_HEADER = u'auth_header'
-URI_QUERY = u'query'
-BODY = u'body'
-
-
-class Client(object):
-
-    def __init__(self, client_id,
-            default_redirect_uri=None,
-            token_type=None,
-            access_token=None,
-            refresh_token=None):
-        """Initialize a client with commonly used attributes."""
-
-        self.client_id = client_id
-        self.default_redirect_uri = default_redirect_uri
-        self.token_type = token_type
-        self.access_token = access_token
-        self.refresh_token = refresh_token
-        self.token_types = {
-            u'bearer': self._add_bearer_token,
-            u'mac': self._add_mac_token
-        }
-
-    def add_token(self, uri, http_method=u'GET', body=None, headers=None,
-            token_placement=AUTH_HEADER):
-        """Add token to the request uri, body or authorization header.
-
-        The access token type provides the client with the information
-        required to successfully utilize the access token to make a protected
-        resource request (along with type-specific attributes).  The client
-        MUST NOT use an access token if it does not understand the token
-        type.
-
-        For example, the "bearer" token type defined in
-        [I-D.ietf-oauth-v2-bearer] is utilized by simply including the access
-        token string in the request:
-
-        GET /resource/1 HTTP/1.1
-        Host: example.com
-        Authorization: Bearer mF_9.B5f-4.1JqM
-
-        while the "mac" token type defined in [I-D.ietf-oauth-v2-http-mac] is
-        utilized by issuing a MAC key together with the access token which is
-        used to sign certain components of the HTTP requests:
-
-        GET /resource/1 HTTP/1.1
-        Host: example.com
-        Authorization: MAC id="h480djs93hd8",
-                            nonce="274312:dj83hs9s",
-                            mac="kDZvddkndxvhGRXZhvuDjEWhGeE="
-
-        .. _`I-D.ietf-oauth-v2-bearer`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#ref-I-D.ietf-oauth-v2-bearer
-        .. _`I-D.ietf-oauth-v2-http-mac`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#ref-I-D.ietf-oauth-v2-http-mac
-        """
-        return self.token_types[self.token_type](uri, http_method, body,
-                    headers, token_placement)
-
-    def prepare_refresh_body(self, body=u'', refresh_token=None, scope=None):
-        """Prepare an access token request, using a refresh token.
-
-        If the authorization server issued a refresh token to the client, the
-        client makes a refresh request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format in the HTTP request entity-body:
-
-        grant_type
-                REQUIRED.  Value MUST be set to "refresh_token".
-        refresh_token
-                REQUIRED.  The refresh token issued to the client.
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                Section 3.3.  The requested scope MUST NOT include any scope
-                not originally granted by the resource owner, and if omitted is
-                treated as equal to the scope originally granted by the
-                resource owner.
-        """
-        refresh_token = refresh_token or self.refresh_token
-        return prepare_token_request(u'refresh_token', body=body, scope=scope,
-                refresh_token=refresh_token)
-
-    def _add_bearer_token(self, uri, http_method=u'GET', body=None,
-            headers=None, token_placement=AUTH_HEADER):
-        """Add a bearer token to the request uri, body or authorization header."""
-        if token_placement == AUTH_HEADER:
-            headers = prepare_bearer_headers(self.token, headers)
-
-        if token_placement == URI_QUERY:
-            uri = prepare_bearer_uri(self.token, uri)
-
-        if token_placement == BODY:
-            body = prepare_bearer_body(self.token, body)
-
-        return uri, headers, body
-
-    def _add_mac_token(self, uri, http_method=u'GET', body=None,
-            headers=None, token_placement=AUTH_HEADER):
-        """Add a MAC token to the request authorization header."""
-        headers = prepare_mac_header(self.token, uri, self.key, http_method,
-                        headers=headers, body=body, ext=self.ext,
-                        hash_algorithm=self.hash_algorithm)
-        return uri, headers, body
-
-    def _populate_attributes(self, response):
-        """Add commonly used values such as access_token to self."""
-
-        if u'access_token' in response:
-            self.access_token = response.get(u'access_token')
-
-        if u'refresh_token' in response:
-            self.refresh_token = response.get(u'refresh_token')
-
-        if u'token_type' in response:
-            self.token_type = response.get(u'token_type')
-
-        if u'expires_in' in response:
-            self.expires_in = response.get(u'expires_in')
-
-        if u'code' in response:
-            self.code = response.get(u'code')
-
-    def prepare_request_uri(self, *args, **kwargs):
-        """Abstract method used to create request URIs."""
-        raise NotImplementedError("Must be implemented by inheriting classes.")
-
-    def prepare_request_body(self, *args, **kwargs):
-        """Abstract method used to create request bodies."""
-        raise NotImplementedError("Must be implemented by inheriting classes.")
-
-    def parse_request_uri_response(self, *args, **kwargs):
-        """Abstract method used to parse redirection responses."""
-
-    def parse_request_body_response(self, *args, **kwargs):
-        """Abstract method used to parse JSON responses."""
-
-
-class WebApplicationClient(Client):
-    """A client utilizing the authorization code grant workflow.
-
-    A web application is a confidential client running on a web
-    server.  Resource owners access the client via an HTML user
-    interface rendered in a user-agent on the device used by the
-    resource owner.  The client credentials as well as any access
-    token issued to the client are stored on the web server and are
-    not exposed to or accessible by the resource owner.
-
-    The authorization code grant type is used to obtain both access
-    tokens and refresh tokens and is optimized for confidential clients.
-    As a redirection-based flow, the client must be capable of
-    interacting with the resource owner's user-agent (typically a web
-    browser) and capable of receiving incoming requests (via redirection)
-    from the authorization server.
-    """
-
-    def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
-            state=None, **kwargs):
-        """Prepare the authorization code request URI
-
-        The client constructs the request URI by adding the following
-        parameters to the query component of the authorization endpoint URI
-        using the "application/x-www-form-urlencoded" format as defined by
-        [`W3C.REC-html401-19991224`_]:
-
-        response_type
-                REQUIRED.  Value MUST be set to "code".
-        client_id
-                REQUIRED.  The client identifier as described in `Section 2.2`_.
-        redirect_uri
-                OPTIONAL.  As described in `Section 3.1.2`_.
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                `Section 3.3`_.
-        state
-                RECOMMENDED.  An opaque value used by the client to maintain
-                state between the request and callback.  The authorization
-                server includes this value when redirecting the user-agent back
-                to the client.  The parameter SHOULD be used for preventing
-                cross-site request forgery as described in `Section 10.12`_.
-
-        .. _`W3C.REC-html401-19991224`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#ref-W3C.REC-html401-19991224
-        .. _`Section 2.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-2.2
-        .. _`Section 3.1.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.1.2
-        .. _`Section 3.3`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.3
-        .. _`Section 10.12`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-10.12
-        """
-        redirect_uri = redirect_uri or self.default_redirect_uri
-        return prepare_grant_uri(uri, self.client_id, u'code',
-                redirect_uri=redirect_uri, scope=scope, state=state, **kwargs)
-
-    def prepare_request_body(self, code, body=u'', redirect_uri=None, **kwargs):
-        """Prepare the access token request body.
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format in the HTTP request entity-body:
-
-        grant_type
-                REQUIRED.  Value MUST be set to "authorization_code".
-        code
-                REQUIRED.  The authorization code received from the
-                authorization server.
-        redirect_uri
-                REQUIRED, if the "redirect_uri" parameter was included in the
-                authorization request as described in Section 4.1.1, and their
-                values MUST be identical.
-
-        .. _`Section 4.1.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-4.1.1
-        """
-        redirect_uri = redirect_uri or self.default_redirect_uri
-        code = code or self.code
-        return prepare_token_request(u'authorization_code', code=code, body=body,
-                                         redirect_uri=redirect_uri, **kwargs)
-
-    def parse_request_uri_response(self, uri, state=None):
-        """Parse the URI query for code and state.
-
-        If the resource owner grants the access request, the authorization
-        server issues an authorization code and delivers it to the client by
-        adding the following parameters to the query component of the
-        redirection URI using the "application/x-www-form-urlencoded" format:
-
-        code
-                REQUIRED.  The authorization code generated by the
-                authorization server.  The authorization code MUST expire
-                shortly after it is issued to mitigate the risk of leaks.  A
-                maximum authorization code lifetime of 10 minutes is
-                RECOMMENDED.  The client MUST NOT use the authorization code
-                more than once.  If an authorization code is used more than
-                once, the authorization server MUST deny the request and SHOULD
-                revoke (when possible) all tokens previously issued based on
-                that authorization code.  The authorization code is bound to
-                the client identifier and redirection URI.
-        state
-                REQUIRED if the "state" parameter was present in the client
-                authorization request.  The exact value received from the
-                client.
-        """
-        response = parse_authorization_code_response(uri, state=state)
-        self._populate_attributes(response)
-        return response
-
-    def parse_request_body_response(self, body, scope=None):
-        """Parse the JSON response body.
-
-        If the access token request is valid and authorized, the
-        authorization server issues an access token and optional refresh
-        token as described in `Section 5.1`_.  If the request client
-        authentication failed or is invalid, the authorization server returns
-        an error response as described in `Section 5.2`_.
-
-        .. `Section 5.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-5.1
-        .. `Section 5.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-5.2
-        """
-        response = parse_token_response(body, scope=scope)
-        self._populate_attributes(response)
-        return response
-
-
-class UserAgentClient(Client):
-    """A public client utilizing the implicit code grant workflow.
-
-    A user-agent-based application is a public client in which the
-    client code is downloaded from a web server and executes within a
-    user-agent (e.g. web browser) on the device used by the resource
-    owner.  Protocol data and credentials are easily accessible (and
-    often visible) to the resource owner.  Since such applications
-    reside within the user-agent, they can make seamless use of the
-    user-agent capabilities when requesting authorization.
-
-    The implicit grant type is used to obtain access tokens (it does not
-    support the issuance of refresh tokens) and is optimized for public
-    clients known to operate a particular redirection URI.  These clients
-    are typically implemented in a browser using a scripting language
-    such as JavaScript.
-
-    As a redirection-based flow, the client must be capable of
-    interacting with the resource owner's user-agent (typically a web
-    browser) and capable of receiving incoming requests (via redirection)
-    from the authorization server.
-
-    Unlike the authorization code grant type in which the client makes
-    separate requests for authorization and access token, the client
-    receives the access token as the result of the authorization request.
-
-    The implicit grant type does not include client authentication, and
-    relies on the presence of the resource owner and the registration of
-    the redirection URI.  Because the access token is encoded into the
-    redirection URI, it may be exposed to the resource owner and other
-    applications residing on the same device.
-    """
-
-    def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
-            state=None, **kwargs):
-        """Prepare the implicit grant request URI.
-
-        The client constructs the request URI by adding the following
-        parameters to the query component of the authorization endpoint URI
-        using the "application/x-www-form-urlencoded" format:
-
-        response_type
-                REQUIRED.  Value MUST be set to "token".
-        client_id
-                REQUIRED.  The client identifier as described in Section 2.2.
-        redirect_uri
-                OPTIONAL.  As described in Section 3.1.2.
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                Section 3.3.
-        state
-                RECOMMENDED.  An opaque value used by the client to maintain
-                state between the request and callback.  The authorization
-                server includes this value when redirecting the user-agent back
-                to the client.  The parameter SHOULD be used for preventing
-                cross-site request forgery as described in Section 10.12.
-        """
-        redirect_uri = redirect_uri or self.default_redirect_uri
-        return prepare_grant_uri(uri, self.client_id, u'token',
-                redirect_uri=redirect_uri, state=state, scope=scope, **kwargs)
-
-    def parse_request_uri_response(self, uri, state=None, scope=None):
-        """Parse the response URI fragment.
-
-        If the resource owner grants the access request, the authorization
-        server issues an access token and delivers it to the client by adding
-        the following parameters to the fragment component of the redirection
-        URI using the "application/x-www-form-urlencoded" format:
-
-        access_token
-                REQUIRED.  The access token issued by the authorization server.
-        token_type
-                REQUIRED.  The type of the token issued as described in
-                `Section 7.1`_.  Value is case insensitive.
-        expires_in
-                RECOMMENDED.  The lifetime in seconds of the access token.  For
-                example, the value "3600" denotes that the access token will
-                expire in one hour from the time the response was generated.
-                If omitted, the authorization server SHOULD provide the
-                expiration time via other means or document the default value.
-        scope
-                OPTIONAL, if identical to the scope requested by the client,
-                otherwise REQUIRED.  The scope of the access token as described
-                by `Section 3.3`_.
-        state
-                REQUIRED if the "state" parameter was present in the client
-                authorization request.  The exact value received from the
-                client.
-
-        .. _`Section 7.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-7.1
-        .. _`Section 3.3`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.3
-        """
-        response = parse_implicit_response(uri, state=state, scope=scope)
-        self._populate_attributes(response)
-        return response
-
-
-class NativeApplicationClient(Client):
-    """A public client utilizing the client credentials grant workflow.
-
-    A native application is a public client installed and executed on
-    the device used by the resource owner.  Protocol data and
-    credentials are accessible to the resource owner.  It is assumed
-    that any client authentication credentials included in the
-    application can be extracted.  On the other hand, dynamically
-    issued credentials such as access tokens or refresh tokens can
-    receive an acceptable level of protection.  At a minimum, these
-    credentials are protected from hostile servers with which the
-    application may interact with.  On some platforms these
-    credentials might be protected from other applications residing on
-    the same device.
-
-    The client can request an access token using only its client
-    credentials (or other supported means of authentication) when the
-    client is requesting access to the protected resources under its
-    control, or those of another resource owner which has been previously
-    arranged with the authorization server (the method of which is beyond
-    the scope of this specification).
-
-    The client credentials grant type MUST only be used by confidential
-    clients.
-
-    Since the client authentication is used as the authorization grant,
-    no additional authorization request is needed.
-    """
-
-    def prepare_request_body(self, body=u'', scope=None, **kwargs):
-        """Add the client credentials to the request body.
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format in the HTTP request entity-body:
-
-        grant_type
-                REQUIRED.  Value MUST be set to "client_credentials".
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                `Section 3.3`_.
-
-        .. _`Section 3.3`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.3
-        """
-        return prepare_token_request(u'client_credentials', body=body,
-                                     scope=scope, **kwargs)
-
-    def parse_request_body_response(self, body, scope=None):
-        """Parse the JSON response body.
-
-        If the access token request is valid and authorized, the
-        authorization server issues an access token as described in
-        `Section 5.1`_.  A refresh token SHOULD NOT be included.  If the request
-        failed client authentication or is invalid, the authorization server
-        returns an error response as described in `Section 5.2`_.
-
-        .. `Section 5.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-5.1
-        .. `Section 5.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-5.2
-        """
-        response = parse_token_response(body, scope=scope)
-        self._populate_attributes(response)
-        return response
-
-
-class PasswordCredentialsClient(Client):
-    """A public client using the resource owner password and username directly.
-
-    The resource owner password credentials grant type is suitable in
-    cases where the resource owner has a trust relationship with the
-    client, such as the device operating system or a highly privileged
-    application.  The authorization server should take special care when
-    enabling this grant type, and only allow it when other flows are not
-    viable.
-
-    The grant type is suitable for clients capable of obtaining the
-    resource owner's credentials (username and password, typically using
-    an interactive form).  It is also used to migrate existing clients
-    using direct authentication schemes such as HTTP Basic or Digest
-    authentication to OAuth by converting the stored credentials to an
-    access token.
-
-    The method through which the client obtains the resource owner
-    credentials is beyond the scope of this specification.  The client
-    MUST discard the credentials once an access token has been obtained.
-    """
-
-    def prepare_request_body(self, username, password, body=u'', scope=None,
-            **kwargs):
-        """Add the resource owner password and username to the request body.
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format in the HTTP request entity-body:
-
-        grant_type
-                REQUIRED.  Value MUST be set to "password".
-        username
-                REQUIRED.  The resource owner username.
-        password
-                REQUIRED.  The resource owner password.
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                `Section 3.3`_.
-
-        .. _`Section 3.3`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.3
-        """
-        return prepare_token_request(u'password', body=body, username=username,
-                password=password, scope=scope, **kwargs)
-
-    def parse_request_body_response(self, body, scope=None):
-        """Parse the JSON response body.
-
-        If the access token request is valid and authorized, the
-        authorization server issues an access token and optional refresh
-        token as described in `Section 5.1`_.  If the request failed client
-        authentication or is invalid, the authorization server returns an
-        error response as described in `Section 5.2`_.
-
-        .. `Section 5.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-5.1
-        .. `Section 5.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-5.2
-        """
-        response = parse_token_response(body, scope=scope)
-        self._populate_attributes(response)
-        return response
-
-
-class Server(object):
-    pass
diff --git a/lib/requests/packages/oauthlib/oauth2/draft25/parameters.py b/lib/requests/packages/oauthlib/oauth2/draft25/parameters.py
deleted file mode 100755
index ecc9f63..0000000
--- a/lib/requests/packages/oauthlib/oauth2/draft25/parameters.py
+++ /dev/null
@@ -1,256 +0,0 @@
-"""
-oauthlib.oauth2_draft28.parameters
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module contains methods related to `Section 4`_ of the OAuth 2 draft.
-
-.. _`Section 4`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-4
-"""
-
-import json
-import urlparse
-from oauthlib.common import add_params_to_uri, add_params_to_qs
-
-
-def prepare_grant_uri(uri, client_id, response_type, redirect_uri=None,
-            scope=None, state=None, **kwargs):
-    """Prepare the authorization grant request URI.
-
-    The client constructs the request URI by adding the following
-    parameters to the query component of the authorization endpoint URI
-    using the "application/x-www-form-urlencoded" format as defined by
-    [W3C.REC-html401-19991224]:
-
-    response_type
-            REQUIRED.  Value MUST be set to "code".
-    client_id
-            REQUIRED.  The client identifier as described in `Section 2.2`_.
-    redirect_uri
-            OPTIONAL.  As described in `Section 3.1.2`_.
-    scope
-            OPTIONAL.  The scope of the access request as described by
-            `Section 3.3`_.
-    state
-            RECOMMENDED.  An opaque value used by the client to maintain
-            state between the request and callback.  The authorization
-            server includes this value when redirecting the user-agent back
-            to the client.  The parameter SHOULD be used for preventing
-            cross-site request forgery as described in `Section 10.12`_.
-
-    GET /authorize?response_type=code&client_id=s6BhdRkqt3&state=xyz
-        &redirect_uri=https%3A%2F%2Fclient%2Eexample%2Ecom%2Fcb HTTP/1.1
-    Host: server.example.com
-
-    .. _`W3C.REC-html401-19991224`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#ref-W3C.REC-html401-19991224
-    .. _`Section 2.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-2.2
-    .. _`Section 3.1.2`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.1.2
-    .. _`Section 3.3`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.3
-    .. _`section 10.12`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-10.12
-    """
-    params = [((u'response_type', response_type)),
-              ((u'client_id', client_id))]
-
-    if redirect_uri:
-        params.append((u'redirect_uri', redirect_uri))
-    if scope:
-        params.append((u'scope', scope))
-    if state:
-        params.append((u'state', state))
-
-    for k in kwargs:
-        params.append((unicode(k), kwargs[k]))
-
-    return add_params_to_uri(uri, params)
-
-
-def prepare_token_request(grant_type, body=u'', **kwargs):
-    """Prepare the access token request.
-
-    The client makes a request to the token endpoint by adding the
-    following parameters using the "application/x-www-form-urlencoded"
-    format in the HTTP request entity-body:
-
-    grant_type
-            REQUIRED.  Value MUST be set to "authorization_code".
-    code
-            REQUIRED.  The authorization code received from the
-            authorization server.
-    redirect_uri
-            REQUIRED, if the "redirect_uri" parameter was included in the
-            authorization request as described in `Section 4.1.1`_, and their
-            values MUST be identical.
-
-    grant_type=authorization_code&code=SplxlOBeZQQYbYS6WxSbIA
-    &redirect_uri=https%3A%2F%2Fclient%2Eexample%2Ecom%2Fcb
-
-    .. _`Section 4.1.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-4.1.1
-    """
-    params = [(u'grant_type', grant_type)]
-    for k in kwargs:
-        params.append((unicode(k), kwargs[k]))
-
-    return add_params_to_qs(body, params)
-
-
-def parse_authorization_code_response(uri, state=None):
-    """Parse authorization grant response URI into a dict.
-
-    If the resource owner grants the access request, the authorization
-    server issues an authorization code and delivers it to the client by
-    adding the following parameters to the query component of the
-    redirection URI using the "application/x-www-form-urlencoded" format:
-
-    code
-            REQUIRED.  The authorization code generated by the
-            authorization server.  The authorization code MUST expire
-            shortly after it is issued to mitigate the risk of leaks.  A
-            maximum authorization code lifetime of 10 minutes is
-            RECOMMENDED.  The client MUST NOT use the authorization code
-            more than once.  If an authorization code is used more than
-            once, the authorization server MUST deny the request and SHOULD
-            revoke (when possible) all tokens previously issued based on
-            that authorization code.  The authorization code is bound to
-            the client identifier and redirection URI.
-    state
-            REQUIRED if the "state" parameter was present in the client
-            authorization request.  The exact value received from the
-            client.
-
-    For example, the authorization server redirects the user-agent by
-    sending the following HTTP response:
-
-    HTTP/1.1 302 Found
-    Location: https://client.example.com/cb?code=SplxlOBeZQQYbYS6WxSbIA
-            &state=xyz
-
-    """
-    query = urlparse.urlparse(uri).query
-    params = dict(urlparse.parse_qsl(query))
-
-    if not u'code' in params:
-        raise KeyError("Missing code parameter in response.")
-
-    if state and params.get(u'state', None) != state:
-        raise ValueError("Mismatching or missing state in response.")
-
-    return params
-
-
-def parse_implicit_response(uri, state=None, scope=None):
-    """Parse the implicit token response URI into a dict.
-
-    If the resource owner grants the access request, the authorization
-    server issues an access token and delivers it to the client by adding
-    the following parameters to the fragment component of the redirection
-    URI using the "application/x-www-form-urlencoded" format:
-
-    access_token
-            REQUIRED.  The access token issued by the authorization server.
-    token_type
-            REQUIRED.  The type of the token issued as described in
-            Section 7.1.  Value is case insensitive.
-    expires_in
-            RECOMMENDED.  The lifetime in seconds of the access token.  For
-            example, the value "3600" denotes that the access token will
-            expire in one hour from the time the response was generated.
-            If omitted, the authorization server SHOULD provide the
-            expiration time via other means or document the default value.
-    scope
-            OPTIONAL, if identical to the scope requested by the client,
-            otherwise REQUIRED.  The scope of the access token as described
-            by Section 3.3.
-    state
-            REQUIRED if the "state" parameter was present in the client
-            authorization request.  The exact value received from the
-            client.
-
-    HTTP/1.1 302 Found
-    Location: http://example.com/cb#access_token=2YotnFZFEjr1zCsicMWpAA
-            &state=xyz&token_type=example&expires_in=3600
-    """
-    fragment = urlparse.urlparse(uri).fragment
-    params = dict(urlparse.parse_qsl(fragment, keep_blank_values=True))
-    validate_token_parameters(params, scope)
-
-    if state and params.get(u'state', None) != state:
-        raise ValueError("Mismatching or missing state in params.")
-
-    return params
-
-
-def parse_token_response(body, scope=None):
-    """Parse the JSON token response body into a dict.
-
-    The authorization server issues an access token and optional refresh
-    token, and constructs the response by adding the following parameters
-    to the entity body of the HTTP response with a 200 (OK) status code:
-
-    access_token
-            REQUIRED.  The access token issued by the authorization server.
-    token_type
-            REQUIRED.  The type of the token issued as described in
-            `Section 7.1`_.  Value is case insensitive.
-    expires_in
-            RECOMMENDED.  The lifetime in seconds of the access token.  For
-            example, the value "3600" denotes that the access token will
-            expire in one hour from the time the response was generated.
-            If omitted, the authorization server SHOULD provide the
-            expiration time via other means or document the default value.
-    refresh_token
-            OPTIONAL.  The refresh token which can be used to obtain new
-            access tokens using the same authorization grant as described
-            in `Section 6`_.
-    scope
-            OPTIONAL, if identical to the scope requested by the client,
-            otherwise REQUIRED.  The scope of the access token as described
-            by `Section 3.3`_.
-
-    The parameters are included in the entity body of the HTTP response
-    using the "application/json" media type as defined by [`RFC4627`_].  The
-    parameters are serialized into a JSON structure by adding each
-    parameter at the highest structure level.  Parameter names and string
-    values are included as JSON strings.  Numerical values are included
-    as JSON numbers.  The order of parameters does not matter and can
-    vary.
-
-    For example:
-
-        HTTP/1.1 200 OK
-        Content-Type: application/json;charset=UTF-8
-        Cache-Control: no-store
-        Pragma: no-cache
-
-        {
-        "access_token":"2YotnFZFEjr1zCsicMWpAA",
-        "token_type":"example",
-        "expires_in":3600,
-        "refresh_token":"tGzv3JOkF0XG5Qx2TlKWIA",
-        "example_parameter":"example_value"
-        }
-
-    .. _`Section 7.1`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-7.1
-    .. _`Section 6`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-6
-    .. _`Section 3.3`: http://tools.ietf.org/html/draft-ietf-oauth-v2-28#section-3.3
-    .. _`RFC4627`: http://tools.ietf.org/html/rfc4627
-    """
-    params = json.loads(body)
-    validate_token_parameters(params, scope)
-    return params
-
-
-def validate_token_parameters(params, scope=None):
-    """Ensures token precence, token type, expiration and scope in params."""
-
-    if not u'access_token' in params:
-        raise KeyError("Missing access token parameter.")
-
-    if not u'token_type' in params:
-        raise KeyError("Missing token type parameter.")
-
-    # If the issued access token scope is different from the one requested by
-    # the client, the authorization server MUST include the "scope" response
-    # parameter to inform the client of the actual scope granted.
-    # http://tools.ietf.org/html/draft-ietf-oauth-v2-25#section-3.3
-    new_scope = params.get(u'scope', None)
-    if scope and new_scope and scope != new_scope:
-        raise Warning("Scope has changed to %s." % new_scope)
diff --git a/lib/requests/packages/oauthlib/oauth2/draft25/tokens.py b/lib/requests/packages/oauthlib/oauth2/draft25/tokens.py
deleted file mode 100755
index 74491fb..0000000
--- a/lib/requests/packages/oauthlib/oauth2/draft25/tokens.py
+++ /dev/null
@@ -1,132 +0,0 @@
-from __future__ import absolute_import
-"""
-oauthlib.oauth2.draft25.tokens
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module contains methods for adding two types of access tokens to requests.
-
-- Bearer http://tools.ietf.org/html/draft-ietf-oauth-saml2-bearer-08
-- MAC http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-00
-
-"""
-from binascii import b2a_base64
-import hashlib
-import hmac
-from urlparse import urlparse
-
-from oauthlib.common import add_params_to_uri, add_params_to_qs
-from . import utils
-
-
-def prepare_mac_header(token, uri, key, http_method, nonce=None, headers=None,
-        body=None, ext=u'', hash_algorithm=u'hmac-sha-1'):
-    """Add an `MAC Access Authentication`_ signature to headers.
-
-    Unlike OAuth 1, this HMAC signature does not require inclusion of the request
-    payload/body, neither does it use a combination of client_secret and
-    token_secret but rather a mac_key provided together with the access token.
-
-    Currently two algorithms are supported, "hmac-sha-1" and "hmac-sha-256",
-    `extension algorithms`_ are not supported.
-
-    Example MAC Authorization header, linebreaks added for clarity
-
-    Authorization: MAC id="h480djs93hd8",
-                       nonce="1336363200:dj83hs9s",
-                       mac="bhCQXTVyfj5cmA9uKkPFx1zeOXM="
-
-    .. _`MAC Access Authentication`: http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
-    .. _`extension algorithms`: http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-7.1
-
-    :param uri: Request URI.
-    :param headers: Request headers as a dictionary.
-    :param http_method: HTTP Request method.
-    :param key: MAC given provided by token endpoint.
-    :param algorithm: HMAC algorithm provided by token endpoint.
-    :return: headers dictionary with the authorization field added.
-    """
-    http_method = http_method.upper()
-    host, port = utils.host_from_uri(uri)
-
-    if hash_algorithm.lower() == u'hmac-sha-1':
-        h = hashlib.sha1
-    else:
-        h = hashlib.sha256
-
-    nonce = nonce or u'{0}:{1}'.format(utils.generate_nonce(), utils.generate_timestamp())
-    sch, net, path, par, query, fra = urlparse(uri)
-
-    if query:
-        request_uri = path + u'?' + query
-    else:
-        request_uri = path
-
-    # Hash the body/payload
-    if body is not None:
-        bodyhash = b2a_base64(h(body).digest())[:-1].decode('utf-8')
-    else:
-        bodyhash = u''
-
-    # Create the normalized base string
-    base = []
-    base.append(nonce)
-    base.append(http_method.upper())
-    base.append(request_uri)
-    base.append(host)
-    base.append(port)
-    base.append(bodyhash)
-    base.append(ext)
-    base_string = '\n'.join(base) + u'\n'
-
-    # hmac struggles with unicode strings - http://bugs.python.org/issue5285
-    if isinstance(key, unicode):
-        key = key.encode('utf-8')
-    sign = hmac.new(key, base_string, h)
-    sign = b2a_base64(sign.digest())[:-1].decode('utf-8')
-
-    header = []
-    header.append(u'MAC id="%s"' % token)
-    header.append(u'nonce="%s"' % nonce)
-    if bodyhash:
-        header.append(u'bodyhash="%s"' % bodyhash)
-    if ext:
-        header.append(u'ext="%s"' % ext)
-    header.append(u'mac="%s"' % sign)
-
-    headers = headers or {}
-    headers[u'Authorization'] = u', '.join(header)
-    return headers
-
-
-def prepare_bearer_uri(token, uri):
-    """Add a `Bearer Token`_ to the request URI.
-    Not recommended, use only if client can't use authorization header or body.
-
-    http://www.example.com/path?access_token=h480djs93hd8
-
-    .. _`Bearer Token`: http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-18
-    """
-    return add_params_to_uri(uri, [((u'access_token', token))])
-
-
-def prepare_bearer_headers(token, headers=None):
-    """Add a `Bearer Token`_ to the request URI.
-    Recommended method of passing bearer tokens.
-
-    Authorization: Bearer h480djs93hd8
-
-    .. _`Bearer Token`: http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-18
-    """
-    headers = headers or {}
-    headers[u'Authorization'] = u'Bearer %s' % token
-    return headers
-
-
-def prepare_bearer_body(token, body=u''):
-    """Add a `Bearer Token`_ to the request body.
-
-    access_token=h480djs93hd8
-
-    .. _`Bearer Token`: http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-18
-    """
-    return add_params_to_qs(body, [((u'access_token', token))])
diff --git a/lib/requests/packages/oauthlib/oauth2/draft25/utils.py b/lib/requests/packages/oauthlib/oauth2/draft25/utils.py
deleted file mode 100755
index 75d5fcc..0000000
--- a/lib/requests/packages/oauthlib/oauth2/draft25/utils.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-oauthlib.utils
-~~~~~~~~~~~~~~
-
-This module contains utility methods used by various parts of the OAuth 2 spec.
-"""
-
-import urllib
-import urlparse
-
-
-def host_from_uri(uri):
-    """Extract hostname and port from URI.
-
-    Will use default port for HTTP and HTTPS if none is present in the URI.
-    """
-    default_ports = {
-        u'HTTP': u'80',
-        u'HTTPS': u'443',
-    }
-
-    sch, netloc, path, par, query, fra = urlparse.urlparse(uri)
-    if u':' in netloc:
-        netloc, port = netloc.split(u':', 1)
-    else:
-        port = default_ports.get(sch.upper())
-
-    return netloc, port
-
-
-def escape(u):
-    """Escape a string in an OAuth-compatible fashion.
-
-    TODO: verify whether this can in fact be used for OAuth 2
-
-    """
-    if not isinstance(u, unicode):
-        raise ValueError('Only unicode objects are escapable.')
-    return urllib.quote(u.encode('utf-8'), safe='~')
diff --git a/lib/requests/packages/urllib3/__init__.py b/lib/requests/packages/urllib3/__init__.py
old mode 100755
new mode 100644
index 55de87e..d7592ae
--- a/lib/requests/packages/urllib3/__init__.py
+++ b/lib/requests/packages/urllib3/__init__.py
@@ -1,9 +1,3 @@
-# urllib3/__init__.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 """
 urllib3 - Thread-safe connection pooling and re-using.
 """
@@ -23,7 +17,10 @@ from . import exceptions
 from .filepost import encode_multipart_formdata
 from .poolmanager import PoolManager, ProxyManager, proxy_from_url
 from .response import HTTPResponse
-from .util import make_headers, get_host
+from .util.request import make_headers
+from .util.url import get_host
+from .util.timeout import Timeout
+from .util.retry import Retry
 
 
 # Set default logging handler to avoid "No handler found" warnings.
@@ -51,8 +48,19 @@ def add_stderr_logger(level=logging.DEBUG):
     handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
     logger.addHandler(handler)
     logger.setLevel(level)
-    logger.debug('Added an stderr logging handler to logger: %s' % __name__)
+    logger.debug('Added a stderr logging handler to logger: %s' % __name__)
     return handler
 
 # ... Clean up.
 del NullHandler
+
+
+# Set security warning to always go off by default.
+import warnings
+warnings.simplefilter('always', exceptions.SecurityWarning)
+
+def disable_warnings(category=exceptions.HTTPWarning):
+    """
+    Helper for quickly disabling all urllib3 warnings.
+    """
+    warnings.simplefilter('ignore', category)
diff --git a/lib/requests/packages/urllib3/__init__.pyc b/lib/requests/packages/urllib3/__init__.pyc
index f33df3d..fb0ce42 100644
Binary files a/lib/requests/packages/urllib3/__init__.pyc and b/lib/requests/packages/urllib3/__init__.pyc differ
diff --git a/lib/requests/packages/urllib3/_collections.py b/lib/requests/packages/urllib3/_collections.py
old mode 100755
new mode 100644
index a052b1d..784342a
--- a/lib/requests/packages/urllib3/_collections.py
+++ b/lib/requests/packages/urllib3/_collections.py
@@ -1,19 +1,23 @@
-# urllib3/_collections.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
+from collections import Mapping, MutableMapping
+try:
+    from threading import RLock
+except ImportError: # Platform-specific: No threads available
+    class RLock:
+        def __enter__(self):
+            pass
+
+        def __exit__(self, exc_type, exc_value, traceback):
+            pass
 
-from collections import MutableMapping
-from threading import Lock
 
 try: # Python 2.7+
     from collections import OrderedDict
 except ImportError:
     from .packages.ordered_dict import OrderedDict
+from .packages.six import iterkeys, itervalues
 
 
-__all__ = ['RecentlyUsedContainer']
+__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
 
 
 _Null = object()
@@ -40,18 +44,18 @@ class RecentlyUsedContainer(MutableMapping):
         self.dispose_func = dispose_func
 
         self._container = self.ContainerCls()
-        self._lock = Lock()
+        self.lock = RLock()
 
     def __getitem__(self, key):
         # Re-insert the item, moving it to the end of the eviction line.
-        with self._lock:
+        with self.lock:
             item = self._container.pop(key)
             self._container[key] = item
             return item
 
     def __setitem__(self, key, value):
         evicted_value = _Null
-        with self._lock:
+        with self.lock:
             # Possibly evict the existing value of 'key'
             evicted_value = self._container.get(key, _Null)
             self._container[key] = value
@@ -65,24 +69,23 @@ class RecentlyUsedContainer(MutableMapping):
             self.dispose_func(evicted_value)
 
     def __delitem__(self, key):
-        with self._lock:
+        with self.lock:
             value = self._container.pop(key)
 
         if self.dispose_func:
             self.dispose_func(value)
 
     def __len__(self):
-        with self._lock:
+        with self.lock:
             return len(self._container)
 
     def __iter__(self):
         raise NotImplementedError('Iteration over this class is unlikely to be threadsafe.')
 
     def clear(self):
-        with self._lock:
+        with self.lock:
             # Copy pointers to all values, then wipe the mapping
-            # under Python 2, this copies the list of values twice :-|
-            values = list(self._container.values())
+            values = list(itervalues(self._container))
             self._container.clear()
 
         if self.dispose_func:
@@ -90,5 +93,106 @@ class RecentlyUsedContainer(MutableMapping):
                 self.dispose_func(value)
 
     def keys(self):
-        with self._lock:
-            return self._container.keys()
+        with self.lock:
+            return list(iterkeys(self._container))
+
+
+class HTTPHeaderDict(MutableMapping):
+    """
+    :param headers:
+        An iterable of field-value pairs. Must not contain multiple field names
+        when compared case-insensitively.
+
+    :param kwargs:
+        Additional field-value pairs to pass in to ``dict.update``.
+
+    A ``dict`` like container for storing HTTP Headers.
+
+    Field names are stored and compared case-insensitively in compliance with
+    RFC 7230. Iteration provides the first case-sensitive key seen for each
+    case-insensitive pair.
+
+    Using ``__setitem__`` syntax overwrites fields that compare equal
+    case-insensitively in order to maintain ``dict``'s api. For fields that
+    compare equal, instead create a new ``HTTPHeaderDict`` and use ``.add``
+    in a loop.
+
+    If multiple fields that are equal case-insensitively are passed to the
+    constructor or ``.update``, the behavior is undefined and some will be
+    lost.
+
+    >>> headers = HTTPHeaderDict()
+    >>> headers.add('Set-Cookie', 'foo=bar')
+    >>> headers.add('set-cookie', 'baz=quxx')
+    >>> headers['content-length'] = '7'
+    >>> headers['SET-cookie']
+    'foo=bar, baz=quxx'
+    >>> headers['Content-Length']
+    '7'
+
+    If you want to access the raw headers with their original casing
+    for debugging purposes you can access the private ``._data`` attribute
+    which is a normal python ``dict`` that maps the case-insensitive key to a
+    list of tuples stored as (case-sensitive-original-name, value). Using the
+    structure from above as our example:
+
+    >>> headers._data
+    {'set-cookie': [('Set-Cookie', 'foo=bar'), ('set-cookie', 'baz=quxx')],
+    'content-length': [('content-length', '7')]}
+    """
+
+    def __init__(self, headers=None, **kwargs):
+        self._data = {}
+        if headers is None:
+            headers = {}
+        self.update(headers, **kwargs)
+
+    def add(self, key, value):
+        """Adds a (name, value) pair, doesn't overwrite the value if it already
+        exists.
+
+        >>> headers = HTTPHeaderDict(foo='bar')
+        >>> headers.add('Foo', 'baz')
+        >>> headers['foo']
+        'bar, baz'
+        """
+        self._data.setdefault(key.lower(), []).append((key, value))
+
+    def getlist(self, key):
+        """Returns a list of all the values for the named field. Returns an
+        empty list if the key doesn't exist."""
+        return self[key].split(', ') if key in self else []
+
+    def copy(self):
+        h = HTTPHeaderDict()
+        for key in self._data:
+            for rawkey, value in self._data[key]:
+                h.add(rawkey, value)
+        return h
+
+    def __eq__(self, other):
+        if not isinstance(other, Mapping):
+            return False
+        other = HTTPHeaderDict(other)
+        return dict((k1, self[k1]) for k1 in self._data) == \
+                dict((k2, other[k2]) for k2 in other._data)
+
+    def __getitem__(self, key):
+        values = self._data[key.lower()]
+        return ', '.join(value[1] for value in values)
+
+    def __setitem__(self, key, value):
+        self._data[key.lower()] = [(key, value)]
+
+    def __delitem__(self, key):
+        del self._data[key.lower()]
+
+    def __len__(self):
+        return len(self._data)
+
+    def __iter__(self):
+        for headers in itervalues(self._data):
+            yield headers[0][0]
+
+    def __repr__(self):
+        return '%s(%r)' % (self.__class__.__name__, dict(self.items()))
diff --git a/lib/requests/packages/urllib3/_collections.pyc b/lib/requests/packages/urllib3/_collections.pyc
index 3ad57a1..19588b5 100644
Binary files a/lib/requests/packages/urllib3/_collections.pyc and b/lib/requests/packages/urllib3/_collections.pyc differ
diff --git a/lib/requests/packages/urllib3/connection.py b/lib/requests/packages/urllib3/connection.py
new file mode 100644
index 0000000..e5de769
--- /dev/null
+++ b/lib/requests/packages/urllib3/connection.py
@@ -0,0 +1,262 @@
+import datetime
+import sys
+import socket
+from socket import timeout as SocketTimeout
+import warnings
+from .packages import six
+
+try:  # Python 3
+    from http.client import HTTPConnection as _HTTPConnection, HTTPException
+except ImportError:
+    from httplib import HTTPConnection as _HTTPConnection, HTTPException
+
+
+class DummyConnection(object):
+    "Used to detect a failed ConnectionCls import."
+    pass
+
+
+try:  # Compiled with SSL?
+    HTTPSConnection = DummyConnection
+    import ssl
+    BaseSSLError = ssl.SSLError
+except (ImportError, AttributeError):  # Platform-specific: No SSL.
+    ssl = None
+
+    class BaseSSLError(BaseException):
+        pass
+
+
+try:  # Python 3:
+    # Not a no-op, we're adding this to the namespace so it can be imported.
+    ConnectionError = ConnectionError
+except NameError:  # Python 2:
+    class ConnectionError(Exception):
+        pass
+
+
+from .exceptions import (
+    ConnectTimeoutError,
+    SystemTimeWarning,
+    SecurityWarning,
+)
+from .packages.ssl_match_hostname import match_hostname
+
+from .util.ssl_ import (
+    resolve_cert_reqs,
+    resolve_ssl_version,
+    ssl_wrap_socket,
+    assert_fingerprint,
+)
+
+
+from .util import connection
+
+port_by_scheme = {
+    'http': 80,
+    'https': 443,
+}
+
+RECENT_DATE = datetime.date(2014, 1, 1)
+
+
+class HTTPConnection(_HTTPConnection, object):
+    """
+    Based on httplib.HTTPConnection but provides an extra constructor
+    backwards-compatibility layer between older and newer Pythons.
+
+    Additional keyword parameters are used to configure attributes of the connection.
+    Accepted parameters include:
+
+      - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`
+      - ``source_address``: Set the source address for the current connection.
+
+        .. note:: This is ignored for Python 2.6. It is only applied for 2.7 and 3.x
+
+      - ``socket_options``: Set specific options on the underlying socket. If not specified, then
+        defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling
+        Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.
+
+        For example, if you wish to enable TCP Keep Alive in addition to the defaults,
+        you might pass::
+
+            HTTPConnection.default_socket_options + [
+                (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+            ]
+
+        Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).
+    """
+
+    default_port = port_by_scheme['http']
+
+    #: Disable Nagle's algorithm by default.
+    #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``
+    default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]
+
+    #: Whether this connection verifies the host's certificate.
+    is_verified = False
+
+    def __init__(self, *args, **kw):
+        if six.PY3:  # Python 3
+            kw.pop('strict', None)
+
+        # Pre-set source_address in case we have an older Python like 2.6.
+        self.source_address = kw.get('source_address')
+
+        if sys.version_info < (2, 7):  # Python 2.6
+            # _HTTPConnection on Python 2.6 will balk at this keyword arg, but
+            # not newer versions. We can still use it when creating a
+            # connection though, so we pop it *after* we have saved it as
+            # self.source_address.
+            kw.pop('source_address', None)
+
+        #: The socket options provided by the user. If no options are
+        #: provided, we use the default options.
+        self.socket_options = kw.pop('socket_options', self.default_socket_options)
+
+        # Superclass also sets self.source_address in Python 2.7+.
+        _HTTPConnection.__init__(self, *args, **kw)
+
+    def _new_conn(self):
+        """ Establish a socket connection and set nodelay settings on it.
+
+        :return: New socket connection.
+        """
+        extra_kw = {}
+        if self.source_address:
+            extra_kw['source_address'] = self.source_address
+
+        if self.socket_options:
+            extra_kw['socket_options'] = self.socket_options
+
+        try:
+            conn = connection.create_connection(
+                (self.host, self.port), self.timeout, **extra_kw)
+
+        except SocketTimeout:
+            raise ConnectTimeoutError(
+                self, "Connection to %s timed out. (connect timeout=%s)" %
+                (self.host, self.timeout))
+
+        return conn
+
+    def _prepare_conn(self, conn):
+        self.sock = conn
+        # the _tunnel_host attribute was added in python 2.6.3 (via
+        # http://hg.python.org/cpython/rev/0f57b30a152f) so pythons 2.6(0-2) do
+        # not have them.
+        if getattr(self, '_tunnel_host', None):
+            # TODO: Fix tunnel so it doesn't depend on self.sock state.
+            self._tunnel()
+            # Mark this connection as not reusable
+            self.auto_open = 0
+
+    def connect(self):
+        conn = self._new_conn()
+        self._prepare_conn(conn)
+
+
+class HTTPSConnection(HTTPConnection):
+    default_port = port_by_scheme['https']
+
+    def __init__(self, host, port=None, key_file=None, cert_file=None,
+                 strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, **kw):
+
+        HTTPConnection.__init__(self, host, port, strict=strict,
+                                timeout=timeout, **kw)
+
+        self.key_file = key_file
+        self.cert_file = cert_file
+
+        # Required property for Google AppEngine 1.9.0 which otherwise causes
+        # HTTPS requests to go out as HTTP. (See Issue #356)
+        self._protocol = 'https'
+
+    def connect(self):
+        conn = self._new_conn()
+        self._prepare_conn(conn)
+        self.sock = ssl.wrap_socket(conn, self.key_file, self.cert_file)
+
+
+class VerifiedHTTPSConnection(HTTPSConnection):
+    """
+    Based on httplib.HTTPSConnection but wraps the socket with
+    SSL certification.
+    """
+    cert_reqs = None
+    ca_certs = None
+    ssl_version = None
+    assert_fingerprint = None
+
+    def set_cert(self, key_file=None, cert_file=None,
+                 cert_reqs=None, ca_certs=None,
+                 assert_hostname=None, assert_fingerprint=None):
+
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.cert_reqs = cert_reqs
+        self.ca_certs = ca_certs
+        self.assert_hostname = assert_hostname
+        self.assert_fingerprint = assert_fingerprint
+
+    def connect(self):
+        # Add certificate verification
+        conn = self._new_conn()
+
+        resolved_cert_reqs = resolve_cert_reqs(self.cert_reqs)
+        resolved_ssl_version = resolve_ssl_version(self.ssl_version)
+
+        hostname = self.host
+        if getattr(self, '_tunnel_host', None):
+            # _tunnel_host was added in Python 2.6.3
+            # (See: http://hg.python.org/cpython/rev/0f57b30a152f)
+
+            self.sock = conn
+            # Calls self._set_hostport(), so self.host is
+            # self._tunnel_host below.
+            self._tunnel()
+            # Mark this connection as not reusable
+            self.auto_open = 0
+
+            # Override the host with the one we're requesting data from.
+            hostname = self._tunnel_host
+
+        is_time_off = datetime.date.today() < RECENT_DATE
+        if is_time_off:
+            warnings.warn((
+                'System time is way off (before {0}). This will probably '
+                'lead to SSL verification errors').format(RECENT_DATE),
+                SystemTimeWarning
+            )
+
+        # Wrap socket using verification with the root certs in
+        # trusted_root_certs
+        self.sock = ssl_wrap_socket(conn, self.key_file, self.cert_file,
+                                    cert_reqs=resolved_cert_reqs,
+                                    ca_certs=self.ca_certs,
+                                    server_hostname=hostname,
+                                    ssl_version=resolved_ssl_version)
+
+        if self.assert_fingerprint:
+            assert_fingerprint(self.sock.getpeercert(binary_form=True),
+                               self.assert_fingerprint)
+        elif resolved_cert_reqs != ssl.CERT_NONE \
+                and self.assert_hostname is not False:
+            cert = self.sock.getpeercert()
+            if not cert.get('subjectAltName', ()):
+                warnings.warn((
+                    'Certificate has no `subjectAltName`, falling back to check for a `commonName` for now. '
+                    'This feature is being removed by major browsers and deprecated by RFC 2818. '
+                    '(See https://github.com/shazow/urllib3/issues/497 for details.)'),
+                    SecurityWarning
+                )
+            match_hostname(cert, self.assert_hostname or hostname)
+
+        self.is_verified = (resolved_cert_reqs == ssl.CERT_REQUIRED
+                            or self.assert_fingerprint is not None)
+
+
+if ssl:
+    # Make a copy for testing.
+    UnverifiedHTTPSConnection = HTTPSConnection
+    HTTPSConnection = VerifiedHTTPSConnection
diff --git a/lib/requests/packages/urllib3/connection.pyc b/lib/requests/packages/urllib3/connection.pyc
new file mode 100644
index 0000000..6c75319
Binary files /dev/null and b/lib/requests/packages/urllib3/connection.pyc differ
diff --git a/lib/requests/packages/urllib3/connectionpool.py b/lib/requests/packages/urllib3/connectionpool.py
old mode 100755
new mode 100644
index 97da544..affd9a9
--- a/lib/requests/packages/urllib3/connectionpool.py
+++ b/lib/requests/packages/urllib3/connectionpool.py
@@ -1,58 +1,46 @@
-# urllib3/connectionpool.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
+import errno
 import logging
-import socket
+import sys
+import warnings
 
-from socket import timeout as SocketTimeout
-
-try: # Python 3
-    from http.client import HTTPConnection, HTTPException
-    from http.client import HTTP_PORT, HTTPS_PORT
-except ImportError:
-    from httplib import HTTPConnection, HTTPException
-    from httplib import HTTP_PORT, HTTPS_PORT
+from socket import error as SocketError, timeout as SocketTimeout
+import socket
 
-try: # Python 3
+try:  # Python 3
     from queue import LifoQueue, Empty, Full
 except ImportError:
     from Queue import LifoQueue, Empty, Full
+    import Queue as _  # Platform-specific: Windows
 
 
-try: # Compiled with SSL?
-    HTTPSConnection = object
-    BaseSSLError = None
-    ssl = None
-
-    try: # Python 3
-        from http.client import HTTPSConnection
-    except ImportError:
-        from httplib import HTTPSConnection
-
-    import ssl
-    BaseSSLError = ssl.SSLError
-
-except (ImportError, AttributeError): # Platform-specific: No SSL.
-    pass
-
-
-from .request import RequestMethods
-from .response import HTTPResponse
-from .util import get_host, is_connection_dropped
 from .exceptions import (
     ClosedPoolError,
+    ProtocolError,
     EmptyPoolError,
     HostChangedError,
+    LocationValueError,
     MaxRetryError,
+    ProxyError,
+    ReadTimeoutError,
     SSLError,
     TimeoutError,
+    InsecureRequestWarning,
 )
-
-from .packages.ssl_match_hostname import match_hostname, CertificateError
+from .packages.ssl_match_hostname import CertificateError
 from .packages import six
+from .connection import (
+    port_by_scheme,
+    DummyConnection,
+    HTTPConnection, HTTPSConnection, VerifiedHTTPSConnection,
+    HTTPException, BaseSSLError, ConnectionError
+)
+from .request import RequestMethods
+from .response import HTTPResponse
+
+from .util.connection import is_connection_dropped
+from .util.retry import Retry
+from .util.timeout import Timeout
+from .util.url import get_host
 
 
 xrange = six.moves.xrange
@@ -61,50 +49,8 @@ log = logging.getLogger(__name__)
 
 _Default = object()
 
-port_by_scheme = {
-    'http': HTTP_PORT,
-    'https': HTTPS_PORT,
-}
-
-
-## Connection objects (extension of httplib)
-
-class VerifiedHTTPSConnection(HTTPSConnection):
-    """
-    Based on httplib.HTTPSConnection but wraps the socket with
-    SSL certification.
-    """
-    cert_reqs = None
-    ca_certs = None
-
-    def set_cert(self, key_file=None, cert_file=None,
-                 cert_reqs='CERT_NONE', ca_certs=None):
-        ssl_req_scheme = {
-            'CERT_NONE': ssl.CERT_NONE,
-            'CERT_OPTIONAL': ssl.CERT_OPTIONAL,
-            'CERT_REQUIRED': ssl.CERT_REQUIRED
-        }
-
-        self.key_file = key_file
-        self.cert_file = cert_file
-        self.cert_reqs = ssl_req_scheme.get(cert_reqs) or ssl.CERT_NONE
-        self.ca_certs = ca_certs
-
-    def connect(self):
-        # Add certificate verification
-        sock = socket.create_connection((self.host, self.port), self.timeout)
-
-        # Wrap socket using verification with the root certs in
-        # trusted_root_certs
-        self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-                                    cert_reqs=self.cert_reqs,
-                                    ca_certs=self.ca_certs)
-        if self.ca_certs:
-            match_hostname(self.sock.getpeercert(), self.host)
-
 
 ## Pool objects
-
 class ConnectionPool(object):
     """
     Base class for all connection pools, such as
@@ -115,13 +61,20 @@ class ConnectionPool(object):
     QueueCls = LifoQueue
 
     def __init__(self, host, port=None):
-        self.host = host
+        if not host:
+            raise LocationValueError("No host specified.")
+
+        # httplib doesn't like it when we include brackets in ipv6 addresses
+        self.host = host.strip('[]')
         self.port = port
 
     def __str__(self):
         return '%s(host=%r, port=%r)' % (type(self).__name__,
                                          self.host, self.port)
 
+# This is taken from http://hg.python.org/cpython/file/7aaba721ebc0/Lib/socket.py#l252
+_blocking_errnos = set([errno.EAGAIN, errno.EWOULDBLOCK])
+
 
 class HTTPConnectionPool(ConnectionPool, RequestMethods):
     """
@@ -140,9 +93,15 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         as a valid HTTP/1.0 or 1.1 status line, passed into
         :class:`httplib.HTTPConnection`.
 
+        .. note::
+           Only works in Python 2. This parameter is ignored in Python 3.
+
     :param timeout:
-        Socket timeout for each individual connection, can be a float. None
-        disables timeout.
+        Socket timeout in seconds for each individual connection. This can
+        be a float or integer, which sets the timeout for the HTTP request,
+        or an instance of :class:`urllib3.util.Timeout` which gives you more
+        fine-grained control over request timeouts. After the constructor has
+        been parsed, this is always a `urllib3.util.Timeout` object.
 
     :param maxsize:
         Number of connections to save that can be reused. More than 1 is useful
@@ -160,19 +119,50 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
     :param headers:
         Headers to include with all requests, unless other headers are given
         explicitly.
+
+    :param retries:
+        Retry configuration to use by default with requests in this pool.
+
+    :param _proxy:
+        Parsed proxy URL, should not be used directly, instead, see
+        :class:`urllib3.connectionpool.ProxyManager`"
+
+    :param _proxy_headers:
+        A dictionary with proxy headers, should not be used directly,
+        instead, see :class:`urllib3.connectionpool.ProxyManager`"
+
+    :param \**conn_kw:
+        Additional parameters are used to create fresh :class:`urllib3.connection.HTTPConnection`,
+        :class:`urllib3.connection.HTTPSConnection` instances.
     """
 
     scheme = 'http'
+    ConnectionCls = HTTPConnection
 
-    def __init__(self, host, port=None, strict=False, timeout=None, maxsize=1,
-                 block=False, headers=None):
-        super(HTTPConnectionPool, self).__init__(host, port)
+    def __init__(self, host, port=None, strict=False,
+                 timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1, block=False,
+                 headers=None, retries=None,
+                 _proxy=None, _proxy_headers=None,
+                 **conn_kw):
+        ConnectionPool.__init__(self, host, port)
+        RequestMethods.__init__(self, headers)
 
         self.strict = strict
+
+        if not isinstance(timeout, Timeout):
+            timeout = Timeout.from_float(timeout)
+
+        if retries is None:
+            retries = Retry.DEFAULT
+
         self.timeout = timeout
+        self.retries = retries
+
         self.pool = self.QueueCls(maxsize)
         self.block = block
-        self.headers = headers or {}
+
+        self.proxy = _proxy
+        self.proxy_headers = _proxy_headers or {}
 
         # Fill the queue up so that doing get() on it will block properly
         for _ in xrange(maxsize):
@@ -181,15 +171,26 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         # These are mostly for testing and debugging purposes.
         self.num_connections = 0
         self.num_requests = 0
+        self.conn_kw = conn_kw
+
+        if self.proxy:
+            # Enable Nagle's algorithm for proxies, to avoid packet fragmentation.
+            # We cannot know if the user has added default socket options, so we cannot replace the
+            # list.
+            self.conn_kw.setdefault('socket_options', [])
 
     def _new_conn(self):
         """
-        Return a fresh :class:`httplib.HTTPConnection`.
+        Return a fresh :class:`HTTPConnection`.
         """
         self.num_connections += 1
         log.info("Starting new HTTP connection (%d): %s" %
                  (self.num_connections, self.host))
-        return HTTPConnection(host=self.host, port=self.port)
+
+        conn = self.ConnectionCls(host=self.host, port=self.port,
+                                  timeout=self.timeout.connect_timeout,
+                                  strict=self.strict, **self.conn_kw)
+        return conn
 
     def _get_conn(self, timeout=None):
         """
@@ -207,7 +208,7 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         try:
             conn = self.pool.get(block=self.block, timeout=timeout)
 
-        except AttributeError: # self.pool is None
+        except AttributeError:  # self.pool is None
             raise ClosedPoolError(self, "Pool is closed.")
 
         except Empty:
@@ -221,6 +222,11 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         if conn and is_connection_dropped(conn):
             log.info("Resetting dropped connection: %s" % self.host)
             conn.close()
+            if getattr(conn, 'auto_open', 1) == 0:
+                # This is a proxied connection that has been mutated by
+                # httplib._tunnel() and cannot be reused (since it would
+                # attempt to bypass the proxy)
+                conn = None
 
         return conn or self._new_conn()
 
@@ -240,41 +246,120 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         """
         try:
             self.pool.put(conn, block=False)
-            return # Everything is dandy, done.
+            return  # Everything is dandy, done.
         except AttributeError:
             # self.pool is None.
             pass
         except Full:
             # This should never happen if self.block == True
-            log.warning("HttpConnectionPool is full, discarding connection: %s"
-                        % self.host)
+            log.warning(
+                "Connection pool is full, discarding connection: %s" %
+                self.host)
 
         # Connection never got put back into the pool, close it.
-        conn.close()
+        if conn:
+            conn.close()
+
+    def _validate_conn(self, conn):
+        """
+        Called right before a request is made, after the socket is created.
+        """
+        pass
+
+    def _prepare_proxy(self, conn):
+        # Nothing to do for HTTP connections.
+        pass
+
+    def _get_timeout(self, timeout):
+        """ Helper that always returns a :class:`urllib3.util.Timeout` """
+        if timeout is _Default:
+            return self.timeout.clone()
+
+        if isinstance(timeout, Timeout):
+            return timeout.clone()
+        else:
+            # User passed us an int/float. This is for backwards compatibility,
+            # can be removed later
+            return Timeout.from_float(timeout)
+
+    def _raise_timeout(self, err, url, timeout_value):
+        """Is the error actually a timeout? Will raise a ReadTimeout or pass"""
+
+        if isinstance(err, SocketTimeout):
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+        # See the above comment about EAGAIN in Python 3. In Python 2 we have
+        # to specifically catch it and throw the timeout error
+        if hasattr(err, 'errno') and err.errno in _blocking_errnos:
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+        # Catch possible read timeouts thrown as SSL errors. If not the
+        # case, rethrow the original. We need to do this because of:
+        # http://bugs.python.org/issue10272
+        if 'timed out' in str(err) or 'did not complete (read)' in str(err):  # Python 2.6
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
 
     def _make_request(self, conn, method, url, timeout=_Default,
                       **httplib_request_kw):
         """
-        Perform a request on a given httplib connection object taken from our
+        Perform a request on a given urllib connection object taken from our
         pool.
+
+        :param conn:
+            a connection from one of our connection pools
+
+        :param timeout:
+            Socket timeout in seconds for the request. This can be a
+            float or integer, which will set the same timeout value for
+            the socket connect and the socket read, or an instance of
+            :class:`urllib3.util.Timeout`, which gives you more fine-grained
+            control over your timeouts.
         """
         self.num_requests += 1
 
-        if timeout is _Default:
-            timeout = self.timeout
+        timeout_obj = self._get_timeout(timeout)
+        timeout_obj.start_connect()
+        conn.timeout = timeout_obj.connect_timeout
 
-        conn.timeout = timeout # This only does anything in Py26+
+        # Trigger any extra validation we need to do.
+        try:
+            self._validate_conn(conn)
+        except (SocketTimeout, BaseSSLError) as e:
+            # Py2 raises this as a BaseSSLError, Py3 raises it as socket timeout.
+            self._raise_timeout(err=e, url=url, timeout_value=conn.timeout)
+            raise
+
+        # conn.request() calls httplib.*.request, not the method in
+        # urllib3.request. It also calls makefile (recv) on the socket.
         conn.request(method, url, **httplib_request_kw)
 
-        # Set timeout
-        sock = getattr(conn, 'sock', False) # AppEngine doesn't have sock attr.
-        if sock:
-            sock.settimeout(timeout)
-
-        try: # Python 2.7+, use buffering of HTTP responses
-            httplib_response = conn.getresponse(buffering=True)
-        except TypeError: # Python 2.6 and older
-            httplib_response = conn.getresponse()
+        # Reset the timeout for the recv() on the socket
+        read_timeout = timeout_obj.read_timeout
+
+        # App Engine doesn't have a sock attr
+        if getattr(conn, 'sock', None):
+            # In Python 3 socket.py will catch EAGAIN and return None when you
+            # try and read into the file pointer created by http.client, which
+            # instead raises a BadStatusLine exception. Instead of catching
+            # the exception and assuming all BadStatusLine exceptions are read
+            # timeouts, check for a zero timeout before making the request.
+            if read_timeout == 0:
+                raise ReadTimeoutError(
+                    self, url, "Read timed out. (read timeout=%s)" % read_timeout)
+            if read_timeout is Timeout.DEFAULT_TIMEOUT:
+                conn.sock.settimeout(socket.getdefaulttimeout())
+            else:  # None or a value
+                conn.sock.settimeout(read_timeout)
+
+        # Receive the response from the server
+        try:
+            try:  # Python 2.7+, use buffering of HTTP responses
+                httplib_response = conn.getresponse(buffering=True)
+            except TypeError:  # Python 2.6 and older
+                httplib_response = conn.getresponse()
+        except (SocketTimeout, BaseSSLError, SocketError) as e:
+            self._raise_timeout(err=e, url=url, timeout_value=read_timeout)
+            raise
 
         # AppEngine doesn't have a version attr.
         http_version = getattr(conn, '_http_vsn_str', 'HTTP/?')
@@ -297,7 +382,7 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
                     conn.close()
 
         except Empty:
-            pass # Done.
+            pass  # Done.
 
     def is_same_host(self, url):
         """
@@ -310,13 +395,15 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         # TODO: Add optional support for socket.gethostbyname checking.
         scheme, host, port = get_host(url)
 
+        # Use explicit default port for comparison when none is given
         if self.port and not port:
-            # Use explicit default port for comparison when none is given.
             port = port_by_scheme.get(scheme)
+        elif not self.port and port == port_by_scheme.get(scheme):
+            port = None
 
         return (scheme, host, port) == (self.scheme, self.host, self.port)
 
-    def urlopen(self, method, url, body=None, headers=None, retries=3,
+    def urlopen(self, method, url, body=None, headers=None, retries=None,
                 redirect=True, assert_same_host=True, timeout=_Default,
                 pool_timeout=None, release_conn=None, **response_kw):
         """
@@ -350,11 +437,25 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
             these headers completely replace any pool-specific headers.
 
         :param retries:
-            Number of retries to allow before raising a MaxRetryError exception.
+            Configure the number of retries to allow before raising a
+            :class:`~urllib3.exceptions.MaxRetryError` exception.
+
+            Pass ``None`` to retry until you receive a response. Pass a
+            :class:`~urllib3.util.retry.Retry` object for fine-grained control
+            over different types of retries.
+            Pass an integer number to retry connection errors that many times,
+            but no other types of errors. Pass zero to never retry.
+
+            If ``False``, then retries are disabled and any exception is raised
+            immediately. Also, instead of raising a MaxRetryError on redirects,
+            the redirect response will be returned.
+
+        :type retries: :class:`~urllib3.util.retry.Retry`, False, or an int.
 
         :param redirect:
             If True, automatically handle redirects (status codes 301, 302,
-            303, 307). Each redirect counts as a retry.
+            303, 307, 308). Each redirect counts as a retry. Disabling retries
+            will disable redirect, too.
 
         :param assert_same_host:
             If ``True``, will make sure that the host of the pool requests is
@@ -362,7 +463,9 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
             use the pool on an HTTP proxy and request foreign hosts.
 
         :param timeout:
-            If specified, overrides the default timeout for this one request.
+            If specified, overrides the default timeout for this one
+            request. It may be a float (in seconds) or an instance of
+            :class:`urllib3.util.Timeout`.
 
         :param pool_timeout:
             If set and the pool is set to block=True, then this method will
@@ -386,32 +489,43 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         if headers is None:
             headers = self.headers
 
-        if retries < 0:
-            raise MaxRetryError(self, url)
-
-        if timeout is _Default:
-            timeout = self.timeout
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect, default=self.retries)
 
         if release_conn is None:
             release_conn = response_kw.get('preload_content', True)
 
         # Check host
         if assert_same_host and not self.is_same_host(url):
-            host = "%s://%s" % (self.scheme, self.host)
-            if self.port:
-                host = "%s:%d" % (host, self.port)
-
-            raise HostChangedError(self, url, retries - 1)
+            raise HostChangedError(self, url, retries)
 
         conn = None
 
+        # Merge the proxy headers. Only do this in HTTP. We have to copy the
+        # headers dict so we can safely change it without those changes being
+        # reflected in anyone else's copy.
+        if self.scheme == 'http':
+            headers = headers.copy()
+            headers.update(self.proxy_headers)
+
+        # Must keep the exception bound to a separate variable or else Python 3
+        # complains about UnboundLocalError.
+        err = None
+
         try:
-            # Request a connection from the queue
+            # Request a connection from the queue.
+            timeout_obj = self._get_timeout(timeout)
             conn = self._get_conn(timeout=pool_timeout)
 
-            # Make the request on the httplib connection object
+            conn.timeout = timeout_obj.connect_timeout
+
+            is_new_proxy_conn = self.proxy is not None and not getattr(conn, 'sock', None)
+            if is_new_proxy_conn:
+                self._prepare_proxy(conn)
+
+            # Make the request on the httplib connection object.
             httplib_response = self._make_request(conn, method, url,
-                                                  timeout=timeout,
+                                                  timeout=timeout_obj,
                                                   body=body, headers=headers)
 
             # If we're going to release the connection in ``finally:``, then
@@ -431,28 +545,37 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
             #     ``response.release_conn()`` is called (implicitly by
             #     ``response.read()``)
 
-        except Empty as e:
-            # Timed out by queue
-            raise TimeoutError(self, "Request timed out. (pool_timeout=%s)" %
-                               pool_timeout)
+        except Empty:
+            # Timed out by queue.
+            raise EmptyPoolError(self, "No pool connections are available.")
+
+        except (BaseSSLError, CertificateError) as e:
+            # Close the connection. If a connection is reused on which there
+            # was a Certificate error, the next request will certainly raise
+            # another Certificate error.
+            if conn:
+                conn.close()
+                conn = None
+            raise SSLError(e)
 
-        except SocketTimeout as e:
-            # Timed out by socket
-            raise TimeoutError(self, "Request timed out. (timeout=%s)" %
-                               timeout)
+        except (TimeoutError, HTTPException, SocketError, ConnectionError) as e:
+            if conn:
+                # Discard the connection for these exceptions. It will be
+                # be replaced during the next _get_conn() call.
+                conn.close()
+                conn = None
 
-        except BaseSSLError as e:
-            # SSL certificate error
-            raise SSLError(e)
+            stacktrace = sys.exc_info()[2]
+            if isinstance(e, SocketError) and self.proxy:
+                e = ProxyError('Cannot connect to proxy.', e)
+            elif isinstance(e, (SocketError, HTTPException)):
+                e = ProtocolError('Connection aborted.', e)
 
-        except CertificateError as e:
-            # Name mismatch
-            raise SSLError(e)
+            retries = retries.increment(method, url, error=e,
+                                        _pool=self, _stacktrace=stacktrace)
+            retries.sleep()
 
-        except HTTPException as e:
-            # Connection broken, discard. It will be replaced next _get_conn().
-            conn = None
-            # This is necessary so we can access e below
+            # Keep track of the error for the retry warning.
             err = e
 
         finally:
@@ -464,9 +587,9 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
 
         if not conn:
             # Try again
-            log.warn("Retrying (%d attempts remain) after connection "
-                     "broken by '%r': %s" % (retries, err, url))
-            return self.urlopen(method, url, body, headers, retries - 1,
+            log.warning("Retrying (%r) after connection "
+                        "broken by '%r': %s" % (retries, err, url))
+            return self.urlopen(method, url, body, headers, retries,
                                 redirect, assert_same_host,
                                 timeout=timeout, pool_timeout=pool_timeout,
                                 release_conn=release_conn, **response_kw)
@@ -476,11 +599,31 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
         if redirect_location:
             if response.status == 303:
                 method = 'GET'
+
+            try:
+                retries = retries.increment(method, url, response=response, _pool=self)
+            except MaxRetryError:
+                if retries.raise_on_redirect:
+                    raise
+                return response
+
             log.info("Redirecting %s -> %s" % (url, redirect_location))
             return self.urlopen(method, redirect_location, body, headers,
-                                retries - 1, redirect, assert_same_host,
-                                timeout=timeout, pool_timeout=pool_timeout,
-                                release_conn=release_conn, **response_kw)
+                    retries=retries, redirect=redirect,
+                    assert_same_host=assert_same_host,
+                    timeout=timeout, pool_timeout=pool_timeout,
+                    release_conn=release_conn, **response_kw)
+
+        # Check if we should retry the HTTP response.
+        if retries.is_forced_retry(method, status_code=response.status):
+            retries = retries.increment(method, url, response=response, _pool=self)
+            retries.sleep()
+            log.info("Forced retry: %s" % url)
+            return self.urlopen(method, url, body, headers,
+                    retries=retries, redirect=redirect,
+                    assert_same_host=assert_same_host,
+                    timeout=timeout, pool_timeout=pool_timeout,
+                    release_conn=release_conn, **response_kw)
 
         return response
 
@@ -491,28 +634,75 @@ class HTTPSConnectionPool(HTTPConnectionPool):
 
     When Python is compiled with the :mod:`ssl` module, then
     :class:`.VerifiedHTTPSConnection` is used, which *can* verify certificates,
-    instead of :class:httplib.HTTPSConnection`.
+    instead of :class:`.HTTPSConnection`.
 
-    The ``key_file``, ``cert_file``, ``cert_reqs``, and ``ca_certs`` parameters
-    are only used if :mod:`ssl` is available and are fed into
-    :meth:`ssl.wrap_socket` to upgrade the connection socket into an SSL socket.
+    :class:`.VerifiedHTTPSConnection` uses one of ``assert_fingerprint``,
+    ``assert_hostname`` and ``host`` in this order to verify connections.
+    If ``assert_hostname`` is False, no verification is done.
+
+    The ``key_file``, ``cert_file``, ``cert_reqs``, ``ca_certs`` and
+    ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
+    :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
+    into an SSL socket.
     """
 
     scheme = 'https'
+    ConnectionCls = HTTPSConnection
 
     def __init__(self, host, port=None,
-                 strict=False, timeout=None, maxsize=1,
-                 block=False, headers=None,
-                 key_file=None, cert_file=None,
-                 cert_reqs='CERT_NONE', ca_certs=None):
-
-        super(HTTPSConnectionPool, self).__init__(host, port,
-                                                  strict, timeout, maxsize,
-                                                  block, headers)
+                 strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
+                 block=False, headers=None, retries=None,
+                 _proxy=None, _proxy_headers=None,
+                 key_file=None, cert_file=None, cert_reqs=None,
+                 ca_certs=None, ssl_version=None,
+                 assert_hostname=None, assert_fingerprint=None,
+                 **conn_kw):
+
+        HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,
+                                    block, headers, retries, _proxy, _proxy_headers,
+                                    **conn_kw)
         self.key_file = key_file
         self.cert_file = cert_file
         self.cert_reqs = cert_reqs
         self.ca_certs = ca_certs
+        self.ssl_version = ssl_version
+        self.assert_hostname = assert_hostname
+        self.assert_fingerprint = assert_fingerprint
+
+    def _prepare_conn(self, conn):
+        """
+        Prepare the ``connection`` for :meth:`urllib3.util.ssl_wrap_socket`
+        and establish the tunnel if proxy is used.
+        """
+
+        if isinstance(conn, VerifiedHTTPSConnection):
+            conn.set_cert(key_file=self.key_file,
+                          cert_file=self.cert_file,
+                          cert_reqs=self.cert_reqs,
+                          ca_certs=self.ca_certs,
+                          assert_hostname=self.assert_hostname,
+                          assert_fingerprint=self.assert_fingerprint)
+            conn.ssl_version = self.ssl_version
+
+        return conn
+
+    def _prepare_proxy(self, conn):
+        """
+        Establish tunnel connection early, because otherwise httplib
+        would improperly set Host: header to proxy's IP:port.
+        """
+        # Python 2.7+
+        try:
+            set_tunnel = conn.set_tunnel
+        except AttributeError:  # Platform-specific: Python 2.6
+            set_tunnel = conn._set_tunnel
+
+        if sys.version_info <= (2, 6, 4) and not self.proxy_headers:   # Python 2.6.4 and older
+            set_tunnel(self.host, self.port)
+        else:
+            set_tunnel(self.host, self.port, self.proxy_headers)
+
+        conn.connect()
 
     def _new_conn(self):
         """
@@ -522,17 +712,39 @@ class HTTPSConnectionPool(HTTPConnectionPool):
         log.info("Starting new HTTPS connection (%d): %s"
                  % (self.num_connections, self.host))
 
-        if not ssl: # Platform-specific: Python compiled without +ssl
-            if not HTTPSConnection or HTTPSConnection is object:
-                raise SSLError("Can't connect to HTTPS URL because the SSL "
-                               "module is not available.")
+        if not self.ConnectionCls or self.ConnectionCls is DummyConnection:
+            # Platform-specific: Python without ssl
+            raise SSLError("Can't connect to HTTPS URL because the SSL "
+                           "module is not available.")
+
+        actual_host = self.host
+        actual_port = self.port
+        if self.proxy is not None:
+            actual_host = self.proxy.host
+            actual_port = self.proxy.port
+
+        conn = self.ConnectionCls(host=actual_host, port=actual_port,
+                                  timeout=self.timeout.connect_timeout,
+                                  strict=self.strict, **self.conn_kw)
+
+        return self._prepare_conn(conn)
+
+    def _validate_conn(self, conn):
+        """
+        Called right before a request is made, after the socket is created.
+        """
+        super(HTTPSConnectionPool, self)._validate_conn(conn)
 
-            return HTTPSConnection(host=self.host, port=self.port)
+        # Force connect early to allow us to validate the connection.
+        if not getattr(conn, 'sock', None):  # AppEngine might not have  `.sock`
+            conn.connect()
 
-        connection = VerifiedHTTPSConnection(host=self.host, port=self.port)
-        connection.set_cert(key_file=self.key_file, cert_file=self.cert_file,
-                            cert_reqs=self.cert_reqs, ca_certs=self.ca_certs)
-        return connection
+        '''if not conn.is_verified:
+            warnings.warn((
+                'Unverified HTTPS request is being made. '
+                'Adding certificate verification is strongly advised. See: '
+                'https://urllib3.readthedocs.org/en/latest/security.html'),
+                InsecureRequestWarning)'''
 
 
 def connection_from_url(url, **kw):
@@ -550,7 +762,7 @@ def connection_from_url(url, **kw):
         :class:`.ConnectionPool`. Useful for specifying things like
         timeout, maxsize, headers, etc.
 
-    Example: ::
+    Example::
 
         >>> conn = connection_from_url('http://google.com/')
         >>> r = conn.request('GET', '/')
diff --git a/lib/requests/packages/urllib3/connectionpool.pyc b/lib/requests/packages/urllib3/connectionpool.pyc
index 82bc94b..dc9f7b2 100644
Binary files a/lib/requests/packages/urllib3/connectionpool.pyc and b/lib/requests/packages/urllib3/connectionpool.pyc differ
diff --git a/lib/requests/packages/urllib3/contrib/__init__.py b/lib/requests/packages/urllib3/contrib/__init__.py
old mode 100755
new mode 100644
diff --git a/lib/requests/packages/urllib3/contrib/__init__.pyc b/lib/requests/packages/urllib3/contrib/__init__.pyc
new file mode 100644
index 0000000..e67ae17
Binary files /dev/null and b/lib/requests/packages/urllib3/contrib/__init__.pyc differ
diff --git a/lib/requests/packages/urllib3/contrib/ntlmpool.py b/lib/requests/packages/urllib3/contrib/ntlmpool.py
old mode 100755
new mode 100644
index bb41fd1..c6b266f
--- a/lib/requests/packages/urllib3/contrib/ntlmpool.py
+++ b/lib/requests/packages/urllib3/contrib/ntlmpool.py
@@ -1,9 +1,3 @@
-# urllib3/contrib/ntlmpool.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 """
 NTLM authenticating pool, contributed by erikcederstran
 
@@ -33,7 +27,7 @@ class NTLMConnectionPool(HTTPSConnectionPool):
     def __init__(self, user, pw, authurl, *args, **kwargs):
         """
         authurl is a random URL on the server that is protected by NTLM.
-        user is the Windows user, probably in the DOMAIN\username format.
+        user is the Windows user, probably in the DOMAIN\\username format.
         pw is the password for the user.
         """
         super(NTLMConnectionPool, self).__init__(*args, **kwargs)
diff --git a/lib/requests/packages/urllib3/contrib/pyopenssl.py b/lib/requests/packages/urllib3/contrib/pyopenssl.py
new file mode 100644
index 0000000..ee657fb
--- /dev/null
+++ b/lib/requests/packages/urllib3/contrib/pyopenssl.py
@@ -0,0 +1,308 @@
+'''SSL with SNI_-support for Python 2. Follow these instructions if you would
+like to verify SSL certificates in Python 2. Note, the default libraries do
+*not* do certificate checking; you need to do additional work to validate
+certificates yourself.
+
+This needs the following packages installed:
+
+* pyOpenSSL (tested with 0.13)
+* ndg-httpsclient (tested with 0.3.2)
+* pyasn1 (tested with 0.1.6)
+
+You can install them with the following command:
+
+    pip install pyopenssl ndg-httpsclient pyasn1
+
+To activate certificate checking, call
+:func:`~urllib3.contrib.pyopenssl.inject_into_urllib3` from your Python code
+before you begin making HTTP requests. This can be done in a ``sitecustomize``
+module, or at any other time before your application begins using ``urllib3``,
+like this::
+
+    try:
+        import urllib3.contrib.pyopenssl
+        urllib3.contrib.pyopenssl.inject_into_urllib3()
+    except ImportError:
+        pass
+
+Now you can use :mod:`urllib3` as you normally would, and it will support SNI
+when the required modules are installed.
+
+Activating this module also has the positive side effect of disabling SSL/TLS
+compression in Python 2 (see `CRIME attack`_).
+
+If you want to configure the default list of supported cipher suites, you can
+set the ``urllib3.contrib.pyopenssl.DEFAULT_SSL_CIPHER_LIST`` variable.
+
+Module Variables
+----------------
+
+:var DEFAULT_SSL_CIPHER_LIST: The list of supported SSL/TLS cipher suites.
+    Default: ``ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:
+    ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS``
+
+.. _sni: https://en.wikipedia.org/wiki/Server_Name_Indication
+.. _crime attack: https://en.wikipedia.org/wiki/CRIME_(security_exploit)
+
+'''
+
+try:
+    from ndg.httpsclient.ssl_peer_verification import SUBJ_ALT_NAME_SUPPORT
+    from ndg.httpsclient.subj_alt_name import SubjectAltName as BaseSubjectAltName
+except SyntaxError as e:
+    raise ImportError(e)
+
+import OpenSSL.SSL
+from pyasn1.codec.der import decoder as der_decoder
+from pyasn1.type import univ, constraint
+from socket import _fileobject, timeout
+import ssl
+import select
+
+from .. import connection
+from .. import util
+
+__all__ = ['inject_into_urllib3', 'extract_from_urllib3']
+
+# SNI only *really* works if we can read the subjectAltName of certificates.
+HAS_SNI = SUBJ_ALT_NAME_SUPPORT
+
+# Map from urllib3 to PyOpenSSL compatible parameter-values.
+_openssl_versions = {
+    ssl.PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD,
+    ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD,
+}
+
+try:
+    _openssl_versions.update({ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD})
+except AttributeError:
+    pass
+
+_openssl_verify = {
+    ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
+    ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
+    ssl.CERT_REQUIRED: OpenSSL.SSL.VERIFY_PEER
+                       + OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT,
+}
+
+# A secure default.
+# Sources for more information on TLS ciphers:
+#
+# - https://wiki.mozilla.org/Security/Server_Side_TLS
+# - https://www.ssllabs.com/projects/best-practices/index.html
+# - https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
+#
+# The general intent is:
+# - Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE),
+# - prefer ECDHE over DHE for better performance,
+# - prefer any AES-GCM over any AES-CBC for better performance and security,
+# - use 3DES as fallback which is secure but slow,
+# - disable NULL authentication, MD5 MACs and DSS for security reasons.
+DEFAULT_SSL_CIPHER_LIST = "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:" + \
+    "ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:" + \
+    "!aNULL:!MD5:!DSS"
+
+
+orig_util_HAS_SNI = util.HAS_SNI
+orig_connection_ssl_wrap_socket = connection.ssl_wrap_socket
+
+
+def inject_into_urllib3():
+    'Monkey-patch urllib3 with PyOpenSSL-backed SSL-support.'
+
+    connection.ssl_wrap_socket = ssl_wrap_socket
+    util.HAS_SNI = HAS_SNI
+
+
+def extract_from_urllib3():
+    'Undo monkey-patching by :func:`inject_into_urllib3`.'
+
+    connection.ssl_wrap_socket = orig_connection_ssl_wrap_socket
+    util.HAS_SNI = orig_util_HAS_SNI
+
+
+### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
+class SubjectAltName(BaseSubjectAltName):
+    '''ASN.1 implementation for subjectAltNames support'''
+
+    # There is no limit to how many SAN certificates a certificate may have,
+    #   however this needs to have some limit so we'll set an arbitrarily high
+    #   limit.
+    sizeSpec = univ.SequenceOf.sizeSpec + \
+        constraint.ValueSizeConstraint(1, 1024)
+
+
+### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
+def get_subj_alt_name(peer_cert):
+    # Search through extensions
+    dns_name = []
+    if not SUBJ_ALT_NAME_SUPPORT:
+        return dns_name
+
+    general_names = SubjectAltName()
+    for i in range(peer_cert.get_extension_count()):
+        ext = peer_cert.get_extension(i)
+        ext_name = ext.get_short_name()
+        if ext_name != 'subjectAltName':
+            continue
+
+        # PyOpenSSL returns extension data in ASN.1 encoded form
+        ext_dat = ext.get_data()
+        decoded_dat = der_decoder.decode(ext_dat,
+                                         asn1Spec=general_names)
+
+        for name in decoded_dat:
+            if not isinstance(name, SubjectAltName):
+                continue
+            for entry in range(len(name)):
+                component = name.getComponentByPosition(entry)
+                if component.getName() != 'dNSName':
+                    continue
+                dns_name.append(str(component.getComponent()))
+
+    return dns_name
+
+
+class WrappedSocket(object):
+    '''API-compatibility wrapper for Python OpenSSL's Connection-class.
+
+    Note: _makefile_refs, _drop() and _reuse() are needed for the garbage
+    collector of pypy.
+    '''
+
+    def __init__(self, connection, socket, suppress_ragged_eofs=True):
+        self.connection = connection
+        self.socket = socket
+        self.suppress_ragged_eofs = suppress_ragged_eofs
+        self._makefile_refs = 0
+
+    def fileno(self):
+        return self.socket.fileno()
+
+    def makefile(self, mode, bufsize=-1):
+        self._makefile_refs += 1
+        return _fileobject(self, mode, bufsize, close=True)
+
+    def recv(self, *args, **kwargs):
+        try:
+            data = self.connection.recv(*args, **kwargs)
+        except OpenSSL.SSL.SysCallError as e:
+            if self.suppress_ragged_eofs and e.args == (-1, 'Unexpected EOF'):
+                return b''
+            else:
+                raise
+        except OpenSSL.SSL.ZeroReturnError as e:
+            if self.connection.get_shutdown() == OpenSSL.SSL.RECEIVED_SHUTDOWN:
+                return b''
+            else:
+                raise
+        except OpenSSL.SSL.WantReadError:
+            rd, wd, ed = select.select(
+                [self.socket], [], [], self.socket.gettimeout())
+            if not rd:
+                raise timeout('The read operation timed out')
+            else:
+                return self.recv(*args, **kwargs)
+        else:
+            return data
+
+    def settimeout(self, timeout):
+        return self.socket.settimeout(timeout)
+
+    def _send_until_done(self, data):
+        while True:
+            try:
+                return self.connection.send(data)
+            except OpenSSL.SSL.WantWriteError:
+                _, wlist, _ = select.select([], [self.socket], [],
+                                            self.socket.gettimeout())
+                if not wlist:
+                    raise timeout()
+                continue
+
+    def sendall(self, data):
+        while len(data):
+            sent = self._send_until_done(data)
+            data = data[sent:]
+
+    def close(self):
+        if self._makefile_refs < 1:
+            return self.connection.shutdown()
+        else:
+            self._makefile_refs -= 1
+
+    def getpeercert(self, binary_form=False):
+        x509 = self.connection.get_peer_certificate()
+
+        if not x509:
+            return x509
+
+        if binary_form:
+            return OpenSSL.crypto.dump_certificate(
+                OpenSSL.crypto.FILETYPE_ASN1,
+                x509)
+
+        return {
+            'subject': (
+                (('commonName', x509.get_subject().CN),),
+            ),
+            'subjectAltName': [
+                ('DNS', value)
+                for value in get_subj_alt_name(x509)
+            ]
+        }
+
+    def _reuse(self):
+        self._makefile_refs += 1
+
+    def _drop(self):
+        if self._makefile_refs < 1:
+            self.close()
+        else:
+            self._makefile_refs -= 1
+
+
+def _verify_callback(cnx, x509, err_no, err_depth, return_code):
+    return err_no == 0
+
+
+def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
+                    ca_certs=None, server_hostname=None,
+                    ssl_version=None):
+    ctx = OpenSSL.SSL.Context(_openssl_versions[ssl_version])
+    if certfile:
+        keyfile = keyfile or certfile  # Match behaviour of the normal python ssl library
+        ctx.use_certificate_file(certfile)
+    if keyfile:
+        ctx.use_privatekey_file(keyfile)
+    if cert_reqs != ssl.CERT_NONE:
+        ctx.set_verify(_openssl_verify[cert_reqs], _verify_callback)
+    if ca_certs:
+        try:
+            ctx.load_verify_locations(ca_certs, None)
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError('bad ca_certs: %r' % ca_certs, e)
+    else:
+        ctx.set_default_verify_paths()
+
+    # Disable TLS compression to migitate CRIME attack (issue #309)
+    OP_NO_COMPRESSION = 0x20000
+    ctx.set_options(OP_NO_COMPRESSION)
+
+    # Set list of supported ciphersuites.
+    ctx.set_cipher_list(DEFAULT_SSL_CIPHER_LIST)
+
+    cnx = OpenSSL.SSL.Connection(ctx, sock)
+    cnx.set_tlsext_host_name(server_hostname)
+    cnx.set_connect_state()
+    while True:
+        try:
+            cnx.do_handshake()
+        except OpenSSL.SSL.WantReadError:
+            select.select([sock], [], [])
+            continue
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError('bad handshake', e)
+        break
+
+    return WrappedSocket(cnx, sock)
diff --git a/lib/requests/packages/urllib3/contrib/pyopenssl.pyc b/lib/requests/packages/urllib3/contrib/pyopenssl.pyc
new file mode 100644
index 0000000..a67d5de
Binary files /dev/null and b/lib/requests/packages/urllib3/contrib/pyopenssl.pyc differ
diff --git a/lib/requests/packages/urllib3/exceptions.py b/lib/requests/packages/urllib3/exceptions.py
old mode 100755
new mode 100644
index 99ebb67..0c6fd3c
--- a/lib/requests/packages/urllib3/exceptions.py
+++ b/lib/requests/packages/urllib3/exceptions.py
@@ -1,9 +1,3 @@
-# urllib3/exceptions.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 
 ## Base Exceptions
 
@@ -11,6 +5,11 @@ class HTTPError(Exception):
     "Base exception used by this module."
     pass
 
+class HTTPWarning(Warning):
+    "Base warning used by this module."
+    pass
+
+
 
 class PoolError(HTTPError):
     "Base exception for errors caused within a pool."
@@ -18,42 +17,99 @@ class PoolError(HTTPError):
         self.pool = pool
         HTTPError.__init__(self, "%s: %s" % (pool, message))
 
+    def __reduce__(self):
+        # For pickling purposes.
+        return self.__class__, (None, None)
+
+
+class RequestError(PoolError):
+    "Base exception for PoolErrors that have associated URLs."
+    def __init__(self, pool, url, message):
+        self.url = url
+        PoolError.__init__(self, pool, message)
+
+    def __reduce__(self):
+        # For pickling purposes.
+        return self.__class__, (None, self.url, None)
+
 
 class SSLError(HTTPError):
     "Raised when SSL certificate fails in an HTTPS connection."
     pass
 
 
+class ProxyError(HTTPError):
+    "Raised when the connection to a proxy fails."
+    pass
+
+
 class DecodeError(HTTPError):
     "Raised when automatic decoding based on Content-Type fails."
     pass
 
 
+class ProtocolError(HTTPError):
+    "Raised when something unexpected happens mid-request/response."
+    pass
+
+
+#: Renamed to ProtocolError but aliased for backwards compatibility.
+ConnectionError = ProtocolError
+
+
 ## Leaf Exceptions
 
-class MaxRetryError(PoolError):
-    "Raised when the maximum number of retries is exceeded."
+class MaxRetryError(RequestError):
+    """Raised when the maximum number of retries is exceeded.
 
-    def __init__(self, pool, url):
-        message = "Max retries exceeded with url: %s" % url
-        PoolError.__init__(self, pool, message)
+    :param pool: The connection pool
+    :type pool: :class:`~urllib3.connectionpool.HTTPConnectionPool`
+    :param string url: The requested Url
+    :param exceptions.Exception reason: The underlying error
 
-        self.url = url
+    """
+
+    def __init__(self, pool, url, reason=None):
+        self.reason = reason
+
+        message = "Max retries exceeded with url: %s (Caused by %r)" % (
+            url, reason)
 
+        RequestError.__init__(self, pool, url, message)
 
-class HostChangedError(PoolError):
+
+class HostChangedError(RequestError):
     "Raised when an existing pool gets a request for a foreign host."
 
     def __init__(self, pool, url, retries=3):
         message = "Tried to open a foreign host with url: %s" % url
-        PoolError.__init__(self, pool, message)
-
-        self.url = url
+        RequestError.__init__(self, pool, url, message)
         self.retries = retries
 
 
-class TimeoutError(PoolError):
-    "Raised when a socket timeout occurs."
+class TimeoutStateError(HTTPError):
+    """ Raised when passing an invalid state to a timeout """
+    pass
+
+
+class TimeoutError(HTTPError):
+    """ Raised when a socket timeout error occurs.
+
+    Catching this error will catch both :exc:`ReadTimeoutErrors
+    <ReadTimeoutError>` and :exc:`ConnectTimeoutErrors <ConnectTimeoutError>`.
+    """
+    pass
+
+
+class ReadTimeoutError(TimeoutError, RequestError):
+    "Raised when a socket timeout occurs while receiving data from a server"
+    pass
+
+
+# This timeout error does not have a URL attached and needs to inherit from the
+# base HTTPError
+class ConnectTimeoutError(TimeoutError):
+    "Raised when a socket timeout occurs while connecting to a server"
     pass
 
 
@@ -67,11 +123,37 @@ class ClosedPoolError(PoolError):
     pass
 
 
-class LocationParseError(ValueError, HTTPError):
+class LocationValueError(ValueError, HTTPError):
+    "Raised when there is something wrong with a given URL input."
+    pass
+
+
+class LocationParseError(LocationValueError):
     "Raised when get_host or similar fails to parse the URL input."
 
     def __init__(self, location):
         message = "Failed to parse: %s" % location
-        super(LocationParseError, self).__init__(self, message)
+        HTTPError.__init__(self, message)
 
         self.location = location
+
+
+class ResponseError(HTTPError):
+    "Used as a container for an error reason supplied in a MaxRetryError."
+    GENERIC_ERROR = 'too many error responses'
+    SPECIFIC_ERROR = 'too many {status_code} error responses'
+
+
+class SecurityWarning(HTTPWarning):
+    "Warned when perfoming security reducing actions"
+    pass
+
+
+class InsecureRequestWarning(SecurityWarning):
+    "Warned when making an unverified HTTPS request."
+    pass
+
+
+class SystemTimeWarning(SecurityWarning):
+    "Warned when system time is suspected to be wrong"
+    pass
diff --git a/lib/requests/packages/urllib3/exceptions.pyc b/lib/requests/packages/urllib3/exceptions.pyc
index dc81f19..bbfc151 100644
Binary files a/lib/requests/packages/urllib3/exceptions.pyc and b/lib/requests/packages/urllib3/exceptions.pyc differ
diff --git a/lib/requests/packages/urllib3/fields.py b/lib/requests/packages/urllib3/fields.py
new file mode 100644
index 0000000..c853f8d
--- /dev/null
+++ b/lib/requests/packages/urllib3/fields.py
@@ -0,0 +1,177 @@
+import email.utils
+import mimetypes
+
+from .packages import six
+
+
+def guess_content_type(filename, default='application/octet-stream'):
+    """
+    Guess the "Content-Type" of a file.
+
+    :param filename:
+        The filename to guess the "Content-Type" of using :mod:`mimetypes`.
+    :param default:
+        If no "Content-Type" can be guessed, default to `default`.
+    """
+    if filename:
+        return mimetypes.guess_type(filename)[0] or default
+    return default
+
+
+def format_header_param(name, value):
+    """
+    Helper function to format and quote a single header parameter.
+
+    Particularly useful for header parameters which might contain
+    non-ASCII values, like file names. This follows RFC 2231, as
+    suggested by RFC 2388 Section 4.4.
+
+    :param name:
+        The name of the parameter, a string expected to be ASCII only.
+    :param value:
+        The value of the parameter, provided as a unicode string.
+    """
+    if not any(ch in value for ch in '"\\\r\n'):
+        result = '%s="%s"' % (name, value)
+        try:
+            result.encode('ascii')
+        except UnicodeEncodeError:
+            pass
+        else:
+            return result
+    if not six.PY3:  # Python 2:
+        value = value.encode('utf-8')
+    value = email.utils.encode_rfc2231(value, 'utf-8')
+    value = '%s*=%s' % (name, value)
+    return value
+
+
+class RequestField(object):
+    """
+    A data container for request body parameters.
+
+    :param name:
+        The name of this request field.
+    :param data:
+        The data/value body.
+    :param filename:
+        An optional filename of the request field.
+    :param headers:
+        An optional dict-like object of headers to initially use for the field.
+    """
+    def __init__(self, name, data, filename=None, headers=None):
+        self._name = name
+        self._filename = filename
+        self.data = data
+        self.headers = {}
+        if headers:
+            self.headers = dict(headers)
+
+    @classmethod
+    def from_tuples(cls, fieldname, value):
+        """
+        A :class:`~urllib3.fields.RequestField` factory from old-style tuple parameters.
+
+        Supports constructing :class:`~urllib3.fields.RequestField` from
+        parameter of key/value strings AND key/filetuple. A filetuple is a
+        (filename, data, MIME type) tuple where the MIME type is optional.
+        For example::
+
+            'foo': 'bar',
+            'fakefile': ('foofile.txt', 'contents of foofile'),
+            'realfile': ('barfile.txt', open('realfile').read()),
+            'typedfile': ('bazfile.bin', open('bazfile').read(), 'image/jpeg'),
+            'nonamefile': 'contents of nonamefile field',
+
+        Field names and filenames must be unicode.
+        """
+        if isinstance(value, tuple):
+            if len(value) == 3:
+                filename, data, content_type = value
+            else:
+                filename, data = value
+                content_type = guess_content_type(filename)
+        else:
+            filename = None
+            content_type = None
+            data = value
+
+        request_param = cls(fieldname, data, filename=filename)
+        request_param.make_multipart(content_type=content_type)
+
+        return request_param
+
+    def _render_part(self, name, value):
+        """
+        Overridable helper function to format a single header parameter.
+
+        :param name:
+            The name of the parameter, a string expected to be ASCII only.
+        :param value:
+            The value of the parameter, provided as a unicode string.
+        """
+        return format_header_param(name, value)
+
+    def _render_parts(self, header_parts):
+        """
+        Helper function to format and quote a single header.
+
+        Useful for single headers that are composed of multiple items. E.g.,
+        'Content-Disposition' fields.
+
+        :param header_parts:
+            A sequence of (k, v) typles or a :class:`dict` of (k, v) to format
+            as `k1="v1"; k2="v2"; ...`.
+        """
+        parts = []
+        iterable = header_parts
+        if isinstance(header_parts, dict):
+            iterable = header_parts.items()
+
+        for name, value in iterable:
+            if value:
+                parts.append(self._render_part(name, value))
+
+        return '; '.join(parts)
+
+    def render_headers(self):
+        """
+        Renders the headers for this request field.
+        """
+        lines = []
+
+        sort_keys = ['Content-Disposition', 'Content-Type', 'Content-Location']
+        for sort_key in sort_keys:
+            if self.headers.get(sort_key, False):
+                lines.append('%s: %s' % (sort_key, self.headers[sort_key]))
+
+        for header_name, header_value in self.headers.items():
+            if header_name not in sort_keys:
+                if header_value:
+                    lines.append('%s: %s' % (header_name, header_value))
+
+        lines.append('\r\n')
+        return '\r\n'.join(lines)
+
+    def make_multipart(self, content_disposition=None, content_type=None,
+                       content_location=None):
+        """
+        Makes this request field into a multipart request field.
+
+        This method overrides "Content-Disposition", "Content-Type" and
+        "Content-Location" headers to the request parameter.
+
+        :param content_type:
+            The 'Content-Type' of the request body.
+        :param content_location:
+            The 'Content-Location' of the request body.
+
+        """
+        self.headers['Content-Disposition'] = content_disposition or 'form-data'
+        self.headers['Content-Disposition'] += '; '.join([
+            '', self._render_parts(
+                (('name', self._name), ('filename', self._filename))
+            )
+        ])
+        self.headers['Content-Type'] = content_type
+        self.headers['Content-Location'] = content_location
diff --git a/lib/requests/packages/urllib3/fields.pyc b/lib/requests/packages/urllib3/fields.pyc
new file mode 100644
index 0000000..c68a042
Binary files /dev/null and b/lib/requests/packages/urllib3/fields.pyc differ
diff --git a/lib/requests/packages/urllib3/filepost.py b/lib/requests/packages/urllib3/filepost.py
old mode 100755
new mode 100644
index e679b93..0fbf488
--- a/lib/requests/packages/urllib3/filepost.py
+++ b/lib/requests/packages/urllib3/filepost.py
@@ -1,17 +1,11 @@
-# urllib3/filepost.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 import codecs
-import mimetypes
 
 from uuid import uuid4
 from io import BytesIO
 
 from .packages import six
 from .packages.six import b
+from .fields import RequestField
 
 writer = codecs.lookup('utf-8')[3]
 
@@ -23,14 +17,36 @@ def choose_boundary():
     return uuid4().hex
 
 
-def get_content_type(filename):
-    return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+def iter_field_objects(fields):
+    """
+    Iterate over fields.
+
+    Supports list of (k, v) tuples and dicts, and lists of
+    :class:`~urllib3.fields.RequestField`.
+
+    """
+    if isinstance(fields, dict):
+        i = six.iteritems(fields)
+    else:
+        i = iter(fields)
+
+    for field in i:
+        if isinstance(field, RequestField):
+            yield field
+        else:
+            yield RequestField.from_tuples(*field)
 
 
 def iter_fields(fields):
     """
+    .. deprecated:: 1.6
+
     Iterate over fields.
 
+    The addition of :class:`~urllib3.fields.RequestField` makes this function
+    obsolete. Instead, use :func:`iter_field_objects`, which returns
+    :class:`~urllib3.fields.RequestField` objects.
+
     Supports list of (k, v) tuples and dicts.
     """
     if isinstance(fields, dict):
@@ -41,15 +57,10 @@ def iter_fields(fields):
 
 def encode_multipart_formdata(fields, boundary=None):
     """
-    Encode a dictionary of ``fields`` using the multipart/form-data mime format.
+    Encode a dictionary of ``fields`` using the multipart/form-data MIME format.
 
     :param fields:
-        Dictionary of fields or list of (key, value) field tuples.  The key is
-        treated as the field name, and the value as the body of the form-data
-        bytes. If the value is a tuple of two elements, then the first element
-        is treated as the filename of the form-data section.
-
-        Field names and filenames must be unicode.
+        Dictionary of fields or list of (key, :class:`~urllib3.fields.RequestField`).
 
     :param boundary:
         If not specified, then a random boundary will be generated using
@@ -59,20 +70,11 @@ def encode_multipart_formdata(fields, boundary=None):
     if boundary is None:
         boundary = choose_boundary()
 
-    for fieldname, value in iter_fields(fields):
+    for field in iter_field_objects(fields):
         body.write(b('--%s\r\n' % (boundary)))
 
-        if isinstance(value, tuple):
-            filename, data = value
-            writer(body).write('Content-Disposition: form-data; name="%s"; '
-                               'filename="%s"\r\n' % (fieldname, filename))
-            body.write(b('Content-Type: %s\r\n\r\n' %
-                       (get_content_type(filename))))
-        else:
-            data = value
-            writer(body).write('Content-Disposition: form-data; name="%s"\r\n'
-                               % (fieldname))
-            body.write(b'Content-Type: text/plain\r\n\r\n')
+        writer(body).write(field.render_headers())
+        data = field.data
 
         if isinstance(data, int):
             data = str(data)  # Backwards compatibility
@@ -86,6 +88,6 @@ def encode_multipart_formdata(fields, boundary=None):
 
     body.write(b('--%s--\r\n' % (boundary)))
 
-    content_type = b('multipart/form-data; boundary=%s' % boundary)
+    content_type = str('multipart/form-data; boundary=%s' % boundary)
 
     return body.getvalue(), content_type
diff --git a/lib/requests/packages/urllib3/filepost.pyc b/lib/requests/packages/urllib3/filepost.pyc
index 2ccad30..9598c9c 100644
Binary files a/lib/requests/packages/urllib3/filepost.pyc and b/lib/requests/packages/urllib3/filepost.pyc differ
diff --git a/lib/requests/packages/urllib3/packages/__init__.py b/lib/requests/packages/urllib3/packages/__init__.py
old mode 100755
new mode 100644
diff --git a/lib/requests/packages/urllib3/packages/__init__.pyc b/lib/requests/packages/urllib3/packages/__init__.pyc
index e373e5c..c901359 100644
Binary files a/lib/requests/packages/urllib3/packages/__init__.pyc and b/lib/requests/packages/urllib3/packages/__init__.pyc differ
diff --git a/lib/requests/packages/urllib3/packages/ordered_dict.py b/lib/requests/packages/urllib3/packages/ordered_dict.py
old mode 100755
new mode 100644
index 7f8ee15..4479363
--- a/lib/requests/packages/urllib3/packages/ordered_dict.py
+++ b/lib/requests/packages/urllib3/packages/ordered_dict.py
@@ -2,7 +2,6 @@
 # Passes Python2.7's test suite and incorporates all the latest updates.
 # Copyright 2009 Raymond Hettinger, released under the MIT License.
 # http://code.activestate.com/recipes/576693/
-
 try:
     from thread import get_ident as _get_ident
 except ImportError:
diff --git a/lib/requests/packages/urllib3/packages/ordered_dict.pyc b/lib/requests/packages/urllib3/packages/ordered_dict.pyc
index 57d3c12..93ba108 100644
Binary files a/lib/requests/packages/urllib3/packages/ordered_dict.pyc and b/lib/requests/packages/urllib3/packages/ordered_dict.pyc differ
diff --git a/lib/requests/packages/urllib3/packages/six.py b/lib/requests/packages/urllib3/packages/six.py
old mode 100755
new mode 100644
index a64f6fb..27d8011
--- a/lib/requests/packages/urllib3/packages/six.py
+++ b/lib/requests/packages/urllib3/packages/six.py
@@ -24,7 +24,7 @@ import sys
 import types
 
 __author__ = "Benjamin Peterson <benjamin at python.org>"
-__version__ = "1.1.0"
+__version__ = "1.2.0"  # Revision 41c74fef2ded
 
 
 # True if we are running on Python 3.
@@ -45,19 +45,23 @@ else:
     text_type = unicode
     binary_type = str
 
-    # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-    class X(object):
-        def __len__(self):
-            return 1 << 31
-    try:
-        len(X())
-    except OverflowError:
-        # 32-bit
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
         MAXSIZE = int((1 << 31) - 1)
     else:
-        # 64-bit
-        MAXSIZE = int((1 << 63) - 1)
-    del X
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+            del X
 
 
 def _add_doc(func, doc):
@@ -132,6 +136,7 @@ class _MovedItems(types.ModuleType):
 _moved_attributes = [
     MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
     MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
     MovedAttribute("map", "itertools", "builtins", "imap", "map"),
     MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
     MovedAttribute("reduce", "__builtin__", "functools"),
@@ -178,7 +183,7 @@ for attr in _moved_attributes:
     setattr(_MovedItems, attr.name, attr)
 del attr
 
-moves = sys.modules["six.moves"] = _MovedItems("moves")
+moves = sys.modules[__name__ + ".moves"] = _MovedItems("moves")
 
 
 def add_move(move):
@@ -219,12 +224,19 @@ else:
     _iteritems = "iteritems"
 
 
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
 if PY3:
     def get_unbound_function(unbound):
         return unbound
 
-
-    advance_iterator = next
+    Iterator = object
 
     def callable(obj):
         return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
@@ -232,9 +244,10 @@ else:
     def get_unbound_function(unbound):
         return unbound.im_func
 
+    class Iterator(object):
 
-    def advance_iterator(it):
-        return it.next()
+        def next(self):
+            return type(self).__next__(self)
 
     callable = callable
 _add_doc(get_unbound_function,
@@ -249,15 +262,15 @@ get_function_defaults = operator.attrgetter(_func_defaults)
 
 def iterkeys(d):
     """Return an iterator over the keys of a dictionary."""
-    return getattr(d, _iterkeys)()
+    return iter(getattr(d, _iterkeys)())
 
 def itervalues(d):
     """Return an iterator over the values of a dictionary."""
-    return getattr(d, _itervalues)()
+    return iter(getattr(d, _itervalues)())
 
 def iteritems(d):
     """Return an iterator over the (key, value) pairs of a dictionary."""
-    return getattr(d, _iteritems)()
+    return iter(getattr(d, _iteritems)())
 
 
 if PY3:
diff --git a/lib/requests/packages/urllib3/packages/six.pyc b/lib/requests/packages/urllib3/packages/six.pyc
index 87485d4..09a4603 100644
Binary files a/lib/requests/packages/urllib3/packages/six.pyc and b/lib/requests/packages/urllib3/packages/six.pyc differ
diff --git a/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py b/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
old mode 100755
new mode 100644
index 9560b04..dd59a75
--- a/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+++ b/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
@@ -1,61 +1,13 @@
-"""The match_hostname() function from Python 3.2, essential when using SSL."""
-
-import re
-
-__version__ = '3.2.2'
-
-class CertificateError(ValueError):
-    pass
-
-def _dnsname_to_pat(dn):
-    pats = []
-    for frag in dn.split(r'.'):
-        if frag == '*':
-            # When '*' is a fragment by itself, it matches a non-empty dotless
-            # fragment.
-            pats.append('[^.]+')
-        else:
-            # Otherwise, '*' matches any dotless fragment.
-            frag = re.escape(frag)
-            pats.append(frag.replace(r'\*', '[^.]*'))
-    return re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
-
-def match_hostname(cert, hostname):
-    """Verify that *cert* (in decoded format as returned by
-    SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 rules
-    are mostly followed, but IP addresses are not accepted for *hostname*.
-
-    CertificateError is raised on failure. On success, the function
-    returns nothing.
-    """
-    if not cert:
-        raise ValueError("empty or no certificate")
-    dnsnames = []
-    san = cert.get('subjectAltName', ())
-    for key, value in san:
-        if key == 'DNS':
-            if _dnsname_to_pat(value).match(hostname):
-                return
-            dnsnames.append(value)
-    if not dnsnames:
-        # The subject is only checked when there is no dNSName entry
-        # in subjectAltName
-        for sub in cert.get('subject', ()):
-            for key, value in sub:
-                # XXX according to RFC 2818, the most specific Common Name
-                # must be used.
-                if key == 'commonName':
-                    if _dnsname_to_pat(value).match(hostname):
-                        return
-                    dnsnames.append(value)
-    if len(dnsnames) > 1:
-        raise CertificateError("hostname %r "
-            "doesn't match either of %s"
-            % (hostname, ', '.join(map(repr, dnsnames))))
-    elif len(dnsnames) == 1:
-        raise CertificateError("hostname %r "
-            "doesn't match %r"
-            % (hostname, dnsnames[0]))
-    else:
-        raise CertificateError("no appropriate commonName or "
-            "subjectAltName fields were found")
+try:
+    # Python 3.2+
+    from ssl import CertificateError, match_hostname
+except ImportError:
+    try:
+        # Backport of the function from a pypi module
+        from backports.ssl_match_hostname import CertificateError, match_hostname
+    except ImportError:
+        # Our vendored copy
+        from ._implementation import CertificateError, match_hostname
+
+# Not needed, but documenting what we provide.
+__all__ = ('CertificateError', 'match_hostname')
diff --git a/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc b/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc
index c4a1c3f..adcf40b 100644
Binary files a/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc and b/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyc differ
diff --git a/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py b/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
new file mode 100644
index 0000000..52f4287
--- /dev/null
+++ b/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
@@ -0,0 +1,105 @@
+"""The match_hostname() function from Python 3.3.3, essential when using SSL."""
+
+# Note: This file is under the PSF license as the code comes from the python
+# stdlib.   http://docs.python.org/3/license.html
+
+import re
+
+__version__ = '3.4.0.2'
+
+class CertificateError(ValueError):
+    pass
+
+
+def _dnsname_match(dn, hostname, max_wildcards=1):
+    """Matching according to RFC 6125, section 6.4.3
+
+    http://tools.ietf.org/html/rfc6125#section-6.4.3
+    """
+    pats = []
+    if not dn:
+        return False
+
+    # Ported from python3-syntax:
+    # leftmost, *remainder = dn.split(r'.')
+    parts = dn.split(r'.')
+    leftmost = parts[0]
+    remainder = parts[1:]
+
+    wildcards = leftmost.count('*')
+    if wildcards > max_wildcards:
+        # Issue #17980: avoid denials of service by refusing more
+        # than one wildcard per fragment.  A survey of established
+        # policy among SSL implementations showed it to be a
+        # reasonable choice.
+        raise CertificateError(
+            "too many wildcards in certificate DNS name: " + repr(dn))
+
+    # speed up common case w/o wildcards
+    if not wildcards:
+        return dn.lower() == hostname.lower()
+
+    # RFC 6125, section 6.4.3, subitem 1.
+    # The client SHOULD NOT attempt to match a presented identifier in which
+    # the wildcard character comprises a label other than the left-most label.
+    if leftmost == '*':
+        # When '*' is a fragment by itself, it matches a non-empty dotless
+        # fragment.
+        pats.append('[^.]+')
+    elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
+        # RFC 6125, section 6.4.3, subitem 3.
+        # The client SHOULD NOT attempt to match a presented identifier
+        # where the wildcard character is embedded within an A-label or
+        # U-label of an internationalized domain name.
+        pats.append(re.escape(leftmost))
+    else:
+        # Otherwise, '*' matches any dotless string, e.g. www*
+        pats.append(re.escape(leftmost).replace(r'\*', '[^.]*'))
+
+    # add the remaining fragments, ignore any wildcards
+    for frag in remainder:
+        pats.append(re.escape(frag))
+
+    pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
+    return pat.match(hostname)
+
+
+def match_hostname(cert, hostname):
+    """Verify that *cert* (in decoded format as returned by
+    SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 and RFC 6125
+    rules are followed, but IP addresses are not accepted for *hostname*.
+
+    CertificateError is raised on failure. On success, the function
+    returns nothing.
+    """
+    if not cert:
+        raise ValueError("empty or no certificate")
+    dnsnames = []
+    san = cert.get('subjectAltName', ())
+    for key, value in san:
+        if key == 'DNS':
+            if _dnsname_match(value, hostname):
+                return
+            dnsnames.append(value)
+    if not dnsnames:
+        # The subject is only checked when there is no dNSName entry
+        # in subjectAltName
+        for sub in cert.get('subject', ()):
+            for key, value in sub:
+                # XXX according to RFC 2818, the most specific Common Name
+                # must be used.
+                if key == 'commonName':
+                    if _dnsname_match(value, hostname):
+                        return
+                    dnsnames.append(value)
+    if len(dnsnames) > 1:
+        raise CertificateError("hostname %r "
+            "doesn't match either of %s"
+            % (hostname, ', '.join(map(repr, dnsnames))))
+    elif len(dnsnames) == 1:
+        raise CertificateError("hostname %r "
+            "doesn't match %r"
+            % (hostname, dnsnames[0]))
+    else:
+        raise CertificateError("no appropriate commonName or "
+            "subjectAltName fields were found")
diff --git a/lib/requests/packages/urllib3/poolmanager.py b/lib/requests/packages/urllib3/poolmanager.py
old mode 100755
new mode 100644
index 8f5b54c..515dc96
--- a/lib/requests/packages/urllib3/poolmanager.py
+++ b/lib/requests/packages/urllib3/poolmanager.py
@@ -1,16 +1,17 @@
-# urllib3/poolmanager.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 import logging
 
+try:  # Python 3
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
+
 from ._collections import RecentlyUsedContainer
 from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
-from .connectionpool import connection_from_url, port_by_scheme
+from .connectionpool import port_by_scheme
+from .exceptions import LocationValueError
 from .request import RequestMethods
-from .util import parse_url
+from .util.url import parse_url
+from .util.retry import Retry
 
 
 __all__ = ['PoolManager', 'ProxyManager', 'proxy_from_url']
@@ -23,6 +24,9 @@ pool_classes_by_scheme = {
 
 log = logging.getLogger(__name__)
 
+SSL_KEYWORDS = ('key_file', 'cert_file', 'cert_reqs', 'ca_certs',
+                'ssl_version')
+
 
 class PoolManager(RequestMethods):
     """
@@ -30,29 +34,53 @@ class PoolManager(RequestMethods):
     necessary connection pools for you.
 
     :param num_pools:
-        Number of connection pools to cache before discarding the least recently
-        used pool.
+        Number of connection pools to cache before discarding the least
+        recently used pool.
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
 
     :param \**connection_pool_kw:
         Additional parameters are used to create fresh
         :class:`urllib3.connectionpool.ConnectionPool` instances.
 
-    Example: ::
+    Example::
 
         >>> manager = PoolManager(num_pools=2)
-        >>> r = manager.urlopen("http://google.com/")
-        >>> r = manager.urlopen("http://google.com/mail")
-        >>> r = manager.urlopen("http://yahoo.com/")
+        >>> r = manager.request('GET', 'http://google.com/')
+        >>> r = manager.request('GET', 'http://google.com/mail')
+        >>> r = manager.request('GET', 'http://yahoo.com/')
         >>> len(manager.pools)
         2
 
     """
 
-    def __init__(self, num_pools=10, **connection_pool_kw):
+    proxy = None
+
+    def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
+        RequestMethods.__init__(self, headers)
         self.connection_pool_kw = connection_pool_kw
         self.pools = RecentlyUsedContainer(num_pools,
                                            dispose_func=lambda p: p.close())
 
+    def _new_pool(self, scheme, host, port):
+        """
+        Create a new :class:`ConnectionPool` based on host, port and scheme.
+
+        This method is used to actually create the connection pools handed out
+        by :meth:`connection_from_url` and companion methods. It is intended
+        to be overridden for customization.
+        """
+        pool_cls = pool_classes_by_scheme[scheme]
+        kwargs = self.connection_pool_kw
+        if scheme == 'http':
+            kwargs = self.connection_pool_kw.copy()
+            for kw in SSL_KEYWORDS:
+                kwargs.pop(kw, None)
+
+        return pool_cls(host, port, **kwargs)
+
     def clear(self):
         """
         Empty our store of pools and direct them all to close.
@@ -69,21 +97,24 @@ class PoolManager(RequestMethods):
         If ``port`` isn't given, it will be derived from the ``scheme`` using
         ``urllib3.connectionpool.port_by_scheme``.
         """
-        port = port or port_by_scheme.get(scheme, 80)
 
-        pool_key = (scheme, host, port)
+        if not host:
+            raise LocationValueError("No host specified.")
 
-        # If the scheme, host, or port doesn't match existing open connections,
-        # open a new ConnectionPool.
-        pool = self.pools.get(pool_key)
-        if pool:
-            return pool
+        scheme = scheme or 'http'
+        port = port or port_by_scheme.get(scheme, 80)
+        pool_key = (scheme, host, port)
 
-        # Make a fresh ConnectionPool of the desired type
-        pool_cls = pool_classes_by_scheme[scheme]
-        pool = pool_cls(host, port, **self.connection_pool_kw)
+        with self.pools.lock:
+            # If the scheme, host, or port doesn't match existing open
+            # connections, open a new ConnectionPool.
+            pool = self.pools.get(pool_key)
+            if pool:
+                return pool
 
-        self.pools[pool_key] = pool
+            # Make a fresh ConnectionPool of the desired type
+            pool = self._new_pool(scheme, host, port)
+            self.pools[pool_key] = pool
 
         return pool
 
@@ -113,46 +144,122 @@ class PoolManager(RequestMethods):
 
         kw['assert_same_host'] = False
         kw['redirect'] = False
+        if 'headers' not in kw:
+            kw['headers'] = self.headers
 
-        response = conn.urlopen(method, u.request_uri, **kw)
+        if self.proxy is not None and u.scheme == "http":
+            response = conn.urlopen(method, url, **kw)
+        else:
+            response = conn.urlopen(method, u.request_uri, **kw)
 
         redirect_location = redirect and response.get_redirect_location()
         if not redirect_location:
             return response
 
+        # Support relative URLs for redirecting.
+        redirect_location = urljoin(url, redirect_location)
+
+        # RFC 7231, Section 6.4.4
         if response.status == 303:
             method = 'GET'
 
+        retries = kw.get('retries')
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect)
+
+        kw['retries'] = retries.increment(method, redirect_location)
+        kw['redirect'] = redirect
+
         log.info("Redirecting %s -> %s" % (url, redirect_location))
-        kw['retries'] = kw.get('retries', 3) - 1 # Persist retries countdown
         return self.urlopen(method, redirect_location, **kw)
 
 
-class ProxyManager(RequestMethods):
+class ProxyManager(PoolManager):
     """
-    Given a ConnectionPool to a proxy, the ProxyManager's ``urlopen`` method
-    will make requests to any url through the defined proxy.
+    Behaves just like :class:`PoolManager`, but sends all requests through
+    the defined proxy, using the CONNECT method for HTTPS URLs.
+
+    :param proxy_url:
+        The URL of the proxy to be used.
+
+    :param proxy_headers:
+        A dictionary contaning headers that will be sent to the proxy. In case
+        of HTTP they are being sent with each request, while in the
+        HTTPS/CONNECT case they are sent only once. Could be used for proxy
+        authentication.
+
+    Example:
+        >>> proxy = urllib3.ProxyManager('http://localhost:3128/')
+        >>> r1 = proxy.request('GET', 'http://google.com/')
+        >>> r2 = proxy.request('GET', 'http://httpbin.org/')
+        >>> len(proxy.pools)
+        1
+        >>> r3 = proxy.request('GET', 'https://httpbin.org/')
+        >>> r4 = proxy.request('GET', 'https://twitter.com/')
+        >>> len(proxy.pools)
+        3
+
     """
 
-    def __init__(self, proxy_pool):
-        self.proxy_pool = proxy_pool
+    def __init__(self, proxy_url, num_pools=10, headers=None,
+                 proxy_headers=None, **connection_pool_kw):
+
+        if isinstance(proxy_url, HTTPConnectionPool):
+            proxy_url = '%s://%s:%i' % (proxy_url.scheme, proxy_url.host,
+                                        proxy_url.port)
+        proxy = parse_url(proxy_url)
+        if not proxy.port:
+            port = port_by_scheme.get(proxy.scheme, 80)
+            proxy = proxy._replace(port=port)
 
-    def _set_proxy_headers(self, headers=None):
-        headers = headers or {}
+        assert proxy.scheme in ("http", "https"), \
+            'Not supported proxy scheme %s' % proxy.scheme
 
-        # Same headers are curl passes for --proxy1.0
-        headers['Accept'] = '*/*'
-        headers['Proxy-Connection'] = 'Keep-Alive'
+        self.proxy = proxy
+        self.proxy_headers = proxy_headers or {}
 
-        return headers
+        connection_pool_kw['_proxy'] = self.proxy
+        connection_pool_kw['_proxy_headers'] = self.proxy_headers
 
-    def urlopen(self, method, url, **kw):
+        super(ProxyManager, self).__init__(
+            num_pools, headers, **connection_pool_kw)
+
+    def connection_from_host(self, host, port=None, scheme='http'):
+        if scheme == "https":
+            return super(ProxyManager, self).connection_from_host(
+                host, port, scheme)
+
+        return super(ProxyManager, self).connection_from_host(
+            self.proxy.host, self.proxy.port, self.proxy.scheme)
+
+    def _set_proxy_headers(self, url, headers=None):
+        """
+        Sets headers needed by proxies: specifically, the Accept and Host
+        headers. Only sets headers not provided by the user.
+        """
+        headers_ = {'Accept': '*/*'}
+
+        netloc = parse_url(url).netloc
+        if netloc:
+            headers_['Host'] = netloc
+
+        if headers:
+            headers_.update(headers)
+        return headers_
+
+    def urlopen(self, method, url, redirect=True, **kw):
         "Same as HTTP(S)ConnectionPool.urlopen, ``url`` must be absolute."
-        kw['assert_same_host'] = False
-        kw['headers'] = self._set_proxy_headers(kw.get('headers'))
-        return self.proxy_pool.urlopen(method, url, **kw)
+        u = parse_url(url)
+
+        if u.scheme == "http":
+            # For proxied HTTPS requests, httplib sets the necessary headers
+            # on the CONNECT to the proxy. For HTTP, we'll definitely
+            # need to set 'Host' at the very least.
+            headers = kw.get('headers', self.headers)
+            kw['headers'] = self._set_proxy_headers(url, headers)
+
+        return super(ProxyManager, self).urlopen(method, url, redirect=redirect, **kw)
 
 
-def proxy_from_url(url, **pool_kw):
-    proxy_pool = connection_from_url(url, **pool_kw)
-    return ProxyManager(proxy_pool)
+def proxy_from_url(url, **kw):
+    return ProxyManager(proxy_url=url, **kw)
diff --git a/lib/requests/packages/urllib3/poolmanager.pyc b/lib/requests/packages/urllib3/poolmanager.pyc
index 88ccc43..e1d3a97 100644
Binary files a/lib/requests/packages/urllib3/poolmanager.pyc and b/lib/requests/packages/urllib3/poolmanager.pyc differ
diff --git a/lib/requests/packages/urllib3/request.py b/lib/requests/packages/urllib3/request.py
old mode 100755
new mode 100644
index 569ac96..b08d6c9
--- a/lib/requests/packages/urllib3/request.py
+++ b/lib/requests/packages/urllib3/request.py
@@ -1,9 +1,3 @@
-# urllib3/request.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 try:
     from urllib.parse import urlencode
 except ImportError:
@@ -26,25 +20,32 @@ class RequestMethods(object):
 
     Specifically,
 
-    :meth:`.request_encode_url` is for sending requests whose fields are encoded
-    in the URL (such as GET, HEAD, DELETE).
+    :meth:`.request_encode_url` is for sending requests whose fields are
+    encoded in the URL (such as GET, HEAD, DELETE).
 
     :meth:`.request_encode_body` is for sending requests whose fields are
-    encoded in the *body* of the request using multipart or www-orm-urlencoded
+    encoded in the *body* of the request using multipart or www-form-urlencoded
     (such as for POST, PUT, PATCH).
 
     :meth:`.request` is for making any kind of request, it will look up the
     appropriate encoding format and use one of the above two methods to make
     the request.
+
+    Initializer parameters:
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
     """
 
     _encode_url_methods = set(['DELETE', 'GET', 'HEAD', 'OPTIONS'])
 
-    _encode_body_methods = set(['PATCH', 'POST', 'PUT', 'TRACE'])
+    def __init__(self, headers=None):
+        self.headers = headers or {}
 
     def urlopen(self, method, url, body=None, headers=None,
                 encode_multipart=True, multipart_boundary=None,
-                **kw): # Abstract
+                **kw):  # Abstract
         raise NotImplemented("Classes extending RequestMethods must implement "
                              "their own ``urlopen`` method.")
 
@@ -54,8 +55,8 @@ class RequestMethods(object):
         ``fields`` based on the ``method`` used.
 
         This is a convenience method that requires the least amount of manual
-        effort. It can be used in most situations, while still having the option
-        to drop down to more specific methods when necessary, such as
+        effort. It can be used in most situations, while still having the
+        option to drop down to more specific methods when necessary, such as
         :meth:`request_encode_url`, :meth:`request_encode_body`,
         or even the lowest level :meth:`urlopen`.
         """
@@ -63,12 +64,12 @@ class RequestMethods(object):
 
         if method in self._encode_url_methods:
             return self.request_encode_url(method, url, fields=fields,
-                                            headers=headers,
-                                            **urlopen_kw)
+                                           headers=headers,
+                                           **urlopen_kw)
         else:
             return self.request_encode_body(method, url, fields=fields,
-                                             headers=headers,
-                                             **urlopen_kw)
+                                            headers=headers,
+                                            **urlopen_kw)
 
     def request_encode_url(self, method, url, fields=None, **urlopen_kw):
         """
@@ -87,42 +88,54 @@ class RequestMethods(object):
         the body. This is useful for request methods like POST, PUT, PATCH, etc.
 
         When ``encode_multipart=True`` (default), then
-        :meth:`urllib3.filepost.encode_multipart_formdata` is used to encode the
-        payload with the appropriate content type. Otherwise
+        :meth:`urllib3.filepost.encode_multipart_formdata` is used to encode
+        the payload with the appropriate content type. Otherwise
         :meth:`urllib.urlencode` is used with the
         'application/x-www-form-urlencoded' content type.
 
         Multipart encoding must be used when posting files, and it's reasonably
-        safe to use it in other times too. However, it may break request signing,
-        such as with OAuth.
+        safe to use it in other times too. However, it may break request
+        signing, such as with OAuth.
 
         Supports an optional ``fields`` parameter of key/value strings AND
-        key/filetuple. A filetuple is a (filename, data) tuple. For example: ::
+        key/filetuple. A filetuple is a (filename, data, MIME type) tuple where
+        the MIME type is optional. For example::
 
             fields = {
                 'foo': 'bar',
                 'fakefile': ('foofile.txt', 'contents of foofile'),
                 'realfile': ('barfile.txt', open('realfile').read()),
-                'nonamefile': ('contents of nonamefile field'),
+                'typedfile': ('bazfile.bin', open('bazfile').read(),
+                              'image/jpeg'),
+                'nonamefile': 'contents of nonamefile field',
             }
 
         When uploading a file, providing a filename (the first parameter of the
         tuple) is optional but recommended to best mimick behavior of browsers.
 
-        Note that if ``headers`` are supplied, the 'Content-Type' header will be
-        overwritten because it depends on the dynamic random boundary string
+        Note that if ``headers`` are supplied, the 'Content-Type' header will
+        be overwritten because it depends on the dynamic random boundary string
         which is used to compose the body of the request. The random boundary
         string can be explicitly set with the ``multipart_boundary`` parameter.
         """
-        if encode_multipart:
-            body, content_type = encode_multipart_formdata(fields or {},
-                                    boundary=multipart_boundary)
-        else:
-            body, content_type = (urlencode(fields or {}),
-                                    'application/x-www-form-urlencoded')
+        if headers is None:
+            headers = self.headers
+
+        extra_kw = {'headers': {}}
+
+        if fields:
+            if 'body' in urlopen_kw:
+                raise TypeError('request got values for both \'fields\' and \'body\', can only specify one.')
+
+            if encode_multipart:
+                body, content_type = encode_multipart_formdata(fields, boundary=multipart_boundary)
+            else:
+                body, content_type = urlencode(fields), 'application/x-www-form-urlencoded'
+
+            extra_kw['body'] = body
+            extra_kw['headers'] = {'Content-Type': content_type}
 
-        headers = headers or {}
-        headers.update({'Content-Type': content_type})
+        extra_kw['headers'].update(headers)
+        extra_kw.update(urlopen_kw)
 
-        return self.urlopen(method, url, body=body, headers=headers,
-                            **urlopen_kw)
+        return self.urlopen(method, url, **extra_kw)
diff --git a/lib/requests/packages/urllib3/request.pyc b/lib/requests/packages/urllib3/request.pyc
index a48f0c6..7cd21ad 100644
Binary files a/lib/requests/packages/urllib3/request.pyc and b/lib/requests/packages/urllib3/request.pyc differ
diff --git a/lib/requests/packages/urllib3/response.py b/lib/requests/packages/urllib3/response.py
old mode 100755
new mode 100644
index 28537d3..e69de95
--- a/lib/requests/packages/urllib3/response.py
+++ b/lib/requests/packages/urllib3/response.py
@@ -1,40 +1,57 @@
-# urllib3/response.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-import gzip
-import logging
 import zlib
+import io
+from socket import timeout as SocketTimeout
 
-from io import BytesIO
+from ._collections import HTTPHeaderDict
+from .exceptions import ProtocolError, DecodeError, ReadTimeoutError
+from .packages.six import string_types as basestring, binary_type
+from .connection import HTTPException, BaseSSLError
+from .util.response import is_fp_closed
 
-from .exceptions import DecodeError
-from .packages.six import string_types as basestring
 
 
-log = logging.getLogger(__name__)
+class DeflateDecoder(object):
 
+    def __init__(self):
+        self._first_try = True
+        self._data = binary_type()
+        self._obj = zlib.decompressobj()
 
-def decode_gzip(data):
-    gzipper = gzip.GzipFile(fileobj=BytesIO(data))
-    return gzipper.read()
+    def __getattr__(self, name):
+        return getattr(self._obj, name)
 
+    def decompress(self, data):
+        if not self._first_try:
+            return self._obj.decompress(data)
 
-def decode_deflate(data):
-    try:
-        return zlib.decompress(data)
-    except zlib.error:
-        return zlib.decompress(data, -zlib.MAX_WBITS)
+        self._data += data
+        try:
+            return self._obj.decompress(data)
+        except zlib.error:
+            self._first_try = False
+            self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
+            try:
+                return self.decompress(self._data)
+            finally:
+                self._data = None
+
+
+def _get_decoder(mode):
+    if mode == 'gzip':
+        return zlib.decompressobj(16 + zlib.MAX_WBITS)
 
+    return DeflateDecoder()
 
-class HTTPResponse(object):
+
+class HTTPResponse(io.IOBase):
     """
     HTTP Response container.
 
     Backwards-compatible to httplib's HTTPResponse but the response ``body`` is
-    loaded and decoded on-demand when the ``data`` property is accessed.
+    loaded and decoded on-demand when the ``data`` property is accessed.  This
+    class is also compatible with the Python standard library's :mod:`io`
+    module, and can hence be treated as a readable object in the context of that
+    framework.
 
     Extra parameters for behaviour not present in httplib.HTTPResponse:
 
@@ -52,24 +69,30 @@ class HTTPResponse(object):
         otherwise unused.
     """
 
-    CONTENT_DECODERS = {
-        'gzip': decode_gzip,
-        'deflate': decode_deflate,
-    }
+    CONTENT_DECODERS = ['gzip', 'deflate']
+    REDIRECT_STATUSES = [301, 302, 303, 307, 308]
 
     def __init__(self, body='', headers=None, status=0, version=0, reason=None,
                  strict=0, preload_content=True, decode_content=True,
                  original_response=None, pool=None, connection=None):
-        self.headers = headers or {}
+
+        self.headers = HTTPHeaderDict()
+        if headers:
+            self.headers.update(headers)
         self.status = status
         self.version = version
         self.reason = reason
         self.strict = strict
+        self.decode_content = decode_content
 
-        self._decode_content = decode_content
-        self._body = body if body and isinstance(body, basestring) else None
+        self._decoder = None
+        self._body = None
         self._fp = None
         self._original_response = original_response
+        self._fp_bytes_read = 0
+
+        if body and isinstance(body, (basestring, binary_type)):
+            self._body = body
 
         self._pool = pool
         self._connection = connection
@@ -88,7 +111,7 @@ class HTTPResponse(object):
             code and valid location. ``None`` if redirect status and no
             location. ``False`` if not a redirect status code.
         """
-        if self.status in [301, 302, 303, 307]:
+        if self.status in self.REDIRECT_STATUSES:
             return self.headers.get('location')
 
         return False
@@ -109,19 +132,27 @@ class HTTPResponse(object):
         if self._fp:
             return self.read(cache_content=True)
 
+    def tell(self):
+        """
+        Obtain the number of bytes pulled over the wire so far. May differ from
+        the amount of content returned by :meth:``HTTPResponse.read`` if bytes
+        are encoded on the wire (e.g, compressed).
+        """
+        return self._fp_bytes_read
+
     def read(self, amt=None, decode_content=None, cache_content=False):
         """
         Similar to :meth:`httplib.HTTPResponse.read`, but with two additional
         parameters: ``decode_content`` and ``cache_content``.
 
         :param amt:
-            How much of the content to read. If specified, decoding and caching
-            is skipped because we can't decode partial content nor does it make
-            sense to cache partial content as the full response.
+            How much of the content to read. If specified, caching is skipped
+            because it doesn't make sense to cache partial content as the full
+            response.
 
         :param decode_content:
             If True, will attempt to decode the body based on the
-            'content-encoding' header. (Overridden if ``amt`` is set.)
+            'content-encoding' header.
 
         :param cache_content:
             If True, will save the returned data such that the same result is
@@ -130,27 +161,71 @@ class HTTPResponse(object):
             after having ``.read()`` the file object. (Overridden if ``amt`` is
             set.)
         """
-        content_encoding = self.headers.get('content-encoding')
-        decoder = self.CONTENT_DECODERS.get(content_encoding)
+        # Note: content-encoding value should be case-insensitive, per RFC 7230
+        # Section 3.2
+        content_encoding = self.headers.get('content-encoding', '').lower()
+        if self._decoder is None:
+            if content_encoding in self.CONTENT_DECODERS:
+                self._decoder = _get_decoder(content_encoding)
         if decode_content is None:
-            decode_content = self._decode_content
+            decode_content = self.decode_content
 
         if self._fp is None:
             return
 
+        flush_decoder = False
+
         try:
-            if amt is None:
-                # cStringIO doesn't like amt=None
-                data = self._fp.read()
-            else:
-                return self._fp.read(amt)
+            try:
+                if amt is None:
+                    # cStringIO doesn't like amt=None
+                    data = self._fp.read()
+                    flush_decoder = True
+                else:
+                    cache_content = False
+                    data = self._fp.read(amt)
+                    if amt != 0 and not data:  # Platform-specific: Buggy versions of Python.
+                        # Close the connection when no data is returned
+                        #
+                        # This is redundant to what httplib/http.client _should_
+                        # already do.  However, versions of python released before
+                        # December 15, 2012 (http://bugs.python.org/issue16298) do
+                        # not properly close the connection in all cases. There is
+                        # no harm in redundantly calling close.
+                        self._fp.close()
+                        flush_decoder = True
+
+            except SocketTimeout:
+                # FIXME: Ideally we'd like to include the url in the ReadTimeoutError but
+                # there is yet no clean way to get at it from this context.
+                raise ReadTimeoutError(self._pool, None, 'Read timed out.')
+
+            except BaseSSLError as e:
+                # FIXME: Is there a better way to differentiate between SSLErrors?
+                if not 'read operation timed out' in str(e):  # Defensive:
+                    # This shouldn't happen but just in case we're missing an edge
+                    # case, let's avoid swallowing SSL errors.
+                    raise
+
+                raise ReadTimeoutError(self._pool, None, 'Read timed out.')
+
+            except HTTPException as e:
+                # This includes IncompleteRead.
+                raise ProtocolError('Connection broken: %r' % e, e)
+
+            self._fp_bytes_read += len(data)
 
             try:
-                if decode_content and decoder:
-                    data = decoder(data)
-            except (IOError, zlib.error):
-                raise DecodeError("Received response with content-encoding: %s, but "
-                                  "failed to decode it." % content_encoding)
+                if decode_content and self._decoder:
+                    data = self._decoder.decompress(data)
+            except (IOError, zlib.error) as e:
+                raise DecodeError(
+                    "Received response with content-encoding: %s, but "
+                    "failed to decode it." % content_encoding, e)
+
+            if flush_decoder and decode_content and self._decoder:
+                buf = self._decoder.decompress(binary_type())
+                data += buf + self._decoder.flush()
 
             if cache_content:
                 self._body = data
@@ -161,6 +236,28 @@ class HTTPResponse(object):
             if self._original_response and self._original_response.isclosed():
                 self.release_conn()
 
+    def stream(self, amt=2**16, decode_content=None):
+        """
+        A generator wrapper for the read() method. A call will block until
+        ``amt`` bytes have been read from the connection or until the
+        connection is closed.
+
+        :param amt:
+            How much of the content to read. The generator will return up to
+            much data per iteration, but may return less. This is particularly
+            likely when using compressed data. However, the empty string will
+            never be returned.
+
+        :param decode_content:
+            If True, will attempt to decode the body based on the
+            'content-encoding' header.
+        """
+        while not is_fp_closed(self._fp):
+            data = self.read(amt=amt, decode_content=decode_content)
+
+            if data:
+                yield data
+
     @classmethod
     def from_httplib(ResponseCls, r, **response_kw):
         """
@@ -171,17 +268,9 @@ class HTTPResponse(object):
         with ``original_response=r``.
         """
 
-        # Normalize headers between different versions of Python
-        headers = {}
+        headers = HTTPHeaderDict()
         for k, v in r.getheaders():
-            # Python 3: Header keys are returned capitalised
-            k = k.lower()
-
-            has_value = headers.get(k)
-            if has_value: # Python 3: Repeating header keys are unmerged.
-                v = ', '.join([has_value, v])
-
-            headers[k] = v
+            headers.add(k, v)
 
         # HTTPResponse objects in Python 3 don't have a .strict attribute
         strict = getattr(r, 'strict', 0)
@@ -200,3 +289,45 @@ class HTTPResponse(object):
 
     def getheader(self, name, default=None):
         return self.headers.get(name, default)
+
+    # Overrides from io.IOBase
+    def close(self):
+        if not self.closed:
+            self._fp.close()
+
+    @property
+    def closed(self):
+        if self._fp is None:
+            return True
+        elif hasattr(self._fp, 'closed'):
+            return self._fp.closed
+        elif hasattr(self._fp, 'isclosed'):  # Python 2
+            return self._fp.isclosed()
+        else:
+            return True
+
+    def fileno(self):
+        if self._fp is None:
+            raise IOError("HTTPResponse has no file to get a fileno from")
+        elif hasattr(self._fp, "fileno"):
+            return self._fp.fileno()
+        else:
+            raise IOError("The file-like object this HTTPResponse is wrapped "
+                          "around has no file descriptor")
+
+    def flush(self):
+        if self._fp is not None and hasattr(self._fp, 'flush'):
+            return self._fp.flush()
+
+    def readable(self):
+        # This method is required for `io` module compatibility.
+        return True
+
+    def readinto(self, b):
+        # This method is required for `io` module compatibility.
+        temp = self.read(len(b))
+        if len(temp) == 0:
+            return 0
+        else:
+            b[:len(temp)] = temp
+            return len(temp)
diff --git a/lib/requests/packages/urllib3/response.pyc b/lib/requests/packages/urllib3/response.pyc
index b2e6396..3263d28 100644
Binary files a/lib/requests/packages/urllib3/response.pyc and b/lib/requests/packages/urllib3/response.pyc differ
diff --git a/lib/requests/packages/urllib3/util.py b/lib/requests/packages/urllib3/util.py
deleted file mode 100755
index 8ec990b..0000000
--- a/lib/requests/packages/urllib3/util.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# urllib3/util.py
-# Copyright 2008-2012 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
-#
-# This module is part of urllib3 and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-
-from base64 import b64encode
-from collections import namedtuple
-from socket import error as SocketError
-
-try:
-    from select import poll, POLLIN
-except ImportError: # `poll` doesn't exist on OSX and other platforms
-    poll = False
-    try:
-        from select import select
-    except ImportError: # `select` doesn't exist on AppEngine.
-        select = False
-
-from .packages import six
-from .exceptions import LocationParseError
-
-
-class Url(namedtuple('Url', ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment'])):
-    """
-    Datastructure for representing an HTTP URL. Used as a return value for
-    :func:`parse_url`.
-    """
-    slots = ()
-
-    def __new__(cls, scheme=None, auth=None, host=None, port=None, path=None, query=None, fragment=None):
-        return super(Url, cls).__new__(cls, scheme, auth, host, port, path, query, fragment)
-
-    @property
-    def hostname(self):
-        """For backwards-compatibility with urlparse. We're nice like that."""
-        return self.host
-
-    @property
-    def request_uri(self):
-        """Absolute path including the query string."""
-        uri = self.path or '/'
-
-        if self.query is not None:
-            uri += '?' + self.query
-
-        return uri
-
-
-def split_first(s, delims):
-    """
-    Given a string and an iterable of delimiters, split on the first found
-    delimiter. Return two split parts and the matched delimiter.
-
-    If not found, then the first part is the full input string.
-
-    Example: ::
-
-        >>> split_first('foo/bar?baz', '?/=')
-        ('foo', 'bar?baz', '/')
-        >>> split_first('foo/bar?baz', '123')
-        ('foo/bar?baz', '', None)
-
-    Scales linearly with number of delims. Not ideal for large number of delims.
-    """
-    min_idx = None
-    min_delim = None
-    for d in delims:
-        idx = s.find(d)
-        if idx < 0:
-            continue
-
-        if min_idx is None or idx < min_idx:
-            min_idx = idx
-            min_delim = d
-
-    if min_idx is None or min_idx < 0:
-        return s, '', None
-
-    return s[:min_idx], s[min_idx+1:], min_delim
-
-
-def parse_url(url):
-    """
-    Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
-    performed to parse incomplete urls. Fields not provided will be None.
-
-    Partly backwards-compatible with :mod:`urlparse`.
-
-    Example: ::
-
-        >>> parse_url('http://google.com/mail/')
-        Url(scheme='http', host='google.com', port=None, path='/', ...)
-        >>> prase_url('google.com:80')
-        Url(scheme=None, host='google.com', port=80, path=None, ...)
-        >>> prase_url('/foo?bar')
-        Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
-    """
-
-    # While this code has overlap with stdlib's urlparse, it is much
-    # simplified for our needs and less annoying.
-    # Additionally, this imeplementations does silly things to be optimal
-    # on CPython.
-
-    scheme = None
-    auth = None
-    host = None
-    port = None
-    path = None
-    fragment = None
-    query = None
-
-    # Scheme
-    if '://' in url:
-        scheme, url = url.split('://', 1)
-
-    # Find the earliest Authority Terminator
-    # (http://tools.ietf.org/html/rfc3986#section-3.2)
-    url, path_, delim = split_first(url, ['/', '?', '#'])
-
-    if delim:
-        # Reassemble the path
-        path = delim + path_
-
-    # Auth
-    if '@' in url:
-        auth, url = url.split('@', 1)
-
-    # IPv6
-    if url and url[0] == '[':
-        host, url = url[1:].split(']', 1)
-
-    # Port
-    if ':' in url:
-        _host, port = url.split(':', 1)
-
-        if not host:
-            host = _host
-
-        if not port.isdigit():
-            raise LocationParseError("Failed to parse: %s" % url)
-
-        port = int(port)
-
-    elif not host and url:
-        host = url
-
-    if not path:
-        return Url(scheme, auth, host, port, path, query, fragment)
-
-    # Fragment
-    if '#' in path:
-        path, fragment = path.split('#', 1)
-
-    # Query
-    if '?' in path:
-        path, query = path.split('?', 1)
-
-    return Url(scheme, auth, host, port, path, query, fragment)
-
-
-def get_host(url):
-    """
-    Deprecated. Use :func:`.parse_url` instead.
-    """
-    p = parse_url(url)
-    return p.scheme or 'http', p.hostname, p.port
-
-
-def make_headers(keep_alive=None, accept_encoding=None, user_agent=None,
-                 basic_auth=None):
-    """
-    Shortcuts for generating request headers.
-
-    :param keep_alive:
-        If ``True``, adds 'connection: keep-alive' header.
-
-    :param accept_encoding:
-        Can be a boolean, list, or string.
-        ``True`` translates to 'gzip,deflate'.
-        List will get joined by comma.
-        String will be used as provided.
-
-    :param user_agent:
-        String representing the user-agent you want, such as
-        "python-urllib3/0.6"
-
-    :param basic_auth:
-        Colon-separated username:password string for 'authorization: basic ...'
-        auth header.
-
-    Example: ::
-
-        >>> make_headers(keep_alive=True, user_agent="Batman/1.0")
-        {'connection': 'keep-alive', 'user-agent': 'Batman/1.0'}
-        >>> make_headers(accept_encoding=True)
-        {'accept-encoding': 'gzip,deflate'}
-    """
-    headers = {}
-    if accept_encoding:
-        if isinstance(accept_encoding, str):
-            pass
-        elif isinstance(accept_encoding, list):
-            accept_encoding = ','.join(accept_encoding)
-        else:
-            accept_encoding = 'gzip,deflate'
-        headers['accept-encoding'] = accept_encoding
-
-    if user_agent:
-        headers['user-agent'] = user_agent
-
-    if keep_alive:
-        headers['connection'] = 'keep-alive'
-
-    if basic_auth:
-        headers['authorization'] = 'Basic ' + \
-            b64encode(six.b(basic_auth)).decode('utf-8')
-
-    return headers
-
-
-def is_connection_dropped(conn):
-    """
-    Returns True if the connection is dropped and should be closed.
-
-    :param conn:
-        :class:`httplib.HTTPConnection` object.
-
-    Note: For platforms like AppEngine, this will always return ``False`` to
-    let the platform handle connection recycling transparently for us.
-    """
-    sock = getattr(conn, 'sock', False)
-    if not sock: # Platform-specific: AppEngine
-        return False
-
-    if not poll: # Platform-specific
-        if not select: # Platform-specific: AppEngine
-            return False
-
-        try:
-            return select([sock], [], [], 0.0)[0]
-        except SocketError:
-            return True
-
-    # This version is better on platforms that support it.
-    p = poll()
-    p.register(sock, POLLIN)
-    for (fno, ev) in p.poll(0.0):
-        if fno == sock.fileno():
-            # Either data is buffered (bad), or the connection is dropped.
-            return True
diff --git a/lib/requests/packages/urllib3/util.pyc b/lib/requests/packages/urllib3/util.pyc
deleted file mode 100644
index 27791dc..0000000
Binary files a/lib/requests/packages/urllib3/util.pyc and /dev/null differ
diff --git a/lib/requests/packages/urllib3/util/__init__.py b/lib/requests/packages/urllib3/util/__init__.py
new file mode 100644
index 0000000..8becc81
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/__init__.py
@@ -0,0 +1,24 @@
+# For backwards compatibility, provide imports that used to be here.
+from .connection import is_connection_dropped
+from .request import make_headers
+from .response import is_fp_closed
+from .ssl_ import (
+    SSLContext,
+    HAS_SNI,
+    assert_fingerprint,
+    resolve_cert_reqs,
+    resolve_ssl_version,
+    ssl_wrap_socket,
+)
+from .timeout import (
+    current_time,
+    Timeout,
+)
+
+from .retry import Retry
+from .url import (
+    get_host,
+    parse_url,
+    split_first,
+    Url,
+)
diff --git a/lib/requests/packages/urllib3/util/__init__.pyc b/lib/requests/packages/urllib3/util/__init__.pyc
new file mode 100644
index 0000000..b236a54
Binary files /dev/null and b/lib/requests/packages/urllib3/util/__init__.pyc differ
diff --git a/lib/requests/packages/urllib3/util/connection.py b/lib/requests/packages/urllib3/util/connection.py
new file mode 100644
index 0000000..2156993
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/connection.py
@@ -0,0 +1,97 @@
+import socket
+try:
+    from select import poll, POLLIN
+except ImportError:  # `poll` doesn't exist on OSX and other platforms
+    poll = False
+    try:
+        from select import select
+    except ImportError:  # `select` doesn't exist on AppEngine.
+        select = False
+
+
+def is_connection_dropped(conn):  # Platform-specific
+    """
+    Returns True if the connection is dropped and should be closed.
+
+    :param conn:
+        :class:`httplib.HTTPConnection` object.
+
+    Note: For platforms like AppEngine, this will always return ``False`` to
+    let the platform handle connection recycling transparently for us.
+    """
+    sock = getattr(conn, 'sock', False)
+    if sock is False:  # Platform-specific: AppEngine
+        return False
+    if sock is None:  # Connection already closed (such as by httplib).
+        return True
+
+    if not poll:
+        if not select:  # Platform-specific: AppEngine
+            return False
+
+        try:
+            return select([sock], [], [], 0.0)[0]
+        except socket.error:
+            return True
+
+    # This version is better on platforms that support it.
+    p = poll()
+    p.register(sock, POLLIN)
+    for (fno, ev) in p.poll(0.0):
+        if fno == sock.fileno():
+            # Either data is buffered (bad), or the connection is dropped.
+            return True
+
+
+# This function is copied from socket.py in the Python 2.7 standard
+# library test suite. Added to its signature is only `socket_options`.
+def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
+                      source_address=None, socket_options=None):
+    """Connect to *address* and return the socket object.
+
+    Convenience function.  Connect to *address* (a 2-tuple ``(host,
+    port)``) and return the socket object.  Passing the optional
+    *timeout* parameter will set the timeout on the socket instance
+    before attempting to connect.  If no *timeout* is supplied, the
+    global default timeout setting returned by :func:`getdefaulttimeout`
+    is used.  If *source_address* is set it must be a tuple of (host, port)
+    for the socket to bind as a source address before making the connection.
+    An host of '' or port 0 tells the OS to use the default.
+    """
+
+    host, port = address
+    err = None
+    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+        af, socktype, proto, canonname, sa = res
+        sock = None
+        try:
+            sock = socket.socket(af, socktype, proto)
+
+            # If provided, set socket level options before connecting.
+            # This is the only addition urllib3 makes to this function.
+            _set_socket_options(sock, socket_options)
+
+            if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
+                sock.settimeout(timeout)
+            if source_address:
+                sock.bind(source_address)
+            sock.connect(sa)
+            return sock
+
+        except socket.error as _:
+            err = _
+            if sock is not None:
+                sock.close()
+
+    if err is not None:
+        raise err
+    else:
+        raise socket.error("getaddrinfo returns an empty list")
+
+
+def _set_socket_options(sock, options):
+    if options is None:
+        return
+
+    for opt in options:
+        sock.setsockopt(*opt)
diff --git a/lib/requests/packages/urllib3/util/connection.pyc b/lib/requests/packages/urllib3/util/connection.pyc
new file mode 100644
index 0000000..79160d0
Binary files /dev/null and b/lib/requests/packages/urllib3/util/connection.pyc differ
diff --git a/lib/requests/packages/urllib3/util/request.py b/lib/requests/packages/urllib3/util/request.py
new file mode 100644
index 0000000..bc64f6b
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/request.py
@@ -0,0 +1,71 @@
+from base64 import b64encode
+
+from ..packages.six import b
+
+ACCEPT_ENCODING = 'gzip,deflate'
+
+
+def make_headers(keep_alive=None, accept_encoding=None, user_agent=None,
+                 basic_auth=None, proxy_basic_auth=None, disable_cache=None):
+    """
+    Shortcuts for generating request headers.
+
+    :param keep_alive:
+        If ``True``, adds 'connection: keep-alive' header.
+
+    :param accept_encoding:
+        Can be a boolean, list, or string.
+        ``True`` translates to 'gzip,deflate'.
+        List will get joined by comma.
+        String will be used as provided.
+
+    :param user_agent:
+        String representing the user-agent you want, such as
+        "python-urllib3/0.6"
+
+    :param basic_auth:
+        Colon-separated username:password string for 'authorization: basic ...'
+        auth header.
+
+    :param proxy_basic_auth:
+        Colon-separated username:password string for 'proxy-authorization: basic ...'
+        auth header.
+
+    :param disable_cache:
+        If ``True``, adds 'cache-control: no-cache' header.
+
+    Example::
+
+        >>> make_headers(keep_alive=True, user_agent="Batman/1.0")
+        {'connection': 'keep-alive', 'user-agent': 'Batman/1.0'}
+        >>> make_headers(accept_encoding=True)
+        {'accept-encoding': 'gzip,deflate'}
+    """
+    headers = {}
+    if accept_encoding:
+        if isinstance(accept_encoding, str):
+            pass
+        elif isinstance(accept_encoding, list):
+            accept_encoding = ','.join(accept_encoding)
+        else:
+            accept_encoding = ACCEPT_ENCODING
+        headers['accept-encoding'] = accept_encoding
+
+    if user_agent:
+        headers['user-agent'] = user_agent
+
+    if keep_alive:
+        headers['connection'] = 'keep-alive'
+
+    if basic_auth:
+        headers['authorization'] = 'Basic ' + \
+            b64encode(b(basic_auth)).decode('utf-8')
+
+    if proxy_basic_auth:
+        headers['proxy-authorization'] = 'Basic ' + \
+            b64encode(b(proxy_basic_auth)).decode('utf-8')
+
+    if disable_cache:
+        headers['cache-control'] = 'no-cache'
+
+    return headers
diff --git a/lib/requests/packages/urllib3/util/request.pyc b/lib/requests/packages/urllib3/util/request.pyc
new file mode 100644
index 0000000..bdc4485
Binary files /dev/null and b/lib/requests/packages/urllib3/util/request.pyc differ
diff --git a/lib/requests/packages/urllib3/util/response.py b/lib/requests/packages/urllib3/util/response.py
new file mode 100644
index 0000000..45fff55
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/response.py
@@ -0,0 +1,22 @@
+def is_fp_closed(obj):
+    """
+    Checks whether a given file-like object is closed.
+
+    :param obj:
+        The file-like object to check.
+    """
+
+    try:
+        # Check via the official file-like-object way.
+        return obj.closed
+    except AttributeError:
+        pass
+
+    try:
+        # Check if the object is a container for another file-like object that
+        # gets released on exhaustion (e.g. HTTPResponse).
+        return obj.fp is None
+    except AttributeError:
+        pass
+
+    raise ValueError("Unable to determine whether fp is closed.")
diff --git a/lib/requests/packages/urllib3/util/response.pyc b/lib/requests/packages/urllib3/util/response.pyc
new file mode 100644
index 0000000..76ef8c2
Binary files /dev/null and b/lib/requests/packages/urllib3/util/response.pyc differ
diff --git a/lib/requests/packages/urllib3/util/retry.py b/lib/requests/packages/urllib3/util/retry.py
new file mode 100644
index 0000000..7e0959d
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/retry.py
@@ -0,0 +1,285 @@
+import time
+import logging
+
+from ..exceptions import (
+    ConnectTimeoutError,
+    MaxRetryError,
+    ProtocolError,
+    ReadTimeoutError,
+    ResponseError,
+)
+from ..packages import six
+
+
+log = logging.getLogger(__name__)
+
+
+class Retry(object):
+    """ Retry configuration.
+
+    Each retry attempt will create a new Retry object with updated values, so
+    they can be safely reused.
+
+    Retries can be defined as a default for a pool::
+
+        retries = Retry(connect=5, read=2, redirect=5)
+        http = PoolManager(retries=retries)
+        response = http.request('GET', 'http://example.com/')
+
+    Or per-request (which overrides the default for the pool)::
+
+        response = http.request('GET', 'http://example.com/', retries=Retry(10))
+
+    Retries can be disabled by passing ``False``::
+
+        response = http.request('GET', 'http://example.com/', retries=False)
+
+    Errors will be wrapped in :class:`~urllib3.exceptions.MaxRetryError` unless
+    retries are disabled, in which case the causing exception will be raised.
+
+    :param int total:
+        Total number of retries to allow. Takes precedence over other counts.
+
+        Set to ``None`` to remove this constraint and fall back on other
+        counts. It's a good idea to set this to some sensibly-high value to
+        account for unexpected edge cases and avoid infinite retry loops.
+
+        Set to ``0`` to fail on the first retry.
+
+        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
+
+    :param int connect:
+        How many connection-related errors to retry on.
+
+        These are errors raised before the request is sent to the remote server,
+        which we assume has not triggered the server to process the request.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+    :param int read:
+        How many times to retry on read errors.
+
+        These errors are raised after the request was sent to the server, so the
+        request may have side-effects.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+    :param int redirect:
+        How many redirects to perform. Limit this to avoid infinite redirect
+        loops.
+
+        A redirect is a HTTP response with a status code 301, 302, 303, 307 or
+        308.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
+
+    :param iterable method_whitelist:
+        Set of uppercased HTTP method verbs that we should retry on.
+
+        By default, we only retry on methods which are considered to be
+        indempotent (multiple requests with the same parameters end with the
+        same state). See :attr:`Retry.DEFAULT_METHOD_WHITELIST`.
+
+    :param iterable status_forcelist:
+        A set of HTTP status codes that we should force a retry on.
+
+        By default, this is disabled with ``None``.
+
+    :param float backoff_factor:
+        A backoff factor to apply between attempts. urllib3 will sleep for::
+
+            {backoff factor} * (2 ^ ({number of total retries} - 1))
+
+        seconds. If the backoff_factor is 0.1, then :func:`.sleep` will sleep
+        for [0.1s, 0.2s, 0.4s, ...] between retries. It will never be longer
+        than :attr:`Retry.MAX_BACKOFF`.
+
+        By default, backoff is disabled (set to 0).
+
+    :param bool raise_on_redirect: Whether, if the number of redirects is
+        exhausted, to raise a MaxRetryError, or to return a response with a
+        response code in the 3xx range.
+    """
+
+    DEFAULT_METHOD_WHITELIST = frozenset([
+        'HEAD', 'GET', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'])
+
+    #: Maximum backoff time.
+    BACKOFF_MAX = 120
+
+    def __init__(self, total=10, connect=None, read=None, redirect=None,
+                 method_whitelist=DEFAULT_METHOD_WHITELIST, status_forcelist=None,
+                 backoff_factor=0, raise_on_redirect=True, _observed_errors=0):
+
+        self.total = total
+        self.connect = connect
+        self.read = read
+
+        if redirect is False or total is False:
+            redirect = 0
+            raise_on_redirect = False
+
+        self.redirect = redirect
+        self.status_forcelist = status_forcelist or set()
+        self.method_whitelist = method_whitelist
+        self.backoff_factor = backoff_factor
+        self.raise_on_redirect = raise_on_redirect
+        self._observed_errors = _observed_errors # TODO: use .history instead?
+
+    def new(self, **kw):
+        params = dict(
+            total=self.total,
+            connect=self.connect, read=self.read, redirect=self.redirect,
+            method_whitelist=self.method_whitelist,
+            status_forcelist=self.status_forcelist,
+            backoff_factor=self.backoff_factor,
+            raise_on_redirect=self.raise_on_redirect,
+            _observed_errors=self._observed_errors,
+        )
+        params.update(kw)
+        return type(self)(**params)
+
+    @classmethod
+    def from_int(cls, retries, redirect=True, default=None):
+        """ Backwards-compatibility for the old retries format."""
+        if retries is None:
+            retries = default if default is not None else cls.DEFAULT
+
+        if isinstance(retries, Retry):
+            return retries
+
+        redirect = bool(redirect) and None
+        new_retries = cls(retries, redirect=redirect)
+        log.debug("Converted retries value: %r -> %r" % (retries, new_retries))
+        return new_retries
+
+    def get_backoff_time(self):
+        """ Formula for computing the current backoff
+
+        :rtype: float
+        """
+        if self._observed_errors <= 1:
+            return 0
+
+        backoff_value = self.backoff_factor * (2 ** (self._observed_errors - 1))
+        return min(self.BACKOFF_MAX, backoff_value)
+
+    def sleep(self):
+        """ Sleep between retry attempts using an exponential backoff.
+
+        By default, the backoff factor is 0 and this method will return
+        immediately.
+        """
+        backoff = self.get_backoff_time()
+        if backoff <= 0:
+            return
+        time.sleep(backoff)
+
+    def _is_connection_error(self, err):
+        """ Errors when we're fairly sure that the server did not receive the
+        request, so it should be safe to retry.
+        """
+        return isinstance(err, ConnectTimeoutError)
+
+    def _is_read_error(self, err):
+        """ Errors that occur after the request has been started, so we should
+        assume that the server began processing it.
+        """
+        return isinstance(err, (ReadTimeoutError, ProtocolError))
+
+    def is_forced_retry(self, method, status_code):
+        """ Is this method/status code retryable? (Based on method/codes whitelists)
+        """
+        if self.method_whitelist and method.upper() not in self.method_whitelist:
+            return False
+
+        return self.status_forcelist and status_code in self.status_forcelist
+
+    def is_exhausted(self):
+        """ Are we out of retries? """
+        retry_counts = (self.total, self.connect, self.read, self.redirect)
+        retry_counts = list(filter(None, retry_counts))
+        if not retry_counts:
+            return False
+
+        return min(retry_counts) < 0
+
+    def increment(self, method=None, url=None, response=None, error=None, _pool=None, _stacktrace=None):
+        """ Return a new Retry object with incremented retry counters.
+
+        :param response: A response object, or None, if the server did not
+            return a response.
+        :type response: :class:`~urllib3.response.HTTPResponse`
+        :param Exception error: An error encountered during the request, or
+            None if the response was received successfully.
+
+        :return: A new ``Retry`` object.
+        """
+        if self.total is False and error:
+            # Disabled, indicate to re-raise the error.
+            raise six.reraise(type(error), error, _stacktrace)
+
+        total = self.total
+        if total is not None:
+            total -= 1
+
+        _observed_errors = self._observed_errors
+        connect = self.connect
+        read = self.read
+        redirect = self.redirect
+        cause = 'unknown'
+
+        if error and self._is_connection_error(error):
+            # Connect retry?
+            if connect is False:
+                raise six.reraise(type(error), error, _stacktrace)
+            elif connect is not None:
+                connect -= 1
+            _observed_errors += 1
+
+        elif error and self._is_read_error(error):
+            # Read retry?
+            if read is False:
+                raise six.reraise(type(error), error, _stacktrace)
+            elif read is not None:
+                read -= 1
+            _observed_errors += 1
+
+        elif response and response.get_redirect_location():
+            # Redirect retry?
+            if redirect is not None:
+                redirect -= 1
+            cause = 'too many redirects'
+
+        else:
+            # Incrementing because of a server error like a 500 in
+            # status_forcelist and a the given method is in the whitelist
+            _observed_errors += 1
+            cause = ResponseError.GENERIC_ERROR
+            if response and response.status:
+                cause = ResponseError.SPECIFIC_ERROR.format(
+                    status_code=response.status)
+
+        new_retry = self.new(
+            total=total,
+            connect=connect, read=read, redirect=redirect,
+            _observed_errors=_observed_errors)
+
+        if new_retry.is_exhausted():
+            raise MaxRetryError(_pool, url, error or ResponseError(cause))
+
+        log.debug("Incremented Retry for (url='%s'): %r" % (url, new_retry))
+
+        return new_retry
+
+
+    def __repr__(self):
+        return ('{cls.__name__}(total={self.total}, connect={self.connect}, '
+                'read={self.read}, redirect={self.redirect})').format(
+                    cls=type(self), self=self)
+
+
+# For backwards compatibility (equivalent to pre-v1.9):
+Retry.DEFAULT = Retry(3)
diff --git a/lib/requests/packages/urllib3/util/retry.pyc b/lib/requests/packages/urllib3/util/retry.pyc
new file mode 100644
index 0000000..e39a655
Binary files /dev/null and b/lib/requests/packages/urllib3/util/retry.pyc differ
diff --git a/lib/requests/packages/urllib3/util/ssl_.py b/lib/requests/packages/urllib3/util/ssl_.py
new file mode 100644
index 0000000..a788b1b
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/ssl_.py
@@ -0,0 +1,254 @@
+from binascii import hexlify, unhexlify
+from hashlib import md5, sha1
+
+from ..exceptions import SSLError
+
+
+SSLContext = None
+HAS_SNI = False
+create_default_context = None
+
+import errno
+import ssl
+
+try:  # Test for SSL features
+    from ssl import wrap_socket, CERT_NONE, PROTOCOL_SSLv23
+    from ssl import HAS_SNI  # Has SNI?
+except ImportError:
+    pass
+
+
+try:
+    from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_COMPRESSION
+except ImportError:
+    OP_NO_SSLv2, OP_NO_SSLv3 = 0x1000000, 0x2000000
+    OP_NO_COMPRESSION = 0x20000
+
+try:
+    from ssl import _DEFAULT_CIPHERS
+except ImportError:
+    _DEFAULT_CIPHERS = (
+        'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
+        'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:'
+        'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5'
+    )
+
+try:
+    from ssl import SSLContext  # Modern SSL?
+except ImportError:
+    import sys
+
+    class SSLContext(object):  # Platform-specific: Python 2 & 3.1
+        supports_set_ciphers = sys.version_info >= (2, 7)
+
+        def __init__(self, protocol_version):
+            self.protocol = protocol_version
+            # Use default values from a real SSLContext
+            self.check_hostname = False
+            self.verify_mode = ssl.CERT_NONE
+            self.ca_certs = None
+            self.options = 0
+            self.certfile = None
+            self.keyfile = None
+            self.ciphers = None
+
+        def load_cert_chain(self, certfile, keyfile):
+            self.certfile = certfile
+            self.keyfile = keyfile
+
+        def load_verify_locations(self, location):
+            self.ca_certs = location
+
+        def set_ciphers(self, cipher_suite):
+            if not self.supports_set_ciphers:
+                raise TypeError(
+                    'Your version of Python does not support setting '
+                    'a custom cipher suite. Please upgrade to Python '
+                    '2.7, 3.2, or later if you need this functionality.'
+                )
+            self.ciphers = cipher_suite
+
+        def wrap_socket(self, socket, server_hostname=None):
+            kwargs = {
+                'keyfile': self.keyfile,
+                'certfile': self.certfile,
+                'ca_certs': self.ca_certs,
+                'cert_reqs': self.verify_mode,
+                'ssl_version': self.protocol,
+            }
+            if self.supports_set_ciphers:  # Platform-specific: Python 2.7+
+                return wrap_socket(socket, ciphers=self.ciphers, **kwargs)
+            else:  # Platform-specific: Python 2.6
+                return wrap_socket(socket, **kwargs)
+
+
+def assert_fingerprint(cert, fingerprint):
+    """
+    Checks if given fingerprint matches the supplied certificate.
+
+    :param cert:
+        Certificate as bytes object.
+    :param fingerprint:
+        Fingerprint as string of hexdigits, can be interspersed by colons.
+    """
+
+    # Maps the length of a digest to a possible hash function producing
+    # this digest.
+    hashfunc_map = {
+        16: md5,
+        20: sha1
+    }
+
+    fingerprint = fingerprint.replace(':', '').lower()
+    digest_length, odd = divmod(len(fingerprint), 2)
+
+    if odd or digest_length not in hashfunc_map:
+        raise SSLError('Fingerprint is of invalid length.')
+
+    # We need encode() here for py32; works on py2 and p33.
+    fingerprint_bytes = unhexlify(fingerprint.encode())
+
+    hashfunc = hashfunc_map[digest_length]
+
+    cert_digest = hashfunc(cert).digest()
+
+    if not cert_digest == fingerprint_bytes:
+        raise SSLError('Fingerprints did not match. Expected "{0}", got "{1}".'
+                       .format(hexlify(fingerprint_bytes),
+                               hexlify(cert_digest)))
+
+
+def resolve_cert_reqs(candidate):
+    """
+    Resolves the argument to a numeric constant, which can be passed to
+    the wrap_socket function/method from the ssl module.
+    Defaults to :data:`ssl.CERT_NONE`.
+    If given a string it is assumed to be the name of the constant in the
+    :mod:`ssl` module or its abbrevation.
+    (So you can specify `REQUIRED` instead of `CERT_REQUIRED`.
+    If it's neither `None` nor a string we assume it is already the numeric
+    constant which can directly be passed to wrap_socket.
+    """
+    if candidate is None:
+        return CERT_NONE
+
+    if isinstance(candidate, str):
+        res = getattr(ssl, candidate, None)
+        if res is None:
+            res = getattr(ssl, 'CERT_' + candidate)
+        return res
+
+    return candidate
+
+
+def resolve_ssl_version(candidate):
+    """
+    like resolve_cert_reqs
+    """
+    if candidate is None:
+        return PROTOCOL_SSLv23
+
+    if isinstance(candidate, str):
+        res = getattr(ssl, candidate, None)
+        if res is None:
+            res = getattr(ssl, 'PROTOCOL_' + candidate)
+        return res
+
+    return candidate
+
+
+def create_urllib3_context(ssl_version=None, cert_reqs=ssl.CERT_REQUIRED,
+                           options=None, ciphers=None):
+    """All arguments have the same meaning as ``ssl_wrap_socket``.
+
+    By default, this function does a lot of the same work that
+    ``ssl.create_default_context`` does on Python 3.4+. It:
+
+    - Disables SSLv2, SSLv3, and compression
+    - Sets a restricted set of server ciphers
+
+    If you wish to enable SSLv3, you can do::
+
+        from urllib3.util import ssl_
+        context = ssl_.create_urllib3_context()
+        context.options &= ~ssl_.OP_NO_SSLv3
+
+    You can do the same to enable compression (substituting ``COMPRESSION``
+    for ``SSLv3`` in the last line above).
+
+    :param ssl_version:
+        The desired protocol version to use. This will default to
+        PROTOCOL_SSLv23 which will negotiate the highest protocol that both
+        the server and your installation of OpenSSL support.
+    :param cert_reqs:
+        Whether to require the certificate verification. This defaults to
+        ``ssl.CERT_REQUIRED``.
+    :param options:
+        Specific OpenSSL options. These default to ``ssl.OP_NO_SSLv2``,
+        ``ssl.OP_NO_SSLv3``, ``ssl.OP_NO_COMPRESSION``.
+    :param ciphers:
+        Which cipher suites to allow the server to select.
+    :returns:
+        Constructed SSLContext object with specified options
+    :rtype: SSLContext
+    """
+    context = SSLContext(ssl_version or ssl.PROTOCOL_SSLv23)
+
+    if options is None:
+        options = 0
+        # SSLv2 is easily broken and is considered harmful and dangerous
+        options |= OP_NO_SSLv2
+        # SSLv3 has several problems and is now dangerous
+        options |= OP_NO_SSLv3
+        # Disable compression to prevent CRIME attacks for OpenSSL 1.0+
+        # (issue #309)
+        options |= OP_NO_COMPRESSION
+
+    context.options |= options
+
+    if getattr(context, 'supports_set_ciphers', True):  # Platform-specific: Python 2.6
+        context.set_ciphers(ciphers or _DEFAULT_CIPHERS)
+
+    context.verify_mode = cert_reqs
+    if getattr(context, 'check_hostname', None) is not None:  # Platform-specific: Python 3.2
+        context.check_hostname = (context.verify_mode == ssl.CERT_REQUIRED)
+    return context
+
+
+def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
+                    ca_certs=None, server_hostname=None,
+                    ssl_version=None, ciphers=None, ssl_context=None):
+    """
+    All arguments except for server_hostname and ssl_context have the same
+    meaning as they do when using :func:`ssl.wrap_socket`.
+
+    :param server_hostname:
+        When SNI is supported, the expected hostname of the certificate
+    :param ssl_context:
+        A pre-made :class:`SSLContext` object. If none is provided, one will
+        be created using :func:`create_urllib3_context`.
+    :param ciphers:
+        A string of ciphers we wish the client to support. This is not
+        supported on Python 2.6 as the ssl module does not support it.
+    """
+    context = ssl_context
+    if context is None:
+        context = create_urllib3_context(ssl_version, cert_reqs,
+                                         ciphers=ciphers)
+
+    if ca_certs:
+        try:
+            context.load_verify_locations(ca_certs)
+        except IOError as e:  # Platform-specific: Python 2.6, 2.7, 3.2
+            raise SSLError(e)
+        # Py33 raises FileNotFoundError which subclasses OSError
+        # These are not equivalent unless we check the errno attribute
+        except OSError as e:  # Platform-specific: Python 3.3 and beyond
+            if e.errno == errno.ENOENT:
+                raise SSLError(e)
+            raise
+    if certfile:
+        context.load_cert_chain(certfile, keyfile)
+    if HAS_SNI:  # Platform-specific: OpenSSL with enabled SNI
+        return context.wrap_socket(sock, server_hostname=server_hostname)
+    return context.wrap_socket(sock)
diff --git a/lib/requests/packages/urllib3/util/ssl_.pyc b/lib/requests/packages/urllib3/util/ssl_.pyc
new file mode 100644
index 0000000..e5f9485
Binary files /dev/null and b/lib/requests/packages/urllib3/util/ssl_.pyc differ
diff --git a/lib/requests/packages/urllib3/util/timeout.py b/lib/requests/packages/urllib3/util/timeout.py
new file mode 100644
index 0000000..ea7027f
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/timeout.py
@@ -0,0 +1,240 @@
+# The default socket timeout, used by httplib to indicate that no timeout was
+# specified by the user
+from socket import _GLOBAL_DEFAULT_TIMEOUT
+import time
+
+from ..exceptions import TimeoutStateError
+
+# A sentinel value to indicate that no timeout was specified by the user in
+# urllib3
+_Default = object()
+
+def current_time():
+    """
+    Retrieve the current time. This function is mocked out in unit testing.
+    """
+    return time.time()
+
+
+class Timeout(object):
+    """ Timeout configuration.
+
+    Timeouts can be defined as a default for a pool::
+
+        timeout = Timeout(connect=2.0, read=7.0)
+        http = PoolManager(timeout=timeout)
+        response = http.request('GET', 'http://example.com/')
+
+    Or per-request (which overrides the default for the pool)::
+
+        response = http.request('GET', 'http://example.com/', timeout=Timeout(10))
+
+    Timeouts can be disabled by setting all the parameters to ``None``::
+
+        no_timeout = Timeout(connect=None, read=None)
+        response = http.request('GET', 'http://example.com/, timeout=no_timeout)
+
+
+    :param total:
+        This combines the connect and read timeouts into one; the read timeout
+        will be set to the time leftover from the connect attempt. In the
+        event that both a connect timeout and a total are specified, or a read
+        timeout and a total are specified, the shorter timeout will be applied.
+
+        Defaults to None.
+
+    :type total: integer, float, or None
+
+    :param connect:
+        The maximum amount of time to wait for a connection attempt to a server
+        to succeed. Omitting the parameter will default the connect timeout to
+        the system default, probably `the global default timeout in socket.py
+        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
+        None will set an infinite timeout for connection attempts.
+
+    :type connect: integer, float, or None
+
+    :param read:
+        The maximum amount of time to wait between consecutive
+        read operations for a response from the server. Omitting
+        the parameter will default the read timeout to the system
+        default, probably `the global default timeout in socket.py
+        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
+        None will set an infinite timeout.
+
+    :type read: integer, float, or None
+
+    .. note::
+
+        Many factors can affect the total amount of time for urllib3 to return
+        an HTTP response.
+
+        For example, Python's DNS resolver does not obey the timeout specified
+        on the socket. Other factors that can affect total request time include
+        high CPU load, high swap, the program running at a low priority level,
+        or other behaviors.
+
+        In addition, the read and total timeouts only measure the time between
+        read operations on the socket connecting the client and the server,
+        not the total amount of time for the request to return a complete
+        response. For most requests, the timeout is raised because the server
+        has not sent the first byte in the specified time. This is not always
+        the case; if a server streams one byte every fifteen seconds, a timeout
+        of 20 seconds will not trigger, even though the request will take
+        several minutes to complete.
+
+        If your goal is to cut off any request after a set amount of wall clock
+        time, consider having a second "watcher" thread to cut off a slow
+        request.
+    """
+
+    #: A sentinel object representing the default timeout value
+    DEFAULT_TIMEOUT = _GLOBAL_DEFAULT_TIMEOUT
+
+    def __init__(self, total=None, connect=_Default, read=_Default):
+        self._connect = self._validate_timeout(connect, 'connect')
+        self._read = self._validate_timeout(read, 'read')
+        self.total = self._validate_timeout(total, 'total')
+        self._start_connect = None
+
+    def __str__(self):
+        return '%s(connect=%r, read=%r, total=%r)' % (
+            type(self).__name__, self._connect, self._read, self.total)
+
+    @classmethod
+    def _validate_timeout(cls, value, name):
+        """ Check that a timeout attribute is valid.
+
+        :param value: The timeout value to validate
+        :param name: The name of the timeout attribute to validate. This is
+            used to specify in error messages.
+        :return: The validated and casted version of the given value.
+        :raises ValueError: If the type is not an integer or a float, or if it
+            is a numeric value less than zero.
+        """
+        if value is _Default:
+            return cls.DEFAULT_TIMEOUT
+
+        if value is None or value is cls.DEFAULT_TIMEOUT:
+            return value
+
+        try:
+            float(value)
+        except (TypeError, ValueError):
+            raise ValueError("Timeout value %s was %s, but it must be an "
+                             "int or float." % (name, value))
+
+        try:
+            if value < 0:
+                raise ValueError("Attempted to set %s timeout to %s, but the "
+                                 "timeout cannot be set to a value less "
+                                 "than 0." % (name, value))
+        except TypeError:  # Python 3
+            raise ValueError("Timeout value %s was %s, but it must be an "
+                             "int or float." % (name, value))
+
+        return value
+
+    @classmethod
+    def from_float(cls, timeout):
+        """ Create a new Timeout from a legacy timeout value.
+
+        The timeout value used by httplib.py sets the same timeout on the
+        connect(), and recv() socket requests. This creates a :class:`Timeout`
+        object that sets the individual timeouts to the ``timeout`` value
+        passed to this function.
+
+        :param timeout: The legacy timeout value.
+        :type timeout: integer, float, sentinel default object, or None
+        :return: Timeout object
+        :rtype: :class:`Timeout`
+        """
+        return Timeout(read=timeout, connect=timeout)
+
+    def clone(self):
+        """ Create a copy of the timeout object
+
+        Timeout properties are stored per-pool but each request needs a fresh
+        Timeout object to ensure each one has its own start/stop configured.
+
+        :return: a copy of the timeout object
+        :rtype: :class:`Timeout`
+        """
+        # We can't use copy.deepcopy because that will also create a new object
+        # for _GLOBAL_DEFAULT_TIMEOUT, which socket.py uses as a sentinel to
+        # detect the user default.
+        return Timeout(connect=self._connect, read=self._read,
+                       total=self.total)
+
+    def start_connect(self):
+        """ Start the timeout clock, used during a connect() attempt
+
+        :raises urllib3.exceptions.TimeoutStateError: if you attempt
+            to start a timer that has been started already.
+        """
+        if self._start_connect is not None:
+            raise TimeoutStateError("Timeout timer has already been started.")
+        self._start_connect = current_time()
+        return self._start_connect
+
+    def get_connect_duration(self):
+        """ Gets the time elapsed since the call to :meth:`start_connect`.
+
+        :return: Elapsed time.
+        :rtype: float
+        :raises urllib3.exceptions.TimeoutStateError: if you attempt
+            to get duration for a timer that hasn't been started.
+        """
+        if self._start_connect is None:
+            raise TimeoutStateError("Can't get connect duration for timer "
+                                    "that has not started.")
+        return current_time() - self._start_connect
+
+    @property
+    def connect_timeout(self):
+        """ Get the value to use when setting a connection timeout.
+
+        This will be a positive float or integer, the value None
+        (never timeout), or the default system timeout.
+
+        :return: Connect timeout.
+        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+        """
+        if self.total is None:
+            return self._connect
+
+        if self._connect is None or self._connect is self.DEFAULT_TIMEOUT:
+            return self.total
+
+        return min(self._connect, self.total)
+
+    @property
+    def read_timeout(self):
+        """ Get the value for the read timeout.
+
+        This assumes some time has elapsed in the connection timeout and
+        computes the read timeout appropriately.
+
+        If self.total is set, the read timeout is dependent on the amount of
+        time taken by the connect timeout. If the connection time has not been
+        established, a :exc:`~urllib3.exceptions.TimeoutStateError` will be
+        raised.
+
+        :return: Value to use for the read timeout.
+        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+        :raises urllib3.exceptions.TimeoutStateError: If :meth:`start_connect`
+            has not yet been called on this object.
+        """
+        if (self.total is not None and
+            self.total is not self.DEFAULT_TIMEOUT and
+            self._read is not None and
+            self._read is not self.DEFAULT_TIMEOUT):
+            # In case the connect timeout has not yet been established.
+            if self._start_connect is None:
+                return self._read
+            return max(0, min(self.total - self.get_connect_duration(),
+                              self._read))
+        elif self.total is not None and self.total is not self.DEFAULT_TIMEOUT:
+            return max(0, self.total - self.get_connect_duration())
+        else:
+            return self._read
diff --git a/lib/requests/packages/urllib3/util/timeout.pyc b/lib/requests/packages/urllib3/util/timeout.pyc
new file mode 100644
index 0000000..5fb9253
Binary files /dev/null and b/lib/requests/packages/urllib3/util/timeout.pyc differ
diff --git a/lib/requests/packages/urllib3/util/url.py b/lib/requests/packages/urllib3/util/url.py
new file mode 100644
index 0000000..b2ec834
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/url.py
@@ -0,0 +1,212 @@
+from collections import namedtuple
+
+from ..exceptions import LocationParseError
+
+
+url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
+
+
+class Url(namedtuple('Url', url_attrs)):
+    """
+    Datastructure for representing an HTTP URL. Used as a return value for
+    :func:`parse_url`.
+    """
+    slots = ()
+
+    def __new__(cls, scheme=None, auth=None, host=None, port=None, path=None,
+                query=None, fragment=None):
+        return super(Url, cls).__new__(cls, scheme, auth, host, port, path,
+                                       query, fragment)
+
+    @property
+    def hostname(self):
+        """For backwards-compatibility with urlparse. We're nice like that."""
+        return self.host
+
+    @property
+    def request_uri(self):
+        """Absolute path including the query string."""
+        uri = self.path or '/'
+
+        if self.query is not None:
+            uri += '?' + self.query
+
+        return uri
+
+    @property
+    def netloc(self):
+        """Network location including host and port"""
+        if self.port:
+            return '%s:%d' % (self.host, self.port)
+        return self.host
+
+    @property
+    def url(self):
+        """
+        Convert self into a url
+
+        This function should more or less round-trip with :func:`.parse_url`. The
+        returned url may not be exactly the same as the url inputted to
+        :func:`.parse_url`, but it should be equivalent by the RFC (e.g., urls
+        with a blank port will have : removed).
+
+        Example: ::
+
+            >>> U = parse_url('http://google.com/mail/')
+            >>> U.url
+            'http://google.com/mail/'
+            >>> Url('http', 'username:password', 'host.com', 80,
+            ... '/path', 'query', 'fragment').url
+            'http://username:password@host.com:80/path?query#fragment'
+        """
+        scheme, auth, host, port, path, query, fragment = self
+        url = ''
+
+        # We use "is not None" we want things to happen with empty strings (or 0 port)
+        if scheme is not None:
+            url += scheme + '://'
+        if auth is not None:
+            url += auth + '@'
+        if host is not None:
+            url += host
+        if port is not None:
+            url += ':' + str(port)
+        if path is not None:
+            url += path
+        if query is not None:
+            url += '?' + query
+        if fragment is not None:
+            url += '#' + fragment
+
+        return url
+
+    def __str__(self):
+        return self.url
+
+def split_first(s, delims):
+    """
+    Given a string and an iterable of delimiters, split on the first found
+    delimiter. Return two split parts and the matched delimiter.
+
+    If not found, then the first part is the full input string.
+
+    Example::
+
+        >>> split_first('foo/bar?baz', '?/=')
+        ('foo', 'bar?baz', '/')
+        >>> split_first('foo/bar?baz', '123')
+        ('foo/bar?baz', '', None)
+
+    Scales linearly with number of delims. Not ideal for large number of delims.
+    """
+    min_idx = None
+    min_delim = None
+    for d in delims:
+        idx = s.find(d)
+        if idx < 0:
+            continue
+
+        if min_idx is None or idx < min_idx:
+            min_idx = idx
+            min_delim = d
+
+    if min_idx is None or min_idx < 0:
+        return s, '', None
+
+    return s[:min_idx], s[min_idx+1:], min_delim
+
+
+def parse_url(url):
+    """
+    Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
+    performed to parse incomplete urls. Fields not provided will be None.
+
+    Partly backwards-compatible with :mod:`urlparse`.
+
+    Example::
+
+        >>> parse_url('http://google.com/mail/')
+        Url(scheme='http', host='google.com', port=None, path='/mail/', ...)
+        >>> parse_url('google.com:80')
+        Url(scheme=None, host='google.com', port=80, path=None, ...)
+        >>> parse_url('/foo?bar')
+        Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
+    """
+
+    # While this code has overlap with stdlib's urlparse, it is much
+    # simplified for our needs and less annoying.
+    # Additionally, this implementations does silly things to be optimal
+    # on CPython.
+
+    if not url:
+        # Empty
+        return Url()
+
+    scheme = None
+    auth = None
+    host = None
+    port = None
+    path = None
+    fragment = None
+    query = None
+
+    # Scheme
+    if '://' in url:
+        scheme, url = url.split('://', 1)
+
+    # Find the earliest Authority Terminator
+    # (http://tools.ietf.org/html/rfc3986#section-3.2)
+    url, path_, delim = split_first(url, ['/', '?', '#'])
+
+    if delim:
+        # Reassemble the path
+        path = delim + path_
+
+    # Auth
+    if '@' in url:
+        # Last '@' denotes end of auth part
+        auth, url = url.rsplit('@', 1)
+
+    # IPv6
+    if url and url[0] == '[':
+        host, url = url.split(']', 1)
+        host += ']'
+
+    # Port
+    if ':' in url:
+        _host, port = url.split(':', 1)
+
+        if not host:
+            host = _host
+
+        if port:
+            # If given, ports must be integers.
+            if not port.isdigit():
+                raise LocationParseError(url)
+            port = int(port)
+        else:
+            # Blank ports are cool, too. (rfc3986#section-3.2.3)
+            port = None
+
+    elif not host and url:
+        host = url
+
+    if not path:
+        return Url(scheme, auth, host, port, path, query, fragment)
+
+    # Fragment
+    if '#' in path:
+        path, fragment = path.split('#', 1)
+
+    # Query
+    if '?' in path:
+        path, query = path.split('?', 1)
+
+    return Url(scheme, auth, host, port, path, query, fragment)
+
+def get_host(url):
+    """
+    Deprecated. Use :func:`.parse_url` instead.
+    """
+    p = parse_url(url)
+    return p.scheme or 'http', p.hostname, p.port
diff --git a/lib/requests/packages/urllib3/util/url.pyc b/lib/requests/packages/urllib3/util/url.pyc
new file mode 100644
index 0000000..d8cdae3
Binary files /dev/null and b/lib/requests/packages/urllib3/util/url.pyc differ
diff --git a/lib/requests/safe_mode.py b/lib/requests/safe_mode.py
deleted file mode 100755
index 0fb8d70..0000000
--- a/lib/requests/safe_mode.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.safe_mode
-~~~~~~~~~~~~
-
-This module contains a decorator that implements safe_mode.
-
-:copyright: (c) 2012 by Kenneth Reitz.
-:license: ISC, see LICENSE for more details.
-
-"""
-
-from .models import Response
-from .packages.urllib3.response import HTTPResponse
-from .exceptions import RequestException, ConnectionError, HTTPError
-import socket
-
-
-def catch_exceptions_if_in_safe_mode(function):
-    """New implementation of safe_mode. We catch all exceptions at the API level
-    and then return a blank Response object with the error field filled. This decorator
-    wraps request() in api.py.
-    """
-
-    def wrapped(method, url, **kwargs):
-        # if save_mode, we catch exceptions and fill error field
-        if (kwargs.get('config') and kwargs.get('config').get('safe_mode')) or (kwargs.get('session')
-                                            and kwargs.get('session').config.get('safe_mode')):
-            try:
-                return function(method, url, **kwargs)
-            except (RequestException, ConnectionError, HTTPError,
-                    socket.timeout, socket.gaierror) as e:
-                r = Response()
-                r.error = e
-                r.raw = HTTPResponse()  # otherwise, tests fail
-                r.status_code = 0  # with this status_code, content returns None
-                return r
-        return function(method, url, **kwargs)
-    return wrapped
diff --git a/lib/requests/safe_mode.pyc b/lib/requests/safe_mode.pyc
deleted file mode 100644
index 41e4bba..0000000
Binary files a/lib/requests/safe_mode.pyc and /dev/null differ
diff --git a/lib/requests/sessions.py b/lib/requests/sessions.py
old mode 100755
new mode 100644
index f0d4f3c..4f30696
--- a/lib/requests/sessions.py
+++ b/lib/requests/sessions.py
@@ -8,101 +8,330 @@ This module provides a Session object to manage and persist settings across
 requests (cookies, auth, proxies).
 
 """
+import os
+from collections import Mapping
+from datetime import datetime
 
-from copy import deepcopy
-from .compat import cookielib
-from .cookies import cookiejar_from_dict, remove_cookie_by_name
-from .defaults import defaults
-from .models import Request
-from .hooks import dispatch_hook
-from .utils import header_expand, from_key_val_list
-from .packages.urllib3.poolmanager import PoolManager
+from .auth import _basic_auth_str
+from .compat import cookielib, OrderedDict, urljoin, urlparse
+from .cookies import (
+    cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
+from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
+from .hooks import default_hooks, dispatch_hook
+from .utils import to_key_val_list, default_headers, to_native_string
+from .exceptions import (
+    TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
+from .packages.urllib3._collections import RecentlyUsedContainer
+from .structures import CaseInsensitiveDict
 
+from .adapters import HTTPAdapter
 
-def merge_kwargs(local_kwarg, default_kwarg):
-    """Merges kwarg dictionaries.
+from .utils import (
+    requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
+    get_auth_from_url
+)
 
-    If a local key in the dictionary is set to None, it will be removed.
-    """
+from .status_codes import codes
+
+# formerly defined here, reexposed here for backward compatibility
+from .models import REDIRECT_STATI
+
+REDIRECT_CACHE_SIZE = 1000
 
-    if default_kwarg is None:
-        return local_kwarg
 
-    if isinstance(local_kwarg, str):
-        return local_kwarg
+def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
+    """
+    Determines appropriate setting for a given request, taking into account the
+    explicit setting on that request, and the setting in the session. If a
+    setting is a dictionary, they will be merged together using `dict_class`
+    """
 
-    if local_kwarg is None:
-        return default_kwarg
+    if session_setting is None:
+        return request_setting
 
-    # Bypass if not a dictionary (e.g. timeout)
-    if not hasattr(default_kwarg, 'items'):
-        return local_kwarg
+    if request_setting is None:
+        return session_setting
 
-    default_kwarg = from_key_val_list(default_kwarg)
-    local_kwarg = from_key_val_list(local_kwarg)
+    # Bypass if not a dictionary (e.g. verify)
+    if not (
+            isinstance(session_setting, Mapping) and
+            isinstance(request_setting, Mapping)
+    ):
+        return request_setting
 
-    # Update new values.
-    kwargs = default_kwarg.copy()
-    kwargs.update(local_kwarg)
+    merged_setting = dict_class(to_key_val_list(session_setting))
+    merged_setting.update(to_key_val_list(request_setting))
 
     # Remove keys that are set to None.
-    for (k, v) in local_kwarg.items():
+    for (k, v) in request_setting.items():
         if v is None:
-            del kwargs[k]
+            del merged_setting[k]
+
+    merged_setting = dict((k, v) for (k, v) in merged_setting.items() if v is not None)
+
+    return merged_setting
+
+
+def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
+    """
+    Properly merges both requests and session hooks.
+
+    This is necessary because when request_hooks == {'response': []}, the
+    merge breaks Session hooks entirely.
+    """
+    if session_hooks is None or session_hooks.get('response') == []:
+        return request_hooks
+
+    if request_hooks is None or request_hooks.get('response') == []:
+        return session_hooks
+
+    return merge_setting(request_hooks, session_hooks, dict_class)
+
+
+class SessionRedirectMixin(object):
+    def resolve_redirects(self, resp, req, stream=False, timeout=None,
+                          verify=True, cert=None, proxies=None):
+        """Receives a Response. Returns a generator of Responses."""
+
+        i = 0
+        hist = [] # keep track of history
+
+        while resp.is_redirect:
+            prepared_request = req.copy()
+
+            if i > 0:
+                # Update history and keep track of redirects.
+                hist.append(resp)
+                new_hist = list(hist)
+                resp.history = new_hist
+
+            try:
+                resp.content  # Consume socket so it can be released
+            except (ChunkedEncodingError, ContentDecodingError, RuntimeError):
+                resp.raw.read(decode_content=False)
+
+            if i >= self.max_redirects:
+                raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects)
+
+            # Release the connection back into the pool.
+            resp.close()
+
+            url = resp.headers['location']
+            method = req.method
+
+            # Handle redirection without scheme (see: RFC 1808 Section 4)
+            if url.startswith('//'):
+                parsed_rurl = urlparse(resp.url)
+                url = '%s:%s' % (parsed_rurl.scheme, url)
+
+            # The scheme should be lower case...
+            parsed = urlparse(url)
+            url = parsed.geturl()
+
+            # Facilitate relative 'location' headers, as allowed by RFC 7231.
+            # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')
+            # Compliant with RFC3986, we percent encode the url.
+            if not parsed.netloc:
+                url = urljoin(resp.url, requote_uri(url))
+            else:
+                url = requote_uri(url)
+
+            prepared_request.url = to_native_string(url)
+            # Cache the url, unless it redirects to itself.
+            if resp.is_permanent_redirect and req.url != prepared_request.url:
+                self.redirect_cache[req.url] = prepared_request.url
+
+            # http://tools.ietf.org/html/rfc7231#section-6.4.4
+            if (resp.status_code == codes.see_other and
+                    method != 'HEAD'):
+                method = 'GET'
+
+            # Do what the browsers do, despite standards...
+            # First, turn 302s into GETs.
+            if resp.status_code == codes.found and method != 'HEAD':
+                method = 'GET'
+
+            # Second, if a POST is responded to with a 301, turn it into a GET.
+            # This bizarre behaviour is explained in Issue 1704.
+            if resp.status_code == codes.moved and method == 'POST':
+                method = 'GET'
+
+            prepared_request.method = method
+
+            # https://github.com/kennethreitz/requests/issues/1084
+            if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
+                if 'Content-Length' in prepared_request.headers:
+                    del prepared_request.headers['Content-Length']
+
+                prepared_request.body = None
+
+            headers = prepared_request.headers
+            try:
+                del headers['Cookie']
+            except KeyError:
+                pass
+
+            extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
+            prepared_request._cookies.update(self.cookies)
+            prepared_request.prepare_cookies(prepared_request._cookies)
+
+            # Rebuild auth and proxy information.
+            proxies = self.rebuild_proxies(prepared_request, proxies)
+            self.rebuild_auth(prepared_request, resp)
+
+            # Override the original request.
+            req = prepared_request
+
+            resp = self.send(
+                req,
+                stream=stream,
+                timeout=timeout,
+                verify=verify,
+                cert=cert,
+                proxies=proxies,
+                allow_redirects=False,
+            )
+
+            extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
+
+            i += 1
+            yield resp
+
+    def rebuild_auth(self, prepared_request, response):
+        """
+        When being redirected we may want to strip authentication from the
+        request to avoid leaking credentials. This method intelligently removes
+        and reapplies authentication where possible to avoid credential loss.
+        """
+        headers = prepared_request.headers
+        url = prepared_request.url
+
+        if 'Authorization' in headers:
+            # If we get redirected to a new host, we should strip out any
+            # authentication headers.
+            original_parsed = urlparse(response.request.url)
+            redirect_parsed = urlparse(url)
+
+            if (original_parsed.hostname != redirect_parsed.hostname):
+                del headers['Authorization']
+
+        # .netrc might have more auth for us on our new host.
+        new_auth = get_netrc_auth(url) if self.trust_env else None
+        if new_auth is not None:
+            prepared_request.prepare_auth(new_auth)
+
+        return
+
+    def rebuild_proxies(self, prepared_request, proxies):
+        """
+        This method re-evaluates the proxy configuration by considering the
+        environment variables. If we are redirected to a URL covered by
+        NO_PROXY, we strip the proxy configuration. Otherwise, we set missing
+        proxy keys for this URL (in case they were stripped by a previous
+        redirect).
+
+        This method also replaces the Proxy-Authorization header where
+        necessary.
+        """
+        headers = prepared_request.headers
+        url = prepared_request.url
+        scheme = urlparse(url).scheme
+        new_proxies = proxies.copy() if proxies is not None else {}
+
+        if self.trust_env and not should_bypass_proxies(url):
+            environ_proxies = get_environ_proxies(url)
+
+            proxy = environ_proxies.get(scheme)
+
+            if proxy:
+                new_proxies.setdefault(scheme, environ_proxies[scheme])
+
+        if 'Proxy-Authorization' in headers:
+            del headers['Proxy-Authorization']
+
+        try:
+            username, password = get_auth_from_url(new_proxies[scheme])
+        except KeyError:
+            username, password = None, None
 
-    return kwargs
+        if username and password:
+            headers['Proxy-Authorization'] = _basic_auth_str(username, password)
 
+        return new_proxies
 
-class Session(object):
-    """A Requests session."""
+
+class Session(SessionRedirectMixin):
+    """A Requests session.
+
+    Provides cookie persistence, connection-pooling, and configuration.
+
+    Basic Usage::
+
+      >>> import requests
+      >>> s = requests.Session()
+      >>> s.get('http://httpbin.org/get')
+      200
+    """
 
     __attrs__ = [
-        'headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks',
-        'params', 'config', 'verify', 'cert', 'prefetch']
+        'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
+        'cert', 'prefetch', 'adapters', 'stream', 'trust_env',
+        'max_redirects',
+    ]
 
-    def __init__(self,
-        headers=None,
-        cookies=None,
-        auth=None,
-        timeout=None,
-        proxies=None,
-        hooks=None,
-        params=None,
-        config=None,
-        prefetch=True,
-        verify=True,
-        cert=None):
-
-        self.headers = from_key_val_list(headers or [])
-        self.auth = auth
-        self.timeout = timeout
-        self.proxies = from_key_val_list(proxies or [])
-        self.hooks = from_key_val_list(hooks or {})
-        self.params = from_key_val_list(params or [])
-        self.config = from_key_val_list(config or {})
-        self.prefetch = prefetch
-        self.verify = verify
-        self.cert = cert
-
-        for (k, v) in list(defaults.items()):
-            self.config.setdefault(k, deepcopy(v))
-
-        self.init_poolmanager()
-
-        # Set up a CookieJar to be used by default
-        if isinstance(cookies, cookielib.CookieJar):
-            self.cookies = cookies
-        else:
-            self.cookies = cookiejar_from_dict(cookies)
-
-    def init_poolmanager(self):
-        self.poolmanager = PoolManager(
-            num_pools=self.config.get('pool_connections'),
-            maxsize=self.config.get('pool_maxsize')
-        )
+    def __init__(self):
+
+        #: A case-insensitive dictionary of headers to be sent on each
+        #: :class:`Request <Request>` sent from this
+        #: :class:`Session <Session>`.
+        self.headers = default_headers()
+
+        #: Default Authentication tuple or object to attach to
+        #: :class:`Request <Request>`.
+        self.auth = None
+
+        #: Dictionary mapping protocol to the URL of the proxy (e.g.
+        #: {'http': 'foo.bar:3128'}) to be used on each
+        #: :class:`Request <Request>`.
+        self.proxies = {}
+
+        #: Event-handling hooks.
+        self.hooks = default_hooks()
+
+        #: Dictionary of querystring data to attach to each
+        #: :class:`Request <Request>`. The dictionary values may be lists for
+        #: representing multivalued query parameters.
+        self.params = {}
+
+        #: Stream response content default.
+        self.stream = False
+
+        #: SSL Verification default.
+        self.verify = True
+
+        #: SSL certificate default.
+        self.cert = None
+
+        #: Maximum number of redirects allowed. If the request exceeds this
+        #: limit, a :class:`TooManyRedirects` exception is raised.
+        self.max_redirects = DEFAULT_REDIRECT_LIMIT
+
+        #: Should we trust the environment?
+        self.trust_env = True
+
+        #: A CookieJar containing all currently outstanding cookies set on this
+        #: session. By default it is a
+        #: :class:`RequestsCookieJar <requests.cookies.RequestsCookieJar>`, but
+        #: may be any other ``cookielib.CookieJar`` compatible object.
+        self.cookies = cookiejar_from_dict({})
 
-    def __repr__(self):
-        return '<requests-client at 0x%x>' % (id(self))
+        # Default connection adapters.
+        self.adapters = OrderedDict()
+        self.mount('https://', HTTPAdapter())
+        self.mount('http://', HTTPAdapter())
+
+        # Only store 1000 redirects to prevent using infinite memory
+        self.redirect_cache = RecentlyUsedContainer(REDIRECT_CACHE_SIZE)
 
     def __enter__(self):
         return self
@@ -110,13 +339,45 @@ class Session(object):
     def __exit__(self, *args):
         self.close()
 
-    def close(self):
-        """Dispose of any internal state.
+    def prepare_request(self, request):
+        """Constructs a :class:`PreparedRequest <PreparedRequest>` for
+        transmission and returns it. The :class:`PreparedRequest` has settings
+        merged from the :class:`Request <Request>` instance and those of the
+        :class:`Session`.
 
-        Currently, this just closes the PoolManager, which closes pooled
-        connections.
+        :param request: :class:`Request` instance to prepare with this
+            session's settings.
         """
-        self.poolmanager.clear()
+        cookies = request.cookies or {}
+
+        # Bootstrap CookieJar.
+        if not isinstance(cookies, cookielib.CookieJar):
+            cookies = cookiejar_from_dict(cookies)
+
+        # Merge with session cookies
+        merged_cookies = merge_cookies(
+            merge_cookies(RequestsCookieJar(), self.cookies), cookies)
+
+
+        # Set environment's basic authentication if not explicitly set.
+        auth = request.auth
+        if self.trust_env and not auth and not self.auth:
+            auth = get_netrc_auth(request.url)
+
+        p = PreparedRequest()
+        p.prepare(
+            method=request.method.upper(),
+            url=request.url,
+            files=request.files,
+            data=request.data,
+            json=request.json,
+            headers=merge_setting(request.headers, self.headers, dict_class=CaseInsensitiveDict),
+            params=merge_setting(request.params, self.params),
+            auth=merge_setting(auth, self.auth),
+            cookies=merged_cookies,
+            hooks=merge_hooks(request.hooks, self.hooks),
+        )
+        return p
 
     def request(self, method, url,
         params=None,
@@ -129,119 +390,77 @@ class Session(object):
         allow_redirects=True,
         proxies=None,
         hooks=None,
-        return_response=True,
-        config=None,
-        prefetch=None,
+        stream=None,
         verify=None,
-        cert=None):
-
-        """Constructs and sends a :class:`Request <Request>`.
+        cert=None,
+        json=None):
+        """Constructs a :class:`Request <Request>`, prepares it and sends it.
         Returns :class:`Response <Response>` object.
 
         :param method: method for the new :class:`Request` object.
         :param url: URL for the new :class:`Request` object.
-        :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
-        :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
-        :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
-        :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
-        :param files: (optional) Dictionary of 'filename': file-like-objects for multipart encoding upload.
-        :param auth: (optional) Auth tuple or callable to enable Basic/Digest/Custom HTTP Auth.
-        :param timeout: (optional) Float describing the timeout of the request.
-        :param allow_redirects: (optional) Boolean. Set to True by default.
-        :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
-        :param return_response: (optional) If False, an un-sent Request object will returned.
-        :param config: (optional) A configuration dictionary. See ``request.defaults`` for allowed keys and their default values.
-        :param prefetch: (optional) whether to immediately download the response content. Defaults to ``True``.
-        :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
-        :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
+        :param params: (optional) Dictionary or bytes to be sent in the query
+            string for the :class:`Request`.
+        :param data: (optional) Dictionary or bytes to send in the body of the
+            :class:`Request`.
+        :param json: (optional) json to send in the body of the
+            :class:`Request`.
+        :param headers: (optional) Dictionary of HTTP Headers to send with the
+            :class:`Request`.
+        :param cookies: (optional) Dict or CookieJar object to send with the
+            :class:`Request`.
+        :param files: (optional) Dictionary of ``'filename': file-like-objects``
+            for multipart encoding upload.
+        :param auth: (optional) Auth tuple or callable to enable
+            Basic/Digest/Custom HTTP Auth.
+        :param timeout: (optional) How long to wait for the server to send
+            data before giving up, as a float, or a (`connect timeout, read
+            timeout <user/advanced.html#timeouts>`_) tuple.
+        :type timeout: float or tuple
+        :param allow_redirects: (optional) Set to True by default.
+        :type allow_redirects: bool
+        :param proxies: (optional) Dictionary mapping protocol to the URL of
+            the proxy.
+        :param stream: (optional) whether to immediately download the response
+            content. Defaults to ``False``.
+        :param verify: (optional) if ``True``, the SSL cert will be verified.
+            A CA_BUNDLE path can also be provided.
+        :param cert: (optional) if String, path to ssl client cert file (.pem).
+            If Tuple, ('cert', 'key') pair.
         """
 
-        method = str(method).upper()
-
-        # Default empty dicts for dict params.
-        data = [] if data is None else data
-        files = [] if files is None else files
-        headers = {} if headers is None else headers
-        params = {} if params is None else params
-        hooks = {} if hooks is None else hooks
-        prefetch = prefetch if prefetch is not None else self.prefetch
-
-        # use session's hooks as defaults
-        for key, cb in list(self.hooks.items()):
-            hooks.setdefault(key, cb)
-
-        # Expand header values.
-        if headers:
-            for k, v in list(headers.items() or {}):
-                headers[k] = header_expand(v)
-
-        args = dict(
-            method=method,
-            url=url,
-            data=data,
-            params=from_key_val_list(params),
-            headers=from_key_val_list(headers),
-            cookies=cookies,
-            files=files,
-            auth=auth,
-            hooks=from_key_val_list(hooks),
-            timeout=timeout,
-            allow_redirects=allow_redirects,
-            proxies=from_key_val_list(proxies),
-            config=from_key_val_list(config),
-            prefetch=prefetch,
-            verify=verify,
-            cert=cert,
-            _poolmanager=self.poolmanager
+        method = to_native_string(method)
+
+        # Create the Request.
+        req = Request(
+            method = method.upper(),
+            url = url,
+            headers = headers,
+            files = files,
+            data = data or {},
+            json = json,
+            params = params or {},
+            auth = auth,
+            cookies = cookies,
+            hooks = hooks,
         )
+        prep = self.prepare_request(req)
 
-        # merge session cookies into passed-in ones
-        dead_cookies = None
-        # passed-in cookies must become a CookieJar:
-        if not isinstance(cookies, cookielib.CookieJar):
-            args['cookies'] = cookiejar_from_dict(cookies)
-            # support unsetting cookies that have been passed in with None values
-            # this is only meaningful when `cookies` is a dict ---
-            # for a real CookieJar, the client should use session.cookies.clear()
-            if cookies is not None:
-                dead_cookies = [name for name in cookies if cookies[name] is None]
-        # merge the session's cookies into the passed-in cookies:
-        for cookie in self.cookies:
-            args['cookies'].set_cookie(cookie)
-        # remove the unset cookies from the jar we'll be using with the current request
-        # (but not from the session's own store of cookies):
-        if dead_cookies is not None:
-            for name in dead_cookies:
-                remove_cookie_by_name(args['cookies'], name)
-
-        # Merge local kwargs with session kwargs.
-        for attr in self.__attrs__:
-            # we already merged cookies:
-            if attr == 'cookies':
-                continue
-
-            session_val = getattr(self, attr, None)
-            local_val = args.get(attr)
-            args[attr] = merge_kwargs(local_val, session_val)
-
-        # Arguments manipulation hook.
-        args = dispatch_hook('args', args['hooks'], args)
-
-        # Create the (empty) response.
-        r = Request(**args)
-
-        # Give the response some context.
-        r.session = self
-
-        # Don't send if asked nicely.
-        if not return_response:
-            return r
-
-        # Send the HTTP Request.
-        r.send(prefetch=prefetch)
-
-        # Return the response.
-        return r.response
+        proxies = proxies or {}
+
+        settings = self.merge_environment_settings(
+            prep.url, proxies, stream, verify, cert
+        )
+
+        # Send the request.
+        send_kwargs = {
+            'timeout': timeout,
+            'allow_redirects': allow_redirects,
+        }
+        send_kwargs.update(settings)
+        resp = self.send(prep, **send_kwargs)
+
+        return resp
 
     def get(self, url, **kwargs):
         """Sends a GET request. Returns :class:`Response` object.
@@ -251,7 +470,7 @@ class Session(object):
         """
 
         kwargs.setdefault('allow_redirects', True)
-        return self.request('get', url, **kwargs)
+        return self.request('GET', url, **kwargs)
 
     def options(self, url, **kwargs):
         """Sends a OPTIONS request. Returns :class:`Response` object.
@@ -261,7 +480,7 @@ class Session(object):
         """
 
         kwargs.setdefault('allow_redirects', True)
-        return self.request('options', url, **kwargs)
+        return self.request('OPTIONS', url, **kwargs)
 
     def head(self, url, **kwargs):
         """Sends a HEAD request. Returns :class:`Response` object.
@@ -271,37 +490,38 @@ class Session(object):
         """
 
         kwargs.setdefault('allow_redirects', False)
-        return self.request('head', url, **kwargs)
+        return self.request('HEAD', url, **kwargs)
 
-    def post(self, url, data=None, **kwargs):
+    def post(self, url, data=None, json=None, **kwargs):
         """Sends a POST request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
-        :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+        :param json: (optional) json to send in the body of the :class:`Request`.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         """
 
-        return self.request('post', url, data=data, **kwargs)
+        return self.request('POST', url, data=data, json=json, **kwargs)
 
     def put(self, url, data=None, **kwargs):
         """Sends a PUT request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
-        :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         """
 
-        return self.request('put', url, data=data, **kwargs)
+        return self.request('PUT', url, data=data, **kwargs)
 
     def patch(self, url, data=None, **kwargs):
         """Sends a PATCH request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
-        :param data: (optional) Dictionary or bytes to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         """
 
-        return self.request('patch', url,  data=data, **kwargs)
+        return self.request('PATCH', url,  data=data, **kwargs)
 
     def delete(self, url, **kwargs):
         """Sends a DELETE request. Returns :class:`Response` object.
@@ -310,19 +530,153 @@ class Session(object):
         :param \*\*kwargs: Optional arguments that ``request`` takes.
         """
 
-        return self.request('delete', url, **kwargs)
+        return self.request('DELETE', url, **kwargs)
+
+    def send(self, request, **kwargs):
+        """Send a given PreparedRequest."""
+        # Set defaults that the hooks can utilize to ensure they always have
+        # the correct parameters to reproduce the previous request.
+        kwargs.setdefault('stream', self.stream)
+        kwargs.setdefault('verify', self.verify)
+        kwargs.setdefault('cert', self.cert)
+        kwargs.setdefault('proxies', self.proxies)
+
+        # It's possible that users might accidentally send a Request object.
+        # Guard against that specific failure case.
+        if not isinstance(request, PreparedRequest):
+            raise ValueError('You can only send PreparedRequests.')
+
+        checked_urls = set()
+        while request.url in self.redirect_cache:
+            checked_urls.add(request.url)
+            new_url = self.redirect_cache.get(request.url)
+            if new_url in checked_urls:
+                break
+            request.url = new_url
+
+        # Set up variables needed for resolve_redirects and dispatching of hooks
+        allow_redirects = kwargs.pop('allow_redirects', True)
+        stream = kwargs.get('stream')
+        timeout = kwargs.get('timeout')
+        verify = kwargs.get('verify')
+        cert = kwargs.get('cert')
+        proxies = kwargs.get('proxies')
+        hooks = request.hooks
+
+        # Get the appropriate adapter to use
+        adapter = self.get_adapter(url=request.url)
+
+        # Start time (approximately) of the request
+        start = datetime.utcnow()
+
+        # Send the request
+        r = adapter.send(request, **kwargs)
+
+        # Total elapsed time of the request (approximately)
+        r.elapsed = datetime.utcnow() - start
+
+        # Response manipulation hooks
+        r = dispatch_hook('response', hooks, r, **kwargs)
+
+        # Persist cookies
+        if r.history:
+
+            # If the hooks create history then we want those cookies too
+            for resp in r.history:
+                extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
+
+        extract_cookies_to_jar(self.cookies, request, r.raw)
+
+        # Redirect resolving generator.
+        gen = self.resolve_redirects(r, request,
+            stream=stream,
+            timeout=timeout,
+            verify=verify,
+            cert=cert,
+            proxies=proxies)
+
+        # Resolve redirects if allowed.
+        history = [resp for resp in gen] if allow_redirects else []
+
+        # Shuffle things around if there's history.
+        if history:
+            # Insert the first (original) request at the start
+            history.insert(0, r)
+            # Get the last request made
+            r = history.pop()
+            r.history = history
+
+        if not stream:
+            r.content
+
+        return r
+
+    def merge_environment_settings(self, url, proxies, stream, verify, cert):
+        """Check the environment and merge it with some settings."""
+        # Gather clues from the surrounding environment.
+        if self.trust_env:
+            # Set environment's proxies.
+            env_proxies = get_environ_proxies(url) or {}
+            for (k, v) in env_proxies.items():
+                proxies.setdefault(k, v)
+
+            # Look for requests environment configuration and be compatible
+            # with cURL.
+            if verify is True or verify is None:
+                verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
+                          os.environ.get('CURL_CA_BUNDLE'))
+
+        # Merge all the kwargs.
+        proxies = merge_setting(proxies, self.proxies)
+        stream = merge_setting(stream, self.stream)
+        verify = merge_setting(verify, self.verify)
+        cert = merge_setting(cert, self.cert)
+
+        return {'verify': verify, 'proxies': proxies, 'stream': stream,
+                'cert': cert}
+
+    def get_adapter(self, url):
+        """Returns the appropriate connnection adapter for the given URL."""
+        for (prefix, adapter) in self.adapters.items():
+
+            if url.lower().startswith(prefix):
+                return adapter
+
+        # Nothing matches :-/
+        raise InvalidSchema("No connection adapters were found for '%s'" % url)
+
+    def close(self):
+        """Closes all adapters and as such the session"""
+        for v in self.adapters.values():
+            v.close()
+
+    def mount(self, prefix, adapter):
+        """Registers a connection adapter to a prefix.
+
+        Adapters are sorted in descending order by key length."""
+
+        self.adapters[prefix] = adapter
+        keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]
+
+        for key in keys_to_move:
+            self.adapters[key] = self.adapters.pop(key)
 
     def __getstate__(self):
-        return dict((attr, getattr(self, attr, None)) for attr in self.__attrs__)
+        state = dict((attr, getattr(self, attr, None)) for attr in self.__attrs__)
+        state['redirect_cache'] = dict(self.redirect_cache)
+        return state
 
     def __setstate__(self, state):
+        redirect_cache = state.pop('redirect_cache', {})
         for attr, value in state.items():
             setattr(self, attr, value)
 
-        self.init_poolmanager()
+        self.redirect_cache = RecentlyUsedContainer(REDIRECT_CACHE_SIZE)
+        for redirect, to in redirect_cache.items():
+            self.redirect_cache[redirect] = to
 
 
-def session(**kwargs):
+def session():
     """Returns a :class:`Session` for context-management."""
 
-    return Session(**kwargs)
+    return Session()
diff --git a/lib/requests/sessions.pyc b/lib/requests/sessions.pyc
index a074f0b..0d8bd75 100644
Binary files a/lib/requests/sessions.pyc and b/lib/requests/sessions.pyc differ
diff --git a/lib/requests/status_codes.py b/lib/requests/status_codes.py
old mode 100755
new mode 100644
index e25ecdb..e0887f2
--- a/lib/requests/status_codes.py
+++ b/lib/requests/status_codes.py
@@ -10,7 +10,7 @@ _codes = {
     102: ('processing',),
     103: ('checkpoint',),
     122: ('uri_too_long', 'request_uri_too_long'),
-    200: ('ok', 'okay', 'all_ok', 'all_okay', 'all_good', '\\o/'),
+    200: ('ok', 'okay', 'all_ok', 'all_okay', 'all_good', '\\o/', '✓'),
     201: ('created',),
     202: ('accepted',),
     203: ('non_authoritative_info', 'non_authoritative_information'),
@@ -18,7 +18,8 @@ _codes = {
     205: ('reset_content', 'reset'),
     206: ('partial_content', 'partial'),
     207: ('multi_status', 'multiple_status', 'multi_stati', 'multiple_stati'),
-    208: ('im_used',),
+    208: ('already_reported',),
+    226: ('im_used',),
 
     # Redirection.
     300: ('multiple_choices',),
@@ -29,7 +30,8 @@ _codes = {
     305: ('use_proxy',),
     306: ('switch_proxy',),
     307: ('temporary_redirect', 'temporary_moved', 'temporary'),
-    308: ('resume_incomplete', 'resume'),
+    308: ('permanent_redirect',
+          'resume_incomplete', 'resume',), # These 2 to be removed in 3.0
 
     # Client Error.
     400: ('bad_request', 'bad'),
@@ -62,10 +64,11 @@ _codes = {
     444: ('no_response', 'none'),
     449: ('retry_with', 'retry'),
     450: ('blocked_by_windows_parental_controls', 'parental_controls'),
+    451: ('unavailable_for_legal_reasons', 'legal_reasons'),
     499: ('client_closed_request',),
 
     # Server Error.
-    500: ('internal_server_error', 'server_error', '/o\\'),
+    500: ('internal_server_error', 'server_error', '/o\\', '✗'),
     501: ('not_implemented',),
     502: ('bad_gateway',),
     503: ('service_unavailable', 'unavailable'),
diff --git a/lib/requests/status_codes.pyc b/lib/requests/status_codes.pyc
index 43d9d43..b5ecd15 100644
Binary files a/lib/requests/status_codes.pyc and b/lib/requests/status_codes.pyc differ
diff --git a/lib/requests/structures.py b/lib/requests/structures.py
old mode 100755
new mode 100644
index 3fda984..3e5f2fa
--- a/lib/requests/structures.py
+++ b/lib/requests/structures.py
@@ -8,45 +8,82 @@ Data structures that power Requests.
 
 """
 
+import collections
 
-class CaseInsensitiveDict(dict):
-    """Case-insensitive Dictionary
+
+class CaseInsensitiveDict(collections.MutableMapping):
+    """
+    A case-insensitive ``dict``-like object.
+
+    Implements all methods and operations of
+    ``collections.MutableMapping`` as well as dict's ``copy``. Also
+    provides ``lower_items``.
+
+    All keys are expected to be strings. The structure remembers the
+    case of the last key to be set, and ``iter(instance)``,
+    ``keys()``, ``items()``, ``iterkeys()``, and ``iteritems()``
+    will contain case-sensitive keys. However, querying and contains
+    testing is case insensitive::
+
+        cid = CaseInsensitiveDict()
+        cid['Accept'] = 'application/json'
+        cid['aCCEPT'] == 'application/json'  # True
+        list(cid) == ['Accept']  # True
 
     For example, ``headers['content-encoding']`` will return the
-    value of a ``'Content-Encoding'`` response header."""
+    value of a ``'Content-Encoding'`` response header, regardless
+    of how the header name was originally stored.
 
-    @property
-    def lower_keys(self):
-        if not hasattr(self, '_lower_keys') or not self._lower_keys:
-            self._lower_keys = dict((k.lower(), k) for k in list(self.keys()))
-        return self._lower_keys
+    If the constructor, ``.update``, or equality comparison
+    operations are given keys that have equal ``.lower()``s, the
+    behavior is undefined.
 
-    def _clear_lower_keys(self):
-        if hasattr(self, '_lower_keys'):
-            self._lower_keys.clear()
+    """
+    def __init__(self, data=None, **kwargs):
+        self._store = dict()
+        if data is None:
+            data = {}
+        self.update(data, **kwargs)
 
     def __setitem__(self, key, value):
-        dict.__setitem__(self, key, value)
-        self._clear_lower_keys()
+        # Use the lowercased key for lookups, but store the actual
+        # key alongside the value.
+        self._store[key.lower()] = (key, value)
+
+    def __getitem__(self, key):
+        return self._store[key.lower()][1]
 
     def __delitem__(self, key):
-        dict.__delitem__(self, self.lower_keys.get(key.lower(), key))
-        self._lower_keys.clear()
+        del self._store[key.lower()]
 
-    def __contains__(self, key):
-        return key.lower() in self.lower_keys
+    def __iter__(self):
+        return (casedkey for casedkey, mappedvalue in self._store.values())
 
-    def __getitem__(self, key):
-        # We allow fall-through here, so values default to None
-        if key in self:
-            return dict.__getitem__(self, self.lower_keys[key.lower()])
+    def __len__(self):
+        return len(self._store)
 
-    def get(self, key, default=None):
-        if key in self:
-            return self[key]
+    def lower_items(self):
+        """Like iteritems(), but with all lowercase keys."""
+        return (
+            (lowerkey, keyval[1])
+            for (lowerkey, keyval)
+            in self._store.items()
+        )
+
+    def __eq__(self, other):
+        if isinstance(other, collections.Mapping):
+            other = CaseInsensitiveDict(other)
         else:
-            return default
+            return NotImplemented
+        # Compare insensitively
+        return dict(self.lower_items()) == dict(other.lower_items())
+
+    # Copy is required
+    def copy(self):
+        return CaseInsensitiveDict(self._store.values())
 
+    def __repr__(self):
+        return str(dict(self.items()))
 
 class LookupDict(dict):
     """Dictionary lookup object."""
diff --git a/lib/requests/structures.pyc b/lib/requests/structures.pyc
index 88999cf..6d1227a 100644
Binary files a/lib/requests/structures.pyc and b/lib/requests/structures.pyc differ
diff --git a/lib/requests/utils.py b/lib/requests/utils.py
old mode 100755
new mode 100644
index ec9f4d2..7467941
--- a/lib/requests/utils.py
+++ b/lib/requests/utils.py
@@ -11,55 +11,30 @@ that are also useful for external consumption.
 
 import cgi
 import codecs
+import collections
+import io
 import os
 import platform
 import re
 import sys
-import zlib
-from netrc import netrc, NetrcParseError
+import socket
+import struct
+import warnings
 
 from . import __version__
+from . import certs
 from .compat import parse_http_list as _parse_list_header
-from .compat import quote, quote_plus, urlparse, basestring, bytes, str, OrderedDict
+from .compat import (quote, urlparse, bytes, str, OrderedDict, unquote, is_py2,
+                     builtin_str, getproxies, proxy_bypass, urlunparse)
 from .cookies import RequestsCookieJar, cookiejar_from_dict
+from .structures import CaseInsensitiveDict
+from .exceptions import InvalidURL
 
 _hush_pyflakes = (RequestsCookieJar,)
 
-CERTIFI_BUNDLE_PATH = None
-try:
-    # see if requests's own CA certificate bundle is installed
-    from . import certs
-    CERTIFI_BUNDLE_PATH = certs.where()
-except ImportError:
-    pass
-
 NETRC_FILES = ('.netrc', '_netrc')
 
-# common paths for the OS's CA certificate bundle
-POSSIBLE_CA_BUNDLE_PATHS = [
-        # Red Hat, CentOS, Fedora and friends (provided by the ca-certificates package):
-        '/etc/pki/tls/certs/ca-bundle.crt',
-        # Ubuntu, Debian, and friends (provided by the ca-certificates package):
-        '/etc/ssl/certs/ca-certificates.crt',
-        # FreeBSD (provided by the ca_root_nss package):
-        '/usr/local/share/certs/ca-root-nss.crt',
-        # openSUSE (provided by the ca-certificates package), the 'certs' directory is the
-        # preferred way but may not be supported by the SSL module, thus it has 'ca-bundle.pem'
-        # as a fallback (which is generated from pem files in the 'certs' directory):
-        '/etc/ssl/ca-bundle.pem',
-]
-
-
-def get_os_ca_bundle_path():
-    """Try to pick an available CA certificate bundle provided by the OS."""
-    for path in POSSIBLE_CA_BUNDLE_PATHS:
-        if os.path.exists(path):
-            return path
-    return None
-
-# if certifi is installed, use its CA bundle;
-# otherwise, try and use the OS bundle
-DEFAULT_CA_BUNDLE_PATH = CERTIFI_BUNDLE_PATH or get_os_ca_bundle_path()
+DEFAULT_CA_BUNDLE_PATH = certs.where()
 
 
 def dict_to_sequence(d):
@@ -71,20 +46,50 @@ def dict_to_sequence(d):
     return d
 
 
+def super_len(o):
+    if hasattr(o, '__len__'):
+        return len(o)
+
+    if hasattr(o, 'len'):
+        return o.len
+
+    if hasattr(o, 'fileno'):
+        try:
+            fileno = o.fileno()
+        except io.UnsupportedOperation:
+            pass
+        else:
+            return os.fstat(fileno).st_size
+
+    if hasattr(o, 'getvalue'):
+        # e.g. BytesIO, cStringIO.StringIO
+        return len(o.getvalue())
+
+
 def get_netrc_auth(url):
     """Returns the Requests tuple auth for a given url from netrc."""
 
     try:
-        locations = (os.path.expanduser('~/{0}'.format(f)) for f in NETRC_FILES)
+        from netrc import netrc, NetrcParseError
+
         netrc_path = None
 
-        for loc in locations:
-            if os.path.exists(loc) and not netrc_path:
+        for f in NETRC_FILES:
+            try:
+                loc = os.path.expanduser('~/{0}'.format(f))
+            except KeyError:
+                # os.path.expanduser can fail when $HOME is undefined and
+                # getpwuid fails. See http://bugs.python.org/issue20164 &
+                # https://github.com/kennethreitz/requests/issues/1846
+                return
+
+            if os.path.exists(loc):
                 netrc_path = loc
+                break
 
         # Abort early if there isn't one.
         if netrc_path is None:
-            return netrc_path
+            return
 
         ri = urlparse(url)
 
@@ -110,8 +115,8 @@ def get_netrc_auth(url):
 def guess_filename(obj):
     """Tries to guess the filename of the given object."""
     name = getattr(obj, 'name', None)
-    if name and name[0] != '<' and name[-1] != '>':
-        return name
+    if name and isinstance(name, builtin_str) and name[0] != '<' and name[-1] != '>':
+        return os.path.basename(name)
 
 
 def from_key_val_list(value):
@@ -156,7 +161,7 @@ def to_key_val_list(value):
     if isinstance(value, (str, bytes, bool, int)):
         raise ValueError('cannot encode objects that are not 2-tuples')
 
-    if isinstance(value, dict):
+    if isinstance(value, collections.Mapping):
         value = value.items()
 
     return list(value)
@@ -252,57 +257,6 @@ def unquote_header_value(value, is_filename=False):
     return value
 
 
-def header_expand(headers):
-    """Returns an HTTP Header value string from a dictionary.
-
-    Example expansion::
-
-        {'text/x-dvi': {'q': '.8', 'mxb': '100000', 'mxt': '5.0'}, 'text/x-c': {}}
-        # Accept: text/x-dvi; q=.8; mxb=100000; mxt=5.0, text/x-c
-
-        (('text/x-dvi', {'q': '.8', 'mxb': '100000', 'mxt': '5.0'}), ('text/x-c', {}))
-        # Accept: text/x-dvi; q=.8; mxb=100000; mxt=5.0, text/x-c
-    """
-
-    collector = []
-
-    if isinstance(headers, dict):
-        headers = list(headers.items())
-    elif isinstance(headers, basestring):
-        return headers
-    elif isinstance(headers, str):
-        # As discussed in https://github.com/kennethreitz/requests/issues/400
-        # latin-1 is the most conservative encoding used on the web. Anyone
-        # who needs more can encode to a byte-string before calling
-        return headers.encode("latin-1")
-    elif headers is None:
-        return headers
-
-    for i, (value, params) in enumerate(headers):
-
-        _params = []
-
-        for (p_k, p_v) in list(params.items()):
-
-            _params.append('%s=%s' % (p_k, p_v))
-
-        collector.append(value)
-        collector.append('; ')
-
-        if len(params):
-
-            collector.append('; '.join(_params))
-
-            if not len(headers) == i + 1:
-                collector.append(', ')
-
-    # Remove trailing separators.
-    if collector[-1] in (', ', '; '):
-        del collector[-1]
-
-    return ''.join(collector)
-
-
 def dict_from_cookiejar(cj):
     """Returns a key/value dictionary from a CookieJar.
 
@@ -325,8 +279,7 @@ def add_dict_to_cookiejar(cj, cookie_dict):
     """
 
     cj2 = cookiejar_from_dict(cookie_dict)
-    for cookie in cj2:
-        cj.set_cookie(cookie)
+    cj.update(cj2)
     return cj
 
 
@@ -335,10 +288,19 @@ def get_encodings_from_content(content):
 
     :param content: bytestring to extract encodings from.
     """
+    warnings.warn((
+        'In requests 3.0, get_encodings_from_content will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
 
     charset_re = re.compile(r'<meta.*?charset=["\']*(.+?)["\'>]', flags=re.I)
+    pragma_re = re.compile(r'<meta.*?content=["\']*;?charset=(.+?)["\'>]', flags=re.I)
+    xml_re = re.compile(r'^<\?xml.*?encoding=["\']*(.+?)["\'>]')
 
-    return charset_re.findall(content)
+    return (charset_re.findall(content) +
+            pragma_re.findall(content) +
+            xml_re.findall(content))
 
 
 def get_encoding_from_headers(headers):
@@ -374,7 +336,7 @@ def stream_decode_response_unicode(iterator, r):
         rv = decoder.decode(chunk)
         if rv:
             yield rv
-    rv = decoder.decode('', final=True)
+    rv = decoder.decode(b'', final=True)
     if rv:
         yield rv
 
@@ -395,12 +357,14 @@ def get_unicode_from_response(r):
     Tried:
 
     1. charset from content-type
-
-    2. every encodings from ``<meta ... charset=XXX>``
-
-    3. fall back and replace all unicode characters
+    2. fall back and replace all unicode characters
 
     """
+    warnings.warn((
+        'In requests 3.0, get_unicode_from_response will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
 
     tried_encodings = []
 
@@ -420,49 +384,6 @@ def get_unicode_from_response(r):
         return r.content
 
 
-def stream_decompress(iterator, mode='gzip'):
-    """
-    Stream decodes an iterator over compressed data
-
-    :param iterator: An iterator over compressed data
-    :param mode: 'gzip' or 'deflate'
-    :return: An iterator over decompressed data
-    """
-
-    if mode not in ['gzip', 'deflate']:
-        raise ValueError('stream_decompress mode must be gzip or deflate')
-
-    zlib_mode = 16 + zlib.MAX_WBITS if mode == 'gzip' else -zlib.MAX_WBITS
-    dec = zlib.decompressobj(zlib_mode)
-    try:
-        for chunk in iterator:
-            rv = dec.decompress(chunk)
-            if rv:
-                yield rv
-    except zlib.error:
-        # If there was an error decompressing, just return the raw chunk
-        yield chunk
-        # Continue to return the rest of the raw data
-        for chunk in iterator:
-            yield chunk
-    else:
-        # Make sure everything has been returned from the decompression object
-        buf = dec.decompress(bytes())
-        rv = buf + dec.flush()
-        if rv:
-            yield rv
-
-
-def stream_untransfer(gen, resp):
-    ce = resp.headers.get('content-encoding', '').lower()
-    if 'gzip' in ce:
-        gen = stream_decompress(gen, mode='gzip')
-    elif 'deflate' in ce:
-        gen = stream_decompress(gen, mode='deflate')
-
-    return gen
-
-
 # The unreserved URI characters (RFC 3986)
 UNRESERVED_SET = frozenset(
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
@@ -473,21 +394,22 @@ def unquote_unreserved(uri):
     """Un-escape any percent-escape sequences in a URI that are unreserved
     characters. This leaves all reserved, illegal and non-ASCII bytes encoded.
     """
-    try:
-        parts = uri.split('%')
-        for i in range(1, len(parts)):
-            h = parts[i][0:2]
-            if len(h) == 2 and h.isalnum():
+    parts = uri.split('%')
+    for i in range(1, len(parts)):
+        h = parts[i][0:2]
+        if len(h) == 2 and h.isalnum():
+            try:
                 c = chr(int(h, 16))
-                if c in UNRESERVED_SET:
-                    parts[i] = c + parts[i][2:]
-                else:
-                    parts[i] = '%' + parts[i]
+            except ValueError:
+                raise InvalidURL("Invalid percent-escape sequence: '%s'" % h)
+
+            if c in UNRESERVED_SET:
+                parts[i] = c + parts[i][2:]
             else:
                 parts[i] = '%' + parts[i]
-        return ''.join(parts)
-    except ValueError:
-        return uri
+        else:
+            parts[i] = '%' + parts[i]
+    return ''.join(parts)
 
 
 def requote_uri(uri):
@@ -502,35 +424,119 @@ def requote_uri(uri):
     return quote(unquote_unreserved(uri), safe="!#$%&'()*+,/:;=?@[]~")
 
 
-def get_environ_proxies():
-    """Return a dict of environment proxies."""
+def address_in_network(ip, net):
+    """
+    This function allows you to check if on IP belongs to a network subnet
+    Example: returns True if ip = 192.168.1.1 and net = 192.168.1.0/24
+             returns False if ip = 192.168.1.1 and net = 192.168.100.0/24
+    """
+    ipaddr = struct.unpack('=L', socket.inet_aton(ip))[0]
+    netaddr, bits = net.split('/')
+    netmask = struct.unpack('=L', socket.inet_aton(dotted_netmask(int(bits))))[0]
+    network = struct.unpack('=L', socket.inet_aton(netaddr))[0] & netmask
+    return (ipaddr & netmask) == (network & netmask)
+
+
+def dotted_netmask(mask):
+    """
+    Converts mask from /xx format to xxx.xxx.xxx.xxx
+    Example: if mask is 24 function returns 255.255.255.0
+    """
+    bits = 0xffffffff ^ (1 << 32 - mask) - 1
+    return socket.inet_ntoa(struct.pack('>I', bits))
+
+
+def is_ipv4_address(string_ip):
+    try:
+        socket.inet_aton(string_ip)
+    except socket.error:
+        return False
+    return True
+
+
+def is_valid_cidr(string_network):
+    """Very simple check of the cidr format in no_proxy variable"""
+    if string_network.count('/') == 1:
+        try:
+            mask = int(string_network.split('/')[1])
+        except ValueError:
+            return False
+
+        if mask < 1 or mask > 32:
+            return False
 
-    proxy_keys = [
-        'all',
-        'http',
-        'https',
-        'ftp',
-        'socks',
-        'no'
-    ]
+        try:
+            socket.inet_aton(string_network.split('/')[0])
+        except socket.error:
+            return False
+    else:
+        return False
+    return True
 
+
+def should_bypass_proxies(url):
+    """
+    Returns whether we should bypass proxies or not.
+    """
     get_proxy = lambda k: os.environ.get(k) or os.environ.get(k.upper())
-    proxies = [(key, get_proxy(key + '_proxy')) for key in proxy_keys]
-    return dict([(key, val) for (key, val) in proxies if val])
 
+    # First check whether no_proxy is defined. If it is, check that the URL
+    # we're getting isn't in the no_proxy list.
+    no_proxy = get_proxy('no_proxy')
+    netloc = urlparse(url).netloc
+
+    if no_proxy:
+        # We need to check whether we match here. We need to see if we match
+        # the end of the netloc, both with and without the port.
+        no_proxy = no_proxy.replace(' ', '').split(',')
+
+        ip = netloc.split(':')[0]
+        if is_ipv4_address(ip):
+            for proxy_ip in no_proxy:
+                if is_valid_cidr(proxy_ip):
+                    if address_in_network(ip, proxy_ip):
+                        return True
+        else:
+            for host in no_proxy:
+                if netloc.endswith(host) or netloc.split(':')[0].endswith(host):
+                    # The URL does match something in no_proxy, so we don't want
+                    # to apply the proxies on this URL.
+                    return True
+
+    # If the system proxy settings indicate that this URL should be bypassed,
+    # don't proxy.
+    # The proxy_bypass function is incredibly buggy on OS X in early versions
+    # of Python 2.6, so allow this call to fail. Only catch the specific
+    # exceptions we've seen, though: this call failing in other ways can reveal
+    # legitimate problems.
+    try:
+        bypass = proxy_bypass(netloc)
+    except (TypeError, socket.gaierror):
+        bypass = False
+
+    if bypass:
+        return True
 
-def default_user_agent():
+    return False
+
+def get_environ_proxies(url):
+    """Return a dict of environment proxies."""
+    if should_bypass_proxies(url):
+        return {}
+    else:
+        return getproxies()
+
+
+def default_user_agent(name="python-requests"):
     """Return a string representing the default user agent."""
     _implementation = platform.python_implementation()
 
     if _implementation == 'CPython':
         _implementation_version = platform.python_version()
     elif _implementation == 'PyPy':
-        _implementation_version = '%s.%s.%s' % (
-                                                sys.pypy_version_info.major,
+        _implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major,
                                                 sys.pypy_version_info.minor,
-                                                sys.pypy_version_info.micro
-                                            )
+                                                sys.pypy_version_info.micro)
         if sys.pypy_version_info.releaselevel != 'final':
             _implementation_version = ''.join([_implementation_version, sys.pypy_version_info.releaselevel])
     elif _implementation == 'Jython':
@@ -540,11 +546,25 @@ def default_user_agent():
     else:
         _implementation_version = 'Unknown'
 
-    return " ".join([
-            'python-requests/%s' % __version__,
-            '%s/%s' % (_implementation, _implementation_version),
-            '%s/%s' % (platform.system(), platform.release()),
-        ])
+    try:
+        p_system = platform.system()
+        p_release = platform.release()
+    except IOError:
+        p_system = 'Unknown'
+        p_release = 'Unknown'
+
+    return " ".join(['%s/%s' % (name, __version__),
+                     '%s/%s' % (_implementation, _implementation_version),
+                     '%s/%s' % (p_system, p_release)])
+
+
+def default_headers():
+    return CaseInsensitiveDict({
+        'User-Agent': default_user_agent(),
+        'Accept-Encoding': ', '.join(('gzip', 'deflate')),
+        'Accept': '*/*',
+        'Connection': 'keep-alive',
+    })
 
 
 def parse_header_links(value):
@@ -558,7 +578,7 @@ def parse_header_links(value):
 
     replace_chars = " '\""
 
-    for val in value.split(","):
+    for val in re.split(", *<", value):
         try:
             url, params = val.split(";", 1)
         except ValueError:
@@ -570,7 +590,7 @@ def parse_header_links(value):
 
         for param in params.split(";"):
             try:
-                key,value = param.split("=")
+                key, value = param.split("=")
             except ValueError:
                 break
 
@@ -614,3 +634,64 @@ def guess_json_utf(data):
             return 'utf-32-le'
         # Did not detect a valid UTF-32 ascii-range character
     return None
+
+
+def prepend_scheme_if_needed(url, new_scheme):
+    '''Given a URL that may or may not have a scheme, prepend the given scheme.
+    Does not replace a present scheme with the one provided as an argument.'''
+    scheme, netloc, path, params, query, fragment = urlparse(url, new_scheme)
+
+    # urlparse is a finicky beast, and sometimes decides that there isn't a
+    # netloc present. Assume that it's being over-cautious, and switch netloc
+    # and path if urlparse decided there was no netloc.
+    if not netloc:
+        netloc, path = path, netloc
+
+    return urlunparse((scheme, netloc, path, params, query, fragment))
+
+
+def get_auth_from_url(url):
+    """Given a url with authentication components, extract them into a tuple of
+    username,password."""
+    parsed = urlparse(url)
+
+    try:
+        auth = (unquote(parsed.username), unquote(parsed.password))
+    except (AttributeError, TypeError):
+        auth = ('', '')
+
+    return auth
+
+
+def to_native_string(string, encoding='ascii'):
+    """
+    Given a string object, regardless of type, returns a representation of that
+    string in the native string type, encoding and decoding where necessary.
+    This assumes ASCII unless told otherwise.
+    """
+    out = None
+
+    if isinstance(string, builtin_str):
+        out = string
+    else:
+        if is_py2:
+            out = string.encode(encoding)
+        else:
+            out = string.decode(encoding)
+
+    return out
+
+
+def urldefragauth(url):
+    """
+    Given a url remove the fragment and the authentication part
+    """
+    scheme, netloc, path, params, query, fragment = urlparse(url)
+
+    # see func:`prepend_scheme_if_needed`
+    if not netloc:
+        netloc, path = path, netloc
+
+    netloc = netloc.rsplit('@', 1)[-1]
+
+    return urlunparse((scheme, netloc, path, params, query, ''))
diff --git a/lib/requests/utils.pyc b/lib/requests/utils.pyc
index c7ea8a7..afe5387 100644
Binary files a/lib/requests/utils.pyc and b/lib/requests/utils.pyc differ
diff --git a/lib/requests_oauthlib/__init__.py b/lib/requests_oauthlib/__init__.py
new file mode 100644
index 0000000..e473591
--- /dev/null
+++ b/lib/requests_oauthlib/__init__.py
@@ -0,0 +1,41 @@
+"""
+Copyright (c) 2014 Kenneth Reitz.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+"""
+
+
+
+
+from .oauth1_auth import OAuth1
+from .oauth1_session import OAuth1Session
+from .oauth2_auth import OAuth2
+from .oauth2_session import OAuth2Session, TokenUpdated
+
+__version__ = '0.4.2'
+
+import requests
+if requests.__version__ < '2.0.0':
+    msg = ('You are using requests version %s, which is older than '
+           'requests-oauthlib expects, please upgrade to 2.0.0 or later.')
+    raise Warning(msg % requests.__version__)
+
+import logging
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+   class NullHandler(logging.Handler):
+       def emit(self, record):
+           pass
+
+logging.getLogger('requests_oauthlib').addHandler(NullHandler())
diff --git a/lib/requests_oauthlib/compliance_fixes/__init__.py b/lib/requests_oauthlib/compliance_fixes/__init__.py
new file mode 100644
index 0000000..30cdd10
--- /dev/null
+++ b/lib/requests_oauthlib/compliance_fixes/__init__.py
@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+
+from .facebook import facebook_compliance_fix
+from .linkedin import linkedin_compliance_fix
+from .weibo import weibo_compliance_fix
diff --git a/lib/requests_oauthlib/compliance_fixes/douban.py b/lib/requests_oauthlib/compliance_fixes/douban.py
new file mode 100644
index 0000000..2e45b3b
--- /dev/null
+++ b/lib/requests_oauthlib/compliance_fixes/douban.py
@@ -0,0 +1,18 @@
+import json
+
+from oauthlib.common import to_unicode
+
+
+def douban_compliance_fix(session):
+
+    def fix_token_type(r):
+        token = json.loads(r.text)
+        token.setdefault('token_type', 'Bearer')
+        fixed_token = json.dumps(token)
+        r._content = to_unicode(fixed_token).encode('utf-8')
+        return r
+
+    session._client_default_token_placement = 'query'
+    session.register_compliance_hook('access_token_response', fix_token_type)
+
+    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/facebook.py b/lib/requests_oauthlib/compliance_fixes/facebook.py
new file mode 100644
index 0000000..07181c3
--- /dev/null
+++ b/lib/requests_oauthlib/compliance_fixes/facebook.py
@@ -0,0 +1,33 @@
+from json import dumps
+try:
+    from urlparse import parse_qsl
+except ImportError:
+    from urllib.parse import parse_qsl
+
+from oauthlib.common import to_unicode
+
+
+def facebook_compliance_fix(session):
+
+    def _compliance_fix(r):
+        # if Facebook claims to be sending us json, let's trust them.
+        if 'application/json' in r.headers.get('content-type', {}):
+            return r
+
+        # Facebook returns a content-type of text/plain when sending their
+        # x-www-form-urlencoded responses, along with a 200. If not, let's
+        # assume we're getting JSON and bail on the fix.
+        if 'text/plain' in r.headers.get('content-type', {}) and r.status_code == 200:
+            token = dict(parse_qsl(r.text, keep_blank_values=True))
+        else:
+            return r
+
+        expires = token.get('expires')
+        if expires is not None:
+            token['expires_in'] = expires
+        token['token_type'] = 'Bearer'
+        r._content = to_unicode(dumps(token)).encode('UTF-8')
+        return r
+
+    session.register_compliance_hook('access_token_response', _compliance_fix)
+    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/linkedin.py b/lib/requests_oauthlib/compliance_fixes/linkedin.py
new file mode 100644
index 0000000..c6e4d68
--- /dev/null
+++ b/lib/requests_oauthlib/compliance_fixes/linkedin.py
@@ -0,0 +1,24 @@
+from json import loads, dumps
+
+from oauthlib.common import add_params_to_uri, to_unicode
+
+
+def linkedin_compliance_fix(session):
+
+    def _missing_token_type(r):
+        token = loads(r.text)
+        token['token_type'] = 'Bearer'
+        r._content = to_unicode(dumps(token)).encode('UTF-8')
+        return r
+
+    def _non_compliant_param_name(url, headers, data):
+        token = [('oauth2_access_token', session._client.access_token)]
+        url = add_params_to_uri(url, token)
+        return url, headers, data
+
+    session._client.default_token_placement = 'query'
+    session.register_compliance_hook('access_token_response',
+                                     _missing_token_type)
+    session.register_compliance_hook('protected_request',
+                                     _non_compliant_param_name)
+    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/weibo.py b/lib/requests_oauthlib/compliance_fixes/weibo.py
new file mode 100644
index 0000000..28aca32
--- /dev/null
+++ b/lib/requests_oauthlib/compliance_fixes/weibo.py
@@ -0,0 +1,17 @@
+from json import loads, dumps
+
+from oauthlib.common import to_unicode
+
+
+def weibo_compliance_fix(session):
+
+    def _missing_token_type(r):
+        token = loads(r.text)
+        token['token_type'] = 'Bearer'
+        r._content = to_unicode(dumps(token)).encode('UTF-8')
+        return r
+
+    session._client.default_token_placement = 'query'
+    session.register_compliance_hook('access_token_response',
+                                     _missing_token_type)
+    return session
diff --git a/lib/requests_oauthlib/oauth1_auth.py b/lib/requests_oauthlib/oauth1_auth.py
new file mode 100644
index 0000000..303ecd2
--- /dev/null
+++ b/lib/requests_oauthlib/oauth1_auth.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import logging
+
+from oauthlib.common import extract_params
+from oauthlib.oauth1 import Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER
+from oauthlib.oauth1 import SIGNATURE_TYPE_BODY
+from requests.compat import is_py3
+from requests.utils import to_native_string
+
+CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
+CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
+
+if is_py3:
+    unicode = str
+
+log = logging.getLogger(__name__)
+
+# OBS!: Correct signing of requests are conditional on invoking OAuth1
+# as the last step of preparing a request, or at least having the
+# content-type set properly.
+class OAuth1(object):
+    """Signs the request using OAuth 1 (RFC5849)"""
+
+    client_class = Client
+
+    def __init__(self, client_key,
+            client_secret=None,
+            resource_owner_key=None,
+            resource_owner_secret=None,
+            callback_uri=None,
+            signature_method=SIGNATURE_HMAC,
+            signature_type=SIGNATURE_TYPE_AUTH_HEADER,
+            rsa_key=None, verifier=None,
+            decoding='utf-8',
+            client_class=None,
+            force_include_body=False,
+            **kwargs):
+
+        try:
+            signature_type = signature_type.upper()
+        except AttributeError:
+            pass
+
+        client_class = client_class or self.client_class
+
+        self.force_include_body = force_include_body
+
+        self.client = client_class(client_key, client_secret, resource_owner_key,
+            resource_owner_secret, callback_uri, signature_method,
+            signature_type, rsa_key, verifier, decoding=decoding, **kwargs)
+
+    def __call__(self, r):
+        """Add OAuth parameters to the request.
+
+        Parameters may be included from the body if the content-type is
+        urlencoded, if no content type is set a guess is made.
+        """
+        # Overwriting url is safe here as request will not modify it past
+        # this point.
+        log.debug('Signing request %s using client %s', r, self.client)
+
+        content_type = r.headers.get('Content-Type', '')
+        if (not content_type and extract_params(r.body)
+                or self.client.signature_type == SIGNATURE_TYPE_BODY):
+            content_type = CONTENT_TYPE_FORM_URLENCODED
+        if not isinstance(content_type, unicode):
+            content_type = content_type.decode('utf-8')
+
+        is_form_encoded = (CONTENT_TYPE_FORM_URLENCODED in content_type)
+
+        log.debug('Including body in call to sign: %s',
+                  is_form_encoded or self.force_include_body)
+
+        if is_form_encoded:
+            r.headers['Content-Type'] = CONTENT_TYPE_FORM_URLENCODED
+            r.url, headers, r.body = self.client.sign(
+                unicode(r.url), unicode(r.method), r.body or '', r.headers)
+        elif self.force_include_body:
+            # To allow custom clients to work on non form encoded bodies.
+            r.url, headers, r.body = self.client.sign(
+                unicode(r.url), unicode(r.method), r.body or '', r.headers)
+        else:
+            # Omit body data in the signing of non form-encoded requests
+            r.url, headers, _ = self.client.sign(
+                unicode(r.url), unicode(r.method), None, r.headers)
+
+        r.prepare_headers(headers)
+        r.url = to_native_string(r.url)
+        log.debug('Updated url: %s', r.url)
+        log.debug('Updated headers: %s', headers)
+        log.debug('Updated body: %r', r.body)
+        return r
diff --git a/lib/requests_oauthlib/oauth1_session.py b/lib/requests_oauthlib/oauth1_session.py
new file mode 100644
index 0000000..ffb84fd
--- /dev/null
+++ b/lib/requests_oauthlib/oauth1_session.py
@@ -0,0 +1,371 @@
+from __future__ import unicode_literals
+
+try:
+    from urlparse import urlparse
+except ImportError:
+    from urllib.parse import urlparse
+
+import logging
+
+from oauthlib.common import add_params_to_uri
+from oauthlib.common import urldecode as _urldecode
+from oauthlib.oauth1 import (
+    SIGNATURE_HMAC, SIGNATURE_RSA, SIGNATURE_TYPE_AUTH_HEADER
+)
+import requests
+
+from . import OAuth1
+
+import sys
+if sys.version > "3":
+    unicode = str
+
+
+log = logging.getLogger(__name__)
+
+
+def urldecode(body):
+    """Parse query or json to python dictionary"""
+    try:
+        return _urldecode(body)
+    except:
+        import json
+        return json.loads(body)
+
+
+class TokenRequestDenied(ValueError):
+
+    def __init__(self, message, status_code):
+        super(TokenRequestDenied, self).__init__(message)
+        self.status_code = status_code
+
+
+class TokenMissing(ValueError):
+    def __init__(self, message, response):
+        super(TokenMissing, self).__init__(message)
+        self.response = response
+
+
+class VerifierMissing(ValueError):
+    pass
+
+
+class OAuth1Session(requests.Session):
+    """Request signing and convenience methods for the oauth dance.
+
+    What is the difference between OAuth1Session and OAuth1?
+
+    OAuth1Session actually uses OAuth1 internally and it's purpose is to assist
+    in the OAuth workflow through convenience methods to prepare authorization
+    URLs and parse the various token and redirection responses. It also provide
+    rudimentary validation of responses.
+
+    An example of the OAuth workflow using a basic CLI app and Twitter.
+
+    >>> # Credentials obtained during the registration.
+    >>> client_key = 'client key'
+    >>> client_secret = 'secret'
+    >>> callback_uri = 'https://127.0.0.1/callback'
+    >>>
+    >>> # Endpoints found in the OAuth provider API documentation
+    >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
+    >>> authorization_url = 'https://api.twitter.com/oauth/authorize'
+    >>> access_token_url = 'https://api.twitter.com/oauth/access_token'
+    >>>
+    >>> oauth_session = OAuth1Session(client_key,client_secret=client_secret, callback_uri=callback_uri)
+    >>>
+    >>> # First step, fetch the request token.
+    >>> oauth_session.fetch_request_token(request_token_url)
+    {
+        'oauth_token': 'kjerht2309u',
+        'oauth_token_secret': 'lsdajfh923874',
+    }
+    >>>
+    >>> # Second step. Follow this link and authorize
+    >>> oauth_session.authorization_url(authorization_url)
+    'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&oauth_callback=https%3A%2F%2F127.0.0.1%2Fcallback'
+    >>>
+    >>> # Third step. Fetch the access token
+    >>> redirect_response = raw_input('Paste the full redirect URL here.')
+    >>> oauth_session.parse_authorization_response(redirect_response)
+    {
+        'oauth_token: 'kjerht2309u',
+        'oauth_token_secret: 'lsdajfh923874',
+        'oauth_verifier: 'w34o8967345',
+    }
+    >>> oauth_session.fetch_access_token(access_token_url)
+    {
+        'oauth_token': 'sdf0o9823sjdfsdf',
+        'oauth_token_secret': '2kjshdfp92i34asdasd',
+    }
+    >>> # Done. You can now make OAuth requests.
+    >>> status_url = 'http://api.twitter.com/1/statuses/update.json'
+    >>> new_status = {'status':  'hello world!'}
+    >>> oauth_session.post(status_url, data=new_status)
+    <Response [200]>
+    """
+
+    def __init__(self, client_key,
+            client_secret=None,
+            resource_owner_key=None,
+            resource_owner_secret=None,
+            callback_uri=None,
+            signature_method=SIGNATURE_HMAC,
+            signature_type=SIGNATURE_TYPE_AUTH_HEADER,
+            rsa_key=None,
+            verifier=None,
+            client_class=None,
+            force_include_body=False,
+            **kwargs):
+        """Construct the OAuth 1 session.
+
+        :param client_key: A client specific identifier.
+        :param client_secret: A client specific secret used to create HMAC and
+                              plaintext signatures.
+        :param resource_owner_key: A resource owner key, also referred to as
+                                   request token or access token depending on
+                                   when in the workflow it is used.
+        :param resource_owner_secret: A resource owner secret obtained with
+                                      either a request or access token. Often
+                                      referred to as token secret.
+        :param callback_uri: The URL the user is redirect back to after
+                             authorization.
+        :param signature_method: Signature methods determine how the OAuth
+                                 signature is created. The three options are
+                                 oauthlib.oauth1.SIGNATURE_HMAC (default),
+                                 oauthlib.oauth1.SIGNATURE_RSA and
+                                 oauthlib.oauth1.SIGNATURE_PLAIN.
+        :param signature_type: Signature type decides where the OAuth
+                               parameters are added. Either in the
+                               Authorization header (default) or to the URL
+                               query parameters or the request body. Defined as
+                               oauthlib.oauth1.SIGNATURE_TYPE_AUTH_HEADER,
+                               oauthlib.oauth1.SIGNATURE_TYPE_QUERY and
+                               oauthlib.oauth1.SIGNATURE_TYPE_BODY
+                               respectively.
+        :param rsa_key: The private RSA key as a string. Can only be used with
+                        signature_method=oauthlib.oauth1.SIGNATURE_RSA.
+        :param verifier: A verifier string to prove authorization was granted.
+        :param client_class: A subclass of `oauthlib.oauth1.Client` to use with
+                             `requests_oauthlib.OAuth1` instead of the default
+        :param force_include_body: Always include the request body in the
+                                   signature creation.
+        :param **kwargs: Additional keyword arguments passed to `OAuth1`
+        """
+        super(OAuth1Session, self).__init__()
+        self._client = OAuth1(client_key,
+                client_secret=client_secret,
+                resource_owner_key=resource_owner_key,
+                resource_owner_secret=resource_owner_secret,
+                callback_uri=callback_uri,
+                signature_method=signature_method,
+                signature_type=signature_type,
+                rsa_key=rsa_key,
+                verifier=verifier,
+                client_class=client_class,
+                force_include_body=force_include_body,
+                **kwargs)
+        self.auth = self._client
+
+    @property
+    def authorized(self):
+        """Boolean that indicates whether this session has an OAuth token
+        or not. If `self.authorized` is True, you can reasonably expect
+        OAuth-protected requests to the resource to succeed. If
+        `self.authorized` is False, you need the user to go through the OAuth
+        authentication dance before OAuth-protected requests to the resource
+        will succeed.
+        """
+        if self._client.client.signature_method == SIGNATURE_RSA:
+            # RSA only uses resource_owner_key
+            return bool(self._client.client.resource_owner_key)
+        else:
+            # other methods of authentication use all three pieces
+            return (
+                bool(self._client.client.client_secret) and
+                bool(self._client.client.resource_owner_key) and
+                bool(self._client.client.resource_owner_secret)
+            )
+
+    def authorization_url(self, url, request_token=None, **kwargs):
+        """Create an authorization URL by appending request_token and optional
+        kwargs to url.
+
+        This is the second step in the OAuth 1 workflow. The user should be
+        redirected to this authorization URL, grant access to you, and then
+        be redirected back to you. The redirection back can either be specified
+        during client registration or by supplying a callback URI per request.
+
+        :param url: The authorization endpoint URL.
+        :param request_token: The previously obtained request token.
+        :param kwargs: Optional parameters to append to the URL.
+        :returns: The authorization URL with new parameters embedded.
+
+        An example using a registered default callback URI.
+
+        >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
+        >>> authorization_url = 'https://api.twitter.com/oauth/authorize'
+        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
+        >>> oauth_session.fetch_request_token(request_token_url)
+        {
+            'oauth_token': 'sdf0o9823sjdfsdf',
+            'oauth_token_secret': '2kjshdfp92i34asdasd',
+        }
+        >>> oauth_session.authorization_url(authorization_url)
+        'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf'
+        >>> oauth_session.authorization_url(authorization_url, foo='bar')
+        'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&foo=bar'
+
+        An example using an explicit callback URI.
+
+        >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
+        >>> authorization_url = 'https://api.twitter.com/oauth/authorize'
+        >>> oauth_session = OAuth1Session('client-key', client_secret='secret', callback_uri='https://127.0.0.1/callback')
+        >>> oauth_session.fetch_request_token(request_token_url)
+        {
+            'oauth_token': 'sdf0o9823sjdfsdf',
+            'oauth_token_secret': '2kjshdfp92i34asdasd',
+        }
+        >>> oauth_session.authorization_url(authorization_url)
+        'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&oauth_callback=https%3A%2F%2F127.0.0.1%2Fcallback'
+        """
+        kwargs['oauth_token'] = request_token or self._client.client.resource_owner_key
+        log.debug('Adding parameters %s to url %s', kwargs, url)
+        return add_params_to_uri(url, kwargs.items())
+
+    def fetch_request_token(self, url, realm=None):
+        """Fetch a request token.
+
+        This is the first step in the OAuth 1 workflow. A request token is
+        obtained by making a signed post request to url. The token is then
+        parsed from the application/x-www-form-urlencoded response and ready
+        to be used to construct an authorization url.
+
+        :param url: The request token endpoint URL.
+        :param realm: A list of realms to request access to.
+        :returns: The response in dict format.
+
+        Note that a previously set callback_uri will be reset for your
+        convenience, or else signature creation will be incorrect on
+        consecutive requests.
+
+        >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
+        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
+        >>> oauth_session.fetch_request_token(request_token_url)
+        {
+            'oauth_token': 'sdf0o9823sjdfsdf',
+            'oauth_token_secret': '2kjshdfp92i34asdasd',
+        }
+        """
+        self._client.client.realm = ' '.join(realm) if realm else None
+        token = self._fetch_token(url)
+        log.debug('Resetting callback_uri and realm (not needed in next phase).')
+        self._client.client.callback_uri = None
+        self._client.client.realm = None
+        return token
+
+    def fetch_access_token(self, url, verifier=None):
+        """Fetch an access token.
+
+        This is the final step in the OAuth 1 workflow. An access token is
+        obtained using all previously obtained credentials, including the
+        verifier from the authorization step.
+
+        Note that a previously set verifier will be reset for your
+        convenience, or else signature creation will be incorrect on
+        consecutive requests.
+
+        >>> access_token_url = 'https://api.twitter.com/oauth/access_token'
+        >>> redirect_response = 'https://127.0.0.1/callback?oauth_token=kjerht2309uf&oauth_token_secret=lsdajfh923874&oauth_verifier=w34o8967345'
+        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
+        >>> oauth_session.parse_authorization_response(redirect_response)
+        {
+            'oauth_token: 'kjerht2309u',
+            'oauth_token_secret: 'lsdajfh923874',
+            'oauth_verifier: 'w34o8967345',
+        }
+        >>> oauth_session.fetch_access_token(access_token_url)
+        {
+            'oauth_token': 'sdf0o9823sjdfsdf',
+            'oauth_token_secret': '2kjshdfp92i34asdasd',
+        }
+        """
+        if verifier:
+            self._client.client.verifier = verifier
+        if not getattr(self._client.client, 'verifier', None):
+            raise VerifierMissing('No client verifier has been set.')
+        token = self._fetch_token(url)
+        log.debug('Resetting verifier attribute, should not be used anymore.')
+        self._client.client.verifier = None
+        return token
+
+    def parse_authorization_response(self, url):
+        """Extract parameters from the post authorization redirect response URL.
+
+        :param url: The full URL that resulted from the user being redirected
+                    back from the OAuth provider to you, the client.
+        :returns: A dict of parameters extracted from the URL.
+
+        >>> redirect_response = 'https://127.0.0.1/callback?oauth_token=kjerht2309uf&oauth_token_secret=lsdajfh923874&oauth_verifier=w34o8967345'
+        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
+        >>> oauth_session.parse_authorization_response(redirect_response)
+        {
+            'oauth_token: 'kjerht2309u',
+            'oauth_token_secret: 'lsdajfh923874',
+            'oauth_verifier: 'w34o8967345',
+        }
+        """
+        log.debug('Parsing token from query part of url %s', url)
+        token = dict(urldecode(urlparse(url).query))
+        log.debug('Updating internal client token attribute.')
+        self._populate_attributes(token)
+        return token
+
+    def _populate_attributes(self, token):
+        if 'oauth_token' in token:
+            self._client.client.resource_owner_key = token['oauth_token']
+        else:
+            raise TokenMissing(
+                'Response does not contain a token: {resp}'.format(resp=token),
+                token,
+            )
+        if 'oauth_token_secret' in token:
+            self._client.client.resource_owner_secret = (
+                token['oauth_token_secret'])
+        if 'oauth_verifier' in token:
+            self._client.client.verifier = token['oauth_verifier']
+
+    def _fetch_token(self, url):
+        log.debug('Fetching token from %s using client %s', url, self._client.client)
+        r = self.post(url)
+
+        if r.status_code >= 400:
+            error = "Token request failed with code %s, response was '%s'."
+            raise TokenRequestDenied(error % (r.status_code, r.text), r.status_code)
+
+        log.debug('Decoding token from response "%s"', r.text)
+        try:
+            token = dict(urldecode(r.text))
+        except ValueError as e:
+            error = ("Unable to decode token from token response. "
+                     "This is commonly caused by an unsuccessful request where"
+                     " a non urlencoded error message is returned. "
+                     "The decoding error was %s""" % e)
+            raise ValueError(error)
+
+        log.debug('Obtained token %s', token)
+        log.debug('Updating internal client attributes from token data.')
+        self._populate_attributes(token)
+        return token
+
+    def rebuild_auth(self, prepared_request, response):
+        """
+        When being redirected we should always strip Authorization
+        header, since nonce may not be reused as per OAuth spec.
+        """
+        if 'Authorization' in prepared_request.headers:
+            # If we get redirected to a new host, we should strip out
+            # any authentication headers.
+            prepared_request.headers.pop('Authorization', True)
+            prepared_request.prepare_auth(self.auth)
+        return
diff --git a/lib/requests_oauthlib/oauth2_auth.py b/lib/requests_oauthlib/oauth2_auth.py
new file mode 100644
index 0000000..42366e7
--- /dev/null
+++ b/lib/requests_oauthlib/oauth2_auth.py
@@ -0,0 +1,35 @@
+from __future__ import unicode_literals
+from oauthlib.oauth2 import WebApplicationClient, InsecureTransportError
+from oauthlib.oauth2 import is_secure_transport
+
+
+class OAuth2(object):
+    """Adds proof of authorization (OAuth2 token) to the request."""
+
+    def __init__(self, client_id=None, client=None, token=None):
+        """Construct a new OAuth 2 authorization object.
+
+        :param client_id: Client id obtained during registration
+        :param client: :class:`oauthlib.oauth2.Client` to be used. Default is
+                       WebApplicationClient which is useful for any
+                       hosted application but not mobile or desktop.
+        :param token: Token dictionary, must include access_token
+                      and token_type.
+        """
+        self._client = client or WebApplicationClient(client_id, token=token)
+        if token:
+            for k, v in token.items():
+                setattr(self._client, k, v)
+
+    def __call__(self, r):
+        """Append an OAuth 2 token to the request.
+
+        Note that currently HTTPS is required for all requests. There may be
+        a token type that allows for plain HTTP in the future and then this
+        should be updated to allow plain HTTP on a white list basis.
+        """
+        if not is_secure_transport(r.url):
+            raise InsecureTransportError()
+        r.url, r.headers, r.body = self._client.add_token(r.url,
+                http_method=r.method, body=r.body, headers=r.headers)
+        return r
diff --git a/lib/requests_oauthlib/oauth2_session.py b/lib/requests_oauthlib/oauth2_session.py
new file mode 100644
index 0000000..f2a1a43
--- /dev/null
+++ b/lib/requests_oauthlib/oauth2_session.py
@@ -0,0 +1,315 @@
+from __future__ import unicode_literals
+
+import logging
+
+from oauthlib.common import generate_token, urldecode
+from oauthlib.oauth2 import WebApplicationClient, InsecureTransportError
+from oauthlib.oauth2 import TokenExpiredError, is_secure_transport
+import requests
+
+log = logging.getLogger(__name__)
+
+
+class TokenUpdated(Warning):
+    def __init__(self, token):
+        super(TokenUpdated, self).__init__()
+        self.token = token
+
+
+class OAuth2Session(requests.Session):
+    """Versatile OAuth 2 extension to :class:`requests.Session`.
+
+    Supports any grant type adhering to :class:`oauthlib.oauth2.Client` spec
+    including the four core OAuth 2 grants.
+
+    Can be used to create authorization urls, fetch tokens and access protected
+    resources using the :class:`requests.Session` interface you are used to.
+
+    - :class:`oauthlib.oauth2.WebApplicationClient` (default): Authorization Code Grant
+    - :class:`oauthlib.oauth2.MobileApplicationClient`: Implicit Grant
+    - :class:`oauthlib.oauth2.LegacyApplicationClient`: Password Credentials Grant
+    - :class:`oauthlib.oauth2.BackendApplicationClient`: Client Credentials Grant
+
+    Note that the only time you will be using Implicit Grant from python is if
+    you are driving a user agent able to obtain URL fragments.
+    """
+
+    def __init__(self, client_id=None, client=None, auto_refresh_url=None,
+            auto_refresh_kwargs=None, scope=None, redirect_uri=None, token=None,
+            state=None, token_updater=None, **kwargs):
+        """Construct a new OAuth 2 client session.
+
+        :param client_id: Client id obtained during registration
+        :param client: :class:`oauthlib.oauth2.Client` to be used. Default is
+                       WebApplicationClient which is useful for any
+                       hosted application but not mobile or desktop.
+        :param scope: List of scopes you wish to request access to
+        :param redirect_uri: Redirect URI you registered as callback
+        :param token: Token dictionary, must include access_token
+                      and token_type.
+        :param state: State string used to prevent CSRF. This will be given
+                      when creating the authorization url and must be supplied
+                      when parsing the authorization response.
+                      Can be either a string or a no argument callable.
+        :auto_refresh_url: Refresh token endpoint URL, must be HTTPS. Supply
+                           this if you wish the client to automatically refresh
+                           your access tokens.
+        :auto_refresh_kwargs: Extra arguments to pass to the refresh token
+                              endpoint.
+        :token_updater: Method with one argument, token, to be used to update
+                        your token databse on automatic token refresh. If not
+                        set a TokenUpdated warning will be raised when a token
+                        has been refreshed. This warning will carry the token
+                        in its token argument.
+        :param kwargs: Arguments to pass to the Session constructor.
+        """
+        super(OAuth2Session, self).__init__(**kwargs)
+        self.client_id = client_id or client.client_id
+        self.scope = scope
+        self.redirect_uri = redirect_uri
+        self.token = token or {}
+        self.state = state or generate_token
+        self._state = state
+        self.auto_refresh_url = auto_refresh_url
+        self.auto_refresh_kwargs = auto_refresh_kwargs or {}
+        self.token_updater = token_updater
+        self._client = client or WebApplicationClient(client_id, token=token)
+        self._client._populate_attributes(token or {})
+
+        # Allow customizations for non compliant providers through various
+        # hooks to adjust requests and responses.
+        self.compliance_hook = {
+            'access_token_response': set([]),
+            'refresh_token_response': set([]),
+            'protected_request': set([]),
+        }
+
+    def new_state(self):
+        """Generates a state string to be used in authorizations."""
+        try:
+            self._state = self.state()
+            log.debug('Generated new state %s.', self._state)
+        except TypeError:
+            self._state = self.state
+            log.debug('Re-using previously supplied state %s.', self._state)
+        return self._state
+
+    @property
+    def authorized(self):
+        """Boolean that indicates whether this session has an OAuth token
+        or not. If `self.authorized` is True, you can reasonably expect
+        OAuth-protected requests to the resource to succeed. If
+        `self.authorized` is False, you need the user to go through the OAuth
+        authentication dance before OAuth-protected requests to the resource
+        will succeed.
+        """
+        return bool(self._client.access_token)
+
+    def authorization_url(self, url, state=None, **kwargs):
+        """Form an authorization URL.
+
+        :param url: Authorization endpoint url, must be HTTPS.
+        :param state: An optional state string for CSRF protection. If not
+                      given it will be generated for you.
+        :param kwargs: Extra parameters to include.
+        :return: authorization_url, state
+        """
+        state = state or self.new_state()
+        return self._client.prepare_request_uri(url,
+                redirect_uri=self.redirect_uri,
+                scope=self.scope,
+                state=state,
+                **kwargs), state
+
+    def fetch_token(self, token_url, code=None, authorization_response=None,
+            body='', auth=None, username=None, password=None, method='POST',
+            timeout=None, headers=None, verify=True, **kwargs):
+        """Generic method for fetching an access token from the token endpoint.
+
+        If you are using the MobileApplicationClient you will want to use
+        token_from_fragment instead of fetch_token.
+
+        :param token_url: Token endpoint URL, must use HTTPS.
+        :param code: Authorization code (used by WebApplicationClients).
+        :param authorization_response: Authorization response URL, the callback
+                                       URL of the request back to you. Used by
+                                       WebApplicationClients instead of code.
+        :param body: Optional application/x-www-form-urlencoded body to add the
+                     include in the token request. Prefer kwargs over body.
+        :param auth: An auth tuple or method as accepted by requests.
+        :param username: Username used by LegacyApplicationClients.
+        :param password: Password used by LegacyApplicationClients.
+        :param method: The HTTP method used to make the request. Defaults
+                       to POST, but may also be GET. Other methods should
+                       be added as needed.
+        :param headers: Dict to default request headers with.
+        :param timeout: Timeout of the request in seconds.
+        :param verify: Verify SSL certificate.
+        :param kwargs: Extra parameters to include in the token request.
+        :return: A token dict
+        """
+        if not is_secure_transport(token_url):
+            raise InsecureTransportError()
+
+        if not code and authorization_response:
+            self._client.parse_request_uri_response(authorization_response,
+                    state=self._state)
+            code = self._client.code
+        elif not code and isinstance(self._client, WebApplicationClient):
+            code = self._client.code
+            if not code:
+                raise ValueError('Please supply either code or '
+                                 'authorization_code parameters.')
+
+
+        body = self._client.prepare_request_body(code=code, body=body,
+                redirect_uri=self.redirect_uri, username=username,
+                password=password, **kwargs)
+
+        headers = headers or {
+            'Accept': 'application/json',
+            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+        }
+        if method.upper() == 'POST':
+            r = self.post(token_url, data=dict(urldecode(body)),
+                timeout=timeout, headers=headers, auth=auth,
+                verify=verify)
+            log.debug('Prepared fetch token request body %s', body)
+        elif method.upper() == 'GET':
+            # if method is not 'POST', switch body to querystring and GET
+            r = self.get(token_url, params=dict(urldecode(body)),
+                timeout=timeout, headers=headers, auth=auth,
+                verify=verify)
+            log.debug('Prepared fetch token request querystring %s', body)
+        else:
+            raise ValueError('The method kwarg must be POST or GET.')
+
+        log.debug('Request to fetch token completed with status %s.',
+                  r.status_code)
+        log.debug('Request headers were %s', r.request.headers)
+        log.debug('Request body was %s', r.request.body)
+        log.debug('Response headers were %s and content %s.',
+                  r.headers, r.text)
+        log.debug('Invoking %d token response hooks.',
+                  len(self.compliance_hook['access_token_response']))
+        for hook in self.compliance_hook['access_token_response']:
+            log.debug('Invoking hook %s.', hook)
+            r = hook(r)
+
+        self._client.parse_request_body_response(r.text, scope=self.scope)
+        self.token = self._client.token
+        log.debug('Obtained token %s.', self.token)
+        return self.token
+
+    def token_from_fragment(self, authorization_response):
+        """Parse token from the URI fragment, used by MobileApplicationClients.
+
+        :param authorization_response: The full URL of the redirect back to you
+        :return: A token dict
+        """
+        self._client.parse_request_uri_response(authorization_response,
+                state=self._state)
+        self.token = self._client.token
+        return self.token
+
+    def refresh_token(self, token_url, refresh_token=None, body='', auth=None,
+                      timeout=None, verify=True, **kwargs):
+        """Fetch a new access token using a refresh token.
+
+        :param token_url: The token endpoint, must be HTTPS.
+        :param refresh_token: The refresh_token to use.
+        :param body: Optional application/x-www-form-urlencoded body to add the
+                     include in the token request. Prefer kwargs over body.
+        :param auth: An auth tuple or method as accepted by requests.
+        :param timeout: Timeout of the request in seconds.
+        :param verify: Verify SSL certificate.
+        :param kwargs: Extra parameters to include in the token request.
+        :return: A token dict
+        """
+        if not token_url:
+            raise ValueError('No token endpoint set for auto_refresh.')
+
+        if not is_secure_transport(token_url):
+            raise InsecureTransportError()
+
+        # Need to nullify token to prevent it from being added to the request
+        refresh_token = refresh_token or self.token.get('refresh_token')
+        self.token = {}
+
+        log.debug('Adding auto refresh key word arguments %s.',
+                  self.auto_refresh_kwargs)
+        kwargs.update(self.auto_refresh_kwargs)
+        body = self._client.prepare_refresh_body(body=body,
+                refresh_token=refresh_token, scope=self.scope, **kwargs)
+        log.debug('Prepared refresh token request body %s', body)
+        r = self.post(token_url, data=dict(urldecode(body)), auth=auth,
+                      timeout=timeout, verify=verify)
+        log.debug('Request to refresh token completed with status %s.',
+                  r.status_code)
+        log.debug('Response headers were %s and content %s.',
+                  r.headers, r.text)
+        log.debug('Invoking %d token response hooks.',
+                  len(self.compliance_hook['refresh_token_response']))
+        for hook in self.compliance_hook['refresh_token_response']:
+            log.debug('Invoking hook %s.', hook)
+            r = hook(r)
+
+        self.token = self._client.parse_request_body_response(r.text, scope=self.scope)
+        if not 'refresh_token' in self.token:
+            log.debug('No new refresh token given. Re-using old.')
+            self.token['refresh_token'] = refresh_token
+        return self.token
+
+    def request(self, method, url, data=None, headers=None, **kwargs):
+        """Intercept all requests and add the OAuth 2 token if present."""
+        if not is_secure_transport(url):
+            raise InsecureTransportError()
+        if self.token:
+            log.debug('Invoking %d protected resource request hooks.',
+                      len(self.compliance_hook['protected_request']))
+            for hook in self.compliance_hook['protected_request']:
+                log.debug('Invoking hook %s.', hook)
+                url, headers, data = hook(url, headers, data)
+
+            log.debug('Adding token %s to request.', self.token)
+            try:
+                url, headers, data = self._client.add_token(url,
+                        http_method=method, body=data, headers=headers)
+            # Attempt to retrieve and save new access token if expired
+            except TokenExpiredError:
+                if self.auto_refresh_url:
+                    log.debug('Auto refresh is set, attempting to refresh at %s.',
+                              self.auto_refresh_url)
+                    token = self.refresh_token(self.auto_refresh_url)
+                    if self.token_updater:
+                        log.debug('Updating token to %s using %s.',
+                                  token, self.token_updater)
+                        self.token_updater(token)
+                        url, headers, data = self._client.add_token(url,
+                                http_method=method, body=data, headers=headers)
+                    else:
+                        raise TokenUpdated(token)
+                else:
+                    raise
+
+        log.debug('Requesting url %s using method %s.', url, method)
+        log.debug('Supplying headers %s and data %s', headers, data)
+        log.debug('Passing through key word arguments %s.', kwargs)
+        return super(OAuth2Session, self).request(method, url,
+                headers=headers, data=data, **kwargs)
+
+    def register_compliance_hook(self, hook_type, hook):
+        """Register a hook for request/response tweaking.
+
+        Available hooks are:
+            access_token_response invoked before token parsing.
+            refresh_token_response invoked before refresh token parsing.
+            protected_request invoked before making a request.
+
+        If you find a new hook is needed please send a GitHub PR request
+        or open an issue.
+        """
+        if hook_type not in self.compliance_hook:
+            raise ValueError('Hook type %s is not in %s.',
+                             hook_type, self.compliance_hook)
+        self.compliance_hook[hook_type].add(hook)
diff --git a/lib/twitter/__init__.py b/lib/twitter/__init__.py
new file mode 100644
index 0000000..6a00575
--- /dev/null
+++ b/lib/twitter/__init__.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+#
+# vim: sw=2 ts=2 sts=2
+#
+# Copyright 2007 The Python-Twitter Developers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+'''A library that provides a Python interface to the Twitter API'''
+
+__author__ = 'python-twitter at googlegroups.com'
+__version__ = '2.2'
+
+import json as simplejson
+
+try:
+  from hashlib import md5
+except ImportError:
+  from md5 import md5
+
+from _file_cache import _FileCache
+from error import TwitterError
+from direct_message import DirectMessage
+from hashtag import Hashtag
+from parse_tweet import ParseTweet
+from trend import Trend
+from url import Url
+from status import Status
+from user import User, UserStatus
+from list import List
+from api import Api
diff --git a/lib/twitter/_file_cache.py b/lib/twitter/_file_cache.py
new file mode 100644
index 0000000..278f2d8
--- /dev/null
+++ b/lib/twitter/_file_cache.py
@@ -0,0 +1,150 @@
+#!/usr/bin/env python
+from hashlib import md5
+import os
+import re
+import tempfile
+
+class _FileCacheError(Exception):
+  '''Base exception class for FileCache related errors'''
+
+class _FileCache(object):
+
+  DEPTH = 3
+
+  def __init__(self,root_directory=None):
+    self._InitializeRootDirectory(root_directory)
+
+  def Get(self, key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return open(path).read()
+    else:
+      return None
+
+  def Set(self, key, data):
+    path = self._GetPath(key)
+    directory = os.path.dirname(path)
+    if not os.path.exists(directory):
+      os.makedirs(directory)
+    if not os.path.isdir(directory):
+      raise _FileCacheError('%s exists but is not a directory' % directory)
+    temp_fd, temp_path = tempfile.mkstemp()
+    temp_fp = os.fdopen(temp_fd, 'w')
+    temp_fp.write(data)
+    temp_fp.close()
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory))
+    if os.path.exists(path):
+      os.remove(path)
+    os.rename(temp_path, path)
+
+  def Remove(self, key):
+    path = self._GetPath(key)
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory ))
+    if os.path.exists(path):
+      os.remove(path)
+
+  def GetCachedTime(self, key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return os.path.getmtime(path)
+    else:
+      return None
+
+  def _GetUsername(self):
+    '''Attempt to find the username in a cross-platform fashion.'''
+    try:
+      return os.getenv('USER') or \
+             os.getenv('LOGNAME') or \
+             os.getenv('USERNAME') or \
+             os.getlogin() or \
+             'nobody'
+    except (AttributeError, IOError, OSError), e:
+      return 'nobody'
+
+  def _GetTmpCachePath(self):
+    username = self._GetUsername()
+    cache_directory = 'python.cache_' + username
+    return os.path.join(tempfile.gettempdir(), cache_directory)
+
+  def _InitializeRootDirectory(self, root_directory):
+    if not root_directory:
+      root_directory = self._GetTmpCachePath()
+    root_directory = os.path.abspath(root_directory)
+    if not os.path.exists(root_directory):
+      os.mkdir(root_directory)
+    if not os.path.isdir(root_directory):
+      raise _FileCacheError('%s exists but is not a directory' %
+                            root_directory)
+    self._root_directory = root_directory
+
+  def _GetPath(self, key):
+    try:
+        hashed_key = md5(key).hexdigest()
+    except TypeError:
+        hashed_key = md5.new(key).hexdigest()
+
+    return os.path.join(self._root_directory,
+                        self._GetPrefix(hashed_key),
+                        hashed_key)
+
+  def _GetPrefix(self, hashed_key):
+    return os.path.sep.join(hashed_key[0:_FileCache.DEPTH])
+
+class ParseTweet:
+  # compile once on import
+  regexp = { "RT": "^RT", "MT":r"^MT", "ALNUM": r"(@[a-zA-Z0-9_]+)",
+             "HASHTAG": r"(#[\w\d]+)", "URL": r"([http://]?[a-zA-Z\d\/]+[\.]+[a-zA-Z\d\/\.]+)" }
+  regexp = dict((key,re.compile(value)) for key,value in regexp.items())
+
+  def __init__(self,timeline_owner,tweet):
+    ''' timeline_owner : twitter handle of user account. tweet - 140 chars from feed; object does all computation on construction
+        properties: 
+        RT, MT - boolean
+        URLs - list of URL
+        Hashtags - list of tags
+    '''
+    self.Owner = timeline_owner
+    self.tweet = tweet
+    self.UserHandles = ParseTweet.getUserHandles(tweet)
+    self.Hashtags = ParseTweet.getHashtags(tweet)
+    self.URLs = ParseTweet.getURLs(tweet)
+    self.RT = ParseTweet.getAttributeRT(tweet)
+    self.MT = ParseTweet.getAttributeMT(tweet)
+    
+    # additional intelligence
+    if ( self.RT and len(self.UserHandles) > 0 ): #change the owner of tweet?
+      self.Owner = self.UserHandles[0]
+    return
+
+  def __str__(self):
+    ''' for display method '''
+    return "owner %s, urls: %d, hashtags %d, user_handles %d, len_tweet %d, RT = %s, MT = %s"%(self.Owner,len(self.URLs),len(self.Hashtags),len(self.UserHandles), len(self.tweet), self.RT,self.MT)
+  
+  @staticmethod
+  def getAttributeRT( tweet ):
+    """ see if tweet is a RT """
+    return re.search(ParseTweet.regexp["RT"],tweet.strip()) != None
+
+  @staticmethod
+  def getAttributeMT( tweet ):
+    """ see if tweet is a MT """
+    return re.search(ParseTweet.regexp["MT"],tweet.strip()) != None
+  
+  @staticmethod
+  def getUserHandles( tweet ):
+    """ given a tweet we try and extract all user handles in order of occurrence"""
+    return re.findall(ParseTweet.regexp["ALNUM"],tweet)
+  
+  @staticmethod
+  def getHashtags( tweet ):
+    """ return all hashtags"""
+    return re.findall(ParseTweet.regexp["HASHTAG"],tweet)
+  
+  @staticmethod
+  def getURLs( tweet ):
+    """ URL : [http://]?[\w\.?/]+"""
+    return re.findall(ParseTweet.regexp["URL"],tweet)
diff --git a/lib/twitter/api.py b/lib/twitter/api.py
new file mode 100644
index 0000000..0760fff
--- /dev/null
+++ b/lib/twitter/api.py
@@ -0,0 +1,3638 @@
+#!/usr/bin/env python
+
+#
+# vim: sw=2 ts=2 sts=2
+#
+# Copyright 2007 The Python-Twitter Developers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+'''A library that provides a Python interface to the Twitter API'''
+
+import base64
+from calendar import timegm
+import time
+import datetime
+import gzip
+import sys
+import textwrap
+import types
+import urllib
+import urllib2
+import urlparse
+import lib.requests as requests
+from lib.requests_oauthlib import OAuth1
+import StringIO
+
+from lib.twitter import (__version__, _FileCache, simplejson, DirectMessage, List,
+                     Status, Trend, TwitterError, User, UserStatus)
+
+CHARACTER_LIMIT = 140
+
+# A singleton representing a lazily instantiated FileCache.
+DEFAULT_CACHE = object()
+
+class Api(object):
+  '''A python interface into the Twitter API
+
+  By default, the Api caches results for 1 minute.
+
+  Example usage:
+
+    To create an instance of the twitter.Api class, with no authentication:
+
+      >>> import twitter
+      >>> api = twitter.Api()
+
+    To fetch a single user's public status messages, where "user" is either
+    a Twitter "short name" or their user id.
+
+      >>> statuses = api.GetUserTimeline(user)
+      >>> print [s.text for s in statuses]
+
+    To use authentication, instantiate the twitter.Api class with a
+    consumer key and secret; and the oAuth key and secret:
+
+      >>> api = twitter.Api(consumer_key='twitter consumer key',
+                            consumer_secret='twitter consumer secret',
+                            access_token_key='the_key_given',
+                            access_token_secret='the_key_secret')
+
+    To fetch your friends (after being authenticated):
+
+      >>> users = api.GetFriends()
+      >>> print [u.name for u in users]
+
+    To post a twitter status message (after being authenticated):
+
+      >>> status = api.PostUpdate('I love python-twitter!')
+      >>> print status.text
+      I love python-twitter!
+
+    There are many other methods, including:
+
+      >>> api.PostUpdates(status)
+      >>> api.PostDirectMessage(user, text)
+      >>> api.GetUser(user)
+      >>> api.GetReplies()
+      >>> api.GetUserTimeline(user)
+      >>> api.GetHomeTimeline()
+      >>> api.GetStatus(id)
+      >>> api.DestroyStatus(id)
+      >>> api.GetFriends(user)
+      >>> api.GetFollowers()
+      >>> api.GetFeatured()
+      >>> api.GetDirectMessages()
+      >>> api.GetSentDirectMessages()
+      >>> api.PostDirectMessage(user, text)
+      >>> api.DestroyDirectMessage(id)
+      >>> api.DestroyFriendship(user)
+      >>> api.CreateFriendship(user)
+      >>> api.LookupFriendship(user)
+      >>> api.GetUserByEmail(email)
+      >>> api.VerifyCredentials()
+  '''
+
+  DEFAULT_CACHE_TIMEOUT = 60  # cache for 1 minute
+  _API_REALM = 'Twitter API'
+
+  def __init__(self,
+               consumer_key=None,
+               consumer_secret=None,
+               access_token_key=None,
+               access_token_secret=None,
+               input_encoding=None,
+               request_headers=None,
+               cache=DEFAULT_CACHE,
+               shortner=None,
+               base_url=None,
+               stream_url=None,
+               upload_url=None,
+               use_gzip_compression=False,
+               debugHTTP=False,
+               timeout=None):
+    '''Instantiate a new twitter.Api object.
+
+    Args:
+      consumer_key:
+        Your Twitter user's consumer_key.
+      consumer_secret:
+        Your Twitter user's consumer_secret.
+      access_token_key:
+        The oAuth access token key value you retrieved
+        from running get_access_token.py.
+      access_token_secret:
+        The oAuth access token's secret, also retrieved
+        from the get_access_token.py run.
+      input_encoding:
+        The encoding used to encode input strings. [Optional]
+      request_header:
+        A dictionary of additional HTTP request headers. [Optional]
+      cache:
+        The cache instance to use. Defaults to DEFAULT_CACHE.
+        Use None to disable caching. [Optional]
+      shortner:
+        The shortner instance to use.  Defaults to None.
+        See shorten_url.py for an example shortner. [Optional]
+      base_url:
+        The base URL to use to contact the Twitter API.
+        Defaults to https://api.twitter.com. [Optional]
+      use_gzip_compression:
+        Set to True to tell enable gzip compression for any call
+        made to Twitter.  Defaults to False. [Optional]
+      debugHTTP:
+        Set to True to enable debug output from urllib2 when performing
+        any HTTP requests.  Defaults to False. [Optional]
+      timeout:
+        Set timeout (in seconds) of the http/https requests. If None the
+        requests lib default will be used.  Defaults to None. [Optional]
+    '''
+    self.SetCache(cache)
+    self._urllib         = urllib2
+    self._cache_timeout  = Api.DEFAULT_CACHE_TIMEOUT
+    self._input_encoding = input_encoding
+    self._use_gzip       = use_gzip_compression
+    self._debugHTTP      = debugHTTP
+    self._shortlink_size = 19
+    self._timeout = timeout
+
+    self._InitializeRequestHeaders(request_headers)
+    self._InitializeUserAgent()
+    self._InitializeDefaultParameters()
+
+    if base_url is None:
+      self.base_url = 'https://api.twitter.com/1.1'
+    else:
+      self.base_url = base_url
+
+    if stream_url is None:
+      self.stream_url = 'https://stream.twitter.com/1.1'
+    else:
+      self.stream_url = stream_url
+
+    if upload_url is None:
+      self.upload_url = 'https://upload.twitter.com/1.1'
+    else:
+      self.upload_url = upload_url
+
+    if consumer_key is not None and (access_token_key is None or
+                                     access_token_secret is None):
+      print >> sys.stderr, 'Twitter now requires an oAuth Access Token for API calls.'
+      print >> sys.stderr, 'If your using this library from a command line utility, please'
+      print >> sys.stderr, 'run the included get_access_token.py tool to generate one.'
+
+      raise TwitterError({'message': "Twitter requires oAuth Access Token for all API access"})
+
+    self.SetCredentials(consumer_key, consumer_secret, access_token_key, access_token_secret)
+
+    if debugHTTP:
+      import logging
+      import httplib
+      httplib.HTTPConnection.debuglevel = 1
+
+      logging.basicConfig() # you need to initialize logging, otherwise you will not see anything from requests
+      logging.getLogger().setLevel(logging.DEBUG)
+      requests_log = logging.getLogger("requests.packages.urllib3")
+      requests_log.setLevel(logging.DEBUG)
+      requests_log.propagate = True
+
+  def SetCredentials(self,
+                     consumer_key,
+                     consumer_secret,
+                     access_token_key=None,
+                     access_token_secret=None):
+    '''Set the consumer_key and consumer_secret for this instance
+
+    Args:
+      consumer_key:
+        The consumer_key of the twitter account.
+      consumer_secret:
+        The consumer_secret for the twitter account.
+      access_token_key:
+        The oAuth access token key value you retrieved
+        from running get_access_token.py.
+      access_token_secret:
+        The oAuth access token's secret, also retrieved
+        from the get_access_token.py run.
+    '''
+    self._consumer_key        = consumer_key
+    self._consumer_secret     = consumer_secret
+    self._access_token_key    = access_token_key
+    self._access_token_secret = access_token_secret
+    auth_list = [consumer_key, consumer_secret,
+                 access_token_key, access_token_secret]
+
+    if all(auth_list):
+      self.__auth = OAuth1(consumer_key, consumer_secret,
+              access_token_key, access_token_secret)
+
+    self._config = None
+
+  def GetHelpConfiguration(self):
+    if self._config is None:
+      url  = '%s/help/configuration.json' % self.base_url
+      json = self._RequestUrl(url, 'GET')
+      data = self._ParseAndCheckTwitter(json.content)
+      self._config = data
+    return self._config
+
+  def GetShortUrlLength(self, https=False):
+    config = self.GetHelpConfiguration()
+    if https:
+      return config['short_url_length_https']
+    else:
+      return config['short_url_length']
+
+  def ClearCredentials(self):
+    '''Clear any credentials for this instance
+    '''
+    self._consumer_key        = None
+    self._consumer_secret     = None
+    self._access_token_key    = None
+    self._access_token_secret = None
+    self.__auth               = None  # for request upgrade
+
+  def GetSearch(self,
+                term=None,
+                geocode=None,
+                since_id=None,
+                max_id=None,
+                until=None,
+                count=15,
+                lang=None,
+                locale=None,
+                result_type="mixed",
+                include_entities=None):
+    '''Return twitter search results for a given term.
+
+    Args:
+      term:
+        Term to search by. Optional if you include geocode.
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than (that is, older
+        than) or equal to the specified ID. [Optional]
+      until:
+        Returns tweets generated before the given date. Date should be
+        formatted as YYYY-MM-DD. [Optional]
+      geocode:
+        Geolocation information in the form (latitude, longitude, radius)
+        [Optional]
+      count:
+        Number of results to return.  Default is 15 [Optional]
+      lang:
+        Language for results as ISO 639-1 code.  Default is None (all languages)
+        [Optional]
+      locale:
+        Language of the search query. Currently only 'ja' is effective. This is
+        intended for language-specific consumers and the default should work in
+        the majority of cases.
+      result_type:
+        Type of result which should be returned.  Default is "mixed".  Other
+        valid options are "recent" and "popular". [Optional]
+      include_entities:
+        If True, each tweet will include a node called "entities,".
+        This node offers a variety of metadata about the tweet in a
+        discrete structure, including: user_mentions, urls, and
+        hashtags. [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message containing
+      the term
+    '''
+    # Build request parameters
+    parameters = {}
+
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError({'message': "since_id must be an integer"})
+
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError({'message': "max_id must be an integer"})
+
+    if until:
+        parameters['until'] = until
+
+    if lang:
+      parameters['lang'] = lang
+
+    if locale:
+      parameters['locale'] = locale
+
+    if term is None and geocode is None:
+      return []
+
+    if term is not None:
+      parameters['q'] = term
+
+    if geocode is not None:
+      parameters['geocode'] = ','.join(map(str, geocode))
+
+    if include_entities:
+      parameters['include_entities'] = 1
+
+    try:
+        parameters['count'] = int(count)
+    except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+
+    if result_type in ["mixed", "popular", "recent"]:
+      parameters['result_type'] = result_type
+
+    # Make and send requests
+    url  = '%s/search/tweets.json' % self.base_url
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    # Return built list of statuses
+    return [Status.NewFromJsonDict(x) for x in data['statuses']]
+
+  def GetUsersSearch(self,
+                     term=None,
+                     page=1,
+                     count=20,
+                     include_entities=None):
+    '''Return twitter user search results for a given term.
+
+    Args:
+      term:
+        Term to search by.
+      page:
+        Page of results to return. Default is 1
+        [Optional]
+      count:
+        Number of results to return.  Default is 20
+        [Optional]
+      include_entities:
+        If True, each tweet will include a node called "entities,".
+        This node offers a variety of metadata about the tweet in a
+        discrete structure, including: user_mentions, urls, and hashtags.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.User instances, one for each message containing
+      the term
+    '''
+    # Build request parameters
+    parameters = {}
+
+    if term is not None:
+      parameters['q'] = term
+
+    if page != 1:
+      parameters['page'] = page
+
+    if include_entities:
+      parameters['include_entities'] = 1
+
+    try:
+      parameters['count'] = int(count)
+    except ValueError:
+      raise TwitterError({'message': "count must be an integer"})
+
+    # Make and send requests
+    url  = '%s/users/search.json' % self.base_url
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetTrendsCurrent(self, exclude=None):
+    '''Get the current top trending topics (global)
+
+    Args:
+      exclude:
+        Appends the exclude parameter as a request parameter.
+        Currently only exclude=hashtags is supported. [Optional]
+
+    Returns:
+      A list with 10 entries. Each entry contains a trend.
+    '''
+    return self.GetTrendsWoeid(id=1, exclude=exclude)
+
+  def GetTrendsWoeid(self, id, exclude=None):
+    '''Return the top 10 trending topics for a specific WOEID, if trending
+    information is available for it.
+
+    Args:
+      woeid:
+        the Yahoo! Where On Earth ID for a location.
+      exclude:
+        Appends the exclude parameter as a request parameter.
+        Currently only exclude=hashtags is supported. [Optional]
+
+    Returns:
+      A list with 10 entries. Each entry contains a trend.
+    '''
+    url = '%s/trends/place.json' % (self.base_url)
+    parameters = {'id': id}
+
+    if exclude:
+      parameters['exclude'] = exclude
+
+    json = self._RequestUrl(url, verb='GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    trends = []
+    timestamp = data[0]['as_of']
+
+    for trend in data[0]['trends']:
+        trends.append(Trend.NewFromJsonDict(trend, timestamp=timestamp))
+    return trends
+
+  def GetHomeTimeline(self,
+                      count=None,
+                      since_id=None,
+                      max_id=None,
+                      trim_user=False,
+                      exclude_replies=False,
+                      contributor_details=False,
+                      include_entities=True):
+    '''Fetch a collection of the most recent Tweets and retweets posted
+    by the authenticating user and the users they follow.
+
+    The home timeline is central to how most users interact with Twitter.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      count:
+        Specifies the number of statuses to retrieve. May not be
+        greater than 200. Defaults to 20. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      trim_user:
+        When True, each tweet returned in a timeline will include a user
+        object including only the status authors numerical ID. Omit this
+        parameter to receive the complete user object. [Optional]
+      exclude_replies:
+        This parameter will prevent replies from appearing in the
+        returned timeline. Using exclude_replies with the count
+        parameter will mean you will receive up-to count tweets -
+        this is because the count parameter retrieves that many
+        tweets before filtering out retweets and replies. [Optional]
+      contributor_details:
+        This parameter enhances the contributors element of the
+        status response to include the screen_name of the contributor.
+        By default only the user_id of the contributor is included. [Optional]
+      include_entities:
+        The entities node will be disincluded when set to false.
+        This node offers a variety of metadata about the tweet in a
+        discreet structure, including: user_mentions, urls, and
+        hashtags. [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message
+    '''
+    url = '%s/statuses/home_timeline.json' % self.base_url
+
+    if not self.__auth:
+      raise TwitterError({'message': "API must be authenticated."})
+    parameters = {}
+    if count is not None:
+      try:
+        if int(count) > 200:
+          raise TwitterError({'message': "'count' may not be greater than 200"})
+      except ValueError:
+        raise TwitterError({'message': "'count' must be an integer"})
+      parameters['count'] = count
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError({'message': "'since_id' must be an integer"})
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError({'message': "'max_id' must be an integer"})
+    if trim_user:
+      parameters['trim_user'] = 1
+    if exclude_replies:
+      parameters['exclude_replies'] = 1
+    if contributor_details:
+      parameters['contributor_details'] = 1
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetUserTimeline(self,
+                      user_id=None,
+                      screen_name=None,
+                      since_id=None,
+                      max_id=None,
+                      count=None,
+                      include_rts=True,
+                      trim_user=None,
+                      exclude_replies=None):
+    '''Fetch the sequence of public Status messages for a single user.
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Args:
+      user_id:
+        Specifies the ID of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid user ID
+        is also a valid screen name. [Optional]
+      screen_name:
+        Specifies the screen name of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid screen
+        name is also a user ID. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than (that is, older
+        than) or equal to the specified ID. [Optional]
+      count:
+        Specifies the number of statuses to retrieve. May not be
+        greater than 200. [Optional]
+      include_rts:
+        If True, the timeline will contain native retweets (if they
+        exist) in addition to the standard stream of tweets. [Optional]
+      trim_user:
+        If True, statuses will only contain the numerical user ID only.
+        Otherwise a full user object will be returned for each status.
+        [Optional]
+      exclude_replies:
+        If True, this will prevent replies from appearing in the returned
+        timeline. Using exclude_replies with the count parameter will mean you
+        will receive up-to count tweets - this is because the count parameter
+        retrieves that many tweets before filtering out retweets and replies.
+        This parameter is only supported for JSON and XML responses. [Optional]
+
+    Returns:
+      A sequence of Status instances, one for each message up to count
+    '''
+    parameters = {}
+    url = '%s/statuses/user_timeline.json' % (self.base_url)
+
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = screen_name
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError({'message': "since_id must be an integer"})
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError({'message': "max_id must be an integer"})
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if not include_rts:
+      parameters['include_rts'] = 0
+    if trim_user:
+      parameters['trim_user'] = 1
+    if exclude_replies:
+      parameters['exclude_replies'] = 1
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetStatus(self,
+                id,
+                trim_user=False,
+                include_my_retweet=True,
+                include_entities=True):
+    '''Returns a single status message, specified by the id parameter.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The numeric ID of the status you are trying to retrieve.
+      trim_user:
+        When set to True, each tweet returned in a timeline will include
+        a user object including only the status authors numerical ID.
+        Omit this parameter to receive the complete user object. [Optional]
+      include_my_retweet:
+        When set to True, any Tweets returned that have been retweeted by
+        the authenticating user will include an additional
+        current_user_retweet node, containing the ID of the source status
+        for the retweet. [Optional]
+      include_entities:
+        If False, the entities node will be disincluded.
+        This node offers a variety of metadata about the tweet in a
+        discreet structure, including: user_mentions, urls, and
+        hashtags. [Optional]
+    Returns:
+      A twitter.Status instance representing that status message
+    '''
+    url = '%s/statuses/show.json' % (self.base_url)
+
+    if not self.__auth:
+      raise TwitterError({'message': "API must be authenticated."})
+
+    parameters = {}
+
+    try:
+      parameters['id'] = long(id)
+    except ValueError:
+      raise TwitterError({'message': "'id' must be an integer."})
+
+    if trim_user:
+      parameters['trim_user'] = 1
+    if include_my_retweet:
+      parameters['include_my_retweet'] = 1
+    if not include_entities:
+      parameters['include_entities'] = 'none'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def GetStatusOembed(self,
+                      id=None,
+                      url=None,
+                      maxwidth=None,
+                      hide_media=False,
+                      hide_thread=False,
+                      omit_script=False,
+                      align=None,
+                      related=None,
+                      lang=None):
+    '''Returns information allowing the creation of an embedded representation of a
+    Tweet on third party sites.
+
+    Specify tweet by the id or url parameter.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The numeric ID of the status you are trying to embed.
+      url:
+        The url of the status you are trying to embed.
+      maxwidth:
+        The maximum width in pixels that the embed should be rendered at.
+        This value is constrained to be between 250 and 550 pixels. [Optional]
+      hide_media:
+        Specifies whether the embedded Tweet should automatically expand images. [Optional]
+      hide_thread:
+        Specifies whether the embedded Tweet should automatically show the original
+        message in the case that the embedded Tweet is a reply. [Optional]
+      omit_script:
+        Specifies whether the embedded Tweet HTML should include a <script>
+        element pointing to widgets.js. [Optional]
+      align:
+        Specifies whether the embedded Tweet should be left aligned, right aligned,
+        or centered in the page. [Optional]
+      related:
+        A comma sperated string of related screen names. [Optional]
+      lang:
+        Language code for the rendered embed. [Optional]
+
+    Returns:
+      A dictionary with the response.
+    '''
+    request_url  = '%s/statuses/oembed.json' % (self.base_url)
+
+    if not self.__auth:
+      raise TwitterError({'message': "API must be authenticated."})
+
+    parameters = {}
+
+    if id is not None:
+      try:
+        parameters['id'] = long(id)
+      except ValueError:
+        raise TwitterError({'message': "'id' must be an integer."})
+    elif url is not None:
+      parameters['url'] = url
+    else:
+      raise TwitterError({'message': "Must specify either 'id' or 'url'"})
+
+    if maxwidth is not None:
+       parameters['maxwidth'] = maxwidth
+    if hide_media == True:
+       parameters['hide_media'] = 'true'
+    if hide_thread == True:
+       parameters['hide_thread'] = 'true'
+    if omit_script == True:
+       parameters['omit_script'] = 'true'
+    if align is not None:
+       if align not in ('left', 'center', 'right', 'none'):
+         raise TwitterError({'message': "'align' must be 'left', 'center', 'right', or 'none'"})
+       parameters['align'] = align
+    if related:
+        if not isinstance(related, str):
+          raise TwitterError({'message': "'related' should be a string of comma separated screen names"})
+        parameters['related'] = related
+    if lang is not None:
+        if not isinstance(lang, str):
+          raise TwitterError({'message': "'lang' should be string instance"})
+        parameters['lang'] = lang
+
+    json = self._RequestUrl(request_url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return data
+
+  def DestroyStatus(self, id, trim_user=False):
+    '''Destroys the status specified by the required ID parameter.
+
+    The twitter.Api instance must be authenticated and the
+    authenticating user must be the author of the specified status.
+
+    Args:
+      id:
+        The numerical ID of the status you're trying to destroy.
+
+    Returns:
+      A twitter.Status instance representing the destroyed status message
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "API must be authenticated."})
+
+    try:
+      post_data = {'id': long(id)}
+    except ValueError:
+      raise TwitterError({'message': "id must be an integer"})
+    url = '%s/statuses/destroy/%s.json' % (self.base_url, id)
+    if trim_user:
+      post_data['trim_user'] = 1
+
+    json = self._RequestUrl(url, 'POST', data=post_data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  @classmethod
+  def _calculate_status_length(cls, status, linksize=19):
+    dummy_link_replacement = 'https://-%d-chars%s/' % (linksize, '-' * (linksize - 18))
+    shortened = ' '.join([x if not (x.startswith('http://') or
+                                    x.startswith('https://'))
+                            else
+                                dummy_link_replacement
+                            for x in status.split(' ')])
+    return len(shortened)
+
+  def PostUpdate(self,
+                 status,
+                 in_reply_to_status_id=None,
+                 latitude=None,
+                 longitude=None,
+                 place_id=None,
+                 display_coordinates=False,
+                 trim_user=False):
+    '''Post a twitter status message from the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    https://dev.twitter.com/docs/api/1.1/post/statuses/update
+
+    Args:
+      status:
+        The message text to be posted.
+        Must be less than or equal to 140 characters.
+      in_reply_to_status_id:
+        The ID of an existing status that the status to be posted is
+        in reply to.  This implicitly sets the in_reply_to_user_id
+        attribute of the resulting status to the user ID of the
+        message being replied to.  Invalid/missing status IDs will be
+        ignored. [Optional]
+      latitude:
+        Latitude coordinate of the tweet in degrees. Will only work
+        in conjunction with longitude argument. Both longitude and
+        latitude will be ignored by twitter if the user has a false
+        geo_enabled setting. [Optional]
+      longitude:
+        Longitude coordinate of the tweet in degrees. Will only work
+        in conjunction with latitude argument. Both longitude and
+        latitude will be ignored by twitter if the user has a false
+        geo_enabled setting. [Optional]
+      place_id:
+        A place in the world. These IDs can be retrieved from
+        GET geo/reverse_geocode. [Optional]
+      display_coordinates:
+        Whether or not to put a pin on the exact coordinates a tweet
+        has been sent from. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+    Returns:
+      A twitter.Status instance representing the message posted.
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/statuses/update.json' % self.base_url
+
+    if isinstance(status, unicode) or self._input_encoding is None:
+      u_status = status
+    else:
+      u_status = unicode(status, self._input_encoding)
+
+    # if self._calculate_status_length(u_status, self._shortlink_size) > CHARACTER_LIMIT:
+    #  raise TwitterError("Text must be less than or equal to %d characters. "
+    #                     "Consider using PostUpdates." % CHARACTER_LIMIT)
+
+    data = {'status': status}
+    if in_reply_to_status_id:
+      data['in_reply_to_status_id'] = in_reply_to_status_id
+    if latitude is not None and longitude is not None:
+      data['lat']     = str(latitude)
+      data['long']    = str(longitude)
+    if place_id is not None:
+      data['place_id'] = str(place_id)
+    if display_coordinates:
+      data['display_coordinates'] = 'true'
+    if trim_user:
+      data['trim_user'] = 'true'
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def PostMedia(self,
+                status,
+                media,
+                possibly_sensitive=None,
+                in_reply_to_status_id=None,
+                latitude=None,
+                longitude=None,
+                place_id=None,
+                display_coordinates=False):
+    '''Post a twitter status message from the user with a picture attached.
+
+    Args:
+      status:
+          the text of your update
+      media:
+          This can be the location of media(PNG, JPG, GIF) on the local file
+          system or at an HTTP URL, it can also be a file-like object
+      possibly_sensitive:
+          set true if content is "advanced." [Optional]
+      in_reply_to_status_id:
+          ID of a status that this is in reply to. [Optional]
+      lat:
+          latitude of location. [Optional]
+      long:
+          longitude of location. [Optional]
+      place_id:
+          A place in the world identified by a Twitter place ID. [Optional]
+      display_coordinates:
+          Set true if you want to display coordinates. [Optional]
+
+      Returns:
+          A twitter.Status instance representing the message posted.
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/statuses/update_with_media.json' % self.base_url
+
+    if isinstance(status, unicode) or self._input_encoding is None:
+      u_status = status
+    else:
+      u_status = unicode(status, self._input_encoding)
+
+    data = {'status': status}
+    if not hasattr(media, 'read'):
+      if media.startswith('http'):
+        data['media'] = urllib2.urlopen(media).read()
+      else:
+        with open(str(media), 'rb') as f:
+          data['media'] = f.read()
+    else:
+      data['media'] = media.read()
+    if possibly_sensitive:
+      data['possibly_sensitive'] = 'true'
+    if in_reply_to_status_id:
+      data['in_reply_to_status_id'] = str(in_reply_to_status_id)
+    if latitude is not None and longitude is not None:
+      data['lat']  = str(latitude)
+      data['long'] = str(longitude)
+    if place_id is not None:
+      data['place_id'] = str(place_id)
+    if display_coordinates:
+      data['display_coordinates'] = 'true'
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def PostMultipleMedia(self, status, media, possibly_sensitive=None,
+                        in_reply_to_status_id=None, latitude=None,
+                        longitude=None, place_id=None,
+                        display_coordinates=False):
+    '''
+    Post a twitter status message from the authenticated user with
+    multiple pictures attached.
+
+    Args:
+      status:
+          the text of your update
+      media:
+          location of multiple media elements(PNG, JPG, GIF)
+      possibly_sensitive:
+          set true is content is "advanced"
+      in_reply_to_status_id:
+          ID of a status that this is in reply to
+      lat:
+          location in latitude
+      long:
+          location in longitude
+      place_id:
+          A place in the world identified by a Twitter place ID
+      display_coordinates:
+
+      Returns:
+          A twitter.Status instance representing the message posted.
+    '''
+    if not self.__auth:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+
+    if type(media) is not list:
+      raise TwitterError("Must by multiple media elements")
+
+    url = '%s/media/upload.json' % self.upload_url
+
+    if isinstance(status, unicode) or self._input_encoding is None:
+      u_status = status
+    else:
+      u_status = unicode(status, self._input_encoding)
+
+    media_ids = ''
+    for m in range(0,len(media)):
+
+      data = {}
+      if not hasattr(media[m], 'read'):
+        if media[m].startswith('http'):
+          data['media'] = urllib2.urlopen(media[m]).read()
+        else:
+          data['media'] = open(str(media[m]), 'rb').read()
+      else:
+        data['media'] = media[m].read()
+
+      json = self._RequestUrl(url, 'POST', data=data)
+      data = self._ParseAndCheckTwitter(json.content)
+
+      media_ids += str(data['media_id_string'])
+      if m is not len(media)-1:
+        media_ids += ","
+
+    data = {'status': status, 'media_ids' : media_ids}
+
+    url = '%s/statuses/update.json' % self.base_url
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+    return Status.NewFromJsonDict(data)
+
+  def PostUpdates(self,
+                  status,
+                  continuation=None,
+                  **kwargs):
+    '''Post one or more twitter status messages from the authenticated user.
+
+    Unlike api.PostUpdate, this method will post multiple status updates
+    if the message is longer than 140 characters.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      status:
+        The message text to be posted.
+        May be longer than 140 characters.
+      continuation:
+        The character string, if any, to be appended to all but the
+        last message.  Note that Twitter strips trailing '...' strings
+        from messages.  Consider using the unicode \u2026 character
+        (horizontal ellipsis) instead. [Defaults to None]
+      **kwargs:
+        See api.PostUpdate for a list of accepted parameters.
+
+    Returns:
+      A of list twitter.Status instance representing the messages posted.
+    '''
+    results = list()
+    if continuation is None:
+      continuation = ''
+    line_length = CHARACTER_LIMIT - len(continuation)
+    lines = textwrap.wrap(status, line_length)
+    for line in lines[0:-1]:
+      results.append(self.PostUpdate(line + continuation, **kwargs))
+    results.append(self.PostUpdate(lines[-1], **kwargs))
+
+    return results
+
+  def PostRetweet(self, original_id, trim_user=False):
+    '''Retweet a tweet with the Retweet API.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      original_id:
+        The numerical id of the tweet that will be retweeted
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A twitter.Status instance representing the original tweet with retweet details embedded.
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    try:
+      if int(original_id) <= 0:
+        raise TwitterError({'message': "'original_id' must be a positive number"})
+    except ValueError:
+        raise TwitterError({'message': "'original_id' must be an integer"})
+
+    url = '%s/statuses/retweet/%s.json' % (self.base_url, original_id)
+    data = {'id': original_id}
+    if trim_user:
+      data['trim_user'] = 'true'
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def GetUserRetweets(self,
+                      count=None,
+                      since_id=None,
+                      max_id=None,
+                      trim_user=False):
+    '''Fetch the sequence of retweets made by the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      count:
+        The number of status messages to retrieve. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message up to count
+    '''
+    return self.GetUserTimeline(since_id=since_id, count=count, max_id=max_id, trim_user=trim_user, exclude_replies=True, include_rts=True)
+
+  def GetReplies(self,
+                 since_id=None,
+                 count=None,
+                 max_id=None,
+                 trim_user=False):
+    '''Get a sequence of status messages representing the 20 most
+    recent replies (status updates prefixed with @twitterID) to the
+    authenticating user.
+
+    Args:
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each reply to the user.
+    '''
+    return self.GetUserTimeline(since_id=since_id, count=count, max_id=max_id, trim_user=trim_user, exclude_replies=False, include_rts=False)
+
+  def GetRetweets(self,
+                  statusid,
+                  count=None,
+                  trim_user=False):
+    '''Returns up to 100 of the first retweets of the tweet identified
+    by statusid
+
+    Args:
+      statusid:
+        The ID of the tweet for which retweets should be searched for
+      count:
+        The number of status messages to retrieve. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A list of twitter.Status instances, which are retweets of statusid
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instsance must be authenticated."})
+
+    url = '%s/statuses/retweets/%s.json' % (self.base_url, statusid)
+    parameters = {}
+    if trim_user:
+      parameters['trim_user'] = 'true'
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(s) for s in data]
+
+  def GetRetweeters(self,
+                    status_id,
+                    cursor=None,
+                    stringify_ids=None):
+    '''Returns a collection of up to 100 user IDs belonging to users who have
+    retweeted the tweet specified by the status_id parameter.
+
+    Args:
+      status_id:
+        the tweet's numerical ID
+      cursor:
+        breaks the ids into pages of no more than 100.
+      stringify_ids:
+        returns the IDs as unicode strings. [Optional]
+
+    Returns:
+      A list of user IDs
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instsance must be authenticated."})
+
+    url = '%s/statuses/retweeters/ids.json' % (self.base_url)
+    parameters = {}
+    parameters['id'] = status_id
+    if stringify_ids:
+      parameters['stringify_ids'] = 'true'
+    result = []
+
+    while True:
+      if cursor:
+        try:
+          parameters['count'] = int(cursor)
+        except ValueError:
+          raise TwitterError({'message': "cursor must be an integer"})
+          break
+      json = self._RequestUrl(url, 'GET', data=parameters)
+      data = self._ParseAndCheckTwitter(json.content)
+      result += [x for x in data['ids']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+          total_count -= len(data['ids'])
+          if total_count < 1:
+            break
+      else:
+        break
+
+    return result
+
+  def GetRetweetsOfMe(self,
+                      count=None,
+                      since_id=None,
+                      max_id=None,
+                      trim_user=False,
+                      include_entities=True,
+                      include_user_entities=True):
+    '''Returns up to 100 of the most recent tweets of the user that have been
+    retweeted by others.
+
+    Args:
+      count:
+        The number of retweets to retrieve, up to 100.
+        Defaults to 20. [Optional]
+      since_id:
+        Returns results with an ID greater than
+        (newer than) this ID. [Optional]
+      max_id:
+        Returns results with an ID less than or equal
+        to this ID. [Optional]
+      trim_user:
+        When True, the user object for each tweet will
+        only be an ID. [Optional]
+      include_entities:
+        When True, the tweet entities will be included. [Optional]
+      include_user_entities:
+        When True, the user entities will be included. [Optional]
+    '''
+    if not self.__auth:
+      raise TwitterError({'error': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/statuses/retweets_of_me.json' % self.base_url
+    parameters = {}
+    if count is not None:
+      try:
+        if int(count) > 100:
+          raise TwitterError({'message': "'count' may not be greater than 100"})
+      except ValueError:
+        raise TwitterError({'message': "'count' must be an integer"})
+    if count:
+      parameters['count'] = count
+    if since_id:
+      parameters['since_id'] = since_id
+    if max_id:
+      parameters['max_id'] = max_id
+    if trim_user:
+      parameters['trim_user'] = trim_user
+    if not include_entities:
+      parameters['include_entities'] = include_entities
+    if not include_user_entities:
+      parameters['include_user_entities'] = include_user_entities
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(s) for s in data]
+
+  def GetBlocks(self,
+                user_id=None,
+                screen_name=None,
+                cursor=-1,
+                skip_status=False,
+                include_user_entities=False):
+    '''Fetch the sequence of twitter.User instances, one for each blocked user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The twitter id of the user whose friends you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      screen_name:
+        The twitter name of the user whose friends you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns.
+      skip_status:
+        If True the statuses will not be returned in the user items.
+        [Optional]
+      include_user_entities:
+        When True, the user entities will be included. [Optional]
+
+    Returns:
+      A sequence of twitter.User instances, one for each friend
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "twitter.Api instance must be authenticated"})
+
+    url = '%s/blocks/list.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      parameters['user_id'] = user_id
+    if screen_name is not None:
+      parameters['screen_name'] = screen_name
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_user_entities:
+      parameters['include_user_entities'] = True
+
+    while True:
+      parameters['cursor'] = cursor
+      json = self._RequestUrl(url, 'GET', data=parameters)
+      data = self._ParseAndCheckTwitter(json.content)
+      result += [User.NewFromJsonDict(x) for x in data['users']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+
+    return result
+
+  def DestroyBlock(self, id, trim_user=False):
+    '''Destroys the block for the user specified by the required ID
+    parameter.
+
+    The twitter.Api instance must be authenticated and the
+    authenticating user must have blocked the user specified by the
+    required ID parameter.
+
+    Args:
+      id:
+        The numerical ID of the user to be un-blocked.
+
+    Returns:
+      A twitter.User instance representing the un-blocked user.
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "API must be authenticated."})
+
+    try:
+      post_data = {'user_id': long(id)}
+    except ValueError:
+      raise TwitterError({'message': "id must be an integer"})
+    url = '%s/blocks/destroy.json' % (self.base_url)
+    if trim_user:
+      post_data['trim_user'] = 1
+
+    json = self._RequestUrl(url, 'POST', data=post_data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def GetFriends(self, user_id=None, screen_name=None, cursor=-1, count=None, skip_status=False, include_user_entities=False):
+    '''Fetch the sequence of twitter.User instances, one for each friend.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The twitter id of the user whose friends you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      screen_name:
+        The twitter name of the user whose friends you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns.
+      count:
+        The number of users to return per page, up to a maximum of 200.
+        Defaults to 20. [Optional]
+      skip_status:
+        If True the statuses will not be returned in the user items.
+        [Optional]
+      include_user_entities:
+        When True, the user entities will be included. [Optional]
+
+    Returns:
+      A sequence of twitter.User instances, one for each friend
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "twitter.Api instance must be authenticated"})
+
+    url = '%s/friends/list.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      parameters['user_id'] = user_id
+    if screen_name is not None:
+      parameters['screen_name'] = screen_name
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_user_entities:
+      parameters['include_user_entities'] = True
+
+    while True:
+      parameters['cursor'] = cursor
+      json = self._RequestUrl(url, 'GET', data=parameters)
+      data = self._ParseAndCheckTwitter(json.content)
+      result += [User.NewFromJsonDict(x) for x in data['users']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+      sec = self.GetSleepTime('/friends/list')
+      time.sleep(sec)
+
+    return result
+
+  def GetFriendIDs(self,
+                   user_id=None,
+                   screen_name=None,
+                   cursor=-1,
+                   stringify_ids=False,
+                   count=None):
+      '''Returns a list of twitter user id's for every person
+      the specified user is following.
+
+      Args:
+        user_id:
+          The id of the user to retrieve the id list for. [Optional]
+        screen_name:
+          The screen_name of the user to retrieve the id list for. [Optional]
+        cursor:
+          Specifies the Twitter API Cursor location to start at.
+          Note: there are pagination limits. [Optional]
+        stringify_ids:
+          if True then twitter will return the ids as strings instead of integers.
+          [Optional]
+        count:
+          The number of status messages to retrieve. [Optional]
+
+      Returns:
+        A list of integers, one for each user id.
+      '''
+      url = '%s/friends/ids.json' % self.base_url
+      if not self.__auth:
+          raise TwitterError({'message': "twitter.Api instance must be authenticated"})
+      parameters = {}
+      if user_id is not None:
+        parameters['user_id'] = user_id
+      if screen_name is not None:
+        parameters['screen_name'] = screen_name
+      if stringify_ids:
+        parameters['stringify_ids'] = True
+      if count is not None:
+        parameters['count'] = count
+      result = []
+
+      while True:
+        parameters['cursor'] = cursor
+        json = self._RequestUrl(url, 'GET', data=parameters)
+        data = self._ParseAndCheckTwitter(json.content)
+        result += [x for x in data['ids']]
+        if 'next_cursor' in data:
+          if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+            break
+          else:
+            cursor = data['next_cursor']
+        else:
+          break
+        sec = self.GetSleepTime('/friends/ids')
+        time.sleep(sec)
+
+      return result
+
+
+  def GetFollowerIDs(self,
+                     user_id=None,
+                     screen_name=None,
+                     cursor=-1,
+                     stringify_ids=False,
+                     count=None,
+                     total_count=None):
+      '''Returns a list of twitter user id's for every person
+      that is following the specified user.
+
+      Args:
+        user_id:
+          The id of the user to retrieve the id list for. [Optional]
+        screen_name:
+          The screen_name of the user to retrieve the id list for. [Optional]
+        cursor:
+          Specifies the Twitter API Cursor location to start at.
+          Note: there are pagination limits. [Optional]
+        stringify_ids:
+          if True then twitter will return the ids as strings instead of integers.
+          [Optional]
+        count:
+          The number of user id's to retrieve per API request. Please be aware that
+          this might get you rate-limited if set to a small number.
+          By default Twitter will retrieve 5000 UIDs per call. [Optional]
+        total_count:
+          The total amount of UIDs to retrieve. Good if the account has many followers
+          and you don't want to get rate limited. The data returned might contain more
+          UIDs if total_count is not a multiple of count (5000 by default). [Optional]
+
+      Returns:
+        A list of integers, one for each user id.
+      '''
+      url = '%s/followers/ids.json' % self.base_url
+      if not self.__auth:
+          raise TwitterError({'message': "twitter.Api instance must be authenticated"})
+      parameters = {}
+      if user_id is not None:
+        parameters['user_id'] = user_id
+      if screen_name is not None:
+        parameters['screen_name'] = screen_name
+      if stringify_ids:
+        parameters['stringify_ids'] = True
+      if count is not None:
+        parameters['count'] = count
+      result = []
+
+      while True:
+        if total_count and total_count < count:
+          parameters['count'] = total_count
+        parameters['cursor'] = cursor
+        json = self._RequestUrl(url, 'GET', data=parameters)
+        data = self._ParseAndCheckTwitter(json.content)
+        result += [x for x in data['ids']]
+        if 'next_cursor' in data:
+          if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+            break
+          else:
+            cursor = data['next_cursor']
+            if total_count is not None:
+              total_count -= len(data['ids'])
+              if total_count < 1:
+                break
+        else:
+          break
+        sec = self.GetSleepTime('/followers/ids')
+        time.sleep(sec)
+
+      return result
+
+  def GetFollowersPaged(self,
+                        user_id=None,
+                        screen_name=None,
+                        cursor=-1,
+                        count=200,
+                        skip_status=False,
+                        include_user_entities=False):
+    '''Make a cursor driven call to return the list of all followers
+
+    The caller is responsible for handling the cursor value and looping
+    to gather all of the data
+
+    Args:
+      user_id:
+        The twitter id of the user whose followers you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      screen_name:
+        The twitter name of the user whose followers you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns.
+      count:
+        The number of users to return per page, up to a maximum of 200.
+        Defaults to 200. [Optional]
+      skip_status:
+        If True the statuses will not be returned in the user items.
+        [Optional]
+      include_user_entities:
+        When True, the user entities will be included. [Optional]
+
+    Returns:
+      next_cursor, previous_cursor, data sequence of twitter.User instances, one for each follower
+    '''
+    url = '%s/followers/list.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      parameters['user_id'] = user_id
+    if screen_name is not None:
+      parameters['screen_name'] = screen_name
+    try:
+      parameters['count'] = int(count)
+    except ValueError:
+      raise TwitterError({'message': "count must be an integer"})
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_user_entities:
+      parameters['include_user_entities'] = True
+    parameters['cursor'] = cursor
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    if 'next_cursor' in data:
+      next_cursor = data['next_cursor']
+    else:
+      next_cursor = 0
+    if 'previous_cursor' in data:
+      previous_cursor = data['previous_cursor']
+    else:
+      previous_cursor = 0
+
+    return next_cursor, previous_cursor, data
+
+  def GetFollowers(self,
+                   user_id=None,
+                   screen_name=None,
+                   cursor=-1,
+                   count=200,
+                   skip_status=False,
+                   include_user_entities=False):
+    '''Fetch the sequence of twitter.User instances, one for each follower.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The twitter id of the user whose followers you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      screen_name:
+        The twitter name of the user whose followers you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns.
+      count:
+        The number of users to return per page, up to a maximum of 200.
+        Defaults to 200. [Optional]
+      skip_status:
+        If True the statuses will not be returned in the user items. [Optional]
+      include_user_entities:
+        When True, the user entities will be included. [Optional]
+
+    Returns:
+      A sequence of twitter.User instances, one for each follower
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "twitter.Api instance must be authenticated"})
+
+    result = []
+    parameters = {}
+    while True:
+      next_cursor, previous_cursor, data = self.GetFollowersPaged(user_id, screen_name, cursor, count, skip_status, include_user_entities)
+      result += [User.NewFromJsonDict(x) for x in data['users']]
+      if next_cursor == 0 or next_cursor == previous_cursor:
+        break
+      else:
+        cursor = next_cursor
+      sec = self.GetSleepTime('/followers/list')
+      time.sleep(sec)
+
+    return result
+
+  def UsersLookup(self,
+                  user_id=None,
+                  screen_name=None,
+                  users=None,
+                  include_entities=True):
+    '''Fetch extended information for the specified users.
+
+    Users may be specified either as lists of either user_ids,
+    screen_names, or twitter.User objects. The list of users that
+    are queried is the union of all specified parameters.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A list of user_ids to retrieve extended information. [Optional]
+      screen_name:
+        A list of screen_names to retrieve extended information. [Optional]
+      users:
+        A list of twitter.User objects to retrieve extended information.
+        [Optional]
+      include_entities:
+        The entities node that may appear within embedded statuses will be
+        disincluded when set to False. [Optional]
+
+    Returns:
+      A list of twitter.User objects for the requested users
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+    if not user_id and not screen_name and not users:
+      raise TwitterError({'message': "Specify at least one of user_id, screen_name, or users."})
+
+    url = '%s/users/lookup.json' % self.base_url
+    parameters = {}
+    uids = list()
+    if user_id:
+      uids.extend(user_id)
+    if users:
+      uids.extend([u.id for u in users])
+    if len(uids):
+      parameters['user_id'] = ','.join(["%s" % u for u in uids])
+    if screen_name:
+      parameters['screen_name'] = ','.join(screen_name)
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    try:
+      data = self._ParseAndCheckTwitter(json.content)
+    except TwitterError, e:
+        _, e, _ = sys.exc_info()
+        t = e.args[0]
+        if len(t) == 1 and ('code' in t[0]) and (t[0]['code'] == 34):
+          data = []
+        else:
+            raise
+
+    return [User.NewFromJsonDict(u) for u in data]
+
+  def GetUser(self,
+              user_id=None,
+              screen_name=None,
+              include_entities=True):
+    '''Returns a single user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The id of the user to retrieve. [Optional]
+      screen_name:
+        The screen name of the user for whom to return results for.
+        Either a user_id or screen_name is required for this method.
+        [Optional]
+      include_entities:
+        The entities node will be omitted when set to False.
+        [Optional]
+
+    Returns:
+      A twitter.User instance representing that user
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/users/show.json' % (self.base_url)
+    parameters = {}
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify at least one of user_id or screen_name."})
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def GetDirectMessages(self,
+                        since_id=None,
+                        max_id=None,
+                        count=None,
+                        include_entities=True,
+                        skip_status=False):
+    '''Returns a list of the direct messages sent to the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      count:
+        Specifies the number of direct messages to try and retrieve, up to a
+        maximum of 200. The value of count is best thought of as a limit to the
+        number of Tweets to return because suspended or deleted content is
+        removed after the count has been applied. [Optional]
+      include_entities:
+        The entities node will be omitted when set to False.
+        [Optional]
+      skip_status:
+        When set to True statuses will not be included in the returned user
+        objects. [Optional]
+
+    Returns:
+      A sequence of twitter.DirectMessage instances
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/direct_messages.json' % self.base_url
+    parameters = {}
+    if since_id:
+      parameters['since_id'] = since_id
+    if max_id:
+      parameters['max_id'] = max_id
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+    if skip_status:
+      parameters['skip_status'] = 1
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [DirectMessage.NewFromJsonDict(x) for x in data]
+
+  def GetSentDirectMessages(self,
+                            since_id=None,
+                            max_id=None,
+                            count=None,
+                            page=None,
+                            include_entities=True):
+    '''Returns a list of the direct messages sent by the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occured since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      count:
+        Specifies the number of direct messages to try and retrieve, up to a
+        maximum of 200. The value of count is best thought of as a limit to the
+        number of Tweets to return because suspended or deleted content is
+        removed after the count has been applied. [Optional]
+      page:
+        Specifies the page of results to retrieve.
+        Note: there are pagination limits. [Optional]
+      include_entities:
+        The entities node will be omitted when set to False.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.DirectMessage instances
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/direct_messages/sent.json' % self.base_url
+    parameters = {}
+    if since_id:
+      parameters['since_id'] = since_id
+    if page:
+      parameters['page'] = page
+    if max_id:
+      parameters['max_id'] = max_id
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [DirectMessage.NewFromJsonDict(x) for x in data]
+
+  def PostDirectMessage(self,
+                        text,
+                        user_id=None,
+                        screen_name=None):
+    '''Post a twitter direct message from the authenticated user.
+
+    The twitter.Api instance must be authenticated. user_id or screen_name
+    must be specified.
+
+    Args:
+      text: The message text to be posted.  Must be less than 140 characters.
+      user_id:
+        The ID of the user who should receive the direct message. [Optional]
+      screen_name:
+        The screen name of the user who should receive the direct message. [Optional]
+
+    Returns:
+      A twitter.DirectMessage instance representing the message posted
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "The twitter.Api instance must be authenticated."})
+
+    url = '%s/direct_messages/new.json' % self.base_url
+    data = {'text': text}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify at least one of user_id or screen_name."})
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return DirectMessage.NewFromJsonDict(data)
+
+  def DestroyDirectMessage(self, id, include_entities=True):
+    '''Destroys the direct message specified in the required ID parameter.
+
+    The twitter.Api instance must be authenticated, and the
+    authenticating user must be the recipient of the specified direct
+    message.
+
+    Args:
+      id: The id of the direct message to be destroyed
+
+    Returns:
+      A twitter.DirectMessage instance representing the message destroyed
+    '''
+    url = '%s/direct_messages/destroy.json' % self.base_url
+    data = {'id': id}
+    if not include_entities:
+      data['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return DirectMessage.NewFromJsonDict(data)
+
+  def CreateFriendship(self, user_id=None, screen_name=None, follow=True):
+    '''Befriends the user specified by the user_id or screen_name.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A user_id to follow [Optional]
+      screen_name:
+        A screen_name to follow [Optional]
+      follow:
+        Set to False to disable notifications for the target user
+
+    Returns:
+      A twitter.User instance representing the befriended user.
+    '''
+    url = '%s/friendships/create.json' % (self.base_url)
+    data = {}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify at least one of user_id or screen_name."})
+    if follow:
+      data['follow'] = 'true'
+    else:
+      data['follow'] = 'false'
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def DestroyFriendship(self, user_id=None, screen_name=None):
+    '''Discontinues friendship with a user_id or screen_name.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A user_id to unfollow [Optional]
+      screen_name:
+        A screen_name to unfollow [Optional]
+
+    Returns:
+      A twitter.User instance representing the discontinued friend.
+    '''
+    url = '%s/friendships/destroy.json' % self.base_url
+    data = {}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify at least one of user_id or screen_name."})
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def LookupFriendship(self, user_id=None, screen_name=None):
+    '''Lookup friendship status for user specified by user_id or screen_name.
+
+    Currently only supports one user at a time.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A user_id to lookup [Optional]
+      screen_name:
+        A screen_name to lookup [Optional]
+
+    Returns:
+      A twitter.UserStatus instance representing the friendship status
+    '''
+    url = '%s/friendships/lookup.json' % (self.base_url)
+    data = {}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify at least one of user_id or screen_name."})
+
+    json = self._RequestUrl(url, 'GET', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    if len(data) >= 1:
+      return UserStatus.NewFromJsonDict(data[0])
+    else:
+      return None
+
+  def CreateFavorite(self,
+                     status=None,
+                     id=None,
+                     include_entities=True):
+    '''Favorites the specified status object or id as the authenticating user.
+
+    Returns the favorite status when successful.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The id of the twitter status to mark as a favorite. [Optional]
+      status:
+        The twitter.Status object to mark as a favorite. [Optional]
+      include_entities:
+        The entities node will be omitted when set to False. [Optional]
+
+    Returns:
+      A twitter.Status instance representing the newly-marked favorite.
+    '''
+    url = '%s/favorites/create.json' % self.base_url
+    data = {}
+    if id:
+      data['id'] = id
+    elif status:
+      data['id'] = status.id
+    else:
+      raise TwitterError({'message': "Specify id or status"})
+    if not include_entities:
+      data['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def DestroyFavorite(self,
+                      status=None,
+                      id=None,
+                      include_entities=True):
+    '''Un-Favorites the specified status object or id as the authenticating user.
+
+    Returns the un-favorited status when successful.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The id of the twitter status to unmark as a favorite. [Optional]
+      status:
+        The twitter.Status object to unmark as a favorite. [Optional]
+      include_entities:
+        The entities node will be omitted when set to False. [Optional]
+
+    Returns:
+      A twitter.Status instance representing the newly-unmarked favorite.
+    '''
+    url = '%s/favorites/destroy.json' % self.base_url
+    data = {}
+    if id:
+      data['id'] = id
+    elif status:
+      data['id'] = status.id
+    else:
+      raise TwitterError({'message': "Specify id or status"})
+    if not include_entities:
+      data['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return Status.NewFromJsonDict(data)
+
+  def GetFavorites(self,
+                   user_id=None,
+                   screen_name=None,
+                   count=None,
+                   since_id=None,
+                   max_id=None,
+                   include_entities=True):
+    '''Return a list of Status objects representing favorited tweets.
+
+    Returns up to the 20 most recent tweets for the authenticated user.
+
+    Args:
+      user:
+        The twitter name or id of the user whose favorites you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      page:
+        Specifies the page of results to retrieve.
+        Note: there are pagination limits. [Optional]
+    '''
+    parameters = {}
+    url = '%s/favorites/list.json' % self.base_url
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = screen_name
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError({'message': "since_id must be an integer"})
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError({'message': "max_id must be an integer"})
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if include_entities:
+        parameters['include_entities'] = True
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetMentions(self,
+                  count=None,
+                  since_id=None,
+                  max_id=None,
+                  trim_user=False,
+                  contributor_details=False,
+                  include_entities=True):
+    '''Returns the 20 most recent mentions (status containing @screen_name)
+    for the authenticating user.
+
+    Args:
+      count:
+        Specifies the number of tweets to try and retrieve, up to a maximum of
+        200. The value of count is best thought of as a limit to the number of
+        tweets to return because suspended or deleted content is removed after
+        the count has been applied. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than
+        (that is, older than) the specified ID. [Optional]
+      trim_user:
+        When set to True, each tweet returned in a timeline will include a user
+        object including only the status authors numerical ID. Omit this
+        parameter to receive the complete user object. [Optional]
+      contributor_details:
+        If set to True, this parameter enhances the contributors element of the
+        status response to include the screen_name of the contributor. By
+        default only the user_id of the contributor is included. [Optional]
+      include_entities:
+        The entities node will be disincluded when set to False. [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each mention of the user.
+    '''
+    url = '%s/statuses/mentions_timeline.json' % self.base_url
+    parameters = {}
+
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError({'message': "since_id must be an integer"})
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError({'message': "max_id must be an integer"})
+    if trim_user:
+      parameters['trim_user'] = 1
+    if contributor_details:
+      parameters['contributor_details'] = 'true'
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  # List endpoint status
+  # done GET lists/list
+  # done GET lists/statuses
+  # done POST lists/subscribers/create
+  # done GET lists/subscribers/show
+  # done POST lists/subscribers/destroy
+  # done GET lists/members
+  # done POST lists/members/create
+  # done POST lists/members/create_all
+  # done POST lists/members/destroy
+  # done POST lists/members/destroy_all
+  #      GET lists/members/show
+  # done POST lists/create
+  # done POST lists/destroy
+  #      POST lists/update
+  #      GET lists/show
+  # done GET lists/subscriptions
+  #      GET lists/memberships
+  #      GET lists/subscribers
+  # done GET lists/ownerships
+
+  def CreateList(self, name, mode=None, description=None):
+    '''Creates a new list with the give name for the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/create
+
+    Args:
+      name:
+        New name for the list
+      mode:
+        'public' or 'private'.
+        Defaults to 'public'. [Optional]
+      description:
+        Description of the list. [Optional]
+
+    Returns:
+      A twitter.List instance representing the new list
+    '''
+    url = '%s/lists/create.json' % self.base_url
+    parameters = {'name': name}
+    if mode is not None:
+      parameters['mode'] = mode
+    if description is not None:
+      parameters['description'] = description
+
+    json = self._RequestUrl(url, 'POST', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return List.NewFromJsonDict(data)
+
+  def DestroyList(self,
+                  owner_screen_name=False,
+                  owner_id=False,
+                  list_id=None,
+                  slug=None):
+    '''Destroys the list identified by list_id or owner_screen_name/owner_id and slug.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/destroy
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+
+    Returns:
+      A twitter.List instance representing the removed list.
+    '''
+    url = '%s/lists/destroy.json' % self.base_url
+    data = {}
+    if list_id:
+      try:
+        data['list_id'] = long(list_id)
+      except ValueError:
+        raise TwitterError({'message': "list_id must be an integer"})
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except ValueError:
+          raise TwitterError({'message': "owner_id must be an integer"})
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    else:
+      raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return List.NewFromJsonDict(data)
+
+  def CreateSubscription(self,
+                         owner_screen_name=False,
+                         owner_id=False,
+                         list_id=None,
+                         slug=None):
+    '''Creates a subscription to a list by the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/subscribers/create
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+
+    Returns:
+      A twitter.User instance representing the user subscribed
+    '''
+    url = '%s/lists/subscribers/create.json' % (self.base_url)
+    data = {}
+    if list_id:
+      try:
+        data['list_id'] = long(list_id)
+      except ValueError:
+        raise TwitterError({'message': "list_id must be an integer"})
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except ValueError:
+          raise TwitterError({'message': "owner_id must be an integer"})
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    else:
+      raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def DestroySubscription(self,
+                          owner_screen_name=False,
+                          owner_id=False,
+                          list_id=None,
+                          slug=None):
+    '''Destroys the subscription to a list for the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/subscribers/destroy
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+
+    Returns:
+      A twitter.List instance representing the removed list.
+    '''
+    url = '%s/lists/subscribers/destroy.json' % (self.base_url)
+    data = {}
+    if list_id:
+      try:
+        data['list_id'] = long(list_id)
+      except ValueError:
+        raise TwitterError({'message': "list_id must be an integer"})
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except ValueError:
+          raise TwitterError({'message': "owner_id must be an integer"})
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    else:
+      raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return List.NewFromJsonDict(data)
+
+  def ShowSubscription(self,
+                       owner_screen_name=False,
+                       owner_id=False,
+                       list_id=None,
+                       slug=None,
+                       user_id=None,
+                       screen_name=None,
+                       include_entities=False,
+                       skip_status=False):
+    '''Check if the specified user is a subscriber of the specified list.
+
+    Returns the user if they are subscriber.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/subscribers/show
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical ID of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical ID.
+        If you decide to do so, note that you'll also have to specify
+        the list owner using the owner_id or owner_screen_name parameters.
+      user_id:
+        The user_id or a list of user_id's to add to the list.
+        If not given, then screen_name is required.
+      screen_name:
+        The screen_name or a list of screen_name's to add to the list.
+        If not given, then user_id is required.
+      include_entities:
+        If False, the timeline will not contain additional metadata.
+        Defaults to True. [Optional]
+      skip_status:
+        If True the statuses will not be returned in the user items. [Optional]
+    Returns:
+      A twitter.User instance representing the user requested
+    '''
+    url = '%s/lists/subscribers/show.json' % (self.base_url)
+    data = {}
+    if list_id:
+      try:
+        data['list_id'] = long(list_id)
+      except ValueError:
+        raise TwitterError({'message': "list_id must be an integer"})
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except ValueError:
+          raise TwitterError({'message': "owner_id must be an integer"})
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    else:
+      raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    if user_id:
+      try:
+        data['user_id'] = long(user_id)
+      except ValueError:
+        raise TwitterError({'message': "user_id must be an integer"})
+    elif screen_name:
+        data['screen_name'] = screen_name
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_entities:
+      parameters['include_entities'] = True
+
+    json = self._RequestUrl(url, 'GET', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def GetSubscriptions(self,
+                       user_id=None,
+                       screen_name=None,
+                       count=20,
+                       cursor=-1):
+    '''Obtain a collection of the lists the specified user is subscribed to.
+
+    The list will contain a maximum of 20 lists per page by default.
+
+    Does not include the user's own lists.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/subscriptions
+
+    Args:
+      user_id:
+        The ID of the user for whom to return results for. [Optional]
+      screen_name:
+        The screen name of the user for whom to return results for. [Optional]
+      count:
+       The amount of results to return per page.
+       No more than 1000 results will ever be returned in a single page.
+       Defaults to 20. [Optional]
+      cursor:
+        The "page" value that Twitter will use to start building the list sequence from.
+        Use the value of -1 to start at the beginning.
+        Twitter will return in the result the values for next_cursor and previous_cursor. [Optional]
+
+    Returns:
+      A sequence of twitter.List instances, one for each list
+    '''
+    url = '%s/lists/subscriptions.json' % (self.base_url)
+    parameters = {}
+    try:
+      parameters['cursor'] = int(cursor)
+    except ValueError:
+      raise TwitterError({'message': "cursor must be an integer"})
+    try:
+      parameters['count'] = int(count)
+    except ValueError:
+      raise TwitterError({'message': "count must be an integer"})
+    if user_id is not None:
+      try:
+        parameters['user_id'] = long(user_id)
+      except ValueError:
+        raise TwitterError({'message': "user_id must be an integer"})
+    elif screen_name is not None:
+      parameters['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify user_id or screen_name"})
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [List.NewFromJsonDict(x) for x in data['lists']]
+
+  def GetListsList(self,
+                   screen_name,
+                   user_id=None,
+                   reverse=False):
+    '''Returns a single status message, specified by the id parameter.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/list
+
+    Args:
+      screen_name:
+        Specifies the screen name of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid screen
+        name is also a user ID.
+      user_id:
+        Specifies the ID of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid user ID
+        is also a valid screen name. [Optional]
+      reverse:
+        If False, the owned lists will be returned first, othewise subscribed
+        lists will be at the top. Returns a maximum of 100 entries regardless.
+        Defaults to False. [Optional]
+
+    Returns:
+      A list of twitter List items.
+    '''
+    url = '%s/lists/list.json' % (self.base_url)
+    parameters = {}
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = screen_name
+    if reverse:
+      parameters['reverse'] = 'true'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [List.NewFromJsonDict(x) for x in data]
+
+  def GetListTimeline(self,
+                      list_id,
+                      slug,
+                      owner_id=None,
+                      owner_screen_name=None,
+                      since_id=None,
+                      max_id=None,
+                      count=None,
+                      include_rts=True,
+                      include_entities=True):
+    '''Fetch the sequence of Status messages for a given List ID.
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Twitter endpoint: /lists/statuses
+
+    Args:
+      list_id:
+        Specifies the ID of the list to retrieve.
+      slug:
+        The slug name for the list to retrieve. If you specify None for the
+        list_id, then you have to provide either a owner_screen_name or owner_id.
+      owner_id:
+        Specifies the ID of the user for whom to return the
+        list timeline. Helpful for disambiguating when a valid user ID
+        is also a valid screen name. [Optional]
+      owner_screen_name:
+        Specifies the screen name of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid screen
+        name is also a user ID. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent than)
+        the specified ID. There are limits to the number of Tweets which
+        can be accessed through the API.
+        If the limit of Tweets has occurred since the since_id, the since_id
+        will be forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      count:
+        Specifies the number of statuses to retrieve.
+        May not be greater than 200. [Optional]
+      include_rts:
+        If True, the timeline will contain native retweets (if they exist) in
+        addition to the standard stream of tweets. [Optional]
+      include_entities:
+        If False, the timeline will not contain additional metadata.
+        Defaults to True. [Optional]
+
+    Returns:
+      A sequence of Status instances, one for each message up to count
+    '''
+    parameters = { 'slug':    slug,
+                   'list_id': list_id,
+                 }
+    url = '%s/lists/statuses.json' % (self.base_url)
+    parameters['slug']    = slug
+    parameters['list_id'] = list_id
+    if list_id is None:
+      if slug is None:
+        raise TwitterError({'message': "list_id or slug required"})
+      if owner_id is None and not owner_screen_name:
+        raise TwitterError({'message': "if list_id is not given you have to include an owner to help identify the proper list"})
+    if owner_id:
+      parameters['owner_id'] = owner_id
+    if owner_screen_name:
+      parameters['owner_screen_name'] = owner_screen_name
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError({'message': "since_id must be an integer"})
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError({'message': "max_id must be an integer"})
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except ValueError:
+        raise TwitterError({'message': "count must be an integer"})
+    if not include_rts:
+      parameters['include_rts'] = 'false'
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._RequestUrl(url, 'GET', data=parameters)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetListMembers(self,
+                     list_id,
+                     slug,
+                     owner_id=None,
+                     owner_screen_name=None,
+                     cursor=-1,
+                     skip_status=False,
+                     include_entities=False):
+    '''Fetch the sequence of twitter.User instances, one for each member
+    of the given list_id or slug.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/members
+
+    Args:
+      list_id:
+        Specifies the ID of the list to retrieve.
+      slug:
+        The slug name for the list to retrieve. If you specify None for the
+        list_id, then you have to provide either a owner_screen_name or owner_id.
+      owner_id:
+        Specifies the ID of the user for whom to return the
+        list timeline. Helpful for disambiguating when a valid user ID
+        is also a valid screen name. [Optional]
+      owner_screen_name:
+        Specifies the screen name of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid screen
+        name is also a user ID. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns.
+      skip_status:
+        If True the statuses will not be returned in the user items.
+        [Optional]
+      include_entities:
+        If False, the timeline will not contain additional metadata.
+        Defaults to True. [Optional]
+
+    Returns:
+      A sequence of twitter.User instances, one for each follower
+    '''
+    parameters = { 'slug':    slug,
+                   'list_id': list_id,
+                 }
+    url = '%s/lists/members.json' % (self.base_url)
+    parameters['slug']    = slug
+    parameters['list_id'] = list_id
+    if list_id is None:
+      if slug is None:
+        raise TwitterError({'message': "list_id or slug required"})
+      if owner_id is None and not owner_screen_name:
+        raise TwitterError({'message': "if list_id is not given you have to include an owner to help identify the proper list"})
+    if owner_id:
+      parameters['owner_id'] = owner_id
+    if owner_screen_name:
+      parameters['owner_screen_name'] = owner_screen_name
+    if cursor:
+      try:
+        parameters['cursor'] = int(cursor)
+      except ValueError:
+        raise TwitterError({'message': "cursor must be an integer"})
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_entities:
+      parameters['include_user_entities'] = True
+    result = []
+
+    while True:
+      parameters['cursor'] = cursor
+      json = self._RequestUrl(url, 'GET', data=parameters)
+      data = self._ParseAndCheckTwitter(json.content)
+      result += [User.NewFromJsonDict(x) for x in data['users']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+      sec = self.GetSleepTime('/followers/list')
+      time.sleep(sec)
+
+    return result
+
+  def CreateListsMember(self,
+                        list_id=None,
+                        slug=None,
+                        user_id=None,
+                        screen_name=None,
+                        owner_screen_name=None,
+                        owner_id=None):
+    '''Add a new member (or list of members) to a user's list.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/members/create or /lists/members/create_all
+
+    Args:
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+      user_id:
+        The user_id or a list of user_id's to add to the list.
+        If not given, then screen_name is required.
+      screen_name:
+        The screen_name or a list of screen_name's to add to the list.
+        If not given, then user_id is required.
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+
+    Returns:
+      A twitter.List instance representing the list subscribed to
+    '''
+    isList = False
+    data = {}
+    if list_id:
+      try:
+        data['list_id'] = long(list_id)
+      except ValueError:
+        raise TwitterError({'message': "list_id must be an integer"})
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except ValueError:
+          raise TwitterError({'message': "owner_id must be an integer"})
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    else:
+      raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    if user_id:
+      try:
+        if type(user_id) == types.ListType or type(user_id) == types.TupleType:
+          isList = True
+          data['user_id'] = '%s' % ','.join(user_id)
+        else:
+          data['user_id'] = long(user_id)
+      except ValueError:
+        raise TwitterError({'message': "user_id must be an integer"})
+    elif screen_name:
+        if type(screen_name) == types.ListType or type(screen_name) == types.TupleType:
+          isList = True
+          data['screen_name'] = '%s' % ','.join(screen_name)
+        else:
+          data['screen_name'] = screen_name
+    if isList:
+      url = '%s/lists/members/create_all.json' % self.base_url
+    else:
+      url = '%s/lists/members/create.json' % self.base_url
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return List.NewFromJsonDict(data)
+
+  def DestroyListsMember(self,
+                         list_id=None,
+                         slug=None,
+                         owner_screen_name=False,
+                         owner_id=False,
+                         user_id=None,
+                         screen_name=None):
+    '''Destroys the subscription to a list for the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/subscribers/destroy
+
+    Args:
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id.
+        If you decide to do so, note that you'll also have to specify
+        the list owner using the owner_id or owner_screen_name parameters.
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      user_id:
+        The user_id or a list of user_id's to add to the list.
+        If not given, then screen_name is required.
+      screen_name:
+        The screen_name or a list of Screen_name's to add to the list.
+        If not given, then user_id is required.
+
+    Returns:
+      A twitter.List instance representing the removed list.
+    '''
+    isList = False
+    data = {}
+    if list_id:
+      try:
+        data['list_id'] = long(list_id)
+      except ValueError:
+        raise TwitterError({'message': "list_id must be an integer"})
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except ValueError:
+          raise TwitterError({'message': "owner_id must be an integer"})
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    else:
+      raise TwitterError({'message': "Identify list by list_id or owner_screen_name/owner_id and slug"})
+    if user_id:
+      try:
+        if type(user_id) == types.ListType or type(user_id) == types.TupleType:
+          isList = True
+          data['user_id'] = '%s' % ','.join(user_id)
+        else:
+          data['user_id'] = long(user_id)
+      except ValueError:
+        raise TwitterError({'message': "user_id must be an integer"})
+    elif screen_name:
+        if type(screen_name) == types.ListType or type(screen_name) == types.TupleType:
+          isList = True
+          data['screen_name'] = '%s' % ','.join(screen_name)
+        else:
+          data['screen_name'] = screen_name
+    if isList:
+      url = '%s/lists/members/destroy_all.json' % self.base_url
+    else:
+      url = '%s/lists/members/destroy.json' % (self.base_url)
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return List.NewFromJsonDict(data)
+
+  def GetLists(self,
+               user_id=None,
+               screen_name=None,
+               count=None,
+               cursor=-1):
+    '''Fetch the sequence of lists for a user.
+
+    The twitter.Api instance must be authenticated.
+
+    Twitter endpoint: /lists/ownerships
+
+    Args:
+      user_id:
+        The ID of the user for whom to return results for. [Optional]
+      screen_name:
+        The screen name of the user for whom to return results for. [Optional]
+      count:
+        The amount of results to return per page.
+        No more than 1000 results will ever be returned in a single page.
+        Defaults to 20. [Optional]
+      cursor:
+        The "page" value that Twitter will use to start building the list sequence from.
+        Use the value of -1 to start at the beginning.
+        Twitter will return in the result the values for next_cursor and previous_cursor. [Optional]
+
+    Returns:
+      A sequence of twitter.List instances, one for each list
+    '''
+    url = '%s/lists/ownerships.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      try:
+        parameters['user_id'] = long(user_id)
+      except ValueError:
+        raise TwitterError({'message': "user_id must be an integer"})
+    elif screen_name is not None:
+      parameters['screen_name'] = screen_name
+    else:
+      raise TwitterError({'message': "Specify user_id or screen_name"})
+    if count is not None:
+      parameters['count'] = count
+
+    while True:
+      parameters['cursor'] = cursor
+      json = self._RequestUrl(url, 'GET', data=parameters)
+      data = self._ParseAndCheckTwitter(json.content)
+      result += [List.NewFromJsonDict(x) for x in data['lists']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+
+    return result
+
+  def UpdateProfile(self,
+                    name=None,
+                    profileURL=None,
+                    location=None,
+                    description=None,
+                    include_entities=False,
+                    skip_status=False):
+    '''Update's the authenticated user's profile data.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      name:
+        Full name associated with the profile.
+        Maximum of 20 characters. [Optional]
+      profileURL:
+        URL associated with the profile.
+        Will be prepended with "http://" if not present.
+        Maximum of 100 characters. [Optional]
+      location:
+        The city or country describing where the user of the account is located.
+        The contents are not normalized or geocoded in any way.
+        Maximum of 30 characters. [Optional]
+      description:
+        A description of the user owning the account.
+        Maximum of 160 characters. [Optional]
+      include_entities:
+        The entities node will be omitted when set to False.
+        [Optional]
+      skip_status:
+        When set to either True, t or 1 then statuses will not be included
+        in the returned user objects. [Optional]
+
+    Returns:
+      A twitter.User instance representing the modified user.
+    '''
+    url = '%s/account/update_profile.json' % (self.base_url)
+    data = {}
+    if name:
+      data['name'] = name
+    if profileURL:
+      data['url'] = profileURL
+    if location:
+      data['location'] = location
+    if description:
+      data['description'] = description
+    if include_entities:
+      data['include_entities'] = include_entities
+    if skip_status:
+      data['skip_status'] = skip_status
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def UpdateBanner(self,
+                  image,
+                  include_entities=False,
+                  skip_status=False):
+    '''Updates the authenticated users profile banner.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      image:
+        Location of image in file system
+      include_entities:
+        If True, each tweet will include a node called "entities."
+        This node offers a variety of metadata about the tweet in a
+        discrete structure, including: user_mentions, urls, and hashtags.
+        [Optional]
+
+    Returns:
+      A twitter.List instance representing the list subscribed to
+    '''
+    url = '%s/account/update_profile_banner.json' % (self.base_url)
+    with open(image, 'rb') as image_file:
+      encoded_image = base64.b64encode(image_file.read())
+    data = {
+      # When updated for API v1.1 use image, not banner
+      # https://dev.twitter.com/docs/api/1.1/post/account/update_profile_banner
+      # 'image': encoded_image
+      'banner': encoded_image
+    }
+    if include_entities:
+      data['include_entities'] = 1
+    if skip_status:
+      data['skip_status'] = 1
+
+    json = self._RequestUrl(url, 'POST', data=data)
+    if json.status_code in [200, 201, 202]:
+      return True
+    if json.status_code == 400:
+      raise TwitterError({'message': "Image data could not be processed"})
+    if json.status_code == 422:
+      raise TwitterError({'message': "The image could not be resized or is too large."})
+
+    raise TwitterError({'message': "Unkown banner image upload issue"})
+
+  def GetStreamSample(self, delimited=None, stall_warnings=None):
+    '''Returns a small sample of public statuses.
+
+    Args:
+      delimited:
+        Specifies a message length. [Optional]
+      stall_warnings:
+        Set to True to have Twitter deliver stall warnings. [Optional]
+
+    Returns:
+      A Twitter stream
+    '''
+    url = '%s/statuses/sample.json' % self.stream_url
+    json = self._RequestStream(url, 'GET')
+    for line in json.iter_lines():
+      if line:
+        data = self._ParseAndCheckTwitter(line)
+        yield data
+
+  def GetStreamFilter(self,
+                      follow=None,
+                      track=None,
+                      locations=None,
+                      delimited=None,
+                      stall_warnings=None):
+    '''Returns a filtered view of public statuses.
+
+    Args:
+      follow:
+        A list of user IDs to track. [Optional]
+      track:
+        A list of expressions to track. [Optional]
+      locations:
+        A list of Latitude,Longitude pairs (as strings) specifying
+        bounding boxes for the tweets' origin. [Optional]
+      delimited:
+        Specifies a message length. [Optional]
+      stall_warnings:
+        Set to True to have Twitter deliver stall warnings. [Optional]
+
+    Returns:
+      A twitter stream
+    '''
+    if all((follow is None, track is None, locations is None)):
+      raise ValueError({'message': "No filter parameters specified."})
+    url = '%s/statuses/filter.json' % self.stream_url
+    data = {}
+    if follow is not None:
+      data['follow'] = ','.join(follow)
+    if track is not None:
+      data['track'] = ','.join(track)
+    if locations is not None:
+      data['locations'] = ','.join(locations)
+    if delimited is not None:
+      data['delimited'] = str(delimited)
+    if stall_warnings is not None:
+      data['stall_warnings'] = str(stall_warnings)
+
+    json = self._RequestStream(url, 'POST', data=data)
+    for line in json.iter_lines():
+      if line:
+        data = self._ParseAndCheckTwitter(line)
+        yield data
+
+  def GetUserStream(self,
+                    replies='all',
+                    withuser='user',
+                    track=None,
+                    locations=None,
+                    delimited=None,
+                    stall_warning=None,
+                    stringify_friend_ids=False):
+    '''Returns the data from the user stream.
+
+    Args:
+      replies:
+        Specifies whether to return additional @replies in the stream.
+        Defaults to 'all'.
+      withuser:
+        Specifies whether to return information for just the authenticating
+        user, or include messages from accounts the user follows. [Optional]
+      track:
+        A list of expressions to track. [Optional]
+      locations:
+        A list of Latitude,Longitude pairs (as strings) specifying
+        bounding boxes for the tweets' origin. [Optional]
+      delimited:
+        Specifies a message length. [Optional]
+      stall_warnings:
+        Set to True to have Twitter deliver stall warnings. [Optional]
+      stringify_friend_ids:
+        Specifies whether to send the friends list preamble as an array of
+        integers or an array of strings. [Optional]
+
+    Returns:
+      A twitter stream
+    '''
+    url = 'https://userstream.twitter.com/1.1/user.json'
+    data = {}
+    if stringify_friend_ids:
+      data['stringify_friend_ids'] = 'true'
+    if replies is not None:
+      data['replies'] = replies
+    if withuser is not None:
+      data['with'] = withuser
+    if track is not None:
+      data['track'] = ','.join(track)
+    if locations is not None:
+      data['locations'] = ','.join(locations)
+    if delimited is not None:
+      data['delimited'] = str(delimited)
+    if delimited is not None:
+      data['stall_warning'] = str(stall_warning)
+
+    r = self._RequestStream(url, 'POST', data=data)
+    for line in r.iter_lines():
+      if line:
+        data = self._ParseAndCheckTwitter(line)
+        yield data
+
+  def VerifyCredentials(self):
+    '''Returns a twitter.User instance if the authenticating user is valid.
+
+    Returns:
+      A twitter.User instance representing that user if the
+      credentials are valid, None otherwise.
+    '''
+    if not self.__auth:
+      raise TwitterError({'message': "Api instance must first be given user credentials."})
+    url = '%s/account/verify_credentials.json' % self.base_url
+    json = self._RequestUrl(url, 'GET')  # No_cache
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return User.NewFromJsonDict(data)
+
+  def SetCache(self, cache):
+    '''Override the default cache.  Set to None to prevent caching.
+
+    Args:
+      cache:
+        An instance that supports the same API as the twitter._FileCache
+    '''
+    if cache == DEFAULT_CACHE:
+      self._cache = _FileCache()
+    else:
+      self._cache = cache
+
+  def SetUrllib(self, urllib):
+    '''Override the default urllib implementation.
+
+    Args:
+      urllib:
+        An instance that supports the same API as the urllib2 module
+    '''
+    self._urllib = urllib
+
+  def SetCacheTimeout(self, cache_timeout):
+    '''Override the default cache timeout.
+
+    Args:
+      cache_timeout:
+        Time, in seconds, that responses should be reused.
+    '''
+    self._cache_timeout = cache_timeout
+
+  def SetUserAgent(self, user_agent):
+    '''Override the default user agent.
+
+    Args:
+      user_agent:
+        A string that should be send to the server as the user-agent.
+    '''
+    self._request_headers['User-Agent'] = user_agent
+
+  def SetXTwitterHeaders(self, client, url, version):
+    '''Set the X-Twitter HTTP headers that will be sent to the server.
+
+    Args:
+      client:
+         The client name as a string.  Will be sent to the server as
+         the 'X-Twitter-Client' header.
+      url:
+         The URL of the meta.xml as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-URL' header.
+      version:
+         The client version as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-Version' header.
+    '''
+    self._request_headers['X-Twitter-Client'] = client
+    self._request_headers['X-Twitter-Client-URL'] = url
+    self._request_headers['X-Twitter-Client-Version'] = version
+
+  def SetSource(self, source):
+    '''Suggest the "from source" value to be displayed on the Twitter web site.
+
+    The value of the 'source' parameter must be first recognized by
+    the Twitter server.
+
+    New source values are authorized on a case by case basis by the
+    Twitter development team.
+
+    Args:
+      source:
+        The source name as a string.  Will be sent to the server as
+        the 'source' parameter.
+    '''
+    self._default_params['source'] = source
+
+  def GetRateLimitStatus(self, resource_families=None):
+    '''Fetch the rate limit status for the currently authorized user.
+
+    Args:
+      resources:
+        A comma seperated list of resource families you want to know the current
+        rate limit disposition of. [Optional]
+
+    Returns:
+      A dictionary containing the time the limit will reset (reset_time),
+      the number of remaining hits allowed before the reset (remaining_hits),
+      the number of hits allowed in a 60-minute period (hourly_limit), and
+      the time of the reset in seconds since The Epoch (reset_time_in_seconds).
+    '''
+    url = '%s/application/rate_limit_status.json' % self.base_url
+    parameters = {}
+    if resource_families is not None:
+      parameters['resources'] = resource_families
+
+    json = self._RequestUrl(url, 'GET', data=parameters)  # No-Cache
+    data = self._ParseAndCheckTwitter(json.content)
+
+    return data
+
+  def GetAverageSleepTime(self, resources):
+    '''Determines the minimum number of seconds that a program must wait
+    before hitting the server again without exceeding the rate_limit
+    imposed for the currently authenticated user.
+
+    Returns:
+      The average seconds that the api must have to sleep
+    '''
+    if resources[0] == '/':
+        resources = resources[1:]
+    resource_families = resources[:resources.find('/')] if '/' in resources else resources
+    rate_status = self.GetRateLimitStatus(resource_families)
+    try:
+        reset_time = rate_status['resources'][resource_families]['/' + resources]['reset']
+        remaining = rate_status['resources'][resource_families]['/' + resources]['remaining']
+    except:
+        raise TwitterError({'message': 'Wrong resources'})
+    utc_now = datetime.datetime.utcnow()
+    utc_stuct = utc_now.timetuple()
+    current_time = timegm(utc_stuct)
+    delta = reset_time - current_time
+
+    if remaining == 0:
+        return remaining
+    else:
+        return delta/ remaining
+
+  def GetSleepTime(self, resources):
+    '''Determines the minimum number of seconds that a program must wait
+    before hitting the server again without exceeding the rate_limit
+    imposed for the currently authenticated user.
+
+    Returns:
+      The minimum seconds that the api must have to sleep before query again
+    '''
+    if resources[0] == '/':
+        resources = resources[1:]
+    resource_families = resources[:resources.find('/')] if '/' in resources else resources
+    rate_status = self.GetRateLimitStatus(resource_families)
+    try:
+        reset_time = rate_status['resources'][resource_families]['/' + resources]['reset']
+        remaining = rate_status['resources'][resource_families]['/' + resources]['remaining']
+    except:
+        raise TwitterError({'message': 'Wrong resources'})
+
+    if remaining == 0:
+        utc_now = datetime.datetime.utcnow()
+        utc_stuct = utc_now.timetuple()
+        current_time = timegm(utc_stuct)
+        delta = reset_time - current_time
+        if delta < 0:
+            return 0
+        else:
+            return delta
+    else:
+        return 0
+
+  def _BuildUrl(self, url, path_elements=None, extra_params=None):
+    # Break url into constituent parts
+    (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+
+    # Add any additional path elements to the path
+    if path_elements:
+      # Filter out the path elements that have a value of None
+      p = [i for i in path_elements if i]
+      if not path.endswith('/'):
+        path += '/'
+      path += '/'.join(p)
+
+    # Add any additional query parameters to the query string
+    if extra_params and len(extra_params) > 0:
+      extra_query = self._EncodeParameters(extra_params)
+      # Add it to the existing query
+      if query:
+        query += '&' + extra_query
+      else:
+        query = extra_query
+
+    # Return the rebuilt URL
+    return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
+
+  def _InitializeRequestHeaders(self, request_headers):
+    if request_headers:
+      self._request_headers = request_headers
+    else:
+      self._request_headers = {}
+
+  def _InitializeUserAgent(self):
+    user_agent = 'Python-urllib/%s (python-twitter/%s)' % \
+                 (self._urllib.__version__, __version__)
+    self.SetUserAgent(user_agent)
+
+  def _InitializeDefaultParameters(self):
+    self._default_params = {}
+
+  def _DecompressGzippedResponse(self, response):
+    raw_data = response.read()
+    if response.headers.get('content-encoding', None) == 'gzip':
+      url_data = gzip.GzipFile(fileobj=StringIO.StringIO(raw_data)).read()
+    else:
+      url_data = raw_data
+    return url_data
+
+  def _Encode(self, s):
+    if self._input_encoding:
+      return unicode(s, self._input_encoding).encode('utf-8')
+    else:
+      return unicode(s).encode('utf-8')
+
+  def _EncodeParameters(self, parameters):
+    '''Return a string in key=value&key=value form.
+
+    Values of None are not included in the output string.
+
+    Args:
+      parameters:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+    '''
+    if parameters is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in parameters.items() if v is not None]))
+
+  def _EncodePostData(self, post_data):
+    '''Return a string in key=value&key=value form.
+
+    Values are assumed to be encoded in the format specified by self._encoding,
+    and are subsequently URL encoded.
+
+    Args:
+      post_data:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+    '''
+    if post_data is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in post_data.items()]))
+
+  def _ParseAndCheckTwitter(self, json):
+    """Try and parse the JSON returned from Twitter and return
+    an empty dictionary if there is any error.
+
+    This is a purely defensive check because during some Twitter
+    network outages it will return an HTML failwhale page.
+    """
+    try:
+      data = simplejson.loads(json)
+      self._CheckForTwitterError(data)
+    except ValueError:
+      if "<title>Twitter / Over capacity</title>" in json:
+        raise TwitterError({'message': "Capacity Error"})
+      if "<title>Twitter / Error</title>" in json:
+        raise TwitterError({'message': "Technical Error"})
+      if "Exceeded connection limit for user" in json:
+        raise TwitterError({'message': "Exceeded connection limit for user"})
+      raise TwitterError({'message': "json decoding"})
+
+    return data
+
+  def _CheckForTwitterError(self, data):
+    """Raises a TwitterError if twitter returns an error message.
+
+    Args:
+      data:
+        A python dict created from the Twitter json response
+
+    Raises:
+      TwitterError wrapping the twitter error message if one exists.
+    """
+    # Twitter errors are relatively unlikely, so it is faster
+    # to check first, rather than try and catch the exception
+    if 'error' in data:
+      raise TwitterError(data['error'])
+    if 'errors' in data:
+      raise TwitterError(data['errors'])
+
+  def _RequestUrl(self, url, verb, data=None):
+    '''Request a url.
+
+       Args:
+         url:
+           The web location we want to retrieve.
+         verb:
+           Either POST or GET.
+         data:
+           A dict of (str, unicode) key/value pairs.
+
+       Returns:
+         A JSON object.
+    '''
+    if verb == 'POST':
+      if data.has_key('media_ids'):
+        url = self._BuildUrl(url, extra_params={'media_ids' : data['media_ids']})
+      if data.has_key('media'):
+        try:
+          return requests.post(
+            url,
+            files=data,
+            auth=self.__auth,
+            timeout=self._timeout
+          )
+        except requests.RequestException as e:
+          raise TwitterError(str(e))
+      else:
+        try:
+          return requests.post(
+            url,
+            data=data,
+            auth=self.__auth,
+            timeout=self._timeout
+          )
+        except requests.RequestException as e:
+          raise TwitterError(str(e))
+    if verb == 'GET':
+      url = self._BuildUrl(url, extra_params=data)
+      try:
+        return requests.get(
+          url,
+          auth=self.__auth,
+          timeout=self._timeout
+        )
+      except requests.RequestException as e:
+        raise TwitterError(str(e))
+    return 0  # if not a POST or GET request
+
+  def _RequestStream(self, url, verb, data=None):
+    '''Request a stream of data.
+
+       Args:
+         url:
+           The web location we want to retrieve.
+         verb:
+           Either POST or GET.
+         data:
+           A dict of (str, unicode) key/value pairs.
+
+       Returns:
+         A twitter stream.
+    '''
+    if verb == 'POST':
+      try:
+        return requests.post(url, data=data, stream=True,
+                             auth=self.__auth,
+                             timeout=self._timeout
+                            )
+      except requests.RequestException as e:
+        raise TwitterError(str(e))
+    if verb == 'GET':
+      url = self._BuildUrl(url, extra_params=data)
+      try:
+        return requests.get(url, stream=True, auth=self.__auth,
+                            timeout=self._timeout
+                           )
+      except requests.RequestException as e:
+        raise TwitterError(str(e))
+    return 0  # if not a POST or GET request
diff --git a/lib/twitter/direct_message.py b/lib/twitter/direct_message.py
new file mode 100644
index 0000000..39b3f68
--- /dev/null
+++ b/lib/twitter/direct_message.py
@@ -0,0 +1,290 @@
+#!/usr/bin/env python
+
+from calendar import timegm
+import rfc822
+
+from lib.twitter import simplejson, TwitterError
+
+class DirectMessage(object):
+  '''A class representing the DirectMessage structure used by the twitter API.
+
+  The DirectMessage structure exposes the following properties:
+
+    direct_message.id
+    direct_message.created_at
+    direct_message.created_at_in_seconds # read only
+    direct_message.sender_id
+    direct_message.sender_screen_name
+    direct_message.recipient_id
+    direct_message.recipient_screen_name
+    direct_message.text
+  '''
+
+  def __init__(self,
+               id=None,
+               created_at=None,
+               sender_id=None,
+               sender_screen_name=None,
+               recipient_id=None,
+               recipient_screen_name=None,
+               text=None):
+    '''An object to hold a Twitter direct message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      id:
+        The unique id of this direct message. [Optional]
+      created_at:
+        The time this direct message was posted. [Optional]
+      sender_id:
+        The id of the twitter user that sent this message. [Optional]
+      sender_screen_name:
+        The name of the twitter user that sent this message. [Optional]
+      recipient_id:
+        The id of the twitter that received this message. [Optional]
+      recipient_screen_name:
+        The name of the twitter that received this message. [Optional]
+      text:
+        The text of this direct message. [Optional]
+    '''
+    self.id = id
+    self.created_at = created_at
+    self.sender_id = sender_id
+    self.sender_screen_name = sender_screen_name
+    self.recipient_id = recipient_id
+    self.recipient_screen_name = recipient_screen_name
+    self.text = text
+
+  def GetId(self):
+    '''Get the unique id of this direct message.
+
+    Returns:
+      The unique id of this direct message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this direct message.
+
+    Args:
+      id:
+        The unique id of this direct message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this direct message.')
+
+  def GetCreatedAt(self):
+    '''Get the time this direct message was posted.
+
+    Returns:
+      The time this direct message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this direct message was posted.
+
+    Args:
+      created_at:
+        The time this direct message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this direct message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this direct message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this direct message was posted, in seconds since the epoch.
+    '''
+    return timegm(rfc822.parsedate(self.created_at))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this direct message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetSenderId(self):
+    '''Get the unique sender id of this direct message.
+
+    Returns:
+      The unique sender id of this direct message
+    '''
+    return self._sender_id
+
+  def SetSenderId(self, sender_id):
+    '''Set the unique sender id of this direct message.
+
+    Args:
+      sender_id:
+        The unique sender id of this direct message
+    '''
+    self._sender_id = sender_id
+
+  sender_id = property(GetSenderId, SetSenderId,
+                doc='The unique sender id of this direct message.')
+
+  def GetSenderScreenName(self):
+    '''Get the unique sender screen name of this direct message.
+
+    Returns:
+      The unique sender screen name of this direct message
+    '''
+    return self._sender_screen_name
+
+  def SetSenderScreenName(self, sender_screen_name):
+    '''Set the unique sender screen name of this direct message.
+
+    Args:
+      sender_screen_name:
+        The unique sender screen name of this direct message
+    '''
+    self._sender_screen_name = sender_screen_name
+
+  sender_screen_name = property(GetSenderScreenName, SetSenderScreenName,
+                doc='The unique sender screen name of this direct message.')
+
+  def GetRecipientId(self):
+    '''Get the unique recipient id of this direct message.
+
+    Returns:
+      The unique recipient id of this direct message
+    '''
+    return self._recipient_id
+
+  def SetRecipientId(self, recipient_id):
+    '''Set the unique recipient id of this direct message.
+
+    Args:
+      recipient_id:
+        The unique recipient id of this direct message
+    '''
+    self._recipient_id = recipient_id
+
+  recipient_id = property(GetRecipientId, SetRecipientId,
+                doc='The unique recipient id of this direct message.')
+
+  def GetRecipientScreenName(self):
+    '''Get the unique recipient screen name of this direct message.
+
+    Returns:
+      The unique recipient screen name of this direct message
+    '''
+    return self._recipient_screen_name
+
+  def SetRecipientScreenName(self, recipient_screen_name):
+    '''Set the unique recipient screen name of this direct message.
+
+    Args:
+      recipient_screen_name:
+        The unique recipient screen name of this direct message
+    '''
+    self._recipient_screen_name = recipient_screen_name
+
+  recipient_screen_name = property(GetRecipientScreenName, SetRecipientScreenName,
+                doc='The unique recipient screen name of this direct message.')
+
+  def GetText(self):
+    '''Get the text of this direct message.
+
+    Returns:
+      The text of this direct message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this direct message.
+
+    Args:
+      text:
+        The text of this direct message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this direct message')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+          self.id == other.id and \
+          self.created_at == other.created_at and \
+          self.sender_id == other.sender_id and \
+          self.sender_screen_name == other.sender_screen_name and \
+          self.recipient_id == other.recipient_id and \
+          self.recipient_screen_name == other.recipient_screen_name and \
+          self.text == other.text
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.DirectMessage instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.DirectMessage instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.DirectMessage instance.
+
+    Returns:
+      A JSON string representation of this twitter.DirectMessage instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.DirectMessage instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.DirectMessage instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.sender_id:
+      data['sender_id'] = self.sender_id
+    if self.sender_screen_name:
+      data['sender_screen_name'] = self.sender_screen_name
+    if self.recipient_id:
+      data['recipient_id'] = self.recipient_id
+    if self.recipient_screen_name:
+      data['recipient_screen_name'] = self.recipient_screen_name
+    if self.text:
+      data['text'] = self.text
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.DirectMessage instance
+    '''
+    return DirectMessage(created_at=data.get('created_at', None),
+                         recipient_id=data.get('recipient_id', None),
+                         sender_id=data.get('sender_id', None),
+                         text=data.get('text', None),
+                         sender_screen_name=data.get('sender_screen_name', None),
+                         id=data.get('id', None),
+                         recipient_screen_name=data.get('recipient_screen_name', None))
diff --git a/lib/twitter/error.py b/lib/twitter/error.py
new file mode 100644
index 0000000..01fcd8f
--- /dev/null
+++ b/lib/twitter/error.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+class TwitterError(Exception):
+  '''Base class for Twitter errors'''
+
+  @property
+  def message(self):
+    '''Returns the first argument used to construct this error.'''
+    return self.args[0]
diff --git a/lib/twitter/hashtag.py b/lib/twitter/hashtag.py
new file mode 100644
index 0000000..14135b9
--- /dev/null
+++ b/lib/twitter/hashtag.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+from lib.twitter import TwitterError
+
+class Hashtag(object):
+  ''' A class representing a twitter hashtag
+  '''
+  def __init__(self,
+               text=None):
+    self.text = text
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.Hashtag instance
+    '''
+    return Hashtag(text=data.get('text', None))
diff --git a/lib/twitter/list.py b/lib/twitter/list.py
new file mode 100644
index 0000000..6e02eba
--- /dev/null
+++ b/lib/twitter/list.py
@@ -0,0 +1,355 @@
+#!/usr/bin/env python
+
+from lib.twitter import simplejson, TwitterError, User
+
+class List(object):
+  '''A class representing the List structure used by the twitter API.
+
+  The List structure exposes the following properties:
+
+    list.id
+    list.name
+    list.slug
+    list.description
+    list.full_name
+    list.mode
+    list.uri
+    list.member_count
+    list.subscriber_count
+    list.following
+  '''
+  def __init__(self, **kwargs):
+    param_defaults = {
+      'id':               None,
+      'name':             None,
+      'slug':             None,
+      'description':      None,
+      'full_name':        None,
+      'mode':             None,
+      'uri':              None,
+      'member_count':     None,
+      'subscriber_count': None,
+      'following':        None,
+      'user':             None}
+    
+    for (param, default) in param_defaults.iteritems():
+      setattr(self, param, kwargs.get(param, default))
+
+  def GetId(self):
+    '''Get the unique id of this list.
+
+    Returns:
+      The unique id of this list
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this list.
+
+    Args:
+      id:
+        The unique id of this list.
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this list.')
+
+  def GetName(self):
+    '''Get the real name of this list.
+
+    Returns:
+      The real name of this list
+    '''
+    return self._name
+
+  def SetName(self, name):
+    '''Set the real name of this list.
+
+    Args:
+      name:
+        The real name of this list
+    '''
+    self._name = name
+
+  name = property(GetName, SetName,
+                  doc='The real name of this list.')
+
+  def GetSlug(self):
+    '''Get the slug of this list.
+
+    Returns:
+      The slug of this list
+    '''
+    return self._slug
+
+  def SetSlug(self, slug):
+    '''Set the slug of this list.
+
+    Args:
+      slug:
+        The slug of this list.
+    '''
+    self._slug = slug
+
+  slug = property(GetSlug, SetSlug,
+                  doc='The slug of this list.')
+
+  def GetDescription(self):
+    '''Get the description of this list.
+
+    Returns:
+      The description of this list
+    '''
+    return self._description
+
+  def SetDescription(self, description):
+    '''Set the description of this list.
+
+    Args:
+      description:
+        The description of this list.
+    '''
+    self._description = description
+
+  description = property(GetDescription, SetDescription,
+                         doc='The description of this list.')
+
+  def GetFull_name(self):
+    '''Get the full_name of this list.
+
+    Returns:
+      The full_name of this list
+    '''
+    return self._full_name
+
+  def SetFull_name(self, full_name):
+    '''Set the full_name of this list.
+
+    Args:
+      full_name:
+        The full_name of this list.
+    '''
+    self._full_name = full_name
+
+  full_name = property(GetFull_name, SetFull_name,
+                       doc='The full_name of this list.')
+
+  def GetMode(self):
+    '''Get the mode of this list.
+
+    Returns:
+      The mode of this list
+    '''
+    return self._mode
+
+  def SetMode(self, mode):
+    '''Set the mode of this list.
+
+    Args:
+      mode:
+        The mode of this list.
+    '''
+    self._mode = mode
+
+  mode = property(GetMode, SetMode,
+                  doc='The mode of this list.')
+
+  def GetUri(self):
+    '''Get the uri of this list.
+
+    Returns:
+      The uri of this list
+    '''
+    return self._uri
+
+  def SetUri(self, uri):
+    '''Set the uri of this list.
+
+    Args:
+      uri:
+        The uri of this list.
+    '''
+    self._uri = uri
+
+  uri = property(GetUri, SetUri,
+                 doc='The uri of this list.')
+
+  def GetMember_count(self):
+    '''Get the member_count of this list.
+
+    Returns:
+      The member_count of this list
+    '''
+    return self._member_count
+
+  def SetMember_count(self, member_count):
+    '''Set the member_count of this list.
+
+    Args:
+      member_count:
+        The member_count of this list.
+    '''
+    self._member_count = member_count
+
+  member_count = property(GetMember_count, SetMember_count,
+                          doc='The member_count of this list.')
+
+  def GetSubscriber_count(self):
+    '''Get the subscriber_count of this list.
+
+    Returns:
+      The subscriber_count of this list
+    '''
+    return self._subscriber_count
+
+  def SetSubscriber_count(self, subscriber_count):
+    '''Set the subscriber_count of this list.
+
+    Args:
+      subscriber_count:
+        The subscriber_count of this list.
+    '''
+    self._subscriber_count = subscriber_count
+
+  subscriber_count = property(GetSubscriber_count, SetSubscriber_count,
+                              doc='The subscriber_count of this list.')
+
+  def GetFollowing(self):
+    '''Get the following status of this list.
+
+    Returns:
+      The following status of this list
+    '''
+    return self._following
+
+  def SetFollowing(self, following):
+    '''Set the following status of this list.
+
+    Args:
+      following:
+        The following of this list.
+    '''
+    self._following = following
+
+  following = property(GetFollowing, SetFollowing,
+                       doc='The following status of this list.')
+
+  def GetUser(self):
+    '''Get the user of this list.
+
+    Returns:
+      The owner of this list
+    '''
+    return self._user
+
+  def SetUser(self, user):
+    '''Set the user of this list.
+
+    Args:
+      user:
+        The owner of this list.
+    '''
+    self._user = user
+
+  user = property(GetUser, SetUser,
+                  doc='The owner of this list.')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.id == other.id and \
+             self.name == other.name and \
+             self.slug == other.slug and \
+             self.description == other.description and \
+             self.full_name == other.full_name and \
+             self.mode == other.mode and \
+             self.uri == other.uri and \
+             self.member_count == other.member_count and \
+             self.subscriber_count == other.subscriber_count and \
+             self.following == other.following and \
+             self.user == other.user
+
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.List instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.List instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.List instance.
+
+    Returns:
+      A JSON string representation of this twitter.List instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.List instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.List instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.name:
+      data['name'] = self.name
+    if self.slug:
+      data['slug'] = self.slug
+    if self.description:
+      data['description'] = self.description
+    if self.full_name:
+      data['full_name'] = self.full_name
+    if self.mode:
+      data['mode'] = self.mode
+    if self.uri:
+      data['uri'] = self.uri
+    if self.member_count is not None:
+      data['member_count'] = self.member_count
+    if self.subscriber_count is not None:
+      data['subscriber_count'] = self.subscriber_count
+    if self.following is not None:
+      data['following'] = self.following
+    if self.user is not None:
+      data['user'] = self.user.AsDict()
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.List instance
+    '''
+    if 'user' in data:
+      user = User.NewFromJsonDict(data['user'])
+    else:
+      user = None
+    return List(id=data.get('id', None),
+                name=data.get('name', None),
+                slug=data.get('slug', None),
+                description=data.get('description', None),
+                full_name=data.get('full_name', None),
+                mode=data.get('mode', None),
+                uri=data.get('uri', None),
+                member_count=data.get('member_count', None),
+                subscriber_count=data.get('subscriber_count', None),
+                following=data.get('following', None),
+                user=user)
diff --git a/lib/twitter/parse_tweet.py b/lib/twitter/parse_tweet.py
new file mode 100644
index 0000000..f999e19
--- /dev/null
+++ b/lib/twitter/parse_tweet.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+import re
+
+from lib.twitter import TwitterError
+
+class ParseTweet:
+  # compile once on import
+  regexp = { "RT": "^RT", "MT":r"^MT", "ALNUM": r"(@[a-zA-Z0-9_]+)",
+             "HASHTAG": r"(#[\w\d]+)", "URL": r"([http://]?[a-zA-Z\d\/]+[\.]+[a-zA-Z\d\/\.]+)" }
+  regexp = dict((key,re.compile(value)) for key,value in regexp.items())
+
+  def __init__(self,timeline_owner,tweet):
+    ''' timeline_owner : twitter handle of user account. tweet - 140 chars from feed; object does all computation on construction
+        properties: 
+        RT, MT - boolean
+        URLs - list of URL
+        Hashtags - list of tags
+    '''
+    self.Owner = timeline_owner
+    self.tweet = tweet
+    self.UserHandles = ParseTweet.getUserHandles(tweet)
+    self.Hashtags = ParseTweet.getHashtags(tweet)
+    self.URLs = ParseTweet.getURLs(tweet)
+    self.RT = ParseTweet.getAttributeRT(tweet)
+    self.MT = ParseTweet.getAttributeMT(tweet)
+    
+    # additional intelligence
+    if ( self.RT and len(self.UserHandles) > 0 ): #change the owner of tweet?
+      self.Owner = self.UserHandles[0]
+    return
+
+  def __str__(self):
+    ''' for display method '''
+    return "owner %s, urls: %d, hashtags %d, user_handles %d, len_tweet %d, RT = %s, MT = %s"%(self.Owner,len(self.URLs),len(self.Hashtags),len(self.UserHandles), len(self.tweet), self.RT,self.MT)
+  
+  @staticmethod
+  def getAttributeRT( tweet ):
+    """ see if tweet is a RT """
+    return re.search(ParseTweet.regexp["RT"],tweet.strip()) != None
+
+  @staticmethod
+  def getAttributeMT( tweet ):
+    """ see if tweet is a MT """
+    return re.search(ParseTweet.regexp["MT"],tweet.strip()) != None
+  
+  @staticmethod
+  def getUserHandles( tweet ):
+    """ given a tweet we try and extract all user handles in order of occurrence"""
+    return re.findall(ParseTweet.regexp["ALNUM"],tweet)
+  
+  @staticmethod
+  def getHashtags( tweet ):
+    """ return all hashtags"""
+    return re.findall(ParseTweet.regexp["HASHTAG"],tweet)
+  
+  @staticmethod
+  def getURLs( tweet ):
+    """ URL : [http://]?[\w\.?/]+"""
+    return re.findall(ParseTweet.regexp["URL"],tweet)
diff --git a/lib/twitter/status.py b/lib/twitter/status.py
new file mode 100644
index 0000000..65d7cff
--- /dev/null
+++ b/lib/twitter/status.py
@@ -0,0 +1,735 @@
+#!/usr/bin/env python
+
+from calendar import timegm
+import rfc822
+import time
+
+from lib.twitter import simplejson, Hashtag, TwitterError, Url
+
+class Status(object):
+  '''A class representing the Status structure used by the twitter API.
+
+  The Status structure exposes the following properties:
+
+    status.contributors
+    status.coordinates
+    status.created_at
+    status.created_at_in_seconds # read only
+    status.favorited
+    status.favorite_count
+    status.geo
+    status.id
+    status.id_str
+    status.in_reply_to_screen_name
+    status.in_reply_to_user_id
+    status.in_reply_to_status_id
+    status.lang
+    status.place
+    status.retweet_count
+    status.relative_created_at # read only
+    status.source
+    status.text
+    status.truncated
+    status.location
+    status.user
+    status.urls
+    status.user_mentions
+    status.hashtags
+  '''
+  def __init__(self, **kwargs):
+    '''An object to hold a Twitter status message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      created_at:
+        The time this status message was posted. [Optional]
+      favorited:
+        Whether this is a favorite of the authenticated user. [Optional]
+      favorite_count:
+        Number of times this status message has been favorited. [Optional]
+      id:
+        The unique id of this status message. [Optional]
+      id_str:
+        The string form of the unique id of this status message. [Optional]
+      text:
+        The text of this status message. [Optional]
+      location:
+        the geolocation string associated with this message. [Optional]
+      relative_created_at:
+        A human readable string representing the posting time. [Optional]
+      user:
+        A twitter.User instance representing the person posting the
+        message. [Optional]
+      now:
+        The current time, if the client chooses to set it.
+        Defaults to the wall clock time. [Optional]
+      urls:
+      user_mentions:
+      hashtags:
+      geo:
+      place:
+      coordinates:
+      contributors:
+      retweeted:
+      retweeted_status:
+      current_user_retweet:
+      retweet_count:
+      possibly_sensitive:
+      scopes:
+      withheld_copyright:
+      withheld_in_countries:
+      withheld_scope:
+    '''
+    param_defaults = {
+      'coordinates':             None,
+      'contributors':            None,
+      'created_at':              None,
+      'current_user_retweet':    None,
+      'favorited':               None,
+      'favorite_count':          None,
+      'geo':                     None,
+      'id':                      None,
+      'id_str':                  None,
+      'in_reply_to_screen_name': None,
+      'in_reply_to_user_id':     None,
+      'in_reply_to_status_id':   None,
+      'lang':                    None,
+      'location':                None,
+      'now':                     None,
+      'place':                   None,
+      'possibly_sensitive':      None,
+      'retweeted':               None,
+      'retweeted_status':        None,
+      'retweet_count':           None,
+      'scopes':                  None,
+      'source':                  None,
+      'text':                    None,
+      'truncated':               None,
+      'urls':                    None,
+      'user':                    None,
+      'user_mentions':           None,
+      'hashtags':                None,
+      'media':                   None,
+      'withheld_copyright':      None,
+      'withheld_in_countries':   None,
+      'withheld_scope':          None}
+
+    for (param, default) in param_defaults.iteritems():
+      setattr(self, param, kwargs.get(param, default))
+
+  def GetCreatedAt(self):
+    '''Get the time this status message was posted.
+
+    Returns:
+      The time this status message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this status message was posted.
+
+    Args:
+      created_at:
+        The time this status message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this status message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this status message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this status message was posted, in seconds since the epoch.
+    '''
+    return timegm(rfc822.parsedate(self.created_at))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this status message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetFavorited(self):
+    '''Get the favorited setting of this status message.
+
+    Returns:
+      True if this status message is favorited; False otherwise
+    '''
+    return self._favorited
+
+  def SetFavorited(self, favorited):
+    '''Set the favorited state of this status message.
+
+    Args:
+      favorited:
+        boolean True/False favorited state of this status message
+    '''
+    self._favorited = favorited
+
+  favorited = property(GetFavorited, SetFavorited,
+                       doc='The favorited state of this status message.')
+
+  def GetFavoriteCount(self):
+    '''Get the favorite count of this status message.
+
+    Returns:
+      number of times this status message has been favorited
+    '''
+    return self._favorite_count
+
+  def SetFavoriteCount(self, favorite_count):
+    '''Set the favorited state of this status message.
+
+    Args:
+      favorite_count:
+        int number of favorites for this status message
+    '''
+    self._favorite_count = favorite_count
+
+  favorite_count = property(GetFavoriteCount, SetFavoriteCount,
+                       doc='The number of favorites for this status message.')
+
+  def GetId(self):
+    '''Get the unique id of this status message.
+
+    Returns:
+      The unique id of this status message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this status message.
+
+    Args:
+      id:
+        The unique id of this status message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this status message.')
+
+  def GetIdStr(self):
+    '''Get the unique id_str of this status message.
+
+    Returns:
+      The unique id_str of this status message
+    '''
+    return self._id_str
+
+  def SetIdStr(self, id_str):
+    '''Set the unique id_str of this status message.
+
+    Args:
+      id:
+        The unique id_str of this status message
+    '''
+    self._id_str = id_str
+
+  id_str = property(GetIdStr, SetIdStr,
+                doc='The unique id_str of this status message.')
+
+  def GetInReplyToScreenName(self):
+    return self._in_reply_to_screen_name
+
+  def SetInReplyToScreenName(self, in_reply_to_screen_name):
+    self._in_reply_to_screen_name = in_reply_to_screen_name
+
+  in_reply_to_screen_name = property(GetInReplyToScreenName, SetInReplyToScreenName,
+                                     doc='')
+
+  def GetInReplyToUserId(self):
+    return self._in_reply_to_user_id
+
+  def SetInReplyToUserId(self, in_reply_to_user_id):
+    self._in_reply_to_user_id = in_reply_to_user_id
+
+  in_reply_to_user_id = property(GetInReplyToUserId, SetInReplyToUserId,
+                                 doc='')
+
+  def GetInReplyToStatusId(self):
+    return self._in_reply_to_status_id
+
+  def SetInReplyToStatusId(self, in_reply_to_status_id):
+    self._in_reply_to_status_id = in_reply_to_status_id
+
+  in_reply_to_status_id = property(GetInReplyToStatusId, SetInReplyToStatusId,
+                                   doc='')
+
+  def GetTruncated(self):
+    return self._truncated
+
+  def SetTruncated(self, truncated):
+    self._truncated = truncated
+
+  truncated = property(GetTruncated, SetTruncated,
+                       doc='')
+
+  def GetRetweeted(self):
+    return self._retweeted
+
+  def SetRetweeted(self, retweeted):
+    self._retweeted = retweeted
+
+  retweeted = property(GetRetweeted, SetRetweeted,
+                       doc='')
+
+  def GetSource(self):
+    return self._source
+
+  def SetSource(self, source):
+    self._source = source
+
+  source = property(GetSource, SetSource,
+                    doc='')
+
+  def GetText(self):
+    '''Get the text of this status message.
+
+    Returns:
+      The text of this status message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this status message.
+
+    Args:
+      text:
+        The text of this status message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this status message')
+
+  def GetLang(self):
+    '''Get the machine-detected language of this status message 
+
+    Returns:
+      The machine-detected language  code of this status message.
+    '''  
+    return self._lang
+
+  '''
+  don't think that there will be a Setter....
+  def SetLang(selfm lang):
+      self._lang = lang
+      
+  '''
+  def GetLocation(self):
+    '''Get the geolocation associated with this status message
+
+    Returns:
+      The geolocation string of this status message.
+    '''
+    return self._location
+
+  def SetLocation(self, location):
+    '''Set the geolocation associated with this status message
+
+    Args:
+      location:
+        The geolocation string of this status message
+    '''
+    self._location = location
+
+  location = property(GetLocation, SetLocation,
+                      doc='The geolocation string of this status message')
+
+  def GetRelativeCreatedAt(self):
+    '''Get a human readable string representing the posting time
+
+    Returns:
+      A human readable string representing the posting time
+    '''
+    fudge = 1.25
+    delta = long(self.now) - long(self.created_at_in_seconds)
+
+    if delta < (1 * fudge):
+      return 'about a second ago'
+    elif delta < (60 * (1 / fudge)):
+      return 'about %d seconds ago' % (delta)
+    elif delta < (60 * fudge):
+      return 'about a minute ago'
+    elif delta < (60 * 60 * (1 / fudge)):
+      return 'about %d minutes ago' % (delta / 60)
+    elif delta < (60 * 60 * fudge) or delta / (60 * 60) == 1:
+      return 'about an hour ago'
+    elif delta < (60 * 60 * 24 * (1 / fudge)):
+      return 'about %d hours ago' % (delta / (60 * 60))
+    elif delta < (60 * 60 * 24 * fudge) or delta / (60 * 60 * 24) == 1:
+      return 'about a day ago'
+    else:
+      return 'about %d days ago' % (delta / (60 * 60 * 24))
+
+  relative_created_at = property(GetRelativeCreatedAt,
+                                 doc='Get a human readable string representing '
+                                     'the posting time')
+
+  def GetUser(self):
+    '''Get a twitter.User representing the entity posting this status message.
+
+    Returns:
+      A twitter.User representing the entity posting this status message
+    '''
+    return self._user
+
+  def SetUser(self, user):
+    '''Set a twitter.User representing the entity posting this status message.
+
+    Args:
+      user:
+        A twitter.User representing the entity posting this status message
+    '''
+    self._user = user
+
+  user = property(GetUser, SetUser,
+                  doc='A twitter.User representing the entity posting this '
+                      'status message')
+
+  def GetNow(self):
+    '''Get the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Returns:
+      Whatever the status instance believes the current time to be,
+      in seconds since the epoch.
+    '''
+    if self._now is None:
+      self._now = time.time()
+    return self._now
+
+  def SetNow(self, now):
+    '''Set the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Args:
+      now:
+        The wallclock time for this instance.
+    '''
+    self._now = now
+
+  now = property(GetNow, SetNow,
+                 doc='The wallclock time for this status instance.')
+
+  def GetGeo(self):
+    return self._geo
+
+  def SetGeo(self, geo):
+    self._geo = geo
+
+  geo = property(GetGeo, SetGeo,
+                 doc='')
+
+  def GetPlace(self):
+    return self._place
+
+  def SetPlace(self, place):
+    self._place = place
+
+  place = property(GetPlace, SetPlace,
+                   doc='')
+
+  def GetCoordinates(self):
+    return self._coordinates
+
+  def SetCoordinates(self, coordinates):
+    self._coordinates = coordinates
+
+  coordinates = property(GetCoordinates, SetCoordinates,
+                         doc='')
+
+  def GetContributors(self):
+    return self._contributors
+
+  def SetContributors(self, contributors):
+    self._contributors = contributors
+
+  contributors = property(GetContributors, SetContributors,
+                          doc='')
+
+  def GetRetweeted_status(self):
+    return self._retweeted_status
+
+  def SetRetweeted_status(self, retweeted_status):
+    self._retweeted_status = retweeted_status
+
+  retweeted_status = property(GetRetweeted_status, SetRetweeted_status,
+                              doc='')
+
+  def GetRetweetCount(self):
+    return self._retweet_count
+
+  def SetRetweetCount(self, retweet_count):
+    self._retweet_count = retweet_count
+
+  retweet_count = property(GetRetweetCount, SetRetweetCount,
+                           doc='')
+
+  def GetCurrent_user_retweet(self):
+    return self._current_user_retweet
+
+  def SetCurrent_user_retweet(self, current_user_retweet):
+    self._current_user_retweet = current_user_retweet
+
+  current_user_retweet = property(GetCurrent_user_retweet, SetCurrent_user_retweet,
+                                  doc='')
+
+  def GetPossibly_sensitive(self):
+    return self._possibly_sensitive
+
+  def SetPossibly_sensitive(self, possibly_sensitive):
+    self._possibly_sensitive = possibly_sensitive
+
+  possibly_sensitive = property(GetPossibly_sensitive, SetPossibly_sensitive,
+                                doc='')
+
+  def GetScopes(self):
+    return self._scopes
+
+  def SetScopes(self, scopes):
+    self._scopes = scopes
+
+  scopes = property(GetScopes, SetScopes, doc='')
+
+  def GetWithheld_copyright(self):
+    return self._withheld_copyright
+
+  def SetWithheld_copyright(self, withheld_copyright):
+    self._withheld_copyright = withheld_copyright
+
+  withheld_copyright = property(GetWithheld_copyright, SetWithheld_copyright,
+                                doc='')
+
+  def GetWithheld_in_countries(self):
+    return self._withheld_in_countries
+
+  def SetWithheld_in_countries(self, withheld_in_countries):
+    self._withheld_in_countries = withheld_in_countries
+
+  withheld_in_countries = property(GetWithheld_in_countries, SetWithheld_in_countries,
+                                doc='')
+
+  def GetWithheld_scope(self):
+    return self._withheld_scope
+
+  def SetWithheld_scope(self, withheld_scope):
+    self._withheld_scope = withheld_scope
+
+  withheld_scope = property(GetWithheld_scope, SetWithheld_scope,
+                                doc='')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.created_at == other.created_at and \
+             self.id == other.id and \
+             self.text == other.text and \
+             self.location == other.location and \
+             self.user == other.user and \
+             self.in_reply_to_screen_name == other.in_reply_to_screen_name and \
+             self.in_reply_to_user_id == other.in_reply_to_user_id and \
+             self.in_reply_to_status_id == other.in_reply_to_status_id and \
+             self.truncated == other.truncated and \
+             self.retweeted == other.retweeted and \
+             self.favorited == other.favorited and \
+             self.favorite_count == other.favorite_count and \
+             self.source == other.source and \
+             self.geo == other.geo and \
+             self.place == other.place and \
+             self.coordinates == other.coordinates and \
+             self.contributors == other.contributors and \
+             self.retweeted_status == other.retweeted_status and \
+             self.retweet_count == other.retweet_count and \
+             self.current_user_retweet == other.current_user_retweet and \
+             self.possibly_sensitive == other.possibly_sensitive and \
+             self.scopes == other.scopes and \
+             self.withheld_copyright == other.withheld_copyright and \
+             self.withheld_in_countries == other.withheld_in_countries and \
+             self.withheld_scope == other.withheld_scope
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.Status instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.Status instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self, allow_non_ascii=False):
+    '''A JSON string representation of this twitter.Status instance.
+    
+    To output non-ascii, set keyword allow_non_ascii=True.
+
+    Returns:
+      A JSON string representation of this twitter.Status instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True,
+               ensure_ascii= not allow_non_ascii )
+  def AsDict(self):
+    '''A dict representation of this twitter.Status instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.Status instance
+    '''
+    data = {}
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.favorited:
+      data['favorited'] = self.favorited
+    if self.favorite_count:
+      data['favorite_count'] = self.favorite_count
+    if self.id:
+      data['id'] = self.id
+    if self.text:
+      data['text'] = self.text
+    if self.lang:
+      data['lang'] = self.lang
+    if self.location:
+      data['location'] = self.location
+    if self.user:
+      data['user'] = self.user.AsDict()
+    if self.in_reply_to_screen_name:
+      data['in_reply_to_screen_name'] = self.in_reply_to_screen_name
+    if self.in_reply_to_user_id:
+      data['in_reply_to_user_id'] = self.in_reply_to_user_id
+    if self.in_reply_to_status_id:
+      data['in_reply_to_status_id'] = self.in_reply_to_status_id
+    if self.truncated is not None:
+      data['truncated'] = self.truncated
+    if self.retweeted is not None:
+      data['retweeted'] = self.retweeted
+    if self.favorited is not None:
+      data['favorited'] = self.favorited
+    if self.source:
+      data['source'] = self.source
+    if self.geo:
+      data['geo'] = self.geo
+    if self.place:
+      data['place'] = self.place
+    if self.coordinates:
+      data['coordinates'] = self.coordinates
+    if self.contributors:
+      data['contributors'] = self.contributors
+    if self.hashtags:
+      data['hashtags'] = [h.text for h in self.hashtags]
+    if self.media:
+      data['media'] = [m for m in self.media]
+    if self.retweeted_status:
+      data['retweeted_status'] = self.retweeted_status.AsDict()
+    if self.retweet_count:
+      data['retweet_count'] = self.retweet_count
+    if self.urls:
+      data['urls'] = dict([(url.url, url.expanded_url) for url in self.urls])
+    if self.user_mentions:
+      data['user_mentions'] = [um.AsDict() for um in self.user_mentions]
+    if self.current_user_retweet:
+      data['current_user_retweet'] = self.current_user_retweet
+    if self.possibly_sensitive:
+      data['possibly_sensitive'] = self.possibly_sensitive
+    if self.scopes:
+      data['scopes'] = self.scopes
+    if self.withheld_copyright:
+      data['withheld_copyright'] = self.withheld_copyright
+    if self.withheld_in_countries:
+      data['withheld_in_countries'] = self.withheld_in_countries
+    if self.withheld_scope:
+      data['withheld_scope'] = self.withheld_scope
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.Status instance
+    '''
+    if 'user' in data:
+      from lib.twitter import User
+      # Have to do the import here to prevent cyclic imports in the __init__.py
+      # file
+      user = User.NewFromJsonDict(data['user'])
+    else:
+      user = None
+    if 'retweeted_status' in data:
+      retweeted_status = Status.NewFromJsonDict(data['retweeted_status'])
+    else:
+      retweeted_status = None
+
+    if 'current_user_retweet' in data:
+      current_user_retweet = data['current_user_retweet']['id']
+    else:
+      current_user_retweet = None
+
+    urls = None
+    user_mentions = None
+    hashtags = None
+    media = None
+    if 'entities' in data:
+      if 'urls' in data['entities']:
+        urls = [Url.NewFromJsonDict(u) for u in data['entities']['urls']]
+      if 'user_mentions' in data['entities']:
+        from lib.twitter import User
+        user_mentions = [User.NewFromJsonDict(u) for u in data['entities']['user_mentions']]
+      if 'hashtags' in data['entities']:
+        hashtags = [Hashtag.NewFromJsonDict(h) for h in data['entities']['hashtags']]
+      if 'media' in data['entities']:
+        media = data['entities']['media']
+      else:
+        media = []
+
+    # the new extended entities
+    if 'extended_entities' in data:
+      if 'media' in data['extended_entities']:
+        media = [m for m in data['extended_entities']['media']]
+
+    return Status(created_at=data.get('created_at', None),
+                  favorited=data.get('favorited', None),
+                  favorite_count=data.get('favorite_count', None),
+                  id=data.get('id', None),
+                  text=data.get('text', None),
+                  location=data.get('location', None),
+                  lang=data.get('lang', None),
+                  in_reply_to_screen_name=data.get('in_reply_to_screen_name', None),
+                  in_reply_to_user_id=data.get('in_reply_to_user_id', None),
+                  in_reply_to_status_id=data.get('in_reply_to_status_id', None),
+                  truncated=data.get('truncated', None),
+                  retweeted=data.get('retweeted', None),
+                  source=data.get('source', None),
+                  user=user,
+                  urls=urls,
+                  user_mentions=user_mentions,
+                  hashtags=hashtags,
+                  media=media,
+                  geo=data.get('geo', None),
+                  place=data.get('place', None),
+                  coordinates=data.get('coordinates', None),
+                  contributors=data.get('contributors', None),
+                  retweeted_status=retweeted_status,
+                  current_user_retweet=current_user_retweet,
+                  retweet_count=data.get('retweet_count', None),
+                  possibly_sensitive=data.get('possibly_sensitive', None),
+                  scopes=data.get('scopes', None),
+                  withheld_copyright=data.get('withheld_copyright', None),
+                  withheld_in_countries=data.get('withheld_in_countries', None),
+                  withheld_scope=data.get('withheld_scope', None))
diff --git a/lib/twitter/trend.py b/lib/twitter/trend.py
new file mode 100644
index 0000000..7ae2fa4
--- /dev/null
+++ b/lib/twitter/trend.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+from lib.twitter import TwitterError
+
+class Trend(object):
+  ''' A class representing a trending topic
+  '''
+  def __init__(self, name=None, query=None, timestamp=None, url=None):
+    self.name = name
+    self.query = query
+    self.timestamp = timestamp
+    self.url = url
+
+  def __repr__(self):
+    return self.name
+
+  def __str__(self):
+    return 'Name: %s\nQuery: %s\nTimestamp: %s\nSearch URL: %s\n' % (self.name, self.query, self.timestamp, self.url)
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+          self.name == other.name and \
+          self.query == other.query and \
+          self.timestamp == other.timestamp and \
+          self.url == self.url
+    except AttributeError:
+      return False
+
+  @staticmethod
+  def NewFromJsonDict(data, timestamp=None):
+    '''Create a new instance based on a JSON dict
+
+    Args:
+      data:
+        A JSON dict
+      timestamp:
+        Gets set as the timestamp property of the new object
+
+    Returns:
+      A twitter.Trend object
+    '''
+    return Trend(name=data.get('name', None),
+                 query=data.get('query', None),
+                 url=data.get('url', None),
+                 timestamp=timestamp)
diff --git a/lib/twitter/url.py b/lib/twitter/url.py
new file mode 100644
index 0000000..91aedec
--- /dev/null
+++ b/lib/twitter/url.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+from lib.twitter import TwitterError
+
+class Url(object):
+  '''A class representing an URL contained in a tweet'''
+  def __init__(self,
+               url=None,
+               expanded_url=None):
+    self.url = url
+    self.expanded_url = expanded_url
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.Url instance
+    '''
+    return Url(url=data.get('url', None),
+               expanded_url=data.get('expanded_url', None))
diff --git a/lib/twitter/user.py b/lib/twitter/user.py
new file mode 100644
index 0000000..611fdf2
--- /dev/null
+++ b/lib/twitter/user.py
@@ -0,0 +1,862 @@
+#!/usr/bin/env python
+
+from lib.twitter import simplejson, TwitterError
+
+class UserStatus(object):
+  '''A class representing the UserStatus structure used by the twitter API.
+
+  The UserStatus structure exposes the following properties:
+
+    userstatus.name
+    userstatus.id_str
+    userstatus.id
+    userstatus.screen_name
+    userstatus.following
+    userstatus.followed_by
+  '''
+  def __init__(self, **kwargs):
+    '''An object to hold a Twitter user status message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Args:
+      id:
+        The unique id of this status message. [Optional]
+      id_str:
+        The string version of the unique id of this status message. [Optional]
+    '''
+    param_defaults = {
+      'name':                    None,
+      'id':                      None,
+      'id_str':                  None,
+      'screen_name':             None,
+      'following':               None,
+      'followed_by':             None}
+
+    for (param, default) in param_defaults.iteritems():
+      setattr(self, param, kwargs.get(param, default))
+
+  def GetFollowedBy(self):
+    return self.followed_by or False
+
+  def GetFollowing(self):
+    return self.following or False
+
+  def GetScreenName(self):
+    return self.screen_name
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.name == other.name and \
+             self.id == other.id and \
+             self.id_str == other.id_str and \
+             self.screen_name == other.screen_name and \
+             self.following == other.following and \
+             self.followed_by == other.followed_by
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.UserStatus instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.UserStatus instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.UserStatus instance.
+
+    Returns:
+      A JSON string representation of this twitter.UserStatus instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.UserStatus instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.UserStatus instance
+    '''
+    data = {}
+    if self.name:
+      data['name'] = self.name
+    if self.id:
+      data['id'] = self.id
+    if self.id_str:
+      data['id_str'] = self.id_str
+    if self.screen_name:
+      data['screen_name'] = self.screen_name
+    if self.following:
+      data['following'] = self.following
+    if self.followed_by:
+      data['followed_by'] = self.followed_by
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.UserStatus instance
+    '''
+    following = None
+    followed_by = None
+    if 'connections' in data:
+      if 'following' in data['connections']:
+        following = True
+      if 'followed_by' in data['connections']:
+        followed_by = True
+
+    return UserStatus(name=data.get('name', None),
+                  id=data.get('id', None),
+                  id_str=data.get('id_str', None),
+                  screen_name=data.get('screen_name', None),
+                  following=following,
+                  followed_by=followed_by)
+
+class User(object):
+  '''A class representing the User structure used by the twitter API.
+
+  The User structure exposes the following properties:
+
+    user.id
+    user.name
+    user.screen_name
+    user.location
+    user.description
+    user.default_profile
+    user.default_profile_image
+    user.profile_image_url
+    user.profile_background_tile
+    user.profile_background_image_url
+    user.profile_banner_url
+    user.profile_sidebar_fill_color
+    user.profile_background_color
+    user.profile_link_color
+    user.profile_text_color
+    user.protected
+    user.utc_offset
+    user.time_zone
+    user.url
+    user.status
+    user.statuses_count
+    user.followers_count
+    user.friends_count
+    user.favourites_count
+    user.geo_enabled
+    user.verified
+    user.lang
+    user.notifications
+    user.contributors_enabled
+    user.created_at
+    user.listed_count
+  '''
+  def __init__(self, **kwargs):
+    param_defaults = {
+      'id':                           None,
+      'name':                         None,
+      'screen_name':                  None,
+      'location':                     None,
+      'description':                  None,
+      'default_profile':              None,
+      'default_profile_image':        None,
+      'profile_image_url':            None,
+      'profile_background_tile':      None,
+      'profile_background_image_url': None,
+      'profile_banner_url':           None,
+      'profile_sidebar_fill_color':   None,
+      'profile_background_color':     None,
+      'profile_link_color':           None,
+      'profile_text_color':           None,
+      'protected':                    None,
+      'utc_offset':                   None,
+      'time_zone':                    None,
+      'followers_count':              None,
+      'friends_count':                None,
+      'statuses_count':               None,
+      'favourites_count':             None,
+      'url':                          None,
+      'status':                       None,
+      'geo_enabled':                  None,
+      'verified':                     None,
+      'lang':                         None,
+      'notifications':                None,
+      'contributors_enabled':         None,
+      'created_at':                   None,
+      'listed_count':                 None}
+
+    for (param, default) in param_defaults.iteritems():
+      setattr(self, param, kwargs.get(param, default))
+               
+
+  def GetId(self):
+    '''Get the unique id of this user.
+
+    Returns:
+      The unique id of this user
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this user.
+
+    Args:
+      id: The unique id of this user.
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this user.')
+
+  def GetName(self):
+    '''Get the real name of this user.
+
+    Returns:
+      The real name of this user
+    '''
+    return self._name
+
+  def SetName(self, name):
+    '''Set the real name of this user.
+
+    Args:
+      name: The real name of this user
+    '''
+    self._name = name
+
+  name = property(GetName, SetName,
+                  doc='The real name of this user.')
+
+  def GetScreenName(self):
+    '''Get the short twitter name of this user.
+
+    Returns:
+      The short twitter name of this user
+    '''
+    return self._screen_name
+
+  def SetScreenName(self, screen_name):
+    '''Set the short twitter name of this user.
+
+    Args:
+      screen_name: the short twitter name of this user
+    '''
+    self._screen_name = screen_name
+
+  screen_name = property(GetScreenName, SetScreenName,
+                         doc='The short twitter name of this user.')
+
+  def GetLocation(self):
+    '''Get the geographic location of this user.
+
+    Returns:
+      The geographic location of this user
+    '''
+    return self._location
+
+  def SetLocation(self, location):
+    '''Set the geographic location of this user.
+
+    Args:
+      location: The geographic location of this user
+    '''
+    self._location = location
+
+  location = property(GetLocation, SetLocation,
+                      doc='The geographic location of this user.')
+
+  def GetDescription(self):
+    '''Get the short text description of this user.
+
+    Returns:
+      The short text description of this user
+    '''
+    return self._description
+
+  def SetDescription(self, description):
+    '''Set the short text description of this user.
+
+    Args:
+      description: The short text description of this user
+    '''
+    self._description = description
+
+  description = property(GetDescription, SetDescription,
+                         doc='The short text description of this user.')
+
+  def GetUrl(self):
+    '''Get the homepage url of this user.
+
+    Returns:
+      The homepage url of this user
+    '''
+    return self._url
+
+  def SetUrl(self, url):
+    '''Set the homepage url of this user.
+
+    Args:
+      url: The homepage url of this user
+    '''
+    self._url = url
+
+  url = property(GetUrl, SetUrl,
+                 doc='The homepage url of this user.')
+
+  def GetProfileImageUrl(self):
+    '''Get the url of the thumbnail of this user.
+
+    Returns:
+      The url of the thumbnail of this user
+    '''
+    return self._profile_image_url
+
+  def SetProfileImageUrl(self, profile_image_url):
+    '''Set the url of the thumbnail of this user.
+
+    Args:
+      profile_image_url: The url of the thumbnail of this user
+    '''
+    self._profile_image_url = profile_image_url
+
+  profile_image_url = property(GetProfileImageUrl, SetProfileImageUrl,
+                              doc='The url of the thumbnail of this user.')
+
+  def GetProfileBackgroundTile(self):
+    '''Boolean for whether to tile the profile background image.
+
+    Returns:
+      True if the background is to be tiled, False if not, None if unset.
+    '''
+    return self._profile_background_tile
+
+  def SetProfileBackgroundTile(self, profile_background_tile):
+    '''Set the boolean flag for whether to tile the profile background image.
+
+    Args:
+      profile_background_tile: Boolean flag for whether to tile or not.
+    '''
+    self._profile_background_tile = profile_background_tile
+
+  profile_background_tile = property(GetProfileBackgroundTile, SetProfileBackgroundTile,
+                                     doc='Boolean for whether to tile the background image.')
+
+  def GetProfileBackgroundImageUrl(self):
+    return self._profile_background_image_url
+
+  def SetProfileBackgroundImageUrl(self, profile_background_image_url):
+    self._profile_background_image_url = profile_background_image_url
+
+  profile_background_image_url = property(GetProfileBackgroundImageUrl, SetProfileBackgroundImageUrl,
+                                          doc='The url of the profile background of this user.')
+
+  def GetProfileBannerUrl(self):
+    return self._profile_banner_url
+
+  def SetProfileBannerUrl(self, profile_banner_url):
+    self._profile_banner_url = profile_banner_url
+
+  profile_banner_url = property(GetProfileBannerUrl, SetProfileBannerUrl,
+                                          doc='The url of the profile banner of this user.')
+
+  def GetProfileSidebarFillColor(self):
+    return self._profile_sidebar_fill_color
+
+  def SetProfileSidebarFillColor(self, profile_sidebar_fill_color):
+    self._profile_sidebar_fill_color = profile_sidebar_fill_color
+
+  profile_sidebar_fill_color = property(GetProfileSidebarFillColor, SetProfileSidebarFillColor)
+
+  def GetProfileBackgroundColor(self):
+    return self._profile_background_color
+
+  def SetProfileBackgroundColor(self, profile_background_color):
+    self._profile_background_color = profile_background_color
+
+  profile_background_color = property(GetProfileBackgroundColor, SetProfileBackgroundColor)
+
+  def GetProfileLinkColor(self):
+    return self._profile_link_color
+
+  def SetProfileLinkColor(self, profile_link_color):
+    self._profile_link_color = profile_link_color
+
+  profile_link_color = property(GetProfileLinkColor, SetProfileLinkColor)
+
+  def GetProfileTextColor(self):
+    return self._profile_text_color
+
+  def SetProfileTextColor(self, profile_text_color):
+    self._profile_text_color = profile_text_color
+
+  profile_text_color = property(GetProfileTextColor, SetProfileTextColor)
+
+  def GetProtected(self):
+    return self._protected
+
+  def SetProtected(self, protected):
+    self._protected = protected
+
+  protected = property(GetProtected, SetProtected)
+
+  def GetUtcOffset(self):
+    return self._utc_offset
+
+  def SetUtcOffset(self, utc_offset):
+    self._utc_offset = utc_offset
+
+  utc_offset = property(GetUtcOffset, SetUtcOffset)
+
+  def GetTimeZone(self):
+    '''Returns the current time zone string for the user.
+
+    Returns:
+      The descriptive time zone string for the user.
+    '''
+    return self._time_zone
+
+  def SetTimeZone(self, time_zone):
+    '''Sets the user's time zone string.
+
+    Args:
+      time_zone:
+        The descriptive time zone to assign for the user.
+    '''
+    self._time_zone = time_zone
+
+  time_zone = property(GetTimeZone, SetTimeZone)
+
+  def GetStatus(self):
+    '''Get the latest twitter.Status of this user.
+
+    Returns:
+      The latest twitter.Status of this user
+    '''
+    return self._status
+
+  def SetStatus(self, status):
+    '''Set the latest twitter.Status of this user.
+
+    Args:
+      status:
+        The latest twitter.Status of this user
+    '''
+    self._status = status
+
+  status = property(GetStatus, SetStatus,
+                    doc='The latest twitter.Status of this user.')
+
+  def GetFriendsCount(self):
+    '''Get the friend count for this user.
+
+    Returns:
+      The number of users this user has befriended.
+    '''
+    return self._friends_count
+
+  def SetFriendsCount(self, count):
+    '''Set the friend count for this user.
+
+    Args:
+      count:
+        The number of users this user has befriended.
+    '''
+    self._friends_count = count
+
+  friends_count = property(GetFriendsCount, SetFriendsCount,
+                           doc='The number of friends for this user.')
+
+  def GetListedCount(self):
+    '''Get the listed count for this user.
+
+    Returns:
+      The number of lists this user belongs to.
+    '''
+    return self._listed_count
+
+  def SetListedCount(self, count):
+    '''Set the listed count for this user.
+
+    Args:
+      count:
+        The number of lists this user belongs to.
+    '''
+    self._listed_count = count
+
+  listed_count = property(GetListedCount, SetListedCount,
+                          doc='The number of lists this user belongs to.')
+
+  def GetFollowersCount(self):
+    '''Get the follower count for this user.
+
+    Returns:
+      The number of users following this user.
+    '''
+    return self._followers_count
+
+  def SetFollowersCount(self, count):
+    '''Set the follower count for this user.
+
+    Args:
+      count:
+        The number of users following this user.
+    '''
+    self._followers_count = count
+
+  followers_count = property(GetFollowersCount, SetFollowersCount,
+                             doc='The number of users following this user.')
+
+  def GetStatusesCount(self):
+    '''Get the number of status updates for this user.
+
+    Returns:
+      The number of status updates for this user.
+    '''
+    return self._statuses_count
+
+  def SetStatusesCount(self, count):
+    '''Set the status update count for this user.
+
+    Args:
+      count:
+        The number of updates for this user.
+    '''
+    self._statuses_count = count
+
+  statuses_count = property(GetStatusesCount, SetStatusesCount,
+                            doc='The number of updates for this user.')
+
+  def GetFavouritesCount(self):
+    '''Get the number of favourites for this user.
+
+    Returns:
+      The number of favourites for this user.
+    '''
+    return self._favourites_count
+
+  def SetFavouritesCount(self, count):
+    '''Set the favourite count for this user.
+
+    Args:
+      count:
+        The number of favourites for this user.
+    '''
+    self._favourites_count = count
+
+  favourites_count = property(GetFavouritesCount, SetFavouritesCount,
+                              doc='The number of favourites for this user.')
+
+  def GetGeoEnabled(self):
+    '''Get the setting of geo_enabled for this user.
+
+    Returns:
+      True/False if Geo tagging is enabled
+    '''
+    return self._geo_enabled
+
+  def SetGeoEnabled(self, geo_enabled):
+    '''Set the latest twitter.geo_enabled of this user.
+
+    Args:
+      geo_enabled:
+        True/False if Geo tagging is to be enabled
+    '''
+    self._geo_enabled = geo_enabled
+
+  geo_enabled = property(GetGeoEnabled, SetGeoEnabled,
+                         doc='The value of twitter.geo_enabled for this user.')
+
+  def GetVerified(self):
+    '''Get the setting of verified for this user.
+
+    Returns:
+      True/False if user is a verified account
+    '''
+    return self._verified
+
+  def SetVerified(self, verified):
+    '''Set twitter.verified for this user.
+
+    Args:
+      verified:
+        True/False if user is a verified account
+    '''
+    self._verified = verified
+
+  verified = property(GetVerified, SetVerified,
+                      doc='The value of twitter.verified for this user.')
+
+  def GetLang(self):
+    '''Get the setting of lang for this user.
+
+    Returns:
+      language code of the user
+    '''
+    return self._lang
+
+  def SetLang(self, lang):
+    '''Set twitter.lang for this user.
+
+    Args:
+      lang:
+        language code for the user
+    '''
+    self._lang = lang
+
+  lang = property(GetLang, SetLang,
+                  doc='The value of twitter.lang for this user.')
+
+  def GetNotifications(self):
+    '''Get the setting of notifications for this user.
+
+    Returns:
+      True/False for the notifications setting of the user
+    '''
+    return self._notifications
+
+  def SetNotifications(self, notifications):
+    '''Set twitter.notifications for this user.
+
+    Args:
+      notifications:
+        True/False notifications setting for the user
+    '''
+    self._notifications = notifications
+
+  notifications = property(GetNotifications, SetNotifications,
+                           doc='The value of twitter.notifications for this user.')
+
+  def GetContributorsEnabled(self):
+    '''Get the setting of contributors_enabled for this user.
+
+    Returns:
+      True/False contributors_enabled of the user
+    '''
+    return self._contributors_enabled
+
+  def SetContributorsEnabled(self, contributors_enabled):
+    '''Set twitter.contributors_enabled for this user.
+
+    Args:
+      contributors_enabled:
+        True/False contributors_enabled setting for the user
+    '''
+    self._contributors_enabled = contributors_enabled
+
+  contributors_enabled = property(GetContributorsEnabled, SetContributorsEnabled,
+                                  doc='The value of twitter.contributors_enabled for this user.')
+
+  def GetCreatedAt(self):
+    '''Get the setting of created_at for this user.
+
+    Returns:
+      created_at value of the user
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set twitter.created_at for this user.
+
+    Args:
+      created_at:
+        created_at value for the user
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The value of twitter.created_at for this user.')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.id == other.id and \
+             self.name == other.name and \
+             self.screen_name == other.screen_name and \
+             self.location == other.location and \
+             self.description == other.description and \
+             self.default_profile == other.default_profile and \
+             self.default_profile_image == other.default_profile_image and \
+             self.profile_image_url == other.profile_image_url and \
+             self.profile_background_tile == other.profile_background_tile and \
+             self.profile_background_image_url == other.profile_background_image_url and \
+             self.profile_banner_url == other.profile_banner_url and \
+             self.profile_sidebar_fill_color == other.profile_sidebar_fill_color and \
+             self.profile_background_color == other.profile_background_color and \
+             self.profile_link_color == other.profile_link_color and \
+             self.profile_text_color == other.profile_text_color and \
+             self.protected == other.protected and \
+             self.utc_offset == other.utc_offset and \
+             self.time_zone == other.time_zone and \
+             self.url == other.url and \
+             self.statuses_count == other.statuses_count and \
+             self.followers_count == other.followers_count and \
+             self.favourites_count == other.favourites_count and \
+             self.friends_count == other.friends_count and \
+             self.status == other.status and \
+             self.geo_enabled == other.geo_enabled and \
+             self.verified == other.verified and \
+             self.lang == other.lang and \
+             self.notifications == other.notifications and \
+             self.contributors_enabled == other.contributors_enabled and \
+             self.created_at == other.created_at and \
+             self.listed_count == other.listed_count
+
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.User instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.User instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.User instance.
+
+    Returns:
+      A JSON string representation of this twitter.User instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.User instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.User instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.name:
+      data['name'] = self.name
+    if self.screen_name:
+      data['screen_name'] = self.screen_name
+    if self.location:
+      data['location'] = self.location
+    if self.description:
+      data['description'] = self.description
+    if self.default_profile:
+      data['default_profile'] = self.default_profile
+    if self.default_profile_image:
+      data['default_profile_image'] = self.default_profile_image
+    if self.profile_image_url:
+      data['profile_image_url'] = self.profile_image_url
+    if self.profile_background_tile is not None:
+      data['profile_background_tile'] = self.profile_background_tile
+    if self.profile_background_image_url:
+      data['profile_background_image_url'] = self.profile_background_image_url
+    if self.profile_banner_url:
+      data['profile_banner_url'] = self.profile_banner_url
+    if self.profile_sidebar_fill_color:
+      data['profile_sidebar_fill_color'] = self.profile_sidebar_fill_color
+    if self.profile_background_color:
+      data['profile_background_color'] = self.profile_background_color
+    if self.profile_link_color:
+      data['profile_link_color'] = self.profile_link_color
+    if self.profile_text_color:
+      data['profile_text_color'] = self.profile_text_color
+    if self.protected is not None:
+      data['protected'] = self.protected
+    if self.utc_offset:
+      data['utc_offset'] = self.utc_offset
+    if self.time_zone:
+      data['time_zone'] = self.time_zone
+    if self.url:
+      data['url'] = self.url
+    if self.status:
+      data['status'] = self.status.AsDict()
+    if self.friends_count:
+      data['friends_count'] = self.friends_count
+    if self.followers_count:
+      data['followers_count'] = self.followers_count
+    if self.statuses_count:
+      data['statuses_count'] = self.statuses_count
+    if self.favourites_count:
+      data['favourites_count'] = self.favourites_count
+    if self.geo_enabled:
+      data['geo_enabled'] = self.geo_enabled
+    if self.verified:
+      data['verified'] = self.verified
+    if self.lang:
+      data['lang'] = self.lang
+    if self.notifications:
+      data['notifications'] = self.notifications
+    if self.contributors_enabled:
+      data['contributors_enabled'] = self.contributors_enabled
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.listed_count:
+      data['listed_count'] = self.listed_count
+
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.User instance
+    '''
+    if 'status' in data:
+      from lib.twitter import Status
+      # Have to do the import here to prevent cyclic imports in the __init__.py
+      # file
+      status = Status.NewFromJsonDict(data['status'])
+    else:
+      status = None
+    return User(id=data.get('id', None),
+                name=data.get('name', None),
+                screen_name=data.get('screen_name', None),
+                location=data.get('location', None),
+                description=data.get('description', None),
+                statuses_count=data.get('statuses_count', None),
+                followers_count=data.get('followers_count', None),
+                favourites_count=data.get('favourites_count', None),
+                default_profile=data.get('default_profile', None),
+                default_profile_image=data.get('default_profile_image', None),
+                friends_count=data.get('friends_count', None),
+                profile_image_url=data.get('profile_image_url_https', data.get('profile_image_url', None)),
+                profile_background_tile=data.get('profile_background_tile', None),
+                profile_background_image_url=data.get('profile_background_image_url', None),
+                profile_banner_url=data.get('profile_banner_url', None),
+                profile_sidebar_fill_color=data.get('profile_sidebar_fill_color', None),
+                profile_background_color=data.get('profile_background_color', None),
+                profile_link_color=data.get('profile_link_color', None),
+                profile_text_color=data.get('profile_text_color', None),
+                protected=data.get('protected', None),
+                utc_offset=data.get('utc_offset', None),
+                time_zone=data.get('time_zone', None),
+                url=data.get('url', None),
+                status=status,
+                geo_enabled=data.get('geo_enabled', None),
+                verified=data.get('verified', None),
+                lang=data.get('lang', None),
+                notifications=data.get('notifications', None),
+                contributors_enabled=data.get('contributors_enabled', None),
+                created_at=data.get('created_at', None),
+                listed_count=data.get('listed_count', None))
diff --git a/logs/wa.log b/logs/wa.log
deleted file mode 100644
index 115f812..0000000
--- a/logs/wa.log
+++ /dev/null
@@ -1,83 +0,0 @@
-2014-02-12 14:30:31,385: istsos - INFO - Executing GET on /wa/istsos/operations/initialization: Your istsos has been initializated
-2014-02-12 14:30:31,781: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [0] services
-2014-02-12 14:30:31,805: istsos - INFO - Executing GET on /wa/istsos/operations/status: Serverstatus request successfully executed
-2014-02-12 14:30:36,767: istsos - INFO - Executing GET on /wa/istsos/services/default/configsections/connection: Information successfully retrived
-2014-02-12 14:31:07,377: istsos - ERROR - Executing POST on /wa/istsos/services: schema "milan" already exists
-
-2014-02-12 14:31:07,538: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [1] services
-2014-02-12 14:31:09,256: istsos - INFO - Executing GET on /wa/istsos/operations/status: Serverstatus request successfully executed
-2014-02-12 14:31:15,573: istsos - INFO - Executing GET on /wa/istsos/services/default/configsections: List of sections successfully returned
-2014-02-12 14:31:15,754: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [1] services
-2014-02-12 14:31:19,965: istsos - INFO - Executing DELETE on /wa/istsos/services/milan: Service <milan> correctly deleted
-2014-02-12 14:31:20,008: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [0] services
-2014-02-12 14:31:20,115: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [0] services
-2014-02-12 14:31:20,327: istsos - INFO - Executing GET on /wa/istsos/operations/status: Serverstatus request successfully executed
-2014-02-12 14:31:26,323: istsos - INFO - Executing GET on /wa/istsos/services/default/configsections/connection: Information successfully retrived
-2014-02-12 14:31:36,497: istsos - INFO - Executing POST on /wa/istsos/services: New service <istzoz> correctly created
-2014-02-12 14:31:36,510: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [1] services
-2014-02-12 14:31:36,913: istsos - INFO - Executing GET on /wa/istsos/operations/status: Serverstatus request successfully executed
-2014-02-12 14:31:45,972: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/configsections: List of sections successfully returned
-2014-02-12 14:31:46,038: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/configsections/serviceurl: Information successfully retrived
-2014-02-12 14:32:01,507: istsos - INFO - Executing GET on /wa/istsos/services/default/configsections: List of sections successfully returned
-2014-02-12 14:32:01,884: istsos - INFO - Executing GET on /wa/istsos/operations/status: Serverstatus request successfully executed
-2014-02-12 14:34:06,884: istsos - INFO - Executing GET on /wa/istsos/services/default/configsections: List of sections successfully returned
-2014-02-12 14:34:07,417: istsos - INFO - Executing GET on /wa/istsos/operations/status: Serverstatus request successfully executed
-2014-02-12 14:35:04,159: istsos - ERROR - Executing GET on /wa/istsos/services/istzoz/procedures/T_TRE: Error loading DescribeSensor of 'T_TRE' [STATUS CODE: 200]: 'sml'
-2014-02-12 14:35:04,615: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/procedures: <?xml version="1.0" encoding="UTF-8"?>
-<sos:RegisterSensorResponse
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-     xmlns:sos="http://www.opengis.net/sos/1.0">
-<AssignedSensorId>urn:ogc:def:sensor:x-istsos:1.0:30b203f161a2d09448dc7cc9dc97c75d</AssignedSensorId>
-</sos:RegisterSensorResponse>
-2014-02-12 14:35:04,940: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/procedures/T_TRE: Sensor Description successfully loaded
-2014-02-12 14:35:05,215: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/operations/getobservation/offerings/temporary/procedures/T_TRE/observedproperties/urn/eventtime/last: GetObservation requested successfully executed
-2014-02-12 14:35:07,838: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>1 at 2@3 at 4@5 at 6@7 at 8@9 at 10@11 at 12@13 at 14@15 at 16@17 at 18@19 at 20@21 at 22@23 at 24@25 at 26@27 at 28@29 at 30@31 at 32@33 at 34@35 at 36@37 at 38@39 at 40@41 at 42@43 at 44@45 at 46@47 at 48@49 at 50@51 at 52@53 at 54@55 at 56@57 at 58@59 at 60@61 at 62@63 at 64@65 at 66@67 at 68@69 at 70@71 at 72@73 at 74@75 at 76@77 at 78@79 at 80@ [...]
-2014-02-12 14:35:10,489: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>248 at 249@250 at 251@252 at 253@254 at 255@256 at 257@258 at 259@260 at 261@262 at 263@264 at 265@266 at 267@268 at 269@270 at 271@272 at 273@274 at 275@276 at 277@278 at 279@280 at 281@282 at 283@284 at 285@286 at 287@288 at 289@290 at 291@292 at 293@294 at 295@296 at 297@298 at 299@300 at 301@302 at 303@304 at 305 [...]
-2014-02-12 14:35:12,729: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>968 at 969@970 at 971@972 at 973@974 at 975@976 at 977@978 at 979@980 at 981@982 at 983@984 at 985@986 at 987@988 at 989@990 at 991@992 at 993@994 at 995@996 at 997@998 at 999@1000 at 1001@1002 at 1003@1004 at 1005@1006 at 1007@1008 at 1009@1010 at 1011@1012 at 1013@1014 at 1015@1016 at 1017@1018 at 1019@102 [...]
-2014-02-12 14:35:14,148: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/configsections: List of sections successfully returned
-2014-02-12 14:35:14,617: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/procedures/operations/getlist: Procedures of service <istzoz> successfully retrived
-2014-02-12 14:35:15,506: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>1736 at 1737@1738 at 1739@1740 at 1741@1742 at 1743@1744 at 1745@1746 at 1747@1748 at 1749@1750 at 1751@1752 at 1753@1754 at 1755@1756 at 1757@1758 at 1759@1760 at 1761@1762 at 1763@1764 at 1765@1766 at 1767@1768 at 1769@1770 at 1771@1772 at 1773@1774 at 1775@1776 at 1777@1778 at 1779@1780 at 1781@1 [...]
-2014-02-12 14:35:17,058: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/configsections: List of sections successfully returned
-2014-02-12 14:35:18,045: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>2552 at 2553@2554 at 2555@2556 at 2557@2558 at 2559@2560 at 2561@2562 at 2563@2564 at 2565@2566 at 2567@2568 at 2569@2570 at 2571@2572 at 2573@2574 at 2575@2576 at 2577@2578 at 2579@2580 at 2581@2582 at 2583@2584 at 2585@2586 at 2587@2588 at 2589@2590 at 2591@2592 at 2593@2594 at 2595@2596 at 2597@2 [...]
-2014-02-12 14:35:18,212: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/procedures/T_TRE: Sensor Description successfully loaded
-2014-02-12 14:35:18,708: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/systemtypes: System type of service <istzoz> successfully retrived
-2014-02-12 14:35:18,736: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/epsgs: List of valid EPSG codes of service <istzoz> successfully retrived
-2014-02-12 14:35:20,733: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>3416 at 3417@3418 at 3419@3420 at 3421@3422 at 3423@3424 at 3425@3426 at 3427@3428 at 3429@3430 at 3431@3432 at 3433@3434 at 3435@3436 at 3437@3438 at 3439@3440 at 3441@3442 at 3443@3444 at 3445@3446 at 3447@3448 at 3449@3450 at 3451@3452 at 3453@3454 at 3455@3456 at 3457@3458 at 3459@3460 at 3461@3 [...]
-2014-02-12 14:35:23,365: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>4328 at 4329@4330 at 4331@4332 at 4333@4334 at 4335@4336 at 4337@4338 at 4339@4340 at 4341@4342 at 4343@4344 at 4345@4346 at 4347@4348 at 4349@4350 at 4351@4352 at 4353@4354 at 4355@4356 at 4357@4358 at 4359@4360 at 4361@4362 at 4363@4364 at 4365@4366 at 4367@4368 at 4369@4370 at 4371@4372 at 4373@4 [...]
-2014-02-12 14:35:26,197: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>5288 at 5289@5290 at 5291@5292 at 5293@5294 at 5295@5296 at 5297@5298 at 5299@5300 at 5301@5302 at 5303@5304 at 5305@5306 at 5307@5308 at 5309@5310 at 5311@5312 at 5313@5314 at 5315@5316 at 5317@5318 at 5319@5320 at 5321@5322 at 5323@5324 at 5325@5326 at 5327@5328 at 5329@5330 at 5331@5332 at 5333@5 [...]
-2014-02-12 14:35:28,994: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>6296 at 6297@6298 at 6299@6300 at 6301@6302 at 6303@6304 at 6305@6306 at 6307@6308 at 6309@6310 at 6311@6312 at 6313@6314 at 6315@6316 at 6317@6318 at 6319@6320 at 6321@6322 at 6323@6324 at 6325@6326 at 6327@6328 at 6329@6330 at 6331@6332 at 6333@6334 at 6335@6336 at 6337@6338 at 6339@6340 at 6341@6 [...]
-2014-02-12 14:35:34,513: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>7352 at 7353@7354 at 7355@7356 at 7357@7358 at 7359@7360 at 7361@7362 at 7363@7364 at 7365@7366 at 7367@7368 at 7369@7370 at 7371@7372 at 7373@7374 at 7375@7376 at 7377@7378 at 7379@7380 at 7381@7382 at 7383@7384 at 7385@7386 at 7387@7388 at 7389@7390 at 7391@7392 at 7393@7394 at 7395@7396 at 7397@7 [...]
-2014-02-12 14:35:41,060: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>10221 at 10222@10223 at 10224@10225 at 10226@10227 at 10228@10229 at 10230@10231 at 10232@10233 at 10234@10235 at 10236@10237 at 10238@10239 at 10240@10241 at 10242@10243 at 10244@10245 at 10246@10247 at 10248@10249 at 10250@10251 at 10252@10253 at 10254@10255 at 10256@10257 at 10258@102 [...]
-2014-02-12 14:35:47,207: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>13677 at 13678@13679 at 13680@13681 at 13682@13683 at 13684@13685 at 13686@13687 at 13688@13689 at 13690@13691 at 13692@13693 at 13694@13695 at 13696@13697 at 13698@13699 at 13700@13701 at 13702@13703 at 13704@13705 at 13706@13707 at 13708@13709 at 13710@13711 at 13712@13713 at 13714@137 [...]
-2014-02-12 14:35:53,449: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>17258 at 17259@17260 at 17261@17262 at 17263@17264 at 17265@17266 at 17267@17268 at 17269@17270 at 17271@17272 at 17273@17274 at 17275@17276 at 17277@17278 at 17279@17280 at 17281@17282 at 17283@17284 at 17285@17286 at 17287@17288 at 17289@17290 at 17291@17292 at 17293@17294 at 17295@172 [...]
-2014-02-12 14:35:59,007: istsos - INFO - Executing GET on /wa/istsos/services: Services list successfully retrived: found [1] services
-2014-02-12 14:35:59,270: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>21001 at 21002@21003 at 21004@21005 at 21006@21007 at 21008@21009 at 21010@21011 at 21012@21013 at 21014@21015 at 21016@21017 at 21018@21019 at 21020@21021 at 21022@21023 at 21024@21025 at 21026@21027 at 21028@21029 at 21030@21031 at 21032@21033 at 21034@21035 at 21036@21037 at 21038@210 [...]
-2014-02-12 14:35:59,593: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/offerings/operations/getlist: Offerings names of service "istzoz" successfully retrived
-2014-02-12 14:36:01,025: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/offerings/temporary/procedures/operations/memberslist: Offerings names of service <istzoz> successfully retrived
-2014-02-12 14:36:02,495: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/configsections: List of sections successfully returned
-2014-02-12 14:36:02,578: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/procedures/T_TRE: Sensor Description successfully loaded
-2014-02-12 14:36:04,082: istsos - INFO - Executing GET on /wa/istsos/services/istzoz/operations/getobservation/offerings/temporary/procedures/T_TRE/observedproperties/urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature/eventtime/2008-08-09T00:00:00+02:00/2008-08-16T00:00:00+02:00: GetObservation requested successfully executed
-2014-02-12 14:36:05,126: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>24889 at 24890@24891 at 24892@24893 at 24894@24895 at 24896@24897 at 24898@24899 at 24900@24901 at 24902@24903 at 24904@24905 at 24906@24907 at 24908@24909 at 24910@24911 at 24912@24913 at 24914@24915 at 24916@24917 at 24918@24919 at 24920@24921 at 24922@24923 at 24924@24925 at 24926@249 [...]
-2014-02-12 14:36:11,738: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>28921 at 28922@28923 at 28924@28925 at 28926@28927 at 28928@28929 at 28930@28931 at 28932@28933 at 28934@28935 at 28936@28937 at 28938@28939 at 28940@28941 at 28942@28943 at 28944@28945 at 28946@28947 at 28948@28949 at 28950@28951 at 28952@28953 at 28954@28955 at 28956@28957 at 28958@289 [...]
-2014-02-12 14:36:18,383: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>33097 at 33098@33099 at 33100@33101 at 33102@33103 at 33104@33105 at 33106@33107 at 33108@33109 at 33110@33111 at 33112@33113 at 33114@33115 at 33116@33117 at 33118@33119 at 33120@33121 at 33122@33123 at 33124@33125 at 33126@33127 at 33128@33129 at 33130@33131 at 33132@33133 at 33134@331 [...]
-2014-02-12 14:36:26,001: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>37417 at 37418@37419 at 37420@37421 at 37422@37423 at 37424@37425 at 37426@37427 at 37428@37429 at 37430@37431 at 37432@37433 at 37434@37435 at 37436@37437 at 37438@37439 at 37440@37441 at 37442@37443 at 37444@37445 at 37446@37447 at 37448@37449 at 37450@37451 at 37452@37453 at 37454@374 [...]
-2014-02-12 14:36:34,499: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>41881 at 41882@41883 at 41884@41885 at 41886@41887 at 41888@41889 at 41890@41891 at 41892@41893 at 41894@41895 at 41896@41897 at 41898@41899 at 41900@41901 at 41902@41903 at 41904@41905 at 41906@41907 at 41908@41909 at 41910@41911 at 41912@41913 at 41914@41915 at 41916@41917 at 41918@419 [...]
-2014-02-12 14:36:41,795: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>46489 at 46490@46491 at 46492@46493 at 46494@46495 at 46496@46497 at 46498@46499 at 46500@46501 at 46502@46503 at 46504@46505 at 46506@46507 at 46508@46509 at 46510@46511 at 46512@46513 at 46514@46515 at 46516@46517 at 46518@46519 at 46520@46521 at 46522@46523 at 46524@46525 at 46526@465 [...]
-2014-02-12 14:36:49,628: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>51241 at 51242@51243 at 51244@51245 at 51246@51247 at 51248@51249 at 51250@51251 at 51252@51253 at 51254@51255 at 51256@51257 at 51258@51259 at 51260@51261 at 51262@51263 at 51264@51265 at 51266@51267 at 51268@51269 at 51270@51271 at 51272@51273 at 51274@51275 at 51276@51277 at 51278@512 [...]
-2014-02-12 14:36:58,017: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>56137 at 56138@56139 at 56140@56141 at 56142@56143 at 56144@56145 at 56146@56147 at 56148@56149 at 56150@56151 at 56152@56153 at 56154@56155 at 56156@56157 at 56158@56159 at 56160@56161 at 56162@56163 at 56164@56165 at 56166@56167 at 56168@56169 at 56170@56171 at 56172@56173 at 56174@561 [...]
-2014-02-12 14:37:05,196: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>61177 at 61178@61179 at 61180@61181 at 61182@61183 at 61184@61185 at 61186@61187 at 61188@61189 at 61190@61191 at 61192@61193 at 61194@61195 at 61196@61197 at 61198@61199 at 61200@61201 at 61202@61203 at 61204@61205 at 61206@61207 at 61208@61209 at 61210@61211 at 61212@61213 at 61214@612 [...]
-2014-02-12 14:37:14,545: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>66360 at 66361@66362 at 66363@66364 at 66365@66366 at 66367@66368 at 66369@66370 at 66371@66372 at 66373@66374 at 66375@66376 at 66377@66378 at 66379@66380 at 66381@66382 at 66383@66384 at 66385@66386 at 66387@66388 at 66389@66390 at 66391@66392 at 66393@66394 at 66395@66396 at 66397@663 [...]
-2014-02-12 14:37:23,026: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>71688 at 71689@71690 at 71691@71692 at 71693@71694 at 71695@71696 at 71697@71698 at 71699@71700 at 71701@71702 at 71703@71704 at 71705@71706 at 71707@71708 at 71709@71710 at 71711@71712 at 71713@71714 at 71715@71716 at 71717@71718 at 71719@71720 at 71721@71722 at 71723@71724 at 71725@717 [...]
-2014-02-12 14:37:30,323: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>77160 at 77161@77162 at 77163@77164 at 77165@77166 at 77167@77168 at 77169@77170 at 77171@77172 at 77173@77174 at 77175@77176 at 77177@77178 at 77179@77180 at 77181@77182 at 77183@77184 at 77185@77186 at 77187@77188 at 77189@77190 at 77191@77192 at 77193@77194 at 77195@77196 at 77197@771 [...]
-2014-02-12 14:37:36,587: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>82776 at 82777@82778 at 82779@82780 at 82781@82782 at 82783@82784 at 82785@82786 at 82787@82788 at 82789@82790 at 82791@82792 at 82793@82794 at 82795@82796 at 82797@82798 at 82799@82800 at 82801@82802 at 82803@82804 at 82805@82806 at 82807@82808 at 82809@82810 at 82811@82812 at 82813@828 [...]
-2014-02-12 14:37:44,556: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>88535 at 88536@88537 at 88538@88539 at 88540@88541 at 88542@88543 at 88544@88545 at 88546@88547 at 88548@88549 at 88550@88551 at 88552@88553 at 88554@88555 at 88556@88557 at 88558@88559 at 88560@88561 at 88562@88563 at 88564@88565 at 88566@88567 at 88568@88569 at 88570@88571 at 88572@885 [...]
-2014-02-12 14:37:51,702: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>94439 at 94440@94441 at 94442@94443 at 94444@94445 at 94446@94447 at 94448@94449 at 94450@94451 at 94452@94453 at 94454@94455 at 94456@94457 at 94458@94459 at 94460@94461 at 94462@94463 at 94464@94465 at 94466@94467 at 94468@94469 at 94470@94471 at 94472@94473 at 94474@94475 at 94476@944 [...]
-2014-02-12 14:38:00,437: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>100486 at 100487@100488 at 100489@100490 at 100491@100492 at 100493@100494 at 100495@100496 at 100497@100498 at 100499@100500 at 100501@100502 at 100503@100504 at 100505@100506 at 100507@100508 at 100509@100510 at 100511@100512 at 100513@100514 at 100515@100516 at 100517@100518@ [...]
-2014-02-12 14:38:08,742: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>106678 at 106679@106680 at 106681@106682 at 106683@106684 at 106685@106686 at 106687@106688 at 106689@106690 at 106691@106692 at 106693@106694 at 106695@106696 at 106697@106698 at 106699@106700 at 106701@106702 at 106703@106704 at 106705@106706 at 106707@106708 at 106709@106710@ [...]
-2014-02-12 14:38:17,535: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>113014 at 113015@113016 at 113017@113018 at 113019@113020 at 113021@113022 at 113023@113024 at 113025@113026 at 113027@113028 at 113029@113030 at 113031@113032 at 113033@113034 at 113035@113036 at 113037@113038 at 113039@113040 at 113041@113042 at 113043@113044 at 113045@113046@ [...]
-2014-02-12 14:38:26,363: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>119494 at 119495@119496 at 119497@119498 at 119499@119500 at 119501@119502 at 119503@119504 at 119505@119506 at 119507@119508 at 119509@119510 at 119511@119512 at 119513@119514 at 119515@119516 at 119517@119518 at 119519@119520 at 119521@119522 at 119523@119524 at 119525@119526@ [...]
-2014-02-12 14:38:34,421: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>126118 at 126119@126120 at 126121@126122 at 126123@126124 at 126125@126126 at 126127@126128 at 126129@126130 at 126131@126132 at 126133@126134 at 126135@126136 at 126137@126138 at 126139@126140 at 126141@126142 at 126143@126144 at 126145@126146 at 126147@126148 at 126149@126150@ [...]
-2014-02-12 14:38:45,032: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>132886 at 132887@132888 at 132889@132890 at 132891@132892 at 132893@132894 at 132895@132896 at 132897@132898 at 132899@132900 at 132901@132902 at 132903@132904 at 132905@132906 at 132907@132908 at 132909@132910 at 132911@132912 at 132913@132914 at 132915@132916 at 132917@132918@ [...]
-2014-02-12 14:38:53,289: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>139798 at 139799@139800 at 139801@139802 at 139803@139804 at 139805@139806 at 139807@139808 at 139809@139810 at 139811@139812 at 139813@139814 at 139815@139816 at 139817@139818 at 139819@139820 at 139821@139822 at 139823@139824 at 139825@139826 at 139827@139828 at 139829@139830@ [...]
-2014-02-12 14:40:12,866: istsos - INFO - Executing POST on /wa/istsos/services/istzoz/operations/insertobservation: <?xml version="1.0" encoding="UTF-8"?>  <sos:InsertObservationResponse xmlns:sos="http://www.opengis.net/sos/1.0">    <sos:AssignedObservationId>146854 at 146855@146856 at 146857@146858 at 146859@146860 at 146861@146862 at 146863@146864 at 146865@146866 at 146867@146868 at 146869@146870 at 146871@146872 at 146873@146874 at 146875@146876 at 146877@146878 at 146879@146880 at 146881@146882 at 146883@146884 at 146885@146886@ [...]
diff --git a/makecheck.py b/makecheck.py
old mode 100755
new mode 100644
index 2223a65..4564cca
--- a/makecheck.py
+++ b/makecheck.py
@@ -1,4 +1,25 @@
 # -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 import sys
 import time
 from os import path
@@ -392,4 +413,4 @@ if __name__ == "__main__":
     args = parser.parse_args()
     #print args.__dict__
     #exit()
-    run_tests(args.__dict__)
\ No newline at end of file
+    run_tests(args.__dict__)
diff --git a/procedures.csv b/procedures.csv
new file mode 100644
index 0000000..ee63964
--- /dev/null
+++ b/procedures.csv
@@ -0,0 +1,151 @@
+A_AETCAN_AIR,A_AETCAN_AIR,
+A_BOL_PTC,A_BOL_PTC,
+A_BOL_PTC_LAM,A_BOL_PTC_LAM,
+A_BON_QUA,A_BON_QUA,
+A_CAL_AIR,A_CAL_AIR,
+A_CFER_ARO,A_CFER_ARO,
+A_CUC_POR,A_CUC_POR,
+A_GNO_GNO,A_GNO_GNO,
+A_LAV_MEN,A_LAV_MEN,
+A_LAV_RSV,A_LAV_RSV,
+A_MAG_CEV,A_MAG_CEV,
+A_MAG_LOD,A_MAG_LOD,
+A_MAG_RIV,A_MAG_RIV,
+A_MAG_VIS,A_MAG_VIS,
+A_MAR_MAR,A_MAR_MAR,
+A_MAR_MAR2,A_MAR_MAR2,
+A_MOR_GIU,A_MOR_GIU,
+A_MUZ_MUZ,A_MUZ_MUZ,
+A_RMUL_ARB,A_RMUL_ARB,
+A_RMUL_COM,A_RMUL_COM,
+A_RMUL_MAR,A_RMUL_MAR,
+A_ROV_CVM1,A_ROV_CVM1,
+A_ROV_CVM2,A_ROV_CVM2,
+A_ROV_CVM3,A_ROV_CVM3,
+A_SAL_MAG,A_SAL_MAG,
+A_SBIB_PON,A_SBIB_PON,
+A_SCA_LUG,A_SCA_LUG,
+A_TICTO_CHIR,A_TICTO_CHIR,
+A_TIC_BED,A_TIC_BED,
+A_TRA_ARB,A_TRA_ARB,
+A_TRA_ARB_FFS1,A_TRA_ARB_FFS1,
+A_TRA_ARB_FFS2,A_TRA_ARB_FFS2,
+A_VED_ISO,A_VED_ISO,
+A_VED_MUZ,A_VED_MUZ,
+A_VER_BGU,A_VER_BGU,
+A_VVED_AGN,A_VVED_AGN,
+B_TRE,B_TRE,
+H_BIA,H_BIA,
+H_CAB,H_CAB,
+H_CAV,H_CAV,
+H_CHIA,H_CHIA,
+H_NOV,H_NOV,
+H_TRE,H_TRE,
+P_ARO,P_ARO,
+P_BED,P_BED,
+P_BED_OL,P_BED_OL,
+P_BIA,P_BIA,
+P_CAB,P_CAB,
+P_CAD_RTM,P_CAD_RTM,
+P_CAL,P_CAL,
+P_CAM,P_CAM,
+P_CAM_DOG,P_CAM_DOG,
+P_CAR,P_CAR,
+P_CAV,P_CAV,
+P_CHIA,P_CHIA,
+P_COL,P_COL,
+P_CVM,P_CVM,
+P_FRA,P_FRA,
+P_FRA_OL,P_FRA_OL,
+P_FUS,P_FUS,
+P_FUS_PAE,P_FUS_PAE,
+P_GIUB,P_GIUB,
+P_GNO,P_GNO,
+P_GRA,P_GRA,
+P_ISO,P_ISO,
+P_LOD,P_LOD,
+P_LUZ,P_LUZ,
+P_MAG,P_MAG,
+P_MEN,P_MEN,
+P_NOV,P_NOV,
+P_OLI,P_OLI,
+P_PON,P_PON,
+P_SOM,P_SOM,
+P_SON,P_SON,
+P_TRE,P_TRE,
+Q_AETCAN_AIR,Q_AETCAN_AIR,
+Q_BOL_PTC,Q_BOL_PTC,
+Q_BON_QUA,Q_BON_QUA,
+Q_CAL_AIR,Q_CAL_AIR,
+Q_CFER_ARO,Q_CFER_ARO,
+Q_CUC_POR,Q_CUC_POR,
+Q_GNO_GNO,Q_GNO_GNO,
+Q_LAV_MEN,Q_LAV_MEN,
+Q_LAV_RSV,Q_LAV_RSV,
+Q_MAG_CEV,,Non c'era nemmeno nel vecchio istSOS
+Q_MAG_LOD,Q_MAG_LOD,
+Q_MAG_RIV,,Non c'era nemmeno nel vecchio istSOS
+Q_MAG_VIS,Q_MAG_VIS,
+Q_MAR_MAR,Q_MAR_MAR,
+Q_MAR_MAR2,Q_MAR_MAR2,
+Q_MOR_GIU,Q_MOR_GIU,
+Q_MUZ_MUZ,Q_MUZ_MUZ,
+Q_RMUL_ARB,Q_RMUL_ARB,
+Q_RMUL_COM,Q_RMUL_COM,
+Q_RMUL_MAR,Q_RMUL_MAR,
+Q_ROV_CVM1,Q_ROV_CVM1,
+Q_ROV_CVM2,Q_ROV_CVM2,
+Q_ROV_CVM3,Q_ROV_CVM3,
+Q_SAL_MAG,Q_SAL_MAG,
+Q_SBIB_PON,Q_SBIB_PON,
+Q_SCA_LUG,Q_SCA_LUG,
+Q_TICTO_CHIR,Q_TICTO_CHIR,
+Q_TIC_BED,Q_TIC_BED,
+Q_TRA_ARB,Q_TRA_ARB,
+Q_TRA_ARB_FFS,Q_TRA_ARB_FFS,
+Q_TRA_ARB_FFS1,Q_TRA_ARB_FFS1,
+Q_TRA_ARB_FFS2,Q_TRA_ARB_FFS2,
+Q_TRA_ARB_FFS3,Q_TRA_ARB_FFS3,
+Q_VED_ISO,Q_VED_ISO,
+Q_VED_MUZ,Q_VED_MUZ,
+Q_VER_BGU,Q_VER_BGU,
+Q_VVED_AGN,Q_VVED_AGN,
+R_CAV,R_CAV,
+T_BIA,T_BIA,
+T_CAB,T_CAB,
+T_CAL,T_CAL,
+T_CAM_DOG,T_CAM_DOG,
+T_CAR,T_CAR,
+T_CAV,T_CAV,
+T_CHIA,T_CHIA,
+T_COL,T_COL,
+T_GRA,T_GRA,
+T_ISO,T_ISO,
+T_NOV,T_NOV,
+T_PON,T_PON,
+T_SON,T_SON,
+T_TRE,T_TRE,
+WK_MUZ_MUZ,WK_MUZ_MUZ,
+WT_BOL_PTC,WT_BOL_PTC,
+WT_BON_QUA,WT_BON_QUA,
+WT_CAL_AIR,WT_CAL_AIR,
+WT_CUC_POR,WT_CUC_POR,
+WT_GNO_GNO,WT_GNO_GNO,
+WT_LAV_MEN,WT_LAV_MEN,
+WT_LAV_RSV,WT_LAV_RSV,
+WT_MAG_CEV,WT_MAG_CEV,
+WT_MAG_LOD,WT_MAG_LOD,
+WT_MAR_MAR,WT_MAR_MAR,
+WT_MAR_MAR2,WT_MAR_MAR2,
+WT_MOR_GIU,WT_MOR_GIU,
+WT_MUZ_MUZ,WT_MUZ_MUZ,
+WT_ROV_CVM1,WT_ROV_CVM1,
+WT_ROV_CVM2,WT_ROV_CVM2,
+WT_ROV_CVM3,WT_ROV_CVM3,
+WT_SAL_MAG,WT_SAL_MAG,
+WT_SCA_LUG,WT_SCA_LUG,
+WT_TIC_BED,WT_TIC_BED,
+WT_TRA_ARB_FFS1,WT_TRA_ARB_FFS1,
+WT_VED_ISO,WT_VED_ISO,
+WT_VVED_AGN,WT_VVED_AGN,
+W_PON,W_PON,
diff --git a/public.py b/public.py
old mode 100755
new mode 100644
index f14fd0d..810e2ad
--- a/public.py
+++ b/public.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istsos WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import sys
 from os import path
 sys.path.insert(0, path.abspath(path.dirname(__file__)))
@@ -27,15 +32,37 @@ def application(environ, start_response):
     path = environ['PATH_INFO'].strip()[1:].split("/")
     if path[0]=='wa':
         return executeWa(environ, start_response)
+    elif path[0] == 'wns':
+        return executeWns(environ, start_response)
+    else:
+        return executeSos(environ, start_response)
+    '''
     else:
-        response_body = "istSOS requests not supported in this url"
+        response_body = "istSOS requests not supported for read only users"
         start_response('404 Not Found', 
             [
                 ('Content-Type', 'text/plain; charset=utf-8'),
                 ('Content-Length', str(len(response_body)))
             ]
         )
+        return [response_body.encode('utf-8')]'''
+
+
+def executeSos(environ, start_response):
+    
+    method = str(environ['REQUEST_METHOD']).upper()
+    # Data RETRIEVAL
+    if method != "GET":
+        response_body = '{"success": false, "message": "HTTP method %s not supported", "method": "%s"}' % (method,method)
+        start_response('200 OK', 
+            [
+                ('Content-Type', 'application/json; charset=utf-8'),
+                ('Content-Length', str(len(response_body)))
+            ]
+        )
         return [response_body.encode('utf-8')]
+    else:
+        return app.executeSos(environ, start_response)
 
 def executeWa(environ, start_response):
     
@@ -52,3 +79,22 @@ def executeWa(environ, start_response):
         return [response_body.encode('utf-8')]
     else:
         return app.executeWa(environ, start_response)
+        
+
+def executeWns(environ, start_response):
+    
+    method = str(environ['REQUEST_METHOD']).upper()
+    # Data RETRIEVAL
+    if method != "GET":
+        response_body = '{"success": false, "message": "HTTP method %s not supported", "method": "%s"}' % (method,method)
+        start_response('200 OK', 
+            [
+                ('Content-Type', 'application/json; charset=utf-8'),
+                ('Content-Length', str(len(response_body)))
+            ]
+        )
+        return [response_body.encode('utf-8')]
+    else:
+        return app.executeWns(environ, start_response)
+        
+
diff --git a/runAllTests.py b/runAllTests.py
old mode 100755
new mode 100644
index 8d1a7f8..a1a76d4
--- a/runAllTests.py
+++ b/runAllTests.py
@@ -1,4 +1,25 @@
 # -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 import sys
 import time
 from os import path
@@ -394,4 +415,4 @@ if __name__ == "__main__":
     args = parser.parse_args()
     #print args.__dict__
     #exit()
-    run_tests(args.__dict__)
\ No newline at end of file
+    run_tests(args.__dict__)
diff --git a/sampling.csv b/sampling.csv
new file mode 100644
index 0000000..e0a2634
--- /dev/null
+++ b/sampling.csv
@@ -0,0 +1,113 @@
+"A_AETCAN_AIR","2006-12-31T23:00:00+00:00","2006-12-31T23:00:00+00:00","2011-12-31T22:50:00+00:00","2011-12-31T22:50:00+00:00"
+"A_BOL_PTC","1999-12-31T23:00:00+00:00","1999-12-31T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"A_BOL_PTC_LAM","2012-12-04T09:30:00+00:00","2012-12-04T09:30:00+00:00","2015-05-06T08:30:00+00:00","2015-05-05T06:50:00+00:00"
+"A_BON_QUA","1990-05-03T23:00:00+00:00","1990-05-03T23:00:00+00:00","2015-04-17T07:10:00+00:00","2015-04-17T07:10:00+00:00"
+"A_CAL_AIR","1999-12-31T23:00:00+00:00","1999-12-31T23:00:00+00:00","2015-04-08T12:40:00+00:00","2015-04-08T12:43:00+00:00"
+"A_CFER_ARO","2006-12-31T23:00:00+00:00","2006-12-31T23:00:00+00:00","2015-01-08T15:00:00+00:00","2015-01-08T15:00:00+00:00"
+"A_CUC_POR","1999-12-31T23:00:00+00:00","1999-12-31T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"A_GNO_GNO","1990-01-10T23:00:00+00:00","1990-01-10T23:00:00+00:00","2015-04-29T12:10:00+00:00","2015-04-29T12:17:00+00:00"
+"A_LAV_MEN","1990-01-18T23:00:00+00:00","1990-01-18T23:00:00+00:00","2015-04-28T07:50:00+00:00","2015-04-28T07:52:00+00:00"
+"A_LAV_RSV","1990-01-10T23:00:00+00:00","1990-01-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T12:00:00+00:00"
+"A_MAG_CEV","2003-10-20T23:00:00+00:00","2003-11-03T23:00:00+00:00","2009-05-15T11:20:00+00:00","2009-05-15T11:20:00+00:00"
+"A_MAG_LOD","2001-10-28T23:00:00+00:00","2001-10-28T23:00:00+00:00","2015-04-02T12:10:00+00:00","2015-04-02T12:15:00+00:00"
+"A_MAG_RIV","2003-03-11T23:00:00+00:00","2003-03-11T23:00:00+00:00","2009-06-23T05:20:00+00:00","2009-06-23T05:20:00+00:00"
+"A_MAG_VIS","2001-09-26T23:00:00+00:00","2001-09-26T23:00:00+00:00","2004-10-21T12:20:00+00:00","2004-10-21T12:20:00+00:00"
+"A_MAR_MAR","1990-01-10T23:00:00+00:00","1990-01-10T23:00:00+00:00","2014-01-03T09:40:00+00:00","2014-01-03T09:40:00+00:00"
+"A_MAR_MAR2","2013-07-18T09:10:00+00:00","2013-07-18T09:10:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:00:00+00:00"
+"A_MOR_GIU","2000-12-31T23:00:00+00:00","2000-12-31T23:00:00+00:00","2015-05-06T09:20:00+00:00","2015-05-05T12:00:00+00:00"
+"A_MUZ_MUZ","2005-06-08T23:00:00+00:00","2005-06-08T23:00:00+00:00","2015-04-21T13:30:00+00:00","2015-04-21T13:32:00+00:00"
+"A_RMUL_ARB","2009-04-02T23:00:00+00:00","2009-04-02T23:00:00+00:00","2015-04-24T06:50:00+00:00","2015-04-24T06:57:00+00:00"
+"A_RMUL_COM","2004-09-15T23:00:00+00:00","2004-09-15T23:00:00+00:00","2007-03-29T07:30:00+00:00","2007-03-29T07:30:00+00:00"
+"A_RMUL_MAR","2013-07-18T08:00:00+00:00","2013-07-18T08:00:00+00:00","2015-04-28T08:30:00+00:00","2015-04-28T08:34:00+00:00"
+"A_ROV_CVM1","2001-10-23T15:00:00+00:00","2001-10-23T15:00:00+00:00","2015-01-02T09:30:00+00:00","2015-01-02T09:30:00+00:00"
+"A_ROV_CVM2","1999-11-26T23:00:00+00:00","1999-11-26T23:00:00+00:00","2015-01-02T09:40:00+00:00","2015-01-02T09:40:00+00:00"
+"A_ROV_CVM3","2001-10-23T23:00:00+00:00","2001-10-23T23:00:00+00:00","2015-04-23T08:20:00+00:00","2015-04-23T08:28:00+00:00"
+"A_SAL_MAG","1999-12-31T23:00:00+00:00","1999-12-31T23:00:00+00:00","2015-05-06T05:00:00+00:00","2015-05-05T11:00:00+00:00"
+"A_SBIB_PON","2007-11-05T23:00:00+00:00","2007-11-05T23:00:00+00:00","2015-04-29T08:00:00+00:00","2015-04-29T08:00:00+00:00"
+"A_SCA_LUG","1999-12-31T23:00:00+00:00","1999-12-31T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"A_TICTO_CHIR","2003-12-10T23:00:00+00:00","2003-12-10T23:00:00+00:00","2006-08-31T09:30:00+00:00","2006-08-31T09:30:00+00:00"
+"A_TIC_BED","1994-12-21T23:00:00+00:00","1994-12-21T23:00:00+00:00","2015-04-15T11:20:00+00:00","2015-04-15T11:20:00+00:00"
+"A_TRA_ARB","1990-01-15T23:00:00+00:00","1990-01-15T23:00:00+00:00","2009-04-03T09:30:00+00:00","2009-04-03T09:30:00+00:00"
+"A_TRA_ARB_FFS1","2009-04-02T23:00:00+00:00","2009-04-02T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"A_TRA_ARB_FFS2","2011-05-05T14:00:00+00:00","2011-05-05T14:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"A_VED_ISO","1997-10-09T23:00:00+00:00","1997-10-09T23:00:00+00:00","2015-04-16T12:00:00+00:00","2015-04-16T12:09:00+00:00"
+"A_VED_MUZ","1999-12-31T23:00:00+00:00","1999-12-31T23:00:00+00:00","2005-06-24T13:00:00+00:00","2005-06-24T13:00:00+00:00"
+"A_VER_BGU","2003-10-30T23:00:00+00:00","2003-10-30T23:00:00+00:00","2010-09-03T11:30:00+00:00","2010-09-03T11:30:00+00:00"
+"A_VVED_AGN","1998-10-08T23:00:00+00:00","1998-10-08T23:00:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:00:00+00:00"
+"B_TRE","2008-06-23T10:50:00+00:00","2008-06-23T10:50:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"H_BIA","2011-10-28T09:00:00+00:00","2011-10-28T09:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"H_CAB","2014-05-13T10:30:00+00:00","2014-05-13T10:40:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"H_CAV","2004-02-10T23:00:00+00:00","2004-02-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"H_CHIA","2012-09-03T11:00:00+00:00","2012-09-03T11:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"H_NOV","2010-11-11T08:50:00+00:00","2010-11-11T08:50:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"H_TRE","2008-06-23T10:50:00+00:00","2008-06-23T10:50:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_ARO","2007-06-27T23:00:00+00:00","2007-06-27T23:00:00+00:00","2015-04-28T12:00:00+00:00","2015-04-28T12:07:00+00:00"
+"P_BED","2000-12-31T23:00:00+00:00","2000-12-31T23:00:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:50:00+00:00"
+"P_BED_OL","1993-11-18T23:00:00+00:00","1993-11-18T23:00:00+00:00","2000-12-26T17:00:00+00:00","2000-12-26T17:00:00+00:00"
+"P_BIA","2011-10-28T09:00:00+00:00","2011-10-28T09:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CAB","2014-05-13T10:30:00+00:00","2014-05-13T10:40:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CAD_RTM","2005-07-08T23:00:00+00:00","2005-07-08T23:00:00+00:00","2007-08-23T09:50:00+00:00","2007-08-23T09:50:00+00:00"
+"P_CAL","2010-10-10T23:00:00+00:00","2010-10-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CAM","1993-11-23T23:00:00+00:00","1993-11-23T23:00:00+00:00","2011-03-17T08:20:00+00:00","2011-03-17T08:20:00+00:00"
+"P_CAM_DOG","2005-09-30T23:00:00+00:00","2005-09-30T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CAR","2005-09-07T23:00:00+00:00","2005-09-07T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CAV","2004-02-10T23:00:00+00:00","2004-02-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CHIA","2007-09-13T23:00:00+00:00","2007-09-13T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_COL","2006-07-31T23:00:00+00:00","2006-07-31T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_CVM","2005-12-31T23:00:00+00:00","2005-12-31T23:00:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:41:01+00:00"
+"P_FRA","2006-03-31T23:00:00+00:00","2006-03-31T23:00:00+00:00","2011-02-22T02:40:00+00:00","2011-02-22T02:40:00+00:00"
+"P_FRA_OL","1993-11-21T23:00:00+00:00","1993-11-21T23:00:00+00:00","2006-03-31T05:10:00+00:00","2006-03-31T05:10:00+00:00"
+"P_FUS","1994-08-27T23:00:00+00:00","1994-08-27T23:00:00+00:00","2010-12-01T06:20:00+00:00","2010-12-01T06:20:00+00:00"
+"P_FUS_PAE","2007-05-24T23:00:00+00:00","2007-05-24T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:34:08+00:00"
+"P_GIUB","2005-02-24T23:00:00+00:00","2005-02-24T23:00:00+00:00","2015-04-16T13:40:00+00:00","2015-04-16T13:40:00+00:00"
+"P_GNO","2008-04-24T23:00:00+00:00","2008-04-24T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_GRA","2006-04-26T23:00:00+00:00","2006-04-26T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_ISO","2006-10-06T23:00:00+00:00","2006-10-06T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_LOD","2007-08-24T23:00:00+00:00","2007-08-24T23:00:00+00:00","2014-01-07T14:10:00+00:00","2014-01-07T14:10:00+00:00"
+"P_LUZ","1994-08-28T23:00:00+00:00","1994-08-28T23:00:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:00:00+00:00"
+"P_MAG","2005-02-12T23:00:00+00:00","2005-02-12T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_MEN","2004-10-14T23:00:00+00:00","2004-10-14T23:00:00+00:00","2015-04-28T08:00:00+00:00","2015-04-28T08:07:00+00:00"
+"P_NOV","2005-09-07T23:00:00+00:00","2005-09-07T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_OLI","2005-11-18T23:00:00+00:00","2005-11-18T23:00:00+00:00","2015-04-14T12:40:00+00:00","2015-04-14T12:41:00+00:00"
+"P_SOM","2008-01-31T23:00:00+00:00","2008-01-31T23:00:00+00:00","2015-03-03T08:00:00+00:00","2015-03-03T08:00:00+00:00"
+"P_SON","2010-11-22T23:00:00+00:00","2010-11-22T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"P_TRE","2007-11-02T23:00:00+00:00","2007-11-02T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"R_CAV","2004-02-10T23:00:00+00:00","2004-02-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_BIA","2011-10-28T09:00:00+00:00","2011-10-28T09:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_CAB","2014-05-13T10:30:00+00:00","2014-05-13T10:40:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:50:00+00:00"
+"T_CAL","2010-10-10T23:00:00+00:00","2010-10-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_CAM_DOG","2013-11-08T11:30:00+00:00","2013-11-08T11:30:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_CAR","2005-09-07T23:00:00+00:00","2005-09-07T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_CAV","2004-02-10T23:00:00+00:00","2004-02-10T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_CHIA","2012-09-03T11:00:00+00:00","2012-09-03T11:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_COL","2006-07-31T23:00:00+00:00","2006-07-31T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_GRA","2006-04-26T23:00:00+00:00","2006-04-26T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_ISO","2006-10-06T23:00:00+00:00","2006-10-06T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_NOV","2005-09-07T23:00:00+00:00","2005-09-07T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_PON","2007-11-28T23:00:00+00:00","2007-11-28T23:00:00+00:00","2013-11-05T07:40:00+00:00","2013-11-05T07:40:00+00:00"
+"T_SON","2010-11-22T23:00:00+00:00","2010-11-22T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"T_TRE","2007-11-02T23:00:00+00:00","2007-11-02T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"WK_MUZ_MUZ","2013-01-10T08:00:00+00:00","2013-01-10T08:00:00+00:00","2015-04-21T13:30:00+00:00","2015-04-21T13:32:00+00:00"
+"WT_BOL_PTC","2009-08-20T23:00:00+00:00","2009-08-20T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"WT_BON_QUA","2002-12-31T23:00:00+00:00","2002-12-31T23:00:00+00:00","2015-04-17T07:10:00+00:00","2015-04-17T07:10:00+00:00"
+"WT_CAL_AIR","2008-10-02T23:00:00+00:00","2008-10-02T23:00:00+00:00","2015-04-08T12:40:00+00:00","2015-04-08T12:43:00+00:00"
+"WT_CUC_POR","2002-07-11T23:00:00+00:00","2002-07-11T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"WT_GNO_GNO","2005-12-15T23:00:00+00:00","2005-12-15T23:00:00+00:00","2015-04-29T12:10:00+00:00","2015-04-29T12:17:00+00:00"
+"WT_LAV_MEN","2010-05-10T23:00:00+00:00","2010-05-10T23:00:00+00:00","2015-04-28T07:50:00+00:00","2015-04-28T07:52:00+00:00"
+"WT_LAV_RSV","2009-01-28T23:00:00+00:00","2009-01-28T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T12:00:00+00:00"
+"WT_MAG_CEV","2003-10-20T23:00:00+00:00","2003-11-03T23:00:00+00:00","2009-05-15T11:20:00+00:00","2009-05-15T11:20:00+00:00"
+"WT_MAG_LOD","2014-04-16T08:40:00+00:00","2014-04-16T08:40:00+00:00","2015-04-02T12:10:00+00:00","2015-04-02T12:15:00+00:00"
+"WT_MAR_MAR","2004-07-29T23:00:00+00:00","2004-07-29T23:00:00+00:00","2014-01-03T09:40:00+00:00","2014-01-03T09:40:00+00:00"
+"WT_MAR_MAR2","2013-07-18T09:10:00+00:00","2013-07-18T09:10:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:00:00+00:00"
+"WT_MOR_GIU","2009-11-04T23:00:00+00:00","2009-11-04T23:00:00+00:00","2015-05-06T09:20:00+00:00","2015-05-05T12:00:00+00:00"
+"WT_MUZ_MUZ","2005-06-08T23:00:00+00:00","2005-06-08T23:00:00+00:00","2015-04-21T13:30:00+00:00","2015-04-21T13:32:00+00:00"
+"WT_ROV_CVM1","2011-11-03T09:20:00+00:00","2011-11-03T09:20:00+00:00","2015-01-02T09:30:00+00:00","2015-01-02T09:30:00+00:00"
+"WT_ROV_CVM2","2006-11-22T23:00:00+00:00","2006-11-22T23:00:00+00:00","2015-01-02T09:40:00+00:00","2015-01-02T09:40:00+00:00"
+"WT_ROV_CVM3","2011-11-03T11:00:00+00:00","2011-11-03T11:00:00+00:00","2015-04-23T08:20:00+00:00","2015-04-23T08:28:00+00:00"
+"WT_SAL_MAG","2002-12-31T23:00:00+00:00","2002-12-31T23:00:00+00:00","2015-05-06T05:00:00+00:00","2015-05-05T11:00:00+00:00"
+"WT_SCA_LUG","2008-12-31T23:00:00+00:00","2008-12-31T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"WT_TIC_BED","2008-10-02T23:00:00+00:00","2008-10-02T23:00:00+00:00","2015-04-15T11:20:00+00:00","2015-04-15T11:20:00+00:00"
+"WT_TRA_ARB_FFS1","2009-04-02T23:00:00+00:00","2009-04-02T23:00:00+00:00","2015-05-06T09:10:00+00:00","2015-05-05T11:50:00+00:00"
+"WT_VED_ISO","2011-02-24T23:00:00+00:00","2011-02-24T23:00:00+00:00","2015-04-16T12:00:00+00:00","2015-04-16T12:09:00+00:00"
+"WT_VVED_AGN","2008-10-29T23:00:00+00:00","2008-10-29T23:00:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:00:00+00:00"
+"W_PON","2007-11-29T00:00:00+00:00","2007-11-29T00:00:00+00:00","2015-05-06T09:00:00+00:00","2015-05-05T11:50:00+00:00"
diff --git a/scheduler.py b/scheduler.py
old mode 100755
new mode 100644
index f24f4db..b516173
--- a/scheduler.py
+++ b/scheduler.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
-# Created on Tue Nov 12 17:15:04 2013
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 description:
     the scheduler dynamically check if scheduled job for each service
@@ -25,34 +27,40 @@ description:
     The scheduled job for a service are instantiated by a file named
     "serviceName.aps" that includes the jobs according the decoration methods
     of the python APScheduler library; for example:
-    
+
     @sched.interval_schedule(seconds=4)
     def demo_job4():
         print 'demo job4'
-    
+
     @sched.cron_schedule(second='*/30')
     def demo_decorated_task():
         print "I am printed at every minute at the 30th second!"
-    
+
 """
 
 #---------------------------------
 import os
+import logging
+logging.basicConfig()
 def recursive_glob(rootdir='.', suffix=''):
     return [( os.path.splitext(filename)[0] ,os.path.join(rootdir, filename) )
             for rootdir, dirnames, filenames in os.walk(rootdir)
             for filename in filenames if filename.endswith(suffix)]
-            
+
 import hashlib
 schedmd5 = {}
 services_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "services")
 
 from lib.apscheduler.scheduler import Scheduler
+from lib.apscheduler import threadpool
+
 sched = Scheduler(daemonic=False)
+sched._threadpool = threadpool.ThreadPool(core_threads=10, max_threads=200, keepalive=10)
+
 sched.start()
 
 #===========================
-#START THE ISTSOS SCHEDULER 
+#START THE ISTSOS SCHEDULER
 #===========================
 @sched.interval_schedule(seconds=5)
 def istsos_job():
@@ -70,9 +78,10 @@ def istsos_job():
                 print "  > Change detectd: %s" % service
                 schedmd5[service] = md5_now
                 jobs = sched.get_jobs()
+                #print jobs
                 for j in jobs[1:]:
                     print " job: %s" % j.name
                     if j.name.startswith(service):
                         sched.unschedule_job(j)
                 execfile(scheduler)
-            
+
diff --git a/scripts/__init__.py b/scripts/__init__.py
old mode 100755
new mode 100644
index ca37bad..4494f7d
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -1,2 +1,23 @@
 # -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "csv2istsos","raw2csv","sos2istsos","sos_virtualHQ_importer"]
diff --git a/scripts/__init__.pyc b/scripts/__init__.pyc
new file mode 100644
index 0000000..314ba8f
Binary files /dev/null and b/scripts/__init__.pyc differ
diff --git a/lib/requests/async.py b/scripts/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from lib/requests/async.py
rename to scripts/build.sh
diff --git a/scripts/compair2sos.py b/scripts/compair2sos.py
new file mode 100644
index 0000000..8be4104
--- /dev/null
+++ b/scripts/compair2sos.py
@@ -0,0 +1,323 @@
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------------
+# istSOS - Istituto Scienze della Terra
+# Copyright (C) 2014 Milan Antonovic, Massimiliano Cannata
+#---------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#---------------------------------------------------------------------------
+
+from datetime import timedelta
+import csv
+import sys
+from os import path
+
+sys.path.insert(0, path.abspath("."))
+
+try:
+    from lib import requests
+    from lib import isodate
+    from scripts import istsosutils
+except ImportError as e:
+    print "\nError loading internal libs:\n >> did you run the script from the istSOS root folder?\n\n"
+    raise e
+    
+auth = ('ist','wms21supsi')
+servicename = "sos"
+
+sos1 = istsosutils.Service(
+    "http://geoservice.ist.supsi.ch", servicename, basicAuth=auth)
+sos2 = istsosutils.Service(
+    "https://geoservice.ist.supsi.ch/isos", servicename, basicAuth=auth)
+
+td = timedelta(days=60)
+
+#procedures = ["WT_TRA_ARB_FFS1"] 
+procedures = sos1.getSharedProcedureListWith(sos2)
+
+sampling = []
+
+samplingFile = open('sampling.csv', 'w')
+out = csv.writer(samplingFile, quoting=csv.QUOTE_ALL)
+
+for procedure in procedures:
+    
+    if procedure in ["P_PON", "Q_AETCAN_AIR", "Q_BOL_PTC", "Q_BON_QUA", "Q_CAL_AIR", "Q_CERPRE_FAI", "Q_CERSCA_FAI", "Q_CFER_ARO", "Q_CUC_POR", "Q_GNO_GNO", "Q_LAV_MEN", "Q_LAV_RSV", "Q_MAG_LOD", "Q_MAG_VIS", "Q_MAR_MAR", "Q_MAR_MAR2", "Q_MOR_GIU", "Q_MUZ_MUZ", "Q_RMUL_ARB", "Q_RMUL_COM", "Q_RMUL_MAR", "Q_ROV_CVM1", "Q_ROV_CVM2", "Q_ROV_CVM3", "Q_SAL_MAG", "Q_SBIB_PON", "Q_SCA_LUG", "Q_TIC_BED", "Q_TICTO_CHIR", "Q_TRA_ARB", "Q_TRA_ARB_FFS", "Q_TRA_ARB_FFS1", "Q_TRA_ARB_FFS2", "Q_TRA_ARB_ [...]
+        continue
+    
+    '''if procedure <= 'T_TRE':
+        continue'''
+        
+    row = []
+    
+    samp1 = sos1.getSOSProcedureSamplingtime(procedure)
+    samp2 = sos2.getSOSProcedureSamplingtime(procedure)
+    
+    row = [procedure]
+    
+    row.extend([samp1[0].isoformat(),samp2[0].isoformat(),samp1[1].isoformat(),samp2[1].isoformat()])
+    
+    out.writerow(row)
+    
+    sampling.append(row)
+    
+    samplingFile.flush()
+
+    #minEnd = min(samp1[1],samp2[1])
+    minEnd = max(samp1[1],samp2[1])
+    #minEnd = isodate.parse_datetime('2015-04-02T00:00:00+00:00')
+    
+    
+    
+    print "\n[%s -- %s]\n" % (minEnd-td, minEnd)
+
+    '''
+    observations1 = sos1.getSOSProcedureObservations(
+        procedure, (minEnd-timedelta(days=120)).isoformat(), (minEnd-timedelta(days=60)).isoformat(), True)
+    observations2 = sos2.getSOSProcedureObservations(
+        procedure, (minEnd-timedelta(days=120)).isoformat(), (minEnd-timedelta(days=60)).isoformat(), True)'''
+        
+    observations1 = sos1.getSOSProcedureObservations(
+        procedure, (minEnd-td).isoformat(), minEnd.isoformat(), True)
+    observations2 = sos2.getSOSProcedureObservations(
+        procedure, (minEnd-td).isoformat(), minEnd.isoformat(), True)
+        
+    '''maxBegin = max(samp1[0],samp2[0])
+    observations1 = sos1.getSOSProcedureObservations(
+        procedure, maxBegin.isoformat(), (maxBegin+timedelta(days=120)).isoformat())
+    observations2 = sos2.getSOSProcedureObservations(
+        procedure, maxBegin.isoformat(), (maxBegin+timedelta(days=120)).isoformat())
+    
+    print " >>> Compairing: %s / %s " % (maxBegin.isoformat(), (maxBegin+timedelta(days=120)).isoformat())'''
+    
+    if len(observations1)==len(observations2):
+        stop = len(observations1)
+    elif len(observations1)>len(observations2):
+        stop = len(observations1)
+    elif len(observations1)<len(observations2):
+        stop = len(observations2)
+        
+    print " > sos1 has %s observations" % len(observations1)
+    print " > sos2 has %s observations\n" % len(observations2)
+    
+    merged = [] # ListTable()
+    mergedErrors = []
+
+    stop1 = len(observations1)
+    stop2 = len(observations2)
+    cnt1 = cnt2 = 0
+    stop = max(stop1,stop2)
+    
+    errors = False
+    
+    #print "**********************************************"
+    #print "Stop: %s, %s" % (stop1,stop2)
+    #print "**********************************************"
+    
+    for i in range(0,stop):
+
+        row = []
+        iso1 = None
+        iso2 = None
+        
+        #toprint = i, ": "
+        if (cnt1)<stop1:
+            iso1 = isodate.parse_datetime(observations1[cnt1][0])
+            #toprint = toprint , cnt1, observations1[cnt1], ' '
+            
+        if (cnt2)<stop2:
+            iso2 = isodate.parse_datetime(observations2[cnt2][0])
+            #toprint = toprint , cnt2, observations2[cnt2]
+        
+        #print toprint
+        
+        if iso1 == None:
+            row = [None,None,None,iso2.isoformat(),observations2[cnt2][1],observations2[cnt2][2]]
+            #errors = True
+            #mergedErrors.append([None,None,None,iso2.isoformat(),observations2[cnt2][1],observations2[cnt2][2]])
+            cnt1 += 1     
+            if cnt2<stop2 and cnt1>stop1:
+                cnt2 += 1
+            
+        elif iso2 == None:
+            row = [iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],None,None,None]
+            errors = True
+            mergedErrors.append([iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],None,None,None])
+            cnt2 += 1
+            if cnt1<stop1 and cnt2>stop2:
+                cnt1 += 1
+            
+        elif iso1 == iso2:
+            #row.extend([iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],iso2.isoformat(),observations2[cnt2][1],observations2[cnt2][2]])
+            row = [iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],iso2.isoformat(),observations2[cnt2][1],observations2[cnt2][2]]
+            if observations1[cnt1][1] != observations2[cnt2][1]:
+                if observations1[cnt1][1]=='-999.900000' and observations2[cnt2][1] == 'None':
+                    pass
+                elif observations1[cnt1][1]=='-999.900000' and observations2[cnt2][1] != '-999.900000':
+                    pass
+                elif observations1[cnt1][1]=='-999.900000' and observations2[cnt2][1] != 'None':
+                    pass
+                else:
+                    errors = True
+                    mergedErrors.append([iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],iso2.isoformat(),observations2[cnt2][1],observations2[cnt2][2]])
+                    #print "%s - %s == %s" % (iso1.isoformat(), observations1[cnt1][1], observations2[cnt2][1])
+            # QI Check
+            '''if observations1[cnt1][2] != observations2[cnt2][2]:
+                errors = True'''
+            cnt1 += 1
+            cnt2 += 1
+            
+        elif iso1 < iso2:
+            row = [iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],None,None,None]
+            cnt1 += 1
+            errors = True
+            mergedErrors.append([iso1.isoformat(),observations1[cnt1][1],observations1[cnt1][2],None,None,None])
+            
+        elif iso1 > iso2:
+            row = [None,None,None,iso2.isoformat(),observations2[cnt2][1],observations2[cnt2][2]]
+            cnt2 += 1
+            #errors = True
+            
+        #print row
+        #print ""
+        
+        merged.append(row)
+    
+    if errors:
+        print "\n  > Checked with errors"
+    else:
+        print "  > Checked Ok"
+        
+    if errors:
+        check = open('check/%s.csv' % procedure, 'w')
+    else:
+        check = open('check/_%s.csv' % procedure, 'w')
+    
+    if len(mergedErrors)>0:
+        errorsFile = open('check/%s_errors.csv' % procedure, 'w')
+        outErrors = csv.writer(errorsFile, quoting=csv.QUOTE_ALL)
+        for row in mergedErrors:
+            outErrors.writerow(row)        
+        errorsFile.flush()
+        errorsFile.close()
+        
+    print "\n*****************************************************************\n"
+    
+    outCheck = csv.writer(check, quoting=csv.QUOTE_ALL)
+    for row in merged:
+        outCheck.writerow(row)        
+    check.flush()
+    check.close()
+    
+    
+samplingFile.close()   
+
+
+"""
+
+from lib import requests
+from lib import isodate
+from scripts import istsosutils
+from datetime import timedelta
+import csv
+
+td = 200
+
+sos1 = istsosutils.Service("http://geoservice.ist.supsi.ch", "sos")
+sos2 = istsosutils.Service("https://geoservice.ist.supsi.ch/isos", "sos")
+
+procedure = 'A_CAL_AIR'
+
+row = []
+
+samp1 = sos1.getSOSProcedureSamplingtime(procedure)
+samp2 = sos2.getSOSProcedureSamplingtime(procedure)
+
+row = [procedure]
+
+row.extend([samp1[0].isoformat(),samp2[0].isoformat(),samp1[1].isoformat(),samp2[1].isoformat()])
+
+#sampling.append(row)
+
+minEnd = min(samp1[1],samp2[1])
+
+observations1 = sos1.getSOSProcedureObservations(
+    procedure, (minEnd-timedelta(days=td)).isoformat(), minEnd.isoformat())
+observations2 = sos2.getSOSProcedureObservations(
+    procedure, (minEnd-timedelta(days=td)).isoformat(), minEnd.isoformat())
+
+if len(observations1)==len(observations2):
+    stop = len(observations1)
+elif len(observations1)>len(observations2):
+    stop = len(observations1)
+elif len(observations1)<len(observations2):
+    stop = len(observations2)
+    
+merged = [] # ListTable()
+
+stop1 = len(observations1)
+stop2 = len(observations2)
+cnt1 = cnt2 = 0
+stop = max(stop1,stop2)
+
+check = open('check/%s.csv' % procedure, 'w')
+outCheck = csv.writer(check, quoting=csv.QUOTE_ALL)
+
+for i in range(0,stop):
+
+    row = []
+    iso1 = None
+    iso2 = None
+    
+    if (cnt1)<stop1:
+        iso1 = isodate.parse_datetime(observations1[cnt1][0])
+        
+    if (cnt2)<stop2:
+        iso2 = isodate.parse_datetime(observations2[cnt2][0])
+    
+    if iso1 == None:
+        row = [None,None,iso2.isoformat(),observations2[cnt2][1]]
+        cnt1 += 1
+        
+    elif iso2 == None:
+        row = [iso1.isoformat(),observations1[cnt1][1],None,None]
+        cnt2 += 1
+        
+    elif iso1 == iso2:
+        row.extend([iso1.isoformat(),observations1[cnt1][1],iso2.isoformat(),observations2[cnt2][1]])
+        cnt1 += 1
+        cnt2 += 1
+        
+    elif iso1 < iso2:
+        row = [iso1.isoformat(),observations1[cnt1][1],None,None]
+
+        cnt1 += 1
+        
+    elif iso1 > iso2:
+        row = [None,None,iso2.isoformat(),observations2[cnt2][1]]
+        cnt2 += 1
+        
+    merged.append(row)
+
+    outCheck.writerow(row)        
+    check.flush()
+    
+    #print row
+    
+print "  > Checked"
+
+#samplingFile.close()   
+check.close()
+
+
+"""
diff --git a/scripts/constrain2db.py b/scripts/constrain2db.py
old mode 100755
new mode 100644
index e2ce231..2de8cb9
--- a/scripts/constrain2db.py
+++ b/scripts/constrain2db.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
-# Created on Mon Jan 20 12:05:08 2014
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 description:
     usage example:
diff --git a/scripts/converter/__init__.py b/scripts/converter/__init__.py
old mode 100755
new mode 100644
index 4287ca8..6d3c056
--- a/scripts/converter/__init__.py
+++ b/scripts/converter/__init__.py
@@ -1 +1,22 @@
-#
\ No newline at end of file
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
diff --git a/scripts/converter/__init__.pyc b/scripts/converter/__init__.pyc
new file mode 100644
index 0000000..e14ee2b
Binary files /dev/null and b/scripts/converter/__init__.pyc differ
diff --git a/scripts/converter/campbell.py b/scripts/converter/campbell.py
old mode 100755
new mode 100644
index f3f5cc5..f18b900
--- a/scripts/converter/campbell.py
+++ b/scripts/converter/campbell.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 
 Usage example:
@@ -120,7 +124,9 @@ class CampbellImporter(raw2csv.Converter):
     
     def parse(self, fileObj, name):
         lines = fileObj.readlines()
+        lineCounter = 0
         for line in lines:
+            lineCounter = lineCounter + 1
             s = line.strip(' \t\n\r')
             arr = s.split(",")
             if s != '' and len(arr)>0:
@@ -142,6 +148,12 @@ class CampbellImporter(raw2csv.Converter):
                     values = {}
                     
                     if "column" in self.config:
+                        # It happens that some lines are cutted so the line is skipped
+                        try:
+                            arr[self.config["column"]]
+                        except:
+                            print "Error in line %s: %s" % (lineCounter, arr)
+                            continue
                         values[self.config["observedProperty"]] = arr[self.config["column"]]
                     else:
                         values[self.config["observedProperty"]] = float(self.config["value"])
diff --git a/scripts/converter/campbell.pyc b/scripts/converter/campbell.pyc
new file mode 100644
index 0000000..49ee0e5
Binary files /dev/null and b/scripts/converter/campbell.pyc differ
diff --git a/scripts/converter/csv.py b/scripts/converter/csv.py
old mode 100755
new mode 100644
index 91c9971..c3cfa5e
--- a/scripts/converter/csv.py
+++ b/scripts/converter/csv.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2014 Massimiliano Cannata, Milan Antonovic
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
-# Created on Tue Dec 17 13:58:05 2013
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 
 Usage example:
diff --git a/scripts/converter/kern.py b/scripts/converter/kern.py
old mode 100755
new mode 100644
index 2848787..9e92a22
--- a/scripts/converter/kern.py
+++ b/scripts/converter/kern.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2013 Milan Antonovic, Massimiliano Cannata
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 
 File example:
@@ -79,7 +83,12 @@ class KernImporter(raw2csv.Converter):
         raw2csv.Converter.__init__(self, procedureName, url, service,
             inputDir, fileNamePattern, outputDir,
             qualityIndex, exceptionBehaviour, user, password, debug, csvlength, filenamecheck, archivefolder)
-            
+        
+        '''d1 = self.getDSEndPosition() - timedelta(minutes=-10080)  # one week behind
+        d2 = datetime(year=dt.year,month=1,day=1)
+        
+        perfect_pattern = "%s_%s" % (str(d1.year)[-2:], ((d1-d2).total_seconds()/60))'''
+        
     def minutesdate(self, year, minutes):
         d1 = datetime(year=int(year),month=1,day=1)
         d1 = (d1 + timedelta(minutes=int(minutes)))
diff --git a/scripts/converter/sts.py b/scripts/converter/sts.py
old mode 100755
new mode 100644
index 35a81d7..eec650e
--- a/scripts/converter/sts.py
+++ b/scripts/converter/sts.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2013 Milan Antonovic, Massimiliano Cannata
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 
 @todo to be enhanced, it is a little bit hardcoded :(
@@ -75,7 +79,7 @@ class StsImporter(raw2csv.Converter):
         
         for line in fileObj.readlines():
             
-            if line.find(skipline)==0:
+            if line.find(skipline)==0 or line.find('data')>-1:
                 continue
             
             pair = line.split(";")
@@ -84,11 +88,20 @@ class StsImporter(raw2csv.Converter):
                 op: pair[1]
             }
             
+            
             data = datetime.strptime(pair[0], dateformat)
             if "tz" in self.config:
                 data = self.getDateTimeWithTimeZone(data, self.config["tz"])
-            
+                
+            # Removing seconds from date
+            '''if "zerofill" in self.config:
+                if 's' in self.config['zerofill']:'''
+            data = datetime(
+                data.year, data.month, data.day, data.hour, 
+                data.minute, 0, tzinfo=data.tzinfo)
+                            
+                    
             self.setEndPosition(data)
             self.addObservation(
                 raw2csv.Observation(data, val)
-            )
\ No newline at end of file
+            )
diff --git a/scripts/csv2istsos.py b/scripts/csv2istsos.py
old mode 100755
new mode 100644
index 79a6cf6..6143b7e
--- a/scripts/csv2istsos.py
+++ b/scripts/csv2istsos.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 '''
 This script 
 '''
@@ -35,6 +40,7 @@ sys.path.insert(0, path.abspath("."))
 try:
     import lib.argparse as argparse
     import lib.requests as requests
+    from lib.requests.auth import HTTPBasicAuth
     import lib.isodate as iso
     from lib.pytz import timezone
 except ImportError as e:
@@ -86,11 +92,26 @@ def execute (args, logger=None):
             test = args['t']
         
         user = None
-        if 'usr' in args:
-            user = args['usr']
+        if 'user' in args:
+            user = args['user']
         passw = None
-        if 'pwd' in args:
-            passw = args['pwd']
+        if 'password' in args:
+            password = args['password']
+            
+        auth = None
+        if user and password:
+            auth = HTTPBasicAuth(user, password)
+        
+        noqi = False # False meas that quality index is also migrated
+        if 'noqi' in args:
+            if args['noqi'] == True: 
+                noqi = True
+            
+        #print "noqi: %s" % noqi
+            
+        maxobs = 5000
+        if 'm' in args:
+            maxobs = int(args['m'])
             
         #req = requests.session()
         req = requests
@@ -104,18 +125,14 @@ def execute (args, logger=None):
                 url,
                 service,
                 proc
-                ), prefetch=True, auth=(user, passw), verify=False)
+                ), auth=auth, verify=False)
                 
-            data = res.json
-            #log(pp.pprint(data))
+            data = res.json()
                 
             if data['success']==False:
                 raise Exception ("Description of procedure %s can not be loaded: %s" % (proc, data['message']))
             else:
-                if debug:
-                    pp.pprint(data)
-                else:
-                    print " > %s" % data['message']
+                print " > %s" % data['message']
             
             data = data['data']
             
@@ -124,8 +141,9 @@ def execute (args, logger=None):
             # Getting observed properties from describeSensor response
             op = []
             for out in data['outputs']:
-                op.append(out['definition'])
-            
+                if not noqi or not ':qualityIndex' in out['definition']:
+                    op.append(out['definition'])
+                    
             # Load of a getobservation request
             res = req.get("%s/wa/istsos/services/%s/operations/getobservation/offerings/%s/procedures/%s/observedproperties/%s/eventtime/last" % (
                 url,
@@ -133,29 +151,32 @@ def execute (args, logger=None):
                 'temporary',
                 proc,
                 ','.join(op)
-                ), prefetch=True, auth=(user, passw), verify=False)
+                ), auth=auth, verify=False)
             
-            data = res.json
+            data = res.json()
             
             if data['success']==False:
                 raise Exception ("Last observation of procedure %s can not be loaded: %s" % (proc, data['message']))
             else:
-                if debug:
-                    pp.pprint(data)
-                else:
-                    print " > %s" % data['message']
+                print " > %s" % data['message']
                     
             data = data['data'][0]
             data['AssignedSensorId'] = aid
             
             # Set values array empty (can contain 1 value if procedure not empty)
+            lastMeasure = data['result']['DataArray']['values'][0] if len(data['result']['DataArray']['values'])==1 else None
             data['result']['DataArray']['values'] = []
             
             # discover json observed property disposition
             jsonindex = {}
             for pos in range(0, len(data['result']['DataArray']['field'])):
                 field = data['result']['DataArray']['field'][pos]
-                jsonindex[field['definition']] = pos
+                if not noqi:
+                    jsonindex[field['definition']] = pos
+                elif not ':qualityIndex' in field['definition']:
+                    jsonindex[field['definition']] = pos
+                elif ':qualityIndex' in field['definition'] and noqi:
+                    data['result']['DataArray']['field'].pop(pos)
             
             log ("Searching: %s" % os.path.join(wd, "%s_[0-9]*%s" % (proc,ext)))
                 
@@ -165,105 +186,167 @@ def execute (args, logger=None):
             if debug:
                 print " > %s %s found" % (len(files), "Files" if len(files)>1 else "File")
                 
-            for f in files:
-            
-                # open file
-                file = open(f, 'rU')
+            if len(files)>0:
+                for f in files:
+                
+                    # open file
+                    file = open(f, 'rU')
+                    
+                    # loop lines
+                    lines = file.readlines()
+                    
+                    obsindex = lines[0].strip(' \t\n\r').split(",")
+                    
+                    # Check if all the observedProperties of the procedure are included in the CSV file (quality index is optional)
+                    for k, v in jsonindex.iteritems():
+                        if k in obsindex:
+                            continue
+                        elif ':qualityIndex' in k:
+                            continue
+                        else:
+                            raise Exception ("Mandatory observed property %s is not present in the CSV." % k)
+                    
+                    # loop lines (skipping header)
+                    for i in range(1, len(lines)):
+                        try:
+                            line = lines[i]
+                            lineArray = line.strip(' \t\n\r').split(",")
+                            
+                            # Creating an empty array where the values will be inserted
+                            observation =  ['']*len(jsonindex)
+                            
+                            for k, v in jsonindex.iteritems():
+                                val = None
+                                if k in obsindex:
+                                    val = lineArray[obsindex.index(k)]
+                                elif ':qualityIndex' in k: # Quality index is not present in the CSV so the default value will be set
+                                    val = quality
+                                    
+                                observation[v] = val
+                                
+                            # attach to object
+                            data['result']['DataArray']['values'].append(observation)
+                            
+                        except Exception as e:
+                            print "Errore alla riga: %s - %s)" % (i, lines[i])
+                            traceback.print_exc()
+                            raise e
+                            
+                log ("Before insert ST:")
+                if 'beginPosition' in data["samplingTime"]:
+                    log (" > Begin: %s" % data["samplingTime"]["beginPosition"])
+                if 'endPosition' in data["samplingTime"]:
+                    log ("   + End: %s" % data["samplingTime"]["endPosition"])
+                
+                ep = datetime.strptime(
+                    os.path.split(f)[1].replace("%s_" % proc, "").replace(ext, ""),"%Y%m%d%H%M%S%f"
+                ).replace(tzinfo=timezone('UTC'))
+                
+                # Kick in the brain code snippet
                 
-                # loop lines
-                lines = file.readlines()
+                # If there is at least one measure:
+                if len(data['result']['DataArray']['values'])>0:
                 
-                obsindex = lines[0].strip(' \t\n\r').split(",")
+                    # taking first observation as begin position
+                    bp = iso.parse_datetime(
+                        data['result']['DataArray']['values'][0][jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']]
+                    )
+                        
+                else: # otherwise this can be an irrebular procedure where just the end position is moved forward
                 
-                # Check if all the observedProperties of the procedure are included in the CSV file (quality index is optional)
-                for k, v in jsonindex.iteritems():
-                    if k in obsindex:
-                        continue
-                    elif ':qualityIndex' in k:
-                        continue
+                    if ep > iso.parse_datetime(data["samplingTime"]["endPosition"]):
+                        bp = ep
                     else:
-                        raise Exception ("Mandatory observed property %s is not present in the CSV." % k)
+                        raise Exception("Something is wrong with begin position..")
+                        
+                data["samplingTime"] = {
+                    "beginPosition": bp.isoformat(),
+		            "endPosition":  ep.isoformat()
+                }
+                
+                #data["result"]["DataArray"]["elementCount"] = str(len(data['result']['DataArray']['values']))
                 
-                # loop lines skipping the header
-                for i in range(1, len(lines)):
-                    try:
-                        line = lines[i]
-                        lineArray = line.strip(' \t\n\r').split(",")
+                log ("Insert ST:")
+                log (" > Begin: %s" % bp.isoformat())
+                log ("   + End: %s" % ep.isoformat())
+                log (" > Values: %s" % len( data['result']['DataArray']['values']))
+                    
+                if not test and len(files)>0: # send to wa
+                
+                    if len(data['result']['DataArray']['values']) > maxobs:
+                    
+                        import copy
                         
-                        # Creating an empty array where the values will be inserted
-                        observation =  ['']*len(jsonindex)
+                        total = len(data['result']['DataArray']['values'])
+                        inserted = last = maxobs
                         
-                        for k, v in jsonindex.iteritems():
-                            val = None
-                            if k in obsindex:
-                                val = lineArray[obsindex.index(k)]
-                            elif ':qualityIndex' in k: # Quality index is not present in the CSV so the default value will be set
-                                val = quality
+                        while len(data['result']['DataArray']['values'])>0:
+                            
+                            tmpData = copy.deepcopy(data)                            
+                            tmpData['result']['DataArray']['values'] = data['result']['DataArray']['values'][:last]                            
+                            data['result']['DataArray']['values']    = data['result']['DataArray']['values'][last:]
+                            
+                            if len(data['result']['DataArray']['values'])>0:
+                                tmpData["samplingTime"] = {
+                                    "beginPosition": tmpData['result']['DataArray']['values'][0][jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']],
+			                        "endPosition":      data['result']['DataArray']['values'][0][jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']]
+                                }
+                            else:
+                                tmpData["samplingTime"] = {
+                                    "beginPosition": tmpData['result']['DataArray']['values'][0][jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']],
+			                        "endPosition":   ep.isoformat()
+                                }
                                 
-                            observation[v] = val
+                            res = req.post("%s/wa/istsos/services/%s/operations/insertobservation" % (
+                                url,
+                                service), 
+                                auth=auth,
+                                verify=False,
+                                data=json.dumps({
+                                    "ForceInsert": "true",
+                                    "AssignedSensorId": aid,
+                                    "Observation": tmpData
+                                })
+                            )
+                            
+                            # read response
+                            res.raise_for_status()
+                            log (" > Insert observation success of %s/%s (%s / %s) observations: %s" % (inserted,total,tmpData["samplingTime"]["beginPosition"],tmpData["samplingTime"]["endPosition"],res.json()['success']))
+                            if not res.json()['success']:
+                                log (res.json()['message'])
+                                
+                            if len(data['result']['DataArray']['values'])<maxobs:
+                                last = len(data['result']['DataArray']['values'])
+                            inserted += last
                             
-                        # attach to object
-                        data['result']['DataArray']['values'].append(observation)
-                        
-                    except Exception as e:
-                        print "Errore alla riga: %s" % i
-                        raise e
-                        
-            log ("Before insert ST:")
-            log (" > Begin: %s" % data["samplingTime"]["beginPosition"])
-            log ("   + End: %s" % data["samplingTime"]["endPosition"])
-            
-            ep = datetime.strptime(
-                os.path.split(f)[1].replace("%s_" % proc, "").replace(ext, ""),"%Y%m%d%H%M%S%f"
-            ).replace(tzinfo=timezone('UTC')) # .isoformat()
-            
-            # @todo: date shall be converted in datetime objects
-            if len(data['result']['DataArray']['values'])>0:
-                bp = iso.parse_datetime(
-                    data['result']['DataArray']['values'][0][jsonindex['urn:ogc:def:parameter:x-istsos:1.0:time:iso8601']]
-                )
-                if bp > iso.parse_datetime(data["samplingTime"]["endPosition"]):
-                    bp = iso.parse_datetime(data["samplingTime"]["endPosition"])
-            else:
-                if ep > iso.parse_datetime(data["samplingTime"]["endPosition"]):
-                    bp = iso.parse_datetime(data["samplingTime"]["endPosition"])
-                else:
-                    raise Exception("Something is wrong with begin position..")
                     
-            data["samplingTime"] = {
-                "beginPosition": bp.isoformat(),
-			   "endPosition":  ep.isoformat()
-            }
-            
-            #data["result"]["DataArray"]["elementCount"] = str(len(data['result']['DataArray']['values']))
-            
-            log ("Insert ST:")
-            log (" > Begin: %s" % bp.isoformat())
-            log ("   + End: %s" % ep.isoformat())
-            log (" > Values: %s" % len( data['result']['DataArray']['values']))
+                    else:
                 
-            if not test and len(files)>0: # send to wa
-                res = req.post("%s/wa/istsos/services/%s/operations/insertobservation" % (
-                    url,
-                    service), 
-                    prefetch=True,
-                    auth=(user, passw),
-                    verify=False,
-                    data=json.dumps({
-                    "ForceInsert": "true",
-                    "AssignedSensorId": aid,
-                    "Observation": data
-                    })
-                )
-                # read response
-                log (" > Insert observation success: %s" % res.json['success'])
-                if not res.json['success']:
-                    log (res.json['message'])
+                        res = req.post("%s/wa/istsos/services/%s/operations/insertobservation" % (
+                            url,
+                            service), 
+                            auth=auth,
+                            verify=False,
+                            data=json.dumps({
+                                "ForceInsert": "true",
+                                "AssignedSensorId": aid,
+                                "Observation": data
+                            })
+                        )
+                        # read response
+                        res.raise_for_status()
+                        log (" > Insert observation success: %s" % res.json()['success'])
+                        if not res.json()['success']:
+                            log (res.json()['message'])
+                        
                     
-                
-                print "~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~"
+                    print "~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~"
+        pass
+    
+    except requests.exceptions.HTTPError as eh:
+        print "ERROR: %s\n\n" % eh
+        traceback.print_exc()
         pass
-        
     except Exception as e:    
         print "ERROR: %s\n\n" % e
         traceback.print_exc()
@@ -295,6 +378,13 @@ if __name__ == "__main__":
         dest='p',
         metavar='procedures',
         help='List of procedures to be aggregated.')
+        
+    parser.add_argument('-m', 
+        action='store',
+        dest='m',
+        metavar='max observations',
+        default= '5000',
+        help='Maximum number of observations inserted per InsertObservation request (default: %(default)s).')
     
     parser.add_argument('-q',
         action = 'store',
@@ -303,6 +393,11 @@ if __name__ == "__main__":
         default= '100',
         help   = 'The quality index to set for all the measures of the CSV file, if not set into the CSV. (default: %(default)s).')
         
+    parser.add_argument('-noqi',
+        action = 'store_true',
+        dest   = 'noqi',
+        help   = 'Do not export quality index')
+        
     parser.add_argument('-u',
         action = 'store',
         dest   = 'u',
@@ -332,14 +427,14 @@ if __name__ == "__main__":
         default= '.dat',
         help   = 'Extension of the CSV file. (default: %(default)s)')
         
-    parser.add_argument('-usr',
+    parser.add_argument('-user',
         action = 'store',
-        dest   = 'usr',
+        dest   = 'user',
         metavar= 'user name')
         
-    parser.add_argument('-pwd',
+    parser.add_argument('-password',
         action = 'store',
-        dest   = 'pwd',
+        dest   = 'password',
         metavar= 'password')
 
     args = parser.parse_args()
diff --git a/scripts/csv2istsos.pyc b/scripts/csv2istsos.pyc
new file mode 100644
index 0000000..b236688
Binary files /dev/null and b/scripts/csv2istsos.pyc differ
diff --git a/scripts/istsos-ckeck.py b/scripts/istsos-ckeck.py
new file mode 100644
index 0000000..b3c6a56
--- /dev/null
+++ b/scripts/istsos-ckeck.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------------
+# istSOS - Istituto Scienze della Terra
+# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+#---------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#---------------------------------------------------------------------------
+"""
+description:
+    
+    todo
+    
+"""
+
+import sys
+from os import path
+
+try:
+    sys.path.insert(0, path.abspath("."))
+    from scripts import istsosutils
+except ImportError as e:
+    print "\nError loading internal libs:\n >> please run the script from the istSOS root folder.\n\n"
+    raise e
+    
+    
+sos = istsosutils.Service("http://geoservice.ist.supsi.ch/", "sosraw")
+isos = istsosutils.Service("http://localhost/istsos", "sosraw")
+
+sosprocs = sos.getSOSProceduresList()
+isosprocs = isos.getSOSProceduresList()
+
+for idx in range(len(isosprocs)):
+    isosprocs[idx] = isosprocs[idx].replace('urn:ogc:def:procedure:x-istsos:1.0:','')
+    
+sosprocs.sort()
+isosprocs.sort()
+
+comparator = {}
+
+for name in sosprocs:
+    comparator[name] = [True,False,False,False]
+    
+for name in isosprocs:
+    if sosprocs.index(name)>=0:
+    
+        sosSam = sos.getSOSProcedureSamplingtime(name)
+        isosSam = isos.getSOSProcedureSamplingtime(name)
+        
+        comparator[name][1] = True
+        
+        if sosSam[0] == isosSam[0]:
+            comparator[name][2] = True
+            
+        if sosSam[1] == isosSam[1]:
+            comparator[name][3] = True
+            
+        for tmp in [sosSam[0],sosSam[1],isosSam[0],isosSam[1]]:
+            if  tmp is None:
+                comparator[name].append(None)
+            else:
+                comparator[name].append(tmp.isoformat())
+            
+        #comparator[name].extend([
+        #    sosSam[0].isoformat(),sosSam[1].isoformat(),
+        #    isosSam[0].isoformat(),isosSam[1].isoformat()
+        #])
+        
+    else:
+        comparator[name] = [False,True,False,False]
+    
+keys = comparator.keys()
+keys.sort()
+for c in keys:
+    line = c
+    for b in range(len(comparator[c])):
+        line += ",%s" % comparator[c][b]
+    print line
+    
+    
diff --git a/scripts/istsos2csv.py b/scripts/istsos2csv.py
new file mode 100644
index 0000000..d3aa404
--- /dev/null
+++ b/scripts/istsos2csv.py
@@ -0,0 +1,210 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import urllib
+import datetime
+import sys
+from os import path
+import traceback
+from datetime import timedelta
+    
+sys.path.insert(0, path.abspath("."))
+try:
+    import lib.argparse as argparse
+    import lib.requests as req
+    from lib.requests.auth import HTTPBasicAuth
+    from scripts import istsosutils
+    import lib.isodate as iso
+
+except ImportError as e:
+    print "\nError loading internal libs:\n >> did you run the script from the istSOS root folder?\n\n"
+    raise e
+
+step = timedelta(days=20)
+isoop = "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601"
+    
+def makeFile(res, procedure, op, path):
+    text = res.text
+    text = text.replace("%s," % procedure, "")
+    lines = text.split('\n')
+    if lines[-1] == '':
+        del lines[-1]
+    tmpOp = op.replace("x-ist::","x-istsos:1.0:")
+    lines[0] = "%s,%s,%s:qualityIndex" % (isoop, tmpOp, tmpOp)    
+    if len(lines)>1:
+        datenumber = iso.parse_datetime(lines[-1].split(",")[0])       
+        print "File: %s/%s_%s.dat" % (path, procedure, datetime.datetime.strftime(datenumber, "%Y%m%d%H%M%S%f"))
+        out_file = open("%s/%s_%s.dat" % (path, procedure, datetime.datetime.strftime(datenumber, "%Y%m%d%H%M%S%f")),"w")
+        out_file.write("\n".join(lines))
+        #print "\n".join(lines)
+        out_file.close()
+
+    
+def execute (args, logger=None):
+    
+    print "istsos2csv start.."
+    
+    try:
+        
+        url = args['url']
+        
+        procedure = args['procedure']
+        observedProperty = args['op']
+        
+        begin = iso.parse_datetime(args['begin'])
+        end = iso.parse_datetime(args['end'])
+        
+        d = args['d']
+        
+        auth = None
+        if 'user' in args:
+            user = args['user']
+        password = None
+        if 'password' in args:
+            password = args['password']
+        if auth and password:
+            auth = HTTPBasicAuth(user, password)
+            
+        qi = 'True'
+        if 'noqi' in args:
+            if args['noqi'] == True: 
+                qi = 'False'
+                
+            
+        params = {
+            "request": "GetObservation",
+            "offering": "temporary",
+            "procedure": procedure,
+            "eventTime": None,
+            "observedProperty": observedProperty,
+            "responseFormat": "text/plain",
+            "service": "SOS", 
+            "version":"1.0.0",
+            "qualityIndex": qi
+        }
+        
+        tmpBegin = begin
+        tmpEnd = end
+        if (end-begin)>step:
+            tmpEnd = tmpBegin + step
+        
+        print params
+
+        while tmpEnd <= end:
+        
+            print ("%s - %s") % (tmpBegin,tmpEnd)
+
+            if tmpBegin == tmpEnd:
+                params["eventTime"] = iso.datetime_isoformat(tmpBegin)
+            else:
+                params["eventTime"] = "%s/%s" % (iso.datetime_isoformat(tmpBegin), iso.datetime_isoformat(tmpEnd))
+                
+            res = req.get("%s?%s" % (url, urllib.urlencode(params)), auth=auth)
+            
+            makeFile(res, procedure, observedProperty, d)
+            tmpBegin = tmpEnd
+            tmpEnd = tmpBegin + step
+            
+            print " %s ************************** " % iso.datetime_isoformat(tmpEnd)
+            
+        if tmpBegin < end:
+        
+            tmpEnd = end
+            if tmpBegin == tmpEnd:
+                params["eventTime"] = iso.datetime_isoformat(tmpBegin)
+            else:
+                params["eventTime"] = "%s/%s" % (iso.datetime_isoformat(tmpBegin), iso.datetime_isoformat(tmpEnd))
+            
+            res = req.get("%s?%s" % (url, urllib.urlencode(params)), auth=auth)
+            makeFile(res, procedure, observedProperty, d)
+            
+            print " %s ************************** " % iso.datetime_isoformat(end)
+        
+        print "Finish."
+        
+    except Exception as e:    
+        print "ERROR: %s\n\n" % e
+        traceback.print_exc()
+
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='Export data in CSV format')
+        
+    parser.add_argument('-b', '--begin',
+        action = 'store',
+        dest   = 'begin',
+        default= '*',
+        metavar= '1978-10-08T03:56:00+01:00',
+        help   = 'Begin position date of the processing in ISO 8601. If the default value (%(default)s) is used, then the endPosition of the \"destination\" service procedure will be used.')
+    
+    parser.add_argument('-e', '--end',
+        action = 'store',
+        dest   = 'end',
+        default= '*',
+        metavar= '2014-01-27T11:27:00+01:00',
+        help   = 'End position date of the processing in ISO 8601. If the default value (%(default)s) is used, then the endPosition of the "source" service procedure will be used.')
+        
+    
+    parser.add_argument('-noqi',
+        action = 'store_true',
+        dest   = 'noqi',
+        help   = 'Do not export quality index')
+        
+    parser.add_argument('-p',
+        action = 'store',
+        dest   = 'procedure',
+        help   = 'Procedure name')
+        
+    parser.add_argument('-o',
+        action = 'store',
+        dest   = 'op',
+        help   = 'Procedure\'s observed property')
+    
+    parser.add_argument('-u',
+        action = 'store',
+        dest   = 'url',
+        metavar= 'url',
+        default= 'http://localhost:80/sos',
+        help   = 'IstSOS Server address IP (or domain name) used for all request. (default: %(default)s).')
+        
+    parser.add_argument('-d',
+        action = 'store',
+        dest   = 'd',
+        default= './',
+        help   = 'Csv output folder (default %(default)s).')
+        
+    parser.add_argument('-user',
+        action = 'store',
+        dest   = 'user',
+        help   = 'User')
+        
+    parser.add_argument('-password',
+        action = 'store',
+        dest   = 'password',
+        help   = 'password')
+    
+
+    args = parser.parse_args()
+    #print args.__dict__
+    execute(args.__dict__)
diff --git a/scripts/istsos2csv.pyc b/scripts/istsos2csv.pyc
new file mode 100644
index 0000000..6b640bd
Binary files /dev/null and b/scripts/istsos2csv.pyc differ
diff --git a/scripts/istsos2istsos.py b/scripts/istsos2istsos.py
old mode 100755
new mode 100644
index b813f46..5da0c14
--- a/scripts/istsos2istsos.py
+++ b/scripts/istsos2istsos.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2014 Milan Antonovic, Massimiliano Cannata
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 description:
     
@@ -151,8 +155,8 @@ def execute (args, logger=None):
         surl,
         ssrv,
         procedure
-        ), prefetch=True, auth=(suser, spwd), verify=False)
-    sdata = res.json
+        ), auth=(suser, spwd), verify=False)
+    sdata = res.json()
     if sdata['success']==False:
         raise Exception ("Description of procedure %s can not be loaded from source service: %s" % (procedure, sdata['message']))
     else:
@@ -161,20 +165,20 @@ def execute (args, logger=None):
     # Loading describe sensor from destination ================================
     res = req.get("%s/wa/istsos/services/%s/procedures/%s" % (
             durl, dsrv, procedure
-        ), prefetch=True, auth=(duser, dpwd), verify=False)
-    ddata = res.json
+        ), auth=(duser, dpwd), verify=False)
+    ddata = res.json()
     if ddata['success']==False:
         raise Exception ("Description of procedure %s can not be loaded from destination service: %s" % (procedure, ddata['message']))
     else:
         log("   > DS Destination Ok.")
         
-    # Load of a getobservation template =======================================
+    # Load of a getobservation template from destination =======================================
     res = req.get("%s/wa/istsos/services/%s/operations/getobservation/offerings/%s/procedures/%s/observedproperties/:/eventtime/last?qualityIndex=False" % (
             durl, dsrv, 'temporary', procedure
         ),  params={
             "qualityIndex": cpqi
-        }, prefetch=True, auth=(duser, dpwd), verify=False)
-    dtemplate = res.json
+        }, auth=(duser, dpwd), verify=False)
+    dtemplate = res.json()
     if dtemplate['success']==False:
         raise Exception ("Observation template of procedure %s can not be loaded: %s" % (procedure, dtemplate['message']))
     else:
@@ -187,8 +191,8 @@ def execute (args, logger=None):
     if aurl and asrv:
         res = req.get("%s/wa/istsos/services/%s/procedures/%s" % (
                 aurl, asrv, procedure
-            ), prefetch=True, auth=(auser, apwd), verify=False)
-        adata = res.json
+            ), auth=(auser, apwd), verify=False)
+        adata = res.json()
         if adata['success']==False:
             raise Exception ("Description of procedure %s can not be loaded from destination service: %s" % (procedure, adata['message']))
         else:
@@ -196,29 +200,29 @@ def execute (args, logger=None):
 
     log("\n2. Identifying processing interval:")
     
-    
-    # Check if mesaures are present in source procedure, if it is empty an exception is thrown
+    # Check if mesaures are present in source procedure, by identifying the sampling time constraint 
+    #  located always in the first position of the outputs, if it is empty an exception is thrown
     if (not 'constraint' in sdata['data']['outputs'][0] 
             or not 'interval' in sdata['data']['outputs'][0]['constraint'] ):
         raise Exception ("There is no data in the source procedure to be copied to the destination procedure.")
-    
-    # Check if the contraint interval contains a valid ISO date begin position
-    try:
-        iso.parse_datetime(sdata['data']['outputs'][0]['constraint']['interval'][0])
-    except Exception:
-        raise Exception ("The date in the source procedure constraint interval (%s) is not valid." % 
-            sdata['data']['outputs'][0]['constraint']['interval'][0])
-    
-    # Check if the contraint interval contains a valid ISO date end position
-    try:
-        iso.parse_datetime(sdata['data']['outputs'][0]['constraint']['interval'][1])
-    except Exception:
-        raise Exception ("The date in the source procedure constraint interval (%s) is not valid." % 
-            sdata['data']['outputs'][0]['constraint']['interval'][1])
+    else:
+        # Check if the contraint interval contains a valid ISO date begin position
+        try:
+            iso.parse_datetime(sdata['data']['outputs'][0]['constraint']['interval'][0])
+        except Exception:
+            raise Exception ("The date in the source procedure constraint interval (%s) is not valid." % 
+                sdata['data']['outputs'][0]['constraint']['interval'][0])
+        
+        # Check if the contraint interval contains a valid ISO date end position
+        try:
+            iso.parse_datetime(sdata['data']['outputs'][0]['constraint']['interval'][1])
+        except Exception:
+            raise Exception ("The date in the source procedure constraint interval (%s) is not valid." % 
+                sdata['data']['outputs'][0]['constraint']['interval'][1])
     
     log("   > Source interval is valid")
     
-    # Looking for start instant processing 
+    # Looking for start (IO beginPOsition) instant processing 
     #   If the default value (*) is used, then the endPosition of 
     #   the "destination" service procedure will be used. But if the destination
     # procedure is empty , then the begin position of the source will be used
@@ -228,24 +232,45 @@ def execute (args, logger=None):
         if ('constraint' in ddata['data']['outputs'][0] 
             and 'interval' in ddata['data']['outputs'][0]['constraint']):
                 try:
-                    # Using the end position of the destination will be used
-                    start = iso.parse_datetime(ddata['data']['outputs'][0]['constraint']['interval'][1])
-                    # Retroactive aggregation
-                    if retro > 0:
+                    if function and resolution:
+                        # getting last inserted observations of "destination" service
+                        log("Aggregation requested: getting last inserted observations of \"destination\" service")
+                        params = {
+                            "request": "GetObservation",
+                            "service": "SOS",
+                            "version": "1.0.0",
+                            "observedProperty": ':',
+                            "procedure": procedure,
+                            "responseFormat": "application/json",
+                            "offering": 'temporary'
+                        }
+                        res = req.get("%s/%s" % (durl,dsrv), params=params, auth=(duser, dpwd), verify=False)
+                        obs = res.json()
+                        start = iso.parse_datetime(obs['ObservationCollection']['member'][0]['result']['DataArray']['values'][0][0])
+                    else:
+                        # The endPosition of the destination will be used as Start/IO BeginPosition
+                        start = iso.parse_datetime(ddata['data']['outputs'][0]['constraint']['interval'][1])
+                    if retro > 0: # Retroactive aggregation
+                        log("Retroactive aggregation active.")
                         if start-timedelta(minutes=retro) > iso.parse_datetime(ddata['data']['outputs'][0]['constraint']['interval'][0]):
                             start = start-timedelta(minutes=retro)
                         else:
                             start = iso.parse_datetime(ddata['data']['outputs'][0]['constraint']['interval'][0])
-                except Exception:
-                    raise Exception ("The date in the destination procedure constraint interval (%s) is not valid." % 
-                        ddata['data']['outputs'][0]['constraint']['interval'][0])
+                            
+                    log("Start: %s" % start)
+                    
+                except Exception as ee:
+                    print "Error setting start date for proc %s: %s" % (procedure,ee)
+                    raise Exception ("The date in the destination procedure %s constraint interval (%s) is not valid." % 
+                        (procedure,ddata['data']['outputs'][0]['constraint']['interval'][0]))
         else:
-            # Using the begin position of the source will be used
+            # The beginPosition of the source will be used as Start/IO BeginPosition
             start = iso.parse_datetime(sdata['data']['outputs'][0]['constraint']['interval'][0])           
     else:
         start = iso.parse_datetime(begin)
     
     if end == "*":
+        # The endPosition of the source will be used as Stop/IO EndPosition
         stop = iso.parse_datetime(sdata['data']['outputs'][0]['constraint']['interval'][1])   
     else:
         stop = iso.parse_datetime(end)
@@ -267,7 +292,7 @@ def execute (args, logger=None):
         try:
             iso.duration_isoformat(resolution)
         except:
-            raise Exception ("The resolution (%s) to apply in the aggrating function is not valid." % resolution)
+            raise Exception ("The resolution (%s) to apply in the aggregating function is not valid." % resolution)
         log("   > Function(Resolution) : %s(%s)" % (function,resolution))
         
     while start+interval<=stop:        
@@ -296,34 +321,32 @@ def execute (args, logger=None):
             if nodataQI != None:
                 params['aggregateNodataQi'] = nodataQI
         
-        res = req.get("%s/%s" % (surl,ssrv),  params=params, prefetch=True, auth=(suser, spwd), verify=False)
+        res = req.get("%s/%s" % (surl,ssrv),  params=params, auth=(suser, spwd), verify=False)
         
         # Check if an Exception occured
         if 'ExceptionReport' in res.content:
             raise Exception (res.content)
         
-        smeasures = res.json['ObservationCollection']['member'][0]
+        smeasures = res.json()['ObservationCollection']['member'][0]
         #pp.pprint(smeasures)
         
         log("   > %s measures from: %s to: %s" % (len(smeasures['result']['DataArray']['values']), start.isoformat(), nextStart.isoformat()))
         
-        dtemplate["samplingTime"] = {
-            "beginPosition": start.isoformat()
-        }
+        dtemplate["samplingTime"] = {}
         if lm and len(smeasures['result']['DataArray']['values'])>0:
+            dtemplate["samplingTime"]["beginPosition"] = smeasures['result']['DataArray']['values'][0][0]
             dtemplate["samplingTime"]["endPosition"] = smeasures['result']['DataArray']['values'][-1][0]
         else:
+            dtemplate["samplingTime"]["beginPosition"] = start.isoformat()
             dtemplate["samplingTime"]["endPosition"] = nextStart.isoformat()
             
         dtemplate['result']['DataArray']['values'] = smeasures['result']['DataArray']['values']
-            
         dtemplate['result']['DataArray']['field'] = smeasures['result']['DataArray']['field']
         
         # POST data to WA
         res = req.post("%s/wa/istsos/services/%s/operations/insertobservation" % (
             durl,
             dsrv), 
-            prefetch=True,
             auth=(duser, dpwd),
             verify=False,
             data=json.dumps({
@@ -334,10 +357,12 @@ def execute (args, logger=None):
         )
         
         # read response
-        log("     > Insert observation success: %s" % res.json['success'])
+        log("     > Insert observation success: %s" % res.json()['success'])
+        
+        #print res.json()
         
-        if not res.json['success']:
-            raise Exception ('Error inserting observation: %s' % res.json['message'])
+        if not res.json()['success']:
+            raise Exception ('Error inserting observation: %s' % res.json()['message'])
         
         start = nextStart
         if start<stop and start+interval>stop:
@@ -510,4 +535,6 @@ if __name__ == "__main__":
         help   = 'Password, if given this will be used for istSOS QI EXTRAPOLATION')
         
     args = parser.parse_args()
-    execute(args.__dict__)
\ No newline at end of file
+    
+    execute(args.__dict__)
+    
diff --git a/scripts/istsos2istsos.pyc b/scripts/istsos2istsos.pyc
new file mode 100644
index 0000000..5c79377
Binary files /dev/null and b/scripts/istsos2istsos.pyc differ
diff --git a/scripts/istsosutils.py b/scripts/istsosutils.py
new file mode 100755
index 0000000..8915863
--- /dev/null
+++ b/scripts/istsosutils.py
@@ -0,0 +1,459 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+"""
+description:
+    
+    
+"""
+
+import sys
+from datetime import timedelta
+from datetime import datetime
+import pprint
+from StringIO import StringIO
+import json
+try:
+    import lib.requests as req
+    from lib.requests.auth import HTTPBasicAuth
+    import lib.argparse as argparse
+    from lib.etree import et
+    import lib.isodate as iso
+except ImportError as e:
+    print "\nError loading internal libs:"
+    raise e
+
+class Service(object):
+
+    """
+    Base class handling istSOS WA requests
+    """
+    
+    def __init__(self, host, service, basicAuth=None):
+        """
+        Initialize Service object
+        """
+        self.host = host
+        self.service = service
+        self.auth = None
+        self.user = None
+        self.password = None
+        if basicAuth:
+            self.user = basicAuth[0]
+            self.password = basicAuth[1]
+            self.auth = HTTPBasicAuth(self.user, self.password)
+        
+       
+    def parse_and_get_ns(self, xml):
+        events = "start", "start-ns"
+        root = None
+        ns = {}
+        for event, elem in et.iterparse(xml, events):
+            if event == "start-ns":
+                if elem[0] in ns and ns[elem[0]] != elem[1]:
+                    raise KeyError("Duplicate prefix with different URI found.")
+                ns[elem[0]] = "%s" % elem[1]
+            elif event == "start":
+                if root is None:
+                    root = elem 
+        return et.ElementTree(root), ns
+       
+    def getSOSProcedureSamplingtime(self, name):
+        """
+            Execute a getObservation and extract the begin and endPosition.
+            
+            > Return an array of two dates.  
+        
+        """        
+        ret = self.extractSamplingFromGOJson(
+            self.getSOSProcedure(name)
+        )
+        print " > %s: %s - %s" % (name, ret[0], ret[1]) 
+        return ret
+        
+            
+    def extractSamplingFromGOJson(self, json):
+        
+        if "beginPosition" in json["samplingTime"]:
+            
+            begin = json["samplingTime"]["beginPosition"]
+            end = json["samplingTime"]["endPosition"]
+            
+        
+            return [
+                iso.parse_datetime(begin),
+                iso.parse_datetime(end)
+            ]
+        
+        else:
+        
+            print "%s: %s - %s" % (name, None, None) 
+            return [None,None]
+       
+    def getSOSProceduresList(self): 
+        """
+            Execute a getCapabilties and extract all the procedures name.
+            
+            > Return an array of procedures name strings.  
+        
+        """
+        # Executing request
+        
+        params = {
+            'service': 'SOS', 
+            'version': '1.0.0',
+            'request': 'GetCapabilities',
+            'section': 'contents'
+        }
+        
+        print "Requesting a getCapabilitie: %s/%s" % (self.host,self.service)
+        print params
+        
+        res = req.get("%s/%s" % (self.host,self.service), params=params, auth=self.auth)
+        
+        # Parsing response
+        gc, gcNs = self.parse_and_get_ns(StringIO(res.content))
+        
+        offerings = gc.findall("{%s}Contents/{%s}ObservationOfferingList/{%s}ObservationOffering" % (gcNs['sos'],gcNs['sos'],gcNs['sos']) )
+        
+        procedures = {}
+        
+        for offering in offerings:
+            offeringName = offering.find("{%s}name" % (gcNs['gml']) ).text.split(":")[-1]
+            
+            # For each offering get the procedures
+            elProcs = offering.findall("{%s}procedure" % (gcNs['sos']) )
+            for p in elProcs:
+                pname = p.get('{%s}href' % gcNs['xlink'])
+                
+                procedures[pname] = True
+                
+                #print pname
+                
+        return procedures.keys()
+        
+        
+    def getProcedures(self):
+        res = req.get(
+            "%s/wa/istsos/services/%s/procedures/operations/getlist" % (
+                self.host,self.service
+            ), auth=self.auth
+        )
+        json = res.json()
+        if not json['success']:
+            raise Exception("Error loading procedures list: %s" % (json['message']))     
+        
+        procedures = []
+        for data in json['data']:
+            procedure = Procedure(data['name'])
+            procedure.merge(data)
+            procedures.append(procedure)
+        
+        
+        print "Procedures list result:"
+        print " - Found: %s procedures" % len(procedures)
+        
+        
+        return procedures
+        
+        
+    def getProcedure(self,name):
+        ret = Procedure(name)
+        res = req.get(
+            "%s/wa/istsos/services/%s/procedures/%s" % (
+                self.host,self.service,name
+            ), auth=self.auth
+        )
+        json = res.json()
+        if not json['success']:
+            raise Exception("Error loading %s description: %s" % (self.name, json['message']))        
+        ret.description = json['data']
+                
+        return ret
+        
+    def getSOSProcedure(self,name):
+    
+        params = {
+            'service': 'SOS', 
+            'version': '1.0.0',
+            'request': 'GetObservation',
+            'observedProperty': ':',
+            'offering': 'temporary',
+            'responseFormat': 'application/json',
+            'procedure': name
+        }
+        
+        print "Requesting %s GetObservation: %s/%s" % (name,self.host,self.service)
+        #print params
+        
+        res = req.get("%s/%s" % (self.host,self.service), params=params, auth=self.auth)
+        
+        #print res.json()
+        
+        
+        
+        json = res.json()['ObservationCollection']['member'][0]
+        
+        return json
+    
+    def registerProcedure(self, procedure):
+        request = {
+            "system_id": procedure.name,
+            "system": procedure.name,
+            "classification": [
+                {
+                    "name": "System Type",
+                    "definition": "urn:ogc:def:classifier:x-istsos:1.0:systemType",
+                    "value": procedure.systemType
+                },
+                {
+                    "name": "Sensor Type",
+                    "definition": "urn:ogc:def:classifier:x-istsos:1.0:sensorType",
+                    "value": procedure.sensorType
+                }
+            ],
+            "outputs": [
+                {
+                    "name": "Time",
+                    "definition": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601",
+                    "uom": "iso8601",
+                    "description":"",
+                    "constraint":{}
+                }
+            ],
+            "description": procedure.description,
+            "keywords": procedure.keywords,
+            "identification": [{
+                    "definition":'urn:ogc:def:identifier:OGC:uniqueID',
+                    "name":"uniqueID",
+                    "value": "urn:ogc:def:procedure:x-istsos:1.0:%s" % procedure.name
+            }],
+            "location": {
+                "type": "Feature",
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": procedure.xyz
+                },
+                "crs": {
+                    "type": "name",
+                    "properties": {"name": procedure.epsg}
+                },
+                "properties": {"name": procedure.foiname}
+            },
+            "characteristics": "",
+            "contacts": [],
+            "documentation": [],
+            "interfaces": "",
+            "inputs": [],
+            "history": [],
+            "capabilities": []
+        }
+        for obs in procedure.observedProperty:
+            request["outputs"].append({
+                "name": procedure.observedProperty[obs][0],
+                "definition": procedure.observedProperty[obs][1],
+                "uom": procedure.observedProperty[obs][2],
+                "description": procedure.observedProperty[obs][3],
+                "constraint":{}
+            })
+        res = req.post("%s/wa/istsos/services/%s/procedures" % (self.host,self.service), 
+                data=json.dumps(request), auth=self.auth
+        ) 
+        json = res.json()
+        if not json["success"]:
+            #print json.dumps(procedures[pname].data)
+            raise Exception("Registering procedure %s failed: \n%s" % (pname, json["message"]))
+        else:
+            print json["message"]
+            
+    def getSOSProcedureObservations(self, name, begin, end, qi = False):
+        """
+            Execute a getObservation
+            
+            > Return an array observations.  
+        
+        """
+        begin1 = ""
+        end1 = ""
+        
+        
+        # Checking dates format
+        if isinstance(begin, datetime):
+            # Check tz
+            if begin.tzinfo is None:
+                raise Exception("Time Zone (tzinfo) is mandatory in datetime objects")
+            begin1 = begin.isoformat()
+        elif isinstance(begin, str):
+            tmp = iso.parse_datetime(begin)
+            if tmp.tzinfo is None:
+                raise Exception("Time Zone (tzinfo) is mandatory in datetime objects")
+            begin1 = tmp.isoformat()
+            
+            
+        if isinstance(end, datetime):
+            # Check tz
+            if end.tzinfo is None:
+                raise Exception("Time Zone (tzinfo) is mandatory in datetime objects")
+            end1 = end.isoformat()
+        elif isinstance(end, str):
+            tmp = iso.parse_datetime(end)
+            if tmp.tzinfo is None:
+                raise Exception("Time Zone (tzinfo) is mandatory in datetime objects")
+            end1 = tmp.isoformat()
+            
+        # Executing request
+        res = req.get("%s/%s" % (self.host, self.service), params={
+            'service': 'SOS', 
+            'version': '1.0.0',
+            'request': 'GetObservation',
+            'offering': 'temporary',
+            'responseFormat': 'application/json',
+            'procedure': name,
+            'qualityIndex': qi,
+            'eventTime': "%s/%s" % (begin1,end1),
+            'observedProperty': ":"
+        }, auth=self.auth)
+        
+        json = res.json()
+        
+        return json['ObservationCollection']['member'][0]['result']['DataArray']['values']
+        
+    def getSharedProcedureListWith(self, service2):
+        
+        """
+        
+        Return a list of procedures equals in each istSOS service 
+        
+        """
+        
+        procedures1 = self.getSOSProceduresList()
+        procedures2 = service2.getSOSProceduresList()
+
+        procedures1 = [p.replace('urn:ogc:def:procedure:x-istsos:1.0:', '') for p in procedures1]
+        procedures2 = [p.replace('urn:ogc:def:procedure:x-istsos:1.0:', '') for p in procedures2]
+
+        procedures1.sort()
+        procedures2.sort()
+
+        procedures = [] # ListTable()
+
+        stop1 = len(procedures1)
+        stop2 = len(procedures2)
+        cnt1 = cnt2 = 0
+        stop = max(stop1,stop2)
+
+        for i in range(0,stop):
+
+            row = []
+            tmp1 = None
+            tmp2 = None
+            
+            if (cnt1)<stop1:
+                tmp1 = procedures1[cnt1]
+                
+            if (cnt2)<stop2:
+                tmp2 = procedures2[cnt2]
+            
+            if tmp1 == None:
+                row = [None,tmp2]
+                cnt1 += 1
+                
+            elif tmp2 == None:
+                row = [tmp1,None]
+                cnt2 += 1
+                
+            elif tmp1 == tmp2:
+                row = [tmp1,tmp2]
+                cnt1 += 1
+                cnt2 += 1
+                
+            elif tmp1 < tmp2:
+                row = [tmp1,None]
+
+                cnt1 += 1
+                
+            elif tmp1 > tmp2:
+                row = [None,tmp2]
+                cnt2 += 1
+                
+            procedures.append(row)
+            
+            print row
+            
+
+        procedures = list(set(procedures1) & set(procedures2))
+        procedures.sort()
+        return procedures
+
+class Procedure(dict):
+
+    """
+    Base class for istSOS WNS
+    """
+    def __init__(self, name=None):
+        """
+        Initialize Procedure object
+        """
+        self.name = name
+        self.outputs = []
+        self.observedProperty = {}
+        
+    def merge(self, data):
+        for key in data:
+            self[key] = data[key]
+        
+    def setName(self,name):
+        self.name = name
+    
+    def setDescription(self,description):
+        self.description = description
+        
+    def setKeywords(self,keywords):
+        self.keywords = keywords
+        
+    def setSystemType(self, systemType):
+        if systemType in ['virtual','insitu-fixed-point']:
+            self.systemType = systemType
+        else:
+            raise Exception("System type supported virtual, insitu-fixed-point only.")
+                
+    def setSensorType(self, sensorType):
+        self.sensorType = sensorType    
+    
+    def setFoi(self, name, epsg, x, y, z):
+        """ 
+        name: feature of interest name
+        epsg: coordinates system
+        xyz: array of coordinates 
+        """
+        self.foiname = name
+        self.epsg = epsg
+        self.xyz = [x,y,z]
+    
+    def addObservedProperty(self, name, definition, uom, description=""):
+        self.observedProperty[name] = [name, definition, uom, description]
+        
+        
+        
+        
+        
+        
diff --git a/scripts/istsosutils.pyc b/scripts/istsosutils.pyc
new file mode 100644
index 0000000..32d31e5
Binary files /dev/null and b/scripts/istsosutils.pyc differ
diff --git a/scripts/migrate.py b/scripts/migrate.py
new file mode 100644
index 0000000..4d4793f
--- /dev/null
+++ b/scripts/migrate.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------------
+# istSOS - Istituto Scienze della Terra
+# Copyright (C) 2014 Milan Antonovic, Massimiliano Cannata
+#---------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#---------------------------------------------------------------------------
+
+"""
+    Migrate from sos1 to sos2
+"""
+
+from datetime import timedelta
+import csv
+import sys
+from os import path
+import tempfile
+import shutil
+import traceback
+
+
+sys.path.insert(0, path.abspath("."))
+
+try:
+    from lib import requests
+    from lib import isodate
+    from scripts import istsosutils
+    from scripts import istsos2csv
+    from scripts import csv2istsos
+except ImportError as e:
+    print "\nError loading internal libs:\n >> did you run the script from the istSOS root folder?\n\n"
+    raise e
+    
+url1 = "http://geoservice.ist.supsi.ch"
+srv1 = "sos"
+url2 = "https://geoservice.ist.supsi.ch/isos"
+srv2 = "sos"
+    
+auth = ('ist','wms21supsi')
+sos1 = istsosutils.Service(url1, srv1, basicAuth=auth)
+sos2 = istsosutils.Service(url2, srv2, basicAuth=auth)
+
+# Get all procedures that the two service have in common
+#procedures = sos1.getSharedProcedureListWith(sos2)
+
+procedures = ["W_PON"]
+
+def yearsago(years, from_date=None):
+    if from_date is None:
+        from_date = datetime.now()
+    try:
+        return from_date.replace(year=from_date.year - years)
+    except:
+        # Must be 2/29!
+        assert from_date.month == 2 and from_date.day == 29 # can be removed
+        return from_date.replace(month=2, day=28,
+                                 year=from_date.year-years)
+
+for procedure in procedures:
+    
+    if procedure in ['Q_BOL_PTC', 'Q_CFER_ARO', 'Q_LAV_MEN', 'Q_MAG_VIS', 'Q_MOR_GIU', 'Q_RMUL_COM', 'Q_ROV_CVM2', 'Q_SBIB_PON', 'Q_TICTO_CHIR', 'Q_TRA_ARB_FFS1', 'Q_VED_ISO', 'Q_VVED_AGN', 'P_PON', 'Q_BON_QUA', 'Q_CUC_POR', 'Q_LAV_RSV', 'Q_MAR_MAR', "Q_MAR_MAR2", 'Q_MUZ_MUZ', 'Q_RMUL_MAR', 'Q_ROV_CVM3', 'Q_SCA_LUG', 'Q_TRA_ARB', 'Q_TRA_ARB_FFS2', 'Q_VED_MUZ', 'V_TEST', 'Q_AETCAN_AIR', 'Q_CAL_AIR', 'Q_GNO_GNO', 'Q_MAG_LOD', 'Q_MAR_MAR2', 'Q_RMUL_ARB', 'Q_ROV_CVM1', 'Q_SAL_MAG', 'Q_TIC_BE [...]
+        continue
+        
+    # Creating temporary directory where CSV files will be stored
+    dirpath = tempfile.mkdtemp()
+    
+    try:
+        
+        # Loading Begin end End posiion of the Procedure
+        #samp1 = sos1.getSOSProcedureSamplingtime(procedure)
+        #samp2 = sos2.getSOSProcedureSamplingtime(procedure)
+        
+        print "Gathering info for %s from source" % procedure
+        go1 = sos1.getSOSProcedure(procedure)
+        samp1 = sos1.extractSamplingFromGOJson(go1)
+        
+        if ' component' in go1['observedProperty']:
+            op = go1['observedProperty'][' component'][1]
+        else:
+            op = go1['observedProperty']['component'][1]
+        
+        print "Gathering info for %s from destination" % procedure
+        go2 = sos2.getSOSProcedure(procedure)
+        samp2 = sos2.extractSamplingFromGOJson(go2)
+        
+        """interval = timedelta(days=int(30))
+        begin = yearsago(1, samp1[1]) #samp1[0]
+        if begin < samp1[0]:
+            begin = samp1[0]"""
+        
+        begin = samp1[0]
+        end = samp1[1]
+        
+        # Comment this if you want a full migration
+        begin = isodate.parse_datetime('2015-04-29T07:30:00+00:00')
+        end   = isodate.parse_datetime('2015-04-29T08:10:00+00:00')
+        
+        istsos2csv.execute({
+            'begin': begin.isoformat(),
+            'end': end.isoformat(),
+            'procedure': procedure,
+            'op': op,
+            'url': '%s/%s' % (url1, srv1),
+            'd': dirpath,
+            'user': auth[0],
+            'password': auth[1],
+            'noqi': True
+        })
+        
+        csv2istsos.execute({
+            'u':  url2,
+            's': srv2,
+            'wd': dirpath,
+            'p': [procedure],
+            'v': True,
+            'user': auth[0],
+            'password': auth[1],
+            'noqi': True
+        })
+    
+    except Exception as e:
+        print "*****************************************************************"
+        print str(e)
+        traceback.print_exc()
+        print "*****************************************************************"
+        pass
+    
+    shutil.rmtree(dirpath)
+
+
+
diff --git a/scripts/migrate_errors.py b/scripts/migrate_errors.py
new file mode 100644
index 0000000..3a28ce3
--- /dev/null
+++ b/scripts/migrate_errors.py
@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------------
+# istSOS - Istituto Scienze della Terra
+# Copyright (C) 2014 Milan Antonovic, Massimiliano Cannata
+#---------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#---------------------------------------------------------------------------
+
+"""
+    Migrate from sos1 to sos2
+"""
+
+from datetime import timedelta
+import csv
+import sys
+from os import path
+import tempfile
+import shutil
+import traceback
+import glob
+import time
+
+sys.path.insert(0, path.abspath("."))
+
+try:
+    from lib import requests
+    from lib import isodate
+    from scripts import istsosutils
+    from scripts import istsos2csv
+    from scripts import csv2istsos
+except ImportError as e:
+    print "\nError loading internal libs:\n >> did you run the script from the istSOS root folder?\n\n"
+    raise e
+    
+url1 = "http://geoservice.ist.supsi.ch"
+srv1 = "sosraw"
+url2 = "https://geoservice.ist.supsi.ch/isos"
+srv2 = "sosraw"
+    
+sos1 = istsosutils.Service(url1, srv1)
+sos2 = istsosutils.Service(url2, srv2)
+
+# Get all procedures that the two service have in common
+#procedures = sos1.getSharedProcedureListWith(sos2)
+
+#procedures = ["WK_MUZ_MUZ"]
+
+def yearsago(years, from_date=None):
+    if from_date is None:
+        from_date = datetime.now()
+    try:
+        return from_date.replace(year=from_date.year - years)
+    except:
+        # Must be 2/29!
+        assert from_date.month == 2 and from_date.day == 29 # can be removed
+        return from_date.replace(month=2, day=28,
+                                 year=from_date.year-years)
+
+files = glob.glob(path.join('check', "*_errors.csv"))
+files.sort()
+
+for f in files:
+    
+    procedure = f.replace('check/','').replace('_errors.csv','')
+    
+    fileObj = open(f, 'rU')
+    
+    lines = fileObj.readlines()
+    
+    print "Gathering info for %s from source" % procedure
+    go1 = sos1.getSOSProcedure(procedure)
+    
+    if ' component' in go1['observedProperty']:
+        op = go1['observedProperty'][' component'][1]
+    else:
+        op = go1['observedProperty']['component'][1]
+    
+    '''print "Gathering info for %s from destination" % procedure
+    go2 = sos2.getSOSProcedure(procedure)'''
+    
+    for line in lines:
+    
+        if procedure in ['Q_BOL_PTC', 'Q_CFER_ARO', 'Q_LAV_MEN', 'Q_MAG_VIS', 'Q_MOR_GIU', 'Q_RMUL_COM', 'Q_ROV_CVM2', 'Q_SBIB_PON', 'Q_TICTO_CHIR', 'Q_TRA_ARB_FFS1', 'Q_VED_ISO', 'Q_VVED_AGN', 'P_PON', 'Q_BON_QUA', 'Q_CUC_POR', 'Q_LAV_RSV', 'Q_MAR_MAR', 'Q_MUZ_MUZ', 'Q_RMUL_MAR', 'Q_ROV_CVM3', 'Q_SCA_LUG', 'Q_TRA_ARB', 'Q_TRA_ARB_FFS2', 'Q_VED_MUZ', 'V_TEST', 'Q_AETCAN_AIR', 'Q_CAL_AIR', 'Q_GNO_GNO', 'Q_MAG_LOD', 'Q_MAR_MAR2', 'Q_RMUL_ARB', 'Q_ROV_CVM1', 'Q_SAL_MAG', 'Q_TIC_BED', 'Q_TRA [...]
+            continue
+        
+        begin = isodate.parse_datetime(line.replace("\"","").split(",")[0])
+        end   = isodate.parse_datetime(line.replace("\"","").split(",")[0])
+        
+        # Creating temporary directory where CSV files will be stored
+        dirpath = tempfile.mkdtemp()
+        
+        try:
+            
+            istsos2csv.execute({
+                'begin': begin.isoformat(),
+                'end': end.isoformat(),
+                'procedure': procedure,
+                'op': op,
+                'url': '%s/%s' % (url1, srv1),
+                'd': dirpath
+            })
+            
+            csv2istsos.execute({
+                'u':  url2,
+                's': srv2,
+                'wd': dirpath,
+                'p': [procedure],
+                'v': True
+            })
+        
+        except Exception as e:
+            print "*****************************************************************"
+            print str(e)
+            traceback.print_exc()
+            print "*****************************************************************"
+            pass
+    
+        shutil.rmtree(dirpath)
+        print "Sleeping.. yaaaawn"
+        #time.sleep(1)
+
+
+
diff --git a/scripts/net2csv.py b/scripts/net2csv.py
new file mode 100755
index 0000000..e955704
--- /dev/null
+++ b/scripts/net2csv.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+#---------------------------------------------------------------------------
+# istSOS - Istituto Scienze della Terra
+# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+#---------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#---------------------------------------------------------------------------
+"""
+description:
+    
+    Base class to be extended by specialized implementation to 
+    handle different raw source files.
+    
+"""
+
+import sys
+import os
+from os import path
+import glob
+from datetime import datetime
+from datetime import timedelta
+import decimal
+from inspect import stack
+import pprint
+import tempfile
+pp = pprint.PrettyPrinter(indent=4)
+
+try:
+    sys.path.insert(0, path.abspath("."))
+    from scripts import raw2csv
+    from lib.pytz import timezone
+    import lib.requests as requests
+    import lib.isodate as iso
+except ImportError as e:
+    print "\nError loading internal libs:\n >> please run the script from the istSOS root folder.\n\n"
+    raise e
+    
+    
+class NetConverter(raw2csv.Converter):
+
+    def __init__(self, name, url, service, url, folderOut=None, 
+                 exceptionBehaviour={}, 
+                 user=None, password=None, debug=False, 
+                 csvlength=5000, archivefolder = None):
+        
+        raw2csv.Converter.__init__(self, name, url, service, url, None, folderOut, 
+                 False, exceptionBehaviour={}, 
+                 user, password, debug, 
+                 csvlength,  None, archivefolder = None)
+        
+    
+    def execute(self):
+        
+        self.observations = []
+        self.observationsCheck = {}
+        self.endPosition = None
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scripts/raw2csv.py b/scripts/raw2csv.py
old mode 100755
new mode 100644
index d9ddf2a..031b451
--- a/scripts/raw2csv.py
+++ b/scripts/raw2csv.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 description:
     
@@ -43,6 +47,7 @@ try:
     import lib.isodate as iso
 except ImportError as e:
     print "\nError loading internal libs:\n >> please run the script from the istSOS root folder.\n\n"
+    print str(e)
     raise e
     
 class Converter():
@@ -76,14 +81,15 @@ class Converter():
         """
         
         self.req = requests.session()
-        self.req.config['keep_alive'] = False
     
         self.name = name
         self.url = url
         self.service = service
         self.folderIn = folderIn
         self.pattern = pattern
+        
         self.folderOut = folderOut if folderOut is not None else tempfile.mkdtemp()
+        
         self.qualityIndex = qualityIndex
         self.user = user
         self.password = password
@@ -91,8 +97,13 @@ class Converter():
 
         self.debugfile = False
         if debug == 'file':
-            self.debug = True
-            self.debugfile = open(os.path.join(self.folderOut, "log.txt"), "w")
+            self.debug = False
+            try:
+                self.debugfile = open(os.path.join(self.folderOut, "log.txt"), "w")
+            except Exception as e:
+              self.log(str(e))
+              self.debug = True
+              self.debugfile = False
         else:
             self.debug = debug
         
@@ -103,7 +114,7 @@ class Converter():
         self.fntd = self.fnre = self.fndf = None
         if type(filenamecheck) == type({}):
             if 'dateformat' in filenamecheck:
-                self.fndf = filenamecheck['dateformat'] 
+                self.fndf = filenamecheck['dateformat']
             if 'datetz' in filenamecheck:
                 self.fndtz = filenamecheck['datetz'] 
             if 'replace' in filenamecheck:
@@ -143,14 +154,24 @@ class Converter():
         if self.debugfile:
             self.debugfile.flush()
             self.debugfile.close()
+            self.debug = True
+            self.debugfile = False
+            self.log("  > Debug file closed..")
         if self.archivefolder:
             self.archive() 
+        # Deleting temporary working directory
+        for root, dirs, files in os.walk(self.folderOut, topdown=False):
+            for name in files:
+                os.remove(os.path.join(root, name))
+            for name in dirs:
+                os.rmdir(os.path.join(root, name))
+        os.rmdir(self.folderOut)
     
     def log(self, message):
         if self.debug:
             print message 
-            if self.debugfile:
-                self.debugfile.write("%s\n" % message)
+        if self.debugfile:
+            self.debugfile.write("%s\n" % message)
                 
     
     def addMessage(self, message):
@@ -237,7 +258,7 @@ class Converter():
             'dsrv': ssrv,
             'function': function if function is not None else None,
             'resolution': resolution if resolution is not None else None,
-            'nodataValue': nodataValue if nodataValue is not None else None,
+            'nodataValue': nodataValue if nodataValue is not None else None, 
             'nodataQI': nodataQI if nodataQI is not None else None
         },self)
     
@@ -280,7 +301,12 @@ class Converter():
                 "file": fileObj
             }
             dat = open(fileObj,'rU')
-            self.parse(dat,os.path.split(fileObj)[1])
+            try:
+                self.parse(dat,os.path.split(fileObj)[1])
+            except Exception as e:
+                self.log(" !! Error while parsing file: %s" % os.path.split(fileObj)[1])
+                dat.close()
+                raise e
             dat.close()
         
         self.log(" > Parsed %s observations" % len(self.observations))
@@ -312,13 +338,13 @@ class Converter():
                 self.service,
                 self.name
             ), 
-            prefetch=True, 
             auth=self.auth, 
             verify=False
         )
-        if res.json['success']==False:
-            raise IstSOSError ("Description of procedure %s can not be loaded: %s" % (self.name, res.json['message']))
-        self.describe = res.json['data']
+        json = res.json()
+        if json['success']==False:
+            raise IstSOSError ("Description of procedure %s can not be loaded: %s" % (self.name, json['message']))
+        self.describe = json['data']
         
         self.obsindex = []
         for out in self.describe['outputs']:
@@ -428,6 +454,7 @@ class Converter():
             if self.getIOEndPosition() == None:
                 f = open(os.path.join(self.folderOut,"%s_%s.dat" %(
                     self.name,
+
                     datetime.strftime(self.observations[-1].getEventime().astimezone(timezone('UTC')), "%Y%m%d%H%M%S%f"))), 'w')
             else:
                 if self.getIOEndPosition() < self.observations[-1].getEventime():
@@ -444,10 +471,11 @@ class Converter():
             # there is a "no data" observation (rain)
             if self.getIOEndPosition() == None:
                 raise IstSOSError("The file has no observations, if this happens, you shall use the setEndPosition function to set the endPosition manually")
-            f = open(os.path.join(self.folderOut,"%s_%s.dat" %(
+            f = open(os.path.join(self.folderOut,"%s_%s.dat" % (
                 self.name,
                 datetime.strftime(self.getIOEndPosition().astimezone(timezone('UTC')), "%Y%m%d%H%M%S%f"))), 'w')
             f.write("%s\n" % ",".join(self.obsindex))
+        f.flush()
         f.close()
         
 class InitializationError(Exception):
diff --git a/scripts/raw2csv.pyc b/scripts/raw2csv.pyc
new file mode 100644
index 0000000..bee730a
Binary files /dev/null and b/scripts/raw2csv.pyc differ
diff --git a/scripts/registercsv.py b/scripts/registercsv.py
new file mode 100644
index 0000000..428de6e
--- /dev/null
+++ b/scripts/registercsv.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+'''
+This script register new procedures importing data from a csv file in this format:
+
+nome procedura;Descrizione;Keywords;SystemType;SensorType;foi name;epsg;x;y;z;name,definition,uom at name,definition,uom at name,definition,uom
+nome procedura;Descrizione;Keywords;SystemType;SensorType;foi name;epsg;x;y;z;name,definition,uom at name,definition,uom at name,definition,uom
+nome procedura;Descrizione;Keywords;SystemType;SensorType;foi name;epsg;x;y;z;name,definition,uom at name,definition,uom at name,definition,uom
+nome procedura;Descrizione;Keywords;SystemType;SensorType;foi name;epsg;x;y;z;name,definition,uom at name,definition,uom at name,definition,uom
+nome procedura;Descrizione;Keywords;SystemType;SensorType;foi name;epsg;x;y;z;name,definition,uom at name,definition,uom at name,definition,uom
+nome procedura;Descrizione;Keywords;SystemType;SensorType;foi name;epsg;x;y;z;name,definition,uom at name,definition,uom at name,definition,uom
+
+
+'''
+
+import sys
+import os
+from os import path
+import traceback
+import json
+import pprint
+import glob
+from datetime import datetime
+
+#print path.abspath(".")
+#print path.normpath("%s/../" % path.abspath("."))
+    
+sys.path.insert(0, path.abspath("."))
+try:
+    import lib.argparse as argparse
+    from scripts import istsosutils as iu
+
+except ImportError as e:
+    print "\nError loading internal libs:\n >> did you run the script from the istSOS root folder?\n\n"
+    raise e
+
+
+
+def execute (args, logger=None):
+
+    try:
+        # Service instance name
+        csv = args['csv']
+        
+        # Initializing URLs
+        service = iu.Service(args['u'],args['s'])
+        
+        file = open(csv, 'rU')
+                    
+        # loop lines
+        lines = file.readlines()
+        
+        # loop lines (skipping header)
+        for i in range(0, len(lines)):
+            line = lines[i].strip(' \t\n\r').split(";")
+            
+            proc = iu.Procedure(line[0])
+            proc.setDescription(line[1])
+            proc.setKeywords(line[2])
+            proc.setSystemType(line[3])
+            proc.setSensorType(line[4])
+            proc.setFoi(line[5],line[6],line[7],line[8],line[9])
+            
+            for op in line[10].split("@"):
+                op = op.split(",")
+                proc.addObservedProperty(op[0], op[1], op[2])
+                        
+            print line
+            
+            service.registerProcedure(proc)
+            
+            
+    except Exception as e:    
+        print "ERROR: %s\n\n" % e
+        traceback.print_exc()
+        
+        
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(
+        description='Registers new sensor from a csv file.')
+        
+    parser.add_argument('-csv', 
+        action='store',
+        required=True,
+        dest='csv',
+        metavar='csv file',
+        help='The csv file containing the procedures metadata')
+    
+    parser.add_argument('-u',
+        action = 'store',
+        dest   = 'u',
+        metavar= 'url',
+        default= 'http://localhost:80/istsos',
+        help   = 'IstSOS Server address IP (or domain name) used for all request. (default: %(default)s).')
+    
+    parser.add_argument('-s',
+        action = 'store',
+        required=True,
+        dest   = 's',
+        metavar= 'service',
+        help   = 'The name of the service instance.')
+
+    args = parser.parse_args()
+    #print args.__dict__
+    execute(args.__dict__)
+    
diff --git a/scripts/sos2istsos.py b/scripts/sos2istsos.py
old mode 100755
new mode 100644
index d75cff4..f2ffa37
--- a/scripts/sos2istsos.py
+++ b/scripts/sos2istsos.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 '''
 This script get minimal metadata from an existing SOS and populate an istsos instance
 '''
@@ -144,11 +149,11 @@ class Procedure():
                 )
             )
             try:
-                self.template = res.json['data'][0]
+                self.template = res.json()['data'][0]
             except Exception as e:
                 print res.text
                 raise e
-        return self.template #res.json['data'][0]
+        return self.template #res.json()['data'][0]
 
     
 def parse_and_get_ns(xml):
@@ -165,10 +170,12 @@ def parse_and_get_ns(xml):
                 root = elem 
     return et.ElementTree(root), ns
    
-def execute (args):  
+def execute (args):
     pp = pprint.PrettyPrinter(indent=2)
     try:
     
+        istsos_version = args['istsos'] if 'istsos' in args else None
+        
         debug = args['v']
         test = args['t']
         
@@ -208,13 +215,13 @@ def execute (args):
             'version': '1.0.0',
             'request': 'GetCapabilities',
             'section': 'contents'
-        }, prefetch=True, verify=False)
+        }, verify=False)
         
         # Parsing response
         gc, gcNs = parse_and_get_ns(StringIO(res.content))
         
         # Extract all offerings
-        elOfferings = gc.findall("{%s}Contents/{%s}ObservationOfferingList/{%s}ObservationOffering" % (gcNs['sos'],gcNs['sos'],gcNs['sos']) )
+        elOfferings = gc.findall("{%s}Contents/{%s}ObservationOfferingList/{%s}ObservationOffering" % (gcNs['sos'],gcNs['sos'],gcNs['sos']))
         
         for offering in elOfferings:
             offeringName = offering.find("{%s}name" % (gcNs['gml']) ).text.split(":")[-1]
@@ -243,7 +250,7 @@ def execute (args):
                     'request': 'DescribeSensor',
                     'outputFormat': 'text/xml;subtype=\'sensorML/1.0.0\'',
                     'procedure': pname
-                }, prefetch=True, verify=False)
+                }, verify=False)
                 
                 ds, dsNs = parse_and_get_ns(StringIO(res.content))
                 
@@ -255,16 +262,42 @@ def execute (args):
                     print "Error on DS for %s" % pname
                     continue
                     
-                elDescribe = ds.findall("member/{%s}System/{%s}outputs/{%s}OutputList/{%s}output" % (dsNs['sml'],dsNs['sml'],dsNs['sml'],dsNs['sml']) )
+                
                 
                 #print "Outputs found: %s" % len(elDescribe)
                 
                 observedProperties = []
-                for ds in elDescribe:
-                    definition = ds.find("{%s}ObservableProperty" % (dsNs['swe'])).get('definition').replace('urn:ogc:def:parameter:x-ist::','')
-                    #print definition
-                    if definition.find('time:iso8601')<0:
-                        observedProperties.append(definition)
+                print "istsos_version: ", istsos_version
+                uniqidurn = 'urn:ogc:def:parameter:x-ist::'
+                if istsos_version != None and istsos_version == '2':
+                    uniqidurn = 'urn:ogc:def:parameter:x-ist:1.0:'
+                    elFields = ds.findall("{%s}member/{%s}System/{%s}outputs/{%s}OutputList/{%s}output/{%s}DataRecord/{%s}field" % (
+                                    dsNs['sml'],dsNs['sml'],dsNs['sml'],dsNs['sml'],dsNs['sml'],dsNs['swe'],dsNs['swe']) )
+                    print "Observed properties (v2): %s " % len(elFields)
+                    for fs in elFields:
+                        print fs.get('name')
+                        if fs.get('name') != 'Time':
+                            observedProperties.append(fs.find("{%s}Quantity" % (dsNs['swe'])).get('definition').replace(uniqidurn,''))
+                        
+                else:
+                    elDescribe = ds.findall("member/{%s}System/{%s}outputs/{%s}OutputList/{%s}output" % (dsNs['sml'],dsNs['sml'],dsNs['sml'],dsNs['sml']) )
+                    print "Observed properties: %s " % len(elDescribe)
+                    for ds in elDescribe:
+                        definition = ds.find("{%s}ObservableProperty" % (dsNs['swe'])).get('definition').replace(uniqidurn,'')
+                        #print definition
+                        if definition.find('time:iso8601')<0:
+                            observedProperties.append(definition)
+                            
+                
+                print {
+                    'service': 'SOS', 
+                    'version': '1.0.0',
+                    'request': 'GetObservation',
+                    'offering': offeringName,
+                    'responseFormat': 'text/xml;subtype=\'sensorML/1.0.0\'',
+                    'procedure': pname,
+                    'observedProperty': ",".join(observedProperties)
+                }
                 
                 res = req.get("%s" % (src), params={
                     'service': 'SOS', 
@@ -274,7 +307,7 @@ def execute (args):
                     'responseFormat': 'text/xml;subtype=\'sensorML/1.0.0\'',
                     'procedure': pname,
                     'observedProperty': ",".join(observedProperties)
-                }, prefetch=True, verify=False)
+                }, verify=False)
                               
                 go, goNs = parse_and_get_ns(StringIO(res.content))
                 
@@ -308,14 +341,23 @@ def execute (args):
                 point = foi.find("{%s}Point" % (
                     goNs['gml'])
                 )
+                
+                if point == None:
+                    point = foi.find("{%s}FeatureCollection/{%s}location/{%s}Point" % (
+                        goNs['gml'],goNs['gml'],goNs['gml'])
+                    )
+                
                 coord = point.find("{%s}coordinates" % (
                     goNs['gml'])
-                )
+                ).text.split(",")
+                
+                if len(coord) == 2:
+                    coord.append('0')
                 
                 procedures[pname].setFoi(
                     foi.get('{%s}href' % gcNs['xlink']).split(":")[-1],
                     point.get('srsName'),
-                    coord.text.split(",")
+                    coord
                 )
                 
                 # Extracting UOM
@@ -333,7 +375,7 @@ def execute (args):
                         )                        
                         procedures[pname].addObservedProperty(
                             field.get('name'),
-                            qty.get('definition').replace('urn:ogc:def:parameter:x-ist::',''), 
+                            qty.get('definition').replace(uniqidurn,''), 
                             uom.get('code')
                         )
                 
@@ -354,15 +396,15 @@ def execute (args):
                 # ~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~
                 
                 # Check if procedure already exist
-                res = req.get("%s/wa/istsos/services/%s/procedures/%s" % (dst,srv,pname))  
-                if not res.json["success"]:
+                res = req.get("%s/wa/istsos/services/%s/procedures/%s" % (dst,srv,pname), verify=False)  
+                if not res.json()["success"]:
                     # Registering procedure to istSOS   
                     res = req.post("%s/wa/istsos/services/%s/procedures" % (dst,srv), 
                             data=json.dumps(procedures[pname].data)
                     ) 
-                    if not res.json["success"]:
-                        print json.dumps(procedures[pname].data)
-                        raise Exception("Registering procedure %s failed: \n%s" % (pname, res.json["message"]))
+                    if not res.json()["success"]:
+                        #print json.dumps(procedures[pname].data)
+                        raise Exception("Registering procedure %s failed: \n%s" % (pname, res.json()["message"]))
                     
                     # Getting details (describe sensor) to get the assignedSensorId
                     res = req.get("%s/wa/istsos/services/%s/procedures/%s" % (dst,srv,pname))  
@@ -381,7 +423,7 @@ def execute (args):
                         print res.text
                         raise exproc
                 
-                procedures[pname].oid = res.json["data"]["assignedSensorId"]
+                procedures[pname].oid = res.json()["data"]["assignedSensorId"]
                 days = int(args['i'])
                 interval = timedelta(days=int(days))
                 
@@ -421,7 +463,10 @@ def execute (args):
                             
                             t = float(calendar.timegm(end.utctimetuple())-calendar.timegm(_begin.utctimetuple()))
                             t1 = float(calendar.timegm(nextPosition.utctimetuple())-calendar.timegm(_begin.utctimetuple()))
-                            percentage = round((t1/t)*100,2)
+                            try:
+                                percentage = round((t1/t)*100,2)
+                            except:
+                                percentage = 0
                             if percentage > 100:
                                 percentage = 100
                             lastPrint = "%s > %s%% (%s / %s %s days)" % ("\b"*len(lastPrint),percentage, begin.strftime(fmtshort), nextPosition.strftime(fmtshort), days)
@@ -442,9 +487,9 @@ def execute (args):
                                 'observedProperty': ",".join(observedProperties)
                             }
                             try:
-                                res = req.get("%s" % (src), params=params, prefetch=True, verify=False)
+                                res = req.get("%s" % (src), params=params, verify=False)
                             except Exception:
-                                res = req.get("%s" % (src), params=params, prefetch=True, verify=False)
+                                res = req.get("%s" % (src), params=params, verify=False)
                             
                             gotime = timedelta(seconds=int(time.time() - looptime))
                             
@@ -461,9 +506,7 @@ def execute (args):
                             lastPrint = "%s - GO: '%s'" % (lastPrint, gotime)
                             
                             go, goNs = parse_and_get_ns(StringIO(res.content))
-                            
-                            #print res.text
-                            
+                                                        
                             if len(oOrder)==0:
                                 fields = go.findall("{%s}member/{%s}Observation/{%s}result/{%s}DataArray/{%s}elementType/{%s}DataRecord/{%s}field" % (
                                     goNs['om'], goNs['om'], goNs['om'], goNs['swe'], goNs['swe'], goNs['swe'], goNs['swe'])
@@ -489,9 +532,13 @@ def execute (args):
                                 # InsertObservation to istSOS
                                 template['result']['DataArray']['values'] = copy
                                 template['samplingTime'] = {
-                                    "beginPosition": begin.strftime(fmt),
+                                    "beginPosition": copy[0][0],
                                     "endPosition": nextPosition.strftime(fmt)
                                 }
+                                '''template['samplingTime'] = {
+                                    "beginPosition": begin.strftime(fmt),
+                                    "endPosition": nextPosition.strftime(fmt)
+                                }'''
                                 
                                 template[u"AssignedSensorId"] = procedures[pname].oid
                                 
@@ -528,7 +575,7 @@ def execute (args):
                         
                         
                         print " > Completed in %s" % timedelta(seconds=int(time.time() - startTime))
-            
+            break
     except Exception as e:    
         print "ERROR: %s\n\n" % e
         traceback.print_exc()
@@ -538,6 +585,12 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description='Import data from an external SOS to an istSOS instance.')
     
+    parser.add_argument('--istsos',
+        action = 'store',
+        dest   = 'istsos',
+        metavar= 'istsos',
+        help   = 'Set source istSOS version (accepted versions only 2)')
+        
     parser.add_argument('-p', 
         action='store',
         dest='p',
@@ -583,7 +636,7 @@ if __name__ == "__main__":
     parser.add_argument('-a',
         action = 'store_true',
         dest   = 'a',
-        help   = 'Add this parameter, if you want to replace all the dataset instead of appending after existing observations.')
+        help   = 'Add this parameter, if you want to append after existing observations instead of replacing all the dataset.')
     
     parser.add_argument('--from', 
         action='store',
diff --git a/scripts/sos_virtualHQ_importer.py b/scripts/sos_virtualHQ_importer.py
old mode 100755
new mode 100644
index bd47443..bce9ade
--- a/scripts/sos_virtualHQ_importer.py
+++ b/scripts/sos_virtualHQ_importer.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 '''
 This script get creates an HQ virtual procedure from an existing virtual procedure and curve rating file
 
diff --git a/services/default.cfg b/services/default.cfg
index 5f68ed7..e5440da 100755
--- a/services/default.cfg
+++ b/services/default.cfg
@@ -1,7 +1,7 @@
 [serviceType]
 version = 1.0.0
-codespace = http://opengeospatial.net
 value = OGC:SOS
+codespace = http://opengeospatial.net
 
 [getobservation]
 correct_qi = 110
@@ -9,7 +9,7 @@ stat_qi = 200
 aggregate_nodata_qi = -100
 default_qi = 100
 aggregate_nodata = -999.9
-maxGoPeriod = 200
+maxGoPeriod = 0
 transactional_log = False
 
 [serviceurl]
@@ -19,27 +19,27 @@ url = http://localhost/istsos
 GO_resultModel = om:Observation
 DS_outputFormats = text/xml;subtype="sensorML/1.0.1"
 GC_Section = serviceidentification,serviceprovider,operationsmetadata,contents,all
-GO_responseFormat = text/xml;subtype='sensorML/1.0.0',application/json,text/plain,text/xml,text/x-json
+GO_responseFormat = text/xml;subtype="om/1.0.0",application/json,text/plain,text/xml,text/x-json
 version = 1.0.0
 GO_timeFormats = ISO 8601 (e.g.: 1997-12-17T07:37:16-08),xsi:type='TimeInstantType',xsi:type='TimePeriodType'
 requests = getcapabilities,describesensor,getobservation,getfeatureofinterest,insertobservation,registersensor
 GO_responseMode = inline
 
 [urn]
-identifier = urn:ogc:def:identifier:x-istsos:1.0:
+property = urn:ogc:def:property:x-istsos:1.0:
 offering = urn:ogc:def:offering:x-istsos:1.0:
-parameter = urn:ogc:def:parameter:x-istsos:1.0:
+sensor = urn:ogc:def:sensor:x-istsos:1.0:
 phenomena = urn:ogc:def:phenomenon:x-istsos:1.0:
 feature = urn:ogc:def:feature:x-istsos:1.0:
 sensorType = urn:ogc:def:sensorType:x-istsos:1.0:
 process = urn:ogc:def:process:x-istsos:1.0:
 role = urn:role:x-istsos:1.0:
 refsystem = urn:ogc:crs:EPSG:
-keywords = urn:ogc:def:keywords:x-istsos:1.0:
-time = urn:ogc:def:parameter:x-istsos:1.0:time:iso8601
 dataType = urn:ogc:def:dataType:x-istsos:1.0:
-property = urn:ogc:def:property:x-istsos:1.0:
-sensor = urn:ogc:def:sensor:x-istsos:1.0:
+time = urn:ogc:def:parameter:x-istsos:1.0:time:iso8601
+keywords = urn:ogc:def:keywords:x-istsos:1.0:
+identifier = urn:ogc:def:identifier:x-istsos:1.0:
+parameter = urn:ogc:def:parameter:x-istsos:1.0:
 procedure = urn:ogc:def:procedure:x-istsos:1.0:
 
 [connection]
@@ -70,15 +70,15 @@ x = x-position,east,easting,lon,longitude,x
 
 [provider]
 contactCountry = Switzerland
-providerName = Istitute of Earth Science - SUPSI
-contactAdminArea = Canton Ticino
-contactVoice = +41586666200 
+providerName = Istitute Of Earth Science - SUPSI
+contactCity = Canobbio
+contactVoice = +41586666200
 contactEmail = geoservice at supsi.ch
 contactDeliveryPoint = Campus Trevano
 contactName = Team Geomatica
 contactPostalCode = 6952
 contactFax = +41586666209
-contactCity = Lugano - Canobbio
+contactAdminArea = Canton Ticino
 providerSite = http://www.supsi.ch/ist
 contactPosition = Data manager
 
@@ -92,3 +92,19 @@ istsosepsg = 4326
 [initialization]
 level = 42
 
+[connectionWns]
+dbname = istsos
+host = 127.0.0.1
+user = postgres
+password = postgres
+port = 5433
+
+[mail]
+usermail = ""
+password = ""
+
+[twitter]
+oauth_token = ""
+oauth_secret = ""
+consumer_key = ""
+consumer_secret = ""
diff --git a/test/__init__.py b/test/__init__.py
deleted file mode 100755
index 6cd6606..0000000
--- a/test/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-__all__ = [ "istsoslib","admin","walib","delete", "get", "post", "put","script"]
diff --git a/test/_test.py b/test/_test.py
deleted file mode 100755
index 0302e99..0000000
--- a/test/_test.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class Test():
-
-    def __init__(self, path=None, url='http://localhost/istsos/'):
-        pass
diff --git a/test/admin/__init__.py b/test/admin/__init__.py
deleted file mode 100755
index a9a2c5b..0000000
--- a/test/admin/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = []
diff --git a/test/delete.py b/test/delete.py
deleted file mode 100755
index b44a4fd..0000000
--- a/test/delete.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import lib.requests as requests
-
-def DELETE(fname, address):
-    
-    #print fname + ', DELETE'
-    
-    res = requests.delete(
-        address,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    return res.json
-    
-def services_name_uoms_name_DELETE(sname, uname):
-    
-    fname = '/istsos/services/{name}/uoms/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/uoms/' + uname
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_DELETE(sname):
-    
-    fname = '/istsos/services/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_procedures_name_DELETE(sname, pname):
-    
-    fname = '/istsos/services/{name}/procedures/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures/' + pname
-    
-    result = DELETE(fname, address)
-    return result
-    
-def operations_log_DELETE():
-
-    fname = '/istsos/operations/log'
-    address = 'http://localhost/istsos/wa/istsos/operations/log'
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_offerings_name_DELETE(sname, oname):
-    
-    fname = '/istsos/services/{name}/offerings/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_offerings_name_procedures_name_DELETE(sname, oname, pname):
-    
-    fname = '/istsos/services/{name}/offerings/{name}/procedures/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname + '/procedures/' + pname
-    
-    result = DELETE(fname, address)
-    return result    
-    
-def services_name_observedproperties_name_DELETE(sname, oname):
-    
-    fname = '/istsos/services/{name}/observedproperties/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/observedproperties/' + oname
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_dataqualities_code_DELETE(sname, qualcode):
-    
-    fname = '/istsos/services/{name}/dataqualities/{code}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/dataqualities/' + qualcode
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_configsections_DELETE(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections'
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_configsections_getobservation_DELETE(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/getobservation'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/getobservation'
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_configsections_identification_DELETE(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/identification'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/identification'
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_configsections_geo_DELETE(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/geo'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/geo'
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_configsections_serviceurl_DELETE(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/serviceurl'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/serviceurl'
-    
-    result = DELETE(fname, address)
-    return result
-    
-def services_name_configsections_provider_DELETE(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/provider'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/provider'
-    
-    result = DELETE(fname, address)
-    return result
\ No newline at end of file
diff --git a/test/get.py b/test/get.py
deleted file mode 100755
index 04ff6d1..0000000
--- a/test/get.py
+++ /dev/null
@@ -1,275 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import lib.requests as requests
-
-def GET(fname, address):
-    
-    #print fname + ', GET'
-    
-    res = requests.get(
-        address,
-        prefetch=True
-    )
-            
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-    
-    return res.json
-    
-def services_name_uoms_GET(sname):
-    
-    fname = '/istsos/services/{name}/uoms'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/uoms'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_uoms_name_GET(sname, uname):
-    
-    fname = '/istsos/services/{name}/uoms/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/uoms/' + uname
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_systemtypes_GET(sname):
-    
-    fname = '/istsos/services/{name}/systemtypes'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/systemtypes'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_GET():
-    
-    fname = '/istsos/services'
-    address = 'http://localhost/istsos/wa/istsos/services'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_GET(sname):
-    
-    fname = '/istsos/services/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_procedures_name_GET(sname, pname):
-    
-    fname = '/istsos/services/{name}/procedures/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures/' + pname
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_procedures_operations_getlist_GET(sname):
-    
-    fname = '/istsos/services/{name}/procedures/operations/getlist'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures/operations/getlist'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_procedures_name_ratingcurve_GET(sname, pname):
-    
-    fname = '/istsos/services/{name}/procedures/{name}/ratingcurve'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures/' + pname + '/ratingcurve'
-    
-    result = GET(fname, address)
-    return result    
-    
-def operations_status_GET():
-    
-    fname = '/istsos/operations/status'
-    address = 'http://localhost/istsos/wa/istsos/operations/status'
-     
-    result = GET(fname, address)
-    return result
-    
-def operations_log_GET():
-    
-    fname = '/istsos/operations/log'
-    address = 'http://localhost/istsos/wa/istsos/operations/log'
-    
-    result = GET(fname, address)
-    return result
-    
-def operations_about_GET():
-    
-    fname = '/istsos/operations/aboutg'
-    address = 'http://localhost/istsos/wa/istsos/operations/about'
-    
-    result = GET(fname, address)
-    return result
-    
-def operations_initialization_GET():
-    
-    fname = '/istsos/operations/initialization'
-    address = 'http://localhost/istsos/wa/istsos/operations/initialization'
-    
-    result = GET(fname, address)
-    return result
-    
-def operations_getobservation_offerings_name_procedures_GET(sname, oname, pname, oprop, start, end):
-    
-    fname = '/istsos/services/{name}/operations/getobservation/offerings/{name}/procedures/{name}/observedproperties/{name}/eventtime/{begin}/{end}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/operations/getobservation/offerings/' + oname + '/procedures/' + pname + '/observedproperties/' + oprop + '/eventtime/' + start + '/' + end
-        
-    result = GET(fname, address)
-    return result
-    
-def services_name_offerings_GET(sname):
-    
-    fname = '/istsos/services/{name}/offerings'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_offerings_name_GET(sname, oname):
-    
-    fname = '/istsos/services/{name}/offerings/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_offerings_name_procedures_GET(sname, oname):
-    
-    fname = '/istsos/services/{name}/offerings/{name}/procedures'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname + '/procedures'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_offerings_name_procedures_operations_memberlist_GET(sname, oname):
-    
-    fname = '/istsos/services/{name}/offerings/{name}/procedures/operations/memberslist'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname + '/procedures/operations/memberslist'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_offerings_name_procedures_operations_nonmemberlist_GET(sname, oname):
-    
-    fname = '/istsos/services/{name}/offerings/{name}/procedures/operations/nonmemberslist'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname + '/procedures/operations/nonmemberslist'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_offerings_operations_getlist_GET(sname):
-    
-    fname = '/istsos/services/{name}/offerings/operations/getlist'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/operations/getlist'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_observedproperties_GET(sname):
-    
-    fname = '/istsos/services/{name}/observedproperties'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/observedproperties'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_observedproperties_name_GET(sname, oname):
-    
-    fname = '/istsos/services/{name}/observedproperties/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/observedproperties/' + oname
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_epsgs_GET(sname):
-    
-    fname = '/istsos/services/{name}/epsgs'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/epsgs'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_dataqualities_GET(sname):
-    
-    fname = '/istsos/services/{name}/dataqualities'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/dataqualities'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_dataqualities_code_GET(sname, qualcode):
-    
-    fname = '/istsos/services/{name}/dataqualities/{code}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/dataqualities/' + qualcode
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_getobservation_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/getobservation'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/getobservation'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_identification_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/identification'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/identification'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_geo_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/geo'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/geo'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_connection_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/connection'    
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/connection'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_connection_operations_validatedb_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/connection/operations/validatedb'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/connection/operations/validatedb'
-
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_serviceurl_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/serviceurl'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/serviceurl'
-    
-    result = GET(fname, address)
-    return result
-    
-def services_name_configsections_provider_GET(sname):
-    
-    fname = '/istsos/services/{name/default}/configsections/provider'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/provider'
-    
-    result = GET(fname, address)
-    return result
\ No newline at end of file
diff --git a/test/istsoslib/__init__.py b/test/istsoslib/__init__.py
deleted file mode 100755
index 56d0a37..0000000
--- a/test/istsoslib/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-__all__ = [ "sosRequests" ]
\ No newline at end of file
diff --git a/test/istsoslib/sosRequests.py b/test/istsoslib/sosRequests.py
deleted file mode 100755
index 57db71d..0000000
--- a/test/istsoslib/sosRequests.py
+++ /dev/null
@@ -1,1037 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import lib.requests as requests
-import time
-
-def getCapabilities(doc):
-    
-    doc.write('\n\n-----------------getCapabilities----------------------------\n')
-    
-    service = 'test'
-    
-    success_get = False
-    success_post = False
-    combo = False
-    
-    get = 'http://localhost/istsos/' + service + '?request=getCapabilities&sections=serviceidentification,serviceprovider,operationsmetadata,contents&service=SOS&version=1.0.0'
-    
-    post = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:GetCapabilities
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-        xmlns:sos="http://www.opengis.net/sos/1.0"
-        xmlns:gml="http://www.opengis.net/gml/3.2"
-        xmlns:ogc="http://www.opengis.net/ogc"
-        xmlns:om="http://www.opengis.net/om/1.0"
-        version="1.0.0" service="SOS">'
-            <section>serviceidentification</section>
-            <section>serviceprovider</section>
-            <section>operationsmetadata</section>
-            <section>contents</section>
-    </sos:GetCapabilities>'''
-    
-    header = {'Content-Type': 'application/xml'}    
-    
-    get1 = requests.get(get, prefetch=True)
-    time.sleep(1)
-    get2 = requests.get(get, prefetch=True)
-    
-    res1 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    time.sleep(1)
-    res2 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    
-    if get1.text == get2.text:
-        doc.write('GET retrieved the same information')
-        success_get = True
-    else:
-        doc.write('GET didn\'t retrieve the correct information')
-        doc.write('\n---------------------GET didn\'t retrieve the correct information--------------------\n')
-        doc.write(get2.text)
-    
-    if res1.text == res2.text:
-        doc.write('POST retrieved the same information')
-        success_post = True
-    else:
-        doc.write('POST didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST didn\'t retrieve the correct information--------------------\n')
-        doc.write(res2.text)
-        
-    if get2.text == res2.text:
-        doc.write('POST and GET retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST and GET didn\'t retrieve the correct information')
-        doc.write('\nPOST and GET didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------POST--------------------\n\n')
-        doc.write(res2.text)
-
-    result = {
-        'getCapabilities_GET' : success_get,
-        'getCapabilities_POST' : success_post,
-        'getCapabilities_BOTH' : combo
-        }
-        
-    return result
-
-
-
-   
-def describeSensor(doc):
-    
-    doc.write('\n\n-----------------describeSensor-----------------------------\n')
-    
-    service = 'test'
-    procedure = 'test'
-    
-    success_get = False
-    success_post = False
-    combo = False
-    
-    get = 'http://localhost/istsos/' + service + '?request=describeSensor&procedure=' + procedure + '&outputFormat=text/xml%3Bsubtype%3D\'sensorML/1.0.0\'&service=SOS&version=1.0.0'
-    
-    post = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:describeSensor
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-        xmlns:sos="http://www.opengis.net/sos/1.0"
-        xmlns:gml="http://www.opengis.net/gml/3.2"
-        xmlns:ogc="http://www.opengis.net/ogc"
-        xmlns:om="http://www.opengis.net/om/1.0"
-        service="SOS"
-        outputFormat="text/xml;subtype=\'sensorML/1.0.0\'">
-            <procedure>test</procedure>
-    </sos:describeSensor>'''
-    
-    header = {'Content-Type': 'application/xml'}        
-    
-    get1 = requests.get(get, prefetch=True)
-    time.sleep(1)
-    get2 = requests.get(get, prefetch=True)
-    
-    res1 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    time.sleep(1)
-    res2 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    
-    if get1.text == get2.text:
-        doc.write('GET retrieved the same information')
-        success_get = True
-    else:
-        doc.write('GET didn\'t retrieve the correct information')
-        doc.write('\n---------------------GET didn\'t retrieve the correct information--------------------\n')
-        doc.write(get2.text)
-    
-    if res1.text == res2.text:
-        doc.write('POST retrieved the same information')
-        success_post = True
-    else:
-        doc.write('POST didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST didn\'t retrieve the correct information--------------------\n')
-        doc.write(res2.text)
-    
-    if get2.text == res2.text:
-        doc.write('POST and GET retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST and GET didn\'t retrieve the correct information')
-        doc.write('\nPOST and GET didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------POST--------------------\n\n')
-        doc.write(res2.text)
-
-    result = {
-        'describeSensor_GET' : success_get,
-        'describeSensor_POST' : success_post,
-        'describeSensor_BOTH' : combo
-        }
-        
-    return result
-
-
-
-
-
-    
-def getObservation(doc):
-    
-    doc.write('\n\n-----------------getObservation-----------------------------\n')
-    
-    service = 'test'
-    procedure = 'test'
-    offering = 'temporary'
-    obproperty = 'test'
-    
-    success_get = False
-    success_getB = False
-    success_post = False
-    combo = False
-    
-    get = 'http://localhost/istsos/' + service + '?service=SOS&request=GetObservation&offering=' + offering + '&procedure=' + procedure + '&eventTime=2013-01-01T00:00:00+01/2013-01-05T17:00:00+01,2013-01-05T17:30:00+01&observedProperty=' + obproperty + '&responseFormat=text/xml;subtype=\'sensorML/1.0.0\'&service=SOS&version=1.0.0'
-    getBBOX = 'http://localhost/istsos/' + service + '?service=SOS&request=GetObservation&offering=' + offering + '&observedProperty='  + obproperty + '&responseFormat=text/xml;subtype=\'sensorML/1.0.0\'&service=SOS&version=1.0.0&featureOfInterest=&BBOX=[713800,89915 713830,89940(,21781)]&service=SOS&version=1.0.0'
-    
-    post = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:GetObservation
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-       xmlns:sos="http://www.opengis.net/sos/1.0"
-       xmlns:gml="http://www.opengis.net/gml/3.2"
-       xmlns:ogc="http://www.opengis.net/ogc"
-       xmlns:om="http://www.opengis.net/om/1.0" 
-       service="SOS" version='1.0.0'>
-        <offering>urn:ogc:def:offering:x-istsos:1.0:temporary</offering>
-        <procedure>urn:ogc:def:procedure:x-istsos:1.0:test</procedure>
-        <eventTime>
-            <gml:TimePeriod>
-               <gml:beginPosition>2013-01-01T00:00:00+01:00</gml:beginPosition>
-               <gml:endPosition>2013-01-05T00:00:00+01:00</gml:endPosition>
-            </gml:TimePeriod>
-            <gml:TimeInstant>
-               <gml:timePosition>2013-01-05T00:00:00+01:00</gml:timePosition>
-            </gml:TimeInstant>
-        </eventTime>
-        <responseFormat>text/xml;subtype='sensorML/1.0.0'</responseFormat>
-        <observedProperty>urn:ogc:def:parameter:x-istsos:1.0:test</observedProperty>
-    </sos:GetObservation>'''
-    
-    post2 = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:GetObservation
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-       xmlns:sos="http://www.opengis.net/sos/1.0"
-       xmlns:gml="http://www.opengis.net/gml/3.2"
-       xmlns:ogc="http://www.opengis.net/ogc"
-       xmlns:om="http://www.opengis.net/om/1.0" 
-       service="SOS" version='1.0.0'>
-        <offering>urn:ogc:def:offering:x-istsos:1.0:temporary</offering>
-        <procedure>urn:ogc:def:procedure:x-istsos:1.0:test</procedure>
-    
-        <eventTime>
-            <gml:TimeInstant>
-               <gml:timePosition>2013-01-07T00:00:00+01:00</gml:timePosition>
-            </gml:TimeInstant>
-        </eventTime>
-        <responseFormat>text/xml;subtype='sensorML/1.0.0'</responseFormat>
-        <srsName>urn:ogc:crs:EPSG:21781</srsName>
-        <observedProperty>urn:ogc:def:parameter:x-istsos:1.0:test</observedProperty>
-    </sos:GetObservation>'''
-    
-    post4 = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:GetObservation
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-       xmlns:sos="http://www.opengis.net/sos/1.0"
-       xmlns:gml="http://www.opengis.net/gml/3.2"
-       xmlns:ogc="http://www.opengis.net/ogc"
-       xmlns:om="http://www.opengis.net/om/1.0" 
-       service="SOS" version='1.0.0'>
-        <offering>urn:ogc:def:offering:x-istsos:1.0:temporary</offering>
-        <procedure>urn:ogc:def:procedure:x-istsos:1.0:test</procedure>
-        <eventTime>
-            <gml:TimeInstant>
-               <gml:timePosition>2012-10-26T17:00:00+01</gml:timePosition>
-            </gml:TimeInstant>
-        </eventTime>
-        <responseFormat>text/xml;subtype='sensorML/1.0.0'</responseFormat>
-        <observedProperty>urn:ogc:def:parameter:x-istsos:1.0:test</observedProperty>
-    </sos:GetObservation>'''
-    
-    header = {'Content-Type': 'application/xml'}        
-    
-    get1 = requests.get(get, prefetch=True)
-    time.sleep(1)
-    get2 = requests.get(get, prefetch=True)
-    
-    getb1 = requests.get(getBBOX, prefetch=True)
-    time.sleep(1)
-    getb2 = requests.get(getBBOX, prefetch=True)
-    
-    res1 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    time.sleep(1)
-    res2 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    
-    res3 = requests.post('http://localhost/istsos/' + service, data=post2, headers=header, prefetch=True)
-    time.sleep(1)
-    res4 = requests.post('http://localhost/istsos/' + service, data=post2, headers=header, prefetch=True)
-
-    res5 = requests.post('http://localhost/istsos/' + service, data=post4, headers=header, prefetch=True)
-    time.sleep(1)
-    res6 = requests.post('http://localhost/istsos/' + service, data=post4, headers=header, prefetch=True)
-    
-    if get1.text == get2.text:
-        doc.write('GET retrieved the same information')
-        success_get = True
-    else:
-        doc.write('GET didn\'t retrieve the correct information')
-        doc.write('\n---------------------GET didn\'t retrieve the correct information--------------------\n')
-        doc.write(get2.text)
-        
-    if getb1.text == getb2.text:
-        doc.write('GET retrieved the same information')
-        success_getB = True
-    else:
-        doc.write('GETB didn\'t retrieve the correct information')
-        doc.write('\n---------------------GETB didn\'t retrieve the correct information--------------------\n')
-        doc.write(getb2.text)
-    
-    if res1.text == res2.text:
-        doc.write('POST retrieved the same information')
-        success_post = True
-    else:
-        doc.write('POST didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST didn\'t retrieve the correct information--------------------\n')
-        doc.write(res2.text)
-        
-    
-    if res3.text == res4.text:
-        doc.write('POST2 retrieved the same information')
-        success_post = True
-    else:
-        doc.write('POST2 didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST2 didn\'t retrieve the correct information--------------------\n')
-        doc.write(res3.text)
-    
-    if res5.text == res6.text:
-        doc.write('POST4 retrieved the same information')
-        success_post = True
-    else:
-        doc.write('POST4 didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST4 didn\'t retrieve the correct information--------------------\n')
-        doc.write(res5.text)
-    
-        
-    if get2.text == getb2.text:
-        doc.write('GET and GETB retrieved the same information')
-        combo = True
-    else:
-        doc.write('GET and GETB didn\'t retrieve the correct information')
-        doc.write('\nGET and GETB didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------GETB--------------------\n\n')
-        doc.write(getb2.text)
-    
-    if get2.text == res2.text:
-        doc.write('POST and GET retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST and GET didn\'t retrieve the correct information')
-        doc.write('\nPOST and GET didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------POST--------------------\n\n')
-        doc.write(res2.text)
-        
-    if getb2.text == res2.text:
-        doc.write('POST and GETB retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST and GETB didn\'t retrieve the correct information')
-        doc.write('\nPOST and GETB didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GETB--------------------\n\n')
-        doc.write(getb2.text)
-        doc.write('\n\n---------------------POST--------------------\n\n')
-        doc.write(res2.text)
-            
-    if get2.text == res4.text:
-        doc.write('POST2 and GET retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST2 and GET didn\'t retrieve the correct information')
-        doc.write('\nPOST2 and GET didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------POST2--------------------\n\n')
-        doc.write(res4.text)
-            
-    if get2.text == res6.text:
-        doc.write('POST4 and GET retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST4 and GET didn\'t retrieve the correct information')
-        doc.write('\nPOST4 and GET didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------POST4--------------------\n\n')
-        doc.write(res6.text)
-
-    result = {
-        'getObservation_GET' : success_get,
-        'getObservation_GETB' : success_getB,
-        'getObservation_POST' : success_post,
-        'getObservation_BOTH' : combo
-        }
-        
-    return result
-    
-    
-    
-    
-def registerSensor(doc):
-    
-    doc.write('\n\n-----------------registerSensor-----------------------------\n')
-    
-    service = 'test'
-    
-    success_posts = False
-    success_postc = False
-    
-    header = {'Content-Type': 'application/xml'}
-    
-    post_simple = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:RegisterSensor 
-        service="SOS" 
-        version="1.0.0" 
-        xmlns:sos="http://www.opengis.net/sos/1.0" 
-        xmlns:gml="http://www.opengis.net/gml" 
-        xmlns:om="http://www.opengis.net/om" 
-        xmlns:sml="http://www.opengis.net/sensorML" 
-        xmlns:swe="http://www.opengis.net/swe" 
-        xmlns:xlink="http://www.w3.org/1999/xlink" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosRegisterSensor.xsd">
-      <sos:SensorDescription>
-        <sml:member>
-          <sml:System gml:id="H_TREVANO">
-            <gml:name>H_TREVANO</gml:name>
-            <sml:identification/>
-            <sml:classification>
-              <sml:ClassifierList>
-                <sml:classifier name="System Type">
-                  <sml:Term definition="urn:ogc:def:classifier:x-istsos:1.0:systemType">
-                    <sml:value>insitu-fixed-point</sml:value>
-                  </sml:Term>
-                </sml:classifier>
-                <sml:classifier name="Sensor Type">
-                  <sml:Term definition="urn:ogc:def:classifier:x-istsos:1.0:sensorType">
-                    <sml:value>humidity sensor</sml:value>
-                  </sml:Term>
-                </sml:classifier>
-              </sml:ClassifierList>
-            </sml:classification>
-            <sml:capabilities>
-              <swe:DataRecord/>
-            </sml:capabilities>
-            <gml:location>
-              <gml:Point gml:id="trevano" srsName="EPSG:4326">
-                <gml:coordinates>8.961435,46.028235,350</gml:coordinates>
-              </gml:Point>
-            </gml:location>
-            <sml:outputs>
-              <sml:OutputList>
-                <sml:output name="output data">
-                  <swe:DataRecord definition="urn:ogc:def:dataType:x-istsos:1.0:timeSeries">
-                    <swe:field name="Time">
-                      <swe:Time definition="urn:ogc:def:parameter:x-istsos:1.0:time:iso8601" gml:id="1">
-                        <swe:uom code="iso8601"/>
-                      </swe:Time>
-                    </swe:field>
-                    <swe:field name="air humidity">
-                      <swe:Quantity definition="urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity" gml:id="2">
-                        <swe:uom code="%"/>
-                      </swe:Quantity>
-                    </swe:field>
-                  </swe:DataRecord>
-                </sml:output>
-              </sml:OutputList>
-            </sml:outputs>
-          </sml:System>
-        </sml:member>
-      </sos:SensorDescription>
-      <sos:ObservationTemplate>
-        <om:Observation>
-          <om:procedure xlink:href="urn:ogc:object:procedure:x-istsos:1.0:H_TREVANO"/>
-          <om:samplingTime>
-            <gml:TimePeriod>
-              <gml:TimeLength/>
-            </gml:TimePeriod>
-          </om:samplingTime>
-          <om:observedProperty>
-            <swe:CompositPhenomenon dimension="2">
-              <swe:component xlink:href="urn:ogc:def:parameter:x-istsos:1.0:time:iso8601"/>
-              <swe:component xlink:href="urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity"/>
-            </swe:CompositPhenomenon>
-          </om:observedProperty>
-          <om:featureOfInterest xlink:href="trevano">
-            <gml:Point gml:id="trevano" srsName="EPSG:4326">
-              <gml:coordinates>8.961435,46.028235,350</gml:coordinates>
-            </gml:Point>
-          </om:featureOfInterest>
-          <om:result>
-            <swe:DataArray>
-              <swe:elementCount>
-                <swe:value>2</swe:value>
-              </swe:elementCount>
-              <swe:elementType name="SimpleDataArray" xlink:href="urn:ogc:def:dataType:x-istsos:1.0:timeSeriesDataRecord">
-                <swe:DataRecord definition="urn:ogc:def:dataType:x-istsos:1.0:timeSeries">
-                  <swe:field name="Time">
-                    <swe:Time definition="urn:ogc:def:parameter:x-istsos::time:iso8601" gml:id="1">
-                      <swe:uom code="iso8601"/>
-                    </swe:Time>
-                  </swe:field>
-                  <swe:field name="air humidity">
-                    <swe:Quantity definition="urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity" gml:id="2">
-                      <swe:uom code="%"/>
-                    </swe:Quantity>
-                  </swe:field>
-                </swe:DataRecord>
-              </swe:elementType>
-              <swe:encoding>
-                <swe:TextBlock blockSeparator="@" decimalSeparator="." tokenSeparator=","/>
-              </swe:encoding>
-              <swe:values/>
-            </swe:DataArray>
-          </om:result>
-        </om:Observation>
-      </sos:ObservationTemplate>
-    </sos:RegisterSensor>'''
-
-    post_composite = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:RegisterSensor 
-        service="SOS" 
-        version="1.0.0" 
-        xmlns:sos="http://www.opengis.net/sos/1.0" 
-        xmlns:gml="http://www.opengis.net/gml" 
-        xmlns:om="http://www.opengis.net/om" 
-        xmlns:sml="http://www.opengis.net/sensorML" 
-        xmlns:swe="http://www.opengis.net/swe" 
-        xmlns:xlink="http://www.w3.org/1999/xlink" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <sos:SensorDescription>
-        <sml:member>
-          <sml:System gml:id="LL_CERESIO">
-            <gml:name>LL_CERESIO</gml:name>
-            <sml:identification>
-              <sml:IdentifierList>
-                <sml:identifier name="Short Name">
-                  <sml:Term definition="urn:x-ogc:def:identifier:x-istsos:1.0:shortName">
-                    <sml:value>CHS001</sml:value>
-                  </sml:Term>
-                </sml:identifier>
-                <sml:identifier name="Long Name">
-                  <sml:Term definition="urn:x-ogc:def:identifier:x-istsos:1.0:longName">
-                    <sml:value>Capacitive humidity sensors model 001</sml:value>
-                  </sml:Term>
-                </sml:identifier>
-                <sml:identifier name="Manufacturer Name">
-                  <sml:Term definition="urn:x-ogc:def:identifier:x-istsos:1.0:manufacturerName">
-                    <sml:value>Technical Department - SUPSI</sml:value>
-                  </sml:Term>
-                </sml:identifier>
-                <sml:identifier name="Model Number">
-                  <sml:Term definition="urn:x-ogc:def:identifier:x-istsos:1.0:modelNumber">
-                    <sml:value>TDS-001</sml:value>
-                  </sml:Term>
-                </sml:identifier>
-                <sml:identifier name="Serial Number">
-                  <sml:Term definition="urn:x-ogc:def:identifier:x-istsos:1.0:serialNumber">
-                    <sml:value>EXZU70012987712ABC</sml:value>
-                  </sml:Term>
-                </sml:identifier>
-                <sml:identifier name="Device ID">
-                  <sml:Term definition="urn:x-ogc:def:identifier:x-istsos:1.0:deviceID">
-                    <sml:value>TDSCHSMWLLUGANO</sml:value>
-                  </sml:Term>
-                </sml:identifier>
-              </sml:IdentifierList>
-            </sml:identification>
-            <sml:classification>
-              <sml:ClassifierList>
-                <sml:classifier name="System Type">
-                  <sml:Term definition="urn:ogc:def:classifier:x-istsos:1.0:systemType">
-                    <sml:value>insitu-fixed-point</sml:value>
-                  </sml:Term>
-                </sml:classifier>
-                <sml:classifier name="Sensor Type">
-                  <sml:Term definition="urn:ogc:def:classifier:x-istsos:1.0:sensorType">
-                    <sml:value>lake water level</sml:value>
-                  </sml:Term>
-                </sml:classifier>
-              </sml:ClassifierList>
-            </sml:classification>
-            <sml:characteristics xlink:href="http://192.168.56.101/istsos/admin/"/>
-            <sml:capabilities>
-              <swe:DataRecord>
-                <swe:field name="Memory Capacity">
-                  <swe:Quantity definition="urn:x-ogc:def:classifier:x-istsos:1.0:memoryCapacity">
-                    <swe:uom code="Byte"/>
-                    <swe:value>34359738368</swe:value>
-                  </swe:Quantity>
-                </swe:field>
-                <swe:field name="Battery Current">
-                  <swe:Quantity definition="urn:x-ogc:def:phenomenon:x-istsos:1.0:batteryCurrent">
-                    <swe:uom code="A.h"/>
-                    <swe:value>1420000</swe:value>
-                  </swe:Quantity>
-                </swe:field>
-                <swe:field name="Sampling time resolution">
-                  <swe:Quantity definition="urn:x-ogc:def:classifier:x-istsos:1.0:samplingTimeResolution">
-                    <swe:uom code="iso8601"/>
-                    <swe:value>PT20M</swe:value>
-                  </swe:Quantity>
-                </swe:field>
-                <swe:field name="Acquisition time resolution">
-                  <swe:Quantity definition="urn:x-ogc:def:classifier:x-istsos:1.0:acquisitionTimeResolution">
-                    <swe:uom code="iso8601"/>
-                    <swe:value>PT30M</swe:value>
-                  </swe:Quantity>
-                </swe:field>
-              </swe:DataRecord>
-            </sml:capabilities>
-            <sml:contact role="urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:owner">
-              <sml:ResponsibleParty>
-                <sml:individualName>Fausto Gervasoni</sml:individualName>
-                <sml:organizationName>Institute of Earth Science - SUPSI</sml:organizationName>
-                <sml:contactInfo>
-                  <sml:phone>
-                    <sml:voice>+41586666200</sml:voice>
-                    <sml:facsimile>+41586666209</sml:facsimile>
-                  </sml:phone>
-                  <sml:address>
-                    <sml:deliveryPoint>Campus Trevano</sml:deliveryPoint>
-                    <sml:city>Canobbio</sml:city>
-                    <sml:administrativeArea>Ticino</sml:administrativeArea>
-                    <sml:postalCode>6952</sml:postalCode>
-                    <sml:country>Switzerland</sml:country>
-                    <sml:electronicMailAddress>ist at supsi.ch</sml:electronicMailAddress>
-                  </sml:address>
-                  <sml:onlineResource xlink:href="http://www.supsi.ch/ist"/>
-                </sml:contactInfo>
-              </sml:ResponsibleParty>
-            </sml:contact>
-            <sml:contact role="urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:manufacturer">
-              <sml:ResponsibleParty>
-                <sml:individualName>Paolo Rezzonico</sml:individualName>
-                <sml:organizationName>Technical Department - SUPSI</sml:organizationName>
-                <sml:contactInfo>
-                  <sml:phone>
-                    <sml:voice>+41586666200</sml:voice>
-                    <sml:facsimile>+41586666209</sml:facsimile>
-                  </sml:phone>
-                  <sml:address>
-                    <sml:deliveryPoint>Residence Stella alpina</sml:deliveryPoint>
-                    <sml:city>Viganello</sml:city>
-                    <sml:administrativeArea>Ticino</sml:administrativeArea>
-                    <sml:postalCode>6962</sml:postalCode>
-                    <sml:country>Switzerland</sml:country>
-                    <sml:electronicMailAddress>ist at supsi.ch</sml:electronicMailAddress>
-                  </sml:address>
-                  <sml:onlineResource xlink:href="http://www.supsi.ch/ist"/>
-                </sml:contactInfo>
-              </sml:ResponsibleParty>
-            </sml:contact>
-            <sml:contact role="urn:x-ogc:def:classifiers:x-istsos:1.0:contactType:operator">
-              <sml:ResponsibleParty>
-                <sml:individualName>Giacomino Bragaferro</sml:individualName>
-                <sml:organizationName>Ufficio Tecnico Augenthaler</sml:organizationName>
-                <sml:contactInfo>
-                  <sml:phone>
-                    <sml:voice>+41586666200</sml:voice>
-                    <sml:facsimile>+41586666209</sml:facsimile>
-                  </sml:phone>
-                  <sml:address>
-                    <sml:deliveryPoint>Via delle Vigne 6</sml:deliveryPoint>
-                    <sml:city>Bironico</sml:city>
-                    <sml:administrativeArea>Ticino</sml:administrativeArea>
-                    <sml:postalCode>6804</sml:postalCode>
-                    <sml:country>Switzerland</sml:country>
-                    <sml:electronicMailAddress>ist at supsi.ch</sml:electronicMailAddress>
-                  </sml:address>
-                  <sml:onlineResource xlink:href="http://www.supsi.ch/ist"/>
-                </sml:contactInfo>
-              </sml:ResponsibleParty>
-            </sml:contact>
-            <sml:documentation>
-              <sml:Document>
-                <gml:description>User Manual</gml:description>
-                <sml:date>01/01/2013</sml:date>
-                <sml:format>text/html</sml:format>
-                <gml:onlineResource xlink:href="http://goo.gl/0fpAA"/>
-              </sml:Document>
-            </sml:documentation>
-            <gml:location>
-              <gml:Point gml:id="ceresio" srsName="EPSG:4326">
-                <gml:coordinates>8.962662,46.004809,270</gml:coordinates>
-              </gml:Point>
-            </gml:location>
-            <sml:interfaces>
-              <sml:InterfaceList>
-                <sml:interface name="Bluetooth4.0/SDP/RFCOMM/L2CAP"/>
-                <sml:interface name="USB2.0/Mass Storage"/>
-              </sml:InterfaceList>
-            </sml:interfaces>
-            <sml:outputs>
-              <sml:OutputList>
-                <sml:output name="output data">
-                  <swe:DataRecord definition="urn:ogc:def:dataType:x-istsos:1.0:timeSeries">
-                    <swe:field name="Time">
-                      <swe:Time definition="urn:ogc:def:parameter:x-istsos:1.0:time:iso8601" gml:id="1">
-                        <swe:uom code="iso8601"/>
-                      </swe:Time>
-                    </swe:field>
-                    <swe:field name="lake water level">
-                      <swe:Quantity definition="urn:ogc:def:parameter:x-istsos:1.0:lake:water:level" gml:id="2">
-                        <swe:uom code="m"/>
-                      </swe:Quantity>
-                    </swe:field>
-                    <swe:field name="lake water temperature">
-                      <swe:Quantity definition="urn:ogc:def:parameter:x-istsos:1.0:lake:water:temperature" gml:id="2">
-                        <swe:uom code="°C"/>
-                      </swe:Quantity>
-                    </swe:field>
-                  </swe:DataRecord>
-                </sml:output>
-              </sml:OutputList>
-            </sml:outputs>
-          </sml:System>
-        </sml:member>
-      </sos:SensorDescription>
-      <sos:ObservationTemplate>
-        <om:Observation>
-          <om:procedure xlink:href="urn:ogc:object:procedure:x-istsos:1.0:LL_CERESIO"/>
-          <om:samplingTime>
-            <gml:TimePeriod>
-              <gml:TimeLength/>
-            </gml:TimePeriod>
-          </om:samplingTime>
-          <om:observedProperty>
-            <swe:CompositPhenomenon dimension="2">
-              <swe:component xlink:href="urn:ogc:def:parameter:x-istsos:1.0:time:iso8601"/>
-              <swe:component xlink:href="urn:ogc:def:parameter:x-istsos:1.0:lake:water:level"/>
-              <swe:component xlink:href="urn:ogc:def:parameter:x-istsos:1.0:lake:water:temperature"/>
-            </swe:CompositPhenomenon>
-          </om:observedProperty>
-          <om:featureOfInterest xlink:href="ceresio">
-            <gml:Point gml:id="ceresio" srsName="EPSG:4326">
-              <gml:coordinates>8.962662,46.004809,270</gml:coordinates>
-            </gml:Point>
-          </om:featureOfInterest>
-          <om:result>
-            <swe:DataArray>
-              <swe:elementCount>
-                <swe:value>2</swe:value>
-              </swe:elementCount>
-              <swe:elementType name="SimpleDataArray" xlink:href="urn:ogc:def:dataType:x-istsos:1.0:timeSeriesDataRecord">
-                <swe:DataRecord definition="urn:ogc:def:dataType:x-istsos:1.0:timeSeries">
-                  <swe:field name="Time">
-                    <swe:Time definition="urn:ogc:def:parameter:x-istsos:1.0:time:iso8601" gml:id="1">
-                      <swe:uom code="iso8601"/>
-                    </swe:Time>
-                  </swe:field>
-                  <swe:field name="lake water level">
-                    <swe:Quantity definition="urn:ogc:def:parameter:x-istsos:1.0:lake:water:level" gml:id="2">
-                      <swe:uom code="m"/>
-                    </swe:Quantity>
-                  </swe:field>
-                  <swe:field name="lake water temperature">
-                    <swe:Quantity definition="urn:ogc:def:parameter:x-istsos:1.0:lake:water:temperature" gml:id="2">
-                      <swe:uom code="°C"/>
-                    </swe:Quantity>
-                  </swe:field>
-                </swe:DataRecord>
-              </swe:elementType>
-              <swe:encoding>
-                <swe:TextBlock blockSeparator="@" decimalSeparator="." tokenSeparator=","/>
-              </swe:encoding>
-              <swe:values/>
-            </swe:DataArray>
-          </om:result>
-        </om:Observation>
-      </sos:ObservationTemplate>
-    </sos:RegisterSensor>'''
-    
-    
-    ress1 = requests.post('http://localhost/istsos/' + service, data=post_simple, headers=header, prefetch=True)
-    time.sleep(1)
-    ress2 = requests.post('http://localhost/istsos/' + service, data=post_simple, headers=header, prefetch=True)
-    
-    resc1 = requests.post('http://localhost/istsos/' + service, data=post_composite, headers=header, prefetch=True)
-    time.sleep(1)
-    resc2 = requests.post('http://localhost/istsos/' + service, data=post_composite, headers=header, prefetch=True)
-    
-    if ress1.text == ress2.text:
-        doc.write('POST Simple retrieved the same information')
-        success_posts = True
-    else:
-        doc.write('POST Simple didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST Simple didn\'t retrieve the correct information--------------------\n')
-        doc.write(ress2.text)    
-    
-    if resc1.text == resc2.text:
-        doc.write('POST Composite retrieved the same information')
-        success_postc = True
-    else:
-        doc.write('POST Composite didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST Composite didn\'t retrieve the correct information--------------------\n')
-        doc.write(resc2.text)
-    
-    result = {
-        'registerSensor_POSTS' : success_posts,
-        'registerSensor_POSTC' : success_postc
-        }
-        
-    return result
-
-
-def insertObservation(doc):
-    
-    doc.write('\n\n-----------------insertObservation--------------------------\n')    
-    
-    service = 'test'
-    
-    success_posts = False
-    success_postc = False
-            
-    header = {'Content-Type': 'application/xml'}
-    
-    post_simple = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:InsertObservation
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-       xmlns:sos="http://www.opengis.net/sos/1.0"
-       xmlns:xlink="http://www.w3.org/1999/xlink"
-       xmlns:sa="http://www.opengis.net/sampling/1.0"
-       xmlns:swe="http://www.opengis.net/swe/1.0.1"
-       xmlns:gml="http://www.opengis.net/gml/3.2"
-       xmlns:ogc="http://www.opengis.net/ogc"
-       xmlns:om="http://www.opengis.net/om/1.0" service="SOS" version="1.0.0" >
-       <AssignedSensorId>urn:ogc:object:sensor:x-ist::???</AssignedSensorId>
-       <om:Observation>
-        <om:procedure xlink:href="urn:ogc:object:procedure:x-ist::thermo1"/>
-        <om:samplingTime>
-          <gml:TimePeriod>
-            <gml:beginPosition>2010-01-01T00:10:00+00:00</gml:beginPosition>
-            <gml:endPosition>2010-01-01T02:00:00+00:00</gml:endPosition>
-          </gml:TimePeriod>
-        </om:samplingTime>
-        <om:observedProperty>
-          <swe:CompositPhenomenon dimension="2">
-            <swe:component xlink:href="urn:ogc:def:parameter:x-ist::time:iso8601"/>  
-            <swe:component xlink:href="urn:ogc:def:property:x-ist::airtemperature" />      
-          </swe:CompositPhenomenon>
-        </om:observedProperty>
-        <om:featureOfInterest xlink:href="urn:ogc:object:feature:x-ist::station:LUGANO"/>
-          <om:result>
-            <swe:DataArray>
-              <swe:elementCount>
-                <swe:Count>
-                  <swe:value>2</swe:value>
-                </swe:Count>
-              </swe:elementCount>
-              <swe:elementType name="SimpleDataArray">
-                  <swe:DataRecord definition="http://mmiws.org/ont/x/timeSeries">
-                    <swe:field name="Time">
-                      <swe:Time definition="urn:ogc:def:parameter:x-ist::time:iso8601"/>
-                    </swe:field>
-                    <swe:field name="airtemperature">
-                      <swe:Quantity definition="urn:ogc:def:property:x-ist::airtemperature">
-                        <swe:uom code="deg"/>
-                      </swe:Quantity>
-                    </swe:field>
-                  </swe:DataRecord>
-              </swe:elementType>
-            <swe:encoding>
-              <swe:TextBlock tokenSeparator="," blockSeparator="@" decimalSeparator="."/>
-            </swe:encoding>
-            <swe:values>
-                2010-01-01T00:10:00+00:00,9.81@
-                2010-01-01T00:20:00+00:00,9.78@
-                2010-01-01T00:30:00+00:00,9.74@
-                2010-01-01T00:40:00+00:00,9.69@
-                2010-01-01T00:50:00+00:00,9.4@
-                2010-01-01T01:00:00+00:00,9.1@
-                2010-01-01T01:10:00+00:00,8.7@
-                2010-01-01T01:20:00+00:00,8.5@
-                2010-01-01T01:30:00+00:00,8.4@
-                2010-01-01T01:40:00+00:00,8.32@
-                2010-01-01T01:50:00+00:00,8.30@
-                2010-01-01T02:00:00+00:00,8.27
-            </swe:values>
-          </swe:DataArray>
-        </om:result>
-      </om:Observation>
-    </sos:InsertObservation>'''
-
-    post_composite = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:InsertObservation
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-       xmlns:sos="http://www.opengis.net/sos/1.0"
-       xmlns:xlink="http://www.w3.org/1999/xlink"
-       xmlns:sa="http://www.opengis.net/sampling/1.0"
-       xmlns:swe="http://www.opengis.net/swe/1.0.1"
-       xmlns:gml="http://www.opengis.net/gml/3.2"
-       xmlns:ogc="http://www.opengis.net/ogc"
-       xmlns:om="http://www.opengis.net/om/1.0" service="SOS" version="1.0.0" >
-       <AssignedSensorId>urn:ogc:object:sensor:x-ist::???</AssignedSensorId>
-       <om:Observation>
-        <om:procedure xlink:href="urn:ogc:object:procedure:x-ist::meteo1"/>
-        <om:samplingTime>
-          <gml:TimePeriod>
-            <gml:beginPosition>2010-02-10T16:10:00+01:00</gml:beginPosition>
-            <gml:endPosition>2010-02-10T18:00:00+01:00</gml:endPosition>
-          </gml:TimePeriod>
-        </om:samplingTime>
-        <om:observedProperty>
-          <swe:CompositPhenomenon dimension="4">
-            <swe:component xlink:href="urn:ogc:def:parameter:x-ist::time:iso8601"/>  
-            <swe:component xlink:href="urn:ogc:def:property:x-ist::airtemperature"/> 
-            <swe:component xlink:href="urn:ogc:def:property:x-ist::rainfall"/> 
-            <swe:component xlink:href="urn:ogc:def:property:x-ist::pressure"/>
-          </swe:CompositPhenomenon>
-        </om:observedProperty>
-        <om:featureOfInterest xlink:href="urn:ogc:object:feature:x-ist::station:LUGANO"/>
-          <om:result>
-            <swe:DataArray>
-              <swe:elementCount>
-                <swe:Count>
-                  <swe:value>5</swe:value>
-                </swe:Count>
-              </swe:elementCount>
-              <swe:elementType name="SimpleDataArray">
-                  <swe:DataRecord definition="http://mmiws.org/ont/x/timeSeries">
-                    <swe:field name="Time">
-                      <swe:Time definition="urn:ogc:def:parameter:x-ist::time:iso8601"/>
-                    </swe:field>
-                    <swe:field name="airtemperature">
-                      <swe:Quantity definition="urn:ogc:def:property:x-ist::airtemperature">
-                        <swe:uom code="deg"/>
-                      </swe:Quantity>
-                    </swe:field>
-                    <swe:field name="rainfall">
-                      <swe:Quantity definition="urn:ogc:def:property:x-ist::rainfall">
-                        <swe:uom code="mm"/>
-                      </swe:Quantity>
-                    </swe:field>
-                    <swe:field name="pressure">
-                      <swe:Quantity definition="urn:ogc:def:property:x-ist::pressure">
-                        <swe:uom code="mbar"/>
-                      </swe:Quantity>
-                    </swe:field>
-                  </swe:DataRecord>
-              </swe:elementType>
-            <swe:encoding>
-              <swe:TextBlock tokenSeparator="," blockSeparator="@" decimalSeparator="."/>
-            </swe:encoding>
-            <swe:values>
-                2010-02-10T16:10:00+01:00,12.8,0.2,940@
-                2010-02-10T16:20:00+01:00,12.7,0.3,948@
-                2010-02-10T16:30:00+01:00,12.5,0.2,949@
-                2010-02-10T16:40:00+01:00,12.3,0.3,950@
-                2010-02-10T16:50:00+01:00,12.2,0.4,949@
-                2010-02-10T17:00:00+01:00,12.1,0.4,947@
-                2010-02-10T17:10:00+01:00,11.8,0.5,948@
-                2010-02-10T17:20:00+01:00,11.6,0.3,944@
-                2010-02-10T17:30:00+01:00,11.7,0.4,943@
-                2010-02-10T17:40:00+01:00,11.4,0.4,944@
-                2010-02-10T17:50:00+01:00,11.4,0.5,944@
-                2010-02-10T18:00:00+01:00,11.3,0.4,945
-            </swe:values>
-          </swe:DataArray>
-        </om:result>
-      </om:Observation>
-    </sos:InsertObservation>'''
-    
-    
-    ress1 = requests.post('http://localhost/istsos/' + service, data=post_simple, headers=header, prefetch=True)
-    time.sleep(1)
-    ress2 = requests.post('http://localhost/istsos/' + service, data=post_simple, headers=header, prefetch=True)
-    
-    resc1 = requests.post('http://localhost/istsos/' + service, data=post_composite, headers=header, prefetch=True)
-    time.sleep(1)
-    resc2 = requests.post('http://localhost/istsos/' + service, data=post_composite, headers=header, prefetch=True)
-    
-    if ress1.text == ress2.text:
-        doc.write('POST Simple retrieved the same information')
-        success_posts = True
-    else:
-        doc.write('POST Simple didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST Simple didn\'t retrieve the correct information--------------------\n')
-        doc.write(ress2.text)    
-    
-    if resc1.text == resc2.text:
-        doc.write('POST Composite retrieved the same information')
-        success_postc = True
-    else:
-        doc.write('POST Composite didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST Composite didn\'t retrieve the correct information--------------------\n')
-        doc.write(resc2.text)
-        
-    result = {
-        'insertObservation_POSTS' : success_posts,
-        'insertObservation_POSTC' : success_postc
-        }
-        
-    return result
-
-def getFeatureOfInterest(doc):
-    
-    doc.write('\n\n-----------------getFeatureOfInterest-----------------------\n')
-    
-    service = 'test'
-    foi = 'test'
-    srs = '4326'
-    
-    success_get = False
-    success_post = False
-    combo = False
-    
-    get = 'http://localhost/istsos/' + service + '?request=getFeatureOfInterest&FeatureOfInterestId=' + foi + '&srsName=' + srs + '&service=SOS&version=1.0.0'
-        
-    post = '''<?xml version="1.0" encoding="UTF-8"?>
-    <sos:getfeatureOfinterest
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://schemas.opengis.net/sos/1.0.0/sosAll.xsd"
-        xmlns:sos="http://www.opengis.net/sos/1.0"
-        xmlns:gml="http://www.opengis.net/gml/3.2"
-        xmlns:ogc="http://www.opengis.net/ogc"
-        xmlns:om="http://www.opengis.net/om/1.0" service="SOS" outputFormat="text/xml;subtype='sensorML/1.0.0'">
-            <FeatureOfInterestId>urn:ogc:def:feature:x-istsos:1.0:Point:test</FeatureOfInterestId>
-            <srsName>4326</srsName>    
-      </sos:getfeatureOfinterest>'''
-    
-    header = {'Content-Type': 'application/xml'}    
-    
-    get1 = requests.get(get, prefetch=True)
-    time.sleep(1)
-    get2 = requests.get(get, prefetch=True)
-    
-    res1 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    time.sleep(1)
-    res2 = requests.post('http://localhost/istsos/' + service, data=post, headers=header, prefetch=True)
-    
-    if get1.text == get2.text:
-        doc.write('GET retrieved the same information')
-        success_get = True
-    else:
-        doc.write('GET didn\'t retrieve the correct information')
-        doc.write('\n---------------------GET didn\'t retrieve the correct information--------------------\n')
-        doc.write(get2.text)
-    
-    if res1.text == res2.text:
-        doc.write('POST retrieved the same information')
-        success_post = True
-    else:
-        doc.write('POST didn\'t retrieve the correct information')
-        doc.write('\n---------------------POST didn\'t retrieve the correct information--------------------\n')
-        doc.write(res2.text)
-    
-    if get2.text == res2.text:
-        doc.write('POST and GET retrieved the same information')
-        combo = True
-    else:
-        doc.write('POST and GET didn\'t retrieve the correct information')
-        doc.write('\nPOST and GET didn\'t retrieve the correct information\n')
-        doc.write('\n---------------------GET--------------------\n\n')
-        doc.write(get2.text)
-        doc.write('\n\n---------------------POST--------------------\n\n')
-        doc.write(res2.text)
-        
-    result = {
-        'getFeatureOfInterest_GET' : success_get,
-        'getFeatureOfInterest_POST' : success_post,
-        'getFeatureOfInterest_BOTH' : combo
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/post.py b/test/post.py
deleted file mode 100755
index 43e6c0f..0000000
--- a/test/post.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import json
-import lib.requests as requests
-
-def POST(fname, spost, address):
-    
-    #print  fname + ', POST'
-    
-    res = requests.post(
-        address,
-        data=json.dumps(spost),
-        prefetch=True
-    )
-             
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-
-    return res.json
-    
-def services_name_uoms_POST(sname, post):
-    
-    fname = '/istsos/services/{name}/uoms'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/uoms'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_POST(post):
-    
-    fname = '/istsos/services'
-    address = 'http://localhost/istsos/wa/istsos/services'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_operations_insertobservation_POST(sname, post):
-    
-    fname = '/istsos/services/{name}/operations/insertobservation'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/operations/insertobservation'
-
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_procedures_POST(sname, post):
-    
-    fname = '/istsos/services/{name}/procedures'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_procedures_name_ratingcurve_POST(sname, pname, post):
-    
-    fname = '/istsos/services/{name}/procedures/{name}/ratingcurve'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures/' + pname + '/ratingcurve'
-    
-    result = POST(fname, post, address)
-    return result    
-    
-    
-def operations_validatedb_POST(post):
-    
-    fname = '/istsos/operations/validatedb'
-    address = 'http://localhost/istsos/wa/istsos/operations/validatedb'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_offerings_POST(sname, post):
-    
-    fname = '/istsos/services/{name}/offerings'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_offerings_name_procedures_name_POST(sname, oname, post):
-    
-    fname = '/istsos/services/{name}/offerings/{name}/procedures/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname + '/procedures'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_observedproperties_POST(sname, post):
-    
-    fname = '/istsos/services/{name}/observedproperties'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/observedproperties'
-    
-    result = POST(fname, post, address)
-    return result
-    
-def services_name_dataqualities_POST(sname, post):
-    
-    fname = '/istsos/services/{name}/dataqualities'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/dataqualities'
-    
-    result = POST(fname, post, address)
-    return result
\ No newline at end of file
diff --git a/test/prove.py b/test/prove.py
deleted file mode 100755
index 8d7a3b5..0000000
--- a/test/prove.py
+++ /dev/null
@@ -1,1669 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import json, pprint
-import lib.requests as requests
-
-
-def run():
-    
-    pp = pprint.PrettyPrinter(indent=2)   
-    
-    
-
-
-def operations_status_GET(pp):
-    print "operations/status, GET \n"
-     
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/operations/status',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def operations_log_GET(pp):
-    print "operations/log, GET"
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/operations/log',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def operations_log_DELETE(pp):
-    print "operations/log, DELETE"
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/operations/log',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def operations_about_GET(pp):
-    print "operations/about, GET"
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/operations/about',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def operations_validatedb_POST(pp):
-    print "operations/validatedb, POST"
-    
-    put = { #not the right object implementation
-        "title": "IST Sensor Observation Service 200000",
-        "abstract": "hydro-meteorological monitoring network",
-        "keywords": "SOS,IST,SUPSI",
-        "fees": "NONE",
-        "accessconstrains": "NONE",
-        "authority":" x-istsos",
-        "urnversion": "1.0"
-    }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/operations/validatedb',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def operations_initialization_GET(pp):
-    print "operations/initialization, GET"
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/operations/initialization',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def operations_initialization_PUT(pp):
-    print "operations/initialization, PUT"
-    
-    put = {"level": "2"}
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/operations/initialization',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_GET(pp):
-    print "services, GET"
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_POST(pp):
-    print "services, POST"
-    
-    post = {
-        "path": "gneeeeeeek",
-        "service": "pippo"
-    }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_GET(pp):
-    print "services/{name}, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_PUT(pp):
-    print "services/{name}, PUT"
-    
-    dbname = "pippo"
-    
-    put = {
-        "service": "gianni", 
-        "dbname": "istsos", 
-        "host": "localhost", 
-        "user": "postgres", 
-        "password": "postgres", 
-        "port": "5432"
-    }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname,
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_DELETE(pp):
-    print "services/{name}, DELETE"
-    
-    dbname = "test_update"
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_GET(pp):
-    print "services/{name}/configsections, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_PUT(pp):
-    print "services/{name}/configsections, PUT"
-    
-    dbname = "demo"
-    
-    put = {
-        "getobservation": {
-            "default": True, 
-            "maxgoperiod": "200", 
-            "aggregatenodataqi": "-100", 
-            "defaultqi": "100", 
-            "aggregatenodata": "-999.9"
-            }, 
-        "urn": {
-            "process": "urn:ogc:def:process:x-istsos:1.0:", 
-            "property": "urn:ogc:def:property:x-istsos:1.0:", 
-            "offering": "urn:ogc:def:offering:x-istsos:1.0:", 
-            "default": True, 
-            "sensor": "urn:ogc:def:sensor:x-istsos:1.0:", 
-            "phenomena": "urn:ogc:def:phenomenon:x-istsos:1.0:", 
-            "feature": "urn:ogc:def:feature:x-istsos:1.0:", 
-            "sensorType": "urn:ogc:def:sensorType:x-istsos:1.0:", 
-            "dataType": "urn:ogc:def:dataType:x-istsos:1.0:", 
-            "role": "urn:role:x-istsos:1.0:", 
-            "refsystem": "urn:ogc:crs:EPSG:", 
-            "time": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "keywords": "urn:ogc:def:keywords:x-istsos:1.0:", 
-            "identifier": "urn:ogc:def:identifier:x-istsos:1.0:", 
-            "parameter": "urn:ogc:def:parameter:x-istsos:1.0:", 
-            "procedure": "urn:ogc:def:procedure:x-istsos:1.0:"
-            }, 
-        "connection": {
-            "default": True, 
-            "dbname": "istsos", 
-            "host": "localhost", 
-            "user": "postgres", 
-            "password": "postgres", 
-            "port": "5432"
-            }, 
-        "identification": {
-            "title": "IST Sensor Observation Service 1", 
-            "default": False, 
-            "abstract": "hydro-meteorological monitoring network", 
-            "urnversion": "1.0", 
-            "authority": "x-istsos", 
-            "fees": "NONE", 
-            "keywords": "SOS,IST,SUPSI", 
-            "accessconstrains": "NONE"
-            }, 
-        "serviceurl": {
-            "default": True, 
-            "url": "http://localhost/istsos/pippo"
-            }, 
-        "provider": {
-            "contactcountry": "Switzerland", 
-            "providername": "Istituto Scienze della Terra", 
-            "default": True, 
-            "contactposition": "Data manager", 
-            "contactvoice": "+41586666200", 
-            "contactadminarea": "Canton Ticino", 
-            "contactemail": "geoservice at supsi.ch", 
-            "contactdeliverypoint": "Campus Trevano", 
-            "contactname": "Team Geomatica", 
-            "contactpostalcode": "6952", 
-            "contactcity": "Canobbio", 
-            "providersite": "http://www.supsi.ch/ist", 
-            "contactfax": "+41586666209"
-            }, 
-        "geo": {
-            "zaxisname": "altitude", 
-            "default": True, 
-            "xaxisname": "easting", 
-            "yaxisname": "northing", 
-            "allowedepsg": "4326,3857", 
-            "istsosepsg": "21781"
-            }
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_DELETE(pp):
-    print "services/{name}/configsections, DELETE" #shouldn't work with default as {name}
-    
-    dbname = 'default'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-    
-def services_name_configsections_getobservation_GET(pp):
-    print "services/{name}/configsections/getobservation, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/getobservation',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_getobservation_PUT(pp):
-    print "services/{name}/configsections/getobservation, PUT"
-    
-    dbname = "demo"
-    
-    put = {
-        "default": False, 
-        "maxgoperiod": "200", 
-        "aggregatenodataqi": "-100", 
-        "defaultqi": "100", 
-        "aggregatenodata": "-999.9"
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/getobservation',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_getobservation_DELETE(pp):
-    print "services/{name}/configsections/getobservation, DELETE" #shouldn't work with default as {name}
-    
-    dbname = 'default'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/getobservation',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def services_name_configsections_identification_GET(pp):
-    print "services/{name}/configsections/identification, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/identification',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_identification_PUT(pp):
-    print "services/{name}/configsections/identification, PUT"
-    
-    dbname = "demo"
-    
-    put = {
-        "title": "IST Sensor Observation Service 1", 
-        "default": False, 
-        "abstract": "hydro-meteorological monitoring network", 
-        "urnversion": "1.0", 
-        "authority": "x-istsos", 
-        "fees": "NONE", 
-        "keywords": "SOS,IST,SUPSI, test", 
-        "accessconstrains": "NONE"}
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/identification',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_identification_DELETE(pp):
-    print "services/{name}/configsections/identification, DELETE" #shouldn't work with default as {name}
-    
-    dbname = 'default'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/identification',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def services_name_configsections_geo_GET(pp):
-    print "services/{name}/configsections/geo, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/geo',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_geo_PUT(pp):
-    print "services/{name}/configsections/geo, PUT"
-    
-    dbname = "demo"
-    
-    put = {
-        "zaxisname": "altitude", 
-        "default": False, 
-        "xaxisname": "easting", 
-        "yaxisname": "northing", 
-        "allowedepsg": "4326,3857", 
-        "istsosepsg": "21781"
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/geo',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_geo_DELETE(pp):
-    print "services/{name}/configsections/geo, DELETE" #shouldn't work with default as {name}
-    
-    dbname = 'default'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/geo',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def services_name_configsections_connection_GET(pp):
-    print "services/{name}/configsections/connection, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/connection',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_connection_PUT(pp):
-    print "services/{name}/configsections/connection, PUT"
-    
-    dbname = "demo"
-    
-    put = {
-        "default": False, 
-        "dbname": "istsos", 
-        "host": "localhost", 
-        "user": "postgres", 
-        "password": "postgres", 
-        "port": "5432"
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/connection',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_connection_operations_validatedb_GET(pp):
-    print "services/{name}/configsections/connection/operations/validatedb, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/connection/operations/validatedb',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_serviceurl_GET(pp):
-    print "services/{name}/configsections/serviceurl, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/serviceurl',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_serviceurl_PUT(pp):
-    print "services/{name}/configsections/serviceurl, PUT"
-    
-    dbname = "demo"
-    
-    put = {"default": False, "url": "http://localhost/istsos/demo"}
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/serviceurl',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_serviceurl_DELETE(pp):
-    print "services/{name}/configsections/serviceurl, DELETE" #shouldn't work with default as {name}
-    
-    dbname = 'default'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/serviceurl',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def services_name_configsections_provider_GET(pp):
-    print "services/{name}/configsections/provider, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/provider',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_configsections_provider_PUT(pp):
-    print "services/{name}/configsections/provider, PUT"
-    
-    dbname = "demo"
-    
-    put = {
-        "contactcountry": "Switzerland", 
-        "providername": "South Hampton Institute of Technology", 
-        "default": False, 
-        "contactposition": "Data manager", 
-        "contactvoice": "+41586666200", 
-        "contactadminarea": "Canton Ticino", 
-        "contactemail": "geoservice at supsi.ch", 
-        "contactdeliverypoint": "Campus Trevano", 
-        "contactname": "Team Geomatica", 
-        "contactpostalcode": "6952", 
-        "contactcity": "Canobbio", 
-        "providersite": "http://www.supsi.ch/ist", 
-        "contactfax": "+41586666209"
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/provider',
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_configsections_provider_DELETE(pp):
-    print "services/{name}/configsections/provider, DELETE" #shouldn't work with default as {name}
-    
-    dbname = 'default'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/configsections/provider',
-        prefetch=True
-    )
-    
-    pp.pprint(res.json)
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    print "\n ************************************ \n"
-    
-def services_name_dataqualities_GET(pp):
-    print "services/{name}/dataqualities, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/dataqualities',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_dataqualities_POST(pp):
-    print "services/{name}/dataqualities, POST"
-    
-    dbname = "demo"
-    
-    post = {
-        "code": 42, 
-        "name": "the answer", 
-        "description": "Answer to the Ultimate Question of Life, the Universe, and Everything"}
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/dataqualities',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_dataqualities_code_GET(pp):
-    print "services/{name}/dataqualities/{code}, GET"
-    
-    dbname = 'demo'
-    qualcode = '42'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/dataqualities/' + qualcode,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_dataqualities_code_PUT(pp):
-    print "services/{name}/dataqualities/{code}, PUT"
-    
-    dbname = "demo"
-    qualcode = '42'
-    
-    put = {
-        "code": 42, 
-        "name": "the answer", 
-        "description": "Answer to the Life, the Universe, and Everything"}
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/dataqualities/' + qualcode,
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_dataqualities_code_DELETE(pp):
-    print "services/{name}/dataqualities/{code}, DELETE"
-    
-    dbname = "demo"
-    qualcode = '42'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/dataqualities/' + qualcode,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_procedures_POST(pp):
-    print "services/{name}/procedures, POST"
-    
-    dbname = "demo"
-    
-    post = {
-        "inputs": [], 
-        "description": "temperature weather station in Usmate Carate", 
-        "classification": [
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:systemType", 
-            "name": "System Type", 
-            "value": "insitu-fixed-point"
-            }, 
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:sensorType", 
-            "name": "Sensor Type", 
-            "value": "tipping bucket rain gauge"
-            }
-        ], 
-        "characteristics": "", 
-        "interfaces": "", 
-        "keywords": "weather,meteorological,IST", 
-        "contacts": [], 
-        "assignedSensorId": "6ecb65065eccaac8967089df62c81a24", 
-        "documentation": [], 
-        "system": "PIPPO", 
-        "capabilities": [], 
-        "identification": [], 
-        "location": {
-            "geometry": {
-                "type": "Point", 
-                "coordinates": ["8.96127", "46.02723", "344.1"]
-                }, 
-            "crs": {
-                "type": "name", 
-                "properties": {"name": "EPSG:4326"}
-                }, 
-            "type": "Feature", 
-            "properties": {"name": "PIPPO"}
-            }, 
-        "outputs": [
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "constraint": {
-                "max": "", 
-                "interval": ["2013-01-01T00:10:00.000000+0100", "2013-02-05T00:00:00.000000+0100"], 
-                "role": "", 
-                "valuelist": "", 
-                "min": ""
-                }, 
-            "name": "Time", 
-            "uom": "", 
-            "description": ""
-            }, 
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall", 
-            "constraint": {
-                "max": "", 
-                "interval": "", 
-                "role": "", 
-                "valuelist": "", 
-                "min": ""
-                }, 
-            "name": "air-rainfall", 
-            "uom": "mm", 
-            "description": ""
-            }
-        ], 
-        "system_id": "PIPPO", 
-        "history": []
-        }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/procedures',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_procedures_name_GET(pp):
-    print "services/{name}/procedures/{name}, GET"
-    
-    dbname = 'demo'
-    pname = 'PIPPO'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/procedures/' + pname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_procedures_name_PUT(pp):
-    print "services/{name}/procedures/{name}, PUT"
-    
-    dbname = "demo"
-    pname = 'PIPPO'
-    
-    put = {
-        "inputs": [], 
-        "description": "temperature weather station in Usmate Carate", 
-        "classification": [
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:systemType", 
-            "name": "System Type", 
-            "value": "insitu-fixed-point"
-            }, 
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:sensorType", 
-            "name": "Sensor Type", 
-            "value": "tipping bucket rain gauge"
-            }
-        ], 
-        "characteristics": "", 
-        "interfaces": "", 
-        "keywords": "weather,meteorological,IST, test", 
-        "contacts": [], 
-        "assignedSensorId": "6ecb65065eccaac8967089df62c81a24", 
-        "documentation": [], 
-        "system": "PIPPO", 
-        "capabilities": [], 
-        "identification": [], 
-        "location": {
-            "geometry": {
-                "type": "Point", 
-                "coordinates": ["8.96127", "46.02723", "344.1"]
-                }, 
-            "crs": {
-                "type": "name", 
-                "properties": {"name": "EPSG:4326"}
-                }, 
-            "type": "Feature", 
-            "properties": {"name": "PIPPO"}
-            }, 
-        "outputs": [
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "constraint": {
-                "max": "", 
-                "interval": ["2013-01-01T00:10:00.000000+0100", "2013-02-05T00:00:00.000000+0100"], 
-                "role": "", 
-                "valuelist": "", 
-                "min": ""
-                }, 
-            "name": "Time", 
-            "uom": "", 
-            "description": ""
-            }, 
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall", 
-            "constraint": {
-                "max": "", 
-                "interval": "", 
-                "role": "", 
-                "valuelist": "", 
-                "min": ""
-                }, 
-            "name": "air-rainfall", 
-            "uom": "mm", 
-            "description": ""
-            }
-        ], 
-        "system_id": "PIPPO", 
-        "history": []
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/procedures/' + pname,
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_procedures_name_DELETE(pp):
-    print "services/{name}/procedures/{name}, DELETE"
-    
-    dbname = "demo"
-    pname = 'PIPPO'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/procedures/' + pname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_procedures_operations_getlist_GET(pp):
-    print "services/{name}/procedures/operations/getlist, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/procedures/operations/getlist',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_offerings_GET(pp):
-    print "services/{name}/offerings, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_offerings_POST(pp):
-    print "services/{name}/offerings, POST"
-    
-    dbname = 'demo'
-    
-    post = {
-        "description": "temporary offering to hold self-registered procedures/sensors waiting for service adimistration acceptance", 
-        "expiration": "", 
-        "active": True, 
-        "procedures": 4, 
-        "id": 1, 
-        "name": "piripicchio"
-        }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_offerings_name_GET(pp):
-    print "services/{name}/offerings/{name}, GET"
-    
-    dbname = 'demo'
-    oname = 'piripicchio'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/' + oname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_offerings_name_PUT(pp):
-    print "services/{name}/offerings/{name}, PUT"
-    
-    dbname = "demo"
-    oname = 'piripicchio'
-    
-    put = {
-        "description": "blablabla", 
-        "expiration": "", 
-        "active": True, 
-        "procedures": 0, 
-        "id": 2, 
-        "name": "piripicchio"}
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/' + oname,
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_offerings_name_DELETE(pp):
-    print "services/{name}/offerings/{name}, DELETE"
-    
-    dbname = "demo"
-    oname = 'piripicchio'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/' + oname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_offerings_name_procedures_GET(pp):
-    print "services/{name}/offerings/{name}/procedures, GET"
-    
-    dbname = 'demo'
-    oname = 'temporary'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/' + oname + '/procedures',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_offerings_name_procedures_operations_memberlist_GET(pp):
-    print "services/{name}/offerings/{name}/procedures/operations/membelist, GET"
-    
-    dbname = 'demo'
-    oname = 'temporary'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/' + oname + '/procedures/operations/memberlist',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_offerings_name_procedures_operations_nonmemberlist_GET(pp):
-    print "services/{name}/offerings/{name}/procedures/operations/nonmemberlist, GET"
-    
-    dbname = 'demo'
-    oname = 'temporary'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/' + oname + '/procedures/operations/nonmemberlist',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-    
-def services_name_offerings_operations_getlist_GET(pp):
-    print "services/{name}/offerings/operations/getlist, GET"
-    
-    dbname = 'demo'
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/offerings/operations/getlist',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_operations_getobservation_offerings_name_procedures_GET(pp):
-    print "services/{name}/operations/getobservation/offerings/{name}/procedures/..., GET"
-    
-    dbname = 'demo'
-    oname = 'temporary'
-    pname = 'BELLINZONA'
-    obprop = 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature'
-    start = '2013-01-01T00:10:00.000000+0100'
-    end = '2013-01-05T00:00:00.000000+0100'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/operations/getobservation/offerings/' + oname + '/procedures/' + pname + '/observedproperties/' + obprop + '/eventtime/' + start + '/' + end,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_operations_insertobservation_POST(pp):
-    print "services/{name}/operations/insertobservation, POST"
-    
-    dbname = 'demo'    
-    
-    post = {
-    "name": "BELLINZONA", 
-    "samplingTime": {
-        "duration": "P34DT23H50M", 
-        "beginPosition": "2013-01-01T00:10:00.000000+0100", 
-        "endPosition": "2013-02-05T00:00:00.000000+0100"
-        }, 
-    "result": {
-        "DataArray": {
-            "elementCount": "3", 
-            "values": [
-                ["2013-01-01T00:20:00.000000+0100", "20", "100"], 
-                ["2013-01-01T00:30:00.000000+0100", "20", "100"], 
-                ["2013-01-01T00:40:00.000000+0100", "20", "100"], 
-                ["2013-01-01T00:50:00.000000+0100", "20", "100"], 
-                ["2013-01-01T01:00:00.000000+0100", "20", "100"]
-            ], 
-            "field": [
-                {
-                "definition": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-                "name": "Time"
-                }, 
-                {
-                "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature", 
-                "name": "air-temperature", 
-                "uom": "\u00b0C"
-                }, 
-                {"definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature:qualityIndex", 
-                 "name": "air-temperature:qualityIndex", 
-                 "uom": "-"
-                 }
-            ]
-        }
-    }, 
-    "featureOfInterest": {
-        "geom": "<gml:Point srsName='EPSG:21781'><gml:coordinates>722032.159653624286875,118091.771747849488747,176.382462739521088</gml:coordinates></gml:Point>", 
-        "name": "urn:ogc:def:feature:x-istsos:1.0:Point:BELLINZONA"
-        }, 
-    "observedProperty": {
-        "component": [
-            "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature", 
-            "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature:qualityIndex"
-            ], 
-        "CompositePhenomenon": {
-            "dimension": "3", 
-            "id": "comp_5", 
-            "name": "timeSeriesOfObservations"
-            }, 
-        "components": [
-            "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature", 
-            "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature:qualityIndex"
-            ]
-        }, 
-    "procedure": "urn:ogc:def:procedure:x-istsos:1.0:BELLINZONA"
-    }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/operations/insertobservation',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_observedproperties_GET(pp):
-    print "services/{name}/observedproperties, GET"
-    
-    dbname = 'demo'
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/observedproperties',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_observedproperties_POST(pp):
-    print "services/{name}/observedproperties, POST"
-    
-    dbname = 'demo'    
-    
-    post = {
-        "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:LOVEisintheAIR", 
-        "procedures": ["P_LUGANO", "LOCARNO"], 
-        "name": "LoveIsInTheAir", 
-        "description": "liquid precipitation or snow water equivalent"
-        }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/observedproperties',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_observedproperties_name_GET(pp):
-    print "services/{name}/observedproperties/{name}, GET"
-    
-    dbname = 'demo'
-    oname = 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:LOVEisintheAIR'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/observedproperties/' + oname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_observedproperties_name_PUT(pp):
-    print "services/{name}/observedproperties/{name}, PUT"
-    
-    dbname = "demo"
-    oname = 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:LOVEisintheAIR'
-    
-    put = {
-        "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:LoveIsInTheAir", 
-        "procedures": [], 
-        "name": "LoveIsInTheAir", 
-        "description": "liquid precipitation or snow water equivalent"}
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/observedproperties/' + oname,
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_observedproperties_name_DELETE(pp):
-    print "services/{name}/observedproperties/{name}, DELETE"
-    
-    dbname = "demo"
-    oname = 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:LoveIsInTheAir'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/observedproperties/' + oname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_uoms_GET(pp):
-    print "services/{nome}/uoms, GET"
-    
-    dbname = 'demo'    
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/uoms',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_uoms_POST(pp):
-    print "services/{nome}/uoms, POST"
-    
-    dbname = 'demo'
-    
-    post = {
-        "procedures": ["LOCARNO"], 
-        "name": "am",
-        "description": "Love is in the air"
-        }
-    
-    res = requests.post(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/uoms',
-        data=json.dumps(post),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_uoms_name_GET(pp):
-    print "services/{name}/uoms/{name}, GET"
-    
-    dbname = 'demo'
-    oname = 'test'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/uoms/' + oname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_uoms_name_PUT(pp):
-    print "services/{name}/uoms/{name}, PUT"
-    
-    dbname = "demo"
-    oname = 'am'
-    
-    put = {
-        "procedures": [], 
-        "name": "love", 
-        "description": "Love is in the air yesss"
-        }
-    
-    res = requests.put(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/uoms/' + oname,
-        data=json.dumps(put),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_uoms_name_DELETE(pp):
-    print "services/{name}/uoms/{name}, DELETE"
-    
-    dbname = "demo"
-    oname = 'test'
-    
-    res = requests.delete(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/uoms/' + oname,
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)
-    print "\n ************************************ \n"
-    
-def services_name_epsgs_GET(pp):
-    print "services/{name}/epsgs, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/epsgs',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
-    
-def services_name_systemtypes_GET(pp):
-    print "services/{name}/systemtypes, GET"
-    
-    dbname = 'demo'
-    
-    res = requests.get(
-        'http://localhost/istsos/wa/istsos/services/' + dbname + '/systemtypes',
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-        
-    pp.pprint(res.json)   
-    
-    print "\n ************************************ \n"
\ No newline at end of file
diff --git a/test/put.py b/test/put.py
deleted file mode 100755
index 1fd2b65..0000000
--- a/test/put.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import json
-import lib.requests as requests
-
-def PUT(fname, sput, address):
-    
-    #print fname + ', PUT'
-    
-    res = requests.put(
-        address,
-        data=json.dumps(sput),
-        prefetch=True
-    )
-    
-    try:
-        res.raise_for_status() # raise exception if som comunication error occured    
-    except Exception as e:
-        print str(e)
-    
-    return res.json
-    
-def services_name_uoms_name_PUT(sname, uname, put):
-    
-    fname = '/istsos/services/{name}/uoms/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/uoms/' + uname
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_PUT(put, sname):
-    
-    fname = '/istsos/services/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_procedures_name_PUT(sname, pname, put):
-    
-    fname = '/istsos/services/{name}/procedures/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/procedures/' + pname
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def operations_initialization_PUT(put):
-    
-    fname = '/istsos/operations/initialization'
-    address = 'http://localhost/istsos/wa/istsos/operations/initialization'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_offerings_name_PUT(sname, oname, put):
-    
-    fname = '/istsos/services/{name}/offerings/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/offerings/' + oname
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_observedproperties_name_PUT(sname, oname, put):
-    
-    fname = '/istsos/services/{name}/observedproperties/{name}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/observedproperties/' + oname
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_dataqualities_code_PUT(sname, put, qualcode):
-    
-    fname = '/istsos/services/{name}/dataqualities/{code}'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/dataqualities/' + qualcode
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_getobservation_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections/getobservation'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/getobservation'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_identification_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections/identification'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/identification'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_geo_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections/geo'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/geo'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_connection_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections/connection'    
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/connection'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_serviceurl_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections/serviceurl'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/serviceurl'
-    
-    result = PUT(fname, put, address)
-    return result
-    
-def services_name_configsections_provider_PUT(sname, put):
-    
-    fname = '/istsos/services/{name/default}/configsections/provider'
-    address = 'http://localhost/istsos/wa/istsos/services/' + sname + '/configsections/provider'
-    
-    result = PUT(fname, put, address)
-    return result
\ No newline at end of file
diff --git a/test/scripts/__init__.py b/test/scripts/__init__.py
deleted file mode 100755
index d20ce61..0000000
--- a/test/scripts/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-__all__ = [ "testConverter", "importvp"]
diff --git a/test/scripts/data/soglie_QC0_2013.txt b/test/scripts/data/soglie_QC0_2013.txt
deleted file mode 100755
index 4aa9356..0000000
--- a/test/scripts/data/soglie_QC0_2013.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-P_OLI,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_BED,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_FUS_PAE,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_FRA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_LOD,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_GNO,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_MAG,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CAM_DOG,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_ISO,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_MEN,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CHIA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_ARO,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_GIUB,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_SOM,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CVM,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CAM,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_LUZ,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_NOV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CAV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CAR,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_COL,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_TRE,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_PON,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_GRA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_CAL,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_SON,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-P_BIA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,40
-A_GNO_GNO,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2
-A_BON_QUA,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3
-A_LAV_RSV,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_SAL_MAG,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,5
-A_CAL_AIR,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2
-A_VED_ISO,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_MAR_MAR,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3
-A_TIC_BED,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,4
-A_LAV_MEN,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_SCA_LUG,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_VVED_AGN,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_BOL_PTC,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3
-A_CUC_POR,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_ROV_CVM1,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_ROV_CVM2,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3
-A_ROV_CVM3,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3
-A_MAG_LOD,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,7
-A_MUZ_MUZ,urn:ogc:def:parameter:x-istsos:1.0:lake:water:height,337,339
-A_AETCAN_AIR,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3
-A_SBIB_PON,urn:ogc:def:parameter:x-istsos:1.0:spring:water:height,0,1
-A_RMUL_ARB,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,1
-A_MOR_GIU,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,3.5
-A_CFER_ARO,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,1
-A_MAR_MAR2,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2.5
-A_RMUL_MAR,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,1
-A_TRA_ARB_FFS1,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,2
-A_TRA_ARB_FFS2,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,0,1
-A_BOL_PTC_LAM,urn:ogc:def:parameter:x-istsos:1.0:river:water:height,-0.2,1
-T_ISO,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_NOV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_CAV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_CAR,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_COL,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_TRE,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_PON,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_GRA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_CAL,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_SON,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_BIA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_CHIA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-T_CAM_DOG,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature,-20,45
-H_NOV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity,1,100
-H_CAV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity,1,100
-H_TRE,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity,1,100
-H_BIA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity,1,100
-H_CHIA,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:relative_humidity,1,100
-B_TRE,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:pressure,900,1020
-R_CAV,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:radiation,-10,1300
-WT_GNO_GNO,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_BON_QUA,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_LAV_RSV,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_SAL_MAG,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_CAL_AIR,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_VED_ISO,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_MAR_MAR,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_TIC_BED,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_LAV_MEN,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_SCA_LUG,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_VVED_AGN,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_BOL_PTC,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_CUC_POR,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_MUZ_MUZ,urn:ogc:def:parameter:x-istsos:1.0:lake:water:temperature,-5,35
-WT_TRA_ARB_FFS1,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_MOR_GIU,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_ROV_CVM2,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_MAG_CEV,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_ROV_CVM1,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-WT_ROV_CVM3,urn:ogc:def:parameter:x-istsos:1.0:river:water:temperature,-5,35
-W_PON,urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall,0,650
diff --git a/test/walib/__init__.py b/test/walib/__init__.py
deleted file mode 100755
index 89a9d4d..0000000
--- a/test/walib/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-__all__ = [ "istsos" ]
\ No newline at end of file
diff --git a/test/walib/istsos/__init__.py b/test/walib/istsos/__init__.py
deleted file mode 100755
index ed4caed..0000000
--- a/test/walib/istsos/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = ["services"]
diff --git a/test/walib/istsos/services/__init__.py b/test/walib/istsos/services/__init__.py
deleted file mode 100755
index 28eb19e..0000000
--- a/test/walib/istsos/services/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__all__ = ["sosRequests","configsections", "dataqualities", "epsgs", "observedproperties", "offerings", "operations", "procedures", "systemtypes", "uoms", "services"]
diff --git a/test/walib/istsos/services/configsections.py b/test/walib/istsos/services/configsections.py
deleted file mode 100755
index aa45bd9..0000000
--- a/test/walib/istsos/services/configsections.py
+++ /dev/null
@@ -1,1052 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-def deldic(d, k):
-    c = d.copy()
-    for el in k:
-        if type(el) == list:
-            del c[el[0]][el[1]]
-        else:
-            del c[el]
-    return c
-
-def test_configsections(doc):
-    #services_name_configsections_GET(sname)
-    #services_name_configsections_PUT(sname, put)
-    #services_name_configsections_DELETE(sname)
-    #services_name_configsections_getobservation_GET(sname)
-    #services_name_configsections_getobservation_PUT(sname, putob)
-    #services_name_configsections_getobservation_DELETE(sname)
-    #services_name_configsections_identification_GET(sname)
-    #services_name_configsections_identification_PUT(sname, putid)
-    #services_name_configsections_identification_DELETE(sname)
-    #services_name_configsections_geo_GET(sname)
-    #services_name_configsections_geo_PUT(sname, putgeo)
-    #services_name_configsections_geo_DELETE(sname)
-    #services_name_configsections_connection_GET(sname)
-    #services_name_configsections_connection_PUT(sname, putcon)
-    #services_name_configsections_connection_operations_validatedb_GET(sname)
-    #services_name_configsections_serviceurl_GET(sname)
-    #services_name_configsections_serviceurl_PUT(sname, putsrv)
-    #services_name_configsections_serviceurl_DELETE(sname)
-    #services_name_configsections_provider_GET(sname)
-    #services_name_configsections_provider_PUT(sname, putpro)
-    #services_name_configsections_provider_DELETE(sname)
-    
-    doc.write('\n\n-----------------CONFIGSECTIONS---------------------')
-    
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-        
-    put = {
-        "getobservation": {
-            #"default": True, 
-            "maxgoperiod": "200", 
-            "aggregatenodataqi": "-100", 
-            "defaultqi": "100", 
-            "aggregatenodata": "-999.9",
-            "correct_qi" : "110",
-            "stat_qi" : "200",
-            "transactional_log" : "True"
-            }, 
-        "urn": {
-            "process": "urn:ogc:def:process:x-istsos:1.0:", 
-            "property": "urn:ogc:def:property:x-istsos:1.0:", 
-            "offering": "urn:ogc:def:offering:x-istsos:1.0:", 
-            #"default": True, 
-            "sensor": "urn:ogc:def:sensor:x-istsos:1.0:", 
-            "phenomena": "urn:ogc:def:phenomenon:x-istsos:1.0:", 
-            "feature": "urn:ogc:def:feature:x-istsos:1.0:", 
-            "sensorType": "urn:ogc:def:sensorType:x-istsos:1.0:", 
-            "dataType": "urn:ogc:def:dataType:x-istsos:1.0:", 
-            "role": "urn:role:x-istsos:1.0:", 
-            "refsystem": "urn:ogc:crs:EPSG:", 
-            "time": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "keywords": "urn:ogc:def:keywords:x-istsos:1.0:", 
-            "identifier": "urn:ogc:def:identifier:x-istsos:1.0:", 
-            "parameter": "urn:ogc:def:parameter:x-istsos:1.0:", 
-            "procedure": "urn:ogc:def:procedure:x-istsos:1.0:"
-            }, 
-        "connection": {
-            #"default": True, 
-            "dbname": "istsos", 
-            "host": "localhost", 
-            "user": "postgres", 
-            "password": "postgres", 
-            "port": "5432"
-            }, 
-        "identification": {
-            "title": "IST Sensor Observation Service 1", 
-            #"default": False, 
-            "abstract": "hydro-meteorological monitoring network", 
-            "urnversion": "1.0", 
-            "authority": "x-istsos", 
-            "fees": "NONE", 
-            "keywords": "SOS,IST,SUPSI", 
-            "accessconstrains": "NONE"
-            }, 
-        "serviceurl": {
-            #"default": True, 
-            "url": "http://localhost/istsos/test"
-            }, 
-        "provider": {
-            "contactcountry": "Switzerland", 
-            "providername": "Istituto Scienze della Terra", 
-            #"default": True, 
-            "contactposition": "Data manager", 
-            "contactvoice": "+41586666200", 
-            "contactadminarea": "Canton Ticino", 
-            "contactemail": "geoservice at supsi.ch", 
-            "contactdeliverypoint": "Campus Trevano", 
-            "contactname": "Team Geomatica", 
-            "contactpostalcode": "6952", 
-            "contactcity": "Canobbio", 
-            "providersite": "http://www.supsi.ch/ist", 
-            "contactfax": "+41000000000000"
-            }, 
-        "geo": {
-            "zaxisname": "altitude", 
-            #"default": True, 
-            "xaxisname": "easting", 
-            "yaxisname": "northing", 
-            "allowedepsg": "4326,3857", 
-            "istsosepsg": "21781"
-            }
-        }     
-        
-    putob = {
-        #"default": False, 
-        "maxgoperiod": "600", 
-        "aggregatenodataqi": "-100", 
-        "defaultqi": "100", 
-        "aggregatenodata": "-999.9",
-        "correct_qi" : "110",
-        "stat_qi" : "200",
-        "transactional_log": "'True"
-        }
-        
-    putid = {
-        "title": "IST Sensor Observation Service 1", 
-        #"default": False, 
-        "abstract": "hydro-meteorological monitoring network", 
-        "urnversion": "1.0", 
-        "authority": "x-istsos", 
-        "fees": "YUP, sure", 
-        "keywords": "SOS,IST,SUPSI, test", 
-        "accessconstrains": "NONE"}
-        
-    putgeo = {
-        "zaxisname": "altitude", 
-        #"default": False, 
-        "xaxisname": "easting", 
-        "yaxisname": "northing_u", 
-        "allowedepsg": "4326,3857", 
-        "istsosepsg": "21781"
-        }
-        
-    putcon = {
-        #"default": False, 
-        "dbname": "istsos", 
-        "host": "localhost", 
-        "user": "postgres", 
-        "password": "postgres", 
-        "port": "5432"
-        }
-        
-    putsrv = {
-        #"default": True, 
-        "url": "http://localhost/istsos/test"
-        }
-    
-    putpro = {
-        "contactcountry": "SwitzerlandCH", 
-        "providername": "South Hampton Institute of Technology", 
-        #"default": False, 
-        "contactposition": "Data manager", 
-        "contactvoice": "+41586666200", 
-        "contactadminarea": "Canton Ticino", 
-        "contactemail": "geoservice at supsi.ch", 
-        "contactdeliverypoint": "Campus Trevano", 
-        "contactname": "Team Geomatica", 
-        "contactpostalcode": "6952", 
-        "contactcity": "Canobbio", 
-        "providersite": "http://www.supsi.ch/ist", 
-        "contactfax": "+41586666209"
-        }
-        
-    success_get = False
-    success_put = False
-    success_del = False
-    success_getob = False
-    success_putob = False
-    success_delob = False
-    success_getid = False
-    success_putid = False
-    success_delid = False
-    success_getgeo = False
-    success_putgeo = False
-    success_delgeo = False
-    success_getcon = False
-    success_putcon = False
-    success_getconop = False
-    success_getsrv = False
-    success_putsrv = False
-    success_delsrv = False
-    success_getpro = False
-    success_putpro = False
-    success_delpro = False
-    
-    get1 = tget.services_name_configsections_GET(sname)
-    time.sleep(1)
-    get2 = tget.services_name_configsections_GET(sname)
-    put1 = tput.services_name_configsections_PUT(sname, put)
-    get3 = tget.services_name_configsections_GET(sname)
-    delete1 = tdelete.services_name_configsections_DELETE(sname)
-    get4 = tget.services_name_configsections_GET(sname)
-    
-    getob1 = tget.services_name_configsections_getobservation_GET(sname)
-    time.sleep(1)
-    getob2 = tget.services_name_configsections_getobservation_GET(sname)
-    putob1 = tput.services_name_configsections_getobservation_PUT(sname, putob)
-    getob3 = tget.services_name_configsections_getobservation_GET(sname)
-    deleteob1 = tdelete.services_name_configsections_getobservation_DELETE(sname)
-    getob4 = tget.services_name_configsections_getobservation_GET(sname)
-    
-    getid1 = tget.services_name_configsections_identification_GET(sname)
-    time.sleep(1)
-    getid2 = tget.services_name_configsections_identification_GET(sname)
-    putid1 = tput.services_name_configsections_identification_PUT(sname, putid)
-    getid3 = tget.services_name_configsections_identification_GET(sname)
-    deleteid1 = tdelete.services_name_configsections_identification_DELETE(sname)
-    getid4 = tget.services_name_configsections_identification_GET(sname)
-    
-    getgeo1 = tget.services_name_configsections_geo_GET(sname)
-    time.sleep(1)
-    getgeo2 = tget.services_name_configsections_geo_GET(sname)
-    putgeo1 = tput.services_name_configsections_geo_PUT(sname, putgeo)
-    getgeo3 = tget.services_name_configsections_geo_GET(sname)
-    deletegeo1 = tdelete.services_name_configsections_geo_DELETE(sname)
-    getgeo4 = tget.services_name_configsections_geo_GET(sname)
-    
-    getcon1 = tget.services_name_configsections_connection_GET(sname)
-    time.sleep(1)
-    getcon2 = tget.services_name_configsections_connection_GET(sname)
-    putcon1 = tput.services_name_configsections_connection_PUT(sname, putcon)
-    getcon3 = tget.services_name_configsections_connection_GET(sname)
-    
-    getcon4 = tget.services_name_configsections_connection_operations_validatedb_GET(sname)
-    time.sleep(1)
-    getcon5 = tget.services_name_configsections_connection_operations_validatedb_GET(sname)
-    
-    getpro1 = tget.services_name_configsections_provider_GET(sname)
-    time.sleep(1)
-    getpro2 = tget.services_name_configsections_provider_GET(sname)
-    putpro1 = tput.services_name_configsections_provider_PUT(sname, putpro)
-    getpro3 = tget.services_name_configsections_provider_GET(sname)
-    deletepro1 = tdelete.services_name_configsections_provider_DELETE(sname)
-    getpro4 = tget.services_name_configsections_provider_GET(sname)
-    
-    getsrv1 = tget.services_name_configsections_serviceurl_GET(sname)
-    time.sleep(1)
-    getsrv2 = tget.services_name_configsections_serviceurl_GET(sname)
-    putsrv1 = tput.services_name_configsections_serviceurl_PUT(sname, putsrv)
-    getsrv3 = tget.services_name_configsections_serviceurl_GET(sname)
-    deletesrv1 = tdelete.services_name_configsections_serviceurl_DELETE(sname)
-    getsrv4 = tget.services_name_configsections_serviceurl_GET(sname)
-    
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #configsections
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('services_name_configsections_GET: SUCCESS')
-            success_get = True
-        else:
-            doc.write('services_name_configsections_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-    else:
-        doc.write('services_name_configsections_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-        
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get2 == get3:
-            doc.write('services_name_configsections_PUT: FAILED')
-            doc.write('\n\nservices_name_configsections_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            temp = deldic(get3['data'], [['getobservation','default'],['urn','default'],['connection','default'],['identification','default'],['serviceurl','default'],['provider','default'],['geo','default']])
-            if (temp['getobservation'] == put['getobservation'] 
-                and temp['urn'] == put['urn'] 
-                and temp['connection'] == put['connection'] 
-                and temp['identification'] == put['identification'] 
-                and temp['serviceurl'] == put['serviceurl'] 
-                and temp['provider'] == put['provider'] 
-                and temp['geo'] == put['geo']
-                ):
-                doc.write('services_name_configsections_PUT: SUCCESS')
-                success_put = True
-            else:
-                doc.write('services_name_configsections_PUT: FAILED')
-                doc.write('\n\nservices_name_configsections_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_PUT: FAILED')
-        doc.write('\n\nservices_name_configsections_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-        
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get3 == get4:
-            doc.write('services_name_configsections_DELETE: FAILED')
-            doc.write('\n\nservices_name_configsections_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get4))
-        #For the success, second get should be void
-        else:
-            if get4['total'] == get3['total'] - 1:
-                #print 'the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_DELETE: SUCCESS')
-                success_del = True
-            else:
-                doc.write('services_name_configsections_DELETE: FAILED')
-                doc.write('\n\nservices_name_configsections_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(delete1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_DELETE: FAILED')
-        doc.write('\n\nservices_name_configsections_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get4))
-        
-            
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #observations
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if getob1['success'] and getob2['success']:
-        if getob1 == getob2:
-            doc.write('services_name_configsections_getobservation_GET: SUCCESS')
-            success_getob = True
-        else:
-            doc.write('services_name_configsections_getobservation_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_getobservation_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getob1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getob2))
-    else:
-        doc.write('services_name_configsections_getobservation_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_getobservation_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getob1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getob2))
-        
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if putob1['success']:
-        #If gets before and after are the same, failure
-        if getob2 == getob3:
-            doc.write('services_name_configsections_getobservation_PUTT: FAILED')
-            doc.write('\n\nservices_name_configsections_getobservation_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(putob1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getob2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getob3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (getob3['data']['maxgoperiod'] == putob['maxgoperiod']
-                #and getob3['data']['default'] == putob['default']
-                and getob3['data']['aggregatenodataqi'] == putob['aggregatenodataqi'] 
-                and getob3['data']['defaultqi'] == putob['defaultqi'] 
-                and getob3['data']['aggregatenodata'] == putob['aggregatenodata']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_getobservation_PUTT: SUCCESS')
-                success_putob = True
-            else:
-                doc.write('services_name_configsections_getobservation_PUTT: FAILED')
-                doc.write('\n\nservices_name_configsections_getobservation_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(putob1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getob2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getob3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_getobservation_PUTT: FAILED')
-        doc.write('\n\nservices_name_configsections_getobservation_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(putob1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getob2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getob3))
-        
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if deleteob1['success']:
-        #If gets before and after are the same, failure
-        if getob3 == getob4:
-            doc.write('services_name_configsections_getobservations_DELETE: FAILED')
-            doc.write('\n\nservices_name_configsections_getobservations_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(deleteob1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getob3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getob4))
-        #For the success, second get should be void
-        else:
-            if getob4['total'] <= getob3['total'] and getob4['data']['default']:
-                doc.write('services_name_configsections_getobservations_DELETE: SUCCESS')
-                success_delob = True
-            else:
-                doc.write('services_name_configsections_getobservations_DELETE: FAILED')
-                doc.write('\n\nservices_name_configsections_getobservations_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(deleteob1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getob3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getob4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_getobservations_DELETE: FAILED')
-        doc.write('\n\nservices_name_configsections_getobservations_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(deleteob1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getob3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getob4))
-        
-            
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #identification
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if getid1['success'] and getid2['success']:
-        if getid1 == getid2:
-            doc.write('services_name_configsections_identificaiton_GET: SUCCESS')
-            success_getid = True
-        else:
-            doc.write('services_name_configsections_identificaiton_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_identificaiton_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getid1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getid2))
-    else:
-        doc.write('services_name_configsections_identificaiton_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_identification_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getid1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getid2))
-        
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if putid1['success']:
-        #If gets before and after are the same, failure
-        if getid2 == getid3:
-            doc.write('services_name_configsections_identification_PUT: FAILED')
-            doc.write('\n\nservices_name_configsections_identification_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(putid1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getid2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getid3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (getid3['data']['title'] == putid['title'] 
-                #and getid3['data']['default'] == putid['default'] 
-                and getid3['data']['abstract'] == putid['abstract'] 
-                and getid3['data']['urnversion'] == putid['urnversion'] 
-                and getid3['data']['authority'] == putid['authority'] 
-                and getid3['data']['fees'] == putid['fees'] 
-                and getid3['data']['keywords'] == putid['keywords'] 
-                and getid3['data']['accessconstrains'] == putid['accessconstrains']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_identification_PUT: SUCCESS')
-                success_putid = True
-            else:
-                doc.write('services_name_configsections_identification_PUT: FAILED')
-                doc.write('\n\nservices_name_configsections_identification_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(putid1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getid2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getid3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_identification_PUT: FAILED')
-        doc.write('\n\nservices_name_configsections_identification_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(putid1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getid2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getid3))
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if deleteid1['success']:
-        #If gets before and after are the same, failure
-        if getid3 == getid4:
-            doc.write('services_name_configsections_identification_DELETE: FAILED')
-            doc.write('\n\nservices_name_configsections_identification_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(deleteid1))     
-            doc.write('\nGet, before:\idn')
-            doc.write(pp.pformat(get3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getid4))
-        #For the success, second get should be void
-        else:
-            if getid4['total'] <= getid3['total'] and getid4['data']['default']:
-                doc.write('services_name_configsections_identification_DELETE: SUCCESS')
-                success_delid = True
-            else:
-                doc.write('services_name_configsections_identification_DELETE: FAILED')
-                doc.write('\n\nservices_name_configsections_identification_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(deleteid1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getid3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getid4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_identification_DELETE: FAILED')
-        doc.write('\n\nservices_name_configsections_identification_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(deleteid1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getid3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getid4))
-        
-            
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #geo
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if getgeo1['success'] and getgeo2['success']:
-        if getgeo1 == getgeo2:
-            doc.write('services_name_configsections_geo_GET: SUCCESS')
-            success_getgeo = True
-        else:
-            doc.write('services_name_configsections_geo_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_geo_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getgeo1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getgeo2))
-    else:
-        doc.write('services_name_configsections_geo_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_geo_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getgeo1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getgeo2))
-        
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if putgeo1['success']:
-        #If gets before and after are the same, failure
-        if getgeo2 == getgeo3:
-            doc.write('services_name_configsections_geo_PUT: FAILED')
-            doc.write('\n\nservices_name_configsections_geo_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(putgeo1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getgeo2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getgeo3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (getgeo3['data']['zaxisname'] == putgeo['zaxisname'] 
-                #and getgeo3['data']['default'] == putgeo['default'] 
-                and getgeo3['data']['xaxisname'] == putgeo['xaxisname'] 
-                and getgeo3['data']['yaxisname'] == putgeo['yaxisname'] 
-                and getgeo3['data']['allowedepsg'] == putgeo['allowedepsg'] 
-                and getgeo3['data']['istsosepsg'] == putgeo['istsosepsg']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_geo_PUT: SUCCESS')
-                success_putgeo = True
-            else:
-                doc.write('services_name_configsections_geo_PUT: FAILED')
-                doc.write('\n\nservices_name_configsections_geo_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(putgeo1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getgeo2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getgeo3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_geo_PUT: FAILED')
-        doc.write('\n\nservices_name_configsections_geo_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(putgeo1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getgeo2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getgeo3))
-             
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if deletegeo1['success']:
-        #If gets before and after are the same, failure
-        if getgeo3 == getgeo4:
-            doc.write('services_name_configsections_geo_DELETE: FAILED')
-            doc.write('\n\nservices_name_configsections_geo_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(deletegeo1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getgeo3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getgeo4))
-        #For the success, second get should be void
-        else:
-            if getgeo4['total'] <= getgeo3['total'] and getgeo4['data']['default']:
-                doc.write('services_name_configsections_geo_DELETE: SUCCESS')
-                success_delgeo = True
-            else:
-                doc.write('services_name_configsections_geo_DELETE: FAILED')
-                doc.write('\n\nservices_name_configsections_geo_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(deletegeo1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getgeo3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getgeo4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_geo_DELETE: FAILED')
-        doc.write('\n\nservices_name_configsections_geo_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(deletegeo1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getgeo3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getgeo4))
-        
-            
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #serviceurl
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if getsrv1['success'] and getsrv2['success']:
-        if getsrv1 == getsrv2:
-            doc.write('services_name_configsections_serviceurl_GET: SUCCESS')
-            success_getsrv = True
-        else:
-            doc.write('services_name_configsections_serviceurl_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_serviceurl_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getsrv1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getsrv2))
-    else:
-        doc.write('services_name_configsections_serviceurl_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_serviceurl_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getsrv1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getsrv2))
-        
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if putsrv1['success']:
-        #If gets before and after are the same, failure
-        if getsrv2 == getsrv3:
-            doc.write('services_name_configsections_serviceurl_PUT: FAILED')
-            doc.write('\n\nservices_name_configsections_serviceurl_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(putsrv1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getsrv2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getsrv3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (getsrv3['data']['url'] == putsrv['url']
-                #and getsrv3['data']['default'] == putsrv['default']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_serviceurl_PUT: SUCCESS')
-                success_putsrv = True
-            else:
-                doc.write('services_name_configsections_serviceurl_PUT: FAILED')
-                doc.write('\n\nservices_name_configsections_serviceurl_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(putsrv1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getsrv2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getsrv3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_serviceurl_PUT: FAILED')
-        doc.write('\n\nservices_name_configsections_serviceurl_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(putsrv1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getsrv2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getsrv3))
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if deletesrv1['success']:
-        #If gets before and after are the same, failure
-        if getsrv3 == getsrv4:
-            doc.write('services_name_configsections_serviceurl_DELETE: FAILED')
-            doc.write('\n\nservices_name_configsections_serviceurl_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(deletesrv1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getsrv3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getsrv4))
-        #For the success, second get should be void
-        else:
-            if getsrv4['total'] <= getsrv3['total'] and getsrv4['data']['default']:
-                doc.write('services_name_configsections_serviceurl_DELETE: SUCCESS')
-                success_delsrv = True
-            else:
-                doc.write('services_name_configsections_serviceurl_DELETE: FAILED')
-                doc.write('\n\nservices_name_configsections_serviceurl_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(deletesrv1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getsrv3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getsrv4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_serviceurl_DELETE: FAILED')
-        doc.write('\n\nservices_name_configsections_serviceurl_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(deletesrv1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getsrv3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getsrv4))
-            
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #provider
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if getpro1['success'] and getpro2['success']:
-        if getpro1 == getpro2:
-            doc.write('services_name_configsections_provider_GET: SUCCESS')            
-            success_getpro = True
-        else:
-            doc.write('services_name_configsections_provider_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_provider_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getpro1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getpro2))
-    else:
-        doc.write('services_name_configsections_provider_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_provider_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getpro1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getpro2))
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if putpro1['success']:
-        #If gets before and after are the same, failure
-        if getpro2 == getpro3:
-            doc.write('services_name_configsections_provider_PUT: FAILED')
-            doc.write('\n\nservices_name_configsections_provider_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(putpro1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getpro2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getpro3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (getpro3['data']['contactcountry'] == putpro['contactcountry'] 
-                and getpro3['data']['providername'] == putpro['providername'] 
-                and getpro3['data']['contactposition'] == putpro['contactposition'] 
-                and getpro3['data']['contactvoice'] == putpro['contactvoice'] 
-                and getpro3['data']['contactadminarea'] == putpro['contactadminarea'] 
-                and getpro3['data']['contactemail'] == putpro['contactemail'] 
-                and getpro3['data']['contactdeliverypoint'] == putpro['contactdeliverypoint'] 
-                and getpro3['data']['contactname'] == putpro['contactname'] 
-                and getpro3['data']['contactpostalcode'] == putpro['contactpostalcode'] 
-                and getpro3['data']['contactcity'] == putpro['contactcity'] 
-                and getpro3['data']['providersite'] == putpro['providersite'] 
-                and getpro3['data']['contactfax'] == putpro['contactfax']
-                #and getpro3['data']['default'] == putpro['default']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_provider_PUT: SUCCESS')
-                success_putpro = True
-            else:
-                doc.write('services_name_configsections_provider_PUT: FAILED')
-                doc.write('\n\nservices_name_configsections_provider_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(putpro1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getpro2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getpro3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_provider_PUT: FAILED')
-        doc.write('\n\nservices_name_configsections_provider_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(putpro1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getpro2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getpro3))
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if deletepro1['success']:
-        #If gets before and after are the same, failure
-        if getpro3 == getpro4:
-            doc.write('services_name_configsections_provider_DELETE: FAILED')
-            doc.write('\n\nservices_name_configsections_provider_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(deletepro1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getpro3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getpro4))
-        #For the success, second get should be void
-        else:
-            if getpro4['total'] <= getpro3['total'] and getpro4['data']['default']:
-                #print 'the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_provider_DELETE: SUCCESS')
-                success_delpro = True
-            else:
-                doc.write('services_name_configsections_provider_DELETE: FAILED')
-                doc.write('\n\nservices_name_configsections_provider_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(deletepro1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getpro3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getpro4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_provider_DELETE: FAILED')
-        doc.write('\n\nservices_name_configsections_provider_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(deletepro1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getpro3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getpro4))
-            
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    #connection
-    #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-    
-    #Check for two successful requests to have the same result
-    if getcon1['success'] and getcon2['success']:
-        if getcon1 == getcon2:
-            doc.write('services_name_configsections_connection_GET: SUCCESS')
-            success_getcon = True
-        else:
-            doc.write('services_name_configsections_connection_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_connection_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getcon1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getcon2))
-    else:
-        doc.write('services_name_configsections_connection_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_connection_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getcon1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getcon2))
-    
-     
-    #Checks for the PUT to be successful by comparing two GETs
-    if putcon1['success']:
-        #If gets before and after are the same, failure
-        if getcon2 == getcon3:
-            doc.write('services_name_configsections_connection_PUT: FAILED')
-            doc.write('\n\nservices_name_configsections_connection_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(putcon1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(getcon2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(getcon3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (getcon3['data']['dbname'] == putcon['dbname'] 
-                and getcon3['data']['host'] == putcon['host'] 
-                and getcon3['data']['user'] == putcon['user'] 
-                and getcon3['data']['password'] == putcon['password'] 
-                and getcon3['data']['port'] == putcon['port']
-                #and getcon3['data']['default'] == putcon['default']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_configsections_connection_PUT: SUCCESS')
-                success_putcon = True
-            else:
-                doc.write('services_name_configsections_connection_PUT: FAILED')
-                doc.write('\n\nservices_name_configsections_connection_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(putcon1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(getcon2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(getcon3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_configsections_connection_PUT: FAILED')
-        doc.write('\n\nservices_name_configsections_connection_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(putcon1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(getcon2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(getcon3))    
-    
-    #Check for two successful requests to have the same result
-    if getcon4['success'] and getcon5['success']:
-        if getcon4 == getcon5:
-            doc.write('services_name_configsections_connection_operations_validatedb_GET: SUCCESS')
-            success_getconop = True
-        else:
-            doc.write('services_name_configsections_connection_operations_validatedb_GET: FAILED')
-            doc.write('\n\nservices_name_configsections_connection_operations_validatedb_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(getcon4))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(getcon5))
-    else:
-        doc.write('services_name_configsections_connection_operations_validatedb_GET: FAILED')
-        doc.write('\n\nservices_name_configsections_connection_operations_validatedb_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(getcon4))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(getcon5))
-    
-    result = {
-        'services_name_configsections_GET' : success_get,
-        'services_name_configsections_PUT' : success_put,
-        'services_name_configsections_DELETE' : success_del,
-        'services_name_configsections_getobservation_GET' : success_getob,
-        'services_name_configsections_getobservation_PUT' : success_putob,
-        'services_name_configsections_getobservation_DELETE' : success_delob,
-        'services_name_configsections_identification_GET' : success_getid,
-        'services_name_configsections_identification_PUT' : success_putid,
-        'services_name_configsections_identification_DELETE' : success_delid,
-        'services_name_configsections_geo_GET' : success_getgeo,
-        'services_name_configsections_geo_PUT' : success_putgeo,
-        'services_name_configsections_geo_DELETE' : success_delgeo,
-        'services_name_configsections_connection_GET' : success_getcon,
-        'services_name_configsections_connection_PUT' : success_putcon,
-        'services_name_configsections_connection_operations_validatedb_GET' : success_getconop,
-        'services_name_configsections_serviceurl_GET' : success_getsrv,
-        'services_name_configsections_serviceurl_PUT' : success_putsrv,
-        'services_name_configsections_serviceurl_DELETE' : success_delsrv,
-        'services_name_configsections_provider_GET' : success_getpro,
-        'services_name_configsections_provider_PUT' : success_putpro,
-        'services_name_configsections_provider_DELETE' : success_delpro,
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/dataqualities.py b/test/walib/istsos/services/dataqualities.py
deleted file mode 100755
index ab71741..0000000
--- a/test/walib/istsos/services/dataqualities.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-    
-def test_dataqualities(doc):
-    #services_name_dataqualities_GET(sname)
-    #services_name_dataqualities_POST(sname, post)
-    #services_name_dataqualities_code_GET(sname, qualcode)
-    #services_name_dataqualities_code_PUT(sname, put, qualcode)
-    #services_name_dataqualities_code_DELETE(sname, qualcode)
-    
-    doc.write('\nDATAQUALITIES\n-------------\n')
-    
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-    qualcode = '42'
-    post = {
-        "code": 42, 
-        "name": "the answer", 
-        "description": "Answer to the Ultimate Question of Life, the Universe, and Everything"}
-        
-    put = {
-        "code": 42, 
-        "name": "the answer", 
-        "description": "answer to the life, updated"}        
-        
-    success_get1 = False
-    success_post = False
-    success_get2 = False
-    success_put = False
-    success_delete = False
-    
-    get1 = tget.services_name_dataqualities_GET(sname)
-    time.sleep(1)
-    get2 = tget.services_name_dataqualities_GET(sname)
-    post1 = tpost.services_name_dataqualities_POST(sname, post)
-    get3 = tget.services_name_dataqualities_GET(sname)
-    
-    get4 = tget.services_name_dataqualities_code_GET(sname, qualcode)
-    time.sleep(1)
-    get5 = tget.services_name_dataqualities_code_GET(sname, qualcode)
-    put1 = tput.services_name_dataqualities_code_PUT(sname, put, qualcode)
-    get6 = tget.services_name_dataqualities_code_GET(sname, qualcode)
-    delete1 = tdelete.services_name_dataqualities_code_DELETE(sname, qualcode)
-    get7 = tget.services_name_dataqualities_code_GET(sname, qualcode)
-    get8 = tget.services_name_dataqualities_GET(sname)
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            success_get1 = True
-            doc.write('\n\nservices_name_dataqualities_GET: SUCCESS')
-        else:
-            doc.write('\n\nservices_name_dataqualities_GET: FAILED')
-            doc.write('\nThe results are not consistent\n')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-    else:
-        doc.write('\n\nservices_name_dataqualities_GET: FAILED')
-        doc.write('\n\nservices_name_dataqualities_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-        
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        #If gets before and after are the same, failure
-        if get1 == get3:
-            doc.write('\n\nservices_name_dataqualities_POST: FAILED')
-            doc.write('\n\nservices_name_dataqualities_POST: the data has not changed')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has same or less entries than first, failure
-        elif get3['total'] <= get1['total']:
-            doc.write('\n\nservices_name_dataqualities_POST: FAILED')
-            doc.write('\n\nservices_name_dataqualities_POST: post failed or deleted another entry')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has one more entry than first, look for the 
-        #inserted value. If found, success, else failure
-        elif get3['total'] == get1['total'] + 1:
-            for data in get3['data']:
-                if (data['name'] == post['name'] 
-                    and data['code'] == post['code'] 
-                    and data['description'] == post['description']
-                    ):
-                    #pp.pprint(get3)   
-                    #pp.pprint(post1)
-                    doc.write('\n\nservices_name_dataqualities_POST: SUCCESS')
-                    success_post = True
-                    break
-            if not success_post:
-                doc.write('\n\nservices_name_dataqualities_POST: FAILED')
-                doc.write('\n\nservices_name_dataqualities_POST: posted data does not correspond')
-                doc.write('\nPost:\n')
-                doc.write(pp.pformat(post1))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-        #if anything else wrong, failure
-        else:
-            doc.write('\n\nservices_name_dataqualities_POST: FAILED')
-            doc.write('\n\nservices_name_dataqualities_POST: something went wrong')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-    #If post not successful, failure
-    else:
-        doc.write('\n\nservices_name_dataqualities_POST: FAILED')
-        doc.write('\n\nservices_name_dataqualities_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-    
-    #Check for two successful requests to have the same result
-    if get4['success'] and get5['success']:
-        if get4 == get5:
-            #print 'the results are the same:\n'
-            #pp.pprint(get1)
-            doc.write('\n\nservices_name_dataqualities_code_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('\n\nservices_name_dataqualities_code_GET: FAILED')
-            doc.write('\n\nservices_name_dataqualities_code_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get4))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get5))
-    else:
-        doc.write('\n\nservices_name_dataqualities_code_GET: FAILED')
-        doc.write('\n\nservices_name_dataqualities_code_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get4))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get5))
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get5 == get6:
-            doc.write('\n\nservices_name_dataqualities_code_PUT: FAILED')
-            doc.write('\n\nservices_name_dataqualities_code_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get5))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get6))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (get6['data'][0]['code'] == put['code'] 
-                and get6['data'][0]['name'] == put['name'] 
-                and get6['data'][0]['description'] == put['description']
-                ):
-                #print 'the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('\n\nservices_name_dataqualities_code_PUT: SUCCESS')
-                success_put = True
-            else:
-                doc.write('\n\nservices_name_dataqualities_code_PUT: FAILED')
-                doc.write('\n\nservices_name_dataqualities_code_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get5))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get6))
-    #If post not successful, failure
-    else:
-        doc.write('\n\nservices_name_dataqualities_code_PUT: FAILED')
-        doc.write('\n\nservices_name_dataqualities_code_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get5))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get6))
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get6 == get7:
-            doc.write('\n\nservices_name_dataqualities_code_DELETE: FAILED')
-            doc.write('\n\nservices_name_dataqualities_code_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get6))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get7))
-        #For the success, second get should be void
-        else:
-            if get7['total'] == get6['total'] - 1 and get8 == get1:
-                #print 'the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('\n\nservices_name_dataqualities_code_DELETE: FAILED')
-                success_delete = True
-            else:
-                doc.write('\n\nservices_name_dataqualities_code_DELETE: FAILED')
-                doc.write('\n\nservices_name_dataqualities_code_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(delete1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get6))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get7))
-    #If post not successful, failure
-    else:
-        doc.write('\n\nservices_name_dataqualities_code_DELETE: FAILED')
-        doc.write('\n\nservices_name_dataqualities_code_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get6))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get7))
-            
-            
-            
-    result = {
-        'services_name_dataqualities_GET' : success_get1,
-        'services_name_dataqualities_POST' : success_post,
-        'services_name_dataqualities_code_GET' : success_get2,
-        'services_name_dataqualities_code_PUT' : success_put,
-        'services_name_dataqualities_code_DELETE' : success_delete
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/epsgs.py b/test/walib/istsos/services/epsgs.py
deleted file mode 100755
index 886ccf7..0000000
--- a/test/walib/istsos/services/epsgs.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import time
-import pprint
-
-    
-def test_epsgs(doc):
-    #services_name_epsgs_GET(sname)
-    
-    doc.write('\n\n-----------------EPSGS------------------------------')
-    
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-    success = False
-    
-    get1 = tget.services_name_epsgs_GET(sname)
-    time.sleep(1)
-    get2 = tget.services_name_epsgs_GET(sname)
-    
-    #Checks if all the requests were successful
-    if get1['success'] and get2['success']:
-        #Checks if all the requests got the same result
-        if get1 == get2:
-            doc.write('services_name_epsgs_GET: SUCCESS')
-            success = True
-        #If the results are not all the same, we got a failure
-        else:
-            doc.write('services_name_epsgs_GET: FAILED')
-            doc.write('\n\nservices_name_epsgs_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')            
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')            
-            doc.write(pp.pformat(get2))
-    #If the requests weren't all successful, we got a failure
-    else:
-        doc.write('services_name_epsgs_GET: FAILED')
-        doc.write('\n\nservices_name_epsgs_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')            
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')            
-        doc.write(pp.pformat(get2))
-        
-        
-        
-        
-    result = {'services_name_epsgs_GET' : success}
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/observedproperties.py b/test/walib/istsos/services/observedproperties.py
deleted file mode 100755
index 4c3ad7a..0000000
--- a/test/walib/istsos/services/observedproperties.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-    
-def test_observedproperties(doc):
-    #services_name_observedproperties_GET(sname)
-    #services_name_observedproperties_POST(sname, post)
-    #services_name_observedproperties_name_GET(sname, oname)
-    #services_name_observedproperties_name_PUT(sname, oname, put)
-    #services_name_observedproperties_name_DELETE(sname, oname)
-    
-    doc.write('\n\n-----------------OBSERVEDPROPERTIES-----------------')
-    
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-    oname = 'urn:ogc:def:parameter:x-istsos:1.0:test_post'
-    
-    post = {
-        "definition": "urn:ogc:def:parameter:x-istsos:1.0:test_post", 
-        #"procedures": [], 
-        "constraint": [],
-        "name": "test_post", 
-        "description": "lorem impsum dolor"
-        }
-        
-    put = {
-        "definition": "urn:ogc:def:parameter:x-istsos:1.0:test_post_up", 
-        #"procedures": [], 
-        "constraint": [],
-        "name": "test_post", 
-        "description": "updated description"}        
-        
-    success_get1 = False
-    success_post = False
-    success_get2 = False
-    success_put = False
-    success_delete = False
-    
-    get1 = tget.services_name_observedproperties_GET(sname)
-    time.sleep(1)
-    get2 = tget.services_name_observedproperties_GET(sname)
-    post1 = tpost.services_name_observedproperties_POST(sname, post)
-    get3 = tget.services_name_observedproperties_GET(sname)
-    
-    get4 = tget.services_name_observedproperties_name_GET(sname, oname)
-    time.sleep(1)
-    get5 = tget.services_name_observedproperties_name_GET(sname, oname)
-    put1 = tput.services_name_observedproperties_name_PUT(sname, oname, put)
-    get6 = tget.services_name_observedproperties_name_GET(sname, oname + '_up')
-    delete1 = tdelete.services_name_observedproperties_name_DELETE(sname, oname + '_up')
-    get7 = tget.services_name_observedproperties_name_GET(sname, oname)
-    get8 = tget.services_name_observedproperties_GET(sname)
-    
-    
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('services_name_observedproperties_GET: SUCCESS')
-            success_get1 = True
-        else:
-            doc.write('services_name_observedproperties_GET: FAILED')
-            doc.write('\n\nservices_name_observedproperties_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-            
-    else:
-        doc.write('services_name_observedproperties_GET: FAILED')
-        doc.write('\n\nservices_name_observedproperties_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-    
-    
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        #If gets before and after are the same, failure
-        if get2 == get3:
-            doc.write('services_name_observedproperties_POST: FAILED')
-            doc.write('\n\nservices_name_observedproperties_POST: the data has not changed')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        
-        #If second get has same or less entries than first, failure
-        elif get3['total'] <= get2['total']:
-            doc.write('services_name_observedproperties_POST: FAILED')
-            doc.write('\n\nservices_name_observedproperties_POST: post failed or deleted another entry')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-            
-        #If second get has one more entry than first, look for the 
-        #inserted value. If found, success, else failure
-        elif get3['total'] == get2['total'] + 1:
-            for data in get3['data']:
-                if (data['name'] == post['name'] 
-                    and data['description'] == post['description'] 
-                    and data['definition'] == post['definition']
-                    #and data['procedures'] == post['procedures']
-                    ):
-                    doc.write('services_name_observedproperties_POST: SUCCESS')
-                    success_post = True
-                    break
-            if not success_post:
-                doc.write('services_name_observedproperties_POST: FAILED')
-                doc.write('\n\nservices_name_observedproperties_POST: posted data does not correspond')
-                doc.write('\nPost:\n')
-                doc.write(pp.pformat(post1))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-                
-        #if anything else wrong, failure
-        else:
-            doc.write('services_name_observedproperties_POST: FAILED')
-            doc.write('\n\nservices_name_observedproperties_POST: something went wrong')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-            doc.write('services_name_observedproperties_POST: FAILED')
-    #If post not successful, failure
-    else:
-        doc.write('\n\nservices_name_observedproperties_POST: post FAILED')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-    
-            
-    
-    #Check for two successful requests to have the same result
-    if get4['success'] and get5['success']:
-        if get4 == get5:
-            #doc.write('the results are the same:\n'
-            #pp.pprint(get1)
-            doc.write('services_name_observedproperties_name_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('services_name_observedproperties_name_GET: FAILED')
-            doc.write('\n\nservices_name_observedproperties_name_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get4))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get5))
-        
-    else:
-        doc.write('services_name_observedproperties_name_GET: FAILED')
-        doc.write('\n\nservices_name_observedproperties_name_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get4))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get5))
-        
-    
-    
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get5 == get6:
-            doc.write('services_name_observedproperties_name_PUT: FAILED')
-            doc.write('\n\nservices_name_observedproperties_name_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get5))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get6))
-            
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if len(get6['data']) > 0 and (get6['data'][0]['definition'] == put['definition'] 
-                and get6['data'][0]['name'] == put['name'] 
-                and get6['data'][0]['description'] == put['description']
-                #and get6['data'][0]['procedures'] == put['procedures']                
-                ):
-                #doc.write('the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_observedproperties_name_PUT: SUCCESS')
-                success_put = True
-            else:
-                doc.write('services_name_observedproperties_name_PUT: FAILED')
-                doc.write('\n\nservices_name_observedproperties_name_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get5))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get6))
-                
-    #If post not successful, failure
-    else:
-        doc.write('services_name_observedproperties_name_PUT: FAILED')
-        doc.write('\n\nservices_name_observedproperties_name_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get5))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get6))
-        
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get6 == get7:
-            doc.write('services_name_observedproperties_name_DELETE: FAILED')
-            doc.write('\n\nservices_name_observedproperties_name_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get6))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get7))
-            
-        #For the success, second get should be void
-        else:
-            if get7['total'] == get6['total'] - 1 and get8 == get1:
-                #doc.write('the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_observedproperties_name_DELETE: SUCCESS')
-                success_delete = True
-            else:
-                doc.write('services_name_observedproperties_name_DELETE: FAILED')
-                doc.write('\n\nservices_name_observedproperties_name_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(delete1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get6))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get7))
-                
-    #If post not successful, failure
-    else:
-        doc.write('services_name_observedproperties_name_DELETE: FAILED')
-        doc.write('\n\nservices_name_observedproperties_name_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get6))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get7))
-        
-            
-            
-    result = {
-        'services_name_observedproperties_GET' : success_get1,
-        'services_name_observedproperties_POST' : success_post,
-        'services_name_observedproperties_name_GET' : success_get2,
-        'services_name_observedproperties_name_PUT' : success_put,
-        'services_name_observedproperties_name_DELETE' : success_delete
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/offerings.py b/test/walib/istsos/services/offerings.py
deleted file mode 100755
index 9c64f77..0000000
--- a/test/walib/istsos/services/offerings.py
+++ /dev/null
@@ -1,440 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-    
-def test_offerings(doc):
-    #services_name_offerings_GET(sname)
-    #services_name_offerings_POST(sname, post)
-    #services_name_offerings_name_GET(sname, oname)
-    #services_name_offerings_name_PUT(sname, oname, put)
-    #services_name_offerings_name_DELETE(sname, oname)
-    #services_name_offerings_name_procedures_GET(sname, oname)
-    #services_name_offerings_name_procedures_operations_memberlist_GET(sname, oname)
-    #services_name_offerings_name_procedures_operations_nonmemberlist_GET(sname, oname)
-    #services_name_offerings_operations_getlist_GET(sname)
-    #services_name_offerings_name_procedures_name_POST(sname, post)
-    #services_name_offerings_name_procedures_name_DELETE(sname)
-    
-    doc.write('\n-----------------OFFERINGS-----------------------\n')
-    
-    pp = pprint.PrettyPrinter(indent=2)
-    
-    sname = 'test'
-    oname = 'test'
-    pname = 'test'
-    delname = 'test_post'
-    
-    post = {
-        "description": "test_post", 
-        "expiration": "", 
-        "active": "on", 
-        #"procedures": 4, 
-        #"id": 1, 
-        "name": "test"
-        }
-        
-    postproc = [{
-        "offering": "test_post",
-        "procedure": "test"
-                }]
-        
-    put = {
-        "description": "updated description", 
-        "expiration": "", 
-        #"active": True, 
-        #"procedures": 0, 
-        #"id": 14, 
-        "name": "test_post"}        
-        
-    success_get1 = False
-    success_post = False
-    success_get2 = False
-    success_put = False
-    success_delete = False
-    success_get3 = False
-    success_getmem = False
-    success_getnmem = False
-    success_getlist = False
-    success_postprog = False
-    success_delprog = False
-    
-    
-    get1 = tget.services_name_offerings_GET(sname)
-    time.sleep(1)
-    get2 = tget.services_name_offerings_GET(sname)
-    post1 = tpost.services_name_offerings_POST(sname, post)
-    get3 = tget.services_name_offerings_GET(sname)
-    
-    get4 = tget.services_name_offerings_name_GET(sname, oname)
-    time.sleep(1)
-    get5 = tget.services_name_offerings_name_GET(sname, oname)
-    put1 = tput.services_name_offerings_name_PUT(sname, oname, put)
-    get6 = tget.services_name_offerings_name_GET(sname, oname)
-    
-    post2 = tpost.services_name_offerings_name_procedures_name_POST(sname, oname, postproc)
-    
-    delete2 = tdelete.services_name_offerings_name_procedures_name_DELETE(sname, oname, pname)
-    
-    delete1 = tdelete.services_name_offerings_name_DELETE(sname, delname)
-    
-    get7 = tget.services_name_offerings_name_GET(sname, oname)
-    get8 = tget.services_name_offerings_GET(sname)
-    
-    get9 = tget.services_name_offerings_name_procedures_GET(sname, oname)
-    time.sleep(1)
-    get10 = tget.services_name_offerings_name_procedures_GET(sname, oname)
-    
-    get11 = tget.services_name_offerings_name_procedures_operations_memberlist_GET(sname, oname)
-    time.sleep(1)
-    get12 = tget.services_name_offerings_name_procedures_operations_memberlist_GET(sname, oname)
-    
-    get13 = tget.services_name_offerings_name_procedures_operations_nonmemberlist_GET(sname, oname)
-    time.sleep(1)
-    get14 = tget.services_name_offerings_name_procedures_operations_nonmemberlist_GET(sname, oname)
-    
-    get15 = tget.services_name_offerings_operations_getlist_GET(sname)
-    time.sleep(1)
-    get16 = tget.services_name_offerings_operations_getlist_GET(sname)
-    
-    
-    
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('services_name_offerings_GET: SUCCESS')
-            success_get1 = True
-        else:
-            doc.write('services_name_offerings_GET: FAILED')
-            doc.write('\n\nservices_name_offerings_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-    else:
-        doc.write('services_name_offerings_GET: FAILED')
-        doc.write('\n\nservices_name_offerings_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-    
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        #If gets before and after are the same, failure
-        if get2 == get3:
-            doc.write('services_name_offerings_POST: FAILED')
-            doc.write('\n\nservices_name_offerings_POST: the data has not changed')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has same or less entries than first, failure
-        elif get3['total'] <= get2['total']:
-            doc.write('services_name_offerings_POST: FAILED')
-            doc.write('\n\nservices_name_offerings_POST: post failed or deleted another entry')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has one more entry than first, look for the 
-        #inserted value. If found, success, else failure
-        elif get3['total'] == get2['total'] + 1:
-            for data in get3['data']:
-                if (data['name'] == post['name'] 
-                    and data['description'] == post['description']
-                    and data['expiration'] == post['expiration']
-                    #and data['active'] == post['active']
-                    #and data['procedures'] == post['procedures']
-                    #and data['id'] == post['id']
-                    ):
-                    #pp.pprint(get3)   
-                    #pp.pprint(post1)
-                    doc.write('services_name_offerings_POST: SUCCESS')
-                    success_post = True
-                    break
-            if not success_post:
-                doc.write('services_name_offerings_POST: FAILED')
-                doc.write('\n\nservices_name_offerings_POST: posted data does not correspond')
-                doc.write('\nPost:\n')
-                doc.write(pp.pformat(post1))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-        #if anything else wrong, failure
-        else:
-            doc.write('services_name_offerings_POST: FAILED')
-            doc.write('\n\nservices_name_offerings_POST: something went wrong')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_offerings_POST: FAILED')
-        doc.write('\n\nservices_name_offerings_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-            
-    
-    #Check for two successful requests to have the same result
-    if get4['success'] and get5['success']:
-        if get4 == get5:
-            #doc.write('the results are the same:\n'
-            #pp.pprint(get1)
-            doc.write('services_name_offerings_name_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('services_name_offerings_name_GET: FAILED')
-            doc.write('\n\nservices_name_offerings_name_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get4))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get5))
-    else:
-        doc.write('services_name_offerings_name_GET: FAILED')
-        doc.write('\n\nservices_name_offerings_name_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get4))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get5))
-    
-    
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get5 == get6:
-            doc.write('services_name_offerings_name_PUT: FAILED')
-            doc.write('\n\nservices_name_offerings_name_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get5))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get6))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            for data in get6['data']:
-                if (data['description'] == put['description'] 
-                    and data['name'] == put['name']
-                    and data['expiration'] == put['expiration']
-                    #and data['active'] == put['active']
-                    #and data['procedures'] == put['procedures']
-                    #and data['id'] == put['id']
-                    ):
-                    doc.write('services_name_offerings_name_PUT: SUCCESS')
-                    success_put = True
-                    break
-            if not success_put:
-                doc.write('services_name_offerings_name_PUT: FAILED')
-                doc.write('\n\nservices_name_offerings_name_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get5))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get6))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_offerings_name_PUTT: FAILED')
-        doc.write('\n\nservices_name_offerings_name_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get5))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get6))
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get6 == get7:
-            doc.write('services_name_offerings_name_DELETE: FAILED')
-            doc.write('\n\nservices_name_offerings_name_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get6))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get7))
-        #For the success, second get should be void
-        else:
-            if get7['total'] == get6['total'] - 1 and get8 == get1:
-                #doc.write('the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_offerings_name_DELETE: SUCCESS')
-                success_delete = True
-            else:
-                doc.write('services_name_offerings_name_DELETE: FAILED')
-                doc.write('\n\nservices_name_offerings_name_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(delete1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get6))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get7))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_offerings_name_DELETE: FAILED')
-        doc.write('\n\nservices_name_offerings_name_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get6))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get7))
-            
-    
-    
-    #Check for two successful requests to have the same result
-    if get9['success'] and get10['success']:
-        if get9 == get10:
-            doc.write('services_name_offerings_name_procedures_GET: SUCCESS')
-            success_get3 = True
-        else:
-            doc.write('services_name_offerings_name_procedures_GET: FAILED')
-            doc.write('\n\nservices_name_offerings_name_procedures_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get9))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get10))
-    else:
-        doc.write('services_name_offerings_name_procedures_GET: FAILED')
-        doc.write('\n\nservices_name_offerings_name_procedures_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get9))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get10))
-        
-        
-    #Check for two successful requests to have the same result
-    if get11['success'] and get12['success']:
-        if get11 == get12:
-            doc.write('services_name_offerings_name_procedures_operations_memberlist_GET: SUCCESS')
-            success_getmem = True
-        else:
-            doc.write('services_name_offerings_name_procedures_operations_memberlist_GET: FAILED')
-            doc.write('\n\nservices_name_offerings_name_procedures_operations_memberlist_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get11))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get12))
-    else:
-        doc.write('services_name_offerings_name_procedures_operations_memberlist_GET: FAILED')
-        doc.write('\n\nservices_name_offerings_name_procedures_operations_memberlist_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get11))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get12))
-        
-        
-    #Check for two successful requests to have the same result
-    if get13['success'] and get14['success']:
-        if get13 == get14:
-            doc.write('services_name_offerings_name_procedures_operations_nonmemberlist_GET: SUCCESS')
-            success_getnmem = True
-        else:
-            doc.write('services_name_offerings_name_procedures_operations_nonmemberlist_GET: FAILED')
-            doc.write('\n\nservices_name_offerings_name_procedures_operations_nonmemberlist_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get13))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get14))
-            
-    else:
-        doc.write('services_name_offerings_name_procedures_operations_nonmemberlist_GET: FAILED')
-        doc.write('\n\nservices_name_offerings_name_procedures_operations_nonmemberlist_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get13))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get14))
-        
-        
-        
-  #Check for two successful requests to have the same result
-    if get15['success'] and get16['success']:
-        if get15 == get16:
-            doc.write('services_name_offerings_name_operations_getlist_GET: SUCCESS')
-            success_getlist = True
-        else:
-            doc.write('services_name_offerings_name_operations_getlist_GET: FAILED')
-            doc.write('\n\nservices_name_offerings_name_operations_getlist_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get15))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get16))
-            
-    else:
-        doc.write('services_name_offerings_name_operations_getlist_GET: FAILED')
-        doc.write('\n\nservices_name_offerings_name_operations_getlist_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get15))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get16))
-        
-        
-   
-    #Checks for the POST to be successful by comparing two GETs
-    if post2['success']:
-        doc.write('services_name_offerings_name_procedures_name_POST: SUCCESS')
-        success_postprog= True
-    #If post not successful, failure
-    else:
-        doc.write('services_name_offerings_name_procedures_name_POST: FAILED')
-        doc.write('\n\nservices_name_offerings_name_procedures_name_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post2))
-             
-        
-       
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete2['success']:
-        doc.write('services_name_offerings_name_procedures_name_DELETE: SUCCESS')
-        success_delprog = True
-    #If post not successful, failure
-    else:
-        doc.write('services_name_offerings_name_procedures_name_DELETE: FAILED')       
-        doc.write('\n\nservices_name_offerings_name_procedures_name_DELETEE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete2))
-       
-    
-        
-    result = {
-        'services_name_offerings_GET' : success_get1,
-        'services_name_offerings_POST' : success_post,
-        'services_name_offerings_name_GET' : success_get2,
-        'services_name_offerings_name_PUT' : success_put,
-        'services_name_offerings_name_DELETE' : success_delete,
-        'services_name_offerings_name_procedures_GET' : success_get3,
-        'services_name_offerings_name_procedures_operations_memberlist_GET' : success_getmem,
-        'services_name_offerings_name_procedures_operations_nonmemberlist_GET' : success_getnmem,
-        'services_name_offerings_operations_getlist_GET' : success_getlist,
-        'services_name_offerings_name_procedures_name_POST' : success_postprog,
-        'services_name_offerings_name_procedures_name_DELETE' : success_delprog
-        }
-            
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/operations.py b/test/walib/istsos/services/operations.py
deleted file mode 100755
index 99cd720..0000000
--- a/test/walib/istsos/services/operations.py
+++ /dev/null
@@ -1,286 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-    
-    
-def test_operations(doc):
-    #operations_status_GET()
-    #operations_log_GET()
-    #operations_log_DELETE()
-    #operations_about_GET()
-    #operations_validatedb_POST(post_db)
-    #operations_initialization_GET()
-    #operations_initialization_PUT(put)
-    #operations_getobservation_offerings_name_procedures_GET(sname, oname, pname, oprop, start, end)
-    
-    
-    doc.write('\n\n-----------------OPERATIONS-------------------------') 
-    
-    pp = pprint.PrettyPrinter(indent=2)   
-    
-    sname = 'test'
-    oname = 'temporary'
-    pname = 'test'
-    oprop = 'test'
-    start = '2013-01-01T00:10:00.000000+0100'
-    end = '2013-01-05T00:00:00.000000+0100'
-    
-    post_db = {
-        "user" : "postgres",
-        "password" : "postgres",
-        "dbname" : "istsos",
-        "host" : "localhost",
-        "port" : 5432
-    }
-        
-    put = {"level": 42}        
-        
-    success_get1 = False
-    success_get2 = False
-    success_get3 = False
-    success_get4 = False
-    success_post = False
-    success_put = False
-    success_delete = False
-    success_getobs = False
-    
-    get1 = tget.operations_status_GET()
-    time.sleep(1)
-    get2 = tget.operations_status_GET()
-    
-    get3 = tget.operations_log_GET()
-    time.sleep(1)
-    get4 = tget.operations_log_GET()
-    delete1 = tdelete.operations_log_DELETE()
-    get5 = tget.operations_log_GET()
-    
-    get6 = tget.operations_about_GET()
-    time.sleep(1)
-    get7 = tget.operations_about_GET()
-    
-    post1 = tpost.operations_validatedb_POST(post_db)
-    
-    get8 = tget.operations_initialization_GET()
-    time.sleep(1)
-    get9 = tget.operations_initialization_GET()
-    put1 = tput.operations_initialization_PUT(put)
-    get10 = tget.operations_initialization_GET()
-    
-    get11 = tget.operations_getobservation_offerings_name_procedures_GET(sname, oname, pname, oprop, start, end)
-    time.sleep(1)
-    get12 = tget.operations_getobservation_offerings_name_procedures_GET(sname, oname, pname, oprop, start, end)
-
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('operations_status_GET: SUCCESS')
-            success_get1 = True
-        else:
-            doc.write('operations_status_GET: FAILED')
-            doc.write('\n\noperations_status_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-    else:
-        doc.write('operations_status_GET: FAILED')
-        doc.write('\n\noperations_status_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-        
-    
-    #Check for two successful requests to have the same result
-    if get3['success'] and get4['success']:
-        if get3 == get4:
-            doc.write('operations_log_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('operations_log_GET: FAILED')
-            doc.write('\n\noperations_log_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get3))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get4))
-    else:
-        doc.write('operations_log_GET: FAILED')
-        doc.write('\n\noperations_log_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get3))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get4))
-        
-        
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get4 == get5:
-            doc.write('operations_log_DELETE: FAILED')
-            doc.write('\n\noperations_log_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get4))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get5))
-        #For the success, second get should be void
-        else:
-           if not get5['success']:
-                doc.write('operations_log_DELETE: SUCCESS')
-                success_delete = True
-           else:
-               doc.write('operations_log_DELETE: FAILED')
-               doc.write('\n\noperations_log_DELETE: the element has not been deleted')
-               doc.write('\nDelete:\n')            
-               doc.write(pp.pformat(delete1))     
-               doc.write('\nGet, before:\n')
-               doc.write(pp.pformat(get4))
-               doc.write('\nGet, after:\n')
-               doc.write(pp.pformat(get5))
-    #If post not successful, failure
-    else:
-        doc.write('operations_log_DELETEE: FAILED')
-        doc.write('\n\noperations_log_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get4))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get5))
-            
-            
-    #Check for two successful requests to have the same result
-    if get6['success'] and get7['success']:
-        if get6 == get7:
-            doc.write('operations_about_GET: SUCCESS')
-            success_get3 = True
-        else:
-            doc.write('operations_about_GET: FAILED')
-            doc.write('\n\noperations_about_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get6))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get7))
-    else:
-        doc.write('operations_about_GET: FAILED')
-        doc.write('\n\noperations_about_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get6))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get7))
-    
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        doc.write('operations_validatedb_POST: SUCCESS')
-        success_post = True  
-    else:
-        doc.write('operations_validatedb_POST: FAILED')        
-        doc.write('\n\noperations_validatedb_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        
-    
-    #Check for two successful requests to have the same result
-    if get8['success'] and get9['success']:
-        if get8 == get9:
-            doc.write('operations_initialization_GET: SUCCESS')
-            success_get4 = True
-        else:
-            doc.write('operations_initialization_GET: FAILED')
-            doc.write('\n\noperations_initialization_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get8))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get9))
-    else:
-        doc.write('operations_initialization_GET: FAILED')    
-        doc.write('\n\noperations_initialization_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get8))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get9))
-    
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get9 == get10:
-            doc.write('operations_initialization_PUT: FAILED')
-            doc.write('\n\noperations_initialization_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get9))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get10))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if get10['data']['level'] == put['level']:
-                #doc.write('the update is successful:\n'
-                #pp.pprint(get6)
-                doc.write('operations_initialization_PUT: SUCCESS')
-                success_put = True
-            else:
-                doc.write('operations_initialization_PUT: FAILED')
-                doc.write('\n\noperations_initialization_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get9))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get10))
-    #If post not successful, failure
-    else:
-        doc.write('operations_initialization_PUT: FAILED')
-        doc.write('\n\noperations_initialization_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get9))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get10))
-            
-    
-    #Check for two successful requests to have the same result
-    if get11['success'] and get12['success']:
-        if get11 == get12:
-            doc.write('operations_getobservation_offerings_name_procedures_GET: SUCCESS')
-            success_getobs = True
-        else:
-            doc.write('operations_getobservation_offerings_name_procedures_GET: FAILED')
-            doc.write('\n\noperations_getobservation_offerings_name_procedures_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get11))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get12))
-    else:
-        doc.write('operations_getobservation_offerings_name_procedures_GET: FAILED')
-        doc.write('\n\noperations_getobservation_offerings_name_procedures_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get11))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get12))
-        
-        
-    result = {
-        'operations_status_GET' : success_get1,
-        'operations_log_GET' : success_get2,
-        'operations_about_GET' : success_get3,
-        'operations_initialization_GET' : success_get4,
-        'operations_validatedb_POST' : success_post,
-        'operations_initialization_PUT' : success_put,
-        'operations_log_DELETE' : success_delete,
-        'operations_getobservation_offerings_name_procedures_GET' : success_getobs
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/procedures.py b/test/walib/istsos/services/procedures.py
deleted file mode 100755
index 858528d..0000000
--- a/test/walib/istsos/services/procedures.py
+++ /dev/null
@@ -1,486 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-    
-def deldic(d, k):
-    c = d.copy()
-    for el in k:
-        if type(el) == list:
-            del c[el[0]][el[1]]
-        else:
-            del c[el]
-    return c    
-    
-def test_procedures(doc):
-    #services_name_procedures_POST(sname, post)
-    #services_name_procedures_name_GET(sname, pname)
-    #services_name_procedures_name_PUT(sname, pname, put)
-    #services_name_procedures_name_DELETE(sname, pname)
-    #services_name_procedures_operations_getlist_GET(sname)
-    #services_name_procedures_name_ratingcurve_GET(sname, pname)
-    #services_name_procedures_name_ratingcurve_POST(sname, pname, post)
-    
-    doc.write('\n-----------------PROCEDURES----------------------\n')
-    
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-    pname = 'test_post'
-    prat = "Q_TICINO"
-    
-    post = {
-        "inputs": [], 
-        "description": "Weather in Usmate Carate", 
-        "classification": [
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:systemType", 
-            "name": "System Type", 
-            "value": "insitu-fixed-point"
-            }, 
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:sensorType", 
-            "name": "Sensor Type", 
-            "value": "tipping bucket rain gauge"
-            }
-        ], 
-        "characteristics": "", 
-        "interfaces": "", 
-        "keywords": "weather,meteorological,IST", 
-        "contacts": [], 
-        #"assignedSensorId": "6ecb65065eccaac8967089df62c81a24", 
-        "documentation": [], 
-        "system": "test_post", 
-        "capabilities": [], 
-        "identification": [], 
-        "location": {
-            "geometry": {
-                "type": "Point", 
-                "coordinates": ["8.96127", "46.02723", "344.1"]
-                }, 
-            "crs": {
-                "type": "name", 
-                "properties": {"name": "4326"}
-                }, 
-            "type": "Feature", 
-            "properties": {"name": "test"}
-            }, 
-        "outputs": [
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "constraint": { }, 
-            "name": "Time", 
-            "uom": "", 
-            "description": ""
-            }, 
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall", 
-            "constraint": { }, 
-            "name": "air-rainfall", 
-            "uom": "mm", 
-            "description": ""
-            }
-        ], 
-        "system_id": "test_post", 
-        "history": []
-        }
-        
-    put = {
-        "inputs": [], 
-        "description": "updated description", 
-        "classification": [
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:systemType", 
-            "name": "System Type", 
-            "value": "insitu-fixed-point"
-            }, 
-            {
-            "definition": "urn:ogc:def:classifier:x-istsos:1.0:sensorType", 
-            "name": "Sensor Type", 
-            "value": "tipping bucket rain gauge"
-            }
-        ], 
-        "characteristics": "", 
-        "interfaces": "", 
-        "keywords": "weather,meteorological,IST,test_update", 
-        "contacts": [], 
-        #"assignedSensorId": "6ecb65065eccaac8967089df62c81a24", 
-        "documentation": [], 
-        "system": "test_post", 
-        "capabilities": [], 
-        "identification": [], 
-        "location": {
-            "geometry": {
-                "type": "Point", 
-                "coordinates": ["8.96127", "46.02723", "344.1"]
-                }, 
-            "crs": {
-                "type": "name", 
-                "properties": {"name": "4326"}
-                }, 
-            "type": "Feature", 
-            "properties": {"name": "test"}
-            }, 
-        "outputs": [
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:time:iso8601", 
-            "constraint": { },
-            "name": "Time", 
-            "uom": "", 
-            "description": ""
-            }, 
-            {
-            "definition": "urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall", 
-            "constraint": { },
-            "name": "air-rainfall", 
-            "uom": "mm", 
-            "description": ""
-            }
-        ], 
-        "system_id": "test_post", 
-        "history": []
-    }   
-        
-    post_rat = [ 
-         {
-          'A': '42',
-          'B': '42',
-          'C': '42',
-          'K': '42',
-          'from': '1982-01-01T00:00+00:00',
-          'low_val': '0',
-          'to': '1983-01-01T00:00+00:00',
-          'up_val': '1000'
-         }
-        ]
-        
-    success_get1 = False
-    success_post = False
-    success_getlist = False
-    success_put = False
-    success_delete = False
-    success_get2 = False
-    success_postrat = False
-    
-    post1 = tpost.services_name_procedures_POST(sname, post)
-    get1 = tget.services_name_procedures_name_GET(sname, pname)
-    time.sleep(1)
-    get2 = tget.services_name_procedures_name_GET(sname, pname)
-    put1 = tput.services_name_procedures_name_PUT(sname, pname, put)
-    get3 = tget.services_name_procedures_name_GET(sname, pname)
-    delete1 = tdelete.services_name_procedures_name_DELETE(sname, pname)
-    get4 = tget.services_name_procedures_name_GET(sname, pname)
-    get5 = tget.services_name_procedures_operations_getlist_GET(sname)
-    time.sleep(1)
-    get6 = tget.services_name_procedures_operations_getlist_GET(sname)
-    
-    get7 = tget.services_name_procedures_name_ratingcurve_GET(sname, prat)
-    time.sleep(1)
-    get8 = tget.services_name_procedures_name_ratingcurve_GET(sname, prat)
-    post2 = tpost.services_name_procedures_name_ratingcurve_POST(sname, prat, post_rat)
-    get9 = tget.services_name_procedures_name_ratingcurve_GET(sname, prat)
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('services_name_procedures_name_GET: SUCCESS')
-            success_get1 = True
-        else:
-            doc.write('services_name_procedures_name_GET: FAILED')
-            doc.write('\n\nservices_name_procedures_name_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))            
-    else:
-        doc.write('services_name_procedures_name_GET: FAILED')
-        doc.write('\n\nservices_name_procedures_name_GET: the requests did not succeed')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))            
-    
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        temp = deldic(get1['data'], [['location', 'crs']])
-        postloc = deldic(post['location'], ['crs'])
-        if (get1['data']['description'] == post['description']
-            and temp['inputs'] == post['inputs']
-            and temp['classification'] == post['classification']
-            and temp['characteristics'] == post['characteristics']
-            and temp['interfaces'] == post['interfaces']
-            and temp['keywords'] == post['keywords']
-            and temp['contacts'] == post['contacts']
-            #and temp['assignedSensorId'] == post['assignedSensorId']
-            and temp['documentation'] == post['documentation']
-            and temp['system'] == post['system']
-            and temp['capabilities'] == post['capabilities']
-            and temp['identification'] == post['identification']
-            and temp['location'] == postloc
-            and temp['outputs'] == post['outputs']
-            and temp['system_id'] == post['system_id']
-            and temp['history'] == post['history']
-            ):
-            doc.write('services_name_procedures_POST: SUCCESS')
-            success_post = True
-        #if anything else wrong, failure
-        else:
-            doc.write('services_name_procedures_POST: FAILED')
-            doc.write('\n\nservices_name_procedures_POST: posted data does not correspond')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get1['data']))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_procedures_POST: FAILED')
-        doc.write('\n\nservices_name_procedures_POST: post did not succeed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get1))
-            
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get2 == get3:
-            doc.write('services_name_procedures_name_PUT: FAILED')
-            doc.write('\n\nservices_name_procedures_name_PUT: data did not change')
-            doc.write('\nPut:\n')
-            doc.write(pp.pformat(put1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        
-        else:
-            
-            print 'get3:\n'
-            print pp.pformat(get3)
-            print 'put, after:\n'
-            print pp.pformat(put)
-            
-            temp = deldic(get3['data'], [['location', 'crs']])
-            ptloc = deldic(put['location'], ['crs'])
-            
-            
-            print '\ntemp:\n'
-            print pp.pformat(temp)
-            print '\nptloc, after:\n'
-            print pp.pformat(ptloc)
-            
-            if (temp['description'] == put['description']
-                and temp['inputs'] == put['inputs']
-                and temp['classification'] == put['classification']
-                and temp['characteristics'] == put['characteristics']
-                and temp['interfaces'] == put['interfaces']
-                and temp['keywords'] == put['keywords']
-                and temp['contacts'] == put['contacts']
-                #and temp['assignedSensorId'] == put['assignedSensorId']
-                and temp['documentation'] == put['documentation']
-                and temp['system'] == put['system']
-                and temp['capabilities'] == put['capabilities']
-                and temp['identification'] == put['identification']
-                and temp['location'] == putloc
-                and temp['outputs'] == put['outputs']
-                and temp['system_id'] == put['system_id']
-                and temp['history'] == put['history']
-                ):
-                doc.write('services_name_procedures_name_PUT: SUCCESS')
-                success_put = True
-            else:
-                doc.write('services_name_procedures_name_PUT: FAILED')
-                doc.write('\n\nservices_name_procedures_name_PUT: data does not correspond')
-                doc.write('\nPut:\n')
-                doc.write(pp.pformat(put1))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_procedures_name_PUT: FAILED')
-        doc.write('\n\nservices_name_procedures_name_PUT: request did not succeed')
-        doc.write('\nPut:\n')
-        doc.write(pp.pformat(put1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get3 == get4:
-            doc.write('services_name_procedures_name_DELETE: FAILED')
-            doc.write('\n\nservices_name_procedures_name_DELETE: data did not change')
-            doc.write('\nDelete:\n')
-            doc.write(pp.pformat(delete1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get3))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get4))
-        #For the success, second get should be void
-        else:
-            if not get4['success']:
-                #doc.write('the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_procedures_name_DELETE: SUCCESS')
-                success_delete = True
-            else:
-                doc.write('services_name_procedures_name_DELETE: FAILED')
-                doc.write('\n\nservices_name_procedures_name_DELETE: data has not been deleted')
-                doc.write('\nDelete:\n')
-                doc.write(pp.pformat(delete1))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get3))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get4))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_procedures_name_DELETE: FAILED')
-        doc.write('\n\nservices_name_procedures_name_DELETE: request did not succeed')
-        doc.write('\nDelete:\n')
-        doc.write(pp.pformat(delete1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get3))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get4))
-            
-    
-    
-    #Check for two successful requests to have the same result
-    if get5['success'] and get6['success']:
-        if get5 == get6:
-            doc.write('services_name_procedures_operations_getlist_GET: SUCCESS')
-            success_getlist = True
-        else:
-            doc.write('services_name_procedures_operations_getlist_GET: FAILED')
-            doc.write('\n\nservices_name_procedures_operations_getlist_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get5))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get6))            
-    else:
-        doc.write('services_name_procedures_operations_getlist_GET: FAILED')
-        doc.write('\n\nservices_name_procedures_operations_getlist_GET: the requests did not succeed')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get5))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get6))            
-        
-        
-        
-    #Check for two successful requests to have the same result    
-    if get7['success'] and get8['success']:
-        if get7 == get8:
-            doc.write('services_name_procedures_name_ratingcurve_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('services_name_procedures_name_ratingcurve_GET: FAILED')
-            doc.write('\n\nservices_name_procedures_name_ratingcurve_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get7))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get8))            
-    else:
-        doc.write('services_name_procedures_name_ratingcurve_GET: FAILED')
-        doc.write('\n\nservices_name_procedures_name_ratingcurve_GET: the requests did not succeed')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get7))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get8))
-        
-    
-    
-    #Checks for the POST to be successful by comparing two GETs
-    if post2['success']:
-        #If gets before and after are the same, failure
-        if get8 == get9:
-            doc.write('services_name_procedures_name_ratingcurve_POST: FAILED')
-            doc.write('\n\nservices_name_procedures_name_ratingcurve_POST: the data has not changed')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get8))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get9))
-        #If second get has same or less entries than first, failure
-        elif get9['total'] != len(post_rat):
-            doc.write('services_name_procedures_name_ratingcurve_POST: FAILED')
-            doc.write('\n\nservices_name_procedures_name_ratingcurve_POST: post does not have correct length')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post2))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get8))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get9))
-        #If second get has one more entry than first, look for the 
-        #inserted value. If found, success, else failure
-        elif get9['total'] == len(post_rat):
-            for data in get9['data']:
-                temp = post_rat[0]
-                if (data['A'] == temp['A'] 
-                    and data['B'] == temp['B']
-                    and data['C'] == temp['C']
-                    and data['K'] == temp['K']
-                    and data['from'] == temp['from']
-                    and data['to'] == temp['to']
-                    and data['up_val'] == temp['up_val']
-                    and data['low_val'] == temp['low_val']
-                    ):
-                    doc.write('services_name_procedures_name_ratingcurve_POST: SUCCESS')
-                    success_postrat = True
-                    break
-            if not success_postrat:
-                doc.write('services_name_procedures_name_ratingcurve_POST: FAILED')
-                doc.write('\n\nservices_name_procedures_name_ratingcurve_POST: posted data does not correspond')
-                doc.write('\nPost:\n')
-                doc.write(pp.pformat(post2))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get8))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get9))
-        #if anything else wrong, failure
-        else:
-            doc.write('services_name_procedures_name_ratingcurve_POST: FAILED')
-            doc.write('\n\nservices_name_procedures_name_ratingcurve_POST: something went wrong')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post2))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get8))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get9))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_procedures_name_ratingcurve_POST: FAILED')
-        doc.write('\n\nservices_name_procedures_name_ratingcurve_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post2))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get8))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get9))
-    
-    
-    
-    result = {
-        'services_name_procedures_name_GET' : success_get1,
-        'services_name_procedures_POST' : success_post,
-        'services_name_procedures_operations_getlist_GET' : success_getlist,
-        'services_name_procedures_name_PUT' : success_put,
-        'services_name_procedures_name_DELETE' : success_delete,
-        'services_name_procedures_name_ratingcurve_GET' : success_get2,
-        'services_name_procedures_name_ratingcurve_POST' : success_postrat
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/services.py b/test/walib/istsos/services/services.py
deleted file mode 100755
index 8e12a6e..0000000
--- a/test/walib/istsos/services/services.py
+++ /dev/null
@@ -1,335 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-    
-def test_services(doc):
-    #services_GET()
-    #services_POST(post)
-    #services_name_GET(sname)
-    #services_name_PUT(put, sname)
-    #services_name_DELETE(sname_updated)
-    #services_name_operations_insertobservation_POST(sname_insertob, post_observation)
-    
-    doc.write('\n-----------------SERVICES------------------------\n')
-    
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-    sname_updated = 'prova_updated'
-    sname_post = 'prova'
-    sname_insertob = 'test'
-    
-    post = {
-        "path": "/usr/local/istsos/services/prova/prova.cfg",
-        "service": "prova"
-    }
-        
-    put = {
-        "service": "prova_updated", 
-        "dbname": "istsos", 
-        "host": "localhost", 
-        "user": "postgres", 
-        "password": "postgres", 
-        "port": "5432"
-    } 
-
-      
-    success_get1 = False
-    success_post = False
-    success_get2 = False
-    success_put = False
-    success_delete = False
-    success_insertob = False
-    
-    get1 = tget.services_GET()
-    time.sleep(1)
-    get2 = tget.services_GET()    
-    post1 = tpost.services_POST(post)
-    get3 = tget.services_GET()
-    
-    get4 = tget.services_name_GET(sname)
-    time.sleep(1)
-    get5 = tget.services_name_GET(sname)
-    put1 = tput.services_name_PUT(put, sname_post)
-    get6 = tget.services_name_GET(sname_updated)
-    delete1 = tdelete.services_name_DELETE(sname_updated)
-    get7 = tget.services_name_GET(sname_updated)
-    
-    
-    asi = tget.services_name_procedures_name_GET(sname, sname)['data']['assignedSensorId']
-    post_observation = {
-            "AssignedSensorId" : asi,
-            "ForceInsert" : "true",
-            "Observation" : {
-                "procedure": "urn:ogc:object:procedure:x-istsos:1.01.0:test",
-                "samplingTime": {
-				    "beginPosition": "2012-01-01T13:00:00+01:00", 
-				    "endPosition": "2012-01-01T17:00:00+01:00"
-			    }, 
-			    "observedProperty": {
-				    "CompositePhenomenon": {
-					    "id": "comp_126", 
-					    "dimension": "2"
-				    }, 
-				    "component": [
-					    "urn:ogc:def:parameter:x-istsos:1.01.0:time:iso8601", 
-					    "urn:ogc:def:parameter:x-istsos:1.0:test"
-				    ]
-			    },
-			    "featureOfInterest": {
-				    "geom": "<gml:Point srsName='EPSG:4326'><gml:coordinates>15,15,15</gml:coordinates></gml:Point>", 
-				    "name": "urn:ogc:object:feature:x-istsos:1.01.0:station:test"
-			    }, 
-			    "result": {
-				    "DataArray": {
-					    "elementCount": "2", 
-					    "values": [
-						    [
-							    "2012-01-01T14:00:00+01:00", 
-							    "10.000000"
-						    ],
-						    [
-							    "2012-01-01T15:00:00+01:00", 
-							    "20.000000"
-						    ]
-					    ], 
-					    "field": [
-						    {
-							    "definition": "urn:ogc:def:parameter:x-istsos:1.01.0:time:iso8601", 
-							    "name": "Time"
-						    }, 
-						    {
-							    "definition": "urn:ogc:def:parameter:x-istsos:1.0:test", 
-							    "name": "test", 
-							    "uom": "test"
-						    }
-					    ]
-				    }
-			    }
-		    } 
-		}    
-    
-    post2 = tpost.services_name_operations_insertobservation_POST(sname_insertob, post_observation)
-    
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('services_GET: SUCCESS')
-            success_get1 = True
-        else:
-            doc.write('services_GET: FAILED')
-            doc.write('\n\nservices_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-    else:
-        doc.write('services_GET: FAILED')
-        doc.write('\n\nservices_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-    
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        #If gets before and after are the same, failure
-        if get2 == get3:
-            doc.write('services_POST: FAILED')
-            doc.write('\n\nservices_POST: the data has not changed')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has same or less entries than first, failure
-        elif get3['total'] <= get2['total']:
-            doc.write('services_POST: FAILED')
-            doc.write('\n\nservices_POST: post failed or deleted another entry')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has one more entry than first, look for the 
-        #inserted value. If found, success, else failure
-        elif get3['total'] == get2['total'] + 1:
-            for data in get3['data']:
-                if (data['service'] == post['service']
-                    #and data['path'] == post['path']
-                    ):
-                    doc.write('services_POST: SUCCESS')
-                    success_post = True
-                    break
-            if not success_post:
-                doc.write('services_POST: FAILED')
-                doc.write('\n\nservices_POST: posted data does not correspond')
-                doc.write('\nPost:\n')
-                doc.write(pp.pformat(post1))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-        #if anything else wrong, failure
-        else:
-            doc.write('services_POST: FAILED')
-            doc.write('\n\nservices_POST: something went wrong')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-    #If post not successful, failure
-    else:
-        doc.write('services_POST: FAILED')
-        doc.write('\n\nservices_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-            
-    
-    #Check for two successful requests to have the same result
-    if get4['success'] and get5['success']:
-        if get4 == get5:
-            #doc.write('the results are the same:\n'
-            #pp.pprint(get1)
-            doc.write('services_name_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('services_name_GET: FAILED')
-            doc.write('\n\nservices_name_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get4))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get5))
-    else:
-        doc.write('services_name_GET: FAILED')
-        doc.write('\n\nservices_name_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get4))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get5))
-    
-    
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get5 == get6:
-            doc.write('services_name_uoms_name_PUT: FAILED')
-            doc.write('\n\nservices_name_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get5))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get6))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            if (get6['data']['service'] == put['service'] 
-                and get6['data']['dbname'] == put['dbname']
-                and get6['data']['host'] == put['host']
-                and get6['data']['user'] == put['user']
-                and get6['data']['password'] == put['password']
-                and get6['data']['port'] == put['port']
-                ):
-                doc.write('services_name_PUT: SUCCESS')
-                success_put = True
-            else:
-                doc.write('services_name_PUT: FAILED')
-                doc.write('\n\nservices_name_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get5))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get6))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_PUT: FAILED')
-        doc.write('\n\nservices_name_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get5))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get6))
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get6 == get7:
-            doc.write('services_name_DELETE: FAILED')
-            doc.write('\n\nservices_name_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get6))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get7))
-        #For the success, second get should be void
-        else:
-            if get7['success'] == False:
-                #doc.write('the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_DELETE: SUCCESS')
-                success_delete = True
-            else:
-                doc.write('services_name_DELETE: FAILED')
-                doc.write('\n\nservices_name_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(delete1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get6))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get7))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_DELETE: FAILED')
-        doc.write('\n\nservices_name_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get6))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get7))
-        
-            
-    #Checks for the POST to be successful by comparing two GETs
-    if post2['success']:
-        doc.write('services_name_operations_insertobservation_POST: SUCCESS')
-        success_insertob = True
-    else:
-        doc.write('\n\nservices_name_operations_insertobservation_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post2))
-        doc.write('services_name_operations_insertobservation_POST: FAILED')
-        
-    
-    result = {
-        'services_GET' : success_get1,
-        'services_POST' : success_post,
-        'services_name_GET' : success_get2,
-        'services_name_PUT' : success_put,
-        'services_name_DELETE' : success_delete,
-        'services_name_operations_insertobservation_POST' : success_insertob
-        }
-        
-    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/systemtypes.py b/test/walib/istsos/services/systemtypes.py
deleted file mode 100755
index 37ddb77..0000000
--- a/test/walib/istsos/services/systemtypes.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import time
-import pprint
-
-   
-def test_systemtypes(doc):
-    #services_name_systemtypes_GET(sname)
-    
-    doc.write('\n-----------------SYSTEMTYPES---------------------\n')
-    doc.write('\nRequest services_name_systemtypes_GET is not implemented\n')
-    
-#    if v:
-#        doc.write('\n\n-----------------SYSTEMTYPES------------------------')
-#    
-#    pp = pprint.PrettyPrinter(indent=2)    
-#    sname = 'test'
-#    success = False
-#    
-#    get1 = tget.services_name_systemtypes_GET(sname)
-#    time.sleep(1)
-#    get2 = tget.services_name_systemtypes_GET(sname)
-#    
-#    
-#    #Checks if all the requests were successful
-#    if get1['success'] and get2['success']:
-#        #Checks if all the requests got the same result
-#        if get1 == get2:
-#            print 'services_name_systemtypes_GET: SUCCESS'
-#            success = True
-#        #If the results are not all the same, we got a failure
-#        else:
-#            if v:
-#                doc.write('\n\nservices_name_systemtypes_GET: the results are not all the same')
-#                doc.write('\nFirst get:\n')            
-#                doc.write(pp.pformat(get1))
-#                doc.write('\nSecond get:\n')            
-#                doc.write(pp.pformat(get2))
-#            print 'services_name_systemtypes_GET: FAILED'
-#    #If the requests weren't all successful, we got a failure
-#    else:
-#        if v:
-#            doc.write('\n\nservices_name_systemtypes_GET: the requests have not been successful')
-#            doc.write('\nFirst get:\n')            
-#            doc.write(pp.pformat(get1))
-#            doc.write('\nSecond get:\n')            
-#            doc.write(pp.pformat(get2))
-#        print 'services_name_systemtypes_GET: FAILED'
-#        
-#    result = {'services_name_systemtypes_GET' : success}
-#    return result
\ No newline at end of file
diff --git a/test/walib/istsos/services/uoms.py b/test/walib/istsos/services/uoms.py
deleted file mode 100755
index 7711930..0000000
--- a/test/walib/istsos/services/uoms.py
+++ /dev/null
@@ -1,261 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import test.get as tget #GET(fname, address)
-import test.post as tpost #POST(fname, spost, address)
-import test.put as tput #PUT(fname, sput, address)
-import test.delete as tdelete #DELETE(fname, address)
-import pprint
-import time
-
-    
-def test_uoms(doc):
-    #services_name_uoms_GET(sname)
-    #services_name_uoms_POST(sname, post)    
-    #services_name_uoms_name_GET(sname, uname)
-    #services_name_uoms_name_PUT(sname, uname, put)
-    #services_name_uoms_name_DELETE(sname, uname)
-    
-    doc.write('\n-----------------UOMS----------------------------\n')
-    pp = pprint.PrettyPrinter(indent=2)    
-    sname = 'test'
-    uname = 'test'
-    putname = 'test_post'
-    
-    post = {
-        "procedures": [], 
-        "name": "test_post", 
-        "description": "lorem ipsum dolor"
-        }
-        
-    put = {
-        "procedures": [], 
-        "name": "test_post", 
-        "description": "modified input"
-        }        
-        
-    success_get1 = False
-    success_post = False
-    success_get2 = False
-    success_put = False
-    success_delete = False
-    
-    get1 = tget.services_name_uoms_GET(sname)
-    time.sleep(1)
-    get2 = tget.services_name_uoms_GET(sname)
-    post1 = tpost.services_name_uoms_POST(sname, post)
-    get3 = tget.services_name_uoms_GET(sname)
-    
-    get4 = tget.services_name_uoms_name_GET(sname, putname)
-    time.sleep(1)
-    get5 = tget.services_name_uoms_name_GET(sname, putname)
-    put1 = tput.services_name_uoms_name_PUT(sname, putname, put)
-    get6 = tget.services_name_uoms_name_GET(sname, putname)    
-    delete1 = tdelete.services_name_uoms_name_DELETE(sname, putname)
-    get7 = tget.services_name_uoms_name_GET(sname, putname)
-    get8 = tget.services_name_uoms_GET(sname)
-    
-    
-    
-    #Check for two successful requests to have the same result
-    if get1['success'] and get2['success']:
-        if get1 == get2:
-            doc.write('services_name_uoms_GET: SUCCESS')
-            success_get1 = True
-        else:
-            doc.write('services_name_uoms_GET: FAILED')
-            doc.write('\n\nservices_name_uoms_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get1))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get2))
-    else:
-        doc.write('services_name_uoms_GET: FAILED')
-        doc.write('\n\nservices_name_uoms_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get1))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get2))
-    
-     
-    #Checks for the POST to be successful by comparing two GETs
-    if post1['success']:
-        #If gets before and after are the same, failure
-        if get2 == get3:
-            doc.write('services_name_uoms_POST: FAILED')
-            doc.write('\n\nservices_name_uoms_POST: the data has not changed')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has same or less entries than first, failure
-        elif get3['total'] <= get2['total']:
-            doc.write('services_name_uoms_POST: FAILED')
-            doc.write('\n\nservices_name_uoms_POST: post failed or deleted another entry')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-        #If second get has one more entry than first, look for the 
-        #inserted value. If found, success, else failure
-        elif get3['total'] == get2['total'] + 1:
-            for data in get3['data']:
-                if (data['name'] == post['name']
-                    and data['description'] == post['description']
-                    and data['procedures'] == post['procedures']
-                    ):
-                    doc.write('services_name_uoms_POST: SUCCESS')
-                    success_post = True
-                    break
-            if not success_post:
-                doc.write('services_name_uoms_POST: FAILED')
-                doc.write('\n\nservices_name_uoms_POST: posted data does not correspond')
-                doc.write('\nPost:\n')
-                doc.write(pp.pformat(post1))
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get2))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get3))
-        #if anything else wrong, failure
-        else:
-            doc.write('services_name_uoms_POST: FAILED')
-            doc.write('\n\nservices_name_uoms_POST: something went wrong')
-            doc.write('\nPost:\n')
-            doc.write(pp.pformat(post1))
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get2))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get3))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_uoms_POST: FAILED')
-        doc.write('\n\nservices_name_uoms_POST: post failed')
-        doc.write('\nPost:\n')
-        doc.write(pp.pformat(post1))
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get2))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get3))
-            
-    
-    #Check for two successful requests to have the same result
-    if get4['success'] and get5['success']:
-        if get4 == get5:
-            #doc.write('the results are the same:\n'
-            #pp.pprint(get1)
-            doc.write('services_name_uoms_name_GET: SUCCESS')
-            success_get2 = True
-        else:
-            doc.write('services_name_uoms_name_GET: FAILED')
-            doc.write('\n\nservices_name_uoms_name_GET: the results are not all the same')
-            doc.write('\nFirst get:\n')
-            doc.write(pp.pformat(get4))
-            doc.write('\nSecond get:\n')
-            doc.write(pp.pformat(get5))
-    else:
-        doc.write('services_name_uoms_name_GET: FAILED')
-        doc.write('\n\nservices_name_uoms_name_GET: the requests have not been successful')
-        doc.write('\nFirst get:\n')
-        doc.write(pp.pformat(get4))
-        doc.write('\nSecond get:\n')
-        doc.write(pp.pformat(get5))
-
-    
-    
-    
-    #Checks for the PUT to be successful by comparing two GETs
-    if put1['success']:
-        #If gets before and after are the same, failure
-        if get5 == get6:
-            doc.write('services_name_uoms_name_PUT: FAILED')
-            doc.write('\n\nservices_name_uoms_name_PUT: maybe you re-wrote existing data')
-            doc.write('\nPut:\n')            
-            doc.write(pp.pformat(put1)) 
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get5))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get6))
-        #For the success, second get should be the same as first
-        #apart from the modicifation done with put
-        else:
-            for data in get6['data']:
-                if (data['name'] == put['name'] 
-                    and data['description'] == put['description']
-                    #and get6['data'][0]['procedures'] == put['procedures']
-                ):
-                    doc.write('services_name_uoms_name_PUT: SUCCESS')
-                    success_put = True
-            if not success_put:
-                doc.write('services_name_uoms_name_PUT: FAILED')
-                doc.write('\n\nservices_name_uoms_name_PUT: updated data does not correspond')
-                doc.write('\nPut:\n')            
-                doc.write(pp.pformat(put1)) 
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get5))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get6))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_uoms_name_PUT: FAILED')
-        doc.write('\n\nservices_name_uoms_name_PUT: the request has not been successful')
-        doc.write('\nPut:\n')            
-        doc.write(pp.pformat(put1)) 
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get5))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get6))
-            
-            
-            
-    #Checks for the DELETE to be successful by comparing two GETs
-    if delete1['success']:
-        #If gets before and after are the same, failure
-        if get6 == get7:
-            doc.write('services_name_uoms_name_DELETE: FAILED')
-            doc.write('\n\nservices_name_uoms_name_DELETE: the results remained the same')
-            doc.write('\nDelete:\n')            
-            doc.write(pp.pformat(delete1))     
-            doc.write('\nGet, before:\n')
-            doc.write(pp.pformat(get6))
-            doc.write('\nGet, after:\n')
-            doc.write(pp.pformat(get7))
-        #For the success, second get should be void
-        else:
-            if get7['total'] == get6['total'] - 1 and get8 == get1:
-                #doc.write('the delete is successful:\n'
-                #pp.pprint(get6)
-                doc.write('services_name_uoms_name_DELETE: SUCCESS')
-                success_delete = True
-            else:
-                doc.write('services_name_uoms_name_DELETE: FAILED')
-                doc.write('\n\nservices_name_uoms_name_DELETE: the element has not been deleted')
-                doc.write('\nDelete:\n')            
-                doc.write(pp.pformat(delete1))     
-                doc.write('\nGet, before:\n')
-                doc.write(pp.pformat(get6))
-                doc.write('\nGet, after:\n')
-                doc.write(pp.pformat(get7))
-    #If post not successful, failure
-    else:
-        doc.write('services_name_uoms_name_DELETE: FAILED')
-        doc.write('\n\nservices_name_uoms_name_DELETE: the request has not been successful')
-        doc.write('\nDelete:\n')            
-        doc.write(pp.pformat(delete1))     
-        doc.write('\nGet, before:\n')
-        doc.write(pp.pformat(get6))
-        doc.write('\nGet, after:\n')
-        doc.write(pp.pformat(get7))
-            
-            
-    result = {
-        'services_name_uoms_GET' : success_get1,
-        'services_name_uoms_POST' : success_post,
-        'services_name_uoms_name_GET' : success_get2,
-        'services_name_uoms_name_PUT' : success_put,
-        'services_name_uoms_name_DELETE' : success_delete
-        }
-        
-    return result
\ No newline at end of file
diff --git a/updates/database_upgrade_2.1.1_to_2.2.sql b/updates/database_upgrade_2.1.1_to_2.2.sql
new file mode 100644
index 0000000..a7660f0
--- /dev/null
+++ b/updates/database_upgrade_2.1.1_to_2.2.sql
@@ -0,0 +1,28 @@
+-- ===============================================
+-- WORKING
+-- ===============================================
+SET search_path = SCHEMA_NAME, pg_catalog;
+
+CREATE TYPE status AS ENUM ('verified','pending');
+
+CREATE TABLE cron_log
+(
+   id_clo serial NOT NULL, 
+   id_prc_fk integer NOT NULL,              -- "5"
+   process_clo character varying NOT NULL, -- "acquisizione"
+   element_clo character varying NOT NULL, -- "T_TREVANO"
+   datetime_clo timestamp with time zone NOT NULL, -- "NOW"
+   message_clo character varying NOT NULL, -- "TIPO DI ECCEZIONE"
+   details_clo character varying, -- "MESSAGGIO LIBERO"
+   status_clo status,            -- "error"
+   PRIMARY KEY (id_clo)
+);
+
+ALTER TABLE procedures DROP CONSTRAINT procedures_id_tru_fk_fkey CASCADE;
+ALTER TABLE procedures ADD COLUMN time_acq_prc integer;
+ALTER TABLE procedures DROP COLUMN id_tru_fk;
+
+ALTER TABLE ONLY cron_log
+    ADD CONSTRAINT cron_log_id_prc_fk_fkey FOREIGN KEY (id_prc_fk) REFERENCES procedures(id_prc) ON DELETE CASCADE;
+DROP SEQUENCE time_res_unit_id_tru_seq CASCADE;
+DROP TABLE time_res_unit CASCADE;
\ No newline at end of file
diff --git a/waconf2sos.py b/waconf2sos.py
old mode 100755
new mode 100644
index f876bc3..c41a511
--- a/waconf2sos.py
+++ b/waconf2sos.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import resource
 import string
 import config
diff --git a/waconf2sos.pyc b/waconf2sos.pyc
deleted file mode 100644
index dd98efd..0000000
Binary files a/waconf2sos.pyc and /dev/null differ
diff --git a/walib/__init__.py b/walib/__init__.py
index d32e069..50f4d0c 100755
--- a/walib/__init__.py
+++ b/walib/__init__.py
@@ -1 +1,24 @@
-__all__ = [ "istsos","admin","configManager","databaseManager","resourceFactory","utils","sqlschema","wa_version"]
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = ["istsos", "admin", "configManager", "databaseManager",
+                "resourceFactory", "utils", "sqlschema", "wa_version"]
diff --git a/walib/__init__.pyc b/walib/__init__.pyc
index e6e52e2..4b8af69 100644
Binary files a/walib/__init__.pyc and b/walib/__init__.pyc differ
diff --git a/walib/admin/__init__.py b/walib/admin/__init__.py
index abe9e13..611b1ab 100755
--- a/walib/admin/__init__.py
+++ b/walib/admin/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "configsections"]
diff --git a/walib/admin/__init__.pyc b/walib/admin/__init__.pyc
new file mode 100644
index 0000000..9138d0b
Binary files /dev/null and b/walib/admin/__init__.pyc differ
diff --git a/walib/admin/configsections/__init__.py b/walib/admin/configsections/__init__.py
index 7893296..9f026f5 100755
--- a/walib/admin/configsections/__init__.py
+++ b/walib/admin/configsections/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "configsections", "paths"]
diff --git a/walib/admin/configsections/__init__.pyc b/walib/admin/configsections/__init__.pyc
new file mode 100644
index 0000000..ee48ae9
Binary files /dev/null and b/walib/admin/configsections/__init__.pyc differ
diff --git a/walib/admin/configsections/configsections.py b/walib/admin/configsections/configsections.py
index e69de29..6d3c056 100755
--- a/walib/admin/configsections/configsections.py
+++ b/walib/admin/configsections/configsections.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
diff --git a/walib/admin/configsections/configsections.pyc b/walib/admin/configsections/configsections.pyc
new file mode 100644
index 0000000..d7e02f5
Binary files /dev/null and b/walib/admin/configsections/configsections.pyc differ
diff --git a/walib/admin/configsections/paths.py b/walib/admin/configsections/paths.py
index 608a948..69701d9 100755
--- a/walib/admin/configsections/paths.py
+++ b/walib/admin/configsections/paths.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceAdmin
 
 class waPaths(waResourceAdmin):
diff --git a/walib/admin/configsections/paths.pyc b/walib/admin/configsections/paths.pyc
new file mode 100644
index 0000000..53cae61
Binary files /dev/null and b/walib/admin/configsections/paths.pyc differ
diff --git a/walib/configManager.py b/walib/configManager.py
index 72533c4..0df931d 100755
--- a/walib/configManager.py
+++ b/walib/configManager.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import ConfigParser
 import os 
 import os.path
diff --git a/walib/configManager.pyc b/walib/configManager.pyc
index 01647c7..f9bcc25 100644
Binary files a/walib/configManager.pyc and b/walib/configManager.pyc differ
diff --git a/walib/databaseManager.py b/walib/databaseManager.py
index b933d19..b2290fc 100755
--- a/walib/databaseManager.py
+++ b/walib/databaseManager.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-import psycopg2 # @TODO the right library
+#
+# ===============================================================================
+import psycopg2 #TODO: the right library
 import psycopg2.extras
 import psycopg2.extensions
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
@@ -26,7 +31,7 @@ from walib import utils as wut
 
 #import pprint
 #pp = pprint.PrettyPrinter(indent=4)
-    
+
 
 class Database:
     """Connect to a database"""
@@ -45,7 +50,7 @@ class Database:
 class PgDB(Database):
     """Connect to a PostgreSQL database"""
     host=None
-    def __init__(self,user,password,dbName,host='localhost',port='5432'):
+    def __init__(self,user,password,dbName,host='localhost',port='5433'):
         "Initialize PostgreSQL connection parameters"
         self.__dns=""
         if host: self.__dns += "host='%s' " % host
@@ -54,7 +59,7 @@ class PgDB(Database):
         if user: self.__dns += "user='%s' " % user
         if password: self.__dns += "password='%s' " % password
         self.__connect()
-    
+
     def __connect(self):
         """Connect to a PostgreSQL database"""
         try:
@@ -71,8 +76,8 @@ class PgDB(Database):
             elif emes.find("connections on port")>-1 or emes.find("invalid literal for int()")>-1:
                 raise Exception("CONNECTION ERROR: wrong port")
             else:
-                raise Exception("CONNECTION ERROR: %s" % e)  
-        
+                raise Exception("CONNECTION ERROR: %s" % e)
+
     def select(self,sql,par=None):
         """ Execute a select statement"""
         if sql.lstrip()[0:6].lower() == "select":
@@ -100,14 +105,14 @@ class PgDB(Database):
             raise e
         except Exception as e:
             raise e
-            
+
     def rollbackTransaction(self):
         """Rollback current transaction"""
         try:
             self.__conn.rollback()
         except psycopg2.ProgrammingError as e:
             print >> sys.stderr,  e.message
-    
+
     def executeInTransaction(self,sql,par=None):
         """Execute an sql statement in an open session"""
         cur = self.__conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
@@ -126,14 +131,15 @@ class PgDB(Database):
         cur.close()
         #return rows
         return wut.encodeobject(rows)
-                
-    def execute(self,sql,par=None):
+
+    def execute(self, sql, par=None):
         """Execute an sql statement"""
         cur = self.__conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
         try:
-            cur.execute(sql,par)
+            cur.execute(sql, par)
         except psycopg2.ProgrammingError as e:
             raise e
+
         try:
             rows = cur.fetchall()
         except:
@@ -151,7 +157,7 @@ class PgDB(Database):
             raise e
         self.__conn.commit()
         return
-    
+
     def mogrify(self,sql,par=None):
         """Mogrify an sql statement (print >> sys.stderr,  the actual sql query that will be executed)"""
         cur = self.__conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
@@ -164,4 +170,4 @@ class PgDB(Database):
             raise e
         cur.close()
         return a
-        
+
diff --git a/walib/databaseManager.pyc b/walib/databaseManager.pyc
index c6de2c2..b24dc8d 100644
Binary files a/walib/databaseManager.pyc and b/walib/databaseManager.pyc differ
diff --git a/walib/istsos/__init__.py b/walib/istsos/__init__.py
index fcbeac0..2210427 100755
--- a/walib/istsos/__init__.py
+++ b/walib/istsos/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "istsos","services"]
diff --git a/walib/istsos/__init__.pyc b/walib/istsos/__init__.pyc
index 7da3530..2f0c3b9 100644
Binary files a/walib/istsos/__init__.pyc and b/walib/istsos/__init__.pyc differ
diff --git a/walib/istsos/istsos.py b/walib/istsos/istsos.py
old mode 100755
new mode 100644
index 2ec63ec..62eef13
--- a/walib/istsos/istsos.py
+++ b/walib/istsos/istsos.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import resource, utils, databaseManager, configManager
 import sys, os
 import xml.etree.ElementTree as ET
@@ -159,7 +164,7 @@ class waAbout(waIstsos):
             try:
                 response.raise_for_status()
                 
-                lastVersion = response.json
+                lastVersion = response.json()
                 data["istsos_version"] = str(sos_version.version)
                 data["latest_istsos_version"] = str(lastVersion["istsos_version"])
                 data["latest_istsos_changelog"] = str(lastVersion["istsos_changelog"])
diff --git a/walib/istsos/istsos.pyc b/walib/istsos/istsos.pyc
deleted file mode 100644
index be39fa3..0000000
Binary files a/walib/istsos/istsos.pyc and /dev/null differ
diff --git a/walib/istsos/services/__init__.py b/walib/istsos/services/__init__.py
index 5a02e2b..e05a2b0 100755
--- a/walib/istsos/services/__init__.py
+++ b/walib/istsos/services/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "configsections","dataqualities","services","procedures","observedproperties","uoms","systemtypes"]
diff --git a/walib/istsos/services/__init__.pyc b/walib/istsos/services/__init__.pyc
index ef51738..4873459 100644
Binary files a/walib/istsos/services/__init__.pyc and b/walib/istsos/services/__init__.pyc differ
diff --git a/walib/istsos/services/configsections/__init__.py b/walib/istsos/services/configsections/__init__.py
old mode 100755
new mode 100644
index 69310b7..1d75d25
--- a/walib/istsos/services/configsections/__init__.py
+++ b/walib/istsos/services/configsections/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "configsections", "connection", "geo", "getobservation", "identification", "provider", "serviceurl","urn" ]
diff --git a/walib/istsos/services/configsections/__init__.pyc b/walib/istsos/services/configsections/__init__.pyc
index f2fd930..e3c14b3 100644
Binary files a/walib/istsos/services/configsections/__init__.pyc and b/walib/istsos/services/configsections/__init__.pyc differ
diff --git a/walib/istsos/services/configsections/configsections.py b/walib/istsos/services/configsections/configsections.py
old mode 100755
new mode 100644
index c422181..d5f6499
--- a/walib/istsos/services/configsections/configsections.py
+++ b/walib/istsos/services/configsections/configsections.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceService
 
 class waConfigsections(waResourceService):
diff --git a/walib/istsos/services/configsections/configsections.pyc b/walib/istsos/services/configsections/configsections.pyc
index 3cee2d1..5df9890 100644
Binary files a/walib/istsos/services/configsections/configsections.pyc and b/walib/istsos/services/configsections/configsections.pyc differ
diff --git a/walib/istsos/services/configsections/connection.py b/walib/istsos/services/configsections/connection.py
index c97974a..1789568 100755
--- a/walib/istsos/services/configsections/connection.py
+++ b/walib/istsos/services/configsections/connection.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator, waResourceService
 
 class waConnection(waResourceConfigurator):
diff --git a/walib/istsos/services/configsections/connection.pyc b/walib/istsos/services/configsections/connection.pyc
index dcae483..c8b7d87 100644
Binary files a/walib/istsos/services/configsections/connection.pyc and b/walib/istsos/services/configsections/connection.pyc differ
diff --git a/walib/istsos/services/configsections/geo.py b/walib/istsos/services/configsections/geo.py
index fcb5395..c51fb72 100755
--- a/walib/istsos/services/configsections/geo.py
+++ b/walib/istsos/services/configsections/geo.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator
 from walib import databaseManager
 
diff --git a/walib/istsos/services/configsections/geo.pyc b/walib/istsos/services/configsections/geo.pyc
index eda9ffd..5eeca51 100644
Binary files a/walib/istsos/services/configsections/geo.pyc and b/walib/istsos/services/configsections/geo.pyc differ
diff --git a/walib/istsos/services/configsections/getobservation.py b/walib/istsos/services/configsections/getobservation.py
old mode 100755
new mode 100644
index 2f868f2..362d4d4
--- a/walib/istsos/services/configsections/getobservation.py
+++ b/walib/istsos/services/configsections/getobservation.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator, waResourceService
 
 class waGetobservation(waResourceConfigurator):
diff --git a/walib/istsos/services/configsections/getobservation.pyc b/walib/istsos/services/configsections/getobservation.pyc
index 667d40a..4e8c782 100644
Binary files a/walib/istsos/services/configsections/getobservation.pyc and b/walib/istsos/services/configsections/getobservation.pyc differ
diff --git a/walib/istsos/services/configsections/identification.py b/walib/istsos/services/configsections/identification.py
old mode 100755
new mode 100644
index 447f86b..3926755
--- a/walib/istsos/services/configsections/identification.py
+++ b/walib/istsos/services/configsections/identification.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator, waResourceService
 
 class waIdentification(waResourceConfigurator):
diff --git a/walib/istsos/services/configsections/identification.pyc b/walib/istsos/services/configsections/identification.pyc
index 15f32e2..ff894af 100644
Binary files a/walib/istsos/services/configsections/identification.pyc and b/walib/istsos/services/configsections/identification.pyc differ
diff --git a/walib/istsos/services/configsections/provider.py b/walib/istsos/services/configsections/provider.py
index 4c205a1..8849951 100755
--- a/walib/istsos/services/configsections/provider.py
+++ b/walib/istsos/services/configsections/provider.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator, waResourceService
 import sys
 
diff --git a/walib/istsos/services/configsections/provider.pyc b/walib/istsos/services/configsections/provider.pyc
index d7982ee..ee16480 100644
Binary files a/walib/istsos/services/configsections/provider.pyc and b/walib/istsos/services/configsections/provider.pyc differ
diff --git a/walib/istsos/services/configsections/serviceurl.py b/walib/istsos/services/configsections/serviceurl.py
index fef5362..f58b4aa 100755
--- a/walib/istsos/services/configsections/serviceurl.py
+++ b/walib/istsos/services/configsections/serviceurl.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator
 
 class waServiceurl(waResourceConfigurator):
diff --git a/walib/istsos/services/configsections/serviceurl.pyc b/walib/istsos/services/configsections/serviceurl.pyc
index 639fc02..478e99d 100644
Binary files a/walib/istsos/services/configsections/serviceurl.pyc and b/walib/istsos/services/configsections/serviceurl.pyc differ
diff --git a/walib/istsos/services/configsections/urn.py b/walib/istsos/services/configsections/urn.py
old mode 100755
new mode 100644
index 2ee5745..36172e3
--- a/walib/istsos/services/configsections/urn.py
+++ b/walib/istsos/services/configsections/urn.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceConfigurator, waResourceService
 import sys
 
diff --git a/walib/istsos/services/configsections/urn.pyc b/walib/istsos/services/configsections/urn.pyc
index bdbcb45..4dcbaf7 100644
Binary files a/walib/istsos/services/configsections/urn.pyc and b/walib/istsos/services/configsections/urn.pyc differ
diff --git a/walib/istsos/services/dataqualities/__init__.py b/walib/istsos/services/dataqualities/__init__.py
index e1f71a0..77b7c62 100755
--- a/walib/istsos/services/dataqualities/__init__.py
+++ b/walib/istsos/services/dataqualities/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "dataqualities" ]
diff --git a/walib/istsos/services/dataqualities/__init__.pyc b/walib/istsos/services/dataqualities/__init__.pyc
new file mode 100644
index 0000000..5d6fd62
Binary files /dev/null and b/walib/istsos/services/dataqualities/__init__.pyc differ
diff --git a/walib/istsos/services/dataqualities/dataqualities.py b/walib/istsos/services/dataqualities/dataqualities.py
old mode 100755
new mode 100644
index 7c5d7d4..a7b79a8
--- a/walib/istsos/services/dataqualities/dataqualities.py
+++ b/walib/istsos/services/dataqualities/dataqualities.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import databaseManager
 from walib.resource import waResourceService
 import traceback
diff --git a/walib/istsos/services/dataqualities/dataqualities.pyc b/walib/istsos/services/dataqualities/dataqualities.pyc
new file mode 100644
index 0000000..9b6c641
Binary files /dev/null and b/walib/istsos/services/dataqualities/dataqualities.pyc differ
diff --git a/walib/istsos/services/epsgs/__init__.py b/walib/istsos/services/epsgs/__init__.py
index 3ddc54b..2b44b19 100755
--- a/walib/istsos/services/epsgs/__init__.py
+++ b/walib/istsos/services/epsgs/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "epsgs" ]
diff --git a/walib/istsos/services/epsgs/__init__.pyc b/walib/istsos/services/epsgs/__init__.pyc
index c62cdf4..8eed394 100644
Binary files a/walib/istsos/services/epsgs/__init__.pyc and b/walib/istsos/services/epsgs/__init__.pyc differ
diff --git a/walib/istsos/services/epsgs/epsgs.py b/walib/istsos/services/epsgs/epsgs.py
index d414aa3..d3e73f9 100755
--- a/walib/istsos/services/epsgs/epsgs.py
+++ b/walib/istsos/services/epsgs/epsgs.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import resource, utils, databaseManager, configManager
 from walib.resource import waResourceService
 import sys, os
diff --git a/walib/istsos/services/epsgs/epsgs.pyc b/walib/istsos/services/epsgs/epsgs.pyc
index 1fffdeb..8bb9412 100644
Binary files a/walib/istsos/services/epsgs/epsgs.pyc and b/walib/istsos/services/epsgs/epsgs.pyc differ
diff --git a/walib/istsos/services/logs/__init__.py b/walib/istsos/services/logs/__init__.py
new file mode 100755
index 0000000..accd675
--- /dev/null
+++ b/walib/istsos/services/logs/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = [ "logs" ]
diff --git a/walib/istsos/services/logs/logs.py b/walib/istsos/services/logs/logs.py
new file mode 100755
index 0000000..0bfbd33
--- /dev/null
+++ b/walib/istsos/services/logs/logs.py
@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from walib.resource import waResourceService
+from walib import databaseManager
+
+
+class waLogs(waResourceService):
+
+    def __init__(self, waEnviron):
+        waResourceService.__init__(self, waEnviron)
+        self.setData("")
+        pathinfo = waEnviron['pathinfo']
+
+        self.logs_id = None
+        if pathinfo[-1] != 'logs':
+            self.logs_id = pathinfo[-1]
+
+    def executeGet(self):
+        """
+        Method for executing a GET requests
+
+        Request:
+            (...)/istsos/wa/istsos/services/<service name>/logs/?message=TypeError
+                                                        &element=T_TREVANO
+                                                        &stime=2013-01-01T00:08:00.000000%2B0100
+                                                        &etime=2013-01-01T00:11:00.000000%2B0100
+                                                        &process=acquisition
+        The response is:
+        {
+                 [
+                    {
+                        "process": "acquisition",
+                        "element": "T_TREVANO",
+                        "datetime": "2013-01-01T00:10:00.000000+0100",
+                        "message": "TypeError",
+                        "details": "Error parsing line 200",
+                        "status": "pending"
+                    },
+                    {
+                        "process": "...",
+                        "element": "...",
+                        "datetime": "...",
+                        "message": "...",
+                        "details": "...",
+                        "status": "verified"
+                    }
+                ]
+            }
+        """
+        if self.service == "default":
+            raise Exception("logs operation can not be done for default service instance.")
+
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connection['user'],
+            self.serviceconf.connection['password'],
+            self.serviceconf.connection['dbname'],
+            self.serviceconf.connection['host'],
+            self.serviceconf.connection['port'])
+
+        if self.logs_id:
+            sql = "SELECT * FROM %s.cron_log " % (self.service)
+            sql += " WHERE id_clo= %s"
+            par = (self.logs_id,)
+            exceptions = servicedb.select(sql, par)
+        else:
+            exceptions = self.search_with_params(servicedb)
+
+        data = []
+        for exc in exceptions:
+            data.append(
+                    {
+                        "process": exc['process_clo'],
+                        "element": exc['element_clo'],
+                        "datetime": str(exc['datetime_clo']),
+                        "message": exc['message_clo'],
+                        "details": exc['details_clo'],
+                        "status": exc['status_clo'],
+                        "id": exc['id_clo']
+                    }
+            )
+
+        self.setMessage("logs result")
+        self.setData(data)
+
+    def executePost(self):
+        """
+        Method for executing a POST requests that insert a new exception
+         {
+                "process": "acquisition",
+                "element": "T_TREVANO",
+                "datetime": "2013-01-01T00:10:00.000000+0100",
+                "message": "TypeError",
+                "details": "Error parsing line 200"
+        }
+        """
+
+        if self.service == "default":
+            raise Exception("Logs operation can not be done for default service instance.")
+
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connection['user'],
+            self.serviceconf.connection['password'],
+            self.serviceconf.connection['dbname'],
+            self.serviceconf.connection['host'],
+            self.serviceconf.connection['port'])
+
+        #TODO: Add a error code to the table?
+        #check if exception exist
+
+        # Get procedure id
+        sql = "SELECT id_prc FROM %s.procedures WHERE " % self.service
+        sql += "name_prc = %s;"
+        par = (self.json['element'],)
+
+        procId = servicedb.execute(sql, par)
+
+        if(len(procId) != 1):
+            raise Exception("Procedure %s not found." % (self.json['element']))
+
+        sql = "INSERT INTO %s.cron_log(process_clo, element_clo, datetime_clo,message_clo,details_clo,id_prc_fk, status_clo)" % self.service
+        sql += " VALUES (%s, %s, %s, %s, %s, %s, %s);"
+        par = (self.json['process'], self.json['element'],
+                self.json['datetime'], self.json['message'],
+                self.json['details'], procId[0][0], 'pending')
+        servicedb.execute(sql, par)
+        self.setMessage("Added exception")
+
+    def executePut(self):
+        """
+            Method for executing a PUT requests that update the status of a  exception
+            Update a exception status
+
+            {
+                "id" : 1,
+                "newstatus" : "verified"
+            }
+        """
+        if self.service == "default":
+            raise Exception("Logs operation can not be done for default service instance.")
+
+        if self.logs_id == None:
+            raise Exception("Please select a valid logs id.")
+
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connection['user'],
+            self.serviceconf.connection['password'],
+            self.serviceconf.connection['dbname'],
+            self.serviceconf.connection['host'],
+            self.serviceconf.connection['port'])
+
+        if (self.json['newstatus'] is None):
+            raise Exception("Not params.")
+
+        sql = "UPDATE %s.cron_log SET" % self.service
+        sql += " status_clo = %s WHERE id_clo = %s"
+        par = (self.json['newstatus'], self.logs_id)
+        servicedb.execute(sql, par)
+        self.setMessage("Status changed")
+
+    def executeDelete(self):
+        """
+             Method for executing a DELETE requests that remove a exception
+            (...)/istsos/wa/istsos/<service name>/logs_id
+        """
+        if self.service == "default":
+            raise Exception("Logs operation can not be done for default service instance.")
+
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connection['user'],
+            self.serviceconf.connection['password'],
+            self.serviceconf.connection['dbname'],
+            self.serviceconf.connection['host'],
+            self.serviceconf.connection['port'])
+
+        if self.logs_id is None:
+            raise Exception("No exception id specified")
+
+        sql = "DELETE FROM %s.cron_log" % self.service
+        sql += " WHERE id_clo = %s"
+        par = (self.logs_id,)
+        servicedb.execute(sql, par)
+        self.setMessage("Exception removed")
+
+
+    def search_with_params(self, servicedb):
+        params = self.waEnviron['parameters']
+        par = ()
+        sql = """SELECT datetime_clo, * FROM %s.cron_log, %s.procedures """ % (self.service, self.service)
+        sql += " WHERE id_prc_fk = id_prc "
+
+        # where
+        if not params == None:
+            keyList = params.keys()
+
+            if 'message' in keyList:
+                sql += " AND ( message_clo = %s) "
+                par += (params['message'][0],)
+
+            if 'stime' in keyList:
+                sql += " AND  (datetime_clo > %s::timestamptz)"
+                par += (params['stime'][0],)
+
+            if 'etime' in keyList:
+                sql += " AND  (datetime_clo < %s::timestamptz)"
+                par += (params['etime'][0],)
+
+            if 'process' in keyList:
+                sql += " AND  (process_clo = %s )"
+                par += (params['process'][0],)
+
+            if 'element' in keyList:
+                sql += " AND  (element_clo = %s )"
+                par += (params['element'][0],)
+
+            if 'status' in keyList:
+                if params['status'][0] in ('verified', 'pending'):
+                    sql += " AND (status_clo = %s)"
+                    par += (params['status'][0],)
+                else:
+                    raise Exception("Status %s not supported." % params['status'][0])
+
+        # Sort by date
+        sql += " ORDER BY datetime_clo DESC;"
+
+        res = servicedb.select(sql, par)
+        return res
diff --git a/walib/istsos/services/observedproperties/__init__.py b/walib/istsos/services/observedproperties/__init__.py
index 4498650..5c7cc33 100755
--- a/walib/istsos/services/observedproperties/__init__.py
+++ b/walib/istsos/services/observedproperties/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "observedproperties"]
diff --git a/walib/istsos/services/observedproperties/__init__.pyc b/walib/istsos/services/observedproperties/__init__.pyc
new file mode 100644
index 0000000..2c98343
Binary files /dev/null and b/walib/istsos/services/observedproperties/__init__.pyc differ
diff --git a/walib/istsos/services/observedproperties/observedproperties.py b/walib/istsos/services/observedproperties/observedproperties.py
old mode 100755
new mode 100644
index 8eb3198..0b7d654
--- a/walib/istsos/services/observedproperties/observedproperties.py
+++ b/walib/istsos/services/observedproperties/observedproperties.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import databaseManager #, procedure, resource, utils, configManager
 from walib.resource import waResourceService
 #import sys, os, shutil, errno
diff --git a/walib/istsos/services/observedproperties/observedproperties.pyc b/walib/istsos/services/observedproperties/observedproperties.pyc
new file mode 100644
index 0000000..1c0bdd3
Binary files /dev/null and b/walib/istsos/services/observedproperties/observedproperties.pyc differ
diff --git a/walib/istsos/services/offerings/__init__.py b/walib/istsos/services/offerings/__init__.py
index 6f3e59c..798cca4 100755
--- a/walib/istsos/services/offerings/__init__.py
+++ b/walib/istsos/services/offerings/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "offerings"]
diff --git a/walib/istsos/services/offerings/__init__.pyc b/walib/istsos/services/offerings/__init__.pyc
index 1274bef..f4273ac 100644
Binary files a/walib/istsos/services/offerings/__init__.pyc and b/walib/istsos/services/offerings/__init__.pyc differ
diff --git a/walib/istsos/services/offerings/offerings.py b/walib/istsos/services/offerings/offerings.py
index 1cd255e..f7dc03a 100755
--- a/walib/istsos/services/offerings/offerings.py
+++ b/walib/istsos/services/offerings/offerings.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import resource, utils, databaseManager, configManager
 from walib.resource import waResourceService
 import sys, os
diff --git a/walib/istsos/services/offerings/offerings.pyc b/walib/istsos/services/offerings/offerings.pyc
index 7a1744d..af2a5bb 100644
Binary files a/walib/istsos/services/offerings/offerings.pyc and b/walib/istsos/services/offerings/offerings.pyc differ
diff --git a/walib/istsos/services/offerings/procedures/__init__.py b/walib/istsos/services/offerings/procedures/__init__.py
index dd8fd91..d27ec00 100755
--- a/walib/istsos/services/offerings/procedures/__init__.py
+++ b/walib/istsos/services/offerings/procedures/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "procedures" ]
diff --git a/walib/istsos/services/offerings/procedures/__init__.pyc b/walib/istsos/services/offerings/procedures/__init__.pyc
index b26b33f..e9ef628 100644
Binary files a/walib/istsos/services/offerings/procedures/__init__.pyc and b/walib/istsos/services/offerings/procedures/__init__.pyc differ
diff --git a/walib/istsos/services/offerings/procedures/procedures.py b/walib/istsos/services/offerings/procedures/procedures.py
index 4b8a74a..d3e347d 100755
--- a/walib/istsos/services/offerings/procedures/procedures.py
+++ b/walib/istsos/services/offerings/procedures/procedures.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import utils, databaseManager
 from walib.resource import waResourceService
 
diff --git a/walib/istsos/services/offerings/procedures/procedures.pyc b/walib/istsos/services/offerings/procedures/procedures.pyc
index 69a389b..06457e3 100644
Binary files a/walib/istsos/services/offerings/procedures/procedures.pyc and b/walib/istsos/services/offerings/procedures/procedures.pyc differ
diff --git a/walib/istsos/services/procedures/__init__.py b/walib/istsos/services/procedures/__init__.py
index dd8fd91..d27ec00 100755
--- a/walib/istsos/services/procedures/__init__.py
+++ b/walib/istsos/services/procedures/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "procedures" ]
diff --git a/walib/istsos/services/procedures/__init__.pyc b/walib/istsos/services/procedures/__init__.pyc
index d66d0e2..0f2daf2 100644
Binary files a/walib/istsos/services/procedures/__init__.pyc and b/walib/istsos/services/procedures/__init__.pyc differ
diff --git a/walib/istsos/services/procedures/procedures.py b/walib/istsos/services/procedures/procedures.py
old mode 100755
new mode 100644
index 9d1d054..43cd9eb
--- a/walib/istsos/services/procedures/procedures.py
+++ b/walib/istsos/services/procedures/procedures.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import procedure, utils, databaseManager
 from walib.resource import waResourceService
 import lib.requests as requests
 import os
 import sys
 
+convertToSec = {
+'min': lambda x: x * 60,
+'h': lambda x: x * 3600,
+'d': lambda x: x * 24 * 3600,
+'s': lambda x: x,
+'ms': lambda x: x/1000,
+'us': lambda x: x/1000000,
+}
+
 class waProcedures(waResourceService):
     """class to handle SOS service objects, support GET and POST method"""
 
@@ -171,8 +185,7 @@ class waProcedures(waResourceService):
         response = requests.post(
             self.serviceconf.serviceurl["url"],
             data=smlstring,
-            headers={"Content-type": "text/xml"},
-            prefetch=True
+            headers={"Content-type": "text/xml"}
         )
 
         try:
@@ -269,6 +282,8 @@ class waProcedures(waResourceService):
         msg1 = ""
         msg2 = ""
 
+             
+        
         if proc.data['system'] != self.procedurename:
             #rename procedure in transaction
             sql  = "UPDATE %s.procedures" % self.service
@@ -284,6 +299,27 @@ class waProcedures(waResourceService):
 
             msg1 = "Procedure '%s' successfully renamed to '%s'" %(self.procedurename,str(self.json["system"]))
 
+# Update for sapling time and acquisition time
+        time_acq_val = None
+        time_sam_val = None
+
+        for cap in proc.data['capabilities']:
+            if 'samplingTimeResolution' in cap['definition']:
+                
+                time_sam_val = convertToSec[cap['uom']](int(cap['value'])) # convertToSec(cap['uom'],int(cap['value']))
+                #print >> sys.stderr, "Sampling value: ",time_sam_val, cap['value']
+                
+            elif 'acquisitionTimeResolution' in cap['definition']:
+                
+                time_acq_val = convertToSec[cap['uom']](int(cap['value'])) # convertToSec(cap['uom'],int(cap['value']))
+                #print >> sys.stderr, "Acquisition value: ",time_acq_val, cap['value']
+                
+
+        sql = "UPDATE %s.procedures" % self.service
+        sql += " SET time_res_prc = %s, time_acq_prc = %s WHERE name_prc= %s"
+        params = (time_sam_val,time_acq_val,self.procedurename)                
+        servicedb.executeInTransaction(sql,params)
+                
         #allows to update observed property constraints
         for obsprop in proc.data['outputs']:
             if "constraint" in obsprop:
@@ -467,23 +503,22 @@ class waProcedures(waResourceService):
         }
         """
 
-        import lib.requests as requests
-        res = requests.get(
-            self.serviceconf.serviceurl["url"],
-            params={
-                "request": "DescribeSensor",
-                "procedure": self.procedurename,
-                "outputFormat": "text/xml;subtype=\"sensorML/1.0.1\"",
-                "service": "SOS",
-                "version": "1.0.0"
-            }
-        )
-
-        smlobj = procedure.Procedure()
         try:
+            import lib.requests as requests
+            res = requests.get(
+                self.serviceconf.serviceurl["url"],
+                params={
+                    "request": "DescribeSensor",
+                    "procedure": self.procedurename,
+                    "outputFormat": "text/xml;subtype=\"sensorML/1.0.1\"",
+                    "service": "SOS",
+                    "version": "1.0.0"
+                }
+            )
+            smlobj = procedure.Procedure()
             smlobj.loadXML(res.content)
         except Exception as e:
-            print >> sys.stderr, "\n\nSML: %s\n\n" % res.content
+            print >> sys.stderr, "\n\nSML: %s\n%s\n" % (self.procedurename,res.content)
             raise Exception("Error loading DescribeSensor of '%s' [STATUS CODE: %s]: %s" % (self.procedurename,res.status_code,e))
 
         # Searching for the assignedSensorId from the database
@@ -507,6 +542,7 @@ class waProcedures(waResourceService):
         else:
             self.setException("Unable to find the procedure's assignedSensorId")
 
+    
 
 
 class waGetlist(waResourceService):
@@ -548,6 +584,7 @@ class waGetlist(waResourceService):
             self.setData(data)
             self.setMessage("Procedures of service <%s> successfully retrived" % self.servicename)
 
+  
 
 class waGetGeoJson(waResourceService):
     """
@@ -558,7 +595,7 @@ class waGetGeoJson(waResourceService):
 
         import pprint
         pp = pprint.PrettyPrinter(indent=4)
-        print >> sys.stderr, "\n\nENVIRON: %s" % pp.pprint(self.serviceconf.get("geo")['istsosepsg'])
+        #print >> sys.stderr, "\n\nENVIRON: %s" % pp.pprint(self.serviceconf.get("geo")['istsosepsg'])
 
         if self.waEnviron['parameters'] and self.waEnviron['parameters']['epsg']:
             self.epsg = self.waEnviron['parameters']['epsg'][0]
@@ -574,20 +611,51 @@ class waGetGeoJson(waResourceService):
                     "type": "FeatureCollection",
                     "features": []
                 }
+                
                 servicedb = databaseManager.PgDB(self.serviceconf.connection['user'],
                                                 self.serviceconf.connection['password'],
                                                 self.serviceconf.connection['dbname'],
                                                 self.serviceconf.connection['host'],
                                                 self.serviceconf.connection['port']
                 )
+
                 proceduresList = utils.getProcedureNamesList(servicedb,self.service)
                 for proc in proceduresList:
+                    
+                    
+                    if proc['samplingTime']['beginposition'] == '':
+                        print >> sys.stderr, proc['name']
+                        import lib.requests as requests
+                        res = requests.get(
+                            self.serviceconf.serviceurl["url"],
+                            params={
+                                "request": "DescribeSensor",
+                                "procedure": proc['name'],
+                                "outputFormat": "text/xml;subtype=\"sensorML/1.0.1\"",
+                                "service": "SOS",
+                                "version": "1.0.0"
+                            }
+                        )
+
+                        smlobj = procedure.Procedure()
+                        try:
+                            smlobj.loadXML(res.content)
+                        except Exception as e:
+                            print >> sys.stderr, "\n\nSML: %s\n\n" % res.content
+                            raise Exception("Error loading DescribeSensor of '%s' [STATUS CODE: %s]: %s" % (proc['name'],res.status_code,e))
+                        ret = {}
+                        ret.update(smlobj.data)    
+
+                        proc['samplingTime']['beginposition'] = ret['outputs'][0]['constraint']['interval'][0]
+                        proc['samplingTime']['endposition'] = ret['outputs'][0]['constraint']['interval'][1]
+                        #print >> sys.stderr, ret['outputs'][0]['constraint']['interval']                    
+                    
                     elem = {}
                     elem.update(proc)
                     #elem["name"] = proc["name"]
                     ops = utils.getObservedPropertiesFromProcedure(servicedb,self.service,proc["name"])
                     if ops != None:
-                        elem["observedproperties"] = [ {"name" : op["name"], "uom" : op["uom"]  } for op in ops ]
+                        elem["observedproperties"] = [ {"name" : op["name"], "def" : op["def"], "uom" : op["uom"]  } for op in ops ]
                     else:
                         elem["observedproperties"] = []
                     offs = utils.getOfferingsFromProcedure(servicedb,self.service,proc["name"])
@@ -616,4 +684,5 @@ class waGetGeoJson(waResourceService):
     def setData(self,data):
         """ Set data in response """
         self.response = data
-
+        
+     
diff --git a/walib/istsos/services/procedures/procedures.pyc b/walib/istsos/services/procedures/procedures.pyc
index 35db809..d47f2f9 100644
Binary files a/walib/istsos/services/procedures/procedures.pyc and b/walib/istsos/services/procedures/procedures.pyc differ
diff --git a/walib/istsos/services/services.py b/walib/istsos/services/services.py
old mode 100755
new mode 100644
index d8287a5..11ba6e7
--- a/walib/istsos/services/services.py
+++ b/walib/istsos/services/services.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import utils, databaseManager, configManager
 from walib.resource import waResourceAdmin, waResourceService
 import sys, os, shutil, errno
@@ -493,23 +498,30 @@ class waGetobservation(waResourceService):
             rparams.update({
                 "eventTime": "/".join(eventtime)
             })
-            
+        
+        if self.waEnviron['parameters'] and 'aggregatefunction' in self.waEnviron['parameters']:
+            rparams.update({
+                "aggregatefunction": self.waEnviron['parameters']["aggregatefunction"],
+                "aggregateinterval": self.waEnviron['parameters']["aggregateinterval"]
+            })
+            if 'aggregatenodata' in self.waEnviron['parameters']:
+                rparams.update({
+                    "aggregatenodata": self.waEnviron['parameters']["aggregatenodata"]
+                })
+            if 'aggregatenodataqi' in self.waEnviron['parameters']:
+                rparams.update({
+                    "aggregatenodataqi": self.waEnviron['parameters']["aggregatenodataqi"]
+                })
+          
         response = requests.get(
             self.serviceconf.serviceurl["url"], 
             params=rparams
         )
         
-        obsjson = response.json
-        
-        '''try:
-            obsjson["ObservationCollection"]["member"][0]["observedProperty"]["components"] = obsjson["ObservationCollection"]["member"][0]["observedProperty"]["component"]
-        except:
-            print >> sys.stderr,  "ERROR"
-            pass'''
-            
         # build the response --------------------------------------------------- 
         try:
             response.raise_for_status()
+            obsjson = response.json()
             self.setData( obsjson["ObservationCollection"]["member"] )
             self.setMessage("GetObservation requested successfully executed")
         except Exception as e:
@@ -697,8 +709,6 @@ class waInsertobservation(waResourceService):
                     uom = et.SubElement(Quantity, "{%s}uom" % ns['swe'] )
                     uom.attrib["code"] = item["uom"]
                 
-                
-                
         encoding = et.SubElement(DataArray, "{%s}encoding" % ns['swe'] )
         TextBlock = et.SubElement(encoding, "{%s}TextBlock" % ns['swe'] )
         TextBlock.attrib["tokenSeparator"] = ","
@@ -717,7 +727,7 @@ class waInsertobservation(waResourceService):
             data=iostring, 
             headers={
                 "Content-type": "text/xml",
-                "User-Agent": "Walib post"
+                "User-Agent": "WalibPost;InsertObservation"
             }
         )
         data = response.text
diff --git a/walib/istsos/services/services.pyc b/walib/istsos/services/services.pyc
deleted file mode 100644
index 48d276b..0000000
Binary files a/walib/istsos/services/services.pyc and /dev/null differ
diff --git a/walib/istsos/services/status/__init__.py b/walib/istsos/services/status/__init__.py
new file mode 100755
index 0000000..5c9d07a
--- /dev/null
+++ b/walib/istsos/services/status/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = [ "status" ]
+
diff --git a/walib/istsos/services/status/status.py b/walib/istsos/services/status/status.py
new file mode 100755
index 0000000..83e70fb
--- /dev/null
+++ b/walib/istsos/services/status/status.py
@@ -0,0 +1,389 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from walib.resource import waResourceService
+from walib import databaseManager
+from walib import utils
+
+from datetime import datetime, timedelta
+import time
+from lib.pytz import timezone
+
+getErrorCode = {
+'ParsingError': 1,
+'TypeError': 2,
+'EOFError': 3,
+'IndexError': 4,
+'BufferError': 5
+}
+
+
+class waStatus(waResourceService):
+
+    def __init__(self, waEnviron):
+        waResourceService.__init__(self, waEnviron)
+
+    def executeGet(self):
+        """
+        Request:
+            (...)/istsos/wa/istsos/<service name>/status/?type=delay
+
+        The response is:
+        >>>
+        [
+            {
+                "name": "air-rainfall",
+                "children": [
+                    {
+                        "name": "ok",
+                        "children": [
+                            {}
+                        ]
+                    },
+                    {
+                        "name": "pending",
+                        "children": [
+                            {
+                                "delay": 35243.204681,
+                                "lastObservation": "2014-05-12T07:00:00+0200",
+                                "code": [
+                                    2
+                                ],
+                                "name": "LOCARNO",
+                                "oum": "mm",
+                                "exceptions": [
+                                    {
+                                        "status": "pending",
+                                        "process": "acquisition",
+                                        "datetime": "2014-05-12 09:00:00+02:00",
+                                        "details": null,
+                                        "message": "TypeError",
+                                        "element": "LOCARNO",
+                                        "id": 2
+                                    }
+                                ],
+                                "lastMeasure": "2.000000",
+                                "cycle": 4.894889539027778
+                            },
+                            {
+                                "delay": 540143.269259,
+                                "lastObservation": "2014-05-06T10:45:00+0200",
+                                "code": [
+                                    1,
+                                    2,
+                                    3
+                                ],
+                                "name": "P_LUGANO",
+                                "oum": "mm",
+                                "exceptions": [
+                                    {
+                                        "details": "No exception found"
+                                    }
+                                ],
+                                "lastMeasure": "32.000000",
+                                "cycle": 75.01989850819444
+                            }
+                        ]
+                    },
+                    {
+                        "name": "verified",
+                        "children": [
+                            {
+                                "delay": 49163.155455,
+                                "lastObservation": "2014-05-12T03:08:00+0200",
+                                "code": [
+                                    1,
+                                    2,
+                                    3
+                                ],
+                                "name": "BELLINZONA",
+                                "oum": "mm",
+                                "exceptions": [
+                                    {
+                                        "status": "verified",
+                                        "process": "acquisition",
+                                        "datetime": "2014-05-12 05:00:00+02:00",
+                                        "details": null,
+                                        "message": "TypeError",
+                                        "element": "BELLINZONA",
+                                        "id": 1
+                                    }
+                                ],
+                                "lastMeasure": "1.000000",
+                                "type": "verified",
+                                "cycle": 13.656432070833333
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "name": "air-temperature",
+                "children":[...]
+            }
+        ]
+        """
+
+        if self.service == "default":
+            raise Exception("Status operation can not be done for default service instance.")
+
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connection['user'],
+            self.serviceconf.connection['password'],
+            self.serviceconf.connection['dbname'],
+            self.serviceconf.connection['host'],
+            self.serviceconf.connection['port'])
+
+        #param = self.waEnviron['parameters']['type'][0]
+
+        procedureData = []
+        lastValue = {'values': 'No observation', 'uom': 'No observation'}
+        for procedure in utils.getProcedureNamesList(servicedb, self.service):
+
+            #if param == 'delay':
+            status = self.__delay(procedure['name'], servicedb)
+            if status is None:
+                continue
+            #else:
+                #raise Exception("Operation %s not permitted." % (param))
+
+            if(status['status'] == 'NOT OK'):
+                # Require last exceptions
+                logEnviron = self.waEnviron.copy()
+                logEnviron['parameters'] = {}
+                from walib.istsos.services.logs import logs
+                log = logs.waLogs(logEnviron)
+
+                logEnviron['parameters'] = {'element': [procedure['name']],
+                                        'stime': [status['lastObservation']]}
+
+                log.executeGet()
+
+            if(status['lastObservation'] != 'No observation'):
+                # Convert last Observation to string
+                status['lastObservation'] = status['lastObservation'].strftime("%Y-%m-%dT%H:%M:%S%z")
+                lastValue = self.__getLastObservation(servicedb,procedure['name'])
+
+            procedureData.append(
+                {
+                    "procedure": procedure['name'],
+                    "status": status,
+                    "lastMeasure": lastValue,
+                    "exception": log.response['data']
+                }
+            )
+
+        jsonResult = []
+        for op in utils.getObsPropNamesList(servicedb, self.service):
+            propOk = []
+            propNotOk = []
+            propVerif = []
+            for procedure in procedureData:
+                if self.__containsOp(procedure, op['name']):
+                    lastValue = self.__getLastValue(procedure, op['name'])
+                    jsonProc = {
+                                    "name": procedure['procedure'],
+                                    "lastObservation": procedure['status']['lastObservation'],
+                                    "lastMeasure": lastValue['values'],
+                                    "oum": lastValue['uom'],
+                                    "delay": procedure['status']['delay'],
+                                    "cycle": procedure['status']['cycle']
+                                }
+                    if procedure['status']['status'] == "OK":
+                        jsonProc['type'] = 'ok'
+                        propOk.append(jsonProc)
+
+                    elif procedure['status']['status'] == "NOT OK":
+                        code = []
+                        if procedure['exception']:
+                            for exc in procedure['exception']:
+                                if exc['message'] in getErrorCode:
+                                    code.append(getErrorCode[exc['message']])
+                                else:
+                                    code.append(0)
+
+                            jsonProc['code'] = code
+                            jsonProc['exceptions'] = procedure['exception']
+
+                            if(self.__checkError(procedure['exception'])):
+                                propNotOk.append(jsonProc)
+                            else:
+                                jsonProc['type'] = 'verified'
+                                propVerif.append(jsonProc)
+                        else:
+                            jsonProc['exceptions'] = [{"details": "No exceptions found"}]
+                            propNotOk.append(jsonProc)
+
+            if(len(propOk) == 0):
+                propOk.append({})
+            if(len(propNotOk) == 0):
+                propNotOk.append({})
+            if(len(propVerif) == 0):
+                propVerif.append({})
+
+            jsonResult.append({
+                "name": op['name'],
+                "children": [
+                    {"name": "ok", "children": propOk},
+                    {"name":"pending", "children": propNotOk},
+                    {"name": "verified", "children": propVerif}
+                ]
+                }
+            )
+
+        self.setMessage("Status result")
+        self.setData(jsonResult)
+
+    def __getLastValue(self, procedureJson, opName):
+        """
+            retrun the last measurement
+        """
+        for op in procedureJson['lastMeasure']:
+            if op['op'] == opName:
+                return op
+
+    def __containsOp(self, procedureJson, opName):
+        """
+            check if the procedure contains the op
+        """
+        for op in procedureJson['lastMeasure']:
+            if op['op'] == opName:
+                return True
+        return False
+
+    def __checkError(self, excList):
+        for exc in excList:
+            if(exc['status'] == 'pending'):
+                return True
+        return False
+
+    def __delay(self, procedureName, servicedb):
+        """
+            Get the delay status (check last observation and sampling time)
+            return a dict containing status, last observation, delay (s), and cycle delay
+        """
+        sql = """
+        SELECT p.etime_prc as time, p.time_acq_prc as delay
+        FROM  %s.procedures p
+        WHERE
+        """ % (self.service,)
+
+        sql += """ p.name_prc = %s;
+        """
+        par = (procedureName,)
+        row = servicedb.select(sql, par)
+        statusDict = {}
+
+        # if exist the procedure
+        if len(row) == 1:
+
+            lastDate = row[0]['time']
+            if row[0]['delay'] is None:
+                return None
+
+            delay = int(row[0]['delay'])
+
+            if delay == 0:
+                return None
+
+            nowDate = datetime.now().replace(tzinfo=timezone(time.tzname[0]))
+
+            limitDelay = timedelta(seconds=delay).total_seconds()
+            tmpDelay = 0
+            tmpCycle = 0
+
+            if lastDate is None:
+                status = "No observation"
+                lastDate = "No observation"
+            else:
+                tmpDelta = (nowDate - lastDate).total_seconds()
+                if(tmpDelta > limitDelay) and delay > 0:
+                    status = "NOT OK"
+                    tmpDelay = tmpDelta
+                else:
+                    status = "OK"
+                    tmpDelay = limitDelay - tmpDelta
+
+                if limitDelay > 0:
+                    tmpCycle = tmpDelta / limitDelay
+                else:
+                    tmpCycle = 0
+                    tmpDelay = 0
+
+            statusDict['status'] = status
+            statusDict['lastObservation'] = lastDate
+        else:
+            statusDict['status'] = "No observation"
+            statusDict['lastObservation'] = "No observation"
+
+        statusDict['delay'] = tmpDelay
+        statusDict['cycle'] = tmpCycle
+
+        return statusDict
+
+    def __getLastObservation(self, servicedb, procedureName):
+        """
+            request the last observation
+        """
+        opList = utils.getObservedPropertiesFromProcedure(servicedb,self.service,procedureName)
+        name = ""
+
+        for op in opList:
+            name += op['name'] + ","
+
+        offering = utils.getOfferingsFromProcedure(servicedb,self.service,procedureName)
+
+        # request the last observation of the procedure
+        rparams = {
+            "request": "GetObservation",
+            "service": "SOS",
+            "version": "1.0.0",
+            "procedure": procedureName,
+            "observedProperty": name,
+            "responseFormat": "application/json",
+            "offering": offering[0]['name']
+        }
+
+        import lib.requests as requests
+        response = requests.get(
+            self.serviceconf.serviceurl["url"],
+            params=rparams
+        )
+
+        dataArray = response.json()['ObservationCollection']['member'][0]['result']['DataArray']
+        # Value field
+        data = []
+        if not len(dataArray['values']) == 0:
+            # last vaue field
+            lastValue = dataArray['values'][0]
+            # op and uom fileds
+            field = dataArray['field']
+            for i in range(1, len(lastValue)):
+                data.append(
+                    {
+                        "values": lastValue[i],
+                        "op": field[i]['name'],
+                        "uom": field[i]['uom']
+                    }
+                )
+
+        return data
diff --git a/walib/istsos/services/systemtypes/__init__.py b/walib/istsos/services/systemtypes/__init__.py
old mode 100755
new mode 100644
index 8204305..2063907
--- a/walib/istsos/services/systemtypes/__init__.py
+++ b/walib/istsos/services/systemtypes/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "systemtypes"]
diff --git a/walib/istsos/services/systemtypes/__init__.pyc b/walib/istsos/services/systemtypes/__init__.pyc
deleted file mode 100644
index dc772f8..0000000
Binary files a/walib/istsos/services/systemtypes/__init__.pyc and /dev/null differ
diff --git a/walib/istsos/services/systemtypes/systemtypes.py b/walib/istsos/services/systemtypes/systemtypes.py
old mode 100755
new mode 100644
index 681c16f..e97f87e
--- a/walib/istsos/services/systemtypes/systemtypes.py
+++ b/walib/istsos/services/systemtypes/systemtypes.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2013 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import databaseManager
 from walib.resource import waResourceService
 
diff --git a/walib/istsos/services/systemtypes/systemtypes.pyc b/walib/istsos/services/systemtypes/systemtypes.pyc
deleted file mode 100644
index a89e48b..0000000
Binary files a/walib/istsos/services/systemtypes/systemtypes.pyc and /dev/null differ
diff --git a/walib/istsos/services/uoms/__init__.py b/walib/istsos/services/uoms/__init__.py
index 0ef09e9..e99e2a3 100755
--- a/walib/istsos/services/uoms/__init__.py
+++ b/walib/istsos/services/uoms/__init__.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "uoms"]
diff --git a/walib/istsos/services/uoms/__init__.pyc b/walib/istsos/services/uoms/__init__.pyc
new file mode 100644
index 0000000..6c0e566
Binary files /dev/null and b/walib/istsos/services/uoms/__init__.pyc differ
diff --git a/walib/istsos/services/uoms/uoms.py b/walib/istsos/services/uoms/uoms.py
old mode 100755
new mode 100644
index 70c38d8..bcf6a49
--- a/walib/istsos/services/uoms/uoms.py
+++ b/walib/istsos/services/uoms/uoms.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib import procedure, resource, utils, databaseManager, configManager
 from walib.resource import waResourceService
 import sys, os, shutil, errno
diff --git a/walib/istsos/services/uoms/uoms.pyc b/walib/istsos/services/uoms/uoms.pyc
new file mode 100644
index 0000000..8c603ab
Binary files /dev/null and b/walib/istsos/services/uoms/uoms.pyc differ
diff --git a/walib/istsos/services/virtualprocedures/__init__.py b/walib/istsos/services/virtualprocedures/__init__.py
old mode 100755
new mode 100644
index 9f53c45..23dad24
--- a/walib/istsos/services/virtualprocedures/__init__.py
+++ b/walib/istsos/services/virtualprocedures/__init__.py
@@ -1,3 +1,23 @@
 # -*- coding: utf-8 -*-
-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 __all__ = [ "virtualprocedures", "ratingcurve", "code" ]
diff --git a/walib/istsos/services/virtualprocedures/code.py b/walib/istsos/services/virtualprocedures/code.py
old mode 100755
new mode 100644
index ad38eb4..c09b7a3
--- a/walib/istsos/services/virtualprocedures/code.py
+++ b/walib/istsos/services/virtualprocedures/code.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
-#---------------------------------------------------------------------------
-# istSOS - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
-#---------------------------------------------------------------------------
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#---------------------------------------------------------------------------
-# Created on Thu Aug 29 17:28:18 2013
-#---------------------------------------------------------------------------
+#
+# ===============================================================================
 """
 description:
     
diff --git a/walib/istsos/services/virtualprocedures/ratingcurve.py b/walib/istsos/services/virtualprocedures/ratingcurve.py
old mode 100755
new mode 100644
index fc93598..ffca338
--- a/walib/istsos/services/virtualprocedures/ratingcurve.py
+++ b/walib/istsos/services/virtualprocedures/ratingcurve.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 from walib.resource import waResourceService
 import sys, os
 
diff --git a/walib/istsos/services/virtualprocedures/virtualprocedures.py b/walib/istsos/services/virtualprocedures/virtualprocedures.py
old mode 100755
new mode 100644
index 0aef394..fde6bbe
--- a/walib/istsos/services/virtualprocedures/virtualprocedures.py
+++ b/walib/istsos/services/virtualprocedures/virtualprocedures.py
@@ -1,5 +1,25 @@
 # -*- coding: utf-8 -*-
-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 from walib import databaseManager, utils
 from walib.istsos.services.procedures.procedures import waProcedures
 from walib.resource import waResourceService
diff --git a/walib/procedure.py b/walib/procedure.py
old mode 100755
new mode 100644
index 1f3e402..d0936cd
--- a/walib/procedure.py
+++ b/walib/procedure.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import sys, traceback
 import json
 from lib.etree import et
@@ -83,11 +88,20 @@ class Procedure():
             raise TypeError("xml input must be a string representing the XML itself or the path to the file where the XML is stored")
             #tree, ns = parse_and_get_ns(xml)
         
+        # Workaround for rare xml parsing bug in etree
+        ns = {
+            'swe': 'http://www.opengis.net/swe/1.0.1',
+            'gml': 'http://www.opengis.net/gml',
+            'sml': 'http://www.opengis.net/sensorML/1.0.1',
+            'xlink': 'http://www.w3.org/1999/xlink',
+            'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
+        }
+        
         #-----System name/identifier------
         system = tree.find("{%s}member/{%s}System" %(ns['sml'],ns['sml']) )
         try:
             self.data['system_id'] = system.attrib[ "{%s}id" % ns['gml'] ]
-        except:
+        except Exception as e:
             raise SyntaxError("Error in <sml:member>: <sml:System> element or mandatory attribute are missing")
         
         systemname = tree.find("{%s}member/{%s}System/{%s}name" %(ns['sml'],ns['sml'],ns['gml']) )
@@ -231,7 +245,9 @@ class Procedure():
                 except:
                     item["web"] = ""
                 self.data["contacts"].append(item)
-            except:
+            except Exception as e:
+                print "ECCEZIONE: "
+                print str(e)
                 raise SyntaxError("Error in <swe:contact>: some <swe:contact> mandatory sub elements or attributes are missing")
             
         
diff --git a/walib/procedure.pyc b/walib/procedure.pyc
index 6371631..91ce4d6 100644
Binary files a/walib/procedure.pyc and b/walib/procedure.pyc differ
diff --git a/walib/resource.py b/walib/resource.py
old mode 100755
new mode 100644
index 935bc2a..42b88a9
--- a/walib/resource.py
+++ b/walib/resource.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import sys, os
 from walib import configManager
 from walib import utils as ut
@@ -23,7 +28,7 @@ class waResource(object):
     """
     Base class for istSOS Web Admin REST operations
     """
-    
+
     def __init__(self, waEnviron,loadjson=True):
         """
         Initialize resource object
@@ -41,55 +46,55 @@ class waResource(object):
         self.postRequest = None
         if self.method in ["POST","PUT"] and loadjson==True:
             import json
-            
+
             self.json = ut.encodeobject(json.loads(waEnviron['wsgi_input']))
-    
+
     def validateGet(self):
         """ base method to validate GET request """
         raise Exception("%s.validateGet method is not implemented!" % self.__class__.__name__)
-        
+
     def validatePost(self):
         """ base method to validate POST request """
         raise Exception("%s.validatePost method is not implemented!" % self.__class__.__name__)
-        
+
     def validatePut(self):
         """ base method to validate PUT request """
         raise Exception("%s.validatePut method is not implemented!" % self.__class__.__name__)
-        
+
     def validateDelete(self):
         """ base method to validate DELETE request """
         raise Exception("%s.validateDelete method is not implemented!" % self.__class__.__name__)
-        
+
     def executeGet(self):
         """ base method to execute GET request """
         raise Exception("%s.executeGet method is not implemented!" % self.__class__.__name__)
-        
+
     def executePost(self):
         """ base method to execute POST request """
         raise Exception("%s.executePost method is not implemented!" % self.__class__.__name__)
-        
+
     def executePut(self):
         """ base method to execute PUT request """
         raise Exception("%s.executePut method is not implemented!" % self.__class__.__name__)
-        
+
     def executeDelete(self):
         """ base method to execute DELETE request """
         raise Exception("%s.executeDelete method is not implemented!" % self.__class__.__name__)
-        
+
     def getResponse(self):
         import json
         #return json.dumps(self.response, ensure_ascii=False)
         return json.dumps(self.response)
-    
+
     def setData(self,data):
         """ Set data in response """
         self.response['data'] = data
         self.response['total'] = len(data) if type(data)==type([]) else 0
-        
+
     def setMessage(self,msg):
         """ Set message in response """
         self.response['message'] = msg
-        
+
     def setException(self,msg):
         """ Set exception message in response """
         self.response['message']    = msg
@@ -111,13 +116,13 @@ class waResourceAdmin(waResource):
         class waconf():
             def __init__(self):
                 self.paths = {}
-            
+
         self.waconf = waconf()
         self.waconf.paths["services"] = waEnviron["services_path"]
         self.waconf.paths["istsos"] = waEnviron["istsos_path"]
-        
+
         #self.waconf = configManager.waConfig()
-        
+
 class waResourceService(waResourceAdmin):
     def __init__(self, waEnviron,service=None,loadjson=True):
         waResourceAdmin.__init__(self,waEnviron,loadjson)
@@ -128,34 +133,34 @@ class waResourceService(waResourceAdmin):
                 self.service = self.pathinfo[i+1]
             else:
                 self.service = None
-                
+
         else:
             self.service = service
-        
+
         #set default config path
         if not os.path.isdir(self.waconf.paths["services"]):
             raise Exception("servicespath is not configured in the wa.cfg file [%s]." % self.waconf.paths["services"])
-            
+
         defaultCFGpath = os.path.join(self.waconf.paths["services"], "default.cfg")
         if not os.path.isfile(defaultCFGpath):
             raise Exception("istsos [default] configuration file not found in %s." % (defaultCFGpath))
-        
+
         if not (self.service == None or self.service == 'default'):
             serviceCFGpath = os.path.join(self.waconf.paths["services"], "%s" % self.service, "%s.cfg" % self.service)
             if not os.path.isfile(serviceCFGpath):
                 raise Exception("istsos [%s] configuration file not found in %s." % (self.service,serviceCFGpath))
             self.servicepath = os.path.join(self.waconf.paths["services"], "%s" % self.service)
-            
+
             sensormlpath = os.path.join(self.waconf.paths["services"], "%s" % self.service, "sml")
             if not os.path.isdir(sensormlpath):
                 raise Exception("istsos [%s] sensorML folder not found in %s." % (self.service,sensormlpath))
             self.sensormlpath = sensormlpath
-            
-            virtualpath = os.path.join(self.waconf.paths["services"], "%s" % self.service, "virtual")          
+
+            virtualpath = os.path.join(self.waconf.paths["services"], "%s" % self.service, "virtual")
             if not os.path.isdir(virtualpath):
-                raise Exception("istsos [%s] virtual procedures folder not found in %s." % (self.service,virtualpath))  
+                raise Exception("istsos [%s] virtual procedures folder not found in %s." % (self.service,virtualpath))
             self.virtualpath = virtualpath
-        
+
         if self.service == None or self.service == 'default':
             self.serviceconf = configManager.waServiceConfig(defaultCFGpath)
         else:
@@ -169,15 +174,15 @@ class waResourceConfigurator(waResourceService):
         for key in self.template:
             tmp.append(self.template[key][0])
         self.sections = list(set(tmp))
-        
+
     def validate(self):
         pass
-    
+
     def executeGet(self):
         """
         Execute operation GET for on service configuration sections
         """
-        
+
         data = {
             'default': True
         }
@@ -191,14 +196,14 @@ class waResourceConfigurator(waResourceService):
         self.setData(data)
         self.setMessage("Information successfully retrived")
         return data
-    
+
     def executePut(self, json=None):
         """
         Execute operation PUT for on service configuration sections and return new values
         """
         if json is not None:
             self.json = json
-            
+
         self.validate()
         for key in self.template:
             if not self.json.has_key(key):
@@ -207,19 +212,19 @@ class waResourceConfigurator(waResourceService):
                 self.template[key][0],
                 self.template[key][1],
                 str(self.json[key]))
-                
+
         self.serviceconf.save()
         self.executeGet()
         self.setMessage("Information successfully updated")
-    
+
     def executeDelete(self):
         """
         Execute operation DELETE for on service configuration sections
-        
+
         @note: it does not work on default service
         """
         for s in self.sections:
             self.serviceconf.delete(s)
         self.serviceconf.save()
         self.setMessage("Information successfully reset to default values!")
-    
+
diff --git a/walib/resource.pyc b/walib/resource.pyc
index 0390784..c4adc48 100644
Binary files a/walib/resource.pyc and b/walib/resource.pyc differ
diff --git a/walib/resourceFactory.py b/walib/resourceFactory.py
old mode 100755
new mode 100644
index b8a6b9c..9066ef2
--- a/walib/resourceFactory.py
+++ b/walib/resourceFactory.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import sys, re
 import copy
 def initResource(waEnviron):
@@ -270,6 +275,19 @@ def initResource(waEnviron):
                         #print >> sys.stderr, resource     
                         from walib.istsos.services import services
                         return services.waInsertobservation(waEnviron)
+                        
+                # ---------------------------------------
+                # Entering istsos.services.logs
+                # ---------------------------------------        
+                elif resource == "logs":
+                    from walib.istsos.services.logs import logs
+                    return logs.waLogs(waEnviron)
+                
+                # ---------------------------------------
+                # Entering istsos.services.status
+                # ---------------------------------------
+                elif resource == "status":
+                    from walib.istsos.services.status import status
+                    return status.waStatus(waEnviron)
                                    
     raise Exception("Resource is not identified, check the URL")
-
diff --git a/walib/resourceFactory.pyc b/walib/resourceFactory.pyc
index 88fcb52..5f2d148 100644
Binary files a/walib/resourceFactory.pyc and b/walib/resourceFactory.pyc differ
diff --git a/walib/sqlschema.py b/walib/sqlschema.py
old mode 100755
new mode 100644
index af9f57c..8388623
--- a/walib/sqlschema.py
+++ b/walib/sqlschema.py
@@ -1,4 +1,25 @@
 # -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 createsqlschema = u"""
 
 SET statement_timeout = 0;
@@ -193,8 +214,9 @@ CREATE TABLE procedures (
     stime_prc timestamp with time zone,
     etime_prc timestamp with time zone,
 
-    id_tru_fk integer NOT NULL,
+   -- id_tru_fk integer NOT NULL,
     time_res_prc integer,
+    time_acq_prc integer,
     id_oty_fk integer,
     id_foi_fk integer,
     assignedid_prc character varying(32) NOT NULL
@@ -219,18 +241,18 @@ COMMENT ON TABLE quality_index IS 'Stores the QualityIndexes.';
 
 --=====================================
 
-CREATE TABLE time_res_unit (
-    id_tru integer NOT NULL,
-    name_tru character varying(15)
-);
-COMMENT ON TABLE time_res_unit IS 'Stores the Procedure''s time resolution units.';
+--CREATE TABLE time_res_unit (
+--    id_tru integer NOT NULL,
+--    name_tru character varying(15)
+--);
+--COMMENT ON TABLE time_res_unit IS 'Stores the Procedure''s time resolution units.';
 
-CREATE SEQUENCE time_res_unit_id_tru_seq
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-ALTER SEQUENCE time_res_unit_id_tru_seq OWNED BY time_res_unit.id_tru;
+--CREATE SEQUENCE time_res_unit_id_tru_seq
+--    INCREMENT BY 1
+--    NO MAXVALUE
+--    NO MINVALUE
+--    CACHE 1;
+--ALTER SEQUENCE time_res_unit_id_tru_seq OWNED BY time_res_unit.id_tru;
 
 --=====================================
 
@@ -271,6 +293,20 @@ CREATE SEQUENCE tran_log_id_trl_seq
 ALTER SEQUENCE tran_log_id_trl_seq OWNED BY tran_log.id_trl;
 
 --=====================================
+CREATE TYPE status AS ENUM ('verified','pending');
+CREATE TABLE cron_log
+(
+   id_clo serial NOT NULL, 
+   id_prc_fk integer NOT NULL,              -- "5"
+   process_clo character varying NOT NULL, -- "acquisizione"
+   element_clo character varying NOT NULL, -- "T_TREVANO"
+   datetime_clo timestamp with time zone NOT NULL, -- "NOW"
+   message_clo character varying NOT NULL, -- "TIPO DI ECCEZIONE"
+   details_clo character varying, -- "MESSAGGIO LIBERO"
+   status_clo status,            -- "error"
+   PRIMARY KEY (id_clo)
+);
+--=====================================
 -- NEXTVALS
 --=====================================
 
@@ -285,7 +321,7 @@ ALTER TABLE offerings ALTER COLUMN id_off SET DEFAULT nextval('offerings_id_off_
 ALTER TABLE positions ALTER COLUMN id_pos SET DEFAULT nextval('measures_mobile_id_mmo_seq'::regclass);
 ALTER TABLE proc_obs ALTER COLUMN id_pro SET DEFAULT nextval('prc_obs_id_pro_seq'::regclass);
 ALTER TABLE procedures ALTER COLUMN id_prc SET DEFAULT nextval('procedures_id_prc_seq'::regclass);
-ALTER TABLE time_res_unit ALTER COLUMN id_tru SET DEFAULT nextval('time_res_unit_id_tru_seq'::regclass);
+--ALTER TABLE time_res_unit ALTER COLUMN id_tru SET DEFAULT nextval('time_res_unit_id_tru_seq'::regclass);
 ALTER TABLE uoms ALTER COLUMN id_uom SET DEFAULT nextval('uoms_id_uom_seq'::regclass);
 ALTER TABLE tran_log ALTER COLUMN id_trl SET DEFAULT nextval('tran_log_id_trl_seq'::regclass);
 
@@ -332,8 +368,8 @@ ALTER TABLE ONLY procedures
     ADD CONSTRAINT procedures_pkey PRIMARY KEY (id_prc);
 ALTER TABLE ONLY quality_index
     ADD CONSTRAINT quality_index_pkey PRIMARY KEY (id_qi);
-ALTER TABLE ONLY time_res_unit
-    ADD CONSTRAINT time_res_unit_pkey PRIMARY KEY (id_tru);
+--ALTER TABLE ONLY time_res_unit
+--    ADD CONSTRAINT time_res_unit_pkey PRIMARY KEY (id_tru);
 ALTER TABLE ONLY uoms
     ADD CONSTRAINT uoms_pkey PRIMARY KEY (id_uom);
 ALTER TABLE ONLY event_time
@@ -364,11 +400,13 @@ ALTER TABLE ONLY procedures
     ADD CONSTRAINT procedures_id_foi_fk_fkey FOREIGN KEY (id_foi_fk) REFERENCES foi(id_foi);
 ALTER TABLE ONLY procedures
     ADD CONSTRAINT procedures_id_oty_fk_fkey FOREIGN KEY (id_oty_fk) REFERENCES obs_type(id_oty);
-ALTER TABLE ONLY procedures
-    ADD CONSTRAINT procedures_id_tru_fk_fkey FOREIGN KEY (id_tru_fk) REFERENCES time_res_unit(id_tru);
+--ALTER TABLE ONLY procedures
+--    ADD CONSTRAINT procedures_id_tru_fk_fkey FOREIGN KEY (id_tru_fk) REFERENCES time_res_unit(id_tru);
 ALTER TABLE ONLY tran_log
     ADD CONSTRAINT tran_log_pkey PRIMARY KEY (id_trl);
-   
+ALTER TABLE ONLY cron_log
+    ADD CONSTRAINT cron_log_id_prc_fk_fkey FOREIGN KEY (id_prc_fk) REFERENCES procedures(id_prc) ON DELETE CASCADE;    
+    
 --=====================================
 -- INDEXES
 --=====================================
@@ -392,4 +430,34 @@ INSERT INTO obs_type (id_oty, name_oty, desc_oty) VALUES (1, 'insitu-fixed-point
 INSERT INTO obs_type (id_oty, name_oty, desc_oty) VALUES (2, 'insitu-mobile-point', 'mobile, in-situ, pointwise observation');
 INSERT INTO obs_type (id_oty, name_oty, desc_oty) VALUES (3, 'virtual', 'virtual procedure');
 
+--=====================================
+-- ADDING OBSERVED PROPERTIES
+--=====================================
+/*
+INSERT INTO observed_properties VALUES ('air-rainfall', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall', 'liquid precipitation or snow water equivalent', '{"role": "urn:x-ogc:def:classifiers:x-istsos:1.0:qualityIndexCheck:level0", "min": "0"}', 2);
+INSERT INTO observed_properties VALUES ('air-relative-humidity', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:humidity:relative', 'absolute humidity relative to the maximum for that air', '{"interval": ["0", "100"], "role": "urn:x-ogc:def:classifiers:x-istsos:1.0:qualityIndexCheck:level0"}', 3);
+INSERT INTO observed_properties VALUES ('air-wind-velocity', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:wind:velocity', 'wind speed at 1 meter above terrain', '{"role": "urn:x-ogc:def:classifiers:x-istsos:1.0:qualityIndexCheck:level0", "min": "0"}', 4);
+INSERT INTO observed_properties VALUES ('solar-radiation', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:solar:radiation', 'Direct radiation sum in spectrum rand', NULL, 5);
+INSERT INTO observed_properties VALUES ('river-height', 'urn:ogc:def:parameter:x-istsos:1.0:river:water:height', '', '{"interval": ["0", "10"], "role": "urn:x-ogc:def:classifiers:x-istsos:1.0:qualityIndexCheck:level0"}', 6);
+INSERT INTO observed_properties VALUES ('river-discharge', 'urn:ogc:def:parameter:x-istsos:1.0:river:water:discharge', '', NULL, 7);
+INSERT INTO observed_properties VALUES ('soil-evapotranspiration', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:soil:evapotranspiration', '', NULL, 8);
+INSERT INTO observed_properties VALUES ('air-temperature', 'urn:ogc:def:parameter:x-istsos:1.0:meteo:air:temperature', 'air temperature at 2 meters above terrain', '{"interval": ["-40", "100"], "role": "urn:x-ogc:def:classifiers:x-istsos:1.0:qualityIndexCheck:level0"}', 1);
+SELECT pg_catalog.setval('obs_pr_id_opr_seq', 8, true);
+
+--=====================================
+-- ADDING UNIT OF MEASURES
+--=====================================
+
+INSERT INTO uoms VALUES ('null', '', 0);
+INSERT INTO uoms VALUES ('mm', 'millimeter', 1);
+INSERT INTO uoms VALUES ('°C', 'Celsius degree', 2);
+INSERT INTO uoms VALUES ('%', 'percentage', 3);
+INSERT INTO uoms VALUES ('m/s', 'metre per second', 4);
+INSERT INTO uoms VALUES ('W/m2', 'Watt per square metre', 5);
+INSERT INTO uoms VALUES ('°F', 'Fahrenheit degree', 6);
+INSERT INTO uoms VALUES ('m', 'metre', 7);
+INSERT INTO uoms VALUES ('m3/s', 'cube meter per second', 8);
+SELECT pg_catalog.setval('uoms_id_uom_seq', 8, true);
+*/
+
 """
diff --git a/walib/sqlschema.pyc b/walib/sqlschema.pyc
index 120d62a..9276ee8 100644
Binary files a/walib/sqlschema.pyc and b/walib/sqlschema.pyc differ
diff --git a/walib/utils.py b/walib/utils.py
old mode 100755
new mode 100644
index b9776c3..5e99dcc
--- a/walib/utils.py
+++ b/walib/utils.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
-# istSOS WebAdmin - Istituto Scienze della Terra
-# Copyright (C) 2012 Massimiliano Cannata, Milan Antonovic
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License.
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#
+# ===============================================================================
 import sys, traceback
 
 def valid_NCName(name):
@@ -220,7 +225,7 @@ def getProcedureNamesList(pgdb,service,offering=None, observationType=None):
         else:
             sql = """
                 SELECT id_prc, name_prc, desc_prc, assignedid_prc, name_oty, stime_prc, etime_prc
-                FROM %s.off_proc op, %s.procedures, %s.offerings, %s.obs_type """ % ((service,)*4)
+                FROM %s.off_proc op, %s.procedures p, %s.offerings o, %s.obs_type """ % ((service,)*4)
             sql += """
                 WHERE o.id_off=op.id_off_fk 
                 AND op.id_prc_fk=p.id_prc 
@@ -364,12 +369,12 @@ def getObservedPropertiesFromProcedure(pgdb,service,procedure):
     
     >>> Return example:
         [
-            { "id":1,"name":"urn:ogc:def:parameter:x-istsos:1.0:lake:water:height"},
-            { "id":2,"name":"urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall"}
+            { "id":1,"def":"urn:ogc:def:parameter:x-istsos:1.0:lake:water:height", "name":"lake-water-height"},
+            { "id":2,"def":"urn:ogc:def:parameter:x-istsos:1.0:meteo:air:rainfall", "name":"lake-air-rainfall"}
         ]
     
     """
-    sql  = "SELECT id_opr, name_opr, name_uom"
+    sql  = "SELECT id_opr, name_opr, def_opr, name_uom"
     sql += " FROM %s.proc_obs po, %s.procedures p, %s.observed_properties o, %s.uoms u" %((service,)*4) 
     sql += " WHERE po.id_prc_fk=p.id_prc AND po.id_opr_fk=o.id_opr AND po.id_uom_fk=u.id_uom"
     sql += " AND name_prc=%s"
@@ -377,7 +382,7 @@ def getObservedPropertiesFromProcedure(pgdb,service,procedure):
     # @todo check this double tuple ?
     rows = pgdb.select(sql,(params,))
     if rows:
-        return [ { "id":row["id_opr"] , "name":row["name_opr"], "uom":row["name_uom"]} for row in rows ]
+        return [ { "id":row["id_opr"] , "name":row["name_opr"], "def": row["def_opr"], "uom":row["name_uom"]} for row in rows ]
     else:
         return None
 
diff --git a/walib/utils.pyc b/walib/utils.pyc
index 7d48da0..154778a 100644
Binary files a/walib/utils.pyc and b/walib/utils.pyc differ
diff --git a/walib/wa_version.py b/walib/wa_version.py
index 11a716e..67e0ff4 100755
--- a/walib/wa_version.py
+++ b/walib/wa_version.py
@@ -1 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
 version = "1.0.0"
diff --git a/walib/wa_version.pyc b/walib/wa_version.pyc
new file mode 100644
index 0000000..99aadeb
Binary files /dev/null and b/walib/wa_version.pyc differ
diff --git a/wnslib/__init__.py b/wnslib/__init__.py
new file mode 100755
index 0000000..928e2d3
--- /dev/null
+++ b/wnslib/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = ["operation", "notificationScheduler", "notify", "setup",
+            "resourceFactory", "services", "notificationManager"]
diff --git a/wnslib/dbSetup.sql b/wnslib/dbSetup.sql
new file mode 100755
index 0000000..1ea79e6
--- /dev/null
+++ b/wnslib/dbSetup.sql
@@ -0,0 +1,107 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 9.3.5
+-- Dumped by pg_dump version 9.3.5
+-- Started on 2014-11-18 16:49:28 CET
+
+SET statement_timeout = 0;
+--SET lock_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+
+
+CREATE SCHEMA wns;
+
+ALTER SCHEMA wns OWNER TO postgres;
+
+SET search_path = wns, pg_catalog;
+SET default_tablespace = '';
+SET default_with_oids = false;
+
+
+CREATE TABLE notification (
+    id integer NOT NULL,
+    name text,
+    description text
+);
+
+ALTER TABLE wns.notification OWNER TO postgres;
+
+CREATE SEQUENCE notification_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER TABLE wns.notification_id_seq OWNER TO postgres;
+
+ALTER SEQUENCE notification_id_seq OWNED BY notification.id;
+
+CREATE TABLE registration (
+    user_id_fk integer NOT NULL,
+    not_id_fk integer NOT NULL,
+    not_list text[]
+);
+
+ALTER TABLE wns.registration OWNER TO postgres;
+
+CREATE TABLE "user" (
+    id integer NOT NULL,
+    username text,
+    email text,
+    twitter text,
+    tel text,
+    fax text,
+    address text,
+    zip integer,
+    city text,
+    state text,
+    country text
+);
+
+ALTER TABLE wns."user" OWNER TO postgres;
+
+CREATE SEQUENCE user_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE wns.user_id_seq OWNER TO postgres;
+
+ALTER SEQUENCE user_id_seq OWNED BY "user".id;
+
+ALTER TABLE ONLY notification ALTER COLUMN id SET DEFAULT nextval('notification_id_seq'::regclass);
+
+ALTER TABLE ONLY "user" ALTER COLUMN id SET DEFAULT nextval('user_id_seq'::regclass);
+
+ALTER TABLE ONLY notification
+    ADD CONSTRAINT notification_name_key UNIQUE (name);
+
+ALTER TABLE ONLY notification
+    ADD CONSTRAINT notification_pkey PRIMARY KEY (id);
+
+ALTER TABLE ONLY registration
+    ADD CONSTRAINT registration_pkey PRIMARY KEY (user_id_fk, not_id_fk);
+
+ALTER TABLE ONLY "user"
+    ADD CONSTRAINT user_email_key UNIQUE (email);
+
+ALTER TABLE ONLY "user"
+    ADD CONSTRAINT user_pkey PRIMARY KEY (id);
+
+ALTER TABLE ONLY "user"
+    ADD CONSTRAINT user_username_key UNIQUE (username);
+
+ALTER TABLE ONLY registration
+    ADD CONSTRAINT not_id_fkey FOREIGN KEY (not_id_fk) REFERENCES notification(id);
+
+ALTER TABLE ONLY registration
+    ADD CONSTRAINT user_id_fkey FOREIGN KEY (user_id_fk) REFERENCES "user"(id) ON DELETE CASCADE;
diff --git a/wnslib/notificationManager.py b/wnslib/notificationManager.py
new file mode 100644
index 0000000..202ffd1
--- /dev/null
+++ b/wnslib/notificationManager.py
@@ -0,0 +1,213 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from os import path
+from walib import configManager
+
+
+defaultCFGpath = path.join(path.dirname(path.split(path.abspath(__file__))[0]),
+                                         "services/default.cfg")
+serviceconf = configManager.waServiceConfig(defaultCFGpath)
+services_path = path.join(path.dirname(path.split(path.abspath(__file__))[0]),
+                                             "services/notifications.aps")
+
+
+def delNotification(name):
+
+    aps_file = open(services_path, 'r')
+    data = aps_file.readlines()
+    aps_file.close()
+
+    x = 0
+    start = '### start ' + name + ' ###'
+    end = '### end ' + name + ' ###'
+
+    while not start in data[x]:
+        x += 1
+
+    while not end in data[x]:
+        del data[x]
+    del data[x]
+
+    aps_file = open(services_path, 'w')
+    aps_file.writelines(data)
+    aps_file.close()
+
+
+def addNotification(name, func_name, interval):
+    """
+    add the funtion to .aps
+    1) append on .aps the function "name"
+
+    !!! The function should terminate with a call
+    to notify() in case the condition is met
+    """
+    import datetime
+    now = datetime.datetime.now()
+    startDate = now.strftime('%Y-%m-%d %H:%M:%S')
+
+    f = open(func_name, 'r')
+    code = f.read()
+    f.close()
+
+    flag = __check_valid_python(code, func_name)
+    if flag:
+        return flag
+
+    flag = __check_valid_name(name, func_name)
+    if flag:
+        return flag
+
+    if not "notify(" in code:
+        return "The function MUST contain a notificationScheduler.notify() call"
+
+    aps_file = open(services_path, 'a')
+    aps_file.writelines(
+        """
+### start %s ###
+ at sched.interval_schedule(minutes=%s, start_date='%s')
+%s
+### end %s ###""" % (name, interval, startDate, code, name)
+    )
+    aps_file.close()
+
+
+def __check_valid_python(code, func_name):
+    try:
+        # check only the syntax
+        compile(code, func_name, 'exec')
+    except Exception, e:
+        return "Error on function: " + str(e)
+
+
+def __check_valid_name(name, func_name):
+
+    flag_name = False
+    flag_not = False
+    for line in open(func_name, 'r'):
+        if 'def' in line:
+            if name in line:
+                flag_name = True
+        elif 'notify' in line:
+            if name in line:
+                flag_not = True
+
+    if not flag_name and not flag_not:
+        return '\nThe function name nust be equal to notification name!!!'
+
+
+def createSimpleNotification(name, service, params, cql, interval, period=None):
+    """
+    Inputs:
+        params = dict of {key:val1, key:val1, ...} to compose
+                the GetObservation request returning 1
+                value (latest, max of aggregation, etc..)
+        cql = cql condition to be verified (e.g.: >40)
+"""
+
+    import datetime
+    import json
+    now = datetime.datetime.now()
+    startDate = now.strftime('%Y-%m-%d %H:%M:%S')
+
+    aps_file = open(services_path, 'a')
+
+    rparams = {
+        "request": "GetObservation",
+        "service": "SOS",
+        "version": "1.0.0",
+        "observedProperty": params['observedProperty'],
+        "responseFormat": "application/json",
+        "offering": params['offering']
+    }
+
+    if "procedure" in params:
+        rparams['procedure'] = params["procedure"]
+
+    if period:
+        config = """
+    import datetime
+    import time
+    from pytz import timezone
+    now = datetime.datetime.now().replace(tzinfo=timezone(time.tzname[0]))
+    endDate = now.strftime('%%Y-%%m-%%dT%%H:%%M:%%S%%z')
+    eventTime = now - datetime.timedelta(hours=%s)
+    startDate = eventTime.strftime('%%Y-%%m-%%dT%%H:%%M:%%S%%z')
+
+    rparams = %s
+    rparams['eventTime'] = str(startDate) + "/" +str(endDate)
+
+""" % (period, json.dumps(rparams))
+    else:
+        config = """
+    rparams = %s
+""" % json.dumps(rparams)
+
+    link = serviceconf.serviceurl["url"].replace('test', '')
+    link += service
+
+    # write to notification.aps
+    aps_file.writelines(
+"""### start %s ###
+ at sched.interval_schedule(minutes=%s, start_date='%s')
+def %s():
+    %s
+    import lib.requests as requests
+    res = requests.get('%s', params=rparams)
+
+    result = res.json()['ObservationCollection']['member'][0]['result']['DataArray']['values']
+
+    import wnslib.notificationScheduler as nS
+    notify = {
+        "twitter": {
+            "public": "",
+            "private": ""
+        },
+        "mail": {
+            "subject": "",
+            "message": ""
+        }
+    }
+
+    if len(result) ==0:
+        message = "no data found, procedure: " + rparams['procedures']
+        notify['twitter']['public'] = message
+        notify['twitter']['private'] = message
+        notify['mail']['subject'] = "notification from %s"
+        notify['mail']['message'] = message
+        nS.notify('%s',notify)
+
+    for el in result:
+        if float(el[1]) %s:
+
+            message = 'Condition met on the requested notification\\nDate: '
+            message += str(el[0]) + '\\nCondition: ' + str(el[1]) + '%s'
+            notify['twitter']['public'] = message
+            notify['twitter']['private'] = message
+            notify['mail']['subject'] = "notification from %s"
+            notify['mail']['message'] = message
+            nS.notify('%s',notify)
+            break;
+### end %s ### """ % (name, interval, startDate, name, config, link, name, name,
+         cql, name, name, name, name)
+    )
+    aps_file.close()
diff --git a/wnslib/notificationScheduler.py b/wnslib/notificationScheduler.py
new file mode 100755
index 0000000..fb5cedb
--- /dev/null
+++ b/wnslib/notificationScheduler.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from os import path
+from walib import configManager
+
+defaultCFGpath = path.join(path.dirname(path.split(path.abspath(__file__))[0]),
+                                         "services/default.cfg")
+serviceconf = configManager.waServiceConfig(defaultCFGpath)
+
+
+def notify(name, message, status=True):
+    """
+        Attributes:
+            name        name of the notification
+            message     message to notify
+    """
+    from walib import databaseManager as dbm
+    from wnslib import notify
+
+    dbConnection = dbm.PgDB(
+            serviceconf.connectionWns['user'],
+            serviceconf.connectionWns['password'],
+            serviceconf.connectionWns['dbname'],
+            serviceconf.connectionWns['host'],
+            serviceconf.connectionWns['port'])
+
+    sql = """SELECT r.user_id_fk, r.not_list
+            FROM wns.registration r, wns.notification n
+            WHERE r.not_id_fk = n.id AND n.name=%s"""
+    params = (name,)
+
+    usersList = dbConnection.select(sql, params)
+
+    #print usersList
+
+    notifier = notify.Notify(serviceconf)
+    if status:
+        notifier.post_twitter_status(message['twitter'], name)
+
+    for user in usersList:
+        sql = "SELECT * FROM wns.user WHERE id = %s"
+        par = [user['user_id_fk']]
+        contact = dict(dbConnection.select(sql, par)[0])
+
+        #print user['not_list']
+        #print contact
+
+        for con in user['not_list']:
+            if con == 'mail' or con == 'email':
+                if 'mail' in message.keys():
+                    notifier.email(message['mail'], contact['email'])
+            elif con == 'twitter':
+                if 'twitter' in message.keys():
+                    notifier.twitter(message['twitter'], contact['twitter'], name)
+            elif con == 'fax':
+                notifier.fax(message, contact['fax'], name)
+            elif con == 'sms':
+                notifier.sms(message, contact['tel'], name)
diff --git a/wnslib/notify.py b/wnslib/notify.py
new file mode 100755
index 0000000..f64c680
--- /dev/null
+++ b/wnslib/notify.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from lib import twitter
+
+
+class Notify(object):
+
+    def __init__(self, serviceconfig):
+        self.serviceconfig = serviceconfig
+        twitter_conf = self.serviceconfig.twitter
+        self.twitter_api = twitter.Api(
+                            consumer_key=twitter_conf['consumer_key'],
+                            consumer_secret=twitter_conf['consumer_secret'],
+                            access_token_key=twitter_conf['oauth_token'],
+                            access_token_secret=twitter_conf['oauth_secret'])
+
+    def email(self, message, to):
+        print 'send mail'
+
+        if not 'subject' in message.keys():
+            print "please define a email subject"
+            return 
+        if not 'message' in message.keys():
+            print "please define a email text"
+            return 
+
+        import smtplib
+        from email.MIMEMultipart import MIMEMultipart
+        from email.MIMEText import MIMEText
+
+        mail_usr = self.serviceconfig.mail['usermail']
+        mail_pwd = self.serviceconfig.mail['password']
+
+        msg = MIMEMultipart('alternative')
+        msg['Subject'] = message['subject']
+        msg['From'] = mail_usr
+        msg['To'] = to
+
+        part = MIMEText(message['message'], 'plain')
+        msg.attach(part)
+
+        mailServer = smtplib.SMTP("smtp.gmail.com", 587)
+        mailServer.ehlo()
+        mailServer.starttls()
+        mailServer.ehlo()
+        mailServer.login(mail_usr, mail_pwd)
+        mailServer.sendmail(mail_usr, to, msg.as_string())
+        mailServer.quit()
+
+    def post_twitter_status(self, message, name):
+        # Update Status
+        if not 'public' in message.keys():
+            print "please define a twitter public message"
+            return
+
+        print 'update twitter status'
+        tweet = '#' + name + ' '
+        tweet += message['public']
+
+        if len(message) < 140:
+            try:
+                self.twitter_api.PostUpdate(tweet)
+            except twitter.TwitterError, e:
+                if e[0][0]['code'] == 187:
+                    print 'Duplicate tweet'
+                else:
+                    print e
+        else:
+            raise Exception("Message for twitter to long!!!, MAX 140 character")
+
+    def twitter(self, message, to, name):
+        if not 'private' in message.keys():
+            print "please define a twitter public message"
+            return
+        print 'Send via Twitter'
+        # Send direct message
+        tweet = '#' + name + ' '
+        tweet += message['private']
+
+        if len(message) < 140:
+            print 'send direct message'
+            #try:
+                #self.twitter_api.PostDirectMessage(tweet, to)
+            #except twitter.TwitterError, e:
+                #if e[0][0]['code'] == 187:
+                    #print 'Duplicate tweet'
+                #else:
+                    #print e
+        else:
+            raise Exception("Message for twitter to long!!!, MAX 140 character")
+
+    def fax(self, message, to, name):
+        print "notify via FAX"
+
+    def sms(self, message, to, name):
+        print "notify via SMS"
\ No newline at end of file
diff --git a/wnslib/operation.py b/wnslib/operation.py
new file mode 100755
index 0000000..9b3b52e
--- /dev/null
+++ b/wnslib/operation.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from walib import utils as ut
+from walib import configManager
+import os
+
+
+class wnsOperation(object):
+
+    """
+    Base class for istSOS WNS
+    """
+    def __init__(self, wnsEnviron, loadjson=True):
+        """
+        Initialize resource object
+        @param wnsEnviron: wnsEnviron variable see L(wa)
+        @type wnsEnviron: C{dictionary}
+        """
+        self.response = {
+            "success": True,
+            "message": ""
+        }
+        self.wnsEnviron = wnsEnviron
+        self.method = wnsEnviron['method']
+        self.pathinfo = wnsEnviron['pathinfo']
+        self.json = None
+        self.postRequest = None
+        if self.method in ["POST", "PUT"] and loadjson:
+            import json
+            self.json = ut.encodeobject(json.loads(wnsEnviron['wsgi_input']))
+
+        defaultCFGpath = os.path.join(wnsEnviron["services_path"],
+                                                    "default.cfg")
+        self.serviceconf = configManager.waServiceConfig(defaultCFGpath)
+
+    def validateGet(self):
+        """ base method to validate GET request """
+        raise Exception("%s.validateGet method is not implemented!" % self.__class__.__name__)
+
+    def validatePost(self):
+        """ base method to validate POST request """
+        raise Exception("%s.validatePost method is not implemented!" % self.__class__.__name__)
+
+    def validatePut(self):
+        """ base method to validate PUT request """
+        raise Exception("%s.validatePut method is not implemented!" % self.__class__.__name__)
+
+    def validateDelete(self):
+        """ base method to validate DELETE request """
+        raise Exception("%s.validateDelete method is not implemented!" % self.__class__.__name__)
+
+    def executeGet(self):
+        """ base method to execute GET request """
+        raise Exception("%s.executeGet method is not implemented!" % self.__class__.__name__)
+
+    def executePost(self):
+        """ base method to execute POST request """
+        raise Exception("%s.executePost method is not implemented!" % self.__class__.__name__)
+
+    def executePut(self):
+        """ base method to execute PUT request """
+        raise Exception("%s.executePut method is not implemented!" % self.__class__.__name__)
+
+    def executeDelete(self):
+        """ base method to execute DELETE request """
+        raise Exception("%s.executeDelete method is not implemented!" % self.__class__.__name__)
+
+    def getResponse(self):
+        import json
+        #return json.dumps(self.response, ensure_ascii=False)
+        return json.dumps(self.response)
+
+    def setData(self, data):
+        """ Set data in response """
+        self.response['data'] = data
+        self.response['total'] = len(data) if type(data) == type([]) else 0
+
+    def setMessage(self, msg):
+        """ Set message in response """
+        self.response['message'] = msg
+
+    def setException(self, msg):
+        """ Set exception message in response """
+        self.response['message'] = msg
+        self.response['resource'] = self.__class__.__name__
+        self.response['method'] = self.wnsEnviron["method"]
+        self.response['path'] = self.wnsEnviron["path"]
+        self.response['success'] = False
+
+    def setLog(self, log):
+        """ set message in log """
+        self.response['log'] = log
\ No newline at end of file
diff --git a/wnslib/resourceFactory.py b/wnslib/resourceFactory.py
new file mode 100755
index 0000000..b8ba364
--- /dev/null
+++ b/wnslib/resourceFactory.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+import sys
+import copy
+
+
+def initResource(wnsEnviron):
+    path = wnsEnviron['path']
+    print >> sys.stderr, path
+
+    print >> sys.stderr, wnsEnviron['pathinfo']
+    pathinfo = copy.deepcopy(wnsEnviron['pathinfo'])
+    pathinfo.pop(0)
+    resource = pathinfo.pop(0)
+
+    print >> sys.stderr, pathinfo
+    print >> sys.stderr, resource
+
+    if resource == 'user':
+        if len(pathinfo) <= 1:
+            from wnslib.services.users import users
+            return users.wnsUsers(wnsEnviron)
+        else:
+            pathinfo.pop(0)
+            resource = pathinfo.pop(0)
+            if resource == 'notification' and len(pathinfo) <= 1:
+                from wnslib.services.registrations import registrations
+                return registrations.wnsRegistrations(wnsEnviron)
+            else:
+                raise Exception("Resource is not identified, check the URL")
+
+    elif resource == 'notification':
+        print >> sys.stderr, "Notifcation request"
+        if len(pathinfo) <= 1:
+            from wnslib.services.notifications import notifications
+            return notifications.wnsNotifications(wnsEnviron)
+        else:
+            raise Exception("Resource is not identified, check the URL")
+    elif resource == 'setup':
+        from wnslib import setup
+        return setup.wnsSetup(wnsEnviron)
+    else:
+        raise Exception("Resource is not identified, check the URL")
diff --git a/wnslib/services/__init__.py b/wnslib/services/__init__.py
new file mode 100755
index 0000000..3a3b241
--- /dev/null
+++ b/wnslib/services/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = ['users', 'notifications', 'registrations']
diff --git a/wnslib/services/notifications/__init__.py b/wnslib/services/notifications/__init__.py
new file mode 100755
index 0000000..ff6899a
--- /dev/null
+++ b/wnslib/services/notifications/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = ['notifications']
diff --git a/wnslib/services/notifications/notifications.py b/wnslib/services/notifications/notifications.py
new file mode 100755
index 0000000..b9ed087
--- /dev/null
+++ b/wnslib/services/notifications/notifications.py
@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from wnslib.operation import wnsOperation
+from walib import databaseManager
+import sys
+
+
+class wnsNotifications(wnsOperation):
+
+    def __init__(self, wnsEnviron):
+        wnsOperation.__init__(self, wnsEnviron)
+        self.not_id = None
+        if len(wnsEnviron['pathinfo']) > 2:
+            self.not_id = wnsEnviron['pathinfo'][2]
+            print self.not_id
+        self.setData("")
+
+    def executeGet(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        if self.not_id:
+            sql = "SELECT * FROM wns.notification WHERE id=%s;"
+            params = (self.not_id,)
+        else:
+            sql = "SELECT * FROM wns.notification"
+            params = None
+
+        NotificationList = servicedb.select(sql, params)
+        Notification = []
+
+        for notif in NotificationList:
+            Notification.append(dict(notif))
+
+        self.setData(Notification)
+
+    def executePost(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        #self.json = self.json['data']
+
+        name = self.json["name"]
+        description = self.json["description"]
+        interval = self.json["interval"]
+        not_id = None
+
+        sql = """INSERT INTO wns.notification (name, description)
+                        VALUES (%s,%s) RETURNING id;"""
+        par = [name, description]
+        not_id = servicedb.executeInTransaction(sql, par)[0][0]
+
+        if not not_id:
+            self.setException('Exception while creating a new notification')
+            return
+        try:
+            from wnslib import notificationManager as notManager
+            if "params" in self.json.keys():
+                print "simpleNot"
+                params = self.json["params"]
+                condition = self.json["condition"]
+                service = self.json["service"]
+                period = self.json.get("period", None)
+
+                notManager.createSimpleNotification(name, service, params,
+                                            condition, interval, period)
+            else:
+                print  "Notification"
+                funcFile = self.json["function"]
+                msg = notManager.addNotification(name, funcFile, interval)
+                if msg:
+                    self.setException(msg)
+                    servicedb.rollbackTransaction()
+                    return
+
+        except Exception, e:
+            msg = "The following error occoured: " + str(e)
+            msg += "\n\nPlease try again"
+            self.setException(msg)
+            servicedb.rollbackTransaction()
+            return
+        servicedb.commitTransaction()
+        self.setMessage(not_id)
+
+    def executePut(self):
+        #self.json = self.json['data']
+        description = self.json.get("description", None)
+
+        from wnslib import notificationManager as notManager
+
+        if description:
+            servicedb = databaseManager.PgDB(
+                self.serviceconf.connectionWns['user'],
+                self.serviceconf.connectionWns['password'],
+                self.serviceconf.connectionWns['dbname'],
+                self.serviceconf.connectionWns['host'],
+                self.serviceconf.connectionWns['port'])
+
+            sql = "UPDATE wns.notification SET description = %s WHERE id=%s;"
+            params = (description, self.not_id,)
+            servicedb.executeInTransaction(sql, params)
+
+        if not self.json.get("params") or not self.json.get("function"):
+            self.setMessage("Updated notifcation description")
+            servicedb.commitTransaction()
+            return
+
+        try:
+            name = self.json["name"]
+            interval = self.json["interval"]
+
+            if "params" in self.json.keys():
+                print >> sys.stderr, "simpleNot"
+                params = self.json["params"]
+                condition = self.json["condition"]
+                service = self.json["service"]
+                period = self.json.get("period", None)
+
+                notManager.createSimpleNotification(name, service, params,
+                                            condition, interval, period)
+            else:
+                print >> sys.stderr, "Notification"
+                funcFile = self.json["function"]
+                msg = notManager.addNotification(name, funcFile, interval)
+                if msg:
+                    self.setException(msg)
+                    if description:
+                        servicedb.rollbackTransaction()
+                    return
+            if description:
+                servicedb.commitTransaction()
+            # Delete old notification function
+            notManager.delNotification(name)
+
+        except Exception, e:
+            msg = "The following error occoured: " + str(e)
+            msg += "\n\nPlease try again"
+            if description:
+                servicedb.rollbackTransaction()
+            self.setException(msg)
+            return
+
+        self.setMessage("Notification updated")
+
+    def executeDelete(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        sql = "DELETE FROM wns.notification WHERE id = %s RETURNING name;"
+        par = [self.not_id]
+        notname = None
+        notname = servicedb.executeInTransaction(sql, par)[0][0]
+
+        try:
+            from wnslib import notificationManager as notManager
+            if notname:
+                notManager.delNotification(notname)
+                servicedb.commitTransaction()
+                self.setMessage('OK')
+            else:
+                servicedb.rollbackTransaction()
+                self.setException("Canno't delete the notifcation")
+                return
+        except Exception, e:
+            msg = "The following error occoured: " + str(e)
+            msg += "\n\nPlease try again"
+            servicedb.rollbackTransaction()
+            self.setException(msg)
+            return
diff --git a/wnslib/services/registrations/__init__.py b/wnslib/services/registrations/__init__.py
new file mode 100755
index 0000000..6045adb
--- /dev/null
+++ b/wnslib/services/registrations/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = ["registrations"]
diff --git a/wnslib/services/registrations/registrations.py b/wnslib/services/registrations/registrations.py
new file mode 100755
index 0000000..bd771de
--- /dev/null
+++ b/wnslib/services/registrations/registrations.py
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from walib import databaseManager
+from wnslib.operation import wnsOperation
+
+
+class wnsRegistrations(wnsOperation):
+
+    def __init__(self, wnsEnviron):
+        wnsOperation.__init__(self, wnsEnviron)
+        pathinfo = wnsEnviron['pathinfo']
+        print pathinfo
+        self.user_id = None
+        self.notification = None
+
+        if pathinfo[1] == 'user':
+            self.user_id = pathinfo[2]
+        else:
+            raise Exception("Resource is not identified, check the URL")
+
+        if len(pathinfo) > 4:
+            if pathinfo[3] == 'notification':
+                self.notification = pathinfo[4]
+            else:
+                raise Exception("Resource is not identified, check the URL")
+        self.setData("")
+
+    def executeGet(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        sql = "SELECT * FROM wns.registration r, wns.notification n "
+        sql += "WHERE r.user_id_fk = %s AND r.not_id_fk=n.id"
+
+        params = (self.user_id, )
+
+        if self.notification:
+            sql += " AND r.not_id_fk= %s "
+            params += (self.notification, )
+
+        NotificationList = servicedb.select(sql, params)
+        RegistrationsList = {}
+
+        for el in NotificationList:
+            el = dict(el)
+            del el['id']
+            user_id = el['user_id_fk']
+            del el['user_id_fk']
+            if not(user_id in RegistrationsList):
+                RegistrationsList[user_id] = [dict(el)]
+            else:
+                RegistrationsList[user_id].append(dict(el))
+
+        self.setData(RegistrationsList)
+
+    def executePost(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        not_list = self.json['data']
+
+        if len(not_list) == 0:
+            self.setException('Please add a notification type')
+            return
+
+        if self.user_id and self.notification:
+            sql = """INSERT INTO wns.registration (user_id_fk, not_id_fk,
+                            not_list) VALUES (%s,%s, %s);"""
+            par = [self.user_id, self.notification, not_list]
+
+            servicedb.execute(sql, par)
+            self.setMessage('OK')
+            return
+        else:
+            self.setException("Please defien user and notification")
+
+    def executePut(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        not_list = self.json['data']
+
+        if len(not_list) == 0:
+            self.setException('Please add a notification type')
+            return
+
+        if self.user_id and self.notification:
+            sql = """UPDATE wns.registration SET not_list=%s
+                     WHERE user_id_fk=%s AND not_id_fk=%s;"""
+            par = [not_list, self.user_id, self.notification]
+            servicedb.execute(sql, par)
+            self.setMessage('OK')
+            return
+        else:
+            self.setException("Please defien user and notification")
+
+    def executeDelete(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        if self.user_id and self.notification:
+            sql = """DELETE FROM wns.registration
+                    WHERE user_id_fk = %s AND not_id_fk = %s;"""
+            par = [self.user_id, self.notification]
+            servicedb.execute(sql, par)
+            self.setMessage('OK')
+        else:
+            self.setException('Please define a user_id and a notification_id')
diff --git a/wnslib/services/users/__init__.py b/wnslib/services/users/__init__.py
new file mode 100755
index 0000000..b942fd2
--- /dev/null
+++ b/wnslib/services/users/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+__all__ = ['users']
diff --git a/wnslib/services/users/users.py b/wnslib/services/users/users.py
new file mode 100755
index 0000000..653e5b1
--- /dev/null
+++ b/wnslib/services/users/users.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from wnslib.operation import wnsOperation
+from walib import databaseManager
+
+
+class wnsUsers(wnsOperation):
+
+    def __init__(self, wnsEnviron):
+        wnsOperation.__init__(self, wnsEnviron)
+        self.userid = None
+        if len(wnsEnviron['pathinfo']) > 2:
+            self.userid = wnsEnviron['pathinfo'][2]
+        self.setData("")
+
+    def executeGet(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        if self.userid:
+            sql = "SELECT * FROM wns.user WHERE id=%s;"
+            params = (self.userid,)
+        else:
+            sql = "SELECT * FROM wns.user;"
+            params = None
+        UsersList = servicedb.select(sql, params)
+
+        users = []
+        for user in UsersList:
+            users.append(dict(user))
+
+        self.setData(users)
+
+    def executePost(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        json_data = self.json
+        username = json_data["username"]
+        email = json_data["email"]
+        # optional value
+        tel = json_data.get("tel", None)
+        fax = json_data.get("fax", None)
+        address = json_data.get("address", None)
+        zip_code = json_data.get("zip", None)
+        city = json_data.get("city", None)
+        state = json_data.get("state", None)
+        country = json_data.get("country", None)
+        twitter = json_data.get("twitter", None)
+
+        sql = "INSERT INTO wns.user(username,email,twitter,tel, fax, "
+        sql += "address, zip, city, state, country)"
+        sql += " VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) RETURNING id;"
+        params = (username, email, twitter, tel, fax, address, zip_code, city,)
+        params += (state, country)
+        user_id = servicedb.execute(sql, params)[0][0]
+
+        self.setMessage(user_id)
+
+    def executePut(self):
+
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        json_data = self.json
+        username = json_data["username"]
+        email = json_data["email"]
+        # optional value
+        tel = json_data.get("tel", None)
+        fax = json_data.get("fax", None)
+        address = json_data.get("address", None)
+        zip_code = json_data.get("zip", None)
+        city = json_data.get("city", None)
+        state = json_data.get("state", None)
+        country = json_data.get("country", None)
+        twitter = json_data.get("twitter", None)
+
+        sql = "UPDATE wns.user SET username=%s, email=%s, twitter=%s,"
+        sql += " tel =%s, fax= %s, address=%s, zip=%s, city=%s, state=%s,"
+        sql += "country=%s WHERE id=%s;"
+        params = (username, email, twitter, tel, fax, address, zip_code, city,)
+        params += (state, country, self.userid)
+        servicedb.execute(sql, params)
+
+        self.setMessage("Updated user info")
+
+    def executeDelete(self):
+        servicedb = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        if self.userid:
+            sql = "DELETE FROM wns.user WHERE id=%s;"
+            par = [self.userid]
+            servicedb.execute(sql, par)
+            self.setMessage('OK')
+        else:
+            self.setException("Please define a user id!!!")
diff --git a/wnslib/setup.py b/wnslib/setup.py
new file mode 100755
index 0000000..e97d714
--- /dev/null
+++ b/wnslib/setup.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# ===============================================================================
+#
+# Authors: Massimiliano Cannata, Milan Antonovic
+#
+# Copyright (c) 2015 IST-SUPSI (www.supsi.ch/ist)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ===============================================================================
+from os import path
+from wnslib.operation import wnsOperation
+from walib import databaseManager
+
+
+class wnsSetup(wnsOperation):
+
+    def __init__(self, wnsEnviron):
+        wnsOperation.__init__(self, wnsEnviron)
+
+    def executePost(self):
+
+        directory = path.dirname(path.split(path.abspath(__file__))[0])
+        services_dir = path.join(directory, "services")
+        wns_dir = path.join(directory, "wnslib")
+        sql_dir = path.join(wns_dir, "dbSetup.sql")
+        aps_dir = path.join(services_dir, "notifications.aps")
+
+        import datetime
+        now = datetime.datetime.now()
+        startDate = now.strftime('%Y-%m-%d %H:%M:%S')
+
+        aps = open(aps_dir, 'w')
+        aps.write("### CREATED ON " + str(startDate) + " ###")
+        aps.close()
+
+        db = open(sql_dir, 'r')
+        sqlFile = db.read()
+        db.close()
+
+        sqlCommands = sqlFile.split(';')
+        sqlCommands.pop()
+        dbConnection = databaseManager.PgDB(
+            self.serviceconf.connectionWns['user'],
+            self.serviceconf.connectionWns['password'],
+            self.serviceconf.connectionWns['dbname'],
+            self.serviceconf.connectionWns['host'],
+            self.serviceconf.connectionWns['port'])
+
+        dbConnection.execute(sqlFile)
+        msg = "Notification.aps file created in %s " % services_dir
+        msg += "\nDatabase schema WNS correctly created"
+
+        self.setMessage(msg)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/istsos.git



More information about the Pkg-grass-devel mailing list